diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-12 16:40:57 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-12 16:40:57 -0400 |
commit | 21ba0f88ae56da82a3a15fe54d729208b64c4f4b (patch) | |
tree | 17ce67f276fe3ea7284c3dc730bdd6a2ec7dfe2f /drivers/infiniband | |
parent | dc690d8ef842b464f1c429a376ca16cb8dbee6ae (diff) | |
parent | 36e235901f90fb83215be43cbd8f1ca14661ea40 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6: (34 commits)
PCI: Only build PCI syscalls on architectures that want them
PCI: limit pci_get_bus_and_slot to domain 0
PCI: hotplug: acpiphp: avoid acpiphp "cannot get bridge info" PCI hotplug failure
PCI: hotplug: acpiphp: remove hot plug parameter write to PCI host bridge
PCI: hotplug: acpiphp: fix slot poweroff problem on systems without _PS3
PCI: hotplug: pciehp: wait for 1 second after power off slot
PCI: pci_set_power_state(): check for PM capabilities earlier
PCI: cpci_hotplug: Convert to use the kthread API
PCI: add pci_try_set_mwi
PCI: pcie: remove SPIN_LOCK_UNLOCKED
PCI: ROUND_UP macro cleanup in drivers/pci
PCI: remove pci_dac_dma_... APIs
PCI: pci-x-pci-express-read-control-interfaces cleanups
PCI: Fix typo in include/linux/pci.h
PCI: pci_ids, remove double or more empty lines
PCI: pci_ids, add atheros and 3com_2 vendors
PCI: pci_ids, reorder some entries
PCI: i386: traps, change VENDOR to DEVICE
PCI: ATM: lanai, change VENDOR to DEVICE
PCI: Change all drivers to use pci_device->revision
...
Diffstat (limited to 'drivers/infiniband')
-rw-r--r-- | drivers/infiniband/hw/ipath/ipath_driver.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/infiniband/hw/ipath/ipath_driver.c b/drivers/infiniband/hw/ipath/ipath_driver.c index e3a223209710..834e86f6c04e 100644 --- a/drivers/infiniband/hw/ipath/ipath_driver.c +++ b/drivers/infiniband/hw/ipath/ipath_driver.c | |||
@@ -270,7 +270,6 @@ static int __devinit ipath_init_one(struct pci_dev *pdev, | |||
270 | struct ipath_devdata *dd; | 270 | struct ipath_devdata *dd; |
271 | unsigned long long addr; | 271 | unsigned long long addr; |
272 | u32 bar0 = 0, bar1 = 0; | 272 | u32 bar0 = 0, bar1 = 0; |
273 | u8 rev; | ||
274 | 273 | ||
275 | dd = ipath_alloc_devdata(pdev); | 274 | dd = ipath_alloc_devdata(pdev); |
276 | if (IS_ERR(dd)) { | 275 | if (IS_ERR(dd)) { |
@@ -432,13 +431,7 @@ static int __devinit ipath_init_one(struct pci_dev *pdev, | |||
432 | dd->ipath_deviceid = ent->device; /* save for later use */ | 431 | dd->ipath_deviceid = ent->device; /* save for later use */ |
433 | dd->ipath_vendorid = ent->vendor; | 432 | dd->ipath_vendorid = ent->vendor; |
434 | 433 | ||
435 | ret = pci_read_config_byte(pdev, PCI_REVISION_ID, &rev); | 434 | dd->ipath_pcirev = pdev->revision; |
436 | if (ret) { | ||
437 | ipath_dev_err(dd, "Failed to read PCI revision ID unit " | ||
438 | "%u: err %d\n", dd->ipath_unit, -ret); | ||
439 | goto bail_regions; /* shouldn't ever happen */ | ||
440 | } | ||
441 | dd->ipath_pcirev = rev; | ||
442 | 435 | ||
443 | #if defined(__powerpc__) | 436 | #if defined(__powerpc__) |
444 | /* There isn't a generic way to specify writethrough mappings */ | 437 | /* There isn't a generic way to specify writethrough mappings */ |