From patchwork Wed Mar 1 08:10:41 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: 9597761 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 98777604DC for ; Wed, 1 Mar 2017 08:12:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 89632223C7 for ; Wed, 1 Mar 2017 08:12:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7E0B122638; Wed, 1 Mar 2017 08:12:27 +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 0EF8A252D5 for ; Wed, 1 Mar 2017 08:12:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751800AbdCAIMV (ORCPT ); Wed, 1 Mar 2017 03:12:21 -0500 Received: from mail-lf0-f67.google.com ([209.85.215.67]:34895 "EHLO mail-lf0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750988AbdCAIMN (ORCPT ); Wed, 1 Mar 2017 03:12:13 -0500 Received: by mail-lf0-f67.google.com with SMTP id z127so2714083lfa.2 for ; Wed, 01 Mar 2017 00:10:50 -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=cqJtZkS/fRc88WDg7ig8t+vZRl50L8QPo2ITtGjKL98=; b=FYSBTncBwr+cIxHqzLhjmaMddkOGbZmg0D0orex7DtDsOdZ/ve/kBndFuYYdI7GmfQ BfaJWDVjDUUt59xs2Npml5I2tLSZDHWTStjBauecjMv8c3smP8qv8h9jDSpSas694a4l TrlSOTr1qIhNA04Xx29gCcr0pHrQ2RaOnKsFs= 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=cqJtZkS/fRc88WDg7ig8t+vZRl50L8QPo2ITtGjKL98=; b=HnwLqf3Tj6IblMkDQUlw9oe/LaEfStXmhDso7jkyMvmkJYoQuX9dv7hkSOl9mV0+Ss BT2tHO0YYkSE6XmSysJWY2skY6t2q/+XD8INrPcLyOwCmfc6zYByPYZqDQiLKH1cbCqL gK1SndFnb3Jexhg2UjKqBwLOrb6FZvx6DZatJIXhlsLHO8Gq+mhw9VkJW7QE8QYIoXLI vkHwdb5Hrv4shkDIUR1msbfbWWORALgcfoEEWxXJj/brRTraBzCXFiY4uNzJFIzlnnwB XR87XmaYH8qXQjFO7IBM16mCqwSqeq0NAEGwSafLq5215mLESHBJuJU8z4nRIsOJ/f1H kJbw== X-Gm-Message-State: AMke39llB8xalxq4Oe9YvIgds3QhrdIaNOAPExMreuMHSIaLv0srHUfWmSemONP8LDaKSw== X-Received: by 10.46.84.84 with SMTP id y20mr2117217ljd.126.1488355849821; Wed, 01 Mar 2017 00:10:49 -0800 (PST) Received: from ozzy.hq.kempniu.pl ([2001:a10:160:3::3]) by smtp.googlemail.com with ESMTPSA id l23sm917192lfk.27.2017.03.01.00.10.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 01 Mar 2017 00:10:49 -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 v2 1/4] platform/x86: fujitsu-laptop: register backlight device in a separate function Date: Wed, 1 Mar 2017 09:10:41 +0100 Message-Id: <20170301081044.12141-2-kernel@kempniu.pl> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170301081044.12141-1-kernel@kempniu.pl> References: <20170301081044.12141-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 Move code responsible for backlight device registration to a separate function in order to simplify error handling and decrease indentation. Simplify initialization of struct backlight_properties. Use KBUILD_MODNAME as device name to avoid repeating the same string literal throughout the module. Signed-off-by: Michał Kępień --- drivers/platform/x86/fujitsu-laptop.c | 38 ++++++++++++++++++++--------------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/drivers/platform/x86/fujitsu-laptop.c b/drivers/platform/x86/fujitsu-laptop.c index e12cc3504d48..185c929898d9 100644 --- a/drivers/platform/x86/fujitsu-laptop.c +++ b/drivers/platform/x86/fujitsu-laptop.c @@ -685,6 +685,25 @@ static const struct dmi_system_id fujitsu_dmi_table[] __initconst = { /* ACPI device for LCD brightness control */ +static int fujitsu_backlight_register(void) +{ + struct backlight_properties props = { + .brightness = fujitsu_bl->brightness_level, + .max_brightness = fujitsu_bl->max_brightness - 1, + .type = BACKLIGHT_PLATFORM + }; + struct backlight_device *bd; + + bd = backlight_device_register(KBUILD_MODNAME, NULL, NULL, + &fujitsu_bl_ops, &props); + if (IS_ERR(bd)) + return PTR_ERR(bd); + + fujitsu_bl->bl_device = bd; + + return 0; +} + static int acpi_fujitsu_bl_add(struct acpi_device *device) { int state = 0; @@ -1192,7 +1211,7 @@ MODULE_DEVICE_TABLE(acpi, fujitsu_ids); static int __init fujitsu_init(void) { - int ret, max_brightness; + int ret; if (acpi_disabled) return -ENODEV; @@ -1232,22 +1251,9 @@ static int __init fujitsu_init(void) /* Register backlight stuff */ if (acpi_video_get_backlight_type() == acpi_backlight_vendor) { - struct backlight_properties props; - - memset(&props, 0, sizeof(struct backlight_properties)); - max_brightness = fujitsu_bl->max_brightness; - props.type = BACKLIGHT_PLATFORM; - props.max_brightness = max_brightness - 1; - fujitsu_bl->bl_device = backlight_device_register("fujitsu-laptop", - NULL, NULL, - &fujitsu_bl_ops, - &props); - if (IS_ERR(fujitsu_bl->bl_device)) { - ret = PTR_ERR(fujitsu_bl->bl_device); - fujitsu_bl->bl_device = NULL; + ret = fujitsu_backlight_register(); + if (ret) goto fail_sysfs_group; - } - fujitsu_bl->bl_device->props.brightness = fujitsu_bl->brightness_level; } ret = platform_driver_register(&fujitsu_pf_driver);