From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: [8/9] ALSA: usx2y: usbusx2yaudio: use usb_fill_int_urb() From: Sebastian Andrzej Siewior Message-Id: <20180620154701.i4zgeram6i2gxps6@linutronix.de> Date: Wed, 20 Jun 2018 17:47:01 +0200 To: Takashi Iwai Cc: alsa-devel@alsa-project.org, tglx@linutronix.de, Jaroslav Kysela , linux-usb@vger.kernel.org List-ID: T24gMjAxOC0wNi0yMCAxNzozODo0NCBbKzAyMDBdLCBUbyBUYWthc2hpIEl3YWkgd3JvdGU6Cj4g b2theSwgYXMgeW91IHdpc2g6CgpJJ20gc29ycnksIEkgY29tcGlsZWQgb25lIHBhdGNoIGFuZCBz ZW5kIHRoZSBvdGhlci4gSGVyZSBpcyB0aGUgZml4ZWQKb25lLgoKPiA+IHRoYW5rcywKPiA+IAo+ ID4gVGFrYXNoaQo+IAotLS0tLS0tLS0tLSA+OApTdWJqZWN0OiBbUEFUQ0ggOC85IHY0XSBBTFNB OiB1c3gyeTogdXNidXN4MnlhdWRpbzogdXNlIHVzYl9maWxsX2ludF91cmIoKQoKVXNpbmcgdXNi X2ZpbGxfaW50X3VyYigpIGhlbHBzIHRvIGZpbmQgY29kZSB3aGljaCBpbml0aWFsaXplcyBhbgpV UkIuIEEgZ3JlcCBmb3IgbWVtYmVycyBvZiB0aGUgc3RydWN0IChsaWtlIC0+Y29tcGxldGUpIHJl dmVhbCBsb3RzCm9mIG90aGVyIHRoaW5ncywgdG9vLgoKVGhlICImJiAhKCpwdXJiKS0+dHJhbnNm ZXJfYnVmZmVyIiBjaGVjayBoYXMgYmVlbiByZW1vdmVkIGJlY2F1c2UgdGhlClVSQiBoYXMgYmVl biBmcmVzaGx5IGFsbG9jYXRlZCBhIGZldyBsaW5lcyBhYm92ZSBzbyAtPnRyYW5zZmVyX2J1ZmZl cgpoYXMgdG8gYmUgTlVMTCBoZXJlLgpUaGUgYGRldicgYW5kIGB0cmFuc2Zlcl9zaXplJyBhc3Np Z25tZW50cyBoYXZlIGJlZW4gbW92ZWQgZnJvbQp1c1gyWV91cmJzX3N0YXJ0KCkgdG8gdXNYMllf dXJic19hbGxvY2F0ZSgpIGJlY2F1c2UgdGhleSBkb24ndCBjaGFuZ2UKb3ZlcnRpbWUuClRoZSBt dWx0aXBsaWNhdGlvbiB2aWEgY2hlY2tfbXVsX292ZXJmbG93KCkgaGFzIGJlZW4gZXh0cmFjdGVk IGZyb20Ka21hbGxvY19hcnJheSgpIHRvIGF2b2lkIHR3byBtdWx0aXBsaWNhdGlvbiAob25lIHdp dGggb3ZlcmZsb3cgY2hlY2sgYW5kCm9uZSB3aXRob3V0IGZvciB0aGUgbGVuZ3RoIGFyZ3VtZW50 KS4gVGhpcyByZXF1aXJlcyB0byBjaGFuZ2UgdGhlIHR5cGUKYG1heHBhY2tzaXplJyB0byBpbnQg c28gdGhlcmUgaXMgb25seSBvbmUgdHlwZSBpbnZvbHZlZCBpbiB0aGUKbXVsdGlwbGljYXRpb24u CgpDYzogSmFyb3NsYXYgS3lzZWxhIDxwZXJleEBwZXJleC5jej4KQ2M6IFRha2FzaGkgSXdhaSA8 dGl3YWlAc3VzZS5jb20+ClNpZ25lZC1vZmYtYnk6IFNlYmFzdGlhbiBBbmRyemVqIFNpZXdpb3Ig PGJpZ2Vhc3lAbGludXRyb25peC5kZT4KLS0tCiBzb3VuZC91c2IvdXN4MnkvdXNidXN4MnlhdWRp by5jIHwgMjMgKysrKysrKysrKystLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxMSBpbnNl cnRpb25zKCspLCAxMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9zb3VuZC91c2IvdXN4Mnkv dXNidXN4MnlhdWRpby5jIGIvc291bmQvdXNiL3VzeDJ5L3VzYnVzeDJ5YXVkaW8uYwppbmRleCAy YjgzMzA1NGUzYjAuLmRlM2EyMTQ0NGRiMyAxMDA2NDQKLS0tIGEvc291bmQvdXNiL3VzeDJ5L3Vz YnVzeDJ5YXVkaW8uYworKysgYi9zb3VuZC91c2IvdXN4MnkvdXNidXN4MnlhdWRpby5jCkBAIC00 MjUsNiArNDI1LDkgQEAgc3RhdGljIGludCB1c1gyWV91cmJzX2FsbG9jYXRlKHN0cnVjdCBzbmRf dXNYMllfc3Vic3RyZWFtICpzdWJzKQogCS8qIGFsbG9jYXRlIGFuZCBpbml0aWFsaXplIGRhdGEg dXJicyAqLwogCWZvciAoaSA9IDA7IGkgPCBOUlVSQlM7IGkrKykgewogCQlzdHJ1Y3QgdXJiICoq cHVyYiA9IHN1YnMtPnVyYiArIGk7CisJCXZvaWQgKmJ1ZiA9IE5VTEw7CisJCWludCBsZW4gPSAw OworCiAJCWlmICgqcHVyYikgewogCQkJdXNiX2tpbGxfdXJiKCpwdXJiKTsKIAkJCWNvbnRpbnVl OwpAQCAtNDM0LDIyICs0MzcsMjAgQEAgc3RhdGljIGludCB1c1gyWV91cmJzX2FsbG9jYXRlKHN0 cnVjdCBzbmRfdXNYMllfc3Vic3RyZWFtICpzdWJzKQogCQkJdXNYMllfdXJic19yZWxlYXNlKHN1 YnMpOwogCQkJcmV0dXJuIC1FTk9NRU07CiAJCX0KLQkJaWYgKCFpc19wbGF5YmFjayAmJiAhKCpw dXJiKS0+dHJhbnNmZXJfYnVmZmVyKSB7CisKKwkJaWYgKCFpc19wbGF5YmFjaykgewogCQkJLyog YWxsb2NhdGUgYSBjYXB0dXJlIGJ1ZmZlciBwZXIgdXJiICovCi0JCQkoKnB1cmIpLT50cmFuc2Zl cl9idWZmZXIgPQotCQkJCWttYWxsb2NfYXJyYXkoc3Vicy0+bWF4cGFja3NpemUsCi0JCQkJCSAg ICAgIG5yX29mX3BhY2tzKCksIEdGUF9LRVJORUwpOwotCQkJaWYgKE5VTEwgPT0gKCpwdXJiKS0+ dHJhbnNmZXJfYnVmZmVyKSB7CisJCQlidWYgPSBrbWFsbG9jX2FycmF5KHN1YnMtPm1heHBhY2tz aXplLCBucl9vZl9wYWNrcygpLAorCQkJCQkgICAgR0ZQX0tFUk5FTCk7CisJCQlpZiAoIWJ1Zikg ewogCQkJCXVzWDJZX3VyYnNfcmVsZWFzZShzdWJzKTsKIAkJCQlyZXR1cm4gLUVOT01FTTsKIAkJ CX0KKwkJCWxlbiA9IHN1YnMtPm1heHBhY2tzaXplICogbnJfb2ZfcGFja3MoKTsKIAkJfQotCQko KnB1cmIpLT5kZXYgPSBkZXY7Ci0JCSgqcHVyYiktPnBpcGUgPSBwaXBlOworCQl1c2JfZmlsbF9p bnRfdXJiKCpwdXJiLCBkZXYsIHBpcGUsIGJ1ZiwgbGVuLAorCQkJCSBpX3VzWDJZX3N1YnNfc3Rh cnR1cCwgc3VicywgMSk7CiAJCSgqcHVyYiktPm51bWJlcl9vZl9wYWNrZXRzID0gbnJfb2ZfcGFj a3MoKTsKLQkJKCpwdXJiKS0+Y29udGV4dCA9IHN1YnM7Ci0JCSgqcHVyYiktPmludGVydmFsID0g MTsKLQkJKCpwdXJiKS0+Y29tcGxldGUgPSBpX3VzWDJZX3N1YnNfc3RhcnR1cDsKIAl9CiAJcmV0 dXJuIDA7CiB9CkBAIC00ODUsMTIgKzQ4NiwxMCBAQCBzdGF0aWMgaW50IHVzWDJZX3VyYnNfc3Rh cnQoc3RydWN0IHNuZF91c1gyWV9zdWJzdHJlYW0gKnN1YnMpCiAJCQl1bnNpZ25lZCBsb25nIHBh Y2s7CiAJCQlpZiAoMCA9PSBpKQogCQkJCWF0b21pY19zZXQoJnN1YnMtPnN0YXRlLCBzdGF0ZV9T VEFSVElORzMpOwotCQkJdXJiLT5kZXYgPSB1c1gyWS0+ZGV2OwogCQkJZm9yIChwYWNrID0gMDsg cGFjayA8IG5yX29mX3BhY2tzKCk7IHBhY2srKykgewogCQkJCXVyYi0+aXNvX2ZyYW1lX2Rlc2Nb cGFja10ub2Zmc2V0ID0gc3Vicy0+bWF4cGFja3NpemUgKiBwYWNrOwogCQkJCXVyYi0+aXNvX2Zy YW1lX2Rlc2NbcGFja10ubGVuZ3RoID0gc3Vicy0+bWF4cGFja3NpemU7CiAJCQl9Ci0JCQl1cmIt PnRyYW5zZmVyX2J1ZmZlcl9sZW5ndGggPSBzdWJzLT5tYXhwYWNrc2l6ZSAqIG5yX29mX3BhY2tz KCk7IAogCQkJaWYgKChlcnIgPSB1c2Jfc3VibWl0X3VyYih1cmIsIEdGUF9BVE9NSUMpKSA8IDAp IHsKIAkJCQlzbmRfcHJpbnRrIChLRVJOX0VSUiAiY2Fubm90IHN1Ym1pdCBkYXRhcGlwZSBmb3Ig dXJiICVkLCBlcnIgPSAlZFxuIiwgaSwgZXJyKTsKIAkJCQllcnIgPSAtRVBJUEU7Cg== From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sebastian Andrzej Siewior Subject: Re: [PATCH 8/9] ALSA: usx2y: usbusx2yaudio: use usb_fill_int_urb() Date: Wed, 20 Jun 2018 17:47:01 +0200 Message-ID: <20180620154701.i4zgeram6i2gxps6@linutronix.de> References: <20180619215521.13688-1-bigeasy@linutronix.de> <20180619215521.13688-9-bigeasy@linutronix.de> <20180620143922.nkcazvbcrmkyvm2c@linutronix.de> <20180620153844.zayxlivlroqs2oaw@linutronix.de> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from Galois.linutronix.de (galois.linutronix.de [146.0.238.70]) by alsa0.perex.cz (Postfix) with ESMTP id D730F266D4C for ; Wed, 20 Jun 2018 17:47:02 +0200 (CEST) Content-Disposition: inline In-Reply-To: <20180620153844.zayxlivlroqs2oaw@linutronix.de> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org To: Takashi Iwai Cc: alsa-devel@alsa-project.org, linux-usb@vger.kernel.org, tglx@linutronix.de List-Id: alsa-devel@alsa-project.org On 2018-06-20 17:38:44 [+0200], To Takashi Iwai wrote: > okay, as you wish: I'm sorry, I compiled one patch and send the other. Here is the fixed one. > > thanks, > > > > Takashi > ----------- >8 Subject: [PATCH 8/9 v4] ALSA: usx2y: usbusx2yaudio: use usb_fill_int_urb() 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. The "&& !(*purb)->transfer_buffer" check has been removed because the URB has been freshly allocated a few lines above so ->transfer_buffer has to be NULL here. The `dev' and `transfer_size' assignments have been moved from usX2Y_urbs_start() to usX2Y_urbs_allocate() because they don't change overtime. The multiplication via check_mul_overflow() has been extracted from kmalloc_array() to avoid two multiplication (one with overflow check and one without for the length argument). This requires to change the type `maxpacksize' to int so there is only one type involved in the multiplication. Cc: Jaroslav Kysela Cc: Takashi Iwai Signed-off-by: Sebastian Andrzej Siewior --- sound/usb/usx2y/usbusx2yaudio.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/sound/usb/usx2y/usbusx2yaudio.c b/sound/usb/usx2y/usbusx2yaudio.c index 2b833054e3b0..de3a21444db3 100644 --- a/sound/usb/usx2y/usbusx2yaudio.c +++ b/sound/usb/usx2y/usbusx2yaudio.c @@ -425,6 +425,9 @@ static int usX2Y_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 = NULL; + int len = 0; + if (*purb) { usb_kill_urb(*purb); continue; @@ -434,22 +437,20 @@ static int usX2Y_urbs_allocate(struct snd_usX2Y_substream *subs) usX2Y_urbs_release(subs); return -ENOMEM; } - if (!is_playback && !(*purb)->transfer_buffer) { + + if (!is_playback) { /* allocate a capture buffer per urb */ - (*purb)->transfer_buffer = - kmalloc_array(subs->maxpacksize, - nr_of_packs(), GFP_KERNEL); - if (NULL == (*purb)->transfer_buffer) { + buf = kmalloc_array(subs->maxpacksize, nr_of_packs(), + GFP_KERNEL); + if (!buf) { usX2Y_urbs_release(subs); return -ENOMEM; } + len = subs->maxpacksize * nr_of_packs(); } - (*purb)->dev = dev; - (*purb)->pipe = pipe; + usb_fill_int_urb(*purb, dev, pipe, buf, len, + i_usX2Y_subs_startup, subs, 1); (*purb)->number_of_packets = nr_of_packs(); - (*purb)->context = subs; - (*purb)->interval = 1; - (*purb)->complete = i_usX2Y_subs_startup; } return 0; } @@ -485,12 +486,10 @@ static int usX2Y_urbs_start(struct snd_usX2Y_substream *subs) unsigned long pack; if (0 == i) atomic_set(&subs->state, state_STARTING3); - urb->dev = usX2Y->dev; for (pack = 0; pack < nr_of_packs(); pack++) { urb->iso_frame_desc[pack].offset = subs->maxpacksize * pack; urb->iso_frame_desc[pack].length = subs->maxpacksize; } - urb->transfer_buffer_length = subs->maxpacksize * nr_of_packs(); if ((err = usb_submit_urb(urb, GFP_ATOMIC)) < 0) { snd_printk (KERN_ERR "cannot submit datapipe for urb %d, err = %d\n", i, err); err = -EPIPE; -- 2.17.1