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: 9215 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 9EE9223E5A for ; Tue, 12 Jun 2012 06:23:47 +0000 (UTC) Received: from mail-yw0-f52.google.com (mail-yw0-f52.google.com [209.85.213.52]) by fiordland.canonical.com (Postfix) with ESMTP id 5CAE0A18971 for ; Tue, 12 Jun 2012 06:23:47 +0000 (UTC) Received: by yhpp61 with SMTP id p61so3469470yhp.11 for ; Mon, 11 Jun 2012 23:23:46 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:x-gm-message-state; bh=n10P3Qwy9xBdFV9ewl5MTLtHK+VZx7fWtoOZKQO4K+Q=; b=P7ypUIIZk5nZ1gnyKQIxtCwSfLLFZIgiVWwusF/hloppA3ssVyv7scQjdUSnZi6ONg ec2Rmpg+VeApt66QeMjpR/zMmnQ0xMqW0d9jgthAAZU/RsAAQ7k8I6/6ABmmtuTkelfr 2u/hL0neTBjpBEpLhMg+fXE+JhEQ074nUJw9b7NG1DgUbYzkNOMsO2T9Zv6+/5OiWR2S uenyvqozakPYR8A58xcO8BgtCEriv/WsB3dYKbctnA/hen1PcXNfBfvkadiiTi7ve0rd jKi4yuiQ7bS/onETIoI6K+GC719rKC3owSvmfxjlyllXmwICJPzqzuXft3mpNGAtwmE6 08Vg== Received: by 10.50.163.99 with SMTP id yh3mr7536901igb.53.1339482226681; Mon, 11 Jun 2012 23:23:46 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.231.24.148 with SMTP id v20csp149273ibb; Mon, 11 Jun 2012 23:23:46 -0700 (PDT) Received: by 10.68.130.9 with SMTP id oa9mr36313923pbb.95.1339482225996; Mon, 11 Jun 2012 23:23:45 -0700 (PDT) Received: from mail-pb0-f50.google.com (mail-pb0-f50.google.com [209.85.160.50]) by mx.google.com with ESMTPS id jy9si938158pbc.190.2012.06.11.23.23.45 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 11 Jun 2012 23:23:45 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.160.50 is neither permitted nor denied by best guess record for domain of sachin.kamat@linaro.org) client-ip=209.85.160.50; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.160.50 is neither permitted nor denied by best guess record for domain of sachin.kamat@linaro.org) smtp.mail=sachin.kamat@linaro.org Received: by pbbrr4 with SMTP id rr4so414838pbb.37 for ; Mon, 11 Jun 2012 23:23:45 -0700 (PDT) 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: ALoCoQmKu5Je+HsMofbgkg0gtAYuKS4FCJVPBsfvuTEDTPj04HtGV5PIuU0L/fOIKzRbcWeDSKno 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);