2015-02-19 08:14:38

by Fengguang Wu

Subject: [PATCH] x86/intel/quark: fix ptr_ret.cocci warnings

arch/x86/platform/intel-quark/imr.c:280:1-3: WARNING: PTR_ERR_OR_ZERO can be used


Use PTR_ERR_OR_ZERO rather than if(IS_ERR(...)) + PTR_ERR

Generated by: scripts/coccinelle/api/ptr_ret.cocci

CC: Bryan O'Donoghue <[email protected]>
Signed-off-by: Fengguang Wu <[email protected]>
---

imr.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)

--- a/arch/x86/platform/intel-quark/imr.c
+++ b/arch/x86/platform/intel-quark/imr.c
@@ -277,10 +277,7 @@ static int imr_debugfs_register(struct i
{
idev->file = debugfs_create_file("imr_state", S_IFREG | S_IRUGO, NULL,
idev, &imr_state_ops);
- if (IS_ERR(idev->file))
- return PTR_ERR(idev->file);
-
- return 0;
+ return PTR_ERR_OR_ZERO(idev->file);
}

/**

2015-02-19 10:12:17

by Bryan O'Donoghue

Subject: Re: [PATCH] x86/intel/quark: fix ptr_ret.cocci warnings

On 19/02/15 08:14, kbuild test robot wrote:
> arch/x86/platform/intel-quark/imr.c:280:1-3: WARNING: PTR_ERR_OR_ZERO can be used
>
>
> Use PTR_ERR_OR_ZERO rather than if(IS_ERR(...)) + PTR_ERR
>
> Generated by: scripts/coccinelle/api/ptr_ret.cocci
>
> CC: Bryan O'Donoghue <[email protected]>
> Signed-off-by: Fengguang Wu <[email protected]>
> ---
>
> imr.c | 5 +----
> 1 file changed, 1 insertion(+), 4 deletions(-)
>
> --- a/arch/x86/platform/intel-quark/imr.c
> +++ b/arch/x86/platform/intel-quark/imr.c
> @@ -277,10 +277,7 @@ static int imr_debugfs_register(struct i
> {
> idev->file = debugfs_create_file("imr_state", S_IFREG | S_IRUGO, NULL,
> idev, &imr_state_ops);
> - if (IS_ERR(idev->file))
> - return PTR_ERR(idev->file);
> -
> - return 0;
> + return PTR_ERR_OR_ZERO(idev->file);
> }
>
> /**
>

This is a reasonable change.

ACK

2015-02-19 11:31:59

by tip-bot for Vasyl Gomonovych

Subject: [tip:x86/platform] x86/intel/quark: Fix ptr_ret.cocci warnings

Commit-ID: 32d39169d7f56849b8c6c8c51aca7b73194d05f1
Gitweb: http://git.kernel.org/tip/32d39169d7f56849b8c6c8c51aca7b73194d05f1
Author: Fengguang Wu <[email protected]>
AuthorDate: Thu, 19 Feb 2015 16:14:32 +0800
Committer: Ingo Molnar <[email protected]>
CommitDate: Thu, 19 Feb 2015 10:00:54 +0100

x86/intel/quark: Fix ptr_ret.cocci warnings

arch/x86/platform/intel-quark/imr.c:280:1-3: WARNING: PTR_ERR_OR_ZERO can be used

Use PTR_ERR_OR_ZERO rather than if(IS_ERR(...)) + PTR_ERR

Generated by: scripts/coccinelle/api/ptr_ret.cocci

Signed-off-by: Fengguang Wu <[email protected]>
Cc: Andy Shevchenko <[email protected]>
Cc: Ong, Boon Leong <[email protected]>
Cc: Bryan O'Donoghue <[email protected]>
Cc: Darren Hart <[email protected]>
Cc: [email protected]
Link: http://lkml.kernel.org/r/20150219081432.GA21983@waimea
Signed-off-by: Ingo Molnar <[email protected]>
---
arch/x86/platform/intel-quark/imr.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/arch/x86/platform/intel-quark/imr.c b/arch/x86/platform/intel-quark/imr.c
index 16e4df1..60c01eb 100644
--- a/arch/x86/platform/intel-quark/imr.c
+++ b/arch/x86/platform/intel-quark/imr.c
@@ -277,10 +277,7 @@ static int imr_debugfs_register(struct imr_device *idev)
{
idev->file = debugfs_create_file("imr_state", S_IFREG | S_IRUGO, NULL,
idev, &imr_state_ops);
- if (IS_ERR(idev->file))
- return PTR_ERR(idev->file);
-
- return 0;
+ return PTR_ERR_OR_ZERO(idev->file);
}

/**