Skip to contentSkip to conversation

Staging: ks7010 - fixed style block comments

PATCH In review Derek Robson 3 participants 5 messages Mar 19, 2017 – Mar 21, 2017 Staging

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Staging: ks7010 - fixed style block comments

Fixed style of all block comments across whole driver Found by checkpatch

---
 drivers/staging/ks7010/ks7010_sdio.c |  3 ++-
 drivers/staging/ks7010/ks_hostif.h   | 35 +++++++++++++++++++++---------
 drivers/staging/ks7010/ks_wlan.h     |  3 ++-
 drivers/staging/ks7010/ks_wlan_net.c | 41 +++++++++++++++++++++++-------------
 4 files changed, 55 insertions(+), 27 deletions(-)
drivers/staging/ks7010/ks7010_sdio.c +2 -1
index 6f9f746a3a61..1311e83b99d8 100644
@@ -496,7 +496,8 @@ static void ks7010_rw_function(struct work_struct *work)
 	while (time_after(priv->last_wakeup + ((30 * HZ) / 1000), jiffies)) {
 		DPRINTK(4, "wait after WAKEUP\n");
 /*		queue_delayed_work(priv->ks_wlan_hw.ks7010sdio_wq,&priv->ks_wlan_hw.rw_wq,
-		(priv->last_wakeup + ((30*HZ)/1000) - jiffies));*/
+ *		(priv->last_wakeup + ((30*HZ)/1000) - jiffies));
+ */
 		dev_info(&priv->ks_wlan_hw.sdio_card->func->dev,
 			 "wake: %lu %lu\n",
 			 priv->last_wakeup + (30 * HZ) / 1000,
drivers/staging/ks7010/ks_hostif.h +25 -10
index 30c49b699d62..c7636e829c40 100644
@@ -360,8 +360,11 @@ 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 
-				 * bit10:ShortSlotTime bit13:DSSS-OFDM DSSS-OFDM 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,8 +379,11 @@ 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 
-				 * bit10:ShortSlotTime bit13:DSSS-OFDM DSSS-OFDM 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;
 #define AUTH_TYPE_OPEN_SYSTEM 0
@@ -392,8 +398,11 @@ 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 
-				 * bit10:ShortSlotTime bit13:DSSS-OFDM DSSS-OFDM 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;
 #define AUTH_TYPE_OPEN_SYSTEM 0
@@ -415,8 +424,11 @@ 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 
-				 * bit10:ShortSlotTime bit13:DSSS-OFDM DSSS-OFDM 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,8 +439,11 @@ 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 
-				 * bit10:ShortSlotTime bit13:DSSS-OFDM DSSS-OFDM 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;
 	uint8_t bssid[ETH_ALEN];
drivers/staging/ks7010/ks_wlan.h +2 -1
index 9ab80e1f123e..540319d49c7a 100644
@@ -356,7 +356,8 @@ struct wpa_key_t {
 	u8 rx_seq[IW_ENCODE_SEQ_MAX_SIZE];	/* LSB first */
 	struct sockaddr addr;	/* ff:ff:ff:ff:ff:ff for broadcast/multicast
 				 * (group) keys or unicast address for
-				 * individual keys */
+				 * individual keys
+				 */
 	u16 alg;
 	u16 key_len;	/* WEP: 5 or 13, TKIP: 32, CCMP: 16 */
 	u8 key_val[IW_ENCODING_TOKEN_MAX];
drivers/staging/ks7010/ks_wlan_net.c +26 -15

107 lines not on this page · raw message

Signature · 1 line
2.12.0
maintainer
#1 lore raw
Quoted 10 lines · Derek Robson

Fixed style of all block comments across whole driver Found by checkpatch

---
 drivers/staging/ks7010/ks7010_sdio.c |  3 ++-
 drivers/staging/ks7010/ks_hostif.h   | 35 +++++++++++++++++++++---------
 drivers/staging/ks7010/ks_wlan.h     |  3 ++-
 drivers/staging/ks7010/ks_wlan_net.c | 41 +++++++++++++++++++++++-------------
 4 files changed, 55 insertions(+), 27 deletions(-)

This patch doesn't apply to my tree at all :(

sorry,

greg k-h

#2 lore raw
Quoted 12 lines · Greg KH
Quoted 10 lines · Derek Robson

Fixed style of all block comments across whole driver Found by checkpatch

---
 drivers/staging/ks7010/ks7010_sdio.c |  3 ++-
 drivers/staging/ks7010/ks_hostif.h   | 35 +++++++++++++++++++++---------
 drivers/staging/ks7010/ks_wlan.h     |  3 ++-
 drivers/staging/ks7010/ks_wlan_net.c | 41 +++++++++++++++++++++++-------------
 4 files changed, 55 insertions(+), 27 deletions(-)
Quoted 2 lines

This patch doesn't apply to my tree at all :(

Am I working from the right/best tree for driver/staging?

https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git

Thanks for helping the new guy :-)

maintainer
#3 lore raw
Quoted 13 lines · Derek Robson
Quoted 12 lines · Greg KH
Quoted 10 lines · Derek Robson

Fixed style of all block comments across whole driver Found by checkpatch

---
 drivers/staging/ks7010/ks7010_sdio.c |  3 ++-
 drivers/staging/ks7010/ks_hostif.h   | 35 +++++++++++++++++++++---------
 drivers/staging/ks7010/ks_wlan.h     |  3 ++-
 drivers/staging/ks7010/ks_wlan_net.c | 41 +++++++++++++++++++++++-------------
 4 files changed, 55 insertions(+), 27 deletions(-)
Quoted 6 lines
Quoted 2 lines

This patch doesn't apply to my tree at all :(

Am I working from the right/best tree for driver/staging?

https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git

What branch did you use? You should use staging-next, or worse case, staging-testing. Don't use 'master', as that tracks Linus's tree and is usually quite old.

thanks,

greg k-h

#4 lore raw
In reply to Derek Robson
Quoted 13 lines · Derek Robson
Quoted 12 lines · Greg KH
Quoted 10 lines · Derek Robson

Fixed style of all block comments across whole driver Found by checkpatch

---
 drivers/staging/ks7010/ks7010_sdio.c |  3 ++-
 drivers/staging/ks7010/ks_hostif.h   | 35 +++++++++++++++++++++---------
 drivers/staging/ks7010/ks_wlan.h     |  3 ++-
 drivers/staging/ks7010/ks_wlan_net.c | 41 +++++++++++++++++++++++-------------
 4 files changed, 55 insertions(+), 27 deletions(-)
Quoted 8 lines
Quoted 2 lines

This patch doesn't apply to my tree at all :(

Am I working from the right/best tree for driver/staging?

https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git

Thanks for helping the new guy :-)

I think you just got unlucky on this one Derek, a patch set of mine that happened to fix this got merged the same morning you submitted your patch set.

Good luck,
Tobin.