[v3,08/26] alpha/PCI: Use PCI_STD_NUM_BARS

Message ID	20190916204158.6889-9-efremov@linux.com
State	Deferred
Delegated to:	Bjorn Helgaas
Headers	show Return-Path: <linux-pci-owner@vger.kernel.org> From: Denis Efremov <efremov@linux.com> To: Bjorn Helgaas <bhelgaas@google.com> Cc: Denis Efremov <efremov@linux.com>, linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, Andrew Murray <andrew.murray@arm.com>, linux-alpha@vger.kernel.org, Richard Henderson <rth@twiddle.net>, Ivan Kokshaysky <ink@jurassic.park.msu.ru>, Matt Turner <mattst88@gmail.com> Subject: [PATCH v3 08/26] alpha/PCI: Use PCI_STD_NUM_BARS Date: Mon, 16 Sep 2019 23:41:40 +0300 Message-Id: <20190916204158.6889-9-efremov@linux.com> In-Reply-To: <20190916204158.6889-1-efremov@linux.com> References: <20190916204158.6889-1-efremov@linux.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-pci-owner@vger.kernel.org Precedence: bulk
Series	[RESEND,v3,01/26] PCI: Add define for the number of standard PCI BARs \| expand [v3,02/26] PCI: hv: Use PCI_STD_NUM_BARS [v3,03/26] PCI: dwc: Use PCI_STD_NUM_BARS [v3,04/26] PCI: endpoint: Use PCI_STD_NUM_BARS [v3,05/26] misc: pci_endpoint_test: Use PCI_STD_NUM_BARS [v3,06/26] s390/pci: Use PCI_STD_NUM_BARS [v3,07/26] x86/PCI: Loop using PCI_STD_NUM_BARS [v3,08/26] alpha/PCI: Use PCI_STD_NUM_BARS [v3,09/26] ia64: Use PCI_STD_NUM_BARS [v3,10/26] stmmac: pci: Loop using PCI_STD_NUM_BARS [v3,11/26] net: dwc-xlgmac: Loop using PCI_STD_NUM_BARS [v3,12/26] ixgb: use PCI_STD_NUM_BARS [v3,13/26] e1000: Use PCI_STD_NUM_BARS [v3,14/26] rapidio/tsi721: Loop using PCI_STD_NUM_BARS [v3,15/26] efifb: Loop using PCI_STD_NUM_BARS [v3,16/26] fbmem: use PCI_STD_NUM_BARS [v3,17/26] vfio_pci: Loop using PCI_STD_NUM_BARS [v3,18/26] scsi: pm80xx: Use PCI_STD_NUM_BARS [v3,19/26] ata: sata_nv: Use PCI_STD_NUM_BARS [v3,20/26] staging: gasket: Use PCI_STD_NUM_BARS [v3,21/26] serial: 8250_pci: Use PCI_STD_NUM_BARS [v3,22/26] pata_atp867x: Use PCI_STD_NUM_BARS [v3,23/26] memstick: use PCI_STD_NUM_BARS [v3,24/26] USB: core: Use PCI_STD_NUM_BARS [v3,25/26] usb: pci-quirks: Use PCI_STD_NUM_BARS [v3,26/26] devres: use PCI_STD_NUM_BARS [RESEND,v3,01/26] PCI: Add define for the number of standard PCI BARs

Message ID

20190916204158.6889-9-efremov@linux.com

State

Deferred

Delegated to:

Bjorn Helgaas

Headers

From: Denis Efremov <efremov@linux.com>
To: Bjorn Helgaas <bhelgaas@google.com>
Cc: Denis Efremov <efremov@linux.com>, linux-kernel@vger.kernel.org,
	linux-pci@vger.kernel.org, Andrew Murray <andrew.murray@arm.com>,
	linux-alpha@vger.kernel.org, Richard Henderson <rth@twiddle.net>,
	Ivan Kokshaysky <ink@jurassic.park.msu.ru>,
	Matt Turner <mattst88@gmail.com>
Subject: [PATCH v3 08/26] alpha/PCI: Use PCI_STD_NUM_BARS
Date: Mon, 16 Sep 2019 23:41:40 +0300
Message-Id: <20190916204158.6889-9-efremov@linux.com>
In-Reply-To: <20190916204158.6889-1-efremov@linux.com>
References: <20190916204158.6889-1-efremov@linux.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Sender: linux-pci-owner@vger.kernel.org
Precedence: bulk

Series

[RESEND,v3,01/26] PCI: Add define for the number of standard PCI BARs | expand

Commit Message

Denis Efremov Sept. 16, 2019, 8:41 p.m. UTC

Use define PCI_STD_NUM_BARS instead of PCI_ROM_RESOURCE for the number of
PCI BARs.

Cc: Richard Henderson <rth@twiddle.net>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Cc: Matt Turner <mattst88@gmail.com>
Signed-off-by: Denis Efremov <efremov@linux.com>
---
 arch/alpha/kernel/pci-sysfs.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/alpha/kernel/pci-sysfs.c b/arch/alpha/kernel/pci-sysfs.c
index f94c732fedeb..0021580d79ad 100644
--- a/arch/alpha/kernel/pci-sysfs.c
+++ b/arch/alpha/kernel/pci-sysfs.c
@@ -71,10 +71,10 @@  static int pci_mmap_resource(struct kobject *kobj,
 	struct pci_bus_region bar;
 	int i;
 
-	for (i = 0; i < PCI_ROM_RESOURCE; i++)
+	for (i = 0; i < PCI_STD_NUM_BARS; i++)
 		if (res == &pdev->resource[i])
 			break;
-	if (i >= PCI_ROM_RESOURCE)
+	if (i >= PCI_STD_NUM_BARS)
 		return -ENODEV;
 
 	if (res->flags & IORESOURCE_MEM && iomem_is_exclusive(res->start))
@@ -115,7 +115,7 @@  void pci_remove_resource_files(struct pci_dev *pdev)
 {
 	int i;
 
-	for (i = 0; i < PCI_ROM_RESOURCE; i++) {
+	for (i = 0; i < PCI_STD_NUM_BARS; i++) {
 		struct bin_attribute *res_attr;
 
 		res_attr = pdev->res_attr[i];
@@ -232,7 +232,7 @@  int pci_create_resource_files(struct pci_dev *pdev)
 	int retval;
 
 	/* Expose the PCI resources from this device as files */
-	for (i = 0; i < PCI_ROM_RESOURCE; i++) {
+	for (i = 0; i < PCI_STD_NUM_BARS; i++) {
 
 		/* skip empty resources */
 		if (!pci_resource_len(pdev, i))

[v3,08/26] alpha/PCI: Use PCI_STD_NUM_BARS

Commit Message

Patch