i2c: Use of_property_read_bool() for boolean properties

Message ID 20230310144707.1542595-1-robh@kernel.org
State New
Headers
Series i2c: Use of_property_read_bool() for boolean properties |

Commit Message

Rob Herring March 10, 2023, 2:47 p.m. UTC
  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/i2c/busses/i2c-mpc.c | 2 +-
 drivers/i2c/busses/i2c-pxa.c | 6 ++----
 drivers/i2c/i2c-core-of.c    | 2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)
  

Comments

Chris Packham March 12, 2023, 7:55 p.m. UTC | #1
On 11/03/23 03: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>

For i2c-mpc.c

Reviewed-by: Chris Packham <chris.packham@alliedtelesis.co.nz>

> ---
>   drivers/i2c/busses/i2c-mpc.c | 2 +-
>   drivers/i2c/busses/i2c-pxa.c | 6 ++----
>   drivers/i2c/i2c-core-of.c    | 2 +-
>   3 files changed, 4 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/i2c/busses/i2c-mpc.c b/drivers/i2c/busses/i2c-mpc.c
> index 81ac92bb4f6f..bec0c5dc20d1 100644
> --- a/drivers/i2c/busses/i2c-mpc.c
> +++ b/drivers/i2c/busses/i2c-mpc.c
> @@ -842,7 +842,7 @@ static int fsl_i2c_probe(struct platform_device *op)
>   		data->setup(op->dev.of_node, i2c, clock);
>   	} else {
>   		/* Backwards compatibility */
> -		if (of_get_property(op->dev.of_node, "dfsrr", NULL))
> +		if (of_property_read_bool(op->dev.of_node, "dfsrr"))
>   			mpc_i2c_setup_8xxx(op->dev.of_node, i2c, clock);
>   	}
>   
> diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c
> index b605b6e43cb9..f9fa5308556b 100644
> --- a/drivers/i2c/busses/i2c-pxa.c
> +++ b/drivers/i2c/busses/i2c-pxa.c
> @@ -1261,10 +1261,8 @@ static int i2c_pxa_probe_dt(struct platform_device *pdev, struct pxa_i2c *i2c,
>   	/* For device tree we always use the dynamic or alias-assigned ID */
>   	i2c->http://scanmail.trustwave.com/?c=20988&d=-cKL5Dh8QMK0P2KPUMhJxUWIHGxrwEz2ggUtInY_JA&u=http%3a%2f%2fadap%2enr = -1;
>   
> -	if (of_get_property(np, "mrvl,i2c-polling", NULL))
> -		i2c->use_pio = 1;
> -	if (of_get_property(np, "mrvl,i2c-fast-mode", NULL))
> -		i2c->fast_mode = 1;
> +	i2c->use_pio = of_property_read_bool(np, "mrvl,i2c-polling");
> +	i2c->fast_mode = of_property_read_bool(np, "mrvl,i2c-fast-mode");
>   
>   	*i2c_types = (enum pxa_i2c_types)(of_id->data);
>   
> diff --git a/drivers/i2c/i2c-core-of.c b/drivers/i2c/i2c-core-of.c
> index bce6b796e04c..aa93467784c2 100644
> --- a/drivers/i2c/i2c-core-of.c
> +++ b/drivers/i2c/i2c-core-of.c
> @@ -55,7 +55,7 @@ int of_i2c_get_board_info(struct device *dev, struct device_node *node,
>   	if (of_property_read_bool(node, "host-notify"))
>   		info->flags |= I2C_CLIENT_HOST_NOTIFY;
>   
> -	if (of_get_property(node, "wakeup-source", NULL))
> +	if (of_property_read_bool(node, "wakeup-source"))
>   		info->flags |= I2C_CLIENT_WAKE;
>   
>   	return 0;
  
Wolfram Sang March 16, 2023, 7:20 p.m. UTC | #2
On Fri, Mar 10, 2023 at 08:47:07AM -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>

Applied to for-next, thanks!
  

Patch

diff --git a/drivers/i2c/busses/i2c-mpc.c b/drivers/i2c/busses/i2c-mpc.c
index 81ac92bb4f6f..bec0c5dc20d1 100644
--- a/drivers/i2c/busses/i2c-mpc.c
+++ b/drivers/i2c/busses/i2c-mpc.c
@@ -842,7 +842,7 @@  static int fsl_i2c_probe(struct platform_device *op)
 		data->setup(op->dev.of_node, i2c, clock);
 	} else {
 		/* Backwards compatibility */
-		if (of_get_property(op->dev.of_node, "dfsrr", NULL))
+		if (of_property_read_bool(op->dev.of_node, "dfsrr"))
 			mpc_i2c_setup_8xxx(op->dev.of_node, i2c, clock);
 	}
 
diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c
index b605b6e43cb9..f9fa5308556b 100644
--- a/drivers/i2c/busses/i2c-pxa.c
+++ b/drivers/i2c/busses/i2c-pxa.c
@@ -1261,10 +1261,8 @@  static int i2c_pxa_probe_dt(struct platform_device *pdev, struct pxa_i2c *i2c,
 	/* For device tree we always use the dynamic or alias-assigned ID */
 	i2c->adap.nr = -1;
 
-	if (of_get_property(np, "mrvl,i2c-polling", NULL))
-		i2c->use_pio = 1;
-	if (of_get_property(np, "mrvl,i2c-fast-mode", NULL))
-		i2c->fast_mode = 1;
+	i2c->use_pio = of_property_read_bool(np, "mrvl,i2c-polling");
+	i2c->fast_mode = of_property_read_bool(np, "mrvl,i2c-fast-mode");
 
 	*i2c_types = (enum pxa_i2c_types)(of_id->data);
 
diff --git a/drivers/i2c/i2c-core-of.c b/drivers/i2c/i2c-core-of.c
index bce6b796e04c..aa93467784c2 100644
--- a/drivers/i2c/i2c-core-of.c
+++ b/drivers/i2c/i2c-core-of.c
@@ -55,7 +55,7 @@  int of_i2c_get_board_info(struct device *dev, struct device_node *node,
 	if (of_property_read_bool(node, "host-notify"))
 		info->flags |= I2C_CLIENT_HOST_NOTIFY;
 
-	if (of_get_property(node, "wakeup-source", NULL))
+	if (of_property_read_bool(node, "wakeup-source"))
 		info->flags |= I2C_CLIENT_WAKE;
 
 	return 0;