linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Michał Kępień" <kernel@kempniu.pl>
To: "Richard Purdie" <rpurdie@rpsys.net>,
	"Jacek Anaszewski" <j.anaszewski@samsung.com>,
	"Matthew Garrett" <mjg59@srcf.ucam.org>,
	"Pali Rohár" <pali.rohar@gmail.com>,
	"Darren Hart" <dvhart@infradead.org>,
	"Jaroslav Kysela" <perex@perex.cz>,
	"Takashi Iwai" <tiwai@suse.com>
Cc: Bob Rodgers <Robert_Rodgers@dell.com>,
	Louis Davis <Louis_Davis@dell.com>,
	Jim Dailey <Jim_Dailey@dell.com>,
	Alex Hung <alex.hung@canonical.com>,
	Hui Wang <hui.wang@canonical.com>,
	linux-leds@vger.kernel.org, platform-driver-x86@vger.kernel.org,
	alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org
Subject: [PATCH 3/7] ALSA: hda - use dell_micmute_led_set() instead of dell_app_wmi_led_set()
Date: Thu,  8 Dec 2016 13:36:14 +0100	[thread overview]
Message-ID: <20161208123618.28603-4-kernel@kempniu.pl> (raw)
In-Reply-To: <20161208123618.28603-1-kernel@kempniu.pl>

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ń <kernel@kempniu.pl>
---
 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 <linux/dell-led.h>
 
 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;
 	}
-- 
2.10.2

  parent reply	other threads:[~2016-12-08 12:38 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <CGME20161208123909epcas3p23229f5e0d337e19a27b272211798d364@epcas3p2.samsung.com>
2016-12-08 12:36 ` [PATCH 0/7] Move dell-led to drivers/platform/x86 Michał Kępień
2016-12-08 12:36   ` [PATCH 1/7] dell-led: remove GUID check from dell_micmute_led_set() Michał Kępień
2016-12-09  9:20     ` Pali Rohár
2016-12-15 14:34       ` Michał Kępień
2016-12-08 12:36   ` [PATCH 2/7] dell-led: export dell_micmute_led_set() Michał Kępień
2016-12-08 12:36   ` Michał Kępień [this message]
2016-12-11 10:40     ` [PATCH 3/7] ALSA: hda - use dell_micmute_led_set() instead of dell_app_wmi_led_set() Pali Rohár
2016-12-15 14:46       ` Michał Kępień
2016-12-15 15:43         ` Pali Rohár
2016-12-15 19:22           ` Michał Kępień
2017-01-09 13:26             ` Michał Kępień
2017-01-09 14:47               ` Takashi Iwai
2017-01-10  5:28                 ` Michał Kępień
2016-12-08 12:36   ` [PATCH 4/7] dell-led: remove dell_app_wmi_led_set() Michał Kępień
2016-12-11 10:40     ` Pali Rohár
2016-12-14  1:54       ` Andy Shevchenko
2016-12-14  1:57         ` Andy Shevchenko
2016-12-15 14:48           ` Michał Kępień
2016-12-08 12:36   ` [PATCH 5/7] dell-laptop: import dell_micmute_led_set() from drivers/leds/dell-led.c Michał Kępień
2016-12-08 12:36   ` [PATCH 6/7] dell-led: remove code related to mic mute LED Michał Kępień
2016-12-08 12:36   ` [PATCH 7/7] dell-led: move driver to drivers/platform/x86/dell-wmi-led.c Michał Kępień
2016-12-14  2:05     ` Andy Shevchenko
2016-12-15 14:54       ` Michał Kępień
2016-12-08 14:26   ` [PATCH 0/7] Move dell-led to drivers/platform/x86 Jacek Anaszewski
2016-12-11 10:45     ` Pali Rohár

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20161208123618.28603-4-kernel@kempniu.pl \
    --to=kernel@kempniu.pl \
    --cc=Jim_Dailey@dell.com \
    --cc=Louis_Davis@dell.com \
    --cc=Robert_Rodgers@dell.com \
    --cc=alex.hung@canonical.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=dvhart@infradead.org \
    --cc=hui.wang@canonical.com \
    --cc=j.anaszewski@samsung.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-leds@vger.kernel.org \
    --cc=mjg59@srcf.ucam.org \
    --cc=pali.rohar@gmail.com \
    --cc=perex@perex.cz \
    --cc=platform-driver-x86@vger.kernel.org \
    --cc=rpurdie@rpsys.net \
    --cc=tiwai@suse.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).