PCI: Remove fixed parameter in pci_iov_resource_bar()
PATCH v2 1/1 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 Myron Stowe <[email protected]>
Cc Chris Wright <[email protected]>
Cc Yu Zhao <[email protected]>
--- drivers/pci/iov.c | 11 +++-------- drivers/pci/pci.c | 3 ++- drivers/pci/pci.h | 6 ++---- 3 files changed, 7 insertions(+), 13 deletions(-)
drivers/pci/iov.c +3 -8
@@ -479,20 +479,16 @@ void pci_iov_release(struct pci_dev *dev)* pci_iov_resource_bar - get position of the SR-IOV BAR * @dev: the PCI device * @resno: the resource number -* @type: the BAR type to be filled in * * Returns position of the BAR encapsulated in the SR-IOV capability. */ -int pci_iov_resource_bar (struct pci_dev *dev,int resno, -enum pci_bar_type *type) +int pci_iov_resource_bar (struct pci_dev *dev,int resno) {if (resno <PCI_IOV_RESOURCES || resno >PCI_IOV_RESOURCE_END )return 0 ;BUG_ON (!dev->is_physfn); - *type = pci_bar_unknown; -return dev->sriov->pos +PCI_SRIOV_BAR +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) {struct resource tmp; -enum pci_bar_type type; -int reg =pci_iov_resource_bar (dev, resno, &type); +int reg =pci_iov_resource_bar (dev, resno);if (!reg)return 0 ; -__pci_read_base (dev, type, &tmp, reg); +__pci_read_base (dev, pci_bar_unknown, &tmp, reg);return resource_alignment (&tmp); }
drivers/pci/pci.c +2 -1
@@ -4180,7 +4180,8 @@ int pci_resource_bar(struct pci_dev *dev, int resno, enum pci_bar_type *type)return dev->rom_base_reg; }else if (resno <PCI_BRIDGE_RESOURCES ) {/* device specific resource */ - reg =pci_iov_resource_bar (dev, resno, type); + *type = pci_bar_unknown; + reg =pci_iov_resource_bar (dev, resno);if (reg)return reg; }
drivers/pci/pci.h +2 -4
@@ -251,8 +251,7 @@ static inline void pci_restore_ats_state(struct pci_dev *dev)#ifdef CONFIG_PCI_IOV int pci_iov_init (struct pci_dev *dev);void pci_iov_release (struct pci_dev *dev); -int pci_iov_resource_bar (struct pci_dev *dev,int resno, -enum pci_bar_type *type); +int pci_iov_resource_bar (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);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, -enum pci_bar_type *type) +static inline int pci_iov_resource_bar (struct pci_dev *dev,int resno) {return 0 ; }
Bjorn Helgaas
maintainerQuoted 9 lines · Myron Stowe
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 Myron Stowe <[email protected]>Cc Chris Wright <[email protected]>Cc Yu Zhao <[email protected]>
I replaced the v1 patch with this one to fix the build error:
drivers/pci/pci.c:4184:9: error: too few arguments to function 'pci_iov_resource_bar'
Thanks!
Quoted 87 lines
--- drivers/pci/iov.c | 11 +++-------- drivers/pci/pci.c | 3 ++- drivers/pci/pci.h | 6 ++---- 3 files changed, 7 insertions(+), 13 deletions(-)drivers/pci/iov.c +3
-8@@ -479,20 +479,16 @@ void pci_iov_release(struct pci_dev *dev)* pci_iov_resource_bar - get position of the SR-IOV BAR * @dev: the PCI device * @resno: the resource number -* @type: the BAR type to be filled in * * Returns position of the BAR encapsulated in the SR-IOV capability. */ -int pci_iov_resource_bar (struct pci_dev *dev,int resno, -enum pci_bar_type *type) +int pci_iov_resource_bar (struct pci_dev *dev,int resno) {if (resno <PCI_IOV_RESOURCES || resno >PCI_IOV_RESOURCE_END )return 0 ;BUG_ON (!dev->is_physfn); - *type = pci_bar_unknown; -return dev->sriov->pos +PCI_SRIOV_BAR +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) {struct resource tmp; -enum pci_bar_type type; -int reg =pci_iov_resource_bar (dev, resno, &type); +int reg =pci_iov_resource_bar (dev, resno);if (!reg)return 0 ; -__pci_read_base (dev, type, &tmp, reg); +__pci_read_base (dev, pci_bar_unknown, &tmp, reg);return resource_alignment (&tmp); }drivers/pci/pci.c +2
-1@@ -4180,7 +4180,8 @@ int pci_resource_bar(struct pci_dev *dev, int resno, enum pci_bar_type *type)return dev->rom_base_reg; }else if (resno <PCI_BRIDGE_RESOURCES ) {/* device specific resource */ - reg =pci_iov_resource_bar (dev, resno, type); + *type = pci_bar_unknown; + reg =pci_iov_resource_bar (dev, resno);if (reg)return reg; }drivers/pci/pci.h +2
-4@@ -251,8 +251,7 @@ static inline void pci_restore_ats_state(struct pci_dev *dev)#ifdef CONFIG_PCI_IOV int pci_iov_init (struct pci_dev *dev);void pci_iov_release (struct pci_dev *dev); -int pci_iov_resource_bar (struct pci_dev *dev,int resno, -enum pci_bar_type *type); +int pci_iov_resource_bar (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);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, -enum pci_bar_type *type) +static inline int pci_iov_resource_bar (struct pci_dev *dev,int resno) {return 0 ; }