Merge tag 'trace-v6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux...

[linux.git] / drivers / fpga / fpga-bridge.c

diff --git a/drivers/fpga/fpga-bridge.c b/drivers/fpga/fpga-bridge.c
index a6c25dee9cc11800f47003047dfb449336c0dccb..a024be2b84e2913d0be7b3621c21080dd5583793 100644 (file)
--- a/drivers/fpga/fpga-bridge.c
+++ b/drivers/fpga/fpga-bridge.c
@@ -14,7 +14,7 @@
 #include <linux/spinlock.h>
 
 static DEFINE_IDA(fpga_bridge_ida);
 #include <linux/spinlock.h>
 
 static DEFINE_IDA(fpga_bridge_ida);

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

 
 /* Lock for adding/removing bridges to linked lists*/
 static DEFINE_SPINLOCK(bridge_list_lock);
 
 /* Lock for adding/removing bridges to linked lists*/
 static DEFINE_SPINLOCK(bridge_list_lock);


@@ -87,19 +87,20 @@ err_dev:
 /**
  * of_fpga_bridge_get - get an exclusive reference to an fpga bridge
  *
 /**
  * of_fpga_bridge_get - get an exclusive reference to an fpga bridge
  *

- * @np: node pointer of an FPGA bridge
- * @info: fpga image specific information
+ * @np: node pointer of an FPGA bridge.
+ * @info: fpga image specific information.

  *
  *

- * Return fpga_bridge struct if successful.
- * Return -EBUSY if someone already has a reference to the bridge.
- * Return -ENODEV if @np is not an FPGA Bridge.
+ * Return:
+ * * fpga_bridge struct pointer if successful.
+ * * -EBUSY if someone already has a reference to the bridge.
+ * * -ENODEV if @np is not an FPGA Bridge or can't take parent driver refcount.

  */
 struct fpga_bridge *of_fpga_bridge_get(struct device_node *np,
                                       struct fpga_image_info *info)
 {
        struct device *dev;
 
  */
 struct fpga_bridge *of_fpga_bridge_get(struct device_node *np,
                                       struct fpga_image_info *info)
 {
        struct device *dev;
 

-       dev = class_find_device_by_of_node(fpga_bridge_class, np);
+       dev = class_find_device_by_of_node(&fpga_bridge_class, np);

        if (!dev)
                return ERR_PTR(-ENODEV);
 
        if (!dev)
                return ERR_PTR(-ENODEV);
 


@@ -126,7 +127,7 @@ struct fpga_bridge *fpga_bridge_get(struct device *dev,
 {
        struct device *bridge_dev;
 
 {
        struct device *bridge_dev;
 

-       bridge_dev = class_find_device(fpga_bridge_class, NULL, dev,
+       bridge_dev = class_find_device(&fpga_bridge_class, NULL, dev,

                                       fpga_bridge_dev_match);
        if (!bridge_dev)
                return ERR_PTR(-ENODEV);
                                       fpga_bridge_dev_match);
        if (!bridge_dev)
                return ERR_PTR(-ENODEV);


@@ -155,9 +156,9 @@ EXPORT_SYMBOL_GPL(fpga_bridge_put);
  * fpga_bridges_enable - enable bridges in a list
  * @bridge_list: list of FPGA bridges
  *
  * fpga_bridges_enable - enable bridges in a list
  * @bridge_list: list of FPGA bridges
  *

- * Enable each bridge in the list.  If list is empty, do nothing.
+ * Enable each bridge in the list. If list is empty, do nothing.

  *
  *

- * Return 0 for success or empty bridge list; return error code otherwise.
+ * Return: 0 for success or empty bridge list or an error code otherwise.

  */
 int fpga_bridges_enable(struct list_head *bridge_list)
 {
  */
 int fpga_bridges_enable(struct list_head *bridge_list)
 {


@@ -179,9 +180,9 @@ EXPORT_SYMBOL_GPL(fpga_bridges_enable);
  *
  * @bridge_list: list of FPGA bridges
  *
  *
  * @bridge_list: list of FPGA bridges
  *

- * Disable each bridge in the list.  If list is empty, do nothing.
+ * Disable each bridge in the list. If list is empty, do nothing.

  *
  *

- * Return 0 for success or empty bridge list; return error code otherwise.
+ * Return: 0 for success or empty bridge list or an error code otherwise.

  */
 int fpga_bridges_disable(struct list_head *bridge_list)
 {
  */
 int fpga_bridges_disable(struct list_head *bridge_list)
 {


@@ -230,7 +231,7 @@ EXPORT_SYMBOL_GPL(fpga_bridges_put);
  *
  * Get an exclusive reference to the bridge and it to the list.
  *
  *
  * Get an exclusive reference to the bridge and it to the list.
  *

- * Return 0 for success, error code from of_fpga_bridge_get() otherwise.
+ * Return: 0 for success, error code from of_fpga_bridge_get() otherwise.

  */
 int of_fpga_bridge_get_to_list(struct device_node *np,
                               struct fpga_image_info *info,
  */
 int of_fpga_bridge_get_to_list(struct device_node *np,
                               struct fpga_image_info *info,


@@ -260,7 +261,7 @@ EXPORT_SYMBOL_GPL(of_fpga_bridge_get_to_list);
  *
  * Get an exclusive reference to the bridge and it to the list.
  *
  *
  * Get an exclusive reference to the bridge and it to the list.
  *

- * Return 0 for success, error code from fpga_bridge_get() otherwise.
+ * Return: 0 for success, error code from fpga_bridge_get() otherwise.

  */
 int fpga_bridge_get_to_list(struct device *dev,
                            struct fpga_image_info *info,
  */
 int fpga_bridge_get_to_list(struct device *dev,
                            struct fpga_image_info *info,


@@ -359,7 +360,7 @@ fpga_bridge_register(struct device *parent, const char *name,
        bridge->priv = priv;
 
        bridge->dev.groups = br_ops->groups;
        bridge->priv = priv;
 
        bridge->dev.groups = br_ops->groups;

-       bridge->dev.class = fpga_bridge_class;
+       bridge->dev.class = &fpga_bridge_class;

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


@@ -415,21 +416,20 @@ static void fpga_bridge_dev_release(struct device *dev)
        kfree(bridge);
 }
 
        kfree(bridge);
 }
 

+static const struct class fpga_bridge_class = {
+       .name = "fpga_bridge",
+       .dev_groups = fpga_bridge_groups,
+       .dev_release = fpga_bridge_dev_release,
+};
+

 static int __init fpga_bridge_dev_init(void)
 {
 static int __init fpga_bridge_dev_init(void)
 {

-       fpga_bridge_class = class_create("fpga_bridge");
-       if (IS_ERR(fpga_bridge_class))
-               return PTR_ERR(fpga_bridge_class);
-
-       fpga_bridge_class->dev_groups = fpga_bridge_groups;
-       fpga_bridge_class->dev_release = fpga_bridge_dev_release;
-
-       return 0;
+       return class_register(&fpga_bridge_class);

 }
 
 static void __exit fpga_bridge_dev_exit(void)
 {
 }
 
 static void __exit fpga_bridge_dev_exit(void)
 {

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

        ida_destroy(&fpga_bridge_ida);
 }
 
        ida_destroy(&fpga_bridge_ida);
 }