]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
gpib: common: change gpib_class to a const struct
authorJori Koolstra <jkoolstra@xs4all.nl>
Tue, 3 Mar 2026 19:21:20 +0000 (20:21 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 16 Mar 2026 10:48:51 +0000 (11:48 +0100)
The class_create() call has been deprecated in favor of class_register()
as the driver core now allows for a struct class to be in read-only
memory. Change gpib_class to be a const struct class and drop the
class_create() call.

Link: https://lore.kernel.org/all/2023040244-duffel-pushpin-f738@gregkh/
Suggested-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Jori Koolstra <jkoolstra@xs4all.nl>
Link: https://patch.msgid.link/20260303192124.3855792-1-jkoolstra@xs4all.nl
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/gpib/common/gpib_os.c

index be757db993a56b5538f31d954686524866c8e2ae..0a8b981fc57918da02f9fe6125c07859a1463c74 100644 (file)
@@ -2169,10 +2169,13 @@ void init_gpib_status_queue(struct gpib_status_queue *device)
        device->dropped_byte = 0;
 }
 
-static struct class *gpib_class;
+static const struct class gpib_class = {
+       .name   = "gpib_common",
+};
 
 static int __init gpib_common_init_module(void)
 {
+       int err;
        int i;
 
        pr_info("GPIB core driver\n");
@@ -2181,14 +2184,14 @@ static int __init gpib_common_init_module(void)
                pr_err("gpib: can't get major %d\n", GPIB_CODE);
                return -EIO;
        }
-       gpib_class = class_create("gpib_common");
-       if (IS_ERR(gpib_class)) {
+       err = class_register(&gpib_class);
+       if (err) {
                pr_err("gpib: failed to create gpib class\n");
                unregister_chrdev(GPIB_CODE, "gpib");
-               return PTR_ERR(gpib_class);
+               return err;
        }
        for (i = 0; i < GPIB_MAX_NUM_BOARDS; ++i)
-               board_array[i].gpib_dev = device_create(gpib_class, NULL,
+               board_array[i].gpib_dev = device_create(&gpib_class, NULL,
                                                        MKDEV(GPIB_CODE, i), NULL, "gpib%i", i);
 
        return 0;
@@ -2199,9 +2202,9 @@ static void __exit gpib_common_exit_module(void)
        int i;
 
        for (i = 0; i < GPIB_MAX_NUM_BOARDS; ++i)
-               device_destroy(gpib_class, MKDEV(GPIB_CODE, i));
+               device_destroy(&gpib_class, MKDEV(GPIB_CODE, i));
 
-       class_destroy(gpib_class);
+       class_unregister(&gpib_class);
        unregister_chrdev(GPIB_CODE, "gpib");
 }