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: [4/9] USB: serial: cypress_m8: drop unused termios From: Johan Hovold Message-Id: <20190421122154.26465-5-johan@kernel.org> Date: Sun, 21 Apr 2019 14:21:49 +0200 To: linux-usb@vger.kernel.org Cc: Greg Kroah-Hartman , Johan Hovold List-ID: RHJvcCBkcml2ZXIgdGVybWlvcyBzdHJ1Y3R1cmUgdGhhdCBoZWxkIGEgY29weSBvZiB0aGUgdHR5 IHRlcm1pb3MgZm9yCm5vIGdvb2QgcmVhc29uLgoKU2lnbmVkLW9mZi1ieTogSm9oYW4gSG92b2xk IDxqb2hhbkBrZXJuZWwub3JnPgotLS0KIGRyaXZlcnMvdXNiL3NlcmlhbC9jeXByZXNzX204LmMg fCAxMiArLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxIGluc2VydGlvbigrKSwgMTEgZGVs ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy91c2Ivc2VyaWFsL2N5cHJlc3NfbTguYyBi L2RyaXZlcnMvdXNiL3NlcmlhbC9jeXByZXNzX204LmMKaW5kZXggOGEwNmU1ZmZlNjQ0Li5mOWJi YmRkMWExNDggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvdXNiL3NlcmlhbC9jeXByZXNzX204LmMKKysr IGIvZHJpdmVycy91c2Ivc2VyaWFsL2N5cHJlc3NfbTguYwpAQCAtMTA4LDkgKzEwOCw2IEBAIHN0 cnVjdCBjeXByZXNzX3ByaXZhdGUgewogCWludCBiYXVkX3JhdGU7CQkJICAgLyogc3RvcmVzIGN1 cnJlbnQgYmF1ZCByYXRlIGluCiAJCQkJCSAgICAgIGludGVnZXIgZm9ybSAqLwogCWNoYXIgcHJl dl9zdGF0dXM7CQkgICAvKiB1c2VkIGZvciBUSU9DTUlXQUlUICovCi0JLyogd2UgcGFzcyBhIHBv aW50ZXIgdG8gdGhpcyBhcyB0aGUgYXJndW1lbnQgc2VudCB0bwotCSAgIGN5cHJlc3Nfc2V0X3Rl cm1pb3Mgb2xkX3Rlcm1pb3MgKi8KLQlzdHJ1Y3Qga3Rlcm1pb3MgdG1wX3Rlcm1pb3M7IAkgICAv KiBzdG9yZXMgdGhlIG9sZCB0ZXJtaW9zIHNldHRpbmdzICovCiB9OwogCiAvKiBmdW5jdGlvbiBw cm90b3R5cGVzIGZvciB0aGUgQ3lwcmVzcyBVU0IgdG8gc2VyaWFsIGRldmljZSAqLwpAQCAtNjAz LDcgKzYwMCw3IEBAIHN0YXRpYyBpbnQgY3lwcmVzc19vcGVuKHN0cnVjdCB0dHlfc3RydWN0ICp0 dHksIHN0cnVjdCB1c2Jfc2VyaWFsX3BvcnQgKnBvcnQpCiAJY3lwcmVzc19zZW5kKHBvcnQpOwog CiAJaWYgKHR0eSkKLQkJY3lwcmVzc19zZXRfdGVybWlvcyh0dHksIHBvcnQsICZwcml2LT50bXBf dGVybWlvcyk7CisJCWN5cHJlc3Nfc2V0X3Rlcm1pb3ModHR5LCBwb3J0LCBOVUxMKTsKIAogCS8q IHNldHVwIHRoZSBwb3J0IGFuZCBzdGFydCByZWFkaW5nIGZyb20gdGhlIGRldmljZSAqLwogCXVz Yl9maWxsX2ludF91cmIocG9ydC0+aW50ZXJydXB0X2luX3VyYiwgc2VyaWFsLT5kZXYsCkBAIC04 OTksMTMgKzg5Niw2IEBAIHN0YXRpYyB2b2lkIGN5cHJlc3Nfc2V0X3Rlcm1pb3Moc3RydWN0IHR0 eV9zdHJ1Y3QgKnR0eSwKIAogCWNmbGFnID0gdHR5LT50ZXJtaW9zLmNfY2ZsYWc7CiAKLQkvKiBj aGVjayBpZiB0aGVyZSBhcmUgbmV3IHNldHRpbmdzICovCi0JaWYgKG9sZF90ZXJtaW9zKSB7Ci0J CXNwaW5fbG9ja19pcnFzYXZlKCZwcml2LT5sb2NrLCBmbGFncyk7Ci0JCXByaXYtPnRtcF90ZXJt aW9zID0gdHR5LT50ZXJtaW9zOwotCQlzcGluX3VubG9ja19pcnFyZXN0b3JlKCZwcml2LT5sb2Nr LCBmbGFncyk7Ci0JfQotCiAJLyogc2V0IG51bWJlciBvZiBkYXRhIGJpdHMsIHBhcml0eSwgc3Rv cCBiaXRzICovCiAJLyogd2hlbiBwYXJpdHkgaXMgZGlzYWJsZWQgdGhlIHBhcml0eSB0eXBlIGJp dCBpcyBpZ25vcmVkICovCiAK 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 59201C282E1 for ; Sun, 21 Apr 2019 12:22:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2296720869 for ; Sun, 21 Apr 2019 12:22:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1555849321; bh=vxfQDXarWLZbmws3NNKYD8t2s+yAlQvl2tiAEhMdKb8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=u4E9eZRNIb7gi4kJlLto80pIYzw496a6IhClO3AbVNyRMWjDaTQaoiQr8qSgoDCH1 CGXglH0cKmiUOhyJnDA4Z7BoKPtfcE+Uf0m/eObrtiJC1zsPF7ePE+G//5xmj+fJOc wtw99B+gmDnSQ8rC0PaLwhbMjAFrxSF2pZ8AHfgI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727412AbfDUMWA (ORCPT ); Sun, 21 Apr 2019 08:22:00 -0400 Received: from mail-lf1-f65.google.com ([209.85.167.65]:40418 "EHLO mail-lf1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727368AbfDUMV7 (ORCPT ); Sun, 21 Apr 2019 08:21:59 -0400 Received: by mail-lf1-f65.google.com with SMTP id a28so7119954lfo.7 for ; Sun, 21 Apr 2019 05:21:58 -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=fAhC/WX+6J0nXpY/NoNtT8XueLyId+XZUjl4jOW+1kg=; b=eCi5Nszj4fFxDFURQjF4NnBSBr6vi9cKfqKpoyBg1gp+JYtAaBN/qVnwmMgR1DdIFc MeHPsAk19MR+FFsHeCzcwzOHgMtiFcLZCxELpstqvUzqh5T3gryvMRFxfhsDOl1LgJkS q2O1vnKjz2f5qTOsgaJzppXMSWTVOj0v2wtfJzLHrO48tn1iss92kjR9XMEBqCgWiRW4 3Y7is3ks/PECpzJShRR0aapeguQdxGtmPKc0emAyI272ANVyvBR46JyQBLtxGSQWUmXV PNgCTvPsiOuhIjLJUQaQyhoImt9BdIxbwre5bhpd8sQpv9c/VCM1BGkt4eY6z8TAfC3q okxA== X-Gm-Message-State: APjAAAWJiKOPFfN5Zs7dT+Vvgvt9s2Eg2wd4YK3/XDyUNDDn/ZHsuXj2 Dyqq0f2arVK7LZcSV8GwjPEo6qCG X-Google-Smtp-Source: APXvYqyWiwqY1BN7fzuSJ1cTvpiShqJ/N39TqXxtNioyNa/6HRLWNlH2i/q3XyAEBk3Cuy45aQceaA== X-Received: by 2002:a19:751a:: with SMTP id y26mr7785744lfe.47.1555849316957; Sun, 21 Apr 2019 05:21:56 -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 v21sm2448520lfg.26.2019.04.21.05.21.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 21 Apr 2019 05:21:55 -0700 (PDT) Received: from johan by xi.terra with local (Exim 4.91) (envelope-from ) id 1hIBTs-0006tz-EY; Sun, 21 Apr 2019 14:22:00 +0200 From: Johan Hovold To: linux-usb@vger.kernel.org Cc: Greg Kroah-Hartman , Johan Hovold Subject: [PATCH 4/9] USB: serial: cypress_m8: drop unused termios Date: Sun, 21 Apr 2019 14:21:49 +0200 Message-Id: <20190421122154.26465-5-johan@kernel.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190421122154.26465-1-johan@kernel.org> References: <20190421122154.26465-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: <20190421122149.7xrDezV09NiCjSWl0PSxj6yWkrAUQ-l-ppl3DWG0rg0@z> Drop driver termios structure that held a copy of the tty termios for no good reason. Signed-off-by: Johan Hovold --- drivers/usb/serial/cypress_m8.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/drivers/usb/serial/cypress_m8.c b/drivers/usb/serial/cypress_m8.c index 8a06e5ffe644..f9bbbdd1a148 100644 --- a/drivers/usb/serial/cypress_m8.c +++ b/drivers/usb/serial/cypress_m8.c @@ -108,9 +108,6 @@ struct cypress_private { int baud_rate; /* stores current baud rate in integer form */ char prev_status; /* used for TIOCMIWAIT */ - /* we pass a pointer to this as the argument sent to - cypress_set_termios old_termios */ - struct ktermios tmp_termios; /* stores the old termios settings */ }; /* function prototypes for the Cypress USB to serial device */ @@ -603,7 +600,7 @@ static int cypress_open(struct tty_struct *tty, struct usb_serial_port *port) cypress_send(port); if (tty) - cypress_set_termios(tty, port, &priv->tmp_termios); + cypress_set_termios(tty, port, NULL); /* setup the port and start reading from the device */ usb_fill_int_urb(port->interrupt_in_urb, serial->dev, @@ -899,13 +896,6 @@ static void cypress_set_termios(struct tty_struct *tty, cflag = tty->termios.c_cflag; - /* check if there are new settings */ - if (old_termios) { - spin_lock_irqsave(&priv->lock, flags); - priv->tmp_termios = tty->termios; - spin_unlock_irqrestore(&priv->lock, flags); - } - /* set number of data bits, parity, stop bits */ /* when parity is disabled the parity type bit is ignored */ -- 2.21.0