drivers/misc/lis3lv02d/lis3lv02d_spi.c: add lis3lv02d device tree init

Add lis3lv02d device tree initialization code/API to take pdata from
device node.  Also remove CONFIG_OF ifdef from the driver, if CONFIG_OF is
not defined then OF APIs returns 0.

[[email protected]: fix CONFIG_OF=n build[
Signed-off-by: AnilKumar Ch <[email protected]>
Cc: Eric Piel <[email protected]>
Reviewed-by: Arnd Bergmann <[email protected]>
Cc: Mark Brown <[email protected]>
Cc: Tony Lindgren <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

diff --git a/drivers/misc/lis3lv02d/lis3lv02d_spi.c b/drivers/misc/lis3lv02d/lis3lv02d_spi.c
index 4b8ccf200194e2235b679ea13a9024c4393f2389..ccb6475fa05966eb81888c191ea97a592d3a9c99 100644 (file)
--- a/drivers/misc/lis3lv02d/lis3lv02d_spi.c
+++ b/drivers/misc/lis3lv02d/lis3lv02d_spi.c
@@ -19,6 +19,7 @@
 #include <linux/pm.h>
 #include <linux/of.h>
 #include <linux/of_platform.h>
+#include <linux/of_device.h>
 
 #include "lis3lv02d.h"
 
@@ -87,10 +88,13 @@ static int __devinit lis302dl_spi_probe(struct spi_device *spi)
        lis3_dev.pdata          = spi->dev.platform_data;
 
 #ifdef CONFIG_OF
-       if (of_match_device(lis302dl_spi_dt_ids, &spi->dev))
+       if (of_match_device(lis302dl_spi_dt_ids, &spi->dev)) {
                lis3_dev.of_node = spi->dev.of_node;
+               ret = lis3lv02d_init_dt(&lis3_dev);
+               if (ret)
+                       return ret;
+       }
 #endif
-
        spi_set_drvdata(spi, &lis3_dev);
 
        return lis3lv02d_init_device(&lis3_dev);