samsung_sm8750/android_kernel_samsung_sm8750
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ARM: OMAP2+: make of_device_ids const

Browse Source 
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>
This commit is contained in:
Uwe Kleine-König
2014-09-10 10:26:17 +02:00
committed by Tony Lindgren
parent 58cda01ed1
commit 31957609db
7 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-omap2/board-generic.c
View File

@@ -27,7 +27,7 @@
#define gic_of_init NULL #define gic_of_init NULL
#endif #endif
static struct of_device_id omap_dt_match_table[] __initdata = { static const struct of_device_id omap_dt_match_table[] __initconst = {
{ .compatible = "simple-bus", }, { .compatible = "simple-bus", },
{ .compatible = "ti,omap-infra", }, { .compatible = "ti,omap-infra", },
{ } { }

2
arch/arm/mach-omap2/common.h
View File

@@ -307,7 +307,7 @@ static inline void omap4_cpu_resume(void)
#endif #endif
void pdata_quirks_init(struct of_device_id *); void pdata_quirks_init(const struct of_device_id *);
void omap_auxdata_legacy_init(struct device *dev); void omap_auxdata_legacy_init(struct device *dev);
void omap_pcs_legacy_init(int irq, void (*rearm)(void)); void omap_pcs_legacy_init(int irq, void (*rearm)(void));

2
arch/arm/mach-omap2/gpmc.c
View File

@@ -1244,7 +1244,7 @@ int gpmc_cs_program_settings(int cs, struct gpmc_settings *p)
} }
#ifdef CONFIG_OF #ifdef CONFIG_OF
static struct of_device_id gpmc_dt_ids[] = { static const struct of_device_id gpmc_dt_ids[] = {
{ .compatible = "ti,omap2420-gpmc" }, { .compatible = "ti,omap2420-gpmc" },
{ .compatible = "ti,omap2430-gpmc" }, { .compatible = "ti,omap2430-gpmc" },
{ .compatible = "ti,omap3430-gpmc" }, /* omap3430 & omap3630 */ { .compatible = "ti,omap3430-gpmc" }, /* omap3430 & omap3630 */

2
arch/arm/mach-omap2/irq.c
View File

@@ -289,7 +289,7 @@ int __init intc_of_init(struct device_node *node,
return 0; return 0;
} }
static struct of_device_id irq_match[] __initdata = { static const struct of_device_id irq_match[] __initconst = {
{ .compatible = "ti,omap2-intc", .data = intc_of_init, }, { .compatible = "ti,omap2-intc", .data = intc_of_init, },
{ } { }
}; };

2
arch/arm/mach-omap2/pdata-quirks.c
View File

@@ -405,7 +405,7 @@ static void pdata_quirks_check(struct pdata_init *quirks)
} }
} }
void __init pdata_quirks_init(struct of_device_id *omap_dt_match_table) void __init pdata_quirks_init(const struct of_device_id *omap_dt_match_table)
{ {
omap_sdrc_init(NULL, NULL); omap_sdrc_init(NULL, NULL);
pdata_quirks_check(auxdata_quirks); pdata_quirks_check(auxdata_quirks);

2
arch/arm/mach-omap2/prm_common.c
View File

@@ -467,7 +467,7 @@ int prm_unregister(struct prm_ll_data *pld)
return 0; return 0;
} }
static struct of_device_id omap_prcm_dt_match_table[] = { static const struct of_device_id omap_prcm_dt_match_table[] = {
{ .compatible = "ti,am3-prcm" }, { .compatible = "ti,am3-prcm" },
{ .compatible = "ti,am3-scrm" }, { .compatible = "ti,am3-scrm" },
{ .compatible = "ti,am4-prcm" }, { .compatible = "ti,am4-prcm" },

6
arch/arm/mach-omap2/timer.c
View File

@@ -141,7 +141,7 @@ static struct property device_disabled = {
.value = "disabled", .value = "disabled",
}; };
static struct of_device_id omap_timer_match[] __initdata = { static const struct of_device_id omap_timer_match[] __initconst = {
{ .compatible = "ti,omap2420-timer", }, { .compatible = "ti,omap2420-timer", },
{ .compatible = "ti,omap3430-timer", }, { .compatible = "ti,omap3430-timer", },
{ .compatible = "ti,omap4430-timer", }, { .compatible = "ti,omap4430-timer", },
@@ -162,7 +162,7 @@ static struct of_device_id omap_timer_match[] __initdata = {
* the timer node in device-tree as disabled, to prevent the kernel from * the timer node in device-tree as disabled, to prevent the kernel from
* registering this timer as a platform device and so no one else can use it. * registering this timer as a platform device and so no one else can use it.
*/ */
static struct device_node * __init omap_get_timer_dt(struct of_device_id *match, static struct device_node * __init omap_get_timer_dt(const struct of_device_id *match,
const char *property) const char *property)
{ {
struct device_node *np; struct device_node *np;
@@ -388,7 +388,7 @@ static u64 notrace dmtimer_read_sched_clock(void)
return 0; return 0;
} }
static struct of_device_id omap_counter_match[] __initdata = { static const struct of_device_id omap_counter_match[] __initconst = {
{ .compatible = "ti,omap-counter32k", }, { .compatible = "ti,omap-counter32k", },
{ } { }
}; };