From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from smtp-3.sys.kth.se ([130.237.48.192]:44333 "EHLO smtp-3.sys.kth.se" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751247AbdAaPuE (ORCPT ); Tue, 31 Jan 2017 10:50:04 -0500 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, Wolfram Sang , =?UTF-8?q?Niklas=20S=C3=B6derlund?= Subject: [PATCH 10/11] media: rcar-vin: split rvin_s_fmt_vid_cap() Date: Tue, 31 Jan 2017 16:40:15 +0100 Message-Id: <20170131154016.15526-11-niklas.soderlund+renesas@ragnatech.se> In-Reply-To: <20170131154016.15526-1-niklas.soderlund+renesas@ragnatech.se> References: <20170131154016.15526-1-niklas.soderlund+renesas@ragnatech.se> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-media-owner@vger.kernel.org List-ID: To support unbind and rebinding of subdevices rvin_s_fmt_vid_cap() needs to be called from with in the driver itself. Rename the function __rvin_s_fmt_vid_cap() and create a wrapper which can be used by vidioc_s_fmt_vid_cap. 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 51324c6d826f76ea..929f58b49b06154d 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) { -- 2.11.0