From patchwork Fri Aug 17 23:36:56 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 178419 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 7E8382C007E for ; Sat, 18 Aug 2012 14:17:56 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758132Ab2HQXg7 (ORCPT ); Fri, 17 Aug 2012 19:36:59 -0400 Received: from mail-ob0-f202.google.com ([209.85.214.202]:34062 "EHLO mail-ob0-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757918Ab2HQXg6 (ORCPT ); Fri, 17 Aug 2012 19:36:58 -0400 Received: by mail-ob0-f202.google.com with SMTP id wc20so3010724obb.1 for ; Fri, 17 Aug 2012 16:36:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=subject:to:from:cc:date:message-id:in-reply-to:references :user-agent:mime-version:content-type:content-transfer-encoding; bh=Bygw7TFTBfqyQv26ASlB166zqY/gU2ssRw+E+dwzHDk=; b=Xu6qeuBpZQ9YNIZEoTb3w0n+YbpvHUJILJr4jB5wzjJ/eRjRbt1iTH3GD+DvDBMPnC hugb7svem8EQfILVg0TVlWwQD4uYo84kVc8Zco7MCR+zUxOlDCtbPVQL2x4Z+QQ4O8Jh 7sy8njq2CVre32D9x8fcsoMzrDfwRTt43kTVHieg+sO/EeOtUAQy7emqH0KPUTZnKncH hyFTvurbtlDydavyISOoKFn+3X+W9jdeGGCrB2h4dcucHH+2/g7WMaU2sk7qkvKAaGNg 0Y+ZuUQfHCkK19bRV9UOsjbC0cf8FOWQI19dE0qdr0iMEiBwICmLPGp2DiEkO5FYVJWx Vz0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=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=Bygw7TFTBfqyQv26ASlB166zqY/gU2ssRw+E+dwzHDk=; b=m0fEtaHm1fYAjmQ0CHJQdxBuMWkFnuQgs8iTrKW56lI8i4g4JwLKf+6dru9tBg5RZt HXD91MridYxRhByqAV4irPJPp7wjqeIPDxdFRKQbvl8W0Vynv48efb4ykyYZjTVwDcH8 6optVNFDal+SdzhsisJi82EI5yHfKOqZPJFA0ZOeHhGXmCApzC2xLBZL1IkAfzC4x4ht UTefbL6p9+WkmUuiXnc3epxdGhL2XkZxg+3jwZ9BO94NrRgkhUuMj/5um2mQLWMF/Q6p n0H8nz6uuXtJpI+GU/UidFOjekFesZmauAacWnA7e29tgh80DeHGb0rO1XPx4VYEphvX OROA== Received: by 10.50.217.134 with SMTP id oy6mr1612119igc.5.1345246617775; Fri, 17 Aug 2012 16:36:57 -0700 (PDT) Received: by 10.50.217.134 with SMTP id oy6mr1612110igc.5.1345246617682; Fri, 17 Aug 2012 16:36:57 -0700 (PDT) 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 mb9si1823289igc.1.2012.08.17.16.36.57 (version=TLSv1/SSLv3 cipher=AES128-SHA); Fri, 17 Aug 2012 16:36:57 -0700 (PDT) Received: from bhelgaas.mtv.corp.google.com (bhelgaas.mtv.corp.google.com [172.18.96.155]) by wpzn4.hot.corp.google.com (Postfix) with ESMTP id 4C4F81E0043; Fri, 17 Aug 2012 16:36:57 -0700 (PDT) Received: from bhelgaas.mtv.corp.google.com (unknown [IPv6:::1]) by bhelgaas.mtv.corp.google.com (Postfix) with ESMTP id EDD431801BB; Fri, 17 Aug 2012 16:36:56 -0700 (PDT) Subject: [PATCH v2 14/16] parisc/PCI: Use list_for_each_entry() for bus->devices traversal To: linux-pci@vger.kernel.org From: Bjorn Helgaas Cc: linux-pcmcia@lists.infradead.org, Yinghai Lu , linux-parisc@vger.kernel.org, Kenji Kaneshige Date: Fri, 17 Aug 2012 17:36:56 -0600 Message-ID: <20120817233656.10973.65389.stgit@bhelgaas.mtv.corp.google.com> In-Reply-To: <20120817233100.10973.59521.stgit@bhelgaas.mtv.corp.google.com> References: <20120817233100.10973.59521.stgit@bhelgaas.mtv.corp.google.com> User-Agent: StGit/0.15 MIME-Version: 1.0 X-Gm-Message-State: ALoCoQnK/JYUUC0DXa3EtIQZqUzSwqMt3m/JgGWks4XTZzrRVvjSqOpOp1NYe7Shx1M0R0mot+bnPPtLQfVT9DD9xh8teA15JRBjpupo29I67DQ0/eJBcAhM5AGvDksU1jPyYKzJXgoMqGkeCJG0UeqmNm2tXJotccGWO8c6/UFcpQIyzlfNdnz0/l+NrvYGjZc8EqtMPu7rQbmxFEur2+TXF9QjXU6fIg== Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Replace list_for_each() + pci_dev_b() with the simpler list_for_each_entry(). Signed-off-by: Bjorn Helgaas CC: linux-parisc@vger.kernel.org --- drivers/parisc/dino.c | 6 ++---- drivers/parisc/lba_pci.c | 7 ++----- 2 files changed, 4 insertions(+), 9 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/drivers/parisc/dino.c b/drivers/parisc/dino.c index ffddc4f..4581ee0 100644 --- a/drivers/parisc/dino.c +++ b/drivers/parisc/dino.c @@ -477,14 +477,12 @@ dino_card_setup(struct pci_bus *bus, void __iomem *base_addr) if (ccio_allocate_resource(dino_dev->hba.dev, res, _8MB, F_EXTEND(0xf0000000UL) | _8MB, F_EXTEND(0xffffffffUL) &~ _8MB, _8MB) < 0) { - struct list_head *ln, *tmp_ln; + struct pci_dev *dev, *tmp; printk(KERN_ERR "Dino: cannot attach bus %s\n", dev_name(bus->bridge)); /* kill the bus, we can't do anything with it */ - list_for_each_safe(ln, tmp_ln, &bus->devices) { - struct pci_dev *dev = pci_dev_b(ln); - + list_for_each_entry_safe(dev, tmp, &bus->devices, bus_list) { list_del(&dev->bus_list); } diff --git a/drivers/parisc/lba_pci.c b/drivers/parisc/lba_pci.c index 4ce57c9..fdd63a6 100644 --- a/drivers/parisc/lba_pci.c +++ b/drivers/parisc/lba_pci.c @@ -629,7 +629,6 @@ truncate_pat_collision(struct resource *root, struct resource *new) static void lba_fixup_bus(struct pci_bus *bus) { - struct list_head *ln; struct pci_dev *dev; #ifdef FBB_SUPPORT u16 status; @@ -711,10 +710,9 @@ lba_fixup_bus(struct pci_bus *bus) } - list_for_each(ln, &bus->devices) { + list_for_each_entry(dev, &bus->devices, bus_list) { int i; - dev = pci_dev_b(ln); DBG("lba_fixup_bus() %s\n", pci_name(dev)); /* Virtualize Device/Bridge Resources. */ @@ -771,8 +769,7 @@ lba_fixup_bus(struct pci_bus *bus) } /* Lastly enable FBB/PERR/SERR on all devices too */ - list_for_each(ln, &bus->devices) { - dev = pci_dev_b(ln); + list_for_each_entry(dev, &bus->devices, bus_list) { (void) pci_read_config_word(dev, PCI_COMMAND, &status); status |= PCI_COMMAND_PARITY | PCI_COMMAND_SERR | fbb_enable; (void) pci_write_config_word(dev, PCI_COMMAND, status);