This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / drivers / scsi / libata-scsi.c

diff --git a/drivers/scsi/libata-scsi.c b/drivers/scsi/libata-scsi.c
index 1b8bc9b..d1d2062 100644 (file)
--- a/drivers/scsi/libata-scsi.c
+++ b/drivers/scsi/libata-scsi.c
@@ -156,7 +156,6 @@ struct ata_queued_cmd *ata_scsi_qc_new(struct ata_port *ap,
 /**
  *     ata_to_sense_error - convert ATA error to SCSI error
  *     @qc: Command that we are erroring out
- *     @drv_stat: value contained in ATA status register
  *
  *     Converts an ATA error into a SCSI error. While we are at it
  *     we decode and dump the ATA error for the user so that they
@@ -679,7 +678,7 @@ static void ata_scsi_translate(struct ata_port *ap, struct ata_device *dev,
                        ata_sg_init_one(qc, cmd->request_buffer,
                                        cmd->request_bufflen);
 
-               qc->dma_dir = cmd->sc_data_direction;
+               qc->pci_dma_dir = scsi_to_pci_dma_dir(cmd->sc_data_direction);
        }
 
        qc->complete_fn = ata_scsi_qc_complete;
@@ -736,7 +735,6 @@ static unsigned int ata_scsi_rbuf_get(struct scsi_cmnd *cmd, u8 **buf_out)
 /**
  *     ata_scsi_rbuf_put - Unmap response buffer.
  *     @cmd: SCSI command containing buffer to be unmapped.
- *     @buf: buffer to unmap
  *
  *     Unmaps response buffer contained within @cmd.
  *
@@ -1294,11 +1292,6 @@ static unsigned int atapi_xlat(struct ata_queued_cmd *qc, u8 *scsicmd)
        int using_pio = (dev->flags & ATA_DFLAG_PIO);
        int nodata = (cmd->sc_data_direction == SCSI_DATA_NONE);
 
-       if (!using_pio)
-               /* Check whether ATAPI DMA is safe */
-               if (ata_check_atapi_dma(qc))
-                       using_pio = 1;
-
        memcpy(&qc->cdb, scsicmd, qc->ap->cdb_len);
 
        qc->complete_fn = atapi_qc_complete;
@@ -1341,7 +1334,7 @@ static unsigned int atapi_xlat(struct ata_queued_cmd *qc, u8 *scsicmd)
 /**
  *     ata_scsi_find_dev - lookup ata_device from scsi_cmnd
  *     @ap: ATA port to which the device is attached
- *     @scsidev: SCSI device from which we derive the ATA device
+ *     @cmd: SCSI command to be sent to the device
  *
  *     Given various information provided in struct scsi_cmnd,
  *     map that onto an ATA bus, and using that mapping