[PATCH v3 09/11] mwifiex: sdio: don't check for NULL sdio_func

[Amitkumar Karwar]

From: Brian Norris <briannor...@chromium.org>

sdio_func is retrieved via container_of() and should never be NULL.
Checking for NULL just makes the logic more confusing than necessary.
Stop doing that.

Signed-off-by: Brian Norris <briannor...@chromium.org>
Tested-by: Xinming Hu <h...@marvell.com>
Signed-off-by: Amitkumar Karwar <akar...@marvell.com>
---
v3: Same as v1 and v2
---
 drivers/net/wireless/marvell/mwifiex/sdio.c | 40 +++++++++++------------------
 1 file changed, 15 insertions(+), 25 deletions(-)

diff --git a/drivers/net/wireless/marvell/mwifiex/sdio.c 
b/drivers/net/wireless/marvell/mwifiex/sdio.c
index 4c4b012..bee7326 100644
--- a/drivers/net/wireless/marvell/mwifiex/sdio.c
+++ b/drivers/net/wireless/marvell/mwifiex/sdio.c
@@ -190,15 +190,10 @@ static int mwifiex_sdio_resume(struct device *dev)
        struct mwifiex_adapter *adapter;
        mmc_pm_flag_t pm_flag = 0;
 
-       if (func) {
-               pm_flag = sdio_get_host_pm_caps(func);
-               card = sdio_get_drvdata(func);
-               if (!card || !card->adapter) {
-                       pr_err("resume: invalid card or adapter\n");
-                       return 0;
-               }
-       } else {
-               pr_err("resume: sdio_func is not specified\n");
+       pm_flag = sdio_get_host_pm_caps(func);
+       card = sdio_get_drvdata(func);
+       if (!card || !card->adapter) {
+               dev_err(dev, "resume: invalid card or adapter\n");
                return 0;
        }
 
@@ -274,23 +269,18 @@ static int mwifiex_sdio_suspend(struct device *dev)
        mmc_pm_flag_t pm_flag = 0;
        int ret = 0;
 
-       if (func) {
-               pm_flag = sdio_get_host_pm_caps(func);
-               pr_debug("cmd: %s: suspend: PM flag = 0x%x\n",
-                        sdio_func_id(func), pm_flag);
-               if (!(pm_flag & MMC_PM_KEEP_POWER)) {
-                       pr_err("%s: cannot remain alive while host is"
-                               " suspended\n", sdio_func_id(func));
-                       return -ENOSYS;
-               }
+       pm_flag = sdio_get_host_pm_caps(func);
+       pr_debug("cmd: %s: suspend: PM flag = 0x%x\n",
+                sdio_func_id(func), pm_flag);
+       if (!(pm_flag & MMC_PM_KEEP_POWER)) {
+               dev_err(dev, "%s: cannot remain alive while host is"
+                       " suspended\n", sdio_func_id(func));
+               return -ENOSYS;
+       }
 
-               card = sdio_get_drvdata(func);
-               if (!card) {
-                       dev_err(dev, "suspend: invalid card\n");
-                       return 0;
-               }
-       } else {
-               pr_err("suspend: sdio_func is not specified\n");
+       card = sdio_get_drvdata(func);
+       if (!card) {
+               dev_err(dev, "suspend: invalid card\n");
                return 0;
        }
 
-- 
1.9.1