Re: [alsa-devel] [PATCH] ASoC: Intel: bytcr_5640.c:Refactored if statement and removed buffer

From: Pierre-Louis Bossart
Date: Mon May 20 2019 - 09:52:54 EST



On 5/20/19 3:37 AM, Hans de Goede wrote:
Hi all,

On 19-05-19 19:57, nariman wrote:
From: Nariman Etemadi <narimantos@xxxxxxxxx>

in function snd_byt_rt5640_mc_probe and removed buffer yt_rt5640_codec_aif_name & byt_rt5640_cpu_dai_name

Signed-off-by: Nariman Etemadi <narimantos@xxxxxxxxx>

Series (all 4 patches) look good to me:

Reviewed-by: Hans de Goede <hdegoede@xxxxxxxxxx>

Thanks for the update (I believe it's the v2, yes?)

the code is fine but can be polished to fix a couple of
alignment issues

+ bits = 16;
} else {

and checkpatch.pl --strict is quite verbose here. Some reports look like false-alarms but the commit message should be wrapped and alignement fixed.

---------------------------------------------------------
0001-ASoC-Intel-bytcr_5640.c-refactored-codec_fixup.patch
---------------------------------------------------------
CHECK: Alignment should match open parenthesis
#86: FILE: sound/soc/intel/boards/bytcr_rt5640.c:980:
+ ret = snd_soc_dai_set_fmt(rtd->cpu_dai,
+ SND_SOC_DAIFMT_I2S |

total: 0 errors, 0 warnings, 1 checks, 82 lines checked

NOTE: For some of the reported defects, checkpatch may be able to
mechanically convert to the typical style using --fix or --fix-inplace.

0001-ASoC-Intel-bytcr_5640.c-refactored-codec_fixup.patch has style problems, please review.
---------------------------------------------------------------
0002-ASoC-Intel-bytcr_5640.c-Refactored-if-statement-and-.patch
---------------------------------------------------------------
WARNING: Possible unwrapped commit description (prefer a maximum 75 chars per line)
#7:
in function snd_byt_rt5640_mc_probe and removed buffer yt_rt5640_codec_aif_name & byt_rt5640_cpu_dai_name

total: 0 errors, 1 warnings, 0 checks, 40 lines checked

NOTE: For some of the reported defects, checkpatch may be able to
mechanically convert to the typical style using --fix or --fix-inplace.

0002-ASoC-Intel-bytcr_5640.c-Refactored-if-statement-and-.patch has style problems, please review.
---------------------------------------------------------------
0003-ASoC-Intel-bytcr_rt5651.c-remove-string-buffers-byt_.patch
---------------------------------------------------------------
WARNING: Possible unwrapped commit description (prefer a maximum 75 chars per line)
#7:
The snprintf calls filling byt_rt5651_cpu_dai_name / byt_rt5651_cpu_dai_name always fill them with the same string (ssp0-port" resp "rt5651-aif2"). So instead of keeping these buffers around and making the cpu_dai_name / codec_dai_name point to this, simply update the foo_dai_name pointers to directly point to a string constant containing the desired string.

total: 0 errors, 1 warnings, 0 checks, 38 lines checked

NOTE: For some of the reported defects, checkpatch may be able to
mechanically convert to the typical style using --fix or --fix-inplace.

0003-ASoC-Intel-bytcr_rt5651.c-remove-string-buffers-byt_.patch has style problems, please review.
---------------------------------------------------------------
0004-ASoC-Intel-cht_bsw_rt5645.c-Remove-buffer-and-snprin.patch
---------------------------------------------------------------
WARNING: Possible unwrapped commit description (prefer a maximum 75 chars per line)
#7:
The snprintf calls filling cht_rt5645_cpu_dai_name / cht_rt5645_codec_aif_name

WARNING: suspect code indent for conditional statements (8, 24)
#35: FILE: sound/soc/intel/boards/cht_bsw_rt5645.c:642:
if ((cht_rt5645_quirk & CHT_RT5645_SSP2_AIF2) ||
[...]
+ cht_dailink[dai_index].codec_dai_name = "rt5645-aif2";

WARNING: suspect code indent for conditional statements (8, 24)
#49: FILE: sound/soc/intel/boards/cht_bsw_rt5645.c:646:
if ((cht_rt5645_quirk & CHT_RT5645_SSP0_AIF1) ||
[...]
+ cht_dailink[dai_index].cpu_dai_name = "ssp0-port";

total: 0 errors, 3 warnings, 0 checks, 40 lines checked

NOTE: For some of the reported defects, checkpatch may be able to
mechanically convert to the typical style using --fix or --fix-inplace.

0004-ASoC-Intel-cht_bsw_rt5645.c-Remove-buffer-and-snprin.patch has style problems, please review.




Regards,

Hans


---
 sound/soc/intel/boards/bytcr_rt5640.c | 26 ++++----------------------
 1 file changed, 4 insertions(+), 22 deletions(-)

diff --git a/sound/soc/intel/boards/bytcr_rt5640.c b/sound/soc/intel/boards/bytcr_rt5640.c
index 940eb27158da..0d91642ca287 100644
--- a/sound/soc/intel/boards/bytcr_rt5640.c
+++ b/sound/soc/intel/boards/bytcr_rt5640.c
@@ -1075,8 +1075,6 @@ static struct snd_soc_dai_link byt_rt5640_dais[] = {
 /* SoC card */
 static char byt_rt5640_codec_name[SND_ACPI_I2C_ID_LEN];
-static char byt_rt5640_codec_aif_name[12]; /*Â = "rt5640-aif[1|2]" */
-static char byt_rt5640_cpu_dai_name[10]; /*Â = "ssp[0|2]-port" */
 static char byt_rt5640_long_name[40]; /* = "bytcr-rt5640-*-spk-*-mic" */
 static int byt_rt5640_suspend(struct snd_soc_card *card)
@@ -1268,28 +1266,12 @@ static int snd_byt_rt5640_mc_probe(struct platform_device *pdev)
ÂÂÂÂÂ log_quirks(&pdev->dev);
ÂÂÂÂÂ if ((byt_rt5640_quirk & BYT_RT5640_SSP2_AIF2) ||
-ÂÂÂÂÂÂÂ (byt_rt5640_quirk & BYT_RT5640_SSP0_AIF2)) {
-
-ÂÂÂÂÂÂÂ /* fixup codec aif name */
-ÂÂÂÂÂÂÂ snprintf(byt_rt5640_codec_aif_name,
-ÂÂÂÂÂÂÂÂÂÂÂ sizeof(byt_rt5640_codec_aif_name),
-ÂÂÂÂÂÂÂÂÂÂÂ "%s", "rt5640-aif2");
-
-ÂÂÂÂÂÂÂ byt_rt5640_dais[dai_index].codec_dai_name =
-ÂÂÂÂÂÂÂÂÂÂÂ byt_rt5640_codec_aif_name;
-ÂÂÂ }
+ÂÂÂÂÂÂÂ (byt_rt5640_quirk & BYT_RT5640_SSP0_AIF2))
+ÂÂÂÂÂÂÂ byt_rt5640_dais[dai_index].codec_dai_name = "rt5640-aif2";
ÂÂÂÂÂ if ((byt_rt5640_quirk & BYT_RT5640_SSP0_AIF1) ||
-ÂÂÂÂÂÂÂ (byt_rt5640_quirk & BYT_RT5640_SSP0_AIF2)) {
-
-ÂÂÂÂÂÂÂ /* fixup cpu dai name name */
-ÂÂÂÂÂÂÂ snprintf(byt_rt5640_cpu_dai_name,
-ÂÂÂÂÂÂÂÂÂÂÂ sizeof(byt_rt5640_cpu_dai_name),
-ÂÂÂÂÂÂÂÂÂÂÂ "%s", "ssp0-port");
-
-ÂÂÂÂÂÂÂ byt_rt5640_dais[dai_index].cpu_dai_name =
-ÂÂÂÂÂÂÂÂÂÂÂ byt_rt5640_cpu_dai_name;
-ÂÂÂ }
+ÂÂÂÂÂÂÂ (byt_rt5640_quirk & BYT_RT5640_SSP0_AIF2))
+ÂÂÂÂÂÂÂ byt_rt5640_dais[dai_index].cpu_dai_name = "ssp0-port";
ÂÂÂÂÂ if (byt_rt5640_quirk & BYT_RT5640_MCLK_EN) {
ÂÂÂÂÂÂÂÂÂ priv->mclk = devm_clk_get(&pdev->dev, "pmc_plt_clk_3");

_______________________________________________
Alsa-devel mailing list
Alsa-devel@xxxxxxxxxxxxxxxx
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel