char: Switch back to struct platform_driver::remove()

After commit 0edb555a65d1 ("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 <u.kleine-koenig@baylibre.com>
Acked-by: Eli Billauer <eli.billauer@gmail.com>
Link: https://lore.kernel.org/r/20241021104511.405661-2-u.kleine-koenig@baylibre.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/char/powernv-op-panel.c b/drivers/char/powernv-op-panel.c
index f2cff1a6fed520d1dce659e8ab348524f0dba8ee..53467b0a6187f5c2769b2165d8a085fd59559149 100644 (file)
--- a/drivers/char/powernv-op-panel.c
+++ b/drivers/char/powernv-op-panel.c
@@ -213,7 +213,7 @@ static struct platform_driver oppanel_driver = {
                .of_match_table = oppanel_match,
        },
        .probe  = oppanel_probe,
-       .remove_new = oppanel_remove,
+       .remove = oppanel_remove,
 };
 
 module_platform_driver(oppanel_driver);

diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c
index 0f8185e541ed478d359a64f8f533fd8ddcc8cd93..f887569fd3d0f0e9102a69692df519dd30a43976 100644 (file)
--- a/drivers/char/sonypi.c
+++ b/drivers/char/sonypi.c
@@ -1467,7 +1467,7 @@ static struct platform_driver sonypi_driver = {
                .pm     = SONYPI_PM,
        },
        .probe          = sonypi_probe,
-       .remove_new     = sonypi_remove,
+       .remove         = sonypi_remove,
        .shutdown       = sonypi_shutdown,
 };
 

diff --git a/drivers/char/xilinx_hwicap/xilinx_hwicap.c b/drivers/char/xilinx_hwicap/xilinx_hwicap.c
index 4f6c3cb8aa4138e6948d7b5971595d0dd4de07b7..34a345dc5e724df5b20bd52caab12bc85aba5c8c 100644 (file)
--- a/drivers/char/xilinx_hwicap/xilinx_hwicap.c
+++ b/drivers/char/xilinx_hwicap/xilinx_hwicap.c
@@ -738,7 +738,7 @@ MODULE_DEVICE_TABLE(of, hwicap_of_match);
 
 static struct platform_driver hwicap_platform_driver = {
        .probe = hwicap_drv_probe,
-       .remove_new = hwicap_drv_remove,
+       .remove = hwicap_drv_remove,
        .driver = {
                .name = DRIVER_NAME,
                .of_match_table = hwicap_of_match,

diff --git a/drivers/char/xillybus/xillybus_of.c b/drivers/char/xillybus/xillybus_of.c
index 8802e2a6fd20b779dfafa1708ad25cb109327843..1a1e64133315bc0fbfa12e66944c3bc97c6ca1cc 100644 (file)
--- a/drivers/char/xillybus/xillybus_of.c
+++ b/drivers/char/xillybus/xillybus_of.c
@@ -74,7 +74,7 @@ static void xilly_drv_remove(struct platform_device *op)
 
 static struct platform_driver xillybus_platform_driver = {
        .probe = xilly_drv_probe,
-       .remove_new = xilly_drv_remove,
+       .remove = xilly_drv_remove,
        .driver = {
                .name = xillyname,
                .of_match_table = xillybus_of_match,