[PATCH] Staging: wimax: i2400m: fixing several coding style issues.

[PATCH] Staging: wimax: i2400m: fixing several coding style issues.

[dev.dragon]

From: Dmitrii Wolf <dev.dragon@bk.ru>

Fixed a coding style issues.

Signed-off-by: Dmitrii Wolf <dev.dragon@bk.ru>
---
 drivers/staging/wimax/i2400m/debugfs.c |  2 +-
 drivers/staging/wimax/i2400m/netdev.c  |  2 +-
 drivers/staging/wimax/i2400m/rx.c      | 23 +++++++++++------------
 drivers/staging/wimax/i2400m/usb.c     |  2 +-
 4 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/drivers/staging/wimax/i2400m/debugfs.c b/drivers/staging/wimax/i2400m/debugfs.c
index 1c640b41ea4c..4e6e1e3f015e 100644
--- a/drivers/staging/wimax/i2400m/debugfs.c
+++ b/drivers/staging/wimax/i2400m/debugfs.c
@@ -170,7 +170,7 @@ int debugfs_i2400m_reset_set(void *data, u64 val)
 	int result;
 	struct i2400m *i2400m = data;
 	enum i2400m_reset_type rt = val;
-	switch(rt) {
+	switch (rt) {
 	case I2400M_RT_WARM:
 	case I2400M_RT_COLD:
 	case I2400M_RT_BUS:
diff --git a/drivers/staging/wimax/i2400m/netdev.c b/drivers/staging/wimax/i2400m/netdev.c
index 8339d600e77b..0895a2e441d3 100644
--- a/drivers/staging/wimax/i2400m/netdev.c
+++ b/drivers/staging/wimax/i2400m/netdev.c
@@ -523,7 +523,7 @@ void i2400m_net_erx(struct i2400m *i2400m, struct sk_buff *skb,
 
 	d_fnstart(2, dev, "(i2400m %p skb %p [%u] cs %d)\n",
 		  i2400m, skb, skb->len, cs);
-	switch(cs) {
+	switch (cs) {
 	case I2400M_CS_IPV4_0:
 	case I2400M_CS_IPV4:
 		i2400m_rx_fake_eth_header(i2400m->wimax_dev.net_dev,
diff --git a/drivers/staging/wimax/i2400m/rx.c b/drivers/staging/wimax/i2400m/rx.c
index c9fb619a9e01..807bd3db69e9 100644
--- a/drivers/staging/wimax/i2400m/rx.c
+++ b/drivers/staging/wimax/i2400m/rx.c
@@ -485,8 +485,7 @@ struct i2400m_roq_data {
  * store the sequence number (sn) and the cs (packet type) coming from
  * the RX payload header from the device.
  */
-struct i2400m_roq
-{
+struct i2400m_roq {
 	unsigned ws;
 	struct sk_buff_head queue;
 	struct i2400m_roq_log *log;
@@ -556,7 +555,7 @@ void i2400m_roq_log_entry_print(struct i2400m *i2400m, unsigned index,
 {
 	struct device *dev = i2400m_dev(i2400m);
 
-	switch(e->type) {
+	switch (e->type) {
 	case I2400M_RO_TYPE_RESET:
 		dev_err(dev, "q#%d reset           ws %u cnt %u sn %u/%u"
 			" - new nws %u\n",
@@ -764,9 +763,9 @@ unsigned __i2400m_roq_update_ws(struct i2400m *i2400m, struct i2400m_roq *roq,
 				 new_nws);
 			__skb_unlink(skb_itr, &roq->queue);
 			i2400m_net_erx(i2400m, skb_itr, roq_data_itr->cs);
-		}
-		else
+		} else {
 			break;	/* rest of packets all nsn_itr > nws */
+		}
 	}
 	roq->ws = sn;
 	return new_nws;
@@ -819,7 +818,7 @@ void i2400m_roq_reset(struct i2400m *i2400m, struct i2400m_roq *roq)
  */
 static
 void i2400m_roq_queue(struct i2400m *i2400m, struct i2400m_roq *roq,
-		      struct sk_buff * skb, unsigned lbn)
+		struct sk_buff *skb, unsigned lbn)
 {
 	struct device *dev = i2400m_dev(i2400m);
 	unsigned nsn, len;
@@ -882,7 +881,7 @@ void i2400m_roq_update_ws(struct i2400m *i2400m, struct i2400m_roq *roq,
  */
 static
 void i2400m_roq_queue_update_ws(struct i2400m *i2400m, struct i2400m_roq *roq,
-				struct sk_buff * skb, unsigned sn)
+		struct sk_buff *skb, unsigned sn)
 {
 	struct device *dev = i2400m_dev(i2400m);
 	unsigned nsn, old_ws, len;
@@ -1046,7 +1045,7 @@ void i2400m_rx_edata(struct i2400m *i2400m, struct sk_buff *skb_rx,
 			 ro_type, ro_cin, roq->ws, ro_sn,
 			 __i2400m_roq_nsn(roq, ro_sn), size);
 		d_dump(2, dev, payload, size);
-		switch(ro_type) {
+		switch (ro_type) {
 		case I2400M_RO_TYPE_RESET:
 			i2400m_roq_reset(i2400m, roq);
 			kfree_skb(skb);	/* no data here */
@@ -1068,9 +1067,9 @@ void i2400m_rx_edata(struct i2400m *i2400m, struct sk_buff *skb_rx,
 		spin_lock_irqsave(&i2400m->rx_lock, flags);
 		kref_put(&i2400m->rx_roq_refcount, i2400m_rx_roq_destroy);
 		spin_unlock_irqrestore(&i2400m->rx_lock, flags);
-	}
-	else
+	} else {
 		i2400m_net_erx(i2400m, skb, cs);
+	}
 error_skb_clone:
 error:
 	d_fnend(2, dev, "(i2400m %p skb_rx %p single %u payload %p "
@@ -1346,7 +1345,7 @@ int i2400m_rx_setup(struct i2400m *i2400m)
 {
 	int result = 0;
 
-	i2400m->rx_reorder = i2400m_rx_reorder_disabled? 0 : 1;
+	i2400m->rx_reorder = i2400m_rx_reorder_disabled ? 0 : 1;
 	if (i2400m->rx_reorder) {
 		unsigned itr;
 		struct i2400m_roq_log *rd;
@@ -1365,7 +1364,7 @@ int i2400m_rx_setup(struct i2400m *i2400m)
 			goto error_roq_log_alloc;
 		}
 
-		for(itr = 0; itr < I2400M_RO_CIN + 1; itr++) {
+		for (itr = 0; itr < I2400M_RO_CIN + 1; itr++) {
 			__i2400m_roq_init(&i2400m->rx_roq[itr]);
 			i2400m->rx_roq[itr].log = &rd[itr];
 		}
diff --git a/drivers/staging/wimax/i2400m/usb.c b/drivers/staging/wimax/i2400m/usb.c
index f250d03ce7c7..3bb8c32414c2 100644
--- a/drivers/staging/wimax/i2400m/usb.c
+++ b/drivers/staging/wimax/i2400m/usb.c
@@ -327,7 +327,7 @@ int i2400mu_bus_reset(struct i2400m *i2400m, enum i2400m_reset_type rt)
 }
 
 static void i2400mu_get_drvinfo(struct net_device *net_dev,
-                                struct ethtool_drvinfo *info)
+		struct ethtool_drvinfo *info)
 {
 	struct i2400m *i2400m = net_dev_to_i2400m(net_dev);
 	struct i2400mu *i2400mu = container_of(i2400m, struct i2400mu, i2400m);
-- 
2.25.1

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

Re: [PATCH] Staging: wimax: i2400m: fixing several coding style issues.

[Joe Perches]

On Sun, 2021-01-31 at 23:42 +0300, dev.dragon@bk.ru wrote:

> diff --git a/drivers/staging/wimax/i2400m/rx.c b/drivers/staging/wimax/i2400m/rx.c
[]
> @@ -764,9 +763,9 @@ unsigned __i2400m_roq_update_ws(struct i2400m *i2400m, struct i2400m_roq *roq,
>  				 new_nws);
>  			__skb_unlink(skb_itr, &roq->queue);
>  			i2400m_net_erx(i2400m, skb_itr, roq_data_itr->cs);
> -		}
> -		else
> +		} else {
>  			break;	/* rest of packets all nsn_itr > nws */
> +		}
>  	}

Rather than merely fixing what checkpatch complains about, it'd be
better to reverse the test above and break directly then unindent
the expected block.
---
 drivers/staging/wimax/i2400m/rx.c | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/drivers/staging/wimax/i2400m/rx.c b/drivers/staging/wimax/i2400m/rx.c
index c9fb619a9e01..caeba9694b4e 100644
--- a/drivers/staging/wimax/i2400m/rx.c
+++ b/drivers/staging/wimax/i2400m/rx.c
@@ -757,16 +757,12 @@ unsigned __i2400m_roq_update_ws(struct i2400m *i2400m, struct i2400m_roq *roq,
 		roq_data_itr = (struct i2400m_roq_data *) &skb_itr->cb;
 		nsn_itr = __i2400m_roq_nsn(roq, roq_data_itr->sn);
 		/* NSN bounds assumed correct (checked when it was queued) */
-		if (nsn_itr < new_nws) {
-			d_printf(2, dev, "ERX: roq %p - release skb %p "
-				 "(nsn %u/%u new nws %u)\n",
-				 roq, skb_itr, nsn_itr, roq_data_itr->sn,
-				 new_nws);
-			__skb_unlink(skb_itr, &roq->queue);
-			i2400m_net_erx(i2400m, skb_itr, roq_data_itr->cs);
-		}
-		else
-			break;	/* rest of packets all nsn_itr > nws */
+		if (nsn_itr >= new_nws)
+			break;
+		d_printf(2, dev, "ERX: roq %p - release skb %p (nsn %u/%u new nws %u)\n",
+			 roq, skb_itr, nsn_itr, roq_data_itr->sn, new_nws);
+		__skb_unlink(skb_itr, &roq->queue);
+		i2400m_net_erx(i2400m, skb_itr, roq_data_itr->cs);
 	}
 	roq->ws = sn;
 	return new_nws;

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

[96e8740] [PATCH 2/2] Staging: wimax: i2400m: some readability improvements.

[dev.dragon]

From: Dmitrii Wolf <dev.dragon@bk.ru>

 Hello, developers!
 Sorry for the late answer. As you know - i am a newbie and it is my first kernel patch.
 After reading kernelnewbies.or, ./Documentation/process/ files and viewing FOSDEM's videpo
 "Write and Submit your first Linux kernel Patch", i took a decision to send you some
 changes. I understand that it is annoying to get this "style fixing" patches. So, the
 Joe Perches's idea to improve code readability was implemented in second patch. Also,
 some new readability improvements added to it.
 Thanks in advance!

Signed-off-by: Dmitrii Wolf <dev.dragon@bk.ru>
---
 drivers/staging/wimax/i2400m/netdev.c |  8 ++++----
 drivers/staging/wimax/i2400m/rx.c     | 25 +++++++++++++------------
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/drivers/staging/wimax/i2400m/netdev.c b/drivers/staging/wimax/i2400m/netdev.c
index 0895a2e441d3..5f79ccc87656 100644
--- a/drivers/staging/wimax/i2400m/netdev.c
+++ b/drivers/staging/wimax/i2400m/netdev.c
@@ -366,13 +366,13 @@ netdev_tx_t i2400m_hard_start_xmit(struct sk_buff *skb,
 		result = i2400m_net_wake_tx(i2400m, net_dev, skb);
 	else
 		result = i2400m_net_tx(i2400m, net_dev, skb);
-	if (result <  0) {
-drop:
-		net_dev->stats.tx_dropped++;
-	} else {
+	if (result >= 0) {
 		net_dev->stats.tx_packets++;
 		net_dev->stats.tx_bytes += skb->len;
 	}
+drop:
+	net_dev->stats.tx_dropped++;
+
 	dev_kfree_skb(skb);
 	d_fnend(3, dev, "(skb %p net_dev %p) = %d\n", skb, net_dev, result);
 	return NETDEV_TX_OK;
diff --git a/drivers/staging/wimax/i2400m/rx.c b/drivers/staging/wimax/i2400m/rx.c
index 807bd3db69e9..fdc5da409683 100644
--- a/drivers/staging/wimax/i2400m/rx.c
+++ b/drivers/staging/wimax/i2400m/rx.c
@@ -194,8 +194,8 @@ void i2400m_report_hook_work(struct work_struct *ws)
 		spin_unlock_irqrestore(&i2400m->rx_lock, flags);
 		if (list_empty(&list))
 			break;
-		else
-			d_printf(1, dev, "processing queued reports\n");
+
+		d_printf(1, dev, "processing queued reports\n");
 		list_for_each_entry_safe(args, args_next, &list, list_node) {
 			d_printf(2, dev, "processing queued report %p\n", args);
 			i2400m_report_hook(i2400m, args->l3l4_hdr, args->size);
@@ -756,16 +756,15 @@ unsigned __i2400m_roq_update_ws(struct i2400m *i2400m, struct i2400m_roq *roq,
 		roq_data_itr = (struct i2400m_roq_data *) &skb_itr->cb;
 		nsn_itr = __i2400m_roq_nsn(roq, roq_data_itr->sn);
 		/* NSN bounds assumed correct (checked when it was queued) */
-		if (nsn_itr < new_nws) {
-			d_printf(2, dev, "ERX: roq %p - release skb %p "
-				 "(nsn %u/%u new nws %u)\n",
-				 roq, skb_itr, nsn_itr, roq_data_itr->sn,
-				 new_nws);
-			__skb_unlink(skb_itr, &roq->queue);
-			i2400m_net_erx(i2400m, skb_itr, roq_data_itr->cs);
-		} else {
+		if (nsn_itr >= new_nws) {
 			break;	/* rest of packets all nsn_itr > nws */
 		}
+		d_printf(2, dev, "ERX: roq %p - release skb %p "
+			 "(nsn %u/%u new nws %u)\n",
+			 roq, skb_itr, nsn_itr, roq_data_itr->sn,
+			 new_nws);
+		__skb_unlink(skb_itr, &roq->queue);
+		i2400m_net_erx(i2400m, skb_itr, roq_data_itr->cs);
 	}
 	roq->ws = sn;
 	return new_nws;
@@ -904,8 +903,9 @@ void i2400m_roq_queue_update_ws(struct i2400m *i2400m, struct i2400m_roq *roq,
 		struct i2400m_roq_data *roq_data;
 		roq_data = (struct i2400m_roq_data *) &skb->cb;
 		i2400m_net_erx(i2400m, skb, roq_data->cs);
-	} else
+	} else {
 		__i2400m_roq_queue(i2400m, roq, skb, sn, nsn);
+	}
 
 	__i2400m_roq_update_ws(i2400m, roq, sn + 1);
 	i2400m_roq_log_add(i2400m, roq, I2400M_RO_TYPE_PACKET_WS,
@@ -1321,9 +1321,10 @@ void i2400m_unknown_barker(struct i2400m *i2400m,
 			       8, 4, buf, 64, 0);
 		printk(KERN_ERR "%s... (only first 64 bytes "
 		       "dumped)\n", prefix);
-	} else
+	} else {
 		print_hex_dump(KERN_ERR, prefix, DUMP_PREFIX_OFFSET,
 			       8, 4, buf, size, 0);
+	}
 }
 EXPORT_SYMBOL(i2400m_unknown_barker);
 
-- 
2.25.1

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

Re: [96e8740] [PATCH 2/2] Staging: wimax: i2400m: some readability improvements.

[Greg KH]

On Sun, Feb 07, 2021 at 10:11:24PM +0300, dev.dragon@bk.ru wrote:
> From: Dmitrii Wolf <dev.dragon@bk.ru>
> 
>  Hello, developers!
>  Sorry for the late answer. As you know - i am a newbie and it is my first kernel patch.
>  After reading kernelnewbies.or, ./Documentation/process/ files and viewing FOSDEM's videpo
>  "Write and Submit your first Linux kernel Patch", i took a decision to send you some
>  changes. I understand that it is annoying to get this "style fixing" patches. So, the
>  Joe Perches's idea to improve code readability was implemented in second patch. Also,
>  some new readability improvements added to it.
>  Thanks in advance!
> 
> Signed-off-by: Dmitrii Wolf <dev.dragon@bk.ru>
> ---
>  drivers/staging/wimax/i2400m/netdev.c |  8 ++++----
>  drivers/staging/wimax/i2400m/rx.c     | 25 +++++++++++++------------
>  2 files changed, 17 insertions(+), 16 deletions(-)
> 
> diff --git a/drivers/staging/wimax/i2400m/netdev.c b/drivers/staging/wimax/i2400m/netdev.c
> index 0895a2e441d3..5f79ccc87656 100644
> --- a/drivers/staging/wimax/i2400m/netdev.c
> +++ b/drivers/staging/wimax/i2400m/netdev.c
> @@ -366,13 +366,13 @@ netdev_tx_t i2400m_hard_start_xmit(struct sk_buff *skb,
>  		result = i2400m_net_wake_tx(i2400m, net_dev, skb);
>  	else
>  		result = i2400m_net_tx(i2400m, net_dev, skb);
> -	if (result <  0) {
> -drop:
> -		net_dev->stats.tx_dropped++;
> -	} else {
> +	if (result >= 0) {
>  		net_dev->stats.tx_packets++;
>  		net_dev->stats.tx_bytes += skb->len;
>  	}
> +drop:
> +	net_dev->stats.tx_dropped++;
> +
>  	dev_kfree_skb(skb);
>  	d_fnend(3, dev, "(skb %p net_dev %p) = %d\n", skb, net_dev, result);
>  	return NETDEV_TX_OK;
> diff --git a/drivers/staging/wimax/i2400m/rx.c b/drivers/staging/wimax/i2400m/rx.c
> index 807bd3db69e9..fdc5da409683 100644
> --- a/drivers/staging/wimax/i2400m/rx.c
> +++ b/drivers/staging/wimax/i2400m/rx.c
> @@ -194,8 +194,8 @@ void i2400m_report_hook_work(struct work_struct *ws)
>  		spin_unlock_irqrestore(&i2400m->rx_lock, flags);
>  		if (list_empty(&list))
>  			break;
> -		else
> -			d_printf(1, dev, "processing queued reports\n");
> +
> +		d_printf(1, dev, "processing queued reports\n");
>  		list_for_each_entry_safe(args, args_next, &list, list_node) {
>  			d_printf(2, dev, "processing queued report %p\n", args);
>  			i2400m_report_hook(i2400m, args->l3l4_hdr, args->size);
> @@ -756,16 +756,15 @@ unsigned __i2400m_roq_update_ws(struct i2400m *i2400m, struct i2400m_roq *roq,
>  		roq_data_itr = (struct i2400m_roq_data *) &skb_itr->cb;
>  		nsn_itr = __i2400m_roq_nsn(roq, roq_data_itr->sn);
>  		/* NSN bounds assumed correct (checked when it was queued) */
> -		if (nsn_itr < new_nws) {
> -			d_printf(2, dev, "ERX: roq %p - release skb %p "
> -				 "(nsn %u/%u new nws %u)\n",
> -				 roq, skb_itr, nsn_itr, roq_data_itr->sn,
> -				 new_nws);
> -			__skb_unlink(skb_itr, &roq->queue);
> -			i2400m_net_erx(i2400m, skb_itr, roq_data_itr->cs);
> -		} else {
> +		if (nsn_itr >= new_nws) {
>  			break;	/* rest of packets all nsn_itr > nws */
>  		}
> +		d_printf(2, dev, "ERX: roq %p - release skb %p "
> +			 "(nsn %u/%u new nws %u)\n",
> +			 roq, skb_itr, nsn_itr, roq_data_itr->sn,
> +			 new_nws);
> +		__skb_unlink(skb_itr, &roq->queue);
> +		i2400m_net_erx(i2400m, skb_itr, roq_data_itr->cs);
>  	}
>  	roq->ws = sn;
>  	return new_nws;
> @@ -904,8 +903,9 @@ void i2400m_roq_queue_update_ws(struct i2400m *i2400m, struct i2400m_roq *roq,
>  		struct i2400m_roq_data *roq_data;
>  		roq_data = (struct i2400m_roq_data *) &skb->cb;
>  		i2400m_net_erx(i2400m, skb, roq_data->cs);
> -	} else
> +	} else {
>  		__i2400m_roq_queue(i2400m, roq, skb, sn, nsn);
> +	}
>  
>  	__i2400m_roq_update_ws(i2400m, roq, sn + 1);
>  	i2400m_roq_log_add(i2400m, roq, I2400M_RO_TYPE_PACKET_WS,
> @@ -1321,9 +1321,10 @@ void i2400m_unknown_barker(struct i2400m *i2400m,
>  			       8, 4, buf, 64, 0);
>  		printk(KERN_ERR "%s... (only first 64 bytes "
>  		       "dumped)\n", prefix);
> -	} else
> +	} else {
>  		print_hex_dump(KERN_ERR, prefix, DUMP_PREFIX_OFFSET,
>  			       8, 4, buf, size, 0);
> +	}
>  }
>  EXPORT_SYMBOL(i2400m_unknown_barker);
>  
> -- 
> 2.25.1
> 

Hi,

This is the friendly patch-bot of Greg Kroah-Hartman.  You have sent him
a patch that has triggered this response.  He used to manually respond
to these common problems, but in order to save his sanity (he kept
writing the same thing over and over, yet to different people), I was
created.  Hopefully you will not take offence and will fix the problem
in your patch and resubmit it so that it can be accepted into the Linux
kernel tree.

You are receiving this message because of the following common error(s)
as indicated below:

- Your patch did many different things all at once, making it difficult
  to review.  All Linux kernel patches need to only do one thing at a
  time.  If you need to do multiple things (such as clean up all coding
  style issues in a file/driver), do it in a sequence of patches, each
  one doing only one thing.  This will make it easier to review the
  patches to ensure that they are correct, and to help alleviate any
  merge issues that larger patches can cause.

- You did not specify a description of why the patch is needed, or
  possibly, any description at all, in the email body.  Please read the
  section entitled "The canonical patch format" in the kernel file,
  Documentation/SubmittingPatches for what is needed in order to
  properly describe the change.

- You did not write a descriptive Subject: for the patch, allowing Greg,
  and everyone else, to know what this patch is all about.  Please read
  the section entitled "The canonical patch format" in the kernel file,
  Documentation/SubmittingPatches for what a proper Subject: line should
  look like.

If you wish to discuss this problem further, or you have questions about
how to resolve this issue, please feel free to respond to this email and
Greg will reply once he has dug out from the pending patches received
from other developers.

thanks,

greg k-h's patch email bot
_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel