diff mbox series

[B/OEM-B,1/8] Revert "UBUNTU: SAUCE: ACPI / bus: Add some Lenovo laptops in list of acpi table term list"

Message ID 20190704045022.20633-2-kai.heng.feng@canonical.com
State Accepted
Headers show
Series Backport ACPI module-level code functionality | expand

Commit Message

Kai-Heng Feng July 4, 2019, 4:50 a.m. UTC 
BugLink: https://bugs.launchpad.net/bugs/1835357

This reverts commit abd273f52766e1418abc37b3d8bdccf4871affca.

Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
---
 drivers/acpi/bus.c | 34 ----------------------------------
 1 file changed, 34 deletions(-)
diff mbox series

Patch

diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index 0b306a7cef77..f0348e388d01 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -109,43 +109,10 @@  static const struct dmi_system_id acpi_quirks_dmi_table[] __initconst = {
 	},
 	{}
 };
-
-static const char * const acpi_quirk_lenovo_bios_ids[] = {
-	"N2H", /* first 3 bytes of Lenovo BIOS version */
-	NULL
-};
-
-bool acpi_quirk_matches_bios_ids(const char * const ids[])
-{
-	const char *bios_vendor = dmi_get_system_info(DMI_BIOS_VENDOR);
-	const char *bios_ver = dmi_get_system_info(DMI_BIOS_VERSION);
-	int i;
-
-	if ((!bios_vendor) && (!bios_ver) && strncmp(bios_vendor, "LENOVO", 6))
-		return false;
-
-	for (i = 0; ids[i]; i++)
-		if (!strncmp(bios_ver, ids[i], 3)) {
-			acpi_gbl_parse_table_as_term_list = 1;
-			return true;
-		}
-
-	return false;
-}
-
 #else
 static const struct dmi_system_id acpi_quirks_dmi_table[] __initconst = {
 	{}
 };
-
-static const char * const acpi_quirk_lenovo_bios_ids[] = {
-	NULL
-};
-
-bool acpi_quirk_matches_bios_ids(const char * const ids[])
-{
-	return false;
-}
 #endif
 
 /* --------------------------------------------------------------------------
@@ -1069,7 +1036,6 @@  void __init acpi_early_init(void)
 
 	/* Check machine-specific quirks */
 	dmi_check_system(acpi_quirks_dmi_table);
-	acpi_quirk_matches_bios_ids(acpi_quirk_lenovo_bios_ids);
 
 	status = acpi_reallocate_root_table();
 	if (ACPI_FAILURE(status)) {