aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/spi/spi-bcm63xx.c
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-06-26 16:20:58 +0100
committerMark Brown <broonie@linaro.org>2013-06-26 16:20:58 +0100
commit6140b05ca351000dd844f05495198d8425ccf394 (patch)
tree1024c1b1e07a206b509dab0aad0c8399a2a97635 /drivers/spi/spi-bcm63xx.c
parentMerge remote-tracking branch 'spi/topic/coldfire-qspi' into spi-next (diff)
parentspi: remove unnecessary platform_set_drvdata() (diff)
downloadlinux-dev-6140b05ca351000dd844f05495198d8425ccf394.tar.xz
linux-dev-6140b05ca351000dd844f05495198d8425ccf394.zip
Merge remote-tracking branch 'spi/topic/core' into spi-next
Diffstat (limited to 'drivers/spi/spi-bcm63xx.c')
-rw-r--r--drivers/spi/spi-bcm63xx.c3
1 files changed, 0 insertions, 3 deletions
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;