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

Commit ed24e1ff authored by Shawn Lin's avatar Shawn Lin Committed by Ulf Hansson
Browse files

mmc: dw_mmc: remove system PM callback 



Now there are no variant drivers using dw_mci_suspend
and dw_mci_resume, so let's remove it.

Signed-off-by: default avatarShawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: default avatarJaehoon Chung <jh80.chung@samsung.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent ee2112be

drivers/mmc/host/dw_mmc.c

+27 −54
Original line number Diff line number Diff line
@@ -3268,27 +3268,41 @@ EXPORT_SYMBOL(dw_mci_remove); 




#ifdef CONFIG_PM

/*

 * TODO: we should probably disable the clock to the card in the suspend path.

 */

int dw_mci_suspend(struct dw_mci *host)

int dw_mci_runtime_suspend(struct device *dev)

{

	struct dw_mci *host = dev_get_drvdata(dev);



	if (host->use_dma && host->dma_ops->exit)

		host->dma_ops->exit(host);



	clk_disable_unprepare(host->ciu_clk);



	if (host->cur_slot &&

	    (mmc_can_gpio_cd(host->cur_slot->mmc) ||

	     !mmc_card_is_removable(host->cur_slot->mmc)))

		clk_disable_unprepare(host->biu_clk);



	return 0;

}

EXPORT_SYMBOL(dw_mci_suspend);

EXPORT_SYMBOL(dw_mci_runtime_suspend);



int dw_mci_resume(struct dw_mci *host)

int dw_mci_runtime_resume(struct device *dev)

{

	int i, ret;

	int i, ret = 0;

	struct dw_mci *host = dev_get_drvdata(dev);



	if (!dw_mci_ctrl_reset(host, SDMMC_CTRL_ALL_RESET_FLAGS)) {

		ret = -ENODEV;

	if (host->cur_slot &&

	    (mmc_can_gpio_cd(host->cur_slot->mmc) ||

	     !mmc_card_is_removable(host->cur_slot->mmc))) {

		ret = clk_prepare_enable(host->biu_clk);

		if (ret)

			return ret;

	}



	ret = clk_prepare_enable(host->ciu_clk);

	if (ret)

		return ret;



	if (host->use_dma && host->dma_ops->init)

		host->dma_ops->init(host);
@@ -3322,49 +3336,8 @@ int dw_mci_resume(struct dw_mci *host) 
	/* Now that slots are all setup, we can enable card detect */

	dw_mci_enable_cd(host);



	return 0;

}

EXPORT_SYMBOL(dw_mci_resume);



int dw_mci_runtime_suspend(struct device *dev)

{

	int err = 0;

	struct dw_mci *host = dev_get_drvdata(dev);



	err = dw_mci_suspend(host);

	if (err)

		return err;



	clk_disable_unprepare(host->ciu_clk);



	if (host->cur_slot &&

	    (mmc_can_gpio_cd(host->cur_slot->mmc) ||

	     !mmc_card_is_removable(host->cur_slot->mmc)))

		clk_disable_unprepare(host->biu_clk);



	return err;

}

EXPORT_SYMBOL(dw_mci_runtime_suspend);



int dw_mci_runtime_resume(struct device *dev)

{

	int ret = 0;

	struct dw_mci *host = dev_get_drvdata(dev);



	if (host->cur_slot &&

	    (mmc_can_gpio_cd(host->cur_slot->mmc) ||

	     !mmc_card_is_removable(host->cur_slot->mmc))) {

		ret = clk_prepare_enable(host->biu_clk);

		if (ret)

	return ret;

}



	ret = clk_prepare_enable(host->ciu_clk);

	if (ret)

		return ret;



	return dw_mci_resume(host);

}

EXPORT_SYMBOL(dw_mci_runtime_resume);

#endif /* CONFIG_PM */

drivers/mmc/host/dw_mmc.h

+0 −2
Original line number Diff line number Diff line
@@ -235,8 +235,6 @@ 
extern int dw_mci_probe(struct dw_mci *host);

extern void dw_mci_remove(struct dw_mci *host);

#ifdef CONFIG_PM

extern int dw_mci_suspend(struct dw_mci *host);

extern int dw_mci_resume(struct dw_mci *host);

extern int dw_mci_runtime_suspend(struct device *device);

extern int dw_mci_runtime_resume(struct device *device);

#endif