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

Commit 56580c2c authored by Guenter Roeck's avatar Guenter Roeck Committed by Dmitry Torokhov
Browse files

Input: misc - drop unnecessary calls to device_init_wakeup 



Calling device_init_wakeup in the remove function is unnecessary since the
device is going away, and thus won't be able to cause any wakeups under any
circumstances. Besides, the driver cleanup code already handles the
necessary cleanup.

Similarly, disabling wakeup in the probe error path is unnecessary, as is
disabling wakeup in the probe function in the first place.

Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent de3a00ef

drivers/input/misc/88pm80x_onkey.c

+0 −1
Original line number Diff line number Diff line
@@ -143,7 +143,6 @@ static int pm80x_onkey_remove(struct platform_device *pdev) 
{

	struct pm80x_onkey_info *info = platform_get_drvdata(pdev);



	device_init_wakeup(&pdev->dev, 0);

	pm80x_free_irq(info->pm80x, info->irq, info);

	input_unregister_device(info->idev);

	kfree(info);

drivers/input/misc/e3x0-button.c

+0 −1
Original line number Diff line number Diff line
@@ -126,7 +126,6 @@ static int e3x0_button_probe(struct platform_device *pdev) 


static int e3x0_button_remove(struct platform_device *pdev)

{

	device_init_wakeup(&pdev->dev, 0);

	return 0;

}

drivers/input/misc/gp2ap002a00f.c

+0 −2
Original line number Diff line number Diff line
@@ -210,8 +210,6 @@ static int gp2a_remove(struct i2c_client *client) 
	struct gp2a_data *dt = i2c_get_clientdata(client);

	const struct gp2a_platform_data *pdata = dt->pdata;



	device_init_wakeup(&client->dev, false);



	free_irq(client->irq, dt);



	input_unregister_device(dt->input);

drivers/input/misc/hisi_powerkey.c

+0 −2
Original line number Diff line number Diff line
@@ -122,8 +122,6 @@ static int hi65xx_powerkey_probe(struct platform_device *pdev) 


static int hi65xx_powerkey_remove(struct platform_device *pdev)

{

	device_init_wakeup(&pdev->dev, 0);



	return 0;

}

drivers/input/misc/pm8941-pwrkey.c

+0 −1
Original line number Diff line number Diff line
@@ -266,7 +266,6 @@ static int pm8941_pwrkey_remove(struct platform_device *pdev) 
{

	struct pm8941_pwrkey *pwrkey = platform_get_drvdata(pdev);



	device_init_wakeup(&pdev->dev, 0);

	unregister_reboot_notifier(&pwrkey->reboot_notifier);



	return 0;