summaryrefslogtreecommitdiffstats
path: root/drivers/pci
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2016-02-22 13:58:06 -0600
committerBjorn Helgaas <bhelgaas@google.com>2016-02-29 17:47:16 -0600
commit64379079a9e37ab9e1c755921d7ff1c4fa3ac486 (patch)
tree81b2be9df62e6ee7508787d8ee60619a1dd3d43a /drivers/pci
parentfc0a407e9eb8667f93820298a06a85050c42354e (diff)
downloadblackbird-obmc-linux-64379079a9e37ab9e1c755921d7ff1c4fa3ac486.tar.gz
blackbird-obmc-linux-64379079a9e37ab9e1c755921d7ff1c4fa3ac486.zip
PCI: Move pci_vpd_release() from header file to pci/access.c
Move pci_vpd_release() so it's next to the other VPD functions. This puts it next to pci_vpd_pci22_init(), which allocates the space freed by pci_vpd_release(). Tested-by: Shane Seymour <shane.seymour@hpe.com> Tested-by: Babu Moger <babu.moger@oracle.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Reviewed-by: Hannes Reinecke <hare@suse.com>
Diffstat (limited to 'drivers/pci')
-rw-r--r--drivers/pci/access.c6
-rw-r--r--drivers/pci/pci.h6
2 files changed, 7 insertions, 5 deletions
diff --git a/drivers/pci/access.c b/drivers/pci/access.c
index 4c4c73420fb2..ca42a33bbb00 100644
--- a/drivers/pci/access.c
+++ b/drivers/pci/access.c
@@ -581,6 +581,12 @@ int pci_vpd_pci22_init(struct pci_dev *dev)
return 0;
}
+void pci_vpd_release(struct pci_dev *dev)
+{
+ if (dev->vpd)
+ dev->vpd->ops->release(dev);
+}
+
/**
* pci_cfg_access_lock - Lock PCI config reads/writes
* @dev: pci device struct
diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
index 9a1660f592ef..52e86b0d56d2 100644
--- a/drivers/pci/pci.h
+++ b/drivers/pci/pci.h
@@ -107,11 +107,7 @@ struct pci_vpd {
};
int pci_vpd_pci22_init(struct pci_dev *dev);
-static inline void pci_vpd_release(struct pci_dev *dev)
-{
- if (dev->vpd)
- dev->vpd->ops->release(dev);
-}
+void pci_vpd_release(struct pci_dev *dev);
/* PCI /proc functions */
#ifdef CONFIG_PROC_FS
OpenPOWER on IntegriCloud