Merge tag 'rproc-v5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/andersson...

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

diff --git a/drivers/fpga/fpga-mgr.c b/drivers/fpga/fpga-mgr.c
index b85bc47c91a9a127d5da6a162e44ac5cff673141..ecb4c3c795fa561a6043efeee4ad481e163a4b6b 100644 (file)
--- a/drivers/fpga/fpga-mgr.c
+++ b/drivers/fpga/fpga-mgr.c
@@ -26,7 +26,7 @@ struct fpga_mgr_devres {
 };
 
 /**
 };
 
 /**

- * fpga_image_info_alloc - Allocate a FPGA image info struct
+ * fpga_image_info_alloc - Allocate an FPGA image info struct

  * @dev: owning device
  *
  * Return: struct fpga_image_info or NULL
  * @dev: owning device
  *
  * Return: struct fpga_image_info or NULL


@@ -50,7 +50,7 @@ struct fpga_image_info *fpga_image_info_alloc(struct device *dev)
 EXPORT_SYMBOL_GPL(fpga_image_info_alloc);
 
 /**
 EXPORT_SYMBOL_GPL(fpga_image_info_alloc);
 
 /**

- * fpga_image_info_free - Free a FPGA image info struct
+ * fpga_image_info_free - Free an FPGA image info struct

  * @info: FPGA image info struct to free
  */
 void fpga_image_info_free(struct fpga_image_info *info)
  * @info: FPGA image info struct to free
  */
 void fpga_image_info_free(struct fpga_image_info *info)


@@ -470,7 +470,7 @@ static int fpga_mgr_dev_match(struct device *dev, const void *data)
 }
 
 /**
 }
 
 /**

- * fpga_mgr_get - Given a device, get a reference to a fpga mgr.
+ * fpga_mgr_get - Given a device, get a reference to an fpga mgr.

  * @dev:       parent device that fpga mgr was registered with
  *
  * Return: fpga manager struct or IS_ERR() condition containing error code.
  * @dev:       parent device that fpga mgr was registered with
  *
  * Return: fpga manager struct or IS_ERR() condition containing error code.


@@ -487,7 +487,7 @@ struct fpga_manager *fpga_mgr_get(struct device *dev)
 EXPORT_SYMBOL_GPL(fpga_mgr_get);
 
 /**
 EXPORT_SYMBOL_GPL(fpga_mgr_get);
 
 /**

- * of_fpga_mgr_get - Given a device node, get a reference to a fpga mgr.
+ * of_fpga_mgr_get - Given a device node, get a reference to an fpga mgr.

  *
  * @node:      device node
  *
  *
  * @node:      device node
  *


@@ -506,7 +506,7 @@ struct fpga_manager *of_fpga_mgr_get(struct device_node *node)
 EXPORT_SYMBOL_GPL(of_fpga_mgr_get);
 
 /**
 EXPORT_SYMBOL_GPL(of_fpga_mgr_get);
 
 /**

- * fpga_mgr_put - release a reference to a fpga manager
+ * fpga_mgr_put - release a reference to an fpga manager

  * @mgr:       fpga manager structure
  */
 void fpga_mgr_put(struct fpga_manager *mgr)
  * @mgr:       fpga manager structure
  */
 void fpga_mgr_put(struct fpga_manager *mgr)


@@ -550,8 +550,8 @@ void fpga_mgr_unlock(struct fpga_manager *mgr)
 EXPORT_SYMBOL_GPL(fpga_mgr_unlock);
 
 /**
 EXPORT_SYMBOL_GPL(fpga_mgr_unlock);
 
 /**

- * fpga_mgr_create - create and initialize a FPGA manager struct
- * @dev:       fpga manager device from pdev
+ * fpga_mgr_create - create and initialize an FPGA manager struct
+ * @parent:    fpga manager device from pdev

  * @name:      fpga manager name
  * @mops:      pointer to structure of fpga manager ops
  * @priv:      fpga manager private data
  * @name:      fpga manager name
  * @mops:      pointer to structure of fpga manager ops
  * @priv:      fpga manager private data


@@ -561,7 +561,7 @@ EXPORT_SYMBOL_GPL(fpga_mgr_unlock);
  *
  * Return: pointer to struct fpga_manager or NULL
  */
  *
  * Return: pointer to struct fpga_manager or NULL
  */

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

                                     const struct fpga_manager_ops *mops,
                                     void *priv)
 {
                                     const struct fpga_manager_ops *mops,
                                     void *priv)
 {


@@ -571,12 +571,12 @@ struct fpga_manager *fpga_mgr_create(struct device *dev, const char *name,
        if (!mops || !mops->write_complete || !mops->state ||
            !mops->write_init || (!mops->write && !mops->write_sg) ||
            (mops->write && mops->write_sg)) {
        if (!mops || !mops->write_complete || !mops->state ||
            !mops->write_init || (!mops->write && !mops->write_sg) ||
            (mops->write && mops->write_sg)) {

-               dev_err(dev, "Attempt to register without fpga_manager_ops\n");
+               dev_err(parent, "Attempt to register without fpga_manager_ops\n");

                return NULL;
        }
 
        if (!name || !strlen(name)) {
                return NULL;
        }
 
        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;
        }
 


@@ -597,8 +597,8 @@ struct fpga_manager *fpga_mgr_create(struct device *dev, const char *name,
        device_initialize(&mgr->dev);
        mgr->dev.class = fpga_mgr_class;
        mgr->dev.groups = mops->groups;
        device_initialize(&mgr->dev);
        mgr->dev.class = fpga_mgr_class;
        mgr->dev.groups = mops->groups;

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

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


@@ -617,7 +617,7 @@ error_kfree:
 EXPORT_SYMBOL_GPL(fpga_mgr_create);
 
 /**
 EXPORT_SYMBOL_GPL(fpga_mgr_create);
 
 /**

- * fpga_mgr_free - free a FPGA manager created with fpga_mgr_create()
+ * fpga_mgr_free - free an FPGA manager created with fpga_mgr_create()

  * @mgr:       fpga manager struct
  */
 void fpga_mgr_free(struct fpga_manager *mgr)
  * @mgr:       fpga manager struct
  */
 void fpga_mgr_free(struct fpga_manager *mgr)


@@ -636,12 +636,12 @@ static void devm_fpga_mgr_release(struct device *dev, void *res)
 
 /**
  * devm_fpga_mgr_create - create and initialize a managed FPGA manager struct
 
 /**
  * devm_fpga_mgr_create - create and initialize a managed FPGA manager struct

- * @dev:       fpga manager device from pdev
+ * @parent:    fpga manager device from pdev

  * @name:      fpga manager name
  * @mops:      pointer to structure of fpga manager ops
  * @priv:      fpga manager private data
  *
  * @name:      fpga manager name
  * @mops:      pointer to structure of fpga manager ops
  * @priv:      fpga manager private data
  *

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

  * After the manager driver creates the manager struct with
  * devm_fpga_mgr_create(), it should register it with fpga_mgr_register().  The
  * manager driver's remove function should call fpga_mgr_unregister().  The
  * After the manager driver creates the manager struct with
  * devm_fpga_mgr_create(), it should register it with fpga_mgr_register().  The
  * manager driver's remove function should call fpga_mgr_unregister().  The


@@ -651,7 +651,7 @@ static void devm_fpga_mgr_release(struct device *dev, void *res)
  *
  * Return: pointer to struct fpga_manager or NULL
  */
  *
  * Return: pointer to struct fpga_manager or NULL
  */

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

                                          const struct fpga_manager_ops *mops,
                                          void *priv)
 {
                                          const struct fpga_manager_ops *mops,
                                          void *priv)
 {


@@ -661,20 +661,20 @@ struct fpga_manager *devm_fpga_mgr_create(struct device *dev, const char *name,
        if (!dr)
                return NULL;
 
        if (!dr)
                return NULL;
 

-       dr->mgr = fpga_mgr_create(dev, name, mops, priv);
+       dr->mgr = fpga_mgr_create(parent, name, mops, priv);

        if (!dr->mgr) {
                devres_free(dr);
                return NULL;
        }
 
        if (!dr->mgr) {
                devres_free(dr);
                return NULL;
        }
 

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

 
        return dr->mgr;
 }
 EXPORT_SYMBOL_GPL(devm_fpga_mgr_create);
 
 /**
 
        return dr->mgr;
 }
 EXPORT_SYMBOL_GPL(devm_fpga_mgr_create);
 
 /**

- * fpga_mgr_register - register a FPGA manager
+ * fpga_mgr_register - register an FPGA manager

  * @mgr: fpga manager struct
  *
  * Return: 0 on success, negative error code otherwise.
  * @mgr: fpga manager struct
  *
  * Return: 0 on success, negative error code otherwise.


@@ -706,10 +706,10 @@ error_device:
 EXPORT_SYMBOL_GPL(fpga_mgr_register);
 
 /**
 EXPORT_SYMBOL_GPL(fpga_mgr_register);
 
 /**

- * fpga_mgr_unregister - unregister a FPGA manager
+ * fpga_mgr_unregister - unregister an FPGA manager

  * @mgr: fpga manager struct
  *
  * @mgr: fpga manager struct
  *

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

  */
 void fpga_mgr_unregister(struct fpga_manager *mgr)
 {
  */
 void fpga_mgr_unregister(struct fpga_manager *mgr)
 {