From patchwork Sun Jan 27 19:23:36 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yinghai Lu X-Patchwork-Id: 2052191 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id D33B03FD49 for ; Sun, 27 Jan 2013 19:24:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755384Ab3A0TYT (ORCPT ); Sun, 27 Jan 2013 14:24:19 -0500 Received: from userp1040.oracle.com ([156.151.31.81]:38258 "EHLO userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755326Ab3A0TYS (ORCPT ); Sun, 27 Jan 2013 14:24:18 -0500 Received: from ucsinet21.oracle.com (ucsinet21.oracle.com [156.151.31.93]) by userp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id r0RJO8wD001963 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Sun, 27 Jan 2013 19:24:08 GMT Received: from acsmt357.oracle.com (acsmt357.oracle.com [141.146.40.157]) by ucsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id r0RJO74S000025 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sun, 27 Jan 2013 19:24:08 GMT Received: from abhmt120.oracle.com (abhmt120.oracle.com [141.146.116.72]) by acsmt357.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id r0RJO7Eh005150; Sun, 27 Jan 2013 13:24:07 -0600 Received: from linux-siqj.site (/75.36.243.194) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Sun, 27 Jan 2013 11:24:07 -0800 From: Yinghai Lu To: Bjorn Helgaas , Jiang Liu , "Rafael J. Wysocki" , Taku Izumi , Toshi Kani Cc: "Greg Kroah-Hartman" , linux-pci@vger.kernel.org, Yinghai Lu , x86@kernel.org Subject: [PATCH v3 09/22] PCI, x86: Kill pci_find_next_bus in pcibios_scan_root Date: Sun, 27 Jan 2013 11:23:36 -0800 Message-Id: <1359314629-18651-10-git-send-email-yinghai@kernel.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1359314629-18651-1-git-send-email-yinghai@kernel.org> References: <1359314629-18651-1-git-send-email-yinghai@kernel.org> X-Source-IP: ucsinet21.oracle.com [156.151.31.93] Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Replace that with hotplug-safe version for iteration. Signed-off-by: Yinghai Lu Cc: x86@kernel.org --- arch/x86/pci/common.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c index 505731b..b4b4032 100644 --- a/arch/x86/pci/common.c +++ b/arch/x86/pci/common.c @@ -447,11 +447,14 @@ void __init dmi_check_pciprobe(void) struct pci_bus * __devinit pcibios_scan_root(int busnum) { - struct pci_bus *bus = NULL; + struct pci_host_bridge *host_bridge = NULL; + struct pci_bus *bus; - while ((bus = pci_find_next_bus(bus)) != NULL) { - if (bus->number == busnum) { + for_each_pci_host_bridge(host_bridge) { + if (host_bridge->bus->number == busnum) { /* Already scanned */ + bus = host_bridge->bus; + put_device(&host_bridge->dev); return bus; } }