From patchwork Thu Apr 20 02:25:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Darren Hart X-Patchwork-Id: 9689253 X-Patchwork-Delegate: dvhart@infradead.org 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 0B695602C9 for ; Thu, 20 Apr 2017 02:26:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EF97C28418 for ; Thu, 20 Apr 2017 02:26:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E1BF728448; Thu, 20 Apr 2017 02:26:18 +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.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID 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 583AD28418 for ; Thu, 20 Apr 2017 02:26:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S937754AbdDTC0R (ORCPT ); Wed, 19 Apr 2017 22:26:17 -0400 Received: from bombadil.infradead.org ([65.50.211.133]:54890 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1763359AbdDTC0Q (ORCPT ); Wed, 19 Apr 2017 22:26:16 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=References:In-Reply-To:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=bLikZ9K8OV72Io9B4inhl8yKKE4WFkBBXORqsPk4YXY=; b=sU0gqsl1zDcnUPh8kxmxoVCw/ U9TF8cxmqA9BEaAgnnsWZ65I/h0MCIU0awIMakBxab1p6LadmCsPwt1IhpRvixqOykULediXedJsz esM4GBQn4bJkXn1iXfocYDaInINaWaDa42UwkN7SmlEJGon6jPPovrgpfkKnnb8rSaKpLNVSk/Tn3 yDnWayMCqr50bUreJ3KU4kXJ8gTcsVFyavlFEgARgZ8lU1WQ4F1Utj8SIZEfTO8gGgq27KqFlERmJ 0wzfxdcsn8tdo79ZYjtbQq8krQzAfDOJl6rieydBd0nDBsZJUpasYPCB3EMSfoLznMuHOQ+o1UibX UfP60qwLg==; Received: from dvhart by bombadil.infradead.org with local (Exim 4.87 #1 (Red Hat Linux)) id 1d11nU-0005EP-9l; Thu, 20 Apr 2017 02:26:16 +0000 From: Darren Hart To: dvhart@infradead.org Cc: andy@infradead.org, platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org, carlo@caione.org Subject: [PATCH 1/9] platform/x86: hp-wmi: Cleanup local variable declarations Date: Wed, 19 Apr 2017 19:25:13 -0700 Message-Id: X-Mailer: git-send-email 2.9.3 In-Reply-To: References: In-Reply-To: References: 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 From: "Darren Hart (VMware)" Declare like types on one line. Order declarations in decreasing length where possible. Signed-off-by: Darren Hart (VMware) --- drivers/platform/x86/hp-wmi.c | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/drivers/platform/x86/hp-wmi.c b/drivers/platform/x86/hp-wmi.c index 5ca9328..e772105 100644 --- a/drivers/platform/x86/hp-wmi.c +++ b/drivers/platform/x86/hp-wmi.c @@ -346,15 +346,14 @@ static const struct rfkill_ops hp_wmi_rfkill_ops = { static bool hp_wmi_get_sw_state(enum hp_wmi_radio r) { + int mask = 0x200 << (r * 8); int wireless = 0; - int mask; + hp_wmi_perform_query(HPWMI_WIRELESS_QUERY, 0, &wireless, sizeof(wireless), sizeof(wireless)); /* TBD: Pass error */ - mask = 0x200 << (r * 8); - if (wireless & mask) return false; else @@ -363,15 +362,14 @@ static bool hp_wmi_get_sw_state(enum hp_wmi_radio r) static bool hp_wmi_get_hw_state(enum hp_wmi_radio r) { + int mask = 0x800 << (r * 8); int wireless = 0; - int mask; + hp_wmi_perform_query(HPWMI_WIRELESS_QUERY, 0, &wireless, sizeof(wireless), sizeof(wireless)); /* TBD: Pass error */ - mask = 0x800 << (r * 8); - if (wireless & mask) return false; else @@ -395,8 +393,8 @@ static const struct rfkill_ops hp_wmi_rfkill2_ops = { static int hp_wmi_rfkill2_refresh(void) { - int err, i; struct bios_rfkill2_state state; + int err, i; err = hp_wmi_perform_query(HPWMI_WIRELESS2_QUERY, 0, &state, 0, sizeof(state)); @@ -502,9 +500,9 @@ static ssize_t set_als(struct device *dev, struct device_attribute *attr, static ssize_t set_postcode(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) { + long unsigned int tmp2; int ret; u32 tmp; - long unsigned int tmp2; ret = kstrtoul(buf, 10, &tmp2); if (ret || tmp2 != 1) @@ -530,11 +528,11 @@ static DEVICE_ATTR(postcode, S_IRUGO | S_IWUSR, show_postcode, set_postcode); static void hp_wmi_notify(u32 value, void *context) { struct acpi_buffer response = { ACPI_ALLOCATE_BUFFER, NULL }; - union acpi_object *obj; u32 event_id, event_data; + union acpi_object *obj; int key_code = 0, ret; - u32 *location; acpi_status status; + u32 *location; status = wmi_get_event_data(value, &response); if (status != AE_OK) { @@ -645,8 +643,7 @@ static void hp_wmi_notify(u32 value, void *context) static int __init hp_wmi_input_setup(void) { acpi_status status; - int err; - int val; + int err, val; hp_wmi_input_dev = input_allocate_device(); if (!hp_wmi_input_dev) @@ -719,8 +716,7 @@ static void cleanup_sysfs(struct platform_device *device) static int __init hp_wmi_rfkill_setup(struct platform_device *device) { - int err; - int wireless = 0; + int err, wireless = 0; err = hp_wmi_perform_query(HPWMI_WIRELESS_QUERY, 0, &wireless, sizeof(wireless), sizeof(wireless)); @@ -804,8 +800,9 @@ static int __init hp_wmi_rfkill_setup(struct platform_device *device) static int __init hp_wmi_rfkill2_setup(struct platform_device *device) { - int err, i; struct bios_rfkill2_state state; + int err, i; + err = hp_wmi_perform_query(HPWMI_WIRELESS2_QUERY, 0, &state, 0, sizeof(state)); if (err) @@ -1002,9 +999,9 @@ static struct platform_driver hp_wmi_driver = { static int __init hp_wmi_init(void) { - int err; int event_capable = wmi_has_guid(HPWMI_EVENT_GUID); int bios_capable = wmi_has_guid(HPWMI_BIOS_GUID); + int err; if (!bios_capable && !event_capable) return -ENODEV;