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

Commit 923c904c authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Alexandre Belloni
Browse files

rtc: m68k: provide rtc_class_ops directly 



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: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Tested-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@free-electrons.com>
parent 8bbe6b6f

arch/m68k/kernel/time.c

+21 −2
Original line number Diff line number Diff line
@@ -86,7 +86,24 @@ void read_persistent_clock(struct timespec *ts) 
	}

}



#ifdef CONFIG_ARCH_USES_GETTIMEOFFSET

#if defined(CONFIG_ARCH_USES_GETTIMEOFFSET) && IS_ENABLED(CONFIG_RTC_DRV_GENERIC)

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,9 @@ static int __init rtc_init(void) 
	if (!mach_hwclk)

		return -ENODEV;



	pdev = platform_device_register_simple("rtc-generic", -1, NULL, 0);

	pdev = platform_device_register_data(NULL, "rtc-generic", -1,

					     &generic_rtc_ops,

					     sizeof(generic_rtc_ops));

	return PTR_ERR_OR_ZERO(pdev);

}

drivers/rtc/rtc-generic.c

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
#include <linux/platform_device.h>

#include <linux/rtc.h>



#if defined(CONFIG_M68K) || defined(CONFIG_PPC)

#if defined(CONFIG_PPC)

#include <asm/rtc.h>



static int generic_get_time(struct device *dev, struct rtc_time *tm)