aboutsummaryrefslogtreecommitdiff
path: root/arch/m68k/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-10-01 13:55:51 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-10-01 13:55:51 -0700
commitcdeb9b014331af4282be522824e36f3aa33f0671 (patch)
treed4a0eb46348289590f90fadf52644aa21e0ffb29 /arch/m68k/kernel
parent40689ac479e6477096b3dbd5a374cfe3970da3a3 (diff)
parentf82735d55056b200eab19749398457a2f534306b (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k updates from Geert Uytterhoeven: "All pretty boring, seems like all of us had better things to do last summer..." * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: m68k: Use PTR_RET rather than if(IS_ERR(...)) + PTR_ERR m68k/q40: Use PTR_RET rather than if(IS_ERR(...)) + PTR_ERR m68k/amiga: Use PTR_RET rather than if(IS_ERR(...)) + PTR_ERR m68k/apollo: Remove disabled definitions in apollohw.h
Diffstat (limited to 'arch/m68k/kernel')
-rw-r--r--arch/m68k/kernel/time.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/m68k/kernel/time.c b/arch/m68k/kernel/time.c
index 707f0573ec6..5d0bcaad2e5 100644
--- a/arch/m68k/kernel/time.c
+++ b/arch/m68k/kernel/time.c
@@ -100,10 +100,7 @@ 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);