Skip to contentSkip to conversation

usb: serial: remove redundant conditions

PATCH In review Geyslan G. Bem 3 participants 7 messages Dec 11, 2015

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 usb: serial: remove redundant conditions

This patch removes redundant conditions.

(!A || (A && B)) is the same as (!A || B).

Tested by compilation only.
Caught by cppcheck.

---
 drivers/usb/serial/io_edgeport.c | 35 ++++++++++++++---------------------
 1 file changed, 14 insertions(+), 21 deletions(-)
drivers/usb/serial/io_edgeport.c +14 -21
index c086697..f49327d 100644
@@ -1046,9 +1046,8 @@ static void edge_close(struct usb_serial_port *port)
 
 	edge_port->closePending = true;
 
-	if ((!edge_serial->is_epic) ||
-	    ((edge_serial->is_epic) &&
-	     (edge_serial->epic_descriptor.Supports.IOSPChase))) {
+	if (!edge_serial->is_epic ||
+	    edge_serial->epic_descriptor.Supports.IOSPChase) {
 		/* flush and chase */
 		edge_port->chaseResponsePending = true;
 
@@ -1061,9 +1060,8 @@ static void edge_close(struct usb_serial_port *port)
 			edge_port->chaseResponsePending = false;
 	}
 
-	if ((!edge_serial->is_epic) ||
-	    ((edge_serial->is_epic) &&
-	     (edge_serial->epic_descriptor.Supports.IOSPClose))) {
+	if (!edge_serial->is_epic ||
+	    edge_serial->epic_descriptor.Supports.IOSPClose) {
 	       /* close the port */
 		dev_dbg(&port->dev, "%s - Sending IOSP_CMD_CLOSE_PORT\n", __func__);
 		send_iosp_ext_cmd(edge_port, IOSP_CMD_CLOSE_PORT, 0);
@@ -1612,9 +1610,8 @@ static void edge_break(struct tty_struct *tty, int break_state)
 	struct edgeport_serial *edge_serial = usb_get_serial_data(port->serial);
 	int status;
 
-	if ((!edge_serial->is_epic) ||
-	    ((edge_serial->is_epic) &&
-	     (edge_serial->epic_descriptor.Supports.IOSPChase))) {
+	if (!edge_serial->is_epic ||
+	    edge_serial->epic_descriptor.Supports.IOSPChase) {
 		/* flush and chase */
 		edge_port->chaseResponsePending = true;
 
@@ -1628,9 +1625,8 @@ static void edge_break(struct tty_struct *tty, int break_state)
 		}
 	}
 
-	if ((!edge_serial->is_epic) ||
-	    ((edge_serial->is_epic) &&
-	     (edge_serial->epic_descriptor.Supports.IOSPSetClrBreak))) {
+	if (!edge_serial->is_epic ||
+	    edge_serial->epic_descriptor.Supports.IOSPSetClrBreak) {
 		if (break_state == -1) {
 			dev_dbg(&port->dev, "%s - Sending IOSP_CMD_SET_BREAK\n", __func__);
 			status = send_iosp_ext_cmd(edge_port,
@@ -2465,9 +2461,8 @@ static void change_port_settings(struct tty_struct *tty,
 		unsigned char stop_char  = STOP_CHAR(tty);
 		unsigned char start_char = START_CHAR(tty);
 
-		if ((!edge_serial->is_epic) ||
-		    ((edge_serial->is_epic) &&
-		     (edge_serial->epic_descriptor.Supports.IOSPSetXChar))) {
+		if (!edge_serial->is_epic ||
+		    edge_serial->epic_descriptor.Supports.IOSPSetXChar) {
 			send_iosp_ext_cmd(edge_port,
 					IOSP_CMD_SET_XON_CHAR, start_char);
 			send_iosp_ext_cmd(edge_port,
@@ -2494,13 +2489,11 @@ static void change_port_settings(struct tty_struct *tty,
 	}
 
 	/* Set flow control to the configured value */
-	if ((!edge_serial->is_epic) ||
-	    ((edge_serial->is_epic) &&
-	     (edge_serial->epic_descriptor.Supports.IOSPSetRxFlow)))
+	if (!edge_serial->is_epic ||
+	    edge_serial->epic_descriptor.Supports.IOSPSetRxFlow)
 		send_iosp_ext_cmd(edge_port, IOSP_CMD_SET_RX_FLOW, rxFlow);
-	if ((!edge_serial->is_epic) ||
-	    ((edge_serial->is_epic) &&
-	     (edge_serial->epic_descriptor.Supports.IOSPSetTxFlow)))
+	if (!edge_serial->is_epic ||
+	    edge_serial->epic_descriptor.Supports.IOSPSetTxFlow)
 		send_iosp_ext_cmd(edge_port, IOSP_CMD_SET_TX_FLOW, txFlow);
 
 
Signature · 1 line
2.6.3
#1 lore raw

PATCH 2/2 usb: serial: remove redundant condition

This patch removes redundant condition.

(length && length > 5) can be reduced to a single evaluation.

Tested by compilation only.
Caught by cppcheck.

---
 drivers/usb/serial/mos7840.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/serial/mos7840.c +1 -1
index 8ac9b55..2c69bfc 100644
@@ -635,7 +635,7 @@ static void mos7840_interrupt_callback(struct urb *urb)
 	 * Byte 4 IIR Port 4 (port.number is 3)
 	 * Byte 5 FIFO status for both */
 
-	if (length && length > 5) {
+	if (length > 5) {
 		dev_dbg(&urb->dev->dev, "%s", "Wrong data !!!\n");
 		return;
 	}
Signature · 1 line
2.6.3
#2 lore raw

Re: [PATCH 2/2] usb: serial: remove redundant condition

Hello.

On 12/11/2015 12:46 PM, Geyslan G. Bem wrote:

It's a bad idea to send 2 different patches with the same subject. I'd use
"mos7840: " as a prefix in this case.

Quoted 8 lines

This patch removes redundant condition.

(length && length > 5) can be reduced to a single evaluation.

Tested by compilation only.
Caught by cppcheck.

[...]

MBR, Sergei

#3 lore raw

Re: [PATCH 2/2] usb: serial: remove redundant condition

2015-12-11 9:30 GMT-03:00 Sergei Shtylyov <[email protected]>:

Quoted 6 lines

Hello.

On 12/11/2015 12:46 PM, Geyslan G. Bem wrote:

It's a bad idea to send 2 different patches with the same subject. I'd
use "mos7840: " as a prefix in this case.

Sergei, tks for the advice. Johan already applied for next.

Quoted 14 lines
Quoted 9 lines

This patch removes redundant condition.

(length && length > 5) can be reduced to a single evaluation.

Tested by compilation only.
Caught by cppcheck.

[...]

MBR, Sergei

Signature · 4 lines
Regards,

Geyslan G. Bem
hackingbits.com
maintainer
#4 lore raw
In reply to Geyslan G. Bem
Quoted 8 lines · Geyslan G. Bem

This patch removes redundant conditions.

(!A || (A && B)) is the same as (!A || B).

Tested by compilation only.
Caught by cppcheck.

You forgot to update the commit summary (to include the driver name) when splitting the original patch. I fixed that up and applied both for next.

Thanks,
Johan

#5 lore raw

2015-12-11 7:13 GMT-03:00 Johan Hovold <[email protected]>:

Quoted 5 lines · Geyslan G. Bem
Quoted 4 lines

This patch removes redundant conditions.

(!A || (A && B)) is the same as (!A || B).

Quoted 8 lines
Quoted 4 lines

Tested by compilation only.
Caught by cppcheck.

You forgot to update the commit summary (to include the driver name) when splitting the original patch. I fixed that up and applied both for next.

Sorry. I got it: USB: mos7840: and USB: io_edgeport:.

I'm still getting the hang of it. :-)

Thank you for apply them.

Quoted 3 lines

Thanks,
Johan

Signature · 4 lines
Regards,

Geyslan G. Bem
hackingbits.com
maintainer
#6 lore raw
Quoted 9 lines · Geyslan G. Bem

2015-12-11 7:13 GMT-03:00 Johan Hovold <[email protected]>:

Quoted 8 lines · Geyslan G. Bem
Quoted 7 lines

This patch removes redundant conditions.

(!A || (A && B)) is the same as (!A || B).

Tested by compilation only.
Caught by cppcheck.

Quoted 8 lines
Quoted 5 lines
Quoted 1 line

You forgot to update the commit summary (to include the driver name) when splitting the original patch. I fixed that up and applied both for next.

Sorry. I got it: USB: mos7840: and USB: io_edgeport:.

I'm still getting the hang of it. :-)

Looks like you got it. :)

Quoted 1 line

Thank you for apply them.

Thanks again for the patches.

Johan