2 files changed, 6 insertions, 5 deletions

diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c
index 98769a3d31ae..f1942545a20d 100644
--- a/drivers/scsi/libata-core.c
+++ b/drivers/scsi/libata-core.c
@@ -2713,7 +2713,7 @@ static int ata_sg_setup(struct ata_queued_cmd *qc)
 /**
  *      ata_poll_qc_complete - turn irq back on and finish qc
  *      @qc: Command to complete
- *      @drv_stat: ATA status register content
+ *      @err_mask: ATA status register content
  *
  *      LOCKING:
  *      None.  (grabs host lock)
@@ -3478,7 +3478,7 @@ void ata_qc_free(struct ata_queued_cmd *qc)
 /**
  *      ata_qc_complete - Complete an active ATA command
  *      @qc: Command to complete
- *      @drv_stat: ATA Status register contents
+ *      @err_mask: ATA Status register contents
  *
  *      Indicate to the mid and upper layers that an ATA
  *      command has completed, with either an ok or not-ok status.
diff --git a/drivers/scsi/libata-scsi.c b/drivers/scsi/libata-scsi.c
index 38a895ebe826..bb30fcdc9297 100644
--- a/drivers/scsi/libata-scsi.c
+++ b/drivers/scsi/libata-scsi.c
@@ -131,7 +131,7 @@ int ata_std_bios_param(struct scsi_device *sdev, struct block_device *bdev,
 
 /**
  *      ata_cmd_ioctl - Handler for HDIO_DRIVE_CMD ioctl
- *      @dev: Device to whom we are issuing command
+ *      @scsidev: Device to which we are issuing command
  *      @arg: User provided data for issuing command
  *
  *      LOCKING:
@@ -217,7 +217,7 @@ error:
 
 /**
  *      ata_task_ioctl - Handler for HDIO_DRIVE_TASK ioctl
- *      @dev: Device to whom we are issuing command
+ *      @scsidev: Device to which we are issuing command
  *      @arg: User provided data for issuing command
  *
  *      LOCKING:
@@ -416,6 +416,7 @@ void ata_dump_status(unsigned id, struct ata_taskfile *tf)
 
 /**
  *      ata_to_sense_error - convert ATA error to SCSI error
+ *      @id: ATA device number
  *      @drv_stat: value contained in ATA status register
  *      @drv_err: value contained in ATA error register
  *      @sk: the sense key we'll fill out
@@ -2231,7 +2232,7 @@ ata_scsi_map_proto(u8 byte1)
 /**
  *      ata_scsi_pass_thru - convert ATA pass-thru CDB to taskfile
  *      @qc: command structure to be initialized
- *      @cmd: SCSI command to convert
+ *      @scsicmd: SCSI command to convert
  *
  *      Handles either 12 or 16-byte versions of the CDB.
  *