All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] net: usb: hso: use swap macro in hso_kick_transmit
@ 2018-07-09 15:40 ` Gustavo A. R. Silva
  0 siblings, 0 replies; 6+ messages in thread
From: Gustavo A. R. Silva @ 2018-07-09 15:40 UTC (permalink / raw)
  To: David S. Miller; +Cc: linux-usb, netdev, linux-kernel, Gustavo A. R. Silva

Make use of the swap macro and remove unnecessary variable *temp*.
This makes the code easier to read and maintain. Also, slightly
refactor some code due to the removal of *temp*.

This code was detected with the help of Coccinelle.

Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
---
 drivers/net/usb/hso.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
index de305ea..78d128e 100644
--- a/drivers/net/usb/hso.c
+++ b/drivers/net/usb/hso.c
@@ -1732,7 +1732,6 @@ static int hso_serial_ioctl(struct tty_struct *tty,
 /* starts a transmit */
 static void hso_kick_transmit(struct hso_serial *serial)
 {
-	u8 *temp;
 	unsigned long flags;
 	int res;
 
@@ -1748,14 +1747,11 @@ static void hso_kick_transmit(struct hso_serial *serial)
 		goto out;
 
 	/* Switch pointers around to avoid memcpy */
-	temp = serial->tx_buffer;
-	serial->tx_buffer = serial->tx_data;
-	serial->tx_data = temp;
+	swap(serial->tx_buffer, serial->tx_data);
 	serial->tx_data_count = serial->tx_buffer_count;
 	serial->tx_buffer_count = 0;
 
-	/* If temp is set, it means we switched buffers */
-	if (temp && serial->write_data) {
+	if (serial->write_data) {
 		res = serial->write_data(serial);
 		if (res >= 0)
 			serial->tx_urb_used = 1;
-- 
2.7.4


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* net: usb: hso: use swap macro in hso_kick_transmit
@ 2018-07-09 15:40 ` Gustavo A. R. Silva
  0 siblings, 0 replies; 6+ messages in thread
From: Gustavo A. R. Silva @ 2018-07-09 15:40 UTC (permalink / raw)
  To: David S. Miller; +Cc: linux-usb, netdev, linux-kernel, Gustavo A. R. Silva

Make use of the swap macro and remove unnecessary variable *temp*.
This makes the code easier to read and maintain. Also, slightly
refactor some code due to the removal of *temp*.

This code was detected with the help of Coccinelle.

Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
---
 drivers/net/usb/hso.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
index de305ea..78d128e 100644
--- a/drivers/net/usb/hso.c
+++ b/drivers/net/usb/hso.c
@@ -1732,7 +1732,6 @@ static int hso_serial_ioctl(struct tty_struct *tty,
 /* starts a transmit */
 static void hso_kick_transmit(struct hso_serial *serial)
 {
-	u8 *temp;
 	unsigned long flags;
 	int res;
 
@@ -1748,14 +1747,11 @@ static void hso_kick_transmit(struct hso_serial *serial)
 		goto out;
 
 	/* Switch pointers around to avoid memcpy */
-	temp = serial->tx_buffer;
-	serial->tx_buffer = serial->tx_data;
-	serial->tx_data = temp;
+	swap(serial->tx_buffer, serial->tx_data);
 	serial->tx_data_count = serial->tx_buffer_count;
 	serial->tx_buffer_count = 0;
 
-	/* If temp is set, it means we switched buffers */
-	if (temp && serial->write_data) {
+	if (serial->write_data) {
 		res = serial->write_data(serial);
 		if (res >= 0)
 			serial->tx_urb_used = 1;

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [PATCH] net: usb: hso: use swap macro in hso_kick_transmit
@ 2018-07-12  5:58   ` David Miller
  0 siblings, 0 replies; 6+ messages in thread
From: David Miller @ 2018-07-12  5:58 UTC (permalink / raw)
  To: gustavo; +Cc: linux-usb, netdev, linux-kernel

From: "Gustavo A. R. Silva" <gustavo@embeddedor.com>
Date: Mon, 9 Jul 2018 10:40:48 -0500

> @@ -1748,14 +1747,11 @@ static void hso_kick_transmit(struct hso_serial *serial)
>  		goto out;
>  
>  	/* Switch pointers around to avoid memcpy */
> -	temp = serial->tx_buffer;
> -	serial->tx_buffer = serial->tx_data;
> -	serial->tx_data = temp;
> +	swap(serial->tx_buffer, serial->tx_data);
>  	serial->tx_data_count = serial->tx_buffer_count;
>  	serial->tx_buffer_count = 0;
>  
> -	/* If temp is set, it means we switched buffers */
> -	if (temp && serial->write_data) {
> +	if (serial->write_data) {

I think temp can be NULL here, you have to retain this check.

^ permalink raw reply	[flat|nested] 6+ messages in thread

* net: usb: hso: use swap macro in hso_kick_transmit
@ 2018-07-12  5:58   ` David Miller
  0 siblings, 0 replies; 6+ messages in thread
From: David Miller @ 2018-07-12  5:58 UTC (permalink / raw)
  To: gustavo; +Cc: linux-usb, netdev, linux-kernel

From: "Gustavo A. R. Silva" <gustavo@embeddedor.com>
Date: Mon, 9 Jul 2018 10:40:48 -0500

> @@ -1748,14 +1747,11 @@ static void hso_kick_transmit(struct hso_serial *serial)
>  		goto out;
>  
>  	/* Switch pointers around to avoid memcpy */
> -	temp = serial->tx_buffer;
> -	serial->tx_buffer = serial->tx_data;
> -	serial->tx_data = temp;
> +	swap(serial->tx_buffer, serial->tx_data);
>  	serial->tx_data_count = serial->tx_buffer_count;
>  	serial->tx_buffer_count = 0;
>  
> -	/* If temp is set, it means we switched buffers */
> -	if (temp && serial->write_data) {
> +	if (serial->write_data) {

I think temp can be NULL here, you have to retain this check.
---
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] net: usb: hso: use swap macro in hso_kick_transmit
@ 2018-07-12 19:27     ` Gustavo A. R. Silva
  0 siblings, 0 replies; 6+ messages in thread
From: Gustavo A. R. Silva @ 2018-07-12 19:27 UTC (permalink / raw)
  To: David Miller; +Cc: linux-usb, netdev, linux-kernel

Hi David,

On 07/12/2018 12:58 AM, David Miller wrote:
> From: "Gustavo A. R. Silva" <gustavo@embeddedor.com>
> Date: Mon, 9 Jul 2018 10:40:48 -0500
> 
>> @@ -1748,14 +1747,11 @@ static void hso_kick_transmit(struct hso_serial *serial)
>>  		goto out;
>>  
>>  	/* Switch pointers around to avoid memcpy */
>> -	temp = serial->tx_buffer;
>> -	serial->tx_buffer = serial->tx_data;
>> -	serial->tx_data = temp;
>> +	swap(serial->tx_buffer, serial->tx_data);
>>  	serial->tx_data_count = serial->tx_buffer_count;
>>  	serial->tx_buffer_count = 0;
>>  
>> -	/* If temp is set, it means we switched buffers */
>> -	if (temp && serial->write_data) {
>> +	if (serial->write_data) {
> 
> I think temp can be NULL here, you have to retain this check.
> 

I see. Well, in that case I will check serial->tx_data instead.

Thanks for the feedback.
--
Gustavo

^ permalink raw reply	[flat|nested] 6+ messages in thread

* net: usb: hso: use swap macro in hso_kick_transmit
@ 2018-07-12 19:27     ` Gustavo A. R. Silva
  0 siblings, 0 replies; 6+ messages in thread
From: Gustavo A. R. Silva @ 2018-07-12 19:27 UTC (permalink / raw)
  To: David Miller; +Cc: linux-usb, netdev, linux-kernel

Hi David,

On 07/12/2018 12:58 AM, David Miller wrote:
> From: "Gustavo A. R. Silva" <gustavo@embeddedor.com>
> Date: Mon, 9 Jul 2018 10:40:48 -0500
> 
>> @@ -1748,14 +1747,11 @@ static void hso_kick_transmit(struct hso_serial *serial)
>>  		goto out;
>>  
>>  	/* Switch pointers around to avoid memcpy */
>> -	temp = serial->tx_buffer;
>> -	serial->tx_buffer = serial->tx_data;
>> -	serial->tx_data = temp;
>> +	swap(serial->tx_buffer, serial->tx_data);
>>  	serial->tx_data_count = serial->tx_buffer_count;
>>  	serial->tx_buffer_count = 0;
>>  
>> -	/* If temp is set, it means we switched buffers */
>> -	if (temp && serial->write_data) {
>> +	if (serial->write_data) {
> 
> I think temp can be NULL here, you have to retain this check.
> 

I see. Well, in that case I will check serial->tx_data instead.

Thanks for the feedback.
---
Gustavo
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2018-07-12 19:27 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-07-09 15:40 [PATCH] net: usb: hso: use swap macro in hso_kick_transmit Gustavo A. R. Silva
2018-07-09 15:40 ` Gustavo A. R. Silva
2018-07-12  5:58 ` [PATCH] " David Miller
2018-07-12  5:58   ` David Miller
2018-07-12 19:27   ` [PATCH] " Gustavo A. R. Silva
2018-07-12 19:27     ` Gustavo A. R. Silva

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.