Commit 32a0a94a authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Andi Shyti
Browse files

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

Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@baylibre.com>
Signed-off-by: default avatarAndi Shyti <andi.shyti@kernel.org>
parent 506bb2ab

drivers/i2c/busses/i2c-altera.c

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


static struct platform_driver altr_i2c_driver = {

	.probe = altr_i2c_probe,

	.remove_new = altr_i2c_remove,

	.remove = altr_i2c_remove,

	.driver = {

		.name = "altera-i2c",

		.of_match_table = altr_i2c_of_match,

drivers/i2c/busses/i2c-amd-mp2-plat.c

+1 −1
Original line number Diff line number Diff line
@@ -346,7 +346,7 @@ MODULE_DEVICE_TABLE(acpi, i2c_amd_acpi_match); 


static struct platform_driver i2c_amd_plat_driver = {

	.probe = i2c_amd_probe,

	.remove_new = i2c_amd_remove,

	.remove = i2c_amd_remove,

	.driver = {

		.name = "i2c_amd_mp2",

		.acpi_match_table = ACPI_PTR(i2c_amd_acpi_match),

drivers/i2c/busses/i2c-aspeed.c

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


static struct platform_driver aspeed_i2c_bus_driver = {

	.probe		= aspeed_i2c_probe_bus,

	.remove_new	= aspeed_i2c_remove_bus,

	.remove		= aspeed_i2c_remove_bus,

	.driver		= {

		.name		= "aspeed-i2c-bus",

		.of_match_table	= aspeed_i2c_bus_of_table,

drivers/i2c/busses/i2c-at91-core.c

+1 −1
Original line number Diff line number Diff line
@@ -330,7 +330,7 @@ static const struct dev_pm_ops __maybe_unused at91_twi_pm = { 


static struct platform_driver at91_twi_driver = {

	.probe		= at91_twi_probe,

	.remove_new	= at91_twi_remove,

	.remove		= at91_twi_remove,

	.id_table	= at91_twi_devtypes,

	.driver		= {

		.name	= "at91_i2c",

drivers/i2c/busses/i2c-au1550.c

+1 −1
Original line number Diff line number Diff line
@@ -368,7 +368,7 @@ static struct platform_driver au1xpsc_smbus_driver = { 
		.pm	= pm_sleep_ptr(&i2c_au1550_pmops),

	},

	.probe		= i2c_au1550_probe,

	.remove_new	= i2c_au1550_remove,

	.remove		= i2c_au1550_remove,

};



module_platform_driver(au1xpsc_smbus_driver);