From patchwork Sun May 26 15:53:03 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiang Liu X-Patchwork-Id: 2616601 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 2E69DDFB79 for ; Sun, 26 May 2013 16:01:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754282Ab3EZP5n (ORCPT ); Sun, 26 May 2013 11:57:43 -0400 Received: from mail-pa0-f44.google.com ([209.85.220.44]:40078 "EHLO mail-pa0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754086Ab3EZP5l (ORCPT ); Sun, 26 May 2013 11:57:41 -0400 Received: by mail-pa0-f44.google.com with SMTP id wp1so3427385pac.17 for ; Sun, 26 May 2013 08:57:40 -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=Le5py2Ftm/xc31glpoDNE5Q9p+1vaO97D8Y3fVe2pZM=; b=CddR13GADyGRD/NQ78cjhg+0cjSy3rI63RsEotosw3V6J4CTbymGLOrWknsOsiRfrZ QMUipzwtaP4GzkEASzCEAuP9tgWhXU+jFAYucEI8PYFTDC0w951B00GQf/0HIUA0vKl/ DtXSOOsgl5NxhuUTkPzxZWp50Fd1PfLerrdaUBcYuNvFpaLhPaQcCEJFkFumOEmcF96L j0bwzVESI4jcL9FxfoHnXr43ZgdMnDBwCqK03hHQ0MM4wnP9t1EbbhPymNv21nRfIX7g qUaAgmlZ5eHB06R4h11kMYVDNHMhpKUssAhICm0pBreBtcR5IMuLhy+NogFOFecjcEiW qPtQ== X-Received: by 10.68.130.167 with SMTP id of7mr26456301pbb.169.1369583860357; Sun, 26 May 2013 08:57:40 -0700 (PDT) Received: from localhost.localdomain ([111.196.197.202]) by mx.google.com with ESMTPSA id ze11sm26603189pab.22.2013.05.26.08.57.35 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 26 May 2013 08:57:39 -0700 (PDT) From: Jiang Liu To: Bjorn Helgaas , Yinghai Lu Cc: Jiang Liu , "Rafael J . Wysocki" , Greg Kroah-Hartman , Gu Zheng , Toshi Kani , Myron Stowe , Yijing Wang , Jiang Liu , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, David Howells , Sebastian Andrzej Siewior Subject: [PATCH v3, part2 06/20] PCI, FRV: use hotplug-safe iterators to walk PCI buses Date: Sun, 26 May 2013 23:53:03 +0800 Message-Id: <1369583597-3801-7-git-send-email-jiang.liu@huawei.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1369583597-3801-1-git-send-email-jiang.liu@huawei.com> References: <1369583597-3801-1-git-send-email-jiang.liu@huawei.com> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Enhance FRV architecture specific code to use hotplug-safe iterators to walk PCI buses. Signed-off-by: Jiang Liu Cc: David Howells Cc: Jiang Liu Cc: Bjorn Helgaas Cc: Greg Kroah-Hartman Cc: Sebastian Andrzej Siewior Cc: Yinghai Lu Cc: linux-kernel@vger.kernel.org --- arch/frv/mb93090-mb00/pci-frv.c | 5 ++++- arch/frv/mb93090-mb00/pci-vdk.c | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/arch/frv/mb93090-mb00/pci-frv.c b/arch/frv/mb93090-mb00/pci-frv.c index c281217..48ee89a 100644 --- a/arch/frv/mb93090-mb00/pci-frv.c +++ b/arch/frv/mb93090-mb00/pci-frv.c @@ -188,8 +188,11 @@ static void __init pcibios_assign_resources(void) void __init pcibios_resource_survey(void) { + struct pci_bus *bus; + DBG("PCI: Allocating resources\n"); - pcibios_allocate_bus_resources(&pci_root_buses); + for_each_pci_root_bus(bus) + pcibios_allocate_bus_resources(&bus->children); pcibios_allocate_resources(0); pcibios_allocate_resources(1); pcibios_assign_resources(); diff --git a/arch/frv/mb93090-mb00/pci-vdk.c b/arch/frv/mb93090-mb00/pci-vdk.c index 0aa35f0..f1d6c16 100644 --- a/arch/frv/mb93090-mb00/pci-vdk.c +++ b/arch/frv/mb93090-mb00/pci-vdk.c @@ -234,7 +234,7 @@ static void __init pcibios_fixup_peer_bridges(void) return; printk("PCI: Peer bridge fixup\n"); for (n=0; n <= pcibios_last_bus; n++) { - if (pci_find_bus(0, n)) + if (pci_bus_exists(0, n)) continue; bus.number = n; bus.ops = pci_root_ops;