These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / sound / firewire / bebob / bebob_proc.c

diff --git a/kernel/sound/firewire/bebob/bebob_proc.c b/kernel/sound/firewire/bebob/bebob_proc.c
index 335da64..ec24f96 100644 (file)
--- a/kernel/sound/firewire/bebob/bebob_proc.c
+++ b/kernel/sound/firewire/bebob/bebob_proc.c
@@ -73,7 +73,7 @@ proc_read_meters(struct snd_info_entry *entry,
                 struct snd_info_buffer *buffer)
 {
        struct snd_bebob *bebob = entry->private_data;
-       struct snd_bebob_meter_spec *spec = bebob->spec->meter;
+       const struct snd_bebob_meter_spec *spec = bebob->spec->meter;
        u32 *buf;
        unsigned int i, c, channels, size;
 
@@ -132,25 +132,27 @@ static void
 proc_read_clock(struct snd_info_entry *entry,
                struct snd_info_buffer *buffer)
 {
+       static const char *const clk_labels[] = {
+               "Internal",
+               "External",
+               "SYT-Match",
+       };
        struct snd_bebob *bebob = entry->private_data;
-       struct snd_bebob_rate_spec *rate_spec = bebob->spec->rate;
-       struct snd_bebob_clock_spec *clk_spec = bebob->spec->clock;
-       unsigned int rate, id;
-       bool internal;
+       const struct snd_bebob_rate_spec *rate_spec = bebob->spec->rate;
+       const struct snd_bebob_clock_spec *clk_spec = bebob->spec->clock;
+       enum snd_bebob_clock_type src;
+       unsigned int rate;
 
        if (rate_spec->get(bebob, &rate) >= 0)
                snd_iprintf(buffer, "Sampling rate: %d\n", rate);
 
-       if (clk_spec) {
-               if (clk_spec->get(bebob, &id) >= 0)
+       if (snd_bebob_stream_get_clock_src(bebob, &src) >= 0) {
+               if (clk_spec)
                        snd_iprintf(buffer, "Clock Source: %s\n",
-                                   clk_spec->labels[id]);
-       } else {
-               if (snd_bebob_stream_check_internal_clock(bebob,
-                                                         &internal) >= 0)
+                                   clk_labels[src]);
+               else
                        snd_iprintf(buffer, "Clock Source: %s (MSU-dest: %d)\n",
-                                   (internal) ? "Internal" : "External",
-                                   bebob->sync_input_plug);
+                                   clk_labels[src], bebob->sync_input_plug);
        }
 }