thermal: qcom: tsens: small fixup for debugfs

The current tsens debugfs structure is composed by:
- a tsens dir in debugfs with a version file
- a directory for each tsens istance with sensors file to dump all the sensors value.

This works on the assumption that we have the same version for each istance but this assumption seems fragile and with more than one tsens istance results in the version file not tracking each of them.

A better approach is to just create a subdirectory for each tsens istance and put there version and sensors debugfs file.

Using this new implementation results in less code since debugfs entry are created only on successful tsens probe.

Signed-off-by Christian Marangi <[email protected]>

---
  drivers/thermal/qcom/tsens.c | 13 +++----------
  1 file changed, 3 insertions(+), 10 deletions(-)

drivers/thermal/qcom/tsens.c +3 -10

index 467585c45d34..fc12d7c07de4 100644
@@ -704,21 +704,14 @@ DEFINE_SHOW_ATTRIBUTE(dbg_sensors);
  static void tsens_debug_init(struct platform_device *pdev)
  {
  	struct tsens_priv *priv = platform_get_drvdata(pdev);
-	struct dentry *root, *file;
 
-	root = debugfs_lookup("tsens", NULL);
-	if (!root)
+	priv->debug_root = debugfs_lookup("tsens", NULL);
+	if (!priv->debug_root)
  		priv->debug_root = debugfs_create_dir("tsens", NULL);
-	else
-		priv->debug_root = root;
-
-	file = debugfs_lookup("version", priv->debug_root);
-	if (!file)
-		debugfs_create_file("version", 0444, priv->debug_root,
-				    pdev, &dbg_version_fops);
 
  	/* A directory for each instance of the TSENS IP */
  	priv->debug = debugfs_create_dir(dev_name(&pdev->dev), priv->debug_root);
+	debugfs_create_file("version", 0444, priv->debug, pdev, &dbg_version_fops);
  	debugfs_create_file("sensors", 0444, priv->debug, pdev, &dbg_sensors_fops);
  }
  #else

Quoted 4 lines · Christian Marangi

The current tsens debugfs structure is composed by:
- a tsens dir in debugfs with a version file
- a directory for each tsens istance with sensors file to dump all the sensors value.

s/istance/instance/

The patch looks good to me, no need to resend, I'll fix the typos

Quoted 42 lines

This works on the assumption that we have the same version for each istance but this assumption seems fragile and with more than one tsens istance results in the version file not tracking each of them.

A better approach is to just create a subdirectory for each tsens istance and put there version and sensors debugfs file.

Using this new implementation results in less code since debugfs entry are created only on successful tsens probe.

Signed-off-by Christian Marangi <[email protected]>

---
  drivers/thermal/qcom/tsens.c | 13 +++----------
  1 file changed, 3 insertions(+), 10 deletions(-)

drivers/thermal/qcom/tsens.c +3 -10

index 467585c45d34..fc12d7c07de4 100644
@@ -704,21 +704,14 @@ DEFINE_SHOW_ATTRIBUTE(dbg_sensors);
  static void tsens_debug_init(struct platform_device *pdev)
  {
  	struct tsens_priv *priv = platform_get_drvdata(pdev);
-	struct dentry *root, *file;
-	root = debugfs_lookup("tsens", NULL);
-	if (!root)
+	priv->debug_root = debugfs_lookup("tsens", NULL);
+	if (!priv->debug_root)
  		priv->debug_root = debugfs_create_dir("tsens", NULL);
-	else
-		priv->debug_root = root;
-
-	file = debugfs_lookup("version", priv->debug_root);
-	if (!file)
-		debugfs_create_file("version", 0444, priv->debug_root,
-				    pdev, &dbg_version_fops);
  	/* A directory for each instance of the TSENS IP */
  	priv->debug = debugfs_create_dir(dev_name(&pdev->dev), priv->debug_root);
+	debugfs_create_file("version", 0444, priv->debug, pdev, &dbg_version_fops);
  	debugfs_create_file("sensors", 0444, priv->debug, pdev, &dbg_sensors_fops);
  }
  #else

Signature · 5 lines

<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs

Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog

Quoted 4 lines · Christian Marangi

The current tsens debugfs structure is composed by:
- a tsens dir in debugfs with a version file
- a directory for each tsens istance with sensors file to dump all the sensors value.

s/istance/instance/

The patch looks good to me, no need to resend, I'll fix the typos

Quoted 42 lines

This works on the assumption that we have the same version for each istance but this assumption seems fragile and with more than one tsens istance results in the version file not tracking each of them.

A better approach is to just create a subdirectory for each tsens istance and put there version and sensors debugfs file.

Using this new implementation results in less code since debugfs entry are created only on successful tsens probe.

Signed-off-by Christian Marangi <[email protected]>

---
  drivers/thermal/qcom/tsens.c | 13 +++----------
  1 file changed, 3 insertions(+), 10 deletions(-)

drivers/thermal/qcom/tsens.c +3 -10

index 467585c45d34..fc12d7c07de4 100644
@@ -704,21 +704,14 @@ DEFINE_SHOW_ATTRIBUTE(dbg_sensors);
  static void tsens_debug_init(struct platform_device *pdev)
  {
  	struct tsens_priv *priv = platform_get_drvdata(pdev);
-	struct dentry *root, *file;
-	root = debugfs_lookup("tsens", NULL);
-	if (!root)
+	priv->debug_root = debugfs_lookup("tsens", NULL);
+	if (!priv->debug_root)
  		priv->debug_root = debugfs_create_dir("tsens", NULL);
-	else
-		priv->debug_root = root;
-
-	file = debugfs_lookup("version", priv->debug_root);
-	if (!file)
-		debugfs_create_file("version", 0444, priv->debug_root,
-				    pdev, &dbg_version_fops);
  	/* A directory for each instance of the TSENS IP */
  	priv->debug = debugfs_create_dir(dev_name(&pdev->dev), priv->debug_root);
+	debugfs_create_file("version", 0444, priv->debug, pdev, &dbg_version_fops);
  	debugfs_create_file("sensors", 0444, priv->debug, pdev, &dbg_sensors_fops);
  }
  #else

Signature · 5 lines

<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs

Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog

This is a small series to fixup some bug in how tsens init debufs.

The first patch just handle situation where tsens fails to register and debugfs are getting registred anyway. When tsens is tried to reprobe debugs will print a warning as the directory are already there.

The second patch is a fixup for wrong version when the ancient VER_0 is used.

The third patch is a rework of debugfs structure moving version in the tsens istance instead of ignoring any other tsens istance if it will ever be the case in the future of having multiple tsens instance with different version. It's just futureproof on it's own and also removed one additional check.

changes v3:
- remove extra space from patch 1
- split patch 2 to 2 different patch
- patch 3 rework wrong debugfs structure
changes v2:
- Changed sob name to new one.

(the resend was actually v2 but i totally forgot that I sent it as v2 with the sob name fixed... but everything should be good now...)

Christian Marangi (3):
thermal: qcom: tsens: init debugfs only with successful probe
thermal: qcom: tsens: fix wrong version id dbg_version_show
thermal: qcom: tsens: rework debugfs file structure

  drivers/thermal/qcom/tsens.c | 23 +++++++++--------------
  1 file changed, 9 insertions(+), 14 deletions(-)