| Message ID | 201105072139.37992.sshtylyov@ru.mvista.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
> Commit 44c10138fd4bbc4b6d6bff0873c24902f2a9da65 (PCI: Change all drivers to use > pci_device->revision) already converted this driver to using the 'revision' > field of 'struct pci_dev' but commit bb9171448deb1f7ece27674e2e431e4f267fd453 > (IB/ipath: Misc changes to prepare for IB7220 introduction) later reverted that > change for some strange reason. Now restore the change... Thanks for the patch. ipath: use pci_dev->revision, again Acked-by: Mike Marciniszyn <mike.marciniszyn@qlogic.com> This message and any attached documents contain information from QLogic Corporation or its wholly-owned subsidiaries that may be confidential. If you are not the intended recipient, you may not read, copy, distribute, or use this information. If you have received this transmission in error, please notify the sender immediately by reply e-mail and then delete this message. -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Index: linux-2.6/drivers/infiniband/hw/ipath/ipath_driver.c =================================================================== --- linux-2.6.orig/drivers/infiniband/hw/ipath/ipath_driver.c +++ linux-2.6/drivers/infiniband/hw/ipath/ipath_driver.c @@ -398,7 +398,6 @@ static int __devinit ipath_init_one(stru struct ipath_devdata *dd; unsigned long long addr; u32 bar0 = 0, bar1 = 0; - u8 rev; dd = ipath_alloc_devdata(pdev); if (IS_ERR(dd)) { @@ -540,13 +539,7 @@ static int __devinit ipath_init_one(stru goto bail_regions; } - ret = pci_read_config_byte(pdev, PCI_REVISION_ID, &rev); - if (ret) { - ipath_dev_err(dd, "Failed to read PCI revision ID unit " - "%u: err %d\n", dd->ipath_unit, -ret); - goto bail_regions; /* shouldn't ever happen */ - } - dd->ipath_pcirev = rev; + dd->ipath_pcirev = pdev->revision; #if defined(__powerpc__) /* There isn't a generic way to specify writethrough mappings */
Commit 44c10138fd4bbc4b6d6bff0873c24902f2a9da65 (PCI: Change all drivers to use pci_device->revision) already converted this driver to using the 'revision' field of 'struct pci_dev' but commit bb9171448deb1f7ece27674e2e431e4f267fd453 (IB/ipath: Misc changes to prepare for IB7220 introduction) later reverted that change for some strange reason. Now restore the change... Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com> --- The patch is against the recent Linus' tree. drivers/infiniband/hw/ipath/ipath_driver.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html