From patchwork Sun Nov 18 07:26:51 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 15504 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1TZzHY-0003QF-Mg for patchwork@linuxtv.org; Sun, 18 Nov 2012 08:27:08 +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 1TZzHX-0004VM-BT; Sun, 18 Nov 2012 08:27:08 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751480Ab2KRH1E (ORCPT ); Sun, 18 Nov 2012 02:27:04 -0500 Received: from mail-yh0-f46.google.com ([209.85.213.46]:47679 "EHLO mail-yh0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751451Ab2KRH1D (ORCPT ); Sun, 18 Nov 2012 02:27:03 -0500 Received: by mail-yh0-f46.google.com with SMTP id m54so719788yhm.19 for ; Sat, 17 Nov 2012 23:27:02 -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=+l4wMrN2zqbq7My91J/FadjlJWGTyM3HrhfBxayEmTo=; b=ZpKndAzhmuoukPvoYSOk7KKqiAX4nEKMHOFXJUPFfPo1UC5RmJJzVL9w4lfvG8lWrW Xs3vSD0b2QvUgfgmOi16SsPT/PHDvNtZlvv1aQckiaJCQ6jkVxMJ7VKCyrxv+/w5Nf8f eNmdIY4JfSm/8t799HHUy0gAsS02T+rR+F9U+jBkBPCmWn3XFD2f5vg7VX2kDj3zNNNL OXPRaNW7YfEypeb1yJLY7DZjRssyD++NL4uAvMOlIVWA0QM81SLZ9QqH2AtcOCxa+fdY pG3MCh7dEYf1US1yKmJvIcoOJsRonFNZzHUqYYOjMluYzh837sDKx9OdLUX60nN9c1pK qdjg== Received: by 10.236.135.75 with SMTP id t51mr8459882yhi.105.1353223622670; Sat, 17 Nov 2012 23:27:02 -0800 (PST) Received: from localhost.localdomain ([186.207.91.39]) by mx.google.com with ESMTPS id e18sm6450495yhi.0.2012.11.17.23.27.00 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 17 Nov 2012 23:27:02 -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 , Fabio Estevam Subject: [PATCH] [media] soc_camera: mx3_camera: Constify v4l2_crop Date: Sun, 18 Nov 2012 05:26:51 -0200 Message-Id: <1353223611-18960-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.71818 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_1700_1799 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' 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/mx3_camera.c:1134: warning: initialization from incompatible pointer type Signed-off-by: Fabio Estevam --- drivers/media/platform/soc_camera/mx3_camera.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/media/platform/soc_camera/mx3_camera.c b/drivers/media/platform/soc_camera/mx3_camera.c index 64d39b1..ae04395 100644 --- a/drivers/media/platform/soc_camera/mx3_camera.c +++ b/drivers/media/platform/soc_camera/mx3_camera.c @@ -799,17 +799,17 @@ static inline void stride_align(__u32 *width) * default g_crop and cropcap from soc_camera.c */ static int mx3_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 soc_camera_host *ici = to_soc_camera_host(icd->parent); struct mx3_camera_dev *mx3_cam = ici->priv; 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)