lkml.org 
[lkml]   [2007]   [Jan]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[RFC: -mm patch] #if 0 v4l_printk_ioctl_arg()
    On Sat, Jan 27, 2007 at 11:49:28PM -0800, Andrew Morton wrote:
    >...
    > Changes since 2.6.20-rc4-mm1:
    >...
    > git-dvb.patch
    >...
    > git trees.
    >...

    v4l_printk_ioctl_arg() is no longer used.

    Signed-off-by: Adrian Bunk <bunk@stusta.de>

    ---

    drivers/media/video/v4l2-common.c | 7 ++++++-
    include/media/v4l2-common.h | 3 ---
    2 files changed, 6 insertions(+), 4 deletions(-)

    --- linux-2.6.20-rc6-mm1/include/media/v4l2-common.h.old 2007-01-29 00:02:58.000000000 +0100
    +++ linux-2.6.20-rc6-mm1/include/media/v4l2-common.h 2007-01-29 00:03:10.000000000 +0100
    @@ -64,9 +64,6 @@
    /* Prints the ioctl in a human-readable format */
    extern void v4l_printk_ioctl(unsigned int cmd);

    -/* Prints the ioctl and arg in a human-readable format */
    -extern void v4l_printk_ioctl_arg(char *s,unsigned int cmd, void *arg);
    -
    /* Use this macro for non-I2C drivers. Pass the driver name as the first arg. */
    #define v4l_print_ioctl(name, cmd) \
    do { \
    --- linux-2.6.20-rc6-mm1/drivers/media/video/v4l2-common.c.old 2007-01-29 00:21:54.000000000 +0100
    +++ linux-2.6.20-rc6-mm1/drivers/media/video/v4l2-common.c 2007-01-29 00:45:55.000000000 +0100
    @@ -271,11 +271,13 @@
    [V4L2_BUF_TYPE_SLICED_VBI_OUTPUT] = "slicec-vbi-out",
    };

    +#if 0
    static char *v4l2_memory_names[] = {
    [V4L2_MEMORY_MMAP] = "mmap",
    [V4L2_MEMORY_USERPTR] = "userptr",
    [V4L2_MEMORY_OVERLAY] = "overlay",
    };
    +#endif /* 0 */

    #define prt_names(a,arr) (((a)>=0)&&((a)<ARRAY_SIZE(arr)))?arr[a]:"unknown"

    @@ -419,6 +421,7 @@
    };
    #define V4L2_INT_IOCTLS ARRAY_SIZE(v4l2_int_ioctls)

    +#if 0
    static void v4l_print_pix_fmt (char *s, struct v4l2_pix_format *fmt)
    {
    printk ("%s: width=%d, height=%d, format=%d, field=%s, "
    @@ -427,6 +430,7 @@
    prt_names(fmt->field,v4l2_field_names),
    fmt->bytesperline,fmt->sizeimage,fmt->colorspace);
    };
    +#endif /* 0 */

    /* Common ioctl debug function. This function can be used by
    external ioctl messages as well as internal V4L ioctl */
    @@ -466,6 +470,7 @@
    }
    }

    +#if 0
    /* Common ioctl debug function. This function can be used by
    external ioctl messages as well as internal V4L ioctl and its
    arguments */
    @@ -1036,6 +1041,7 @@
    }
    }
    }
    +#endif /* 0 */

    /* ----------------------------------------------------------------- */

    @@ -1544,7 +1550,6 @@
    EXPORT_SYMBOL(v4l2_field_names);
    EXPORT_SYMBOL(v4l2_type_names);
    EXPORT_SYMBOL(v4l_printk_ioctl);
    -EXPORT_SYMBOL(v4l_printk_ioctl_arg);

    EXPORT_SYMBOL(v4l2_ctrl_next);
    EXPORT_SYMBOL(v4l2_ctrl_check);
    -
    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: 2007-01-30 02:17    [W:4.403 / U:0.060 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site