Skip to content

Commit

Permalink
igb: make igb_set_fc_watermarks() return void
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jason Yan authored and Jeff Kirsher committed May 29, 2020
1 parent f2d9f29 commit 49c65e9
Showing 1 changed file with 3 additions and 6 deletions.
9 changes: 3 additions & 6 deletions drivers/net/ethernet/intel/igb/e1000_mac.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:

Expand Down Expand Up @@ -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,
Expand All @@ -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;
}

/**
Expand Down

0 comments on commit 49c65e9

Please sign in to comment.