Commit 34e5eded authored by Heiner Kallweit's avatar Heiner Kallweit Committed by Paolo Abeni
Browse files

r8169: switch away from deprecated pcim_iomap_table 



Avoid using deprecated pcim_iomap_table by switching to
pcim_iomap_region.

Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Reviewed-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Link: https://patch.msgid.link/a36b4cf3-c792-40fa-8164-5dc9d5f14dd0@gmail.com


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 05b815fc

drivers/net/ethernet/realtek/r8169_main.c

+4 −5
Original line number Diff line number Diff line
@@ -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)