ASoC: simple-card: Drop unnecessary "dai-tdm-slot-width-map" property presence check
PATCH 1/1 ASoC: simple-card: Drop unnecessary "dai-tdm-slot-width-map" property presence check
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.
--- sound/soc/generic/simple-card-utils.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
sound/soc/generic/simple-card-utils.c +2 -3
@@ -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 ;
Signature · 1 line
2.45.2
Hi
Quoted 7 lines
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 onof_property_count_elems_of_size()error return if not present.Signed-off-by Rob Herring (Arm) <[email protected]>---
Quoted 20 lines
sound/soc/generic/simple-card-utils.c +2
-3@@ -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 ;Signature · 1 line
2.45.2
Mark Brown
maintainerQuoted 6 lines · Rob Herring (Arm)
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 onof_property_count_elems_of_size()error return if not present.
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/1] ASoC: simple-card: Drop unnecessary "dai-tdm-slot-width-map" property presence check
commit: abea0cbfba5848d11b6364e82df4864fd0bfa683
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark