From patchwork Wed Jan 28 02:46:38 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 5724151 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 3A9589F2ED for ; Wed, 28 Jan 2015 02:55:20 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 540A72024F for ; Wed, 28 Jan 2015 02:55:19 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 62B6A201ED for ; Wed, 28 Jan 2015 02:55:18 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1YGIkh-0003U0-Om; Wed, 28 Jan 2015 02:53:11 +0000 Received: from seldrel01.sonyericsson.com ([212.209.106.2]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YGIfI-0006C3-8t for linux-arm-kernel@lists.infradead.org; Wed, 28 Jan 2015 02:47:38 +0000 From: Bjorn Andersson To: Liam Girdwood , Mark Brown Subject: [PATCH 8/9] regulator: Drop now unused get_optimum_mode Date: Tue, 27 Jan 2015 18:46:38 -0800 Message-ID: <1422413199-17273-9-git-send-email-bjorn.andersson@sonymobile.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1422413199-17273-1-git-send-email-bjorn.andersson@sonymobile.com> References: <1422413199-17273-1-git-send-email-bjorn.andersson@sonymobile.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150127_184736_580265_F3960F1A X-CRM114-Status: GOOD ( 12.95 ) X-Spam-Score: -5.0 (-----) Cc: linux-arm-msm@vger.kernel.org, patches@opensource.wolfsonmicro.com, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, agross@codeaurora.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Bjorn Andersson --- drivers/regulator/core.c | 40 ++++++++-------------------------------- include/linux/regulator/driver.h | 5 ----- 2 files changed, 8 insertions(+), 37 deletions(-) diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index 2a53515..cfab6fc 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -662,7 +662,6 @@ static int drms_uA_update(struct regulator_dev *rdev) { struct regulator *sibling; int current_uA = 0, output_uV, input_uV, err; - unsigned int mode; /* * first check to see if we can set modes at all, otherwise just @@ -672,14 +671,9 @@ static int drms_uA_update(struct regulator_dev *rdev) if (err < 0) return 0; - if (!rdev->desc->ops->get_optimum_mode && - !rdev->desc->ops->set_optimum_mode) + if (!rdev->desc->ops->set_optimum_mode) return 0; - if (!rdev->desc->ops->set_mode && - !rdev->desc->ops->set_optimum_mode) - return -EINVAL; - /* get output voltage */ output_uV = _regulator_get_voltage(rdev); if (output_uV <= 0) { @@ -702,31 +696,13 @@ static int drms_uA_update(struct regulator_dev *rdev) list_for_each_entry(sibling, &rdev->consumer_list, list) current_uA += sibling->uA_load; - if (rdev->desc->ops->set_optimum_mode) { - /* set the optimum mode for our new total regulator load */ - err = rdev->desc->ops->set_optimum_mode(rdev, - input_uV, output_uV, - current_uA); - if (err < 0) - rdev_err(rdev, "failed to set optimum mode @ %d uA %d -> %d uV\n", - current_uA, input_uV, output_uV); - } else { - /* now get the optimum mode for our new total regulator load */ - mode = rdev->desc->ops->get_optimum_mode(rdev, input_uV, - output_uV, current_uA); - - /* check the new mode is allowed */ - err = regulator_mode_constrain(rdev, &mode); - if (err < 0) { - rdev_err(rdev, "failed to get optimum mode @ %d uA %d -> %d uV\n", - current_uA, input_uV, output_uV); - return err; - } - - err = rdev->desc->ops->set_mode(rdev, mode); - if (err < 0) - rdev_err(rdev, "failed to set optimum mode %x\n", mode); - } + /* set the optimum mode for our new total regulator load */ + err = rdev->desc->ops->set_optimum_mode(rdev, + input_uV, output_uV, + current_uA); + if (err < 0) + rdev_err(rdev, "failed to set optimum mode @ %d uA %d -> %d uV\n", + current_uA, input_uV, output_uV); return err; } diff --git a/include/linux/regulator/driver.h b/include/linux/regulator/driver.h index 837addb..f472cb5 100644 --- a/include/linux/regulator/driver.h +++ b/include/linux/regulator/driver.h @@ -95,8 +95,6 @@ struct regulator_linear_range { * @get_mode: Get the configured operating mode for the regulator. * @get_status: Return actual (not as-configured) status of regulator, as a * REGULATOR_STATUS value (or negative errno) - * @get_optimum_mode: Get the most efficient operating mode for the regulator - * when running with the specified parameters. * @set_optimum_mode: Set the most efficient operating mode for the regulator * when running with the specified parameters. * @@ -165,9 +163,6 @@ struct regulator_ops { */ int (*get_status)(struct regulator_dev *); - /* get most efficient regulator operating mode for load */ - unsigned int (*get_optimum_mode) (struct regulator_dev *, int input_uV, - int output_uV, int load_uA); /* set most efficient regulator operating mode for load */ int (*set_optimum_mode)(struct regulator_dev *, int input_uV, int output_uV, int load_uA);