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

[~andy/linux] / drivers / spi / spi-altera.c

diff --git a/drivers/spi/spi-altera.c b/drivers/spi/spi-altera.c
index 156eb888655e1c1529da6b09591427b9e772d76e..f38855f7653622d742127c7ff6af7223b4c5ee91 100644 (file)
--- a/drivers/spi/spi-altera.c
+++ b/drivers/spi/spi-altera.c
@@ -200,7 +200,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;