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

Commit b0312482 authored by Jan Kiszka's avatar Jan Kiszka Committed by Mark Brown
Browse files

spi: pxa2xx: Factor out handle_bad_msg 



As suggested by Andy Shevchenko: Decouple this corner cause from the
general handling logic in ssp_int.

Signed-off-by: default avatarJan Kiszka <jan.kiszka@siemens.com>
Reviewed-by: default avatarJarkko Nikula <jarkko.nikula@linux.intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 25014521

drivers/spi/spi-pxa2xx.c

+15 −14
Original line number Diff line number Diff line
@@ -732,6 +732,20 @@ static irqreturn_t interrupt_transfer(struct driver_data *drv_data) 
	return IRQ_HANDLED;

}



static void handle_bad_msg(struct driver_data *drv_data)

{

	pxa2xx_spi_write(drv_data, SSCR0,

			 pxa2xx_spi_read(drv_data, SSCR0) & ~SSCR0_SSE);

	pxa2xx_spi_write(drv_data, SSCR1,

			 pxa2xx_spi_read(drv_data, SSCR1) & ~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->pdev->dev,

		"bad message state in interrupt handler\n");

}



static irqreturn_t ssp_int(int irq, void *dev_id)

{

	struct driver_data *drv_data = dev_id;
@@ -772,20 +786,7 @@ static irqreturn_t ssp_int(int irq, void *dev_id) 
		return IRQ_NONE;



	if (!drv_data->master->cur_msg) {



		pxa2xx_spi_write(drv_data, SSCR0,

				 pxa2xx_spi_read(drv_data, SSCR0)

				 & ~SSCR0_SSE);

		pxa2xx_spi_write(drv_data, SSCR1,

				 pxa2xx_spi_read(drv_data, SSCR1)

				 & ~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->pdev->dev,

			"bad message state in interrupt handler\n");



		handle_bad_msg(drv_data);

		/* Never fail */

		return IRQ_HANDLED;

	}