From patchwork Wed Nov 19 07:32:48 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: wangyijing X-Patchwork-Id: 41099 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f69.google.com (mail-la0-f69.google.com [209.85.215.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 994F020CBB for ; Wed, 19 Nov 2014 06:54:50 +0000 (UTC) Received: by mail-la0-f69.google.com with SMTP id gd6sf1104318lab.0 for ; Tue, 18 Nov 2014 22:54:49 -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:subject:date:message-id :in-reply-to:references:mime-version:cc:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :sender:errors-to:x-original-sender :x-original-authentication-results:mailing-list:content-type :content-transfer-encoding; bh=ODieEu75Id4Bu0aR7nUr+2t5GpRi6lV+0cx22HA2G2c=; b=BjDLXdqOLXn7/Jc8y3zFQB49RB9iy1v1i5Bhh691AD4lqj8Fy9MFANFdk0FmFJAJ8I 4vfLwAvGgyGFNdsPYH+t4QjhgPB/qAHrjtH1zRWvuryWxRZjXZ/tuxDFrec6rLlk+BY4 K40BqZnVDC6UyG6P926ECLyW3kXpTzeNHx93iO7JCVOknioO3ofP7n97LhKTE/eEzRwG xHWyTDq6/Rs6YyrSPpwemEtRmVK/SoBPs6+qZY0ExLF1V5tp6Xr+JKyq5jBsbEisdT+V 8vlsTc7PS+BXtFlbzQMp+cQrwYOCEGRGGbyBg2lK+j+eYDYiq+g+mBAfMXsNPLPEU64b ueAA== X-Gm-Message-State: ALoCoQm+pkkgVzxyb6scX66kfiifj0CL1bziyoG/6IvtmWqBcsSBx51sC7MaOPdgw+VuQvEi4BMu X-Received: by 10.112.143.136 with SMTP id se8mr17874lbb.18.1416380089558; Tue, 18 Nov 2014 22:54:49 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.5.227 with SMTP id v3ls1462872lav.91.gmail; Tue, 18 Nov 2014 22:54:49 -0800 (PST) X-Received: by 10.152.26.131 with SMTP id l3mr3706406lag.49.1416380089285; Tue, 18 Nov 2014 22:54:49 -0800 (PST) Received: from mail-lb0-f180.google.com (mail-lb0-f180.google.com. [209.85.217.180]) by mx.google.com with ESMTPS id z7si841713lag.18.2014.11.18.22.54.49 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 18 Nov 2014 22:54:49 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.180 as permitted sender) client-ip=209.85.217.180; Received: by mail-lb0-f180.google.com with SMTP id z11so12063542lbi.11 for ; Tue, 18 Nov 2014 22:54:49 -0800 (PST) X-Received: by 10.152.7.193 with SMTP id l1mr3706099laa.57.1416380088980; Tue, 18 Nov 2014 22:54:48 -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 ew9csp37184lbc; Tue, 18 Nov 2014 22:54:48 -0800 (PST) X-Received: by 10.66.145.166 with SMTP id sv6mr17719792pab.140.1416380086303; Tue, 18 Nov 2014 22:54:46 -0800 (PST) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id wv1si1108925pab.224.2014.11.18.22.54.45 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 18 Nov 2014 22:54:46 -0800 (PST) Received-SPF: none (google.com: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org does not designate permitted sender hosts) client-ip=2001:1868:205::9; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Xqz8i-0003JC-B4; Wed, 19 Nov 2014 06:53:20 +0000 Received: from szxga01-in.huawei.com ([119.145.14.64]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Xqz8R-0003GO-Tr for linux-arm-kernel@lists.infradead.org; Wed, 19 Nov 2014 06:53:05 +0000 Received: from 172.24.2.119 (EHLO szxeml450-hub.china.huawei.com) ([172.24.2.119]) by szxrg01-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id CEQ74303; Wed, 19 Nov 2014 14:51:50 +0800 (CST) Received: from localhost.localdomain (10.175.100.166) by szxeml450-hub.china.huawei.com (10.82.67.193) with Microsoft SMTP Server id 14.3.158.1; Wed, 19 Nov 2014 14:51:42 +0800 From: Yijing Wang To: Bjorn Helgaas Subject: [PATCH 4/5] PCI: Remove pci_scan_bus() and pci_scan_bus_parented() Date: Wed, 19 Nov 2014 15:32:48 +0800 Message-ID: <1416382369-13587-5-git-send-email-wangyijing@huawei.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1416382369-13587-1-git-send-email-wangyijing@huawei.com> References: <1416382369-13587-1-git-send-email-wangyijing@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.100.166] X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141118_225304_374161_DF0F922D X-CRM114-Status: UNSURE ( 9.64 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [119.145.14.64 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [119.145.14.64 listed in wl.mailspike.net] -0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders Cc: Liviu Dudau , Tony Luck , Russell King , Arnd Bergmann , linux-pci@vger.kernel.org, x86@kernel.org, Geert Uytterhoeven , Yijing Wang , linux-ia64@vger.kernel.org, Thomas Gleixner , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.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.180 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 Clean out pci_scan_bus() and pci_scan_bus_parented(). Signed-off-by: Yijing Wang --- drivers/pci/probe.c | 38 -------------------------------------- include/linux/pci.h | 3 --- 2 files changed, 0 insertions(+), 41 deletions(-) diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index a8d90d4..79775b5 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -2107,44 +2107,6 @@ struct pci_bus *pci_scan_bus_simple(struct device *parent, } EXPORT_SYMBOL(pci_scan_bus_simple); -/* 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); - -struct pci_bus *pci_scan_bus(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(NULL, bus, ops, sysdata, &resources); - if (b) { - pci_scan_child_bus(b); - } else { - pci_free_resource_list(&resources); - } - return b; -} -EXPORT_SYMBOL(pci_scan_bus); - /** * pci_rescan_bus_bridge_resize - scan a PCI bus for devices. * @bridge: PCI bridge for the bus to scan diff --git a/include/linux/pci.h b/include/linux/pci.h index befefbd..9ebc908 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -767,11 +767,8 @@ 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_scan_bus_simple(struct device *parent, int bus, struct pci_ops *ops, void *sysdata); -struct pci_bus *pci_scan_bus(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);