Skip to content

Commit

Permalink
mmc: core: Remove redundant runtime_idle callback
Browse files Browse the repository at this point in the history
The runtime PM core handles a runtime_idle callback set to NULL as one
returning 0. So, let's just set it to NULL instead.

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Acked-by: Jaehoon Chung <jh80.chung@samsung.com>
  • Loading branch information
Ulf Hansson committed Jul 9, 2014
1 parent 55b604a commit 2e42da5
Showing 1 changed file with 1 addition and 9 deletions.
10 changes: 1 addition & 9 deletions drivers/mmc/core/bus.c
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,6 @@ static int mmc_bus_resume(struct device *dev)
#endif

#ifdef CONFIG_PM_RUNTIME

static int mmc_runtime_suspend(struct device *dev)
{
struct mmc_card *card = mmc_dev_to_card(dev);
Expand All @@ -196,17 +195,10 @@ static int mmc_runtime_resume(struct device *dev)

return host->bus_ops->runtime_resume(host);
}

static int mmc_runtime_idle(struct device *dev)
{
return 0;
}

#endif /* !CONFIG_PM_RUNTIME */

static const struct dev_pm_ops mmc_bus_pm_ops = {
SET_RUNTIME_PM_OPS(mmc_runtime_suspend, mmc_runtime_resume,
mmc_runtime_idle)
SET_RUNTIME_PM_OPS(mmc_runtime_suspend, mmc_runtime_resume, NULL)
SET_SYSTEM_SLEEP_PM_OPS(mmc_bus_suspend, mmc_bus_resume)
};

Expand Down

0 comments on commit 2e42da5

Please sign in to comment.