]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
ASoC: dapm: fix snd_soc_dapm_new_control() implicit declaration
authorVladimir Zapolskiy <vz@mleia.com>
Mon, 1 Jun 2015 21:57:53 +0000 (00:57 +0300)
committerMark Brown <broonie@kernel.org>
Tue, 2 Jun 2015 17:18:03 +0000 (18:18 +0100)
commit5353f65b859255a07e8bf5c096be4d5d268b46e8
tree26948c9dd1c0003c5cbdc38d54d10d8d77d2730d
parent4a6c2aa19d5b6dcd6078d1e0db2a88407b926ded
ASoC: dapm: fix snd_soc_dapm_new_control() implicit declaration

The change fixes the following compilation problem:

  sound/soc/soc-dapm.c: In function 'dapm_kcontrol_data_alloc':
  sound/soc/soc-dapm.c:388:4: error: implicit declaration of function
    'snd_soc_dapm_new_control' [-Werror=implicit-function-declaration]
    data->widget = snd_soc_dapm_new_control(widget->dapm,
    ^

  sound/soc/soc-dapm.c:387:17: warning: assignment makes pointer
    from integer without a cast [enabled by default]
    data->widget = snd_soc_dapm_new_control(widget->dapm,
                 ^
  sound/soc/soc-dapm.c: At top level:
  sound/soc/soc-dapm.c:3269:1: error: conflicting types for
    'snd_soc_dapm_new_control'
  snd_soc_dapm_new_control(struct snd_soc_dapm_context *dapm,
  ^

In addition to the fix add static qualifier to
snd_soc_dapm_new_control() function to silence checkpatch.

Fixes: 02aa78abec ("ASoC: DAPM: Add APIs to create individual DAPM controls.")
Signed-off-by: Vladimir Zapolskiy <vz@mleia.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/soc-dapm.c