diff options
author | Bill Pemberton <wfp5p@virginia.edu> | 2012-11-19 13:24:21 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-28 15:21:11 -0500 |
commit | a9e9ce4c41672cf3f6fcb1288bfd6b26c1f2a917 (patch) | |
tree | fcc837543951ad2a54a26ae04bb436b377ef99eb /drivers/mfd/timberdale.c | |
parent | f791be492f76dea7b0641ed227a60eeb2fa7e255 (diff) |
mfd: remove use of __devinitdata
CONFIG_HOTPLUG is going away as an option so __devinitdata is no
longer needed.
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Srinidhi Kasagar <srinidhi.kasagar@stericsson.com>
Cc: Peter Tyser <ptyser@xes-inc.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/mfd/timberdale.c')
-rw-r--r-- | drivers/mfd/timberdale.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/drivers/mfd/timberdale.c b/drivers/mfd/timberdale.c index dddf1df57838..294e14dcd907 100644 --- a/drivers/mfd/timberdale.c +++ b/drivers/mfd/timberdale.c | |||
@@ -75,13 +75,13 @@ static struct i2c_board_info timberdale_i2c_board_info[] = { | |||
75 | }, | 75 | }, |
76 | }; | 76 | }; |
77 | 77 | ||
78 | static __devinitdata struct xiic_i2c_platform_data | 78 | static struct xiic_i2c_platform_data |
79 | timberdale_xiic_platform_data = { | 79 | timberdale_xiic_platform_data = { |
80 | .devices = timberdale_i2c_board_info, | 80 | .devices = timberdale_i2c_board_info, |
81 | .num_devices = ARRAY_SIZE(timberdale_i2c_board_info) | 81 | .num_devices = ARRAY_SIZE(timberdale_i2c_board_info) |
82 | }; | 82 | }; |
83 | 83 | ||
84 | static __devinitdata struct ocores_i2c_platform_data | 84 | static struct ocores_i2c_platform_data |
85 | timberdale_ocores_platform_data = { | 85 | timberdale_ocores_platform_data = { |
86 | .reg_shift = 2, | 86 | .reg_shift = 2, |
87 | .clock_khz = 62500, | 87 | .clock_khz = 62500, |
@@ -143,7 +143,7 @@ static struct spi_board_info timberdale_spi_8bit_board_info[] = { | |||
143 | }, | 143 | }, |
144 | }; | 144 | }; |
145 | 145 | ||
146 | static __devinitdata struct xspi_platform_data timberdale_xspi_platform_data = { | 146 | static struct xspi_platform_data timberdale_xspi_platform_data = { |
147 | .num_chipselect = 3, | 147 | .num_chipselect = 3, |
148 | .little_endian = true, | 148 | .little_endian = true, |
149 | /* bits per word and devices will be filled in runtime depending | 149 | /* bits per word and devices will be filled in runtime depending |
@@ -164,7 +164,7 @@ static const __devinitconst struct resource timberdale_spi_resources[] = { | |||
164 | }, | 164 | }, |
165 | }; | 165 | }; |
166 | 166 | ||
167 | static __devinitdata struct ks8842_platform_data | 167 | static struct ks8842_platform_data |
168 | timberdale_ks8842_platform_data = { | 168 | timberdale_ks8842_platform_data = { |
169 | .rx_dma_channel = DMA_ETH_RX, | 169 | .rx_dma_channel = DMA_ETH_RX, |
170 | .tx_dma_channel = DMA_ETH_TX | 170 | .tx_dma_channel = DMA_ETH_TX |
@@ -183,7 +183,7 @@ static const __devinitconst struct resource timberdale_eth_resources[] = { | |||
183 | }, | 183 | }, |
184 | }; | 184 | }; |
185 | 185 | ||
186 | static __devinitdata struct timbgpio_platform_data | 186 | static struct timbgpio_platform_data |
187 | timberdale_gpio_platform_data = { | 187 | timberdale_gpio_platform_data = { |
188 | .gpio_base = 0, | 188 | .gpio_base = 0, |
189 | .nr_pins = GPIO_NR_PINS, | 189 | .nr_pins = GPIO_NR_PINS, |
@@ -247,13 +247,13 @@ static const __devinitconst struct resource timberdale_uartlite_resources[] = { | |||
247 | }, | 247 | }, |
248 | }; | 248 | }; |
249 | 249 | ||
250 | static __devinitdata struct i2c_board_info timberdale_adv7180_i2c_board_info = { | 250 | static struct i2c_board_info timberdale_adv7180_i2c_board_info = { |
251 | /* Requires jumper JP9 to be off */ | 251 | /* Requires jumper JP9 to be off */ |
252 | I2C_BOARD_INFO("adv7180", 0x42 >> 1), | 252 | I2C_BOARD_INFO("adv7180", 0x42 >> 1), |
253 | .irq = IRQ_TIMBERDALE_ADV7180 | 253 | .irq = IRQ_TIMBERDALE_ADV7180 |
254 | }; | 254 | }; |
255 | 255 | ||
256 | static __devinitdata struct timb_video_platform_data | 256 | static struct timb_video_platform_data |
257 | timberdale_video_platform_data = { | 257 | timberdale_video_platform_data = { |
258 | .dma_channel = DMA_VIDEO_RX, | 258 | .dma_channel = DMA_VIDEO_RX, |
259 | .i2c_adapter = 0, | 259 | .i2c_adapter = 0, |
@@ -276,15 +276,15 @@ timberdale_radio_resources[] = { | |||
276 | }, | 276 | }, |
277 | }; | 277 | }; |
278 | 278 | ||
279 | static __devinitdata struct i2c_board_info timberdale_tef6868_i2c_board_info = { | 279 | static struct i2c_board_info timberdale_tef6868_i2c_board_info = { |
280 | I2C_BOARD_INFO("tef6862", 0x60) | 280 | I2C_BOARD_INFO("tef6862", 0x60) |
281 | }; | 281 | }; |
282 | 282 | ||
283 | static __devinitdata struct i2c_board_info timberdale_saa7706_i2c_board_info = { | 283 | static struct i2c_board_info timberdale_saa7706_i2c_board_info = { |
284 | I2C_BOARD_INFO("saa7706h", 0x1C) | 284 | I2C_BOARD_INFO("saa7706h", 0x1C) |
285 | }; | 285 | }; |
286 | 286 | ||
287 | static __devinitdata struct timb_radio_platform_data | 287 | static struct timb_radio_platform_data |
288 | timberdale_radio_platform_data = { | 288 | timberdale_radio_platform_data = { |
289 | .i2c_adapter = 0, | 289 | .i2c_adapter = 0, |
290 | .tuner = &timberdale_tef6868_i2c_board_info, | 290 | .tuner = &timberdale_tef6868_i2c_board_info, |
@@ -303,7 +303,7 @@ static const __devinitconst struct resource timberdale_video_resources[] = { | |||
303 | */ | 303 | */ |
304 | }; | 304 | }; |
305 | 305 | ||
306 | static __devinitdata struct timb_dma_platform_data timb_dma_platform_data = { | 306 | static struct timb_dma_platform_data timb_dma_platform_data = { |
307 | .nr_channels = 10, | 307 | .nr_channels = 10, |
308 | .channels = { | 308 | .channels = { |
309 | { | 309 | { |
@@ -375,7 +375,7 @@ static const __devinitconst struct resource timberdale_dma_resources[] = { | |||
375 | }, | 375 | }, |
376 | }; | 376 | }; |
377 | 377 | ||
378 | static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg0[] = { | 378 | static struct mfd_cell timberdale_cells_bar0_cfg0[] = { |
379 | { | 379 | { |
380 | .name = "timb-dma", | 380 | .name = "timb-dma", |
381 | .num_resources = ARRAY_SIZE(timberdale_dma_resources), | 381 | .num_resources = ARRAY_SIZE(timberdale_dma_resources), |
@@ -432,7 +432,7 @@ static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg0[] = { | |||
432 | }, | 432 | }, |
433 | }; | 433 | }; |
434 | 434 | ||
435 | static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg1[] = { | 435 | static struct mfd_cell timberdale_cells_bar0_cfg1[] = { |
436 | { | 436 | { |
437 | .name = "timb-dma", | 437 | .name = "timb-dma", |
438 | .num_resources = ARRAY_SIZE(timberdale_dma_resources), | 438 | .num_resources = ARRAY_SIZE(timberdale_dma_resources), |
@@ -499,7 +499,7 @@ static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg1[] = { | |||
499 | }, | 499 | }, |
500 | }; | 500 | }; |
501 | 501 | ||
502 | static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg2[] = { | 502 | static struct mfd_cell timberdale_cells_bar0_cfg2[] = { |
503 | { | 503 | { |
504 | .name = "timb-dma", | 504 | .name = "timb-dma", |
505 | .num_resources = ARRAY_SIZE(timberdale_dma_resources), | 505 | .num_resources = ARRAY_SIZE(timberdale_dma_resources), |
@@ -549,7 +549,7 @@ static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg2[] = { | |||
549 | }, | 549 | }, |
550 | }; | 550 | }; |
551 | 551 | ||
552 | static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg3[] = { | 552 | static struct mfd_cell timberdale_cells_bar0_cfg3[] = { |
553 | { | 553 | { |
554 | .name = "timb-dma", | 554 | .name = "timb-dma", |
555 | .num_resources = ARRAY_SIZE(timberdale_dma_resources), | 555 | .num_resources = ARRAY_SIZE(timberdale_dma_resources), |
@@ -620,7 +620,7 @@ static const __devinitconst struct resource timberdale_sdhc_resources[] = { | |||
620 | }, | 620 | }, |
621 | }; | 621 | }; |
622 | 622 | ||
623 | static __devinitdata struct mfd_cell timberdale_cells_bar1[] = { | 623 | static struct mfd_cell timberdale_cells_bar1[] = { |
624 | { | 624 | { |
625 | .name = "sdhci", | 625 | .name = "sdhci", |
626 | .num_resources = ARRAY_SIZE(timberdale_sdhc_resources), | 626 | .num_resources = ARRAY_SIZE(timberdale_sdhc_resources), |
@@ -628,7 +628,7 @@ static __devinitdata struct mfd_cell timberdale_cells_bar1[] = { | |||
628 | }, | 628 | }, |
629 | }; | 629 | }; |
630 | 630 | ||
631 | static __devinitdata struct mfd_cell timberdale_cells_bar2[] = { | 631 | static struct mfd_cell timberdale_cells_bar2[] = { |
632 | { | 632 | { |
633 | .name = "sdhci", | 633 | .name = "sdhci", |
634 | .num_resources = ARRAY_SIZE(timberdale_sdhc_resources), | 634 | .num_resources = ARRAY_SIZE(timberdale_sdhc_resources), |