Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/block/amiflop.c

+3 −3
Original line number Diff line number Diff line
@@ -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;

drivers/block/z2ram.c

+1 −1
Original line number Diff line number Diff line
@@ -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))

drivers/input/serio/q40kbd.c

+1 −1
Original line number Diff line number Diff line
@@ -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)

drivers/video/amifb.c

+2 −2
Original line number Diff line number Diff line
@@ -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 @@ 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;

drivers/video/hpfb.c

+1 −1
Original line number Diff line number Diff line
@@ -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;