[PATCH 00/12] dmaengine: remove users of device_control

[PATCH 00/12] dmaengine: remove users of device_control

[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.

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(-)

[PATCH 07/12] spi/atmel: use dmaengine_terminate_all() API

[Vinod Koul]

The drivers should use dmaengine_terminate_all() API instead of
accessing the device_control which will be deprecated soon

Signed-off-by: Vinod Koul <vinod.koul@intel.com>
---
 drivers/spi/spi-atmel.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/spi/spi-atmel.c b/drivers/spi/spi-atmel.c
index 113c83f..649dcb5 100644
--- a/drivers/spi/spi-atmel.c
+++ b/drivers/spi/spi-atmel.c
@@ -482,11 +482,9 @@ error:
 static void atmel_spi_stop_dma(struct atmel_spi *as)
 {
 	if (as->dma.chan_rx)
-		as->dma.chan_rx->device->device_control(as->dma.chan_rx,
-							DMA_TERMINATE_ALL, 0);
+		dmaengine_terminate_all(as->dma.chan_rx);
 	if (as->dma.chan_tx)
-		as->dma.chan_tx->device->device_control(as->dma.chan_tx,
-							DMA_TERMINATE_ALL, 0);
+		dmaengine_terminate_all(as->dma.chan_tx);
 }
 
 static void atmel_spi_release_dma(struct atmel_spi *as)
-- 
1.7.0.4

[PATCH 08/12] spi/spi-dw-mid.c: use dmaengine_slave_config() API

[Vinod Koul]

The drivers should use dmaengine_slave_config() API instead of
accessing the device_control which will be deprecated soon

Signed-off-by: Vinod Koul <vinod.koul@intel.com>
---
 drivers/spi/spi-dw-mid.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/spi/spi-dw-mid.c b/drivers/spi/spi-dw-mid.c
index 6d207af..6c8ad64 100644
--- a/drivers/spi/spi-dw-mid.c
+++ b/drivers/spi/spi-dw-mid.c
@@ -139,8 +139,7 @@ static int mid_spi_dma_transfer(struct dw_spi *dws, int cs_change)
 	txconf.dst_addr_width = DMA_SLAVE_BUSWIDTH_2_BYTES;
 	txconf.device_fc = false;
 
-	txchan->device->device_control(txchan, DMA_SLAVE_CONFIG,
-				       (unsigned long) &txconf);
+	dmaengine_slave_config(txchan, &txconf);
 
 	memset(&dws->tx_sgl, 0, sizeof(dws->tx_sgl));
 	dws->tx_sgl.dma_address = dws->tx_dma;
@@ -162,8 +161,7 @@ static int mid_spi_dma_transfer(struct dw_spi *dws, int cs_change)
 	rxconf.src_addr_width = DMA_SLAVE_BUSWIDTH_2_BYTES;
 	rxconf.device_fc = false;
 
-	rxchan->device->device_control(rxchan, DMA_SLAVE_CONFIG,
-				       (unsigned long) &rxconf);
+	dmaengine_slave_config(txchan, &rxconf);
 
 	memset(&dws->rx_sgl, 0, sizeof(dws->rx_sgl));
 	dws->rx_sgl.dma_address = dws->rx_dma;
-- 
1.7.0.4

Re: [PATCH 07/12] spi/atmel: use dmaengine_terminate_all() API

[Nicolas Ferre]

On 11/10/2014 17:40, Vinod Koul :
> The drivers should use dmaengine_terminate_all() API instead of
> accessing the device_control which will be deprecated soon
> 
> Signed-off-by: Vinod Koul <vinod.koul-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>

sure:
Acked-by: Nicolas Ferre <nicolas.ferre-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>

Thanks Vinod.

Bye,

> ---
>  drivers/spi/spi-atmel.c |    6 ++----
>  1 files changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/spi/spi-atmel.c b/drivers/spi/spi-atmel.c
> index 113c83f..649dcb5 100644
> --- a/drivers/spi/spi-atmel.c
> +++ b/drivers/spi/spi-atmel.c
> @@ -482,11 +482,9 @@ error:
>  static void atmel_spi_stop_dma(struct atmel_spi *as)
>  {
>  	if (as->dma.chan_rx)
> -		as->dma.chan_rx->device->device_control(as->dma.chan_rx,
> -							DMA_TERMINATE_ALL, 0);
> +		dmaengine_terminate_all(as->dma.chan_rx);
>  	if (as->dma.chan_tx)
> -		as->dma.chan_tx->device->device_control(as->dma.chan_tx,
> -							DMA_TERMINATE_ALL, 0);
> +		dmaengine_terminate_all(as->dma.chan_tx);
>  }
>  
>  static void atmel_spi_release_dma(struct atmel_spi *as)
> 


-- 
Nicolas Ferre
--
To unsubscribe from this list: send the line "unsubscribe linux-spi" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 07/12] spi/atmel: use dmaengine_terminate_all() API

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 205 bytes --]

On Sat, Oct 11, 2014 at 09:10:35PM +0530, Vinod Koul wrote:
> The drivers should use dmaengine_terminate_all() API instead of
> accessing the device_control which will be deprecated soon

Applied, thanks.

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 473 bytes --]

Re: [PATCH 08/12] spi/spi-dw-mid.c: use dmaengine_slave_config() API

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 204 bytes --]

On Sat, Oct 11, 2014 at 09:10:36PM +0530, Vinod Koul wrote:
> The drivers should use dmaengine_slave_config() API instead of
> accessing the device_control which will be deprecated soon

Applied, thanks.

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 473 bytes --]

Re: [PATCH 00/12] dmaengine: remove users of device_control

[Vinod Koul]

On Sat, Oct 11, 2014 at 09:09:33PM +0530, Vinod Koul wrote:
> 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

> 
> 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 dmaengine" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

--