diff options
author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2019-06-28 00:08:48 -0400 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2019-07-02 08:48:29 -0400 |
commit | 7422104037773624d2a6cdb9becb68278befbd88 (patch) | |
tree | 50eaad7af2a39b60cd0cdc6238d098c7f7754828 | |
parent | 2d2e331697bfba9dcc59217b1fcbfa2c144f0659 (diff) |
ASoC: au1x: psc-i2s.c: use devm_snd_soc_register_component()
We have devm_xxx version of snd_soc_register_component,
let's use it.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r-- | sound/soc/au1x/psc-i2s.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sound/soc/au1x/psc-i2s.c b/sound/soc/au1x/psc-i2s.c index 4a5a095076f4..076303f96b8c 100644 --- a/sound/soc/au1x/psc-i2s.c +++ b/sound/soc/au1x/psc-i2s.c | |||
@@ -340,16 +340,14 @@ static int au1xpsc_i2s_drvprobe(struct platform_device *pdev) | |||
340 | 340 | ||
341 | platform_set_drvdata(pdev, wd); | 341 | platform_set_drvdata(pdev, wd); |
342 | 342 | ||
343 | return snd_soc_register_component(&pdev->dev, &au1xpsc_i2s_component, | 343 | return devm_snd_soc_register_component(&pdev->dev, |
344 | &wd->dai_drv, 1); | 344 | &au1xpsc_i2s_component, &wd->dai_drv, 1); |
345 | } | 345 | } |
346 | 346 | ||
347 | static int au1xpsc_i2s_drvremove(struct platform_device *pdev) | 347 | static int au1xpsc_i2s_drvremove(struct platform_device *pdev) |
348 | { | 348 | { |
349 | struct au1xpsc_audio_data *wd = platform_get_drvdata(pdev); | 349 | struct au1xpsc_audio_data *wd = platform_get_drvdata(pdev); |
350 | 350 | ||
351 | snd_soc_unregister_component(&pdev->dev); | ||
352 | |||
353 | __raw_writel(0, I2S_CFG(wd)); | 351 | __raw_writel(0, I2S_CFG(wd)); |
354 | wmb(); /* drain writebuffer */ | 352 | wmb(); /* drain writebuffer */ |
355 | __raw_writel(PSC_CTRL_DISABLE, PSC_CTRL(wd)); | 353 | __raw_writel(PSC_CTRL_DISABLE, PSC_CTRL(wd)); |