On 10/14/2015 05:57 PM, Himanshu Madhani wrote:
> Remove firmware binary names for the ISPs, which
> are not submitted to linux-firmware
>
> Signed-off-by: Himanshu Madhani <himanshu.madhani@xxxxxxxxxx>
> Signed-off-by: Giridhar Malavali <giridhar.malavali@xxxxxxxxxx>
> ---
> drivers/scsi/qla2xxx/qla_os.c | 29 -----------------------------
> 1 files changed, 0 insertions(+), 29 deletions(-)
>
> diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
> index c2dd17b..41aca16 100644
> --- a/drivers/scsi/qla2xxx/qla_os.c
> +++ b/drivers/scsi/qla2xxx/qla_os.c
> @@ -5293,11 +5293,6 @@ qla2x00_timer(scsi_qla_host_t *vha)
> #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_FILE_ISP21XX "ql2100_fw.bin"
> #define FW_FILE_ISP22XX "ql2200_fw.bin"
> @@ -5305,12 +5300,6 @@ qla2x00_timer(scsi_qla_host_t *vha)
> #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"
> -
>
> static DEFINE_MUTEX(qla_fw_lock);
>
> @@ -5321,11 +5310,6 @@ static struct fw_blob qla_fw_blobs[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, },
> };
>
> struct fw_blob *
> @@ -5346,16 +5330,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 {
> return NULL;
> }
> @@ -5844,6 +5818,3 @@ MODULE_FIRMWARE(FW_FILE_ISP2300);
> MODULE_FIRMWARE(FW_FILE_ISP2322);
> MODULE_FIRMWARE(FW_FILE_ISP24XX);
> MODULE_FIRMWARE(FW_FILE_ISP25XX);
> -MODULE_FIRMWARE(FW_FILE_ISP2031);
> -MODULE_FIRMWARE(FW_FILE_ISP8031);
> -MODULE_FIRMWARE(FW_FILE_ISP27XX);
> --
> 1.7.7
You should remove this info also from Kconfig:
2031 ql2600_fw.bin
8031 ql8300_fw.bin
27xx ql2700_fw.bin
Anyway,
Reviewed-by: Xose Vazquez Perez <xose.vazquez@xxxxxxxxx>
BTW, linux-firmware still contains release 7.03.00 of ql2400_fw.bin and ql2500_fw.bin .
SLES-11_SP4 already brings 8.00.00. And I did test 8.01.00 time ago and it worked flawlessly.
So, please *regularly* send latest FW releases to linux-firmware.git
-thanks-
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
