Commit 83bce344 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Sebastian Reichel
Browse files

power: Switch back to struct platform_driver::remove() 



After commit 0edb555a ("platform: Make platform_driver::remove()
return void") .remove() is (again) the right callback to implement for
platform drivers.

Convert all platform drivers below drivers/power/ to use .remove(), with
the eventual goal to drop struct platform_driver::remove_new(). As
.remove() and .remove_new() have the same prototypes, conversion is done
by just changing the structure member name in the driver initializer.

While touching these files, make indention of the struct initializer
consistent in several files.

Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@baylibre.com>
Link: https://lore.kernel.org/r/20241010203622.839625-6-u.kleine-koenig@baylibre.com


Signed-off-by: default avatarSebastian Reichel <sebastian.reichel@collabora.com>
parent 44fcc479

drivers/power/reset/at91-poweroff.c

+1 −1
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ MODULE_DEVICE_TABLE(of, at91_poweroff_of_match); 


static struct platform_driver at91_poweroff_driver = {

	.probe = at91_poweroff_probe,

	.remove_new = at91_poweroff_remove,

	.remove = at91_poweroff_remove,

	.driver = {

		.name = "at91-poweroff",

		.of_match_table = at91_poweroff_of_match,

drivers/power/reset/at91-reset.c

+1 −1
Original line number Diff line number Diff line
@@ -427,7 +427,7 @@ static void at91_reset_remove(struct platform_device *pdev) 


static struct platform_driver at91_reset_driver = {

	.probe = at91_reset_probe,

	.remove_new = at91_reset_remove,

	.remove = at91_reset_remove,

	.driver = {

		.name = "at91-reset",

		.of_match_table = at91_reset_of_match,

drivers/power/reset/at91-sama5d2_shdwc.c

+1 −1
Original line number Diff line number Diff line
@@ -441,7 +441,7 @@ static void at91_shdwc_remove(struct platform_device *pdev) 


static struct platform_driver at91_shdwc_driver = {

	.probe = at91_shdwc_probe,

	.remove_new = at91_shdwc_remove,

	.remove = at91_shdwc_remove,

	.driver = {

		.name = "at91-shdwc",

		.of_match_table = at91_shdwc_of_match,

drivers/power/reset/ltc2952-poweroff.c

+1 −1
Original line number Diff line number Diff line
@@ -305,7 +305,7 @@ MODULE_DEVICE_TABLE(of, of_ltc2952_poweroff_match); 


static struct platform_driver ltc2952_poweroff_driver = {

	.probe = ltc2952_poweroff_probe,

	.remove_new = ltc2952_poweroff_remove,

	.remove = ltc2952_poweroff_remove,

	.driver = {

		.name = "ltc2952-poweroff",

		.of_match_table = of_ltc2952_poweroff_match,

drivers/power/reset/qnap-poweroff.c

+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ static void qnap_power_off_remove(struct platform_device *pdev) 


static struct platform_driver qnap_power_off_driver = {

	.probe	= qnap_power_off_probe,

	.remove_new = qnap_power_off_remove,

	.remove	= qnap_power_off_remove,

	.driver	= {

		.name	= "qnap_power_off",

		.of_match_table = of_match_ptr(qnap_power_off_of_match_table),