ptp: 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/ptp 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 drivers, make the alignment of the touched
initializers consistent.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@baylibre.com>
Acked-by: Richard Cochran <richardcochran@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 b6f1941308b17ac6a65be6ef1269ccc40ca8fc4e..fbb3fa8fc60b2f6571519491620ace7d7a9f8a1a 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_new = idtcm_remove,
+       .remove = idtcm_remove,
 };
 
 module_platform_driver(idtcm_driver);

diff --git a/drivers/ptp/ptp_dte.c b/drivers/ptp/ptp_dte.c
index 449ff90927beb0044d799ccec12455f24f6ef73f..372168578a30d8dd92ee0ef900d71752f78c73a3 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_new = ptp_dte_remove,
+       .probe = ptp_dte_probe,
+       .remove = ptp_dte_remove,
 };
 module_platform_driver(ptp_dte_driver);
 

diff --git a/drivers/ptp/ptp_fc3.c b/drivers/ptp/ptp_fc3.c
index 879b82f03535256ad55f785a61053a9f4be50c8c..cfced36c70bcb2bca4bfd21b9524c32c4999dba9 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_new = idtfc3_remove,
+       .remove = idtfc3_remove,
 };
 
 module_platform_driver(idtfc3_driver);

diff --git a/drivers/ptp/ptp_idt82p33.c b/drivers/ptp/ptp_idt82p33.c
index d5732490ed9d16641e1bd1bcfbe1e04dd96b0f27..b2fd94d4f863129a5fccbb1233ce0c94602de2a5 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_new = idt82p33_remove,
+       .remove = idt82p33_remove,
 };
 
 module_platform_driver(idt82p33_driver);

diff --git a/drivers/ptp/ptp_ines.c b/drivers/ptp/ptp_ines.c
index 14a23d3a27f2c9f261151fbe7f40b0a302863099..3d723a2aa6bb0ccf3cbdf2224418cba404b42fc8 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_new = ines_ptp_ctrl_remove,
+       .probe = ines_ptp_ctrl_probe,
+       .remove = 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 879cfc1537ac85c062575f75b6d4a628d809f9cb..4d488c1f1941bf564ed41dbaf13644835a9daf2e 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_new  = ptp_qoriq_remove,
+       .remove      = ptp_qoriq_remove,
 };
 
 module_platform_driver(ptp_qoriq_driver);

diff --git a/drivers/ptp/ptp_vmclock.c b/drivers/ptp/ptp_vmclock.c
index cdca8a3ad1aa1432015a8a50e50da31ccea8dd50..0a2cfc8ad3c5408a87fd8fedeff274ab895de3dd 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_new     = vmclock_remove,
+       .remove         = vmclock_remove,
        .driver = {
                .name   = "vmclock",
                .acpi_match_table = vmclock_acpi_ids,