regulator: Remove NULL test before calling regulator_unregister()
It's safe to call regulator_unregister() with NULL, thus remove the NULL test before regulator_unregister() calls. Signed-off-by: Axel Lin <axel.lin@ingics.com> Signed-off-by: Mark Brown <broonie@sirena.org.uk>
This commit is contained in:
parent
1e4b545cdd
commit
020501f1a0
|
@ -232,8 +232,7 @@ static int max1586_pmic_remove(struct i2c_client *client)
|
|||
int i;
|
||||
|
||||
for (i = 0; i <= MAX1586_V6; i++)
|
||||
if (max1586->rdev[i])
|
||||
regulator_unregister(max1586->rdev[i]);
|
||||
regulator_unregister(max1586->rdev[i]);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
@ -275,10 +275,8 @@ static int max8649_regulator_remove(struct i2c_client *client)
|
|||
{
|
||||
struct max8649_regulator_info *info = i2c_get_clientdata(client);
|
||||
|
||||
if (info) {
|
||||
if (info->regulator)
|
||||
regulator_unregister(info->regulator);
|
||||
}
|
||||
if (info)
|
||||
regulator_unregister(info->regulator);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
|
@ -426,8 +426,7 @@ static int max8660_remove(struct i2c_client *client)
|
|||
int i;
|
||||
|
||||
for (i = 0; i < MAX8660_V_END; i++)
|
||||
if (max8660->rdev[i])
|
||||
regulator_unregister(max8660->rdev[i]);
|
||||
regulator_unregister(max8660->rdev[i]);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
@ -923,8 +923,7 @@ static int s5m8767_pmic_probe(struct platform_device *pdev)
|
|||
return 0;
|
||||
err:
|
||||
for (i = 0; i < s5m8767->num_regulators; i++)
|
||||
if (rdev[i])
|
||||
regulator_unregister(rdev[i]);
|
||||
regulator_unregister(rdev[i]);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
@ -936,8 +935,7 @@ static int s5m8767_pmic_remove(struct platform_device *pdev)
|
|||
int i;
|
||||
|
||||
for (i = 0; i < s5m8767->num_regulators; i++)
|
||||
if (rdev[i])
|
||||
regulator_unregister(rdev[i]);
|
||||
regulator_unregister(rdev[i]);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
|
@ -584,8 +584,7 @@ static int pmic_remove(struct spi_device *spi)
|
|||
if (!hw)
|
||||
return 0;
|
||||
for (i = 0; i < N_REGULATORS; i++) {
|
||||
if (hw->rdev[i])
|
||||
regulator_unregister(hw->rdev[i]);
|
||||
regulator_unregister(hw->rdev[i]);
|
||||
hw->rdev[i] = NULL;
|
||||
}
|
||||
spi_set_drvdata(spi, NULL);
|
||||
|
|
Loading…
Reference in New Issue