ide: remove ->end_request method

* Handle completion of private driver requests explicitly
  for ide_floppy and ide_tape media in ide_kill_rq().

* Remove no longer needed ->end_request method.

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, 0 insertions, 20 deletions

diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c
index bdd8f8e2df6d..ab870a08d62b 100644
--- a/drivers/ide/ide-floppy.c
+++ b/drivers/ide/ide-floppy.c
@@ -61,25 +61,6 @@
  */
 #define IDEFLOPPY_PC_DELAY      (HZ/20) /* default delay for ZIP 100 (50ms) */
 
-/*
- * Used to finish servicing a private request.
- */
-static int ide_floppy_end_request(ide_drive_t *drive, int uptodate, int nsecs)
-{
-        struct request *rq = drive->hwif->rq;
-
-        ide_debug_log(IDE_DBG_FUNC, "enter");
-
-        if (uptodate == 0)
-                drive->failed_pc = NULL;
-
-        rq->errors = uptodate ? 0 : IDE_DRV_ERROR_GENERAL;
-
-        ide_complete_rq(drive, 0);
-
-        return 0;
-}
-
 static void idefloppy_update_buffers(ide_drive_t *drive,
                                 struct ide_atapi_pc *pc)
 {
@@ -560,6 +541,5 @@ const struct ide_disk_ops ide_atapi_disk_ops = {
         .init_media     = ide_floppy_init_media,
         .set_doorlock   = ide_set_media_lock,
         .do_request     = ide_floppy_do_request,
-        .end_request    = ide_floppy_end_request,
         .ioctl          = ide_floppy_ioctl,
 };