Patched in Tegra support.

14 files changed, 48 insertions, 37 deletions

diff --git a/drivers/misc/ibmasm/command.c b/drivers/misc/ibmasm/command.c
index 7d56f45dee1..5c766b4fb23 100644
--- a/drivers/misc/ibmasm/command.c
+++ b/drivers/misc/ibmasm/command.c
@@ -18,7 +18,7 @@
  *
  * Copyright (C) IBM Corporation, 2004
  *
- * Author: Max Asbรถck <amax@us.ibm.com>
+ * Author: Max Asb๖ck <amax@us.ibm.com>
  *
  */
 
diff --git a/drivers/misc/ibmasm/dot_command.c b/drivers/misc/ibmasm/dot_command.c
index d7b2ca358b2..3dd2dfb8da1 100644
--- a/drivers/misc/ibmasm/dot_command.c
+++ b/drivers/misc/ibmasm/dot_command.c
@@ -17,7 +17,7 @@
  *
  * Copyright (C) IBM Corporation, 2004
  *
- * Author: Max Asbรถck <amax@us.ibm.com>
+ * Author: Max Asb๖ck <amax@us.ibm.com>
  *
  */
 
diff --git a/drivers/misc/ibmasm/dot_command.h b/drivers/misc/ibmasm/dot_command.h
index fc9fc9d4e08..6cbba1afef3 100644
--- a/drivers/misc/ibmasm/dot_command.h
+++ b/drivers/misc/ibmasm/dot_command.h
@@ -17,7 +17,7 @@
  *
  * Copyright (C) IBM Corporation, 2004
  *
- * Author: Max Asbรถck <amax@us.ibm.com>
+ * Author: Max Asb๖ck <amax@us.ibm.com>
  *
  */
 
diff --git a/drivers/misc/ibmasm/event.c b/drivers/misc/ibmasm/event.c
index 8e540f4e9d5..76bfda1ffaa 100644
--- a/drivers/misc/ibmasm/event.c
+++ b/drivers/misc/ibmasm/event.c
@@ -18,7 +18,7 @@
  *
  * Copyright (C) IBM Corporation, 2004
  *
- * Author: Max Asbรถck <amax@us.ibm.com>
+ * Author: Max Asb๖ck <amax@us.ibm.com>
  *
  */
 
diff --git a/drivers/misc/ibmasm/heartbeat.c b/drivers/misc/ibmasm/heartbeat.c
index 90746378f9b..1bc4306572a 100644
--- a/drivers/misc/ibmasm/heartbeat.c
+++ b/drivers/misc/ibmasm/heartbeat.c
@@ -18,7 +18,7 @@
  *
  * Copyright (C) IBM Corporation, 2004
  *
- * Author: Max Asbรถck <amax@us.ibm.com>
+ * Author: Max Asb๖ck <amax@us.ibm.com>
  *
  */
 
diff --git a/drivers/misc/ibmasm/i2o.h b/drivers/misc/ibmasm/i2o.h
index 2e9566dab2b..bf2c738d2b7 100644
--- a/drivers/misc/ibmasm/i2o.h
+++ b/drivers/misc/ibmasm/i2o.h
@@ -17,7 +17,7 @@
  *
  * Copyright (C) IBM Corporation, 2004
  *
- * Author: Max Asbรถck <amax@us.ibm.com>
+ * Author: Max Asb๖ck <amax@us.ibm.com>
  *
  */
 
diff --git a/drivers/misc/ibmasm/ibmasm.h b/drivers/misc/ibmasm/ibmasm.h
index 9b083448814..4d8a4e248b3 100644
--- a/drivers/misc/ibmasm/ibmasm.h
+++ b/drivers/misc/ibmasm/ibmasm.h
@@ -18,7 +18,7 @@
  *
  * Copyright (C) IBM Corporation, 2004
  *
- * Author: Max Asbรถck <amax@us.ibm.com>
+ * Author: Max Asb๖ck <amax@us.ibm.com>
  *
  */
 
diff --git a/drivers/misc/ibmasm/ibmasmfs.c b/drivers/misc/ibmasm/ibmasmfs.c
index 6673e578b3e..89947723a27 100644
--- a/drivers/misc/ibmasm/ibmasmfs.c
+++ b/drivers/misc/ibmasm/ibmasmfs.c
@@ -17,7 +17,7 @@
  *
  * Copyright (C) IBM Corporation, 2004
  *
- * Author: Max Asbรถck <amax@us.ibm.com>
+ * Author: Max Asb๖ck <amax@us.ibm.com>
  *
  */
 
@@ -87,7 +87,7 @@
 static LIST_HEAD(service_processors);
 
 static struct inode *ibmasmfs_make_inode(struct super_block *sb, int mode);
-static void ibmasmfs_create_files (struct super_block *sb);
+static void ibmasmfs_create_files (struct super_block *sb, struct dentry *root);
 static int ibmasmfs_fill_super (struct super_block *sb, void *data, int silent);
 
 
@@ -114,6 +114,7 @@ static struct file_system_type ibmasmfs_type = {
 static int ibmasmfs_fill_super (struct super_block *sb, void *data, int silent)
 {
         struct inode *root;
+        struct dentry *root_dentry;
 
         sb->s_blocksize = PAGE_CACHE_SIZE;
         sb->s_blocksize_bits = PAGE_CACHE_SHIFT;
@@ -128,11 +129,14 @@ static int ibmasmfs_fill_super (struct super_block *sb, void *data, int silent)
         root->i_op = &simple_dir_inode_operations;
         root->i_fop = ibmasmfs_dir_ops;
 
-        sb->s_root = d_make_root(root);
-        if (!sb->s_root)
+        root_dentry = d_alloc_root(root);
+        if (!root_dentry) {
+                iput(root);
                 return -ENOMEM;
+        }
+        sb->s_root = root_dentry;
 
-        ibmasmfs_create_files(sb);
+        ibmasmfs_create_files(sb, root_dentry);
         return 0;
 }
 
@@ -500,6 +504,12 @@ static ssize_t r_heartbeat_file_write(struct file *file, const char __user *buf,
         return 1;
 }
 
+static int remote_settings_file_open(struct inode *inode, struct file *file)
+{
+        file->private_data = inode->i_private;
+        return 0;
+}
+
 static int remote_settings_file_close(struct inode *inode, struct file *file)
 {
         return 0;
@@ -594,7 +604,7 @@ static const struct file_operations r_heartbeat_fops = {
 };
 
 static const struct file_operations remote_settings_fops = {
-        .open =         simple_open,
+        .open =         remote_settings_file_open,
         .release =      remote_settings_file_close,
         .read =         remote_settings_file_read,
         .write =        remote_settings_file_write,
@@ -602,7 +612,7 @@ static const struct file_operations remote_settings_fops = {
 };
 
 
-static void ibmasmfs_create_files (struct super_block *sb)
+static void ibmasmfs_create_files (struct super_block *sb, struct dentry *root)
 {
         struct list_head *entry;
         struct service_processor *sp;
@@ -611,7 +621,7 @@ static void ibmasmfs_create_files (struct super_block *sb)
                 struct dentry *dir;
                 struct dentry *remote_dir;
                 sp = list_entry(entry, struct service_processor, node);
-                dir = ibmasmfs_create_dir(sb, sb->s_root, sp->dirname);
+                dir = ibmasmfs_create_dir(sb, root, sp->dirname);
                 if (!dir)
                         continue;
 
diff --git a/drivers/misc/ibmasm/lowlevel.c b/drivers/misc/ibmasm/lowlevel.c
index 5319ea261c0..4b2398e27fd 100644
--- a/drivers/misc/ibmasm/lowlevel.c
+++ b/drivers/misc/ibmasm/lowlevel.c
@@ -17,7 +17,7 @@
  *
  * Copyright (C) IBM Corporation, 2004
  *
- * Author: Max Asbรถck <amax@us.ibm.com>
+ * Author: Max Asb๖ck <amax@us.ibm.com>
  *
  */
 
diff --git a/drivers/misc/ibmasm/lowlevel.h b/drivers/misc/ibmasm/lowlevel.h
index e97848f51b3..766766523a6 100644
--- a/drivers/misc/ibmasm/lowlevel.h
+++ b/drivers/misc/ibmasm/lowlevel.h
@@ -17,7 +17,7 @@
  *
  * Copyright (C) IBM Corporation, 2004
  *
- * Author: Max Asbรถck <amax@us.ibm.com>
+ * Author: Max Asb๖ck <amax@us.ibm.com>
  *
  */
 
diff --git a/drivers/misc/ibmasm/module.c b/drivers/misc/ibmasm/module.c
index 0346d87c5fe..a234d965243 100644
--- a/drivers/misc/ibmasm/module.c
+++ b/drivers/misc/ibmasm/module.c
@@ -18,7 +18,7 @@
  *
  * Copyright (C) IBM Corporation, 2004
  *
- * Author: Max Asbรถck <amax@us.ibm.com>
+ * Author: Max Asb๖ck <amax@us.ibm.com>
  *
  * This driver is based on code originally written by Pete Reynolds
  * and others.
@@ -62,7 +62,7 @@ module_param(ibmasm_debug, int , S_IRUGO | S_IWUSR);
 MODULE_PARM_DESC(ibmasm_debug, " Set debug mode on or off");
 
 
-static int ibmasm_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
+static int __devinit ibmasm_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
 {
         int result;
         struct service_processor *sp;
@@ -163,7 +163,7 @@ error_resources:
         return result;
 }
 
-static void ibmasm_remove_one(struct pci_dev *pdev)
+static void __devexit ibmasm_remove_one(struct pci_dev *pdev)
 {
         struct service_processor *sp = (struct service_processor *)pci_get_drvdata(pdev);
 
@@ -198,7 +198,7 @@ static struct pci_driver ibmasm_driver = {
         .name           = DRIVER_NAME,
         .id_table       = ibmasm_pci_table,
         .probe          = ibmasm_init_one,
-        .remove         = ibmasm_remove_one,
+        .remove         = __devexit_p(ibmasm_remove_one),
 };
 
 static void __exit ibmasm_exit (void)
@@ -211,17 +211,18 @@ static void __exit ibmasm_exit (void)
 
 static int __init ibmasm_init(void)
 {
-        int result = pci_register_driver(&ibmasm_driver);
-        if (result)
-                return result;
+        int result;
 
         result = ibmasmfs_register();
         if (result) {
-                pci_unregister_driver(&ibmasm_driver);
                 err("Failed to register ibmasmfs file system");
                 return result;
         }
-
+        result = pci_register_driver(&ibmasm_driver);
+        if (result) {
+                ibmasmfs_unregister();
+                return result;
+        }
         ibmasm_register_panic_notifier();
         info(DRIVER_DESC " version " DRIVER_VERSION " loaded");
         return 0;
diff --git a/drivers/misc/ibmasm/r_heartbeat.c b/drivers/misc/ibmasm/r_heartbeat.c
index 232034f5da4..2de487ac788 100644
--- a/drivers/misc/ibmasm/r_heartbeat.c
+++ b/drivers/misc/ibmasm/r_heartbeat.c
@@ -16,7 +16,7 @@
  *
  * Copyright (C) IBM Corporation, 2004
  *
- * Author: Max Asbรถck <amax@us.ibm.com>
+ * Author: Max Asb๖ck <amax@us.ibm.com>
  *
  */
 
diff --git a/drivers/misc/ibmasm/remote.h b/drivers/misc/ibmasm/remote.h
index a7729ef76ac..00dbf1d4373 100644
--- a/drivers/misc/ibmasm/remote.h
+++ b/drivers/misc/ibmasm/remote.h
@@ -18,7 +18,7 @@
  *
  * Copyright (C) IBM Corporation, 2004
  *
- * Author: Max Asbรถck <amax@us.ibm.com>
+ * Author: Max Asb๖ck <amax@us.ibm.com>
  *
  * Originally written by Pete Reynolds
  */
diff --git a/drivers/misc/ibmasm/uart.c b/drivers/misc/ibmasm/uart.c
index 01e2b0d7e59..93baa350d69 100644
--- a/drivers/misc/ibmasm/uart.c
+++ b/drivers/misc/ibmasm/uart.c
@@ -18,7 +18,7 @@
  *
  * Copyright (C) IBM Corporation, 2004
  *
- * Author: Max Asbรถck <amax@us.ibm.com>
+ * Author: Max Asb๖ck <amax@us.ibm.com>
  *
  */
 
@@ -33,7 +33,7 @@
 
 void ibmasm_register_uart(struct service_processor *sp)
 {
-        struct uart_8250_port uart;
+        struct uart_port uport;
         void __iomem *iomem_base;
 
         iomem_base = sp->base_address + SCOUT_COM_B_BASE;
@@ -47,14 +47,14 @@ void ibmasm_register_uart(struct service_processor *sp)
                 return;
         }
 
-        memset(&uart, 0, sizeof(uart));
-        uart.port.irq           = sp->irq;
-        uart.port.uartclk       = 3686400;
-        uart.port.flags         = UPF_SHARE_IRQ;
-        uart.port.iotype        = UPIO_MEM;
-        uart.port.membase       = iomem_base;
+        memset(&uport, 0, sizeof(struct uart_port));
+        uport.irq       = sp->irq;
+        uport.uartclk   = 3686400;
+        uport.flags     = UPF_SHARE_IRQ;
+        uport.iotype    = UPIO_MEM;
+        uport.membase   = iomem_base;
 
-        sp->serial_line = serial8250_register_8250_port(&uart);
+        sp->serial_line = serial8250_register_port(&uport);
         if (sp->serial_line < 0) {
                 dev_err(sp->dev, "Failed to register serial port\n");
                 return;