ivtv: Some general fixes
PATCH 1/1 ivtv: Some general fixes
Fix "warning: Using plain integer as NULL pointer". Convert 'x < y ? x : y' to use min() instead.
Signed-off-by Richard Knutsson <[email protected]>
Signed-off-by Hans Verkuil <[email protected]>
---
Compile-tested on i386 with "allyesconfig" and "allmodconfig". Resend, since the 'Remove a gcc-2.95 requirement'-part is taken away.
ivtv-driver.c | 2 +- ivtv-ioctl.c | 2 +- ivtv-irq.c | 4 ++-- ivtv-streams.c | 4 ++-- ivtvfb.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-)
drivers/media/video/ivtv/ivtv-driver.c +1 -1
@@ -979,7 +979,7 @@ static int __devinit ivtv_probe(struct pci_dev *dev, } itv =kzalloc (sizeof (struct ivtv ),GFP_ATOMIC ); -if (itv ==0 ) { +if (itv ==NULL ) {spin_unlock (&ivtv_cards_lock);return -ENOMEM ; }
drivers/media/video/ivtv/ivtv-ioctl.c +1 -1
@@ -688,7 +688,7 @@ static int ivtv_debug_ioctls(struct file *filp, unsigned int cmd, void *arg)ivtv_reset_ir_gpio (itv); }if (val &0x02 ) { - itv->video_dec_func (itv, cmd,0 ); + itv->video_dec_func (itv, cmd,NULL ); }break ; }
drivers/media/video/ivtv/ivtv-irq.c +2 -2
@@ -204,7 +204,7 @@ static int stream_enc_dma_append(struct ivtv_stream *s, u32 data[CX2341X_MBOX_MA s->sg_pending[idx].dst = buf->dma_handle; s->sg_pending[idx].src = offset; s->sg_pending[idx].size = s->buf_size; - buf->bytesused = (size < s->buf_size) ? size : s->buf_size; + buf->bytesused =min (size, s->buf_size); buf->dma_xfer_cnt = s->dma_xfer_cnt; s->q_predma.bytesused += buf->bytesused;
@@ -705,7 +705,7 @@ static void ivtv_irq_dec_data_req(struct ivtv *itv) s = &itv->streams[IVTV_DEC_STREAM_TYPE_YUV ]; }else { - itv->dma_data_req_size = data[2 ] >=0x10000 ?0x10000 : data[2 ]; + itv->dma_data_req_size =min_t (u32, data[2 ],0x10000 ); itv->dma_data_req_offset = data[1 ]; s = &itv->streams[IVTV_DEC_STREAM_TYPE_MPG ]; }
drivers/media/video/ivtv/ivtv-streams.c +2 -2
@@ -572,10 +572,10 @@ int ivtv_start_v4l2_encode_stream(struct ivtv_stream *s)clear_bit (IVTV_F_I_EOS , &itv->i_flags);/* Initialize Digitizer for Capture */ - itv->video_dec_func (itv,VIDIOC_STREAMOFF ,0 ); + itv->video_dec_func (itv,VIDIOC_STREAMOFF ,NULL );ivtv_msleep_timeout (300 ,1 );ivtv_vapi (itv,CX2341X_ENC_INITIALIZE_INPUT ,0 ); - itv->video_dec_func (itv,VIDIOC_STREAMON ,0 ); + itv->video_dec_func (itv,VIDIOC_STREAMON ,NULL ); }/* begin_capture */
drivers/media/video/ivtv/ivtvfb.c +1 -1
@@ -1053,7 +1053,7 @@ static int ivtvfb_init_card(struct ivtv *itv) } itv->osd_info =kzalloc (sizeof (struct osd_info ),GFP_ATOMIC ); -if (itv->osd_info ==0 ) { +if (itv->osd_info ==NULL ) {IVTVFB_ERR ("Failed to allocate memory for osd_info\n" );return -ENOMEM ; }