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: Alan Jenkins <alan-jenkins@tuffmail.co.uk> [kempniu: rebase patch, rewrite commit message] Signed-off-by: Michał Kępień <kernel@kempniu.pl> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Reviewed-by: Jonathan Woithe <jwoithe@just42.net>
This commit is contained in:
Родитель
c1d1e8a051
Коммит
5296a73613
|
@ -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;
|
||||
|
|
Загрузка…
Ссылка в новой задаче