4 files changed, 30 insertions, 23 deletions

diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c
index ced2de32c511..5e573efcf0a7 100644
--- a/drivers/scsi/libsas/sas_ata.c
+++ b/drivers/scsi/libsas/sas_ata.c
@@ -382,7 +382,7 @@ int sas_ata_init_host_and_port(struct domain_device *found_dev,
         struct ata_port *ap;
 
         ata_host_init(&found_dev->sata_dev.ata_host,
-                      &ha->pcidev->dev,
+                      ha->dev,
                       sata_port_info.flags,
                       &sas_sata_ops);
         ap = ata_sas_port_alloc(&found_dev->sata_dev.ata_host,
@@ -448,10 +448,10 @@ static void sas_disc_task_done(struct sas_task *task)
  * @task: the task to be executed
  * @buffer: pointer to buffer to do I/O
  * @size: size of @buffer
- * @pci_dma_dir: PCI_DMA_...
+ * @dma_dir: DMA direction.  DMA_xxx
  */
 static int sas_execute_task(struct sas_task *task, void *buffer, int size,
-                            int pci_dma_dir)
+                            enum dma_data_direction dma_dir)
 {
         int res = 0;
         struct scatterlist *scatter = NULL;
@@ -461,7 +461,7 @@ static int sas_execute_task(struct sas_task *task, void *buffer, int size,
         struct sas_internal *i =
                 to_sas_internal(task->dev->port->ha->core.shost->transportt);
 
-        if (pci_dma_dir != PCI_DMA_NONE) {
+        if (dma_dir != DMA_NONE) {
                 scatter = kzalloc(sizeof(*scatter), GFP_KERNEL);
                 if (!scatter)
                         goto out;
@@ -474,11 +474,11 @@ static int sas_execute_task(struct sas_task *task, void *buffer, int size,
         task->scatter = scatter;
         task->num_scatter = num_scatter;
         task->total_xfer_len = size;
-        task->data_dir = pci_dma_dir;
+        task->data_dir = dma_dir;
         task->task_done = sas_disc_task_done;
-        if (pci_dma_dir != PCI_DMA_NONE &&
+        if (dma_dir != DMA_NONE &&
             sas_protocol_ata(task->task_proto)) {
-                task->num_scatter = pci_map_sg(task->dev->port->ha->pcidev,
+                task->num_scatter = dma_map_sg(task->dev->port->ha->dev,
                                                task->scatter,
                                                task->num_scatter,
                                                task->data_dir);
@@ -565,9 +565,9 @@ static int sas_execute_task(struct sas_task *task, void *buffer, int size,
                 }
         }
 ex_err:
-        if (pci_dma_dir != PCI_DMA_NONE) {
+        if (dma_dir != DMA_NONE) {
                 if (sas_protocol_ata(task->task_proto))
-                        pci_unmap_sg(task->dev->port->ha->pcidev,
+                        dma_unmap_sg(task->dev->port->ha->dev,
                                      task->scatter, task->num_scatter,
                                      task->data_dir);
                 kfree(scatter);
@@ -628,11 +628,11 @@ static void sas_get_ata_command_set(struct domain_device *dev)
  * @features: the features register
  * @buffer: pointer to buffer to do I/O
  * @size: size of @buffer
- * @pci_dma_dir: PCI_DMA_...
+ * @dma_dir: DMA direction.  DMA_xxx
  */
 static int sas_issue_ata_cmd(struct domain_device *dev, u8 command,
                              u8 features, void *buffer, int size,
-                             int pci_dma_dir)
+                             enum dma_data_direction dma_dir)
 {
         int res = 0;
         struct sas_task *task;
@@ -652,7 +652,7 @@ static int sas_issue_ata_cmd(struct domain_device *dev, u8 command,
         task->ata_task.fis.device = d2h_fis->device;
         task->ata_task.retry_count = 1;
 
-        res = sas_execute_task(task, buffer, size, pci_dma_dir);
+        res = sas_execute_task(task, buffer, size, dma_dir);
 
         sas_free_task(task);
 out:
@@ -707,7 +707,7 @@ static int sas_discover_sata_dev(struct domain_device *dev)
         }
 
         res = sas_issue_ata_cmd(dev, command, 0, identify_x, 512,
-                                PCI_DMA_FROMDEVICE);
+                                DMA_FROM_DEVICE);
         if (res)
                 goto out_err;
 
@@ -720,13 +720,13 @@ static int sas_discover_sata_dev(struct domain_device *dev)
                         goto cont1;
                 res = sas_issue_ata_cmd(dev, ATA_SET_FEATURES,
                                         ATA_FEATURE_PUP_STBY_SPIN_UP,
-                                        NULL, 0, PCI_DMA_NONE);
+                                        NULL, 0, DMA_NONE);
                 if (res)
                         goto cont1;
 
                 schedule_timeout_interruptible(5*HZ); /* More time? */
                 res = sas_issue_ata_cmd(dev, command, 0, identify_x, 512,
-                                        PCI_DMA_FROMDEVICE);
+                                        DMA_FROM_DEVICE);
                 if (res)
                         goto out_err;
         }
diff --git a/drivers/scsi/libsas/sas_discover.c b/drivers/scsi/libsas/sas_discover.c
index 6ac9f61d006a..7ef0afc3cd68 100644
--- a/drivers/scsi/libsas/sas_discover.c
+++ b/drivers/scsi/libsas/sas_discover.c
@@ -22,7 +22,6 @@
  *
  */
 
-#include <linux/pci.h>
 #include <linux/scatterlist.h>
 #include <scsi/scsi_host.h>
 #include <scsi/scsi_eh.h>
@@ -170,7 +169,7 @@ int sas_notify_lldd_dev_found(struct domain_device *dev)
                 if (res) {
                         printk("sas: driver on pcidev %s cannot handle "
                                "device %llx, error:%d\n",
-                               pci_name(sas_ha->pcidev),
+                               sas_ha->dev->bus_id,
                                SAS_ADDR(dev->sas_addr), res);
                 }
         }
diff --git a/drivers/scsi/libsas/sas_dump.c b/drivers/scsi/libsas/sas_dump.c
index f1246d2c9bef..bf34a236f946 100644
--- a/drivers/scsi/libsas/sas_dump.c
+++ b/drivers/scsi/libsas/sas_dump.c
@@ -56,7 +56,7 @@ void sas_dprint_phye(int phyid, enum phy_event pe)
 
 void sas_dprint_hae(struct sas_ha_struct *sas_ha, enum ha_event he)
 {
-        SAS_DPRINTK("ha %s: %s event\n", pci_name(sas_ha->pcidev),
+        SAS_DPRINTK("ha %s: %s event\n", sas_ha->dev->bus_id,
                     sas_hae_str[he]);
 }
 
diff --git a/drivers/scsi/libsas/sas_expander.c b/drivers/scsi/libsas/sas_expander.c
index b500f0c1449c..8727436b222d 100644
--- a/drivers/scsi/libsas/sas_expander.c
+++ b/drivers/scsi/libsas/sas_expander.c
@@ -507,14 +507,21 @@ static int sas_dev_present_in_domain(struct asd_sas_port *port,
 int sas_smp_get_phy_events(struct sas_phy *phy)
 {
         int res;
+        u8 *req;
+        u8 *resp;
         struct sas_rphy *rphy = dev_to_rphy(phy->dev.parent);
         struct domain_device *dev = sas_find_dev_by_rphy(rphy);
-        u8 *req = alloc_smp_req(RPEL_REQ_SIZE);
-        u8 *resp = kzalloc(RPEL_RESP_SIZE, GFP_KERNEL);
 
-        if (!resp)
+        req = alloc_smp_req(RPEL_REQ_SIZE);
+        if (!req)
                 return -ENOMEM;
 
+        resp = alloc_smp_resp(RPEL_RESP_SIZE);
+        if (!resp) {
+                kfree(req);
+                return -ENOMEM;
+        }
+
         req[1] = SMP_REPORT_PHY_ERR_LOG;
         req[9] = phy->number;
 
@@ -1879,7 +1886,7 @@ int sas_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy,
                     struct request *req)
 {
         struct domain_device *dev;
-        int ret, type = rphy->identify.device_type;
+        int ret, type;
         struct request *rsp = req->next_rq;
 
         if (!rsp) {
@@ -1888,12 +1895,13 @@ int sas_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy,
                 return -EINVAL;
         }
 
-        /* seems aic94xx doesn't support */
+        /* no rphy means no smp target support (ie aic94xx host) */
         if (!rphy) {
                 printk("%s: can we send a smp request to a host?\n",
                        __FUNCTION__);
                 return -EINVAL;
         }
+        type = rphy->identify.device_type;
 
         if (type != SAS_EDGE_EXPANDER_DEVICE &&
             type != SAS_FANOUT_EXPANDER_DEVICE) {