aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pci/access.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/pci/access.c')
-rw-r--r--drivers/pci/access.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/pci/access.c b/drivers/pci/access.c
index 913d6722ece9..5e9a9822d9d4 100644
--- a/drivers/pci/access.c
+++ b/drivers/pci/access.c
@@ -1,3 +1,4 @@
1// SPDX-License-Identifier: GPL-2.0
1#include <linux/delay.h> 2#include <linux/delay.h>
2#include <linux/pci.h> 3#include <linux/pci.h>
3#include <linux/module.h> 4#include <linux/module.h>
@@ -333,8 +334,7 @@ static size_t pci_vpd_size(struct pci_dev *dev, size_t old_size)
333 (tag == PCI_VPD_LTIN_RW_DATA)) { 334 (tag == PCI_VPD_LTIN_RW_DATA)) {
334 if (pci_read_vpd(dev, off+1, 2, 335 if (pci_read_vpd(dev, off+1, 2,
335 &header[1]) != 2) { 336 &header[1]) != 2) {
336 dev_warn(&dev->dev, 337 pci_warn(dev, "invalid large VPD tag %02x size at offset %zu",
337 "invalid large VPD tag %02x size at offset %zu",
338 tag, off + 1); 338 tag, off + 1);
339 return 0; 339 return 0;
340 } 340 }
@@ -354,8 +354,7 @@ static size_t pci_vpd_size(struct pci_dev *dev, size_t old_size)
354 if ((tag != PCI_VPD_LTIN_ID_STRING) && 354 if ((tag != PCI_VPD_LTIN_ID_STRING) &&
355 (tag != PCI_VPD_LTIN_RO_DATA) && 355 (tag != PCI_VPD_LTIN_RO_DATA) &&
356 (tag != PCI_VPD_LTIN_RW_DATA)) { 356 (tag != PCI_VPD_LTIN_RW_DATA)) {
357 dev_warn(&dev->dev, 357 pci_warn(dev, "invalid %s VPD tag %02x at offset %zu",
358 "invalid %s VPD tag %02x at offset %zu",
359 (header[0] & PCI_VPD_LRDT) ? "large" : "short", 358 (header[0] & PCI_VPD_LRDT) ? "large" : "short",
360 tag, off); 359 tag, off);
361 return 0; 360 return 0;
@@ -402,7 +401,7 @@ static int pci_vpd_wait(struct pci_dev *dev)
402 max_sleep *= 2; 401 max_sleep *= 2;
403 } 402 }
404 403
405 dev_warn(&dev->dev, "VPD access failed. This is likely a firmware bug on this device. Contact the card vendor for a firmware update\n"); 404 pci_warn(dev, "VPD access failed. This is likely a firmware bug on this device. Contact the card vendor for a firmware update\n");
406 return -ETIMEDOUT; 405 return -ETIMEDOUT;
407} 406}
408 407