Merge remote-tracking branch 'spi/topic/pdata' into spi-next

30 files changed, 125 insertions, 160 deletions

diff --git a/drivers/spi/spi-altera.c b/drivers/spi/spi-altera.c
index 156eb888655e..f38855f76536 100644
--- a/drivers/spi/spi-altera.c
+++ b/drivers/spi/spi-altera.c
@@ -200,7 +200,7 @@ static irqreturn_t altera_spi_irq(int irq, void *dev)
 
 static int altera_spi_probe(struct platform_device *pdev)
 {
-        struct altera_spi_platform_data *platp = pdev->dev.platform_data;
+        struct altera_spi_platform_data *platp = dev_get_platdata(&pdev->dev);
         struct altera_spi *hw;
         struct spi_master *master;
         struct resource *res;
diff --git a/drivers/spi/spi-ath79.c b/drivers/spi/spi-ath79.c
index 0e06407a4670..37bad952ab38 100644
--- a/drivers/spi/spi-ath79.c
+++ b/drivers/spi/spi-ath79.c
@@ -221,7 +221,7 @@ static int ath79_spi_probe(struct platform_device *pdev)
         sp = spi_master_get_devdata(master);
         platform_set_drvdata(pdev, sp);
 
-        pdata = pdev->dev.platform_data;
+        pdata = dev_get_platdata(&pdev->dev);
 
         master->bits_per_word_mask = SPI_BPW_RANGE_MASK(1, 32);
         master->setup = ath79_spi_setup;
diff --git a/drivers/spi/spi-au1550.c b/drivers/spi/spi-au1550.c
index e1965553ab79..1d00d9b397dd 100644
--- a/drivers/spi/spi-au1550.c
+++ b/drivers/spi/spi-au1550.c
@@ -776,7 +776,7 @@ static int au1550_spi_probe(struct platform_device *pdev)
         hw = spi_master_get_devdata(master);
 
         hw->master = spi_master_get(master);
-        hw->pdata = pdev->dev.platform_data;
+        hw->pdata = dev_get_platdata(&pdev->dev);
         hw->dev = &pdev->dev;
 
         if (hw->pdata == NULL) {
diff --git a/drivers/spi/spi-bcm63xx.c b/drivers/spi/spi-bcm63xx.c
index a21fef4a3bb1..de197f72e082 100644
--- a/drivers/spi/spi-bcm63xx.c
+++ b/drivers/spi/spi-bcm63xx.c
@@ -353,7 +353,7 @@ static int bcm63xx_spi_probe(struct platform_device *pdev)
 {
         struct resource *r;
         struct device *dev = &pdev->dev;
-        struct bcm63xx_spi_pdata *pdata = pdev->dev.platform_data;
+        struct bcm63xx_spi_pdata *pdata = dev_get_platdata(&pdev->dev);
         int irq;
         struct spi_master *master;
         struct clk *clk;
@@ -474,8 +474,7 @@ static int bcm63xx_spi_remove(struct platform_device *pdev)
 #ifdef CONFIG_PM
 static int bcm63xx_spi_suspend(struct device *dev)
 {
-        struct spi_master *master =
-                        platform_get_drvdata(to_platform_device(dev));
+        struct spi_master *master = dev_get_drvdata(dev);
         struct bcm63xx_spi *bs = spi_master_get_devdata(master);
 
         spi_master_suspend(master);
@@ -487,8 +486,7 @@ static int bcm63xx_spi_suspend(struct device *dev)
 
 static int bcm63xx_spi_resume(struct device *dev)
 {
-        struct spi_master *master =
-                        platform_get_drvdata(to_platform_device(dev));
+        struct spi_master *master = dev_get_drvdata(dev);
         struct bcm63xx_spi *bs = spi_master_get_devdata(master);
 
         clk_prepare_enable(bs->clk);
diff --git a/drivers/spi/spi-bfin-sport.c b/drivers/spi/spi-bfin-sport.c
index 07ec597f9732..91921b5f5817 100644
--- a/drivers/spi/spi-bfin-sport.c
+++ b/drivers/spi/spi-bfin-sport.c
@@ -756,7 +756,7 @@ static int bfin_sport_spi_probe(struct platform_device *pdev)
         struct bfin_sport_spi_master_data *drv_data;
         int status;
 
-        platform_info = dev->platform_data;
+        platform_info = dev_get_platdata(dev);
 
         /* Allocate master with space for drv_data */
         master = spi_alloc_master(dev, sizeof(*master) + 16);
diff --git a/drivers/spi/spi-bfin-v3.c b/drivers/spi/spi-bfin-v3.c
index e4394ebf08f3..f4bf81347d68 100644
--- a/drivers/spi/spi-bfin-v3.c
+++ b/drivers/spi/spi-bfin-v3.c
@@ -773,7 +773,7 @@ static irqreturn_t bfin_spi_rx_dma_isr(int irq, void *dev_id)
 static int bfin_spi_probe(struct platform_device *pdev)
 {
         struct device *dev = &pdev->dev;
-        struct bfin_spi3_master *info = dev->platform_data;
+        struct bfin_spi3_master *info = dev_get_platdata(dev);
         struct spi_master *master;
         struct bfin_spi_master *drv_data;
         struct resource *mem, *res;
diff --git a/drivers/spi/spi-bfin5xx.c b/drivers/spi/spi-bfin5xx.c
index 59a73424419c..45bdf73d6868 100644
--- a/drivers/spi/spi-bfin5xx.c
+++ b/drivers/spi/spi-bfin5xx.c
@@ -1271,7 +1271,7 @@ static int bfin_spi_probe(struct platform_device *pdev)
         struct resource *res;
         int status = 0;
 
-        platform_info = dev->platform_data;
+        platform_info = dev_get_platdata(dev);
 
         /* Allocate master with space for drv_data */
         master = spi_alloc_master(dev, sizeof(*drv_data));
diff --git a/drivers/spi/spi-coldfire-qspi.c b/drivers/spi/spi-coldfire-qspi.c
index 0631b9d4a5de..8e07928cadb3 100644
--- a/drivers/spi/spi-coldfire-qspi.c
+++ b/drivers/spi/spi-coldfire-qspi.c
@@ -400,7 +400,7 @@ static int mcfqspi_probe(struct platform_device *pdev)
         struct mcfqspi_platform_data *pdata;
         int status;
 
-        pdata = pdev->dev.platform_data;
+        pdata = dev_get_platdata(&pdev->dev);
         if (!pdata) {
                 dev_dbg(&pdev->dev, "platform data is missing\n");
                 return -ENOENT;
@@ -558,7 +558,7 @@ static int mcfqspi_resume(struct device *dev)
 #ifdef CONFIG_PM_RUNTIME
 static int mcfqspi_runtime_suspend(struct device *dev)
 {
-        struct mcfqspi *mcfqspi = platform_get_drvdata(to_platform_device(dev));
+        struct mcfqspi *mcfqspi = dev_get_drvdata(dev);
 
         clk_disable(mcfqspi->clk);
 
@@ -567,7 +567,7 @@ static int mcfqspi_runtime_suspend(struct device *dev)
 
 static int mcfqspi_runtime_resume(struct device *dev)
 {
-        struct mcfqspi *mcfqspi = platform_get_drvdata(to_platform_device(dev));
+        struct mcfqspi *mcfqspi = dev_get_drvdata(dev);
 
         clk_enable(mcfqspi->clk);
 
diff --git a/drivers/spi/spi-davinci.c b/drivers/spi/spi-davinci.c
index 707966bd5610..8fbfe2483ffd 100644
--- a/drivers/spi/spi-davinci.c
+++ b/drivers/spi/spi-davinci.c
@@ -872,8 +872,8 @@ static int davinci_spi_probe(struct platform_device *pdev)
                 goto free_master;
         }
 
-        if (pdev->dev.platform_data) {
-                pdata = pdev->dev.platform_data;
+        if (dev_get_platdata(&pdev->dev)) {
+                pdata = dev_get_platdata(&pdev->dev);
                 dspi->pdata = *pdata;
         } else {
                 /* update dspi pdata with that from the DT */
diff --git a/drivers/spi/spi-ep93xx.c b/drivers/spi/spi-ep93xx.c
index 31611f7d7be9..d22c00a227b6 100644
--- a/drivers/spi/spi-ep93xx.c
+++ b/drivers/spi/spi-ep93xx.c
@@ -874,7 +874,7 @@ static int ep93xx_spi_probe(struct platform_device *pdev)
         int irq;
         int error;
 
-        info = pdev->dev.platform_data;
+        info = dev_get_platdata(&pdev->dev);
 
         irq = platform_get_irq(pdev, 0);
         if (irq < 0) {
diff --git a/drivers/spi/spi-fsl-espi.c b/drivers/spi/spi-fsl-espi.c
index 6a74d7848d93..b8f1103fe28e 100644
--- a/drivers/spi/spi-fsl-espi.c
+++ b/drivers/spi/spi-fsl-espi.c
@@ -584,7 +584,7 @@ static void fsl_espi_remove(struct mpc8xxx_spi *mspi)
 static struct spi_master * fsl_espi_probe(struct device *dev,
                 struct resource *mem, unsigned int irq)
 {
-        struct fsl_spi_platform_data *pdata = dev->platform_data;
+        struct fsl_spi_platform_data *pdata = dev_get_platdata(dev);
         struct spi_master *master;
         struct mpc8xxx_spi *mpc8xxx_spi;
         struct fsl_espi_reg *reg_base;
@@ -665,7 +665,7 @@ err:
 static int of_fsl_espi_get_chipselects(struct device *dev)
 {
         struct device_node *np = dev->of_node;
-        struct fsl_spi_platform_data *pdata = dev->platform_data;
+        struct fsl_spi_platform_data *pdata = dev_get_platdata(dev);
         const u32 *prop;
         int len;
 
diff --git a/drivers/spi/spi-fsl-lib.c b/drivers/spi/spi-fsl-lib.c
index e947f2d1b2f5..0b75f26158ab 100644
--- a/drivers/spi/spi-fsl-lib.c
+++ b/drivers/spi/spi-fsl-lib.c
@@ -122,7 +122,7 @@ const char *mpc8xxx_spi_strmode(unsigned int flags)
 int mpc8xxx_spi_probe(struct device *dev, struct resource *mem,
                         unsigned int irq)
 {
-        struct fsl_spi_platform_data *pdata = dev->platform_data;
+        struct fsl_spi_platform_data *pdata = dev_get_platdata(dev);
         struct spi_master *master;
         struct mpc8xxx_spi *mpc8xxx_spi;
         int ret = 0;
diff --git a/drivers/spi/spi-fsl-spi.c b/drivers/spi/spi-fsl-spi.c
index 41e89c3e3edc..bbc94294891c 100644
--- a/drivers/spi/spi-fsl-spi.c
+++ b/drivers/spi/spi-fsl-spi.c
@@ -574,7 +574,7 @@ static void fsl_spi_grlib_cs_control(struct spi_device *spi, bool on)
 
 static void fsl_spi_grlib_probe(struct device *dev)
 {
-        struct fsl_spi_platform_data *pdata = dev->platform_data;
+        struct fsl_spi_platform_data *pdata = dev_get_platdata(dev);
         struct spi_master *master = dev_get_drvdata(dev);
         struct mpc8xxx_spi *mpc8xxx_spi = spi_master_get_devdata(master);
         struct fsl_spi_reg *reg_base = mpc8xxx_spi->reg_base;
@@ -600,7 +600,7 @@ static void fsl_spi_grlib_probe(struct device *dev)
 static struct spi_master * fsl_spi_probe(struct device *dev,
                 struct resource *mem, unsigned int irq)
 {
-        struct fsl_spi_platform_data *pdata = dev->platform_data;
+        struct fsl_spi_platform_data *pdata = dev_get_platdata(dev);
         struct spi_master *master;
         struct mpc8xxx_spi *mpc8xxx_spi;
         struct fsl_spi_reg *reg_base;
@@ -700,7 +700,8 @@ err:
 static void fsl_spi_cs_control(struct spi_device *spi, bool on)
 {
         struct device *dev = spi->dev.parent->parent;
-        struct mpc8xxx_spi_probe_info *pinfo = to_of_pinfo(dev->platform_data);
+        struct fsl_spi_platform_data *pdata = dev_get_platdata(dev);
+        struct mpc8xxx_spi_probe_info *pinfo = to_of_pinfo(pdata);
         u16 cs = spi->chip_select;
         int gpio = pinfo->gpios[cs];
         bool alow = pinfo->alow_flags[cs];
@@ -711,7 +712,7 @@ static void fsl_spi_cs_control(struct spi_device *spi, bool on)
 static int of_fsl_spi_get_chipselects(struct device *dev)
 {
         struct device_node *np = dev->of_node;
-        struct fsl_spi_platform_data *pdata = dev->platform_data;
+        struct fsl_spi_platform_data *pdata = dev_get_platdata(dev);
         struct mpc8xxx_spi_probe_info *pinfo = to_of_pinfo(pdata);
         int ngpios;
         int i = 0;
@@ -790,7 +791,7 @@ err_alloc_flags:
 
 static int of_fsl_spi_free_chipselects(struct device *dev)
 {
-        struct fsl_spi_platform_data *pdata = dev->platform_data;
+        struct fsl_spi_platform_data *pdata = dev_get_platdata(dev);
         struct mpc8xxx_spi_probe_info *pinfo = to_of_pinfo(pdata);
         int i;
 
@@ -889,7 +890,7 @@ static int plat_mpc8xxx_spi_probe(struct platform_device *pdev)
         int irq;
         struct spi_master *master;
 
-        if (!pdev->dev.platform_data)
+        if (!dev_get_platdata(&pdev->dev))
                 return -EINVAL;
 
         mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
diff --git a/drivers/spi/spi-gpio.c b/drivers/spi/spi-gpio.c
index a54524cf42cc..68b69fec13a9 100644
--- a/drivers/spi/spi-gpio.c
+++ b/drivers/spi/spi-gpio.c
@@ -420,7 +420,7 @@ static int spi_gpio_probe(struct platform_device *pdev)
         if (status > 0)
                 use_of = 1;
 
-        pdata = pdev->dev.platform_data;
+        pdata = dev_get_platdata(&pdev->dev);
 #ifdef GENERIC_BITBANG
         if (!pdata || !pdata->num_chipselect)
                 return -ENODEV;
@@ -506,7 +506,7 @@ static int spi_gpio_remove(struct platform_device *pdev)
         int                             status;
 
         spi_gpio = platform_get_drvdata(pdev);
-        pdata = pdev->dev.platform_data;
+        pdata = dev_get_platdata(&pdev->dev);
 
         /* stop() unregisters child devices too */
         status = spi_bitbang_stop(&spi_gpio->bitbang);
diff --git a/drivers/spi/spi-mpc512x-psc.c b/drivers/spi/spi-mpc512x-psc.c
index 85581f307945..dbc5e999a1f5 100644
--- a/drivers/spi/spi-mpc512x-psc.c
+++ b/drivers/spi/spi-mpc512x-psc.c
@@ -469,7 +469,7 @@ static int mpc512x_psc_spi_do_probe(struct device *dev, u32 regaddr,
                                               u32 size, unsigned int irq,
                                               s16 bus_num)
 {
-        struct fsl_spi_platform_data *pdata = dev->platform_data;
+        struct fsl_spi_platform_data *pdata = dev_get_platdata(dev);
         struct mpc512x_psc_spi *mps;
         struct spi_master *master;
         int ret;
diff --git a/drivers/spi/spi-mpc52xx-psc.c b/drivers/spi/spi-mpc52xx-psc.c
index fed0571d4dec..6e925dc34396 100644
--- a/drivers/spi/spi-mpc52xx-psc.c
+++ b/drivers/spi/spi-mpc52xx-psc.c
@@ -366,7 +366,7 @@ static irqreturn_t mpc52xx_psc_spi_isr(int irq, void *dev_id)
 static int mpc52xx_psc_spi_do_probe(struct device *dev, u32 regaddr,
                                 u32 size, unsigned int irq, s16 bus_num)
 {
-        struct fsl_spi_platform_data *pdata = dev->platform_data;
+        struct fsl_spi_platform_data *pdata = dev_get_platdata(dev);
         struct mpc52xx_psc_spi *mps;
         struct spi_master *master;
         int ret;
diff --git a/drivers/spi/spi-nuc900.c b/drivers/spi/spi-nuc900.c
index b21f8f20060a..47a68b43bcd5 100644
--- a/drivers/spi/spi-nuc900.c
+++ b/drivers/spi/spi-nuc900.c
@@ -350,7 +350,7 @@ static int nuc900_spi_probe(struct platform_device *pdev)
 
         hw = spi_master_get_devdata(master);
         hw->master = spi_master_get(master);
-        hw->pdata  = pdev->dev.platform_data;
+        hw->pdata  = dev_get_platdata(&pdev->dev);
         hw->dev = &pdev->dev;
 
         if (hw->pdata == NULL) {
diff --git a/drivers/spi/spi-oc-tiny.c b/drivers/spi/spi-oc-tiny.c
index d36ba907743d..333cb1badcd7 100644
--- a/drivers/spi/spi-oc-tiny.c
+++ b/drivers/spi/spi-oc-tiny.c
@@ -285,7 +285,7 @@ static int tiny_spi_of_probe(struct platform_device *pdev)
 
 static int tiny_spi_probe(struct platform_device *pdev)
 {
-        struct tiny_spi_platform_data *platp = pdev->dev.platform_data;
+        struct tiny_spi_platform_data *platp = dev_get_platdata(&pdev->dev);
         struct tiny_spi *hw;
         struct spi_master *master;
         struct resource *res;
diff --git a/drivers/spi/spi-omap-100k.c b/drivers/spi/spi-omap-100k.c
index cdcc72c5d380..69ecf05757dd 100644
--- a/drivers/spi/spi-omap-100k.c
+++ b/drivers/spi/spi-omap-100k.c
@@ -441,7 +441,7 @@ static int omap1_spi100k_probe(struct platform_device *pdev)
          * You should allocate this with ioremap() before initializing
          * the SPI.
          */
-        spi100k->base = (void __iomem *) pdev->dev.platform_data;
+        spi100k->base = (void __iomem *)dev_get_platdata(&pdev->dev);
 
         spi100k->ick = devm_clk_get(&pdev->dev, "ick");
         if (IS_ERR(spi100k->ick)) {
diff --git a/drivers/spi/spi-omap2-mcspi.c b/drivers/spi/spi-omap2-mcspi.c
index 5994039758de..fc190a5a0bad 100644
--- a/drivers/spi/spi-omap2-mcspi.c
+++ b/drivers/spi/spi-omap2-mcspi.c
@@ -1340,7 +1340,7 @@ static int omap2_mcspi_probe(struct platform_device *pdev)
                 if (of_get_property(node, "ti,pindir-d0-out-d1-in", NULL))
                         mcspi->pin_dir = MCSPI_PINDIR_D0_OUT_D1_IN;
         } else {
-                pdata = pdev->dev.platform_data;
+                pdata = dev_get_platdata(&pdev->dev);
                 master->num_chipselect = pdata->num_cs;
                 if (pdev->id != -1)
                         master->bus_num = pdev->id;
diff --git a/drivers/spi/spi-pl022.c b/drivers/spi/spi-pl022.c
index abef061fb84a..4b564b74c99c 100644
--- a/drivers/spi/spi-pl022.c
+++ b/drivers/spi/spi-pl022.c
@@ -2091,7 +2091,8 @@ pl022_platform_data_dt_get(struct device *dev)
 static int pl022_probe(struct amba_device *adev, const struct amba_id *id)
 {
         struct device *dev = &adev->dev;
-        struct pl022_ssp_controller *platform_info = adev->dev.platform_data;
+        struct pl022_ssp_controller *platform_info =
+                        dev_get_platdata(&adev->dev);
         struct spi_master *master;
         struct pl022 *pl022 = NULL;     /*Data for this driver */
         struct device_node *np = adev->dev.of_node;
diff --git a/drivers/spi/spi-rspi.c b/drivers/spi/spi-rspi.c
index b44a6ac3cec9..57de139f76dc 100644
--- a/drivers/spi/spi-rspi.c
+++ b/drivers/spi/spi-rspi.c
@@ -564,8 +564,12 @@ static void rspi_work(struct work_struct *work)
         unsigned long flags;
         int ret;
 
-        spin_lock_irqsave(&rspi->lock, flags);
-        while (!list_empty(&rspi->queue)) {
+        while (1) {
+                spin_lock_irqsave(&rspi->lock, flags);
+                if (list_empty(&rspi->queue)) {
+                        spin_unlock_irqrestore(&rspi->lock, flags);
+                        break;
+                }
                 mesg = list_entry(rspi->queue.next, struct spi_message, queue);
                 list_del_init(&mesg->queue);
                 spin_unlock_irqrestore(&rspi->lock, flags);
@@ -595,8 +599,6 @@ static void rspi_work(struct work_struct *work)
 
                 mesg->status = 0;
                 mesg->complete(mesg->context);
-
-                spin_lock_irqsave(&rspi->lock, flags);
         }
 
         return;
@@ -664,12 +666,13 @@ static irqreturn_t rspi_irq(int irq, void *_sr)
 static int rspi_request_dma(struct rspi_data *rspi,
                                       struct platform_device *pdev)
 {
-        struct rspi_plat_data *rspi_pd = pdev->dev.platform_data;
+        struct rspi_plat_data *rspi_pd = dev_get_platdata(&pdev->dev);
+        struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         dma_cap_mask_t mask;
         struct dma_slave_config cfg;
         int ret;
 
-        if (!rspi_pd)
+        if (!res || !rspi_pd)
                 return 0;       /* The driver assumes no error. */
 
         rspi->dma_width_16bit = rspi_pd->dma_width_16bit;
@@ -683,6 +686,8 @@ static int rspi_request_dma(struct rspi_data *rspi,
                 if (rspi->chan_rx) {
                         cfg.slave_id = rspi_pd->dma_rx_id;
                         cfg.direction = DMA_DEV_TO_MEM;
+                        cfg.dst_addr = 0;
+                        cfg.src_addr = res->start + RSPI_SPDR;
                         ret = dmaengine_slave_config(rspi->chan_rx, &cfg);
                         if (!ret)
                                 dev_info(&pdev->dev, "Use DMA when rx.\n");
@@ -698,6 +703,8 @@ static int rspi_request_dma(struct rspi_data *rspi,
                 if (rspi->chan_tx) {
                         cfg.slave_id = rspi_pd->dma_tx_id;
                         cfg.direction = DMA_MEM_TO_DEV;
+                        cfg.dst_addr = res->start + RSPI_SPDR;
+                        cfg.src_addr = 0;
                         ret = dmaengine_slave_config(rspi->chan_tx, &cfg);
                         if (!ret)
                                 dev_info(&pdev->dev, "Use DMA when tx\n");
diff --git a/drivers/spi/spi-s3c24xx.c b/drivers/spi/spi-s3c24xx.c
index 68910b310152..ce318d95a6ee 100644
--- a/drivers/spi/spi-s3c24xx.c
+++ b/drivers/spi/spi-s3c24xx.c
@@ -525,7 +525,7 @@ static int s3c24xx_spi_probe(struct platform_device *pdev)
         memset(hw, 0, sizeof(struct s3c24xx_spi));
 
         hw->master = spi_master_get(master);
-        hw->pdata = pdata = pdev->dev.platform_data;
+        hw->pdata = pdata = dev_get_platdata(&pdev->dev);
         hw->dev = &pdev->dev;
 
         if (pdata == NULL) {
@@ -690,7 +690,7 @@ static int s3c24xx_spi_remove(struct platform_device *dev)
 
 static int s3c24xx_spi_suspend(struct device *dev)
 {
-        struct s3c24xx_spi *hw = platform_get_drvdata(to_platform_device(dev));
+        struct s3c24xx_spi *hw = dev_get_drvdata(dev);
 
         if (hw->pdata && hw->pdata->gpio_setup)
                 hw->pdata->gpio_setup(hw->pdata, 0);
@@ -701,7 +701,7 @@ static int s3c24xx_spi_suspend(struct device *dev)
 
 static int s3c24xx_spi_resume(struct device *dev)
 {
-        struct s3c24xx_spi *hw = platform_get_drvdata(to_platform_device(dev));
+        struct s3c24xx_spi *hw = dev_get_drvdata(dev);
 
         s3c24xx_spi_initialsetup(hw);
         return 0;
diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c
index 63e2070c6c14..2465d6d35b06 100644
--- a/drivers/spi/spi-s3c64xx.c
+++ b/drivers/spi/spi-s3c64xx.c
@@ -1275,7 +1275,7 @@ static struct s3c64xx_spi_info *s3c64xx_spi_parse_dt(struct device *dev)
 #else
 static struct s3c64xx_spi_info *s3c64xx_spi_parse_dt(struct device *dev)
 {
-        return dev->platform_data;
+        return dev_get_platdata(dev);
 }
 #endif
 
@@ -1300,7 +1300,7 @@ static int s3c64xx_spi_probe(struct platform_device *pdev)
         struct resource *mem_res;
         struct resource *res;
         struct s3c64xx_spi_driver_data *sdd;
-        struct s3c64xx_spi_info *sci = pdev->dev.platform_data;
+        struct s3c64xx_spi_info *sci = dev_get_platdata(&pdev->dev);
         struct spi_master *master;
         int ret, irq;
         char clk_name[16];
diff --git a/drivers/spi/spi-sh-msiof.c b/drivers/spi/spi-sh-msiof.c
index 2bc5a6b86300..cbc7f2216c16 100644
--- a/drivers/spi/spi-sh-msiof.c
+++ b/drivers/spi/spi-sh-msiof.c
@@ -645,7 +645,7 @@ static int sh_msiof_spi_probe(struct platform_device *pdev)
         if (pdev->dev.of_node)
                 p->info = sh_msiof_spi_parse_dt(&pdev->dev);
         else
-                p->info = pdev->dev.platform_data;
+                p->info = dev_get_platdata(&pdev->dev);
 
         if (!p->info) {
                 dev_err(&pdev->dev, "failed to obtain device info\n");
diff --git a/drivers/spi/spi-sh-sci.c b/drivers/spi/spi-sh-sci.c
index 097e506042be..8eefeb6007df 100644
--- a/drivers/spi/spi-sh-sci.c
+++ b/drivers/spi/spi-sh-sci.c
@@ -130,7 +130,7 @@ static int sh_sci_spi_probe(struct platform_device *dev)
         sp = spi_master_get_devdata(master);
 
         platform_set_drvdata(dev, sp);
-        sp->info = dev->dev.platform_data;
+        sp->info = dev_get_platdata(&dev->dev);
 
         /* setup spi bitbang adaptor */
         sp->bitbang.master = spi_master_get(master);
diff --git a/drivers/spi/spi-sirf.c b/drivers/spi/spi-sirf.c
index fc20bcfd90c3..fc5081ab3677 100644
--- a/drivers/spi/spi-sirf.c
+++ b/drivers/spi/spi-sirf.c
@@ -599,8 +599,7 @@ static int  spi_sirfsoc_remove(struct platform_device *pdev)
 #ifdef CONFIG_PM
 static int spi_sirfsoc_suspend(struct device *dev)
 {
-        struct platform_device *pdev = to_platform_device(dev);
-        struct spi_master *master = platform_get_drvdata(pdev);
+        struct spi_master *master = dev_get_drvdata(dev);
         struct sirfsoc_spi *sspi = spi_master_get_devdata(master);
 
         clk_disable(sspi->clk);
@@ -609,8 +608,7 @@ static int spi_sirfsoc_suspend(struct device *dev)
 
 static int spi_sirfsoc_resume(struct device *dev)
 {
-        struct platform_device *pdev = to_platform_device(dev);
-        struct spi_master *master = platform_get_drvdata(pdev);
+        struct spi_master *master = dev_get_drvdata(dev);
         struct sirfsoc_spi *sspi = spi_master_get_devdata(master);
 
         clk_enable(sspi->clk);
diff --git a/drivers/spi/spi-ti-ssp.c b/drivers/spi/spi-ti-ssp.c
index 10606fcc6efc..7d20e121e4c1 100644
--- a/drivers/spi/spi-ti-ssp.c
+++ b/drivers/spi/spi-ti-ssp.c
@@ -283,7 +283,7 @@ static int ti_ssp_spi_probe(struct platform_device *pdev)
         struct device *dev = &pdev->dev;
         int error = 0;
 
-        pdata = dev->platform_data;
+        pdata = dev_get_platdata(dev);
         if (!pdata) {
                 dev_err(dev, "platform data not found\n");
                 return -EINVAL;
diff --git a/drivers/spi/spi-tle62x0.c b/drivers/spi/spi-tle62x0.c
index 6b0874d782ed..b5a70e3fecb7 100644
--- a/drivers/spi/spi-tle62x0.c
+++ b/drivers/spi/spi-tle62x0.c
@@ -247,7 +247,7 @@ static int tle62x0_probe(struct spi_device *spi)
         int ptr;
         int ret;
 
-        pdata = spi->dev.platform_data;
+        pdata = dev_get_platdata(&spi->dev);
         if (pdata == NULL) {
                 dev_err(&spi->dev, "no device data specified\n");
                 return -EINVAL;
diff --git a/drivers/spi/spi-xilinx.c b/drivers/spi/spi-xilinx.c
index fb56fcfdf65e..0bf1b2c457a1 100644
--- a/drivers/spi/spi-xilinx.c
+++ b/drivers/spi/spi-xilinx.c
@@ -80,10 +80,9 @@ struct xilinx_spi {
         /* bitbang has to be first */
         struct spi_bitbang bitbang;
         struct completion done;
-        struct resource mem; /* phys mem */
         void __iomem    *regs;  /* virt. address of the control registers */
 
-        u32             irq;
+        int             irq;
 
         u8 *rx_ptr;             /* pointer in the Tx buffer */
         const u8 *tx_ptr;       /* pointer in the Rx buffer */
@@ -340,17 +339,34 @@ static const struct of_device_id xilinx_spi_of_match[] = {
 };
 MODULE_DEVICE_TABLE(of, xilinx_spi_of_match);
 
-struct spi_master *xilinx_spi_init(struct device *dev, struct resource *mem,
-        u32 irq, s16 bus_num, int num_cs, int bits_per_word)
+static int xilinx_spi_probe(struct platform_device *pdev)
 {
-        struct spi_master *master;
         struct xilinx_spi *xspi;
-        int ret;
+        struct xspi_platform_data *pdata;
+        struct resource *res;
+        int ret, num_cs = 0, bits_per_word = 8;
+        struct spi_master *master;
         u32 tmp;
+        u8 i;
+
+        pdata = dev_get_platdata(&pdev->dev);
+        if (pdata) {
+                num_cs = pdata->num_chipselect;
+                bits_per_word = pdata->bits_per_word;
+        } else {
+                of_property_read_u32(pdev->dev.of_node, "xlnx,num-ss-bits",
+                                          &num_cs);
+        }
 
-        master = spi_alloc_master(dev, sizeof(struct xilinx_spi));
+        if (!num_cs) {
+                dev_err(&pdev->dev,
+                        "Missing slave select configuration data\n");
+                return -EINVAL;
+        }
+
+        master = spi_alloc_master(&pdev->dev, sizeof(struct xilinx_spi));
         if (!master)
-                return NULL;
+                return -ENODEV;
 
         /* the spi->mode bits understood by this driver: */
         master->mode_bits = SPI_CPOL | SPI_CPHA;
@@ -362,22 +378,16 @@ struct spi_master *xilinx_spi_init(struct device *dev, struct resource *mem,
         xspi->bitbang.txrx_bufs = xilinx_spi_txrx_bufs;
         init_completion(&xspi->done);
 
-        if (!request_mem_region(mem->start, resource_size(mem),
-                XILINX_SPI_NAME))
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        xspi->regs = devm_ioremap_resource(&pdev->dev, res);
+        if (IS_ERR(xspi->regs)) {
+                ret = PTR_ERR(xspi->regs);
                 goto put_master;
-
-        xspi->regs = ioremap(mem->start, resource_size(mem));
-        if (xspi->regs == NULL) {
-                dev_warn(dev, "ioremap failure\n");
-                goto map_failed;
         }
 
-        master->bus_num = bus_num;
+        master->bus_num = pdev->dev.id;
         master->num_chipselect = num_cs;
-        master->dev.of_node = dev->of_node;
-
-        xspi->mem = *mem;
-        xspi->irq = irq;
+        master->dev.of_node = pdev->dev.of_node;
 
         /*
          * Detect endianess on the IP via loop bit in CR. Detection
@@ -407,113 +417,63 @@ struct spi_master *xilinx_spi_init(struct device *dev, struct resource *mem,
         } else if (xspi->bits_per_word == 32) {
                 xspi->tx_fn = xspi_tx32;
                 xspi->rx_fn = xspi_rx32;
-        } else
-                goto unmap_io;
-
+        } else {
+                ret = -EINVAL;
+                goto put_master;
+        }
 
         /* SPI controller initializations */
         xspi_init_hw(xspi);
 
+        xspi->irq = platform_get_irq(pdev, 0);
+        if (xspi->irq < 0) {
+                ret = xspi->irq;
+                goto put_master;
+        }
+
         /* Register for SPI Interrupt */
-        ret = request_irq(xspi->irq, xilinx_spi_irq, 0, XILINX_SPI_NAME, xspi);
+        ret = devm_request_irq(&pdev->dev, xspi->irq, xilinx_spi_irq, 0,
+                               dev_name(&pdev->dev), xspi);
         if (ret)
-                goto unmap_io;
+                goto put_master;
 
         ret = spi_bitbang_start(&xspi->bitbang);
         if (ret) {
-                dev_err(dev, "spi_bitbang_start FAILED\n");
-                goto free_irq;
-        }
-
-        dev_info(dev, "at 0x%08llX mapped to 0x%p, irq=%d\n",
-                (unsigned long long)mem->start, xspi->regs, xspi->irq);
-        return master;
-
-free_irq:
-        free_irq(xspi->irq, xspi);
-unmap_io:
-        iounmap(xspi->regs);
-map_failed:
-        release_mem_region(mem->start, resource_size(mem));
-put_master:
-        spi_master_put(master);
-        return NULL;
-}
-EXPORT_SYMBOL(xilinx_spi_init);
-
-void xilinx_spi_deinit(struct spi_master *master)
-{
-        struct xilinx_spi *xspi;
-
-        xspi = spi_master_get_devdata(master);
-
-        spi_bitbang_stop(&xspi->bitbang);
-        free_irq(xspi->irq, xspi);
-        iounmap(xspi->regs);
-
-        release_mem_region(xspi->mem.start, resource_size(&xspi->mem));
-        spi_master_put(xspi->bitbang.master);
-}
-EXPORT_SYMBOL(xilinx_spi_deinit);
-
-static int xilinx_spi_probe(struct platform_device *dev)
-{
-        struct xspi_platform_data *pdata;
-        struct resource *r;
-        int irq, num_cs = 0, bits_per_word = 8;
-        struct spi_master *master;
-        u8 i;
-
-        pdata = dev->dev.platform_data;
-        if (pdata) {
-                num_cs = pdata->num_chipselect;
-                bits_per_word = pdata->bits_per_word;
-        }
-
-#ifdef CONFIG_OF
-        if (dev->dev.of_node) {
-                const __be32 *prop;
-                int len;
-
-                /* number of slave select bits is required */
-                prop = of_get_property(dev->dev.of_node, "xlnx,num-ss-bits",
-                                       &len);
-                if (prop && len >= sizeof(*prop))
-                        num_cs = __be32_to_cpup(prop);
-        }
-#endif
-
-        if (!num_cs) {
-                dev_err(&dev->dev, "Missing slave select configuration data\n");
-                return -EINVAL;
+                dev_err(&pdev->dev, "spi_bitbang_start FAILED\n");
+                goto put_master;
         }
 
-
-        r = platform_get_resource(dev, IORESOURCE_MEM, 0);
-        if (!r)
-                return -ENODEV;
-
-        irq = platform_get_irq(dev, 0);
-        if (irq < 0)
-                return -ENXIO;
-
-        master = xilinx_spi_init(&dev->dev, r, irq, dev->id, num_cs,
-                                 bits_per_word);
-        if (!master)
-                return -ENODEV;
+        dev_info(&pdev->dev, "at 0x%08llX mapped to 0x%p, irq=%d\n",
+                (unsigned long long)res->start, xspi->regs, xspi->irq);
 
         if (pdata) {
                 for (i = 0; i < pdata->num_devices; i++)
                         spi_new_device(master, pdata->devices + i);
         }
 
-        platform_set_drvdata(dev, master);
+        platform_set_drvdata(pdev, master);
         return 0;
+
+put_master:
+        spi_master_put(master);
+
+        return ret;
 }
 
-static int xilinx_spi_remove(struct platform_device *dev)
+static int xilinx_spi_remove(struct platform_device *pdev)
 {
-        xilinx_spi_deinit(platform_get_drvdata(dev));
+        struct spi_master *master = platform_get_drvdata(pdev);
+        struct xilinx_spi *xspi = spi_master_get_devdata(master);
+        void __iomem *regs_base = xspi->regs;
+
+        spi_bitbang_stop(&xspi->bitbang);
+
+        /* Disable all the interrupts just in case */
+        xspi->write_fn(0, regs_base + XIPIF_V123B_IIER_OFFSET);
+        /* Disable the global IPIF interrupt */
+        xspi->write_fn(0, regs_base + XIPIF_V123B_DGIER_OFFSET);
+
+        spi_master_put(xspi->bitbang.master);
 
         return 0;
 }