]> git.baikalelectronics.ru Git - kernel.git/commitdiff
igb: make igb_set_fc_watermarks() return void
authorJason Yan <yanaijie@huawei.com>
Thu, 7 May 2020 11:09:15 +0000 (19:09 +0800)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Fri, 29 May 2020 03:04:01 +0000 (20:04 -0700)
This function always return 0 now, we can make it return void to
simplify the code. This fixes the following coccicheck warning:

drivers/net/ethernet/intel/igb/e1000_mac.c:728:5-12: Unneeded variable:
"ret_val". Return "0" on line 751

Signed-off-by: Jason Yan <yanaijie@huawei.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
drivers/net/ethernet/intel/igb/e1000_mac.c

index 79ee0a7472608ec823e29d576a40a29b05237fe1..3254737c07a31a0a3998b0afa4f91b612c7fca71 100644 (file)
@@ -12,7 +12,7 @@
 #include "igb.h"
 
 static s32 igb_set_default_fc(struct e1000_hw *hw);
-static s32 igb_set_fc_watermarks(struct e1000_hw *hw);
+static void igb_set_fc_watermarks(struct e1000_hw *hw);
 
 /**
  *  igb_get_bus_info_pcie - Get PCIe bus information
@@ -687,7 +687,7 @@ s32 igb_setup_link(struct e1000_hw *hw)
 
        wr32(E1000_FCTTV, hw->fc.pause_time);
 
-       ret_val = igb_set_fc_watermarks(hw);
+       igb_set_fc_watermarks(hw);
 
 out:
 
@@ -723,9 +723,8 @@ void igb_config_collision_dist(struct e1000_hw *hw)
  *  flow control XON frame transmission is enabled, then set XON frame
  *  tansmission as well.
  **/
-static s32 igb_set_fc_watermarks(struct e1000_hw *hw)
+static void igb_set_fc_watermarks(struct e1000_hw *hw)
 {
-       s32 ret_val = 0;
        u32 fcrtl = 0, fcrth = 0;
 
        /* Set the flow control receive threshold registers.  Normally,
@@ -747,8 +746,6 @@ static s32 igb_set_fc_watermarks(struct e1000_hw *hw)
        }
        wr32(E1000_FCRTL, fcrtl);
        wr32(E1000_FCRTH, fcrth);
-
-       return ret_val;
 }
 
 /**