[1/3] PCI/VPD: Change pci_vpd_init return type to void

Commit Message

Heiner Kallweit April 1, 2021, 4:37 p.m. UTC

pci_init_capabilities() is the only caller and doesn't use the return
value. So let's change the return type to void.

Signed-off-by: Heiner Kallweit <[e-mail]>
---
 drivers/pci/pci.h | 2 +-
 drivers/pci/vpd.c | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

Patch

diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
index bbbc55965..ff0f4aeef 100644
--- a/drivers/pci/pci.h
+++ b/drivers/pci/pci.h
@@ -141,7 +141,7 @@  static inline bool pcie_downstream_port(const struct pci_dev *dev)
 	       type == PCI_EXP_TYPE_PCIE_BRIDGE;
 }
 
-int pci_vpd_init(struct pci_dev *dev);
+void pci_vpd_init(struct pci_dev *dev);
 void pci_vpd_release(struct pci_dev *dev);
 
 /* PCI Virtual Channel */
diff --git a/drivers/pci/vpd.c b/drivers/pci/vpd.c
index 48f4a9ae8..85889718a 100644
--- a/drivers/pci/vpd.c
+++ b/drivers/pci/vpd.c
@@ -337,18 +337,18 @@  static const struct pci_vpd_ops pci_vpd_f0_ops = {
 	.write = pci_vpd_f0_write,
 };
 
-int pci_vpd_init(struct pci_dev *dev)
+void pci_vpd_init(struct pci_dev *dev)
 {
 	struct pci_vpd *vpd;
 	u8 cap;
 
 	cap = pci_find_capability(dev, PCI_CAP_ID_VPD);
 	if (!cap)
-		return -ENODEV;
+		return;
 
 	vpd = kzalloc(sizeof(*vpd), GFP_ATOMIC);
 	if (!vpd)
-		return -ENOMEM;
+		return;
 
 	vpd->len = PCI_VPD_MAX_SIZE;
 	if (dev->dev_flags & PCI_DEV_FLAGS_VPD_REF_F0)
@@ -360,7 +360,6 @@  int pci_vpd_init(struct pci_dev *dev)
 	vpd->busy = 0;
 	vpd->valid = 0;
 	dev->vpd = vpd;
-	return 0;
 }
 
 void pci_vpd_release(struct pci_dev *dev)