Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6caf34cb authored by Brian Norris's avatar Brian Norris Committed by Kalle Valo
Browse files

mwifiex: sdio: don't check for NULL sdio_func 



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: default avatarBrian Norris <briannorris@chromium.org>
Tested-by: default avatarXinming Hu <huxm@marvell.com>
Signed-off-by: default avatarAmitkumar Karwar <akarwar@marvell.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 58b70335

drivers/net/wireless/marvell/mwifiex/sdio.c

+15 −25
Original line number Diff line number Diff line
@@ -188,15 +188,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");

		dev_err(dev, "resume: invalid card or adapter\n");

		return 0;

	}
@@ -272,12 +267,11 @@ 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"

		dev_err(dev, "%s: cannot remain alive while host is"

			" suspended\n", sdio_func_id(func));

		return -ENOSYS;

	}
@@ -287,10 +281,6 @@ static int mwifiex_sdio_suspend(struct device *dev) 
		dev_err(dev, "suspend: invalid card\n");

		return 0;

	}

	} else {

		pr_err("suspend: sdio_func is not specified\n");

		return 0;

	}



	/* Might still be loading firmware */

	wait_for_completion(&card->fw_done);