[PATCH] mark amiflop non-unloadable
From: Christoph Hellwig (hch_at_lst.de)
Date: 09/12/04
- Previous message: Alan Cox: "Re: The Serial Layer"
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Date: Sun, 12 Sep 2004 18:37:56 +0200 To: akpm@osdl.org, geert@linux-m68k.org
as it's using the obsolete MOD_{INC,DEC}_USE_COUNT it's implicitly
locked already, but let's remove them and make it explicit so these
macros can go away completely without breaking m68k compile.
--- 1.46/drivers/block/amiflop.c 2003-09-03 12:32:10 +02:00
+++ edited/drivers/block/amiflop.c 2004-09-12 18:37:32 +02:00
@@ -386,16 +386,6 @@
fd_select(drive);
udelay (1);
fd_deselect(drive);
-
-#ifdef MODULE
-/*
- this is the last interrupt for any drive access, happens after
- release (from floppy_off). So we have to wait until now to decrease
- the use count.
-*/
- if (decusecount)
- MOD_DEC_USE_COUNT;
-#endif
}
static void floppy_off (unsigned int nr)
@@ -1590,10 +1580,6 @@
local_irq_save(flags);
fd_ref[drive]++;
fd_device[drive] = system;
-#ifdef MODULE
- if (unit[drive].motor == 0)
- MOD_INC_USE_COUNT;
-#endif
local_irq_restore(flags);
unit[drive].dtype=&data_types[system];
@@ -1839,6 +1825,7 @@
return amiga_floppy_init();
}
+#if 0 /* not safe to unload */
void cleanup_module(void)
{
int i;
@@ -1859,4 +1846,5 @@
release_mem_region(CUSTOM_PHYSADDR+0x20, 8);
unregister_blkdev(FLOPPY_MAJOR, "fd");
}
+#endif
#endif
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
- Previous message: Alan Cox: "Re: The Serial Layer"
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Relevant Pages
|
|
