git.ipfire.org Git - thirdparty/openwrt.git/blob

   1 From 34e5ededf4b8ad4c9e58f0cab8596e26c8fa59a2 Mon Sep 17 00:00:00 2001
   2 From: Heiner Kallweit <hkallweit1@gmail.com>
   3 Date: Wed, 12 Mar 2025 20:21:42 +0100
   4 Subject: [PATCH] r8169: switch away from deprecated pcim_iomap_table
   5
   6 Avoid using deprecated pcim_iomap_table by switching to
   7 pcim_iomap_region.
   8
   9 Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
  10 Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
  11 Reviewed-by: Simon Horman <horms@kernel.org>
  12 Link: https://patch.msgid.link/a36b4cf3-c792-40fa-8164-5dc9d5f14dd0@gmail.com
  13 Signed-off-by: Paolo Abeni <pabeni@redhat.com>
  14 ---
  15  drivers/net/ethernet/realtek/r8169_main.c | 9 ++++-----
  16  1 file changed, 4 insertions(+), 5 deletions(-)
  17
  18 --- a/drivers/net/ethernet/realtek/r8169_main.c
  19 +++ b/drivers/net/ethernet/realtek/r8169_main.c
  20 @@ -5446,11 +5446,10 @@ static int rtl_init_one(struct pci_dev *
  21         if (region < 0)
  22                 return dev_err_probe(&pdev->dev, -ENODEV, "no MMIO resource found\n");
  23
  24 -       rc = pcim_iomap_regions(pdev, BIT(region), KBUILD_MODNAME);
  25 -       if (rc < 0)
  26 -               return dev_err_probe(&pdev->dev, rc, "cannot remap MMIO, aborting\n");
  27 -
  28 -       tp->mmio_addr = pcim_iomap_table(pdev)[region];
  29 +       tp->mmio_addr = pcim_iomap_region(pdev, region, KBUILD_MODNAME);
  30 +       if (IS_ERR(tp->mmio_addr))
  31 +               return dev_err_probe(&pdev->dev, PTR_ERR(tp->mmio_addr),
  32 +                                    "cannot remap MMIO, aborting\n");
  33
  34         txconfig = RTL_R32(tp, TxConfig);
  35         if (txconfig == ~0U)