From patchwork Fri Jun 21 16:12:48 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiang Liu X-Patchwork-Id: 253262 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 2E1FE2C0394 for ; Sat, 22 Jun 2013 02:13:54 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1423312Ab3FUQNR (ORCPT ); Fri, 21 Jun 2013 12:13:17 -0400 Received: from mail-pa0-f47.google.com ([209.85.220.47]:55232 "EHLO mail-pa0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1423279Ab3FUQNP (ORCPT ); Fri, 21 Jun 2013 12:13:15 -0400 Received: by mail-pa0-f47.google.com with SMTP id kl14so8045912pab.34 for ; Fri, 21 Jun 2013 09:13:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=00A/Ogsk6GXsCV06BwAOuehglTLs3f/tA2VD7oM7xxU=; b=UAsoxEbUIMqr4+CBGVxL1pMrsxZJB0q3SGD4Xuflh5wtuac4hypooP8r3lRHDPxi8F qwfXxJczrt3yFrYx7eGUrnKSZwk8/ZLJF8zrz4CDbYfr9rMLUmpNKJ0JVQTwXXUt5oui 1g6U7i7BP5JmpNXPQVQs3jqR/TpQBkyqXJzQaiWHT0X2JpMK8BKtGqbxP8zuwRjKaQ/p CIO4lbLC05KTjZ1XjqX73C5kk1snipA292yveIVsHZ25nxg/D/fi0EygRRN4jG29nHNY 2dYa/bQqErdgwUmN/cCLYyCtA7ZOuUY1n1vrDDx8WT2jiNEYn0JQgzzvyqtRbcmyVKpT nwaA== X-Received: by 10.68.137.8 with SMTP id qe8mr1453815pbb.100.1371831194815; Fri, 21 Jun 2013 09:13:14 -0700 (PDT) Received: from localhost.localdomain ([120.196.98.106]) by mx.google.com with ESMTPSA id fm2sm6257244pab.13.2013.06.21.09.13.10 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 21 Jun 2013 09:13:13 -0700 (PDT) From: Jiang Liu To: Bjorn Helgaas , Konrad Rzeszutek Wilk , Jeremy Fitzhardinge Cc: liuj97@gmail.com, Jiang Liu , Yijing Wang , xen-devel@lists.xensource.com, virtualization@lists.linux-foundation.org, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Chris Metcalf , Greg Kroah-Hartman , Thierry Reding Subject: [PATCH v2 3/3] PCI: kill pci_scan_bus_parented() Date: Sat, 22 Jun 2013 00:12:48 +0800 Message-Id: <1371831169-17291-4-git-send-email-liuj97@gmail.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1371831169-17291-1-git-send-email-liuj97@gmail.com> References: <1371831169-17291-1-git-send-email-liuj97@gmail.com> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org From: Jiang Liu Now there's no caller of pci_scan_bus_parented(), so kill it. Signed-off-by: Jiang Liu Cc: Chris Metcalf Cc: Greg Kroah-Hartman Cc: Thierry Reding Cc: linux-kernel@vger.kernel.org Cc: linux-pci@vger.kernel.org --- arch/tile/kernel/pci.c | 3 --- drivers/pci/probe.c | 19 ------------------- include/linux/pci.h | 2 -- 3 files changed, 24 deletions(-) diff --git a/arch/tile/kernel/pci.c b/arch/tile/kernel/pci.c index 67237d3..936e087 100644 --- a/arch/tile/kernel/pci.c +++ b/arch/tile/kernel/pci.c @@ -309,9 +309,6 @@ int __init pcibios_init(void) * * It reads the PCI tree for this bus into the Linux * data structures. - * - * This is inlined in linux/pci.h and calls into - * pci_scan_bus_parented() in probe.c. */ pci_add_resource(&resources, &ioport_resource); pci_add_resource(&resources, &iomem_resource); diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index ed768d8..af30772 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -1901,25 +1901,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); - struct pci_bus *pci_scan_bus(int bus, struct pci_ops *ops, void *sysdata) { diff --git a/include/linux/pci.h b/include/linux/pci.h index f1229c7..41ec0a5 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -720,8 +720,6 @@ void pcibios_bus_to_resource(struct pci_dev *dev, 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(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,