ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 20:51:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

ublk: make ublk_chr_class a static const structure

Browse Source 
Now that the driver core allows for struct class to be in read-only
memory, move the ublk_chr_class structure to be declared at build time
placing it into read-only memory, instead of having to be dynamically
allocated at boot time.

Cc: Ming Lei <ming.lei@redhat.com>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: linux-block@vger.kernel.org
Suggested-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Ivan Orlov <ivan.orlov0322@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Link: https://lore.kernel.org/r/20230620180129.645646-7-gregkh@linuxfoundation.org
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Ivan Orlov
2023-06-20 20:01:32 +02:00
committed by Jens Axboe
parent 65d7a37d4e
commit 2eefd399d2
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/block/ublk_drv.c
View File

@@ -189,7 +189,9 @@ static inline void __ublk_complete_rq(struct request *req);
static void ublk_complete_rq(struct kref *ref); static void ublk_complete_rq(struct kref *ref);
static dev_t ublk_chr_devt; static dev_t ublk_chr_devt;
static struct class *ublk_chr_class; static const struct class ublk_chr_class = {
.name = "ublk-char",
};
static DEFINE_IDR(ublk_index_idr); static DEFINE_IDR(ublk_index_idr);
static DEFINE_SPINLOCK(ublk_idr_lock); static DEFINE_SPINLOCK(ublk_idr_lock);
@@ -1755,7 +1757,7 @@ static int ublk_add_chdev(struct ublk_device *ub)
dev->parent = ublk_misc.this_device; dev->parent = ublk_misc.this_device;
dev->devt = MKDEV(MAJOR(ublk_chr_devt), minor); dev->devt = MKDEV(MAJOR(ublk_chr_devt), minor);
dev->class = ublk_chr_class; dev->class = &ublk_chr_class;
dev->release = ublk_cdev_rel; dev->release = ublk_cdev_rel;
device_initialize(dev); device_initialize(dev);
@@ -2581,11 +2583,10 @@ static int __init ublk_init(void)
if (ret) if (ret)
goto unregister_mis; goto unregister_mis;
ublk_chr_class = class_create("ublk-char"); ret = class_register(&ublk_chr_class);
if (IS_ERR(ublk_chr_class)) { if (ret)
ret = PTR_ERR(ublk_chr_class);
goto free_chrdev_region; goto free_chrdev_region;
}
return 0; return 0;
free_chrdev_region: free_chrdev_region:
@@ -2603,7 +2604,7 @@ static void __exit ublk_exit(void)
idr_for_each_entry(&ublk_index_idr, ub, id) idr_for_each_entry(&ublk_index_idr, ub, id)
ublk_remove(ub); ublk_remove(ub);
class_destroy(ublk_chr_class); class_unregister(&ublk_chr_class);
misc_deregister(&ublk_misc); misc_deregister(&ublk_misc);
idr_destroy(&ublk_index_idr); idr_destroy(&ublk_index_idr);