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-sh-hspi.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-sh-hspi.c')
| -rw-r--r-- | drivers/spi/spi-sh-hspi.c | 4 |
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); |