Merge tag 'char-misc-6.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[platform/kernel/linux-rpi.git] / drivers / char / mem.c

diff --git a/drivers/char/mem.c b/drivers/char/mem.c
index 94eff6a..0fcc861 100644 (file)
--- a/drivers/char/mem.c
+++ b/drivers/char/mem.c
@@ -746,20 +746,23 @@ static char *mem_devnode(const struct device *dev, umode_t *mode)
        return NULL;
 }
 
-static struct class *mem_class;
+static const struct class mem_class = {
+       .name           = "mem",
+       .devnode        = mem_devnode,
+};
 
 static int __init chr_dev_init(void)
 {
+       int retval;
        int minor;
 
        if (register_chrdev(MEM_MAJOR, "mem", &memory_fops))
                printk("unable to get major %d for memory devs\n", MEM_MAJOR);
 
-       mem_class = class_create("mem");
-       if (IS_ERR(mem_class))
-               return PTR_ERR(mem_class);
+       retval = class_register(&mem_class);
+       if (retval)
+               return retval;
 
-       mem_class->devnode = mem_devnode;
        for (minor = 1; minor < ARRAY_SIZE(devlist); minor++) {
                if (!devlist[minor].name)
                        continue;
@@ -770,7 +773,7 @@ static int __init chr_dev_init(void)
                if ((minor == DEVPORT_MINOR) && !arch_has_dev_port())
                        continue;
 
-               device_create(mem_class, NULL, MKDEV(MEM_MAJOR, minor),
+               device_create(&mem_class, NULL, MKDEV(MEM_MAJOR, minor),
                              NULL, devlist[minor].name);
        }