diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2012-03-30 22:04:51 +0200 |
|---|---|---|
| committer | Pritesh Raithatha <praithatha@nvidia.com> | 2012-10-11 14:35:49 +0530 |
| commit | 016b0ad9d89b7cefce7767320e25da7c34805396 (patch) | |
| tree | aa2eb19a9e452554a5bd8ec6981ab00868559028 | |
| parent | 03ee2252657e86d6494dd173f399a00af6c5e7f9 (diff) | |
pinctrl: mark const init data with __initconst instead of __initdata
As long as there is no other non-const variable marked __initdata in the
same compilation unit it doesn't hurt. If there were one however
compilation would fail with
error: $variablename causes a section type conflict
because a section containing const variables is marked read only and so
cannot contain non-const variables.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Cc: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
(cherry picked from commit 122dbe7e58c7d064a17eefd33205227e6bce85ca)
Change-Id: Id03a455b6aedaae89a2d2ea9865dd4aa28f7b77e
Signed-off-by: Pritesh Raithatha <praithatha@nvidia.com>
| -rw-r--r-- | Documentation/pinctrl.txt | 2 | ||||
| -rw-r--r-- | drivers/pinctrl/pinctrl-coh901.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/pinctrl.txt b/Documentation/pinctrl.txt index f2e27ef8e1b3..2d88b3c7b61c 100644 --- a/Documentation/pinctrl.txt +++ b/Documentation/pinctrl.txt @@ -786,7 +786,7 @@ and spi on the second function mapping: #include <linux/pinctrl/machine.h> -static const struct pinctrl_map __initdata mapping[] = { +static const struct pinctrl_map mapping[] __initconst = { { .dev_name = "foo-spi.0", .name = PINCTRL_STATE_DEFAULT, diff --git a/drivers/pinctrl/pinctrl-coh901.c b/drivers/pinctrl/pinctrl-coh901.c index 0797eba3e33a..55697a5d7482 100644 --- a/drivers/pinctrl/pinctrl-coh901.c +++ b/drivers/pinctrl/pinctrl-coh901.c @@ -174,7 +174,7 @@ struct u300_gpio_confdata { /* Initial configuration */ -static const struct __initdata u300_gpio_confdata +static const struct __initconst u300_gpio_confdata bs335_gpio_config[BS335_GPIO_NUM_PORTS][U300_GPIO_PINS_PER_PORT] = { /* Port 0, pins 0-7 */ { @@ -255,7 +255,7 @@ bs335_gpio_config[BS335_GPIO_NUM_PORTS][U300_GPIO_PINS_PER_PORT] = { } }; -static const struct __initdata u300_gpio_confdata +static const struct __initconst u300_gpio_confdata bs365_gpio_config[BS365_GPIO_NUM_PORTS][U300_GPIO_PINS_PER_PORT] = { /* Port 0, pins 0-7 */ { |