Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux...

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

diff --git a/arch/m68k/amiga/platform.c b/arch/m68k/amiga/platform.c
index 80076d368b7e8b4417c4612017fd4cbb824ab358..6083088c0cca8287f50888143fb18a95d71c0b5d 100644 (file)
--- 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 635ef4f890102b187ef86710ceb341c5af91bdb5..6c19e0c22411a2bd4f7b76c2daf228e462f1eb27 100644 (file)
--- 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 707f0573ec6bfade21e43c7a91bd0b3896ed8d79..5d0bcaad2e552f5d9587911b241bfe2369eb855e 100644 (file)
--- 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 8a1ce327c963da94dffa388f2fff533260467679..1adb5b7b0d1a141e19463a2b61fa571885af0f7d 100644 (file)
--- 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);