From patchwork Sat May 8 09:41:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhen Lei X-Patchwork-Id: 432602 Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp1096600jao; Sat, 8 May 2021 02:41:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxG2dbr2UBS5UOvvrgJmHkNm5jpUlD9QU3mDxtvh+4lOGmg8NrkzbvWS1I4jY3S4RnEfusP X-Received: by 2002:a63:2c81:: with SMTP id s123mr14601034pgs.168.1620466899420; Sat, 08 May 2021 02:41:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620466899; cv=none; d=google.com; s=arc-20160816; b=b7rLVCBcoaUssPNLGjviGPrln5dkpr4tWuv+lwkDNQv/6n6GqYRUoekYZILhVnjFFV cachE6lg+KWlIGrXtCUsBUc1aUcxmek0b7zJQfMh/sQcTZYxoq0RagQkr+XSlzLXtT6u um30oSyAglU8jmTPmobnKBO2oOBCAcQE94QP7jAOCnggx9Ukfxx26nbMOfH2/HCrpT0c lgdHydVYsh25bDhXZp9kE1vkRi1GfH4DYDDDyO2IQXj9hf+BEAOof8LjqBkmdvlET0j7 1OvicADnPkE1b1BoMbkLwPG9L222pLp9Ss748oWryf7qWhxhI1a3KC0LfIW1pQSteYF+ VusQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=7Ce8D4a6fR7o6ToNaQQniKRzf7OLpMQXcVGs4joUtxU=; b=mToOUERdXsxN5bP7TsU8F1L5iD8BzIMR4fxSe784Uguia3aOTPEilnlNCtOjVirAdL g0ccDNQ10JLLcNnI0Z7vc2pr16Uk9izkwwr0TqnTafIW7i8poOwRX1Xdz6Ka06yzcyR8 48IxacrINlo5wY3oUPagkYd+8wppH311Fm6Vz/w2PO9ZGrVG9Q48Eqnx0+BjAdpSsAjG 4vodzoOxHagu+a22uL3qrx3nKgRwLl7W8JVvzXCq/08jdzGPVoCNWUy+xXI/wkua+gWh oqX2UsvH8vW1a12p4KuzA5MaJDMziTiYbLoezquN2W/7vpJsy6AtqHqv1o2oVQKys0n4 Y7+g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-scsi-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-scsi-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=huawei.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id s23si9905111pgl.464.2021.05.08.02.41.39 for ; Sat, 08 May 2021 02:41:39 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-scsi-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-scsi-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-scsi-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229870AbhEHJmg (ORCPT ); Sat, 8 May 2021 05:42:36 -0400 Received: from szxga04-in.huawei.com ([45.249.212.190]:17160 "EHLO szxga04-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229583AbhEHJmg (ORCPT ); Sat, 8 May 2021 05:42:36 -0400 Received: from DGGEMS413-HUB.china.huawei.com (unknown [172.30.72.59]) by szxga04-in.huawei.com (SkyGuard) with ESMTP id 4Fcj132mk6zncMX; Sat, 8 May 2021 17:38:15 +0800 (CST) Received: from thunder-town.china.huawei.com (10.174.177.72) by DGGEMS413-HUB.china.huawei.com (10.3.19.213) with Microsoft SMTP Server id 14.3.498.0; Sat, 8 May 2021 17:41:25 +0800 From: Zhen Lei To: "James E . J . Bottomley" , "Martin K . Petersen" , linux-scsi , linux-kernel CC: Zhen Lei Subject: [PATCH 1/1] scsi: pmcraid: Remove several unneeded semicolons Date: Sat, 8 May 2021 17:41:18 +0800 Message-ID: <20210508094118.2783-1-thunder.leizhen@huawei.com> X-Mailer: git-send-email 2.26.0.windows.1 MIME-Version: 1.0 X-Originating-IP: [10.174.177.72] X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org The semicolon immediately following '}' is unneeded. Signed-off-by: Zhen Lei --- drivers/scsi/aha1542.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) -- 2.26.0.106.g9fadedd diff --git a/drivers/scsi/aha1542.c b/drivers/scsi/aha1542.c index 1210e61afb1838a..7229748a57b95ff 100644 --- a/drivers/scsi/aha1542.c +++ b/drivers/scsi/aha1542.c @@ -304,7 +304,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; @@ -346,7 +346,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; @@ -411,7 +411,7 @@ static irqreturn_t aha1542_interrupt(int irq, void *dev_id) */ my_done(tmp_cmd); number_serviced++; - }; + } } static int aha1542_queuecommand(struct Scsi_Host *sh, struct scsi_cmnd *cmd) @@ -537,7 +537,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)) @@ -552,7 +552,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)) @@ -581,7 +581,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; @@ -604,7 +604,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; } @@ -639,7 +639,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"); @@ -657,7 +657,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)) @@ -676,7 +676,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