From patchwork Wed Feb 3 01:48:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Li X-Patchwork-Id: 376668 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, UNPARSEABLE_RELAY, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BF33BC433DB for ; Wed, 3 Feb 2021 01:50:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 785B264F75 for ; Wed, 3 Feb 2021 01:50:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229970AbhBCBtz (ORCPT ); Tue, 2 Feb 2021 20:49:55 -0500 Received: from out30-131.freemail.mail.aliyun.com ([115.124.30.131]:59736 "EHLO out30-131.freemail.mail.aliyun.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229621AbhBCBty (ORCPT ); Tue, 2 Feb 2021 20:49:54 -0500 X-Alimail-AntiSpam: AC=PASS; BC=-1|-1; BR=01201311R161e4; CH=green; DM=||false|; DS=||; FP=0|-1|-1|-1|0|-1|-1|-1; HT=e01e04420; MF=yang.lee@linux.alibaba.com; NM=1; PH=DS; RN=6; SR=0; TI=SMTPD_---0UNj9AmY_1612316912; Received: from j63c13417.sqa.eu95.tbsite.net(mailfrom:yang.lee@linux.alibaba.com fp:SMTPD_---0UNj9AmY_1612316912) by smtp.aliyun-inc.com(127.0.0.1); Wed, 03 Feb 2021 09:48:32 +0800 From: Yang Li To: martin.petersen@oracle.com Cc: jejb@linux.ibm.com, brking@us.ibm.com, linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, Yang Li Subject: [PATCH] scsi: remove unneeded semicolon Date: Wed, 3 Feb 2021 09:48:31 +0800 Message-Id: <1612316911-69531-1-git-send-email-yang.lee@linux.alibaba.com> X-Mailer: git-send-email 1.8.3.1 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org Eliminate the following coccicheck warning: ./drivers/scsi/qlogicpti.c:1153:3-4: Unneeded semicolon ./drivers/scsi/pmcraid.c:5090:2-3: Unneeded semicolon ./drivers/scsi/ipr.h:1979:2-3: Unneeded semicolon ./drivers/scsi/aha1542.c:287:2-3: Unneeded semicolon ./drivers/scsi/aha1542.c:327:3-4: Unneeded semicolon ./drivers/scsi/aha1542.c:389:2-3: Unneeded semicolon ./drivers/scsi/aha1542.c:487:3-4: Unneeded semicolon ./drivers/scsi/aha1542.c:498:2-3: Unneeded semicolon ./drivers/scsi/aha1542.c:533:2-3: Unneeded semicolon ./drivers/scsi/aha1542.c:548:2-3: Unneeded semicolon ./drivers/scsi/aha1542.c:575:2-3: Unneeded semicolon ./drivers/scsi/aha1542.c:598:2-3: Unneeded semicolon ./drivers/scsi/aha1542.c:631:2-3: Unneeded semicolon ./drivers/scsi/aha1542.c:649:2-3: Unneeded semicolon ./drivers/scsi/aha1542.c:667:2-3: Unneeded semicolon Reported-by: Abaci Robot Signed-off-by: Yang Li --- drivers/scsi/aha1542.c | 24 ++++++++++++------------ drivers/scsi/ipr.h | 2 +- drivers/scsi/pmcraid.c | 2 +- drivers/scsi/qlogicpti.c | 2 +- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/drivers/scsi/aha1542.c b/drivers/scsi/aha1542.c index dc5667a..e322347 100644 --- a/drivers/scsi/aha1542.c +++ b/drivers/scsi/aha1542.c @@ -284,7 +284,7 @@ static irqreturn_t aha1542_interrupt(int irq, void *dev_id) if (flag & SCRD) printk("SCRD "); printk("status %02x\n", inb(STATUS(sh->io_port))); - }; + } #endif number_serviced = 0; @@ -324,7 +324,7 @@ static irqreturn_t aha1542_interrupt(int irq, void *dev_id) if (!number_serviced) shost_printk(KERN_WARNING, sh, "interrupt received, but no mail.\n"); return IRQ_HANDLED; - }; + } mbo = (scsi2int(mb[mbi].ccbptr) - (unsigned long)aha1542->ccb_handle) / sizeof(struct ccb); mbistatus = mb[mbi].status; @@ -386,7 +386,7 @@ static irqreturn_t aha1542_interrupt(int irq, void *dev_id) far as queuecommand is concerned */ my_done(tmp_cmd); number_serviced++; - }; + } } static int aha1542_queuecommand(struct Scsi_Host *sh, struct scsi_cmnd *cmd) @@ -484,7 +484,7 @@ static int aha1542_queuecommand(struct Scsi_Host *sh, struct scsi_cmnd *cmd) scsi_for_each_sg(cmd, sg, sg_count, i) { any2scsi(acmd->chain[i].dataptr, sg_dma_address(sg)); any2scsi(acmd->chain[i].datalen, sg_dma_len(sg)); - }; + } any2scsi(ccb[mbo].datalen, sg_count * sizeof(struct chain)); any2scsi(ccb[mbo].dataptr, acmd->chain_handle); #ifdef DEBUG @@ -495,7 +495,7 @@ static int aha1542_queuecommand(struct Scsi_Host *sh, struct scsi_cmnd *cmd) ccb[mbo].op = 0; /* SCSI Initiator Command */ any2scsi(ccb[mbo].datalen, 0); any2scsi(ccb[mbo].dataptr, 0); - }; + } ccb[mbo].idlun = (target & 7) << 5 | direction | (lun & 7); /*SCSI Target Id */ ccb[mbo].rsalen = 16; ccb[mbo].linkptr[0] = ccb[mbo].linkptr[1] = ccb[mbo].linkptr[2] = 0; @@ -530,7 +530,7 @@ static void setup_mailboxes(struct Scsi_Host *sh) any2scsi(aha1542->mb[i].ccbptr, aha1542->ccb_handle + i * sizeof(struct ccb)); aha1542->mb[AHA1542_MAILBOXES + i].status = 0; - }; + } aha1542_intr_reset(sh->io_port); /* reset interrupts, so they don't block */ any2scsi(mb_cmd + 2, aha1542->mb_handle); if (aha1542_out(sh->io_port, mb_cmd, 5)) @@ -545,7 +545,7 @@ static int aha1542_getconfig(struct Scsi_Host *sh) i = inb(STATUS(sh->io_port)); if (i & DF) { i = inb(DATA(sh->io_port)); - }; + } aha1542_outb(sh->io_port, CMD_RETCONF); aha1542_in(sh->io_port, inquiry_result, 3, 0); if (!wait_mask(INTRFLAGS(sh->io_port), INTRMASK, HACC, 0, 0)) @@ -572,7 +572,7 @@ static int aha1542_getconfig(struct Scsi_Host *sh) default: shost_printk(KERN_ERR, sh, "Unable to determine DMA channel.\n"); return -1; - }; + } switch (inquiry_result[1]) { case 0x40: sh->irq = 15; @@ -595,7 +595,7 @@ static int aha1542_getconfig(struct Scsi_Host *sh) default: shost_printk(KERN_ERR, sh, "Unable to determine IRQ level.\n"); return -1; - }; + } sh->this_id = inquiry_result[2] & 7; return 0; } @@ -628,7 +628,7 @@ static int aha1542_mbenable(struct Scsi_Host *sh) if (aha1542_out(sh->io_port, mbenable_cmd, 3)) goto fail; - }; + } while (0) { fail: shost_printk(KERN_ERR, sh, "Mailbox init failed\n"); @@ -646,7 +646,7 @@ static int aha1542_query(struct Scsi_Host *sh) i = inb(STATUS(sh->io_port)); if (i & DF) { i = inb(DATA(sh->io_port)); - }; + } aha1542_outb(sh->io_port, CMD_INQUIRY); aha1542_in(sh->io_port, inquiry_result, 4, 0); if (!wait_mask(INTRFLAGS(sh->io_port), INTRMASK, HACC, 0, 0)) @@ -664,7 +664,7 @@ static int aha1542_query(struct Scsi_Host *sh) if (inquiry_result[0] == 0x43) { shost_printk(KERN_INFO, sh, "Emulation mode not supported for AHA-1740 hardware, use aha1740 driver instead.\n"); return 1; - }; + } /* Always call this - boards that do not support extended bios translation will ignore the command, and we will set the proper default */ diff --git a/drivers/scsi/ipr.h b/drivers/scsi/ipr.h index 783ee03..6c29113 100644 --- a/drivers/scsi/ipr.h +++ b/drivers/scsi/ipr.h @@ -1976,7 +1976,7 @@ static inline int ipr_sdt_is_fmt2(u32 sdt_word) case IPR_SDT_FMT2_BAR5_SEL: case IPR_SDT_FMT2_EXP_ROM_SEL: return 1; - }; + } return 0; } diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c index 834556e..44e9709 100644 --- a/drivers/scsi/pmcraid.c +++ b/drivers/scsi/pmcraid.c @@ -5087,7 +5087,7 @@ static int pmcraid_init_instance(struct pci_dev *pdev, struct Scsi_Host *host, mapped_pci_addr + chip_cfg->ioa_host_mask_clr; pint_regs->global_interrupt_mask_reg = mapped_pci_addr + chip_cfg->global_intr_mask; - }; + } pinstance->ioa_reset_attempts = 0; init_waitqueue_head(&pinstance->reset_wait_q); diff --git a/drivers/scsi/qlogicpti.c b/drivers/scsi/qlogicpti.c index d84e218..3da58263 100644 --- a/drivers/scsi/qlogicpti.c +++ b/drivers/scsi/qlogicpti.c @@ -1150,7 +1150,7 @@ static struct scsi_cmnd *qlogicpti_intr_handler(struct qlogicpti *qpti) case COMMAND_ERROR: case COMMAND_PARAM_ERROR: break; - }; + } sbus_writew(0, qpti->qregs + SBUS_SEMAPHORE); }