From: Kuninori Morimoto kuninori.morimoto.gx@renesas.com
codec driver and component driver has duplicated .probe/.remove functions, and codec side is just relayed it. This was quick-hack, but no longer needed. This patch uses component .probe/.remove
Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com --- sound/soc/codecs/da9055.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/sound/soc/codecs/da9055.c b/sound/soc/codecs/da9055.c index 4efb5f8..c52c67edd 100644 --- a/sound/soc/codecs/da9055.c +++ b/sound/soc/codecs/da9055.c @@ -1377,8 +1377,9 @@ static int da9055_set_bias_level(struct snd_soc_codec *codec, return 0; }
-static int da9055_probe(struct snd_soc_codec *codec) +static int da9055_probe(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct da9055_priv *da9055 = snd_soc_codec_get_drvdata(codec);
/* Enable all Gain Ramps */ @@ -1452,10 +1453,10 @@ static int da9055_probe(struct snd_soc_codec *codec) }
static struct snd_soc_codec_driver soc_codec_dev_da9055 = { - .probe = da9055_probe, .set_bias_level = da9055_set_bias_level,
.component_driver = { + .probe = da9055_probe, .controls = da9055_snd_controls, .num_controls = ARRAY_SIZE(da9055_snd_controls), .dapm_widgets = da9055_dapm_widgets,