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

Commit 571dce4f authored by Ulf Hansson's avatar Ulf Hansson
Browse files

mmc: mmci: Let runtime PM callbacks be available for CONFIG_PM 



Convert to the SET_PM_RUNTIME_PM macro while defining the runtime PM
callbacks. This means the callbacks becomes available for both
CONFIG_PM_SLEEP and CONFIG_PM_RUNTIME, which is needed to handle the
combinations of these scenarios.

Cc: Russell King <linux@arm.linux.org.uk>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 42dcc89a

drivers/mmc/host/mmci.c

+2 −2
Original line number Diff line number Diff line
@@ -1789,7 +1789,7 @@ static int mmci_resume(struct device *dev) 
}

#endif



#ifdef CONFIG_PM_RUNTIME

#ifdef CONFIG_PM

static void mmci_save(struct mmci_host *host)

{

	unsigned long flags;
@@ -1857,7 +1857,7 @@ static int mmci_runtime_resume(struct device *dev) 


static const struct dev_pm_ops mmci_dev_pm_ops = {

	SET_SYSTEM_SLEEP_PM_OPS(mmci_suspend, mmci_resume)

	SET_RUNTIME_PM_OPS(mmci_runtime_suspend, mmci_runtime_resume, NULL)

	SET_PM_RUNTIME_PM_OPS(mmci_runtime_suspend, mmci_runtime_resume, NULL)

};



static struct amba_id mmci_ids[] = {