mirror of
https://github.com/VIKINGYFY/immortalwrt.git
synced 2025-12-17 01:26:01 +00:00
48df382797
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.12.55 Removed upstreamed: generic/backport-6.12/510-v6.18-ksmbd-fix-recursive-locking-in-RPC-handle-list-access.patch[1] All other patches automatically rebased. 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.55&id=4602b8cee1481dbb896182e5cb1e8cf12910e9e7 Build system: x86/64 Build-tested: x86/64-glibc Run-tested: x86/64-glibc Signed-off-by: John Audia <therealgraysky@proton.me> Link: https://github.com/openwrt/openwrt/pull/20515 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
36 lines
1.4 KiB
Diff
36 lines
1.4 KiB
Diff
From 34e5ededf4b8ad4c9e58f0cab8596e26c8fa59a2 Mon Sep 17 00:00:00 2001
|
|
From: Heiner Kallweit <hkallweit1@gmail.com>
|
|
Date: Wed, 12 Mar 2025 20:21:42 +0100
|
|
Subject: [PATCH] r8169: switch away from deprecated pcim_iomap_table
|
|
|
|
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 | 9 ++++-----
|
|
1 file changed, 4 insertions(+), 5 deletions(-)
|
|
|
|
--- a/drivers/net/ethernet/realtek/r8169_main.c
|
|
+++ b/drivers/net/ethernet/realtek/r8169_main.c
|
|
@@ -5474,11 +5474,10 @@ static int rtl_init_one(struct pci_dev *
|
|
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)
|