From 1c251ad4d5cebd4815eddfa4449c6e48713adf61 Mon Sep 17 00:00:00 2001 From: Grant Grundler Date: Sun, 30 Nov 2003 01:56:06 -0500 Subject: [PATCH] [libata] use sg_dma_xxx macros Fixes build on some platforms, fixes issues on others. --- drivers/scsi/libata-core.c | 14 +++++++------- drivers/scsi/sata_promise.c | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c index b92d67726018f..3f8bbaa5b92a7 100644 --- a/drivers/scsi/libata-core.c +++ b/drivers/scsi/libata-core.c @@ -1635,8 +1635,8 @@ static void ata_sg_clean(struct ata_queued_cmd *qc) if (cmd->use_sg) pci_unmap_sg(ap->host_set->pdev, sg, qc->n_elem, dir); else - pci_unmap_single(ap->host_set->pdev, sg[0].dma_address, - sg[0].length, dir); + pci_unmap_single(ap->host_set->pdev, sg_dma_address(&sg[0]), + sg_dma_len(&sg[0]), dir); qc->flags &= ~ATA_QCFLAG_SG; qc->sg = NULL; @@ -1659,8 +1659,8 @@ void ata_fill_sg(struct ata_queued_cmd *qc) assert(qc->n_elem > 0); for (i = 0; i < qc->n_elem; i++) { - ap->prd[i].addr = cpu_to_le32(sg[i].dma_address); - ap->prd[i].flags_len = cpu_to_le32(sg[i].length); + ap->prd[i].addr = cpu_to_le32(sg_dma_address(&sg[i])); + ap->prd[i].flags_len = cpu_to_le32(sg_dma_len(&sg[i])); VPRINTK("PRD[%u] = (0x%X, 0x%X)\n", i, le32_to_cpu(ap->prd[i].addr), le32_to_cpu(ap->prd[i].flags_len)); } @@ -1691,12 +1691,12 @@ static int ata_sg_setup_one(struct ata_queued_cmd *qc) sg->page = virt_to_page(cmd->request_buffer); sg->offset = (unsigned long) cmd->request_buffer & ~PAGE_MASK; - sg->length = cmd->request_bufflen; + sg_dma_len(sg) = cmd->request_bufflen; if (!have_sg) return 0; - sg->dma_address = pci_map_single(ap->host_set->pdev, + sg_dma_address(sg) = pci_map_single(ap->host_set->pdev, cmd->request_buffer, cmd->request_bufflen, dir); @@ -1917,7 +1917,7 @@ static void ata_pio_sector(struct ata_port *ap) qc->cursg_ofs++; if (cmd->use_sg) - if ((qc->cursg_ofs * ATA_SECT_SIZE) == sg[qc->cursg].length) { + if ((qc->cursg_ofs * ATA_SECT_SIZE) == sg_dma_len(&sg[qc->cursg])) { qc->cursg++; qc->cursg_ofs = 0; } diff --git a/drivers/scsi/sata_promise.c b/drivers/scsi/sata_promise.c index 0d1fd6e8eb282..783b37413f5d4 100644 --- a/drivers/scsi/sata_promise.c +++ b/drivers/scsi/sata_promise.c @@ -616,8 +616,8 @@ static void pdc20621_fill_sg(struct ata_queued_cmd *qc) last = qc->n_elem; idx = 0; for (i = 0; i < last; i++) { - buf[idx++] = cpu_to_le32(sg[i].dma_address); - buf[idx++] = cpu_to_le32(sg[i].length); + buf[idx++] = cpu_to_le32(sg_dma_address(&sg[i])); + buf[idx++] = cpu_to_le32(sg_dma_len(&sg[i])); total_len += sg[i].length; } buf[idx - 1] |= cpu_to_le32(ATA_PRD_EOT); -- 2.53.0