From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759409AbcAUKw4 (ORCPT ); Thu, 21 Jan 2016 05:52:56 -0500 Received: from mailout3.w1.samsung.com ([210.118.77.13]:52752 "EHLO mailout3.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759249AbcAUKwy (ORCPT ); Thu, 21 Jan 2016 05:52:54 -0500 MIME-version: 1.0 Content-type: text/plain; charset=UTF-8; format=flowed X-AuditID: cbfec7f5-f79b16d000005389-45-56a0b8834fd4 Content-transfer-encoding: 8BIT Message-id: <56A0B882.6020508@samsung.com> Date: Thu, 21 Jan 2016 11:52:50 +0100 From: Jacek Anaszewski User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130804 Thunderbird/17.0.8 To: =?UTF-8?B?TWljaGHFgiBLxJlwaWXFhA==?= Cc: Darren Hart , Matthew Garrett , =?UTF-8?B?UGFsaSBSb2jDoXI=?= , Richard Purdie , Alex Hung , platform-driver-x86@vger.kernel.org, linux-leds@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 13/14] dell-led: use dell_smbios_find_token() for finding mic DMI tokens References: <1452607380-20861-1-git-send-email-kernel@kempniu.pl> <1452607380-20861-14-git-send-email-kernel@kempniu.pl> In-reply-to: <1452607380-20861-14-git-send-email-kernel@kempniu.pl> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrNLMWRmVeSWpSXmKPExsVy+t/xy7rNOxaEGczdwGGx5WiURddCA4vF V66wWlzeNYfNYuubdYwWVx/OZrGYePo3k8XqPS+YLXbvesrqwOkxq6GXzWPnrLvsHptXaHks OtzE7LFn/g9Wj3U3vrJ7fN4kF8AexWWTkpqTWZZapG+XwJXxb+pCxoJ5KhXLdhxkb2D8I9PF yMkhIWAi8XHNUzYIW0ziwr31QDYXh5DAUkaJ+XMXs4MkeAUEJX5MvsfSxcjBwSwgL3HkUjZI mFnATOJRyzpmiPpnjBJPd75jhqjXkph07zILiM0ioCpx8+xOMJtNwFDi54vXTCC2qECExJ/T +1hBbBEBG4nzq/YxQgzdxCRx7FctiC0sECcx7dlXsHohgSqJ7VubwQ7lFHCWOP/3NOsERoFZ SM6bhXDeLCTnLWBkXsUomlqaXFCclJ5rpFecmFtcmpeul5yfu4kREgVfdzAuPWZ1iFGAg1GJ h/fGtflhQqyJZcWVuYcYJTiYlUR4+bYtCBPiTUmsrEotyo8vKs1JLT7EKM3BoiTOO3PX+xAh gfTEktTs1NSC1CKYLBMHp1QD45m9m7/xr2nUWGIl8/qF0YX4O3t2HRXkv3ZtRuMRzyOH1Q70 h1ypffzW45NNatPtQ1m2/xzSozT/Xv949s6Sspoik5vFBf4Cf95ONMzJj2KS/7tz62PZwE9P Z12b7Mibup4lVkamrN3XMfyAWJL1249b2199XlS3I+7wFq1Pu3ceTqlWOJruXarEUpyRaKjF XFScCACooXNWfgIAAA== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Michał, Thanks for the patches. They should probably be merged through linux-platform-drivers-x86.git. Feel free to add my Acked-by: Jacek Anaszewski to 13/14 and 14/14. Best Regards, Jacek Anaszewski On 01/12/2016 03:02 PM, Michał Kępień wrote: > With the advent of dell_smbios_find_token(), dell-led does not need to > perform any DMI walking on its own, but it can rather ask dell-smbios to > look up the DMI tokens it needs for changing the state of the microphone > LED. > > Signed-off-by: Michał Kępień > --- > drivers/leds/Kconfig | 1 + > drivers/leds/dell-led.c | 63 +++++++---------------------------------------- > 2 files changed, 10 insertions(+), 54 deletions(-) > > diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig > index b1ab8bd..171810c 100644 > --- a/drivers/leds/Kconfig > +++ b/drivers/leds/Kconfig > @@ -441,6 +441,7 @@ config LEDS_DELL_NETBOOKS > tristate "External LED on Dell Business Netbooks" > depends on LEDS_CLASS > depends on X86 && ACPI_WMI > + depends on DELL_SMBIOS > help > This adds support for the Latitude 2100 and similar > notebooks that have an external LED. > diff --git a/drivers/leds/dell-led.c b/drivers/leds/dell-led.c > index c36acaf..bfa7511 100644 > --- a/drivers/leds/dell-led.c > +++ b/drivers/leds/dell-led.c > @@ -17,6 +17,7 @@ > #include > #include > #include > +#include "../platform/x86/dell-smbios.h" > > MODULE_AUTHOR("Louis Davis/Jim Dailey"); > MODULE_DESCRIPTION("Dell LED Control Driver"); > @@ -59,22 +60,6 @@ struct app_wmi_args { > #define GLOBAL_MIC_MUTE_ENABLE 0x364 > #define GLOBAL_MIC_MUTE_DISABLE 0x365 > > -struct dell_bios_data_token { > - u16 tokenid; > - u16 location; > - u16 value; > -}; > - > -struct __attribute__ ((__packed__)) dell_bios_calling_interface { > - struct dmi_header header; > - u16 cmd_io_addr; > - u8 cmd_io_code; > - u32 supported_cmds; > - struct dell_bios_data_token damap[]; > -}; > - > -static struct dell_bios_data_token dell_mic_tokens[2]; > - > static int dell_wmi_perform_query(struct app_wmi_args *args) > { > struct app_wmi_args *bios_return; > @@ -112,43 +97,24 @@ static int dell_wmi_perform_query(struct app_wmi_args *args) > return rc; > } > > -static void __init find_micmute_tokens(const struct dmi_header *dm, void *dummy) > -{ > - struct dell_bios_calling_interface *calling_interface; > - struct dell_bios_data_token *token; > - int token_size = sizeof(struct dell_bios_data_token); > - int i = 0; > - > - if (dm->type == 0xda && dm->length > 17) { > - calling_interface = container_of(dm, > - struct dell_bios_calling_interface, header); > - > - token = &calling_interface->damap[i]; > - while (token->tokenid != 0xffff) { > - if (token->tokenid == GLOBAL_MIC_MUTE_DISABLE) > - memcpy(&dell_mic_tokens[0], token, token_size); > - else if (token->tokenid == GLOBAL_MIC_MUTE_ENABLE) > - memcpy(&dell_mic_tokens[1], token, token_size); > - > - i++; > - token = &calling_interface->damap[i]; > - } > - } > -} > - > static int dell_micmute_led_set(int state) > { > + struct calling_interface_token *token; > struct app_wmi_args args; > - struct dell_bios_data_token *token; > > if (!wmi_has_guid(DELL_APP_GUID)) > return -ENODEV; > > - if (state == 0 || state == 1) > - token = &dell_mic_tokens[state]; > + 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; > + > memset(&args, 0, sizeof(struct app_wmi_args)); > > args.class = 1; > @@ -177,14 +143,6 @@ int dell_app_wmi_led_set(int whichled, int on) > } > EXPORT_SYMBOL_GPL(dell_app_wmi_led_set); > > -static int __init dell_micmute_led_init(void) > -{ > - memset(dell_mic_tokens, 0, sizeof(struct dell_bios_data_token) * 2); > - dmi_walk(find_micmute_tokens, NULL); > - > - return 0; > -} > - > struct bios_args { > unsigned char length; > unsigned char result_code; > @@ -330,9 +288,6 @@ static int __init dell_led_init(void) > if (!wmi_has_guid(DELL_LED_BIOS_GUID) && !wmi_has_guid(DELL_APP_GUID)) > return -ENODEV; > > - if (wmi_has_guid(DELL_APP_GUID)) > - error = dell_micmute_led_init(); > - > if (wmi_has_guid(DELL_LED_BIOS_GUID)) { > error = led_off(); > if (error != 0) >