Merge remote-tracking branches 'spi/topic/imx', 'spi/topic/init', 'spi/topic/mpc512x...

diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index eea4eb83f352ddd41de19987baadee84a45f2bdc..5bf7a4f100d218e9050a0e1c8bc5dc7c4f7a38d9 100644 (file)
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -212,7 +212,6 @@ config SPI_IMX
        tristate "Freescale i.MX SPI controllers"
        depends on ARCH_MXC || COMPILE_TEST
        select SPI_BITBANG
-       default m if IMX_HAVE_PLATFORM_SPI_IMX
        help
          This enables using the Freescale i.MX SPI controllers in master
          mode.

diff --git a/drivers/spi/spi-altera.c b/drivers/spi/spi-altera.c
index 09df64950234d8d6776fa8b75ed0d688dffda1ea..5b5709a5c95725276a3942745e9edbf6dc2fb53e 100644 (file)
--- a/drivers/spi/spi-altera.c
+++ b/drivers/spi/spi-altera.c
@@ -13,7 +13,6 @@
  * published by the Free Software Foundation.
  */
 
-#include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/errno.h>
 #include <linux/module.h>

diff --git a/drivers/spi/spi-ath79.c b/drivers/spi/spi-ath79.c
index c3b2fb9b6713c997b1338d5df13470e0227a5d93..3898b0b9ee77cf2f0115c815a26dba9106cccf4a 100644 (file)
--- a/drivers/spi/spi-ath79.c
+++ b/drivers/spi/spi-ath79.c
@@ -14,7 +14,6 @@
 
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/spinlock.h>
 #include <linux/workqueue.h>

diff --git a/drivers/spi/spi-atmel.c b/drivers/spi/spi-atmel.c
index 9641237295cd7987e533f03fcdff7e494d912f9a..8005f986948173e55d5bc5a5387da80c8a5b9185 100644 (file)
--- a/drivers/spi/spi-atmel.c
+++ b/drivers/spi/spi-atmel.c
@@ -9,7 +9,6 @@
  */
 
 #include <linux/kernel.h>
-#include <linux/init.h>
 #include <linux/clk.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>

diff --git a/drivers/spi/spi-bcm63xx.c b/drivers/spi/spi-bcm63xx.c
index c1cd2e0f54d1288ce155b3bc52159bf06b067c56..0250fa721cea89277ef7843979ceaf95e7e4400a 100644 (file)
--- a/drivers/spi/spi-bcm63xx.c
+++ b/drivers/spi/spi-bcm63xx.c
@@ -20,7 +20,6 @@
  */
 
 #include <linux/kernel.h>
-#include <linux/init.h>
 #include <linux/clk.h>
 #include <linux/io.h>
 #include <linux/module.h>

diff --git a/drivers/spi/spi-bfin-sport.c b/drivers/spi/spi-bfin-sport.c
index 38941e5920b50fe2bb9455cc9392fe6803db6355..f515c5e9db5723babdf9f15ba808185011459948 100644 (file)
--- a/drivers/spi/spi-bfin-sport.c
+++ b/drivers/spi/spi-bfin-sport.c
@@ -8,7 +8,6 @@
  * Licensed under the GPL-2 or later.
  */
 
-#include <linux/init.h>
 #include <linux/module.h>
 #include <linux/delay.h>
 #include <linux/device.h>

diff --git a/drivers/spi/spi-bitbang.c b/drivers/spi/spi-bitbang.c
index 67aead24875316b0a3c8f22ced9670d21447442b..dc7d2c2d643e80e3b6fa65564cc76b435d76ce50 100644 (file)
--- a/drivers/spi/spi-bitbang.c
+++ b/drivers/spi/spi-bitbang.c
@@ -16,7 +16,6 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <linux/init.h>
 #include <linux/spinlock.h>
 #include <linux/workqueue.h>
 #include <linux/interrupt.h>

diff --git a/drivers/spi/spi-clps711x.c b/drivers/spi/spi-clps711x.c
index a2b8ef5d8c590389434f963797875511e6121af6..4cd62f63654741010a70fa7d45a4aae820a87e32 100644 (file)
--- a/drivers/spi/spi-clps711x.c
+++ b/drivers/spi/spi-clps711x.c
@@ -11,7 +11,6 @@
 
 #include <linux/io.h>
 #include <linux/clk.h>
-#include <linux/init.h>
 #include <linux/gpio.h>
 #include <linux/delay.h>
 #include <linux/module.h>

diff --git a/drivers/spi/spi-gpio.c b/drivers/spi/spi-gpio.c
index e97baf2f475c9ba6c8bbf3682bc9624833a3d8fc..09823076df889d8b3a2928304713c7faa72651af 100644 (file)
--- a/drivers/spi/spi-gpio.c
+++ b/drivers/spi/spi-gpio.c
@@ -19,7 +19,6 @@
  */
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/init.h>
 #include <linux/platform_device.h>
 #include <linux/gpio.h>
 #include <linux/of.h>

diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c
index f52372c403eeec940ee08c90f1b2d1d85c6c0b72..5daff2054ae49ffa3810c29def0e3cd0db8822fe 100644 (file)
--- a/drivers/spi/spi-imx.c
+++ b/drivers/spi/spi-imx.c
@@ -23,7 +23,6 @@
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/gpio.h>
-#include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/io.h>
 #include <linux/irq.h>
@@ -880,12 +879,12 @@ static int spi_imx_probe(struct platform_device *pdev)
 
        spi_imx->irq = platform_get_irq(pdev, 0);
        if (spi_imx->irq < 0) {
-               ret = -EINVAL;
+               ret = spi_imx->irq;
                goto out_master_put;
        }
 
        ret = devm_request_irq(&pdev->dev, spi_imx->irq, spi_imx_isr, 0,
-                              DRIVER_NAME, spi_imx);
+                              dev_name(&pdev->dev), spi_imx);
        if (ret) {
                dev_err(&pdev->dev, "can't get irq%d: %d\n", spi_imx->irq, ret);
                goto out_master_put;

diff --git a/drivers/spi/spi-mpc512x-psc.c b/drivers/spi/spi-mpc512x-psc.c
index 5032141eeeec4ee0cbb46b7d7af7c8a65e76212c..3822eef2ef9dacebd723ee2472a33dc04e1865a5 100644 (file)
--- a/drivers/spi/spi-mpc512x-psc.c
+++ b/drivers/spi/spi-mpc512x-psc.c
@@ -16,7 +16,6 @@
 
 #include <linux/module.h>
 #include <linux/kernel.h>
-#include <linux/init.h>
 #include <linux/errno.h>
 #include <linux/interrupt.h>
 #include <linux/of_address.h>
@@ -466,10 +465,8 @@ static void mpc512x_spi_cs_control(struct spi_device *spi, bool onoff)
        gpio_set_value(spi->cs_gpio, onoff);
 }
 
-/* bus_num is used only for the case dev->platform_data == NULL */
 static int mpc512x_psc_spi_do_probe(struct device *dev, u32 regaddr,
-                                             u32 size, unsigned int irq,
-                                             s16 bus_num)
+                                             u32 size, unsigned int irq)
 {
        struct fsl_spi_platform_data *pdata = dev_get_platdata(dev);
        struct mpc512x_psc_spi *mps;
@@ -488,7 +485,6 @@ static int mpc512x_psc_spi_do_probe(struct device *dev, u32 regaddr,
 
        if (pdata == NULL) {
                mps->cs_control = mpc512x_spi_cs_control;
-               master->bus_num = bus_num;
        } else {
                mps->cs_control = pdata->cs_control;
                master->bus_num = pdata->bus_num;
@@ -574,7 +570,6 @@ static int mpc512x_psc_spi_of_probe(struct platform_device *op)
 {
        const u32 *regaddr_p;
        u64 regaddr64, size64;
-       s16 id = -1;
 
        regaddr_p = of_get_address(op->dev.of_node, 0, &size64, NULL);
        if (!regaddr_p) {
@@ -583,16 +578,8 @@ static int mpc512x_psc_spi_of_probe(struct platform_device *op)
        }
        regaddr64 = of_translate_address(op->dev.of_node, regaddr_p);
 
-       /* get PSC id (0..11, used by port_config) */
-       id = of_alias_get_id(op->dev.of_node, "spi");
-       if (id < 0) {
-               dev_err(&op->dev, "no alias id for %s\n",
-                       op->dev.of_node->full_name);
-               return id;
-       }
-
        return mpc512x_psc_spi_do_probe(&op->dev, (u32) regaddr64, (u32) size64,
-                               irq_of_parse_and_map(op->dev.of_node, 0), id);
+                               irq_of_parse_and_map(op->dev.of_node, 0));
 }
 
 static int mpc512x_psc_spi_of_remove(struct platform_device *op)

diff --git a/drivers/spi/spi-mpc52xx-psc.c b/drivers/spi/spi-mpc52xx-psc.c
index 00ba910ab3023a2587bc54a700e25e9f4a561438..3d18d93511854c1aa56fd6b5ebe6d10c65157242 100644 (file)
--- a/drivers/spi/spi-mpc52xx-psc.c
+++ b/drivers/spi/spi-mpc52xx-psc.c
@@ -12,7 +12,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/init.h>
 #include <linux/types.h>
 #include <linux/errno.h>
 #include <linux/interrupt.h>

diff --git a/drivers/spi/spi-mpc52xx.c b/drivers/spi/spi-mpc52xx.c
index e3d29a56d70a703a0e65f7a5694912cdb2858653..aac2a5ddd964efcf1086263fa1231235aa065141 100644 (file)
--- a/drivers/spi/spi-mpc52xx.c
+++ b/drivers/spi/spi-mpc52xx.c
@@ -12,7 +12,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/init.h>
 #include <linux/errno.h>
 #include <linux/of_platform.h>
 #include <linux/interrupt.h>
@@ -357,17 +356,6 @@ static void mpc52xx_spi_wq(struct work_struct *work)
  * spi_master ops
  */
 
-static int mpc52xx_spi_setup(struct spi_device *spi)
-{
-       if (spi->bits_per_word % 8)
-               return -EINVAL;
-
-       if (spi->mode & ~(SPI_CPOL | SPI_CPHA | SPI_LSB_FIRST))
-               return -EINVAL;
-
-       return 0;
-}
-
 static int mpc52xx_spi_transfer(struct spi_device *spi, struct spi_message *m)
 {
        struct mpc52xx_spi *ms = spi_master_get_devdata(spi->master);
@@ -430,9 +418,9 @@ static int mpc52xx_spi_probe(struct platform_device *op)
                goto err_alloc;
        }
 
-       master->setup = mpc52xx_spi_setup;
        master->transfer = mpc52xx_spi_transfer;
        master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_LSB_FIRST;
+       master->bits_per_word_mask = SPI_BPW_MASK(8);
        master->dev.of_node = op->dev.of_node;
 
        platform_set_drvdata(op, master);

diff --git a/drivers/spi/spi-mxs.c b/drivers/spi/spi-mxs.c
index 79e5aa2250c89d48541d8d9eb263410c2aa66ac6..2884f0c2f5f05a086621102e847c2bfbefcb215e 100644 (file)
--- a/drivers/spi/spi-mxs.c
+++ b/drivers/spi/spi-mxs.c
@@ -29,7 +29,6 @@
  */
 
 #include <linux/kernel.h>
-#include <linux/init.h>
 #include <linux/ioport.h>
 #include <linux/of.h>
 #include <linux/of_device.h>
@@ -371,7 +370,7 @@ static int mxs_spi_transfer_one(struct spi_master *master,
 {
        struct mxs_spi *spi = spi_master_get_devdata(master);
        struct mxs_ssp *ssp = &spi->ssp;
-       struct spi_transfer *t, *tmp_t;
+       struct spi_transfer *t;
        unsigned int flag;
        int status = 0;
 
@@ -381,7 +380,7 @@ static int mxs_spi_transfer_one(struct spi_master *master,
        writel(mxs_spi_cs_to_reg(m->spi->chip_select),
               ssp->base + HW_SSP_CTRL0 + STMP_OFFSET_REG_SET);
 
-       list_for_each_entry_safe(t, tmp_t, &m->transfers, transfer_list) {
+       list_for_each_entry(t, &m->transfers, transfer_list) {
 
                status = mxs_spi_setup_transfer(m->spi, t);
                if (status)
@@ -473,7 +472,7 @@ static int mxs_spi_probe(struct platform_device *pdev)
        iores = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        irq_err = platform_get_irq(pdev, 0);
        if (irq_err < 0)
-               return -EINVAL;
+               return irq_err;
 
        base = devm_ioremap_resource(&pdev->dev, iores);
        if (IS_ERR(base))

diff --git a/drivers/spi/spi-nuc900.c b/drivers/spi/spi-nuc900.c
index bae97ffec4b9952f10a1affc3ca3741d537e91af..16e30de650b02a7bdbada7b00be5d8eb7e0deaff 100644 (file)
--- a/drivers/spi/spi-nuc900.c
+++ b/drivers/spi/spi-nuc900.c
@@ -9,7 +9,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/init.h>
 #include <linux/spinlock.h>
 #include <linux/workqueue.h>
 #include <linux/interrupt.h>
@@ -38,7 +37,9 @@
 /* usi register bit */
 #define ENINT          (0x01 << 17)
 #define ENFLG          (0x01 << 16)
+#define SLEEP          (0x0f << 12)
 #define TXNUM          (0x03 << 8)
+#define TXBITLEN       (0x1f << 3)
 #define TXNEG          (0x01 << 2)
 #define RXNEG          (0x01 << 1)
 #define LSB            (0x01 << 10)
@@ -58,11 +59,8 @@ struct nuc900_spi {
        unsigned char           *rx;
        struct clk              *clk;
        struct spi_master       *master;
-       struct spi_device       *curdev;
-       struct device           *dev;
        struct nuc900_spi_info *pdata;
        spinlock_t              lock;
-       struct resource         *res;
 };
 
 static inline struct nuc900_spi *to_hw(struct spi_device *sdev)
@@ -119,19 +117,16 @@ static void nuc900_spi_chipsel(struct spi_device *spi, int value)
        }
 }
 
-static void nuc900_spi_setup_txnum(struct nuc900_spi *hw,
-                                                       unsigned int txnum)
+static void nuc900_spi_setup_txnum(struct nuc900_spi *hw, unsigned int txnum)
 {
        unsigned int val;
        unsigned long flags;
 
        spin_lock_irqsave(&hw->lock, flags);
 
-       val = __raw_readl(hw->regs + USI_CNT);
+       val = __raw_readl(hw->regs + USI_CNT) & ~TXNUM;
 
-       if (!txnum)
-               val &= ~TXNUM;
-       else
+       if (txnum)
                val |= txnum << 0x08;
 
        __raw_writel(val, hw->regs + USI_CNT);
@@ -148,7 +143,7 @@ static void nuc900_spi_setup_txbitlen(struct nuc900_spi *hw,
 
        spin_lock_irqsave(&hw->lock, flags);
 
-       val = __raw_readl(hw->regs + USI_CNT);
+       val = __raw_readl(hw->regs + USI_CNT) & ~TXBITLEN;
 
        val |= (txbitlen << 0x03);
 
@@ -287,12 +282,11 @@ static void nuc900_set_sleep(struct nuc900_spi *hw, unsigned int sleep)
 
        spin_lock_irqsave(&hw->lock, flags);
 
-       val = __raw_readl(hw->regs + USI_CNT);
+       val = __raw_readl(hw->regs + USI_CNT) & ~SLEEP;
 
        if (sleep)
                val |= (sleep << 12);
-       else
-               val &= ~(0x0f << 12);
+
        __raw_writel(val, hw->regs + USI_CNT);
 
        spin_unlock_irqrestore(&hw->lock, flags);
@@ -338,6 +332,7 @@ static int nuc900_spi_probe(struct platform_device *pdev)
 {
        struct nuc900_spi *hw;
        struct spi_master *master;
+       struct resource *res;
        int err = 0;
 
        master = spi_alloc_master(&pdev->dev, sizeof(struct nuc900_spi));
@@ -349,7 +344,6 @@ static int nuc900_spi_probe(struct platform_device *pdev)
        hw = spi_master_get_devdata(master);
        hw->master = master;
        hw->pdata  = dev_get_platdata(&pdev->dev);
-       hw->dev = &pdev->dev;
 
        if (hw->pdata == NULL) {
                dev_err(&pdev->dev, "No platform data supplied\n");
@@ -369,8 +363,8 @@ static int nuc900_spi_probe(struct platform_device *pdev)
        hw->bitbang.chipselect     = nuc900_spi_chipsel;
        hw->bitbang.txrx_bufs      = nuc900_spi_txrx;
 
-       hw->res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       hw->regs = devm_ioremap_resource(&pdev->dev, hw->res);
+       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+       hw->regs = devm_ioremap_resource(&pdev->dev, res);
        if (IS_ERR(hw->regs)) {
                err = PTR_ERR(hw->regs);
                goto err_pdata;

diff --git a/drivers/spi/spi-oc-tiny.c b/drivers/spi/spi-oc-tiny.c
index f7c896e2981ef684d339f8e97f2b021ff468c35d..8998d11c72386d78811328590038be63ce34f3f9 100644 (file)
--- a/drivers/spi/spi-oc-tiny.c
+++ b/drivers/spi/spi-oc-tiny.c
@@ -15,7 +15,6 @@
  * published by the Free Software Foundation.
  */
 
-#include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/errno.h>
 #include <linux/module.h>
@@ -267,8 +266,6 @@ static int tiny_spi_probe(struct platform_device *pdev)
 
        /* setup the state for the bitbang driver */
        hw->bitbang.master = master;
-       if (!hw->bitbang.master)
-               return err;
        hw->bitbang.setup_transfer = tiny_spi_setup_transfer;
        hw->bitbang.chipselect = tiny_spi_chipselect;
        hw->bitbang.txrx_bufs = tiny_spi_txrx_bufs;

diff --git a/drivers/spi/spi-octeon.c b/drivers/spi/spi-octeon.c
index e31f6d833951dc3c2bb87840d1bb55d420453e52..c5e2f718eebda3f2c5da42266b7769e4aa8ca407 100644 (file)
--- a/drivers/spi/spi-octeon.c
+++ b/drivers/spi/spi-octeon.c
@@ -11,7 +11,6 @@
 #include <linux/spi/spi.h>
 #include <linux/module.h>
 #include <linux/delay.h>
-#include <linux/init.h>
 #include <linux/io.h>
 #include <linux/of.h>
 
@@ -33,13 +32,6 @@ struct octeon_spi {
        u64 cs_enax;
 };
 
-struct octeon_spi_setup {
-       u32 max_speed_hz;
-       u8 chip_select;
-       u8 mode;
-       u8 bits_per_word;
-};
-
 static void octeon_spi_wait_ready(struct octeon_spi *p)
 {
        union cvmx_mpi_sts mpi_sts;
@@ -57,6 +49,7 @@ static int octeon_spi_do_transfer(struct octeon_spi *p,
                                  struct spi_transfer *xfer,
                                  bool last_xfer)
 {
+       struct spi_device *spi = msg->spi;
        union cvmx_mpi_cfg mpi_cfg;
        union cvmx_mpi_tx mpi_tx;
        unsigned int clkdiv;
@@ -68,18 +61,11 @@ static int octeon_spi_do_transfer(struct octeon_spi *p,
        int len;
        int i;
 
-       struct octeon_spi_setup *msg_setup = spi_get_ctldata(msg->spi);
-
-       speed_hz = msg_setup->max_speed_hz;
-       mode = msg_setup->mode;
+       mode = spi->mode;
        cpha = mode & SPI_CPHA;
        cpol = mode & SPI_CPOL;
 
-       if (xfer->speed_hz)
-               speed_hz = xfer->speed_hz;
-
-       if (speed_hz > OCTEON_SPI_MAX_CLOCK_HZ)
-               speed_hz = OCTEON_SPI_MAX_CLOCK_HZ;
+       speed_hz = xfer->speed_hz ? : spi->max_speed_hz;
 
        clkdiv = octeon_get_io_clock_rate() / (2 * speed_hz);
 
@@ -93,8 +79,8 @@ static int octeon_spi_do_transfer(struct octeon_spi *p,
        mpi_cfg.s.cslate = cpha ? 1 : 0;
        mpi_cfg.s.enable = 1;
 
-       if (msg_setup->chip_select < 4)
-               p->cs_enax |= 1ull << (12 + msg_setup->chip_select);
+       if (spi->chip_select < 4)
+               p->cs_enax |= 1ull << (12 + spi->chip_select);
        mpi_cfg.u64 |= p->cs_enax;
 
        if (mpi_cfg.u64 != p->last_cfg) {
@@ -114,7 +100,7 @@ static int octeon_spi_do_transfer(struct octeon_spi *p,
                        cvmx_write_csr(p->register_base + OCTEON_SPI_DAT0 + (8 * i), d);
                }
                mpi_tx.u64 = 0;
-               mpi_tx.s.csid = msg_setup->chip_select;
+               mpi_tx.s.csid = spi->chip_select;
                mpi_tx.s.leavecs = 1;
                mpi_tx.s.txnum = tx_buf ? OCTEON_SPI_MAX_BYTES : 0;
                mpi_tx.s.totnum = OCTEON_SPI_MAX_BYTES;
@@ -139,7 +125,7 @@ static int octeon_spi_do_transfer(struct octeon_spi *p,
        }
 
        mpi_tx.u64 = 0;
-       mpi_tx.s.csid = msg_setup->chip_select;
+       mpi_tx.s.csid = spi->chip_select;
        if (last_xfer)
                mpi_tx.s.leavecs = xfer->cs_change;
        else
@@ -169,17 +155,9 @@ static int octeon_spi_transfer_one_message(struct spi_master *master,
        int status = 0;
        struct spi_transfer *xfer;
 
-       /*
-        * We better have set the configuration via a call to .setup
-        * before we get here.
-        */
-       if (spi_get_ctldata(msg->spi) == NULL) {
-               status = -EINVAL;
-               goto err;
-       }
-
        list_for_each_entry(xfer, &msg->transfers, transfer_list) {
-               bool last_xfer = &xfer->transfer_list == msg->transfers.prev;
+               bool last_xfer = list_is_last(&xfer->transfer_list,
+                                             &msg->transfers);
                int r = octeon_spi_do_transfer(p, msg, xfer, last_xfer);
                if (r < 0) {
                        status = r;
@@ -194,41 +172,6 @@ err:
        return status;
 }
 
-static struct octeon_spi_setup *octeon_spi_new_setup(struct spi_device *spi)
-{
-       struct octeon_spi_setup *setup = kzalloc(sizeof(*setup), GFP_KERNEL);
-       if (!setup)
-               return NULL;
-
-       setup->max_speed_hz = spi->max_speed_hz;
-       setup->chip_select = spi->chip_select;
-       setup->mode = spi->mode;
-       setup->bits_per_word = spi->bits_per_word;
-       return setup;
-}
-
-static int octeon_spi_setup(struct spi_device *spi)
-{
-       struct octeon_spi_setup *new_setup;
-       struct octeon_spi_setup *old_setup = spi_get_ctldata(spi);
-
-       new_setup = octeon_spi_new_setup(spi);
-       if (!new_setup)
-               return -ENOMEM;
-
-       spi_set_ctldata(spi, new_setup);
-       kfree(old_setup);
-
-       return 0;
-}
-
-static void octeon_spi_cleanup(struct spi_device *spi)
-{
-       struct octeon_spi_setup *old_setup = spi_get_ctldata(spi);
-       spi_set_ctldata(spi, NULL);
-       kfree(old_setup);
-}
-
 static int octeon_spi_probe(struct platform_device *pdev)
 {
        struct resource *res_mem;
@@ -264,10 +207,9 @@ static int octeon_spi_probe(struct platform_device *pdev)
                            SPI_LSB_FIRST |
                            SPI_3WIRE;
 
-       master->setup = octeon_spi_setup;
-       master->cleanup = octeon_spi_cleanup;
        master->transfer_one_message = octeon_spi_transfer_one_message;
        master->bits_per_word_mask = SPI_BPW_MASK(8);
+       master->max_speed_hz = OCTEON_SPI_MAX_CLOCK_HZ;
 
        master->dev.of_node = pdev->dev.of_node;
        err = devm_spi_register_master(&pdev->dev, master);

diff --git a/drivers/spi/spi-omap2-mcspi.c b/drivers/spi/spi-omap2-mcspi.c
index a72127f08e39faa04d1433094590094ea1ac357d..94f133cb2770ab3b1030dac7594eb0eda29f824f 100644 (file)
--- a/drivers/spi/spi-omap2-mcspi.c
+++ b/drivers/spi/spi-omap2-mcspi.c
@@ -22,7 +22,6 @@
  */
 
 #include <linux/kernel.h>
-#include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/module.h>
 #include <linux/device.h>

diff --git a/drivers/spi/spi-orion.c b/drivers/spi/spi-orion.c
index 7f2121fe262223391185bfc458be0ced703463a6..a362425400eaca5f4c2ef520126b53427f0c3477 100644 (file)
--- a/drivers/spi/spi-orion.c
+++ b/drivers/spi/spi-orion.c
@@ -9,7 +9,6 @@
  * published by the Free Software Foundation.
  */
 
-#include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/delay.h>
 #include <linux/platform_device.h>

diff --git a/drivers/spi/spi-ppc4xx.c b/drivers/spi/spi-ppc4xx.c
index 5ee56726f8d080faaf052289a89c667fc425d85c..80b8408ac3e3c89e05ff8c30fd8b99f0ced01601 100644 (file)
--- a/drivers/spi/spi-ppc4xx.c
+++ b/drivers/spi/spi-ppc4xx.c
@@ -24,7 +24,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/init.h>
 #include <linux/sched.h>
 #include <linux/slab.h>
 #include <linux/errno.h>

diff --git a/drivers/spi/spi-pxa2xx-dma.c b/drivers/spi/spi-pxa2xx-dma.c
index 3c0b55125f1eb6b85989a549fc50c51f114b9b0d..713af4806f265e10b87dcfade6b6989055c2f283 100644 (file)
--- a/drivers/spi/spi-pxa2xx-dma.c
+++ b/drivers/spi/spi-pxa2xx-dma.c
@@ -9,7 +9,6 @@
  * published by the Free Software Foundation.
  */
 
-#include <linux/init.h>
 #include <linux/device.h>
 #include <linux/dma-mapping.h>
 #include <linux/dmaengine.h>

diff --git a/drivers/spi/spi-pxa2xx-pxadma.c b/drivers/spi/spi-pxa2xx-pxadma.c
index 2916efc7cfe59eed5734304b5022c150902298fe..e8a26f25d5c0a1464ab259c545e2b1d2031a9741 100644 (file)
--- a/drivers/spi/spi-pxa2xx-pxadma.c
+++ b/drivers/spi/spi-pxa2xx-pxadma.c
@@ -18,7 +18,6 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/device.h>
 #include <linux/dma-mapping.h>

diff --git a/drivers/spi/spi-s3c24xx.c b/drivers/spi/spi-s3c24xx.c
index 746424aa5353fb2a779b04c0fc93aae0163da0ea..c20df45204e257c55563bfeb69f79524da05d13f 100644 (file)
--- a/drivers/spi/spi-s3c24xx.c
+++ b/drivers/spi/spi-s3c24xx.c
@@ -9,7 +9,6 @@
  *
 */
 
-#include <linux/init.h>
 #include <linux/spinlock.h>
 #include <linux/workqueue.h>
 #include <linux/interrupt.h>

diff --git a/drivers/spi/spi-sh-msiof.c b/drivers/spi/spi-sh-msiof.c
index 81cc02f5f9b02494379bbc7cfb5547f17c48fb20..33474061b742a3ae10805fd7aec9b60853831b58 100644 (file)
--- a/drivers/spi/spi-sh-msiof.c
+++ b/drivers/spi/spi-sh-msiof.c
@@ -15,7 +15,6 @@
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/gpio.h>
-#include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/io.h>
 #include <linux/kernel.h>

diff --git a/drivers/spi/spi-sh-sci.c b/drivers/spi/spi-sh-sci.c
index 38eb24df796c58ebdef65d2c5ada2e90aff036d0..85c2efd57c8040bfee639eb59a16b627414fdd18 100644 (file)
--- a/drivers/spi/spi-sh-sci.c
+++ b/drivers/spi/spi-sh-sci.c
@@ -14,7 +14,6 @@
  */
 
 #include <linux/kernel.h>
-#include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/spinlock.h>
 #include <linux/workqueue.h>

diff --git a/drivers/spi/spi-tegra114.c b/drivers/spi/spi-tegra114.c
index f176ad7b8f16c481c9c6016849d98fd5864c9ea6..6be661e4c6e1ec034d4f5d9211a5aab15098d48b 100644 (file)
--- a/drivers/spi/spi-tegra114.c
+++ b/drivers/spi/spi-tegra114.c
@@ -23,7 +23,6 @@
 #include <linux/dma-mapping.h>
 #include <linux/dmapool.h>
 #include <linux/err.h>
-#include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/io.h>
 #include <linux/kernel.h>

diff --git a/drivers/spi/spi-tegra20-sflash.c b/drivers/spi/spi-tegra20-sflash.c
index c45135e371b4258b64fe750a285449b6324f3847..47869ea636e16189cbe651ad3426b338a670d1b7 100644 (file)
--- a/drivers/spi/spi-tegra20-sflash.c
+++ b/drivers/spi/spi-tegra20-sflash.c
@@ -22,7 +22,6 @@
 #include <linux/completion.h>
 #include <linux/delay.h>
 #include <linux/err.h>
-#include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/io.h>
 #include <linux/kernel.h>

diff --git a/drivers/spi/spi-tegra20-slink.c b/drivers/spi/spi-tegra20-slink.c
index eb5b771e1575740633cbdfe1bc6aac728d19858d..e3c1b93e45d19abf610e7566405c3ad434a4bfbf 100644 (file)
--- a/drivers/spi/spi-tegra20-slink.c
+++ b/drivers/spi/spi-tegra20-slink.c
@@ -23,7 +23,6 @@
 #include <linux/dma-mapping.h>
 #include <linux/dmapool.h>
 #include <linux/err.h>
-#include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/io.h>
 #include <linux/kernel.h>

diff --git a/drivers/spi/spi-xcomm.c b/drivers/spi/spi-xcomm.c
index 24c40b13dab1596edb6756e4f6311523393b418a..350a76b7e8d49e86bccbc504da8d508e2f2078ca 100644 (file)
--- a/drivers/spi/spi-xcomm.c
+++ b/drivers/spi/spi-xcomm.c
@@ -8,7 +8,6 @@
  */
 
 #include <linux/kernel.h>
-#include <linux/init.h>
 #include <linux/module.h>
 #include <linux/delay.h>
 #include <linux/i2c.h>

diff --git a/drivers/spi/spi-xilinx.c b/drivers/spi/spi-xilinx.c
index 6d4ce4615163ddb8efbdfc798cec36341b6baa1b..e6cd1112ae40d9afc072141840f936f4ee226fc3 100644 (file)
--- a/drivers/spi/spi-xilinx.c
+++ b/drivers/spi/spi-xilinx.c
@@ -14,7 +14,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/of.h>
 #include <linux/platform_device.h>