Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 282342bc authored by Juhee Kang's avatar Juhee Kang Committed by Greg Kroah-Hartman
Browse files

r8169: use tp_to_dev instead of open code 



[ Upstream commit 4b6c6065fca123d419afef005a696f51e6590470 ]

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 1e1205b7 ("r8169: add helper tp_to_dev"). And then later,
commit f1e911d5 ("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: default avatarJuhee Kang <claudiajkang@gmail.com>
Reviewed-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Link: https://lore.kernel.org/r/20221129161244.5356-1-claudiajkang@gmail.com


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
Stable-dep-of: 621735f59064 ("r8169: fix rare issue with broken rx after link-down on RTL8125")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 3091ab94

drivers/net/ethernet/realtek/r8169_main.c

+3 −2
Original line number Diff line number Diff line
@@ -6293,12 +6293,13 @@ static void rtl8169_rx_missed(struct net_device *dev) 
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);

	}



	if (net_ratelimit())