4 files changed, 27 insertions, 91 deletions

diff --git a/drivers/scsi/aic7xxx/aic79xx_osm.c b/drivers/scsi/aic7xxx/aic79xx_osm.c
index 6054881f21f1..286ab83116f9 100644
--- a/drivers/scsi/aic7xxx/aic79xx_osm.c
+++ b/drivers/scsi/aic7xxx/aic79xx_osm.c
@@ -376,21 +376,10 @@ static __inline void
 ahd_linux_unmap_scb(struct ahd_softc *ahd, struct scb *scb)
 {
         struct scsi_cmnd *cmd;
-        int direction;
 
         cmd = scb->io_ctx;
-        direction = cmd->sc_data_direction;
         ahd_sync_sglist(ahd, scb, BUS_DMASYNC_POSTWRITE);
-        if (cmd->use_sg != 0) {
-                struct scatterlist *sg;
-
-                sg = (struct scatterlist *)cmd->request_buffer;
-                pci_unmap_sg(ahd->dev_softc, sg, cmd->use_sg, direction);
-        } else if (cmd->request_bufflen != 0) {
-                pci_unmap_single(ahd->dev_softc,
-                                 scb->platform_data->buf_busaddr,
-                                 cmd->request_bufflen, direction);
-        }
+        scsi_dma_unmap(cmd);
 }
 
 /******************************** Macros **************************************/
@@ -1422,6 +1411,7 @@ ahd_linux_run_command(struct ahd_softc *ahd, struct ahd_linux_device *dev,
         u_int    col_idx;
         uint16_t mask;
         unsigned long flags;
+        int nseg;
 
         ahd_lock(ahd, &flags);
 
@@ -1494,18 +1484,17 @@ ahd_linux_run_command(struct ahd_softc *ahd, struct ahd_linux_device *dev,
         ahd_set_residual(scb, 0);
         ahd_set_sense_residual(scb, 0);
         scb->sg_count = 0;
-        if (cmd->use_sg != 0) {
-                void    *sg;
-                struct   scatterlist *cur_seg;
-                u_int    nseg;
-                int      dir;
-
-                cur_seg = (struct scatterlist *)cmd->request_buffer;
-                dir = cmd->sc_data_direction;
-                nseg = pci_map_sg(ahd->dev_softc, cur_seg,
-                                  cmd->use_sg, dir);
+
+        nseg = scsi_dma_map(cmd);
+        BUG_ON(nseg < 0);
+        if (nseg > 0) {
+                void *sg = scb->sg_list;
+                struct scatterlist *cur_seg;
+                int i;
+
                 scb->platform_data->xfer_len = 0;
-                for (sg = scb->sg_list; nseg > 0; nseg--, cur_seg++) {
+
+                scsi_for_each_sg(cmd, cur_seg, nseg, i) {
                         dma_addr_t addr;
                         bus_size_t len;
 
@@ -1513,22 +1502,8 @@ ahd_linux_run_command(struct ahd_softc *ahd, struct ahd_linux_device *dev,
                         len = sg_dma_len(cur_seg);
                         scb->platform_data->xfer_len += len;
                         sg = ahd_sg_setup(ahd, scb, sg, addr, len,
-                                          /*last*/nseg == 1);
+                                          i == (nseg - 1));
                 }
-        } else if (cmd->request_bufflen != 0) {
-                void *sg;
-                dma_addr_t addr;
-                int dir;
-
-                sg = scb->sg_list;
-                dir = cmd->sc_data_direction;
-                addr = pci_map_single(ahd->dev_softc,
-                                      cmd->request_buffer,
-                                      cmd->request_bufflen, dir);
-                scb->platform_data->xfer_len = cmd->request_bufflen;
-                scb->platform_data->buf_busaddr = addr;
-                sg = ahd_sg_setup(ahd, scb, sg, addr,
-                                  cmd->request_bufflen, /*last*/TRUE);
         }
 
         LIST_INSERT_HEAD(&ahd->pending_scbs, scb, pending_links);
diff --git a/drivers/scsi/aic7xxx/aic79xx_osm.h b/drivers/scsi/aic7xxx/aic79xx_osm.h
index ad9761b237dc..853998be1474 100644
--- a/drivers/scsi/aic7xxx/aic79xx_osm.h
+++ b/drivers/scsi/aic7xxx/aic79xx_osm.h
@@ -781,7 +781,7 @@ int ahd_get_transfer_dir(struct scb *scb)
 static __inline
 void ahd_set_residual(struct scb *scb, u_long resid)
 {
-        scb->io_ctx->resid = resid;
+        scsi_set_resid(scb->io_ctx, resid);
 }
 
 static __inline
@@ -793,7 +793,7 @@ void ahd_set_sense_residual(struct scb *scb, u_long resid)
 static __inline
 u_long ahd_get_residual(struct scb *scb)
 {
-        return (scb->io_ctx->resid);
+        return scsi_get_resid(scb->io_ctx);
 }
 
 static __inline
diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm.c b/drivers/scsi/aic7xxx/aic7xxx_osm.c
index 660f26e23a38..1803ab6fc21c 100644
--- a/drivers/scsi/aic7xxx/aic7xxx_osm.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_osm.c
@@ -402,18 +402,8 @@ ahc_linux_unmap_scb(struct ahc_softc *ahc, struct scb *scb)
 
         cmd = scb->io_ctx;
         ahc_sync_sglist(ahc, scb, BUS_DMASYNC_POSTWRITE);
-        if (cmd->use_sg != 0) {
-                struct scatterlist *sg;
-
-                sg = (struct scatterlist *)cmd->request_buffer;
-                pci_unmap_sg(ahc->dev_softc, sg, cmd->use_sg,
-                             cmd->sc_data_direction);
-        } else if (cmd->request_bufflen != 0) {
-                pci_unmap_single(ahc->dev_softc,
-                                 scb->platform_data->buf_busaddr,
-                                 cmd->request_bufflen,
-                                 cmd->sc_data_direction);
-        }
+
+        scsi_dma_unmap(cmd);
 }
 
 static __inline int
@@ -1381,6 +1371,7 @@ ahc_linux_run_command(struct ahc_softc *ahc, struct ahc_linux_device *dev,
         struct   ahc_tmode_tstate *tstate;
         uint16_t mask;
         struct scb_tailq *untagged_q = NULL;
+        int nseg;
 
         /*
          * Schedule us to run later.  The only reason we are not
@@ -1472,23 +1463,21 @@ ahc_linux_run_command(struct ahc_softc *ahc, struct ahc_linux_device *dev,
         ahc_set_residual(scb, 0);
         ahc_set_sense_residual(scb, 0);
         scb->sg_count = 0;
-        if (cmd->use_sg != 0) {
+
+        nseg = scsi_dma_map(cmd);
+        BUG_ON(nseg < 0);
+        if (nseg > 0) {
                 struct  ahc_dma_seg *sg;
                 struct  scatterlist *cur_seg;
-                struct  scatterlist *end_seg;
-                int     nseg;
+                int i;
 
-                cur_seg = (struct scatterlist *)cmd->request_buffer;
-                nseg = pci_map_sg(ahc->dev_softc, cur_seg, cmd->use_sg,
-                                  cmd->sc_data_direction);
-                end_seg = cur_seg + nseg;
                 /* Copy the segments into the SG list. */
                 sg = scb->sg_list;
                 /*
                  * The sg_count may be larger than nseg if
                  * a transfer crosses a 32bit page.
-                 */ 
-                while (cur_seg < end_seg) {
+                 */
+                scsi_for_each_sg(cmd, cur_seg, nseg, i) {
                         dma_addr_t addr;
                         bus_size_t len;
                         int consumed;
@@ -1499,7 +1488,6 @@ ahc_linux_run_command(struct ahc_softc *ahc, struct ahc_linux_device *dev,
                                                      sg, addr, len);
                         sg += consumed;
                         scb->sg_count += consumed;
-                        cur_seg++;
                 }
                 sg--;
                 sg->len |= ahc_htole32(AHC_DMA_LAST_SEG);
@@ -1516,33 +1504,6 @@ ahc_linux_run_command(struct ahc_softc *ahc, struct ahc_linux_device *dev,
                  */
                 scb->hscb->dataptr = scb->sg_list->addr;
                 scb->hscb->datacnt = scb->sg_list->len;
-        } else if (cmd->request_bufflen != 0) {
-                struct   ahc_dma_seg *sg;
-                dma_addr_t addr;
-
-                sg = scb->sg_list;
-                addr = pci_map_single(ahc->dev_softc,
-                                      cmd->request_buffer,
-                                      cmd->request_bufflen,
-                                      cmd->sc_data_direction);
-                scb->platform_data->buf_busaddr = addr;
-                scb->sg_count = ahc_linux_map_seg(ahc, scb,
-                                                  sg, addr,
-                                                  cmd->request_bufflen);
-                sg->len |= ahc_htole32(AHC_DMA_LAST_SEG);
-
-                /*
-                 * Reset the sg list pointer.
-                 */
-                scb->hscb->sgptr =
-                        ahc_htole32(scb->sg_list_phys | SG_FULL_RESID);
-
-                /*
-                 * Copy the first SG into the "current"
-                 * data pointer area.
-                 */
-                scb->hscb->dataptr = sg->addr;
-                scb->hscb->datacnt = sg->len;
         } else {
                 scb->hscb->sgptr = ahc_htole32(SG_LIST_NULL);
                 scb->hscb->dataptr = 0;
diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm.h b/drivers/scsi/aic7xxx/aic7xxx_osm.h
index 8fee7edc6eb3..b48dab447bde 100644
--- a/drivers/scsi/aic7xxx/aic7xxx_osm.h
+++ b/drivers/scsi/aic7xxx/aic7xxx_osm.h
@@ -751,7 +751,7 @@ int ahc_get_transfer_dir(struct scb *scb)
 static __inline
 void ahc_set_residual(struct scb *scb, u_long resid)
 {
-        scb->io_ctx->resid = resid;
+        scsi_set_resid(scb->io_ctx, resid);
 }
 
 static __inline
@@ -763,7 +763,7 @@ void ahc_set_sense_residual(struct scb *scb, u_long resid)
 static __inline
 u_long ahc_get_residual(struct scb *scb)
 {
-        return (scb->io_ctx->resid);
+        return scsi_get_resid(scb->io_ctx);
 }
 
 static __inline