From mboxrd@z Thu Jan 1 00:00:00 1970 From: Greg Kroah-Hartman Subject: [PATCH 01/48] vt: remove uneeded retval check before tty->ops->open inside tty_open Date: Mon, 23 May 2011 12:06:18 -0700 Message-ID: <1306177625-17885-1-git-send-email-gregkh@suse.de> References: <20110523190539.GA17519@kroah.com> Return-path: Received: from out5.smtp.messagingengine.com ([66.111.4.29]:57051 "EHLO out5.smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932741Ab1EWTQV (ORCPT ); Mon, 23 May 2011 15:16:21 -0400 In-Reply-To: <20110523190539.GA17519@kroah.com> Sender: linux-serial-owner@vger.kernel.org List-Id: linux-serial@vger.kernel.org To: linux-serial@vger.kernel.org Cc: Herton Ronaldo Krzesinski , Greg Kroah-Hartman From: Herton Ronaldo Krzesinski The current check is uneeded, since !retval will always returns true, as retval returned from tty_add_file is checked earlier and tty_open exits if it's not zero. Acked-by: Alan Cox Signed-off-by: Herton Ronaldo Krzesinski Signed-off-by: Greg Kroah-Hartman --- drivers/tty/tty_io.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c index d7d50b4..188632e 100644 --- a/drivers/tty/tty_io.c +++ b/drivers/tty/tty_io.c @@ -1902,12 +1902,10 @@ got_driver: #ifdef TTY_DEBUG_HANGUP printk(KERN_DEBUG "opening %s...", tty->name); #endif - if (!retval) { - if (tty->ops->open) - retval = tty->ops->open(tty, filp); - else - retval = -ENODEV; - } + if (tty->ops->open) + retval = tty->ops->open(tty, filp); + else + retval = -ENODEV; filp->f_flags = saved_flags; if (!retval && test_bit(TTY_EXCLUSIVE, &tty->flags) && -- 1.7.4.2