From patchwork Tue Feb 27 21:15:39 2018 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: 10246065 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 8683360362 for ; Tue, 27 Feb 2018 21:16:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 74AF428AB5 for ; Tue, 27 Feb 2018 21:16:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6350828AB6; Tue, 27 Feb 2018 21:16:23 +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=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_HI 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 97D7D28A9C for ; Tue, 27 Feb 2018 21:16:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751844AbeB0VQV (ORCPT ); Tue, 27 Feb 2018 16:16:21 -0500 Received: from mail-lf0-f66.google.com ([209.85.215.66]:42926 "EHLO mail-lf0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752052AbeB0VP4 (ORCPT ); Tue, 27 Feb 2018 16:15:56 -0500 Received: by mail-lf0-f66.google.com with SMTP id t204so355657lff.9 for ; Tue, 27 Feb 2018 13:15:55 -0800 (PST) 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=hAzkt9NxwC1sRGtvIWMqi13eud7w+hmU8tvWwVBUeRA=; b=JX4eMKA0Ww1N8I3nttSoPfSiS7NRr5H+st0zXHQud6u2i97sOcSK0qjbfbJwqMzATh oAgWBBkA2TwXr0uxSHOiRcrQ4hPuuNK2sPNOxSU5ppwICWIBZM2WxgedKxbHh5HfSV65 WupuD9X0Fn+zsyt6OAXuGL9xy4EjDGwYVCKII= 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=hAzkt9NxwC1sRGtvIWMqi13eud7w+hmU8tvWwVBUeRA=; b=JhwifWzkoyuReKb0xfcn9IbETnrdvN82kXpXd3G3+RNFhYk5x5XAYAnzFLAFIeG9fO 23mNM7hjSIu+jh5+Wv3bkvZGP7LNEdfN/kwkONgsxNNFh9v1l0bfOoPB7v9BrYrPGzdc utsHLjbZAT04BTiH4xlrKU05L8kUR4P2m1Xs8YJt0IW5TFh7KxI6LD1Xs1ezgdIi3uHt vZ+Hvms82ATfFT986p9y9LGmKyAHu1uFWBi1sZLcNNsI+gS674sSvdbbTov9WMS3X5+T yWZq1BA3z+oRbrBMf5GSu3mXoLNbe5YeXyqpYWlZ2Gl7hIauDBUXtcNOr3bDCUzLPPVp HYEw== X-Gm-Message-State: APf1xPDmL2oaPAQY7sDvEWnjggeNM5KCTwkgsIWB0YkNILXKEySnMDzR 298dnj+1CeWhG24qwpgDLOMAaw== X-Google-Smtp-Source: AH8x224e9xk9uNuMtUy8izEDuS7l57oShTYEL8k4M/Gm0ymj/UaotOuSGxXyVz3CilOD4nKvmpvDxA== X-Received: by 10.46.4.149 with SMTP id a21mr12080449ljf.138.1519766154832; Tue, 27 Feb 2018 13:15:54 -0800 (PST) Received: from kmp-mobile.hq.kempniu.pl (kmp-mobile.hq.kempniu.pl. [2001:470:64df:111::d0d7]) by smtp.googlemail.com with ESMTPSA id l5sm16288lje.58.2018.02.27.13.15.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 27 Feb 2018 13:15:54 -0800 (PST) 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 7/7] platform/x86: fujitsu-laptop: Introduce fext_*() helper functions Date: Tue, 27 Feb 2018 22:15:39 +0100 Message-Id: <20180227211539.5708-8-kernel@kempniu.pl> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180227211539.5708-1-kernel@kempniu.pl> References: <20180227211539.5708-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 Stop invoking call_fext_func() directly to improve code clarity and save some horizontal space. Signed-off-by: Michał Kępień --- drivers/platform/x86/fujitsu-laptop.c | 116 +++++++++++++++++----------------- 1 file changed, 59 insertions(+), 57 deletions(-) diff --git a/drivers/platform/x86/fujitsu-laptop.c b/drivers/platform/x86/fujitsu-laptop.c index 46c9f4441c24..9ac9283fa707 100644 --- a/drivers/platform/x86/fujitsu-laptop.c +++ b/drivers/platform/x86/fujitsu-laptop.c @@ -184,6 +184,30 @@ static int call_fext_func(struct acpi_device *device, return value; } +static int fext_backlight(struct acpi_device *device, + int op, int feature, int state) +{ + return call_fext_func(device, FUNC_BACKLIGHT, op, feature, state); +} + +static int fext_buttons(struct acpi_device *device, + int op, int feature, int state) +{ + return call_fext_func(device, FUNC_BUTTONS, op, feature, state); +} + +static int fext_flags(struct acpi_device *device, + int op, int feature, int state) +{ + return call_fext_func(device, FUNC_FLAGS, op, feature, state); +} + +static int fext_leds(struct acpi_device *device, + int op, int feature, int state) +{ + return call_fext_func(device, FUNC_LEDS, op, feature, state); +} + /* Hardware access for LCD brightness control */ static int set_lcd_level(struct acpi_device *device, int level) @@ -274,12 +298,10 @@ static int bl_update_status(struct backlight_device *b) if (fext) { if (b->props.power == FB_BLANK_POWERDOWN) - call_fext_func(fext, FUNC_BACKLIGHT, OP_SET, - FEAT_BACKLIGHT_POWER, + fext_backlight(fext, OP_SET, FEAT_BACKLIGHT_POWER, STATE_BACKLIGHT_OFF); else - call_fext_func(fext, FUNC_BACKLIGHT, OP_SET, - FEAT_BACKLIGHT_POWER, + fext_backlight(fext, OP_SET, FEAT_BACKLIGHT_POWER, STATE_BACKLIGHT_ON); } @@ -609,13 +631,11 @@ static int logolamp_set(struct led_classdev *cdev, if (brightness < LED_FULL) always = STATE_LED_OFF; - ret = call_fext_func(device, FUNC_LEDS, OP_SET, - FEAT_LOGOLAMP_POWERON, poweron); + ret = fext_leds(device, OP_SET, FEAT_LOGOLAMP_POWERON, poweron); if (ret < 0) return ret; - return call_fext_func(device, FUNC_LEDS, OP_SET, - FEAT_LOGOLAMP_ALWAYS, always); + return fext_leds(device, OP_SET, FEAT_LOGOLAMP_ALWAYS, always); } static enum led_brightness logolamp_get(struct led_classdev *cdev) @@ -623,13 +643,11 @@ static enum led_brightness logolamp_get(struct led_classdev *cdev) struct acpi_device *device = to_acpi_device(cdev->dev->parent); int ret; - ret = call_fext_func(device, FUNC_LEDS, OP_GET, - FEAT_LOGOLAMP_ALWAYS, 0x0); + ret = fext_leds(device, OP_GET, FEAT_LOGOLAMP_ALWAYS, 0x0); if (ret == STATE_LED_ON) return LED_FULL; - ret = call_fext_func(device, FUNC_LEDS, OP_GET, - FEAT_LOGOLAMP_POWERON, 0x0); + ret = fext_leds(device, OP_GET, FEAT_LOGOLAMP_POWERON, 0x0); if (ret == STATE_LED_ON) return LED_HALF; @@ -642,11 +660,11 @@ static int kblamps_set(struct led_classdev *cdev, struct acpi_device *device = to_acpi_device(cdev->dev->parent); if (brightness >= LED_FULL) - return call_fext_func(device, FUNC_LEDS, OP_SET, - FEAT_KEYBOARD_LAMPS, STATE_LED_ON); + return fext_leds(device, OP_SET, FEAT_KEYBOARD_LAMPS, + STATE_LED_ON); else - return call_fext_func(device, FUNC_LEDS, OP_SET, - FEAT_KEYBOARD_LAMPS, STATE_LED_OFF); + return fext_leds(device, OP_SET, FEAT_KEYBOARD_LAMPS, + STATE_LED_OFF); } static enum led_brightness kblamps_get(struct led_classdev *cdev) @@ -654,8 +672,7 @@ static enum led_brightness kblamps_get(struct led_classdev *cdev) struct acpi_device *device = to_acpi_device(cdev->dev->parent); enum led_brightness brightness = LED_OFF; - if (call_fext_func(device, FUNC_LEDS, OP_GET, - FEAT_KEYBOARD_LAMPS, 0x0) == STATE_LED_ON) + if (fext_leds(device, OP_GET, FEAT_KEYBOARD_LAMPS, 0x0) == STATE_LED_ON) brightness = LED_FULL; return brightness; @@ -667,11 +684,11 @@ static int radio_led_set(struct led_classdev *cdev, struct acpi_device *device = to_acpi_device(cdev->dev->parent); if (brightness >= LED_FULL) - return call_fext_func(device, FUNC_FLAGS, OP_SET_EXT, - FEAT_RADIO_LED, STATE_RADIO_LED_ON); + return fext_flags(device, OP_SET_EXT, FEAT_RADIO_LED, + STATE_RADIO_LED_ON); else - return call_fext_func(device, FUNC_FLAGS, OP_SET_EXT, - FEAT_RADIO_LED, STATE_RADIO_LED_OFF); + return fext_flags(device, OP_SET_EXT, FEAT_RADIO_LED, + STATE_RADIO_LED_OFF); } static enum led_brightness radio_led_get(struct led_classdev *cdev) @@ -679,8 +696,7 @@ static enum led_brightness radio_led_get(struct led_classdev *cdev) struct acpi_device *device = to_acpi_device(cdev->dev->parent); enum led_brightness brightness = LED_OFF; - if (call_fext_func(device, FUNC_FLAGS, OP_GET_EXT, - 0x0, 0x0) & STATE_RADIO_LED_ON) + if (fext_flags(device, OP_GET_EXT, 0x0, 0x0) & STATE_RADIO_LED_ON) brightness = LED_FULL; return brightness; @@ -692,13 +708,13 @@ static int eco_led_set(struct led_classdev *cdev, struct acpi_device *device = to_acpi_device(cdev->dev->parent); int curr; - curr = call_fext_func(device, FUNC_LEDS, OP_GET, FEAT_ECO_LED, 0x0); + curr = fext_leds(device, OP_GET, FEAT_ECO_LED, 0x0); if (brightness >= LED_FULL) - return call_fext_func(device, FUNC_LEDS, OP_SET, - FEAT_ECO_LED, curr | STATE_ECO_LED_ON); + return fext_leds(device, OP_SET, FEAT_ECO_LED, + curr | STATE_ECO_LED_ON); else - return call_fext_func(device, FUNC_LEDS, OP_SET, - FEAT_ECO_LED, curr & ~STATE_ECO_LED_ON); + return fext_leds(device, OP_SET, FEAT_ECO_LED, + curr & ~STATE_ECO_LED_ON); } static enum led_brightness eco_led_get(struct led_classdev *cdev) @@ -706,8 +722,7 @@ static enum led_brightness eco_led_get(struct led_classdev *cdev) struct acpi_device *device = to_acpi_device(cdev->dev->parent); enum led_brightness brightness = LED_OFF; - if (call_fext_func(device, FUNC_LEDS, OP_GET, - FEAT_ECO_LED, 0x0) & STATE_ECO_LED_ON) + if (fext_leds(device, OP_GET, FEAT_ECO_LED, 0x0) & STATE_ECO_LED_ON) brightness = LED_FULL; return brightness; @@ -719,8 +734,7 @@ static int acpi_fujitsu_laptop_leds_register(struct acpi_device *device) struct led_classdev *led; int ret; - if (call_fext_func(device, FUNC_LEDS, OP_GET_CAPS, - 0x0, 0x0) & FEAT_LOGOLAMP_POWERON) { + if (fext_leds(device, OP_GET_CAPS, 0x0, 0x0) & FEAT_LOGOLAMP_POWERON) { led = devm_kzalloc(&device->dev, sizeof(*led), GFP_KERNEL); if (!led) return -ENOMEM; @@ -733,10 +747,8 @@ static int acpi_fujitsu_laptop_leds_register(struct acpi_device *device) return ret; } - if ((call_fext_func(device, FUNC_LEDS, OP_GET_CAPS, - 0x0, 0x0) & FEAT_KEYBOARD_LAMPS) && - (call_fext_func(device, FUNC_BUTTONS, OP_GET_CAPS, - 0x0, 0x0) == 0x0)) { + if ((fext_leds(device, OP_GET_CAPS, 0x0, 0x0) & FEAT_KEYBOARD_LAMPS) && + (fext_buttons(device, OP_GET_CAPS, 0x0, 0x0) == 0x0)) { led = devm_kzalloc(&device->dev, sizeof(*led), GFP_KERNEL); if (!led) return -ENOMEM; @@ -777,10 +789,8 @@ static int acpi_fujitsu_laptop_leds_register(struct acpi_device *device) * bit 14 seems to indicate presence of said led as well. * Confirm by testing the status. */ - if ((call_fext_func(device, FUNC_LEDS, OP_GET_CAPS, - 0x0, 0x0) & BIT(14)) && - (call_fext_func(device, FUNC_LEDS, OP_GET, - FEAT_ECO_LED, 0x0) != UNSUPPORTED_CMD)) { + if ((fext_leds(device, OP_GET_CAPS, 0x0, 0x0) & BIT(14)) && + (fext_leds(device, OP_GET, FEAT_ECO_LED, 0x0) != UNSUPPORTED_CMD)) { led = devm_kzalloc(&device->dev, sizeof(*led), GFP_KERNEL); if (!led) return -ENOMEM; @@ -822,15 +832,13 @@ static int acpi_fujitsu_laptop_add(struct acpi_device *device) pr_info("ACPI: %s [%s]\n", acpi_device_name(device), acpi_device_bid(device)); - while (call_fext_func(device, FUNC_BUTTONS, OP_GET_EVENTS, - 0x0, 0x0) != 0 && + while (fext_buttons(device, OP_GET_EVENTS, 0x0, 0x0) != 0 && i++ < HOTKEY_RINGBUFFER_SIZE) ; /* No action, result is discarded */ acpi_handle_debug(device->handle, "Discarded %i ringbuffer entries\n", i); - priv->flags_supported = call_fext_func(device, FUNC_FLAGS, OP_GET_CAPS, - 0x0, 0x0); + priv->flags_supported = fext_flags(device, OP_GET_CAPS, 0x0, 0x0); /* Make sure our bitmask of supported functions is cleared if the RFKILL function block is not implemented, like on the S7020. */ @@ -838,19 +846,16 @@ static int acpi_fujitsu_laptop_add(struct acpi_device *device) priv->flags_supported = 0; if (priv->flags_supported) - priv->flags_state = call_fext_func(device, FUNC_FLAGS, - OP_GET_EXT, 0x0, 0x0); + priv->flags_state = fext_flags(device, OP_GET_EXT, 0x0, 0x0); /* Suspect this is a keymap of the application panel, print it */ acpi_handle_info(device->handle, "BTNI: [0x%x]\n", - call_fext_func(device, FUNC_BUTTONS, OP_GET_CAPS, - 0x0, 0x0)); + fext_buttons(device, OP_GET_CAPS, 0x0, 0x0)); /* Sync backlight power status */ if (fujitsu_bl && fujitsu_bl->bl_device && acpi_video_get_backlight_type() == acpi_backlight_vendor) { - if (call_fext_func(fext, FUNC_BACKLIGHT, OP_GET, - FEAT_BACKLIGHT_POWER, + if (fext_backlight(fext, OP_GET, FEAT_BACKLIGHT_POWER, 0x0) == STATE_BACKLIGHT_OFF) fujitsu_bl->bl_device->props.power = FB_BLANK_POWERDOWN; else @@ -935,11 +940,9 @@ static void acpi_fujitsu_laptop_notify(struct acpi_device *device, u32 event) } if (priv->flags_supported) - priv->flags_state = call_fext_func(device, FUNC_FLAGS, - OP_GET_EXT, 0x0, 0x0); + priv->flags_state = fext_flags(device, OP_GET_EXT, 0x0, 0x0); - while ((irb = call_fext_func(device, FUNC_BUTTONS, OP_GET_EVENTS, - 0x0, 0x0)) != 0 && + while ((irb = fext_buttons(device, OP_GET_EVENTS, 0x0, 0x0)) != 0 && i++ < HOTKEY_RINGBUFFER_SIZE) { scancode = irb & 0x4ff; if (sparse_keymap_entry_from_scancode(priv->input, scancode)) @@ -956,8 +959,7 @@ static void acpi_fujitsu_laptop_notify(struct acpi_device *device, u32 event) * handled in software; its state is queried using FUNC_FLAGS */ if ((priv->flags_supported & BIT(26)) && - (call_fext_func(device, FUNC_FLAGS, OP_GET_EVENTS, - 0x0, 0x0) & BIT(26))) + (fext_flags(device, OP_GET_EVENTS, 0x0, 0x0) & BIT(26))) sparse_keymap_report_event(priv->input, BIT(26), 1, true); }