pci: Add helper to find a VPD resource data type

[net-next-2.6.git] / drivers / net / bnx2.c

diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index 084ef102b8c42e7626c0d2806fabe1647a7907bd..fd43feb5a350d0d8f6fb1ae9c6481174dcdb2e34 100644 (file)
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -7769,28 +7769,12 @@ bnx2_read_vpd_fw_ver(struct bnx2 *bp)
        }
 
        for (i = 0; i <= BNX2_VPD_LEN - 3; ) {
-               unsigned char val = data[i];
                unsigned int block_end;
 
-               if (val & PCI_VPD_LRDT) {
-                       if (i + PCI_VPD_LRDT_TAG_SIZE > BNX2_VPD_LEN)
-                               break;
-
-                       if (val != PCI_VPD_LRDT_RO_DATA) {
-                               i += PCI_VPD_LRDT_TAG_SIZE +
-                                    pci_vpd_lrdt_size(&data[i]);
-
-                               continue;
-                       }
-               } else {
-                       if ((val & PCI_VPD_SRDT_TIN_MASK) == PCI_VPD_STIN_END)
-                               break;
-
-                       i += PCI_VPD_SRDT_TAG_SIZE +
-                            pci_vpd_srdt_size(&data[i]);
-
-                       continue;
-               }
+               i = pci_vpd_find_tag(data, i, BNX2_VPD_LEN,
+                                    PCI_VPD_LRDT_RO_DATA);
+               if (i < 0)
+                       break;
 
                block_end = (i + PCI_VPD_LRDT_TAG_SIZE +
                            pci_vpd_lrdt_size(&data[i]));