From 32aba203291d07d22379b10adf489820992a3b34 Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Wed, 16 May 2012 10:09:27 +0800 Subject: [PATCH] --- yaml --- r: 302301 b: refs/heads/master c: 2b7a7a4e837269a8a157a19ac93ddb207f2bd0b6 h: refs/heads/master i: 302299: 03895d9200c2b4579e02485f4d72c8eb6eb746eb v: v3 --- [refs] | 2 +- trunk/drivers/regulator/isl6271a-regulator.c | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index e5f5b15e545d..02a91ffd0070 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5eb3394f86cda9fc2e66df79ff19086552f0d83e +refs/heads/master: 2b7a7a4e837269a8a157a19ac93ddb207f2bd0b6 diff --git a/trunk/drivers/regulator/isl6271a-regulator.c b/trunk/drivers/regulator/isl6271a-regulator.c index 5caaf1f77541..78cdc90e0a7e 100644 --- a/trunk/drivers/regulator/isl6271a-regulator.c +++ b/trunk/drivers/regulator/isl6271a-regulator.c @@ -83,15 +83,10 @@ static int isl6271a_set_voltage(struct regulator_dev *dev, return err; } -static int isl6271a_list_voltage(struct regulator_dev *dev, unsigned selector) -{ - return ISL6271A_VOLTAGE_MIN + (ISL6271A_VOLTAGE_STEP * selector); -} - static struct regulator_ops isl_core_ops = { .get_voltage = isl6271a_get_voltage, .set_voltage = isl6271a_set_voltage, - .list_voltage = isl6271a_list_voltage, + .list_voltage = regulator_list_voltage_linear, }; static int isl6271a_get_fixed_voltage(struct regulator_dev *dev) @@ -119,6 +114,8 @@ static const struct regulator_desc isl_rd[] = { .ops = &isl_core_ops, .type = REGULATOR_VOLTAGE, .owner = THIS_MODULE, + .min_uV = ISL6271A_VOLTAGE_MIN, + .uV_step = ISL6271A_VOLTAGE_STEP, }, { .name = "LDO1", .id = 1,