summaryrefslogtreecommitdiff
path: root/drivers/spi/spi-davinci.c
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-09-01 16:49:03 +0400
committerMark Brown <broonie@linaro.org>2013-09-01 16:49:03 +0400
commit68aa4cb3374a5f47fe1f7b31e0b5893826c05c69 (patch)
treeaa350fff2ef8ef496d46820487198e9bbfe2bf77 /drivers/spi/spi-davinci.c
parent11c28cfc1e4f32dc6d02373a1e80d7e83584ed21 (diff)
parentb5f9a9d5113efe11a3b9dad600a6f833274da595 (diff)
downloadlinux-68aa4cb3374a5f47fe1f7b31e0b5893826c05c69.tar.xz
Merge remote-tracking branch 'spi/topic/pdata' into spi-next
Diffstat (limited to 'drivers/spi/spi-davinci.c')
-rw-r--r--drivers/spi/spi-davinci.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/spi/spi-davinci.c b/drivers/spi/spi-davinci.c
index 707966bd5610..8fbfe2483ffd 100644
--- a/drivers/spi/spi-davinci.c
+++ b/drivers/spi/spi-davinci.c
@@ -872,8 +872,8 @@ static int davinci_spi_probe(struct platform_device *pdev)
goto free_master;
}
- if (pdev->dev.platform_data) {
- pdata = pdev->dev.platform_data;
+ if (dev_get_platdata(&pdev->dev)) {
+ pdata = dev_get_platdata(&pdev->dev);
dspi->pdata = *pdata;
} else {
/* update dspi pdata with that from the DT */