Staging: ks7010: clean up ks_hostif.h

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



>From 58defc62d53cb473f9d745127d98df834a10b321 Mon Sep 17 00:00:00 2001
From: Logan Gorence <kernelgorence@xxxxxxxxx>
Date: Tue, 31 Jan 2017 21:51:05 -0800
Subject: [PATCH] Staging: ks7010: clean up ks_hostif.h

Clean up the errors in ks_hostif.h put out by checkpatch.pl.

Signed-off by: Logan Gorence <kernelgorence@xxxxxxxxx>
---
 drivers/staging/ks7010/ks_hostif.h | 56 +++++++++++++++++++-----------
--------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/drivers/staging/ks7010/ks_hostif.h
b/drivers/staging/ks7010/ks_hostif.h
index 743f31ead56e..ccc2a7742e80 100644
--- a/drivers/staging/ks7010/ks_hostif.h
+++ b/drivers/staging/ks7010/ks_hostif.h
@@ -1,6 +1,6 @@
 /*
  *   Driver for KeyStream wireless LAN
- *   
+ *
  *   Copyright (c) 2005-2008 KeyStream Corp.
  *   Copyright (C) 2009 Renesas Technology Corp.
  *
@@ -360,7 +360,7 @@ struct hostif_ps_adhoc_set_request_t {
 #define CTS_MODE_TRUE	1
 	uint16_t channel;
 	struct rate_set16_t rate_set;
-	uint16_t capability;	/* bit5:preamble bit6:pbcc pbcc
not supported always 0 
+	uint16_t capability;	/* bit5:preamble bit6:pbcc pbcc
not supported always 0
 				 * bit10:ShortSlotTime bit13:DSSS-OFDM 
DSSS-OFDM not supported always 0 */
 	uint16_t scan_type;
 } __packed;
@@ -376,7 +376,7 @@ struct hostif_infrastructure_set_request_t {
 	uint16_t cts_mode;
 	struct rate_set16_t rate_set;
 	struct ssid_t ssid;
-	uint16_t capability;	/* bit5:preamble bit6:pbcc pbcc
not supported always 0 
+	uint16_t capability;	/* bit5:preamble bit6:pbcc pbcc
not supported always 0
 				 * bit10:ShortSlotTime bit13:DSSS-OFDM 
DSSS-OFDM not supported always 0 */
 	uint16_t beacon_lost_count;
 	uint16_t auth_type;
@@ -392,7 +392,7 @@ struct hostif_infrastructure_set2_request_t {
 	uint16_t cts_mode;
 	struct rate_set16_t rate_set;
 	struct ssid_t ssid;
-	uint16_t capability;	/* bit5:preamble bit6:pbcc pbcc
not supported always 0 
+	uint16_t capability;	/* bit5:preamble bit6:pbcc pbcc
not supported always 0
 				 * bit10:ShortSlotTime bit13:DSSS-OFDM 
DSSS-OFDM not supported always 0 */
 	uint16_t beacon_lost_count;
 	uint16_t auth_type;
@@ -415,7 +415,7 @@ struct hostif_adhoc_set_request_t {
 	uint16_t channel;
 	struct rate_set16_t rate_set;
 	struct ssid_t ssid;
-	uint16_t capability;	/* bit5:preamble bit6:pbcc pbcc
not supported always 0 
+	uint16_t capability;	/* bit5:preamble bit6:pbcc pbcc
not supported always 0
 				 * bit10:ShortSlotTime bit13:DSSS-OFDM 
DSSS-OFDM not supported always 0 */
 	uint16_t scan_type;
 } __packed;
@@ -427,7 +427,7 @@ struct hostif_adhoc_set2_request_t {
 	uint16_t reserved;
 	struct rate_set16_t rate_set;
 	struct ssid_t ssid;
-	uint16_t capability;	/* bit5:preamble bit6:pbcc pbcc
not supported always 0 
+	uint16_t capability;	/* bit5:preamble bit6:pbcc pbcc
not supported always 0
 				 * bit10:ShortSlotTime bit13:DSSS-OFDM 
DSSS-OFDM not supported always 0 */
 	uint16_t scan_type;
 	struct channel_list_t channel_list;
@@ -568,19 +568,19 @@ struct hostif_mic_failure_confirm_t {
 #define TX_RATE_48M	(uint8_t)(480/5)
 #define TX_RATE_54M	(uint8_t)(540/5)
 
-#define IS_11B_RATE(A)
(((A&RATE_MASK)==TX_RATE_1M)||((A&RATE_MASK)==TX_RATE_2M)||\
-                        ((A&RATE_MASK)==TX_RATE_5M)||((A&RATE_MASK)==T
X_RATE_11M))
+#define IS_11B_RATE(A) (((A&RATE_MASK) == TX_RATE_1M) ||
((A&RATE_MASK) == TX_RATE_2M) || \
+			((A&RATE_MASK) == TX_RATE_5M) ||
((A&RATE_MASK) == TX_RATE_11M))
 
-#define IS_OFDM_RATE(A)
(((A&RATE_MASK)==TX_RATE_6M)||((A&RATE_MASK)==TX_RATE_12M)||\
-                        ((A&RATE_MASK)==TX_RATE_24M)||((A&RATE_MASK)==
TX_RATE_9M)||\
-                        ((A&RATE_MASK)==TX_RATE_18M)||((A&RATE_MASK)==
TX_RATE_36M)||\
-                        ((A&RATE_MASK)==TX_RATE_48M)||((A&RATE_MASK)==
TX_RATE_54M))
+#define IS_OFDM_RATE(A) (((A&RATE_MASK) == TX_RATE_6M) ||
((A&RATE_MASK) == TX_RATE_12M) || \
+			((A&RATE_MASK) == TX_RATE_24M) ||
((A&RATE_MASK) == TX_RATE_9M) || \
+			((A&RATE_MASK) == TX_RATE_18M) ||
((A&RATE_MASK) == TX_RATE_36M) || \
+			((A&RATE_MASK) == TX_RATE_48M) ||
((A&RATE_MASK) == TX_RATE_54M))
 
-#define IS_11BG_RATE(A) (IS_11B_RATE(A)||IS_OFDM_RATE(A))
+#define IS_11BG_RATE(A) (IS_11B_RATE(A) || IS_OFDM_RATE(A))
 
-#define
IS_OFDM_EXT_RATE(A)  (((A&RATE_MASK)==TX_RATE_9M)||((A&RATE_MASK)==TX_R
ATE_18M)||\
-                             ((A&RATE_MASK)==TX_RATE_36M)||((A&RATE_MA
SK)==TX_RATE_48M)||\
-                             ((A&RATE_MASK)==TX_RATE_54M))
+#define IS_OFDM_EXT_RATE(A)  (((A&RATE_MASK) == TX_RATE_9M) ||
((A&RATE_MASK) == TX_RATE_18M) || \
+				((A&RATE_MASK) == TX_RATE_36M) ||
((A&RATE_MASK) == TX_RATE_48M) || \
+				((A&RATE_MASK) == TX_RATE_54M))
 
 enum {
 	CONNECT_STATUS = 0,
@@ -602,17 +602,17 @@ enum {
 
 /* macro function */
 #define HIF_EVENT_MASK 0xE800
-#define IS_HIF_IND(_EVENT)  ((_EVENT&HIF_EVENT_MASK)==0xE800  && \
-                             ((_EVENT&~HIF_EVENT_MASK)==0x0001 || \
-                              (_EVENT&~HIF_EVENT_MASK)==0x0006 || \
-                              (_EVENT&~HIF_EVENT_MASK)==0x000C || \
-                              (_EVENT&~HIF_EVENT_MASK)==0x0011 || \
-                              (_EVENT&~HIF_EVENT_MASK)==0x0012))
-
-#define IS_HIF_CONF(_EVENT) ((_EVENT&HIF_EVENT_MASK)==0xE800  && \
-                             (_EVENT&~HIF_EVENT_MASK)>0x0000  && \
-                             (_EVENT&~HIF_EVENT_MASK)<0x0012  && \
-                             !IS_HIF_IND(_EVENT) )
+#define IS_HIF_IND(_EVENT)  ((_EVENT&HIF_EVENT_MASK) == 0xE800  && \
+				((_EVENT&~HIF_EVENT_MASK) == 0x0001 ||
\
+				(_EVENT&~HIF_EVENT_MASK) == 0x0006 ||
\
+				(_EVENT&~HIF_EVENT_MASK) == 0x000C ||
\
+				(_EVENT&~HIF_EVENT_MASK) == 0x0011 ||
\
+				(_EVENT&~HIF_EVENT_MASK) == 0x0012))
+
+#define IS_HIF_CONF(_EVENT) ((_EVENT&HIF_EVENT_MASK) == 0xE800  && \
+				(_EVENT&~HIF_EVENT_MASK) > 0x0000  &&
\
+				(_EVENT&~HIF_EVENT_MASK) < 0x0012  &&
\
+				!IS_HIF_IND(_EVENT))
 
 #ifdef __KERNEL__
 
@@ -622,7 +622,7 @@ enum {
 int hostif_data_request(struct ks_wlan_private *priv,
 			 struct sk_buff *packet);
 void hostif_receive(struct ks_wlan_private *priv, unsigned char *p,
-	             unsigned int size);
+			unsigned int size);
 void hostif_sme_enqueue(struct ks_wlan_private *priv, uint16_t event);
 int hostif_init(struct ks_wlan_private *priv);
 void hostif_exit(struct ks_wlan_private *priv);
-- 
2.11.0

_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel




[Index of Archives]     [Linux Driver Backports]     [DMA Engine]     [Linux GPIO]     [Linux SPI]     [Video for Linux]     [Linux USB Devel]     [Linux Coverity]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [Yosemite Backpacking]
  Powered by Linux