x86: rtc.c cleanup
PATCH 1/1 x86: rtc.c cleanup
Subject: [PATCH] x86: rtc.c cleanup
Impact: cleanup
- fix various style problems
- fix header file issues
Signed-off-by Jaswinder Singh Rajput <[email protected]>
--- arch/x86/kernel/rtc.c | 22 ++++++++++++---------- 1 files changed, 12 insertions(+), 10 deletions(-)
arch/x86/kernel/rtc.c +12 -10
@@ -1,14 +1,14 @@/* * RTC related functions */ +#include <linux/platform_device.h> +#include <linux/mc146818rtc.h> #include <linux/acpi.h> #include <linux/bcd.h> -#include <linux/mc146818rtc.h> -#include <linux/platform_device.h> #include <linux/pnp.h> -#include <asm/time.h> #include <asm/vsyscall.h> +#include <asm/time.h> #ifdef CONFIG_X86_32 /*
@@ -16,9 +16,9 @@* register we are working with. It is required for NMI access to the * CMOS/RTC registers. See include/asm-i386/mc146818rtc.h for details. */ -volatile unsigned long cmos_lock =0 ; +volatile unsigned long cmos_lock;EXPORT_SYMBOL (cmos_lock); -#endif +#endif /* CONFIG_X86_32 */ /* For two digit years assume time is always after that */ #define CMOS_YEARS_OFFS 2000
@@ -72,8 +72,8 @@ int mach_set_rtc_mmss(unsigned long nowtime) real_seconds =bin2bcd (real_seconds); real_minutes =bin2bcd (real_minutes); } -CMOS_WRITE (real_seconds,RTC_SECONDS ); -CMOS_WRITE (real_minutes,RTC_MINUTES ); +CMOS_WRITE (real_seconds,RTC_SECONDS ); +CMOS_WRITE (real_minutes,RTC_MINUTES ); }else { printk(KERN_WARNING "set_rtc_mmss: can't update from %d to %d\n",
@@ -118,7 +118,7 @@ unsigned long mach_get_cmos_time(void)if (acpi_gbl_FADT.header.revision >=FADT2_REVISION_ID && acpi_gbl_FADT.century) century =CMOS_READ (acpi_gbl_FADT.century); -#endif +#endif /* CONFIG_ACPI */ status =CMOS_READ (RTC_CONTROL );WARN_ON_ONCE (RTC_ALWAYS_BCD && (status &RTC_DM_BINARY ));
@@ -151,6 +151,7 @@ unsigned char rtc_cmos_read(unsigned char addr)outb (addr,RTC_PORT (0 )); val =inb (RTC_PORT (1 ));lock_cmos_suffix (addr); +return val; }EXPORT_SYMBOL (rtc_cmos_read);
@@ -166,8 +167,8 @@ EXPORT_SYMBOL(rtc_cmos_write);static int set_rtc_mmss (unsigned long nowtime) { -int retval;unsigned long flags; +int retval;spin_lock_irqsave (&rtc_lock, flags); retval =set_wallclock (nowtime);
@@ -237,11 +238,12 @@ static __init int add_rtc_cmos(void) } } } -#endif +#endif /* CONFIG_PNP */ platform_device_register (&rtc_device);dev_info (&rtc_device.dev,"registered platform RTC device (no PNP device found)\n" ); +return 0 ; }device_initcall (add_rtc_cmos);
Signature · 1 line
1.6.0.6