Skip to contentSkip to conversation

spi: remove unnecessary platform_set_drvdata()

PATCH New Jingoo Han 1 participant 1 message May 3, 2013

Subsystems (7)
Arm i.MX and Layerscape SPI Arm Samsung Exynos PXA2xx/PXA3xx support +3 more subsystems
lore
Share & tools
lore

Jingoo Han

author
#0 lore raw

PATCH v2 1/1 spi: remove unnecessary platform_set_drvdata()

The driver core clears the driver data to NULL after device_release or on probe failure, since commit 0998d0631001288a5974afc0b2a5f568bcdecb4d (device-core: Ensure drvdata = NULL when no driver is bound). Thus, it is not needed to manually clear the device driver data to NULL.

Signed-off-by Jingoo Han <[email protected]>

---
Changes since v1:
- squashed all patches into a single patch

 drivers/spi/spi-altera.c        |    2 --
 drivers/spi/spi-ath79.c         |    2 --
 drivers/spi/spi-au1550.c        |    2 --
 drivers/spi/spi-bcm63xx.c       |    3 ---
 drivers/spi/spi-bfin-sport.c    |    3 ---
 drivers/spi/spi-bfin5xx.c       |    3 ---
 drivers/spi/spi-clps711x.c      |    2 --
 drivers/spi/spi-coldfire-qspi.c |    1 -
 drivers/spi/spi-dw-mmio.c       |    2 --
 drivers/spi/spi-ep93xx.c        |    2 --
 drivers/spi/spi-gpio.c          |    2 --
 drivers/spi/spi-imx.c           |    3 ---
 drivers/spi/spi-oc-tiny.c       |    2 --
 drivers/spi/spi-pxa2xx.c        |    3 ---
 drivers/spi/spi-s3c64xx.c       |    2 --
 15 files changed, 0 insertions(+), 34 deletions(-)
drivers/spi/spi-altera.c +0 -2
index a537f8d..81b9adb 100644
@@ -285,7 +285,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;
 }

@@ -296,7 +295,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;
 }
drivers/spi/spi-ath79.c +0 -2
index e504b76..6f6d455 100644
@@ -287,7 +287,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;

@@ -302,7 +301,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;
drivers/spi/spi-au1550.c +0 -2
index 44dd34b..39560f4 100644
@@ -987,8 +987,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;
 }
drivers/spi/spi-bcm63xx.c +0 -3
index a4ec5f4..099d083 100644
@@ -469,7 +469,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);

@@ -491,8 +490,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;
drivers/spi/spi-bfin-sport.c +0 -3
index 39b0d17..6d04c80 100644
@@ -882,9 +882,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;
 }
drivers/spi/spi-bfin5xx.c +0 -3
index 317f564..68ca444 100644
@@ -1418,9 +1418,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;
 }
drivers/spi/spi-clps711x.c +0 -2
index a11cbf0..6859a02 100644
@@ -254,7 +254,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);
 

@@ -274,7 +273,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);
drivers/spi/spi-coldfire-qspi.c +0 -1
index 7b5cc9e..3f17660 100644
@@ -524,7 +524,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);
drivers/spi/spi-dw-mmio.c +0 -2
index 4a6d5c9..4aa8be8 100644
@@ -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;
drivers/spi/spi-ep93xx.c +0 -2
index d7bac60..8d4f2a6 100644
@@ -1132,7 +1132,6 @@ fail_put_clock:
 	clk_put(espi->clk);
 fail_release_master:
 	spi_master_put(master);
-	platform_set_drvdata(pdev, NULL);
 
 	return error;
 }

@@ -1167,7 +1166,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;
drivers/spi/spi-gpio.c +0 -2
index 0021fc4..9672c7b 100644
@@ -514,8 +514,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)
drivers/spi/spi-imx.c +0 -3
index 0befeeb..f4d7cac 100644
@@ -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;
 }
drivers/spi/spi-oc-tiny.c +0 -2
index e60a776..58deb79 100644
@@ -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;
 }
drivers/spi/spi-pxa2xx.c +0 -3
index f5d84d6..5a7fa2c 100644
@@ -1299,9 +1299,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;
 }
drivers/spi/spi-s3c64xx.c +0 -2
index 5000586..5f3759d 100644
@@ -1399,7 +1399,6 @@ err3:
 err2:
 	clk_disable_unprepare(sdd->clk);
 err0:
-	platform_set_drvdata(pdev, NULL);
 	spi_master_put(master);
 
 	return ret;

@@ -1420,7 +1419,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;
Signature · 10 lines
1.7.2.5



------------------------------------------------------------------------------
Get 100% visibility into Java/.NET code with AppDynamics Lite
It's a free troubleshooting tool designed for production
Get down to code-level detail for bottlenecks, with <2% overhead.
Download for free and get started troubleshooting in minutes.
http://p.sf.net/sfu/appdyn_d2d_ap2