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

spi: pxa2xx: Reuse int_stop_and_reset() in couple of places 



Reuse int_stop_and_reset() in couple of places.

While at it, change the order of the int_stop_and_reset() and pxa2xx_spi_off()
to be in align with the similar flow in int_error_stop().

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


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

drivers/spi/spi-pxa2xx.c

+3 −9
Original line number Diff line number Diff line
@@ -722,11 +722,8 @@ static irqreturn_t interrupt_transfer(struct driver_data *drv_data) 


static void handle_bad_msg(struct driver_data *drv_data)

{

	int_stop_and_reset(drv_data);

	pxa2xx_spi_off(drv_data);

	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);



	dev_err(drv_data->ssp->dev, "bad message state in interrupt handler\n");

}
@@ -1154,13 +1151,10 @@ static void pxa2xx_spi_handle_err(struct spi_controller *controller, 
{

	struct driver_data *drv_data = spi_controller_get_devdata(controller);



	int_stop_and_reset(drv_data);



	/* Disable the SSP */

	pxa2xx_spi_off(drv_data);

	/* Clear and disable interrupts and service requests */

	write_SSSR_CS(drv_data, drv_data->clear_sr);

	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);



	/*

	 * Stop the DMA if running. Note DMA callback handler may have unset