ASoC: Tegra: wm8903: Remove redundant drvdata clears
authorStephen Warren <swarren@nvidia.com>
Tue, 19 Apr 2011 21:25:08 +0000 (15:25 -0600)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 20 Apr 2011 12:49:50 +0000 (13:49 +0100)
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>
sound/soc/tegra/tegra_wm8903.c

index 1eb0632db482c79a97a621fb22fe392dcb3fe8f8..b12b1fd1cb6e12c289cd8b2bab6bff9047ab187b 100644 (file)
@@ -417,15 +417,12 @@ static __devinit int tegra_wm8903_driver_probe(struct platform_device *pdev)
        if (ret) {
                dev_err(&pdev->dev, "snd_soc_register_card failed (%d)\n",
                        ret);
-               goto err_clear_drvdata;
+               goto err_fini_utils;
        }
 
        return 0;
 
-err_clear_drvdata:
-       snd_soc_card_set_drvdata(card, NULL);
-       platform_set_drvdata(pdev, NULL);
-       card->dev = NULL;
+err_fini_utils:
        tegra_asoc_utils_fini(&machine->util_data);
 err_free_machine:
        kfree(machine);
@@ -440,10 +437,6 @@ static int __devexit tegra_wm8903_driver_remove(struct platform_device *pdev)
 
        snd_soc_unregister_card(card);
 
-       snd_soc_card_set_drvdata(card, NULL);
-       platform_set_drvdata(pdev, NULL);
-       card->dev = NULL;
-
        tegra_asoc_utils_fini(&machine->util_data);
 
        if (machine->gpio_requested & GPIO_EXT_MIC_EN)