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 <[email protected]>
---
 sound/soc/tegra/tegra_wm8903.c |   11 ++---------
 1 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/sound/soc/tegra/tegra_wm8903.c b/sound/soc/tegra/tegra_wm8903.c
index 1eb0632..b12b1fd 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)
        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)
-- 
1.7.1

--
To unsubscribe from this list: send the line "unsubscribe linux-tegra" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to