ASoC: sh: use devm_snd_soc_register_component()

morimoto · broonie · commit afa88ee37b13 · 2018-09-10T15:14:38.000+01:00
Now we have devm_snd_soc_register_component().
Let's use it instead of snd_soc_register_component().

Signed-off-by: Kuninori Morimoto &lt;kuninori.morimoto.gx@renesas.com&gt;
Signed-off-by: Mark Brown &lt;broonie@kernel.org&gt;
diff --git a/sound/soc/sh/hac.c b/sound/soc/sh/hac.c
@@ -319,13 +319,12 @@ static int hac_soc_platform_probe(struct platform_device *pdev)
 	if (ret != 0)
 		return ret;
 
-	return snd_soc_register_component(&pdev->dev, &sh4_hac_component,
+	return devm_snd_soc_register_component(&pdev->dev, &sh4_hac_component,
 					  sh4_hac_dai, ARRAY_SIZE(sh4_hac_dai));
 }
 
 static int hac_soc_platform_remove(struct platform_device *pdev)
 {
-	snd_soc_unregister_component(&pdev->dev);
 	snd_soc_set_ac97_ops(NULL);
 	return 0;
 }

Original file line number	Diff line number	Diff line change
`@@ -319,13 +319,12 @@ static int hac_soc_platform_probe(struct platform_device *pdev)`
`319`	`319`	`if (ret != 0)`
`320`	`320`	`return ret;`
`321`	`321`
`322`		`- return snd_soc_register_component(&pdev->dev, &sh4_hac_component,`
	`322`	`+ return devm_snd_soc_register_component(&pdev->dev, &sh4_hac_component,`
`323`	`323`	`sh4_hac_dai, ARRAY_SIZE(sh4_hac_dai));`
`324`	`324`	`}`
`325`	`325`
`326`	`326`	`static int hac_soc_platform_remove(struct platform_device *pdev)`
`327`	`327`	`{`
`328`		`- snd_soc_unregister_component(&pdev->dev);`
`329`	`328`	`snd_soc_set_ac97_ops(NULL);`
`330`	`329`	`return 0;`
`331`	`330`	`}`