Skip to content

L
linux
Commit bf748ed7 authored by Ralf Baechle's avatar Ralf Baechle Committed by Jaroslav Kysela
Browse files
Options

[ALSA] ice1712: build fixes 

  CC [M]  sound/pci/ice1712/ice1712.o
sound/pci/ice1712/ice1712.c:290: error: snd_ice1712_mixer_digmix_route_ac97 causes a section type conflict
sound/pci/ice1712/ice1712.c:1630: error: snd_ice1712_eeprom causes a section type conflict
...
Gcc like its __devinitdata readable not const, it seems.  An alternative
fix would be to remove the __devinitdata attribute but that would result
in slight runtime bloat.
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarJaroslav Kysela <perex@suse.cz>
parent 623ec047
Hide whitespace changes
Inline Side-by-side
Showing with 58 additions and 58 deletions
sound/pci/ice1712/delta.c
View file @ bf748ed7
...@@ -416,7 +416,7 @@ static int snd_ice1712_delta1010lt_wordclock_status_get(struct snd_kcontrol *kco ...@@ -416,7 +416,7 @@ static int snd_ice1712_delta1010lt_wordclock_status_get(struct snd_kcontrol *kco
return 0; return 0;
} }
static const struct snd_kcontrol_new snd_ice1712_delta1010lt_wordclock_status __devinitdata = static struct snd_kcontrol_new snd_ice1712_delta1010lt_wordclock_status __devinitdata =
{ {
.access = (SNDRV_CTL_ELEM_ACCESS_READ), .access = (SNDRV_CTL_ELEM_ACCESS_READ),
.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
...@@ -429,7 +429,7 @@ static const struct snd_kcontrol_new snd_ice1712_delta1010lt_wordclock_status __ ...@@ -429,7 +429,7 @@ static const struct snd_kcontrol_new snd_ice1712_delta1010lt_wordclock_status __
* initialize the chips on M-Audio cards * initialize the chips on M-Audio cards
*/ */
static const struct snd_akm4xxx akm_audiophile __devinitdata = { static struct snd_akm4xxx akm_audiophile __devinitdata = {
.type = SND_AK4528, .type = SND_AK4528,
.num_adcs = 2, .num_adcs = 2,
.num_dacs = 2, .num_dacs = 2,
...@@ -438,7 +438,7 @@ static const struct snd_akm4xxx akm_audiophile __devinitdata = { ...@@ -438,7 +438,7 @@ static const struct snd_akm4xxx akm_audiophile __devinitdata = {
} }
}; };
static const struct snd_ak4xxx_private akm_audiophile_priv __devinitdata = { static struct snd_ak4xxx_private akm_audiophile_priv __devinitdata = {
.caddr = 2, .caddr = 2,
.cif = 0, .cif = 0,
.data_mask = ICE1712_DELTA_AP_DOUT, .data_mask = ICE1712_DELTA_AP_DOUT,
...@@ -450,7 +450,7 @@ static const struct snd_ak4xxx_private akm_audiophile_priv __devinitdata = { ...@@ -450,7 +450,7 @@ static const struct snd_ak4xxx_private akm_audiophile_priv __devinitdata = {
.mask_flags = 0, .mask_flags = 0,
}; };
static const struct snd_akm4xxx akm_delta410 __devinitdata = { static struct snd_akm4xxx akm_delta410 __devinitdata = {
.type = SND_AK4529, .type = SND_AK4529,
.num_adcs = 2, .num_adcs = 2,
.num_dacs = 8, .num_dacs = 8,
...@@ -459,7 +459,7 @@ static const struct snd_akm4xxx akm_delta410 __devinitdata = { ...@@ -459,7 +459,7 @@ static const struct snd_akm4xxx akm_delta410 __devinitdata = {
} }
}; };
static const struct snd_ak4xxx_private akm_delta410_priv __devinitdata = { static struct snd_ak4xxx_private akm_delta410_priv __devinitdata = {
.caddr = 0, .caddr = 0,
.cif = 0, .cif = 0,
.data_mask = ICE1712_DELTA_AP_DOUT, .data_mask = ICE1712_DELTA_AP_DOUT,
...@@ -471,7 +471,7 @@ static const struct snd_ak4xxx_private akm_delta410_priv __devinitdata = { ...@@ -471,7 +471,7 @@ static const struct snd_ak4xxx_private akm_delta410_priv __devinitdata = {
.mask_flags = 0, .mask_flags = 0,
}; };
static const struct snd_akm4xxx akm_delta1010lt __devinitdata = { static struct snd_akm4xxx akm_delta1010lt __devinitdata = {
.type = SND_AK4524, .type = SND_AK4524,
.num_adcs = 8, .num_adcs = 8,
.num_dacs = 8, .num_dacs = 8,
...@@ -481,7 +481,7 @@ static const struct snd_akm4xxx akm_delta1010lt __devinitdata = { ...@@ -481,7 +481,7 @@ static const struct snd_akm4xxx akm_delta1010lt __devinitdata = {
} }
}; };
static const struct snd_ak4xxx_private akm_delta1010lt_priv __devinitdata = { static struct snd_ak4xxx_private akm_delta1010lt_priv __devinitdata = {
.caddr = 2, .caddr = 2,
.cif = 0, /* the default level of the CIF pin from AK4524 */ .cif = 0, /* the default level of the CIF pin from AK4524 */
.data_mask = ICE1712_DELTA_1010LT_DOUT, .data_mask = ICE1712_DELTA_1010LT_DOUT,
...@@ -493,7 +493,7 @@ static const struct snd_ak4xxx_private akm_delta1010lt_priv __devinitdata = { ...@@ -493,7 +493,7 @@ static const struct snd_ak4xxx_private akm_delta1010lt_priv __devinitdata = {
.mask_flags = 0, .mask_flags = 0,
}; };
static const struct snd_akm4xxx akm_delta44 __devinitdata = { static struct snd_akm4xxx akm_delta44 __devinitdata = {
.type = SND_AK4524, .type = SND_AK4524,
.num_adcs = 4, .num_adcs = 4,
.num_dacs = 4, .num_dacs = 4,
...@@ -503,7 +503,7 @@ static const struct snd_akm4xxx akm_delta44 __devinitdata = { ...@@ -503,7 +503,7 @@ static const struct snd_akm4xxx akm_delta44 __devinitdata = {
} }
}; };
static const struct snd_ak4xxx_private akm_delta44_priv __devinitdata = { static struct snd_ak4xxx_private akm_delta44_priv __devinitdata = {
.caddr = 2, .caddr = 2,
.cif = 0, /* the default level of the CIF pin from AK4524 */ .cif = 0, /* the default level of the CIF pin from AK4524 */
.data_mask = ICE1712_DELTA_CODEC_SERIAL_DATA, .data_mask = ICE1712_DELTA_CODEC_SERIAL_DATA,
...@@ -515,7 +515,7 @@ static const struct snd_ak4xxx_private akm_delta44_priv __devinitdata = { ...@@ -515,7 +515,7 @@ static const struct snd_ak4xxx_private akm_delta44_priv __devinitdata = {
.mask_flags = 0, .mask_flags = 0,
}; };
static const struct snd_akm4xxx akm_vx442 __devinitdata = { static struct snd_akm4xxx akm_vx442 __devinitdata = {
.type = SND_AK4524, .type = SND_AK4524,
.num_adcs = 4, .num_adcs = 4,
.num_dacs = 4, .num_dacs = 4,
...@@ -525,7 +525,7 @@ static const struct snd_akm4xxx akm_vx442 __devinitdata = { ...@@ -525,7 +525,7 @@ static const struct snd_akm4xxx akm_vx442 __devinitdata = {
} }
}; };
static const struct snd_ak4xxx_private akm_vx442_priv __devinitdata = { static struct snd_ak4xxx_private akm_vx442_priv __devinitdata = {
.caddr = 2, .caddr = 2,
.cif = 0, .cif = 0,
.data_mask = ICE1712_VX442_DOUT, .data_mask = ICE1712_VX442_DOUT,
...@@ -650,15 +650,15 @@ static int __devinit snd_ice1712_delta_init(struct snd_ice1712 *ice) ...@@ -650,15 +650,15 @@ static int __devinit snd_ice1712_delta_init(struct snd_ice1712 *ice)
* additional controls for M-Audio cards * additional controls for M-Audio cards
*/ */
static const struct snd_kcontrol_new snd_ice1712_delta1010_wordclock_select __devinitdata = static struct snd_kcontrol_new snd_ice1712_delta1010_wordclock_select __devinitdata =
ICE1712_GPIO(SNDRV_CTL_ELEM_IFACE_MIXER, "Word Clock Sync", 0, ICE1712_DELTA_WORD_CLOCK_SELECT, 1, 0); ICE1712_GPIO(SNDRV_CTL_ELEM_IFACE_MIXER, "Word Clock Sync", 0, ICE1712_DELTA_WORD_CLOCK_SELECT, 1, 0);
static const struct snd_kcontrol_new snd_ice1712_delta1010lt_wordclock_select __devinitdata = static struct snd_kcontrol_new snd_ice1712_delta1010lt_wordclock_select __devinitdata =
ICE1712_GPIO(SNDRV_CTL_ELEM_IFACE_MIXER, "Word Clock Sync", 0, ICE1712_DELTA_1010LT_WORDCLOCK, 0, 0); ICE1712_GPIO(SNDRV_CTL_ELEM_IFACE_MIXER, "Word Clock Sync", 0, ICE1712_DELTA_1010LT_WORDCLOCK, 0, 0);
static const struct snd_kcontrol_new snd_ice1712_delta1010_wordclock_status __devinitdata = static struct snd_kcontrol_new snd_ice1712_delta1010_wordclock_status __devinitdata =
ICE1712_GPIO(SNDRV_CTL_ELEM_IFACE_MIXER, "Word Clock Status", 0, ICE1712_DELTA_WORD_CLOCK_STATUS, 1, SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE); ICE1712_GPIO(SNDRV_CTL_ELEM_IFACE_MIXER, "Word Clock Status", 0, ICE1712_DELTA_WORD_CLOCK_STATUS, 1, SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE);
static const struct snd_kcontrol_new snd_ice1712_deltadio2496_spdif_in_select __devinitdata = static struct snd_kcontrol_new snd_ice1712_deltadio2496_spdif_in_select __devinitdata =
ICE1712_GPIO(SNDRV_CTL_ELEM_IFACE_MIXER, "IEC958 Input Optical", 0, ICE1712_DELTA_SPDIF_INPUT_SELECT, 0, 0); ICE1712_GPIO(SNDRV_CTL_ELEM_IFACE_MIXER, "IEC958 Input Optical", 0, ICE1712_DELTA_SPDIF_INPUT_SELECT, 0, 0);
static const struct snd_kcontrol_new snd_ice1712_delta_spdif_in_status __devinitdata = static struct snd_kcontrol_new snd_ice1712_delta_spdif_in_status __devinitdata =
ICE1712_GPIO(SNDRV_CTL_ELEM_IFACE_MIXER, "Delta IEC958 Input Status", 0, ICE1712_DELTA_SPDIF_IN_STAT, 1, SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE); ICE1712_GPIO(SNDRV_CTL_ELEM_IFACE_MIXER, "Delta IEC958 Input Status", 0, ICE1712_DELTA_SPDIF_IN_STAT, 1, SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE);
...@@ -735,7 +735,7 @@ static int __devinit snd_ice1712_delta_add_controls(struct snd_ice1712 *ice) ...@@ -735,7 +735,7 @@ static int __devinit snd_ice1712_delta_add_controls(struct snd_ice1712 *ice)
/* entry point */ /* entry point */
const struct snd_ice1712_card_info snd_ice1712_delta_cards[] __devinitdata = { struct snd_ice1712_card_info snd_ice1712_delta_cards[] __devinitdata = {
{ {
.subvendor = ICE1712_SUBDEVICE_DELTA1010, .subvendor = ICE1712_SUBDEVICE_DELTA1010,
.name = "M Audio Delta 1010", .name = "M Audio Delta 1010",
......
sound/pci/ice1712/delta.h
View file @ bf748ed7
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
#define ICE1712_SUBDEVICE_MEDIASTATION 0x694c0100 #define ICE1712_SUBDEVICE_MEDIASTATION 0x694c0100
/* entry point */ /* entry point */
extern const struct snd_ice1712_card_info snd_ice1712_delta_cards[]; extern struct snd_ice1712_card_info snd_ice1712_delta_cards[];
/* /*
......
sound/pci/ice1712/ews.c
View file @ bf748ed7
...@@ -332,7 +332,7 @@ static void ews88_setup_spdif(struct snd_ice1712 *ice, int rate) ...@@ -332,7 +332,7 @@ static void ews88_setup_spdif(struct snd_ice1712 *ice, int rate)
/* /*
*/ */
static const struct snd_akm4xxx akm_ews88mt __devinitdata = { static struct snd_akm4xxx akm_ews88mt __devinitdata = {
.num_adcs = 8, .num_adcs = 8,
.num_dacs = 8, .num_dacs = 8,
.type = SND_AK4524, .type = SND_AK4524,
...@@ -342,7 +342,7 @@ static const struct snd_akm4xxx akm_ews88mt __devinitdata = { ...@@ -342,7 +342,7 @@ static const struct snd_akm4xxx akm_ews88mt __devinitdata = {
} }
}; };
static const struct snd_ak4xxx_private akm_ews88mt_priv __devinitdata = { static struct snd_ak4xxx_private akm_ews88mt_priv __devinitdata = {
.caddr = 2, .caddr = 2,
.cif = 1, /* CIF high */ .cif = 1, /* CIF high */
.data_mask = ICE1712_EWS88_SERIAL_DATA, .data_mask = ICE1712_EWS88_SERIAL_DATA,
...@@ -354,7 +354,7 @@ static const struct snd_ak4xxx_private akm_ews88mt_priv __devinitdata = { ...@@ -354,7 +354,7 @@ static const struct snd_ak4xxx_private akm_ews88mt_priv __devinitdata = {
.mask_flags = 0, .mask_flags = 0,
}; };
static const struct snd_akm4xxx akm_ewx2496 __devinitdata = { static struct snd_akm4xxx akm_ewx2496 __devinitdata = {
.num_adcs = 2, .num_adcs = 2,
.num_dacs = 2, .num_dacs = 2,
.type = SND_AK4524, .type = SND_AK4524,
...@@ -363,7 +363,7 @@ static const struct snd_akm4xxx akm_ewx2496 __devinitdata = { ...@@ -363,7 +363,7 @@ static const struct snd_akm4xxx akm_ewx2496 __devinitdata = {
} }
}; };
static const struct snd_ak4xxx_private akm_ewx2496_priv __devinitdata = { static struct snd_ak4xxx_private akm_ewx2496_priv __devinitdata = {
.caddr = 2, .caddr = 2,
.cif = 1, /* CIF high */ .cif = 1, /* CIF high */
.data_mask = ICE1712_EWS88_SERIAL_DATA, .data_mask = ICE1712_EWS88_SERIAL_DATA,
...@@ -375,7 +375,7 @@ static const struct snd_ak4xxx_private akm_ewx2496_priv __devinitdata = { ...@@ -375,7 +375,7 @@ static const struct snd_ak4xxx_private akm_ewx2496_priv __devinitdata = {
.mask_flags = 0, .mask_flags = 0,
}; };
static const struct snd_akm4xxx akm_6fire __devinitdata = { static struct snd_akm4xxx akm_6fire __devinitdata = {
.num_adcs = 6, .num_adcs = 6,
.num_dacs = 6, .num_dacs = 6,
.type = SND_AK4524, .type = SND_AK4524,
...@@ -384,7 +384,7 @@ static const struct snd_akm4xxx akm_6fire __devinitdata = { ...@@ -384,7 +384,7 @@ static const struct snd_akm4xxx akm_6fire __devinitdata = {
} }
}; };
static const struct snd_ak4xxx_private akm_6fire_priv __devinitdata = { static struct snd_ak4xxx_private akm_6fire_priv __devinitdata = {
.caddr = 2, .caddr = 2,
.cif = 1, /* CIF high */ .cif = 1, /* CIF high */
.data_mask = ICE1712_6FIRE_SERIAL_DATA, .data_mask = ICE1712_6FIRE_SERIAL_DATA,
...@@ -578,7 +578,7 @@ static int snd_ice1712_ewx_io_sense_put(struct snd_kcontrol *kcontrol, struct sn ...@@ -578,7 +578,7 @@ static int snd_ice1712_ewx_io_sense_put(struct snd_kcontrol *kcontrol, struct sn
return val != nval; return val != nval;
} }
static const struct snd_kcontrol_new snd_ice1712_ewx2496_controls[] __devinitdata = { static struct snd_kcontrol_new snd_ice1712_ewx2496_controls[] __devinitdata = {
{ {
.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "Input Sensitivity Switch", .name = "Input Sensitivity Switch",
...@@ -678,7 +678,7 @@ static int snd_ice1712_ews88mt_input_sense_put(struct snd_kcontrol *kcontrol, st ...@@ -678,7 +678,7 @@ static int snd_ice1712_ews88mt_input_sense_put(struct snd_kcontrol *kcontrol, st
return ndata != data; return ndata != data;
} }
static const struct snd_kcontrol_new snd_ice1712_ews88mt_input_sense __devinitdata = { static struct snd_kcontrol_new snd_ice1712_ews88mt_input_sense __devinitdata = {
.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "Input Sensitivity Switch", .name = "Input Sensitivity Switch",
.info = snd_ice1712_ewx_io_sense_info, .info = snd_ice1712_ewx_io_sense_info,
...@@ -687,7 +687,7 @@ static const struct snd_kcontrol_new snd_ice1712_ews88mt_input_sense __devinitda ...@@ -687,7 +687,7 @@ static const struct snd_kcontrol_new snd_ice1712_ews88mt_input_sense __devinitda
.count = 8, .count = 8,
}; };
static const struct snd_kcontrol_new snd_ice1712_ews88mt_output_sense __devinitdata = { static struct snd_kcontrol_new snd_ice1712_ews88mt_output_sense __devinitdata = {
.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "Output Sensitivity Switch", .name = "Output Sensitivity Switch",
.info = snd_ice1712_ewx_io_sense_info, .info = snd_ice1712_ewx_io_sense_info,
...@@ -769,7 +769,7 @@ static int snd_ice1712_ews88d_control_put(struct snd_kcontrol *kcontrol, struct ...@@ -769,7 +769,7 @@ static int snd_ice1712_ews88d_control_put(struct snd_kcontrol *kcontrol, struct
.private_value = xshift | (xinvert << 8),\ .private_value = xshift | (xinvert << 8),\
} }
static const struct snd_kcontrol_new snd_ice1712_ews88d_controls[] __devinitdata = { static struct snd_kcontrol_new snd_ice1712_ews88d_controls[] __devinitdata = {
EWS88D_CONTROL(SNDRV_CTL_ELEM_IFACE_MIXER, "IEC958 Input Optical", 0, 1, 0), /* inverted */ EWS88D_CONTROL(SNDRV_CTL_ELEM_IFACE_MIXER, "IEC958 Input Optical", 0, 1, 0), /* inverted */
EWS88D_CONTROL(SNDRV_CTL_ELEM_IFACE_MIXER, "ADAT Output Optical", 1, 0, 0), EWS88D_CONTROL(SNDRV_CTL_ELEM_IFACE_MIXER, "ADAT Output Optical", 1, 0, 0),
EWS88D_CONTROL(SNDRV_CTL_ELEM_IFACE_MIXER, "ADAT External Master Clock", 2, 0, 0), EWS88D_CONTROL(SNDRV_CTL_ELEM_IFACE_MIXER, "ADAT External Master Clock", 2, 0, 0),
...@@ -909,7 +909,7 @@ static int snd_ice1712_6fire_select_input_put(struct snd_kcontrol *kcontrol, str ...@@ -909,7 +909,7 @@ static int snd_ice1712_6fire_select_input_put(struct snd_kcontrol *kcontrol, str
.private_value = xshift | (xinvert << 8),\ .private_value = xshift | (xinvert << 8),\
} }
static const struct snd_kcontrol_new snd_ice1712_6fire_controls[] __devinitdata = { static struct snd_kcontrol_new snd_ice1712_6fire_controls[] __devinitdata = {
{ {
.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "Analog Input Select", .name = "Analog Input Select",
...@@ -989,7 +989,7 @@ static int __devinit snd_ice1712_ews_add_controls(struct snd_ice1712 *ice) ...@@ -989,7 +989,7 @@ static int __devinit snd_ice1712_ews_add_controls(struct snd_ice1712 *ice)
/* entry point */ /* entry point */
const struct snd_ice1712_card_info snd_ice1712_ews_cards[] __devinitdata = { struct snd_ice1712_card_info snd_ice1712_ews_cards[] __devinitdata = {
{ {
.subvendor = ICE1712_SUBDEVICE_EWX2496, .subvendor = ICE1712_SUBDEVICE_EWX2496,
.name = "TerraTec EWX24/96", .name = "TerraTec EWX24/96",
......
sound/pci/ice1712/ews.h
View file @ bf748ed7
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
#define ICE1712_SUBDEVICE_PHASE88 0x3b155111 #define ICE1712_SUBDEVICE_PHASE88 0x3b155111
/* entry point */ /* entry point */
extern const struct snd_ice1712_card_info snd_ice1712_ews_cards[]; extern struct snd_ice1712_card_info snd_ice1712_ews_cards[];
/* TerraTec EWX 24/96 configuration definitions */ /* TerraTec EWX 24/96 configuration definitions */
......
sound/pci/ice1712/hoontech.c
View file @ bf748ed7
...@@ -239,7 +239,7 @@ static void stdsp24_ak4524_lock(struct snd_akm4xxx *ak, int chip) ...@@ -239,7 +239,7 @@ static void stdsp24_ak4524_lock(struct snd_akm4xxx *ak, int chip)
static int __devinit snd_ice1712_value_init(struct snd_ice1712 *ice) static int __devinit snd_ice1712_value_init(struct snd_ice1712 *ice)
{ {
/* Hoontech STDSP24 with modified hardware */ /* Hoontech STDSP24 with modified hardware */
static const struct snd_akm4xxx akm_stdsp24_mv __devinitdata = { static struct snd_akm4xxx akm_stdsp24_mv __devinitdata = {
.num_adcs = 2, .num_adcs = 2,
.num_dacs = 2, .num_dacs = 2,
.type = SND_AK4524, .type = SND_AK4524,
...@@ -248,7 +248,7 @@ static int __devinit snd_ice1712_value_init(struct snd_ice1712 *ice) ...@@ -248,7 +248,7 @@ static int __devinit snd_ice1712_value_init(struct snd_ice1712 *ice)
} }
}; };
static const struct snd_ak4xxx_private akm_stdsp24_mv_priv __devinitdata = { static struct snd_ak4xxx_private akm_stdsp24_mv_priv __devinitdata = {
.caddr = 2, .caddr = 2,
.cif = 1, /* CIF high */ .cif = 1, /* CIF high */
.data_mask = ICE1712_STDSP24_SERIAL_DATA, .data_mask = ICE1712_STDSP24_SERIAL_DATA,
...@@ -298,7 +298,7 @@ static int __devinit snd_ice1712_ez8_init(struct snd_ice1712 *ice) ...@@ -298,7 +298,7 @@ static int __devinit snd_ice1712_ez8_init(struct snd_ice1712 *ice)
/* entry point */ /* entry point */
const struct snd_ice1712_card_info snd_ice1712_hoontech_cards[] __devinitdata = { struct snd_ice1712_card_info snd_ice1712_hoontech_cards[] __devinitdata = {
{ {
.subvendor = ICE1712_SUBDEVICE_STDSP24, .subvendor = ICE1712_SUBDEVICE_STDSP24,
.name = "Hoontech SoundTrack Audio DSP24", .name = "Hoontech SoundTrack Audio DSP24",
......
sound/pci/ice1712/hoontech.h
View file @ bf748ed7
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
#define ICE1712_SUBDEVICE_STDSP24_MEDIA7_1 0x16141217 /* Hoontech ST Audio DSP24 Media 7.1 */ #define ICE1712_SUBDEVICE_STDSP24_MEDIA7_1 0x16141217 /* Hoontech ST Audio DSP24 Media 7.1 */
#define ICE1712_SUBDEVICE_EVENT_EZ8 0x00010001 /* A dummy id for EZ8 */ #define ICE1712_SUBDEVICE_EVENT_EZ8 0x00010001 /* A dummy id for EZ8 */
extern const struct snd_ice1712_card_info snd_ice1712_hoontech_cards[]; extern struct snd_ice1712_card_info snd_ice1712_hoontech_cards[];
/* Hoontech SoundTrack Audio DSP 24 GPIO definitions */ /* Hoontech SoundTrack Audio DSP 24 GPIO definitions */
......
sound/pci/ice1712/ice1712.c
View file @ bf748ed7
...@@ -287,7 +287,7 @@ static int snd_ice1712_digmix_route_ac97_put(struct snd_kcontrol *kcontrol, stru ...@@ -287,7 +287,7 @@ static int snd_ice1712_digmix_route_ac97_put(struct snd_kcontrol *kcontrol, stru
return val != nval; return val != nval;
} }
static const struct snd_kcontrol_new snd_ice1712_mixer_digmix_route_ac97 __devinitdata = { static struct snd_kcontrol_new snd_ice1712_mixer_digmix_route_ac97 __devinitdata = {
.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "Digital Mixer To AC97", .name = "Digital Mixer To AC97",
.info = snd_ice1712_digmix_route_ac97_info, .info = snd_ice1712_digmix_route_ac97_info,
...@@ -1378,7 +1378,7 @@ static int snd_ice1712_pro_mixer_volume_put(struct snd_kcontrol *kcontrol, struc ...@@ -1378,7 +1378,7 @@ static int snd_ice1712_pro_mixer_volume_put(struct snd_kcontrol *kcontrol, struc
static const DECLARE_TLV_DB_SCALE(db_scale_playback, -14400, 150, 0); static const DECLARE_TLV_DB_SCALE(db_scale_playback, -14400, 150, 0);
static const struct snd_kcontrol_new snd_ice1712_multi_playback_ctrls[] __devinitdata = { static struct snd_kcontrol_new snd_ice1712_multi_playback_ctrls[] __devinitdata = {
{ {
.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "Multi Playback Switch", .name = "Multi Playback Switch",
...@@ -1402,7 +1402,7 @@ static const struct snd_kcontrol_new snd_ice1712_multi_playback_ctrls[] __devini ...@@ -1402,7 +1402,7 @@ static const struct snd_kcontrol_new snd_ice1712_multi_playback_ctrls[] __devini
}, },
}; };
static const struct snd_kcontrol_new snd_ice1712_multi_capture_analog_switch __devinitdata = { static struct snd_kcontrol_new snd_ice1712_multi_capture_analog_switch __devinitdata = {
.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "H/W Multi Capture Switch", .name = "H/W Multi Capture Switch",
.info = snd_ice1712_pro_mixer_switch_info, .info = snd_ice1712_pro_mixer_switch_info,
...@@ -1411,7 +1411,7 @@ static const struct snd_kcontrol_new snd_ice1712_multi_capture_analog_switch __d ...@@ -1411,7 +1411,7 @@ static const struct snd_kcontrol_new snd_ice1712_multi_capture_analog_switch __d
.private_value = 10, .private_value = 10,
}; };
static const struct snd_kcontrol_new snd_ice1712_multi_capture_spdif_switch __devinitdata = { static struct snd_kcontrol_new snd_ice1712_multi_capture_spdif_switch __devinitdata = {
.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = SNDRV_CTL_NAME_IEC958("Multi ",CAPTURE,SWITCH), .name = SNDRV_CTL_NAME_IEC958("Multi ",CAPTURE,SWITCH),
.info = snd_ice1712_pro_mixer_switch_info, .info = snd_ice1712_pro_mixer_switch_info,
...@@ -1421,7 +1421,7 @@ static const struct snd_kcontrol_new snd_ice1712_multi_capture_spdif_switch __de ...@@ -1421,7 +1421,7 @@ static const struct snd_kcontrol_new snd_ice1712_multi_capture_spdif_switch __de
.count = 2, .count = 2,
}; };
static const struct snd_kcontrol_new snd_ice1712_multi_capture_analog_volume __devinitdata = { static struct snd_kcontrol_new snd_ice1712_multi_capture_analog_volume __devinitdata = {
.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.access = (SNDRV_CTL_ELEM_ACCESS_READWRITE | .access = (SNDRV_CTL_ELEM_ACCESS_READWRITE |
SNDRV_CTL_ELEM_ACCESS_TLV_READ), SNDRV_CTL_ELEM_ACCESS_TLV_READ),
...@@ -1433,7 +1433,7 @@ static const struct snd_kcontrol_new snd_ice1712_multi_capture_analog_volume __d ...@@ -1433,7 +1433,7 @@ static const struct snd_kcontrol_new snd_ice1712_multi_capture_analog_volume __d
.tlv = { .p = db_scale_playback } .tlv = { .p = db_scale_playback }
}; };
static const struct snd_kcontrol_new snd_ice1712_multi_capture_spdif_volume __devinitdata = { static struct snd_kcontrol_new snd_ice1712_multi_capture_spdif_volume __devinitdata = {
.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = SNDRV_CTL_NAME_IEC958("Multi ",CAPTURE,VOLUME), .name = SNDRV_CTL_NAME_IEC958("Multi ",CAPTURE,VOLUME),
.info = snd_ice1712_pro_mixer_volume_info, .info = snd_ice1712_pro_mixer_volume_info,
...@@ -1625,7 +1625,7 @@ static int snd_ice1712_eeprom_get(struct snd_kcontrol *kcontrol, ...@@ -1625,7 +1625,7 @@ static int snd_ice1712_eeprom_get(struct snd_kcontrol *kcontrol,
return 0; return 0;
} }
static const struct snd_kcontrol_new snd_ice1712_eeprom __devinitdata = { static struct snd_kcontrol_new snd_ice1712_eeprom __devinitdata = {
.iface = SNDRV_CTL_ELEM_IFACE_CARD, .iface = SNDRV_CTL_ELEM_IFACE_CARD,
.name = "ICE1712 EEPROM", .name = "ICE1712 EEPROM",
.access = SNDRV_CTL_ELEM_ACCESS_READ, .access = SNDRV_CTL_ELEM_ACCESS_READ,
...@@ -1661,7 +1661,7 @@ static int snd_ice1712_spdif_default_put(struct snd_kcontrol *kcontrol, ...@@ -1661,7 +1661,7 @@ static int snd_ice1712_spdif_default_put(struct snd_kcontrol *kcontrol,
return 0; return 0;
} }
static const struct snd_kcontrol_new snd_ice1712_spdif_default __devinitdata = static struct snd_kcontrol_new snd_ice1712_spdif_default __devinitdata =
{ {
.iface = SNDRV_CTL_ELEM_IFACE_PCM, .iface = SNDRV_CTL_ELEM_IFACE_PCM,
.name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT), .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT),
...@@ -1712,7 +1712,7 @@ static int snd_ice1712_spdif_maskp_get(struct snd_kcontrol *kcontrol, ...@@ -1712,7 +1712,7 @@ static int snd_ice1712_spdif_maskp_get(struct snd_kcontrol *kcontrol,
return 0; return 0;
} }
static const struct snd_kcontrol_new snd_ice1712_spdif_maskc __devinitdata = static struct snd_kcontrol_new snd_ice1712_spdif_maskc __devinitdata =
{ {
.access = SNDRV_CTL_ELEM_ACCESS_READ, .access = SNDRV_CTL_ELEM_ACCESS_READ,
.iface = SNDRV_CTL_ELEM_IFACE_PCM, .iface = SNDRV_CTL_ELEM_IFACE_PCM,
...@@ -1721,7 +1721,7 @@ static const struct snd_kcontrol_new snd_ice1712_spdif_maskc __devinitdata = ...@@ -1721,7 +1721,7 @@ static const struct snd_kcontrol_new snd_ice1712_spdif_maskc __devinitdata =
.get = snd_ice1712_spdif_maskc_get, .get = snd_ice1712_spdif_maskc_get,
}; };
static const struct snd_kcontrol_new snd_ice1712_spdif_maskp __devinitdata = static struct snd_kcontrol_new snd_ice1712_spdif_maskp __devinitdata =
{ {
.access = SNDRV_CTL_ELEM_ACCESS_READ, .access = SNDRV_CTL_ELEM_ACCESS_READ,
.iface = SNDRV_CTL_ELEM_IFACE_PCM, .iface = SNDRV_CTL_ELEM_IFACE_PCM,
...@@ -1748,7 +1748,7 @@ static int snd_ice1712_spdif_stream_put(struct snd_kcontrol *kcontrol, ...@@ -1748,7 +1748,7 @@ static int snd_ice1712_spdif_stream_put(struct snd_kcontrol *kcontrol,
return 0; return 0;
} }
static const struct snd_kcontrol_new snd_ice1712_spdif_stream __devinitdata = static struct snd_kcontrol_new snd_ice1712_spdif_stream __devinitdata =
{ {
.access = (SNDRV_CTL_ELEM_ACCESS_READWRITE | .access = (SNDRV_CTL_ELEM_ACCESS_READWRITE |
SNDRV_CTL_ELEM_ACCESS_INACTIVE), SNDRV_CTL_ELEM_ACCESS_INACTIVE),
...@@ -1889,7 +1889,7 @@ static int snd_ice1712_pro_internal_clock_put(struct snd_kcontrol *kcontrol, ...@@ -1889,7 +1889,7 @@ static int snd_ice1712_pro_internal_clock_put(struct snd_kcontrol *kcontrol,
return change; return change;
} }
static const struct snd_kcontrol_new snd_ice1712_pro_internal_clock __devinitdata = { static struct snd_kcontrol_new snd_ice1712_pro_internal_clock __devinitdata = {
.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "Multi Track Internal Clock", .name = "Multi Track Internal Clock",
.info = snd_ice1712_pro_internal_clock_info, .info = snd_ice1712_pro_internal_clock_info,
...@@ -1960,7 +1960,7 @@ static int snd_ice1712_pro_internal_clock_default_put(struct snd_kcontrol *kcont ...@@ -1960,7 +1960,7 @@ static int snd_ice1712_pro_internal_clock_default_put(struct snd_kcontrol *kcont
return change; return change;
} }
static const struct snd_kcontrol_new snd_ice1712_pro_internal_clock_default __devinitdata = { static struct snd_kcontrol_new snd_ice1712_pro_internal_clock_default __devinitdata = {
.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "Multi Track Internal Clock Default", .name = "Multi Track Internal Clock Default",
.info = snd_ice1712_pro_internal_clock_default_info, .info = snd_ice1712_pro_internal_clock_default_info,
...@@ -1999,7 +1999,7 @@ static int snd_ice1712_pro_rate_locking_put(struct snd_kcontrol *kcontrol, ...@@ -1999,7 +1999,7 @@ static int snd_ice1712_pro_rate_locking_put(struct snd_kcontrol *kcontrol,
return change; return change;
} }
static const struct snd_kcontrol_new snd_ice1712_pro_rate_locking __devinitdata = { static struct snd_kcontrol_new snd_ice1712_pro_rate_locking __devinitdata = {
.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "Multi Track Rate Locking", .name = "Multi Track Rate Locking",
.info = snd_ice1712_pro_rate_locking_info, .info = snd_ice1712_pro_rate_locking_info,
...@@ -2038,7 +2038,7 @@ static int snd_ice1712_pro_rate_reset_put(struct snd_kcontrol *kcontrol, ...@@ -2038,7 +2038,7 @@ static int snd_ice1712_pro_rate_reset_put(struct snd_kcontrol *kcontrol,
return change; return change;
} }
static const struct snd_kcontrol_new snd_ice1712_pro_rate_reset __devinitdata = { static struct snd_kcontrol_new snd_ice1712_pro_rate_reset __devinitdata = {
.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "Multi Track Rate Reset", .name = "Multi Track Rate Reset",
.info = snd_ice1712_pro_rate_reset_info, .info = snd_ice1712_pro_rate_reset_info,
...@@ -2205,7 +2205,7 @@ static int snd_ice1712_pro_route_spdif_put(struct snd_kcontrol *kcontrol, ...@@ -2205,7 +2205,7 @@ static int snd_ice1712_pro_route_spdif_put(struct snd_kcontrol *kcontrol,
return change; return change;
} }
static const struct snd_kcontrol_new snd_ice1712_mixer_pro_analog_route __devinitdata = { static struct snd_kcontrol_new snd_ice1712_mixer_pro_analog_route __devinitdata = {
.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "H/W Playback Route", .name = "H/W Playback Route",
.info = snd_ice1712_pro_route_info, .info = snd_ice1712_pro_route_info,
...@@ -2213,7 +2213,7 @@ static const struct snd_kcontrol_new snd_ice1712_mixer_pro_analog_route __devini ...@@ -2213,7 +2213,7 @@ static const struct snd_kcontrol_new snd_ice1712_mixer_pro_analog_route __devini
.put = snd_ice1712_pro_route_analog_put, .put = snd_ice1712_pro_route_analog_put,
}; };
static const struct snd_kcontrol_new snd_ice1712_mixer_pro_spdif_route __devinitdata = { static struct snd_kcontrol_new snd_ice1712_mixer_pro_spdif_route __devinitdata = {
.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,NONE) "Route", .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,NONE) "Route",
.info = snd_ice1712_pro_route_info, .info = snd_ice1712_pro_route_info,
...@@ -2255,7 +2255,7 @@ static int snd_ice1712_pro_volume_rate_put(struct snd_kcontrol *kcontrol, ...@@ -2255,7 +2255,7 @@ static int snd_ice1712_pro_volume_rate_put(struct snd_kcontrol *kcontrol,
return change; return change;
} }
static const struct snd_kcontrol_new snd_ice1712_mixer_pro_volume_rate __devinitdata = { static struct snd_kcontrol_new snd_ice1712_mixer_pro_volume_rate __devinitdata = {
.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "Multi Track Volume Rate", .name = "Multi Track Volume Rate",
.info = snd_ice1712_pro_volume_rate_info, .info = snd_ice1712_pro_volume_rate_info,
...@@ -2288,7 +2288,7 @@ static int snd_ice1712_pro_peak_get(struct snd_kcontrol *kcontrol, ...@@ -2288,7 +2288,7 @@ static int snd_ice1712_pro_peak_get(struct snd_kcontrol *kcontrol,
return 0; return 0;
} }
static const struct snd_kcontrol_new snd_ice1712_mixer_pro_peak __devinitdata = { static struct snd_kcontrol_new snd_ice1712_mixer_pro_peak __devinitdata = {
.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "Multi Track Peak", .name = "Multi Track Peak",
.access = SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE, .access = SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE,
...@@ -2303,7 +2303,7 @@ static const struct snd_kcontrol_new snd_ice1712_mixer_pro_peak __devinitdata = ...@@ -2303,7 +2303,7 @@ static const struct snd_kcontrol_new snd_ice1712_mixer_pro_peak __devinitdata =
/* /*
* list of available boards * list of available boards
*/ */
static const struct snd_ice1712_card_info *card_tables[] __devinitdata = { static struct snd_ice1712_card_info *card_tables[] __devinitdata = {
snd_ice1712_hoontech_cards, snd_ice1712_hoontech_cards,
snd_ice1712_delta_cards, snd_ice1712_delta_cards,
snd_ice1712_ews_cards, snd_ice1712_ews_cards,
...@@ -2327,7 +2327,7 @@ static int __devinit snd_ice1712_read_eeprom(struct snd_ice1712 *ice, ...@@ -2327,7 +2327,7 @@ static int __devinit snd_ice1712_read_eeprom(struct snd_ice1712 *ice,
{ {
int dev = 0xa0; /* EEPROM device address */ int dev = 0xa0; /* EEPROM device address */
unsigned int i, size; unsigned int i, size;
const struct snd_ice1712_card_info **tbl, *c; struct snd_ice1712_card_info * const *tbl, *c;
if (! modelname || ! *modelname) { if (! modelname || ! *modelname) {
ice->eeprom.subvendor = 0; ice->eeprom.subvendor = 0;
...@@ -2656,7 +2656,7 @@ static int __devinit snd_ice1712_create(struct snd_card *card, ...@@ -2656,7 +2656,7 @@ static int __devinit snd_ice1712_create(struct snd_card *card,
* *
*/ */
static const struct snd_ice1712_card_info no_matched __devinitdata; static struct snd_ice1712_card_info no_matched __devinitdata;
static int __devinit snd_ice1712_probe(struct pci_dev *pci, static int __devinit snd_ice1712_probe(struct pci_dev *pci,
const struct pci_device_id *pci_id) const struct pci_device_id *pci_id)
...@@ -2665,7 +2665,7 @@ static int __devinit snd_ice1712_probe(struct pci_dev *pci, ...@@ -2665,7 +2665,7 @@ static int __devinit snd_ice1712_probe(struct pci_dev *pci,
struct snd_card *card; struct snd_card *card;
struct snd_ice1712 *ice; struct snd_ice1712 *ice;
int pcm_dev = 0, err; int pcm_dev = 0, err;
const struct snd_ice1712_card_info **tbl, *c; struct snd_ice1712_card_info * const *tbl, *c;
if (dev >= SNDRV_CARDS) if (dev >= SNDRV_CARDS)
return -ENODEV; return -ENODEV;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7