[libata] ATAPI pad allocation fixes/cleanup

Use ata_pad_{alloc,free} in two drivers, to factor out common code.

Add ata_pad_{alloc,free} to two other drivers, which needed the padding
but had not been updated.

1 files changed, 23 insertions, 8 deletions

diff --git a/drivers/scsi/sata_mv.c b/drivers/scsi/sata_mv.c
index 64af334e71f4..0f469e3dabe2 100644
--- a/drivers/scsi/sata_mv.c
+++ b/drivers/scsi/sata_mv.c
@@ -670,6 +670,11 @@ static void mv_host_stop(struct ata_host_set *host_set)
         ata_host_stop(host_set);
 }
 
+static inline void mv_priv_free(struct mv_port_priv *pp, struct device *dev)
+{
+        dma_free_coherent(dev, MV_PORT_PRIV_DMA_SZ, pp->crpb, pp->crpb_dma);
+}
+
 /**
  *      mv_port_start - Port specific init/start routine.
  *      @ap: ATA channel to manipulate
@@ -687,21 +692,23 @@ static int mv_port_start(struct ata_port *ap)
         void __iomem *port_mmio = mv_ap_base(ap);
         void *mem;
         dma_addr_t mem_dma;
+        int rc = -ENOMEM;
 
         pp = kmalloc(sizeof(*pp), GFP_KERNEL);
-        if (!pp) {
-                return -ENOMEM;
-        }
+        if (!pp)
+                goto err_out;
         memset(pp, 0, sizeof(*pp));
 
         mem = dma_alloc_coherent(dev, MV_PORT_PRIV_DMA_SZ, &mem_dma, 
                                  GFP_KERNEL);
-        if (!mem) {
-                kfree(pp);
-                return -ENOMEM;
-        }
+        if (!mem)
+                goto err_out_pp;
         memset(mem, 0, MV_PORT_PRIV_DMA_SZ);
 
+        rc = ata_pad_alloc(ap, dev);
+        if (rc)
+                goto err_out_priv;
+
         /* First item in chunk of DMA memory: 
          * 32-slot command request table (CRQB), 32 bytes each in size
          */
@@ -746,6 +753,13 @@ static int mv_port_start(struct ata_port *ap)
          */
         ap->private_data = pp;
         return 0;
+
+err_out_priv:
+        mv_priv_free(pp, dev);
+err_out_pp:
+        kfree(pp);
+err_out:
+        return rc;
 }
 
 /**
@@ -768,7 +782,8 @@ static void mv_port_stop(struct ata_port *ap)
         spin_unlock_irqrestore(&ap->host_set->lock, flags);
 
         ap->private_data = NULL;
-        dma_free_coherent(dev, MV_PORT_PRIV_DMA_SZ, pp->crpb, pp->crpb_dma);
+        ata_pad_free(ap, dev);
+        mv_priv_free(pp, dev);
         kfree(pp);
 }