Patched in Tegra support.

6 files changed, 43 insertions, 43 deletions

diff --git a/drivers/message/i2o/README.ioctl b/drivers/message/i2o/README.ioctl
index 4a7d2ebdfc9..5fb195af43e 100644
--- a/drivers/message/i2o/README.ioctl
+++ b/drivers/message/i2o/README.ioctl
@@ -138,7 +138,7 @@ VI. Setting Parameters
 
    The return value is the size in bytes of the data written into
    ops->resbuf if no errors occur.  If an error occurs, -1 is returned 
-   and errno is set appropriately:
+   and errno is set appropriatly:
 
       EFAULT      Invalid user space pointer was passed
       ENXIO       Invalid IOP number
@@ -222,7 +222,7 @@ VIII. Downloading Software
    RETURNS
 
    This function returns 0 no errors occur. If an error occurs, -1 
-   is returned and errno is set appropriately:
+   is returned and errno is set appropriatly:
 
       EFAULT      Invalid user space pointer was passed
       ENXIO       Invalid IOP number
@@ -264,7 +264,7 @@ IX. Uploading Software
    RETURNS
 
    This function returns 0 if no errors occur.  If an error occurs, -1
-   is returned and errno is set appropriately:
+   is returned and errno is set appropriatly:
 
       EFAULT      Invalid user space pointer was passed
       ENXIO       Invalid IOP number
@@ -301,7 +301,7 @@ X. Removing Software
    RETURNS
 
    This function returns 0 if no errors occur.  If an error occurs, -1
-   is returned and errno is set appropriately:
+   is returned and errno is set appropriatly:
 
       EFAULT      Invalid user space pointer was passed
       ENXIO       Invalid IOP number
@@ -325,7 +325,7 @@ X. Validating Configuration
    RETURNS
 
    This function returns 0 if no erro occur.  If an error occurs, -1 is
-   returned and errno is set appropriately:
+   returned and errno is set appropriatly:
 
       ETIMEDOUT   Timeout waiting for reply message
       ENXIO       Invalid IOP number
@@ -360,7 +360,7 @@ XI. Configuration Dialog
    RETURNS
 
    This function returns 0 if no error occur. If an error occurs, -1
-   is returned and errno is set appropriately:
+   is returned and errno is set appropriatly:
 
       EFAULT      Invalid user space pointer was passed
       ENXIO       Invalid IOP number
diff --git a/drivers/message/i2o/i2o_block.c b/drivers/message/i2o/i2o_block.c
index 49e86aed2bc..4796bbf0ae4 100644
--- a/drivers/message/i2o/i2o_block.c
+++ b/drivers/message/i2o/i2o_block.c
@@ -609,7 +609,7 @@ static int i2o_block_release(struct gendisk *disk, fmode_t mode)
         u8 operation;
 
         /*
-         * This is to deal with the case of an application
+         * This is to deail with the case of an application
          * opening a device and then the device disappears while
          * it's in use, and then the application tries to release
          * it.  ex: Unmounting a deleted RAID volume at reboot.
diff --git a/drivers/message/i2o/i2o_config.c b/drivers/message/i2o/i2o_config.c
index 5451beff183..098de2b3578 100644
--- a/drivers/message/i2o/i2o_config.c
+++ b/drivers/message/i2o/i2o_config.c
@@ -188,13 +188,6 @@ static int i2o_cfg_parms(unsigned long arg, unsigned int type)
         if (!dev)
                 return -ENXIO;
 
-        /*
-         * Stop users being able to try and allocate arbitrary amounts
-         * of DMA space. 64K is way more than sufficient for this.
-         */
-        if (kcmd.oplen > 65536)
-                return -EMSGSIZE;
-
         ops = memdup_user(kcmd.opbuf, kcmd.oplen);
         if (IS_ERR(ops))
                 return PTR_ERR(ops);
diff --git a/drivers/message/i2o/i2o_proc.c b/drivers/message/i2o/i2o_proc.c
index 8001aa6bfb4..07dbeaf9df9 100644
--- a/drivers/message/i2o/i2o_proc.c
+++ b/drivers/message/i2o/i2o_proc.c
@@ -56,7 +56,7 @@
 /* Structure used to define /proc entries */
 typedef struct _i2o_proc_entry_t {
         char *name;             /* entry name */
-        umode_t mode;           /* mode */
+        mode_t mode;            /* mode */
         const struct file_operations *fops;     /* open function */
 } i2o_proc_entry;
 
@@ -255,8 +255,9 @@ static char *scsi_devices[] = {
         "Array Controller Device"
 };
 
-static char *chtostr(char *tmp, u8 *chars, int n)
+static char *chtostr(u8 * chars, int n)
 {
+        char tmp[256];
         tmp[0] = 0;
         return strncat(tmp, (char *)chars, n);
 }
@@ -282,6 +283,7 @@ static char *bus_strings[] = {
         "Local Bus",
         "ISA",
         "EISA",
+        "MCA",
         "PCI",
         "PCMCIA",
         "NUBUS",
@@ -349,6 +351,18 @@ static int i2o_seq_show_hrt(struct seq_file *seq, void *v)
                                            EisaSlotNumber);
                                 break;
 
+                        case I2O_BUS_MCA:
+                                seq_printf(seq, "     IOBase: %0#6x,",
+                                           hrt->hrt_entry[i].bus.mca_bus.
+                                           McaBaseIOPort);
+                                seq_printf(seq, " MemoryBase: %0#10x,",
+                                           hrt->hrt_entry[i].bus.mca_bus.
+                                           McaBaseMemoryAddress);
+                                seq_printf(seq, " Slot: %0#4x,",
+                                           hrt->hrt_entry[i].bus.mca_bus.
+                                           McaSlotNumber);
+                                break;
+
                         case I2O_BUS_PCI:
                                 seq_printf(seq, "     Bus: %0#4x",
                                            hrt->hrt_entry[i].bus.pci_bus.
@@ -790,7 +804,6 @@ static int i2o_seq_show_ddm_table(struct seq_file *seq, void *v)
         } *result;
 
         i2o_exec_execute_ddm_table ddm_table;
-        char tmp[28 + 1];
 
         result = kmalloc(sizeof(*result), GFP_KERNEL);
         if (!result)
@@ -826,7 +839,7 @@ static int i2o_seq_show_ddm_table(struct seq_file *seq, void *v)
                 seq_printf(seq, "%-#7x", ddm_table.i2o_vendor_id);
                 seq_printf(seq, "%-#8x", ddm_table.module_id);
                 seq_printf(seq, "%-29s",
-                           chtostr(tmp, ddm_table.module_name_version, 28));
+                           chtostr(ddm_table.module_name_version, 28));
                 seq_printf(seq, "%9d  ", ddm_table.data_size);
                 seq_printf(seq, "%8d", ddm_table.code_size);
 
@@ -893,7 +906,6 @@ static int i2o_seq_show_drivers_stored(struct seq_file *seq, void *v)
 
         i2o_driver_result_table *result;
         i2o_driver_store_table *dst;
-        char tmp[28 + 1];
 
         result = kmalloc(sizeof(i2o_driver_result_table), GFP_KERNEL);
         if (result == NULL)
@@ -928,9 +940,8 @@ static int i2o_seq_show_drivers_stored(struct seq_file *seq, void *v)
 
                 seq_printf(seq, "%-#7x", dst->i2o_vendor_id);
                 seq_printf(seq, "%-#8x", dst->module_id);
-                seq_printf(seq, "%-29s",
-                           chtostr(tmp, dst->module_name_version, 28));
-                seq_printf(seq, "%-9s", chtostr(tmp, dst->date, 8));
+                seq_printf(seq, "%-29s", chtostr(dst->module_name_version, 28));
+                seq_printf(seq, "%-9s", chtostr(dst->date, 8));
                 seq_printf(seq, "%8d ", dst->module_size);
                 seq_printf(seq, "%8d ", dst->mpb_size);
                 seq_printf(seq, "0x%04x", dst->module_flags);
@@ -1250,7 +1261,6 @@ static int i2o_seq_show_dev_identity(struct seq_file *seq, void *v)
         // == (allow) 512d bytes (max)
         static u16 *work16 = (u16 *) work32;
         int token;
-        char tmp[16 + 1];
 
         token = i2o_parm_field_get(d, 0xF100, -1, &work32, sizeof(work32));
 
@@ -1263,13 +1273,13 @@ static int i2o_seq_show_dev_identity(struct seq_file *seq, void *v)
         seq_printf(seq, "Owner TID     : %0#5x\n", work16[2]);
         seq_printf(seq, "Parent TID    : %0#5x\n", work16[3]);
         seq_printf(seq, "Vendor info   : %s\n",
-                   chtostr(tmp, (u8 *) (work32 + 2), 16));
+                   chtostr((u8 *) (work32 + 2), 16));
         seq_printf(seq, "Product info  : %s\n",
-                   chtostr(tmp, (u8 *) (work32 + 6), 16));
+                   chtostr((u8 *) (work32 + 6), 16));
         seq_printf(seq, "Description   : %s\n",
-                   chtostr(tmp, (u8 *) (work32 + 10), 16));
+                   chtostr((u8 *) (work32 + 10), 16));
         seq_printf(seq, "Product rev.  : %s\n",
-                   chtostr(tmp, (u8 *) (work32 + 14), 8));
+                   chtostr((u8 *) (work32 + 14), 8));
 
         seq_printf(seq, "Serial number : ");
         print_serial_number(seq, (u8 *) (work32 + 16),
@@ -1306,8 +1316,6 @@ static int i2o_seq_show_ddm_identity(struct seq_file *seq, void *v)
                 u8 pad[256];    // allow up to 256 byte (max) serial number
         } result;
 
-        char tmp[24 + 1];
-
         token = i2o_parm_field_get(d, 0xF101, -1, &result, sizeof(result));
 
         if (token < 0) {
@@ -1317,9 +1325,9 @@ static int i2o_seq_show_ddm_identity(struct seq_file *seq, void *v)
 
         seq_printf(seq, "Registering DDM TID : 0x%03x\n", result.ddm_tid);
         seq_printf(seq, "Module name         : %s\n",
-                   chtostr(tmp, result.module_name, 24));
+                   chtostr(result.module_name, 24));
         seq_printf(seq, "Module revision     : %s\n",
-                   chtostr(tmp, result.module_rev, 8));
+                   chtostr(result.module_rev, 8));
 
         seq_printf(seq, "Serial number       : ");
         print_serial_number(seq, result.serial_number, sizeof(result) - 36);
@@ -1343,8 +1351,6 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
                 u8 instance_number[4];
         } result;
 
-        char tmp[64 + 1];
-
         token = i2o_parm_field_get(d, 0xF102, -1, &result, sizeof(result));
 
         if (token < 0) {
@@ -1353,13 +1359,13 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
         }
 
         seq_printf(seq, "Device name     : %s\n",
-                   chtostr(tmp, result.device_name, 64));
+                   chtostr(result.device_name, 64));
         seq_printf(seq, "Service name    : %s\n",
-                   chtostr(tmp, result.service_name, 64));
+                   chtostr(result.service_name, 64));
         seq_printf(seq, "Physical name   : %s\n",
-                   chtostr(tmp, result.physical_location, 64));
+                   chtostr(result.physical_location, 64));
         seq_printf(seq, "Instance number : %s\n",
-                   chtostr(tmp, result.instance_number, 4));
+                   chtostr(result.instance_number, 4));
 
         return 0;
 }
diff --git a/drivers/message/i2o/i2o_scsi.c b/drivers/message/i2o/i2o_scsi.c
index 1d31d7284cb..c8ed7b63fdf 100644
--- a/drivers/message/i2o/i2o_scsi.c
+++ b/drivers/message/i2o/i2o_scsi.c
@@ -57,6 +57,7 @@
 #include <linux/scatterlist.h>
 
 #include <asm/dma.h>
+#include <asm/system.h>
 #include <asm/io.h>
 #include <linux/atomic.h>
 
diff --git a/drivers/message/i2o/pci.c b/drivers/message/i2o/pci.c
index 0f9f3e1a2b6..73e4658af53 100644
--- a/drivers/message/i2o/pci.c
+++ b/drivers/message/i2o/pci.c
@@ -31,13 +31,12 @@
 #include <linux/interrupt.h>
 #include <linux/slab.h>
 #include <linux/i2o.h>
-#include <linux/module.h>
 #include "core.h"
 
 #define OSM_DESCRIPTION "I2O-subsystem"
 
 /* PCI device id table for all I2O controllers */
-static struct pci_device_id i2o_pci_ids[] = {
+static struct pci_device_id __devinitdata i2o_pci_ids[] = {
         {PCI_DEVICE_CLASS(PCI_CLASS_INTELLIGENT_I2O << 8, 0xffff00)},
         {PCI_DEVICE(PCI_VENDOR_ID_DPT, 0xa511)},
         {.vendor = PCI_VENDOR_ID_INTEL,.device = 0x1962,
@@ -84,7 +83,7 @@ static void i2o_pci_free(struct i2o_controller *c)
  *
  *      Returns 0 on success or negative error code on failure.
  */
-static int i2o_pci_alloc(struct i2o_controller *c)
+static int __devinit i2o_pci_alloc(struct i2o_controller *c)
 {
         struct pci_dev *pdev = c->pdev;
         struct device *dev = &pdev->dev;
@@ -315,7 +314,8 @@ static void i2o_pci_irq_disable(struct i2o_controller *c)
  *
  *      Returns 0 on success or negative error code on failure.
  */
-static int i2o_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
+static int __devinit i2o_pci_probe(struct pci_dev *pdev,
+                                   const struct pci_device_id *id)
 {
         struct i2o_controller *c;
         int rc;
@@ -452,7 +452,7 @@ static int i2o_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
  *      Reset the I2O controller, disable interrupts and remove all allocated
  *      resources.
  */
-static void i2o_pci_remove(struct pci_dev *pdev)
+static void __devexit i2o_pci_remove(struct pci_dev *pdev)
 {
         struct i2o_controller *c;
         c = pci_get_drvdata(pdev);
@@ -473,7 +473,7 @@ static struct pci_driver i2o_pci_driver = {
         .name = "PCI_I2O",
         .id_table = i2o_pci_ids,
         .probe = i2o_pci_probe,
-        .remove = i2o_pci_remove,
+        .remove = __devexit_p(i2o_pci_remove),
 };
 
 /**