---

yaml
---
r: 302282
b: refs/heads/master
c: 4093e73
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3c8983b9ac2f8bf9f23effa4f72ce814f8375397
+refs/heads/master: 4093e739f76e1a17b748f9558e3a48a49507885a

trunk/drivers/regulator/max8925-regulator.c

@@ -38,28 +38,20 @@ struct max8925_regulator_info {
 	struct i2c_client	*i2c;
 	struct max8925_chip	*chip;
 
-	int	min_uV;
 	int	max_uV;
-	int	step_uV;
 	int	vol_reg;
 	int	enable_reg;
 };
 
 static inline int check_range(struct max8925_regulator_info *info,
 			      int min_uV, int max_uV)
 {
-	if (min_uV < info->min_uV || min_uV > info->max_uV)
+	if (min_uV < info->desc.min_uV || min_uV > info->max_uV)
 		return -EINVAL;
 
 	return 0;
 }
 
-static int max8925_list_voltage(struct regulator_dev *rdev, unsigned index)
-{
-	struct max8925_regulator_info *info = rdev_get_drvdata(rdev);
-	return info->min_uV + index * info->step_uV;
-}
-
 static int max8925_set_voltage(struct regulator_dev *rdev,
 			       int min_uV, int max_uV, unsigned int *selector)
 {
@@ -71,7 +63,7 @@ static int max8925_set_voltage(struct regulator_dev *rdev,
 			min_uV, max_uV);
 		return -EINVAL;
 	}
-	data = DIV_ROUND_UP(min_uV - info->min_uV, info->step_uV);
+	data = DIV_ROUND_UP(min_uV - info->desc.min_uV, info->desc.uV_step);
 	*selector = data;
 	mask = rdev->desc->n_voltages - 1;
 
@@ -160,7 +152,7 @@ static int max8925_set_dvm_disable(struct regulator_dev *rdev)
 }
 
 static struct regulator_ops max8925_regulator_sdv_ops = {
-	.list_voltage		= max8925_list_voltage,
+	.list_voltage		= regulator_list_voltage_linear,
 	.set_voltage		= max8925_set_voltage,
 	.get_voltage_sel	= max8925_get_voltage_sel,
 	.enable			= max8925_enable,
@@ -172,7 +164,7 @@ static struct regulator_ops max8925_regulator_sdv_ops = {
 };
 
 static struct regulator_ops max8925_regulator_ldo_ops = {
-	.list_voltage		= max8925_list_voltage,
+	.list_voltage		= regulator_list_voltage_linear,
 	.set_voltage		= max8925_set_voltage,
 	.get_voltage_sel	= max8925_get_voltage_sel,
 	.enable			= max8925_enable,
@@ -189,10 +181,10 @@ static struct regulator_ops max8925_regulator_ldo_ops = {
 		.id	= MAX8925_ID_SD##_id,			\
 		.owner	= THIS_MODULE,				\
 		.n_voltages = 64,				\
+		.min_uV = min * 1000,				\
+		.uV_step = step * 1000,				\
 	},							\
-	.min_uV		= min * 1000,				\
 	.max_uV		= max * 1000,				\
-	.step_uV	= step * 1000,				\
 	.vol_reg	= MAX8925_SDV##_id,			\
 	.enable_reg	= MAX8925_SDCTL##_id,			\
 }
@@ -206,10 +198,10 @@ static struct regulator_ops max8925_regulator_ldo_ops = {
 		.id	= MAX8925_ID_LDO##_id,			\
 		.owner	= THIS_MODULE,				\
 		.n_voltages = 64,				\
+		.min_uV = min * 1000,				\
+		.uV_step = step * 1000,				\
 	},							\
-	.min_uV		= min * 1000,				\
 	.max_uV		= max * 1000,				\
-	.step_uV	= step * 1000,				\
 	.vol_reg	= MAX8925_LDOVOUT##_id,			\
 	.enable_reg	= MAX8925_LDOCTL##_id,			\
 }
@@ -320,4 +312,3 @@ MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Haojian Zhuang <haojian.zhuang@marvell.com>");
 MODULE_DESCRIPTION("Regulator Driver for Maxim 8925 PMIC");
 MODULE_ALIAS("platform:max8925-regulator");
-