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>
static bool has_full_constraints;
static bool board_wants_dummy_regulator;
static bool has_full_constraints;
static bool board_wants_dummy_regulator;
static struct dentry *debugfs_root;
static struct dentry *debugfs_root;
/*
* struct regulator_map
/*
* struct regulator_map
char *supply_name;
struct device_attribute dev_attr;
struct regulator_dev *rdev;
char *supply_name;
struct device_attribute dev_attr;
struct regulator_dev *rdev;
};
static int _regulator_is_enabled(struct regulator_dev *rdev);
};
static int _regulator_is_enabled(struct regulator_dev *rdev);
regulator->debugfs = debugfs_create_dir(regulator->supply_name,
rdev->debugfs);
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");
rdev_warn(rdev, "Failed to create debugfs directory\n");
- regulator->debugfs = NULL;
} else {
debugfs_create_u32("uA_load", 0444, regulator->debugfs,
®ulator->uA_load);
} else {
debugfs_create_u32("uA_load", 0444, regulator->debugfs,
®ulator->uA_load);
debugfs_create_u32("max_uV", 0444, regulator->debugfs,
®ulator->max_uV);
}
debugfs_create_u32("max_uV", 0444, regulator->debugfs,
®ulator->max_uV);
}
mutex_unlock(&rdev->mutex);
return regulator;
mutex_unlock(&rdev->mutex);
return regulator;
mutex_lock(®ulator_list_mutex);
rdev = regulator->rdev;
mutex_lock(®ulator_list_mutex);
rdev = regulator->rdev;
debugfs_remove_recursive(regulator->debugfs);
debugfs_remove_recursive(regulator->debugfs);
/* remove any sysfs entries */
if (regulator->dev) {
/* remove any sysfs entries */
if (regulator->dev) {
static void rdev_init_debugfs(struct regulator_dev *rdev)
{
static void rdev_init_debugfs(struct regulator_dev *rdev)
{
rdev->debugfs = debugfs_create_dir(rdev_get_name(rdev), debugfs_root);
rdev->debugfs = debugfs_create_dir(rdev_get_name(rdev), debugfs_root);
- if (IS_ERR_OR_NULL(rdev->debugfs)) {
rdev_warn(rdev, "Failed to create debugfs directory\n");
rdev_warn(rdev, "Failed to create debugfs directory\n");
&rdev->use_count);
debugfs_create_u32("open_count", 0444, rdev->debugfs,
&rdev->open_count);
&rdev->use_count);
debugfs_create_u32("open_count", 0444, rdev->debugfs,
&rdev->open_count);
return;
mutex_lock(®ulator_list_mutex);
return;
mutex_lock(®ulator_list_mutex);
debugfs_remove_recursive(rdev->debugfs);
debugfs_remove_recursive(rdev->debugfs);
flush_work_sync(&rdev->disable_work.work);
WARN_ON(rdev->open_count);
unset_regulator_supplies(rdev);
flush_work_sync(&rdev->disable_work.work);
WARN_ON(rdev->open_count);
unset_regulator_supplies(rdev);
static const struct file_operations supply_map_fops = {
static const struct file_operations supply_map_fops = {
.read = supply_map_read_file,
.llseek = default_llseek,
.read = supply_map_read_file,
.llseek = default_llseek,
static int __init regulator_init(void)
{
static int __init regulator_init(void)
{
ret = class_register(®ulator_class);
ret = class_register(®ulator_class);
debugfs_root = debugfs_create_dir("regulator", NULL);
debugfs_root = debugfs_create_dir("regulator", NULL);
- if (IS_ERR_OR_NULL(debugfs_root)) {
pr_warn("regulator: Failed to create debugfs directory\n");
pr_warn("regulator: Failed to create debugfs directory\n");
- debugfs_root = NULL;
- }
debugfs_create_file("supply_map", 0444, debugfs_root, NULL,
&supply_map_fops);
debugfs_create_file("supply_map", 0444, debugfs_root, NULL,
&supply_map_fops);
void *reg_data; /* regulator_dev data */
void *reg_data; /* regulator_dev data */
};
struct regulator_dev *regulator_register(struct regulator_desc *regulator_desc,
};
struct regulator_dev *regulator_register(struct regulator_desc *regulator_desc,