| Message ID | 87a7e2tkx5.wl-kuninori.morimoto.gx@renesas.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 8af26493c03581ad476a77630502de6152cf013d |
| Headers | show |
| Series | ASoC: use devm_xxx | expand |
On 28.06.2019 07:07, Kuninori Morimoto wrote: > External E-Mail > > > From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> > > We have devm_xxx version of snd_dmaengine_pcm_register, > let's use it. > > This patch also removes related empty functions > > Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> > --- Reviewed-by: Codrin Ciubotariu <codrin.ciubotariu@microchip.com> Thanks again! Best regards, Codrin > v1 -> v2 > > - remove empty functions > > sound/soc/atmel/atmel-pcm-dma.c | 9 ++------- > sound/soc/atmel/atmel-pcm-pdc.c | 5 ----- > sound/soc/atmel/atmel-pcm.h | 8 -------- > sound/soc/atmel/atmel_ssc_dai.c | 11 ----------- > 4 files changed, 2 insertions(+), 31 deletions(-) > > diff --git a/sound/soc/atmel/atmel-pcm-dma.c b/sound/soc/atmel/atmel-pcm-dma.c > index 042e593..db67f5b 100644 > --- a/sound/soc/atmel/atmel-pcm-dma.c > +++ b/sound/soc/atmel/atmel-pcm-dma.c > @@ -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"); > diff --git a/sound/soc/atmel/atmel-pcm-pdc.c b/sound/soc/atmel/atmel-pcm-pdc.c > index 7e9aa70..ed095af 100644 > --- a/sound/soc/atmel/atmel-pcm-pdc.c > +++ b/sound/soc/atmel/atmel-pcm-pdc.c > @@ -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"); > diff --git a/sound/soc/atmel/atmel-pcm.h b/sound/soc/atmel/atmel-pcm.h > index 5173c9b..2e64874 100644 > --- a/sound/soc/atmel/atmel-pcm.h > +++ b/sound/soc/atmel/atmel-pcm.h > @@ -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 */ > diff --git a/sound/soc/atmel/atmel_ssc_dai.c b/sound/soc/atmel/atmel_ssc_dai.c > index b66c778..6f89483 100644 > --- a/sound/soc/atmel/atmel_ssc_dai.c > +++ b/sound/soc/atmel/atmel_ssc_dai.c > @@ -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); >
diff --git a/sound/soc/atmel/atmel-pcm-dma.c b/sound/soc/atmel/atmel-pcm-dma.c index 042e593..db67f5b 100644 --- a/sound/soc/atmel/atmel-pcm-dma.c +++ b/sound/soc/atmel/atmel-pcm-dma.c @@ -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"); diff --git a/sound/soc/atmel/atmel-pcm-pdc.c b/sound/soc/atmel/atmel-pcm-pdc.c index 7e9aa70..ed095af 100644 --- a/sound/soc/atmel/atmel-pcm-pdc.c +++ b/sound/soc/atmel/atmel-pcm-pdc.c @@ -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"); diff --git a/sound/soc/atmel/atmel-pcm.h b/sound/soc/atmel/atmel-pcm.h index 5173c9b..2e64874 100644 --- a/sound/soc/atmel/atmel-pcm.h +++ b/sound/soc/atmel/atmel-pcm.h @@ -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 */ diff --git a/sound/soc/atmel/atmel_ssc_dai.c b/sound/soc/atmel/atmel_ssc_dai.c index b66c778..6f89483 100644 --- a/sound/soc/atmel/atmel_ssc_dai.c +++ b/sound/soc/atmel/atmel_ssc_dai.c @@ -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);