From: Jaime Arrocha <jarr@innercoder.com>
To: gregkh@linuxfoundation.org
Cc: liodot@gmail.com, devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org, charrer@alacritech.com,
Jaime Arrocha <jarr@innercoder.com>
Subject: [PATCH] staging: slicoss: replacement of goto statements
Date: Wed, 8 Jun 2016 08:46:06 -0500 [thread overview]
Message-ID: <1465393566-946-1-git-send-email-jarr@innercoder.com> (raw)
From: Jaime Arrocha <jarr@innercoder.com>
Replaced deprecated goto statements.
Signed-off-by: Jaime Arrocha <jarr@innercoder.com>
---
drivers/staging/slicoss/slicoss.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/drivers/staging/slicoss/slicoss.c b/drivers/staging/slicoss/slicoss.c
index ac126d4..cc45f4c 100644
--- a/drivers/staging/slicoss/slicoss.c
+++ b/drivers/staging/slicoss/slicoss.c
@@ -1457,30 +1457,30 @@ static struct slic_hostcmd *slic_cmdq_getfree(struct adapter *adapter)
struct slic_hostcmd *cmd = NULL;
unsigned long flags;
-lock_and_retry:
spin_lock_irqsave(&cmdq->lock, flags);
-retry:
cmd = cmdq->head;
- if (cmd) {
- cmdq->head = cmd->next;
- cmdq->count--;
- spin_unlock_irqrestore(&cmdq->lock, flags);
- } else {
+ while (!cmd) {
slic_cmdq_getdone(adapter);
cmd = cmdq->head;
- if (cmd) {
- goto retry;
- } else {
+ if (cmd)
+ continue;
+ else {
u32 *pageaddr;
spin_unlock_irqrestore(&cmdq->lock, flags);
pageaddr = slic_cmdqmem_addpage(adapter);
if (pageaddr) {
slic_cmdq_addcmdpage(adapter, pageaddr);
- goto lock_and_retry;
+ spin_lock_irqsave(&cmdq->lock, flags);
+ cmd = cmdq->head;
+ continue;
}
+ return cmd;
}
}
+ cmdq->head = cmd->next;
+ cmdq->count--;
+ spin_unlock_irqrestore(&cmdq->lock, flags);
return cmd;
}
--
2.1.4
next reply other threads:[~2016-06-08 13:43 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-08 13:46 Jaime Arrocha [this message]
2016-06-08 15:49 ` [PATCH] staging: slicoss: replacement of goto statements Greg KH
2016-06-08 16:28 ` Jaime Arrocha
2016-06-08 17:13 ` Greg KH
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=1465393566-946-1-git-send-email-jarr@innercoder.com \
--to=jarr@innercoder.com \
--cc=charrer@alacritech.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=liodot@gmail.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox