3 files changed, 10 insertions, 12 deletions

diff --git a/drivers/misc/ibmasm/ibmasm.h b/drivers/misc/ibmasm/ibmasm.h
index 6aba4195444..634d538ccd1 100644
--- a/drivers/misc/ibmasm/ibmasm.h
+++ b/drivers/misc/ibmasm/ibmasm.h
@@ -29,7 +29,6 @@
 #include <linux/wait.h>
 #include <linux/spinlock.h>
 #include <linux/slab.h>
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/interrupt.h>
 #include <linux/device.h>
diff --git a/drivers/misc/ibmasm/ibmasmfs.c b/drivers/misc/ibmasm/ibmasmfs.c
index 4a35caff5d0..b99dc507de2 100644
--- a/drivers/misc/ibmasm/ibmasmfs.c
+++ b/drivers/misc/ibmasm/ibmasmfs.c
@@ -147,7 +147,6 @@ static struct inode *ibmasmfs_make_inode(struct super_block *sb, int mode)
         if (ret) {
                 ret->i_mode = mode;
                 ret->i_uid = ret->i_gid = 0;
-                ret->i_blksize = PAGE_CACHE_SIZE;
                 ret->i_blocks = 0;
                 ret->i_atime = ret->i_mtime = ret->i_ctime = CURRENT_TIME;
         }
@@ -175,7 +174,7 @@ static struct dentry *ibmasmfs_create_file (struct super_block *sb,
         }
 
         inode->i_fop = fops;
-        inode->u.generic_ip = data;
+        inode->i_private = data;
 
         d_add(dentry, inode);
         return dentry;
@@ -244,7 +243,7 @@ static int command_file_open(struct inode *inode, struct file *file)
 {
         struct ibmasmfs_command_data *command_data;
 
-        if (!inode->u.generic_ip)
+        if (!inode->i_private)
                 return -ENODEV;
 
         command_data = kmalloc(sizeof(struct ibmasmfs_command_data), GFP_KERNEL);
@@ -252,7 +251,7 @@ static int command_file_open(struct inode *inode, struct file *file)
                 return -ENOMEM;
 
         command_data->command = NULL;
-        command_data->sp = inode->u.generic_ip;
+        command_data->sp = inode->i_private;
         file->private_data = command_data;
         return 0;
 }
@@ -351,10 +350,10 @@ static int event_file_open(struct inode *inode, struct file *file)
         struct ibmasmfs_event_data *event_data;
         struct service_processor *sp; 
 
-        if (!inode->u.generic_ip)
+        if (!inode->i_private)
                 return -ENODEV;
 
-        sp = inode->u.generic_ip;
+        sp = inode->i_private;
 
         event_data = kmalloc(sizeof(struct ibmasmfs_event_data), GFP_KERNEL);
         if (!event_data)
@@ -439,14 +438,14 @@ static int r_heartbeat_file_open(struct inode *inode, struct file *file)
 {
         struct ibmasmfs_heartbeat_data *rhbeat;
 
-        if (!inode->u.generic_ip)
+        if (!inode->i_private)
                 return -ENODEV;
 
         rhbeat = kmalloc(sizeof(struct ibmasmfs_heartbeat_data), GFP_KERNEL);
         if (!rhbeat)
                 return -ENOMEM;
 
-        rhbeat->sp = (struct service_processor *)inode->u.generic_ip;
+        rhbeat->sp = inode->i_private;
         rhbeat->active = 0;
         ibmasm_init_reverse_heartbeat(rhbeat->sp, &rhbeat->heartbeat);
         file->private_data = rhbeat;
@@ -508,7 +507,7 @@ static ssize_t r_heartbeat_file_write(struct file *file, const char __user *buf,
 
 static int remote_settings_file_open(struct inode *inode, struct file *file)
 {
-        file->private_data = inode->u.generic_ip;
+        file->private_data = inode->i_private;
         return 0;
 }
 
diff --git a/drivers/misc/ibmasm/module.c b/drivers/misc/ibmasm/module.c
index 1fdf03fd2da..2f3bddfab93 100644
--- a/drivers/misc/ibmasm/module.c
+++ b/drivers/misc/ibmasm/module.c
@@ -85,7 +85,7 @@ static int __devinit ibmasm_init_one(struct pci_dev *pdev, const struct pci_devi
         }
         memset(sp, 0, sizeof(struct service_processor));
 
-        sp->lock = SPIN_LOCK_UNLOCKED;
+        spin_lock_init(&sp->lock);
         INIT_LIST_HEAD(&sp->command_queue);
 
         pci_set_drvdata(pdev, (void *)sp);
@@ -113,7 +113,7 @@ static int __devinit ibmasm_init_one(struct pci_dev *pdev, const struct pci_devi
                 goto error_ioremap;
         }
 
-        result = request_irq(sp->irq, ibmasm_interrupt_handler, SA_SHIRQ, sp->devname, (void*)sp);
+        result = request_irq(sp->irq, ibmasm_interrupt_handler, IRQF_SHARED, sp->devname, (void*)sp);
         if (result) {
                 dev_err(sp->dev, "Failed to register interrupt handler\n");
                 goto error_request_irq;