drivers/vdpa/vdpa_sim/vdpa_sim.c:92:6: warning:
variable ?ret? set but not used [-Wunused-but-set-variable]
Signed-off-by: YueHaibing <yuehaibing at huawei.com>
---
drivers/vdpa/vdpa_sim/vdpa_sim.c | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/drivers/vdpa/vdpa_sim/vdpa_sim.c b/drivers/vdpa/vdpa_sim/vdpa_sim.c
index 7957d2d41fc4..01c456f7c1f7 100644
--- a/drivers/vdpa/vdpa_sim/vdpa_sim.c
+++ b/drivers/vdpa/vdpa_sim/vdpa_sim.c
@@ -89,15 +89,14 @@ static struct vdpasim *dev_to_sim(struct device *dev)
static void vdpasim_queue_ready(struct vdpasim *vdpasim, unsigned int idx)
{
struct vdpasim_virtqueue *vq = &vdpasim->vqs[idx];
- int ret;
- ret = vringh_init_iotlb(&vq->vring, vdpasim_features,
- VDPASIM_QUEUE_MAX, false,
- (struct vring_desc *)(uintptr_t)vq->desc_addr,
- (struct vring_avail *)
- (uintptr_t)vq->driver_addr,
- (struct vring_used *)
- (uintptr_t)vq->device_addr);
+ vringh_init_iotlb(&vq->vring, vdpasim_features,
+ VDPASIM_QUEUE_MAX, false,
+ (struct vring_desc *)(uintptr_t)vq->desc_addr,
+ (struct vring_avail *)
+ (uintptr_t)vq->driver_addr,
+ (struct vring_used *)
+ (uintptr_t)vq->device_addr);
}
static void vdpasim_vq_reset(struct vdpasim_virtqueue *vq)
--
2.17.1
Michael S. Tsirkin
2020-May-06 00:35 UTC
[PATCH -next] vdpasim: remove unused variable 'ret'
On Fri, Apr 10, 2020 at 07:54:22PM +0800, YueHaibing wrote:> drivers/vdpa/vdpa_sim/vdpa_sim.c:92:6: warning: > variable ?ret? set but not used [-Wunused-but-set-variable] > > Signed-off-by: YueHaibing <yuehaibing at huawei.com> > ---Either this, or BUG_ON. Jason?> drivers/vdpa/vdpa_sim/vdpa_sim.c | 15 +++++++-------- > 1 file changed, 7 insertions(+), 8 deletions(-) > > diff --git a/drivers/vdpa/vdpa_sim/vdpa_sim.c b/drivers/vdpa/vdpa_sim/vdpa_sim.c > index 7957d2d41fc4..01c456f7c1f7 100644 > --- a/drivers/vdpa/vdpa_sim/vdpa_sim.c > +++ b/drivers/vdpa/vdpa_sim/vdpa_sim.c > @@ -89,15 +89,14 @@ static struct vdpasim *dev_to_sim(struct device *dev) > static void vdpasim_queue_ready(struct vdpasim *vdpasim, unsigned int idx) > { > struct vdpasim_virtqueue *vq = &vdpasim->vqs[idx]; > - int ret; > > - ret = vringh_init_iotlb(&vq->vring, vdpasim_features, > - VDPASIM_QUEUE_MAX, false, > - (struct vring_desc *)(uintptr_t)vq->desc_addr, > - (struct vring_avail *) > - (uintptr_t)vq->driver_addr, > - (struct vring_used *) > - (uintptr_t)vq->device_addr); > + vringh_init_iotlb(&vq->vring, vdpasim_features, > + VDPASIM_QUEUE_MAX, false, > + (struct vring_desc *)(uintptr_t)vq->desc_addr, > + (struct vring_avail *) > + (uintptr_t)vq->driver_addr, > + (struct vring_used *) > + (uintptr_t)vq->device_addr); > } > > static void vdpasim_vq_reset(struct vdpasim_virtqueue *vq) > -- > 2.17.1 >
On 2020/5/6 ??8:35, Michael S. Tsirkin wrote:> On Fri, Apr 10, 2020 at 07:54:22PM +0800, YueHaibing wrote: >> drivers/vdpa/vdpa_sim/vdpa_sim.c:92:6: warning: >> variable ?ret? set but not used [-Wunused-but-set-variable] >> >> Signed-off-by: YueHaibing <yuehaibing at huawei.com> >> --- > Either this, or BUG_ON. Jason?BUG_ON seems too aggressive. So I prefer this patch. Acked-by: Jason Wang <jasowang at redhat.com>> >> drivers/vdpa/vdpa_sim/vdpa_sim.c | 15 +++++++-------- >> 1 file changed, 7 insertions(+), 8 deletions(-) >> >> diff --git a/drivers/vdpa/vdpa_sim/vdpa_sim.c b/drivers/vdpa/vdpa_sim/vdpa_sim.c >> index 7957d2d41fc4..01c456f7c1f7 100644 >> --- a/drivers/vdpa/vdpa_sim/vdpa_sim.c >> +++ b/drivers/vdpa/vdpa_sim/vdpa_sim.c >> @@ -89,15 +89,14 @@ static struct vdpasim *dev_to_sim(struct device *dev) >> static void vdpasim_queue_ready(struct vdpasim *vdpasim, unsigned int idx) >> { >> struct vdpasim_virtqueue *vq = &vdpasim->vqs[idx]; >> - int ret; >> >> - ret = vringh_init_iotlb(&vq->vring, vdpasim_features, >> - VDPASIM_QUEUE_MAX, false, >> - (struct vring_desc *)(uintptr_t)vq->desc_addr, >> - (struct vring_avail *) >> - (uintptr_t)vq->driver_addr, >> - (struct vring_used *) >> - (uintptr_t)vq->device_addr); >> + vringh_init_iotlb(&vq->vring, vdpasim_features, >> + VDPASIM_QUEUE_MAX, false, >> + (struct vring_desc *)(uintptr_t)vq->desc_addr, >> + (struct vring_avail *) >> + (uintptr_t)vq->driver_addr, >> + (struct vring_used *) >> + (uintptr_t)vq->device_addr); >> } >> >> static void vdpasim_vq_reset(struct vdpasim_virtqueue *vq) >> -- >> 2.17.1 >>