i40e: Remove unreachable code
authorHenry Tieman <henry.w.tieman@intel.com>
Tue, 8 Nov 2016 21:05:06 +0000 (13:05 -0800)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Sat, 3 Dec 2016 07:13:33 +0000 (23:13 -0800)
The code at the end of i40e_read_phy_register_clause22() contained
unreachable code and redundant control statements.

This change removes the unreachable code. And deletes the redundant
goto statement and if statement.

Change-ID: I713032b1585396f40f903cbcfdea987abd874400
Signed-off-by: Henry Tieman <henry.w.tieman@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
drivers/net/ethernet/intel/i40e/i40e_common.c

index e83e8e3..fc7ce02 100644 (file)
@@ -4439,19 +4439,12 @@ i40e_status i40e_read_phy_register_clause22(struct i40e_hw *hw,
        if (status) {
                i40e_debug(hw, I40E_DEBUG_PHY,
                           "PHY: Can't write command to external PHY.\n");
-               goto phy_read_end;
-       }
-
-       if (!status) {
+       } else {
                command = rd32(hw, I40E_GLGEN_MSRWD(port_num));
                *value = (command & I40E_GLGEN_MSRWD_MDIRDDATA_MASK) >>
                         I40E_GLGEN_MSRWD_MDIRDDATA_SHIFT;
-       } else {
-               i40e_debug(hw, I40E_DEBUG_PHY,
-                          "PHY: Can't read register value from external PHY.\n");
        }
 
-phy_read_end:
        return status;
 }