Skip to content

Commit 626f534

Browse files
rbmarliereawilliam
authored andcommitted
vfio/mbochs: make mbochs_class constant
Since commit 43a7206 ("driver core: class: make class_register() take a const *"), the driver core allows for struct class to be in read-only memory, so move the mbochs_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: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Suggested-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Ricardo B. Marliere <ricardo@marliere.net> Link: https://lore.kernel.org/r/20240301-class_cleanup-vfio-v1-2-9236d69083f5@marliere.net Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
1 parent 1f92d6a commit 626f534

File tree

1 file changed

+8
-10
lines changed

1 file changed

+8
-10
lines changed

samples/vfio-mdev/mbochs.c

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,9 @@ static struct mdev_type *mbochs_mdev_types[] = {
133133
};
134134

135135
static dev_t mbochs_devt;
136-
static struct class *mbochs_class;
136+
static const struct class mbochs_class = {
137+
.name = MBOCHS_CLASS_NAME,
138+
};
137139
static struct cdev mbochs_cdev;
138140
static struct device mbochs_dev;
139141
static struct mdev_parent mbochs_parent;
@@ -1422,13 +1424,10 @@ static int __init mbochs_dev_init(void)
14221424
if (ret)
14231425
goto err_cdev;
14241426

1425-
mbochs_class = class_create(MBOCHS_CLASS_NAME);
1426-
if (IS_ERR(mbochs_class)) {
1427-
pr_err("Error: failed to register mbochs_dev class\n");
1428-
ret = PTR_ERR(mbochs_class);
1427+
ret = class_register(&mbochs_class);
1428+
if (ret)
14291429
goto err_driver;
1430-
}
1431-
mbochs_dev.class = mbochs_class;
1430+
mbochs_dev.class = &mbochs_class;
14321431
mbochs_dev.release = mbochs_device_release;
14331432
dev_set_name(&mbochs_dev, "%s", MBOCHS_NAME);
14341433

@@ -1448,7 +1447,7 @@ static int __init mbochs_dev_init(void)
14481447
device_del(&mbochs_dev);
14491448
err_put:
14501449
put_device(&mbochs_dev);
1451-
class_destroy(mbochs_class);
1450+
class_unregister(&mbochs_class);
14521451
err_driver:
14531452
mdev_unregister_driver(&mbochs_driver);
14541453
err_cdev:
@@ -1466,8 +1465,7 @@ static void __exit mbochs_dev_exit(void)
14661465
mdev_unregister_driver(&mbochs_driver);
14671466
cdev_del(&mbochs_cdev);
14681467
unregister_chrdev_region(mbochs_devt, MINORMASK + 1);
1469-
class_destroy(mbochs_class);
1470-
mbochs_class = NULL;
1468+
class_unregister(&mbochs_class);
14711469
}
14721470

14731471
MODULE_IMPORT_NS(DMA_BUF);

0 commit comments

Comments
 (0)