| Message ID | 20220602135316.3554400-17-broonie@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 8d322f170b09989f47614c1a663371647f03176f |
| Headers | show |
| Series | ASoC: DAI clocking terminology modernisation | expand |
Hi Mark,
I love your patch! Yet something to improve:
[auto build test ERROR on broonie-sound/for-next]
[also build test ERROR on v5.18 next-20220603]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/intel-lab-lkp/linux/commits/Mark-Brown/ASoC-DAI-clocking-terminology-modernisation/20220602-220124
base: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
config: hexagon-randconfig-r034-20220531 (https://download.01.org/0day-ci/archive/20220603/202206031611.NflHL5M6-lkp@intel.com/config)
compiler: clang version 15.0.0 (https://github.com/llvm/llvm-project b364c76683f8ef241025a9556300778c07b590c2)
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# https://github.com/intel-lab-lkp/linux/commit/dbeb676b530a8a641b9444a092dcab1d5af2a71f
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review Mark-Brown/ASoC-DAI-clocking-terminology-modernisation/20220602-220124
git checkout dbeb676b530a8a641b9444a092dcab1d5af2a71f
# save the config file
mkdir build_dir && cp config build_dir/.config
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=hexagon SHELL=/bin/bash sound/soc/codecs/
If you fix the issue, kindly add following tag where applicable
Reported-by: kernel test robot <lkp@intel.com>
All errors (new ones prefixed by >>):
>> sound/soc/codecs/tlv320aic26.c:365:9: error: no member named 'master' in 'struct aic26'
aic26->master = 1;
~~~~~ ^
1 error generated.
vim +365 sound/soc/codecs/tlv320aic26.c
7fbdeb809050cb Mark Brown 2013-09-25 341
f0fba2ad1b6b53 Liam Girdwood 2010-03-17 342 /* ---------------------------------------------------------------------
f0fba2ad1b6b53 Liam Girdwood 2010-03-17 343 * SPI device portion of driver: probe and release routines and SPI
f0fba2ad1b6b53 Liam Girdwood 2010-03-17 344 * driver registration.
f0fba2ad1b6b53 Liam Girdwood 2010-03-17 345 */
f0fba2ad1b6b53 Liam Girdwood 2010-03-17 346 static int aic26_spi_probe(struct spi_device *spi)
d8e3bb7385da0b Grant Likely 2008-07-29 347 {
f0fba2ad1b6b53 Liam Girdwood 2010-03-17 348 struct aic26 *aic26;
f0fba2ad1b6b53 Liam Girdwood 2010-03-17 349 int ret;
d8e3bb7385da0b Grant Likely 2008-07-29 350
f0fba2ad1b6b53 Liam Girdwood 2010-03-17 351 dev_dbg(&spi->dev, "probing tlv320aic26 spi device\n");
f0fba2ad1b6b53 Liam Girdwood 2010-03-17 352
f0fba2ad1b6b53 Liam Girdwood 2010-03-17 353 /* Allocate driver data */
a8163023d29c14 Axel Lin 2011-12-29 354 aic26 = devm_kzalloc(&spi->dev, sizeof *aic26, GFP_KERNEL);
f0fba2ad1b6b53 Liam Girdwood 2010-03-17 355 if (!aic26)
f0fba2ad1b6b53 Liam Girdwood 2010-03-17 356 return -ENOMEM;
f0fba2ad1b6b53 Liam Girdwood 2010-03-17 357
7fbdeb809050cb Mark Brown 2013-09-25 358 aic26->regmap = devm_regmap_init_spi(spi, &aic26_regmap);
7fbdeb809050cb Mark Brown 2013-09-25 359 if (IS_ERR(aic26->regmap))
7fbdeb809050cb Mark Brown 2013-09-25 360 return PTR_ERR(aic26->regmap);
7fbdeb809050cb Mark Brown 2013-09-25 361
f0fba2ad1b6b53 Liam Girdwood 2010-03-17 362 /* Initialize the driver data */
f0fba2ad1b6b53 Liam Girdwood 2010-03-17 363 aic26->spi = spi;
f0fba2ad1b6b53 Liam Girdwood 2010-03-17 364 dev_set_drvdata(&spi->dev, aic26);
f0fba2ad1b6b53 Liam Girdwood 2010-03-17 @365 aic26->master = 1;
f0fba2ad1b6b53 Liam Girdwood 2010-03-17 366
1514613a7a4480 Kuninori Morimoto 2018-01-29 367 ret = devm_snd_soc_register_component(&spi->dev,
1514613a7a4480 Kuninori Morimoto 2018-01-29 368 &aic26_soc_component_dev, &aic26_dai, 1);
f0fba2ad1b6b53 Liam Girdwood 2010-03-17 369 return ret;
f0fba2ad1b6b53 Liam Girdwood 2010-03-17 370 }
f0fba2ad1b6b53 Liam Girdwood 2010-03-17 371
diff --git a/sound/soc/codecs/tlv320aic26.c b/sound/soc/codecs/tlv320aic26.c index 077415a57225..1d756bef86ff 100644 --- a/sound/soc/codecs/tlv320aic26.c +++ b/sound/soc/codecs/tlv320aic26.c @@ -32,7 +32,7 @@ struct aic26 { struct spi_device *spi; struct regmap *regmap; struct snd_soc_component *component; - int master; + int clock_provider; int datfm; int mclk; @@ -117,8 +117,8 @@ static int aic26_hw_params(struct snd_pcm_substream *substream, reg = dval << 2; snd_soc_component_write(component, AIC26_REG_PLL_PROG2, reg); - /* Audio Control 3 (master mode, fsref rate) */ - if (aic26->master) + /* Audio Control 3 (clock provider mode, fsref rate) */ + if (aic26->clock_provider) reg = 0x0800; if (fsref == 48000) reg = 0x2000; @@ -178,10 +178,9 @@ static int aic26_set_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt) dev_dbg(&aic26->spi->dev, "aic26_set_fmt(dai=%p, fmt==%i)\n", codec_dai, fmt); - /* set master/slave audio interface */ - switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { - case SND_SOC_DAIFMT_CBM_CFM: aic26->master = 1; break; - case SND_SOC_DAIFMT_CBS_CFS: aic26->master = 0; break; + switch (fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) { + case SND_SOC_DAIFMT_CBP_CFP: aic26->clock_provider = 1; break; + case SND_SOC_DAIFMT_CBC_CFC: aic26->clock_provider = 0; break; default: dev_dbg(&aic26->spi->dev, "bad master\n"); return -EINVAL; }
As part of moving to remove the old style defines for the bus clocks update the tlv320aic26 driver to use more modern terminology for clocking. Signed-off-by: Mark Brown <broonie@kernel.org> --- sound/soc/codecs/tlv320aic26.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)