Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1559721 > unrolled thread
| Started by | Michał Kępień <kernel@kempniu.pl> |
|---|---|
| First post | 2017-01-16 14:30 +0100 |
| Last post | 2017-01-18 20:20 +0100 |
| Articles | 3 — 3 participants |
Back to article view | Back to linux.kernel
This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by
below is the oldest one visible, not the original post.
[PATCH v2 4/6] platform/x86: dell-laptop: import dell_micmute_led_set() from drivers/leds/dell-led.c Michał Kępień <kernel@kempniu.pl> - 2017-01-16 14:30 +0100
Re: [PATCH v2 4/6] platform/x86: dell-laptop: import dell_micmute_led_set() from drivers/leds/dell-led.c Pali Rohár <pali.rohar@gmail.com> - 2017-01-17 12:30 +0100
Re: [PATCH v2 4/6] platform/x86: dell-laptop: import dell_micmute_led_set() from drivers/leds/dell-led.c Andy Shevchenko <andy.shevchenko@gmail.com> - 2017-01-18 20:20 +0100
| From | Michał Kępień <kernel@kempniu.pl> |
|---|---|
| Date | 2017-01-16 14:30 +0100 |
| Subject | [PATCH v2 4/6] platform/x86: dell-laptop: import dell_micmute_led_set() from drivers/leds/dell-led.c |
| Message-ID | <t0fwe-WM-29@gated-at.bofh.it> |
To ensure all users of dell-smbios are in drivers/platform/x86, move the
dell_micmute_led_set() method from drivers/leds/dell-led.c to
drivers/platform/x86/dell-laptop.c.
Signed-off-by: Michał Kępień <kernel@kempniu.pl>
---
drivers/leds/dell-led.c | 29 -----------------------------
drivers/platform/x86/dell-laptop.c | 28 ++++++++++++++++++++++++++++
sound/pci/hda/dell_wmi_helper.c | 6 +++---
3 files changed, 31 insertions(+), 32 deletions(-)
diff --git a/drivers/leds/dell-led.c b/drivers/leds/dell-led.c
index f9002d9bb757..c9cc36a7c890 100644
--- a/drivers/leds/dell-led.c
+++ b/drivers/leds/dell-led.c
@@ -16,7 +16,6 @@
#include <linux/slab.h>
#include <linux/module.h>
#include <linux/dmi.h>
-#include <linux/dell-led.h>
#include "../platform/x86/dell-smbios.h"
MODULE_AUTHOR("Louis Davis/Jim Dailey");
@@ -43,34 +42,6 @@ MODULE_ALIAS("wmi:" DELL_LED_BIOS_GUID);
#define CMD_LED_OFF 17
#define CMD_LED_BLINK 18
-#define GLOBAL_MIC_MUTE_ENABLE 0x364
-#define GLOBAL_MIC_MUTE_DISABLE 0x365
-
-int dell_micmute_led_set(int state)
-{
- struct calling_interface_buffer *buffer;
- struct calling_interface_token *token;
-
- if (state == 0)
- token = dell_smbios_find_token(GLOBAL_MIC_MUTE_DISABLE);
- else if (state == 1)
- token = dell_smbios_find_token(GLOBAL_MIC_MUTE_ENABLE);
- else
- return -EINVAL;
-
- if (!token)
- return -ENODEV;
-
- buffer = dell_smbios_get_buffer();
- buffer->input[0] = token->location;
- buffer->input[1] = token->value;
- dell_smbios_send_request(1, 0);
- dell_smbios_release_buffer();
-
- return state;
-}
-EXPORT_SYMBOL_GPL(dell_micmute_led_set);
-
struct bios_args {
unsigned char length;
unsigned char result_code;
diff --git a/drivers/platform/x86/dell-laptop.c b/drivers/platform/x86/dell-laptop.c
index 2c2f02b2e08a..277656c74343 100644
--- a/drivers/platform/x86/dell-laptop.c
+++ b/drivers/platform/x86/dell-laptop.c
@@ -30,6 +30,7 @@
#include <linux/i8042.h>
#include <linux/debugfs.h>
#include <linux/seq_file.h>
+#include <linux/dell-led.h>
#include <acpi/video.h>
#include "dell-rbtn.h"
#include "dell-smbios.h"
@@ -42,6 +43,8 @@
#define KBD_LED_AUTO_50_TOKEN 0x02EB
#define KBD_LED_AUTO_75_TOKEN 0x02EC
#define KBD_LED_AUTO_100_TOKEN 0x02F6
+#define GLOBAL_MIC_MUTE_ENABLE 0x364
+#define GLOBAL_MIC_MUTE_DISABLE 0x365
struct quirk_entry {
u8 touchpad_led;
@@ -1970,6 +1973,31 @@ static void kbd_led_exit(void)
led_classdev_unregister(&kbd_led);
}
+int dell_micmute_led_set(int state)
+{
+ struct calling_interface_buffer *buffer;
+ struct calling_interface_token *token;
+
+ if (state == 0)
+ token = dell_smbios_find_token(GLOBAL_MIC_MUTE_DISABLE);
+ else if (state == 1)
+ token = dell_smbios_find_token(GLOBAL_MIC_MUTE_ENABLE);
+ else
+ return -EINVAL;
+
+ if (!token)
+ return -ENODEV;
+
+ buffer = dell_smbios_get_buffer();
+ buffer->input[0] = token->location;
+ buffer->input[1] = token->value;
+ dell_smbios_send_request(1, 0);
+ dell_smbios_release_buffer();
+
+ return state;
+}
+EXPORT_SYMBOL_GPL(dell_micmute_led_set);
+
static int __init dell_init(void)
{
struct calling_interface_buffer *buffer;
diff --git a/sound/pci/hda/dell_wmi_helper.c b/sound/pci/hda/dell_wmi_helper.c
index 516237ad6ef5..7efa7bd7acb2 100644
--- a/sound/pci/hda/dell_wmi_helper.c
+++ b/sound/pci/hda/dell_wmi_helper.c
@@ -2,7 +2,7 @@
* to be included from codec driver
*/
-#if IS_ENABLED(CONFIG_LEDS_DELL_NETBOOKS)
+#if IS_ENABLED(CONFIG_DELL_LAPTOP)
#include <linux/dell-led.h>
static int dell_led_value;
@@ -67,10 +67,10 @@ static void alc_fixup_dell_wmi(struct hda_codec *codec,
}
}
-#else /* CONFIG_LEDS_DELL_NETBOOKS */
+#else /* CONFIG_DELL_LAPTOP */
static void alc_fixup_dell_wmi(struct hda_codec *codec,
const struct hda_fixup *fix, int action)
{
}
-#endif /* CONFIG_LEDS_DELL_NETBOOKS */
+#endif /* CONFIG_DELL_LAPTOP */
--
2.11.0
[toc] | [next] | [standalone]
| From | Pali Rohár <pali.rohar@gmail.com> |
|---|---|
| Date | 2017-01-17 12:30 +0100 |
| Subject | Re: [PATCH v2 4/6] platform/x86: dell-laptop: import dell_micmute_led_set() from drivers/leds/dell-led.c |
| Message-ID | <t0A7E-6t2-21@gated-at.bofh.it> |
| In reply to | #1559721 |
On Monday 16 January 2017 14:22:02 Michał Kępień wrote:
> To ensure all users of dell-smbios are in drivers/platform/x86, move the
> dell_micmute_led_set() method from drivers/leds/dell-led.c to
> drivers/platform/x86/dell-laptop.c.
>
> Signed-off-by: Michał Kępień <kernel@kempniu.pl>
> ---
> drivers/leds/dell-led.c | 29 -----------------------------
> drivers/platform/x86/dell-laptop.c | 28 ++++++++++++++++++++++++++++
> sound/pci/hda/dell_wmi_helper.c | 6 +++---
> 3 files changed, 31 insertions(+), 32 deletions(-)
>
> diff --git a/drivers/leds/dell-led.c b/drivers/leds/dell-led.c
> index f9002d9bb757..c9cc36a7c890 100644
> --- a/drivers/leds/dell-led.c
> +++ b/drivers/leds/dell-led.c
> @@ -16,7 +16,6 @@
> #include <linux/slab.h>
> #include <linux/module.h>
> #include <linux/dmi.h>
> -#include <linux/dell-led.h>
> #include "../platform/x86/dell-smbios.h"
>
> MODULE_AUTHOR("Louis Davis/Jim Dailey");
> @@ -43,34 +42,6 @@ MODULE_ALIAS("wmi:" DELL_LED_BIOS_GUID);
> #define CMD_LED_OFF 17
> #define CMD_LED_BLINK 18
>
> -#define GLOBAL_MIC_MUTE_ENABLE 0x364
> -#define GLOBAL_MIC_MUTE_DISABLE 0x365
> -
> -int dell_micmute_led_set(int state)
> -{
> - struct calling_interface_buffer *buffer;
> - struct calling_interface_token *token;
> -
> - if (state == 0)
> - token = dell_smbios_find_token(GLOBAL_MIC_MUTE_DISABLE);
> - else if (state == 1)
> - token = dell_smbios_find_token(GLOBAL_MIC_MUTE_ENABLE);
> - else
> - return -EINVAL;
> -
> - if (!token)
> - return -ENODEV;
> -
> - buffer = dell_smbios_get_buffer();
> - buffer->input[0] = token->location;
> - buffer->input[1] = token->value;
> - dell_smbios_send_request(1, 0);
> - dell_smbios_release_buffer();
> -
> - return state;
> -}
> -EXPORT_SYMBOL_GPL(dell_micmute_led_set);
> -
> struct bios_args {
> unsigned char length;
> unsigned char result_code;
> diff --git a/drivers/platform/x86/dell-laptop.c b/drivers/platform/x86/dell-laptop.c
> index 2c2f02b2e08a..277656c74343 100644
> --- a/drivers/platform/x86/dell-laptop.c
> +++ b/drivers/platform/x86/dell-laptop.c
> @@ -30,6 +30,7 @@
> #include <linux/i8042.h>
> #include <linux/debugfs.h>
> #include <linux/seq_file.h>
> +#include <linux/dell-led.h>
> #include <acpi/video.h>
> #include "dell-rbtn.h"
> #include "dell-smbios.h"
> @@ -42,6 +43,8 @@
> #define KBD_LED_AUTO_50_TOKEN 0x02EB
> #define KBD_LED_AUTO_75_TOKEN 0x02EC
> #define KBD_LED_AUTO_100_TOKEN 0x02F6
> +#define GLOBAL_MIC_MUTE_ENABLE 0x364
> +#define GLOBAL_MIC_MUTE_DISABLE 0x365
For consistency with other constants, please add leading zero (0x0364) so
all constants will be fully 16bit.
Otherwise OK and you can add my Reviewed-by.
>
> struct quirk_entry {
> u8 touchpad_led;
> @@ -1970,6 +1973,31 @@ static void kbd_led_exit(void)
> led_classdev_unregister(&kbd_led);
> }
>
> +int dell_micmute_led_set(int state)
> +{
> + struct calling_interface_buffer *buffer;
> + struct calling_interface_token *token;
> +
> + if (state == 0)
> + token = dell_smbios_find_token(GLOBAL_MIC_MUTE_DISABLE);
> + else if (state == 1)
> + token = dell_smbios_find_token(GLOBAL_MIC_MUTE_ENABLE);
> + else
> + return -EINVAL;
> +
> + if (!token)
> + return -ENODEV;
> +
> + buffer = dell_smbios_get_buffer();
> + buffer->input[0] = token->location;
> + buffer->input[1] = token->value;
> + dell_smbios_send_request(1, 0);
> + dell_smbios_release_buffer();
> +
> + return state;
> +}
> +EXPORT_SYMBOL_GPL(dell_micmute_led_set);
> +
> static int __init dell_init(void)
> {
> struct calling_interface_buffer *buffer;
> diff --git a/sound/pci/hda/dell_wmi_helper.c b/sound/pci/hda/dell_wmi_helper.c
> index 516237ad6ef5..7efa7bd7acb2 100644
> --- a/sound/pci/hda/dell_wmi_helper.c
> +++ b/sound/pci/hda/dell_wmi_helper.c
> @@ -2,7 +2,7 @@
> * to be included from codec driver
> */
>
> -#if IS_ENABLED(CONFIG_LEDS_DELL_NETBOOKS)
> +#if IS_ENABLED(CONFIG_DELL_LAPTOP)
> #include <linux/dell-led.h>
>
> static int dell_led_value;
> @@ -67,10 +67,10 @@ static void alc_fixup_dell_wmi(struct hda_codec *codec,
> }
> }
>
> -#else /* CONFIG_LEDS_DELL_NETBOOKS */
> +#else /* CONFIG_DELL_LAPTOP */
> static void alc_fixup_dell_wmi(struct hda_codec *codec,
> const struct hda_fixup *fix, int action)
> {
> }
>
> -#endif /* CONFIG_LEDS_DELL_NETBOOKS */
> +#endif /* CONFIG_DELL_LAPTOP */
--
Pali Rohár
pali.rohar@gmail.com
[toc] | [prev] | [next] | [standalone]
| From | Andy Shevchenko <andy.shevchenko@gmail.com> |
|---|---|
| Date | 2017-01-18 20:20 +0100 |
| Subject | Re: [PATCH v2 4/6] platform/x86: dell-laptop: import dell_micmute_led_set() from drivers/leds/dell-led.c |
| Message-ID | <t13W1-83l-7@gated-at.bofh.it> |
| In reply to | #1559721 |
On Mon, Jan 16, 2017 at 3:22 PM, Michał Kępień <kernel@kempniu.pl> wrote: > To ensure all users of dell-smbios are in drivers/platform/x86, move the > dell_micmute_led_set() method from drivers/leds/dell-led.c to > drivers/platform/x86/dell-laptop.c. > Acked-by: Andy Shevchenko <andy.shevchenko@gmail.com> Couple of nitpicks below. > --- a/drivers/platform/x86/dell-laptop.c > +++ b/drivers/platform/x86/dell-laptop.c > @@ -30,6 +30,7 @@ > #include <linux/i8042.h> > #include <linux/debugfs.h> > #include <linux/seq_file.h> > +#include <linux/dell-led.h> Perhaps move this one line above > +#define GLOBAL_MIC_MUTE_ENABLE 0x364 > +#define GLOBAL_MIC_MUTE_DISABLE 0x365 Same as Pali told. -- With Best Regards, Andy Shevchenko
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web