| From 63e222008c1a43e658566153a3d1228f9fa52bc4 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Fri, 12 Mar 2021 10:42:52 +0300 |
| Subject: regulator: bd9576: Fix return from bd957x_probe() |
| |
| From: Dan Carpenter <dan.carpenter@oracle.com> |
| |
| [ Upstream commit 320fcd6bbd2b500923db518902c2c640242d2b50 ] |
| |
| 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 <dan.carpenter@oracle.com> |
| Reviewed-by: Matti Vaittinen <matti.vaittinen@fi.rohmeurope.com> |
| Link: https://lore.kernel.org/r/YEsbfLJfEWtnRpoU@mwanda |
| Signed-off-by: Mark Brown <broonie@kernel.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/regulator/bd9576-regulator.c | 11 ++++------- |
| 1 file changed, 4 insertions(+), 7 deletions(-) |
| |
| diff --git a/drivers/regulator/bd9576-regulator.c b/drivers/regulator/bd9576-regulator.c |
| index a8b5832a5a1b..204a2da054f5 100644 |
| --- a/drivers/regulator/bd9576-regulator.c |
| +++ b/drivers/regulator/bd9576-regulator.c |
| @@ -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[] = { |
| -- |
| 2.30.2 |
| |