From patchwork Fri Jul 25 17:48:57 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Frank_Sch=C3=A4fer?= X-Patchwork-Id: 4625141 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id A8C3A9F38C for ; Fri, 25 Jul 2014 17:48:21 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DDDB320123 for ; Fri, 25 Jul 2014 17:48:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 10CEC201D5 for ; Fri, 25 Jul 2014 17:48:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935094AbaGYRsO (ORCPT ); Fri, 25 Jul 2014 13:48:14 -0400 Received: from mail-we0-f182.google.com ([74.125.82.182]:62828 "EHLO mail-we0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935088AbaGYRsL (ORCPT ); Fri, 25 Jul 2014 13:48:11 -0400 Received: by mail-we0-f182.google.com with SMTP id k48so4673828wev.27 for ; Fri, 25 Jul 2014 10:48:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=owQm9qgld21ZXwQwhun8PC0Y2ZO4IX9OFlf6xh+1Gjs=; b=Fl0GdDWarZy/6hHIxDLXKOQL73mgYDMx28H8BVmDsI7GcBLAL12q4r6ru8TU7Qvxhp 0T9QUJWXO2qUQqQziS1Fx30bJugvY6pqZumJF8SO22heInxViT9YGRjB/x2H5cYWKEN9 r/u4nTCMAv2/xUk9mHaXbOaYc35mTeE9+9UU8jQoTzw7SOLCOhHxm/yNVEKHkEhuMUxw jIxPEzSGlJTAo5rOI5fKSrnsZsDG+SUCrPvmeKu3qwJ9VEvzLwVwRjybhEWWb0OqlcAL kERdXTyZba+qGMendkE1HMb/iHfQWW6U2wclcLcD14NWFozTg43Yz7YOR6uE/O8wglCy iA/w== X-Received: by 10.194.92.244 with SMTP id cp20mr24045421wjb.109.1406310489215; Fri, 25 Jul 2014 10:48:09 -0700 (PDT) Received: from Athlon64X2-5000.lan (ip-178-201-166-251.hsi08.unitymediagroup.de. [178.201.166.251]) by mx.google.com with ESMTPSA id w5sm8480640wif.3.2014.07.25.10.48.07 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Jul 2014 10:48:08 -0700 (PDT) From: =?UTF-8?q?Frank=20Sch=C3=A4fer?= To: m.chehab@samsung.com Cc: hverkuil@xs4all.nl, linux-media@vger.kernel.org, =?UTF-8?q?Frank=20Sch=C3=A4fer?= Subject: [PATCH 3/4] em28xx-v4l: simplify em28xx_v4l2_open() by using v4l2_fh_open() Date: Fri, 25 Jul 2014 19:48:57 +0200 Message-Id: <1406310538-5001-4-git-send-email-fschaefer.oss@googlemail.com> X-Mailer: git-send-email 1.8.4.5 In-Reply-To: <1406310538-5001-1-git-send-email-fschaefer.oss@googlemail.com> References: <1406310538-5001-1-git-send-email-fschaefer.oss@googlemail.com> MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Instead of calling ... struct v4l2_fh *fh = kzalloc(sizeof(*fh), GFP_KERNEL); filp->private_data = fh; v4l2_fh_init(fh, vdev); v4l2_fh_add(fh); ... simply use function v4l2_fh_open() which does all of these calls for us. Signed-off-by: Frank Schäfer --- drivers/media/usb/em28xx/em28xx-video.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/drivers/media/usb/em28xx/em28xx-video.c b/drivers/media/usb/em28xx/em28xx-video.c index 4eb4a6a..3a7ec3b 100644 --- a/drivers/media/usb/em28xx/em28xx-video.c +++ b/drivers/media/usb/em28xx/em28xx-video.c @@ -1868,7 +1868,7 @@ static int em28xx_v4l2_open(struct file *filp) struct em28xx *dev = video_drvdata(filp); struct em28xx_v4l2 *v4l2 = dev->v4l2; enum v4l2_buf_type fh_type = 0; - struct v4l2_fh *fh; + int ret; switch (vdev->vfl_type) { case VFL_TYPE_GRABBER: @@ -1889,14 +1889,14 @@ static int em28xx_v4l2_open(struct file *filp) if (mutex_lock_interruptible(&dev->lock)) return -ERESTARTSYS; - fh = kzalloc(sizeof(struct v4l2_fh), GFP_KERNEL); - if (!fh) { - em28xx_errdev("em28xx-video.c: Out of memory?!\n"); + + ret = v4l2_fh_open(filp); + if (ret) { + em28xx_errdev("%s: v4l2_fh_open() returned error %d\n", + __func__, ret); mutex_unlock(&dev->lock); - return -ENOMEM; + return ret; } - v4l2_fh_init(fh, vdev); - filp->private_data = fh; if (v4l2->users == 0) { em28xx_set_mode(dev, EM28XX_ANALOG_MODE); @@ -1921,7 +1921,6 @@ static int em28xx_v4l2_open(struct file *filp) v4l2->users++; mutex_unlock(&dev->lock); - v4l2_fh_add(fh); return 0; }