From: Ryder Lee <ryder.lee@mediatek.com>
To: Andrew Morton <akpm@linux-foundation.org>,
Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Bjorn Helgaas <bhelgaas@google.com>, <linux-pci@vger.kernel.org>,
<linux-kernel@vger.kernel.org>,
Ryder Lee <ryder.lee@mediatek.com>
Subject: [PATCH] PCI: mediatek: change to use the new host bridge interface
Date: Tue, 27 Jun 2017 17:24:11 +0800 [thread overview]
Message-ID: <1498555451-55073-2-git-send-email-ryder.lee@mediatek.com> (raw)
In-Reply-To: <1498555451-55073-1-git-send-email-ryder.lee@mediatek.com>
With the introduction of pci_scan_root_bus_bridge() there is no need to
export pci_register_host_bridge() to other kernel subsystems other than the
PCI compilation unit that needs it.
Make pci_register_host_bridge() static to its compilation unit and convert
the existing drivers usage over to pci_scan_root_bus_bridge().
Also, when probing the PCI host controller driver, if an error occurs, the probe
function code does not free memory allocated for the struct pci_host_bridge
resulting in memory leakage.
This patch fixes them by using the methods that introduces by Lorenzo.
Signed-off-by: Ryder Lee <ryder.lee@mediatek.com>
---
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
next prev parent reply other threads:[~2017-06-27 9:24 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-27 9:24 [RESEND PATCH] critical patch to fix pci-tree build bot failure Ryder Lee
2017-06-27 9:24 ` Ryder Lee [this message]
2017-06-27 22:30 ` [PATCH] PCI: mediatek: change to use the new host bridge interface Bjorn Helgaas
2017-06-27 23:20 ` Bjorn Helgaas
2017-06-28 1:21 ` Ryder Lee
2017-06-27 13:20 ` [RESEND PATCH] critical patch to fix pci-tree build bot failure Bjorn Helgaas
2017-06-27 22:10 ` Stephen Rothwell
2017-06-27 22:23 ` Bjorn Helgaas
2017-06-28 20:43 ` Bjorn Helgaas
2017-06-28 21:55 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1498555451-55073-2-git-send-email-ryder.lee@mediatek.com \
--to=ryder.lee@mediatek.com \
--cc=akpm@linux-foundation.org \
--cc=bhelgaas@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).