Skip to contentSkip to conversation

regulator: bd9576: Fix return from bd957x_probe()

PATCH In review Dan Carpenter 3 participants 3 messages Mar 12, 2021 – Mar 15, 2021

Subsystems (3)
Kernel janitors Voltage and current regulator framework ROHM power management IC device drivers
lore
Share & tools
lore

Dan Carpenter

author
#0 lore raw

PATCH 1/1 regulator: bd9576: Fix return from bd957x_probe()

The probe() function returns an uninitialized variable in the success path. There is no need for the "err" variable at all, just delete it.

Fixes b014e9fae7e7 ("regulator: Support ROHM BD9576MUF and BD9573MUF")
Signed-off-by Dan Carpenter <[email protected]>
---
 drivers/regulator/bd9576-regulator.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)
drivers/regulator/bd9576-regulator.c +4 -7
index a8b5832a5a1b..204a2da054f5 100644
@@ -206,7 +206,7 @@ static int bd957x_probe(struct platform_device *pdev)
 {
 	struct regmap *regmap;
 	struct regulator_config config = { 0 };
-	int i, err;
+	int i;
 	bool vout_mode, ddr_sel;
 	const struct bd957x_regulator_data *reg_data = &bd9576_regulators[0];
 	unsigned int num_reg_data = ARRAY_SIZE(bd9576_regulators);

@@ -279,8 +279,7 @@ static int bd957x_probe(struct platform_device *pdev)
 		break;
 	default:
 		dev_err(&pdev->dev, "Unsupported chip type\n");
-		err = -EINVAL;
-		goto err;
+		return -EINVAL;
 	}
 
 	config.dev = pdev->dev.parent;

@@ -300,8 +299,7 @@ static int bd957x_probe(struct platform_device *pdev)
 			dev_err(&pdev->dev,
 				"failed to register %s regulator\n",
 				desc->name);
-			err = PTR_ERR(rdev);
-			goto err;
+			return PTR_ERR(rdev);
 		}
 		/*
 		 * Clear the VOUT1 GPIO setting - rest of the regulators do not

@@ -310,8 +308,7 @@ static int bd957x_probe(struct platform_device *pdev)
 		config.ena_gpiod = NULL;
 	}
 
-err:
-	return err;
+	return 0;
 }
 
 static const struct platform_device_id bd957x_pmic_id[] = {
Signature · 1 line
2.30.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 7 lines · Dan Carpenter

The probe() function returns an uninitialized variable in the success path. There is no need for the "err" variable at all, just delete it.

Fixes b014e9fae7e7 ("regulator: Support ROHM BD9576MUF and

BD9573MUF")

Signed-off-by Dan Carpenter <[email protected]>

Thanks for killing the bug Dan! Very much appreciated.

By the way, this is going to conflict with the regulator notification extension RFC series. I will rebase the RFC when this gets in tree.

Reviewed-by Matti Vaittinen <[email protected]>
Quoted 54 lines
---
 drivers/regulator/bd9576-regulator.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)
drivers/regulator/bd9576-regulator.c +1 -1
index a8b5832a5a1b..204a2da054f5 100644
@@ -206,7 +206,7 @@ static int bd957x_probe(struct platform_device
 *pdev)
 {
 	struct regmap *regmap;
 	struct regulator_config config = { 0 };
-	int i, err;
+	int i;
 	bool vout_mode, ddr_sel;
 	const struct bd957x_regulator_data *reg_data =

&bd9576_regulators[0];

drivers/regulator/bd9576-regulator.c +1 -2
 	unsigned int num_reg_data = ARRAY_SIZE(bd9576_regulators);

@@ -279,8 +279,7 @@ static int bd957x_probe(struct platform_device
 *pdev)
 		break;
 	default:
 		dev_err(&pdev->dev, "Unsupported chip type\n");
-		err = -EINVAL;
-		goto err;
+		return -EINVAL;
 	}
drivers/regulator/bd9576-regulator.c +1 -2
 	config.dev = pdev->dev.parent;

@@ -300,8 +299,7 @@ static int bd957x_probe(struct platform_device
 *pdev)
 			dev_err(&pdev->dev,
 				"failed to register %s regulator\n",
 				desc->name);
-			err = PTR_ERR(rdev);
-			goto err;
+			return PTR_ERR(rdev);
 		}
 		/*

* Clear the VOUT1 GPIO setting - rest of the
regulators do not

drivers/regulator/bd9576-regulator.c +1 -2
@@ -310,8 +308,7 @@ static int bd957x_probe(struct platform_device
 *pdev)
 		config.ena_gpiod = NULL;
 	}
 
-err:
-	return err;
+	return 0;
 }

static const struct platform_device_id bd957x_pmic_id[] = {

maintainer
#2 lore raw
In reply to Dan Carpenter
Quoted 2 lines · Dan Carpenter

The probe() function returns an uninitialized variable in the success path. There is no need for the "err" variable at all, just delete it.

Applied to

https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git for-next

Thanks!

[1/1] regulator: bd9576: Fix return from bd957x_probe()

      commit: 320fcd6bbd2b500923db518902c2c640242d2b50

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