Unverified Commit 8d858491 authored by Vignesh Raghavendra's avatar Vignesh Raghavendra Committed by Mark Brown
Browse files

spi: omap2-mcspi: Remove redundant checks 



Both omap2_mcspi_tx_dma() and omap2_mcspi_rx_dma() are only called from
omap2_mcspi_txrx_dma() and omap2_mcspi_txrx_dma() is always called after
making sure that mcspi_dma->dma_rx and mcspi_dma->dma_tx are not NULL
(see omap2_mcspi_transfer_one()).
Therefore remove redundant NULL checks for omap2_mcspi->dma_tx and
omap2_mcspi->dma_rx pointers in omap2_mcspi_tx_dma() and
omap2_mcspi_rx_dma() respectively.

Signed-off-by: default avatarVignesh Raghavendra <vigneshr@ti.com>
Link: https://lore.kernel.org/r/20191109041827.26934-1-vigneshr@ti.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent d575c9b7

drivers/spi/spi-omap2-mcspi.c

+47 −58
Original line number Diff line number Diff line
@@ -397,13 +397,11 @@ static void omap2_mcspi_tx_dma(struct spi_device *spi, 
{

	struct omap2_mcspi	*mcspi;

	struct omap2_mcspi_dma  *mcspi_dma;

	struct dma_async_tx_descriptor *tx;



	mcspi = spi_master_get_devdata(spi->master);

	mcspi_dma = &mcspi->dma_channels[spi->chip_select];



	if (mcspi_dma->dma_tx) {

		struct dma_async_tx_descriptor *tx;



	dmaengine_slave_config(mcspi_dma->dma_tx, &cfg);



	tx = dmaengine_prep_slave_sg(mcspi_dma->dma_tx, xfer->tx_sg.sgl,
@@ -417,10 +415,8 @@ static void omap2_mcspi_tx_dma(struct spi_device *spi, 
	} else {

		/* FIXME: fall back to PIO? */

	}

	}

	dma_async_issue_pending(mcspi_dma->dma_tx);

	omap2_mcspi_set_dma_req(spi, 0, 1);



}



static unsigned
@@ -439,6 +435,7 @@ omap2_mcspi_rx_dma(struct spi_device *spi, struct spi_transfer *xfer, 
	int			word_len, element_count;

	struct omap2_mcspi_cs	*cs = spi->controller_state;

	void __iomem		*chstat_reg = cs->base + OMAP2_MCSPI_CHSTAT0;

	struct dma_async_tx_descriptor *tx;



	mcspi = spi_master_get_devdata(spi->master);

	mcspi_dma = &mcspi->dma_channels[spi->chip_select];
@@ -462,8 +459,6 @@ omap2_mcspi_rx_dma(struct spi_device *spi, struct spi_transfer *xfer, 
	else /* word_len <= 32 */

		element_count = count >> 2;



	if (mcspi_dma->dma_rx) {

		struct dma_async_tx_descriptor *tx;



	dmaengine_slave_config(mcspi_dma->dma_rx, &cfg);
@@ -488,21 +483,16 @@ omap2_mcspi_rx_dma(struct spi_device *spi, struct spi_transfer *xfer, 
		nb_sizes = 1;

	}



		ret = sg_split(xfer->rx_sg.sgl, xfer->rx_sg.nents,

			       0, nb_sizes,

			       sizes,

			       sg_out, out_mapped_nents,

			       GFP_KERNEL);

	ret = sg_split(xfer->rx_sg.sgl, xfer->rx_sg.nents, 0, nb_sizes,

		       sizes, sg_out, out_mapped_nents, GFP_KERNEL);



	if (ret < 0) {

		dev_err(&spi->dev, "sg_split failed\n");

		return 0;

	}



		tx = dmaengine_prep_slave_sg(mcspi_dma->dma_rx,

					     sg_out[0],

					     out_mapped_nents[0],

					     DMA_DEV_TO_MEM,

	tx = dmaengine_prep_slave_sg(mcspi_dma->dma_rx, sg_out[0],

				     out_mapped_nents[0], DMA_DEV_TO_MEM,

				     DMA_PREP_INTERRUPT | DMA_CTRL_ACK);

	if (tx) {

		tx->callback = omap2_mcspi_rx_callback;
@@ -511,7 +501,6 @@ omap2_mcspi_rx_dma(struct spi_device *spi, struct spi_transfer *xfer, 
	} else {

		/* FIXME: fall back to PIO? */

	}

	}



	dma_async_issue_pending(mcspi_dma->dma_rx);

	omap2_mcspi_set_dma_req(spi, 1, 1);

CRA Git | Maintained and supported by SUSTech CRA and CCSE