commit db9d286988b9e905045c536f681e85fa5e3a728b
author Borislav Petkov <petkovbb@googlemail.com> Wed Jul 23 19:55:59 2008 +0200
committer Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> Wed Jul 23 19:55:59 2008 +0200
tree 874144e07a0498c4d65dd9695f90056cbe45a1cb
parent 776bb0270ea72c40f95347dcac868c9f602dcb3e

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>

drivers/ide/ide-atapi.c

diff --git a/drivers/ide/ide-atapi.c b/drivers/ide/ide-atapi.c
index d5249df..0e9eeb0 100644
--- a/drivers/ide/ide-atapi.c
+++ b/drivers/ide/ide-atapi.c
@@ -31,10 +31,7 @@
 	debug_log("Enter %s - interrupt handler\n", __func__);
 
 	if (pc->flags & PC_FLAG_TIMEDOUT) {
-		if (drive->media == ide_floppy || drive->media == ide_tape)
-			drive->pc_callback(drive);
-		else
-			pc->callback(drive);
+		drive->pc_callback(drive);
 		return ide_stopped;
 	}
 
@@ -100,10 +97,7 @@
 			return ide_stopped;
 		}
 		/* Command finished - Call the callback function */
-		if (drive->media == ide_floppy || drive->media == ide_tape)
-			drive->pc_callback(drive);
-		else
-			pc->callback(drive);
+		drive->pc_callback(drive);
 		return ide_stopped;
 	}