linux-kernel - Applied "regulator: max77620: Remove unused fields" to the regulator tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [day] [month] [year] [list]

Date:	Fri, 26 Feb 2016 11:47:39 +0900
From:	Mark Brown <broonie@...nel.org>
To:	Axel Lin <axel.lin@...ics.com>, Mark Brown <broonie@...nel.org>
Cc:	linux-kernel@...r.kernel.org
Subject: Applied "regulator: max77620: Remove unused fields" to the regulator tree

The patch

   regulator: max77620: Remove unused fields

has been applied to the regulator tree at

   git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git 

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.  

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark

>From 47dbdbf64fd664eae237ef9b94f4bf89093fa5a3 Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@...ics.com>
Date: Thu, 25 Feb 2016 14:39:29 +0800
Subject: [PATCH] regulator: max77620: Remove unused fields

These fields are never used and not required at all, remove them.

Signed-off-by: Axel Lin <axel.lin@...ics.com>
Signed-off-by: Mark Brown <broonie@...nel.org>
---
 drivers/regulator/max77620-regulator.c | 14 --------------
 1 file changed, 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 {
 
 struct max77620_regulator_info {
 	u8 type;
-	u32 min_uV;
-	u32 max_uV;
-	u32 step_uV;
 	u8 fps_addr;
 	u8 volt_addr;
 	u8 cfg_addr;
-	u8 volt_mask;
 	u8 power_mode_mask;
 	u8 power_mode_shift;
 	u8 remote_sense_addr;
@@ -92,7 +88,6 @@ struct max77620_regulator {
 	struct regmap *rmap;
 	struct max77620_regulator_info *rinfo[MAX77620_NUM_REGS];
 	struct max77620_regulator_pdata reg_pdata[MAX77620_NUM_REGS];
-	struct regulator_desc *rdesc[MAX77620_NUM_REGS];
 	int enable_power_mode[MAX77620_NUM_REGS];
 	int current_power_mode[MAX77620_NUM_REGS];
 	int active_fps_src[MAX77620_NUM_REGS];
@@ -596,15 +591,11 @@ static struct regulator_ops max77620_regulator_ops = {
 		_step_uV, _rs_add, _rs_mask)				\
 	[MAX77620_REGULATOR_ID_##_id] = {				\
 		.type = MAX77620_REGULATOR_TYPE_SD,			\
-		.volt_mask = MAX77620_##_volt_mask##_VOLT_MASK,		\
 		.volt_addr = MAX77620_REG_##_id,			\
 		.cfg_addr = MAX77620_REG_##_id##_CFG,			\
 		.fps_addr = MAX77620_REG_FPS_##_id,			\
 		.remote_sense_addr = _rs_add,				\
 		.remote_sense_mask = MAX77620_SD_CNF2_ROVS_EN_##_rs_mask, \
-		.min_uV = _min_uV,					\
-		.max_uV = _max_uV,					\
-		.step_uV = _step_uV,					\
 		.power_mode_mask = MAX77620_SD_POWER_MODE_MASK,		\
 		.power_mode_shift = MAX77620_SD_POWER_MODE_SHIFT,	\
 		.desc = {						\
@@ -628,14 +619,10 @@ static struct regulator_ops max77620_regulator_ops = {
 #define RAIL_LDO(_id, _name, _sname, _type, _min_uV, _max_uV, _step_uV) \
 	[MAX77620_REGULATOR_ID_##_id] = {				\
 		.type = MAX77620_REGULATOR_TYPE_LDO_##_type,		\
-		.volt_mask = MAX77620_LDO_VOLT_MASK,			\
 		.volt_addr = MAX77620_REG_##_id##_CFG,			\
 		.cfg_addr = MAX77620_REG_##_id##_CFG2,			\
 		.fps_addr = MAX77620_REG_FPS_##_id,			\
 		.remote_sense_addr = 0xFF,				\
-		.min_uV = _min_uV,					\
-		.max_uV = _max_uV,					\
-		.step_uV = _step_uV,					\
 		.power_mode_mask = MAX77620_LDO_POWER_MODE_MASK,	\
 		.power_mode_shift = MAX77620_LDO_POWER_MODE_SHIFT,	\
 		.desc = {						\
@@ -736,7 +723,6 @@ static int max77620_regulator_probe(struct platform_device *pdev)
 		rdesc = &rinfo[id].desc;
 		pmic->rinfo[id] = &max77620_regs_info[id];
 		pmic->enable_power_mode[id] = MAX77620_POWER_MODE_NORMAL;
-		pmic->rdesc[id] = rdesc;
 
 		ret = max77620_read_slew_rate(pmic, id);
 		if (ret < 0)
-- 
2.7.0