From patchwork Wed Feb 8 13:46:31 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: 9562635 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 83BE460434 for ; Wed, 8 Feb 2017 14:21:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 74DDA284F7 for ; Wed, 8 Feb 2017 14:21:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 699B5284FB; Wed, 8 Feb 2017 14:21:17 +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=unavailable 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 CDD15284F7 for ; Wed, 8 Feb 2017 14:21:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754037AbdBHOU6 (ORCPT ); Wed, 8 Feb 2017 09:20:58 -0500 Received: from mail-lf0-f65.google.com ([209.85.215.65]:33618 "EHLO mail-lf0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753874AbdBHOUy (ORCPT ); Wed, 8 Feb 2017 09:20:54 -0500 Received: by mail-lf0-f65.google.com with SMTP id x1so9463071lff.0 for ; Wed, 08 Feb 2017 06:19:32 -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=gcilu9THKjRL2PbH30SFvqVrdGowMQfdjpDpUYlpeLY=; b=cKmE28W5id++Jdqb+AEFe0wh5OVMQdWqW8vMmvad0T9UVkrmLTnvnN5QkGlz+bohsg ZMKELAUEV5l63STY7/dbsANaXoN/6j83D1bBESmb9r3LGj8F3+jiKm85o+PYHSkc3QW9 vcPOlPvSZLtx570hmojNII9YirNPAPzAMxvio= 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=gcilu9THKjRL2PbH30SFvqVrdGowMQfdjpDpUYlpeLY=; b=d2digRrAO83qCkOsHfwsqtm1qZI6YPJ3AlObiXPOLxMFNCQyxzply2XLHNgEp0P8Hd ucXiuD5449bxO4WevYX3gaGuWMlLbKLIdq9R1jbM8jediPxnvvJflj2VfeAovfTIBTPg zVL7rR/PXMs8MAwya0B8kh0RjkSp09arLX909Mw8nbqzYlrTGsrZOzKt0cNf7sDR+JEm plfPIk25rhOJJ56aI4+23tR6P7WRA+shSq0qkIeaCleYdXas3zOqHFRPPXv3fLBrpDDu nnvGipIT5Cpo231U1ugRs5XSCbfR+W6pXUrCI7Z+tJkPR2IieAGRgNDqfRcuDAxT3DCt gONw== X-Gm-Message-State: AIkVDXLzXrD6GFQ+NvHMhQcXfrTLDtvid74ofrw82muDgvUrOZYIaRlOGiwttjYpi6NVRw== X-Received: by 10.46.5.130 with SMTP id 124mr8537062ljf.17.1486561669440; Wed, 08 Feb 2017 05:47:49 -0800 (PST) Received: from ozzy.nask.waw.pl ([2001:a10:160:3::3]) by smtp.googlemail.com with ESMTPSA id m18sm2399684lfe.45.2017.02.08.05.47.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 Feb 2017 05:47:48 -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 08/10] platform/x86: fujitsu-laptop: only register backlight device if FUJ02B1 is present Date: Wed, 8 Feb 2017 14:46:31 +0100 Message-Id: <20170208134633.5152-9-kernel@kempniu.pl> X-Mailer: git-send-email 2.11.1 In-Reply-To: <20170208134633.5152-1-kernel@kempniu.pl> References: <20170208134633.5152-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 From: Alan Jenkins As the backlight device registered by fujitsu-laptop relies on the FUJ02B1 ACPI device being present, only register the backlight device once that ACPI device is detected. Drop redundant max_brightness local variable. Assign current brightness before registering the backlight device. Adjust indentation to make checkpatch happy. Signed-off-by: Alan Jenkins [kempniu: rebase patch, rewrite commit message] Signed-off-by: Michał Kępień --- drivers/platform/x86/fujitsu-laptop.c | 49 ++++++++++++++++------------------- 1 file changed, 22 insertions(+), 27 deletions(-) diff --git a/drivers/platform/x86/fujitsu-laptop.c b/drivers/platform/x86/fujitsu-laptop.c index a5478a011b90..8247abd4658f 100644 --- a/drivers/platform/x86/fujitsu-laptop.c +++ b/drivers/platform/x86/fujitsu-laptop.c @@ -762,6 +762,23 @@ static int acpi_fujitsu_bl_add(struct acpi_device *device) fujitsu_bl->max_brightness = FUJITSU_LCD_N_LEVELS; get_lcd_level(); + if (acpi_video_get_backlight_type() == acpi_backlight_vendor) { + struct backlight_properties props; + + memset(&props, 0, sizeof(struct backlight_properties)); + props.type = BACKLIGHT_PLATFORM; + props.max_brightness = fujitsu_bl->max_brightness - 1; + props.brightness = fujitsu_bl->brightness_level; + fujitsu_bl->bl_device = + backlight_device_register("fujitsu-laptop", NULL, NULL, + &fujitsu_bl_ops, &props); + if (IS_ERR(fujitsu_bl->bl_device)) { + error = PTR_ERR(fujitsu_bl->bl_device); + fujitsu_bl->bl_device = NULL; + goto err_unregister_input_dev; + } + } + return 0; err_unregister_input_dev: @@ -778,6 +795,9 @@ static int acpi_fujitsu_bl_remove(struct acpi_device *device) struct fujitsu_bl *fujitsu_bl = acpi_driver_data(device); struct input_dev *input = fujitsu_bl->input; + if (fujitsu_bl->bl_device) + backlight_device_unregister(fujitsu_bl->bl_device); + input_unregister_device(input); fujitsu_bl->acpi_handle = NULL; @@ -1192,7 +1212,7 @@ MODULE_DEVICE_TABLE(acpi, fujitsu_ids); static int __init fujitsu_init(void) { - int ret, max_brightness; + int ret; if (acpi_disabled) return -ENODEV; @@ -1229,30 +1249,9 @@ static int __init fujitsu_init(void) if (ret) goto fail_platform_device2; - /* 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; - goto fail_sysfs_group; - } - fujitsu_bl->bl_device->props.brightness = fujitsu_bl->brightness_level; - } - ret = platform_driver_register(&fujitsu_pf_driver); if (ret) - goto fail_backlight; + goto fail_sysfs_group; /* Register laptop driver */ @@ -1282,8 +1281,6 @@ static int __init fujitsu_init(void) kfree(fujitsu_laptop); fail_laptop: platform_driver_unregister(&fujitsu_pf_driver); -fail_backlight: - backlight_device_unregister(fujitsu_bl->bl_device); fail_sysfs_group: sysfs_remove_group(&fujitsu_bl->pf_device->dev.kobj, &fujitsu_pf_attribute_group); @@ -1307,8 +1304,6 @@ static void __exit fujitsu_cleanup(void) platform_driver_unregister(&fujitsu_pf_driver); - backlight_device_unregister(fujitsu_bl->bl_device); - sysfs_remove_group(&fujitsu_bl->pf_device->dev.kobj, &fujitsu_pf_attribute_group);