Merge remote-tracking branches 'spi/fix/bcm2835', 'spi/fix/bcm63xx', 'spi/fix/mpc512x...

diff --combined drivers/spi/spi-bcm2835.c
index 3ed666fe840a0cdbaf1a2a2c6cd75670dd25fb48,3c5aca8d677a7cee2ac96211549c7352a068b956,4c332143a3100c52d916fc9887ffd11d96356892,4c332143a3100c52d916fc9887ffd11d96356892,4c332143a3100c52d916fc9887ffd11d96356892,3ed666fe840a0cdbaf1a2a2c6cd75670dd25fb48,3ed666fe840a0cdbaf1a2a2c6cd75670dd25fb48,4c332143a3100c52d916fc9887ffd11d96356892,4c332143a3100c52d916fc9887ffd11d96356892..9025edd7dc45fde131c7c9c6004ce5434829c785
--- 1/drivers/spi/spi-bcm2835.c
--- 2/drivers/spi/spi-bcm2835.c
--- 3/drivers/spi/spi-bcm2835.c
--- 4/drivers/spi/spi-bcm2835.c
--- 5/drivers/spi/spi-bcm2835.c
--- 6/drivers/spi/spi-bcm2835.c
--- 7/drivers/spi/spi-bcm2835.c
--- 8/drivers/spi/spi-bcm2835.c
--- 9/drivers/spi/spi-bcm2835.c
+++ b/drivers/spi/spi-bcm2835.c
@@@@@@@@@@ -217,7 -217,7 -217,7 -217,7 -217,7 -217,7 -217,7 -217,7 -217,7 +217,7 @@@@@@@@@@ static int bcm2835_spi_start_transfer(s
                        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 -377,7 -377,7 -377,7 -377,7 -377,7 -377,7 -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 --combined drivers/spi/spi-mpc512x-psc.c
index 9602bbd8d7eac061fffb5543704fc9d68a48f135,ee6e61cbf7f514caa5c5ebb212e0811426e8b408,ee6e61cbf7f514caa5c5ebb212e0811426e8b408,e9f22a802cdb4047cdf0a1c0776a6bc99ffbd033,ee6e61cbf7f514caa5c5ebb212e0811426e8b408,9602bbd8d7eac061fffb5543704fc9d68a48f135,9602bbd8d7eac061fffb5543704fc9d68a48f135,ee6e61cbf7f514caa5c5ebb212e0811426e8b408,ee6e61cbf7f514caa5c5ebb212e0811426e8b408..87676587d783551e120f5478f9b522c7add7df31
--- 1/drivers/spi/spi-mpc512x-psc.c
--- 2/drivers/spi/spi-mpc512x-psc.c
--- 3/drivers/spi/spi-mpc512x-psc.c
--- 4/drivers/spi/spi-mpc512x-psc.c
--- 5/drivers/spi/spi-mpc512x-psc.c
--- 6/drivers/spi/spi-mpc512x-psc.c
--- 7/drivers/spi/spi-mpc512x-psc.c
--- 8/drivers/spi/spi-mpc512x-psc.c
--- 9/drivers/spi/spi-mpc512x-psc.c
+++ b/drivers/spi/spi-mpc512x-psc.c
@@@@@@@@@@ -20,7 -20,6 -20,6 -20,6 -20,6 -20,7 -20,7 -20,6 -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>
@@@@@@@@@@ -167,7 -166,7 -166,7 -166,7 -166,7 -167,7 -167,7 -166,7 -166,7 +167,7 @@@@@@@@@@ static int mpc512x_psc_spi_transfer_rxt
                                }
         
                                /* 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);
@@@@@@@@@@ -557,7 -556,7 -556,7 -556,7 -556,7 -557,7 -557,7 -556,7 -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 --combined drivers/spi/spi-mxs.c
index 73afb56c08cc26826d468ad4aaacdce3a7e7043f,de333059a9a7ec0f55c134f15161c55bd414648c,de333059a9a7ec0f55c134f15161c55bd414648c,de333059a9a7ec0f55c134f15161c55bd414648c,37b3e41bf46fcbfbd992de3ab5c14c81f0dc8c49,73afb56c08cc26826d468ad4aaacdce3a7e7043f,73afb56c08cc26826d468ad4aaacdce3a7e7043f,de333059a9a7ec0f55c134f15161c55bd414648c,de333059a9a7ec0f55c134f15161c55bd414648c..3adebfa22e3d785b6bf7ffb2149e77652039c3c3
--- 1/drivers/spi/spi-mxs.c
--- 2/drivers/spi/spi-mxs.c
--- 3/drivers/spi/spi-mxs.c
--- 4/drivers/spi/spi-mxs.c
--- 5/drivers/spi/spi-mxs.c
--- 6/drivers/spi/spi-mxs.c
--- 7/drivers/spi/spi-mxs.c
--- 8/drivers/spi/spi-mxs.c
--- 9/drivers/spi/spi-mxs.c
+++ b/drivers/spi/spi-mxs.c
@@@@@@@@@@ -202,7 -202,7 -202,7 -202,7 -202,7 -202,7 -202,7 -202,7 -202,7 +202,7 @@@@@@@@@@ static int mxs_spi_txrx_dma(struct mxs_
                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 -565,7 -565,7 -565,7 -565,7 -565,7 -565,7 -565,7 +565,7 @@@@@@@@@@ static int mxs_spi_remove(struct platfo
                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;