platform/chrome: 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/platform/chrome 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.

Signed-off-by: Uwe Kleine-König <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Tzung-Bi Shih <[email protected]>

diff --git a/drivers/platform/chrome/cros_ec_chardev.c b/drivers/platform/chrome/cros_ec_chardev.c
index 7f034ead7ae47c248e678c0c64fb3e2d44fcc28e..21a484385fc5dbdf191a4c313cefb8babafed708 100644 (file)
--- a/drivers/platform/chrome/cros_ec_chardev.c
+++ b/drivers/platform/chrome/cros_ec_chardev.c
@@ -415,7 +415,7 @@ static struct platform_driver cros_ec_chardev_driver = {
                .name = DRV_NAME,
        },
        .probe = cros_ec_chardev_probe,
-       .remove_new = cros_ec_chardev_remove,
+       .remove = cros_ec_chardev_remove,
        .id_table = cros_ec_chardev_id,
 };
 

diff --git a/drivers/platform/chrome/cros_ec_debugfs.c b/drivers/platform/chrome/cros_ec_debugfs.c
index 839154c46e46cd0bf1fbe470be60b49a726d8a8c..92ac9a2f9c88f61c094bd367966feda0db9b35a1 100644 (file)
--- a/drivers/platform/chrome/cros_ec_debugfs.c
+++ b/drivers/platform/chrome/cros_ec_debugfs.c
@@ -582,7 +582,7 @@ static struct platform_driver cros_ec_debugfs_driver = {
                .probe_type = PROBE_PREFER_ASYNCHRONOUS,
        },
        .probe = cros_ec_debugfs_probe,
-       .remove_new = cros_ec_debugfs_remove,
+       .remove = cros_ec_debugfs_remove,
        .id_table = cros_ec_debugfs_id,
 };
 

diff --git a/drivers/platform/chrome/cros_ec_lightbar.c b/drivers/platform/chrome/cros_ec_lightbar.c
index 1e69f61115a4d054abea36235035e0ce62210998..87634f6921b78aefc58277a14062868c9e2a0f2e 100644 (file)
--- a/drivers/platform/chrome/cros_ec_lightbar.c
+++ b/drivers/platform/chrome/cros_ec_lightbar.c
@@ -608,7 +608,7 @@ static struct platform_driver cros_ec_lightbar_driver = {
                .probe_type = PROBE_PREFER_ASYNCHRONOUS,
        },
        .probe = cros_ec_lightbar_probe,
-       .remove_new = cros_ec_lightbar_remove,
+       .remove = cros_ec_lightbar_remove,
        .id_table = cros_ec_lightbar_id,
 };
 

diff --git a/drivers/platform/chrome/cros_ec_lpc.c b/drivers/platform/chrome/cros_ec_lpc.c
index c784119ab5dc0c68d3339929cdb798e1fe10714d..924bf4d3cc77b9f27d415a10c61ae06886fa7f80 100644 (file)
--- a/drivers/platform/chrome/cros_ec_lpc.c
+++ b/drivers/platform/chrome/cros_ec_lpc.c
@@ -783,7 +783,7 @@ static struct platform_driver cros_ec_lpc_driver = {
                .probe_type = PROBE_FORCE_SYNCHRONOUS,
        },
        .probe = cros_ec_lpc_probe,
-       .remove_new = cros_ec_lpc_remove,
+       .remove = cros_ec_lpc_remove,
 };
 
 static struct platform_device cros_ec_lpc_device = {

diff --git a/drivers/platform/chrome/cros_ec_sysfs.c b/drivers/platform/chrome/cros_ec_sysfs.c
index 9c944146ee507d6a120967a1b18b09b36aa09d81..bc1a5ba0952815755cd9abe9d8880650a69539d9 100644 (file)
--- a/drivers/platform/chrome/cros_ec_sysfs.c
+++ b/drivers/platform/chrome/cros_ec_sysfs.c
@@ -359,7 +359,7 @@ static struct platform_driver cros_ec_sysfs_driver = {
                .name = DRV_NAME,
        },
        .probe = cros_ec_sysfs_probe,
-       .remove_new = cros_ec_sysfs_remove,
+       .remove = cros_ec_sysfs_remove,
        .id_table = cros_ec_sysfs_id,
 };
 

diff --git a/drivers/platform/chrome/cros_ec_typec.c b/drivers/platform/chrome/cros_ec_typec.c
index f1324466efac657a064cf48d4533aae20f371fbe..ae2f862969547ccb33b9b2107ce0dc18bcf2254e 100644 (file)
--- a/drivers/platform/chrome/cros_ec_typec.c
+++ b/drivers/platform/chrome/cros_ec_typec.c
@@ -1326,7 +1326,7 @@ static struct platform_driver cros_typec_driver = {
                .pm = &cros_typec_pm_ops,
        },
        .probe = cros_typec_probe,
-       .remove_new = cros_typec_remove,
+       .remove = cros_typec_remove,
 };
 
 module_platform_driver(cros_typec_driver);

diff --git a/drivers/platform/chrome/cros_ec_vbc.c b/drivers/platform/chrome/cros_ec_vbc.c
index 787a19db4911af750c014c921762b24feeaf4d94..7bdb489354c5d203d2f4af22214314f6ead12c4e 100644 (file)
--- a/drivers/platform/chrome/cros_ec_vbc.c
+++ b/drivers/platform/chrome/cros_ec_vbc.c
@@ -145,7 +145,7 @@ static struct platform_driver cros_ec_vbc_driver = {
                .name = DRV_NAME,
        },
        .probe = cros_ec_vbc_probe,
-       .remove_new = cros_ec_vbc_remove,
+       .remove = cros_ec_vbc_remove,
        .id_table = cros_ec_vbc_id,
 };
 

diff --git a/drivers/platform/chrome/cros_typec_switch.c b/drivers/platform/chrome/cros_typec_switch.c
index 07a19386dc4eee25f4437eb848464688e67e91ae..8d7c34abb0a1282dd72bb6d7c5ff56e168dec713 100644 (file)
--- a/drivers/platform/chrome/cros_typec_switch.c
+++ b/drivers/platform/chrome/cros_typec_switch.c
@@ -318,7 +318,7 @@ static struct platform_driver cros_typec_switch_driver = {
                .acpi_match_table = ACPI_PTR(cros_typec_switch_acpi_id),
        },
        .probe = cros_typec_switch_probe,
-       .remove_new = cros_typec_switch_remove,
+       .remove = cros_typec_switch_remove,
 };
 
 module_platform_driver(cros_typec_switch_driver);

diff --git a/drivers/platform/chrome/cros_usbpd_logger.c b/drivers/platform/chrome/cros_usbpd_logger.c
index 930c2f47269f6fa2db47d3c3c4ff7ae42b68f60d..cd71f1caea81e8b70aa51124f1826cf58e61652c 100644 (file)
--- a/drivers/platform/chrome/cros_usbpd_logger.c
+++ b/drivers/platform/chrome/cros_usbpd_logger.c
@@ -262,7 +262,7 @@ static struct platform_driver cros_usbpd_logger_driver = {
                .pm = &cros_usbpd_logger_pm_ops,
        },
        .probe = cros_usbpd_logger_probe,
-       .remove_new = cros_usbpd_logger_remove,
+       .remove = cros_usbpd_logger_remove,
        .id_table = cros_usbpd_logger_id,
 };
 

diff --git a/drivers/platform/chrome/cros_usbpd_notify.c b/drivers/platform/chrome/cros_usbpd_notify.c
index c83f81d86483c1f6a45aac3e3de146e3f2c82f45..313d2bcd577bdaa9d09c605c884c1c29c64c8d02 100644 (file)
--- a/drivers/platform/chrome/cros_usbpd_notify.c
+++ b/drivers/platform/chrome/cros_usbpd_notify.c
@@ -156,7 +156,7 @@ static struct platform_driver cros_usbpd_notify_acpi_driver = {
                .acpi_match_table = cros_usbpd_notify_acpi_device_ids,
        },
        .probe = cros_usbpd_notify_probe_acpi,
-       .remove_new = cros_usbpd_notify_remove_acpi,
+       .remove = cros_usbpd_notify_remove_acpi,
 };
 
 #endif /* CONFIG_ACPI */
@@ -230,7 +230,7 @@ static struct platform_driver cros_usbpd_notify_plat_driver = {
                .name = DRV_NAME,
        },
        .probe = cros_usbpd_notify_probe_plat,
-       .remove_new = cros_usbpd_notify_remove_plat,
+       .remove = cros_usbpd_notify_remove_plat,
        .id_table = cros_usbpd_notify_id,
 };
 

diff --git a/drivers/platform/chrome/wilco_ec/core.c b/drivers/platform/chrome/wilco_ec/core.c
index 3e6b6cd81a9bb0f904701294dc3853cd2c3bdcba..9f978e531e1f5e5bcb26a503107ac66c6c6f9bc9 100644 (file)
--- a/drivers/platform/chrome/wilco_ec/core.c
+++ b/drivers/platform/chrome/wilco_ec/core.c
@@ -163,7 +163,7 @@ static struct platform_driver wilco_ec_driver = {
                .acpi_match_table = wilco_ec_acpi_device_ids,
        },
        .probe = wilco_ec_probe,
-       .remove_new = wilco_ec_remove,
+       .remove = wilco_ec_remove,
        .id_table = wilco_ec_id,
 };
 

diff --git a/drivers/platform/chrome/wilco_ec/debugfs.c b/drivers/platform/chrome/wilco_ec/debugfs.c
index 99486086af6a161a2f849a4c7f45ac17729235f8..0617292b5cd76eb1666f79dbe87874e5e4df7b1f 100644 (file)
--- a/drivers/platform/chrome/wilco_ec/debugfs.c
+++ b/drivers/platform/chrome/wilco_ec/debugfs.c
@@ -276,7 +276,7 @@ static struct platform_driver wilco_ec_debugfs_driver = {
                .name = DRV_NAME,
        },
        .probe = wilco_ec_debugfs_probe,
-       .remove_new = wilco_ec_debugfs_remove,
+       .remove = wilco_ec_debugfs_remove,
        .id_table = wilco_ec_debugfs_id,
 };
 

diff --git a/drivers/platform/chrome/wilco_ec/telemetry.c b/drivers/platform/chrome/wilco_ec/telemetry.c
index a87877e4300a5b09f8b04e08775cff06002534cb..7d8ae2cbf72f9ea2bc247718ff8453ff5d3445a0 100644 (file)
--- a/drivers/platform/chrome/wilco_ec/telemetry.c
+++ b/drivers/platform/chrome/wilco_ec/telemetry.c
@@ -417,7 +417,7 @@ MODULE_DEVICE_TABLE(platform, telem_id);
 
 static struct platform_driver telem_driver = {
        .probe = telem_device_probe,
-       .remove_new = telem_device_remove,
+       .remove = telem_device_remove,
        .driver = {
                .name = DRV_NAME,
        },