Преглед на файлове

staging: vt6656: remove multiple assignments

Fix style in rxtx.c, breaking all multiple assignments in different
lines.

Signed-off-by: Juan Manuel Torres Palma <j.m.torrespalma@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Juan Manuel Torres Palma преди 8 години
родител
ревизия
9df81ce975
променени са 1 файла, в които са добавени 14 реда и са изтрити 6 реда
  1. 14 6
      drivers/staging/vt6656/rxtx.c

+ 14 - 6
drivers/staging/vt6656/rxtx.c

@@ -147,7 +147,10 @@ static __le16 vnt_get_rtscts_rsvtime_le(struct vnt_private *priv, u8 rsv_type,
 {
 {
 	u32 rrv_time, rts_time, cts_time, ack_time, data_time;
 	u32 rrv_time, rts_time, cts_time, ack_time, data_time;
 
 
-	rrv_time = rts_time = cts_time = ack_time = data_time = 0;
+	rrv_time = 0;
+	rts_time = 0;
+	cts_time = 0;
+	ack_time = 0;
 
 
 	data_time = vnt_get_frame_time(priv->preamble_type, pkt_type,
 	data_time = vnt_get_frame_time(priv->preamble_type, pkt_type,
 				       frame_length, current_rate);
 				       frame_length, current_rate);
@@ -155,9 +158,11 @@ static __le16 vnt_get_rtscts_rsvtime_le(struct vnt_private *priv, u8 rsv_type,
 	if (rsv_type == 0) {
 	if (rsv_type == 0) {
 		rts_time = vnt_get_frame_time(priv->preamble_type, pkt_type,
 		rts_time = vnt_get_frame_time(priv->preamble_type, pkt_type,
 					      20, priv->top_cck_basic_rate);
 					      20, priv->top_cck_basic_rate);
-		cts_time = ack_time = vnt_get_frame_time(priv->preamble_type,
-							 pkt_type, 14,
-							 priv->top_cck_basic_rate);
+		ack_time = vnt_get_frame_time(priv->preamble_type,
+					      pkt_type, 14,
+					      priv->top_cck_basic_rate);
+		cts_time = ack_time;
+
 	} else if (rsv_type == 1) {
 	} else if (rsv_type == 1) {
 		rts_time = vnt_get_frame_time(priv->preamble_type, pkt_type,
 		rts_time = vnt_get_frame_time(priv->preamble_type, pkt_type,
 					      20, priv->top_cck_basic_rate);
 					      20, priv->top_cck_basic_rate);
@@ -168,8 +173,11 @@ static __le16 vnt_get_rtscts_rsvtime_le(struct vnt_private *priv, u8 rsv_type,
 	} else if (rsv_type == 2) {
 	} else if (rsv_type == 2) {
 		rts_time = vnt_get_frame_time(priv->preamble_type, pkt_type,
 		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);
+		ack_time = vnt_get_frame_time(priv->preamble_type,
+					      pkt_type, 14,
+					      priv->top_ofdm_basic_rate);
+		cts_time = ack_time;
+
 	} else if (rsv_type == 3) {
 	} else if (rsv_type == 3) {
 		cts_time = vnt_get_frame_time(priv->preamble_type, pkt_type,
 		cts_time = vnt_get_frame_time(priv->preamble_type, pkt_type,
 					      14, priv->top_cck_basic_rate);
 					      14, priv->top_cck_basic_rate);