can: 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 can drivers 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>
Link: https://patch.msgid.link/20240909072742.381003-2-u.kleine-koenig@baylibre.com
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>

diff --git a/drivers/net/can/at91_can.c b/drivers/net/can/at91_can.c
index 11f434d708b35a61128edd9fa584a31dc16fea27..191707d7e3dac2b816575b9232178a171559a494 100644 (file)
--- a/drivers/net/can/at91_can.c
+++ b/drivers/net/can/at91_can.c
@@ -1191,7 +1191,7 @@ MODULE_DEVICE_TABLE(platform, at91_can_id_table);
 
 static struct platform_driver at91_can_driver = {
        .probe = at91_can_probe,
-       .remove_new = at91_can_remove,
+       .remove = at91_can_remove,
        .driver = {
                .name = KBUILD_MODNAME,
                .of_match_table = of_match_ptr(at91_can_dt_ids),

diff --git a/drivers/net/can/bxcan.c b/drivers/net/can/bxcan.c
index 49cf9682b9254c794bc15e3b01a5e9ad29b5a807..bfc60eb33dc3752722909c3cf6bffad29696f851 100644 (file)
--- a/drivers/net/can/bxcan.c
+++ b/drivers/net/can/bxcan.c
@@ -1092,7 +1092,7 @@ static struct platform_driver bxcan_driver = {
                .of_match_table = bxcan_of_match,
        },
        .probe = bxcan_probe,
-       .remove_new = bxcan_remove,
+       .remove = bxcan_remove,
 };
 
 module_platform_driver(bxcan_driver);

diff --git a/drivers/net/can/c_can/c_can_platform.c b/drivers/net/can/c_can/c_can_platform.c
index e2ec69aa46e53154217d75e09d5fc07c212ee73f..6cba9717a6d87db3d779a31afd6966162094f452 100644 (file)
--- a/drivers/net/can/c_can/c_can_platform.c
+++ b/drivers/net/can/c_can/c_can_platform.c
@@ -476,7 +476,7 @@ static struct platform_driver c_can_plat_driver = {
                .of_match_table = c_can_of_table,
        },
        .probe = c_can_plat_probe,
-       .remove_new = c_can_plat_remove,
+       .remove = c_can_plat_remove,
        .suspend = c_can_suspend,
        .resume = c_can_resume,
        .id_table = c_can_id_table,

diff --git a/drivers/net/can/cc770/cc770_isa.c b/drivers/net/can/cc770/cc770_isa.c
index 22009440a983ee3d602a99882603ea423b63a54e..d0676281715395eedd9d4a4f1c2961b3556af704 100644 (file)
--- a/drivers/net/can/cc770/cc770_isa.c
+++ b/drivers/net/can/cc770/cc770_isa.c
@@ -307,7 +307,7 @@ static void cc770_isa_remove(struct platform_device *pdev)
 
 static struct platform_driver cc770_isa_driver = {
        .probe = cc770_isa_probe,
-       .remove_new = cc770_isa_remove,
+       .remove = cc770_isa_remove,
        .driver = {
                .name = KBUILD_MODNAME,
        },

diff --git a/drivers/net/can/cc770/cc770_platform.c b/drivers/net/can/cc770/cc770_platform.c
index f2424fe58612e9729847aac324d9584370ab0c8a..b6c4f02ffb97aa918272ea9885f0be63d129f487 100644 (file)
--- a/drivers/net/can/cc770/cc770_platform.c
+++ b/drivers/net/can/cc770/cc770_platform.c
@@ -247,7 +247,7 @@ static struct platform_driver cc770_platform_driver = {
                .of_match_table = cc770_platform_table,
        },
        .probe = cc770_platform_probe,
-       .remove_new = cc770_platform_remove,
+       .remove = cc770_platform_remove,
 };
 
 module_platform_driver(cc770_platform_driver);

diff --git a/drivers/net/can/ctucanfd/ctucanfd_platform.c b/drivers/net/can/ctucanfd/ctucanfd_platform.c
index 55bb10b157b498107dc4722c3754be8479a731e6..70e2577c85416cc678084af1bed98e7da3c5fa4e 100644 (file)
--- a/drivers/net/can/ctucanfd/ctucanfd_platform.c
+++ b/drivers/net/can/ctucanfd/ctucanfd_platform.c
@@ -111,7 +111,7 @@ MODULE_DEVICE_TABLE(of, ctucan_of_match);
 
 static struct platform_driver ctucanfd_driver = {
        .probe  = ctucan_platform_probe,
-       .remove_new = ctucan_platform_remove,
+       .remove = ctucan_platform_remove,
        .driver = {
                .name = DRV_NAME,
                .pm = &ctucan_platform_pm_ops,

diff --git a/drivers/net/can/flexcan/flexcan-core.c b/drivers/net/can/flexcan/flexcan-core.c
index d1141102933052da267e96700148ce2ad074785b..ac1a860986df69a1dd64c25ff879490d5b21073b 100644 (file)
--- a/drivers/net/can/flexcan/flexcan-core.c
+++ b/drivers/net/can/flexcan/flexcan-core.c
@@ -2385,7 +2385,7 @@ static struct platform_driver flexcan_driver = {
                .of_match_table = flexcan_of_match,
        },
        .probe = flexcan_probe,
-       .remove_new = flexcan_remove,
+       .remove = flexcan_remove,
        .id_table = flexcan_id_table,
 };
 

diff --git a/drivers/net/can/grcan.c b/drivers/net/can/grcan.c
index 6d3ba71a6a733698aada1915384088c128a13fe2..cdf0ec9fa7f3c2102f776be3422fdb779df9fe7b 100644 (file)
--- a/drivers/net/can/grcan.c
+++ b/drivers/net/can/grcan.c
@@ -1725,7 +1725,7 @@ static struct platform_driver grcan_driver = {
                .of_match_table = grcan_match,
        },
        .probe = grcan_probe,
-       .remove_new = grcan_remove,
+       .remove = grcan_remove,
 };
 
 module_platform_driver(grcan_driver);

diff --git a/drivers/net/can/ifi_canfd/ifi_canfd.c b/drivers/net/can/ifi_canfd/ifi_canfd.c
index 72307297d75e4deb603bbae5a2362ccfe19fd2e2..d32b10900d2f621308922fb45b3a0eee3c313cfc 100644 (file)
--- a/drivers/net/can/ifi_canfd/ifi_canfd.c
+++ b/drivers/net/can/ifi_canfd/ifi_canfd.c
@@ -1033,7 +1033,7 @@ static struct platform_driver ifi_canfd_plat_driver = {
                .of_match_table = ifi_canfd_of_table,
        },
        .probe  = ifi_canfd_plat_probe,
-       .remove_new = ifi_canfd_plat_remove,
+       .remove = ifi_canfd_plat_remove,
 };
 
 module_platform_driver(ifi_canfd_plat_driver);

diff --git a/drivers/net/can/janz-ican3.c b/drivers/net/can/janz-ican3.c
index d048ea565b89252e859b8f4be70016b8369caf7f..60c7b83b4539e1f83dfdc932997b9075a051bfd6 100644 (file)
--- a/drivers/net/can/janz-ican3.c
+++ b/drivers/net/can/janz-ican3.c
@@ -2049,7 +2049,7 @@ static struct platform_driver ican3_driver = {
                .name   = DRV_NAME,
        },
        .probe          = ican3_probe,
-       .remove_new     = ican3_remove,
+       .remove         = ican3_remove,
 };
 
 module_platform_driver(ican3_driver);

diff --git a/drivers/net/can/m_can/m_can_platform.c b/drivers/net/can/m_can/m_can_platform.c
index 983ab80260ddbfc2bd4afcb696f68c2746f3465a..b832566efda042929486578fad1879c7ad4a0cff 100644 (file)
--- a/drivers/net/can/m_can/m_can_platform.c
+++ b/drivers/net/can/m_can/m_can_platform.c
@@ -231,7 +231,7 @@ static struct platform_driver m_can_plat_driver = {
                .pm     = &m_can_pmops,
        },
        .probe = m_can_plat_probe,
-       .remove_new = m_can_plat_remove,
+       .remove = m_can_plat_remove,
 };
 
 module_platform_driver(m_can_plat_driver);

diff --git a/drivers/net/can/mscan/mpc5xxx_can.c b/drivers/net/can/mscan/mpc5xxx_can.c
index 5b3d69c3b6b66fe1f4cb10a42db9120ebecdea6f..0080c39ee182cfd6a18f572f9ca04e3f5c35b994 100644 (file)
--- a/drivers/net/can/mscan/mpc5xxx_can.c
+++ b/drivers/net/can/mscan/mpc5xxx_can.c
@@ -435,7 +435,7 @@ static struct platform_driver mpc5xxx_can_driver = {
                .of_match_table = mpc5xxx_can_table,
        },
        .probe = mpc5xxx_can_probe,
-       .remove_new = mpc5xxx_can_remove,
+       .remove = mpc5xxx_can_remove,
 #ifdef CONFIG_PM
        .suspend = mpc5xxx_can_suspend,
        .resume = mpc5xxx_can_resume,

diff --git a/drivers/net/can/rcar/rcar_can.c b/drivers/net/can/rcar/rcar_can.c
index f5aa5dbacaf21fc6ebcb71b1ac73599374b3ef3b..2b7dd359f27b7dd8b7015838e55379e8eee17ec5 100644 (file)
--- a/drivers/net/can/rcar/rcar_can.c
+++ b/drivers/net/can/rcar/rcar_can.c
@@ -907,7 +907,7 @@ static struct platform_driver rcar_can_driver = {
                .pm = &rcar_can_pm_ops,
        },
        .probe = rcar_can_probe,
-       .remove_new = rcar_can_remove,
+       .remove = rcar_can_remove,
 };
 
 module_platform_driver(rcar_can_driver);

diff --git a/drivers/net/can/rcar/rcar_canfd.c b/drivers/net/can/rcar/rcar_canfd.c
index c919668bbe7a55418e4dbe0d83d0d85b921e933a..df1a5d0b37b226ffac5da9e1f4ef2831801914fa 100644 (file)
--- a/drivers/net/can/rcar/rcar_canfd.c
+++ b/drivers/net/can/rcar/rcar_canfd.c
@@ -2118,7 +2118,7 @@ static struct platform_driver rcar_canfd_driver = {
                .pm = &rcar_canfd_pm_ops,
        },
        .probe = rcar_canfd_probe,
-       .remove_new = rcar_canfd_remove,
+       .remove = rcar_canfd_remove,
 };
 
 module_platform_driver(rcar_canfd_driver);

diff --git a/drivers/net/can/sja1000/sja1000_isa.c b/drivers/net/can/sja1000/sja1000_isa.c
index fca5a9a1d85792a6aad1610d7c81ac8d25a40851..2d1f715459d75a8950f53b96bf5f0a4d36b1580f 100644 (file)
--- a/drivers/net/can/sja1000/sja1000_isa.c
+++ b/drivers/net/can/sja1000/sja1000_isa.c
@@ -245,7 +245,7 @@ static void sja1000_isa_remove(struct platform_device *pdev)
 
 static struct platform_driver sja1000_isa_driver = {
        .probe = sja1000_isa_probe,
-       .remove_new = sja1000_isa_remove,
+       .remove = sja1000_isa_remove,
        .driver = {
                .name = DRV_NAME,
        },

diff --git a/drivers/net/can/sja1000/sja1000_platform.c b/drivers/net/can/sja1000/sja1000_platform.c
index 33f0e46ab1c2f5ae509180454e84923eaf1c64b9..c42ebe9da55abc780891c7b7cb37c7527b22b7e9 100644 (file)
--- a/drivers/net/can/sja1000/sja1000_platform.c
+++ b/drivers/net/can/sja1000/sja1000_platform.c
@@ -329,7 +329,7 @@ static void sp_remove(struct platform_device *pdev)
 
 static struct platform_driver sp_driver = {
        .probe = sp_probe,
-       .remove_new = sp_remove,
+       .remove = sp_remove,
        .driver = {
                .name = DRV_NAME,
                .of_match_table = sp_of_table,

diff --git a/drivers/net/can/softing/softing_main.c b/drivers/net/can/softing/softing_main.c
index bd25137062c5e60d3b3bb27191abd437bc2d8312..278ee8722770c252a2df20c7f3cd61a895a31b59 100644 (file)
--- a/drivers/net/can/softing/softing_main.c
+++ b/drivers/net/can/softing/softing_main.c
@@ -854,7 +854,7 @@ static struct platform_driver softing_driver = {
                .name = KBUILD_MODNAME,
        },
        .probe = softing_pdev_probe,
-       .remove_new = softing_pdev_remove,
+       .remove = softing_pdev_remove,
 };
 
 module_platform_driver(softing_driver);

diff --git a/drivers/net/can/sun4i_can.c b/drivers/net/can/sun4i_can.c
index ab8d017846869d36397c5df83fa3cbf255f6cf13..360158c295d348efc5547826f7dbf9c848bb80a9 100644 (file)
--- a/drivers/net/can/sun4i_can.c
+++ b/drivers/net/can/sun4i_can.c
@@ -914,7 +914,7 @@ static struct platform_driver sun4i_can_driver = {
                .of_match_table = sun4ican_of_match,
        },
        .probe = sun4ican_probe,
-       .remove_new = sun4ican_remove,
+       .remove = sun4ican_remove,
 };
 
 module_platform_driver(sun4i_can_driver);

diff --git a/drivers/net/can/ti_hecc.c b/drivers/net/can/ti_hecc.c
index 5aab440074c690e36eab868e9e456355a3c608c2..644e8b8eb91e74eec050841491f20d3e6796e9b7 100644 (file)
--- a/drivers/net/can/ti_hecc.c
+++ b/drivers/net/can/ti_hecc.c
@@ -1025,7 +1025,7 @@ static struct platform_driver ti_hecc_driver = {
                .of_match_table = ti_hecc_dt_ids,
        },
        .probe = ti_hecc_probe,
-       .remove_new = ti_hecc_remove,
+       .remove = ti_hecc_remove,
        .suspend = ti_hecc_suspend,
        .resume = ti_hecc_resume,
 };

diff --git a/drivers/net/can/xilinx_can.c b/drivers/net/can/xilinx_can.c
index d944911d7f0534aebff7a60fbf8c4ece9d9dee09..436c0e4b0344c7fef1579fd5a0c9543081365b2a 100644 (file)
--- a/drivers/net/can/xilinx_can.c
+++ b/drivers/net/can/xilinx_can.c
@@ -2103,7 +2103,7 @@ static void xcan_remove(struct platform_device *pdev)
 
 static struct platform_driver xcan_driver = {
        .probe = xcan_probe,
-       .remove_new = xcan_remove,
+       .remove = xcan_remove,
        .driver = {
                .name = DRIVER_NAME,
                .pm = &xcan_dev_pm_ops,