pinctrl: core: managed resource handling cleanup
Subsystems (4)
cover pinctrl: core: managed resource handling cleanup
I have stumbled over low-level APIs used for managed API implementations. Here is a clean up along with a drop of some duplicate messages.
Andy Shevchenko (3):
pinctrl: core: Remove unused devm_pinctrl_unregister()
pinctrl: core: Simplify devm_pinctrl_*()
pinctrl: core: Remove duplicate error messages
.../driver-api/driver-model/devres.rst | 1 - drivers/pinctrl/core.c | 93 +++++-------------- include/linux/pinctrl/pinctrl.h | 3 - 3 files changed, 21 insertions(+), 76 deletions(-)
Signature · 1 line
2.50.1
PATCH 1/3 pinctrl: core: Remove unused devm_pinctrl_unregister()
There are no users, drop it for good.
--- .../driver-api/driver-model/devres.rst | 1 - drivers/pinctrl/core.c | 22 ------------------- include/linux/pinctrl/pinctrl.h | 3 --- 3 files changed, 26 deletions(-)
Documentation/driver-api/driver-model/devres.rst +0 -1
@@ -408,7 +408,6 @@ PINCTRL devm_pinctrl_get_select() devm_pinctrl_register() devm_pinctrl_register_and_init() - devm_pinctrl_unregister() POWER devm_reboot_mode_register()
drivers/pinctrl/core.c +0 -22
@@ -2323,16 +2323,6 @@ static void devm_pinctrl_dev_release(struct device *dev, void *res)pinctrl_unregister (pctldev); } -static int devm_pinctrl_dev_match (struct device *dev,void *res,void *data) -{ -struct pctldev **r = res; - -if (WARN_ON (!r || !*r)) -return 0 ; - -return *r == data; -} -/** * devm_pinctrl_register() - Resource managed version of pinctrl_register(). * @dev: parent device for this pin controller
@@ -2403,18 +2393,6 @@ int devm_pinctrl_register_and_init(struct device *dev, }EXPORT_SYMBOL_GPL (devm_pinctrl_register_and_init); -/** -* devm_pinctrl_unregister() - Resource managed version of pinctrl_unregister(). -* @dev: device for which resource was allocated -* @pctldev: the pinctrl device to unregister. -*/ -void devm_pinctrl_unregister (struct device *dev,struct pinctrl_dev *pctldev) -{ -WARN_ON (devres_release (dev, devm_pinctrl_dev_release, - devm_pinctrl_dev_match, pctldev)); -} -EXPORT_SYMBOL_GPL (devm_pinctrl_unregister); -static int __init pinctrl_init (void ) {pr_debug ("initialized pinctrl subsystem\n" );
include/linux/pinctrl/pinctrl.h +0 -3
@@ -187,9 +187,6 @@ extern struct pinctrl_dev *devm_pinctrl_register(struct device *dev,const struct pinctrl_desc *pctldesc, void *driver_data); -extern void devm_pinctrl_unregister (struct device *dev, -struct pinctrl_dev *pctldev); -extern void pinctrl_add_gpio_range (struct pinctrl_dev *pctldev,struct pinctrl_gpio_range *range); extern void pinctrl_add_gpio_ranges(struct pinctrl_dev *pctldev,
Signature · 1 line
2.50.1
Re: [PATCH v1 1/3] pinctrl: core: Remove unused devm_pinctrl_unregister()
Quoted 4 lines · Andy Shevchenko
There are no users, drop it for good.
Signed-off-by Andy Shevchenko <[email protected]>---
PATCH 2/3 pinctrl: core: Simplify devm_pinctrl_*()
In reply to Andy ShevchenkoUse 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.
--- drivers/pinctrl/core.c | 67 +++++++++++++----------------------------- 1 file changed, 20 insertions(+), 47 deletions(-)
drivers/pinctrl/core.c +20 -47
@@ -1383,9 +1383,9 @@ int pinctrl_select_state(struct pinctrl *p, struct pinctrl_state *state) }EXPORT_SYMBOL_GPL (pinctrl_select_state); -static void devm_pinctrl_release (struct device *dev,void *res) +static void devm_pinctrl_release (void *p) { -pinctrl_put (*(struct pinctrl **)res); +pinctrl_put (p); }/**
@@ -1397,31 +1397,21 @@ static void devm_pinctrl_release(struct device *dev, void *res)*/ struct pinctrl *devm_pinctrl_get (struct device *dev) { -struct pinctrl **ptr, *p; - - ptr =devres_alloc (devm_pinctrl_release,sizeof (*ptr),GFP_KERNEL ); -if (!ptr) -return ERR_PTR (-ENOMEM ); +struct pinctrl *p; +int ret; p =pinctrl_get (dev); -if (!IS_ERR (p)) { - *ptr = p; -devres_add (dev, ptr); - }else { -devres_free (ptr); - } +if (IS_ERR (p)) +return p; + + ret =devm_add_action_or_reset (dev, devm_pinctrl_release, p); +if (ret) +return ERR_PTR (ret);return p; }EXPORT_SYMBOL_GPL (devm_pinctrl_get); -static int devm_pinctrl_match (struct device *dev,void *res,void *data) -{ -struct pinctrl **p = res; - -return *p == data; -} -/** * devm_pinctrl_put() - Resource managed pinctrl_put() * @p: the pinctrl handle to release
@@ -1432,8 +1422,7 @@ static int devm_pinctrl_match(struct device *dev, void *res, void *data)*/ void devm_pinctrl_put (struct pinctrl *p) { -WARN_ON (devres_release (p->dev, devm_pinctrl_release, - devm_pinctrl_match, p)); +devm_release_action (p->dev, devm_pinctrl_release, p); }EXPORT_SYMBOL_GPL (devm_pinctrl_put);
@@ -2316,10 +2305,8 @@ void pinctrl_unregister(struct pinctrl_dev *pctldev) }EXPORT_SYMBOL_GPL (pinctrl_unregister); -static void devm_pinctrl_dev_release (struct device *dev,void *res) +static void devm_pinctrl_dev_release (void *pctldev) { -struct pinctrl_dev *pctldev = *(struct pinctrl_dev **)res; -pinctrl_unregister (pctldev); }
@@ -2338,20 +2325,16 @@ struct pinctrl_dev *devm_pinctrl_register(struct device *dev,const struct pinctrl_desc *pctldesc, void *driver_data) { - struct pinctrl_dev **ptr, *pctldev; - - ptr =devres_alloc (devm_pinctrl_dev_release,sizeof (*ptr),GFP_KERNEL ); -if (!ptr) -return ERR_PTR (-ENOMEM ); + struct pinctrl_dev *pctldev; +int ret; pctldev =pinctrl_register (pctldesc, dev, driver_data); -if (IS_ERR (pctldev)) { -devres_free (ptr); +if (IS_ERR (pctldev))return pctldev; - } - *ptr = pctldev; -devres_add (dev, ptr); + ret =devm_add_action_or_reset (dev, devm_pinctrl_dev_release, pctldev); +if (ret) +return ERR_PTR (ret);return pctldev; }
@@ -2373,23 +2356,13 @@ int devm_pinctrl_register_and_init(struct device *dev,void *driver_data, struct pinctrl_dev **pctldev) { - struct pinctrl_dev **ptr; int error; - ptr =devres_alloc (devm_pinctrl_dev_release,sizeof (*ptr),GFP_KERNEL ); -if (!ptr) -return -ENOMEM ; - error =pinctrl_register_and_init (pctldesc, dev, driver_data, pctldev); -if (error) { -devres_free (ptr); +if (error)return error; - } - *ptr = *pctldev; -devres_add (dev, ptr); - -return 0 ; +return devm_add_action_or_reset (dev, devm_pinctrl_dev_release, *pctldev); }EXPORT_SYMBOL_GPL (devm_pinctrl_register_and_init);
Signature · 1 line
2.50.1
Re: [PATCH v1 2/3] pinctrl: core: Simplify devm_pinctrl_*()
Quoted 6 lines · Andy Shevchenko
Use
devm_add_action_or_reset()instead ofdevres_alloc()anddevres_add(), which works the same. This will simplify the code. There is no functional changes.Signed-off-by Andy Shevchenko <[email protected]>---
Makes sense, we don't have a custom struct here.
PATCH 3/3 pinctrl: core: Remove duplicate error messages
In reply to Andy Shevchenkopinctrl_claim_hogs() is covered to report any error via message. Since that it's not needed in the callers.
--- drivers/pinctrl/core.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/pinctrl/core.c +1 -3
@@ -2187,10 +2187,8 @@ int pinctrl_enable(struct pinctrl_dev *pctldev)int error; error =pinctrl_claim_hogs (pctldev); -if (error) { -dev_err (pctldev->dev,"could not claim hogs: %i\n" , error); +if (error)return error; - }mutex_lock (&pinctrldev_list_mutex);list_add_tail (&pctldev->node, &pinctrldev_list);
Signature · 1 line
2.50.1
Re: [PATCH v1 3/3] pinctrl: core: Remove duplicate error messages
Quoted 25 lines · Andy Shevchenko
pinctrl_claim_hogs()is covered to report any error via message. Since that it's not needed in the callers.Signed-off-by Andy Shevchenko <[email protected]>--- drivers/pinctrl/core.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)drivers/pinctrl/core.c +1
-4@@ -2187,10 +2187,8 @@ int pinctrl_enable(struct pinctrl_dev *pctldev)int error; error =pinctrl_claim_hogs (pctldev); -if (error) { -dev_err (pctldev->dev,"could not claim hogs: %i\n" , error); +if (error)return error; - }mutex_lock (&pinctrldev_list_mutex);list_add_tail (&pctldev->node, &pinctrldev_list); --
Quoted 3 lines
2.50.1
Quoted 2 lines · Andy Shevchenko
I have stumbled over low-level APIs used for managed API implementations. Here is a clean up along with a drop of some duplicate messages.
Thanks, Bart, for the prompt review!
Linus, if you want this to take via my Intel PR, please tell me, otherwise I consider you take it via your tree directly. Whatever works for you!
Signature · 2 lines
With Best Regards, Andy Shevchenko
Linus Walleij
maintainerQuoted 7 lines · Andy Shevchenko
I have stumbled over low-level APIs used for managed API implementations. Here is a clean up along with a drop of some duplicate messages.
Andy Shevchenko (3):
pinctrl: core: Remove unuseddevm_pinctrl_unregister()
pinctrl: core: Simplify devm_pinctrl_*()
pinctrl: core: Remove duplicate error messages
Sweet, patches applied!
Yours,
Linus Walleij