path: root/sound/firewire
diff options
authorTakashi Sakamoto <o-takashi@sakamocchi.jp>2019-01-20 17:25:47 +0900
committerTakashi Iwai <tiwai@suse.de>2019-01-21 15:12:16 +0100
commit2f8af5b3f09cd3d2b483b35a400bf2b827ada179 (patch)
tree21c64993e4a41c618f02c49277b418efe436e0b7 /sound/firewire
parent9dd466aca377182b7ea77bc0058c64abba667f90 (diff)
ALSA: fireface: obsolete proc node to leave one node
In a series of Fireface, latter protocol has no way for drivers to retrieve current clock configuration. On the other hand, this driver has proc node for it. This commit removes a proc node to dump both clock configuration and synchronization status in one proc node. Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/firewire')
1 files changed, 12 insertions, 8 deletions
diff --git a/sound/firewire/fireface/ff-proc.c b/sound/firewire/fireface/ff-proc.c
index a0c550dabe9a..37f84b7fc432 100644
--- a/sound/firewire/fireface/ff-proc.c
+++ b/sound/firewire/fireface/ff-proc.c
@@ -8,10 +8,8 @@
#include "./ff.h"
-static void proc_dump_clock_config(struct snd_info_entry *entry,
- struct snd_info_buffer *buffer)
+static void dump_clock_config(struct snd_ff *ff, struct snd_info_buffer *buffer)
- struct snd_ff *ff = entry->private_data;
__le32 reg;
u32 data;
unsigned int rate;
@@ -87,10 +85,8 @@ static void proc_dump_clock_config(struct snd_info_entry *entry,
snd_iprintf(buffer, "Sync to clock source: %s\n", src);
-static void proc_dump_sync_status(struct snd_info_entry *entry,
- struct snd_info_buffer *buffer)
+static void dump_sync_status(struct snd_ff *ff, struct snd_info_buffer *buffer)
- struct snd_ff *ff = entry->private_data;
__le32 reg;
u32 data;
int err;
@@ -213,6 +209,15 @@ static void proc_dump_sync_status(struct snd_info_entry *entry,
snd_iprintf(buffer, "%d\n", (data & 0x3ff) * 250);
+static void proc_dump_status(struct snd_info_entry *entry,
+ struct snd_info_buffer *buffer)
+ struct snd_ff *ff = entry->private_data;
+ dump_clock_config(ff, buffer);
+ dump_sync_status(ff, buffer);
static void add_node(struct snd_ff *ff, struct snd_info_entry *root,
const char *name,
void (*op)(struct snd_info_entry *e,
@@ -247,6 +252,5 @@ void snd_ff_proc_init(struct snd_ff *ff)
- add_node(ff, root, "clock-config", proc_dump_clock_config);
- add_node(ff, root, "sync-status", proc_dump_sync_status);
+ add_node(ff, root, "status", proc_dump_status);