From patchwork Fri May 16 13:33:19 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Lad, Prabhakar" X-Patchwork-Id: 4192361 Return-Path: X-Original-To: patchwork-davinci@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id A37F5BFF02 for ; Fri, 16 May 2014 13:45:10 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C5C912026F for ; Fri, 16 May 2014 13:45:09 +0000 (UTC) Received: from devils.ext.ti.com (devils.ext.ti.com [198.47.26.153]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DEDCB20200 for ; Fri, 16 May 2014 13:45:08 +0000 (UTC) Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id s4GDiCKt023008; Fri, 16 May 2014 08:44:12 -0500 Received: from DLEE71.ent.ti.com (dlee71.ent.ti.com [157.170.170.114]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id s4GDiCLD014986; Fri, 16 May 2014 08:44:12 -0500 Received: from dlep32.itg.ti.com (157.170.170.100) by DLEE71.ent.ti.com (157.170.170.114) with Microsoft SMTP Server id 14.3.174.1; Fri, 16 May 2014 08:44:12 -0500 Received: from linux.omap.com (dlelxs01.itg.ti.com [157.170.227.31]) by dlep32.itg.ti.com (8.14.3/8.13.8) with ESMTP id s4GDiCeX004559; Fri, 16 May 2014 08:44:12 -0500 Received: from linux.omap.com (localhost [127.0.0.1]) by linux.omap.com (Postfix) with ESMTP id 975998062E; Fri, 16 May 2014 08:44:11 -0500 (CDT) X-Original-To: davinci-linux-open-source@linux.davincidsp.com Delivered-To: davinci-linux-open-source@linux.davincidsp.com Received: from dlelxv84.itg.ti.com (dlelxv84.itg.ti.com [172.17.0.246]) by linux.omap.com (Postfix) with ESMTP id 50FAA8062A for ; Fri, 16 May 2014 08:39:37 -0500 (CDT) Received: from red.ext.ti.com (red.ext.ti.com [192.94.93.37]) by dlelxv84.itg.ti.com (8.14.3/8.13.8) with ESMTP id s4GDdbbJ010061 for ; Fri, 16 May 2014 08:39:37 -0500 Received: from mail6.bemta12.messagelabs.com (mail6.bemta12.messagelabs.com [216.82.250.247]) by red.ext.ti.com (8.13.7/8.13.7) with ESMTP id s4GDdaWb007376 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 16 May 2014 08:39:37 -0500 Received: from [216.82.250.83:41761] by server-11.bemta-12.messagelabs.com id 38/50-02193-81516735; Fri, 16 May 2014 13:39:36 +0000 X-Env-Sender: prabhakar.csengg@gmail.com X-Msg-Ref: server-3.tower-120.messagelabs.com!1400247575!4578735!1 X-Originating-IP: [209.85.220.50] X-SpamReason: No, hits=0.0 required=7.0 tests=ML_RADAR_SPEW_LINKS_14, spamassassin: X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8530 invoked from network); 16 May 2014 13:39:35 -0000 Received: from mail-pa0-f50.google.com (HELO mail-pa0-f50.google.com) (209.85.220.50) by server-3.tower-120.messagelabs.com with RC4-SHA encrypted SMTP; 16 May 2014 13:39:35 -0000 Received: by mail-pa0-f50.google.com with SMTP id fb1so2560616pad.23 for ; Fri, 16 May 2014 06:39:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=z/BxisWEpW3xQnd2JJmnPbSR2qvD+3unuBKGk00eKsA=; b=MZVGOda8vR954lQp4dnNVyJKAJbWdMMsEt0VqyszTI/Z0WjPepf0Tmay99PimHu6E7 vvdMo+9Fv9x+OFTMwf9BkYUkYNDhJbV+Ynx7vqaS03gcRaUz1l67a+FdgJWsaj9IbQLZ baS6AvFaFqomq7+e02a4v+fsU6kB32lqY4HUYgscwhLI/kmDuRhAaap3jQXbWRVXnEAL RT6P7qlpmOQdm/Bmvj0cJI8DofCR53OL/D7KS7BGErte89e8Dea/JFhoaDVG/cWIwdOr ZAU/yEaEmSzmJ3AGsRZEpVG7TYs3wto2eQ7OZlvSyAQeIqBqZe+tNZvjK2WzTqsPy8Wi EVcA== X-Received: by 10.68.201.97 with SMTP id jz1mr20978853pbc.26.1400247574879; Fri, 16 May 2014 06:39:34 -0700 (PDT) Received: from localhost.localdomain ([27.107.45.22]) by mx.google.com with ESMTPSA id cj1sm34699547pac.40.2014.05.16.06.39.22 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 16 May 2014 06:39:33 -0700 (PDT) From: "Lad, Prabhakar" To: LMML , Hans Verkuil Subject: [PATCH v5 14/49] media: davinci: vpif_display: drop unnecessary field memory Date: Fri, 16 May 2014 19:03:19 +0530 Message-ID: <1400247235-31434-16-git-send-email-prabhakar.csengg@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1400247235-31434-1-git-send-email-prabhakar.csengg@gmail.com> References: <1400247235-31434-1-git-send-email-prabhakar.csengg@gmail.com> CC: DLOS , LKML X-BeenThere: davinci-linux-open-source@linux.davincidsp.com X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: Errors-To: davinci-linux-open-source-bounces@linux.davincidsp.com X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: "Lad, Prabhakar" Signed-off-by: Lad, Prabhakar --- drivers/media/platform/davinci/vpif_display.c | 5 ----- drivers/media/platform/davinci/vpif_display.h | 3 --- 2 files changed, 8 deletions(-) diff --git a/drivers/media/platform/davinci/vpif_display.c b/drivers/media/platform/davinci/vpif_display.c index bfe1e50..ab097ce 100644 --- a/drivers/media/platform/davinci/vpif_display.c +++ b/drivers/media/platform/davinci/vpif_display.c @@ -572,11 +572,6 @@ static void vpif_config_format(struct channel_obj *ch) struct common_obj *common = &ch->common[VPIF_VIDEO_INDEX]; 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]; common->fmt.fmt.pix.pixelformat = V4L2_PIX_FMT_YUV422P; diff --git a/drivers/media/platform/davinci/vpif_display.h b/drivers/media/platform/davinci/vpif_display.h index b22bb33..06b8d24 100644 --- a/drivers/media/platform/davinci/vpif_display.h +++ b/drivers/media/platform/davinci/vpif_display.h @@ -72,9 +72,6 @@ struct common_obj { * vb2_buffer */ struct vpif_disp_buffer *next_frm; /* Pointer pointing to next * vb2_buffer */ - enum v4l2_memory memory; /* This field keeps track of - * type of buffer exchange - * method user has selected */ struct v4l2_format fmt; /* Used to store the format */ struct vb2_queue buffer_queue; /* Buffer queue used in * video-buf */