Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1630998 > unrolled thread

[PATCH] staging: ks7010: fix block comment style in ks_wlan_net.c

Back to article view | Back to linux.kernel

Contents

  [PATCH] staging: ks7010: fix block comment style in ks_wlan_net.c Ilia Sergachev <ilia.sergachev@unibas.ch> - 2017-04-25 23:10 +0200
    Re: [PATCH] staging: ks7010: fix block comment style in ks_wlan_net.c "Tobin C. Harding" <me@tobin.cc> - 2017-04-26 05:30 +0200
    [PATCH v2] Staging: ks7010: style fix Ilia Sergachev <ilia.sergachev@unibas.ch> - 2017-04-26 10:30 +0200
      Re: [PATCH v2] Staging: ks7010: style fix Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-04-26 10:40 +0200
    [PATCH v2] Staging: ks7010: style fix Ilia Sergachev <ilia.sergachev@unibas.ch> - 2017-04-26 10:50 +0200
      Re: [PATCH v2] Staging: ks7010: style fix "Tobin C. Harding" <me@tobin.cc> - 2017-04-26 12:40 +0200
        Re: [PATCH v2] Staging: ks7010: style fix Dan Carpenter <dan.carpenter@oracle.com> - 2017-04-26 12:50 +0200
    [PATCH v3] staging: ks7010: fix block comment style Ilia Sergachev <ilia.sergachev@unibas.ch> - 2017-04-26 13:10 +0200
      Re: [PATCH v3] staging: ks7010: fix block comment style "Tobin C. Harding" <me@tobin.cc> - 2017-04-27 01:00 +0200
      Re: [PATCH v3] staging: ks7010: fix block comment style Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-04-28 11:50 +0200
    [PATCH v4] staging: ks7010: fix block comment style Ilia Sergachev <ilia.sergachev@unibas.ch> - 2017-04-28 12:40 +0200
      Re: [PATCH v4] staging: ks7010: fix block comment style Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-04-28 14:30 +0200
        Re: [PATCH v4] staging: ks7010: fix block comment style Ilia Sergachev <ilia.sergachev@unibas.ch> - 2017-04-28 15:10 +0200
          Re: [PATCH v4] staging: ks7010: fix block comment style "Tobin C. Harding" <me@tobin.cc> - 2017-04-30 11:20 +0200

#1630998 — [PATCH] staging: ks7010: fix block comment style in ks_wlan_net.c

This is a patch to the ks_wlan_net.c file that fixes up the following warning
found by the checkpatch.pl tool:
WARNING: Block comments use a trailing */ on a separate line

Signed-off-by: Ilia Sergachev <ilia.sergachev@unibas.ch>
---
 drivers/staging/ks7010/ks_wlan_net.c | 43 ++++++++++++++++++++++--------------
 1 file changed, 27 insertions(+), 16 deletions(-)

diff --git a/drivers/staging/ks7010/ks_wlan_net.c b/drivers/staging/ks7010/ks_wlan_net.c
index 121e1530fdba..7f6bd4d53d84 100644
--- a/drivers/staging/ks7010/ks_wlan_net.c
+++ b/drivers/staging/ks7010/ks_wlan_net.c
@@ -230,7 +230,8 @@ static int ks_wlan_set_freq(struct net_device *dev,
 	else {
 		int channel = fwrq->m;
 		/* We should do a better check than that,
-		 * based on the card capability !!! */
+		 * based on the card capability !!!
+		 */
 		if ((channel < 1) || (channel > 14)) {
 			netdev_dbg(dev,
 				   "%s: New channel value of %d is invalid!\n",
@@ -343,7 +344,8 @@ static int ks_wlan_get_essid(struct net_device *dev,
 
 	/* for SLEEP MODE */
 	/* Note : if dwrq->flags != 0, we should
-	 * get the relevant SSID from the SSID list... */
+	 * get the relevant SSID from the SSID list...
+	 */
 	if (priv->reg.ssid.size) {
 		/* Get the current SSID */
 		memcpy(extra, priv->reg.ssid.body, priv->reg.ssid.size);
@@ -1137,7 +1139,8 @@ static int ks_wlan_get_range(struct net_device *dev,
 	range->max_nwid = 0x0000;
 	range->num_channels = 14;
 	/* Should be based on cap_rid.country to give only
-	 * what the current card support */
+	 * what the current card support
+	 */
 	k = 0;
 	for (i = 0; i < 13; i++) {	/* channel 1 -- 13 */
 		range->freq[k].i = i + 1;	/* List index */
@@ -1189,7 +1192,8 @@ static int ks_wlan_get_range(struct net_device *dev,
 
 	/* Set an indication of the max TCP throughput
 	 * in bit/s that we can expect using this interface.
-	 * May be use for QoS stuff... Jean II */
+	 * May be use for QoS stuff... Jean II
+	 */
 	if (i > 2)
 		range->throughput = 5000 * 1000;
 	else
@@ -1225,7 +1229,8 @@ static int ks_wlan_get_range(struct net_device *dev,
 
 	/* Experimental measurements - boundary 11/5.5 Mb/s */
 	/* Note : with or without the (local->rssi), results
-	 * are somewhat different. - Jean II */
+	 * are somewhat different. - Jean II
+	 */
 	range->avg_qual.qual = 50;
 	range->avg_qual.level = 186;	/* -70 dBm */
 	range->avg_qual.noise = 0;
@@ -1497,7 +1502,8 @@ static inline char *ks_wlan_translate_scan(struct net_device *dev,
 				 &(ap->ssid.body[0]));
 
 	/* Rate : stuffing multiple values in a single event require a bit
-	 * more of magic - Jean II */
+	 * more of magic - Jean II
+	 */
 	current_val = current_ev + IW_EV_LCP_LEN;
 
 	iwe.cmd = SIOCGIWRATE;
@@ -1569,7 +1575,8 @@ static inline char *ks_wlan_translate_scan(struct net_device *dev,
 	}
 
 	/* The other data in the scan result are not really
-	 * interesting, so for now drop it - Jean II */
+	 * interesting, so for now drop it - Jean II
+	 */
 	return current_ev;
 }
 
@@ -1596,7 +1603,8 @@ static int ks_wlan_get_scan(struct net_device *dev,
 
 	if (priv->aplist.size == 0) {
 		/* Client error, no scan results...
-		 * The caller need to restart the scan. */
+		 * The caller need to restart the scan.
+		 */
 		DPRINTK(2, "aplist 0\n");
 		return -ENODATA;
 	}
@@ -1970,12 +1978,13 @@ static int ks_wlan_get_encode_ext(struct net_device *dev,
 		return -EPERM;
 
 	/* for SLEEP MODE */
-	/*  WPA (not used ?? wpa_supplicant)
-	   struct ks_wlan_private *priv = (struct ks_wlan_private *)dev->priv;
-	   struct iw_encode_ext *enc;
-	   enc = (struct iw_encode_ext *)extra;
-	   int index = dwrq->flags & IW_ENCODE_INDEX;
-	   WPA (not used ?? wpa_supplicant) */
+	/* WPA (not used ?? wpa_supplicant)
+	 * struct ks_wlan_private *priv = (struct ks_wlan_private *)dev->priv;
+	 * struct iw_encode_ext *enc;
+	 * enc = (struct iw_encode_ext *)extra;
+	 * int index = dwrq->flags & IW_ENCODE_INDEX;
+	 * WPA (not used ?? wpa_supplicant)
+	 */
 	return 0;
 }
 
@@ -2105,7 +2114,8 @@ static struct iw_statistics *ks_get_wireless_stats(struct net_device *dev)
 	}
 
 	/* Packets discarded in the wireless adapter due to wireless
-	 * specific problems */
+	 * specific problems
+	 */
 	wstats->discard.nwid = 0;	/* Rx invalid nwid      */
 	wstats->discard.code = 0;	/* Rx invalid crypt     */
 	wstats->discard.fragment = 0;	/* Rx invalid frag      */
@@ -3351,7 +3361,8 @@ void send_packet_complete(void *arg1, void *arg2)
 }
 
 /* Set or clear the multicast filter for this adaptor.
-   This routine is not state sensitive and need not be SMP locked. */
+ * This routine is not state sensitive and need not be SMP locked. 
+ */
 static
 void ks_wlan_set_multicast_list(struct net_device *dev)
 {
-- 
2.11.0

[toc] | [next] | [standalone]

#1631128

On Tue, Apr 25, 2017 at 10:59:25PM +0200, Ilia Sergachev wrote:
> This is a patch to the ks_wlan_net.c file that fixes up the following warning
> found by the checkpatch.pl tool:
> WARNING: Block comments use a trailing */ on a separate line

Good work resubmitting this following Greg's comments. May I suggest
some ways to hasten your success.

Note firstly, that I appreciate that writing the gitlog message is
very difficult to do well. I am by no means an expert.

 - You don't need to mention the file, especially not in the subject. We
   can see the files changed from the patch itself.
 - You should refrain from using 'this patch', the subject (as in
   subject, object, verb) is implicit.

See Documentation/process/submitting-patches.rst (Section 2: Describe
your changes). 

Example

Checkpatch emits WARNING: Block comments use a trailing */ on a
separate line.

Move trailing */ to separate line.

Good luck,
Tobin.

[toc] | [prev] | [next] | [standalone]

#1631238 — [PATCH v2] Staging: ks7010: style fix

Fix the style of block comments.
Move trailing */ to a separate line.
Checkpatch was showing:
WARNING: Block comments use a trailing */ on a separate line.

Signed-off-by: Ilia Sergachev <ilia.sergachev@unibas.ch>
---
 drivers/staging/ks7010/ks_wlan_net.c | 43 ++++++++++++++++++++++--------------
 1 file changed, 27 insertions(+), 16 deletions(-)

diff --git a/drivers/staging/ks7010/ks_wlan_net.c b/drivers/staging/ks7010/ks_wlan_net.c
index 121e1530fdba..7f6bd4d53d84 100644
--- a/drivers/staging/ks7010/ks_wlan_net.c
+++ b/drivers/staging/ks7010/ks_wlan_net.c
@@ -230,7 +230,8 @@ static int ks_wlan_set_freq(struct net_device *dev,
 	else {
 		int channel = fwrq->m;
 		/* We should do a better check than that,
-		 * based on the card capability !!! */
+		 * based on the card capability !!!
+		 */
 		if ((channel < 1) || (channel > 14)) {
 			netdev_dbg(dev,
 				   "%s: New channel value of %d is invalid!\n",
@@ -343,7 +344,8 @@ static int ks_wlan_get_essid(struct net_device *dev,
 
 	/* for SLEEP MODE */
 	/* Note : if dwrq->flags != 0, we should
-	 * get the relevant SSID from the SSID list... */
+	 * get the relevant SSID from the SSID list...
+	 */
 	if (priv->reg.ssid.size) {
 		/* Get the current SSID */
 		memcpy(extra, priv->reg.ssid.body, priv->reg.ssid.size);
@@ -1137,7 +1139,8 @@ static int ks_wlan_get_range(struct net_device *dev,
 	range->max_nwid = 0x0000;
 	range->num_channels = 14;
 	/* Should be based on cap_rid.country to give only
-	 * what the current card support */
+	 * what the current card support
+	 */
 	k = 0;
 	for (i = 0; i < 13; i++) {	/* channel 1 -- 13 */
 		range->freq[k].i = i + 1;	/* List index */
@@ -1189,7 +1192,8 @@ static int ks_wlan_get_range(struct net_device *dev,
 
 	/* Set an indication of the max TCP throughput
 	 * in bit/s that we can expect using this interface.
-	 * May be use for QoS stuff... Jean II */
+	 * May be use for QoS stuff... Jean II
+	 */
 	if (i > 2)
 		range->throughput = 5000 * 1000;
 	else
@@ -1225,7 +1229,8 @@ static int ks_wlan_get_range(struct net_device *dev,
 
 	/* Experimental measurements - boundary 11/5.5 Mb/s */
 	/* Note : with or without the (local->rssi), results
-	 * are somewhat different. - Jean II */
+	 * are somewhat different. - Jean II
+	 */
 	range->avg_qual.qual = 50;
 	range->avg_qual.level = 186;	/* -70 dBm */
 	range->avg_qual.noise = 0;
@@ -1497,7 +1502,8 @@ static inline char *ks_wlan_translate_scan(struct net_device *dev,
 				 &(ap->ssid.body[0]));
 
 	/* Rate : stuffing multiple values in a single event require a bit
-	 * more of magic - Jean II */
+	 * more of magic - Jean II
+	 */
 	current_val = current_ev + IW_EV_LCP_LEN;
 
 	iwe.cmd = SIOCGIWRATE;
@@ -1569,7 +1575,8 @@ static inline char *ks_wlan_translate_scan(struct net_device *dev,
 	}
 
 	/* The other data in the scan result are not really
-	 * interesting, so for now drop it - Jean II */
+	 * interesting, so for now drop it - Jean II
+	 */
 	return current_ev;
 }
 
@@ -1596,7 +1603,8 @@ static int ks_wlan_get_scan(struct net_device *dev,
 
 	if (priv->aplist.size == 0) {
 		/* Client error, no scan results...
-		 * The caller need to restart the scan. */
+		 * The caller need to restart the scan.
+		 */
 		DPRINTK(2, "aplist 0\n");
 		return -ENODATA;
 	}
@@ -1970,12 +1978,13 @@ static int ks_wlan_get_encode_ext(struct net_device *dev,
 		return -EPERM;
 
 	/* for SLEEP MODE */
-	/*  WPA (not used ?? wpa_supplicant)
-	   struct ks_wlan_private *priv = (struct ks_wlan_private *)dev->priv;
-	   struct iw_encode_ext *enc;
-	   enc = (struct iw_encode_ext *)extra;
-	   int index = dwrq->flags & IW_ENCODE_INDEX;
-	   WPA (not used ?? wpa_supplicant) */
+	/* WPA (not used ?? wpa_supplicant)
+	 * struct ks_wlan_private *priv = (struct ks_wlan_private *)dev->priv;
+	 * struct iw_encode_ext *enc;
+	 * enc = (struct iw_encode_ext *)extra;
+	 * int index = dwrq->flags & IW_ENCODE_INDEX;
+	 * WPA (not used ?? wpa_supplicant)
+	 */
 	return 0;
 }
 
@@ -2105,7 +2114,8 @@ static struct iw_statistics *ks_get_wireless_stats(struct net_device *dev)
 	}
 
 	/* Packets discarded in the wireless adapter due to wireless
-	 * specific problems */
+	 * specific problems
+	 */
 	wstats->discard.nwid = 0;	/* Rx invalid nwid      */
 	wstats->discard.code = 0;	/* Rx invalid crypt     */
 	wstats->discard.fragment = 0;	/* Rx invalid frag      */
@@ -3351,7 +3361,8 @@ void send_packet_complete(void *arg1, void *arg2)
 }
 
 /* Set or clear the multicast filter for this adaptor.
-   This routine is not state sensitive and need not be SMP locked. */
+ * This routine is not state sensitive and need not be SMP locked. 
+ */
 static
 void ks_wlan_set_multicast_list(struct net_device *dev)
 {
-- 
2.11.0

[toc] | [prev] | [next] | [standalone]

#1631247 — Re: [PATCH v2] Staging: ks7010: style fix

On Wed, Apr 26, 2017 at 10:18:14AM +0200, Ilia Sergachev wrote:
> Fix the style of block comments.
> Move trailing */ to a separate line.
> Checkpatch was showing:
> WARNING: Block comments use a trailing */ on a separate line.
> 
> Signed-off-by: Ilia Sergachev <ilia.sergachev@unibas.ch>
> ---
>  drivers/staging/ks7010/ks_wlan_net.c | 43 ++++++++++++++++++++++--------------
>  1 file changed, 27 insertions(+), 16 deletions(-)

What changed from v1?  That needs to go here below the --- line.

thanks,

greg k-h

[toc] | [prev] | [next] | [standalone]

#1631255 — [PATCH v2] Staging: ks7010: style fix

Fix the style of block comments.
Move trailing */ to a separate line.
Checkpatch was showing:
WARNING: Block comments use a trailing */ on a separate line.

Signed-off-by: Ilia Sergachev <ilia.sergachev@unibas.ch>
---
Changes for v2:
  - improve the commit message

 drivers/staging/ks7010/ks_wlan_net.c | 43 ++++++++++++++++++++++--------------
 1 file changed, 27 insertions(+), 16 deletions(-)

diff --git a/drivers/staging/ks7010/ks_wlan_net.c b/drivers/staging/ks7010/ks_wlan_net.c
index 121e1530fdba..7f6bd4d53d84 100644
--- a/drivers/staging/ks7010/ks_wlan_net.c
+++ b/drivers/staging/ks7010/ks_wlan_net.c
@@ -230,7 +230,8 @@ static int ks_wlan_set_freq(struct net_device *dev,
 	else {
 		int channel = fwrq->m;
 		/* We should do a better check than that,
-		 * based on the card capability !!! */
+		 * based on the card capability !!!
+		 */
 		if ((channel < 1) || (channel > 14)) {
 			netdev_dbg(dev,
 				   "%s: New channel value of %d is invalid!\n",
@@ -343,7 +344,8 @@ static int ks_wlan_get_essid(struct net_device *dev,
 
 	/* for SLEEP MODE */
 	/* Note : if dwrq->flags != 0, we should
-	 * get the relevant SSID from the SSID list... */
+	 * get the relevant SSID from the SSID list...
+	 */
 	if (priv->reg.ssid.size) {
 		/* Get the current SSID */
 		memcpy(extra, priv->reg.ssid.body, priv->reg.ssid.size);
@@ -1137,7 +1139,8 @@ static int ks_wlan_get_range(struct net_device *dev,
 	range->max_nwid = 0x0000;
 	range->num_channels = 14;
 	/* Should be based on cap_rid.country to give only
-	 * what the current card support */
+	 * what the current card support
+	 */
 	k = 0;
 	for (i = 0; i < 13; i++) {	/* channel 1 -- 13 */
 		range->freq[k].i = i + 1;	/* List index */
@@ -1189,7 +1192,8 @@ static int ks_wlan_get_range(struct net_device *dev,
 
 	/* Set an indication of the max TCP throughput
 	 * in bit/s that we can expect using this interface.
-	 * May be use for QoS stuff... Jean II */
+	 * May be use for QoS stuff... Jean II
+	 */
 	if (i > 2)
 		range->throughput = 5000 * 1000;
 	else
@@ -1225,7 +1229,8 @@ static int ks_wlan_get_range(struct net_device *dev,
 
 	/* Experimental measurements - boundary 11/5.5 Mb/s */
 	/* Note : with or without the (local->rssi), results
-	 * are somewhat different. - Jean II */
+	 * are somewhat different. - Jean II
+	 */
 	range->avg_qual.qual = 50;
 	range->avg_qual.level = 186;	/* -70 dBm */
 	range->avg_qual.noise = 0;
@@ -1497,7 +1502,8 @@ static inline char *ks_wlan_translate_scan(struct net_device *dev,
 				 &(ap->ssid.body[0]));
 
 	/* Rate : stuffing multiple values in a single event require a bit
-	 * more of magic - Jean II */
+	 * more of magic - Jean II
+	 */
 	current_val = current_ev + IW_EV_LCP_LEN;
 
 	iwe.cmd = SIOCGIWRATE;
@@ -1569,7 +1575,8 @@ static inline char *ks_wlan_translate_scan(struct net_device *dev,
 	}
 
 	/* The other data in the scan result are not really
-	 * interesting, so for now drop it - Jean II */
+	 * interesting, so for now drop it - Jean II
+	 */
 	return current_ev;
 }
 
@@ -1596,7 +1603,8 @@ static int ks_wlan_get_scan(struct net_device *dev,
 
 	if (priv->aplist.size == 0) {
 		/* Client error, no scan results...
-		 * The caller need to restart the scan. */
+		 * The caller need to restart the scan.
+		 */
 		DPRINTK(2, "aplist 0\n");
 		return -ENODATA;
 	}
@@ -1970,12 +1978,13 @@ static int ks_wlan_get_encode_ext(struct net_device *dev,
 		return -EPERM;
 
 	/* for SLEEP MODE */
-	/*  WPA (not used ?? wpa_supplicant)
-	   struct ks_wlan_private *priv = (struct ks_wlan_private *)dev->priv;
-	   struct iw_encode_ext *enc;
-	   enc = (struct iw_encode_ext *)extra;
-	   int index = dwrq->flags & IW_ENCODE_INDEX;
-	   WPA (not used ?? wpa_supplicant) */
+	/* WPA (not used ?? wpa_supplicant)
+	 * struct ks_wlan_private *priv = (struct ks_wlan_private *)dev->priv;
+	 * struct iw_encode_ext *enc;
+	 * enc = (struct iw_encode_ext *)extra;
+	 * int index = dwrq->flags & IW_ENCODE_INDEX;
+	 * WPA (not used ?? wpa_supplicant)
+	 */
 	return 0;
 }
 
@@ -2105,7 +2114,8 @@ static struct iw_statistics *ks_get_wireless_stats(struct net_device *dev)
 	}
 
 	/* Packets discarded in the wireless adapter due to wireless
-	 * specific problems */
+	 * specific problems
+	 */
 	wstats->discard.nwid = 0;	/* Rx invalid nwid      */
 	wstats->discard.code = 0;	/* Rx invalid crypt     */
 	wstats->discard.fragment = 0;	/* Rx invalid frag      */
@@ -3351,7 +3361,8 @@ void send_packet_complete(void *arg1, void *arg2)
 }
 
 /* Set or clear the multicast filter for this adaptor.
-   This routine is not state sensitive and need not be SMP locked. */
+ * This routine is not state sensitive and need not be SMP locked. 
+ */
 static
 void ks_wlan_set_multicast_list(struct net_device *dev)
 {
-- 
2.11.0

[toc] | [prev] | [next] | [standalone]

#1631362 — Re: [PATCH v2] Staging: ks7010: style fix

On Wed, Apr 26, 2017 at 10:38:54AM +0200, Ilia Sergachev wrote:
> Fix the style of block comments.
> Move trailing */ to a separate line.
> Checkpatch was showing:
> WARNING: Block comments use a trailing */ on a separate line.

You are doing well Ilia. A few nitpicks

- Your first subject was better (excluding the filname) :) it was more
  descriptive.

- staging has a small 's'. You can verify with;
  $ git log --pretty=oneline drivers/staging/ks7010/ks_wlan_net.c 

- You may like to describe the problem first, then what the patch does
  to fix it;

Documentation/process/submitting-patches.rst

   Describe your problem.  Whether your patch is a one-line bug fix or
   5000 lines of a new feature, there must be an underlying problem that
   motivated you to do this work.  Convince the reviewer that there is a
   problem worth fixing and that it makes sense for them to read past the
   first paragraph.
   
   ...
   
   Once the problem is established, describe what you are actually doing
   about it in technical detail.  It's important to describe the change
   in plain English for the reviewer to verify that the code is behaving
   as you intend it to.

The actual patch looks good to me.

Hope this helps,
Tobin.

[toc] | [prev] | [next] | [standalone]

#1631376 — Re: [PATCH v2] Staging: ks7010: style fix

On Wed, Apr 26, 2017 at 08:37:56PM +1000, Tobin C. Harding wrote:
> On Wed, Apr 26, 2017 at 10:38:54AM +0200, Ilia Sergachev wrote:
> > Fix the style of block comments.
> > Move trailing */ to a separate line.
> > Checkpatch was showing:
> > WARNING: Block comments use a trailing */ on a separate line.
> 
> You are doing well Ilia. A few nitpicks
> 
> - Your first subject was better (excluding the filname) :) it was more
>   descriptive.

Yeah.   This subject is bad.

> 
> - staging has a small 's'. You can verify with;
>   $ git log --pretty=oneline drivers/staging/ks7010/ks_wlan_net.c 

Nah..  It can go either way.  No one cares.

regards,
dan carpenter

[toc] | [prev] | [next] | [standalone]

#1631403 — [PATCH v3] staging: ks7010: fix block comment style

Checkpatch was showing:
WARNING: Block comments use a trailing */ on a separate line.

Move trailing */ to a separate line.

Signed-off-by: Ilia Sergachev <ilia.sergachev@unibas.ch>
---
Changes for v3:
  - improve the commit message even more

Changes for v2:
  - improve the commit message

 drivers/staging/ks7010/ks_wlan_net.c | 43 ++++++++++++++++++++++--------------
 1 file changed, 27 insertions(+), 16 deletions(-)

diff --git a/drivers/staging/ks7010/ks_wlan_net.c b/drivers/staging/ks7010/ks_wlan_net.c
index 121e1530fdba..7f6bd4d53d84 100644
--- a/drivers/staging/ks7010/ks_wlan_net.c
+++ b/drivers/staging/ks7010/ks_wlan_net.c
@@ -230,7 +230,8 @@ static int ks_wlan_set_freq(struct net_device *dev,
 	else {
 		int channel = fwrq->m;
 		/* We should do a better check than that,
-		 * based on the card capability !!! */
+		 * based on the card capability !!!
+		 */
 		if ((channel < 1) || (channel > 14)) {
 			netdev_dbg(dev,
 				   "%s: New channel value of %d is invalid!\n",
@@ -343,7 +344,8 @@ static int ks_wlan_get_essid(struct net_device *dev,
 
 	/* for SLEEP MODE */
 	/* Note : if dwrq->flags != 0, we should
-	 * get the relevant SSID from the SSID list... */
+	 * get the relevant SSID from the SSID list...
+	 */
 	if (priv->reg.ssid.size) {
 		/* Get the current SSID */
 		memcpy(extra, priv->reg.ssid.body, priv->reg.ssid.size);
@@ -1137,7 +1139,8 @@ static int ks_wlan_get_range(struct net_device *dev,
 	range->max_nwid = 0x0000;
 	range->num_channels = 14;
 	/* Should be based on cap_rid.country to give only
-	 * what the current card support */
+	 * what the current card support
+	 */
 	k = 0;
 	for (i = 0; i < 13; i++) {	/* channel 1 -- 13 */
 		range->freq[k].i = i + 1;	/* List index */
@@ -1189,7 +1192,8 @@ static int ks_wlan_get_range(struct net_device *dev,
 
 	/* Set an indication of the max TCP throughput
 	 * in bit/s that we can expect using this interface.
-	 * May be use for QoS stuff... Jean II */
+	 * May be use for QoS stuff... Jean II
+	 */
 	if (i > 2)
 		range->throughput = 5000 * 1000;
 	else
@@ -1225,7 +1229,8 @@ static int ks_wlan_get_range(struct net_device *dev,
 
 	/* Experimental measurements - boundary 11/5.5 Mb/s */
 	/* Note : with or without the (local->rssi), results
-	 * are somewhat different. - Jean II */
+	 * are somewhat different. - Jean II
+	 */
 	range->avg_qual.qual = 50;
 	range->avg_qual.level = 186;	/* -70 dBm */
 	range->avg_qual.noise = 0;
@@ -1497,7 +1502,8 @@ static inline char *ks_wlan_translate_scan(struct net_device *dev,
 				 &(ap->ssid.body[0]));
 
 	/* Rate : stuffing multiple values in a single event require a bit
-	 * more of magic - Jean II */
+	 * more of magic - Jean II
+	 */
 	current_val = current_ev + IW_EV_LCP_LEN;
 
 	iwe.cmd = SIOCGIWRATE;
@@ -1569,7 +1575,8 @@ static inline char *ks_wlan_translate_scan(struct net_device *dev,
 	}
 
 	/* The other data in the scan result are not really
-	 * interesting, so for now drop it - Jean II */
+	 * interesting, so for now drop it - Jean II
+	 */
 	return current_ev;
 }
 
@@ -1596,7 +1603,8 @@ static int ks_wlan_get_scan(struct net_device *dev,
 
 	if (priv->aplist.size == 0) {
 		/* Client error, no scan results...
-		 * The caller need to restart the scan. */
+		 * The caller need to restart the scan.
+		 */
 		DPRINTK(2, "aplist 0\n");
 		return -ENODATA;
 	}
@@ -1970,12 +1978,13 @@ static int ks_wlan_get_encode_ext(struct net_device *dev,
 		return -EPERM;
 
 	/* for SLEEP MODE */
-	/*  WPA (not used ?? wpa_supplicant)
-	   struct ks_wlan_private *priv = (struct ks_wlan_private *)dev->priv;
-	   struct iw_encode_ext *enc;
-	   enc = (struct iw_encode_ext *)extra;
-	   int index = dwrq->flags & IW_ENCODE_INDEX;
-	   WPA (not used ?? wpa_supplicant) */
+	/* WPA (not used ?? wpa_supplicant)
+	 * struct ks_wlan_private *priv = (struct ks_wlan_private *)dev->priv;
+	 * struct iw_encode_ext *enc;
+	 * enc = (struct iw_encode_ext *)extra;
+	 * int index = dwrq->flags & IW_ENCODE_INDEX;
+	 * WPA (not used ?? wpa_supplicant)
+	 */
 	return 0;
 }
 
@@ -2105,7 +2114,8 @@ static struct iw_statistics *ks_get_wireless_stats(struct net_device *dev)
 	}
 
 	/* Packets discarded in the wireless adapter due to wireless
-	 * specific problems */
+	 * specific problems
+	 */
 	wstats->discard.nwid = 0;	/* Rx invalid nwid      */
 	wstats->discard.code = 0;	/* Rx invalid crypt     */
 	wstats->discard.fragment = 0;	/* Rx invalid frag      */
@@ -3351,7 +3361,8 @@ void send_packet_complete(void *arg1, void *arg2)
 }
 
 /* Set or clear the multicast filter for this adaptor.
-   This routine is not state sensitive and need not be SMP locked. */
+ * This routine is not state sensitive and need not be SMP locked. 
+ */
 static
 void ks_wlan_set_multicast_list(struct net_device *dev)
 {
-- 
2.11.0

[toc] | [prev] | [next] | [standalone]

#1631782 — Re: [PATCH v3] staging: ks7010: fix block comment style

On Wed, Apr 26, 2017 at 01:00:23PM +0200, Ilia Sergachev wrote:
> Checkpatch was showing:
> WARNING: Block comments use a trailing */ on a separate line.
> 
> Move trailing */ to a separate line.
> 
> Signed-off-by: Ilia Sergachev <ilia.sergachev@unibas.ch>

Reviewed-by: Tobin C. Harding <me@tobin.cc>

> ---
> Changes for v3:
>   - improve the commit message even more
> 
> Changes for v2:
>   - improve the commit message
> 
>  drivers/staging/ks7010/ks_wlan_net.c | 43 ++++++++++++++++++++++--------------
>  1 file changed, 27 insertions(+), 16 deletions(-)
> 
> diff --git a/drivers/staging/ks7010/ks_wlan_net.c b/drivers/staging/ks7010/ks_wlan_net.c
> index 121e1530fdba..7f6bd4d53d84 100644
> --- a/drivers/staging/ks7010/ks_wlan_net.c
> +++ b/drivers/staging/ks7010/ks_wlan_net.c
> @@ -230,7 +230,8 @@ static int ks_wlan_set_freq(struct net_device *dev,
>  	else {
>  		int channel = fwrq->m;
>  		/* We should do a better check than that,
> -		 * based on the card capability !!! */
> +		 * based on the card capability !!!
> +		 */
>  		if ((channel < 1) || (channel > 14)) {
>  			netdev_dbg(dev,
>  				   "%s: New channel value of %d is invalid!\n",
> @@ -343,7 +344,8 @@ static int ks_wlan_get_essid(struct net_device *dev,
>  
>  	/* for SLEEP MODE */
>  	/* Note : if dwrq->flags != 0, we should
> -	 * get the relevant SSID from the SSID list... */
> +	 * get the relevant SSID from the SSID list...
> +	 */
>  	if (priv->reg.ssid.size) {
>  		/* Get the current SSID */
>  		memcpy(extra, priv->reg.ssid.body, priv->reg.ssid.size);
> @@ -1137,7 +1139,8 @@ static int ks_wlan_get_range(struct net_device *dev,
>  	range->max_nwid = 0x0000;
>  	range->num_channels = 14;
>  	/* Should be based on cap_rid.country to give only
> -	 * what the current card support */
> +	 * what the current card support
> +	 */
>  	k = 0;
>  	for (i = 0; i < 13; i++) {	/* channel 1 -- 13 */
>  		range->freq[k].i = i + 1;	/* List index */
> @@ -1189,7 +1192,8 @@ static int ks_wlan_get_range(struct net_device *dev,
>  
>  	/* Set an indication of the max TCP throughput
>  	 * in bit/s that we can expect using this interface.
> -	 * May be use for QoS stuff... Jean II */
> +	 * May be use for QoS stuff... Jean II
> +	 */
>  	if (i > 2)
>  		range->throughput = 5000 * 1000;
>  	else
> @@ -1225,7 +1229,8 @@ static int ks_wlan_get_range(struct net_device *dev,
>  
>  	/* Experimental measurements - boundary 11/5.5 Mb/s */
>  	/* Note : with or without the (local->rssi), results
> -	 * are somewhat different. - Jean II */
> +	 * are somewhat different. - Jean II
> +	 */
>  	range->avg_qual.qual = 50;
>  	range->avg_qual.level = 186;	/* -70 dBm */
>  	range->avg_qual.noise = 0;
> @@ -1497,7 +1502,8 @@ static inline char *ks_wlan_translate_scan(struct net_device *dev,
>  				 &(ap->ssid.body[0]));
>  
>  	/* Rate : stuffing multiple values in a single event require a bit
> -	 * more of magic - Jean II */
> +	 * more of magic - Jean II
> +	 */
>  	current_val = current_ev + IW_EV_LCP_LEN;
>  
>  	iwe.cmd = SIOCGIWRATE;
> @@ -1569,7 +1575,8 @@ static inline char *ks_wlan_translate_scan(struct net_device *dev,
>  	}
>  
>  	/* The other data in the scan result are not really
> -	 * interesting, so for now drop it - Jean II */
> +	 * interesting, so for now drop it - Jean II
> +	 */
>  	return current_ev;
>  }
>  
> @@ -1596,7 +1603,8 @@ static int ks_wlan_get_scan(struct net_device *dev,
>  
>  	if (priv->aplist.size == 0) {
>  		/* Client error, no scan results...
> -		 * The caller need to restart the scan. */
> +		 * The caller need to restart the scan.
> +		 */
>  		DPRINTK(2, "aplist 0\n");
>  		return -ENODATA;
>  	}
> @@ -1970,12 +1978,13 @@ static int ks_wlan_get_encode_ext(struct net_device *dev,
>  		return -EPERM;
>  
>  	/* for SLEEP MODE */
> -	/*  WPA (not used ?? wpa_supplicant)
> -	   struct ks_wlan_private *priv = (struct ks_wlan_private *)dev->priv;
> -	   struct iw_encode_ext *enc;
> -	   enc = (struct iw_encode_ext *)extra;
> -	   int index = dwrq->flags & IW_ENCODE_INDEX;
> -	   WPA (not used ?? wpa_supplicant) */
> +	/* WPA (not used ?? wpa_supplicant)
> +	 * struct ks_wlan_private *priv = (struct ks_wlan_private *)dev->priv;
> +	 * struct iw_encode_ext *enc;
> +	 * enc = (struct iw_encode_ext *)extra;
> +	 * int index = dwrq->flags & IW_ENCODE_INDEX;
> +	 * WPA (not used ?? wpa_supplicant)
> +	 */
>  	return 0;
>  }
>  
> @@ -2105,7 +2114,8 @@ static struct iw_statistics *ks_get_wireless_stats(struct net_device *dev)
>  	}
>  
>  	/* Packets discarded in the wireless adapter due to wireless
> -	 * specific problems */
> +	 * specific problems
> +	 */
>  	wstats->discard.nwid = 0;	/* Rx invalid nwid      */
>  	wstats->discard.code = 0;	/* Rx invalid crypt     */
>  	wstats->discard.fragment = 0;	/* Rx invalid frag      */
> @@ -3351,7 +3361,8 @@ void send_packet_complete(void *arg1, void *arg2)
>  }
>  
>  /* Set or clear the multicast filter for this adaptor.
> -   This routine is not state sensitive and need not be SMP locked. */
> + * This routine is not state sensitive and need not be SMP locked. 
> + */
>  static
>  void ks_wlan_set_multicast_list(struct net_device *dev)
>  {
> -- 
> 2.11.0
> 
> _______________________________________________
> devel mailing list
> devel@linuxdriverproject.org
> http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

[toc] | [prev] | [next] | [standalone]

#1632749 — Re: [PATCH v3] staging: ks7010: fix block comment style

On Wed, Apr 26, 2017 at 01:00:23PM +0200, Ilia Sergachev wrote:
> Checkpatch was showing:
> WARNING: Block comments use a trailing */ on a separate line.
> 
> Move trailing */ to a separate line.
> 
> Signed-off-by: Ilia Sergachev <ilia.sergachev@unibas.ch>
> Reviewed-by: Tobin C. Harding <me@tobin.cc>

This patch does not apply to my tree at all :(

[toc] | [prev] | [next] | [standalone]

#1632791 — [PATCH v4] staging: ks7010: fix block comment style

Checkpatch was showing:
WARNING: Block comments use a trailing */ on a separate line.

Move trailing */ to a separate line.

Signed-off-by: Ilia Sergachev <ilia.sergachev@unibas.ch>
---
Changes for v4:
  - remove one trailing whitespace in the last hunk, 
    which was corrupting the patch

Changes for v3:
  - improve the commit message even more

Changes for v2:
  - improve the commit message


 drivers/staging/ks7010/ks_wlan_net.c | 43 ++++++++++++++++++++++--------------
 1 file changed, 27 insertions(+), 16 deletions(-)

diff --git a/drivers/staging/ks7010/ks_wlan_net.c b/drivers/staging/ks7010/ks_wlan_net.c
index 121e1530fdba..539b503daf71 100644
--- a/drivers/staging/ks7010/ks_wlan_net.c
+++ b/drivers/staging/ks7010/ks_wlan_net.c
@@ -230,7 +230,8 @@ static int ks_wlan_set_freq(struct net_device *dev,
 	else {
 		int channel = fwrq->m;
 		/* We should do a better check than that,
-		 * based on the card capability !!! */
+		 * based on the card capability !!!
+		 */
 		if ((channel < 1) || (channel > 14)) {
 			netdev_dbg(dev,
 				   "%s: New channel value of %d is invalid!\n",
@@ -343,7 +344,8 @@ static int ks_wlan_get_essid(struct net_device *dev,
 
 	/* for SLEEP MODE */
 	/* Note : if dwrq->flags != 0, we should
-	 * get the relevant SSID from the SSID list... */
+	 * get the relevant SSID from the SSID list...
+	 */
 	if (priv->reg.ssid.size) {
 		/* Get the current SSID */
 		memcpy(extra, priv->reg.ssid.body, priv->reg.ssid.size);
@@ -1137,7 +1139,8 @@ static int ks_wlan_get_range(struct net_device *dev,
 	range->max_nwid = 0x0000;
 	range->num_channels = 14;
 	/* Should be based on cap_rid.country to give only
-	 * what the current card support */
+	 * what the current card support
+	 */
 	k = 0;
 	for (i = 0; i < 13; i++) {	/* channel 1 -- 13 */
 		range->freq[k].i = i + 1;	/* List index */
@@ -1189,7 +1192,8 @@ static int ks_wlan_get_range(struct net_device *dev,
 
 	/* Set an indication of the max TCP throughput
 	 * in bit/s that we can expect using this interface.
-	 * May be use for QoS stuff... Jean II */
+	 * May be use for QoS stuff... Jean II
+	 */
 	if (i > 2)
 		range->throughput = 5000 * 1000;
 	else
@@ -1225,7 +1229,8 @@ static int ks_wlan_get_range(struct net_device *dev,
 
 	/* Experimental measurements - boundary 11/5.5 Mb/s */
 	/* Note : with or without the (local->rssi), results
-	 * are somewhat different. - Jean II */
+	 * are somewhat different. - Jean II
+	 */
 	range->avg_qual.qual = 50;
 	range->avg_qual.level = 186;	/* -70 dBm */
 	range->avg_qual.noise = 0;
@@ -1497,7 +1502,8 @@ static inline char *ks_wlan_translate_scan(struct net_device *dev,
 				 &(ap->ssid.body[0]));
 
 	/* Rate : stuffing multiple values in a single event require a bit
-	 * more of magic - Jean II */
+	 * more of magic - Jean II
+	 */
 	current_val = current_ev + IW_EV_LCP_LEN;
 
 	iwe.cmd = SIOCGIWRATE;
@@ -1569,7 +1575,8 @@ static inline char *ks_wlan_translate_scan(struct net_device *dev,
 	}
 
 	/* The other data in the scan result are not really
-	 * interesting, so for now drop it - Jean II */
+	 * interesting, so for now drop it - Jean II
+	 */
 	return current_ev;
 }
 
@@ -1596,7 +1603,8 @@ static int ks_wlan_get_scan(struct net_device *dev,
 
 	if (priv->aplist.size == 0) {
 		/* Client error, no scan results...
-		 * The caller need to restart the scan. */
+		 * The caller need to restart the scan.
+		 */
 		DPRINTK(2, "aplist 0\n");
 		return -ENODATA;
 	}
@@ -1970,12 +1978,13 @@ static int ks_wlan_get_encode_ext(struct net_device *dev,
 		return -EPERM;
 
 	/* for SLEEP MODE */
-	/*  WPA (not used ?? wpa_supplicant)
-	   struct ks_wlan_private *priv = (struct ks_wlan_private *)dev->priv;
-	   struct iw_encode_ext *enc;
-	   enc = (struct iw_encode_ext *)extra;
-	   int index = dwrq->flags & IW_ENCODE_INDEX;
-	   WPA (not used ?? wpa_supplicant) */
+	/* WPA (not used ?? wpa_supplicant)
+	 * struct ks_wlan_private *priv = (struct ks_wlan_private *)dev->priv;
+	 * struct iw_encode_ext *enc;
+	 * enc = (struct iw_encode_ext *)extra;
+	 * int index = dwrq->flags & IW_ENCODE_INDEX;
+	 * WPA (not used ?? wpa_supplicant)
+	 */
 	return 0;
 }
 
@@ -2105,7 +2114,8 @@ static struct iw_statistics *ks_get_wireless_stats(struct net_device *dev)
 	}
 
 	/* Packets discarded in the wireless adapter due to wireless
-	 * specific problems */
+	 * specific problems
+	 */
 	wstats->discard.nwid = 0;	/* Rx invalid nwid      */
 	wstats->discard.code = 0;	/* Rx invalid crypt     */
 	wstats->discard.fragment = 0;	/* Rx invalid frag      */
@@ -3351,7 +3361,8 @@ void send_packet_complete(void *arg1, void *arg2)
 }
 
 /* Set or clear the multicast filter for this adaptor.
-   This routine is not state sensitive and need not be SMP locked. */
+ * This routine is not state sensitive and need not be SMP locked.
+ */
 static
 void ks_wlan_set_multicast_list(struct net_device *dev)
 {
-- 
2.11.0

[toc] | [prev] | [next] | [standalone]

#1632831 — Re: [PATCH v4] staging: ks7010: fix block comment style

On Fri, Apr 28, 2017 at 12:35:55PM +0200, Ilia Sergachev wrote:
> Checkpatch was showing:
> WARNING: Block comments use a trailing */ on a separate line.
> 
> Move trailing */ to a separate line.
> 
> Signed-off-by: Ilia Sergachev <ilia.sergachev@unibas.ch>
> ---
> Changes for v4:
>   - remove one trailing whitespace in the last hunk, 
>     which was corrupting the patch

Nope, the whole thing still doesn't apply:

checking file drivers/staging/ks7010/ks_wlan_net.c
Hunk #1 FAILED at 230.
Hunk #2 FAILED at 343.
Hunk #3 FAILED at 1137.
Hunk #4 FAILED at 1189.
Hunk #5 FAILED at 1225.
Hunk #6 FAILED at 1497.
Hunk #7 FAILED at 1569.
Hunk #8 FAILED at 1596.
Hunk #9 FAILED at 1970.
Hunk #10 FAILED at 2105.
Hunk #11 FAILED at 3351.
11 out of 11 hunks FAILED

What tree/branch are you making this patch against?

thanks,

greg k-h

[toc] | [prev] | [next] | [standalone]

#1632861 — Re: [PATCH v4] staging: ks7010: fix block comment style

On Fri, 28 Apr 2017 14:20:21 +0200
Greg Kroah-Hartman <gregkh@linuxfoundation.org> wrote:

> 
> Nope, the whole thing still doesn't apply:
> 
> checking file drivers/staging/ks7010/ks_wlan_net.c
> Hunk #1 FAILED at 230.
> Hunk #2 FAILED at 343.
> Hunk #3 FAILED at 1137.
> Hunk #4 FAILED at 1189.
> Hunk #5 FAILED at 1225.
> Hunk #6 FAILED at 1497.
> Hunk #7 FAILED at 1569.
> Hunk #8 FAILED at 1596.
> Hunk #9 FAILED at 1970.
> Hunk #10 FAILED at 2105.
> Hunk #11 FAILED at 3351.
> 11 out of 11 hunks FAILED
> 
> What tree/branch are you making this patch against?
> 
> thanks,
> 
> greg k-h

Ok, I was using torvalds/linux instead of next/linux-next.
In fact, the style fixes on this file were already done in 'next'.
So, thank you all for your patience, and sorry about lost time,
these were the necessary lessons for me - I'll find now something else
to fix :) 

Ilia.

[toc] | [prev] | [next] | [standalone]

#1633407 — Re: [PATCH v4] staging: ks7010: fix block comment style

On Fri, Apr 28, 2017 at 03:01:32PM +0200, Ilia Sergachev wrote:
> On Fri, 28 Apr 2017 14:20:21 +0200
> Greg Kroah-Hartman <gregkh@linuxfoundation.org> wrote:
> 
> > 
> > Nope, the whole thing still doesn't apply:
> > 
> > checking file drivers/staging/ks7010/ks_wlan_net.c
> > Hunk #1 FAILED at 230.
> > Hunk #2 FAILED at 343.
> > Hunk #3 FAILED at 1137.
> > Hunk #4 FAILED at 1189.
> > Hunk #5 FAILED at 1225.
> > Hunk #6 FAILED at 1497.
> > Hunk #7 FAILED at 1569.
> > Hunk #8 FAILED at 1596.
> > Hunk #9 FAILED at 1970.
> > Hunk #10 FAILED at 2105.
> > Hunk #11 FAILED at 3351.
> > 11 out of 11 hunks FAILED
> > 
> > What tree/branch are you making this patch against?
> > 
> > thanks,
> > 
> > greg k-h
> 
> Ok, I was using torvalds/linux instead of next/linux-next.
> In fact, the style fixes on this file were already done in 'next'.
> So, thank you all for your patience, and sorry about lost time,
> these were the necessary lessons for me - I'll find now something else
> to fix :) 

If you are attempting fixes to staging drivers you may like to base
your patches off Greg's staging tree

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

The branch you want is either staging-next or staging-testing.

Hope this helps,
Tobin.

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web