Merge remote-tracking branch 'spi/for-5.14' into spi-linus

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

diff --git a/drivers/fpga/fpga-region.c b/drivers/fpga/fpga-region.c
index c3134b89c3fe551348d41049896257e40d8783fe..a4838715221ff209792d2829be7864c305336e92 100644 (file)
--- a/drivers/fpga/fpga-region.c
+++ b/drivers/fpga/fpga-region.c
@@ -33,14 +33,14 @@ struct fpga_region *fpga_region_class_find(
 EXPORT_SYMBOL_GPL(fpga_region_class_find);
 
 /**
 EXPORT_SYMBOL_GPL(fpga_region_class_find);
 
 /**

- * fpga_region_get - get an exclusive reference to a fpga region
+ * fpga_region_get - get an exclusive reference to an fpga region

  * @region: FPGA Region struct
  *
  * Caller should call fpga_region_put() when done with region.
  *
  * Return fpga_region struct if successful.
  * Return -EBUSY if someone already has a reference to the region.
  * @region: FPGA Region struct
  *
  * Caller should call fpga_region_put() when done with region.
  *
  * Return fpga_region struct if successful.
  * Return -EBUSY if someone already has a reference to the region.

- * Return -ENODEV if @np is not a FPGA Region.
+ * Return -ENODEV if @np is not an FPGA Region.

  */
 static struct fpga_region *fpga_region_get(struct fpga_region *region)
 {
  */
 static struct fpga_region *fpga_region_get(struct fpga_region *region)
 {


@@ -181,7 +181,7 @@ ATTRIBUTE_GROUPS(fpga_region);
 
 /**
  * fpga_region_create - alloc and init a struct fpga_region
 
 /**
  * fpga_region_create - alloc and init a struct fpga_region

- * @dev: device parent
+ * @parent: device parent

  * @mgr: manager that programs this region
  * @get_bridges: optional function to get bridges to a list
  *
  * @mgr: manager that programs this region
  * @get_bridges: optional function to get bridges to a list
  *


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

-*fpga_region_create(struct device *dev,
+*fpga_region_create(struct device *parent,

                    struct fpga_manager *mgr,
                    int (*get_bridges)(struct fpga_region *))
 {
                    struct fpga_manager *mgr,
                    int (*get_bridges)(struct fpga_region *))
 {


@@ -214,8 +214,8 @@ struct fpga_region
 
        device_initialize(&region->dev);
        region->dev.class = fpga_region_class;
 
        device_initialize(&region->dev);
        region->dev.class = fpga_region_class;

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

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


@@ -234,7 +234,7 @@ err_free:
 EXPORT_SYMBOL_GPL(fpga_region_create);
 
 /**
 EXPORT_SYMBOL_GPL(fpga_region_create);
 
 /**

- * fpga_region_free - free a FPGA region created by fpga_region_create()
+ * fpga_region_free - free an FPGA region created by fpga_region_create()

  * @region: FPGA region
  */
 void fpga_region_free(struct fpga_region *region)
  * @region: FPGA region
  */
 void fpga_region_free(struct fpga_region *region)


@@ -253,11 +253,11 @@ static void devm_fpga_region_release(struct device *dev, void *res)
 
 /**
  * devm_fpga_region_create - create and initialize a managed FPGA region struct
 
 /**
  * devm_fpga_region_create - create and initialize a managed FPGA region struct

- * @dev: device parent
+ * @parent: device parent

  * @mgr: manager that programs this region
  * @get_bridges: optional function to get bridges to a list
  *
  * @mgr: manager that programs this region
  * @get_bridges: optional function to get bridges to a list
  *

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

  * After the region driver creates the region struct with
  * devm_fpga_region_create(), it should register it with fpga_region_register().
  * The region driver's remove function should call fpga_region_unregister().
  * After the region driver creates the region struct with
  * devm_fpga_region_create(), it should register it with fpga_region_register().
  * The region driver's remove function should call fpga_region_unregister().


@@ -268,7 +268,7 @@ static void devm_fpga_region_release(struct device *dev, void *res)
  * Return: struct fpga_region or NULL
  */
 struct fpga_region
  * Return: struct fpga_region or NULL
  */
 struct fpga_region

-*devm_fpga_region_create(struct device *dev,
+*devm_fpga_region_create(struct device *parent,

                         struct fpga_manager *mgr,
                         int (*get_bridges)(struct fpga_region *))
 {
                         struct fpga_manager *mgr,
                         int (*get_bridges)(struct fpga_region *))
 {


@@ -278,12 +278,12 @@ struct fpga_region
        if (!ptr)
                return NULL;
 
        if (!ptr)
                return NULL;
 

-       region = fpga_region_create(dev, mgr, get_bridges);
+       region = fpga_region_create(parent, mgr, get_bridges);

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

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

        }
 
        return region;
        }
 
        return region;


@@ -291,7 +291,7 @@ struct fpga_region
 EXPORT_SYMBOL_GPL(devm_fpga_region_create);
 
 /**
 EXPORT_SYMBOL_GPL(devm_fpga_region_create);
 
 /**

- * fpga_region_register - register a FPGA region
+ * fpga_region_register - register an FPGA region

  * @region: FPGA region
  *
  * Return: 0 or -errno
  * @region: FPGA region
  *
  * Return: 0 or -errno


@@ -303,10 +303,10 @@ int fpga_region_register(struct fpga_region *region)
 EXPORT_SYMBOL_GPL(fpga_region_register);
 
 /**
 EXPORT_SYMBOL_GPL(fpga_region_register);
 
 /**

- * fpga_region_unregister - unregister a FPGA region
+ * fpga_region_unregister - unregister an FPGA region

  * @region: FPGA region
  *
  * @region: FPGA region
  *

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

  */
 void fpga_region_unregister(struct fpga_region *region)
 {
  */
 void fpga_region_unregister(struct fpga_region *region)
 {