From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S968769AbdDTC2J (ORCPT ); Wed, 19 Apr 2017 22:28:09 -0400 Received: from bombadil.infradead.org ([65.50.211.133]:57435 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965899AbdDTC0S (ORCPT ); Wed, 19 Apr 2017 22:26:18 -0400 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 2/9] platform/x86: hp-wmi: Add bios_args initializer Date: Wed, 19 Apr 2017 19:25:14 -0700 Message-Id: <7a898f33a9032f7a65c14f4c131386e8a548ba2e.1492654448.git.dvhart@infradead.org> X-Mailer: git-send-email 2.9.3 In-Reply-To: References: In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: "Darren Hart (VMware)" Cleanup the hp_wmi_perform_query function some by providing a bios_args initializer. No functional changes. Signed-off-by: Darren Hart (VMware) --- drivers/platform/x86/hp-wmi.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/drivers/platform/x86/hp-wmi.c b/drivers/platform/x86/hp-wmi.c index e772105..aa9d99c 100644 --- a/drivers/platform/x86/hp-wmi.c +++ b/drivers/platform/x86/hp-wmi.c @@ -93,6 +93,13 @@ struct bios_args { u32 data; }; +#define BIOS_ARGS_INIT(write, ctype, size) \ + (struct bios_args) { .signature = 0x55434553, \ + .command = (write) ? 0x2 : 0x1, \ + .commandtype = (ctype), \ + .datasize = (size), \ + .data = 0 } + struct bios_return { u32 sigpass; u32 return_code; @@ -190,18 +197,12 @@ static struct rfkill2_device rfkill2[HPWMI_MAX_RFKILL2_DEVICES]; static int hp_wmi_perform_query(int query, int write, void *buffer, int insize, int outsize) { - struct bios_return *bios_return; - int actual_outsize; - union acpi_object *obj; - struct bios_args args = { - .signature = 0x55434553, - .command = write ? 0x2 : 0x1, - .commandtype = query, - .datasize = insize, - .data = 0, - }; + struct bios_args args = BIOS_ARGS_INIT(write, query, insize); struct acpi_buffer input = { sizeof(struct bios_args), &args }; struct acpi_buffer output = { ACPI_ALLOCATE_BUFFER, NULL }; + struct bios_return *bios_return; + union acpi_object *obj; + int actual_outsize; u32 rc; if (WARN_ON(insize > sizeof(args.data))) -- 2.9.3