Its dev parameter is not even used, so remove it. Signed-off-by: Jason Wang <jasowang@xxxxxxxxxx> --- drivers/vhost/net.c | 8 ++++---- drivers/vhost/vhost.c | 2 +- drivers/vhost/vhost.h | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c index 3beb401235c0..7d34e8cbc89b 100644 --- a/drivers/vhost/net.c +++ b/drivers/vhost/net.c @@ -498,7 +498,7 @@ static int sock_has_rx_data(struct socket *sock) static void vhost_net_busy_poll_try_queue(struct vhost_net *net, struct vhost_virtqueue *vq) { - if (!vhost_vq_avail_empty(&net->dev, vq)) { + if (!vhost_vq_avail_empty(vq)) { vhost_poll_queue(&vq->poll); } else if (unlikely(vhost_enable_notify(&net->dev, vq))) { vhost_disable_notify(&net->dev, vq); @@ -540,8 +540,8 @@ static void vhost_net_busy_poll(struct vhost_net *net, } if ((sock_has_rx_data(sock) && - !vhost_vq_avail_empty(&net->dev, rvq)) || - !vhost_vq_avail_empty(&net->dev, tvq)) + !vhost_vq_avail_empty(rvq)) || + !vhost_vq_avail_empty(tvq)) break; cpu_relax(); @@ -638,7 +638,7 @@ static int get_tx_bufs(struct vhost_net *net, static bool tx_can_batch(struct vhost_virtqueue *vq, size_t total_len) { return total_len < VHOST_NET_WEIGHT && - !vhost_vq_avail_empty(vq->dev, vq); + !vhost_vq_avail_empty(vq); } #define SKB_FRAG_PAGE_ORDER get_order(32768) diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c index 7f51c74d9aee..ec3534bcd51b 100644 --- a/drivers/vhost/vhost.c +++ b/drivers/vhost/vhost.c @@ -2946,7 +2946,7 @@ void vhost_add_used_and_signal_n(struct vhost_dev *dev, EXPORT_SYMBOL_GPL(vhost_add_used_and_signal_n); /* return true if we're sure that avaiable ring is empty */ -bool vhost_vq_avail_empty(struct vhost_dev *dev, struct vhost_virtqueue *vq) +bool vhost_vq_avail_empty(struct vhost_virtqueue *vq) { __virtio16 avail_idx; int r; diff --git a/drivers/vhost/vhost.h b/drivers/vhost/vhost.h index 819296332913..e0451c900177 100644 --- a/drivers/vhost/vhost.h +++ b/drivers/vhost/vhost.h @@ -247,7 +247,7 @@ void vhost_add_used_and_signal_n(struct vhost_dev *, struct vhost_virtqueue *, struct vring_used_elem *heads, unsigned count); void vhost_signal(struct vhost_dev *, struct vhost_virtqueue *); void vhost_disable_notify(struct vhost_dev *, struct vhost_virtqueue *); -bool vhost_vq_avail_empty(struct vhost_dev *, struct vhost_virtqueue *); +bool vhost_vq_avail_empty(struct vhost_virtqueue *vq); bool vhost_enable_notify(struct vhost_dev *, struct vhost_virtqueue *); int vhost_log_write(struct vhost_virtqueue *vq, struct vhost_log *log, -- 2.18.1 _______________________________________________ Virtualization mailing list Virtualization@xxxxxxxxxxxxxxxxxxxxxxxxxx https://lists.linuxfoundation.org/mailman/listinfo/virtualization