Merge tag 'printk-for-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/pmladek...

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

diff --git a/block/blk-mq-sysfs.c b/block/blk-mq-sysfs.c
index d6e1a9bd7131c6d7b5c6027fc000b323934ba901..a0d3ce30fa0893e6d854e4097bc627685d97cc7a 100644 (file)
--- a/block/blk-mq-sysfs.c
+++ b/block/blk-mq-sysfs.c
@@ -270,7 +270,7 @@ void blk_mq_unregister_dev(struct device *dev, struct request_queue *q)
        struct blk_mq_hw_ctx *hctx;
        int i;
 
-       lockdep_assert_held(&q->sysfs_lock);
+       lockdep_assert_held(&q->sysfs_dir_lock);
 
        queue_for_each_hw_ctx(q, hctx, i)
                blk_mq_unregister_hctx(hctx);
@@ -320,7 +320,7 @@ int __blk_mq_register_dev(struct device *dev, struct request_queue *q)
        int ret, i;
 
        WARN_ON_ONCE(!q->kobj.parent);
-       lockdep_assert_held(&q->sysfs_lock);
+       lockdep_assert_held(&q->sysfs_dir_lock);
 
        ret = kobject_add(q->mq_kobj, kobject_get(&dev->kobj), "%s", "mq");
        if (ret < 0)
@@ -349,23 +349,12 @@ int __blk_mq_register_dev(struct device *dev, struct request_queue *q)
        return ret;
 }
 
-int blk_mq_register_dev(struct device *dev, struct request_queue *q)
-{
-       int ret;
-
-       mutex_lock(&q->sysfs_lock);
-       ret = __blk_mq_register_dev(dev, q);
-       mutex_unlock(&q->sysfs_lock);
-
-       return ret;
-}
-
 void blk_mq_sysfs_unregister(struct request_queue *q)
 {
        struct blk_mq_hw_ctx *hctx;
        int i;
 
-       mutex_lock(&q->sysfs_lock);
+       mutex_lock(&q->sysfs_dir_lock);
        if (!q->mq_sysfs_init_done)
                goto unlock;
 
@@ -373,7 +362,7 @@ void blk_mq_sysfs_unregister(struct request_queue *q)
                blk_mq_unregister_hctx(hctx);
 
 unlock:
-       mutex_unlock(&q->sysfs_lock);
+       mutex_unlock(&q->sysfs_dir_lock);
 }
 
 int blk_mq_sysfs_register(struct request_queue *q)
@@ -381,7 +370,7 @@ int blk_mq_sysfs_register(struct request_queue *q)
        struct blk_mq_hw_ctx *hctx;
        int i, ret = 0;
 
-       mutex_lock(&q->sysfs_lock);
+       mutex_lock(&q->sysfs_dir_lock);
        if (!q->mq_sysfs_init_done)
                goto unlock;
 
@@ -392,7 +381,7 @@ int blk_mq_sysfs_register(struct request_queue *q)
        }
 
 unlock:
-       mutex_unlock(&q->sysfs_lock);
+       mutex_unlock(&q->sysfs_dir_lock);
 
        return ret;
 }