github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-28 00:53:34 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Revert "ptp: Switch back to struct platform_driver::remove()"

Browse Source 
This reverts commit b32913a560.

Linus applied directly commit e70140ba0d ("Get rid of 'remove_new'
relic from platform driver struct"), drop our local change to avoid
conflicts.

Link: https://lore.kernel.org/CAMuHMdV3J=o2x9G=1t_y97iv9eLsPfiej108vU6JHnn=AR-Nvw@mail.gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Jakub Kicinski 2024-12-03 17:16:43 -08:00
parent e8e7be7d21
commit ebf7f7d616
7 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/ptp/ptp_clockmatrix.c
View File

@ -2471,7 +2471,7 @@ static struct platform_driver idtcm_driver = {
.name = "8a3400x-phc",
},
.probe = idtcm_probe,
.remove = idtcm_remove,
.remove_new = idtcm_remove,
};
module_platform_driver(idtcm_driver);

4
drivers/ptp/ptp_dte.c
View File

@ -326,8 +326,8 @@ static struct platform_driver ptp_dte_driver = {
.pm = PTP_DTE_PM_OPS,
.of_match_table = ptp_dte_of_match,
},
.probe = ptp_dte_probe,
.remove = ptp_dte_remove,
.probe = ptp_dte_probe,
.remove_new = ptp_dte_remove,
};
module_platform_driver(ptp_dte_driver);

2
drivers/ptp/ptp_fc3.c
View File

@ -1003,7 +1003,7 @@ static struct platform_driver idtfc3_driver = {
.name = "rc38xxx-phc",
},
.probe = idtfc3_probe,
.remove = idtfc3_remove,
.remove_new = idtfc3_remove,
};
module_platform_driver(idtfc3_driver);

2
drivers/ptp/ptp_idt82p33.c
View File

@ -1461,7 +1461,7 @@ static struct platform_driver idt82p33_driver = {
.name = "82p33x1x-phc",
},
.probe = idt82p33_probe,
.remove = idt82p33_remove,
.remove_new = idt82p33_remove,
};
module_platform_driver(idt82p33_driver);

4
drivers/ptp/ptp_ines.c
View File

@ -781,8 +781,8 @@ static const struct of_device_id ines_ptp_ctrl_of_match[] = {
MODULE_DEVICE_TABLE(of, ines_ptp_ctrl_of_match);
static struct platform_driver ines_ptp_ctrl_driver = {
.probe = ines_ptp_ctrl_probe,
.remove = ines_ptp_ctrl_remove,
.probe = ines_ptp_ctrl_probe,
.remove_new = ines_ptp_ctrl_remove,
.driver = {
.name = "ines_ptp_ctrl",
.of_match_table = ines_ptp_ctrl_of_match,

2
drivers/ptp/ptp_qoriq.c
View File

@ -670,7 +670,7 @@ static struct platform_driver ptp_qoriq_driver = {
.of_match_table = match_table,
},
.probe = ptp_qoriq_probe,
.remove = ptp_qoriq_remove,
.remove_new = ptp_qoriq_remove,
};
module_platform_driver(ptp_qoriq_driver);

2
drivers/ptp/ptp_vmclock.c
View File

@ -601,7 +601,7 @@ MODULE_DEVICE_TABLE(acpi, vmclock_acpi_ids);
static struct platform_driver vmclock_platform_driver = {
.probe = vmclock_probe,
.remove = vmclock_remove,
.remove_new = vmclock_remove,
.driver = {
.name = "vmclock",
.acpi_match_table = vmclock_acpi_ids,