leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Mark Brown 2020-07-09 22:20:32 +01:00
commit a834238961
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
18 changed files with 37 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sound/soc/atmel/atmel-pcm-dma.c
View File

@ -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

1
sound/soc/atmel/atmel_ssc_dai.c
View File

@ -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)
{

2
sound/soc/codecs/cros_ec_codec.c
View File

@ -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 = {

12
sound/soc/codecs/da7210.c
View File

@ -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)

2
sound/soc/codecs/da7219.c
View File

@ -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)

2
sound/soc/codecs/es8316.c
View File

@ -839,11 +839,13 @@ static const struct of_device_id es8316_of_match[] = {
};
MODULE_DEVICE_TABLE(of, es8316_of_match);
#ifdef CONFIG_ACPI
static const struct acpi_device_id es8316_acpi_match[] = {
{"ESSX8316", 0},
{},
};
MODULE_DEVICE_TABLE(acpi, es8316_acpi_match);
#endif
static struct i2c_driver es8316_i2c_driver = {
.driver = {

1
sound/soc/codecs/jz4770.c
View File

@ -303,7 +303,6 @@ static int jz4770_codec_digital_mute(struct snd_soc_dai *dai, int mute)
static const DECLARE_TLV_DB_MINMAX_MUTE(dac_tlv, -3100, 0);
static const DECLARE_TLV_DB_SCALE(adc_tlv, 0, 100, 0);
static const DECLARE_TLV_DB_MINMAX(out_tlv, -2500, 600);
static const DECLARE_TLV_DB_SCALE(mic_boost_tlv, 0, 400, 0);
static const DECLARE_TLV_DB_SCALE(linein_tlv, -2500, 100, 0);
/* Unconditional controls. */

8
sound/soc/codecs/max98390.c
View File

@ -944,14 +944,6 @@ static const struct regmap_config max98390_regmap = {
.cache_type = REGCACHE_RBTREE,
};
#ifdef CONFIG_OF
static const struct of_device_id max98390_dt_ids[] = {
{ .compatible = "maxim,max98390", },
{ }
};
MODULE_DEVICE_TABLE(of, max98390_dt_ids);
#endif
static int max98390_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
{

2
sound/soc/codecs/rt274.c
View File

@ -1105,12 +1105,14 @@ static const struct i2c_device_id rt274_i2c_id[] = {
};
MODULE_DEVICE_TABLE(i2c, rt274_i2c_id);
#ifdef CONFIG_ACPI
static const struct acpi_device_id rt274_acpi_match[] = {
{ "10EC0274", 0 },
{ "INT34C2", 0 },
{},
};
MODULE_DEVICE_TABLE(acpi, rt274_acpi_match);
#endif
static int rt274_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)

2
sound/soc/codecs/rt286.c
View File

@ -1079,11 +1079,13 @@ static const struct i2c_device_id rt286_i2c_id[] = {
};
MODULE_DEVICE_TABLE(i2c, rt286_i2c_id);
#ifdef CONFIG_ACPI
static const struct acpi_device_id rt286_acpi_match[] = {
{ "INT343A", 0 },
{},
};
MODULE_DEVICE_TABLE(acpi, rt286_acpi_match);
#endif
static const struct dmi_system_id force_combo_jack_table[] = {
{

2
sound/soc/codecs/rt298.c
View File

@ -1145,11 +1145,13 @@ static const struct i2c_device_id rt298_i2c_id[] = {
};
MODULE_DEVICE_TABLE(i2c, rt298_i2c_id);
#ifdef CONFIG_ACPI
static const struct acpi_device_id rt298_acpi_match[] = {
{ "INT343A", 0 },
{},
};
MODULE_DEVICE_TABLE(acpi, rt298_acpi_match);
#endif
static const struct dmi_system_id force_combo_jack_table[] = {
{

2
sound/soc/codecs/rt5660.c
View File

@ -1241,12 +1241,14 @@ static const struct of_device_id rt5660_of_match[] = {
};
MODULE_DEVICE_TABLE(of, rt5660_of_match);
#ifdef CONFIG_ACPI
static const struct acpi_device_id rt5660_acpi_match[] = {
{ "10EC5660", 0 },
{ "10EC3277", 0 },
{ },
};
MODULE_DEVICE_TABLE(acpi, rt5660_acpi_match);
#endif
static int rt5660_parse_dt(struct rt5660_priv *rt5660, struct device *dev)
{

2
sound/soc/codecs/rt5677-spi.c
View File

@ -614,11 +614,13 @@ static int rt5677_spi_probe(struct spi_device *spi)
return ret;
}
#ifdef CONFIG_ACPI
static const struct acpi_device_id rt5677_spi_acpi_id[] = {
{ "RT5677AA", 0 },
{ }
};
MODULE_DEVICE_TABLE(acpi, rt5677_spi_acpi_id);
#endif
static struct spi_driver rt5677_spi_driver = {
.driver = {

5
sound/soc/samsung/pcm.c
View File

@ -104,8 +104,13 @@
/**
* struct s3c_pcm_info - S3C PCM Controller information
* @lock: Spin lock
* @dev: The parent device passed to use from the probe.
* @regs: The pointer to the device register block.
* @sclk_per_fs: number of sclk per frame sync
* @idleclk: Whether to keep PCMSCLK enabled even when idle (no active xfer)
* @pclk: the PCLK_PCM (pcm) clock pointer
* @cclk: the SCLK_AUDIO (audio-bus) clock pointer
* @dma_playback: DMA information for playback channel.
* @dma_capture: DMA information for capture channel.
*/

6
sound/soc/samsung/spdif.c
View File

@ -70,9 +70,9 @@
* @clk_rate: Current clock rate for calcurate ratio.
* @pclk: The peri-clock pointer for spdif master operation.
* @sclk: The source clock pointer for making sync signals.
* @save_clkcon: Backup clkcon reg. in suspend.
* @save_con: Backup con reg. in suspend.
* @save_cstas: Backup cstas reg. in suspend.
* @saved_clkcon: Backup clkcon reg. in suspend.
* @saved_con: Backup con reg. in suspend.
* @saved_cstas: Backup cstas reg. in suspend.
* @dma_playback: DMA information for playback channel.
*/
struct samsung_spdif_info {

3
sound/soc/tegra/tegra20_das.c
View File

@ -98,8 +98,7 @@ EXPORT_SYMBOL_GPL(tegra20_das_connect_dac_to_dap);
static bool tegra20_das_wr_rd_reg(struct device *dev, unsigned int reg)
{
if ((reg >= TEGRA20_DAS_DAP_CTRL_SEL) &&
(reg <= LAST_REG(DAP_CTRL_SEL)))
if (reg <= LAST_REG(DAP_CTRL_SEL))
return true;
if ((reg >= TEGRA20_DAS_DAC_INPUT_DATA_CLK_SEL) &&
(reg <= LAST_REG(DAC_INPUT_DATA_CLK_SEL)))

3
sound/soc/ti/omap-mcbsp-st.c
View File

@ -142,11 +142,8 @@ static void omap_mcbsp_st_fir_write(struct omap_mcbsp *mcbsp, s16 *fir)
static void omap_mcbsp_st_chgain(struct omap_mcbsp *mcbsp)
{
u16 w;
struct omap_mcbsp_st_data *st_data = mcbsp->st_data;
w = MCBSP_ST_READ(mcbsp, SSELCR);
MCBSP_ST_WRITE(mcbsp, SGAINCR, ST_CH0GAIN(st_data->ch0gain) |
ST_CH1GAIN(st_data->ch1gain));
}

7
sound/soc/uniphier/aio-core.c
View File

@ -93,9 +93,9 @@ void aio_iecout_set_enable(struct uniphier_aio_chip *chip, bool enable)
/**
* aio_chip_set_pll - set frequency to audio PLL
* @chip : the AIO chip pointer
* @source: PLL
* @freq : frequency in Hz, 0 is ignored
* @chip: the AIO chip pointer
* @pll_id: PLL
* @freq: frequency in Hz, 0 is ignored
*
* Sets frequency of audio PLL. This function can be called anytime,
* but it takes time till PLL is locked.
@ -267,7 +267,6 @@ void aio_port_reset(struct uniphier_aio_sub *sub)
/**
* aio_port_set_ch - set channels of LPCM
* @sub: the AIO substream pointer, PCM substream only
* @ch : count of channels
*
* Set suitable slot selecting to input/output port block of AIO.
*