diff options
author | Ulf Hansson <ulf.hansson@linaro.org> | 2013-09-26 04:47:11 -0400 |
---|---|---|
committer | Chris Ball <cjb@laptop.org> | 2013-10-30 20:28:36 -0400 |
commit | ccad9b973f50144dddd05e9704b0eb4060c316a3 (patch) | |
tree | 9e6398876cd84ae472a8f86d3bb8264166e1b871 /drivers/mmc | |
parent | d62c9577f950b1ce9b53200542c251ba8dfff344 (diff) |
mmc: via-sdmmc: 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: Bruce Chang <brucechang@via.com.tw>
Cc: Harald Welte <HaraldWelte@viatech.com>
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/via-sdmmc.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/mmc/host/via-sdmmc.c b/drivers/mmc/host/via-sdmmc.c index 4f84586c6e9e..63fac78b3d46 100644 --- a/drivers/mmc/host/via-sdmmc.c +++ b/drivers/mmc/host/via-sdmmc.c | |||
@@ -1269,21 +1269,18 @@ static void via_init_sdc_pm(struct via_crdr_mmc_host *host) | |||
1269 | static int via_sd_suspend(struct pci_dev *pcidev, pm_message_t state) | 1269 | static int via_sd_suspend(struct pci_dev *pcidev, pm_message_t state) |
1270 | { | 1270 | { |
1271 | struct via_crdr_mmc_host *host; | 1271 | struct via_crdr_mmc_host *host; |
1272 | int ret = 0; | ||
1273 | 1272 | ||
1274 | host = pci_get_drvdata(pcidev); | 1273 | host = pci_get_drvdata(pcidev); |
1275 | 1274 | ||
1276 | via_save_pcictrlreg(host); | 1275 | via_save_pcictrlreg(host); |
1277 | via_save_sdcreg(host); | 1276 | via_save_sdcreg(host); |
1278 | 1277 | ||
1279 | ret = mmc_suspend_host(host->mmc); | ||
1280 | |||
1281 | pci_save_state(pcidev); | 1278 | pci_save_state(pcidev); |
1282 | pci_enable_wake(pcidev, pci_choose_state(pcidev, state), 0); | 1279 | pci_enable_wake(pcidev, pci_choose_state(pcidev, state), 0); |
1283 | pci_disable_device(pcidev); | 1280 | pci_disable_device(pcidev); |
1284 | pci_set_power_state(pcidev, pci_choose_state(pcidev, state)); | 1281 | pci_set_power_state(pcidev, pci_choose_state(pcidev, state)); |
1285 | 1282 | ||
1286 | return ret; | 1283 | return 0; |
1287 | } | 1284 | } |
1288 | 1285 | ||
1289 | static int via_sd_resume(struct pci_dev *pcidev) | 1286 | static int via_sd_resume(struct pci_dev *pcidev) |
@@ -1316,8 +1313,6 @@ static int via_sd_resume(struct pci_dev *pcidev) | |||
1316 | via_restore_pcictrlreg(sdhost); | 1313 | via_restore_pcictrlreg(sdhost); |
1317 | via_init_sdc_pm(sdhost); | 1314 | via_init_sdc_pm(sdhost); |
1318 | 1315 | ||
1319 | ret = mmc_resume_host(sdhost->mmc); | ||
1320 | |||
1321 | return ret; | 1316 | return ret; |
1322 | } | 1317 | } |
1323 | 1318 | ||