From: Tony Prisk <linux@prisktech.co.nz>
To: Mike Turquette <mturquette@linaro.org>
Cc: Tony Prisk <linux@prisktech.co.nz>,
Kyungmin Park <kyungmin.park@samsung.com>,
Tomasz Stanislawski <t.stanislaws@samsung.com>,
linux-media@vger.kernel.org
Subject: [PATCH 6/6] clk: s5p-g2d: Fix incorrect usage of IS_ERR_OR_NULL
Date: Tue, 18 Dec 2012 21:28:41 +1300 [thread overview]
Message-ID: <1355819321-21914-7-git-send-email-linux@prisktech.co.nz> (raw)
In-Reply-To: <1355819321-21914-1-git-send-email-linux@prisktech.co.nz>
Replace IS_ERR_OR_NULL with IS_ERR on clk_get results.
Signed-off-by: Tony Prisk <linux@prisktech.co.nz>
CC: Kyungmin Park <kyungmin.park@samsung.com>
CC: Tomasz Stanislawski <t.stanislaws@samsung.com>
CC: linux-media@vger.kernel.org
---
drivers/media/platform/s5p-g2d/g2d.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/media/platform/s5p-g2d/g2d.c b/drivers/media/platform/s5p-g2d/g2d.c
index 1bfbc32..dcd5335 100644
--- a/drivers/media/platform/s5p-g2d/g2d.c
+++ b/drivers/media/platform/s5p-g2d/g2d.c
@@ -715,7 +715,7 @@ static int g2d_probe(struct platform_device *pdev)
}
dev->clk = clk_get(&pdev->dev, "sclk_fimg2d");
- if (IS_ERR_OR_NULL(dev->clk)) {
+ if (IS_ERR(dev->clk)) {
dev_err(&pdev->dev, "failed to get g2d clock\n");
return -ENXIO;
}
@@ -727,7 +727,7 @@ static int g2d_probe(struct platform_device *pdev)
}
dev->gate = clk_get(&pdev->dev, "fimg2d");
- if (IS_ERR_OR_NULL(dev->gate)) {
+ if (IS_ERR(dev->gate)) {
dev_err(&pdev->dev, "failed to get g2d clock gate\n");
ret = -ENXIO;
goto unprep_clk;
--
1.7.9.5
prev parent reply other threads:[~2012-12-18 8:29 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1355819321-21914-1-git-send-email-linux@prisktech.co.nz>
2012-12-18 8:28 ` [PATCH 2/6] clk: exynos: Fix incorrect usage of IS_ERR_OR_NULL Tony Prisk
2012-12-18 8:28 ` [PATCH 3/6] " Tony Prisk
2012-12-18 8:28 ` [PATCH 4/6] clk: s5p-tv: " Tony Prisk
2012-12-18 8:28 ` [PATCH 5/6] clk: s5p-fimc: " Tony Prisk
2013-01-01 18:35 ` Sylwester Nawrocki
2012-12-18 8:28 ` Tony Prisk [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1355819321-21914-7-git-send-email-linux@prisktech.co.nz \
--to=linux@prisktech.co.nz \
--cc=kyungmin.park@samsung.com \
--cc=linux-media@vger.kernel.org \
--cc=mturquette@linaro.org \
--cc=t.stanislaws@samsung.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.