r8169: switch away from deprecated pcim_iomap_table
authorHeiner Kallweit <hkallweit1@gmail.com>
Wed, 12 Mar 2025 19:21:42 +0000 (20:21 +0100)
committerPaolo Abeni <pabeni@redhat.com>
Wed, 19 Mar 2025 18:03:31 +0000 (19:03 +0100)
Avoid using deprecated pcim_iomap_table by switching to
pcim_iomap_region.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Link: https://patch.msgid.link/a36b4cf3-c792-40fa-8164-5dc9d5f14dd0@gmail.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
drivers/net/ethernet/realtek/r8169_main.c

index b18daeeda40d965481d82113becfe9b3e7978ee0..53e541ddb439f7a286d93d54c7c1362db9731926 100644 (file)
@@ -5447,11 +5447,10 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
        if (region < 0)
                return dev_err_probe(&pdev->dev, -ENODEV, "no MMIO resource found\n");
 
-       rc = pcim_iomap_regions(pdev, BIT(region), KBUILD_MODNAME);
-       if (rc < 0)
-               return dev_err_probe(&pdev->dev, rc, "cannot remap MMIO, aborting\n");
-
-       tp->mmio_addr = pcim_iomap_table(pdev)[region];
+       tp->mmio_addr = pcim_iomap_region(pdev, region, KBUILD_MODNAME);
+       if (IS_ERR(tp->mmio_addr))
+               return dev_err_probe(&pdev->dev, PTR_ERR(tp->mmio_addr),
+                                    "cannot remap MMIO, aborting\n");
 
        txconfig = RTL_R32(tp, TxConfig);
        if (txconfig == ~0U)