target/linux/omap/patches-3.12/902-wlcore-remove-pwr_in_suspend-from-platform-data.patch

   1 The pwr_in_suspend flag depends on the MMC settings which can be
   2 retrieved from the SDIO subsystem, so it doesn't need to be part of
   3 the platform data structure.  Move it to the platform device data that
   4 is passed from SDIO to wlcore.
   5
   6 Signed-off-by: Luciano Coelho <coelho@ti.com>
   7 Reviewed-by: Felipe Balbi <balbi@ti.com>
   8
   9 ---
  10  drivers/net/wireless/ti/wlcore/main.c     | 3 +--
  11  drivers/net/wireless/ti/wlcore/sdio.c     | 2 +-
  12  drivers/net/wireless/ti/wlcore/wlcore_i.h | 1 +
  13  include/linux/wl12xx.h                    | 1 -
  14  4 files changed, 3 insertions(+), 4 deletions(-)
  15
  16 --- a/drivers/net/wireless/ti/wlcore/main.c
  17 +++ b/drivers/net/wireless/ti/wlcore/main.c
  18 @@ -5901,7 +5901,6 @@ static void wlcore_nvs_cb(const struct f
  19         struct wl1271 *wl = context;
  20         struct platform_device *pdev = wl->pdev;
  21         struct wlcore_platdev_data *pdev_data = pdev->dev.platform_data;
  22 -       struct wl12xx_platform_data *pdata = pdev_data->pdata;
  23
  24         int ret;
  25
  26 @@ -5948,7 +5947,7 @@ static void wlcore_nvs_cb(const struct f
  27         if (!ret) {
  28                 wl->irq_wake_enabled = true;
  29                 device_init_wakeup(wl->dev, 1);
  30 -               if (pdata->pwr_in_suspend)
  31 +               if (pdev_data->pwr_in_suspend)
  32                         wl->hw->wiphy->wowlan = &wlcore_wowlan_support;
  33         }
  34  #endif
  35 --- a/drivers/net/wireless/ti/wlcore/sdio.c
  36 +++ b/drivers/net/wireless/ti/wlcore/sdio.c
  37 @@ -260,7 +260,7 @@ static int wl1271_probe(struct sdio_func
  38         dev_dbg(glue->dev, "sdio PM caps = 0x%x\n", mmcflags);
  39
  40         if (mmcflags & MMC_PM_KEEP_POWER)
  41 -               pdev_data->pdata->pwr_in_suspend = true;
  42 +               pdev_data->pwr_in_suspend = true;
  43
  44         sdio_set_drvdata(func, glue);
  45
  46 --- a/drivers/net/wireless/ti/wlcore/wlcore_i.h
  47 +++ b/drivers/net/wireless/ti/wlcore/wlcore_i.h
  48 @@ -209,6 +209,7 @@ struct wl1271_if_operations {
  49  struct wlcore_platdev_data {
  50         struct wl12xx_platform_data *pdata;
  51         struct wl1271_if_operations *if_ops;
  52 +       bool pwr_in_suspend;
  53  };
  54
  55  #define MAX_NUM_KEYS 14
  56 --- a/include/linux/wl12xx.h
  57 +++ b/include/linux/wl12xx.h
  58 @@ -59,7 +59,6 @@ struct wl12xx_platform_data {
  59         int irq;
  60         int board_ref_clock;
  61         int board_tcxo_clock;
  62 -       bool pwr_in_suspend;
  63  };
  64
  65  #ifdef CONFIG_WILINK_PLATFORM_DATA