Skip to contentSkip to conversation

staging: vt6656: fixed an indentation coding style issue

PATCH In review Prasant Jalan 2 participants 3 messages Mar 25, 2017 – Apr 8, 2017 1 message not in the archive Staging

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 staging: vt6656: fixed an indentation coding style issue

Replacing spaces with tabs for indetation to fix checkpatch.pl error "code indent should use tabs where possible".

---

v2:
- improved changelog comments
- fixed only one issue

 drivers/staging/vt6656/rxtx.c | 35 +++++++++++++++++++----------------
 1 file changed, 19 insertions(+), 16 deletions(-)
drivers/staging/vt6656/rxtx.c +19 -16
index 1835cd1..7ebd1ee 100644
@@ -114,7 +114,7 @@ static __le16 vnt_time_stamp_off(struct vnt_private *priv, u16 rate)
 }
 
 static u32 vnt_get_rsvtime(struct vnt_private *priv, u8 pkt_type,
-	                    u32 frame_length, u16 rate, int need_ack)
+				u32 frame_length, u16 rate, int need_ack)
 {
 	u32 data_time, ack_time;
 
@@ -135,14 +135,16 @@ static u32 vnt_get_rsvtime(struct vnt_private *priv, u8 pkt_type,
 }
 
 static __le16 vnt_rxtx_rsvtime_le16(struct vnt_private *priv, u8 pkt_type,
-	                             u32 frame_length, u16 rate, int need_ack)
+					u32 frame_length, u16 rate,
+					int need_ack)
 {
 	return cpu_to_le16((u16)vnt_get_rsvtime(priv, pkt_type,
 		frame_length, rate, need_ack));
 }
 
 static __le16 vnt_get_rtscts_rsvtime_le(struct vnt_private *priv,
-	                                 u8 rsv_type, u8 pkt_type, u32 frame_length, u16 current_rate)
+					u8 rsv_type, u8 pkt_type,
+					u32 frame_length, u16 current_rate)
 {
 	u32 rrv_time, rts_time, cts_time, ack_time, data_time;
 
@@ -160,19 +162,19 @@ static __le16 vnt_get_rtscts_rsvtime_le(struct vnt_private *priv,
 		rts_time = vnt_get_frame_time(priv->preamble_type,
 			pkt_type, 20, priv->top_cck_basic_rate);
 		cts_time = vnt_get_frame_time(priv->preamble_type, pkt_type,
-			                      14, priv->top_cck_basic_rate);
+						14, priv->top_cck_basic_rate);
 		ack_time = vnt_get_frame_time(priv->preamble_type, pkt_type,
-			                      14, priv->top_ofdm_basic_rate);
+						14, priv->top_ofdm_basic_rate);
 	} else if (rsv_type == 2) {
 		rts_time = vnt_get_frame_time(priv->preamble_type, pkt_type,
-			                      20, priv->top_ofdm_basic_rate);
+						20, priv->top_ofdm_basic_rate);
 		cts_time = ack_time = vnt_get_frame_time(priv->preamble_type,
 			pkt_type, 14, priv->top_ofdm_basic_rate);
 	} else if (rsv_type == 3) {
 		cts_time = vnt_get_frame_time(priv->preamble_type, pkt_type,
-			                      14, priv->top_cck_basic_rate);
+						14, priv->top_cck_basic_rate);
 		ack_time = vnt_get_frame_time(priv->preamble_type, pkt_type,
-			                      14, priv->top_ofdm_basic_rate);
+						14, priv->top_ofdm_basic_rate);
 
 		rrv_time = cts_time + ack_time + data_time + 2 * priv->sifs;
 
@@ -227,7 +229,8 @@ static __le16 vnt_get_rtscts_duration_le(struct vnt_usb_send_context *context,
 	case RTSDUR_AA_F0:
 	case RTSDUR_AA_F1:
 		cts_time = vnt_get_frame_time(priv->preamble_type,
-				              pkt_type, 14, priv->top_ofdm_basic_rate);
+						pkt_type, 14,
+						priv->top_ofdm_basic_rate);
 		dur_time = cts_time + 2 * priv->sifs +
 			vnt_get_rsvtime(priv, pkt_type,
 					frame_length, rate, need_ack);
@@ -410,7 +413,7 @@ static u16 vnt_rxtx_rts_g_head(struct vnt_usb_send_context *tx_context,
 	u16 current_rate = tx_context->tx_rate;
 
 	vnt_get_phy_field(priv, rts_frame_len, priv->top_cck_basic_rate,
-		          PK_TYPE_11B, &buf->b);
+				PK_TYPE_11B, &buf->b);
 	vnt_get_phy_field(priv, rts_frame_len, priv->top_ofdm_basic_rate,
 			  tx_context->pkt_type, &buf->a);
 
@@ -437,7 +440,7 @@ static u16 vnt_rxtx_rts_g_fb_head(struct vnt_usb_send_context *tx_context,
 	u16 rts_frame_len = 20;
 
 	vnt_get_phy_field(priv, rts_frame_len, priv->top_cck_basic_rate,
-		          PK_TYPE_11B, &buf->b);
+				PK_TYPE_11B, &buf->b);
 	vnt_get_phy_field(priv, rts_frame_len, priv->top_ofdm_basic_rate,
 			  tx_context->pkt_type, &buf->a);
 
@@ -683,9 +686,9 @@ static u16 vnt_rxtx_ab(struct vnt_usb_send_context *tx_context,
 }
 
 static u16 vnt_generate_tx_parameter(struct vnt_usb_send_context *tx_context,
-	                              struct vnt_tx_buffer *tx_buffer,
-	                              struct vnt_mic_hdr **mic_hdr, u32 need_mic,
-	                              bool need_rts)
+					struct vnt_tx_buffer *tx_buffer,
+					struct vnt_mic_hdr **mic_hdr,
+					u32 need_mic, bool need_rts)
 {
 
 	if (tx_context->pkt_type == PK_TYPE_11GB ||
@@ -1024,7 +1027,7 @@ static int vnt_beacon_xmit(struct vnt_private *priv,
 
 		/* Get SignalField,ServiceField,Length */
 		vnt_get_phy_field(priv, frame_size, current_rate,
-			          PK_TYPE_11A, &short_head->ab);
+					PK_TYPE_11A, &short_head->ab);
 
 		/* Get Duration and TimeStampOff */
 		short_head->duration = vnt_get_duration_le(priv,
@@ -1101,7 +1104,7 @@ int vnt_beacon_make(struct vnt_private *priv, struct ieee80211_vif *vif)
 }
 
 int vnt_beacon_enable(struct vnt_private *priv, struct ieee80211_vif *vif,
-	               struct ieee80211_bss_conf *conf)
+			struct ieee80211_bss_conf *conf)
 {
 	vnt_mac_reg_bits_off(priv, MAC_REG_TCR, TCR_AUTOBCNTX);
 
Signature · 1 line
2.7.4

A message that is not in the archive (sent off-list or not yet received): CA+XqjF9=VwTnp19cnwNpnDZ1a7HKOxcaL6BqJa5rcZNBrf-yjQ@mail.gmail.com

#2 lore raw
Quoted 6 lines · Arushi Singhal
Quoted 2 lines · Prasant Jalan
Quoted 8 lines
Quoted 2 lines

Replacing spaces with tabs for indetation to fix checkpatch.pl error "code indent should use tabs where possible".

I think the commit message should be much more clear as for "code indentation"
you are even adding and deleting spaces.

Quoted 2 lines

Hi Arushi,

Thanks for comments and sorry to bother with a coding style fix patch. I'm just trying to learn and felt its an easy one.

I did not understand your comment "adding and deleting spaces". I'm only deleting spaces and replacing it with tabs. I'm not adding spaces. Could you please clarify.

Regards, Prasant

Quoted 166 lines
Quoted 165 lines

---

v2:
- improved changelog comments
- fixed only one issue

 drivers/staging/vt6656/rxtx.c | 35 +++++++++++++++++++----------------
 1 file changed, 19 insertions(+), 16 deletions(-)
drivers/staging/vt6656/rxtx.c +3 -3
index 1835cd1..7ebd1ee 100644
@@ -114,7 +114,7 @@ static __le16 vnt_time_stamp_off(struct vnt_private
 *priv, u16 rate)
 }
 
 static u32 vnt_get_rsvtime(struct vnt_private *priv, u8 pkt_type,
-                           u32 frame_length, u16 rate, int need_ack)
+                               u32 frame_length, u16 rate, int need_ack)
 {
        u32 data_time, ack_time;
@@ -135,14 +135,16 @@ static u32 vnt_get_rsvtime(struct vnt_private *priv,
 u8 pkt_type,
 }
 
 static __le16 vnt_rxtx_rsvtime_le16(struct vnt_private *priv, u8
 pkt_type,
-                                    u32 frame_length, u16 rate, int
 need_ack)
+                                       u32 frame_length, u16 rate,
+                                       int need_ack)
 {
        return cpu_to_le16((u16)vnt_get_rsvtime(priv, pkt_type,
                frame_length, rate, need_ack));
 }
 
 static __le16 vnt_get_rtscts_rsvtime_le(struct vnt_private *priv,
-                                        u8 rsv_type, u8 pkt_type, u32

frame_length, u16 current_rate)

drivers/staging/vt6656/rxtx.c +2 -0
+                                       u8 rsv_type, u8 pkt_type,
+                                       u32 frame_length, u16

current_rate)

 {
        u32 rrv_time, rts_time, cts_time, ack_time, data_time;
drivers/staging/vt6656/rxtx.c +3 -3
@@ -160,19 +162,19 @@ static __le16 vnt_get_rtscts_rsvtime_le(struct
 vnt_private *priv,
                rts_time = vnt_get_frame_time(priv->preamble_type,
                        pkt_type, 20, priv->top_cck_basic_rate);
                cts_time = vnt_get_frame_time(priv->preamble_type,
 pkt_type,
-                                             14,
 priv->top_cck_basic_rate);
+                                               14,
 priv->top_cck_basic_rate);
                ack_time = vnt_get_frame_time(priv->preamble_type,
 pkt_type,
-                                             14,
 priv->top_ofdm_basic_rate);
+                                               14,
 priv->top_ofdm_basic_rate);
        } else if (rsv_type == 2) {
                rts_time = vnt_get_frame_time(priv->preamble_type,
 pkt_type,
-                                             20,
 priv->top_ofdm_basic_rate);
+                                               20,
 priv->top_ofdm_basic_rate);

cts_time = ack_time =
vnt_get_frame_time(priv->preamble_type,

                        pkt_type, 14, priv->top_ofdm_basic_rate);
        } else if (rsv_type == 3) {
                cts_time = vnt_get_frame_time(priv->preamble_type,

pkt_type,
- 14,
priv->top_cck_basic_rate);
+ 14,

priv->top_cck_basic_rate);
                ack_time = vnt_get_frame_time(priv->preamble_type,

pkt_type,
- 14,
priv->top_ofdm_basic_rate);
+ 14,
priv->top_ofdm_basic_rate);

rrv_time = cts_time + ack_time + data_time + 2 *
priv->sifs;

drivers/staging/vt6656/rxtx.c +2 -1
@@ -227,7 +229,8 @@ static __le16 vnt_get_rtscts_duration_le(struct
 vnt_usb_send_context *context,
        case RTSDUR_AA_F0:
        case RTSDUR_AA_F1:
                cts_time = vnt_get_frame_time(priv->preamble_type,
-                                             pkt_type, 14,
 priv->top_ofdm_basic_rate);
+                                               pkt_type, 14,
+
 priv->top_ofdm_basic_rate);
                dur_time = cts_time + 2 * priv->sifs +
                        vnt_get_rsvtime(priv, pkt_type,
                                        frame_length, rate, need_ack);
drivers/staging/vt6656/rxtx.c +5 -5
@@ -410,7 +413,7 @@ static u16 vnt_rxtx_rts_g_head(struct
 vnt_usb_send_context *tx_context,
        u16 current_rate = tx_context->tx_rate;
 
        vnt_get_phy_field(priv, rts_frame_len, priv->top_cck_basic_rate,
-                         PK_TYPE_11B, &buf->b);
+                               PK_TYPE_11B, &buf->b);
        vnt_get_phy_field(priv, rts_frame_len, priv->top_ofdm_basic_rate,
                          tx_context->pkt_type, &buf->a);
@@ -437,7 +440,7 @@ static u16 vnt_rxtx_rts_g_fb_head(struct
 vnt_usb_send_context *tx_context,
        u16 rts_frame_len = 20;
 
        vnt_get_phy_field(priv, rts_frame_len, priv->top_cck_basic_rate,
-                         PK_TYPE_11B, &buf->b);
+                               PK_TYPE_11B, &buf->b);
        vnt_get_phy_field(priv, rts_frame_len, priv->top_ofdm_basic_rate,
                          tx_context->pkt_type, &buf->a);
@@ -683,9 +686,9 @@ static u16 vnt_rxtx_ab(struct vnt_usb_send_context
 *tx_context,
 }
 
 static u16 vnt_generate_tx_parameter(struct vnt_usb_send_context
 *tx_context,
-                                     struct vnt_tx_buffer *tx_buffer,
-                                     struct vnt_mic_hdr **mic_hdr, u32
 need_mic,
-                                     bool need_rts)
+                                       struct vnt_tx_buffer *tx_buffer,
+                                       struct vnt_mic_hdr **mic_hdr,
+                                       u32 need_mic, bool need_rts)

{

        if (tx_context->pkt_type == PK_TYPE_11GB ||
drivers/staging/vt6656/rxtx.c +2 -2
@@ -1024,7 +1027,7 @@ static int vnt_beacon_xmit(struct vnt_private *priv,
 
                /* Get SignalField,ServiceField,Length */
                vnt_get_phy_field(priv, frame_size, current_rate,
-                                 PK_TYPE_11A, &short_head->ab);
+                                       PK_TYPE_11A, &short_head->ab);
 
                /* Get Duration and TimeStampOff */
                short_head->duration = vnt_get_duration_le(priv,
@@ -1101,7 +1104,7 @@ int vnt_beacon_make(struct vnt_private *priv, struct
 ieee80211_vif *vif)
 }
 
 int vnt_beacon_enable(struct vnt_private *priv, struct ieee80211_vif
 *vif,
-                      struct ieee80211_bss_conf *conf)
+                       struct ieee80211_bss_conf *conf)
 {
        vnt_mac_reg_bits_off(priv, MAC_REG_TCR, TCR_AUTOBCNTX);

--
2.7.4

maintainer
#3 lore raw
In reply to Prasant Jalan
Quoted 21 lines · Prasant Jalan

Replacing spaces with tabs for indetation to fix checkpatch.pl error "code indent should use tabs where possible".

---

v2:
- improved changelog comments
- fixed only one issue

 drivers/staging/vt6656/rxtx.c | 35 +++++++++++++++++++----------------
 1 file changed, 19 insertions(+), 16 deletions(-)
drivers/staging/vt6656/rxtx.c +0 -0
index 1835cd1..7ebd1ee 100644

drivers/staging/vt6656/rxtx.c static __le16 vnt_time_stamp_off(struct vnt_private *priv, u16 rate) · line 117

Quoted 5 lines
drivers/staging/vt6656/rxtx.c +1 -1
@@ -114,7 +114,7 @@ static __le16 vnt_time_stamp_off(struct vnt_private *priv, u16 rate)
 }
 
 static u32 vnt_get_rsvtime(struct vnt_private *priv, u8 pkt_type,
-	                    u32 frame_length, u16 rate, int need_ack)
+				u32 frame_length, u16 rate, int need_ack)

No, it should look like:

u32 frame_length, u16 rate, int need_ack)

Please fix them up that way.

thanks,

greg k-h