aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mmc
diff options
context:
space:
mode:
authorUlf Hansson <ulf.hansson@linaro.org>2013-09-25 07:47:24 -0400
committerChris Ball <cjb@laptop.org>2013-10-30 20:26:42 -0400
commit4d6c5d83395778192a9c14c0f88dabac5d7a9254 (patch)
tree4ea2b8c156c66df83a8aa88f0eb11b8e913323c7 /drivers/mmc
parent29685f6c6a6579bd580ca4d2b9dcb74214525dd1 (diff)
mmc: mvsdio: Remove redundant suspend and resume callbacks
Suspend and resume of cards are handled by the protocol layer and consequently the mmc_suspend|resume_host APIs are marked as deprecated. While moving away from using the deprecated APIs, there are nothing left to be done for the suspend and resume callbacks, so remove them. Cc: Nicolas Pitre <nico@fluxnic.net> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Cc: Jason Cooper <jason@lakedaemon.net> Cc: Andrew Lunn <andrew@lunn.ch> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers/mmc')
-rw-r--r--drivers/mmc/host/mvsdio.c29
1 files changed, 0 insertions, 29 deletions
diff --git a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c
index a592407d2de6..22ba4d33e95b 100644
--- a/drivers/mmc/host/mvsdio.c
+++ b/drivers/mmc/host/mvsdio.c
@@ -838,33 +838,6 @@ static int __exit mvsd_remove(struct platform_device *pdev)
838 return 0; 838 return 0;
839} 839}
840 840
841#ifdef CONFIG_PM
842static int mvsd_suspend(struct platform_device *dev, pm_message_t state)
843{
844 struct mmc_host *mmc = platform_get_drvdata(dev);
845 int ret = 0;
846
847 if (mmc)
848 ret = mmc_suspend_host(mmc);
849
850 return ret;
851}
852
853static int mvsd_resume(struct platform_device *dev)
854{
855 struct mmc_host *mmc = platform_get_drvdata(dev);
856 int ret = 0;
857
858 if (mmc)
859 ret = mmc_resume_host(mmc);
860
861 return ret;
862}
863#else
864#define mvsd_suspend NULL
865#define mvsd_resume NULL
866#endif
867
868static const struct of_device_id mvsdio_dt_ids[] = { 841static const struct of_device_id mvsdio_dt_ids[] = {
869 { .compatible = "marvell,orion-sdio" }, 842 { .compatible = "marvell,orion-sdio" },
870 { /* sentinel */ } 843 { /* sentinel */ }
@@ -873,8 +846,6 @@ MODULE_DEVICE_TABLE(of, mvsdio_dt_ids);
873 846
874static struct platform_driver mvsd_driver = { 847static struct platform_driver mvsd_driver = {
875 .remove = __exit_p(mvsd_remove), 848 .remove = __exit_p(mvsd_remove),
876 .suspend = mvsd_suspend,
877 .resume = mvsd_resume,
878 .driver = { 849 .driver = {
879 .name = DRIVER_NAME, 850 .name = DRIVER_NAME,
880 .of_match_table = mvsdio_dt_ids, 851 .of_match_table = mvsdio_dt_ids,