45 lines
1.3 KiB
Diff
45 lines
1.3 KiB
Diff
From: Stefan Hajnoczi <stefanha@redhat.com>
|
|
Date: Mon, 15 Oct 2012 20:52:27 +0200
|
|
Subject: [043/106] staging: line6: drop unused line6_index and line6_id
|
|
arrays
|
|
|
|
commit 54cd1e42f31040c74694a3b2de83cd2cbb2fff55 upstream.
|
|
|
|
The line6 driver does not support 'index' and 'id' module parameters so
|
|
there is no need to keep arrays for these values. Do what other sound
|
|
drivers do and use the scalar constants instead of dummy arrays.
|
|
|
|
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
---
|
|
drivers/staging/line6/audio.c | 8 ++------
|
|
1 file changed, 2 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/drivers/staging/line6/audio.c b/drivers/staging/line6/audio.c
|
|
index 8e73983..a92e21f 100644
|
|
--- a/drivers/staging/line6/audio.c
|
|
+++ b/drivers/staging/line6/audio.c
|
|
@@ -16,20 +16,16 @@
|
|
#include "driver.h"
|
|
#include "audio.h"
|
|
|
|
-static int line6_index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;
|
|
-static char *line6_id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;
|
|
-
|
|
/*
|
|
Initialize the Line6 USB audio system.
|
|
*/
|
|
int line6_init_audio(struct usb_line6 *line6)
|
|
{
|
|
- static int dev;
|
|
struct snd_card *card;
|
|
int err;
|
|
|
|
- err = snd_card_create(line6_index[dev], line6_id[dev], THIS_MODULE, 0,
|
|
- &card);
|
|
+ err = snd_card_create(SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1,
|
|
+ THIS_MODULE, 0, &card);
|
|
if (err < 0)
|
|
return err;
|
|
|