diff options
Diffstat (limited to 'drivers/mmc')
-rw-r--r-- | drivers/mmc/au1xmmc.c | 2 | ||||
-rw-r--r-- | drivers/mmc/pxamci.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mmc/au1xmmc.c b/drivers/mmc/au1xmmc.c index 447fba5825fd..800527cf40d5 100644 --- a/drivers/mmc/au1xmmc.c +++ b/drivers/mmc/au1xmmc.c | |||
@@ -875,7 +875,7 @@ static void au1xmmc_init_dma(struct au1xmmc_host *host) | |||
875 | host->rx_chan = rxchan; | 875 | host->rx_chan = rxchan; |
876 | } | 876 | } |
877 | 877 | ||
878 | struct const mmc_host_ops au1xmmc_ops = { | 878 | static const struct mmc_host_ops au1xmmc_ops = { |
879 | .request = au1xmmc_request, | 879 | .request = au1xmmc_request, |
880 | .set_ios = au1xmmc_set_ios, | 880 | .set_ios = au1xmmc_set_ios, |
881 | }; | 881 | }; |
diff --git a/drivers/mmc/pxamci.c b/drivers/mmc/pxamci.c index 471e9f4e0530..45a9283ce498 100644 --- a/drivers/mmc/pxamci.c +++ b/drivers/mmc/pxamci.c | |||
@@ -355,7 +355,7 @@ static int pxamci_get_ro(struct mmc_host *mmc) | |||
355 | struct pxamci_host *host = mmc_priv(mmc); | 355 | struct pxamci_host *host = mmc_priv(mmc); |
356 | 356 | ||
357 | if (host->pdata && host->pdata->get_ro) | 357 | if (host->pdata && host->pdata->get_ro) |
358 | return host->pdata->get_ro(mmc->dev); | 358 | return host->pdata->get_ro(mmc_dev(mmc)); |
359 | /* Host doesn't support read only detection so assume writeable */ | 359 | /* Host doesn't support read only detection so assume writeable */ |
360 | return 0; | 360 | return 0; |
361 | } | 361 | } |
@@ -383,7 +383,7 @@ static void pxamci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) | |||
383 | host->power_mode = ios->power_mode; | 383 | host->power_mode = ios->power_mode; |
384 | 384 | ||
385 | if (host->pdata && host->pdata->setpower) | 385 | if (host->pdata && host->pdata->setpower) |
386 | host->pdata->setpower(mmc->dev, ios->vdd); | 386 | host->pdata->setpower(mmc_dev(mmc), ios->vdd); |
387 | 387 | ||
388 | if (ios->power_mode == MMC_POWER_ON) | 388 | if (ios->power_mode == MMC_POWER_ON) |
389 | host->cmdat |= CMDAT_INIT; | 389 | host->cmdat |= CMDAT_INIT; |