Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[ALSA] Add 'const' to files in pci/ice1712/

Mark a lot of data as 'const'
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>

authored by

Takashi Iwai and committed by
Jaroslav Kysela
32b47da0 189bc171

+180 -183
+2 -2
sound/pci/ice1712/amp.c
··· 42 42 43 43 static int __devinit snd_vt1724_amp_init(struct snd_ice1712 *ice) 44 44 { 45 - static unsigned short wm_inits[] = { 45 + static const unsigned short wm_inits[] = { 46 46 WM_ATTEN_L, 0x0000, /* 0 db */ 47 47 WM_ATTEN_R, 0x0000, /* 0 db */ 48 48 WM_DAC_CTRL, 0x0008, /* 24bit I2S */ ··· 75 75 76 76 77 77 /* entry point */ 78 - struct snd_ice1712_card_info snd_vt1724_amp_cards[] __devinitdata = { 78 + const struct snd_ice1712_card_info snd_vt1724_amp_cards[] __devinitdata = { 79 79 { 80 80 .subvendor = VT1724_SUBDEVICE_AV710, 81 81 .name = "Chaintech AV-710",
+1 -1
sound/pci/ice1712/amp.h
··· 42 42 #define WM_DAC_CTRL 0x02 43 43 #define WM_INT_CTRL 0x03 44 44 45 - extern struct snd_ice1712_card_info snd_vt1724_amp_cards[]; 45 + extern const struct snd_ice1712_card_info snd_vt1724_amp_cards[]; 46 46 47 47 48 48 #endif /* __SOUND_AMP_H */
+20 -22
sound/pci/ice1712/aureon.c
··· 294 294 static int aureon_ac97_init (struct snd_ice1712 *ice) 295 295 { 296 296 int i; 297 - static unsigned short ac97_defaults[] = { 297 + static const unsigned short ac97_defaults[] = { 298 298 0x00, 0x9640, 299 299 0x02, 0x8000, 300 300 0x04, 0x8000, ··· 674 674 * Logarithmic volume values for WM8770 675 675 * Computed as 20 * Log10(255 / x) 676 676 */ 677 - static unsigned char wm_vol[256] = { 677 + static const unsigned char wm_vol[256] = { 678 678 127, 48, 42, 39, 36, 34, 33, 31, 30, 29, 28, 27, 27, 26, 25, 25, 24, 24, 23, 679 679 23, 22, 22, 21, 21, 21, 20, 20, 20, 19, 19, 19, 18, 18, 18, 18, 17, 17, 17, 680 680 17, 16, 16, 16, 16, 15, 15, 15, 15, 15, 15, 14, 14, 14, 14, 14, 13, 13, 13, ··· 1067 1067 */ 1068 1068 static int wm_adc_mux_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo) 1069 1069 { 1070 - static char *texts[] = { 1070 + static const char * const texts[] = { 1071 1071 "CD", //AIN1 1072 1072 "Aux", //AIN2 1073 1073 "Line", //AIN3 1074 1074 "Mic", //AIN4 1075 1075 "AC97" //AIN5 1076 1076 }; 1077 - static char *universe_texts[] = { 1077 + static const char * const universe_texts[] = { 1078 1078 "Aux1", //AIN1 1079 1079 "CD", //AIN2 1080 1080 "Phono", //AIN3 ··· 1140 1140 static int aureon_cs8415_mux_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo) 1141 1141 { 1142 1142 struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol); 1143 - static char *aureon_texts[] = { 1143 + static const char * const aureon_texts[] = { 1144 1144 "CD", //RXP0 1145 1145 "Optical" //RXP1 1146 1146 }; 1147 - static char *prodigy_texts[] = { 1147 + static const char * const prodigy_texts[] = { 1148 1148 "CD", 1149 1149 "Coax" 1150 1150 }; ··· 1368 1368 */ 1369 1369 static int aureon_oversampling_info(struct snd_kcontrol *k, struct snd_ctl_elem_info *uinfo) 1370 1370 { 1371 - static char *texts[2] = { "128x", "64x" }; 1371 + static const char * const texts[2] = { "128x", "64x" }; 1372 1372 1373 1373 uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED; 1374 1374 uinfo->count = 1; ··· 1411 1411 * mixers 1412 1412 */ 1413 1413 1414 - static struct snd_kcontrol_new aureon_dac_controls[] __devinitdata = { 1414 + static const struct snd_kcontrol_new aureon_dac_controls[] __devinitdata = { 1415 1415 { 1416 1416 .iface = SNDRV_CTL_ELEM_IFACE_MIXER, 1417 1417 .name = "Master Playback Switch", ··· 1526 1526 } 1527 1527 }; 1528 1528 1529 - static struct snd_kcontrol_new wm_controls[] __devinitdata = { 1529 + static const struct snd_kcontrol_new wm_controls[] __devinitdata = { 1530 1530 { 1531 1531 .iface = SNDRV_CTL_ELEM_IFACE_MIXER, 1532 1532 .name = "PCM Playback Switch", ··· 1592 1592 } 1593 1593 }; 1594 1594 1595 - static struct snd_kcontrol_new ac97_controls[] __devinitdata = { 1595 + static const struct snd_kcontrol_new ac97_controls[] __devinitdata = { 1596 1596 { 1597 1597 .iface = SNDRV_CTL_ELEM_IFACE_MIXER, 1598 1598 .name = "AC97 Playback Switch", ··· 1697 1697 } 1698 1698 }; 1699 1699 1700 - static struct snd_kcontrol_new universe_ac97_controls[] __devinitdata = { 1700 + static const struct snd_kcontrol_new universe_ac97_controls[] __devinitdata = { 1701 1701 { 1702 1702 .iface = SNDRV_CTL_ELEM_IFACE_MIXER, 1703 1703 .name = "AC97 Playback Switch", ··· 1829 1829 1830 1830 }; 1831 1831 1832 - 1833 - static struct snd_kcontrol_new cs8415_controls[] __devinitdata = { 1832 + static const struct snd_kcontrol_new cs8415_controls[] __devinitdata = { 1834 1833 { 1835 1834 .iface = SNDRV_CTL_ELEM_IFACE_MIXER, 1836 1835 .name = SNDRV_CTL_NAME_IEC958("",CAPTURE,SWITCH), ··· 1874 1875 } 1875 1876 }; 1876 1877 1877 - 1878 1878 static int __devinit aureon_add_controls(struct snd_ice1712 *ice) 1879 1879 { 1880 1880 unsigned int i, counts; ··· 1941 1943 */ 1942 1944 static int __devinit aureon_init(struct snd_ice1712 *ice) 1943 1945 { 1944 - static unsigned short wm_inits_aureon[] = { 1946 + static const unsigned short wm_inits_aureon[] = { 1945 1947 /* These come first to reduce init pop noise */ 1946 1948 0x1b, 0x044, /* ADC Mux (AC'97 source) */ 1947 1949 0x1c, 0x00B, /* Out Mux1 (VOUT1 = DAC+AUX, VOUT2 = DAC) */ ··· 1977 1979 0x1a, 0x000, /* -12dB ADC/R */ 1978 1980 (unsigned short)-1 1979 1981 }; 1980 - static unsigned short wm_inits_prodigy[] = { 1982 + static const unsigned short wm_inits_prodigy[] = { 1981 1983 1982 1984 /* These come first to reduce init pop noise */ 1983 1985 0x1b, 0x000, /* ADC Mux */ ··· 2019 2021 (unsigned short)-1 2020 2022 2021 2023 }; 2022 - static unsigned short cs_inits[] = { 2024 + static const unsigned short cs_inits[] = { 2023 2025 0x0441, /* RUN */ 2024 2026 0x0180, /* no mute, OMCK output on RMCK pin */ 2025 2027 0x0201, /* S/PDIF source on RXP1 */ ··· 2027 2029 (unsigned short)-1 2028 2030 }; 2029 2031 unsigned int tmp; 2030 - unsigned short *p; 2032 + const unsigned short *p; 2031 2033 int err, i; 2032 2034 2033 2035 if (ice->eeprom.subvendor == VT1724_SUBDEVICE_AUREON51_SKY) { ··· 2107 2109 * hence the driver needs to sets up it properly. 2108 2110 */ 2109 2111 2110 - static unsigned char aureon51_eeprom[] __devinitdata = { 2112 + static const unsigned char aureon51_eeprom[] __devinitdata = { 2111 2113 [ICE_EEP2_SYSCONF] = 0x0a, /* clock 512, spdif-in/ADC, 3DACs */ 2112 2114 [ICE_EEP2_ACLINK] = 0x80, /* I2S */ 2113 2115 [ICE_EEP2_I2S] = 0xfc, /* vol, 96k, 24bit, 192k */ ··· 2123 2125 [ICE_EEP2_GPIO_STATE2] = 0x00, 2124 2126 }; 2125 2127 2126 - static unsigned char aureon71_eeprom[] __devinitdata = { 2128 + static const unsigned char aureon71_eeprom[] __devinitdata = { 2127 2129 [ICE_EEP2_SYSCONF] = 0x0b, /* clock 512, spdif-in/ADC, 4DACs */ 2128 2130 [ICE_EEP2_ACLINK] = 0x80, /* I2S */ 2129 2131 [ICE_EEP2_I2S] = 0xfc, /* vol, 96k, 24bit, 192k */ ··· 2140 2142 }; 2141 2143 #define prodigy71_eeprom aureon71_eeprom 2142 2144 2143 - static unsigned char prodigy71lt_eeprom[] __devinitdata = { 2145 + static const unsigned char prodigy71lt_eeprom[] __devinitdata = { 2144 2146 [ICE_EEP2_SYSCONF] = 0x4b, /* clock 384, spdif-in/ADC, 4DACs */ 2145 2147 [ICE_EEP2_ACLINK] = 0x80, /* I2S */ 2146 2148 [ICE_EEP2_I2S] = 0xfc, /* vol, 96k, 24bit, 192k */ ··· 2158 2160 #define prodigy71xt_eeprom prodigy71lt_eeprom 2159 2161 2160 2162 /* entry point */ 2161 - struct snd_ice1712_card_info snd_vt1724_aureon_cards[] __devinitdata = { 2163 + const struct snd_ice1712_card_info snd_vt1724_aureon_cards[] __devinitdata = { 2162 2164 { 2163 2165 .subvendor = VT1724_SUBDEVICE_AUREON51_SKY, 2164 2166 .name = "Terratec Aureon 5.1-Sky",
+1 -1
sound/pci/ice1712/aureon.h
··· 38 38 #define VT1724_SUBDEVICE_PRODIGY71LT 0x32315441 /* PRODIGY 7.1 LT */ 39 39 #define VT1724_SUBDEVICE_PRODIGY71XT 0x36315441 /* PRODIGY 7.1 XT*/ 40 40 41 - extern struct snd_ice1712_card_info snd_vt1724_aureon_cards[]; 41 + extern const struct snd_ice1712_card_info snd_vt1724_aureon_cards[]; 42 42 43 43 /* GPIO bits */ 44 44 #define AUREON_CS8415_CS (1 << 22)
+17 -17
sound/pci/ice1712/delta.c
··· 416 416 return 0; 417 417 } 418 418 419 - static struct snd_kcontrol_new snd_ice1712_delta1010lt_wordclock_status __devinitdata = 419 + static const struct snd_kcontrol_new snd_ice1712_delta1010lt_wordclock_status __devinitdata = 420 420 { 421 421 .access = (SNDRV_CTL_ELEM_ACCESS_READ), 422 422 .iface = SNDRV_CTL_ELEM_IFACE_MIXER, ··· 429 429 * initialize the chips on M-Audio cards 430 430 */ 431 431 432 - static struct snd_akm4xxx akm_audiophile __devinitdata = { 432 + static const struct snd_akm4xxx akm_audiophile __devinitdata = { 433 433 .type = SND_AK4528, 434 434 .num_adcs = 2, 435 435 .num_dacs = 2, ··· 438 438 } 439 439 }; 440 440 441 - static struct snd_ak4xxx_private akm_audiophile_priv __devinitdata = { 441 + static const struct snd_ak4xxx_private akm_audiophile_priv __devinitdata = { 442 442 .caddr = 2, 443 443 .cif = 0, 444 444 .data_mask = ICE1712_DELTA_AP_DOUT, ··· 450 450 .mask_flags = 0, 451 451 }; 452 452 453 - static struct snd_akm4xxx akm_delta410 __devinitdata = { 453 + static const struct snd_akm4xxx akm_delta410 __devinitdata = { 454 454 .type = SND_AK4529, 455 455 .num_adcs = 2, 456 456 .num_dacs = 8, ··· 459 459 } 460 460 }; 461 461 462 - static struct snd_ak4xxx_private akm_delta410_priv __devinitdata = { 462 + static const struct snd_ak4xxx_private akm_delta410_priv __devinitdata = { 463 463 .caddr = 0, 464 464 .cif = 0, 465 465 .data_mask = ICE1712_DELTA_AP_DOUT, ··· 471 471 .mask_flags = 0, 472 472 }; 473 473 474 - static struct snd_akm4xxx akm_delta1010lt __devinitdata = { 474 + static const struct snd_akm4xxx akm_delta1010lt __devinitdata = { 475 475 .type = SND_AK4524, 476 476 .num_adcs = 8, 477 477 .num_dacs = 8, ··· 481 481 } 482 482 }; 483 483 484 - static struct snd_ak4xxx_private akm_delta1010lt_priv __devinitdata = { 484 + static const struct snd_ak4xxx_private akm_delta1010lt_priv __devinitdata = { 485 485 .caddr = 2, 486 486 .cif = 0, /* the default level of the CIF pin from AK4524 */ 487 487 .data_mask = ICE1712_DELTA_1010LT_DOUT, ··· 493 493 .mask_flags = 0, 494 494 }; 495 495 496 - static struct snd_akm4xxx akm_delta44 __devinitdata = { 496 + static const struct snd_akm4xxx akm_delta44 __devinitdata = { 497 497 .type = SND_AK4524, 498 498 .num_adcs = 4, 499 499 .num_dacs = 4, ··· 503 503 } 504 504 }; 505 505 506 - static struct snd_ak4xxx_private akm_delta44_priv __devinitdata = { 506 + static const struct snd_ak4xxx_private akm_delta44_priv __devinitdata = { 507 507 .caddr = 2, 508 508 .cif = 0, /* the default level of the CIF pin from AK4524 */ 509 509 .data_mask = ICE1712_DELTA_CODEC_SERIAL_DATA, ··· 515 515 .mask_flags = 0, 516 516 }; 517 517 518 - static struct snd_akm4xxx akm_vx442 __devinitdata = { 518 + static const struct snd_akm4xxx akm_vx442 __devinitdata = { 519 519 .type = SND_AK4524, 520 520 .num_adcs = 4, 521 521 .num_dacs = 4, ··· 525 525 } 526 526 }; 527 527 528 - static struct snd_ak4xxx_private akm_vx442_priv __devinitdata = { 528 + static const struct snd_ak4xxx_private akm_vx442_priv __devinitdata = { 529 529 .caddr = 2, 530 530 .cif = 0, 531 531 .data_mask = ICE1712_VX442_DOUT, ··· 650 650 * additional controls for M-Audio cards 651 651 */ 652 652 653 - static struct snd_kcontrol_new snd_ice1712_delta1010_wordclock_select __devinitdata = 653 + static const struct snd_kcontrol_new snd_ice1712_delta1010_wordclock_select __devinitdata = 654 654 ICE1712_GPIO(SNDRV_CTL_ELEM_IFACE_MIXER, "Word Clock Sync", 0, ICE1712_DELTA_WORD_CLOCK_SELECT, 1, 0); 655 - static struct snd_kcontrol_new snd_ice1712_delta1010lt_wordclock_select __devinitdata = 655 + static const struct snd_kcontrol_new snd_ice1712_delta1010lt_wordclock_select __devinitdata = 656 656 ICE1712_GPIO(SNDRV_CTL_ELEM_IFACE_MIXER, "Word Clock Sync", 0, ICE1712_DELTA_1010LT_WORDCLOCK, 0, 0); 657 - static struct snd_kcontrol_new snd_ice1712_delta1010_wordclock_status __devinitdata = 657 + static const struct snd_kcontrol_new snd_ice1712_delta1010_wordclock_status __devinitdata = 658 658 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); 659 - static struct snd_kcontrol_new snd_ice1712_deltadio2496_spdif_in_select __devinitdata = 659 + static const struct snd_kcontrol_new snd_ice1712_deltadio2496_spdif_in_select __devinitdata = 660 660 ICE1712_GPIO(SNDRV_CTL_ELEM_IFACE_MIXER, "IEC958 Input Optical", 0, ICE1712_DELTA_SPDIF_INPUT_SELECT, 0, 0); 661 - static struct snd_kcontrol_new snd_ice1712_delta_spdif_in_status __devinitdata = 661 + static const struct snd_kcontrol_new snd_ice1712_delta_spdif_in_status __devinitdata = 662 662 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); 663 663 664 664 ··· 735 735 736 736 737 737 /* entry point */ 738 - struct snd_ice1712_card_info snd_ice1712_delta_cards[] __devinitdata = { 738 + const struct snd_ice1712_card_info snd_ice1712_delta_cards[] __devinitdata = { 739 739 { 740 740 .subvendor = ICE1712_SUBDEVICE_DELTA1010, 741 741 .name = "M Audio Delta 1010",
+1 -1
sound/pci/ice1712/delta.h
··· 46 46 #define ICE1712_SUBDEVICE_MEDIASTATION 0x694c0100 47 47 48 48 /* entry point */ 49 - extern struct snd_ice1712_card_info snd_ice1712_delta_cards[]; 49 + extern const struct snd_ice1712_card_info snd_ice1712_delta_cards[]; 50 50 51 51 52 52 /*
+12 -12
sound/pci/ice1712/ews.c
··· 332 332 333 333 /* 334 334 */ 335 - static struct snd_akm4xxx akm_ews88mt __devinitdata = { 335 + static const struct snd_akm4xxx akm_ews88mt __devinitdata = { 336 336 .num_adcs = 8, 337 337 .num_dacs = 8, 338 338 .type = SND_AK4524, ··· 342 342 } 343 343 }; 344 344 345 - static struct snd_ak4xxx_private akm_ews88mt_priv __devinitdata = { 345 + static const struct snd_ak4xxx_private akm_ews88mt_priv __devinitdata = { 346 346 .caddr = 2, 347 347 .cif = 1, /* CIF high */ 348 348 .data_mask = ICE1712_EWS88_SERIAL_DATA, ··· 354 354 .mask_flags = 0, 355 355 }; 356 356 357 - static struct snd_akm4xxx akm_ewx2496 __devinitdata = { 357 + static const struct snd_akm4xxx akm_ewx2496 __devinitdata = { 358 358 .num_adcs = 2, 359 359 .num_dacs = 2, 360 360 .type = SND_AK4524, ··· 363 363 } 364 364 }; 365 365 366 - static struct snd_ak4xxx_private akm_ewx2496_priv __devinitdata = { 366 + static const struct snd_ak4xxx_private akm_ewx2496_priv __devinitdata = { 367 367 .caddr = 2, 368 368 .cif = 1, /* CIF high */ 369 369 .data_mask = ICE1712_EWS88_SERIAL_DATA, ··· 375 375 .mask_flags = 0, 376 376 }; 377 377 378 - static struct snd_akm4xxx akm_6fire __devinitdata = { 378 + static const struct snd_akm4xxx akm_6fire __devinitdata = { 379 379 .num_adcs = 6, 380 380 .num_dacs = 6, 381 381 .type = SND_AK4524, ··· 384 384 } 385 385 }; 386 386 387 - static struct snd_ak4xxx_private akm_6fire_priv __devinitdata = { 387 + static const struct snd_ak4xxx_private akm_6fire_priv __devinitdata = { 388 388 .caddr = 2, 389 389 .cif = 1, /* CIF high */ 390 390 .data_mask = ICE1712_6FIRE_SERIAL_DATA, ··· 578 578 return val != nval; 579 579 } 580 580 581 - static struct snd_kcontrol_new snd_ice1712_ewx2496_controls[] __devinitdata = { 581 + static const struct snd_kcontrol_new snd_ice1712_ewx2496_controls[] __devinitdata = { 582 582 { 583 583 .iface = SNDRV_CTL_ELEM_IFACE_MIXER, 584 584 .name = "Input Sensitivity Switch", ··· 678 678 return ndata != data; 679 679 } 680 680 681 - static struct snd_kcontrol_new snd_ice1712_ews88mt_input_sense __devinitdata = { 681 + static const struct snd_kcontrol_new snd_ice1712_ews88mt_input_sense __devinitdata = { 682 682 .iface = SNDRV_CTL_ELEM_IFACE_MIXER, 683 683 .name = "Input Sensitivity Switch", 684 684 .info = snd_ice1712_ewx_io_sense_info, ··· 687 687 .count = 8, 688 688 }; 689 689 690 - static struct snd_kcontrol_new snd_ice1712_ews88mt_output_sense __devinitdata = { 690 + static const struct snd_kcontrol_new snd_ice1712_ews88mt_output_sense __devinitdata = { 691 691 .iface = SNDRV_CTL_ELEM_IFACE_MIXER, 692 692 .name = "Output Sensitivity Switch", 693 693 .info = snd_ice1712_ewx_io_sense_info, ··· 769 769 .private_value = xshift | (xinvert << 8),\ 770 770 } 771 771 772 - static struct snd_kcontrol_new snd_ice1712_ews88d_controls[] __devinitdata = { 772 + static const struct snd_kcontrol_new snd_ice1712_ews88d_controls[] __devinitdata = { 773 773 EWS88D_CONTROL(SNDRV_CTL_ELEM_IFACE_MIXER, "IEC958 Input Optical", 0, 1, 0), /* inverted */ 774 774 EWS88D_CONTROL(SNDRV_CTL_ELEM_IFACE_MIXER, "ADAT Output Optical", 1, 0, 0), 775 775 EWS88D_CONTROL(SNDRV_CTL_ELEM_IFACE_MIXER, "ADAT External Master Clock", 2, 0, 0), ··· 909 909 .private_value = xshift | (xinvert << 8),\ 910 910 } 911 911 912 - static struct snd_kcontrol_new snd_ice1712_6fire_controls[] __devinitdata = { 912 + static const struct snd_kcontrol_new snd_ice1712_6fire_controls[] __devinitdata = { 913 913 { 914 914 .iface = SNDRV_CTL_ELEM_IFACE_MIXER, 915 915 .name = "Analog Input Select", ··· 989 989 990 990 991 991 /* entry point */ 992 - struct snd_ice1712_card_info snd_ice1712_ews_cards[] __devinitdata = { 992 + const struct snd_ice1712_card_info snd_ice1712_ews_cards[] __devinitdata = { 993 993 { 994 994 .subvendor = ICE1712_SUBDEVICE_EWX2496, 995 995 .name = "TerraTec EWX24/96",
+1 -1
sound/pci/ice1712/ews.h
··· 40 40 #define ICE1712_SUBDEVICE_PHASE88 0x3b155111 41 41 42 42 /* entry point */ 43 - extern struct snd_ice1712_card_info snd_ice1712_ews_cards[]; 43 + extern const struct snd_ice1712_card_info snd_ice1712_ews_cards[]; 44 44 45 45 46 46 /* TerraTec EWX 24/96 configuration definitions */
+3 -4
sound/pci/ice1712/hoontech.c
··· 239 239 static int __devinit snd_ice1712_value_init(struct snd_ice1712 *ice) 240 240 { 241 241 /* Hoontech STDSP24 with modified hardware */ 242 - static struct snd_akm4xxx akm_stdsp24_mv __devinitdata = { 242 + static const struct snd_akm4xxx akm_stdsp24_mv __devinitdata = { 243 243 .num_adcs = 2, 244 244 .num_dacs = 2, 245 245 .type = SND_AK4524, ··· 248 248 } 249 249 }; 250 250 251 - static struct snd_ak4xxx_private akm_stdsp24_mv_priv __devinitdata = { 251 + static const struct snd_ak4xxx_private akm_stdsp24_mv_priv __devinitdata = { 252 252 .caddr = 2, 253 253 .cif = 1, /* CIF high */ 254 254 .data_mask = ICE1712_STDSP24_SERIAL_DATA, ··· 298 298 299 299 300 300 /* entry point */ 301 - struct snd_ice1712_card_info snd_ice1712_hoontech_cards[] __devinitdata = { 301 + const struct snd_ice1712_card_info snd_ice1712_hoontech_cards[] __devinitdata = { 302 302 { 303 303 .subvendor = ICE1712_SUBDEVICE_STDSP24, 304 304 .name = "Hoontech SoundTrack Audio DSP24", ··· 325 325 }, 326 326 { } /* terminator */ 327 327 }; 328 -
+1 -1
sound/pci/ice1712/hoontech.h
··· 35 35 #define ICE1712_SUBDEVICE_STDSP24_MEDIA7_1 0x16141217 /* Hoontech ST Audio DSP24 Media 7.1 */ 36 36 #define ICE1712_SUBDEVICE_EVENT_EZ8 0x00010001 /* A dummy id for EZ8 */ 37 37 38 - extern struct snd_ice1712_card_info snd_ice1712_hoontech_cards[]; 38 + extern const struct snd_ice1712_card_info snd_ice1712_hoontech_cards[]; 39 39 40 40 41 41 /* Hoontech SoundTrack Audio DSP 24 GPIO definitions */
+36 -36
sound/pci/ice1712/ice1712.c
··· 107 107 MODULE_PARM_DESC(dxr_enable, "Enable DXR support for Terratec DMX6FIRE."); 108 108 109 109 110 - static struct pci_device_id snd_ice1712_ids[] = { 110 + static const struct pci_device_id snd_ice1712_ids[] = { 111 111 { PCI_VENDOR_ID_ICE, PCI_DEVICE_ID_ICE_1712, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* ICE1712 */ 112 112 { 0, } 113 113 }; ··· 287 287 return val != nval; 288 288 } 289 289 290 - static struct snd_kcontrol_new snd_ice1712_mixer_digmix_route_ac97 __devinitdata = { 290 + static const struct snd_kcontrol_new snd_ice1712_mixer_digmix_route_ac97 __devinitdata = { 291 291 .iface = SNDRV_CTL_ELEM_IFACE_MIXER, 292 292 .name = "Digital Mixer To AC97", 293 293 .info = snd_ice1712_digmix_route_ac97_info, ··· 719 719 return bytes_to_frames(substream->runtime, ptr); 720 720 } 721 721 722 - static struct snd_pcm_hardware snd_ice1712_playback = 722 + static const struct snd_pcm_hardware snd_ice1712_playback = 723 723 { 724 724 .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | 725 725 SNDRV_PCM_INFO_BLOCK_TRANSFER | ··· 739 739 .fifo_size = 0, 740 740 }; 741 741 742 - static struct snd_pcm_hardware snd_ice1712_playback_ds = 742 + static const struct snd_pcm_hardware snd_ice1712_playback_ds = 743 743 { 744 744 .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | 745 745 SNDRV_PCM_INFO_BLOCK_TRANSFER | ··· 759 759 .fifo_size = 0, 760 760 }; 761 761 762 - static struct snd_pcm_hardware snd_ice1712_capture = 762 + static const struct snd_pcm_hardware snd_ice1712_capture = 763 763 { 764 764 .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | 765 765 SNDRV_PCM_INFO_BLOCK_TRANSFER | ··· 1133 1133 return bytes_to_frames(substream->runtime, ptr); 1134 1134 } 1135 1135 1136 - static struct snd_pcm_hardware snd_ice1712_playback_pro = 1136 + static const struct snd_pcm_hardware snd_ice1712_playback_pro = 1137 1137 { 1138 1138 .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | 1139 1139 SNDRV_PCM_INFO_BLOCK_TRANSFER | ··· 1153 1153 .fifo_size = 0, 1154 1154 }; 1155 1155 1156 - static struct snd_pcm_hardware snd_ice1712_capture_pro = 1156 + static const struct snd_pcm_hardware snd_ice1712_capture_pro = 1157 1157 { 1158 1158 .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | 1159 1159 SNDRV_PCM_INFO_BLOCK_TRANSFER | ··· 1380 1380 1381 1381 static DECLARE_TLV_DB_SCALE(db_scale_playback, -14400, 150, 0); 1382 1382 1383 - static struct snd_kcontrol_new snd_ice1712_multi_playback_ctrls[] __devinitdata = { 1383 + static const struct snd_kcontrol_new snd_ice1712_multi_playback_ctrls[] __devinitdata = { 1384 1384 { 1385 1385 .iface = SNDRV_CTL_ELEM_IFACE_MIXER, 1386 1386 .name = "Multi Playback Switch", ··· 1404 1404 }, 1405 1405 }; 1406 1406 1407 - static struct snd_kcontrol_new snd_ice1712_multi_capture_analog_switch __devinitdata = { 1407 + static const struct snd_kcontrol_new snd_ice1712_multi_capture_analog_switch __devinitdata = { 1408 1408 .iface = SNDRV_CTL_ELEM_IFACE_MIXER, 1409 1409 .name = "H/W Multi Capture Switch", 1410 1410 .info = snd_ice1712_pro_mixer_switch_info, ··· 1413 1413 .private_value = 10, 1414 1414 }; 1415 1415 1416 - static struct snd_kcontrol_new snd_ice1712_multi_capture_spdif_switch __devinitdata = { 1416 + static const struct snd_kcontrol_new snd_ice1712_multi_capture_spdif_switch __devinitdata = { 1417 1417 .iface = SNDRV_CTL_ELEM_IFACE_MIXER, 1418 1418 .name = SNDRV_CTL_NAME_IEC958("Multi ",CAPTURE,SWITCH), 1419 1419 .info = snd_ice1712_pro_mixer_switch_info, ··· 1423 1423 .count = 2, 1424 1424 }; 1425 1425 1426 - static struct snd_kcontrol_new snd_ice1712_multi_capture_analog_volume __devinitdata = { 1426 + static const struct snd_kcontrol_new snd_ice1712_multi_capture_analog_volume __devinitdata = { 1427 1427 .iface = SNDRV_CTL_ELEM_IFACE_MIXER, 1428 1428 .access = (SNDRV_CTL_ELEM_ACCESS_READWRITE | 1429 1429 SNDRV_CTL_ELEM_ACCESS_TLV_READ), ··· 1435 1435 .tlv = { .p = db_scale_playback } 1436 1436 }; 1437 1437 1438 - static struct snd_kcontrol_new snd_ice1712_multi_capture_spdif_volume __devinitdata = { 1438 + static const struct snd_kcontrol_new snd_ice1712_multi_capture_spdif_volume __devinitdata = { 1439 1439 .iface = SNDRV_CTL_ELEM_IFACE_MIXER, 1440 1440 .name = SNDRV_CTL_NAME_IEC958("Multi ",CAPTURE,VOLUME), 1441 1441 .info = snd_ice1712_pro_mixer_volume_info, ··· 1627 1627 return 0; 1628 1628 } 1629 1629 1630 - static struct snd_kcontrol_new snd_ice1712_eeprom __devinitdata = { 1630 + static const struct snd_kcontrol_new snd_ice1712_eeprom __devinitdata = { 1631 1631 .iface = SNDRV_CTL_ELEM_IFACE_CARD, 1632 1632 .name = "ICE1712 EEPROM", 1633 1633 .access = SNDRV_CTL_ELEM_ACCESS_READ, ··· 1663 1663 return 0; 1664 1664 } 1665 1665 1666 - static struct snd_kcontrol_new snd_ice1712_spdif_default __devinitdata = 1666 + static const struct snd_kcontrol_new snd_ice1712_spdif_default __devinitdata = 1667 1667 { 1668 1668 .iface = SNDRV_CTL_ELEM_IFACE_PCM, 1669 1669 .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT), ··· 1714 1714 return 0; 1715 1715 } 1716 1716 1717 - static struct snd_kcontrol_new snd_ice1712_spdif_maskc __devinitdata = 1717 + static const struct snd_kcontrol_new snd_ice1712_spdif_maskc __devinitdata = 1718 1718 { 1719 1719 .access = SNDRV_CTL_ELEM_ACCESS_READ, 1720 1720 .iface = SNDRV_CTL_ELEM_IFACE_PCM, ··· 1723 1723 .get = snd_ice1712_spdif_maskc_get, 1724 1724 }; 1725 1725 1726 - static struct snd_kcontrol_new snd_ice1712_spdif_maskp __devinitdata = 1726 + static const struct snd_kcontrol_new snd_ice1712_spdif_maskp __devinitdata = 1727 1727 { 1728 1728 .access = SNDRV_CTL_ELEM_ACCESS_READ, 1729 1729 .iface = SNDRV_CTL_ELEM_IFACE_PCM, ··· 1750 1750 return 0; 1751 1751 } 1752 1752 1753 - static struct snd_kcontrol_new snd_ice1712_spdif_stream __devinitdata = 1753 + static const struct snd_kcontrol_new snd_ice1712_spdif_stream __devinitdata = 1754 1754 { 1755 1755 .access = (SNDRV_CTL_ELEM_ACCESS_READWRITE | 1756 1756 SNDRV_CTL_ELEM_ACCESS_INACTIVE), ··· 1811 1811 static int snd_ice1712_pro_internal_clock_info(struct snd_kcontrol *kcontrol, 1812 1812 struct snd_ctl_elem_info *uinfo) 1813 1813 { 1814 - static char *texts[] = { 1814 + static const char * const texts[] = { 1815 1815 "8000", /* 0: 6 */ 1816 1816 "9600", /* 1: 3 */ 1817 1817 "11025", /* 2: 10 */ ··· 1840 1840 struct snd_ctl_elem_value *ucontrol) 1841 1841 { 1842 1842 struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol); 1843 - static unsigned char xlate[16] = { 1843 + static const unsigned char xlate[16] = { 1844 1844 9, 6, 3, 1, 7, 4, 0, 12, 8, 5, 2, 11, 255, 255, 255, 10 1845 1845 }; 1846 1846 unsigned char val; ··· 1864 1864 struct snd_ctl_elem_value *ucontrol) 1865 1865 { 1866 1866 struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol); 1867 - static unsigned int xrate[13] = { 1867 + static const unsigned int xrate[13] = { 1868 1868 8000, 9600, 11025, 12000, 16000, 22050, 24000, 1869 1869 32000, 44100, 48000, 64000, 88200, 96000 1870 1870 }; ··· 1891 1891 return change; 1892 1892 } 1893 1893 1894 - static struct snd_kcontrol_new snd_ice1712_pro_internal_clock __devinitdata = { 1894 + static const struct snd_kcontrol_new snd_ice1712_pro_internal_clock __devinitdata = { 1895 1895 .iface = SNDRV_CTL_ELEM_IFACE_MIXER, 1896 1896 .name = "Multi Track Internal Clock", 1897 1897 .info = snd_ice1712_pro_internal_clock_info, ··· 1902 1902 static int snd_ice1712_pro_internal_clock_default_info(struct snd_kcontrol *kcontrol, 1903 1903 struct snd_ctl_elem_info *uinfo) 1904 1904 { 1905 - static char *texts[] = { 1905 + static const char * const texts[] = { 1906 1906 "8000", /* 0: 6 */ 1907 1907 "9600", /* 1: 3 */ 1908 1908 "11025", /* 2: 10 */ ··· 1931 1931 struct snd_ctl_elem_value *ucontrol) 1932 1932 { 1933 1933 int val; 1934 - static unsigned int xrate[13] = { 1934 + static const unsigned int xrate[13] = { 1935 1935 8000, 9600, 11025, 12000, 16000, 22050, 24000, 1936 1936 32000, 44100, 48000, 64000, 88200, 96000 1937 1937 }; ··· 1948 1948 static int snd_ice1712_pro_internal_clock_default_put(struct snd_kcontrol *kcontrol, 1949 1949 struct snd_ctl_elem_value *ucontrol) 1950 1950 { 1951 - static unsigned int xrate[13] = { 1951 + static const unsigned int xrate[13] = { 1952 1952 8000, 9600, 11025, 12000, 16000, 22050, 24000, 1953 1953 32000, 44100, 48000, 64000, 88200, 96000 1954 1954 }; ··· 1962 1962 return change; 1963 1963 } 1964 1964 1965 - static struct snd_kcontrol_new snd_ice1712_pro_internal_clock_default __devinitdata = { 1965 + static const struct snd_kcontrol_new snd_ice1712_pro_internal_clock_default __devinitdata = { 1966 1966 .iface = SNDRV_CTL_ELEM_IFACE_MIXER, 1967 1967 .name = "Multi Track Internal Clock Default", 1968 1968 .info = snd_ice1712_pro_internal_clock_default_info, ··· 2001 2001 return change; 2002 2002 } 2003 2003 2004 - static struct snd_kcontrol_new snd_ice1712_pro_rate_locking __devinitdata = { 2004 + static const struct snd_kcontrol_new snd_ice1712_pro_rate_locking __devinitdata = { 2005 2005 .iface = SNDRV_CTL_ELEM_IFACE_MIXER, 2006 2006 .name = "Multi Track Rate Locking", 2007 2007 .info = snd_ice1712_pro_rate_locking_info, ··· 2040 2040 return change; 2041 2041 } 2042 2042 2043 - static struct snd_kcontrol_new snd_ice1712_pro_rate_reset __devinitdata = { 2043 + static const struct snd_kcontrol_new snd_ice1712_pro_rate_reset __devinitdata = { 2044 2044 .iface = SNDRV_CTL_ELEM_IFACE_MIXER, 2045 2045 .name = "Multi Track Rate Reset", 2046 2046 .info = snd_ice1712_pro_rate_reset_info, ··· 2054 2054 static int snd_ice1712_pro_route_info(struct snd_kcontrol *kcontrol, 2055 2055 struct snd_ctl_elem_info *uinfo) 2056 2056 { 2057 - static char *texts[] = { 2057 + static const char * const texts[] = { 2058 2058 "PCM Out", /* 0 */ 2059 2059 "H/W In 0", "H/W In 1", "H/W In 2", "H/W In 3", /* 1-4 */ 2060 2060 "H/W In 4", "H/W In 5", "H/W In 6", "H/W In 7", /* 5-8 */ ··· 2207 2207 return change; 2208 2208 } 2209 2209 2210 - static struct snd_kcontrol_new snd_ice1712_mixer_pro_analog_route __devinitdata = { 2210 + static const struct snd_kcontrol_new snd_ice1712_mixer_pro_analog_route __devinitdata = { 2211 2211 .iface = SNDRV_CTL_ELEM_IFACE_MIXER, 2212 2212 .name = "H/W Playback Route", 2213 2213 .info = snd_ice1712_pro_route_info, ··· 2215 2215 .put = snd_ice1712_pro_route_analog_put, 2216 2216 }; 2217 2217 2218 - static struct snd_kcontrol_new snd_ice1712_mixer_pro_spdif_route __devinitdata = { 2218 + static const struct snd_kcontrol_new snd_ice1712_mixer_pro_spdif_route __devinitdata = { 2219 2219 .iface = SNDRV_CTL_ELEM_IFACE_MIXER, 2220 2220 .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,NONE) "Route", 2221 2221 .info = snd_ice1712_pro_route_info, ··· 2257 2257 return change; 2258 2258 } 2259 2259 2260 - static struct snd_kcontrol_new snd_ice1712_mixer_pro_volume_rate __devinitdata = { 2260 + static const struct snd_kcontrol_new snd_ice1712_mixer_pro_volume_rate __devinitdata = { 2261 2261 .iface = SNDRV_CTL_ELEM_IFACE_MIXER, 2262 2262 .name = "Multi Track Volume Rate", 2263 2263 .info = snd_ice1712_pro_volume_rate_info, ··· 2290 2290 return 0; 2291 2291 } 2292 2292 2293 - static struct snd_kcontrol_new snd_ice1712_mixer_pro_peak __devinitdata = { 2293 + static const struct snd_kcontrol_new snd_ice1712_mixer_pro_peak __devinitdata = { 2294 2294 .iface = SNDRV_CTL_ELEM_IFACE_MIXER, 2295 2295 .name = "Multi Track Peak", 2296 2296 .access = SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE, ··· 2305 2305 /* 2306 2306 * list of available boards 2307 2307 */ 2308 - static struct snd_ice1712_card_info *card_tables[] __devinitdata = { 2308 + static const struct snd_ice1712_card_info *card_tables[] __devinitdata = { 2309 2309 snd_ice1712_hoontech_cards, 2310 2310 snd_ice1712_delta_cards, 2311 2311 snd_ice1712_ews_cards, ··· 2329 2329 { 2330 2330 int dev = 0xa0; /* EEPROM device address */ 2331 2331 unsigned int i, size; 2332 - struct snd_ice1712_card_info **tbl, *c; 2332 + const struct snd_ice1712_card_info **tbl, *c; 2333 2333 2334 2334 if (! modelname || ! *modelname) { 2335 2335 ice->eeprom.subvendor = 0; ··· 2658 2658 * 2659 2659 */ 2660 2660 2661 - static struct snd_ice1712_card_info no_matched __devinitdata; 2661 + static const struct snd_ice1712_card_info no_matched __devinitdata; 2662 2662 2663 2663 static int __devinit snd_ice1712_probe(struct pci_dev *pci, 2664 2664 const struct pci_device_id *pci_id) ··· 2667 2667 struct snd_card *card; 2668 2668 struct snd_ice1712 *ice; 2669 2669 int pcm_dev = 0, err; 2670 - struct snd_ice1712_card_info **tbl, *c; 2670 + const struct snd_ice1712_card_info **tbl, *c; 2671 2671 2672 2672 if (dev >= SNDRV_CARDS) 2673 2673 return -ENODEV;
+2 -2
sound/pci/ice1712/ice1712.h
··· 514 514 unsigned int mpu401_2_info_flags; 515 515 const char *mpu401_1_name; 516 516 const char *mpu401_2_name; 517 - unsigned int eeprom_size; 518 - unsigned char *eeprom_data; 517 + const unsigned int eeprom_size; 518 + const unsigned char *eeprom_data; 519 519 }; 520 520 521 521
+37 -37
sound/pci/ice1712/ice1724.c
··· 87 87 88 88 89 89 /* Both VT1720 and VT1724 have the same PCI IDs */ 90 - static struct pci_device_id snd_vt1724_ids[] = { 90 + static const struct pci_device_id snd_vt1724_ids[] = { 91 91 { PCI_VENDOR_ID_ICE, PCI_DEVICE_ID_VT1724, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, 92 92 { 0, } 93 93 }; ··· 342 342 343 343 what = 0; 344 344 snd_pcm_group_for_each(pos, substream) { 345 - struct vt1724_pcm_reg *reg; 345 + const struct vt1724_pcm_reg *reg; 346 346 s = snd_pcm_group_substream_entry(pos); 347 347 reg = s->runtime->private_data; 348 348 what |= reg->start; ··· 606 606 static int snd_vt1724_pcm_prepare(struct snd_pcm_substream *substream) 607 607 { 608 608 struct snd_ice1712 *ice = snd_pcm_substream_chip(substream); 609 - struct vt1724_pcm_reg *reg = substream->runtime->private_data; 609 + const struct vt1724_pcm_reg *reg = substream->runtime->private_data; 610 610 611 611 spin_lock_irq(&ice->reg_lock); 612 612 outl(substream->runtime->dma_addr, ice->profi_port + reg->addr); ··· 621 621 static snd_pcm_uframes_t snd_vt1724_pcm_pointer(struct snd_pcm_substream *substream) 622 622 { 623 623 struct snd_ice1712 *ice = snd_pcm_substream_chip(substream); 624 - struct vt1724_pcm_reg *reg = substream->runtime->private_data; 624 + const struct vt1724_pcm_reg *reg = substream->runtime->private_data; 625 625 size_t ptr; 626 626 627 627 if (!(inl(ICEMT1724(ice, DMA_CONTROL)) & reg->start)) ··· 647 647 #endif 648 648 } 649 649 650 - static struct vt1724_pcm_reg vt1724_playback_pro_reg = { 650 + static const struct vt1724_pcm_reg vt1724_playback_pro_reg = { 651 651 .addr = VT1724_MT_PLAYBACK_ADDR, 652 652 .size = VT1724_MT_PLAYBACK_SIZE, 653 653 .count = VT1724_MT_PLAYBACK_COUNT, 654 654 .start = VT1724_PDMA0_START, 655 655 }; 656 656 657 - static struct vt1724_pcm_reg vt1724_capture_pro_reg = { 657 + static const struct vt1724_pcm_reg vt1724_capture_pro_reg = { 658 658 .addr = VT1724_MT_CAPTURE_ADDR, 659 659 .size = VT1724_MT_CAPTURE_SIZE, 660 660 .count = VT1724_MT_CAPTURE_COUNT, 661 661 .start = VT1724_RDMA0_START, 662 662 }; 663 663 664 - static struct snd_pcm_hardware snd_vt1724_playback_pro = 664 + static const struct snd_pcm_hardware snd_vt1724_playback_pro = 665 665 { 666 666 .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | 667 667 SNDRV_PCM_INFO_BLOCK_TRANSFER | ··· 680 680 .periods_max = 1024, 681 681 }; 682 682 683 - static struct snd_pcm_hardware snd_vt1724_spdif = 683 + static const struct snd_pcm_hardware snd_vt1724_spdif = 684 684 { 685 685 .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | 686 686 SNDRV_PCM_INFO_BLOCK_TRANSFER | ··· 702 702 .periods_max = 1024, 703 703 }; 704 704 705 - static struct snd_pcm_hardware snd_vt1724_2ch_stereo = 705 + static const struct snd_pcm_hardware snd_vt1724_2ch_stereo = 706 706 { 707 707 .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | 708 708 SNDRV_PCM_INFO_BLOCK_TRANSFER | ··· 774 774 struct snd_ice1712 *ice = snd_pcm_substream_chip(substream); 775 775 int chs; 776 776 777 - runtime->private_data = &vt1724_playback_pro_reg; 777 + runtime->private_data = (void *)&vt1724_playback_pro_reg; 778 778 ice->playback_pro_substream = substream; 779 779 runtime->hw = snd_vt1724_playback_pro; 780 780 snd_pcm_set_sync(substream); ··· 803 803 struct snd_ice1712 *ice = snd_pcm_substream_chip(substream); 804 804 struct snd_pcm_runtime *runtime = substream->runtime; 805 805 806 - runtime->private_data = &vt1724_capture_pro_reg; 806 + runtime->private_data = (void *)&vt1724_capture_pro_reg; 807 807 ice->capture_pro_substream = substream; 808 808 runtime->hw = snd_vt1724_2ch_stereo; 809 809 snd_pcm_set_sync(substream); ··· 889 889 * SPDIF PCM 890 890 */ 891 891 892 - static struct vt1724_pcm_reg vt1724_playback_spdif_reg = { 892 + static const struct vt1724_pcm_reg vt1724_playback_spdif_reg = { 893 893 .addr = VT1724_MT_PDMA4_ADDR, 894 894 .size = VT1724_MT_PDMA4_SIZE, 895 895 .count = VT1724_MT_PDMA4_COUNT, 896 896 .start = VT1724_PDMA4_START, 897 897 }; 898 898 899 - static struct vt1724_pcm_reg vt1724_capture_spdif_reg = { 899 + static const struct vt1724_pcm_reg vt1724_capture_spdif_reg = { 900 900 .addr = VT1724_MT_RDMA1_ADDR, 901 901 .size = VT1724_MT_RDMA1_SIZE, 902 902 .count = VT1724_MT_RDMA1_COUNT, ··· 954 954 struct snd_ice1712 *ice = snd_pcm_substream_chip(substream); 955 955 struct snd_pcm_runtime *runtime = substream->runtime; 956 956 957 - runtime->private_data = &vt1724_playback_spdif_reg; 957 + runtime->private_data = (void *)&vt1724_playback_spdif_reg; 958 958 ice->playback_con_substream = substream; 959 959 if (ice->force_pdma4) { 960 960 runtime->hw = snd_vt1724_2ch_stereo; ··· 986 986 struct snd_ice1712 *ice = snd_pcm_substream_chip(substream); 987 987 struct snd_pcm_runtime *runtime = substream->runtime; 988 988 989 - runtime->private_data = &vt1724_capture_spdif_reg; 989 + runtime->private_data = (void *)&vt1724_capture_spdif_reg; 990 990 ice->capture_con_substream = substream; 991 991 if (ice->force_rdma1) { 992 992 runtime->hw = snd_vt1724_2ch_stereo; ··· 1091 1091 * independent surround PCMs 1092 1092 */ 1093 1093 1094 - static struct vt1724_pcm_reg vt1724_playback_dma_regs[3] = { 1094 + static const struct vt1724_pcm_reg vt1724_playback_dma_regs[3] = { 1095 1095 { 1096 1096 .addr = VT1724_MT_PDMA1_ADDR, 1097 1097 .size = VT1724_MT_PDMA1_SIZE, ··· 1137 1137 return -EBUSY; /* FIXME: should handle blocking mode properly */ 1138 1138 } 1139 1139 mutex_unlock(&ice->open_mutex); 1140 - runtime->private_data = &vt1724_playback_dma_regs[substream->number]; 1140 + runtime->private_data = (void *)&vt1724_playback_dma_regs[substream->number]; 1141 1141 ice->playback_con_substream_ds[substream->number] = substream; 1142 1142 runtime->hw = snd_vt1724_2ch_stereo; 1143 1143 snd_pcm_set_sync(substream); ··· 1318 1318 return 0; 1319 1319 } 1320 1320 1321 - static struct snd_kcontrol_new snd_vt1724_eeprom __devinitdata = { 1321 + static const struct snd_kcontrol_new snd_vt1724_eeprom __devinitdata = { 1322 1322 .iface = SNDRV_CTL_ELEM_IFACE_CARD, 1323 1323 .name = "ICE1724 EEPROM", 1324 1324 .access = SNDRV_CTL_ELEM_ACCESS_READ, ··· 1431 1431 return (val != old); 1432 1432 } 1433 1433 1434 - static struct snd_kcontrol_new snd_vt1724_spdif_default __devinitdata = 1434 + static const struct snd_kcontrol_new snd_vt1724_spdif_default __devinitdata = 1435 1435 { 1436 1436 .iface = SNDRV_CTL_ELEM_IFACE_PCM, 1437 1437 .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT), ··· 1463 1463 return 0; 1464 1464 } 1465 1465 1466 - static struct snd_kcontrol_new snd_vt1724_spdif_maskc __devinitdata = 1466 + static const struct snd_kcontrol_new snd_vt1724_spdif_maskc __devinitdata = 1467 1467 { 1468 1468 .access = SNDRV_CTL_ELEM_ACCESS_READ, 1469 1469 .iface = SNDRV_CTL_ELEM_IFACE_PCM, ··· 1472 1472 .get = snd_vt1724_spdif_maskc_get, 1473 1473 }; 1474 1474 1475 - static struct snd_kcontrol_new snd_vt1724_spdif_maskp __devinitdata = 1475 + static const struct snd_kcontrol_new snd_vt1724_spdif_maskp __devinitdata = 1476 1476 { 1477 1477 .access = SNDRV_CTL_ELEM_ACCESS_READ, 1478 1478 .iface = SNDRV_CTL_ELEM_IFACE_PCM, ··· 1517 1517 return old != val; 1518 1518 } 1519 1519 1520 - static struct snd_kcontrol_new snd_vt1724_spdif_switch __devinitdata = 1520 + static const struct snd_kcontrol_new snd_vt1724_spdif_switch __devinitdata = 1521 1521 { 1522 1522 .iface = SNDRV_CTL_ELEM_IFACE_MIXER, 1523 1523 /* FIXME: the following conflict with IEC958 Playback Route */ ··· 1585 1585 static int snd_vt1724_pro_internal_clock_info(struct snd_kcontrol *kcontrol, 1586 1586 struct snd_ctl_elem_info *uinfo) 1587 1587 { 1588 - static char *texts_1724[] = { 1588 + static const char * const texts_1724[] = { 1589 1589 "8000", /* 0: 6 */ 1590 1590 "9600", /* 1: 3 */ 1591 1591 "11025", /* 2: 10 */ ··· 1603 1603 "192000", /* 14: 14 */ 1604 1604 "IEC958 Input", /* 15: -- */ 1605 1605 }; 1606 - static char *texts_1720[] = { 1606 + static const char * const texts_1720[] = { 1607 1607 "8000", /* 0: 6 */ 1608 1608 "9600", /* 1: 3 */ 1609 1609 "11025", /* 2: 10 */ ··· 1636 1636 struct snd_ctl_elem_value *ucontrol) 1637 1637 { 1638 1638 struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol); 1639 - static unsigned char xlate[16] = { 1639 + static const unsigned char xlate[16] = { 1640 1640 9, 6, 3, 1, 7, 4, 0, 12, 8, 5, 2, 11, 13, 255, 14, 10 1641 1641 }; 1642 1642 unsigned char val; ··· 1695 1695 return change; 1696 1696 } 1697 1697 1698 - static struct snd_kcontrol_new snd_vt1724_pro_internal_clock __devinitdata = { 1698 + static const struct snd_kcontrol_new snd_vt1724_pro_internal_clock __devinitdata = { 1699 1699 .iface = SNDRV_CTL_ELEM_IFACE_MIXER, 1700 1700 .name = "Multi Track Internal Clock", 1701 1701 .info = snd_vt1724_pro_internal_clock_info, ··· 1734 1734 return change; 1735 1735 } 1736 1736 1737 - static struct snd_kcontrol_new snd_vt1724_pro_rate_locking __devinitdata = { 1737 + static const struct snd_kcontrol_new snd_vt1724_pro_rate_locking __devinitdata = { 1738 1738 .iface = SNDRV_CTL_ELEM_IFACE_MIXER, 1739 1739 .name = "Multi Track Rate Locking", 1740 1740 .info = snd_vt1724_pro_rate_locking_info, ··· 1773 1773 return change; 1774 1774 } 1775 1775 1776 - static struct snd_kcontrol_new snd_vt1724_pro_rate_reset __devinitdata = { 1776 + static const struct snd_kcontrol_new snd_vt1724_pro_rate_reset __devinitdata = { 1777 1777 .iface = SNDRV_CTL_ELEM_IFACE_MIXER, 1778 1778 .name = "Multi Track Rate Reset", 1779 1779 .info = snd_vt1724_pro_rate_reset_info, ··· 1817 1817 { 1818 1818 unsigned long val; 1819 1819 unsigned char eitem; 1820 - static unsigned char xlate[8] = { 1820 + static const unsigned char xlate[8] = { 1821 1821 0, 255, 1, 2, 255, 255, 3, 4, 1822 1822 }; 1823 1823 ··· 1836 1836 { 1837 1837 unsigned int old_val, nval; 1838 1838 int change; 1839 - static unsigned char xroute[8] = { 1839 + static const unsigned char xroute[8] = { 1840 1840 0, /* PCM */ 1841 1841 2, /* PSDIN0 Left */ 1842 1842 3, /* PSDIN0 Right */ ··· 1892 1892 digital_route_shift(idx)); 1893 1893 } 1894 1894 1895 - static struct snd_kcontrol_new snd_vt1724_mixer_pro_analog_route __devinitdata = { 1895 + static const struct snd_kcontrol_new snd_vt1724_mixer_pro_analog_route __devinitdata = { 1896 1896 .iface = SNDRV_CTL_ELEM_IFACE_MIXER, 1897 1897 .name = "H/W Playback Route", 1898 1898 .info = snd_vt1724_pro_route_info, ··· 1900 1900 .put = snd_vt1724_pro_route_analog_put, 1901 1901 }; 1902 1902 1903 - static struct snd_kcontrol_new snd_vt1724_mixer_pro_spdif_route __devinitdata = { 1903 + static const struct snd_kcontrol_new snd_vt1724_mixer_pro_spdif_route __devinitdata = { 1904 1904 .iface = SNDRV_CTL_ELEM_IFACE_MIXER, 1905 1905 .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,NONE) "Route", 1906 1906 .info = snd_vt1724_pro_route_info, ··· 1936 1936 return 0; 1937 1937 } 1938 1938 1939 - static struct snd_kcontrol_new snd_vt1724_mixer_pro_peak __devinitdata = { 1939 + static const struct snd_kcontrol_new snd_vt1724_mixer_pro_peak __devinitdata = { 1940 1940 .iface = SNDRV_CTL_ELEM_IFACE_MIXER, 1941 1941 .name = "Multi Track Peak", 1942 1942 .access = SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE, ··· 1948 1948 * 1949 1949 */ 1950 1950 1951 - static struct snd_ice1712_card_info no_matched __devinitdata; 1951 + static const struct snd_ice1712_card_info no_matched __devinitdata; 1952 1952 1953 - static struct snd_ice1712_card_info *card_tables[] __devinitdata = { 1953 + static const struct snd_ice1712_card_info *card_tables[] __devinitdata = { 1954 1954 snd_vt1724_revo_cards, 1955 1955 snd_vt1724_amp_cards, 1956 1956 snd_vt1724_aureon_cards, ··· 2009 2009 { 2010 2010 const int dev = 0xa0; /* EEPROM device address */ 2011 2011 unsigned int i, size; 2012 - struct snd_ice1712_card_info **tbl, *c; 2012 + const struct snd_ice1712_card_info **tbl, *c; 2013 2013 2014 2014 if (! modelname || ! *modelname) { 2015 2015 ice->eeprom.subvendor = 0; ··· 2308 2308 struct snd_card *card; 2309 2309 struct snd_ice1712 *ice; 2310 2310 int pcm_dev = 0, err; 2311 - struct snd_ice1712_card_info **tbl, *c; 2311 + const struct snd_ice1712_card_info **tbl, *c; 2312 2312 2313 2313 if (dev >= SNDRV_CARDS) 2314 2314 return -ENODEV;
+3 -3
sound/pci/ice1712/juli.c
··· 125 125 snd_akm4xxx_reset(ak, 0); 126 126 } 127 127 128 - static struct snd_akm4xxx akm_juli_dac __devinitdata = { 128 + static const struct snd_akm4xxx akm_juli_dac __devinitdata = { 129 129 .type = SND_AK4358, 130 130 .num_dacs = 2, 131 131 .ops = { ··· 206 206 * hence the driver needs to sets up it properly. 207 207 */ 208 208 209 - static unsigned char juli_eeprom[] __devinitdata = { 209 + static const unsigned char juli_eeprom[] __devinitdata = { 210 210 [ICE_EEP2_SYSCONF] = 0x20, /* clock 512, mpu401, 1xADC, 1xDACs */ 211 211 [ICE_EEP2_ACLINK] = 0x80, /* I2S */ 212 212 [ICE_EEP2_I2S] = 0xf8, /* vol, 96k, 24bit, 192k */ ··· 223 223 }; 224 224 225 225 /* entry point */ 226 - struct snd_ice1712_card_info snd_vt1724_juli_cards[] __devinitdata = { 226 + const struct snd_ice1712_card_info snd_vt1724_juli_cards[] __devinitdata = { 227 227 { 228 228 .subvendor = VT1724_SUBDEVICE_JULI, 229 229 .name = "ESI Juli@",
+1 -1
sound/pci/ice1712/juli.h
··· 5 5 6 6 #define VT1724_SUBDEVICE_JULI 0x31305345 /* Juli@ */ 7 7 8 - extern struct snd_ice1712_card_info snd_vt1724_juli_cards[]; 8 + extern const struct snd_ice1712_card_info snd_vt1724_juli_cards[]; 9 9 10 10 #endif /* __SOUND_JULI_H */
+10 -10
sound/pci/ice1712/phase.c
··· 71 71 * Logarithmic volume values for WM8770 72 72 * Computed as 20 * Log10(255 / x) 73 73 */ 74 - static unsigned char wm_vol[256] = { 74 + static const unsigned char wm_vol[256] = { 75 75 127, 48, 42, 39, 36, 34, 33, 31, 30, 29, 28, 27, 27, 26, 25, 25, 24, 24, 23, 76 76 23, 22, 22, 21, 21, 21, 20, 20, 20, 19, 19, 19, 18, 18, 18, 18, 17, 17, 17, 77 77 17, 16, 16, 16, 16, 15, 15, 15, 15, 15, 15, 14, 14, 14, 14, 14, 13, 13, 13, ··· 89 89 #define WM_VOL_MAX (sizeof(wm_vol) - 1) 90 90 #define WM_VOL_MUTE 0x8000 91 91 92 - static struct snd_akm4xxx akm_phase22 __devinitdata = { 92 + static const struct snd_akm4xxx akm_phase22 __devinitdata = { 93 93 .type = SND_AK4524, 94 94 .num_dacs = 2, 95 95 .num_adcs = 2, 96 96 }; 97 97 98 - static struct snd_ak4xxx_private akm_phase22_priv __devinitdata = { 98 + static const struct snd_ak4xxx_private akm_phase22_priv __devinitdata = { 99 99 .caddr = 2, 100 100 .cif = 1, 101 101 .data_mask = 1 << 4, ··· 152 152 return 0; 153 153 } 154 154 155 - static unsigned char phase22_eeprom[] __devinitdata = { 155 + static const unsigned char phase22_eeprom[] __devinitdata = { 156 156 [ICE_EEP2_SYSCONF] = 0x00, /* 1xADC, 1xDACs */ 157 157 [ICE_EEP2_ACLINK] = 0x80, /* I2S */ 158 158 [ICE_EEP2_I2S] = 0xf8, /* vol, 96k, 24bit */ ··· 168 168 [ICE_EEP2_GPIO_STATE2] = 0x00, 169 169 }; 170 170 171 - static unsigned char phase28_eeprom[] __devinitdata = { 171 + static const unsigned char phase28_eeprom[] __devinitdata = { 172 172 [ICE_EEP2_SYSCONF] = 0x0b, /* clock 512, spdif-in/ADC, 4DACs */ 173 173 [ICE_EEP2_ACLINK] = 0x80, /* I2S */ 174 174 [ICE_EEP2_I2S] = 0xfc, /* vol, 96k, 24bit, 192k */ ··· 343 343 344 344 static int __devinit phase28_init(struct snd_ice1712 *ice) 345 345 { 346 - static unsigned short wm_inits_phase28[] = { 346 + static const unsigned short wm_inits_phase28[] = { 347 347 /* These come first to reduce init pop noise */ 348 348 0x1b, 0x044, /* ADC Mux (AC'97 source) */ 349 349 0x1c, 0x00B, /* Out Mux1 (VOUT1 = DAC+AUX, VOUT2 = DAC) */ ··· 382 382 383 383 unsigned int tmp; 384 384 struct snd_akm4xxx *ak; 385 - unsigned short *p; 385 + const unsigned short *p; 386 386 int i; 387 387 388 388 ice->num_total_dacs = 8; ··· 700 700 static DECLARE_TLV_DB_SCALE(db_scale_wm_dac, -12700, 100, 1); 701 701 static DECLARE_TLV_DB_SCALE(db_scale_wm_pcm, -6400, 50, 1); 702 702 703 - static struct snd_kcontrol_new phase28_dac_controls[] __devinitdata = { 703 + static const struct snd_kcontrol_new phase28_dac_controls[] __devinitdata = { 704 704 { 705 705 .iface = SNDRV_CTL_ELEM_IFACE_MIXER, 706 706 .name = "Master Playback Switch", ··· 815 815 } 816 816 }; 817 817 818 - static struct snd_kcontrol_new wm_controls[] __devinitdata = { 818 + static const struct snd_kcontrol_new wm_controls[] __devinitdata = { 819 819 { 820 820 .iface = SNDRV_CTL_ELEM_IFACE_MIXER, 821 821 .name = "PCM Playback Switch", ··· 870 870 return 0; 871 871 } 872 872 873 - struct snd_ice1712_card_info snd_vt1724_phase_cards[] __devinitdata = { 873 + const struct snd_ice1712_card_info snd_vt1724_phase_cards[] __devinitdata = { 874 874 { 875 875 .subvendor = VT1724_SUBDEVICE_PHASE22, 876 876 .name = "Terratec PHASE 22",
+1 -1
sound/pci/ice1712/phase.h
··· 31 31 #define VT1724_SUBDEVICE_PHASE28 0x3b154911 32 32 33 33 /* entry point */ 34 - extern struct snd_ice1712_card_info snd_vt1724_phase_cards[]; 34 + extern const struct snd_ice1712_card_info snd_vt1724_phase_cards[]; 35 35 36 36 /* PHASE28 GPIO bits */ 37 37 #define PHASE28_SPI_MISO (1 << 21)
+7 -7
sound/pci/ice1712/pontis.c
··· 434 434 */ 435 435 static int cs_source_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo) 436 436 { 437 - static char *texts[] = { 437 + static const char * const texts[] = { 438 438 "Coax", /* RXP0 */ 439 439 "Optical", /* RXP1 */ 440 440 "CD", /* RXP2 */ ··· 571 571 * mixers 572 572 */ 573 573 574 - static struct snd_kcontrol_new pontis_controls[] __devinitdata = { 574 + static const struct snd_kcontrol_new pontis_controls[] __devinitdata = { 575 575 { 576 576 .iface = SNDRV_CTL_ELEM_IFACE_MIXER, 577 577 .access = (SNDRV_CTL_ELEM_ACCESS_READWRITE | ··· 741 741 */ 742 742 static int __devinit pontis_init(struct snd_ice1712 *ice) 743 743 { 744 - static unsigned short wm_inits[] = { 744 + static const unsigned short wm_inits[] = { 745 745 /* These come first to reduce init pop noise */ 746 746 WM_ADC_MUX, 0x00c0, /* ADC mute */ 747 747 WM_DAC_MUTE, 0x0001, /* DAC softmute */ ··· 750 750 WM_POWERDOWN, 0x0008, /* All power-up except HP */ 751 751 WM_RESET, 0x0000, /* reset */ 752 752 }; 753 - static unsigned short wm_inits2[] = { 753 + static const unsigned short wm_inits2[] = { 754 754 WM_MASTER_CTRL, 0x0022, /* 256fs, slave mode */ 755 755 WM_DAC_INT, 0x0022, /* I2S, normal polarity, 24bit */ 756 756 WM_ADC_INT, 0x0022, /* I2S, normal polarity, 24bit */ ··· 776 776 WM_DAC_MUTE, 0x0000, /* DAC unmute */ 777 777 WM_ADC_MUX, 0x0003, /* ADC unmute, both CD/Line On */ 778 778 }; 779 - static unsigned char cs_inits[] = { 779 + static const unsigned char cs_inits[] = { 780 780 0x04, 0x80, /* RUN, RXP0 */ 781 781 0x05, 0x05, /* slave, 24bit */ 782 782 0x01, 0x00, ··· 826 826 * hence the driver needs to sets up it properly. 827 827 */ 828 828 829 - static unsigned char pontis_eeprom[] __devinitdata = { 829 + static const unsigned char pontis_eeprom[] __devinitdata = { 830 830 [ICE_EEP2_SYSCONF] = 0x08, /* clock 256, mpu401, spdif-in/ADC, 1DAC */ 831 831 [ICE_EEP2_ACLINK] = 0x80, /* I2S */ 832 832 [ICE_EEP2_I2S] = 0xf8, /* vol, 96k, 24bit, 192k */ ··· 843 843 }; 844 844 845 845 /* entry point */ 846 - struct snd_ice1712_card_info snd_vt1720_pontis_cards[] __devinitdata = { 846 + const struct snd_ice1712_card_info snd_vt1720_pontis_cards[] __devinitdata = { 847 847 { 848 848 .subvendor = VT1720_SUBDEVICE_PONTIS_MS300, 849 849 .name = "Pontis MS300",
+1 -1
sound/pci/ice1712/pontis.h
··· 28 28 29 29 #define VT1720_SUBDEVICE_PONTIS_MS300 0x00020002 /* a dummy id for MS300 */ 30 30 31 - extern struct snd_ice1712_card_info snd_vt1720_pontis_cards[]; 31 + extern const struct snd_ice1712_card_info snd_vt1720_pontis_cards[]; 32 32 33 33 #endif /* __SOUND_PONTIS_H */
+5 -5
sound/pci/ice1712/prodigy192.c
··· 364 364 * mixers 365 365 */ 366 366 367 - static struct snd_kcontrol_new stac_controls[] __devinitdata = { 367 + static const struct snd_kcontrol_new stac_controls[] __devinitdata = { 368 368 { 369 369 .iface = SNDRV_CTL_ELEM_IFACE_MIXER, 370 370 .name = "Master Playback Switch", ··· 475 475 */ 476 476 static int __devinit prodigy192_init(struct snd_ice1712 *ice) 477 477 { 478 - static unsigned short stac_inits_prodigy[] = { 478 + static const unsigned short stac_inits_prodigy[] = { 479 479 STAC946X_RESET, 0, 480 480 /* STAC946X_MASTER_VOLUME, 0, 481 481 STAC946X_LF_VOLUME, 0, ··· 486 486 STAC946X_LFE_VOLUME, 0,*/ 487 487 (unsigned short)-1 488 488 }; 489 - unsigned short *p; 489 + const unsigned short *p; 490 490 491 491 /* prodigy 192 */ 492 492 ice->num_total_dacs = 6; ··· 506 506 * hence the driver needs to sets up it properly. 507 507 */ 508 508 509 - static unsigned char prodigy71_eeprom[] __devinitdata = { 509 + static const unsigned char prodigy71_eeprom[] __devinitdata = { 510 510 [ICE_EEP2_SYSCONF] = 0x2b, /* clock 512, mpu401, spdif-in/ADC, 4DACs */ 511 511 [ICE_EEP2_ACLINK] = 0x80, /* I2S */ 512 512 [ICE_EEP2_I2S] = 0xf8, /* vol, 96k, 24bit, 192k */ ··· 524 524 525 525 526 526 /* entry point */ 527 - struct snd_ice1712_card_info snd_vt1724_prodigy192_cards[] __devinitdata = { 527 + const struct snd_ice1712_card_info snd_vt1724_prodigy192_cards[] __devinitdata = { 528 528 { 529 529 .subvendor = VT1724_SUBDEVICE_PRODIGY192VE, 530 530 .name = "Audiotrak Prodigy 192",
+1 -1
sound/pci/ice1712/prodigy192.h
··· 6 6 7 7 #define VT1724_SUBDEVICE_PRODIGY192VE 0x34495345 /* PRODIGY 192 VE */ 8 8 9 - extern struct snd_ice1712_card_info snd_vt1724_prodigy192_cards[]; 9 + extern const struct snd_ice1712_card_info snd_vt1724_prodigy192_cards[]; 10 10 11 11 #endif /* __SOUND_PRODIGY192_H */
+11 -11
sound/pci/ice1712/revo.c
··· 228 228 .dac_info = revo71_front, 229 229 }; 230 230 231 - static struct snd_ak4xxx_private akm_revo_front_priv __devinitdata = { 231 + static const struct snd_ak4xxx_private akm_revo_front_priv __devinitdata = { 232 232 .caddr = 1, 233 233 .cif = 0, 234 234 .data_mask = VT1724_REVO_CDOUT, ··· 240 240 .mask_flags = 0, 241 241 }; 242 242 243 - static struct snd_akm4xxx akm_revo_surround __devinitdata = { 243 + static const struct snd_akm4xxx akm_revo_surround __devinitdata = { 244 244 .type = SND_AK4355, 245 245 .idx_offset = 1, 246 246 .num_dacs = 6, ··· 250 250 .dac_info = revo71_surround, 251 251 }; 252 252 253 - static struct snd_ak4xxx_private akm_revo_surround_priv __devinitdata = { 253 + static const struct snd_ak4xxx_private akm_revo_surround_priv __devinitdata = { 254 254 .caddr = 3, 255 255 .cif = 0, 256 256 .data_mask = VT1724_REVO_CDOUT, ··· 262 262 .mask_flags = 0, 263 263 }; 264 264 265 - static struct snd_akm4xxx akm_revo51 __devinitdata = { 265 + static const struct snd_akm4xxx akm_revo51 __devinitdata = { 266 266 .type = SND_AK4358, 267 267 .num_dacs = 6, 268 268 .ops = { ··· 271 271 .dac_info = revo51_dac, 272 272 }; 273 273 274 - static struct snd_ak4xxx_private akm_revo51_priv __devinitdata = { 274 + static const struct snd_ak4xxx_private akm_revo51_priv __devinitdata = { 275 275 .caddr = 2, 276 276 .cif = 0, 277 277 .data_mask = VT1724_REVO_CDOUT, ··· 283 283 .mask_flags = 0, 284 284 }; 285 285 286 - static struct snd_akm4xxx akm_revo51_adc __devinitdata = { 286 + static const struct snd_akm4xxx akm_revo51_adc __devinitdata = { 287 287 .type = SND_AK5365, 288 288 .num_adcs = 2, 289 289 .adc_info = revo51_adc, 290 290 }; 291 291 292 - static struct snd_ak4xxx_private akm_revo51_adc_priv __devinitdata = { 292 + static const struct snd_ak4xxx_private akm_revo51_adc_priv __devinitdata = { 293 293 .caddr = 2, 294 294 .cif = 0, 295 295 .data_mask = VT1724_REVO_CDOUT, ··· 333 333 .dac_info = ap192_dac, 334 334 }; 335 335 336 - static struct snd_ak4xxx_private akm_ap192_priv __devinitdata = { 336 + static const struct snd_ak4xxx_private akm_ap192_priv __devinitdata = { 337 337 .caddr = 2, 338 338 .cif = 0, 339 339 .data_mask = VT1724_REVO_CDOUT, ··· 456 456 457 457 static int ap192_ak4114_init(struct snd_ice1712 *ice) 458 458 { 459 - static unsigned char ak4114_init_vals[] = { 459 + static const unsigned char ak4114_init_vals[] = { 460 460 AK4114_RST | AK4114_PWN | AK4114_OCKS0 | AK4114_OCKS1, 461 461 AK4114_DIF_I24I2S, 462 462 AK4114_TX1E, ··· 464 464 0, 465 465 0 466 466 }; 467 - static unsigned char ak4114_init_txcsb[] = { 467 + static const unsigned char ak4114_init_txcsb[] = { 468 468 0x41, 0x02, 0x2c, 0x00, 0x00 469 469 }; 470 470 struct ak4114 *ak; ··· 582 582 } 583 583 584 584 /* entry point */ 585 - struct snd_ice1712_card_info snd_vt1724_revo_cards[] __devinitdata = { 585 + const struct snd_ice1712_card_info snd_vt1724_revo_cards[] __devinitdata = { 586 586 { 587 587 .subvendor = VT1724_SUBDEVICE_REVOLUTION71, 588 588 .name = "M Audio Revolution-7.1",
+1 -1
sound/pci/ice1712/revo.h
··· 34 34 #define VT1724_SUBDEVICE_AUDIOPHILE192 0x12143236 35 35 36 36 /* entry point */ 37 - extern struct snd_ice1712_card_info snd_vt1724_revo_cards[]; 37 + extern const struct snd_ice1712_card_info snd_vt1724_revo_cards[]; 38 38 39 39 40 40 /*
+3 -3
sound/pci/ice1712/vt1720_mobo.c
··· 56 56 57 57 /* EEPROM image */ 58 58 59 - static unsigned char k8x800_eeprom[] __devinitdata = { 59 + static const unsigned char k8x800_eeprom[] __devinitdata = { 60 60 [ICE_EEP2_SYSCONF] = 0x01, /* clock 256, 1ADC, 2DACs */ 61 61 [ICE_EEP2_ACLINK] = 0x02, /* ACLINK, packed */ 62 62 [ICE_EEP2_I2S] = 0x00, /* - */ ··· 72 72 [ICE_EEP2_GPIO_STATE2] = 0x00, /* - */ 73 73 }; 74 74 75 - static unsigned char sn25p_eeprom[] __devinitdata = { 75 + static const unsigned char sn25p_eeprom[] __devinitdata = { 76 76 [ICE_EEP2_SYSCONF] = 0x01, /* clock 256, 1ADC, 2DACs */ 77 77 [ICE_EEP2_ACLINK] = 0x02, /* ACLINK, packed */ 78 78 [ICE_EEP2_I2S] = 0x00, /* - */ ··· 90 90 91 91 92 92 /* entry point */ 93 - struct snd_ice1712_card_info snd_vt1720_mobo_cards[] __devinitdata = { 93 + const struct snd_ice1712_card_info snd_vt1720_mobo_cards[] __devinitdata = { 94 94 { 95 95 .subvendor = VT1720_SUBDEVICE_K8X800, 96 96 .name = "Albatron K8X800 Pro II",
+1 -1
sound/pci/ice1712/vt1720_mobo.h
··· 36 36 #define VT1720_SUBDEVICE_9CJS 0x0f272327 37 37 #define VT1720_SUBDEVICE_SN25P 0x97123650 38 38 39 - extern struct snd_ice1712_card_info snd_vt1720_mobo_cards[]; 39 + extern const struct snd_ice1712_card_info snd_vt1720_mobo_cards[]; 40 40 41 41 #endif /* __SOUND_VT1720_MOBO_H */
+1 -1
sound/pci/ice1712/wtm.c
··· 409 409 /* 410 410 * Control tabs 411 411 */ 412 - static struct snd_kcontrol_new stac9640_controls[] __devinitdata = { 412 + static const struct snd_kcontrol_new stac9640_controls[] __devinitdata = { 413 413 { 414 414 .iface = SNDRV_CTL_ELEM_IFACE_MIXER, 415 415 .name = "Master Playback Switch",