From: Stefan Hajnoczi Date: Mon, 15 Oct 2012 18:52:27 +0000 (+0200) Subject: staging: line6: drop unused line6_index and line6_id arrays X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=54cd1e42f31040c74694a3b2de83cd2cbb2fff55;p=linux-beck.git staging: line6: drop unused line6_index and line6_id arrays 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 Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/line6/audio.c b/drivers/staging/line6/audio.c index 8e7398393a59..a92e21f7d55b 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;