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

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/spi/spi-sh-hspi.c b/drivers/spi/spi-sh-hspi.c
index eab593eaaafa..716edf999538 100644
--- a/drivers/spi/spi-sh-hspi.c
+++ b/drivers/spi/spi-sh-hspi.c
@@ -297,7 +297,7 @@ static int hspi_probe(struct platform_device *pdev)
         }
 
         hspi = spi_master_get_devdata(master);
-        dev_set_drvdata(&pdev->dev, hspi);
+        platform_set_drvdata(pdev, hspi);
 
         /* init hspi */
         hspi->master    = master;
@@ -341,7 +341,7 @@ static int hspi_probe(struct platform_device *pdev)
 
 static int hspi_remove(struct platform_device *pdev)
 {
-        struct hspi_priv *hspi = dev_get_drvdata(&pdev->dev);
+        struct hspi_priv *hspi = platform_get_drvdata(pdev);
 
         pm_runtime_disable(&pdev->dev);