[PATCH 2/9] sound/oss/dmasound/dmasound_awacs.c: ioremap balanced with iounmap

[PATCH 2/9] sound/oss/dmasound/dmasound_awacs.c: ioremap balanced with iounmap

[Amol Lad]

Signed-off-by: Amol Lad <amol@verismonetworks.com>
---
 dmasound_awacs.c |   39 +++++++++++++++++++++++++++++++++++----
 1 files changed, 35 insertions(+), 4 deletions(-)
---
diff -uprN -X linux-2.6.19-rc1-orig/Documentation/dontdiff linux-2.6.19-rc1-orig/sound/oss/dmasound/dmasound_awacs.c linux-2.6.19-rc1/sound/oss/dmasound/dmasound_awacs.c
--- linux-2.6.19-rc1-orig/sound/oss/dmasound/dmasound_awacs.c	2006-10-05 14:01:04.000000000 +0530
+++ linux-2.6.19-rc1/sound/oss/dmasound/dmasound_awacs.c	2006-10-05 17:34:42.000000000 +0530
@@ -3067,8 +3067,9 @@ printk("dmasound_pmac: Awacs/Screamer Co
 		udelay(1);
 
 	/* Initialize beep stuff */
-	if ((res=setup_beep()))
-		return res ;
+	res=setup_beep();
+	if (res)
+		goto out_unmap;
 
 #ifdef CONFIG_PM
 	pmu_register_sleep_notifier(&awacs_sleep_notifier);
@@ -3160,7 +3161,26 @@ printk("dmasound_pmac: Awacs/Screamer Co
 	 */
 	input_register_device(awacs_beep_dev);
 
-	return dmasound_init();
+	res = dmasound_init();
+	if (res)
+		goto out_unmap1;
+
+	return 0;
+	
+out_unmap1:
+	if (is_pbook_3X00)
+		iounmap(latch_base);
+	else if (is_pbook_g3)
+		iounmap(macio_base);
+out_unmap:
+	if (i2s_node)
+		iounmap(i2s);
+	else
+		iounmap(awacs);
+	iounmap(awacs_txdma);
+	iounmap(awacs_rxdma);
+
+	return res;
 }
 
 static void __exit dmasound_awacs_cleanup(void)
@@ -3177,8 +3197,19 @@ static void __exit dmasound_awacs_cleanu
 			daca_cleanup();
 			break;
 	}
-	dmasound_deinit();
 
+	if (is_pbook_3X00)
+		iounmap(latch_base);
+	else if (is_pbook_g3)
+		iounmap(macio_base);
+	if (i2s_node)
+		iounmap(i2s);
+	else
+		iounmap(awacs);
+	iounmap(awacs_txdma);
+	iounmap(awacs_rxdma);
+
+	dmasound_deinit();
 }
 
 MODULE_DESCRIPTION("PowerMac built-in audio driver.");

Re: [PATCH 2/9] sound/oss/dmasound/dmasound_awacs.c: ioremap balanced with iounmap

[Andrew Morton]

On Fri, 06 Oct 2006 11:08:53 +0530
Amol Lad <amol@verismonetworks.com> wrote:

> Signed-off-by: Amol Lad <amol@verismonetworks.com>
> ---
>  dmasound_awacs.c |   39 +++++++++++++++++++++++++++++++++++----
>  1 files changed, 35 insertions(+), 4 deletions(-)
> ---
> diff -uprN -X linux-2.6.19-rc1-orig/Documentation/dontdiff linux-2.6.19-rc1-orig/sound/oss/dmasound/dmasound_awacs.c linux-2.6.19-rc1/sound/oss/dmasound/dmasound_awacs.c
> --- linux-2.6.19-rc1-orig/sound/oss/dmasound/dmasound_awacs.c	2006-10-05 14:01:04.000000000 +0530
> +++ linux-2.6.19-rc1/sound/oss/dmasound/dmasound_awacs.c	2006-10-05 17:34:42.000000000 +0530
> @@ -3067,8 +3067,9 @@ printk("dmasound_pmac: Awacs/Screamer Co
>  		udelay(1);
>  
>  	/* Initialize beep stuff */
> -	if ((res=setup_beep()))
> -		return res ;
> +	res=setup_beep();
> +	if (res)
> +		goto out_unmap;
>  
>  #ifdef CONFIG_PM
>  	pmu_register_sleep_notifier(&awacs_sleep_notifier);
> @@ -3160,7 +3161,26 @@ printk("dmasound_pmac: Awacs/Screamer Co
>  	 */
>  	input_register_device(awacs_beep_dev);
>  
> -	return dmasound_init();
> +	res = dmasound_init();
> +	if (res)
> +		goto out_unmap1;
> +
> +	return 0;
> +	
> +out_unmap1:
> +	if (is_pbook_3X00)
> +		iounmap(latch_base);
> +	else if (is_pbook_g3)
> +		iounmap(macio_base);
> +out_unmap:
> +	if (i2s_node)
> +		iounmap(i2s);
> +	else
> +		iounmap(awacs);
> +	iounmap(awacs_txdma);
> +	iounmap(awacs_rxdma);
> +
> +	return res;
>  }
>  
>  static void __exit dmasound_awacs_cleanup(void)
> @@ -3177,8 +3197,19 @@ static void __exit dmasound_awacs_cleanu
>  			daca_cleanup();
>  			break;
>  	}
> -	dmasound_deinit();
>  
> +	if (is_pbook_3X00)
> +		iounmap(latch_base);
> +	else if (is_pbook_g3)
> +		iounmap(macio_base);
> +	if (i2s_node)
> +		iounmap(i2s);
> +	else
> +		iounmap(awacs);
> +	iounmap(awacs_txdma);
> +	iounmap(awacs_rxdma);
> +
> +	dmasound_deinit();
>  }
>  

man, this is taxing my attention span to the limit.  It'd be nice if
someone else could help out with the reviewing here..

This one could benefit from having a helper function which is called from
both places.

Re: [PATCH 2/9] sound/oss/dmasound/dmasound_awacs.c: ioremap balanced with iounmap

[Amol Lad]

> >  
> >  #ifdef CONFIG_PM
> >  	pmu_register_sleep_notifier(&awacs_sleep_notifier);
> > @@ -3160,7 +3161,26 @@ printk("dmasound_pmac: Awacs/Screamer Co
> >  	 */
> >  	input_register_device(awacs_beep_dev);
> >  
> > -	return dmasound_init();
> > +	res = dmasound_init();
> > +	if (res)
> > +		goto out_unmap1;
> > +
> > +	return 0;
> > +	
> > +out_unmap1:
> > +	if (is_pbook_3X00)
> > +		iounmap(latch_base);
> > +	else if (is_pbook_g3)
> > +		iounmap(macio_base);
> > +out_unmap:
> > +	if (i2s_node)
> > +		iounmap(i2s);
> > +	else
> > +		iounmap(awacs);
> > +	iounmap(awacs_txdma);
> > +	iounmap(awacs_rxdma);
> > +
> > +	return res;
> >  }
> >  
> >  static void __exit dmasound_awacs_cleanup(void)
> > @@ -3177,8 +3197,19 @@ static void __exit dmasound_awacs_cleanu
> >  			daca_cleanup();
> >  			break;
> >  	}
> > -	dmasound_deinit();
> >  
> > +	if (is_pbook_3X00)
> > +		iounmap(latch_base);
> > +	else if (is_pbook_g3)
> > +		iounmap(macio_base);
> > +	if (i2s_node)
> > +		iounmap(i2s);
> > +	else
> > +		iounmap(awacs);
> > +	iounmap(awacs_txdma);
> > +	iounmap(awacs_rxdma);
> > +
> > +	dmasound_deinit();
> >  }
> >  
> 
> man, this is taxing my attention span to the limit.  It'd be nice if
> someone else could help out with the reviewing here..
> 
> This one could benefit from having a helper function which is called from
> both places.
> 

Sorry for that.

Including a better version

Signed-off-by: Amol Lad <amol@verismonetworks.com>
---
 dmasound_awacs.c |   36 +++++++++++++++++++++++++++++++++---
 1 files changed, 33 insertions(+), 3 deletions(-)
---
--- linux-2.6.19-rc1-orig/sound/oss/dmasound/dmasound_awacs.c	2006-10-05 14:01:04.000000000 +0530
+++ linux-2.6.19-rc1/sound/oss/dmasound/dmasound_awacs.c	2006-10-07 11:08:54.000000000 +0530
@@ -308,6 +308,9 @@ extern void daca_get_volume(uint * left_
 extern int daca_enter_sleep(void);
 extern int daca_leave_sleep(void);
 
+/*** cleanup ***/
+static void iounmap_awacs(void);
+
 #define TRY_LOCK()	\
 	if ((rc = mutex_lock_interruptible(&dmasound_mutex)) != 0)	\
 		return rc;
@@ -3067,8 +3070,9 @@ printk("dmasound_pmac: Awacs/Screamer Co
 		udelay(1);
 
 	/* Initialize beep stuff */
-	if ((res=setup_beep()))
-		return res ;
+	res=setup_beep();
+	if (res)
+		goto out_unmap;
 
 #ifdef CONFIG_PM
 	pmu_register_sleep_notifier(&awacs_sleep_notifier);
@@ -3160,7 +3164,32 @@ printk("dmasound_pmac: Awacs/Screamer Co
 	 */
 	input_register_device(awacs_beep_dev);
 
-	return dmasound_init();
+	res = dmasound_init();
+	if (res)
+		goto out_unmap;
+
+	return 0;
+
+out_unmap:
+	iounmap_awacs();
+
+	return res;
+}
+
+static void iounmap_awacs(void)
+{
+	if (is_pbook_3X00 && latch_base)
+		iounmap(latch_base);
+	else if (is_pbook_g3 && macio_base)
+		iounmap(macio_base);
+	if (i2s_node)
+		iounmap(i2s);
+	else
+		iounmap(awacs);
+	iounmap(awacs_txdma);
+	iounmap(awacs_rxdma);
+
+	return;
 }
 
 static void __exit dmasound_awacs_cleanup(void)
@@ -3177,6 +3206,7 @@ static void __exit dmasound_awacs_cleanu
 			daca_cleanup();
 			break;
 	}
+	iounmap_awacs();
 	dmasound_deinit();
 
 }