fpga: region: make fpga_region_class a static const structure

Now that the driver core allows for struct class to be in read-only
memory, move the fpga_region_class structure to be declared at build
time placing it into read-only memory, instead of having to be
dynamically allocated at boot time.

Suggested-by: Greg Kroah-Hartman <[email protected]>
Signed-off-by: Ivan Orlov <[email protected]>
Acked-by: Xu Yilun <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Xu Yilun <[email protected]>

diff --git a/drivers/fpga/fpga-region.c b/drivers/fpga/fpga-region.c
index c9d065a6961b0e477524c7f11440b411be2131f1..b364a929425ce9b54345a0098e28837894359495 100644 (file)
--- a/drivers/fpga/fpga-region.c
+++ b/drivers/fpga/fpga-region.c
@@ -16,7 +16,7 @@
 #include <linux/spinlock.h>
 
 static DEFINE_IDA(fpga_region_ida);
 #include <linux/spinlock.h>
 
 static DEFINE_IDA(fpga_region_ida);

-static struct class *fpga_region_class;
+static const struct class fpga_region_class;

 
 struct fpga_region *
 fpga_region_class_find(struct device *start, const void *data,
 
 struct fpga_region *
 fpga_region_class_find(struct device *start, const void *data,


@@ -24,7 +24,7 @@ fpga_region_class_find(struct device *start, const void *data,
 {
        struct device *dev;
 
 {
        struct device *dev;
 

-       dev = class_find_device(fpga_region_class, start, data, match);
+       dev = class_find_device(&fpga_region_class, start, data, match);

        if (!dev)
                return NULL;
 
        if (!dev)
                return NULL;
 


@@ -217,7 +217,7 @@ fpga_region_register_full(struct device *parent, const struct fpga_region_info *
        mutex_init(&region->mutex);
        INIT_LIST_HEAD(&region->bridge_list);
 
        mutex_init(&region->mutex);
        INIT_LIST_HEAD(&region->bridge_list);
 

-       region->dev.class = fpga_region_class;
+       region->dev.class = &fpga_region_class;

        region->dev.parent = parent;
        region->dev.of_node = parent->of_node;
        region->dev.id = id;
        region->dev.parent = parent;
        region->dev.of_node = parent->of_node;
        region->dev.id = id;


@@ -288,6 +288,12 @@ static void fpga_region_dev_release(struct device *dev)
        kfree(region);
 }
 
        kfree(region);
 }
 

+static const struct class fpga_region_class = {
+       .name = "fpga_region",
+       .dev_groups = fpga_region_groups,
+       .dev_release = fpga_region_dev_release,
+};
+

 /**
  * fpga_region_init - creates the fpga_region class.
  *
 /**
  * fpga_region_init - creates the fpga_region class.
  *


@@ -295,19 +301,12 @@ static void fpga_region_dev_release(struct device *dev)
  */
 static int __init fpga_region_init(void)
 {
  */
 static int __init fpga_region_init(void)
 {

-       fpga_region_class = class_create("fpga_region");
-       if (IS_ERR(fpga_region_class))
-               return PTR_ERR(fpga_region_class);
-
-       fpga_region_class->dev_groups = fpga_region_groups;
-       fpga_region_class->dev_release = fpga_region_dev_release;
-
-       return 0;
+       return class_register(&fpga_region_class);

 }
 
 static void __exit fpga_region_exit(void)
 {
 }
 
 static void __exit fpga_region_exit(void)
 {

-       class_destroy(fpga_region_class);
+       class_unregister(&fpga_region_class);

        ida_destroy(&fpga_region_ida);
 }
 
        ida_destroy(&fpga_region_ida);
 }