Skip to contentSkip to conversation

Patch x86: Remove the duplicate C6100 entry in quirky motherboard boot list.

PATCH In review Masoud Sharbiani 5 participants 5 messages Sep 26, 2013 – Sep 27, 2013 x86

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Patch x86: Remove the duplicate C6100 entry in quirky motherboard boot list.

From: Masoud Sharbiani <[email protected]>

Two entries for the same system type were added, with two different vendor names: 'Dell' and 'Dell, Inc.'. Since a prefix match is being used, we can eliminate the latter.

---
 arch/x86/kernel/reboot.c |    8 --------
 1 file changed, 8 deletions(-)
arch/x86/kernel/reboot.c +0 -8
index f0783a6..d9333a4 100644
@@ -362,14 +362,6 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = {
 		.callback = set_pci_reboot,
 		.ident = "Dell PowerEdge C6100",
 		.matches = {
-			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
-			DMI_MATCH(DMI_PRODUCT_NAME, "C6100"),
-		},
-	},
-	{	/* Some C6100 machines were shipped with vendor being 'Dell'. */
-		.callback = set_pci_reboot,
-		.ident = "Dell PowerEdge C6100",
-		.matches = {
 			DMI_MATCH(DMI_SYS_VENDOR, "Dell"),
 			DMI_MATCH(DMI_PRODUCT_NAME, "C6100"),
 		},
Signature · 1 line
1.7.9.5
#1 lore raw

[tip:x86/reboot] x86/reboot: Remove the duplicate C6100 entry in the reboot quirks list

x86/reboot: Remove the duplicate C6100 entry in the reboot quirks list
Commit-ID:  b5eafc6f07c95e9f3dd047e72737449cb03c9956
Gitweb:     http://git.kernel.org/tip/b5eafc6f07c95e9f3dd047e72737449cb03c9956
Author:     Masoud Sharbiani <[email protected]>
AuthorDate: Thu, 26 Sep 2013 10:30:43 -0700
Committer:  Ingo Molnar <[email protected]>
CommitDate: Thu, 26 Sep 2013 20:52:37 +0200

x86/reboot: Remove the duplicate C6100 entry in the reboot quirks list

Two entries for the same system type were added, with two different vendor
names: 'Dell' and 'Dell, Inc.'.

Since a prefix match is being used by the DMI parsing code, we can eliminate the latter as redundant.

---
 arch/x86/kernel/reboot.c | 8 --------
 1 file changed, 8 deletions(-)
arch/x86/kernel/reboot.c +0 -8
index f0783a6..d9333a4 100644
@@ -362,14 +362,6 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = {
 		.callback = set_pci_reboot,
 		.ident = "Dell PowerEdge C6100",
 		.matches = {
-			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
-			DMI_MATCH(DMI_PRODUCT_NAME, "C6100"),
-		},
-	},
-	{	/* Some C6100 machines were shipped with vendor being 'Dell'. */
-		.callback = set_pci_reboot,
-		.ident = "Dell PowerEdge C6100",
-		.matches = {
 			DMI_MATCH(DMI_SYS_VENDOR, "Dell"),
 			DMI_MATCH(DMI_PRODUCT_NAME, "C6100"),
 		},
#2 lore raw

Re: [tip:x86/reboot] x86/reboot: Remove the duplicate C6100 entry in the reboot quirks list

Quoted 33 lines · tip-bot for Masoud Sharbiani
Commit-ID:  b5eafc6f07c95e9f3dd047e72737449cb03c9956
Gitweb:     http://git.kernel.org/tip/b5eafc6f07c95e9f3dd047e72737449cb03c9956
Author:     Masoud Sharbiani <[email protected]>
AuthorDate: Thu, 26 Sep 2013 10:30:43 -0700
Committer:  Ingo Molnar <[email protected]>
CommitDate: Thu, 26 Sep 2013 20:52:37 +0200

x86/reboot: Remove the duplicate C6100 entry in the reboot quirks list

Two entries for the same system type were added, with two different vendor
names: 'Dell' and 'Dell, Inc.'.

Since a prefix match is being used by the DMI parsing code, we can eliminate the latter as redundant.

---
 arch/x86/kernel/reboot.c | 8 --------
 1 file changed, 8 deletions(-)
arch/x86/kernel/reboot.c +0 -1
index f0783a6..d9333a4 100644
@@ -362,14 +362,6 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = {
 		.callback = set_pci_reboot,
 		.ident = "Dell PowerEdge C6100",
 		.matches = {
-			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),

arch/x86/kernel/reboot.c static struct dmi_system_id __initdata reboot_dmi_table[] = { · line 367

Quoted 10 lines
arch/x86/kernel/reboot.c +0 -7
-			DMI_MATCH(DMI_PRODUCT_NAME, "C6100"),
-		},
-	},
-	{	/* Some C6100 machines were shipped with vendor being 'Dell'. */
-		.callback = set_pci_reboot,
-		.ident = "Dell PowerEdge C6100",
-		.matches = {
 			DMI_MATCH(DMI_SYS_VENDOR, "Dell"),
 			DMI_MATCH(DMI_PRODUCT_NAME, "C6100"),
 		},

Hmm, I think we should be keeping the 'Dell Inc.' part instead of just 'Dell' - at least the rest of the entries use the same string:

arch/x86/kernel/reboot.c:                       DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
arch/x86/kernel/reboot.c:                       DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
arch/x86/kernel/reboot.c:                       DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
arch/x86/kernel/reboot.c:                       DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
arch/x86/kernel/reboot.c:                       DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
arch/x86/kernel/reboot.c:                       DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
arch/x86/kernel/reboot.c:                       DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
arch/x86/kernel/reboot.c:                       DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
arch/x86/kernel/reboot.c:                       DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
arch/x86/kernel/reboot.c:                       DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
arch/x86/kernel/reboot.c:                       DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
arch/x86/kernel/reboot.c:                       DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
arch/x86/kernel/reboot.c:                       DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
arch/x86/kernel/reboot.c:                       DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
arch/x86/kernel/reboot.c:                       DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
arch/x86/kernel/reboot.c:                       DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
arch/x86/kernel/reboot.c:                       DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
#3 lore raw

Re: [tip:x86/reboot] x86/reboot: Remove the duplicate C6100 entry in the reboot quirks list

Quoted 12 lines · Davidlohr Bueso

arch/x86/kernel/reboot.c static struct dmi_system_id __initdata reboot_dmi_table[] = { · line 367

Quoted 8 lines
arch/x86/kernel/reboot.c +0 -5
-	},
-	{	/* Some C6100 machines were shipped with vendor being 'Dell'. */
-		.callback = set_pci_reboot,
-		.ident = "Dell PowerEdge C6100",
-		.matches = {
 			DMI_MATCH(DMI_SYS_VENDOR, "Dell"),
 			DMI_MATCH(DMI_PRODUCT_NAME, "C6100"),
 		},

Hmm, I think we should be keeping the 'Dell Inc.' part instead of just 'Dell' - at least the rest of the entries use the same string:

The point is that some of the machines just has "Dell" in their vendor string.

-hpa

#4 lore raw

Re: [tip:x86/reboot] x86/reboot: Remove the duplicate C6100 entry in the reboot quirks list

Quoted 14 lines · H. Peter Anvin
Quoted 12 lines · Davidlohr Bueso

arch/x86/kernel/reboot.c static struct dmi_system_id __initdata reboot_dmi_table[] = { · line 367

Quoted 8 lines
arch/x86/kernel/reboot.c +0 -5
-	},
-	{	/* Some C6100 machines were shipped with vendor being 'Dell'. */
-		.callback = set_pci_reboot,
-		.ident = "Dell PowerEdge C6100",
-		.matches = {
 			DMI_MATCH(DMI_SYS_VENDOR, "Dell"),
 			DMI_MATCH(DMI_PRODUCT_NAME, "C6100"),
 		},

Hmm, I think we should be keeping the 'Dell Inc.' part instead of just 'Dell' - at least the rest of the entries use the same string:

Quoted 2 lines

The point is that some of the machines just has "Dell" in their vendor string.

Yes, so if then the argument could be made that all the other entries should probably be changed to 'Dell' as well.

This is yet another reminder that DMI matches are such a fragile method
...

Thanks,

Ingo