regulator: Remove NULL test before calling regulator_unregister()

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

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>

authored by

Axel Lin and committed by

Mark Brown 13 years ago 020501f1 1e4b545c

+7 -14

5 changed files

expand all

drivers

regulator

max1586.c

max8649.c

max8660.c

s5m8767.c

tps6524x-regulator.c

+1 -2

drivers/regulator/max1586.c

··· 232 232 int i; 233 233 234 234 for (i = 0; i <= MAX1586_V6; i++) 235 - if (max1586->rdev[i]) 236 - regulator_unregister(max1586->rdev[i]); 235 + regulator_unregister(max1586->rdev[i]); 237 236 return 0; 238 237 } 239 238

+2 -4

drivers/regulator/max8649.c

··· 275 275 { 276 276 struct max8649_regulator_info *info = i2c_get_clientdata(client); 277 277 278 - if (info) { 279 - if (info->regulator) 280 - regulator_unregister(info->regulator); 281 - } 278 + if (info) 279 + regulator_unregister(info->regulator); 282 280 283 281 return 0; 284 282 }

+1 -2

drivers/regulator/max8660.c

··· 426 426 int i; 427 427 428 428 for (i = 0; i < MAX8660_V_END; i++) 429 - if (max8660->rdev[i]) 430 - regulator_unregister(max8660->rdev[i]); 429 + regulator_unregister(max8660->rdev[i]); 431 430 return 0; 432 431 } 433 432

+2 -4

drivers/regulator/s5m8767.c

··· 923 923 return 0; 924 924 err: 925 925 for (i = 0; i < s5m8767->num_regulators; i++) 926 - if (rdev[i]) 927 - regulator_unregister(rdev[i]); 926 + regulator_unregister(rdev[i]); 928 927 929 928 return ret; 930 929 } ··· 935 936 int i; 936 937 937 938 for (i = 0; i < s5m8767->num_regulators; i++) 938 - if (rdev[i]) 939 - regulator_unregister(rdev[i]); 939 + regulator_unregister(rdev[i]); 940 940 941 941 return 0; 942 942 }

+1 -2

drivers/regulator/tps6524x-regulator.c

··· 584 584 if (!hw) 585 585 return 0; 586 586 for (i = 0; i < N_REGULATORS; i++) { 587 - if (hw->rdev[i]) 588 - regulator_unregister(hw->rdev[i]); 587 + regulator_unregister(hw->rdev[i]); 589 588 hw->rdev[i] = NULL; 590 589 } 591 590 spi_set_drvdata(spi, NULL);