[SCSI] qla2xxx: Consolidate firmware-dump handling across ISPs.

Simplify and centralise buffer allocation/deallocation, as
there's no point in having two memory request methods.

Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

1 files changed, 3 insertions, 9 deletions

diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c
index fee0c493775b..e96d58ded57c 100644
--- a/drivers/scsi/qla2xxx/qla_attr.c
+++ b/drivers/scsi/qla2xxx/qla_attr.c
@@ -46,22 +46,16 @@ qla2x00_sysfs_write_fw_dump(struct kobject *kobj, char *buf, loff_t off,
         case 0:
                 if (ha->fw_dump_reading == 1) {
                         qla_printk(KERN_INFO, ha,
-                            "Firmware dump cleared on (%ld).\n",
-                            ha->host_no);
+                            "Firmware dump cleared on (%ld).\n", ha->host_no);
 
                         vfree(ha->fw_dump_buffer);
-                        if (!IS_QLA24XX(ha) && !IS_QLA54XX(ha))
-                                free_pages((unsigned long)ha->fw_dump,
-                                    ha->fw_dump_order);
-
-                        ha->fw_dump_reading = 0;
                         ha->fw_dump_buffer = NULL;
-                        ha->fw_dump = NULL;
+                        ha->fw_dump_reading = 0;
                         ha->fw_dumped = 0;
                 }
                 break;
         case 1:
-                if ((ha->fw_dump || ha->fw_dumped) && !ha->fw_dump_reading) {
+                if (ha->fw_dumped && !ha->fw_dump_reading) {
                         ha->fw_dump_reading = 1;
 
                         if (IS_QLA24XX(ha) || IS_QLA54XX(ha))