regulator: dbx500: debug: Fast path usage info

Print out regulator fast path usage and include their
usage when showing overall regulator use.

ST-Ericsson Linux next: -
ST-Ericsson ID: 370799
ST-Ericsson FOSS-OUT ID: Trivial

Change-Id: Id65fa7b4047e4e033ad89d38ee04ed6ca3b8113f
Signed-off-by: Jonas Aaberg <jonas.aberg@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/39736

1 files changed, 56 insertions, 25 deletions

diff --git a/drivers/regulator/dbx500-prcmu.c b/drivers/regulator/dbx500-prcmu.c
index 3f104b20cb9..bee4f7be93b 100644
--- a/drivers/regulator/dbx500-prcmu.c
+++ b/drivers/regulator/dbx500-prcmu.c
@@ -67,7 +67,9 @@ struct ux500_regulator {
 	char *name;
 	void (*enable)(void);
 	int (*disable)(void);
+	int count;
 };
+
 static struct ux500_regulator ux500_atomic_regulators[] = {
 	{
 		.name    = "dma40.0",
@@ -132,6 +134,7 @@ EXPORT_SYMBOL_GPL(ux500_regulator_get);
 int ux500_regulator_atomic_enable(struct ux500_regulator *regulator)
 {
 	if (regulator) {
+		regulator->count++;
 		regulator->enable();
 		return 0;
 	}
@@ -141,10 +144,11 @@ EXPORT_SYMBOL_GPL(ux500_regulator_atomic_enable);
 
 int ux500_regulator_atomic_disable(struct ux500_regulator *regulator)
 {
-	if (regulator)
+	if (regulator) {
+		regulator->count--;
 		return regulator->disable();
-	else
-		return -EINVAL;
+	}
+	return -EINVAL;
 }
 EXPORT_SYMBOL_GPL(ux500_regulator_atomic_disable);
 
@@ -158,8 +162,6 @@ EXPORT_SYMBOL_GPL(ux500_regulator_put);
 
 static struct ux500_regulator_debug {
 	struct dentry *dir;
-	struct dentry *status_file;
-	struct dentry *power_state_cnt_file;
 	struct dbx500_regulator_info *regulator_array;
 	int num_regulators;
 	u8 *state_before_suspend;
@@ -211,6 +213,35 @@ static const struct file_operations ux500_regulator_power_state_cnt_fops = {
 	.owner = THIS_MODULE,
 };
 
+static int ux500_regulator_power_state_use_print(struct seq_file *s, void *p)
+{
+	int i;
+
+	seq_printf(s, "\nPower state usage:\n\n");
+
+	for (i = 0; i < ARRAY_SIZE(ux500_atomic_regulators); i++) {
+		seq_printf(s, "%s\t : %d\n",
+			   ux500_atomic_regulators[i].name,
+			   ux500_atomic_regulators[i].count);
+	}
+	return 0;
+}
+
+static int ux500_regulator_power_state_use_open(struct inode *inode,
+	struct file *file)
+{
+	return single_open(file, ux500_regulator_power_state_use_print,
+		inode->i_private);
+}
+
+static const struct file_operations ux500_regulator_power_state_use_fops = {
+	.open = ux500_regulator_power_state_use_open,
+	.read = seq_read,
+	.llseek = seq_lseek,
+	.release = single_release,
+	.owner = THIS_MODULE,
+};
+
 static int ux500_regulator_status_print(struct seq_file *s, void *p)
 {
 	struct device *dev = s->private;
@@ -272,22 +303,27 @@ ux500_regulator_debug_init(struct platform_device *pdev,
 {
 	/* create directory */
 	rdebug.dir = debugfs_create_dir("ux500-regulator", NULL);
-	if (!rdebug.dir)
+	if (IS_ERR_OR_NULL(rdebug.dir))
 		goto exit_no_debugfs;
 
 	/* create "status" file */
-	rdebug.status_file = debugfs_create_file("status",
-		S_IRUGO, rdebug.dir, &pdev->dev,
-		&ux500_regulator_status_fops);
-	if (!rdebug.status_file)
-		goto exit_destroy_dir;
+	if (IS_ERR_OR_NULL(debugfs_create_file("status",
+					       S_IRUGO, rdebug.dir, &pdev->dev,
+					       &ux500_regulator_status_fops)))
+		goto exit_fail;
 
 	/* create "power-state-count" file */
-	rdebug.power_state_cnt_file = debugfs_create_file("power-state-count",
-		S_IRUGO, rdebug.dir, &pdev->dev,
-		&ux500_regulator_power_state_cnt_fops);
-	if (!rdebug.power_state_cnt_file)
-		goto exit_destroy_status;
+	if (IS_ERR_OR_NULL(debugfs_create_file("power-state-count",
+					       S_IRUGO, rdebug.dir, &pdev->dev,
+					       &ux500_regulator_power_state_cnt_fops)))
+		goto exit_fail;
+
+	/* create "power-state-count" file */
+	if (IS_ERR_OR_NULL(debugfs_create_file("power-state-usage",
+					       S_IRUGO, rdebug.dir, &pdev->dev,
+					       &ux500_regulator_power_state_use_fops)))
+		goto exit_fail;
+
 
 	rdebug.regulator_array = regulator_info;
 	rdebug.num_regulators = num_regulators;
@@ -296,27 +332,22 @@ ux500_regulator_debug_init(struct platform_device *pdev,
 	if (!rdebug.state_before_suspend) {
 		dev_err(&pdev->dev,
 			"could not allocate memory for saving state\n");
-		goto exit_destroy_power_state;
+		goto exit_fail;
 	}
 
 	rdebug.state_after_suspend = kzalloc(num_regulators, GFP_KERNEL);
 	if (!rdebug.state_after_suspend) {
 		dev_err(&pdev->dev,
 			"could not allocate memory for saving state\n");
-		goto exit_free;
+		goto exit_fail;
 	}
 
 	dbx500_regulator_testcase(regulator_info, num_regulators);
 	return 0;
 
-exit_free:
+exit_fail:
 	kfree(rdebug.state_before_suspend);
-exit_destroy_power_state:
-	debugfs_remove(rdebug.power_state_cnt_file);
-exit_destroy_status:
-	debugfs_remove(rdebug.status_file);
-exit_destroy_dir:
-	debugfs_remove(rdebug.dir);
+	debugfs_remove_recursive(rdebug.dir);
 exit_no_debugfs:
 	dev_err(&pdev->dev, "failed to create debugfs entries.\n");
 	return -ENOMEM;