| Message ID | 20210301174659.117122-1-pierre-louis.bossart@linux.intel.com |
|---|---|
| State | Accepted |
| Commit | 2fb8711095a1f8b545b2cae307d9b0fc9591e36b |
| Headers | show |
| Series | [v2] ASoC: soc-dai: fix kernel-doc | expand |
On Mon, 1 Mar 2021 11:46:59 -0600, Pierre-Louis Bossart wrote: > v5.12-rc1 flags new warnings with make W=1, fix missing or broken > function descriptors. > > sound/soc/soc-dai.c:167: warning: expecting prototype for > snd_soc_xlate_tdm_slot(). Prototype was for > snd_soc_xlate_tdm_slot_mask() instead Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/1] ASoC: soc-dai: fix kernel-doc commit: 17b898dfe583a89526f5fbd509a8bc9107b43960 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
diff --git a/sound/soc/soc-dai.c b/sound/soc/soc-dai.c index cd3bb9a7983f..080fbe053fc5 100644 --- a/sound/soc/soc-dai.c +++ b/sound/soc/soc-dai.c @@ -154,7 +154,7 @@ int snd_soc_dai_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) EXPORT_SYMBOL_GPL(snd_soc_dai_set_fmt); /** - * snd_soc_xlate_tdm_slot - generate tx/rx slot mask. + * snd_soc_xlate_tdm_slot_mask - generate tx/rx slot mask. * @slots: Number of slots in use. * @tx_mask: bitmask representing active TX slots. * @rx_mask: bitmask representing active RX slots.
v5.12-rc1 flags new warnings with make W=1, fix missing or broken function descriptors. sound/soc/soc-dai.c:167: warning: expecting prototype for snd_soc_xlate_tdm_slot(). Prototype was for snd_soc_xlate_tdm_slot_mask() instead Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> --- sound/soc/soc-dai.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)