Discussion:
[PATCH 00/12] dmaengine: remove users of device_control
Vinod Koul
2014-10-11 15:39:33 UTC
Permalink
The recent discussion [1] on the API have resulted in moving away from
device_control ioctl method to proper channel APIs.
There are still few users on the device_control which should use the wrappers
existing rather than access device_control.
This will aid us in deprecating and removing device_control, possibly after
the merge window.

These can be merged thru respective subsystem tree or dmaengine tree. Either
way please just let me know.

Feng's kbuild has tested these as well [2]

[1]: http://www.spinics.net/lists/dmaengine/msg02212.html
[2]: http://git.infradead.org/users/vkoul/slave-dma.git/shortlog/refs/heads/topic/dma_control_cleanup

Vinod Koul (12):
pata_arasan_cf: use dmaengine_terminate_all() API
dmaengine: coh901318: use dmaengine_terminate_all() API
[media] V4L2: mx3_camer: use dmaengine_pause() API
mtd: fsmc_nand: use dmaengine_terminate_all() API
mtd: sh_flctl: use dmaengine_terminate_all() API
net: ks8842: use dmaengine_terminate_all() API
spi/atmel: use dmaengine_terminate_all() API
spi/spi-dw-mid.c: use dmaengine_slave_config() API
serial: sh-sci: use dmaengine_terminate_all() API
usb: musb: ux500_dma: use dmaengine_xxx() APIs
ASoC: txx9: use dmaengine_terminate_all() API
video: mx3fb: use dmaengine_terminate_all() API

drivers/ata/pata_arasan_cf.c | 5 ++---
drivers/dma/coh901318.c | 2 +-
drivers/media/platform/soc_camera/mx3_camera.c | 6 ++----
drivers/mtd/nand/fsmc_nand.c | 2 +-
drivers/mtd/nand/sh_flctl.c | 2 +-
drivers/net/ethernet/micrel/ks8842.c | 6 ++----
drivers/spi/spi-atmel.c | 6 ++----
drivers/spi/spi-dw-mid.c | 6 ++----
drivers/tty/serial/sh-sci.c | 2 +-
drivers/usb/musb/ux500_dma.c | 7 ++-----
drivers/video/fbdev/mx3fb.c | 3 +--
sound/soc/txx9/txx9aclc.c | 7 +++----
12 files changed, 20 insertions(+), 34 deletions(-)

--
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to ***@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Vinod Koul
2014-10-11 15:40:38 UTC
Permalink
The drivers should use dmaengine_terminate_all() or dmaengine_slave_config()
API instead of accessing the device_control which will be deprecated soon

Signed-off-by: Vinod Koul <***@intel.com>
---
drivers/usb/musb/ux500_dma.c | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/drivers/usb/musb/ux500_dma.c b/drivers/usb/musb/ux500_dma.c
index 9aad00f..874833d 100644
--- a/drivers/usb/musb/ux500_dma.c
+++ b/drivers/usb/musb/ux500_dma.c
@@ -121,8 +121,7 @@ static bool ux500_configure_channel(struct dma_channel *channel,
slave_conf.dst_maxburst = 16;
slave_conf.device_fc = false;

- dma_chan->device->device_control(dma_chan, DMA_SLAVE_CONFIG,
- (unsigned long) &slave_conf);
+ dmaengine_slave_config(dma_chan, &slave_conf);

dma_desc = dmaengine_prep_slave_sg(dma_chan, &sg, 1, direction,
DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
@@ -246,9 +245,7 @@ static int ux500_dma_channel_abort(struct dma_channel *channel)
musb_writew(epio, MUSB_RXCSR, csr);
}

- ux500_channel->dma_chan->device->
- device_control(ux500_channel->dma_chan,
- DMA_TERMINATE_ALL, 0);
+ dmaengine_terminate_all(ux500_channel->dma_chan);
channel->status = MUSB_DMA_STATUS_FREE;
}
return 0;
--
1.7.0.4
Greg Kroah-Hartman
2014-10-11 20:21:46 UTC
Permalink
Post by Vinod Koul
The drivers should use dmaengine_terminate_all() or dmaengine_slave_config()
API instead of accessing the device_control which will be deprecated soon
Acked-by: Greg Kroah-Hartman <***@linuxfoundation.org>
Felipe Balbi
2014-10-12 00:45:54 UTC
Permalink
Hi,
Post by Vinod Koul
The drivers should use dmaengine_terminate_all() or dmaengine_slave_config()
API instead of accessing the device_control which will be deprecated soon
awesome. It looks like it doesn't have a direct dependency with the rest
of the series, so I'll take this through my tree with Greg's ack, unless
you shout ;-)
--
balbi
Vinod Koul
2014-10-15 15:58:00 UTC
Permalink
Post by Vinod Koul
The recent discussion [1] on the API have resulted in moving away from
device_control ioctl method to proper channel APIs.
There are still few users on the device_control which should use the wrappers
existing rather than access device_control.
This will aid us in deprecating and removing device_control, possibly after
the merge window.
These can be merged thru respective subsystem tree or dmaengine tree. Either
way please just let me know.
Applying to dmaengine-next with acks recived, dropping the ones which are
applied by respective folks
--
~Vinod
Post by Vinod Koul
Feng's kbuild has tested these as well [2]
[1]: http://www.spinics.net/lists/dmaengine/msg02212.html
[2]: http://git.infradead.org/users/vkoul/slave-dma.git/shortlog/refs/heads/topic/dma_control_cleanup
pata_arasan_cf: use dmaengine_terminate_all() API
dmaengine: coh901318: use dmaengine_terminate_all() API
[media] V4L2: mx3_camer: use dmaengine_pause() API
mtd: fsmc_nand: use dmaengine_terminate_all() API
mtd: sh_flctl: use dmaengine_terminate_all() API
net: ks8842: use dmaengine_terminate_all() API
spi/atmel: use dmaengine_terminate_all() API
spi/spi-dw-mid.c: use dmaengine_slave_config() API
serial: sh-sci: use dmaengine_terminate_all() API
usb: musb: ux500_dma: use dmaengine_xxx() APIs
ASoC: txx9: use dmaengine_terminate_all() API
video: mx3fb: use dmaengine_terminate_all() API
drivers/ata/pata_arasan_cf.c | 5 ++---
drivers/dma/coh901318.c | 2 +-
drivers/media/platform/soc_camera/mx3_camera.c | 6 ++----
drivers/mtd/nand/fsmc_nand.c | 2 +-
drivers/mtd/nand/sh_flctl.c | 2 +-
drivers/net/ethernet/micrel/ks8842.c | 6 ++----
drivers/spi/spi-atmel.c | 6 ++----
drivers/spi/spi-dw-mid.c | 6 ++----
drivers/tty/serial/sh-sci.c | 2 +-
drivers/usb/musb/ux500_dma.c | 7 ++-----
drivers/video/fbdev/mx3fb.c | 3 +--
sound/soc/txx9/txx9aclc.c | 7 +++----
12 files changed, 20 insertions(+), 34 deletions(-)
--
To unsubscribe from this list: send the line "unsubscribe dmaengine" in
More majordomo info at http://vger.kernel.org/majordomo-info.html
--
Loading...