diff mbox series

[10/11] ASoC: Intel: avs: rt5682: Add define for codec DAI name

Message ID 20221125184032.2565979-11-cezary.rojewski@intel.com (mailing list archive)
State New, archived
Headers show
Series ASoC: Intel: avs: Refactor jack handling | expand

Commit Message

Cezary Rojewski Nov. 25, 2022, 6:40 p.m. UTC 
From: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>

Following commits will make use of it to find codec DAI, define it
first.

Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com>
---
 sound/soc/intel/avs/boards/rt5682.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Comments

Mark Brown Nov. 29, 2022, 4:24 p.m. UTC | #1 
On Fri, Nov 25, 2022 at 07:40:31PM +0100, Cezary Rojewski wrote:
> From: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
> 
> Following commits will make use of it to find codec DAI, define it
> first.

This breaks an x86 allmodconfig build:

/build/stage/linux/sound/soc/intel/avs/boards/rt5682.c: In function ‘avs_create_dai_link’:
/build/stage/linux/sound/soc/intel/avs/boards/rt5682.c:198:20: error: ‘avs_rt5682_codec_exit’ undeclared (first use in this function); did you mean ‘avs_rt5682_codec_init’?
  198 |         dl->exit = avs_rt5682_codec_exit;
      |                    ^~~~~~~~~~~~~~~~~~~~~
      |                    avs_rt5682_codec_init

and looks out of place in this commit, it at least deserves calling out
in the commit log?
Amadeusz Sławiński Nov. 29, 2022, 4:31 p.m. UTC | #2 
On 11/29/2022 5:24 PM, Mark Brown wrote:
> On Fri, Nov 25, 2022 at 07:40:31PM +0100, Cezary Rojewski wrote:
>> From: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
>>
>> Following commits will make use of it to find codec DAI, define it
>> first.
> 
> This breaks an x86 allmodconfig build:
> 
> /build/stage/linux/sound/soc/intel/avs/boards/rt5682.c: In function ‘avs_create_dai_link’:
> /build/stage/linux/sound/soc/intel/avs/boards/rt5682.c:198:20: error: ‘avs_rt5682_codec_exit’ undeclared (first use in this function); did you mean ‘avs_rt5682_codec_init’?
>    198 |         dl->exit = avs_rt5682_codec_exit;
>        |                    ^~~~~~~~~~~~~~~~~~~~~
>        |                    avs_rt5682_codec_init
> 
> and looks out of place in this commit, it at least deserves calling out
> in the commit log?

Oops.. that seems like patch split gone wrong, it is added in following 
commit. Other patches add dl->exit in the "second" patch, so this chunk 
should be part of patch 11, instead of this one.
diff mbox series

Patch

diff --git a/sound/soc/intel/avs/boards/rt5682.c b/sound/soc/intel/avs/boards/rt5682.c
index 01f9b9f0c12b..7f9edf4cbd04 100644
--- a/sound/soc/intel/avs/boards/rt5682.c
+++ b/sound/soc/intel/avs/boards/rt5682.c
@@ -26,6 +26,7 @@ 
 #define AVS_RT5682_SSP_CODEC_MASK	(GENMASK(2, 0))
 #define AVS_RT5682_MCLK_EN		BIT(3)
 #define AVS_RT5682_MCLK_24MHZ		BIT(4)
+#define AVS_RT5682_CODEC_DAI_NAME	"rt5682-aif1"
 
 /* Default: MCLK on, MCLK 19.2M, SSP0 */
 static unsigned long avs_rt5682_quirk = AVS_RT5682_MCLK_EN | AVS_RT5682_SSP_CODEC(0);
@@ -184,7 +185,7 @@  static int avs_create_dai_link(struct device *dev, const char *platform_name, in
 
 	dl->cpus->dai_name = devm_kasprintf(dev, GFP_KERNEL, "SSP%d Pin", ssp_port);
 	dl->codecs->name = devm_kasprintf(dev, GFP_KERNEL, "i2c-10EC5682:00");
-	dl->codecs->dai_name = devm_kasprintf(dev, GFP_KERNEL, "rt5682-aif1");
+	dl->codecs->dai_name = devm_kasprintf(dev, GFP_KERNEL, AVS_RT5682_CODEC_DAI_NAME);
 	if (!dl->cpus->dai_name || !dl->codecs->name || !dl->codecs->dai_name)
 		return -ENOMEM;
 
@@ -194,6 +195,7 @@  static int avs_create_dai_link(struct device *dev, const char *platform_name, in
 	dl->num_platforms = 1;
 	dl->id = 0;
 	dl->init = avs_rt5682_codec_init;
+	dl->exit = avs_rt5682_codec_exit;
 	dl->ops = &avs_rt5682_ops;
 	dl->nonatomic = 1;
 	dl->no_pcm = 1;