1 files changed, 27 insertions, 54 deletions

diff --git a/drivers/mfd/timberdale.c b/drivers/mfd/timberdale.c
index 6ad8a7f8d390..94c6c8afad12 100644
--- a/drivers/mfd/timberdale.c
+++ b/drivers/mfd/timberdale.c
@@ -384,8 +384,7 @@ static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg0[] = {
                 .name = "timb-dma",
                 .num_resources = ARRAY_SIZE(timberdale_dma_resources),
                 .resources = timberdale_dma_resources,
-                .platform_data = &timb_dma_platform_data,
-                .data_size = sizeof(timb_dma_platform_data),
+                .mfd_data = &timb_dma_platform_data,
         },
         {
                 .name = "timb-uart",
@@ -396,43 +395,37 @@ static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg0[] = {
                 .name = "xiic-i2c",
                 .num_resources = ARRAY_SIZE(timberdale_xiic_resources),
                 .resources = timberdale_xiic_resources,
-                .platform_data = &timberdale_xiic_platform_data,
-                .data_size = sizeof(timberdale_xiic_platform_data),
+                .mfd_data = &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),
+                .mfd_data = &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),
+                .mfd_data = &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),
+                .mfd_data = &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),
+                .mfd_data = &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)
+                .mfd_data = &timberdale_ks8842_platform_data,
         },
 };
 
@@ -441,8 +434,7 @@ static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg1[] = {
                 .name = "timb-dma",
                 .num_resources = ARRAY_SIZE(timberdale_dma_resources),
                 .resources = timberdale_dma_resources,
-                .platform_data = &timb_dma_platform_data,
-                .data_size = sizeof(timb_dma_platform_data),
+                .mfd_data = &timb_dma_platform_data,
         },
         {
                 .name = "timb-uart",
@@ -458,15 +450,13 @@ static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg1[] = {
                 .name = "xiic-i2c",
                 .num_resources = ARRAY_SIZE(timberdale_xiic_resources),
                 .resources = timberdale_xiic_resources,
-                .platform_data = &timberdale_xiic_platform_data,
-                .data_size = sizeof(timberdale_xiic_platform_data),
+                .mfd_data = &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),
+                .mfd_data = &timberdale_gpio_platform_data,
         },
         {
                 .name = "timb-mlogicore",
@@ -477,29 +467,25 @@ static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg1[] = {
                 .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),
+                .mfd_data = &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),
+                .mfd_data = &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),
+                .mfd_data = &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)
+                .mfd_data = &timberdale_ks8842_platform_data,
         },
 };
 
@@ -508,8 +494,7 @@ static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg2[] = {
                 .name = "timb-dma",
                 .num_resources = ARRAY_SIZE(timberdale_dma_resources),
                 .resources = timberdale_dma_resources,
-                .platform_data = &timb_dma_platform_data,
-                .data_size = sizeof(timb_dma_platform_data),
+                .mfd_data = &timb_dma_platform_data,
         },
         {
                 .name = "timb-uart",
@@ -520,36 +505,31 @@ static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg2[] = {
                 .name = "xiic-i2c",
                 .num_resources = ARRAY_SIZE(timberdale_xiic_resources),
                 .resources = timberdale_xiic_resources,
-                .platform_data = &timberdale_xiic_platform_data,
-                .data_size = sizeof(timberdale_xiic_platform_data),
+                .mfd_data = &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),
+                .mfd_data = &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),
+                .mfd_data = &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),
+                .mfd_data = &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),
+                .mfd_data = &timberdale_xspi_platform_data,
         },
 };
 
@@ -558,8 +538,7 @@ static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg3[] = {
                 .name = "timb-dma",
                 .num_resources = ARRAY_SIZE(timberdale_dma_resources),
                 .resources = timberdale_dma_resources,
-                .platform_data = &timb_dma_platform_data,
-                .data_size = sizeof(timb_dma_platform_data),
+                .mfd_data = &timb_dma_platform_data,
         },
         {
                 .name = "timb-uart",
@@ -570,43 +549,37 @@ static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg3[] = {
                 .name = "ocores-i2c",
                 .num_resources = ARRAY_SIZE(timberdale_ocores_resources),
                 .resources = timberdale_ocores_resources,
-                .platform_data = &timberdale_ocores_platform_data,
-                .data_size = sizeof(timberdale_ocores_platform_data),
+                .mfd_data = &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),
+                .mfd_data = &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),
+                .mfd_data = &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),
+                .mfd_data = &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),
+                .mfd_data = &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)
+                .mfd_data = &timberdale_ks8842_platform_data,
         },
 };