Unverified Commit a8342389 authored by Mark Brown's avatar Mark Brown
Browse files

Merge series "ASoC: Clean-up W=1 build warnings​ - part1" from Pierre-Louis... 

Merge series "ASoC: Clean-up W=1 build warnings​ - part1" from Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>:

Both Lee Jones and I submitted separate series, this is the first part
of the merged result, which includes all previously reviewed patches
or suggested changes along with trivial ones for CONFIG_ACPI.

Lee Jones (2):
  ASoC: codecs: jz4770: Remove defined but never used variable
    'mic_boost_tlv'
  ASoC: ti: omap-mcbsp-st: Remove set, but unused variable 'w'

Pierre-Louis Bossart (11):
  ASoC: atmel: fix kernel-doc
  ASoC: samsung: spdif: fix kernel-doc
  ASoC: samsung: pcm: fix kernel-doc
  ASoC: tegra: tegra20_das: remove always-true comparison
  ASoC: uniphier: aio-core: fix kernel-doc
  ASoC: codecs: da7210: fix kernel-doc
  ASoC: codecs: da7219: fix 'defined but not used' warning
  ASoC: codecs: cros_ec_codec: fix 'defined but not used' warning
  ASoC: codecs: es8316: fix 'defined but not used' warning
  ASoC: codecs: max98390: fix 'defined but not used' warning
  ASoC: codecs: rt*: fix 'defined but not used' warning

 sound/soc/atmel/atmel-pcm-dma.c  |  2 +-
 sound/soc/atmel/atmel_ssc_dai.c  |  1 +
 sound/soc/codecs/cros_ec_codec.c |  2 ++
 sound/soc/codecs/da7210.c        | 12 +++++++-----
 sound/soc/codecs/da7219.c        |  2 ++
 sound/soc/codecs/es8316.c        |  2 ++
 sound/soc/codecs/jz4770.c        |  1 -
 sound/soc/codecs/max98390.c      |  8 --------
 sound/soc/codecs/rt274.c         |  2 ++
 sound/soc/codecs/rt286.c         |  2 ++
 sound/soc/codecs/rt298.c         |  2 ++
 sound/soc/codecs/rt5660.c        |  2 ++
 sound/soc/codecs/rt5677-spi.c    |  2 ++
 sound/soc/samsung/pcm.c          |  5 +++++
 sound/soc/samsung/spdif.c        |  6 +++---
 sound/soc/tegra/tegra20_das.c    |  3 +--
 sound/soc/ti/omap-mcbsp-st.c     |  3 ---
 sound/soc/uniphier/aio-core.c    |  7 +++----
 18 files changed, 37 insertions(+), 27 deletions(-)

--
2.25.1
parents 3e146b55 56bbfbfd

sound/soc/atmel/atmel-pcm-dma.c

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ static const struct snd_pcm_hardware atmel_pcm_dma_hardware = { 
	.buffer_bytes_max	= 512 * 1024,

};



/**

/*

 * atmel_pcm_dma_irq: SSC interrupt handler for DMAENGINE enabled SSC

 *

 * We use DMAENGINE to send/receive data to/from SSC so this ISR is only to

sound/soc/atmel/atmel_ssc_dai.c

+1 −0
Original line number Diff line number Diff line
@@ -887,6 +887,7 @@ static int asoc_ssc_init(struct device *dev) 


/**

 * atmel_ssc_set_audio - Allocate the specified SSC for audio use.

 * @ssc_id: SSD ID in [0, NUM_SSC_DEVICES[

 */

int atmel_ssc_set_audio(int ssc_id)

{

sound/soc/codecs/cros_ec_codec.c

+2 −0
Original line number Diff line number Diff line
@@ -1053,11 +1053,13 @@ static const struct of_device_id cros_ec_codec_of_match[] = { 
MODULE_DEVICE_TABLE(of, cros_ec_codec_of_match);

#endif



#ifdef CONFIG_ACPI

static const struct acpi_device_id cros_ec_codec_acpi_id[] = {

	{ "GOOG0013", 0 },

	{ }

};

MODULE_DEVICE_TABLE(acpi, cros_ec_codec_acpi_id);

#endif



static struct platform_driver cros_ec_codec_platform_driver = {

	.driver = {

sound/soc/codecs/da7210.c

+7 −5
Original line number Diff line number Diff line
@@ -971,14 +971,16 @@ static int da7210_set_dai_sysclk(struct snd_soc_dai *codec_dai, 


/**

 * da7210_set_dai_pll	:Configure the codec PLL

 * @param codec_dai	: pointer to codec DAI

 * @param pll_id	: da7210 has only one pll, so pll_id is always zero

 * @param fref		: MCLK frequency, should be < 20MHz

 * @param fout		: FsDM value, Refer page 44 & 45 of datasheet

 * @return int		: Zero for success, negative error code for error

 * @codec_dai: pointer to codec DAI

 * @pll_id: da7210 has only one pll, so pll_id is always zero

 * @source: clock source

 * @fref: MCLK frequency, should be < 20MHz

 * @fout: FsDM value, Refer page 44 & 45 of datasheet

 *

 * Note: Supported PLL input frequencies are 12MHz, 13MHz, 13.5MHz, 14.4MHz,

 *       19.2MHz, 19.6MHz and 19.8MHz

 *

 * Return: Zero for success, negative error code for error

 */

static int da7210_set_dai_pll(struct snd_soc_dai *codec_dai, int pll_id,

			      int source, unsigned int fref, unsigned int fout)

sound/soc/codecs/da7219.c

+2 −0
Original line number Diff line number Diff line
@@ -1708,11 +1708,13 @@ static const struct of_device_id da7219_of_match[] = { 
};

MODULE_DEVICE_TABLE(of, da7219_of_match);



#ifdef CONFIG_ACPI

static const struct acpi_device_id da7219_acpi_match[] = {

	{ .id = "DLGS7219", },

	{ }

};

MODULE_DEVICE_TABLE(acpi, da7219_acpi_match);

#endif



static enum da7219_micbias_voltage

	da7219_fw_micbias_lvl(struct device *dev, u32 val)