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

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/spi/spi-s3c24xx.c b/drivers/spi/spi-s3c24xx.c
index 68910b310152..ce318d95a6ee 100644
--- a/drivers/spi/spi-s3c24xx.c
+++ b/drivers/spi/spi-s3c24xx.c
@@ -525,7 +525,7 @@ static int s3c24xx_spi_probe(struct platform_device *pdev)
         memset(hw, 0, sizeof(struct s3c24xx_spi));
 
         hw->master = spi_master_get(master);
-        hw->pdata = pdata = pdev->dev.platform_data;
+        hw->pdata = pdata = dev_get_platdata(&pdev->dev);
         hw->dev = &pdev->dev;
 
         if (pdata == NULL) {
@@ -690,7 +690,7 @@ static int s3c24xx_spi_remove(struct platform_device *dev)
 
 static int s3c24xx_spi_suspend(struct device *dev)
 {
-        struct s3c24xx_spi *hw = platform_get_drvdata(to_platform_device(dev));
+        struct s3c24xx_spi *hw = dev_get_drvdata(dev);
 
         if (hw->pdata && hw->pdata->gpio_setup)
                 hw->pdata->gpio_setup(hw->pdata, 0);
@@ -701,7 +701,7 @@ static int s3c24xx_spi_suspend(struct device *dev)
 
 static int s3c24xx_spi_resume(struct device *dev)
 {
-        struct s3c24xx_spi *hw = platform_get_drvdata(to_platform_device(dev));
+        struct s3c24xx_spi *hw = dev_get_drvdata(dev);
 
         s3c24xx_spi_initialsetup(hw);
         return 0;