diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-01 13:55:51 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-01 13:55:51 -0700 |
| commit | cdeb9b014331af4282be522824e36f3aa33f0671 (patch) | |
| tree | d4a0eb46348289590f90fadf52644aa21e0ffb29 /arch | |
| parent | 40689ac479e6477096b3dbd5a374cfe3970da3a3 (diff) | |
| parent | f82735d55056b200eab19749398457a2f534306b (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')
| -rw-r--r-- | arch/m68k/amiga/platform.c | 5 | ||||
| -rw-r--r-- | arch/m68k/include/asm/apollohw.h | 12 | ||||
| -rw-r--r-- | arch/m68k/kernel/time.c | 5 | ||||
| -rw-r--r-- | arch/m68k/q40/config.c | 5 |
4 files changed, 3 insertions, 24 deletions
diff --git a/arch/m68k/amiga/platform.c b/arch/m68k/amiga/platform.c index 80076d368b7..6083088c0cc 100644 --- a/arch/m68k/amiga/platform.c +++ b/arch/m68k/amiga/platform.c @@ -56,10 +56,7 @@ static int __init amiga_init_bus(void) n = AMIGAHW_PRESENT(ZORRO3) ? 4 : 2; pdev = platform_device_register_simple("amiga-zorro", -1, zorro_resources, n); - if (IS_ERR(pdev)) - return PTR_ERR(pdev); - - return 0; + return PTR_RET(pdev); } subsys_initcall(amiga_init_bus); diff --git a/arch/m68k/include/asm/apollohw.h b/arch/m68k/include/asm/apollohw.h index 635ef4f8901..6c19e0c2241 100644 --- a/arch/m68k/include/asm/apollohw.h +++ b/arch/m68k/include/asm/apollohw.h @@ -46,18 +46,6 @@ struct SCN2681 { }; -#if 0 -struct mc146818 { - - unsigned int second1:4, second2:4, alarm_second1:4, alarm_second2:4, - minute1:4, minute2:4, alarm_minute1:4, alarm_minute2:4; - unsigned int hours1:4, hours2:4, alarm_hours1:4, alarm_hours2:4, - day_of_week1:4, day_of_week2:4, day_of_month1:4, day_of_month2:4; - unsigned int month1:4, month2:4, year1:4, year2:4, :16; - -}; -#endif - struct mc146818 { unsigned char second, alarm_second; unsigned char minute, alarm_minute; 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); diff --git a/arch/m68k/q40/config.c b/arch/m68k/q40/config.c index 8a1ce327c96..1adb5b7b0d1 100644 --- a/arch/m68k/q40/config.c +++ b/arch/m68k/q40/config.c @@ -338,9 +338,6 @@ static __init int q40_add_kbd_device(void) return -ENODEV; pdev = platform_device_register_simple("q40kbd", -1, NULL, 0); - if (IS_ERR(pdev)) - return PTR_ERR(pdev); - - return 0; + return PTR_RET(pdev); } arch_initcall(q40_add_kbd_device); |