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

From: tip-bot for Fengguang Wu
Date: Thu Feb 19 2015 - 06:32:08 EST


Commit-ID: 32d39169d7f56849b8c6c8c51aca7b73194d05f1
Gitweb: http://git.kernel.org/tip/32d39169d7f56849b8c6c8c51aca7b73194d05f1
Author: Fengguang Wu <fengguang.wu@xxxxxxxxx>
AuthorDate: Thu, 19 Feb 2015 16:14:32 +0800
Committer: Ingo Molnar <mingo@xxxxxxxxxx>
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 <fengguang.wu@xxxxxxxxx>
Cc: Andy Shevchenko <andy.schevchenko@xxxxxxxxx>
Cc: Ong, Boon Leong <boon.leong.ong@xxxxxxxxx>
Cc: Bryan O'Donoghue <pure.logic@xxxxxxxxxxxxxxxxx>
Cc: Darren Hart <dvhart@xxxxxxxxxxxxxxx>
Cc: kbuild-all@xxxxxx
Link: 20150219081432.GA21983@waimea">http://lkml.kernel.org/r/20150219081432.GA21983@waimea
Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx>
---
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);
}

/**
--
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/