mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2025-01-18 09:07:04 +07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc: mmc: fix au1xmmc build error mmc: pxamci compilation fix
This commit is contained in:
commit
1709775828
@ -875,7 +875,7 @@ static void au1xmmc_init_dma(struct au1xmmc_host *host)
|
||||
host->rx_chan = rxchan;
|
||||
}
|
||||
|
||||
struct const mmc_host_ops au1xmmc_ops = {
|
||||
static const struct mmc_host_ops au1xmmc_ops = {
|
||||
.request = au1xmmc_request,
|
||||
.set_ios = au1xmmc_set_ios,
|
||||
};
|
||||
|
@ -355,7 +355,7 @@ static int pxamci_get_ro(struct mmc_host *mmc)
|
||||
struct pxamci_host *host = mmc_priv(mmc);
|
||||
|
||||
if (host->pdata && host->pdata->get_ro)
|
||||
return host->pdata->get_ro(mmc->dev);
|
||||
return host->pdata->get_ro(mmc_dev(mmc));
|
||||
/* Host doesn't support read only detection so assume writeable */
|
||||
return 0;
|
||||
}
|
||||
@ -383,7 +383,7 @@ static void pxamci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
|
||||
host->power_mode = ios->power_mode;
|
||||
|
||||
if (host->pdata && host->pdata->setpower)
|
||||
host->pdata->setpower(mmc->dev, ios->vdd);
|
||||
host->pdata->setpower(mmc_dev(mmc), ios->vdd);
|
||||
|
||||
if (ios->power_mode == MMC_POWER_ON)
|
||||
host->cmdat |= CMDAT_INIT;
|
||||
|
Loading…
Reference in New Issue
Block a user