projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ASoC: codec: Simplify ASoC probe code.
[deliverable/linux.git]
/
sound
/
soc
/
codecs
/
wm8996.c
diff --git
a/sound/soc/codecs/wm8996.c
b/sound/soc/codecs/wm8996.c
index 1a7655b0aa2230890df4f5b82c34a609f7128f05..54066436d72c44c62fbdbaeac4c21d713e61dcb2 100644
(file)
--- a/
sound/soc/codecs/wm8996.c
+++ b/
sound/soc/codecs/wm8996.c
@@
-2628,14
+2628,6
@@
static int wm8996_probe(struct snd_soc_codec *codec)
init_completion(&wm8996->dcs_done);
init_completion(&wm8996->fll_lock);
init_completion(&wm8996->dcs_done);
init_completion(&wm8996->fll_lock);
- codec->control_data = wm8996->regmap;
-
- ret = snd_soc_codec_set_cache_io(codec, 16, 16, SND_SOC_REGMAP);
- if (ret != 0) {
- dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret);
- goto err;
- }
-
if (wm8996->pdata.num_retune_mobile_cfgs)
wm8996_retune_mobile_pdata(codec);
else
if (wm8996->pdata.num_retune_mobile_cfgs)
wm8996_retune_mobile_pdata(codec);
else
@@
-2674,13
+2666,11
@@
static int wm8996_probe(struct snd_soc_codec *codec)
} else {
dev_err(codec->dev, "Failed to request IRQ: %d\n",
ret);
} else {
dev_err(codec->dev, "Failed to request IRQ: %d\n",
ret);
+ return ret;
}
}
return 0;
}
}
return 0;
-
-err:
- return ret;
}
static int wm8996_remove(struct snd_soc_codec *codec)
}
static int wm8996_remove(struct snd_soc_codec *codec)
This page took
0.024456 seconds
and
5
git commands to generate.