diff mbox

[RESEND,4/4] sh: remove board_time_init() callback

Message ID 0ad306a7d410d3695c7869bf081efaa71e956ae4.1531826106.git.baolin.wang@linaro.org (mailing list archive)
State New, archived
Headers show

Commit Message

(Exiting) Baolin Wang July 17, 2018, 11:24 a.m. UTC 
From: Arnd Bergmann <arnd@arndb.de>

The only remaining user of board_time_init() is the of-generic
machine, and that just calls the global timer_init() function.
Calling that one has no effect on non-DT platforms, so we can
simply call it unconditionally in place of board_time_init().

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Baolin Wang <baolin.wang@linaro.org>
---
 Documentation/sh/new-machine.txt |    8 --------
 arch/sh/boards/of-generic.c      |    8 --------
 arch/sh/include/asm/rtc.h        |    1 -
 arch/sh/kernel/time.c            |    5 +----
 4 files changed, 1 insertion(+), 21 deletions(-)

Comments

kernel test robot July 24, 2018, 5:07 p.m. UTC | #1 
Hi Arnd,

I love your patch! Yet something to improve:

[auto build test ERROR on sof-driver-fuweitax/master]
[also build test ERROR on v4.18-rc6 next-20180724]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]

url:    https://github.com/0day-ci/linux/commits/Baolin-Wang/sh-dreamcast-rtc-push-down-rtc-class-ops-into-driver/20180719-041209
base:   https://github.com/fuweitax/linux master
config: sh-rsk7264_defconfig (attached as .config)
compiler: sh4-linux-gnu-gcc (Debian 7.2.0-11) 7.2.0
reproduce:
        wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
        chmod +x ~/bin/make.cross
        # save the attached .config to linux build tree
        GCC_VERSION=7.2.0 make.cross ARCH=sh 

All errors (new ones prefixed by >>):

   arch/sh/kernel/time.c: In function 'time_init':
>> arch/sh/kernel/time.c:42:2: error: implicit declaration of function 'timer_init'; did you mean 'time_init'? [-Werror=implicit-function-declaration]
     timer_init();
     ^~~~~~~~~~
     time_init
   cc1: all warnings being treated as errors

vim +42 arch/sh/kernel/time.c

    39	
    40	void __init time_init(void)
    41	{
  > 42		timer_init();

---
0-DAY kernel test infrastructure                Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all                   Intel Corporation
Arnd Bergmann July 24, 2018, 9:33 p.m. UTC | #2 
On Tue, Jul 24, 2018 at 7:07 PM, kbuild test robot <lkp@intel.com> wrote:
> Hi Arnd,
>
> I love your patch! Yet something to improve:
>
> [auto build test ERROR on sof-driver-fuweitax/master]
> [also build test ERROR on v4.18-rc6 next-20180724]
> [if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
>
> url:    https://github.com/0day-ci/linux/commits/Baolin-Wang/sh-dreamcast-rtc-push-down-rtc-class-ops-into-driver/20180719-041209
> base:   https://github.com/fuweitax/linux master
> config: sh-rsk7264_defconfig (attached as .config)
> compiler: sh4-linux-gnu-gcc (Debian 7.2.0-11) 7.2.0
> reproduce:
>         wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
>         chmod +x ~/bin/make.cross
>         # save the attached .config to linux build tree
>         GCC_VERSION=7.2.0 make.cross ARCH=sh
>
> All errors (new ones prefixed by >>):
>
>    arch/sh/kernel/time.c: In function 'time_init':
>>> arch/sh/kernel/time.c:42:2: error: implicit declaration of function 'timer_init'; did you mean 'time_init'? [-Werror=implicit-function-declaration]
>      timer_init();
>      ^~~~~~~~~~

Hmm, I fixed it locally, but Baolin forwarded the version from the
original submission that had the same bug (timer_init instead of timer_probe):

https://www.spinics.net/lists/linux-sh/msg52798.html

I'll just send the correct version once more.

      Arnd
--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
(Exiting) Baolin Wang July 25, 2018, 2:06 a.m. UTC | #3 
Hi Arnd,

On 25 July 2018 at 05:33, Arnd Bergmann <arnd@arndb.de> wrote:
> On Tue, Jul 24, 2018 at 7:07 PM, kbuild test robot <lkp@intel.com> wrote:
>> Hi Arnd,
>>
>> I love your patch! Yet something to improve:
>>
>> [auto build test ERROR on sof-driver-fuweitax/master]
>> [also build test ERROR on v4.18-rc6 next-20180724]
>> [if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
>>
>> url:    https://github.com/0day-ci/linux/commits/Baolin-Wang/sh-dreamcast-rtc-push-down-rtc-class-ops-into-driver/20180719-041209
>> base:   https://github.com/fuweitax/linux master
>> config: sh-rsk7264_defconfig (attached as .config)
>> compiler: sh4-linux-gnu-gcc (Debian 7.2.0-11) 7.2.0
>> reproduce:
>>         wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
>>         chmod +x ~/bin/make.cross
>>         # save the attached .config to linux build tree
>>         GCC_VERSION=7.2.0 make.cross ARCH=sh
>>
>> All errors (new ones prefixed by >>):
>>
>>    arch/sh/kernel/time.c: In function 'time_init':
>>>> arch/sh/kernel/time.c:42:2: error: implicit declaration of function 'timer_init'; did you mean 'time_init'? [-Werror=implicit-function-declaration]
>>      timer_init();
>>      ^~~~~~~~~~
>
> Hmm, I fixed it locally, but Baolin forwarded the version from the
> original submission that had the same bug (timer_init instead of timer_probe):
>
> https://www.spinics.net/lists/linux-sh/msg52798.html
>
> I'll just send the correct version once more.

I am sorry I missed your fixes, but thanks to resend them to remove
the last user of the obsolete read_persistent_clock().
diff mbox

Patch

diff --git a/Documentation/sh/new-machine.txt b/Documentation/sh/new-machine.txt
index f035416..e0961a66 100644
--- a/Documentation/sh/new-machine.txt
+++ b/Documentation/sh/new-machine.txt
@@ -116,7 +116,6 @@  might look something like:
  * arch/sh/boards/vapor/setup.c - Setup code for imaginary board
  */
 #include <linux/init.h>
-#include <asm/rtc.h> /* for board_time_init() */
 
 const char *get_system_type(void)
 {
@@ -132,13 +131,6 @@  int __init platform_setup(void)
 	 * this board.
 	 */
 
-  	/* 
-	 * Presume all FooTech boards have the same broken timer,
-	 * and also presume that we've defined foo_timer_init to
-	 * do something useful.
-	 */
-  	board_time_init = foo_timer_init;
-
 	/* Start-up imaginary PCI ... */
 
 	/* And whatever else ... */
diff --git a/arch/sh/boards/of-generic.c b/arch/sh/boards/of-generic.c
index 46b2481..ee74ff1 100644
--- a/arch/sh/boards/of-generic.c
+++ b/arch/sh/boards/of-generic.c
@@ -116,18 +116,10 @@  static void __init sh_of_mem_reserve(void)
 	early_init_fdt_scan_reserved_mem();
 }
 
-static void __init sh_of_time_init(void)
-{
-	pr_info("SH generic board support: scanning for clocksource devices\n");
-	timer_probe();
-}
-
 static void __init sh_of_setup(char **cmdline_p)
 {
 	struct device_node *root;
 
-	board_time_init = sh_of_time_init;
-
 	sh_mv.mv_name = "Unknown SH model";
 	root = of_find_node_by_path("/");
 	if (root) {
diff --git a/arch/sh/include/asm/rtc.h b/arch/sh/include/asm/rtc.h
index fe55fbb..69dbae2 100644
--- a/arch/sh/include/asm/rtc.h
+++ b/arch/sh/include/asm/rtc.h
@@ -3,7 +3,6 @@ 
 #define _ASM_RTC_H
 
 void time_init(void);
-extern void (*board_time_init)(void);
 
 #define RTC_CAP_4_DIGIT_YEAR	(1 << 0)
 
diff --git a/arch/sh/kernel/time.c b/arch/sh/kernel/time.c
index eb0a912..a29eb98 100644
--- a/arch/sh/kernel/time.c
+++ b/arch/sh/kernel/time.c
@@ -22,8 +22,6 @@ 
 #include <asm/clock.h>
 #include <asm/rtc.h>
 
-void (*board_time_init)(void);
-
 static void __init sh_late_time_init(void)
 {
 	/*
@@ -41,8 +39,7 @@  static void __init sh_late_time_init(void)
 
 void __init time_init(void)
 {
-	if (board_time_init)
-		board_time_init();
+	timer_init();
 
 	clk_init();