mirror of https://gitee.com/openkylin/linux.git
alpha: rtc: remove unused set_mmss ops
The .set_mmss and .setmmss64 ops are only called when the RTC is not providing an implementation for the .set_time callback. On alpha, .set_time is provided so .set_mmss64 is never called. Remove the unused code. Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Matt Turner <mattst88@gmail.com>
This commit is contained in:
Alexandre Belloni
Matt Turner
parent
bf6879dcc4
commit
9917df83a9
|
|
@ -114,83 +114,6 @@ alpha_rtc_set_time(struct device *dev, struct rtc_time *tm)
|
|||
return mc146818_set_time(tm);
|
||||
}
|
||||
|
||||
static int
|
||||
alpha_rtc_set_mmss(struct device *dev, time64_t nowtime)
|
||||
{
|
||||
int retval = 0;
|
||||
int real_seconds, real_minutes, cmos_minutes;
|
||||
unsigned char save_control, save_freq_select;
|
||||
|
||||
/* Note: This code only updates minutes and seconds. Comments
|
||||
indicate this was to avoid messing with unknown time zones,
|
||||
and with the epoch nonsense described above. In order for
|
||||
this to work, the existing clock cannot be off by more than
|
||||
15 minutes.
|
||||
|
||||
??? This choice is may be out of date. The x86 port does
|
||||
not have problems with timezones, and the epoch processing has
|
||||
now been fixed in alpha_set_rtc_time.
|
||||
|
||||
In either case, one can always force a full rtc update with
|
||||
the userland hwclock program, so surely 15 minute accuracy
|
||||
is no real burden. */
|
||||
|
||||
/* In order to set the CMOS clock precisely, we have to be called
|
||||
500 ms after the second nowtime has started, because when
|
||||
nowtime is written into the registers of the CMOS clock, it will
|
||||
jump to the next second precisely 500 ms later. Check the Motorola
|
||||
MC146818A or Dallas DS12887 data sheet for details. */
|
||||
|
||||
/* irq are locally disabled here */
|
||||
spin_lock(&rtc_lock);
|
||||
/* Tell the clock it's being set */
|
||||
save_control = CMOS_READ(RTC_CONTROL);
|
||||
CMOS_WRITE((save_control|RTC_SET), RTC_CONTROL);
|
||||
|
||||
/* Stop and reset prescaler */
|
||||
save_freq_select = CMOS_READ(RTC_FREQ_SELECT);
|
||||
CMOS_WRITE((save_freq_select|RTC_DIV_RESET2), RTC_FREQ_SELECT);
|
||||
|
||||
cmos_minutes = CMOS_READ(RTC_MINUTES);
|
||||
if (!(save_control & RTC_DM_BINARY) || RTC_ALWAYS_BCD)
|
||||
cmos_minutes = bcd2bin(cmos_minutes);
|
||||
|
||||
real_seconds = nowtime % 60;
|
||||
real_minutes = nowtime / 60;
|
||||
if (((abs(real_minutes - cmos_minutes) + 15) / 30) & 1) {
|
||||
/* correct for half hour time zone */
|
||||
real_minutes += 30;
|
||||
}
|
||||
real_minutes %= 60;
|
||||
|
||||
if (abs(real_minutes - cmos_minutes) < 30) {
|
||||
if (!(save_control & RTC_DM_BINARY) || RTC_ALWAYS_BCD) {
|
||||
real_seconds = bin2bcd(real_seconds);
|
||||
real_minutes = bin2bcd(real_minutes);
|
||||
}
|
||||
CMOS_WRITE(real_seconds,RTC_SECONDS);
|
||||
CMOS_WRITE(real_minutes,RTC_MINUTES);
|
||||
} else {
|
||||
printk_once(KERN_NOTICE
|
||||
"set_rtc_mmss: can't update from %d to %d\n",
|
||||
cmos_minutes, real_minutes);
|
||||
retval = -1;
|
||||
}
|
||||
|
||||
/* The following flags have to be released exactly in this order,
|
||||
* otherwise the DS12887 (popular MC146818A clone with integrated
|
||||
* battery and quartz) will not reset the oscillator and will not
|
||||
* update precisely 500 ms later. You won't find this mentioned in
|
||||
* the Dallas Semiconductor data sheets, but who believes data
|
||||
* sheets anyway ... -- Markus Kuhn
|
||||
*/
|
||||
CMOS_WRITE(save_control, RTC_CONTROL);
|
||||
CMOS_WRITE(save_freq_select, RTC_FREQ_SELECT);
|
||||
spin_unlock(&rtc_lock);
|
||||
|
||||
return retval;
|
||||
}
|
||||
|
||||
static int
|
||||
alpha_rtc_ioctl(struct device *dev, unsigned int cmd, unsigned long arg)
|
||||
{
|
||||
|
|
@ -210,7 +133,6 @@ alpha_rtc_ioctl(struct device *dev, unsigned int cmd, unsigned long arg)
|
|||
static const struct rtc_class_ops alpha_rtc_ops = {
|
||||
.read_time = alpha_rtc_read_time,
|
||||
.set_time = alpha_rtc_set_time,
|
||||
.set_mmss64 = alpha_rtc_set_mmss,
|
||||
.ioctl = alpha_rtc_ioctl,
|
||||
};
|
||||
|
||||
|
|
@ -225,7 +147,6 @@ static const struct rtc_class_ops alpha_rtc_ops = {
|
|||
|
||||
union remote_data {
|
||||
struct rtc_time *tm;
|
||||
unsigned long now;
|
||||
long retval;
|
||||
};
|
||||
|
||||
|
|
@ -267,29 +188,9 @@ remote_set_time(struct device *dev, struct rtc_time *tm)
|
|||
return alpha_rtc_set_time(NULL, tm);
|
||||
}
|
||||
|
||||
static void
|
||||
do_remote_mmss(void *data)
|
||||
{
|
||||
union remote_data *x = data;
|
||||
x->retval = alpha_rtc_set_mmss(NULL, x->now);
|
||||
}
|
||||
|
||||
static int
|
||||
remote_set_mmss(struct device *dev, time64_t now)
|
||||
{
|
||||
union remote_data x;
|
||||
if (smp_processor_id() != boot_cpuid) {
|
||||
x.now = now;
|
||||
smp_call_function_single(boot_cpuid, do_remote_mmss, &x, 1);
|
||||
return x.retval;
|
||||
}
|
||||
return alpha_rtc_set_mmss(NULL, now);
|
||||
}
|
||||
|
||||
static const struct rtc_class_ops remote_rtc_ops = {
|
||||
.read_time = remote_read_time,
|
||||
.set_time = remote_set_time,
|
||||
.set_mmss64 = remote_set_mmss,
|
||||
.ioctl = alpha_rtc_ioctl,
|
||||
};
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Reference in New Issue