9 files changed, 38 insertions, 35 deletions

diff --git a/drivers/ata/libata-sff.c b/drivers/ata/libata-sff.c
index a58693bdde9d..6f52b598b8d2 100644
--- a/drivers/ata/libata-sff.c
+++ b/drivers/ata/libata-sff.c
@@ -2650,6 +2650,7 @@ EXPORT_SYMBOL_GPL(ata_bmdma32_port_ops);
 static void ata_bmdma_fill_sg(struct ata_queued_cmd *qc)
 {
         struct ata_port *ap = qc->ap;
+        struct ata_bmdma_prd *prd = ap->bmdma_prd;
         struct scatterlist *sg;
         unsigned int si, pi;
 
@@ -2671,8 +2672,8 @@ static void ata_bmdma_fill_sg(struct ata_queued_cmd *qc)
                         if ((offset + sg_len) > 0x10000)
                                 len = 0x10000 - offset;
 
-                        ap->prd[pi].addr = cpu_to_le32(addr);
-                        ap->prd[pi].flags_len = cpu_to_le32(len & 0xffff);
+                        prd[pi].addr = cpu_to_le32(addr);
+                        prd[pi].flags_len = cpu_to_le32(len & 0xffff);
                         VPRINTK("PRD[%u] = (0x%X, 0x%X)\n", pi, addr, len);
 
                         pi++;
@@ -2681,7 +2682,7 @@ static void ata_bmdma_fill_sg(struct ata_queued_cmd *qc)
                 }
         }
 
-        ap->prd[pi - 1].flags_len |= cpu_to_le32(ATA_PRD_EOT);
+        prd[pi - 1].flags_len |= cpu_to_le32(ATA_PRD_EOT);
 }
 
 /**
@@ -2700,6 +2701,7 @@ static void ata_bmdma_fill_sg(struct ata_queued_cmd *qc)
 static void ata_bmdma_fill_sg_dumb(struct ata_queued_cmd *qc)
 {
         struct ata_port *ap = qc->ap;
+        struct ata_bmdma_prd *prd = ap->bmdma_prd;
         struct scatterlist *sg;
         unsigned int si, pi;
 
@@ -2722,16 +2724,16 @@ static void ata_bmdma_fill_sg_dumb(struct ata_queued_cmd *qc)
                                 len = 0x10000 - offset;
 
                         blen = len & 0xffff;
-                        ap->prd[pi].addr = cpu_to_le32(addr);
+                        prd[pi].addr = cpu_to_le32(addr);
                         if (blen == 0) {
                                 /* Some PATA chipsets like the CS5530 can't
                                    cope with 0x0000 meaning 64K as the spec
                                    says */
-                                ap->prd[pi].flags_len = cpu_to_le32(0x8000);
+                                prd[pi].flags_len = cpu_to_le32(0x8000);
                                 blen = 0x8000;
-                                ap->prd[++pi].addr = cpu_to_le32(addr + 0x8000);
+                                prd[++pi].addr = cpu_to_le32(addr + 0x8000);
                         }
-                        ap->prd[pi].flags_len = cpu_to_le32(blen);
+                        prd[pi].flags_len = cpu_to_le32(blen);
                         VPRINTK("PRD[%u] = (0x%X, 0x%X)\n", pi, addr, len);
 
                         pi++;
@@ -2740,7 +2742,7 @@ static void ata_bmdma_fill_sg_dumb(struct ata_queued_cmd *qc)
                 }
         }
 
-        ap->prd[pi - 1].flags_len |= cpu_to_le32(ATA_PRD_EOT);
+        prd[pi - 1].flags_len |= cpu_to_le32(ATA_PRD_EOT);
 }
 
 /**
@@ -2872,7 +2874,7 @@ void ata_bmdma_setup(struct ata_queued_cmd *qc)
 
         /* load PRD table addr. */
         mb();   /* make sure PRD table writes are visible to controller */
-        iowrite32(ap->prd_dma, ap->ioaddr.bmdma_addr + ATA_DMA_TABLE_OFS);
+        iowrite32(ap->bmdma_prd_dma, ap->ioaddr.bmdma_addr + ATA_DMA_TABLE_OFS);
 
         /* specify data direction, triple-check start bit is clear */
         dmactl = ioread8(ap->ioaddr.bmdma_addr + ATA_DMA_CMD);
@@ -2977,9 +2979,10 @@ EXPORT_SYMBOL_GPL(ata_bmdma_status);
 int ata_bmdma_port_start(struct ata_port *ap)
 {
         if (ap->mwdma_mask || ap->udma_mask) {
-                ap->prd = dmam_alloc_coherent(ap->host->dev, ATA_PRD_TBL_SZ,
-                                              &ap->prd_dma, GFP_KERNEL);
-                if (!ap->prd)
+                ap->bmdma_prd =
+                        dmam_alloc_coherent(ap->host->dev, ATA_PRD_TBL_SZ,
+                                            &ap->bmdma_prd_dma, GFP_KERNEL);
+                if (!ap->bmdma_prd)
                         return -ENOMEM;
         }
 
diff --git a/drivers/ata/pata_ns87415.c b/drivers/ata/pata_ns87415.c
index 830431f036a1..fdbba2d76d3e 100644
--- a/drivers/ata/pata_ns87415.c
+++ b/drivers/ata/pata_ns87415.c
@@ -126,7 +126,7 @@ static void ns87415_bmdma_setup(struct ata_queued_cmd *qc)
 
         /* load PRD table addr. */
         mb();   /* make sure PRD table writes are visible to controller */
-        iowrite32(ap->prd_dma, ap->ioaddr.bmdma_addr + ATA_DMA_TABLE_OFS);
+        iowrite32(ap->bmdma_prd_dma, ap->ioaddr.bmdma_addr + ATA_DMA_TABLE_OFS);
 
         /* specify data direction, triple-check start bit is clear */
         dmactl = ioread8(ap->ioaddr.bmdma_addr + ATA_DMA_CMD);
diff --git a/drivers/ata/pata_scc.c b/drivers/ata/pata_scc.c
index 93f690e51a79..6f6193b707cb 100644
--- a/drivers/ata/pata_scc.c
+++ b/drivers/ata/pata_scc.c
@@ -441,7 +441,7 @@ static void scc_bmdma_setup (struct ata_queued_cmd *qc)
         void __iomem *mmio = ap->ioaddr.bmdma_addr;
 
         /* load PRD table addr */
-        out_be32(mmio + SCC_DMA_TABLE_OFS, ap->prd_dma);
+        out_be32(mmio + SCC_DMA_TABLE_OFS, ap->bmdma_prd_dma);
 
         /* specify data direction, triple-check start bit is clear */
         dmactl = in_be32(mmio + SCC_DMA_CMD);
@@ -905,7 +905,7 @@ static int scc_port_start (struct ata_port *ap)
         if (rc)
                 return rc;
 
-        out_be32(mmio + SCC_DMA_PTERADD, ap->prd_dma);
+        out_be32(mmio + SCC_DMA_PTERADD, ap->bmdma_prd_dma);
         return 0;
 }
 
diff --git a/drivers/ata/sata_nv.c b/drivers/ata/sata_nv.c
index 7a283d5d68f3..4863a62c3d8c 100644
--- a/drivers/ata/sata_nv.c
+++ b/drivers/ata/sata_nv.c
@@ -272,7 +272,7 @@ enum ncq_saw_flag_list {
 };
 
 struct nv_swncq_port_priv {
-        struct ata_prd  *prd;    /* our SG list */
+        struct ata_bmdma_prd *prd;       /* our SG list */
         dma_addr_t      prd_dma; /* and its DMA mapping */
         void __iomem    *sactive_block;
         void __iomem    *irq_block;
@@ -2027,7 +2027,7 @@ static void nv_swncq_fill_sg(struct ata_queued_cmd *qc)
         struct ata_port *ap = qc->ap;
         struct scatterlist *sg;
         struct nv_swncq_port_priv *pp = ap->private_data;
-        struct ata_prd *prd;
+        struct ata_bmdma_prd *prd;
         unsigned int si, idx;
 
         prd = pp->prd + ATA_MAX_PRD * qc->tag;
diff --git a/drivers/ata/sata_promise.c b/drivers/ata/sata_promise.c
index 09a6179f5de3..f03ad48273ff 100644
--- a/drivers/ata/sata_promise.c
+++ b/drivers/ata/sata_promise.c
@@ -500,7 +500,7 @@ static int pdc_sata_scr_write(struct ata_link *link,
 static void pdc_atapi_pkt(struct ata_queued_cmd *qc)
 {
         struct ata_port *ap = qc->ap;
-        dma_addr_t sg_table = ap->prd_dma;
+        dma_addr_t sg_table = ap->bmdma_prd_dma;
         unsigned int cdb_len = qc->dev->cdb_len;
         u8 *cdb = qc->cdb;