| Message ID | 87fuqm8xur.wl%kuninori.morimoto.gx@renesas.com (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Geert Uytterhoeven |
| Headers | show |
Hi Kuninori,
[auto build test ERROR on asoc/for-next]
[also build test ERROR on v4.7 next-20160802]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
url: https://github.com/0day-ci/linux/commits/Kuninori-Morimoto/ASoC-remove-codec-duplicated-callback-function/20160803-130552
base: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
config: i386-randconfig-s1-201631 (attached as .config)
compiler: gcc-6 (Debian 6.1.1-9) 6.1.1 20160705
reproduce:
# save the attached .config to linux build tree
make ARCH=i386
All error/warnings (new ones prefixed by >>):
>> sound/soc/codecs/adau1701.c:768:2: error: unknown field 'controls' specified in initializer
.controls = adau1701_controls,
^
>> sound/soc/codecs/adau1701.c:768:2: warning: the address of 'adau1701_controls' will always evaluate as 'true' [-Waddress]
>> sound/soc/codecs/adau1701.c:769:2: error: unknown field 'num_controls' specified in initializer
.num_controls = ARRAY_SIZE(adau1701_controls),
^
In file included from include/linux/list.h:8:0,
from include/linux/module.h:9,
from sound/soc/codecs/adau1701.c:11:
include/linux/kernel.h:54:25: warning: initialization makes pointer from integer without a cast [-Wint-conversion]
#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr))
^
>> sound/soc/codecs/adau1701.c:769:19: note: in expansion of macro 'ARRAY_SIZE'
.num_controls = ARRAY_SIZE(adau1701_controls),
^~~~~~~~~~
include/linux/kernel.h:54:25: note: (near initialization for 'adau1701_codec_drv.seq_notifier')
#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr))
^
>> sound/soc/codecs/adau1701.c:769:19: note: in expansion of macro 'ARRAY_SIZE'
.num_controls = ARRAY_SIZE(adau1701_controls),
^~~~~~~~~~
>> sound/soc/codecs/adau1701.c:770:2: error: unknown field 'dapm_widgets' specified in initializer
.dapm_widgets = adau1701_dapm_widgets,
^
>> sound/soc/codecs/adau1701.c:770:2: warning: the address of 'adau1701_dapm_widgets' will always evaluate as 'true' [-Waddress]
>> sound/soc/codecs/adau1701.c:771:2: error: unknown field 'num_dapm_widgets' specified in initializer
.num_dapm_widgets = ARRAY_SIZE(adau1701_dapm_widgets),
^
In file included from include/linux/list.h:8:0,
from include/linux/module.h:9,
from sound/soc/codecs/adau1701.c:11:
include/linux/kernel.h:54:25: warning: excess elements in struct initializer
#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr))
^
sound/soc/codecs/adau1701.c:771:22: note: in expansion of macro 'ARRAY_SIZE'
.num_dapm_widgets = ARRAY_SIZE(adau1701_dapm_widgets),
^~~~~~~~~~
include/linux/kernel.h:54:25: note: (near initialization for 'adau1701_codec_drv')
#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr))
^
sound/soc/codecs/adau1701.c:771:22: note: in expansion of macro 'ARRAY_SIZE'
.num_dapm_widgets = ARRAY_SIZE(adau1701_dapm_widgets),
^~~~~~~~~~
>> sound/soc/codecs/adau1701.c:772:2: error: unknown field 'dapm_routes' specified in initializer
.dapm_routes = adau1701_dapm_routes,
^
>> sound/soc/codecs/adau1701.c:772:18: warning: excess elements in struct initializer
.dapm_routes = adau1701_dapm_routes,
^~~~~~~~~~~~~~~~~~~~
sound/soc/codecs/adau1701.c:772:18: note: (near initialization for 'adau1701_codec_drv')
>> sound/soc/codecs/adau1701.c:773:2: error: unknown field 'num_dapm_routes' specified in initializer
.num_dapm_routes = ARRAY_SIZE(adau1701_dapm_routes),
^
In file included from include/linux/list.h:8:0,
from include/linux/module.h:9,
from sound/soc/codecs/adau1701.c:11:
include/linux/kernel.h:54:25: warning: excess elements in struct initializer
#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr))
^
sound/soc/codecs/adau1701.c:773:21: note: in expansion of macro 'ARRAY_SIZE'
.num_dapm_routes = ARRAY_SIZE(adau1701_dapm_routes),
^~~~~~~~~~
include/linux/kernel.h:54:25: note: (near initialization for 'adau1701_codec_drv')
#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr))
^
sound/soc/codecs/adau1701.c:773:21: note: in expansion of macro 'ARRAY_SIZE'
.num_dapm_routes = ARRAY_SIZE(adau1701_dapm_routes),
^~~~~~~~~~
--
>> sound/soc/codecs/ak4104.c:248:2: error: unknown field 'dapm_widgets' specified in initializer
.dapm_widgets = ak4104_dapm_widgets,
^
>> sound/soc/codecs/ak4104.c:248:18: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
.dapm_widgets = ak4104_dapm_widgets,
^~~~~~~~~~~~~~~~~~~
sound/soc/codecs/ak4104.c:248:18: note: (near initialization for 'soc_codec_device_ak4104.component_driver.name')
>> sound/soc/codecs/ak4104.c:249:2: error: unknown field 'num_dapm_widgets' specified in initializer
.num_dapm_widgets = ARRAY_SIZE(ak4104_dapm_widgets),
^
In file included from include/linux/list.h:8:0,
from include/linux/module.h:9,
from sound/soc/codecs/ak4104.c:12:
include/linux/kernel.h:54:25: warning: initialization makes pointer from integer without a cast [-Wint-conversion]
#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr))
^
>> sound/soc/codecs/ak4104.c:249:22: note: in expansion of macro 'ARRAY_SIZE'
.num_dapm_widgets = ARRAY_SIZE(ak4104_dapm_widgets),
^~~~~~~~~~
include/linux/kernel.h:54:25: note: (near initialization for 'soc_codec_device_ak4104.set_sysclk')
#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr))
^
>> sound/soc/codecs/ak4104.c:249:22: note: in expansion of macro 'ARRAY_SIZE'
.num_dapm_widgets = ARRAY_SIZE(ak4104_dapm_widgets),
^~~~~~~~~~
>> sound/soc/codecs/ak4104.c:250:2: error: unknown field 'dapm_routes' specified in initializer
.dapm_routes = ak4104_dapm_routes,
^
sound/soc/codecs/ak4104.c:250:17: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
.dapm_routes = ak4104_dapm_routes,
^~~~~~~~~~~~~~~~~~
sound/soc/codecs/ak4104.c:250:17: note: (near initialization for 'soc_codec_device_ak4104.set_pll')
>> sound/soc/codecs/ak4104.c:251:2: error: unknown field 'num_dapm_routes' specified in initializer
.num_dapm_routes = ARRAY_SIZE(ak4104_dapm_routes),
^
In file included from include/linux/list.h:8:0,
from include/linux/module.h:9,
from sound/soc/codecs/ak4104.c:12:
include/linux/kernel.h:54:25: warning: initialization makes pointer from integer without a cast [-Wint-conversion]
#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr))
^
sound/soc/codecs/ak4104.c:251:21: note: in expansion of macro 'ARRAY_SIZE'
.num_dapm_routes = ARRAY_SIZE(ak4104_dapm_routes),
^~~~~~~~~~
include/linux/kernel.h:54:25: note: (near initialization for 'soc_codec_device_ak4104.get_regmap')
#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr))
^
sound/soc/codecs/ak4104.c:251:21: note: in expansion of macro 'ARRAY_SIZE'
.num_dapm_routes = ARRAY_SIZE(ak4104_dapm_routes),
^~~~~~~~~~
>> sound/soc/codecs/ak4104.c:242:62: warning: missing braces around initializer [-Wmissing-braces]
static struct snd_soc_codec_driver soc_codec_device_ak4104 = {
^
sound/soc/codecs/ak4104.c:242:62: note: (near initialization for 'soc_codec_device_ak4104')
cc1: some warnings being treated as errors
--
>> sound/soc/codecs/ak4554.c:68:2: error: unknown field 'dapm_widgets' specified in initializer
.dapm_widgets = ak4554_dapm_widgets,
^
>> sound/soc/codecs/ak4554.c:68:18: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
.dapm_widgets = ak4554_dapm_widgets,
^~~~~~~~~~~~~~~~~~~
sound/soc/codecs/ak4554.c:68:18: note: (near initialization for 'soc_codec_dev_ak4554.probe')
>> sound/soc/codecs/ak4554.c:69:2: error: unknown field 'num_dapm_widgets' specified in initializer
.num_dapm_widgets = ARRAY_SIZE(ak4554_dapm_widgets),
^
In file included from include/linux/list.h:8:0,
from include/linux/module.h:9,
from sound/soc/codecs/ak4554.c:12:
include/linux/kernel.h:54:25: warning: initialization makes pointer from integer without a cast [-Wint-conversion]
#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr))
^
>> sound/soc/codecs/ak4554.c:69:22: note: in expansion of macro 'ARRAY_SIZE'
.num_dapm_widgets = ARRAY_SIZE(ak4554_dapm_widgets),
^~~~~~~~~~
include/linux/kernel.h:54:25: note: (near initialization for 'soc_codec_dev_ak4554.remove')
#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr))
^
>> sound/soc/codecs/ak4554.c:69:22: note: in expansion of macro 'ARRAY_SIZE'
.num_dapm_widgets = ARRAY_SIZE(ak4554_dapm_widgets),
^~~~~~~~~~
>> sound/soc/codecs/ak4554.c:70:2: error: unknown field 'dapm_routes' specified in initializer
.dapm_routes = ak4554_dapm_routes,
^
sound/soc/codecs/ak4554.c:70:17: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
.dapm_routes = ak4554_dapm_routes,
^~~~~~~~~~~~~~~~~~
sound/soc/codecs/ak4554.c:70:17: note: (near initialization for 'soc_codec_dev_ak4554.suspend')
>> sound/soc/codecs/ak4554.c:71:2: error: unknown field 'num_dapm_routes' specified in initializer
.num_dapm_routes = ARRAY_SIZE(ak4554_dapm_routes),
^
In file included from include/linux/list.h:8:0,
from include/linux/module.h:9,
from sound/soc/codecs/ak4554.c:12:
include/linux/kernel.h:54:25: warning: initialization makes pointer from integer without a cast [-Wint-conversion]
#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr))
^
sound/soc/codecs/ak4554.c:71:21: note: in expansion of macro 'ARRAY_SIZE'
.num_dapm_routes = ARRAY_SIZE(ak4554_dapm_routes),
^~~~~~~~~~
include/linux/kernel.h:54:25: note: (near initialization for 'soc_codec_dev_ak4554.resume')
#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr))
^
sound/soc/codecs/ak4554.c:71:21: note: in expansion of macro 'ARRAY_SIZE'
.num_dapm_routes = ARRAY_SIZE(ak4554_dapm_routes),
^~~~~~~~~~
cc1: some warnings being treated as errors
--
>> sound/soc/codecs/cs35l32.c:234:2: error: unknown field 'dapm_widgets' specified in initializer
.dapm_widgets = cs35l32_dapm_widgets,
^
>> sound/soc/codecs/cs35l32.c:234:18: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
.dapm_widgets = cs35l32_dapm_widgets,
^~~~~~~~~~~~~~~~~~~~
sound/soc/codecs/cs35l32.c:234:18: note: (near initialization for 'soc_codec_dev_cs35l32.set_pll')
>> sound/soc/codecs/cs35l32.c:235:2: error: unknown field 'num_dapm_widgets' specified in initializer
.num_dapm_widgets = ARRAY_SIZE(cs35l32_dapm_widgets),
^
In file included from include/linux/list.h:8:0,
from include/linux/module.h:9,
from sound/soc/codecs/cs35l32.c:14:
include/linux/kernel.h:54:25: warning: initialization makes pointer from integer without a cast [-Wint-conversion]
#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr))
^
>> sound/soc/codecs/cs35l32.c:235:22: note: in expansion of macro 'ARRAY_SIZE'
.num_dapm_widgets = ARRAY_SIZE(cs35l32_dapm_widgets),
^~~~~~~~~~
include/linux/kernel.h:54:25: note: (near initialization for 'soc_codec_dev_cs35l32.get_regmap')
#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr))
^
>> sound/soc/codecs/cs35l32.c:235:22: note: in expansion of macro 'ARRAY_SIZE'
.num_dapm_widgets = ARRAY_SIZE(cs35l32_dapm_widgets),
^~~~~~~~~~
>> sound/soc/codecs/cs35l32.c:236:2: error: unknown field 'dapm_routes' specified in initializer
.dapm_routes = cs35l32_audio_map,
^
sound/soc/codecs/cs35l32.c:236:17: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
.dapm_routes = cs35l32_audio_map,
^~~~~~~~~~~~~~~~~
sound/soc/codecs/cs35l32.c:236:17: note: (near initialization for 'soc_codec_dev_cs35l32.read')
>> sound/soc/codecs/cs35l32.c:237:2: error: unknown field 'num_dapm_routes' specified in initializer
.num_dapm_routes = ARRAY_SIZE(cs35l32_audio_map),
^
In file included from include/linux/list.h:8:0,
from include/linux/module.h:9,
from sound/soc/codecs/cs35l32.c:14:
include/linux/kernel.h:54:25: warning: initialization makes pointer from integer without a cast [-Wint-conversion]
#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr))
^
sound/soc/codecs/cs35l32.c:237:21: note: in expansion of macro 'ARRAY_SIZE'
.num_dapm_routes = ARRAY_SIZE(cs35l32_audio_map),
^~~~~~~~~~
include/linux/kernel.h:54:25: note: (near initialization for 'soc_codec_dev_cs35l32.write')
#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr))
^
sound/soc/codecs/cs35l32.c:237:21: note: in expansion of macro 'ARRAY_SIZE'
.num_dapm_routes = ARRAY_SIZE(cs35l32_audio_map),
^~~~~~~~~~
>> sound/soc/codecs/cs35l32.c:239:2: error: unknown field 'controls' specified in initializer
.controls = cs35l32_snd_controls,
^
>> sound/soc/codecs/cs35l32.c:239:14: warning: initialization makes integer from pointer without a cast [-Wint-conversion]
.controls = cs35l32_snd_controls,
^~~~~~~~~~~~~~~~~~~~
sound/soc/codecs/cs35l32.c:239:14: note: (near initialization for 'soc_codec_dev_cs35l32.reg_cache_size')
>> sound/soc/codecs/cs35l32.c:240:2: error: unknown field 'num_controls' specified in initializer
.num_controls = ARRAY_SIZE(cs35l32_snd_controls),
^
cc1: some warnings being treated as errors
--
>> sound/soc/codecs/cs42l73.c:1260:2: error: unknown field 'dapm_widgets' specified in initializer
.dapm_widgets = cs42l73_dapm_widgets,
^
>> sound/soc/codecs/cs42l73.c:1260:18: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
.dapm_widgets = cs42l73_dapm_widgets,
^~~~~~~~~~~~~~~~~~~~
sound/soc/codecs/cs42l73.c:1260:18: note: (near initialization for 'soc_codec_dev_cs42l73.seq_notifier')
>> sound/soc/codecs/cs42l73.c:1261:2: error: unknown field 'num_dapm_widgets' specified in initializer
.num_dapm_widgets = ARRAY_SIZE(cs42l73_dapm_widgets),
^
>> sound/soc/codecs/cs42l73.c:1262:2: error: unknown field 'dapm_routes' specified in initializer
.dapm_routes = cs42l73_audio_map,
^
>> sound/soc/codecs/cs42l73.c:1262:17: warning: excess elements in struct initializer
.dapm_routes = cs42l73_audio_map,
^~~~~~~~~~~~~~~~~
sound/soc/codecs/cs42l73.c:1262:17: note: (near initialization for 'soc_codec_dev_cs42l73')
>> sound/soc/codecs/cs42l73.c:1263:2: error: unknown field 'num_dapm_routes' specified in initializer
.num_dapm_routes = ARRAY_SIZE(cs42l73_audio_map),
^
In file included from include/linux/list.h:8:0,
from include/linux/module.h:9,
from sound/soc/codecs/cs42l73.c:15:
include/linux/kernel.h:54:25: warning: excess elements in struct initializer
#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr))
^
>> sound/soc/codecs/cs42l73.c:1263:21: note: in expansion of macro 'ARRAY_SIZE'
.num_dapm_routes = ARRAY_SIZE(cs42l73_audio_map),
^~~~~~~~~~
include/linux/kernel.h:54:25: note: (near initialization for 'soc_codec_dev_cs42l73')
#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr))
^
>> sound/soc/codecs/cs42l73.c:1263:21: note: in expansion of macro 'ARRAY_SIZE'
.num_dapm_routes = ARRAY_SIZE(cs42l73_audio_map),
^~~~~~~~~~
>> sound/soc/codecs/cs42l73.c:1265:2: error: unknown field 'controls' specified in initializer
.controls = cs42l73_snd_controls,
^
sound/soc/codecs/cs42l73.c:1265:14: warning: excess elements in struct initializer
.controls = cs42l73_snd_controls,
^~~~~~~~~~~~~~~~~~~~
sound/soc/codecs/cs42l73.c:1265:14: note: (near initialization for 'soc_codec_dev_cs42l73')
>> sound/soc/codecs/cs42l73.c:1266:2: error: unknown field 'num_controls' specified in initializer
.num_controls = ARRAY_SIZE(cs42l73_snd_controls),
^
In file included from include/linux/list.h:8:0,
from include/linux/module.h:9,
from sound/soc/codecs/cs42l73.c:15:
include/linux/kernel.h:54:25: warning: excess elements in struct initializer
#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr))
^
sound/soc/codecs/cs42l73.c:1266:18: note: in expansion of macro 'ARRAY_SIZE'
.num_controls = ARRAY_SIZE(cs42l73_snd_controls),
^~~~~~~~~~
include/linux/kernel.h:54:25: note: (near initialization for 'soc_codec_dev_cs42l73')
#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr))
^
sound/soc/codecs/cs42l73.c:1266:18: note: in expansion of macro 'ARRAY_SIZE'
.num_controls = ARRAY_SIZE(cs42l73_snd_controls),
^~~~~~~~~~
cc1: some warnings being treated as errors
..
vim +/num_controls +769 sound/soc/codecs/adau1701.c
64fcc1fd Pascal Huerst 2015-04-20 762 .remove = adau1701_remove,
64fcc1fd Pascal Huerst 2015-04-20 763 .resume = adau1701_resume,
64fcc1fd Pascal Huerst 2015-04-20 764 .suspend = adau1701_suspend,
631ed8a2 Lars-Peter Clausen 2011-06-13 765 .set_bias_level = adau1701_set_bias_level,
eb3032f8 Axel Lin 2012-01-27 766 .idle_bias_off = true,
631ed8a2 Lars-Peter Clausen 2011-06-13 767
631ed8a2 Lars-Peter Clausen 2011-06-13 @768 .controls = adau1701_controls,
631ed8a2 Lars-Peter Clausen 2011-06-13 @769 .num_controls = ARRAY_SIZE(adau1701_controls),
631ed8a2 Lars-Peter Clausen 2011-06-13 @770 .dapm_widgets = adau1701_dapm_widgets,
631ed8a2 Lars-Peter Clausen 2011-06-13 @771 .num_dapm_widgets = ARRAY_SIZE(adau1701_dapm_widgets),
631ed8a2 Lars-Peter Clausen 2011-06-13 @772 .dapm_routes = adau1701_dapm_routes,
631ed8a2 Lars-Peter Clausen 2011-06-13 @773 .num_dapm_routes = ARRAY_SIZE(adau1701_dapm_routes),
631ed8a2 Lars-Peter Clausen 2011-06-13 774
631ed8a2 Lars-Peter Clausen 2011-06-13 775 .set_sysclk = adau1701_set_sysclk,
631ed8a2 Lars-Peter Clausen 2011-06-13 776 };
:::::: The code at line 769 was first introduced by commit
:::::: 631ed8a2134dae17d9e17f3c35c7290720f85199 ASoC: Add ADAU1701 codec driver
:::::: TO: Lars-Peter Clausen <lars@metafoo.de>
:::::: CC: Mark Brown <broonie@opensource.wolfsonmicro.com>
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
diff --git a/include/sound/soc.h b/include/sound/soc.h index 41c21f9..4e36538 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -901,14 +901,6 @@ struct snd_soc_codec_driver { int (*resume)(struct snd_soc_codec *); struct snd_soc_component_driver component_driver; - /* Default control and setup, added after probe() is run */ - const struct snd_kcontrol_new *controls; - int num_controls; - const struct snd_soc_dapm_widget *dapm_widgets; - int num_dapm_widgets; - const struct snd_soc_dapm_route *dapm_routes; - int num_dapm_routes; - /* codec wide operations */ int (*set_sysclk)(struct snd_soc_codec *codec, int clk_id, int source, unsigned int freq, int dir); diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 16369ca..edba975 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -3333,19 +3333,6 @@ int snd_soc_register_codec(struct device *dev, if (ret) goto err_free; - if (codec_drv->controls) { - codec->component.controls = codec_drv->controls; - codec->component.num_controls = codec_drv->num_controls; - } - if (codec_drv->dapm_widgets) { - codec->component.dapm_widgets = codec_drv->dapm_widgets; - codec->component.num_dapm_widgets = codec_drv->num_dapm_widgets; - } - if (codec_drv->dapm_routes) { - codec->component.dapm_routes = codec_drv->dapm_routes; - codec->component.num_dapm_routes = codec_drv->num_dapm_routes; - } - if (codec_drv->probe) codec->component.probe = snd_soc_codec_drv_probe; if (codec_drv->remove)
codec driver and component driver has duplicated callback functions, and codec side functions are just copied to component side when register timing. This was quick-hack, but no longer needed. This patch removes codec side duplicated callback function. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- include/sound/soc.h | 8 -------- sound/soc/soc-core.c | 13 ------------- 2 files changed, 21 deletions(-)