diff mbox

sound: oss/ad1848: remove some dead code

Message ID 20170131113331.GA3434@mwanda (mailing list archive)
State New, archived
Headers show

Commit Message

Dan Carpenter Jan. 31, 2017, 11:33 a.m. UTC 
We never use the irq2dev[] array so we can remove this assignment.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

Comments

Takashi Iwai Jan. 31, 2017, 8:41 p.m. UTC | #1 
On Tue, 31 Jan 2017 12:33:31 +0100,
Dan Carpenter wrote:
> 
> We never use the irq2dev[] array so we can remove this assignment.
> 
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

Thanks, applied now.


Takashi

> 
> diff --git a/sound/oss/ad1848.c b/sound/oss/ad1848.c
> index 6368e5c7d0ba..f6156d8169d0 100644
> --- a/sound/oss/ad1848.c
> +++ b/sound/oss/ad1848.c
> @@ -121,11 +121,6 @@ static bool deskpro_xl;
>  static bool deskpro_m;
>  static bool soundpro;
>  
> -static volatile signed char irq2dev[17] = {
> -	-1, -1, -1, -1, -1, -1, -1, -1,
> -	-1, -1, -1, -1, -1, -1, -1, -1, -1
> -};
> -
>  #ifndef EXCLUDE_TIMERS
>  static int timer_installed = -1;
>  #endif
> @@ -2060,7 +2055,7 @@ int ad1848_init (char *name, struct resource *ports, int irq, int dma_playback,
>  		else
>  			devc->irq_ok = 1;	/* Couldn't test. assume it's OK */
>  	} else if (irq < 0)
> -		irq2dev[-irq] = devc->dev_no = my_dev;
> +		devc->dev_no = my_dev;
>  
>  #ifndef EXCLUDE_TIMERS
>  	if ((capabilities[devc->model].flags & CAP_F_TIMER) &&
>
diff mbox

Patch

diff --git a/sound/oss/ad1848.c b/sound/oss/ad1848.c
index 6368e5c7d0ba..f6156d8169d0 100644
--- a/sound/oss/ad1848.c
+++ b/sound/oss/ad1848.c
@@ -121,11 +121,6 @@  static bool deskpro_xl;
 static bool deskpro_m;
 static bool soundpro;
 
-static volatile signed char irq2dev[17] = {
-	-1, -1, -1, -1, -1, -1, -1, -1,
-	-1, -1, -1, -1, -1, -1, -1, -1, -1
-};
-
 #ifndef EXCLUDE_TIMERS
 static int timer_installed = -1;
 #endif
@@ -2060,7 +2055,7 @@  int ad1848_init (char *name, struct resource *ports, int irq, int dma_playback,
 		else
 			devc->irq_ok = 1;	/* Couldn't test. assume it's OK */
 	} else if (irq < 0)
-		irq2dev[-irq] = devc->dev_no = my_dev;
+		devc->dev_no = my_dev;
 
 #ifndef EXCLUDE_TIMERS
 	if ((capabilities[devc->model].flags & CAP_F_TIMER) &&