From: Daniel Mack <zonque@gmail.com>
To: alsa-devel@alsa-project.org
Cc: Daniel Mack <zonque@gmail.com>
Subject: [PATCH 2/5] ALSA: snd-usb: use snd_printk() instead of printk()
Date: Wed, 13 Jul 2011 02:13:26 +0200 [thread overview]
Message-ID: <1310516009-4387-2-git-send-email-zonque@gmail.com> (raw)
In-Reply-To: <1310516009-4387-1-git-send-email-zonque@gmail.com>
Signed-off-by: Daniel Mack <zonque@gmail.com>
---
sound/usb/card.c | 4 ++--
sound/usb/clock.c | 6 +++---
sound/usb/midi.c | 4 ++--
sound/usb/pcm.c | 12 ++++++------
4 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/sound/usb/card.c b/sound/usb/card.c
index 8990b49..9a4f423 100644
--- a/sound/usb/card.c
+++ b/sound/usb/card.c
@@ -488,7 +488,7 @@ static void *snd_usb_audio_probe(struct usb_device *dev,
break;
}
if (!chip) {
- printk(KERN_ERR "no available usb audio device\n");
+ snd_printk(KERN_ERR "no available usb audio device\n");
goto __error;
}
}
@@ -709,7 +709,7 @@ static struct usb_driver usb_audio_driver = {
static int __init snd_usb_audio_init(void)
{
if (nrpacks < 1 || nrpacks > MAX_PACKS) {
- printk(KERN_WARNING "invalid nrpacks value.\n");
+ snd_printk(KERN_WARNING "invalid nrpacks value.\n");
return -EINVAL;
}
return usb_register(&usb_audio_driver);
diff --git a/sound/usb/clock.c b/sound/usb/clock.c
index 075195e..b319299 100644
--- a/sound/usb/clock.c
+++ b/sound/usb/clock.c
@@ -163,9 +163,9 @@ static int __uac_clock_find_source(struct snd_usb_audio *chip,
/* Selector values are one-based */
if (ret > selector->bNrInPins || ret < 1) {
- printk(KERN_ERR
- "%s(): selector reported illegal value, id %d, ret %d\n",
- __func__, selector->bClockID, ret);
+ snd_printk(KERN_ERR
+ "%s(): selector reported illegal value, id %d, ret %d\n",
+ __func__, selector->bClockID, ret);
return -EINVAL;
}
diff --git a/sound/usb/midi.c b/sound/usb/midi.c
index f928910..a2ae089 100644
--- a/sound/usb/midi.c
+++ b/sound/usb/midi.c
@@ -237,8 +237,8 @@ static void dump_urb(const char *type, const u8 *data, int length)
{
snd_printk(KERN_DEBUG "%s packet: [", type);
for (; length > 0; ++data, --length)
- printk(" %02x", *data);
- printk(" ]\n");
+ snd_printk(" %02x", *data);
+ snd_printk(" ]\n");
}
#else
#define dump_urb(type, data, length) /* nothing */
diff --git a/sound/usb/pcm.c b/sound/usb/pcm.c
index b8dcbf4..24a7a404 100644
--- a/sound/usb/pcm.c
+++ b/sound/usb/pcm.c
@@ -300,12 +300,12 @@ static int set_format(struct snd_usb_substream *subs, struct audioformat *fmt)
snd_usb_set_format_quirk(subs, fmt);
#if 0
- printk(KERN_DEBUG
- "setting done: format = %d, rate = %d..%d, channels = %d\n",
- fmt->format, fmt->rate_min, fmt->rate_max, fmt->channels);
- printk(KERN_DEBUG
- " datapipe = 0x%0x, syncpipe = 0x%0x\n",
- subs->datapipe, subs->syncpipe);
+ snd_printk(KERN_DEBUG
+ "setting done: format = %d, rate = %d..%d, channels = %d\n",
+ fmt->format, fmt->rate_min, fmt->rate_max, fmt->channels);
+ snd_printk(KERN_DEBUG
+ " datapipe = 0x%0x, syncpipe = 0x%0x\n",
+ subs->datapipe, subs->syncpipe);
#endif
return 0;
--
1.7.5.4
next prev parent reply other threads:[~2011-07-13 0:13 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-13 0:13 [PATCH 1/5] ALSA: snd-usb: don't fail hard if mixer creation fails Daniel Mack
2011-07-13 0:13 ` Daniel Mack [this message]
2011-07-13 5:31 ` [PATCH 2/5] ALSA: snd-usb: use snd_printk() instead of printk() Takashi Iwai
2011-07-13 0:13 ` [PATCH 3/5] ALSA: snd-usb: be more verbose about bogus UAC_FORMAT_TYPE descriptors Daniel Mack
2011-07-13 0:13 ` [PATCH 4/5] ALSA: snd-usb: ignore mixer units of type UAC2_EXTENSION_UNIT_V2 Daniel Mack
2011-07-13 0:13 ` [PATCH 5/5] ALSA: snd-usb: Accept UAC2 FORMAT_TYPE descriptors with bLength > 6 Daniel Mack
2011-07-13 5:29 ` [PATCH 1/5] ALSA: snd-usb: don't fail hard if mixer creation fails Takashi Iwai
2011-07-13 12:06 ` Daniel Mack
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=1310516009-4387-2-git-send-email-zonque@gmail.com \
--to=zonque@gmail.com \
--cc=alsa-devel@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.