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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 066EECD54A9 for ; Tue, 19 Sep 2023 08:53:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231271AbjISIxe (ORCPT ); Tue, 19 Sep 2023 04:53:34 -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 Precedence: bulk List-ID: X-Mailing-List: linux-serial@vger.kernel.org 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