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>
This commit is contained in:
parent
c3f52ae6a3
commit
81b504b814
2 changed files with 4 additions and 4 deletions
|
@ -1102,10 +1102,10 @@ static void atl1c_configure_tx(struct atl1c_adapter *adapter)
|
|||
AT_READ_REG(hw, REG_DEVICE_CTRL, &dev_ctrl_data);
|
||||
max_pay_load = (dev_ctrl_data >> DEVICE_CTRL_MAX_PAYLOAD_SHIFT) &
|
||||
DEVICE_CTRL_MAX_PAYLOAD_MASK;
|
||||
hw->dmaw_block = min(max_pay_load, hw->dmaw_block);
|
||||
hw->dmaw_block = min_t(u32, max_pay_load, hw->dmaw_block);
|
||||
max_pay_load = (dev_ctrl_data >> DEVICE_CTRL_MAX_RREQ_SZ_SHIFT) &
|
||||
DEVICE_CTRL_MAX_RREQ_SZ_MASK;
|
||||
hw->dmar_block = min(max_pay_load, hw->dmar_block);
|
||||
hw->dmar_block = min_t(u32, max_pay_load, hw->dmar_block);
|
||||
|
||||
txq_ctrl_data = (hw->tpd_burst & TXQ_NUM_TPD_BURST_MASK) <<
|
||||
TXQ_NUM_TPD_BURST_SHIFT;
|
||||
|
|
|
@ -932,11 +932,11 @@ static inline void atl1e_configure_tx(struct atl1e_adapter *adapter)
|
|||
max_pay_load = ((dev_ctrl_data >> DEVICE_CTRL_MAX_PAYLOAD_SHIFT)) &
|
||||
DEVICE_CTRL_MAX_PAYLOAD_MASK;
|
||||
|
||||
hw->dmaw_block = min(max_pay_load, hw->dmaw_block);
|
||||
hw->dmaw_block = min_t(u32, max_pay_load, hw->dmaw_block);
|
||||
|
||||
max_pay_load = ((dev_ctrl_data >> DEVICE_CTRL_MAX_RREQ_SZ_SHIFT)) &
|
||||
DEVICE_CTRL_MAX_RREQ_SZ_MASK;
|
||||
hw->dmar_block = min(max_pay_load, hw->dmar_block);
|
||||
hw->dmar_block = min_t(u32, max_pay_load, hw->dmar_block);
|
||||
|
||||
if (hw->nic_type != athr_l2e_revB)
|
||||
AT_WRITE_REGW(hw, REG_TXQ_CTRL + 2,
|
||||
|
|
Loading…
Reference in a new issue