From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161272AbcFHNnc (ORCPT ); Wed, 8 Jun 2016 09:43:32 -0400 Received: from sender154-mail.zoho.com ([74.201.84.154]:28190 "EHLO sender154-mail.zoho.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752036AbcFHNna (ORCPT ); Wed, 8 Jun 2016 09:43:30 -0400 From: Jaime Arrocha To: gregkh@linuxfoundation.org Cc: liodot@gmail.com, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, charrer@alacritech.com, Jaime Arrocha Subject: [PATCH] staging: slicoss: replacement of goto statements Date: Wed, 8 Jun 2016 08:46:06 -0500 Message-Id: <1465393566-946-1-git-send-email-jarr@innercoder.com> X-Mailer: git-send-email 2.1.4 X-ZohoMail: Z_48641963 SPT_1 Z_48641962 SPT_1 SLF_D X-Zoho-Virus-Status: 2 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jaime Arrocha Replaced deprecated goto statements. Signed-off-by: Jaime Arrocha --- 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