Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit df25bc38 authored by Matt Carlson's avatar Matt Carlson Committed by David S. Miller
Browse files

bnx2: Remove now useless VPD code 



Now that the VPD searching code is abstracted away, the outer loop used
to detect the read-only large resource data type section is useless.

Signed-off-by: default avatarMatt Carlson <mcarlson@broadcom.com>
Acked-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4067a854

drivers/net/bnx2.c

+29 −45
Original line number Diff line number Diff line
@@ -7743,10 +7743,9 @@ bnx2_get_pci_speed(struct bnx2 *bp) 
static void __devinit

bnx2_read_vpd_fw_ver(struct bnx2 *bp)

{

	int rc, i, v0_len = 0;

	int rc, i, j;

	u8 *data;

	u8 *v0_str = NULL;

	bool mn_match = false;

	unsigned int block_end, rosize, len;



#define BNX2_VPD_NVRAM_OFFSET	0x300

#define BNX2_VPD_LEN		128
@@ -7768,57 +7767,42 @@ bnx2_read_vpd_fw_ver(struct bnx2 *bp) 
		data[i + 3] = data[i + BNX2_VPD_LEN];

	}



	for (i = 0; i <= BNX2_VPD_LEN - 3; ) {

		int j;

		unsigned int block_end, rosize;



		i = pci_vpd_find_tag(data, i, BNX2_VPD_LEN,

				     PCI_VPD_LRDT_RO_DATA);

	i = pci_vpd_find_tag(data, 0, BNX2_VPD_LEN, PCI_VPD_LRDT_RO_DATA);

	if (i < 0)

			break;

		goto vpd_done;



	rosize = pci_vpd_lrdt_size(&data[i]);

		block_end = i + PCI_VPD_LRDT_TAG_SIZE + rosize;

	i += PCI_VPD_LRDT_TAG_SIZE;

	block_end = i + rosize;



	if (block_end > BNX2_VPD_LEN)

		goto vpd_done;



	j = pci_vpd_find_info_keyword(data, i, rosize,

				      PCI_VPD_RO_KEYWORD_MFR_ID);

		if (j > 0) {

			int len = pci_vpd_info_field_size(&data[j]);



			if (j + PCI_VPD_INFO_FLD_HDR_SIZE + len > block_end ||

			    len != 4 ||

			    memcmp(&data[j + PCI_VPD_INFO_FLD_HDR_SIZE],

				   "1028", 4))

	if (j < 0)

		goto vpd_done;



			mn_match = true;

		}

	len = pci_vpd_info_field_size(&data[j]);



	j += PCI_VPD_INFO_FLD_HDR_SIZE;

	if (j + len > block_end || len != 4 ||

	    memcmp(&data[j], "1028", 4))

		goto vpd_done;



	j = pci_vpd_find_info_keyword(data, i, rosize,

				      PCI_VPD_RO_KEYWORD_VENDOR0);

		if (j > 0) {

			int len = pci_vpd_info_field_size(&data[j]);



			j += PCI_VPD_INFO_FLD_HDR_SIZE;

			if (j + len > block_end || len > BNX2_MAX_VER_SLEN)

	if (j < 0)

		goto vpd_done;



			v0_len = len;

			v0_str = &data[j];

		}

	len = pci_vpd_info_field_size(&data[j]);



		if (mn_match && v0_str) {

			memcpy(bp->fw_version, v0_str, v0_len);

			bp->fw_version[v0_len] = ' ';

	j += PCI_VPD_INFO_FLD_HDR_SIZE;

	if (j + len > block_end || len > BNX2_MAX_VER_SLEN)

		goto vpd_done;

		}



		goto vpd_done;

	}

	memcpy(bp->fw_version, &data[j], len);

	bp->fw_version[len] = ' ';



vpd_done:

	kfree(data);