Commit 79eab28d authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab

media: vpbe_venc: don't store return codes if they won't be used

Fix those two warnings

drivers/media/platform/davinci/vpbe_venc.c: In function ‘venc_set_ntsc’:
drivers/media/platform/davinci/vpbe_venc.c:230:6: warning: variable ‘val’ set but not used [-Wunused-but-set-variable]
  u32 val;
      ^~~
drivers/media/platform/davinci/vpbe_venc.c: In function ‘venc_sub_dev_init’:
drivers/media/platform/davinci/vpbe_venc.c:611:6: warning: variable ‘err’ set but not used [-Wunused-but-set-variable]
  int err;
      ^~~
  AR      drivers/media/platform/davinci/built-in.a
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 05c90900
...@@ -227,7 +227,6 @@ venc_enable_vpss_clock(int venc_type, ...@@ -227,7 +227,6 @@ venc_enable_vpss_clock(int venc_type,
*/ */
static int venc_set_ntsc(struct v4l2_subdev *sd) static int venc_set_ntsc(struct v4l2_subdev *sd)
{ {
u32 val;
struct venc_state *venc = to_state(sd); struct venc_state *venc = to_state(sd);
struct venc_platform_data *pdata = venc->pdata; struct venc_platform_data *pdata = venc->pdata;
...@@ -244,7 +243,7 @@ static int venc_set_ntsc(struct v4l2_subdev *sd) ...@@ -244,7 +243,7 @@ static int venc_set_ntsc(struct v4l2_subdev *sd)
if (venc->venc_type == VPBE_VERSION_3) { if (venc->venc_type == VPBE_VERSION_3) {
venc_write(sd, VENC_CLKCTL, 0x01); venc_write(sd, VENC_CLKCTL, 0x01);
venc_write(sd, VENC_VIDCTL, 0); venc_write(sd, VENC_VIDCTL, 0);
val = vdaccfg_write(sd, VDAC_CONFIG_SD_V3); vdaccfg_write(sd, VDAC_CONFIG_SD_V3);
} else if (venc->venc_type == VPBE_VERSION_2) { } else if (venc->venc_type == VPBE_VERSION_2) {
venc_write(sd, VENC_CLKCTL, 0x01); venc_write(sd, VENC_CLKCTL, 0x01);
venc_write(sd, VENC_VIDCTL, 0); venc_write(sd, VENC_VIDCTL, 0);
...@@ -608,9 +607,8 @@ struct v4l2_subdev *venc_sub_dev_init(struct v4l2_device *v4l2_dev, ...@@ -608,9 +607,8 @@ struct v4l2_subdev *venc_sub_dev_init(struct v4l2_device *v4l2_dev,
const char *venc_name) const char *venc_name)
{ {
struct venc_state *venc; struct venc_state *venc;
int err;
err = bus_for_each_dev(&platform_bus_type, NULL, &venc, bus_for_each_dev(&platform_bus_type, NULL, &venc,
venc_device_get); venc_device_get);
if (venc == NULL) if (venc == NULL)
return NULL; return NULL;
......
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