diff options
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/host/atmel-mci.c | 2 | ||||
| -rw-r--r-- | drivers/mmc/host/mmci.c | 2 | ||||
| -rw-r--r-- | drivers/mmc/host/mxcmmc.c | 2 | ||||
| -rw-r--r-- | drivers/mmc/host/mxs-mmc.c | 2 | ||||
| -rw-r--r-- | drivers/mmc/host/sh_mmcif.c | 4 | ||||
| -rw-r--r-- | drivers/mmc/host/tmio_mmc_dma.c | 4 | 
6 files changed, 8 insertions, 8 deletions
diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c index 3ba865ddebc..492854b09d8 100644 --- a/drivers/mmc/host/atmel-mci.c +++ b/drivers/mmc/host/atmel-mci.c @@ -875,7 +875,7 @@ atmci_prepare_data_dma(struct atmel_mci *host, struct mmc_data *data)  			data->sg_len, direction);  	dmaengine_slave_config(chan, &host->dma_conf); -	desc = chan->device->device_prep_slave_sg(chan, +	desc = dmaengine_prep_slave_sg(chan,  			data->sg, sglen, slave_dirn,  			DMA_PREP_INTERRUPT | DMA_CTRL_ACK);  	if (!desc) diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c index a09c06ba046..c55f9663eb1 100644 --- a/drivers/mmc/host/mmci.c +++ b/drivers/mmc/host/mmci.c @@ -413,7 +413,7 @@ static int mmci_dma_prep_data(struct mmci_host *host, struct mmc_data *data,  		return -EINVAL;  	dmaengine_slave_config(chan, &conf); -	desc = device->device_prep_slave_sg(chan, data->sg, nr_sg, +	desc = dmaengine_prep_slave_sg(chan, data->sg, nr_sg,  					    conf.direction, DMA_CTRL_ACK);  	if (!desc)  		goto unmap_exit; diff --git a/drivers/mmc/host/mxcmmc.c b/drivers/mmc/host/mxcmmc.c index 68b69a91e5e..b2058b43232 100644 --- a/drivers/mmc/host/mxcmmc.c +++ b/drivers/mmc/host/mxcmmc.c @@ -255,7 +255,7 @@ static int mxcmci_setup_data(struct mxcmci_host *host, struct mmc_data *data)  	if (nents != data->sg_len)  		return -EINVAL; -	host->desc = host->dma->device->device_prep_slave_sg(host->dma, +	host->desc = dmaengine_prep_slave_sg(host->dma,  		data->sg, data->sg_len, slave_dirn,  		DMA_PREP_INTERRUPT | DMA_CTRL_ACK); diff --git a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c index 382c835d217..65f36cf2ff3 100644 --- a/drivers/mmc/host/mxs-mmc.c +++ b/drivers/mmc/host/mxs-mmc.c @@ -324,7 +324,7 @@ static struct dma_async_tx_descriptor *mxs_mmc_prep_dma(  		sg_len = SSP_PIO_NUM;  	} -	desc = host->dmach->device->device_prep_slave_sg(host->dmach, +	desc = dmaengine_prep_slave_sg(host->dmach,  				sgl, sg_len, host->slave_dirn, append);  	if (desc) {  		desc->callback = mxs_mmc_dma_irq_callback; diff --git a/drivers/mmc/host/sh_mmcif.c b/drivers/mmc/host/sh_mmcif.c index f5d8b53be33..3d00f1aab87 100644 --- a/drivers/mmc/host/sh_mmcif.c +++ b/drivers/mmc/host/sh_mmcif.c @@ -285,7 +285,7 @@ static void sh_mmcif_start_dma_rx(struct sh_mmcif_host *host)  			 DMA_FROM_DEVICE);  	if (ret > 0) {  		host->dma_active = true; -		desc = chan->device->device_prep_slave_sg(chan, sg, ret, +		desc = dmaengine_prep_slave_sg(chan, sg, ret,  			DMA_DEV_TO_MEM, DMA_PREP_INTERRUPT | DMA_CTRL_ACK);  	} @@ -334,7 +334,7 @@ static void sh_mmcif_start_dma_tx(struct sh_mmcif_host *host)  			 DMA_TO_DEVICE);  	if (ret > 0) {  		host->dma_active = true; -		desc = chan->device->device_prep_slave_sg(chan, sg, ret, +		desc = dmaengine_prep_slave_sg(chan, sg, ret,  			DMA_MEM_TO_DEV, DMA_PREP_INTERRUPT | DMA_CTRL_ACK);  	} diff --git a/drivers/mmc/host/tmio_mmc_dma.c b/drivers/mmc/host/tmio_mmc_dma.c index 7a6e6cc8f8b..def9c54f73f 100644 --- a/drivers/mmc/host/tmio_mmc_dma.c +++ b/drivers/mmc/host/tmio_mmc_dma.c @@ -76,7 +76,7 @@ static void tmio_mmc_start_dma_rx(struct tmio_mmc_host *host)  	ret = dma_map_sg(chan->device->dev, sg, host->sg_len, DMA_FROM_DEVICE);  	if (ret > 0) -		desc = chan->device->device_prep_slave_sg(chan, sg, ret, +		desc = dmaengine_prep_slave_sg(chan, sg, ret,  			DMA_DEV_TO_MEM, DMA_CTRL_ACK);  	if (desc) { @@ -157,7 +157,7 @@ static void tmio_mmc_start_dma_tx(struct tmio_mmc_host *host)  	ret = dma_map_sg(chan->device->dev, sg, host->sg_len, DMA_TO_DEVICE);  	if (ret > 0) -		desc = chan->device->device_prep_slave_sg(chan, sg, ret, +		desc = dmaengine_prep_slave_sg(chan, sg, ret,  			DMA_MEM_TO_DEV, DMA_CTRL_ACK);  	if (desc) {  |