mmc: sh_mmcif: remove unneeded struct sh_mmcif_dma, prepare to shdma conversion
Now that all users have been updated to use the embedded in struct sh_mmcif_plat_data DMA slave IDs, struct sh_mmcif_dma is no longer needed and can be removed. This also makes preparation to the shdma base library conversion easier. Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Cc: Chris Ball <cjb@laptop.org> Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
This commit is contained in:
parent
5902c9a7a2
commit
916001fe33
|
@ -385,31 +385,27 @@ static void sh_mmcif_request_dma(struct sh_mmcif_host *host,
|
|||
host->dma_active = false;
|
||||
|
||||
/* We can only either use DMA for both Tx and Rx or not use it at all */
|
||||
if (pdata->dma) {
|
||||
dev_warn(&host->pd->dev,
|
||||
"Update your platform to use embedded DMA slave IDs\n");
|
||||
tx = &pdata->dma->chan_priv_tx;
|
||||
rx = &pdata->dma->chan_priv_rx;
|
||||
} else {
|
||||
tx = &host->dma_slave_tx;
|
||||
tx->slave_id = pdata->slave_id_tx;
|
||||
tx->shdma_slave.slave_id = pdata->slave_id_tx;
|
||||
rx = &host->dma_slave_rx;
|
||||
rx->slave_id = pdata->slave_id_rx;
|
||||
}
|
||||
if (tx->slave_id > 0 && rx->slave_id > 0) {
|
||||
rx->shdma_slave.slave_id = pdata->slave_id_rx;
|
||||
|
||||
if (tx->shdma_slave.slave_id > 0 && rx->shdma_slave.slave_id > 0) {
|
||||
dma_cap_mask_t mask;
|
||||
|
||||
dma_cap_zero(mask);
|
||||
dma_cap_set(DMA_SLAVE, mask);
|
||||
|
||||
host->chan_tx = dma_request_channel(mask, sh_mmcif_filter, tx);
|
||||
host->chan_tx = dma_request_channel(mask, sh_mmcif_filter,
|
||||
&tx->shdma_slave);
|
||||
dev_dbg(&host->pd->dev, "%s: TX: got channel %p\n", __func__,
|
||||
host->chan_tx);
|
||||
|
||||
if (!host->chan_tx)
|
||||
return;
|
||||
|
||||
host->chan_rx = dma_request_channel(mask, sh_mmcif_filter, rx);
|
||||
host->chan_rx = dma_request_channel(mask, sh_mmcif_filter,
|
||||
&rx->shdma_slave);
|
||||
dev_dbg(&host->pd->dev, "%s: RX: got channel %p\n", __func__,
|
||||
host->chan_rx);
|
||||
|
||||
|
|
|
@ -32,17 +32,11 @@
|
|||
* 1111 : Peripheral clock (sup_pclk set '1')
|
||||
*/
|
||||
|
||||
struct sh_mmcif_dma {
|
||||
struct sh_dmae_slave chan_priv_tx;
|
||||
struct sh_dmae_slave chan_priv_rx;
|
||||
};
|
||||
|
||||
struct sh_mmcif_plat_data {
|
||||
void (*set_pwr)(struct platform_device *pdev, int state);
|
||||
void (*down_pwr)(struct platform_device *pdev);
|
||||
int (*get_cd)(struct platform_device *pdef);
|
||||
struct sh_mmcif_dma *dma; /* Deprecated. Instead */
|
||||
unsigned int slave_id_tx; /* use embedded slave_id_[tr]x */
|
||||
unsigned int slave_id_tx; /* embedded slave_id_[tr]x */
|
||||
unsigned int slave_id_rx;
|
||||
u8 sup_pclk; /* 1 :SH7757, 0: SH7724/SH7372 */
|
||||
unsigned long caps;
|
||||
|
|
Loading…
Reference in a new issue