diff options
| author | Mark Brown <broonie@linaro.org> | 2013-06-26 17:21:02 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-06-26 17:21:02 +0200 |
| commit | 3d09da11b59ade74502b246782552f9cb1eb59bd (patch) | |
| tree | a5ac712ac7d7e5e2c76c813f32f9bdd9be6dc1b8 /drivers/spi/spi-davinci.c | |
| parent | Merge remote-tracking branch 'spi/topic/omap' into spi-next (diff) | |
| parent | spi: use platform_{get,set}_drvdata() (diff) | |
| download | linux-3d09da11b59ade74502b246782552f9cb1eb59bd.tar.xz linux-3d09da11b59ade74502b246782552f9cb1eb59bd.zip | |
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.c | 4 |
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); |