From patchwork Tue Mar 7 10:15:13 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: 9608531 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 805A760414 for ; Tue, 7 Mar 2017 10:16:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 759A9284A5 for ; Tue, 7 Mar 2017 10:16:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6A002284D9; Tue, 7 Mar 2017 10:16:13 +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 B8159284A5 for ; Tue, 7 Mar 2017 10:16:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755286AbdCGKP0 (ORCPT ); Tue, 7 Mar 2017 05:15:26 -0500 Received: from mail-lf0-f65.google.com ([209.85.215.65]:34600 "EHLO mail-lf0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755262AbdCGKPX (ORCPT ); Tue, 7 Mar 2017 05:15:23 -0500 Received: by mail-lf0-f65.google.com with SMTP id y193so13586563lfd.1 for ; Tue, 07 Mar 2017 02:15:22 -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=OPwECSNoEd4f1yaBjjLG70CqjMZy7nhgyFazZl5jaSf3ZYRWFnKOwVbauPpat6BnD9 LRNdqo6V+FIH2wErwNzQfGZIrtOzavhVsKxkSR/cfOU4/XLIYQDleZnt6bX0mE3CvH0c Z+3+NOVzxT64WS93YP2ZDqr8mJ1OQg4dKASzw= 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=nSgM9MGEiagjmA5+U1g2raMvy2mfQeSXhN+/pLRXVJ65hIOsCOIp/+Y6wpjcb2zr4M 4uMXC+xi2uICBwHAvgKu8lmfcmo/1o7E1gqjggZKCI3KkGlZOwV06AAc8h/qv9WaOysS TflA6LimeVz8do8sb+pYOAxpbbRzSSS/RXx84xjKu3yYwP3VJORvW/saH24rfChoS0ay 8AN+wGkvnM34U8PjKZCt1Z98zTtkIHzCorW7eiSue4gz62IytNBsNlzqO7VO6BK7GjWC kt8LnK8DRpk7Hxr9UfsbiR0vQQ7bjA+/QNCJxjBm+tWTDQwD3sd25n0mujTtOWB6Y0TG PiFA== X-Gm-Message-State: AMke39m3JHtMnVf0oj7lcjPujzOD0sYyqOIX7QQKm2RW3fPu2TUKwq2TdSwOImzXY69UNg== X-Received: by 10.46.20.27 with SMTP id u27mr6997613ljd.103.1488881721142; Tue, 07 Mar 2017 02:15:21 -0800 (PST) Received: from ozzy.nask.waw.pl ([2001:a10:160:3::3]) by smtp.googlemail.com with ESMTPSA id b16sm1898695lfe.30.2017.03.07.02.15.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 07 Mar 2017 02:15:20 -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 v3 1/4] platform/x86: fujitsu-laptop: register backlight device in a separate function Date: Tue, 7 Mar 2017 11:15:13 +0100 Message-Id: <20170307101516.9852-2-kernel@kempniu.pl> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170307101516.9852-1-kernel@kempniu.pl> References: <20170307101516.9852-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);