[ARM] 4611/2: AT91: Fix GPIO buttons pins on SAM9261-EK.

[linux-2.6-omap-h63xx.git] / fs / romfs / inode.c

diff --git a/fs/romfs/inode.c b/fs/romfs/inode.c
index 2284e03342c6af7367d9fb602732f709cba98d48..a49cf5b9a195d32c51c7f077ea7b60cc7dc22cf8 100644 (file)
--- a/fs/romfs/inode.c
+++ b/fs/romfs/inode.c
@@ -92,7 +92,7 @@ static inline unsigned long romfs_maxsize(struct super_block *sb)
 
 static inline struct romfs_inode_info *ROMFS_I(struct inode *inode)
 {
-       return list_entry(inode, struct romfs_inode_info, vfs_inode);
+       return container_of(inode, struct romfs_inode_info, vfs_inode);
 }
 
 static __u32
@@ -555,7 +555,7 @@ static struct kmem_cache * romfs_inode_cachep;
 static struct inode *romfs_alloc_inode(struct super_block *sb)
 {
        struct romfs_inode_info *ei;
-       ei = (struct romfs_inode_info *)kmem_cache_alloc(romfs_inode_cachep, GFP_KERNEL);
+       ei = kmem_cache_alloc(romfs_inode_cachep, GFP_KERNEL);
        if (!ei)
                return NULL;
        return &ei->vfs_inode;
@@ -566,20 +566,20 @@ static void romfs_destroy_inode(struct inode *inode)
        kmem_cache_free(romfs_inode_cachep, ROMFS_I(inode));
 }
 
-static void init_once(void *foo, struct kmem_cache *cachep, unsigned long flags)
+static void init_once(struct kmem_cache *cachep, void *foo)
 {
        struct romfs_inode_info *ei = foo;
 
        inode_init_once(&ei->vfs_inode);
 }
- 
+
 static int init_inodecache(void)
 {
        romfs_inode_cachep = kmem_cache_create("romfs_inode_cache",
                                             sizeof(struct romfs_inode_info),
                                             0, (SLAB_RECLAIM_ACCOUNT|
                                                SLAB_MEM_SPREAD),
-                                            init_once, NULL);
+                                            init_once);
        if (romfs_inode_cachep == NULL)
                return -ENOMEM;
        return 0;