diff options
| author | Wei Yongjun | 2018-06-22 04:23:24 +0200 |
|---|---|---|
| committer | Mark Brown | 2018-06-22 16:44:55 +0200 |
| commit | a98ec93d7e378db21a6cdbc6d55feaba9fb4b999 (patch) | |
| tree | 724b77f1058583444261a4a9f4d26a33961a2876 /sound/soc/codecs/rt5682.c | |
| parent | ASoC: Intel: common: fix missing rename from 'reef' to 'sof' (diff) | |
| download | kernel-qcow2-linux-a98ec93d7e378db21a6cdbc6d55feaba9fb4b999.tar.gz kernel-qcow2-linux-a98ec93d7e378db21a6cdbc6d55feaba9fb4b999.tar.xz kernel-qcow2-linux-a98ec93d7e378db21a6cdbc6d55feaba9fb4b999.zip | |
ASoC: rt5682: use devm_snd_soc_register_component()
Using devm_snd_soc_register_component() and drop all of the code
related to .remove hook.
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/codecs/rt5682.c')
| -rw-r--r-- | sound/soc/codecs/rt5682.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/sound/soc/codecs/rt5682.c b/sound/soc/codecs/rt5682.c index 61a97301bcfa..baad177908ab 100644 --- a/sound/soc/codecs/rt5682.c +++ b/sound/soc/codecs/rt5682.c @@ -2630,17 +2630,11 @@ static int rt5682_i2c_probe(struct i2c_client *i2c, } - return snd_soc_register_component(&i2c->dev, &soc_component_dev_rt5682, + return devm_snd_soc_register_component(&i2c->dev, + &soc_component_dev_rt5682, rt5682_dai, ARRAY_SIZE(rt5682_dai)); } -static int rt5682_i2c_remove(struct i2c_client *i2c) -{ - snd_soc_unregister_component(&i2c->dev); - - return 0; -} - static void rt5682_i2c_shutdown(struct i2c_client *client) { struct rt5682_priv *rt5682 = i2c_get_clientdata(client); @@ -2671,7 +2665,6 @@ static struct i2c_driver rt5682_i2c_driver = { .acpi_match_table = ACPI_PTR(rt5682_acpi_match), }, .probe = rt5682_i2c_probe, - .remove = rt5682_i2c_remove, .shutdown = rt5682_i2c_shutdown, .id_table = rt5682_i2c_id, }; |