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

   1 From 2b118202583eb05a1799d435d2dce974dc3f5b16 Mon Sep 17 00:00:00 2001
   2 From: "SkyLake.Huang" <skylake.huang@mediatek.com>
   3 Date: Fri, 4 Oct 2024 18:24:08 +0800
   4 Subject: [PATCH 4/9] 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 Signed-off-by: SkyLake.Huang <skylake.huang@mediatek.com>
  11 ---
  12  drivers/net/phy/mediatek/mtk-phy-lib.c | 44 ++++++++++++++------------
  13  1 file changed, 24 insertions(+), 20 deletions(-)
  14
  15 --- a/drivers/net/phy/mediatek/mtk-phy-lib.c
  16 +++ b/drivers/net/phy/mediatek/mtk-phy-lib.c
  17 @@ -127,29 +127,33 @@ int mtk_phy_led_hw_ctrl_set(struct phy_d
  18                 on |= MTK_PHY_LED_ON_LINK2500;
  19
  20         if (rules & BIT(TRIGGER_NETDEV_RX)) {
  21 -               blink |= (on & on_set) ?
  22 -                         (((on & MTK_PHY_LED_ON_LINK10) ?
  23 -                           MTK_PHY_LED_BLINK_10RX : 0) |
  24 -                          ((on & MTK_PHY_LED_ON_LINK100) ?
  25 -                           MTK_PHY_LED_BLINK_100RX : 0) |
  26 -                          ((on & MTK_PHY_LED_ON_LINK1000) ?
  27 -                           MTK_PHY_LED_BLINK_1000RX : 0) |
  28 -                          ((on & MTK_PHY_LED_ON_LINK2500) ?
  29 -                           MTK_PHY_LED_BLINK_2500RX : 0)) :
  30 -                         rx_blink_set;
  31 +               if (on & on_set) {
  32 +                       if (on & MTK_PHY_LED_ON_LINK10)
  33 +                               blink |= MTK_PHY_LED_BLINK_10RX;
  34 +                       if (on & MTK_PHY_LED_ON_LINK100)
  35 +                               blink |= MTK_PHY_LED_BLINK_100RX;
  36 +                       if (on & MTK_PHY_LED_ON_LINK1000)
  37 +                               blink |= MTK_PHY_LED_BLINK_1000RX;
  38 +                       if (on & MTK_PHY_LED_ON_LINK2500)
  39 +                               blink |= MTK_PHY_LED_BLINK_2500RX;
  40 +               } else {
  41 +                       blink |= rx_blink_set;
  42 +               }
  43         }
  44
  45         if (rules & BIT(TRIGGER_NETDEV_TX)) {
  46 -               blink |= (on & on_set) ?
  47 -                         (((on & MTK_PHY_LED_ON_LINK10) ?
  48 -                           MTK_PHY_LED_BLINK_10TX : 0) |
  49 -                          ((on & MTK_PHY_LED_ON_LINK100) ?
  50 -                           MTK_PHY_LED_BLINK_100TX : 0) |
  51 -                          ((on & MTK_PHY_LED_ON_LINK1000) ?
  52 -                           MTK_PHY_LED_BLINK_1000TX : 0) |
  53 -                          ((on & MTK_PHY_LED_ON_LINK2500) ?
  54 -                           MTK_PHY_LED_BLINK_2500TX : 0)) :
  55 -                         tx_blink_set;
  56 +               if (on & on_set) {
  57 +                       if (on & MTK_PHY_LED_ON_LINK10)
  58 +                               blink |= MTK_PHY_LED_BLINK_10TX;
  59 +                       if (on & MTK_PHY_LED_ON_LINK100)
  60 +                               blink |= MTK_PHY_LED_BLINK_100TX;
  61 +                       if (on & MTK_PHY_LED_ON_LINK1000)
  62 +                               blink |= MTK_PHY_LED_BLINK_1000TX;
  63 +                       if (on & MTK_PHY_LED_ON_LINK2500)
  64 +                               blink |= MTK_PHY_LED_BLINK_2500TX;
  65 +               } else {
  66 +                       blink |= tx_blink_set;
  67 +               }
  68         }
  69
  70         if (blink || on)