From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1030327AbaEQSYY (ORCPT ); Sat, 17 May 2014 14:24:24 -0400 Received: from mail-wi0-f181.google.com ([209.85.212.181]:37937 "EHLO mail-wi0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1030236AbaEQSYX (ORCPT ); Sat, 17 May 2014 14:24:23 -0400 From: Peter Senna Tschudin To: linux-kernel@vger.kernel.org Cc: Peter Senna Tschudin , kernel-janitors@vger.kernel.org Subject: [PATCH 1/4] VMCI: Remove redundant error check Date: Sat, 17 May 2014 20:22:57 +0200 Message-Id: <1400350980-30455-1-git-send-email-peter.senna@gmail.com> X-Mailer: git-send-email 1.8.3.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Remove double checks, and move the call to pr_devel to the first check. The simplified version of the coccinelle semantic patch that fixes this issue is as follows: // @@ expression E; identifier pr; expression list es; @@ for(...;...;...){ ... - if (E) break; + if (E){ + pr(es); + break; + } ... } - if(E) pr(es); // Tested by compilation only. Signed-off-by: Peter Senna Tschudin --- drivers/misc/vmw_vmci/vmci_context.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/misc/vmw_vmci/vmci_context.c b/drivers/misc/vmw_vmci/vmci_context.c index f866a4b..3995e64 100644 --- a/drivers/misc/vmw_vmci/vmci_context.c +++ b/drivers/misc/vmw_vmci/vmci_context.c @@ -836,12 +836,12 @@ int vmci_ctx_set_chkpt_state(u32 context_id, for (i = 0; i < num_ids && result == VMCI_SUCCESS; i++) { current_id = ((u32 *)cpt_buf)[i]; result = vmci_ctx_add_notification(context_id, current_id); - if (result != VMCI_SUCCESS) + if (result != VMCI_SUCCESS) { + pr_devel("Failed to set cpt state (type=%d) (error=%d)\n", + cpt_type, result); break; + } } - if (result != VMCI_SUCCESS) - pr_devel("Failed to set cpt state (type=%d) (error=%d)\n", - cpt_type, result); return result; }