diff options
| author | Mark Brown | 2012-02-20 22:01:04 +0100 |
|---|---|---|
| committer | Mark Brown | 2012-02-21 10:56:38 +0100 |
| commit | f4d562c6e616bb686f43d38752b2e5b83359e1fc (patch) | |
| tree | a453c82c9429cedc8ed87673dd145cba9f45fa68 /drivers/regulator/core.c | |
| parent | regulator: Simplify regulator_bulk_get and regulator_bulk_enable error paths (diff) | |
| download | kernel-qcow2-linux-f4d562c6e616bb686f43d38752b2e5b83359e1fc.tar.gz kernel-qcow2-linux-f4d562c6e616bb686f43d38752b2e5b83359e1fc.tar.xz kernel-qcow2-linux-f4d562c6e616bb686f43d38752b2e5b83359e1fc.zip | |
regulator: Clean up debugfs error handling a bit
Use IS_ERR_OR_NULL() rather than open coding it and ignore errors from
failure to create the supply map.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'drivers/regulator/core.c')
| -rw-r--r-- | drivers/regulator/core.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index 6c845200a530..81ea66dcca9c 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -2712,7 +2712,7 @@ static void rdev_init_debugfs(struct regulator_dev *rdev) { #ifdef CONFIG_DEBUG_FS rdev->debugfs = debugfs_create_dir(rdev_get_name(rdev), debugfs_root); - if (IS_ERR(rdev->debugfs) || !rdev->debugfs) { + if (IS_ERR_OR_NULL(rdev->debugfs)) { rdev_warn(rdev, "Failed to create debugfs directory\n"); rdev->debugfs = NULL; return; @@ -3127,14 +3127,13 @@ static int __init regulator_init(void) #ifdef CONFIG_DEBUG_FS debugfs_root = debugfs_create_dir("regulator", NULL); - if (IS_ERR(debugfs_root) || !debugfs_root) { + if (IS_ERR_OR_NULL(debugfs_root)) { pr_warn("regulator: Failed to create debugfs directory\n"); debugfs_root = NULL; } - if (IS_ERR(debugfs_create_file("supply_map", 0444, debugfs_root, - NULL, &supply_map_fops))) - pr_warn("regulator: Failed to create supplies debugfs\n"); + debugfs_create_file("supply_map", 0444, debugfs_root, NULL, + &supply_map_fops); #endif regulator_dummy_init(); |