From: jean.pihet@newoldbits.com (Jean Pihet)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 20/20] ARM: OMAP3+: SmartReflex: fix error handling
Date: Wed, 1 Feb 2012 09:49:59 +0100 [thread overview]
Message-ID: <1328086199-28486-21-git-send-email-j-pihet@ti.com> (raw)
In-Reply-To: <1328086199-28486-1-git-send-email-j-pihet@ti.com>
Fix the code to correctly use IS_ERR and PTR_ERR on the return
values pointers
Reported-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Jean Pihet <j-pihet@ti.com>
---
arch/arm/mach-omap2/smartreflex.c | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/arch/arm/mach-omap2/smartreflex.c b/arch/arm/mach-omap2/smartreflex.c
index 96a97c1..205531b 100644
--- a/arch/arm/mach-omap2/smartreflex.c
+++ b/arch/arm/mach-omap2/smartreflex.c
@@ -536,7 +536,7 @@ int sr_configure_errgen(struct voltagedomain *voltdm)
if (IS_ERR(sr)) {
pr_warning("%s: omap_sr struct for sr_%s not found\n",
__func__, voltdm->name);
- return -EINVAL;
+ return PTR_ERR(sr);
}
if (!sr->clk_length)
@@ -604,7 +604,7 @@ int sr_disable_errgen(struct voltagedomain *voltdm)
if (IS_ERR(sr)) {
pr_warning("%s: omap_sr struct for sr_%s not found\n",
__func__, voltdm->name);
- return -EINVAL;
+ return PTR_ERR(sr);
}
switch (sr->ip_type) {
@@ -655,7 +655,7 @@ int sr_configure_minmax(struct voltagedomain *voltdm)
if (IS_ERR(sr)) {
pr_warning("%s: omap_sr struct for sr_%s not found\n",
__func__, voltdm->name);
- return -EINVAL;
+ return PTR_ERR(sr);
}
if (!sr->clk_length)
@@ -741,7 +741,7 @@ int sr_enable(struct voltagedomain *voltdm, unsigned long volt)
if (IS_ERR(sr)) {
pr_warning("%s: omap_sr struct for sr_%s not found\n",
__func__, voltdm->name);
- return -EINVAL;
+ return PTR_ERR(sr);
}
volt_data = omap_voltage_get_voltdata(sr->voltdm, volt);
@@ -749,7 +749,7 @@ int sr_enable(struct voltagedomain *voltdm, unsigned long volt)
if (IS_ERR(volt_data)) {
dev_warn(&sr->pdev->dev, "%s: Unable to get voltage table"
"for nominal voltage %ld\n", __func__, volt);
- return -ENODATA;
+ return PTR_ERR(volt_data);
}
nvalue_reciprocal = sr_retrieve_nvalue(sr, volt_data->sr_efuse_offs);
@@ -839,10 +839,10 @@ int sr_notifier_control(struct voltagedomain *voltdm, bool enable)
struct omap_sr *sr = _sr_lookup(voltdm);
u32 value = 0;
- if (!sr) {
+ if (IS_ERR(sr)) {
pr_warning("%s: sr corresponding to domain not found\n",
__func__);
- return -EINVAL;
+ return PTR_ERR(sr);
}
if (!sr->autocomp_active)
return -EINVAL;
@@ -1258,7 +1258,7 @@ static int __devexit omap_sr_remove(struct platform_device *pdev)
if (IS_ERR(sr_info)) {
dev_warn(&pdev->dev, "%s: omap_sr struct not found\n",
__func__);
- return -EINVAL;
+ return PTR_ERR(sr_info);
}
if (sr_info->autocomp_active)
--
1.7.5.4
next prev parent reply other threads:[~2012-02-01 8:49 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-01 8:49 [PATCH v3 00/20] ARM: OMAP3+: SmartReflex: bugfixes Jean Pihet
2012-02-01 8:49 ` [PATCH 01/20] ARM: OMAP3+: SmartReflex: Layer Cleanup [V4] Jean Pihet
2012-02-01 8:49 ` [PATCH 02/20] ARM: OMAP3+: SmartReflex: add missing error-handling code Jean Pihet
2012-02-01 8:49 ` [PATCH 03/20] ARM: OMAP3+: SmartReflex: fix err interrupt disable sequence Jean Pihet
2012-02-01 8:49 ` [PATCH 04/20] ARM: OMAP3+: SmartReflex Class3: disable errorgen before disable VP Jean Pihet
2012-02-01 8:49 ` [PATCH 05/20] ARM: OMAP3+: SmartReflex: Add a shutdown hook Jean Pihet
2012-02-01 8:49 ` [PATCH 06/20] ARM: OMAP3+: SmartReflex: Fix status masking in ERRCONFIG register Jean Pihet
2012-02-01 8:49 ` [PATCH 07/20] ARM: OMAP3+: SmartReflex: clear ERRCONFIG_VPBOUNDINTST only on a need Jean Pihet
2012-02-02 19:15 ` Kevin Hilman
2012-02-01 8:49 ` [PATCH 08/20] ARM: OMAP3+: hwmod: add SmartReflex IRQs Jean Pihet
2012-02-01 8:49 ` [PATCH 09/20] ARM: OMAP3+: SmartReflex: introduce class init, deinit and priv data Jean Pihet
2012-02-01 8:49 ` [PATCH 10/20] ARM: OMAP3+: SmartReflex: introduce notifiers flags Jean Pihet
2012-02-01 8:49 ` [PATCH 11/20] ARM: OMAP3+: SmartReflex: introduce notifier_control Jean Pihet
2012-02-01 8:49 ` [PATCH 12/20] ARM: OMAP3+: SmartReflex: disable spamming interrupts Jean Pihet
2012-02-01 8:49 ` [PATCH 13/20] ARM: OMAP3+: SmartReflex: introduce class private data per voltage domain Jean Pihet
2012-02-01 8:49 ` [PATCH 14/20] ARM: OMAP3+: SmartReflex Class3: restrict CPU to run on Jean Pihet
2012-02-01 8:49 ` [PATCH 15/20] ARM: OMAP3+: SmartReflex: add missing platform_set_drvdata() Jean Pihet
2012-02-01 8:49 ` [PATCH 16/20] ARM: OMAP3+: SmartReflex: move late_initcall() closer to its argument Jean Pihet
2012-02-01 8:49 ` [PATCH 17/20] ARM: OMAP3+: SmartReflex: misc cleanups Jean Pihet
2012-02-01 8:49 ` [PATCH 18/20] ARM: OMAP3+: SmartReflex: micro-optimization for sanity check Jean Pihet
2012-02-01 8:49 ` [PATCH 19/20] ARM: OMAP3+: SmartReflex: fix the use of debugfs_create_* API Jean Pihet
2012-02-01 8:49 ` Jean Pihet [this message]
2012-02-02 19:23 ` [PATCH v3 00/20] ARM: OMAP3+: SmartReflex: bugfixes Kevin Hilman
2012-02-08 17:52 ` Jean Pihet
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=1328086199-28486-21-git-send-email-j-pihet@ti.com \
--to=jean.pihet@newoldbits.com \
--cc=linux-arm-kernel@lists.infradead.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).