alsa-devel.alsa-project.org archive mirror
 help / color / mirror / Atom feed
From: Felix Homann <linuxaudio@showlabor.de>
To: patch@alsa-project.org
Cc: alsa-devel@alsa-project.org,
	Felix Homann <linuxaudio@showlabor.de>,
	mark@pogo.org.uk
Subject: [PATCH 4/5] Rename Fast Track Ultra mixer quirk functions
Date: Mon, 23 Apr 2012 20:24:26 +0200	[thread overview]
Message-ID: <1335205467-12650-5-git-send-email-linuxaudio@showlabor.de> (raw)
In-Reply-To: <1335205467-12650-1-git-send-email-linuxaudio@showlabor.de>

This is in preparation for more FTU controls to come. Should help keeping names
a bit shorter.

Signed-off-by: Felix Homann <linuxaudio@showlabor.de>

diff --git a/sound/usb/mixer_quirks.c b/sound/usb/mixer_quirks.c
index 9f1987f..534e81e 100644
--- a/sound/usb/mixer_quirks.c
+++ b/sound/usb/mixer_quirks.c
@@ -575,8 +575,8 @@ static int snd_nativeinstruments_create_mixer(struct usb_mixer_interface *mixer,
 
 /* M-Audio FastTrack Ultra quirks */
 
-/* Create a volume control for FTU devices*/
-static int snd_maudio_ftu_create_volume_ctls(struct usb_mixer_interface *mixer)
+/* Create volume controls for FTU devices*/
+static int snd_ftu_create_volume_ctls(struct usb_mixer_interface *mixer)
 {
 	char name[64];
 	unsigned int control, cmask;
@@ -614,11 +614,11 @@ static int snd_maudio_ftu_create_volume_ctls(struct usb_mixer_interface *mixer)
 	return 0;
 }
 
-static int snd_maudio_ftu_create_mixer(struct usb_mixer_interface *mixer)
+static int snd_ftu_create_mixer(struct usb_mixer_interface *mixer)
 {
 	int err;
 
-	err = snd_maudio_ftu_create_volume_ctls(mixer);
+	err = snd_ftu_create_volume_ctls(mixer);
 	if (err < 0)
 		return err;
 
@@ -703,7 +703,7 @@ int snd_usb_mixer_apply_create_quirk(struct usb_mixer_interface *mixer)
 
 	case USB_ID(0x0763, 0x2080): /* M-Audio Fast Track Ultra */
 	case USB_ID(0x0763, 0x2081): /* M-Audio Fast Track Ultra 8R */
-		err = snd_maudio_ftu_create_mixer(mixer);
+		err = snd_ftu_create_mixer(mixer);
 		break;
 
 	case USB_ID(0x0b05, 0x1739):
-- 
1.7.5.4

  parent reply	other threads:[~2012-04-23 18:24 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-04-23 18:24 [PATCH 0/5] Alsa: snd-usb: Improve M-Audio Fast Track Ultra mixer - v3 Felix Homann
2012-04-23 18:24 ` [PATCH 1/5] Unify M-Audio Fast Track Ultra and Ebox-44 mixer quirks Felix Homann
2012-04-23 18:36   ` Mark Hills
2012-04-23 18:46     ` Felix Homann
2012-04-24  6:20     ` Takashi Iwai
2012-04-23 18:24 ` [PATCH 2/5] Rename and export mixer_vol_tlv Felix Homann
2012-04-23 18:24 ` [PATCH 3/5] Add TLV to M-Audio Fast Track Ultra controls Felix Homann
2012-04-23 18:24 ` Felix Homann [this message]
2012-04-23 18:24 ` [PATCH 5/5] M-Audio Fast Track Ultra: Add effect controls Felix Homann
2012-04-23 18:47 ` [PATCH 0/5] Alsa: snd-usb: Improve M-Audio Fast Track Ultra mixer - v3 Mark Hills
2012-04-23 19:00   ` Felix Homann
2012-04-24  6:21 ` Takashi Iwai
2012-04-24  7:18   ` Felix Homann

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=1335205467-12650-5-git-send-email-linuxaudio@showlabor.de \
    --to=linuxaudio@showlabor.de \
    --cc=alsa-devel@alsa-project.org \
    --cc=mark@pogo.org.uk \
    --cc=patch@alsa-project.org \
    /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).