Commit da417885 authored by Heiner Kallweit's avatar Heiner Kallweit Committed by David S. Miller
Browse files

bnx2x: Search VPD with pci_vpd_find_ro_info_keyword() 



Use pci_vpd_find_ro_info_keyword() to search for keywords in VPD to
simplify the code.

str_id_reg and str_id_cap hold the same string and are used in the same
comparison. This doesn't make sense, use one string str_id instead.

Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent bed3db3d

drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c

+15 −42
Original line number Diff line number Diff line
@@ -12189,11 +12189,10 @@ static int bnx2x_get_hwinfo(struct bnx2x *bp) 


static void bnx2x_read_fwinfo(struct bnx2x *bp)

{

	int i, block_end, rodi;

	char str_id_reg[VENDOR_ID_LEN+1];

	char str_id_cap[VENDOR_ID_LEN+1];

	unsigned int vpd_len;

	u8 *vpd_data, len;

	char str_id[VENDOR_ID_LEN + 1];

	unsigned int vpd_len, kw_len;

	u8 *vpd_data;

	int rodi;



	memset(bp->fw_ver, 0, sizeof(bp->fw_ver));
@@ -12201,46 +12200,20 @@ static void bnx2x_read_fwinfo(struct bnx2x *bp) 
	if (IS_ERR(vpd_data))

		return;



	/* VPD RO tag should be first tag after identifier string, hence

	 * we should be able to find it in first BNX2X_VPD_LEN chars

	 */

	i = pci_vpd_find_tag(vpd_data, vpd_len, PCI_VPD_LRDT_RO_DATA);

	if (i < 0)

		goto out_not_found;



	block_end = i + PCI_VPD_LRDT_TAG_SIZE +

		    pci_vpd_lrdt_size(&vpd_data[i]);

	i += PCI_VPD_LRDT_TAG_SIZE;



	rodi = pci_vpd_find_info_keyword(vpd_data, i, block_end,

				   PCI_VPD_RO_KEYWORD_MFR_ID);

	if (rodi < 0)

		goto out_not_found;



	len = pci_vpd_info_field_size(&vpd_data[rodi]);



	if (len != VENDOR_ID_LEN)

	rodi = pci_vpd_find_ro_info_keyword(vpd_data, vpd_len,

					    PCI_VPD_RO_KEYWORD_MFR_ID, &kw_len);

	if (rodi < 0 || kw_len != VENDOR_ID_LEN)

		goto out_not_found;



	rodi += PCI_VPD_INFO_FLD_HDR_SIZE;



	/* vendor specific info */

	snprintf(str_id_reg, VENDOR_ID_LEN + 1, "%04x", PCI_VENDOR_ID_DELL);

	snprintf(str_id_cap, VENDOR_ID_LEN + 1, "%04X", PCI_VENDOR_ID_DELL);

	if (!strncmp(str_id_reg, &vpd_data[rodi], VENDOR_ID_LEN) ||

	    !strncmp(str_id_cap, &vpd_data[rodi], VENDOR_ID_LEN)) {



		rodi = pci_vpd_find_info_keyword(vpd_data, i, block_end,

						PCI_VPD_RO_KEYWORD_VENDOR0);

		if (rodi >= 0) {

			len = pci_vpd_info_field_size(&vpd_data[rodi]);



			rodi += PCI_VPD_INFO_FLD_HDR_SIZE;



			if (len < 32 && (len + rodi) <= vpd_len) {

				memcpy(bp->fw_ver, &vpd_data[rodi], len);

				bp->fw_ver[len] = ' ';

			}

	snprintf(str_id, VENDOR_ID_LEN + 1, "%04X", PCI_VENDOR_ID_DELL);

	if (!strncmp(str_id, &vpd_data[rodi], VENDOR_ID_LEN)) {

		rodi = pci_vpd_find_ro_info_keyword(vpd_data, vpd_len,

						    PCI_VPD_RO_KEYWORD_VENDOR0,

						    &kw_len);

		if (rodi >= 0 && kw_len < sizeof(bp->fw_ver)) {

			memcpy(bp->fw_ver, &vpd_data[rodi], kw_len);

			bp->fw_ver[kw_len] = ' ';

		}

	}

out_not_found: