Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2258b675 authored by Maxime Ripard's avatar Maxime Ripard Committed by Vinod Koul
Browse files

dmaengine: ep93xx: Split device_control 



Split the device_control callback of the Cirrus Logic EP93xx driver to make use
of the newly introduced callbacks, that will eventually be used to retrieve
slave capabilities.

Signed-off-by: default avatarMaxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
parent aa7c09b6

drivers/dma/ep93xx_dma.c

+7 −34
Original line number Diff line number Diff line
@@ -1164,13 +1164,14 @@ ep93xx_dma_prep_dma_cyclic(struct dma_chan *chan, dma_addr_t dma_addr, 


/**

 * ep93xx_dma_terminate_all - terminate all transactions

 * @edmac: channel

 * @chan: channel

 *

 * Stops all DMA transactions. All descriptors are put back to the

 * @edmac->free_list and callbacks are _not_ called.

 */

static int ep93xx_dma_terminate_all(struct ep93xx_dma_chan *edmac)

static int ep93xx_dma_terminate_all(struct dma_chan *chan)

{

	struct ep93xx_dma_chan *edmac = to_ep93xx_dma_chan(chan);

	struct ep93xx_dma_desc *desc, *_d;

	unsigned long flags;

	LIST_HEAD(list);
@@ -1194,9 +1195,10 @@ static int ep93xx_dma_terminate_all(struct ep93xx_dma_chan *edmac) 
	return 0;

}



static int ep93xx_dma_slave_config(struct ep93xx_dma_chan *edmac,

static int ep93xx_dma_slave_config(struct dma_chan *chan,

				   struct dma_slave_config *config)

{

	struct ep93xx_dma_chan *edmac = to_ep93xx_dma_chan(chan);

	enum dma_slave_buswidth width;

	unsigned long flags;

	u32 addr, ctrl;
@@ -1241,36 +1243,6 @@ static int ep93xx_dma_slave_config(struct ep93xx_dma_chan *edmac, 
	return 0;

}



/**

 * ep93xx_dma_control - manipulate all pending operations on a channel

 * @chan: channel

 * @cmd: control command to perform

 * @arg: optional argument

 *

 * Controls the channel. Function returns %0 in case of success or negative

 * error in case of failure.

 */

static int ep93xx_dma_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd,

			      unsigned long arg)

{

	struct ep93xx_dma_chan *edmac = to_ep93xx_dma_chan(chan);

	struct dma_slave_config *config;



	switch (cmd) {

	case DMA_TERMINATE_ALL:

		return ep93xx_dma_terminate_all(edmac);



	case DMA_SLAVE_CONFIG:

		config = (struct dma_slave_config *)arg;

		return ep93xx_dma_slave_config(edmac, config);



	default:

		break;

	}



	return -ENOSYS;

}



/**

 * ep93xx_dma_tx_status - check if a transaction is completed

 * @chan: channel
@@ -1352,7 +1324,8 @@ static int __init ep93xx_dma_probe(struct platform_device *pdev) 
	dma_dev->device_free_chan_resources = ep93xx_dma_free_chan_resources;

	dma_dev->device_prep_slave_sg = ep93xx_dma_prep_slave_sg;

	dma_dev->device_prep_dma_cyclic = ep93xx_dma_prep_dma_cyclic;

	dma_dev->device_control = ep93xx_dma_control;

	dma_dev->device_config = ep93xx_dma_slave_config;

	dma_dev->device_terminate_all = ep93xx_dma_terminate_all;

	dma_dev->device_issue_pending = ep93xx_dma_issue_pending;

	dma_dev->device_tx_status = ep93xx_dma_tx_status;