Merge tag 'perf-tools-for-v6.2-1-2022-12-16' of git://git.kernel.org/pub/scm/linux...

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

diff --git a/block/blk-crypto-sysfs.c b/block/blk-crypto-sysfs.c
index fd93bd2..55268ed 100644 (file)
--- a/block/blk-crypto-sysfs.c
+++ b/block/blk-crypto-sysfs.c
@@ -126,8 +126,9 @@ static struct kobj_type blk_crypto_ktype = {
  * If the request_queue has a blk_crypto_profile, create the "crypto"
  * subdirectory in sysfs (/sys/block/$disk/queue/crypto/).
  */
-int blk_crypto_sysfs_register(struct request_queue *q)
+int blk_crypto_sysfs_register(struct gendisk *disk)
 {
+       struct request_queue *q = disk->queue;
        struct blk_crypto_kobj *obj;
        int err;
 
@@ -139,8 +140,8 @@ int blk_crypto_sysfs_register(struct request_queue *q)
                return -ENOMEM;
        obj->profile = q->crypto_profile;
 
-       err = kobject_init_and_add(&obj->kobj, &blk_crypto_ktype, &q->kobj,
-                                  "crypto");
+       err = kobject_init_and_add(&obj->kobj, &blk_crypto_ktype,
+                                  &disk->queue_kobj, "crypto");
        if (err) {
                kobject_put(&obj->kobj);
                return err;
@@ -149,9 +150,9 @@ int blk_crypto_sysfs_register(struct request_queue *q)
        return 0;
 }
 
-void blk_crypto_sysfs_unregister(struct request_queue *q)
+void blk_crypto_sysfs_unregister(struct gendisk *disk)
 {
-       kobject_put(q->crypto_kobject);
+       kobject_put(disk->queue->crypto_kobject);
 }
 
 static int __init blk_crypto_sysfs_init(void)