diff options
author | David Ertman <davidx.m.ertman@intel.com> | 2014-04-04 23:36:15 -0400 |
---|---|---|
committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2014-04-23 03:51:32 -0400 |
commit | 3992c8ed48be25a37f6dd04a9c46a4504674546a (patch) | |
tree | 5fc6014f292621193efe113cae80b0d542f1b1c0 /drivers/net/ethernet/intel | |
parent | b8ce18cdfaca25b640a6b0b90e2c6da4c568acb9 (diff) |
e1000e: Cleanup return values in ethtool
Changing occurrences of returning 0 and 1 from bool functions to false and
true, respectively
Signed-off-by: Dave Ertman <davidx.m.ertman@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')
-rw-r--r-- | drivers/net/ethernet/intel/e1000e/ethtool.c | 8 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/e1000e/netdev.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/ethernet/intel/e1000e/ethtool.c b/drivers/net/ethernet/intel/e1000e/ethtool.c index cad250bc1b99..2204a9c412b5 100644 --- a/drivers/net/ethernet/intel/e1000e/ethtool.c +++ b/drivers/net/ethernet/intel/e1000e/ethtool.c | |||
@@ -783,10 +783,10 @@ static bool reg_pattern_test(struct e1000_adapter *adapter, u64 *data, | |||
783 | reg + (offset << 2), val, | 783 | reg + (offset << 2), val, |
784 | (test[pat] & write & mask)); | 784 | (test[pat] & write & mask)); |
785 | *data = reg; | 785 | *data = reg; |
786 | return 1; | 786 | return true; |
787 | } | 787 | } |
788 | } | 788 | } |
789 | return 0; | 789 | return false; |
790 | } | 790 | } |
791 | 791 | ||
792 | static bool reg_set_and_check(struct e1000_adapter *adapter, u64 *data, | 792 | static bool reg_set_and_check(struct e1000_adapter *adapter, u64 *data, |
@@ -799,9 +799,9 @@ static bool reg_set_and_check(struct e1000_adapter *adapter, u64 *data, | |||
799 | e_err("set/check test failed (reg 0x%05X): got 0x%08X expected 0x%08X\n", | 799 | e_err("set/check test failed (reg 0x%05X): got 0x%08X expected 0x%08X\n", |
800 | reg, (val & mask), (write & mask)); | 800 | reg, (val & mask), (write & mask)); |
801 | *data = reg; | 801 | *data = reg; |
802 | return 1; | 802 | return true; |
803 | } | 803 | } |
804 | return 0; | 804 | return false; |
805 | } | 805 | } |
806 | 806 | ||
807 | #define REG_PATTERN_TEST_ARRAY(reg, offset, mask, write) \ | 807 | #define REG_PATTERN_TEST_ARRAY(reg, offset, mask, write) \ |
diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c index d50c91e50528..255481c389e3 100644 --- a/drivers/net/ethernet/intel/e1000e/netdev.c +++ b/drivers/net/ethernet/intel/e1000e/netdev.c | |||
@@ -5170,7 +5170,7 @@ static bool e1000_tx_csum(struct e1000_ring *tx_ring, struct sk_buff *skb) | |||
5170 | __be16 protocol; | 5170 | __be16 protocol; |
5171 | 5171 | ||
5172 | if (skb->ip_summed != CHECKSUM_PARTIAL) | 5172 | if (skb->ip_summed != CHECKSUM_PARTIAL) |
5173 | return 0; | 5173 | return false; |
5174 | 5174 | ||
5175 | if (skb->protocol == cpu_to_be16(ETH_P_8021Q)) | 5175 | if (skb->protocol == cpu_to_be16(ETH_P_8021Q)) |
5176 | protocol = vlan_eth_hdr(skb)->h_vlan_encapsulated_proto; | 5176 | protocol = vlan_eth_hdr(skb)->h_vlan_encapsulated_proto; |
@@ -5215,7 +5215,7 @@ static bool e1000_tx_csum(struct e1000_ring *tx_ring, struct sk_buff *skb) | |||
5215 | i = 0; | 5215 | i = 0; |
5216 | tx_ring->next_to_use = i; | 5216 | tx_ring->next_to_use = i; |
5217 | 5217 | ||
5218 | return 1; | 5218 | return true; |
5219 | } | 5219 | } |
5220 | 5220 | ||
5221 | static int e1000_tx_map(struct e1000_ring *tx_ring, struct sk_buff *skb, | 5221 | static int e1000_tx_map(struct e1000_ring *tx_ring, struct sk_buff *skb, |