forked from Openwrt-EcoNet/openwrt
83648084cc
Reorganize backported 6.12 generic patches, grouping them by following a standard naming XXX-XX-v6.x-patch-file-name.patch. Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
73 lines
2.4 KiB
Diff
73 lines
2.4 KiB
Diff
From 3efd0595fc7aaae300f5d9f4f0ae86f432c8d2c7 Mon Sep 17 00:00:00 2001
|
|
From: "SkyLake.Huang" <skylake.huang@mediatek.com>
|
|
Date: Sat, 9 Nov 2024 00:34:53 +0800
|
|
Subject: [PATCH 06/20] net: phy: mediatek: Improve readability of
|
|
mtk-phy-lib.c's mtk_phy_led_hw_ctrl_set()
|
|
|
|
This patch removes parens around TRIGGER_NETDEV_RX/TRIGGER_NETDEV_TX in
|
|
mtk_phy_led_hw_ctrl_set(), which improves readability.
|
|
|
|
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
|
|
Signed-off-by: SkyLake.Huang <skylake.huang@mediatek.com>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
---
|
|
drivers/net/phy/mediatek/mtk-phy-lib.c | 44 ++++++++++++++------------
|
|
1 file changed, 24 insertions(+), 20 deletions(-)
|
|
|
|
--- a/drivers/net/phy/mediatek/mtk-phy-lib.c
|
|
+++ b/drivers/net/phy/mediatek/mtk-phy-lib.c
|
|
@@ -129,29 +129,33 @@ int mtk_phy_led_hw_ctrl_set(struct phy_d
|
|
on |= MTK_PHY_LED_ON_LINK2500;
|
|
|
|
if (rules & BIT(TRIGGER_NETDEV_RX)) {
|
|
- blink |= (on & on_set) ?
|
|
- (((on & MTK_PHY_LED_ON_LINK10) ?
|
|
- MTK_PHY_LED_BLINK_10RX : 0) |
|
|
- ((on & MTK_PHY_LED_ON_LINK100) ?
|
|
- MTK_PHY_LED_BLINK_100RX : 0) |
|
|
- ((on & MTK_PHY_LED_ON_LINK1000) ?
|
|
- MTK_PHY_LED_BLINK_1000RX : 0) |
|
|
- ((on & MTK_PHY_LED_ON_LINK2500) ?
|
|
- MTK_PHY_LED_BLINK_2500RX : 0)) :
|
|
- rx_blink_set;
|
|
+ if (on & on_set) {
|
|
+ if (on & MTK_PHY_LED_ON_LINK10)
|
|
+ blink |= MTK_PHY_LED_BLINK_10RX;
|
|
+ if (on & MTK_PHY_LED_ON_LINK100)
|
|
+ blink |= MTK_PHY_LED_BLINK_100RX;
|
|
+ if (on & MTK_PHY_LED_ON_LINK1000)
|
|
+ blink |= MTK_PHY_LED_BLINK_1000RX;
|
|
+ if (on & MTK_PHY_LED_ON_LINK2500)
|
|
+ blink |= MTK_PHY_LED_BLINK_2500RX;
|
|
+ } else {
|
|
+ blink |= rx_blink_set;
|
|
+ }
|
|
}
|
|
|
|
if (rules & BIT(TRIGGER_NETDEV_TX)) {
|
|
- blink |= (on & on_set) ?
|
|
- (((on & MTK_PHY_LED_ON_LINK10) ?
|
|
- MTK_PHY_LED_BLINK_10TX : 0) |
|
|
- ((on & MTK_PHY_LED_ON_LINK100) ?
|
|
- MTK_PHY_LED_BLINK_100TX : 0) |
|
|
- ((on & MTK_PHY_LED_ON_LINK1000) ?
|
|
- MTK_PHY_LED_BLINK_1000TX : 0) |
|
|
- ((on & MTK_PHY_LED_ON_LINK2500) ?
|
|
- MTK_PHY_LED_BLINK_2500TX : 0)) :
|
|
- tx_blink_set;
|
|
+ if (on & on_set) {
|
|
+ if (on & MTK_PHY_LED_ON_LINK10)
|
|
+ blink |= MTK_PHY_LED_BLINK_10TX;
|
|
+ if (on & MTK_PHY_LED_ON_LINK100)
|
|
+ blink |= MTK_PHY_LED_BLINK_100TX;
|
|
+ if (on & MTK_PHY_LED_ON_LINK1000)
|
|
+ blink |= MTK_PHY_LED_BLINK_1000TX;
|
|
+ if (on & MTK_PHY_LED_ON_LINK2500)
|
|
+ blink |= MTK_PHY_LED_BLINK_2500TX;
|
|
+ } else {
|
|
+ blink |= tx_blink_set;
|
|
+ }
|
|
}
|
|
|
|
if (blink || on)
|