Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 020501f1a0911af70873e4d3d122b2e1889ccd03

Authored by Axel Lin
Committed by Mark Brown
1 parent 1e4b545cdd
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

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>

Showing 5 changed files with 7 additions and 14 deletions Side-by-side Diff

drivers/regulator/max1586.c
Diff comments   View file @ 020501f
... ... @@ -232,8 +232,7 @@
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  
drivers/regulator/max8649.c
Diff comments   View file @ 020501f
... ... @@ -275,10 +275,8 @@
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 }
drivers/regulator/max8660.c
Diff comments   View file @ 020501f
... ... @@ -426,8 +426,7 @@
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  
drivers/regulator/s5m8767.c
Diff comments   View file @ 020501f
... ... @@ -923,8 +923,7 @@
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 }
... ... @@ -936,8 +935,7 @@
936 935 int i;
937 936  
938 937 for (i = 0; i < s5m8767->num_regulators; i++)
939   - if (rdev[i])
940   - regulator_unregister(rdev[i]);
  938 + regulator_unregister(rdev[i]);
941 939  
942 940 return 0;
943 941 }
drivers/regulator/tps6524x-regulator.c
Diff comments   View file @ 020501f
... ... @@ -584,8 +584,7 @@
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);