ide: remove ide_end_request()

* Add ide_rq_bytes() helper.

* Add blk_noretry_request() quirk to ide_complete_rq() (currently only fs
  requests can be marked as "noretry" so there is no change in behavior).

* Switch current ide_end_request() users to use ide_complete_rq().

  [ No need to check for rq->nr_sectors == 0 in {ide_dma,task_pio}_intr(),
    nsectors == 0 in cdrom_end_request() and err == 0 in ide_do_devset(). ]

* Remove no longer needed ide_end_request().

There should be no functional changes caused by this patch.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

diff --git a/drivers/ide/ide-atapi.c b/drivers/ide/ide-atapi.c
index 30156aa61016421cf846a33532bcb3c9a58b5f14..c3fd528a1b4d3c42e66f15f4292831ee7c668376 100644 (file)
--- a/drivers/ide/ide-atapi.c
+++ b/drivers/ide/ide-atapi.c
@@ -410,7 +410,8 @@ static ide_startstop_t ide_pc_intr(ide_drive_t *drive)
                                if (rq->errors == 0)
                                        rq->errors = -EIO;
                        }
-                       ide_end_request(drive, uptodate, 0);
+                       ide_complete_rq(drive, uptodate ? 0 : -EIO,
+                                       ide_rq_bytes(rq));
                }
 
                return ide_stopped;
@@ -469,7 +470,8 @@ static ide_startstop_t ide_pc_intr(ide_drive_t *drive)
 
                /* FIXME: don't do partial completions */
                if (drive->media == ide_floppy)
-                       ide_end_request(drive, 1, done >> 9);
+                       ide_complete_rq(drive, 0,
+                                       done ? done : ide_rq_bytes(rq));
        } else
                xferfunc(drive, NULL, pc->cur_pos, bcount);
 

diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
index e4fa807fdcfad1c2960325a57dc50b4dd54c7fdc..2f698c6e913fc095589c9d3ad4ea4f6d706187e2 100644 (file)
--- a/drivers/ide/ide-cd.c
+++ b/drivers/ide/ide-cd.c
@@ -298,7 +298,7 @@ static void cdrom_end_request(ide_drive_t *drive, int uptodate)
        if (blk_fs_request(rq) == 0 && uptodate <= 0 && rq->errors == 0)
                rq->errors = -EIO;
 
-       ide_end_request(drive, uptodate, nsectors);
+       ide_complete_rq(drive, uptodate ? 0 : -EIO, nsectors << 9);
 }
 
 static void ide_dump_status_no_sense(ide_drive_t *drive, const char *msg, u8 st)
@@ -793,10 +793,11 @@ static ide_startstop_t cdrom_newpc_intr(ide_drive_t *drive)
                if (dma_error)
                        return ide_error(drive, "dma error", stat);
                if (blk_fs_request(rq)) {
-                       ide_end_request(drive, 1, rq->nr_sectors);
+                       ide_complete_rq(drive, 0, rq->nr_sectors
+                               ? (rq->nr_sectors << 9) : ide_rq_bytes(rq));
                        return ide_stopped;
                } else if (rq->cmd_type == REQ_TYPE_ATA_PC && !rq->bio) {
-                       ide_end_request(drive, 1, 1);
+                       ide_complete_rq(drive, 0, 512);
                        return ide_stopped;
                }
                goto end_request;

diff --git a/drivers/ide/ide-devsets.c b/drivers/ide/ide-devsets.c
index 7c3953414d4703d2cfa502d2ed2c170a71bf0b4c..5bf958e5b1d5fabe5019266448fe623065e69a82 100644 (file)
--- a/drivers/ide/ide-devsets.c
+++ b/drivers/ide/ide-devsets.c
@@ -183,8 +183,6 @@ ide_startstop_t ide_do_devset(ide_drive_t *drive, struct request *rq)
        err = setfunc(drive, *(int *)&rq->cmd[1]);
        if (err)
                rq->errors = err;
-       else
-               err = 1;
-       ide_end_request(drive, err, 0);
+       ide_complete_rq(drive, err, ide_rq_bytes(rq));
        return ide_stopped;
 }

diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c
index ad9a3f54d21dd267405a6571b0213adb4c86c805..d8caa65ca7a50d8cc2faaefc435cb2c8ea2f6622 100644 (file)
--- a/drivers/ide/ide-disk.c
+++ b/drivers/ide/ide-disk.c
@@ -186,7 +186,7 @@ static ide_startstop_t ide_do_rw_disk(ide_drive_t *drive, struct request *rq,
                blk_dump_rq_flags(rq, "ide_do_rw_disk - bad command");
                if (rq->errors == 0)
                        rq->errors = -EIO;
-               ide_end_request(drive, 0, 0);
+               ide_complete_rq(drive, -EIO, ide_rq_bytes(rq));
                return ide_stopped;
        }
 

diff --git a/drivers/ide/ide-dma.c b/drivers/ide/ide-dma.c
index 820e5104ba47bbcfdbf7c0bd4f1ca798a87d668a..8f5e32e692f0621364e6b25665ef9854cf56fb47 100644 (file)
--- a/drivers/ide/ide-dma.c
+++ b/drivers/ide/ide-dma.c
@@ -101,7 +101,8 @@ ide_startstop_t ide_dma_intr(ide_drive_t *drive)
                        if ((cmd->tf_flags & IDE_TFLAG_FS) == 0)
                                ide_finish_cmd(drive, cmd, stat);
                        else
-                               ide_end_request(drive, 1, cmd->rq->nr_sectors);
+                               ide_complete_rq(drive, 0,
+                                               cmd->rq->nr_sectors << 9);
                        return ide_stopped;
                }
                printk(KERN_ERR "%s: %s: bad DMA status (0x%02x)\n",

diff --git a/drivers/ide/ide-eh.c b/drivers/ide/ide-eh.c
index ccfd06ef5bb91508c80fedd99996727a83284ea5..aff1a9b045592dd98ffe8afd68342c2c28131088 100644 (file)
--- a/drivers/ide/ide-eh.c
+++ b/drivers/ide/ide-eh.c
@@ -149,7 +149,7 @@ static inline void ide_complete_drive_reset(ide_drive_t *drive, int err)
        if (rq && blk_special_request(rq) && rq->cmd[0] == REQ_DRIVE_RESET) {
                if (err <= 0 && rq->errors == 0)
                        rq->errors = -EIO;
-               ide_end_request(drive, err ? err : 1, 0);
+               ide_complete_rq(drive, err ? err : 0, ide_rq_bytes(rq));
        }
 }
 

diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c
index 7ef2b90e530a94b8ad6d96d4a1ba26d417a03e80..8c518c6a64772166fdd43b73330f7dc7ffeba003 100644 (file)
--- a/drivers/ide/ide-floppy.c
+++ b/drivers/ide/ide-floppy.c
@@ -68,7 +68,7 @@ static void idefloppy_update_buffers(ide_drive_t *drive,
        struct bio *bio = rq->bio;
 
        while ((bio = rq->bio) != NULL)
-               ide_end_request(drive, 1, 0);
+               ide_complete_rq(drive, 0, ide_rq_bytes(rq));
 }
 
 static int ide_floppy_callback(ide_drive_t *drive, int dsc)
@@ -300,7 +300,7 @@ out_end:
        drive->failed_pc = NULL;
        if (blk_fs_request(rq) == 0 && rq->errors == 0)
                rq->errors = -EIO;
-       ide_end_request(drive, 0, 0);
+       ide_complete_rq(drive, -EIO, ide_rq_bytes(rq));
        return ide_stopped;
 }
 

diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
index 8e2868617a468d261adc12bdafc85d09e91cfd61..f59c709052d2b33442e4e704e61b178436f017ab 100644 (file)
--- a/drivers/ide/ide-io.c
+++ b/drivers/ide/ide-io.c
@@ -71,48 +71,6 @@ int ide_end_rq(ide_drive_t *drive, struct request *rq, int error,
 }
 EXPORT_SYMBOL_GPL(ide_end_rq);
 
-/**
- *     ide_end_request         -       complete an IDE I/O
- *     @drive: IDE device for the I/O
- *     @uptodate:
- *     @nr_sectors: number of sectors completed
- *
- *     This is our end_request wrapper function. We complete the I/O
- *     update random number input and dequeue the request, which if
- *     it was tagged may be out of order.
- */
-
-int ide_end_request (ide_drive_t *drive, int uptodate, int nr_sectors)
-{
-       unsigned int nr_bytes = nr_sectors << 9;
-       struct request *rq = drive->hwif->rq;
-       int rc, error = 0;
-
-       if (!nr_bytes) {
-               if (blk_pc_request(rq))
-                       nr_bytes = rq->data_len;
-               else
-                       nr_bytes = rq->hard_cur_sectors << 9;
-       }
-
-       /*
-        * if failfast is set on a request, override number of sectors
-        * and complete the whole request right now
-        */
-       if (blk_noretry_request(rq) && uptodate <= 0)
-               nr_bytes = rq->hard_nr_sectors << 9;
-
-       if (uptodate <= 0)
-               error = uptodate ? uptodate : -EIO;
-
-       rc = ide_end_rq(drive, rq, error, nr_bytes);
-       if (rc == 0)
-               drive->hwif->rq = NULL;
-
-       return rc;
-}
-EXPORT_SYMBOL(ide_end_request);
-
 void ide_complete_cmd(ide_drive_t *drive, struct ide_cmd *cmd, u8 stat, u8 err)
 {
        struct ide_taskfile *tf = &cmd->tf;
@@ -141,12 +99,29 @@ void ide_complete_cmd(ide_drive_t *drive, struct ide_cmd *cmd, u8 stat, u8 err)
                kfree(cmd);
 }
 
+/* obsolete, blk_rq_bytes() should be used instead */
+unsigned int ide_rq_bytes(struct request *rq)
+{
+       if (blk_pc_request(rq))
+               return rq->data_len;
+       else
+               return rq->hard_cur_sectors << 9;
+}
+EXPORT_SYMBOL_GPL(ide_rq_bytes);
+
 int ide_complete_rq(ide_drive_t *drive, int error, unsigned int nr_bytes)
 {
        ide_hwif_t *hwif = drive->hwif;
        struct request *rq = hwif->rq;
        int rc;
 
+       /*
+        * if failfast is set on a request, override number of sectors
+        * and complete the whole request right now
+        */
+       if (blk_noretry_request(rq) && error <= 0)
+               nr_bytes = rq->hard_nr_sectors << 9;
+
        rc = ide_end_rq(drive, rq, error, nr_bytes);
        if (rc == 0)
                hwif->rq = NULL;
@@ -170,7 +145,7 @@ void ide_kill_rq(ide_drive_t *drive, struct request *rq)
                        rq->errors = IDE_DRV_ERROR_GENERAL;
                else if (blk_fs_request(rq) == 0 && rq->errors == 0)
                        rq->errors = -EIO;
-               ide_end_request(drive, 0, 0);
+               ide_complete_rq(drive, -EIO, ide_rq_bytes(rq));
        }
 }
 

diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c
index 2df708927687f8be2cbb5a9d14e22ab0bff8f64e..853d047aa78f6a3af50eac6be1bbd549dbd35ead 100644 (file)
--- a/drivers/ide/ide-tape.c
+++ b/drivers/ide/ide-tape.c
@@ -762,7 +762,7 @@ static ide_startstop_t idetape_do_request(ide_drive_t *drive,
                        "request queue (%d)\n", drive->name, rq->cmd_type);
                if (blk_fs_request(rq) == 0 && rq->errors == 0)
                        rq->errors = -EIO;
-               ide_end_request(drive, 0, 0);
+               ide_complete_rq(drive, -EIO, ide_rq_bytes(rq));
                return ide_stopped;
        }
 

diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c
index b9d7ba2c8a0084746c3ad727f264056052810c5a..db6d7821e45b1716bbe5d8b6a7d71e7dd4632521 100644 (file)
--- a/drivers/ide/ide-taskfile.c
+++ b/drivers/ide/ide-taskfile.c
@@ -283,7 +283,7 @@ static void ide_error_cmd(ide_drive_t *drive, struct ide_cmd *cmd)
                }
 
                if (sectors > 0)
-                       ide_end_request(drive, 1, sectors);
+                       ide_complete_rq(drive, 0, sectors << 9);
        }
 }
 
@@ -352,7 +352,7 @@ out_end:
        if ((cmd->tf_flags & IDE_TFLAG_FS) == 0)
                ide_finish_cmd(drive, cmd, stat);
        else
-               ide_end_request(drive, 1, cmd->rq->nr_sectors);
+               ide_complete_rq(drive, 0, cmd->rq->nr_sectors << 9);
        return ide_stopped;
 out_err:
        ide_error_cmd(drive, cmd);

diff --git a/include/linux/ide.h b/include/linux/ide.h
index cbfb64fdeda71e6ad99d8dfd31a4753406b176f9..b6142171baf0609935eb35a6939e6406069a62a3 100644 (file)
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -1131,8 +1131,8 @@ int generic_ide_ioctl(ide_drive_t *, struct block_device *, unsigned, unsigned l
 extern int ide_vlb_clk;
 extern int ide_pci_clk;
 
+unsigned int ide_rq_bytes(struct request *);
 int ide_end_rq(ide_drive_t *, struct request *, int, unsigned int);
-int ide_end_request(ide_drive_t *, int, int);
 void ide_kill_rq(ide_drive_t *, struct request *);
 
 void __ide_set_handler(ide_drive_t *, ide_handler_t *, unsigned int,