From: Yijing Wang <wangyijing@huawei.com>
To: Bjorn Helgaas <bhelgaas@google.com>
Cc: <linux-pci@vger.kernel.org>, <dja@axtens.net>,
Arnd Bergmann <arnd@arndb.de>,
<linux-arm-kernel@lists.infradead.org>,
Yijing Wang <wangyijing@huawei.com>,
Thomas Petazzoni <thomas.petazzoni@free-electrons.com>,
Jason Cooper <jason@lakedaemon.net>
Subject: [PATCH Part1 v11 1/5] PCI: mvebu: Use pci_common_init_dev() to simplify code
Date: Tue, 28 Apr 2015 15:01:35 +0800 [thread overview]
Message-ID: <1430204499-19571-2-git-send-email-wangyijing@huawei.com> (raw)
In-Reply-To: <1430204499-19571-1-git-send-email-wangyijing@huawei.com>
Mvebu_pcie_scan_bus() is not necessary, we could use
pci_common_init_dev() instead of pci_common_init(),
and pass the device pointer as the parent. Then
pci_scan_root_bus() will be called to scan the pci busses.
Tested-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Signed-off-by: Yijing Wang <wangyijing@huawei.com>
Reviewed-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
CC: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
CC: Jason Cooper <jason@lakedaemon.net>
---
drivers/pci/host/pci-mvebu.c | 18 +-----------------
1 files changed, 1 insertions(+), 17 deletions(-)
diff --git a/drivers/pci/host/pci-mvebu.c b/drivers/pci/host/pci-mvebu.c
index 1ab8635..70aa095 100644
--- a/drivers/pci/host/pci-mvebu.c
+++ b/drivers/pci/host/pci-mvebu.c
@@ -751,21 +751,6 @@ static int mvebu_pcie_setup(int nr, struct pci_sys_data *sys)
return 1;
}
-static struct pci_bus *mvebu_pcie_scan_bus(int nr, struct pci_sys_data *sys)
-{
- struct mvebu_pcie *pcie = sys_to_pcie(sys);
- struct pci_bus *bus;
-
- bus = pci_create_root_bus(&pcie->pdev->dev, sys->busnr,
- &mvebu_pcie_ops, sys, &sys->resources);
- if (!bus)
- return NULL;
-
- pci_scan_child_bus(bus);
-
- return bus;
-}
-
static resource_size_t mvebu_pcie_align_resource(struct pci_dev *dev,
const struct resource *res,
resource_size_t start,
@@ -809,12 +794,11 @@ static void mvebu_pcie_enable(struct mvebu_pcie *pcie)
hw.nr_controllers = 1;
hw.private_data = (void **)&pcie;
hw.setup = mvebu_pcie_setup;
- hw.scan = mvebu_pcie_scan_bus;
hw.map_irq = of_irq_parse_and_map_pci;
hw.ops = &mvebu_pcie_ops;
hw.align_resource = mvebu_pcie_align_resource;
- pci_common_init(&hw);
+ pci_common_init_dev(&pcie->pdev->dev, &hw);
}
/*
--
1.7.1
next prev parent reply other threads:[~2015-04-28 7:06 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-28 7:01 [PATCH Part1 v11 0/5] Some cleanup for pcie host drivers Yijing Wang
2015-04-28 7:01 ` Yijing Wang [this message]
2015-05-27 0:11 ` [PATCH Part1 v11 1/5] PCI: mvebu: Use pci_common_init_dev() to simplify code Bjorn Helgaas
2015-04-28 7:01 ` [PATCH Part1 v11 2/5] PCI: tegra: Remove redundant tegra_pcie_scan_bus() Yijing Wang
2015-04-28 7:01 ` [PATCH Part1 v11 3/5] PCI: designware: Use pci_scan_root_bus() for simplicity Yijing Wang
2015-04-28 8:15 ` Lucas Stach
2015-05-27 0:12 ` Bjorn Helgaas
2015-04-28 7:01 ` [PATCH Part1 v11 4/5] PCI: xgene: Use pci_scan_root_bus() instead of pci_create_root_bus() Yijing Wang
2015-05-27 15:47 ` Bjorn Helgaas
2015-05-27 17:21 ` Tanmay Inamdar
2015-06-16 18:49 ` Bjorn Helgaas
2015-04-28 7:01 ` [PATCH Part1 v11 5/5] PCI: iproc: " Yijing Wang
2015-04-28 16:38 ` Ray Jui
2015-04-29 1:08 ` Yijing Wang
2015-04-29 1:12 ` Yijing Wang
2015-05-14 8:32 ` [PATCH Part1 v11 0/5] Some cleanup for pcie host drivers Yijing Wang
2015-05-27 16:45 ` Bjorn Helgaas
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=1430204499-19571-2-git-send-email-wangyijing@huawei.com \
--to=wangyijing@huawei.com \
--cc=arnd@arndb.de \
--cc=bhelgaas@google.com \
--cc=dja@axtens.net \
--cc=jason@lakedaemon.net \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-pci@vger.kernel.org \
--cc=thomas.petazzoni@free-electrons.com \
/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).