Remove left-over unused bits.

[linux-2.6-omap-h63xx.git] / drivers / block / noop-iosched.c

diff --git a/drivers/block/noop-iosched.c b/drivers/block/noop-iosched.c
index bc2252b6f2e5fdf553465ed8c269aef70de4c60d..f56b8edb06e42b217b46c9556c23ca30ef6a6063 100644 (file)
--- a/drivers/block/noop-iosched.c
+++ b/drivers/block/noop-iosched.c
@@ -7,38 +7,9 @@
 #include <linux/module.h>
 #include <linux/init.h>
 
-/*
- * See if we can find a request that this buffer can be coalesced with.
- */
-static int elevator_noop_merge(request_queue_t *q, struct request **req,
-                              struct bio *bio)
-{
-       int ret;
-
-       ret = elv_try_last_merge(q, bio);
-       if (ret != ELEVATOR_NO_MERGE)
-               *req = q->last_merge;
-
-       return ret;
-}
-
-static void elevator_noop_merge_requests(request_queue_t *q, struct request *req,
-                                        struct request *next)
-{
-       list_del_init(&next->queuelist);
-}
-
 static void elevator_noop_add_request(request_queue_t *q, struct request *rq)
 {
        elv_dispatch_add_tail(q, rq);
-
-       /*
-        * new merges must not precede this barrier
-        */
-       if (rq->flags & REQ_HARDBARRIER)
-               q->last_merge = NULL;
-       else if (!q->last_merge)
-               q->last_merge = rq;
 }
 
 static int elevator_noop_dispatch(request_queue_t *q, int force)
@@ -48,8 +19,6 @@ static int elevator_noop_dispatch(request_queue_t *q, int force)
 
 static struct elevator_type elevator_noop = {
        .ops = {
-               .elevator_merge_fn              = elevator_noop_merge,
-               .elevator_merge_req_fn          = elevator_noop_merge_requests,
                .elevator_dispatch_fn           = elevator_noop_dispatch,
                .elevator_add_req_fn            = elevator_noop_add_request,
        },