regulator: 88pm8607: Simplify pm8607_list_voltage implementation
PATCH 1/2 regulator: 88pm8607: Simplify pm8607_list_voltage implementation
Set volt_table filed then we can use regulator_list_voltage_table. Since we have volt_table setting, now we can remove vol_table from struct pm8607_regulator_info.
Signed-off-by Axel Lin <[email protected]>
--- drivers/regulator/88pm8607.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-)
drivers/regulator/88pm8607.c +10 -9
@@ -27,7 +27,6 @@ struct pm8607_regulator_info {struct i2c_client *i2c;struct i2c_client *i2c_8606; -unsigned int *vol_table;unsigned int *vol_suspend;int slope_double;
@@ -210,13 +209,15 @@ static const unsigned int LDO14_suspend_table[] = {static int pm8607_list_voltage (struct regulator_dev *rdev,unsigned index) {struct pm8607_regulator_info *info =rdev_get_drvdata (rdev); -int ret = -EINVAL ; +int ret; + + ret =regulator_list_voltage_table (rdev, index); +if (ret <0 ) +return ret; + +if (info->slope_double) + ret <<=1 ; -if (info->vol_table && (index < rdev->desc->n_voltages)) { - ret = info->vol_table[index]; -if (info->slope_double) - ret <<=1 ; - }return ret; }
@@ -257,6 +258,7 @@ static const struct regulator_ops pm8606_preg_ops = { .type = REGULATOR_VOLTAGE, \ .id = PM8607_ID_##vreg, \ .owner = THIS_MODULE, \ + .volt_table = vreg##_table, \ .n_voltages = ARRAY_SIZE(vreg##_table), \ .vsel_reg = PM8607_##vreg, \ .vsel_mask = ARRAY_SIZE(vreg##_table) - 1, \
@@ -266,7 +268,6 @@ static const struct regulator_ops pm8606_preg_ops = { .enable_mask = 1 << (ebit), \ }, \ .slope_double = (0), \ - .vol_table = (unsigned int *)&vreg##_table, \ .vol_suspend = (unsigned int *)&vreg##_suspend_table, \ }
@@ -278,6 +279,7 @@ static const struct regulator_ops pm8606_preg_ops = { .type = REGULATOR_VOLTAGE, \ .id = PM8607_ID_LDO##_id, \ .owner = THIS_MODULE, \ + .volt_table = LDO##_id##_table, \ .n_voltages = ARRAY_SIZE(LDO##_id##_table), \ .vsel_reg = PM8607_##vreg, \ .vsel_mask = (ARRAY_SIZE(LDO##_id##_table) - 1) << (shift), \
@@ -285,7 +287,6 @@ static const struct regulator_ops pm8606_preg_ops = { .enable_mask = 1 << (ebit), \ }, \ .slope_double = (0), \ - .vol_table = (unsigned int *)&LDO##_id##_table, \ .vol_suspend = (unsigned int *)&LDO##_id##_suspend_table, \ }
Signature · 1 line
2.17.1
PATCH 2/2 regulator: 88pm8607: Remove unused fields from struct pm8607_regulator_info
The *i2c and *i2c_8606 are no longer used since this driver was converted to use regmap helpers. The *chip and *regulator are not really required. So remove these unused fields.
Signed-off-by Axel Lin <[email protected]>
--- drivers/regulator/88pm8607.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-)
drivers/regulator/88pm8607.c +5 -14
@@ -11,7 +11,6 @@#include <linux/kernel.h> #include <linux/init.h> #include <linux/err.h> -#include <linux/i2c.h> #include <linux/of.h> #include <linux/regulator/of_regulator.h> #include <linux/platform_device.h>
@@ -22,10 +21,6 @@struct pm8607_regulator_info {struct regulator_desc desc; -struct pm860x_chip *chip; -struct regulator_dev *regulator; -struct i2c_client *i2c; -struct i2c_client *i2c_8606;unsigned int *vol_suspend;
@@ -350,6 +345,7 @@ static int pm8607_regulator_probe(struct platform_device *pdev)struct pm8607_regulator_info *info =NULL ;struct regulator_init_data *pdata =dev_get_platdata (&pdev->dev);struct regulator_config config = { }; +struct regulator_dev *rdev;struct resource *res;int i;
@@ -372,13 +368,9 @@ static int pm8607_regulator_probe(struct platform_device *pdev)/* i is used to check regulator ID */ i =-1 ; } - info->i2c = (chip->id ==CHIP_PM8607 ) ? chip->client : chip->companion; - info->i2c_8606 = (chip->id ==CHIP_PM8607 ) ? chip->companion : - chip->client; - info->chip = chip;/* check DVC ramp slope double */ -if ((i ==PM8607_ID_BUCK3 ) && info->chip->buck3_double) +if ((i ==PM8607_ID_BUCK3 ) && chip->buck3_double) info->slope_double =1 ; config.dev = &pdev->dev;
@@ -393,12 +385,11 @@ static int pm8607_regulator_probe(struct platform_device *pdev)else config.regmap = chip->regmap_companion; - info->regulator =devm_regulator_register (&pdev->dev, &info->desc, - &config); -if (IS_ERR (info->regulator)) { + rdev =devm_regulator_register (&pdev->dev, &info->desc, &config); +if (IS_ERR (rdev)) {dev_err (&pdev->dev,"failed to register regulator %s\n" , info->desc.name); -return PTR_ERR (info->regulator); +return PTR_ERR (rdev); }platform_set_drvdata (pdev, info);
Signature · 1 line
2.17.1