mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
synced 2024-12-28 16:52:18 +00:00
leds: Switch back to struct platform_driver::remove()
After commit 0edb555a65
("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>
This commit is contained in:
parent
def9c8b7bc
commit
6bdc6d4a37
@ -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,
|
||||
|
@ -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,
|
||||
|
@ -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);
|
||||
|
@ -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,
|
||||
|
@ -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);
|
||||
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
||||
|
@ -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,
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
@ -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",
|
||||
|
@ -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,
|
||||
},
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
@ -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,
|
||||
|
@ -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,
|
||||
|
@ -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",
|
||||
},
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
@ -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",
|
||||
|
@ -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",
|
||||
},
|
||||
|
@ -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);
|
||||
|
@ -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,
|
||||
};
|
||||
|
||||
|
@ -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,
|
||||
},
|
||||
|
@ -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,
|
||||
},
|
||||
|
@ -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,
|
||||
},
|
||||
|
Loading…
Reference in New Issue
Block a user