Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a707c27c authored by Andy Lutomirski's avatar Andy Lutomirski Committed by Darren Hart
Browse files

acpi: Remove _OSI(Linux) for ThinkPads 



AFAICT the only reason to set _OSI(Linux) on ThinkPads is to get
sensible mute button behavior.  Now that the thinkpad_acpi driver
can do this on is own, there is no reason to keep the ACPI
quirk.

Cc: Len Brown <len.brown@intel.com>
Cc: Jerone Young <jerone.young@canonical.com>
Signed-off-by: default avatarAndy Lutomirski <luto@amacapital.net>
Acked-by: default avatarHenrique de Moraes Holschuh <hmh@hmh.eng.br>
Signed-off-by: default avatarDarren Hart <dvhart@linux.intel.com>
parent 9a417ec0

drivers/acpi/blacklist.c

+0 −54
Original line number Diff line number Diff line
@@ -304,60 +304,6 @@ static struct dmi_system_id acpi_osi_dmi_table[] __initdata = { 
	 * Linux ignores it, except for the machines enumerated below.

	 */



	/*

	 * Lenovo has a mix of systems OSI(Linux) situations

	 * and thus we can not wildcard the vendor.

	 *

	 * _OSI(Linux) helps sound

	 * DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad R61"),

	 * DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad T61"),

	 * T400, T500

	 * _OSI(Linux) has Linux specific hooks

	 * DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad X61"),

	 * _OSI(Linux) is a NOP:

	 * DMI_MATCH(DMI_PRODUCT_VERSION, "3000 N100"),

	 * DMI_MATCH(DMI_PRODUCT_VERSION, "LENOVO3000 V100"),

	 */

	{

	.callback = dmi_enable_osi_linux,

	.ident = "Lenovo ThinkPad R61",

	.matches = {

		     DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),

		     DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad R61"),

		},

	},

	{

	.callback = dmi_enable_osi_linux,

	.ident = "Lenovo ThinkPad T61",

	.matches = {

		     DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),

		     DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad T61"),

		},

	},

	{

	.callback = dmi_enable_osi_linux,

	.ident = "Lenovo ThinkPad X61",

	.matches = {

		     DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),

		     DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad X61"),

		},

	},

	{

	.callback = dmi_enable_osi_linux,

	.ident = "Lenovo ThinkPad T400",

	.matches = {

		     DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),

		     DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad T400"),

		},

	},

	{

	.callback = dmi_enable_osi_linux,

	.ident = "Lenovo ThinkPad T500",

	.matches = {

		     DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),

		     DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad T500"),

		},

	},

	/*

	 * Without this this EEEpc exports a non working WMI interface, with

	 * this it exports a working "good old" eeepc_laptop interface, fixing