|
@@ -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");
|
|
|
+ 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;
|
|
|
}
|
|
|
|
|
@@ -272,23 +267,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;
|
|
|
}
|
|
|
|