scsi: cxlflash: Make cxlflash_class constant

Since commit 43a7206b0963 ("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 cxlflash_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/20240302-class_cleanup-scsi-v1-3-b9096b990e27@marliere.net
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/cxlflash/main.c b/drivers/scsi/cxlflash/main.c
index debd3697411974aa10b59d222b04aab919b5aeb1..e8382cc5cf23c01515d189b2f8b3580d23a289b6 100644 (file)
--- a/drivers/scsi/cxlflash/main.c
+++ b/drivers/scsi/cxlflash/main.c
@@ -28,7 +28,12 @@ MODULE_AUTHOR("Manoj N. Kumar <manoj@linux.vnet.ibm.com>");
 MODULE_AUTHOR("Matthew R. Ochs <mrochs@linux.vnet.ibm.com>");
 MODULE_LICENSE("GPL");
 
-static struct class *cxlflash_class;
+static char *cxlflash_devnode(const struct device *dev, umode_t *mode);
+static const struct class cxlflash_class = {
+       .name = "cxlflash",
+       .devnode = cxlflash_devnode,
+};
+
 static u32 cxlflash_major;
 static DECLARE_BITMAP(cxlflash_minor, CXLFLASH_MAX_ADAPTERS);
 
@@ -3602,7 +3607,7 @@ static int init_chrdev(struct cxlflash_cfg *cfg)
                goto err1;
        }
 
-       char_dev = device_create(cxlflash_class, NULL, devno,
+       char_dev = device_create(&cxlflash_class, NULL, devno,
                                 NULL, "cxlflash%d", minor);
        if (IS_ERR(char_dev)) {
                rc = PTR_ERR(char_dev);
@@ -3880,14 +3885,12 @@ static int cxlflash_class_init(void)
 
        cxlflash_major = MAJOR(devno);
 
-       cxlflash_class = class_create("cxlflash");
-       if (IS_ERR(cxlflash_class)) {
-               rc = PTR_ERR(cxlflash_class);
+       rc = class_register(&cxlflash_class);
+       if (rc) {
                pr_err("%s: class_create failed rc=%d\n", __func__, rc);
                goto err;
        }
 
-       cxlflash_class->devnode = cxlflash_devnode;
 out:
        pr_debug("%s: returning rc=%d\n", __func__, rc);
        return rc;
@@ -3903,7 +3906,7 @@ static void cxlflash_class_exit(void)
 {
        dev_t devno = MKDEV(cxlflash_major, 0);
 
-       class_destroy(cxlflash_class);
+       class_unregister(&cxlflash_class);
        unregister_chrdev_region(devno, CXLFLASH_MAX_ADAPTERS);
 }