diff options
author | Jarkko Nikula <jarkko.nikula@linux.intel.com> | 2016-09-07 10:04:05 -0400 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2016-09-12 15:01:27 -0400 |
commit | bffc967e93c771805739a4cc4c7849a749a7b0a6 (patch) | |
tree | 05d4a5c8c344e8cc77fbc5c5af10ee9c5f061353 | |
parent | 29b4817d4018df78086157ea3a55c1d9424a7cfc (diff) |
spi: pxa2xx: Do not needlessly initialize stack variables
All of these variables are unconditionally set before their use.
Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r-- | drivers/spi/spi-pxa2xx-dma.c | 2 | ||||
-rw-r--r-- | drivers/spi/spi-pxa2xx.c | 20 |
2 files changed, 11 insertions, 11 deletions
diff --git a/drivers/spi/spi-pxa2xx-dma.c b/drivers/spi/spi-pxa2xx-dma.c index db3ae1dd829e..80c8e27a2f73 100644 --- a/drivers/spi/spi-pxa2xx-dma.c +++ b/drivers/spi/spi-pxa2xx-dma.c | |||
@@ -146,7 +146,7 @@ irqreturn_t pxa2xx_spi_dma_transfer(struct driver_data *drv_data) | |||
146 | int pxa2xx_spi_dma_prepare(struct driver_data *drv_data, u32 dma_burst) | 146 | int pxa2xx_spi_dma_prepare(struct driver_data *drv_data, u32 dma_burst) |
147 | { | 147 | { |
148 | struct dma_async_tx_descriptor *tx_desc, *rx_desc; | 148 | struct dma_async_tx_descriptor *tx_desc, *rx_desc; |
149 | int err = 0; | 149 | int err; |
150 | 150 | ||
151 | tx_desc = pxa2xx_spi_dma_prepare_one(drv_data, DMA_MEM_TO_DEV); | 151 | tx_desc = pxa2xx_spi_dma_prepare_one(drv_data, DMA_MEM_TO_DEV); |
152 | if (!tx_desc) { | 152 | if (!tx_desc) { |
diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c index 87150a1049bd..0e0d445f4028 100644 --- a/drivers/spi/spi-pxa2xx.c +++ b/drivers/spi/spi-pxa2xx.c | |||
@@ -934,13 +934,13 @@ static void pump_transfers(unsigned long data) | |||
934 | { | 934 | { |
935 | struct driver_data *drv_data = (struct driver_data *)data; | 935 | struct driver_data *drv_data = (struct driver_data *)data; |
936 | struct spi_master *master = drv_data->master; | 936 | struct spi_master *master = drv_data->master; |
937 | struct spi_message *message = NULL; | 937 | struct spi_message *message; |
938 | struct spi_transfer *transfer = NULL; | 938 | struct spi_transfer *transfer; |
939 | struct spi_transfer *previous = NULL; | 939 | struct spi_transfer *previous; |
940 | struct chip_data *chip = NULL; | 940 | struct chip_data *chip; |
941 | u32 clk_div = 0; | 941 | u32 clk_div; |
942 | u8 bits = 0; | 942 | u8 bits; |
943 | u32 speed = 0; | 943 | u32 speed; |
944 | u32 cr0; | 944 | u32 cr0; |
945 | u32 cr1; | 945 | u32 cr1; |
946 | u32 dma_thresh = drv_data->cur_chip->dma_threshold; | 946 | u32 dma_thresh = drv_data->cur_chip->dma_threshold; |
@@ -1213,7 +1213,7 @@ static int setup_cs(struct spi_device *spi, struct chip_data *chip, | |||
1213 | 1213 | ||
1214 | static int setup(struct spi_device *spi) | 1214 | static int setup(struct spi_device *spi) |
1215 | { | 1215 | { |
1216 | struct pxa2xx_spi_chip *chip_info = NULL; | 1216 | struct pxa2xx_spi_chip *chip_info; |
1217 | struct chip_data *chip; | 1217 | struct chip_data *chip; |
1218 | const struct lpss_config *config; | 1218 | const struct lpss_config *config; |
1219 | struct driver_data *drv_data = spi_master_get_devdata(spi->master); | 1219 | struct driver_data *drv_data = spi_master_get_devdata(spi->master); |
@@ -1742,7 +1742,7 @@ static int pxa2xx_spi_suspend(struct device *dev) | |||
1742 | { | 1742 | { |
1743 | struct driver_data *drv_data = dev_get_drvdata(dev); | 1743 | struct driver_data *drv_data = dev_get_drvdata(dev); |
1744 | struct ssp_device *ssp = drv_data->ssp; | 1744 | struct ssp_device *ssp = drv_data->ssp; |
1745 | int status = 0; | 1745 | int status; |
1746 | 1746 | ||
1747 | status = spi_master_suspend(drv_data->master); | 1747 | status = spi_master_suspend(drv_data->master); |
1748 | if (status != 0) | 1748 | if (status != 0) |
@@ -1759,7 +1759,7 @@ static int pxa2xx_spi_resume(struct device *dev) | |||
1759 | { | 1759 | { |
1760 | struct driver_data *drv_data = dev_get_drvdata(dev); | 1760 | struct driver_data *drv_data = dev_get_drvdata(dev); |
1761 | struct ssp_device *ssp = drv_data->ssp; | 1761 | struct ssp_device *ssp = drv_data->ssp; |
1762 | int status = 0; | 1762 | int status; |
1763 | 1763 | ||
1764 | /* Enable the SSP clock */ | 1764 | /* Enable the SSP clock */ |
1765 | if (!pm_runtime_suspended(dev)) | 1765 | if (!pm_runtime_suspended(dev)) |