diff options
author | Geert Uytterhoeven <geert@linux-m68k.org> | 2008-05-18 14:47:18 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-18 16:28:50 -0400 |
commit | fd5b462f0b3ae641e39966d1c6cd0dd66100cda5 (patch) | |
tree | c5334016f71fb0e0807147b73e12e565baf3cb73 | |
parent | eb98630ba02f6a23a2d202be082757a9e9940b2b (diff) |
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: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | drivers/block/amiflop.c | 6 | ||||
-rw-r--r-- | drivers/block/z2ram.c | 2 | ||||
-rw-r--r-- | drivers/input/serio/q40kbd.c | 2 | ||||
-rw-r--r-- | drivers/video/amifb.c | 4 | ||||
-rw-r--r-- | drivers/video/hpfb.c | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/drivers/block/amiflop.c b/drivers/block/amiflop.c index c9751b2b57e6..7516baff3bb9 100644 --- a/drivers/block/amiflop.c +++ b/drivers/block/amiflop.c | |||
@@ -1714,10 +1714,10 @@ static int __init amiga_floppy_init(void) | |||
1714 | int i, ret; | 1714 | int i, ret; |
1715 | 1715 | ||
1716 | if (!MACH_IS_AMIGA) | 1716 | if (!MACH_IS_AMIGA) |
1717 | return -ENXIO; | 1717 | return -ENODEV; |
1718 | 1718 | ||
1719 | if (!AMIGAHW_PRESENT(AMI_FLOPPY)) | 1719 | if (!AMIGAHW_PRESENT(AMI_FLOPPY)) |
1720 | return -ENXIO; | 1720 | return -ENODEV; |
1721 | 1721 | ||
1722 | if (register_blkdev(FLOPPY_MAJOR,"fd")) | 1722 | if (register_blkdev(FLOPPY_MAJOR,"fd")) |
1723 | return -EBUSY; | 1723 | return -EBUSY; |
@@ -1755,7 +1755,7 @@ static int __init amiga_floppy_init(void) | |||
1755 | if (!floppy_queue) | 1755 | if (!floppy_queue) |
1756 | goto out_queue; | 1756 | goto out_queue; |
1757 | 1757 | ||
1758 | ret = -ENXIO; | 1758 | ret = -ENODEV; |
1759 | if (fd_probe_drives() < 1) /* No usable drives */ | 1759 | if (fd_probe_drives() < 1) /* No usable drives */ |
1760 | goto out_probe; | 1760 | goto out_probe; |
1761 | 1761 | ||
diff --git a/drivers/block/z2ram.c b/drivers/block/z2ram.c index 2d5853cbd4b0..be20a67f1fa8 100644 --- a/drivers/block/z2ram.c +++ b/drivers/block/z2ram.c | |||
@@ -332,7 +332,7 @@ z2_init(void) | |||
332 | int ret; | 332 | int ret; |
333 | 333 | ||
334 | if (!MACH_IS_AMIGA) | 334 | if (!MACH_IS_AMIGA) |
335 | return -ENXIO; | 335 | return -ENODEV; |
336 | 336 | ||
337 | ret = -EBUSY; | 337 | ret = -EBUSY; |
338 | if (register_blkdev(Z2RAM_MAJOR, DEVICE_NAME)) | 338 | if (register_blkdev(Z2RAM_MAJOR, DEVICE_NAME)) |
diff --git a/drivers/input/serio/q40kbd.c b/drivers/input/serio/q40kbd.c index cb89aff2e160..d962a8d78b14 100644 --- a/drivers/input/serio/q40kbd.c +++ b/drivers/input/serio/q40kbd.c | |||
@@ -156,7 +156,7 @@ static int __init q40kbd_init(void) | |||
156 | int error; | 156 | int error; |
157 | 157 | ||
158 | if (!MACH_IS_Q40) | 158 | if (!MACH_IS_Q40) |
159 | return -EIO; | 159 | return -ENODEV; |
160 | 160 | ||
161 | error = platform_driver_register(&q40kbd_driver); | 161 | error = platform_driver_register(&q40kbd_driver); |
162 | if (error) | 162 | if (error) |
diff --git a/drivers/video/amifb.c b/drivers/video/amifb.c index e6492c1048bf..05a328c11a8b 100644 --- a/drivers/video/amifb.c +++ b/drivers/video/amifb.c | |||
@@ -2261,7 +2261,7 @@ int __init amifb_init(void) | |||
2261 | amifb_setup(option); | 2261 | amifb_setup(option); |
2262 | #endif | 2262 | #endif |
2263 | if (!MACH_IS_AMIGA || !AMIGAHW_PRESENT(AMI_VIDEO)) | 2263 | if (!MACH_IS_AMIGA || !AMIGAHW_PRESENT(AMI_VIDEO)) |
2264 | return -ENXIO; | 2264 | return -ENODEV; |
2265 | 2265 | ||
2266 | /* | 2266 | /* |
2267 | * We request all registers starting from bplpt[0] | 2267 | * We request all registers starting from bplpt[0] |
@@ -2333,7 +2333,7 @@ default_chipset: | |||
2333 | strcat(fb_info.fix.id, "Unknown"); | 2333 | strcat(fb_info.fix.id, "Unknown"); |
2334 | goto default_chipset; | 2334 | goto default_chipset; |
2335 | #else /* CONFIG_FB_AMIGA_OCS */ | 2335 | #else /* CONFIG_FB_AMIGA_OCS */ |
2336 | err = -ENXIO; | 2336 | err = -ENODEV; |
2337 | goto amifb_error; | 2337 | goto amifb_error; |
2338 | #endif /* CONFIG_FB_AMIGA_OCS */ | 2338 | #endif /* CONFIG_FB_AMIGA_OCS */ |
2339 | break; | 2339 | break; |
diff --git a/drivers/video/hpfb.c b/drivers/video/hpfb.c index 2eb4fb159084..b8ebff1e8493 100644 --- a/drivers/video/hpfb.c +++ b/drivers/video/hpfb.c | |||
@@ -382,7 +382,7 @@ int __init hpfb_init(void) | |||
382 | #define INTFBPADDR 0x560000 | 382 | #define INTFBPADDR 0x560000 |
383 | 383 | ||
384 | if (!MACH_IS_HP300) | 384 | if (!MACH_IS_HP300) |
385 | return -ENXIO; | 385 | return -ENODEV; |
386 | 386 | ||
387 | if (fb_get_options("hpfb", NULL)) | 387 | if (fb_get_options("hpfb", NULL)) |
388 | return -ENODEV; | 388 | return -ENODEV; |