5 files changed, 7 insertions, 7 deletions

diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c
index 24e20ba9633c..44ac4aef879f 100644
--- a/drivers/scsi/be2iscsi/be_main.c
+++ b/drivers/scsi/be2iscsi/be_main.c
@@ -618,7 +618,7 @@ static void beiscsi_get_params(struct beiscsi_hba *phba)
                                     + BE2_NOPOUT_REQ));
         phba->params.cxns_per_ctrl = phba->fw_config.iscsi_cid_count;
         phba->params.asyncpdus_per_ctrl = phba->fw_config.iscsi_cid_count * 2;
-        phba->params.icds_per_ctrl = phba->fw_config.iscsi_icd_count;;
+        phba->params.icds_per_ctrl = phba->fw_config.iscsi_icd_count;
         phba->params.num_sge_per_io = BE2_SGE;
         phba->params.defpdu_hdr_sz = BE2_DEFPDU_HDR_SZ;
         phba->params.defpdu_data_sz = BE2_DEFPDU_DATA_SZ;
@@ -781,7 +781,7 @@ static irqreturn_t be_isr(int irq, void *dev_id)
         int isr;
 
         phba = dev_id;
-        ctrl = &phba->ctrl;;
+        ctrl = &phba->ctrl;
         isr = ioread32(ctrl->csr + CEV_ISR0_OFFSET +
                        (PCI_FUNC(ctrl->pdev->devfn) * CEV_ISR_SIZE));
         if (!isr)
diff --git a/drivers/scsi/lpfc/lpfc_bsg.c b/drivers/scsi/lpfc/lpfc_bsg.c
index 77b2871d96b7..3811ea9ce8e4 100644
--- a/drivers/scsi/lpfc/lpfc_bsg.c
+++ b/drivers/scsi/lpfc/lpfc_bsg.c
@@ -598,7 +598,7 @@ lpfc_bsg_rport_els(struct fc_bsg_job *job)
         dd_data->context_un.iocb.cmdiocbq = cmdiocbq;
         dd_data->context_un.iocb.rspiocbq = rspiocbq;
         dd_data->context_un.iocb.set_job = job;
-        dd_data->context_un.iocb.bmp = NULL;;
+        dd_data->context_un.iocb.bmp = NULL;
         dd_data->context_un.iocb.ndlp = ndlp;
 
         if (phba->cfg_poll & DISABLE_FCP_RING_INT) {
diff --git a/drivers/scsi/pm8001/pm8001_init.c b/drivers/scsi/pm8001/pm8001_init.c
index 002360da01e3..172cefb6deb9 100644
--- a/drivers/scsi/pm8001/pm8001_init.c
+++ b/drivers/scsi/pm8001/pm8001_init.c
@@ -160,7 +160,7 @@ static void pm8001_free(struct pm8001_hba_info *pm8001_ha)
 static void pm8001_tasklet(unsigned long opaque)
 {
         struct pm8001_hba_info *pm8001_ha;
-        pm8001_ha = (struct pm8001_hba_info *)opaque;;
+        pm8001_ha = (struct pm8001_hba_info *)opaque;
         if (unlikely(!pm8001_ha))
                 BUG_ON(1);
         PM8001_CHIP_DISP->isr(pm8001_ha);
diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c
index 712518d05128..6c55c3ca8e05 100644
--- a/drivers/scsi/qla2xxx/qla_isr.c
+++ b/drivers/scsi/qla2xxx/qla_isr.c
@@ -1051,7 +1051,7 @@ qla2x00_ct_entry(scsi_qla_host_t *vha, struct req_que *req,
                 }
                 DEBUG2(qla2x00_dump_buffer((uint8_t *)pkt, sizeof(*pkt)));
         } else {
-                bsg_job->reply->result =  DID_OK << 16;;
+                bsg_job->reply->result =  DID_OK << 16;
                 bsg_job->reply->reply_payload_rcv_len =
                     bsg_job->reply_payload.payload_len;
                 bsg_job->reply_len = 0;
@@ -1146,7 +1146,7 @@ qla24xx_els_ct_entry(scsi_qla_host_t *vha, struct req_que *req,
                 DEBUG2(qla2x00_dump_buffer((uint8_t *)pkt, sizeof(*pkt)));
         }
         else {
-                bsg_job->reply->result =  DID_OK << 16;;
+                bsg_job->reply->result =  DID_OK << 16;
                 bsg_job->reply->reply_payload_rcv_len = bsg_job->reply_payload.payload_len;
                 bsg_job->reply_len = 0;
         }
diff --git a/drivers/scsi/sgiwd93.c b/drivers/scsi/sgiwd93.c
index fef0e3c75b16..3a9d85ca6047 100644
--- a/drivers/scsi/sgiwd93.c
+++ b/drivers/scsi/sgiwd93.c
@@ -3,7 +3,7 @@
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
  *
- * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com)
+ * Copyright (C) 1996 David S. Miller (davem@davemloft.net)
  * Copyright (C) 1999 Andrew R. Baker (andrewb@uab.edu)
  * Copyright (C) 2001 Florian Lohoff (flo@rfc822.org)
  * Copyright (C) 2003, 07 Ralf Baechle (ralf@linux-mips.org)