Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / drivers / input / serio / i8042-sparcio.h

diff --git a/drivers/input/serio/i8042-sparcio.h b/drivers/input/serio/i8042-sparcio.h
index da2a198..ed9446f 100644 (file)
--- a/drivers/input/serio/i8042-sparcio.h
+++ b/drivers/input/serio/i8042-sparcio.h
@@ -48,10 +48,10 @@ static inline void i8042_write_command(int val)
 #define OBP_PS2MS_NAME1                "kdmouse"
 #define OBP_PS2MS_NAME2                "mouse"
 
-static int i8042_platform_init(void)
+static int __init i8042_platform_init(void)
 {
 #ifndef CONFIG_PCI
-       return -1;
+       return -ENODEV;
 #else
        char prop[128];
        int len;
@@ -59,14 +59,14 @@ static int i8042_platform_init(void)
        len = prom_getproperty(prom_root_node, "name", prop, sizeof(prop));
        if (len < 0) {
                printk("i8042: Cannot get name property of root OBP node.\n");
-               return -1;
+               return -ENODEV;
        }
        if (strncmp(prop, "SUNW,JavaStation-1", len) == 0) {
                /* Hardcoded values for MrCoffee.  */
                i8042_kbd_irq = i8042_aux_irq = 13 | 0x20;
                kbd_iobase = ioremap(0x71300060, 8);
                if (!kbd_iobase)
-                       return -1;
+                       return -ENODEV;
        } else {
                struct linux_ebus *ebus;
                struct linux_ebus_device *edev;
@@ -78,7 +78,7 @@ static int i8042_platform_init(void)
                                        goto edev_found;
                        }
                }
-               return -1;
+               return -ENODEV;
 
        edev_found:
                for_each_edevchild(edev, child) {
@@ -96,7 +96,7 @@ static int i8042_platform_init(void)
                    i8042_aux_irq == -1) {
                        printk("i8042: Error, 8042 device lacks both kbd and "
                               "mouse nodes.\n");
-                       return -1;
+                       return -ENODEV;
                }
        }