| Message ID | 1362920820-11073-1-git-send-email-ady8radu@gmail.com (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Commit | 09652b00cd249a1f1a2cd1a70d31e880f24d06cc |
| Delegated to: | Michael Ellerman |
| Headers | show |
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>
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);
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(-)