From patchwork Mon Feb 13 13:51:54 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Javier Martin X-Patchwork-Id: 9867 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1RwwKK-0000pi-Vg for patchwork@linuxtv.org; Mon, 13 Feb 2012 14:52:21 +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 1RwwKK-00043D-AQ; Mon, 13 Feb 2012 14:52:20 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756639Ab2BMNwR (ORCPT ); Mon, 13 Feb 2012 08:52:17 -0500 Received: from mail-wi0-f174.google.com ([209.85.212.174]:39134 "EHLO mail-wi0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756571Ab2BMNwP (ORCPT ); Mon, 13 Feb 2012 08:52:15 -0500 Received: by wics10 with SMTP id s10so3471849wic.19 for ; Mon, 13 Feb 2012 05:52:14 -0800 (PST) MIME-Version: 1.0 Received: by 10.216.137.66 with SMTP id x44mr4805146wei.41.1329141134011; Mon, 13 Feb 2012 05:52:14 -0800 (PST) Received: from localhost.localdomain (182.50.18.95.dynamic.jazztel.es. [95.18.50.182]) by mx.google.com with ESMTPS id eq5sm46989029wib.2.2012.02.13.05.52.12 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 13 Feb 2012 05:52:13 -0800 (PST) From: Javier Martin To: linux-media@vger.kernel.org Cc: g.liakhovetski@gmx.de, mchehab@infradead.org, s.hauer@pengutronix.de, Javier Martin Subject: [PATCH 5/6] media: i.MX27 camera: fix compilation warning. Date: Mon, 13 Feb 2012 14:51:54 +0100 Message-Id: <1329141115-23133-6-git-send-email-javier.martin@vista-silicon.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1329141115-23133-1-git-send-email-javier.martin@vista-silicon.com> References: <1329141115-23133-1-git-send-email-javier.martin@vista-silicon.com> X-Gm-Message-State: ALoCoQnbjXhRS7j57emhjpv+yZm4dabTLDpG4HTeaDiJb86P2OJbU3nopC1wdaqgcwhRyJrUlnsC 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.2.13.134523 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' MULTIPLE_RCPTS 0.1, 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, __ANY_URI 0, __CP_MEDIA_BODY 0, __CP_URI_IN_BODY 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __MIME_VERSION 0, __MULTIPLE_RCPTS_CC_X2 0, __PHISH_SPEAR_SUBJECT 0, __SANE_MSGID 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS ' Signed-off-by: Javier Martin --- drivers/media/video/mx2_camera.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/media/video/mx2_camera.c b/drivers/media/video/mx2_camera.c index d9028f1..8ccdb4a 100644 --- a/drivers/media/video/mx2_camera.c +++ b/drivers/media/video/mx2_camera.c @@ -1210,7 +1210,9 @@ static struct soc_camera_host_ops mx2_soc_camera_host_ops = { static void mx27_camera_frame_done_emma(struct mx2_camera_dev *pcdev, int bufnum, bool err) { +#ifdef DEBUG struct mx2_fmt_cfg *prp = pcdev->emma_prp; +#endif struct mx2_buffer *buf; struct vb2_buffer *vb; unsigned long phys; @@ -1232,18 +1234,16 @@ static void mx27_camera_frame_done_emma(struct mx2_camera_dev *pcdev, if (prp->cfg.channel == 1) { if (readl(pcdev->base_emma + PRP_DEST_RGB1_PTR + 4 * bufnum) != phys) { - dev_err(pcdev->dev, "%p != %p\n", phys, - readl(pcdev->base_emma + - PRP_DEST_RGB1_PTR + - 4 * bufnum)); + dev_err(pcdev->dev, "%p != %p\n", (void *)phys, + (void *)readl(pcdev->base_emma + + PRP_DEST_RGB1_PTR + 4 * bufnum)); } } else { if (readl(pcdev->base_emma + PRP_DEST_Y_PTR - 0x14 * bufnum) != phys) { - dev_err(pcdev->dev, "%p != %p\n", phys, - readl(pcdev->base_emma + - PRP_DEST_Y_PTR - - 0x14 * bufnum)); + dev_err(pcdev->dev, "%p != %p\n", (void *)phys, + (void *)readl(pcdev->base_emma + + PRP_DEST_Y_PTR - 0x14 * bufnum)); } } #endif