Skip to content

Commit

Permalink
VSOCK: remove unnecessary ternary operator on return value
Browse files Browse the repository at this point in the history
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 <[email protected]>
Reviewed-by: Stefan Hajnoczi <[email protected]>
Reviewed-by: Jorgen Hansen <[email protected]>
Acked-by: Michael S. Tsirkin <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
  • Loading branch information
Colin Ian King authored and davem330 committed Mar 30, 2017
1 parent 282ccf6 commit ed8bfd5
Showing 1 changed file with 7 additions and 15 deletions.
22 changes: 7 additions & 15 deletions net/vmw_vsock/vmci_transport.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit ed8bfd5

Please sign in to comment.