22 files changed, 92 insertions, 42 deletions

diff --git a/drivers/spi/spi-bcm2835.c b/drivers/spi/spi-bcm2835.c
index 4c332143a310..9025edd7dc45 100644
--- a/drivers/spi/spi-bcm2835.c
+++ b/drivers/spi/spi-bcm2835.c
@@ -217,7 +217,7 @@ static int bcm2835_spi_start_transfer(struct spi_device *spi,
                 cs |= spi->chip_select;
         }
 
-        INIT_COMPLETION(bs->done);
+        reinit_completion(&bs->done);
         bs->tx_buf = tfr->tx_buf;
         bs->rx_buf = tfr->rx_buf;
         bs->len = tfr->len;
@@ -377,7 +377,7 @@ out_master_put:
 
 static int bcm2835_spi_remove(struct platform_device *pdev)
 {
-        struct spi_master *master = spi_master_get(platform_get_drvdata(pdev));
+        struct spi_master *master = platform_get_drvdata(pdev);
         struct bcm2835_spi *bs = spi_master_get_devdata(master);
 
         free_irq(bs->irq, master);
diff --git a/drivers/spi/spi-bcm63xx.c b/drivers/spi/spi-bcm63xx.c
index 80d56b214eb5..469ecd876358 100644
--- a/drivers/spi/spi-bcm63xx.c
+++ b/drivers/spi/spi-bcm63xx.c
@@ -435,7 +435,7 @@ out:
 
 static int bcm63xx_spi_remove(struct platform_device *pdev)
 {
-        struct spi_master *master = spi_master_get(platform_get_drvdata(pdev));
+        struct spi_master *master = platform_get_drvdata(pdev);
         struct bcm63xx_spi *bs = spi_master_get_devdata(master);
 
         /* reset spi block */
diff --git a/drivers/spi/spi-clps711x.c b/drivers/spi/spi-clps711x.c
index e2a5a426b2ef..6f03d7e6435d 100644
--- a/drivers/spi/spi-clps711x.c
+++ b/drivers/spi/spi-clps711x.c
@@ -105,7 +105,7 @@ static int spi_clps711x_transfer_one_message(struct spi_master *master,
 
                 gpio_set_value(cs, !!(msg->spi->mode & SPI_CS_HIGH));
 
-                INIT_COMPLETION(hw->done);
+                reinit_completion(&hw->done);
 
                 hw->count = 0;
                 hw->len = xfer->len;
diff --git a/drivers/spi/spi-davinci.c b/drivers/spi/spi-davinci.c
index dd72445ba2ea..50b2d88c8190 100644
--- a/drivers/spi/spi-davinci.c
+++ b/drivers/spi/spi-davinci.c
@@ -554,7 +554,7 @@ static int davinci_spi_bufs(struct spi_device *spi, struct spi_transfer *t)
         clear_io_bits(dspi->base + SPIGCR1, SPIGCR1_POWERDOWN_MASK);
         set_io_bits(dspi->base + SPIGCR1, SPIGCR1_SPIENA_MASK);
 
-        INIT_COMPLETION(dspi->done);
+        reinit_completion(&dspi->done);
 
         if (spicfg->io_type == SPI_IO_TYPE_INTR)
                 set_io_bits(dspi->base + SPIINT, SPIINT_MASKINT);
diff --git a/drivers/spi/spi-dw-mid.c b/drivers/spi/spi-dw-mid.c
index b9f0192758d6..6d207afec8cb 100644
--- a/drivers/spi/spi-dw-mid.c
+++ b/drivers/spi/spi-dw-mid.c
@@ -150,7 +150,7 @@ static int mid_spi_dma_transfer(struct dw_spi *dws, int cs_change)
                                 &dws->tx_sgl,
                                 1,
                                 DMA_MEM_TO_DEV,
-                                DMA_PREP_INTERRUPT | DMA_COMPL_SKIP_DEST_UNMAP);
+                                DMA_PREP_INTERRUPT);
         txdesc->callback = dw_spi_dma_done;
         txdesc->callback_param = dws;
 
@@ -173,7 +173,7 @@ static int mid_spi_dma_transfer(struct dw_spi *dws, int cs_change)
                                 &dws->rx_sgl,
                                 1,
                                 DMA_DEV_TO_MEM,
-                                DMA_PREP_INTERRUPT | DMA_COMPL_SKIP_DEST_UNMAP);
+                                DMA_PREP_INTERRUPT);
         rxdesc->callback = dw_spi_dma_done;
         rxdesc->callback_param = dws;
 
diff --git a/drivers/spi/spi-fsl-cpm.c b/drivers/spi/spi-fsl-cpm.c
index 58630edb8c21..54b06376f03c 100644
--- a/drivers/spi/spi-fsl-cpm.c
+++ b/drivers/spi/spi-fsl-cpm.c
@@ -20,6 +20,7 @@
 #include <linux/spi/spi.h>
 #include <linux/fsl_devices.h>
 #include <linux/dma-mapping.h>
+#include <linux/of_address.h>
 #include <asm/cpm.h>
 #include <asm/qe.h>
 
diff --git a/drivers/spi/spi-fsl-espi.c b/drivers/spi/spi-fsl-espi.c
index 43222d7532d1..80d8f40f7e05 100644
--- a/drivers/spi/spi-fsl-espi.c
+++ b/drivers/spi/spi-fsl-espi.c
@@ -16,6 +16,8 @@
 #include <linux/fsl_devices.h>
 #include <linux/mm.h>
 #include <linux/of.h>
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
 #include <linux/of_platform.h>
 #include <linux/interrupt.h>
 #include <linux/err.h>
@@ -230,7 +232,7 @@ static int fsl_espi_bufs(struct spi_device *spi, struct spi_transfer *t)
         mpc8xxx_spi->tx = t->tx_buf;
         mpc8xxx_spi->rx = t->rx_buf;
 
-        INIT_COMPLETION(mpc8xxx_spi->done);
+        reinit_completion(&mpc8xxx_spi->done);
 
         /* Set SPCOM[CS] and SPCOM[TRANLEN] field */
         if ((t->len - 1) > SPCOM_TRANLEN_MAX) {
@@ -687,7 +689,7 @@ static int of_fsl_espi_probe(struct platform_device *ofdev)
         struct device_node *np = ofdev->dev.of_node;
         struct spi_master *master;
         struct resource mem;
-        struct resource irq;
+        unsigned int irq;
         int ret = -ENOMEM;
 
         ret = of_mpc8xxx_spi_probe(ofdev);
@@ -702,13 +704,13 @@ static int of_fsl_espi_probe(struct platform_device *ofdev)
         if (ret)
                 goto err;
 
-        ret = of_irq_to_resource(np, 0, &irq);
+        irq = irq_of_parse_and_map(np, 0);
         if (!ret) {
                 ret = -EINVAL;
                 goto err;
         }
 
-        master = fsl_espi_probe(dev, &mem, irq.start);
+        master = fsl_espi_probe(dev, &mem, irq);
         if (IS_ERR(master)) {
                 ret = PTR_ERR(master);
                 goto err;
diff --git a/drivers/spi/spi-fsl-spi.c b/drivers/spi/spi-fsl-spi.c
index 2129fcd1c31b..119f7af94537 100644
--- a/drivers/spi/spi-fsl-spi.c
+++ b/drivers/spi/spi-fsl-spi.c
@@ -339,7 +339,7 @@ static int fsl_spi_bufs(struct spi_device *spi, struct spi_transfer *t,
         mpc8xxx_spi->tx = t->tx_buf;
         mpc8xxx_spi->rx = t->rx_buf;
 
-        INIT_COMPLETION(mpc8xxx_spi->done);
+        reinit_completion(&mpc8xxx_spi->done);
 
         if (mpc8xxx_spi->flags & SPI_CPM_MODE)
                 ret = fsl_spi_cpm_bufs(mpc8xxx_spi, t, is_dma_mapped);
diff --git a/drivers/spi/spi-mpc512x-psc.c b/drivers/spi/spi-mpc512x-psc.c
index ee6e61cbf7f5..87676587d783 100644
--- a/drivers/spi/spi-mpc512x-psc.c
+++ b/drivers/spi/spi-mpc512x-psc.c
@@ -20,6 +20,7 @@
 #include <linux/errno.h>
 #include <linux/interrupt.h>
 #include <linux/of_address.h>
+#include <linux/of_irq.h>
 #include <linux/of_platform.h>
 #include <linux/completion.h>
 #include <linux/io.h>
@@ -166,7 +167,7 @@ static int mpc512x_psc_spi_transfer_rxtx(struct spi_device *spi,
                         }
 
                         /* have the ISR trigger when the TX FIFO is empty */
-                        INIT_COMPLETION(mps->txisrdone);
+                        reinit_completion(&mps->txisrdone);
                         out_be32(&fifo->txisr, MPC512x_PSC_FIFO_EMPTY);
                         out_be32(&fifo->tximr, MPC512x_PSC_FIFO_EMPTY);
                         wait_for_completion(&mps->txisrdone);
@@ -556,7 +557,7 @@ free_master:
 
 static int mpc512x_psc_spi_do_remove(struct device *dev)
 {
-        struct spi_master *master = spi_master_get(dev_get_drvdata(dev));
+        struct spi_master *master = dev_get_drvdata(dev);
         struct mpc512x_psc_spi *mps = spi_master_get_devdata(master);
 
         clk_disable_unprepare(mps->clk_mclk);
diff --git a/drivers/spi/spi-mxs.c b/drivers/spi/spi-mxs.c
index de333059a9a7..3adebfa22e3d 100644
--- a/drivers/spi/spi-mxs.c
+++ b/drivers/spi/spi-mxs.c
@@ -202,7 +202,7 @@ static int mxs_spi_txrx_dma(struct mxs_spi *spi,
         if (!dma_xfer)
                 return -ENOMEM;
 
-        INIT_COMPLETION(spi->c);
+        reinit_completion(&spi->c);
 
         /* Chip select was already programmed into CTRL0 */
         ctrl0 = readl(ssp->base + HW_SSP_CTRL0);
@@ -565,7 +565,7 @@ static int mxs_spi_remove(struct platform_device *pdev)
         struct mxs_spi *spi;
         struct mxs_ssp *ssp;
 
-        master = spi_master_get(platform_get_drvdata(pdev));
+        master = platform_get_drvdata(pdev);
         spi = spi_master_get_devdata(master);
         ssp = &spi->ssp;
 
diff --git a/drivers/spi/spi-ppc4xx.c b/drivers/spi/spi-ppc4xx.c
index c57740bb70d3..5ee56726f8d0 100644
--- a/drivers/spi/spi-ppc4xx.c
+++ b/drivers/spi/spi-ppc4xx.c
@@ -29,6 +29,8 @@
 #include <linux/slab.h>
 #include <linux/errno.h>
 #include <linux/wait.h>
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
 #include <linux/of_platform.h>
 #include <linux/of_gpio.h>
 #include <linux/interrupt.h>
diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c
index cb0e1f1137ad..7765b1999537 100644
--- a/drivers/spi/spi-pxa2xx.c
+++ b/drivers/spi/spi-pxa2xx.c
@@ -1073,6 +1073,8 @@ pxa2xx_spi_acpi_get_pdata(struct platform_device *pdev)
 static struct acpi_device_id pxa2xx_spi_acpi_match[] = {
         { "INT33C0", 0 },
         { "INT33C1", 0 },
+        { "INT3430", 0 },
+        { "INT3431", 0 },
         { "80860F0E", 0 },
         { },
 };
@@ -1291,6 +1293,9 @@ static int pxa2xx_spi_resume(struct device *dev)
         /* Enable the SSP clock */
         clk_prepare_enable(ssp->clk);
 
+        /* Restore LPSS private register bits */
+        lpss_ssp_setup(drv_data);
+
         /* Start the queue running */
         status = spi_master_resume(drv_data->master);
         if (status != 0) {
diff --git a/drivers/spi/spi-rspi.c b/drivers/spi/spi-rspi.c
index 58449ad4ad0d..9e829cee7357 100644
--- a/drivers/spi/spi-rspi.c
+++ b/drivers/spi/spi-rspi.c
@@ -885,14 +885,13 @@ static void rspi_release_dma(struct rspi_data *rspi)
 
 static int rspi_remove(struct platform_device *pdev)
 {
-        struct rspi_data *rspi = spi_master_get(platform_get_drvdata(pdev));
+        struct rspi_data *rspi = platform_get_drvdata(pdev);
 
         spi_unregister_master(rspi->master);
         rspi_release_dma(rspi);
         free_irq(platform_get_irq(pdev, 0), rspi);
         clk_put(rspi->clk);
         iounmap(rspi->addr);
-        spi_master_put(rspi->master);
 
         return 0;
 }
diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c
index 9e2020df9e0f..4c4b0a1219a7 100644
--- a/drivers/spi/spi-s3c64xx.c
+++ b/drivers/spi/spi-s3c64xx.c
@@ -890,7 +890,7 @@ static int s3c64xx_spi_transfer_one(struct spi_master *master,
         unsigned long flags;
         int use_dma;
 
-        INIT_COMPLETION(sdd->xfer_completion);
+                reinit_completion(&sdd->xfer_completion);
 
         /* Only BPW and Speed may change across transfers */
         bpw = xfer->bits_per_word;
diff --git a/drivers/spi/spi-sh-msiof.c b/drivers/spi/spi-sh-msiof.c
index 2a95435a6a11..c74298cf70e2 100644
--- a/drivers/spi/spi-sh-msiof.c
+++ b/drivers/spi/spi-sh-msiof.c
@@ -465,7 +465,7 @@ static int sh_msiof_spi_txrx_once(struct sh_msiof_spi_priv *p,
         ret = ret ? ret : sh_msiof_modify_ctr_wait(p, 0, CTR_TXE);
 
         /* start by setting frame bit */
-        INIT_COMPLETION(p->done);
+        reinit_completion(&p->done);
         ret = ret ? ret : sh_msiof_modify_ctr_wait(p, 0, CTR_TFSE);
         if (ret) {
                 dev_err(&p->pdev->dev, "failed to start hardware\n");
diff --git a/drivers/spi/spi-sirf.c b/drivers/spi/spi-sirf.c
index 592b4aff651f..ed5e501c4652 100644
--- a/drivers/spi/spi-sirf.c
+++ b/drivers/spi/spi-sirf.c
@@ -305,8 +305,8 @@ static int spi_sirfsoc_transfer(struct spi_device *spi, struct spi_transfer *t)
         sspi->tx = t->tx_buf ? t->tx_buf : sspi->dummypage;
         sspi->rx = t->rx_buf ? t->rx_buf : sspi->dummypage;
         sspi->left_tx_word = sspi->left_rx_word = t->len / sspi->word_width;
-        INIT_COMPLETION(sspi->rx_done);
-        INIT_COMPLETION(sspi->tx_done);
+        reinit_completion(&sspi->rx_done);
+        reinit_completion(&sspi->tx_done);
 
         writel(SIRFSOC_SPI_INT_MASK_ALL, sspi->base + SIRFSOC_SPI_INT_STATUS);
 
diff --git a/drivers/spi/spi-tegra114.c b/drivers/spi/spi-tegra114.c
index 9146bb3c2489..aaecfb3ebf58 100644
--- a/drivers/spi/spi-tegra114.c
+++ b/drivers/spi/spi-tegra114.c
@@ -451,7 +451,7 @@ static void tegra_spi_dma_complete(void *args)
 
 static int tegra_spi_start_tx_dma(struct tegra_spi_data *tspi, int len)
 {
-        INIT_COMPLETION(tspi->tx_dma_complete);
+        reinit_completion(&tspi->tx_dma_complete);
         tspi->tx_dma_desc = dmaengine_prep_slave_single(tspi->tx_dma_chan,
                                 tspi->tx_dma_phys, len, DMA_MEM_TO_DEV,
                                 DMA_PREP_INTERRUPT |  DMA_CTRL_ACK);
@@ -470,7 +470,7 @@ static int tegra_spi_start_tx_dma(struct tegra_spi_data *tspi, int len)
 
 static int tegra_spi_start_rx_dma(struct tegra_spi_data *tspi, int len)
 {
-        INIT_COMPLETION(tspi->rx_dma_complete);
+        reinit_completion(&tspi->rx_dma_complete);
         tspi->rx_dma_desc = dmaengine_prep_slave_single(tspi->rx_dma_chan,
                                 tspi->rx_dma_phys, len, DMA_DEV_TO_MEM,
                                 DMA_PREP_INTERRUPT |  DMA_CTRL_ACK);
@@ -844,7 +844,7 @@ static int tegra_spi_transfer_one_message(struct spi_master *master,
         list_for_each_entry(xfer, &msg->transfers, transfer_list) {
                 unsigned long cmd1;
 
-                INIT_COMPLETION(tspi->xfer_completion);
+                reinit_completion(&tspi->xfer_completion);
 
                 cmd1 = tegra_spi_setup_transfer_one(spi, xfer, is_first_msg);
 
diff --git a/drivers/spi/spi-tegra20-sflash.c b/drivers/spi/spi-tegra20-sflash.c
index 79be8ce6a9d1..4dc8e8129459 100644
--- a/drivers/spi/spi-tegra20-sflash.c
+++ b/drivers/spi/spi-tegra20-sflash.c
@@ -339,7 +339,7 @@ static int tegra_sflash_transfer_one_message(struct spi_master *master,
         msg->actual_length = 0;
         single_xfer = list_is_singular(&msg->transfers);
         list_for_each_entry(xfer, &msg->transfers, transfer_list) {
-                INIT_COMPLETION(tsd->xfer_completion);
+                reinit_completion(&tsd->xfer_completion);
                 ret = tegra_sflash_start_transfer_one(spi, xfer,
                                         is_first_msg, single_xfer);
                 if (ret < 0) {
diff --git a/drivers/spi/spi-tegra20-slink.c b/drivers/spi/spi-tegra20-slink.c
index af0a67886ae8..e66715ba37ed 100644
--- a/drivers/spi/spi-tegra20-slink.c
+++ b/drivers/spi/spi-tegra20-slink.c
@@ -462,7 +462,7 @@ static void tegra_slink_dma_complete(void *args)
 
 static int tegra_slink_start_tx_dma(struct tegra_slink_data *tspi, int len)
 {
-        INIT_COMPLETION(tspi->tx_dma_complete);
+        reinit_completion(&tspi->tx_dma_complete);
         tspi->tx_dma_desc = dmaengine_prep_slave_single(tspi->tx_dma_chan,
                                 tspi->tx_dma_phys, len, DMA_MEM_TO_DEV,
                                 DMA_PREP_INTERRUPT |  DMA_CTRL_ACK);
@@ -481,7 +481,7 @@ static int tegra_slink_start_tx_dma(struct tegra_slink_data *tspi, int len)
 
 static int tegra_slink_start_rx_dma(struct tegra_slink_data *tspi, int len)
 {
-        INIT_COMPLETION(tspi->rx_dma_complete);
+        reinit_completion(&tspi->rx_dma_complete);
         tspi->rx_dma_desc = dmaengine_prep_slave_single(tspi->rx_dma_chan,
                                 tspi->rx_dma_phys, len, DMA_DEV_TO_MEM,
                                 DMA_PREP_INTERRUPT |  DMA_CTRL_ACK);
@@ -836,7 +836,7 @@ static int tegra_slink_transfer_one(struct spi_master *master,
         struct tegra_slink_data *tspi = spi_master_get_devdata(master);
         int ret;
 
-        INIT_COMPLETION(tspi->xfer_completion);
+        reinit_completion(&tspi->xfer_completion);
         ret = tegra_slink_start_transfer_one(spi, xfer);
         if (ret < 0) {
                 dev_err(tspi->dev,
diff --git a/drivers/spi/spi-ti-qspi.c b/drivers/spi/spi-ti-qspi.c
index 0b71270fbf67..4396bd448540 100644
--- a/drivers/spi/spi-ti-qspi.c
+++ b/drivers/spi/spi-ti-qspi.c
@@ -161,7 +161,7 @@ static int ti_qspi_setup(struct spi_device *spi)
                         qspi->spi_max_frequency, clk_div);
 
         ret = pm_runtime_get_sync(qspi->dev);
-        if (ret) {
+        if (ret < 0) {
                 dev_err(qspi->dev, "pm_runtime_get_sync() failed\n");
                 return ret;
         }
@@ -459,11 +459,10 @@ static int ti_qspi_probe(struct platform_device *pdev)
         if (!of_property_read_u32(np, "num-cs", &num_cs))
                 master->num_chipselect = num_cs;
 
-        platform_set_drvdata(pdev, master);
-
         qspi = spi_master_get_devdata(master);
         qspi->master = master;
         qspi->dev = &pdev->dev;
+        platform_set_drvdata(pdev, qspi);
 
         r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 
@@ -517,10 +516,26 @@ free_master:
 
 static int ti_qspi_remove(struct platform_device *pdev)
 {
-        struct  ti_qspi *qspi = platform_get_drvdata(pdev);
+        struct spi_master *master;
+        struct ti_qspi *qspi;
+        int ret;
+
+        master = platform_get_drvdata(pdev);
+        qspi = spi_master_get_devdata(master);
+
+        ret = pm_runtime_get_sync(qspi->dev);
+        if (ret < 0) {
+                dev_err(qspi->dev, "pm_runtime_get_sync() failed\n");
+                return ret;
+        }
 
         ti_qspi_write(qspi, QSPI_WC_INT_DISABLE, QSPI_INTR_ENABLE_CLEAR_REG);
 
+        pm_runtime_put(qspi->dev);
+        pm_runtime_disable(&pdev->dev);
+
+        spi_unregister_master(master);
+
         return 0;
 }
 
diff --git a/drivers/spi/spi-xilinx.c b/drivers/spi/spi-xilinx.c
index ec3a83f52ea2..6d4ce4615163 100644
--- a/drivers/spi/spi-xilinx.c
+++ b/drivers/spi/spi-xilinx.c
@@ -258,7 +258,7 @@ static int xilinx_spi_txrx_bufs(struct spi_device *spi, struct spi_transfer *t)
         xspi->tx_ptr = t->tx_buf;
         xspi->rx_ptr = t->rx_buf;
         xspi->remaining_bytes = t->len;
-        INIT_COMPLETION(xspi->done);
+        reinit_completion(&xspi->done);
 
 
         /* Enable the transmit empty interrupt, which we use to determine
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index 8d05accf706c..349ebba4b199 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -245,15 +245,27 @@ EXPORT_SYMBOL_GPL(spi_bus_type);
 static int spi_drv_probe(struct device *dev)
 {
         const struct spi_driver         *sdrv = to_spi_driver(dev->driver);
+        struct spi_device               *spi = to_spi_device(dev);
+        int ret;
+
+        acpi_dev_pm_attach(&spi->dev, true);
+        ret = sdrv->probe(spi);
+        if (ret)
+                acpi_dev_pm_detach(&spi->dev, true);
 
-        return sdrv->probe(to_spi_device(dev));
+        return ret;
 }
 
 static int spi_drv_remove(struct device *dev)
 {
         const struct spi_driver         *sdrv = to_spi_driver(dev->driver);
+        struct spi_device               *spi = to_spi_device(dev);
+        int ret;
 
-        return sdrv->remove(to_spi_device(dev));
+        ret = sdrv->remove(spi);
+        acpi_dev_pm_detach(&spi->dev, true);
+
+        return ret;
 }
 
 static void spi_drv_shutdown(struct device *dev)
@@ -345,6 +357,19 @@ struct spi_device *spi_alloc_device(struct spi_master *master)
 }
 EXPORT_SYMBOL_GPL(spi_alloc_device);
 
+static void spi_dev_set_name(struct spi_device *spi)
+{
+        struct acpi_device *adev = ACPI_COMPANION(&spi->dev);
+
+        if (adev) {
+                dev_set_name(&spi->dev, "spi-%s", acpi_dev_name(adev));
+                return;
+        }
+
+        dev_set_name(&spi->dev, "%s.%u", dev_name(&spi->master->dev),
+                     spi->chip_select);
+}
+
 /**
  * spi_add_device - Add spi_device allocated with spi_alloc_device
  * @spi: spi_device to register
@@ -371,9 +396,7 @@ int spi_add_device(struct spi_device *spi)
         }
 
         /* Set the bus ID string */
-        dev_set_name(&spi->dev, "%s.%u", dev_name(&spi->master->dev),
-                        spi->chip_select);
-
+        spi_dev_set_name(spi);
 
         /* We need to make sure there's no other device with this
          * chipselect **BEFORE** we call setup(), else we'll trash
@@ -559,7 +582,7 @@ static int spi_transfer_one_message(struct spi_master *master,
         list_for_each_entry(xfer, &msg->transfers, transfer_list) {
                 trace_spi_transfer_start(msg, xfer);
 
-                INIT_COMPLETION(master->xfer_completion);
+                reinit_completion(&master->xfer_completion);
 
                 ret = master->transfer_one(master, msg->spi, xfer);
                 if (ret < 0) {
@@ -1132,7 +1155,7 @@ static acpi_status acpi_spi_add_device(acpi_handle handle, u32 level,
                 return AE_NO_MEMORY;
         }
 
-        ACPI_HANDLE_SET(&spi->dev, handle);
+        ACPI_COMPANION_SET(&spi->dev, adev);
         spi->irq = -1;
 
         INIT_LIST_HEAD(&resource_list);
@@ -1145,8 +1168,10 @@ static acpi_status acpi_spi_add_device(acpi_handle handle, u32 level,
                 return AE_OK;
         }
 
+        adev->power.flags.ignore_parent = true;
         strlcpy(spi->modalias, acpi_device_hid(adev), sizeof(spi->modalias));
         if (spi_add_device(spi)) {
+                adev->power.flags.ignore_parent = false;
                 dev_err(&master->dev, "failed to add SPI device %s from ACPI\n",
                         dev_name(&adev->dev));
                 spi_dev_put(spi);
@@ -1390,7 +1415,7 @@ int devm_spi_register_master(struct device *dev, struct spi_master *master)
                 return -ENOMEM;
 
         ret = spi_register_master(master);
-        if (ret != 0) {
+        if (!ret) {
                 *ptr = master;
                 devres_add(dev, ptr);
         } else {