Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
phy: 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 below drivers/phy/ 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.
While touching these files, make indention of the struct initializer
consistent in several files.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@baylibre.com>
Link: https://lore.kernel.org/r/20241009065307.504930-2-u.kleine-koenig@baylibre.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>
authored by
Uwe Kleine-König
and committed by
Vinod Koul
54234e3a
2ac03d08
+59
-59
+4
-4
drivers/phy/allwinner/phy-sun4i-usb.c
+4
-4
drivers/phy/allwinner/phy-sun4i-usb.c
···
1049
1049
MODULE_DEVICE_TABLE(of, sun4i_usb_phy_of_match);
1050
1050
1051
1051
static struct platform_driver sun4i_usb_phy_driver = {
1052
-
.probe = sun4i_usb_phy_probe,
1053
-
.remove_new = sun4i_usb_phy_remove,
1052
+
.probe = sun4i_usb_phy_probe,
1053
+
.remove = sun4i_usb_phy_remove,
1054
1054
.driver = {
1055
-
.of_match_table = sun4i_usb_phy_of_match,
1056
-
.name = "sun4i-usb-phy",
1055
+
.of_match_table= sun4i_usb_phy_of_match,
1056
+
.name = "sun4i-usb-phy",
1057
1057
}
1058
1058
};
1059
1059
module_platform_driver(sun4i_usb_phy_driver);
+1
-1
drivers/phy/broadcom/phy-brcm-usb.c
+1
-1
drivers/phy/broadcom/phy-brcm-usb.c
+1
-1
drivers/phy/cadence/cdns-dphy.c
+1
-1
drivers/phy/cadence/cdns-dphy.c
+1
-1
drivers/phy/cadence/phy-cadence-sierra.c
+1
-1
drivers/phy/cadence/phy-cadence-sierra.c
···
2730
2730
2731
2731
static struct platform_driver cdns_sierra_driver = {
2732
2732
.probe = cdns_sierra_phy_probe,
2733
-
.remove_new = cdns_sierra_phy_remove,
2733
+
.remove = cdns_sierra_phy_remove,
2734
2734
.driver = {
2735
2735
.name = "cdns-sierra-phy",
2736
2736
.of_match_table = cdns_sierra_id_table,
+2
-2
drivers/phy/cadence/phy-cadence-torrent.c
+2
-2
drivers/phy/cadence/phy-cadence-torrent.c
···
5440
5440
5441
5441
static struct platform_driver cdns_torrent_phy_driver = {
5442
5442
.probe = cdns_torrent_phy_probe,
5443
-
.remove_new = cdns_torrent_phy_remove,
5444
-
.driver = {
5443
+
.remove = cdns_torrent_phy_remove,
5444
+
.driver = {
5445
5445
.name = "cdns-torrent-phy",
5446
5446
.of_match_table = cdns_torrent_phy_of_match,
5447
5447
.pm = pm_sleep_ptr(&cdns_torrent_phy_pm_ops),
+3
-3
drivers/phy/freescale/phy-fsl-imx8qm-lvds-phy.c
+3
-3
drivers/phy/freescale/phy-fsl-imx8qm-lvds-phy.c
···
433
433
MODULE_DEVICE_TABLE(of, mixel_lvds_phy_of_match);
434
434
435
435
static struct platform_driver mixel_lvds_phy_driver = {
436
-
.probe = mixel_lvds_phy_probe,
437
-
.remove_new = mixel_lvds_phy_remove,
436
+
.probe = mixel_lvds_phy_probe,
437
+
.remove = mixel_lvds_phy_remove,
438
438
.driver = {
439
439
.pm = &mixel_lvds_phy_pm_ops,
440
440
.name = "mixel-lvds-phy",
441
-
.of_match_table = mixel_lvds_phy_of_match,
441
+
.of_match_table = mixel_lvds_phy_of_match,
442
442
}
443
443
};
444
444
module_platform_driver(mixel_lvds_phy_driver);
+3
-3
drivers/phy/freescale/phy-fsl-lynx-28g.c
+3
-3
drivers/phy/freescale/phy-fsl-lynx-28g.c
···
631
631
MODULE_DEVICE_TABLE(of, lynx_28g_of_match_table);
632
632
633
633
static struct platform_driver lynx_28g_driver = {
634
-
.probe = lynx_28g_probe,
635
-
.remove_new = lynx_28g_remove,
636
-
.driver = {
634
+
.probe = lynx_28g_probe,
635
+
.remove = lynx_28g_remove,
636
+
.driver = {
637
637
.name = "lynx-28g",
638
638
.of_match_table = lynx_28g_of_match_table,
639
639
},
+2
-2
drivers/phy/freescale/phy-fsl-samsung-hdmi.c
+2
-2
drivers/phy/freescale/phy-fsl-samsung-hdmi.c
···
749
749
MODULE_DEVICE_TABLE(of, fsl_samsung_hdmi_phy_of_match);
750
750
751
751
static struct platform_driver fsl_samsung_hdmi_phy_driver = {
752
-
.probe = fsl_samsung_hdmi_phy_probe,
753
-
.remove_new = fsl_samsung_hdmi_phy_remove,
752
+
.probe = fsl_samsung_hdmi_phy_probe,
753
+
.remove = fsl_samsung_hdmi_phy_remove,
754
754
.driver = {
755
755
.name = "fsl-samsung-hdmi-phy",
756
756
.of_match_table = fsl_samsung_hdmi_phy_of_match,
+1
-1
drivers/phy/intel/phy-intel-lgm-combo.c
+1
-1
drivers/phy/intel/phy-intel-lgm-combo.c
+1
-1
drivers/phy/motorola/phy-cpcap-usb.c
+1
-1
drivers/phy/motorola/phy-cpcap-usb.c
···
704
704
705
705
static struct platform_driver cpcap_usb_phy_driver = {
706
706
.probe = cpcap_usb_phy_probe,
707
-
.remove_new = cpcap_usb_phy_remove,
707
+
.remove = cpcap_usb_phy_remove,
708
708
.driver = {
709
709
.name = "cpcap-usb-phy",
710
710
.of_match_table = of_match_ptr(cpcap_usb_phy_id_table),
+1
-1
drivers/phy/motorola/phy-mapphone-mdm6600.c
+1
-1
drivers/phy/motorola/phy-mapphone-mdm6600.c
+1
-1
drivers/phy/phy-lgm-usb.c
+1
-1
drivers/phy/phy-lgm-usb.c
+5
-5
drivers/phy/qualcomm/phy-qcom-apq8064-sata.c
+5
-5
drivers/phy/qualcomm/phy-qcom-apq8064-sata.c
···
257
257
MODULE_DEVICE_TABLE(of, qcom_apq8064_sata_phy_of_match);
258
258
259
259
static struct platform_driver qcom_apq8064_sata_phy_driver = {
260
-
.probe = qcom_apq8064_sata_phy_probe,
261
-
.remove_new = qcom_apq8064_sata_phy_remove,
260
+
.probe = qcom_apq8064_sata_phy_probe,
261
+
.remove = qcom_apq8064_sata_phy_remove,
262
262
.driver = {
263
-
.name = "qcom-apq8064-sata-phy",
264
-
.of_match_table = qcom_apq8064_sata_phy_of_match,
265
-
}
263
+
.name = "qcom-apq8064-sata-phy",
264
+
.of_match_table = qcom_apq8064_sata_phy_of_match,
265
+
},
266
266
};
267
267
module_platform_driver(qcom_apq8064_sata_phy_driver);
268
268
+1
-1
drivers/phy/qualcomm/phy-qcom-eusb2-repeater.c
+1
-1
drivers/phy/qualcomm/phy-qcom-eusb2-repeater.c
···
294
294
295
295
static struct platform_driver eusb2_repeater_driver = {
296
296
.probe = eusb2_repeater_probe,
297
-
.remove_new = eusb2_repeater_remove,
297
+
.remove = eusb2_repeater_remove,
298
298
.driver = {
299
299
.name = "qcom-eusb2-repeater",
300
300
.of_match_table = eusb2_repeater_of_match_table,
+4
-4
drivers/phy/qualcomm/phy-qcom-ipq806x-sata.c
+4
-4
drivers/phy/qualcomm/phy-qcom-ipq806x-sata.c
···
184
184
MODULE_DEVICE_TABLE(of, qcom_ipq806x_sata_phy_of_match);
185
185
186
186
static struct platform_driver qcom_ipq806x_sata_phy_driver = {
187
-
.probe = qcom_ipq806x_sata_phy_probe,
188
-
.remove_new = qcom_ipq806x_sata_phy_remove,
187
+
.probe = qcom_ipq806x_sata_phy_probe,
188
+
.remove = qcom_ipq806x_sata_phy_remove,
189
189
.driver = {
190
-
.name = "qcom-ipq806x-sata-phy",
191
-
.of_match_table = qcom_ipq806x_sata_phy_of_match,
190
+
.name = "qcom-ipq806x-sata-phy",
191
+
.of_match_table = qcom_ipq806x_sata_phy_of_match,
192
192
}
193
193
};
194
194
module_platform_driver(qcom_ipq806x_sata_phy_driver);
+1
-1
drivers/phy/realtek/phy-rtk-usb2.c
+1
-1
drivers/phy/realtek/phy-rtk-usb2.c
+1
-1
drivers/phy/realtek/phy-rtk-usb3.c
+1
-1
drivers/phy/realtek/phy-rtk-usb3.c
+4
-4
drivers/phy/renesas/phy-rcar-gen3-pcie.c
+4
-4
drivers/phy/renesas/phy-rcar-gen3-pcie.c
···
132
132
133
133
static struct platform_driver rcar_gen3_phy_driver = {
134
134
.driver = {
135
-
.name = "phy_rcar_gen3_pcie",
136
-
.of_match_table = rcar_gen3_phy_pcie_match_table,
135
+
.name = "phy_rcar_gen3_pcie",
136
+
.of_match_table = rcar_gen3_phy_pcie_match_table,
137
137
},
138
-
.probe = rcar_gen3_phy_pcie_probe,
139
-
.remove_new = rcar_gen3_phy_pcie_remove,
138
+
.probe = rcar_gen3_phy_pcie_probe,
139
+
.remove = rcar_gen3_phy_pcie_remove,
140
140
};
141
141
142
142
module_platform_driver(rcar_gen3_phy_driver);
+1
-1
drivers/phy/renesas/phy-rcar-gen3-usb2.c
+1
-1
drivers/phy/renesas/phy-rcar-gen3-usb2.c
+4
-4
drivers/phy/renesas/phy-rcar-gen3-usb3.c
+4
-4
drivers/phy/renesas/phy-rcar-gen3-usb3.c
···
206
206
207
207
static struct platform_driver rcar_gen3_phy_usb3_driver = {
208
208
.driver = {
209
-
.name = "phy_rcar_gen3_usb3",
210
-
.of_match_table = rcar_gen3_phy_usb3_match_table,
209
+
.name = "phy_rcar_gen3_usb3",
210
+
.of_match_table = rcar_gen3_phy_usb3_match_table,
211
211
},
212
-
.probe = rcar_gen3_phy_usb3_probe,
213
-
.remove_new = rcar_gen3_phy_usb3_remove,
212
+
.probe = rcar_gen3_phy_usb3_probe,
213
+
.remove = rcar_gen3_phy_usb3_remove,
214
214
};
215
215
module_platform_driver(rcar_gen3_phy_usb3_driver);
216
216
+1
-1
drivers/phy/renesas/r8a779f0-ether-serdes.c
+1
-1
drivers/phy/renesas/r8a779f0-ether-serdes.c
···
404
404
405
405
static struct platform_driver r8a779f0_eth_serdes_driver_platform = {
406
406
.probe = r8a779f0_eth_serdes_probe,
407
-
.remove_new = r8a779f0_eth_serdes_remove,
407
+
.remove = r8a779f0_eth_serdes_remove,
408
408
.driver = {
409
409
.name = "r8a779f0_eth_serdes",
410
410
.of_match_table = r8a779f0_eth_serdes_of_table,
+1
-1
drivers/phy/rockchip/phy-rockchip-inno-csidphy.c
+1
-1
drivers/phy/rockchip/phy-rockchip-inno-csidphy.c
+1
-1
drivers/phy/rockchip/phy-rockchip-inno-dsidphy.c
+1
-1
drivers/phy/rockchip/phy-rockchip-inno-dsidphy.c
+2
-2
drivers/phy/rockchip/phy-rockchip-inno-hdmi.c
+2
-2
drivers/phy/rockchip/phy-rockchip-inno-hdmi.c
···
1424
1424
MODULE_DEVICE_TABLE(of, inno_hdmi_phy_of_match);
1425
1425
1426
1426
static struct platform_driver inno_hdmi_phy_driver = {
1427
-
.probe = inno_hdmi_phy_probe,
1428
-
.remove_new = inno_hdmi_phy_remove,
1427
+
.probe = inno_hdmi_phy_probe,
1428
+
.remove = inno_hdmi_phy_remove,
1429
1429
.driver = {
1430
1430
.name = "inno-hdmi-phy",
1431
1431
.of_match_table = inno_hdmi_phy_of_match,
+1
-1
drivers/phy/rockchip/phy-rockchip-typec.c
+1
-1
drivers/phy/rockchip/phy-rockchip-typec.c
···
1210
1210
1211
1211
static struct platform_driver rockchip_typec_phy_driver = {
1212
1212
.probe = rockchip_typec_phy_probe,
1213
-
.remove_new = rockchip_typec_phy_remove,
1213
+
.remove = rockchip_typec_phy_remove,
1214
1214
.driver = {
1215
1215
.name = "rockchip-typec-phy",
1216
1216
.of_match_table = rockchip_typec_phy_dt_ids,
+1
-1
drivers/phy/st/phy-stm32-usbphyc.c
+1
-1
drivers/phy/st/phy-stm32-usbphyc.c
+1
-1
drivers/phy/tegra/xusb.c
+1
-1
drivers/phy/tegra/xusb.c
+1
-1
drivers/phy/ti/phy-am654-serdes.c
+1
-1
drivers/phy/ti/phy-am654-serdes.c
+2
-2
drivers/phy/ti/phy-da8xx-usb.c
+2
-2
drivers/phy/ti/phy-da8xx-usb.c
···
277
277
278
278
static struct platform_driver da8xx_usb_phy_driver = {
279
279
.probe = da8xx_usb_phy_probe,
280
-
.remove_new = da8xx_usb_phy_remove,
280
+
.remove = da8xx_usb_phy_remove,
281
281
.driver = {
282
282
.name = "da8xx-usb-phy",
283
283
.pm = &da8xx_usb_phy_pm_ops,
284
-
.of_match_table = da8xx_usb_phy_ids,
284
+
.of_match_table = da8xx_usb_phy_ids,
285
285
},
286
286
};
287
287
+1
-1
drivers/phy/ti/phy-dm816x-usb.c
+1
-1
drivers/phy/ti/phy-dm816x-usb.c
+1
-1
drivers/phy/ti/phy-j721e-wiz.c
+1
-1
drivers/phy/ti/phy-j721e-wiz.c
+1
-1
drivers/phy/ti/phy-omap-usb2.c
+1
-1
drivers/phy/ti/phy-omap-usb2.c
+1
-1
drivers/phy/ti/phy-ti-pipe3.c
+1
-1
drivers/phy/ti/phy-ti-pipe3.c
+1
-1
drivers/phy/ti/phy-twl4030-usb.c
+1
-1
drivers/phy/ti/phy-twl4030-usb.c
+1
-1
drivers/phy/xilinx/phy-zynqmp.c
+1
-1
drivers/phy/xilinx/phy-zynqmp.c