Skip to content

Commit b234445

Browse files
committed
Get rid of 'remove_new' relic from platform driver struct
JIRA: https://issues.redhat.com/browse/RHEL-82110 Upstream status: v6.14 Conflicts: treewide limited to drivers/char/ipmi commit e70140b Author: Linus Torvalds <torvalds@linux-foundation.org> Date: Sun Dec 1 15:12:43 2024 -0800 Get rid of 'remove_new' relic from platform driver struct The continual trickle of small conversion patches is grating on me, and is really not helping. Just get rid of the 'remove_new' member function, which is just an alias for the plain 'remove', and had a comment to that effect: /* * .remove_new() is a relic from a prototype conversion of .remove(). * New drivers are supposed to implement .remove(). Once all drivers are * converted to not use .remove_new any more, it will be dropped. */ This was just a tree-wide 'sed' script that replaced '.remove_new' with '.remove', with some care taken to turn a subsequent tab into two tabs to make things line up. I did do some minimal manual whitespace adjustment for places that used spaces to line things up. Then I just removed the old (sic) .remove_new member function, and this is the end result. No more unnecessary conversion noise. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Tony Camuso <tcamuso@redhat.com>
1 parent 47d9280 commit b234445

File tree

6 files changed

+6
-6
lines changed

6 files changed

+6
-6
lines changed

drivers/char/ipmi/bt-bmc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -481,7 +481,7 @@ static struct platform_driver bt_bmc_driver = {
481481
.of_match_table = bt_bmc_match,
482482
},
483483
.probe = bt_bmc_probe,
484-
.remove_new = bt_bmc_remove,
484+
.remove = bt_bmc_remove,
485485
};
486486

487487
module_platform_driver(bt_bmc_driver);

drivers/char/ipmi/ipmi_powernv.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ static struct platform_driver powernv_ipmi_driver = {
302302
.of_match_table = ipmi_powernv_match,
303303
},
304304
.probe = ipmi_powernv_probe,
305-
.remove_new = ipmi_powernv_remove,
305+
.remove = ipmi_powernv_remove,
306306
};
307307

308308

drivers/char/ipmi/ipmi_si_platform.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -445,7 +445,7 @@ struct platform_driver ipmi_platform_driver = {
445445
.acpi_match_table = ACPI_PTR(acpi_ipmi_match),
446446
},
447447
.probe = ipmi_probe,
448-
.remove_new = ipmi_remove,
448+
.remove = ipmi_remove,
449449
.id_table = si_plat_ids
450450
};
451451

drivers/char/ipmi/ipmi_ssif.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2114,7 +2114,7 @@ static struct platform_driver ipmi_driver = {
21142114
.name = DEVICE_NAME,
21152115
},
21162116
.probe = ssif_platform_probe,
2117-
.remove_new = ssif_platform_remove,
2117+
.remove = ssif_platform_remove,
21182118
.id_table = ssif_plat_ids
21192119
};
21202120

drivers/char/ipmi/kcs_bmc_aspeed.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -672,7 +672,7 @@ static struct platform_driver ast_kcs_bmc_driver = {
672672
.of_match_table = ast_kcs_bmc_match,
673673
},
674674
.probe = aspeed_kcs_probe,
675-
.remove_new = aspeed_kcs_remove,
675+
.remove = aspeed_kcs_remove,
676676
};
677677
module_platform_driver(ast_kcs_bmc_driver);
678678

drivers/char/ipmi/kcs_bmc_npcm7xx.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ static struct platform_driver npcm_kcs_bmc_driver = {
241241
.of_match_table = npcm_kcs_bmc_match,
242242
},
243243
.probe = npcm7xx_kcs_probe,
244-
.remove_new = npcm7xx_kcs_remove,
244+
.remove = npcm7xx_kcs_remove,
245245
};
246246
module_platform_driver(npcm_kcs_bmc_driver);
247247

0 commit comments

Comments
 (0)