2006-10-24 03:34:22

by Randy Dunlap

Subject: [PATCH] pvrusb2: use NULL instead of 0

From: Randy Dunlap <[email protected]>

Fix sparse NULL usage warnings:
drivers/media/video/pvrusb2/pvrusb2-v4l2.c:714:14: warning: Using plain integer as NULL pointer
drivers/media/video/pvrusb2/pvrusb2-v4l2.c:715:16: warning: Using plain integer as NULL pointer
drivers/media/video/pvrusb2/pvrusb2-v4l2.c:1079:10: warning: Using plain integer as NULL pointer
drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c:224:58: warning: Using plain integer as NULL pointer

Signed-off-by: Randy Dunlap <[email protected]>
---
drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c | 2 +-
drivers/media/video/pvrusb2/pvrusb2-v4l2.c | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)

--- linux-2.6.19-rc2-git8.orig/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c
+++ linux-2.6.19-rc2-git8/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c
@@ -221,7 +221,7 @@ static unsigned int decoder_describe(str
static void decoder_reset(struct pvr2_v4l_cx2584x *ctxt)
{
int ret;
- ret = pvr2_i2c_client_cmd(ctxt->client,VIDIOC_INT_RESET,0);
+ ret = pvr2_i2c_client_cmd(ctxt->client,VIDIOC_INT_RESET,NULL);
pvr2_trace(PVR2_TRACE_CHIPS,"i2c cx25840 decoder_reset (ret=%d)",ret);
}

--- linux-2.6.19-rc2-git8.orig/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
+++ linux-2.6.19-rc2-git8/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
@@ -711,8 +711,8 @@ static void pvr2_v4l2_dev_destroy(struct
dip->devbase.minor,pvr2_config_get_name(dip->config));

/* Paranoia */
- dip->v4lp = 0;
- dip->stream = 0;
+ dip->v4lp = NULL;
+ dip->stream = NULL;

/* Actual deallocation happens later when all internal references
are gone. */
@@ -1076,7 +1076,7 @@ struct pvr2_v4l2 *pvr2_v4l2_create(struc
vp->vdev = kmalloc(sizeof(*vp->vdev),GFP_KERNEL);
if (!vp->vdev) {
kfree(vp);
- return 0;
+ return NULL;
}
memset(vp->vdev,0,sizeof(*vp->vdev));
pvr2_channel_init(&vp->channel,mnp);


---

2006-10-24 14:33:45

by Horst H. von Brand

Subject: Re: [PATCH] pvrusb2: use NULL instead of 0

Randy Dunlap <[email protected]> wrote:
> From: Randy Dunlap <[email protected]>
>
> Fix sparse NULL usage warnings:
> drivers/media/video/pvrusb2/pvrusb2-v4l2.c:714:14: warning: Using plain integer as NULL pointer
> drivers/media/video/pvrusb2/pvrusb2-v4l2.c:715:16: warning: Using plain integer as NULL pointer
> drivers/media/video/pvrusb2/pvrusb2-v4l2.c:1079:10: warning: Using plain integer as NULL pointer
> drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c:224:58: warning: Using plain integer as NULL pointer
>
> Signed-off-by: Randy Dunlap <[email protected]>
> ---
> drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c | 2 +-
> drivers/media/video/pvrusb2/pvrusb2-v4l2.c | 6 +++---
> 2 files changed, 4 insertions(+), 4 deletions(-)
>
> --- linux-2.6.19-rc2-git8.orig/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c
> +++ linux-2.6.19-rc2-git8/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c
> @@ -221,7 +221,7 @@ static unsigned int decoder_describe(str
> static void decoder_reset(struct pvr2_v4l_cx2584x *ctxt)
> {
> int ret;
> - ret = pvr2_i2c_client_cmd(ctxt->client,VIDIOC_INT_RESET,0);
> + ret = pvr2_i2c_client_cmd(ctxt->client,VIDIOC_INT_RESET,NULL);

Should be, per Coding-style:

ret = pvr2_i2c_client_cmd(ctxt->client, VIDIOC_INT_RESET, NULL);

There is more similar stuff in the patch. Why not clean that up in the
same sweep?
--
Dr. Horst H. von Brand User #22616 counter.li.org
Departamento de Informatica Fono: +56 32 2654431
Universidad Tecnica Federico Santa Maria +56 32 2654239
Casilla 110-V, Valparaiso, Chile Fax: +56 32 2797513