staging: greybus: raw: make raw_class constant
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 5 Oct 2023 13:58:34 +0000 (15:58 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 6 Oct 2023 13:39:01 +0000 (15:39 +0200)
Now that the driver core allows for struct class to be in read-only
memory, making all 'class' structures to be declared at build time
placing them into read-only memory, instead of having to be dynamically
allocated at load time.

Cc: Alex Elder <elder@kernel.org>
Cc: greybus-dev@lists.linaro.org
Reviewed-by: Johan Hovold <johan@kernel.org>
Link: https://lore.kernel.org/r/2023100533-broadband-hunk-9e91@gregkh
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/greybus/raw.c

index 8bca8cb12cc6f2c07a22ced4046a832522a6e908..a00978c8e1d2417d4e8018e39b0e210a11e17409 100644 (file)
@@ -32,7 +32,10 @@ struct raw_data {
        u8 data[];
 };
 
-static struct class *raw_class;
+static const struct class raw_class = {
+       .name = "gb_raw",
+};
+
 static int raw_major;
 static const struct file_operations raw_fops;
 static DEFINE_IDA(minors);
@@ -195,7 +198,7 @@ static int gb_raw_probe(struct gb_bundle *bundle,
        if (retval)
                goto error_connection_disable;
 
-       raw->device = device_create(raw_class, &connection->bundle->dev,
+       raw->device = device_create(&raw_class, &connection->bundle->dev,
                                    raw->dev, raw, "gb!raw%d", minor);
        if (IS_ERR(raw->device)) {
                retval = PTR_ERR(raw->device);
@@ -229,7 +232,7 @@ static void gb_raw_disconnect(struct gb_bundle *bundle)
        struct raw_data *temp;
 
        // FIXME - handle removing a connection when the char device node is open.
-       device_destroy(raw_class, raw->dev);
+       device_destroy(&raw_class, raw->dev);
        cdev_del(&raw->cdev);
        gb_connection_disable(connection);
        ida_simple_remove(&minors, MINOR(raw->dev));
@@ -340,11 +343,9 @@ static int raw_init(void)
        dev_t dev;
        int retval;
 
-       raw_class = class_create("gb_raw");
-       if (IS_ERR(raw_class)) {
-               retval = PTR_ERR(raw_class);
+       retval = class_register(&raw_class);
+       if (retval)
                goto error_class;
-       }
 
        retval = alloc_chrdev_region(&dev, 0, NUM_MINORS, "gb_raw");
        if (retval < 0)
@@ -361,7 +362,7 @@ static int raw_init(void)
 error_gb:
        unregister_chrdev_region(dev, NUM_MINORS);
 error_chrdev:
-       class_destroy(raw_class);
+       class_unregister(&raw_class);
 error_class:
        return retval;
 }
@@ -371,7 +372,7 @@ static void __exit raw_exit(void)
 {
        greybus_deregister(&gb_raw_driver);
        unregister_chrdev_region(MKDEV(raw_major, 0), NUM_MINORS);
-       class_destroy(raw_class);
+       class_unregister(&raw_class);
        ida_destroy(&minors);
 }
 module_exit(raw_exit);