From: Mark Brown <broonie@linaro.org>
Date: Thu, 28 Nov 2013 11:31:35 +0000 (+0000)
Subject: Merge remote-tracking branches 'spi/fix/bcm2835', 'spi/fix/bcm63xx', 'spi/fix/mpc512x... 
X-Git-Tag: v3.13-rc3~27^2
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=c18158f1fdad0de6be5386291189580484e459cf;hp=-c;p=~andy%2Flinux

Merge remote-tracking branches 'spi/fix/bcm2835', 'spi/fix/bcm63xx', 'spi/fix/mpc512x-psc', 'spi/fix/mxs', 'spi/fix/pxa2xx', 'spi/fix/qspi', 'spi/fix/rspi' and 'spi/fix/txx9' into spi-linus
---

c18158f1fdad0de6be5386291189580484e459cf
diff --combined drivers/spi/spi-bcm2835.c
index 3ed666fe840,3c5aca8d677,4c332143a31,4c332143a31,4c332143a31,3ed666fe840,3ed666fe840,4c332143a31,4c332143a31..9025edd7dc4
--- a/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 9602bbd8d7e,ee6e61cbf7f,ee6e61cbf7f,e9f22a802cd,ee6e61cbf7f,9602bbd8d7e,9602bbd8d7e,ee6e61cbf7f,ee6e61cbf7f..87676587d78
--- a/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 73afb56c08c,de333059a9a,de333059a9a,de333059a9a,37b3e41bf46,73afb56c08c,73afb56c08c,de333059a9a,de333059a9a..3adebfa22e3
--- a/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;