From patchwork Wed Oct 31 19:24:34 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rolf Eike Beer X-Patchwork-Id: 1681141 Return-Path: X-Original-To: patchwork-linux-parisc@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 7233EDFB80 for ; Wed, 31 Oct 2012 19:24:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760100Ab2JaTYh (ORCPT ); Wed, 31 Oct 2012 15:24:37 -0400 Received: from mail.sf-mail.de ([62.27.20.61]:57953 "EHLO mail.sf-mail.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760089Ab2JaTYh (ORCPT ); Wed, 31 Oct 2012 15:24:37 -0400 Received: (qmail 26436 invoked from network); 31 Oct 2012 19:24:35 -0000 Received: from dslb-178-003-166-161.pools.arcor-ip.net ([::ffff:178.3.166.161]:45804 HELO eto.sf-tec.de) (auth=eike@sf-mail.de) by mail.sf-mail.de (Qsmtpd 0.22svn) with (DHE-RSA-AES256-SHA encrypted) ESMTPSA for ; Wed, 31 Oct 2012 20:24:35 +0100 From: Rolf Eike Beer To: linux-parisc@vger.kernel.org, linux-input@vger.kernel.org Subject: [PATCH] HIL: remove one goto Date: Wed, 31 Oct 2012 20:24:34 +0100 Message-ID: <2837529.xgu9k1gmUb@eto> User-Agent: KMail/4.8.5 (Linux/3.6.4-9-desktop; KDE/4.8.5; x86_64; ; ) MIME-Version: 1.0 Sender: linux-parisc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-parisc@vger.kernel.org This goto is only used to skip the next instruction, which can easily be done without a goto. Signed-off-by: Rolf Eike Beer --- drivers/input/serio/hil_mlc.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/input/serio/hil_mlc.c b/drivers/input/serio/hil_mlc.c index bfd3865..0280167 100644 --- a/drivers/input/serio/hil_mlc.c +++ b/drivers/input/serio/hil_mlc.c @@ -686,13 +686,12 @@ static int hilse_donode(hil_mlc *mlc) write_lock_irqsave(&mlc->lock, flags); pack = node->object.packet; out: - if (mlc->istarted) - goto out2; - /* Prepare to receive input */ - if ((node + 1)->act & HILSE_IN) - hilse_setup_input(mlc, node + 1); + if (!mlc->istarted) { + /* Prepare to receive input */ + if ((node + 1)->act & HILSE_IN) + hilse_setup_input(mlc, node + 1); + } - out2: write_unlock_irqrestore(&mlc->lock, flags); if (down_trylock(&mlc->osem)) {