summaryrefslogtreecommitdiffstats
path: root/sound/firewire/bebob/bebob_focusrite.c
diff options
context:
space:
mode:
authorTakashi Sakamoto2015-06-14 05:49:31 +0200
committerTakashi Iwai2015-06-15 13:36:44 +0200
commit554d8983a07d853bc4761c575db2f1bbb2f14372 (patch)
tree075d785a7e1b3d53ea2a6006b42b2453daee8490 /sound/firewire/bebob/bebob_focusrite.c
parentALSA: bebob: use normalized representation for the type of clock source (diff)
downloadkernel-qcow2-linux-554d8983a07d853bc4761c575db2f1bbb2f14372.tar.gz
kernel-qcow2-linux-554d8983a07d853bc4761c575db2f1bbb2f14372.tar.xz
kernel-qcow2-linux-554d8983a07d853bc4761c575db2f1bbb2f14372.zip
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_focusrite.c')
-rw-r--r--sound/firewire/bebob/bebob_focusrite.c12
1 files changed, 0 insertions, 12 deletions
diff --git a/sound/firewire/bebob/bebob_focusrite.c b/sound/firewire/bebob/bebob_focusrite.c
index 45c8f76d8187..a1a39494ea6c 100644
--- a/sound/firewire/bebob/bebob_focusrite.c
+++ b/sound/firewire/bebob/bebob_focusrite.c
@@ -103,17 +103,11 @@ saffire_write_quad(struct snd_bebob *bebob, u64 offset, u32 value)
&data, sizeof(__be32), 0);
}
-static const char *const saffirepro_10_clk_src_labels[] = {
- SND_BEBOB_CLOCK_INTERNAL, "S/PDIF", "Word Clock"
-};
static enum snd_bebob_clock_type saffirepro_10_clk_src_types[] = {
SND_BEBOB_CLOCK_TYPE_INTERNAL,
SND_BEBOB_CLOCK_TYPE_EXTERNAL, /* S/PDIF */
SND_BEBOB_CLOCK_TYPE_EXTERNAL, /* Word Clock */
};
-static const char *const saffirepro_26_clk_src_labels[] = {
- SND_BEBOB_CLOCK_INTERNAL, "S/PDIF", "ADAT1", "ADAT2", "Word Clock"
-};
static enum snd_bebob_clock_type saffirepro_26_clk_src_types[] = {
SND_BEBOB_CLOCK_TYPE_INTERNAL,
SND_BEBOB_CLOCK_TYPE_EXTERNAL, /* S/PDIF */
@@ -207,9 +201,6 @@ end:
}
struct snd_bebob_spec saffire_le_spec;
-static const char *const saffire_both_clk_src_labels[] = {
- SND_BEBOB_CLOCK_INTERNAL, "S/PDIF"
-};
static enum snd_bebob_clock_type saffire_both_clk_src_types[] = {
SND_BEBOB_CLOCK_TYPE_INTERNAL,
SND_BEBOB_CLOCK_TYPE_EXTERNAL,
@@ -276,7 +267,6 @@ static struct snd_bebob_rate_spec saffirepro_both_rate_spec = {
/* Saffire Pro 26 I/O */
static struct snd_bebob_clock_spec saffirepro_26_clk_spec = {
.num = ARRAY_SIZE(saffirepro_26_clk_src_types),
- .labels = saffirepro_26_clk_src_labels,
.types = saffirepro_26_clk_src_types,
.get = &saffirepro_both_clk_src_get,
};
@@ -288,7 +278,6 @@ struct snd_bebob_spec saffirepro_26_spec = {
/* Saffire Pro 10 I/O */
static struct snd_bebob_clock_spec saffirepro_10_clk_spec = {
.num = ARRAY_SIZE(saffirepro_10_clk_src_types),
- .labels = saffirepro_10_clk_src_labels,
.types = saffirepro_10_clk_src_types,
.get = &saffirepro_both_clk_src_get,
};
@@ -304,7 +293,6 @@ static struct snd_bebob_rate_spec saffire_both_rate_spec = {
};
static struct snd_bebob_clock_spec saffire_both_clk_spec = {
.num = ARRAY_SIZE(saffire_both_clk_src_types),
- .labels = saffire_both_clk_src_labels,
.types = saffire_both_clk_src_types,
.get = &saffire_both_clk_src_get,
};