mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-08-21 06:50:25 +00:00
platform/chrome: cros_kbd_led_backlight: Remove OF match
After applying4c03a44e26
("arm64: dts: mediatek: mt8195-cherry: Remove keyboard-backlight node"), there are no users for using the OF match. Instead, the device is added via drivers/mfd/cros_ec_dev.c by970c3a6b7a
("mfd: cros_ec: Register keyboard backlight subdevice"). Remove the OF match. Link: https://lore.kernel.org/r/20241206031405.1711996-2-tzungbi@kernel.org Signed-off-by: Tzung-Bi Shih <tzungbi@kernel.org>
This commit is contained in:
parent
dce2f5b5da
commit
3a1d61dc32
1 changed files with 11 additions and 51 deletions
|
@ -121,7 +121,17 @@ static const struct keyboard_led_drvdata keyboard_led_drvdata_acpi = {
|
|||
|
||||
#endif /* CONFIG_ACPI */
|
||||
|
||||
#if IS_ENABLED(CONFIG_CROS_EC)
|
||||
#if IS_ENABLED(CONFIG_MFD_CROS_EC_DEV)
|
||||
static int keyboard_led_init_ec_pwm_mfd(struct platform_device *pdev)
|
||||
{
|
||||
struct cros_ec_dev *ec_dev = dev_get_drvdata(pdev->dev.parent);
|
||||
struct cros_ec_device *cros_ec = ec_dev->ec_dev;
|
||||
struct keyboard_led *keyboard_led = platform_get_drvdata(pdev);
|
||||
|
||||
keyboard_led->ec = cros_ec;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int
|
||||
keyboard_led_set_brightness_ec_pwm(struct led_classdev *cdev,
|
||||
|
@ -169,44 +179,6 @@ keyboard_led_get_brightness_ec_pwm(struct led_classdev *cdev)
|
|||
return resp->percent;
|
||||
}
|
||||
|
||||
static int keyboard_led_init_ec_pwm(struct platform_device *pdev)
|
||||
{
|
||||
struct keyboard_led *keyboard_led = platform_get_drvdata(pdev);
|
||||
|
||||
keyboard_led->ec = dev_get_drvdata(pdev->dev.parent);
|
||||
if (!keyboard_led->ec) {
|
||||
dev_err(&pdev->dev, "no parent EC device\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const __maybe_unused struct keyboard_led_drvdata keyboard_led_drvdata_ec_pwm = {
|
||||
.init = keyboard_led_init_ec_pwm,
|
||||
.brightness_set_blocking = keyboard_led_set_brightness_ec_pwm,
|
||||
.brightness_get = keyboard_led_get_brightness_ec_pwm,
|
||||
.max_brightness = KEYBOARD_BACKLIGHT_MAX,
|
||||
};
|
||||
|
||||
#else /* IS_ENABLED(CONFIG_CROS_EC) */
|
||||
|
||||
static const __maybe_unused struct keyboard_led_drvdata keyboard_led_drvdata_ec_pwm = {};
|
||||
|
||||
#endif /* IS_ENABLED(CONFIG_CROS_EC) */
|
||||
|
||||
#if IS_ENABLED(CONFIG_MFD_CROS_EC_DEV)
|
||||
static int keyboard_led_init_ec_pwm_mfd(struct platform_device *pdev)
|
||||
{
|
||||
struct cros_ec_dev *ec_dev = dev_get_drvdata(pdev->dev.parent);
|
||||
struct cros_ec_device *cros_ec = ec_dev->ec_dev;
|
||||
struct keyboard_led *keyboard_led = platform_get_drvdata(pdev);
|
||||
|
||||
keyboard_led->ec = cros_ec;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const struct keyboard_led_drvdata keyboard_led_drvdata_ec_pwm_mfd = {
|
||||
.init = keyboard_led_init_ec_pwm_mfd,
|
||||
.brightness_set_blocking = keyboard_led_set_brightness_ec_pwm,
|
||||
|
@ -270,17 +242,6 @@ static const struct acpi_device_id keyboard_led_acpi_match[] = {
|
|||
MODULE_DEVICE_TABLE(acpi, keyboard_led_acpi_match);
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_OF
|
||||
static const struct of_device_id keyboard_led_of_match[] = {
|
||||
{
|
||||
.compatible = "google,cros-kbd-led-backlight",
|
||||
.data = &keyboard_led_drvdata_ec_pwm,
|
||||
},
|
||||
{}
|
||||
};
|
||||
MODULE_DEVICE_TABLE(of, keyboard_led_of_match);
|
||||
#endif
|
||||
|
||||
static const struct platform_device_id keyboard_led_id[] = {
|
||||
{ "cros-keyboard-leds", 0 },
|
||||
{}
|
||||
|
@ -291,7 +252,6 @@ static struct platform_driver keyboard_led_driver = {
|
|||
.driver = {
|
||||
.name = "cros-keyboard-leds",
|
||||
.acpi_match_table = ACPI_PTR(keyboard_led_acpi_match),
|
||||
.of_match_table = of_match_ptr(keyboard_led_of_match),
|
||||
},
|
||||
.probe = keyboard_led_probe,
|
||||
.id_table = keyboard_led_id,
|
||||
|
|
Loading…
Add table
Reference in a new issue