From patchwork Wed Nov 2 13:23:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Niklas_S=C3=B6derlund?= X-Patchwork-Id: 9409073 X-Patchwork-Delegate: geert@linux-m68k.org 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 42F246022E for ; Wed, 2 Nov 2016 13:29:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 30E272A17B for ; Wed, 2 Nov 2016 13:29:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 25D5E2A180; Wed, 2 Nov 2016 13:29:44 +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=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham 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 A401D2A17B for ; Wed, 2 Nov 2016 13:29:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754472AbcKBN3m (ORCPT ); Wed, 2 Nov 2016 09:29:42 -0400 Received: from smtp-4.sys.kth.se ([130.237.48.193]:49472 "EHLO smtp-4.sys.kth.se" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754269AbcKBN3k (ORCPT ); Wed, 2 Nov 2016 09:29:40 -0400 Received: from smtp-4.sys.kth.se (localhost.localdomain [127.0.0.1]) by smtp-4.sys.kth.se (Postfix) with ESMTP id 2FFD4321E; Wed, 2 Nov 2016 14:29:39 +0100 (CET) X-Virus-Scanned: by amavisd-new at kth.se Received: from smtp-4.sys.kth.se ([127.0.0.1]) by smtp-4.sys.kth.se (smtp-4.sys.kth.se [127.0.0.1]) (amavisd-new, port 10024) with LMTP id vXuKqNcfAYqs; Wed, 2 Nov 2016 14:29:38 +0100 (CET) X-KTH-Auth: niso [89.233.230.99] X-KTH-mail-from: niklas.soderlund+renesas@ragnatech.se Received: from bismarck.berto.se (unknown [89.233.230.99]) by smtp-4.sys.kth.se (Postfix) with ESMTPSA id 2CB9231A8; Wed, 2 Nov 2016 14:29:38 +0100 (CET) From: =?UTF-8?q?Niklas=20S=C3=B6derlund?= To: Laurent Pinchart , Hans Verkuil Cc: linux-media@vger.kernel.org, linux-renesas-soc@vger.kernel.org, tomoharu.fukawa.eb@renesas.com, Sakari Ailus , =?UTF-8?q?Niklas=20S=C3=B6derlund?= Subject: [PATCH 12/32] media: rcar-vin: split rvin_s_fmt_vid_cap() Date: Wed, 2 Nov 2016 14:23:09 +0100 Message-Id: <20161102132329.436-13-niklas.soderlund+renesas@ragnatech.se> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20161102132329.436-1-niklas.soderlund+renesas@ragnatech.se> References: <20161102132329.436-1-niklas.soderlund+renesas@ragnatech.se> MIME-Version: 1.0 Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The functionality provided by rvin_s_fmt_vid_cap() will be needed in other places to add Gen3 support. Split it up in a function which do the work and one which interface with the v4l2 API. Signed-off-by: Niklas Söderlund --- drivers/media/platform/rcar-vin/rcar-v4l2.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/drivers/media/platform/rcar-vin/rcar-v4l2.c b/drivers/media/platform/rcar-vin/rcar-v4l2.c index 51324c6..929f58b 100644 --- a/drivers/media/platform/rcar-vin/rcar-v4l2.c +++ b/drivers/media/platform/rcar-vin/rcar-v4l2.c @@ -313,10 +313,8 @@ static int rvin_try_fmt_vid_cap(struct file *file, void *priv, &source); } -static int rvin_s_fmt_vid_cap(struct file *file, void *priv, - struct v4l2_format *f) +static int __rvin_s_fmt_vid_cap(struct rvin_dev *vin, struct v4l2_format *f) { - struct rvin_dev *vin = video_drvdata(file); struct rvin_source_fmt source; int ret; @@ -338,6 +336,14 @@ static int rvin_s_fmt_vid_cap(struct file *file, void *priv, return 0; } +static int rvin_s_fmt_vid_cap(struct file *file, void *priv, + struct v4l2_format *f) +{ + struct rvin_dev *vin = video_drvdata(file); + + return __rvin_s_fmt_vid_cap(vin, f); +} + static int rvin_g_fmt_vid_cap(struct file *file, void *priv, struct v4l2_format *f) {