Skip to content

Commit ebf7f7d

Browse files
committed
Revert "ptp: Switch back to struct platform_driver::remove()"
This reverts commit b32913a. Linus applied directly commit e70140b ("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 <[email protected]>
1 parent e8e7be7 commit ebf7f7d

File tree

7 files changed

+9
-9
lines changed

7 files changed

+9
-9
lines changed

drivers/ptp/ptp_clockmatrix.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2471,7 +2471,7 @@ static struct platform_driver idtcm_driver = {
24712471
.name = "8a3400x-phc",
24722472
},
24732473
.probe = idtcm_probe,
2474-
.remove = idtcm_remove,
2474+
.remove_new = idtcm_remove,
24752475
};
24762476

24772477
module_platform_driver(idtcm_driver);

drivers/ptp/ptp_dte.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -326,8 +326,8 @@ static struct platform_driver ptp_dte_driver = {
326326
.pm = PTP_DTE_PM_OPS,
327327
.of_match_table = ptp_dte_of_match,
328328
},
329-
.probe = ptp_dte_probe,
330-
.remove = ptp_dte_remove,
329+
.probe = ptp_dte_probe,
330+
.remove_new = ptp_dte_remove,
331331
};
332332
module_platform_driver(ptp_dte_driver);
333333

drivers/ptp/ptp_fc3.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1003,7 +1003,7 @@ static struct platform_driver idtfc3_driver = {
10031003
.name = "rc38xxx-phc",
10041004
},
10051005
.probe = idtfc3_probe,
1006-
.remove = idtfc3_remove,
1006+
.remove_new = idtfc3_remove,
10071007
};
10081008

10091009
module_platform_driver(idtfc3_driver);

drivers/ptp/ptp_idt82p33.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1461,7 +1461,7 @@ static struct platform_driver idt82p33_driver = {
14611461
.name = "82p33x1x-phc",
14621462
},
14631463
.probe = idt82p33_probe,
1464-
.remove = idt82p33_remove,
1464+
.remove_new = idt82p33_remove,
14651465
};
14661466

14671467
module_platform_driver(idt82p33_driver);

drivers/ptp/ptp_ines.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -781,8 +781,8 @@ static const struct of_device_id ines_ptp_ctrl_of_match[] = {
781781
MODULE_DEVICE_TABLE(of, ines_ptp_ctrl_of_match);
782782

783783
static struct platform_driver ines_ptp_ctrl_driver = {
784-
.probe = ines_ptp_ctrl_probe,
785-
.remove = ines_ptp_ctrl_remove,
784+
.probe = ines_ptp_ctrl_probe,
785+
.remove_new = ines_ptp_ctrl_remove,
786786
.driver = {
787787
.name = "ines_ptp_ctrl",
788788
.of_match_table = ines_ptp_ctrl_of_match,

drivers/ptp/ptp_qoriq.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -670,7 +670,7 @@ static struct platform_driver ptp_qoriq_driver = {
670670
.of_match_table = match_table,
671671
},
672672
.probe = ptp_qoriq_probe,
673-
.remove = ptp_qoriq_remove,
673+
.remove_new = ptp_qoriq_remove,
674674
};
675675

676676
module_platform_driver(ptp_qoriq_driver);

drivers/ptp/ptp_vmclock.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -601,7 +601,7 @@ MODULE_DEVICE_TABLE(acpi, vmclock_acpi_ids);
601601

602602
static struct platform_driver vmclock_platform_driver = {
603603
.probe = vmclock_probe,
604-
.remove = vmclock_remove,
604+
.remove_new = vmclock_remove,
605605
.driver = {
606606
.name = "vmclock",
607607
.acpi_match_table = vmclock_acpi_ids,

0 commit comments

Comments
 (0)