USB: io_edgeport: remove redundant conditions

This patch removes redundant conditions.

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

Tested by compilation only.
Caught by cppcheck.

Signed-off-by: Geyslan G. Bem <geyslan@gmail.com>
Signed-off-by: Johan Hovold <johan@kernel.org>

diff --git a/drivers/usb/serial/io_edgeport.c b/drivers/usb/serial/io_edgeport.c
index c0866971db2bd7fa23b6c6ac7e87817e9725dad9..f49327d20ee820a55a338da89146887b4ec4ac0e 100644 (file)
--- a/drivers/usb/serial/io_edgeport.c
+++ b/drivers/usb/serial/io_edgeport.c
@@ -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);