OSDN Git Service

rtc: cmos: move mc146818rtc code out of asm-generic/rtc.h
authorArnd Bergmann <arnd@arndb.de>
Mon, 30 May 2016 18:57:50 +0000 (20:57 +0200)
committerAlexandre Belloni <alexandre.belloni@free-electrons.com>
Fri, 3 Jun 2016 22:20:00 +0000 (00:20 +0200)
commit5ab788d7383289bfc141ab357767bc6c11bbf77f
tree26776f07b90a42b132fb842ab27356d7b597e35e
parentf09c5142ee42efce956ba93f5a75ddaf4835c9e8
rtc: cmos: move mc146818rtc code out of asm-generic/rtc.h

Drivers should not really include stuff from asm-generic directly,
and the PC-style cmos rtc driver does this in order to reuse the
mc146818 implementation of get_rtc_time/set_rtc_time rather than
the architecture specific one for the architecture it gets built for.

To make it more obvious what is going on, this moves and renames the
two functions into include/linux/mc146818rtc.h, which holds the
other mc146818 specific code. Ideally it would be in a .c file,
but that would require extra infrastructure as the functions are
called by multiple drivers with conflicting dependencies.

With this change, the asm-generic/rtc.h header also becomes much
more generic, so it can be reused more easily across any architecture
that still relies on the genrtc driver.

The only caller of the internal __get_rtc_time/__set_rtc_time
functions is in arch/alpha/kernel/rtc.c, and we just change those
over to the new naming.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
arch/alpha/kernel/rtc.c
arch/x86/include/asm/mc146818rtc.h
arch/x86/platform/efi/efi_64.c
arch/x86/platform/intel-mid/intel_mid_vrtc.c
drivers/rtc/rtc-cmos.c
include/asm-generic/rtc.h
include/linux/mc146818rtc.h