Skip to content

Commit

Permalink
m68k: Return -ENODEV if no device is found
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Geert Uytterhoeven authored and Linus Torvalds committed May 18, 2008
1 parent eb98630 commit fd5b462
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
6 changes: 3 additions & 3 deletions drivers/block/amiflop.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion drivers/block/z2ram.c
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
2 changes: 1 addition & 1 deletion drivers/input/serio/q40kbd.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions drivers/video/amifb.c
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down Expand Up @@ -2333,7 +2333,7 @@ int __init amifb_init(void)
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;
Expand Down
2 changes: 1 addition & 1 deletion drivers/video/hpfb.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit fd5b462

Please sign in to comment.