From patchwork Fri Oct 2 13:40:23 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: 7316131 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 0DC539F1B9 for ; Fri, 2 Oct 2015 13:43:41 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3FEA2208E4 for ; Fri, 2 Oct 2015 13:43:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 630E1208DE for ; Fri, 2 Oct 2015 13:43:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752881AbbJBNnW (ORCPT ); Fri, 2 Oct 2015 09:43:22 -0400 Received: from lists.s-osg.org ([54.187.51.154]:46999 "EHLO lists.s-osg.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753888AbbJBNlN (ORCPT ); Fri, 2 Oct 2015 09:41:13 -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 83DC54632A; Fri, 2 Oct 2015 06:41:11 -0700 (PDT) From: Javier Martinez Canillas To: linux-kernel@vger.kernel.org Cc: Javier Martinez Canillas , Rob Herring , Pramod Gurav , Wolfram Sang , Dmitry Torokhov , linux-input@vger.kernel.org, Dan Carpenter Subject: [PATCH 12/18] Input: pxa27x_keypad - simplify function return logic Date: Fri, 2 Oct 2015 15:40:23 +0200 Message-Id: <1443793229-22363-13-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/keyboard/pxa27x_keypad.c:141:1-6: WARNING: end returns can be simplified Signed-off-by: Javier Martinez Canillas --- drivers/input/keyboard/pxa27x_keypad.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/drivers/input/keyboard/pxa27x_keypad.c b/drivers/input/keyboard/pxa27x_keypad.c index fcef5d1365e2..436e8c2efbe5 100644 --- a/drivers/input/keyboard/pxa27x_keypad.c +++ b/drivers/input/keyboard/pxa27x_keypad.c @@ -138,14 +138,10 @@ static int pxa27x_keypad_matrix_key_parse_dt(struct pxa27x_keypad *keypad, pdata->matrix_key_rows = rows; pdata->matrix_key_cols = cols; - error = matrix_keypad_build_keymap(NULL, NULL, - pdata->matrix_key_rows, - pdata->matrix_key_cols, - keypad->keycodes, input_dev); - if (error) - return error; - - return 0; + return matrix_keypad_build_keymap(NULL, NULL, + pdata->matrix_key_rows, + pdata->matrix_key_cols, + keypad->keycodes, input_dev); } static int pxa27x_keypad_direct_key_parse_dt(struct pxa27x_keypad *keypad,