1 files changed, 22 insertions, 68 deletions

diff --git a/drivers/ata/sata_qstor.c b/drivers/ata/sata_qstor.c
index 0292a79f9747..339f61648af6 100644
--- a/drivers/ata/sata_qstor.c
+++ b/drivers/ata/sata_qstor.c
@@ -37,7 +37,6 @@
 #include <linux/sched.h>
 #include <linux/device.h>
 #include <scsi/scsi_host.h>
-#include <asm/io.h>
 #include <linux/libata.h>
 
 #define DRV_NAME        "sata_qstor"
@@ -117,7 +116,6 @@ static int qs_ata_init_one (struct pci_dev *pdev, const struct pci_device_id *en
 static irqreturn_t qs_intr (int irq, void *dev_instance);
 static int qs_port_start(struct ata_port *ap);
 static void qs_host_stop(struct ata_host *host);
-static void qs_port_stop(struct ata_port *ap);
 static void qs_phy_reset(struct ata_port *ap);
 static void qs_qc_prep(struct ata_queued_cmd *qc);
 static unsigned int qs_qc_issue(struct ata_queued_cmd *qc);
@@ -164,7 +162,6 @@ static const struct ata_port_operations qs_ata_ops = {
         .scr_read               = qs_scr_read,
         .scr_write              = qs_scr_write,
         .port_start             = qs_port_start,
-        .port_stop              = qs_port_stop,
         .host_stop              = qs_host_stop,
         .bmdma_stop             = qs_bmdma_stop,
         .bmdma_status           = qs_bmdma_status,
@@ -501,17 +498,13 @@ static int qs_port_start(struct ata_port *ap)
         if (rc)
                 return rc;
         qs_enter_reg_mode(ap);
-        pp = kzalloc(sizeof(*pp), GFP_KERNEL);
-        if (!pp) {
-                rc = -ENOMEM;
-                goto err_out;
-        }
-        pp->pkt = dma_alloc_coherent(dev, QS_PKT_BYTES, &pp->pkt_dma,
-                                                                GFP_KERNEL);
-        if (!pp->pkt) {
-                rc = -ENOMEM;
-                goto err_out_kfree;
-        }
+        pp = devm_kzalloc(dev, sizeof(*pp), GFP_KERNEL);
+        if (!pp)
+                return -ENOMEM;
+        pp->pkt = dmam_alloc_coherent(dev, QS_PKT_BYTES, &pp->pkt_dma,
+                                      GFP_KERNEL);
+        if (!pp->pkt)
+                return -ENOMEM;
         memset(pp->pkt, 0, QS_PKT_BYTES);
         ap->private_data = pp;
 
@@ -519,38 +512,14 @@ static int qs_port_start(struct ata_port *ap)
         writel((u32) addr,        chan + QS_CCF_CPBA);
         writel((u32)(addr >> 32), chan + QS_CCF_CPBA + 4);
         return 0;
-
-err_out_kfree:
-        kfree(pp);
-err_out:
-        ata_port_stop(ap);
-        return rc;
-}
-
-static void qs_port_stop(struct ata_port *ap)
-{
-        struct device *dev = ap->host->dev;
-        struct qs_port_priv *pp = ap->private_data;
-
-        if (pp != NULL) {
-                ap->private_data = NULL;
-                if (pp->pkt != NULL)
-                        dma_free_coherent(dev, QS_PKT_BYTES, pp->pkt,
-                                                                pp->pkt_dma);
-                kfree(pp);
-        }
-        ata_port_stop(ap);
 }
 
 static void qs_host_stop(struct ata_host *host)
 {
         void __iomem *mmio_base = host->mmio_base;
-        struct pci_dev *pdev = to_pci_dev(host->dev);
 
         writeb(0, mmio_base + QS_HCT_CTRL); /* disable host interrupts */
         writeb(QS_CNFG3_GSRST, mmio_base + QS_HCF_CNFG3); /* global reset */
-
-        pci_iounmap(pdev, mmio_base);
 }
 
 static void qs_host_init(unsigned int chip_id, struct ata_probe_ent *pe)
@@ -638,36 +607,29 @@ static int qs_ata_init_one(struct pci_dev *pdev,
         if (!printed_version++)
                 dev_printk(KERN_DEBUG, &pdev->dev, "version " DRV_VERSION "\n");
 
-        rc = pci_enable_device(pdev);
+        rc = pcim_enable_device(pdev);
         if (rc)
                 return rc;
 
         rc = pci_request_regions(pdev, DRV_NAME);
         if (rc)
-                goto err_out;
+                return rc;
 
-        if ((pci_resource_flags(pdev, 4) & IORESOURCE_MEM) == 0) {
-                rc = -ENODEV;
-                goto err_out_regions;
-        }
+        if ((pci_resource_flags(pdev, 4) & IORESOURCE_MEM) == 0)
+                return -ENODEV;
 
-        mmio_base = pci_iomap(pdev, 4, 0);
-        if (mmio_base == NULL) {
-                rc = -ENOMEM;
-                goto err_out_regions;
-        }
+        mmio_base = pcim_iomap(pdev, 4, 0);
+        if (mmio_base == NULL)
+                return -ENOMEM;
 
         rc = qs_set_dma_masks(pdev, mmio_base);
         if (rc)
-                goto err_out_iounmap;
+                return rc;
 
-        probe_ent = kmalloc(sizeof(*probe_ent), GFP_KERNEL);
-        if (probe_ent == NULL) {
-                rc = -ENOMEM;
-                goto err_out_iounmap;
-        }
+        probe_ent = devm_kzalloc(&pdev->dev, sizeof(*probe_ent), GFP_KERNEL);
+        if (probe_ent == NULL)
+                return -ENOMEM;
 
-        memset(probe_ent, 0, sizeof(*probe_ent));
         probe_ent->dev = pci_dev_to_dev(pdev);
         INIT_LIST_HEAD(&probe_ent->node);
 
@@ -694,19 +656,11 @@ static int qs_ata_init_one(struct pci_dev *pdev,
         /* initialize adapter */
         qs_host_init(board_idx, probe_ent);
 
-        rc = ata_device_add(probe_ent);
-        kfree(probe_ent);
-        if (rc != QS_PORTS)
-                goto err_out_iounmap;
-        return 0;
+        if (ata_device_add(probe_ent) != QS_PORTS)
+                return -EIO;
 
-err_out_iounmap:
-        pci_iounmap(pdev, mmio_base);
-err_out_regions:
-        pci_release_regions(pdev);
-err_out:
-        pci_disable_device(pdev);
-        return rc;
+        devm_kfree(&pdev->dev, probe_ent);
+        return 0;
 }
 
 static int __init qs_ata_init(void)