vpd->len is initialized to PCI_VPD_MAX_SIZE, and if a quirk is used to
set a specific VPD size, then pci_vpd_set_size() sets vpd->valid,
resulting in pci_vpd_size() not being called. Therefore we can remove
the old_size argument. Note that we don't have to check
off < PCI_VPD_MAX_SIZE because that's implicitly done by pci_read_vpd().
Signed-off-by: Heiner Kallweit <hkallweit1@xxxxxxxxx>
---
drivers/pci/vpd.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/pci/vpd.c b/drivers/pci/vpd.c
index ff537371c..e73a3a55f 100644
--- a/drivers/pci/vpd.c
+++ b/drivers/pci/vpd.c
@@ -75,14 +75,13 @@ EXPORT_SYMBOL(pci_write_vpd);
/**
* pci_vpd_size - determine actual size of Vital Product Data
* @dev: pci device struct
- * @old_size: current assumed size, also maximum allowed size
*/
-static size_t pci_vpd_size(struct pci_dev *dev, size_t old_size)
+static size_t pci_vpd_size(struct pci_dev *dev)
{
size_t off = 0;
u8 header[3]; /* 1 byte tag, 2 bytes length */
- while (off < old_size && pci_read_vpd(dev, off, 1, header) == 1) {
+ while (pci_read_vpd(dev, off, 1, header) == 1) {
if (!header[0] && !off) {
pci_info(dev, "Invalid VPD tag 00, assume missing optional VPD EPROM\n");
return 0;
@@ -164,7 +163,7 @@ static ssize_t pci_vpd_read(struct pci_dev *dev, loff_t pos, size_t count,
if (!vpd->valid) {
vpd->valid = 1;
- vpd->len = pci_vpd_size(dev, vpd->len);
+ vpd->len = pci_vpd_size(dev);
}
if (vpd->len == 0)
@@ -231,7 +230,7 @@ static ssize_t pci_vpd_write(struct pci_dev *dev, loff_t pos, size_t count,
if (!vpd->valid) {
vpd->valid = 1;
- vpd->len = pci_vpd_size(dev, vpd->len);
+ vpd->len = pci_vpd_size(dev);
}
if (vpd->len == 0)
@@ -455,6 +454,7 @@ static void quirk_blacklist_vpd(struct pci_dev *dev)
{
if (dev->vpd) {
dev->vpd->len = 0;
+ dev->vpd->valid = 1;
pci_warn(dev, FW_BUG "disabling VPD access (can't determine size of non-standard VPD format)\n");
}
}
--
2.31.1
