[PATCH] mark amiflop non-unloadable

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.

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/drivers/block/amiflop.c b/drivers/block/amiflop.c
index 42c1e5663094b90dbd8b90cf7d9588108556f2fd..62e3a7ed3f60f4141a2ea13322feabb3aafb0952 100644 (file)
--- a/drivers/block/amiflop.c
+++ b/drivers/block/amiflop.c
@@ -386,16 +386,6 @@ static void fd_motor_off(unsigned long drive)
        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 @@ static int floppy_open(struct inode *inode, struct file *filp)
        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 @@ int init_module(void)
        return amiga_floppy_init();
 }
 
+#if 0 /* not safe to unload */
 void cleanup_module(void)
 {
        int i;
@@ -1860,3 +1847,4 @@ void cleanup_module(void)
        unregister_blkdev(FLOPPY_MAJOR, "fd");
 }
 #endif
+#endif