Merge tag 'firewire-6.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee139...

[linux-block.git] / drivers / regulator / core.c

diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 698ab7f5004bf6b74e2e57ac224f6138139f4666..d8e1caaf207e108f124988b7a9f1ee3780a12e8c 100644 (file)
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -1911,19 +1911,17 @@ static struct regulator *create_regulator(struct regulator_dev *rdev,
 
        if (err != -EEXIST)
                regulator->debugfs = debugfs_create_dir(supply_name, rdev->debugfs);
-       if (!regulator->debugfs) {
+       if (IS_ERR(regulator->debugfs))
                rdev_dbg(rdev, "Failed to create debugfs directory\n");
-       } else {
-               debugfs_create_u32("uA_load", 0444, regulator->debugfs,
-                                  &regulator->uA_load);
-               debugfs_create_u32("min_uV", 0444, regulator->debugfs,
-                                  &regulator->voltage[PM_SUSPEND_ON].min_uV);
-               debugfs_create_u32("max_uV", 0444, regulator->debugfs,
-                                  &regulator->voltage[PM_SUSPEND_ON].max_uV);
-               debugfs_create_file("constraint_flags", 0444,
-                                   regulator->debugfs, regulator,
-                                   &constraint_flags_fops);
-       }
+
+       debugfs_create_u32("uA_load", 0444, regulator->debugfs,
+                          &regulator->uA_load);
+       debugfs_create_u32("min_uV", 0444, regulator->debugfs,
+                          &regulator->voltage[PM_SUSPEND_ON].min_uV);
+       debugfs_create_u32("max_uV", 0444, regulator->debugfs,
+                          &regulator->voltage[PM_SUSPEND_ON].max_uV);
+       debugfs_create_file("constraint_flags", 0444, regulator->debugfs,
+                           regulator, &constraint_flags_fops);
 
        /*
         * Check now if the regulator is an always on regulator - if
@@ -5256,10 +5254,8 @@ static void rdev_init_debugfs(struct regulator_dev *rdev)
        }
 
        rdev->debugfs = debugfs_create_dir(rname, debugfs_root);
-       if (IS_ERR(rdev->debugfs)) {
-               rdev_warn(rdev, "Failed to create debugfs directory\n");
-               return;
-       }
+       if (IS_ERR(rdev->debugfs))
+               rdev_dbg(rdev, "Failed to create debugfs directory\n");
 
        debugfs_create_u32("use_count", 0444, rdev->debugfs,
                           &rdev->use_count);
@@ -6179,7 +6175,7 @@ static int __init regulator_init(void)
 
        debugfs_root = debugfs_create_dir("regulator", NULL);
        if (IS_ERR(debugfs_root))
-               pr_warn("regulator: Failed to create debugfs directory\n");
+               pr_debug("regulator: Failed to create debugfs directory\n");
 
 #ifdef CONFIG_DEBUG_FS
        debugfs_create_file("supply_map", 0444, debugfs_root, NULL,