4 files changed, 9 insertions, 11 deletions

diff --git a/drivers/misc/hdpuftrs/hdpu_cpustate.c b/drivers/misc/hdpuftrs/hdpu_cpustate.c
index 11a801be71c..ca86f113f36 100644
--- a/drivers/misc/hdpuftrs/hdpu_cpustate.c
+++ b/drivers/misc/hdpuftrs/hdpu_cpustate.c
@@ -169,7 +169,7 @@ static struct platform_driver hdpu_cpustate_driver = {
 /*
  *      The various file operations we support.
  */
-static struct file_operations cpustate_fops = {
+static const struct file_operations cpustate_fops = {
       owner:THIS_MODULE,
       open:cpustate_open,
       release:cpustate_release,
diff --git a/drivers/misc/hdpuftrs/hdpu_nexus.c b/drivers/misc/hdpuftrs/hdpu_nexus.c
index ea9d5f233c8..6a51e99a807 100644
--- a/drivers/misc/hdpuftrs/hdpu_nexus.c
+++ b/drivers/misc/hdpuftrs/hdpu_nexus.c
@@ -72,11 +72,9 @@ static int hdpu_nexus_probe(struct platform_device *pdev)
                 printk("Could not map slot id\n");
         hdpu_slot_id = create_proc_entry("sky_slot_id", 0666, &proc_root);
         hdpu_slot_id->read_proc = hdpu_slot_id_read;
-        hdpu_slot_id->nlink = 1;
 
         hdpu_chassis_id = create_proc_entry("sky_chassis_id", 0666, &proc_root);
         hdpu_chassis_id->read_proc = hdpu_chassis_id_read;
-        hdpu_chassis_id->nlink = 1;
         return 0;
 }
 
diff --git a/drivers/misc/ibmasm/ibmasmfs.c b/drivers/misc/ibmasm/ibmasmfs.c
index b99dc507de2..c436d3de8b8 100644
--- a/drivers/misc/ibmasm/ibmasmfs.c
+++ b/drivers/misc/ibmasm/ibmasmfs.c
@@ -156,7 +156,7 @@ static struct inode *ibmasmfs_make_inode(struct super_block *sb, int mode)
 static struct dentry *ibmasmfs_create_file (struct super_block *sb,
                         struct dentry *parent,
                         const char *name,
-                        struct file_operations *fops,
+                        const struct file_operations *fops,
                         void *data,
                         int mode)
 {
@@ -581,28 +581,28 @@ static ssize_t remote_settings_file_write(struct file *file, const char __user *
         return count;
 }
 
-static struct file_operations command_fops = {
+static const struct file_operations command_fops = {
         .open =         command_file_open,
         .release =      command_file_close,
         .read =         command_file_read,
         .write =        command_file_write,
 };
 
-static struct file_operations event_fops = {
+static const struct file_operations event_fops = {
         .open =         event_file_open,
         .release =      event_file_close,
         .read =         event_file_read,
         .write =        event_file_write,
 };
 
-static struct file_operations r_heartbeat_fops = {
+static const struct file_operations r_heartbeat_fops = {
         .open =         r_heartbeat_file_open,
         .release =      r_heartbeat_file_close,
         .read =         r_heartbeat_file_read,
         .write =        r_heartbeat_file_write,
 };
 
-static struct file_operations remote_settings_fops = {
+static const struct file_operations remote_settings_fops = {
         .open =         remote_settings_file_open,
         .release =      remote_settings_file_close,
         .read =         remote_settings_file_read,
diff --git a/drivers/misc/ioc4.c b/drivers/misc/ioc4.c
index b995a15b752..6a5a05d1f39 100644
--- a/drivers/misc/ioc4.c
+++ b/drivers/misc/ioc4.c
@@ -309,7 +309,7 @@ ioc4_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id)
                 ret = -ENODEV;
                 goto out_pci;
         }
-        if (!request_region(idd->idd_bar0, sizeof(struct ioc4_misc_regs),
+        if (!request_mem_region(idd->idd_bar0, sizeof(struct ioc4_misc_regs),
                             "ioc4_misc")) {
                 printk(KERN_WARNING
                        "%s: Unable to request IOC4 misc region "
@@ -379,7 +379,7 @@ ioc4_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id)
         return 0;
 
 out_misc_region:
-        release_region(idd->idd_bar0, sizeof(struct ioc4_misc_regs));
+        release_mem_region(idd->idd_bar0, sizeof(struct ioc4_misc_regs));
 out_pci:
         kfree(idd);
 out_idd:
@@ -418,7 +418,7 @@ ioc4_remove(struct pci_dev *pdev)
                        "Device removal may be incomplete.\n",
                        __FUNCTION__, pci_name(idd->idd_pdev));
         }
-        release_region(idd->idd_bar0, sizeof(struct ioc4_misc_regs));
+        release_mem_region(idd->idd_bar0, sizeof(struct ioc4_misc_regs));
 
         /* Disable IOC4 and relinquish */
         pci_disable_device(pdev);