[4/6] ASoC: qi_lb60: Use devm_snd_soc_register_card()
diff mbox

Message ID 1398199596-23649-4-git-send-email-lars@metafoo.de
State Accepted
Commit 050f62e4de52901cc0f7aebbd64876d2639a8657
Headers show

Commit Message

Lars-Peter Clausen April 22, 2014, 8:46 p.m. UTC
Makes the code a bit shorter and will also allow us to remove the drivers
remove() callback eventually.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
---
 sound/soc/jz4740/qi_lb60.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

Comments

Mark Brown April 22, 2014, 8:54 p.m. UTC | #1
On Tue, Apr 22, 2014 at 10:46:34PM +0200, Lars-Peter Clausen wrote:
> Makes the code a bit shorter and will also allow us to remove the drivers
> remove() callback eventually.

Applied all the patches up to here, thanks.  Will wait for Ralf's review
for the other two, they look good to me.
Ralf Baechle April 22, 2014, 10:06 p.m. UTC | #2
On Tue, Apr 22, 2014 at 09:54:10PM +0100, Mark Brown wrote:

> On Tue, Apr 22, 2014 at 10:46:34PM +0200, Lars-Peter Clausen wrote:
> > Makes the code a bit shorter and will also allow us to remove the drivers
> > remove() callback eventually.
> 
> Applied all the patches up to here, thanks.  Will wait for Ralf's review
> for the other two, they look good to me.

Acked-by: Ralf Baechle <ralf@linux-mips.org>

Really, the MIPS bits were trivial ...

  Ralf

Patch
diff mbox

diff --git a/sound/soc/jz4740/qi_lb60.c b/sound/soc/jz4740/qi_lb60.c
index 72ce103..be0a437 100644
--- a/sound/soc/jz4740/qi_lb60.c
+++ b/sound/soc/jz4740/qi_lb60.c
@@ -86,7 +86,7 @@  static int qi_lb60_probe(struct platform_device *pdev)
 
 	card->dev = &pdev->dev;
 
-	ret = snd_soc_register_card(card);
+	ret = devm_snd_soc_register_card(&pdev->dev, card);
 	if (ret) {
 		dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n",
 			ret);
@@ -97,9 +97,6 @@  static int qi_lb60_probe(struct platform_device *pdev)
 
 static int qi_lb60_remove(struct platform_device *pdev)
 {
-	struct snd_soc_card *card = platform_get_drvdata(pdev);
-
-	snd_soc_unregister_card(card);
 	gpio_free_array(qi_lb60_gpios, ARRAY_SIZE(qi_lb60_gpios));
 	return 0;
 }