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

Commit 55313bd3 authored by Tushar Behera's avatar Tushar Behera Committed by Mark Brown
Browse files

ASoC: samsung: Use devm_snd_soc_register_platform 



Replaced snd_soc_register_platform with devm_snd_soc_register_platform
in samsung_asoc_dma_platform_register(). This makes the function
samsung_asoc_dma_platform_unregister() redundant. This is removed and
all its users are updated.

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

sound/soc/samsung/ac97.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -461,7 +461,6 @@ static int s3c_ac97_remove(struct platform_device *pdev) 
{

{

	struct resource *irq_res;

	struct resource *irq_res;





	samsung_asoc_dma_platform_unregister(&pdev->dev);

	snd_soc_unregister_component(&pdev->dev);

	snd_soc_unregister_component(&pdev->dev);





	irq_res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);

	irq_res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);

sound/soc/samsung/dma.c

+1 −7
Original line number Original line Diff line number Diff line
@@ -445,16 +445,10 @@ EXPORT_SYMBOL_GPL(samsung_asoc_init_dma_data); 




int samsung_asoc_dma_platform_register(struct device *dev)

int samsung_asoc_dma_platform_register(struct device *dev)

{

{

	return snd_soc_register_platform(dev, &samsung_asoc_platform);

	return devm_snd_soc_register_platform(dev, &samsung_asoc_platform);

}

}

EXPORT_SYMBOL_GPL(samsung_asoc_dma_platform_register);

EXPORT_SYMBOL_GPL(samsung_asoc_dma_platform_register);





void samsung_asoc_dma_platform_unregister(struct device *dev)

{

	snd_soc_unregister_platform(dev);

}

EXPORT_SYMBOL_GPL(samsung_asoc_dma_platform_unregister);



MODULE_AUTHOR("Ben Dooks, <ben@simtec.co.uk>");

MODULE_AUTHOR("Ben Dooks, <ben@simtec.co.uk>");

MODULE_DESCRIPTION("Samsung ASoC DMA Driver");

MODULE_DESCRIPTION("Samsung ASoC DMA Driver");

MODULE_LICENSE("GPL");
 
MODULE_LICENSE("GPL");

sound/soc/samsung/dma.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -33,6 +33,5 @@ void samsung_asoc_init_dma_data(struct snd_soc_dai *dai, 
				struct s3c_dma_params *playback,

				struct s3c_dma_params *playback,

				struct s3c_dma_params *capture);

				struct s3c_dma_params *capture);

int samsung_asoc_dma_platform_register(struct device *dev);

int samsung_asoc_dma_platform_register(struct device *dev);

void samsung_asoc_dma_platform_unregister(struct device *dev);





#endif
 
#endif

sound/soc/samsung/dmaengine.c

+4 −9
Original line number Original line Diff line number Diff line
@@ -66,18 +66,13 @@ EXPORT_SYMBOL_GPL(samsung_asoc_init_dma_data); 




int samsung_asoc_dma_platform_register(struct device *dev)

int samsung_asoc_dma_platform_register(struct device *dev)

{

{

	return snd_dmaengine_pcm_register(dev, &samsung_dmaengine_pcm_config,

	return devm_snd_dmaengine_pcm_register(dev,

			&samsung_dmaengine_pcm_config,

			SND_DMAENGINE_PCM_FLAG_CUSTOM_CHANNEL_NAME |

			SND_DMAENGINE_PCM_FLAG_CUSTOM_CHANNEL_NAME |

			SND_DMAENGINE_PCM_FLAG_COMPAT);

			SND_DMAENGINE_PCM_FLAG_COMPAT);

}

}

EXPORT_SYMBOL_GPL(samsung_asoc_dma_platform_register);

EXPORT_SYMBOL_GPL(samsung_asoc_dma_platform_register);





void samsung_asoc_dma_platform_unregister(struct device *dev)

{

	return snd_dmaengine_pcm_unregister(dev);

}

EXPORT_SYMBOL_GPL(samsung_asoc_dma_platform_unregister);



MODULE_AUTHOR("Mark Brown <broonie@linaro.org>");

MODULE_AUTHOR("Mark Brown <broonie@linaro.org>");

MODULE_DESCRIPTION("Samsung dmaengine ASoC driver");

MODULE_DESCRIPTION("Samsung dmaengine ASoC driver");

MODULE_LICENSE("GPL");
 
MODULE_LICENSE("GPL");

sound/soc/samsung/i2s.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -1295,8 +1295,6 @@ static int samsung_i2s_remove(struct platform_device *pdev) 
	i2s->pri_dai = NULL;

	i2s->pri_dai = NULL;

	i2s->sec_dai = NULL;

	i2s->sec_dai = NULL;





	samsung_asoc_dma_platform_unregister(&pdev->dev);



	return 0;

	return 0;

}

}