summaryrefslogtreecommitdiff
path: root/drivers/spi/spi-davinci.c
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-06-26 19:21:02 +0400
committerMark Brown <broonie@linaro.org>2013-06-26 19:21:02 +0400
commit3d09da11b59ade74502b246782552f9cb1eb59bd (patch)
treea5ac712ac7d7e5e2c76c813f32f9bdd9be6dc1b8 /drivers/spi/spi-davinci.c
parent1728ddb2ca726b150e7bf10cdd35b5c3fc5efcf3 (diff)
parent24b5a82cf5709a4bc577f42fdaa61b23a7f58f08 (diff)
downloadlinux-3d09da11b59ade74502b246782552f9cb1eb59bd.tar.xz
Merge remote-tracking branch 'spi/topic/pdata' into spi-next
Diffstat (limited to 'drivers/spi/spi-davinci.c')
-rw-r--r--drivers/spi/spi-davinci.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/spi/spi-davinci.c b/drivers/spi/spi-davinci.c
index b141ef221b14..222d3e37fc28 100644
--- a/drivers/spi/spi-davinci.c
+++ b/drivers/spi/spi-davinci.c
@@ -864,7 +864,7 @@ static int davinci_spi_probe(struct platform_device *pdev)
goto err;
}
- dev_set_drvdata(&pdev->dev, master);
+ platform_set_drvdata(pdev, master);
dspi = spi_master_get_devdata(master);
if (dspi == NULL) {
@@ -1044,7 +1044,7 @@ static int davinci_spi_remove(struct platform_device *pdev)
struct spi_master *master;
struct resource *r;
- master = dev_get_drvdata(&pdev->dev);
+ master = platform_get_drvdata(pdev);
dspi = spi_master_get_devdata(master);
spi_bitbang_stop(&dspi->bitbang);