alsa-devel.alsa-project.org archive mirror
 help / color / mirror / Atom feed
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 2/9] ALSA: line6: use usb_fill_int_urb()
Date: Tue, 19 Jun 2018 23:55:14 +0200	[thread overview]
Message-ID: <20180619215521.13688-3-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.
Data pointer & size is filled out later so they are not considered.

Cc: Jaroslav Kysela <perex@perex.cz>
Cc: Takashi Iwai <tiwai@suse.com>
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
---
 sound/usb/line6/capture.c  | 16 ++++++----------
 sound/usb/line6/playback.c | 16 ++++++----------
 2 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/sound/usb/line6/capture.c b/sound/usb/line6/capture.c
index d8a14d769f48..4ee54ba436df 100644
--- a/sound/usb/line6/capture.c
+++ b/sound/usb/line6/capture.c
@@ -52,7 +52,6 @@ static int submit_audio_in_urb(struct snd_line6_pcm *line6pcm)
 	    line6pcm->in.buffer +
 	    index * LINE6_ISO_PACKETS * line6pcm->max_packet_size_in;
 	urb_in->transfer_buffer_length = urb_size;
-	urb_in->context = line6pcm;
 
 	ret = usb_submit_urb(urb_in, GFP_ATOMIC);
 
@@ -280,17 +279,14 @@ int line6_create_audio_in_urbs(struct snd_line6_pcm *line6pcm)
 		if (urb == NULL)
 			return -ENOMEM;
 
-		urb->dev = line6->usbdev;
-		urb->pipe =
-		    usb_rcvisocpipe(line6->usbdev,
-				    line6->properties->ep_audio_r &
-				    USB_ENDPOINT_NUMBER_MASK);
+		usb_fill_int_urb(urb, line6->usbdev,
+				 usb_rcvisocpipe(line6->usbdev,
+						 line6->properties->ep_audio_r &
+						 USB_ENDPOINT_NUMBER_MASK),
+				 NULL, 0, audio_in_callback, line6pcm,
+				 LINE6_ISO_INTERVAL);
 		urb->transfer_flags = URB_ISO_ASAP;
-		urb->start_frame = -1;
 		urb->number_of_packets = LINE6_ISO_PACKETS;
-		urb->interval = LINE6_ISO_INTERVAL;
-		urb->error_count = 0;
-		urb->complete = audio_in_callback;
 	}
 
 	return 0;
diff --git a/sound/usb/line6/playback.c b/sound/usb/line6/playback.c
index dec89d2beb57..af1ca09c260e 100644
--- a/sound/usb/line6/playback.c
+++ b/sound/usb/line6/playback.c
@@ -202,7 +202,6 @@ static int submit_audio_out_urb(struct snd_line6_pcm *line6pcm)
 	    line6pcm->out.buffer +
 	    index * LINE6_ISO_PACKETS * line6pcm->max_packet_size_out;
 	urb_out->transfer_buffer_length = urb_size;
-	urb_out->context = line6pcm;
 
 	if (test_bit(LINE6_STREAM_PCM, &line6pcm->out.running) &&
 	    !test_bit(LINE6_FLAG_PAUSE_PLAYBACK, &line6pcm->flags)) {
@@ -425,17 +424,14 @@ int line6_create_audio_out_urbs(struct snd_line6_pcm *line6pcm)
 		if (urb == NULL)
 			return -ENOMEM;
 
-		urb->dev = line6->usbdev;
-		urb->pipe =
-		    usb_sndisocpipe(line6->usbdev,
-				    line6->properties->ep_audio_w &
-				    USB_ENDPOINT_NUMBER_MASK);
+		usb_fill_int_urb(urb, line6->usbdev,
+				 usb_sndisocpipe(line6->usbdev,
+						 line6->properties->ep_audio_w &
+						 USB_ENDPOINT_NUMBER_MASK),
+				 NULL, 0, audio_out_callback, line6pcm,
+				 LINE6_ISO_INTERVAL);
 		urb->transfer_flags = URB_ISO_ASAP;
-		urb->start_frame = -1;
 		urb->number_of_packets = LINE6_ISO_PACKETS;
-		urb->interval = LINE6_ISO_INTERVAL;
-		urb->error_count = 0;
-		urb->complete = audio_out_callback;
 	}
 
 	return 0;
-- 
2.17.1

  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 ` Sebastian Andrzej Siewior [this message]
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 ` [PATCH 9/9] ALSA: usx2y: usx2yhwdeppcm: " Sebastian Andrzej Siewior
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-3-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).