提交 7eb95877 编写于 作者: N Niklas Söderlund 提交者: Mauro Carvalho Chehab

[media] rcar-vin: fix indentation errors in rcar-v4l2.c

Fix broken indentations and line breaks.
Signed-off-by: NNiklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Signed-off-by: NHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: NMauro Carvalho Chehab <mchehab@s-opensource.com>
上级 0d1c7d60
...@@ -93,9 +93,9 @@ static u32 rvin_format_sizeimage(struct v4l2_pix_format *pix) ...@@ -93,9 +93,9 @@ static u32 rvin_format_sizeimage(struct v4l2_pix_format *pix)
*/ */
static int __rvin_try_format_source(struct rvin_dev *vin, static int __rvin_try_format_source(struct rvin_dev *vin,
u32 which, u32 which,
struct v4l2_pix_format *pix, struct v4l2_pix_format *pix,
struct rvin_source_fmt *source) struct rvin_source_fmt *source)
{ {
struct v4l2_subdev *sd; struct v4l2_subdev *sd;
struct v4l2_subdev_pad_config *pad_cfg; struct v4l2_subdev_pad_config *pad_cfg;
...@@ -133,9 +133,9 @@ static int __rvin_try_format_source(struct rvin_dev *vin, ...@@ -133,9 +133,9 @@ static int __rvin_try_format_source(struct rvin_dev *vin,
} }
static int __rvin_try_format(struct rvin_dev *vin, static int __rvin_try_format(struct rvin_dev *vin,
u32 which, u32 which,
struct v4l2_pix_format *pix, struct v4l2_pix_format *pix,
struct rvin_source_fmt *source) struct rvin_source_fmt *source)
{ {
const struct rvin_video_format *info; const struct rvin_video_format *info;
u32 rwidth, rheight, walign; u32 rwidth, rheight, walign;
...@@ -219,7 +219,7 @@ static int rvin_try_fmt_vid_cap(struct file *file, void *priv, ...@@ -219,7 +219,7 @@ static int rvin_try_fmt_vid_cap(struct file *file, void *priv,
struct rvin_source_fmt source; struct rvin_source_fmt source;
return __rvin_try_format(vin, V4L2_SUBDEV_FORMAT_TRY, &f->fmt.pix, return __rvin_try_format(vin, V4L2_SUBDEV_FORMAT_TRY, &f->fmt.pix,
&source); &source);
} }
static int rvin_s_fmt_vid_cap(struct file *file, void *priv, static int rvin_s_fmt_vid_cap(struct file *file, void *priv,
...@@ -233,7 +233,7 @@ static int rvin_s_fmt_vid_cap(struct file *file, void *priv, ...@@ -233,7 +233,7 @@ static int rvin_s_fmt_vid_cap(struct file *file, void *priv,
return -EBUSY; return -EBUSY;
ret = __rvin_try_format(vin, V4L2_SUBDEV_FORMAT_ACTIVE, &f->fmt.pix, ret = __rvin_try_format(vin, V4L2_SUBDEV_FORMAT_ACTIVE, &f->fmt.pix,
&source); &source);
if (ret) if (ret)
return ret; return ret;
...@@ -334,8 +334,8 @@ static int rvin_s_selection(struct file *file, void *fh, ...@@ -334,8 +334,8 @@ static int rvin_s_selection(struct file *file, void *fh,
vin->crop = s->r = r; vin->crop = s->r = r;
vin_dbg(vin, "Cropped %dx%d@%d:%d of %dx%d\n", vin_dbg(vin, "Cropped %dx%d@%d:%d of %dx%d\n",
r.width, r.height, r.left, r.top, r.width, r.height, r.left, r.top,
vin->source.width, vin->source.height); vin->source.width, vin->source.height);
break; break;
case V4L2_SEL_TGT_COMPOSE: case V4L2_SEL_TGT_COMPOSE:
/* Make sure compose rect fits inside output format */ /* Make sure compose rect fits inside output format */
...@@ -359,8 +359,8 @@ static int rvin_s_selection(struct file *file, void *fh, ...@@ -359,8 +359,8 @@ static int rvin_s_selection(struct file *file, void *fh,
vin->compose = s->r = r; vin->compose = s->r = r;
vin_dbg(vin, "Compose %dx%d@%d:%d in %dx%d\n", vin_dbg(vin, "Compose %dx%d@%d:%d in %dx%d\n",
r.width, r.height, r.left, r.top, r.width, r.height, r.left, r.top,
vin->format.width, vin->format.height); vin->format.width, vin->format.height);
break; break;
default: default:
return -EINVAL; return -EINVAL;
...@@ -483,7 +483,7 @@ static int rvin_subscribe_event(struct v4l2_fh *fh, ...@@ -483,7 +483,7 @@ static int rvin_subscribe_event(struct v4l2_fh *fh,
} }
static int rvin_enum_dv_timings(struct file *file, void *priv_fh, static int rvin_enum_dv_timings(struct file *file, void *priv_fh,
struct v4l2_enum_dv_timings *timings) struct v4l2_enum_dv_timings *timings)
{ {
struct rvin_dev *vin = video_drvdata(file); struct rvin_dev *vin = video_drvdata(file);
struct v4l2_subdev *sd = vin_to_source(vin); struct v4l2_subdev *sd = vin_to_source(vin);
...@@ -500,14 +500,13 @@ static int rvin_enum_dv_timings(struct file *file, void *priv_fh, ...@@ -500,14 +500,13 @@ static int rvin_enum_dv_timings(struct file *file, void *priv_fh,
} }
static int rvin_s_dv_timings(struct file *file, void *priv_fh, static int rvin_s_dv_timings(struct file *file, void *priv_fh,
struct v4l2_dv_timings *timings) struct v4l2_dv_timings *timings)
{ {
struct rvin_dev *vin = video_drvdata(file); struct rvin_dev *vin = video_drvdata(file);
struct v4l2_subdev *sd = vin_to_source(vin); struct v4l2_subdev *sd = vin_to_source(vin);
int err; int err;
err = v4l2_subdev_call(sd, err = v4l2_subdev_call(sd, video, s_dv_timings, timings);
video, s_dv_timings, timings);
if (!err) { if (!err) {
vin->source.width = timings->bt.width; vin->source.width = timings->bt.width;
vin->source.height = timings->bt.height; vin->source.height = timings->bt.height;
...@@ -518,27 +517,25 @@ static int rvin_s_dv_timings(struct file *file, void *priv_fh, ...@@ -518,27 +517,25 @@ static int rvin_s_dv_timings(struct file *file, void *priv_fh,
} }
static int rvin_g_dv_timings(struct file *file, void *priv_fh, static int rvin_g_dv_timings(struct file *file, void *priv_fh,
struct v4l2_dv_timings *timings) struct v4l2_dv_timings *timings)
{ {
struct rvin_dev *vin = video_drvdata(file); struct rvin_dev *vin = video_drvdata(file);
struct v4l2_subdev *sd = vin_to_source(vin); struct v4l2_subdev *sd = vin_to_source(vin);
return v4l2_subdev_call(sd, return v4l2_subdev_call(sd, video, g_dv_timings, timings);
video, g_dv_timings, timings);
} }
static int rvin_query_dv_timings(struct file *file, void *priv_fh, static int rvin_query_dv_timings(struct file *file, void *priv_fh,
struct v4l2_dv_timings *timings) struct v4l2_dv_timings *timings)
{ {
struct rvin_dev *vin = video_drvdata(file); struct rvin_dev *vin = video_drvdata(file);
struct v4l2_subdev *sd = vin_to_source(vin); struct v4l2_subdev *sd = vin_to_source(vin);
return v4l2_subdev_call(sd, return v4l2_subdev_call(sd, video, query_dv_timings, timings);
video, query_dv_timings, timings);
} }
static int rvin_dv_timings_cap(struct file *file, void *priv_fh, static int rvin_dv_timings_cap(struct file *file, void *priv_fh,
struct v4l2_dv_timings_cap *cap) struct v4l2_dv_timings_cap *cap)
{ {
struct rvin_dev *vin = video_drvdata(file); struct rvin_dev *vin = video_drvdata(file);
struct v4l2_subdev *sd = vin_to_source(vin); struct v4l2_subdev *sd = vin_to_source(vin);
...@@ -825,8 +822,7 @@ int rvin_v4l2_probe(struct rvin_dev *vin) ...@@ -825,8 +822,7 @@ int rvin_v4l2_probe(struct rvin_dev *vin)
vin->src_pad_idx = 0; vin->src_pad_idx = 0;
#if defined(CONFIG_MEDIA_CONTROLLER) #if defined(CONFIG_MEDIA_CONTROLLER)
for (pad_idx = 0; pad_idx < sd->entity.num_pads; pad_idx++) for (pad_idx = 0; pad_idx < sd->entity.num_pads; pad_idx++)
if (sd->entity.pads[pad_idx].flags if (sd->entity.pads[pad_idx].flags == MEDIA_PAD_FL_SOURCE)
== MEDIA_PAD_FL_SOURCE)
break; break;
if (pad_idx >= sd->entity.num_pads) if (pad_idx >= sd->entity.num_pads)
return -EINVAL; return -EINVAL;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册