MIPS: Return -ENODEV from weak implementation of rtc_mips_set_time

luukp · ralfbaechle · commit edb6fa1a6452 · 2016-12-11T11:19:04.000+01:00
The sync_cmos_clock function in kernel/time/ntp.c first tries to update the internal clock of the cpu by calling the "update_persistent_clock64" architecture specific function. If this returns -ENODEV, it then tries to update an external RTC using "rtc_set_ntp_time". On the mips architecture, the weak implementation of the underlying function would return 0 if it wasn't overridden. This meant that the sync_cmos_clock function would never try to update an external RTC (if both CONFIG_GENERIC_CMOS_UPDATE and CONFIG_RTC_SYSTOHC are configured) Returning -ENODEV instead, means that an external RTC will be tried. Signed-off-by: Luuk Paulussen <luuk.paulussen@alliedtelesis.co.nz> Reviewed-by: Richard Laing <richard.laing@alliedtelesis.co.nz> Reviewed-by: Scott Parlane <scott.parlane@alliedtelesis.co.nz> Reviewed-by: Chris Packham <chris.packham@alliedtelesis.co.nz> Cc: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/14649/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
diff --git a/arch/mips/kernel/time.c b/arch/mips/kernel/time.c
@@ -36,7 +36,7 @@ EXPORT_SYMBOL(rtc_lock);
 
 int __weak rtc_mips_set_time(unsigned long sec)
 {
-	return 0;
+	return -ENODEV;
 }
 
 int __weak rtc_mips_set_mmss(unsigned long nowtime)

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ EXPORT_SYMBOL(rtc_lock);`
`36`	`36`
`37`	`37`	`int __weak rtc_mips_set_time(unsigned long sec)`
`38`	`38`	`{`
`39`		`- return 0;`
	`39`	`+ return -ENODEV;`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`int __weak rtc_mips_set_mmss(unsigned long nowtime)`