From: Rashika Kheria Date: Thu, 10 Oct 2013 18:14:41 +0000 (+0530) Subject: Staging: btmtk_usb: Fix line length exceeding 80 characters using min_t macro X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8365882373e2b2ccc302aa269342b699ef01f004;p=linux-beck.git Staging: btmtk_usb: Fix line length exceeding 80 characters using min_t macro This patch fixes the following checkpatch.pl warning in btmtk_usb.c: WARNING: line over 80 characters in the file by using kernel built_in min_t macro. Signed-off-by: Rashika Kheria Reviewed-by: Josh Triplett Reviewed-by: Zach Brown Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/btmtk_usb/btmtk_usb.c b/drivers/staging/btmtk_usb/btmtk_usb.c index 3234325f3b32..1b0f993b350c 100644 --- a/drivers/staging/btmtk_usb/btmtk_usb.c +++ b/drivers/staging/btmtk_usb/btmtk_usb.c @@ -417,8 +417,7 @@ load_patch_protect: /* 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 @@ loadfw_protect: /* 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 @@ loadfw_protect: /* 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;