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

Commit 7d6fb7bd authored by Alex Chiang's avatar Alex Chiang Committed by Linus Torvalds
Browse files

ACPI: sleep: eliminate duplicate entries in acpisleep_dmi_table[] 



Duplicate entries ended up acpisleep_dmi_table[] by accident.
They don't hurt functionality, but they are ugly, so let's get
rid of them.

Cc: stable@kernel.org
Signed-off-by: default avatarAlex Chiang <achiang@canonical.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 94b849aa

drivers/acpi/sleep.c

+1 −89
Original line number Diff line number Diff line
@@ -475,101 +475,13 @@ static struct dmi_system_id __initdata acpisleep_dmi_table[] = { 
	},

	{

	.callback = init_set_sci_en_on_resume,

	.ident = "Lenovo ThinkPad X201",

	.ident = "Lenovo ThinkPad X201[s]",

	.matches = {

		DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),

		DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad X201"),

		},

	},

	{

	.callback = init_set_sci_en_on_resume,

	.ident = "Lenovo ThinkPad X201",

	.matches = {

		DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),

		DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad X201s"),

		},

	},

	{

	.callback = init_set_sci_en_on_resume,

	.ident = "Lenovo ThinkPad T410",

	.matches = {

		DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),

		DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad T410"),

		},

	},

	{

	.callback = init_set_sci_en_on_resume,

	.ident = "Lenovo ThinkPad T510",

	.matches = {

		DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),

		DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad T510"),

		},

	},

	{

	.callback = init_set_sci_en_on_resume,

	.ident = "Lenovo ThinkPad W510",

	.matches = {

		DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),

		DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad W510"),

		},

	},

	{

	.callback = init_set_sci_en_on_resume,

	.ident = "Lenovo ThinkPad X201",

	.matches = {

		DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),

		DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad X201"),

		},

	},

	{

	.callback = init_set_sci_en_on_resume,

	.ident = "Lenovo ThinkPad X201",

	.matches = {

		DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),

		DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad X201s"),

		},

	},

	{

	.callback = init_set_sci_en_on_resume,

	.ident = "Lenovo ThinkPad T410",

	.matches = {

		DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),

		DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad T410"),

		},

	},

	{

	.callback = init_set_sci_en_on_resume,

	.ident = "Lenovo ThinkPad T510",

	.matches = {

		DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),

		DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad T510"),

		},

	},

	{

	.callback = init_set_sci_en_on_resume,

	.ident = "Lenovo ThinkPad W510",

	.matches = {

		DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),

		DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad W510"),

		},

	},

	{

	.callback = init_set_sci_en_on_resume,

	.ident = "Lenovo ThinkPad X201",

	.matches = {

		DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),

		DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad X201"),

		},

	},

	{

	.callback = init_set_sci_en_on_resume,

	.ident = "Lenovo ThinkPad X201",

	.matches = {

		DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),

		DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad X201s"),

		},

	},

	{

	.callback = init_old_suspend_ordering,

	.ident = "Panasonic CF51-2L",

	.matches = {