X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=block%2Fnoop-iosched.c;h=56a7c620574f86c0338a431354344d149314ce0f;hb=3a778275626c0eb97674e92875efeba01189ce0e;hp=f370e4a7fe6d7a26e66f988774c002af6b772725;hpb=85d6162d6cea9220e483989817eac0cebc03070e;p=linux-2.6

diff --git a/block/noop-iosched.c b/block/noop-iosched.c
index f370e4a7fe..56a7c62057 100644
--- a/block/noop-iosched.c
+++ b/block/noop-iosched.c
@@ -65,16 +65,15 @@ noop_latter_request(request_queue_t *q, struct request *rq)
 	return list_entry(rq->queuelist.next, struct request, queuelist);
 }
 
-static int noop_init_queue(request_queue_t *q, elevator_t *e)
+static void *noop_init_queue(request_queue_t *q, elevator_t *e)
 {
 	struct noop_data *nd;
 
 	nd = kmalloc(sizeof(*nd), GFP_KERNEL);
 	if (!nd)
-		return -ENOMEM;
+		return NULL;
 	INIT_LIST_HEAD(&nd->queue);
-	e->elevator_data = nd;
-	return 0;
+	return nd;
 }
 
 static void noop_exit_queue(elevator_t *e)