m68k: Return -ENODEV if no device is found
authorGeert Uytterhoeven <geert@linux-m68k.org>
Sun, 18 May 2008 18:47:18 +0000 (20:47 +0200)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 18 May 2008 20:28:50 +0000 (13:28 -0700)
According to the tests in do_initcalls(), the proper error code in case no
device is found is -ENODEV, not -ENXIO or -EIO.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/block/amiflop.c
drivers/block/z2ram.c
drivers/input/serio/q40kbd.c
drivers/video/amifb.c
drivers/video/hpfb.c

index c9751b2b57e63f1ea96e02902ec7a57d7db885ea..7516baff3bb914116742b12a634ba4ab95db361a 100644 (file)
@@ -1714,10 +1714,10 @@ static int __init amiga_floppy_init(void)
        int i, ret;
 
        if (!MACH_IS_AMIGA)
-               return -ENXIO;
+               return -ENODEV;
 
        if (!AMIGAHW_PRESENT(AMI_FLOPPY))
-               return -ENXIO;
+               return -ENODEV;
 
        if (register_blkdev(FLOPPY_MAJOR,"fd"))
                return -EBUSY;
@@ -1755,7 +1755,7 @@ static int __init amiga_floppy_init(void)
        if (!floppy_queue)
                goto out_queue;
 
-       ret = -ENXIO;
+       ret = -ENODEV;
        if (fd_probe_drives() < 1) /* No usable drives */
                goto out_probe;
 
index 2d5853cbd4b002d4d2281da36b61097106090515..be20a67f1fa8c78397be751954a1d225e511af77 100644 (file)
@@ -332,7 +332,7 @@ z2_init(void)
     int ret;
 
     if (!MACH_IS_AMIGA)
-       return -ENXIO;
+       return -ENODEV;
 
     ret = -EBUSY;
     if (register_blkdev(Z2RAM_MAJOR, DEVICE_NAME))
index cb89aff2e1603c30711a7900a6bbbb39b5fd83e6..d962a8d78b144fc7ac3f17af6107d111f4fb31aa 100644 (file)
@@ -156,7 +156,7 @@ static int __init q40kbd_init(void)
        int error;
 
        if (!MACH_IS_Q40)
-               return -EIO;
+               return -ENODEV;
 
        error = platform_driver_register(&q40kbd_driver);
        if (error)
index e6492c1048bf29dcb367f696a7abaee9c6403055..05a328c11a8bf17b7bd6178841caf546644c1639 100644 (file)
@@ -2261,7 +2261,7 @@ int __init amifb_init(void)
        amifb_setup(option);
 #endif
        if (!MACH_IS_AMIGA || !AMIGAHW_PRESENT(AMI_VIDEO))
-               return -ENXIO;
+               return -ENODEV;
 
        /*
         * We request all registers starting from bplpt[0]
@@ -2333,7 +2333,7 @@ default_chipset:
                        strcat(fb_info.fix.id, "Unknown");
                        goto default_chipset;
 #else /* CONFIG_FB_AMIGA_OCS */
-                       err = -ENXIO;
+                       err = -ENODEV;
                        goto amifb_error;
 #endif /* CONFIG_FB_AMIGA_OCS */
                        break;
index 2eb4fb15908404e8926d6342b88faed3d64d180b..b8ebff1e8493e2290b21530ad5086b5d55172089 100644 (file)
@@ -382,7 +382,7 @@ int __init hpfb_init(void)
 #define INTFBPADDR 0x560000
 
        if (!MACH_IS_HP300)
-               return -ENXIO;
+               return -ENODEV;
 
        if (fb_get_options("hpfb", NULL))
                return -ENODEV;