Set up the default_groups for blk_queue_ktype instead of manually calling
sysfs_create_group.
Signed-off-by: Christoph Hellwig <hch@xxxxxx>
---
block/blk-sysfs.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c
index 520ff9aa6dd45..80f506411f92f 100644
--- a/block/blk-sysfs.c
+++ b/block/blk-sysfs.c
@@ -788,7 +788,13 @@ static const struct sysfs_ops queue_sysfs_ops = {
.store = queue_attr_store,
};
+static const struct attribute_group *blk_queue_attr_groups[] = {
+ &queue_attr_group,
+ NULL
+};
+
struct kobj_type blk_queue_ktype = {
+ .default_groups = blk_queue_attr_groups,
.sysfs_ops = &queue_sysfs_ops,
.release = blk_release_queue,
};
@@ -809,12 +815,6 @@ int blk_register_queue(struct gendisk *disk)
if (ret < 0)
goto unlock;
- ret = sysfs_create_group(&q->kobj, &queue_attr_group);
- if (ret) {
- kobject_del(&q->kobj);
- goto unlock;
- }
-
if (queue_is_mq(q))
__blk_mq_register_dev(dev, q);
mutex_lock(&q->sysfs_lock);
--
2.30.2
