Skip to content

Commit 32a0a94

Browse files
ukleinekAndi Shyti
authored andcommitted
i2c: Switch back to struct platform_driver::remove()
After commit 0edb555 ("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: Uwe Kleine-König <[email protected]> Signed-off-by: Andi Shyti <[email protected]>
1 parent 506bb2a commit 32a0a94

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+88
-88
lines changed

drivers/i2c/busses/i2c-altera.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,7 @@ MODULE_DEVICE_TABLE(of, altr_i2c_of_match);
482482

483483
static struct platform_driver altr_i2c_driver = {
484484
.probe = altr_i2c_probe,
485-
.remove_new = altr_i2c_remove,
485+
.remove = altr_i2c_remove,
486486
.driver = {
487487
.name = "altera-i2c",
488488
.of_match_table = altr_i2c_of_match,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ MODULE_DEVICE_TABLE(acpi, i2c_amd_acpi_match);
346346

347347
static struct platform_driver i2c_amd_plat_driver = {
348348
.probe = i2c_amd_probe,
349-
.remove_new = i2c_amd_remove,
349+
.remove = i2c_amd_remove,
350350
.driver = {
351351
.name = "i2c_amd_mp2",
352352
.acpi_match_table = ACPI_PTR(i2c_amd_acpi_match),

drivers/i2c/busses/i2c-aspeed.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1102,7 +1102,7 @@ static void aspeed_i2c_remove_bus(struct platform_device *pdev)
11021102

11031103
static struct platform_driver aspeed_i2c_bus_driver = {
11041104
.probe = aspeed_i2c_probe_bus,
1105-
.remove_new = aspeed_i2c_remove_bus,
1105+
.remove = aspeed_i2c_remove_bus,
11061106
.driver = {
11071107
.name = "aspeed-i2c-bus",
11081108
.of_match_table = aspeed_i2c_bus_of_table,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ static const struct dev_pm_ops __maybe_unused at91_twi_pm = {
330330

331331
static struct platform_driver at91_twi_driver = {
332332
.probe = at91_twi_probe,
333-
.remove_new = at91_twi_remove,
333+
.remove = at91_twi_remove,
334334
.id_table = at91_twi_devtypes,
335335
.driver = {
336336
.name = "at91_i2c",

drivers/i2c/busses/i2c-au1550.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@ static struct platform_driver au1xpsc_smbus_driver = {
368368
.pm = pm_sleep_ptr(&i2c_au1550_pmops),
369369
},
370370
.probe = i2c_au1550_probe,
371-
.remove_new = i2c_au1550_remove,
371+
.remove = i2c_au1550_remove,
372372
};
373373

374374
module_platform_driver(au1xpsc_smbus_driver);

drivers/i2c/busses/i2c-axxia.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -824,7 +824,7 @@ MODULE_DEVICE_TABLE(of, axxia_i2c_of_match);
824824

825825
static struct platform_driver axxia_i2c_driver = {
826826
.probe = axxia_i2c_probe,
827-
.remove_new = axxia_i2c_remove,
827+
.remove = axxia_i2c_remove,
828828
.driver = {
829829
.name = "axxia-i2c",
830830
.of_match_table = axxia_i2c_of_match,

drivers/i2c/busses/i2c-bcm-iproc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1264,7 +1264,7 @@ static struct platform_driver bcm_iproc_i2c_driver = {
12641264
.pm = pm_sleep_ptr(&bcm_iproc_i2c_pm_ops),
12651265
},
12661266
.probe = bcm_iproc_i2c_probe,
1267-
.remove_new = bcm_iproc_i2c_remove,
1267+
.remove = bcm_iproc_i2c_remove,
12681268
};
12691269
module_platform_driver(bcm_iproc_i2c_driver);
12701270

drivers/i2c/busses/i2c-bcm-kona.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -877,7 +877,7 @@ static struct platform_driver bcm_kona_i2c_driver = {
877877
.of_match_table = bcm_kona_i2c_of_match,
878878
},
879879
.probe = bcm_kona_i2c_probe,
880-
.remove_new = bcm_kona_i2c_remove,
880+
.remove = bcm_kona_i2c_remove,
881881
};
882882
module_platform_driver(bcm_kona_i2c_driver);
883883

drivers/i2c/busses/i2c-bcm2835.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -520,7 +520,7 @@ MODULE_DEVICE_TABLE(of, bcm2835_i2c_of_match);
520520

521521
static struct platform_driver bcm2835_i2c_driver = {
522522
.probe = bcm2835_i2c_probe,
523-
.remove_new = bcm2835_i2c_remove,
523+
.remove = bcm2835_i2c_remove,
524524
.driver = {
525525
.name = "i2c-bcm2835",
526526
.of_match_table = bcm2835_i2c_of_match,

drivers/i2c/busses/i2c-brcmstb.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -744,7 +744,7 @@ static struct platform_driver brcmstb_i2c_driver = {
744744
.pm = pm_sleep_ptr(&brcmstb_i2c_pm),
745745
},
746746
.probe = brcmstb_i2c_probe,
747-
.remove_new = brcmstb_i2c_remove,
747+
.remove = brcmstb_i2c_remove,
748748
};
749749
module_platform_driver(brcmstb_i2c_driver);
750750

0 commit comments

Comments
 (0)