diff options
| author | Mike Isely <isely@pobox.com> | 2006-06-30 10:35:28 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-06-30 14:59:50 -0400 |
| commit | a0fd1cb171e8b17339a9a18ae7cf09c50022010f (patch) | |
| tree | fdd003ed9f8fe86d20d77fa9bb8da5e13954d494 | |
| parent | 07e337eeab3660559cbe1fee6907d1092037aea7 (diff) | |
V4L/DVB (4288): Clean out a zillion sparse warnings in pvrusb2
Signed-off-by: Mike Isely <isely@pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
19 files changed, 105 insertions, 105 deletions
diff --git a/drivers/media/video/pvrusb2/pvrusb2-audio.c b/drivers/media/video/pvrusb2/pvrusb2-audio.c index 313d2dcf9e4b..9846c464ec80 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-audio.c +++ b/drivers/media/video/pvrusb2/pvrusb2-audio.c | |||
| @@ -145,8 +145,8 @@ static int get_audio_status(struct pvr2_msp3400_handler *ctxt) | |||
| 145 | 145 | ||
| 146 | static void pvr2_msp3400_detach(struct pvr2_msp3400_handler *ctxt) | 146 | static void pvr2_msp3400_detach(struct pvr2_msp3400_handler *ctxt) |
| 147 | { | 147 | { |
| 148 | ctxt->client->handler = 0; | 148 | ctxt->client->handler = NULL; |
| 149 | ctxt->hdw->audio_stat = 0; | 149 | ctxt->hdw->audio_stat = NULL; |
| 150 | kfree(ctxt); | 150 | kfree(ctxt); |
| 151 | } | 151 | } |
| 152 | 152 | ||
diff --git a/drivers/media/video/pvrusb2/pvrusb2-context.c b/drivers/media/video/pvrusb2/pvrusb2-context.c index 40dc59871a45..f129f316d20e 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-context.c +++ b/drivers/media/video/pvrusb2/pvrusb2-context.c | |||
| @@ -77,7 +77,7 @@ struct pvr2_context *pvr2_context_create( | |||
| 77 | const struct usb_device_id *devid, | 77 | const struct usb_device_id *devid, |
| 78 | void (*setup_func)(struct pvr2_context *)) | 78 | void (*setup_func)(struct pvr2_context *)) |
| 79 | { | 79 | { |
| 80 | struct pvr2_context *mp = 0; | 80 | struct pvr2_context *mp = NULL; |
| 81 | mp = kmalloc(sizeof(*mp),GFP_KERNEL); | 81 | mp = kmalloc(sizeof(*mp),GFP_KERNEL); |
| 82 | if (!mp) goto done; | 82 | if (!mp) goto done; |
| 83 | memset(mp,0,sizeof(*mp)); | 83 | memset(mp,0,sizeof(*mp)); |
| @@ -87,7 +87,7 @@ struct pvr2_context *pvr2_context_create( | |||
| 87 | mp->hdw = pvr2_hdw_create(intf,devid); | 87 | mp->hdw = pvr2_hdw_create(intf,devid); |
| 88 | if (!mp->hdw) { | 88 | if (!mp->hdw) { |
| 89 | pvr2_context_destroy(mp); | 89 | pvr2_context_destroy(mp); |
| 90 | mp = 0; | 90 | mp = NULL; |
| 91 | goto done; | 91 | goto done; |
| 92 | } | 92 | } |
| 93 | 93 | ||
| @@ -145,7 +145,7 @@ void pvr2_channel_init(struct pvr2_channel *cp,struct pvr2_context *mp) | |||
| 145 | { | 145 | { |
| 146 | cp->hdw = mp->hdw; | 146 | cp->hdw = mp->hdw; |
| 147 | cp->mc_head = mp; | 147 | cp->mc_head = mp; |
| 148 | cp->mc_next = 0; | 148 | cp->mc_next = NULL; |
| 149 | cp->mc_prev = mp->mc_last; | 149 | cp->mc_prev = mp->mc_last; |
| 150 | if (mp->mc_last) { | 150 | if (mp->mc_last) { |
| 151 | mp->mc_last->mc_next = cp; | 151 | mp->mc_last->mc_next = cp; |
| @@ -160,8 +160,8 @@ static void pvr2_channel_disclaim_stream(struct pvr2_channel *cp) | |||
| 160 | { | 160 | { |
| 161 | if (!cp->stream) return; | 161 | if (!cp->stream) return; |
| 162 | pvr2_stream_kill(cp->stream->stream); | 162 | pvr2_stream_kill(cp->stream->stream); |
| 163 | cp->stream->user = 0; | 163 | cp->stream->user = NULL; |
| 164 | cp->stream = 0; | 164 | cp->stream = NULL; |
| 165 | } | 165 | } |
| 166 | 166 | ||
| 167 | 167 | ||
| @@ -179,7 +179,7 @@ void pvr2_channel_done(struct pvr2_channel *cp) | |||
| 179 | } else { | 179 | } else { |
| 180 | mp->mc_first = cp->mc_next; | 180 | mp->mc_first = cp->mc_next; |
| 181 | } | 181 | } |
| 182 | cp->hdw = 0; | 182 | cp->hdw = NULL; |
| 183 | } | 183 | } |
| 184 | 184 | ||
| 185 | 185 | ||
| @@ -212,7 +212,7 @@ struct pvr2_ioread *pvr2_channel_create_mpeg_stream( | |||
| 212 | { | 212 | { |
| 213 | struct pvr2_ioread *cp; | 213 | struct pvr2_ioread *cp; |
| 214 | cp = pvr2_ioread_create(); | 214 | cp = pvr2_ioread_create(); |
| 215 | if (!cp) return 0; | 215 | if (!cp) return NULL; |
| 216 | pvr2_ioread_setup(cp,sp->stream); | 216 | pvr2_ioread_setup(cp,sp->stream); |
| 217 | pvr2_ioread_set_sync_key(cp,stream_sync_key,sizeof(stream_sync_key)); | 217 | pvr2_ioread_set_sync_key(cp,stream_sync_key,sizeof(stream_sync_key)); |
| 218 | return cp; | 218 | return cp; |
diff --git a/drivers/media/video/pvrusb2/pvrusb2-ctrl.c b/drivers/media/video/pvrusb2/pvrusb2-ctrl.c index d5df9fbeba2f..fb6198f1df98 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-ctrl.c +++ b/drivers/media/video/pvrusb2/pvrusb2-ctrl.c | |||
| @@ -158,7 +158,7 @@ int pvr2_ctrl_get_mask(struct pvr2_ctrl *cptr) | |||
| 158 | /* Retrieve the control's name */ | 158 | /* Retrieve the control's name */ |
| 159 | const char *pvr2_ctrl_get_name(struct pvr2_ctrl *cptr) | 159 | const char *pvr2_ctrl_get_name(struct pvr2_ctrl *cptr) |
| 160 | { | 160 | { |
| 161 | if (!cptr) return 0; | 161 | if (!cptr) return NULL; |
| 162 | return cptr->info->name; | 162 | return cptr->info->name; |
| 163 | } | 163 | } |
| 164 | 164 | ||
| @@ -166,7 +166,7 @@ const char *pvr2_ctrl_get_name(struct pvr2_ctrl *cptr) | |||
| 166 | /* Retrieve the control's desc */ | 166 | /* Retrieve the control's desc */ |
| 167 | const char *pvr2_ctrl_get_desc(struct pvr2_ctrl *cptr) | 167 | const char *pvr2_ctrl_get_desc(struct pvr2_ctrl *cptr) |
| 168 | { | 168 | { |
| 169 | if (!cptr) return 0; | 169 | if (!cptr) return NULL; |
| 170 | return cptr->info->desc; | 170 | return cptr->info->desc; |
| 171 | } | 171 | } |
| 172 | 172 | ||
| @@ -488,7 +488,7 @@ int pvr2_ctrl_sym_to_value(struct pvr2_ctrl *cptr, | |||
| 488 | 488 | ||
| 489 | LOCK_TAKE(cptr->hdw->big_lock); do { | 489 | LOCK_TAKE(cptr->hdw->big_lock); do { |
| 490 | if (cptr->info->type == pvr2_ctl_int) { | 490 | if (cptr->info->type == pvr2_ctl_int) { |
| 491 | ret = parse_token(ptr,len,valptr,0,0); | 491 | ret = parse_token(ptr,len,valptr,NULL,0); |
| 492 | if ((ret >= 0) && | 492 | if ((ret >= 0) && |
| 493 | ((*valptr < cptr->info->def.type_int.min_value) || | 493 | ((*valptr < cptr->info->def.type_int.min_value) || |
| 494 | (*valptr > cptr->info->def.type_int.max_value))) { | 494 | (*valptr > cptr->info->def.type_int.max_value))) { |
diff --git a/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c b/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c index 27eadaff75a0..c80c26be6e4d 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c +++ b/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c | |||
| @@ -139,8 +139,8 @@ static const struct pvr2_v4l_cx2584x_ops decoder_ops[] = { | |||
| 139 | 139 | ||
| 140 | static void decoder_detach(struct pvr2_v4l_cx2584x *ctxt) | 140 | static void decoder_detach(struct pvr2_v4l_cx2584x *ctxt) |
| 141 | { | 141 | { |
| 142 | ctxt->client->handler = 0; | 142 | ctxt->client->handler = NULL; |
| 143 | ctxt->hdw->decoder_ctrl = 0; | 143 | ctxt->hdw->decoder_ctrl = NULL; |
| 144 | kfree(ctxt); | 144 | kfree(ctxt); |
| 145 | } | 145 | } |
| 146 | 146 | ||
| @@ -221,7 +221,7 @@ static unsigned int decoder_describe(struct pvr2_v4l_cx2584x *ctxt, | |||
| 221 | static void decoder_reset(struct pvr2_v4l_cx2584x *ctxt) | 221 | static void decoder_reset(struct pvr2_v4l_cx2584x *ctxt) |
| 222 | { | 222 | { |
| 223 | int ret; | 223 | int ret; |
| 224 | ret = pvr2_i2c_client_cmd(ctxt->client,VIDIOC_INT_RESET,0); | 224 | ret = pvr2_i2c_client_cmd(ctxt->client,VIDIOC_INT_RESET,NULL); |
| 225 | pvr2_trace(PVR2_TRACE_CHIPS,"i2c cx25840 decoder_reset (ret=%d)",ret); | 225 | pvr2_trace(PVR2_TRACE_CHIPS,"i2c cx25840 decoder_reset (ret=%d)",ret); |
| 226 | } | 226 | } |
| 227 | 227 | ||
diff --git a/drivers/media/video/pvrusb2/pvrusb2-debugifc.c b/drivers/media/video/pvrusb2/pvrusb2-debugifc.c index 8092b239cf27..f985f00d885a 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-debugifc.c +++ b/drivers/media/video/pvrusb2/pvrusb2-debugifc.c | |||
| @@ -82,7 +82,7 @@ static unsigned int debugifc_isolate_word(const char *buf,unsigned int count, | |||
