diff --git a/block/blktrace.c b/block/blktrace.c
index 7471621d4ded548489695362083e7f0b16a88aed..9b4da4ae3c7dcce3dc9964adb5ecf2c570017e8a 100644
--- a/block/blktrace.c
+++ b/block/blktrace.c
@@ -178,7 +178,7 @@ void __blk_add_trace(struct blk_trace *bt, sector_t sector, int bytes,
 EXPORT_SYMBOL_GPL(__blk_add_trace);
 
 static struct dentry *blk_tree_root;
-static struct mutex blk_tree_mutex;
+static DEFINE_MUTEX(blk_tree_mutex);
 static unsigned int root_users;
 
 static inline void blk_remove_root(void)
@@ -504,13 +504,3 @@ void blk_trace_shutdown(struct request_queue *q)
 		blk_trace_remove(q);
 	}
 }
-
-static __init int blk_trace_init(void)
-{
-	mutex_init(&blk_tree_mutex);
-
-	return 0;
-}
-
-module_init(blk_trace_init);
-