From patchwork Fri Feb 17 07:57:49 2017 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: 9579055 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 F165B6049F for ; Fri, 17 Feb 2017 07:59:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E56CA286A8 for ; Fri, 17 Feb 2017 07:59:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D9E12286AD; Fri, 17 Feb 2017 07:59:43 +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=-6.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_HI,RCVD_IN_SORBS_SPAM autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 59F8F286A8 for ; Fri, 17 Feb 2017 07:59:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932193AbdBQH7Y (ORCPT ); Fri, 17 Feb 2017 02:59:24 -0500 Received: from mail-lf0-f66.google.com ([209.85.215.66]:36749 "EHLO mail-lf0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755235AbdBQH6G (ORCPT ); Fri, 17 Feb 2017 02:58:06 -0500 Received: by mail-lf0-f66.google.com with SMTP id h65so3173962lfi.3 for ; Thu, 16 Feb 2017 23:58:06 -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=vzuxlCqMtrFqVlVqakPztPefvpUQh3sSuZscpDyJE/s=; b=mKlfktS7UOvCB+MF73AEE57vW3Zle/Y4V9goPtOEkyZ85qm0/TGO81PhmlIKzYTCKg XY6ZDCk3EpdcBk9R7hPyH/Owt/KQAAh1ibhtfQojf+TRMdx5oq+Jv3VOv6Yys/32ltD9 CmQuFED1c+QWvKzhpmflsL6AqrI9G0E8AKiyM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=vzuxlCqMtrFqVlVqakPztPefvpUQh3sSuZscpDyJE/s=; b=cbLM/PZBwS8ZK3lHALsfmPjZ0cpLkhK2OCVdpSr+B6PXJTonB8t0fNhlXWLM+A9bXx wlPKw5tyrO1OFqnKEVYvDaxmx821/HrM6T21S/nDo27/MEOimI2VzSOPlIWt16kB4oiD eQ9kUkOqqXWajve0C/W96eq4QXz6tA1PPfGLyYlVUbS/BvvflDOs3eKT/evWNpqTslV0 wJ1kb/5XGUmENrh9LAVZe1U2npdcheENdR0I3ihG+7QsvNSb5aVxdAyY1aYneT3x4PGS ccszdEdwd5EX18zib5PTG3z8tF0P70Z2TaSQ5cGMT0FeATMlgwkY70FInUW/VgleiByI 8H5g== X-Gm-Message-State: AMke39nLe8CkxWCHbmCrVBHD/745wGxeyxHubJ1Oqy9zgi9/svJa+bK+msJ4BtovxGQm+g== X-Received: by 10.25.157.146 with SMTP id g140mr1880612lfe.123.1487318285185; Thu, 16 Feb 2017 23:58:05 -0800 (PST) Received: from ozzy.nask.waw.pl ([2001:a10:160:3::3]) by smtp.googlemail.com with ESMTPSA id 206sm2336457ljf.35.2017.02.16.23.58.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 16 Feb 2017 23:58:04 -0800 (PST) From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= To: Richard Purdie , Jacek Anaszewski , Pavel Machek , Matthew Garrett , =?UTF-8?q?Pali=20Roh=C3=A1r?= , Darren Hart , Andy Shevchenko , Jaroslav Kysela , Takashi Iwai Cc: Alex Hung , linux-leds@vger.kernel.org, platform-driver-x86@vger.kernel.org, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 3/7] ALSA: hda - rename dell_led_set_func to dell_micmute_led_set_func Date: Fri, 17 Feb 2017 08:57:49 +0100 Message-Id: <20170217075753.12702-4-kernel@kempniu.pl> X-Mailer: git-send-email 2.11.1 In-Reply-To: <20170217075753.12702-1-kernel@kempniu.pl> References: <20170217075753.12702-1-kernel@kempniu.pl> MIME-Version: 1.0 Sender: platform-driver-x86-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: platform-driver-x86@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP With dell_app_wmi_led_set() replaced by dell_micmute_led_set(), rename the function pointer to the latter for consistency. Signed-off-by: Michał Kępień Tested-by: Alex Hung Reviewed-by: Pali Rohár Acked-by: Takashi Iwai --- sound/pci/hda/dell_wmi_helper.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/sound/pci/hda/dell_wmi_helper.c b/sound/pci/hda/dell_wmi_helper.c index e128c8096772..516237ad6ef5 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); +static int (*dell_micmute_led_set_func)(int); static void (*dell_old_cap_hook)(struct hda_codec *, struct snd_kcontrol *, struct snd_ctl_elem_value *); @@ -18,7 +18,7 @@ static void update_dell_wmi_micmute_led(struct hda_codec *codec, if (dell_old_cap_hook) dell_old_cap_hook(codec, kcontrol, ucontrol); - if (!ucontrol || !dell_led_set_func) + if (!ucontrol || !dell_micmute_led_set_func) return; if (strcmp("Capture Switch", ucontrol->id.name) == 0 && ucontrol->id.index == 0) { /* TODO: How do I verify if it's a mono or stereo here? */ @@ -26,8 +26,8 @@ static void update_dell_wmi_micmute_led(struct hda_codec *codec, if (val == dell_led_value) return; dell_led_value = val; - if (dell_led_set_func) - dell_led_set_func(dell_led_value); + if (dell_micmute_led_set_func) + dell_micmute_led_set_func(dell_led_value); } } @@ -39,15 +39,15 @@ static void alc_fixup_dell_wmi(struct hda_codec *codec, bool removefunc = false; if (action == HDA_FIXUP_ACT_PROBE) { - if (!dell_led_set_func) - dell_led_set_func = symbol_request(dell_micmute_led_set); - if (!dell_led_set_func) { + if (!dell_micmute_led_set_func) + dell_micmute_led_set_func = symbol_request(dell_micmute_led_set); + if (!dell_micmute_led_set_func) { codec_warn(codec, "Failed to find dell wmi symbol dell_micmute_led_set\n"); return; } removefunc = true; - if (dell_led_set_func(false) >= 0) { + if (dell_micmute_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"); @@ -60,9 +60,9 @@ static void alc_fixup_dell_wmi(struct hda_codec *codec, } - if (dell_led_set_func && (action == HDA_FIXUP_ACT_FREE || removefunc)) { + if (dell_micmute_led_set_func && (action == HDA_FIXUP_ACT_FREE || removefunc)) { symbol_put(dell_micmute_led_set); - dell_led_set_func = NULL; + dell_micmute_led_set_func = NULL; dell_old_cap_hook = NULL; } }