Merge tag 'iwlwifi-for-kalle-2015-01-05' of https://git.kernel.org/pub/scm/linux...

[linux-2.6-block.git] / block / blk-mq-sysfs.c

diff --git a/block/blk-mq-sysfs.c b/block/blk-mq-sysfs.c
index 371d8800b48a631c9807bce20f1e973a4c3a35b8..1630a20d5dcfa550ebe9c8815927d51b70bd9d56 100644 (file)
--- a/block/blk-mq-sysfs.c
+++ b/block/blk-mq-sysfs.c
@@ -390,16 +390,15 @@ static void blk_mq_sysfs_init(struct request_queue *q)
 {
        struct blk_mq_hw_ctx *hctx;
        struct blk_mq_ctx *ctx;
-       int i, j;
+       int i;
 
        kobject_init(&q->mq_kobj, &blk_mq_ktype);
 
-       queue_for_each_hw_ctx(q, hctx, i) {
+       queue_for_each_hw_ctx(q, hctx, i)
                kobject_init(&hctx->kobj, &blk_mq_hw_ktype);
 
-               hctx_for_each_ctx(hctx, ctx, j)
-                       kobject_init(&ctx->kobj, &blk_mq_ctx_ktype);
-       }
+       queue_for_each_ctx(q, ctx, i)
+               kobject_init(&ctx->kobj, &blk_mq_ctx_ktype);
 }
 
 /* see blk_register_queue() */