Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754585AbbGXRCM (ORCPT ); Fri, 24 Jul 2015 13:02:12 -0400 Received: from mail-pa0-f43.google.com ([209.85.220.43]:33621 "EHLO mail-pa0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753102AbbGXRCK (ORCPT ); Fri, 24 Jul 2015 13:02:10 -0400 From: Shraddha Barke To: Anton Vorontsov , Colin Cross , Kees Cook , Tony Luck Cc: linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, Shraddha Barke Subject: [PATCH 2756/2756] Staging: acpi: Merge lines for immediate return Date: Fri, 24 Jul 2015 22:30:56 +0530 Message-Id: <1437757256-10228-1-git-send-email-shraddha.6596@gmail.com> X-Mailer: git-send-email 2.1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1691 Lines: 61 This patch merges two lines in a single line if immediate return is found. This is done using Coccinelle.Semantic patch used for this is as follows: @@ expression ret; identifier f; @@ -ret = +return f(...); -return ret; Signed-off-by: Shraddha Barke --- drivers/acpi/apei/erst.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/drivers/acpi/apei/erst.c b/drivers/acpi/apei/erst.c index 3670bba..58e1bdd 100644 --- a/drivers/acpi/apei/erst.c +++ b/drivers/acpi/apei/erst.c @@ -162,8 +162,7 @@ static int erst_exec_add_value(struct apei_exec_context *ctx, if (rc) return rc; val += ctx->value; - rc = __apei_exec_write_register(entry, val); - return rc; + return __apei_exec_write_register(entry, val); } static int erst_exec_subtract_value(struct apei_exec_context *ctx, @@ -176,8 +175,7 @@ static int erst_exec_subtract_value(struct apei_exec_context *ctx, if (rc) return rc; val -= ctx->value; - rc = __apei_exec_write_register(entry, val); - return rc; + return __apei_exec_write_register(entry, val); } static int erst_exec_stall(struct apei_exec_context *ctx, @@ -979,9 +977,7 @@ static int erst_open_pstore(struct pstore_info *psi) if (erst_disable) return -ENODEV; - rc = erst_get_record_id_begin(&reader_pos); - - return rc; + return erst_get_record_id_begin(&reader_pos); } static int erst_close_pstore(struct pstore_info *psi) -- 2.1.0 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/