scsi: qla2xxx: remove references to unavailable firmware files
Subsystems (2)
PATCH v2 1/1 scsi: qla2xxx: remove references to unavailable firmware files
They are not in linux-firmware, and some(all???) of them are loaded only from flash. This should have been done in f8ac60855ebfa and 940a7f09ad645
v2: remove firmware upload code
Cc Nilesh Javali <[email protected]>
Cc James E.J. Bottomley <[email protected]>
Cc Martin K. Petersen <[email protected]>
Cc QLOGIC-ML <[email protected]>
Cc SCSI-ML <[email protected]>
Signed-off-by Xose Vazquez Perez <[email protected]>
--- drivers/scsi/qla2xxx/qla_os.c | 30 ------------------------------ 1 file changed, 30 deletions(-)
drivers/scsi/qla2xxx/qla_os.c +0 -30
@@ -7606,12 +7606,6 @@ qla2x00_timer(struct timer_list *t)#define FW_ISP2322 3#define FW_ISP24XX 4#define FW_ISP25XX 5 -#define FW_ISP81XX 6 -#define FW_ISP82XX 7 -#define FW_ISP2031 8 -#define FW_ISP8031 9 -#define FW_ISP27XX 10 -#define FW_ISP28XX 11#define FW_FILE_ISP21XX "ql2100_fw.bin"#define FW_FILE_ISP22XX "ql2200_fw.bin"
@@ -7619,12 +7613,6 @@ qla2x00_timer(struct timer_list *t)#define FW_FILE_ISP2322 "ql2322_fw.bin"#define FW_FILE_ISP24XX "ql2400_fw.bin"#define FW_FILE_ISP25XX "ql2500_fw.bin" -#define FW_FILE_ISP81XX "ql8100_fw.bin" -#define FW_FILE_ISP82XX "ql8200_fw.bin" -#define FW_FILE_ISP2031 "ql2600_fw.bin" -#define FW_FILE_ISP8031 "ql8300_fw.bin" -#define FW_FILE_ISP27XX "ql2700_fw.bin" -#define FW_FILE_ISP28XX "ql2800_fw.bin"static DEFINE_MUTEX (qla_fw_lock);
@@ -7636,12 +7624,6 @@ static struct fw_blob qla_fw_blobs[] = { { .name = FW_FILE_ISP2322, .segs = { 0x800, 0x1c000, 0x1e000, 0 }, }, { .name = FW_FILE_ISP24XX, }, { .name = FW_FILE_ISP25XX, }, - { .name = FW_FILE_ISP81XX, }, - { .name = FW_FILE_ISP82XX, }, - { .name = FW_FILE_ISP2031, }, - { .name = FW_FILE_ISP8031, }, - { .name = FW_FILE_ISP27XX, }, - { .name = FW_FILE_ISP28XX, }, { .name = NULL, }, };
@@ -7663,18 +7645,6 @@ qla2x00_request_firmware(scsi_qla_host_t *vha) blob = &qla_fw_blobs[FW_ISP24XX ]; }else if (IS_QLA25XX (ha)) { blob = &qla_fw_blobs[FW_ISP25XX ]; - }else if (IS_QLA81XX (ha)) { - blob = &qla_fw_blobs[FW_ISP81XX ]; - }else if (IS_QLA82XX (ha)) { - blob = &qla_fw_blobs[FW_ISP82XX ]; - }else if (IS_QLA2031 (ha)) { - blob = &qla_fw_blobs[FW_ISP2031 ]; - }else if (IS_QLA8031 (ha)) { - blob = &qla_fw_blobs[FW_ISP8031 ]; - }else if (IS_QLA27XX (ha)) { - blob = &qla_fw_blobs[FW_ISP27XX ]; - }else if (IS_QLA28XX (ha)) { - blob = &qla_fw_blobs[FW_ISP28XX ]; }else {return NULL ; }
Signature · 1 line
2.51.0
On 9/28/25 4:18 PM, Xose Vazquez Perez wrote:
Is there any problem/drawback?
Quoted 77 lines
They are not in linux-firmware, and some(all???) of them are loaded only from flash. This should have been done in
f8ac60855ebfaand940a7f09ad645v2: remove firmware upload code
Cc Nilesh Javali <[email protected]>Cc James E.J. Bottomley <[email protected]>Cc Martin K. Petersen <[email protected]>Cc QLOGIC-ML <[email protected]>Cc SCSI-ML <[email protected]>Signed-off-by Xose Vazquez Perez <[email protected]>--- drivers/scsi/qla2xxx/qla_os.c | 30 ------------------------------ 1 file changed, 30 deletions(-)drivers/scsi/qla2xxx/qla_os.c +0
-30@@ -7606,12 +7606,6 @@ qla2x00_timer(struct timer_list *t)#define FW_ISP2322 3#define FW_ISP24XX 4#define FW_ISP25XX 5 -#define FW_ISP81XX 6 -#define FW_ISP82XX 7 -#define FW_ISP2031 8 -#define FW_ISP8031 9 -#define FW_ISP27XX 10 -#define FW_ISP28XX 11#define FW_FILE_ISP21XX "ql2100_fw.bin"#define FW_FILE_ISP22XX "ql2200_fw.bin"@@ -7619,12 +7613,6 @@ qla2x00_timer(struct timer_list *t)#define FW_FILE_ISP2322 "ql2322_fw.bin"#define FW_FILE_ISP24XX "ql2400_fw.bin"#define FW_FILE_ISP25XX "ql2500_fw.bin" -#define FW_FILE_ISP81XX "ql8100_fw.bin" -#define FW_FILE_ISP82XX "ql8200_fw.bin" -#define FW_FILE_ISP2031 "ql2600_fw.bin" -#define FW_FILE_ISP8031 "ql8300_fw.bin" -#define FW_FILE_ISP27XX "ql2700_fw.bin" -#define FW_FILE_ISP28XX "ql2800_fw.bin"static DEFINE_MUTEX (qla_fw_lock);@@ -7636,12 +7624,6 @@ static struct fw_blob qla_fw_blobs[] = { { .name = FW_FILE_ISP2322, .segs = { 0x800, 0x1c000, 0x1e000, 0 }, }, { .name = FW_FILE_ISP24XX, }, { .name = FW_FILE_ISP25XX, }, - { .name = FW_FILE_ISP81XX, }, - { .name = FW_FILE_ISP82XX, }, - { .name = FW_FILE_ISP2031, }, - { .name = FW_FILE_ISP8031, }, - { .name = FW_FILE_ISP27XX, }, - { .name = FW_FILE_ISP28XX, }, { .name = NULL, }, };@@ -7663,18 +7645,6 @@ qla2x00_request_firmware(scsi_qla_host_t *vha) blob = &qla_fw_blobs[FW_ISP24XX ]; }else if (IS_QLA25XX (ha)) { blob = &qla_fw_blobs[FW_ISP25XX ]; - }else if (IS_QLA81XX (ha)) { - blob = &qla_fw_blobs[FW_ISP81XX ]; - }else if (IS_QLA82XX (ha)) { - blob = &qla_fw_blobs[FW_ISP82XX ]; - }else if (IS_QLA2031 (ha)) { - blob = &qla_fw_blobs[FW_ISP2031 ]; - }else if (IS_QLA8031 (ha)) { - blob = &qla_fw_blobs[FW_ISP8031 ]; - }else if (IS_QLA27XX (ha)) { - blob = &qla_fw_blobs[FW_ISP27XX ]; - }else if (IS_QLA28XX (ha)) { - blob = &qla_fw_blobs[FW_ISP28XX ]; }else {return NULL ; }