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/manage.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/manage.c')
-rw-r--r-- | drivers/net/ethernet/intel/e1000e/manage.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/e1000e/manage.c b/drivers/net/ethernet/intel/e1000e/manage.c index 473f8e711510..bacc950fc684 100644 --- a/drivers/net/ethernet/intel/e1000e/manage.c +++ b/drivers/net/ethernet/intel/e1000e/manage.c | |||
@@ -85,7 +85,7 @@ static s32 e1000_mng_enable_host_if(struct e1000_hw *hw) | |||
85 | 85 | ||
86 | /* Check that the host interface is enabled. */ | 86 | /* Check that the host interface is enabled. */ |
87 | hicr = er32(HICR); | 87 | hicr = er32(HICR); |
88 | if ((hicr & E1000_HICR_EN) == 0) { | 88 | if (!(hicr & E1000_HICR_EN)) { |
89 | e_dbg("E1000_HOST_EN bit disabled.\n"); | 89 | e_dbg("E1000_HOST_EN bit disabled.\n"); |
90 | return -E1000_ERR_HOST_INTERFACE_COMMAND; | 90 | return -E1000_ERR_HOST_INTERFACE_COMMAND; |
91 | } | 91 | } |