| Message ID | 20210531194947.10770-7-andriy.shevchenko@linux.intel.com |
|---|---|
| State | Accepted |
| Commit | 9ae241d06ef7aca8ebe8b1df91e0621ba7de5195 |
| Headers | show |
| Series | None | expand |
Hello Andy, On Mon, May 31, 2021 at 10:49:47PM +0300, Andy Shevchenko wrote: > Use devm_add_action_or_reset() instead of devres_alloc() and > devres_add(), which works the same. This will simplify the > code. There is no functional changes. > > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > --- > v2: new patch > drivers/pwm/core.c | 60 +++++++++++++++++++--------------------------- > 1 file changed, 25 insertions(+), 35 deletions(-) > > diff --git a/drivers/pwm/core.c b/drivers/pwm/core.c > index 6d4410bd9793..9f643414676b 100644 > --- a/drivers/pwm/core.c > +++ b/drivers/pwm/core.c > @@ -1059,9 +1059,9 @@ void pwm_put(struct pwm_device *pwm) > } > EXPORT_SYMBOL_GPL(pwm_put); > > -static void devm_pwm_release(struct device *dev, void *res) > +static void devm_pwm_release(void *pwm) > { > - pwm_put(*(struct pwm_device **)res); > + pwm_put(pwm); > } > > /** > @@ -1077,19 +1077,16 @@ static void devm_pwm_release(struct device *dev, void *res) > */ > struct pwm_device *devm_pwm_get(struct device *dev, const char *con_id) > { > - struct pwm_device **ptr, *pwm; > - > - ptr = devres_alloc(devm_pwm_release, sizeof(*ptr), GFP_KERNEL); > - if (!ptr) > - return ERR_PTR(-ENOMEM); > + struct pwm_device *pwm; > + int ret; > > pwm = pwm_get(dev, con_id); > - if (!IS_ERR(pwm)) { > - *ptr = pwm; > - devres_add(dev, ptr); > - } else { > - devres_free(ptr); > - } > + if (IS_ERR(pwm)) > + return pwm; > + > + ret = devm_add_action_or_reset(dev, devm_pwm_release, pwm); > + if (ret) > + return ERR_PTR(ret); > > return pwm; > } > @@ -1110,19 +1107,16 @@ EXPORT_SYMBOL_GPL(devm_pwm_get); > struct pwm_device *devm_of_pwm_get(struct device *dev, struct device_node *np, > const char *con_id) > { > - struct pwm_device **ptr, *pwm; > - > - ptr = devres_alloc(devm_pwm_release, sizeof(*ptr), GFP_KERNEL); > - if (!ptr) > - return ERR_PTR(-ENOMEM); > + struct pwm_device *pwm; > + int ret; > > pwm = of_pwm_get(dev, np, con_id); > - if (!IS_ERR(pwm)) { > - *ptr = pwm; > - devres_add(dev, ptr); > - } else { > - devres_free(ptr); > - } > + if (IS_ERR(pwm)) > + return pwm; > + > + ret = devm_add_action_or_reset(dev, devm_pwm_release, pwm); > + if (ret) > + return ERR_PTR(ret); > > return pwm; > } > @@ -1144,23 +1138,19 @@ struct pwm_device *devm_fwnode_pwm_get(struct device *dev, > struct fwnode_handle *fwnode, > const char *con_id) > { > - struct pwm_device **ptr, *pwm = ERR_PTR(-ENODEV); > - > - ptr = devres_alloc(devm_pwm_release, sizeof(*ptr), GFP_KERNEL); > - if (!ptr) > - return ERR_PTR(-ENOMEM); > + struct pwm_device *pwm = ERR_PTR(-ENODEV); > + int ret; > > if (is_of_node(fwnode)) > pwm = of_pwm_get(dev, to_of_node(fwnode), con_id); > else if (is_acpi_node(fwnode)) > pwm = acpi_pwm_get(fwnode); > + if (IS_ERR(pwm)) > + return pwm; > > - if (!IS_ERR(pwm)) { > - *ptr = pwm; > - devres_add(dev, ptr); > - } else { > - devres_free(ptr); > - } > + ret = devm_add_action_or_reset(dev, devm_pwm_release, pwm); > + if (ret) > + return ERR_PTR(ret); > Another nice one: Reviewed-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Thanks Uwe -- Pengutronix e.K. | Uwe Kleine-König | Industrial Linux Solutions | https://www.pengutronix.de/ |
diff --git a/drivers/pwm/core.c b/drivers/pwm/core.c index 6d4410bd9793..9f643414676b 100644 --- a/drivers/pwm/core.c +++ b/drivers/pwm/core.c @@ -1059,9 +1059,9 @@ void pwm_put(struct pwm_device *pwm) } EXPORT_SYMBOL_GPL(pwm_put); -static void devm_pwm_release(struct device *dev, void *res) +static void devm_pwm_release(void *pwm) { - pwm_put(*(struct pwm_device **)res); + pwm_put(pwm); } /** @@ -1077,19 +1077,16 @@ static void devm_pwm_release(struct device *dev, void *res) */ struct pwm_device *devm_pwm_get(struct device *dev, const char *con_id) { - struct pwm_device **ptr, *pwm; - - ptr = devres_alloc(devm_pwm_release, sizeof(*ptr), GFP_KERNEL); - if (!ptr) - return ERR_PTR(-ENOMEM); + struct pwm_device *pwm; + int ret; pwm = pwm_get(dev, con_id); - if (!IS_ERR(pwm)) { - *ptr = pwm; - devres_add(dev, ptr); - } else { - devres_free(ptr); - } + if (IS_ERR(pwm)) + return pwm; + + ret = devm_add_action_or_reset(dev, devm_pwm_release, pwm); + if (ret) + return ERR_PTR(ret); return pwm; } @@ -1110,19 +1107,16 @@ EXPORT_SYMBOL_GPL(devm_pwm_get); struct pwm_device *devm_of_pwm_get(struct device *dev, struct device_node *np, const char *con_id) { - struct pwm_device **ptr, *pwm; - - ptr = devres_alloc(devm_pwm_release, sizeof(*ptr), GFP_KERNEL); - if (!ptr) - return ERR_PTR(-ENOMEM); + struct pwm_device *pwm; + int ret; pwm = of_pwm_get(dev, np, con_id); - if (!IS_ERR(pwm)) { - *ptr = pwm; - devres_add(dev, ptr); - } else { - devres_free(ptr); - } + if (IS_ERR(pwm)) + return pwm; + + ret = devm_add_action_or_reset(dev, devm_pwm_release, pwm); + if (ret) + return ERR_PTR(ret); return pwm; } @@ -1144,23 +1138,19 @@ struct pwm_device *devm_fwnode_pwm_get(struct device *dev, struct fwnode_handle *fwnode, const char *con_id) { - struct pwm_device **ptr, *pwm = ERR_PTR(-ENODEV); - - ptr = devres_alloc(devm_pwm_release, sizeof(*ptr), GFP_KERNEL); - if (!ptr) - return ERR_PTR(-ENOMEM); + struct pwm_device *pwm = ERR_PTR(-ENODEV); + int ret; if (is_of_node(fwnode)) pwm = of_pwm_get(dev, to_of_node(fwnode), con_id); else if (is_acpi_node(fwnode)) pwm = acpi_pwm_get(fwnode); + if (IS_ERR(pwm)) + return pwm; - if (!IS_ERR(pwm)) { - *ptr = pwm; - devres_add(dev, ptr); - } else { - devres_free(ptr); - } + ret = devm_add_action_or_reset(dev, devm_pwm_release, pwm); + if (ret) + return ERR_PTR(ret); return pwm; }
Use devm_add_action_or_reset() instead of devres_alloc() and devres_add(), which works the same. This will simplify the code. There is no functional changes. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> --- v2: new patch drivers/pwm/core.c | 60 +++++++++++++++++++--------------------------- 1 file changed, 25 insertions(+), 35 deletions(-)