ARM: SoC: address -Wmissing-prototype warnings

From: Arnd Bergmann <[email protected]>

The davinci_cpufreq_init() declaration is only seen by its caller but not the definition:

drivers/cpufreq/davinci-cpufreq.c:153:12: error: no previous prototype for 'davinci_cpufreq_init'

Move it into the platform_data header that is already used an interface between the two places.

Signed-off-by Arnd Bergmann <[email protected]>

---
 arch/arm/mach-davinci/common.c                | 1 +
 arch/arm/mach-davinci/common.h                | 6 ------
 include/linux/platform_data/davinci-cpufreq.h | 6 ++++++
 3 files changed, 7 insertions(+), 6 deletions(-)

arch/arm/mach-davinci/common.c +1 -0

index c1ce6b2a8d48..7bc7018688de 100644
@@ -11,6 +11,7 @@
 #include <linux/etherdevice.h>
 #include <linux/davinci_emac.h>
 #include <linux/dma-mapping.h>
+#include <linux/platform_data/davinci-cpufreq.h>
 
 #include <asm/tlb.h>
 #include <asm/mach/map.h>

arch/arm/mach-davinci/common.h +0 -6

index b2a96cdf88da..010ba1df27b3 100644
@@ -55,12 +55,6 @@ extern void davinci_common_init(const struct davinci_soc_info *soc_info);
 extern void davinci_init_ide(void);
 void davinci_init_late(void);
 
-#ifdef CONFIG_CPU_FREQ
-int davinci_cpufreq_init(void);
-#else
-static inline int davinci_cpufreq_init(void) { return 0; }
-#endif
-
 #ifdef CONFIG_SUSPEND
 int davinci_pm_init(void);
 #else

include/linux/platform_data/davinci-cpufreq.h +6 -1

index bc208c64e3d7..1ef91c36f609 100644
@@ -16,4 +16,10 @@ struct davinci_cpufreq_config {
        int (*init)(void);
 };
 
+#ifdef CONFIG_CPU_FREQ
+int davinci_cpufreq_init(void);
+#else
+static inline int davinci_cpufreq_init(void) { return 0; }
+#endif
+
 #endif /* _MACH_DAVINCI_CPUFREQ_H */
--

2.39.2

From: Arnd Bergmann <[email protected]>

ep93xx_clocksource_read() is only called from the file it is declared in, while ep93xx_timer_init() is declared in a header that is not included here.

arch/arm/mach-ep93xx/timer-ep93xx.c:120:13: error: no previous prototype for 'ep93xx_timer_init' arch/arm/mach-ep93xx/timer-ep93xx.c:63:5: error: no previous prototype for 'ep93xx_clocksource_read'

Fixes 000bc17817bf ("ARM: ep93xx: switch to GENERIC_CLOCKEVENTS")

Signed-off-by Arnd Bergmann <[email protected]>

---
 arch/arm/mach-ep93xx/timer-ep93xx.c | 3 ++-

 1 file changed, 2 insertions(+), 1 deletion(-)

arch/arm/mach-ep93xx/timer-ep93xx.c +1 -0

index dd4b164d1831..a9efa7bc2fa1 100644
@@ -9,6 +9,7 @@
  #include <linux/io.h>
  #include <asm/mach/time.h>
  #include "soc.h"
+#include "platform.h"

/*************************************************************************
  * Timer handling for EP93xx

arch/arm/mach-ep93xx/timer-ep93xx.c +0 -0

@@ -60,7 +61,7 @@ static u64 notrace ep93xx_read_sched_clock(void)
         return ret;
  }

arch/arm/mach-ep93xx/timer-ep93xx.c +1 -1

-u64 ep93xx_clocksource_read(struct clocksource *c)
+static u64 ep93xx_clocksource_read(struct clocksource *c)

 {
        u64 ret;

From: Arnd Bergmann <[email protected]>

highbank_pm_init() is declared in core.h this is not included in the file that defines it.

arch/arm/mach-highbank/pm.c:43:13: error: no previous prototype for 'highbank_pm_init'

Signed-off-by Arnd Bergmann <[email protected]>

---
 arch/arm/mach-highbank/pm.c | 2 ++
 1 file changed, 2 insertions(+)

arch/arm/mach-highbank/pm.c +2 -0

index 561941baeda9..3fdbdb83113b 100644
@@ -12,6 +12,8 @@
 
 #include <uapi/linux/psci.h>
 
+#include "core.h"
+
 #define HIGHBANK_SUSPEND_PARAM \
 	((0 << PSCI_0_2_POWER_STATE_ID_SHIFT) | \
 	 (1 << PSCI_0_2_POWER_STATE_AFFL_SHIFT) | \

From: Arnd Bergmann <[email protected]>

This function has no prototype and no callers:

arm/mach-imx/cpu-imx25.c:43:5: error: no previous prototype for 'mx25_revision' [-Werror=missing-prototypes]

Signed-off-by Arnd Bergmann <[email protected]>

Quoted 7 lines · Arnd Bergmann

From: Arnd Bergmann <[email protected]>

This function has no prototype and no callers:

arm/mach-imx/cpu-imx25.c:43:5: error: no previous prototype for 'mx25_revision' [-Werror=missing-prototypes]

Quoted 1 line

Signed-off-by Arnd Bergmann <[email protected]>

Martin Kaiser sent a patch adding a user for this function:

https://lore.kernel.org/linux-arm-kernel/[email protected]/

It would be better to apply Martin's patch instead of removing mx25_revision().

I think either way is ok to address the warning. If we wanted to do this properly, the mx{25,27,31,35,5}_revision functions could all be removed and the logic hooked up to imx_set_soc_revision() in the same way that they already use mxc_set_cpu_type() for drivers/soc/imx/soc-imx.c.

I'll leave it up to you, if you want to merge Martin's patches or a replacement for the soc-imx driver through the imx tree for 6.5, I'll drop my patch from this series, otherwise I'll keep it for now and we can still do it better at later point.

Thus wrote Arnd Bergmann ([email protected]):

Quoted 9 lines

I think either way is ok to address the warning. If we wanted to do this properly, the mx{25,27,31,35,5}_revision functions could all be removed and the logic hooked up to imx_set_soc_revision() in the same way that they already use mxc_set_cpu_type() for drivers/soc/imx/soc-imx.c.

I'll leave it up to you, if you want to merge Martin's patches or a replacement for the soc-imx driver through the imx tree for 6.5, I'll drop my patch from this series, otherwise I'll keep it for now and we can still do it better at later point.

I suggest we merge my patches for imx25 first and then clean up all the older imx families to use the common functions.

I've just rebased the patches against today's linux-next. My understanding is that they have to go through the clk tree.

Quoted 7 lines

Quoted 4 lines

I'll leave it up to you, if you want to merge Martin's patches or a replacement for the soc-imx driver through the imx tree for 6.5, I'll drop my patch from this series, otherwise I'll keep it for now and we can still do it better at later point.

I suggest we merge my patches for imx25 first and then clean up all the older imx families to use the common functions.

Quoted 2 lines

I've just rebased the patches against today's linux-next. My understanding is that they have to go through the clk tree.

This never happened, right? I see that mx25_revision() is still in the tree without any users, so I can't easily turn on the warning by default yet. Should I just go ahead and remove it for 5.6, or do you expect to have your patch ready in time for the merge window?

From: Arnd Bergmann <[email protected]>

lpc32xx_loopback_set() is defined in linux/soc/nxp/lpc32xx-misc.h but this is not included before the function definition.

arch/arm/mach-lpc32xx/serial.c:63:6: error: no previous prototype for 'lpc32xx_loopback_set'

Signed-off-by Arnd Bergmann <[email protected]>

---
  arch/arm/mach-lpc32xx/serial.c | 1 +
  1 file changed, 1 insertion(+)

arch/arm/mach-lpc32xx/serial.c +0 -0

index 3e765c4bf986..3b1203db81b2 100644

From: Arnd Bergmann <[email protected]>

The omap_serial_wakeup_init() declaration is not visible where it is defined, so make sure "common.h" is included here, avoiding:

arch/arm/mach-omap1/serial.c:221:12: error: no previous prototype for 'omap_serial_wakeup_init' [-Werror=missing-prototypes]

Signed-off-by Arnd Bergmann <[email protected]>

---
 arch/arm/mach-omap1/serial.c | 1 +
 1 file changed, 1 insertion(+)

arch/arm/mach-omap1/serial.c +1 -0

index 96f59110d649..f25b94c86aec 100644
@@ -19,6 +19,7 @@
 
 #include <asm/mach-types.h>
 
+#include "common.h"
 #include "serial.h"
 #include "mux.h"
 #include "pm.h"

Signature · 1 line

2.39.2

Quoted 8 lines · Arnd Bergmann

From: Arnd Bergmann <[email protected]>

The omap_serial_wakeup_init() declaration is not visible where it is defined, so make sure "common.h" is included here, avoiding:

arch/arm/mach-omap1/serial.c:221:12: error: no previous prototype for 'omap_serial_wakeup_init' [-Werror=missing-prototypes]

Signed-off-by Arnd Bergmann <[email protected]>

Acked-by Aaro Koskinen <[email protected]>

Quoted 8 lines · Arnd Bergmann

From: Arnd Bergmann <[email protected]>

The omap_serial_wakeup_init() declaration is not visible where it is defined, so make sure "common.h" is included here, avoiding:

arch/arm/mach-omap1/serial.c:221:12: error: no previous prototype for 'omap_serial_wakeup_init' [-Werror=missing-prototypes]

Signed-off-by Arnd Bergmann <[email protected]>

Acked-by Aaro Koskinen <[email protected]>

From: Arnd Bergmann <[email protected]>

omap2 contains a hack to define tick_broadcast() on non-SMP configurations in place of the normal SMP definition. This one causes a warning because of a missing prototype:

arch/arm/mach-omap2/board-generic.c:44:6: error: no previous prototype for 'tick_broadcast'

Make sure to always include the header with the declaration.

Fixes d86ad463d670 ("ARM: OMAP2+: Fix regression for using local timer on non-SMP SoCs")

Signed-off-by Arnd Bergmann <[email protected]>

---
 arch/arm/mach-omap2/board-generic.c | 1 +
 1 file changed, 1 insertion(+)

arch/arm/mach-omap2/board-generic.c +1 -0

index 853409b341a3..7aa41841edd4 100644
@@ -13,6 +13,7 @@
 #include <linux/of_platform.h>
 #include <linux/irqdomain.h>
 #include <linux/clocksource.h>
+#include <linux/clockchips.h>
 
 #include <asm/setup.h>
 #include <asm/mach/arch.h>

Signature · 1 line

2.39.2

From: Arnd Bergmann <[email protected]>

The DT version of this board has a custom file with the gpio device. However, it does nothing because the d2net_init() has no caller or prototype:

arch/arm/mach-orion5x/board-d2net.c:101:13: error: no previous prototype for 'd2net_init'

Call it from the board-dt file as intended.

Fixes 94b0bd366e36 ("ARM: orion5x: convert d2net to Device Tree")

Cc [email protected]

Signed-off-by Arnd Bergmann <[email protected]>

From: Arnd Bergmann <[email protected]>

The PXA platform has a number of configurations that end up with a warning like these when building with W=1:

drivers/hwmon/max1111.c:83:5: error: no previous prototype for 'max1111_read_channel' [-Werror=missing-prototypes] arch/arm/mach-pxa/reset.c:86:6: error: no previous prototype for 'pxa_restart' [-Werror=missing-prototypes] arch/arm/mach-pxa/mfp-pxa2xx.c:254:5: error: no previous prototype for 'keypad_set_wake' [-Werror=missing-prototypes] drivers/clk/pxa/clk-pxa25x.c:70:14: error: no previous prototype for 'pxa25x_get_clk_frequency_khz' [-Werror=missing-prototypes] drivers/clk/pxa/clk-pxa25x.c:325:12: error: no previous prototype for 'pxa25x_clocks_init' [-Werror=missing-prototypes] drivers/clk/pxa/clk-pxa27x.c:74:14: error: no previous prototype for 'pxa27x_get_clk_frequency_khz' [-Werror=missing-prototypes] drivers/clk/pxa/clk-pxa27x.c:102:6: error: no previous prototype for 'pxa27x_is_ppll_disabled' [-Werror=missing-prototypes] drivers/clk/pxa/clk-pxa27x.c:470:12: error: no previous prototype for 'pxa27x_clocks_init' [-Werror=missing-prototypes] arch/arm/mach-pxa/pxa27x.c:44:6: error: no previous prototype for 'pxa27x_clear_otgph' [-Werror=missing-prototypes] arch/arm/mach-pxa/pxa27x.c:58:6: error: no previous prototype for 'pxa27x_configure_ac97reset' [-Werror=missing-prototypes] arch/arm/mach-pxa/spitz_pm.c:170:15: error: no previous prototype for 'spitzpm_read_devdata' [-Werror=missing-prototypes]

The problem is that there is a declaration for each of these, but it's only seen by the caller and not the callee. Moving these into appropriate header files ensures that both use the same calling conventions and it avoids the warnings.

Signed-off-by Arnd Bergmann <[email protected]>

---

From: Arnd Bergmann <[email protected]>

The PXA platform has a number of configurations that end up with a warning like these when building with W=1:

drivers/hwmon/max1111.c:83:5: error: no previous prototype for 'max1111_read_channel' [-Werror=missing-prototypes] arch/arm/mach-pxa/reset.c:86:6: error: no previous prototype for 'pxa_restart' [-Werror=missing-prototypes] arch/arm/mach-pxa/mfp-pxa2xx.c:254:5: error: no previous prototype for 'keypad_set_wake' [-Werror=missing-prototypes] drivers/clk/pxa/clk-pxa25x.c:70:14: error: no previous prototype for 'pxa25x_get_clk_frequency_khz' [-Werror=missing-prototypes] drivers/clk/pxa/clk-pxa25x.c:325:12: error: no previous prototype for 'pxa25x_clocks_init' [-Werror=missing-prototypes] drivers/clk/pxa/clk-pxa27x.c:74:14: error: no previous prototype for 'pxa27x_get_clk_frequency_khz' [-Werror=missing-prototypes] drivers/clk/pxa/clk-pxa27x.c:102:6: error: no previous prototype for 'pxa27x_is_ppll_disabled' [-Werror=missing-prototypes] drivers/clk/pxa/clk-pxa27x.c:470:12: error: no previous prototype for 'pxa27x_clocks_init' [-Werror=missing-prototypes] arch/arm/mach-pxa/pxa27x.c:44:6: error: no previous prototype for 'pxa27x_clear_otgph' [-Werror=missing-prototypes] arch/arm/mach-pxa/pxa27x.c:58:6: error: no previous prototype for 'pxa27x_configure_ac97reset' [-Werror=missing-prototypes] arch/arm/mach-pxa/spitz_pm.c:170:15: error: no previous prototype for 'spitzpm_read_devdata' [-Werror=missing-prototypes]

The problem is that there is a declaration for each of these, but it's only seen by the caller and not the callee. Moving these into appropriate header files ensures that both use the same calling conventions and it avoids the warnings.

Signed-off-by Arnd Bergmann <[email protected]>

From: Arnd Bergmann <[email protected]>

pl080_get_signal() and pl080_put_signal() are declared in pl080.h and defined in pl080.c, but this file is missing an include of the header:

arch/arm/mach-spear/pl080.c:27:5: error: no previous prototype for 'pl080_get_signal' arch/arm/mach-spear/pl080.c:62:6: error: no previous prototype for 'pl080_put_signal'

Signed-off-by Arnd Bergmann <[email protected]>

---
 arch/arm/mach-spear/pl080.c | 1 +
 1 file changed, 1 insertion(+)

arch/arm/mach-spear/pl080.c +0 -0

index d6b8627d2544..47243a8153d0 100644