summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJike Song <albcamus@gmail.com>2008-09-09 23:42:03 +0800
committerJesse Barnes <jbarnes@virtuousgeek.org>2008-10-20 10:53:50 -0700
commit5993760f7fc75b77e4701f1e56dc84c0d6cf18d5 (patch)
tree5eda8e0622ae17c84bb1c44763d8e3e07a204773 /drivers
parent7f2feec140f1f1e4f701e013a2bf8284a9ec2a3c (diff)
downloadop-kernel-dev-5993760f7fc75b77e4701f1e56dc84c0d6cf18d5.zip
op-kernel-dev-5993760f7fc75b77e4701f1e56dc84c0d6cf18d5.tar.gz
PCI: utilize calculated results when detecting MSI features
In msi_capability_init, we can make use of the calculated results instead of calling is_mask_bit_support and is_64bit_address twice. Signed-off-by: Jike Song <albcamus@gmail.com> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/pci/msi.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
index 4a10b56..d281201 100644
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
@@ -378,23 +378,21 @@ static int msi_capability_init(struct pci_dev *dev)
entry->msi_attrib.masked = 1;
entry->msi_attrib.default_irq = dev->irq; /* Save IOAPIC IRQ */
entry->msi_attrib.pos = pos;
- if (is_mask_bit_support(control)) {
+ if (entry->msi_attrib.maskbit) {
entry->mask_base = (void __iomem *)(long)msi_mask_bits_reg(pos,
- is_64bit_address(control));
+ entry->msi_attrib.is_64);
}
entry->dev = dev;
if (entry->msi_attrib.maskbit) {
unsigned int maskbits, temp;
/* All MSIs are unmasked by default, Mask them all */
pci_read_config_dword(dev,
- msi_mask_bits_reg(pos, is_64bit_address(control)),
+ msi_mask_bits_reg(pos, entry->msi_attrib.is_64),
&maskbits);
temp = (1 << multi_msi_capable(control));
temp = ((temp - 1) & ~temp);
maskbits |= temp;
- pci_write_config_dword(dev,
- msi_mask_bits_reg(pos, is_64bit_address(control)),
- maskbits);
+ pci_write_config_dword(dev, entry->msi_attrib.is_64, maskbits);
entry->msi_attrib.maskbits_mask = temp;
}
list_add_tail(&entry->list, &dev->msi_list);
OpenPOWER on IntegriCloud