Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 64379079 authored Feb 22, 2016 by Bjorn Helgaas

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>

parent fc0a407e

drivers/pci/access.c

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -581,6 +581,12 @@ int pci_vpd_pci22_init(struct pci_dev *dev)
	return 0;		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		* pci_cfg_access_lock - Lock PCI config reads/writes
	* @dev: pci device struct		* @dev: pci device struct

drivers/pci/pci.h

+1 −5

Original line number	Original line	Diff line number	Diff line
	@@ -107,11 +107,7 @@ struct pci_vpd {
	};		};

	int pci_vpd_pci22_init(struct pci_dev *dev);		int pci_vpd_pci22_init(struct pci_dev *dev);
	static inline void pci_vpd_release(struct pci_dev *dev)		void pci_vpd_release(struct pci_dev *dev);
	{
	if (dev->vpd)
	dev->vpd->ops->release(dev);
	}

	/* PCI /proc functions */		/* PCI /proc functions */
	#ifdef CONFIG_PROC_FS		#ifdef CONFIG_PROC_FS