From patchwork Tue Mar 28 15:54:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colin Ian King X-Patchwork-Id: 744382 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3vswTW60fYz9ryT for ; Wed, 29 Mar 2017 02:55:27 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752716AbdC1Pyu (ORCPT ); Tue, 28 Mar 2017 11:54:50 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:41818 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751921AbdC1Pyt (ORCPT ); Tue, 28 Mar 2017 11:54:49 -0400 Received: from 1.general.cking.uk.vpn ([10.172.193.212] helo=localhost) by youngberry.canonical.com with esmtpsa (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1cstRw-0004JY-TS; Tue, 28 Mar 2017 15:54:25 +0000 From: Colin King To: "David S . Miller" , Jorgen Hansen , Adit Ranadive , Julia Lawall , Stefan Hajnoczi , netdev@vger.kernel.org Cc: kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] VSOCK: remove unnecessary ternary operator on return value Date: Tue, 28 Mar 2017 16:54:24 +0100 Message-Id: <20170328155424.22873-1-colin.king@canonical.com> X-Mailer: git-send-email 2.11.0 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Colin Ian King Rather than assign the positive errno values to ret and then checking if it is positive and flip the sign, just set ret to be the -ve errno value. Detected by CoverityScan, CID#986649 ("Logically Dead Code") Signed-off-by: Colin Ian King --- net/vmw_vsock/vmci_transport.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/net/vmw_vsock/vmci_transport.c b/net/vmw_vsock/vmci_transport.c index 4be4fbbc0b50..a68cd6b0fb72 100644 --- a/net/vmw_vsock/vmci_transport.c +++ b/net/vmw_vsock/vmci_transport.c @@ -100,27 +100,27 @@ static s32 vmci_transport_error_to_vsock_error(s32 vmci_error) switch (vmci_error) { case VMCI_ERROR_NO_MEM: - err = ENOMEM; + err = -ENOMEM; break; case VMCI_ERROR_DUPLICATE_ENTRY: case VMCI_ERROR_ALREADY_EXISTS: - err = EADDRINUSE; + err = -EADDRINUSE; break; case VMCI_ERROR_NO_ACCESS: - err = EPERM; + err = -EPERM; break; case VMCI_ERROR_NO_RESOURCES: - err = ENOBUFS; + err = -ENOBUFS; break; case VMCI_ERROR_INVALID_RESOURCE: - err = EHOSTUNREACH; + err = -EHOSTUNREACH; break; case VMCI_ERROR_INVALID_ARGS: default: - err = EINVAL; + err = -EINVAL; } - return err > 0 ? -err : err; + return err; } static u32 vmci_transport_peer_rid(u32 peer_cid)