Commit 8cbfd2c3 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Linus Torvalds

[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: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 6ccb97bf
...@@ -386,16 +386,6 @@ static void fd_motor_off(unsigned long drive) ...@@ -386,16 +386,6 @@ static void fd_motor_off(unsigned long drive)
fd_select(drive); fd_select(drive);
udelay (1); udelay (1);
fd_deselect(drive); 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) static void floppy_off (unsigned int nr)
...@@ -1590,10 +1580,6 @@ static int floppy_open(struct inode *inode, struct file *filp) ...@@ -1590,10 +1580,6 @@ static int floppy_open(struct inode *inode, struct file *filp)
local_irq_save(flags); local_irq_save(flags);
fd_ref[drive]++; fd_ref[drive]++;
fd_device[drive] = system; fd_device[drive] = system;
#ifdef MODULE
if (unit[drive].motor == 0)
MOD_INC_USE_COUNT;
#endif
local_irq_restore(flags); local_irq_restore(flags);
unit[drive].dtype=&data_types[system]; unit[drive].dtype=&data_types[system];
...@@ -1839,6 +1825,7 @@ int init_module(void) ...@@ -1839,6 +1825,7 @@ int init_module(void)
return amiga_floppy_init(); return amiga_floppy_init();
} }
#if 0 /* not safe to unload */
void cleanup_module(void) void cleanup_module(void)
{ {
int i; int i;
...@@ -1860,3 +1847,4 @@ void cleanup_module(void) ...@@ -1860,3 +1847,4 @@ void cleanup_module(void)
unregister_blkdev(FLOPPY_MAJOR, "fd"); unregister_blkdev(FLOPPY_MAJOR, "fd");
} }
#endif #endif
#endif
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment