From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bjorn Helgaas Subject: Re: [PATCH v4 23/30] PCI/mvebu: Use pci_common_init_dev() to simplify code Date: Mon, 2 Mar 2015 21:30:08 -0600 Message-ID: <20150303033008.GL11978@google.com> References: <1424938344-4017-1-git-send-email-wangyijing@huawei.com> <1424938344-4017-24-git-send-email-wangyijing@huawei.com> Mime-Version: 1.0 Return-path: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; bh=yVvVFNcD4dq4/UScIMdUf7eDKDzvP7Ps3sNw7rk7quA=; b=baRiZyg1qlDnbhYaU8SFO8fBzH3z7RoELE7we5dBuC3aaWoaJXyzSCG/PqQDKfjF2B eCmaBnCJ9Wapzi6MZ3o4mDywetCzEzkK+vJy80DQ6x/zDBfoEV395jJTevwdxEIAog92 yIhG4o2ZkeSZNxec3pVy1QSQKo8Bg+/thKDSOK/0VRqFbJaiMVQTum8mzmkhGdK7QAi0 HAJytyCVwdNRKdg+eEtEQRIL6mi3mfM0cgkN5Ltd+q/bOH/EQFcGeGOv5NMk/oG1pe6U ckuA0Obr+uws98AGIKrQSynjMZ0/iibY0wlbhpFQnANPOz/5p+FMFa1wlEN5ndNGJc3E JO2Q== Content-Disposition: inline In-Reply-To: <1424938344-4017-24-git-send-email-wangyijing@huawei.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Yijing Wang Cc: Jiang Liu , linux-pci@vger.kernel.org, Yinghai Lu , linux-kernel@vger.kernel.org, Marc Zyngier , linux-arm-kernel@lists.infradead.org, Russell King , x86@kernel.org, Thomas Gleixner , Benjamin Herrenschmidt , Rusty Russell , Tony Luck , linux-ia64@vger.kernel.org, "David S. Miller" , Guan Xuetao , linux-alpha@vger.kernel.org, linux-m68k@lists.linux-m68k.org, Liviu Dudau , Arnd Bergmann , Geert Uytterhoeven , Thomas Petazzoni , Jason Cooper On Thu, Feb 26, 2015 at 04:12:17PM +0800, Yijing Wang wrote: > 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. > > Signed-off-by: Yijing Wang > CC: Thomas Petazzoni > CC: Jason Cooper > --- > 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 1309cfb..d5a2b70 100644 > --- a/drivers/pci/host/pci-mvebu.c > +++ b/drivers/pci/host/pci-mvebu.c > @@ -750,21 +750,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, > @@ -808,12 +793,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); I'm not necessarily opposed to this, but it seems unrelated to the rest of the series. And I think it changes the behavior slightly (now we call pci_common_init_dev() with &pcie->pdev->dev instead of NULL). So I'll wait for an ack from Thomas and/or Jason. > } > > /* > -- > 1.7.1 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/