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

15 files changed, 0 insertions, 34 deletions

diff --git a/drivers/spi/spi-altera.c b/drivers/spi/spi-altera.c
index 6b7096e0ad68..8a6bb37910da 100644
--- a/drivers/spi/spi-altera.c
+++ b/drivers/spi/spi-altera.c
@@ -273,7 +273,6 @@ static int altera_spi_probe(struct platform_device *pdev)
 exit_busy:
         err = -EBUSY;
 exit:
-        platform_set_drvdata(pdev, NULL);
         spi_master_put(master);
         return err;
 }
@@ -284,7 +283,6 @@ static int altera_spi_remove(struct platform_device *dev)
         struct spi_master *master = hw->bitbang.master;
 
         spi_bitbang_stop(&hw->bitbang);
-        platform_set_drvdata(dev, NULL);
         spi_master_put(master);
         return 0;
 }
diff --git a/drivers/spi/spi-ath79.c b/drivers/spi/spi-ath79.c
index 5e2d52ce387f..0e06407a4670 100644
--- a/drivers/spi/spi-ath79.c
+++ b/drivers/spi/spi-ath79.c
@@ -285,7 +285,6 @@ err_clk_put:
 err_unmap:
         iounmap(sp->base);
 err_put_master:
-        platform_set_drvdata(pdev, NULL);
         spi_master_put(sp->bitbang.master);
 
         return ret;
@@ -300,7 +299,6 @@ static int ath79_spi_remove(struct platform_device *pdev)
         clk_disable(sp->clk);
         clk_put(sp->clk);
         iounmap(sp->base);
-        platform_set_drvdata(pdev, NULL);
         spi_master_put(sp->bitbang.master);
 
         return 0;
diff --git a/drivers/spi/spi-au1550.c b/drivers/spi/spi-au1550.c
index d736fa942020..e1965553ab79 100644
--- a/drivers/spi/spi-au1550.c
+++ b/drivers/spi/spi-au1550.c
@@ -977,8 +977,6 @@ static int au1550_spi_remove(struct platform_device *pdev)
                 au1xxx_dbdma_chan_free(hw->dma_tx_ch);
         }
 
-        platform_set_drvdata(pdev, NULL);
-
         spi_master_put(hw->master);
         return 0;
 }
diff --git a/drivers/spi/spi-bcm63xx.c b/drivers/spi/spi-bcm63xx.c
index 270f09c071fb..9fd7a39b8029 100644
--- a/drivers/spi/spi-bcm63xx.c
+++ b/drivers/spi/spi-bcm63xx.c
@@ -451,7 +451,6 @@ static int bcm63xx_spi_probe(struct platform_device *pdev)
 out_clk_disable:
         clk_disable_unprepare(clk);
 out_err:
-        platform_set_drvdata(pdev, NULL);
         spi_master_put(master);
 out_clk:
         clk_put(clk);
@@ -473,8 +472,6 @@ static int bcm63xx_spi_remove(struct platform_device *pdev)
         clk_disable_unprepare(bs->clk);
         clk_put(bs->clk);
 
-        platform_set_drvdata(pdev, 0);
-
         spi_master_put(master);
 
         return 0;
diff --git a/drivers/spi/spi-bfin-sport.c b/drivers/spi/spi-bfin-sport.c
index e4a858ad6ef6..07ec597f9732 100644
--- a/drivers/spi/spi-bfin-sport.c
+++ b/drivers/spi/spi-bfin-sport.c
@@ -876,9 +876,6 @@ static int bfin_sport_spi_remove(struct platform_device *pdev)
 
         peripheral_free_list(drv_data->pin_req);
 
-        /* Prevent double remove */
-        platform_set_drvdata(pdev, NULL);
-
         return 0;
 }
 
diff --git a/drivers/spi/spi-bfin5xx.c b/drivers/spi/spi-bfin5xx.c
index e35c19cff9ca..59a73424419c 100644
--- a/drivers/spi/spi-bfin5xx.c
+++ b/drivers/spi/spi-bfin5xx.c
@@ -1407,9 +1407,6 @@ static int bfin_spi_remove(struct platform_device *pdev)
 
         peripheral_free_list(drv_data->pin_req);
 
-        /* Prevent double remove */
-        platform_set_drvdata(pdev, NULL);
-
         return 0;
 }
 
diff --git a/drivers/spi/spi-clps711x.c b/drivers/spi/spi-clps711x.c
index e322b5bf9910..17965fe225cc 100644
--- a/drivers/spi/spi-clps711x.c
+++ b/drivers/spi/spi-clps711x.c
@@ -249,7 +249,6 @@ err_out:
                 if (gpio_is_valid(hw->chipselect[i]))
                         gpio_free(hw->chipselect[i]);
 
-        platform_set_drvdata(pdev, NULL);
         spi_master_put(master);
         kfree(master);
 
@@ -269,7 +268,6 @@ static int spi_clps711x_remove(struct platform_device *pdev)
                         gpio_free(hw->chipselect[i]);
 
         devm_clk_put(&pdev->dev, hw->spi_clk);
-        platform_set_drvdata(pdev, NULL);
         spi_unregister_master(master);
         kfree(master);
 
diff --git a/drivers/spi/spi-coldfire-qspi.c b/drivers/spi/spi-coldfire-qspi.c
index 15cda45afec6..0631b9d4a5de 100644
--- a/drivers/spi/spi-coldfire-qspi.c
+++ b/drivers/spi/spi-coldfire-qspi.c
@@ -518,7 +518,6 @@ static int mcfqspi_remove(struct platform_device *pdev)
         /* disable the hardware (set the baud rate to 0) */
         mcfqspi_wr_qmr(mcfqspi, MCFQSPI_QMR_MSTR);
 
-        platform_set_drvdata(pdev, NULL);
         mcfqspi_cs_teardown(mcfqspi);
         clk_disable(mcfqspi->clk);
         clk_put(mcfqspi->clk);
diff --git a/drivers/spi/spi-dw-mmio.c b/drivers/spi/spi-dw-mmio.c
index 4a6d5c9057a4..4aa8be865cc0 100644
--- a/drivers/spi/spi-dw-mmio.c
+++ b/drivers/spi/spi-dw-mmio.c
@@ -111,8 +111,6 @@ static int dw_spi_mmio_remove(struct platform_device *pdev)
         struct dw_spi_mmio *dwsmmio = platform_get_drvdata(pdev);
         struct resource *mem;
 
-        platform_set_drvdata(pdev, NULL);
-
         clk_disable(dwsmmio->clk);
         clk_put(dwsmmio->clk);
         dwsmmio->clk = NULL;
diff --git a/drivers/spi/spi-ep93xx.c b/drivers/spi/spi-ep93xx.c
index f1b14977abdf..15ea07d8f8d6 100644
--- a/drivers/spi/spi-ep93xx.c
+++ b/drivers/spi/spi-ep93xx.c
@@ -1123,7 +1123,6 @@ fail_put_clock:
         clk_put(espi->clk);
 fail_release_master:
         spi_master_put(master);
-        platform_set_drvdata(pdev, NULL);
 
         return error;
 }
@@ -1158,7 +1157,6 @@ static int ep93xx_spi_remove(struct platform_device *pdev)
 
         ep93xx_spi_release_dma(espi);
         clk_put(espi->clk);
-        platform_set_drvdata(pdev, NULL);
 
         spi_unregister_master(master);
         return 0;
diff --git a/drivers/spi/spi-gpio.c b/drivers/spi/spi-gpio.c
index a7801a889ff9..a54524cf42cc 100644
--- a/drivers/spi/spi-gpio.c
+++ b/drivers/spi/spi-gpio.c
@@ -512,8 +512,6 @@ static int spi_gpio_remove(struct platform_device *pdev)
         status = spi_bitbang_stop(&spi_gpio->bitbang);
         spi_master_put(spi_gpio->bitbang.master);
 
-        platform_set_drvdata(pdev, NULL);
-
         if (SPI_MISO_GPIO != SPI_GPIO_NO_MISO)
                 gpio_free(SPI_MISO_GPIO);
         if (SPI_MOSI_GPIO != SPI_GPIO_NO_MOSI)
diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c
index 982667383dd5..b805cd0e00b5 100644
--- a/drivers/spi/spi-imx.c
+++ b/drivers/spi/spi-imx.c
@@ -902,7 +902,6 @@ out_gpio_free:
         }
         spi_master_put(master);
         kfree(master);
-        platform_set_drvdata(pdev, NULL);
         return ret;
 }
 
@@ -929,8 +928,6 @@ static int spi_imx_remove(struct platform_device *pdev)
 
         release_mem_region(res->start, resource_size(res));
 
-        platform_set_drvdata(pdev, NULL);
-
         return 0;
 }
 
diff --git a/drivers/spi/spi-oc-tiny.c b/drivers/spi/spi-oc-tiny.c
index e60a776ed2d4..58deb79d046b 100644
--- a/drivers/spi/spi-oc-tiny.c
+++ b/drivers/spi/spi-oc-tiny.c
@@ -368,7 +368,6 @@ exit_gpio:
 exit_busy:
         err = -EBUSY;
 exit:
-        platform_set_drvdata(pdev, NULL);
         spi_master_put(master);
         return err;
 }
@@ -382,7 +381,6 @@ static int tiny_spi_remove(struct platform_device *pdev)
         spi_bitbang_stop(&hw->bitbang);
         for (i = 0; i < hw->gpio_cs_count; i++)
                 gpio_free(hw->gpio_cs[i]);
-        platform_set_drvdata(pdev, NULL);
         spi_master_put(master);
         return 0;
 }
diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c
index cca27d840e1f..d161d45e021e 100644
--- a/drivers/spi/spi-pxa2xx.c
+++ b/drivers/spi/spi-pxa2xx.c
@@ -1283,9 +1283,6 @@ static int pxa2xx_spi_remove(struct platform_device *pdev)
         /* Disconnect from the SPI framework */
         spi_unregister_master(drv_data->master);
 
-        /* Prevent double remove */
-        platform_set_drvdata(pdev, NULL);
-
         return 0;
 }
 
diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c
index 315ff1298dbf..32ba3555f8b9 100644
--- a/drivers/spi/spi-s3c64xx.c
+++ b/drivers/spi/spi-s3c64xx.c
@@ -1400,7 +1400,6 @@ err3:
 err2:
         clk_disable_unprepare(sdd->clk);
 err0:
-        platform_set_drvdata(pdev, NULL);
         spi_master_put(master);
 
         return ret;
@@ -1421,7 +1420,6 @@ static int s3c64xx_spi_remove(struct platform_device *pdev)
 
         clk_disable_unprepare(sdd->clk);
 
-        platform_set_drvdata(pdev, NULL);
         spi_master_put(master);
 
         return 0;