lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

regulator: Remove NULL test before calling regulator_unregister()

Browse Source 
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:
Axel Lin
2013-04-27 13:58:08 +08:00
committed by Mark Brown
parent 1e4b545cdd
commit 020501f1a0
5 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/regulator/max1586.c
View File

@@ -232,8 +232,7 @@ static int max1586_pmic_remove(struct i2c_client *client)
int i; int i;
for (i = 0; i <= MAX1586_V6; i++) for (i = 0; i <= MAX1586_V6; i++)
if (max1586->rdev[i]) regulator_unregister(max1586->rdev[i]);
regulator_unregister(max1586->rdev[i]);
return 0; return 0;
} }

6
drivers/regulator/max8649.c
View File

@@ -275,10 +275,8 @@ static int max8649_regulator_remove(struct i2c_client *client)
{ {
struct max8649_regulator_info *info = i2c_get_clientdata(client); struct max8649_regulator_info *info = i2c_get_clientdata(client);
if (info) { if (info)
if (info->regulator) regulator_unregister(info->regulator);
regulator_unregister(info->regulator);
}
return 0; return 0;
} }

3
drivers/regulator/max8660.c
View File

@@ -426,8 +426,7 @@ static int max8660_remove(struct i2c_client *client)
int i; int i;
for (i = 0; i < MAX8660_V_END; 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; return 0;
} }

6
drivers/regulator/s5m8767.c
View File

@@ -923,8 +923,7 @@ static int s5m8767_pmic_probe(struct platform_device *pdev)
return 0; return 0;
err: err:
for (i = 0; i < s5m8767->num_regulators; i++) for (i = 0; i < s5m8767->num_regulators; i++)
if (rdev[i]) regulator_unregister(rdev[i]);
regulator_unregister(rdev[i]);
return ret; return ret;
} }
@@ -936,8 +935,7 @@ static int s5m8767_pmic_remove(struct platform_device *pdev)
int i; int i;
for (i = 0; i < s5m8767->num_regulators; i++) for (i = 0; i < s5m8767->num_regulators; i++)
if (rdev[i]) regulator_unregister(rdev[i]);
regulator_unregister(rdev[i]);
return 0; return 0;
} }

3
drivers/regulator/tps6524x-regulator.c
View File

@@ -584,8 +584,7 @@ static int pmic_remove(struct spi_device *spi)
if (!hw) if (!hw)
return 0; return 0;
for (i = 0; i < N_REGULATORS; i++) { 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; hw->rdev[i] = NULL;
} }
spi_set_drvdata(spi, NULL); spi_set_drvdata(spi, NULL);