clk: at91: Silence warnings and cleanup __init usage

PATCH In review Stephen Boyd 3 participants 6 messages Jul 6, 2015 – Jul 8, 2015

Subsystems (2)

Common clk Arm/Microchip (AT91) SoC support

lore

Share & tools

lore

Stephen Boyd

author

2015-07-06 19:31 UTC #0 lore raw

PATCH 1/1 clk: at91: Silence warnings and cleanup __init usage

Remove useless ifdefs around function prototypes to silence the following sparse warnings when the configs aren't enabled.

drivers/clk/at91/clk-h32mx.c:95:13: warning: symbol 'of_sama5d4_clk_h32mx_setup' was not declared. Should it be static?
drivers/clk/at91/clk-utmi.c:159:13: warning: symbol 'of_at91sam9x5_clk_utmi_setup' was not declared. Should it be static?

Plus, using __init in function prototypes doesn't do anything, so just drop it throughout this file.

Cc Boris BREZILLON <[email protected]>

Cc Alexandre Belloni <[email protected]>

Signed-off-by Stephen Boyd <[email protected]>

---
 drivers/clk/at91/pmc.h | 56 ++++++++++++++++++++++----------------------------
 1 file changed, 24 insertions(+), 32 deletions(-)

drivers/clk/at91/pmc.h +24 ~~-32~~

index 69abb08cf146..0caad646583d 100644
@@ -59,71 +59,63 @@ static inline void pmc_write(struct at91_pmc *pmc, int offset, u32 value)
 int of_at91_get_clk_range(struct device_node *np, const char *propname,
 			  struct clk_range *range);
 
-extern void __init of_at91sam9260_clk_slow_setup(struct device_node *np,
+extern void of_at91sam9260_clk_slow_setup(struct device_node *np,
 						 struct at91_pmc *pmc);
 
-extern void __init of_at91rm9200_clk_main_osc_setup(struct device_node *np,
+extern void of_at91rm9200_clk_main_osc_setup(struct device_node *np,
 						    struct at91_pmc *pmc);
-extern void __init of_at91sam9x5_clk_main_rc_osc_setup(struct device_node *np,
+extern void of_at91sam9x5_clk_main_rc_osc_setup(struct device_node *np,
 						       struct at91_pmc *pmc);
-extern void __init of_at91rm9200_clk_main_setup(struct device_node *np,
+extern void of_at91rm9200_clk_main_setup(struct device_node *np,
 						struct at91_pmc *pmc);
-extern void __init of_at91sam9x5_clk_main_setup(struct device_node *np,
+extern void of_at91sam9x5_clk_main_setup(struct device_node *np,
 						struct at91_pmc *pmc);
 
-extern void __init of_at91rm9200_clk_pll_setup(struct device_node *np,
+extern void of_at91rm9200_clk_pll_setup(struct device_node *np,
 					       struct at91_pmc *pmc);
-extern void __init of_at91sam9g45_clk_pll_setup(struct device_node *np,
+extern void of_at91sam9g45_clk_pll_setup(struct device_node *np,
 						struct at91_pmc *pmc);
-extern void __init of_at91sam9g20_clk_pllb_setup(struct device_node *np,
+extern void of_at91sam9g20_clk_pllb_setup(struct device_node *np,
 						 struct at91_pmc *pmc);
-extern void __init of_sama5d3_clk_pll_setup(struct device_node *np,
+extern void of_sama5d3_clk_pll_setup(struct device_node *np,
 					    struct at91_pmc *pmc);
-extern void __init of_at91sam9x5_clk_plldiv_setup(struct device_node *np,
+extern void of_at91sam9x5_clk_plldiv_setup(struct device_node *np,
 						  struct at91_pmc *pmc);
 
-extern void __init of_at91rm9200_clk_master_setup(struct device_node *np,
+extern void of_at91rm9200_clk_master_setup(struct device_node *np,
 						  struct at91_pmc *pmc);
-extern void __init of_at91sam9x5_clk_master_setup(struct device_node *np,
+extern void of_at91sam9x5_clk_master_setup(struct device_node *np,
 						  struct at91_pmc *pmc);
 
-extern void __init of_at91rm9200_clk_sys_setup(struct device_node *np,
+extern void of_at91rm9200_clk_sys_setup(struct device_node *np,
 					       struct at91_pmc *pmc);
 
-extern void __init of_at91rm9200_clk_periph_setup(struct device_node *np,
+extern void of_at91rm9200_clk_periph_setup(struct device_node *np,
 						  struct at91_pmc *pmc);
-extern void __init of_at91sam9x5_clk_periph_setup(struct device_node *np,
+extern void of_at91sam9x5_clk_periph_setup(struct device_node *np,
 						  struct at91_pmc *pmc);
 
-extern void __init of_at91rm9200_clk_prog_setup(struct device_node *np,
+extern void of_at91rm9200_clk_prog_setup(struct device_node *np,
 						struct at91_pmc *pmc);
-extern void __init of_at91sam9g45_clk_prog_setup(struct device_node *np,
+extern void of_at91sam9g45_clk_prog_setup(struct device_node *np,
 						 struct at91_pmc *pmc);
-extern void __init of_at91sam9x5_clk_prog_setup(struct device_node *np,
+extern void of_at91sam9x5_clk_prog_setup(struct device_node *np,
 						struct at91_pmc *pmc);
 
-#if defined(CONFIG_HAVE_AT91_UTMI)
-extern void __init of_at91sam9x5_clk_utmi_setup(struct device_node *np,
+extern void of_at91sam9x5_clk_utmi_setup(struct device_node *np,
 						struct at91_pmc *pmc);
-#endif
 
-#if defined(CONFIG_HAVE_AT91_USB_CLK)
-extern void __init of_at91rm9200_clk_usb_setup(struct device_node *np,
+extern void of_at91rm9200_clk_usb_setup(struct device_node *np,
 					       struct at91_pmc *pmc);
-extern void __init of_at91sam9x5_clk_usb_setup(struct device_node *np,
+extern void of_at91sam9x5_clk_usb_setup(struct device_node *np,
 					       struct at91_pmc *pmc);
-extern void __init of_at91sam9n12_clk_usb_setup(struct device_node *np,
+extern void of_at91sam9n12_clk_usb_setup(struct device_node *np,
 						struct at91_pmc *pmc);
-#endif
 
-#if defined(CONFIG_HAVE_AT91_SMD)
-extern void __init of_at91sam9x5_clk_smd_setup(struct device_node *np,
+extern void of_at91sam9x5_clk_smd_setup(struct device_node *np,
 					       struct at91_pmc *pmc);
-#endif
 
-#if defined(CONFIG_HAVE_AT91_SMD)
-extern void __init of_sama5d4_clk_h32mx_setup(struct device_node *np,
+extern void of_sama5d4_clk_h32mx_setup(struct device_node *np,
 					      struct at91_pmc *pmc);
-#endif
 
 #endif /* __PMC_H_ */

Signature · 2 lines

The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project

Alexandre Belloni

2015-07-06 20:38 UTC #1 lore raw

Hi,

Quoted 10 lines · Stephen Boyd

Remove useless ifdefs around function prototypes to silence the following sparse warnings when the configs aren't enabled.
drivers/clk/at91/clk-h32mx.c:95:13: warning: symbol 'of_sama5d4_clk_h32mx_setup' was not declared. Should it be static?
drivers/clk/at91/clk-utmi.c:159:13: warning: symbol 'of_at91sam9x5_clk_utmi_setup' was not declared. Should it be static?

Quoted 3 lines

Plus, using __init in function prototypes doesn't do anything, so just drop it throughout this file.

The main drawback of that removal is that it destroys the alignment throughout the header file :)

Signature · 3 lines

Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

Stephen Boyd

author

2015-07-06 21:37 UTC #2 lore raw

Quoted 13 lines · Alexandre Belloni

Hi,
Quoted 10 lines · Stephen Boyd
Remove useless ifdefs around function prototypes to silence the following sparse warnings when the configs aren't enabled.
drivers/clk/at91/clk-h32mx.c:95:13: warning: symbol 'of_sama5d4_clk_h32mx_setup' was not declared. Should it be static?
drivers/clk/at91/clk-utmi.c:159:13: warning: symbol 'of_at91sam9x5_clk_utmi_setup' was not declared. Should it be static?

Quoted 7 lines

Quoted 3 lines
Plus, using __init in function prototypes doesn't do anything, so just drop it throughout this file.
The main drawback of that removal is that it destroys the alignment throughout the header file :)

Ok I can fix the alignment at the same time.

---8<---
From: Stephen Boyd <[email protected]>
Subject: [PATCH] clk: at91: Silence warnings and cleanup __init usage

Remove useless ifdefs around function prototypes to silence the following sparse warnings when the configs aren't enabled.

Plus, using __init in function prototypes doesn't do anything, so just drop it throughout this file.

Cc Boris BREZILLON <[email protected]>

Cc Alexandre Belloni <[email protected]>

Signed-off-by Stephen Boyd <[email protected]>

---
 drivers/clk/at91/pmc.h | 120 +++++++++++++++++++++++--------------------------
 1 file changed, 56 insertions(+), 64 deletions(-)

drivers/clk/at91/pmc.h +56 ~~-64~~

index eb8e5dc9076d..619dd02554e6 100644
@@ -59,71 +59,63 @@ static inline void pmc_write(struct at91_pmc *pmc, int offset, u32 value)
 int of_at91_get_clk_range(struct device_node *np, const char *propname,
 			  struct clk_range *range);
 
-extern void __init of_at91sam9260_clk_slow_setup(struct device_node *np,
-						 struct at91_pmc *pmc);
-
-extern void __init of_at91rm9200_clk_main_osc_setup(struct device_node *np,
-						    struct at91_pmc *pmc);
-extern void __init of_at91sam9x5_clk_main_rc_osc_setup(struct device_node *np,
-						       struct at91_pmc *pmc);
-extern void __init of_at91rm9200_clk_main_setup(struct device_node *np,
-						struct at91_pmc *pmc);
-extern void __init of_at91sam9x5_clk_main_setup(struct device_node *np,
-						struct at91_pmc *pmc);
+extern void of_at91sam9260_clk_slow_setup(struct device_node *np,
+					  struct at91_pmc *pmc);
 
-extern void __init of_at91rm9200_clk_pll_setup(struct device_node *np,
-					       struct at91_pmc *pmc);
-extern void __init of_at91sam9g45_clk_pll_setup(struct device_node *np,
-						struct at91_pmc *pmc);
-extern void __init of_at91sam9g20_clk_pllb_setup(struct device_node *np,
-						 struct at91_pmc *pmc);
-extern void __init of_sama5d3_clk_pll_setup(struct device_node *np,
-					    struct at91_pmc *pmc);
-extern void __init of_at91sam9x5_clk_plldiv_setup(struct device_node *np,
-						  struct at91_pmc *pmc);
-
-extern void __init of_at91rm9200_clk_master_setup(struct device_node *np,
-						  struct at91_pmc *pmc);
-extern void __init of_at91sam9x5_clk_master_setup(struct device_node *np,
-						  struct at91_pmc *pmc);
-
-extern void __init of_at91rm9200_clk_sys_setup(struct device_node *np,
-					       struct at91_pmc *pmc);
-
-extern void __init of_at91rm9200_clk_periph_setup(struct device_node *np,
-						  struct at91_pmc *pmc);
-extern void __init of_at91sam9x5_clk_periph_setup(struct device_node *np,
-						  struct at91_pmc *pmc);
-
-extern void __init of_at91rm9200_clk_prog_setup(struct device_node *np,
+extern void of_at91rm9200_clk_main_osc_setup(struct device_node *np,
+					     struct at91_pmc *pmc);
+extern void of_at91sam9x5_clk_main_rc_osc_setup(struct device_node *np,
 						struct at91_pmc *pmc);
-extern void __init of_at91sam9g45_clk_prog_setup(struct device_node *np,
-						 struct at91_pmc *pmc);
-extern void __init of_at91sam9x5_clk_prog_setup(struct device_node *np,
-						struct at91_pmc *pmc);
-
-#if defined(CONFIG_HAVE_AT91_UTMI)
-extern void __init of_at91sam9x5_clk_utmi_setup(struct device_node *np,
-						struct at91_pmc *pmc);
-#endif
-
-#if defined(CONFIG_HAVE_AT91_USB_CLK)
-extern void __init of_at91rm9200_clk_usb_setup(struct device_node *np,
-					       struct at91_pmc *pmc);
-extern void __init of_at91sam9x5_clk_usb_setup(struct device_node *np,
-					       struct at91_pmc *pmc);
-extern void __init of_at91sam9n12_clk_usb_setup(struct device_node *np,
-						struct at91_pmc *pmc);
-#endif
-
-#if defined(CONFIG_HAVE_AT91_SMD)
-extern void __init of_at91sam9x5_clk_smd_setup(struct device_node *np,
-					       struct at91_pmc *pmc);
-#endif
-
-#if defined(CONFIG_HAVE_AT91_H32MX)
-extern void __init of_sama5d4_clk_h32mx_setup(struct device_node *np,
-					      struct at91_pmc *pmc);
-#endif
+extern void of_at91rm9200_clk_main_setup(struct device_node *np,
+					 struct at91_pmc *pmc);
+extern void of_at91sam9x5_clk_main_setup(struct device_node *np,
+					 struct at91_pmc *pmc);
+
+extern void of_at91rm9200_clk_pll_setup(struct device_node *np,
+					struct at91_pmc *pmc);
+extern void of_at91sam9g45_clk_pll_setup(struct device_node *np,
+					 struct at91_pmc *pmc);
+extern void of_at91sam9g20_clk_pllb_setup(struct device_node *np,
+					  struct at91_pmc *pmc);
+extern void of_sama5d3_clk_pll_setup(struct device_node *np,
+				     struct at91_pmc *pmc);
+extern void of_at91sam9x5_clk_plldiv_setup(struct device_node *np,
+					   struct at91_pmc *pmc);
+
+extern void of_at91rm9200_clk_master_setup(struct device_node *np,
+					   struct at91_pmc *pmc);
+extern void of_at91sam9x5_clk_master_setup(struct device_node *np,
+					   struct at91_pmc *pmc);
+
+extern void of_at91rm9200_clk_sys_setup(struct device_node *np,
+					struct at91_pmc *pmc);
+
+extern void of_at91rm9200_clk_periph_setup(struct device_node *np,
+					   struct at91_pmc *pmc);
+extern void of_at91sam9x5_clk_periph_setup(struct device_node *np,
+					   struct at91_pmc *pmc);
+
+extern void of_at91rm9200_clk_prog_setup(struct device_node *np,
+					 struct at91_pmc *pmc);
+extern void of_at91sam9g45_clk_prog_setup(struct device_node *np,
+					  struct at91_pmc *pmc);
+extern void of_at91sam9x5_clk_prog_setup(struct device_node *np,
+					 struct at91_pmc *pmc);
+
+extern void of_at91sam9x5_clk_utmi_setup(struct device_node *np,
+					 struct at91_pmc *pmc);
+
+extern void of_at91rm9200_clk_usb_setup(struct device_node *np,
+					struct at91_pmc *pmc);
+extern void of_at91sam9x5_clk_usb_setup(struct device_node *np,
+					struct at91_pmc *pmc);
+extern void of_at91sam9n12_clk_usb_setup(struct device_node *np,
+					 struct at91_pmc *pmc);
+
+extern void of_at91sam9x5_clk_smd_setup(struct device_node *np,
+					struct at91_pmc *pmc);
+
+extern void of_sama5d4_clk_h32mx_setup(struct device_node *np,
+				       struct at91_pmc *pmc);
 
 #endif /* __PMC_H_ */

Signature · 2 lines

Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project

Alexandre Belloni

Acked-by

2015-07-07 17:17 UTC #3 lore raw

Quoted 3 lines · Stephen Boyd

Ok I can fix the alignment at the same time.

Thanks :)

Quoted 14 lines

---8<---
From: Stephen Boyd <[email protected]>
Subject: [PATCH] clk: at91: Silence warnings and cleanup __init usage
Remove useless ifdefs around function prototypes to silence the following sparse warnings when the configs aren't enabled.
drivers/clk/at91/clk-h32mx.c:95:13: warning: symbol 'of_sama5d4_clk_h32mx_setup' was not declared. Should it be static?
drivers/clk/at91/clk-utmi.c:159:13: warning: symbol 'of_at91sam9x5_clk_utmi_setup' was not declared. Should it be static?

Quoted 6 lines

Plus, using __init in function prototypes doesn't do anything, so just drop it throughout this file.
Cc Boris BREZILLON <[email protected]>
Cc Alexandre Belloni <[email protected]>
Signed-off-by Stephen Boyd <[email protected]>

Acked-by Alexandre Belloni <[email protected]>

Signature · 3 lines

Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

Boris Brezillon

Acked-by

2015-07-07 17:54 UTC #4 lore raw

In reply to Stephen Boyd

Hi Stephen,

Quoted 38 lines · On Mon, 6 Jul 2015 14:37:59 -0700 Stephen Boyd <[email protected]> wrote:

Quoted 13 lines · Alexandre Belloni
Hi,
Quoted 10 lines · Stephen Boyd
Remove useless ifdefs around function prototypes to silence the following sparse warnings when the configs aren't enabled.
drivers/clk/at91/clk-h32mx.c:95:13: warning: symbol 'of_sama5d4_clk_h32mx_setup' was not declared. Should it be static?
drivers/clk/at91/clk-utmi.c:159:13: warning: symbol 'of_at91sam9x5_clk_utmi_setup' was not declared. Should it be static?
Quoted 7 lines
Quoted 3 lines
Plus, using __init in function prototypes doesn't do anything, so just drop it throughout this file.
The main drawback of that removal is that it destroys the alignment throughout the header file :)
Ok I can fix the alignment at the same time.
---8<---
From: Stephen Boyd <[email protected]>
Subject: [PATCH] clk: at91: Silence warnings and cleanup __init usage
Remove useless ifdefs around function prototypes to silence the following sparse warnings when the configs aren't enabled.
drivers/clk/at91/clk-h32mx.c:95:13: warning: symbol 'of_sama5d4_clk_h32mx_setup' was not declared. Should it be static?
drivers/clk/at91/clk-utmi.c:159:13: warning: symbol 'of_at91sam9x5_clk_utmi_setup' was not declared. Should it be static?

Quoted 2 lines

Plus, using __init in function prototypes doesn't do anything, so just drop it throughout this file.

I think we should also drop the useless extern keywords. Otherwise,

Acked-by Boris Brezillon <[email protected]>

Thanks,

Boris

Quoted 141 lines

Cc Boris BREZILLON <[email protected]>

Cc Alexandre Belloni <[email protected]>

Signed-off-by Stephen Boyd <[email protected]>

---
 drivers/clk/at91/pmc.h | 120 +++++++++++++++++++++++--------------------------
 1 file changed, 56 insertions(+), 64 deletions(-)

drivers/clk/at91/pmc.h +56 ~~-64~~

index eb8e5dc9076d..619dd02554e6 100644
@@ -59,71 +59,63 @@ static inline void pmc_write(struct at91_pmc *pmc, int offset, u32 value)
 int of_at91_get_clk_range(struct device_node *np, const char *propname,
 			  struct clk_range *range);
 
-extern void __init of_at91sam9260_clk_slow_setup(struct device_node *np,
-						 struct at91_pmc *pmc);
-
-extern void __init of_at91rm9200_clk_main_osc_setup(struct device_node *np,
-						    struct at91_pmc *pmc);
-extern void __init of_at91sam9x5_clk_main_rc_osc_setup(struct device_node *np,
-						       struct at91_pmc *pmc);
-extern void __init of_at91rm9200_clk_main_setup(struct device_node *np,
-						struct at91_pmc *pmc);
-extern void __init of_at91sam9x5_clk_main_setup(struct device_node *np,
-						struct at91_pmc *pmc);
+extern void of_at91sam9260_clk_slow_setup(struct device_node *np,
+					  struct at91_pmc *pmc);
 
-extern void __init of_at91rm9200_clk_pll_setup(struct device_node *np,
-					       struct at91_pmc *pmc);
-extern void __init of_at91sam9g45_clk_pll_setup(struct device_node *np,
-						struct at91_pmc *pmc);
-extern void __init of_at91sam9g20_clk_pllb_setup(struct device_node *np,
-						 struct at91_pmc *pmc);
-extern void __init of_sama5d3_clk_pll_setup(struct device_node *np,
-					    struct at91_pmc *pmc);
-extern void __init of_at91sam9x5_clk_plldiv_setup(struct device_node *np,
-						  struct at91_pmc *pmc);
-
-extern void __init of_at91rm9200_clk_master_setup(struct device_node *np,
-						  struct at91_pmc *pmc);
-extern void __init of_at91sam9x5_clk_master_setup(struct device_node *np,
-						  struct at91_pmc *pmc);
-
-extern void __init of_at91rm9200_clk_sys_setup(struct device_node *np,
-					       struct at91_pmc *pmc);
-
-extern void __init of_at91rm9200_clk_periph_setup(struct device_node *np,
-						  struct at91_pmc *pmc);
-extern void __init of_at91sam9x5_clk_periph_setup(struct device_node *np,
-						  struct at91_pmc *pmc);
-
-extern void __init of_at91rm9200_clk_prog_setup(struct device_node *np,
+extern void of_at91rm9200_clk_main_osc_setup(struct device_node *np,
+					     struct at91_pmc *pmc);
+extern void of_at91sam9x5_clk_main_rc_osc_setup(struct device_node *np,
 						struct at91_pmc *pmc);
-extern void __init of_at91sam9g45_clk_prog_setup(struct device_node *np,
-						 struct at91_pmc *pmc);
-extern void __init of_at91sam9x5_clk_prog_setup(struct device_node *np,
-						struct at91_pmc *pmc);
-
-#if defined(CONFIG_HAVE_AT91_UTMI)
-extern void __init of_at91sam9x5_clk_utmi_setup(struct device_node *np,
-						struct at91_pmc *pmc);
-#endif
-
-#if defined(CONFIG_HAVE_AT91_USB_CLK)
-extern void __init of_at91rm9200_clk_usb_setup(struct device_node *np,
-					       struct at91_pmc *pmc);
-extern void __init of_at91sam9x5_clk_usb_setup(struct device_node *np,
-					       struct at91_pmc *pmc);
-extern void __init of_at91sam9n12_clk_usb_setup(struct device_node *np,
-						struct at91_pmc *pmc);
-#endif
-
-#if defined(CONFIG_HAVE_AT91_SMD)
-extern void __init of_at91sam9x5_clk_smd_setup(struct device_node *np,
-					       struct at91_pmc *pmc);
-#endif
-
-#if defined(CONFIG_HAVE_AT91_H32MX)
-extern void __init of_sama5d4_clk_h32mx_setup(struct device_node *np,
-					      struct at91_pmc *pmc);
-#endif
+extern void of_at91rm9200_clk_main_setup(struct device_node *np,
+					 struct at91_pmc *pmc);
+extern void of_at91sam9x5_clk_main_setup(struct device_node *np,
+					 struct at91_pmc *pmc);
+
+extern void of_at91rm9200_clk_pll_setup(struct device_node *np,
+					struct at91_pmc *pmc);
+extern void of_at91sam9g45_clk_pll_setup(struct device_node *np,
+					 struct at91_pmc *pmc);
+extern void of_at91sam9g20_clk_pllb_setup(struct device_node *np,
+					  struct at91_pmc *pmc);
+extern void of_sama5d3_clk_pll_setup(struct device_node *np,
+				     struct at91_pmc *pmc);
+extern void of_at91sam9x5_clk_plldiv_setup(struct device_node *np,
+					   struct at91_pmc *pmc);
+
+extern void of_at91rm9200_clk_master_setup(struct device_node *np,
+					   struct at91_pmc *pmc);
+extern void of_at91sam9x5_clk_master_setup(struct device_node *np,
+					   struct at91_pmc *pmc);
+
+extern void of_at91rm9200_clk_sys_setup(struct device_node *np,
+					struct at91_pmc *pmc);
+
+extern void of_at91rm9200_clk_periph_setup(struct device_node *np,
+					   struct at91_pmc *pmc);
+extern void of_at91sam9x5_clk_periph_setup(struct device_node *np,
+					   struct at91_pmc *pmc);
+
+extern void of_at91rm9200_clk_prog_setup(struct device_node *np,
+					 struct at91_pmc *pmc);
+extern void of_at91sam9g45_clk_prog_setup(struct device_node *np,
+					  struct at91_pmc *pmc);
+extern void of_at91sam9x5_clk_prog_setup(struct device_node *np,
+					 struct at91_pmc *pmc);
+
+extern void of_at91sam9x5_clk_utmi_setup(struct device_node *np,
+					 struct at91_pmc *pmc);
+
+extern void of_at91rm9200_clk_usb_setup(struct device_node *np,
+					struct at91_pmc *pmc);
+extern void of_at91sam9x5_clk_usb_setup(struct device_node *np,
+					struct at91_pmc *pmc);
+extern void of_at91sam9n12_clk_usb_setup(struct device_node *np,
+					 struct at91_pmc *pmc);
+
+extern void of_at91sam9x5_clk_smd_setup(struct device_node *np,
+					struct at91_pmc *pmc);
+
+extern void of_sama5d4_clk_h32mx_setup(struct device_node *np,
+				       struct at91_pmc *pmc);
 
 #endif /* __PMC_H_ */

Signature · 3 lines

Boris Brezillon, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

Stephen Boyd

author Acked-by Boris BREZILLON Acked-by Alexandre Belloni

2015-07-08 00:23 UTC #5 lore raw

Quoted 43 lines · Boris Brezillon

Hi Stephen,
Quoted 38 lines · On Mon, 6 Jul 2015 14:37:59 -0700 Stephen Boyd <[email protected]> wrote:
Quoted 13 lines · Alexandre Belloni
Hi,
Quoted 10 lines · Stephen Boyd
Remove useless ifdefs around function prototypes to silence the following sparse warnings when the configs aren't enabled.
drivers/clk/at91/clk-h32mx.c:95:13: warning: symbol 'of_sama5d4_clk_h32mx_setup' was not declared. Should it be static?
drivers/clk/at91/clk-utmi.c:159:13: warning: symbol 'of_at91sam9x5_clk_utmi_setup' was not declared. Should it be static?
Quoted 7 lines
Quoted 3 lines
Plus, using __init in function prototypes doesn't do anything, so just drop it throughout this file.
The main drawback of that removal is that it destroys the alignment throughout the header file :)
Ok I can fix the alignment at the same time.
---8<---
From: Stephen Boyd <[email protected]>
Subject: [PATCH] clk: at91: Silence warnings and cleanup __init usage
Remove useless ifdefs around function prototypes to silence the following sparse warnings when the configs aren't enabled.
drivers/clk/at91/clk-h32mx.c:95:13: warning: symbol 'of_sama5d4_clk_h32mx_setup' was not declared. Should it be static?
drivers/clk/at91/clk-utmi.c:159:13: warning: symbol 'of_at91sam9x5_clk_utmi_setup' was not declared. Should it be static?

Quoted 8 lines

Quoted 2 lines
Plus, using __init in function prototypes doesn't do anything, so just drop it throughout this file.
I think we should also drop the useless extern keywords. Otherwise,
Acked-by Boris Brezillon <[email protected]>

Ok, I think we got a color match ;-)

-----8<-----
From: Stephen Boyd <[email protected]>
Subject: [PATCH] clk: at91: Silence warnings and cleanup __init/extern usage

Remove useless ifdefs around function prototypes to silence the following sparse warnings when the configs aren't enabled.

Plus, using __init and extern in function prototypes doesn't do anything, so just drop it throughout this file.

Acked-by Boris BREZILLON <[email protected]>

Acked-by Alexandre Belloni <[email protected]>

Signed-off-by Stephen Boyd <[email protected]>

---
 drivers/clk/at91/pmc.h | 124 +++++++++++++++++++++++--------------------------
 1 file changed, 58 insertions(+), 66 deletions(-)

drivers/clk/at91/pmc.h +58 ~~-66~~

index eb8e5dc9076d..8b87771c69b2 100644
@@ -59,71 +59,63 @@ static inline void pmc_write(struct at91_pmc *pmc, int offset, u32 value)
 int of_at91_get_clk_range(struct device_node *np, const char *propname,
 			  struct clk_range *range);
 
-extern void __init of_at91sam9260_clk_slow_setup(struct device_node *np,
-						 struct at91_pmc *pmc);
-
-extern void __init of_at91rm9200_clk_main_osc_setup(struct device_node *np,
-						    struct at91_pmc *pmc);
-extern void __init of_at91sam9x5_clk_main_rc_osc_setup(struct device_node *np,
-						       struct at91_pmc *pmc);
-extern void __init of_at91rm9200_clk_main_setup(struct device_node *np,
-						struct at91_pmc *pmc);
-extern void __init of_at91sam9x5_clk_main_setup(struct device_node *np,
-						struct at91_pmc *pmc);
-
-extern void __init of_at91rm9200_clk_pll_setup(struct device_node *np,
-					       struct at91_pmc *pmc);
-extern void __init of_at91sam9g45_clk_pll_setup(struct device_node *np,
-						struct at91_pmc *pmc);
-extern void __init of_at91sam9g20_clk_pllb_setup(struct device_node *np,
-						 struct at91_pmc *pmc);
-extern void __init of_sama5d3_clk_pll_setup(struct device_node *np,
-					    struct at91_pmc *pmc);
-extern void __init of_at91sam9x5_clk_plldiv_setup(struct device_node *np,
-						  struct at91_pmc *pmc);
-
-extern void __init of_at91rm9200_clk_master_setup(struct device_node *np,
-						  struct at91_pmc *pmc);
-extern void __init of_at91sam9x5_clk_master_setup(struct device_node *np,
-						  struct at91_pmc *pmc);
-
-extern void __init of_at91rm9200_clk_sys_setup(struct device_node *np,
-					       struct at91_pmc *pmc);
-
-extern void __init of_at91rm9200_clk_periph_setup(struct device_node *np,
-						  struct at91_pmc *pmc);
-extern void __init of_at91sam9x5_clk_periph_setup(struct device_node *np,
-						  struct at91_pmc *pmc);
-
-extern void __init of_at91rm9200_clk_prog_setup(struct device_node *np,
-						struct at91_pmc *pmc);
-extern void __init of_at91sam9g45_clk_prog_setup(struct device_node *np,
-						 struct at91_pmc *pmc);
-extern void __init of_at91sam9x5_clk_prog_setup(struct device_node *np,
-						struct at91_pmc *pmc);
-
-#if defined(CONFIG_HAVE_AT91_UTMI)
-extern void __init of_at91sam9x5_clk_utmi_setup(struct device_node *np,
-						struct at91_pmc *pmc);
-#endif
-
-#if defined(CONFIG_HAVE_AT91_USB_CLK)
-extern void __init of_at91rm9200_clk_usb_setup(struct device_node *np,
-					       struct at91_pmc *pmc);
-extern void __init of_at91sam9x5_clk_usb_setup(struct device_node *np,
-					       struct at91_pmc *pmc);
-extern void __init of_at91sam9n12_clk_usb_setup(struct device_node *np,
-						struct at91_pmc *pmc);
-#endif
-
-#if defined(CONFIG_HAVE_AT91_SMD)
-extern void __init of_at91sam9x5_clk_smd_setup(struct device_node *np,
-					       struct at91_pmc *pmc);
-#endif
-
-#if defined(CONFIG_HAVE_AT91_H32MX)
-extern void __init of_sama5d4_clk_h32mx_setup(struct device_node *np,
-					      struct at91_pmc *pmc);
-#endif
+void of_at91sam9260_clk_slow_setup(struct device_node *np,
+				   struct at91_pmc *pmc);
+
+void of_at91rm9200_clk_main_osc_setup(struct device_node *np,
+				      struct at91_pmc *pmc);
+void of_at91sam9x5_clk_main_rc_osc_setup(struct device_node *np,
+					 struct at91_pmc *pmc);
+void of_at91rm9200_clk_main_setup(struct device_node *np,
+				  struct at91_pmc *pmc);
+void of_at91sam9x5_clk_main_setup(struct device_node *np,
+				  struct at91_pmc *pmc);
+
+void of_at91rm9200_clk_pll_setup(struct device_node *np,
+				 struct at91_pmc *pmc);
+void of_at91sam9g45_clk_pll_setup(struct device_node *np,
+				  struct at91_pmc *pmc);
+void of_at91sam9g20_clk_pllb_setup(struct device_node *np,
+				   struct at91_pmc *pmc);
+void of_sama5d3_clk_pll_setup(struct device_node *np,
+			      struct at91_pmc *pmc);
+void of_at91sam9x5_clk_plldiv_setup(struct device_node *np,
+				    struct at91_pmc *pmc);
+
+void of_at91rm9200_clk_master_setup(struct device_node *np,
+				    struct at91_pmc *pmc);
+void of_at91sam9x5_clk_master_setup(struct device_node *np,
+				    struct at91_pmc *pmc);
+
+void of_at91rm9200_clk_sys_setup(struct device_node *np,
+				 struct at91_pmc *pmc);
+
+void of_at91rm9200_clk_periph_setup(struct device_node *np,
+				    struct at91_pmc *pmc);
+void of_at91sam9x5_clk_periph_setup(struct device_node *np,
+				    struct at91_pmc *pmc);
+
+void of_at91rm9200_clk_prog_setup(struct device_node *np,
+				  struct at91_pmc *pmc);
+void of_at91sam9g45_clk_prog_setup(struct device_node *np,
+				   struct at91_pmc *pmc);
+void of_at91sam9x5_clk_prog_setup(struct device_node *np,
+				  struct at91_pmc *pmc);
+
+void of_at91sam9x5_clk_utmi_setup(struct device_node *np,
+				  struct at91_pmc *pmc);
+
+void of_at91rm9200_clk_usb_setup(struct device_node *np,
+				 struct at91_pmc *pmc);
+void of_at91sam9x5_clk_usb_setup(struct device_node *np,
+				 struct at91_pmc *pmc);
+void of_at91sam9n12_clk_usb_setup(struct device_node *np,
+				  struct at91_pmc *pmc);
+
+void of_at91sam9x5_clk_smd_setup(struct device_node *np,
+				 struct at91_pmc *pmc);
+
+void of_sama5d4_clk_h32mx_setup(struct device_node *np,
+				struct at91_pmc *pmc);
 
 #endif /* __PMC_H_ */

Signature · 2 lines

Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project