ide: return request status from ->pc_callback method

Make ->pc_callback method return request status and then move
the request completion from ->pc_callback to ide_pc_intr().

There should be no functional changes caused by this patch.

Acked-by: Borislav Petkov <petkovbb@gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

3 files changed, 17 insertions, 17 deletions

diff --git a/drivers/ide/ide-atapi.c b/drivers/ide/ide-atapi.c
index f44474b0adae..f72b5a675435 100644
--- a/drivers/ide/ide-atapi.c
+++ b/drivers/ide/ide-atapi.c
@@ -357,6 +357,8 @@ static ide_startstop_t ide_pc_intr(ide_drive_t *drive)
 
         /* No more interrupts */
         if ((stat & ATA_DRQ) == 0) {
+                int uptodate;
+
                 debug_log("Packet command completed, %d bytes transferred\n",
                           pc->xferred);
 
@@ -395,7 +397,15 @@ static ide_startstop_t ide_pc_intr(ide_drive_t *drive)
                         dsc = 1;
 
                 /* Command finished - Call the callback function */
-                drive->pc_callback(drive, dsc);
+                uptodate = drive->pc_callback(drive, dsc);
+
+                if (uptodate == 0)
+                        drive->failed_pc = NULL;
+
+                if (blk_special_request(rq))
+                        ide_complete_rq(drive, 0);
+                else
+                        ide_end_request(drive, uptodate, 0);
 
                 return ide_stopped;
         }
diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c
index ab870a08d62b..5625946739ad 100644
--- a/drivers/ide/ide-floppy.c
+++ b/drivers/ide/ide-floppy.c
@@ -71,7 +71,7 @@ static void idefloppy_update_buffers(ide_drive_t *drive,
                 ide_end_request(drive, 1, 0);
 }
 
-static void ide_floppy_callback(ide_drive_t *drive, int dsc)
+static int ide_floppy_callback(ide_drive_t *drive, int dsc)
 {
         struct ide_disk_obj *floppy = drive->driver_data;
         struct ide_atapi_pc *pc = drive->pc;
@@ -108,14 +108,10 @@ static void ide_floppy_callback(ide_drive_t *drive, int dsc)
                                "Aborting request!\n");
         }
 
-        if (uptodate == 0)
-                drive->failed_pc = NULL;
-
-        if (blk_special_request(rq)) {
+        if (blk_special_request(rq))
                 rq->errors = uptodate ? 0 : IDE_DRV_ERROR_GENERAL;
-                ide_complete_rq(drive, 0);
-        } else
-                ide_end_request(drive, uptodate, 0);
+
+        return uptodate;
 }
 
 static void ide_floppy_report_error(struct ide_disk_obj *floppy,
diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c
index fc61bbef3bb9..a42e49c6cc3f 100644
--- a/drivers/ide/ide-tape.c
+++ b/drivers/ide/ide-tape.c
@@ -463,7 +463,7 @@ static void ide_tape_kfree_buffer(idetape_tape_t *tape)
 
 static void ide_tape_handle_dsc(ide_drive_t *);
 
-static void ide_tape_callback(ide_drive_t *drive, int dsc)
+static int ide_tape_callback(ide_drive_t *drive, int dsc)
 {
         idetape_tape_t *tape = drive->driver_data;
         struct ide_atapi_pc *pc = drive->pc;
@@ -530,13 +530,7 @@ static void ide_tape_callback(ide_drive_t *drive, int dsc)
 
         rq->errors = err;
 
-        if (uptodate == 0)
-                drive->failed_pc = NULL;
-
-        if (blk_special_request(rq))
-                ide_complete_rq(drive, 0);
-        else
-                ide_end_request(drive, uptodate, 0);
+        return uptodate;
 }
 
 /*