pci: Add VPD information field helper functions

This patch adds a preprocessor constant to describe the PCI VPD
information field header size and an inline function to extract the
size of the information field itself.

Signed-off-by: Matt Carlson <mcarlson@broadcom.com>
Signed-off-by: Michael Chan <mchan@broadcom.com>
Acked-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Matt Carlson
2010-02-26 14:04:42 +00:00
committed by David S. Miller
parent b55ac1b226
commit e1d5bdabb9
3 changed files with 23 additions and 8 deletions

View File

@@ -12604,9 +12604,9 @@ static void __devinit tg3_read_partno(struct tg3 *tp)
while (i < (block_end - 2)) {
if (vpd_data[i + 0] == 'P' &&
vpd_data[i + 1] == 'N') {
int partno_len = vpd_data[i + 2];
int partno_len = pci_vpd_info_field_size(&vpd_data[i]);
i += 3;
i += PCI_VPD_INFO_FLD_HDR_SIZE;
if (partno_len > TG3_BPN_SIZE ||
(partno_len + i) > TG3_NVM_VPD_LEN)
goto out_not_found;
@@ -12617,7 +12617,8 @@ static void __devinit tg3_read_partno(struct tg3 *tp)
/* Success. */
return;
}
i += 3 + vpd_data[i + 2];
i += PCI_VPD_INFO_FLD_HDR_SIZE +
pci_vpd_info_field_size(&vpd_data[i]);
}
/* Part number not found. */