From a14988b460924de49bf4a7b61a5e643602ee39d8 Mon Sep 17 00:00:00 2001 From: Michalis Pappas Date: Mon, 25 Sep 2023 16:09:19 +0200 Subject: [PATCH] drivers/virtio/blk: Remove unused warnings When building without assertions some arguments and variables are not used. This commit adds respective attributes to solve the warning. Signed-off-by: Marc Rittinghaus Reviewed-by: Michalis Pappas Reviewed-by: Andrei Topala Reviewed-by: Marco Schlumpp Approved-by: Razvan Deaconescu GitHub-Closes: #1115 --- drivers/virtio/blk/virtio_blk.c | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/drivers/virtio/blk/virtio_blk.c b/drivers/virtio/blk/virtio_blk.c index d3e8b94da..ef9ac0083 100644 --- a/drivers/virtio/blk/virtio_blk.c +++ b/drivers/virtio/blk/virtio_blk.c @@ -334,16 +334,15 @@ out: return rc; } -static int virtio_blkdev_submit_request(struct uk_blkdev *dev, - struct uk_blkdev_queue *queue, - struct uk_blkreq *req) +static int virtio_blkdev_submit_request(struct uk_blkdev *dev __unused, + struct uk_blkdev_queue *queue, + struct uk_blkreq *req) { int rc = 0; int status = 0x0; UK_ASSERT(req); UK_ASSERT(queue); - UK_ASSERT(dev); rc = virtio_blkdev_queue_enqueue(queue, req); if (likely(rc >= 0)) { @@ -405,14 +404,12 @@ out: return ret; } -static int virtio_blkdev_complete_reqs(struct uk_blkdev *dev, - struct uk_blkdev_queue *queue) +static int virtio_blkdev_complete_reqs(struct uk_blkdev *dev __unused, + struct uk_blkdev_queue *queue) { struct uk_blkreq *req; int rc = 0; - UK_ASSERT(dev); - /* Queue interrupts have to be off when calling receive */ UK_ASSERT(!(queue->intr_enabled & VTBLK_INTR_EN)); @@ -462,13 +459,11 @@ static int virtio_blkdev_recv_done(struct virtqueue *vq, void *priv) return 1; } -static int virtio_blkdev_queue_intr_enable(struct uk_blkdev *dev, - struct uk_blkdev_queue *queue) +static int virtio_blkdev_queue_intr_enable(struct uk_blkdev *dev __unused, + struct uk_blkdev_queue *queue) { int rc = 0; - UK_ASSERT(dev); - /* If the interrupt is enabled */ if (queue->intr_enabled & VTBLK_INTR_EN) return 0; @@ -486,10 +481,9 @@ static int virtio_blkdev_queue_intr_enable(struct uk_blkdev *dev, return rc; } -static int virtio_blkdev_queue_intr_disable(struct uk_blkdev *dev, - struct uk_blkdev_queue *queue) +static int virtio_blkdev_queue_intr_disable(struct uk_blkdev *dev __unused, + struct uk_blkdev_queue *queue) { - UK_ASSERT(dev); UK_ASSERT(queue); virtqueue_intr_disable(queue->vq); -- 2.39.5