Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753341AbbEAGR3 (ORCPT ); Fri, 1 May 2015 02:17:29 -0400 Received: from mail-pa0-f54.google.com ([209.85.220.54]:35915 "EHLO mail-pa0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750935AbbEAGR0 (ORCPT ); Fri, 1 May 2015 02:17:26 -0400 Message-ID: <1430461041.4848.2.camel@ingics.com> Subject: [RFT][PATCH 2/2] regulator: max77843: Convert to use regulator_is_enabled_regmap From: Axel Lin To: Mark Brown Cc: Jaewon Kim , Beomho Seo , Liam Girdwood , "linux-kernel@vger.kernel.org" Date: Fri, 01 May 2015 14:17:21 +0800 In-Reply-To: <1430460999.4848.1.camel@ingics.com> References: <1430460999.4848.1.camel@ingics.com> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.12.10-0ubuntu1~14.10.1 Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1907 Lines: 60 Use regulator_is_enabled_regmap() to replace max77843_reg_is_enabled(). Signed-off-by: Axel Lin --- drivers/regulator/max77843.c | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/drivers/regulator/max77843.c b/drivers/regulator/max77843.c index 3ae2a9b..f4fd0d3 100644 --- a/drivers/regulator/max77843.c +++ b/drivers/regulator/max77843.c @@ -33,21 +33,6 @@ static const unsigned int max77843_safeout_voltage_table[] = { 3300000, }; -static int max77843_reg_is_enabled(struct regulator_dev *rdev) -{ - struct regmap *regmap = rdev->regmap; - int ret; - unsigned int reg; - - ret = regmap_read(regmap, rdev->desc->enable_reg, ®); - if (ret) { - dev_err(&rdev->dev, "Fialed to read charger register\n"); - return ret; - } - - return (reg & rdev->desc->enable_mask) == rdev->desc->enable_mask; -} - static int max77843_reg_get_current_limit(struct regulator_dev *rdev) { struct regmap *regmap = rdev->regmap; @@ -96,7 +81,7 @@ static int max77843_reg_set_current_limit(struct regulator_dev *rdev, } static struct regulator_ops max77843_charger_ops = { - .is_enabled = max77843_reg_is_enabled, + .is_enabled = regulator_is_enabled_regmap, .enable = regulator_enable_regmap, .disable = regulator_disable_regmap, .get_current_limit = max77843_reg_get_current_limit, @@ -141,6 +126,7 @@ static const struct regulator_desc max77843_supported_regulators[] = { .owner = THIS_MODULE, .enable_reg = MAX77843_CHG_REG_CHG_CNFG_00, .enable_mask = MAX77843_CHG_MASK | MAX77843_CHG_BUCK_MASK, + .enable_val = MAX77843_CHG_MASK | MAX77843_CHG_BUCK_MASK, }, }; -- 2.1.0 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/