OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mmc: core: Attach PM domain prior probing of SDIO func driver 

Other subsystem buses attach PM domains during probe, but prior calling
the driver's ->probe() method. During the removal phase, detaching the PM
domain will be done after invoking the driver's ->remove() callback.

Convert the SDIO bus to follow this behavior and add error handling.

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
This commit is contained in:
Ulf Hansson 2015-06-01 12:18:25 +02:00
parent 3056c49c35
commit 1ef48e3ded
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/mmc/core/sdio_bus.c
View File

@ -137,6 +137,10 @@ static int sdio_bus_probe(struct device *dev)
if (!id) if (!id)
return -ENODEV; return -ENODEV;
ret = dev_pm_domain_attach(dev, false);
if (ret == -EPROBE_DEFER)
return ret;
/* Unbound SDIO functions are always suspended. /* Unbound SDIO functions are always suspended.
* During probe, the function is set active and the usage count * During probe, the function is set active and the usage count
* is incremented. If the driver supports runtime PM, * is incremented. If the driver supports runtime PM,
@ -166,6 +170,7 @@ static int sdio_bus_probe(struct device *dev)
disable_runtimepm: disable_runtimepm:
if (func->card->host->caps & MMC_CAP_POWER_OFF_CARD) if (func->card->host->caps & MMC_CAP_POWER_OFF_CARD)
pm_runtime_put_noidle(dev); pm_runtime_put_noidle(dev);
dev_pm_domain_detach(dev, false);
return ret; return ret;
} }
@ -197,6 +202,8 @@ static int sdio_bus_remove(struct device *dev)
if (func->card->host->caps & MMC_CAP_POWER_OFF_CARD) if (func->card->host->caps & MMC_CAP_POWER_OFF_CARD)
pm_runtime_put_sync(dev); pm_runtime_put_sync(dev);
dev_pm_domain_detach(dev, false);
return ret; return ret;
} }
@ -316,10 +323,8 @@ int sdio_add_func(struct sdio_func *func)
sdio_set_of_node(func); sdio_set_of_node(func);
sdio_acpi_set_handle(func); sdio_acpi_set_handle(func);
ret = device_add(&func->dev); ret = device_add(&func->dev);
if (ret == 0) { if (ret == 0)
sdio_func_set_present(func); sdio_func_set_present(func);
dev_pm_domain_attach(&func->dev, false);
}
return ret; return ret;
} }
@ -335,7 +340,6 @@ void sdio_remove_func(struct sdio_func *func)
if (!sdio_func_present(func)) if (!sdio_func_present(func))
return; return;
dev_pm_domain_detach(&func->dev, false);
device_del(&func->dev); device_del(&func->dev);
of_node_put(func->dev.of_node); of_node_put(func->dev.of_node);
put_device(&func->dev); put_device(&func->dev);