From: Daniel Mack <daniel@caiaq.de>
To: alsa-devel@alsa-project.org
Cc: tiwai@suse.de, clemens@ladisch.de
Subject: [PATCH 4/6] ALSA: usb-mixer: rename usbmixer.[ch] -> mixer.[ch]
Date: Thu, 11 Mar 2010 21:13:23 +0100 [thread overview]
Message-ID: <1268338405-8944-5-git-send-email-daniel@caiaq.de> (raw)
In-Reply-To: <1268338405-8944-4-git-send-email-daniel@caiaq.de>
For clearer namespace, also rename usbmixer_maps.c -> mixer_maps.c
Signed-off-by: Daniel Mack <daniel@caiaq.de>
Cc: Clemens Ladisch <clemens@ladisch.de>
Cc: Takashi Iwai <tiwai@suse.de>
---
sound/usb/Makefile | 2 +-
sound/usb/card.c | 2 +-
sound/usb/{usbmixer.c => mixer.c} | 4 ++--
sound/usb/{usbmixer.h => mixer.h} | 0
sound/usb/{usbmixer_maps.c => mixer_maps.c} | 0
sound/usb/mixer_quirks.c | 2 +-
sound/usb/quirks.c | 2 +-
7 files changed, 6 insertions(+), 6 deletions(-)
rename sound/usb/{usbmixer.c => mixer.c} (99%)
rename sound/usb/{usbmixer.h => mixer.h} (100%)
rename sound/usb/{usbmixer_maps.c => mixer_maps.c} (100%)
diff --git a/sound/usb/Makefile b/sound/usb/Makefile
index 744024a..e7ac7f4 100644
--- a/sound/usb/Makefile
+++ b/sound/usb/Makefile
@@ -3,7 +3,7 @@
#
snd-usb-audio-objs := card.o \
- usbmixer.o \
+ mixer.o \
mixer_quirks.o \
proc.o \
quirks.o \
diff --git a/sound/usb/card.c b/sound/usb/card.c
index 78d12ff..0bd62a1 100644
--- a/sound/usb/card.c
+++ b/sound/usb/card.c
@@ -56,7 +56,7 @@
#include "usbaudio.h"
#include "card.h"
#include "midi.h"
-#include "usbmixer.h"
+#include "mixer.h"
#include "proc.h"
#include "quirks.h"
#include "endpoint.h"
diff --git a/sound/usb/usbmixer.c b/sound/usb/mixer.c
similarity index 99%
rename from sound/usb/usbmixer.c
rename to sound/usb/mixer.c
index ec2436e..4e7c2fd 100644
--- a/sound/usb/usbmixer.c
+++ b/sound/usb/mixer.c
@@ -41,7 +41,7 @@
#include <sound/tlv.h>
#include "usbaudio.h"
-#include "usbmixer.h"
+#include "mixer.h"
#include "helper.h"
#include "mixer_quirks.h"
@@ -132,7 +132,7 @@ enum {
* if the mixer topology is too complicated and the parsed names are
* ambiguous, add the entries in usbmixer_maps.c.
*/
-#include "usbmixer_maps.c"
+#include "mixer_maps.c"
static const struct usbmix_name_map *
find_map(struct mixer_build *state, int unitid, int control)
diff --git a/sound/usb/usbmixer.h b/sound/usb/mixer.h
similarity index 100%
rename from sound/usb/usbmixer.h
rename to sound/usb/mixer.h
diff --git a/sound/usb/usbmixer_maps.c b/sound/usb/mixer_maps.c
similarity index 100%
rename from sound/usb/usbmixer_maps.c
rename to sound/usb/mixer_maps.c
diff --git a/sound/usb/mixer_quirks.c b/sound/usb/mixer_quirks.c
index d2f4dcd..56b6659 100644
--- a/sound/usb/mixer_quirks.c
+++ b/sound/usb/mixer_quirks.c
@@ -35,7 +35,7 @@
#include <sound/info.h>
#include "usbaudio.h"
-#include "usbmixer.h"
+#include "mixer.h"
#include "mixer_quirks.h"
#include "helper.h"
diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c
index a82cfed..d4ced64 100644
--- a/sound/usb/quirks.c
+++ b/sound/usb/quirks.c
@@ -24,7 +24,7 @@
#include "usbaudio.h"
#include "card.h"
-#include "usbmixer.h"
+#include "mixer.h"
#include "mixer_quirks.h"
#include "midi.h"
#include "quirks.h"
--
1.6.6.2
next prev parent reply other threads:[~2010-03-11 20:14 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-11 20:13 ALSA: usb-mixer: Add support for UAC2 devices Daniel Mack
2010-03-11 20:13 ` [PATCH 1/6] linux/usb/audio.h: split header Daniel Mack
2010-03-11 20:13 ` [PATCH 2/6] ALSA: usb-mixer: use defines from audio.h Daniel Mack
2010-03-11 20:13 ` [PATCH 3/6] ALSA: usb-mixer: factor out quirks Daniel Mack
2010-03-11 20:13 ` Daniel Mack [this message]
2010-03-11 20:13 ` [PATCH 5/6] ALSA: usb-mixer: parse descriptors with structs Daniel Mack
2010-03-11 20:13 ` [PATCH 6/6] ALSA: usb-mixer: Add support for Audio Class v2.0 Daniel Mack
2010-03-11 20:17 ` [PATCH 1/6] linux/usb/audio.h: split header Daniel Mack
2010-03-12 2:55 ` Greg KH
2010-03-12 11:46 ` ALSA: usb-mixer: Add support for UAC2 devices Takashi Iwai
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1268338405-8944-5-git-send-email-daniel@caiaq.de \
--to=daniel@caiaq.de \
--cc=alsa-devel@alsa-project.org \
--cc=clemens@ladisch.de \
--cc=tiwai@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).