Skip to content

Commit

Permalink
mmc: via-sdmmc: Move away from using deprecated APIs
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Ulf Hansson authored and Chris Ball committed Oct 31, 2013

Unverified

No user is associated with the committer email.
1 parent d62c957 commit ccad9b9
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions drivers/mmc/host/via-sdmmc.c
Original file line number Diff line number Diff line change
@@ -1269,21 +1269,18 @@ static void via_init_sdc_pm(struct via_crdr_mmc_host *host)
static int via_sd_suspend(struct pci_dev *pcidev, pm_message_t state)
{
struct via_crdr_mmc_host *host;
int ret = 0;

host = pci_get_drvdata(pcidev);

via_save_pcictrlreg(host);
via_save_sdcreg(host);

ret = mmc_suspend_host(host->mmc);

pci_save_state(pcidev);
pci_enable_wake(pcidev, pci_choose_state(pcidev, state), 0);
pci_disable_device(pcidev);
pci_set_power_state(pcidev, pci_choose_state(pcidev, state));

return ret;
return 0;
}

static int via_sd_resume(struct pci_dev *pcidev)
@@ -1316,8 +1313,6 @@ static int via_sd_resume(struct pci_dev *pcidev)
via_restore_pcictrlreg(sdhost);
via_init_sdc_pm(sdhost);

ret = mmc_resume_host(sdhost->mmc);

return ret;
}

0 comments on commit ccad9b9

Please sign in to comment.