Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e925a6b1 authored by Fabio Estevam's avatar Fabio Estevam Committed by Mark Brown
Browse files

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: default avatarFabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent d8dfad38

sound/soc/dwc/designware_i2s.c

+1 −4
Original line number Original line Diff line number Diff line
@@ -421,13 +421,11 @@ static int dw_i2s_probe(struct platform_device *pdev) 
					 dw_i2s_dai, 1);

					 dw_i2s_dai, 1);

	if (ret != 0) {

	if (ret != 0) {

		dev_err(&pdev->dev, "not able to register dai\n");

		dev_err(&pdev->dev, "not able to register dai\n");

		goto err_set_drvdata;

		goto err_clk_disable;

	}

	}





	return 0;

	return 0;





err_set_drvdata:

	dev_set_drvdata(&pdev->dev, NULL);

err_clk_disable:

err_clk_disable:

	clk_disable(dev->clk);

	clk_disable(dev->clk);

err_clk_put:

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);

	struct dw_i2s_dev *dev = dev_get_drvdata(&pdev->dev);





	snd_soc_unregister_component(&pdev->dev);

	snd_soc_unregister_component(&pdev->dev);

	dev_set_drvdata(&pdev->dev, NULL);





	clk_put(dev->clk);

	clk_put(dev->clk);