From: Javier Martinez Canillas Date: Mon, 21 Mar 2016 02:29:45 +0000 (-0300) Subject: regulator: Remove unneded check for regulator supply X-Git-Tag: v4.7-rc1~173^2~7^2~3 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=95a293c7ba17253b8cffcacbdd716ebfbfe42587;p=karo-tx-linux.git regulator: Remove unneded check for regulator supply The regulator_resolve_supply() function checks if a supply has been associated with a regulator to avoid enabling it if that is not the case. But the supply was already looked up with regulator_resolve_supply() and set with set_supply() before the check and both return on error. So the fact that this statement has been reached means that neither of them failed and a supply must be associated with the regulator. Signed-off-by: Javier Martinez Canillas Signed-off-by: Mark Brown --- diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index e0b764284773..6dd63523bcfe 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -1532,7 +1532,7 @@ static int regulator_resolve_supply(struct regulator_dev *rdev) } /* Cascade always-on state to supply */ - if (_regulator_is_enabled(rdev) && rdev->supply) { + if (_regulator_is_enabled(rdev)) { ret = regulator_enable(rdev->supply); if (ret < 0) { _regulator_put(rdev->supply);