leds: 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/leds/ 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 files, make indention of the struct initializer
consistent in several files.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@baylibre.com>
Link: https://lore.kernel.org/r/20241010203622.839625-5-u.kleine-koenig@baylibre.com
Signed-off-by: Lee Jones <lee@kernel.org>

diff --git a/drivers/leds/blink/leds-lgm-sso.c b/drivers/leds/blink/leds-lgm-sso.c
index 7b04ea146260583d3fc986d2ac46f55159972778..effaaaf302b588856fea7c91e718f77109c89550 100644 (file)
--- a/drivers/leds/blink/leds-lgm-sso.c
+++ b/drivers/leds/blink/leds-lgm-sso.c
@@ -861,7 +861,7 @@ MODULE_DEVICE_TABLE(of, of_sso_led_match);
 
 static struct platform_driver intel_sso_led_driver = {
        .probe          = intel_sso_led_probe,
-       .remove_new     = intel_sso_led_remove,
+       .remove         = intel_sso_led_remove,
        .driver         = {
                        .name = "lgm-ssoled",
                        .of_match_table = of_sso_led_match,

diff --git a/drivers/leds/flash/leds-aat1290.c b/drivers/leds/flash/leds-aat1290.c
index c7b6a1f0128828c7b5da2fc257c8f7706bdcf903..49251cfd33509e098ead0f409f1f66d8f18872cb 100644 (file)
--- a/drivers/leds/flash/leds-aat1290.c
+++ b/drivers/leds/flash/leds-aat1290.c
@@ -536,7 +536,7 @@ MODULE_DEVICE_TABLE(of, aat1290_led_dt_match);
 
 static struct platform_driver aat1290_led_driver = {
        .probe          = aat1290_led_probe,
-       .remove_new     = aat1290_led_remove,
+       .remove         = aat1290_led_remove,
        .driver         = {
                .name   = "aat1290",
                .of_match_table = aat1290_led_dt_match,

diff --git a/drivers/leds/flash/leds-ktd2692.c b/drivers/leds/flash/leds-ktd2692.c
index 16a01a200c0b751815da0238d14f8dd75ffd387b..2e42f845df288865cb31904d298ee43113d60285 100644 (file)
--- a/drivers/leds/flash/leds-ktd2692.c
+++ b/drivers/leds/flash/leds-ktd2692.c
@@ -343,7 +343,7 @@ static struct platform_driver ktd2692_driver = {
                .of_match_table = ktd2692_match,
        },
        .probe  = ktd2692_probe,
-       .remove_new = ktd2692_remove,
+       .remove = ktd2692_remove,
 };
 
 module_platform_driver(ktd2692_driver);

diff --git a/drivers/leds/flash/leds-max77693.c b/drivers/leds/flash/leds-max77693.c
index 90d78b3d22f8825e687a316512da15eb689639e6..daee109861086b57f2533217ad097adc015d662b 100644 (file)
--- a/drivers/leds/flash/leds-max77693.c
+++ b/drivers/leds/flash/leds-max77693.c
@@ -1042,7 +1042,7 @@ MODULE_DEVICE_TABLE(of, max77693_led_dt_match);
 
 static struct platform_driver max77693_led_driver = {
        .probe          = max77693_led_probe,
-       .remove_new     = max77693_led_remove,
+       .remove         = max77693_led_remove,
        .driver         = {
                .name   = "max77693-led",
                .of_match_table = max77693_led_dt_match,

diff --git a/drivers/leds/flash/leds-mt6360.c b/drivers/leds/flash/leds-mt6360.c
index 676236c19ec415f711972aed091e1be501b5485d..462a902f54e04c5b92d3f44f386786790c79de96 100644 (file)
--- a/drivers/leds/flash/leds-mt6360.c
+++ b/drivers/leds/flash/leds-mt6360.c
@@ -886,7 +886,7 @@ static struct platform_driver mt6360_led_driver = {
                .of_match_table = mt6360_led_of_id,
        },
        .probe = mt6360_led_probe,
-       .remove_new = mt6360_led_remove,
+       .remove = mt6360_led_remove,
 };
 module_platform_driver(mt6360_led_driver);
 

diff --git a/drivers/leds/flash/leds-qcom-flash.c b/drivers/leds/flash/leds-qcom-flash.c
index ab848c5acd2d081e982ce7f3219ac3503acc3e02..b4c19be51c4da7b55f78aa3bc11454d57428b1fa 100644 (file)
--- a/drivers/leds/flash/leds-qcom-flash.c
+++ b/drivers/leds/flash/leds-qcom-flash.c
@@ -940,7 +940,7 @@ static struct platform_driver qcom_flash_led_driver = {
                .of_match_table = qcom_flash_led_match_table,
        },
        .probe = qcom_flash_led_probe,
-       .remove_new = qcom_flash_led_remove,
+       .remove = qcom_flash_led_remove,
 };
 
 module_platform_driver(qcom_flash_led_driver);

diff --git a/drivers/leds/flash/leds-rt8515.c b/drivers/leds/flash/leds-rt8515.c
index eef426924eafb4512dae70301cd3b1fb32f1424e..6b051f182b72dddf72ee43e14191dcfd7225ed9b 100644 (file)
--- a/drivers/leds/flash/leds-rt8515.c
+++ b/drivers/leds/flash/leds-rt8515.c
@@ -388,7 +388,7 @@ static struct platform_driver rt8515_driver = {
                .of_match_table = rt8515_match,
        },
        .probe  = rt8515_probe,
-       .remove_new = rt8515_remove,
+       .remove = rt8515_remove,
 };
 module_platform_driver(rt8515_driver);
 

diff --git a/drivers/leds/flash/leds-sgm3140.c b/drivers/leds/flash/leds-sgm3140.c
index db0ac6641954e940afbc7a84b81dc87c254899dc..3c01739c0b46419ef09ba3c961adb9f5228f0396 100644 (file)
--- a/drivers/leds/flash/leds-sgm3140.c
+++ b/drivers/leds/flash/leds-sgm3140.c
@@ -300,7 +300,7 @@ MODULE_DEVICE_TABLE(of, sgm3140_dt_match);
 
 static struct platform_driver sgm3140_driver = {
        .probe  = sgm3140_probe,
-       .remove_new = sgm3140_remove,
+       .remove = sgm3140_remove,
        .driver = {
                .name   = "sgm3140",
                .of_match_table = sgm3140_dt_match,

diff --git a/drivers/leds/leds-88pm860x.c b/drivers/leds/leds-88pm860x.c
index 81238376484bebff7f456aadcfee96b90122a28c..ef5c6c4667ab18c5d326b29ed861199a424e4aba 100644 (file)
--- a/drivers/leds/leds-88pm860x.c
+++ b/drivers/leds/leds-88pm860x.c
@@ -226,7 +226,7 @@ static struct platform_driver pm860x_led_driver = {
                .name   = "88pm860x-led",
        },
        .probe  = pm860x_led_probe,
-       .remove_new = pm860x_led_remove,
+       .remove = pm860x_led_remove,
 };
 
 module_platform_driver(pm860x_led_driver);

diff --git a/drivers/leds/leds-adp5520.c b/drivers/leds/leds-adp5520.c
index d89a4dca50ae4a0133e4d755c5d3a0d8b1296415..13e5bc80e56e0e947062074a8d38d60ffe3a3ff2 100644 (file)
--- a/drivers/leds/leds-adp5520.c
+++ b/drivers/leds/leds-adp5520.c
@@ -184,7 +184,7 @@ static struct platform_driver adp5520_led_driver = {
                .name   = "adp5520-led",
        },
        .probe          = adp5520_led_probe,
-       .remove_new     = adp5520_led_remove,
+       .remove         = adp5520_led_remove,
 };
 
 module_platform_driver(adp5520_led_driver);

diff --git a/drivers/leds/leds-cht-wcove.c b/drivers/leds/leds-cht-wcove.c
index b4998402b8c6f08ac677402c31fef7cafa3e40ce..8246f048edcb4b23255d51bdea13ee839b4df50b 100644 (file)
--- a/drivers/leds/leds-cht-wcove.c
+++ b/drivers/leds/leds-cht-wcove.c
@@ -461,7 +461,7 @@ static DEFINE_SIMPLE_DEV_PM_OPS(cht_wc_leds_pm, cht_wc_leds_suspend, cht_wc_leds
 
 static struct platform_driver cht_wc_leds_driver = {
        .probe = cht_wc_leds_probe,
-       .remove_new = cht_wc_leds_remove,
+       .remove = cht_wc_leds_remove,
        .shutdown = cht_wc_leds_disable,
        .driver = {
                .name = "cht_wcove_leds",

diff --git a/drivers/leds/leds-clevo-mail.c b/drivers/leds/leds-clevo-mail.c
index 82da0fe688ade9edb9921f4f8d7072cc360b6565..f00b16ac158635be70344c770978fa5b37e616be 100644 (file)
--- a/drivers/leds/leds-clevo-mail.c
+++ b/drivers/leds/leds-clevo-mail.c
@@ -165,7 +165,7 @@ static void clevo_mail_led_remove(struct platform_device *pdev)
 }
 
 static struct platform_driver clevo_mail_led_driver = {
-       .remove_new     = clevo_mail_led_remove,
+       .remove         = clevo_mail_led_remove,
        .driver         = {
                .name           = KBUILD_MODNAME,
        },

diff --git a/drivers/leds/leds-da903x.c b/drivers/leds/leds-da903x.c
index f067a5f4d3c4921ba9b8cc6a9d2898d022bc4c4a..71209b3c8f1e6940de0e879ac9ca0ba3bd8e04ee 100644 (file)
--- a/drivers/leds/leds-da903x.c
+++ b/drivers/leds/leds-da903x.c
@@ -133,7 +133,7 @@ static struct platform_driver da903x_led_driver = {
                .name   = "da903x-led",
        },
        .probe          = da903x_led_probe,
-       .remove_new     = da903x_led_remove,
+       .remove         = da903x_led_remove,
 };
 
 module_platform_driver(da903x_led_driver);

diff --git a/drivers/leds/leds-da9052.c b/drivers/leds/leds-da9052.c
index 64679d62076bbb15b4a205cb60b412e1a6b2f071..7c9051184a598983ecc233e3cb92a8f83042ec53 100644 (file)
--- a/drivers/leds/leds-da9052.c
+++ b/drivers/leds/leds-da9052.c
@@ -179,7 +179,7 @@ static struct platform_driver da9052_led_driver = {
                .name   = "da9052-leds",
        },
        .probe          = da9052_led_probe,
-       .remove_new     = da9052_led_remove,
+       .remove         = da9052_led_remove,
 };
 
 module_platform_driver(da9052_led_driver);

diff --git a/drivers/leds/leds-lm3533.c b/drivers/leds/leds-lm3533.c
index a3d33165d262bf89343391a0a8d34f923ece552c..45795f2a10426a680acc1bbacab5202198b88b6c 100644 (file)
--- a/drivers/leds/leds-lm3533.c
+++ b/drivers/leds/leds-lm3533.c
@@ -744,7 +744,7 @@ static struct platform_driver lm3533_led_driver = {
                .name = "lm3533-leds",
        },
        .probe          = lm3533_led_probe,
-       .remove_new     = lm3533_led_remove,
+       .remove         = lm3533_led_remove,
        .shutdown       = lm3533_led_shutdown,
 };
 module_platform_driver(lm3533_led_driver);

diff --git a/drivers/leds/leds-mc13783.c b/drivers/leds/leds-mc13783.c
index da99d114bfb2123ed8f13bea61fad8abe651381b..e22f09d1379839387fef57a2e43715fb719b0fd9 100644 (file)
--- a/drivers/leds/leds-mc13783.c
+++ b/drivers/leds/leds-mc13783.c
@@ -301,7 +301,7 @@ static struct platform_driver mc13xxx_led_driver = {
        .driver = {
                .name   = "mc13xxx-led",
        },
-       .remove_new     = mc13xxx_led_remove,
+       .remove         = mc13xxx_led_remove,
        .id_table       = mc13xxx_led_id_table,
 };
 module_platform_driver_probe(mc13xxx_led_driver, mc13xxx_led_probe);

diff --git a/drivers/leds/leds-mt6323.c b/drivers/leds/leds-mt6323.c
index a19e8e0b6d1b1de86a2606a9e6942bc06769c675..dbdc221c3828343bc1d39e50abc340ab792561c4 100644 (file)
--- a/drivers/leds/leds-mt6323.c
+++ b/drivers/leds/leds-mt6323.c
@@ -713,7 +713,7 @@ MODULE_DEVICE_TABLE(of, mt6323_led_dt_match);
 
 static struct platform_driver mt6323_led_driver = {
        .probe          = mt6323_led_probe,
-       .remove_new     = mt6323_led_remove,
+       .remove         = mt6323_led_remove,
        .driver         = {
                .name   = "mt6323-led",
                .of_match_table = mt6323_led_dt_match,

diff --git a/drivers/leds/leds-powernv.c b/drivers/leds/leds-powernv.c
index 49ab8c9a3f29fc12c1b05a53d118da8de362fdc0..3a38578ce8e4a0ae6b90bb1ba694572c636d248f 100644 (file)
--- a/drivers/leds/leds-powernv.c
+++ b/drivers/leds/leds-powernv.c
@@ -323,8 +323,8 @@ static const struct of_device_id powernv_led_match[] = {
 MODULE_DEVICE_TABLE(of, powernv_led_match);
 
 static struct platform_driver powernv_led_driver = {
-       .probe  = powernv_led_probe,
-       .remove_new = powernv_led_remove,
+       .probe = powernv_led_probe,
+       .remove = powernv_led_remove,
        .driver = {
                .name = "powernv-led-driver",
                .of_match_table = powernv_led_match,

diff --git a/drivers/leds/leds-rb532.c b/drivers/leds/leds-rb532.c
index e66f73879c8e397050102126d2854527da77af53..782e1c11ee442a9d0da8173cd363f9403043a10e 100644 (file)
--- a/drivers/leds/leds-rb532.c
+++ b/drivers/leds/leds-rb532.c
@@ -49,7 +49,7 @@ static void rb532_led_remove(struct platform_device *pdev)
 
 static struct platform_driver rb532_led_driver = {
        .probe = rb532_led_probe,
-       .remove_new = rb532_led_remove,
+       .remove = rb532_led_remove,
        .driver = {
                .name = "rb532-led",
        },

diff --git a/drivers/leds/leds-regulator.c b/drivers/leds/leds-regulator.c
index 848e929c4a61c888a997e684013fcedf1c2d0b9d..ade64629431a498c03f2411939bdc500e8501e21 100644 (file)
--- a/drivers/leds/leds-regulator.c
+++ b/drivers/leds/leds-regulator.c
@@ -193,7 +193,7 @@ static struct platform_driver regulator_led_driver = {
                .of_match_table = regulator_led_of_match,
        },
        .probe  = regulator_led_probe,
-       .remove_new = regulator_led_remove,
+       .remove = regulator_led_remove,
 };
 
 module_platform_driver(regulator_led_driver);

diff --git a/drivers/leds/leds-sc27xx-bltc.c b/drivers/leds/leds-sc27xx-bltc.c
index cca98c644aa65eb96eb3541b1136ed90af63b8da..0c5169773949a29e4c96cf0070a2fd1c173f3478 100644 (file)
--- a/drivers/leds/leds-sc27xx-bltc.c
+++ b/drivers/leds/leds-sc27xx-bltc.c
@@ -344,7 +344,7 @@ static struct platform_driver sc27xx_led_driver = {
                .of_match_table = sc27xx_led_of_match,
        },
        .probe = sc27xx_led_probe,
-       .remove_new = sc27xx_led_remove,
+       .remove = sc27xx_led_remove,
 };
 
 module_platform_driver(sc27xx_led_driver);

diff --git a/drivers/leds/leds-sun50i-a100.c b/drivers/leds/leds-sun50i-a100.c
index 03f1b642469287a0a9b912b160721d02adda3cbf..2c9bd360ab818b7968f0d77e8c918cf5b39af443 100644 (file)
--- a/drivers/leds/leds-sun50i-a100.c
+++ b/drivers/leds/leds-sun50i-a100.c
@@ -558,7 +558,7 @@ static DEFINE_SIMPLE_DEV_PM_OPS(sun50i_a100_ledc_pm,
 
 static struct platform_driver sun50i_a100_ledc_driver = {
        .probe          = sun50i_a100_ledc_probe,
-       .remove_new     = sun50i_a100_ledc_remove,
+       .remove         = sun50i_a100_ledc_remove,
        .shutdown       = sun50i_a100_ledc_remove,
        .driver         = {
                .name           = "sun50i-a100-ledc",

diff --git a/drivers/leds/leds-sunfire.c b/drivers/leds/leds-sunfire.c
index a621e5e5c75c5fe2966a002c7998e5b1ed8b137c..bd24e7f5947ab4904d4787d433afbffd4ea0f01b 100644 (file)
--- a/drivers/leds/leds-sunfire.c
+++ b/drivers/leds/leds-sunfire.c
@@ -219,7 +219,7 @@ MODULE_ALIAS("platform:sunfire-fhc-leds");
 
 static struct platform_driver sunfire_clockboard_led_driver = {
        .probe          = sunfire_clockboard_led_probe,
-       .remove_new     = sunfire_led_generic_remove,
+       .remove         = sunfire_led_generic_remove,
        .driver         = {
                .name   = "sunfire-clockboard-leds",
        },
@@ -227,7 +227,7 @@ static struct platform_driver sunfire_clockboard_led_driver = {
 
 static struct platform_driver sunfire_fhc_led_driver = {
        .probe          = sunfire_fhc_led_probe,
-       .remove_new     = sunfire_led_generic_remove,
+       .remove         = sunfire_led_generic_remove,
        .driver         = {
                .name   = "sunfire-fhc-leds",
        },

diff --git a/drivers/leds/leds-wm831x-status.c b/drivers/leds/leds-wm831x-status.c
index 70b32d80f9602b6144bbfb3161cbc315eda8cb75..05930e9e88878eeb4c0f6572ced7eb741f723925 100644 (file)
--- a/drivers/leds/leds-wm831x-status.c
+++ b/drivers/leds/leds-wm831x-status.c
@@ -292,7 +292,7 @@ static struct platform_driver wm831x_status_driver = {
                   .name = "wm831x-status",
                   },
        .probe = wm831x_status_probe,
-       .remove_new = wm831x_status_remove,
+       .remove = wm831x_status_remove,
 };
 
 module_platform_driver(wm831x_status_driver);

diff --git a/drivers/leds/leds-wm8350.c b/drivers/leds/leds-wm8350.c
index 61cbefa05710e8124b8035dbc9e4d6e71842fa63..87e60ea927b9bbe94fd7151ea2ed1de3af789e5d 100644 (file)
--- a/drivers/leds/leds-wm8350.c
+++ b/drivers/leds/leds-wm8350.c
@@ -255,7 +255,7 @@ static struct platform_driver wm8350_led_driver = {
                   .name = "wm8350-led",
                   },
        .probe = wm8350_led_probe,
-       .remove_new = wm8350_led_remove,
+       .remove = wm8350_led_remove,
        .shutdown = wm8350_led_shutdown,
 };
 

diff --git a/drivers/leds/simple/simatic-ipc-leds-gpio-apollolake.c b/drivers/leds/simple/simatic-ipc-leds-gpio-apollolake.c
index 726c186391afdb64f5f036ab586e06334b04d78e..c98c370687c22d205c9ab4cea4def55db828b610 100644 (file)
--- a/drivers/leds/simple/simatic-ipc-leds-gpio-apollolake.c
+++ b/drivers/leds/simple/simatic-ipc-leds-gpio-apollolake.c
@@ -53,7 +53,7 @@ static void simatic_ipc_leds_gpio_apollolake_remove(struct platform_device *pdev
 
 static struct platform_driver simatic_ipc_led_gpio_apollolake_driver = {
        .probe = simatic_ipc_leds_gpio_apollolake_probe,
-       .remove_new = simatic_ipc_leds_gpio_apollolake_remove,
+       .remove = simatic_ipc_leds_gpio_apollolake_remove,
        .driver = {
                .name = KBUILD_MODNAME,
        },

diff --git a/drivers/leds/simple/simatic-ipc-leds-gpio-elkhartlake.c b/drivers/leds/simple/simatic-ipc-leds-gpio-elkhartlake.c
index 3fec96c549c14f9cda8d18ef69426147e702226c..7f7cff2754480ee04fd8677e9bcb79f8fb4b0f93 100644 (file)
--- a/drivers/leds/simple/simatic-ipc-leds-gpio-elkhartlake.c
+++ b/drivers/leds/simple/simatic-ipc-leds-gpio-elkhartlake.c
@@ -43,7 +43,7 @@ static void simatic_ipc_leds_gpio_elkhartlake_remove(struct platform_device *pde
 
 static struct platform_driver simatic_ipc_led_gpio_elkhartlake_driver = {
        .probe = simatic_ipc_leds_gpio_elkhartlake_probe,
-       .remove_new = simatic_ipc_leds_gpio_elkhartlake_remove,
+       .remove = simatic_ipc_leds_gpio_elkhartlake_remove,
        .driver = {
                .name = KBUILD_MODNAME,
        },

diff --git a/drivers/leds/simple/simatic-ipc-leds-gpio-f7188x.c b/drivers/leds/simple/simatic-ipc-leds-gpio-f7188x.c
index a1f10952513c65ade59479a9a86acda84bce251c..bc23d701bcb79c241c784def883a5126fa827f58 100644 (file)
--- a/drivers/leds/simple/simatic-ipc-leds-gpio-f7188x.c
+++ b/drivers/leds/simple/simatic-ipc-leds-gpio-f7188x.c
@@ -93,7 +93,7 @@ static void simatic_ipc_leds_gpio_f7188x_remove(struct platform_device *pdev)
 
 static struct platform_driver simatic_ipc_led_gpio_driver = {
        .probe = simatic_ipc_leds_gpio_f7188x_probe,
-       .remove_new = simatic_ipc_leds_gpio_f7188x_remove,
+       .remove = simatic_ipc_leds_gpio_f7188x_remove,
        .driver = {
                .name = KBUILD_MODNAME,
        },