ALSA: ice17xx: Constify strings and string arrays (a2af050f) · Commits · 戴 / test

sound/pci/ice1712/aureon.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -203,7 +203,8 @@ static void aureon_pca9554_write(struct snd_ice1712 *ice, unsigned char reg,
		static int aureon_universe_inmux_info(struct snd_kcontrol *kcontrol,
		struct snd_ctl_elem_info *uinfo)
		{
		char *texts[3] = {"Internal Aux", "Wavetable", "Rear Line-In"};
		static const char * const texts[3] =
		{"Internal Aux", "Wavetable", "Rear Line-In"};

		uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
		uinfo->count = 1;

+2 −2

Original line number	Diff line number	Diff line
		@@ -576,7 +576,7 @@ static int __devinit snd_ice1712_ews_init(struct snd_ice1712 *ice)
		/* i/o sensitivity - this callback is shared among other devices, too */
		static int snd_ice1712_ewx_io_sense_info(struct snd_kcontrol kcontrol, struct snd_ctl_elem_info uinfo){

		static char *texts[2] = {
		static const char * const texts[2] = {
		"+4dBu", "-10dBV",
		};
		uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
		@@ -899,7 +899,7 @@ static int snd_ice1712_6fire_control_put(struct snd_kcontrol *kcontrol, struct s

		static int snd_ice1712_6fire_select_input_info(struct snd_kcontrol kcontrol, struct snd_ctl_elem_info uinfo)
		{
		static char *texts[4] = {
		static const char * const texts[4] = {
		"Internal", "Front Input", "Rear Input", "Wave Table"
		};
		uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;

+4 −4

Original line number	Diff line number	Diff line
		@@ -383,7 +383,7 @@ struct snd_ice1712 {
		unsigned char (set_mclk)(struct snd_ice1712 ice, unsigned int rate);
		int (set_spdif_clock)(struct snd_ice1712 ice, int type);
		int (get_spdif_master_type)(struct snd_ice1712 ice);
		char **ext_clock_names;
		const char * const *ext_clock_names;
		int ext_clock_count;
		void (pro_open)(struct snd_ice1712 , struct snd_pcm_substream *);
		#ifdef CONFIG_PM_SLEEP
		@@ -515,9 +515,9 @@ static inline u8 snd_ice1712_read(struct snd_ice1712 *ice, u8 addr)

		struct snd_ice1712_card_info {
		unsigned int subvendor;
		char *name;
		char *model;
		char *driver;
		const char *name;
		const char *model;
		const char *driver;
		int (chip_init)(struct snd_ice1712 );
		void (chip_exit)(struct snd_ice1712 );
		int (build_controls)(struct snd_ice1712 );

+3 −3

Original line number	Diff line number	Diff line
		@@ -107,7 +107,7 @@ static int PRO_RATE_LOCKED;
		static int PRO_RATE_RESET = 1;
		static unsigned int PRO_RATE_DEFAULT = 44100;

		static char *ext_clock_names[1] = { "IEC958 In" };
		static const char * const ext_clock_names[1] = { "IEC958 In" };

		/*
		* Basic I/O
		@@ -2043,7 +2043,7 @@ static struct snd_kcontrol_new snd_vt1724_pro_rate_reset __devinitdata = {
		static int snd_vt1724_pro_route_info(struct snd_kcontrol *kcontrol,
		struct snd_ctl_elem_info *uinfo)
		{
		static char *texts[] = {
		static const char * const texts[] = {
		"PCM Out", /* 0 */
		"H/W In 0", "H/W In 1", /* 1-2 */
		"IEC958 In L", "IEC958 In R", /* 3-4 */
		@@ -2233,7 +2233,7 @@ static unsigned char ooaoo_sq210_eeprom[] __devinitdata = {
		};


		struct snd_ice1712_card_info snd_vt1724_ooaoo_cards[] __devinitdata = {
		static struct snd_ice1712_card_info snd_vt1724_ooaoo_cards[] __devinitdata = {
		{
		.name = "ooAoo SQ210a",
		.model = "sq210a",

+2 −1

Original line number	Diff line number	Diff line
		@@ -435,7 +435,8 @@ static struct snd_kcontrol __devinit ctl_find(struct snd_card card,
		}

		static void __devinit add_slaves(struct snd_card *card,
		struct snd_kcontrol master, char *list)
		struct snd_kcontrol *master,
		char * const *list)
		{
		for (; *list; list++) {
		struct snd_kcontrol slave = ctl_find(card, list);