The patch titled lis3: change exported function to use passed parameter has been added to the -mm tree. Its filename is lis3-change-exported-function-to-use-given.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: lis3: change exported function to use passed parameter From: Éric Piel <eric.piel@xxxxxxxxxxxxxxxx> Change exported functions to use the device given as parameter instead of the global one. Signed-off-by: Ilkka Koskinen <ilkka.koskinen@xxxxxxxxx> Signed-off-by: Éric Piel <eric.piel@xxxxxxxxxxxxxxxx> Cc: Matthew Garrett <mjg@xxxxxxxxxx> Cc: Witold Pilat <witold.pilat@xxxxxxxxx> Cc: Lyall Pearce <lyall.pearce@xxxxxx> Cc: Malte Starostik <m-starostik@xxxxxxxxxxx> Cc: Thadeu Lima de Souza Cascardo <cascardo@xxxxxxxxxxxxxx> Cc: Christian Lamparter <chunkeey@xxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/misc/lis3lv02d/lis3lv02d.c | 6 +++--- drivers/misc/lis3lv02d/lis3lv02d.h | 4 ++-- drivers/misc/lis3lv02d/lis3lv02d_i2c.c | 2 +- drivers/misc/lis3lv02d/lis3lv02d_spi.c | 2 +- drivers/platform/x86/hp_accel.c | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff -puN drivers/misc/lis3lv02d/lis3lv02d.c~lis3-change-exported-function-to-use-given drivers/misc/lis3lv02d/lis3lv02d.c --- a/drivers/misc/lis3lv02d/lis3lv02d.c~lis3-change-exported-function-to-use-given +++ a/drivers/misc/lis3lv02d/lis3lv02d.c @@ -629,7 +629,7 @@ static struct miscdevice lis3lv02d_misc_ .fops = &lis3lv02d_misc_fops, }; -int lis3lv02d_joystick_enable(void) +int lis3lv02d_joystick_enable(struct lis3lv02d *lis3) { struct input_dev *input_dev; int err; @@ -687,7 +687,7 @@ int lis3lv02d_joystick_enable(void) } EXPORT_SYMBOL_GPL(lis3lv02d_joystick_enable); -void lis3lv02d_joystick_disable(void) +void lis3lv02d_joystick_disable(struct lis3lv02d *lis3) { if (lis3_dev.irq) free_irq(lis3_dev.irq, &lis3_dev); @@ -957,7 +957,7 @@ int lis3lv02d_init_device(struct lis3lv0 pm_runtime_enable(lis3->pm_dev); } - if (lis3lv02d_joystick_enable()) + if (lis3lv02d_joystick_enable(lis3)) pr_err("joystick initialization failed\n"); /* passing in platform specific data is purely optional and only diff -puN drivers/misc/lis3lv02d/lis3lv02d.h~lis3-change-exported-function-to-use-given drivers/misc/lis3lv02d/lis3lv02d.h --- a/drivers/misc/lis3lv02d/lis3lv02d.h~lis3-change-exported-function-to-use-given +++ a/drivers/misc/lis3lv02d/lis3lv02d.h @@ -282,8 +282,8 @@ struct lis3lv02d { }; int lis3lv02d_init_device(struct lis3lv02d *lis3); -int lis3lv02d_joystick_enable(void); -void lis3lv02d_joystick_disable(void); +int lis3lv02d_joystick_enable(struct lis3lv02d *lis3); +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); diff -puN drivers/misc/lis3lv02d/lis3lv02d_i2c.c~lis3-change-exported-function-to-use-given drivers/misc/lis3lv02d/lis3lv02d_i2c.c --- a/drivers/misc/lis3lv02d/lis3lv02d_i2c.c~lis3-change-exported-function-to-use-given +++ a/drivers/misc/lis3lv02d/lis3lv02d_i2c.c @@ -182,7 +182,7 @@ static int __devexit lis3lv02d_i2c_remov if (pdata && pdata->release_resources) pdata->release_resources(); - lis3lv02d_joystick_disable(); + lis3lv02d_joystick_disable(lis3); lis3lv02d_remove_fs(&lis3_dev); if (lis3_dev.reg_ctrl) diff -puN drivers/misc/lis3lv02d/lis3lv02d_spi.c~lis3-change-exported-function-to-use-given drivers/misc/lis3lv02d/lis3lv02d_spi.c --- a/drivers/misc/lis3lv02d/lis3lv02d_spi.c~lis3-change-exported-function-to-use-given +++ a/drivers/misc/lis3lv02d/lis3lv02d_spi.c @@ -83,7 +83,7 @@ static int __devinit lis302dl_spi_probe( static int __devexit lis302dl_spi_remove(struct spi_device *spi) { struct lis3lv02d *lis3 = spi_get_drvdata(spi); - lis3lv02d_joystick_disable(); + lis3lv02d_joystick_disable(lis3); lis3lv02d_poweroff(lis3); return lis3lv02d_remove_fs(&lis3_dev); diff -puN drivers/platform/x86/hp_accel.c~lis3-change-exported-function-to-use-given drivers/platform/x86/hp_accel.c --- a/drivers/platform/x86/hp_accel.c~lis3-change-exported-function-to-use-given +++ a/drivers/platform/x86/hp_accel.c @@ -323,7 +323,7 @@ static int lis3lv02d_add(struct acpi_dev INIT_WORK(&hpled_led.work, delayed_set_status_worker); ret = led_classdev_register(NULL, &hpled_led.led_classdev); if (ret) { - lis3lv02d_joystick_disable(); + lis3lv02d_joystick_disable(&lis3_dev); lis3lv02d_poweroff(&lis3_dev); flush_work(&hpled_led.work); return ret; @@ -337,7 +337,7 @@ static int lis3lv02d_remove(struct acpi_ if (!device) return -EINVAL; - lis3lv02d_joystick_disable(); + lis3lv02d_joystick_disable(&lis3_dev); lis3lv02d_poweroff(&lis3_dev); led_classdev_unregister(&hpled_led.led_classdev); _ Patches currently in -mm which might be from eric.piel@xxxxxxxxxxxxxxxx are lis3lv02d-avoid-divide-by-zero-due-to-unchecked.patch lis3-update-maintainer-information.patch lis3-add-support-for-hp-elitebook-2730p.patch lis3-add-support-for-hp-elitebook-8540w.patch hp_accel-add-hp-probook-655x.patch config_hp_accel-fix-help-text.patch lis3-free-regulators-if-probe-fails.patch lis3-change-naming-to-consistent.patch lis3-change-exported-function-to-use-given.patch lis3-remove-the-references-to-the-global-variable-in-core-driver.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html