2014-02-20 17:46:44

by Paul Gortmaker

[permalink] [raw]
Subject: [PATCH] frv: replace now removed pci_bus_b() causing build failure

In commit 94e6a9b93064b49024b8701d2d81fcb4a821fa09 ("PCI: Remove
pci_bus_b() and use list_for_each_entry() directly") the function
pci_bus_b() was removed, but one instance of its usage was missed.

Replace it in the same fashion that the original commit did.

Cc: Yijing Wang <[email protected]>
Cc: Bjorn Helgaas <[email protected]>
Signed-off-by: Paul Gortmaker <[email protected]>
---

[Note: commit ID referenced above is from linux-next and will
be invalid if the PCI-next content is ever rebased.]

arch/frv/mb93090-mb00/pci-frv.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/frv/mb93090-mb00/pci-frv.c b/arch/frv/mb93090-mb00/pci-frv.c
index c28121765448..67b1d1685759 100644
--- a/arch/frv/mb93090-mb00/pci-frv.c
+++ b/arch/frv/mb93090-mb00/pci-frv.c
@@ -88,7 +88,7 @@ static void __init pcibios_allocate_bus_resources(struct list_head *bus_list)

/* Depth-First Search on bus tree */
for (ln=bus_list->next; ln != bus_list; ln=ln->next) {
- bus = pci_bus_b(ln);
+ bus = list_entry(ln, struct pci_bus, node);
if ((dev = bus->self)) {
for (idx = PCI_BRIDGE_RESOURCES; idx < PCI_NUM_RESOURCES; idx++) {
r = &dev->resource[idx];
--
1.8.5.2


2014-02-20 18:16:56

by Bjorn Helgaas

[permalink] [raw]
Subject: Re: [PATCH] frv: replace now removed pci_bus_b() causing build failure

[+cc linux-pci]

On Thu, Feb 20, 2014 at 10:46 AM, Paul Gortmaker
<[email protected]> wrote:
> In commit 94e6a9b93064b49024b8701d2d81fcb4a821fa09 ("PCI: Remove
> pci_bus_b() and use list_for_each_entry() directly") the function
> pci_bus_b() was removed, but one instance of its usage was missed.
>
> Replace it in the same fashion that the original commit did.
>
> Cc: Yijing Wang <[email protected]ei.com>
> Cc: Bjorn Helgaas <[email protected]>
> Signed-off-by: Paul Gortmaker <[email protected]>

Crap, sorry about that. I added this to my pci/list-for-each-entry
branch for v3.15.

> ---
>
> [Note: commit ID referenced above is from linux-next and will
> be invalid if the PCI-next content is ever rebased.]
>
> arch/frv/mb93090-mb00/pci-frv.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/frv/mb93090-mb00/pci-frv.c b/arch/frv/mb93090-mb00/pci-frv.c
> index c28121765448..67b1d1685759 100644
> --- a/arch/frv/mb93090-mb00/pci-frv.c
> +++ b/arch/frv/mb93090-mb00/pci-frv.c
> @@ -88,7 +88,7 @@ static void __init pcibios_allocate_bus_resources(struct list_head *bus_list)
>
> /* Depth-First Search on bus tree */
> for (ln=bus_list->next; ln != bus_list; ln=ln->next) {
> - bus = pci_bus_b(ln);
> + bus = list_entry(ln, struct pci_bus, node);
> if ((dev = bus->self)) {
> for (idx = PCI_BRIDGE_RESOURCES; idx < PCI_NUM_RESOURCES; idx++) {
> r = &dev->resource[idx];
> --
> 1.8.5.2
>

2014-02-21 01:18:30

by Yijing Wang

[permalink] [raw]
Subject: Re: [PATCH] frv: replace now removed pci_bus_b() causing build failure

Oh, I'm sorry, Paul,thanks for your patch to correct this.

On 2014/2/21 1:46, Paul Gortmaker wrote:
> In commit 94e6a9b93064b49024b8701d2d81fcb4a821fa09 ("PCI: Remove
> pci_bus_b() and use list_for_each_entry() directly") the function
> pci_bus_b() was removed, but one instance of its usage was missed.
>
> Replace it in the same fashion that the original commit did.
>
> Cc: Yijing Wang <[email protected]>
> Cc: Bjorn Helgaas <[email protected]>
> Signed-off-by: Paul Gortmaker <[email protected]>
> ---
>
> [Note: commit ID referenced above is from linux-next and will
> be invalid if the PCI-next content is ever rebased.]
>
> arch/frv/mb93090-mb00/pci-frv.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/frv/mb93090-mb00/pci-frv.c b/arch/frv/mb93090-mb00/pci-frv.c
> index c28121765448..67b1d1685759 100644
> --- a/arch/frv/mb93090-mb00/pci-frv.c
> +++ b/arch/frv/mb93090-mb00/pci-frv.c
> @@ -88,7 +88,7 @@ static void __init pcibios_allocate_bus_resources(struct list_head *bus_list)
>
> /* Depth-First Search on bus tree */
> for (ln=bus_list->next; ln != bus_list; ln=ln->next) {
> - bus = pci_bus_b(ln);
> + bus = list_entry(ln, struct pci_bus, node);
> if ((dev = bus->self)) {
> for (idx = PCI_BRIDGE_RESOURCES; idx < PCI_NUM_RESOURCES; idx++) {
> r = &dev->resource[idx];
>


--
Thanks!
Yijing