bk://gkernel.bkbits.net/libata-2.6 jgarzik@pobox.com|ChangeSet|20041115090026|53483 jgarzik # This is a BitKeeper generated diff -Nru style patch. # # ChangeSet # 2004/11/15 00:17:15-05:00 jgarzik@pobox.com # [libata] fix DocBook bugs # # drivers/scsi/libata-scsi.c # 2004/11/15 00:17:09-05:00 jgarzik@pobox.com +3 -1 # [libata] fix DocBook bugs # # drivers/scsi/libata-core.c # 2004/11/15 00:17:09-05:00 jgarzik@pobox.com +6 -4 # [libata] fix DocBook bugs # diff -Nru a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c --- a/drivers/scsi/libata-core.c 2004-11-15 20:47:22 -08:00 +++ b/drivers/scsi/libata-core.c 2004-11-15 20:47:22 -08:00 @@ -582,7 +582,7 @@ /** * ata_udma_string - convert UDMA bit offset to string - * @udma_mask: mask of bits supported; only highest bit counts. + * @mask: mask of bits supported; only highest bit counts. * * Determine string which represents the highest speed * (highest bit in @udma_mask). @@ -819,7 +819,7 @@ /** * ata_dev_id_string - Convert IDENTIFY DEVICE page into string - * @dev: Device whose IDENTIFY DEVICE results we will examine + * @id: IDENTIFY DEVICE results we will examine * @s: string into which data is output * @ofs: offset into identify device page * @len: length of string to return. must be an even number. @@ -1766,8 +1766,10 @@ } /** - * ata_choose_xfer_mode - - * @ap: + * ata_choose_xfer_mode - attempt to find best transfer mode + * @ap: Port for which an xfer mode will be selected + * @xfer_mode_out: (output) SET FEATURES - XFER MODE code + * @xfer_shift_out: (output) bit shift that selects this mode * * LOCKING: * diff -Nru a/drivers/scsi/libata-scsi.c b/drivers/scsi/libata-scsi.c --- a/drivers/scsi/libata-scsi.c 2004-11-15 20:47:22 -08:00 +++ b/drivers/scsi/libata-scsi.c 2004-11-15 20:47:22 -08:00 @@ -156,6 +156,7 @@ /** * 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 @@ -735,6 +736,7 @@ /** * 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. * @@ -1334,7 +1336,7 @@ /** * ata_scsi_find_dev - lookup ata_device from scsi_cmnd * @ap: ATA port to which the device is attached - * @cmd: SCSI command to be sent to the device + * @scsidev: SCSI device from which we derive the ATA device * * Given various information provided in struct scsi_cmnd, * map that onto an ATA bus, and using that mapping