Received: by 2002:a05:7412:37c9:b0:e2:908c:2ebd with SMTP id jz9csp509769rdb; Tue, 19 Sep 2023 02:02:30 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGs4fVe/t5+BIH2k8jUm9rmGlYJ5SN7hIC7lVhQp5QLDAq3pKr1nxv6nl6onLia9vCA/eAL X-Received: by 2002:a05:6358:e49c:b0:139:d4f2:b03e with SMTP id by28-20020a056358e49c00b00139d4f2b03emr10437149rwb.6.1695114150029; Tue, 19 Sep 2023 02:02:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695114149; cv=none; d=google.com; s=arc-20160816; b=lIRBeL82RE/od2akFEhPc2/oRJ3iulAiJZMbDh6Gj7cEiiEFIpPGZYY0FPnCknK/kC 1XM3gZzH7E8mMsiYGMVKli7NLB/rjkI4gTCk//sYHHmtnsrUCm2ZkOMQVDh7MXmRmlAF zQcWQrQe9cx/pgGL/qQUgMT+mkKfk/p9KsbCrCxQSdf3h3Loz0o1+GM7lM2T6L8Hm/vB RjLE/8ouYHVBviYr+pOqm+TA8ZGZ6H2/GT3a9/IIPG2n0oN4pQIvUqFLmZ2GoClR3nvq uc3GWAx0tUSPZfKwQDl1hR1lCML7ftPGFILIvPVjJhpsgFkltEQJ3p15Zp8jGle/kCxk kUjA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=XzqNPiPSYL8Dm/i0Ku/FtBBJMwnuoPGFxuFri6htGpo=; fh=1YNwm5KBWetjB3qGkhgLqh/dZnCTsWuqRk83JW6hjgE=; b=k+DNa8HkYrhwF5Abr93IfqGhMKgp/q/TnEbg3jgKM5N/Kh+3cYmdYJT6x52BqDIBZy ChrEkX2TZoUXpCs6TlBEubeGeX9U0n+3MnP9jK4xaue8ICJg9UlfYa2ptstGKGNpdUg4 MDpD4z9qqhcOOr1id6oJsDzzm1vVv5We+gwJaahRLbZF8KNb8dU/8x3j0UTtQcuzaytw 3LjxOmnl58kEQ9M64QMybUq1OVLmHf8LQMiXTWwN9wvOBCZkgZt6EaRQLB/BpXRFPgjF /riZVKmV83Ccpi5ISaMvMKIulQmMhyRducAf10AS+AQTEkQk6LeSeII80hVQ/3hTemLn A6Tg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=qeWUWhVA; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from lipwig.vger.email (lipwig.vger.email. [2620:137:e000::3:3]) by mx.google.com with ESMTPS id x189-20020a6386c6000000b00578b63123desi822394pgd.789.2023.09.19.02.02.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Sep 2023 02:02:29 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=qeWUWhVA; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id 3D6AF80A13A3; Tue, 19 Sep 2023 01:53:39 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231172AbjISIxf (ORCPT + 99 others); Tue, 19 Sep 2023 04:53:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34064 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231464AbjISIxL (ORCPT ); Tue, 19 Sep 2023 04:53:11 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 502D1CED; Tue, 19 Sep 2023 01:52:22 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 19FF4C433C7; Tue, 19 Sep 2023 08:52:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1695113542; bh=7UoeuQSc61iexVhpiA9OIZHl2gZTKMqiBLJ5FoPV2xg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qeWUWhVAi9S3XdxAdbNO7sAK5hMkVsAqMrVWbaNvxJ0mhN/otAEI9OKSuns7zvmD+ U3h3PB2aa7EkDgi2R1w0iYUkai8W3Qg1ADkOPyyH/TNshv+/pOiUGenfG+3UkuIkqv dEWLQyenySZpDxTsy93hXuPclq6kOlTS9ct1EweJUyVZJS9dmfZuhpPe+jmY7n1tfP IYVb7oQwPS4QQl3dJKdDSlp9wDS/Kk1NXsDlpatBKVLdSvzkQ7c8/duEmLmlnEWs9I +X1SLwxxJjHXOLMcHIb+/uhbTe1ofrgUBn1zT5owaxmoFpeBgysn5K7+Wupj6v8JLi 2XYz9NenJZ5Yw== From: "Jiri Slaby (SUSE)" To: gregkh@linuxfoundation.org Cc: linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org, "Jiri Slaby (SUSE)" Subject: [PATCH 15/15] tty: use 'if' in send_break() instead of 'goto' Date: Tue, 19 Sep 2023 10:51:56 +0200 Message-ID: <20230919085156.1578-16-jirislaby@kernel.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20230919085156.1578-1-jirislaby@kernel.org> References: <20230919085156.1578-1-jirislaby@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Tue, 19 Sep 2023 01:53:39 -0700 (PDT) Now, the "jumped-over" code is simple enough to be put inside an 'if'. Do so to make it 'goto'-less. Signed-off-by: Jiri Slaby (SUSE) --- drivers/tty/tty_io.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c index 24833b31b81c..378257c4c41a 100644 --- a/drivers/tty/tty_io.c +++ b/drivers/tty/tty_io.c @@ -2482,11 +2482,10 @@ static int send_break(struct tty_struct *tty, unsigned int duration) return -EINTR; retval = tty->ops->break_ctl(tty, -1); - if (retval) - goto out; - msleep_interruptible(duration); - retval = tty->ops->break_ctl(tty, 0); -out: + if (!retval) { + msleep_interruptible(duration); + retval = tty->ops->break_ctl(tty, 0); + } tty_write_unlock(tty); if (signal_pending(current)) -- 2.42.0