| From d6c13c2feab5837fcef4e408d248088fc0745b05 Mon Sep 17 00:00:00 2001 |
| From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| Date: Thu, 8 Aug 2013 00:43:00 +0200 |
| Subject: ARM: shmobile: lager: Constify platform data and resources |
| |
| Platform data and resources for Lager devices are kmemdup()ed when the |
| corresponding devices are registered and can thus be declared as const. |
| Do so. |
| |
| Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| (cherry picked from commit 27113d63daac0aacaa26b1fabfc23391de4284f4) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| |
| Conflicts: |
| arch/arm/mach-shmobile/board-lager.c |
| --- |
| arch/arm/mach-shmobile/board-lager.c | 12 ++++++------ |
| 1 file changed, 6 insertions(+), 6 deletions(-) |
| |
| diff --git a/arch/arm/mach-shmobile/board-lager.c b/arch/arm/mach-shmobile/board-lager.c |
| index 6569491839cf..c1075f202602 100644 |
| --- a/arch/arm/mach-shmobile/board-lager.c |
| +++ b/arch/arm/mach-shmobile/board-lager.c |
| @@ -56,7 +56,7 @@ static struct gpio_led lager_leds[] = { |
| }, |
| }; |
| |
| -static __initdata struct gpio_led_platform_data lager_leds_pdata = { |
| +static const struct gpio_led_platform_data lager_leds_pdata __initconst = { |
| .leds = lager_leds, |
| .num_leds = ARRAY_SIZE(lager_leds), |
| }; |
| @@ -72,7 +72,7 @@ static struct gpio_keys_button gpio_buttons[] = { |
| GPIO_KEY(KEY_1, RCAR_GP_PIN(1, 14), "SW2-pin1"), |
| }; |
| |
| -static __initdata struct gpio_keys_platform_data lager_keys_pdata = { |
| +static const struct gpio_keys_platform_data lager_keys_pdata __initconst = { |
| .buttons = gpio_buttons, |
| .nbuttons = ARRAY_SIZE(gpio_buttons), |
| }; |
| @@ -84,24 +84,24 @@ static struct regulator_consumer_supply fixed3v3_power_consumers[] = |
| }; |
| |
| /* MMCIF */ |
| -static struct sh_mmcif_plat_data mmcif1_pdata __initdata = { |
| +static const struct sh_mmcif_plat_data mmcif1_pdata __initconst = { |
| .caps = MMC_CAP_8_BIT_DATA | MMC_CAP_NONREMOVABLE, |
| }; |
| |
| -static struct resource mmcif1_resources[] __initdata = { |
| +static const struct resource mmcif1_resources[] __initconst = { |
| DEFINE_RES_MEM_NAMED(0xee220000, 0x80, "MMCIF1"), |
| DEFINE_RES_IRQ(gic_spi(170)), |
| }; |
| |
| /* Ether */ |
| -static struct sh_eth_plat_data ether_pdata __initdata = { |
| +static const struct sh_eth_plat_data ether_pdata __initconst = { |
| .phy = 0x1, |
| .edmac_endian = EDMAC_LITTLE_ENDIAN, |
| .phy_interface = PHY_INTERFACE_MODE_RMII, |
| .ether_link_active_low = 1, |
| }; |
| |
| -static struct resource ether_resources[] __initdata = { |
| +static const struct resource ether_resources[] __initconst = { |
| DEFINE_RES_MEM(0xee700000, 0x400), |
| DEFINE_RES_IRQ(gic_spi(162)), |
| }; |
| -- |
| 1.8.5.rc3 |
| |