powerpc: Use PTR_RET instead of IS_ERR/PTR_ERR
Subsystems (2)
PATCH 1/1 powerpc: Use PTR_RET instead of IS_ERR/PTR_ERR
Signed-off-by Adrian-Leonard Radu <[email protected]>
--- 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(-)
arch/powerpc/kernel/iommu.c +1 -1
@@ -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);
arch/powerpc/kernel/time.c +1 -3
@@ -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);
arch/powerpc/platforms/ps3/time.c +1 -3
@@ -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);
arch/powerpc/sysdev/rtc_cmos_setup.c +1 -4
@@ -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);
Signature · 1 line
1.7.10.4
Quoted 7 lines · Adrian-Leonard Radu
Signed-off-by Adrian-Leonard Radu <[email protected]>--- 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 <[email protected]>