aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi
diff options
context:
space:
mode:
authorBorislav Petkov <petkovbb@googlemail.com>2008-07-23 13:55:59 -0400
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-07-23 13:55:59 -0400
commitdb9d286988b9e905045c536f681e85fa5e3a728b (patch)
tree874144e07a0498c4d65dd9695f90056cbe45a1cb /drivers/scsi
parent776bb0270ea72c40f95347dcac868c9f602dcb3e (diff)
ide-scsi: use drive->pc_callback instead of pc->callback
There should be no functionality change resulting from this patch. Signed-off-by: Borislav Petkov <petkovbb@gmail.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/scsi')
-rw-r--r--drivers/scsi/ide-scsi.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/scsi/ide-scsi.c b/drivers/scsi/ide-scsi.c
index 659db3f7ae08..37cfec43bd40 100644
--- a/drivers/scsi/ide-scsi.c
+++ b/drivers/scsi/ide-scsi.c
@@ -229,7 +229,6 @@ static int idescsi_check_condition(ide_drive_t *drive,
229 rq->cmd_type = REQ_TYPE_SENSE; 229 rq->cmd_type = REQ_TYPE_SENSE;
230 rq->cmd_flags |= REQ_PREEMPT; 230 rq->cmd_flags |= REQ_PREEMPT;
231 pc->timeout = jiffies + WAIT_READY; 231 pc->timeout = jiffies + WAIT_READY;
232 pc->callback = ide_scsi_callback;
233 /* NOTE! Save the failed packet command in "rq->buffer" */ 232 /* NOTE! Save the failed packet command in "rq->buffer" */
234 rq->buffer = (void *) failed_cmd->special; 233 rq->buffer = (void *) failed_cmd->special;
235 pc->scsi_cmd = ((struct ide_atapi_pc *) failed_cmd->special)->scsi_cmd; 234 pc->scsi_cmd = ((struct ide_atapi_pc *) failed_cmd->special)->scsi_cmd;
@@ -465,6 +464,9 @@ static void idescsi_setup (ide_drive_t *drive, idescsi_scsi_t *scsi)
465#if IDESCSI_DEBUG_LOG 464#if IDESCSI_DEBUG_LOG
466 set_bit(IDESCSI_LOG_CMD, &scsi->log); 465 set_bit(IDESCSI_LOG_CMD, &scsi->log);
467#endif /* IDESCSI_DEBUG_LOG */ 466#endif /* IDESCSI_DEBUG_LOG */
467
468 drive->pc_callback = ide_scsi_callback;
469
468 idescsi_add_settings(drive); 470 idescsi_add_settings(drive);
469} 471}
470 472
@@ -616,7 +618,6 @@ static int idescsi_queue (struct scsi_cmnd *cmd,
616 pc->scsi_cmd = cmd; 618 pc->scsi_cmd = cmd;
617 pc->done = done; 619 pc->done = done;
618 pc->timeout = jiffies + cmd->timeout_per_command; 620 pc->timeout = jiffies + cmd->timeout_per_command;
619 pc->callback = ide_scsi_callback;
620 621
621 if (test_bit(IDESCSI_LOG_CMD, &scsi->log)) { 622 if (test_bit(IDESCSI_LOG_CMD, &scsi->log)) {
622 printk ("ide-scsi: %s: que %lu, cmd = ", drive->name, cmd->serial_number); 623 printk ("ide-scsi: %s: que %lu, cmd = ", drive->name, cmd->serial_number);