diff options
author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2014-09-10 15:56:38 -0400 |
---|---|---|
committer | Michael Ellerman <mpe@ellerman.id.au> | 2014-09-25 09:14:46 -0400 |
commit | ce6d73c94d7cfbdc3dc31860fe14af2f37d1b4fe (patch) | |
tree | 004b418dc22e1e6be5b8ba27d229a67a4ceee4df /arch/powerpc/platforms/pasemi | |
parent | d4fe0965e20820f3dd05bcc4d89de3da29bb83aa (diff) |
powerpc: 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. This allows to
mark all struct of_device_id const, too.
While touching these line also put the __init annotation at the right
position where necessary.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch/powerpc/platforms/pasemi')
-rw-r--r-- | arch/powerpc/platforms/pasemi/gpio_mdio.c | 2 | ||||
-rw-r--r-- | arch/powerpc/platforms/pasemi/setup.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/pasemi/gpio_mdio.c b/arch/powerpc/platforms/pasemi/gpio_mdio.c index 15adee544638..ada33358950d 100644 --- a/arch/powerpc/platforms/pasemi/gpio_mdio.c +++ b/arch/powerpc/platforms/pasemi/gpio_mdio.c | |||
@@ -290,7 +290,7 @@ static int gpio_mdio_remove(struct platform_device *dev) | |||
290 | return 0; | 290 | return 0; |
291 | } | 291 | } |
292 | 292 | ||
293 | static struct of_device_id gpio_mdio_match[] = | 293 | static const struct of_device_id gpio_mdio_match[] = |
294 | { | 294 | { |
295 | { | 295 | { |
296 | .compatible = "gpio-mdio", | 296 | .compatible = "gpio-mdio", |
diff --git a/arch/powerpc/platforms/pasemi/setup.c b/arch/powerpc/platforms/pasemi/setup.c index 8c54de6d8ec4..d71b2c7e8403 100644 --- a/arch/powerpc/platforms/pasemi/setup.c +++ b/arch/powerpc/platforms/pasemi/setup.c | |||
@@ -393,7 +393,7 @@ static inline void pasemi_pcmcia_init(void) | |||
393 | #endif | 393 | #endif |
394 | 394 | ||
395 | 395 | ||
396 | static struct of_device_id pasemi_bus_ids[] = { | 396 | static const struct of_device_id pasemi_bus_ids[] = { |
397 | /* Unfortunately needed for legacy firmwares */ | 397 | /* Unfortunately needed for legacy firmwares */ |
398 | { .type = "localbus", }, | 398 | { .type = "localbus", }, |
399 | { .type = "sdc", }, | 399 | { .type = "sdc", }, |