summaryrefslogtreecommitdiffstats
path: root/drivers/spi/spi-mpc52xx.c
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-06-26 17:21:02 +0200
committerMark Brown <broonie@linaro.org>2013-06-26 17:21:02 +0200
commit3d09da11b59ade74502b246782552f9cb1eb59bd (patch)
treea5ac712ac7d7e5e2c76c813f32f9bdd9be6dc1b8 /drivers/spi/spi-mpc52xx.c
parentMerge remote-tracking branch 'spi/topic/omap' into spi-next (diff)
parentspi: use platform_{get,set}_drvdata() (diff)
downloadlinux-3d09da11b59ade74502b246782552f9cb1eb59bd.tar.xz
linux-3d09da11b59ade74502b246782552f9cb1eb59bd.zip
Merge remote-tracking branch 'spi/topic/pdata' into spi-next
Diffstat (limited to 'drivers/spi/spi-mpc52xx.c')
-rw-r--r--drivers/spi/spi-mpc52xx.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/spi/spi-mpc52xx.c b/drivers/spi/spi-mpc52xx.c
index 29f77056eedc..7c675fe83101 100644
--- a/drivers/spi/spi-mpc52xx.c
+++ b/drivers/spi/spi-mpc52xx.c
@@ -438,7 +438,7 @@ static int mpc52xx_spi_probe(struct platform_device *op)
master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_LSB_FIRST;
master->dev.of_node = op->dev.of_node;
- dev_set_drvdata(&op->dev, master);
+ platform_set_drvdata(op, master);
ms = spi_master_get_devdata(master);
ms->master = master;
@@ -529,7 +529,7 @@ static int mpc52xx_spi_probe(struct platform_device *op)
static int mpc52xx_spi_remove(struct platform_device *op)
{
- struct spi_master *master = spi_master_get(dev_get_drvdata(&op->dev));
+ struct spi_master *master = spi_master_get(platform_get_drvdata(op));
struct mpc52xx_spi *ms = spi_master_get_devdata(master);
int i;