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/wm8400.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/sound/soc/codecs/wm8400.c b/sound/soc/codecs/wm8400.c index 4551e54..67e0730 100644 --- a/sound/soc/codecs/wm8400.c +++ b/sound/soc/codecs/wm8400.c @@ -1273,8 +1273,9 @@ static struct snd_soc_dai_driver wm8400_dai = { .ops = &wm8400_dai_ops, };
-static int wm8400_codec_probe(struct snd_soc_codec *codec) +static int wm8400_codec_probe(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct wm8400 *wm8400 = dev_get_platdata(codec->dev); struct wm8400_priv *priv; int ret; @@ -1314,15 +1315,14 @@ static int wm8400_codec_probe(struct snd_soc_codec *codec) return 0; }
-static int wm8400_codec_remove(struct snd_soc_codec *codec) +static void wm8400_codec_remove(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); u16 reg;
reg = snd_soc_read(codec, WM8400_POWER_MANAGEMENT_1); snd_soc_write(codec, WM8400_POWER_MANAGEMENT_1, reg & (~WM8400_CODEC_ENA)); - - return 0; }
static struct regmap *wm8400_get_regmap(struct device *dev) @@ -1333,13 +1333,13 @@ static struct regmap *wm8400_get_regmap(struct device *dev) }
static struct snd_soc_codec_driver soc_codec_dev_wm8400 = { - .probe = wm8400_codec_probe, - .remove = wm8400_codec_remove, .get_regmap = wm8400_get_regmap, .set_bias_level = wm8400_set_bias_level, .suspend_bias_off = true,
.component_driver = { + .probe = wm8400_codec_probe, + .remove = wm8400_codec_remove, .controls = wm8400_snd_controls, .num_controls = ARRAY_SIZE(wm8400_snd_controls), .dapm_widgets = wm8400_dapm_widgets,