From patchwork Mon Jan 16 13:22:01 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: 9518741 X-Patchwork-Delegate: andy.shevchenko@gmail.com 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 BD8446020B for ; Mon, 16 Jan 2017 13:23:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A2F6328438 for ; Mon, 16 Jan 2017 13:23:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 97A4B28458; Mon, 16 Jan 2017 13:23:47 +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=ham 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 418D628438 for ; Mon, 16 Jan 2017 13:23:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751599AbdAPNXq (ORCPT ); Mon, 16 Jan 2017 08:23:46 -0500 Received: from mail-lf0-f67.google.com ([209.85.215.67]:33831 "EHLO mail-lf0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751376AbdAPNW2 (ORCPT ); Mon, 16 Jan 2017 08:22:28 -0500 Received: by mail-lf0-f67.google.com with SMTP id q89so12618241lfi.1 for ; Mon, 16 Jan 2017 05:22:28 -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=Z1fTQAKOn64Jix0vzVwQZMtIXD+6vnmaR1YN7w6mxG8=; b=IwnZr6uvYmVwH3O2d4atWbe79/hphw6PJylkVZ4kYnhPqo4v5KjAFPg9skQh1NqhtB twQ3CFa//rr7BJacEfPIwdH89yBMIiUWYAVoyohmheZ6EzuPL/DinjtUgJWhZsYtZiIZ yQqHCh1BPFM5KNIOgx2w4u2gJ32PHgzx2ovkc= 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=Z1fTQAKOn64Jix0vzVwQZMtIXD+6vnmaR1YN7w6mxG8=; b=dBzv4QqmY4slePKs9idUsV+byt4Y2SCcGMukOI5x9FCG06MlmmUe87W3G36VMKoY22 K1aYuJWw5o+iYHYzoTLg36cRKZHXc7FsLOgE9obuUYAhiykS6XTCXfEjZXmaS8n4FzBw KdI+OXPk5fhyU1ozKOObF/rjwUgcWO0Q2HRBnsO+QB94oGOnAh6Sbo6mBCO/83PQhXid pZ5xLX7vvbxWmhOEzQuzrgSgfmgBQgxUn6tKuM3wQQwXpOdNkuvCvwVJUkbFNHdiVxO0 m7BodeKIn+KooiTcFzkNkMK6fYBc6818xiusWs/MdCT/hiIuFdeTkj68DtJW1t7DIi6S 1R3A== X-Gm-Message-State: AIkVDXIXT1MD3AenZKK8xfhm6E5e04dsYGGh/QDM6mj6cmJnKN/5AyIUdrsHK1ILTZp60Q== X-Received: by 10.25.196.197 with SMTP id u188mr9957058lff.180.1484572947121; Mon, 16 Jan 2017 05:22:27 -0800 (PST) Received: from ozzy.hq.kempniu.pl ([2001:a10:160:3::3]) by smtp.googlemail.com with ESMTPSA id b62sm7270115lfb.24.2017.01.16.05.22.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Jan 2017 05:22:26 -0800 (PST) From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= To: Richard Purdie , Jacek Anaszewski , Pavel Machek , =?UTF-8?q?Pali=20Roh=C3=A1r?= , Darren Hart , Jaroslav Kysela , Takashi Iwai Cc: Andy Shevchenko , Anthony Wong , linux-leds@vger.kernel.org, platform-driver-x86@vger.kernel.org, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 3/6] ALSA: hda - rename dell_led_set_func to dell_micmute_led_set_func Date: Mon, 16 Jan 2017 14:22:01 +0100 Message-Id: <20170116132204.6421-4-kernel@kempniu.pl> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170116132204.6421-1-kernel@kempniu.pl> References: <20170116132204.6421-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ń Reviewed-by: Pali Rohár --- 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; } }