mirror of
https://github.com/Ysurac/openmptcprouter.git
synced 2025-02-15 04:42:02 +00:00
38 lines
1.5 KiB
Diff
38 lines
1.5 KiB
Diff
From fd149c4ab09b01136c7e80db020eed59a3385d24 Mon Sep 17 00:00:00 2001
|
|
From: Juhee Kang <claudiajkang@gmail.com>
|
|
Date: Wed, 30 Nov 2022 01:12:44 +0900
|
|
Subject: [PATCH 3/4] r8169: use tp_to_dev instead of open code
|
|
|
|
The open code is defined as a helper function(tp_to_dev) on r8169_main.c,
|
|
which the open code is &tp->pci_dev->dev. The helper function was added
|
|
in commit 1e1205b7d3e9 ("r8169: add helper tp_to_dev"). And then later,
|
|
commit f1e911d5d0df ("r8169: add basic phylib support") added
|
|
r8169_phylink_handler function but it didn't use the helper function.
|
|
Thus, tp_to_dev() replaces the open code. This patch doesn't change logic.
|
|
|
|
Signed-off-by: Juhee Kang <claudiajkang@gmail.com>
|
|
Reviewed-by: Heiner Kallweit <hkallweit1@gmail.com>
|
|
Link: https://lore.kernel.org/r/20221129161244.5356-1-claudiajkang@gmail.com
|
|
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
|
|
---
|
|
drivers/net/ethernet/realtek/r8169_main.c | 5 +++--
|
|
1 file changed, 3 insertions(+), 2 deletions(-)
|
|
|
|
--- a/drivers/net/ethernet/realtek/r8169_main.c
|
|
+++ b/drivers/net/ethernet/realtek/r8169_main.c
|
|
@@ -4559,12 +4559,13 @@ static int rtl8169_poll(struct napi_stru
|
|
static void r8169_phylink_handler(struct net_device *ndev)
|
|
{
|
|
struct rtl8169_private *tp = netdev_priv(ndev);
|
|
+ struct device *d = tp_to_dev(tp);
|
|
|
|
if (netif_carrier_ok(ndev)) {
|
|
rtl_link_chg_patch(tp);
|
|
- pm_request_resume(&tp->pci_dev->dev);
|
|
+ pm_request_resume(d);
|
|
} else {
|
|
- pm_runtime_idle(&tp->pci_dev->dev);
|
|
+ pm_runtime_idle(d);
|
|
}
|
|
|
|
phy_print_status(tp->phydev);
|