[PATCH v2] ramfs: Remove module leftovers

[PATCH v2] ramfs: Remove module leftovers

[Richard Weinberger]

Since ramfs is hard-selected to "y", the module leftovers make
no sense.

Signed-off-by: Richard Weinberger <richard@nod.at>
---
 fs/ramfs/inode.c |   12 +-----------
 1 files changed, 1 insertions(+), 11 deletions(-)

diff --git a/fs/ramfs/inode.c b/fs/ramfs/inode.c
index eacb166..148fdf6 100644
--- a/fs/ramfs/inode.c
+++ b/fs/ramfs/inode.c
@@ -23,7 +23,6 @@
  * caches is sufficient.
  */
 
-#include <linux/module.h>
 #include <linux/fs.h>
 #include <linux/pagemap.h>
 #include <linux/highmem.h>
@@ -288,14 +287,7 @@ static int __init init_ramfs_fs(void)
 {
 	return register_filesystem(&ramfs_fs_type);
 }
-
-static void __exit exit_ramfs_fs(void)
-{
-	unregister_filesystem(&ramfs_fs_type);
-}
-
-module_init(init_ramfs_fs)
-module_exit(exit_ramfs_fs)
+device_initcall(init_ramfs_fs);
 
 int __init init_rootfs(void)
 {
@@ -311,5 +303,3 @@ int __init init_rootfs(void)
 
 	return err;
 }
-
-MODULE_LICENSE("GPL");
-- 
1.7.7

Re: [PATCH v2] ramfs: Remove module leftovers

[Christoph Hellwig]

On Mon, Oct 10, 2011 at 12:54:39PM +0200, Richard Weinberger wrote:
> Since ramfs is hard-selected to "y", the module leftovers make
> no sense.

Removing the dead code looks good, but what is the point in using
device_initcall?  We've always been using module_init for non-modular
code, though.

Re: [PATCH v2] ramfs: Remove module leftovers

[Richard Weinberger]

[-- Attachment #1: Type: text/plain, Size: 523 bytes --]

Am 10.10.2011 13:09, schrieb Christoph Hellwig:
> On Mon, Oct 10, 2011 at 12:54:39PM +0200, Richard Weinberger wrote:
>> Since ramfs is hard-selected to "y", the module leftovers make
>> no sense.
> 
> Removing the dead code looks good, but what is the point in using
> device_initcall?  We've always been using module_init for non-modular
> code, though.
> 

Ah, ok!
So we can keep the module_init()?
I was not sure whether it's valid to use module_init() in pure
non-modular code...

Thanks,
//richard


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 490 bytes --]

Re: [PATCH v2] ramfs: Remove module leftovers

[Christoph Hellwig]

On Mon, Oct 10, 2011 at 01:13:22PM +0200, Richard Weinberger wrote:
> > Removing the dead code looks good, but what is the point in using
> > device_initcall?  We've always been using module_init for non-modular
> > code, though.
> > 
> 
> Ah, ok!
> So we can keep the module_init()?
> I was not sure whether it's valid to use module_init() in pure
> non-modular code...

It is valid.  And if it's not the style de jour anymore thousands of people
will flame me now, but I've always done it that way.