scsi: remove unneeded semicolon
Subsystems (3)
PATCH 1/1 scsi: remove unneeded semicolon
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
--- 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(-)
drivers/scsi/aha1542.c +12 -12
@@ -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 */
drivers/scsi/ipr.h +1 -1
@@ -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 ; }
drivers/scsi/pmcraid.c +1 -1
@@ -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);
drivers/scsi/qlogicpti.c +1 -1
@@ -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 ); }
Signature · 1 line
1.8.3.1
Hello Yang,
Quoted 8 lines
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
Quoted 8 lines
./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
One patch per driver, please.
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering