ice1712: build fixes
CC [M] sound/pci/ice1712/ice1712.osound/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 sound/pci/ice1712/ice1712.c:1894: error: snd_ice1712_pro_internal_clock causes a section type conflict sound/pci/ice1712/ice1712.c:1965: error: snd_ice1712_pro_internal_clock_default causes a section type conflict sound/pci/ice1712/ice1712.c:2004: error: snd_ice1712_pro_rate_locking causes a section type conflict sound/pci/ice1712/ice1712.c:2043: error: snd_ice1712_pro_rate_reset causes a section type conflict sound/pci/ice1712/ice1712.c:2210: error: snd_ice1712_mixer_pro_analog_route causes a section type conflict sound/pci/ice1712/ice1712.c:2218: error: snd_ice1712_mixer_pro_spdif_route causes a section type conflict sound/pci/ice1712/ice1712.c:2260: error: snd_ice1712_mixer_pro_volume_rate causes a section type conflict sound/pci/ice1712/ice1712.c:2293: error: snd_ice1712_mixer_pro_peak causes a section type conflict sound/pci/ice1712/ice1712.c:1666: error: snd_ice1712_spdif_default causes a section type conflict sound/pci/ice1712/ice1712.c:1717: error: snd_ice1712_spdif_maskc causes a section type conflict sound/pci/ice1712/ice1712.c:1726: error: snd_ice1712_spdif_maskp causes a section type conflict sound/pci/ice1712/ice1712.c:1753: error: snd_ice1712_spdif_stream 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.
sound/pci/ice1712/delta.c +17 -17
@@ -416,7 +416,7 @@ static int snd_ice1712_delta1010lt_wordclock_status_get(struct snd_kcontrol *kcoreturn 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 ), .iface =SNDRV_CTL_ELEM_IFACE_MIXER ,
@@ -429,7 +429,7 @@ static const struct snd_kcontrol_new snd_ice1712_delta1010lt_wordclock_status __* 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 , .num_adcs =2 , .num_dacs =2 ,
@@ -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 , .cif =0 , .data_mask =ICE1712_DELTA_AP_DOUT ,
@@ -450,7 +450,7 @@ static const struct snd_ak4xxx_private akm_audiophile_priv __devinitdata = { .mask_flags = 0, }; -static const struct snd_akm4xxx akm_delta410__devinitdata = { +static struct snd_akm4xxx akm_delta410__devinitdata = { .type =SND_AK4529 , .num_adcs =2 , .num_dacs =8 ,
@@ -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 , .cif =0 , .data_mask =ICE1712_DELTA_AP_DOUT ,
@@ -471,7 +471,7 @@ static const struct snd_ak4xxx_private akm_delta410_priv __devinitdata = { .mask_flags = 0, }; -static const struct snd_akm4xxx akm_delta1010lt__devinitdata = { +static struct snd_akm4xxx akm_delta1010lt__devinitdata = { .type =SND_AK4524 , .num_adcs =8 , .num_dacs =8 ,
@@ -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 , .cif =0 ,/* the default level of the CIF pin from AK4524 */ .data_mask =ICE1712_DELTA_1010LT_DOUT ,
@@ -493,7 +493,7 @@ static const struct snd_ak4xxx_private akm_delta1010lt_priv __devinitdata = { .mask_flags = 0, }; -static const struct snd_akm4xxx akm_delta44__devinitdata = { +static struct snd_akm4xxx akm_delta44__devinitdata = { .type =SND_AK4524 , .num_adcs =4 , .num_dacs =4 ,
@@ -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 , .cif =0 ,/* the default level of the CIF pin from AK4524 */ .data_mask =ICE1712_DELTA_CODEC_SERIAL_DATA ,
@@ -515,7 +515,7 @@ static const struct snd_ak4xxx_private akm_delta44_priv __devinitdata = { .mask_flags = 0, }; -static const struct snd_akm4xxx akm_vx442__devinitdata = { +static struct snd_akm4xxx akm_vx442__devinitdata = { .type =SND_AK4524 , .num_adcs =4 , .num_dacs =4 ,
@@ -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 , .cif =0 , .data_mask =ICE1712_VX442_DOUT ,
@@ -650,15 +650,15 @@ static int __devinit snd_ice1712_delta_init(struct snd_ice1712 *ice)* 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 ); -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 ); -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 ); -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 ); -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 );
@@ -735,7 +735,7 @@ static int __devinit snd_ice1712_delta_add_controls(struct snd_ice1712 *ice)/* 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 , .name ="M Audio Delta 1010" ,
sound/pci/ice1712/delta.h +1 -1
@@ -46,7 +46,7 @@#define ICE1712_SUBDEVICE_MEDIASTATION 0x694c0100/* 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 +12 -12
@@ -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_dacs =8 , .type =SND_AK4524 ,
@@ -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 , .cif =1 ,/* CIF high */ .data_mask =ICE1712_EWS88_SERIAL_DATA ,
@@ -354,7 +354,7 @@ static const struct snd_ak4xxx_private akm_ews88mt_priv __devinitdata = { .mask_flags = 0, }; -static const struct snd_akm4xxx akm_ewx2496__devinitdata = { +static struct snd_akm4xxx akm_ewx2496__devinitdata = { .num_adcs =2 , .num_dacs =2 , .type =SND_AK4524 ,
@@ -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 , .cif =1 ,/* CIF high */ .data_mask =ICE1712_EWS88_SERIAL_DATA ,
@@ -375,7 +375,7 @@ static const struct snd_ak4xxx_private akm_ewx2496_priv __devinitdata = { .mask_flags = 0, }; -static const struct snd_akm4xxx akm_6fire__devinitdata = { +static struct snd_akm4xxx akm_6fire__devinitdata = { .num_adcs =6 , .num_dacs =6 , .type =SND_AK4524 ,
@@ -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 , .cif =1 ,/* CIF high */ .data_mask =ICE1712_6FIRE_SERIAL_DATA ,
@@ -578,7 +578,7 @@ static int snd_ice1712_ewx_io_sense_put(struct snd_kcontrol *kcontrol, struct snreturn 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 , .name ="Input Sensitivity Switch" ,
@@ -678,7 +678,7 @@ static int snd_ice1712_ews88mt_input_sense_put(struct snd_kcontrol *kcontrol, streturn 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 , .name ="Input Sensitivity Switch" , .info = snd_ice1712_ewx_io_sense_info,
@@ -687,7 +687,7 @@ static const struct snd_kcontrol_new snd_ice1712_ews88mt_input_sense __devinitda .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 , .name ="Output Sensitivity Switch" , .info = snd_ice1712_ewx_io_sense_info,
@@ -769,7 +769,7 @@ static int snd_ice1712_ews88d_control_put(struct snd_kcontrol *kcontrol, struct .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 ,"ADAT Output Optical" ,1 ,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 .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 , .name ="Analog Input Select" ,
@@ -989,7 +989,7 @@ static int __devinit snd_ice1712_ews_add_controls(struct snd_ice1712 *ice)/* 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 , .name ="TerraTec EWX24/96" ,
sound/pci/ice1712/ews.h +1 -1
@@ -40,7 +40,7 @@#define ICE1712_SUBDEVICE_PHASE88 0x3b155111/* 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 */
sound/pci/ice1712/hoontech.c +3 -3
@@ -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) {/* 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_dacs =2 , .type =SND_AK4524 ,
@@ -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 , .cif =1 ,/* CIF high */ .data_mask =ICE1712_STDSP24_SERIAL_DATA ,
@@ -298,7 +298,7 @@ static int __devinit snd_ice1712_ez8_init(struct snd_ice1712 *ice)/* 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 , .name ="Hoontech SoundTrack Audio DSP24" ,
sound/pci/ice1712/hoontech.h +1 -1
@@ -35,7 +35,7 @@#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 */ -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 */
sound/pci/ice1712/ice1712.c +23 -23
184 lines not on this page · raw message
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV