From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yijing Wang Subject: Re: [PATCH v2 03/30] xen/PCI: Don't use deprecated function pci_scan_bus_parented() Date: Fri, 23 Jan 2015 10:12:16 +0800 Message-ID: <54C1AE00.3020804__49939.3599028282$1421979408$gmane$org@huawei.com> References: <1421800225-26230-1-git-send-email-wangyijing@huawei.com> <1421800225-26230-4-git-send-email-wangyijing@huawei.com> <20150122202523.GC5813@l.oracle.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YETk0-0005k7-TX for xen-devel@lists.xenproject.org; Fri, 23 Jan 2015 02:12:57 +0000 In-Reply-To: <20150122202523.GC5813@l.oracle.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Konrad Rzeszutek Wilk Cc: linux-m68k@vger.kernel.org, linux-ia64@vger.kernel.org, linux-pci@vger.kernel.org, Guan Xuetao , Russell King , x86@kernel.org, Geert Uytterhoeven , Benjamin Herrenschmidt , xen-devel@lists.xenproject.org, Arnd Bergmann , Marc Zyngier , Rusty Russell , Bjorn Helgaas , Thomas Gleixner , Yinghai Lu , linux-arm-kernel@lists.infradead.org, Liviu Dudau , Tony Luck , linux-kernel@vger.kernel.org, Jiang Liu , linux-alpha@vger.kernel.org, "David S. Miller" List-Id: xen-devel@lists.xenproject.org On 2015/1/23 4:25, Konrad Rzeszutek Wilk wrote: > On Wed, Jan 21, 2015 at 08:29:58AM +0800, Yijing Wang wrote: >> From: Arnd Bergmann >> >> Use pci_scan_root_bus() instead of deprecated function >> pci_scan_bus_parented(). >> >> Signed-off-by: Arnd Bergmann >> Signed-off-by: Yijing Wang >> CC: Konrad Rzeszutek Wilk >> CC: xen-devel@lists.xenproject.org > > It looks OK to me thought I need to test it first. Thanks! >> --- >> drivers/pci/xen-pcifront.c | 10 +++++++--- >> 1 files changed, 7 insertions(+), 3 deletions(-) >> >> diff --git a/drivers/pci/xen-pcifront.c b/drivers/pci/xen-pcifront.c >> index b1ffebe..240ddbc 100644 >> --- a/drivers/pci/xen-pcifront.c >> +++ b/drivers/pci/xen-pcifront.c >> @@ -446,6 +446,7 @@ static int pcifront_scan_root(struct pcifront_device *pdev, >> unsigned int domain, unsigned int bus) >> { >> struct pci_bus *b; >> + LIST_HEAD(resources); >> struct pcifront_sd *sd = NULL; >> struct pci_bus_entry *bus_entry = NULL; >> int err = 0; >> @@ -470,17 +471,20 @@ static int pcifront_scan_root(struct pcifront_device *pdev, >> err = -ENOMEM; >> goto err_out; >> } >> + pci_add_resource(&resources, &ioport_resource); >> + pci_add_resource(&resources, &iomem_resource); >> pcifront_init_sd(sd, domain, bus, pdev); >> >> pci_lock_rescan_remove(); >> >> - b = pci_scan_bus_parented(&pdev->xdev->dev, bus, >> - &pcifront_bus_ops, sd); >> + b = pci_scan_root_bus(&pdev->xdev->dev, bus, >> + &pcifront_bus_ops, sd, &resources); >> if (!b) { >> dev_err(&pdev->xdev->dev, >> "Error creating PCI Frontend Bus!\n"); >> err = -ENOMEM; >> pci_unlock_rescan_remove(); >> + pci_free_resource_list(&resources); >> goto err_out; >> } >> >> @@ -488,7 +492,7 @@ static int pcifront_scan_root(struct pcifront_device *pdev, >> >> list_add(&bus_entry->list, &pdev->root_buses); >> >> - /* pci_scan_bus_parented skips devices which do not have a have >> + /* pci_scan_root_bus skips devices which do not have a have >> * devfn==0. The pcifront_scan_bus enumerates all devfn. */ >> err = pcifront_scan_bus(pdev, domain, bus, b); >> >> -- >> 1.7.1 >> > > . > -- Thanks! Yijing