Skip to content

L
linux
Commit 74f93cf9 authored by Michelle Darcy's avatar Michelle Darcy Committed by Greg Kroah-Hartman
Browse files
Options

staging: davinci_vpfe: Align brackets to open parentheses 

Fixes checkpatch.pl CHECK: Alignment should match open parenthesis
Signed-off-by: default avatarMichelle Darcy <mdarcy137@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent dff94010
Hide whitespace changes
Inline Side-by-side
Showing with 31 additions and 31 deletions
drivers/staging/media/davinci_vpfe/dm365_ipipe.c
View file @ 74f93cf9
...@@ -62,7 +62,7 @@ static int ipipe_validate_lutdpc_params(struct vpfe_ipipe_lutdpc *lutdpc) ...@@ -62,7 +62,7 @@ static int ipipe_validate_lutdpc_params(struct vpfe_ipipe_lutdpc *lutdpc)
for (i = 0; i < lutdpc->dpc_size; i++) for (i = 0; i < lutdpc->dpc_size; i++)
if (lutdpc->table[i].horz_pos > LUT_DPC_H_POS_MASK || if (lutdpc->table[i].horz_pos > LUT_DPC_H_POS_MASK ||
lutdpc->table[i].vert_pos > LUT_DPC_V_POS_MASK) lutdpc->table[i].vert_pos > LUT_DPC_V_POS_MASK)
return -EINVAL; return -EINVAL;
return 0; return 0;
...@@ -102,7 +102,7 @@ static int ipipe_get_lutdpc_params(struct vpfe_ipipe_device *ipipe, void *param) ...@@ -102,7 +102,7 @@ static int ipipe_get_lutdpc_params(struct vpfe_ipipe_device *ipipe, void *param)
lut_param->repl_white = lutdpc->repl_white; lut_param->repl_white = lutdpc->repl_white;
lut_param->dpc_size = lutdpc->dpc_size; lut_param->dpc_size = lutdpc->dpc_size;
memcpy(&lut_param->table, &lutdpc->table, memcpy(&lut_param->table, &lutdpc->table,
(lutdpc->dpc_size * sizeof(struct vpfe_ipipe_lutdpc_entry))); (lutdpc->dpc_size * sizeof(struct vpfe_ipipe_lutdpc_entry)));
return 0; return 0;
} }
...@@ -491,7 +491,7 @@ ipipe_validate_rgb2rgb_params(struct vpfe_ipipe_rgb2rgb *rgb2rgb, ...@@ -491,7 +491,7 @@ ipipe_validate_rgb2rgb_params(struct vpfe_ipipe_rgb2rgb *rgb2rgb,
} }
static int ipipe_set_rgb2rgb_params(struct vpfe_ipipe_device *ipipe, static int ipipe_set_rgb2rgb_params(struct vpfe_ipipe_device *ipipe,
unsigned int id, void *param) unsigned int id, void *param)
{ {
struct vpfe_ipipe_rgb2rgb *rgb2rgb = &ipipe->config.rgb2rgb1; struct vpfe_ipipe_rgb2rgb *rgb2rgb = &ipipe->config.rgb2rgb1;
struct device *dev = ipipe->subdev.v4l2_dev->dev; struct device *dev = ipipe->subdev.v4l2_dev->dev;
...@@ -545,7 +545,7 @@ ipipe_set_rgb2rgb_2_params(struct vpfe_ipipe_device *ipipe, void *param) ...@@ -545,7 +545,7 @@ ipipe_set_rgb2rgb_2_params(struct vpfe_ipipe_device *ipipe, void *param)
} }
static int ipipe_get_rgb2rgb_params(struct vpfe_ipipe_device *ipipe, static int ipipe_get_rgb2rgb_params(struct vpfe_ipipe_device *ipipe,
unsigned int id, void *param) unsigned int id, void *param)
{ {
struct vpfe_ipipe_rgb2rgb *rgb2rgb = &ipipe->config.rgb2rgb1; struct vpfe_ipipe_rgb2rgb *rgb2rgb = &ipipe->config.rgb2rgb1;
struct vpfe_ipipe_rgb2rgb *rgb2rgb_param; struct vpfe_ipipe_rgb2rgb *rgb2rgb_param;
...@@ -775,44 +775,44 @@ ipipe_set_3d_lut_params(struct vpfe_ipipe_device *ipipe, void *param) ...@@ -775,44 +775,44 @@ ipipe_set_3d_lut_params(struct vpfe_ipipe_device *ipipe, void *param)
static int ipipe_validate_rgb2yuv_params(struct vpfe_ipipe_rgb2yuv *rgb2yuv) static int ipipe_validate_rgb2yuv_params(struct vpfe_ipipe_rgb2yuv *rgb2yuv)
{ {
if (rgb2yuv->coef_ry.decimal > RGB2YCBCR_COEF_DECI_MASK || if (rgb2yuv->coef_ry.decimal > RGB2YCBCR_COEF_DECI_MASK ||
rgb2yuv->coef_ry.integer > RGB2YCBCR_COEF_INT_MASK) rgb2yuv->coef_ry.integer > RGB2YCBCR_COEF_INT_MASK)
return -EINVAL; return -EINVAL;
if (rgb2yuv->coef_gy.decimal > RGB2YCBCR_COEF_DECI_MASK || if (rgb2yuv->coef_gy.decimal > RGB2YCBCR_COEF_DECI_MASK ||
rgb2yuv->coef_gy.integer > RGB2YCBCR_COEF_INT_MASK) rgb2yuv->coef_gy.integer > RGB2YCBCR_COEF_INT_MASK)
return -EINVAL; return -EINVAL;
if (rgb2yuv->coef_by.decimal > RGB2YCBCR_COEF_DECI_MASK || if (rgb2yuv->coef_by.decimal > RGB2YCBCR_COEF_DECI_MASK ||
rgb2yuv->coef_by.integer > RGB2YCBCR_COEF_INT_MASK) rgb2yuv->coef_by.integer > RGB2YCBCR_COEF_INT_MASK)
return -EINVAL; return -EINVAL;
if (rgb2yuv->coef_rcb.decimal > RGB2YCBCR_COEF_DECI_MASK || if (rgb2yuv->coef_rcb.decimal > RGB2YCBCR_COEF_DECI_MASK ||
rgb2yuv->coef_rcb.integer > RGB2YCBCR_COEF_INT_MASK) rgb2yuv->coef_rcb.integer > RGB2YCBCR_COEF_INT_MASK)
return -EINVAL; return -EINVAL;
if (rgb2yuv->coef_gcb.decimal > RGB2YCBCR_COEF_DECI_MASK || if (rgb2yuv->coef_gcb.decimal > RGB2YCBCR_COEF_DECI_MASK ||
rgb2yuv->coef_gcb.integer > RGB2YCBCR_COEF_INT_MASK) rgb2yuv->coef_gcb.integer > RGB2YCBCR_COEF_INT_MASK)
return -EINVAL; return -EINVAL;
if (rgb2yuv->coef_bcb.decimal > RGB2YCBCR_COEF_DECI_MASK || if (rgb2yuv->coef_bcb.decimal > RGB2YCBCR_COEF_DECI_MASK ||
rgb2yuv->coef_bcb.integer > RGB2YCBCR_COEF_INT_MASK) rgb2yuv->coef_bcb.integer > RGB2YCBCR_COEF_INT_MASK)
return -EINVAL; return -EINVAL;
if (rgb2yuv->coef_rcr.decimal > RGB2YCBCR_COEF_DECI_MASK || if (rgb2yuv->coef_rcr.decimal > RGB2YCBCR_COEF_DECI_MASK ||
rgb2yuv->coef_rcr.integer > RGB2YCBCR_COEF_INT_MASK) rgb2yuv->coef_rcr.integer > RGB2YCBCR_COEF_INT_MASK)
return -EINVAL; return -EINVAL;
if (rgb2yuv->coef_gcr.decimal > RGB2YCBCR_COEF_DECI_MASK || if (rgb2yuv->coef_gcr.decimal > RGB2YCBCR_COEF_DECI_MASK ||
rgb2yuv->coef_gcr.integer > RGB2YCBCR_COEF_INT_MASK) rgb2yuv->coef_gcr.integer > RGB2YCBCR_COEF_INT_MASK)
return -EINVAL; return -EINVAL;
if (rgb2yuv->coef_bcr.decimal > RGB2YCBCR_COEF_DECI_MASK || if (rgb2yuv->coef_bcr.decimal > RGB2YCBCR_COEF_DECI_MASK ||
rgb2yuv->coef_bcr.integer > RGB2YCBCR_COEF_INT_MASK) rgb2yuv->coef_bcr.integer > RGB2YCBCR_COEF_INT_MASK)
return -EINVAL; return -EINVAL;
if (rgb2yuv->out_ofst_y > RGB2YCBCR_OFST_MASK || if (rgb2yuv->out_ofst_y > RGB2YCBCR_OFST_MASK ||
rgb2yuv->out_ofst_cb > RGB2YCBCR_OFST_MASK || rgb2yuv->out_ofst_cb > RGB2YCBCR_OFST_MASK ||
rgb2yuv->out_ofst_cr > RGB2YCBCR_OFST_MASK) rgb2yuv->out_ofst_cr > RGB2YCBCR_OFST_MASK)
return -EINVAL; return -EINVAL;
return 0; return 0;
...@@ -918,7 +918,7 @@ static int ipipe_get_gbce_params(struct vpfe_ipipe_device *ipipe, void *param) ...@@ -918,7 +918,7 @@ static int ipipe_get_gbce_params(struct vpfe_ipipe_device *ipipe, void *param)
gbce_param->type = gbce->type; gbce_param->type = gbce->type;
memcpy(gbce_param->table, gbce->table, memcpy(gbce_param->table, gbce->table,
(VPFE_IPIPE_MAX_SIZE_GBCE_LUT * sizeof(unsigned short))); (VPFE_IPIPE_MAX_SIZE_GBCE_LUT * sizeof(unsigned short)));
return 0; return 0;
} }
...@@ -945,7 +945,7 @@ ipipe_set_yuv422_conv_params(struct vpfe_ipipe_device *ipipe, void *param) ...@@ -945,7 +945,7 @@ ipipe_set_yuv422_conv_params(struct vpfe_ipipe_device *ipipe, void *param)
yuv422_conv->chrom_pos = VPFE_IPIPE_YUV422_CHR_POS_COSITE; yuv422_conv->chrom_pos = VPFE_IPIPE_YUV422_CHR_POS_COSITE;
} else { } else {
memcpy(yuv422_conv, yuv422_conv_param, memcpy(yuv422_conv, yuv422_conv_param,
sizeof(struct vpfe_ipipe_yuv422_conv)); sizeof(struct vpfe_ipipe_yuv422_conv));
if (ipipe_validate_yuv422_conv_params(yuv422_conv) < 0) { if (ipipe_validate_yuv422_conv_params(yuv422_conv) < 0) {
dev_err(dev, "Invalid yuv422 params\n"); dev_err(dev, "Invalid yuv422 params\n");
return -EINVAL; return -EINVAL;
...@@ -1382,7 +1382,7 @@ static int ipipe_set_stream(struct v4l2_subdev *sd, int enable) ...@@ -1382,7 +1382,7 @@ static int ipipe_set_stream(struct v4l2_subdev *sd, int enable)
struct vpfe_device *vpfe_dev = to_vpfe_device(ipipe); struct vpfe_device *vpfe_dev = to_vpfe_device(ipipe);
if (enable && ipipe->input != IPIPE_INPUT_NONE && if (enable && ipipe->input != IPIPE_INPUT_NONE &&
ipipe->output != IPIPE_OUTPUT_NONE) { ipipe->output != IPIPE_OUTPUT_NONE) {
if (config_ipipe_hw(ipipe) < 0) if (config_ipipe_hw(ipipe) < 0)
return -EINVAL; return -EINVAL;
} }
...@@ -1402,8 +1402,8 @@ static int ipipe_set_stream(struct v4l2_subdev *sd, int enable) ...@@ -1402,8 +1402,8 @@ static int ipipe_set_stream(struct v4l2_subdev *sd, int enable)
*/ */
static struct v4l2_mbus_framefmt * static struct v4l2_mbus_framefmt *
__ipipe_get_format(struct vpfe_ipipe_device *ipipe, __ipipe_get_format(struct vpfe_ipipe_device *ipipe,
struct v4l2_subdev_pad_config *cfg, unsigned int pad, struct v4l2_subdev_pad_config *cfg, unsigned int pad,
enum v4l2_subdev_format_whence which) enum v4l2_subdev_format_whence which)
{ {
if (which == V4L2_SUBDEV_FORMAT_TRY) if (which == V4L2_SUBDEV_FORMAT_TRY)
return v4l2_subdev_get_try_format(&ipipe->subdev, cfg, pad); return v4l2_subdev_get_try_format(&ipipe->subdev, cfg, pad);
...@@ -1421,9 +1421,9 @@ __ipipe_get_format(struct vpfe_ipipe_device *ipipe, ...@@ -1421,9 +1421,9 @@ __ipipe_get_format(struct vpfe_ipipe_device *ipipe,
*/ */
static void static void
ipipe_try_format(struct vpfe_ipipe_device *ipipe, ipipe_try_format(struct vpfe_ipipe_device *ipipe,
struct v4l2_subdev_pad_config *cfg, unsigned int pad, struct v4l2_subdev_pad_config *cfg, unsigned int pad,
struct v4l2_mbus_framefmt *fmt, struct v4l2_mbus_framefmt *fmt,
enum v4l2_subdev_format_whence which) enum v4l2_subdev_format_whence which)
{ {
unsigned int max_out_height; unsigned int max_out_height;
unsigned int max_out_width; unsigned int max_out_width;
...@@ -1463,7 +1463,7 @@ ipipe_try_format(struct vpfe_ipipe_device *ipipe, ...@@ -1463,7 +1463,7 @@ ipipe_try_format(struct vpfe_ipipe_device *ipipe,
*/ */
static int static int
ipipe_set_format(struct v4l2_subdev *sd, struct v4l2_subdev_pad_config *cfg, ipipe_set_format(struct v4l2_subdev *sd, struct v4l2_subdev_pad_config *cfg,
struct v4l2_subdev_format *fmt) struct v4l2_subdev_format *fmt)
{ {
struct vpfe_ipipe_device *ipipe = v4l2_get_subdevdata(sd); struct vpfe_ipipe_device *ipipe = v4l2_get_subdevdata(sd);
struct v4l2_mbus_framefmt *format; struct v4l2_mbus_framefmt *format;
...@@ -1479,11 +1479,11 @@ ipipe_set_format(struct v4l2_subdev *sd, struct v4l2_subdev_pad_config *cfg, ...@@ -1479,11 +1479,11 @@ ipipe_set_format(struct v4l2_subdev *sd, struct v4l2_subdev_pad_config *cfg,
return 0; return 0;
if (fmt->pad == IPIPE_PAD_SINK && if (fmt->pad == IPIPE_PAD_SINK &&
(ipipe->input == IPIPE_INPUT_CCDC || (ipipe->input == IPIPE_INPUT_CCDC ||
ipipe->input == IPIPE_INPUT_MEMORY)) ipipe->input == IPIPE_INPUT_MEMORY))
ipipe->formats[fmt->pad] = fmt->format; ipipe->formats[fmt->pad] = fmt->format;
else if (fmt->pad == IPIPE_PAD_SOURCE && else if (fmt->pad == IPIPE_PAD_SOURCE &&
ipipe->output == IPIPE_OUTPUT_RESIZER) ipipe->output == IPIPE_OUTPUT_RESIZER)
ipipe->formats[fmt->pad] = fmt->format; ipipe->formats[fmt->pad] = fmt->format;
else else
return -EINVAL; return -EINVAL;
...@@ -1499,7 +1499,7 @@ ipipe_set_format(struct v4l2_subdev *sd, struct v4l2_subdev_pad_config *cfg, ...@@ -1499,7 +1499,7 @@ ipipe_set_format(struct v4l2_subdev *sd, struct v4l2_subdev_pad_config *cfg,
*/ */
static int static int
ipipe_get_format(struct v4l2_subdev *sd, struct v4l2_subdev_pad_config *cfg, ipipe_get_format(struct v4l2_subdev *sd, struct v4l2_subdev_pad_config *cfg,
struct v4l2_subdev_format *fmt) struct v4l2_subdev_format *fmt)
{ {
struct vpfe_ipipe_device *ipipe = v4l2_get_subdevdata(sd); struct vpfe_ipipe_device *ipipe = v4l2_get_subdevdata(sd);
...@@ -1519,8 +1519,8 @@ ipipe_get_format(struct v4l2_subdev *sd, struct v4l2_subdev_pad_config *cfg, ...@@ -1519,8 +1519,8 @@ ipipe_get_format(struct v4l2_subdev *sd, struct v4l2_subdev_pad_config *cfg,
*/ */
static int static int
ipipe_enum_frame_size(struct v4l2_subdev *sd, ipipe_enum_frame_size(struct v4l2_subdev *sd,
struct v4l2_subdev_pad_config *cfg, struct v4l2_subdev_pad_config *cfg,
struct v4l2_subdev_frame_size_enum *fse) struct v4l2_subdev_frame_size_enum *fse)
{ {
struct vpfe_ipipe_device *ipipe = v4l2_get_subdevdata(sd); struct vpfe_ipipe_device *ipipe = v4l2_get_subdevdata(sd);
struct v4l2_mbus_framefmt format; struct v4l2_mbus_framefmt format;
...@@ -1687,7 +1687,7 @@ static const struct v4l2_subdev_ops ipipe_v4l2_ops = { ...@@ -1687,7 +1687,7 @@ static const struct v4l2_subdev_ops ipipe_v4l2_ops = {
*/ */
static int static int
ipipe_link_setup(struct media_entity *entity, const struct media_pad *local, ipipe_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 v4l2_subdev *sd = media_entity_to_v4l2_subdev(entity);
struct vpfe_ipipe_device *ipipe = v4l2_get_subdevdata(sd); struct vpfe_ipipe_device *ipipe = v4l2_get_subdevdata(sd);
...@@ -1749,7 +1749,7 @@ void vpfe_ipipe_unregister_entities(struct vpfe_ipipe_device *vpfe_ipipe) ...@@ -1749,7 +1749,7 @@ void vpfe_ipipe_unregister_entities(struct vpfe_ipipe_device *vpfe_ipipe)
*/ */
int int
vpfe_ipipe_register_entities(struct vpfe_ipipe_device *ipipe, vpfe_ipipe_register_entities(struct vpfe_ipipe_device *ipipe,
struct v4l2_device *vdev) struct v4l2_device *vdev)
{ {
int ret; int ret;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7