From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 17658C43441 for ; Tue, 27 Nov 2018 09:45:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CE1D120817 for ; Tue, 27 Nov 2018 09:45:24 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CE1D120817 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=suse.de Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730307AbeK0Umn (ORCPT ); Tue, 27 Nov 2018 15:42:43 -0500 Received: from mx2.suse.de ([195.135.220.15]:49462 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728266AbeK0Umn (ORCPT ); Tue, 27 Nov 2018 15:42:43 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay1.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 33597AF8D; Tue, 27 Nov 2018 09:45:22 +0000 (UTC) Date: Tue, 27 Nov 2018 10:45:19 +0100 Message-ID: From: Takashi Iwai To: "Ayman Bagabas" Cc: , "Hui Wang" , "Andy Shevchenko" , "Darren Hart" , "Jaroslav Kysela" , "Kailang Yang" , , Subject: Re: [PATCH v7 2/3] x86: add support for Huawei WMI hotkeys. In-Reply-To: <20181127025752.6459-3-ayman.bagabas@gmail.com> References: <20181127025752.6459-1-ayman.bagabas@gmail.com> <20181127025752.6459-3-ayman.bagabas@gmail.com> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.8 Emacs/26 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, 27 Nov 2018 03:57:48 +0100, Ayman Bagabas wrote: > > +static const struct key_entry huawei_wmi_keymap[] __initconst = { > + { KE_KEY, 0x281, { KEY_BRIGHTNESSDOWN } }, > + { KE_KEY, 0x282, { KEY_BRIGHTNESSUP } }, > + { KE_KEY, 0x284, { KEY_MUTE } }, > + { KE_KEY, 0x285, { KEY_VOLUMEDOWN } }, > + { KE_KEY, 0x286, { KEY_VOLUMEUP } }, > + { KE_KEY, 0x287, { KEY_MICMUTE } }, > + { KE_KEY, 0x289, { KEY_WLAN } }, > + // Huawei |M| button > + { KE_KEY, 0x28a, { KEY_CONFIG } }, > + // Keyboard light > + { KE_IGNORE, 0x293, { KEY_KBDILLUMTOGGLE } }, > + { KE_IGNORE, 0x294, { KEY_KBDILLUMUP } }, > + { KE_IGNORE, 0x295, { KEY_KBDILLUMUP } }, > + { KE_END, 0 } The indentation looks too deep here. > +static int huawei_wmi_micmute_led_set(bool on) > +{ > + acpi_handle handle; > + char *method; > + union acpi_object args[3]; > + struct acpi_object_list arg_list = { > + .pointer = args, > + .count = ARRAY_SIZE(args), > + }; > + > + handle = ACPI_HANDLE(&inputdev->dev); Just wondering whether the ACPI handle is assigned properly for this device... > + args[0].type = args[1].type = args[2].type = ACPI_TYPE_INTEGER; > + args[1].integer.value = 0x04; > + > + if (acpi_has_method(handle, method = "\\_SB.PCI0.LPCB.EC0.SPIN")) { > + args[0].integer.value = 0; > + args[2].integer.value = on ? 1 : 0; > + } else if (acpi_has_method(handle, method = "\\_SB.PCI0.LPCB.EC0.WPIN")) { > + args[0].integer.value = 1; > + args[2].integer.value = on ? 0 : 1; > + } else { > + dev_err(&inputdev->dev, "Unable to find ACPI method\n"); > + return -ENOSYS; > + } > + > + acpi_evaluate_object(handle, method, &arg_list, NULL); > + > + return 0; > +} > + > +static int micmute_led_set(struct led_classdev *led_cdev, > + enum led_brightness brightness) > +{ > + int state = brightness != LED_OFF; > + int err; > + > + err = huawei_wmi_micmute_led_set(state); > + return err < 0 ? err : 0; No need for checking err here, you can return huawei_wmi_mute_led_set() directly. Or even you can fold two functions into one. > +static int __init huawei_wmi_init(void) > +{ > + int err; > + > + if (wmi_has_guid(MBX_EVENT_GUID)) { > + event_guid = MBX_EVENT_GUID; > + } else if (wmi_has_guid(MBXP_EVENT_GUID)) { > + event_guid = MBXP_EVENT_GUID; > + } else { > + pr_warn("Compatible WMI GUID not found\n"); > + return -ENODEV; > + } > + > + err = huawei_wmi_input_init(); > + if (err) > + goto err_input; > + > + micmute_led_cdev.brightness = ledtrig_audio_get(LED_AUDIO_MICMUTE); > + err = led_classdev_register(&inputdev->dev, &micmute_led_cdev); > + if (err) > + goto err_leds; > + > + return 0; Might it be cleaner to implement on top of wmi_driver? Then you can create both input and led devices on wmi device. thanks, Takashi From mboxrd@z Thu Jan 1 00:00:00 1970 From: Takashi Iwai Subject: Re: [PATCH v7 2/3] x86: add support for Huawei WMI hotkeys. Date: Tue, 27 Nov 2018 10:45:19 +0100 Message-ID: References: <20181127025752.6459-1-ayman.bagabas@gmail.com> <20181127025752.6459-3-ayman.bagabas@gmail.com> Mime-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Return-path: In-Reply-To: <20181127025752.6459-3-ayman.bagabas@gmail.com> Sender: linux-kernel-owner@vger.kernel.org To: Ayman Bagabas Cc: alsa-devel@alsa-project.org, Hui Wang , Andy Shevchenko , Darren Hart , Jaroslav Kysela , Kailang Yang , linux-kernel@vger.kernel.org, platform-driver-x86@vger.kernel.org List-Id: platform-driver-x86.vger.kernel.org On Tue, 27 Nov 2018 03:57:48 +0100, Ayman Bagabas wrote: > > +static const struct key_entry huawei_wmi_keymap[] __initconst = { > + { KE_KEY, 0x281, { KEY_BRIGHTNESSDOWN } }, > + { KE_KEY, 0x282, { KEY_BRIGHTNESSUP } }, > + { KE_KEY, 0x284, { KEY_MUTE } }, > + { KE_KEY, 0x285, { KEY_VOLUMEDOWN } }, > + { KE_KEY, 0x286, { KEY_VOLUMEUP } }, > + { KE_KEY, 0x287, { KEY_MICMUTE } }, > + { KE_KEY, 0x289, { KEY_WLAN } }, > + // Huawei |M| button > + { KE_KEY, 0x28a, { KEY_CONFIG } }, > + // Keyboard light > + { KE_IGNORE, 0x293, { KEY_KBDILLUMTOGGLE } }, > + { KE_IGNORE, 0x294, { KEY_KBDILLUMUP } }, > + { KE_IGNORE, 0x295, { KEY_KBDILLUMUP } }, > + { KE_END, 0 } The indentation looks too deep here. > +static int huawei_wmi_micmute_led_set(bool on) > +{ > + acpi_handle handle; > + char *method; > + union acpi_object args[3]; > + struct acpi_object_list arg_list = { > + .pointer = args, > + .count = ARRAY_SIZE(args), > + }; > + > + handle = ACPI_HANDLE(&inputdev->dev); Just wondering whether the ACPI handle is assigned properly for this device... > + args[0].type = args[1].type = args[2].type = ACPI_TYPE_INTEGER; > + args[1].integer.value = 0x04; > + > + if (acpi_has_method(handle, method = "\\_SB.PCI0.LPCB.EC0.SPIN")) { > + args[0].integer.value = 0; > + args[2].integer.value = on ? 1 : 0; > + } else if (acpi_has_method(handle, method = "\\_SB.PCI0.LPCB.EC0.WPIN")) { > + args[0].integer.value = 1; > + args[2].integer.value = on ? 0 : 1; > + } else { > + dev_err(&inputdev->dev, "Unable to find ACPI method\n"); > + return -ENOSYS; > + } > + > + acpi_evaluate_object(handle, method, &arg_list, NULL); > + > + return 0; > +} > + > +static int micmute_led_set(struct led_classdev *led_cdev, > + enum led_brightness brightness) > +{ > + int state = brightness != LED_OFF; > + int err; > + > + err = huawei_wmi_micmute_led_set(state); > + return err < 0 ? err : 0; No need for checking err here, you can return huawei_wmi_mute_led_set() directly. Or even you can fold two functions into one. > +static int __init huawei_wmi_init(void) > +{ > + int err; > + > + if (wmi_has_guid(MBX_EVENT_GUID)) { > + event_guid = MBX_EVENT_GUID; > + } else if (wmi_has_guid(MBXP_EVENT_GUID)) { > + event_guid = MBXP_EVENT_GUID; > + } else { > + pr_warn("Compatible WMI GUID not found\n"); > + return -ENODEV; > + } > + > + err = huawei_wmi_input_init(); > + if (err) > + goto err_input; > + > + micmute_led_cdev.brightness = ledtrig_audio_get(LED_AUDIO_MICMUTE); > + err = led_classdev_register(&inputdev->dev, &micmute_led_cdev); > + if (err) > + goto err_leds; > + > + return 0; Might it be cleaner to implement on top of wmi_driver? Then you can create both input and led devices on wmi device. thanks, Takashi