diff options
| author | Rashika Kheria <rashika.kheria@gmail.com> | 2013-10-10 23:44:41 +0530 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-11 13:17:54 -0700 |
| commit | 8365882373e2b2ccc302aa269342b699ef01f004 (patch) | |
| tree | 6f92d3fd990a6262b44b7a1588f2a0a2ea2e61d5 | |
| parent | 4ddffcca5ec47dd634870492f2292635ae3777c7 (diff) | |
| download | linux-8365882373e2b2ccc302aa269342b699ef01f004.tar.bz2 | |
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 <rashika.kheria@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Reviewed-by: Zach Brown <zab@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/btmtk_usb/btmtk_usb.c | 9 |
1 files changed, 3 insertions, 6 deletions
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; |