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

Commit 162d6f98 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

MMC / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM 



After commit b2b49ccb (PM: Kconfig: Set PM_RUNTIME if PM_SLEEP is
selected) PM_RUNTIME is always set if PM is set, so #ifdef blocks
depending on CONFIG_PM_RUNTIME may now be changed to depend on
CONFIG_PM.

Replace CONFIG_PM_RUNTIME with CONFIG_PM everywhere under
drivers/mmc/.

Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 48bb9fe4

drivers/mmc/core/bus.c

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

#endif



#ifdef CONFIG_PM_RUNTIME

#ifdef CONFIG_PM

static int mmc_runtime_suspend(struct device *dev)

{

	struct mmc_card *card = mmc_dev_to_card(dev);
@@ -195,7 +195,7 @@ static int mmc_runtime_resume(struct device *dev) 


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

}

#endif /* !CONFIG_PM_RUNTIME */

#endif /* !CONFIG_PM */



static const struct dev_pm_ops mmc_bus_pm_ops = {

	SET_RUNTIME_PM_OPS(mmc_runtime_suspend, mmc_runtime_resume, NULL)

drivers/mmc/host/sdhci-acpi.c

+1 −1
Original line number Diff line number Diff line
@@ -416,7 +416,7 @@ static int sdhci_acpi_resume(struct device *dev) 


#endif



#ifdef CONFIG_PM_RUNTIME

#ifdef CONFIG_PM



static int sdhci_acpi_runtime_suspend(struct device *dev)

{

drivers/mmc/host/sdhci-esdhc-imx.c

+2 −2
Original line number Diff line number Diff line
@@ -1172,7 +1172,7 @@ static int sdhci_esdhc_imx_remove(struct platform_device *pdev) 
	pm_runtime_dont_use_autosuspend(&pdev->dev);

	pm_runtime_disable(&pdev->dev);



	if (!IS_ENABLED(CONFIG_PM_RUNTIME)) {

	if (!IS_ENABLED(CONFIG_PM)) {

		clk_disable_unprepare(imx_data->clk_per);

		clk_disable_unprepare(imx_data->clk_ipg);

		clk_disable_unprepare(imx_data->clk_ahb);
@@ -1183,7 +1183,7 @@ static int sdhci_esdhc_imx_remove(struct platform_device *pdev) 
	return 0;

}



#ifdef CONFIG_PM_RUNTIME

#ifdef CONFIG_PM

static int sdhci_esdhc_runtime_suspend(struct device *dev)

{

	struct sdhci_host *host = dev_get_drvdata(dev);

drivers/mmc/host/sdhci-pci.c

+7 −11
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ static int pch_hc_probe_slot(struct sdhci_pci_slot *slot) 
	return 0;

}



#ifdef CONFIG_PM_RUNTIME

#ifdef CONFIG_PM



static irqreturn_t sdhci_pci_sd_cd(int irq, void *dev_id)

{
@@ -1230,15 +1230,6 @@ static int sdhci_pci_resume(struct device *dev) 
	return 0;

}



#else /* CONFIG_PM */



#define sdhci_pci_suspend NULL

#define sdhci_pci_resume NULL



#endif /* CONFIG_PM */



#ifdef CONFIG_PM_RUNTIME



static int sdhci_pci_runtime_suspend(struct device *dev)

{

	struct pci_dev *pdev = container_of(dev, struct pci_dev, dev);
@@ -1310,7 +1301,12 @@ static int sdhci_pci_runtime_idle(struct device *dev) 
	return 0;

}



#endif

#else /* CONFIG_PM */



#define sdhci_pci_suspend NULL

#define sdhci_pci_resume NULL



#endif /* CONFIG_PM */



static const struct dev_pm_ops sdhci_pci_pm_ops = {

	.suspend = sdhci_pci_suspend,

drivers/mmc/host/sdhci-pxav3.c

+1 −1
Original line number Diff line number Diff line
@@ -436,7 +436,7 @@ static int sdhci_pxav3_resume(struct device *dev) 
}

#endif



#ifdef CONFIG_PM_RUNTIME

#ifdef CONFIG_PM

static int sdhci_pxav3_runtime_suspend(struct device *dev)

{

	struct sdhci_host *host = dev_get_drvdata(dev);