diff options
author | Borislav Petkov <petkovbb@googlemail.com> | 2008-07-23 13:55:59 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-07-23 13:55:59 -0400 |
commit | db9d286988b9e905045c536f681e85fa5e3a728b (patch) | |
tree | 874144e07a0498c4d65dd9695f90056cbe45a1cb /drivers/ide/ide-atapi.c | |
parent | 776bb0270ea72c40f95347dcac868c9f602dcb3e (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/ide/ide-atapi.c')
-rw-r--r-- | drivers/ide/ide-atapi.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/ide/ide-atapi.c b/drivers/ide/ide-atapi.c index d5249dfc5546..0e9eeb08da2d 100644 --- a/drivers/ide/ide-atapi.c +++ b/drivers/ide/ide-atapi.c | |||
@@ -31,10 +31,7 @@ ide_startstop_t ide_pc_intr(ide_drive_t *drive, struct ide_atapi_pc *pc, | |||
31 | debug_log("Enter %s - interrupt handler\n", __func__); | 31 | debug_log("Enter %s - interrupt handler\n", __func__); |
32 | 32 | ||
33 | if (pc->flags & PC_FLAG_TIMEDOUT) { | 33 | if (pc->flags & PC_FLAG_TIMEDOUT) { |
34 | if (drive->media == ide_floppy || drive->media == ide_tape) | 34 | drive->pc_callback(drive); |
35 | drive->pc_callback(drive); | ||
36 | else | ||
37 | pc->callback(drive); | ||
38 | return ide_stopped; | 35 | return ide_stopped; |
39 | } | 36 | } |
40 | 37 | ||
@@ -100,10 +97,7 @@ cmd_finished: | |||
100 | return ide_stopped; | 97 | return ide_stopped; |
101 | } | 98 | } |
102 | /* Command finished - Call the callback function */ | 99 | /* Command finished - Call the callback function */ |
103 | if (drive->media == ide_floppy || drive->media == ide_tape) | 100 | drive->pc_callback(drive); |
104 | drive->pc_callback(drive); | ||
105 | else | ||
106 | pc->callback(drive); | ||
107 | return ide_stopped; | 101 | return ide_stopped; |
108 | } | 102 | } |
109 | 103 | ||