From patchwork Sun Jan 27 19:23:33 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yinghai Lu X-Patchwork-Id: 2052161 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 679133FD49 for ; Sun, 27 Jan 2013 19:24:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755321Ab3A0TYR (ORCPT ); Sun, 27 Jan 2013 14:24:17 -0500 Received: from aserp1040.oracle.com ([141.146.126.69]:32288 "EHLO aserp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755311Ab3A0TYQ (ORCPT ); Sun, 27 Jan 2013 14:24:16 -0500 Received: from acsinet22.oracle.com (acsinet22.oracle.com [141.146.126.238]) by aserp1040.oracle.com (Sentrion-MTA-4.3.1/Sentrion-MTA-4.3.1) with ESMTP id r0RJO4ZR009014 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Sun, 27 Jan 2013 19:24:05 GMT Received: from acsmt357.oracle.com (acsmt357.oracle.com [141.146.40.157]) by acsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id r0RJO4v1022797 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sun, 27 Jan 2013 19:24:04 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 r0RJO4lX005116; Sun, 27 Jan 2013 13:24:04 -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:03 -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 Subject: [PATCH v3 06/22] PCI, hotplug: Kill pci_find_next_bus in sgi_hotplug Date: Sun, 27 Jan 2013 11:23:33 -0800 Message-Id: <1359314629-18651-7-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: acsinet22.oracle.com [141.146.126.238] 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 --- drivers/pci/hotplug/sgi_hotplug.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/pci/hotplug/sgi_hotplug.c b/drivers/pci/hotplug/sgi_hotplug.c index 180e760..ea81618 100644 --- a/drivers/pci/hotplug/sgi_hotplug.c +++ b/drivers/pci/hotplug/sgi_hotplug.c @@ -669,7 +669,7 @@ alloc_err: static int __init sn_pci_hotplug_init(void) { - struct pci_bus *pci_bus = NULL; + struct pci_host_bridge *host_bridge = NULL; int rc; int registered = 0; @@ -681,7 +681,9 @@ static int __init sn_pci_hotplug_init(void) INIT_LIST_HEAD(&sn_hp_list); - while ((pci_bus = pci_find_next_bus(pci_bus))) { + for_each_pci_host_bridge(host_bridge) { + struct pci_bus *pci_bus = host_bridge->bus; + if (!pci_bus->sysdata) continue;