Merge branch 'torvalds/master'

[firefly-linux-kernel-4.4.55.git] / arch / m68k / q40 / config.c

diff --git a/arch/m68k/q40/config.c b/arch/m68k/q40/config.c
index 658542b914fc0fb37476ca3df10461e1438e3049..e90fe903613ead8ad480797d138f7d566f738f48 100644 (file)
--- a/arch/m68k/q40/config.c
+++ b/arch/m68k/q40/config.c
@@ -154,7 +154,7 @@ static unsigned int serports[] =
        0x3f8,0x2f8,0x3e8,0x2e8,0
 };
 
-static void q40_disable_irqs(void)
+static void __init q40_disable_irqs(void)
 {
        unsigned i, j;
 
@@ -198,7 +198,7 @@ void __init config_q40(void)
 }
 
 
-int q40_parse_bootinfo(const struct bi_record *rec)
+int __init q40_parse_bootinfo(const struct bi_record *rec)
 {
        return 1;
 }
@@ -338,6 +338,6 @@ static __init int q40_add_kbd_device(void)
                return -ENODEV;
 
        pdev = platform_device_register_simple("q40kbd", -1, NULL, 0);
-       return PTR_RET(pdev);
+       return PTR_ERR_OR_ZERO(pdev);
 }
 arch_initcall(q40_add_kbd_device);