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

Commit d978a2b6 authored by Ulf Hansson's avatar Ulf Hansson Committed by Chris Ball
Browse files

mmc: cb710: Move away from using deprecated APIs 



Suspend and resume of cards are being handled from the protocol layer
and consequently the mmc_suspend|resume_host APIs are deprecated.

This means we can simplify the suspend|resume callbacks by removing the
use of the deprecated APIs.

Cc: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Acked-by: default avatarMichał Mirosław <mirq-linux@rere.qmqm.pl>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent 15a6af4d

drivers/mmc/host/cb710-mmc.c

+1 −9
Original line number Diff line number Diff line
@@ -667,12 +667,6 @@ static const struct mmc_host_ops cb710_mmc_host = { 
static int cb710_mmc_suspend(struct platform_device *pdev, pm_message_t state)

{

	struct cb710_slot *slot = cb710_pdev_to_slot(pdev);

	struct mmc_host *mmc = cb710_slot_to_mmc(slot);

	int err;



	err = mmc_suspend_host(mmc);

	if (err)

		return err;



	cb710_mmc_enable_irq(slot, 0, ~0);

	return 0;
@@ -681,11 +675,9 @@ static int cb710_mmc_suspend(struct platform_device *pdev, pm_message_t state) 
static int cb710_mmc_resume(struct platform_device *pdev)

{

	struct cb710_slot *slot = cb710_pdev_to_slot(pdev);

	struct mmc_host *mmc = cb710_slot_to_mmc(slot);



	cb710_mmc_enable_irq(slot, 0, ~0);



	return mmc_resume_host(mmc);

	return 0;

}



#endif /* CONFIG_PM */