Merge remote-tracking branch 'omap_dss2/for-next'

[deliverable/linux.git] / sound / firewire / bebob / bebob_terratec.c

diff --git a/sound/firewire/bebob/bebob_terratec.c b/sound/firewire/bebob/bebob_terratec.c
index c38358b82ada0ac909ff9e999ee3f57761b5a632..2fdaf93e7a8d3d69d8fa28e91a611c8776b52e76 100644 (file)
--- a/sound/firewire/bebob/bebob_terratec.c
+++ b/sound/firewire/bebob/bebob_terratec.c
@@ -36,25 +36,6 @@ end:
        return err;
 }
 
-static enum snd_bebob_clock_type phase24_series_clk_src_types[] = {
-       SND_BEBOB_CLOCK_TYPE_INTERNAL,
-       SND_BEBOB_CLOCK_TYPE_EXTERNAL,  /* S/PDIF */
-};
-static int
-phase24_series_clk_src_get(struct snd_bebob *bebob, unsigned int *id)
-{
-       int err;
-
-       err = avc_audio_get_selector(bebob->unit, 0, 4, id);
-       if (err < 0)
-               return err;
-
-       if (*id >= ARRAY_SIZE(phase24_series_clk_src_types))
-               return -EIO;
-
-       return 0;
-}
-
 static const struct snd_bebob_rate_spec phase_series_rate_spec = {
        .get    = &snd_bebob_stream_get_rate,
        .set    = &snd_bebob_stream_set_rate,
@@ -71,15 +52,3 @@ const struct snd_bebob_spec phase88_rack_spec = {
        .rate   = &phase_series_rate_spec,
        .meter  = NULL
 };
-
-/* 'PHASE 24 FW' and 'PHASE X24 FW' */
-static const struct snd_bebob_clock_spec phase24_series_clk = {
-       .num    = ARRAY_SIZE(phase24_series_clk_src_types),
-       .types  = phase24_series_clk_src_types,
-       .get    = &phase24_series_clk_src_get,
-};
-const struct snd_bebob_spec phase24_series_spec = {
-       .clock  = &phase24_series_clk,
-       .rate   = &phase_series_rate_spec,
-       .meter  = NULL
-};