diff options
author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2014-09-10 04:26:17 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2014-09-11 15:37:23 -0400 |
commit | 31957609db529d401658adc2e91ef7df7ea42699 (patch) | |
tree | b020c9ed66a5e51135e1faaa04cc3fd799ce08bc /arch/arm/mach-omap2/timer.c | |
parent | 58cda01ed18945c17ad858dfcf4a9a74ba70157c (diff) |
ARM: OMAP2+: make of_device_ids const
of_device_ids (i.e. compatible strings and the respective data) are not
supposed to change at runtime. All functions working with of_device_ids
provided by <linux/of.h> work with const of_device_ids. So mark the
non-const function parameters and structs for OMAP2+ as const, too.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/timer.c')
-rw-r--r-- | arch/arm/mach-omap2/timer.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c index 43d03fbf4c0b..4f61148ec168 100644 --- a/arch/arm/mach-omap2/timer.c +++ b/arch/arm/mach-omap2/timer.c | |||
@@ -141,7 +141,7 @@ static struct property device_disabled = { | |||
141 | .value = "disabled", | 141 | .value = "disabled", |
142 | }; | 142 | }; |
143 | 143 | ||
144 | static struct of_device_id omap_timer_match[] __initdata = { | 144 | static const struct of_device_id omap_timer_match[] __initconst = { |
145 | { .compatible = "ti,omap2420-timer", }, | 145 | { .compatible = "ti,omap2420-timer", }, |
146 | { .compatible = "ti,omap3430-timer", }, | 146 | { .compatible = "ti,omap3430-timer", }, |
147 | { .compatible = "ti,omap4430-timer", }, | 147 | { .compatible = "ti,omap4430-timer", }, |
@@ -162,7 +162,7 @@ static struct of_device_id omap_timer_match[] __initdata = { | |||
162 | * the timer node in device-tree as disabled, to prevent the kernel from | 162 | * the timer node in device-tree as disabled, to prevent the kernel from |
163 | * registering this timer as a platform device and so no one else can use it. | 163 | * registering this timer as a platform device and so no one else can use it. |
164 | */ | 164 | */ |
165 | static struct device_node * __init omap_get_timer_dt(struct of_device_id *match, | 165 | static struct device_node * __init omap_get_timer_dt(const struct of_device_id *match, |
166 | const char *property) | 166 | const char *property) |
167 | { | 167 | { |
168 | struct device_node *np; | 168 | struct device_node *np; |
@@ -388,7 +388,7 @@ static u64 notrace dmtimer_read_sched_clock(void) | |||
388 | return 0; | 388 | return 0; |
389 | } | 389 | } |
390 | 390 | ||
391 | static struct of_device_id omap_counter_match[] __initdata = { | 391 | static const struct of_device_id omap_counter_match[] __initconst = { |
392 | { .compatible = "ti,omap-counter32k", }, | 392 | { .compatible = "ti,omap-counter32k", }, |
393 | { } | 393 | { } |
394 | }; | 394 | }; |