From patchwork Thu Dec 8 12:36:14 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?TWljaGHFgiBLxJlwaWXFhA==?= X-Patchwork-Id: 9467967 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 9767760231 for ; Fri, 9 Dec 2016 11:23:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7F494285DE for ; Fri, 9 Dec 2016 11:23:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 73871285F8; Fri, 9 Dec 2016 11:23:28 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_NONE,RCVD_IN_SORBS_SPAM,T_DKIM_INVALID autolearn=no version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8C9C3285DE for ; Fri, 9 Dec 2016 11:23:27 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id B11B9267772; Fri, 9 Dec 2016 12:23:25 +0100 (CET) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 87C2F266DA6; Fri, 9 Dec 2016 12:21:05 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 5FC7C26745B; Thu, 8 Dec 2016 13:37:13 +0100 (CET) Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by alsa0.perex.cz (Postfix) with ESMTP id ABE242668F6 for ; Thu, 8 Dec 2016 13:37:09 +0100 (CET) Received: by mail-wm0-f65.google.com with SMTP id g23so3327578wme.1 for ; Thu, 08 Dec 2016 04:37:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kempniu.pl; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=CYJ1a+iIYFjoDblZFkQYZfwaDAnlhBlGu9TJlNwBJDc=; b=BzgJ/rJMUvEBSqObV5WFbHpYVVMQnkm75zfpDrPvQ1FJ9H7l4l9eL06yvmEzabQk1t 4rgyOL5u9Fjy2Eus3A0mMelp3jsUV7vPgLiktoREEISAZ07N8PvuvE8YHVUI0uJtYA2l 2aSp28uR+xetmd3sWBMRCpgvH5WC3yMs3+mHI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=CYJ1a+iIYFjoDblZFkQYZfwaDAnlhBlGu9TJlNwBJDc=; b=lGGrhmhDIcSr8j4Ojo0gQwuZbjSO9H/enKlVM37fb/DS8zpcF77BFyxvFl7Nn3nqPL MnKjSI1QkdPXwtm/VmkG6YV3v4Fh9Q0XIBF4oqtufio7ZCUGP/ADU1lufS5u7bitGUoG 0gDuiyuHS9xbF1SelA+TFm6oVtfFB3v8Vse09hEMghGW/vuMPDz4aivFNZrjh2FJTQ3R UXYXitdukykViYjAT8R7DAgyQBTLBr0TAwGGyUI30/Dw5Zgz/bzEhLdHKvRMJJUxdqWg rEHo5W8prr+tfj8cG3olX27IZeQIqTvAdSYHzBrt3mMZAY+R5BXUOgcMasbY9IRUoe13 AtCw== X-Gm-Message-State: AKaTC01gBNBG73Jcw5dJ0H8mWRxVtl83rmsX9YMzIWF6vn7NIR+1gGnsD718ae0zQ+yl/A== X-Received: by 10.28.9.80 with SMTP id 77mr2108904wmj.68.1481200629110; Thu, 08 Dec 2016 04:37:09 -0800 (PST) Received: from kmp-mobile.hq.kempniu.pl (kmp-mobile.hq.kempniu.pl. [2001:6a0:200:83b0::2d90]) by smtp.googlemail.com with ESMTPSA id a13sm15095293wma.18.2016.12.08.04.37.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 Dec 2016 04:37:08 -0800 (PST) From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= To: Richard Purdie , Jacek Anaszewski , Matthew Garrett , =?UTF-8?q?Pali=20Roh=C3=A1r?= , Darren Hart , Jaroslav Kysela , Takashi Iwai Date: Thu, 8 Dec 2016 13:36:14 +0100 Message-Id: <20161208123618.28603-4-kernel@kempniu.pl> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20161208123618.28603-1-kernel@kempniu.pl> References: <20161208123618.28603-1-kernel@kempniu.pl> MIME-Version: 1.0 X-Mailman-Approved-At: Fri, 09 Dec 2016 10:19:33 +0100 Cc: alsa-devel@alsa-project.org, Louis Davis , linux-kernel@vger.kernel.org, Bob Rodgers , platform-driver-x86@vger.kernel.org, Hui Wang , Alex Hung , Jim Dailey , linux-leds@vger.kernel.org Subject: [alsa-devel] [PATCH 3/7] ALSA: hda - use dell_micmute_led_set() instead of dell_app_wmi_led_set() X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP When the dell_app_wmi_led_set() method was introduced in db6d8cc ("dell-led: add mic mute led interface"), it was implemented as an easily extensible entry point for other modules to set the state of various LEDs. However, almost three years later it is still only used to control the mic mute LED, so it will be replaced with direct calls to dell_micmute_led_set(). Signed-off-by: Michał Kępień --- sound/pci/hda/dell_wmi_helper.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sound/pci/hda/dell_wmi_helper.c b/sound/pci/hda/dell_wmi_helper.c index 19d41da..e128c80 100644 --- a/sound/pci/hda/dell_wmi_helper.c +++ b/sound/pci/hda/dell_wmi_helper.c @@ -6,7 +6,7 @@ #include static int dell_led_value; -static int (*dell_led_set_func)(int, int); +static int (*dell_led_set_func)(int); static void (*dell_old_cap_hook)(struct hda_codec *, struct snd_kcontrol *, struct snd_ctl_elem_value *); @@ -27,7 +27,7 @@ static void update_dell_wmi_micmute_led(struct hda_codec *codec, return; dell_led_value = val; if (dell_led_set_func) - dell_led_set_func(DELL_LED_MICMUTE, dell_led_value); + dell_led_set_func(dell_led_value); } } @@ -40,14 +40,14 @@ static void alc_fixup_dell_wmi(struct hda_codec *codec, if (action == HDA_FIXUP_ACT_PROBE) { if (!dell_led_set_func) - dell_led_set_func = symbol_request(dell_app_wmi_led_set); + dell_led_set_func = symbol_request(dell_micmute_led_set); if (!dell_led_set_func) { - codec_warn(codec, "Failed to find dell wmi symbol dell_app_wmi_led_set\n"); + codec_warn(codec, "Failed to find dell wmi symbol dell_micmute_led_set\n"); return; } removefunc = true; - if (dell_led_set_func(DELL_LED_MICMUTE, false) >= 0) { + if (dell_led_set_func(false) >= 0) { dell_led_value = 0; if (spec->gen.num_adc_nids > 1 && !spec->gen.dyn_adc_switch) codec_dbg(codec, "Skipping micmute LED control due to several ADCs"); @@ -61,7 +61,7 @@ static void alc_fixup_dell_wmi(struct hda_codec *codec, } if (dell_led_set_func && (action == HDA_FIXUP_ACT_FREE || removefunc)) { - symbol_put(dell_app_wmi_led_set); + symbol_put(dell_micmute_led_set); dell_led_set_func = NULL; dell_old_cap_hook = NULL; }