* [PATCH] PCI: Remove fixed parameter in pci_iov_resource_bar()
@ 2014-10-30 21:28 Myron Stowe
2014-11-11 3:36 ` Bjorn Helgaas
0 siblings, 1 reply; 2+ messages in thread
From: Myron Stowe @ 2014-10-30 21:28 UTC (permalink / raw)
To: bhelgaas, linux-pci; +Cc: chrisw, ddutile, linux-kernel, yuzhao
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>
Cc: Chris Wright <chrisw@sous-sol.org>
Cc: Yu Zhao <yuzhao@google.com>
---
drivers/pci/iov.c | 11 +++--------
drivers/pci/pci.c | 3 ++-
drivers/pci/pci.h | 3 +--
3 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/drivers/pci/iov.c b/drivers/pci/iov.c
index 4d109c0..4b3a4ea 100644
--- 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 625a4ac..7bf2465 100644
--- 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 0601890..e0b5f17 100644
--- 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);
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] PCI: Remove fixed parameter in pci_iov_resource_bar()
2014-10-30 21:28 [PATCH] PCI: Remove fixed parameter in pci_iov_resource_bar() Myron Stowe
@ 2014-11-11 3:36 ` Bjorn Helgaas
0 siblings, 0 replies; 2+ messages in thread
From: Bjorn Helgaas @ 2014-11-11 3:36 UTC (permalink / raw)
To: Myron Stowe; +Cc: linux-pci, chrisw, ddutile, linux-kernel, yuzhao
On Thu, Oct 30, 2014 at 03:28:17PM -0600, Myron Stowe wrote:
> 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>
> Cc: Chris Wright <chrisw@sous-sol.org>
> Cc: Yu Zhao <yuzhao@google.com>
Applied to pci/enumeration for v3.19, thanks!
> ---
> drivers/pci/iov.c | 11 +++--------
> drivers/pci/pci.c | 3 ++-
> drivers/pci/pci.h | 3 +--
> 3 files changed, 6 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/pci/iov.c b/drivers/pci/iov.c
> index 4d109c0..4b3a4ea 100644
> --- 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 625a4ac..7bf2465 100644
> --- 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 0601890..e0b5f17 100644
> --- 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);
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-11-11 3:36 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-10-30 21:28 [PATCH] PCI: Remove fixed parameter in pci_iov_resource_bar() Myron Stowe
2014-11-11 3:36 ` Bjorn Helgaas
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).