Skip to contentSkip to conversation

usb: serial: remove redundant conditions

PATCH In review Geyslan G. Bem 2 participants 6 messages Dec 10, 2015 – Dec 11, 2015

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

PATCH 1/4 usb: serial: remove redundant conditions

This patch removes redundant conditions.

(!A || (A && B)) is the same as (!A || B).
(length && length > 5) can be reduced to a single evaluation.

Tested by compilation only.
Caught by cppcheck.

---
 drivers/usb/serial/io_edgeport.c | 35 ++++++++++++++---------------------
 drivers/usb/serial/mos7840.c     |  2 +-
 2 files changed, 15 insertions(+), 22 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);
 
 
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
#1 lore raw

PATCH 2/4 usb: gadget: remove redundant condition

This patch removes redundant condition.

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

Tested by compilation only.
Caught by cppcheck.

---
 drivers/usb/gadget/udc/s3c-hsudc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/gadget/udc/s3c-hsudc.c +1 -1
index e9def42..82a9e2a 100644
@@ -569,7 +569,7 @@ static int s3c_hsudc_handle_reqfeat(struct s3c_hsudc *hsudc,
 		hsep = &hsudc->ep[ep_num];
 		switch (le16_to_cpu(ctrl->wValue)) {
 		case USB_ENDPOINT_HALT:
-			if (set || (!set && !hsep->wedge))
+			if (set || !hsep->wedge)
 				s3c_hsudc_set_halt(&hsep->ep, set);
 			return 0;
 		}
Signature · 1 line
2.6.3
#2 lore raw

PATCH 3/4 usb: host: remove redundant condition

In reply to Geyslan G. Bem

This patch removes redundant condition.

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

Tested by compilation only.
Caught by cppcheck.

---
 drivers/usb/host/fhci-sched.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/host/fhci-sched.c +1 -1
index 95ca598..23ecac5 100644
@@ -288,7 +288,7 @@ static int scan_ed_list(struct fhci_usb *usb,
 	list_for_each_entry(ed, list, node) {
 		td = ed->td_head;
 
-		if (!td || (td && td->status == USB_TD_INPROGRESS))
+		if (!td || (td->status == USB_TD_INPROGRESS))
 			continue;
 
 		if (ed->state != FHCI_ED_OPER) {
Signature · 1 line
2.6.3
#3 lore raw

PATCH 4/4 usb: musb: remove redundant condition

In reply to Geyslan G. Bem

This patch removes redundant condition.

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

Fixes indentation too.

Tested by: compilation only
Caught by: cppcheck

---
 drivers/usb/musb/musb_gadget.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/usb/musb/musb_gadget.c +2 -3
index 67ad630..87bd578 100644
@@ -353,9 +353,8 @@ static void txstate(struct musb *musb, struct musb_request *req)
 					 *	1	>0	Yes(FS bulk)
 					 */
 					if (!musb_ep->hb_mult ||
-						(musb_ep->hb_mult &&
-						 can_bulk_split(musb,
-						    musb_ep->type)))
+					    can_bulk_split(musb,
+							   musb_ep->type))
 						csr |= MUSB_TXCSR_AUTOSET;
 				}
 				csr &= ~MUSB_TXCSR_P_UNDERRUN;
Signature · 1 line
2.6.3
maintainer
#4 lore raw
In reply to Geyslan G. Bem
Quoted 5 lines · Geyslan G. Bem

This patch removes redundant conditions.

(!A || (A && B)) is the same as (!A || B).
(length && length > 5) can be reduced to a single evaluation.

Quoted 8 lines

Tested by compilation only.
Caught by cppcheck.

---
 drivers/usb/serial/io_edgeport.c | 35 ++++++++++++++---------------------
 drivers/usb/serial/mos7840.c     |  2 +-
 2 files changed, 15 insertions(+), 22 deletions(-)

Please split this up per driver as I (and Felipe) asked.

You can send these two separate from the rest, and remember to CC the USB list.

Thanks,
Johan

#5 lore raw

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

Quoted 9 lines · Geyslan G. Bem
Quoted 8 lines

This patch removes redundant conditions.

(!A || (A && B)) is the same as (!A || B).
(length && length > 5) can be reduced to a single evaluation.

Tested by compilation only.
Caught by cppcheck.

Quoted 7 lines
Quoted 5 lines
---
 drivers/usb/serial/io_edgeport.c | 35 ++++++++++++++---------------------
 drivers/usb/serial/mos7840.c     |  2 +-
 2 files changed, 15 insertions(+), 22 deletions(-)

Please split this up per driver as I (and Felipe) asked.

Sorry. get_maintainer give same maintainers, but the question here is the different drivers. Ok, I'll send them splitted.

Quoted 3 lines

You can send these two separate from the rest, and remember to CC the USB list.

Ok, tks.

Quoted 3 lines

Thanks,
Johan

Signature · 4 lines
Regards,

Geyslan G. Bem
hackingbits.com