Skip to content

Commit 6bdc6d4

Browse files
ukleineklag-linaro
authored andcommitted
leds: Switch back to struct platform_driver::remove()
After commit 0edb555 ("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 <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Lee Jones <[email protected]>
1 parent def9c8b commit 6bdc6d4

28 files changed

+30
-30
lines changed

drivers/leds/blink/leds-lgm-sso.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -861,7 +861,7 @@ MODULE_DEVICE_TABLE(of, of_sso_led_match);
861861

862862
static struct platform_driver intel_sso_led_driver = {
863863
.probe = intel_sso_led_probe,
864-
.remove_new = intel_sso_led_remove,
864+
.remove = intel_sso_led_remove,
865865
.driver = {
866866
.name = "lgm-ssoled",
867867
.of_match_table = of_sso_led_match,

drivers/leds/flash/leds-aat1290.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -536,7 +536,7 @@ MODULE_DEVICE_TABLE(of, aat1290_led_dt_match);
536536

537537
static struct platform_driver aat1290_led_driver = {
538538
.probe = aat1290_led_probe,
539-
.remove_new = aat1290_led_remove,
539+
.remove = aat1290_led_remove,
540540
.driver = {
541541
.name = "aat1290",
542542
.of_match_table = aat1290_led_dt_match,

drivers/leds/flash/leds-ktd2692.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ static struct platform_driver ktd2692_driver = {
343343
.of_match_table = ktd2692_match,
344344
},
345345
.probe = ktd2692_probe,
346-
.remove_new = ktd2692_remove,
346+
.remove = ktd2692_remove,
347347
};
348348

349349
module_platform_driver(ktd2692_driver);

drivers/leds/flash/leds-max77693.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1042,7 +1042,7 @@ MODULE_DEVICE_TABLE(of, max77693_led_dt_match);
10421042

10431043
static struct platform_driver max77693_led_driver = {
10441044
.probe = max77693_led_probe,
1045-
.remove_new = max77693_led_remove,
1045+
.remove = max77693_led_remove,
10461046
.driver = {
10471047
.name = "max77693-led",
10481048
.of_match_table = max77693_led_dt_match,

drivers/leds/flash/leds-mt6360.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -886,7 +886,7 @@ static struct platform_driver mt6360_led_driver = {
886886
.of_match_table = mt6360_led_of_id,
887887
},
888888
.probe = mt6360_led_probe,
889-
.remove_new = mt6360_led_remove,
889+
.remove = mt6360_led_remove,
890890
};
891891
module_platform_driver(mt6360_led_driver);
892892

drivers/leds/flash/leds-qcom-flash.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -940,7 +940,7 @@ static struct platform_driver qcom_flash_led_driver = {
940940
.of_match_table = qcom_flash_led_match_table,
941941
},
942942
.probe = qcom_flash_led_probe,
943-
.remove_new = qcom_flash_led_remove,
943+
.remove = qcom_flash_led_remove,
944944
};
945945

946946
module_platform_driver(qcom_flash_led_driver);

drivers/leds/flash/leds-rt8515.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,7 @@ static struct platform_driver rt8515_driver = {
388388
.of_match_table = rt8515_match,
389389
},
390390
.probe = rt8515_probe,
391-
.remove_new = rt8515_remove,
391+
.remove = rt8515_remove,
392392
};
393393
module_platform_driver(rt8515_driver);
394394

drivers/leds/flash/leds-sgm3140.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ MODULE_DEVICE_TABLE(of, sgm3140_dt_match);
300300

301301
static struct platform_driver sgm3140_driver = {
302302
.probe = sgm3140_probe,
303-
.remove_new = sgm3140_remove,
303+
.remove = sgm3140_remove,
304304
.driver = {
305305
.name = "sgm3140",
306306
.of_match_table = sgm3140_dt_match,

drivers/leds/leds-88pm860x.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ static struct platform_driver pm860x_led_driver = {
226226
.name = "88pm860x-led",
227227
},
228228
.probe = pm860x_led_probe,
229-
.remove_new = pm860x_led_remove,
229+
.remove = pm860x_led_remove,
230230
};
231231

232232
module_platform_driver(pm860x_led_driver);

drivers/leds/leds-adp5520.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ static struct platform_driver adp5520_led_driver = {
184184
.name = "adp5520-led",
185185
},
186186
.probe = adp5520_led_probe,
187-
.remove_new = adp5520_led_remove,
187+
.remove = adp5520_led_remove,
188188
};
189189

190190
module_platform_driver(adp5520_led_driver);

0 commit comments

Comments
 (0)