x86/hpet: Coding style cleanup (0b5c597d) · Commits · 戴 / test

arch/x86/kernel/hpet.c

+26 −17

Original line number	Diff line number	Diff line
		@@ -131,26 +131,33 @@ EXPORT_SYMBOL_GPL(is_hpet_enabled);

		static void _hpet_print_config(const char *function, int line)
		{
		u32 i, timers, l, h;
		u32 i, id, period, cfg, status, channels, l, h;

		pr_info("%s(%d):\n", function, line);
		l = hpet_readl(HPET_ID);
		h = hpet_readl(HPET_PERIOD);
		timers = ((l & HPET_ID_NUMBER) >> HPET_ID_NUMBER_SHIFT) + 1;
		pr_info("ID: 0x%x, PERIOD: 0x%x\n", l, h);
		l = hpet_readl(HPET_CFG);
		h = hpet_readl(HPET_STATUS);
		pr_info("CFG: 0x%x, STATUS: 0x%x\n", l, h);

		id = hpet_readl(HPET_ID);
		period = hpet_readl(HPET_PERIOD);
		pr_info("ID: 0x%x, PERIOD: 0x%x\n", id, period);

		cfg = hpet_readl(HPET_CFG);
		status = hpet_readl(HPET_STATUS);
		pr_info("CFG: 0x%x, STATUS: 0x%x\n", cfg, status);

		l = hpet_readl(HPET_COUNTER);
		h = hpet_readl(HPET_COUNTER+4);
		pr_info("COUNTER_l: 0x%x, COUNTER_h: 0x%x\n", l, h);

		for (i = 0; i < timers; i++) {
		channels = ((id & HPET_ID_NUMBER) >> HPET_ID_NUMBER_SHIFT) + 1;

		for (i = 0; i < channels; i++) {
		l = hpet_readl(HPET_Tn_CFG(i));
		h = hpet_readl(HPET_Tn_CFG(i)+4);
		pr_info("T%d: CFG_l: 0x%x, CFG_h: 0x%x\n", i, l, h);

		l = hpet_readl(HPET_Tn_CMP(i));
		h = hpet_readl(HPET_Tn_CMP(i)+4);
		pr_info("T%d: CMP_l: 0x%x, CMP_h: 0x%x\n", i, l, h);

		l = hpet_readl(HPET_Tn_ROUTE(i));
		h = hpet_readl(HPET_Tn_ROUTE(i)+4);
		pr_info("T%d ROUTE_l: 0x%x, ROUTE_h: 0x%x\n", i, l, h);
		@@ -216,6 +223,7 @@ static void hpet_reserve_platform_timers(unsigned int id) { }
		static void hpet_stop_counter(void)
		{
		u32 cfg = hpet_readl(HPET_CFG);

		cfg &= ~HPET_CFG_ENABLE;
		hpet_writel(cfg, HPET_CFG);
		}
		@@ -229,6 +237,7 @@ static void hpet_reset_counter(void)
		static void hpet_start_counter(void)
		{
		unsigned int cfg = hpet_readl(HPET_CFG);

		cfg \|= HPET_CFG_ENABLE;
		hpet_writel(cfg, HPET_CFG);
		}
		@@ -1142,6 +1151,7 @@ EXPORT_SYMBOL_GPL(hpet_rtc_timer_init);
		static void hpet_disable_rtc_channel(void)
		{
		u32 cfg = hpet_readl(HPET_T1_CFG);

		cfg &= ~HPET_TN_ENABLE;
		hpet_writel(cfg, HPET_T1_CFG);
		}
		@@ -1183,8 +1193,7 @@ int hpet_set_rtc_irq_bit(unsigned long bit_mask)
		}
		EXPORT_SYMBOL_GPL(hpet_set_rtc_irq_bit);

		int hpet_set_alarm_time(unsigned char hrs, unsigned char min,
		unsigned char sec)
		int hpet_set_alarm_time(unsigned char hrs, unsigned char min, unsigned char sec)
		{
		if (!is_hpet_enabled())
		return 0;
		@@ -1204,15 +1213,16 @@ int hpet_set_periodic_freq(unsigned long freq)
		if (!is_hpet_enabled())
		return 0;

		if (freq <= DEFAULT_RTC_INT_FREQ)
		if (freq <= DEFAULT_RTC_INT_FREQ) {
		hpet_pie_limit = DEFAULT_RTC_INT_FREQ / freq;
		else {
		} else {
		clc = (uint64_t) hpet_clockevent.mult * NSEC_PER_SEC;
		do_div(clc, freq);
		clc >>= hpet_clockevent.shift;
		hpet_pie_delta = clc;
		hpet_pie_limit = 0;
		}

		return 1;
		}
		EXPORT_SYMBOL_GPL(hpet_set_periodic_freq);
		@@ -1272,8 +1282,7 @@ irqreturn_t hpet_rtc_interrupt(int irq, void *dev_id)
		hpet_prev_update_sec = curr_time.tm_sec;
		}

		if (hpet_rtc_flags & RTC_PIE &&
		++hpet_pie_count >= hpet_pie_limit) {
		if (hpet_rtc_flags & RTC_PIE && ++hpet_pie_count >= hpet_pie_limit) {
		rtc_int_flag \|= RTC_PF;
		hpet_pie_count = 0;
		}

Admin message