From patchwork Wed Jan 9 17:52:55 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 210808 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 067102C0172 for ; Thu, 10 Jan 2013 04:59:08 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932320Ab3AIR7G (ORCPT ); Wed, 9 Jan 2013 12:59:06 -0500 Received: from mail-vb0-f73.google.com ([209.85.212.73]:34911 "EHLO mail-vb0-f73.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932316Ab3AIR7F (ORCPT ); Wed, 9 Jan 2013 12:59:05 -0500 Received: by mail-vb0-f73.google.com with SMTP id l1so264483vba.2 for ; Wed, 09 Jan 2013 09:59:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:subject:to:from:cc:date:message-id:in-reply-to :references:user-agent:mime-version:content-type :content-transfer-encoding; bh=tLY0ZfCk/lQfops0ZjVD2zf+ja2U159a/jV6Q+b0Pds=; b=S/Wta+Dk9CNXP9tX5ZCjiOi5DP6ELfAFtnI0BNWtIad1zXNbZRYXK6Co/7sGKLtm7z Nqpxd+yR+IOL7w1yMHj6zKQH9yAtfKd5bRrdXowqiIQgyseC4ShZ/R47tzInvaUmUCu6 KQDG7Ayfl72ybK8rHeuXc3c/9QTnkNnrHTiYO0ESt3Fwzs2rma3Sg9ADx8okzllfxnrF w8u+P5twfespkIG63jK8ILwto/1TRL53ZZcrbqyDb6Pm9tAYjaQXx2AtDltLz8pvqZ1S IrHiFriELfWBoJ7VngHwXFCT+qxeF1azcEembOlopnPzN19ENScY0wcE4prjYbj4iVXQ CbiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:subject:to:from:cc:date:message-id:in-reply-to :references:user-agent:mime-version:content-type :content-transfer-encoding:x-gm-message-state; bh=tLY0ZfCk/lQfops0ZjVD2zf+ja2U159a/jV6Q+b0Pds=; b=kpl6ZPH8iGu0WmbpKmmdyoohRBklM18l6OReHFndz+nKPlRym1xfWrxiIfWTdyS9+U BVYs+ETUoKdVJFyNb5pah0m9agBbMgtmecmB//xiEMrU+tisZqx3aRxH7G4nw9fduGP0 M7sW4YMUQS2RyPLztPgJImWAXCOTH1Sg29QlXhUydMkNiR1mbK7O+4d8p2zGm1e2xs0i ktk05SMP8PE8h279CEMmsDOujPuN5ons2o7hn74+j0PNhZuehRSAWJ6n1HhDGPvnmoid JTkB0DrD32xqrvuS2duE09jxJYsOG7PDwK6XQbltCI0XWqHNhRHterauTkPTO/vz76od 8/Lw== X-Received: by 10.236.59.8 with SMTP id r8mr37849455yhc.8.1357753975681; Wed, 09 Jan 2013 09:52:55 -0800 (PST) Received: from wpzn4.hot.corp.google.com (216-239-44-65.google.com [216.239.44.65]) by gmr-mx.google.com with ESMTPS id p19si5826018yhi.1.2013.01.09.09.52.55 (version=TLSv1/SSLv3 cipher=AES128-SHA); Wed, 09 Jan 2013 09:52:55 -0800 (PST) Received: from bhelgaas.mtv.corp.google.com (bhelgaas.mtv.corp.google.com [172.17.131.112]) by wpzn4.hot.corp.google.com (Postfix) with ESMTP id 929E282004A; Wed, 9 Jan 2013 09:52:55 -0800 (PST) Received: from bhelgaas.mtv.corp.google.com (unknown [IPv6:::1]) by bhelgaas.mtv.corp.google.com (Postfix) with ESMTP id 4D11E180190; Wed, 9 Jan 2013 09:52:55 -0800 (PST) Subject: [PATCH 1/5] x86/PCI: Remove unused pci_root_bus To: linux-pci@vger.kernel.org From: Bjorn Helgaas Cc: David Howells , Koichi Yasutake , x86@kernel.org Date: Wed, 09 Jan 2013 10:52:55 -0700 Message-ID: <20130109175255.13904.16833.stgit@bhelgaas.mtv.corp.google.com> In-Reply-To: <20130109175151.13904.84252.stgit@bhelgaas.mtv.corp.google.com> References: <20130109175151.13904.84252.stgit@bhelgaas.mtv.corp.google.com> User-Agent: StGit/0.15 MIME-Version: 1.0 X-Gm-Message-State: ALoCoQlAklOo9S8mqFyB+AAljCMMJ7RjPtZVeLibYAB8RYcu2CBSE7oWmLzFMO77JMnMOE1A0oE7m0n3RSnueXJfYOOunbPgScA2Euli/WdUWiQkKr+Cxi7Zv72LGcXL7grGiZFdilZLmiI6ZqtY76SSuFRCthEtKsH6C7lZzXqw0IJiIsOLeSCEv2yLURDSJ+0Q6GJYLGMKVdDuplP8m0sQXBmQZsftWA== Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org pci_root_bus is unused, so remove all references to it. Signed-off-by: Bjorn Helgaas --- arch/x86/include/asm/pci_x86.h | 1 - arch/x86/pci/common.c | 1 - arch/x86/pci/legacy.c | 2 +- arch/x86/pci/numaq_32.c | 2 +- 4 files changed, 2 insertions(+), 4 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/arch/x86/include/asm/pci_x86.h b/arch/x86/include/asm/pci_x86.h index 73e8eef..0126f10 100644 --- a/arch/x86/include/asm/pci_x86.h +++ b/arch/x86/include/asm/pci_x86.h @@ -54,7 +54,6 @@ void pcibios_set_cache_line_size(void); /* pci-pc.c */ extern int pcibios_last_bus; -extern struct pci_bus *pci_root_bus; extern struct pci_ops pci_root_ops; void pcibios_scan_specific_bus(int busn); diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c index 412e128..505731b 100644 --- a/arch/x86/pci/common.c +++ b/arch/x86/pci/common.c @@ -34,7 +34,6 @@ int noioapicreroute = 1; #endif int pcibios_last_bus = -1; unsigned long pirq_table_addr; -struct pci_bus *pci_root_bus; const struct pci_raw_ops *__read_mostly raw_pci_ops; const struct pci_raw_ops *__read_mostly raw_pci_ext_ops; diff --git a/arch/x86/pci/legacy.c b/arch/x86/pci/legacy.c index a1df191..a9e8308 100644 --- a/arch/x86/pci/legacy.c +++ b/arch/x86/pci/legacy.c @@ -30,7 +30,7 @@ int __init pci_legacy_init(void) } printk("PCI: Probing PCI hardware\n"); - pci_root_bus = pcibios_scan_root(0); + pcibios_scan_root(0); return 0; } diff --git a/arch/x86/pci/numaq_32.c b/arch/x86/pci/numaq_32.c index 83e125b..00edfe6 100644 --- a/arch/x86/pci/numaq_32.c +++ b/arch/x86/pci/numaq_32.c @@ -152,7 +152,7 @@ int __init pci_numaq_init(void) raw_pci_ops = &pci_direct_conf1_mq; - pci_root_bus = pcibios_scan_root(0); + pcibios_scan_root(0); if (num_online_nodes() > 1) for_each_online_node(quad) { if (quad == 0)