backports: fix unused mwifiex_sdio_resume() warning

This fixes the following warning:

/drivers/net/wireless/mwifiex/sdio.c:124:12: warning: ‘mwifiex_sdio_resume’ defined but not used [-Wunused-function]
 static int mwifiex_sdio_resume(struct device *dev)
            ^

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

diff --git a/patches/collateral-evolutions/network/29-sdio_no_suspend/drivers_net_wireless_mwifiex_sdio.patch b/patches/collateral-evolutions/network/29-sdio_no_suspend/drivers_net_wireless_mwifiex_sdio.patch
index 11a30396597b3123a0b6b6ef5f4d1dcffcdc8a72..21b81091b144d4f7ec48cc7a7fb910244ad7d93e 100644 (file)
--- a/patches/collateral-evolutions/network/29-sdio_no_suspend/drivers_net_wireless_mwifiex_sdio.patch
+++ b/patches/collateral-evolutions/network/29-sdio_no_suspend/drivers_net_wireless_mwifiex_sdio.patch
@@ -1,6 +1,22 @@
 --- a/drivers/net/wireless/mwifiex/sdio.c
 +++ b/drivers/net/wireless/mwifiex/sdio.c
-@@ -183,8 +183,10 @@ mwifiex_sdio_remove(struct sdio_func *fu
+@@ -111,6 +111,7 @@ mwifiex_sdio_probe(struct sdio_func *fun
+       return ret;
+ }
+ 
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34))
+ /*
+  * SDIO resume.
+  *
+@@ -155,6 +156,7 @@ static int mwifiex_sdio_resume(struct de
+ 
+       return 0;
+ }
++#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34)) */
+ 
+ /*
+  * SDIO remove.
+@@ -183,8 +185,10 @@ mwifiex_sdio_remove(struct sdio_func *fu
        wait_for_completion(&adapter->fw_load);
  
        if (user_rmmod) {
@@ -11,7 +27,7 @@
  
                for (i = 0; i < adapter->priv_num; i++)
                        if ((GET_BSS_ROLE(adapter->priv[i]) ==
-@@ -200,6 +202,7 @@ mwifiex_sdio_remove(struct sdio_func *fu
+@@ -200,6 +204,7 @@ mwifiex_sdio_remove(struct sdio_func *fu
        mwifiex_remove_card(card->adapter, &add_remove_card_sem);
  }
  
@@ -19,7 +35,7 @@
  /*
   * SDIO suspend.
   *
-@@ -254,6 +257,7 @@ static int mwifiex_sdio_suspend(struct d
+@@ -254,6 +259,7 @@ static int mwifiex_sdio_suspend(struct d
  
        return ret;
  }
@@ -27,7 +43,7 @@
  
  /* Device ID for SD8786 */
  #define SDIO_DEVICE_ID_MARVELL_8786   (0x9116)
-@@ -279,10 +283,12 @@ static const struct sdio_device_id mwifi
+@@ -279,10 +285,12 @@ static const struct sdio_device_id mwifi
  
  MODULE_DEVICE_TABLE(sdio, mwifiex_ids);
  
@@ -40,7 +56,7 @@
  
  static struct sdio_driver mwifiex_sdio = {
        .name = "mwifiex_sdio",
-@@ -291,7 +297,9 @@ static struct sdio_driver mwifiex_sdio =
+@@ -291,7 +299,9 @@ static struct sdio_driver mwifiex_sdio =
        .remove = mwifiex_sdio_remove,
        .drv = {
                .owner = THIS_MODULE,