[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <SA2PR11MB4891262E970A79FCCF3B345597C89@SA2PR11MB4891.namprd11.prod.outlook.com>
Date: Wed, 11 May 2022 06:55:45 +0000
From: "Lu, Brent" <brent.lu@...el.com>
To: Terry Chen <terry_chen@...tron.corp-partner.google.com>,
"alsa-devel@...a-project.org" <alsa-devel@...a-project.org>
CC: "Rojewski, Cezary" <cezary.rojewski@...el.com>,
"pierre-louis.bossart@...ux.intel.com"
<pierre-louis.bossart@...ux.intel.com>,
"liam.r.girdwood@...ux.intel.com" <liam.r.girdwood@...ux.intel.com>,
"yang.jie@...ux.intel.com" <yang.jie@...ux.intel.com>,
"broonie@...nel.org" <broonie@...nel.org>,
"perex@...ex.cz" <perex@...ex.cz>,
"tiwai@...e.com" <tiwai@...e.com>,
"cujomalainey@...omium.org" <cujomalainey@...omium.org>,
"seanpaul@...omium.org" <seanpaul@...omium.org>,
"Bowman, Casey G" <casey.g.bowman@...el.com>,
"mark_hsieh@...tron.corp-partner.google.com"
<mark_hsieh@...tron.corp-partner.google.com>,
"Gopal, Vamshi Krishna" <vamshi.krishna.gopal@...el.com>,
"Chiang, Mac" <mac.chiang@...el.com>,
"kai.vehmanen@...ux.intel.com" <kai.vehmanen@...ux.intel.com>,
"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>
Subject: RE: [PATCH] [v3]FROMLIST: ASoC: Intel: sof_cs42l42: adding support
for ADL configuration and BT offload audio
>
> +static int create_bt_offload_dai_links(struct device *dev,
> + struct snd_soc_dai_link *links,
> + struct snd_soc_dai_link_component
> *cpus,
> + int *id, int ssp_bt)
> +{
> + int ret = 0;
Unused variable, please remove it.
> +
> + /* bt offload */
> + if (!(sof_cs42l42_quirk & SOF_BT_OFFLOAD_PRESENT))
> + return 0;
> +
> + links[*id].name = devm_kasprintf(dev, GFP_KERNEL, "SSP%d-BT",
> + ssp_bt);
> + if (!links[*id].name) {
> + ret = -ENOMEM;
Remove it, too. And also the brackets.
> + goto devm_err;
> + }
> +
> + links[*id].id = *id;
> + links[*id].codecs = dummy_component;
> + links[*id].num_codecs = ARRAY_SIZE(dummy_component);
> + links[*id].platforms = platform_component;
> + links[*id].num_platforms = ARRAY_SIZE(platform_component);
> +
> + links[*id].dpcm_playback = 1;
> + links[*id].dpcm_capture = 1;
> + links[*id].no_pcm = 1;
> + links[*id].cpus = &cpus[*id];
> + links[*id].num_cpus = 1;
> +
> + links[*id].cpus->dai_name = devm_kasprintf(dev, GFP_KERNEL,
> + "SSP%d Pin",
> + ssp_bt);
> + if (!links[*id].cpus->dai_name) {
> + ret = -ENOMEM;
Same here.
> + goto devm_err;
> + }
> +
> + (*id)++;
> +
> + return 0;
> +
> +devm_err:
> + return -ENOMEM;
> +}
> +
> --- a/sound/soc/intel/common/soc-acpi-intel-adl-match.c
> +++ b/sound/soc/intel/common/soc-acpi-intel-adl-match.c
> @@ -384,6 +384,14 @@ struct snd_soc_acpi_mach
> snd_soc_acpi_intel_adl_machines[] = {
> .sof_fw_filename = "sof-adl.ri",
> .sof_tplg_filename = "sof-adl-cs35l41.tplg",
> },
> + {
> + .id = "10134242",
> + .drv_name = "adl_mx98360a_cs4242",
> + .machine_quirk = snd_soc_acpi_codec_list,
> + .quirk_data = &adl_max98360a_amp,
> + .sof_fw_filename = "sof-adl.ri",
I remember that the 'sof_fw_filename' has been removed for a while. Please
apply the patch to the for-next branch on the broonie tree. Build the kernel
and make sure there is no error before sending the patch.
Brent
Powered by blists - more mailing lists