Skip to contentSkip to conversation

clocksource: dw_apb_timer_of: Mark a few more functions as __init

PATCH New Uwe Kleine-König 3 participants 4 messages Oct 1, 2013 – Oct 2, 2013 Clocksource, clockevent drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 clocksource: dw_apb_timer_of: Mark a few more functions as __init

These are all only called by dw_apb_timer_init which is an __init function, too

---
 drivers/clocksource/dw_apb_timer_of.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/clocksource/dw_apb_timer_of.c +5 -5
index 4cbae4f..993cdde 100644
@@ -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;
 
Signature · 1 line
1.8.4.rc3
#1 lore raw

PATCH 1/1 clocksource: dw_apb_timer_of: Mark a few more functions as __init

Hi Uwe,

Quoted 22 lines · Uwe Kleine-K?nig

These are all only called by dw_apb_timer_init which is an __init function, too

---
 drivers/clocksource/dw_apb_timer_of.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/clocksource/dw_apb_timer_of.c +1 -1
index 4cbae4f..993cdde 100644
@@ -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;

drivers/clocksource/dw_apb_timer_of.c static void timer_get_base_and_rate(struct device_node *np, · line 58

Quoted 5 lines
drivers/clocksource/dw_apb_timer_of.c +1 -1
@@ -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

Quoted 28 lines
drivers/clocksource/dw_apb_timer_of.c +3 -3
 		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;
 
Signature · 1 line
1.8.4.rc3
Signature · 3 lines
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -
#2 lore raw

PATCH 1/1 clocksource: dw_apb_timer_of: Mark a few more functions as __init

Hello Baruch,

Quoted 24 lines · Baruch Siach
Quoted 23 lines · Uwe Kleine-K?nig

These are all only called by dw_apb_timer_init which is an __init function, too

---
 drivers/clocksource/dw_apb_timer_of.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/clocksource/dw_apb_timer_of.c +1 -1
index 4cbae4f..993cdde 100644
@@ -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,
 
Quoted 6 lines

drivers/clocksource/dw_apb_timer_of.c static void timer_get_base_and_rate(struct device_node *np, · line 58

Quoted 4 lines
drivers/clocksource/dw_apb_timer_of.c +1 -1
 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

Signature · 2 lines
Pengutronix e.K.                           | Uwe Kleine-K?nig            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
#3 lore raw

PATCH 1/1 clocksource: dw_apb_timer_of: Mark a few more functions as __init

In reply to Uwe Kleine-König
Quoted 5 lines · Uwe Kleine-K?nig

These are all only called by dw_apb_timer_init which is an __init function, too

---

Applied to my tree for 3.13

Thanks
-- Daniel

Signature · 5 lines
  <http://www.linaro.org/> Linaro.org ? Open source software for ARM SoCs

Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog