linux-arm-msm.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v2 0/2] Minor fix for qcom tsens driver
@ 2021-04-29  1:05 Ansuel Smith
  2021-04-29  1:05 ` [thermal-next PATCH v2 1/2] thermal: qcom: tsens: init debugfs only with successful probe Ansuel Smith
  2021-04-29  1:05 ` [thermal-next PATCH v2 2/2] thermal: qcom: tsens: simplify debugfs init function Ansuel Smith
  0 siblings, 2 replies; 5+ messages in thread
From: Ansuel Smith @ 2021-04-29  1:05 UTC (permalink / raw)
  To: Thara Gopinath
  Cc: Ansuel Smith, Andy Gross, Bjorn Andersson, Amit Kucheria,
	Zhang Rui, Daniel Lezcano, linux-arm-msm, linux-pm, linux-kernel

This is a small series to fix some warning arised testing the 8960 tsens
driver. 8960 calibration function can return PROBE_DEFER and cause
reregistration of debugfs. Move debugfs registration deeper in the probe
function and fix a small problem with wrong tsens version reported. 

v2:
- Address review comments from Thara

Ansuel Smith (2):
  thermal: qcom: tsens: init debugfs only with successful probe
  thermal: qcom: tsens: simplify debugfs init function

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

-- 
2.30.2


^ permalink raw reply	[flat|nested] 5+ messages in thread

* [thermal-next PATCH v2 1/2] thermal: qcom: tsens: init debugfs only with successful probe
  2021-04-29  1:05 [PATCH v2 0/2] Minor fix for qcom tsens driver Ansuel Smith
@ 2021-04-29  1:05 ` Ansuel Smith
  2021-05-10 12:41   ` Thara Gopinath
  2021-04-29  1:05 ` [thermal-next PATCH v2 2/2] thermal: qcom: tsens: simplify debugfs init function Ansuel Smith
  1 sibling, 1 reply; 5+ messages in thread
From: Ansuel Smith @ 2021-04-29  1:05 UTC (permalink / raw)
  To: Thara Gopinath
  Cc: Ansuel Smith, Andy Gross, Bjorn Andersson, Amit Kucheria,
	Zhang Rui, Daniel Lezcano, linux-arm-msm, linux-pm, linux-kernel

calibrate and tsens_register can fail or PROBE_DEFER. This will cause a
double or a wrong init of the debugfs information. Init debugfs only
with successful probe fixing warning about directory already present.

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

diff --git a/drivers/thermal/qcom/tsens.c b/drivers/thermal/qcom/tsens.c
index d8ce3a687b80..b37d5fd71f3a 100644
--- a/drivers/thermal/qcom/tsens.c
+++ b/drivers/thermal/qcom/tsens.c
@@ -845,8 +845,6 @@ int __init init_common(struct tsens_priv *priv)
 	if (tsens_version(priv) >= VER_0_1)
 		tsens_enable_irq(priv);
 
-	tsens_debug_init(op);
-
 err_put_device:
 	put_device(&op->dev);
 	return ret;
@@ -1057,7 +1055,12 @@ static int tsens_probe(struct platform_device *pdev)
 		}
 	}
 
-	return tsens_register(priv);
+	ret = tsens_register(priv);
+
+	if (!ret)
+		tsens_debug_init(pdev);
+
+	return ret;
 }
 
 static int tsens_remove(struct platform_device *pdev)
-- 
2.30.2


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [thermal-next PATCH v2 2/2] thermal: qcom: tsens: simplify debugfs init function
  2021-04-29  1:05 [PATCH v2 0/2] Minor fix for qcom tsens driver Ansuel Smith
  2021-04-29  1:05 ` [thermal-next PATCH v2 1/2] thermal: qcom: tsens: init debugfs only with successful probe Ansuel Smith
@ 2021-04-29  1:05 ` Ansuel Smith
  2021-05-10 12:44   ` Thara Gopinath
  1 sibling, 1 reply; 5+ messages in thread
From: Ansuel Smith @ 2021-04-29  1:05 UTC (permalink / raw)
  To: Thara Gopinath
  Cc: Ansuel Smith, Amit Kucheria, Andy Gross, Bjorn Andersson,
	Zhang Rui, Daniel Lezcano, linux-pm, linux-arm-msm, linux-kernel

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(-)

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);
 
-- 
2.30.2


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* Re: [thermal-next PATCH v2 1/2] thermal: qcom: tsens: init debugfs only with successful probe
  2021-04-29  1:05 ` [thermal-next PATCH v2 1/2] thermal: qcom: tsens: init debugfs only with successful probe Ansuel Smith
@ 2021-05-10 12:41   ` Thara Gopinath
  0 siblings, 0 replies; 5+ messages in thread
From: Thara Gopinath @ 2021-05-10 12:41 UTC (permalink / raw)
  To: Ansuel Smith
  Cc: Andy Gross, Bjorn Andersson, Amit Kucheria, Zhang Rui,
	Daniel Lezcano, linux-arm-msm, linux-pm, linux-kernel



On 4/28/21 9:05 PM, Ansuel Smith wrote:
> calibrate and tsens_register can fail or PROBE_DEFER. This will cause a
> double or a wrong init of the debugfs information. Init debugfs only
> with successful probe fixing warning about directory already present.
> 
> Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>

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

-- 
Warm Regards
Thara
> ---
>   drivers/thermal/qcom/tsens.c | 9 ++++++---
>   1 file changed, 6 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/thermal/qcom/tsens.c b/drivers/thermal/qcom/tsens.c
> index d8ce3a687b80..b37d5fd71f3a 100644
> --- a/drivers/thermal/qcom/tsens.c
> +++ b/drivers/thermal/qcom/tsens.c
> @@ -845,8 +845,6 @@ int __init init_common(struct tsens_priv *priv)
>   	if (tsens_version(priv) >= VER_0_1)
>   		tsens_enable_irq(priv);
>   
> -	tsens_debug_init(op);
> -
>   err_put_device:
>   	put_device(&op->dev);
>   	return ret;
> @@ -1057,7 +1055,12 @@ static int tsens_probe(struct platform_device *pdev)
>   		}
>   	}
>   
> -	return tsens_register(priv);
> +	ret = tsens_register(priv);
> +
> +	if (!ret)
> +		tsens_debug_init(pdev);
> +
> +	return ret;
>   }
>   
>   static int tsens_remove(struct platform_device *pdev)
> 


^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [thermal-next PATCH v2 2/2] thermal: qcom: tsens: simplify debugfs init function
  2021-04-29  1:05 ` [thermal-next PATCH v2 2/2] thermal: qcom: tsens: simplify debugfs init function Ansuel Smith
@ 2021-05-10 12:44   ` Thara Gopinath
  0 siblings, 0 replies; 5+ messages in thread
From: Thara Gopinath @ 2021-05-10 12:44 UTC (permalink / raw)
  To: Ansuel Smith
  Cc: Amit Kucheria, Andy Gross, Bjorn Andersson, Zhang Rui,
	Daniel Lezcano, linux-pm, linux-arm-msm, linux-kernel



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);
>   
>

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2021-05-10 13:29 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-29  1:05 [PATCH v2 0/2] Minor fix for qcom tsens driver Ansuel Smith
2021-04-29  1:05 ` [thermal-next PATCH v2 1/2] thermal: qcom: tsens: init debugfs only with successful probe Ansuel Smith
2021-05-10 12:41   ` Thara Gopinath
2021-04-29  1:05 ` [thermal-next PATCH v2 2/2] thermal: qcom: tsens: simplify debugfs init function Ansuel Smith
2021-05-10 12:44   ` Thara Gopinath

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).