Skip to content

Commit

Permalink
virtio: rpmsg: make it clear that virtqueue_add_buf() no longer retur…
Browse files Browse the repository at this point in the history
…ns > 0

We simplified virtqueue_add_buf(), make it clear in the callers.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
  • Loading branch information
Rusty Russell committed Dec 18, 2012
1 parent 0e3daa6 commit 57e1a37
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions drivers/rpmsg/virtio_rpmsg_bus.c
Original file line number Diff line number Diff line change
Expand Up @@ -764,7 +764,7 @@ int rpmsg_send_offchannel_raw(struct rpmsg_channel *rpdev, u32 src, u32 dst,

/* add message to the remote processor's virtqueue */
err = virtqueue_add_buf(vrp->svq, &sg, 1, 0, msg, GFP_KERNEL);
if (err < 0) {
if (err) {
/*
* need to reclaim the buffer here, otherwise it's lost
* (memory won't leak, but rpmsg won't use it again for TX).
Expand All @@ -776,8 +776,6 @@ int rpmsg_send_offchannel_raw(struct rpmsg_channel *rpdev, u32 src, u32 dst,

/* tell the remote processor it has a pending message to read */
virtqueue_kick(vrp->svq);

err = 0;
out:
mutex_unlock(&vrp->tx_lock);
return err;
Expand Down Expand Up @@ -980,7 +978,7 @@ static int rpmsg_probe(struct virtio_device *vdev)

err = virtqueue_add_buf(vrp->rvq, &sg, 0, 1, cpu_addr,
GFP_KERNEL);
WARN_ON(err < 0); /* sanity check; this can't really happen */
WARN_ON(err); /* sanity check; this can't really happen */
}

/* suppress "tx-complete" interrupts */
Expand Down

0 comments on commit 57e1a37

Please sign in to comment.