Commit 6126f7bb authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Guenter Roeck
Browse files

hwmon: 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/hwmonto 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>
Message-ID: <20241017155900.137357-2-u.kleine-koenig@baylibre.com>
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
parent 0eed6fc3

drivers/hwmon/abituguru.c

+1 −1
Original line number Diff line number Diff line
@@ -1531,7 +1531,7 @@ static struct platform_driver abituguru_driver = { 
		.pm	= pm_sleep_ptr(&abituguru_pm),

	},

	.probe		= abituguru_probe,

	.remove_new	= abituguru_remove,

	.remove		= abituguru_remove,

};



static int __init abituguru_detect(void)

drivers/hwmon/abituguru3.c

+2 −2
Original line number Diff line number Diff line
@@ -1152,7 +1152,7 @@ static struct platform_driver abituguru3_driver = { 
		.pm	= pm_sleep_ptr(&abituguru3_pm),

	},

	.probe	= abituguru3_probe,

	.remove_new = abituguru3_remove,

	.remove	= abituguru3_remove,

};



static int __init abituguru3_dmi_detect(void)

drivers/hwmon/aspeed-g6-pwm-tach.c

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


static struct platform_driver aspeed_pwm_tach_driver = {

	.probe = aspeed_pwm_tach_probe,

	.remove_new = aspeed_pwm_tach_remove,

	.remove = aspeed_pwm_tach_remove,

	.driver	= {

		.name = "aspeed-g6-pwm-tach",

		.of_match_table = aspeed_pwm_tach_match,

drivers/hwmon/da9052-hwmon.c

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


static struct platform_driver da9052_hwmon_driver = {

	.probe = da9052_hwmon_probe,

	.remove_new = da9052_hwmon_remove,

	.remove = da9052_hwmon_remove,

	.driver = {

		.name = "da9052-hwmon",

	},

drivers/hwmon/dme1737.c

+1 −1
Original line number Diff line number Diff line
@@ -2721,7 +2721,7 @@ static struct platform_driver dme1737_isa_driver = { 
		.name = "dme1737",

	},

	.probe = dme1737_isa_probe,

	.remove_new = dme1737_isa_remove,

	.remove = dme1737_isa_remove,

};



/* ---------------------------------------------------------------------