1 files changed, 109 insertions, 150 deletions

diff --git a/drivers/net/wireless/wl12xx/sdio.c b/drivers/net/wireless/wl12xx/sdio.c
index 516a8980723c..468a50553fac 100644
--- a/drivers/net/wireless/wl12xx/sdio.c
+++ b/drivers/net/wireless/wl12xx/sdio.c
@@ -24,6 +24,7 @@
 #include <linux/irq.h>
 #include <linux/module.h>
 #include <linux/vmalloc.h>
+#include <linux/platform_device.h>
 #include <linux/mmc/sdio_func.h>
 #include <linux/mmc/sdio_ids.h>
 #include <linux/mmc/card.h>
@@ -44,107 +45,67 @@
 #define SDIO_DEVICE_ID_TI_WL1271        0x4076
 #endif
 
+struct wl12xx_sdio_glue {
+        struct device *dev;
+        struct platform_device *core;
+};
+
 static const struct sdio_device_id wl1271_devices[] __devinitconst = {
         { SDIO_DEVICE(SDIO_VENDOR_ID_TI, SDIO_DEVICE_ID_TI_WL1271) },
         {}
 };
 MODULE_DEVICE_TABLE(sdio, wl1271_devices);
 
-static void wl1271_sdio_set_block_size(struct wl1271 *wl, unsigned int blksz)
-{
-        sdio_claim_host(wl->if_priv);
-        sdio_set_block_size(wl->if_priv, blksz);
-        sdio_release_host(wl->if_priv);
-}
-
-static inline struct sdio_func *wl_to_func(struct wl1271 *wl)
-{
-        return wl->if_priv;
-}
-
-static struct device *wl1271_sdio_wl_to_dev(struct wl1271 *wl)
-{
-        return &(wl_to_func(wl)->dev);
-}
-
-static irqreturn_t wl1271_hardirq(int irq, void *cookie)
+static void wl1271_sdio_set_block_size(struct device *child,
+                                       unsigned int blksz)
 {
-        struct wl1271 *wl = cookie;
-        unsigned long flags;
+        struct wl12xx_sdio_glue *glue = dev_get_drvdata(child->parent);
+        struct sdio_func *func = dev_to_sdio_func(glue->dev);
 
-        wl1271_debug(DEBUG_IRQ, "IRQ");
-
-        /* complete the ELP completion */
-        spin_lock_irqsave(&wl->wl_lock, flags);
-        set_bit(WL1271_FLAG_IRQ_RUNNING, &wl->flags);
-        if (wl->elp_compl) {
-                complete(wl->elp_compl);
-                wl->elp_compl = NULL;
-        }
-
-        if (test_bit(WL1271_FLAG_SUSPENDED, &wl->flags)) {
-                /* don't enqueue a work right now. mark it as pending */
-                set_bit(WL1271_FLAG_PENDING_WORK, &wl->flags);
-                wl1271_debug(DEBUG_IRQ, "should not enqueue work");
-                disable_irq_nosync(wl->irq);
-                pm_wakeup_event(wl1271_sdio_wl_to_dev(wl), 0);
-                spin_unlock_irqrestore(&wl->wl_lock, flags);
-                return IRQ_HANDLED;
-        }
-        spin_unlock_irqrestore(&wl->wl_lock, flags);
-
-        return IRQ_WAKE_THREAD;
-}
-
-static void wl1271_sdio_disable_interrupts(struct wl1271 *wl)
-{
-        disable_irq(wl->irq);
-}
-
-static void wl1271_sdio_enable_interrupts(struct wl1271 *wl)
-{
-        enable_irq(wl->irq);
+        sdio_claim_host(func);
+        sdio_set_block_size(func, blksz);
+        sdio_release_host(func);
 }
 
-static void wl1271_sdio_raw_read(struct wl1271 *wl, int addr, void *buf,
+static void wl12xx_sdio_raw_read(struct device *child, int addr, void *buf,
                                  size_t len, bool fixed)
 {
         int ret;
-        struct sdio_func *func = wl_to_func(wl);
+        struct wl12xx_sdio_glue *glue = dev_get_drvdata(child->parent);
+        struct sdio_func *func = dev_to_sdio_func(glue->dev);
 
         if (unlikely(addr == HW_ACCESS_ELP_CTRL_REG_ADDR)) {
                 ((u8 *)buf)[0] = sdio_f0_readb(func, addr, &ret);
-                wl1271_debug(DEBUG_SDIO, "sdio read 52 addr 0x%x, byte 0x%02x",
-                             addr, ((u8 *)buf)[0]);
+                dev_dbg(child->parent, "sdio read 52 addr 0x%x, byte 0x%02x\n",
+                        addr, ((u8 *)buf)[0]);
         } else {
                 if (fixed)
                         ret = sdio_readsb(func, buf, addr, len);
                 else
                         ret = sdio_memcpy_fromio(func, buf, addr, len);
 
-                wl1271_debug(DEBUG_SDIO, "sdio read 53 addr 0x%x, %zu bytes",
-                             addr, len);
-                wl1271_dump_ascii(DEBUG_SDIO, "data: ", buf, len);
+                dev_dbg(child->parent, "sdio read 53 addr 0x%x, %zu bytes\n",
+                        addr, len);
         }
 
         if (ret)
-                wl1271_error("sdio read failed (%d)", ret);
+                dev_err(child->parent, "sdio read failed (%d)\n", ret);
 }
 
-static void wl1271_sdio_raw_write(struct wl1271 *wl, int addr, void *buf,
+static void wl12xx_sdio_raw_write(struct device *child, int addr, void *buf,
                                   size_t len, bool fixed)
 {
         int ret;
-        struct sdio_func *func = wl_to_func(wl);
+        struct wl12xx_sdio_glue *glue = dev_get_drvdata(child->parent);
+        struct sdio_func *func = dev_to_sdio_func(glue->dev);
 
         if (unlikely(addr == HW_ACCESS_ELP_CTRL_REG_ADDR)) {
                 sdio_f0_writeb(func, ((u8 *)buf)[0], addr, &ret);
-                wl1271_debug(DEBUG_SDIO, "sdio write 52 addr 0x%x, byte 0x%02x",
-                             addr, ((u8 *)buf)[0]);
+                dev_dbg(child->parent, "sdio write 52 addr 0x%x, byte 0x%02x\n",
+                        addr, ((u8 *)buf)[0]);
         } else {
-                wl1271_debug(DEBUG_SDIO, "sdio write 53 addr 0x%x, %zu bytes",
-                             addr, len);
-                wl1271_dump_ascii(DEBUG_SDIO, "data: ", buf, len);
+                dev_dbg(child->parent, "sdio write 53 addr 0x%x, %zu bytes\n",
+                        addr, len);
 
                 if (fixed)
                         ret = sdio_writesb(func, addr, buf, len);
@@ -153,13 +114,13 @@ static void wl1271_sdio_raw_write(struct wl1271 *wl, int addr, void *buf,
         }
 
         if (ret)
-                wl1271_error("sdio write failed (%d)", ret);
+                dev_err(child->parent, "sdio write failed (%d)\n", ret);
 }
 
-static int wl1271_sdio_power_on(struct wl1271 *wl)
+static int wl12xx_sdio_power_on(struct wl12xx_sdio_glue *glue)
 {
-        struct sdio_func *func = wl_to_func(wl);
         int ret;
+        struct sdio_func *func = dev_to_sdio_func(glue->dev);
 
         /* If enabled, tell runtime PM not to power off the card */
         if (pm_runtime_enabled(&func->dev)) {
@@ -180,10 +141,10 @@ out:
         return ret;
 }
 
-static int wl1271_sdio_power_off(struct wl1271 *wl)
+static int wl12xx_sdio_power_off(struct wl12xx_sdio_glue *glue)
 {
-        struct sdio_func *func = wl_to_func(wl);
         int ret;
+        struct sdio_func *func = dev_to_sdio_func(glue->dev);
 
         sdio_disable_func(func);
         sdio_release_host(func);
@@ -200,46 +161,43 @@ static int wl1271_sdio_power_off(struct wl1271 *wl)
         return ret;
 }
 
-static int wl1271_sdio_set_power(struct wl1271 *wl, bool enable)
+static int wl12xx_sdio_set_power(struct device *child, bool enable)
 {
+        struct wl12xx_sdio_glue *glue = dev_get_drvdata(child->parent);
+
         if (enable)
-                return wl1271_sdio_power_on(wl);
+                return wl12xx_sdio_power_on(glue);
         else
-                return wl1271_sdio_power_off(wl);
+                return wl12xx_sdio_power_off(glue);
 }
 
 static struct wl1271_if_operations sdio_ops = {
-        .read           = wl1271_sdio_raw_read,
-        .write          = wl1271_sdio_raw_write,
-        .power          = wl1271_sdio_set_power,
-        .dev            = wl1271_sdio_wl_to_dev,
-        .enable_irq     = wl1271_sdio_enable_interrupts,
-        .disable_irq    = wl1271_sdio_disable_interrupts,
+        .read           = wl12xx_sdio_raw_read,
+        .write          = wl12xx_sdio_raw_write,
+        .power          = wl12xx_sdio_set_power,
         .set_block_size = wl1271_sdio_set_block_size,
 };
 
 static int __devinit wl1271_probe(struct sdio_func *func,
                                   const struct sdio_device_id *id)
 {
-        struct ieee80211_hw *hw;
-        const struct wl12xx_platform_data *wlan_data;
-        struct wl1271 *wl;
-        unsigned long irqflags;
+        struct wl12xx_platform_data *wlan_data;
+        struct wl12xx_sdio_glue *glue;
+        struct resource res[1];
         mmc_pm_flag_t mmcflags;
-        int ret;
+        int ret = -ENOMEM;
 
         /* We are only able to handle the wlan function */
         if (func->num != 0x02)
                 return -ENODEV;
 
-        hw = wl1271_alloc_hw();
-        if (IS_ERR(hw))
-                return PTR_ERR(hw);
-
-        wl = hw->priv;
+        glue = kzalloc(sizeof(*glue), GFP_KERNEL);
+        if (!glue) {
+                dev_err(&func->dev, "can't allocate glue\n");
+                goto out;
+        }
 
-        wl->if_priv = func;
-        wl->if_ops = &sdio_ops;
+        glue->dev = &func->dev;
 
         /* Grab access to FN0 for ELP reg. */
         func->card->quirks |= MMC_QUIRK_LENIENT_FN0;
@@ -250,80 +208,79 @@ static int __devinit wl1271_probe(struct sdio_func *func,
         wlan_data = wl12xx_get_platform_data();
         if (IS_ERR(wlan_data)) {
                 ret = PTR_ERR(wlan_data);
-                wl1271_error("missing wlan platform data: %d", ret);
-                goto out_free;
+                dev_err(glue->dev, "missing wlan platform data: %d\n", ret);
+                goto out_free_glue;
         }
 
-        wl->irq = wlan_data->irq;
-        wl->ref_clock = wlan_data->board_ref_clock;
-        wl->tcxo_clock = wlan_data->board_tcxo_clock;
-        wl->platform_quirks = wlan_data->platform_quirks;
+        /* if sdio can keep power while host is suspended, enable wow */
+        mmcflags = sdio_get_host_pm_caps(func);
+        dev_dbg(glue->dev, "sdio PM caps = 0x%x\n", mmcflags);
 
-        if (wl->platform_quirks & WL12XX_PLATFORM_QUIRK_EDGE_IRQ)
-                irqflags = IRQF_TRIGGER_RISING;
-        else
-                irqflags = IRQF_TRIGGER_HIGH | IRQF_ONESHOT;
-
-        ret = request_threaded_irq(wl->irq, wl1271_hardirq, wl1271_irq,
-                                   irqflags,
-                                   DRIVER_NAME, wl);
-        if (ret < 0) {
-                wl1271_error("request_irq() failed: %d", ret);
-                goto out_free;
-        }
+        if (mmcflags & MMC_PM_KEEP_POWER)
+                wlan_data->pwr_in_suspend = true;
+
+        wlan_data->ops = &sdio_ops;
 
-        ret = enable_irq_wake(wl->irq);
-        if (!ret) {
-                wl->irq_wake_enabled = true;
-                device_init_wakeup(wl1271_sdio_wl_to_dev(wl), 1);
+        sdio_set_drvdata(func, glue);
 
-                /* if sdio can keep power while host is suspended, enable wow */
-                mmcflags = sdio_get_host_pm_caps(func);
-                wl1271_debug(DEBUG_SDIO, "sdio PM caps = 0x%x", mmcflags);
+        /* Tell PM core that we don't need the card to be powered now */
+        pm_runtime_put_noidle(&func->dev);
 
-                if (mmcflags & MMC_PM_KEEP_POWER)
-                        hw->wiphy->wowlan.flags = WIPHY_WOWLAN_ANY;
+        glue->core = platform_device_alloc("wl12xx", -1);
+        if (!glue->core) {
+                dev_err(glue->dev, "can't allocate platform_device");
+                ret = -ENOMEM;
+                goto out_free_glue;
         }
-        disable_irq(wl->irq);
 
-        ret = wl1271_init_ieee80211(wl);
-        if (ret)
-                goto out_irq;
+        glue->core->dev.parent = &func->dev;
 
-        ret = wl1271_register_hw(wl);
-        if (ret)
-                goto out_irq;
+        memset(res, 0x00, sizeof(res));
 
-        sdio_set_drvdata(func, wl);
+        res[0].start = wlan_data->irq;
+        res[0].flags = IORESOURCE_IRQ;
+        res[0].name = "irq";
 
-        /* Tell PM core that we don't need the card to be powered now */
-        pm_runtime_put_noidle(&func->dev);
+        ret = platform_device_add_resources(glue->core, res, ARRAY_SIZE(res));
+        if (ret) {
+                dev_err(glue->dev, "can't add resources\n");
+                goto out_dev_put;
+        }
 
+        ret = platform_device_add_data(glue->core, wlan_data,
+                                       sizeof(*wlan_data));
+        if (ret) {
+                dev_err(glue->dev, "can't add platform data\n");
+                goto out_dev_put;
+        }
+
+        ret = platform_device_add(glue->core);
+        if (ret) {
+                dev_err(glue->dev, "can't add platform device\n");
+                goto out_dev_put;
+        }
         return 0;
 
- out_irq:
-        free_irq(wl->irq, wl);
+out_dev_put:
+        platform_device_put(glue->core);
 
- out_free:
-        wl1271_free_hw(wl);
+out_free_glue:
+        kfree(glue);
 
+out:
         return ret;
 }
 
 static void __devexit wl1271_remove(struct sdio_func *func)
 {
-        struct wl1271 *wl = sdio_get_drvdata(func);
+        struct wl12xx_sdio_glue *glue = sdio_get_drvdata(func);
 
         /* Undo decrement done above in wl1271_probe */
         pm_runtime_get_noresume(&func->dev);
 
-        wl1271_unregister_hw(wl);
-        if (wl->irq_wake_enabled) {
-                device_init_wakeup(wl1271_sdio_wl_to_dev(wl), 0);
-                disable_irq_wake(wl->irq);
-        }
-        free_irq(wl->irq, wl);
-        wl1271_free_hw(wl);
+        platform_device_del(glue->core);
+        platform_device_put(glue->core);
+        kfree(glue);
 }
 
 #ifdef CONFIG_PM
@@ -332,20 +289,21 @@ static int wl1271_suspend(struct device *dev)
         /* Tell MMC/SDIO core it's OK to power down the card
          * (if it isn't already), but not to remove it completely */
         struct sdio_func *func = dev_to_sdio_func(dev);
-        struct wl1271 *wl = sdio_get_drvdata(func);
+        struct wl12xx_sdio_glue *glue = sdio_get_drvdata(func);
+        struct wl1271 *wl = platform_get_drvdata(glue->core);
         mmc_pm_flag_t sdio_flags;
         int ret = 0;
 
-        wl1271_debug(DEBUG_MAC80211, "wl1271 suspend. wow_enabled: %d",
-                     wl->wow_enabled);
+        dev_dbg(dev, "wl1271 suspend. wow_enabled: %d\n",
+                wl->wow_enabled);
 
         /* check whether sdio should keep power */
         if (wl->wow_enabled) {
                 sdio_flags = sdio_get_host_pm_caps(func);
 
                 if (!(sdio_flags & MMC_PM_KEEP_POWER)) {
-                        wl1271_error("can't keep power while host "
-                                     "is suspended");
+                        dev_err(dev, "can't keep power while host "
+                                     "is suspended\n");
                         ret = -EINVAL;
                         goto out;
                 }
@@ -353,7 +311,7 @@ static int wl1271_suspend(struct device *dev)
                 /* keep power while host suspended */
                 ret = sdio_set_host_pm_flags(func, MMC_PM_KEEP_POWER);
                 if (ret) {
-                        wl1271_error("error while trying to keep power");
+                        dev_err(dev, "error while trying to keep power\n");
                         goto out;
                 }
 
@@ -367,9 +325,10 @@ out:
 static int wl1271_resume(struct device *dev)
 {
         struct sdio_func *func = dev_to_sdio_func(dev);
-        struct wl1271 *wl = sdio_get_drvdata(func);
+        struct wl12xx_sdio_glue *glue = sdio_get_drvdata(func);
+        struct wl1271 *wl = platform_get_drvdata(glue->core);
 
-        wl1271_debug(DEBUG_MAC80211, "wl1271 resume");
+        dev_dbg(dev, "wl1271 resume\n");
         if (wl->wow_enabled) {
                 /* claim back host */
                 sdio_claim_host(func);