diff options
Diffstat (limited to 'drivers/staging/media/omap4iss/iss_ipipe.c')
| -rw-r--r-- | drivers/staging/media/omap4iss/iss_ipipe.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/drivers/staging/media/omap4iss/iss_ipipe.c b/drivers/staging/media/omap4iss/iss_ipipe.c index f94a59299..dd0abeffd 100644 --- a/drivers/staging/media/omap4iss/iss_ipipe.c +++ b/drivers/staging/media/omap4iss/iss_ipipe.c @@ -247,8 +247,8 @@ ipipe_try_format(struct iss_ipipe_device *ipipe, * return -EINVAL or zero on success */ static int ipipe_enum_mbus_code(struct v4l2_subdev *sd, - struct v4l2_subdev_pad_config *cfg, - struct v4l2_subdev_mbus_code_enum *code) + struct v4l2_subdev_pad_config *cfg, + struct v4l2_subdev_mbus_code_enum *code) { switch (code->pad) { case IPIPE_PAD_SINK: @@ -274,8 +274,8 @@ static int ipipe_enum_mbus_code(struct v4l2_subdev *sd, } static int ipipe_enum_frame_size(struct v4l2_subdev *sd, - struct v4l2_subdev_pad_config *cfg, - struct v4l2_subdev_frame_size_enum *fse) + struct v4l2_subdev_pad_config *cfg, + struct v4l2_subdev_frame_size_enum *fse) { struct iss_ipipe_device *ipipe = v4l2_get_subdevdata(sd); struct v4l2_mbus_framefmt format; @@ -320,7 +320,7 @@ static int ipipe_get_format(struct v4l2_subdev *sd, struct v4l2_mbus_framefmt *format; format = __ipipe_get_format(ipipe, cfg, fmt->pad, fmt->which); - if (format == NULL) + if (!format) return -EINVAL; fmt->format = *format; @@ -344,7 +344,7 @@ static int ipipe_set_format(struct v4l2_subdev *sd, struct v4l2_mbus_framefmt *format; format = __ipipe_get_format(ipipe, cfg, fmt->pad, fmt->which); - if (format == NULL) + if (!format) return -EINVAL; ipipe_try_format(ipipe, cfg, fmt->pad, &fmt->format, fmt->which); @@ -353,18 +353,18 @@ static int ipipe_set_format(struct v4l2_subdev *sd, /* Propagate the format from sink to source */ if (fmt->pad == IPIPE_PAD_SINK) { format = __ipipe_get_format(ipipe, cfg, IPIPE_PAD_SOURCE_VP, - fmt->which); + fmt->which); *format = fmt->format; ipipe_try_format(ipipe, cfg, IPIPE_PAD_SOURCE_VP, format, - fmt->which); + fmt->which); } return 0; } static int ipipe_link_validate(struct v4l2_subdev *sd, struct media_link *link, - struct v4l2_subdev_format *source_fmt, - struct v4l2_subdev_format *sink_fmt) + struct v4l2_subdev_format *source_fmt, + struct v4l2_subdev_format *sink_fmt) { /* Check if the two ends match */ if (source_fmt->format.width != sink_fmt->format.width || @@ -440,8 +440,8 @@ static const struct v4l2_subdev_internal_ops ipipe_v4l2_internal_ops = { * return -EINVAL or zero on success */ static int ipipe_link_setup(struct media_entity *entity, - const struct media_pad *local, - const struct media_pad *remote, u32 flags) + const struct media_pad *local, + const struct media_pad *remote, u32 flags) { struct v4l2_subdev *sd = media_entity_to_v4l2_subdev(entity); struct iss_ipipe_device *ipipe = v4l2_get_subdevdata(sd); @@ -528,7 +528,7 @@ void omap4iss_ipipe_unregister_entities(struct iss_ipipe_device *ipipe) } int omap4iss_ipipe_register_entities(struct iss_ipipe_device *ipipe, - struct v4l2_device *vdev) + struct v4l2_device *vdev) { int ret; |