From patchwork Wed Oct 3 06:27:38 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Lad, Prabhakar" X-Patchwork-Id: 1540371 Return-Path: X-Original-To: patchwork-davinci@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from devils.ext.ti.com (devils.ext.ti.com [198.47.26.153]) by patchwork1.kernel.org (Postfix) with ESMTP id 3B98B3FDAE for ; Wed, 3 Oct 2012 06:30:03 +0000 (UTC) Received: from dlelxv30.itg.ti.com ([172.17.2.17]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id q936S6Rq013735; Wed, 3 Oct 2012 01:28:06 -0500 Received: from DLEE74.ent.ti.com (dlee74.ent.ti.com [157.170.170.8]) by dlelxv30.itg.ti.com (8.13.8/8.13.8) with ESMTP id q936S6AF016997; Wed, 3 Oct 2012 01:28:06 -0500 Received: from dlelxv23.itg.ti.com (172.17.1.198) by DLEE74.ent.ti.com (157.170.170.8) with Microsoft SMTP Server id 14.1.323.3; Wed, 3 Oct 2012 01:28:06 -0500 Received: from linux.omap.com (dlelxs01.itg.ti.com [157.170.227.31]) by dlelxv23.itg.ti.com (8.13.8/8.13.8) with ESMTP id q936S6hp031940; Wed, 3 Oct 2012 01:28:06 -0500 Received: from linux.omap.com (localhost [127.0.0.1]) by linux.omap.com (Postfix) with ESMTP id 518E980627; Wed, 3 Oct 2012 01:28:06 -0500 (CDT) X-Original-To: davinci-linux-open-source@linux.davincidsp.com Delivered-To: davinci-linux-open-source@linux.davincidsp.com Received: from dflp53.itg.ti.com (dflp53.itg.ti.com [128.247.5.6]) by linux.omap.com (Postfix) with ESMTP id 85DE580626 for ; Wed, 3 Oct 2012 01:27:59 -0500 (CDT) Received: from neches.ext.ti.com (neches.ext.ti.com [192.91.81.29]) by dflp53.itg.ti.com (8.13.8/8.13.8) with ESMTP id q936RxUb024513 for ; Wed, 3 Oct 2012 01:27:59 -0500 (CDT) Received: from psmtp.com (na3sys009amx221.postini.com [74.125.149.61]) by neches.ext.ti.com (8.13.7/8.13.7) with SMTP id q936Rv6H011127 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Wed, 3 Oct 2012 01:27:58 -0500 Received: from mail-pa0-f45.google.com ([209.85.220.45]) (using TLSv1) by na3sys009amx221.postini.com ([74.125.148.10]) with SMTP; Tue, 02 Oct 2012 23:27:58 PDT Received: by padfb10 with SMTP id fb10so6082267pad.4 for ; Tue, 02 Oct 2012 23:27:57 -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:x-mailer; bh=/Bgc3KIKNPF3mMGlcXm7MBwN58WiVpQXeZ/Rnkw4UhA=; b=ME95jXMBxRZLP/tR6Idim0+LviaZI3lXH/Jl2+/jOvPH+zqGdzWc08dK8xWiCWArfE OjU+UfYfTsWO0yh3oksf44DVo0ByPg3VU9CAeME6q4nlbyqDy+Z755ZNud8s+n9LNXOU jUf8WzjHchqSCxk9G6ub8dLlCtwjrNSOG0fJrv+a3/yfdB36Kmc4iLOyIW9KaSdapHx0 I3hvzgxcH1HmVqr5OO7DiwFmtmrUWkTHR1DC0X8vJCx3GrKoaej7FkqizCJ/fjSx1HPW zom92XRneRMFDOm7xI1t0U1q/35P8JIaLDhBzWwVF9uu0to1m4ZXTkX/agF+k/ZFLf5D 71wg== Received: by 10.66.88.197 with SMTP id bi5mr2633050pab.58.1349245676882; Tue, 02 Oct 2012 23:27:56 -0700 (PDT) Received: from localhost.localdomain ([117.200.103.160]) by mx.google.com with ESMTPS id nt7sm2122585pbb.33.2012.10.02.23.27.48 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 02 Oct 2012 23:27:55 -0700 (PDT) From: Prabhakar To: LMML Subject: [PATCH] media: davinci: vpbe: fix build warning Date: Wed, 3 Oct 2012 11:57:38 +0530 Message-ID: <1349245658-7125-1-git-send-email-prabhakar.lad@ti.com> X-Mailer: git-send-email 1.7.4.1 X-pstn-levels: (S:47.14284/99.90000 CV:99.9000 FC:95.5390 LC:95.5390 R:95.9108 P:95.9108 M:97.0282 C:98.6951 ) X-pstn-dkim: 1 skipped:not-enabled X-pstn-settings: 2 (0.5000:0.0050) s cv GT3 gt2 gt1 r p m c X-pstn-addresses: from [82/3] CC: DLOS , Mauro Carvalho Chehab , VGER , Hans Verkuil 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 From: Lad, Prabhakar recent patch with commit id 4f996594ceaf6c3f9bc42b40c40b0f7f87b79c86 which makes vidioc_s_crop const, was causing a following build warning, vpbe_display.c: In function 'vpbe_display_s_crop': vpbe_display.c:640: warning: initialization discards qualifiers from pointer target type This patch fixes the above build warning. Signed-off-by: Lad, Prabhakar Signed-off-by: Manjunath Hadli Cc: Hans Verkuil Cc: Mauro Carvalho Chehab Acked-by: Hans Verkuil --- drivers/media/platform/davinci/vpbe_display.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/media/platform/davinci/vpbe_display.c b/drivers/media/platform/davinci/vpbe_display.c index 1b238fe..161c776 100644 --- a/drivers/media/platform/davinci/vpbe_display.c +++ b/drivers/media/platform/davinci/vpbe_display.c @@ -637,7 +637,7 @@ static int vpbe_display_s_crop(struct file *file, void *priv, struct vpbe_device *vpbe_dev = disp_dev->vpbe_dev; struct osd_layer_config *cfg = &layer->layer_info.config; struct osd_state *osd_device = disp_dev->osd_device; - struct v4l2_rect *rect = &crop->c; + struct v4l2_rect rect = crop->c; int ret; v4l2_dbg(1, debug, &vpbe_dev->v4l2_dev, @@ -648,21 +648,21 @@ static int vpbe_display_s_crop(struct file *file, void *priv, return -EINVAL; } - if (rect->top < 0) - rect->top = 0; - if (rect->left < 0) - rect->left = 0; + if (rect.top < 0) + rect.top = 0; + if (rect.left < 0) + rect.left = 0; - vpbe_disp_check_window_params(disp_dev, rect); + vpbe_disp_check_window_params(disp_dev, &rect); osd_device->ops.get_layer_config(osd_device, layer->layer_info.id, cfg); vpbe_disp_calculate_scale_factor(disp_dev, layer, - rect->width, - rect->height); - vpbe_disp_adj_position(disp_dev, layer, rect->top, - rect->left); + rect.width, + rect.height); + vpbe_disp_adj_position(disp_dev, layer, rect.top, + rect.left); ret = osd_device->ops.set_layer_config(osd_device, layer->layer_info.id, cfg); if (ret < 0) {