lkml.org 
[lkml]   [2013]   [Sep]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 25/27] mmc: via-sdmmc: Move away from using deprecated APIs
    Date
    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>
    ---
    drivers/mmc/host/via-sdmmc.c | 7 +------
    1 file changed, 1 insertion(+), 6 deletions(-)

    diff --git a/drivers/mmc/host/via-sdmmc.c b/drivers/mmc/host/via-sdmmc.c
    index 4f84586..63fac78 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)
    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;
    }

    --
    1.7.9.5


    \
     
     \ /
      Last update: 2013-09-26 18:41    [W:4.110 / U:0.440 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site