diff options
author | Éric Piel <eric.piel@tremplin-utc.net> | 2011-10-31 20:11:02 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-31 20:30:52 -0400 |
commit | e1e5687d75ef0ea5cbae63df48ff2fdcb5306f66 (patch) | |
tree | 4831229322e0c7cff31a026270832a83eb51ccf9 /drivers/platform | |
parent | d7f81d4299cdc8cf06fc9562ec3dafce528bd6ff (diff) |
lis3: change exported function to use passed parameter
Change exported functions to use the device given as parameter
instead of the global one.
Signed-off-by: Ilkka Koskinen <ilkka.koskinen@nokia.com>
Signed-off-by: Éric Piel <eric.piel@tremplin-utc.net>
Cc: Matthew Garrett <mjg@redhat.com>
Cc: Witold Pilat <witold.pilat@gmail.com>
Cc: Lyall Pearce <lyall.pearce@hp.com>
Cc: Malte Starostik <m-starostik@versanet.de>
Cc: Thadeu Lima de Souza Cascardo <cascardo@holoscopio.com>
Cc: Christian Lamparter <chunkeey@googlemail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/platform')
-rw-r--r-- | drivers/platform/x86/hp_accel.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/platform/x86/hp_accel.c b/drivers/platform/x86/hp_accel.c index 89c5cb586187..f93a47b7136a 100644 --- a/drivers/platform/x86/hp_accel.c +++ b/drivers/platform/x86/hp_accel.c | |||
@@ -323,7 +323,7 @@ static int lis3lv02d_add(struct acpi_device *device) | |||
323 | INIT_WORK(&hpled_led.work, delayed_set_status_worker); | 323 | INIT_WORK(&hpled_led.work, delayed_set_status_worker); |
324 | ret = led_classdev_register(NULL, &hpled_led.led_classdev); | 324 | ret = led_classdev_register(NULL, &hpled_led.led_classdev); |
325 | if (ret) { | 325 | if (ret) { |
326 | lis3lv02d_joystick_disable(); | 326 | lis3lv02d_joystick_disable(&lis3_dev); |
327 | lis3lv02d_poweroff(&lis3_dev); | 327 | lis3lv02d_poweroff(&lis3_dev); |
328 | flush_work(&hpled_led.work); | 328 | flush_work(&hpled_led.work); |
329 | return ret; | 329 | return ret; |
@@ -337,7 +337,7 @@ static int lis3lv02d_remove(struct acpi_device *device, int type) | |||
337 | if (!device) | 337 | if (!device) |
338 | return -EINVAL; | 338 | return -EINVAL; |
339 | 339 | ||
340 | lis3lv02d_joystick_disable(); | 340 | lis3lv02d_joystick_disable(&lis3_dev); |
341 | lis3lv02d_poweroff(&lis3_dev); | 341 | lis3lv02d_poweroff(&lis3_dev); |
342 | 342 | ||
343 | led_classdev_unregister(&hpled_led.led_classdev); | 343 | led_classdev_unregister(&hpled_led.led_classdev); |