[PATCH] scsi: aha1542: remove unneeded semicolon

2021-03-18 Thread Jiapeng Chong
Fix the following coccicheck warnings:

./drivers/scsi/aha1542.c:569:2-3: Unneeded semicolon.
./drivers/scsi/aha1542.c:554:2-3: Unneeded semicolon.
./drivers/scsi/aha1542.c:519:2-3: Unneeded semicolon.
./drivers/scsi/aha1542.c:508:3-4: Unneeded semicolon.
./drivers/scsi/aha1542.c:407:2-3: Unneeded semicolon.

Reported-by: Abaci Robot 
Signed-off-by: Jiapeng Chong 
---
 drivers/scsi/aha1542.c | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/scsi/aha1542.c b/drivers/scsi/aha1542.c
index 21aab9f5b117..6d4d7d60bfba 100644
--- a/drivers/scsi/aha1542.c
+++ b/drivers/scsi/aha1542.c
@@ -404,7 +404,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)
@@ -505,7 +505,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
@@ -516,7 +516,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;
@@ -551,7 +551,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))
@@ -564,9 +564,9 @@ static int aha1542_getconfig(struct Scsi_Host *sh)
u8 inquiry_result[3];
int i;
i = inb(STATUS(sh->io_port));
-   if (i & DF) {
+   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))
-- 
2.20.1.2432.ga663e714



[PATCH] scsi: aha1542: remove unneeded semicolon

2021-03-07 Thread Jiapeng Chong
Fix the following coccicheck warnings:

./drivers/scsi/aha1542.c:693:2-3: Unneeded semicolon.
./drivers/scsi/aha1542.c:674:2-3: Unneeded semicolon.
./drivers/scsi/aha1542.c:656:2-3: Unneeded semicolon.
./drivers/scsi/aha1542.c:621:2-3: Unneeded semicolon.

Reported-by: Abaci Robot 
Signed-off-by: Jiapeng Chong 
---
 drivers/scsi/aha1542.c | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/scsi/aha1542.c b/drivers/scsi/aha1542.c
index 21aab9f..6e34767 100644
--- a/drivers/scsi/aha1542.c
+++ b/drivers/scsi/aha1542.c
@@ -618,7 +618,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;
 }
@@ -653,7 +653,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");
@@ -669,9 +669,9 @@ static int aha1542_query(struct Scsi_Host *sh)
u8 inquiry_result[4];
int i;
i = inb(STATUS(sh->io_port));
-   if (i & DF) {
+   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))
@@ -690,7 +690,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
-- 
1.8.3.1