| Message ID | 1454577871-667-31-git-send-email-glen.lee@atmel.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Delegated to: | Kalle Valo |
| Headers | show |
On Thu, 2016-02-04 at 18:24 +0900, Glen Lee wrote: > From: Leo Kim <leo.kim@atmel.com> > > This patch removes the warnings reported by checkpatch.pl > for line over 80 characters. > > Signed-off-by: Leo Kim <leo.kim@atmel.com> > --- > drivers/staging/wilc1000/coreconfigurator.c | 11 +++++++---- > 1 file changed, 7 insertions(+), 4 deletions(-) > > diff --git a/drivers/staging/wilc1000/coreconfigurator.c b/drivers/staging/wilc1000/coreconfigurator.c [] > @@ -4,7 +4,7 @@ > #include > #include > #define TAG_PARAM_OFFSET (MAC_HDR_LEN + TIME_STAMP_LEN + \ > - BEACON_INTERVAL_LEN + CAP_INFO_LEN) > + BEACON_INTERVAL_LEN + CAP_INFO_LEN) Another style is to use the continuation on the first line #define TAG_PARAM_OFFSET \ (MAC_HDR_LEN + TIME_STAMP_LEN + BEACON_INTERVAL_LEN + CAP_INFO_LEN) > > enum basic_frame_type { > FRAME_TYPE_CONTROL = 0x04, > @@ -337,8 +337,10 @@ s32 wilc_parse_network_info(u8 *msg_buffer, > tim_elm = get_tim_elm(msa, rx_len + FCS_LEN, index); > if (tim_elm) > network_info->dtim_period = tim_elm[3]; > - ies = &msa[MAC_HDR_LEN + TIME_STAMP_LEN + BEACON_INTERVAL_LEN + CAP_INFO_LEN]; > - ies_len = rx_len - (MAC_HDR_LEN + TIME_STAMP_LEN + BEACON_INTERVAL_LEN + CAP_INFO_LEN); > + ies = &msa[MAC_HDR_LEN + TIME_STAMP_LEN + BEACON_INTERVAL_LEN + > + CAP_INFO_LEN]; > + ies_len = rx_len - (MAC_HDR_LEN + TIME_STAMP_LEN + > + BEACON_INTERVAL_LEN + CAP_INFO_LEN); Pretty funny that a TAG_PARAM_OFFSET change is in the same patch It'd be simpler to use that define here. ies = &msa[TAG_PARAM_OFFSET]; ies_len = rx_len - TAG_PARAM_OFFSET; > if (!connect_resp_info->ies) -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/staging/wilc1000/coreconfigurator.c b/drivers/staging/wilc1000/coreconfigurator.c index d481719..3a76586 100644 --- a/drivers/staging/wilc1000/coreconfigurator.c +++ b/drivers/staging/wilc1000/coreconfigurator.c @@ -4,7 +4,7 @@ #include <linux/errno.h> #include <linux/slab.h> #define TAG_PARAM_OFFSET (MAC_HDR_LEN + TIME_STAMP_LEN + \ - BEACON_INTERVAL_LEN + CAP_INFO_LEN) + BEACON_INTERVAL_LEN + CAP_INFO_LEN) enum basic_frame_type { FRAME_TYPE_CONTROL = 0x04, @@ -337,8 +337,10 @@ s32 wilc_parse_network_info(u8 *msg_buffer, tim_elm = get_tim_elm(msa, rx_len + FCS_LEN, index); if (tim_elm) network_info->dtim_period = tim_elm[3]; - ies = &msa[MAC_HDR_LEN + TIME_STAMP_LEN + BEACON_INTERVAL_LEN + CAP_INFO_LEN]; - ies_len = rx_len - (MAC_HDR_LEN + TIME_STAMP_LEN + BEACON_INTERVAL_LEN + CAP_INFO_LEN); + ies = &msa[MAC_HDR_LEN + TIME_STAMP_LEN + BEACON_INTERVAL_LEN + + CAP_INFO_LEN]; + ies_len = rx_len - (MAC_HDR_LEN + TIME_STAMP_LEN + + BEACON_INTERVAL_LEN + CAP_INFO_LEN); if (ies_len > 0) { network_info->ies = kmemdup(ies, ies_len, GFP_KERNEL); @@ -373,7 +375,8 @@ s32 wilc_parse_assoc_resp_info(u8 *buffer, u32 buffer_len, connect_resp_info->assoc_id = get_asoc_id(buffer); ies = &buffer[CAP_INFO_LEN + STATUS_CODE_LEN + AID_LEN]; - ies_len = assoc_resp_len - (CAP_INFO_LEN + STATUS_CODE_LEN + AID_LEN); + ies_len = assoc_resp_len - (CAP_INFO_LEN + STATUS_CODE_LEN + + AID_LEN); connect_resp_info->ies = kmemdup(ies, ies_len, GFP_KERNEL); if (!connect_resp_info->ies)