diff --git a/drivers/staging/btmtk_usb/btmtk_usb.c b/drivers/staging/btmtk_usb/btmtk_usb.c index 3234325f3b32e26dfcd8c9ede3a2d72a46f13c4b..1b0f993b350c769243a503a574f283e6d5fd1214 100644 --- a/drivers/staging/btmtk_usb/btmtk_usb.c +++ b/drivers/staging/btmtk_usb/btmtk_usb.c @@ -417,8 +417,7 @@ static int btmtk_usb_load_rom_patch(struct btmtk_usb_data *data) /* loading rom patch */ while (1) { s32 sent_len_max = UPLOAD_PATCH_UNIT - PATCH_HEADER_SIZE; - sent_len = (patch_len - cur_len) >= sent_len_max ? - sent_len_max : (patch_len - cur_len); + sent_len = min_t(s32, (patch_len - cur_len), sent_len_max); BT_DBG("patch_len = %d\n", patch_len); BT_DBG("cur_len = %d\n", cur_len); @@ -673,8 +672,7 @@ static int btmtk_usb_load_fw(struct btmtk_usb_data *data) /* Loading ILM */ while (1) { - sent_len = (ilm_len - cur_len) >= 14336 ? 14336 : - (ilm_len - cur_len); + sent_len = min_t(s32, (ilm_len - cur_len), 14336); if (sent_len > 0) { packet_header &= ~(0xffffffff); @@ -732,8 +730,7 @@ static int btmtk_usb_load_fw(struct btmtk_usb_data *data) /* Loading DLM */ while (1) { - sent_len = (dlm_len - cur_len) >= 14336 ? 14336 : - (dlm_len - cur_len); + sent_len = min_t(s32, (dlm_len - cur_len), 14336); if (sent_len <= 0) break;