From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932645AbcINQyj (ORCPT ); Wed, 14 Sep 2016 12:54:39 -0400 Received: from mail-pf0-f176.google.com ([209.85.192.176]:36834 "EHLO mail-pf0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1761983AbcINQyg (ORCPT ); Wed, 14 Sep 2016 12:54:36 -0400 From: Matthias Kaehlcke To: Mark Brown , lgirdwood@gmail.com Cc: Douglas Anderson , briannorris@chromium.org, javier@dowhile0.org, robh+dt@kernel.org, mark.rutland@arm.com, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Matthias Kaehlcke Subject: [PATCH v5 3/6] regulator: core: Don't skip set_voltage_time when ramp delay disabled Date: Wed, 14 Sep 2016 09:52:07 -0700 Message-Id: <1473871930-99603-3-git-send-email-mka@chromium.org> X-Mailer: git-send-email 2.8.0.rc3.226.g39d4020 In-Reply-To: <1473871930-99603-1-git-send-email-mka@chromium.org> References: <1473871930-99603-1-git-send-email-mka@chromium.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The current code assumes that only the ramp_delay is used to determine the time needed for the voltage to stabilize. This may be true for the calculation done by regulator_set_voltage_time_sel(), however regulators can implement their own set_voltage_time_sel() op which would be skipped if no ramp delay is specified. Remove the check in _regulator_do_set_voltage(), the functions calculating the ramp delay return 0 anyway when the ramp delay is not configured. Signed-off-by: Matthias Kaehlcke --- Changes in v5: - This patch is new for v5. drivers/regulator/core.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index b0076cc..df3028b 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -2804,9 +2804,7 @@ static int _regulator_do_set_voltage(struct regulator_dev *rdev, goto out; /* Call set_voltage_time_sel if successfully obtained old_selector */ - if (!rdev->constraints->ramp_disable && old_selector >= 0 - && old_selector != selector) { - + if (!old_selector >= 0 && old_selector != selector) { delay = ops->set_voltage_time_sel(rdev, old_selector, selector); if (delay < 0) { @@ -3051,10 +3049,8 @@ int regulator_set_voltage_time_sel(struct regulator_dev *rdev, else if (rdev->desc->ramp_delay) ramp_delay = rdev->desc->ramp_delay; - if (ramp_delay == 0) { - rdev_warn(rdev, "ramp_delay not set\n"); + if (ramp_delay == 0) return 0; - } /* sanity check */ if (!rdev->desc->ops->list_voltage) -- 2.8.0.rc3.226.g39d4020