aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@ingics.com>2015-10-20 19:13:45 +0800
committerMark Brown <broonie@kernel.org>2015-10-23 01:53:32 +0900
commit4901aa065bced55be5ae55b58fc032bfc727fdda (patch)
treeffafcb4317213d49bd8c4947e561e90a39b23019 /sound
parentASoC: Intel: switch from ioremap_cache to memremap (diff)
downloadlinux-dev-4901aa065bced55be5ae55b58fc032bfc727fdda.tar.xz
linux-dev-4901aa065bced55be5ae55b58fc032bfc727fdda.zip
ASoC: Intel: Skylake: Convert to devm_snd_soc_register_card
Signed-off-by: Axel Lin <axel.lin@ingics.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/intel/boards/skl_rt286.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/sound/soc/intel/boards/skl_rt286.c b/sound/soc/intel/boards/skl_rt286.c
index 488c98ee1ded..a73a431bd8b7 100644
--- a/sound/soc/intel/boards/skl_rt286.c
+++ b/sound/soc/intel/boards/skl_rt286.c
@@ -240,18 +240,11 @@ static int skylake_audio_probe(struct platform_device *pdev)
{
skylake_rt286.dev = &pdev->dev;
- return snd_soc_register_card(&skylake_rt286);
-}
-
-static int skylake_audio_remove(struct platform_device *pdev)
-{
- snd_soc_unregister_card(&skylake_rt286);
- return 0;
+ return devm_snd_soc_register_card(&pdev->dev, &skylake_rt286);
}
static struct platform_driver skylake_audio = {
.probe = skylake_audio_probe,
- .remove = skylake_audio_remove,
.driver = {
.name = "skl_alc286s_i2s",
},