Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1612073

[PATCH][V2] VSOCK: remove unnecessary ternary operator on return value

Show all headers | View raw

From: Colin Ian King <colin.king@canonical.com>

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 <colin.king@canonical.com>
---
 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

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH][V2] VSOCK: remove unnecessary ternary operator on return value Colin King <colin.king@canonical.com> - 2017-03-29 17:40 +0200
  Re: [PATCH][V2] VSOCK: remove unnecessary ternary operator on return  value Stefan Hajnoczi <stefanha@redhat.com> - 2017-03-29 20:40 +0200
  Re: [PATCH][V2] VSOCK: remove unnecessary ternary operator on return  value "Jorgen S. Hansen" <jhansen@vmware.com> - 2017-03-30 15:20 +0200
  Re: [PATCH][V2] VSOCK: remove unnecessary ternary operator on return  value "Michael S. Tsirkin" <mst@redhat.com> - 2017-03-30 15:30 +0200
  Re: [PATCH][V2] VSOCK: remove unnecessary ternary operator on  return value David Miller <davem@davemloft.net> - 2017-03-30 20:20 +0200

csiph-web