diff options
author | Shubhrajyoti D <shubhrajyoti@ti.com> | 2012-11-19 01:42:29 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-02 10:17:50 -0500 |
commit | 6a47d80308a824c32c47fbef6b8e8b59de08af94 (patch) | |
tree | 9e4af126d10048243553bd5c7531fc7ad7866d5e /drivers/spi | |
parent | 170c2d0a87922adb43a8e8ca47cba3e30407d4d6 (diff) |
spi: omap2-mcspi: Fix the redifine warning
Fix the below warning
drivers/spi/spi-omap2-mcspi.c:336:34: warning: symbol 'tx' shadows an earlier one
drivers/spi/spi-omap2-mcspi.c:327:12: originally declared here
So delete the u8 tx as it is assigned and not used(resigned afterwards).
Signed-off-by: Shubhrajyoti D <shubhrajyoti@ti.com>
Acked-by: Peter Korsgaard <jacmet@sunsite.dk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'drivers/spi')
-rw-r--r-- | drivers/spi/spi-omap2-mcspi.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/spi/spi-omap2-mcspi.c b/drivers/spi/spi-omap2-mcspi.c index cc4f2dd89b5..d1895f70019 100644 --- a/drivers/spi/spi-omap2-mcspi.c +++ b/drivers/spi/spi-omap2-mcspi.c | |||
@@ -324,14 +324,11 @@ static void omap2_mcspi_tx_dma(struct spi_device *spi, | |||
324 | struct omap2_mcspi *mcspi; | 324 | struct omap2_mcspi *mcspi; |
325 | struct omap2_mcspi_dma *mcspi_dma; | 325 | struct omap2_mcspi_dma *mcspi_dma; |
326 | unsigned int count; | 326 | unsigned int count; |
327 | const u8 * tx; | ||
328 | 327 | ||
329 | mcspi = spi_master_get_devdata(spi->master); | 328 | mcspi = spi_master_get_devdata(spi->master); |
330 | mcspi_dma = &mcspi->dma_channels[spi->chip_select]; | 329 | mcspi_dma = &mcspi->dma_channels[spi->chip_select]; |
331 | count = xfer->len; | 330 | count = xfer->len; |
332 | 331 | ||
333 | tx = xfer->tx_buf; | ||
334 | |||
335 | if (mcspi_dma->dma_tx) { | 332 | if (mcspi_dma->dma_tx) { |
336 | struct dma_async_tx_descriptor *tx; | 333 | struct dma_async_tx_descriptor *tx; |
337 | struct scatterlist sg; | 334 | struct scatterlist sg; |