diff options
author | stephen hemminger <shemminger@vyatta.com> | 2011-02-23 04:06:49 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-02-23 17:11:31 -0500 |
commit | 81b504b81437457614ce44ce0dac48038d35f859 (patch) | |
tree | 73630dd160a6d5934e4e05e1826e1bf13359a1d1 /drivers/net/atl1e/atl1e_main.c | |
parent | c3f52ae6a378398127acb845087ddb9e8b67493b (diff) |
atl1[ce]: fix sparse warnings
The dmaw_block is an enum and max_pay_load is u32. Therefore
sparse gives warning about comparison of unsigned and signed value.
Resolve by using min_t to force cast.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/atl1e/atl1e_main.c')
-rw-r--r-- | drivers/net/atl1e/atl1e_main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/atl1e/atl1e_main.c b/drivers/net/atl1e/atl1e_main.c index bf7500ccd73f..21f501184023 100644 --- a/drivers/net/atl1e/atl1e_main.c +++ b/drivers/net/atl1e/atl1e_main.c | |||
@@ -932,11 +932,11 @@ static inline void atl1e_configure_tx(struct atl1e_adapter *adapter) | |||
932 | max_pay_load = ((dev_ctrl_data >> DEVICE_CTRL_MAX_PAYLOAD_SHIFT)) & | 932 | max_pay_load = ((dev_ctrl_data >> DEVICE_CTRL_MAX_PAYLOAD_SHIFT)) & |
933 | DEVICE_CTRL_MAX_PAYLOAD_MASK; | 933 | DEVICE_CTRL_MAX_PAYLOAD_MASK; |
934 | 934 | ||
935 | hw->dmaw_block = min(max_pay_load, hw->dmaw_block); | 935 | hw->dmaw_block = min_t(u32, max_pay_load, hw->dmaw_block); |
936 | 936 | ||
937 | max_pay_load = ((dev_ctrl_data >> DEVICE_CTRL_MAX_RREQ_SZ_SHIFT)) & | 937 | max_pay_load = ((dev_ctrl_data >> DEVICE_CTRL_MAX_RREQ_SZ_SHIFT)) & |
938 | DEVICE_CTRL_MAX_RREQ_SZ_MASK; | 938 | DEVICE_CTRL_MAX_RREQ_SZ_MASK; |
939 | hw->dmar_block = min(max_pay_load, hw->dmar_block); | 939 | hw->dmar_block = min_t(u32, max_pay_load, hw->dmar_block); |
940 | 940 | ||
941 | if (hw->nic_type != athr_l2e_revB) | 941 | if (hw->nic_type != athr_l2e_revB) |
942 | AT_WRITE_REGW(hw, REG_TXQ_CTRL + 2, | 942 | AT_WRITE_REGW(hw, REG_TXQ_CTRL + 2, |