* [PATCH net-next] r8169: switch away from deprecated pcim_iomap_table
@ 2025-03-12 19:21 Heiner Kallweit
2025-03-13 21:22 ` Jacob Keller
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Heiner Kallweit @ 2025-03-12 19:21 UTC (permalink / raw)
To: Realtek linux nic maintainers, Andrew Lunn, Paolo Abeni,
Jakub Kicinski, David Miller, Eric Dumazet, Simon Horman
Cc: netdev@vger.kernel.org
Avoid using deprecated pcim_iomap_table by switching to
pcim_iomap_region.
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
---
drivers/net/ethernet/realtek/r8169_main.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c
index b18daeeda..53e541ddb 100644
--- a/drivers/net/ethernet/realtek/r8169_main.c
+++ b/drivers/net/ethernet/realtek/r8169_main.c
@@ -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)
--
2.48.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH net-next] r8169: switch away from deprecated pcim_iomap_table
2025-03-12 19:21 [PATCH net-next] r8169: switch away from deprecated pcim_iomap_table Heiner Kallweit
@ 2025-03-13 21:22 ` Jacob Keller
2025-03-18 19:49 ` Simon Horman
2025-03-19 18:10 ` patchwork-bot+netdevbpf
2 siblings, 0 replies; 4+ messages in thread
From: Jacob Keller @ 2025-03-13 21:22 UTC (permalink / raw)
To: Heiner Kallweit, Realtek linux nic maintainers, Andrew Lunn,
Paolo Abeni, Jakub Kicinski, David Miller, Eric Dumazet,
Simon Horman
Cc: netdev@vger.kernel.org
On 3/12/2025 12:21 PM, Heiner Kallweit wrote:
> Avoid using deprecated pcim_iomap_table by switching to
> pcim_iomap_region.
>
> Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
> ---
> drivers/net/ethernet/realtek/r8169_main.c | 9 ++++-----
> 1 file changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c
> index b18daeeda..53e541ddb 100644
> --- a/drivers/net/ethernet/realtek/r8169_main.c
> +++ b/drivers/net/ethernet/realtek/r8169_main.c
> @@ -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)
Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH net-next] r8169: switch away from deprecated pcim_iomap_table
2025-03-12 19:21 [PATCH net-next] r8169: switch away from deprecated pcim_iomap_table Heiner Kallweit
2025-03-13 21:22 ` Jacob Keller
@ 2025-03-18 19:49 ` Simon Horman
2025-03-19 18:10 ` patchwork-bot+netdevbpf
2 siblings, 0 replies; 4+ messages in thread
From: Simon Horman @ 2025-03-18 19:49 UTC (permalink / raw)
To: Heiner Kallweit
Cc: Realtek linux nic maintainers, Andrew Lunn, Paolo Abeni,
Jakub Kicinski, David Miller, Eric Dumazet,
netdev@vger.kernel.org
On Wed, Mar 12, 2025 at 08:21:42PM +0100, Heiner Kallweit wrote:
> Avoid using deprecated pcim_iomap_table by switching to
> pcim_iomap_region.
>
> Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Reviewed-by: Simon Horman <horms@kernel.org>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH net-next] r8169: switch away from deprecated pcim_iomap_table
2025-03-12 19:21 [PATCH net-next] r8169: switch away from deprecated pcim_iomap_table Heiner Kallweit
2025-03-13 21:22 ` Jacob Keller
2025-03-18 19:49 ` Simon Horman
@ 2025-03-19 18:10 ` patchwork-bot+netdevbpf
2 siblings, 0 replies; 4+ messages in thread
From: patchwork-bot+netdevbpf @ 2025-03-19 18:10 UTC (permalink / raw)
To: Heiner Kallweit
Cc: nic_swsd, andrew+netdev, pabeni, kuba, davem, edumazet, horms,
netdev
Hello:
This patch was applied to netdev/net-next.git (main)
by Paolo Abeni <pabeni@redhat.com>:
On Wed, 12 Mar 2025 20:21:42 +0100 you wrote:
> Avoid using deprecated pcim_iomap_table by switching to
> pcim_iomap_region.
>
> Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
> ---
> drivers/net/ethernet/realtek/r8169_main.c | 9 ++++-----
> 1 file changed, 4 insertions(+), 5 deletions(-)
Here is the summary with links:
- [net-next] r8169: switch away from deprecated pcim_iomap_table
https://git.kernel.org/netdev/net-next/c/34e5ededf4b8
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2025-03-19 18:09 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-03-12 19:21 [PATCH net-next] r8169: switch away from deprecated pcim_iomap_table Heiner Kallweit
2025-03-13 21:22 ` Jacob Keller
2025-03-18 19:49 ` Simon Horman
2025-03-19 18:10 ` patchwork-bot+netdevbpf
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).