diff options
| author | andrew-elder <aelder@audioscience.com> | 2018-04-03 13:18:36 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-03 13:18:36 -0400 |
| commit | c253bd9204ed0fe85619266c0da1a47fbfdaab0a (patch) | |
| tree | f256df34cf5062956ac28b4894044d3fa685f5de /kmod/igb/e1000_82575.c | |
| parent | 5e43fa5ae27fbd2b89c320670a32143ce93e0e16 (diff) | |
| parent | 7d0f6655b04ef9af9a74319997ead5e5a1dcc2be (diff) | |
| download | Open-AVB-c253bd9204ed0fe85619266c0da1a47fbfdaab0a.tar.gz | |
Merge pull request #773 from AVnu/open-avb-next
Maintenance pull request
Diffstat (limited to 'kmod/igb/e1000_82575.c')
| -rw-r--r-- | kmod/igb/e1000_82575.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/kmod/igb/e1000_82575.c b/kmod/igb/e1000_82575.c index f8abc3e5..2fcc3bf3 100644 --- a/kmod/igb/e1000_82575.c +++ b/kmod/igb/e1000_82575.c @@ -98,10 +98,10 @@ static void e1000_clear_vfta_i350(struct e1000_hw *hw); static void e1000_i2c_start(struct e1000_hw *hw); static void e1000_i2c_stop(struct e1000_hw *hw); -static s32 e1000_clock_in_i2c_byte(struct e1000_hw *hw, u8 *data); +static void e1000_clock_in_i2c_byte(struct e1000_hw *hw, u8 *data); static s32 e1000_clock_out_i2c_byte(struct e1000_hw *hw, u8 data); static s32 e1000_get_i2c_ack(struct e1000_hw *hw); -static s32 e1000_clock_in_i2c_bit(struct e1000_hw *hw, bool *data); +static void e1000_clock_in_i2c_bit(struct e1000_hw *hw, bool *data); static s32 e1000_clock_out_i2c_bit(struct e1000_hw *hw, bool data); static void e1000_raise_i2c_clk(struct e1000_hw *hw, u32 *i2cctl); static void e1000_lower_i2c_clk(struct e1000_hw *hw, u32 *i2cctl); @@ -3217,9 +3217,7 @@ s32 e1000_read_i2c_byte_generic(struct e1000_hw *hw, u8 byte_offset, if (status != E1000_SUCCESS) goto fail; - status = e1000_clock_in_i2c_byte(hw, data); - if (status != E1000_SUCCESS) - goto fail; + e1000_clock_in_i2c_byte(hw, data); status = e1000_clock_out_i2c_bit(hw, nack); if (status != E1000_SUCCESS) @@ -3383,7 +3381,7 @@ static void e1000_i2c_stop(struct e1000_hw *hw) * * Clocks in one byte data via I2C data/clock **/ -static s32 e1000_clock_in_i2c_byte(struct e1000_hw *hw, u8 *data) +static void e1000_clock_in_i2c_byte(struct e1000_hw *hw, u8 *data) { s32 i; bool bit = 0; @@ -3396,7 +3394,6 @@ static s32 e1000_clock_in_i2c_byte(struct e1000_hw *hw, u8 *data) *data |= bit << i; } - return E1000_SUCCESS; } /** @@ -3485,7 +3482,7 @@ static s32 e1000_get_i2c_ack(struct e1000_hw *hw) * * Clocks in one bit via I2C data/clock **/ -static s32 e1000_clock_in_i2c_bit(struct e1000_hw *hw, bool *data) +static void e1000_clock_in_i2c_bit(struct e1000_hw *hw, bool *data) { u32 i2cctl = E1000_READ_REG(hw, E1000_I2CPARAMS); @@ -3504,7 +3501,6 @@ static s32 e1000_clock_in_i2c_bit(struct e1000_hw *hw, bool *data) /* Minimum low period of clock is 4.7 us */ usec_delay(E1000_I2C_T_LOW); - return E1000_SUCCESS; } /** |