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: 2319061 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork1.kernel.org (Postfix) with ESMTP id 939C13FD8C for ; Fri, 22 Mar 2013 11:34:12 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9C22DE610C for ; Fri, 22 Mar 2013 04:34:12 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pb0-f41.google.com (mail-pb0-f41.google.com [209.85.160.41]) by gabe.freedesktop.org (Postfix) with ESMTP id E7C08E5DC3 for ; Thu, 21 Mar 2013 03:15:13 -0700 (PDT) Received: by mail-pb0-f41.google.com with SMTP id um15so2141315pbc.0 for ; Thu, 21 Mar 2013 03:15:13 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=kIkoyZhYxmNFV+o0LQuEsbfmFI0YjuywSVa6YYSW6SM=; b=l40b+lUj/YoXqRpkxI9vWfQbUQqixFA+z4grd+R/yErEWIRJ70yKRPl47SO6xQBHkG cCA6nywAOpPGHpRs4YPHum74+QmLb3u5TNGU/KjcCjwjq88/MfifB/VeM43GnOCL1lyX tNf+q4rcKpyIP/QoJYl0JfbrirKIhRzL7NRLD1JWcf+RF7giJoDHGnfWm9RH70MCBY1P Q0kGx7DCwbKoeWxxHjd/xrNyrEVBbtklQKkawjv5kzGTjGl5Y9Y7vQ68COCFHyjldnLw JJN8eVh1ZOwHfcbieu+4rA3KCkAUYzYu/u+i6OoRe/6Vm9pvqBfAINpBEVsepiX0F1sU XG1g== 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 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: ALoCoQk9YdDrzx4Ib6QB9udFVplr1z6Cvtd8yD7TMFuG4yWeXM11W9QCv3SBbZQHXHxh8kcmHq10 X-Mailman-Approved-At: Fri, 22 Mar 2013 04:33:08 -0700 Cc: sachin.kamat@linaro.org, patches@linaro.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org 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; }