Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[~andy/linux] / drivers / spi / spi-ti-ssp.c

diff --git a/drivers/spi/spi-ti-ssp.c b/drivers/spi/spi-ti-ssp.c
index 10606fcc6efc81bca1fb63cd696cf393290253c1..7d20e121e4c1dfb521d6cf110f3eba7e870d00d5 100644 (file)
--- a/drivers/spi/spi-ti-ssp.c
+++ b/drivers/spi/spi-ti-ssp.c
@@ -283,7 +283,7 @@ static int ti_ssp_spi_probe(struct platform_device *pdev)
        struct device *dev = &pdev->dev;
        int error = 0;
 
-       pdata = dev->platform_data;
+       pdata = dev_get_platdata(dev);
        if (!pdata) {
                dev_err(dev, "platform data not found\n");
                return -EINVAL;