2008-02-04 22:22:39

by Roel Kluin

[permalink] [raw]
Subject: [drivers/scsi/NCR53C9x.c] remove duplication for family_code == 0x00

in drivers/scsi/NCR53C9x.c:412-422 it reads:

else if(family_code == 0x00) {
if ((version & 7) == 2)
esp->erev = fas100a; /* NCR53C9X */
else
esp->erev = espunknown;
} else if(family_code == 0x14) {
if ((version & 7) == 2)
esp->erev = fsc;
else
esp->erev = espunknown;
} else if(family_code == 0x00) {
if ((version & 7) == 2)
esp->erev = fas100a; /* NCR53C9X */
else
esp->erev = espunknown;

Note the duplication of test 'if(family_code == 0x00)' and lines below

Signed-off-by: Roel Kluin <[email protected]>
---
diff --git a/drivers/scsi/NCR53C9x.c b/drivers/scsi/NCR53C9x.c
index 5b0efc9..b8df3c0 100644
--- a/drivers/scsi/NCR53C9x.c
+++ b/drivers/scsi/NCR53C9x.c
@@ -419,11 +419,6 @@ static void esp_reset_esp(struct NCR_ESP *esp, struct ESP_regs *eregs)
esp->erev = fsc;
else
esp->erev = espunknown;
- } else if(family_code == 0x00) {
- if ((version & 7) == 2)
- esp->erev = fas100a; /* NCR53C9X */
- else
- esp->erev = espunknown;
} else
esp->erev = espunknown;
ESPLOG(("esp%d: FAST chip is %s (family=%d, version=%d)\n",