From: Dan Carpenter <dan.carpenter@oracle.com>
To: Neal Liu <neal_liu@aspeedtech.com>
Cc: Felipe Balbi <balbi@kernel.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Joel Stanley <joel@jms.id.au>, Andrew Jeffery <andrew@aj.id.au>,
linux-aspeed@lists.ozlabs.org, linux-usb@vger.kernel.org,
kernel-janitors@vger.kernel.org
Subject: [PATCH 1/2] usb: gadget: aspeed_udc: cleanup loop in ast_dma_descriptor_setup()
Date: Sat, 18 Jun 2022 11:54:20 +0300 [thread overview]
Message-ID: <Yq2SvM2bbrtSd1H9@kili> (raw)
The "chunk >= 0" condition does not work because count is a u32.
Also, really we shouldn't enter the loop when "chunk" is zero.
Once that condition is fixed then there is no need for the "last"
variable. I reversed the "if (chunk <= ep->chunk_max)" as well.
The new loop is much simpler.
Fixes: 055276c13205 ("usb: gadget: add Aspeed ast2600 udc driver")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
drivers/usb/gadget/udc/aspeed_udc.c | 24 +++++++++++-------------
1 file changed, 11 insertions(+), 13 deletions(-)
diff --git a/drivers/usb/gadget/udc/aspeed_udc.c b/drivers/usb/gadget/udc/aspeed_udc.c
index 1fc15228ff15..77376ae04224 100644
--- a/drivers/usb/gadget/udc/aspeed_udc.c
+++ b/drivers/usb/gadget/udc/aspeed_udc.c
@@ -476,8 +476,8 @@ static int ast_dma_descriptor_setup(struct ast_udc_ep *ep, u32 dma_buf,
{
struct ast_udc_dev *udc = ep->udc;
struct device *dev = &udc->pdev->dev;
- u32 offset, chunk;
- int count, last;
+ int chunk, count;
+ u32 offset;
if (!ep->descs) {
dev_warn(dev, "%s: Empty DMA descs list failure\n",
@@ -486,30 +486,28 @@ static int ast_dma_descriptor_setup(struct ast_udc_ep *ep, u32 dma_buf,
}
chunk = tx_len;
- offset = count = last = 0;
+ offset = count = 0;
EP_DBG(ep, "req @%p, %s:%d, %s:0x%x, %s:0x%x\n", req,
"wptr", ep->descs_wptr, "dma_buf", dma_buf,
"tx_len", tx_len);
/* Create Descriptor Lists */
- while (chunk >= 0 && !last && count < AST_UDC_DESCS_COUNT) {
+ while (chunk > 0 && count < AST_UDC_DESCS_COUNT) {
ep->descs[ep->descs_wptr].des_0 = dma_buf + offset;
- if (chunk <= ep->chunk_max) {
- ep->descs[ep->descs_wptr].des_1 = chunk;
- last = 1;
- } else {
+ if (chunk > ep->chunk_max)
ep->descs[ep->descs_wptr].des_1 = ep->chunk_max;
- chunk -= ep->chunk_max;
- }
+ else
+ ep->descs[ep->descs_wptr].des_1 = chunk;
+
+ chunk -= ep->chunk_max;
- EP_DBG(ep, "descs[%d]: 0x%x 0x%x, last:%d\n",
+ EP_DBG(ep, "descs[%d]: 0x%x 0x%x\n",
ep->descs_wptr,
ep->descs[ep->descs_wptr].des_0,
- ep->descs[ep->descs_wptr].des_1,
- last);
+ ep->descs[ep->descs_wptr].des_1);
if (count == 0)
req->saved_dma_wptr = ep->descs_wptr;
--
2.35.1
WARNING: multiple messages have this Message-ID (diff)
From: Dan Carpenter <dan.carpenter@oracle.com>
To: linux-aspeed@lists.ozlabs.org
Subject: [PATCH 1/2] usb: gadget: aspeed_udc: cleanup loop in ast_dma_descriptor_setup()
Date: Sat, 18 Jun 2022 11:54:20 +0300 [thread overview]
Message-ID: <Yq2SvM2bbrtSd1H9@kili> (raw)
The "chunk >= 0" condition does not work because count is a u32.
Also, really we shouldn't enter the loop when "chunk" is zero.
Once that condition is fixed then there is no need for the "last"
variable. I reversed the "if (chunk <= ep->chunk_max)" as well.
The new loop is much simpler.
Fixes: 055276c13205 ("usb: gadget: add Aspeed ast2600 udc driver")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
drivers/usb/gadget/udc/aspeed_udc.c | 24 +++++++++++-------------
1 file changed, 11 insertions(+), 13 deletions(-)
diff --git a/drivers/usb/gadget/udc/aspeed_udc.c b/drivers/usb/gadget/udc/aspeed_udc.c
index 1fc15228ff15..77376ae04224 100644
--- a/drivers/usb/gadget/udc/aspeed_udc.c
+++ b/drivers/usb/gadget/udc/aspeed_udc.c
@@ -476,8 +476,8 @@ static int ast_dma_descriptor_setup(struct ast_udc_ep *ep, u32 dma_buf,
{
struct ast_udc_dev *udc = ep->udc;
struct device *dev = &udc->pdev->dev;
- u32 offset, chunk;
- int count, last;
+ int chunk, count;
+ u32 offset;
if (!ep->descs) {
dev_warn(dev, "%s: Empty DMA descs list failure\n",
@@ -486,30 +486,28 @@ static int ast_dma_descriptor_setup(struct ast_udc_ep *ep, u32 dma_buf,
}
chunk = tx_len;
- offset = count = last = 0;
+ offset = count = 0;
EP_DBG(ep, "req @%p, %s:%d, %s:0x%x, %s:0x%x\n", req,
"wptr", ep->descs_wptr, "dma_buf", dma_buf,
"tx_len", tx_len);
/* Create Descriptor Lists */
- while (chunk >= 0 && !last && count < AST_UDC_DESCS_COUNT) {
+ while (chunk > 0 && count < AST_UDC_DESCS_COUNT) {
ep->descs[ep->descs_wptr].des_0 = dma_buf + offset;
- if (chunk <= ep->chunk_max) {
- ep->descs[ep->descs_wptr].des_1 = chunk;
- last = 1;
- } else {
+ if (chunk > ep->chunk_max)
ep->descs[ep->descs_wptr].des_1 = ep->chunk_max;
- chunk -= ep->chunk_max;
- }
+ else
+ ep->descs[ep->descs_wptr].des_1 = chunk;
+
+ chunk -= ep->chunk_max;
- EP_DBG(ep, "descs[%d]: 0x%x 0x%x, last:%d\n",
+ EP_DBG(ep, "descs[%d]: 0x%x 0x%x\n",
ep->descs_wptr,
ep->descs[ep->descs_wptr].des_0,
- ep->descs[ep->descs_wptr].des_1,
- last);
+ ep->descs[ep->descs_wptr].des_1);
if (count == 0)
req->saved_dma_wptr = ep->descs_wptr;
--
2.35.1
next reply other threads:[~2022-06-18 8:54 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-18 8:54 Dan Carpenter [this message]
2022-06-18 8:54 ` [PATCH 1/2] usb: gadget: aspeed_udc: cleanup loop in ast_dma_descriptor_setup() Dan Carpenter
2022-06-18 8:54 ` [PATCH 2/2] usb: gadget: aspeed_udc: unlock on error in ast_udc_ep_queue() Dan Carpenter
2022-06-18 8:54 ` Dan Carpenter
2022-06-21 9:24 ` Neal Liu
2022-06-21 9:24 ` Neal Liu
2022-06-22 5:25 ` [PATCH 1/2] usb: gadget: aspeed_udc: cleanup loop in ast_dma_descriptor_setup() Neal Liu
2022-06-22 5:25 ` Neal Liu
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=Yq2SvM2bbrtSd1H9@kili \
--to=dan.carpenter@oracle.com \
--cc=andrew@aj.id.au \
--cc=balbi@kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=joel@jms.id.au \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-aspeed@lists.ozlabs.org \
--cc=linux-usb@vger.kernel.org \
--cc=neal_liu@aspeedtech.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.