leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ASoC: Convert cs42l51 to table based DAPM and control init

Browse Source 
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Axel Lin 2011-12-20 10:19:54 +08:00 committed by Mark Brown
parent f4f8e4c32c
commit 3f7cec0493
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sound/soc/codecs/cs42l51.c
View File

@ -511,7 +511,6 @@ static struct snd_soc_dai_driver cs42l51_dai = {
static int cs42l51_probe(struct snd_soc_codec *codec) static int cs42l51_probe(struct snd_soc_codec *codec)
{ {
struct cs42l51_private *cs42l51 = snd_soc_codec_get_drvdata(codec); struct cs42l51_private *cs42l51 = snd_soc_codec_get_drvdata(codec);
struct snd_soc_dapm_context *dapm = &codec->dapm;
int ret, reg; int ret, reg;
ret = cs42l51_fill_cache(codec); ret = cs42l51_fill_cache(codec);
@ -539,13 +538,6 @@ static int cs42l51_probe(struct snd_soc_codec *codec)
if (ret < 0) if (ret < 0)
return ret; return ret;
snd_soc_add_controls(codec, cs42l51_snd_controls,
ARRAY_SIZE(cs42l51_snd_controls));
snd_soc_dapm_new_controls(dapm, cs42l51_dapm_widgets,
ARRAY_SIZE(cs42l51_dapm_widgets));
snd_soc_dapm_add_routes(dapm, cs42l51_routes,
ARRAY_SIZE(cs42l51_routes));
return 0; return 0;
} }
@ -553,6 +545,13 @@ static struct snd_soc_codec_driver soc_codec_device_cs42l51 = {
.probe = cs42l51_probe, .probe = cs42l51_probe,
.reg_cache_size = CS42L51_NUMREGS + 1, .reg_cache_size = CS42L51_NUMREGS + 1,
.reg_word_size = sizeof(u8), .reg_word_size = sizeof(u8),
.controls = cs42l51_snd_controls,
.num_controls = ARRAY_SIZE(cs42l51_snd_controls),
.dapm_widgets = cs42l51_dapm_widgets,
.num_dapm_widgets = ARRAY_SIZE(cs42l51_dapm_widgets),
.dapm_routes = cs42l51_routes,
.num_dapm_routes = ARRAY_SIZE(cs42l51_routes),
}; };
static int cs42l51_i2c_probe(struct i2c_client *i2c_client, static int cs42l51_i2c_probe(struct i2c_client *i2c_client,