ide: use ->end_request only for private device driver requests

* Move IDE{FLOPPY,TAPE}_ERROR_* defines to <linux/ide.h> and rename them
  to IDE_DRV_ERROR_*.

* Handle ->end_request special cases for floppy/tape media in ide_kill_rq().

* Call ->end_request only for private device driver requests.

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, 3 insertions, 13 deletions

diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c
index 7237e1547b1f..f85b7f21a617 100644
--- a/drivers/ide/ide-taskfile.c
+++ b/drivers/ide/ide-taskfile.c
@@ -315,12 +315,8 @@ static ide_startstop_t task_error(ide_drive_t *drive, struct request *rq,
                         break;
                 }
 
-                if (sectors > 0) {
-                        struct ide_driver *drv;
-
-                        drv = *(struct ide_driver **)rq->rq_disk->private_data;
-                        drv->end_request(drive, 1, sectors);
-                }
+                if (sectors > 0)
+                        ide_end_request(drive, 1, sectors);
         }
         return ide_error(drive, s, stat);
 }
@@ -337,13 +333,7 @@ void task_end_request(ide_drive_t *drive, struct request *rq, u8 stat)
                 return;
         }
 
-        if (rq->rq_disk) {
-                struct ide_driver *drv;
-
-                drv = *(struct ide_driver **)rq->rq_disk->private_data;;
-                drv->end_request(drive, 1, rq->nr_sectors);
-        } else
-                ide_end_request(drive, 1, rq->nr_sectors);
+        ide_end_request(drive, 1, rq->nr_sectors);
 }
 
 /*