[PATCH] ASoC: atmel_ssc_dai: make module reloadable

[PATCH] ASoC: atmel_ssc_dai: make module reloadable

[Alexandre Belloni]

As the platform_devices were never unregistered, it was not possible to
unload/reload the module.

Signed-off-by: Alexandre Belloni <alexandre.belloni@piout.net>
---
 sound/soc/atmel/atmel_ssc_dai.c |   11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/sound/soc/atmel/atmel_ssc_dai.c b/sound/soc/atmel/atmel_ssc_dai.c
index 354341e..07ee57b 100644
--- a/sound/soc/atmel/atmel_ssc_dai.c
+++ b/sound/soc/atmel/atmel_ssc_dai.c
@@ -155,6 +155,8 @@ static struct atmel_ssc_info ssc_info[NUM_SSC_DEVICES] = {
 #endif
 };
 
+static struct platform_device *dma_pdev;
+static struct platform_device *ssc_pdevs[NUM_SSC_DEVICES];
 
 /*
  * SSC interrupt handler.  Passes PDC interrupts to the DMA
@@ -796,6 +798,12 @@ static __devinit int asoc_ssc_probe(struct platform_device *pdev)
 
 static int __devexit asoc_ssc_remove(struct platform_device *pdev)
 {
+	int i;
+	platform_device_unregister(dma_pdev);
+
+	for(i = 0; i < NUM_SSC_DEVICES; i++)
+		platform_device_unregister(ssc_pdevs[i]);
+
 	snd_soc_unregister_dai(&pdev->dev);
 	return 0;
 }
@@ -816,7 +824,6 @@ static struct platform_driver asoc_ssc_driver = {
 int atmel_ssc_set_audio(int ssc_id)
 {
 	struct ssc_device *ssc;
-	static struct platform_device *dma_pdev;
 	struct platform_device *ssc_pdev;
 	int ret;
 
@@ -855,6 +862,8 @@ int atmel_ssc_set_audio(int ssc_id)
 	if (ret < 0)
 		platform_device_put(ssc_pdev);
 
+	ssc_pdevs[ssc_id] = ssc_pdev;
+
 	return ret;
 }
 EXPORT_SYMBOL_GPL(atmel_ssc_set_audio);
-- 
1.7.9.5

Re: [PATCH] ASoC: atmel_ssc_dai: make module reloadable

[Bo Shen]

Hi Alexandre Belloni,

On 11/1/2012 14:18, Alexandre Belloni wrote:
> As the platform_devices were never unregistered, it was not possible to
> unload/reload the module.
>
> Signed-off-by: Alexandre Belloni <alexandre.belloni@piout.net>
> ---
>   sound/soc/atmel/atmel_ssc_dai.c |   11 ++++++++++-
>   1 file changed, 10 insertions(+), 1 deletion(-)

NACK - Thanks for your work on atmel ssc dai component. Now, I am 
reworking the atmel ssc dai audio framework. So, some of them will be 
none exist any more.

Thanks again.

Best regards,
Bo Shen

> diff --git a/sound/soc/atmel/atmel_ssc_dai.c b/sound/soc/atmel/atmel_ssc_dai.c
> index 354341e..07ee57b 100644
> --- a/sound/soc/atmel/atmel_ssc_dai.c
> +++ b/sound/soc/atmel/atmel_ssc_dai.c
> @@ -155,6 +155,8 @@ static struct atmel_ssc_info ssc_info[NUM_SSC_DEVICES] = {
>   #endif
>   };
>
> +static struct platform_device *dma_pdev;
> +static struct platform_device *ssc_pdevs[NUM_SSC_DEVICES];
>
>   /*
>    * SSC interrupt handler.  Passes PDC interrupts to the DMA
> @@ -796,6 +798,12 @@ static __devinit int asoc_ssc_probe(struct platform_device *pdev)
>
>   static int __devexit asoc_ssc_remove(struct platform_device *pdev)
>   {
> +	int i;
> +	platform_device_unregister(dma_pdev);
> +
> +	for(i = 0; i < NUM_SSC_DEVICES; i++)
> +		platform_device_unregister(ssc_pdevs[i]);
> +
>   	snd_soc_unregister_dai(&pdev->dev);
>   	return 0;
>   }
> @@ -816,7 +824,6 @@ static struct platform_driver asoc_ssc_driver = {
>   int atmel_ssc_set_audio(int ssc_id)
>   {
>   	struct ssc_device *ssc;
> -	static struct platform_device *dma_pdev;
>   	struct platform_device *ssc_pdev;
>   	int ret;
>
> @@ -855,6 +862,8 @@ int atmel_ssc_set_audio(int ssc_id)
>   	if (ret < 0)
>   		platform_device_put(ssc_pdev);
>
> +	ssc_pdevs[ssc_id] = ssc_pdev;
> +
>   	return ret;
>   }
>   EXPORT_SYMBOL_GPL(atmel_ssc_set_audio);
>