regulator: Remove ifdefs for debugfs code
If CONFIG_DEBUG_FS=y debugfs functions will never return an
ERR_PTR. Instead they'll return NULL. The intent is to remove
ifdefs in calling code.
Update the code to reflect this. We gain an extra dentry pointer
per struct regulator and struct regulator_dev but that should be
ok because most distros have debugfs compiled in anyway.
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 81ea66d..603e39f 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -52,9 +52,7 @@
static bool has_full_constraints;
static bool board_wants_dummy_regulator;
-#ifdef CONFIG_DEBUG_FS
static struct dentry *debugfs_root;
-#endif
/*
* struct regulator_map
@@ -82,9 +80,7 @@
char *supply_name;
struct device_attribute dev_attr;
struct regulator_dev *rdev;
-#ifdef CONFIG_DEBUG_FS
struct dentry *debugfs;
-#endif
};
static int _regulator_is_enabled(struct regulator_dev *rdev);
@@ -1145,12 +1141,10 @@
goto attr_err;
}
-#ifdef CONFIG_DEBUG_FS
regulator->debugfs = debugfs_create_dir(regulator->supply_name,
rdev->debugfs);
- if (IS_ERR_OR_NULL(regulator->debugfs)) {
+ if (!regulator->debugfs) {
rdev_warn(rdev, "Failed to create debugfs directory\n");
- regulator->debugfs = NULL;
} else {
debugfs_create_u32("uA_load", 0444, regulator->debugfs,
®ulator->uA_load);
@@ -1159,7 +1153,6 @@
debugfs_create_u32("max_uV", 0444, regulator->debugfs,
®ulator->max_uV);
}
-#endif
mutex_unlock(&rdev->mutex);
return regulator;
@@ -1368,9 +1361,7 @@
mutex_lock(®ulator_list_mutex);
rdev = regulator->rdev;
-#ifdef CONFIG_DEBUG_FS
debugfs_remove_recursive(regulator->debugfs);
-#endif
/* remove any sysfs entries */
if (regulator->dev) {
@@ -2710,11 +2701,9 @@
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_OR_NULL(rdev->debugfs)) {
+ if (!rdev->debugfs) {
rdev_warn(rdev, "Failed to create debugfs directory\n");
- rdev->debugfs = NULL;
return;
}
@@ -2722,7 +2711,6 @@
&rdev->use_count);
debugfs_create_u32("open_count", 0444, rdev->debugfs,
&rdev->open_count);
-#endif
}
/**
@@ -2900,9 +2888,7 @@
return;
mutex_lock(®ulator_list_mutex);
-#ifdef CONFIG_DEBUG_FS
debugfs_remove_recursive(rdev->debugfs);
-#endif
flush_work_sync(&rdev->disable_work.work);
WARN_ON(rdev->open_count);
unset_regulator_supplies(rdev);
@@ -3112,12 +3098,14 @@
return ret;
}
+#endif
static const struct file_operations supply_map_fops = {
+#ifdef CONFIG_DEBUG_FS
.read = supply_map_read_file,
.llseek = default_llseek,
-};
#endif
+};
static int __init regulator_init(void)
{
@@ -3125,16 +3113,12 @@
ret = class_register(®ulator_class);
-#ifdef CONFIG_DEBUG_FS
debugfs_root = debugfs_create_dir("regulator", NULL);
- if (IS_ERR_OR_NULL(debugfs_root)) {
+ if (!debugfs_root)
pr_warn("regulator: Failed to create debugfs directory\n");
- debugfs_root = NULL;
- }
debugfs_create_file("supply_map", 0444, debugfs_root, NULL,
&supply_map_fops);
-#endif
regulator_dummy_init();