From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
To: alsa-devel@alsa-project.org
Cc: tglx@linutronix.de, linux-usb@vger.kernel.org,
Takashi Iwai <tiwai@suse.com>,
Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Subject: [PATCH 9/9] ALSA: usx2y: usx2yhwdeppcm: use usb_fill_int_urb()
Date: Tue, 19 Jun 2018 23:55:21 +0200 [thread overview]
Message-ID: <20180619215521.13688-10-bigeasy@linutronix.de> (raw)
In-Reply-To: <20180619215521.13688-1-bigeasy@linutronix.de>
Using usb_fill_int_urb() helps to find code which initializes an
URB. A grep for members of the struct (like ->complete) reveal lots
of other things, too.
I'm keeping the transfer-length initialisation in
usX2Y_usbpcm_urbs_start() because I am not certain if this does not
change over time.
Cc: Jaroslav Kysela <perex@perex.cz>
Cc: Takashi Iwai <tiwai@suse.com>
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
---
sound/usb/usx2y/usx2yhwdeppcm.c | 23 +++++++++++++----------
1 file changed, 13 insertions(+), 10 deletions(-)
diff --git a/sound/usb/usx2y/usx2yhwdeppcm.c b/sound/usb/usx2y/usx2yhwdeppcm.c
index 4fd9276b8e50..0a14612f2178 100644
--- a/sound/usb/usx2y/usx2yhwdeppcm.c
+++ b/sound/usb/usx2y/usx2yhwdeppcm.c
@@ -325,6 +325,8 @@ static int usX2Y_usbpcm_urbs_allocate(struct snd_usX2Y_substream *subs)
/* allocate and initialize data urbs */
for (i = 0; i < NRURBS; i++) {
struct urb **purb = subs->urb + i;
+ void *buf;
+
if (*purb) {
usb_kill_urb(*purb);
continue;
@@ -334,18 +336,19 @@ static int usX2Y_usbpcm_urbs_allocate(struct snd_usX2Y_substream *subs)
usX2Y_usbpcm_urbs_release(subs);
return -ENOMEM;
}
- (*purb)->transfer_buffer = is_playback ?
- subs->usX2Y->hwdep_pcm_shm->playback : (
- subs->endpoint == 0x8 ?
- subs->usX2Y->hwdep_pcm_shm->capture0x8 :
- subs->usX2Y->hwdep_pcm_shm->capture0xA);
+ if (is_playback) {
+ buf = subs->usX2Y->hwdep_pcm_shm->playback;
+ } else {
+ if (subs->endpoint == 0x8)
+ buf = subs->usX2Y->hwdep_pcm_shm->capture0x8;
+ else
+ buf = subs->usX2Y->hwdep_pcm_shm->capture0xA;
+ }
+ usb_fill_int_urb(*purb, dev, pipe, buf,
+ subs->maxpacksize * nr_of_packs(),
+ i_usX2Y_usbpcm_subs_startup, subs, 1);
- (*purb)->dev = dev;
- (*purb)->pipe = pipe;
(*purb)->number_of_packets = nr_of_packs();
- (*purb)->context = subs;
- (*purb)->interval = 1;
- (*purb)->complete = i_usX2Y_usbpcm_subs_startup;
}
return 0;
}
--
2.17.1
next prev parent reply other threads:[~2018-06-19 21:55 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-19 21:55 ALSA: use irqsave() in URB completion + usb_fill_int_urb Sebastian Andrzej Siewior
2018-06-19 21:55 ` [PATCH 1/9] ALSA: 6fire: use usb_fill_int_urb() Sebastian Andrzej Siewior
2018-06-19 21:55 ` [PATCH 2/9] ALSA: line6: " Sebastian Andrzej Siewior
2018-06-19 21:55 ` [PATCH 3/9] ALSA: ua101: " Sebastian Andrzej Siewior
2018-06-19 21:55 ` [PATCH 4/9] ALSA: usb-audio: " Sebastian Andrzej Siewior
2018-06-20 8:23 ` Sergei Shtylyov
2018-06-20 9:38 ` [PATCH 4/9 v2] " Sebastian Andrzej Siewior
2018-06-20 13:21 ` Takashi Iwai
2018-06-20 13:52 ` Sebastian Andrzej Siewior
2018-06-20 13:56 ` Takashi Iwai
2018-06-20 14:00 ` Takashi Iwai
2018-06-19 21:55 ` [PATCH 5/9] ALSA: usb: caiaq: audio: use irqsave() in USB's complete callback Sebastian Andrzej Siewior
2018-06-21 20:18 ` Daniel Mack
2018-06-19 21:55 ` [PATCH 6/9] ALSA: usb: caiaq: use usb_fill_int_urb() Sebastian Andrzej Siewior
2018-06-21 20:19 ` Daniel Mack
2018-06-21 21:16 ` Sebastian Andrzej Siewior
2018-06-22 8:49 ` Takashi Iwai
2018-06-22 10:01 ` Daniel Mack
2018-06-22 10:14 ` Sebastian Andrzej Siewior
2018-06-19 21:55 ` [PATCH 7/9] ALSA: usb-midi: use irqsave() in USB's complete callback Sebastian Andrzej Siewior
2018-06-19 21:55 ` [PATCH 8/9] ALSA: usx2y: usbusx2yaudio: use usb_fill_int_urb() Sebastian Andrzej Siewior
2018-06-20 12:51 ` Takashi Iwai
2018-06-20 14:39 ` Sebastian Andrzej Siewior
2018-06-20 14:52 ` Takashi Iwai
2018-06-20 15:38 ` Sebastian Andrzej Siewior
2018-06-20 15:47 ` Sebastian Andrzej Siewior
2018-06-20 16:20 ` Takashi Iwai
2018-06-19 21:55 ` Sebastian Andrzej Siewior [this message]
2018-06-20 12:55 ` ALSA: use irqsave() in URB completion + usb_fill_int_urb 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=20180619215521.13688-10-bigeasy@linutronix.de \
--to=bigeasy@linutronix.de \
--cc=alsa-devel@alsa-project.org \
--cc=linux-usb@vger.kernel.org \
--cc=tglx@linutronix.de \
--cc=tiwai@suse.com \
/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).