From: Andrew Scull <ascull@google.com>
To: u-boot@lists.denx.de
Cc: sjg@chromium.org, trini@konsulko.com, bmeng.cn@gmail.com,
Andrew Scull <ascull@google.com>
Subject: [PATCH v3 01/12] virtio_ring: Merge identical variables
Date: Mon, 16 May 2022 10:41:29 +0000 [thread overview]
Message-ID: <20220516104140.1047229-2-ascull@google.com> (raw)
In-Reply-To: <20220516104140.1047229-1-ascull@google.com>
The variables `total_sg` and `descs_used` have the same value. Replace
the few uses of `total_sg` with `descs_used` to simplify the situation.
Signed-off-by: Andrew Scull <ascull@google.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
---
drivers/virtio/virtio_ring.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c
index 7f1cbc5932..a6922ce1b8 100644
--- a/drivers/virtio/virtio_ring.c
+++ b/drivers/virtio/virtio_ring.c
@@ -20,17 +20,16 @@ int virtqueue_add(struct virtqueue *vq, struct virtio_sg *sgs[],
unsigned int out_sgs, unsigned int in_sgs)
{
struct vring_desc *desc;
- unsigned int total_sg = out_sgs + in_sgs;
- unsigned int i, n, avail, descs_used, uninitialized_var(prev);
+ unsigned int descs_used = out_sgs + in_sgs;
+ unsigned int i, n, avail, uninitialized_var(prev);
int head;
- WARN_ON(total_sg == 0);
+ WARN_ON(descs_used == 0);
head = vq->free_head;
desc = vq->vring.desc;
i = head;
- descs_used = total_sg;
if (vq->num_free < descs_used) {
debug("Can't add buf len %i - avail = %i\n",
--
2.36.0.550.gb090851708-goog
next prev parent reply other threads:[~2022-05-16 10:42 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-16 10:41 [PATCH v3 00/12] virtio: Harden and test vring Andrew Scull
2022-05-16 10:41 ` Andrew Scull [this message]
2022-06-08 17:25 ` [PATCH v3 01/12] virtio_ring: Merge identical variables Tom Rini
2022-05-16 10:41 ` [PATCH v3 02/12] virtio_ring: Add helper to attach vring descriptor Andrew Scull
2022-05-16 10:41 ` [PATCH v3 03/12] virtio_ring: Maintain a shadow copy of descriptors Andrew Scull
2022-05-16 10:41 ` [PATCH v3 04/12] virtio_ring: Check used descriptors are chain heads Andrew Scull
2022-05-16 10:41 ` [PATCH v3 05/12] dm: test: virtio: Test the virtio ring Andrew Scull
2022-05-16 10:41 ` [PATCH v3 06/12] virtio: sandbox: Fix device features bitfield Andrew Scull
2022-05-16 10:41 ` [PATCH v3 07/12] test: dm: virtio: Test notify before del_vqs Andrew Scull
2022-05-16 10:41 ` [PATCH v3 08/12] test: dm: virtio: Split out virtio device tests Andrew Scull
2022-05-16 10:41 ` [PATCH v3 09/12] virtio: sandbox: Bind RNG rather than block device Andrew Scull
2022-05-16 10:41 ` [PATCH v3 10/12] test: dm: virtio: Test virtio device driver probing Andrew Scull
2022-05-16 10:41 ` [PATCH v3 11/12] virtio: rng: Check length before copying Andrew Scull
2022-05-16 10:41 ` [PATCH v3 12/12] test: dm: virtio_rng: Test virtio-rng with faked device Andrew Scull
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220516104140.1047229-2-ascull@google.com \
--to=ascull@google.com \
--cc=bmeng.cn@gmail.com \
--cc=sjg@chromium.org \
--cc=trini@konsulko.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox