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

Unverified Commit 45e41bc5 authored by Colin Ian King's avatar Colin Ian King Committed by Mark Brown
Browse files

spi: omap2-mcspi: remove several redundant variables 



Variable count, l, mcspi and spi_cntrl are being assigned but are
never used hence they are redundant and can be removed.

Cleans up clang warnings:
warning: variable 'count' set but not used [-Wunused-but-set-variable]
warning: variable 'l' set but not used [-Wunused-but-set-variable]
warning: variable 'mcspi' set but not used [-Wunused-but-set-variable]
warning: variable 'spi_cntrl' set but not used [-Wunused-but-set-variable]

Signed-off-by: default avatarColin Ian King <colin.king@canonical.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent c2c25cc3

drivers/spi/spi-omap2-mcspi.c

+0 −9
Original line number Diff line number Diff line
@@ -398,11 +398,9 @@ static void omap2_mcspi_tx_dma(struct spi_device *spi, 
{

	struct omap2_mcspi	*mcspi;

	struct omap2_mcspi_dma  *mcspi_dma;

	unsigned int		count;



	mcspi = spi_master_get_devdata(spi->master);

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

	count = xfer->len;



	if (mcspi_dma->dma_tx) {

		struct dma_async_tx_descriptor *tx;
@@ -582,7 +580,6 @@ omap2_mcspi_txrx_dma(struct spi_device *spi, struct spi_transfer *xfer) 
	struct omap2_mcspi_cs	*cs = spi->controller_state;

	struct omap2_mcspi_dma  *mcspi_dma;

	unsigned int		count;

	u32			l;

	u8			*rx;

	const u8		*tx;

	struct dma_slave_config	cfg;
@@ -595,8 +592,6 @@ omap2_mcspi_txrx_dma(struct spi_device *spi, struct spi_transfer *xfer) 


	mcspi = spi_master_get_devdata(spi->master);

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

	l = mcspi_cached_chconf0(spi);





	if (cs->word_len <= 8) {

		width = DMA_SLAVE_BUSWIDTH_1_BYTE;
@@ -676,7 +671,6 @@ omap2_mcspi_txrx_dma(struct spi_device *spi, struct spi_transfer *xfer) 
static unsigned

omap2_mcspi_txrx_pio(struct spi_device *spi, struct spi_transfer *xfer)

{

	struct omap2_mcspi	*mcspi;

	struct omap2_mcspi_cs	*cs = spi->controller_state;

	unsigned int		count, c;

	u32			l;
@@ -686,7 +680,6 @@ omap2_mcspi_txrx_pio(struct spi_device *spi, struct spi_transfer *xfer) 
	void __iomem		*chstat_reg;

	int			word_len;



	mcspi = spi_master_get_devdata(spi->master);

	count = xfer->len;

	c = count;

	word_len = cs->word_len;
@@ -883,13 +876,11 @@ static int omap2_mcspi_setup_transfer(struct spi_device *spi, 
{

	struct omap2_mcspi_cs *cs = spi->controller_state;

	struct omap2_mcspi *mcspi;

	struct spi_master *spi_cntrl;

	u32 l = 0, clkd = 0, div, extclk = 0, clkg = 0;

	u8 word_len = spi->bits_per_word;

	u32 speed_hz = spi->max_speed_hz;



	mcspi = spi_master_get_devdata(spi->master);

	spi_cntrl = mcspi->master;



	if (t != NULL && t->bits_per_word)

		word_len = t->bits_per_word;