[SCSI] qla2xxx: Cleanse memory allocation logic during probe.

- Drop loop-till-allocated structure of code within
  qla2x00_mem_alloc().
- Properly unwind deallcations of memory during failures.
- Drop qla2x00_allocate_sp_pool() and qla2x00_free_sp_pool()
  functions as their implementations can easily be collapsed into
  the callers.
- Defer DMA pool allocation of SFP data until requested.

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

1 files changed, 13 insertions, 0 deletions

diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c
index adf97320574b..1dd8591bd5c2 100644
--- a/drivers/scsi/qla2xxx/qla_attr.c
+++ b/drivers/scsi/qla2xxx/qla_attr.c
@@ -428,6 +428,19 @@ qla2x00_sysfs_read_sfp(struct kobject *kobj,
         if (!capable(CAP_SYS_ADMIN) || off != 0 || count != SFP_DEV_SIZE * 2)
                 return 0;
 
+        if (ha->sfp_data)
+                goto do_read;
+
+        ha->sfp_data = dma_pool_alloc(ha->s_dma_pool, GFP_KERNEL,
+            &ha->sfp_data_dma);
+        if (!ha->sfp_data) {
+                qla_printk(KERN_WARNING, ha,
+                    "Unable to allocate memory for SFP read-data.\n");
+                return 0;
+        }
+
+do_read:
+        memset(ha->sfp_data, 0, SFP_BLOCK_SIZE);
         addr = 0xa0;
         for (iter = 0, offset = 0; iter < (SFP_DEV_SIZE * 2) / SFP_BLOCK_SIZE;
             iter++, offset += SFP_BLOCK_SIZE) {