diff options
| author | archit taneja <archit@ti.com> | 2010-08-13 12:36:06 +0530 |
|---|---|---|
| committer | Ricardo Perez Olivares <x0081762@ti.com> | 2010-09-14 19:27:30 -0500 |
| commit | 4be3a5836609bb83821255a53a731d044bd83dce (patch) | |
| tree | 039246b6f752ea4caa33690d315612c72f92a47b /drivers/media | |
| parent | 46bb4b69cfd25428e0c420f7e894daed631b6051 (diff) | |
V4L2: Warning fixes
Warning fixes for omap_vout.c and omap_wb.c
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/video/omap/omap_vout.c | 7 | ||||
| -rw-r--r-- | drivers/media/video/omap/omap_wb.c | 11 |
2 files changed, 9 insertions, 9 deletions
diff --git a/drivers/media/video/omap/omap_vout.c b/drivers/media/video/omap/omap_vout.c index da017ffb0754..70a8a00ff9fd 100644 --- a/drivers/media/video/omap/omap_vout.c +++ b/drivers/media/video/omap/omap_vout.c @@ -804,7 +804,7 @@ enum omap_color_mode video_mode_to_dss_mode(struct v4l2_pix_format *pix) ovid = &vout->vid_info; ovl = ovid->overlays[0]; #else - enum omap_color_mode mode; + enum omap_color_mode mode = 1 << 0; #endif switch (pix->pixelformat) { case V4L2_PIX_FMT_NV12: @@ -1042,14 +1042,13 @@ int omapvid_apply_changes(struct omap_vout_device *vout) void omap_vout_isr(void *arg, unsigned int irqstatus) { int ret; - u32 addr, fid; - u32 uv_addr; + u32 addr, uv_addr; struct omap_overlay *ovl; struct timeval timevalue; struct omapvideo_info *ovid; struct omap_dss_device *cur_display; struct omap_vout_device *vout = (struct omap_vout_device *)arg; - u32 flags; + unsigned long flags; int irq = 0; if (!vout->streaming) diff --git a/drivers/media/video/omap/omap_wb.c b/drivers/media/video/omap/omap_wb.c index 2847255a224c..820408d1d61f 100644 --- a/drivers/media/video/omap/omap_wb.c +++ b/drivers/media/video/omap/omap_wb.c @@ -73,7 +73,7 @@ enum omap_color_mode video_mode_to_dss_mode( struct v4l2_pix_format *pix); void omap_wb_isr(void *arg, unsigned int irqstatus); int omap_dss_wb_apply(struct omap_overlay_manager *mgr, struct omap_writeback *wb); -int omap_dss_wb_flush(); +int omap_dss_wb_flush(void); int omap_setup_wb(struct omap_wb_device *wb_device, u32 addr, u32 uv_addr) { @@ -468,7 +468,7 @@ static int vidioc_streamoff(struct file *file, void *fh, return 0; } -static int vidioc_default_wb(struct file *file, void *fh, +static long vidioc_default(struct file *file, void *fh, int cmd, void *arg) { struct v4l2_writeback_ioctl_data *wb_data = NULL; @@ -538,7 +538,7 @@ static const struct v4l2_ioctl_ops wb_ioctl_fops = { .vidioc_streamoff = vidioc_streamoff, .vidioc_s_fmt_vid_overlay = vidioc_s_fmt_vid_overlay, .vidioc_g_fmt_vid_overlay = vidioc_g_fmt_vid_overlay, - .vidioc_default = vidioc_default_wb, + .vidioc_default = vidioc_default, }; static void omap_wb_tiler_buffer_free(struct omap_wb_device *wb, @@ -836,7 +836,7 @@ static int omap_wb_mmap(struct file *file, struct vm_area_struct *vma) /* UV Buffer in case of NV12 format */ if (OMAP_DSS_COLOR_NV12 == wb->dss_mode) { - pos = wb->buf_phy_uv_addr[i]; + pos = (void*) wb->buf_phy_uv_addr[i]; /* UV buffer is 2 bpp, but half size, so p remains */ m_increment = 2*64*TILER_WIDTH; @@ -1156,7 +1156,8 @@ void omap_wb_isr(void *arg, unsigned int irqstatus) int r = 0; struct omap_wb_device *wb = (struct omap_wb_device *) arg; - u32 addr, uv_addr, flags; + u32 addr, uv_addr; + unsigned long flags; spin_lock_irqsave(&wb->vbq_lock, flags); |