lkml.org 
[lkml]   [2017]   [Nov]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Subject[PATCH 1/3] regulator/core: Use common error handling code in regulator_resolve_supply()
From
Date
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Wed, 1 Nov 2017 22:20:13 +0100

* Add a jump target so that a bit of exception handling can be better
reused at the end of this function.

* Adjust two condition checks.

This issue was detected by using the Coccinelle software.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
drivers/regulator/core.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index b64b7916507f..14fdf2f17a62 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -1554,23 +1554,19 @@ static int regulator_resolve_supply(struct regulator_dev *rdev)
*/
if (r->dev.parent && r->dev.parent != rdev->dev.parent) {
if (!device_is_bound(r->dev.parent)) {
- put_device(&r->dev);
- return -EPROBE_DEFER;
+ ret = -EPROBE_DEFER;
+ goto put_device;
}
}

/* Recursively resolve the supply of the supply */
ret = regulator_resolve_supply(r);
- if (ret < 0) {
- put_device(&r->dev);
- return ret;
- }
+ if (ret)
+ goto put_device;

ret = set_supply(rdev, r);
- if (ret < 0) {
- put_device(&r->dev);
- return ret;
- }
+ if (ret)
+ goto put_device;

/* Cascade always-on state to supply */
if (_regulator_is_enabled(rdev)) {
@@ -1583,6 +1579,10 @@ static int regulator_resolve_supply(struct regulator_dev *rdev)
}

return 0;
+
+put_device:
+ put_device(&r->dev);
+ return ret;
}

/* Internal regulator request function */
--
2.14.3
\
 
 \ /
  Last update: 2017-11-02 09:10    [W:0.061 / U:0.084 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site