aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mmc
diff options
context:
space:
mode:
authorUlf Hansson <ulf.hansson@linaro.org>2013-09-25 10:10:11 -0400
committerChris Ball <cjb@laptop.org>2013-10-30 20:28:28 -0400
commitbfc55a8e86be704903b93122444f05872db20973 (patch)
tree934c3d5321c977525c03a90167ff083d8ba7c16f /drivers/mmc
parent7af37663502ff842846dba1afa2f792afeb41805 (diff)
mmc: s3cmci: 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: Ben Dooks <ben-linux@fluff.org> Cc: linux-arm-kernel@lists.infradead.org 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/s3cmci.c29
1 files changed, 0 insertions, 29 deletions
diff --git a/drivers/mmc/host/s3cmci.c b/drivers/mmc/host/s3cmci.c
index 8d6794cdf899..2fce5ea5eb39 100644
--- a/drivers/mmc/host/s3cmci.c
+++ b/drivers/mmc/host/s3cmci.c
@@ -1949,39 +1949,10 @@ static struct platform_device_id s3cmci_driver_ids[] = {
1949 1949
1950MODULE_DEVICE_TABLE(platform, s3cmci_driver_ids); 1950MODULE_DEVICE_TABLE(platform, s3cmci_driver_ids);
1951 1951
1952
1953#ifdef CONFIG_PM
1954
1955static int s3cmci_suspend(struct device *dev)
1956{
1957 struct mmc_host *mmc = platform_get_drvdata(to_platform_device(dev));
1958
1959 return mmc_suspend_host(mmc);
1960}
1961
1962static int s3cmci_resume(struct device *dev)
1963{
1964 struct mmc_host *mmc = platform_get_drvdata(to_platform_device(dev));
1965
1966 return mmc_resume_host(mmc);
1967}
1968
1969static const struct dev_pm_ops s3cmci_pm = {
1970 .suspend = s3cmci_suspend,
1971 .resume = s3cmci_resume,
1972};
1973
1974#define s3cmci_pm_ops &s3cmci_pm
1975#else /* CONFIG_PM */
1976#define s3cmci_pm_ops NULL
1977#endif /* CONFIG_PM */
1978
1979
1980static struct platform_driver s3cmci_driver = { 1952static struct platform_driver s3cmci_driver = {
1981 .driver = { 1953 .driver = {
1982 .name = "s3c-sdi", 1954 .name = "s3c-sdi",
1983 .owner = THIS_MODULE, 1955 .owner = THIS_MODULE,
1984 .pm = s3cmci_pm_ops,
1985 }, 1956 },
1986 .id_table = s3cmci_driver_ids, 1957 .id_table = s3cmci_driver_ids,
1987 .probe = s3cmci_probe, 1958 .probe = s3cmci_probe,