From 83e2fce3b8a8a7bc790b043be50c409dfc258fce Mon Sep 17 00:00:00 2001
From: AnilKumar Ch <anilkumar@ti.com>
Date: Wed, 26 Sep 2012 13:58:21 -0700
Subject: [PATCH] --- yaml --- r: 324352 b: refs/heads/master c:
 0c83adba6b117264eb1972d2787dd17874214e9b h: refs/heads/master v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/misc/lis3lv02d/lis3lv02d.c | 8 ++------
 trunk/drivers/misc/lis3lv02d/lis3lv02d.h | 1 +
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 969da0e7aa27..9797014061d5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4bcdea86f176e96d44531c1e54a1b5c92672424d
+refs/heads/master: 0c83adba6b117264eb1972d2787dd17874214e9b
diff --git a/trunk/drivers/misc/lis3lv02d/lis3lv02d.c b/trunk/drivers/misc/lis3lv02d/lis3lv02d.c
index 6877f1179875..4a87e5c0a320 100644
--- a/trunk/drivers/misc/lis3lv02d/lis3lv02d.c
+++ b/trunk/drivers/misc/lis3lv02d/lis3lv02d.c
@@ -945,7 +945,7 @@ static void lis3lv02d_8b_configure(struct lis3lv02d *lis3,
 }
 
 #ifdef CONFIG_OF
-static int lis3lv02d_init_dt(struct lis3lv02d *lis3)
+int lis3lv02d_init_dt(struct lis3lv02d *lis3)
 {
 	struct lis3lv02d_platform_data *pdata;
 	struct device_node *np = lis3->of_node;
@@ -1085,7 +1085,7 @@ static int lis3lv02d_init_dt(struct lis3lv02d *lis3)
 }
 
 #else
-static int lis3lv02d_init_dt(struct lis3lv02d *lis3)
+int lis3lv02d_init_dt(struct lis3lv02d *lis3)
 {
 	return 0;
 }
@@ -1102,10 +1102,6 @@ int lis3lv02d_init_device(struct lis3lv02d *lis3)
 	irq_handler_t thread_fn;
 	int irq_flags = 0;
 
-	err = lis3lv02d_init_dt(lis3);
-	if (err < 0)
-		return err;
-
 	lis3->whoami = lis3lv02d_read_8(lis3, WHO_AM_I);
 
 	switch (lis3->whoami) {
diff --git a/trunk/drivers/misc/lis3lv02d/lis3lv02d.h b/trunk/drivers/misc/lis3lv02d/lis3lv02d.h
index 2e0700baa584..c439c827eea8 100644
--- a/trunk/drivers/misc/lis3lv02d/lis3lv02d.h
+++ b/trunk/drivers/misc/lis3lv02d/lis3lv02d.h
@@ -326,5 +326,6 @@ void lis3lv02d_joystick_disable(struct lis3lv02d *lis3);
 void lis3lv02d_poweroff(struct lis3lv02d *lis3);
 int lis3lv02d_poweron(struct lis3lv02d *lis3);
 int lis3lv02d_remove_fs(struct lis3lv02d *lis3);
+int lis3lv02d_init_dt(struct lis3lv02d *lis3);
 
 extern struct lis3lv02d lis3_dev;