diff options
| author |   Lars-Peter Clausen <lars@metafoo.de> | 2015-07-16 21:22:50 +0200 |
|---|---|---|
| committer |   Mark Brown <broonie@kernel.org> | 2015-07-16 21:35:12 +0100 |
| commit | 623436af42ef2b37fee8f6058a85f4664bd32c74 (patch) | |
| tree | ec391608e1f0c51cd99fee4a792f55274bc9f6e3 /sound | |
| parent | ASoC: max9877: Make driver global regmap struct local (diff) | |
| download | linux-dev-623436af42ef2b37fee8f6058a85f4664bd32c74.tar.xz linux-dev-623436af42ef2b37fee8f6058a85f4664bd32c74.zip | |
ASoC: max9877: Convert to component
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>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/max9877.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/sound/soc/codecs/max9877.c b/sound/soc/codecs/max9877.c index b469e1c82ea2..fb448dde018d 100644 --- a/sound/soc/codecs/max9877.c +++ b/sound/soc/codecs/max9877.c @@ -121,7 +121,7 @@ static const struct snd_soc_dapm_route max9877_dapm_routes[] = { { "HPR", NULL, "SHDN" }, }; -static const struct snd_soc_codec_driver max9877_codec = { +static const struct snd_soc_component_driver max9877_component_driver = { .controls = max9877_controls, .num_controls = ARRAY_SIZE(max9877_controls), @@ -154,14 +154,8 @@ static int max9877_i2c_probe(struct i2c_client *client, for (i = 0; i < ARRAY_SIZE(max9877_regs); i++) regmap_write(regmap, max9877_regs[i].reg, max9877_regs[i].def); - return snd_soc_register_codec(&client->dev, &max9877_codec, NULL, 0); -} - -static int max9877_i2c_remove(struct i2c_client *client) -{ - snd_soc_unregister_codec(&client->dev); - - return 0; + return devm_snd_soc_register_component(&client->dev, + &max9877_component_driver, NULL, 0); } static const struct i2c_device_id max9877_i2c_id[] = { @@ -175,7 +169,6 @@ static struct i2c_driver max9877_i2c_driver = { .name = "max9877", }, .probe = max9877_i2c_probe, - .remove = max9877_i2c_remove, .id_table = max9877_i2c_id, }; |