* [PATCH] powerpc: Use PTR_RET instead of IS_ERR/PTR_ERR
@ 2013-03-10 13:07 Adrian-Leonard Radu
2013-03-11 21:36 ` Geoff Levand
0 siblings, 1 reply; 2+ messages in thread
From: Adrian-Leonard Radu @ 2013-03-10 13:07 UTC (permalink / raw)
To: benh
Cc: cbe-oss-dev, geoff, fweisbec, akinobu.mita, rostedt, linux-kernel,
paulus, anton, john.stultz, ady8radu, linuxppc-dev, cascardo
Signed-off-by: Adrian-Leonard Radu <ady8radu@gmail.com>
---
arch/powerpc/kernel/iommu.c | 2 +-
arch/powerpc/kernel/time.c | 4 +---
arch/powerpc/platforms/ps3/time.c | 4 +---
arch/powerpc/sysdev/rtc_cmos_setup.c | 5 +----
4 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/arch/powerpc/kernel/iommu.c b/arch/powerpc/kernel/iommu.c
index 31c4fdc..c0d0dbd 100644
--- a/arch/powerpc/kernel/iommu.c
+++ b/arch/powerpc/kernel/iommu.c
@@ -102,7 +102,7 @@ static int __init fail_iommu_debugfs(void)
struct dentry *dir = fault_create_debugfs_attr("fail_iommu",
NULL, &fail_iommu);
- return IS_ERR(dir) ? PTR_ERR(dir) : 0;
+ return PTR_RET(dir);
}
late_initcall(fail_iommu_debugfs);
diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c
index f77fa22..5fc29ad 100644
--- a/arch/powerpc/kernel/time.c
+++ b/arch/powerpc/kernel/time.c
@@ -1049,10 +1049,8 @@ static int __init rtc_init(void)
return -ENODEV;
pdev = platform_device_register_simple("rtc-generic", -1, NULL, 0);
- if (IS_ERR(pdev))
- return PTR_ERR(pdev);
- return 0;
+ return PTR_RET(pdev);
}
module_init(rtc_init);
diff --git a/arch/powerpc/platforms/ps3/time.c b/arch/powerpc/platforms/ps3/time.c
index 40b5cb4..cba1e6b 100644
--- a/arch/powerpc/platforms/ps3/time.c
+++ b/arch/powerpc/platforms/ps3/time.c
@@ -89,10 +89,8 @@ static int __init ps3_rtc_init(void)
return -ENODEV;
pdev = platform_device_register_simple("rtc-ps3", -1, NULL, 0);
- if (IS_ERR(pdev))
- return PTR_ERR(pdev);
- return 0;
+ return PTR_RET(pdev);
}
module_init(ps3_rtc_init);
diff --git a/arch/powerpc/sysdev/rtc_cmos_setup.c b/arch/powerpc/sysdev/rtc_cmos_setup.c
index 9afba92..af79e1e 100644
--- a/arch/powerpc/sysdev/rtc_cmos_setup.c
+++ b/arch/powerpc/sysdev/rtc_cmos_setup.c
@@ -62,10 +62,7 @@ static int __init add_rtc(void)
pd = platform_device_register_simple("rtc_cmos", -1,
&res[0], num_res);
- if (IS_ERR(pd))
- return PTR_ERR(pd);
-
- return 0;
+ return PTR_RET(pd);
}
fs_initcall(add_rtc);
--
1.7.10.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] powerpc: Use PTR_RET instead of IS_ERR/PTR_ERR
2013-03-10 13:07 [PATCH] powerpc: Use PTR_RET instead of IS_ERR/PTR_ERR Adrian-Leonard Radu
@ 2013-03-11 21:36 ` Geoff Levand
0 siblings, 0 replies; 2+ messages in thread
From: Geoff Levand @ 2013-03-11 21:36 UTC (permalink / raw)
To: Adrian-Leonard Radu
Cc: cbe-oss-dev, fweisbec, akinobu.mita, rostedt, linux-kernel,
paulus, anton, john.stultz, linuxppc-dev, cascardo
On Sun, 2013-03-10 at 15:07 +0200, Adrian-Leonard Radu wrote:
> Signed-off-by: Adrian-Leonard Radu <ady8radu@gmail.com>
> ---
> arch/powerpc/kernel/iommu.c | 2 +-
> arch/powerpc/kernel/time.c | 4 +---
> arch/powerpc/platforms/ps3/time.c | 4 +---
> arch/powerpc/sysdev/rtc_cmos_setup.c | 5 +----
> 4 files changed, 4 insertions(+), 11 deletions(-)
ps3 part looks OK, thanks.
Acked-by: Geoff Levand <geoff@infradead.org>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-03-11 21:36 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-03-10 13:07 [PATCH] powerpc: Use PTR_RET instead of IS_ERR/PTR_ERR Adrian-Leonard Radu
2013-03-11 21:36 ` Geoff Levand
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).