Skip to content

L
linux
Commit 6140b05c authored by Mark Brown's avatar Mark Brown
Browse files
Options

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

parents 2924f096 89e87730
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 34 deletions
drivers/spi/spi-altera.c
View file @ 6140b05c
...@@ -273,7 +273,6 @@ static int altera_spi_probe(struct platform_device *pdev) ...@@ -273,7 +273,6 @@ static int altera_spi_probe(struct platform_device *pdev)
exit_busy: exit_busy:
err = -EBUSY; err = -EBUSY;
exit: exit:
platform_set_drvdata(pdev, NULL);
spi_master_put(master); spi_master_put(master);
return err; return err;
} }
...@@ -284,7 +283,6 @@ static int altera_spi_remove(struct platform_device *dev) ...@@ -284,7 +283,6 @@ static int altera_spi_remove(struct platform_device *dev)
struct spi_master *master = hw->bitbang.master; struct spi_master *master = hw->bitbang.master;
spi_bitbang_stop(&hw->bitbang); spi_bitbang_stop(&hw->bitbang);
platform_set_drvdata(dev, NULL);
spi_master_put(master); spi_master_put(master);
return 0; return 0;
} }
......
drivers/spi/spi-ath79.c
View file @ 6140b05c
...@@ -285,7 +285,6 @@ static int ath79_spi_probe(struct platform_device *pdev) ...@@ -285,7 +285,6 @@ static int ath79_spi_probe(struct platform_device *pdev)
err_unmap: err_unmap:
iounmap(sp->base); iounmap(sp->base);
err_put_master: err_put_master:
platform_set_drvdata(pdev, NULL);
spi_master_put(sp->bitbang.master); spi_master_put(sp->bitbang.master);
return ret; return ret;
...@@ -300,7 +299,6 @@ static int ath79_spi_remove(struct platform_device *pdev) ...@@ -300,7 +299,6 @@ static int ath79_spi_remove(struct platform_device *pdev)
clk_disable(sp->clk); clk_disable(sp->clk);
clk_put(sp->clk); clk_put(sp->clk);
iounmap(sp->base); iounmap(sp->base);
platform_set_drvdata(pdev, NULL);
spi_master_put(sp->bitbang.master); spi_master_put(sp->bitbang.master);
return 0; return 0;
......
drivers/spi/spi-au1550.c
View file @ 6140b05c
...@@ -977,8 +977,6 @@ static int au1550_spi_remove(struct platform_device *pdev) ...@@ -977,8 +977,6 @@ static int au1550_spi_remove(struct platform_device *pdev)
au1xxx_dbdma_chan_free(hw->dma_tx_ch); au1xxx_dbdma_chan_free(hw->dma_tx_ch);
} }
platform_set_drvdata(pdev, NULL);
spi_master_put(hw->master); spi_master_put(hw->master);
return 0; return 0;
} }
......
drivers/spi/spi-bcm63xx.c
View file @ 6140b05c
...@@ -451,7 +451,6 @@ static int bcm63xx_spi_probe(struct platform_device *pdev) ...@@ -451,7 +451,6 @@ static int bcm63xx_spi_probe(struct platform_device *pdev)
out_clk_disable: out_clk_disable:
clk_disable_unprepare(clk); clk_disable_unprepare(clk);
out_err: out_err:
platform_set_drvdata(pdev, NULL);
spi_master_put(master); spi_master_put(master);
out_clk: out_clk:
clk_put(clk); clk_put(clk);
...@@ -473,8 +472,6 @@ static int bcm63xx_spi_remove(struct platform_device *pdev) ...@@ -473,8 +472,6 @@ static int bcm63xx_spi_remove(struct platform_device *pdev)
clk_disable_unprepare(bs->clk); clk_disable_unprepare(bs->clk);
clk_put(bs->clk); clk_put(bs->clk);
platform_set_drvdata(pdev, 0);
spi_master_put(master); spi_master_put(master);
return 0; return 0;
......
drivers/spi/spi-bfin-sport.c
View file @ 6140b05c
...@@ -876,9 +876,6 @@ static int bfin_sport_spi_remove(struct platform_device *pdev) ...@@ -876,9 +876,6 @@ static int bfin_sport_spi_remove(struct platform_device *pdev)
peripheral_free_list(drv_data->pin_req); peripheral_free_list(drv_data->pin_req);
/* Prevent double remove */
platform_set_drvdata(pdev, NULL);
return 0; return 0;
} }
......
drivers/spi/spi-bfin5xx.c
View file @ 6140b05c
...@@ -1407,9 +1407,6 @@ static int bfin_spi_remove(struct platform_device *pdev) ...@@ -1407,9 +1407,6 @@ static int bfin_spi_remove(struct platform_device *pdev)
peripheral_free_list(drv_data->pin_req); peripheral_free_list(drv_data->pin_req);
/* Prevent double remove */
platform_set_drvdata(pdev, NULL);
return 0; return 0;
} }
......
drivers/spi/spi-clps711x.c
View file @ 6140b05c
...@@ -249,7 +249,6 @@ static int spi_clps711x_probe(struct platform_device *pdev) ...@@ -249,7 +249,6 @@ static int spi_clps711x_probe(struct platform_device *pdev)
if (gpio_is_valid(hw->chipselect[i])) if (gpio_is_valid(hw->chipselect[i]))
gpio_free(hw->chipselect[i]); gpio_free(hw->chipselect[i]);
platform_set_drvdata(pdev, NULL);
spi_master_put(master); spi_master_put(master);
kfree(master); kfree(master);
...@@ -269,7 +268,6 @@ static int spi_clps711x_remove(struct platform_device *pdev) ...@@ -269,7 +268,6 @@ static int spi_clps711x_remove(struct platform_device *pdev)
gpio_free(hw->chipselect[i]); gpio_free(hw->chipselect[i]);
devm_clk_put(&pdev->dev, hw->spi_clk); devm_clk_put(&pdev->dev, hw->spi_clk);
platform_set_drvdata(pdev, NULL);
spi_unregister_master(master); spi_unregister_master(master);
kfree(master); kfree(master);
......
drivers/spi/spi-coldfire-qspi.c
View file @ 6140b05c
...@@ -518,7 +518,6 @@ static int mcfqspi_remove(struct platform_device *pdev) ...@@ -518,7 +518,6 @@ static int mcfqspi_remove(struct platform_device *pdev)
/* disable the hardware (set the baud rate to 0) */ /* disable the hardware (set the baud rate to 0) */
mcfqspi_wr_qmr(mcfqspi, MCFQSPI_QMR_MSTR); mcfqspi_wr_qmr(mcfqspi, MCFQSPI_QMR_MSTR);
platform_set_drvdata(pdev, NULL);
mcfqspi_cs_teardown(mcfqspi); mcfqspi_cs_teardown(mcfqspi);
clk_disable(mcfqspi->clk); clk_disable(mcfqspi->clk);
clk_put(mcfqspi->clk); clk_put(mcfqspi->clk);
......
drivers/spi/spi-dw-mmio.c
View file @ 6140b05c
...@@ -111,8 +111,6 @@ static int dw_spi_mmio_remove(struct platform_device *pdev) ...@@ -111,8 +111,6 @@ static int dw_spi_mmio_remove(struct platform_device *pdev)
struct dw_spi_mmio *dwsmmio = platform_get_drvdata(pdev); struct dw_spi_mmio *dwsmmio = platform_get_drvdata(pdev);
struct resource *mem; struct resource *mem;
platform_set_drvdata(pdev, NULL);
clk_disable(dwsmmio->clk); clk_disable(dwsmmio->clk);
clk_put(dwsmmio->clk); clk_put(dwsmmio->clk);
dwsmmio->clk = NULL; dwsmmio->clk = NULL;
......
drivers/spi/spi-ep93xx.c
View file @ 6140b05c
...@@ -1123,7 +1123,6 @@ static int ep93xx_spi_probe(struct platform_device *pdev) ...@@ -1123,7 +1123,6 @@ static int ep93xx_spi_probe(struct platform_device *pdev)
clk_put(espi->clk); clk_put(espi->clk);
fail_release_master: fail_release_master:
spi_master_put(master); spi_master_put(master);
platform_set_drvdata(pdev, NULL);
return error; return error;
} }
...@@ -1158,7 +1157,6 @@ static int ep93xx_spi_remove(struct platform_device *pdev) ...@@ -1158,7 +1157,6 @@ static int ep93xx_spi_remove(struct platform_device *pdev)
ep93xx_spi_release_dma(espi); ep93xx_spi_release_dma(espi);
clk_put(espi->clk); clk_put(espi->clk);
platform_set_drvdata(pdev, NULL);
spi_unregister_master(master); spi_unregister_master(master);
return 0; return 0;
......
drivers/spi/spi-gpio.c
View file @ 6140b05c
...@@ -512,8 +512,6 @@ static int spi_gpio_remove(struct platform_device *pdev) ...@@ -512,8 +512,6 @@ static int spi_gpio_remove(struct platform_device *pdev)
status = spi_bitbang_stop(&spi_gpio->bitbang); status = spi_bitbang_stop(&spi_gpio->bitbang);
spi_master_put(spi_gpio->bitbang.master); spi_master_put(spi_gpio->bitbang.master);
platform_set_drvdata(pdev, NULL);
if (SPI_MISO_GPIO != SPI_GPIO_NO_MISO) if (SPI_MISO_GPIO != SPI_GPIO_NO_MISO)
gpio_free(SPI_MISO_GPIO); gpio_free(SPI_MISO_GPIO);
if (SPI_MOSI_GPIO != SPI_GPIO_NO_MOSI) if (SPI_MOSI_GPIO != SPI_GPIO_NO_MOSI)
......
drivers/spi/spi-imx.c
View file @ 6140b05c
...@@ -902,7 +902,6 @@ static int spi_imx_probe(struct platform_device *pdev) ...@@ -902,7 +902,6 @@ static int spi_imx_probe(struct platform_device *pdev)
} }
spi_master_put(master); spi_master_put(master);
kfree(master); kfree(master);
platform_set_drvdata(pdev, NULL);
return ret; return ret;
} }
...@@ -929,8 +928,6 @@ static int spi_imx_remove(struct platform_device *pdev) ...@@ -929,8 +928,6 @@ static int spi_imx_remove(struct platform_device *pdev)
release_mem_region(res->start, resource_size(res)); release_mem_region(res->start, resource_size(res));
platform_set_drvdata(pdev, NULL);
return 0; return 0;
} }
......
drivers/spi/spi-oc-tiny.c
View file @ 6140b05c
...@@ -368,7 +368,6 @@ static int tiny_spi_probe(struct platform_device *pdev) ...@@ -368,7 +368,6 @@ static int tiny_spi_probe(struct platform_device *pdev)
exit_busy: exit_busy:
err = -EBUSY; err = -EBUSY;
exit: exit:
platform_set_drvdata(pdev, NULL);
spi_master_put(master); spi_master_put(master);
return err; return err;
} }
...@@ -382,7 +381,6 @@ static int tiny_spi_remove(struct platform_device *pdev) ...@@ -382,7 +381,6 @@ static int tiny_spi_remove(struct platform_device *pdev)
spi_bitbang_stop(&hw->bitbang); spi_bitbang_stop(&hw->bitbang);
for (i = 0; i < hw->gpio_cs_count; i++) for (i = 0; i < hw->gpio_cs_count; i++)
gpio_free(hw->gpio_cs[i]); gpio_free(hw->gpio_cs[i]);
platform_set_drvdata(pdev, NULL);
spi_master_put(master); spi_master_put(master);
return 0; return 0;
} }
......
drivers/spi/spi-pxa2xx.c
View file @ 6140b05c
...@@ -1283,9 +1283,6 @@ static int pxa2xx_spi_remove(struct platform_device *pdev) ...@@ -1283,9 +1283,6 @@ static int pxa2xx_spi_remove(struct platform_device *pdev)
/* Disconnect from the SPI framework */ /* Disconnect from the SPI framework */
spi_unregister_master(drv_data->master); spi_unregister_master(drv_data->master);
/* Prevent double remove */
platform_set_drvdata(pdev, NULL);
return 0; return 0;
} }
......
drivers/spi/spi-s3c64xx.c
View file @ 6140b05c
...@@ -1400,7 +1400,6 @@ static int s3c64xx_spi_probe(struct platform_device *pdev) ...@@ -1400,7 +1400,6 @@ static int s3c64xx_spi_probe(struct platform_device *pdev)
err2: err2:
clk_disable_unprepare(sdd->clk); clk_disable_unprepare(sdd->clk);
err0: err0:
platform_set_drvdata(pdev, NULL);
spi_master_put(master); spi_master_put(master);
return ret; return ret;
...@@ -1421,7 +1420,6 @@ static int s3c64xx_spi_remove(struct platform_device *pdev) ...@@ -1421,7 +1420,6 @@ static int s3c64xx_spi_remove(struct platform_device *pdev)
clk_disable_unprepare(sdd->clk); clk_disable_unprepare(sdd->clk);
platform_set_drvdata(pdev, NULL);
spi_master_put(master); spi_master_put(master);
return 0; return 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7