diff options
author | Bruce Allan <bruce.w.allan@intel.com> | 2012-04-12 20:08:31 -0400 |
---|---|---|
committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2012-04-14 05:05:00 -0400 |
commit | 04499ec4ee945dfad9f0afbdd8d6f8ba12dac6d6 (patch) | |
tree | 15d4cd43517c8afb20b777607830ca1093341b95 /drivers/net/ethernet/intel/e1000e/82571.c | |
parent | 6ad651456e3c8f3ea77056bc05c85e46ab8ead5a (diff) |
e1000e: cleanup boolean logic
Replace occurrences of 'if (<bool expr> == <1|0>)' with
'if ([!]<bool expr>)'
Replace occurrences of '<bool var> = (<non-bool expr>) ? true : false'
with '<bool var> = <non-bool expr>'.
Replace occurrence of '<bool var> = <non-bool expr>' with
'<bool var> = !!<non-bool expr>'
While the latter replacement is not really necessary, it is done here for
consistency and clarity. No functional changes.
Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/ethernet/intel/e1000e/82571.c')
-rw-r--r-- | drivers/net/ethernet/intel/e1000e/82571.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/net/ethernet/intel/e1000e/82571.c b/drivers/net/ethernet/intel/e1000e/82571.c index b3fdc6977f2e..609c18cb300a 100644 --- a/drivers/net/ethernet/intel/e1000e/82571.c +++ b/drivers/net/ethernet/intel/e1000e/82571.c | |||
@@ -295,9 +295,8 @@ static s32 e1000_init_mac_params_82571(struct e1000_hw *hw) | |||
295 | * ARC supported; valid only if manageability features are | 295 | * ARC supported; valid only if manageability features are |
296 | * enabled. | 296 | * enabled. |
297 | */ | 297 | */ |
298 | mac->arc_subsystem_valid = | 298 | mac->arc_subsystem_valid = !!(er32(FWSM) & |
299 | (er32(FWSM) & E1000_FWSM_MODE_MASK) | 299 | E1000_FWSM_MODE_MASK); |
300 | ? true : false; | ||
301 | break; | 300 | break; |
302 | case e1000_82574: | 301 | case e1000_82574: |
303 | case e1000_82583: | 302 | case e1000_82583: |
@@ -798,7 +797,7 @@ static s32 e1000_update_nvm_checksum_82571(struct e1000_hw *hw) | |||
798 | /* Check for pending operations. */ | 797 | /* Check for pending operations. */ |
799 | for (i = 0; i < E1000_FLASH_UPDATES; i++) { | 798 | for (i = 0; i < E1000_FLASH_UPDATES; i++) { |
800 | usleep_range(1000, 2000); | 799 | usleep_range(1000, 2000); |
801 | if ((er32(EECD) & E1000_EECD_FLUPD) == 0) | 800 | if (!(er32(EECD) & E1000_EECD_FLUPD)) |
802 | break; | 801 | break; |
803 | } | 802 | } |
804 | 803 | ||
@@ -822,7 +821,7 @@ static s32 e1000_update_nvm_checksum_82571(struct e1000_hw *hw) | |||
822 | 821 | ||
823 | for (i = 0; i < E1000_FLASH_UPDATES; i++) { | 822 | for (i = 0; i < E1000_FLASH_UPDATES; i++) { |
824 | usleep_range(1000, 2000); | 823 | usleep_range(1000, 2000); |
825 | if ((er32(EECD) & E1000_EECD_FLUPD) == 0) | 824 | if (!(er32(EECD) & E1000_EECD_FLUPD)) |
826 | break; | 825 | break; |
827 | } | 826 | } |
828 | 827 | ||