scsi: pm8001: Provide function name and fix a misspelling

[linux-2.6-microblaze.git] / drivers / scsi / pm8001 / pm8001_init.c

diff --git a/drivers/scsi/pm8001/pm8001_init.c b/drivers/scsi/pm8001/pm8001_init.c
index ee2de17..bbb6b23 100644 (file)
--- a/drivers/scsi/pm8001/pm8001_init.c
+++ b/drivers/scsi/pm8001/pm8001_init.c
@@ -184,7 +184,7 @@ static void pm8001_free(struct pm8001_hba_info *pm8001_ha)
 #ifdef PM8001_USE_TASKLET
 
 /**
- * tasklet for 64 msi-x interrupt handler
+ * pm8001_tasklet() - tasklet for 64 msi-x interrupt handler
  * @opaque: the passed general host adapter struct
  * Note: pm8001_tasklet is common for pm8001 & pm80xx
  */
@@ -423,7 +423,7 @@ err_out_shost:
 err_out_nodev:
        for (i = 0; i < pm8001_ha->max_memcnt; i++) {
                if (pm8001_ha->memoryMap.region[i].virt_ptr != NULL) {
-                       pci_free_consistent(pm8001_ha->pdev,
+                       dma_free_coherent(&pm8001_ha->pdev->dev,
                                (pm8001_ha->memoryMap.region[i].total_len +
                                pm8001_ha->memoryMap.region[i].alignment),
                                pm8001_ha->memoryMap.region[i].virt_ptr,
@@ -466,9 +466,12 @@ static int pm8001_ioremap(struct pm8001_hba_info *pm8001_ha)
                        pm8001_ha->io_mem[logicalBar].memvirtaddr =
                                ioremap(pm8001_ha->io_mem[logicalBar].membase,
                                pm8001_ha->io_mem[logicalBar].memsize);
-                       pm8001_dbg(pm8001_ha, INIT,
-                                  "PCI: bar %d, logicalBar %d\n",
+                       if (!pm8001_ha->io_mem[logicalBar].memvirtaddr) {
+                               pm8001_dbg(pm8001_ha, INIT,
+                                       "Failed to ioremap bar %d, logicalBar %d",
                                   bar, logicalBar);
+                               return -ENOMEM;
+                       }
                        pm8001_dbg(pm8001_ha, INIT,
                                   "base addr %llx virt_addr=%llx len=%d\n",
                                   (u64)pm8001_ha->io_mem[logicalBar].membase,
@@ -540,9 +543,11 @@ static struct pm8001_hba_info *pm8001_pci_alloc(struct pci_dev *pdev,
                        tasklet_init(&pm8001_ha->tasklet[j], pm8001_tasklet,
                                (unsigned long)&(pm8001_ha->irq_vector[j]));
 #endif
-       pm8001_ioremap(pm8001_ha);
+       if (pm8001_ioremap(pm8001_ha))
+               goto failed_pci_alloc;
        if (!pm8001_alloc(pm8001_ha, ent))
                return pm8001_ha;
+failed_pci_alloc:
        pm8001_free(pm8001_ha);
        return NULL;
 }
@@ -859,7 +864,7 @@ void pm8001_get_phy_mask(struct pm8001_hba_info *pm8001_ha, int *phymask)
 }
 
 /**
- * pm8001_set_phy_settings_ven_117c_12Gb : Configure ATTO 12Gb PHY settings
+ * pm8001_set_phy_settings_ven_117c_12G() : Configure ATTO 12Gb PHY settings
  * @pm8001_ha : our adapter
  */
 static
@@ -1192,12 +1197,13 @@ pm8001_init_ccb_tag(struct pm8001_hba_info *pm8001_ha, struct Scsi_Host *shost,
                goto err_out_noccb;
        }
        for (i = 0; i < ccb_count; i++) {
-               pm8001_ha->ccb_info[i].buf_prd = pci_alloc_consistent(pdev,
+               pm8001_ha->ccb_info[i].buf_prd = dma_alloc_coherent(&pdev->dev,
                                sizeof(struct pm8001_prd) * PM8001_MAX_DMA_SG,
-                               &pm8001_ha->ccb_info[i].ccb_dma_handle);
+                               &pm8001_ha->ccb_info[i].ccb_dma_handle,
+                               GFP_KERNEL);
                if (!pm8001_ha->ccb_info[i].buf_prd) {
                        pm8001_dbg(pm8001_ha, FAIL,
-                                  "pm80xx: ccb prd memory allocation error\n");
+                                  "ccb prd memory allocation error\n");
                        goto err_out;
                }
                pm8001_ha->ccb_info[i].task = NULL;