evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ASoC: lm4857: Convert to component

Browse source 
The driver does not use any CODEC specific constructs anymore. Convert it
to snd_soc_component.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Lars-Peter Clausen 2015-05-01 18:02:45 +02:00 • committed by Mark Brown
parent 0eb93ef04b
commit 08a1e646bd
1 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
sound/soc/codecs/lm4857.c
View file

@ -100,7 +100,7 @@ static const struct snd_soc_dapm_route lm4857_routes[] = {
{ "EP", "Earpiece", "Mode" }, { "EP", "Earpiece", "Mode" },
}; };
static struct snd_soc_codec_driver soc_codec_dev_lm4857 = { static struct snd_soc_component_driver lm4857_component_driver = {
.controls = lm4857_controls, .controls = lm4857_controls,
.num_controls = ARRAY_SIZE(lm4857_controls), .num_controls = ARRAY_SIZE(lm4857_controls),
.dapm_widgets = lm4857_dapm_widgets, .dapm_widgets = lm4857_dapm_widgets,
@ -129,13 +129,8 @@ static int lm4857_i2c_probe(struct i2c_client *i2c,
if (IS_ERR(regmap)) if (IS_ERR(regmap))
return PTR_ERR(regmap); return PTR_ERR(regmap);
return snd_soc_register_codec(&i2c->dev, &soc_codec_dev_lm4857, NULL, 0); return devm_snd_soc_register_component(&i2c->dev,
} &lm4857_component_driver, NULL, 0);
static int lm4857_i2c_remove(struct i2c_client *i2c)
{
snd_soc_unregister_codec(&i2c->dev);
return 0;
} }
static const struct i2c_device_id lm4857_i2c_id[] = { static const struct i2c_device_id lm4857_i2c_id[] = {
@ -150,7 +145,6 @@ static struct i2c_driver lm4857_i2c_driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.probe = lm4857_i2c_probe, .probe = lm4857_i2c_probe,
.remove = lm4857_i2c_remove,
.id_table = lm4857_i2c_id, .id_table = lm4857_i2c_id,
}; };