Skip to content

Commit 9defeb9

Browse files
committed
regulator: core: Fix error checking and messages
Merge series from Geert Uytterhoeven <geert+renesas@glider.be>: This patch series corrects an error check, fixes error messages when debugfs is not enabled, and improves debugfs error handling in the regulator core.
2 parents 87fe021 + 0888071 commit 9defeb9

1 file changed

Lines changed: 13 additions & 17 deletions

File tree

drivers/regulator/core.c

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1911,19 +1911,17 @@ static struct regulator *create_regulator(struct regulator_dev *rdev,
19111911

19121912
if (err != -EEXIST)
19131913
regulator->debugfs = debugfs_create_dir(supply_name, rdev->debugfs);
1914-
if (!regulator->debugfs) {
1914+
if (IS_ERR(regulator->debugfs))
19151915
rdev_dbg(rdev, "Failed to create debugfs directory\n");
1916-
} else {
1917-
debugfs_create_u32("uA_load", 0444, regulator->debugfs,
1918-
&regulator->uA_load);
1919-
debugfs_create_u32("min_uV", 0444, regulator->debugfs,
1920-
&regulator->voltage[PM_SUSPEND_ON].min_uV);
1921-
debugfs_create_u32("max_uV", 0444, regulator->debugfs,
1922-
&regulator->voltage[PM_SUSPEND_ON].max_uV);
1923-
debugfs_create_file("constraint_flags", 0444,
1924-
regulator->debugfs, regulator,
1925-
&constraint_flags_fops);
1926-
}
1916+
1917+
debugfs_create_u32("uA_load", 0444, regulator->debugfs,
1918+
&regulator->uA_load);
1919+
debugfs_create_u32("min_uV", 0444, regulator->debugfs,
1920+
&regulator->voltage[PM_SUSPEND_ON].min_uV);
1921+
debugfs_create_u32("max_uV", 0444, regulator->debugfs,
1922+
&regulator->voltage[PM_SUSPEND_ON].max_uV);
1923+
debugfs_create_file("constraint_flags", 0444, regulator->debugfs,
1924+
regulator, &constraint_flags_fops);
19271925

19281926
/*
19291927
* Check now if the regulator is an always on regulator - if
@@ -5256,10 +5254,8 @@ static void rdev_init_debugfs(struct regulator_dev *rdev)
52565254
}
52575255

52585256
rdev->debugfs = debugfs_create_dir(rname, debugfs_root);
5259-
if (IS_ERR(rdev->debugfs)) {
5260-
rdev_warn(rdev, "Failed to create debugfs directory\n");
5261-
return;
5262-
}
5257+
if (IS_ERR(rdev->debugfs))
5258+
rdev_dbg(rdev, "Failed to create debugfs directory\n");
52635259

52645260
debugfs_create_u32("use_count", 0444, rdev->debugfs,
52655261
&rdev->use_count);
@@ -6179,7 +6175,7 @@ static int __init regulator_init(void)
61796175

61806176
debugfs_root = debugfs_create_dir("regulator", NULL);
61816177
if (IS_ERR(debugfs_root))
6182-
pr_warn("regulator: Failed to create debugfs directory\n");
6178+
pr_debug("regulator: Failed to create debugfs directory\n");
61836179

61846180
#ifdef CONFIG_DEBUG_FS
61856181
debugfs_create_file("supply_map", 0444, debugfs_root, NULL,

0 commit comments

Comments
 (0)