Commit fd5b462f authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Linus Torvalds

m68k: Return -ENODEV if no device is found

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: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent eb98630b
...@@ -1714,10 +1714,10 @@ static int __init amiga_floppy_init(void) ...@@ -1714,10 +1714,10 @@ static int __init amiga_floppy_init(void)
int i, ret; int i, ret;
if (!MACH_IS_AMIGA) if (!MACH_IS_AMIGA)
return -ENXIO; return -ENODEV;
if (!AMIGAHW_PRESENT(AMI_FLOPPY)) if (!AMIGAHW_PRESENT(AMI_FLOPPY))
return -ENXIO; return -ENODEV;
if (register_blkdev(FLOPPY_MAJOR,"fd")) if (register_blkdev(FLOPPY_MAJOR,"fd"))
return -EBUSY; return -EBUSY;
...@@ -1755,7 +1755,7 @@ static int __init amiga_floppy_init(void) ...@@ -1755,7 +1755,7 @@ static int __init amiga_floppy_init(void)
if (!floppy_queue) if (!floppy_queue)
goto out_queue; goto out_queue;
ret = -ENXIO; ret = -ENODEV;
if (fd_probe_drives() < 1) /* No usable drives */ if (fd_probe_drives() < 1) /* No usable drives */
goto out_probe; goto out_probe;
......
...@@ -332,7 +332,7 @@ z2_init(void) ...@@ -332,7 +332,7 @@ z2_init(void)
int ret; int ret;
if (!MACH_IS_AMIGA) if (!MACH_IS_AMIGA)
return -ENXIO; return -ENODEV;
ret = -EBUSY; ret = -EBUSY;
if (register_blkdev(Z2RAM_MAJOR, DEVICE_NAME)) if (register_blkdev(Z2RAM_MAJOR, DEVICE_NAME))
......
...@@ -156,7 +156,7 @@ static int __init q40kbd_init(void) ...@@ -156,7 +156,7 @@ static int __init q40kbd_init(void)
int error; int error;
if (!MACH_IS_Q40) if (!MACH_IS_Q40)
return -EIO; return -ENODEV;
error = platform_driver_register(&q40kbd_driver); error = platform_driver_register(&q40kbd_driver);
if (error) if (error)
......
...@@ -2261,7 +2261,7 @@ int __init amifb_init(void) ...@@ -2261,7 +2261,7 @@ int __init amifb_init(void)
amifb_setup(option); amifb_setup(option);
#endif #endif
if (!MACH_IS_AMIGA || !AMIGAHW_PRESENT(AMI_VIDEO)) if (!MACH_IS_AMIGA || !AMIGAHW_PRESENT(AMI_VIDEO))
return -ENXIO; return -ENODEV;
/* /*
* We request all registers starting from bplpt[0] * We request all registers starting from bplpt[0]
...@@ -2333,7 +2333,7 @@ int __init amifb_init(void) ...@@ -2333,7 +2333,7 @@ int __init amifb_init(void)
strcat(fb_info.fix.id, "Unknown"); strcat(fb_info.fix.id, "Unknown");
goto default_chipset; goto default_chipset;
#else /* CONFIG_FB_AMIGA_OCS */ #else /* CONFIG_FB_AMIGA_OCS */
err = -ENXIO; err = -ENODEV;
goto amifb_error; goto amifb_error;
#endif /* CONFIG_FB_AMIGA_OCS */ #endif /* CONFIG_FB_AMIGA_OCS */
break; break;
......
...@@ -382,7 +382,7 @@ int __init hpfb_init(void) ...@@ -382,7 +382,7 @@ int __init hpfb_init(void)
#define INTFBPADDR 0x560000 #define INTFBPADDR 0x560000
if (!MACH_IS_HP300) if (!MACH_IS_HP300)
return -ENXIO; return -ENODEV;
if (fb_get_options("hpfb", NULL)) if (fb_get_options("hpfb", NULL))
return -ENODEV; return -ENODEV;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment