Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux

[linux-drm-fsl-dcu.git] / drivers / spi / spi-dw-mmio.c

diff --git a/drivers/spi/spi-dw-mmio.c b/drivers/spi/spi-dw-mmio.c
index 7edede6e024ba493ce0dfc7038d83e03eb88ef85..a6d7029a85ac8655ce44423751f2ded3b63b8816 100644 (file)
--- a/drivers/spi/spi-dw-mmio.c
+++ b/drivers/spi/spi-dw-mmio.c
@@ -19,6 +19,7 @@
 #include <linux/of.h>
 #include <linux/of_gpio.h>
 #include <linux/of_platform.h>
+#include <linux/property.h>
 
 #include "spi-dw.h"
 
@@ -74,13 +75,11 @@ static int dw_spi_mmio_probe(struct platform_device *pdev)
 
        dws->max_freq = clk_get_rate(dwsmmio->clk);
 
-       of_property_read_u32(pdev->dev.of_node, "reg-io-width",
-                            &dws->reg_io_width);
+       device_property_read_u32(&pdev->dev, "reg-io-width", &dws->reg_io_width);
 
        num_cs = 4;
 
-       if (pdev->dev.of_node)
-               of_property_read_u32(pdev->dev.of_node, "num-cs", &num_cs);
+       device_property_read_u32(&pdev->dev, "num-cs", &num_cs);
 
        dws->num_cs = num_cs;