Skip to content

Commit

Permalink
drivers/misc/lis3lv02d: remove lis3lv02d driver DT init
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
AnilKumar Ch authored and Greg Kroah-Hartman committed Sep 26, 2012
1 parent 4bcdea8 commit 0c83adb
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 deletions.
8 changes: 2 additions & 6 deletions drivers/misc/lis3lv02d/lis3lv02d.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
Expand All @@ -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) {
Expand Down
1 change: 1 addition & 0 deletions drivers/misc/lis3lv02d/lis3lv02d.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;

0 comments on commit 0c83adb

Please sign in to comment.