diff options
author | Geert Uytterhoeven <geert@linux-m68k.org> | 2013-11-18 08:33:03 -0500 |
---|---|---|
committer | Lee Jones <lee.jones@linaro.org> | 2014-01-06 04:13:26 -0500 |
commit | afb580a944ce9fe8c31f96623ded7bb4b87412d3 (patch) | |
tree | c77901c57a6e3cf3c9227685a065fd4b57d21449 | |
parent | ad59de489bf4c81b90b25fb9017f0e6d141f5415 (diff) |
mfd: toshiba: Constify struct mfd_cell where possible
As of commit 03e361b25ee8dfb1fd9b890072c23c4aae01c6c7 ("mfd: Stop setting
refcounting pointers in original mfd_cell arrays"), the "cell" parameter of
mfd_add_devices() is "const" again. Hence make all cell data passed to
mfd_add_devices() const where possible.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
-rw-r--r-- | drivers/mfd/tc3589x.c | 4 | ||||
-rw-r--r-- | drivers/mfd/tc6387xb.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mfd/tc3589x.c b/drivers/mfd/tc3589x.c index 87ea51dc6234..2cf636c267d9 100644 --- a/drivers/mfd/tc3589x.c +++ b/drivers/mfd/tc3589x.c | |||
@@ -155,7 +155,7 @@ static struct resource keypad_resources[] = { | |||
155 | }, | 155 | }, |
156 | }; | 156 | }; |
157 | 157 | ||
158 | static struct mfd_cell tc3589x_dev_gpio[] = { | 158 | static const struct mfd_cell tc3589x_dev_gpio[] = { |
159 | { | 159 | { |
160 | .name = "tc3589x-gpio", | 160 | .name = "tc3589x-gpio", |
161 | .num_resources = ARRAY_SIZE(gpio_resources), | 161 | .num_resources = ARRAY_SIZE(gpio_resources), |
@@ -164,7 +164,7 @@ static struct mfd_cell tc3589x_dev_gpio[] = { | |||
164 | }, | 164 | }, |
165 | }; | 165 | }; |
166 | 166 | ||
167 | static struct mfd_cell tc3589x_dev_keypad[] = { | 167 | static const struct mfd_cell tc3589x_dev_keypad[] = { |
168 | { | 168 | { |
169 | .name = "tc3589x-keypad", | 169 | .name = "tc3589x-keypad", |
170 | .num_resources = ARRAY_SIZE(keypad_resources), | 170 | .num_resources = ARRAY_SIZE(keypad_resources), |
diff --git a/drivers/mfd/tc6387xb.c b/drivers/mfd/tc6387xb.c index acd0f3a41044..591a331d8d83 100644 --- a/drivers/mfd/tc6387xb.c +++ b/drivers/mfd/tc6387xb.c | |||
@@ -126,7 +126,7 @@ static struct tmio_mmc_data tc6387xb_mmc_data = { | |||
126 | 126 | ||
127 | /*--------------------------------------------------------------------------*/ | 127 | /*--------------------------------------------------------------------------*/ |
128 | 128 | ||
129 | static struct mfd_cell tc6387xb_cells[] = { | 129 | static const struct mfd_cell tc6387xb_cells[] = { |
130 | [TC6387XB_CELL_MMC] = { | 130 | [TC6387XB_CELL_MMC] = { |
131 | .name = "tmio-mmc", | 131 | .name = "tmio-mmc", |
132 | .enable = tc6387xb_mmc_enable, | 132 | .enable = tc6387xb_mmc_enable, |