Unverified Commit 42c80cd4 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Mark Brown
Browse files

spi: pxa2xx: Extract clear_SSCR1_bits() helper 



There are few places that repeat the logic of "clear some bits in SSCR1".
Extract clear_SSCR1_bits() helper to deduplicate that.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20210510124134.24638-12-andriy.shevchenko@linux.intel.com


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

drivers/spi/spi-pxa2xx-dma.c

+1 −3
Original line number Diff line number Diff line
@@ -41,9 +41,7 @@ static void pxa2xx_spi_dma_transfer_complete(struct driver_data *drv_data, 
		}



		/* Clear status & disable interrupts */

		pxa2xx_spi_write(drv_data, SSCR1,

				 pxa2xx_spi_read(drv_data, SSCR1)

				 & ~drv_data->dma_cr1);

		clear_SSCR1_bits(drv_data, drv_data->dma_cr1);

		write_SSSR_CS(drv_data, drv_data->clear_sr);

		if (!pxa25x_ssp_comp(drv_data))

			pxa2xx_spi_write(drv_data, SSTO, 0);

drivers/spi/spi-pxa2xx.c

+2 −5
Original line number Diff line number Diff line
@@ -733,8 +733,7 @@ static irqreturn_t interrupt_transfer(struct driver_data *drv_data) 
static void handle_bad_msg(struct driver_data *drv_data)

{

	pxa2xx_spi_off(drv_data);

	pxa2xx_spi_write(drv_data, SSCR1,

			 pxa2xx_spi_read(drv_data, SSCR1) & ~drv_data->int_cr1);

	clear_SSCR1_bits(drv_data, drv_data->int_cr1);

	if (!pxa25x_ssp_comp(drv_data))

		pxa2xx_spi_write(drv_data, SSTO, 0);

	write_SSSR_CS(drv_data, drv_data->clear_sr);
@@ -1161,9 +1160,7 @@ static void pxa2xx_spi_handle_err(struct spi_controller *controller, 
	pxa2xx_spi_off(drv_data);

	/* Clear and disable interrupts and service requests */

	write_SSSR_CS(drv_data, drv_data->clear_sr);

	pxa2xx_spi_write(drv_data, SSCR1,

			 pxa2xx_spi_read(drv_data, SSCR1)

			 & ~(drv_data->int_cr1 | drv_data->dma_cr1));

	clear_SSCR1_bits(drv_data, drv_data->int_cr1 | drv_data->dma_cr1);

	if (!pxa25x_ssp_comp(drv_data))

		pxa2xx_spi_write(drv_data, SSTO, 0);

drivers/spi/spi-pxa2xx.h

+5 −0
Original line number Diff line number Diff line
@@ -105,6 +105,11 @@ static inline int pxa25x_ssp_comp(struct driver_data *drv_data) 
	}

}



static inline void clear_SSCR1_bits(const struct driver_data *drv_data, u32 bits)

{

	pxa2xx_spi_write(drv_data, SSCR1, pxa2xx_spi_read(drv_data, SSCR1) & ~bits);

}



static inline void write_SSSR_CS(struct driver_data *drv_data, u32 val)

{

	if (drv_data->ssp_type == CE4100_SSP ||