aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Warren <swarren@nvidia.com>2011-04-19 17:25:08 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-04-20 08:49:50 -0400
commitacb8303f15768c72796f3f95bb32a955333e0fbc (patch)
tree4b1175cdd7ae0e27ea826605e89ba325927210e4
parentd9e3c4cc6801b03bce6dd31ba0e1a6acff8f8a1a (diff)
ASoC: Tegra: wm8903: Remove redundant drvdata clears
When the driver is not initialized/registered, nothing should be touching these fields anyway, so there's no point clearing them out. (Applying Mark's TrimSlice review comments to the existing driver) Signed-off-by: Stephen Warren <swarren@nvidia.com> Acked-by: Liam Girdwood <lrg@ti.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r--sound/soc/tegra/tegra_wm8903.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/sound/soc/tegra/tegra_wm8903.c b/sound/soc/tegra/tegra_wm8903.c
index 1eb0632db482..b12b1fd1cb6e 100644
--- a/sound/soc/tegra/tegra_wm8903.c
+++ b/sound/soc/tegra/tegra_wm8903.c
@@ -417,15 +417,12 @@ static __devinit int tegra_wm8903_driver_probe(struct platform_device *pdev)
417 if (ret) { 417 if (ret) {
418 dev_err(&pdev->dev, "snd_soc_register_card failed (%d)\n", 418 dev_err(&pdev->dev, "snd_soc_register_card failed (%d)\n",
419 ret); 419 ret);
420 goto err_clear_drvdata; 420 goto err_fini_utils;
421 } 421 }
422 422
423 return 0; 423 return 0;
424 424
425err_clear_drvdata: 425err_fini_utils:
426 snd_soc_card_set_drvdata(card, NULL);
427 platform_set_drvdata(pdev, NULL);
428 card->dev = NULL;
429 tegra_asoc_utils_fini(&machine->util_data); 426 tegra_asoc_utils_fini(&machine->util_data);
430err_free_machine: 427err_free_machine:
431 kfree(machine); 428 kfree(machine);
@@ -440,10 +437,6 @@ static int __devexit tegra_wm8903_driver_remove(struct platform_device *pdev)
440 437
441 snd_soc_unregister_card(card); 438 snd_soc_unregister_card(card);
442 439
443 snd_soc_card_set_drvdata(card, NULL);
444 platform_set_drvdata(pdev, NULL);
445 card->dev = NULL;
446
447 tegra_asoc_utils_fini(&machine->util_data); 440 tegra_asoc_utils_fini(&machine->util_data);
448 441
449 if (machine->gpio_requested & GPIO_EXT_MIC_EN) 442 if (machine->gpio_requested & GPIO_EXT_MIC_EN)