| Message ID | 20210609221135.261837-4-russell.h.weight@intel.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | fpga: Populate dev_release functions | expand |
Looks good to me. Reviewed-by: Xu Yilun <yilun.xu@intel.com> On Wed, Jun 09, 2021 at 03:11:30PM -0700, Russ Weight wrote: > Rename variable "dev" to "parent" in cases where it represents the parent > device. > > Signed-off-by: Russ Weight <russell.h.weight@intel.com> > --- > v2: > - This patch contains the renaming of "dev" to "parent" that was previously > part of the patch: "fpga: mgr: Use standard dev_release for class driver" > --- > drivers/fpga/fpga-mgr.c | 20 ++++++++++---------- > 1 file changed, 10 insertions(+), 10 deletions(-) > > diff --git a/drivers/fpga/fpga-mgr.c b/drivers/fpga/fpga-mgr.c > index b85bc47c91a9..42ddc0844781 100644 > --- a/drivers/fpga/fpga-mgr.c > +++ b/drivers/fpga/fpga-mgr.c > @@ -551,7 +551,7 @@ EXPORT_SYMBOL_GPL(fpga_mgr_unlock); > > /** > * fpga_mgr_create - create and initialize a 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 > @@ -561,7 +561,7 @@ EXPORT_SYMBOL_GPL(fpga_mgr_unlock); > * > * 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) > { > @@ -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)) { > - 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)) { > - dev_err(dev, "Attempt to register with no name!\n"); > + dev_err(parent, "Attempt to register with no name!\n"); > 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; > - 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); > @@ -636,7 +636,7 @@ static void devm_fpga_mgr_release(struct device *dev, void *res) > > /** > * 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 > @@ -651,7 +651,7 @@ static void devm_fpga_mgr_release(struct device *dev, void *res) > * > * 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) > { > @@ -661,13 +661,13 @@ struct fpga_manager *devm_fpga_mgr_create(struct device *dev, const char *name, > 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; > } > > - devres_add(dev, dr); > + devres_add(parent, dr); > > return dr->mgr; > } > -- > 2.25.1
diff --git a/drivers/fpga/fpga-mgr.c b/drivers/fpga/fpga-mgr.c index b85bc47c91a9..42ddc0844781 100644 --- a/drivers/fpga/fpga-mgr.c +++ b/drivers/fpga/fpga-mgr.c @@ -551,7 +551,7 @@ EXPORT_SYMBOL_GPL(fpga_mgr_unlock); /** * fpga_mgr_create - create and initialize a 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 @@ -561,7 +561,7 @@ EXPORT_SYMBOL_GPL(fpga_mgr_unlock); * * 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) { @@ -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)) { - 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)) { - dev_err(dev, "Attempt to register with no name!\n"); + dev_err(parent, "Attempt to register with no name!\n"); 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; - 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); @@ -636,7 +636,7 @@ static void devm_fpga_mgr_release(struct device *dev, void *res) /** * 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 @@ -651,7 +651,7 @@ static void devm_fpga_mgr_release(struct device *dev, void *res) * * 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) { @@ -661,13 +661,13 @@ struct fpga_manager *devm_fpga_mgr_create(struct device *dev, const char *name, 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; } - devres_add(dev, dr); + devres_add(parent, dr); return dr->mgr; }
Rename variable "dev" to "parent" in cases where it represents the parent device. Signed-off-by: Russ Weight <russell.h.weight@intel.com> --- v2: - This patch contains the renaming of "dev" to "parent" that was previously part of the patch: "fpga: mgr: Use standard dev_release for class driver" --- drivers/fpga/fpga-mgr.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)