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 <myron.stowe@redhat.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
CC: Chris Wright <chrisw@sous-sol.org>
CC: Yu Zhao <yuzhao@google.com>

diff --git a/drivers/pci/iov.c b/drivers/pci/iov.c
index 4d109c07294a8d7326583e43ffb594569cf1c1e7..4b3a4eaad996b474474836a6f9ea60795a36d81f 100644 (file)
--- a/drivers/pci/iov.c
+++ b/drivers/pci/iov.c
@@ -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);
 }
 

diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 625a4ace10b4411aed1cbda278a3851d9299965d..7bf246595c63d08615cec04466784d81f134af5b 100644 (file)
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -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;
        }

diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
index 0601890db22de96131af2d67fd872651ab608133..a0905a0985ce520554eb721a395942bce6066e69 100644 (file)
--- a/drivers/pci/pci.h
+++ b/drivers/pci/pci.h
@@ -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;
 }