Skip to content

Commit

Permalink
r8169: switch away from deprecated pcim_iomap_table
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Heiner Kallweit authored and Paolo Abeni committed Mar 19, 2025
1 parent 05b815f commit 34e5ede
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions drivers/net/ethernet/realtek/r8169_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 34e5ede

Please sign in to comment.