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

Unverified Commit d9071b7e authored by Emil Renner Berthing's avatar Emil Renner Berthing Committed by Mark Brown
Browse files

spi: rockchip: directly use direction constants 



The dma direction for the tx and rx dma channels never
change, so just use the constants directly rather
than storing them in device data.

Signed-off-by: default avatarEmil Renner Berthing <kernel@esmil.dk>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent f340b920

drivers/spi/spi-rockchip.c

+4 −7
Original line number Diff line number Diff line
@@ -164,7 +164,6 @@ enum rockchip_ssi_type { 


struct rockchip_spi_dma_data {

	struct dma_chan *ch;

	enum dma_transfer_direction direction;

	dma_addr_t addr;

};
@@ -451,7 +450,7 @@ static int rockchip_spi_prepare_dma(struct rockchip_spi *rs) 


	rxdesc = NULL;

	if (rs->rx) {

		rxconf.direction = rs->dma_rx.direction;

		rxconf.direction = DMA_DEV_TO_MEM;

		rxconf.src_addr = rs->dma_rx.addr;

		rxconf.src_addr_width = rs->n_bytes;

		rxconf.src_maxburst = 1;
@@ -460,7 +459,7 @@ static int rockchip_spi_prepare_dma(struct rockchip_spi *rs) 
		rxdesc = dmaengine_prep_slave_sg(

				rs->dma_rx.ch,

				rs->rx_sg.sgl, rs->rx_sg.nents,

				rs->dma_rx.direction, DMA_PREP_INTERRUPT);

				DMA_DEV_TO_MEM, DMA_PREP_INTERRUPT);

		if (!rxdesc)

			return -EINVAL;
@@ -470,7 +469,7 @@ static int rockchip_spi_prepare_dma(struct rockchip_spi *rs) 


	txdesc = NULL;

	if (rs->tx) {

		txconf.direction = rs->dma_tx.direction;

		txconf.direction = DMA_MEM_TO_DEV;

		txconf.dst_addr = rs->dma_tx.addr;

		txconf.dst_addr_width = rs->n_bytes;

		txconf.dst_maxburst = rs->fifo_len / 2;
@@ -479,7 +478,7 @@ static int rockchip_spi_prepare_dma(struct rockchip_spi *rs) 
		txdesc = dmaengine_prep_slave_sg(

				rs->dma_tx.ch,

				rs->tx_sg.sgl, rs->tx_sg.nents,

				rs->dma_tx.direction, DMA_PREP_INTERRUPT);

				DMA_MEM_TO_DEV, DMA_PREP_INTERRUPT);

		if (!txdesc) {

			if (rxdesc)

				dmaengine_terminate_sync(rs->dma_rx.ch);
@@ -775,8 +774,6 @@ static int rockchip_spi_probe(struct platform_device *pdev) 
	if (rs->dma_tx.ch && rs->dma_rx.ch) {

		rs->dma_tx.addr = (dma_addr_t)(mem->start + ROCKCHIP_SPI_TXDR);

		rs->dma_rx.addr = (dma_addr_t)(mem->start + ROCKCHIP_SPI_RXDR);

		rs->dma_tx.direction = DMA_MEM_TO_DEV;

		rs->dma_rx.direction = DMA_DEV_TO_MEM;



		master->can_dma = rockchip_spi_can_dma;

		master->dma_tx = rs->dma_tx.ch;