iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[media] omap_vout: Get rid of a few warnings

Browse Source 
drivers/media/platform/omap/omap_vout.c: In function 'omapvid_setup_overlay':
drivers/media/platform/omap/omap_vout.c:372:29: warning: variable 'pixheight' set but not used [-Wunused-but-set-variable]
  int cropheight, cropwidth, pixheight, pixwidth;
                             ^
drivers/media/platform/omap/omap_vout.c: In function 'vidioc_s_ctrl':
drivers/media/platform/omap/omap_vout.c:1454:24: warning: variable 'ovl' set but not used [-Wunused-but-set-variable]
   struct omap_overlay *ovl;
                        ^
drivers/media/platform/omap/omap_vout.c: In function 'vidioc_reqbufs':
drivers/media/platform/omap/omap_vout.c:1492:55: warning: comparison of unsigned expression < 0 is always false [-Wtype-limits]
  if ((req->type != V4L2_BUF_TYPE_VIDEO_OUTPUT) || (req->count < 0))
                                                       ^

Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
This commit is contained in:
Mauro Carvalho Chehab 2014-08-26 10:46:49 -03:00
parent 92e3919a49
commit 52334bb3df
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/media/platform/omap/omap_vout.c
View File

@ -369,7 +369,7 @@ static int omapvid_setup_overlay(struct omap_vout_device *vout,
{ {
int ret = 0; int ret = 0;
struct omap_overlay_info info; struct omap_overlay_info info;
int cropheight, cropwidth, pixheight, pixwidth; int cropheight, cropwidth, pixwidth;
if ((ovl->caps & OMAP_DSS_OVL_CAP_SCALE) == 0 && if ((ovl->caps & OMAP_DSS_OVL_CAP_SCALE) == 0 &&
(outw != vout->pix.width || outh != vout->pix.height)) { (outw != vout->pix.width || outh != vout->pix.height)) {
@ -389,12 +389,10 @@ static int omapvid_setup_overlay(struct omap_vout_device *vout,
if (is_rotation_90_or_270(vout)) { if (is_rotation_90_or_270(vout)) {
cropheight = vout->crop.width; cropheight = vout->crop.width;
cropwidth = vout->crop.height; cropwidth = vout->crop.height;
pixheight = vout->pix.width;
pixwidth = vout->pix.height; pixwidth = vout->pix.height;
} else { } else {
cropheight = vout->crop.height; cropheight = vout->crop.height;
cropwidth = vout->crop.width; cropwidth = vout->crop.width;
pixheight = vout->pix.height;
pixwidth = vout->pix.width; pixwidth = vout->pix.width;
} }
@ -1451,12 +1449,10 @@ static int vidioc_s_ctrl(struct file *file, void *fh, struct v4l2_control *a)
} }
case V4L2_CID_VFLIP: case V4L2_CID_VFLIP:
{ {
struct omap_overlay *ovl;
struct omapvideo_info *ovid; struct omapvideo_info *ovid;
unsigned int mirror = a->value; unsigned int mirror = a->value;
ovid = &vout->vid_info; ovid = &vout->vid_info;
ovl = ovid->overlays[0];
mutex_lock(&vout->lock); mutex_lock(&vout->lock);
if (mirror && ovid->rotation_type == VOUT_ROT_NONE) { if (mirror && ovid->rotation_type == VOUT_ROT_NONE) {
@ -1489,7 +1485,7 @@ static int vidioc_reqbufs(struct file *file, void *fh,
struct omap_vout_device *vout = fh; struct omap_vout_device *vout = fh;
struct videobuf_queue *q = &vout->vbq; struct videobuf_queue *q = &vout->vbq;
if ((req->type != V4L2_BUF_TYPE_VIDEO_OUTPUT) || (req->count < 0)) if (req->type != V4L2_BUF_TYPE_VIDEO_OUTPUT)
return -EINVAL; return -EINVAL;
/* if memory is not mmp or userptr /* if memory is not mmp or userptr
return error */ return error */