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

spi: pxa2xx: Introduce int_stop_and_reset() helper 



Currently we have three times the same few lines repeated in the code.
Deduplicate them by newly introduced int_stop_and_reset() helper.

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


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

drivers/spi/spi-pxa2xx.c

+13 −14
Original line number Diff line number Diff line
@@ -620,13 +620,20 @@ static void reset_sccr1(struct driver_data *drv_data) 
	pxa2xx_spi_write(drv_data, SSCR1, sccr1_reg);

}



static void int_error_stop(struct driver_data *drv_data, const char *msg)

static void int_stop_and_reset(struct driver_data *drv_data)

{

	/* Stop and reset SSP */

	/* Clear and disable interrupts */

	write_SSSR_CS(drv_data, drv_data->clear_sr);

	reset_sccr1(drv_data);

	if (!pxa25x_ssp_comp(drv_data))

	if (pxa25x_ssp_comp(drv_data))

		return;



	pxa2xx_spi_write(drv_data, SSTO, 0);

}



static void int_error_stop(struct driver_data *drv_data, const char *msg)

{

	int_stop_and_reset(drv_data);

	pxa2xx_spi_flush(drv_data);

	pxa2xx_spi_off(drv_data);
@@ -638,11 +645,7 @@ static void int_error_stop(struct driver_data *drv_data, const char *msg) 


static void int_transfer_complete(struct driver_data *drv_data)

{

	/* Clear and disable interrupts */

	write_SSSR_CS(drv_data, drv_data->clear_sr);

	reset_sccr1(drv_data);

	if (!pxa25x_ssp_comp(drv_data))

		pxa2xx_spi_write(drv_data, SSTO, 0);

	int_stop_and_reset(drv_data);



	spi_finalize_current_transfer(drv_data->controller);

}
@@ -1151,11 +1154,7 @@ static int pxa2xx_spi_slave_abort(struct spi_controller *controller) 
{

	struct driver_data *drv_data = spi_controller_get_devdata(controller);



	/* Stop and reset SSP */

	write_SSSR_CS(drv_data, drv_data->clear_sr);

	reset_sccr1(drv_data);

	if (!pxa25x_ssp_comp(drv_data))

		pxa2xx_spi_write(drv_data, SSTO, 0);

	int_stop_and_reset(drv_data);

	pxa2xx_spi_flush(drv_data);

	pxa2xx_spi_off(drv_data);