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: 1540361 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 7999C3FDAE for ; Wed, 3 Oct 2012 06:28:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752772Ab2JCG16 (ORCPT ); Wed, 3 Oct 2012 02:27:58 -0400 Received: from mail-pa0-f46.google.com ([209.85.220.46]:59442 "EHLO mail-pa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752678Ab2JCG15 (ORCPT ); Wed, 3 Oct 2012 02:27:57 -0400 Received: by padhz1 with SMTP id hz1so6001670pad.19 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 Cc: DLOS , Manjunath Hadli , VGER , "Lad, Prabhakar" , Hans Verkuil , Mauro Carvalho Chehab 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 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org 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) {