lkml.org 
[lkml]   [2006]   [Nov]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3/7] V4L/DVB (4786): Pvrusb2: use NULL instead of 0
    Date

    From: Randy Dunlap <randy.dunlap@oracle.com>

    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 <randy.dunlap@oracle.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
    ---

    drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c | 2 +-
    drivers/media/video/pvrusb2/pvrusb2-v4l2.c | 6 +++---
    2 files changed, 4 insertions(+), 4 deletions(-)

    diff --git a/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c b/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c
    index df8feac..c80c26b 100644
    --- a/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c
    +++ b/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);
    }

    diff --git a/drivers/media/video/pvrusb2/pvrusb2-v4l2.c b/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
    index 97e974d..bb40e90 100644
    --- a/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
    +++ b/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);
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2006-11-03 05:07    [W:0.041 / U:181.200 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site