From 6d22eb92c7e7fc56dba2aec725d788323b984a74 Mon Sep 17 00:00:00 2001 From: Bjorn Helgaas Date: Wed, 17 Apr 2013 17:42:30 -0600 Subject: [PATCH] --- yaml --- r: 362909 b: refs/heads/master c: 4987ce82056327a43cd58c32adf8a3f255e7d862 h: refs/heads/master i: 362907: b4e83b7508a38c30e7d0351ac6668e46f3c60cfb v: v3 --- [refs] | 2 +- trunk/drivers/pci/msi.c | 4 ++-- trunk/drivers/pci/msi.h | 2 -- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index ab903021ade6..baff1921e4cd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2f221349366daf074bad07cc670e483cc52ab203 +refs/heads/master: 4987ce82056327a43cd58c32adf8a3f255e7d862 diff --git a/trunk/drivers/pci/msi.c b/trunk/drivers/pci/msi.c index 1688c26db962..aaaf954ad3a4 100644 --- a/trunk/drivers/pci/msi.c +++ b/trunk/drivers/pci/msi.c @@ -555,9 +555,9 @@ static int msi_capability_init(struct pci_dev *dev, int nvec) return -ENOMEM; entry->msi_attrib.is_msix = 0; - entry->msi_attrib.is_64 = is_64bit_address(control); + entry->msi_attrib.is_64 = !!(control & PCI_MSI_FLAGS_64BIT); entry->msi_attrib.entry_nr = 0; - entry->msi_attrib.maskbit = is_mask_bit_support(control); + entry->msi_attrib.maskbit = !!(control & PCI_MSI_FLAGS_MASKBIT); entry->msi_attrib.default_irq = dev->irq; /* Save IOAPIC IRQ */ entry->msi_attrib.pos = dev->msi_cap; diff --git a/trunk/drivers/pci/msi.h b/trunk/drivers/pci/msi.h index d2c6cd982a21..bc5cd9969062 100644 --- a/trunk/drivers/pci/msi.h +++ b/trunk/drivers/pci/msi.h @@ -8,8 +8,6 @@ #define msi_mask_reg(base, is64bit) \ (base + ((is64bit == 1) ? PCI_MSI_MASK_64 : PCI_MSI_MASK_32)) -#define is_64bit_address(control) (!!(control & PCI_MSI_FLAGS_64BIT)) -#define is_mask_bit_support(control) (!!(control & PCI_MSI_FLAGS_MASKBIT)) #define msix_table_offset_reg(base) (base + PCI_MSIX_TABLE) #define msix_pba_offset_reg(base) (base + PCI_MSIX_PBA)