From patchwork Fri Oct 2 13:40:27 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: 7316071 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 B42969F1B9 for ; Fri, 2 Oct 2015 13:42:24 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EE0C4208E8 for ; Fri, 2 Oct 2015 13:42:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 78759208E4 for ; Fri, 2 Oct 2015 13:42:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752943AbbJBNlY (ORCPT ); Fri, 2 Oct 2015 09:41:24 -0400 Received: from lists.s-osg.org ([54.187.51.154]:47015 "EHLO lists.s-osg.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752488AbbJBNlX (ORCPT ); Fri, 2 Oct 2015 09:41:23 -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 E9A0846328; Fri, 2 Oct 2015 06:41:20 -0700 (PDT) From: Javier Martinez Canillas To: linux-kernel@vger.kernel.org Cc: Javier Martinez Canillas , Rasmus Villemoes , Benson Leung , Dmitry Torokhov , linux-input@vger.kernel.org, Duson Lin Subject: [PATCH 16/18] Input: elan_i2c - simplify function return logic Date: Fri, 2 Oct 2015 15:40:27 +0200 Message-Id: <1443793229-22363-17-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/elan_i2c_smbus.c:402:1-6: WARNING: end returns can be simplified Signed-off-by: Javier Martinez Canillas Reviewed-by: Benson Leung --- drivers/input/mouse/elan_i2c_smbus.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/input/mouse/elan_i2c_smbus.c b/drivers/input/mouse/elan_i2c_smbus.c index cb6aecbc1dc2..e5b0adfac3d0 100644 --- a/drivers/input/mouse/elan_i2c_smbus.c +++ b/drivers/input/mouse/elan_i2c_smbus.c @@ -399,11 +399,7 @@ static int elan_smbus_prepare_fw_update(struct i2c_client *client) return error; /* Reset IC */ - error = elan_smbus_iap_reset(client); - if (error) - return error; - - return 0; + return elan_smbus_iap_reset(client); }