From: Hans de Goede <hdegoede@redhat.com> To: Jiri Kosina <jikos@kernel.org>, Benjamin Tissoires <benjamin.tissoires@redhat.com> Cc: "Hans de Goede" <hdegoede@redhat.com>, "Marek Behún" <kabel@kernel.org>, linux-input@vger.kernel.org, linux-leds@vger.kernel.org, alsa-devel@alsa-project.org Subject: [PATCH v3 4/7] HID: lenovo: Remove lenovo_led_brightness_get() Date: Sun, 21 Feb 2021 12:20:02 +0100 [thread overview] Message-ID: <20210221112005.102116-5-hdegoede@redhat.com> (raw) In-Reply-To: <20210221112005.102116-1-hdegoede@redhat.com> The led_classdev already contains a cached value of the last set brightness, the brightness_get callback is only meant for LED drivers which can read back the actual / current brightness from the hardware. Since lenovo_led_brightness_get() just returns the last set value it does not add any functionality, so we can just remove it. Reviewed-by: Marek Behún <kabel@kernel.org> Signed-off-by: Hans de Goede <hdegoede@redhat.com> --- Changes in v2: - New patch in v2 of this patch-set --- drivers/hid/hid-lenovo.c | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/drivers/hid/hid-lenovo.c b/drivers/hid/hid-lenovo.c index b2596ed37880..1b8dd85ceb05 100644 --- a/drivers/hid/hid-lenovo.c +++ b/drivers/hid/hid-lenovo.c @@ -774,22 +774,6 @@ static void lenovo_led_set_tpkbd(struct hid_device *hdev) hid_hw_request(hdev, report, HID_REQ_SET_REPORT); } -static enum led_brightness lenovo_led_brightness_get( - struct led_classdev *led_cdev) -{ - struct device *dev = led_cdev->dev->parent; - struct hid_device *hdev = to_hid_device(dev); - struct lenovo_drvdata *data_pointer = hid_get_drvdata(hdev); - int led_nr = 0; - - if (led_cdev == &data_pointer->led_micmute) - led_nr = 1; - - return data_pointer->led_state & (1 << led_nr) - ? LED_FULL - : LED_OFF; -} - static int lenovo_led_brightness_set(struct led_classdev *led_cdev, enum led_brightness value) { @@ -837,7 +821,6 @@ static int lenovo_register_leds(struct hid_device *hdev) snprintf(name_micm, name_sz, "%s:amber:micmute", dev_name(&hdev->dev)); data->led_mute.name = name_mute; - data->led_mute.brightness_get = lenovo_led_brightness_get; data->led_mute.brightness_set_blocking = lenovo_led_brightness_set; data->led_mute.flags = LED_HW_PLUGGABLE; data->led_mute.dev = &hdev->dev; @@ -846,7 +829,6 @@ static int lenovo_register_leds(struct hid_device *hdev) return ret; data->led_micmute.name = name_micm; - data->led_micmute.brightness_get = lenovo_led_brightness_get; data->led_micmute.brightness_set_blocking = lenovo_led_brightness_set; data->led_micmute.flags = LED_HW_PLUGGABLE; data->led_micmute.dev = &hdev->dev; -- 2.30.1
WARNING: multiple messages have this Message-ID (diff)
From: Hans de Goede <hdegoede@redhat.com> To: Jiri Kosina <jikos@kernel.org>, Benjamin Tissoires <benjamin.tissoires@redhat.com> Cc: "Marek Behún" <kabel@kernel.org>, "Hans de Goede" <hdegoede@redhat.com>, alsa-devel@alsa-project.org, linux-leds@vger.kernel.org, linux-input@vger.kernel.org Subject: [PATCH v3 4/7] HID: lenovo: Remove lenovo_led_brightness_get() Date: Sun, 21 Feb 2021 12:20:02 +0100 [thread overview] Message-ID: <20210221112005.102116-5-hdegoede@redhat.com> (raw) In-Reply-To: <20210221112005.102116-1-hdegoede@redhat.com> The led_classdev already contains a cached value of the last set brightness, the brightness_get callback is only meant for LED drivers which can read back the actual / current brightness from the hardware. Since lenovo_led_brightness_get() just returns the last set value it does not add any functionality, so we can just remove it. Reviewed-by: Marek Behún <kabel@kernel.org> Signed-off-by: Hans de Goede <hdegoede@redhat.com> --- Changes in v2: - New patch in v2 of this patch-set --- drivers/hid/hid-lenovo.c | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/drivers/hid/hid-lenovo.c b/drivers/hid/hid-lenovo.c index b2596ed37880..1b8dd85ceb05 100644 --- a/drivers/hid/hid-lenovo.c +++ b/drivers/hid/hid-lenovo.c @@ -774,22 +774,6 @@ static void lenovo_led_set_tpkbd(struct hid_device *hdev) hid_hw_request(hdev, report, HID_REQ_SET_REPORT); } -static enum led_brightness lenovo_led_brightness_get( - struct led_classdev *led_cdev) -{ - struct device *dev = led_cdev->dev->parent; - struct hid_device *hdev = to_hid_device(dev); - struct lenovo_drvdata *data_pointer = hid_get_drvdata(hdev); - int led_nr = 0; - - if (led_cdev == &data_pointer->led_micmute) - led_nr = 1; - - return data_pointer->led_state & (1 << led_nr) - ? LED_FULL - : LED_OFF; -} - static int lenovo_led_brightness_set(struct led_classdev *led_cdev, enum led_brightness value) { @@ -837,7 +821,6 @@ static int lenovo_register_leds(struct hid_device *hdev) snprintf(name_micm, name_sz, "%s:amber:micmute", dev_name(&hdev->dev)); data->led_mute.name = name_mute; - data->led_mute.brightness_get = lenovo_led_brightness_get; data->led_mute.brightness_set_blocking = lenovo_led_brightness_set; data->led_mute.flags = LED_HW_PLUGGABLE; data->led_mute.dev = &hdev->dev; @@ -846,7 +829,6 @@ static int lenovo_register_leds(struct hid_device *hdev) return ret; data->led_micmute.name = name_micm; - data->led_micmute.brightness_get = lenovo_led_brightness_get; data->led_micmute.brightness_set_blocking = lenovo_led_brightness_set; data->led_micmute.flags = LED_HW_PLUGGABLE; data->led_micmute.dev = &hdev->dev; -- 2.30.1
next prev parent reply other threads:[~2021-02-21 11:21 UTC|newest] Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-02-21 11:19 [PATCH v3 0/7] HID: lenovo: Mute LED handling fixes and improvements Hans de Goede 2021-02-21 11:19 ` Hans de Goede 2021-02-21 11:19 ` [PATCH v3 1/7] HID: lenovo: Use brightness_set_blocking callback for setting LEDs brightness Hans de Goede 2021-02-21 11:19 ` Hans de Goede 2021-02-21 11:20 ` [PATCH v3 2/7] HID: lenovo: Fix lenovo_led_set_tp10ubkbd() error handling Hans de Goede 2021-02-21 11:20 ` Hans de Goede 2021-02-21 11:29 ` Marek Behún 2021-02-21 11:29 ` Marek Behún 2021-02-21 11:20 ` [PATCH v3 3/7] HID: lenovo: Check hid_get_drvdata() returns non NULL in lenovo_event() Hans de Goede 2021-02-21 11:20 ` Hans de Goede 2021-02-21 11:20 ` Hans de Goede [this message] 2021-02-21 11:20 ` [PATCH v3 4/7] HID: lenovo: Remove lenovo_led_brightness_get() Hans de Goede 2021-02-23 9:03 ` Pavel Machek 2021-02-23 9:03 ` Pavel Machek 2021-02-21 11:20 ` [PATCH v3 5/7] HID: lenovo: Set LEDs max_brightness value Hans de Goede 2021-02-21 11:20 ` Hans de Goede 2021-02-21 11:29 ` Marek Behún 2021-02-21 11:29 ` Marek Behún 2021-02-23 9:03 ` Pavel Machek 2021-02-23 9:03 ` Pavel Machek 2021-02-21 11:20 ` [PATCH v3 6/7] HID: lenovo: Map mic-mute button to KEY_F20 instead of KEY_MICMUTE Hans de Goede 2021-02-21 11:20 ` Hans de Goede 2021-02-21 11:30 ` Marek Behún 2021-02-21 11:30 ` Marek Behún 2021-02-21 11:20 ` [PATCH v3 7/7] HID: lenovo: Set default_triggers for the mute and micmute LEDs Hans de Goede 2021-02-21 11:20 ` Hans de Goede 2021-02-23 9:04 ` Pavel Machek 2021-02-23 9:04 ` Pavel Machek
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210221112005.102116-5-hdegoede@redhat.com \ --to=hdegoede@redhat.com \ --cc=alsa-devel@alsa-project.org \ --cc=benjamin.tissoires@redhat.com \ --cc=jikos@kernel.org \ --cc=kabel@kernel.org \ --cc=linux-input@vger.kernel.org \ --cc=linux-leds@vger.kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.