Commit 31957609 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Tony Lindgren
Browse files

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: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 58cda01e

arch/arm/mach-omap2/board-generic.c

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
#define gic_of_init		NULL

#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 = "ti,omap-infra", },

	{ }

arch/arm/mach-omap2/common.h

+1 −1
Original line number Diff line number Diff line
@@ -307,7 +307,7 @@ static inline void omap4_cpu_resume(void) 


#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_pcs_legacy_init(int irq, void (*rearm)(void));

arch/arm/mach-omap2/gpmc.c

+1 −1
Original line number Diff line number Diff line
@@ -1244,7 +1244,7 @@ int gpmc_cs_program_settings(int cs, struct gpmc_settings *p) 
}



#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,omap2430-gpmc" },

	{ .compatible = "ti,omap3430-gpmc" },	/* omap3430 & omap3630 */

arch/arm/mach-omap2/irq.c

+1 −1
Original line number Diff line number Diff line
@@ -289,7 +289,7 @@ int __init intc_of_init(struct device_node *node, 
	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, },

	{ }

};

arch/arm/mach-omap2/pdata-quirks.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

	pdata_quirks_check(auxdata_quirks);

CRA Git | Maintained and supported by SUSTech CRA and CCSE