Merge tag 'trace-seq-buf-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/roste...

[cascardo/linux.git] / drivers / mmc / host / msm_sdcc.c

diff --git a/drivers/mmc/host/msm_sdcc.c b/drivers/mmc/host/msm_sdcc.c
index 9405ecd..90c60fd 100644 (file)
--- a/drivers/mmc/host/msm_sdcc.c
+++ b/drivers/mmc/host/msm_sdcc.c
@@ -1360,7 +1360,7 @@ msmsdcc_probe(struct platform_device *pdev)
        if (ret)
                goto cmd_irq_free;
 
-       mmc_set_drvdata(pdev, mmc);
+       platform_set_drvdata(pdev, mmc);
        mmc_add_host(mmc);
 
        pr_info("%s: Qualcomm MSM SDCC at 0x%016llx irq %d,%d dma %d\n",
@@ -1419,7 +1419,7 @@ ioremap_free:
 static int
 msmsdcc_suspend(struct platform_device *dev, pm_message_t state)
 {
-       struct mmc_host *mmc = mmc_get_drvdata(dev);
+       struct mmc_host *mmc = platform_get_drvdata(dev);
 
        if (mmc) {
                struct msmsdcc_host *host = mmc_priv(mmc);
@@ -1437,7 +1437,7 @@ msmsdcc_suspend(struct platform_device *dev, pm_message_t state)
 static int
 msmsdcc_resume(struct platform_device *dev)
 {
-       struct mmc_host *mmc = mmc_get_drvdata(dev);
+       struct mmc_host *mmc = platform_get_drvdata(dev);
 
        if (mmc) {
                struct msmsdcc_host *host = mmc_priv(mmc);