diff --git a/[refs] b/[refs]
index 0aadd3da5627..e7faa1c92dc6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2b1191af683d16a899c2b81b87b605841ceffdec
+refs/heads/master: a22b169df1b9f259391cf3b8ad8bfeea3d7be3f1
diff --git a/trunk/block/elevator.c b/trunk/block/elevator.c
index 487dd3da8853..d8030a84773a 100644
--- a/trunk/block/elevator.c
+++ b/trunk/block/elevator.c
@@ -93,21 +93,18 @@ static inline int elv_try_merge(struct request *__rq, struct bio *bio)
 
 static struct elevator_type *elevator_find(const char *name)
 {
-	struct elevator_type *e = NULL;
+	struct elevator_type *e;
 	struct list_head *entry;
 
 	list_for_each(entry, &elv_list) {
-		struct elevator_type *__e;
 
-		__e = list_entry(entry, struct elevator_type, list);
+		e = list_entry(entry, struct elevator_type, list);
 
-		if (!strcmp(__e->elevator_name, name)) {
-			e = __e;
-			break;
-		}
+		if (!strcmp(e->elevator_name, name))
+			return e;
 	}
 
-	return e;
+	return NULL;
 }
 
 static void elevator_put(struct elevator_type *e)