From patchwork Wed Jun 20 11:00:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Andrzej Siewior X-Patchwork-Id: 10477029 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 93CCC60230 for ; Wed, 20 Jun 2018 11:02:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8479728AD7 for ; Wed, 20 Jun 2018 11:02:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 792F928C69; Wed, 20 Jun 2018 11:02:56 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2BF3828AD7 for ; Wed, 20 Jun 2018 11:02:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754104AbeFTLBa (ORCPT ); Wed, 20 Jun 2018 07:01:30 -0400 Received: from Galois.linutronix.de ([146.0.238.70]:59889 "EHLO Galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753893AbeFTLB1 (ORCPT ); Wed, 20 Jun 2018 07:01:27 -0400 Received: from localhost ([127.0.0.1] helo=bazinga.breakpoint.cc) by Galois.linutronix.de with esmtp (Exim 4.80) (envelope-from ) id 1fVarb-0003m6-NF; Wed, 20 Jun 2018 13:01:23 +0200 From: Sebastian Andrzej Siewior To: linux-media@vger.kernel.org Cc: Mauro Carvalho Chehab , linux-usb@vger.kernel.org, tglx@linutronix.de, Sebastian Andrzej Siewior Subject: [PATCH 03/27] media: cx231xx: use usb_fill_XXX_urb() Date: Wed, 20 Jun 2018 13:00:41 +0200 Message-Id: <20180620110105.19955-4-bigeasy@linutronix.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180620110105.19955-1-bigeasy@linutronix.de> References: <20180620110105.19955-1-bigeasy@linutronix.de> MIME-Version: 1.0 Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Using usb_fill_XXX_urb() helps to find code which initializes an URB. A grep for members of the struct (like ->complete) reveal lots of other things, too. Cc: Mauro Carvalho Chehab Signed-off-by: Sebastian Andrzej Siewior --- drivers/media/usb/cx231xx/cx231xx-audio.c | 30 ++++++++--------------- 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/drivers/media/usb/cx231xx/cx231xx-audio.c b/drivers/media/usb/cx231xx/cx231xx-audio.c index c4a84fb930b6..5d7a0c085902 100644 --- a/drivers/media/usb/cx231xx/cx231xx-audio.c +++ b/drivers/media/usb/cx231xx/cx231xx-audio.c @@ -281,6 +281,7 @@ static int cx231xx_init_audio_isoc(struct cx231xx *dev) for (i = 0; i < CX231XX_AUDIO_BUFS; i++) { struct urb *urb; int j, k; + unsigned int pipe; dev->adev.transfer_buffer[i] = kmalloc(sb_size, GFP_ATOMIC); if (!dev->adev.transfer_buffer[i]) @@ -295,17 +296,12 @@ static int cx231xx_init_audio_isoc(struct cx231xx *dev) } return -ENOMEM; } - - urb->dev = dev->udev; - urb->context = dev; - urb->pipe = usb_rcvisocpipe(dev->udev, - dev->adev.end_point_addr); + pipe = usb_rcvisocpipe(dev->udev, dev->adev.end_point_addr); + usb_fill_int_urb(urb, dev->udev, pipe, + dev->adev.transfer_buffer[i], sb_size, + cx231xx_audio_isocirq, dev, 1); urb->transfer_flags = URB_ISO_ASAP; - urb->transfer_buffer = dev->adev.transfer_buffer[i]; - urb->interval = 1; - urb->complete = cx231xx_audio_isocirq; urb->number_of_packets = CX231XX_ISO_NUM_AUDIO_PACKETS; - urb->transfer_buffer_length = sb_size; for (j = k = 0; j < CX231XX_ISO_NUM_AUDIO_PACKETS; j++, k += dev->adev.max_pkt_size) { @@ -356,18 +352,12 @@ static int cx231xx_init_audio_bulk(struct cx231xx *dev) } return -ENOMEM; } - - urb->dev = dev->udev; - urb->context = dev; - urb->pipe = usb_rcvbulkpipe(dev->udev, - dev->adev.end_point_addr); - urb->transfer_flags = 0; - urb->transfer_buffer = dev->adev.transfer_buffer[i]; - urb->complete = cx231xx_audio_bulkirq; - urb->transfer_buffer_length = sb_size; - + usb_fill_bulk_urb(urb, dev->udev, + usb_rcvbulkpipe(dev->udev, + dev->adev.end_point_addr), + dev->adev.transfer_buffer[i], sb_size, + cx231xx_audio_bulkirq, dev); dev->adev.urb[i] = urb; - } for (i = 0; i < CX231XX_AUDIO_BUFS; i++) {