From patchwork Tue Mar 7 10:15:14 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: 9608537 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 2C42660414 for ; Tue, 7 Mar 2017 10:16:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 22164284A5 for ; Tue, 7 Mar 2017 10:16:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 16C2D284D9; Tue, 7 Mar 2017 10:16:22 +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 AACCB284A5 for ; Tue, 7 Mar 2017 10:16:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755341AbdCGKQU (ORCPT ); Tue, 7 Mar 2017 05:16:20 -0500 Received: from mail-lf0-f67.google.com ([209.85.215.67]:35379 "EHLO mail-lf0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755266AbdCGKPY (ORCPT ); Tue, 7 Mar 2017 05:15:24 -0500 Received: by mail-lf0-f67.google.com with SMTP id v2so8635417lfi.2 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=AI3hkQMFGxIF9XoCKmH1GAyb9XMiLdSJYALKoBowwLU=; b=OqG/eCVohSu+Vmf6gg9Z/ciJ4SNQSMYWlwa5Jo3tKZohcypuBUcS8WMWyB8qnjsdPg iB0OJenX+tP7B9y1zAHpPdtpALZgmU+20bZfQEWwxULHY0cZFxCdxVJNA/jtK+Snhzso lfLX54kj2YOP8o90FsPW2QMkiU/Ge289psnW4= 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=AI3hkQMFGxIF9XoCKmH1GAyb9XMiLdSJYALKoBowwLU=; b=VYNgNXma36zyovOC10qjkP9ZpRnGuy1LWZVxHn6z2BtHzh686PMxerxAkGpHOq9LzW jbOXrYWai9t2CfnmiivtvjZconsO4NUIqxTLo6DMWeFv6GSzkHqFmly8Vc6iaovcV/n/ GoFzdGz7XP4GixMDW6koxPDkewWb5vUh/xfgCD/XoTtqaoJyRu0kmVfIQTwrBDNpVimK 0yFcyHs7Ub13FxrwGRS7hrb+3cbaGpjBLME4WkulBygA5uuStc+1Fdl4tYb02RGPiCXS N7VJ0qJZzT6LUEeh5AF2MaEG0DcXXrpPC1OAMlYxsYsPHhTHK7vk0P1HJFQ+iNswZXoH McNw== X-Gm-Message-State: AMke39mYOQJZ5GC0KD584bDzKHF5SaRRPpgMMV0sxFGspB8HWxgFL00BPaMnuAA4DmDgPQ== X-Received: by 10.46.88.85 with SMTP id x21mr6996131ljd.90.1488881721961; 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.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 07 Mar 2017 02:15:21 -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 2/4] platform/x86: fujitsu-laptop: sync backlight power status in acpi_fujitsu_laptop_add() Date: Tue, 7 Mar 2017 11:15:14 +0100 Message-Id: <20170307101516.9852-3-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 Registering an ACPI driver does not mean the device it handles has to exist. As the code which syncs backlight power status uses call_fext_func(), it needs the FUJ02E3 ACPI device to be present, so ensure that code is only run once the FUJ02E3 device is detected. Signed-off-by: Michał Kępień --- drivers/platform/x86/fujitsu-laptop.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/platform/x86/fujitsu-laptop.c b/drivers/platform/x86/fujitsu-laptop.c index 185c929898d9..348af17cdc94 100644 --- a/drivers/platform/x86/fujitsu-laptop.c +++ b/drivers/platform/x86/fujitsu-laptop.c @@ -955,6 +955,14 @@ static int acpi_fujitsu_laptop_add(struct acpi_device *device) /* Suspect this is a keymap of the application panel, print it */ pr_info("BTNI: [0x%x]\n", call_fext_func(FUNC_BUTTONS, 0x0, 0x0, 0x0)); + /* Sync backlight power status */ + if (acpi_video_get_backlight_type() == acpi_backlight_vendor) { + if (call_fext_func(FUNC_BACKLIGHT, 0x2, 0x4, 0x0) == 3) + fujitsu_bl->bl_device->props.power = FB_BLANK_POWERDOWN; + else + fujitsu_bl->bl_device->props.power = FB_BLANK_UNBLANK; + } + #if IS_ENABLED(CONFIG_LEDS_CLASS) if (call_fext_func(FUNC_LEDS, 0x0, 0x0, 0x0) & LOGOLAMP_POWERON) { result = led_classdev_register(&fujitsu_bl->pf_device->dev, @@ -1272,14 +1280,6 @@ static int __init fujitsu_init(void) if (ret) goto fail_laptop1; - /* Sync backlight power status (needs FUJ02E3 device, hence deferred) */ - if (acpi_video_get_backlight_type() == acpi_backlight_vendor) { - if (call_fext_func(FUNC_BACKLIGHT, 0x2, 0x4, 0x0) == 3) - fujitsu_bl->bl_device->props.power = FB_BLANK_POWERDOWN; - else - fujitsu_bl->bl_device->props.power = FB_BLANK_UNBLANK; - } - pr_info("driver " FUJITSU_DRIVER_VERSION " successfully loaded\n"); return 0;