staging: media: davinci_vpfe: Fix various warnings
Subsystems (2)
cover staging: media: davinci_vpfe: Fix various warnings
This series fix the following warnings:
-Fix comparison to NULL
-Change multiple line dereference into a single line -Fix alignment warnings
Daniela Mormocea (3):
Fix comparison to NULL
Fix multiple line dereference
Fix alignment issues
drivers/staging/media/davinci_vpfe/dm365_ipipeif.c | 23 +++++++++++----------- 1 file changed, 11 insertions(+), 12 deletions(-)
Signature · 1 line
2.7.4
PATCH 1/3 staging: media: davinci_vpfe: Fix comparison to NULL
Replace comparison to NULL with '!' operator
Signed-off-by Daniela Mormocea <[email protected]>
--- drivers/staging/media/davinci_vpfe/dm365_ipipeif.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/media/davinci_vpfe/dm365_ipipeif.c +1 -1
@@ -703,7 +703,7 @@ ipipeif_set_format(struct v4l2_subdev *sd, struct v4l2_subdev_pad_config *cfg,struct v4l2_mbus_framefmt *format; format =__ipipeif_get_format (ipipeif, cfg, fmt->pad, fmt->which); -if (format ==NULL ) +if (!format)return -EINVAL ;ipipeif_try_format (ipipeif, cfg, fmt->pad, &fmt->format, fmt->which);
Signature · 1 line
2.7.4
PATCH 2/3 staging: media: davinci_vpfe: Fix multiple line dereference
In reply to Daniela MormoceaFix multiple line dereference to improve readability and avoid checkpatch warning
Signed-off-by Daniela Mormocea <[email protected]>
--- drivers/staging/media/davinci_vpfe/dm365_ipipeif.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/staging/media/davinci_vpfe/dm365_ipipeif.c +1 -2
@@ -920,8 +920,7 @@ ipipeif_link_setup(struct media_entity *entity, const struct media_pad *local,if (remote->entity == &vpfe->vpfe_ipipe.subdev.entity)/* connencted to ipipe */ ipipeif->output =IPIPEIF_OUTPUT_IPIPE ; -else if (remote->entity == &vpfe->vpfe_resizer. - crop_resizer.subdev.entity) +else if (remote->entity == &vpfe->vpfe_resizer.crop_resizer.subdev.entity)/* connected to resizer */ ipipeif->output =IPIPEIF_OUTPUT_RESIZER ;else
Signature · 1 line
2.7.4
PATCH 3/3 staging: media: davinci_vpfe: Fix alignment issues
In reply to Daniela MormoceaFix all the alignment issues in the file to
get rid of checkpatch warnings
Signed-off-by Daniela Mormocea <[email protected]>
--- drivers/staging/media/davinci_vpfe/dm365_ipipeif.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
drivers/staging/media/davinci_vpfe/dm365_ipipeif.c +9 -9
@@ -104,7 +104,7 @@ ipipeif_get_cfg_src1(struct vpfe_ipipeif_device *ipipeif) informat = &ipipeif->formats[IPIPEIF_PAD_SINK ];if (ipipeif->input ==IPIPEIF_INPUT_MEMORY && - (informat->code ==MEDIA_BUS_FMT_Y8_1X8 || + (informat->code ==MEDIA_BUS_FMT_Y8_1X8 || informat->code ==MEDIA_BUS_FMT_UV8_1X8 ))return IPIPEIF_CCDC ;
@@ -360,7 +360,7 @@ static int ipipeif_hw_setup(struct v4l2_subdev *sd)default :/* Bayer */ ipipeif_write (params.if_5_1.clip, ipipeif_base_addr, -IPIPEIF_OCLIP ); +IPIPEIF_OCLIP ); }ipipeif_write (val, ipipeif_base_addr,IPIPEIF_CFG2 );break ;
@@ -389,7 +389,7 @@ ipipeif_set_config(struct v4l2_subdev *sd, struct ipipeif_params *config) ipipeif->config.rsz = config->rsz; ipipeif->config.decimation = config->decimation;if (ipipeif->config.decimation && - (ipipeif->config.rsz <IPIPEIF_RSZ_MIN || + (ipipeif->config.rsz <IPIPEIF_RSZ_MIN || ipipeif->config.rsz >IPIPEIF_RSZ_MAX )) {dev_err (dev,"rsz range is %d to %d\n" ,IPIPEIF_RSZ_MIN ,IPIPEIF_RSZ_MAX );
@@ -580,7 +580,7 @@ static int ipipeif_enum_mbus_code(struct v4l2_subdev *sd,*/ static int ipipeif_get_format (struct v4l2_subdev *sd,struct v4l2_subdev_pad_config *cfg, -struct v4l2_subdev_format *fmt) +struct v4l2_subdev_format *fmt) {struct vpfe_ipipeif_device *ipipeif =v4l2_get_subdevdata (sd);
@@ -679,8 +679,8 @@ ipipeif_enum_frame_size(struct v4l2_subdev *sd,*/ static struct v4l2_mbus_framefmt *__ipipeif_get_format (struct vpfe_ipipeif_device *ipipeif, -struct v4l2_subdev_pad_config *cfg,unsigned int pad, -enum v4l2_subdev_format_whence which) +struct v4l2_subdev_pad_config *cfg,unsigned int pad, +enum v4l2_subdev_format_whence which) {if (which ==V4L2_SUBDEV_FORMAT_TRY )return v4l2_subdev_get_try_format (&ipipeif->subdev, cfg, pad);
@@ -697,7 +697,7 @@ __ipipeif_get_format(struct vpfe_ipipeif_device *ipipeif,*/ static int ipipeif_set_format (struct v4l2_subdev *sd,struct v4l2_subdev_pad_config *cfg, -struct v4l2_subdev_format *fmt) +struct v4l2_subdev_format *fmt) {struct vpfe_ipipeif_device *ipipeif =v4l2_get_subdevdata (sd);struct v4l2_mbus_framefmt *format;
@@ -879,7 +879,7 @@ static const struct vpfe_video_operations video_in_ops = {static int ipipeif_link_setup (struct media_entity *entity,const struct media_pad *local, -const struct media_pad *remote,u32 flags) +const struct media_pad *remote,u32 flags) {struct v4l2_subdev *sd =media_entity_to_v4l2_subdev (entity);struct vpfe_ipipeif_device *ipipeif =v4l2_get_subdevdata (sd);
@@ -975,7 +975,7 @@ vpfe_ipipeif_register_entities(struct vpfe_ipipeif_device *ipipeif, flags =0 ; ret =media_create_pad_link (&ipipeif->video_in.video_dev.entity,0 , - &ipipeif->subdev.entity,0 , flags); + &ipipeif->subdev.entity,0 , flags);if (ret <0 ) goto fail;
Signature · 1 line
2.7.4