Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/regulator/core.c

+2 −6
Original line number Diff line number Diff line
@@ -1584,7 +1584,7 @@ static struct regulator *_regulator_get(struct device *dev, const char *id, 
					bool exclusive, bool allow_dummy)

{

	struct regulator_dev *rdev;

	struct regulator *regulator = ERR_PTR(-EPROBE_DEFER);

	struct regulator *regulator;

	const char *devname = NULL;

	int ret;
@@ -1596,11 +1596,6 @@ static struct regulator *_regulator_get(struct device *dev, const char *id, 
	if (dev)

		devname = dev_name(dev);



	if (have_full_constraints())

		ret = -ENODEV;

	else

		ret = -EPROBE_DEFER;



	rdev = regulator_dev_lookup(dev, id, &ret);

	if (rdev)

		goto found;
@@ -1656,6 +1651,7 @@ static struct regulator *_regulator_get(struct device *dev, const char *id, 
	}



	if (!try_module_get(rdev->owner)) {

		regulator = ERR_PTR(-EPROBE_DEFER);

		put_device(&rdev->dev);

		return regulator;

	}