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

Commit bffc967e authored by Jarkko Nikula's avatar Jarkko Nikula Committed by Mark Brown
Browse files

spi: pxa2xx: Do not needlessly initialize stack variables 



All of these variables are unconditionally set before their use.

Signed-off-by: default avatarJarkko Nikula <jarkko.nikula@linux.intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 29b4817d

drivers/spi/spi-pxa2xx-dma.c

+1 −1
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ irqreturn_t pxa2xx_spi_dma_transfer(struct driver_data *drv_data) 
int pxa2xx_spi_dma_prepare(struct driver_data *drv_data, u32 dma_burst)

{

	struct dma_async_tx_descriptor *tx_desc, *rx_desc;

	int err = 0;

	int err;



	tx_desc = pxa2xx_spi_dma_prepare_one(drv_data, DMA_MEM_TO_DEV);

	if (!tx_desc) {

drivers/spi/spi-pxa2xx.c

+10 −10
Original line number Diff line number Diff line
@@ -934,13 +934,13 @@ static void pump_transfers(unsigned long data) 
{

	struct driver_data *drv_data = (struct driver_data *)data;

	struct spi_master *master = drv_data->master;

	struct spi_message *message = NULL;

	struct spi_transfer *transfer = NULL;

	struct spi_transfer *previous = NULL;

	struct chip_data *chip = NULL;

	u32 clk_div = 0;

	u8 bits = 0;

	u32 speed = 0;

	struct spi_message *message;

	struct spi_transfer *transfer;

	struct spi_transfer *previous;

	struct chip_data *chip;

	u32 clk_div;

	u8 bits;

	u32 speed;

	u32 cr0;

	u32 cr1;

	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, 


static int setup(struct spi_device *spi)

{

	struct pxa2xx_spi_chip *chip_info = NULL;

	struct pxa2xx_spi_chip *chip_info;

	struct chip_data *chip;

	const struct lpss_config *config;

	struct driver_data *drv_data = spi_master_get_devdata(spi->master);
@@ -1742,7 +1742,7 @@ static int pxa2xx_spi_suspend(struct device *dev) 
{

	struct driver_data *drv_data = dev_get_drvdata(dev);

	struct ssp_device *ssp = drv_data->ssp;

	int status = 0;

	int status;



	status = spi_master_suspend(drv_data->master);

	if (status != 0)
@@ -1759,7 +1759,7 @@ static int pxa2xx_spi_resume(struct device *dev) 
{

	struct driver_data *drv_data = dev_get_drvdata(dev);

	struct ssp_device *ssp = drv_data->ssp;

	int status = 0;

	int status;



	/* Enable the SSP clock */

	if (!pm_runtime_suspended(dev))