The patch titled
pci: don't use dmi_name_in_vendors() in quirk
has been added to the -mm tree. Its filename is
pci-dont-use-dmi_name_in_vendors-in-quirk.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: pci: don't use dmi_name_in_vendors() in quirk
From: Jean Delvare <khali@xxxxxxxxxxxx>
Don't use the costly dmi_name_in_vendors() when we know the string we are
looking for can only be in the DMI board name field. This is more robust
and, more importantly, much faster.
Signed-off-by: Jean Delvare <khali@xxxxxxxxxxxx>
Cc: Jesse Barnes <jbarnes@xxxxxxxxxxxxxxxx>
Cc: Andi Kleen <andi@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/pci/quirks.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff -puN drivers/pci/quirks.c~pci-dont-use-dmi_name_in_vendors-in-quirk drivers/pci/quirks.c
--- a/drivers/pci/quirks.c~pci-dont-use-dmi_name_in_vendors-in-quirk
+++ a/drivers/pci/quirks.c
@@ -2349,8 +2349,11 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_A
*/
static void __devinit nvenet_msi_disable(struct pci_dev *dev)
{
- if (dmi_name_in_vendors("P5N32-SLI PREMIUM") ||
- dmi_name_in_vendors("P5N32-E SLI")) {
+ const char *board_name = dmi_get_system_info(DMI_BOARD_NAME);
+
+ if (board_name &&
+ (strstr(board_name, "P5N32-SLI PREMIUM") ||
+ strstr(board_name, "P5N32-E SLI"))) {
dev_info(&dev->dev,
"Disabling msi for MCP55 NIC on P5N32-SLI\n");
dev->no_msi = 1;
_
Patches currently in -mm which might be from khali@xxxxxxxxxxxx are
linux-next.patch
pci-dont-use-dmi_name_in_vendors-in-quirk.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
