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: Jan Kiszka <jan.kiszka@siemens.com>
Reviewed-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

1 files changed, 15 insertions, 14 deletions

diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c
index d6239fa718be..8c65bc1823f3 100644
--- a/drivers/spi/spi-pxa2xx.c
+++ b/drivers/spi/spi-pxa2xx.c
@@ -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;
         }