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

[deliverable/linux.git] / drivers / spi / spi-altera.c

diff --git a/drivers/spi/spi-altera.c b/drivers/spi/spi-altera.c
index 81b9adb6e766bdae0b0f6c9de4836ecfaffc490a..e53caac13aec06f836640ad0bd6f5f8f317a694f 100644 (file)
--- a/drivers/spi/spi-altera.c
+++ b/drivers/spi/spi-altera.c
@@ -217,7 +217,7 @@ static irqreturn_t altera_spi_irq(int irq, void *dev)
 
 static int altera_spi_probe(struct platform_device *pdev)
 {
-       struct altera_spi_platform_data *platp = pdev->dev.platform_data;
+       struct altera_spi_platform_data *platp = dev_get_platdata(&pdev->dev);
        struct altera_spi *hw;
        struct spi_master *master;
        struct resource *res;