From patchwork Mon Apr 24 13:33:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?TWljaGHFgiBLxJlwaWXFhA==?= X-Patchwork-Id: 9696405 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 B40A7601AE for ; Mon, 24 Apr 2017 13:35:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A572D26247 for ; Mon, 24 Apr 2017 13:35:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9A53A2818B; Mon, 24 Apr 2017 13:35:37 +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.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM 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 366E026247 for ; Mon, 24 Apr 2017 13:35:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1171182AbdDXNfe (ORCPT ); Mon, 24 Apr 2017 09:35:34 -0400 Received: from mail-lf0-f66.google.com ([209.85.215.66]:34600 "EHLO mail-lf0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1171112AbdDXNdl (ORCPT ); Mon, 24 Apr 2017 09:33:41 -0400 Received: by mail-lf0-f66.google.com with SMTP id x72so16553860lfb.1 for ; Mon, 24 Apr 2017 06:33:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kempniu.pl; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1VAgR2TNZNnm/NDksjpGuoKw/Zi+wxPKa68SzUr2to8=; b=cgcqdQwTomLnKR45LpISfid9N0loKFZ3OsHlaMDGshcycNC2wbaKQxcS8ILx0MEXj/ N/18g00rCaPF3/VARFH8bT5MwQiilkmY66O0RPYdPh6jJOAKQJwJ3MPQ9gEp6lw5YaYC seGu8FYx5kXxRLlsfCZDg3P3wdJbPUlXKEdBA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1VAgR2TNZNnm/NDksjpGuoKw/Zi+wxPKa68SzUr2to8=; b=r6fbVGRFL6Epdl4eLrYtpBSvcwwgtL+C+1vx4EykIDHUnYFMZQZxt03OPPxmpan01R zdWMuAOQnWGqatBf5Gp+wWTWDpyZ97+fSJXy2OIPu1DKN9uuCP3gdGM0e96TXXYGrjIY HjjZwdG1CtjtfHsuw6CaMDCHNMHlEAR8pMGTlZ6e049HKOaULrZzl2zUtwKkZMxyljm6 5WRCxHUtPeyTDTjfRFqaCdQ0Bh5bC3/RE1rLBgYHzT9dVEukpdRR/f+hFTsCqjtt14Mr aPAsBiKVAJSuE8ka9khUL/YK1Vg8/7kty1mqE2LlMp/MFAFZmJBlkIUUUsMDsG9BXBAP 5pmw== X-Gm-Message-State: AN3rC/5jcYo9fZQIjS+hO4wSvdJWz3Avn6HZP1qBe3UA7cCD8Oi68WEX 1KEcjJOlqzLXanr0 X-Received: by 10.46.69.139 with SMTP id s133mr8489671lja.72.1493040819709; Mon, 24 Apr 2017 06:33:39 -0700 (PDT) Received: from ozzy.hq.kempniu.pl ([2001:a10:160:3::3]) by smtp.googlemail.com with ESMTPSA id 69sm3346138lfq.36.2017.04.24.06.33.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 24 Apr 2017 06:33:39 -0700 (PDT) From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= To: Jonathan Woithe , Darren Hart , Andy Shevchenko Cc: platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 02/10] platform/x86: fujitsu-laptop: shorten names of acpi_handle fields Date: Mon, 24 Apr 2017 15:33:26 +0200 Message-Id: <20170424133334.7064-3-kernel@kempniu.pl> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170424133334.7064-1-kernel@kempniu.pl> References: <20170424133334.7064-1-kernel@kempniu.pl> MIME-Version: 1.0 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 As both struct fujitsu_bl and struct fujitsu_laptop represent data associated with ACPI devices, drop the "acpi_" prefix from the names of the relevant fields of these structures to save some horizontal space. Signed-off-by: Michał Kępień --- drivers/platform/x86/fujitsu-laptop.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/drivers/platform/x86/fujitsu-laptop.c b/drivers/platform/x86/fujitsu-laptop.c index 3f232967af04..3695e8075aa6 100644 --- a/drivers/platform/x86/fujitsu-laptop.c +++ b/drivers/platform/x86/fujitsu-laptop.c @@ -130,7 +130,7 @@ /* Device controlling the backlight and associated keys */ struct fujitsu_bl { - acpi_handle acpi_handle; + acpi_handle handle; struct input_dev *input; char phys[32]; struct backlight_device *bl_device; @@ -144,7 +144,7 @@ static bool disable_brightness_adjust; /* Device used to access hotkeys and other features on the laptop */ struct fujitsu_laptop { - acpi_handle acpi_handle; + acpi_handle handle; struct acpi_device *dev; struct input_dev *input; char phys[32]; @@ -175,7 +175,7 @@ static int call_fext_func(int func, int op, int feature, int state) unsigned long long value; acpi_status status; - status = acpi_evaluate_integer(fujitsu_laptop->acpi_handle, "FUNC", + status = acpi_evaluate_integer(fujitsu_laptop->handle, "FUNC", &arg_list, &value); if (ACPI_FAILURE(status)) { vdbg_printk(FUJLAPTOP_DBG_ERROR, "Failed to evaluate FUNC\n"); @@ -216,7 +216,7 @@ static int set_lcd_level(int level) switch (use_alt_lcd_levels) { case -1: - if (acpi_has_method(fujitsu_bl->acpi_handle, "SBL2")) + if (acpi_has_method(fujitsu_bl->handle, "SBL2")) method = "SBL2"; else method = "SBLL"; @@ -235,8 +235,7 @@ static int set_lcd_level(int level) if (level < 0 || level >= fujitsu_bl->max_brightness) return -EINVAL; - status = acpi_execute_simple_method(fujitsu_bl->acpi_handle, method, - level); + status = acpi_execute_simple_method(fujitsu_bl->handle, method, level); if (ACPI_FAILURE(status)) { vdbg_printk(FUJLAPTOP_DBG_ERROR, "Failed to evaluate %s\n", method); @@ -255,7 +254,7 @@ static int get_lcd_level(void) vdbg_printk(FUJLAPTOP_DBG_TRACE, "get lcd level via GBLL\n"); - status = acpi_evaluate_integer(fujitsu_bl->acpi_handle, "GBLL", NULL, + status = acpi_evaluate_integer(fujitsu_bl->handle, "GBLL", NULL, &state); if (ACPI_FAILURE(status)) return 0; @@ -272,7 +271,7 @@ static int get_max_brightness(void) vdbg_printk(FUJLAPTOP_DBG_TRACE, "get max lcd level via RBLL\n"); - status = acpi_evaluate_integer(fujitsu_bl->acpi_handle, "RBLL", NULL, + status = acpi_evaluate_integer(fujitsu_bl->handle, "RBLL", NULL, &state); if (ACPI_FAILURE(status)) return -1; @@ -421,7 +420,7 @@ static int acpi_fujitsu_bl_add(struct acpi_device *device) if (!device) return -EINVAL; - fujitsu_bl->acpi_handle = device->handle; + fujitsu_bl->handle = device->handle; sprintf(acpi_device_name(device), "%s", ACPI_FUJITSU_BL_DEVICE_NAME); sprintf(acpi_device_class(device), "%s", ACPI_FUJITSU_CLASS); device->driver_data = fujitsu_bl; @@ -430,7 +429,7 @@ static int acpi_fujitsu_bl_add(struct acpi_device *device) if (error) return error; - error = acpi_bus_update_power(fujitsu_bl->acpi_handle, &state); + error = acpi_bus_update_power(fujitsu_bl->handle, &state); if (error) { pr_err("Error reading power state\n"); return error; @@ -791,7 +790,7 @@ static int acpi_fujitsu_laptop_add(struct acpi_device *device) if (!device) return -EINVAL; - fujitsu_laptop->acpi_handle = device->handle; + fujitsu_laptop->handle = device->handle; sprintf(acpi_device_name(device), "%s", ACPI_FUJITSU_LAPTOP_DEVICE_NAME); sprintf(acpi_device_class(device), "%s", ACPI_FUJITSU_CLASS); @@ -810,7 +809,7 @@ static int acpi_fujitsu_laptop_add(struct acpi_device *device) if (error) goto err_free_fifo; - error = acpi_bus_update_power(fujitsu_laptop->acpi_handle, &state); + error = acpi_bus_update_power(fujitsu_laptop->handle, &state); if (error) { pr_err("Error reading power state\n"); goto err_free_fifo;