Patchwork clocksource: dw_apb_timer_of: Mark a few more functions as __init

login
register
mail settings
Submitter Uwe Kleine-König
Date Oct. 1, 2013, 8:38 a.m.
Message ID <1380616692-10253-1-git-send-email-u.kleine-koenig@pengutronix.de>
Download mbox | patch
Permalink /patch/279373/
State New
Headers show

Comments

Uwe Kleine-König - Oct. 1, 2013, 8:38 a.m.
These are all only called by dw_apb_timer_init which is an __init
function, too

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
 drivers/clocksource/dw_apb_timer_of.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
Baruch Siach - Oct. 1, 2013, 9:01 a.m.
Hi Uwe,

On Tue, Oct 01, 2013 at 10:38:12AM +0200, Uwe Kleine-König wrote:
> These are all only called by dw_apb_timer_init which is an __init
> function, too
> 
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> ---
>  drivers/clocksource/dw_apb_timer_of.c | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/clocksource/dw_apb_timer_of.c b/drivers/clocksource/dw_apb_timer_of.c
> index 4cbae4f..993cdde 100644
> --- a/drivers/clocksource/dw_apb_timer_of.c
> +++ b/drivers/clocksource/dw_apb_timer_of.c
> @@ -23,7 +23,7 @@
>  #include <linux/clk.h>
>  #include <linux/sched_clock.h>
>  
> -static void timer_get_base_and_rate(struct device_node *np,
> +static void __init timer_get_base_and_rate(struct device_node *np,
>  				    void __iomem **base, u32 *rate)
>  {
>  	struct clk *timer_clk;
> @@ -55,11 +55,11 @@ static void timer_get_base_and_rate(struct device_node *np,
>  
>  try_clock_freq:
>  	if (of_property_read_u32(np, "clock-freq", rate) &&
> -		of_property_read_u32(np, "clock-frequency", rate))
> +	    of_property_read_u32(np, "clock-frequency", rate))

Unintended whitespace change?

baruch

>  		panic("No clock nor clock-frequency property for %s", np->name);
>  }
>  
> -static void add_clockevent(struct device_node *event_timer)
> +static void __init add_clockevent(struct device_node *event_timer)
>  {
>  	void __iomem *iobase;
>  	struct dw_apb_clock_event_device *ced;
> @@ -82,7 +82,7 @@ static void add_clockevent(struct device_node *event_timer)
>  static void __iomem *sched_io_base;
>  static u32 sched_rate;
>  
> -static void add_clocksource(struct device_node *source_timer)
> +static void __init add_clocksource(struct device_node *source_timer)
>  {
>  	void __iomem *iobase;
>  	struct dw_apb_clocksource *cs;
> @@ -117,7 +117,7 @@ static const struct of_device_id sptimer_ids[] __initconst = {
>  	{ /* Sentinel */ },
>  };
>  
> -static void init_sched_clock(void)
> +static void __init init_sched_clock(void)
>  {
>  	struct device_node *sched_timer;
>  
> -- 
> 1.8.4.rc3
Uwe Kleine-König - Oct. 1, 2013, 9:11 a.m.
Hello Baruch,

On Tue, Oct 01, 2013 at 12:01:08PM +0300, Baruch Siach wrote:
> On Tue, Oct 01, 2013 at 10:38:12AM +0200, Uwe Kleine-König wrote:
> > These are all only called by dw_apb_timer_init which is an __init
> > function, too
> > 
> > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> > ---
> >  drivers/clocksource/dw_apb_timer_of.c | 10 +++++-----
> >  1 file changed, 5 insertions(+), 5 deletions(-)
> > 
> > diff --git a/drivers/clocksource/dw_apb_timer_of.c b/drivers/clocksource/dw_apb_timer_of.c
> > index 4cbae4f..993cdde 100644
> > --- a/drivers/clocksource/dw_apb_timer_of.c
> > +++ b/drivers/clocksource/dw_apb_timer_of.c
> > @@ -23,7 +23,7 @@
> >  #include <linux/clk.h>
> >  #include <linux/sched_clock.h>
> >  
> > -static void timer_get_base_and_rate(struct device_node *np,
> > +static void __init timer_get_base_and_rate(struct device_node *np,
> >  				    void __iomem **base, u32 *rate)
> >  {
> >  	struct clk *timer_clk;
> > @@ -55,11 +55,11 @@ static void timer_get_base_and_rate(struct device_node *np,
> >  
> >  try_clock_freq:
> >  	if (of_property_read_u32(np, "clock-freq", rate) &&
> > -		of_property_read_u32(np, "clock-frequency", rate))
> > +	    of_property_read_u32(np, "clock-frequency", rate))
> 
> Unintended whitespace change?
Well no, it was intended and I wanted to mention it in the commit log,
but forgot about it. It read:

	if (something &&
		somethingelse)
		dosomething;

which is hard to read.

Best regards
Uwe
Daniel Lezcano - Oct. 2, 2013, 10:22 a.m.
On 10/01/2013 10:38 AM, Uwe Kleine-König wrote:
> These are all only called by dw_apb_timer_init which is an __init
> function, too
>
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> ---

Applied to my tree for 3.13

Thanks
   -- Daniel

Patch

diff --git a/drivers/clocksource/dw_apb_timer_of.c b/drivers/clocksource/dw_apb_timer_of.c
index 4cbae4f..993cdde 100644
--- a/drivers/clocksource/dw_apb_timer_of.c
+++ b/drivers/clocksource/dw_apb_timer_of.c
@@ -23,7 +23,7 @@ 
 #include <linux/clk.h>
 #include <linux/sched_clock.h>
 
-static void timer_get_base_and_rate(struct device_node *np,
+static void __init timer_get_base_and_rate(struct device_node *np,
 				    void __iomem **base, u32 *rate)
 {
 	struct clk *timer_clk;
@@ -55,11 +55,11 @@  static void timer_get_base_and_rate(struct device_node *np,
 
 try_clock_freq:
 	if (of_property_read_u32(np, "clock-freq", rate) &&
-		of_property_read_u32(np, "clock-frequency", rate))
+	    of_property_read_u32(np, "clock-frequency", rate))
 		panic("No clock nor clock-frequency property for %s", np->name);
 }
 
-static void add_clockevent(struct device_node *event_timer)
+static void __init add_clockevent(struct device_node *event_timer)
 {
 	void __iomem *iobase;
 	struct dw_apb_clock_event_device *ced;
@@ -82,7 +82,7 @@  static void add_clockevent(struct device_node *event_timer)
 static void __iomem *sched_io_base;
 static u32 sched_rate;
 
-static void add_clocksource(struct device_node *source_timer)
+static void __init add_clocksource(struct device_node *source_timer)
 {
 	void __iomem *iobase;
 	struct dw_apb_clocksource *cs;
@@ -117,7 +117,7 @@  static const struct of_device_id sptimer_ids[] __initconst = {
 	{ /* Sentinel */ },
 };
 
-static void init_sched_clock(void)
+static void __init init_sched_clock(void)
 {
 	struct device_node *sched_timer;