ASoC: remove codec duplicated callback function
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> Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
90eb10fc4f
commit
8073aefa60
|
@ -898,14 +898,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);
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Reference in a new issue