| Message ID | 1538129080-8206-5-git-send-email-honghui.zhang@mediatek.com (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | Bjorn Helgaas |
| Headers | show |
| Series | PCI: mediatek: fixup find_port, enable_msi and add pm, module support | expand |
On Fri, 2018-09-28 at 18:04 +0800, honghui.zhang@mediatek.com wrote: > From: Honghui Zhang <honghui.zhang@mediatek.com> > > Part of mtk_pcie_register_host is an open-coded version of > pci_host_probe(). So instead of duplicating this code, use > pci_host_probe() directly and remove mtk_pcie_register_host. > > Signed-off-by: Honghui Zhang <honghui.zhang@mediatek.com> > --- > drivers/pci/controller/pcie-mediatek.c | 37 ++++++++-------------------------- > 1 file changed, 8 insertions(+), 29 deletions(-) > > diff --git a/drivers/pci/controller/pcie-mediatek.c b/drivers/pci/controller/pcie-mediatek.c > index e2c4127..cbf4543 100644 > --- a/drivers/pci/controller/pcie-mediatek.c > +++ b/drivers/pci/controller/pcie-mediatek.c > @@ -1125,34 +1125,6 @@ static int mtk_pcie_request_resources(struct mtk_pcie *pcie) > return 0; > } > > -static int mtk_pcie_register_host(struct pci_host_bridge *host) > -{ > - struct mtk_pcie *pcie = pci_host_bridge_priv(host); > - struct pci_bus *child; > - int err; To make the patch simple, could we keep these host->*. and return pci_host_probe() directly? > - host->busnr = pcie->busn.start; > - host->dev.parent = pcie->dev; > - host->ops = pcie->soc->ops; > - host->map_irq = of_irq_parse_and_map_pci; > - host->swizzle_irq = pci_common_swizzle; > - host->sysdata = pcie; > - > - err = pci_scan_root_bus_bridge(host); > - if (err < 0) > - return err; > - > - pci_bus_size_bridges(host->bus); > - pci_bus_assign_resources(host->bus); > - > - list_for_each_entry(child, &host->bus->children, node) > - pcie_bus_configure_settings(child); > - > - pci_bus_add_devices(host->bus); > - > - return 0; > -} > - > static int mtk_pcie_probe(struct platform_device *pdev) > { > struct device *dev = &pdev->dev; > @@ -1179,7 +1151,14 @@ static int mtk_pcie_probe(struct platform_device *pdev) > if (err) > goto put_resources; > > - err = mtk_pcie_register_host(host); > + host->busnr = pcie->busn.start; > + host->dev.parent = pcie->dev; > + host->ops = pcie->soc->ops; > + host->map_irq = of_irq_parse_and_map_pci; > + host->swizzle_irq = pci_common_swizzle; > + host->sysdata = pcie; > + > + err = pci_host_probe(host); > if (err) > goto put_resources; >
On Fri, 2018-09-28 at 23:41 +0800, Ryder Lee wrote: > On Fri, 2018-09-28 at 18:04 +0800, honghui.zhang@mediatek.com wrote: > > From: Honghui Zhang <honghui.zhang@mediatek.com> > > > > Part of mtk_pcie_register_host is an open-coded version of > > pci_host_probe(). So instead of duplicating this code, use > > pci_host_probe() directly and remove mtk_pcie_register_host. > > > > Signed-off-by: Honghui Zhang <honghui.zhang@mediatek.com> > > --- > > drivers/pci/controller/pcie-mediatek.c | 37 ++++++++-------------------------- > > 1 file changed, 8 insertions(+), 29 deletions(-) > > > > diff --git a/drivers/pci/controller/pcie-mediatek.c b/drivers/pci/controller/pcie-mediatek.c > > index e2c4127..cbf4543 100644 > > --- a/drivers/pci/controller/pcie-mediatek.c > > +++ b/drivers/pci/controller/pcie-mediatek.c > > @@ -1125,34 +1125,6 @@ static int mtk_pcie_request_resources(struct mtk_pcie *pcie) > > return 0; > > } > > > > -static int mtk_pcie_register_host(struct pci_host_bridge *host) > > -{ > > - struct mtk_pcie *pcie = pci_host_bridge_priv(host); > > - struct pci_bus *child; > > - int err; > > To make the patch simple, could we keep these host->*. and return > pci_host_probe() directly? Well, I guess it's not necessary to keep the mtk_pcie_register_host just wrap pci_host_probe(). Put those host->* directly in probe function is no harm, it will reduce one function call and related parameter passing. I may update this patch to keep the mtk_pcie_register_host if you insist though I prefer the current way. Thanks. > > > - host->busnr = pcie->busn.start; > > - host->dev.parent = pcie->dev; > > - host->ops = pcie->soc->ops; > > - host->map_irq = of_irq_parse_and_map_pci; > > - host->swizzle_irq = pci_common_swizzle; > > - host->sysdata = pcie; > > - > > - err = pci_scan_root_bus_bridge(host); > > - if (err < 0) > > - return err; > > - > > - pci_bus_size_bridges(host->bus); > > - pci_bus_assign_resources(host->bus); > > - > > - list_for_each_entry(child, &host->bus->children, node) > > - pcie_bus_configure_settings(child); > > - > > - pci_bus_add_devices(host->bus); > > - > > - return 0; > > -} > > - > > static int mtk_pcie_probe(struct platform_device *pdev) > > { > > struct device *dev = &pdev->dev; > > @@ -1179,7 +1151,14 @@ static int mtk_pcie_probe(struct platform_device *pdev) > > if (err) > > goto put_resources; > > > > - err = mtk_pcie_register_host(host); > > + host->busnr = pcie->busn.start; > > + host->dev.parent = pcie->dev; > > + host->ops = pcie->soc->ops; > > + host->map_irq = of_irq_parse_and_map_pci; > > + host->swizzle_irq = pci_common_swizzle; > > + host->sysdata = pcie; > > + > > + err = pci_host_probe(host); > > if (err) > > goto put_resources; > > > >
On Sat, 2018-09-29 at 08:16 +0800, Honghui Zhang wrote: > On Fri, 2018-09-28 at 23:41 +0800, Ryder Lee wrote: > > On Fri, 2018-09-28 at 18:04 +0800, honghui.zhang@mediatek.com wrote: > > > From: Honghui Zhang <honghui.zhang@mediatek.com> > > > > > > Part of mtk_pcie_register_host is an open-coded version of > > > pci_host_probe(). So instead of duplicating this code, use > > > pci_host_probe() directly and remove mtk_pcie_register_host. > > > > > > Signed-off-by: Honghui Zhang <honghui.zhang@mediatek.com> > > > --- > > > drivers/pci/controller/pcie-mediatek.c | 37 ++++++++-------------------------- > > > 1 file changed, 8 insertions(+), 29 deletions(-) > > > > > > diff --git a/drivers/pci/controller/pcie-mediatek.c b/drivers/pci/controller/pcie-mediatek.c > > > index e2c4127..cbf4543 100644 > > > --- a/drivers/pci/controller/pcie-mediatek.c > > > +++ b/drivers/pci/controller/pcie-mediatek.c > > > @@ -1125,34 +1125,6 @@ static int mtk_pcie_request_resources(struct mtk_pcie *pcie) > > > return 0; > > > } > > > > > > -static int mtk_pcie_register_host(struct pci_host_bridge *host) > > > -{ > > > - struct mtk_pcie *pcie = pci_host_bridge_priv(host); > > > - struct pci_bus *child; > > > - int err; > > > > To make the patch simple, could we keep these host->*. and return > > pci_host_probe() directly? > > Well, I guess it's not necessary to keep the mtk_pcie_register_host just > wrap pci_host_probe(). Put those host->* directly in probe function is > no harm, it will reduce one function call and related parameter passing. > > I may update this patch to keep the mtk_pcie_register_host if you insist > though I prefer the current way. > > Thanks. Okay. I'm fine with this. > > > - host->busnr = pcie->busn.start; > > > - host->dev.parent = pcie->dev; > > > - host->ops = pcie->soc->ops; > > > - host->map_irq = of_irq_parse_and_map_pci; > > > - host->swizzle_irq = pci_common_swizzle; > > > - host->sysdata = pcie; > > > - > > > - err = pci_scan_root_bus_bridge(host); > > > - if (err < 0) > > > - return err; > > > - > > > - pci_bus_size_bridges(host->bus); > > > - pci_bus_assign_resources(host->bus); > > > - > > > - list_for_each_entry(child, &host->bus->children, node) > > > - pcie_bus_configure_settings(child); > > > - > > > - pci_bus_add_devices(host->bus); > > > - > > > - return 0; > > > -} > > > - > > > static int mtk_pcie_probe(struct platform_device *pdev) > > > { > > > struct device *dev = &pdev->dev; > > > @@ -1179,7 +1151,14 @@ static int mtk_pcie_probe(struct platform_device *pdev) > > > if (err) > > > goto put_resources; > > > > > > - err = mtk_pcie_register_host(host); > > > + host->busnr = pcie->busn.start; > > > + host->dev.parent = pcie->dev; > > > + host->ops = pcie->soc->ops; > > > + host->map_irq = of_irq_parse_and_map_pci; > > > + host->swizzle_irq = pci_common_swizzle; > > > + host->sysdata = pcie; > > > + > > > + err = pci_host_probe(host); > > > if (err) > > > goto put_resources; > > > > > > > > >
diff --git a/drivers/pci/controller/pcie-mediatek.c b/drivers/pci/controller/pcie-mediatek.c index e2c4127..cbf4543 100644 --- a/drivers/pci/controller/pcie-mediatek.c +++ b/drivers/pci/controller/pcie-mediatek.c @@ -1125,34 +1125,6 @@ static int mtk_pcie_request_resources(struct mtk_pcie *pcie) return 0; } -static int mtk_pcie_register_host(struct pci_host_bridge *host) -{ - struct mtk_pcie *pcie = pci_host_bridge_priv(host); - struct pci_bus *child; - int err; - - host->busnr = pcie->busn.start; - host->dev.parent = pcie->dev; - host->ops = pcie->soc->ops; - host->map_irq = of_irq_parse_and_map_pci; - host->swizzle_irq = pci_common_swizzle; - host->sysdata = pcie; - - err = pci_scan_root_bus_bridge(host); - if (err < 0) - return err; - - pci_bus_size_bridges(host->bus); - pci_bus_assign_resources(host->bus); - - list_for_each_entry(child, &host->bus->children, node) - pcie_bus_configure_settings(child); - - pci_bus_add_devices(host->bus); - - return 0; -} - static int mtk_pcie_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; @@ -1179,7 +1151,14 @@ static int mtk_pcie_probe(struct platform_device *pdev) if (err) goto put_resources; - err = mtk_pcie_register_host(host); + host->busnr = pcie->busn.start; + host->dev.parent = pcie->dev; + host->ops = pcie->soc->ops; + host->map_irq = of_irq_parse_and_map_pci; + host->swizzle_irq = pci_common_swizzle; + host->sysdata = pcie; + + err = pci_host_probe(host); if (err) goto put_resources;