diff options
| author | andrew.vasquez@qlogic.com <andrew.vasquez@qlogic.com> | 2006-01-13 20:05:37 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.(none)> | 2006-01-14 11:55:34 -0500 |
| commit | 590f98e5e8d6502cc21fdcddc90a0cc09c1f770e (patch) | |
| tree | daa1a9439c0736d6ad79a90752922e5a608d66a9 /drivers/scsi/qla2xxx/qla_init.c | |
| parent | f94097edf2c3ac9bc48580252c2eee52947b5e60 (diff) | |
[SCSI] qla2xxx: Collapse load RISC RAM implementations.
Simplify essentially duplicate load RISC RAM implementation
in qla2x00_load_ram_ext() and qla2x00_load_ram().
Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/qla2xxx/qla_init.c')
| -rw-r--r-- | drivers/scsi/qla2xxx/qla_init.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c index 49e831561d16..b4fbef5bf409 100644 --- a/drivers/scsi/qla2xxx/qla_init.c +++ b/drivers/scsi/qla2xxx/qla_init.c | |||
| @@ -3672,8 +3672,8 @@ qla24xx_load_risc_flash(scsi_qla_host_t *ha, uint32_t *srisc_addr) | |||
| 3672 | for (i = 0; i < dlen; i++) | 3672 | for (i = 0; i < dlen; i++) |
| 3673 | dcode[i] = swab32(dcode[i]); | 3673 | dcode[i] = swab32(dcode[i]); |
| 3674 | 3674 | ||
| 3675 | rval = qla2x00_load_ram_ext(ha, ha->request_dma, | 3675 | rval = qla2x00_load_ram(ha, ha->request_dma, risc_addr, |
| 3676 | risc_addr, dlen); | 3676 | dlen); |
| 3677 | if (rval) { | 3677 | if (rval) { |
| 3678 | DEBUG(printk("scsi(%ld):[ERROR] Failed to load " | 3678 | DEBUG(printk("scsi(%ld):[ERROR] Failed to load " |
| 3679 | "segment %d of firmware\n", ha->host_no, | 3679 | "segment %d of firmware\n", ha->host_no, |
| @@ -3873,8 +3873,8 @@ qla24xx_load_risc(scsi_qla_host_t *ha, uint32_t *srisc_addr) | |||
| 3873 | for (i = 0; i < dlen; i++) | 3873 | for (i = 0; i < dlen; i++) |
| 3874 | dcode[i] = swab32(fwcode[i]); | 3874 | dcode[i] = swab32(fwcode[i]); |
| 3875 | 3875 | ||
| 3876 | rval = qla2x00_load_ram_ext(ha, ha->request_dma, | 3876 | rval = qla2x00_load_ram(ha, ha->request_dma, risc_addr, |
| 3877 | risc_addr, dlen); | 3877 | dlen); |
| 3878 | if (rval) { | 3878 | if (rval) { |
| 3879 | DEBUG(printk("scsi(%ld):[ERROR] Failed to load " | 3879 | DEBUG(printk("scsi(%ld):[ERROR] Failed to load " |
| 3880 | "segment %d of firmware\n", ha->host_no, | 3880 | "segment %d of firmware\n", ha->host_no, |