diff options
author | Fabio Estevam <fabio.estevam@freescale.com> | 2013-08-26 14:25:15 +0200 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-08-29 14:18:32 +0200 |
commit | e925a6b1b6e7ddb43a71b31c0afa12ca9a6ec118 (patch) | |
tree | bba7de34a399266f23c5698288ccbc36941ccb0e /sound | |
parent | Linux 3.11-rc7 (diff) | |
download | linux-e925a6b1b6e7ddb43a71b31c0afa12ca9a6ec118.tar.xz linux-e925a6b1b6e7ddb43a71b31c0afa12ca9a6ec118.zip |
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.c | 5 |
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) dw_i2s_dai, 1); if (ret != 0) { dev_err(&pdev->dev, "not able to register dai\n"); - goto err_set_drvdata; + goto err_clk_disable; } return 0; -err_set_drvdata: - dev_set_drvdata(&pdev->dev, NULL); err_clk_disable: clk_disable(dev->clk); err_clk_put: @@ -440,7 +438,6 @@ static int dw_i2s_remove(struct platform_device *pdev) struct dw_i2s_dev *dev = dev_get_drvdata(&pdev->dev); snd_soc_unregister_component(&pdev->dev); - dev_set_drvdata(&pdev->dev, NULL); clk_put(dev->clk); |