aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2016-03-14 10:29:44 -0400
committerMartin K. Petersen <martin.petersen@oracle.com>2016-03-18 15:21:23 -0400
commitaeb6641f8ebdd61939f462a8255b316f9bfab707 (patch)
tree421ce0359a2c307841d3fcbd3ae98ff83745fc61
parentcdc43ae34c25693fa8de30c9a95243cd45548023 (diff)
lpfc: fix misleading indentation
gcc-6 complains about the indentation of the lpfc_destroy_vport_work_array() call in lpfc_online(), which clearly doesn't look right: drivers/scsi/lpfc/lpfc_init.c: In function 'lpfc_online': drivers/scsi/lpfc/lpfc_init.c:2880:3: warning: statement is indented as if it were guarded by... [-Wmisleading-indentation] lpfc_destroy_vport_work_array(phba, vports); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ drivers/scsi/lpfc/lpfc_init.c:2863:2: note: ...this 'if' clause, but it is not if (vports != NULL) ^~ Looking at the patch that introduced this code, it's clear that the behavior is correct and the indentation is wrong. This fixes the indentation and adds curly braces around the previous if() block for clarity, as that is most likely what caused the code to be misindented in the first place. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Fixes: 549e55cd2a1b ("[SCSI] lpfc 8.2.2 : Fix locking around HBA's port_list") Reviewed-by: Sebastian Herbszt <herbszt@gmx.de> Reviewed-by: Hannes Reinecke <hare@suse.com> Reviewed-by: Ewan D. Milne <emilne@redhat.com> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
-rw-r--r--drivers/scsi/lpfc/lpfc_init.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
index a544366a367e..f57d02c3b6cf 100644
--- a/drivers/scsi/lpfc/lpfc_init.c
+++ b/drivers/scsi/lpfc/lpfc_init.c
@@ -2860,7 +2860,7 @@ lpfc_online(struct lpfc_hba *phba)
2860 } 2860 }
2861 2861
2862 vports = lpfc_create_vport_work_array(phba); 2862 vports = lpfc_create_vport_work_array(phba);
2863 if (vports != NULL) 2863 if (vports != NULL) {
2864 for (i = 0; i <= phba->max_vports && vports[i] != NULL; i++) { 2864 for (i = 0; i <= phba->max_vports && vports[i] != NULL; i++) {
2865 struct Scsi_Host *shost; 2865 struct Scsi_Host *shost;
2866 shost = lpfc_shost_from_vport(vports[i]); 2866 shost = lpfc_shost_from_vport(vports[i]);
@@ -2877,7 +2877,8 @@ lpfc_online(struct lpfc_hba *phba)
2877 } 2877 }
2878 spin_unlock_irq(shost->host_lock); 2878 spin_unlock_irq(shost->host_lock);
2879 } 2879 }
2880 lpfc_destroy_vport_work_array(phba, vports); 2880 }
2881 lpfc_destroy_vport_work_array(phba, vports);
2881 2882
2882 lpfc_unblock_mgmt_io(phba); 2883 lpfc_unblock_mgmt_io(phba);
2883 return 0; 2884 return 0;