qlge: fix duplicated code for different branches

Refactor code in order to avoid identical code for different branches.

This issue was detected with the help of Coccinelle.

Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/qlogic/qlge/qlge_dbg.c b/drivers/net/ethernet/qlogic/qlge/qlge_dbg.c
index 28ea0af89aefeb2a733801af03a21b20d269cb37..458d55ba423f599ec824dc327f248a9b64d8af96 100644 (file)
--- a/drivers/net/ethernet/qlogic/qlge/qlge_dbg.c
+++ b/drivers/net/ethernet/qlogic/qlge/qlge_dbg.c
@@ -144,42 +144,23 @@ static int ql_get_serdes_regs(struct ql_adapter *qdev,
        xaui_direct_valid = xaui_indirect_valid = 1;
 
        /* The XAUI needs to be read out per port */
-       if (qdev->func & 1) {
-               /* We are NIC 2 */
-               status = ql_read_other_func_serdes_reg(qdev,
-                               XG_SERDES_XAUI_HSS_PCS_START, &temp);
-               if (status)
-                       temp = XG_SERDES_ADDR_XAUI_PWR_DOWN;
-               if ((temp & XG_SERDES_ADDR_XAUI_PWR_DOWN) ==
-                                       XG_SERDES_ADDR_XAUI_PWR_DOWN)
-                       xaui_indirect_valid = 0;
+       status = ql_read_other_func_serdes_reg(qdev,
+                       XG_SERDES_XAUI_HSS_PCS_START, &temp);
+       if (status)
+               temp = XG_SERDES_ADDR_XAUI_PWR_DOWN;
 
-               status = ql_read_serdes_reg(qdev,
-                               XG_SERDES_XAUI_HSS_PCS_START, &temp);
-               if (status)
-                       temp = XG_SERDES_ADDR_XAUI_PWR_DOWN;
+       if ((temp & XG_SERDES_ADDR_XAUI_PWR_DOWN) ==
+                               XG_SERDES_ADDR_XAUI_PWR_DOWN)
+               xaui_indirect_valid = 0;
 
-               if ((temp & XG_SERDES_ADDR_XAUI_PWR_DOWN) ==
-                                       XG_SERDES_ADDR_XAUI_PWR_DOWN)
-                       xaui_direct_valid = 0;
-       } else {
-               /* We are NIC 1 */
-               status = ql_read_other_func_serdes_reg(qdev,
-                               XG_SERDES_XAUI_HSS_PCS_START, &temp);
-               if (status)
-                       temp = XG_SERDES_ADDR_XAUI_PWR_DOWN;
-               if ((temp & XG_SERDES_ADDR_XAUI_PWR_DOWN) ==
-                                       XG_SERDES_ADDR_XAUI_PWR_DOWN)
-                       xaui_indirect_valid = 0;
+       status = ql_read_serdes_reg(qdev, XG_SERDES_XAUI_HSS_PCS_START, &temp);
 
-               status = ql_read_serdes_reg(qdev,
-                               XG_SERDES_XAUI_HSS_PCS_START, &temp);
-               if (status)
-                       temp = XG_SERDES_ADDR_XAUI_PWR_DOWN;
-               if ((temp & XG_SERDES_ADDR_XAUI_PWR_DOWN) ==
-                                       XG_SERDES_ADDR_XAUI_PWR_DOWN)
-                       xaui_direct_valid = 0;
-       }
+       if (status)
+               temp = XG_SERDES_ADDR_XAUI_PWR_DOWN;
+
+       if ((temp & XG_SERDES_ADDR_XAUI_PWR_DOWN) ==
+                               XG_SERDES_ADDR_XAUI_PWR_DOWN)
+               xaui_direct_valid = 0;
 
        /*
         * XFI register is shared so only need to read one