ixgbe: remove unnecessary return value check
Remove unnecessary return value check. Signed-off-by: Jakub Chylkowski <jakubx.chylkowski@intel.com> Signed-off-by: Guinan Sun <guinanx.sun@intel.com> Reviewed-by: Wei Zhao <wei.zhao1@intel.com> Approved by: imp Obtained from: DPDK (4b0ee6529b7897c2a08dd56669f07ac1f46a8474) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D31621
This commit is contained in:
parent
80a39a2bda
commit
3a89005394
@ -2130,9 +2130,7 @@ s32 ixgbe_start_hw_82599(struct ixgbe_hw *hw)
|
||||
if (ret_val != IXGBE_SUCCESS)
|
||||
goto out;
|
||||
|
||||
ret_val = ixgbe_start_hw_gen2(hw);
|
||||
if (ret_val != IXGBE_SUCCESS)
|
||||
goto out;
|
||||
ixgbe_start_hw_gen2(hw);
|
||||
|
||||
/* We need to run link autotry after the driver loads */
|
||||
hw->mac.autotry_restart = true;
|
||||
|
@ -457,7 +457,7 @@ s32 ixgbe_start_hw_generic(struct ixgbe_hw *hw)
|
||||
* 82599
|
||||
* X540
|
||||
**/
|
||||
s32 ixgbe_start_hw_gen2(struct ixgbe_hw *hw)
|
||||
void ixgbe_start_hw_gen2(struct ixgbe_hw *hw)
|
||||
{
|
||||
u32 i;
|
||||
u32 regval;
|
||||
@ -482,8 +482,6 @@ s32 ixgbe_start_hw_gen2(struct ixgbe_hw *hw)
|
||||
IXGBE_DCA_RXCTRL_HEAD_WRO_EN);
|
||||
IXGBE_WRITE_REG(hw, IXGBE_DCA_RXCTRL(i), regval);
|
||||
}
|
||||
|
||||
return IXGBE_SUCCESS;
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -56,7 +56,7 @@ u16 ixgbe_get_pcie_msix_count_generic(struct ixgbe_hw *hw);
|
||||
s32 ixgbe_init_ops_generic(struct ixgbe_hw *hw);
|
||||
s32 ixgbe_init_hw_generic(struct ixgbe_hw *hw);
|
||||
s32 ixgbe_start_hw_generic(struct ixgbe_hw *hw);
|
||||
s32 ixgbe_start_hw_gen2(struct ixgbe_hw *hw);
|
||||
void ixgbe_start_hw_gen2(struct ixgbe_hw *hw);
|
||||
s32 ixgbe_clear_hw_cntrs_generic(struct ixgbe_hw *hw);
|
||||
s32 ixgbe_read_pba_num_generic(struct ixgbe_hw *hw, u32 *pba_num);
|
||||
s32 ixgbe_read_pba_string_generic(struct ixgbe_hw *hw, u8 *pba_num,
|
||||
|
@ -39,10 +39,10 @@
|
||||
|
||||
static void ixgbe_i2c_start(struct ixgbe_hw *hw);
|
||||
static void ixgbe_i2c_stop(struct ixgbe_hw *hw);
|
||||
static s32 ixgbe_clock_in_i2c_byte(struct ixgbe_hw *hw, u8 *data);
|
||||
static void ixgbe_clock_in_i2c_byte(struct ixgbe_hw *hw, u8 *data);
|
||||
static s32 ixgbe_clock_out_i2c_byte(struct ixgbe_hw *hw, u8 data);
|
||||
static s32 ixgbe_get_i2c_ack(struct ixgbe_hw *hw);
|
||||
static s32 ixgbe_clock_in_i2c_bit(struct ixgbe_hw *hw, bool *data);
|
||||
static void ixgbe_clock_in_i2c_bit(struct ixgbe_hw *hw, bool *data);
|
||||
static s32 ixgbe_clock_out_i2c_bit(struct ixgbe_hw *hw, bool data);
|
||||
static void ixgbe_raise_i2c_clk(struct ixgbe_hw *hw, u32 *i2cctl);
|
||||
static void ixgbe_lower_i2c_clk(struct ixgbe_hw *hw, u32 *i2cctl);
|
||||
@ -77,11 +77,7 @@ static s32 ixgbe_out_i2c_byte_ack(struct ixgbe_hw *hw, u8 byte)
|
||||
*/
|
||||
static s32 ixgbe_in_i2c_byte_ack(struct ixgbe_hw *hw, u8 *byte)
|
||||
{
|
||||
s32 status;
|
||||
|
||||
status = ixgbe_clock_in_i2c_byte(hw, byte);
|
||||
if (status)
|
||||
return status;
|
||||
ixgbe_clock_in_i2c_byte(hw, byte);
|
||||
/* ACK */
|
||||
return ixgbe_clock_out_i2c_bit(hw, false);
|
||||
}
|
||||
@ -154,8 +150,7 @@ s32 ixgbe_read_i2c_combined_generic_int(struct ixgbe_hw *hw, u8 addr, u16 reg,
|
||||
if (ixgbe_in_i2c_byte_ack(hw, &low_bits))
|
||||
goto fail;
|
||||
/* Get csum */
|
||||
if (ixgbe_clock_in_i2c_byte(hw, &csum_byte))
|
||||
goto fail;
|
||||
ixgbe_clock_in_i2c_byte(hw, &csum_byte);
|
||||
/* NACK */
|
||||
if (ixgbe_clock_out_i2c_bit(hw, false))
|
||||
goto fail;
|
||||
@ -2043,9 +2038,7 @@ static s32 ixgbe_read_i2c_byte_generic_int(struct ixgbe_hw *hw, u8 byte_offset,
|
||||
if (status != IXGBE_SUCCESS)
|
||||
goto fail;
|
||||
|
||||
status = ixgbe_clock_in_i2c_byte(hw, data);
|
||||
if (status != IXGBE_SUCCESS)
|
||||
goto fail;
|
||||
ixgbe_clock_in_i2c_byte(hw, data);
|
||||
|
||||
status = ixgbe_clock_out_i2c_bit(hw, nack);
|
||||
if (status != IXGBE_SUCCESS)
|
||||
@ -2290,7 +2283,7 @@ static void ixgbe_i2c_stop(struct ixgbe_hw *hw)
|
||||
*
|
||||
* Clocks in one byte data via I2C data/clock
|
||||
**/
|
||||
static s32 ixgbe_clock_in_i2c_byte(struct ixgbe_hw *hw, u8 *data)
|
||||
static void ixgbe_clock_in_i2c_byte(struct ixgbe_hw *hw, u8 *data)
|
||||
{
|
||||
s32 i;
|
||||
bool bit = 0;
|
||||
@ -2302,8 +2295,6 @@ static s32 ixgbe_clock_in_i2c_byte(struct ixgbe_hw *hw, u8 *data)
|
||||
ixgbe_clock_in_i2c_bit(hw, &bit);
|
||||
*data |= bit << i;
|
||||
}
|
||||
|
||||
return IXGBE_SUCCESS;
|
||||
}
|
||||
|
||||
/**
|
||||
@ -2399,7 +2390,7 @@ static s32 ixgbe_get_i2c_ack(struct ixgbe_hw *hw)
|
||||
*
|
||||
* Clocks in one bit via I2C data/clock
|
||||
**/
|
||||
static s32 ixgbe_clock_in_i2c_bit(struct ixgbe_hw *hw, bool *data)
|
||||
static void ixgbe_clock_in_i2c_bit(struct ixgbe_hw *hw, bool *data)
|
||||
{
|
||||
u32 i2cctl = IXGBE_READ_REG(hw, IXGBE_I2CCTL_BY_MAC(hw));
|
||||
u32 data_oe_bit = IXGBE_I2C_DATA_OE_N_EN_BY_MAC(hw);
|
||||
@ -2424,8 +2415,6 @@ static s32 ixgbe_clock_in_i2c_bit(struct ixgbe_hw *hw, bool *data)
|
||||
|
||||
/* Minimum low period of clock is 4.7 us */
|
||||
usec_delay(IXGBE_I2C_T_LOW);
|
||||
|
||||
return IXGBE_SUCCESS;
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -323,7 +323,7 @@ s32 ixgbe_start_hw_X540(struct ixgbe_hw *hw)
|
||||
if (ret_val != IXGBE_SUCCESS)
|
||||
goto out;
|
||||
|
||||
ret_val = ixgbe_start_hw_gen2(hw);
|
||||
ixgbe_start_hw_gen2(hw);
|
||||
|
||||
out:
|
||||
return ret_val;
|
||||
|
Loading…
Reference in New Issue
Block a user