Messages in this thread Patch in this message | | | From | Mark Brown <> | Subject | Applied "regulator: core: Slightly improve readability of _regulator_get_enable_time" to the regulator tree | Date | Wed, 8 May 2019 10:08:46 +0100 (BST) |
| |
The patch
regulator: core: Slightly improve readability of _regulator_get_enable_time
has been applied to the regulator tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git for-5.3
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks, Mark
From 68ce3a4461726ebd3acf9d94841a46386402a058 Mon Sep 17 00:00:00 2001 From: Axel Lin <axel.lin@ingics.com> Date: Sat, 4 May 2019 11:33:36 +0800 Subject: [PATCH] regulator: core: Slightly improve readability of _regulator_get_enable_time
The logic is equivalent, but it looks more straightforward this way: If rdev->desc->ops->enable_time is set, call it. Otherwise fallback to return rdev->desc->enable_time.
Signed-off-by: Axel Lin <axel.lin@ingics.com> Signed-off-by: Mark Brown <broonie@kernel.org> --- drivers/regulator/core.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index 955a0a15b9cb..bf4cdbcf0653 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -1650,9 +1650,9 @@ static int _regulator_get_enable_time(struct regulator_dev *rdev) { if (rdev->constraints && rdev->constraints->enable_time) return rdev->constraints->enable_time; - if (!rdev->desc->ops->enable_time) - return rdev->desc->enable_time; - return rdev->desc->ops->enable_time(rdev); + if (rdev->desc->ops->enable_time) + return rdev->desc->ops->enable_time(rdev); + return rdev->desc->enable_time; } static struct regulator_supply_alias *regulator_find_supply_alias( -- 2.20.1
| |