2023-03-10 15:02:01

by Rob Herring (Arm)

[permalink] [raw]
Subject: [PATCH] soc: qcom: Use of_property_present() for testing DT property presence

It is preferred to use typed property access functions (i.e.
of_property_read_<type> functions) rather than low-level
of_get_property/of_find_property functions for reading properties. As
part of this, convert of_get_property/of_find_property calls to the
recently added of_property_present() helper when we just want to test
for presence of a property and nothing more.

Signed-off-by: Rob Herring <[email protected]>
---
drivers/soc/qcom/qcom_aoss.c | 2 +-
drivers/soc/qcom/smem.c | 2 +-
drivers/soc/qcom/smsm.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/soc/qcom/qcom_aoss.c b/drivers/soc/qcom/qcom_aoss.c
index 18c856056475..e376c32cc16e 100644
--- a/drivers/soc/qcom/qcom_aoss.c
+++ b/drivers/soc/qcom/qcom_aoss.c
@@ -395,7 +395,7 @@ static int qmp_cooling_devices_register(struct qmp *qmp)
return -ENOMEM;

for_each_available_child_of_node(np, child) {
- if (!of_find_property(child, "#cooling-cells", NULL))
+ if (!of_property_present(child, "#cooling-cells"))
continue;
ret = qmp_cooling_device_add(qmp, &qmp->cooling_devs[count++],
child);
diff --git a/drivers/soc/qcom/smem.c b/drivers/soc/qcom/smem.c
index 4f163d62942c..25f5925a8d51 100644
--- a/drivers/soc/qcom/smem.c
+++ b/drivers/soc/qcom/smem.c
@@ -1045,7 +1045,7 @@ static int qcom_smem_probe(struct platform_device *pdev)
int i;

num_regions = 1;
- if (of_find_property(pdev->dev.of_node, "qcom,rpm-msg-ram", NULL))
+ if (of_property_present(pdev->dev.of_node, "qcom,rpm-msg-ram"))
num_regions++;

array_size = num_regions * sizeof(struct smem_region);
diff --git a/drivers/soc/qcom/smsm.c b/drivers/soc/qcom/smsm.c
index 3e8994d6110e..8c137dff7dac 100644
--- a/drivers/soc/qcom/smsm.c
+++ b/drivers/soc/qcom/smsm.c
@@ -510,7 +510,7 @@ static int qcom_smsm_probe(struct platform_device *pdev)
return -ENOMEM;

for_each_child_of_node(pdev->dev.of_node, local_node) {
- if (of_find_property(local_node, "#qcom,smem-state-cells", NULL))
+ if (of_property_present(local_node, "#qcom,smem-state-cells"))
break;
}
if (!local_node) {
--
2.39.2



2023-03-11 12:44:18

by Konrad Dybcio

[permalink] [raw]
Subject: Re: [PATCH] soc: qcom: Use of_property_present() for testing DT property presence



On 10.03.2023 15:47, Rob Herring wrote:
> It is preferred to use typed property access functions (i.e.
> of_property_read_<type> functions) rather than low-level
> of_get_property/of_find_property functions for reading properties. As
> part of this, convert of_get_property/of_find_property calls to the
> recently added of_property_present() helper when we just want to test
> for presence of a property and nothing more.
>
> Signed-off-by: Rob Herring <[email protected]>
> ---
Reviewed-by: Konrad Dybcio <[email protected]>

Konrad
> drivers/soc/qcom/qcom_aoss.c | 2 +-
> drivers/soc/qcom/smem.c | 2 +-
> drivers/soc/qcom/smsm.c | 2 +-
> 3 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/soc/qcom/qcom_aoss.c b/drivers/soc/qcom/qcom_aoss.c
> index 18c856056475..e376c32cc16e 100644
> --- a/drivers/soc/qcom/qcom_aoss.c
> +++ b/drivers/soc/qcom/qcom_aoss.c
> @@ -395,7 +395,7 @@ static int qmp_cooling_devices_register(struct qmp *qmp)
> return -ENOMEM;
>
> for_each_available_child_of_node(np, child) {
> - if (!of_find_property(child, "#cooling-cells", NULL))
> + if (!of_property_present(child, "#cooling-cells"))
> continue;
> ret = qmp_cooling_device_add(qmp, &qmp->cooling_devs[count++],
> child);
> diff --git a/drivers/soc/qcom/smem.c b/drivers/soc/qcom/smem.c
> index 4f163d62942c..25f5925a8d51 100644
> --- a/drivers/soc/qcom/smem.c
> +++ b/drivers/soc/qcom/smem.c
> @@ -1045,7 +1045,7 @@ static int qcom_smem_probe(struct platform_device *pdev)
> int i;
>
> num_regions = 1;
> - if (of_find_property(pdev->dev.of_node, "qcom,rpm-msg-ram", NULL))
> + if (of_property_present(pdev->dev.of_node, "qcom,rpm-msg-ram"))
> num_regions++;
>
> array_size = num_regions * sizeof(struct smem_region);
> diff --git a/drivers/soc/qcom/smsm.c b/drivers/soc/qcom/smsm.c
> index 3e8994d6110e..8c137dff7dac 100644
> --- a/drivers/soc/qcom/smsm.c
> +++ b/drivers/soc/qcom/smsm.c
> @@ -510,7 +510,7 @@ static int qcom_smsm_probe(struct platform_device *pdev)
> return -ENOMEM;
>
> for_each_child_of_node(pdev->dev.of_node, local_node) {
> - if (of_find_property(local_node, "#qcom,smem-state-cells", NULL))
> + if (of_property_present(local_node, "#qcom,smem-state-cells"))
> break;
> }
> if (!local_node) {

2023-03-15 23:37:30

by Bjorn Andersson

[permalink] [raw]
Subject: Re: [PATCH] soc: qcom: Use of_property_present() for testing DT property presence

On Fri, 10 Mar 2023 08:47:24 -0600, Rob Herring wrote:
> It is preferred to use typed property access functions (i.e.
> of_property_read_<type> functions) rather than low-level
> of_get_property/of_find_property functions for reading properties. As
> part of this, convert of_get_property/of_find_property calls to the
> recently added of_property_present() helper when we just want to test
> for presence of a property and nothing more.
>
> [...]

Applied, thanks!

[1/1] soc: qcom: Use of_property_present() for testing DT property presence
commit: 4a1b9f4eb122f3e36fdfe62dce96091d3e45132f

Best regards,
--
Bjorn Andersson <[email protected]>