From patchwork Wed Feb 8 13:46:32 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: 9562679 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 AA9D260434 for ; Wed, 8 Feb 2017 14:54:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9BFFD284BA for ; Wed, 8 Feb 2017 14:54:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8CFEB28504; Wed, 8 Feb 2017 14:54:59 +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 2BCE6284BA for ; Wed, 8 Feb 2017 14:54:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933209AbdBHOyr (ORCPT ); Wed, 8 Feb 2017 09:54:47 -0500 Received: from mail-lf0-f65.google.com ([209.85.215.65]:35389 "EHLO mail-lf0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753928AbdBHOyC (ORCPT ); Wed, 8 Feb 2017 09:54:02 -0500 Received: by mail-lf0-f65.google.com with SMTP id v186so9577187lfa.2 for ; Wed, 08 Feb 2017 06:54:01 -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=jCi1PVDeTSG8ML7ZfNk5f5/BtupYakg83Zrf9JVE4sg=; b=SEFTbLQ+iHl+Bbw8ZwTUCxHyq+PLSbuqvVQ9NylK/08+mV5LsJmokgNnIb1M35rBSV UGZkOirX8bAL659/D9mRnKmSE5ayqUzHQjVlGRoYSykKACGMWCNeHrr+EEQ+gVLTD2s1 JlnOZhF/tAtfSPToDlXgg7g0dAkHpsVYnC114= 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=jCi1PVDeTSG8ML7ZfNk5f5/BtupYakg83Zrf9JVE4sg=; b=BjLwd9KiyC66rJzqQNUGRro8nKj/jpoJhINf1bNlE5Ip6RloP4UWU88MjOP2SiQi6u oWTxB91qxbFBdrVKU5rkehBQJkW2+m5oIvkxPD+4MVPzmivmps5fU4yFanR+gh7kjixa qeWZjaLyiJPWTKZ0sD71abe0D2VgZ/Xn4uDI98tA/3qPycRceku1cuw2Aeq8tqNgMCdj iVy95CXOX0V5iJ0geiUeuwwGlD3BuvHgoWyFxyBl2K7XSnU0DRmCb0tue6I4ZbVjPj4C nHMXvNSz+3aSRZUNY0yEJ11VapFiEqPSdlkqqQWmQxSciE1YuoDq6QYkn8vX+tFRdAaZ v3qw== X-Gm-Message-State: AIkVDXL/Vz6Qlh1Zzuiw0scYo9Vbi8r+gGqKJGCFePSw8mSQwl3PJ7aB8b4tBgQB+v1lwQ== X-Received: by 10.25.80.26 with SMTP id e26mr7715446lfb.82.1486561670239; Wed, 08 Feb 2017 05:47:50 -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.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 Feb 2017 05:47:49 -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 09/10] platform/x86: fujitsu-laptop: autodetect LCD interface on all models Date: Wed, 8 Feb 2017 14:46:32 +0100 Message-Id: <20170208134633.5152-10-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 Presence of ACPI method SBL2 should be checked on all models rather than just the ones with predefined hotkey keycode overrides. Move most of dmi_check_cb_common() to acpi_fujitsu_bl_add(). 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 | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/platform/x86/fujitsu-laptop.c b/drivers/platform/x86/fujitsu-laptop.c index 8247abd4658f..4eabb169e2c9 100644 --- a/drivers/platform/x86/fujitsu-laptop.c +++ b/drivers/platform/x86/fujitsu-laptop.c @@ -631,15 +631,6 @@ static struct platform_driver fujitsu_pf_driver = { static void __init dmi_check_cb_common(const struct dmi_system_id *id) { pr_info("Identified laptop model '%s'\n", id->ident); - if (use_alt_lcd_levels == -1) { - if (acpi_has_method(NULL, - "\\_SB.PCI0.LPCB.FJEX.SBL2")) - use_alt_lcd_levels = 1; - else - use_alt_lcd_levels = 0; - vdbg_printk(FUJLAPTOP_DBG_TRACE, "auto-detected usealt as " - "%i\n", use_alt_lcd_levels); - } } static int __init dmi_check_cb_s6410(const struct dmi_system_id *id) @@ -751,6 +742,15 @@ static int acpi_fujitsu_bl_add(struct acpi_device *device) pr_err("_INI Method failed\n"); } + if (use_alt_lcd_levels == -1) { + if (acpi_has_method(NULL, "\\_SB.PCI0.LPCB.FJEX.SBL2")) + use_alt_lcd_levels = 1; + else + use_alt_lcd_levels = 0; + vdbg_printk(FUJLAPTOP_DBG_TRACE, "auto-detected usealt as %i\n", + use_alt_lcd_levels); + } + /* do config (detect defaults) */ use_alt_lcd_levels = use_alt_lcd_levels == 1 ? 1 : 0; disable_brightness_adjust = disable_brightness_adjust == 1 ? 1 : 0;