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

Commit 26ff46c6 authored by Myron Stowe's avatar Myron Stowe Committed by Bjorn Helgaas
Browse files

PCI: Remove fixed parameter in pci_iov_resource_bar() 



pci_iov_resource_bar() always sets its 'pci_bar_type' parameter to
'pci_bar_unknown'.  Drop the parameter and just use 'pci_bar_unknown'
directly in the callers.

No functional change intended.

Signed-off-by: default avatarMyron Stowe <myron.stowe@redhat.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
CC: Chris Wright <chrisw@sous-sol.org>
CC: Yu Zhao <yuzhao@google.com>
parent 7e79c5f8

drivers/pci/iov.c

+3 −8
Original line number Original line Diff line number Diff line
@@ -479,20 +479,16 @@ void pci_iov_release(struct pci_dev *dev) 
 * pci_iov_resource_bar - get position of the SR-IOV BAR

 * pci_iov_resource_bar - get position of the SR-IOV BAR

 * @dev: the PCI device

 * @dev: the PCI device

 * @resno: the resource number

 * @resno: the resource number

 * @type: the BAR type to be filled in

 *

 *

 * Returns position of the BAR encapsulated in the SR-IOV capability.

 * Returns position of the BAR encapsulated in the SR-IOV capability.

 */

 */

int pci_iov_resource_bar(struct pci_dev *dev, int resno,

int pci_iov_resource_bar(struct pci_dev *dev, int resno)

			 enum pci_bar_type *type)

{

{

	if (resno < PCI_IOV_RESOURCES || resno > PCI_IOV_RESOURCE_END)

	if (resno < PCI_IOV_RESOURCES || resno > PCI_IOV_RESOURCE_END)

		return 0;

		return 0;





	BUG_ON(!dev->is_physfn);

	BUG_ON(!dev->is_physfn);





	*type = pci_bar_unknown;



	return dev->sriov->pos + PCI_SRIOV_BAR +

	return dev->sriov->pos + PCI_SRIOV_BAR +

		4 * (resno - PCI_IOV_RESOURCES);

		4 * (resno - PCI_IOV_RESOURCES);

}

}
@@ -510,13 +506,12 @@ int pci_iov_resource_bar(struct pci_dev *dev, int resno, 
resource_size_t pci_sriov_resource_alignment(struct pci_dev *dev, int resno)

resource_size_t pci_sriov_resource_alignment(struct pci_dev *dev, int resno)

{

{

	struct resource tmp;

	struct resource tmp;

	enum pci_bar_type type;

	int reg = pci_iov_resource_bar(dev, resno);

	int reg = pci_iov_resource_bar(dev, resno, &type);





	if (!reg)

	if (!reg)

		return 0;

		return 0;





	 __pci_read_base(dev, type, &tmp, reg);

	 __pci_read_base(dev, pci_bar_unknown, &tmp, reg);

	return resource_alignment(&tmp);

	return resource_alignment(&tmp);

}

}

drivers/pci/pci.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -4180,7 +4180,8 @@ int pci_resource_bar(struct pci_dev *dev, int resno, enum pci_bar_type *type) 
		return dev->rom_base_reg;

		return dev->rom_base_reg;

	} else if (resno < PCI_BRIDGE_RESOURCES) {

	} else if (resno < PCI_BRIDGE_RESOURCES) {

		/* device specific resource */

		/* device specific resource */

		reg = pci_iov_resource_bar(dev, resno, type);

		*type = pci_bar_unknown;

		reg = pci_iov_resource_bar(dev, resno);

		if (reg)

		if (reg)

			return reg;

			return reg;

	}

	}

drivers/pci/pci.h

+2 −4
Original line number Original line Diff line number Diff line
@@ -251,8 +251,7 @@ static inline void pci_restore_ats_state(struct pci_dev *dev) 
#ifdef CONFIG_PCI_IOV

#ifdef CONFIG_PCI_IOV

int pci_iov_init(struct pci_dev *dev);

int pci_iov_init(struct pci_dev *dev);

void pci_iov_release(struct pci_dev *dev);

void pci_iov_release(struct pci_dev *dev);

int pci_iov_resource_bar(struct pci_dev *dev, int resno,

int pci_iov_resource_bar(struct pci_dev *dev, int resno);

			 enum pci_bar_type *type);

resource_size_t pci_sriov_resource_alignment(struct pci_dev *dev, int resno);

resource_size_t pci_sriov_resource_alignment(struct pci_dev *dev, int resno);

void pci_restore_iov_state(struct pci_dev *dev);

void pci_restore_iov_state(struct pci_dev *dev);

int pci_iov_bus_range(struct pci_bus *bus);

int pci_iov_bus_range(struct pci_bus *bus);
@@ -266,8 +265,7 @@ static inline void pci_iov_release(struct pci_dev *dev) 




{

{

}

}

static inline int pci_iov_resource_bar(struct pci_dev *dev, int resno,

static inline int pci_iov_resource_bar(struct pci_dev *dev, int resno)

				       enum pci_bar_type *type)

{

{

	return 0;

	return 0;

}

}