2 files changed, 7 insertions, 12 deletions

diff --git a/arch/arm/mach-omap2/board-omap3pandora.c b/arch/arm/mach-omap2/board-omap3pandora.c
index de1bc6bbe585..cf18340eb3bb 100644
--- a/arch/arm/mach-omap2/board-omap3pandora.c
+++ b/arch/arm/mach-omap2/board-omap3pandora.c
@@ -536,11 +536,13 @@ static struct spi_board_info omap3pandora_spi_board_info[] __initdata = {
 
 static void __init pandora_wl1251_init(void)
 {
-        struct wl12xx_platform_data pandora_wl1251_pdata;
+        struct wl1251_platform_data pandora_wl1251_pdata;
         int ret;
 
         memset(&pandora_wl1251_pdata, 0, sizeof(pandora_wl1251_pdata));
 
+        pandora_wl1251_pdata.power_gpio = -1;
+
         ret = gpio_request_one(PANDORA_WIFI_IRQ_GPIO, GPIOF_IN, "wl1251 irq");
         if (ret < 0)
                 goto fail;
@@ -550,7 +552,7 @@ static void __init pandora_wl1251_init(void)
                 goto fail_irq;
 
         pandora_wl1251_pdata.use_eeprom = true;
-        ret = wl12xx_set_platform_data(&pandora_wl1251_pdata);
+        ret = wl1251_set_platform_data(&pandora_wl1251_pdata);
         if (ret < 0)
                 goto fail_irq;
 
diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c
index 8760bbe3baab..ddfc8df83c6a 100644
--- a/arch/arm/mach-omap2/board-rx51-peripherals.c
+++ b/arch/arm/mach-omap2/board-rx51-peripherals.c
@@ -84,7 +84,7 @@ enum {
         RX51_SPI_MIPID,         /* LCD panel */
 };
 
-static struct wl12xx_platform_data wl1251_pdata;
+static struct wl1251_platform_data wl1251_pdata;
 static struct tsc2005_platform_data tsc2005_pdata;
 
 #if defined(CONFIG_SENSORS_LIS3_I2C) || defined(CONFIG_SENSORS_LIS3_I2C_MODULE)
@@ -1173,13 +1173,7 @@ static inline void board_smc91x_init(void)
 
 #endif
 
-static void rx51_wl1251_set_power(bool enable)
-{
-        gpio_set_value(RX51_WL1251_POWER_GPIO, enable);
-}
-
 static struct gpio rx51_wl1251_gpios[] __initdata = {
-        { RX51_WL1251_POWER_GPIO, GPIOF_OUT_INIT_LOW,   "wl1251 power"  },
         { RX51_WL1251_IRQ_GPIO,   GPIOF_IN,             "wl1251 irq"    },
 };
 
@@ -1196,17 +1190,16 @@ static void __init rx51_init_wl1251(void)
         if (irq < 0)
                 goto err_irq;
 
-        wl1251_pdata.set_power = rx51_wl1251_set_power;
+        wl1251_pdata.power_gpio = RX51_WL1251_POWER_GPIO;
         rx51_peripherals_spi_board_info[RX51_SPI_WL1251].irq = irq;
 
         return;
 
 err_irq:
         gpio_free(RX51_WL1251_IRQ_GPIO);
-        gpio_free(RX51_WL1251_POWER_GPIO);
 error:
         printk(KERN_ERR "wl1251 board initialisation failed\n");
-        wl1251_pdata.set_power = NULL;
+        wl1251_pdata.power_gpio = -1;
 
         /*
          * Now rx51_peripherals_spi_board_info[1].irq is zero and