aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorFabio Estevam <fabio.estevam@freescale.com>2013-08-26 08:25:15 -0400
committerMark Brown <broonie@linaro.org>2013-08-29 08:18:32 -0400
commite925a6b1b6e7ddb43a71b31c0afa12ca9a6ec118 (patch)
treebba7de34a399266f23c5698288ccbc36941ccb0e /sound
parentd8dfad3876e4386666b759da3c833d62fb8b2267 (diff)
ASoC: designware_i2s: Remove unnecessary dev_set_drvdata()
Driver core clears the driver data to NULL after device_release or on probe failure, so just remove it from here. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/dwc/designware_i2s.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/sound/soc/dwc/designware_i2s.c b/sound/soc/dwc/designware_i2s.c
index 70eb37a5dd16..25c31f1655f6 100644
--- a/sound/soc/dwc/designware_i2s.c
+++ b/sound/soc/dwc/designware_i2s.c
@@ -421,13 +421,11 @@ static int dw_i2s_probe(struct platform_device *pdev)
421 dw_i2s_dai, 1); 421 dw_i2s_dai, 1);
422 if (ret != 0) { 422 if (ret != 0) {
423 dev_err(&pdev->dev, "not able to register dai\n"); 423 dev_err(&pdev->dev, "not able to register dai\n");
424 goto err_set_drvdata; 424 goto err_clk_disable;
425 } 425 }
426 426
427 return 0; 427 return 0;
428 428
429err_set_drvdata:
430 dev_set_drvdata(&pdev->dev, NULL);
431err_clk_disable: 429err_clk_disable:
432 clk_disable(dev->clk); 430 clk_disable(dev->clk);
433err_clk_put: 431err_clk_put:
@@ -440,7 +438,6 @@ static int dw_i2s_remove(struct platform_device *pdev)
440 struct dw_i2s_dev *dev = dev_get_drvdata(&pdev->dev); 438 struct dw_i2s_dev *dev = dev_get_drvdata(&pdev->dev);
441 439
442 snd_soc_unregister_component(&pdev->dev); 440 snd_soc_unregister_component(&pdev->dev);
443 dev_set_drvdata(&pdev->dev, NULL);
444 441
445 clk_put(dev->clk); 442 clk_put(dev->clk);
446 443