2017-06-26 13:34:44

by Ryder Lee

Subject: [PATCH] critical patch to fix build bot failed

Hi,

This is a critical patch (based on pcie -next branch) to fix build bot failure:

This build failure is still present in -next:

> arm-allmodconfig
> ../drivers/pci/host/pcie-mediatek.c:485:8: error: implicit declaration of function 'pci_register_host_bridge' [-Werror=implicit-function-declaration]

and we're at -rc7 now.


This is because host/pci-mediatek is a separate branch in pci-tree but we (Lorenzo's patches) merge together.
Seems Bjorn didn't response these days, so I need someone help to apply this patch to -next.

Hi Arnd and Mark,

Do you have better idea to handle this situation? I'm really not sure how to fix it in proper ways.
Thanks a lot.

Ryder

Ryder Lee (1):
PCI: mediatek: change to use pci_scan_root_bus_bridge()

drivers/pci/host/pcie-mediatek.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)

--
1.9.1

2017-06-26 13:34:29

by Ryder Lee

Subject: [PATCH] PCI: mediatek: change to use pci_scan_root_bus_bridge()

This is a critical patch fixes Build bot failed:
> arm-allmodconfig
> ../drivers/pci/host/pcie-mediatek.c:485:8: error: implicit declaration of
function 'pci_register_host_bridge' [-Werror=implicit-function-declaration]

It uses the new registration methods pci_scan_root_bus_bridge().

Signed-off-by: Ryder Lee <[email protected]>
---
drivers/pci/host/pcie-mediatek.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/pci/host/pcie-mediatek.c b/drivers/pci/host/pcie-mediatek.c
index 3baafa8..514ef34 100644
--- a/drivers/pci/host/pcie-mediatek.c
+++ b/drivers/pci/host/pcie-mediatek.c
@@ -482,12 +482,10 @@ static int mtk_pcie_register_host(struct pci_host_bridge *host)
host->dev.parent = pcie->dev;
host->ops = &mtk_pcie_ops;

- err = pci_register_host_bridge(host);
+ err = pci_scan_root_bus_bridge(host);
if (err < 0)
return err;

- pci_scan_child_bus(host->bus);
-
pci_fixup_irqs(pci_common_swizzle, of_irq_parse_and_map_pci);
pci_bus_size_bridges(host->bus);
pci_bus_assign_resources(host->bus);
@@ -506,7 +504,7 @@ static int mtk_pcie_probe(struct platform_device *pdev)
struct pci_host_bridge *host;
int err;

- host = pci_alloc_host_bridge(sizeof(*pcie));
+ host = devm_pci_alloc_host_bridge(&pdev->dev, sizeof(*pcie));
if (!host)
return -ENOMEM;

--
1.9.1