Skip to content

Commit

Permalink
ixgbe: remove return code for functions that always return 0
Browse files Browse the repository at this point in the history 
Since ixgbe_raise_i2c_clk() can never return anything else than 0
this patch removes it's return value and all checks for it.

Signed-off-by: Emil Tantilov <emil.s.tantilov@intel.com>
Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
  • Loading branch information
Emil Tantilov authored and Jeff Kirsher committed Oct 5, 2011
1 parent 3fbaa3a commit e1befd7
Showing 1 changed file with 9 additions and 21 deletions.
30 changes: 9 additions & 21 deletions drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ 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 s32 ixgbe_clock_out_i2c_bit(struct ixgbe_hw *hw, bool data);
static s32 ixgbe_raise_i2c_clk(struct ixgbe_hw *hw, u32 *i2cctl);
static void ixgbe_raise_i2c_clk(struct ixgbe_hw *hw, u32 *i2cctl);
static void ixgbe_lower_i2c_clk(struct ixgbe_hw *hw, u32 *i2cctl);
static s32 ixgbe_set_i2c_data(struct ixgbe_hw *hw, u32 *i2cctl, bool data);
static bool ixgbe_get_i2c_data(u32 *i2cctl);
Expand Down Expand Up @@ -1420,19 +1420,15 @@ static void ixgbe_i2c_stop(struct ixgbe_hw *hw)
**/
static s32 ixgbe_clock_in_i2c_byte(struct ixgbe_hw *hw, u8 *data)
{
s32 status = 0;
s32 i;
bool bit = 0;

for (i = 7; i >= 0; i--) {
status = ixgbe_clock_in_i2c_bit(hw, &bit);
ixgbe_clock_in_i2c_bit(hw, &bit);
*data |= bit << i;

if (status != 0)
break;
}

return status;
return 0;
}

/**
Expand Down Expand Up @@ -1473,16 +1469,14 @@ static s32 ixgbe_clock_out_i2c_byte(struct ixgbe_hw *hw, u8 data)
**/
static s32 ixgbe_get_i2c_ack(struct ixgbe_hw *hw)
{
s32 status;
s32 status = 0;
u32 i = 0;
u32 i2cctl = IXGBE_READ_REG(hw, IXGBE_I2CCTL);
u32 timeout = 10;
bool ack = 1;

status = ixgbe_raise_i2c_clk(hw, &i2cctl);
ixgbe_raise_i2c_clk(hw, &i2cctl);

if (status != 0)
goto out;

/* Minimum high period of clock is 4us */
udelay(IXGBE_I2C_T_HIGH);
Expand All @@ -1508,7 +1502,6 @@ static s32 ixgbe_get_i2c_ack(struct ixgbe_hw *hw)
/* Minimum low period of clock is 4.7 us */
udelay(IXGBE_I2C_T_LOW);

out:
return status;
}

Expand All @@ -1521,10 +1514,9 @@ static s32 ixgbe_get_i2c_ack(struct ixgbe_hw *hw)
**/
static s32 ixgbe_clock_in_i2c_bit(struct ixgbe_hw *hw, bool *data)
{
s32 status;
u32 i2cctl = IXGBE_READ_REG(hw, IXGBE_I2CCTL);

status = ixgbe_raise_i2c_clk(hw, &i2cctl);
ixgbe_raise_i2c_clk(hw, &i2cctl);

/* Minimum high period of clock is 4us */
udelay(IXGBE_I2C_T_HIGH);
Expand All @@ -1537,7 +1529,7 @@ static s32 ixgbe_clock_in_i2c_bit(struct ixgbe_hw *hw, bool *data)
/* Minimum low period of clock is 4.7 us */
udelay(IXGBE_I2C_T_LOW);

return status;
return 0;
}

/**
Expand All @@ -1554,7 +1546,7 @@ static s32 ixgbe_clock_out_i2c_bit(struct ixgbe_hw *hw, bool data)

status = ixgbe_set_i2c_data(hw, &i2cctl, data);
if (status == 0) {
status = ixgbe_raise_i2c_clk(hw, &i2cctl);
ixgbe_raise_i2c_clk(hw, &i2cctl);

/* Minimum high period of clock is 4us */
udelay(IXGBE_I2C_T_HIGH);
Expand All @@ -1579,19 +1571,15 @@ static s32 ixgbe_clock_out_i2c_bit(struct ixgbe_hw *hw, bool data)
*
* Raises the I2C clock line '0'->'1'
**/
static s32 ixgbe_raise_i2c_clk(struct ixgbe_hw *hw, u32 *i2cctl)
static void ixgbe_raise_i2c_clk(struct ixgbe_hw *hw, u32 *i2cctl)
{
s32 status = 0;

*i2cctl |= IXGBE_I2C_CLK_OUT;

IXGBE_WRITE_REG(hw, IXGBE_I2CCTL, *i2cctl);
IXGBE_WRITE_FLUSH(hw);

/* SCL rise time (1000ns) */
udelay(IXGBE_I2C_T_RISE);

return status;
}

/**
Expand Down

0 comments on commit e1befd7

Please sign in to comment.