Skip to content

Commit

Permalink
powerpc: Use PTR_RET instead of IS_ERR/PTR_ERR
Browse files Browse the repository at this point in the history
Signed-off-by: Adrian-Leonard Radu <ady8radu@gmail.com>
Acked-by: Geoff Levand <geoff@infradead.org>
Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
  • Loading branch information
Adrian-Leonard Radu authored and Michael Ellerman committed Apr 18, 2013
1 parent db38f29 commit 09652b0
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 11 deletions.
2 changes: 1 addition & 1 deletion arch/powerpc/kernel/iommu.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
4 changes: 1 addition & 3 deletions arch/powerpc/kernel/time.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
4 changes: 1 addition & 3 deletions arch/powerpc/platforms/ps3/time.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
5 changes: 1 addition & 4 deletions arch/powerpc/sysdev/rtc_cmos_setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down

0 comments on commit 09652b0

Please sign in to comment.