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/da7218.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/sound/soc/codecs/da7218.c b/sound/soc/codecs/da7218.c index dcdda6c..bbaae56 100644 --- a/sound/soc/codecs/da7218.c +++ b/sound/soc/codecs/da7218.c @@ -2885,8 +2885,9 @@ static void da7218_handle_pdata(struct snd_soc_codec *codec) } }
-static int da7218_probe(struct snd_soc_codec *codec) +static int da7218_probe(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct da7218_priv *da7218 = snd_soc_codec_get_drvdata(codec); int ret;
@@ -2997,13 +2998,12 @@ err_disable_reg: return ret; }
-static int da7218_remove(struct snd_soc_codec *codec) +static void da7218_remove(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct da7218_priv *da7218 = snd_soc_codec_get_drvdata(codec);
regulator_bulk_disable(DA7218_NUM_SUPPLIES, da7218->supplies); - - return 0; }
#ifdef CONFIG_PM @@ -3039,13 +3039,13 @@ static int da7218_resume(struct snd_soc_codec *codec) #endif
static struct snd_soc_codec_driver soc_codec_dev_da7218 = { - .probe = da7218_probe, - .remove = da7218_remove, .suspend = da7218_suspend, .resume = da7218_resume, .set_bias_level = da7218_set_bias_level,
.component_driver = { + .probe = da7218_probe, + .remove = da7218_remove, .controls = da7218_snd_controls, .num_controls = ARRAY_SIZE(da7218_snd_controls), .dapm_widgets = da7218_dapm_widgets,