Merge branch 'rework/printk_safe-removal' into for-linus

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

diff --git a/drivers/fpga/fpga-bridge.c b/drivers/fpga/fpga-bridge.c
index e9266b2a357f6029cd63f0edf8ea6722eb1649cd..2bfb2ff86930555c1638610726caeb18690fa31e 100644 (file)
--- a/drivers/fpga/fpga-bridge.c
+++ b/drivers/fpga/fpga-bridge.c
@@ -85,14 +85,14 @@ err_dev:
 }
 
 /**
 }
 
 /**

- * of_fpga_bridge_get - get an exclusive reference to a fpga bridge
+ * of_fpga_bridge_get - get an exclusive reference to an fpga bridge

  *
  *

- * @np: node pointer of a FPGA bridge
+ * @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.
  * @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 a FPGA Bridge.
+ * Return -ENODEV if @np is not an FPGA Bridge.

  */
 struct fpga_bridge *of_fpga_bridge_get(struct device_node *np,
                                       struct fpga_image_info *info)
  */
 struct fpga_bridge *of_fpga_bridge_get(struct device_node *np,
                                       struct fpga_image_info *info)


@@ -113,11 +113,11 @@ static int fpga_bridge_dev_match(struct device *dev, const void *data)
 }
 
 /**
 }
 
 /**

- * fpga_bridge_get - get an exclusive reference to a fpga bridge
+ * fpga_bridge_get - get an exclusive reference to an fpga bridge

  * @dev:       parent device that fpga bridge was registered with
  * @info:      fpga manager info
  *
  * @dev:       parent device that fpga bridge was registered with
  * @info:      fpga manager info
  *

- * Given a device, get an exclusive reference to a fpga bridge.
+ * Given a device, get an exclusive reference to an fpga bridge.

  *
  * Return: fpga bridge struct or IS_ERR() condition containing error code.
  */
  *
  * Return: fpga bridge struct or IS_ERR() condition containing error code.
  */


@@ -224,7 +224,7 @@ EXPORT_SYMBOL_GPL(fpga_bridges_put);
 /**
  * of_fpga_bridge_get_to_list - get a bridge, add it to a list
  *
 /**
  * of_fpga_bridge_get_to_list - get a bridge, add it to a list
  *

- * @np: node pointer of a FPGA bridge
+ * @np: node pointer of an FPGA bridge

  * @info: fpga image specific information
  * @bridge_list: list of FPGA bridges
  *
  * @info: fpga image specific information
  * @bridge_list: list of FPGA bridges
  *


@@ -313,7 +313,7 @@ ATTRIBUTE_GROUPS(fpga_bridge);
 
 /**
  * fpga_bridge_create - create and initialize a struct fpga_bridge
 
 /**
  * fpga_bridge_create - create and initialize a struct fpga_bridge

- * @dev:       FPGA bridge device from pdev
+ * @parent:    FPGA bridge device from pdev

  * @name:      FPGA bridge name
  * @br_ops:    pointer to structure of fpga bridge ops
  * @priv:      FPGA bridge private data
  * @name:      FPGA bridge name
  * @br_ops:    pointer to structure of fpga bridge ops
  * @priv:      FPGA bridge private data


@@ -323,7 +323,7 @@ ATTRIBUTE_GROUPS(fpga_bridge);
  *
  * Return: struct fpga_bridge or NULL
  */
  *
  * Return: struct fpga_bridge or NULL
  */

-struct fpga_bridge *fpga_bridge_create(struct device *dev, const char *name,
+struct fpga_bridge *fpga_bridge_create(struct device *parent, const char *name,

                                       const struct fpga_bridge_ops *br_ops,
                                       void *priv)
 {
                                       const struct fpga_bridge_ops *br_ops,
                                       void *priv)
 {


@@ -331,7 +331,7 @@ struct fpga_bridge *fpga_bridge_create(struct device *dev, const char *name,
        int id, ret;
 
        if (!name || !strlen(name)) {
        int id, ret;
 
        if (!name || !strlen(name)) {

-               dev_err(dev, "Attempt to register with no name!\n");
+               dev_err(parent, "Attempt to register with no name!\n");

                return NULL;
        }
 
                return NULL;
        }
 


@@ -353,8 +353,8 @@ struct fpga_bridge *fpga_bridge_create(struct device *dev, const char *name,
        device_initialize(&bridge->dev);
        bridge->dev.groups = br_ops->groups;
        bridge->dev.class = fpga_bridge_class;
        device_initialize(&bridge->dev);
        bridge->dev.groups = br_ops->groups;
        bridge->dev.class = fpga_bridge_class;

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

        bridge->dev.id = id;
 
        ret = dev_set_name(&bridge->dev, "br%d", id);
        bridge->dev.id = id;
 
        ret = dev_set_name(&bridge->dev, "br%d", id);


@@ -373,7 +373,7 @@ error_kfree:
 EXPORT_SYMBOL_GPL(fpga_bridge_create);
 
 /**
 EXPORT_SYMBOL_GPL(fpga_bridge_create);
 
 /**

- * fpga_bridge_free - free a fpga bridge created by fpga_bridge_create()
+ * fpga_bridge_free - free an fpga bridge created by fpga_bridge_create()

  * @bridge:    FPGA bridge struct
  */
 void fpga_bridge_free(struct fpga_bridge *bridge)
  * @bridge:    FPGA bridge struct
  */
 void fpga_bridge_free(struct fpga_bridge *bridge)


@@ -392,12 +392,12 @@ static void devm_fpga_bridge_release(struct device *dev, void *res)
 
 /**
  * devm_fpga_bridge_create - create and init a managed struct fpga_bridge
 
 /**
  * devm_fpga_bridge_create - create and init a managed struct fpga_bridge

- * @dev:       FPGA bridge device from pdev
+ * @parent:    FPGA bridge device from pdev

  * @name:      FPGA bridge name
  * @br_ops:    pointer to structure of fpga bridge ops
  * @priv:      FPGA bridge private data
  *
  * @name:      FPGA bridge name
  * @br_ops:    pointer to structure of fpga bridge ops
  * @priv:      FPGA bridge private data
  *

- * This function is intended for use in a FPGA bridge driver's probe function.
+ * This function is intended for use in an FPGA bridge driver's probe function.

  * After the bridge driver creates the struct with devm_fpga_bridge_create(), it
  * should register the bridge with fpga_bridge_register().  The bridge driver's
  * remove function should call fpga_bridge_unregister().  The bridge struct
  * After the bridge driver creates the struct with devm_fpga_bridge_create(), it
  * should register the bridge with fpga_bridge_register().  The bridge driver's
  * remove function should call fpga_bridge_unregister().  The bridge struct


@@ -408,7 +408,7 @@ static void devm_fpga_bridge_release(struct device *dev, void *res)
  *  Return: struct fpga_bridge or NULL
  */
 struct fpga_bridge
  *  Return: struct fpga_bridge or NULL
  */
 struct fpga_bridge

-*devm_fpga_bridge_create(struct device *dev, const char *name,
+*devm_fpga_bridge_create(struct device *parent, const char *name,

                         const struct fpga_bridge_ops *br_ops, void *priv)
 {
        struct fpga_bridge **ptr, *bridge;
                         const struct fpga_bridge_ops *br_ops, void *priv)
 {
        struct fpga_bridge **ptr, *bridge;


@@ -417,12 +417,12 @@ struct fpga_bridge
        if (!ptr)
                return NULL;
 
        if (!ptr)
                return NULL;
 

-       bridge = fpga_bridge_create(dev, name, br_ops, priv);
+       bridge = fpga_bridge_create(parent, name, br_ops, priv);

        if (!bridge) {
                devres_free(ptr);
        } else {
                *ptr = bridge;
        if (!bridge) {
                devres_free(ptr);
        } else {
                *ptr = bridge;

-               devres_add(dev, ptr);
+               devres_add(parent, ptr);

        }
 
        return bridge;
        }
 
        return bridge;


@@ -430,7 +430,7 @@ struct fpga_bridge
 EXPORT_SYMBOL_GPL(devm_fpga_bridge_create);
 
 /**
 EXPORT_SYMBOL_GPL(devm_fpga_bridge_create);
 
 /**

- * fpga_bridge_register - register a FPGA bridge
+ * fpga_bridge_register - register an FPGA bridge

  *
  * @bridge: FPGA bridge struct
  *
  *
  * @bridge: FPGA bridge struct
  *


@@ -454,11 +454,11 @@ int fpga_bridge_register(struct fpga_bridge *bridge)
 EXPORT_SYMBOL_GPL(fpga_bridge_register);
 
 /**
 EXPORT_SYMBOL_GPL(fpga_bridge_register);
 
 /**

- * fpga_bridge_unregister - unregister a FPGA bridge
+ * fpga_bridge_unregister - unregister an FPGA bridge

  *
  * @bridge: FPGA bridge struct
  *
  *
  * @bridge: FPGA bridge struct
  *

- * This function is intended for use in a FPGA bridge driver's remove function.
+ * This function is intended for use in an FPGA bridge driver's remove function.

  */
 void fpga_bridge_unregister(struct fpga_bridge *bridge)
 {
  */
 void fpga_bridge_unregister(struct fpga_bridge *bridge)
 {