Commit dd64594c authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Daniel Lezcano
Browse files

thermal: 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/thermal 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.

On the way make a few whitespace changes to make indention consistent.

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


Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
parent 62d9748f

drivers/thermal/amlogic_thermal.c

+1 −1
Original line number Diff line number Diff line
@@ -333,7 +333,7 @@ static struct platform_driver amlogic_thermal_driver = { 
		.of_match_table = of_amlogic_thermal_match,

	},

	.probe = amlogic_thermal_probe,

	.remove_new = amlogic_thermal_remove,

	.remove = amlogic_thermal_remove,

};



module_platform_driver(amlogic_thermal_driver);

drivers/thermal/armada_thermal.c

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


static struct platform_driver armada_thermal_driver = {

	.probe = armada_thermal_probe,

	.remove_new = armada_thermal_exit,

	.remove = armada_thermal_exit,

	.driver = {

		.name = "armada_thermal",

		.of_match_table = armada_thermal_id_table,

drivers/thermal/broadcom/bcm2835_thermal.c

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


static struct platform_driver bcm2835_thermal_driver = {

	.probe = bcm2835_thermal_probe,

	.remove_new = bcm2835_thermal_remove,

	.remove = bcm2835_thermal_remove,

	.driver = {

		.name = "bcm2835_thermal",

		.of_match_table = bcm2835_thermal_of_match_table,

drivers/thermal/broadcom/ns-thermal.c

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


static struct platform_driver ns_thermal_driver = {

	.probe		= ns_thermal_probe,

	.remove_new	= ns_thermal_remove,

	.remove		= ns_thermal_remove,

	.driver = {

		.name = "ns-thermal",

		.of_match_table = ns_thermal_of_match,

drivers/thermal/da9062-thermal.c

+3 −3
Original line number Diff line number Diff line
@@ -250,7 +250,7 @@ static void da9062_thermal_remove(struct platform_device *pdev) 


static struct platform_driver da9062_thermal_driver = {

	.probe	= da9062_thermal_probe,

	.remove_new = da9062_thermal_remove,

	.remove	= da9062_thermal_remove,

	.driver	= {

		.name		= "da9062-thermal",

		.of_match_table	= da9062_compatible_reg_id_table,