alpha/PCI: Use PCI resource accessor macros

Replace direct pdev->resource[] accesses with pci_resource_n(), and
open-coded res->flags type checks with pci_resource_is_mem() and
pci_resource_start() helpers.

While at it, move the pci_resource_n() call directly into
pcibios_resource_to_bus() and drop the local struct resource pointer.

No functional changes intended.

Signed-off-by: Krzysztof Wilczyński <kwilczynski@kernel.org>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Tested-by: Magnus Lindholm <linmag7@gmail.com>
Tested-by: Shivaprasad G Bhat <sbhat@linux.ibm.com>
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Acked-by: Magnus Lindholm <linmag7@gmail.com>
Link: https://patch.msgid.link/20260508043543.217179-14-kwilczynski@kernel.org

diff --git a/arch/alpha/kernel/pci-sysfs.c b/arch/alpha/kernel/pci-sysfs.c
index 2330ab84d59c1f4056776f4795585c79bd4ecd79..5c29f1d2821caeb49b5cd24b82fb25699997736a 100644 (file)
--- a/arch/alpha/kernel/pci-sysfs.c
+++ b/arch/alpha/kernel/pci-sysfs.c
@@ -70,7 +70,6 @@ static int pci_mmap_resource(struct kobject *kobj,
 {
        struct pci_dev *pdev = to_pci_dev(kobj_to_dev(kobj));
        int barno = (unsigned long)attr->private;
-       struct resource *res = pci_resource_n(pdev, barno);
        enum pci_mmap_state mmap_type;
        struct pci_bus_region bar;
        int ret;
@@ -79,15 +78,16 @@ static int pci_mmap_resource(struct kobject *kobj,
        if (ret)
                return ret;
 
-       if (res->flags & IORESOURCE_MEM && iomem_is_exclusive(res->start))
+       if (pci_resource_is_mem(pdev, barno) &&
+           iomem_is_exclusive(pci_resource_start(pdev, barno)))
                return -EINVAL;
 
        if (!__pci_mmap_fits(pdev, barno, vma, sparse))
                return -EINVAL;
 
-       pcibios_resource_to_bus(pdev->bus, &bar, res);
+       pcibios_resource_to_bus(pdev->bus, &bar, pci_resource_n(pdev, barno));
        vma->vm_pgoff += bar.start >> (PAGE_SHIFT - (sparse ? 5 : 0));
-       mmap_type = res->flags & IORESOURCE_MEM ? pci_mmap_mem : pci_mmap_io;
+       mmap_type = pci_resource_is_mem(pdev, barno) ? pci_mmap_mem : pci_mmap_io;
 
        return hose_mmap_page_range(pdev->sysdata, vma, mmap_type, sparse);
 }
@@ -141,7 +141,7 @@ static int sparse_mem_mmap_fits(struct pci_dev *pdev, int num)
        long dense_offset;
        unsigned long sparse_size;
 
-       pcibios_resource_to_bus(pdev->bus, &bar, &pdev->resource[num]);
+       pcibios_resource_to_bus(pdev->bus, &bar, pci_resource_n(pdev, num));
 
        /* All core logic chips have 4G sparse address space, except
           CIA which has 16G (see xxx_SPARSE_MEM and xxx_DENSE_MEM
@@ -181,7 +181,7 @@ static int pci_create_attr(struct pci_dev *pdev, int num)
        suffix = "";    /* Assume bwx machine, normal resourceN files. */
        nlen1 = 10;
 
-       if (pdev->resource[num].flags & IORESOURCE_MEM) {
+       if (pci_resource_is_mem(pdev, num)) {
                sparse_base = hose->sparse_mem_base;
                dense_base = hose->dense_mem_base;
                if (sparse_base && !sparse_mem_mmap_fits(pdev, num)) {