From nobody Fri May 3 12:23:33 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass header.i=@intel.com; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=linux.intel.com ARC-Seal: i=1; a=rsa-sha256; t=1678468473; cv=none; d=zohomail.com; s=zohoarc; b=Ha0iGpYNMUKG7jRwDBO1aL8JCU28//6RpOd0OBMMuv2YZ9CGDJLOFy9xIRBoytPSVtngsxSr8PG9QvCKlMOVEguJe08ChRtlsqXN5v9IBJV1OAOE2oY4yynK9ETkl8hyO5sppN+H3YMB8e2UjEw2vnMugn8C/24F52TuYGj+KtE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1678468473; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=TQvLTEqPhM9jr5jl902GUEbyIFm8u1p8xxKiD+k6hmI=; b=L114cNGvGU0bh/yPNfLFavdqa/7D9JL4s6DRNYanfQsu0F3prws5kULi9vzfZ2EtQd+sn8go09P9Q2cMv6qf8AfKcox0Wc9yxg2dyAUPQeybXGyYXjwaYjs/9lNmfjolxCwCHMPElEclQQwn+/ROd4d3qHNuT9roxhN+LyOw98U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=@intel.com; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1678468473499595.867285092521; Fri, 10 Mar 2023 09:14:33 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.508544.783322 (Exim 4.92) (envelope-from ) id 1pagJr-0004jH-Ht; Fri, 10 Mar 2023 17:14:15 +0000 Received: by outflank-mailman (output) from mailman id 508544.783322; Fri, 10 Mar 2023 17:14:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pagJr-0004iR-Al; Fri, 10 Mar 2023 17:14:15 +0000 Received: by outflank-mailman (input) for mailman id 508544; Fri, 10 Mar 2023 17:14:14 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pagJp-0003j4-Me for xen-devel@lists.xenproject.org; Fri, 10 Mar 2023 17:14:14 +0000 Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id f944201c-bf66-11ed-87f5-c1b5be75604c; Fri, 10 Mar 2023 18:14:11 +0100 (CET) Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Mar 2023 09:13:48 -0800 Received: from black.fi.intel.com ([10.237.72.28]) by orsmga006.jf.intel.com with ESMTP; 10 Mar 2023 09:13:37 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id 5964C94; Fri, 10 Mar 2023 19:14:21 +0200 (EET) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: f944201c-bf66-11ed-87f5-c1b5be75604c DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1678468451; x=1710004451; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=eHidnQb8OVGw2m65PUEJlimfsZ9DgoEAjYSy55tHAGc=; b=FQFDFEzkDdGrmL/4rAu7nao/cqMLMYwtlkywGR94hqDRiFSl/Oj0d8cw u/rj4347d9rShE+GivA595tKkP7lDzhVg3n6oTHyd0R+e55WjN2lXulep 91O9+YLzj2aWKEnH7cXsXmUIDaqsWp3lWSso54XbH0fCE9mFUGNbwo0qk p5ll0c7Jvf6crvsRwGpY/HTynPLoNExYQ6H4dvHYs+dyfcrpj/UJMQa0S qzh7KPq+tdixdkl4c5vKh459Rjb5m8FVVikFlr2L0MmIWhhxg5ZW00qz+ 0x/53y1NYjjhOuGoAXHtU3VRSymocLVso6TkdPa4+XVWgAyfrPsjxFuGE A==; X-IronPort-AV: E=McAfee;i="6500,9779,10645"; a="325132321" X-IronPort-AV: E=Sophos;i="5.98,250,1673942400"; d="scan'208";a="325132321" X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10645"; a="655250078" X-IronPort-AV: E=Sophos;i="5.98,250,1673942400"; d="scan'208";a="655250078" From: Andy Shevchenko To: =?UTF-8?q?Micka=C3=ABl=20Sala=C3=BCn?= , Andy Shevchenko , Mika Westerberg , =?UTF-8?q?Krzysztof=20Wilczy=C5=84ski?= , Michael Ellerman , Randy Dunlap , Arnd Bergmann , Bjorn Helgaas , "Rafael J. Wysocki" , Niklas Schnelle , =?UTF-8?q?Pali=20Roh=C3=A1r?= , "Maciej W. Rozycki" , Juergen Gross , Dominik Brodowski , linux-kernel@vger.kernel.org, linux-alpha@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mips@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-sh@vger.kernel.org, sparclinux@vger.kernel.org, linux-pci@vger.kernel.org, xen-devel@lists.xenproject.org, linux-acpi@vger.kernel.org Cc: Miguel Ojeda , Richard Henderson , Ivan Kokshaysky , Matt Turner , Russell King , Andrew Lunn , Sebastian Hesselbarth , Gregory Clement , Thomas Bogendoerfer , Nicholas Piggin , Christophe Leroy , Anatolij Gustschin , Yoshinori Sato , Rich Felker , John Paul Adrian Glaubitz , "David S. Miller" , Bjorn Helgaas , Stefano Stabellini , Oleksandr Tyshchenko Subject: [PATCH v4 1/4] PCI: Introduce pci_dev_for_each_resource() Date: Fri, 10 Mar 2023 19:14:13 +0200 Message-Id: <20230310171416.23356-2-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230310171416.23356-1-andriy.shevchenko@linux.intel.com> References: <20230310171416.23356-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @intel.com) X-ZM-MESSAGEID: 1678468473837100006 From: Mika Westerberg Instead of open-coding it everywhere introduce a tiny helper that can be used to iterate over each resource of a PCI device, and convert the most obvious users into it. While at it drop doubled empty line before pdev_sort_resources(). No functional changes intended. Suggested-by: Andy Shevchenko Signed-off-by: Mika Westerberg Signed-off-by: Andy Shevchenko Reviewed-by: Krzysztof Wilczy=C5=84ski --- .clang-format | 2 ++ arch/alpha/kernel/pci.c | 5 ++-- arch/arm/kernel/bios32.c | 16 ++++++------- arch/arm/mach-dove/pcie.c | 10 ++++---- arch/arm/mach-mv78xx0/pcie.c | 10 ++++---- arch/arm/mach-orion5x/pci.c | 10 ++++---- arch/mips/pci/ops-bcm63xx.c | 8 +++---- arch/mips/pci/pci-legacy.c | 3 +-- arch/powerpc/kernel/pci-common.c | 21 ++++++++-------- arch/powerpc/platforms/4xx/pci.c | 8 +++---- arch/powerpc/platforms/52xx/mpc52xx_pci.c | 4 ++-- arch/powerpc/platforms/pseries/pci.c | 16 ++++++------- arch/sh/drivers/pci/pcie-sh7786.c | 10 ++++---- arch/sparc/kernel/leon_pci.c | 5 ++-- arch/sparc/kernel/pci.c | 10 ++++---- arch/sparc/kernel/pcic.c | 5 ++-- drivers/pci/remove.c | 5 ++-- drivers/pci/setup-bus.c | 27 ++++++++------------- drivers/pci/setup-res.c | 4 +--- drivers/pci/vgaarb.c | 17 ++++--------- drivers/pci/xen-pcifront.c | 4 +--- drivers/pnp/quirks.c | 29 ++++++++--------------- include/linux/pci.h | 12 ++++++++++ 23 files changed, 110 insertions(+), 131 deletions(-) diff --git a/.clang-format b/.clang-format index d988e9fa9b26..266abb843654 100644 --- a/.clang-format +++ b/.clang-format @@ -520,6 +520,8 @@ ForEachMacros: - 'of_property_for_each_string' - 'of_property_for_each_u32' - 'pci_bus_for_each_resource' + - 'pci_dev_for_each_resource' + - 'pci_dev_for_each_resource_p' - 'pci_doe_for_each_off' - 'pcl_for_each_chunk' - 'pcl_for_each_segment' diff --git a/arch/alpha/kernel/pci.c b/arch/alpha/kernel/pci.c index 64fbfb0763b2..4458eb7f44f0 100644 --- a/arch/alpha/kernel/pci.c +++ b/arch/alpha/kernel/pci.c @@ -288,11 +288,10 @@ pcibios_claim_one_bus(struct pci_bus *b) struct pci_bus *child_bus; =20 list_for_each_entry(dev, &b->devices, bus_list) { + struct resource *r; int i; =20 - for (i =3D 0; i < PCI_NUM_RESOURCES; i++) { - struct resource *r =3D &dev->resource[i]; - + pci_dev_for_each_resource(dev, r, i) { if (r->parent || !r->start || !r->flags) continue; if (pci_has_flag(PCI_PROBE_ONLY) || diff --git a/arch/arm/kernel/bios32.c b/arch/arm/kernel/bios32.c index e7ef2b5bea9c..5254734b23e6 100644 --- a/arch/arm/kernel/bios32.c +++ b/arch/arm/kernel/bios32.c @@ -142,15 +142,15 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_WINBOND2, PCI_= DEVICE_ID_WINBOND2_89C940F, */ static void pci_fixup_dec21285(struct pci_dev *dev) { - int i; - if (dev->devfn =3D=3D 0) { + struct resource *r; + dev->class &=3D 0xff; dev->class |=3D PCI_CLASS_BRIDGE_HOST << 8; - for (i =3D 0; i < PCI_NUM_RESOURCES; i++) { - dev->resource[i].start =3D 0; - dev->resource[i].end =3D 0; - dev->resource[i].flags =3D 0; + pci_dev_for_each_resource_p(dev, r) { + r->start =3D 0; + r->end =3D 0; + r->flags =3D 0; } } } @@ -162,13 +162,11 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_DEC, PCI_DEVIC= E_ID_DEC_21285, pci_fixup_d static void pci_fixup_ide_bases(struct pci_dev *dev) { struct resource *r; - int i; =20 if ((dev->class >> 8) !=3D PCI_CLASS_STORAGE_IDE) return; =20 - for (i =3D 0; i < PCI_NUM_RESOURCES; i++) { - r =3D dev->resource + i; + pci_dev_for_each_resource_p(dev, r) { if ((r->start & ~0x80) =3D=3D 0x374) { r->start |=3D 2; r->end =3D r->start; diff --git a/arch/arm/mach-dove/pcie.c b/arch/arm/mach-dove/pcie.c index 754ca381f600..58cecd79a204 100644 --- a/arch/arm/mach-dove/pcie.c +++ b/arch/arm/mach-dove/pcie.c @@ -142,14 +142,14 @@ static struct pci_ops pcie_ops =3D { static void rc_pci_fixup(struct pci_dev *dev) { if (dev->bus->parent =3D=3D NULL && dev->devfn =3D=3D 0) { - int i; + struct resource *r; =20 dev->class &=3D 0xff; dev->class |=3D PCI_CLASS_BRIDGE_HOST << 8; - for (i =3D 0; i < DEVICE_COUNT_RESOURCE; i++) { - dev->resource[i].start =3D 0; - dev->resource[i].end =3D 0; - dev->resource[i].flags =3D 0; + pci_dev_for_each_resource_p(dev, r) { + r->start =3D 0; + r->end =3D 0; + r->flags =3D 0; } } } diff --git a/arch/arm/mach-mv78xx0/pcie.c b/arch/arm/mach-mv78xx0/pcie.c index 6190f538a124..f59f02150a36 100644 --- a/arch/arm/mach-mv78xx0/pcie.c +++ b/arch/arm/mach-mv78xx0/pcie.c @@ -186,14 +186,14 @@ static struct pci_ops pcie_ops =3D { static void rc_pci_fixup(struct pci_dev *dev) { if (dev->bus->parent =3D=3D NULL && dev->devfn =3D=3D 0) { - int i; + struct resource *r; =20 dev->class &=3D 0xff; dev->class |=3D PCI_CLASS_BRIDGE_HOST << 8; - for (i =3D 0; i < DEVICE_COUNT_RESOURCE; i++) { - dev->resource[i].start =3D 0; - dev->resource[i].end =3D 0; - dev->resource[i].flags =3D 0; + pci_dev_for_each_resource_p(dev, r) { + r->start =3D 0; + r->end =3D 0; + r->flags =3D 0; } } } diff --git a/arch/arm/mach-orion5x/pci.c b/arch/arm/mach-orion5x/pci.c index 888fdc9099c5..0933b47b601a 100644 --- a/arch/arm/mach-orion5x/pci.c +++ b/arch/arm/mach-orion5x/pci.c @@ -522,14 +522,14 @@ static int __init pci_setup(struct pci_sys_data *sys) static void rc_pci_fixup(struct pci_dev *dev) { if (dev->bus->parent =3D=3D NULL && dev->devfn =3D=3D 0) { - int i; + struct resource *r; =20 dev->class &=3D 0xff; dev->class |=3D PCI_CLASS_BRIDGE_HOST << 8; - for (i =3D 0; i < DEVICE_COUNT_RESOURCE; i++) { - dev->resource[i].start =3D 0; - dev->resource[i].end =3D 0; - dev->resource[i].flags =3D 0; + pci_dev_for_each_resource_p(dev, r) { + r->start =3D 0; + r->end =3D 0; + r->flags =3D 0; } } } diff --git a/arch/mips/pci/ops-bcm63xx.c b/arch/mips/pci/ops-bcm63xx.c index dc6dc2741272..c0efcbf3c63f 100644 --- a/arch/mips/pci/ops-bcm63xx.c +++ b/arch/mips/pci/ops-bcm63xx.c @@ -413,18 +413,18 @@ struct pci_ops bcm63xx_cb_ops =3D { static void bcm63xx_fixup(struct pci_dev *dev) { static int io_window =3D -1; - int i, found, new_io_window; + int found, new_io_window; + struct resource *r; u32 val; =20 /* look for any io resource */ found =3D 0; - for (i =3D 0; i < DEVICE_COUNT_RESOURCE; i++) { - if (pci_resource_flags(dev, i) & IORESOURCE_IO) { + pci_dev_for_each_resource_p(dev, r) { + if (resource_type(r) =3D=3D IORESOURCE_IO) { found =3D 1; break; } } - if (!found) return; =20 diff --git a/arch/mips/pci/pci-legacy.c b/arch/mips/pci/pci-legacy.c index 468722c8a5c6..ec2567f8efd8 100644 --- a/arch/mips/pci/pci-legacy.c +++ b/arch/mips/pci/pci-legacy.c @@ -249,12 +249,11 @@ static int pcibios_enable_resources(struct pci_dev *d= ev, int mask) =20 pci_read_config_word(dev, PCI_COMMAND, &cmd); old_cmd =3D cmd; - for (idx =3D 0; idx < PCI_NUM_RESOURCES; idx++) { + pci_dev_for_each_resource(dev, r, idx) { /* Only set up the requested stuff */ if (!(mask & (1<resource[idx]; if (!(r->flags & (IORESOURCE_IO | IORESOURCE_MEM))) continue; if ((idx =3D=3D PCI_ROM_RESOURCE) && diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-com= mon.c index d67cf79bf5d0..1908a46cad54 100644 --- a/arch/powerpc/kernel/pci-common.c +++ b/arch/powerpc/kernel/pci-common.c @@ -880,6 +880,7 @@ int pcibios_root_bridge_prepare(struct pci_host_bridge = *bridge) static void pcibios_fixup_resources(struct pci_dev *dev) { struct pci_controller *hose =3D pci_bus_to_host(dev->bus); + struct resource *res; int i; =20 if (!hose) { @@ -891,9 +892,9 @@ static void pcibios_fixup_resources(struct pci_dev *dev) if (dev->is_virtfn) return; =20 - for (i =3D 0; i < DEVICE_COUNT_RESOURCE; i++) { - struct resource *res =3D dev->resource + i; + pci_dev_for_each_resource(dev, res, i) { struct pci_bus_region reg; + if (!res->flags) continue; =20 @@ -1452,11 +1453,10 @@ void pcibios_claim_one_bus(struct pci_bus *bus) struct pci_bus *child_bus; =20 list_for_each_entry(dev, &bus->devices, bus_list) { + struct resource *r; int i; =20 - for (i =3D 0; i < PCI_NUM_RESOURCES; i++) { - struct resource *r =3D &dev->resource[i]; - + pci_dev_for_each_resource(dev, r, i) { if (r->parent || !r->start || !r->flags) continue; =20 @@ -1705,19 +1705,20 @@ EXPORT_SYMBOL_GPL(pcibios_scan_phb); =20 static void fixup_hide_host_resource_fsl(struct pci_dev *dev) { - int i, class =3D dev->class >> 8; + int class =3D dev->class >> 8; /* When configured as agent, programming interface =3D 1 */ int prog_if =3D dev->class & 0xf; + struct resource *r; =20 if ((class =3D=3D PCI_CLASS_PROCESSOR_POWERPC || class =3D=3D PCI_CLASS_BRIDGE_OTHER) && (dev->hdr_type =3D=3D PCI_HEADER_TYPE_NORMAL) && (prog_if =3D=3D 0) && (dev->bus->parent =3D=3D NULL)) { - for (i =3D 0; i < DEVICE_COUNT_RESOURCE; i++) { - dev->resource[i].start =3D 0; - dev->resource[i].end =3D 0; - dev->resource[i].flags =3D 0; + pci_dev_for_each_resource_p(dev, r) { + r->start =3D 0; + r->end =3D 0; + r->flags =3D 0; } } } diff --git a/arch/powerpc/platforms/4xx/pci.c b/arch/powerpc/platforms/4xx/= pci.c index ca5dd7a5842a..9d19123c0da8 100644 --- a/arch/powerpc/platforms/4xx/pci.c +++ b/arch/powerpc/platforms/4xx/pci.c @@ -57,7 +57,7 @@ static inline int ppc440spe_revA(void) static void fixup_ppc4xx_pci_bridge(struct pci_dev *dev) { struct pci_controller *hose; - int i; + struct resource *r; =20 if (dev->devfn !=3D 0 || dev->bus->self !=3D NULL) return; @@ -79,9 +79,9 @@ static void fixup_ppc4xx_pci_bridge(struct pci_dev *dev) /* Hide the PCI host BARs from the kernel as their content doesn't * fit well in the resource management */ - for (i =3D 0; i < DEVICE_COUNT_RESOURCE; i++) { - dev->resource[i].start =3D dev->resource[i].end =3D 0; - dev->resource[i].flags =3D 0; + pci_dev_for_each_resource_p(dev, r) { + r->start =3D r->end =3D 0; + r->flags =3D 0; } =20 printk(KERN_INFO "PCI: Hiding 4xx host bridge resources %s\n", diff --git a/arch/powerpc/platforms/52xx/mpc52xx_pci.c b/arch/powerpc/platf= orms/52xx/mpc52xx_pci.c index 859e2818c43d..f0b0ac298484 100644 --- a/arch/powerpc/platforms/52xx/mpc52xx_pci.c +++ b/arch/powerpc/platforms/52xx/mpc52xx_pci.c @@ -327,14 +327,14 @@ mpc52xx_pci_setup(struct pci_controller *hose, static void mpc52xx_pci_fixup_resources(struct pci_dev *dev) { + struct resource *res; int i; =20 pr_debug("%s() %.4x:%.4x\n", __func__, dev->vendor, dev->device); =20 /* We don't rely on boot loader for PCI and resets all devices */ - for (i =3D 0; i < DEVICE_COUNT_RESOURCE; i++) { - struct resource *res =3D &dev->resource[i]; + pci_dev_for_each_resource_p(dev, res) { if (res->end > res->start) { /* Only valid resources */ res->end -=3D res->start; res->start =3D 0; diff --git a/arch/powerpc/platforms/pseries/pci.c b/arch/powerpc/platforms/= pseries/pci.c index 60e0a58928ef..ee7b2c737c92 100644 --- a/arch/powerpc/platforms/pseries/pci.c +++ b/arch/powerpc/platforms/pseries/pci.c @@ -240,7 +240,7 @@ void __init pSeries_final_fixup(void) */ static void fixup_winbond_82c105(struct pci_dev* dev) { - int i; + struct resource *r; unsigned int reg; =20 if (!machine_is(pseries)) @@ -251,14 +251,14 @@ static void fixup_winbond_82c105(struct pci_dev* dev) /* Enable LEGIRQ to use INTC instead of ISA interrupts */ pci_write_config_dword(dev, 0x40, reg | (1<<11)); =20 - for (i =3D 0; i < DEVICE_COUNT_RESOURCE; ++i) { + pci_dev_for_each_resource_p(dev, r) { /* zap the 2nd function of the winbond chip */ - if (dev->resource[i].flags & IORESOURCE_IO - && dev->bus->number =3D=3D 0 && dev->devfn =3D=3D 0x81) - dev->resource[i].flags &=3D ~IORESOURCE_IO; - if (dev->resource[i].start =3D=3D 0 && dev->resource[i].end) { - dev->resource[i].flags =3D 0; - dev->resource[i].end =3D 0; + if (dev->bus->number =3D=3D 0 && dev->devfn =3D=3D 0x81 && + r->flags & IORESOURCE_IO) + r->flags &=3D ~IORESOURCE_IO; + if (r->start =3D=3D 0 && r->end) { + r->flags =3D 0; + r->end =3D 0; } } } diff --git a/arch/sh/drivers/pci/pcie-sh7786.c b/arch/sh/drivers/pci/pcie-s= h7786.c index b0c2a5238d04..982f9aec2f2f 100644 --- a/arch/sh/drivers/pci/pcie-sh7786.c +++ b/arch/sh/drivers/pci/pcie-sh7786.c @@ -140,12 +140,12 @@ static void sh7786_pci_fixup(struct pci_dev *dev) * Prevent enumeration of root complex resources. */ if (pci_is_root_bus(dev->bus) && dev->devfn =3D=3D 0) { - int i; + struct resource *r; =20 - for (i =3D 0; i < DEVICE_COUNT_RESOURCE; i++) { - dev->resource[i].start =3D 0; - dev->resource[i].end =3D 0; - dev->resource[i].flags =3D 0; + pci_dev_for_each_resource_p(dev, r) { + r->start =3D 0; + r->end =3D 0; + r->flags =3D 0; } } } diff --git a/arch/sparc/kernel/leon_pci.c b/arch/sparc/kernel/leon_pci.c index e5e5ff6b9a5c..b6663a3fbae9 100644 --- a/arch/sparc/kernel/leon_pci.c +++ b/arch/sparc/kernel/leon_pci.c @@ -62,15 +62,14 @@ void leon_pci_init(struct platform_device *ofdev, struc= t leon_pci_info *info) =20 int pcibios_enable_device(struct pci_dev *dev, int mask) { + struct resource *res; u16 cmd, oldcmd; int i; =20 pci_read_config_word(dev, PCI_COMMAND, &cmd); oldcmd =3D cmd; =20 - for (i =3D 0; i < PCI_NUM_RESOURCES; i++) { - struct resource *res =3D &dev->resource[i]; - + pci_dev_for_each_resource(dev, res, i) { /* Only set up the requested stuff */ if (!(mask & (1<devices, bus_list) { + struct resource *r; int i; =20 - for (i =3D 0; i < PCI_NUM_RESOURCES; i++) { - struct resource *r =3D &dev->resource[i]; - + pci_dev_for_each_resource(dev, r, i) { if (r->parent || !r->start || !r->flags) continue; =20 @@ -724,15 +723,14 @@ struct pci_bus *pci_scan_one_pbm(struct pci_pbm_info = *pbm, =20 int pcibios_enable_device(struct pci_dev *dev, int mask) { + struct resource *res; u16 cmd, oldcmd; int i; =20 pci_read_config_word(dev, PCI_COMMAND, &cmd); oldcmd =3D cmd; =20 - for (i =3D 0; i < PCI_NUM_RESOURCES; i++) { - struct resource *res =3D &dev->resource[i]; - + pci_dev_for_each_resource(dev, res, i) { /* Only set up the requested stuff */ if (!(mask & (1<resource[i]; - + pci_dev_for_each_resource(dev, res, i) { /* Only set up the requested stuff */ if (!(mask & (1<resource + i; + pci_dev_for_each_resource_p(dev, res) { if (res->parent) release_resource(res); } diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c index c690572b10ce..d4fc7665f70a 100644 --- a/drivers/pci/setup-bus.c +++ b/drivers/pci/setup-bus.c @@ -124,20 +124,17 @@ static resource_size_t get_res_add_align(struct list_= head *head, return dev_res ? dev_res->min_align : 0; } =20 - /* Sort resources by alignment */ static void pdev_sort_resources(struct pci_dev *dev, struct list_head *hea= d) { + struct resource *r; int i; =20 - for (i =3D 0; i < PCI_NUM_RESOURCES; i++) { - struct resource *r; + pci_dev_for_each_resource(dev, r, i) { struct pci_dev_resource *dev_res, *tmp; resource_size_t r_align; struct list_head *n; =20 - r =3D &dev->resource[i]; - if (r->flags & IORESOURCE_PCI_FIXED) continue; =20 @@ -895,10 +892,9 @@ static void pbus_size_io(struct pci_bus *bus, resource= _size_t min_size, =20 min_align =3D window_alignment(bus, IORESOURCE_IO); list_for_each_entry(dev, &bus->devices, bus_list) { - int i; + struct resource *r; =20 - for (i =3D 0; i < PCI_NUM_RESOURCES; i++) { - struct resource *r =3D &dev->resource[i]; + pci_dev_for_each_resource_p(dev, r) { unsigned long r_size; =20 if (r->parent || !(r->flags & IORESOURCE_IO)) @@ -1014,10 +1010,10 @@ static int pbus_size_mem(struct pci_bus *bus, unsig= ned long mask, size =3D 0; =20 list_for_each_entry(dev, &bus->devices, bus_list) { + struct resource *r; int i; =20 - for (i =3D 0; i < PCI_NUM_RESOURCES; i++) { - struct resource *r =3D &dev->resource[i]; + pci_dev_for_each_resource(dev, r, i) { resource_size_t r_size; =20 if (r->parent || (r->flags & IORESOURCE_PCI_FIXED) || @@ -1358,11 +1354,10 @@ static void assign_fixed_resource_on_bus(struct pci= _bus *b, struct resource *r) */ static void pdev_assign_fixed_resources(struct pci_dev *dev) { - int i; + struct resource *r; =20 - for (i =3D 0; i < PCI_NUM_RESOURCES; i++) { + pci_dev_for_each_resource_p(dev, r) { struct pci_bus *b; - struct resource *r =3D &dev->resource[i]; =20 if (r->parent || !(r->flags & IORESOURCE_PCI_FIXED) || !(r->flags & (IORESOURCE_IO | IORESOURCE_MEM))) @@ -1795,11 +1790,9 @@ static void remove_dev_resources(struct pci_dev *dev= , struct resource *io, struct resource *mmio, struct resource *mmio_pref) { - int i; - - for (i =3D 0; i < PCI_NUM_RESOURCES; i++) { - struct resource *res =3D &dev->resource[i]; + struct resource *res; =20 + pci_dev_for_each_resource_p(dev, res) { if (resource_type(res) =3D=3D IORESOURCE_IO) { remove_dev_resource(io, dev, res); } else if (resource_type(res) =3D=3D IORESOURCE_MEM) { diff --git a/drivers/pci/setup-res.c b/drivers/pci/setup-res.c index b492e67c3d87..967f9a758923 100644 --- a/drivers/pci/setup-res.c +++ b/drivers/pci/setup-res.c @@ -484,12 +484,10 @@ int pci_enable_resources(struct pci_dev *dev, int mas= k) pci_read_config_word(dev, PCI_COMMAND, &cmd); old_cmd =3D cmd; =20 - for (i =3D 0; i < PCI_NUM_RESOURCES; i++) { + pci_dev_for_each_resource(dev, r, i) { if (!(mask & (1 << i))) continue; =20 - r =3D &dev->resource[i]; - if (!(r->flags & (IORESOURCE_IO | IORESOURCE_MEM))) continue; if ((i =3D=3D PCI_ROM_RESOURCE) && diff --git a/drivers/pci/vgaarb.c b/drivers/pci/vgaarb.c index f80b6ec88dc3..3ec6a0b7dbf0 100644 --- a/drivers/pci/vgaarb.c +++ b/drivers/pci/vgaarb.c @@ -548,10 +548,8 @@ static bool vga_is_firmware_default(struct pci_dev *pd= ev) #if defined(CONFIG_X86) || defined(CONFIG_IA64) u64 base =3D screen_info.lfb_base; u64 size =3D screen_info.lfb_size; + struct resource *r; u64 limit; - resource_size_t start, end; - unsigned long flags; - int i; =20 /* Select the device owning the boot framebuffer if there is one */ =20 @@ -561,19 +559,14 @@ static bool vga_is_firmware_default(struct pci_dev *p= dev) limit =3D base + size; =20 /* Does firmware framebuffer belong to us? */ - for (i =3D 0; i < DEVICE_COUNT_RESOURCE; i++) { - flags =3D pci_resource_flags(pdev, i); - - if ((flags & IORESOURCE_MEM) =3D=3D 0) + pci_dev_for_each_resource_p(pdev, r) { + if (resource_type(r) !=3D IORESOURCE_MEM) continue; =20 - start =3D pci_resource_start(pdev, i); - end =3D pci_resource_end(pdev, i); - - if (!start || !end) + if (!r->start || !r->end) continue; =20 - if (base < start || limit >=3D end) + if (base < r->start || limit >=3D r->end) continue; =20 return true; diff --git a/drivers/pci/xen-pcifront.c b/drivers/pci/xen-pcifront.c index fcd029ca2eb1..83c0ab50676d 100644 --- a/drivers/pci/xen-pcifront.c +++ b/drivers/pci/xen-pcifront.c @@ -390,9 +390,7 @@ static int pcifront_claim_resource(struct pci_dev *dev,= void *data) int i; struct resource *r; =20 - for (i =3D 0; i < PCI_NUM_RESOURCES; i++) { - r =3D &dev->resource[i]; - + pci_dev_for_each_resource(dev, r, i) { if (!r->parent && r->start && r->flags) { dev_info(&pdev->xdev->dev, "claiming resource %s/%d\n", pci_name(dev), i); diff --git a/drivers/pnp/quirks.c b/drivers/pnp/quirks.c index ac98b9919029..420121954ffd 100644 --- a/drivers/pnp/quirks.c +++ b/drivers/pnp/quirks.c @@ -229,8 +229,7 @@ static void quirk_ad1815_mpu_resources(struct pnp_dev *= dev) static void quirk_system_pci_resources(struct pnp_dev *dev) { struct pci_dev *pdev =3D NULL; - struct resource *res; - resource_size_t pnp_start, pnp_end, pci_start, pci_end; + struct resource *res, *r; int i, j; =20 /* @@ -243,32 +242,26 @@ static void quirk_system_pci_resources(struct pnp_dev= *dev) * so they won't be claimed by the PNP system driver. */ for_each_pci_dev(pdev) { - for (i =3D 0; i < DEVICE_COUNT_RESOURCE; i++) { - unsigned long flags, type; + pci_dev_for_each_resource(pdev, r, i) { + unsigned long type =3D resource_type(r); =20 - flags =3D pci_resource_flags(pdev, i); - type =3D flags & (IORESOURCE_IO | IORESOURCE_MEM); - if (!type || pci_resource_len(pdev, i) =3D=3D 0) + if (type !=3D IORESOURCE_IO || type !=3D IORESOURCE_MEM || + resource_size(r) =3D=3D 0) continue; =20 - if (flags & IORESOURCE_UNSET) + if (r->flags & IORESOURCE_UNSET) continue; =20 - pci_start =3D pci_resource_start(pdev, i); - pci_end =3D pci_resource_end(pdev, i); for (j =3D 0; (res =3D pnp_get_resource(dev, type, j)); j++) { if (res->start =3D=3D 0 && res->end =3D=3D 0) continue; =20 - pnp_start =3D res->start; - pnp_end =3D res->end; - /* * If the PNP region doesn't overlap the PCI * region at all, there's no problem. */ - if (pnp_end < pci_start || pnp_start > pci_end) + if (!resource_overlaps(res, r)) continue; =20 /* @@ -278,8 +271,7 @@ static void quirk_system_pci_resources(struct pnp_dev *= dev) * PNP device describes a bridge with PCI * behind it. */ - if (pnp_start <=3D pci_start && - pnp_end >=3D pci_end) + if (res->start <=3D r->start && res->end >=3D r->end) continue; =20 /* @@ -288,9 +280,8 @@ static void quirk_system_pci_resources(struct pnp_dev *= dev) * driver from requesting its resources. */ dev_warn(&dev->dev, - "disabling %pR because it overlaps " - "%s BAR %d %pR\n", res, - pci_name(pdev), i, &pdev->resource[i]); + "disabling %pR because it overlaps %s BAR %d %pR\n", + res, pci_name(pdev), i, r); res->flags |=3D IORESOURCE_DISABLED; } } diff --git a/include/linux/pci.h b/include/linux/pci.h index fafd8020c6d7..670f01c5538c 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -1404,6 +1404,18 @@ void pdev_enable_device(struct pci_dev *); int pci_enable_resources(struct pci_dev *, int mask); void pci_assign_irq(struct pci_dev *dev); struct resource *pci_find_resource(struct pci_dev *dev, struct resource *r= es); + +#define __pci_dev_for_each_resource(dev, res, __i, vartype) \ + for (vartype __i =3D 0; \ + res =3D &(dev)->resource[__i], __i < PCI_NUM_RESOURCES; \ + __i++) + +#define pci_dev_for_each_resource(dev, res, i) \ + __pci_dev_for_each_resource(dev, res, i, ) + +#define pci_dev_for_each_resource_p(dev, res) \ + __pci_dev_for_each_resource(dev, res, i, unsigned int) + #define HAVE_PCI_REQ_REGIONS 2 int __must_check pci_request_regions(struct pci_dev *, const char *); int __must_check pci_request_regions_exclusive(struct pci_dev *, const cha= r *); --=20 2.39.1 From nobody Fri May 3 12:23:33 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass header.i=@intel.com; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=linux.intel.com ARC-Seal: i=1; a=rsa-sha256; t=1678468471; cv=none; d=zohomail.com; s=zohoarc; b=PveFbSm6LQD3nP1lHakxqpGgZCB7mBckkW9GTSFAnbspxGV8/252crzmSusSq6jlF9tOBwzHGZdWpD6FzdQjYBSwgRdWpCJwalEngNYlPvPhLBkddXsPZyPMddn8pyQFajRdmgiJWtQrm0U/baE1QEhfZIv/iZeUKvC7IGPbh8E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1678468471; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ZAZAslZ/5/c7xYjVb3sJMbfpWxz5/Iew9YmlhkXYonI=; b=bGz4Ba+n6IdkAw4izWGRN0mQFlDCAk8F4qrKAxEWUI9xC8670vgEvGG1RqEM1xf295ovRQ0kfVc1v7ea3Rl0WQvg881ltkU4n7UiLhDg25yvVuh98hs0wZ3PBwk9HNJNsgdc3HZS1D8ctVZWgUb5nllj97K6mEYvHdrYX5Sj5K4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=@intel.com; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1678468471315638.530410314678; Fri, 10 Mar 2023 09:14:31 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.508540.783282 (Exim 4.92) (envelope-from ) id 1pagJn-0003jM-5o; Fri, 10 Mar 2023 17:14:11 +0000 Received: by outflank-mailman (output) from mailman id 508540.783282; Fri, 10 Mar 2023 17:14:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pagJn-0003jF-20; Fri, 10 Mar 2023 17:14:11 +0000 Received: by outflank-mailman (input) for mailman id 508540; Fri, 10 Mar 2023 17:14:10 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pagJm-0003j4-0K for xen-devel@lists.xenproject.org; Fri, 10 Mar 2023 17:14:10 +0000 Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id f5ab27ce-bf66-11ed-87f5-c1b5be75604c; Fri, 10 Mar 2023 18:14:06 +0100 (CET) Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Mar 2023 09:13:47 -0800 Received: from black.fi.intel.com ([10.237.72.28]) by orsmga006.jf.intel.com with ESMTP; 10 Mar 2023 09:13:37 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id 6CDBF154; Fri, 10 Mar 2023 19:14:21 +0200 (EET) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: f5ab27ce-bf66-11ed-87f5-c1b5be75604c DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1678468446; x=1710004446; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=ImovGyFssY2h57L8ILEiNfPIEtHnJufocebXbe8t0O4=; b=c3PtlaSe1a23WhRWgkFCELMEIAdq6umwZ9U35Afhmhlwn5lnDBaUr273 nX2ggtupl4PXtOyR8nIkjtyUDe3FO2jG7BzO4at4s5GuZRmOOeXgmjvIS cWTPm0zj1T+UYCM3Ivxow19SE/QRPefIoERzuJf6jpzThOBUOyB8CoxNe xc7JDHAQzYJTb9hv6ufYBlAqtYZZkOjwguHLA18k6T2QbV1QJCANpkDgC irQG8y0EZ+q6fzxCTd8JfRf/M2aVU+fvWcLOhtOlrkawufd3LKeXJgu9/ aEEsb+yC9ZEfqLcdWsj0XoiuBa9Imu9Zw27mxa4gvLfgulXFMLWoTy0QO Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10645"; a="325132196" X-IronPort-AV: E=Sophos;i="5.98,250,1673942400"; d="scan'208";a="325132196" X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10645"; a="655250048" X-IronPort-AV: E=Sophos;i="5.98,250,1673942400"; d="scan'208";a="655250048" From: Andy Shevchenko To: =?UTF-8?q?Micka=C3=ABl=20Sala=C3=BCn?= , Andy Shevchenko , Mika Westerberg , =?UTF-8?q?Krzysztof=20Wilczy=C5=84ski?= , Michael Ellerman , Randy Dunlap , Arnd Bergmann , Bjorn Helgaas , "Rafael J. Wysocki" , Niklas Schnelle , =?UTF-8?q?Pali=20Roh=C3=A1r?= , "Maciej W. Rozycki" , Juergen Gross , Dominik Brodowski , linux-kernel@vger.kernel.org, linux-alpha@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mips@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-sh@vger.kernel.org, sparclinux@vger.kernel.org, linux-pci@vger.kernel.org, xen-devel@lists.xenproject.org, linux-acpi@vger.kernel.org Cc: Miguel Ojeda , Richard Henderson , Ivan Kokshaysky , Matt Turner , Russell King , Andrew Lunn , Sebastian Hesselbarth , Gregory Clement , Thomas Bogendoerfer , Nicholas Piggin , Christophe Leroy , Anatolij Gustschin , Yoshinori Sato , Rich Felker , John Paul Adrian Glaubitz , "David S. Miller" , Bjorn Helgaas , Stefano Stabellini , Oleksandr Tyshchenko Subject: [PATCH v4 2/4] PCI: Split pci_bus_for_each_resource_p() out of pci_bus_for_each_resource() Date: Fri, 10 Mar 2023 19:14:14 +0200 Message-Id: <20230310171416.23356-3-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230310171416.23356-1-andriy.shevchenko@linux.intel.com> References: <20230310171416.23356-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @intel.com) X-ZM-MESSAGEID: 1678468471962100002 Refactor pci_bus_for_each_resource() in the same way as it's done in pci_dev_for_each_resource() case. This will allow to hide iterator inside the loop, where it's not used otherwise. No functional changes intended. Signed-off-by: Andy Shevchenko Reviewed-by: Krzysztof Wilczy=C5=84ski --- .clang-format | 1 + drivers/pci/bus.c | 7 +++---- drivers/pci/hotplug/shpchp_sysfs.c | 8 ++++---- drivers/pci/pci.c | 5 ++--- drivers/pci/probe.c | 2 +- drivers/pci/setup-bus.c | 10 ++++------ include/linux/pci.h | 14 ++++++++++---- 7 files changed, 25 insertions(+), 22 deletions(-) diff --git a/.clang-format b/.clang-format index 266abb843654..81c9f055086f 100644 --- a/.clang-format +++ b/.clang-format @@ -520,6 +520,7 @@ ForEachMacros: - 'of_property_for_each_string' - 'of_property_for_each_u32' - 'pci_bus_for_each_resource' + - 'pci_bus_for_each_resource_p' - 'pci_dev_for_each_resource' - 'pci_dev_for_each_resource_p' - 'pci_doe_for_each_off' diff --git a/drivers/pci/bus.c b/drivers/pci/bus.c index 83ae838ceb5f..b48bcc965a42 100644 --- a/drivers/pci/bus.c +++ b/drivers/pci/bus.c @@ -161,13 +161,13 @@ static int pci_bus_alloc_from_region(struct pci_bus *= bus, struct resource *res, void *alignf_data, struct pci_bus_region *region) { - int i, ret; struct resource *r, avail; resource_size_t max; + int ret; =20 type_mask |=3D IORESOURCE_TYPE_BITS; =20 - pci_bus_for_each_resource(bus, r, i) { + pci_bus_for_each_resource_p(bus, r) { resource_size_t min_used =3D min; =20 if (!r) @@ -268,9 +268,8 @@ bool pci_bus_clip_resource(struct pci_dev *dev, int idx) struct resource *res =3D &dev->resource[idx]; struct resource orig_res =3D *res; struct resource *r; - int i; =20 - pci_bus_for_each_resource(bus, r, i) { + pci_bus_for_each_resource_p(bus, r) { resource_size_t start, end; =20 if (!r) diff --git a/drivers/pci/hotplug/shpchp_sysfs.c b/drivers/pci/hotplug/shpch= p_sysfs.c index 64beed7a26be..ff04f0c5e7c3 100644 --- a/drivers/pci/hotplug/shpchp_sysfs.c +++ b/drivers/pci/hotplug/shpchp_sysfs.c @@ -24,16 +24,16 @@ static ssize_t show_ctrl(struct device *dev, struct device_attribute *attr= , char *buf) { struct pci_dev *pdev; - int index, busnr; struct resource *res; struct pci_bus *bus; size_t len =3D 0; + int busnr; =20 pdev =3D to_pci_dev(dev); bus =3D pdev->subordinate; =20 len +=3D sysfs_emit_at(buf, len, "Free resources: memory\n"); - pci_bus_for_each_resource(bus, res, index) { + pci_bus_for_each_resource_p(bus, res) { if (res && (res->flags & IORESOURCE_MEM) && !(res->flags & IORESOURCE_PREFETCH)) { len +=3D sysfs_emit_at(buf, len, @@ -43,7 +43,7 @@ static ssize_t show_ctrl(struct device *dev, struct devic= e_attribute *attr, char } } len +=3D sysfs_emit_at(buf, len, "Free resources: prefetchable memory\n"); - pci_bus_for_each_resource(bus, res, index) { + pci_bus_for_each_resource_p(bus, res) { if (res && (res->flags & IORESOURCE_MEM) && (res->flags & IORESOURCE_PREFETCH)) { len +=3D sysfs_emit_at(buf, len, @@ -53,7 +53,7 @@ static ssize_t show_ctrl(struct device *dev, struct devic= e_attribute *attr, char } } len +=3D sysfs_emit_at(buf, len, "Free resources: IO\n"); - pci_bus_for_each_resource(bus, res, index) { + pci_bus_for_each_resource_p(bus, res) { if (res && (res->flags & IORESOURCE_IO)) { len +=3D sysfs_emit_at(buf, len, "start =3D %8.8llx, length =3D %8.8llx\n", diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 7a67611dc5f4..2f8915ab41ef 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -779,9 +779,8 @@ struct resource *pci_find_parent_resource(const struct = pci_dev *dev, { const struct pci_bus *bus =3D dev->bus; struct resource *r; - int i; =20 - pci_bus_for_each_resource(bus, r, i) { + pci_bus_for_each_resource_p(bus, r) { if (!r) continue; if (resource_contains(r, res)) { @@ -799,7 +798,7 @@ struct resource *pci_find_parent_resource(const struct = pci_dev *dev, * be both a positively-decoded aperture and a * subtractively-decoded region that contain the BAR. * We want the positively-decoded one, so this depends - * on pci_bus_for_each_resource() giving us those + * on pci_bus_for_each_resource_p() giving us those * first. */ return r; diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index a3f68b6ba6ac..5ada4c155d3c 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -533,7 +533,7 @@ void pci_read_bridge_bases(struct pci_bus *child) pci_read_bridge_mmio_pref(child); =20 if (dev->transparent) { - pci_bus_for_each_resource(child->parent, res, i) { + pci_bus_for_each_resource_p(child->parent, res) { if (res && res->flags) { pci_bus_add_resource(child, res, PCI_SUBTRACTIVE_DECODE); diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c index d4fc7665f70a..d6ead027255f 100644 --- a/drivers/pci/setup-bus.c +++ b/drivers/pci/setup-bus.c @@ -770,9 +770,8 @@ static struct resource *find_bus_resource_of_type(struc= t pci_bus *bus, unsigned long type) { struct resource *r, *r_assigned =3D NULL; - int i; =20 - pci_bus_for_each_resource(bus, r, i) { + pci_bus_for_each_resource_p(bus, r) { if (r =3D=3D &ioport_resource || r =3D=3D &iomem_resource) continue; if (r && (r->flags & type_mask) =3D=3D type && !r->parent) @@ -1204,7 +1203,7 @@ void __pci_bus_size_bridges(struct pci_bus *bus, stru= ct list_head *realloc_head) additional_mmio_pref_size =3D 0; struct resource *pref; struct pci_host_bridge *host; - int hdr_type, i, ret; + int hdr_type, ret; =20 list_for_each_entry(dev, &bus->devices, bus_list) { struct pci_bus *b =3D dev->subordinate; @@ -1228,7 +1227,7 @@ void __pci_bus_size_bridges(struct pci_bus *bus, stru= ct list_head *realloc_head) host =3D to_pci_host_bridge(bus->bridge); if (!host->size_windows) return; - pci_bus_for_each_resource(bus, pref, i) + pci_bus_for_each_resource_p(bus, pref) if (pref && (pref->flags & IORESOURCE_PREFETCH)) break; hdr_type =3D -1; /* Intentionally invalid - not a PCI device. */ @@ -1333,12 +1332,11 @@ EXPORT_SYMBOL(pci_bus_size_bridges); =20 static void assign_fixed_resource_on_bus(struct pci_bus *b, struct resourc= e *r) { - int i; struct resource *parent_r; unsigned long mask =3D IORESOURCE_IO | IORESOURCE_MEM | IORESOURCE_PREFETCH; =20 - pci_bus_for_each_resource(b, parent_r, i) { + pci_bus_for_each_resource_p(b, parent_r) { if (!parent_r) continue; =20 diff --git a/include/linux/pci.h b/include/linux/pci.h index 670f01c5538c..aac72c247bed 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -1456,10 +1456,16 @@ int devm_request_pci_bus_resources(struct device *d= ev, /* Temporary until new and working PCI SBR API in place */ int pci_bridge_secondary_bus_reset(struct pci_dev *dev); =20 -#define pci_bus_for_each_resource(bus, res, i) \ - for (i =3D 0; \ - (res =3D pci_bus_resource_n(bus, i)) || i < PCI_BRIDGE_RESOURCE_NUM; \ - i++) +#define __pci_bus_for_each_resource(bus, res, __i, vartype) \ + for (vartype __i =3D 0; \ + res =3D pci_bus_resource_n(bus, __i), __i < PCI_BRIDGE_RESOURCE_NUM;= \ + __i++) + +#define pci_bus_for_each_resource(bus, res, i) \ + __pci_bus_for_each_resource(bus, res, i, ) + +#define pci_bus_for_each_resource_p(bus, res) \ + __pci_bus_for_each_resource(bus, res, i, unsigned int) =20 int __must_check pci_bus_alloc_resource(struct pci_bus *bus, struct resource *res, resource_size_t size, --=20 2.39.1 From nobody Fri May 3 12:23:33 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass header.i=@intel.com; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=linux.intel.com ARC-Seal: i=1; a=rsa-sha256; t=1678468471; cv=none; d=zohomail.com; s=zohoarc; b=KytIExJY6Z2WQ2ckyLgnuQjR3uPS3Le4X5VqH6elmNTxO3lzeShJpBp/C+8Z7mZh2rkm3tlO//BZuEGo9KdfUWjhjANb9Mp1MC3DrQlXJulznZDbX8VOvDROFw/Vcssk3p4oeiiFEIBS4UA63bXXyBMghbsJZ3HzKVjfx8LZsCw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1678468471; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=pblzQhbPNBksTVsIt1SpuCH4eEI1Gfg/+m2mzBx2M7Y=; b=Xpt5pspFQbTIunUXGLHBszmybTe0ZOIELoOx0dQBlhi73fwq64JARMpI7wVWrCBJp5ZdEx6hd52nbVMIob65HQp7dXTPiemdCZ3kekwrnN6Cg1blv3/tbE17Lt3wFGD+E7Zu26/KV1Bzb4qok7YMUE4r9WNdOEshBAW1Au4V9N8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=@intel.com; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1678468471380203.65872378017343; Fri, 10 Mar 2023 09:14:31 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.508542.783302 (Exim 4.92) (envelope-from ) id 1pagJp-0004ER-SO; Fri, 10 Mar 2023 17:14:13 +0000 Received: by outflank-mailman (output) from mailman id 508542.783302; Fri, 10 Mar 2023 17:14:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pagJp-0004EK-Nr; Fri, 10 Mar 2023 17:14:13 +0000 Received: by outflank-mailman (input) for mailman id 508542; Fri, 10 Mar 2023 17:14:11 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pagJn-0003j4-MK for xen-devel@lists.xenproject.org; Fri, 10 Mar 2023 17:14:11 +0000 Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id f89dbd46-bf66-11ed-87f5-c1b5be75604c; Fri, 10 Mar 2023 18:14:10 +0100 (CET) Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Mar 2023 09:13:47 -0800 Received: from black.fi.intel.com ([10.237.72.28]) by orsmga006.jf.intel.com with ESMTP; 10 Mar 2023 09:13:37 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id 7AE48354; Fri, 10 Mar 2023 19:14:21 +0200 (EET) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: f89dbd46-bf66-11ed-87f5-c1b5be75604c DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1678468450; x=1710004450; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=XiU+o/uX7/9asxJWP74CXm0XTbLgvXwYQIiNjIPtko8=; b=PIUkkohnnedlJL78nxialTXtivr7pWxgRQRlqPi5V5mgNg0gQsEZtMrg aQ1RLqFQI5YJ6kw/vofetjVNPZg1IfBGoeiZOwwrrGCNzBXkWjOB4yYlZ vjWUbH4hdByI72MbFUNabjmkG0/NBbaGOGqmShavQsd7uRiO1w8MBh1o8 oiVrs1uwvEF54SjxU1ZJKP/ls/SVxtBQGJB/u0a8SXzgwkSDUgw8noo83 k7Mpr4el4+5erwCrV29HmuRNZaIlT5G3CNHQrRFBQ0XjEfBaRjfdWxPUP WCUDc/8lqPXDhCBZlPcCZBfxheldfp/8F1lk/kkKMxFISytwo4ozAYX+K A==; X-IronPort-AV: E=McAfee;i="6500,9779,10645"; a="325132253" X-IronPort-AV: E=Sophos;i="5.98,250,1673942400"; d="scan'208";a="325132253" X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10645"; a="655250056" X-IronPort-AV: E=Sophos;i="5.98,250,1673942400"; d="scan'208";a="655250056" From: Andy Shevchenko To: =?UTF-8?q?Micka=C3=ABl=20Sala=C3=BCn?= , Andy Shevchenko , Mika Westerberg , =?UTF-8?q?Krzysztof=20Wilczy=C5=84ski?= , Michael Ellerman , Randy Dunlap , Arnd Bergmann , Bjorn Helgaas , "Rafael J. Wysocki" , Niklas Schnelle , =?UTF-8?q?Pali=20Roh=C3=A1r?= , "Maciej W. Rozycki" , Juergen Gross , Dominik Brodowski , linux-kernel@vger.kernel.org, linux-alpha@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mips@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-sh@vger.kernel.org, sparclinux@vger.kernel.org, linux-pci@vger.kernel.org, xen-devel@lists.xenproject.org, linux-acpi@vger.kernel.org Cc: Miguel Ojeda , Richard Henderson , Ivan Kokshaysky , Matt Turner , Russell King , Andrew Lunn , Sebastian Hesselbarth , Gregory Clement , Thomas Bogendoerfer , Nicholas Piggin , Christophe Leroy , Anatolij Gustschin , Yoshinori Sato , Rich Felker , John Paul Adrian Glaubitz , "David S. Miller" , Bjorn Helgaas , Stefano Stabellini , Oleksandr Tyshchenko Subject: [PATCH v4 3/4] EISA: Convert to use pci_bus_for_each_resource_p() Date: Fri, 10 Mar 2023 19:14:15 +0200 Message-Id: <20230310171416.23356-4-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230310171416.23356-1-andriy.shevchenko@linux.intel.com> References: <20230310171416.23356-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @intel.com) X-ZM-MESSAGEID: 1678468471930100001 The pci_bus_for_each_resource_p() hides the iterator loop since it may be not used otherwise. With this, we may drop that iterator variable definition. Signed-off-by: Andy Shevchenko Reviewed-by: Krzysztof Wilczy=C5=84ski --- drivers/eisa/pci_eisa.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/eisa/pci_eisa.c b/drivers/eisa/pci_eisa.c index 930c2332c3c4..907b86384396 100644 --- a/drivers/eisa/pci_eisa.c +++ b/drivers/eisa/pci_eisa.c @@ -20,8 +20,8 @@ static struct eisa_root_device pci_eisa_root; =20 static int __init pci_eisa_init(struct pci_dev *pdev) { - int rc, i; struct resource *res, *bus_res =3D NULL; + int rc; =20 if ((rc =3D pci_enable_device (pdev))) { dev_err(&pdev->dev, "Could not enable device\n"); @@ -38,7 +38,7 @@ static int __init pci_eisa_init(struct pci_dev *pdev) * eisa_root_register() can only deal with a single io port resource, * so we use the first valid io port resource. */ - pci_bus_for_each_resource(pdev->bus, res, i) + pci_bus_for_each_resource_p(pdev->bus, res) if (res && (res->flags & IORESOURCE_IO)) { bus_res =3D res; break; --=20 2.39.1 From nobody Fri May 3 12:23:33 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass header.i=@intel.com; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=linux.intel.com ARC-Seal: i=1; a=rsa-sha256; t=1678468476; cv=none; d=zohomail.com; s=zohoarc; b=f6Oai7IyKWPxpQeGhBISXvXLfNXGNUklPzIJgo1oeYK2yYR/lpohicebnMpHtEkvYJfUbv0lOe0G5tvzGW4EJlpG32vqCLAXmL8jcHbW8TUOwULajqSOtquB8EUSYsDN5Ufka9blxdhFtMjkY26/2z5yYrUnqPxEDsR2md5CICM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1678468476; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=vVVfWJCrvi8RtvgLfSI2D6TodUgBv6CgdjfWrnsE61U=; b=h6n5z+Ks8QWZAwQSpebKtljLUA4AP3y1bcMf1T9SLwFTIs9+pA7UF+Ie8h6iWgBfq5JhRJw042PsfHIEiPV3RoodgS9PHmLvgAV01n1sQidDYRULJ7PW1IINTUU36cW0509V7zh7WaRDMx01QDPqP8h4AMi4jpgz903AK5edEY4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=@intel.com; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1678468476148573.0055395900795; Fri, 10 Mar 2023 09:14:36 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.508543.783308 (Exim 4.92) (envelope-from ) id 1pagJq-0004Hb-8S; Fri, 10 Mar 2023 17:14:14 +0000 Received: by outflank-mailman (output) from mailman id 508543.783308; Fri, 10 Mar 2023 17:14:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pagJp-0004FY-WB; Fri, 10 Mar 2023 17:14:13 +0000 Received: by outflank-mailman (input) for mailman id 508543; Fri, 10 Mar 2023 17:14:12 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pagJo-0003j4-Mc for xen-devel@lists.xenproject.org; Fri, 10 Mar 2023 17:14:12 +0000 Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id f90b0c42-bf66-11ed-87f5-c1b5be75604c; Fri, 10 Mar 2023 18:14:10 +0100 (CET) Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Mar 2023 09:13:48 -0800 Received: from black.fi.intel.com ([10.237.72.28]) by orsmga006.jf.intel.com with ESMTP; 10 Mar 2023 09:13:37 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id 867E0367; Fri, 10 Mar 2023 19:14:21 +0200 (EET) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: f90b0c42-bf66-11ed-87f5-c1b5be75604c DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1678468450; x=1710004450; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=At9xdYTQNTpkoGAW78tZWvzRJ4xj1ehsEwPouDTGZjw=; b=JKDAZMXgzId5lQQjEGTaDxBOOl8LMf05qAEHN5P0No6Kz5iij++12cmf dhxEAxekjW9IfwJ4mgOd95H0Zp8ehbnp9TyD4ih7Ifafk0I6BdbkiDqrI ZQV8i33lpQ8azb7/THdt1os1DDXFKXoxVkjpmwUmVVwYa0YcBzAgh4kHZ HLia9FQXPZIvsrtF6MGhrJRBMCn0qAIl+yxAQpQHiH6cFpNJo2GvqWVwv 4WRDiOZCXEShmpvTdrhc3Cib8Qouf7nYQ3ENfoIVY6jyd764MiZfqeu3e QWq7YUsJKzilC6sJHdk9899HmhTbhwRApeLTjmTP/xeHEJ2HcxKHgPWTz A==; X-IronPort-AV: E=McAfee;i="6500,9779,10645"; a="325132284" X-IronPort-AV: E=Sophos;i="5.98,250,1673942400"; d="scan'208";a="325132284" X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10645"; a="655250064" X-IronPort-AV: E=Sophos;i="5.98,250,1673942400"; d="scan'208";a="655250064" From: Andy Shevchenko To: =?UTF-8?q?Micka=C3=ABl=20Sala=C3=BCn?= , Andy Shevchenko , Mika Westerberg , =?UTF-8?q?Krzysztof=20Wilczy=C5=84ski?= , Michael Ellerman , Randy Dunlap , Arnd Bergmann , Bjorn Helgaas , "Rafael J. Wysocki" , Niklas Schnelle , =?UTF-8?q?Pali=20Roh=C3=A1r?= , "Maciej W. Rozycki" , Juergen Gross , Dominik Brodowski , linux-kernel@vger.kernel.org, linux-alpha@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mips@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-sh@vger.kernel.org, sparclinux@vger.kernel.org, linux-pci@vger.kernel.org, xen-devel@lists.xenproject.org, linux-acpi@vger.kernel.org Cc: Miguel Ojeda , Richard Henderson , Ivan Kokshaysky , Matt Turner , Russell King , Andrew Lunn , Sebastian Hesselbarth , Gregory Clement , Thomas Bogendoerfer , Nicholas Piggin , Christophe Leroy , Anatolij Gustschin , Yoshinori Sato , Rich Felker , John Paul Adrian Glaubitz , "David S. Miller" , Bjorn Helgaas , Stefano Stabellini , Oleksandr Tyshchenko Subject: [PATCH v4 4/4] pcmcia: Convert to use pci_bus_for_each_resource_p() Date: Fri, 10 Mar 2023 19:14:16 +0200 Message-Id: <20230310171416.23356-5-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230310171416.23356-1-andriy.shevchenko@linux.intel.com> References: <20230310171416.23356-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @intel.com) X-ZM-MESSAGEID: 1678468477822100001 The pci_bus_for_each_resource_p() hides the iterator loop since it may be not used otherwise. With this, we may drop that iterator variable definition. Signed-off-by: Andy Shevchenko Reviewed-by: Krzysztof Wilczy=C5=84ski Acked-by: Dominik Brodowski --- drivers/pcmcia/rsrc_nonstatic.c | 9 +++------ drivers/pcmcia/yenta_socket.c | 3 +-- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/drivers/pcmcia/rsrc_nonstatic.c b/drivers/pcmcia/rsrc_nonstati= c.c index ad1141fddb4c..9d92d4bb6239 100644 --- a/drivers/pcmcia/rsrc_nonstatic.c +++ b/drivers/pcmcia/rsrc_nonstatic.c @@ -934,7 +934,7 @@ static int adjust_io(struct pcmcia_socket *s, unsigned = int action, unsigned long static int nonstatic_autoadd_resources(struct pcmcia_socket *s) { struct resource *res; - int i, done =3D 0; + int done =3D 0; =20 if (!s->cb_dev || !s->cb_dev->bus) return -ENODEV; @@ -960,12 +960,9 @@ static int nonstatic_autoadd_resources(struct pcmcia_s= ocket *s) */ if (s->cb_dev->bus->number =3D=3D 0) return -EINVAL; - - for (i =3D 0; i < PCI_BRIDGE_RESOURCE_NUM; i++) { - res =3D s->cb_dev->bus->resource[i]; -#else - pci_bus_for_each_resource(s->cb_dev->bus, res, i) { #endif + + pci_bus_for_each_resource_p(s->cb_dev->bus, res) { if (!res) continue; =20 diff --git a/drivers/pcmcia/yenta_socket.c b/drivers/pcmcia/yenta_socket.c index 1365eaa20ff4..2e5bdf3db0ba 100644 --- a/drivers/pcmcia/yenta_socket.c +++ b/drivers/pcmcia/yenta_socket.c @@ -673,9 +673,8 @@ static int yenta_search_res(struct yenta_socket *socket= , struct resource *res, u32 min) { struct resource *root; - int i; =20 - pci_bus_for_each_resource(socket->dev->bus, root, i) { + pci_bus_for_each_resource_p(socket->dev->bus, root) { if (!root) continue; =20 --=20 2.39.1