From patchwork Sun Apr 4 07:52:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Hans de Goede X-Patchwork-Id: 415206 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2796EC433ED for ; Sun, 4 Apr 2021 07:53:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id EF9C261359 for ; Sun, 4 Apr 2021 07:53:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229861AbhDDHxI (ORCPT ); Sun, 4 Apr 2021 03:53:08 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:49407 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229788AbhDDHxI (ORCPT ); Sun, 4 Apr 2021 03:53:08 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1617522783; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=upX7XR4pztHm7LEtxyGrV6ftWfxbW6s4rs10lEHck0c=; b=GZXwJZ5ZJXoxs7uFts0o1cTKCoqo9e2+P7zapXGMR5Cmf0oRtCor4DTG5AivbGWTrmvbPz kjx9TGfQhhJiSogBjPZwLWdPTxyuM3m5RMmvt2EMprzc3S7Sz3eOdyPyzf3hA20EXHDDBL s11NANOeHIzXhlS3I5frUpbi9vbaHlk= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-293-OEFTapzCNvmaUsCkcbpvrA-1; Sun, 04 Apr 2021 03:53:02 -0400 X-MC-Unique: OEFTapzCNvmaUsCkcbpvrA-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 14B0A1084C8C; Sun, 4 Apr 2021 07:53:00 +0000 (UTC) Received: from x1.localdomain (ovpn-112-48.ams2.redhat.com [10.36.112.48]) by smtp.corp.redhat.com (Postfix) with ESMTP id 87F935F729; Sun, 4 Apr 2021 07:52:58 +0000 (UTC) From: Hans de Goede To: Jiri Kosina , Benjamin Tissoires Cc: Hans de Goede , linux-input@vger.kernel.org, linux-leds@vger.kernel.org, =?utf-8?q?Marek_Beh=C3=BAn?= , Pavel Machek Subject: [PATCH resend 1/3] HID: elan: Silence mute LED errors being logged when the device is unplugged Date: Sun, 4 Apr 2021 09:52:50 +0200 Message-Id: <20210404075252.4032-2-hdegoede@redhat.com> In-Reply-To: <20210404075252.4032-1-hdegoede@redhat.com> References: <20210404075252.4032-1-hdegoede@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Precedence: bulk List-ID: X-Mailing-List: linux-leds@vger.kernel.org Being integrated into an USB keyboard-dock the mute LED can go away at any time, leading to the following errors: [ 918.667671] elan 0003:04F3:0755.0002: Failed to set mute led brightness: -19 [ 918.667737] leds elan:red:mute: Setting an LED's brightness failed (-19) Fix this by making the following changes: 1. Don't log an error from elan_mute_led_set_brigtness() when ret == -ENODEV 2. Set the LED_HW_PLUGGABLE flag on the mute LED led_classdev While at it also make sure that elan_mute_led_set_brigtness() returns an error (-EIO) when ret != 3 but it is not an error (>= 0). Reviewed-by: Marek Behún Acked-by: Pavel Machek Signed-off-by: Hans de Goede --- Changes in v2: - Return -EIO when ret != 3 and >= 0 --- drivers/hid/hid-elan.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/hid/hid-elan.c b/drivers/hid/hid-elan.c index dae193749d44..473d8528319d 100644 --- a/drivers/hid/hid-elan.c +++ b/drivers/hid/hid-elan.c @@ -445,8 +445,9 @@ static int elan_mute_led_set_brigtness(struct led_classdev *led_cdev, kfree(dmabuf); if (ret != ELAN_LED_REPORT_SIZE) { - hid_err(hdev, "Failed to set mute led brightness: %d\n", ret); - return ret; + if (ret != -ENODEV) + hid_err(hdev, "Failed to set mute led brightness: %d\n", ret); + return ret < 0 ? ret : -EIO; } drvdata->mute_led_state = led_state; @@ -462,6 +463,7 @@ static int elan_init_mute_led(struct hid_device *hdev) mute_led->brightness_get = elan_mute_led_get_brigtness; mute_led->brightness_set_blocking = elan_mute_led_set_brigtness; mute_led->max_brightness = LED_ON; + mute_led->flags = LED_HW_PLUGGABLE; mute_led->dev = &hdev->dev; return devm_led_classdev_register(&hdev->dev, mute_led); From patchwork Sun Apr 4 07:52:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Hans de Goede X-Patchwork-Id: 415205 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B761CC433B4 for ; Sun, 4 Apr 2021 07:53:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 742E961350 for ; Sun, 4 Apr 2021 07:53:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229788AbhDDHxN (ORCPT ); Sun, 4 Apr 2021 03:53:13 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:34127 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229911AbhDDHxL (ORCPT ); Sun, 4 Apr 2021 03:53:11 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1617522787; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=OH7Cn7XqLYo+eqHaDWyQ7QOLJNfARghqSu/3lHuBKNg=; b=K0BuRVR+6eL7U6io+lo29BpPZj32xJ3IPyAfalyNkwUDrS+7pI/VvuZbj2j98G43i95pqV QgbmkL1+8dmkOnS36wZsgKi4quonztnU63PH69F5iJjWmwW2UxgQb3XMymwFATL92S0J79 c8GEb665hApmNLoryjj/AFBnbPmsWCo= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-571-p7lc4vKlPjy6O5XvMI5O1A-1; Sun, 04 Apr 2021 03:53:03 -0400 X-MC-Unique: p7lc4vKlPjy6O5XvMI5O1A-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0BB811005D4F; Sun, 4 Apr 2021 07:53:02 +0000 (UTC) Received: from x1.localdomain (ovpn-112-48.ams2.redhat.com [10.36.112.48]) by smtp.corp.redhat.com (Postfix) with ESMTP id 59D0B1B534; Sun, 4 Apr 2021 07:53:00 +0000 (UTC) From: Hans de Goede To: Jiri Kosina , Benjamin Tissoires Cc: Hans de Goede , linux-input@vger.kernel.org, linux-leds@vger.kernel.org, =?utf-8?q?Marek_Beh=C3=BAn?= , Pavel Machek Subject: [PATCH resend 2/3] HID: elan: Set default_trigger for the mute LED Date: Sun, 4 Apr 2021 09:52:51 +0200 Message-Id: <20210404075252.4032-3-hdegoede@redhat.com> In-Reply-To: <20210404075252.4032-1-hdegoede@redhat.com> References: <20210404075252.4032-1-hdegoede@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Precedence: bulk List-ID: X-Mailing-List: linux-leds@vger.kernel.org The mute LED should be automatically turned on/off based on the audio-card's mixer settings. Add the standardized default-trigger name for this, so that the alsa code can turn the LED on/off as appropriate (on supported audio cards). Reviewed-by: Marek Behún Acked-by: Pavel Machek Signed-off-by: Hans de Goede --- drivers/hid/hid-elan.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/hid/hid-elan.c b/drivers/hid/hid-elan.c index 473d8528319d..5173f50d474d 100644 --- a/drivers/hid/hid-elan.c +++ b/drivers/hid/hid-elan.c @@ -460,6 +460,7 @@ static int elan_init_mute_led(struct hid_device *hdev) struct led_classdev *mute_led = &drvdata->mute_led; mute_led->name = "elan:red:mute"; + mute_led->default_trigger = "audio-mute"; mute_led->brightness_get = elan_mute_led_get_brigtness; mute_led->brightness_set_blocking = elan_mute_led_set_brigtness; mute_led->max_brightness = LED_ON; From patchwork Sun Apr 4 07:52:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Hans de Goede X-Patchwork-Id: 415485 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 56C5EC43460 for ; Sun, 4 Apr 2021 07:53:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 25FE96124B for ; Sun, 4 Apr 2021 07:53:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230037AbhDDHxN (ORCPT ); Sun, 4 Apr 2021 03:53:13 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:29138 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229950AbhDDHxK (ORCPT ); Sun, 4 Apr 2021 03:53:10 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1617522786; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8F2L8XZBcnlIjAt8iGkwkSWvI1GfQmnb5P2PUhjAY94=; b=KmPm4zfd+vzkZw85fwd6O0K147R/di5wyTOczaGG+j5oF/HQq/hx7BWLEXDcEFa+OU/B+F CRBHY9CWfwR5tQ4lkgx59IeuM2A+8okHJAzTyQLA5keQtr06mxDLjmaW+WuYo3TUX9Osm5 9/bLwsxoFYEeE+wIrdwt3w5KxOz9F/A= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-580-T9d1aV7wPx6UQvghizka9g-1; Sun, 04 Apr 2021 03:53:04 -0400 X-MC-Unique: T9d1aV7wPx6UQvghizka9g-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B16B58030A1; Sun, 4 Apr 2021 07:53:03 +0000 (UTC) Received: from x1.localdomain (ovpn-112-48.ams2.redhat.com [10.36.112.48]) by smtp.corp.redhat.com (Postfix) with ESMTP id 535535C5DF; Sun, 4 Apr 2021 07:53:02 +0000 (UTC) From: Hans de Goede To: Jiri Kosina , Benjamin Tissoires Cc: Hans de Goede , linux-input@vger.kernel.org, linux-leds@vger.kernel.org, =?utf-8?q?Marek_Beh=C3=BAn?= , Pavel Machek Subject: [PATCH resend 3/3] HID: elan: Remove elan_mute_led_get_brigtness() Date: Sun, 4 Apr 2021 09:52:52 +0200 Message-Id: <20210404075252.4032-4-hdegoede@redhat.com> In-Reply-To: <20210404075252.4032-1-hdegoede@redhat.com> References: <20210404075252.4032-1-hdegoede@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Precedence: bulk List-ID: X-Mailing-List: linux-leds@vger.kernel.org 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 elan_mute_led_get_brigtness() just returns the last set value it does not add any functionality, so we can just remove it. Reviewed-by: Marek Behún Acked-by: Pavel Machek Signed-off-by: Hans de Goede --- drivers/hid/hid-elan.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/drivers/hid/hid-elan.c b/drivers/hid/hid-elan.c index 5173f50d474d..021049805bb7 100644 --- a/drivers/hid/hid-elan.c +++ b/drivers/hid/hid-elan.c @@ -410,15 +410,6 @@ static int elan_start_multitouch(struct hid_device *hdev) return 0; } -static enum led_brightness elan_mute_led_get_brigtness(struct led_classdev *led_cdev) -{ - struct device *dev = led_cdev->dev->parent; - struct hid_device *hdev = to_hid_device(dev); - struct elan_drvdata *drvdata = hid_get_drvdata(hdev); - - return drvdata->mute_led_state; -} - static int elan_mute_led_set_brigtness(struct led_classdev *led_cdev, enum led_brightness value) { @@ -461,7 +452,6 @@ static int elan_init_mute_led(struct hid_device *hdev) mute_led->name = "elan:red:mute"; mute_led->default_trigger = "audio-mute"; - mute_led->brightness_get = elan_mute_led_get_brigtness; mute_led->brightness_set_blocking = elan_mute_led_set_brigtness; mute_led->max_brightness = LED_ON; mute_led->flags = LED_HW_PLUGGABLE;