Message ID | 1490179462-16559-1-git-send-email-der.herr@hofr.at (mailing list archive) |
---|---|
State | Accepted, archived |
Headers | show |
Nicholas Mc Guire <der.herr@hofr.at> writes: > The redundant init_completion() here seems to be a cut&past error as > struct scsi_qla_host only has 4 completion elements to initialize, > thus the duplicate init_completion(disable_acb_comp) is simply > removed. Applied to 4.12/scsi-queue.
diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c index ac52150..64c6fa5 100644 --- a/drivers/scsi/qla4xxx/ql4_os.c +++ b/drivers/scsi/qla4xxx/ql4_os.c @@ -8663,9 +8663,8 @@ static int qla4xxx_probe_adapter(struct pci_dev *pdev, init_completion(&ha->mbx_intr_comp); init_completion(&ha->disable_acb_comp); init_completion(&ha->idc_comp); init_completion(&ha->link_up_comp); - init_completion(&ha->disable_acb_comp); spin_lock_init(&ha->hardware_lock); spin_lock_init(&ha->work_lock);
The redundant init_completion() here seems to be a cut&past error as struct scsi_qla_host only has 4 completion elements to initialize, thus the duplicate init_completion(disable_acb_comp) is simply removed. Signed-off-by: Nicholas Mc Guire <der.herr@hofr.at> --- Found by experimental coccinelle script: ./drivers/scsi/qla4xxx/ql4_os.c:8667:1-16: WARNING: possible duplicate init_completion checking struct scsi_qla_host in drivers/scsi/qla4xxx/ql4_def.h:457 "Linux Host Adapter structure" it contain only the following 4 completion objects: struct completion disable_acb_comp; struct completion idc_comp; struct completion link_up_comp; struct completion mbx_intr_comp; so it seems the double initialization of disable_acb_comp was just a cut&past but and no omission of some other completion object - thus the second initialization is simply removed. Patch was only compile tested with: x86_64_defconfig + SCSI_LOWLEVEL=y, CONFIG_SCSI_QLA_ISCSI=m (...quite a few sparse and coccinelle errors/warnings during build-tests) Patch is against 4.11-rc3 (localversion-next is next-20170322) drivers/scsi/qla4xxx/ql4_os.c | 1 - 1 file changed, 1 deletion(-)