Merge remote-tracking branch 'spi/topic/pdata' into spi-next

1 files changed, 3 insertions, 5 deletions

diff --git a/drivers/spi/spi-bcm63xx.c b/drivers/spi/spi-bcm63xx.c
index a21fef4a3bb1..de197f72e082 100644
--- a/drivers/spi/spi-bcm63xx.c
+++ b/drivers/spi/spi-bcm63xx.c
@@ -353,7 +353,7 @@ static int bcm63xx_spi_probe(struct platform_device *pdev)
 {
         struct resource *r;
         struct device *dev = &pdev->dev;
-        struct bcm63xx_spi_pdata *pdata = pdev->dev.platform_data;
+        struct bcm63xx_spi_pdata *pdata = dev_get_platdata(&pdev->dev);
         int irq;
         struct spi_master *master;
         struct clk *clk;
@@ -474,8 +474,7 @@ static int bcm63xx_spi_remove(struct platform_device *pdev)
 #ifdef CONFIG_PM
 static int bcm63xx_spi_suspend(struct device *dev)
 {
-        struct spi_master *master =
-                        platform_get_drvdata(to_platform_device(dev));
+        struct spi_master *master = dev_get_drvdata(dev);
         struct bcm63xx_spi *bs = spi_master_get_devdata(master);
 
         spi_master_suspend(master);
@@ -487,8 +486,7 @@ static int bcm63xx_spi_suspend(struct device *dev)
 
 static int bcm63xx_spi_resume(struct device *dev)
 {
-        struct spi_master *master =
-                        platform_get_drvdata(to_platform_device(dev));
+        struct spi_master *master = dev_get_drvdata(dev);
         struct bcm63xx_spi *bs = spi_master_get_devdata(master);
 
         clk_prepare_enable(bs->clk);