OSDN Git Service

VSOCK: remove unnecessary ternary operator on return value
authorColin Ian King <colin.king@canonical.com>
Wed, 29 Mar 2017 15:33:55 +0000 (16:33 +0100)
committerDavid S. Miller <davem@davemloft.net>
Thu, 30 Mar 2017 18:07:08 +0000 (11:07 -0700)
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>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Jorgen Hansen <jhansen@vmware.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/vmw_vsock/vmci_transport.c

index 4be4fbb..10ae782 100644 (file)
@@ -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)