summaryrefslogtreecommitdiffstats
path: root/sound/usb
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2020-11-23 09:53:13 +0100
committerTakashi Iwai <tiwai@suse.de>2020-11-23 15:12:17 +0100
commite93e890e16ef5a0605b7cdc52b3bde50d88d7207 (patch)
tree9976f3f894df6578842cecd0ba9d3afa1b140ef1 /sound/usb
parent1803503fe963afe850b26769f5447f871b1c6f83 (diff)
downloadlinux-e93e890e16ef5a0605b7cdc52b3bde50d88d7207.tar.gz
linux-e93e890e16ef5a0605b7cdc52b3bde50d88d7207.tar.bz2
linux-e93e890e16ef5a0605b7cdc52b3bde50d88d7207.zip
ALSA: usb-audio: Improve some debug prints
There are a few rooms for improvements wrt the debug prints: - The EP debug print is shown only at starting, not at stopping - The EP debug print contains useless object addresses - Some helpers show the urb and the EP object addresses, too This patch addresses those shortcomings. Tested-by: Keith Milner <kamilner@superlative.org> Tested-by: Dylan Robinson <dylan_robinson@motu.com> Link: https://lore.kernel.org/r/20201123085347.19667-8-tiwai@suse.de Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb')
-rw-r--r--sound/usb/endpoint.c8
-rw-r--r--sound/usb/pcm.c11
2 files changed, 12 insertions, 7 deletions
diff --git a/sound/usb/endpoint.c b/sound/usb/endpoint.c
index cf00871fd278..8205a64a734e 100644
--- a/sound/usb/endpoint.c
+++ b/sound/usb/endpoint.c
@@ -367,8 +367,8 @@ static void queue_pending_output_urbs(struct snd_usb_endpoint *ep)
err = usb_submit_urb(ctx->urb, GFP_ATOMIC);
if (err < 0)
usb_audio_err(ep->chip,
- "Unable to submit urb #%d: %d (urb %p)\n",
- ctx->index, err, ctx->urb);
+ "Unable to submit urb #%d: %d at %s\n",
+ ctx->index, err, __func__);
else
set_bit(ctx->index, &ep->active_mask);
}
@@ -494,8 +494,8 @@ struct snd_usb_endpoint *snd_usb_add_endpoint(struct snd_usb_audio *chip,
alts->desc.bInterfaceNumber,
alts->desc.bAlternateSetting);
if (ep) {
- usb_audio_dbg(ep->chip, "Re-using EP %x in iface %d,%d @%p\n",
- ep_num, ep->iface, ep->altsetting, ep);
+ usb_audio_dbg(ep->chip, "Re-using EP %x in iface %d,%d\n",
+ ep_num, ep->iface, ep->altsetting);
goto __exit_unlock;
}
diff --git a/sound/usb/pcm.c b/sound/usb/pcm.c
index 8800ec627a73..8f4fe65d5c37 100644
--- a/sound/usb/pcm.c
+++ b/sound/usb/pcm.c
@@ -218,7 +218,7 @@ static int start_endpoints(struct snd_usb_substream *subs)
if (!test_and_set_bit(SUBSTREAM_FLAG_DATA_EP_STARTED, &subs->flags)) {
struct snd_usb_endpoint *ep = subs->data_endpoint;
- dev_dbg(&subs->dev->dev, "Starting data EP @%p\n", ep);
+ dev_dbg(&subs->dev->dev, "Starting data EP 0x%x\n", ep->ep_num);
ep->data_subs = subs;
err = snd_usb_endpoint_start(ep);
@@ -232,7 +232,7 @@ static int start_endpoints(struct snd_usb_substream *subs)
!test_and_set_bit(SUBSTREAM_FLAG_SYNC_EP_STARTED, &subs->flags)) {
struct snd_usb_endpoint *ep = subs->sync_endpoint;
- dev_dbg(&subs->dev->dev, "Starting sync EP @%p\n", ep);
+ dev_dbg(&subs->dev->dev, "Starting sync EP 0x%x\n", ep->ep_num);
ep->sync_slave = subs->data_endpoint;
err = snd_usb_endpoint_start(ep);
@@ -255,12 +255,17 @@ static void sync_pending_stops(struct snd_usb_substream *subs)
static void stop_endpoints(struct snd_usb_substream *subs)
{
if (test_and_clear_bit(SUBSTREAM_FLAG_SYNC_EP_STARTED, &subs->flags)) {
+ dev_dbg(&subs->dev->dev, "Stopping sync EP 0x%x\n",
+ subs->sync_endpoint->ep_num);
snd_usb_endpoint_stop(subs->sync_endpoint);
subs->sync_endpoint->sync_slave = NULL;
}
- if (test_and_clear_bit(SUBSTREAM_FLAG_DATA_EP_STARTED, &subs->flags))
+ if (test_and_clear_bit(SUBSTREAM_FLAG_DATA_EP_STARTED, &subs->flags)) {
+ dev_dbg(&subs->dev->dev, "Stopping data EP 0x%x\n",
+ subs->data_endpoint->ep_num);
snd_usb_endpoint_stop(subs->data_endpoint);
+ }
}
/* PCM sync_stop callback */