From: Rusty Russell <rusty@rustcorp.com.au>
To: linux-kernel@vger.kernel.org
Cc: Rusty Russell <rusty@rustcorp.com.au>,
"Rafael J. Wysocki" <rafael.j.wysocki@intel.com>,
Alexandru Gheorghiu <gheorghiuandru@gmail.com>
Subject: [PATCH 4/9] acpi: Replace weird use of PTR_RET.
Date: Sun, 16 Jun 2013 14:12:43 +0930 [thread overview]
Message-ID: <1371357768-4968-4-git-send-email-rusty@rustcorp.com.au> (raw)
In-Reply-To: <1371357768-4968-1-git-send-email-rusty@rustcorp.com.au>
This functions is really weird. It sets rc to -ENOMEM, then overrides
it. It was converted to PTR_RET in a1458187 when it should have
simply been rewritten.
This version makes it more explicit, with a single IS_ERR() test.
Cc: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Cc: Alexandru Gheorghiu <gheorghiuandru@gmail.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
---
drivers/acpi/acpi_pad.c | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/drivers/acpi/acpi_pad.c b/drivers/acpi/acpi_pad.c
index 27bb6a9..46e0b3c 100644
--- a/drivers/acpi/acpi_pad.c
+++ b/drivers/acpi/acpi_pad.c
@@ -231,16 +231,19 @@ static struct task_struct *ps_tsks[NR_CPUS];
static unsigned int ps_tsk_num;
static int create_power_saving_task(void)
{
- int rc = -ENOMEM;
+ int rc;
ps_tsks[ps_tsk_num] = kthread_run(power_saving_thread,
(void *)(unsigned long)ps_tsk_num,
"acpi_pad/%d", ps_tsk_num);
- rc = PTR_RET(ps_tsks[ps_tsk_num]);
- if (!rc)
- ps_tsk_num++;
- else
+
+ if (IS_ERR(ps_tsks[ps_tsk_num])) {
+ rc = PTR_ERR(ps_tsks[ps_tsk_num]);
ps_tsks[ps_tsk_num] = NULL;
+ } else {
+ rc = 0;
+ ps_tsk_num++;
+ }
return rc;
}
--
1.8.1.2
next prev parent reply other threads:[~2013-06-16 4:46 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-01 9:56 [PATCH] virtio-mmio: Cocci spatch "ptr_ret.spatch" Thomas Meyer
2013-06-03 2:29 ` [RFC] PTR_ERR: return 0 if ptr isn't an error value Rusty Russell
2013-06-03 7:15 ` Uwe Kleine-König
2013-06-08 21:07 ` Julia Lawall
2013-06-13 4:37 ` Rusty Russell
2013-06-13 7:30 ` Michael S. Tsirkin
2013-06-13 7:56 ` Julia Lawall
2013-06-16 2:44 ` Rusty Russell
2013-06-16 4:42 ` [PATCH 1/9] PTR_RET is now PTR_ERR_OR_ZERO Rusty Russell
2013-06-16 4:42 ` [PATCH 2/9] PTR_RET is now PTR_ERR_OR_ZERO(): Replace most Rusty Russell
2013-06-20 6:05 ` David Miller
2013-06-25 7:47 ` Benjamin Herrenschmidt
2013-06-16 4:42 ` [PATCH 3/9] s390: Replace weird use of PTR_RET Rusty Russell
2013-06-17 5:03 ` Heiko Carstens
2013-06-16 4:42 ` Rusty Russell [this message]
2013-06-16 11:55 ` [PATCH 4/9] acpi: " Rafael J. Wysocki
2013-06-16 4:42 ` [PATCH 5/9] pinctrl: don't use PTR_RET() Rusty Russell
2013-06-16 4:42 ` [PATCH 6/9] remoteproc: " Rusty Russell
2013-06-17 3:15 ` Ohad Ben-Cohen
2013-06-17 3:49 ` Rusty Russell
2013-06-16 4:42 ` [PATCH 7/9] staging/zcache: " Rusty Russell
2013-06-16 4:42 ` [PATCH 8/9] x86: remove weird PTR_ERR() in do_debug Rusty Russell
2013-06-19 18:43 ` [tip:x86/debug] x86: Remove " tip-bot for Rusty Russell
2013-06-16 4:42 ` [PATCH 9/9] mm/oom_kill: remove weird use of ERR_PTR()/PTR_ERR() Rusty Russell
2013-06-16 18:11 ` David Rientjes
2013-06-17 3:50 ` Rusty Russell
2013-06-09 5:55 ` [RFC] PTR_ERR: return 0 if ptr isn't an error value Rusty Russell
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=1371357768-4968-4-git-send-email-rusty@rustcorp.com.au \
--to=rusty@rustcorp.com.au \
--cc=gheorghiuandru@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=rafael.j.wysocki@intel.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome