Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 0c83adba6b117264eb1972d2787dd17874214e9b

Authored by AnilKumar Ch
Committed by Greg Kroah-Hartman
1 parent 4bcdea86f1
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

drivers/misc/lis3lv02d: remove lis3lv02d driver DT init 

Remove lis3lv02d driver device tree initialization from core driver and
move it to individual drivers.  With the current implementation some pdata
parameters are missing if we use lis3lv02d_init_device() in lis3lv02d_i2c
driver.

Signed-off-by: AnilKumar Ch <anilkumar@ti.com>
Cc: Eric Piel <eric.piel@tremplin-utc.net>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: Tony Lindgren <tony@atomide.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Showing 2 changed files with 3 additions and 6 deletions Side-by-side Diff

drivers/misc/lis3lv02d/lis3lv02d.c
Diff comments   View file @ 0c83adb
... ... @@ -945,7 +945,7 @@
945 945 }
946 946  
947 947 #ifdef CONFIG_OF
948   -static int lis3lv02d_init_dt(struct lis3lv02d *lis3)
  948 +int lis3lv02d_init_dt(struct lis3lv02d *lis3)
949 949 {
950 950 struct lis3lv02d_platform_data *pdata;
951 951 struct device_node *np = lis3->of_node;
... ... @@ -1085,7 +1085,7 @@
1085 1085 }
1086 1086  
1087 1087 #else
1088   -static int lis3lv02d_init_dt(struct lis3lv02d *lis3)
  1088 +int lis3lv02d_init_dt(struct lis3lv02d *lis3)
1089 1089 {
1090 1090 return 0;
1091 1091 }
... ... @@ -1101,10 +1101,6 @@
1101 1101 int err;
1102 1102 irq_handler_t thread_fn;
1103 1103 int irq_flags = 0;
1104   -
1105   - err = lis3lv02d_init_dt(lis3);
1106   - if (err < 0)
1107   - return err;
1108 1104  
1109 1105 lis3->whoami = lis3lv02d_read_8(lis3, WHO_AM_I);
1110 1106  
drivers/misc/lis3lv02d/lis3lv02d.h
Diff comments   View file @ 0c83adb
... ... @@ -326,6 +326,7 @@
326 326 void lis3lv02d_poweroff(struct lis3lv02d *lis3);
327 327 int lis3lv02d_poweron(struct lis3lv02d *lis3);
328 328 int lis3lv02d_remove_fs(struct lis3lv02d *lis3);
  329 +int lis3lv02d_init_dt(struct lis3lv02d *lis3);
329 330  
330 331 extern struct lis3lv02d lis3_dev;