Re: [PATCH 4/9] acpi: Replace weird use of PTR_RET.

From: Rafael J. Wysocki
Date: Sun Jun 16 2013 - 07:46:00 EST


On Sunday, June 16, 2013 02:12:43 PM Rusty Russell wrote:
> 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@xxxxxxxxx>
> Cc: Alexandru Gheorghiu <gheorghiuandru@xxxxxxxxx>
> Signed-off-by: Rusty Russell <rusty@xxxxxxxxxxxxxxx>

Acked-by: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>

> ---
> 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;
> }
>
--
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/