Skip to contentSkip to conversation

regulator: stw481x: Remove unused fields from struct stw481x

PATCH Applied Axel Lin 2 participants 2 messages Mar 19, 2015 – Mar 21, 2015

Subsystems (2)
Multifunction devices (MFD) Voltage and current regulator framework
lore
Share & tools
lore

Axel Lin

author
#0 lore raw

PATCH 1/1 regulator: stw481x: Remove unused fields from struct stw481x

The mutex lock is not used at all, remove it.
The *vmmc_regulator is not necessary, use a local variable in stw481x_vmmc_regulator_probe() instead.

Signed-off-by Axel Lin <[email protected]>
Reviewed-by Linus Walleij <[email protected]>
Acked-by Lee Jones <[email protected]>

---
Change the prefix from mfd to regulator.

 drivers/regulator/stw481x-vmmc.c | 8 ++++----
 include/linux/mfd/stw481x.h      | 4 ----
 2 files changed, 4 insertions(+), 8 deletions(-)
drivers/regulator/stw481x-vmmc.c +4 -4
index 89025f5..7d2ae3e 100644
@@ -56,6 +56,7 @@ static int stw481x_vmmc_regulator_probe(struct platform_device *pdev)
 {
 	struct stw481x *stw481x = dev_get_platdata(&pdev->dev);
 	struct regulator_config config = { };
+	struct regulator_dev *rdev;
 	int ret;
 
 	/* First disable the external VMMC if it's active */

@@ -75,12 +76,11 @@ static int stw481x_vmmc_regulator_probe(struct platform_device *pdev)
 						      pdev->dev.of_node,
 						      &vmmc_regulator);
 
-	stw481x->vmmc_regulator = devm_regulator_register(&pdev->dev,
-						&vmmc_regulator, &config);
-	if (IS_ERR(stw481x->vmmc_regulator)) {
+	rdev = devm_regulator_register(&pdev->dev, &vmmc_regulator, &config);
+	if (IS_ERR(rdev)) {
 		dev_err(&pdev->dev,
 			"error initializing STw481x VMMC regulator\n");
-		return PTR_ERR(stw481x->vmmc_regulator);
+		return PTR_ERR(rdev);
 	}
 
 	dev_info(&pdev->dev, "initialized STw481x VMMC regulator\n");
include/linux/mfd/stw481x.h +0 -4
index eda1215..833074b 100644
@@ -41,15 +41,11 @@
 
 /**
  * struct stw481x - state holder for the Stw481x drivers
- * @mutex: mutex to serialize I2C accesses
  * @i2c_client: corresponding I2C client
- * @regulator: regulator device for regulator children
  * @map: regmap handle to access device registers
  */
 struct stw481x {
-	struct mutex		lock;
 	struct i2c_client	*client;
-	struct regulator_dev	*vmmc_regulator;
 	struct regmap		*map;
 };
Signature · 1 line
1.9.1
maintainer Applied
#1 lore raw
Quoted 4 lines · Axel Lin

The mutex lock is not used at all, remove it.
The *vmmc_regulator is not necessary, use a local variable in stw481x_vmmc_regulator_probe() instead.

Applied, thanks.