Skip to content

Commit f36ee84

Browse files
ukleinekgregkh
authored andcommitted
char: 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 matched by the "CHAR and MISC DRIVERS" maintainer's entry 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]> Acked-by: Eli Billauer <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent d8da4f1 commit f36ee84

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

drivers/char/powernv-op-panel.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ static struct platform_driver oppanel_driver = {
213213
.of_match_table = oppanel_match,
214214
},
215215
.probe = oppanel_probe,
216-
.remove_new = oppanel_remove,
216+
.remove = oppanel_remove,
217217
};
218218

219219
module_platform_driver(oppanel_driver);

drivers/char/sonypi.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1467,7 +1467,7 @@ static struct platform_driver sonypi_driver = {
14671467
.pm = SONYPI_PM,
14681468
},
14691469
.probe = sonypi_probe,
1470-
.remove_new = sonypi_remove,
1470+
.remove = sonypi_remove,
14711471
.shutdown = sonypi_shutdown,
14721472
};
14731473

drivers/char/xilinx_hwicap/xilinx_hwicap.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -738,7 +738,7 @@ MODULE_DEVICE_TABLE(of, hwicap_of_match);
738738

739739
static struct platform_driver hwicap_platform_driver = {
740740
.probe = hwicap_drv_probe,
741-
.remove_new = hwicap_drv_remove,
741+
.remove = hwicap_drv_remove,
742742
.driver = {
743743
.name = DRIVER_NAME,
744744
.of_match_table = hwicap_of_match,

drivers/char/xillybus/xillybus_of.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ static void xilly_drv_remove(struct platform_device *op)
7474

7575
static struct platform_driver xillybus_platform_driver = {
7676
.probe = xilly_drv_probe,
77-
.remove_new = xilly_drv_remove,
77+
.remove = xilly_drv_remove,
7878
.driver = {
7979
.name = xillyname,
8080
.of_match_table = xillybus_of_match,

0 commit comments

Comments
 (0)