From patchwork Sun Nov 18 07:14:23 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 15503 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1TZz5V-00033r-Dj for patchwork@linuxtv.org; Sun, 18 Nov 2012 08:14:41 +0100 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.75/mailfrontend-4) with esmtp for id 1TZz5U-0002ql-Bg; Sun, 18 Nov 2012 08:14:41 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751603Ab2KRHOi (ORCPT ); Sun, 18 Nov 2012 02:14:38 -0500 Received: from mail-gh0-f174.google.com ([209.85.160.174]:51850 "EHLO mail-gh0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751474Ab2KRHOi (ORCPT ); Sun, 18 Nov 2012 02:14:38 -0500 Received: by mail-gh0-f174.google.com with SMTP id g15so85250ghb.19 for ; Sat, 17 Nov 2012 23:14:37 -0800 (PST) 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=dg8xbrfVQB8uMAQtdu02UCegRfFb46JHtnxr4cwf4j0=; b=xPbNXjtrp4fx+AX0zC+zYLde9CmRwYWNF98LCUkQmsX7+bsTRfhDpaOk6jiLGP9/1m +gKyl9Olhis300oJ9+Xu0YexmKXengmgwLLNC6USYtgzIGq9o+a6CslR8I0r3M/JG+2Y KYSf9QlxOsdsRaIl/somcsTAWFULFmcZyl516OJFSjo5LGpWxcksHKQA5kSl89xXMF2l 5iF93DtQQ8TGV/oXB7F+TLzH1PspC4cgJTfKSFvITxdsYPV3qjxy3lLuD/x6aCe8Q6S5 +D0X6I4GQmr9feAiR3AJdKv2JqtXcCivwYsYRTPqpHF6dM2OwXpVW4QI+jlGw37DI0XA K4cw== Received: by 10.236.81.36 with SMTP id l24mr8726471yhe.93.1353222877483; Sat, 17 Nov 2012 23:14:37 -0800 (PST) Received: from localhost.localdomain ([186.207.91.39]) by mx.google.com with ESMTPS id o66sm6391410yhi.19.2012.11.17.23.14.34 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 17 Nov 2012 23:14:36 -0800 (PST) From: Fabio Estevam To: g.liakhovetski@gmx.de Cc: mchehab@infradead.org, hans.verkuil@cisco.com, javier.martin@vista-silicon.com, kernel@pengutronix.de, linux-media@vger.kernel.org, Fabio Estevam Subject: [PATCH] [media] soc_camera: mx2_camera: Constify v4l2_crop Date: Sun, 18 Nov 2012 05:14:23 -0200 Message-Id: <1353222863-23959-1-git-send-email-festevam@gmail.com> X-Mailer: git-send-email 1.7.9.5 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 5.6.1.2065439, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2012.11.18.70033 X-PMX-Spam: Gauge=IIIIIIIII, Probability=9%, Report=' FORGED_FROM_GMAIL 0.1, MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1600_1699 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, DKIM_SIGNATURE 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_MEDIA_BODY 0, __CP_URI_IN_BODY 0, __FRAUD_WEBMAIL 0, __FRAUD_WEBMAIL_FROM 0, __FROM_GMAIL 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __MULTIPLE_RCPTS_CC_X2 0, __PHISH_SPEAR_STRUCTURE_1 0, __SANE_MSGID 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS , __YOUTUBE_RCVD 0' From: Fabio Estevam Since commit 4f996594ce ([media] v4l2: make vidioc_s_crop const), set_crop should receive a 'const struct v4l2_crop *' argument type. Adapt to this new format and get rid of the following build warning: drivers/media/platform/soc_camera/mx2_camera.c:1529: warning: initialization from incompatible pointer type Signed-off-by: Fabio Estevam --- drivers/media/platform/soc_camera/mx2_camera.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/media/platform/soc_camera/mx2_camera.c b/drivers/media/platform/soc_camera/mx2_camera.c index e575ae8..5fc3319 100644 --- a/drivers/media/platform/soc_camera/mx2_camera.c +++ b/drivers/media/platform/soc_camera/mx2_camera.c @@ -1131,15 +1131,15 @@ static int mx2_camera_set_bus_param(struct soc_camera_device *icd) } static int mx2_camera_set_crop(struct soc_camera_device *icd, - struct v4l2_crop *a) + const struct v4l2_crop *a) { - struct v4l2_rect *rect = &a->c; + struct v4l2_rect rect = a->c; struct v4l2_subdev *sd = soc_camera_to_subdev(icd); struct v4l2_mbus_framefmt mf; int ret; - soc_camera_limit_side(&rect->left, &rect->width, 0, 2, 4096); - soc_camera_limit_side(&rect->top, &rect->height, 0, 2, 4096); + soc_camera_limit_side(&rect.left, &rect.width, 0, 2, 4096); + soc_camera_limit_side(&rect.top, &rect.height, 0, 2, 4096); ret = v4l2_subdev_call(sd, video, s_crop, a); if (ret < 0)