2014-10-17 20:00:59

by Fabian Frédérick

Subject: [PATCH 1/1 linux-next] x86: sysfb: use PTR_ERR_OR_ZERO

replace IS_ERR/PTR_ERR

Signed-off-by: Fabian Frederick <[email protected]>
---
arch/x86/kernel/sysfb.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/kernel/sysfb.c b/arch/x86/kernel/sysfb.c
index 193ec2c..160386e 100644
--- a/arch/x86/kernel/sysfb.c
+++ b/arch/x86/kernel/sysfb.c
@@ -67,7 +67,7 @@ static __init int sysfb_init(void)

pd = platform_device_register_resndata(NULL, name, 0,
NULL, 0, si, sizeof(*si));
- return IS_ERR(pd) ? PTR_ERR(pd) : 0;
+ return PTR_ERR_OR_ZERO(pd);
}

/* must execute after PCI subsystem for EFI quirks */
--
1.9.3

2014-10-17 20:46:45

by tip-bot for Vasyl Gomonovych

Subject: [tip:x86/cleanups] x86/sysfb: Use PTR_ERR_OR_ZERO

Commit-ID: e8d95ce9705c6683f57dc146b8c726c4d2242a52
Gitweb: http://git.kernel.org/tip/e8d95ce9705c6683f57dc146b8c726c4d2242a52
Author: Fabian Frederick <[email protected]>
AuthorDate: Fri, 17 Oct 2014 22:00:53 +0200
Committer: H. Peter Anvin <[email protected]>
CommitDate: Fri, 17 Oct 2014 13:40:52 -0700

x86/sysfb: Use PTR_ERR_OR_ZERO

Replace IS_ERR/PTR_ERR

Signed-off-by: Fabian Frederick <[email protected]>
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: H. Peter Anvin <[email protected]>
---
arch/x86/kernel/sysfb.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/kernel/sysfb.c b/arch/x86/kernel/sysfb.c
index 193ec2c..160386e 100644
--- a/arch/x86/kernel/sysfb.c
+++ b/arch/x86/kernel/sysfb.c
@@ -67,7 +67,7 @@ static __init int sysfb_init(void)

pd = platform_device_register_resndata(NULL, name, 0,
NULL, 0, si, sizeof(*si));
- return IS_ERR(pd) ? PTR_ERR(pd) : 0;
+ return PTR_ERR_OR_ZERO(pd);
}

/* must execute after PCI subsystem for EFI quirks */