Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e1e5687d authored by Éric Piel's avatar Éric Piel Committed by Linus Torvalds
Browse files

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: default avatarIlkka Koskinen <ilkka.koskinen@nokia.com>
Signed-off-by: default avatarÉ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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d7f81d42

drivers/misc/lis3lv02d/lis3lv02d.c

+3 −3
Original line number Diff line number Diff line
@@ -631,7 +631,7 @@ static struct miscdevice lis3lv02d_misc_device = { 
	.fops    = &lis3lv02d_misc_fops,

};



int lis3lv02d_joystick_enable(void)

int lis3lv02d_joystick_enable(struct lis3lv02d *lis3)

{

	struct input_dev *input_dev;

	int err;
@@ -689,7 +689,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);
@@ -959,7 +959,7 @@ int lis3lv02d_init_device(struct lis3lv02d *lis3) 
		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

drivers/misc/lis3lv02d/lis3lv02d.h

+2 −2
Original line number Diff line number Diff line
@@ -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);

drivers/misc/lis3lv02d/lis3lv02d_i2c.c

+1 −1
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ static int __devexit lis3lv02d_i2c_remove(struct i2c_client *client) 
	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)

drivers/misc/lis3lv02d/lis3lv02d_spi.c

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ static int __devinit lis302dl_spi_probe(struct spi_device *spi) 
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);

drivers/platform/x86/hp_accel.c

+2 −2
Original line number Diff line number Diff line
@@ -323,7 +323,7 @@ static int lis3lv02d_add(struct acpi_device *device) 
	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_device *device, int type) 
	if (!device)

		return -EINVAL;



	lis3lv02d_joystick_disable();

	lis3lv02d_joystick_disable(&lis3_dev);

	lis3lv02d_poweroff(&lis3_dev);



	led_classdev_unregister(&hpled_led.led_classdev);