Commit f4229204 authored by Arushi Singhal's avatar Arushi Singhal Committed by Mauro Carvalho Chehab

media: staging: media: davinci_vpfe: Replace a bit shift

This patch replaces bit shifting on 1 with the BIT(x) macro.
This was done with coccinelle:
@@
constant c;
@@

-1 << c
+BIT(c)

[mchehab+samsung@kernel.org: rebase on the top of upstream]
Signed-off-by: default avatarArushi Singhal <arushisinghal19971997@gmail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent 6995a659
...@@ -1040,7 +1040,7 @@ static int isp_stat_init_entities(struct ispstat *stat, const char *name, ...@@ -1040,7 +1040,7 @@ static int isp_stat_init_entities(struct ispstat *stat, const char *name,
v4l2_subdev_init(subdev, sd_ops); v4l2_subdev_init(subdev, sd_ops);
snprintf(subdev->name, V4L2_SUBDEV_NAME_SIZE, "OMAP3 ISP %s", name); snprintf(subdev->name, V4L2_SUBDEV_NAME_SIZE, "OMAP3 ISP %s", name);
subdev->grp_id = 1 << 16; /* group ID for isp subdevs */ subdev->grp_id = BIT(16); /* group ID for isp subdevs */
subdev->flags |= V4L2_SUBDEV_FL_HAS_EVENTS | V4L2_SUBDEV_FL_HAS_DEVNODE; subdev->flags |= V4L2_SUBDEV_FL_HAS_EVENTS | V4L2_SUBDEV_FL_HAS_DEVNODE;
v4l2_set_subdevdata(subdev, stat); v4l2_set_subdevdata(subdev, stat);
......
...@@ -816,7 +816,7 @@ isif_config_dfc(struct vpfe_isif_device *isif, struct vpfe_isif_dfc *vdfc) ...@@ -816,7 +816,7 @@ isif_config_dfc(struct vpfe_isif_device *isif, struct vpfe_isif_dfc *vdfc)
/* Correct whole line or partial */ /* Correct whole line or partial */
if (vdfc->corr_whole_line) if (vdfc->corr_whole_line)
val |= 1 << ISIF_VDFC_CORR_WHOLE_LN_SHIFT; val |= BIT(ISIF_VDFC_CORR_WHOLE_LN_SHIFT);
/* level shift value */ /* level shift value */
val |= (vdfc->def_level_shift & ISIF_VDFC_LEVEL_SHFT_MASK) << val |= (vdfc->def_level_shift & ISIF_VDFC_LEVEL_SHFT_MASK) <<
...@@ -844,7 +844,7 @@ isif_config_dfc(struct vpfe_isif_device *isif, struct vpfe_isif_dfc *vdfc) ...@@ -844,7 +844,7 @@ isif_config_dfc(struct vpfe_isif_device *isif, struct vpfe_isif_dfc *vdfc)
val = isif_read(isif->isif_cfg.base_addr, DFCMEMCTL); val = isif_read(isif->isif_cfg.base_addr, DFCMEMCTL);
/* set DFCMARST and set DFCMWR */ /* set DFCMARST and set DFCMWR */
val |= 1 << ISIF_DFCMEMCTL_DFCMARST_SHIFT; val |= BIT(ISIF_DFCMEMCTL_DFCMARST_SHIFT);
val |= 1; val |= 1;
isif_write(isif->isif_cfg.base_addr, val, DFCMEMCTL); isif_write(isif->isif_cfg.base_addr, val, DFCMEMCTL);
...@@ -875,7 +875,7 @@ isif_config_dfc(struct vpfe_isif_device *isif, struct vpfe_isif_dfc *vdfc) ...@@ -875,7 +875,7 @@ isif_config_dfc(struct vpfe_isif_device *isif, struct vpfe_isif_dfc *vdfc)
} }
val = isif_read(isif->isif_cfg.base_addr, DFCMEMCTL); val = isif_read(isif->isif_cfg.base_addr, DFCMEMCTL);
/* clear DFCMARST and set DFCMWR */ /* clear DFCMARST and set DFCMWR */
val &= ~(1 << ISIF_DFCMEMCTL_DFCMARST_SHIFT); val &= ~BIT(ISIF_DFCMEMCTL_DFCMARST_SHIFT);
val |= 1; val |= 1;
isif_write(isif->isif_cfg.base_addr, val, DFCMEMCTL); isif_write(isif->isif_cfg.base_addr, val, DFCMEMCTL);
...@@ -1135,7 +1135,7 @@ static int isif_config_raw(struct v4l2_subdev *sd, int mode) ...@@ -1135,7 +1135,7 @@ static int isif_config_raw(struct v4l2_subdev *sd, int mode)
isif_write(isif->isif_cfg.base_addr, val, CGAMMAWD); isif_write(isif->isif_cfg.base_addr, val, CGAMMAWD);
/* Configure DPCM compression settings */ /* Configure DPCM compression settings */
if (params->v4l2_pix_fmt == V4L2_PIX_FMT_SGRBG10DPCM8) { if (params->v4l2_pix_fmt == V4L2_PIX_FMT_SGRBG10DPCM8) {
val = 1 << ISIF_DPCM_EN_SHIFT; val = BIT(ISIF_DPCM_EN_SHIFT);
val |= (params->dpcm_predictor & val |= (params->dpcm_predictor &
ISIF_DPCM_PREDICTOR_MASK) << ISIF_DPCM_PREDICTOR_SHIFT; ISIF_DPCM_PREDICTOR_MASK) << ISIF_DPCM_PREDICTOR_SHIFT;
} }
......
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