Unverified Commit 8af26493 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: atmel: atmel-pcm-dma.c: use devm_snd_dmaengine_pcm_register() 



We have devm_xxx version of snd_dmaengine_pcm_register,
let's use it.

This patch also removes related empty functions

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Reviewed-by: default avatarCodrin Ciubotariu <codrin.ciubotariu@microchip.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 8fc22fa4

sound/soc/atmel/atmel-pcm-dma.c

+2 −7
Original line number Diff line number Diff line
@@ -111,16 +111,11 @@ static const struct snd_dmaengine_pcm_config atmel_dmaengine_pcm_config = { 


int atmel_pcm_dma_platform_register(struct device *dev)

{

	return snd_dmaengine_pcm_register(dev, &atmel_dmaengine_pcm_config, 0);

	return devm_snd_dmaengine_pcm_register(dev,

					&atmel_dmaengine_pcm_config, 0);

}

EXPORT_SYMBOL(atmel_pcm_dma_platform_register);



void atmel_pcm_dma_platform_unregister(struct device *dev)

{

	snd_dmaengine_pcm_unregister(dev);

}

EXPORT_SYMBOL(atmel_pcm_dma_platform_unregister);



MODULE_AUTHOR("Bo Shen <voice.shen@atmel.com>");

MODULE_DESCRIPTION("Atmel DMA based PCM module");

MODULE_LICENSE("GPL");

sound/soc/atmel/atmel-pcm-pdc.c

+0 −5
Original line number Diff line number Diff line
@@ -393,11 +393,6 @@ int atmel_pcm_pdc_platform_register(struct device *dev) 
}

EXPORT_SYMBOL(atmel_pcm_pdc_platform_register);



void atmel_pcm_pdc_platform_unregister(struct device *dev)

{

}

EXPORT_SYMBOL(atmel_pcm_pdc_platform_unregister);



MODULE_AUTHOR("Sedji Gaouaou <sedji.gaouaou@atmel.com>");

MODULE_DESCRIPTION("Atmel PCM module");

MODULE_LICENSE("GPL");

sound/soc/atmel/atmel-pcm.h

+0 −8
Original line number Diff line number Diff line
@@ -72,28 +72,20 @@ struct atmel_pcm_dma_params { 


#if IS_ENABLED(CONFIG_SND_ATMEL_SOC_PDC)

int atmel_pcm_pdc_platform_register(struct device *dev);

void atmel_pcm_pdc_platform_unregister(struct device *dev);

#else

static inline int atmel_pcm_pdc_platform_register(struct device *dev)

{

	return 0;

}

static inline void atmel_pcm_pdc_platform_unregister(struct device *dev)

{

}

#endif



#if IS_ENABLED(CONFIG_SND_ATMEL_SOC_DMA)

int atmel_pcm_dma_platform_register(struct device *dev);

void atmel_pcm_dma_platform_unregister(struct device *dev);

#else

static inline int atmel_pcm_dma_platform_register(struct device *dev)

{

	return 0;

}

static inline void atmel_pcm_dma_platform_unregister(struct device *dev)

{

}

#endif



#endif /* _ATMEL_PCM_H */

sound/soc/atmel/atmel_ssc_dai.c

+0 −11
Original line number Diff line number Diff line
@@ -1012,16 +1012,6 @@ static int asoc_ssc_init(struct device *dev) 
	return 0;

}



static void asoc_ssc_exit(struct device *dev)

{

	struct ssc_device *ssc = dev_get_drvdata(dev);



	if (ssc->pdata->use_dma)

		atmel_pcm_dma_platform_unregister(dev);

	else

		atmel_pcm_pdc_platform_unregister(dev);

}



/**

 * atmel_ssc_set_audio - Allocate the specified SSC for audio use.

 */
@@ -1050,7 +1040,6 @@ void atmel_ssc_put_audio(int ssc_id) 
{

	struct ssc_device *ssc = ssc_info[ssc_id].ssc;



	asoc_ssc_exit(&ssc->pdev->dev);

	ssc_free(ssc);

}

EXPORT_SYMBOL_GPL(atmel_ssc_put_audio);

CRA Git | Maintained and supported by SUSTech CRA and CCSE