diff options
| -rw-r--r-- | drivers/misc/lis3lv02d/lis3lv02d.c | 8 | ||||
| -rw-r--r-- | drivers/misc/lis3lv02d/lis3lv02d.h | 1 |
2 files changed, 3 insertions, 6 deletions
diff --git a/drivers/misc/lis3lv02d/lis3lv02d.c b/drivers/misc/lis3lv02d/lis3lv02d.c index 6877f1179875..4a87e5c0a320 100644 --- a/drivers/misc/lis3lv02d/lis3lv02d.c +++ b/drivers/misc/lis3lv02d/lis3lv02d.c | |||
| @@ -945,7 +945,7 @@ static void lis3lv02d_8b_configure(struct lis3lv02d *lis3, | |||
| 945 | } | 945 | } |
| 946 | 946 | ||
| 947 | #ifdef CONFIG_OF | 947 | #ifdef CONFIG_OF |
| 948 | static int lis3lv02d_init_dt(struct lis3lv02d *lis3) | 948 | int lis3lv02d_init_dt(struct lis3lv02d *lis3) |
| 949 | { | 949 | { |
| 950 | struct lis3lv02d_platform_data *pdata; | 950 | struct lis3lv02d_platform_data *pdata; |
| 951 | struct device_node *np = lis3->of_node; | 951 | struct device_node *np = lis3->of_node; |
| @@ -1085,7 +1085,7 @@ static int lis3lv02d_init_dt(struct lis3lv02d *lis3) | |||
| 1085 | } | 1085 | } |
| 1086 | 1086 | ||
| 1087 | #else | 1087 | #else |
| 1088 | static int lis3lv02d_init_dt(struct lis3lv02d *lis3) | 1088 | int lis3lv02d_init_dt(struct lis3lv02d *lis3) |
| 1089 | { | 1089 | { |
| 1090 | return 0; | 1090 | return 0; |
| 1091 | } | 1091 | } |
| @@ -1102,10 +1102,6 @@ int lis3lv02d_init_device(struct lis3lv02d *lis3) | |||
| 1102 | irq_handler_t thread_fn; | 1102 | irq_handler_t thread_fn; |
| 1103 | int irq_flags = 0; | 1103 | int irq_flags = 0; |
| 1104 | 1104 | ||
| 1105 | err = lis3lv02d_init_dt(lis3); | ||
| 1106 | if (err < 0) | ||
| 1107 | return err; | ||
| 1108 | |||
| 1109 | lis3->whoami = lis3lv02d_read_8(lis3, WHO_AM_I); | 1105 | lis3->whoami = lis3lv02d_read_8(lis3, WHO_AM_I); |
| 1110 | 1106 | ||
| 1111 | switch (lis3->whoami) { | 1107 | switch (lis3->whoami) { |
diff --git a/drivers/misc/lis3lv02d/lis3lv02d.h b/drivers/misc/lis3lv02d/lis3lv02d.h index 2e0700baa584..c439c827eea8 100644 --- a/drivers/misc/lis3lv02d/lis3lv02d.h +++ b/drivers/misc/lis3lv02d/lis3lv02d.h | |||
| @@ -326,5 +326,6 @@ void lis3lv02d_joystick_disable(struct lis3lv02d *lis3); | |||
| 326 | void lis3lv02d_poweroff(struct lis3lv02d *lis3); | 326 | void lis3lv02d_poweroff(struct lis3lv02d *lis3); |
| 327 | int lis3lv02d_poweron(struct lis3lv02d *lis3); | 327 | int lis3lv02d_poweron(struct lis3lv02d *lis3); |
| 328 | int lis3lv02d_remove_fs(struct lis3lv02d *lis3); | 328 | int lis3lv02d_remove_fs(struct lis3lv02d *lis3); |
| 329 | int lis3lv02d_init_dt(struct lis3lv02d *lis3); | ||
| 329 | 330 | ||
| 330 | extern struct lis3lv02d lis3_dev; | 331 | extern struct lis3lv02d lis3_dev; |
