Commit 7d245afa authored by Dmitry Torokhov's avatar Dmitry Torokhov Committed by Mark Brown

regulator: core: remove dead code in _regulator_get()

There is no point in assigning value to 'ret' before calling
regulator_dev_lookup() as it will clobber 'ret' anyway.

Also, let's explicitly return -PROBE_DEFER when try_module_get() fails,
instead of relying that earlier initialization of "regulator" carries
correct value.
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent d00b7461
...@@ -1584,7 +1584,7 @@ static struct regulator *_regulator_get(struct device *dev, const char *id, ...@@ -1584,7 +1584,7 @@ static struct regulator *_regulator_get(struct device *dev, const char *id,
bool exclusive, bool allow_dummy) bool exclusive, bool allow_dummy)
{ {
struct regulator_dev *rdev; struct regulator_dev *rdev;
struct regulator *regulator = ERR_PTR(-EPROBE_DEFER); struct regulator *regulator;
const char *devname = NULL; const char *devname = NULL;
int ret; int ret;
...@@ -1596,11 +1596,6 @@ static struct regulator *_regulator_get(struct device *dev, const char *id, ...@@ -1596,11 +1596,6 @@ static struct regulator *_regulator_get(struct device *dev, const char *id,
if (dev) if (dev)
devname = dev_name(dev); devname = dev_name(dev);
if (have_full_constraints())
ret = -ENODEV;
else
ret = -EPROBE_DEFER;
rdev = regulator_dev_lookup(dev, id, &ret); rdev = regulator_dev_lookup(dev, id, &ret);
if (rdev) if (rdev)
goto found; goto found;
...@@ -1656,6 +1651,7 @@ static struct regulator *_regulator_get(struct device *dev, const char *id, ...@@ -1656,6 +1651,7 @@ static struct regulator *_regulator_get(struct device *dev, const char *id,
} }
if (!try_module_get(rdev->owner)) { if (!try_module_get(rdev->owner)) {
regulator = ERR_PTR(-EPROBE_DEFER);
put_device(&rdev->dev); put_device(&rdev->dev);
return regulator; return regulator;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment