From patchwork Mon Nov 17 10:21:39 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: wangyijing X-Patchwork-Id: 40882 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ee0-f70.google.com (mail-ee0-f70.google.com [74.125.83.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id A6AFB24035 for ; Mon, 17 Nov 2014 09:41:29 +0000 (UTC) Received: by mail-ee0-f70.google.com with SMTP id b57sf716457eek.1 for ; Mon, 17 Nov 2014 01:41:28 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe:content-type; bh=KuJKMkPe5zoPlxwwOmrYlk2t6hScqCGo5URHOpgRc2M=; b=F3frg8ttgMfoi2Lpe094VsZKc2p9csKjkptyXv3EJXlSmDa2SQzlzxNHMzVQCyT1yR iQe8wRU+RTh/aaf0jtbhUNj1E+ufWYFxogjXkODuLbfhDaMI8p9ydrsxOTeqFcC4raGR l5H3udW2oyo33FmiOp89vmPh3zxQOLpBnD2sRAy+VgJ65OgR61iErZnNASMimSwxiemK EqDZdEBOkwkF4sMQCw90P+JNLuYsNsLaWisE3iSlkF6rGxJAW+BqZK8qD/UvOzeC+UL9 GI/YBZI1RHRFcwq7kwF3iujJdvZeH65OsZEsV8mBlzqhTk2p77i/ee2iGOL61R3bh+Td dU6w== X-Gm-Message-State: ALoCoQlv2T7pgidmZRfS15aw0dRslfdnhxluPItwmO9DxD3cn5QBnenSFXPyD7EaDxJQmLgnmnnA X-Received: by 10.152.30.66 with SMTP id q2mr13695790lah.2.1416217288869; Mon, 17 Nov 2014 01:41:28 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.87.46 with SMTP id u14ls1079781laz.96.gmail; Mon, 17 Nov 2014 01:41:28 -0800 (PST) X-Received: by 10.112.16.39 with SMTP id c7mr25735400lbd.19.1416217288464; Mon, 17 Nov 2014 01:41:28 -0800 (PST) Received: from mail-lb0-f175.google.com (mail-lb0-f175.google.com. [209.85.217.175]) by mx.google.com with ESMTPS id p7si3753238lah.114.2014.11.17.01.41.28 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 17 Nov 2014 01:41:28 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.175 as permitted sender) client-ip=209.85.217.175; Received: by mail-lb0-f175.google.com with SMTP id n15so15496176lbi.6 for ; Mon, 17 Nov 2014 01:41:28 -0800 (PST) X-Received: by 10.112.14.69 with SMTP id n5mr26052817lbc.34.1416217288378; Mon, 17 Nov 2014 01:41:28 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.184.201 with SMTP id ew9csp1127179lbc; Mon, 17 Nov 2014 01:41:27 -0800 (PST) X-Received: by 10.68.68.206 with SMTP id y14mr457762pbt.165.1416217286238; Mon, 17 Nov 2014 01:41:26 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ks5si34825505pdb.42.2014.11.17.01.41.25 for ; Mon, 17 Nov 2014 01:41:26 -0800 (PST) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752201AbaKQJlD (ORCPT + 26 others); Mon, 17 Nov 2014 04:41:03 -0500 Received: from szxga01-in.huawei.com ([119.145.14.64]:43133 "EHLO szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751090AbaKQJkw (ORCPT ); Mon, 17 Nov 2014 04:40:52 -0500 Received: from 172.24.2.119 (EHLO szxeml462-hub.china.huawei.com) ([172.24.2.119]) by szxrg01-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id CEO10116; Mon, 17 Nov 2014 17:40:42 +0800 (CST) Received: from localhost.localdomain (10.175.100.166) by szxeml462-hub.china.huawei.com (10.82.67.205) with Microsoft SMTP Server id 14.3.158.1; Mon, 17 Nov 2014 17:40:31 +0800 From: Yijing Wang To: Bjorn Helgaas CC: , , Xinwei Hu , Wuyun , , Russell King , , Thomas Gleixner , Benjamin Herrenschmidt , , Tony Luck , , Thierry Reding , Liviu Dudau , , Yijing Wang Subject: [RFC PATCH 05/16] PCI: Use pci_scan_root_bus() instead of pci_scan_bus_parented() Date: Mon, 17 Nov 2014 18:21:39 +0800 Message-ID: <1416219710-26088-6-git-send-email-wangyijing@huawei.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1416219710-26088-1-git-send-email-wangyijing@huawei.com> References: <1416219710-26088-1-git-send-email-wangyijing@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.100.166] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: wangyijing@huawei.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.175 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Now we can remove the deprecated pci_scan_bus_parented(), and use pci_scan_root_bus() instead. Signed-off-by: Yijing Wang --- drivers/pci/probe.c | 19 ------------------- drivers/pci/xen-pcifront.c | 6 +++--- include/linux/pci.h | 2 -- 3 files changed, 3 insertions(+), 24 deletions(-) diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 97711f3..623bfff 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -2105,25 +2105,6 @@ struct pci_bus *pci_scan_root_bus(struct device *parent, int bus, } EXPORT_SYMBOL(pci_scan_root_bus); -/* Deprecated; use pci_scan_root_bus() instead */ -struct pci_bus *pci_scan_bus_parented(struct device *parent, - int bus, struct pci_ops *ops, void *sysdata) -{ - LIST_HEAD(resources); - struct pci_bus *b; - - pci_add_resource(&resources, &ioport_resource); - pci_add_resource(&resources, &iomem_resource); - pci_add_resource(&resources, &busn_resource); - b = pci_create_root_bus(parent, bus, ops, sysdata, &resources); - if (b) - pci_scan_child_bus(b); - else - pci_free_resource_list(&resources); - return b; -} -EXPORT_SYMBOL(pci_scan_bus_parented); - /** * pci_rescan_bus_bridge_resize - scan a PCI bus for devices. * @bridge: PCI bridge for the bus to scan diff --git a/drivers/pci/xen-pcifront.c b/drivers/pci/xen-pcifront.c index 116ca37..fa2e312 100644 --- a/drivers/pci/xen-pcifront.c +++ b/drivers/pci/xen-pcifront.c @@ -474,8 +474,8 @@ static int pcifront_scan_root(struct pcifront_device *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, NULL); if (!b) { dev_err(&pdev->xdev->dev, "Error creating PCI Frontend Bus!\n"); @@ -488,7 +488,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); diff --git a/include/linux/pci.h b/include/linux/pci.h index f8045d6..4daef65 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -767,8 +767,6 @@ void pcibios_bus_to_resource(struct pci_bus *bus, struct resource *res, void pcibios_scan_specific_bus(int busn); struct pci_bus *pci_find_bus(int domain, int busnr); void pci_bus_add_devices(const struct pci_bus *bus); -struct pci_bus *pci_scan_bus_parented(struct device *parent, int bus, - struct pci_ops *ops, void *sysdata); struct pci_bus *pci_create_root_bus(struct device *parent, int bus, struct pci_ops *ops, void *sysdata, struct list_head *resources);