diff options
| author |  Jedrzej Jagielski <jedrzej.jagielski@intel.com>
| 2024-01-31 12:04:18 +0100 |
|---|---|---|
| committer |  Tony Nguyen <anthony.l.nguyen@intel.com>
| 2024-02-06 13:17:14 -0800 |
| commit | b678b63a2454983cf22ffc8f8e5366ac9f376972 (patch) | |
| tree | b86d42cf9661a639f032770fc651d0e607de499f /drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c | |
| parent | ixgbe: Convert ret val type from s32 to int (diff) | |
| download | linux-b678b63a2454983cf22ffc8f8e5366ac9f376972.tar.gz linux-b678b63a2454983cf22ffc8f8e5366ac9f376972.tar.bz2 linux-b678b63a2454983cf22ffc8f8e5366ac9f376972.zip | |
ixgbe: Rearrange args to fix reverse Christmas tree
Clean up the code touched during type conversion by the previous patch
of the series.
Suggested-by: Tony Nguyen <anthony.l.nguyen@intel.com>
Reviewed-by: Przemek Kitszel <przemyslaw.kitszel@intel.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Signed-off-by: Jedrzej Jagielski <jedrzej.jagielski@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
Diffstat (limited to 'drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c')
| -rw-r--r-- | drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c index 39357af77c64..f1ffa398f6df 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c @@ -68,9 +68,9 @@ int ixgbe_setup_mac_link_X540(struct ixgbe_hw *hw, ixgbe_link_speed speed, **/ int ixgbe_reset_hw_X540(struct ixgbe_hw *hw) { - int status; - u32 ctrl, i; u32 swfw_mask = hw->phy.phy_semaphore_mask; + u32 ctrl, i; + int status; /* Call adapter stop to disable tx/rx and clear interrupts */ status = hw->mac.ops.stop_adapter(hw); @@ -382,9 +382,9 @@ static int ixgbe_calc_eeprom_checksum_X540(struct ixgbe_hw *hw) static int ixgbe_validate_eeprom_checksum_X540(struct ixgbe_hw *hw, u16 *checksum_val) { - int status; - u16 checksum; u16 read_checksum = 0; + u16 checksum; + int status; /* Read the first word from the EEPROM. If this times out or fails, do * not continue or we could be in for a very long wait while every @@ -441,8 +441,8 @@ out: **/ static int ixgbe_update_eeprom_checksum_X540(struct ixgbe_hw *hw) { - int status; u16 checksum; + int status; /* Read the first word from the EEPROM. If this times out or fails, do * not continue or we could be in for a very long wait while every @@ -486,8 +486,8 @@ out: **/ static int ixgbe_update_flash_X540(struct ixgbe_hw *hw) { - u32 flup; int status; + u32 flup; status = ixgbe_poll_flash_update_done_X540(hw); if (status == -EIO) { |