aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/spi/spi-pl022.c
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-09-01 08:49:03 -0400
committerMark Brown <broonie@linaro.org>2013-09-01 08:49:03 -0400
commit68aa4cb3374a5f47fe1f7b31e0b5893826c05c69 (patch)
treeaa350fff2ef8ef496d46820487198e9bbfe2bf77 /drivers/spi/spi-pl022.c
parent11c28cfc1e4f32dc6d02373a1e80d7e83584ed21 (diff)
parentb5f9a9d5113efe11a3b9dad600a6f833274da595 (diff)
Merge remote-tracking branch 'spi/topic/pdata' into spi-next
Diffstat (limited to 'drivers/spi/spi-pl022.c')
-rw-r--r--drivers/spi/spi-pl022.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/spi/spi-pl022.c b/drivers/spi/spi-pl022.c
index abef061fb84a..4b564b74c99c 100644
--- a/drivers/spi/spi-pl022.c
+++ b/drivers/spi/spi-pl022.c
@@ -2091,7 +2091,8 @@ pl022_platform_data_dt_get(struct device *dev)
2091static int pl022_probe(struct amba_device *adev, const struct amba_id *id) 2091static int pl022_probe(struct amba_device *adev, const struct amba_id *id)
2092{ 2092{
2093 struct device *dev = &adev->dev; 2093 struct device *dev = &adev->dev;
2094 struct pl022_ssp_controller *platform_info = adev->dev.platform_data; 2094 struct pl022_ssp_controller *platform_info =
2095 dev_get_platdata(&adev->dev);
2095 struct spi_master *master; 2096 struct spi_master *master;
2096 struct pl022 *pl022 = NULL; /*Data for this driver */ 2097 struct pl022 *pl022 = NULL; /*Data for this driver */
2097 struct device_node *np = adev->dev.of_node; 2098 struct device_node *np = adev->dev.of_node;