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/ak4104.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/sound/soc/codecs/ak4104.c b/sound/soc/codecs/ak4104.c index bdca879..f4c915c 100644 --- a/sound/soc/codecs/ak4104.c +++ b/sound/soc/codecs/ak4104.c @@ -171,8 +171,9 @@ static struct snd_soc_dai_driver ak4104_dai = { .ops = &ak4101_dai_ops, };
-static int ak4104_probe(struct snd_soc_codec *codec) +static int ak4104_probe(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct ak4104_private *ak4104 = snd_soc_codec_get_drvdata(codec); int ret;
@@ -202,15 +203,14 @@ exit_disable_regulator: return ret; }
-static int ak4104_remove(struct snd_soc_codec *codec) +static void ak4104_remove(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct ak4104_private *ak4104 = snd_soc_codec_get_drvdata(codec);
regmap_update_bits(ak4104->regmap, AK4104_REG_CONTROL1, AK4104_CONTROL1_PW | AK4104_CONTROL1_RSTN, 0); regulator_disable(ak4104->regulator); - - return 0; }
#ifdef CONFIG_PM @@ -240,12 +240,12 @@ static int ak4104_soc_resume(struct snd_soc_codec *codec) #endif /* CONFIG_PM */
static struct snd_soc_codec_driver soc_codec_device_ak4104 = { - .probe = ak4104_probe, - .remove = ak4104_remove, .suspend = ak4104_soc_suspend, .resume = ak4104_soc_resume,
.component_driver = { + .probe = ak4104_probe, + .remove = ak4104_remove, .dapm_widgets = ak4104_dapm_widgets, .num_dapm_widgets = ARRAY_SIZE(ak4104_dapm_widgets), .dapm_routes = ak4104_dapm_routes,