diff options
author | Takashi Sakamoto <o-takashi@sakamocchi.jp> | 2015-06-14 12:49:31 +0900 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2015-06-15 13:36:44 +0200 |
commit | 554d8983a07d853bc4761c575db2f1bbb2f14372 (patch) | |
tree | 075d785a7e1b3d53ea2a6006b42b2453daee8490 /sound/firewire/bebob/bebob_maudio.c | |
parent | 3e254b16b65dbbcc2528781070e1be0f7945f220 (diff) |
ALSA: bebob: obsolete string literal expression for clock source
The old string literals were completely replaced by new normalized
representation.
This commit obsoletes it.
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/firewire/bebob/bebob_maudio.c')
-rw-r--r-- | sound/firewire/bebob/bebob_maudio.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sound/firewire/bebob/bebob_maudio.c b/sound/firewire/bebob/bebob_maudio.c index 7a43afcfa9bd..057495d54ab0 100644 --- a/sound/firewire/bebob/bebob_maudio.c +++ b/sound/firewire/bebob/bebob_maudio.c @@ -340,9 +340,6 @@ end: } /* Clock source control for special firmware */ -static const char *const special_clk_labels[] = { - SND_BEBOB_CLOCK_INTERNAL " with Digital Mute", "Digital", - "Word Clock", SND_BEBOB_CLOCK_INTERNAL}; static enum snd_bebob_clock_type special_clk_types[] = { SND_BEBOB_CLOCK_TYPE_INTERNAL, /* With digital mute */ SND_BEBOB_CLOCK_TYPE_EXTERNAL, /* SPDIF/ADAT */ @@ -358,6 +355,12 @@ static int special_clk_get(struct snd_bebob *bebob, unsigned int *id) static int special_clk_ctl_info(struct snd_kcontrol *kctl, struct snd_ctl_elem_info *einf) { + static const char *const special_clk_labels[] = { + "Internal with Digital Mute", + "Digital", + "Word Clock", + "Internal" + }; return snd_ctl_enum_info(einf, 1, ARRAY_SIZE(special_clk_types), special_clk_labels); } @@ -715,7 +718,6 @@ static struct snd_bebob_rate_spec special_rate_spec = { }; static struct snd_bebob_clock_spec special_clk_spec = { .num = ARRAY_SIZE(special_clk_types), - .labels = special_clk_labels, .types = special_clk_types, .get = &special_clk_get, }; |