block: replace end_request() with [__]blk_end_request_cur()

end_request() has been kept around for backward compatibility;
however, it's about time for it to go away.

* There aren't too many users left.

* Its use of @updtodate is pretty confusing.

* In some cases, newer code ends up using mixture of end_request() and
  [__]blk_end_request[_all](), which is way too confusing.

So, add [__]blk_end_request_cur() and replace end_request() with it.
Most conversions are straightforward.  Noteworthy ones are...

* paride/pcd: next_request() updated to take 0/-errno instead of 1/0.

* paride/pf: pf_end_request() and next_request() updated to take
  0/-errno instead of 1/0.

* xd: xd_readwrite() updated to return 0/-errno instead of 1/0.

* mtd/mtd_blkdevs: blktrans_discard_request() updated to return
  0/-errno instead of 1/0.  Unnecessary local variable res
  initialization removed from mtd_blktrans_thread().

[ Impact: cleanup ]

Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Joerg Dorchain <joerg@dorchain.net>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: Grant Likely <grant.likely@secretlab.ca>
Acked-by: Laurent Vivier <Laurent@lvivier.info>
Cc: Tim Waugh <tim@cyberelk.net>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Jeremy Fitzhardinge <jeremy@xensource.com>
Cc: Markus Lidel <Markus.Lidel@shadowconnect.com>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Pete Zaitcev <zaitcev@redhat.com>
Cc: unsik Kim <donari75@gmail.com>

1 files changed, 8 insertions, 8 deletions

diff --git a/drivers/block/mg_disk.c b/drivers/block/mg_disk.c
index f3898353d0a8..408c2bd8a439 100644
--- a/drivers/block/mg_disk.c
+++ b/drivers/block/mg_disk.c
@@ -285,7 +285,7 @@ static void mg_bad_rw_intr(struct mg_host *host)
         if (req != NULL)
                 if (++req->errors >= MG_MAX_ERRORS ||
                                 host->error == MG_ERR_TIMEOUT)
-                        end_request(req, 0);
+                        __blk_end_request_cur(req, -EIO);
 }
 
 static unsigned int mg_out(struct mg_host *host,
@@ -351,7 +351,7 @@ static void mg_read(struct request *req)
 
                 if (req->current_nr_sectors <= 0) {
                         MG_DBG("remain : %d sects\n", remains);
-                        end_request(req, 1);
+                        __blk_end_request_cur(req, 0);
                         if (remains > 0)
                                 req = elv_next_request(host->breq);
                 }
@@ -395,7 +395,7 @@ static void mg_write(struct request *req)
 
                 if (req->current_nr_sectors <= 0) {
                         MG_DBG("remain : %d sects\n", remains);
-                        end_request(req, 1);
+                        __blk_end_request_cur(req, 0);
                         if (remains > 0)
                                 req = elv_next_request(host->breq);
                 }
@@ -448,7 +448,7 @@ ok_to_read:
 
         /* let know if current segment done */
         if (req->current_nr_sectors <= 0)
-                end_request(req, 1);
+                __blk_end_request_cur(req, 0);
 
         /* set handler if read remains */
         if (i > 0) {
@@ -497,7 +497,7 @@ ok_to_write:
 
         /* let know if current segment or all done */
         if (!i || (req->bio && req->current_nr_sectors <= 0))
-                end_request(req, 1);
+                __blk_end_request_cur(req, 0);
 
         /* write 1 sector and set handler if remains */
         if (i > 0) {
@@ -563,7 +563,7 @@ static void mg_request_poll(struct request_queue *q)
                         default:
                                 printk(KERN_WARNING "%s:%d unknown command\n",
                                                 __func__, __LINE__);
-                                end_request(req, 0);
+                                __blk_end_request_cur(req, -EIO);
                                 break;
                         }
                 }
@@ -617,7 +617,7 @@ static unsigned int mg_issue_req(struct request *req,
         default:
                 printk(KERN_WARNING "%s:%d unknown command\n",
                                 __func__, __LINE__);
-                end_request(req, 0);
+                __blk_end_request_cur(req, -EIO);
                 break;
         }
         return MG_ERR_NONE;
@@ -655,7 +655,7 @@ static void mg_request(struct request_queue *q)
                                         "%s: bad access: sector=%d, count=%d\n",
                                         req->rq_disk->disk_name,
                                         sect_num, sect_cnt);
-                        end_request(req, 0);
+                        __blk_end_request_cur(req, -EIO);
                         continue;
                 }