From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933851AbdC3NWS (ORCPT ); Thu, 30 Mar 2017 09:22:18 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35965 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933126AbdC3NWQ (ORCPT ); Thu, 30 Mar 2017 09:22:16 -0400 DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 8A9EF64CC Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=mst@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 8A9EF64CC Date: Thu, 30 Mar 2017 16:22:05 +0300 From: "Michael S. Tsirkin" To: Colin King Cc: "David S . Miller" , Jorgen Hansen , Adit Ranadive , George Zhang , Stefan Hajnoczi , Julia Lawall , netdev@vger.kernel.org, kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH][V2] VSOCK: remove unnecessary ternary operator on return value Message-ID: <20170330162154-mutt-send-email-mst@kernel.org> References: <20170329153355.17525-1-colin.king@canonical.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170329153355.17525-1-colin.king@canonical.com> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Thu, 30 Mar 2017 13:22:10 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Mar 29, 2017 at 04:33:55PM +0100, Colin King wrote: > 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 return the > errno value. > > Detected by CoverityScan, CID#986649 ("Logically Dead Code") > > Signed-off-by: Colin Ian King Acked-by: Michael S. Tsirkin > --- > net/vmw_vsock/vmci_transport.c | 22 +++++++--------------- > 1 file changed, 7 insertions(+), 15 deletions(-) > > diff --git a/net/vmw_vsock/vmci_transport.c b/net/vmw_vsock/vmci_transport.c > index 4be4fbbc0b50..10ae7823a19d 100644 > --- a/net/vmw_vsock/vmci_transport.c > +++ b/net/vmw_vsock/vmci_transport.c > @@ -96,31 +96,23 @@ static int PROTOCOL_OVERRIDE = -1; > > static s32 vmci_transport_error_to_vsock_error(s32 vmci_error) > { > - int err; > - > switch (vmci_error) { > case VMCI_ERROR_NO_MEM: > - err = ENOMEM; > - break; > + return -ENOMEM; > case VMCI_ERROR_DUPLICATE_ENTRY: > case VMCI_ERROR_ALREADY_EXISTS: > - err = EADDRINUSE; > - break; > + return -EADDRINUSE; > case VMCI_ERROR_NO_ACCESS: > - err = EPERM; > - break; > + return -EPERM; > case VMCI_ERROR_NO_RESOURCES: > - err = ENOBUFS; > - break; > + return -ENOBUFS; > case VMCI_ERROR_INVALID_RESOURCE: > - err = EHOSTUNREACH; > - break; > + return -EHOSTUNREACH; > case VMCI_ERROR_INVALID_ARGS: > default: > - err = EINVAL; > + break; > } > - > - return err > 0 ? -err : err; > + return -EINVAL; > } > > static u32 vmci_transport_peer_rid(u32 peer_cid) > -- > 2.11.0