diff mbox series

ASoC: simple-card: Drop unnecessary "dai-tdm-slot-width-map" property presence check

Message ID 20250109182202.3971965-2-robh@kernel.org (mailing list archive)
State New
Headers show
Series ASoC: simple-card: Drop unnecessary "dai-tdm-slot-width-map" property presence check | expand

Commit Message

Rob Herring Jan. 9, 2025, 6:22 p.m. UTC
It doesn't matter whether "dai-tdm-slot-width-map" is not present or
there is some other issue parsing it in of_property_count_elems_of_size()
causing an error. Drop the presence check and rely on
of_property_count_elems_of_size() error return if not present.

Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
---
 sound/soc/generic/simple-card-utils.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Comments

Kuninori Morimoto Jan. 9, 2025, 10:52 p.m. UTC | #1
Hi

> It doesn't matter whether "dai-tdm-slot-width-map" is not present or
> there is some other issue parsing it in of_property_count_elems_of_size()
> causing an error. Drop the presence check and rely on
> of_property_count_elems_of_size() error return if not present.
> 
> Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
> ---

Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>


> diff --git a/sound/soc/generic/simple-card-utils.c b/sound/soc/generic/simple-card-utils.c
> index 91325286894e..e25b387a9776 100644
> --- a/sound/soc/generic/simple-card-utils.c
> +++ b/sound/soc/generic/simple-card-utils.c
> @@ -139,10 +139,9 @@ int simple_util_parse_tdm_width_map(struct device *dev, struct device_node *np,
>  	int n, i, ret;
>  	u32 *p;
>  
> -	if (!of_property_read_bool(np, "dai-tdm-slot-width-map"))
> -		return 0;
> -
>  	n = of_property_count_elems_of_size(np, "dai-tdm-slot-width-map", sizeof(u32));
> +	if (n <= 0)
> +		return 0;
>  	if (n % 3) {
>  		dev_err(dev, "Invalid number of cells for dai-tdm-slot-width-map\n");
>  		return -EINVAL;
> -- 
> 2.45.2
>
diff mbox series

Patch

diff --git a/sound/soc/generic/simple-card-utils.c b/sound/soc/generic/simple-card-utils.c
index 91325286894e..e25b387a9776 100644
--- a/sound/soc/generic/simple-card-utils.c
+++ b/sound/soc/generic/simple-card-utils.c
@@ -139,10 +139,9 @@  int simple_util_parse_tdm_width_map(struct device *dev, struct device_node *np,
 	int n, i, ret;
 	u32 *p;
 
-	if (!of_property_read_bool(np, "dai-tdm-slot-width-map"))
-		return 0;
-
 	n = of_property_count_elems_of_size(np, "dai-tdm-slot-width-map", sizeof(u32));
+	if (n <= 0)
+		return 0;
 	if (n % 3) {
 		dev_err(dev, "Invalid number of cells for dai-tdm-slot-width-map\n");
 		return -EINVAL;