leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PCI/VPD: Remove pci_vpd_find_tag() 'offset' argument

Browse Source 
All callers pass 0 as offset. Therefore remove the parameter and use a
fixed offset 0 in pci_vpd_find_tag().

Link: https://lore.kernel.org/r/f62e6e19-5423-2ead-b2bd-62844b23ef8f@gmail.com
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
This commit is contained in:
Heiner Kallweit 2021-04-01 18:43:15 +02:00 committed by Bjorn Helgaas
parent e947e7b116
commit 4cf0abbce6
10 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/ethernet/broadcom/bnx2.c
View File

@ -8057,7 +8057,7 @@ bnx2_read_vpd_fw_ver(struct bnx2 *bp)
data[i + 3] = data[i + BNX2_VPD_LEN]; data[i + 3] = data[i + BNX2_VPD_LEN];
} }
i = pci_vpd_find_tag(data, 0, BNX2_VPD_LEN, PCI_VPD_LRDT_RO_DATA); i = pci_vpd_find_tag(data, BNX2_VPD_LEN, PCI_VPD_LRDT_RO_DATA);
if (i < 0) if (i < 0)
goto vpd_done; goto vpd_done;

3
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
View File

@ -12207,8 +12207,7 @@ static void bnx2x_read_fwinfo(struct bnx2x *bp)
/* VPD RO tag should be first tag after identifier string, hence /* VPD RO tag should be first tag after identifier string, hence
* we should be able to find it in first BNX2X_VPD_LEN chars * we should be able to find it in first BNX2X_VPD_LEN chars
*/ */
i = pci_vpd_find_tag(vpd_start, 0, BNX2X_VPD_LEN, i = pci_vpd_find_tag(vpd_start, BNX2X_VPD_LEN, PCI_VPD_LRDT_RO_DATA);
PCI_VPD_LRDT_RO_DATA);
if (i < 0) if (i < 0)
goto out_not_found; goto out_not_found;

2
drivers/net/ethernet/broadcom/bnxt/bnxt.c
View File

@ -12668,7 +12668,7 @@ static void bnxt_vpd_read_info(struct bnxt *bp)
goto exit; goto exit;
} }
i = pci_vpd_find_tag(vpd_data, 0, vpd_size, PCI_VPD_LRDT_RO_DATA); i = pci_vpd_find_tag(vpd_data, vpd_size, PCI_VPD_LRDT_RO_DATA);
if (i < 0) { if (i < 0) {
netdev_err(bp->dev, "VPD READ-Only not found\n"); netdev_err(bp->dev, "VPD READ-Only not found\n");
goto exit; goto exit;

4
drivers/net/ethernet/broadcom/tg3.c
View File

@ -13016,7 +13016,7 @@ static int tg3_test_nvram(struct tg3 *tp)
if (!buf) if (!buf)
return -ENOMEM; return -ENOMEM;
i = pci_vpd_find_tag((u8 *)buf, 0, len, PCI_VPD_LRDT_RO_DATA); i = pci_vpd_find_tag((u8 *)buf, len, PCI_VPD_LRDT_RO_DATA);
if (i > 0) { if (i > 0) {
j = pci_vpd_lrdt_size(&((u8 *)buf)[i]); j = pci_vpd_lrdt_size(&((u8 *)buf)[i]);
if (j < 0) if (j < 0)
@ -15629,7 +15629,7 @@ static void tg3_read_vpd(struct tg3 *tp)
if (!vpd_data) if (!vpd_data)
goto out_no_vpd; goto out_no_vpd;
i = pci_vpd_find_tag(vpd_data, 0, vpdlen, PCI_VPD_LRDT_RO_DATA); i = pci_vpd_find_tag(vpd_data, vpdlen, PCI_VPD_LRDT_RO_DATA);
if (i < 0) if (i < 0)
goto out_not_found; goto out_not_found;

2
drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
View File

@ -2774,7 +2774,7 @@ int t4_get_raw_vpd_params(struct adapter *adapter, struct vpd_params *p)
if (id_len > ID_LEN) if (id_len > ID_LEN)
id_len = ID_LEN; id_len = ID_LEN;
i = pci_vpd_find_tag(vpd, 0, VPD_LEN, PCI_VPD_LRDT_RO_DATA); i = pci_vpd_find_tag(vpd, VPD_LEN, PCI_VPD_LRDT_RO_DATA);
if (i < 0) { if (i < 0) {
dev_err(adapter->pdev_dev, "missing VPD-R section\n"); dev_err(adapter->pdev_dev, "missing VPD-R section\n");
ret = -EINVAL; ret = -EINVAL;

2
drivers/net/ethernet/sfc/efx.c
View File

@ -920,7 +920,7 @@ static void efx_probe_vpd_strings(struct efx_nic *efx)
} }
/* Get the Read only section */ /* Get the Read only section */
ro_start = pci_vpd_find_tag(vpd_data, 0, vpd_size, PCI_VPD_LRDT_RO_DATA); ro_start = pci_vpd_find_tag(vpd_data, vpd_size, PCI_VPD_LRDT_RO_DATA);
if (ro_start < 0) { if (ro_start < 0) {
netif_err(efx, drv, efx->net_dev, "VPD Read-only not found\n"); netif_err(efx, drv, efx->net_dev, "VPD Read-only not found\n");
return; return;

2
drivers/net/ethernet/sfc/falcon/efx.c
View File

@ -2800,7 +2800,7 @@ static void ef4_probe_vpd_strings(struct ef4_nic *efx)
} }
/* Get the Read only section */ /* Get the Read only section */
ro_start = pci_vpd_find_tag(vpd_data, 0, vpd_size, PCI_VPD_LRDT_RO_DATA); ro_start = pci_vpd_find_tag(vpd_data, vpd_size, PCI_VPD_LRDT_RO_DATA);
if (ro_start < 0) { if (ro_start < 0) {
netif_err(efx, drv, efx->net_dev, "VPD Read-only not found\n"); netif_err(efx, drv, efx->net_dev, "VPD Read-only not found\n");
return; return;

4
drivers/pci/vpd.c
View File

@ -410,11 +410,11 @@ void pcie_vpd_remove_sysfs_dev_files(struct pci_dev *dev)
} }
} }
int pci_vpd_find_tag(const u8 *buf, unsigned int off, unsigned int len, u8 rdt) int pci_vpd_find_tag(const u8 *buf, unsigned int len, u8 rdt)
{ {
int i; int i;
for (i = off; i < len; ) { for (i = 0; i < len; ) {
u8 val = buf[i]; u8 val = buf[i];
if (val & PCI_VPD_LRDT) { if (val & PCI_VPD_LRDT) {

3
drivers/scsi/cxlflash/main.c
View File

@ -1649,8 +1649,7 @@ static int read_vpd(struct cxlflash_cfg *cfg, u64 wwpn[])
} }
/* Get the read only section offset */ /* Get the read only section offset */
ro_start = pci_vpd_find_tag(vpd_data, 0, vpd_size, ro_start = pci_vpd_find_tag(vpd_data, vpd_size, PCI_VPD_LRDT_RO_DATA);
PCI_VPD_LRDT_RO_DATA);
if (unlikely(ro_start < 0)) { if (unlikely(ro_start < 0)) {
dev_err(dev, "%s: VPD Read-only data not found\n", __func__); dev_err(dev, "%s: VPD Read-only data not found\n", __func__);
rc = -ENODEV; rc = -ENODEV;

3
include/linux/pci.h
View File

@ -2310,14 +2310,13 @@ static inline u8 pci_vpd_info_field_size(const u8 *info_field)
/** /**
* pci_vpd_find_tag - Locates the Resource Data Type tag provided * pci_vpd_find_tag - Locates the Resource Data Type tag provided
* @buf: Pointer to buffered vpd data * @buf: Pointer to buffered vpd data
* @off: The offset into the buffer at which to begin the search
* @len: The length of the vpd buffer * @len: The length of the vpd buffer
* @rdt: The Resource Data Type to search for * @rdt: The Resource Data Type to search for
* *
* Returns the index where the Resource Data Type was found or * Returns the index where the Resource Data Type was found or
* -ENOENT otherwise. * -ENOENT otherwise.
*/ */
int pci_vpd_find_tag(const u8 *buf, unsigned int off, unsigned int len, u8 rdt); int pci_vpd_find_tag(const u8 *buf, unsigned int len, u8 rdt);
/** /**
* pci_vpd_find_info_keyword - Locates an information field keyword in the VPD * pci_vpd_find_info_keyword - Locates an information field keyword in the VPD