lkml.org 
[lkml]   [2020]   [May]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH 2/2] staging: vt6655: fix LONG_LINE warning
On Sat, May 02, 2020 at 10:11:43PM -0700, Joe Perches wrote:
>On Sun, 2020-05-03 at 00:16 +0200, Matej Dujava wrote:
>> This patch will fix LONG_LINE error from checkpatch, by createing temporary
>> variable so call to the function is not in if/else block.
>[]
>> diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c
>[]

Sorry, am I missing something here?

>> @@ -164,16 +164,24 @@ s_uGetTxRsvTime(
>> )
>> {
>> unsigned int uDataTime, uAckTime;
>> + unsigned short basic_rate;
>>
>> uDataTime = bb_get_frame_time(pDevice->byPreambleType, byPktType, cbFrameLength, wRate);
>>
>> if (!bNeedAck)
>> return uDataTime;
>>
>> - if (byPktType == PK_TYPE_11B) /* llb,CCK mode */
>> - uAckTime = bb_get_frame_time(pDevice->byPreambleType, byPktType, 14, (unsigned short)pDevice->byTopCCKBasicRate);
>> - else /* 11g 2.4G OFDM mode & 11a 5G OFDM mode */
>> - uAckTime = bb_get_frame_time(pDevice->byPreambleType, byPktType, 14, (unsigned short)pDevice->byTopOFDMBasicRate);
>> + /*
>> + * CCK mode - 11b
>> + * OFDM mode - 11g 2.4G & 11a 5G
>> + */
>> + if (byPktType == PK_TYPE_11B)
>> + basic_rate = (unsigned short)pDevice->byTopCCKBasicRate;
>> + else
>> + basic_rate = (unsigned short)pDevice->byTopOFDMBasicRate;
>> +
>> + uAckTime = bb_get_frame_time(pDevice->byPreambleType, byPktType, 14,
>> + basic_rate);
>>
>> return uDataTime + pDevice->uSIFS + uAckTime;
>> }
>
>perhaps simpler using a ?:
>
> uAckTime = bb_get_frame_time(pDevice->byPreambleType, byPktType, 14,
> byPktType == PK_TYPE_11B
> ? pDevice->byTopCCKBasicRate
> : pDevice->byTopOFDMBasicRate);
>
>the casts aren't necessary either as both by... fields are u8

Thank you, will resend my patch.

>
>

\
 
 \ /
  Last update: 2020-05-03 11:17    [W:0.135 / U:0.064 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site