aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/regulator
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@ingics.com>2016-02-25 01:39:29 -0500
committerMark Brown <broonie@kernel.org>2016-02-25 20:36:54 -0500
commit47dbdbf64fd664eae237ef9b94f4bf89093fa5a3 (patch)
tree5dc744ab668dd514dd9671462305919ae14fc279 /drivers/regulator
parent5b1c20286fc962d8c19601b7378a4fc32be8fd9e (diff)
regulator: max77620: Remove unused fields
These fields are never used and not required at all, remove them. Signed-off-by: Axel Lin <axel.lin@ingics.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/regulator')
-rw-r--r--drivers/regulator/max77620-regulator.c14
1 files changed, 0 insertions, 14 deletions
diff --git a/drivers/regulator/max77620-regulator.c b/drivers/regulator/max77620-regulator.c
index fee8ad972852..761eb965f901 100644
--- a/drivers/regulator/max77620-regulator.c
+++ b/drivers/regulator/max77620-regulator.c
@@ -62,13 +62,9 @@ enum max77620_regulator_type {
62 62
63struct max77620_regulator_info { 63struct max77620_regulator_info {
64 u8 type; 64 u8 type;
65 u32 min_uV;
66 u32 max_uV;
67 u32 step_uV;
68 u8 fps_addr; 65 u8 fps_addr;
69 u8 volt_addr; 66 u8 volt_addr;
70 u8 cfg_addr; 67 u8 cfg_addr;
71 u8 volt_mask;
72 u8 power_mode_mask; 68 u8 power_mode_mask;
73 u8 power_mode_shift; 69 u8 power_mode_shift;
74 u8 remote_sense_addr; 70 u8 remote_sense_addr;
@@ -92,7 +88,6 @@ struct max77620_regulator {
92 struct regmap *rmap; 88 struct regmap *rmap;
93 struct max77620_regulator_info *rinfo[MAX77620_NUM_REGS]; 89 struct max77620_regulator_info *rinfo[MAX77620_NUM_REGS];
94 struct max77620_regulator_pdata reg_pdata[MAX77620_NUM_REGS]; 90 struct max77620_regulator_pdata reg_pdata[MAX77620_NUM_REGS];
95 struct regulator_desc *rdesc[MAX77620_NUM_REGS];
96 int enable_power_mode[MAX77620_NUM_REGS]; 91 int enable_power_mode[MAX77620_NUM_REGS];
97 int current_power_mode[MAX77620_NUM_REGS]; 92 int current_power_mode[MAX77620_NUM_REGS];
98 int active_fps_src[MAX77620_NUM_REGS]; 93 int active_fps_src[MAX77620_NUM_REGS];
@@ -596,15 +591,11 @@ static struct regulator_ops max77620_regulator_ops = {
596 _step_uV, _rs_add, _rs_mask) \ 591 _step_uV, _rs_add, _rs_mask) \
597 [MAX77620_REGULATOR_ID_##_id] = { \ 592 [MAX77620_REGULATOR_ID_##_id] = { \
598 .type = MAX77620_REGULATOR_TYPE_SD, \ 593 .type = MAX77620_REGULATOR_TYPE_SD, \
599 .volt_mask = MAX77620_##_volt_mask##_VOLT_MASK, \
600 .volt_addr = MAX77620_REG_##_id, \ 594 .volt_addr = MAX77620_REG_##_id, \
601 .cfg_addr = MAX77620_REG_##_id##_CFG, \ 595 .cfg_addr = MAX77620_REG_##_id##_CFG, \
602 .fps_addr = MAX77620_REG_FPS_##_id, \ 596 .fps_addr = MAX77620_REG_FPS_##_id, \
603 .remote_sense_addr = _rs_add, \ 597 .remote_sense_addr = _rs_add, \
604 .remote_sense_mask = MAX77620_SD_CNF2_ROVS_EN_##_rs_mask, \ 598 .remote_sense_mask = MAX77620_SD_CNF2_ROVS_EN_##_rs_mask, \
605 .min_uV = _min_uV, \
606 .max_uV = _max_uV, \
607 .step_uV = _step_uV, \
608 .power_mode_mask = MAX77620_SD_POWER_MODE_MASK, \ 599 .power_mode_mask = MAX77620_SD_POWER_MODE_MASK, \
609 .power_mode_shift = MAX77620_SD_POWER_MODE_SHIFT, \ 600 .power_mode_shift = MAX77620_SD_POWER_MODE_SHIFT, \
610 .desc = { \ 601 .desc = { \
@@ -628,14 +619,10 @@ static struct regulator_ops max77620_regulator_ops = {
628#define RAIL_LDO(_id, _name, _sname, _type, _min_uV, _max_uV, _step_uV) \ 619#define RAIL_LDO(_id, _name, _sname, _type, _min_uV, _max_uV, _step_uV) \
629 [MAX77620_REGULATOR_ID_##_id] = { \ 620 [MAX77620_REGULATOR_ID_##_id] = { \
630 .type = MAX77620_REGULATOR_TYPE_LDO_##_type, \ 621 .type = MAX77620_REGULATOR_TYPE_LDO_##_type, \
631 .volt_mask = MAX77620_LDO_VOLT_MASK, \
632 .volt_addr = MAX77620_REG_##_id##_CFG, \ 622 .volt_addr = MAX77620_REG_##_id##_CFG, \
633 .cfg_addr = MAX77620_REG_##_id##_CFG2, \ 623 .cfg_addr = MAX77620_REG_##_id##_CFG2, \
634 .fps_addr = MAX77620_REG_FPS_##_id, \ 624 .fps_addr = MAX77620_REG_FPS_##_id, \
635 .remote_sense_addr = 0xFF, \ 625 .remote_sense_addr = 0xFF, \
636 .min_uV = _min_uV, \
637 .max_uV = _max_uV, \
638 .step_uV = _step_uV, \
639 .power_mode_mask = MAX77620_LDO_POWER_MODE_MASK, \ 626 .power_mode_mask = MAX77620_LDO_POWER_MODE_MASK, \
640 .power_mode_shift = MAX77620_LDO_POWER_MODE_SHIFT, \ 627 .power_mode_shift = MAX77620_LDO_POWER_MODE_SHIFT, \
641 .desc = { \ 628 .desc = { \
@@ -736,7 +723,6 @@ static int max77620_regulator_probe(struct platform_device *pdev)
736 rdesc = &rinfo[id].desc; 723 rdesc = &rinfo[id].desc;
737 pmic->rinfo[id] = &max77620_regs_info[id]; 724 pmic->rinfo[id] = &max77620_regs_info[id];
738 pmic->enable_power_mode[id] = MAX77620_POWER_MODE_NORMAL; 725 pmic->enable_power_mode[id] = MAX77620_POWER_MODE_NORMAL;
739 pmic->rdesc[id] = rdesc;
740 726
741 ret = max77620_read_slew_rate(pmic, id); 727 ret = max77620_read_slew_rate(pmic, id);
742 if (ret < 0) 728 if (ret < 0)