Commit 014e5b56 authored by Richard Zhao's avatar Richard Zhao Committed by Mark Brown
Browse files

ASoC: fsl_ssi: convert to use devm_clk_get 



Signed-off-by: default avatarRichard Zhao <richard.zhao@freescale.com>
Acked-by: default avatarTimur Tabi <timur@freescale.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent ec02995a

sound/soc/fsl/fsl_ssi.c

+2 −5
Original line number Original line Diff line number Diff line
@@ -725,7 +725,7 @@ static int __devinit fsl_ssi_probe(struct platform_device *pdev) 
		u32 dma_events[2];

		u32 dma_events[2];

		ssi_private->ssi_on_imx = true;

		ssi_private->ssi_on_imx = true;





		ssi_private->clk = clk_get(&pdev->dev, NULL);

		ssi_private->clk = devm_clk_get(&pdev->dev, NULL);

		if (IS_ERR(ssi_private->clk)) {

		if (IS_ERR(ssi_private->clk)) {

			ret = PTR_ERR(ssi_private->clk);

			ret = PTR_ERR(ssi_private->clk);

			dev_err(&pdev->dev, "could not get clock: %d\n", ret);

			dev_err(&pdev->dev, "could not get clock: %d\n", ret);
@@ -842,10 +842,8 @@ static int __devinit fsl_ssi_probe(struct platform_device *pdev) 
	device_remove_file(&pdev->dev, dev_attr);

	device_remove_file(&pdev->dev, dev_attr);





error_clk:

error_clk:

	if (ssi_private->ssi_on_imx) {

	if (ssi_private->ssi_on_imx)

		clk_disable_unprepare(ssi_private->clk);

		clk_disable_unprepare(ssi_private->clk);

		clk_put(ssi_private->clk);

	}





error_irq:

error_irq:

	free_irq(ssi_private->irq, ssi_private);

	free_irq(ssi_private->irq, ssi_private);
@@ -871,7 +869,6 @@ static int fsl_ssi_remove(struct platform_device *pdev) 
	if (ssi_private->ssi_on_imx) {

	if (ssi_private->ssi_on_imx) {

		platform_device_unregister(ssi_private->imx_pcm_pdev);

		platform_device_unregister(ssi_private->imx_pcm_pdev);

		clk_disable_unprepare(ssi_private->clk);

		clk_disable_unprepare(ssi_private->clk);

		clk_put(ssi_private->clk);

	}

	}

	snd_soc_unregister_dai(&pdev->dev);

	snd_soc_unregister_dai(&pdev->dev);

	device_remove_file(&pdev->dev, &ssi_private->dev_attr);

	device_remove_file(&pdev->dev, &ssi_private->dev_attr);