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

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
...@@ -143,7 +143,6 @@ static int pm80x_onkey_remove(struct platform_device *pdev) ...@@ -143,7 +143,6 @@ static int pm80x_onkey_remove(struct platform_device *pdev)
{ {
struct pm80x_onkey_info *info = platform_get_drvdata(pdev); struct pm80x_onkey_info *info = platform_get_drvdata(pdev);
device_init_wakeup(&pdev->dev, 0);
pm80x_free_irq(info->pm80x, info->irq, info); pm80x_free_irq(info->pm80x, info->irq, info);
input_unregister_device(info->idev); input_unregister_device(info->idev);
kfree(info); kfree(info);
......
...@@ -126,7 +126,6 @@ static int e3x0_button_probe(struct platform_device *pdev) ...@@ -126,7 +126,6 @@ static int e3x0_button_probe(struct platform_device *pdev)
static int e3x0_button_remove(struct platform_device *pdev) static int e3x0_button_remove(struct platform_device *pdev)
{ {
device_init_wakeup(&pdev->dev, 0);
return 0; return 0;
} }
......
...@@ -210,8 +210,6 @@ static int gp2a_remove(struct i2c_client *client) ...@@ -210,8 +210,6 @@ static int gp2a_remove(struct i2c_client *client)
struct gp2a_data *dt = i2c_get_clientdata(client); struct gp2a_data *dt = i2c_get_clientdata(client);
const struct gp2a_platform_data *pdata = dt->pdata; const struct gp2a_platform_data *pdata = dt->pdata;
device_init_wakeup(&client->dev, false);
free_irq(client->irq, dt); free_irq(client->irq, dt);
input_unregister_device(dt->input); input_unregister_device(dt->input);
......
...@@ -122,8 +122,6 @@ static int hi65xx_powerkey_probe(struct platform_device *pdev) ...@@ -122,8 +122,6 @@ static int hi65xx_powerkey_probe(struct platform_device *pdev)
static int hi65xx_powerkey_remove(struct platform_device *pdev) static int hi65xx_powerkey_remove(struct platform_device *pdev)
{ {
device_init_wakeup(&pdev->dev, 0);
return 0; return 0;
} }
......
...@@ -266,7 +266,6 @@ static int pm8941_pwrkey_remove(struct platform_device *pdev) ...@@ -266,7 +266,6 @@ static int pm8941_pwrkey_remove(struct platform_device *pdev)
{ {
struct pm8941_pwrkey *pwrkey = platform_get_drvdata(pdev); struct pm8941_pwrkey *pwrkey = platform_get_drvdata(pdev);
device_init_wakeup(&pdev->dev, 0);
unregister_reboot_notifier(&pwrkey->reboot_notifier); unregister_reboot_notifier(&pwrkey->reboot_notifier);
return 0; return 0;
......
...@@ -440,8 +440,6 @@ static int pmic8xxx_pwrkey_probe(struct platform_device *pdev) ...@@ -440,8 +440,6 @@ static int pmic8xxx_pwrkey_probe(struct platform_device *pdev)
static int pmic8xxx_pwrkey_remove(struct platform_device *pdev) static int pmic8xxx_pwrkey_remove(struct platform_device *pdev)
{ {
device_init_wakeup(&pdev->dev, 0);
return 0; return 0;
} }
......
...@@ -174,8 +174,6 @@ static int sirfsoc_pwrc_probe(struct platform_device *pdev) ...@@ -174,8 +174,6 @@ static int sirfsoc_pwrc_probe(struct platform_device *pdev)
static int sirfsoc_pwrc_remove(struct platform_device *pdev) static int sirfsoc_pwrc_remove(struct platform_device *pdev)
{ {
device_init_wakeup(&pdev->dev, 0);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment