From patchwork Sun Feb 21 11:30:27 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: 385636 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=-16.0 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 26DF5C433E0 for ; Sun, 21 Feb 2021 11:32:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F011464EE6 for ; Sun, 21 Feb 2021 11:32:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229817AbhBULcH (ORCPT ); Sun, 21 Feb 2021 06:32:07 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:31210 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229903AbhBULcG (ORCPT ); Sun, 21 Feb 2021 06:32:06 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1613907039; 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=RGhoaiUahRGEqg6YAu1OLbTZWon7ll7ymdptKdOKNCc=; b=Au31YoLW8cKVpmzdIrNWCEjkLA6ajwbDCbJEZVHXaWciNKGzhzhSp0I25Q6SzQ9splZKrE RqozzCZKFj5j2gL8IMAJ5sTqM5SAL7Tnq7yV8of+P+PMQAZPG53euaw/sa4+fh8BaxJ1UK JwYEycvXvCHsutfrXbhpuPYl0h3sHwk= 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-152-IpQAVNBeNgqFWX0TVZqZIw-1; Sun, 21 Feb 2021 06:30:38 -0500 X-MC-Unique: IpQAVNBeNgqFWX0TVZqZIw-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E0721C291; Sun, 21 Feb 2021 11:30:36 +0000 (UTC) Received: from x1.localdomain (ovpn-112-87.ams2.redhat.com [10.36.112.87]) by smtp.corp.redhat.com (Postfix) with ESMTP id 743751002391; Sun, 21 Feb 2021 11:30:35 +0000 (UTC) From: Hans de Goede To: Jiri Kosina , Benjamin Tissoires Cc: Hans de Goede , =?utf-8?q?Marek_Beh=C3=BAn?= , linux-input@vger.kernel.org, linux-leds@vger.kernel.org, alsa-devel@alsa-project.org Subject: [PATCH v2 1/3] HID: elan: Silence mute LED errors being logged when the device is unplugged Date: Sun, 21 Feb 2021 12:30:27 +0100 Message-Id: <20210221113029.103703-2-hdegoede@redhat.com> In-Reply-To: <20210221113029.103703-1-hdegoede@redhat.com> References: <20210221113029.103703-1-hdegoede@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 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 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 Feb 21 11:30:28 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: 385635 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=-16.0 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 2FF6FC43381 for ; Sun, 21 Feb 2021 11:32:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0654564EE6 for ; Sun, 21 Feb 2021 11:32:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229588AbhBULcN (ORCPT ); Sun, 21 Feb 2021 06:32:13 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:58880 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229943AbhBULcH (ORCPT ); Sun, 21 Feb 2021 06:32:07 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1613907041; 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=4wid0Z8fb2fJ7PI5rh7yKNoRd4ZHKZ5fW47Zor2VmIs=; b=Pg130a0x6u/WZXw8tmZLwgal1mbXDB+tKyXLUCK1xffJSRFiDgo/uzlcHMtib/3StG257M 8Cdi72v9hBUvsDGO5wuJ2ifregApnBo1Z6Vep7PotPlQWZnewAxMFRwhXSpH8U8/RFJK+D U9AhJI5n8GEeGG1hK00ufFW/QbRzt8g= 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-189-R0Pjf0OLOpSJfEPMd6_Szw-1; Sun, 21 Feb 2021 06:30:39 -0500 X-MC-Unique: R0Pjf0OLOpSJfEPMd6_Szw-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9B1AF801965; Sun, 21 Feb 2021 11:30:38 +0000 (UTC) Received: from x1.localdomain (ovpn-112-87.ams2.redhat.com [10.36.112.87]) by smtp.corp.redhat.com (Postfix) with ESMTP id 332AC1001281; Sun, 21 Feb 2021 11:30:37 +0000 (UTC) From: Hans de Goede To: Jiri Kosina , Benjamin Tissoires Cc: Hans de Goede , =?utf-8?q?Marek_Beh=C3=BAn?= , linux-input@vger.kernel.org, linux-leds@vger.kernel.org, alsa-devel@alsa-project.org Subject: [PATCH v2 2/3] HID: elan: Set default_trigger for the mute LED Date: Sun, 21 Feb 2021 12:30:28 +0100 Message-Id: <20210221113029.103703-3-hdegoede@redhat.com> In-Reply-To: <20210221113029.103703-1-hdegoede@redhat.com> References: <20210221113029.103703-1-hdegoede@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 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 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 Feb 21 11:30:29 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: 385961 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=-16.0 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 7033BC4332B for ; Sun, 21 Feb 2021 11:32:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 40B6064EE6 for ; Sun, 21 Feb 2021 11:32:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229802AbhBULcN (ORCPT ); Sun, 21 Feb 2021 06:32:13 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:28988 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229663AbhBULcJ (ORCPT ); Sun, 21 Feb 2021 06:32:09 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1613907043; 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=jRvDIk6w5R7tTJTlwErthP/8a9L/ZRRF5eq/nuQxcH8=; b=O0a+hCLCNk6LB/xTKTYU/u80p6R1FxjpUdH3SeCzAdnTahb4F+jWqIclH1y839xbj+dymK DKSNNKyaRLJ/GcS7YaLkm8B2RjWhOv1ZM+/+48v+1QeRWGYh+jO1bmDBlhzc9JN4sxS4H5 oZ/EvypLEo7qgwySDcXNQEd7yJSv5m4= 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-270-BKvnVWu4OxaWoFxFu5FipQ-1; Sun, 21 Feb 2021 06:30:41 -0500 X-MC-Unique: BKvnVWu4OxaWoFxFu5FipQ-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 65826107ACE8; Sun, 21 Feb 2021 11:30:40 +0000 (UTC) Received: from x1.localdomain (ovpn-112-87.ams2.redhat.com [10.36.112.87]) by smtp.corp.redhat.com (Postfix) with ESMTP id E22B91001281; Sun, 21 Feb 2021 11:30:38 +0000 (UTC) From: Hans de Goede To: Jiri Kosina , Benjamin Tissoires Cc: Hans de Goede , =?utf-8?q?Marek_Beh=C3=BAn?= , linux-input@vger.kernel.org, linux-leds@vger.kernel.org, alsa-devel@alsa-project.org Subject: [PATCH v2 3/3] HID: elan: Remove elan_mute_led_get_brigtness() Date: Sun, 21 Feb 2021 12:30:29 +0100 Message-Id: <20210221113029.103703-4-hdegoede@redhat.com> In-Reply-To: <20210221113029.103703-1-hdegoede@redhat.com> References: <20210221113029.103703-1-hdegoede@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 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 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;