diff options
Diffstat (limited to 'drivers/rpmsg')
-rw-r--r-- | drivers/rpmsg/virtio_rpmsg_bus.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/rpmsg/virtio_rpmsg_bus.c b/drivers/rpmsg/virtio_rpmsg_bus.c index 257683e7fe8a..8980ac2cc546 100644 --- a/drivers/rpmsg/virtio_rpmsg_bus.c +++ b/drivers/rpmsg/virtio_rpmsg_bus.c | |||
@@ -720,14 +720,14 @@ int rpmsg_send_offchannel_raw(struct rpmsg_channel *rpdev, u32 src, u32 dst, | |||
720 | mutex_lock(&vrp->tx_lock); | 720 | mutex_lock(&vrp->tx_lock); |
721 | 721 | ||
722 | /* add message to the remote processor's virtqueue */ | 722 | /* add message to the remote processor's virtqueue */ |
723 | err = virtqueue_add_buf_gfp(vrp->svq, &sg, 1, 0, msg, GFP_KERNEL); | 723 | err = virtqueue_add_buf(vrp->svq, &sg, 1, 0, msg, GFP_KERNEL); |
724 | if (err < 0) { | 724 | if (err < 0) { |
725 | /* | 725 | /* |
726 | * need to reclaim the buffer here, otherwise it's lost | 726 | * need to reclaim the buffer here, otherwise it's lost |
727 | * (memory won't leak, but rpmsg won't use it again for TX). | 727 | * (memory won't leak, but rpmsg won't use it again for TX). |
728 | * this will wait for a buffer management overhaul. | 728 | * this will wait for a buffer management overhaul. |
729 | */ | 729 | */ |
730 | dev_err(dev, "virtqueue_add_buf_gfp failed: %d\n", err); | 730 | dev_err(dev, "virtqueue_add_buf failed: %d\n", err); |
731 | goto out; | 731 | goto out; |
732 | } | 732 | } |
733 | 733 | ||
@@ -777,7 +777,7 @@ static void rpmsg_recv_done(struct virtqueue *rvq) | |||
777 | sg_init_one(&sg, msg, sizeof(*msg) + len); | 777 | sg_init_one(&sg, msg, sizeof(*msg) + len); |
778 | 778 | ||
779 | /* add the buffer back to the remote processor's virtqueue */ | 779 | /* add the buffer back to the remote processor's virtqueue */ |
780 | err = virtqueue_add_buf_gfp(vrp->rvq, &sg, 0, 1, msg, GFP_KERNEL); | 780 | err = virtqueue_add_buf(vrp->rvq, &sg, 0, 1, msg, GFP_KERNEL); |
781 | if (err < 0) { | 781 | if (err < 0) { |
782 | dev_err(dev, "failed to add a virtqueue buffer: %d\n", err); | 782 | dev_err(dev, "failed to add a virtqueue buffer: %d\n", err); |
783 | return; | 783 | return; |
@@ -907,7 +907,7 @@ static int rpmsg_probe(struct virtio_device *vdev) | |||
907 | 907 | ||
908 | sg_init_one(&sg, cpu_addr, RPMSG_BUF_SIZE); | 908 | sg_init_one(&sg, cpu_addr, RPMSG_BUF_SIZE); |
909 | 909 | ||
910 | err = virtqueue_add_buf_gfp(vrp->rvq, &sg, 0, 1, cpu_addr, | 910 | err = virtqueue_add_buf(vrp->rvq, &sg, 0, 1, cpu_addr, |
911 | GFP_KERNEL); | 911 | GFP_KERNEL); |
912 | WARN_ON(err < 0); /* sanity check; this can't really happen */ | 912 | WARN_ON(err < 0); /* sanity check; this can't really happen */ |
913 | } | 913 | } |