mfd: mfd_cell is now implicitly available to timberdale drivers

The cell's platform_data is now accessed with a helper function;
change clients to use that, and remove the now-unused data_size.

Note that the mfd's platform_data is marked __devinitdata.  This
is still correct in all cases except for the timbgpio driver, whose
remove hook has been changed to no longer reference the pdata.

Signed-off-by: Andres Salomon <dilinger@queued.net>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

1 files changed, 0 insertions, 27 deletions

diff --git a/drivers/mfd/timberdale.c b/drivers/mfd/timberdale.c
index 6ad8a7f8d390..6353921c1729 100644
--- a/drivers/mfd/timberdale.c
+++ b/drivers/mfd/timberdale.c
@@ -385,7 +385,6 @@ static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg0[] = {
                 .num_resources = ARRAY_SIZE(timberdale_dma_resources),
                 .resources = timberdale_dma_resources,
                 .platform_data = &timb_dma_platform_data,
-                .data_size = sizeof(timb_dma_platform_data),
         },
         {
                 .name = "timb-uart",
@@ -397,42 +396,36 @@ static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg0[] = {
                 .num_resources = ARRAY_SIZE(timberdale_xiic_resources),
                 .resources = timberdale_xiic_resources,
                 .platform_data = &timberdale_xiic_platform_data,
-                .data_size = sizeof(timberdale_xiic_platform_data),
         },
         {
                 .name = "timb-gpio",
                 .num_resources = ARRAY_SIZE(timberdale_gpio_resources),
                 .resources = timberdale_gpio_resources,
                 .platform_data = &timberdale_gpio_platform_data,
-                .data_size = sizeof(timberdale_gpio_platform_data),
         },
         {
                 .name = "timb-video",
                 .num_resources = ARRAY_SIZE(timberdale_video_resources),
                 .resources = timberdale_video_resources,
                 .platform_data = &timberdale_video_platform_data,
-                .data_size = sizeof(timberdale_video_platform_data),
         },
         {
                 .name = "timb-radio",
                 .num_resources = ARRAY_SIZE(timberdale_radio_resources),
                 .resources = timberdale_radio_resources,
                 .platform_data = &timberdale_radio_platform_data,
-                .data_size = sizeof(timberdale_radio_platform_data),
         },
         {
                 .name = "xilinx_spi",
                 .num_resources = ARRAY_SIZE(timberdale_spi_resources),
                 .resources = timberdale_spi_resources,
                 .platform_data = &timberdale_xspi_platform_data,
-                .data_size = sizeof(timberdale_xspi_platform_data),
         },
         {
                 .name = "ks8842",
                 .num_resources = ARRAY_SIZE(timberdale_eth_resources),
                 .resources = timberdale_eth_resources,
                 .platform_data = &timberdale_ks8842_platform_data,
-                .data_size = sizeof(timberdale_ks8842_platform_data)
         },
 };
 
@@ -442,7 +435,6 @@ static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg1[] = {
                 .num_resources = ARRAY_SIZE(timberdale_dma_resources),
                 .resources = timberdale_dma_resources,
                 .platform_data = &timb_dma_platform_data,
-                .data_size = sizeof(timb_dma_platform_data),
         },
         {
                 .name = "timb-uart",
@@ -459,14 +451,12 @@ static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg1[] = {
                 .num_resources = ARRAY_SIZE(timberdale_xiic_resources),
                 .resources = timberdale_xiic_resources,
                 .platform_data = &timberdale_xiic_platform_data,
-                .data_size = sizeof(timberdale_xiic_platform_data),
         },
         {
                 .name = "timb-gpio",
                 .num_resources = ARRAY_SIZE(timberdale_gpio_resources),
                 .resources = timberdale_gpio_resources,
                 .platform_data = &timberdale_gpio_platform_data,
-                .data_size = sizeof(timberdale_gpio_platform_data),
         },
         {
                 .name = "timb-mlogicore",
@@ -478,28 +468,24 @@ static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg1[] = {
                 .num_resources = ARRAY_SIZE(timberdale_video_resources),
                 .resources = timberdale_video_resources,
                 .platform_data = &timberdale_video_platform_data,
-                .data_size = sizeof(timberdale_video_platform_data),
         },
         {
                 .name = "timb-radio",
                 .num_resources = ARRAY_SIZE(timberdale_radio_resources),
                 .resources = timberdale_radio_resources,
                 .platform_data = &timberdale_radio_platform_data,
-                .data_size = sizeof(timberdale_radio_platform_data),
         },
         {
                 .name = "xilinx_spi",
                 .num_resources = ARRAY_SIZE(timberdale_spi_resources),
                 .resources = timberdale_spi_resources,
                 .platform_data = &timberdale_xspi_platform_data,
-                .data_size = sizeof(timberdale_xspi_platform_data),
         },
         {
                 .name = "ks8842",
                 .num_resources = ARRAY_SIZE(timberdale_eth_resources),
                 .resources = timberdale_eth_resources,
                 .platform_data = &timberdale_ks8842_platform_data,
-                .data_size = sizeof(timberdale_ks8842_platform_data)
         },
 };
 
@@ -509,7 +495,6 @@ static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg2[] = {
                 .num_resources = ARRAY_SIZE(timberdale_dma_resources),
                 .resources = timberdale_dma_resources,
                 .platform_data = &timb_dma_platform_data,
-                .data_size = sizeof(timb_dma_platform_data),
         },
         {
                 .name = "timb-uart",
@@ -521,35 +506,30 @@ static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg2[] = {
                 .num_resources = ARRAY_SIZE(timberdale_xiic_resources),
                 .resources = timberdale_xiic_resources,
                 .platform_data = &timberdale_xiic_platform_data,
-                .data_size = sizeof(timberdale_xiic_platform_data),
         },
         {
                 .name = "timb-gpio",
                 .num_resources = ARRAY_SIZE(timberdale_gpio_resources),
                 .resources = timberdale_gpio_resources,
                 .platform_data = &timberdale_gpio_platform_data,
-                .data_size = sizeof(timberdale_gpio_platform_data),
         },
         {
                 .name = "timb-video",
                 .num_resources = ARRAY_SIZE(timberdale_video_resources),
                 .resources = timberdale_video_resources,
                 .platform_data = &timberdale_video_platform_data,
-                .data_size = sizeof(timberdale_video_platform_data),
         },
         {
                 .name = "timb-radio",
                 .num_resources = ARRAY_SIZE(timberdale_radio_resources),
                 .resources = timberdale_radio_resources,
                 .platform_data = &timberdale_radio_platform_data,
-                .data_size = sizeof(timberdale_radio_platform_data),
         },
         {
                 .name = "xilinx_spi",
                 .num_resources = ARRAY_SIZE(timberdale_spi_resources),
                 .resources = timberdale_spi_resources,
                 .platform_data = &timberdale_xspi_platform_data,
-                .data_size = sizeof(timberdale_xspi_platform_data),
         },
 };
 
@@ -559,7 +539,6 @@ static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg3[] = {
                 .num_resources = ARRAY_SIZE(timberdale_dma_resources),
                 .resources = timberdale_dma_resources,
                 .platform_data = &timb_dma_platform_data,
-                .data_size = sizeof(timb_dma_platform_data),
         },
         {
                 .name = "timb-uart",
@@ -571,42 +550,36 @@ static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg3[] = {
                 .num_resources = ARRAY_SIZE(timberdale_ocores_resources),
                 .resources = timberdale_ocores_resources,
                 .platform_data = &timberdale_ocores_platform_data,
-                .data_size = sizeof(timberdale_ocores_platform_data),
         },
         {
                 .name = "timb-gpio",
                 .num_resources = ARRAY_SIZE(timberdale_gpio_resources),
                 .resources = timberdale_gpio_resources,
                 .platform_data = &timberdale_gpio_platform_data,
-                .data_size = sizeof(timberdale_gpio_platform_data),
         },
         {
                 .name = "timb-video",
                 .num_resources = ARRAY_SIZE(timberdale_video_resources),
                 .resources = timberdale_video_resources,
                 .platform_data = &timberdale_video_platform_data,
-                .data_size = sizeof(timberdale_video_platform_data),
         },
         {
                 .name = "timb-radio",
                 .num_resources = ARRAY_SIZE(timberdale_radio_resources),
                 .resources = timberdale_radio_resources,
                 .platform_data = &timberdale_radio_platform_data,
-                .data_size = sizeof(timberdale_radio_platform_data),
         },
         {
                 .name = "xilinx_spi",
                 .num_resources = ARRAY_SIZE(timberdale_spi_resources),
                 .resources = timberdale_spi_resources,
                 .platform_data = &timberdale_xspi_platform_data,
-                .data_size = sizeof(timberdale_xspi_platform_data),
         },
         {
                 .name = "ks8842",
                 .num_resources = ARRAY_SIZE(timberdale_eth_resources),
                 .resources = timberdale_eth_resources,
                 .platform_data = &timberdale_ks8842_platform_data,
-                .data_size = sizeof(timberdale_ks8842_platform_data)
         },
 };