From patchwork Fri Mar 10 10:50:34 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: 9615987 X-Patchwork-Delegate: andy.shevchenko@gmail.com 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 D290C60415 for ; Fri, 10 Mar 2017 10:53:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BA7D128709 for ; Fri, 10 Mar 2017 10:53:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AF7462870E; Fri, 10 Mar 2017 10:53:45 +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 37D9A28709 for ; Fri, 10 Mar 2017 10:53:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934497AbdCJKxG (ORCPT ); Fri, 10 Mar 2017 05:53:06 -0500 Received: from mail-lf0-f68.google.com ([209.85.215.68]:35139 "EHLO mail-lf0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935073AbdCJKup (ORCPT ); Fri, 10 Mar 2017 05:50:45 -0500 Received: by mail-lf0-f68.google.com with SMTP id v2so6574427lfi.2 for ; Fri, 10 Mar 2017 02:50:44 -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=BPQJ8nSrvh6Rhp+7uvUqXisyKk8wRxMpPqFthM+5znU=; b=binXjSqMzO0d10eO7etHvSuGkx7KfXUugn97ck66QI1z9xAZJqm7clayWvhI6xskHs w2TBnt9TX58xJqUnAzlCIgBY/5BOB+uK5pQa4u+gl82WEolTIwviyBYCh+YMFtDwrvxI aPLs/ZN5ulQLQ347qy8PW6Du8kqhBgsqv1YHY= 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=BPQJ8nSrvh6Rhp+7uvUqXisyKk8wRxMpPqFthM+5znU=; b=i8MzB2Mhz8FVkXHQ6KvYuJZCNcid1Zib3ERFcAAJjnURqhmFHLCemAgnU6MeT4hSrH xtBw3W5zT49K2cyh5+xa+iTChMbbzJ+hk8TqONNX3ZnoCMNR/wi1g5HCVcS2kJgFuwfK WX+wk7xxclya2jK+jE75bVUBo70YgraGHUw3M54j/R2iN1BnJlEIvm8MmwIyRcaKPhDj hULSIYRELTYMi99EkAWjKZoLxgXUcxQ1oUlUHtoLBkcPAFpmaO27JDJGYIy9uP+B58tG uxrYwI8TfzV16keZOrTkwXyXjebFyi8qWTaZvkT8+1yJH8VuMxIWBr7Jf4+nJnUqBxbB duXg== X-Gm-Message-State: AMke39nuzay0+LYwu6E4q3AJCYLEetUkHUjiep12hyxvzoEY9dbSSrFT/zDiG2WNfrptKQ== X-Received: by 10.25.20.198 with SMTP id 67mr4145717lfu.78.1489143043678; Fri, 10 Mar 2017 02:50:43 -0800 (PST) Received: from ozzy.hq.kempniu.pl ([2001:a10:160:3::3]) by smtp.googlemail.com with ESMTPSA id r10sm500865ljd.54.2017.03.10.02.50.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 10 Mar 2017 02:50:43 -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 v4 2/4] platform/x86: fujitsu-laptop: sync backlight power status in acpi_fujitsu_laptop_add() Date: Fri, 10 Mar 2017 11:50:34 +0100 Message-Id: <20170310105036.26899-3-kernel@kempniu.pl> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170310105036.26899-1-kernel@kempniu.pl> References: <20170310105036.26899-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 5ec596c5053d..165971b102e7 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;