From patchwork Thu Mar 21 10:03:58 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sachin Kamat X-Patchwork-Id: 15451 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 916EA23E75 for ; Thu, 21 Mar 2013 10:15:15 +0000 (UTC) Received: from mail-ve0-f177.google.com (mail-ve0-f177.google.com [209.85.128.177]) by fiordland.canonical.com (Postfix) with ESMTP id 43050A18F46 for ; Thu, 21 Mar 2013 10:15:15 +0000 (UTC) Received: by mail-ve0-f177.google.com with SMTP id m1so2263686ves.36 for ; Thu, 21 Mar 2013 03:15:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:x-received:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state; bh=kIkoyZhYxmNFV+o0LQuEsbfmFI0YjuywSVa6YYSW6SM=; b=Ev6UKe/bu1lxcHdOEls+JcRAygTE3jc9h3tDTai1IYQ0LsKz3K+K1/+Q2GgGwRAg/i RvMoj8ImhoEtxKmQCxtGl1SZjuzhCQgjwzAfiU/fn6IfiT5pqFWlTqcefiRHcB1bP+k0 vYXx3ySyWDdpxexJrZ42q6BUk9lKcWO5rhJ4lvnY8Fe2oKOCE7EbGpxmZFRe3ejiD2zd 2o0diwhN9dzlPfDC0H9xiVsFtUwslKPNbqx+SZwqggD+IBJ6C/mMU72BKXc2/vxKOkdM y6gcnne31TS1ONzhVeCcBUNNo4k14ahHez+eoVeXRK189vXxNMbTN11m3+1LtcfGy3TF CzFQ== X-Received: by 10.58.224.101 with SMTP id rb5mr12726628vec.17.1363860914778; Thu, 21 Mar 2013 03:15:14 -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.58.233.198 with SMTP id ty6csp53162vec; Thu, 21 Mar 2013 03:15:14 -0700 (PDT) X-Received: by 10.68.56.232 with SMTP id d8mr13645653pbq.162.1363860913594; Thu, 21 Mar 2013 03:15:13 -0700 (PDT) Received: from mail-pb0-f49.google.com (mail-pb0-f49.google.com [209.85.160.49]) by mx.google.com with ESMTPS id qf10si5802738pbc.98.2013.03.21.03.15.13 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 21 Mar 2013 03:15:13 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.160.49 is neither permitted nor denied by best guess record for domain of sachin.kamat@linaro.org) client-ip=209.85.160.49; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.160.49 is neither permitted nor denied by best guess record for domain of sachin.kamat@linaro.org) smtp.mail=sachin.kamat@linaro.org Received: by mail-pb0-f49.google.com with SMTP id xa12so2137379pbc.36 for ; Thu, 21 Mar 2013 03:15:13 -0700 (PDT) X-Received: by 10.66.191.136 with SMTP id gy8mr14218351pac.88.1363860913223; Thu, 21 Mar 2013 03:15:13 -0700 (PDT) Received: from localhost.localdomain ([115.113.119.130]) by mx.google.com with ESMTPS id yr10sm5989471pab.6.2013.03.21.03.15.10 (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 21 Mar 2013 03:15:12 -0700 (PDT) From: Sachin Kamat To: dri-devel@lists.freedesktop.org Cc: inki.dae@samsung.com, jy0922.shim@samsung.com, sachin.kamat@linaro.org, patches@linaro.org Subject: [PATCH 2/3] drm/exynos: mixer: Fix incorrect usage of IS_ERR_OR_NULL Date: Thu, 21 Mar 2013 15:33:58 +0530 Message-Id: <1363860239-916-2-git-send-email-sachin.kamat@linaro.org> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1363860239-916-1-git-send-email-sachin.kamat@linaro.org> References: <1363860239-916-1-git-send-email-sachin.kamat@linaro.org> X-Gm-Message-State: ALoCoQk2u1UTMp9pVVbKjRoR1eqOyxL76Re0vniecIq6zLLP2/DHmwowrViz+eLFBDXykrbNcmvm Use IS_ERR instead of IS_ERR_OR_NULL on clk_get results. Signed-off-by: Sachin Kamat --- drivers/gpu/drm/exynos/exynos_mixer.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos_mixer.c b/drivers/gpu/drm/exynos/exynos_mixer.c index 2f4f72f..2bd85c8 100644 --- a/drivers/gpu/drm/exynos/exynos_mixer.c +++ b/drivers/gpu/drm/exynos/exynos_mixer.c @@ -1047,13 +1047,13 @@ static int mixer_resources_init(struct exynos_drm_hdmi_context *ctx, spin_lock_init(&mixer_res->reg_slock); mixer_res->mixer = devm_clk_get(dev, "mixer"); - if (IS_ERR_OR_NULL(mixer_res->mixer)) { + if (IS_ERR(mixer_res->mixer)) { dev_err(dev, "failed to get clock 'mixer'\n"); return -ENODEV; } mixer_res->sclk_hdmi = devm_clk_get(dev, "sclk_hdmi"); - if (IS_ERR_OR_NULL(mixer_res->sclk_hdmi)) { + if (IS_ERR(mixer_res->sclk_hdmi)) { dev_err(dev, "failed to get clock 'sclk_hdmi'\n"); return -ENODEV; } @@ -1096,17 +1096,17 @@ static int vp_resources_init(struct exynos_drm_hdmi_context *ctx, struct resource *res; mixer_res->vp = devm_clk_get(dev, "vp"); - if (IS_ERR_OR_NULL(mixer_res->vp)) { + if (IS_ERR(mixer_res->vp)) { dev_err(dev, "failed to get clock 'vp'\n"); return -ENODEV; } mixer_res->sclk_mixer = devm_clk_get(dev, "sclk_mixer"); - if (IS_ERR_OR_NULL(mixer_res->sclk_mixer)) { + if (IS_ERR(mixer_res->sclk_mixer)) { dev_err(dev, "failed to get clock 'sclk_mixer'\n"); return -ENODEV; } mixer_res->sclk_dac = devm_clk_get(dev, "sclk_dac"); - if (IS_ERR_OR_NULL(mixer_res->sclk_dac)) { + if (IS_ERR(mixer_res->sclk_dac)) { dev_err(dev, "failed to get clock 'sclk_dac'\n"); return -ENODEV; }