From: Geert Uytterhoeven <geert@linux-m68k.org>
To: Linus Torvalds <torvalds@linux-foundation.org>,
Andrew Morton <akpm@linux-foundation.org>
Cc: linux-m68k@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [patch 12/18] m68k: Return -ENODEV if no device is found
Date: Sun, 18 May 2008 20:47:18 +0200 [thread overview]
Message-ID: <20080518185152.674241300@mail.of.borg> (raw)
In-Reply-To: 20080518184706.631023070@mail.of.borg
[-- Attachment #1: m68k-initcalls-should-return-ENODEV-if-device-not-found.diff --]
[-- Type: text/plain, Size: 2626 bytes --]
From: Geert Uytterhoeven <geert@linux-m68k.org>
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>
---
drivers/block/amiflop.c | 6 +++---
drivers/block/z2ram.c | 2 +-
drivers/input/serio/q40kbd.c | 2 +-
drivers/video/amifb.c | 4 ++--
drivers/video/hpfb.c | 2 +-
5 files changed, 8 insertions(+), 8 deletions(-)
--- a/drivers/block/amiflop.c
+++ b/drivers/block/amiflop.c
@@ -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;
--- a/drivers/block/z2ram.c
+++ b/drivers/block/z2ram.c
@@ -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))
--- a/drivers/input/serio/q40kbd.c
+++ b/drivers/input/serio/q40kbd.c
@@ -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)
--- a/drivers/video/amifb.c
+++ b/drivers/video/amifb.c
@@ -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;
--- a/drivers/video/hpfb.c
+++ b/drivers/video/hpfb.c
@@ -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;
--
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
next prev parent reply other threads:[~2008-05-18 19:05 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-05-18 18:47 [patch 00/18] Updated m68k patches for 2.6.26 Geert Uytterhoeven
2008-05-18 18:47 ` [patch 01/18] m68k: Convert access_ok() to an inline function Geert Uytterhoeven
2008-05-18 18:47 ` [patch 02/18] m68k: Kill CONFIG_FB_DAFB Geert Uytterhoeven
2008-05-18 18:47 ` [patch 03/18] m68k: FB_HP300 depends on DIO and doesnt need FB_CFB_FILLRECT Geert Uytterhoeven
2008-05-18 18:47 ` [patch 04/18] m68k: Kill CONFIG_WHIPPET_SERIAL Geert Uytterhoeven
2008-05-18 18:47 ` [patch 05/18] m68k vme_scc: avoid global namespace pollution Geert Uytterhoeven
2008-05-18 18:47 ` [patch 06/18] m68k: Make gcc aware that BUG() does not return Geert Uytterhoeven
2008-05-18 18:47 ` [patch 07/18] m68k: Correct jump if not running on HP300 Geert Uytterhoeven
2008-05-18 18:47 ` [patch 08/18] m68k: macide doesnt check for Mac Geert Uytterhoeven
2008-05-18 18:47 ` [patch 09/18] m68k: dnfb doesnt check for Apollo Geert Uytterhoeven
2008-05-18 18:47 ` [patch 10/18] m68k: Some network drivers do not check the platform Geert Uytterhoeven
2008-05-18 18:47 ` [patch 11/18] m68k: Some input " Geert Uytterhoeven
2008-05-18 18:47 ` Geert Uytterhoeven [this message]
2008-05-18 18:47 ` [patch 13/18] m68k: Q40/Q60 floppy support is broken Geert Uytterhoeven
2008-05-18 18:47 ` [patch 14/18] m68k: export m68k_mmutype Geert Uytterhoeven
2008-05-18 18:47 ` [patch 15/18] m68k: Prefix ISA type with ISA_TYPE_ Geert Uytterhoeven
2008-05-18 18:47 ` [patch 16/18] m68k: Correctly handle multi-ISA at runtime Geert Uytterhoeven
2008-05-18 18:47 ` [patch 17/18] m68k: Update defconfigs Geert Uytterhoeven
2008-05-18 18:47 ` [patch 18/18] m68k: Add multi_defconfig Geert Uytterhoeven
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080518185152.674241300@mail.of.borg \
--to=geert@linux-m68k.org \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-m68k@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).