From patchwork Wed Mar 1 08:10:43 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: 9597763 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 E58A060547 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 D517720855 for ; Wed, 1 Mar 2017 08:12:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CA03A22638; 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 E310D20855 for ; Wed, 1 Mar 2017 08:12:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752058AbdCAIMU (ORCPT ); Wed, 1 Mar 2017 03:12:20 -0500 Received: from mail-lf0-f66.google.com ([209.85.215.66]:34900 "EHLO mail-lf0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751062AbdCAIMN (ORCPT ); Wed, 1 Mar 2017 03:12:13 -0500 Received: by mail-lf0-f66.google.com with SMTP id z127so2714119lfa.2 for ; Wed, 01 Mar 2017 00:10:52 -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=iaOI4hV3jkTRUkhrvM0vfzO9EKB0Bamk464N6CFUQKs=; b=wboGTin84vM0MbtbNXmReJYev+Um/YktDGI7munzZHDubBzxz6cEPfwkVlLVVMCK0n kskYzDdPBUba9OjsGQfECCheMixnXVJSoEyGRO3ACEOD83JH9ZGcYtYarC6TlYiv6v3n +AxG3J1JdEz+Nyw2EUIyx5kbd35g97qt+DkbY= 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=iaOI4hV3jkTRUkhrvM0vfzO9EKB0Bamk464N6CFUQKs=; b=BzrmtNWROUvoVTGo53InUc5bmdoKIyvu81N6JTY28OsCwaZHvvpxkm+KeSqTJUE4pW lY3LWebasoFSnz60X2Vgygt880slxgs7GNQkyoqQwOz8rXsbVr6L9cSi+BxTxpSChIbK 1toU6HjCTDRlsWP/0ReD47EvtO3C7wp1Wu9Ak/MjAAXNBxNGRgHceffoay6O/gp57g+J JCIuPjpecXgrwYClCGg43n47G/efnSG2ogTl+Lk3/Mv4vzi0hdiIi2FuAXC3Pw562LaG +ScuSuoSfr9Zb83INmIIbRGkQS2KrWG6l7+cXhA3lgOaILViHGgfE2XV97NbhgP7o3D7 9Z6w== X-Gm-Message-State: AMke39lW7mNF1CL8wBQMPvEVfP+Aw1M8RovEFSMbgU8rzSh72F+RSvfKf8PENbMCpBGHIw== X-Received: by 10.46.83.88 with SMTP id t24mr2258489ljd.20.1488355851428; Wed, 01 Mar 2017 00:10:51 -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.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 01 Mar 2017 00:10:51 -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 3/4] platform/x86: fujitsu-laptop: only register backlight device if FUJ02B1 is present Date: Wed, 1 Mar 2017 09:10:43 +0100 Message-Id: <20170301081044.12141-4-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 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. Suggested-by: Alan Jenkins Signed-off-by: Michał Kępień --- drivers/platform/x86/fujitsu-laptop.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/drivers/platform/x86/fujitsu-laptop.c b/drivers/platform/x86/fujitsu-laptop.c index afcc451e21f6..4fc14fbcfa8a 100644 --- a/drivers/platform/x86/fujitsu-laptop.c +++ b/drivers/platform/x86/fujitsu-laptop.c @@ -787,6 +787,12 @@ 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) { + error = fujitsu_backlight_register(); + if (error) + goto err_unregister_input_dev; + } + return 0; err_unregister_input_dev: @@ -803,6 +809,7 @@ 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; + backlight_device_unregister(fujitsu_bl->bl_device); input_unregister_device(input); fujitsu_bl->acpi_handle = NULL; @@ -1254,17 +1261,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) { - ret = fujitsu_backlight_register(); - if (ret) - goto fail_sysfs_group; - } - ret = platform_driver_register(&fujitsu_pf_driver); if (ret) - goto fail_backlight; + goto fail_sysfs_group; /* Register laptop driver */ @@ -1286,8 +1285,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); @@ -1311,8 +1308,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);