Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Uwe Kleine-König and committed by
Marc Kleine-Budde
221013af f3b6129b

+20 -20
+1 -1
drivers/net/can/at91_can.c
··· 1191 1191 1192 1192 static struct platform_driver at91_can_driver = { 1193 1193 .probe = at91_can_probe, 1194 - .remove_new = at91_can_remove, 1194 + .remove = at91_can_remove, 1195 1195 .driver = { 1196 1196 .name = KBUILD_MODNAME, 1197 1197 .of_match_table = of_match_ptr(at91_can_dt_ids),
+1 -1
drivers/net/can/bxcan.c
··· 1092 1092 .of_match_table = bxcan_of_match, 1093 1093 }, 1094 1094 .probe = bxcan_probe, 1095 - .remove_new = bxcan_remove, 1095 + .remove = bxcan_remove, 1096 1096 }; 1097 1097 1098 1098 module_platform_driver(bxcan_driver);
+1 -1
drivers/net/can/c_can/c_can_platform.c
··· 476 476 .of_match_table = c_can_of_table, 477 477 }, 478 478 .probe = c_can_plat_probe, 479 - .remove_new = c_can_plat_remove, 479 + .remove = c_can_plat_remove, 480 480 .suspend = c_can_suspend, 481 481 .resume = c_can_resume, 482 482 .id_table = c_can_id_table,
+1 -1
drivers/net/can/cc770/cc770_isa.c
··· 307 307 308 308 static struct platform_driver cc770_isa_driver = { 309 309 .probe = cc770_isa_probe, 310 - .remove_new = cc770_isa_remove, 310 + .remove = cc770_isa_remove, 311 311 .driver = { 312 312 .name = KBUILD_MODNAME, 313 313 },
+1 -1
drivers/net/can/cc770/cc770_platform.c
··· 247 247 .of_match_table = cc770_platform_table, 248 248 }, 249 249 .probe = cc770_platform_probe, 250 - .remove_new = cc770_platform_remove, 250 + .remove = cc770_platform_remove, 251 251 }; 252 252 253 253 module_platform_driver(cc770_platform_driver);
+1 -1
drivers/net/can/ctucanfd/ctucanfd_platform.c
··· 111 111 112 112 static struct platform_driver ctucanfd_driver = { 113 113 .probe = ctucan_platform_probe, 114 - .remove_new = ctucan_platform_remove, 114 + .remove = ctucan_platform_remove, 115 115 .driver = { 116 116 .name = DRV_NAME, 117 117 .pm = &ctucan_platform_pm_ops,
+1 -1
drivers/net/can/flexcan/flexcan-core.c
··· 2385 2385 .of_match_table = flexcan_of_match, 2386 2386 }, 2387 2387 .probe = flexcan_probe, 2388 - .remove_new = flexcan_remove, 2388 + .remove = flexcan_remove, 2389 2389 .id_table = flexcan_id_table, 2390 2390 }; 2391 2391
+1 -1
drivers/net/can/grcan.c
··· 1725 1725 .of_match_table = grcan_match, 1726 1726 }, 1727 1727 .probe = grcan_probe, 1728 - .remove_new = grcan_remove, 1728 + .remove = grcan_remove, 1729 1729 }; 1730 1730 1731 1731 module_platform_driver(grcan_driver);
+1 -1
drivers/net/can/ifi_canfd/ifi_canfd.c
··· 1033 1033 .of_match_table = ifi_canfd_of_table, 1034 1034 }, 1035 1035 .probe = ifi_canfd_plat_probe, 1036 - .remove_new = ifi_canfd_plat_remove, 1036 + .remove = ifi_canfd_plat_remove, 1037 1037 }; 1038 1038 1039 1039 module_platform_driver(ifi_canfd_plat_driver);
+1 -1
drivers/net/can/janz-ican3.c
··· 2049 2049 .name = DRV_NAME, 2050 2050 }, 2051 2051 .probe = ican3_probe, 2052 - .remove_new = ican3_remove, 2052 + .remove = ican3_remove, 2053 2053 }; 2054 2054 2055 2055 module_platform_driver(ican3_driver);
+1 -1
drivers/net/can/m_can/m_can_platform.c
··· 231 231 .pm = &m_can_pmops, 232 232 }, 233 233 .probe = m_can_plat_probe, 234 - .remove_new = m_can_plat_remove, 234 + .remove = m_can_plat_remove, 235 235 }; 236 236 237 237 module_platform_driver(m_can_plat_driver);
+1 -1
drivers/net/can/mscan/mpc5xxx_can.c
··· 435 435 .of_match_table = mpc5xxx_can_table, 436 436 }, 437 437 .probe = mpc5xxx_can_probe, 438 - .remove_new = mpc5xxx_can_remove, 438 + .remove = mpc5xxx_can_remove, 439 439 #ifdef CONFIG_PM 440 440 .suspend = mpc5xxx_can_suspend, 441 441 .resume = mpc5xxx_can_resume,
+1 -1
drivers/net/can/rcar/rcar_can.c
··· 907 907 .pm = &rcar_can_pm_ops, 908 908 }, 909 909 .probe = rcar_can_probe, 910 - .remove_new = rcar_can_remove, 910 + .remove = rcar_can_remove, 911 911 }; 912 912 913 913 module_platform_driver(rcar_can_driver);
+1 -1
drivers/net/can/rcar/rcar_canfd.c
··· 2118 2118 .pm = &rcar_canfd_pm_ops, 2119 2119 }, 2120 2120 .probe = rcar_canfd_probe, 2121 - .remove_new = rcar_canfd_remove, 2121 + .remove = rcar_canfd_remove, 2122 2122 }; 2123 2123 2124 2124 module_platform_driver(rcar_canfd_driver);
+1 -1
drivers/net/can/sja1000/sja1000_isa.c
··· 245 245 246 246 static struct platform_driver sja1000_isa_driver = { 247 247 .probe = sja1000_isa_probe, 248 - .remove_new = sja1000_isa_remove, 248 + .remove = sja1000_isa_remove, 249 249 .driver = { 250 250 .name = DRV_NAME, 251 251 },
+1 -1
drivers/net/can/sja1000/sja1000_platform.c
··· 329 329 330 330 static struct platform_driver sp_driver = { 331 331 .probe = sp_probe, 332 - .remove_new = sp_remove, 332 + .remove = sp_remove, 333 333 .driver = { 334 334 .name = DRV_NAME, 335 335 .of_match_table = sp_of_table,
+1 -1
drivers/net/can/softing/softing_main.c
··· 854 854 .name = KBUILD_MODNAME, 855 855 }, 856 856 .probe = softing_pdev_probe, 857 - .remove_new = softing_pdev_remove, 857 + .remove = softing_pdev_remove, 858 858 }; 859 859 860 860 module_platform_driver(softing_driver);
+1 -1
drivers/net/can/sun4i_can.c
··· 914 914 .of_match_table = sun4ican_of_match, 915 915 }, 916 916 .probe = sun4ican_probe, 917 - .remove_new = sun4ican_remove, 917 + .remove = sun4ican_remove, 918 918 }; 919 919 920 920 module_platform_driver(sun4i_can_driver);
+1 -1
drivers/net/can/ti_hecc.c
··· 1025 1025 .of_match_table = ti_hecc_dt_ids, 1026 1026 }, 1027 1027 .probe = ti_hecc_probe, 1028 - .remove_new = ti_hecc_remove, 1028 + .remove = ti_hecc_remove, 1029 1029 .suspend = ti_hecc_suspend, 1030 1030 .resume = ti_hecc_resume, 1031 1031 };
+1 -1
drivers/net/can/xilinx_can.c
··· 2103 2103 2104 2104 static struct platform_driver xcan_driver = { 2105 2105 .probe = xcan_probe, 2106 - .remove_new = xcan_remove, 2106 + .remove = xcan_remove, 2107 2107 .driver = { 2108 2108 .name = DRIVER_NAME, 2109 2109 .pm = &xcan_dev_pm_ops,