From patchwork Fri Oct 2 13:40:28 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Javier Martinez Canillas X-Patchwork-Id: 7316041 Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id AFD709F1B9 for ; Fri, 2 Oct 2015 13:42:00 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CF64520663 for ; Fri, 2 Oct 2015 13:41:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EA38C208D7 for ; Fri, 2 Oct 2015 13:41:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753955AbbJBNla (ORCPT ); Fri, 2 Oct 2015 09:41:30 -0400 Received: from lists.s-osg.org ([54.187.51.154]:47023 "EHLO lists.s-osg.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753945AbbJBNlZ (ORCPT ); Fri, 2 Oct 2015 09:41:25 -0400 Received: from localhost.localdomain (148.103.23.95.dynamic.jazztel.es [95.23.103.148]) by lists.s-osg.org (Postfix) with ESMTPSA id 7E90E4632A; Fri, 2 Oct 2015 06:41:23 -0700 (PDT) From: Javier Martinez Canillas To: linux-kernel@vger.kernel.org Cc: Javier Martinez Canillas , Hans de Goede , Benjamin Tissoires , Henrik Rydberg , linux-input@vger.kernel.org, Dmitry Torokhov Subject: [PATCH 17/18] Input: cypress_ps2 - simplify function return logic Date: Fri, 2 Oct 2015 15:40:28 +0200 Message-Id: <1443793229-22363-18-git-send-email-javier@osg.samsung.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1443793229-22363-1-git-send-email-javier@osg.samsung.com> References: <1443793229-22363-1-git-send-email-javier@osg.samsung.com> Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The invoked function already returns zero on success or a negative errno code so there is no need to open code the logic in the caller. This also fixes the following make coccicheck warning: drivers/input/mouse/cypress_ps2.c:333:1-4: WARNING: end returns can be simplified Signed-off-by: Javier Martinez Canillas --- drivers/input/mouse/cypress_ps2.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/input/mouse/cypress_ps2.c b/drivers/input/mouse/cypress_ps2.c index 28dcfc822bf6..bca984f53434 100644 --- a/drivers/input/mouse/cypress_ps2.c +++ b/drivers/input/mouse/cypress_ps2.c @@ -330,11 +330,7 @@ static int cypress_query_hardware(struct psmouse *psmouse) if (ret) return ret; - ret = cypress_read_tp_metrics(psmouse); - if (ret) - return ret; - - return 0; + return cypress_read_tp_metrics(psmouse); } static int cypress_set_absolute_mode(struct psmouse *psmouse)