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

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

Input: keyboard - 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 d7ddf154

drivers/input/keyboard/gpio_keys.c

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

	sysfs_remove_group(&pdev->dev.kobj, &gpio_keys_attr_group);



	device_init_wakeup(&pdev->dev, 0);



	return 0;

}

drivers/input/keyboard/matrix_keypad.c

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

	struct matrix_keypad *keypad = platform_get_drvdata(pdev);



	device_init_wakeup(&pdev->dev, 0);



	matrix_keypad_free_gpio(keypad);

	input_unregister_device(keypad->input_dev);

	kfree(keypad);

drivers/input/keyboard/omap4-keypad.c

+0 −3
Original line number Diff line number Diff line
@@ -375,7 +375,6 @@ static int omap4_keypad_probe(struct platform_device *pdev) 


err_pm_disable:

	pm_runtime_disable(&pdev->dev);

	device_init_wakeup(&pdev->dev, false);

	free_irq(keypad_data->irq, keypad_data);

err_free_keymap:

	kfree(keypad_data->keymap);
@@ -401,8 +400,6 @@ static int omap4_keypad_remove(struct platform_device *pdev) 


	pm_runtime_disable(&pdev->dev);



	device_init_wakeup(&pdev->dev, false);



	input_unregister_device(keypad_data->input);



	iounmap(keypad_data->base);

drivers/input/keyboard/samsung-keypad.c

+0 −2
Original line number Diff line number Diff line
@@ -445,7 +445,6 @@ static int samsung_keypad_probe(struct platform_device *pdev) 


err_disable_runtime_pm:

	pm_runtime_disable(&pdev->dev);

	device_init_wakeup(&pdev->dev, 0);

err_unprepare_clk:

	clk_unprepare(keypad->clk);

	return error;
@@ -456,7 +455,6 @@ static int samsung_keypad_remove(struct platform_device *pdev) 
	struct samsung_keypad *keypad = platform_get_drvdata(pdev);



	pm_runtime_disable(&pdev->dev);

	device_init_wakeup(&pdev->dev, 0);



	input_unregister_device(keypad->input_dev);

drivers/input/keyboard/spear-keyboard.c

+0 −2
Original line number Diff line number Diff line
@@ -283,8 +283,6 @@ static int spear_kbd_remove(struct platform_device *pdev) 
	input_unregister_device(kbd->input);

	clk_unprepare(kbd->clk);



	device_init_wakeup(&pdev->dev, 0);



	return 0;

}