git.openwrt.org Git - openwrt/staging/pepe2k.git/blob

   1 From 3efd0595fc7aaae300f5d9f4f0ae86f432c8d2c7 Mon Sep 17 00:00:00 2001
   2 From: "SkyLake.Huang" <skylake.huang@mediatek.com>
   3 Date: Sat, 9 Nov 2024 00:34:53 +0800
   4 Subject: [PATCH 06/20] net: phy: mediatek: Improve readability of
   5  mtk-phy-lib.c's mtk_phy_led_hw_ctrl_set()
   6
   7 This patch removes parens around TRIGGER_NETDEV_RX/TRIGGER_NETDEV_TX in
   8 mtk_phy_led_hw_ctrl_set(), which improves readability.
   9
  10 Reviewed-by: Andrew Lunn <andrew@lunn.ch>
  11 Signed-off-by: SkyLake.Huang <skylake.huang@mediatek.com>
  12 Signed-off-by: David S. Miller <davem@davemloft.net>
  13 ---
  14  drivers/net/phy/mediatek/mtk-phy-lib.c | 44 ++++++++++++++------------
  15  1 file changed, 24 insertions(+), 20 deletions(-)
  16
  17 --- a/drivers/net/phy/mediatek/mtk-phy-lib.c
  18 +++ b/drivers/net/phy/mediatek/mtk-phy-lib.c
  19 @@ -129,29 +129,33 @@ int mtk_phy_led_hw_ctrl_set(struct phy_d
  20                 on |= MTK_PHY_LED_ON_LINK2500;
  21
  22         if (rules & BIT(TRIGGER_NETDEV_RX)) {
  23 -               blink |= (on & on_set) ?
  24 -                         (((on & MTK_PHY_LED_ON_LINK10) ?
  25 -                           MTK_PHY_LED_BLINK_10RX : 0) |
  26 -                          ((on & MTK_PHY_LED_ON_LINK100) ?
  27 -                           MTK_PHY_LED_BLINK_100RX : 0) |
  28 -                          ((on & MTK_PHY_LED_ON_LINK1000) ?
  29 -                           MTK_PHY_LED_BLINK_1000RX : 0) |
  30 -                          ((on & MTK_PHY_LED_ON_LINK2500) ?
  31 -                           MTK_PHY_LED_BLINK_2500RX : 0)) :
  32 -                         rx_blink_set;
  33 +               if (on & on_set) {
  34 +                       if (on & MTK_PHY_LED_ON_LINK10)
  35 +                               blink |= MTK_PHY_LED_BLINK_10RX;
  36 +                       if (on & MTK_PHY_LED_ON_LINK100)
  37 +                               blink |= MTK_PHY_LED_BLINK_100RX;
  38 +                       if (on & MTK_PHY_LED_ON_LINK1000)
  39 +                               blink |= MTK_PHY_LED_BLINK_1000RX;
  40 +                       if (on & MTK_PHY_LED_ON_LINK2500)
  41 +                               blink |= MTK_PHY_LED_BLINK_2500RX;
  42 +               } else {
  43 +                       blink |= rx_blink_set;
  44 +               }
  45         }
  46
  47         if (rules & BIT(TRIGGER_NETDEV_TX)) {
  48 -               blink |= (on & on_set) ?
  49 -                         (((on & MTK_PHY_LED_ON_LINK10) ?
  50 -                           MTK_PHY_LED_BLINK_10TX : 0) |
  51 -                          ((on & MTK_PHY_LED_ON_LINK100) ?
  52 -                           MTK_PHY_LED_BLINK_100TX : 0) |
  53 -                          ((on & MTK_PHY_LED_ON_LINK1000) ?
  54 -                           MTK_PHY_LED_BLINK_1000TX : 0) |
  55 -                          ((on & MTK_PHY_LED_ON_LINK2500) ?
  56 -                           MTK_PHY_LED_BLINK_2500TX : 0)) :
  57 -                         tx_blink_set;
  58 +               if (on & on_set) {
  59 +                       if (on & MTK_PHY_LED_ON_LINK10)
  60 +                               blink |= MTK_PHY_LED_BLINK_10TX;
  61 +                       if (on & MTK_PHY_LED_ON_LINK100)
  62 +                               blink |= MTK_PHY_LED_BLINK_100TX;
  63 +                       if (on & MTK_PHY_LED_ON_LINK1000)
  64 +                               blink |= MTK_PHY_LED_BLINK_1000TX;
  65 +                       if (on & MTK_PHY_LED_ON_LINK2500)
  66 +                               blink |= MTK_PHY_LED_BLINK_2500TX;
  67 +               } else {
  68 +                       blink |= tx_blink_set;
  69 +               }
  70         }
  71
  72         if (blink || on)