[ALSA] ice1712 - Reorganize existing eeprom data

Reorganize EEPROM data (in C99 style).
Signed-of-by: Philipp Matthias Hahn <pmhahn@pmhahn.de>

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>

1 files changed, 41 insertions, 71 deletions

diff --git a/sound/pci/ice1712/aureon.c b/sound/pci/ice1712/aureon.c
index a085618d33f9..041d2f07572b 100644
--- a/sound/pci/ice1712/aureon.c
+++ b/sound/pci/ice1712/aureon.c
@@ -2110,84 +2110,54 @@ static int __devinit aureon_init(struct snd_ice1712 *ice)
  */
 
 static unsigned char aureon51_eeprom[] __devinitdata = {
-        0x0a,   /* SYSCONF: clock 512, spdif-in/ADC, 3DACs */
-        0x80,   /* ACLINK: I2S */
-        0xfc,   /* I2S: vol, 96k, 24bit, 192k */
-        0xc3,   /* SPDIF: out-en, out-int, spdif-in */
-        0xff,   /* GPIO_DIR */
-        0xff,   /* GPIO_DIR1 */
-        0x5f,   /* GPIO_DIR2 */
-        0x00,   /* GPIO_MASK */
-        0x00,   /* GPIO_MASK1 */
-        0x00,   /* GPIO_MASK2 */
-        0x00,   /* GPIO_STATE */
-        0x00,   /* GPIO_STATE1 */
-        0x00,   /* GPIO_STATE2 */
+        [ICE_EEP2_SYSCONF]     = 0x0a,  /* clock 512, spdif-in/ADC, 3DACs */
+        [ICE_EEP2_ACLINK]      = 0x80,  /* I2S */
+        [ICE_EEP2_I2S]         = 0xfc,  /* vol, 96k, 24bit, 192k */
+        [ICE_EEP2_SPDIF]       = 0xc3,  /* out-en, out-int, spdif-in */
+        [ICE_EEP2_GPIO_DIR]    = 0xff,
+        [ICE_EEP2_GPIO_DIR1]   = 0xff,
+        [ICE_EEP2_GPIO_DIR2]   = 0x5f,
+        [ICE_EEP2_GPIO_MASK]   = 0x00,
+        [ICE_EEP2_GPIO_MASK1]  = 0x00,
+        [ICE_EEP2_GPIO_MASK2]  = 0x00,
+        [ICE_EEP2_GPIO_STATE]  = 0x00,
+        [ICE_EEP2_GPIO_STATE1] = 0x00,
+        [ICE_EEP2_GPIO_STATE2] = 0x00,
 };
 
 static unsigned char aureon71_eeprom[] __devinitdata = {
-        0x0b,   /* SYSCONF: clock 512, spdif-in/ADC, 4DACs */
-        0x80,   /* ACLINK: I2S */
-        0xfc,   /* I2S: vol, 96k, 24bit, 192k */
-        0xc3,   /* SPDIF: out-en, out-int, spdif-in */
-        0xff,   /* GPIO_DIR */
-        0xff,   /* GPIO_DIR1 */
-        0x5f,   /* GPIO_DIR2 */
-        0x00,   /* GPIO_MASK */
-        0x00,   /* GPIO_MASK1 */
-        0x00,   /* GPIO_MASK2 */
-        0x00,   /* GPIO_STATE */
-        0x00,   /* GPIO_STATE1 */
-        0x00,   /* GPIO_STATE2 */
-};
-
-static unsigned char prodigy71_eeprom[] __devinitdata = {
-        0x0b,   /* SYSCONF: clock 512, spdif-in/ADC, 4DACs */
-        0x80,   /* ACLINK: I2S */
-        0xfc,   /* I2S: vol, 96k, 24bit, 192k */
-        0xc3,   /* SPDIF: out-en, out-int, spdif-in */
-        0xff,   /* GPIO_DIR */
-        0xff,   /* GPIO_DIR1 */
-        0x5f,   /* GPIO_DIR2 */
-        0x00,   /* GPIO_MASK */
-        0x00,   /* GPIO_MASK1 */
-        0x00,   /* GPIO_MASK2 */
-        0x00,   /* GPIO_STATE */
-        0x00,   /* GPIO_STATE1 */
-        0x00,   /* GPIO_STATE2 */
+        [ICE_EEP2_SYSCONF]     = 0x0b,  /* clock 512, spdif-in/ADC, 4DACs */
+        [ICE_EEP2_ACLINK]      = 0x80,  /* I2S */
+        [ICE_EEP2_I2S]         = 0xfc,  /* vol, 96k, 24bit, 192k */
+        [ICE_EEP2_SPDIF]       = 0xc3,  /* out-en, out-int, spdif-in */
+        [ICE_EEP2_GPIO_DIR]    = 0xff,
+        [ICE_EEP2_GPIO_DIR1]   = 0xff,
+        [ICE_EEP2_GPIO_DIR2]   = 0x5f,
+        [ICE_EEP2_GPIO_MASK]   = 0x00,
+        [ICE_EEP2_GPIO_MASK1]  = 0x00,
+        [ICE_EEP2_GPIO_MASK2]  = 0x00,
+        [ICE_EEP2_GPIO_STATE]  = 0x00,
+        [ICE_EEP2_GPIO_STATE1] = 0x00,
+        [ICE_EEP2_GPIO_STATE2] = 0x00,
 };
+#define prodigy71_eeprom aureon71_eeprom
 
 static unsigned char prodigy71lt_eeprom[] __devinitdata = {
-        0x4b,   /* SYSCINF: clock 512, spdif-in/ADC, 4DACs */
-        0x80,   /* ACLINK: I2S */
-        0xfc,   /* I2S: vol, 96k, 24bit, 192k */
-        0xc3,   /* SPDIF: out-en, out-int, spdif-in */
-        0xff,   /* GPIO_DIR */
-        0xff,   /* GPIO_DIR1 */
-        0x5f,   /* GPIO_DIR2 */
-        0x00,   /* GPIO_MASK */
-        0x00,   /* GPIO_MASK1 */
-        0x00,   /* GPIO_MASK2 */
-        0x00,   /* GPIO_STATE */
-        0x00,   /* GPIO_STATE1 */
-        0x00,   /* GPIO_STATE2 */
-};
-
-static unsigned char prodigy71xt_eeprom[] __devinitdata = {
-        0x4b,   /* SYSCINF: clock 512, spdif-in/ADC, 4DACs */
-        0x80,   /* ACLINK: I2S */
-        0xfc,   /* I2S: vol, 96k, 24bit, 192k */
-        0xc3,   /* SPDIF: out-en, out-int, spdif-in */
-        0xff,   /* GPIO_DIR */
-        0xff,   /* GPIO_DIR1 */
-        0x5f,   /* GPIO_DIR2 */
-        0x00,   /* GPIO_MASK */
-        0x00,   /* GPIO_MASK1 */
-        0x00,   /* GPIO_MASK2 */
-        0x00,   /* GPIO_STATE */
-        0x00,   /* GPIO_STATE1 */
-        0x00,   /* GPIO_STATE2 */
+        [ICE_EEP2_SYSCONF]     = 0x4b,  /* clock 384, spdif-in/ADC, 4DACs */
+        [ICE_EEP2_ACLINK]      = 0x80,  /* I2S */
+        [ICE_EEP2_I2S]         = 0xfc,  /* vol, 96k, 24bit, 192k */
+        [ICE_EEP2_SPDIF]       = 0xc3,  /* out-en, out-int, spdif-in */
+        [ICE_EEP2_GPIO_DIR]    = 0xff,
+        [ICE_EEP2_GPIO_DIR1]   = 0xff,
+        [ICE_EEP2_GPIO_DIR2]   = 0x5f,
+        [ICE_EEP2_GPIO_MASK]   = 0x00,
+        [ICE_EEP2_GPIO_MASK1]  = 0x00,
+        [ICE_EEP2_GPIO_MASK2]  = 0x00,
+        [ICE_EEP2_GPIO_STATE]  = 0x00,
+        [ICE_EEP2_GPIO_STATE1] = 0x00,
+        [ICE_EEP2_GPIO_STATE2] = 0x00,
 };
+#define prodigy71xt_eeprom prodigy71lt_eeprom
 
 /* entry point */
 struct snd_ice1712_card_info snd_vt1724_aureon_cards[] __devinitdata = {