aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoel Kluin <roel.kluin@gmail.com>2010-01-17 10:15:57 -0500
committerJames Bottomley <James.Bottomley@suse.de>2010-02-08 19:28:38 -0500
commitd44a6d2bbffd9e5c87f0a78cbe9c089e21289162 (patch)
tree2b1232ad21ed254dfad9295c210bf2c925933583
parenta3babda5b3b60b5d28dbab127b1ecc8ba707b6e7 (diff)
[SCSI] lpfc: unify two if branches with the same code in lpfc_decode_firmware_rev()
Regardless of the flag state, the branches execute the same code Signed-off-by: Roel Kluin <roel.kluin@gmail.com> Acked-by: James Smart <james.smart@emulex.com> Signed-off-by: James Bottomley <James.Bottomley@suse.de>
-rw-r--r--drivers/scsi/lpfc/lpfc_ct.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/scsi/lpfc/lpfc_ct.c b/drivers/scsi/lpfc/lpfc_ct.c
index 0ebcd9baca79..bf7bf62e81eb 100644
--- a/drivers/scsi/lpfc/lpfc_ct.c
+++ b/drivers/scsi/lpfc/lpfc_ct.c
@@ -1843,12 +1843,7 @@ lpfc_decode_firmware_rev(struct lpfc_hba *phba, char *fwrevision, int flag)
1843 c = (rev & 0x0000ff00) >> 8; 1843 c = (rev & 0x0000ff00) >> 8;
1844 b4 = (rev & 0x000000ff); 1844 b4 = (rev & 0x000000ff);
1845 1845
1846 if (flag) 1846 sprintf(fwrevision, "%d.%d%d%c%d", b1, b2, b3, c, b4);
1847 sprintf(fwrevision, "%d.%d%d%c%d ", b1,
1848 b2, b3, c, b4);
1849 else
1850 sprintf(fwrevision, "%d.%d%d%c%d ", b1,
1851 b2, b3, c, b4);
1852 } 1847 }
1853 return; 1848 return;
1854} 1849}