From 32b41b18967d745b331a09ea75d412945bca810d Mon Sep 17 00:00:00 2001
From: Adrian-Leonard Radu <ady8radu@gmail.com>
Date: Sun, 10 Mar 2013 03:07:00 +0000
Subject: [PATCH] --- yaml --- r: 370749 b: refs/heads/master c:
 09652b00cd249a1f1a2cd1a70d31e880f24d06cc h: refs/heads/master i:   370747:
 fd57a511c118b9b91194cc99519a2c612d1dad73 v: v3

---
 [refs]                                     | 2 +-
 trunk/arch/powerpc/kernel/iommu.c          | 2 +-
 trunk/arch/powerpc/kernel/time.c           | 4 +---
 trunk/arch/powerpc/platforms/ps3/time.c    | 4 +---
 trunk/arch/powerpc/sysdev/rtc_cmos_setup.c | 5 +----
 5 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index b215f907e136..68643b39bb3e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: db38f290cadc16304b84f6d18cbaa06251dde875
+refs/heads/master: 09652b00cd249a1f1a2cd1a70d31e880f24d06cc
diff --git a/trunk/arch/powerpc/kernel/iommu.c b/trunk/arch/powerpc/kernel/iommu.c
index 31c4fdc6859c..c0d0dbddfba1 100644
--- a/trunk/arch/powerpc/kernel/iommu.c
+++ b/trunk/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/trunk/arch/powerpc/kernel/time.c b/trunk/arch/powerpc/kernel/time.c
index f77fa22754bc..5fc29ad7e26f 100644
--- a/trunk/arch/powerpc/kernel/time.c
+++ b/trunk/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/trunk/arch/powerpc/platforms/ps3/time.c b/trunk/arch/powerpc/platforms/ps3/time.c
index 40b5cb433005..cba1e6be68e5 100644
--- a/trunk/arch/powerpc/platforms/ps3/time.c
+++ b/trunk/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/trunk/arch/powerpc/sysdev/rtc_cmos_setup.c b/trunk/arch/powerpc/sysdev/rtc_cmos_setup.c
index 9afba924e94f..af79e1ea74b6 100644
--- a/trunk/arch/powerpc/sysdev/rtc_cmos_setup.c
+++ b/trunk/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);