2019-10-06 19:12:04

by Gabriela Bittencourt

Subject: [PATCH] staging: vt6656: align arguments with open parenthesis

Cleans up CHECKs of "Alignment should match open parenthesis"

Signed-off-by: Gabriela Bittencourt <[email protected]>
---
drivers/staging/vt6656/rxtx.c | 63 +++++++++++++++++++++++------------
1 file changed, 41 insertions(+), 22 deletions(-)

diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c
index 9def0748ffee..c7522841c8cf 100644
--- a/drivers/staging/vt6656/rxtx.c
+++ b/drivers/staging/vt6656/rxtx.c
@@ -285,14 +285,15 @@ static u16 vnt_rxtx_datahead_g(struct vnt_usb_send_context *tx_context,
buf->duration_b = dur;
} else {
buf->duration_a = vnt_get_duration_le(priv,
- tx_context->pkt_type, need_ack);
+ tx_context->pkt_type,
+ need_ack);
buf->duration_b = vnt_get_duration_le(priv,
- PK_TYPE_11B, need_ack);
+ PK_TYPE_11B, need_ack);
}

buf->time_stamp_off_a = vnt_time_stamp_off(priv, rate);
buf->time_stamp_off_b = vnt_time_stamp_off(priv,
- priv->top_cck_basic_rate);
+ priv->top_cck_basic_rate);

tx_context->tx_hdr_size = vnt_mac_hdr_pos(tx_context, &buf->hdr);

@@ -325,7 +326,7 @@ static u16 vnt_rxtx_datahead_g_fb(struct vnt_usb_send_context *tx_context,

buf->time_stamp_off_a = vnt_time_stamp_off(priv, rate);
buf->time_stamp_off_b = vnt_time_stamp_off(priv,
- priv->top_cck_basic_rate);
+ priv->top_cck_basic_rate);

tx_context->tx_hdr_size = vnt_mac_hdr_pos(tx_context, &buf->hdr);

@@ -595,17 +596,24 @@ static u16 vnt_rxtx_rts(struct vnt_usb_send_context *tx_context,
u8 need_ack = tx_context->need_ack;

buf->rts_rrv_time_aa = vnt_get_rtscts_rsvtime_le(priv, 2,
- tx_context->pkt_type, frame_len, current_rate);
+ tx_context->pkt_type,
+ frame_len,
+ current_rate);
buf->rts_rrv_time_ba = vnt_get_rtscts_rsvtime_le(priv, 1,
- tx_context->pkt_type, frame_len, current_rate);
+ tx_context->pkt_type,
+ frame_len,
+ current_rate);
buf->rts_rrv_time_bb = vnt_get_rtscts_rsvtime_le(priv, 0,
- tx_context->pkt_type, frame_len, current_rate);
+ tx_context->pkt_type,
+ frame_len,
+ current_rate);

buf->rrv_time_a = vnt_rxtx_rsvtime_le16(priv, tx_context->pkt_type,
frame_len, current_rate,
need_ack);
buf->rrv_time_b = vnt_rxtx_rsvtime_le16(priv, PK_TYPE_11B, frame_len,
- priv->top_cck_basic_rate, need_ack);
+ priv->top_cck_basic_rate,
+ need_ack);

if (need_mic)
head = &tx_head->tx_rts.tx.mic.head;
@@ -627,12 +635,16 @@ static u16 vnt_rxtx_cts(struct vnt_usb_send_context *tx_context,
u8 need_ack = tx_context->need_ack;

buf->rrv_time_a = vnt_rxtx_rsvtime_le16(priv, tx_context->pkt_type,
- frame_len, current_rate, need_ack);
- buf->rrv_time_b = vnt_rxtx_rsvtime_le16(priv, PK_TYPE_11B,
- frame_len, priv->top_cck_basic_rate, need_ack);
+ frame_len, current_rate,
+ need_ack);
+ buf->rrv_time_b = vnt_rxtx_rsvtime_le16(priv, PK_TYPE_11B, frame_len,
+ priv->top_cck_basic_rate,
+ need_ack);

buf->cts_rrv_time_ba = vnt_get_rtscts_rsvtime_le(priv, 3,
- tx_context->pkt_type, frame_len, current_rate);
+ tx_context->pkt_type,
+ frame_len,
+ current_rate);

if (need_mic)
head = &tx_head->tx_cts.tx.mic.head;
@@ -655,18 +667,25 @@ static u16 vnt_rxtx_ab(struct vnt_usb_send_context *tx_context,
u8 need_ack = tx_context->need_ack;

buf->rrv_time = vnt_rxtx_rsvtime_le16(priv, tx_context->pkt_type,
- frame_len, current_rate, need_ack);
+ frame_len, current_rate,
+ need_ack);

if (need_mic)
head = &tx_head->tx_ab.tx.mic.head;

if (need_rts) {
if (tx_context->pkt_type == PK_TYPE_11B)
- buf->rts_rrv_time = vnt_get_rtscts_rsvtime_le(priv, 0,
- tx_context->pkt_type, frame_len, current_rate);
+ buf->rts_rrv_time =
+ vnt_get_rtscts_rsvtime_le(priv, 0,
+ tx_context->pkt_type,
+ frame_len,
+ current_rate);
else /* PK_TYPE_11A */
- buf->rts_rrv_time = vnt_get_rtscts_rsvtime_le(priv, 2,
- tx_context->pkt_type, frame_len, current_rate);
+ buf->rts_rrv_time =
+ vnt_get_rtscts_rsvtime_le(priv, 2,
+ tx_context->pkt_type,
+ frame_len,
+ current_rate);

if (tx_context->fb_option &&
tx_context->pkt_type == PK_TYPE_11A)
@@ -767,10 +786,10 @@ static void vnt_fill_txkey(struct vnt_usb_send_context *tx_context,
ether_addr_copy(mic_hdr->addr2, hdr->addr2);
ether_addr_copy(mic_hdr->addr3, hdr->addr3);

- mic_hdr->frame_control = cpu_to_le16(
- le16_to_cpu(hdr->frame_control) & 0xc78f);
- mic_hdr->seq_ctrl = cpu_to_le16(
- le16_to_cpu(hdr->seq_ctrl) & 0xf);
+ mic_hdr->frame_control =
+ cpu_to_le16(le16_to_cpu(hdr->frame_control) & 0xc78f);
+ mic_hdr->seq_ctrl =
+ cpu_to_le16(le16_to_cpu(hdr->seq_ctrl) & 0xf);

if (ieee80211_has_a4(hdr->frame_control))
ether_addr_copy(mic_hdr->addr4, hdr->addr4);
@@ -1036,7 +1055,7 @@ static int vnt_beacon_xmit(struct vnt_private *priv, struct sk_buff *skb)

/* Get Duration and TimeStampOff */
short_head->duration = vnt_get_duration_le(priv,
- PK_TYPE_11B, false);
+ PK_TYPE_11B, false);
short_head->time_stamp_off =
vnt_time_stamp_off(priv, current_rate);
}
--
2.20.1

2019-10-07 10:29:00

by Greg Kroah-Hartman

Subject: Re: [PATCH] staging: vt6656: align arguments with open parenthesis

On Sun, Oct 06, 2019 at 04:10:20PM -0300, Gabriela Bittencourt wrote:
> Cleans up CHECKs of "Alignment should match open parenthesis"
>
> Signed-off-by: Gabriela Bittencourt <[email protected]>
> ---
> drivers/staging/vt6656/rxtx.c | 63 +++++++++++++++++++++++------------
> 1 file changed, 41 insertions(+), 22 deletions(-)

This patch does not apply to my staging-next branch either :(

Please rebase and resend it.

thanks,

greg k-h