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>

1 files changed, 4 insertions, 8 deletions

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,