Skip to content

Commit

Permalink
regulator: Add initial per-regulator debugfs support
Browse files Browse the repository at this point in the history
We only expose the use and open counts to userspace, providing a tiny
bit of insight into what the API is up to.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
  • Loading branch information
Mark Brown authored and Liam Girdwood committed Jan 12, 2011
1 parent 21cf891 commit 1130e5b
Show file tree
Hide file tree
Showing 2 changed files with 41 additions and 2 deletions.
35 changes: 35 additions & 0 deletions drivers/regulator/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/debugfs.h>
#include <linux/device.h>
#include <linux/slab.h>
#include <linux/err.h>
Expand Down Expand Up @@ -47,6 +48,10 @@ static LIST_HEAD(regulator_map_list);
static bool has_full_constraints;
static bool board_wants_dummy_regulator;

#ifdef CONFIG_DEBUG_FS
static struct dentry *debugfs_root;
#endif

/*
* struct regulator_map
*
Expand Down Expand Up @@ -2404,6 +2409,23 @@ static int add_regulator_attributes(struct regulator_dev *rdev)
return status;
}

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) {
rdev_warn(rdev, "Failed to create debugfs directory\n");
rdev->debugfs = NULL;
return;
}

debugfs_create_u32("use_count", 0444, rdev->debugfs,
&rdev->use_count);
debugfs_create_u32("open_count", 0444, rdev->debugfs,
&rdev->open_count);
#endif
}

/**
* regulator_register - register regulator
* @regulator_desc: regulator to register
Expand Down Expand Up @@ -2548,6 +2570,8 @@ struct regulator_dev *regulator_register(struct regulator_desc *regulator_desc,
}

list_add(&rdev->list, &regulator_list);

rdev_init_debugfs(rdev);
out:
mutex_unlock(&regulator_list_mutex);
return rdev;
Expand Down Expand Up @@ -2580,6 +2604,9 @@ void regulator_unregister(struct regulator_dev *rdev)
return;

mutex_lock(&regulator_list_mutex);
#ifdef CONFIG_DEBUG_FS
debugfs_remove_recursive(rdev->debugfs);
#endif
WARN_ON(rdev->open_count);
unset_regulator_supplies(rdev);
list_del(&rdev->list);
Expand Down Expand Up @@ -2723,6 +2750,14 @@ static int __init regulator_init(void)

ret = class_register(&regulator_class);

#ifdef CONFIG_DEBUG_FS
debugfs_root = debugfs_create_dir("regulator", NULL);
if (IS_ERR(debugfs_root) || !debugfs_root) {
pr_warn("regulator: Failed to create debugfs directory\n");
debugfs_root = NULL;
}
#endif

regulator_dummy_init();

return ret;
Expand Down
8 changes: 6 additions & 2 deletions include/linux/regulator/driver.h
Original file line number Diff line number Diff line change
Expand Up @@ -175,9 +175,9 @@ struct regulator_desc {
*/
struct regulator_dev {
struct regulator_desc *desc;
int use_count;
int open_count;
int exclusive;
u32 use_count;
u32 open_count;

/* lists we belong to */
struct list_head list; /* list of all regulators */
Expand All @@ -195,6 +195,10 @@ struct regulator_dev {
struct regulator_dev *supply; /* for tree */

void *reg_data; /* regulator_dev data */

#ifdef CONFIG_DEBUG_FS
struct dentry *debugfs;
#endif
};

struct regulator_dev *regulator_register(struct regulator_desc *regulator_desc,
Expand Down

0 comments on commit 1130e5b

Please sign in to comment.