2013-03-13 19:06:39

by Alexandru Gheorghiu

Subject: [PATCH] arch: s390: mm: Use PTR_RET function

Used PTR_RET function instead of IS_ERR and PTR_ERR.
Patch found using coccinelle.

Signed-off-by: Alexandru Gheorghiu <[email protected]>
---
arch/s390/mm/cmm.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/s390/mm/cmm.c b/arch/s390/mm/cmm.c
index 479e942..5cf867f 100644
--- a/arch/s390/mm/cmm.c
+++ b/arch/s390/mm/cmm.c
@@ -458,7 +458,7 @@ static int __init cmm_init(void)
if (rc)
goto out_pm;
cmm_thread_ptr = kthread_run(cmm_thread, NULL, "cmmthread");
- rc = IS_ERR(cmm_thread_ptr) ? PTR_ERR(cmm_thread_ptr) : 0;
+ rc = PTR_RET(cmm_thread_ptr);
if (rc)
goto out_kthread;
return 0;
--
1.7.9.5

2013-03-13 19:10:39

by Al Viro

Subject: Re: [PATCH] arch: s390: mm: Use PTR_RET function

On Wed, Mar 13, 2013 at 09:05:57PM +0200, Alexandru Gheorghiu wrote:
> Used PTR_RET function instead of IS_ERR and PTR_ERR.
> Patch found using coccinelle.
>
> Signed-off-by: Alexandru Gheorghiu <[email protected]>
> ---
> arch/s390/mm/cmm.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/s390/mm/cmm.c b/arch/s390/mm/cmm.c
> index 479e942..5cf867f 100644
> --- a/arch/s390/mm/cmm.c
> +++ b/arch/s390/mm/cmm.c
> @@ -458,7 +458,7 @@ static int __init cmm_init(void)
> if (rc)
> goto out_pm;
> cmm_thread_ptr = kthread_run(cmm_thread, NULL, "cmmthread");
> - rc = IS_ERR(cmm_thread_ptr) ? PTR_ERR(cmm_thread_ptr) : 0;
> + rc = PTR_RET(cmm_thread_ptr);
> if (rc)
> goto out_kthread;
> return 0;

Egads... How about
if (!IS_ERR(cmm_thread_ptr))
return 0;
rc = PTR_ERR(cmm_thread_ptr);
instead of the entire thing? out_kthread: is just past that return 0
and there's nothing else leading to it, so with that change the label
itself can go as well.