Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit af514ca7 authored by Paul Mundt's avatar Paul Mundt
Browse files

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



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

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 2991be72

arch/sh/boards/dreamcast/rtc.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

}

arch/sh/boards/landisk/rtc.c

+4 −13
Original line number Diff line number Diff line
@@ -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;

}

arch/sh/boards/mpc1211/rtc.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

}

arch/sh/boards/sh03/rtc.c

+4 −5
Original line number Diff line number Diff line
@@ -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;

}

arch/sh/boards/snapgear/rtc.c

+4 −4
Original line number Diff line number Diff line
@@ -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");