Commit 7253e354 authored by Tushar Behera's avatar Tushar Behera Committed by Mark Brown
Browse files

ASoC: samsung: Use devm_snd_soc_register_component 



Replaced snd_soc_register_component with its devres equivalent,
devm_snd_soc_register_component.

Signed-off-by: default avatarTushar Behera <tushar.behera@linaro.org>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 55313bd3

sound/soc/samsung/ac97.c

+2 −6
Original line number Diff line number Diff line
@@ -433,7 +433,7 @@ static int s3c_ac97_probe(struct platform_device *pdev) 
		goto err4;

	}



	ret = snd_soc_register_component(&pdev->dev, &s3c_ac97_component,

	ret = devm_snd_soc_register_component(&pdev->dev, &s3c_ac97_component,

					 s3c_ac97_dai, ARRAY_SIZE(s3c_ac97_dai));

	if (ret)

		goto err5;
@@ -441,12 +441,10 @@ static int s3c_ac97_probe(struct platform_device *pdev) 
	ret = samsung_asoc_dma_platform_register(&pdev->dev);

	if (ret) {

		dev_err(&pdev->dev, "failed to get register DMA: %d\n", ret);

		goto err6;

		goto err5;

	}



	return 0;

err6:

	snd_soc_unregister_component(&pdev->dev);

err5:

	free_irq(irq_res->start, NULL);

err4:
@@ -461,8 +459,6 @@ static int s3c_ac97_remove(struct platform_device *pdev) 
{

	struct resource *irq_res;



	snd_soc_unregister_component(&pdev->dev);



	irq_res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);

	if (irq_res)

		free_irq(irq_res->start, NULL);

sound/soc/samsung/goni_wm8994.c

+3 −6
Original line number Diff line number Diff line
@@ -274,8 +274,8 @@ static int __init goni_init(void) 
		return -ENOMEM;



	/* register voice DAI here */

	ret = snd_soc_register_component(&goni_snd_device->dev, &voice_component,

					 &voice_dai, 1);

	ret = devm_snd_soc_register_component(&goni_snd_device->dev,

			&voice_component, &voice_dai, 1);

	if (ret) {

		platform_device_put(goni_snd_device);

		return ret;
@@ -284,17 +284,14 @@ static int __init goni_init(void) 
	platform_set_drvdata(goni_snd_device, &goni);

	ret = platform_device_add(goni_snd_device);



	if (ret) {

		snd_soc_unregister_component(&goni_snd_device->dev);

	if (ret)

		platform_device_put(goni_snd_device);

	}



	return ret;

}



static void __exit goni_exit(void)

{

	snd_soc_unregister_component(&goni_snd_device->dev);

	platform_device_unregister(goni_snd_device);

}

sound/soc/samsung/pcm.c

+2 −6
Original line number Diff line number Diff line
@@ -588,7 +588,7 @@ static int s3c_pcm_dev_probe(struct platform_device *pdev) 


	pm_runtime_enable(&pdev->dev);



	ret = snd_soc_register_component(&pdev->dev, &s3c_pcm_component,

	ret = devm_snd_soc_register_component(&pdev->dev, &s3c_pcm_component,

					 &s3c_pcm_dai[pdev->id], 1);

	if (ret != 0) {

		dev_err(&pdev->dev, "failed to get register DAI: %d\n", ret);
@@ -598,13 +598,11 @@ static int s3c_pcm_dev_probe(struct platform_device *pdev) 
	ret = samsung_asoc_dma_platform_register(&pdev->dev);

	if (ret) {

		dev_err(&pdev->dev, "failed to get register DMA: %d\n", ret);

		goto err6;

		goto err5;

	}



	return 0;



err6:

	snd_soc_unregister_component(&pdev->dev);

err5:

	clk_disable_unprepare(pcm->pclk);

	clk_put(pcm->pclk);
@@ -624,8 +622,6 @@ static int s3c_pcm_dev_remove(struct platform_device *pdev) 
	struct s3c_pcm_info *pcm = &s3c_pcm[pdev->id];

	struct resource *mem_res;



	snd_soc_unregister_component(&pdev->dev);



	pm_runtime_disable(&pdev->dev);



	iounmap(pcm->regs);

sound/soc/samsung/s3c-i2s-v2.c

+1 −1
Original line number Diff line number Diff line
@@ -745,7 +745,7 @@ int s3c_i2sv2_register_component(struct device *dev, int id, 
	dai_drv->suspend = s3c2412_i2s_suspend;

	dai_drv->resume = s3c2412_i2s_resume;



	return snd_soc_register_component(dev, cmp_drv, dai_drv, 1);

	return devm_snd_soc_register_component(dev, cmp_drv, dai_drv, 1);

}

EXPORT_SYMBOL_GPL(s3c_i2sv2_register_component);

sound/soc/samsung/s3c2412-i2s.c

+1 −13
Original line number Diff line number Diff line
@@ -179,26 +179,14 @@ static int s3c2412_iis_dev_probe(struct platform_device *pdev) 
	}



	ret = samsung_asoc_dma_platform_register(&pdev->dev);

	if (ret) {

	if (ret)

		pr_err("failed to register the DMA: %d\n", ret);

		goto err;

	}



	return 0;

err:

	snd_soc_unregister_component(&pdev->dev);

	return ret;

}



static int s3c2412_iis_dev_remove(struct platform_device *pdev)

{

	snd_soc_unregister_component(&pdev->dev);

	return 0;

}



static struct platform_driver s3c2412_iis_driver = {

	.probe  = s3c2412_iis_dev_probe,

	.remove = s3c2412_iis_dev_remove,

	.driver = {

		.name = "s3c2412-iis",

		.owner = THIS_MODULE,