nfc: mrvl: Use of_property_read_bool() for boolean properties

[PATCH] nfc: mrvl: Use of_property_read_bool() for boolean properties

Posted by Rob Herring 3 years, 1 month ago

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.
Convert reading boolean properties to to of_property_read_bool().

Signed-off-by: Rob Herring <robh@kernel.org>
---
 drivers/nfc/nfcmrvl/i2c.c  |  2 +-
 drivers/nfc/nfcmrvl/main.c |  6 +-----
 drivers/nfc/nfcmrvl/uart.c | 11 ++---------
 3 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/drivers/nfc/nfcmrvl/i2c.c b/drivers/nfc/nfcmrvl/i2c.c
index e74342b0b728..164e2ab859fd 100644
--- a/drivers/nfc/nfcmrvl/i2c.c
+++ b/drivers/nfc/nfcmrvl/i2c.c
@@ -168,7 +168,7 @@ static int nfcmrvl_i2c_parse_dt(struct device_node *node,
 		return ret;
 	}
 
-	if (of_find_property(node, "i2c-int-falling", NULL))
+	if (of_property_read_bool(node, "i2c-int-falling"))
 		pdata->irq_polarity = IRQF_TRIGGER_FALLING;
 	else
 		pdata->irq_polarity = IRQF_TRIGGER_RISING;
diff --git a/drivers/nfc/nfcmrvl/main.c b/drivers/nfc/nfcmrvl/main.c
index 1a5284de4341..141bc4b66dcb 100644
--- a/drivers/nfc/nfcmrvl/main.c
+++ b/drivers/nfc/nfcmrvl/main.c
@@ -261,11 +261,7 @@ int nfcmrvl_parse_dt(struct device_node *node,
 		return reset_n_io;
 	}
 	pdata->reset_n_io = reset_n_io;
-
-	if (of_find_property(node, "hci-muxed", NULL))
-		pdata->hci_muxed = 1;
-	else
-		pdata->hci_muxed = 0;
+	pdata->hci_muxed = of_property_read_bool(node, "hci-muxed");
 
 	return 0;
 }
diff --git a/drivers/nfc/nfcmrvl/uart.c b/drivers/nfc/nfcmrvl/uart.c
index 9c92cbdc42f0..956ae92f7573 100644
--- a/drivers/nfc/nfcmrvl/uart.c
+++ b/drivers/nfc/nfcmrvl/uart.c
@@ -76,15 +76,8 @@ static int nfcmrvl_uart_parse_dt(struct device_node *node,
 		return ret;
 	}
 
-	if (of_find_property(matched_node, "flow-control", NULL))
-		pdata->flow_control = 1;
-	else
-		pdata->flow_control = 0;
-
-	if (of_find_property(matched_node, "break-control", NULL))
-		pdata->break_control = 1;
-	else
-		pdata->break_control = 0;
+	pdata->flow_control = of_property_read_bool(matched_node, "flow-control");
+	pdata->break_control = of_property_read_bool(matched_node, "break-control");
 
 	of_node_put(matched_node);
 
-- 
2.39.2

Re: [PATCH] nfc: mrvl: Use of_property_read_bool() for boolean properties

Posted by Krzysztof Kozlowski 3 years ago

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.
> Convert reading boolean properties to to of_property_read_bool().
> 
> Signed-off-by: Rob Herring <robh@kernel.org>
> ---

Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>

Best regards,
Krzysztof

Re: [PATCH] nfc: mrvl: Use of_property_read_bool() for boolean properties

Posted by Simon Horman 3 years, 1 month ago

On Fri, Mar 10, 2023 at 08:47:18AM -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.
> Convert reading boolean properties to to of_property_read_bool().
> 
> Signed-off-by: Rob Herring <robh@kernel.org>

Reviewed-by: Simon Horman <simon.horman@corigine.com>

> ---
>  drivers/nfc/nfcmrvl/i2c.c  |  2 +-
>  drivers/nfc/nfcmrvl/main.c |  6 +-----
>  drivers/nfc/nfcmrvl/uart.c | 11 ++---------
>  3 files changed, 4 insertions(+), 15 deletions(-)

...

> diff --git a/drivers/nfc/nfcmrvl/main.c b/drivers/nfc/nfcmrvl/main.c
> index 1a5284de4341..141bc4b66dcb 100644
> --- a/drivers/nfc/nfcmrvl/main.c
> +++ b/drivers/nfc/nfcmrvl/main.c
> @@ -261,11 +261,7 @@ int nfcmrvl_parse_dt(struct device_node *node,
>  		return reset_n_io;
>  	}
>  	pdata->reset_n_io = reset_n_io;
> -
> -	if (of_find_property(node, "hci-muxed", NULL))
> -		pdata->hci_muxed = 1;
> -	else
> -		pdata->hci_muxed = 0;
> +	pdata->hci_muxed = of_property_read_bool(node, "hci-muxed");

FWIIW, I'm not entirely excited by assigning a bool value
to an integer variable. But I guess that is a challenge for another day.

>  
>  	return 0;
>  }
> diff --git a/drivers/nfc/nfcmrvl/uart.c b/drivers/nfc/nfcmrvl/uart.c
> index 9c92cbdc42f0..956ae92f7573 100644
> --- a/drivers/nfc/nfcmrvl/uart.c
> +++ b/drivers/nfc/nfcmrvl/uart.c
> @@ -76,15 +76,8 @@ static int nfcmrvl_uart_parse_dt(struct device_node *node,
>  		return ret;
>  	}
>  
> -	if (of_find_property(matched_node, "flow-control", NULL))
> -		pdata->flow_control = 1;
> -	else
> -		pdata->flow_control = 0;
> -
> -	if (of_find_property(matched_node, "break-control", NULL))
> -		pdata->break_control = 1;
> -	else
> -		pdata->break_control = 0;
> +	pdata->flow_control = of_property_read_bool(matched_node, "flow-control");
> +	pdata->break_control = of_property_read_bool(matched_node, "break-control");

Likewise, here.

>  	of_node_put(matched_node);
>  
> -- 
> 2.39.2
>