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

Commit 95442b22 authored by Russell King's avatar Russell King
Browse files

dmaengine: PL08x: get rid of device_fc in struct pl08x_dma_chan 



As we now store the dma_slave_config in pl08x_dma_chan, we don't need
to store this separately.  Use the one in dma_slave_config directly.

Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Tested-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent ed91c13d

drivers/dma/amba-pl08x.c

+1 −7
Original line number Diff line number Diff line
@@ -226,9 +226,6 @@ enum pl08x_dma_chan_state { 
 * @host: a pointer to the host (internal use)

 * @state: whether the channel is idle, paused, running etc

 * @slave: whether this channel is a device (slave) or for memcpy

 * @device_fc: Flow Controller Settings for ccfg register. Only valid for slave

 * channels. Fill with 'true' if peripheral should be flow controller. Direction

 * will be selected at Runtime.

 * @waiting: a TX descriptor on this channel which is waiting for a physical

 * channel to become available

 */
@@ -249,7 +246,6 @@ struct pl08x_dma_chan { 
	struct pl08x_driver_data *host;

	enum pl08x_dma_chan_state state;

	bool slave;

	bool device_fc;

	struct pl08x_txd *waiting;

};
@@ -1261,8 +1257,6 @@ static int dma_set_runtime_config(struct dma_chan *chan, 
	cctl |= burst << PL080_CONTROL_SB_SIZE_SHIFT;

	cctl |= burst << PL080_CONTROL_DB_SIZE_SHIFT;



	plchan->device_fc = config->device_fc;



	if (plchan->runtime_direction == DMA_DEV_TO_MEM) {

		plchan->src_cctl = pl08x_cctl(cctl) | PL080_CONTROL_DST_INCR |

			pl08x_select_bus(plchan->cd->periph_buses,
@@ -1492,7 +1486,7 @@ static struct dma_async_tx_descriptor *pl08x_prep_slave_sg( 
		return NULL;

	}



	if (plchan->device_fc)

	if (plchan->cfg.device_fc)

		tmp = (direction == DMA_MEM_TO_DEV) ? PL080_FLOW_MEM2PER_PER :

			PL080_FLOW_PER2MEM_PER;

	else