* [PATCH] clk: at91: Silence warnings and cleanup __init usage
@ 2015-07-06 19:31 Stephen Boyd
2015-07-06 20:38 ` Alexandre Belloni
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Boyd @ 2015-07-06 19:31 UTC (permalink / raw)
To: Mike Turquette, Stephen Boyd
Cc: linux-kernel, linux-clk, Boris BREZILLON, Alexandre Belloni
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 <boris.brezillon@free-electrons.com>
Cc: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
---
drivers/clk/at91/pmc.h | 56 ++++++++++++++++++++++----------------------------
1 file changed, 24 insertions(+), 32 deletions(-)
diff --git a/drivers/clk/at91/pmc.h b/drivers/clk/at91/pmc.h
index 69abb08cf146..0caad646583d 100644
--- a/drivers/clk/at91/pmc.h
+++ b/drivers/clk/at91/pmc.h
@@ -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_ */
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] clk: at91: Silence warnings and cleanup __init usage
2015-07-06 19:31 [PATCH] clk: at91: Silence warnings and cleanup __init usage Stephen Boyd
@ 2015-07-06 20:38 ` Alexandre Belloni
2015-07-06 21:37 ` Stephen Boyd
0 siblings, 1 reply; 6+ messages in thread
From: Alexandre Belloni @ 2015-07-06 20:38 UTC (permalink / raw)
To: Stephen Boyd; +Cc: Mike Turquette, linux-kernel, linux-clk, Boris BREZILLON
Hi,
On 06/07/2015 at 12:31:45 -0700, Stephen Boyd wrote :
> 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.
>
The main drawback of that removal is that it destroys the alignment
throughout the header file :)
--
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] clk: at91: Silence warnings and cleanup __init usage
2015-07-06 20:38 ` Alexandre Belloni
@ 2015-07-06 21:37 ` Stephen Boyd
2015-07-07 17:17 ` Alexandre Belloni
2015-07-07 17:54 ` Boris Brezillon
0 siblings, 2 replies; 6+ messages in thread
From: Stephen Boyd @ 2015-07-06 21:37 UTC (permalink / raw)
To: Alexandre Belloni
Cc: Mike Turquette, linux-kernel, linux-clk, Boris BREZILLON
On 07/06, Alexandre Belloni wrote:
> Hi,
>
> On 06/07/2015 at 12:31:45 -0700, Stephen Boyd wrote :
> > 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.
> >
>
> 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 <sboyd@codeaurora.org>
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?
Plus, using __init in function prototypes doesn't do anything, so
just drop it throughout this file.
Cc: Boris BREZILLON <boris.brezillon@free-electrons.com>
Cc: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
---
drivers/clk/at91/pmc.h | 120 +++++++++++++++++++++++--------------------------
1 file changed, 56 insertions(+), 64 deletions(-)
diff --git a/drivers/clk/at91/pmc.h b/drivers/clk/at91/pmc.h
index eb8e5dc9076d..619dd02554e6 100644
--- a/drivers/clk/at91/pmc.h
+++ b/drivers/clk/at91/pmc.h
@@ -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_ */
--
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] clk: at91: Silence warnings and cleanup __init usage
2015-07-06 21:37 ` Stephen Boyd
@ 2015-07-07 17:17 ` Alexandre Belloni
2015-07-07 17:54 ` Boris Brezillon
1 sibling, 0 replies; 6+ messages in thread
From: Alexandre Belloni @ 2015-07-07 17:17 UTC (permalink / raw)
To: Stephen Boyd; +Cc: Mike Turquette, linux-kernel, linux-clk, Boris BREZILLON
On 06/07/2015 at 14:37:59 -0700, Stephen Boyd wrote :
>
> Ok I can fix the alignment at the same time.
>
Thanks :)
> ---8<---
> From: Stephen Boyd <sboyd@codeaurora.org>
> 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?
>
> Plus, using __init in function prototypes doesn't do anything, so
> just drop it throughout this file.
>
> Cc: Boris BREZILLON <boris.brezillon@free-electrons.com>
> Cc: Alexandre Belloni <alexandre.belloni@free-electrons.com>
> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
--
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] clk: at91: Silence warnings and cleanup __init usage
2015-07-06 21:37 ` Stephen Boyd
2015-07-07 17:17 ` Alexandre Belloni
@ 2015-07-07 17:54 ` Boris Brezillon
2015-07-08 0:23 ` Stephen Boyd
1 sibling, 1 reply; 6+ messages in thread
From: Boris Brezillon @ 2015-07-07 17:54 UTC (permalink / raw)
To: Stephen Boyd; +Cc: Alexandre Belloni, Mike Turquette, linux-kernel, linux-clk
Hi Stephen,
On Mon, 6 Jul 2015 14:37:59 -0700
Stephen Boyd <sboyd@codeaurora.org> wrote:
> On 07/06, Alexandre Belloni wrote:
> > Hi,
> >
> > On 06/07/2015 at 12:31:45 -0700, Stephen Boyd wrote :
> > > 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.
> > >
> >
> > 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 <sboyd@codeaurora.org>
> 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?
>
> 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 <boris.brezillon@free-electrons.com>
Thanks,
Boris
>
> Cc: Boris BREZILLON <boris.brezillon@free-electrons.com>
> Cc: Alexandre Belloni <alexandre.belloni@free-electrons.com>
> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
> ---
> drivers/clk/at91/pmc.h | 120 +++++++++++++++++++++++--------------------------
> 1 file changed, 56 insertions(+), 64 deletions(-)
>
> diff --git a/drivers/clk/at91/pmc.h b/drivers/clk/at91/pmc.h
> index eb8e5dc9076d..619dd02554e6 100644
> --- a/drivers/clk/at91/pmc.h
> +++ b/drivers/clk/at91/pmc.h
> @@ -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_ */
>
--
Boris Brezillon, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] clk: at91: Silence warnings and cleanup __init usage
2015-07-07 17:54 ` Boris Brezillon
@ 2015-07-08 0:23 ` Stephen Boyd
0 siblings, 0 replies; 6+ messages in thread
From: Stephen Boyd @ 2015-07-08 0:23 UTC (permalink / raw)
To: Boris Brezillon
Cc: Alexandre Belloni, Mike Turquette, linux-kernel, linux-clk
On 07/07, Boris Brezillon wrote:
> Hi Stephen,
>
> On Mon, 6 Jul 2015 14:37:59 -0700
> Stephen Boyd <sboyd@codeaurora.org> wrote:
>
> > On 07/06, Alexandre Belloni wrote:
> > > Hi,
> > >
> > > On 06/07/2015 at 12:31:45 -0700, Stephen Boyd wrote :
> > > > 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.
> > > >
> > >
> > > 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 <sboyd@codeaurora.org>
> > 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?
> >
> > 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 <boris.brezillon@free-electrons.com>
>
Ok, I think we got a color match ;-)
-----8<-----
From: Stephen Boyd <sboyd@codeaurora.org>
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.
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 and extern in function prototypes doesn't do
anything, so just drop it throughout this file.
Acked-by: Boris BREZILLON <boris.brezillon@free-electrons.com>
Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
---
drivers/clk/at91/pmc.h | 124 +++++++++++++++++++++++--------------------------
1 file changed, 58 insertions(+), 66 deletions(-)
diff --git a/drivers/clk/at91/pmc.h b/drivers/clk/at91/pmc.h
index eb8e5dc9076d..8b87771c69b2 100644
--- a/drivers/clk/at91/pmc.h
+++ b/drivers/clk/at91/pmc.h
@@ -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_ */
--
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2015-07-08 0:23 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-07-06 19:31 [PATCH] clk: at91: Silence warnings and cleanup __init usage Stephen Boyd
2015-07-06 20:38 ` Alexandre Belloni
2015-07-06 21:37 ` Stephen Boyd
2015-07-07 17:17 ` Alexandre Belloni
2015-07-07 17:54 ` Boris Brezillon
2015-07-08 0:23 ` Stephen Boyd
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).