From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: [2/2] USB: serial: digi_acceleport: clean up set_termios From: Johan Hovold Message-Id: <20190418162020.23566-2-johan@kernel.org> Date: Thu, 18 Apr 2019 18:20:20 +0200 To: linux-usb@vger.kernel.org Cc: Johan Hovold List-ID: Q2xlYW4gdXAgc2V0X3Rlcm1pb3MoKSBieSBhZGRpbmcgbWlzc2luZyB3aGl0ZSBzcGFjZSBhcm91 bmQgb3BlcmF0b3JzCmFuZCBtYWtpbmcgYSBjb3VwbGUgb2YgY29udGludWF0aW9uIGxpbmVzIG1v cmUgcmVhZGFibGUuCgpBbHNvIGRyb3AgYSBjb3VwbGUgb2YgcmVkdW5kYW50IGJyYWNlcy4KClNp Z25lZC1vZmYtYnk6IEpvaGFuIEhvdm9sZCA8am9oYW5Aa2VybmVsLm9yZz4KLS0tCiBkcml2ZXJz L3VzYi9zZXJpYWwvZGlnaV9hY2NlbGVwb3J0LmMgfCAzMyArKysrKysrKysrKysrKy0tLS0tLS0t LS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMTYgaW5zZXJ0aW9ucygrKSwgMTcgZGVsZXRpb25zKC0p CgpkaWZmIC0tZ2l0IGEvZHJpdmVycy91c2Ivc2VyaWFsL2RpZ2lfYWNjZWxlcG9ydC5jIGIvZHJp dmVycy91c2Ivc2VyaWFsL2RpZ2lfYWNjZWxlcG9ydC5jCmluZGV4IDQ2OTllMTE0ZjYxNy4uNTc4 ZWJkZDg2NTIwIDEwMDY0NAotLS0gYS9kcml2ZXJzL3VzYi9zZXJpYWwvZGlnaV9hY2NlbGVwb3J0 LmMKKysrIGIvZHJpdmVycy91c2Ivc2VyaWFsL2RpZ2lfYWNjZWxlcG9ydC5jCkBAIC03NDAsOSAr NzQwLDkgQEAgc3RhdGljIHZvaWQgZGlnaV9zZXRfdGVybWlvcyhzdHJ1Y3QgdHR5X3N0cnVjdCAq dHR5LAogCS8qIHNldCBwYXJpdHkgKi8KIAl0dHktPnRlcm1pb3MuY19jZmxhZyAmPSB+Q01TUEFS OwogCi0JaWYgKChjZmxhZyYoUEFSRU5CfFBBUk9ERCkpICE9IChvbGRfY2ZsYWcmKFBBUkVOQnxQ QVJPREQpKSkgewotCQlpZiAoY2ZsYWcmUEFSRU5CKSB7Ci0JCQlpZiAoY2ZsYWcmUEFST0REKQor CWlmICgoY2ZsYWcgJiAoUEFSRU5CIHwgUEFST0REKSkgIT0gKG9sZF9jZmxhZyAmIChQQVJFTkIg fCBQQVJPREQpKSkgeworCQlpZiAoY2ZsYWcgJiBQQVJFTkIpIHsKKwkJCWlmIChjZmxhZyAmIFBB Uk9ERCkKIAkJCQlhcmcgPSBESUdJX1BBUklUWV9PREQ7CiAJCQllbHNlCiAJCQkJYXJnID0gRElH SV9QQVJJVFlfRVZFTjsKQEAgLTc1NSw5ICs3NTUsOSBAQCBzdGF0aWMgdm9pZCBkaWdpX3NldF90 ZXJtaW9zKHN0cnVjdCB0dHlfc3RydWN0ICp0dHksCiAJCWJ1ZltpKytdID0gMDsKIAl9CiAJLyog c2V0IHdvcmQgc2l6ZSAqLwotCWlmICgoY2ZsYWcmQ1NJWkUpICE9IChvbGRfY2ZsYWcmQ1NJWkUp KSB7CisJaWYgKChjZmxhZyAmIENTSVpFKSAhPSAob2xkX2NmbGFnICYgQ1NJWkUpKSB7CiAJCWFy ZyA9IC0xOwotCQlzd2l0Y2ggKGNmbGFnJkNTSVpFKSB7CisJCXN3aXRjaCAoY2ZsYWcgJiBDU0la RSkgewogCQljYXNlIENTNTogYXJnID0gRElHSV9XT1JEX1NJWkVfNTsgYnJlYWs7CiAJCWNhc2Ug Q1M2OiBhcmcgPSBESUdJX1dPUkRfU0laRV82OyBicmVhazsKIAkJY2FzZSBDUzc6IGFyZyA9IERJ R0lfV09SRF9TSVpFXzc7IGJyZWFrOwpAQCAtNzY1LDcgKzc2NSw3IEBAIHN0YXRpYyB2b2lkIGRp Z2lfc2V0X3Rlcm1pb3Moc3RydWN0IHR0eV9zdHJ1Y3QgKnR0eSwKIAkJZGVmYXVsdDoKIAkJCWRl dl9kYmcoZGV2LAogCQkJCSJkaWdpX3NldF90ZXJtaW9zOiBjYW4ndCBoYW5kbGUgd29yZCBzaXpl ICVkXG4iLAotCQkJCShjZmxhZyZDU0laRSkpOworCQkJCWNmbGFnICYgQ1NJWkUpOwogCQkJYnJl YWs7CiAJCX0KIApAQCAtNzc5LDkgKzc3OSw5IEBAIHN0YXRpYyB2b2lkIGRpZ2lfc2V0X3Rlcm1p b3Moc3RydWN0IHR0eV9zdHJ1Y3QgKnR0eSwKIAl9CiAKIAkvKiBzZXQgc3RvcCBiaXRzICovCi0J aWYgKChjZmxhZyZDU1RPUEIpICE9IChvbGRfY2ZsYWcmQ1NUT1BCKSkgeworCWlmICgoY2ZsYWcg JiBDU1RPUEIpICE9IChvbGRfY2ZsYWcgJiBDU1RPUEIpKSB7CiAKLQkJaWYgKChjZmxhZyZDU1RP UEIpKQorCQlpZiAoKGNmbGFnICYgQ1NUT1BCKSkKIAkJCWFyZyA9IERJR0lfU1RPUF9CSVRTXzI7 CiAJCWVsc2UKIAkJCWFyZyA9IERJR0lfU1RPUF9CSVRTXzE7CkBAIC03OTQsMTUgKzc5NCwxNSBA QCBzdGF0aWMgdm9pZCBkaWdpX3NldF90ZXJtaW9zKHN0cnVjdCB0dHlfc3RydWN0ICp0dHksCiAJ fQogCiAJLyogc2V0IGlucHV0IGZsb3cgY29udHJvbCAqLwotCWlmICgoaWZsYWcmSVhPRkYpICE9 IChvbGRfaWZsYWcmSVhPRkYpCi0JICAgIHx8IChjZmxhZyZDUlRTQ1RTKSAhPSAob2xkX2NmbGFn JkNSVFNDVFMpKSB7CisJaWYgKChpZmxhZyAmIElYT0ZGKSAhPSAob2xkX2lmbGFnICYgSVhPRkYp IHx8CisJCQkoY2ZsYWcgJiBDUlRTQ1RTKSAhPSAob2xkX2NmbGFnICYgQ1JUU0NUUykpIHsKIAkJ YXJnID0gMDsKLQkJaWYgKGlmbGFnJklYT0ZGKQorCQlpZiAoaWZsYWcgJiBJWE9GRikKIAkJCWFy ZyB8PSBESUdJX0lOUFVUX0ZMT1dfQ09OVFJPTF9YT05fWE9GRjsKIAkJZWxzZQogCQkJYXJnICY9 IH5ESUdJX0lOUFVUX0ZMT1dfQ09OVFJPTF9YT05fWE9GRjsKIAotCQlpZiAoY2ZsYWcmQ1JUU0NU UykgeworCQlpZiAoY2ZsYWcgJiBDUlRTQ1RTKSB7CiAJCQlhcmcgfD0gRElHSV9JTlBVVF9GTE9X X0NPTlRST0xfUlRTOwogCiAJCQkvKiBPbiBVU0ItNCBpdCBpcyBuZWNlc3NhcnkgdG8gYXNzZXJ0 IFJUUyBwcmlvciAqLwpAQCAtODIyLDE5ICs4MjIsMTggQEAgc3RhdGljIHZvaWQgZGlnaV9zZXRf dGVybWlvcyhzdHJ1Y3QgdHR5X3N0cnVjdCAqdHR5LAogCX0KIAogCS8qIHNldCBvdXRwdXQgZmxv dyBjb250cm9sICovCi0JaWYgKChpZmxhZyAmIElYT04pICE9IChvbGRfaWZsYWcgJiBJWE9OKQot CSAgICB8fCAoY2ZsYWcgJiBDUlRTQ1RTKSAhPSAob2xkX2NmbGFnICYgQ1JUU0NUUykpIHsKKwlp ZiAoKGlmbGFnICYgSVhPTikgIT0gKG9sZF9pZmxhZyAmIElYT04pIHx8CisJCQkoY2ZsYWcgJiBD UlRTQ1RTKSAhPSAob2xkX2NmbGFnICYgQ1JUU0NUUykpIHsKIAkJYXJnID0gMDsKIAkJaWYgKGlm bGFnICYgSVhPTikKIAkJCWFyZyB8PSBESUdJX09VVFBVVF9GTE9XX0NPTlRST0xfWE9OX1hPRkY7 CiAJCWVsc2UKIAkJCWFyZyAmPSB+RElHSV9PVVRQVVRfRkxPV19DT05UUk9MX1hPTl9YT0ZGOwog Ci0JCWlmIChjZmxhZyAmIENSVFNDVFMpIHsKKwkJaWYgKGNmbGFnICYgQ1JUU0NUUykKIAkJCWFy ZyB8PSBESUdJX09VVFBVVF9GTE9XX0NPTlRST0xfQ1RTOwotCQl9IGVsc2UgeworCQllbHNlCiAJ CQlhcmcgJj0gfkRJR0lfT1VUUFVUX0ZMT1dfQ09OVFJPTF9DVFM7Ci0JCX0KIAogCQlidWZbaSsr XSA9IERJR0lfQ01EX1NFVF9PVVRQVVRfRkxPV19DT05UUk9MOwogCQlidWZbaSsrXSA9IHByaXYt PmRwX3BvcnRfbnVtOwo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS, T_DKIMWL_WL_HIGH,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BA2E2C10F0E for ; Thu, 18 Apr 2019 16:20:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 89503206B6 for ; Thu, 18 Apr 2019 16:20:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1555604418; bh=QdTc3cc0Uc3tnrA+utfxODqaQmVlP04aH1b26OsGHC4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=LTmFhQa1uFPTJc8zXfwUW0LQXrU1iV7gQ5bfNHMRUFPGCzaqL+yPTCP9FY3OKtmB5 Cj4erMHiG0GsK/NVicarkXZd3xudlPaH18h3AI9pmAtkawzkV7dkesip2FrpmAh2a8 5poJ97SpHR6dUOb2zdgLPy4h7P2k3eGhaNTOPbHA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388495AbfDRQUS (ORCPT ); Thu, 18 Apr 2019 12:20:18 -0400 Received: from mail-lj1-f196.google.com ([209.85.208.196]:39545 "EHLO mail-lj1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725888AbfDRQUR (ORCPT ); Thu, 18 Apr 2019 12:20:17 -0400 Received: by mail-lj1-f196.google.com with SMTP id l7so2423743ljg.6 for ; Thu, 18 Apr 2019 09:20:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=urnnXzbecz685AXtXD3Xo8I3/bPlf9IE3dOhSF7i3Eg=; b=jIdtDLCMkPC7QmMUcYhCBEFaQhoVkuHqOy0VvJJye7LSB4IjX6ZxuX8dihOSb9dz+Q UuG1vKmIeXmr+QtLhRBADj/bmMs3WTva0RrSWnm6uO2j4XEE3YV5ruhm0IREj5NdS4Qa tn1uAofr7MgY6RyKoKoGLedCKjgSFYWC+OMnrwKmqsFtVhl2a5se2HTrcFRPFyBozp6Z jyydp6go7NxNC3oFlX+tpTnSi77BC41I5lzYgMNlj3FDKKu4UOBNLnI0OdasFqhpINjB NpJfuyLVfBajUodtoxpVp1BKvwELj9LPAbYxTC2ootv5iMScN0GUnsfKcwDuQlo78t6J /hsw== X-Gm-Message-State: APjAAAW9L2iERpf9mXyGcUlC5TWXao/vRZeVe/8fwB16p6xyLOocSprP tfx3KW/pax0k3ywvWM9fMERqThgK X-Google-Smtp-Source: APXvYqwE/1U6gTBB49vVLO4SI++wq9FwU83eQS2Ph2A6Id2KK74mJMj7P6QOQHnRWSMD7ph6Yj6ksg== X-Received: by 2002:a2e:7311:: with SMTP id o17mr35351763ljc.124.1555604415489; Thu, 18 Apr 2019 09:20:15 -0700 (PDT) Received: from xi.terra (c-74bee655.07-184-6d6c6d4.bbcust.telenor.se. [85.230.190.116]) by smtp.gmail.com with ESMTPSA id o7sm500878ljj.23.2019.04.18.09.20.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 18 Apr 2019 09:20:14 -0700 (PDT) Received: from johan by xi.terra with local (Exim 4.91) (envelope-from ) id 1hH9lx-00068u-Az; Thu, 18 Apr 2019 18:20:25 +0200 From: Johan Hovold To: linux-usb@vger.kernel.org Cc: Johan Hovold Subject: [PATCH 2/2] USB: serial: digi_acceleport: clean up set_termios Date: Thu, 18 Apr 2019 18:20:20 +0200 Message-Id: <20190418162020.23566-2-johan@kernel.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190418162020.23566-1-johan@kernel.org> References: <20190418162020.23566-1-johan@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Message-ID: <20190418162020.X6HW4ywbHzX1NY9ZNg51dlc0msKEzd-43miUdoWZh_o@z> Clean up set_termios() by adding missing white space around operators and making a couple of continuation lines more readable. Also drop a couple of redundant braces. Signed-off-by: Johan Hovold --- drivers/usb/serial/digi_acceleport.c | 33 ++++++++++++++-------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/drivers/usb/serial/digi_acceleport.c b/drivers/usb/serial/digi_acceleport.c index 4699e114f617..578ebdd86520 100644 --- a/drivers/usb/serial/digi_acceleport.c +++ b/drivers/usb/serial/digi_acceleport.c @@ -740,9 +740,9 @@ static void digi_set_termios(struct tty_struct *tty, /* set parity */ tty->termios.c_cflag &= ~CMSPAR; - if ((cflag&(PARENB|PARODD)) != (old_cflag&(PARENB|PARODD))) { - if (cflag&PARENB) { - if (cflag&PARODD) + if ((cflag & (PARENB | PARODD)) != (old_cflag & (PARENB | PARODD))) { + if (cflag & PARENB) { + if (cflag & PARODD) arg = DIGI_PARITY_ODD; else arg = DIGI_PARITY_EVEN; @@ -755,9 +755,9 @@ static void digi_set_termios(struct tty_struct *tty, buf[i++] = 0; } /* set word size */ - if ((cflag&CSIZE) != (old_cflag&CSIZE)) { + if ((cflag & CSIZE) != (old_cflag & CSIZE)) { arg = -1; - switch (cflag&CSIZE) { + switch (cflag & CSIZE) { case CS5: arg = DIGI_WORD_SIZE_5; break; case CS6: arg = DIGI_WORD_SIZE_6; break; case CS7: arg = DIGI_WORD_SIZE_7; break; @@ -765,7 +765,7 @@ static void digi_set_termios(struct tty_struct *tty, default: dev_dbg(dev, "digi_set_termios: can't handle word size %d\n", - (cflag&CSIZE)); + cflag & CSIZE); break; } @@ -779,9 +779,9 @@ static void digi_set_termios(struct tty_struct *tty, } /* set stop bits */ - if ((cflag&CSTOPB) != (old_cflag&CSTOPB)) { + if ((cflag & CSTOPB) != (old_cflag & CSTOPB)) { - if ((cflag&CSTOPB)) + if ((cflag & CSTOPB)) arg = DIGI_STOP_BITS_2; else arg = DIGI_STOP_BITS_1; @@ -794,15 +794,15 @@ static void digi_set_termios(struct tty_struct *tty, } /* set input flow control */ - if ((iflag&IXOFF) != (old_iflag&IXOFF) - || (cflag&CRTSCTS) != (old_cflag&CRTSCTS)) { + if ((iflag & IXOFF) != (old_iflag & IXOFF) || + (cflag & CRTSCTS) != (old_cflag & CRTSCTS)) { arg = 0; - if (iflag&IXOFF) + if (iflag & IXOFF) arg |= DIGI_INPUT_FLOW_CONTROL_XON_XOFF; else arg &= ~DIGI_INPUT_FLOW_CONTROL_XON_XOFF; - if (cflag&CRTSCTS) { + if (cflag & CRTSCTS) { arg |= DIGI_INPUT_FLOW_CONTROL_RTS; /* On USB-4 it is necessary to assert RTS prior */ @@ -822,19 +822,18 @@ static void digi_set_termios(struct tty_struct *tty, } /* set output flow control */ - if ((iflag & IXON) != (old_iflag & IXON) - || (cflag & CRTSCTS) != (old_cflag & CRTSCTS)) { + if ((iflag & IXON) != (old_iflag & IXON) || + (cflag & CRTSCTS) != (old_cflag & CRTSCTS)) { arg = 0; if (iflag & IXON) arg |= DIGI_OUTPUT_FLOW_CONTROL_XON_XOFF; else arg &= ~DIGI_OUTPUT_FLOW_CONTROL_XON_XOFF; - if (cflag & CRTSCTS) { + if (cflag & CRTSCTS) arg |= DIGI_OUTPUT_FLOW_CONTROL_CTS; - } else { + else arg &= ~DIGI_OUTPUT_FLOW_CONTROL_CTS; - } buf[i++] = DIGI_CMD_SET_OUTPUT_FLOW_CONTROL; buf[i++] = priv->dp_port_num; -- 2.21.0