From patchwork Tue Jun 12 06:12:26 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sachin Kamat X-Patchwork-Id: 11675 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1SeKW5-0008Pv-Gs for patchwork@linuxtv.org; Tue, 12 Jun 2012 08:23:49 +0200 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 1SeKW4-0000j8-CN; Tue, 12 Jun 2012 08:23:49 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751939Ab2FLGXq (ORCPT ); Tue, 12 Jun 2012 02:23:46 -0400 Received: from mail-pb0-f46.google.com ([209.85.160.46]:46135 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751499Ab2FLGXq (ORCPT ); Tue, 12 Jun 2012 02:23:46 -0400 Received: by pbbrp8 with SMTP id rp8so354857pbb.19 for ; Mon, 11 Jun 2012 23:23:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:x-gm-message-state; bh=n10P3Qwy9xBdFV9ewl5MTLtHK+VZx7fWtoOZKQO4K+Q=; b=GA3UyZVyWt8lZK7OSK8DFXtFNO/s1Bw6yn1rEk1ja2xfL6O0nJS08IpUyzVvK9MXAg mP4or7BW5kicjj5NJnYtZb2NuGx5uds3i6whb9hBE+pzWu/0EZNI9HiK2CtcYTMTR22q hnZihuSITO+iWHZW5u/qB40ynvghZuUtoCgx2SJV2P+Gftbb9QUbMNXnvlig5zjFJ2UX LJynZKFJ5yOtWk1lqvNK0+6kY4Z/gfZRB6eEWJXv53elw74loPm3PP/ibeO5v6mH/Q3D iEUolSWRWDIVtr/mlb/uQq6A/mFzB8Didtxe352m86OrG5aHNYbf2j7qISu0OGWKPHqD NDbw== Received: by 10.68.232.103 with SMTP id tn7mr34204976pbc.86.1339482225741; Mon, 11 Jun 2012 23:23:45 -0700 (PDT) Received: from localhost.localdomain ([115.113.119.130]) by mx.google.com with ESMTPS id io2sm933026pbc.24.2012.06.11.23.23.42 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 11 Jun 2012 23:23:45 -0700 (PDT) From: Sachin Kamat To: linux-media@vger.kernel.org Cc: s.nawrocki@samsung.com, snjw23@gmail.com, mchehab@infradead.org, sachin.kamat@linaro.org, patches@linaro.org Subject: [PATCH 1/1] [media] s5p-fimc: Replace custom err() macro with v4l2_err() macro Date: Tue, 12 Jun 2012 11:42:26 +0530 Message-Id: <1339481546-24491-1-git-send-email-sachin.kamat@linaro.org> X-Mailer: git-send-email 1.7.4.1 X-Gm-Message-State: ALoCoQkNgnJe2o5/twJH72bNAwrbh/iZSwwb2W6/bek9NUzCx7RyUQBib+5DpKB/nsjUYpk0BudK 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.6.12.61221 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1800_1899 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, URI_ENDS_IN_HTML 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, __MULTIPLE_RCPTS_CC_X2 0, __SANE_MSGID 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS ' Replace custom err() macro with v4l2_err() macro. Signed-off-by: Sachin Kamat --- drivers/media/video/s5p-fimc/fimc-core.h | 3 --- drivers/media/video/s5p-fimc/fimc-reg.c | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/media/video/s5p-fimc/fimc-core.h b/drivers/media/video/s5p-fimc/fimc-core.h index 95b27ae..808ccc6 100644 --- a/drivers/media/video/s5p-fimc/fimc-core.h +++ b/drivers/media/video/s5p-fimc/fimc-core.h @@ -27,9 +27,6 @@ #include #include -#define err(fmt, args...) \ - printk(KERN_ERR "%s:%d: " fmt "\n", __func__, __LINE__, ##args) - #define dbg(fmt, args...) \ pr_debug("%s:%d: " fmt "\n", __func__, __LINE__, ##args) diff --git a/drivers/media/video/s5p-fimc/fimc-reg.c b/drivers/media/video/s5p-fimc/fimc-reg.c index 1fc4ce8..3a82eac 100644 --- a/drivers/media/video/s5p-fimc/fimc-reg.c +++ b/drivers/media/video/s5p-fimc/fimc-reg.c @@ -683,7 +683,7 @@ int fimc_hw_set_camera_type(struct fimc_dev *fimc, cfg |= FIMC_REG_CIGCTRL_CAM_JPEG; break; default: - v4l2_err(fimc->vid_cap.vfd, + v4l2_err(vid_cap->vfd, "Not supported camera pixel format: %d", vid_cap->mf.code); return -EINVAL; @@ -699,7 +699,7 @@ int fimc_hw_set_camera_type(struct fimc_dev *fimc, } else if (cam->bus_type == FIMC_LCD_WB) { cfg |= FIMC_REG_CIGCTRL_CAMIF_SELWB; } else { - err("invalid camera bus type selected\n"); + v4l2_err(vid_cap->vfd, "Invalid camera bus type selected\n"); return -EINVAL; } writel(cfg, fimc->regs + FIMC_REG_CIGCTRL);