media: fix integer as NULL pointer warnings
PATCH 2/3 media: fix integer as NULL pointer warnings
drivers/media/video/v4l2-common.c:719:16: warning: Using plain integer as NULL pointer drivers/media/video/au0828/au0828-dvb.c:122:19: warning: Using plain integer as NULL pointer drivers/media/video/ivtv/ivtv-yuv.c:1101:22: warning: Using plain integer as NULL pointer drivers/media/video/ivtv/ivtv-yuv.c:1102:23: warning: Using plain integer as NULL pointer drivers/media/video/pvrusb2/pvrusb2-audio.c:78:39: warning: Using plain integer as NULL pointer drivers/media/video/pvrusb2/pvrusb2-video-v4l.c:84:39: warning: Using plain integer as NULL pointer drivers/media/video/pvrusb2/pvrusb2-v4l2.c:1264:9: warning: Using plain integer as NULL pointer drivers/media/video/pvrusb2/pvrusb2-context.c:197:28: warning: Using plain integer as NULL pointer drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c:126:39: warning: Using plain integer as NULL pointer drivers/media/video/pvrusb2/pvrusb2-dvb.c:133:32: warning: Using plain integer as NULL pointer drivers/media/video/pvrusb2/pvrusb2-dvb.c:145:31: warning: Using plain integer as NULL pointer drivers/media/video/pvrusb2/pvrusb2-dvb.c:177:55: warning: Using plain integer as NULL pointer drivers/media/video/videobuf-core.c:100:9: warning: Using plain integer as NULL pointer
--- drivers/media/video/au0828/au0828-dvb.c | 2 +- drivers/media/video/ivtv/ivtv-yuv.c | 4 ++-- drivers/media/video/pvrusb2/pvrusb2-audio.c | 2 +- drivers/media/video/pvrusb2/pvrusb2-context.c | 2 +- drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c | 2 +- drivers/media/video/pvrusb2/pvrusb2-dvb.c | 6 +++--- drivers/media/video/pvrusb2/pvrusb2-v4l2.c | 2 +- drivers/media/video/pvrusb2/pvrusb2-video-v4l.c | 2 +- drivers/media/video/v4l2-common.c | 2 +- drivers/media/video/videobuf-core.c | 5 ++++- 10 files changed, 16 insertions(+), 13 deletions(-)
drivers/media/video/au0828/au0828-dvb.c +1 -1
@@ -119,7 +119,7 @@ static int start_urb_transfer(struct au0828_dev *dev) purb->transfer_buffer =kzalloc (URB_BUFSIZE ,GFP_KERNEL );if (!purb->transfer_buffer) {usb_free_urb (purb); - dev->urbs[i] =0 ; + dev->urbs[i] =NULL ; goto err; }
drivers/media/video/ivtv/ivtv-yuv.c +2 -2
@@ -1098,8 +1098,8 @@ void ivtv_yuv_setup_stream_frame(struct ivtv *itv)ivtv_yuv_next_free (itv);/* Copy V4L2 parameters to an ivtv_dma_frame struct... */ - dma_args.y_source =0L ; - dma_args.uv_source =0L ; + dma_args.y_source =NULL ; + dma_args.uv_source =NULL ; dma_args.src.left =0 ; dma_args.src.top =0 ; dma_args.src.width = yi->v4l2_src_w;
drivers/media/video/pvrusb2/pvrusb2-audio.c +1 -1
@@ -75,7 +75,7 @@ static void set_stereo(struct pvr2_msp3400_handler *ctxt)pvr2_trace (PVR2_TRACE_CHIPS ,"i2c msp3400 v4l2 set_stereo" );if ((sid <ARRAY_SIZE (routing_schemes)) && - ((sp = routing_schemes + sid) !=0 ) && + ((sp = routing_schemes + sid) !=NULL ) && (hdw->input_val >=0 ) && (hdw->input_val < sp->cnt)) { route.input = sp->def[hdw->input_val];
drivers/media/video/pvrusb2/pvrusb2-context.c +1 -1
@@ -195,7 +195,7 @@ static int pvr2_context_thread_func(void *foo)int pvr2_context_global_init (void ) { pvr2_context_thread_ptr =kthread_run (pvr2_context_thread_func, -0 , +NULL ,"pvrusb2-context" );return (pvr2_context_thread_ptr ?0 : -ENOMEM ); }
drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c +1 -1
@@ -123,7 +123,7 @@ static void set_input(struct pvr2_v4l_cx2584x *ctxt)memset (&route,0 ,sizeof (route));if ((sid <ARRAY_SIZE (routing_schemes)) && - ((sp = routing_schemes + sid) !=0 ) && + ((sp = routing_schemes + sid) !=NULL ) && (hdw->input_val >=0 ) && (hdw->input_val < sp->cnt)) { vid_input = sp->def[hdw->input_val].vid;
drivers/media/video/pvrusb2/pvrusb2-dvb.c +3 -3
@@ -130,7 +130,7 @@ static void pvr2_dvb_stream_end(struct pvr2_dvb_adapter *adap)for (idx =0 ; idx <PVR2_DVB_BUFFER_COUNT ; idx++) {if (!(adap->buffer_storage[idx]))continue ;kfree (adap->buffer_storage[idx]); - adap->buffer_storage[idx] =0 ; + adap->buffer_storage[idx] =NULL ; } adap->stream_run =0 ; }
@@ -142,7 +142,7 @@ static int pvr2_dvb_stream_do_start(struct pvr2_dvb_adapter *adap)unsigned int idx;int ret;struct pvr2_buffer *bp; -struct pvr2_stream *stream =0 ; +struct pvr2_stream *stream =NULL ;if (adap->stream_run)return -EIO ;
@@ -174,7 +174,7 @@ static int pvr2_dvb_stream_do_start(struct pvr2_dvb_adapter *adap) ret =pvr2_hdw_set_streaming (adap->channel.hdw,1 );if (ret <0 )return ret; -while ((bp =pvr2_stream_get_idle_buffer (stream)) !=0 ) { +while ((bp =pvr2_stream_get_idle_buffer (stream)) !=NULL ) { ret =pvr2_buffer_queue (bp);if (ret <0 )return ret; }
drivers/media/video/pvrusb2/pvrusb2-v4l2.c +1 -1
@@ -1261,7 +1261,7 @@ struct pvr2_v4l2 *pvr2_v4l2_create(struct pvr2_context *mnp) fail:pvr2_trace (PVR2_TRACE_STRUCT ,"Failure creating pvr2_v4l2 id=%p" ,vp);pvr2_v4l2_destroy_no_lock (vp); -return 0 ; +return NULL ; }/*
drivers/media/video/pvrusb2/pvrusb2-video-v4l.c +1 -1
@@ -81,7 +81,7 @@ static void set_input(struct pvr2_v4l_decoder *ctxt)pvr2_trace (PVR2_TRACE_CHIPS ,"i2c v4l2 set_input(%d)" ,hdw->input_val);if ((sid <ARRAY_SIZE (routing_schemes)) && - ((sp = routing_schemes + sid) !=0 ) && + ((sp = routing_schemes + sid) !=NULL ) && (hdw->input_val >=0 ) && (hdw->input_val < sp->cnt)) { route.input = sp->def[hdw->input_val];
drivers/media/video/v4l2-common.c +1 -1
@@ -716,7 +716,7 @@ int v4l2_i2c_attach(struct i2c_adapter *adapter, int address, struct i2c_driverint err; client =kzalloc (sizeof (struct i2c_client ),GFP_KERNEL ); -if (client ==0 ) +if (!client)return -ENOMEM ; client->addr = address;
drivers/media/video/videobuf-core.c +4 -1
@@ -97,7 +97,10 @@ int videobuf_iolock(struct videobuf_queue *q, struct videobuf_buffer *vb,void *videobuf_queue_to_vmalloc (struct videobuf_queue *q,struct videobuf_buffer *buf) { -return CALL (q, vmalloc, buf); +if (q->int_ops->vmalloc) +return q->int_ops->vmalloc (buf); +else +return NULL ; }EXPORT_SYMBOL_GPL (videobuf_queue_to_vmalloc);
Signature · 1 line
1.5.5.1.270.g89765