leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

x86: rtc.c cleanup

Browse Source 
Impact: cleanup

 - fix various style problems
  - fix header file issues

Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com>
This commit is contained in:
Jaswinder Singh Rajput 2009-03-21 16:56:37 +05:30
parent c8344bc218
commit 8383d821e7
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
arch/x86/kernel/rtc.c
View File

@ -1,14 +1,14 @@
/* /*
* RTC related functions * RTC related functions
*/ */
#include <linux/platform_device.h>
#include <linux/mc146818rtc.h>
#include <linux/acpi.h> #include <linux/acpi.h>
#include <linux/bcd.h> #include <linux/bcd.h>
#include <linux/mc146818rtc.h>
#include <linux/platform_device.h>
#include <linux/pnp.h> #include <linux/pnp.h>
#include <asm/time.h>
#include <asm/vsyscall.h> #include <asm/vsyscall.h>
#include <asm/time.h>
#ifdef CONFIG_X86_32 #ifdef CONFIG_X86_32
/* /*
@ -16,9 +16,9 @@
* register we are working with. It is required for NMI access to the * register we are working with. It is required for NMI access to the
* CMOS/RTC registers. See include/asm-i386/mc146818rtc.h for details. * 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); EXPORT_SYMBOL(cmos_lock);
#endif #endif /* CONFIG_X86_32 */
/* For two digit years assume time is always after that */ /* For two digit years assume time is always after that */
#define CMOS_YEARS_OFFS 2000 #define CMOS_YEARS_OFFS 2000
@ -38,9 +38,9 @@ EXPORT_SYMBOL(rtc_lock);
*/ */
int mach_set_rtc_mmss(unsigned long nowtime) int mach_set_rtc_mmss(unsigned long nowtime)
{ {
int retval = 0;
int real_seconds, real_minutes, cmos_minutes; int real_seconds, real_minutes, cmos_minutes;
unsigned char save_control, save_freq_select; unsigned char save_control, save_freq_select;
int retval = 0;
/* tell the clock it's being set */ /* tell the clock it's being set */
save_control = CMOS_READ(RTC_CONTROL); save_control = CMOS_READ(RTC_CONTROL);
@ -72,8 +72,8 @@ int mach_set_rtc_mmss(unsigned long nowtime)
real_seconds = bin2bcd(real_seconds); real_seconds = bin2bcd(real_seconds);
real_minutes = bin2bcd(real_minutes); real_minutes = bin2bcd(real_minutes);
} }
CMOS_WRITE(real_seconds,RTC_SECONDS); CMOS_WRITE(real_seconds, RTC_SECONDS);
CMOS_WRITE(real_minutes,RTC_MINUTES); CMOS_WRITE(real_minutes, RTC_MINUTES);
} else { } else {
printk(KERN_WARNING printk(KERN_WARNING
"set_rtc_mmss: can't update from %d to %d\n", "set_rtc_mmss: can't update from %d to %d\n",
@ -151,6 +151,7 @@ unsigned char rtc_cmos_read(unsigned char addr)
outb(addr, RTC_PORT(0)); outb(addr, RTC_PORT(0));
val = inb(RTC_PORT(1)); val = inb(RTC_PORT(1));
lock_cmos_suffix(addr); lock_cmos_suffix(addr);
return val; return val;
} }
EXPORT_SYMBOL(rtc_cmos_read); EXPORT_SYMBOL(rtc_cmos_read);
@ -166,8 +167,8 @@ EXPORT_SYMBOL(rtc_cmos_write);
static int set_rtc_mmss(unsigned long nowtime) static int set_rtc_mmss(unsigned long nowtime)
{ {
int retval;
unsigned long flags; unsigned long flags;
int retval;
spin_lock_irqsave(&rtc_lock, flags); spin_lock_irqsave(&rtc_lock, flags);
retval = set_wallclock(nowtime); retval = set_wallclock(nowtime);
@ -242,6 +243,7 @@ static __init int add_rtc_cmos(void)
platform_device_register(&rtc_device); platform_device_register(&rtc_device);
dev_info(&rtc_device.dev, dev_info(&rtc_device.dev,
"registered platform RTC device (no PNP device found)\n"); "registered platform RTC device (no PNP device found)\n");
return 0; return 0;
} }
device_initcall(add_rtc_cmos); device_initcall(add_rtc_cmos);