ASoC: soc-dai.h: Align the word of comment for SND_SOC_DAIFMT_CBC_CFC

Message ID 8735usc1gr.wl-kuninori.morimoto.gx@renesas.com
State Accepted
Commit 47c1131633ef6210add63b8b5704497023a3462a
Headers show
Series
  • ASoC: soc-dai.h: Align the word of comment for SND_SOC_DAIFMT_CBC_CFC
Related show

Commit Message

Kuninori Morimoto May 11, 2021, 11:09 p.m.
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

Let's use "consumer" instead of "follower".

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
Mark

I think this is just typo.

 include/sound/soc-dai.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Pierre-Louis Bossart May 11, 2021, 11:59 p.m. | #1
On 5/11/21 6:09 PM, Kuninori Morimoto wrote:
> From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> 
> Let's use "consumer" instead of "follower".
> 
> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> ---
> Mark
> 
> I think this is just typo.

yes, it's my mistake. This was changed in 'ASoC: topology: use inclusive 
language for bclk and fsync', the first version used frame follower and 
this line was somehow not updated. Thanks for spotting this!

Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>


> 
>   include/sound/soc-dai.h | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h
> index 1358a0ceb4d0..0bc29c4516e7 100644
> --- a/include/sound/soc-dai.h
> +++ b/include/sound/soc-dai.h
> @@ -81,7 +81,7 @@ struct snd_compr_stream;
>   #define SND_SOC_DAIFMT_CBP_CFP		(1 << 12) /* codec clk provider & frame provider */
>   #define SND_SOC_DAIFMT_CBC_CFP		(2 << 12) /* codec clk consumer & frame provider */
>   #define SND_SOC_DAIFMT_CBP_CFC		(3 << 12) /* codec clk provider & frame consumer */
> -#define SND_SOC_DAIFMT_CBC_CFC		(4 << 12) /* codec clk consumer & frame follower */
> +#define SND_SOC_DAIFMT_CBC_CFC		(4 << 12) /* codec clk consumer & frame consumer */
>   
>   /* previous definitions kept for backwards-compatibility, do not use in new contributions */
>   #define SND_SOC_DAIFMT_CBM_CFM		SND_SOC_DAIFMT_CBP_CFP
>
Kuninori Morimoto May 12, 2021, 5:42 a.m. | #2
Hi Mark, Pierre-Louis

> > From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> > 
> > Let's use "consumer" instead of "follower".
> > 
> > Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> > ---
> > Mark
> > 
> > I think this is just typo.
> 
> yes, it's my mistake. This was changed in 'ASoC: topology: use
> inclusive language for bclk and fsync', the first version used frame
> follower and this line was somehow not updated. Thanks for spotting
> this!
> 
> Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>

Thanks.
Maybe we want to have Fixes tab, too.

	Fixes: f026c123001bcc ("ASoC: topology: use inclusive language for bclk and fsync")
	Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>

Thank you for your help !!

Best regards
---
Kuninori Morimoto
Mark Brown May 12, 2021, 5:04 p.m. | #3
On 12 May 2021 08:09:08 +0900, Kuninori Morimoto wrote:
> Let's use "consumer" instead of "follower".

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next

Thanks!

[1/1] ASoC: soc-dai.h: Align the word of comment for SND_SOC_DAIFMT_CBC_CFC
      commit: 47c1131633ef6210add63b8b5704497023a3462a

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

Patch

diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h
index 1358a0ceb4d0..0bc29c4516e7 100644
--- a/include/sound/soc-dai.h
+++ b/include/sound/soc-dai.h
@@ -81,7 +81,7 @@  struct snd_compr_stream;
 #define SND_SOC_DAIFMT_CBP_CFP		(1 << 12) /* codec clk provider & frame provider */
 #define SND_SOC_DAIFMT_CBC_CFP		(2 << 12) /* codec clk consumer & frame provider */
 #define SND_SOC_DAIFMT_CBP_CFC		(3 << 12) /* codec clk provider & frame consumer */
-#define SND_SOC_DAIFMT_CBC_CFC		(4 << 12) /* codec clk consumer & frame follower */
+#define SND_SOC_DAIFMT_CBC_CFC		(4 << 12) /* codec clk consumer & frame consumer */
 
 /* previous definitions kept for backwards-compatibility, do not use in new contributions */
 #define SND_SOC_DAIFMT_CBM_CFM		SND_SOC_DAIFMT_CBP_CFP