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