Messages in this thread Patch in this message | | | From | Arnd Bergmann <> | Subject | [PATCH 2/6] m68k: rtc: provide rtc_class_ops directly | Date | Tue, 1 Mar 2016 17:59:58 +0100 |
| |
The rtc-generic driver provides an architecture specific wrapper on top of the generic rtc_class_ops abstraction, and m68k has another abstraction on top, which is a bit silly.
This changes the m68k rtc-generic device to provide its rtc_class_ops directly, to reduce the number of layers by one.
Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- arch/m68k/kernel/time.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-)
diff --git a/arch/m68k/kernel/time.c b/arch/m68k/kernel/time.c index 3857737e3958..773b2187210d 100644 --- a/arch/m68k/kernel/time.c +++ b/arch/m68k/kernel/time.c @@ -87,6 +87,23 @@ void read_persistent_clock(struct timespec *ts) } #ifdef CONFIG_ARCH_USES_GETTIMEOFFSET +static int rtc_generic_get_time(struct device *dev, struct rtc_time *tm) +{ + mach_hwclk(0, tm); + return rtc_valid_tm(tm); +} + +static int rtc_generic_set_time(struct device *dev, struct rtc_time *tm) +{ + if (mach_hwclk(1, tm) < 0) + return -EOPNOTSUPP; + return 0; +} + +static const struct rtc_class_ops generic_rtc_ops = { + .read_time = rtc_generic_get_time, + .set_time = rtc_generic_set_time, +}; static int __init rtc_init(void) { @@ -95,7 +112,10 @@ static int __init rtc_init(void) if (!mach_hwclk) return -ENODEV; - pdev = platform_device_register_simple("rtc-generic", -1, NULL, 0); + /* or just call devm_rtc_device_register instead? */ + pdev = platform_device_register_data(NULL, "rtc-generic", -1, + &generic_rtc_ops, + sizeof(generic_rtc_ops)); return PTR_ERR_OR_ZERO(pdev); } -- 2.7.0
| |