xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sh: Rename rtc_get/set_time() to avoid RTC_CLASS conflict.

Browse Source 
We have a clash with RTC_CLASS over these names, so we
change them..

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
This commit is contained in:
Paul Mundt
2006-09-27 17:11:32 +09:00
parent 2991be7252
commit af514ca7d2
8 changed files with 28 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/sh/boards/dreamcast/rtc.c
View File

@@ -75,7 +75,7 @@ int aica_rtc_settimeofday(const time_t secs)
void aica_time_init(void)
{
rtc_get_time = aica_rtc_gettimeofday;
rtc_set_time = aica_rtc_settimeofday;
rtc_sh_get_time = aica_rtc_gettimeofday;
rtc_sh_set_time = aica_rtc_settimeofday;
}

17
arch/sh/boards/landisk/rtc.c
View File

@@ -16,17 +16,9 @@
#include <linux/time.h>
#include <linux/delay.h>
#include <linux/spinlock.h>
#include <linux/bcd.h>
#include <asm/rtc.h>
#ifndef BCD_TO_BIN
#define BCD_TO_BIN(val) ((val)=((val)&15) + ((val)>>4)*10)
#endif
#ifndef BIN_TO_BCD
#define BIN_TO_BCD(val) ((val)=(((val)/10)<<4) + (val)%10)
#endif
extern void (*rtc_get_time) (struct timespec *);
extern int (*rtc_set_time) (const time_t);
extern spinlock_t rtc_lock;
extern void
@@ -94,9 +86,8 @@ int landisk_rtc_settimeofday(const time_t secs)
return retval;
}
void landisk_time_init(void)
{
rtc_get_time = landisk_rtc_gettimeofday;
rtc_set_time = landisk_rtc_settimeofday;
rtc_sh_get_time = landisk_rtc_gettimeofday;
rtc_sh_set_time = landisk_rtc_settimeofday;
}

4
arch/sh/boards/mpc1211/rtc.c
View File

@@ -130,7 +130,7 @@ int mpc1211_rtc_settimeofday(const struct timeval *tv)
void mpc1211_time_init(void)
{
rtc_get_time = mpc1211_rtc_gettimeofday;
rtc_set_time = mpc1211_rtc_settimeofday;
rtc_sh_get_time = mpc1211_rtc_gettimeofday;
rtc_sh_set_time = mpc1211_rtc_settimeofday;
}

9
arch/sh/boards/sh03/rtc.c
View File

@@ -10,9 +10,10 @@
#include <linux/sched.h>
#include <linux/time.h>
#include <linux/bcd.h>
#include <asm/io.h>
#include <linux/rtc.h>
#include <linux/spinlock.h>
#include <asm/io.h>
#include <asm/rtc.h>
#define RTC_BASE 0xb0000000
#define RTC_SEC1 (RTC_BASE + 0)
@@ -34,8 +35,6 @@
#define RTC_BUSY 1
#define RTC_STOP 2
extern void (*rtc_get_time)(struct timespec *);
extern int (*rtc_set_time)(const time_t);
extern spinlock_t rtc_lock;
unsigned long get_cmos_time(void)
@@ -128,6 +127,6 @@ int sh03_rtc_settimeofday(const time_t secs)
void sh03_time_init(void)
{
rtc_get_time = sh03_rtc_gettimeofday;
rtc_set_time = sh03_rtc_settimeofday;
rtc_sh_get_time = sh03_rtc_gettimeofday;
rtc_sh_set_time = sh03_rtc_settimeofday;
}

8
arch/sh/boards/snapgear/rtc.c
View File

@@ -165,11 +165,11 @@ void __init secureedge5410_rtc_init(void)
}
if (use_ds1302) {
rtc_get_time = snapgear_rtc_gettimeofday;
rtc_set_time = snapgear_rtc_settimeofday;
rtc_sh_get_time = snapgear_rtc_gettimeofday;
rtc_sh_set_time = snapgear_rtc_settimeofday;
} else {
rtc_get_time = sh_rtc_gettimeofday;
rtc_set_time = sh_rtc_settimeofday;
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");