Commit 5296a736 authored by Alan Jenkins's avatar Alan Jenkins Committed by Andy Shevchenko

platform/x86: fujitsu-laptop: autodetect LCD interface on all models

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: default avatarAlan Jenkins <alan-jenkins@tuffmail.co.uk>
[kempniu: rebase patch, rewrite commit message]
Signed-off-by: default avatarMichał Kępień <kernel@kempniu.pl>
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: default avatarJonathan Woithe <jwoithe@just42.net>
parent c1d1e8a0
...@@ -631,15 +631,6 @@ static struct platform_driver fujitsu_pf_driver = { ...@@ -631,15 +631,6 @@ static struct platform_driver fujitsu_pf_driver = {
static void __init dmi_check_cb_common(const struct dmi_system_id *id) static void __init dmi_check_cb_common(const struct dmi_system_id *id)
{ {
pr_info("Identified laptop model '%s'\n", id->ident); 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) 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) ...@@ -751,6 +742,15 @@ static int acpi_fujitsu_bl_add(struct acpi_device *device)
pr_err("_INI Method failed\n"); 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) */ /* do config (detect defaults) */
use_alt_lcd_levels = use_alt_lcd_levels == 1 ? 1 : 0; use_alt_lcd_levels = use_alt_lcd_levels == 1 ? 1 : 0;
disable_brightness_adjust = disable_brightness_adjust == 1 ? 1 : 0; disable_brightness_adjust = disable_brightness_adjust == 1 ? 1 : 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment