CVS commit: src/sys/arch/x86/pci

[SAITOH Masanobu]

Module Name:    src
Committed By:   msaitoh
Date:           Mon Jun 22 03:57:01 UTC 2015

Modified Files:
        src/sys/arch/x86/pci: pci_msi_machdep.c

Log Message:
Don't check PCI_FLAGS_"MSI"_OKAY in pci_"msix"_alloc_common().
OK'd by knakahara.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/x86/pci/pci_msi_machdep.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/arch/x86/pci/pci_msi_machdep.c
diff -u src/sys/arch/x86/pci/pci_msi_machdep.c:1.5 src/sys/arch/x86/pci/pci_msi_machdep.c:1.6
--- src/sys/arch/x86/pci/pci_msi_machdep.c:1.5	Fri May 15 08:36:41 2015
+++ src/sys/arch/x86/pci/pci_msi_machdep.c	Mon Jun 22 03:57:01 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: pci_msi_machdep.c,v 1.5 2015/05/15 08:36:41 knakahara Exp $	*/
+/*	$NetBSD: pci_msi_machdep.c,v 1.6 2015/06/22 03:57:01 msaitoh Exp $	*/
 
 /*
  * Copyright (c) 2015 Internet Initiative Japan Inc.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_msi_machdep.c,v 1.5 2015/05/15 08:36:41 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_msi_machdep.c,v 1.6 2015/06/22 03:57:01 msaitoh Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -236,8 +236,7 @@ pci_msix_alloc_common(pci_intr_handle_t 
 	pci_intr_handle_t *vectors;
 	int error, i;
 
-	if (((pa->pa_flags & PCI_FLAGS_MSI_OKAY) == 0)
-	    || ((pa->pa_flags & PCI_FLAGS_MSIX_OKAY) == 0)) {
+	if ((pa->pa_flags & PCI_FLAGS_MSIX_OKAY) == 0) {
 		DPRINTF(("PCI host bridge does not support MSI-X.\n"));
 		return ENODEV;
 	}