[thermal-next,v2,2/2] thermal: qcom: tsens: simplify debugfs init function

Message ID 20210429010518.13319-3-ansuelsmth@gmail.com
State New
Headers show
Series
  • Minor fix for qcom tsens driver
Related show

Commit Message

Ansuel Smith April 29, 2021, 1:05 a.m.
Simplify debugfs init function.
- Add check for existing dev directory.
- Fix wrong version in dbg_version_show (with version 0.0.0, 0.1.0 was
  incorrectly reported)

Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
---
 drivers/thermal/qcom/tsens.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

Comments

Thara Gopinath May 10, 2021, 12:44 p.m. | #1
On 4/28/21 9:05 PM, Ansuel Smith wrote:
> Simplify debugfs init function.

> - Add check for existing dev directory.

> - Fix wrong version in dbg_version_show (with version 0.0.0, 0.1.0 was

>    incorrectly reported)

> 

> Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>


Acked-by: Thara Gopinath <thara.gopinath@linaro.org>


Warm Regards
Thara

> ---

>   drivers/thermal/qcom/tsens.c | 12 ++++--------

>   1 file changed, 4 insertions(+), 8 deletions(-)

> 

> diff --git a/drivers/thermal/qcom/tsens.c b/drivers/thermal/qcom/tsens.c

> index b37d5fd71f3a..e43898bf3199 100644

> --- a/drivers/thermal/qcom/tsens.c

> +++ b/drivers/thermal/qcom/tsens.c

> @@ -657,7 +657,7 @@ static int dbg_version_show(struct seq_file *s, void *data)

>   			return ret;

>   		seq_printf(s, "%d.%d.%d\n", maj_ver, min_ver, step_ver);

>   	} else {

> -		seq_puts(s, "0.1.0\n");

> +		seq_printf(s, "0.%d.0\n", priv->feat->ver_major);

>   	}

>   

>   	return 0;

> @@ -669,16 +669,12 @@ 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)

> +	if (!debugfs_lookup("version", priv->debug_root))

>   		debugfs_create_file("version", 0444, priv->debug_root,

>   				    pdev, &dbg_version_fops);

>   

>

Patch

diff --git a/drivers/thermal/qcom/tsens.c b/drivers/thermal/qcom/tsens.c
index b37d5fd71f3a..e43898bf3199 100644
--- a/drivers/thermal/qcom/tsens.c
+++ b/drivers/thermal/qcom/tsens.c
@@ -657,7 +657,7 @@  static int dbg_version_show(struct seq_file *s, void *data)
 			return ret;
 		seq_printf(s, "%d.%d.%d\n", maj_ver, min_ver, step_ver);
 	} else {
-		seq_puts(s, "0.1.0\n");
+		seq_printf(s, "0.%d.0\n", priv->feat->ver_major);
 	}
 
 	return 0;
@@ -669,16 +669,12 @@  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)
+	if (!debugfs_lookup("version", priv->debug_root))
 		debugfs_create_file("version", 0444, priv->debug_root,
 				    pdev, &dbg_version_fops);