From 3d07ff70d56b6e25873796faaa322194bbef607e Mon Sep 17 00:00:00 2001 From: Lee Jones Date: Tue, 21 Aug 2012 10:06:44 +0100 Subject: [PATCH] --- yaml --- r: 326885 b: refs/heads/master c: 2087a692a54947ef5688d096e398111a25356692 h: refs/heads/master i: 326883: b42517b64935ea75876b4b485e5ef8904ebf4b3e v: v3 --- [refs] | 2 +- trunk/sound/soc/ux500/mop500.c | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 619c0a030729..7e947c8d61be 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: db5c811d4044b5bd2ef923c7466bd2720eee0887 +refs/heads/master: 2087a692a54947ef5688d096e398111a25356692 diff --git a/trunk/sound/soc/ux500/mop500.c b/trunk/sound/soc/ux500/mop500.c index 6840df79d798..356611d9654d 100644 --- a/trunk/sound/soc/ux500/mop500.c +++ b/trunk/sound/soc/ux500/mop500.c @@ -88,8 +88,6 @@ static int __devinit mop500_probe(struct platform_device *pdev) struct device_node *np = pdev->dev.of_node; int ret; - pr_debug("%s: Enter.\n", __func__); - dev_dbg(&pdev->dev, "%s: Enter.\n", __func__); mop500_card.dev = &pdev->dev; @@ -117,8 +115,7 @@ static int __devinit mop500_probe(struct platform_device *pdev) ret = snd_soc_register_card(&mop500_card); if (ret) dev_err(&pdev->dev, - "Error: snd_soc_register_card failed (%d)!\n", - ret); + "Error: snd_soc_register_card failed (%d)!\n", ret); return ret; } @@ -131,7 +128,7 @@ static int __devexit mop500_remove(struct platform_device *pdev) snd_soc_unregister_card(mop500_card); mop500_ab8500_remove(mop500_card); - + return 0; }