10 files changed, 35 insertions, 28 deletions

diff --git a/Documentation/devicetree/bindings/spi/efm32-spi.txt b/Documentation/devicetree/bindings/spi/efm32-spi.txt
index 8f081c96a4fa..130cd17e3680 100644
--- a/Documentation/devicetree/bindings/spi/efm32-spi.txt
+++ b/Documentation/devicetree/bindings/spi/efm32-spi.txt
@@ -8,7 +8,13 @@ Required properties:
 - interrupts: pair specifying rx and tx irq
 - clocks: phandle to the spi clock
 - cs-gpios: see spi-bus.txt
-- efm32,location: Value to write to the ROUTE register's LOCATION bitfield to configure the pinmux for the device, see datasheet for values.
+
+Recommended properties :
+- efm32,location: Value to write to the ROUTE register's LOCATION bitfield to
+                  configure the pinmux for the device, see datasheet for values.
+                  If "efm32,location" property is not provided, keeping what is
+                  already configured in the hardware, so its either the reset
+                  default 0 or whatever the bootloader did.
 
 Example:
 
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index efe1960af2b3..60f2b41c7310 100644
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -383,7 +383,7 @@ config SPI_RSPI
 
 config SPI_QUP
         tristate "Qualcomm SPI controller with QUP interface"
-        depends on ARCH_MSM_DT || (ARM && COMPILE_TEST)
+        depends on ARCH_QCOM || (ARM && COMPILE_TEST)
         help
           Qualcomm Universal Peripheral (QUP) core is an AHB slave that
           provides a common data path (an output FIFO and an input FIFO)
diff --git a/drivers/spi/spi-fsl-espi.c b/drivers/spi/spi-fsl-espi.c
index 6fb2b75df821..e767f5831b9c 100644
--- a/drivers/spi/spi-fsl-espi.c
+++ b/drivers/spi/spi-fsl-espi.c
@@ -441,7 +441,8 @@ static void fsl_espi_do_one_msg(struct spi_message *m)
 
         m->actual_length = espi_trans.actual_length;
         m->status = espi_trans.status;
-        m->complete(m->context);
+        if (m->complete)
+                m->complete(m->context);
 }
 
 static int fsl_espi_setup(struct spi_device *spi)
diff --git a/drivers/spi/spi-fsl-spi.c b/drivers/spi/spi-fsl-spi.c
index f35488ed62a9..b3e7775034db 100644
--- a/drivers/spi/spi-fsl-spi.c
+++ b/drivers/spi/spi-fsl-spi.c
@@ -408,7 +408,8 @@ static void fsl_spi_do_one_msg(struct spi_message *m)
         }
 
         m->status = status;
-        m->complete(m->context);
+        if (m->complete)
+                m->complete(m->context);
 
         if (status || !cs_change) {
                 ndelay(nsecs);
diff --git a/drivers/spi/spi-mpc512x-psc.c b/drivers/spi/spi-mpc512x-psc.c
index 3822eef2ef9d..577d23a12763 100644
--- a/drivers/spi/spi-mpc512x-psc.c
+++ b/drivers/spi/spi-mpc512x-psc.c
@@ -300,7 +300,8 @@ static int mpc512x_psc_spi_msg_xfer(struct spi_master *master,
         }
 
         m->status = status;
-        m->complete(m->context);
+        if (m->complete)
+                m->complete(m->context);
 
         if (status || !cs_change)
                 mpc512x_psc_spi_deactivate_cs(spi);
diff --git a/drivers/spi/spi-mpc52xx-psc.c b/drivers/spi/spi-mpc52xx-psc.c
index 3d18d9351185..de532aa11d34 100644
--- a/drivers/spi/spi-mpc52xx-psc.c
+++ b/drivers/spi/spi-mpc52xx-psc.c
@@ -247,7 +247,8 @@ static void mpc52xx_psc_spi_work(struct work_struct *work)
                 }
 
                 m->status = status;
-                m->complete(m->context);
+                if (m->complete)
+                        m->complete(m->context);
 
                 if (status || !cs_change)
                         mpc52xx_psc_spi_deactivate_cs(spi);
diff --git a/drivers/spi/spi-mpc52xx.c b/drivers/spi/spi-mpc52xx.c
index aac2a5ddd964..b07db4b62d80 100644
--- a/drivers/spi/spi-mpc52xx.c
+++ b/drivers/spi/spi-mpc52xx.c
@@ -234,7 +234,8 @@ static int mpc52xx_spi_fsmstate_transfer(int irq, struct mpc52xx_spi *ms,
                 dev_err(&ms->master->dev, "mode fault\n");
                 mpc52xx_spi_chipsel(ms, 0);
                 ms->message->status = -EIO;
-                ms->message->complete(ms->message->context);
+                if (ms->message->complete)
+                        ms->message->complete(ms->message->context);
                 ms->state = mpc52xx_spi_fsmstate_idle;
                 return FSM_CONTINUE;
         }
@@ -288,7 +289,8 @@ mpc52xx_spi_fsmstate_wait(int irq, struct mpc52xx_spi *ms, u8 status, u8 data)
                 ms->msg_count++;
                 mpc52xx_spi_chipsel(ms, 0);
                 ms->message->status = 0;
-                ms->message->complete(ms->message->context);
+                if (ms->message->complete)
+                        ms->message->complete(ms->message->context);
                 ms->state = mpc52xx_spi_fsmstate_idle;
                 return FSM_CONTINUE;
         }
diff --git a/drivers/spi/spi-omap2-mcspi.c b/drivers/spi/spi-omap2-mcspi.c
index 2941c5b96ebc..4dc77df38864 100644
--- a/drivers/spi/spi-omap2-mcspi.c
+++ b/drivers/spi/spi-omap2-mcspi.c
@@ -1379,12 +1379,13 @@ static int omap2_mcspi_probe(struct platform_device *pdev)
 
         INIT_LIST_HEAD(&mcspi->ctx.cs);
 
-        mcspi->dma_channels = kcalloc(master->num_chipselect,
-                        sizeof(struct omap2_mcspi_dma),
-                        GFP_KERNEL);
-
-        if (mcspi->dma_channels == NULL)
+        mcspi->dma_channels = devm_kcalloc(&pdev->dev, master->num_chipselect,
+                                           sizeof(struct omap2_mcspi_dma),
+                                           GFP_KERNEL);
+        if (mcspi->dma_channels == NULL) {
+                status = -ENOMEM;
                 goto free_master;
+        }
 
         for (i = 0; i < master->num_chipselect; i++) {
                 char *dma_rx_ch_name = mcspi->dma_channels[i].dma_rx_ch_name;
@@ -1426,7 +1427,7 @@ static int omap2_mcspi_probe(struct platform_device *pdev)
         }
 
         if (status < 0)
-                goto dma_chnl_free;
+                goto free_master;
 
         pm_runtime_use_autosuspend(&pdev->dev);
         pm_runtime_set_autosuspend_delay(&pdev->dev, SPI_AUTOSUSPEND_TIMEOUT);
@@ -1444,8 +1445,6 @@ static int omap2_mcspi_probe(struct platform_device *pdev)
 
 disable_pm:
         pm_runtime_disable(&pdev->dev);
-dma_chnl_free:
-        kfree(mcspi->dma_channels);
 free_master:
         spi_master_put(master);
         return status;
@@ -1453,19 +1452,12 @@ free_master:
 
 static int omap2_mcspi_remove(struct platform_device *pdev)
 {
-        struct spi_master       *master;
-        struct omap2_mcspi      *mcspi;
-        struct omap2_mcspi_dma  *dma_channels;
-
-        master = platform_get_drvdata(pdev);
-        mcspi = spi_master_get_devdata(master);
-        dma_channels = mcspi->dma_channels;
+        struct spi_master *master = platform_get_drvdata(pdev);
+        struct omap2_mcspi *mcspi = spi_master_get_devdata(master);
 
         pm_runtime_put_sync(mcspi->dev);
         pm_runtime_disable(&pdev->dev);
 
-        kfree(dma_channels);
-
         return 0;
 }
 
diff --git a/drivers/spi/spi-sh.c b/drivers/spi/spi-sh.c
index f6f2c7010177..03edf5ed0e9f 100644
--- a/drivers/spi/spi-sh.c
+++ b/drivers/spi/spi-sh.c
@@ -322,7 +322,8 @@ static void spi_sh_work(struct work_struct *work)
                 spin_lock_irqsave(&ss->lock, flags);
 
                 mesg->status = 0;
-                mesg->complete(mesg->context);
+                if (mesg->complete)
+                        mesg->complete(mesg->context);
         }
 
         clear_fifo(ss);
@@ -340,7 +341,8 @@ static void spi_sh_work(struct work_struct *work)
 
  error:
         mesg->status = ret;
-        mesg->complete(mesg->context);
+        if (mesg->complete)
+                mesg->complete(mesg->context);
 
         spi_sh_clear_bit(ss, SPI_SH_SSA | SPI_SH_SSDB | SPI_SH_SSD,
                          SPI_SH_CR1);
diff --git a/drivers/spi/spi-txx9.c b/drivers/spi/spi-txx9.c
index 820b499816f8..5f183baa91a9 100644
--- a/drivers/spi/spi-txx9.c
+++ b/drivers/spi/spi-txx9.c
@@ -262,7 +262,8 @@ static void txx9spi_work_one(struct txx9spi *c, struct spi_message *m)
 
 exit:
         m->status = status;
-        m->complete(m->context);
+        if (m->complete)
+                m->complete(m->context);
 
         /* normally deactivate chipselect ... unless no error and
          * cs_change has hinted that the next message will probably