lkml.org 
[lkml]   [2014]   [May]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v5 38/49] media: davinci: vpif_capture: drop unnecessary field memory
    Date
    From: "Lad, Prabhakar" <prabhakar.csengg@gmail.com>

    Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
    ---
    drivers/media/platform/davinci/vpif_capture.c | 5 -----
    drivers/media/platform/davinci/vpif_capture.h | 5 -----
    2 files changed, 10 deletions(-)

    diff --git a/drivers/media/platform/davinci/vpif_capture.c b/drivers/media/platform/davinci/vpif_capture.c
    index 41cd3ff..6b66f55 100644
    --- a/drivers/media/platform/davinci/vpif_capture.c
    +++ b/drivers/media/platform/davinci/vpif_capture.c
    @@ -608,11 +608,6 @@ static void vpif_config_format(struct channel_obj *ch)
    vpif_dbg(2, debug, "vpif_config_format\n");

    common->fmt.fmt.pix.field = V4L2_FIELD_ANY;
    - if (config_params.numbuffers[ch->channel_id] == 0)
    - common->memory = V4L2_MEMORY_USERPTR;
    - else
    - common->memory = V4L2_MEMORY_MMAP;
    -
    common->fmt.fmt.pix.sizeimage
    = config_params.channel_bufsize[ch->channel_id];

    diff --git a/drivers/media/platform/davinci/vpif_capture.h b/drivers/media/platform/davinci/vpif_capture.h
    index f600819..9b7dd06 100644
    --- a/drivers/media/platform/davinci/vpif_capture.h
    +++ b/drivers/media/platform/davinci/vpif_capture.h
    @@ -63,11 +63,6 @@ struct common_obj {
    struct vpif_cap_buffer *cur_frm;
    /* Pointer pointing to current v4l2_buffer */
    struct vpif_cap_buffer *next_frm;
    - /*
    - * This field keeps track of type of buffer exchange mechanism
    - * user has selected
    - */
    - enum v4l2_memory memory;
    /* Used to store pixel format */
    struct v4l2_format fmt;
    /* Buffer queue used in video-buf */
    --
    1.7.9.5


    \
     
     \ /
      Last update: 2014-05-16 16:21    [W:4.171 / U:0.188 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site