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

This reverts commit b32913a5609a36c230e9b091da26d38f8e80a056.

Linus applied directly commit e70140ba0d2b ("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>

diff --git a/drivers/ptp/ptp_clockmatrix.c b/drivers/ptp/ptp_clockmatrix.c
index fbb3fa8fc60b2f6571519491620ace7d7a9f8a1a..b6f1941308b17ac6a65be6ef1269ccc40ca8fc4e 100644 (file)
--- a/drivers/ptp/ptp_clockmatrix.c
+++ b/drivers/ptp/ptp_clockmatrix.c
@@ -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);

diff --git a/drivers/ptp/ptp_dte.c b/drivers/ptp/ptp_dte.c
index 372168578a30d8dd92ee0ef900d71752f78c73a3..449ff90927beb0044d799ccec12455f24f6ef73f 100644 (file)
--- a/drivers/ptp/ptp_dte.c
+++ b/drivers/ptp/ptp_dte.c
@@ -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);
 

diff --git a/drivers/ptp/ptp_fc3.c b/drivers/ptp/ptp_fc3.c
index cfced36c70bcb2bca4bfd21b9524c32c4999dba9..879b82f03535256ad55f785a61053a9f4be50c8c 100644 (file)
--- a/drivers/ptp/ptp_fc3.c
+++ b/drivers/ptp/ptp_fc3.c
@@ -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);

diff --git a/drivers/ptp/ptp_idt82p33.c b/drivers/ptp/ptp_idt82p33.c
index b2fd94d4f863129a5fccbb1233ce0c94602de2a5..d5732490ed9d16641e1bd1bcfbe1e04dd96b0f27 100644 (file)
--- a/drivers/ptp/ptp_idt82p33.c
+++ b/drivers/ptp/ptp_idt82p33.c
@@ -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);

diff --git a/drivers/ptp/ptp_ines.c b/drivers/ptp/ptp_ines.c
index 3d723a2aa6bb0ccf3cbdf2224418cba404b42fc8..14a23d3a27f2c9f261151fbe7f40b0a302863099 100644 (file)
--- a/drivers/ptp/ptp_ines.c
+++ b/drivers/ptp/ptp_ines.c
@@ -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,

diff --git a/drivers/ptp/ptp_qoriq.c b/drivers/ptp/ptp_qoriq.c
index 4d488c1f1941bf564ed41dbaf13644835a9daf2e..879cfc1537ac85c062575f75b6d4a628d809f9cb 100644 (file)
--- a/drivers/ptp/ptp_qoriq.c
+++ b/drivers/ptp/ptp_qoriq.c
@@ -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);

diff --git a/drivers/ptp/ptp_vmclock.c b/drivers/ptp/ptp_vmclock.c
index 0a2cfc8ad3c5408a87fd8fedeff274ab895de3dd..cdca8a3ad1aa1432015a8a50e50da31ccea8dd50 100644 (file)
--- a/drivers/ptp/ptp_vmclock.c
+++ b/drivers/ptp/ptp_vmclock.c
@@ -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,