sh: Kill off the rest of the legacy rtc mess.
With the new RTC class driver, we can get rid of most of the
old left over cruft.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
diff --git a/arch/sh/boards/snapgear/rtc.c b/arch/sh/boards/snapgear/rtc.c
index 722479d..1659fdd 100644
--- a/arch/sh/boards/snapgear/rtc.c
+++ b/arch/sh/boards/snapgear/rtc.c
@@ -19,9 +19,7 @@
#include <linux/mc146818rtc.h>
#include <asm/io.h>
-/****************************************************************************/
-
-static int use_ds1302 = 0;
+static int use_ds1302;
/****************************************************************************/
/*
@@ -79,10 +77,6 @@
unsigned int val;
unsigned long flags;
-#if 0
- printk("SnapGear RTC: ds1302_readbyte(addr=%x)\n", addr);
-#endif
-
local_irq_save(flags);
set_dirp(get_dirp() | RTC_RESET | RTC_IODATA | RTC_SCLK);
set_dp(get_dp() & ~(RTC_RESET | RTC_IODATA | RTC_SCLK));
@@ -101,10 +95,6 @@
{
unsigned long flags;
-#if 0
- printk("SnapGear RTC: ds1302_writebyte(addr=%x)\n", addr);
-#endif
-
local_irq_save(flags);
set_dirp(get_dirp() | RTC_RESET | RTC_IODATA | RTC_SCLK);
set_dp(get_dp() & ~(RTC_RESET | RTC_IODATA | RTC_SCLK));
@@ -167,9 +157,6 @@
if (use_ds1302) {
rtc_sh_get_time = snapgear_rtc_gettimeofday;
rtc_sh_set_time = snapgear_rtc_settimeofday;
- } else {
- rtc_sh_get_time = sh_rtc_gettimeofday;
- rtc_sh_set_time = sh_rtc_settimeofday;
}
printk("SnapGear RTC: using %s rtc.\n", use_ds1302 ? "ds1302" : "internal");
@@ -184,10 +171,8 @@
{
unsigned int sec, min, hr, day, mon, yr;
- if (!use_ds1302) {
- sh_rtc_gettimeofday(ts);
+ if (!use_ds1302)
return;
- }
sec = bcd2int(ds1302_readbyte(RTC_ADDR_SEC));
min = bcd2int(ds1302_readbyte(RTC_ADDR_MIN));
@@ -228,7 +213,7 @@
unsigned long nowtime;
if (!use_ds1302)
- return sh_rtc_settimeofday(secs);
+ return 0;
/*
* This is called direct from the kernel timer handling code.
@@ -237,10 +222,6 @@
nowtime = secs;
-#if 1
- printk("SnapGear RTC: snapgear_rtc_settimeofday(nowtime=%ld)\n", nowtime);
-#endif
-
/* STOP RTC */
ds1302_writebyte(RTC_ADDR_SEC, ds1302_readbyte(RTC_ADDR_SEC) | 0x80);
@@ -326,5 +307,3 @@
default: break;
}
}
-
-/****************************************************************************/