Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 81b504b81437457614ce44ce0dac48038d35f859

Authored by stephen hemminger
Committed by David S. Miller
1 parent c3f52ae6a3
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

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>

Showing 2 changed files with 4 additions and 4 deletions Side-by-side Diff

drivers/net/atl1c/atl1c_main.c
Diff comments   View file @ 81b504b
... ... @@ -1102,10 +1102,10 @@
1102 1102 AT_READ_REG(hw, REG_DEVICE_CTRL, &dev_ctrl_data);
1103 1103 max_pay_load = (dev_ctrl_data >> DEVICE_CTRL_MAX_PAYLOAD_SHIFT) &
1104 1104 DEVICE_CTRL_MAX_PAYLOAD_MASK;
1105   - hw->dmaw_block = min(max_pay_load, hw->dmaw_block);
  1105 + hw->dmaw_block = min_t(u32, max_pay_load, hw->dmaw_block);
1106 1106 max_pay_load = (dev_ctrl_data >> DEVICE_CTRL_MAX_RREQ_SZ_SHIFT) &
1107 1107 DEVICE_CTRL_MAX_RREQ_SZ_MASK;
1108   - hw->dmar_block = min(max_pay_load, hw->dmar_block);
  1108 + hw->dmar_block = min_t(u32, max_pay_load, hw->dmar_block);
1109 1109  
1110 1110 txq_ctrl_data = (hw->tpd_burst & TXQ_NUM_TPD_BURST_MASK) <<
1111 1111 TXQ_NUM_TPD_BURST_SHIFT;
drivers/net/atl1e/atl1e_main.c
Diff comments   View file @ 81b504b
... ... @@ -932,11 +932,11 @@
932 932 max_pay_load = ((dev_ctrl_data >> DEVICE_CTRL_MAX_PAYLOAD_SHIFT)) &
933 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 937 max_pay_load = ((dev_ctrl_data >> DEVICE_CTRL_MAX_RREQ_SZ_SHIFT)) &
938 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 941 if (hw->nic_type != athr_l2e_revB)
942 942 AT_WRITE_REGW(hw, REG_TXQ_CTRL + 2,