| Message ID | 20210905085717.7427-1-mgurtovoy@nvidia.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2,1/1] virtio-blk: remove unneeded "likely" statements | expand |
On 9/5/2021 1:57 AM, Max Gurtovoy wrote: > Usually we use "likely/unlikely" to optimize the fast path. Remove > redundant "likely/unlikely" statements in the control path to simplify > the code and make it easier to read. > > Reviewed-by: Stefan Hajnoczi<stefanha@redhat.com> > Signed-off-by: Max Gurtovoy<mgurtovoy@nvidia.com> Reviewed-by: Chaitanya Kulkarni <ckulkarnilinux@gmail.com>
> Usually we use "likely/unlikely" to optimize the fast path. Remove > redundant "likely/unlikely" statements in the control path to simplify > the code and make it easier to read. > > Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com> > Signed-off-by: Max Gurtovoy <mgurtovoy@nvidia.com> > --- > > changes from v1: > - added "Reviewed-by" (Stefan) > - commit description update (Stefan) > > --- > drivers/block/virtio_blk.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c > index afb37aac09e8..e574fbf5e6df 100644 > --- a/drivers/block/virtio_blk.c > +++ b/drivers/block/virtio_blk.c > @@ -765,7 +765,7 @@ static int virtblk_probe(struct virtio_device *vdev) > goto out_free_vblk; > > /* Default queue sizing is to fill the ring. */ > - if (likely(!virtblk_queue_depth)) { > + if (!virtblk_queue_depth) { > queue_depth = vblk->vqs[0].vq->num_free; > /* ... but without indirect descs, we use 2 descs per req */ > if (!virtio_has_feature(vdev, VIRTIO_RING_F_INDIRECT_DESC)) > @@ -839,7 +839,7 @@ static int virtblk_probe(struct virtio_device *vdev) > else > blk_size = queue_logical_block_size(q); > > - if (unlikely(blk_size < SECTOR_SIZE || blk_size > PAGE_SIZE)) { > + if (blk_size < SECTOR_SIZE || blk_size > PAGE_SIZE) { > dev_err(&vdev->dev, > "block size is changed unexpectedly, now is %u\n", > blk_size); > -- Reviewed-by: Pankaj Gupta <pankaj.gupta@ionos.com>
diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c index afb37aac09e8..e574fbf5e6df 100644 --- a/drivers/block/virtio_blk.c +++ b/drivers/block/virtio_blk.c @@ -765,7 +765,7 @@ static int virtblk_probe(struct virtio_device *vdev) goto out_free_vblk; /* Default queue sizing is to fill the ring. */ - if (likely(!virtblk_queue_depth)) { + if (!virtblk_queue_depth) { queue_depth = vblk->vqs[0].vq->num_free; /* ... but without indirect descs, we use 2 descs per req */ if (!virtio_has_feature(vdev, VIRTIO_RING_F_INDIRECT_DESC)) @@ -839,7 +839,7 @@ static int virtblk_probe(struct virtio_device *vdev) else blk_size = queue_logical_block_size(q); - if (unlikely(blk_size < SECTOR_SIZE || blk_size > PAGE_SIZE)) { + if (blk_size < SECTOR_SIZE || blk_size > PAGE_SIZE) { dev_err(&vdev->dev, "block size is changed unexpectedly, now is %u\n", blk_size);