diff options
author | Rusty Russell <rusty@rustcorp.com.au> | 2007-10-17 02:26:27 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-17 11:42:49 -0400 |
commit | af49d9248fca6f26cbdb01918334f71d9040df80 (patch) | |
tree | 5d6a7f4d5ca55ff17fbfc98cacac37be62c7a4a3 /drivers/dma | |
parent | d9c9bef1345e5d9258febce2a37e4d40319fa728 (diff) |
Remove "unsafe" from module struct
Adrian Bunk points out that "unsafe" was used to mark modules touched by
the deprecated MOD_INC_USE_COUNT interface, which has long gone. It's time
to remove the member from the module structure, as well.
If you want a module which can't unload, don't register an exit function.
(Vlad Yasevich says SCTP is now safe to unload, so just remove the
__unsafe there).
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Acked-by: Shannon Nelson <shannon.nelson@intel.com>
Acked-by: Dan Williams <dan.j.williams@intel.com>
Acked-by: Vlad Yasevich <vladislav.yasevich@hp.com>
Cc: Sridhar Samudrala <sri@us.ibm.com>
Cc: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/dma')
-rw-r--r-- | drivers/dma/iop-adma.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/dma/iop-adma.c b/drivers/dma/iop-adma.c index 5a1d426744d6..e5c62b75f36f 100644 --- a/drivers/dma/iop-adma.c +++ b/drivers/dma/iop-adma.c | |||
@@ -1446,21 +1446,20 @@ static struct platform_driver iop_adma_driver = { | |||
1446 | 1446 | ||
1447 | static int __init iop_adma_init (void) | 1447 | static int __init iop_adma_init (void) |
1448 | { | 1448 | { |
1449 | /* it's currently unsafe to unload this module */ | ||
1450 | /* if forced, worst case is that rmmod hangs */ | ||
1451 | __unsafe(THIS_MODULE); | ||
1452 | |||
1453 | return platform_driver_register(&iop_adma_driver); | 1449 | return platform_driver_register(&iop_adma_driver); |
1454 | } | 1450 | } |
1455 | 1451 | ||
1452 | /* it's currently unsafe to unload this module */ | ||
1453 | #if 0 | ||
1456 | static void __exit iop_adma_exit (void) | 1454 | static void __exit iop_adma_exit (void) |
1457 | { | 1455 | { |
1458 | platform_driver_unregister(&iop_adma_driver); | 1456 | platform_driver_unregister(&iop_adma_driver); |
1459 | return; | 1457 | return; |
1460 | } | 1458 | } |
1459 | module_exit(iop_adma_exit); | ||
1460 | #endif | ||
1461 | 1461 | ||
1462 | module_init(iop_adma_init); | 1462 | module_init(iop_adma_init); |
1463 | module_exit(iop_adma_exit); | ||
1464 | 1463 | ||
1465 | MODULE_AUTHOR("Intel Corporation"); | 1464 | MODULE_AUTHOR("Intel Corporation"); |
1466 | MODULE_DESCRIPTION("IOP ADMA Engine Driver"); | 1465 | MODULE_DESCRIPTION("IOP ADMA Engine Driver"); |