Basically, drivers in ALSA firewire stack implement no control elements,
because they can be implemented in userspace as Linux FireWire subsystem
interface applications. Nevertheless, ALSA oxfw driver has some control
elements. This is due to backward compatibility to old firewire-speakers
module. The control elements are model-specific, while the file name gives
an impression of oxfw generic functionality.
This commit renames the file so that it's specific for two models.
Signed-off-by: Takashi Sakamoto <o-takashi@xxxxxxxxxxxxx>
---
sound/firewire/oxfw/Makefile | 4 ++--
sound/firewire/oxfw/{oxfw-control.c => oxfw-spkr.c} | 4 +++-
2 files changed, 5 insertions(+), 3 deletions(-)
rename sound/firewire/oxfw/{oxfw-control.c => oxfw-spkr.c} (98%)
diff --git a/sound/firewire/oxfw/Makefile b/sound/firewire/oxfw/Makefile
index 06ff50f..4e54ba9 100644
--- a/sound/firewire/oxfw/Makefile
+++ b/sound/firewire/oxfw/Makefile
@@ -1,3 +1,3 @@
-snd-oxfw-objs := oxfw-command.o oxfw-stream.o oxfw-control.o oxfw-pcm.o \
- oxfw-proc.o oxfw-midi.o oxfw-hwdep.o oxfw.o
+snd-oxfw-objs := oxfw-command.o oxfw-stream.o oxfw-pcm.o oxfw-proc.o \
+ oxfw-midi.o oxfw-hwdep.o oxfw-spkr.o oxfw.o
obj-$(CONFIG_SND_OXFW) += snd-oxfw.o
diff --git a/sound/firewire/oxfw/oxfw-control.c b/sound/firewire/oxfw/oxfw-spkr.c
similarity index 98%
rename from sound/firewire/oxfw/oxfw-control.c
rename to sound/firewire/oxfw/oxfw-spkr.c
index 02a1cb9..ba766be 100644
--- a/sound/firewire/oxfw/oxfw-control.c
+++ b/sound/firewire/oxfw/oxfw-spkr.c
@@ -1,7 +1,9 @@
/*
- * oxfw_stream.c - a part of driver for OXFW970/971 based devices
+ * oxfw-spkr.c - a part of driver for OXFW970/971 based devices
*
* Copyright (c) Clemens Ladisch <clemens@xxxxxxxxxx>
+ * Copyright (c) 2015 Takashi Sakamoto <o-takashi@xxxxxxxxxxxxx>
+ *
* Licensed under the terms of the GNU General Public License, version 2.
*/
--
2.5.0
_______________________________________________
Alsa-devel mailing list
Alsa-devel@xxxxxxxxxxxxxxxx
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
