Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

273 files changed, 4114 insertions, 11518 deletions

diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index 6d4736e89f1a..8827dafba945 100644
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -20,6 +20,8 @@
 
 #include "base.h"
 
+#define to_platform_driver(drv) (container_of((drv), struct platform_driver, driver))
+
 struct device platform_bus = {
         .bus_id         = "platform",
 };
@@ -354,6 +356,77 @@ error:
         return ERR_PTR(retval);
 }
 
+static int platform_drv_probe(struct device *_dev)
+{
+        struct platform_driver *drv = to_platform_driver(_dev->driver);
+        struct platform_device *dev = to_platform_device(_dev);
+
+        return drv->probe(dev);
+}
+
+static int platform_drv_remove(struct device *_dev)
+{
+        struct platform_driver *drv = to_platform_driver(_dev->driver);
+        struct platform_device *dev = to_platform_device(_dev);
+
+        return drv->remove(dev);
+}
+
+static void platform_drv_shutdown(struct device *_dev)
+{
+        struct platform_driver *drv = to_platform_driver(_dev->driver);
+        struct platform_device *dev = to_platform_device(_dev);
+
+        drv->shutdown(dev);
+}
+
+static int platform_drv_suspend(struct device *_dev, pm_message_t state)
+{
+        struct platform_driver *drv = to_platform_driver(_dev->driver);
+        struct platform_device *dev = to_platform_device(_dev);
+
+        return drv->suspend(dev, state);
+}
+
+static int platform_drv_resume(struct device *_dev)
+{
+        struct platform_driver *drv = to_platform_driver(_dev->driver);
+        struct platform_device *dev = to_platform_device(_dev);
+
+        return drv->resume(dev);
+}
+
+/**
+ *      platform_driver_register
+ *      @drv: platform driver structure
+ */
+int platform_driver_register(struct platform_driver *drv)
+{
+        drv->driver.bus = &platform_bus_type;
+        if (drv->probe)
+                drv->driver.probe = platform_drv_probe;
+        if (drv->remove)
+                drv->driver.remove = platform_drv_remove;
+        if (drv->shutdown)
+                drv->driver.shutdown = platform_drv_shutdown;
+        if (drv->suspend)
+                drv->driver.suspend = platform_drv_suspend;
+        if (drv->resume)
+                drv->driver.resume = platform_drv_resume;
+        return driver_register(&drv->driver);
+}
+EXPORT_SYMBOL_GPL(platform_driver_register);
+
+/**
+ *      platform_driver_unregister
+ *      @drv: platform driver structure
+ */
+void platform_driver_unregister(struct platform_driver *drv)
+{
+        driver_unregister(&drv->driver);
+}
+EXPORT_SYMBOL_GPL(platform_driver_unregister);
+
 
 /**
  *      platform_match - bind platform device to platform driver.
diff --git a/drivers/block/acsi.c b/drivers/block/acsi.c
index 0e1f34fef0c8..5d2d649f7e8d 100644
--- a/drivers/block/acsi.c
+++ b/drivers/block/acsi.c
@@ -58,7 +58,6 @@
 #include <linux/slab.h>
 #include <linux/interrupt.h>
 #include <scsi/scsi.h> /* for SCSI_IOCTL_GET_IDLUN */
-typedef void Scsi_Device; /* hack to avoid including scsi.h */
 #include <scsi/scsi_ioctl.h>
 #include <linux/hdreg.h> /* for HDIO_GETGEO */
 #include <linux/blkpg.h>
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index a97c80b57737..e239a6c29230 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -148,6 +148,7 @@ static struct board_type products[] = {
 static ctlr_info_t *hba[MAX_CTLR];
 
 static void do_cciss_request(request_queue_t *q);
+static irqreturn_t do_cciss_intr(int irq, void *dev_id, struct pt_regs *regs);
 static int cciss_open(struct inode *inode, struct file *filep);
 static int cciss_release(struct inode *inode, struct file *filep);
 static int cciss_ioctl(struct inode *inode, struct file *filep, 
@@ -1583,6 +1584,24 @@ static int fill_cmd(CommandList_struct *c, __u8 cmd, int ctlr, void *buff,
                 }
         } else if (cmd_type == TYPE_MSG) {
                 switch (cmd) {
+                case 0: /* ABORT message */
+                        c->Request.CDBLen = 12;
+                        c->Request.Type.Attribute = ATTR_SIMPLE;
+                        c->Request.Type.Direction = XFER_WRITE;
+                        c->Request.Timeout = 0;
+                        c->Request.CDB[0] = cmd; /* abort */
+                        c->Request.CDB[1] = 0;   /* abort a command */
+                        /* buff contains the tag of the command to abort */
+                        memcpy(&c->Request.CDB[4], buff, 8);
+                        break;
+                case 1: /* RESET message */
+                        c->Request.CDBLen = 12;
+                        c->Request.Type.Attribute = ATTR_SIMPLE;
+                        c->Request.Type.Direction = XFER_WRITE;
+                        c->Request.Timeout = 0;
+                        memset(&c->Request.CDB[0], 0, sizeof(c->Request.CDB));
+                        c->Request.CDB[0] = cmd;  /* reset */
+                        c->Request.CDB[1] = 0x04; /* reset a LUN */
                 case 3: /* No-Op message */
                         c->Request.CDBLen = 1;
                         c->Request.Type.Attribute = ATTR_SIMPLE;
@@ -1869,6 +1888,52 @@ static unsigned long pollcomplete(int ctlr)
         /* Invalid address to tell caller we ran out of time */
         return 1;
 }
+
+static int add_sendcmd_reject(__u8 cmd, int ctlr, unsigned long complete)
+{
+        /* We get in here if sendcmd() is polling for completions
+           and gets some command back that it wasn't expecting -- 
+           something other than that which it just sent down.  
+           Ordinarily, that shouldn't happen, but it can happen when 
+           the scsi tape stuff gets into error handling mode, and
+           starts using sendcmd() to try to abort commands and 
+           reset tape drives.  In that case, sendcmd may pick up
+           completions of commands that were sent to logical drives
+           through the block i/o system, or cciss ioctls completing, etc. 
+           In that case, we need to save those completions for later
+           processing by the interrupt handler.
+        */
+
+#ifdef CONFIG_CISS_SCSI_TAPE
+        struct sendcmd_reject_list *srl = &hba[ctlr]->scsi_rejects;     
+
+        /* If it's not the scsi tape stuff doing error handling, (abort */
+        /* or reset) then we don't expect anything weird. */
+        if (cmd != CCISS_RESET_MSG && cmd != CCISS_ABORT_MSG) {
+#endif
+                printk( KERN_WARNING "cciss cciss%d: SendCmd "
+                      "Invalid command list address returned! (%lx)\n",
+                        ctlr, complete);
+                /* not much we can do. */
+#ifdef CONFIG_CISS_SCSI_TAPE
+                return 1;
+        }
+
+        /* We've sent down an abort or reset, but something else
+           has completed */
+        if (srl->ncompletions >= (NR_CMDS + 2)) {
+                /* Uh oh.  No room to save it for later... */
+                printk(KERN_WARNING "cciss%d: Sendcmd: Invalid command addr, "
+                        "reject list overflow, command lost!\n", ctlr);
+                return 1;
+        }
+        /* Save it for later */
+        srl->complete[srl->ncompletions] = complete;
+        srl->ncompletions++;
+#endif
+        return 0;
+}
+
 /*
  * Send a command to the controller, and wait for it to complete.  
  * Only used at init time. 
@@ -1891,7 +1956,7 @@ static int sendcmd(
         unsigned long complete;
         ctlr_info_t *info_p= hba[ctlr];
         u64bit buff_dma_handle;
-        int status;
+        int status, done = 0;
 
         if ((c = cmd_alloc(info_p, 1)) == NULL) {
                 printk(KERN_WARNING "cciss: unable to get memory");
@@ -1913,7 +1978,9 @@ resend_cmd1:
         info_p->access.set_intr_mask(info_p, CCISS_INTR_OFF);
         
         /* Make sure there is room in the command FIFO */
-        /* Actually it should be completely empty at this time. */
+        /* Actually it should be completely empty at this time */
+        /* unless we are in here doing error handling for the scsi */
+        /* tape side of the driver. */
         for (i = 200000; i > 0; i--) 
         {
                 /* if fifo isn't full go */
@@ -1930,13 +1997,25 @@ resend_cmd1:
          * Send the cmd
          */
         info_p->access.submit_command(info_p, c);
-        complete = pollcomplete(ctlr);
+        done = 0;
+        do {
+                complete = pollcomplete(ctlr);
 
 #ifdef CCISS_DEBUG
-        printk(KERN_DEBUG "cciss: command completed\n");
+                printk(KERN_DEBUG "cciss: command completed\n");
 #endif /* CCISS_DEBUG */
 
-        if (complete != 1) {
+                if (complete == 1) {
+                        printk( KERN_WARNING
+                                "cciss cciss%d: SendCmd Timeout out, "
+                                "No command list address returned!\n",
+                                ctlr);
+                        status = IO_ERROR;
+                        done = 1;
+                        break;
+                }
+
+                /* This will need to change for direct lookup completions */
                 if ( (complete & CISS_ERROR_BIT)
                      && (complete & ~CISS_ERROR_BIT) == c->busaddr)
                      {
@@ -1976,6 +2055,10 @@ resend_cmd1:
                                                 status = IO_ERROR;
                                                 goto cleanup1;
                                         }
+                                } else if (c->err_info->CommandStatus == CMD_UNABORTABLE) {
+                                        printk(KERN_WARNING "cciss%d: command could not be aborted.\n", ctlr);
+                                        status = IO_ERROR;
+                                        goto cleanup1;
                                 }
                                 printk(KERN_WARNING "ciss ciss%d: sendcmd"
                                 " Error %x \n", ctlr, 
@@ -1990,20 +2073,15 @@ resend_cmd1:
                                 goto cleanup1;
                         }
                 }
+                /* This will need changing for direct lookup completions */
                 if (complete != c->busaddr) {
-                        printk( KERN_WARNING "cciss cciss%d: SendCmd "
-                      "Invalid command list address returned! (%lx)\n",
-                                ctlr, complete);
-                        status = IO_ERROR;
-                        goto cleanup1;
-                }
-        } else {
-                printk( KERN_WARNING
-                        "cciss cciss%d: SendCmd Timeout out, "
-                        "No command list address returned!\n",
-                        ctlr);
-                status = IO_ERROR;
-        }
+                        if (add_sendcmd_reject(cmd, ctlr, complete) != 0) {
+                                BUG(); /* we are pretty much hosed if we get here. */
+                        }
+                        continue;
+                } else
+                        done = 1;
+        } while (!done);
                 
 cleanup1:       
         /* unlock the data buffer from DMA */
@@ -2011,6 +2089,11 @@ cleanup1:
         buff_dma_handle.val32.upper = c->SG[0].Addr.upper;
         pci_unmap_single(info_p->pdev, (dma_addr_t) buff_dma_handle.val,
                                 c->SG[0].Len, PCI_DMA_BIDIRECTIONAL);
+#ifdef CONFIG_CISS_SCSI_TAPE
+        /* if we saved some commands for later, process them now. */
+        if (info_p->scsi_rejects.ncompletions > 0)
+                do_cciss_intr(0, info_p, NULL);
+#endif
         cmd_free(info_p, c, 1);
         return (status);
 } 
@@ -2335,6 +2418,48 @@ startio:
         start_io(h);
 }
 
+static inline unsigned long get_next_completion(ctlr_info_t *h)
+{
+#ifdef CONFIG_CISS_SCSI_TAPE
+        /* Any rejects from sendcmd() lying around? Process them first */
+        if (h->scsi_rejects.ncompletions == 0)
+                return h->access.command_completed(h);
+        else {
+                struct sendcmd_reject_list *srl;
+                int n;
+                srl = &h->scsi_rejects;
+                n = --srl->ncompletions;
+                /* printk("cciss%d: processing saved reject\n", h->ctlr); */
+                printk("p");
+                return srl->complete[n];
+        }
+#else
+        return h->access.command_completed(h);
+#endif
+}
+
+static inline int interrupt_pending(ctlr_info_t *h)
+{
+#ifdef CONFIG_CISS_SCSI_TAPE
+        return ( h->access.intr_pending(h) 
+                || (h->scsi_rejects.ncompletions > 0));
+#else
+        return h->access.intr_pending(h);
+#endif
+}
+
+static inline long interrupt_not_for_us(ctlr_info_t *h)
+{
+#ifdef CONFIG_CISS_SCSI_TAPE
+        return (((h->access.intr_pending(h) == 0) || 
+                 (h->interrupts_enabled == 0)) 
+              && (h->scsi_rejects.ncompletions == 0));
+#else
+        return (((h->access.intr_pending(h) == 0) || 
+                 (h->interrupts_enabled == 0)));
+#endif
+}
+
 static irqreturn_t do_cciss_intr(int irq, void *dev_id, struct pt_regs *regs)
 {
         ctlr_info_t *h = dev_id;
@@ -2344,19 +2469,15 @@ static irqreturn_t do_cciss_intr(int irq, void *dev_id, struct pt_regs *regs)
         int j;
         int start_queue = h->next_to_run;
 
-        /* Is this interrupt for us? */
-        if (( h->access.intr_pending(h) == 0) || (h->interrupts_enabled == 0))
+        if (interrupt_not_for_us(h))
                 return IRQ_NONE;
-
         /*
          * If there are completed commands in the completion queue,
          * we had better do something about it.
          */
         spin_lock_irqsave(CCISS_LOCK(h->ctlr), flags);
-        while( h->access.intr_pending(h))
-        {
-                while((a = h->access.command_completed(h)) != FIFO_EMPTY) 
-                {
+        while (interrupt_pending(h)) {
+                while((a = get_next_completion(h)) != FIFO_EMPTY) {
                         a1 = a;
                         if ((a & 0x04)) {
                                 a2 = (a >> 3);
@@ -2963,7 +3084,15 @@ static int __devinit cciss_init_one(struct pci_dev *pdev,
                 printk( KERN_ERR "cciss: out of memory");
                 goto clean4;
         }
-
+#ifdef CONFIG_CISS_SCSI_TAPE
+        hba[i]->scsi_rejects.complete = 
+                kmalloc(sizeof(hba[i]->scsi_rejects.complete[0]) * 
+                        (NR_CMDS + 5), GFP_KERNEL);
+        if (hba[i]->scsi_rejects.complete == NULL) {
+                printk( KERN_ERR "cciss: out of memory");
+                goto clean4;
+        }
+#endif
         spin_lock_init(&hba[i]->lock);
 
         /* Initialize the pdev driver private data. 
@@ -3031,6 +3160,10 @@ static int __devinit cciss_init_one(struct pci_dev *pdev,
         return(1);
 
 clean4:
+#ifdef CONFIG_CISS_SCSI_TAPE
+        if(hba[i]->scsi_rejects.complete)
+                kfree(hba[i]->scsi_rejects.complete);
+#endif
         kfree(hba[i]->cmd_pool_bits);
         if(hba[i]->cmd_pool)
                 pci_free_consistent(hba[i]->pdev,
@@ -3103,6 +3236,9 @@ static void __devexit cciss_remove_one (struct pci_dev *pdev)
         pci_free_consistent(hba[i]->pdev, NR_CMDS * sizeof( ErrorInfo_struct),
                 hba[i]->errinfo_pool, hba[i]->errinfo_pool_dhandle);
         kfree(hba[i]->cmd_pool_bits);
+#ifdef CONFIG_CISS_SCSI_TAPE
+        kfree(hba[i]->scsi_rejects.complete);
+#endif
         release_io_mem(hba[i]);
         free_hba(i);
 }       
diff --git a/drivers/block/cciss.h b/drivers/block/cciss.h
index ef277baee9fd..3b0858c83897 100644
--- a/drivers/block/cciss.h
+++ b/drivers/block/cciss.h
@@ -44,6 +44,14 @@ typedef struct _drive_info_struct
                                   */
 } drive_info_struct;
 
+#ifdef CONFIG_CISS_SCSI_TAPE
+
+struct sendcmd_reject_list {
+        int ncompletions;
+        unsigned long *complete; /* array of NR_CMDS tags */
+};
+
+#endif
 struct ctlr_info 
 {
         int     ctlr;
@@ -100,6 +108,9 @@ struct ctlr_info
         struct gendisk   *gendisk[NWD];
 #ifdef CONFIG_CISS_SCSI_TAPE
         void *scsi_ctlr; /* ptr to structure containing scsi related stuff */
+        /* list of block side commands the scsi error handling sucked up */
+        /* and saved for later processing */
+        struct sendcmd_reject_list scsi_rejects;
 #endif
         unsigned char alive;
 };
diff --git a/drivers/block/cciss_scsi.c b/drivers/block/cciss_scsi.c
index ec27976a57da..3226aa11c6ef 100644
--- a/drivers/block/cciss_scsi.c
+++ b/drivers/block/cciss_scsi.c
@@ -42,6 +42,9 @@
 
 #include "cciss_scsi.h"
 
+#define CCISS_ABORT_MSG 0x00
+#define CCISS_RESET_MSG 0x01
+
 /* some prototypes... */ 
 static int sendcmd(
         __u8    cmd,
@@ -67,6 +70,8 @@ static int cciss_scsi_proc_info(
 
 static int cciss_scsi_queue_command (struct scsi_cmnd *cmd,
                 void (* done)(struct scsi_cmnd *));
+static int cciss_eh_device_reset_handler(struct scsi_cmnd *);
+static int cciss_eh_abort_handler(struct scsi_cmnd *);
 
 static struct cciss_scsi_hba_t ccissscsi[MAX_CTLR] = {
         { .name = "cciss0", .ndevices = 0 },
@@ -90,6 +95,9 @@ static struct scsi_host_template cciss_driver_template = {
         .sg_tablesize           = MAXSGENTRIES,
         .cmd_per_lun            = 1,
         .use_clustering         = DISABLE_CLUSTERING,
+        /* Can't have eh_bus_reset_handler or eh_host_reset_handler for cciss */
+        .eh_device_reset_handler= cciss_eh_device_reset_handler,
+        .eh_abort_handler       = cciss_eh_abort_handler,
 };
 
 #pragma pack(1)
@@ -247,7 +255,7 @@ scsi_cmd_stack_free(int ctlr)
 #define DEVICETYPE(n) (n<0 || n>MAX_SCSI_DEVICE_CODE) ? \
         "Unknown" : scsi_device_types[n]
 
-#if 0
+#if 1
 static int xmargin=8;
 static int amargin=60;
 
@@ -1448,6 +1456,78 @@ cciss_proc_tape_report(int ctlr, unsigned char *buffer, off_t *pos, off_t *len)
         *pos += size; *len += size;
 }
 
+/* Need at least one of these error handlers to keep ../scsi/hosts.c from 
+ * complaining.  Doing a host- or bus-reset can't do anything good here. 
+ * Despite what it might say in scsi_error.c, there may well be commands
+ * on the controller, as the cciss driver registers twice, once as a block
+ * device for the logical drives, and once as a scsi device, for any tape
+ * drives.  So we know there are no commands out on the tape drives, but we
+ * don't know there are no commands on the controller, and it is likely 
+ * that there probably are, as the cciss block device is most commonly used
+ * as a boot device (embedded controller on HP/Compaq systems.)
+*/
+
+static int cciss_eh_device_reset_handler(struct scsi_cmnd *scsicmd)
+{
+        int rc;
+        CommandList_struct *cmd_in_trouble;
+        ctlr_info_t **c;
+        int ctlr;
+
+        /* find the controller to which the command to be aborted was sent */
+        c = (ctlr_info_t **) &scsicmd->device->host->hostdata[0];       
+        if (c == NULL) /* paranoia */
+                return FAILED;
+        ctlr = (*c)->ctlr;
+        printk(KERN_WARNING "cciss%d: resetting tape drive or medium changer.\n", ctlr);
+
+        /* find the command that's giving us trouble */
+        cmd_in_trouble = (CommandList_struct *) scsicmd->host_scribble;
+        if (cmd_in_trouble == NULL) { /* paranoia */
+                return FAILED;
+        }
+        /* send a reset to the SCSI LUN which the command was sent to */
+        rc = sendcmd(CCISS_RESET_MSG, ctlr, NULL, 0, 2, 0, 0, 
+                (unsigned char *) &cmd_in_trouble->Header.LUN.LunAddrBytes[0], 
+                TYPE_MSG);
+        /* sendcmd turned off interrputs on the board, turn 'em back on. */
+        (*c)->access.set_intr_mask(*c, CCISS_INTR_ON);
+        if (rc == 0)
+                return SUCCESS;
+        printk(KERN_WARNING "cciss%d: resetting device failed.\n", ctlr);
+        return FAILED;
+}
+
+static int  cciss_eh_abort_handler(struct scsi_cmnd *scsicmd)
+{
+        int rc;
+        CommandList_struct *cmd_to_abort;
+        ctlr_info_t **c;
+        int ctlr;
+
+        /* find the controller to which the command to be aborted was sent */
+        c = (ctlr_info_t **) &scsicmd->device->host->hostdata[0];       
+        if (c == NULL) /* paranoia */
+                return FAILED;
+        ctlr = (*c)->ctlr;
+        printk(KERN_WARNING "cciss%d: aborting tardy SCSI cmd\n", ctlr);
+
+        /* find the command to be aborted */
+        cmd_to_abort = (CommandList_struct *) scsicmd->host_scribble;
+        if (cmd_to_abort == NULL) /* paranoia */
+                return FAILED;
+        rc = sendcmd(CCISS_ABORT_MSG, ctlr, &cmd_to_abort->Header.Tag, 
+                0, 2, 0, 0, 
+                (unsigned char *) &cmd_to_abort->Header.LUN.LunAddrBytes[0], 
+                TYPE_MSG);
+        /* sendcmd turned off interrputs on the board, turn 'em back on. */
+        (*c)->access.set_intr_mask(*c, CCISS_INTR_ON);
+        if (rc == 0)
+                return SUCCESS;
+        return FAILED;
+
+}
+
 #else /* no CONFIG_CISS_SCSI_TAPE */
 
 /* If no tape support, then these become defined out of existence */
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index 28002de783b6..13b8a9bed66e 100644
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -98,6 +98,10 @@
  */
 
 /*
+ * 1998/1/21 -- Richard Gooch <rgooch@atnf.csiro.au> -- devfs support
+ */
+
+/*
  * 1998/05/07 -- Russell King -- More portability cleanups; moved definition of
  * interrupt and dma channel to asm/floppy.h. Cleaned up some formatting &
  * use of '0' for NULL.
@@ -158,10 +162,6 @@ static int print_unex = 1;
 #define FDPATCHES
 #include <linux/fdreg.h>
 
-/*
- * 1998/1/21 -- Richard Gooch <rgooch@atnf.csiro.au> -- devfs support
- */
-
 #include <linux/fd.h>
 #include <linux/hdreg.h>
 
diff --git a/drivers/char/ftape/lowlevel/ftape-buffer.c b/drivers/char/ftape/lowlevel/ftape-buffer.c
index 54af20cd9a2c..c706ff162771 100644
--- a/drivers/char/ftape/lowlevel/ftape-buffer.c
+++ b/drivers/char/ftape/lowlevel/ftape-buffer.c
@@ -33,6 +33,7 @@
 #include "../lowlevel/ftape-rw.h"
 #include "../lowlevel/ftape-read.h"
 #include "../lowlevel/ftape-tracing.h"
+#include "../lowlevel/ftape-buffer.h"
 
 /*  DMA'able memory allocation stuff.
  */
diff --git a/drivers/char/i8k.c b/drivers/char/i8k.c
index 6c4b3f986d0c..f3c3aaf4560e 100644
--- a/drivers/char/i8k.c
+++ b/drivers/char/i8k.c
@@ -99,7 +99,9 @@ struct smm_regs {
 
 static inline char *i8k_get_dmi_data(int field)
 {
-        return dmi_get_system_info(field) ? : "N/A";
+        char *dmi_data = dmi_get_system_info(field);
+
+        return dmi_data && *dmi_data ? dmi_data : "?";
 }
 
 /*
@@ -396,7 +398,7 @@ static int i8k_proc_show(struct seq_file *seq, void *offset)
         return seq_printf(seq, "%s %s %s %d %d %d %d %d %d %d\n",
                           I8K_PROC_FMT,
                           bios_version,
-                          dmi_get_system_info(DMI_PRODUCT_SERIAL) ? : "N/A",
+                          i8k_get_dmi_data(DMI_PRODUCT_SERIAL),
                           cpu_temp,
                           left_fan, right_fan, left_speed, right_speed,
                           ac_power, fn_key);
diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c
index c1d06ba449b6..d16bd4b5c117 100644
--- a/drivers/char/ipmi/ipmi_msghandler.c
+++ b/drivers/char/ipmi/ipmi_msghandler.c
@@ -2648,7 +2648,7 @@ void ipmi_smi_msg_received(ipmi_smi_t          intf,
         spin_lock_irqsave(&intf->waiting_msgs_lock, flags);
         if (!list_empty(&intf->waiting_msgs)) {
                 list_add_tail(&msg->link, &intf->waiting_msgs);
-                spin_unlock(&intf->waiting_msgs_lock);
+                spin_unlock_irqrestore(&intf->waiting_msgs_lock, flags);
                 goto out;
         }
         spin_unlock_irqrestore(&intf->waiting_msgs_lock, flags);
@@ -2657,9 +2657,9 @@ void ipmi_smi_msg_received(ipmi_smi_t          intf,
         if (rv > 0) {
                 /* Could not handle the message now, just add it to a
                    list to handle later. */
-                spin_lock(&intf->waiting_msgs_lock);
+                spin_lock_irqsave(&intf->waiting_msgs_lock, flags);
                 list_add_tail(&msg->link, &intf->waiting_msgs);
-                spin_unlock(&intf->waiting_msgs_lock);
+                spin_unlock_irqrestore(&intf->waiting_msgs_lock, flags);
         } else if (rv == 0) {
                 ipmi_free_smi_msg(msg);
         }
diff --git a/drivers/char/s3c2410-rtc.c b/drivers/char/s3c2410-rtc.c
index d724c0de4f28..3df7a574267b 100644
--- a/drivers/char/s3c2410-rtc.c
+++ b/drivers/char/s3c2410-rtc.c
@@ -382,7 +382,7 @@ static struct rtc_ops s3c2410_rtcops = {
         .proc           = s3c2410_rtc_proc,
 };
 
-static void s3c2410_rtc_enable(struct device *dev, int en)
+static void s3c2410_rtc_enable(struct platform_device *pdev, int en)
 {
         unsigned int tmp;
 
@@ -399,21 +399,21 @@ static void s3c2410_rtc_enable(struct device *dev, int en)
                 /* re-enable the device, and check it is ok */
 
                 if ((readb(S3C2410_RTCCON) & S3C2410_RTCCON_RTCEN) == 0){
-                        dev_info(dev, "rtc disabled, re-enabling\n");
+                        dev_info(&pdev->dev, "rtc disabled, re-enabling\n");
 
                         tmp = readb(S3C2410_RTCCON);
                         writeb(tmp | S3C2410_RTCCON_RTCEN , S3C2410_RTCCON);
                 }
 
                 if ((readb(S3C2410_RTCCON) & S3C2410_RTCCON_CNTSEL)){
-                        dev_info(dev, "removing S3C2410_RTCCON_CNTSEL\n");
+                        dev_info(&pdev->dev, "removing S3C2410_RTCCON_CNTSEL\n");
 
                         tmp = readb(S3C2410_RTCCON);
                         writeb(tmp& ~S3C2410_RTCCON_CNTSEL , S3C2410_RTCCON);
                 }
 
                 if ((readb(S3C2410_RTCCON) & S3C2410_RTCCON_CLKRST)){
-                        dev_info(dev, "removing S3C2410_RTCCON_CLKRST\n");
+                        dev_info(&pdev->dev, "removing S3C2410_RTCCON_CLKRST\n");
 
                         tmp = readb(S3C2410_RTCCON);
                         writeb(tmp & ~S3C2410_RTCCON_CLKRST, S3C2410_RTCCON);
@@ -421,7 +421,7 @@ static void s3c2410_rtc_enable(struct device *dev, int en)
         }
 }
 
-static int s3c2410_rtc_remove(struct device *dev)
+static int s3c2410_rtc_remove(struct platform_device *dev)
 {
         unregister_rtc(&s3c2410_rtcops);
 
@@ -438,25 +438,24 @@ static int s3c2410_rtc_remove(struct device *dev)
         return 0;
 }
 
-static int s3c2410_rtc_probe(struct device *dev)
+static int s3c2410_rtc_probe(struct platform_device *pdev)
 {
-        struct platform_device *pdev = to_platform_device(dev);
         struct resource *res;
         int ret;
 
-        pr_debug("%s: probe=%p, device=%p\n", __FUNCTION__, pdev, dev);
+        pr_debug("%s: probe=%p\n", __FUNCTION__, pdev);
 
         /* find the IRQs */
 
         s3c2410_rtc_tickno = platform_get_irq(pdev, 1);
         if (s3c2410_rtc_tickno <= 0) {
-                dev_err(dev, "no irq for rtc tick\n");
+                dev_err(&pdev->dev, "no irq for rtc tick\n");
                 return -ENOENT;
         }
 
         s3c2410_rtc_alarmno = platform_get_irq(pdev, 0);
         if (s3c2410_rtc_alarmno <= 0) {
-                dev_err(dev, "no irq for alarm\n");
+                dev_err(&pdev->dev, "no irq for alarm\n");
                 return -ENOENT;
         }
 
@@ -467,7 +466,7 @@ static int s3c2410_rtc_probe(struct device *dev)
 
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         if (res == NULL) {
-                dev_err(dev, "failed to get memory region resource\n");
+                dev_err(&pdev->dev, "failed to get memory region resource\n");
                 return -ENOENT;
         }
 
@@ -475,14 +474,14 @@ static int s3c2410_rtc_probe(struct device *dev)
                                      pdev->name);
 
         if (s3c2410_rtc_mem == NULL) {
-                dev_err(dev, "failed to reserve memory region\n");
+                dev_err(&pdev->dev, "failed to reserve memory region\n");
                 ret = -ENOENT;
                 goto exit_err;
         }
 
         s3c2410_rtc_base = ioremap(res->start, res->end - res->start + 1);
         if (s3c2410_rtc_base == NULL) {
-                dev_err(dev, "failed ioremap()\n");
+                dev_err(&pdev->dev, "failed ioremap()\n");
                 ret = -EINVAL;
                 goto exit_err;
         }
@@ -494,7 +493,7 @@ static int s3c2410_rtc_probe(struct device *dev)
 
         /* check to see if everything is setup correctly */
 
-        s3c2410_rtc_enable(dev, 1);
+        s3c2410_rtc_enable(pdev, 1);
 
         pr_debug("s3c2410_rtc: RTCCON=%02x\n", readb(S3C2410_RTCCON));
 
@@ -506,7 +505,7 @@ static int s3c2410_rtc_probe(struct device *dev)
         return 0;
 
  exit_err:
-        dev_err(dev, "error %d during initialisation\n", ret);
+        dev_err(&pdev->dev, "error %d during initialisation\n", ret);
 
         return ret;
 }
@@ -519,7 +518,7 @@ static struct timespec s3c2410_rtc_delta;
 
 static int ticnt_save;
 
-static int s3c2410_rtc_suspend(struct device *dev, pm_message_t state)
+static int s3c2410_rtc_suspend(struct platform_device *pdev, pm_message_t state)
 {
         struct rtc_time tm;
         struct timespec time;
@@ -535,19 +534,19 @@ static int s3c2410_rtc_suspend(struct device *dev, pm_message_t state)
         s3c2410_rtc_gettime(&tm);
         rtc_tm_to_time(&tm, &time.tv_sec);
         save_time_delta(&s3c2410_rtc_delta, &time);
-        s3c2410_rtc_enable(dev, 0);
+        s3c2410_rtc_enable(pdev, 0);
 
         return 0;
 }
 
-static int s3c2410_rtc_resume(struct device *dev)
+static int s3c2410_rtc_resume(struct platform_device *pdev)
 {
         struct rtc_time tm;
         struct timespec time;
 
         time.tv_nsec = 0;
 
-        s3c2410_rtc_enable(dev, 1);
+        s3c2410_rtc_enable(pdev, 1);
         s3c2410_rtc_gettime(&tm);
         rtc_tm_to_time(&tm, &time.tv_sec);
         restore_time_delta(&s3c2410_rtc_delta, &time);
@@ -560,14 +559,15 @@ static int s3c2410_rtc_resume(struct device *dev)
 #define s3c2410_rtc_resume  NULL
 #endif
 
-static struct device_driver s3c2410_rtcdrv = {
-        .name           = "s3c2410-rtc",
-        .owner          = THIS_MODULE,
-        .bus            = &platform_bus_type,
+static struct platform_driver s3c2410_rtcdrv = {
         .probe          = s3c2410_rtc_probe,
         .remove         = s3c2410_rtc_remove,
         .suspend        = s3c2410_rtc_suspend,
         .resume         = s3c2410_rtc_resume,
+        .driver         = {
+                .name   = "s3c2410-rtc",
+                .owner  = THIS_MODULE,
+        },
 };
 
 static char __initdata banner[] = "S3C2410 RTC, (c) 2004 Simtec Electronics\n";
@@ -575,12 +575,12 @@ static char __initdata banner[] = "S3C2410 RTC, (c) 2004 Simtec Electronics\n";
 static int __init s3c2410_rtc_init(void)
 {
         printk(banner);
-        return driver_register(&s3c2410_rtcdrv);
+        return platform_driver_register(&s3c2410_rtcdrv);
 }
 
 static void __exit s3c2410_rtc_exit(void)
 {
-        driver_unregister(&s3c2410_rtcdrv);
+        platform_driver_unregister(&s3c2410_rtcdrv);
 }
 
 module_init(s3c2410_rtc_init);
diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c
index d05067dcea01..51a07370e636 100644
--- a/drivers/char/sonypi.c
+++ b/drivers/char/sonypi.c
@@ -1168,7 +1168,7 @@ static int sonypi_disable(void)
 #ifdef CONFIG_PM
 static int old_camera_power;
 
-static int sonypi_suspend(struct device *dev, pm_message_t state)
+static int sonypi_suspend(struct platform_device *dev, pm_message_t state)
 {
         old_camera_power = sonypi_device.camera_power;
         sonypi_disable();
@@ -1176,26 +1176,27 @@ static int sonypi_suspend(struct device *dev, pm_message_t state)
         return 0;
 }
 
-static int sonypi_resume(struct device *dev)
+static int sonypi_resume(struct platform_device *dev)
 {
         sonypi_enable(old_camera_power);
         return 0;
 }
 #endif
 
-static void sonypi_shutdown(struct device *dev)
+static void sonypi_shutdown(struct platform_device *dev)
 {
         sonypi_disable();
 }
 
-static struct device_driver sonypi_driver = {
-        .name           = "sonypi",
-        .bus            = &platform_bus_type,
+static struct platform_driver sonypi_driver = {
 #ifdef CONFIG_PM
         .suspend        = sonypi_suspend,
         .resume         = sonypi_resume,
 #endif
         .shutdown       = sonypi_shutdown,
+        .driver         = {
+                .name   = "sonypi",
+        },
 };
 
 static int __devinit sonypi_create_input_devices(void)
@@ -1455,20 +1456,20 @@ static int __init sonypi_init(void)
         if (!dmi_check_system(sonypi_dmi_table))
                 return -ENODEV;
 
-        ret = driver_register(&sonypi_driver);
+        ret = platform_driver_register(&sonypi_driver);
         if (ret)
                 return ret;
 
         ret = sonypi_probe();
         if (ret)
-                driver_unregister(&sonypi_driver);
+                platform_driver_unregister(&sonypi_driver);
 
         return ret;
 }
 
 static void __exit sonypi_exit(void)
 {
-        driver_unregister(&sonypi_driver);
+        platform_driver_unregister(&sonypi_driver);
         sonypi_remove();
 }
 
diff --git a/drivers/char/tb0219.c b/drivers/char/tb0219.c
index 24355b23b2ca..b3d411a756fe 100644
--- a/drivers/char/tb0219.c
+++ b/drivers/char/tb0219.c
@@ -283,7 +283,7 @@ static void tb0219_pci_irq_init(void)
         vr41xx_set_irq_level(TB0219_PCI_SLOT3_PIN, IRQ_LEVEL_LOW);
 }
 
-static int tb0219_probe(struct device *dev)
+static int tb0219_probe(struct platform_device *dev)
 {
         int retval;
 
@@ -319,7 +319,7 @@ static int tb0219_probe(struct device *dev)
         return 0;
 }
 
-static int tb0219_remove(struct device *dev)
+static int tb0219_remove(struct platform_device *dev)
 {
         _machine_restart = old_machine_restart;
 
@@ -333,11 +333,12 @@ static int tb0219_remove(struct device *dev)
 
 static struct platform_device *tb0219_platform_device;
 
-static struct device_driver tb0219_device_driver = {
-        .name           = "TB0219",
-        .bus            = &platform_bus_type,
+static struct platform_driver tb0219_device_driver = {
         .probe          = tb0219_probe,
         .remove         = tb0219_remove,
+        .driver         = {
+                .name   = "TB0219",
+        },
 };
 
 static int __devinit tanbac_tb0219_init(void)
@@ -348,7 +349,7 @@ static int __devinit tanbac_tb0219_init(void)
         if (IS_ERR(tb0219_platform_device))
                 return PTR_ERR(tb0219_platform_device);
 
-        retval = driver_register(&tb0219_device_driver);
+        retval = platform_driver_register(&tb0219_device_driver);
         if (retval < 0)
                 platform_device_unregister(tb0219_platform_device);
 
@@ -357,7 +358,7 @@ static int __devinit tanbac_tb0219_init(void)
 
 static void __devexit tanbac_tb0219_exit(void)
 {
-        driver_unregister(&tb0219_device_driver);
+        platform_driver_unregister(&tb0219_device_driver);
 
         platform_device_unregister(tb0219_platform_device);
 }
diff --git a/drivers/char/vr41xx_giu.c b/drivers/char/vr41xx_giu.c
index 94641085faf8..9ac6d43437b3 100644
--- a/drivers/char/vr41xx_giu.c
+++ b/drivers/char/vr41xx_giu.c
@@ -613,7 +613,7 @@ static struct file_operations gpio_fops = {
         .release        = gpio_release,
 };
 
-static int giu_probe(struct device *dev)
+static int giu_probe(struct platform_device *dev)
 {
         unsigned long start, size, flags = 0;
         unsigned int nr_pins = 0;
@@ -697,7 +697,7 @@ static int giu_probe(struct device *dev)
         return cascade_irq(GIUINT_IRQ, giu_get_irq);
 }
 
-static int giu_remove(struct device *dev)
+static int giu_remove(struct platform_device *dev)
 {
         iounmap(giu_base);
 
@@ -710,11 +710,12 @@ static int giu_remove(struct device *dev)
 
 static struct platform_device *giu_platform_device;
 
-static struct device_driver giu_device_driver = {
-        .name           = "GIU",
-        .bus            = &platform_bus_type,
+static struct platform_driver giu_device_driver = {
         .probe          = giu_probe,
         .remove         = giu_remove,
+        .driver         = {
+                .name   = "GIU",
+        },
 };
 
 static int __devinit vr41xx_giu_init(void)
@@ -725,7 +726,7 @@ static int __devinit vr41xx_giu_init(void)
         if (IS_ERR(giu_platform_device))
                 return PTR_ERR(giu_platform_device);
 
-        retval = driver_register(&giu_device_driver);
+        retval = platform_driver_register(&giu_device_driver);
         if (retval < 0)
                 platform_device_unregister(giu_platform_device);
 
@@ -734,7 +735,7 @@ static int __devinit vr41xx_giu_init(void)
 
 static void __devexit vr41xx_giu_exit(void)
 {
-        driver_unregister(&giu_device_driver);
+        platform_driver_unregister(&giu_device_driver);
 
         platform_device_unregister(giu_platform_device);
 }
diff --git a/drivers/char/vr41xx_rtc.c b/drivers/char/vr41xx_rtc.c
index 5e3292df69d8..435b30748e23 100644
--- a/drivers/char/vr41xx_rtc.c
+++ b/drivers/char/vr41xx_rtc.c
@@ -560,13 +560,11 @@ static struct miscdevice rtc_miscdevice = {
         .fops   = &rtc_fops,
 };
 
-static int rtc_probe(struct device *dev)
+static int rtc_probe(struct platform_device *pdev)
 {
-        struct platform_device *pdev;
         unsigned int irq;
         int retval;
 
-        pdev = to_platform_device(dev);
         if (pdev->num_resources != 2)
                 return -EBUSY;
 
@@ -635,7 +633,7 @@ static int rtc_probe(struct device *dev)
         return 0;
 }
 
-static int rtc_remove(struct device *dev)
+static int rtc_remove(struct platform_device *dev)
 {
         int retval;
 
@@ -655,11 +653,12 @@ static int rtc_remove(struct device *dev)
 
 static struct platform_device *rtc_platform_device;
 
-static struct device_driver rtc_device_driver = {
-        .name           = rtc_name,
-        .bus            = &platform_bus_type,
+static struct platform_driver rtc_device_driver = {
         .probe          = rtc_probe,
         .remove         = rtc_remove,
+        .driver         = {
+                .name   = rtc_name,
+        },
 };
 
 static int __devinit vr41xx_rtc_init(void)
@@ -691,7 +690,7 @@ static int __devinit vr41xx_rtc_init(void)
         if (IS_ERR(rtc_platform_device))
                 return PTR_ERR(rtc_platform_device);
 
-        retval = driver_register(&rtc_device_driver);
+        retval = platform_driver_register(&rtc_device_driver);
         if (retval < 0)
                 platform_device_unregister(rtc_platform_device);
 
@@ -700,7 +699,7 @@ static int __devinit vr41xx_rtc_init(void)
 
 static void __devexit vr41xx_rtc_exit(void)
 {
-        driver_unregister(&rtc_device_driver);
+        platform_driver_unregister(&rtc_device_driver);
 
         platform_device_unregister(rtc_platform_device);
 }
diff --git a/drivers/char/watchdog/mpcore_wdt.c b/drivers/char/watchdog/mpcore_wdt.c
index da631c114fd1..9defcf861b67 100644
--- a/drivers/char/watchdog/mpcore_wdt.c
+++ b/drivers/char/watchdog/mpcore_wdt.c
@@ -139,7 +139,7 @@ static int mpcore_wdt_set_heartbeat(int t)
  */
 static int mpcore_wdt_open(struct inode *inode, struct file *file)
 {
-        struct mpcore_wdt *wdt = dev_get_drvdata(&mpcore_wdt_dev->dev);
+        struct mpcore_wdt *wdt = platform_get_drvdata(mpcore_wdt_dev);
 
         if (test_and_set_bit(0, &wdt->timer_alive))
                 return -EBUSY;
@@ -291,9 +291,9 @@ static int mpcore_wdt_ioctl(struct inode *inode, struct file *file,
  *      System shutdown handler.  Turn off the watchdog if we're
  *      restarting or halting the system.
  */
-static void mpcore_wdt_shutdown(struct device *_dev)
+static void mpcore_wdt_shutdown(struct platform_device *dev)
 {
-        struct mpcore_wdt *wdt = dev_get_drvdata(_dev);
+        struct mpcore_wdt *wdt = platform_get_drvdata(dev);
 
         if (system_state == SYSTEM_RESTART || system_state == SYSTEM_HALT)
                 mpcore_wdt_stop(wdt);
@@ -317,9 +317,8 @@ static struct miscdevice mpcore_wdt_miscdev = {
         .fops           = &mpcore_wdt_fops,
 };
 
-static int __devinit mpcore_wdt_probe(struct device *_dev)
+static int __devinit mpcore_wdt_probe(struct platform_device *dev)
 {
-        struct platform_device *dev = to_platform_device(_dev);
         struct mpcore_wdt *wdt;
         struct resource *res;
         int ret;
@@ -364,7 +363,7 @@ static int __devinit mpcore_wdt_probe(struct device *_dev)
         }
 
         mpcore_wdt_stop(wdt);
-        dev_set_drvdata(&dev->dev, wdt);
+        platform_set_drvdata(&dev->dev, wdt);
         mpcore_wdt_dev = dev;
 
         return 0;
@@ -379,11 +378,11 @@ static int __devinit mpcore_wdt_probe(struct device *_dev)
         return ret;
 }
 
-static int __devexit mpcore_wdt_remove(struct device *dev)
+static int __devexit mpcore_wdt_remove(struct platform_device *dev)
 {
-        struct mpcore_wdt *wdt = dev_get_drvdata(dev);
+        struct mpcore_wdt *wdt = platform_get_drvdata(dev);
 
-        dev_set_drvdata(dev, NULL);
+        platform_set_drvdata(dev, NULL);
 
         misc_deregister(&mpcore_wdt_miscdev);
 
@@ -395,13 +394,14 @@ static int __devexit mpcore_wdt_remove(struct device *dev)
         return 0;
 }
 
-static struct device_driver mpcore_wdt_driver = {
-        .owner          = THIS_MODULE,
-        .name           = "mpcore_wdt",
-        .bus            = &platform_bus_type,
+static struct platform_driver mpcore_wdt_driver = {
         .probe          = mpcore_wdt_probe,
         .remove         = __devexit_p(mpcore_wdt_remove),
         .shutdown       = mpcore_wdt_shutdown,
+        .driver         = {
+                .owner  = THIS_MODULE,
+                .name   = "mpcore_wdt",
+        },
 };
 
 static char banner[] __initdata = KERN_INFO "MPcore Watchdog Timer: 0.1. mpcore_noboot=%d mpcore_margin=%d sec (nowayout= %d)\n";
@@ -420,12 +420,12 @@ static int __init mpcore_wdt_init(void)
 
         printk(banner, mpcore_noboot, mpcore_margin, nowayout);
 
-        return driver_register(&mpcore_wdt_driver);
+        return platform_driver_register(&mpcore_wdt_driver);
 }
 
 static void __exit mpcore_wdt_exit(void)
 {
-        driver_unregister(&mpcore_wdt_driver);
+        platform_driver_unregister(&mpcore_wdt_driver);
 }
 
 module_init(mpcore_wdt_init);
diff --git a/drivers/char/watchdog/mv64x60_wdt.c b/drivers/char/watchdog/mv64x60_wdt.c
index 119b3c541d95..00d9ef04a369 100644
--- a/drivers/char/watchdog/mv64x60_wdt.c
+++ b/drivers/char/watchdog/mv64x60_wdt.c
@@ -182,10 +182,9 @@ static struct miscdevice mv64x60_wdt_miscdev = {
         .fops = &mv64x60_wdt_fops,
 };
 
-static int __devinit mv64x60_wdt_probe(struct device *dev)
+static int __devinit mv64x60_wdt_probe(struct platform_device *dev)
 {
-        struct platform_device *pd = to_platform_device(dev);
-        struct mv64x60_wdt_pdata *pdata = pd->dev.platform_data;
+        struct mv64x60_wdt_pdata *pdata = dev->dev.platform_data;
         int bus_clk = 133;
 
         mv64x60_wdt_timeout = 10;
@@ -202,7 +201,7 @@ static int __devinit mv64x60_wdt_probe(struct device *dev)
         return misc_register(&mv64x60_wdt_miscdev);
 }
 
-static int __devexit mv64x60_wdt_remove(struct device *dev)
+static int __devexit mv64x60_wdt_remove(struct platform_device *dev)
 {
         misc_deregister(&mv64x60_wdt_miscdev);
 
@@ -212,12 +211,13 @@ static int __devexit mv64x60_wdt_remove(struct device *dev)
         return 0;
 }
 
-static struct device_driver mv64x60_wdt_driver = {
-        .owner = THIS_MODULE,
-        .name = MV64x60_WDT_NAME,
-        .bus = &platform_bus_type,
+static struct platform_driver mv64x60_wdt_driver = {
         .probe = mv64x60_wdt_probe,
         .remove = __devexit_p(mv64x60_wdt_remove),
+        .driver = {
+                .owner = THIS_MODULE,
+                .name = MV64x60_WDT_NAME,
+        },
 };
 
 static struct platform_device *mv64x60_wdt_dev;
@@ -235,14 +235,14 @@ static int __init mv64x60_wdt_init(void)
                 goto out;
         }
 
-        ret = driver_register(&mv64x60_wdt_driver);
+        ret = platform_driver_register(&mv64x60_wdt_driver);
       out:
         return ret;
 }
 
 static void __exit mv64x60_wdt_exit(void)
 {
-        driver_unregister(&mv64x60_wdt_driver);
+        platform_driver_unregister(&mv64x60_wdt_driver);
         platform_device_unregister(mv64x60_wdt_dev);
 }
 
diff --git a/drivers/char/watchdog/s3c2410_wdt.c b/drivers/char/watchdog/s3c2410_wdt.c
index 751cb77b0715..eb667daee19b 100644
--- a/drivers/char/watchdog/s3c2410_wdt.c
+++ b/drivers/char/watchdog/s3c2410_wdt.c
@@ -347,15 +347,14 @@ static irqreturn_t s3c2410wdt_irq(int irqno, void *param,
 }
 /* device interface */
 
-static int s3c2410wdt_probe(struct device *dev)
+static int s3c2410wdt_probe(struct platform_device *pdev)
 {
-        struct platform_device *pdev = to_platform_device(dev);
         struct resource *res;
         int started = 0;
         int ret;
         int size;
 
-        DBG("%s: probe=%p, device=%p\n", __FUNCTION__, pdev, dev);
+        DBG("%s: probe=%p\n", __FUNCTION__, pdev);
 
         /* get the memory region for the watchdog timer */
 
@@ -386,13 +385,13 @@ static int s3c2410wdt_probe(struct device *dev)
                 return -ENOENT;
         }
 
-        ret = request_irq(res->start, s3c2410wdt_irq, 0, pdev->name, dev);
+        ret = request_irq(res->start, s3c2410wdt_irq, 0, pdev->name, pdev);
         if (ret != 0) {
                 printk(KERN_INFO PFX "failed to install irq (%d)\n", ret);
                 return ret;
         }
 
-        wdt_clock = clk_get(dev, "watchdog");
+        wdt_clock = clk_get(&pdev->dev, "watchdog");
         if (wdt_clock == NULL) {
                 printk(KERN_INFO PFX "failed to find watchdog clock source\n");
                 return -ENOENT;
@@ -430,7 +429,7 @@ static int s3c2410wdt_probe(struct device *dev)
         return 0;
 }
 
-static int s3c2410wdt_remove(struct device *dev)
+static int s3c2410wdt_remove(struct platform_device *dev)
 {
         if (wdt_mem != NULL) {
                 release_resource(wdt_mem);
@@ -454,7 +453,7 @@ static int s3c2410wdt_remove(struct device *dev)
         return 0;
 }
 
-static void s3c2410wdt_shutdown(struct device *dev)
+static void s3c2410wdt_shutdown(struct platform_device *dev)
 {
         s3c2410wdt_stop();      
 }
@@ -464,7 +463,7 @@ static void s3c2410wdt_shutdown(struct device *dev)
 static unsigned long wtcon_save;
 static unsigned long wtdat_save;
 
-static int s3c2410wdt_suspend(struct device *dev, pm_message_t state)
+static int s3c2410wdt_suspend(struct platform_device *dev, pm_message_t state)
 {
         /* Save watchdog state, and turn it off. */
         wtcon_save = readl(wdt_base + S3C2410_WTCON);
@@ -476,7 +475,7 @@ static int s3c2410wdt_suspend(struct device *dev, pm_message_t state)
         return 0;
 }
 
-static int s3c2410wdt_resume(struct device *dev)
+static int s3c2410wdt_resume(struct platform_device *dev)
 {
         /* Restore watchdog state. */
 
@@ -496,15 +495,16 @@ static int s3c2410wdt_resume(struct device *dev)
 #endif /* CONFIG_PM */
 
 
-static struct device_driver s3c2410wdt_driver = {
-        .owner          = THIS_MODULE,
-        .name           = "s3c2410-wdt",
-        .bus            = &platform_bus_type,
+static struct platform_driver s3c2410wdt_driver = {
         .probe          = s3c2410wdt_probe,
         .remove         = s3c2410wdt_remove,
         .shutdown       = s3c2410wdt_shutdown,
         .suspend        = s3c2410wdt_suspend,
         .resume         = s3c2410wdt_resume,
+        .driver         = {
+                .owner  = THIS_MODULE,
+                .name   = "s3c2410-wdt",
+        },
 };
 
 
@@ -513,12 +513,12 @@ static char banner[] __initdata = KERN_INFO "S3C2410 Watchdog Timer, (c) 2004 Si
 static int __init watchdog_init(void)
 {
         printk(banner);
-        return driver_register(&s3c2410wdt_driver);
+        return platform_driver_register(&s3c2410wdt_driver);
 }
 
 static void __exit watchdog_exit(void)
 {
-        driver_unregister(&s3c2410wdt_driver);
+        platform_driver_unregister(&s3c2410wdt_driver);
 }
 
 module_init(watchdog_init);
diff --git a/drivers/hwmon/hdaps.c b/drivers/hwmon/hdaps.c
index 1e5dfc7805e2..c81bd4bce1b8 100644
--- a/drivers/hwmon/hdaps.c
+++ b/drivers/hwmon/hdaps.c
@@ -60,9 +60,11 @@
 
 #define HDAPS_POLL_PERIOD       (HZ/20) /* poll for input every 1/20s */
 #define HDAPS_INPUT_FUZZ        4       /* input event threshold */
+#define HDAPS_INPUT_FLAT        4
 
 static struct timer_list hdaps_timer;
 static struct platform_device *pdev;
+static struct input_dev *hdaps_idev;
 static unsigned int hdaps_invert;
 static u8 km_activity;
 static int rest_x;
@@ -284,7 +286,7 @@ out:
 
 /* Device model stuff */
 
-static int hdaps_probe(struct device *dev)
+static int hdaps_probe(struct platform_device *dev)
 {
         int ret;
 
@@ -296,29 +298,18 @@ static int hdaps_probe(struct device *dev)
         return 0;
 }
 
-static int hdaps_resume(struct device *dev)
+static int hdaps_resume(struct platform_device *dev)
 {
         return hdaps_device_init();
 }
 
-static struct device_driver hdaps_driver = {
-        .name = "hdaps",
-        .bus = &platform_bus_type,
-        .owner = THIS_MODULE,
+static struct platform_driver hdaps_driver = {
         .probe = hdaps_probe,
-        .resume = hdaps_resume
-};
-
-/* Input class stuff */
-
-static struct input_dev hdaps_idev = {
-        .name = "hdaps",
-        .evbit = { BIT(EV_ABS) },
-        .absbit = { BIT(ABS_X) | BIT(ABS_Y) },
-        .absmin  = { [ABS_X] = -256, [ABS_Y] = -256 },
-        .absmax  = { [ABS_X] = 256, [ABS_Y] = 256 },
-        .absfuzz = { [ABS_X] = HDAPS_INPUT_FUZZ, [ABS_Y] = HDAPS_INPUT_FUZZ },
-        .absflat = { [ABS_X] = HDAPS_INPUT_FUZZ, [ABS_Y] = HDAPS_INPUT_FUZZ },
+        .resume = hdaps_resume,
+        .driver = {
+                .name = "hdaps",
+                .owner = THIS_MODULE,
+        },
 };
 
 /*
@@ -342,9 +333,9 @@ static void hdaps_mousedev_poll(unsigned long unused)
         if (__hdaps_read_pair(HDAPS_PORT_XPOS, HDAPS_PORT_YPOS, &x, &y))
                 goto out;
 
-        input_report_abs(&hdaps_idev, ABS_X, x - rest_x);
-        input_report_abs(&hdaps_idev, ABS_Y, y - rest_y);
-        input_sync(&hdaps_idev);
+        input_report_abs(hdaps_idev, ABS_X, x - rest_x);
+        input_report_abs(hdaps_idev, ABS_Y, y - rest_y);
+        input_sync(hdaps_idev);
 
         mod_timer(&hdaps_timer, jiffies + HDAPS_POLL_PERIOD);
 
@@ -550,7 +541,7 @@ static int __init hdaps_init(void)
                 goto out;
         }
 
-        ret = driver_register(&hdaps_driver);
+        ret = platform_driver_register(&hdaps_driver);
         if (ret)
                 goto out_region;
 
@@ -564,12 +555,25 @@ static int __init hdaps_init(void)
         if (ret)
                 goto out_device;
 
+        hdaps_idev = input_allocate_device();
+        if (!hdaps_idev) {
+                ret = -ENOMEM;
+                goto out_group;
+        }
+
         /* initial calibrate for the input device */
         hdaps_calibrate();
 
         /* initialize the input class */
-        hdaps_idev.dev = &pdev->dev;
-        input_register_device(&hdaps_idev);
+        hdaps_idev->name = "hdaps";
+        hdaps_idev->cdev.dev = &pdev->dev;
+        hdaps_idev->evbit[0] = BIT(EV_ABS);
+        input_set_abs_params(hdaps_idev, ABS_X,
+                        -256, 256, HDAPS_INPUT_FUZZ, HDAPS_INPUT_FLAT);
+        input_set_abs_params(hdaps_idev, ABS_X,
+                        -256, 256, HDAPS_INPUT_FUZZ, HDAPS_INPUT_FLAT);
+
+        input_register_device(hdaps_idev);
 
         /* start up our timer for the input device */
         init_timer(&hdaps_timer);
@@ -580,10 +584,12 @@ static int __init hdaps_init(void)
         printk(KERN_INFO "hdaps: driver successfully loaded.\n");
         return 0;
 
+out_group:
+        sysfs_remove_group(&pdev->dev.kobj, &hdaps_attribute_group);
 out_device:
         platform_device_unregister(pdev);
 out_driver:
-        driver_unregister(&hdaps_driver);
+        platform_driver_unregister(&hdaps_driver);
 out_region:
         release_region(HDAPS_LOW_PORT, HDAPS_NR_PORTS);
 out:
@@ -594,10 +600,10 @@ out:
 static void __exit hdaps_exit(void)
 {
         del_timer_sync(&hdaps_timer);
-        input_unregister_device(&hdaps_idev);
+        input_unregister_device(hdaps_idev);
         sysfs_remove_group(&pdev->dev.kobj, &hdaps_attribute_group);
         platform_device_unregister(pdev);
-        driver_unregister(&hdaps_driver);
+        platform_driver_unregister(&hdaps_driver);
         release_region(HDAPS_LOW_PORT, HDAPS_NR_PORTS);
 
         printk(KERN_INFO "hdaps: driver unloaded.\n");
diff --git a/drivers/i2c/busses/i2c-iop3xx.c b/drivers/i2c/busses/i2c-iop3xx.c
index cfae4ad00fae..1414851a17b8 100644
--- a/drivers/i2c/busses/i2c-iop3xx.c
+++ b/drivers/i2c/busses/i2c-iop3xx.c
@@ -405,10 +405,9 @@ static struct i2c_algorithm iop3xx_i2c_algo = {
 };
 
 static int 
-iop3xx_i2c_remove(struct device *device)
+iop3xx_i2c_remove(struct platform_device *pdev)
 {
-        struct platform_device *pdev = to_platform_device(device);
-        struct i2c_adapter *padapter = dev_get_drvdata(&pdev->dev);
+        struct i2c_adapter *padapter = platform_get_drvdata(pdev);
         struct i2c_algo_iop3xx_data *adapter_data = 
                 (struct i2c_algo_iop3xx_data *)padapter->algo_data;
         struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
@@ -426,15 +425,14 @@ iop3xx_i2c_remove(struct device *device)
         kfree(adapter_data);
         kfree(padapter);
 
-        dev_set_drvdata(&pdev->dev, NULL);
+        platform_set_drvdata(pdev, NULL);
 
         return 0;
 }
 
 static int 
-iop3xx_i2c_probe(struct device *dev)
+iop3xx_i2c_probe(struct platform_device *pdev)
 {
-        struct platform_device *pdev = to_platform_device(dev);
         struct resource *res;
         int ret;
         struct i2c_adapter *new_adapter;
@@ -499,7 +497,7 @@ iop3xx_i2c_probe(struct device *dev)
         iop3xx_i2c_set_slave_addr(adapter_data);
         iop3xx_i2c_enable(adapter_data);
 
-        dev_set_drvdata(&pdev->dev, new_adapter);
+        platform_set_drvdata(pdev, new_adapter);
         new_adapter->algo_data = adapter_data;
 
         i2c_add_adapter(new_adapter);
@@ -523,24 +521,25 @@ out:
 }
 
 
-static struct device_driver iop3xx_i2c_driver = {
-        .owner          = THIS_MODULE,
-        .name           = "IOP3xx-I2C",
-        .bus            = &platform_bus_type,
+static struct platform_driver iop3xx_i2c_driver = {
         .probe          = iop3xx_i2c_probe,
-        .remove         = iop3xx_i2c_remove
+        .remove         = iop3xx_i2c_remove,
+        .driver         = {
+                .owner  = THIS_MODULE,
+                .name   = "IOP3xx-I2C",
+        },
 };
 
 static int __init 
 i2c_iop3xx_init (void)
 {
-        return driver_register(&iop3xx_i2c_driver);
+        return platform_driver_register(&iop3xx_i2c_driver);
 }
 
 static void __exit 
 i2c_iop3xx_exit (void)
 {
-        driver_unregister(&iop3xx_i2c_driver);
+        platform_driver_unregister(&iop3xx_i2c_driver);
         return;
 }
 
diff --git a/drivers/i2c/busses/i2c-ixp2000.c b/drivers/i2c/busses/i2c-ixp2000.c
index 64552a376f2d..cef024a7d048 100644
--- a/drivers/i2c/busses/i2c-ixp2000.c
+++ b/drivers/i2c/busses/i2c-ixp2000.c
@@ -86,12 +86,11 @@ struct ixp2000_i2c_data {
         struct i2c_algo_bit_data algo_data;
 };
 
-static int ixp2000_i2c_remove(struct device *dev)
+static int ixp2000_i2c_remove(struct platform_device *plat_dev)
 {
-        struct platform_device *plat_dev = to_platform_device(dev);
-        struct ixp2000_i2c_data *drv_data = dev_get_drvdata(&plat_dev->dev);
+        struct ixp2000_i2c_data *drv_data = platform_get_drvdata(plat_dev);
 
-        dev_set_drvdata(&plat_dev->dev, NULL);
+        platform_set_drvdata(plat_dev, NULL);
 
         i2c_bit_del_bus(&drv_data->adapter);
 
@@ -100,10 +99,9 @@ static int ixp2000_i2c_remove(struct device *dev)
         return 0;
 }
 
-static int ixp2000_i2c_probe(struct device *dev)
+static int ixp2000_i2c_probe(struct platform_device *plat_dev)
 {
         int err;
-        struct platform_device *plat_dev = to_platform_device(dev);
         struct ixp2000_i2c_pins *gpio = plat_dev->dev.platform_data;
         struct ixp2000_i2c_data *drv_data = 
                 kzalloc(sizeof(struct ixp2000_i2c_data), GFP_KERNEL);
@@ -139,27 +137,28 @@ static int ixp2000_i2c_probe(struct device *dev)
                 return err;
         } 
 
-        dev_set_drvdata(&plat_dev->dev, drv_data);
+        platform_set_drvdata(plat_dev, drv_data);
 
         return 0;
 }
 
-static struct device_driver ixp2000_i2c_driver = {
-        .owner          = THIS_MODULE,
-        .name           = "IXP2000-I2C",
-        .bus            = &platform_bus_type,
+static struct platform_driver ixp2000_i2c_driver = {
         .probe          = ixp2000_i2c_probe,
         .remove         = ixp2000_i2c_remove,
+        .driver         = {
+                .name   = "IXP2000-I2C",
+                .owner  = THIS_MODULE,
+        },
 };
 
 static int __init ixp2000_i2c_init(void)
 {
-        return driver_register(&ixp2000_i2c_driver);
+        return platform_driver_register(&ixp2000_i2c_driver);
 }
 
 static void __exit ixp2000_i2c_exit(void)
 {
-        driver_unregister(&ixp2000_i2c_driver);
+        platform_driver_unregister(&ixp2000_i2c_driver);
 }
 
 module_init(ixp2000_i2c_init);
diff --git a/drivers/i2c/busses/i2c-ixp4xx.c b/drivers/i2c/busses/i2c-ixp4xx.c
index cc652c350814..aa36855fa995 100644
--- a/drivers/i2c/busses/i2c-ixp4xx.c
+++ b/drivers/i2c/busses/i2c-ixp4xx.c
@@ -87,12 +87,11 @@ struct ixp4xx_i2c_data {
         struct i2c_algo_bit_data algo_data;
 };
 
-static int ixp4xx_i2c_remove(struct device *dev)
+static int ixp4xx_i2c_remove(struct platform_device *plat_dev)
 {
-        struct platform_device *plat_dev = to_platform_device(dev);
-        struct ixp4xx_i2c_data *drv_data = dev_get_drvdata(&plat_dev->dev);
+        struct ixp4xx_i2c_data *drv_data = platform_get_drvdata(plat_dev);
 
-        dev_set_drvdata(&plat_dev->dev, NULL);
+        platform_set_drvdata(plat_dev, NULL);
 
         i2c_bit_del_bus(&drv_data->adapter);
 
@@ -101,10 +100,9 @@ static int ixp4xx_i2c_remove(struct device *dev)
         return 0;
 }
 
-static int ixp4xx_i2c_probe(struct device *dev)
+static int ixp4xx_i2c_probe(struct platform_device *plat_dev)
 {
         int err;
-        struct platform_device *plat_dev = to_platform_device(dev);
         struct ixp4xx_i2c_pins *gpio = plat_dev->dev.platform_data;
         struct ixp4xx_i2c_data *drv_data = 
                 kzalloc(sizeof(struct ixp4xx_i2c_data), GFP_KERNEL);
@@ -148,27 +146,28 @@ static int ixp4xx_i2c_probe(struct device *dev)
                 return err;
         }
 
-        dev_set_drvdata(&plat_dev->dev, drv_data);
+        platform_set_drvdata(plat_dev, drv_data);
 
         return 0;
 }
 
-static struct device_driver ixp4xx_i2c_driver = {
-        .owner          = THIS_MODULE,
-        .name           = "IXP4XX-I2C",
-        .bus            = &platform_bus_type,
+static struct platform_driver ixp4xx_i2c_driver = {
         .probe          = ixp4xx_i2c_probe,
         .remove         = ixp4xx_i2c_remove,
+        .driver         = {
+                .name   = "IXP4XX-I2C",
+                .owner  = THIS_MODULE,
+        },
 };
 
 static int __init ixp4xx_i2c_init(void)
 {
-        return driver_register(&ixp4xx_i2c_driver);
+        return platform_driver_register(&ixp4xx_i2c_driver);
 }
 
 static void __exit ixp4xx_i2c_exit(void)
 {
-        driver_unregister(&ixp4xx_i2c_driver);
+        platform_driver_unregister(&ixp4xx_i2c_driver);
 }
 
 module_init(ixp4xx_i2c_init);
diff --git a/drivers/i2c/busses/i2c-mpc.c b/drivers/i2c/busses/i2c-mpc.c
index 65b939a059e9..5ccd338a9dc9 100644
--- a/drivers/i2c/busses/i2c-mpc.c
+++ b/drivers/i2c/busses/i2c-mpc.c
@@ -288,11 +288,10 @@ static struct i2c_adapter mpc_ops = {
         .retries = 1
 };
 
-static int fsl_i2c_probe(struct device *device)
+static int fsl_i2c_probe(struct platform_device *pdev)
 {
         int result = 0;
         struct mpc_i2c *i2c;
-        struct platform_device *pdev = to_platform_device(device);
         struct fsl_i2c_platform_data *pdata;
         struct resource *r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 
@@ -323,7 +322,7 @@ static int fsl_i2c_probe(struct device *device)
                 }
 
         mpc_i2c_setclock(i2c);
-        dev_set_drvdata(device, i2c);
+        platform_set_drvdata(pdev, i2c);
 
         i2c->adap = mpc_ops;
         i2c_set_adapdata(&i2c->adap, i2c);
@@ -345,12 +344,12 @@ static int fsl_i2c_probe(struct device *device)
         return result;
 };
 
-static int fsl_i2c_remove(struct device *device)
+static int fsl_i2c_remove(struct platform_device *pdev)
 {
-        struct mpc_i2c *i2c = dev_get_drvdata(device);
+        struct mpc_i2c *i2c = platform_get_drvdata(pdev);
 
         i2c_del_adapter(&i2c->adap);
-        dev_set_drvdata(device, NULL);
+        platform_set_drvdata(pdev, NULL);
 
         if (i2c->irq != 0)
                 free_irq(i2c->irq, i2c);
@@ -361,22 +360,23 @@ static int fsl_i2c_remove(struct device *device)
 };
 
 /* Structure for a device driver */
-static struct device_driver fsl_i2c_driver = {
-        .owner = THIS_MODULE,
-        .name = "fsl-i2c",
-        .bus = &platform_bus_type,
+static struct platform_driver fsl_i2c_driver = {
         .probe = fsl_i2c_probe,
         .remove = fsl_i2c_remove,
+        .driver = {
+                .owner = THIS_MODULE,
+                .name = "fsl-i2c",
+        },
 };
 
 static int __init fsl_i2c_init(void)
 {
-        return driver_register(&fsl_i2c_driver);
+        return platform_driver_register(&fsl_i2c_driver);
 }
 
 static void __exit fsl_i2c_exit(void)
 {
-        driver_unregister(&fsl_i2c_driver);
+        platform_driver_unregister(&fsl_i2c_driver);
 }
 
 module_init(fsl_i2c_init);
diff --git a/drivers/i2c/busses/i2c-mv64xxx.c b/drivers/i2c/busses/i2c-mv64xxx.c
index 6b48027b2ee3..afd7634e5cc9 100644
--- a/drivers/i2c/busses/i2c-mv64xxx.c
+++ b/drivers/i2c/busses/i2c-mv64xxx.c
@@ -492,11 +492,10 @@ mv64xxx_i2c_unmap_regs(struct mv64xxx_i2c_data *drv_data)
 }
 
 static int __devinit
-mv64xxx_i2c_probe(struct device *dev)
+mv64xxx_i2c_probe(struct platform_device *pd)
 {
-        struct platform_device          *pd = to_platform_device(dev);
         struct mv64xxx_i2c_data         *drv_data;
-        struct mv64xxx_i2c_pdata        *pdata = dev->platform_data;
+        struct mv64xxx_i2c_pdata        *pdata = pd->dev.platform_data;
         int     rc;
 
         if ((pd->id != 0) || !pdata)
@@ -526,7 +525,7 @@ mv64xxx_i2c_probe(struct device *dev)
         drv_data->adapter.class = I2C_CLASS_HWMON;
         drv_data->adapter.timeout = pdata->timeout;
         drv_data->adapter.retries = pdata->retries;
-        dev_set_drvdata(dev, drv_data);
+        platform_set_drvdata(pd, drv_data);
         i2c_set_adapdata(&drv_data->adapter, drv_data);
 
         if (request_irq(drv_data->irq, mv64xxx_i2c_intr, 0,
@@ -555,9 +554,9 @@ mv64xxx_i2c_probe(struct device *dev)
 }
 
 static int __devexit
-mv64xxx_i2c_remove(struct device *dev)
+mv64xxx_i2c_remove(struct platform_device *dev)
 {
-        struct mv64xxx_i2c_data         *drv_data = dev_get_drvdata(dev);
+        struct mv64xxx_i2c_data         *drv_data = platform_get_drvdata(dev);
         int     rc;
 
         rc = i2c_del_adapter(&drv_data->adapter);
@@ -568,24 +567,25 @@ mv64xxx_i2c_remove(struct device *dev)
         return rc;
 }
 
-static struct device_driver mv64xxx_i2c_driver = {
-        .owner  = THIS_MODULE,
-        .name   = MV64XXX_I2C_CTLR_NAME,
-        .bus    = &platform_bus_type,
+static struct platform_driver mv64xxx_i2c_driver = {
         .probe  = mv64xxx_i2c_probe,
         .remove = mv64xxx_i2c_remove,
+        .driver = {
+                .owner  = THIS_MODULE,
+                .name   = MV64XXX_I2C_CTLR_NAME,
+        },
 };
 
 static int __init
 mv64xxx_i2c_init(void)
 {
-        return driver_register(&mv64xxx_i2c_driver);
+        return platform_driver_register(&mv64xxx_i2c_driver);
 }
 
 static void __exit
 mv64xxx_i2c_exit(void)
 {
-        driver_unregister(&mv64xxx_i2c_driver);
+        platform_driver_unregister(&mv64xxx_i2c_driver);
 }
 
 module_init(mv64xxx_i2c_init);
diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c
index 67ccbea24ba4..70f7ab829d36 100644
--- a/drivers/i2c/busses/i2c-pxa.c
+++ b/drivers/i2c/busses/i2c-pxa.c
@@ -936,10 +936,10 @@ static struct pxa_i2c i2c_pxa = {
         },
 };
 
-static int i2c_pxa_probe(struct device *dev)
+static int i2c_pxa_probe(struct platform_device *dev)
 {
         struct pxa_i2c *i2c = &i2c_pxa;
-        struct i2c_pxa_platform_data *plat = dev->platform_data;
+        struct i2c_pxa_platform_data *plat = dev->dev.platform_data;
         int ret;
 
 #ifdef CONFIG_PXA27x
@@ -968,7 +968,7 @@ static int i2c_pxa_probe(struct device *dev)
         i2c_pxa_reset(i2c);
 
         i2c->adap.algo_data = i2c;
-        i2c->adap.dev.parent = dev;
+        i2c->adap.dev.parent = &dev->dev;
 
         ret = i2c_add_adapter(&i2c->adap);
         if (ret < 0) {
@@ -976,7 +976,7 @@ static int i2c_pxa_probe(struct device *dev)
                 goto err_irq;
         }
 
-        dev_set_drvdata(dev, i2c);
+        platform_set_drvdata(dev, i2c);
 
 #ifdef CONFIG_I2C_PXA_SLAVE
         printk(KERN_INFO "I2C: %s: PXA I2C adapter, slave address %d\n",
@@ -993,11 +993,11 @@ static int i2c_pxa_probe(struct device *dev)
         return ret;
 }
 
-static int i2c_pxa_remove(struct device *dev)
+static int i2c_pxa_remove(struct platform_device *dev)
 {
-        struct pxa_i2c *i2c = dev_get_drvdata(dev);
+        struct pxa_i2c *i2c = platform_get_drvdata(dev);
 
-        dev_set_drvdata(dev, NULL);
+        platform_set_drvdata(dev, NULL);
 
         i2c_del_adapter(&i2c->adap);
         free_irq(IRQ_I2C, i2c);
@@ -1006,21 +1006,22 @@ static int i2c_pxa_remove(struct device *dev)
         return 0;
 }
 
-static struct device_driver i2c_pxa_driver = {
-        .name           = "pxa2xx-i2c",
-        .bus            = &platform_bus_type,
+static struct platform_driver i2c_pxa_driver = {
         .probe          = i2c_pxa_probe,
         .remove         = i2c_pxa_remove,
+        .driver         = {
+                .name   = "pxa2xx-i2c",
+        },
 };
 
 static int __init i2c_adap_pxa_init(void)
 {
-        return driver_register(&i2c_pxa_driver);
+        return platform_driver_register(&i2c_pxa_driver);
 }
 
 static void i2c_adap_pxa_exit(void)
 {
-        return driver_unregister(&i2c_pxa_driver);
+        return platform_driver_unregister(&i2c_pxa_driver);
 }
 
 module_init(i2c_adap_pxa_init);
diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c
index 1b582262e677..58cfd3111ef6 100644
--- a/drivers/i2c/busses/i2c-s3c2410.c
+++ b/drivers/i2c/busses/i2c-s3c2410.c
@@ -760,24 +760,23 @@ static void s3c24xx_i2c_free(struct s3c24xx_i2c *i2c)
  * called by the bus driver when a suitable device is found
 */
 
-static int s3c24xx_i2c_probe(struct device *dev)
+static int s3c24xx_i2c_probe(struct platform_device *pdev)
 {
-        struct platform_device *pdev = to_platform_device(dev);
         struct s3c24xx_i2c *i2c = &s3c24xx_i2c;
         struct resource *res;
         int ret;
 
         /* find the clock and enable it */
 
-        i2c->dev = dev;
-        i2c->clk = clk_get(dev, "i2c");
+        i2c->dev = &pdev->dev;
+        i2c->clk = clk_get(&pdev->dev, "i2c");
         if (IS_ERR(i2c->clk)) {
-                dev_err(dev, "cannot get clock\n");
+                dev_err(&pdev->dev, "cannot get clock\n");
                 ret = -ENOENT;
                 goto out;
         }
 
-        dev_dbg(dev, "clock source %p\n", i2c->clk);
+        dev_dbg(&pdev->dev, "clock source %p\n", i2c->clk);
 
         clk_use(i2c->clk);
         clk_enable(i2c->clk);
@@ -786,7 +785,7 @@ static int s3c24xx_i2c_probe(struct device *dev)
 
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         if (res == NULL) {
-                dev_err(dev, "cannot find IO resource\n");
+                dev_err(&pdev->dev, "cannot find IO resource\n");
                 ret = -ENOENT;
                 goto out;
         }
@@ -795,7 +794,7 @@ static int s3c24xx_i2c_probe(struct device *dev)
                                          pdev->name);
 
         if (i2c->ioarea == NULL) {
-                dev_err(dev, "cannot request IO\n");
+                dev_err(&pdev->dev, "cannot request IO\n");
                 ret = -ENXIO;
                 goto out;
         }
@@ -803,17 +802,17 @@ static int s3c24xx_i2c_probe(struct device *dev)
         i2c->regs = ioremap(res->start, (res->end-res->start)+1);
 
         if (i2c->regs == NULL) {
-                dev_err(dev, "cannot map IO\n");
+                dev_err(&pdev->dev, "cannot map IO\n");
                 ret = -ENXIO;
                 goto out;
         }
 
-        dev_dbg(dev, "registers %p (%p, %p)\n", i2c->regs, i2c->ioarea, res);
+        dev_dbg(&pdev->dev, "registers %p (%p, %p)\n", i2c->regs, i2c->ioarea, res);
 
         /* setup info block for the i2c core */
 
         i2c->adap.algo_data = i2c;
-        i2c->adap.dev.parent = dev;
+        i2c->adap.dev.parent = &pdev->dev;
 
         /* initialise the i2c controller */
 
@@ -827,7 +826,7 @@ static int s3c24xx_i2c_probe(struct device *dev)
 
         res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
         if (res == NULL) {
-                dev_err(dev, "cannot find IRQ\n");
+                dev_err(&pdev->dev, "cannot find IRQ\n");
                 ret = -ENOENT;
                 goto out;
         }
@@ -836,23 +835,23 @@ static int s3c24xx_i2c_probe(struct device *dev)
                           pdev->name, i2c);
 
         if (ret != 0) {
-                dev_err(dev, "cannot claim IRQ\n");
+                dev_err(&pdev->dev, "cannot claim IRQ\n");
                 goto out;
         }
 
         i2c->irq = res;
                 
-        dev_dbg(dev, "irq resource %p (%ld)\n", res, res->start);
+        dev_dbg(&pdev->dev, "irq resource %p (%ld)\n", res, res->start);
 
         ret = i2c_add_adapter(&i2c->adap);
         if (ret < 0) {
-                dev_err(dev, "failed to add bus to i2c core\n");
+                dev_err(&pdev->dev, "failed to add bus to i2c core\n");
                 goto out;
         }
 
-        dev_set_drvdata(dev, i2c);
+        platform_set_drvdata(pdev, i2c);
 
-        dev_info(dev, "%s: S3C I2C adapter\n", i2c->adap.dev.bus_id);
+        dev_info(&pdev->dev, "%s: S3C I2C adapter\n", i2c->adap.dev.bus_id);
 
  out:
         if (ret < 0)
@@ -866,22 +865,22 @@ static int s3c24xx_i2c_probe(struct device *dev)
  * called when device is removed from the bus
 */
 
-static int s3c24xx_i2c_remove(struct device *dev)
+static int s3c24xx_i2c_remove(struct platform_device *pdev)
 {
-        struct s3c24xx_i2c *i2c = dev_get_drvdata(dev);
+        struct s3c24xx_i2c *i2c = platform_get_drvdata(pdev);
         
         if (i2c != NULL) {
                 s3c24xx_i2c_free(i2c);
-                dev_set_drvdata(dev, NULL);
+                platform_set_drvdata(pdev, NULL);
         }
 
         return 0;
 }
 
 #ifdef CONFIG_PM
-static int s3c24xx_i2c_resume(struct device *dev)
+static int s3c24xx_i2c_resume(struct platform_device *dev)
 {
-        struct s3c24xx_i2c *i2c = dev_get_drvdata(dev);
+        struct s3c24xx_i2c *i2c = platform_get_drvdata(dev);
 
         if (i2c != NULL)
                 s3c24xx_i2c_init(i2c);
@@ -895,33 +894,35 @@ static int s3c24xx_i2c_resume(struct device *dev)
 
 /* device driver for platform bus bits */
 
-static struct device_driver s3c2410_i2c_driver = {
-        .owner          = THIS_MODULE,
-        .name           = "s3c2410-i2c",
-        .bus            = &platform_bus_type,
+static struct platform_driver s3c2410_i2c_driver = {
         .probe          = s3c24xx_i2c_probe,
         .remove         = s3c24xx_i2c_remove,
         .resume         = s3c24xx_i2c_resume,
+        .driver         = {
+                .owner  = THIS_MODULE,
+                .name   = "s3c2410-i2c",
+        },
 };
 
-static struct device_driver s3c2440_i2c_driver = {
-        .owner          = THIS_MODULE,
-        .name           = "s3c2440-i2c",
-        .bus            = &platform_bus_type,
+static struct platform_driver s3c2440_i2c_driver = {
         .probe          = s3c24xx_i2c_probe,
         .remove         = s3c24xx_i2c_remove,
         .resume         = s3c24xx_i2c_resume,
+        .driver         = {
+                .owner  = THIS_MODULE,
+                .name   = "s3c2440-i2c",
+        },
 };
 
 static int __init i2c_adap_s3c_init(void)
 {
         int ret;
 
-        ret = driver_register(&s3c2410_i2c_driver);
+        ret = platform_driver_register(&s3c2410_i2c_driver);
         if (ret == 0) {
-                ret = driver_register(&s3c2440_i2c_driver);
+                ret = platform_driver_register(&s3c2440_i2c_driver);
                 if (ret)
-                        driver_unregister(&s3c2410_i2c_driver);
+                        platform_driver_unregister(&s3c2410_i2c_driver);
         }
 
         return ret;
@@ -929,8 +930,8 @@ static int __init i2c_adap_s3c_init(void)
 
 static void __exit i2c_adap_s3c_exit(void)
 {
-        driver_unregister(&s3c2410_i2c_driver);
-        driver_unregister(&s3c2440_i2c_driver);
+        platform_driver_unregister(&s3c2410_i2c_driver);
+        platform_driver_unregister(&s3c2440_i2c_driver);
 }
 
 module_init(i2c_adap_s3c_init);
diff --git a/drivers/i2c/chips/isp1301_omap.c b/drivers/i2c/chips/isp1301_omap.c
index 9dbb72fffbe2..d2a100d77839 100644
--- a/drivers/i2c/chips/isp1301_omap.c
+++ b/drivers/i2c/chips/isp1301_omap.c
@@ -873,26 +873,27 @@ static int otg_init(struct isp1301 *isp)
         return 0;
 }
 
-static int otg_probe(struct device *dev)
+static int otg_probe(struct platform_device *dev)
 {
         // struct omap_usb_config *config = dev->platform_data;
 
-        otg_dev = to_platform_device(dev);
+        otg_dev = dev;
         return 0;
 }
 
-static int otg_remove(struct device *dev)
+static int otg_remove(struct platform_device *dev)
 {
         otg_dev = 0;
         return 0;
 }
 
-struct device_driver omap_otg_driver = {
-        .owner          = THIS_MODULE,
-        .name           = "omap_otg",
-        .bus            = &platform_bus_type,
+struct platform_driver omap_otg_driver = {
         .probe          = otg_probe,
-        .remove         = otg_remove,   
+        .remove         = otg_remove,
+        .driver         = {
+                .owner  = THIS_MODULE,
+                .name   = "omap_otg",
+        },
 };
 
 static int otg_bind(struct isp1301 *isp)
@@ -902,7 +903,7 @@ static int otg_bind(struct isp1301 *isp)
         if (otg_dev)
                 return -EBUSY;
 
-        status = driver_register(&omap_otg_driver);
+        status = platform_driver_register(&omap_otg_driver);
         if (status < 0)
                 return status;
 
@@ -913,7 +914,7 @@ static int otg_bind(struct isp1301 *isp)
                 status = -ENODEV;
 
         if (status < 0)
-                driver_unregister(&omap_otg_driver);
+                platform_driver_unregister(&omap_otg_driver);
         return status;
 }
 
diff --git a/drivers/input/keyboard/corgikbd.c b/drivers/input/keyboard/corgikbd.c
index d00d14bb637a..64672d491222 100644
--- a/drivers/input/keyboard/corgikbd.c
+++ b/drivers/input/keyboard/corgikbd.c
@@ -259,17 +259,17 @@ static void corgikbd_hinge_timer(unsigned long data)
 }
 
 #ifdef CONFIG_PM
-static int corgikbd_suspend(struct device *dev, pm_message_t state)
+static int corgikbd_suspend(struct platform_device *dev, pm_message_t state)
 {
-        struct corgikbd *corgikbd = dev_get_drvdata(dev);
+        struct corgikbd *corgikbd = platform_get_drvdata(dev);
         corgikbd->suspended = 1;
 
         return 0;
 }
 
-static int corgikbd_resume(struct device *dev)
+static int corgikbd_resume(struct platform_device *dev)
 {
-        struct corgikbd *corgikbd = dev_get_drvdata(dev);
+        struct corgikbd *corgikbd = platform_get_drvdata(dev);
 
         /* Upon resume, ignore the suspend key for a short while */
         corgikbd->suspend_jiffies=jiffies;
@@ -282,7 +282,7 @@ static int corgikbd_resume(struct device *dev)
 #define corgikbd_resume         NULL
 #endif
 
-static int __init corgikbd_probe(struct device *dev)
+static int __init corgikbd_probe(struct platform_device *pdev)
 {
         struct corgikbd *corgikbd;
         struct input_dev *input_dev;
@@ -296,7 +296,7 @@ static int __init corgikbd_probe(struct device *dev)
                 return -ENOMEM;
         }
 
-        dev_set_drvdata(dev, corgikbd);
+        platform_set_drvdata(pdev, corgikbd);
 
         corgikbd->input = input_dev;
         spin_lock_init(&corgikbd->lock);
@@ -321,7 +321,7 @@ static int __init corgikbd_probe(struct device *dev)
         input_dev->id.vendor = 0x0001;
         input_dev->id.product = 0x0001;
         input_dev->id.version = 0x0100;
-        input_dev->cdev.dev = dev;
+        input_dev->cdev.dev = &pdev->dev;
         input_dev->private = corgikbd;
 
         input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REP) | BIT(EV_PWR) | BIT(EV_SW);
@@ -356,10 +356,10 @@ static int __init corgikbd_probe(struct device *dev)
         return 0;
 }
 
-static int corgikbd_remove(struct device *dev)
+static int corgikbd_remove(struct platform_device *pdev)
 {
         int i;
-        struct corgikbd *corgikbd = dev_get_drvdata(dev);
+        struct corgikbd *corgikbd = platform_get_drvdata(pdev);
 
         for (i = 0; i < CORGI_KEY_SENSE_NUM; i++)
                 free_irq(CORGI_IRQ_GPIO_KEY_SENSE(i), corgikbd);
@@ -374,23 +374,24 @@ static int corgikbd_remove(struct device *dev)
         return 0;
 }
 
-static struct device_driver corgikbd_driver = {
-        .name           = "corgi-keyboard",
-        .bus            = &platform_bus_type,
+static struct platform_driver corgikbd_driver = {
         .probe          = corgikbd_probe,
         .remove         = corgikbd_remove,
         .suspend        = corgikbd_suspend,
         .resume         = corgikbd_resume,
+        .driver         = {
+                .name   = "corgi-keyboard",
+        },
 };
 
 static int __devinit corgikbd_init(void)
 {
-        return driver_register(&corgikbd_driver);
+        return platform_driver_register(&corgikbd_driver);
 }
 
 static void __exit corgikbd_exit(void)
 {
-        driver_unregister(&corgikbd_driver);
+        platform_driver_unregister(&corgikbd_driver);
 }
 
 module_init(corgikbd_init);
diff --git a/drivers/input/keyboard/spitzkbd.c b/drivers/input/keyboard/spitzkbd.c
index 0fa38a559cdf..6a15fe3bc527 100644
--- a/drivers/input/keyboard/spitzkbd.c
+++ b/drivers/input/keyboard/spitzkbd.c
@@ -309,10 +309,10 @@ static void spitzkbd_hinge_timer(unsigned long data)
 }
 
 #ifdef CONFIG_PM
-static int spitzkbd_suspend(struct device *dev, pm_message_t state)
+static int spitzkbd_suspend(struct platform_device *dev, pm_message_t state)
 {
         int i;
-        struct spitzkbd *spitzkbd = dev_get_drvdata(dev);
+        struct spitzkbd *spitzkbd = platform_get_drvdata(dev);
         spitzkbd->suspended = 1;
 
         /* Set Strobe lines as inputs - *except* strobe line 0 leave this
@@ -323,10 +323,10 @@ static int spitzkbd_suspend(struct device *dev, pm_message_t state)
         return 0;
 }
 
-static int spitzkbd_resume(struct device *dev)
+static int spitzkbd_resume(struct platform_device *dev)
 {
         int i;
-        struct spitzkbd *spitzkbd = dev_get_drvdata(dev);
+        struct spitzkbd *spitzkbd = platform_get_drvdata(dev);
 
         for (i = 0; i < SPITZ_KEY_STROBE_NUM; i++)
                 pxa_gpio_mode(spitz_strobes[i] | GPIO_OUT | GPIO_DFLT_HIGH);
@@ -342,7 +342,7 @@ static int spitzkbd_resume(struct device *dev)
 #define spitzkbd_resume         NULL
 #endif
 
-static int __init spitzkbd_probe(struct device *dev)
+static int __init spitzkbd_probe(struct platform_device *dev)
 {
         struct spitzkbd *spitzkbd;
         struct input_dev *input_dev;
@@ -358,7 +358,7 @@ static int __init spitzkbd_probe(struct device *dev)
                 return -ENOMEM;
         }
 
-        dev_set_drvdata(dev, spitzkbd);
+        platform_set_drvdata(dev, spitzkbd);
         strcpy(spitzkbd->phys, "spitzkbd/input0");
 
         spin_lock_init(&spitzkbd->lock);
@@ -380,7 +380,7 @@ static int __init spitzkbd_probe(struct device *dev)
         input_dev->private = spitzkbd;
         input_dev->name = "Spitz Keyboard";
         input_dev->phys = spitzkbd->phys;
-        input_dev->cdev.dev = dev;
+        input_dev->cdev.dev = &dev->dev;
 
         input_dev->id.bustype = BUS_HOST;
         input_dev->id.vendor = 0x0001;
@@ -437,10 +437,10 @@ static int __init spitzkbd_probe(struct device *dev)
         return 0;
 }
 
-static int spitzkbd_remove(struct device *dev)
+static int spitzkbd_remove(struct platform_device *dev)
 {
         int i;
-        struct spitzkbd *spitzkbd = dev_get_drvdata(dev);
+        struct spitzkbd *spitzkbd = platform_get_drvdata(dev);
 
         for (i = 0; i < SPITZ_KEY_SENSE_NUM; i++)
                 free_irq(IRQ_GPIO(spitz_senses[i]), spitzkbd);
@@ -460,23 +460,24 @@ static int spitzkbd_remove(struct device *dev)
         return 0;
 }
 
-static struct device_driver spitzkbd_driver = {
-        .name           = "spitz-keyboard",
-        .bus            = &platform_bus_type,
+static struct platform_driver spitzkbd_driver = {
         .probe          = spitzkbd_probe,
         .remove         = spitzkbd_remove,
         .suspend        = spitzkbd_suspend,
         .resume         = spitzkbd_resume,
+        .driver         = {
+                .name   = "spitz-keyboard",
+        },
 };
 
 static int __devinit spitzkbd_init(void)
 {
-        return driver_register(&spitzkbd_driver);
+        return platform_driver_register(&spitzkbd_driver);
 }
 
 static void __exit spitzkbd_exit(void)
 {
-        driver_unregister(&spitzkbd_driver);
+        platform_driver_unregister(&spitzkbd_driver);
 }
 
 module_init(spitzkbd_init);
diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c
index 01e186422021..ac86c1d1d83e 100644
--- a/drivers/input/serio/i8042.c
+++ b/drivers/input/serio/i8042.c
@@ -912,7 +912,7 @@ static long i8042_panic_blink(long count)
  * Here we try to restore the original BIOS settings
  */
 
-static int i8042_suspend(struct device *dev, pm_message_t state)
+static int i8042_suspend(struct platform_device *dev, pm_message_t state)
 {
         del_timer_sync(&i8042_timer);
         i8042_controller_reset();
@@ -925,7 +925,7 @@ static int i8042_suspend(struct device *dev, pm_message_t state)
  * Here we try to reset everything back to a state in which suspended
  */
 
-static int i8042_resume(struct device *dev)
+static int i8042_resume(struct platform_device *dev)
 {
         int i;
 
@@ -964,17 +964,18 @@ static int i8042_resume(struct device *dev)
  * because otherwise BIOSes will be confused.
  */
 
-static void i8042_shutdown(struct device *dev)
+static void i8042_shutdown(struct platform_device *dev)
 {
         i8042_controller_cleanup();
 }
 
-static struct device_driver i8042_driver = {
-        .name           = "i8042",
-        .bus            = &platform_bus_type,
+static struct platform_driver i8042_driver = {
         .suspend        = i8042_suspend,
         .resume         = i8042_resume,
         .shutdown       = i8042_shutdown,
+        .driver         = {
+                .name   = "i8042",
+        },
 };
 
 static int __init i8042_create_kbd_port(void)
@@ -1078,7 +1079,7 @@ static int __init i8042_init(void)
                 goto err_platform_exit;
         }
 
-        err = driver_register(&i8042_driver);
+        err = platform_driver_register(&i8042_driver);
         if (err)
                 goto err_controller_cleanup;
 
@@ -1126,7 +1127,7 @@ static int __init i8042_init(void)
  err_unregister_device:
         platform_device_unregister(i8042_platform_device);
  err_unregister_driver:
-        driver_unregister(&i8042_driver);
+        platform_driver_unregister(&i8042_driver);
  err_controller_cleanup:
         i8042_controller_cleanup();
  err_platform_exit:
@@ -1148,7 +1149,7 @@ static void __exit i8042_exit(void)
         del_timer_sync(&i8042_timer);
 
         platform_device_unregister(i8042_platform_device);
-        driver_unregister(&i8042_driver);
+        platform_driver_unregister(&i8042_driver);
 
         i8042_platform_exit();
 
diff --git a/drivers/input/serio/rpckbd.c b/drivers/input/serio/rpckbd.c
index 52c49258f8a4..a3bd11589bc3 100644
--- a/drivers/input/serio/rpckbd.c
+++ b/drivers/input/serio/rpckbd.c
@@ -107,7 +107,7 @@ static void rpckbd_close(struct serio *port)
  * Allocate and initialize serio structure for subsequent registration
  * with serio core.
  */
-static int __devinit rpckbd_probe(struct device *dev)
+static int __devinit rpckbd_probe(struct platform_device *dev)
 {
         struct serio *serio;
 
@@ -120,37 +120,38 @@ static int __devinit rpckbd_probe(struct device *dev)
         serio->write            = rpckbd_write;
         serio->open             = rpckbd_open;
         serio->close            = rpckbd_close;
-        serio->dev.parent       = dev;
+        serio->dev.parent       = &dev->dev;
         strlcpy(serio->name, "RiscPC PS/2 kbd port", sizeof(serio->name));
         strlcpy(serio->phys, "rpckbd/serio0", sizeof(serio->phys));
 
-        dev_set_drvdata(dev, serio);
+        platform_set_drvdata(dev, serio);
         serio_register_port(serio);
         return 0;
 }
 
-static int __devexit rpckbd_remove(struct device *dev)
+static int __devexit rpckbd_remove(struct platform_device *dev)
 {
-        struct serio *serio = dev_get_drvdata(dev);
+        struct serio *serio = platform_get_drvdata(dev);
         serio_unregister_port(serio);
         return 0;
 }
 
-static struct device_driver rpckbd_driver = {
-        .name           = "kart",
-        .bus            = &platform_bus_type,
+static struct platform_driver rpckbd_driver = {
         .probe          = rpckbd_probe,
         .remove         = __devexit_p(rpckbd_remove),
+        .driver         = {
+                .name   = "kart",
+        },
 };
 
 static int __init rpckbd_init(void)
 {
-        return driver_register(&rpckbd_driver);
+        return platform_driver_register(&rpckbd_driver);
 }
 
 static void __exit rpckbd_exit(void)
 {
-        driver_unregister(&rpckbd_driver);
+        platform_driver_unregister(&rpckbd_driver);
 }
 
 module_init(rpckbd_init);
diff --git a/drivers/input/touchscreen/corgi_ts.c b/drivers/input/touchscreen/corgi_ts.c
index 15e88eeae8d6..1042987856f7 100644
--- a/drivers/input/touchscreen/corgi_ts.c
+++ b/drivers/input/touchscreen/corgi_ts.c
@@ -231,9 +231,9 @@ static irqreturn_t ts_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 }
 
 #ifdef CONFIG_PM
-static int corgits_suspend(struct device *dev, pm_message_t state)
+static int corgits_suspend(struct platform_device *dev, pm_message_t state)
 {
-        struct corgi_ts *corgi_ts = dev_get_drvdata(dev);
+        struct corgi_ts *corgi_ts = platform_get_drvdata(dev);
 
         if (corgi_ts->pendown) {
                 del_timer_sync(&corgi_ts->timer);
@@ -248,9 +248,9 @@ static int corgits_suspend(struct device *dev, pm_message_t state)
         return 0;
 }
 
-static int corgits_resume(struct device *dev)
+static int corgits_resume(struct platform_device *dev)
 {
-        struct corgi_ts *corgi_ts = dev_get_drvdata(dev);
+        struct corgi_ts *corgi_ts = platform_get_drvdata(dev);
 
         corgi_ssp_ads7846_putget((4u << ADSCTRL_ADR_SH) | ADSCTRL_STS);
         /* Enable Falling Edge */
@@ -264,10 +264,9 @@ static int corgits_resume(struct device *dev)
 #define corgits_resume          NULL
 #endif
 
-static int __init corgits_probe(struct device *dev)
+static int __init corgits_probe(struct platform_device *pdev)
 {
         struct corgi_ts *corgi_ts;
-        struct platform_device *pdev = to_platform_device(dev);
         struct input_dev *input_dev;
         int err = -ENOMEM;
 
@@ -276,9 +275,9 @@ static int __init corgits_probe(struct device *dev)
         if (!corgi_ts || !input_dev)
                 goto fail;
 
-        dev_set_drvdata(dev, corgi_ts);
+        platform_set_drvdata(pdev, corgi_ts);
 
-        corgi_ts->machinfo = dev->platform_data;
+        corgi_ts->machinfo = pdev->dev.platform_data;
         corgi_ts->irq_gpio = platform_get_irq(pdev, 0);
 
         if (corgi_ts->irq_gpio < 0) {
@@ -298,7 +297,7 @@ static int __init corgits_probe(struct device *dev)
         input_dev->id.vendor = 0x0001;
         input_dev->id.product = 0x0002;
         input_dev->id.version = 0x0100;
-        input_dev->cdev.dev = dev;
+        input_dev->cdev.dev = &pdev->dev;
         input_dev->private = corgi_ts;
 
         input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
@@ -339,9 +338,9 @@ static int __init corgits_probe(struct device *dev)
 
 }
 
-static int corgits_remove(struct device *dev)
+static int corgits_remove(struct platform_device *pdev)
 {
-        struct corgi_ts *corgi_ts = dev_get_drvdata(dev);
+        struct corgi_ts *corgi_ts = platform_get_drvdata(pdev);
 
         free_irq(corgi_ts->irq_gpio, NULL);
         del_timer_sync(&corgi_ts->timer);
@@ -351,23 +350,24 @@ static int corgits_remove(struct device *dev)
         return 0;
 }
 
-static struct device_driver corgits_driver = {
-        .name           = "corgi-ts",
-        .bus            = &platform_bus_type,
+static struct platform_driver corgits_driver = {
         .probe          = corgits_probe,
         .remove         = corgits_remove,
         .suspend        = corgits_suspend,
         .resume         = corgits_resume,
+        .driver         = {
+                .name   = "corgi-ts",
+        },
 };
 
 static int __devinit corgits_init(void)
 {
-        return driver_register(&corgits_driver);
+        return platform_driver_register(&corgits_driver);
 }
 
 static void __exit corgits_exit(void)
 {
-        driver_unregister(&corgits_driver);
+        platform_driver_unregister(&corgits_driver);
 }
 
 module_init(corgits_init);
diff --git a/drivers/media/dvb/b2c2/Kconfig b/drivers/media/dvb/b2c2/Kconfig
index d7417eac2aba..2583a865a58e 100644
--- a/drivers/media/dvb/b2c2/Kconfig
+++ b/drivers/media/dvb/b2c2/Kconfig
@@ -7,6 +7,7 @@ config DVB_B2C2_FLEXCOP
         select DVB_NXT2002
         select DVB_STV0297
         select DVB_BCM3510
+        select DVB_LGDT330X
         help
           Support for the digital TV receiver chip made by B2C2 Inc. included in
           Technisats PCI cards and USB boxes.
diff --git a/drivers/mfd/mcp-sa11x0.c b/drivers/mfd/mcp-sa11x0.c
index 7daa0ed7331c..1eab7cffceaa 100644
--- a/drivers/mfd/mcp-sa11x0.c
+++ b/drivers/mfd/mcp-sa11x0.c
@@ -138,9 +138,8 @@ static struct mcp_ops mcp_sa11x0 = {
         .disable                = mcp_sa11x0_disable,
 };
 
-static int mcp_sa11x0_probe(struct device *dev)
+static int mcp_sa11x0_probe(struct platform_device *pdev)
 {
-        struct platform_device *pdev = to_platform_device(dev);
         struct mcp_plat_data *data = pdev->dev.platform_data;
         struct mcp *mcp;
         int ret;
@@ -165,7 +164,7 @@ static int mcp_sa11x0_probe(struct device *dev)
         mcp->dma_telco_rd       = DMA_Ser4MCP1Rd;
         mcp->dma_telco_wr       = DMA_Ser4MCP1Wr;
 
-        dev_set_drvdata(dev, mcp);
+        platform_set_drvdata(pdev, mcp);
 
         if (machine_is_assabet()) {
                 ASSABET_BCR_set(ASSABET_BCR_CODEC_RST);
@@ -202,26 +201,26 @@ static int mcp_sa11x0_probe(struct device *dev)
 
  release:
         release_mem_region(0x80060000, 0x60);
-        dev_set_drvdata(dev, NULL);
+        platform_set_drvdata(pdev, NULL);
 
  out:
         return ret;
 }
 
-static int mcp_sa11x0_remove(struct device *dev)
+static int mcp_sa11x0_remove(struct platform_device *dev)
 {
-        struct mcp *mcp = dev_get_drvdata(dev);
+        struct mcp *mcp = platform_get_drvdata(dev);
 
-        dev_set_drvdata(dev, NULL);
+        platform_set_drvdata(dev, NULL);
         mcp_host_unregister(mcp);
         release_mem_region(0x80060000, 0x60);
 
         return 0;
 }
 
-static int mcp_sa11x0_suspend(struct device *dev, pm_message_t state)
+static int mcp_sa11x0_suspend(struct platform_device *dev, pm_message_t state)
 {
-        struct mcp *mcp = dev_get_drvdata(dev);
+        struct mcp *mcp = platform_get_drvdata(dev);
 
         priv(mcp)->mccr0 = Ser4MCCR0;
         priv(mcp)->mccr1 = Ser4MCCR1;
@@ -230,9 +229,9 @@ static int mcp_sa11x0_suspend(struct device *dev, pm_message_t state)
         return 0;
 }
 
-static int mcp_sa11x0_resume(struct device *dev)
+static int mcp_sa11x0_resume(struct platform_device *dev)
 {
-        struct mcp *mcp = dev_get_drvdata(dev);
+        struct mcp *mcp = platform_get_drvdata(dev);
 
         Ser4MCCR1 = priv(mcp)->mccr1;
         Ser4MCCR0 = priv(mcp)->mccr0;
@@ -243,13 +242,14 @@ static int mcp_sa11x0_resume(struct device *dev)
 /*
  * The driver for the SA11x0 MCP port.
  */
-static struct device_driver mcp_sa11x0_driver = {
-        .name           = "sa11x0-mcp",
-        .bus            = &platform_bus_type,
+static struct platform_driver mcp_sa11x0_driver = {
         .probe          = mcp_sa11x0_probe,
         .remove         = mcp_sa11x0_remove,
         .suspend        = mcp_sa11x0_suspend,
         .resume         = mcp_sa11x0_resume,
+        .driver         = {
+                .name   = "sa11x0-mcp",
+        },
 };
 
 /*
@@ -257,12 +257,12 @@ static struct device_driver mcp_sa11x0_driver = {
  */
 static int __init mcp_sa11x0_init(void)
 {
-        return driver_register(&mcp_sa11x0_driver);
+        return platform_driver_register(&mcp_sa11x0_driver);
 }
 
 static void __exit mcp_sa11x0_exit(void)
 {
-        driver_unregister(&mcp_sa11x0_driver);
+        platform_driver_unregister(&mcp_sa11x0_driver);
 }
 
 module_init(mcp_sa11x0_init);
diff --git a/drivers/misc/hdpuftrs/hdpu_cpustate.c b/drivers/misc/hdpuftrs/hdpu_cpustate.c
index bc2b72b32905..11a801be71c8 100644
--- a/drivers/misc/hdpuftrs/hdpu_cpustate.c
+++ b/drivers/misc/hdpuftrs/hdpu_cpustate.c
@@ -26,8 +26,8 @@
 
 #define SKY_CPUSTATE_VERSION            "1.1"
 
-static int hdpu_cpustate_probe(struct device *ddev);
-static int hdpu_cpustate_remove(struct device *ddev);
+static int hdpu_cpustate_probe(struct platform_device *pdev);
+static int hdpu_cpustate_remove(struct platform_device *pdev);
 
 struct cpustate_t cpustate;
 
@@ -158,11 +158,12 @@ static int cpustate_read_proc(char *page, char **start, off_t off,
         return len;
 }
 
-static struct device_driver hdpu_cpustate_driver = {
-        .name = HDPU_CPUSTATE_NAME,
-        .bus = &platform_bus_type,
+static struct platform_driver hdpu_cpustate_driver = {
         .probe = hdpu_cpustate_probe,
         .remove = hdpu_cpustate_remove,
+        .driver = {
+                .name = HDPU_CPUSTATE_NAME,
+        },
 };
 
 /*
@@ -187,9 +188,8 @@ static struct miscdevice cpustate_dev = {
         &cpustate_fops
 };
 
-static int hdpu_cpustate_probe(struct device *ddev)
+static int hdpu_cpustate_probe(struct platform_device *pdev)
 {
-        struct platform_device *pdev = to_platform_device(ddev);
         struct resource *res;
         struct proc_dir_entry *proc_de;
         int ret;
@@ -217,7 +217,7 @@ static int hdpu_cpustate_probe(struct device *ddev)
         return 0;
 }
 
-static int hdpu_cpustate_remove(struct device *ddev)
+static int hdpu_cpustate_remove(struct platform_device *pdev)
 {
 
         cpustate.set_addr = NULL;
@@ -232,13 +232,13 @@ static int hdpu_cpustate_remove(struct device *ddev)
 static int __init cpustate_init(void)
 {
         int rc;
-        rc = driver_register(&hdpu_cpustate_driver);
+        rc = platform_driver_register(&hdpu_cpustate_driver);
         return rc;
 }
 
 static void __exit cpustate_exit(void)
 {
-        driver_unregister(&hdpu_cpustate_driver);
+        platform_driver_unregister(&hdpu_cpustate_driver);
 }
 
 module_init(cpustate_init);
diff --git a/drivers/misc/hdpuftrs/hdpu_nexus.c b/drivers/misc/hdpuftrs/hdpu_nexus.c
index 4bb461793851..ea9d5f233c83 100644
--- a/drivers/misc/hdpuftrs/hdpu_nexus.c
+++ b/drivers/misc/hdpuftrs/hdpu_nexus.c
@@ -22,19 +22,20 @@
 
 #include <linux/platform_device.h>
 
-static int hdpu_nexus_probe(struct device *ddev);
-static int hdpu_nexus_remove(struct device *ddev);
+static int hdpu_nexus_probe(struct platform_device *pdev);
+static int hdpu_nexus_remove(struct platform_device *pdev);
 
 static struct proc_dir_entry *hdpu_slot_id;
 static struct proc_dir_entry *hdpu_chassis_id;
 static int slot_id = -1;
 static int chassis_id = -1;
 
-static struct device_driver hdpu_nexus_driver = {
-        .name = HDPU_NEXUS_NAME,
-        .bus = &platform_bus_type,
+static struct platform_driver hdpu_nexus_driver = {
         .probe = hdpu_nexus_probe,
         .remove = hdpu_nexus_remove,
+        .driver = {
+                .name = HDPU_NEXUS_NAME,
+        },
 };
 
 int hdpu_slot_id_read(char *buffer, char **buffer_location, off_t offset,
@@ -55,9 +56,8 @@ int hdpu_chassis_id_read(char *buffer, char **buffer_location, off_t offset,
         return sprintf(buffer, "%d\n", chassis_id);
 }
 
-static int hdpu_nexus_probe(struct device *ddev)
+static int hdpu_nexus_probe(struct platform_device *pdev)
 {
-        struct platform_device *pdev = to_platform_device(ddev);
         struct resource *res;
 
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
@@ -80,7 +80,7 @@ static int hdpu_nexus_probe(struct device *ddev)
         return 0;
 }
 
-static int hdpu_nexus_remove(struct device *ddev)
+static int hdpu_nexus_remove(struct platform_device *pdev)
 {
         slot_id = -1;
         chassis_id = -1;
@@ -94,13 +94,13 @@ static int hdpu_nexus_remove(struct device *ddev)
 static int __init nexus_init(void)
 {
         int rc;
-        rc = driver_register(&hdpu_nexus_driver);
+        rc = platform_driver_register(&hdpu_nexus_driver);
         return rc;
 }
 
 static void __exit nexus_exit(void)
 {
-        driver_unregister(&hdpu_nexus_driver);
+        platform_driver_unregister(&hdpu_nexus_driver);
 }
 
 module_init(nexus_init);
diff --git a/drivers/mmc/pxamci.c b/drivers/mmc/pxamci.c
index f31e247b2cbe..ee8f8a0420d1 100644
--- a/drivers/mmc/pxamci.c
+++ b/drivers/mmc/pxamci.c
@@ -428,9 +428,8 @@ static irqreturn_t pxamci_detect_irq(int irq, void *devid, struct pt_regs *regs)
         return IRQ_HANDLED;
 }
 
-static int pxamci_probe(struct device *dev)
+static int pxamci_probe(struct platform_device *pdev)
 {
-        struct platform_device *pdev = to_platform_device(dev);
         struct mmc_host *mmc;
         struct pxamci_host *host = NULL;
         struct resource *r;
@@ -445,7 +444,7 @@ static int pxamci_probe(struct device *dev)
         if (!r)
                 return -EBUSY;
 
-        mmc = mmc_alloc_host(sizeof(struct pxamci_host), dev);
+        mmc = mmc_alloc_host(sizeof(struct pxamci_host), &pdev->dev);
         if (!mmc) {
                 ret = -ENOMEM;
                 goto out;
@@ -474,7 +473,7 @@ static int pxamci_probe(struct device *dev)
                          host->pdata->ocr_mask :
                          MMC_VDD_32_33|MMC_VDD_33_34;
 
-        host->sg_cpu = dma_alloc_coherent(dev, PAGE_SIZE, &host->sg_dma, GFP_KERNEL);
+        host->sg_cpu = dma_alloc_coherent(&pdev->dev, PAGE_SIZE, &host->sg_dma, GFP_KERNEL);
         if (!host->sg_cpu) {
                 ret = -ENOMEM;
                 goto out;
@@ -511,10 +510,10 @@ static int pxamci_probe(struct device *dev)
         if (ret)
                 goto out;
 
-        dev_set_drvdata(dev, mmc);
+        platform_set_drvdata(pdev, mmc);
 
         if (host->pdata && host->pdata->init)
-                host->pdata->init(dev, pxamci_detect_irq, mmc);
+                host->pdata->init(&pdev->dev, pxamci_detect_irq, mmc);
 
         mmc_add_host(mmc);
 
@@ -527,7 +526,7 @@ static int pxamci_probe(struct device *dev)
                 if (host->base)
                         iounmap(host->base);
                 if (host->sg_cpu)
-                        dma_free_coherent(dev, PAGE_SIZE, host->sg_cpu, host->sg_dma);
+                        dma_free_coherent(&pdev->dev, PAGE_SIZE, host->sg_cpu, host->sg_dma);
         }
         if (mmc)
                 mmc_free_host(mmc);
@@ -535,17 +534,17 @@ static int pxamci_probe(struct device *dev)
         return ret;
 }
 
-static int pxamci_remove(struct device *dev)
+static int pxamci_remove(struct platform_device *pdev)
 {
-        struct mmc_host *mmc = dev_get_drvdata(dev);
+        struct mmc_host *mmc = platform_get_drvdata(pdev);
 
-        dev_set_drvdata(dev, NULL);
+        platform_set_drvdata(pdev, NULL);
 
         if (mmc) {
                 struct pxamci_host *host = mmc_priv(mmc);
 
                 if (host->pdata && host->pdata->exit)
-                        host->pdata->exit(dev, mmc);
+                        host->pdata->exit(&pdev->dev, mmc);
 
                 mmc_remove_host(mmc);
 
@@ -560,7 +559,7 @@ static int pxamci_remove(struct device *dev)
                 free_irq(host->irq, host);
                 pxa_free_dma(host->dma);
                 iounmap(host->base);
-                dma_free_coherent(dev, PAGE_SIZE, host->sg_cpu, host->sg_dma);
+                dma_free_coherent(&pdev->dev, PAGE_SIZE, host->sg_cpu, host->sg_dma);
 
                 release_resource(host->res);
 
@@ -570,9 +569,9 @@ static int pxamci_remove(struct device *dev)
 }
 
 #ifdef CONFIG_PM
-static int pxamci_suspend(struct device *dev, pm_message_t state)
+static int pxamci_suspend(struct platform_device *dev, pm_message_t state)
 {
-        struct mmc_host *mmc = dev_get_drvdata(dev);
+        struct mmc_host *mmc = platform_get_drvdata(dev);
         int ret = 0;
 
         if (mmc)
@@ -581,9 +580,9 @@ static int pxamci_suspend(struct device *dev, pm_message_t state)
         return ret;
 }
 
-static int pxamci_resume(struct device *dev)
+static int pxamci_resume(struct platform_device *dev)
 {
-        struct mmc_host *mmc = dev_get_drvdata(dev);
+        struct mmc_host *mmc = platform_get_drvdata(dev);
         int ret = 0;
 
         if (mmc)
@@ -596,23 +595,24 @@ static int pxamci_resume(struct device *dev)
 #define pxamci_resume   NULL
 #endif
 
-static struct device_driver pxamci_driver = {
-        .name           = DRIVER_NAME,
-        .bus            = &platform_bus_type,
+static struct platform_driver pxamci_driver = {
         .probe          = pxamci_probe,
         .remove         = pxamci_remove,
         .suspend        = pxamci_suspend,
         .resume         = pxamci_resume,
+        .driver         = {
+                .name   = DRIVER_NAME,
+        },
 };
 
 static int __init pxamci_init(void)
 {
-        return driver_register(&pxamci_driver);
+        return platform_driver_register(&pxamci_driver);
 }
 
 static void __exit pxamci_exit(void)
 {
-        driver_unregister(&pxamci_driver);
+        platform_driver_unregister(&pxamci_driver);
 }
 
 module_init(pxamci_init);
diff --git a/drivers/mmc/wbsd.c b/drivers/mmc/wbsd.c
index e954b8354fef..c7eb7c269081 100644
--- a/drivers/mmc/wbsd.c
+++ b/drivers/mmc/wbsd.c
@@ -42,7 +42,7 @@
 #include "wbsd.h"
 
 #define DRIVER_NAME "wbsd"
-#define DRIVER_VERSION "1.4"
+#define DRIVER_VERSION "1.5"
 
 #ifdef CONFIG_MMC_DEBUG
 #define DBG(x...) \
@@ -1932,14 +1932,14 @@ static void __devexit wbsd_shutdown(struct device* dev, int pnp)
  * Non-PnP
  */
 
-static int __devinit wbsd_probe(struct device* dev)
+static int __devinit wbsd_probe(struct platform_device* dev)
 {
-        return wbsd_init(dev, io, irq, dma, 0);
+        return wbsd_init(&dev->dev, io, irq, dma, 0);
 }
 
-static int __devexit wbsd_remove(struct device* dev)
+static int __devexit wbsd_remove(struct platform_device* dev)
 {
-        wbsd_shutdown(dev, 0);
+        wbsd_shutdown(&dev->dev, 0);
 
         return 0;
 }
@@ -1983,9 +1983,9 @@ static void __devexit wbsd_pnp_remove(struct pnp_dev * dev)
 
 #ifdef CONFIG_PM
 
-static int wbsd_suspend(struct device *dev, pm_message_t state)
+static int wbsd_suspend(struct platform_device *dev, pm_message_t state)
 {
-        struct mmc_host *mmc = dev_get_drvdata(dev);
+        struct mmc_host *mmc = platform_get_drvdata(dev);
         struct wbsd_host *host;
         int ret;
 
@@ -2005,9 +2005,9 @@ static int wbsd_suspend(struct device *dev, pm_message_t state)
         return 0;
 }
 
-static int wbsd_resume(struct device *dev)
+static int wbsd_resume(struct platform_device *dev)
 {
-        struct mmc_host *mmc = dev_get_drvdata(dev);
+        struct mmc_host *mmc = platform_get_drvdata(dev);
         struct wbsd_host *host;
 
         if (!mmc)
@@ -2038,14 +2038,15 @@ static int wbsd_resume(struct device *dev)
 
 static struct platform_device *wbsd_device;
 
-static struct device_driver wbsd_driver = {
-        .name           = DRIVER_NAME,
-        .bus            = &platform_bus_type,
+static struct platform_driver wbsd_driver = {
         .probe          = wbsd_probe,
-        .remove         = wbsd_remove,
+        .remove         = __devexit_p(wbsd_remove),
 
         .suspend        = wbsd_suspend,
         .resume         = wbsd_resume,
+        .driver         = {
+                .name   = DRIVER_NAME,
+        },
 };
 
 #ifdef CONFIG_PNP
@@ -2054,7 +2055,7 @@ static struct pnp_driver wbsd_pnp_driver = {
         .name           = DRIVER_NAME,
         .id_table       = pnp_dev_table,
         .probe          = wbsd_pnp_probe,
-        .remove         = wbsd_pnp_remove,
+        .remove         = __devexit_p(wbsd_pnp_remove),
 };
 
 #endif /* CONFIG_PNP */
@@ -2085,7 +2086,7 @@ static int __init wbsd_drv_init(void)
 
         if (nopnp)
         {
-                result = driver_register(&wbsd_driver);
+                result = platform_driver_register(&wbsd_driver);
                 if (result < 0)
                         return result;
 
@@ -2111,7 +2112,7 @@ static void __exit wbsd_drv_exit(void)
         {
                 platform_device_unregister(wbsd_device);
 
-                driver_unregister(&wbsd_driver);
+                platform_driver_unregister(&wbsd_driver);
         }
 
         DBG("unloaded\n");
@@ -2127,6 +2128,7 @@ module_param(irq, uint, 0444);
 module_param(dma, int, 0444);
 
 MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Pierre Ossman <drzeus@drzeus.cx>");
 MODULE_DESCRIPTION("Winbond W83L51xD SD/MMC card interface driver");
 MODULE_VERSION(DRIVER_VERSION);
 
diff --git a/drivers/mtd/maps/bast-flash.c b/drivers/mtd/maps/bast-flash.c
index b7858eb93534..51f962dd7e31 100644
--- a/drivers/mtd/maps/bast-flash.c
+++ b/drivers/mtd/maps/bast-flash.c
@@ -63,11 +63,6 @@ struct bast_flash_info {
 
 static const char *probes[] = { "RedBoot", "cmdlinepart", NULL };
 
-static struct bast_flash_info *to_bast_info(struct device *dev)
-{
-        return (struct bast_flash_info *)dev_get_drvdata(dev);
-}
-
 static void bast_flash_setrw(int to)
 {
         unsigned int val;
@@ -87,11 +82,11 @@ static void bast_flash_setrw(int to)
         local_irq_restore(flags);
 }
 
-static int bast_flash_remove(struct device *dev)
+static int bast_flash_remove(struct platform_device *pdev)
 {
-        struct bast_flash_info *info = to_bast_info(dev);
+        struct bast_flash_info *info = platform_get_drvdata(pdev);
 
-        dev_set_drvdata(dev, NULL);
+        platform_set_drvdata(pdev, NULL);
 
         if (info == NULL)
                 return 0;
@@ -116,9 +111,8 @@ static int bast_flash_remove(struct device *dev)
         return 0;
 }
 
-static int bast_flash_probe(struct device *dev)
+static int bast_flash_probe(struct platform_device *pdev)
 {
-        struct platform_device *pdev = to_platform_device(dev);
         struct bast_flash_info *info;
         struct resource *res;
         int err = 0;
@@ -131,13 +125,13 @@ static int bast_flash_probe(struct device *dev)
         }
 
         memzero(info, sizeof(*info));
-        dev_set_drvdata(dev, info);
+        platform_set_drvdata(pdev, info);
 
         res = pdev->resource;  /* assume that the flash has one resource */
 
         info->map.phys = res->start;
         info->map.size = res->end - res->start + 1;
-        info->map.name = dev->bus_id;
+        info->map.name = pdev->dev.bus_id;      
         info->map.bankwidth = 2;
 
         if (info->map.size > AREA_MAXSIZE)
@@ -199,27 +193,28 @@ static int bast_flash_probe(struct device *dev)
         /* fall through to exit error */
 
  exit_error:
-        bast_flash_remove(dev);
+        bast_flash_remove(pdev);
         return err;
 }
 
-static struct device_driver bast_flash_driver = {
-        .name           = "bast-nor",
-        .owner          = THIS_MODULE,
-        .bus            = &platform_bus_type,
+static struct platform_driver bast_flash_driver = {
         .probe          = bast_flash_probe,
         .remove         = bast_flash_remove,
+        .driver         = {
+                .name   = "bast-nor",
+                .owner  = THIS_MODULE,
+        },
 };
 
 static int __init bast_flash_init(void)
 {
         printk("BAST NOR-Flash Driver, (c) 2004 Simtec Electronics\n");
-        return driver_register(&bast_flash_driver);
+        return platform_driver_register(&bast_flash_driver);
 }
 
 static void __exit bast_flash_exit(void)
 {
-        driver_unregister(&bast_flash_driver);
+        platform_driver_unregister(&bast_flash_driver);
 }
 
 module_init(bast_flash_init);
diff --git a/drivers/mtd/maps/integrator-flash.c b/drivers/mtd/maps/integrator-flash.c
index fe738fd8d6f8..a3ba52fbd868 100644
--- a/drivers/mtd/maps/integrator-flash.c
+++ b/drivers/mtd/maps/integrator-flash.c
@@ -67,9 +67,8 @@ static void armflash_set_vpp(struct map_info *map, int on)
 
 static const char *probes[] = { "cmdlinepart", "RedBoot", "afs", NULL };
 
-static int armflash_probe(struct device *_dev)
+static int armflash_probe(struct platform_device *dev)
 {
-        struct platform_device *dev = to_platform_device(_dev);
         struct flash_platform_data *plat = dev->dev.platform_data;
         struct resource *res = dev->resource;
         unsigned int size = res->end - res->start + 1;
@@ -138,7 +137,7 @@ static int armflash_probe(struct device *_dev)
         }
 
         if (err == 0)
-                dev_set_drvdata(&dev->dev, info);
+                platform_set_drvdata(dev, info);
 
         /*
          * If we got an error, free all resources.
@@ -163,12 +162,11 @@ static int armflash_probe(struct device *_dev)
         return err;
 }
 
-static int armflash_remove(struct device *_dev)
+static int armflash_remove(struct platform_device *dev)
 {
-        struct platform_device *dev = to_platform_device(_dev);
-        struct armflash_info *info = dev_get_drvdata(&dev->dev);
+        struct armflash_info *info = platform_get_drvdata(dev);
 
-        dev_set_drvdata(&dev->dev, NULL);
+        platform_set_drvdata(dev, NULL);
 
         if (info) {
                 if (info->mtd) {
@@ -190,21 +188,22 @@ static int armflash_remove(struct device *_dev)
         return 0;
 }
 
-static struct device_driver armflash_driver = {
-        .name           = "armflash",
-        .bus            = &platform_bus_type,
+static struct platform_driver armflash_driver = {
         .probe          = armflash_probe,
         .remove         = armflash_remove,
+        .driver         = {
+                .name   = "armflash",
+        },
 };
 
 static int __init armflash_init(void)
 {
-        return driver_register(&armflash_driver);
+        return platform_driver_register(&armflash_driver);
 }
 
 static void __exit armflash_exit(void)
 {
-        driver_unregister(&armflash_driver);
+        platform_driver_unregister(&armflash_driver);
 }
 
 module_init(armflash_init);
diff --git a/drivers/mtd/maps/ixp2000.c b/drivers/mtd/maps/ixp2000.c
index 641eb2b55e9f..fc7a78e31735 100644
--- a/drivers/mtd/maps/ixp2000.c
+++ b/drivers/mtd/maps/ixp2000.c
@@ -111,13 +111,12 @@ static void ixp2000_flash_copy_to(struct map_info *map, unsigned long to,
 }
 
 
-static int ixp2000_flash_remove(struct device *_dev)
+static int ixp2000_flash_remove(struct platform_device *dev)
 {
-        struct platform_device *dev = to_platform_device(_dev);
         struct flash_platform_data *plat = dev->dev.platform_data;
-        struct ixp2000_flash_info *info = dev_get_drvdata(&dev->dev);
+        struct ixp2000_flash_info *info = platform_get_drvdata(dev);
 
-        dev_set_drvdata(&dev->dev, NULL);
+        platform_set_drvdata(dev, NULL);
 
         if(!info)
                 return 0;
@@ -143,10 +142,9 @@ static int ixp2000_flash_remove(struct device *_dev)
 }
 
 
-static int ixp2000_flash_probe(struct device *_dev)
+static int ixp2000_flash_probe(struct platform_device *dev)
 {
         static const char *probes[] = { "RedBoot", "cmdlinepart", NULL };
-        struct platform_device *dev = to_platform_device(_dev);
         struct ixp2000_flash_data *ixp_data = dev->dev.platform_data;
         struct flash_platform_data *plat;
         struct ixp2000_flash_info *info;
@@ -177,7 +175,7 @@ static int ixp2000_flash_probe(struct device *_dev)
         }
         memzero(info, sizeof(struct ixp2000_flash_info));
 
-        dev_set_drvdata(&dev->dev, info);
+        platform_set_drvdata(dev, info);
 
         /*
          * Tell the MTD layer we're not 1:1 mapped so that it does
@@ -248,25 +246,26 @@ static int ixp2000_flash_probe(struct device *_dev)
         return 0;
 
 Error:
-        ixp2000_flash_remove(_dev);
+        ixp2000_flash_remove(dev);
         return err;
 }
 
-static struct device_driver ixp2000_flash_driver = {
-        .name           = "IXP2000-Flash",
-        .bus            = &platform_bus_type,
+static struct platform_driver ixp2000_flash_driver = {
         .probe          = &ixp2000_flash_probe,
         .remove         = &ixp2000_flash_remove
+        .driver         = {
+                .name   = "IXP2000-Flash",
+        },
 };
 
 static int __init ixp2000_flash_init(void)
 {
-        return driver_register(&ixp2000_flash_driver);
+        return platform_driver_register(&ixp2000_flash_driver);
 }
 
 static void __exit ixp2000_flash_exit(void)
 {
-        driver_unregister(&ixp2000_flash_driver);
+        platform_driver_unregister(&ixp2000_flash_driver);
 }
 
 module_init(ixp2000_flash_init);
diff --git a/drivers/mtd/maps/ixp4xx.c b/drivers/mtd/maps/ixp4xx.c
index 56b3a355bf7b..a59f8027903c 100644
--- a/drivers/mtd/maps/ixp4xx.c
+++ b/drivers/mtd/maps/ixp4xx.c
@@ -99,13 +99,12 @@ struct ixp4xx_flash_info {
 
 static const char *probes[] = { "RedBoot", "cmdlinepart", NULL };
 
-static int ixp4xx_flash_remove(struct device *_dev)
+static int ixp4xx_flash_remove(struct platform_device *dev)
 {
-        struct platform_device *dev = to_platform_device(_dev);
         struct flash_platform_data *plat = dev->dev.platform_data;
-        struct ixp4xx_flash_info *info = dev_get_drvdata(&dev->dev);
+        struct ixp4xx_flash_info *info = platform_get_drvdata(dev);
 
-        dev_set_drvdata(&dev->dev, NULL);
+        platform_set_drvdata(dev, NULL);
 
         if(!info)
                 return 0;
@@ -130,9 +129,8 @@ static int ixp4xx_flash_remove(struct device *_dev)
         return 0;
 }
 
-static int ixp4xx_flash_probe(struct device *_dev)
+static int ixp4xx_flash_probe(struct platform_device *dev)
 {
-        struct platform_device *dev = to_platform_device(_dev);
         struct flash_platform_data *plat = dev->dev.platform_data;
         struct ixp4xx_flash_info *info;
         int err = -1;
@@ -153,7 +151,7 @@ static int ixp4xx_flash_probe(struct device *_dev)
         }
         memzero(info, sizeof(struct ixp4xx_flash_info));
 
-        dev_set_drvdata(&dev->dev, info);
+        platform_set_drvdata(dev, info);
 
         /*
          * Tell the MTD layer we're not 1:1 mapped so that it does
@@ -214,25 +212,26 @@ static int ixp4xx_flash_probe(struct device *_dev)
         return 0;
 
 Error:
-        ixp4xx_flash_remove(_dev);
+        ixp4xx_flash_remove(dev);
         return err;
 }
 
-static struct device_driver ixp4xx_flash_driver = {
-        .name           = "IXP4XX-Flash",
-        .bus            = &platform_bus_type,
+static struct platform_driver ixp4xx_flash_driver = {
         .probe          = ixp4xx_flash_probe,
         .remove         = ixp4xx_flash_remove,
+        .driver         = {
+                .name   = "IXP4XX-Flash",
+        },
 };
 
 static int __init ixp4xx_flash_init(void)
 {
-        return driver_register(&ixp4xx_flash_driver);
+        return platform_driver_register(&ixp4xx_flash_driver);
 }
 
 static void __exit ixp4xx_flash_exit(void)
 {
-        driver_unregister(&ixp4xx_flash_driver);
+        platform_driver_unregister(&ixp4xx_flash_driver);
 }
 
 
diff --git a/drivers/mtd/maps/omap_nor.c b/drivers/mtd/maps/omap_nor.c
index fd3b4a5fc207..418afffb2d80 100644
--- a/drivers/mtd/maps/omap_nor.c
+++ b/drivers/mtd/maps/omap_nor.c
@@ -70,11 +70,10 @@ static void omap_set_vpp(struct map_info *map, int enable)
         }
 }
 
-static int __devinit omapflash_probe(struct device *dev)
+static int __devinit omapflash_probe(struct platform_device *pdev)
 {
         int err;
         struct omapflash_info *info;
-        struct platform_device *pdev = to_platform_device(dev);
         struct flash_platform_data *pdata = pdev->dev.platform_data;
         struct resource *res = pdev->resource;
         unsigned long size = res->end - res->start + 1;
@@ -119,7 +118,7 @@ static int __devinit omapflash_probe(struct device *dev)
 #endif
                 add_mtd_device(info->mtd);
 
-        dev_set_drvdata(&pdev->dev, info);
+        platform_set_drvdata(pdev, info);
 
         return 0;
 
@@ -133,12 +132,11 @@ out_free_info:
         return err;
 }
 
-static int __devexit omapflash_remove(struct device *dev)
+static int __devexit omapflash_remove(struct platform_device *pdev)
 {
-        struct platform_device *pdev = to_platform_device(dev);
-        struct omapflash_info *info = dev_get_drvdata(&pdev->dev);
+        struct omapflash_info *info = platform_get_drvdata(pdev);
 
-        dev_set_drvdata(&pdev->dev, NULL);
+        platform_set_drvdata(pdev, NULL);
 
         if (info) {
                 if (info->parts) {
@@ -155,21 +153,22 @@ static int __devexit omapflash_remove(struct device *dev)
         return 0;
 }
 
-static struct device_driver omapflash_driver = {
-        .name   = "omapflash",
-        .bus    = &platform_bus_type,
+static struct platform_driver omapflash_driver = {
         .probe  = omapflash_probe,
         .remove = __devexit_p(omapflash_remove),
+        .driver = {
+                .name   = "omapflash",
+        },
 };
 
 static int __init omapflash_init(void)
 {
-        return driver_register(&omapflash_driver);
+        return platform_driver_register(&omapflash_driver);
 }
 
 static void __exit omapflash_exit(void)
 {
-        driver_unregister(&omapflash_driver);
+        platform_driver_unregister(&omapflash_driver);
 }
 
 module_init(omapflash_init);
diff --git a/drivers/mtd/maps/plat-ram.c b/drivers/mtd/maps/plat-ram.c
index a02eed94a231..5d3c75451ca2 100644
--- a/drivers/mtd/maps/plat-ram.c
+++ b/drivers/mtd/maps/plat-ram.c
@@ -56,9 +56,9 @@ struct platram_info {
  * device private data to struct platram_info conversion
 */
 
-static inline struct platram_info *to_platram_info(struct device *dev)
+static inline struct platram_info *to_platram_info(struct platform_device *dev)
 {
-        return (struct platram_info *)dev_get_drvdata(dev);
+        return (struct platram_info *)platform_get_drvdata(dev);
 }
 
 /* platram_setrw
@@ -83,13 +83,13 @@ static inline void platram_setrw(struct platram_info *info, int to)
  * called to remove the device from the driver's control
 */
 
-static int platram_remove(struct device *dev)
+static int platram_remove(struct platform_device *pdev)
 {
-        struct platram_info *info = to_platram_info(dev);
+        struct platram_info *info = to_platram_info(pdev);
 
-        dev_set_drvdata(dev, NULL);
+        platform_set_drvdata(pdev, NULL);
 
-        dev_dbg(dev, "removing device\n");
+        dev_dbg(&pdev->dev, "removing device\n");
 
         if (info == NULL)
                 return 0;
@@ -130,61 +130,60 @@ static int platram_remove(struct device *dev)
  * driver is found.
 */
 
-static int platram_probe(struct device *dev)
+static int platram_probe(struct platform_device *pdev)
 {
-        struct platform_device *pd = to_platform_device(dev);
         struct platdata_mtd_ram *pdata;
         struct platram_info *info;
         struct resource *res;
         int err = 0;
 
-        dev_dbg(dev, "probe entered\n");
+        dev_dbg(&pdev->dev, "probe entered\n");
 
-        if (dev->platform_data == NULL) {
-                dev_err(dev, "no platform data supplied\n");
+        if (pdev->dev.platform_data == NULL) {
+                dev_err(&pdev->dev, "no platform data supplied\n");
                 err = -ENOENT;
                 goto exit_error;
         }
 
-        pdata = dev->platform_data;
+        pdata = pdev->dev.platform_data;
 
         info = kmalloc(sizeof(*info), GFP_KERNEL);
         if (info == NULL) {
-                dev_err(dev, "no memory for flash info\n");
+                dev_err(&pdev->dev, "no memory for flash info\n");
                 err = -ENOMEM;
                 goto exit_error;
         }
 
         memset(info, 0, sizeof(*info));
-        dev_set_drvdata(dev, info);
+        platform_set_drvdata(pdev, info);
 
-        info->dev = dev;
+        info->dev = &pdev->dev;
         info->pdata = pdata;
 
         /* get the resource for the memory mapping */
 
-        res = platform_get_resource(pd, IORESOURCE_MEM, 0);
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 
         if (res == NULL) {
-                dev_err(dev, "no memory resource specified\n");
+                dev_err(&pdev->dev, "no memory resource specified\n");
                 err = -ENOENT;
                 goto exit_free;
         }
 
-        dev_dbg(dev, "got platform resource %p (0x%lx)\n", res, res->start);
+        dev_dbg(&pdev->dev, "got platform resource %p (0x%lx)\n", res, res->start);
 
         /* setup map parameters */
 
         info->map.phys = res->start;
         info->map.size = (res->end - res->start) + 1;
-        info->map.name = pdata->mapname != NULL ? pdata->mapname : (char *)pd->name;
+        info->map.name = pdata->mapname != NULL ? pdata->mapname : (char *)pdev->name;
         info->map.bankwidth = pdata->bankwidth;
 
         /* register our usage of the memory area */
 
-        info->area = request_mem_region(res->start, info->map.size, pd->name);
+        info->area = request_mem_region(res->start, info->map.size, pdev->name);
         if (info->area == NULL) {
-                dev_err(dev, "failed to request memory region\n");
+                dev_err(&pdev->dev, "failed to request memory region\n");
                 err = -EIO;
                 goto exit_free;
         }
@@ -192,23 +191,23 @@ static int platram_probe(struct device *dev)
         /* remap the memory area */
 
         info->map.virt = ioremap(res->start, info->map.size);
-        dev_dbg(dev, "virt %p, %lu bytes\n", info->map.virt, info->map.size);
+        dev_dbg(&pdev->dev, "virt %p, %lu bytes\n", info->map.virt, info->map.size);
 
         if (info->map.virt == NULL) {
-                dev_err(dev, "failed to ioremap() region\n");
+                dev_err(&pdev->dev, "failed to ioremap() region\n");
                 err = -EIO;
                 goto exit_free;
         }
 
         simple_map_init(&info->map);
 
-        dev_dbg(dev, "initialised map, probing for mtd\n");
+        dev_dbg(&pdev->dev, "initialised map, probing for mtd\n");
 
         /* probe for the right mtd map driver */
 
         info->mtd = do_map_probe("map_ram" , &info->map);
         if (info->mtd == NULL) {
-                dev_err(dev, "failed to probe for map_ram\n");
+                dev_err(&pdev->dev, "failed to probe for map_ram\n");
                 err = -ENOMEM;
                 goto exit_free;
         }
@@ -237,27 +236,28 @@ static int platram_probe(struct device *dev)
 #endif /* CONFIG_MTD_PARTITIONS */
 
         if (add_mtd_device(info->mtd)) {
-                dev_err(dev, "add_mtd_device() failed\n");
+                dev_err(&pdev->dev, "add_mtd_device() failed\n");
                 err = -ENOMEM;
         }
 
-        dev_info(dev, "registered mtd device\n");
+        dev_info(&pdev->dev, "registered mtd device\n");
         return err;
 
  exit_free:
-        platram_remove(dev);
+        platram_remove(pdev);
  exit_error:
         return err;
 }
 
 /* device driver info */
 
-static struct device_driver platram_driver = {
-        .name           = "mtd-ram",
-        .owner          = THIS_MODULE,
-        .bus            = &platform_bus_type,
+static struct platform_driver platram_driver = {
         .probe          = platram_probe,
         .remove         = platram_remove,
+        .driver         = {
+                .name   = "mtd-ram",
+                .owner  = THIS_MODULE,
+        },
 };
 
 /* module init/exit */
@@ -265,12 +265,12 @@ static struct device_driver platram_driver = {
 static int __init platram_init(void)
 {
         printk("Generic platform RAM MTD, (c) 2004 Simtec Electronics\n");
-        return driver_register(&platram_driver);
+        return platform_driver_register(&platram_driver);
 }
 
 static void __exit platram_exit(void)
 {
-        driver_unregister(&platram_driver);
+        platform_driver_unregister(&platram_driver);
 }
 
 module_init(platram_init);
diff --git a/drivers/mtd/maps/sa1100-flash.c b/drivers/mtd/maps/sa1100-flash.c
index 9e8bb1782be0..5cefb015633c 100644
--- a/drivers/mtd/maps/sa1100-flash.c
+++ b/drivers/mtd/maps/sa1100-flash.c
@@ -356,9 +356,8 @@ sa1100_setup_mtd(struct platform_device *pdev, struct flash_platform_data *plat)
 
 static const char *part_probes[] = { "cmdlinepart", "RedBoot", NULL };
 
-static int __init sa1100_mtd_probe(struct device *dev)
+static int __init sa1100_mtd_probe(struct platform_device *pdev)
 {
-        struct platform_device *pdev = to_platform_device(dev);
         struct flash_platform_data *plat = pdev->dev.platform_data;
         struct mtd_partition *parts;
         const char *part_type = NULL;
@@ -402,28 +401,28 @@ static int __init sa1100_mtd_probe(struct device *dev)
 
         info->nr_parts = nr_parts;
 
-        dev_set_drvdata(dev, info);
+        platform_set_drvdata(pdev, info);
         err = 0;
 
  out:
         return err;
 }
 
-static int __exit sa1100_mtd_remove(struct device *dev)
+static int __exit sa1100_mtd_remove(struct platform_device *pdev)
 {
-        struct sa_info *info = dev_get_drvdata(dev);
-        struct flash_platform_data *plat = dev->platform_data;
+        struct sa_info *info = platform_get_drvdata(pdev);
+        struct flash_platform_data *plat = pdev->dev.platform_data;
 
-        dev_set_drvdata(dev, NULL);
+        platform_set_drvdata(pdev, NULL);
         sa1100_destroy(info, plat);
 
         return 0;
 }
 
 #ifdef CONFIG_PM
-static int sa1100_mtd_suspend(struct device *dev, pm_message_t state)
+static int sa1100_mtd_suspend(struct platform_device *dev, pm_message_t state)
 {
-        struct sa_info *info = dev_get_drvdata(dev);
+        struct sa_info *info = platform_get_drvdata(dev);
         int ret = 0;
 
         if (info)
@@ -432,17 +431,17 @@ static int sa1100_mtd_suspend(struct device *dev, pm_message_t state)
         return ret;
 }
 
-static int sa1100_mtd_resume(struct device *dev)
+static int sa1100_mtd_resume(struct platform_device *dev)
 {
-        struct sa_info *info = dev_get_drvdata(dev);
+        struct sa_info *info = platform_get_drvdata(dev);
         if (info)
                 info->mtd->resume(info->mtd);
         return 0;
 }
 
-static void sa1100_mtd_shutdown(struct device *dev)
+static void sa1100_mtd_shutdown(struct platform_device *dev)
 {
-        struct sa_info *info = dev_get_drvdata(dev);
+        struct sa_info *info = platform_get_drvdata(dev);
         if (info && info->mtd->suspend(info->mtd) == 0)
                 info->mtd->resume(info->mtd);
 }
@@ -452,24 +451,25 @@ static void sa1100_mtd_shutdown(struct device *dev)
 #define sa1100_mtd_shutdown NULL
 #endif
 
-static struct device_driver sa1100_mtd_driver = {
-        .name           = "flash",
-        .bus            = &platform_bus_type,
+static struct platform_driver sa1100_mtd_driver = {
         .probe          = sa1100_mtd_probe,
         .remove         = __exit_p(sa1100_mtd_remove),
         .suspend        = sa1100_mtd_suspend,
         .resume         = sa1100_mtd_resume,
         .shutdown       = sa1100_mtd_shutdown,
+        .driver         = {
+                .name   = "flash",
+        },
 };
 
 static int __init sa1100_mtd_init(void)
 {
-        return driver_register(&sa1100_mtd_driver);
+        return platform_driver_register(&sa1100_mtd_driver);
 }
 
 static void __exit sa1100_mtd_exit(void)
 {
-        driver_unregister(&sa1100_mtd_driver);
+        platform_driver_unregister(&sa1100_mtd_driver);
 }
 
 module_init(sa1100_mtd_init);
diff --git a/drivers/mtd/nand/s3c2410.c b/drivers/mtd/nand/s3c2410.c
index 97e9b7892d29..d209214b1318 100644
--- a/drivers/mtd/nand/s3c2410.c
+++ b/drivers/mtd/nand/s3c2410.c
@@ -125,14 +125,14 @@ static struct s3c2410_nand_info *s3c2410_nand_mtd_toinfo(struct mtd_info *mtd)
         return s3c2410_nand_mtd_toours(mtd)->info;
 }
 
-static struct s3c2410_nand_info *to_nand_info(struct device *dev)
+static struct s3c2410_nand_info *to_nand_info(struct platform_device *dev)
 {
-        return dev_get_drvdata(dev);
+        return platform_get_drvdata(dev);
 }
 
-static struct s3c2410_platform_nand *to_nand_plat(struct device *dev)
+static struct s3c2410_platform_nand *to_nand_plat(struct platform_device *dev)
 {
-        return dev->platform_data;
+        return dev->dev.platform_data;
 }
 
 /* timing calculations */
@@ -165,9 +165,9 @@ static int s3c2410_nand_calc_rate(int wanted, unsigned long clk, int max)
 /* controller setup */
 
 static int s3c2410_nand_inithw(struct s3c2410_nand_info *info,
-                               struct device *dev)
+                               struct platform_device *pdev)
 {
-        struct s3c2410_platform_nand *plat = to_nand_plat(dev);
+        struct s3c2410_platform_nand *plat = to_nand_plat(pdev);
         unsigned long clkrate = clk_get_rate(info->clk);
         int tacls, twrph0, twrph1;
         unsigned long cfg;
@@ -430,11 +430,11 @@ static void s3c2410_nand_write_buf(struct mtd_info *mtd,
 
 /* device management functions */
 
-static int s3c2410_nand_remove(struct device *dev)
+static int s3c2410_nand_remove(struct platform_device *pdev)
 {
-        struct s3c2410_nand_info *info = to_nand_info(dev);
+        struct s3c2410_nand_info *info = to_nand_info(pdev);
 
-        dev_set_drvdata(dev, NULL);
+        platform_set_drvdata(pdev, NULL);
 
         if (info == NULL)
                 return 0;
@@ -562,10 +562,9 @@ static void s3c2410_nand_init_chip(struct s3c2410_nand_info *info,
  * nand layer to look for devices
 */
 
-static int s3c24xx_nand_probe(struct device *dev, int is_s3c2440)
+static int s3c24xx_nand_probe(struct platform_device *pdev, int is_s3c2440)
 {
-        struct platform_device *pdev = to_platform_device(dev);
-        struct s3c2410_platform_nand *plat = to_nand_plat(dev);
+        struct s3c2410_platform_nand *plat = to_nand_plat(pdev);
         struct s3c2410_nand_info *info;
         struct s3c2410_nand_mtd *nmtd;
         struct s3c2410_nand_set *sets;
@@ -575,26 +574,26 @@ static int s3c24xx_nand_probe(struct device *dev, int is_s3c2440)
         int nr_sets;
         int setno;
 
-        pr_debug("s3c2410_nand_probe(%p)\n", dev);
+        pr_debug("s3c2410_nand_probe(%p)\n", pdev);
 
         info = kmalloc(sizeof(*info), GFP_KERNEL);
         if (info == NULL) {
-                dev_err(dev, "no memory for flash info\n");
+                dev_err(&pdev->dev, "no memory for flash info\n");
                 err = -ENOMEM;
                 goto exit_error;
         }
 
         memzero(info, sizeof(*info));
-        dev_set_drvdata(dev, info);
+        platform_set_drvdata(pdev, info);
 
         spin_lock_init(&info->controller.lock);
         init_waitqueue_head(&info->controller.wq);
 
         /* get the clock source and enable it */
 
-        info->clk = clk_get(dev, "nand");
+        info->clk = clk_get(&pdev->dev, "nand");
         if (IS_ERR(info->clk)) {
-                dev_err(dev, "failed to get clock");
+                dev_err(&pdev->dev, "failed to get clock");
                 err = -ENOENT;
                 goto exit_error;
         }
@@ -611,27 +610,27 @@ static int s3c24xx_nand_probe(struct device *dev, int is_s3c2440)
         info->area = request_mem_region(res->start, size, pdev->name);
 
         if (info->area == NULL) {
-                dev_err(dev, "cannot reserve register region\n");
+                dev_err(&pdev->dev, "cannot reserve register region\n");
                 err = -ENOENT;
                 goto exit_error;
         }
 
-        info->device     = dev;
+        info->device     = &pdev->dev;
         info->platform   = plat;
         info->regs       = ioremap(res->start, size);
         info->is_s3c2440 = is_s3c2440;
 
         if (info->regs == NULL) {
-                dev_err(dev, "cannot reserve register region\n");
+                dev_err(&pdev->dev, "cannot reserve register region\n");
                 err = -EIO;
                 goto exit_error;
         }
 
-        dev_dbg(dev, "mapped registers at %p\n", info->regs);
+        dev_dbg(&pdev->dev, "mapped registers at %p\n", info->regs);
 
         /* initialise the hardware */
 
-        err = s3c2410_nand_inithw(info, dev);
+        err = s3c2410_nand_inithw(info, pdev);
         if (err != 0)
                 goto exit_error;
 
@@ -645,7 +644,7 @@ static int s3c24xx_nand_probe(struct device *dev, int is_s3c2440)
         size = nr_sets * sizeof(*info->mtds);
         info->mtds = kmalloc(size, GFP_KERNEL);
         if (info->mtds == NULL) {
-                dev_err(dev, "failed to allocate mtd storage\n");
+                dev_err(&pdev->dev, "failed to allocate mtd storage\n");
                 err = -ENOMEM;
                 goto exit_error;
         }
@@ -677,7 +676,7 @@ static int s3c24xx_nand_probe(struct device *dev, int is_s3c2440)
         return 0;
 
  exit_error:
-        s3c2410_nand_remove(dev);
+        s3c2410_nand_remove(pdev);
 
         if (err == 0)
                 err = -EINVAL;
@@ -686,44 +685,46 @@ static int s3c24xx_nand_probe(struct device *dev, int is_s3c2440)
 
 /* driver device registration */
 
-static int s3c2410_nand_probe(struct device *dev)
+static int s3c2410_nand_probe(struct platform_device *dev)
 {
         return s3c24xx_nand_probe(dev, 0);
 }
 
-static int s3c2440_nand_probe(struct device *dev)
+static int s3c2440_nand_probe(struct platform_device *dev)
 {
         return s3c24xx_nand_probe(dev, 1);
 }
 
-static struct device_driver s3c2410_nand_driver = {
-        .name           = "s3c2410-nand",
-        .owner          = THIS_MODULE,
-        .bus            = &platform_bus_type,
+static struct platform_driver s3c2410_nand_driver = {
         .probe          = s3c2410_nand_probe,
         .remove         = s3c2410_nand_remove,
+        .driver         = {
+                .name   = "s3c2410-nand",
+                .owner  = THIS_MODULE,
+        },
 };
 
-static struct device_driver s3c2440_nand_driver = {
-        .name           = "s3c2440-nand",
-        .owner          = THIS_MODULE,
-        .bus            = &platform_bus_type,
+static struct platform_driver s3c2440_nand_driver = {
         .probe          = s3c2440_nand_probe,
         .remove         = s3c2410_nand_remove,
+        .driver         = {
+                .name   = "s3c2440-nand",
+                .owner  = THIS_MODULE,
+        },
 };
 
 static int __init s3c2410_nand_init(void)
 {
         printk("S3C24XX NAND Driver, (c) 2004 Simtec Electronics\n");
 
-        driver_register(&s3c2440_nand_driver);
-        return driver_register(&s3c2410_nand_driver);
+        platform_driver_register(&s3c2440_nand_driver);
+        return platform_driver_register(&s3c2410_nand_driver);
 }
 
 static void __exit s3c2410_nand_exit(void)
 {
-        driver_unregister(&s3c2440_nand_driver);
-        driver_unregister(&s3c2410_nand_driver);
+        platform_driver_unregister(&s3c2440_nand_driver);
+        platform_driver_unregister(&s3c2410_nand_driver);
 }
 
 module_init(s3c2410_nand_init);
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 5c69d57f8548..ebd7313d7fc1 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -812,7 +812,7 @@ config SMC91X
         tristate "SMC 91C9x/91C1xxx support"
         select CRC32
         select MII
-        depends on NET_ETHERNET && (ARM || REDWOOD_5 || REDWOOD_6 || M32R || SUPERH)
+        depends on NET_ETHERNET && (ARM || REDWOOD_5 || REDWOOD_6 || M32R || SUPERH || SOC_AU1X00)
         help
           This is a driver for SMC's 91x series of Ethernet chipsets,
           including the SMC91C94 and the SMC91C111. Say Y if you want it
diff --git a/drivers/net/depca.c b/drivers/net/depca.c
index 0d33a93df96b..03804cc38be0 100644
--- a/drivers/net/depca.c
+++ b/drivers/net/depca.c
@@ -398,13 +398,19 @@ static struct mca_driver depca_mca_driver = {
 };
 #endif
 
-static int depca_isa_probe (struct device *);
+static int depca_isa_probe (struct platform_device *);
 
-static struct device_driver depca_isa_driver = {
-        .name   = depca_string,
-        .bus    = &platform_bus_type,
+static int __devexit depca_isa_remove(struct platform_device *pdev)
+{
+        return depca_device_remove(&pdev->dev);
+}
+
+static struct platform_driver depca_isa_driver = {
         .probe  = depca_isa_probe,
-        .remove = __devexit_p(depca_device_remove),
+        .remove = __devexit_p(depca_isa_remove),
+        .driver = {
+                .name   = depca_string,
+        },
 };
         
 /*
@@ -1525,7 +1531,7 @@ static enum depca_type __init depca_shmem_probe (ulong *mem_start)
         return adapter;
 }
 
-static int __init depca_isa_probe (struct device *device)
+static int __init depca_isa_probe (struct platform_device *device)
 {
         struct net_device *dev;
         struct depca_private *lp;
@@ -1533,7 +1539,7 @@ static int __init depca_isa_probe (struct device *device)
         enum depca_type adapter = unknown;
         int status = 0;
 
-        ioaddr = (u_long) device->platform_data;
+        ioaddr = (u_long) device->dev.platform_data;
 
         if ((status = depca_common_init (ioaddr, &dev)))
                 goto out;
@@ -1553,7 +1559,7 @@ static int __init depca_isa_probe (struct device *device)
         lp->adapter = adapter;
         lp->mem_start = mem_start;
         
-        if ((status = depca_hw_init(dev, device)))
+        if ((status = depca_hw_init(dev, &device->dev)))
                 goto out_free;
         
         return 0;
@@ -2082,7 +2088,7 @@ static int __init depca_module_init (void)
 #ifdef CONFIG_EISA
         err |= eisa_driver_register (&depca_eisa_driver);
 #endif
-        err |= driver_register (&depca_isa_driver);
+        err |= platform_driver_register (&depca_isa_driver);
         depca_platform_probe ();
         
         return err;
@@ -2097,7 +2103,7 @@ static void __exit depca_module_exit (void)
 #ifdef CONFIG_EISA
         eisa_driver_unregister (&depca_eisa_driver);
 #endif
-        driver_unregister (&depca_isa_driver);
+        platform_driver_unregister (&depca_isa_driver);
 
         for (i = 0; depca_io_ports[i].iobase; i++) {
                 if (depca_io_ports[i].device) {
diff --git a/drivers/net/dm9000.c b/drivers/net/dm9000.c
index f8c9bcdab68b..24996da4c1c4 100644
--- a/drivers/net/dm9000.c
+++ b/drivers/net/dm9000.c
@@ -148,7 +148,7 @@ typedef struct board_info {
 } board_info_t;
 
 /* function declaration ------------------------------------- */
-static int dm9000_probe(struct device *);
+static int dm9000_probe(struct platform_device *);
 static int dm9000_open(struct net_device *);
 static int dm9000_start_xmit(struct sk_buff *, struct net_device *);
 static int dm9000_stop(struct net_device *);
@@ -378,9 +378,8 @@ dm9000_release_board(struct platform_device *pdev, struct board_info *db)
  * Search DM9000 board, allocate space and register it
  */
 static int
-dm9000_probe(struct device *dev)
+dm9000_probe(struct platform_device *pdev)
 {
-        struct platform_device *pdev = to_platform_device(dev);
         struct dm9000_plat_data *pdata = pdev->dev.platform_data;
         struct board_info *db;  /* Point a board information structure */
         struct net_device *ndev;
@@ -398,7 +397,7 @@ dm9000_probe(struct device *dev)
         }
 
         SET_MODULE_OWNER(ndev);
-        SET_NETDEV_DEV(ndev, dev);
+        SET_NETDEV_DEV(ndev, &pdev->dev);
 
         PRINTK2("dm9000_probe()");
 
@@ -569,7 +568,7 @@ dm9000_probe(struct device *dev)
                 printk("%s: Invalid ethernet MAC address.  Please "
                        "set using ifconfig\n", ndev->name);
 
-        dev_set_drvdata(dev, ndev);
+        platform_set_drvdata(pdev, ndev);
         ret = register_netdev(ndev);
 
         if (ret == 0) {
@@ -1140,9 +1139,9 @@ dm9000_phy_write(struct net_device *dev, int phyaddr_unused, int reg, int value)
 }
 
 static int
-dm9000_drv_suspend(struct device *dev, pm_message_t state)
+dm9000_drv_suspend(struct platform_device *dev, pm_message_t state)
 {
-        struct net_device *ndev = dev_get_drvdata(dev);
+        struct net_device *ndev = platform_get_drvdata(dev);
 
         if (ndev) {
                 if (netif_running(ndev)) {
@@ -1154,9 +1153,9 @@ dm9000_drv_suspend(struct device *dev, pm_message_t state)
 }
 
 static int
-dm9000_drv_resume(struct device *dev)
+dm9000_drv_resume(struct platform_device *dev)
 {
-        struct net_device *ndev = dev_get_drvdata(dev);
+        struct net_device *ndev = platform_get_drvdata(dev);
         board_info_t *db = (board_info_t *) ndev->priv;
 
         if (ndev) {
@@ -1172,12 +1171,11 @@ dm9000_drv_resume(struct device *dev)
 }
 
 static int
-dm9000_drv_remove(struct device *dev)
+dm9000_drv_remove(struct platform_device *pdev)
 {
-        struct platform_device *pdev = to_platform_device(dev);
-        struct net_device *ndev = dev_get_drvdata(dev);
+        struct net_device *ndev = platform_get_drvdata(pdev);
 
-        dev_set_drvdata(dev, NULL);
+        platform_set_drvdata(pdev, NULL);
 
         unregister_netdev(ndev);
         dm9000_release_board(pdev, (board_info_t *) ndev->priv);
@@ -1188,13 +1186,14 @@ dm9000_drv_remove(struct device *dev)
         return 0;
 }
 
-static struct device_driver dm9000_driver = {
-        .name    = "dm9000",
-        .bus     = &platform_bus_type,
+static struct platform_driver dm9000_driver = {
         .probe   = dm9000_probe,
         .remove  = dm9000_drv_remove,
         .suspend = dm9000_drv_suspend,
         .resume  = dm9000_drv_resume,
+        .driver = {
+                .name   = "dm9000",
+        },
 };
 
 static int __init
@@ -1202,13 +1201,13 @@ dm9000_init(void)
 {
         printk(KERN_INFO "%s Ethernet Driver\n", CARDNAME);
 
-        return driver_register(&dm9000_driver); /* search board and register */
+        return platform_driver_register(&dm9000_driver);        /* search board and register */
 }
 
 static void __exit
 dm9000_cleanup(void)
 {
-        driver_unregister(&dm9000_driver);
+        platform_driver_unregister(&dm9000_driver);
 }
 
 module_init(dm9000_init);
diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c
index 22aec6ed80f5..525624fc03b4 100644
--- a/drivers/net/forcedeth.c
+++ b/drivers/net/forcedeth.c
@@ -80,7 +80,7 @@
  *                         into nv_close, otherwise reenabling for wol can
  *                         cause DMA to kfree'd memory.
  *      0.31: 14 Nov 2004: ethtool support for getting/setting link
- *                         capabilities.
+ *                         capabilities.
  *      0.32: 16 Apr 2005: RX_ERROR4 handling added.
  *      0.33: 16 May 2005: Support for MCP51 added.
  *      0.34: 18 Jun 2005: Add DEV_NEED_LINKTIMER to all nForce nics.
@@ -89,14 +89,17 @@
  *      0.37: 10 Jul 2005: Additional ethtool support, cleanup of pci id list
  *      0.38: 16 Jul 2005: tx irq rewrite: Use global flags instead of
  *                         per-packet flags.
- *      0.39: 18 Jul 2005: Add 64bit descriptor support.
- *      0.40: 19 Jul 2005: Add support for mac address change.
- *      0.41: 30 Jul 2005: Write back original MAC in nv_close instead
+ *      0.39: 18 Jul 2005: Add 64bit descriptor support.
+ *      0.40: 19 Jul 2005: Add support for mac address change.
+ *      0.41: 30 Jul 2005: Write back original MAC in nv_close instead
  *                         of nv_remove
- *      0.42: 06 Aug 2005: Fix lack of link speed initialization
+ *      0.42: 06 Aug 2005: Fix lack of link speed initialization
  *                         in the second (and later) nv_open call
- *      0.43: 10 Aug 2005: Add support for tx checksum.
- *      0.44: 20 Aug 2005: Add support for scatter gather and segmentation.
+ *      0.43: 10 Aug 2005: Add support for tx checksum.
+ *      0.44: 20 Aug 2005: Add support for scatter gather and segmentation.
+ *      0.45: 18 Sep 2005: Remove nv_stop/start_rx from every link check
+ *      0.46: 20 Oct 2005: Add irq optimization modes.
+ *      0.47: 26 Oct 2005: Add phyaddr 0 in phy scan.
  *
  * Known bugs:
  * We suspect that on some hardware no TX done interrupts are generated.
@@ -108,7 +111,7 @@
  * DEV_NEED_TIMERIRQ will not harm you on sane hardware, only generating a few
  * superfluous timer interrupts from the nic.
  */
-#define FORCEDETH_VERSION               "0.44"
+#define FORCEDETH_VERSION               "0.47"
 #define DRV_NAME                        "forcedeth"
 
 #include <linux/module.h>
@@ -163,7 +166,8 @@ enum {
 #define NVREG_IRQ_LINK                  0x0040
 #define NVREG_IRQ_TX_ERROR              0x0080
 #define NVREG_IRQ_TX1                   0x0100
-#define NVREG_IRQMASK_WANTED            0x00df
+#define NVREG_IRQMASK_THROUGHPUT        0x00df
+#define NVREG_IRQMASK_CPU               0x0040
 
 #define NVREG_IRQ_UNKNOWN       (~(NVREG_IRQ_RX_ERROR|NVREG_IRQ_RX|NVREG_IRQ_RX_NOBUF|NVREG_IRQ_TX_ERR| \
                                         NVREG_IRQ_TX_OK|NVREG_IRQ_TIMER|NVREG_IRQ_LINK|NVREG_IRQ_TX_ERROR| \
@@ -177,7 +181,8 @@ enum {
  * NVREG_POLL_DEFAULT=97 would result in an interval length of 1 ms
  */
         NvRegPollingInterval = 0x00c,
-#define NVREG_POLL_DEFAULT      970
+#define NVREG_POLL_DEFAULT_THROUGHPUT   970
+#define NVREG_POLL_DEFAULT_CPU  13
         NvRegMisc1 = 0x080,
 #define NVREG_MISC1_HD          0x02
 #define NVREG_MISC1_FORCE       0x3b0f3c
@@ -538,6 +543,25 @@ struct fe_priv {
  */
 static int max_interrupt_work = 5;
 
+/*
+ * Optimization can be either throuput mode or cpu mode
+ * 
+ * Throughput Mode: Every tx and rx packet will generate an interrupt.
+ * CPU Mode: Interrupts are controlled by a timer.
+ */
+#define NV_OPTIMIZATION_MODE_THROUGHPUT 0
+#define NV_OPTIMIZATION_MODE_CPU        1
+static int optimization_mode = NV_OPTIMIZATION_MODE_THROUGHPUT;
+
+/*
+ * Poll interval for timer irq
+ *
+ * This interval determines how frequent an interrupt is generated.
+ * The is value is determined by [(time_in_micro_secs * 100) / (2^10)]
+ * Min = 0, and Max = 65535
+ */
+static int poll_interval = -1;
+
 static inline struct fe_priv *get_nvpriv(struct net_device *dev)
 {
         return netdev_priv(dev);
@@ -1328,67 +1352,71 @@ static void nv_rx_process(struct net_device *dev)
                         if (!(Flags & NV_RX_DESCRIPTORVALID))
                                 goto next_pkt;
 
-                        if (Flags & NV_RX_MISSEDFRAME) {
-                                np->stats.rx_missed_errors++;
-                                np->stats.rx_errors++;
-                                goto next_pkt;
-                        }
-                        if (Flags & (NV_RX_ERROR1|NV_RX_ERROR2|NV_RX_ERROR3)) {
-                                np->stats.rx_errors++;
-                                goto next_pkt;
-                        }
-                        if (Flags & NV_RX_CRCERR) {
-                                np->stats.rx_crc_errors++;
-                                np->stats.rx_errors++;
-                                goto next_pkt;
-                        }
-                        if (Flags & NV_RX_OVERFLOW) {
-                                np->stats.rx_over_errors++;
-                                np->stats.rx_errors++;
-                                goto next_pkt;
-                        }
-                        if (Flags & NV_RX_ERROR4) {
-                                len = nv_getlen(dev, np->rx_skbuff[i]->data, len);
-                                if (len < 0) {
+                        if (Flags & NV_RX_ERROR) {
+                                if (Flags & NV_RX_MISSEDFRAME) {
+                                        np->stats.rx_missed_errors++;
                                         np->stats.rx_errors++;
                                         goto next_pkt;
                                 }
-                        }
-                        /* framing errors are soft errors. */
-                        if (Flags & NV_RX_FRAMINGERR) {
-                                if (Flags & NV_RX_SUBSTRACT1) {
-                                        len--;
+                                if (Flags & (NV_RX_ERROR1|NV_RX_ERROR2|NV_RX_ERROR3)) {
+                                        np->stats.rx_errors++;
+                                        goto next_pkt;
+                                }
+                                if (Flags & NV_RX_CRCERR) {
+                                        np->stats.rx_crc_errors++;
+                                        np->stats.rx_errors++;
+                                        goto next_pkt;
+                                }
+                                if (Flags & NV_RX_OVERFLOW) {
+                                        np->stats.rx_over_errors++;
+                                        np->stats.rx_errors++;
+                                        goto next_pkt;
+                                }
+                                if (Flags & NV_RX_ERROR4) {
+                                        len = nv_getlen(dev, np->rx_skbuff[i]->data, len);
+                                        if (len < 0) {
+                                                np->stats.rx_errors++;
+                                                goto next_pkt;
+                                        }
+                                }
+                                /* framing errors are soft errors. */
+                                if (Flags & NV_RX_FRAMINGERR) {
+                                        if (Flags & NV_RX_SUBSTRACT1) {
+                                                len--;
+                                        }
                                 }
                         }
                 } else {
                         if (!(Flags & NV_RX2_DESCRIPTORVALID))
                                 goto next_pkt;
 
-                        if (Flags & (NV_RX2_ERROR1|NV_RX2_ERROR2|NV_RX2_ERROR3)) {
-                                np->stats.rx_errors++;
-                                goto next_pkt;
-                        }
-                        if (Flags & NV_RX2_CRCERR) {
-                                np->stats.rx_crc_errors++;
-                                np->stats.rx_errors++;
-                                goto next_pkt;
-                        }
-                        if (Flags & NV_RX2_OVERFLOW) {
-                                np->stats.rx_over_errors++;
-                                np->stats.rx_errors++;
-                                goto next_pkt;
-                        }
-                        if (Flags & NV_RX2_ERROR4) {
-                                len = nv_getlen(dev, np->rx_skbuff[i]->data, len);
-                                if (len < 0) {
+                        if (Flags & NV_RX2_ERROR) {
+                                if (Flags & (NV_RX2_ERROR1|NV_RX2_ERROR2|NV_RX2_ERROR3)) {
                                         np->stats.rx_errors++;
                                         goto next_pkt;
                                 }
-                        }
-                        /* framing errors are soft errors */
-                        if (Flags & NV_RX2_FRAMINGERR) {
-                                if (Flags & NV_RX2_SUBSTRACT1) {
-                                        len--;
+                                if (Flags & NV_RX2_CRCERR) {
+                                        np->stats.rx_crc_errors++;
+                                        np->stats.rx_errors++;
+                                        goto next_pkt;
+                                }
+                                if (Flags & NV_RX2_OVERFLOW) {
+                                        np->stats.rx_over_errors++;
+                                        np->stats.rx_errors++;
+                                        goto next_pkt;
+                                }
+                                if (Flags & NV_RX2_ERROR4) {
+                                        len = nv_getlen(dev, np->rx_skbuff[i]->data, len);
+                                        if (len < 0) {
+                                                np->stats.rx_errors++;
+                                                goto next_pkt;
+                                        }
+                                }
+                                /* framing errors are soft errors */
+                                if (Flags & NV_RX2_FRAMINGERR) {
+                                        if (Flags & NV_RX2_SUBSTRACT1) {
+                                                len--;
+                                        }
                                 }
                         }
                         Flags &= NV_RX2_CHECKSUMMASK;
@@ -1612,6 +1640,17 @@ static void nv_set_multicast(struct net_device *dev)
         spin_unlock_irq(&np->lock);
 }
 
+/**
+ * nv_update_linkspeed: Setup the MAC according to the link partner
+ * @dev: Network device to be configured
+ *
+ * The function queries the PHY and checks if there is a link partner.
+ * If yes, then it sets up the MAC accordingly. Otherwise, the MAC is
+ * set to 10 MBit HD.
+ *
+ * The function returns 0 if there is no link partner and 1 if there is
+ * a good link partner.
+ */
 static int nv_update_linkspeed(struct net_device *dev)
 {
         struct fe_priv *np = netdev_priv(dev);
@@ -1751,13 +1790,11 @@ set_speed:
 static void nv_linkchange(struct net_device *dev)
 {
         if (nv_update_linkspeed(dev)) {
-                if (netif_carrier_ok(dev)) {
-                        nv_stop_rx(dev);
-                } else {
+                if (!netif_carrier_ok(dev)) {
                         netif_carrier_on(dev);
                         printk(KERN_INFO "%s: link up.\n", dev->name);
+                        nv_start_rx(dev);
                 }
-                nv_start_rx(dev);
         } else {
                 if (netif_carrier_ok(dev)) {
                         netif_carrier_off(dev);
@@ -1799,22 +1836,18 @@ static irqreturn_t nv_nic_irq(int foo, void *data, struct pt_regs *regs)
                 if (!(events & np->irqmask))
                         break;
 
-                if (events & (NVREG_IRQ_TX1|NVREG_IRQ_TX_OK|NVREG_IRQ_TX_ERROR|NVREG_IRQ_TX_ERR)) {
+                spin_lock(&np->lock);
+                nv_tx_done(dev);
+                spin_unlock(&np->lock);
+                
+                nv_rx_process(dev);
+                if (nv_alloc_rx(dev)) {
                         spin_lock(&np->lock);
-                        nv_tx_done(dev);
+                        if (!np->in_shutdown)
+                                mod_timer(&np->oom_kick, jiffies + OOM_REFILL);
                         spin_unlock(&np->lock);
                 }
-
-                if (events & (NVREG_IRQ_RX_ERROR|NVREG_IRQ_RX|NVREG_IRQ_RX_NOBUF)) {
-                        nv_rx_process(dev);
-                        if (nv_alloc_rx(dev)) {
-                                spin_lock(&np->lock);
-                                if (!np->in_shutdown)
-                                        mod_timer(&np->oom_kick, jiffies + OOM_REFILL);
-                                spin_unlock(&np->lock);
-                        }
-                }
-
+                
                 if (events & NVREG_IRQ_LINK) {
                         spin_lock(&np->lock);
                         nv_link_irq(dev);
@@ -2216,7 +2249,14 @@ static int nv_open(struct net_device *dev)
         writel(NVREG_RNDSEED_FORCE | (i&NVREG_RNDSEED_MASK), base + NvRegRandomSeed);
         writel(NVREG_UNKSETUP1_VAL, base + NvRegUnknownSetupReg1);
         writel(NVREG_UNKSETUP2_VAL, base + NvRegUnknownSetupReg2);
-        writel(NVREG_POLL_DEFAULT, base + NvRegPollingInterval);
+        if (poll_interval == -1) {
+                if (optimization_mode == NV_OPTIMIZATION_MODE_THROUGHPUT)
+                        writel(NVREG_POLL_DEFAULT_THROUGHPUT, base + NvRegPollingInterval);
+                else
+                        writel(NVREG_POLL_DEFAULT_CPU, base + NvRegPollingInterval);
+        }
+        else
+                writel(poll_interval & 0xFFFF, base + NvRegPollingInterval);
         writel(NVREG_UNKSETUP6_VAL, base + NvRegUnknownSetupReg6);
         writel((np->phyaddr << NVREG_ADAPTCTL_PHYSHIFT)|NVREG_ADAPTCTL_PHYVALID|NVREG_ADAPTCTL_RUNNING,
                         base + NvRegAdapterControl);
@@ -2501,7 +2541,11 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i
         } else {
                 np->tx_flags = NV_TX2_VALID;
         }
-        np->irqmask = NVREG_IRQMASK_WANTED;
+        if (optimization_mode == NV_OPTIMIZATION_MODE_THROUGHPUT)
+                np->irqmask = NVREG_IRQMASK_THROUGHPUT;
+        else
+                np->irqmask = NVREG_IRQMASK_CPU;
+
         if (id->driver_data & DEV_NEED_TIMERIRQ)
                 np->irqmask |= NVREG_IRQ_TIMER;
         if (id->driver_data & DEV_NEED_LINKTIMER) {
@@ -2514,16 +2558,17 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i
         }
 
         /* find a suitable phy */
-        for (i = 1; i < 32; i++) {
+        for (i = 1; i <= 32; i++) {
                 int id1, id2;
+                int phyaddr = i & 0x1F;
 
                 spin_lock_irq(&np->lock);
-                id1 = mii_rw(dev, i, MII_PHYSID1, MII_READ);
+                id1 = mii_rw(dev, phyaddr, MII_PHYSID1, MII_READ);
                 spin_unlock_irq(&np->lock);
                 if (id1 < 0 || id1 == 0xffff)
                         continue;
                 spin_lock_irq(&np->lock);
-                id2 = mii_rw(dev, i, MII_PHYSID2, MII_READ);
+                id2 = mii_rw(dev, phyaddr, MII_PHYSID2, MII_READ);
                 spin_unlock_irq(&np->lock);
                 if (id2 < 0 || id2 == 0xffff)
                         continue;
@@ -2531,23 +2576,19 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i
                 id1 = (id1 & PHYID1_OUI_MASK) << PHYID1_OUI_SHFT;
                 id2 = (id2 & PHYID2_OUI_MASK) >> PHYID2_OUI_SHFT;
                 dprintk(KERN_DEBUG "%s: open: Found PHY %04x:%04x at address %d.\n",
-                                pci_name(pci_dev), id1, id2, i);
-                np->phyaddr = i;
+                        pci_name(pci_dev), id1, id2, phyaddr);
+                np->phyaddr = phyaddr;
                 np->phy_oui = id1 | id2;
                 break;
         }
-        if (i == 32) {
-                /* PHY in isolate mode? No phy attached and user wants to
-                 * test loopback? Very odd, but can be correct.
-                 */
+        if (i == 33) {
                 printk(KERN_INFO "%s: open: Could not find a valid PHY.\n",
-                                pci_name(pci_dev));
-        }
-
-        if (i != 32) {
-                /* reset it */
-                phy_init(dev);
+                       pci_name(pci_dev));
+                goto out_freering;
         }
+        
+        /* reset it */
+        phy_init(dev);
 
         /* set default link speed settings */
         np->linkspeed = NVREG_LINKSPEED_FORCE|NVREG_LINKSPEED_10;
@@ -2689,6 +2730,10 @@ static void __exit exit_nic(void)
 
 module_param(max_interrupt_work, int, 0);
 MODULE_PARM_DESC(max_interrupt_work, "forcedeth maximum events handled per interrupt");
+module_param(optimization_mode, int, 0);
+MODULE_PARM_DESC(optimization_mode, "In throughput mode (0), every tx & rx packet will generate an interrupt. In CPU mode (1), interrupts are controlled by a timer.");
+module_param(poll_interval, int, 0);
+MODULE_PARM_DESC(poll_interval, "Interval determines how frequent timer interrupt is generated by [(time_in_micro_secs * 100) / (2^10)]. Min is 0 and Max is 65535.");
 
 MODULE_AUTHOR("Manfred Spraul <manfred@colorfullife.com>");
 MODULE_DESCRIPTION("Reverse Engineered nForce ethernet driver");
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c
index 54d294ad6df5..e3a329539f1c 100644
--- a/drivers/net/gianfar.c
+++ b/drivers/net/gianfar.c
@@ -126,8 +126,8 @@ static irqreturn_t gfar_interrupt(int irq, void *dev_id, struct pt_regs *regs);
 static void adjust_link(struct net_device *dev);
 static void init_registers(struct net_device *dev);
 static int init_phy(struct net_device *dev);
-static int gfar_probe(struct device *device);
-static int gfar_remove(struct device *device);
+static int gfar_probe(struct platform_device *pdev);
+static int gfar_remove(struct platform_device *pdev);
 static void free_skb_resources(struct gfar_private *priv);
 static void gfar_set_multi(struct net_device *dev);
 static void gfar_set_hash_for_addr(struct net_device *dev, u8 *addr);
@@ -156,12 +156,11 @@ int gfar_uses_fcb(struct gfar_private *priv)
 
 /* Set up the ethernet device structure, private data,
  * and anything else we need before we start */
-static int gfar_probe(struct device *device)
+static int gfar_probe(struct platform_device *pdev)
 {
         u32 tempval;
         struct net_device *dev = NULL;
         struct gfar_private *priv = NULL;
-        struct platform_device *pdev = to_platform_device(device);
         struct gianfar_platform_data *einfo;
         struct resource *r;
         int idx;
@@ -208,7 +207,7 @@ static int gfar_probe(struct device *device)
 
         spin_lock_init(&priv->lock);
 
-        dev_set_drvdata(device, dev);
+        platform_set_drvdata(pdev, dev);
 
         /* Stop the DMA engine now, in case it was running before */
         /* (The firmware could have used it, and left it running). */
@@ -245,7 +244,7 @@ static int gfar_probe(struct device *device)
         dev->base_addr = (unsigned long) (priv->regs);
 
         SET_MODULE_OWNER(dev);
-        SET_NETDEV_DEV(dev, device);
+        SET_NETDEV_DEV(dev, &pdev->dev);
 
         /* Fill in the dev structure */
         dev->open = gfar_enet_open;
@@ -377,12 +376,12 @@ regs_fail:
         return err;
 }
 
-static int gfar_remove(struct device *device)
+static int gfar_remove(struct platform_device *pdev)
 {
-        struct net_device *dev = dev_get_drvdata(device);
+        struct net_device *dev = platform_get_drvdata(pdev);
         struct gfar_private *priv = netdev_priv(dev);
 
-        dev_set_drvdata(device, NULL);
+        platform_set_drvdata(pdev, NULL);
 
         iounmap((void *) priv->regs);
         free_netdev(dev);
@@ -1861,11 +1860,12 @@ static irqreturn_t gfar_error(int irq, void *dev_id, struct pt_regs *regs)
 }
 
 /* Structure for a device driver */
-static struct device_driver gfar_driver = {
-        .name = "fsl-gianfar",
-        .bus = &platform_bus_type,
+static struct platform_driver gfar_driver = {
         .probe = gfar_probe,
         .remove = gfar_remove,
+        .driver = {
+                .name = "fsl-gianfar",
+        },
 };
 
 static int __init gfar_init(void)
@@ -1875,7 +1875,7 @@ static int __init gfar_init(void)
         if (err)
                 return err;
 
-        err = driver_register(&gfar_driver);
+        err = platform_driver_register(&gfar_driver);
 
         if (err)
                 gfar_mdio_exit();
@@ -1885,7 +1885,7 @@ static int __init gfar_init(void)
 
 static void __exit gfar_exit(void)
 {
-        driver_unregister(&gfar_driver);
+        platform_driver_unregister(&gfar_driver);
         gfar_mdio_exit();
 }
 
diff --git a/drivers/net/gianfar_mii.c b/drivers/net/gianfar_mii.c
index 7263395d78bb..9544279e8bcd 100644
--- a/drivers/net/gianfar_mii.c
+++ b/drivers/net/gianfar_mii.c
@@ -133,7 +133,7 @@ int gfar_mdio_probe(struct device *dev)
         if (NULL == dev)
                 return -EINVAL;
 
-        new_bus = kmalloc(sizeof(struct mii_bus), GFP_KERNEL);
+        new_bus = kzalloc(sizeof(struct mii_bus), GFP_KERNEL);
 
         if (NULL == new_bus)
                 return -ENOMEM;
diff --git a/drivers/net/gt96100eth.c b/drivers/net/gt96100eth.c
index 666cfbbcf6d9..5958a6314723 100644
--- a/drivers/net/gt96100eth.c
+++ b/drivers/net/gt96100eth.c
@@ -72,8 +72,6 @@ static void dump_tx_desc(int dbg_lvl, struct net_device *dev, int i);
 static void dump_rx_desc(int dbg_lvl, struct net_device *dev, int i);
 static void dump_skb(int dbg_lvl, struct net_device *dev,
                      struct sk_buff *skb);
-static void dump_hw_addr(int dbg_lvl, struct net_device *dev,
-                         const char* pfx, unsigned char* addr_str);
 static void update_stats(struct gt96100_private *gp);
 static void abort(struct net_device *dev, u32 abort_bits);
 static void hard_stop(struct net_device *dev);
@@ -334,13 +332,13 @@ dump_MII(int dbg_lvl, struct net_device *dev)
 
 static void
 dump_hw_addr(int dbg_lvl, struct net_device *dev, const char* pfx,
-             unsigned char* addr_str)
+             const char* func, unsigned char* addr_str)
 {
         int i;
         char buf[100], octet[5];
     
         if (dbg_lvl <= GT96100_DEBUG) {
-                strcpy(buf, pfx);
+                sprintf(buf, pfx, func);
                 for (i = 0; i < 6; i++) {
                         sprintf(octet, "%2.2x%s",
                                 addr_str[i], i<5 ? ":" : "\n");
@@ -708,7 +706,7 @@ static int __init gt96100_probe1(struct pci_dev *pci, int port_num)
 
         info("%s found at 0x%x, irq %d\n",
              chip_name(gp->chip_rev), gtif->iobase, gtif->irq);
-        dump_hw_addr(0, dev, "HW Address ", dev->dev_addr);
+        dump_hw_addr(0, dev, "%s: HW Address ", __FUNCTION__, dev->dev_addr);
         info("%s chip revision=%d\n", chip_name(gp->chip_rev), gp->chip_rev);
         info("%s ethernet port %d\n", chip_name(gp->chip_rev), gp->port_num);
         info("external PHY ID1=0x%04x, ID2=0x%04x\n", phy_id1, phy_id2);
@@ -1488,7 +1486,7 @@ gt96100_set_rx_mode(struct net_device *dev)
                 gt96100_add_hash_entry(dev, dev->dev_addr);
 
                 for (mcptr = dev->mc_list; mcptr; mcptr = mcptr->next) {
-                        dump_hw_addr(2, dev, __FUNCTION__ ": addr=",
+                        dump_hw_addr(2, dev, "%s: addr=", __FUNCTION__,
                                      mcptr->dmi_addr);
                         gt96100_add_hash_entry(dev, mcptr->dmi_addr);
                 }
diff --git a/drivers/net/ibmveth.c b/drivers/net/ibmveth.c
index be191d80ef9c..ceb98fd398af 100644
--- a/drivers/net/ibmveth.c
+++ b/drivers/net/ibmveth.c
@@ -58,7 +58,7 @@
 
 #include "ibmveth.h"
 
-#define DEBUG 1
+#undef DEBUG
 
 #define ibmveth_printk(fmt, args...) \
   printk(KERN_INFO "%s: " fmt, __FILE__, ## args)
diff --git a/drivers/net/irda/sa1100_ir.c b/drivers/net/irda/sa1100_ir.c
index 76e0b9fb5e96..63d38fbbd04e 100644
--- a/drivers/net/irda/sa1100_ir.c
+++ b/drivers/net/irda/sa1100_ir.c
@@ -291,9 +291,9 @@ static void sa1100_irda_shutdown(struct sa1100_irda *si)
 /*
  * Suspend the IrDA interface.
  */
-static int sa1100_irda_suspend(struct device *_dev, pm_message_t state)
+static int sa1100_irda_suspend(struct platform_device *pdev, pm_message_t state)
 {
-        struct net_device *dev = dev_get_drvdata(_dev);
+        struct net_device *dev = platform_get_drvdata(pdev);
         struct sa1100_irda *si;
 
         if (!dev)
@@ -316,9 +316,9 @@ static int sa1100_irda_suspend(struct device *_dev, pm_message_t state)
 /*
  * Resume the IrDA interface.
  */
-static int sa1100_irda_resume(struct device *_dev)
+static int sa1100_irda_resume(struct platform_device *pdev)
 {
-        struct net_device *dev = dev_get_drvdata(_dev);
+        struct net_device *dev = platform_get_drvdata(pdev);
         struct sa1100_irda *si;
 
         if (!dev)
@@ -886,9 +886,8 @@ static int sa1100_irda_init_iobuf(iobuff_t *io, int size)
         return io->head ? 0 : -ENOMEM;
 }
 
-static int sa1100_irda_probe(struct device *_dev)
+static int sa1100_irda_probe(struct platform_device *pdev)
 {
-        struct platform_device *pdev = to_platform_device(_dev);
         struct net_device *dev;
         struct sa1100_irda *si;
         unsigned int baudrate_mask;
@@ -967,7 +966,7 @@ static int sa1100_irda_probe(struct device *_dev)
 
         err = register_netdev(dev);
         if (err == 0)
-                dev_set_drvdata(&pdev->dev, dev);
+                platform_set_drvdata(pdev, dev);
 
         if (err) {
  err_mem_5:
@@ -985,9 +984,9 @@ static int sa1100_irda_probe(struct device *_dev)
         return err;
 }
 
-static int sa1100_irda_remove(struct device *_dev)
+static int sa1100_irda_remove(struct platform_device *pdev)
 {
-        struct net_device *dev = dev_get_drvdata(_dev);
+        struct net_device *dev = platform_get_drvdata(pdev);
 
         if (dev) {
                 struct sa1100_irda *si = dev->priv;
@@ -1004,13 +1003,14 @@ static int sa1100_irda_remove(struct device *_dev)
         return 0;
 }
 
-static struct device_driver sa1100ir_driver = {
-        .name           = "sa11x0-ir",
-        .bus            = &platform_bus_type,
+static struct platform_driver sa1100ir_driver = {
         .probe          = sa1100_irda_probe,
         .remove         = sa1100_irda_remove,
         .suspend        = sa1100_irda_suspend,
         .resume         = sa1100_irda_resume,
+        .driver         = {
+                .name   = "sa11x0-ir",
+        },
 };
 
 static int __init sa1100_irda_init(void)
@@ -1023,12 +1023,12 @@ static int __init sa1100_irda_init(void)
         if (power_level > 3)
                 power_level = 3;
 
-        return driver_register(&sa1100ir_driver);
+        return platform_driver_register(&sa1100ir_driver);
 }
 
 static void __exit sa1100_irda_exit(void)
 {
-        driver_unregister(&sa1100ir_driver);
+        platform_driver_unregister(&sa1100ir_driver);
 }
 
 module_init(sa1100_irda_init);
diff --git a/drivers/net/irda/smsc-ircc2.c b/drivers/net/irda/smsc-ircc2.c
index a1d207f2fa68..ec94ecdb103d 100644
--- a/drivers/net/irda/smsc-ircc2.c
+++ b/drivers/net/irda/smsc-ircc2.c
@@ -214,14 +214,15 @@ static int  smsc_ircc_probe_transceiver_smsc_ircc_atc(int fir_base);
 
 /* Power Management */
 
-static int smsc_ircc_suspend(struct device *dev, pm_message_t state);
-static int smsc_ircc_resume(struct device *dev);
+static int smsc_ircc_suspend(struct platform_device *dev, pm_message_t state);
+static int smsc_ircc_resume(struct platform_device *dev);
 
-static struct device_driver smsc_ircc_driver = {
-        .name           = SMSC_IRCC2_DRIVER_NAME,
-        .bus            = &platform_bus_type,
+static struct platform_driver smsc_ircc_driver = {
         .suspend        = smsc_ircc_suspend,
         .resume         = smsc_ircc_resume,
+        .driver         = {
+                .name   = SMSC_IRCC2_DRIVER_NAME,
+        },
 };
 
 /* Transceivers for SMSC-ircc */
@@ -346,7 +347,7 @@ static int __init smsc_ircc_init(void)
 
         IRDA_DEBUG(1, "%s\n", __FUNCTION__);
 
-        ret = driver_register(&smsc_ircc_driver);
+        ret = platform_driver_register(&smsc_ircc_driver);
         if (ret) {
                 IRDA_ERROR("%s, Can't register driver!\n", driver_name);
                 return ret;
@@ -378,7 +379,7 @@ static int __init smsc_ircc_init(void)
         }
 
         if (ret)
-                driver_unregister(&smsc_ircc_driver);
+                platform_driver_unregister(&smsc_ircc_driver);
 
         return ret;
 }
@@ -491,7 +492,7 @@ static int __init smsc_ircc_open(unsigned int fir_base, unsigned int sir_base, u
                 err = PTR_ERR(self->pldev);
                 goto err_out5;
         }
-        dev_set_drvdata(&self->pldev->dev, self);
+        platform_set_drvdata(self->pldev, self);
 
         IRDA_MESSAGE("IrDA: Registered device %s\n", dev->name);
         dev_count++;
@@ -1685,9 +1686,9 @@ static int smsc_ircc_net_close(struct net_device *dev)
         return 0;
 }
 
-static int smsc_ircc_suspend(struct device *dev, pm_message_t state)
+static int smsc_ircc_suspend(struct platform_device *dev, pm_message_t state)
 {
-        struct smsc_ircc_cb *self = dev_get_drvdata(dev);
+        struct smsc_ircc_cb *self = platform_get_drvdata(dev);
 
         if (!self->io.suspended) {
                 IRDA_DEBUG(1, "%s, Suspending\n", driver_name);
@@ -1706,9 +1707,9 @@ static int smsc_ircc_suspend(struct device *dev, pm_message_t state)
         return 0;
 }
 
-static int smsc_ircc_resume(struct device *dev)
+static int smsc_ircc_resume(struct platform_device *dev)
 {
-        struct smsc_ircc_cb *self = dev_get_drvdata(dev);
+        struct smsc_ircc_cb *self = platform_get_drvdata(dev);
 
         if (self->io.suspended) {
                 IRDA_DEBUG(1, "%s, Waking up\n", driver_name);
@@ -1788,7 +1789,7 @@ static void __exit smsc_ircc_cleanup(void)
                         smsc_ircc_close(dev_self[i]);
         }
 
-        driver_unregister(&smsc_ircc_driver);
+        platform_driver_unregister(&smsc_ircc_driver);
 }
 
 /*
diff --git a/drivers/net/jazzsonic.c b/drivers/net/jazzsonic.c
index 2fb3101cb33e..b039bd89ceb9 100644
--- a/drivers/net/jazzsonic.c
+++ b/drivers/net/jazzsonic.c
@@ -194,7 +194,7 @@ out:
  * Probe for a SONIC ethernet controller on a Mips Jazz board.
  * Actually probing is superfluous but we're paranoid.
  */
-static int __init jazz_sonic_probe(struct device *device)
+static int __init jazz_sonic_probe(struct platform_device *pdev)
 {
         struct net_device *dev;
         struct sonic_local *lp;
@@ -212,8 +212,8 @@ static int __init jazz_sonic_probe(struct device *device)
                 return -ENOMEM;
 
         lp = netdev_priv(dev);
-        lp->device = device;
-        SET_NETDEV_DEV(dev, device);
+        lp->device = &pdev->dev;
+        SET_NETDEV_DEV(dev, &pdev->dev);
         SET_MODULE_OWNER(dev);
 
         netdev_boot_setup_check(dev);
@@ -264,9 +264,9 @@ MODULE_PARM_DESC(sonic_debug, "jazzsonic debug level (1-4)");
 
 #include "sonic.c"
 
-static int __devexit jazz_sonic_device_remove (struct device *device)
+static int __devexit jazz_sonic_device_remove (struct platform_device *pdev)
 {
-        struct net_device *dev = device->driver_data;
+        struct net_device *dev = platform_get_drvdata(pdev);
         struct sonic_local* lp = netdev_priv(dev);
 
         unregister_netdev (dev);
@@ -278,18 +278,19 @@ static int __devexit jazz_sonic_device_remove (struct device *device)
         return 0;
 }
 
-static struct device_driver jazz_sonic_driver = {
-        .name   = jazz_sonic_string,
-        .bus    = &platform_bus_type,
+static struct platform_driver jazz_sonic_driver = {
         .probe  = jazz_sonic_probe,
         .remove = __devexit_p(jazz_sonic_device_remove),
+        .driver = {
+                .name   = jazz_sonic_string,
+        },
 };
 
 static int __init jazz_sonic_init_module(void)
 {
         int err;
 
-        if ((err = driver_register(&jazz_sonic_driver))) {
+        if ((err = platform_driver_register(&jazz_sonic_driver))) {
                 printk(KERN_ERR "Driver registration failed\n");
                 return err;
         }
@@ -313,7 +314,7 @@ out_unregister:
 
 static void __exit jazz_sonic_cleanup_module(void)
 {
-        driver_unregister(&jazz_sonic_driver);
+        platform_driver_unregister(&jazz_sonic_driver);
 
         if (jazz_sonic_device) {
                 platform_device_unregister(jazz_sonic_device);
diff --git a/drivers/net/macsonic.c b/drivers/net/macsonic.c
index 9ef4592aca03..02d5c6822733 100644
--- a/drivers/net/macsonic.c
+++ b/drivers/net/macsonic.c
@@ -525,7 +525,7 @@ int __init mac_nubus_sonic_probe(struct net_device* dev)
         return macsonic_init(dev);
 }
 
-static int __init mac_sonic_probe(struct device *device)
+static int __init mac_sonic_probe(struct platform_device *device)
 {
         struct net_device *dev;
         struct sonic_local *lp;
@@ -537,8 +537,8 @@ static int __init mac_sonic_probe(struct device *device)
                 return -ENOMEM;
 
         lp = netdev_priv(dev);
-        lp->device = device;
-        SET_NETDEV_DEV(dev, device);
+        lp->device = &device->dev;
+        SET_NETDEV_DEV(dev, &device->dev);
         SET_MODULE_OWNER(dev);
 
         /* This will catch fatal stuff like -ENOMEM as well as success */
@@ -579,9 +579,9 @@ MODULE_PARM_DESC(sonic_debug, "macsonic debug level (1-4)");
 
 #include "sonic.c"
 
-static int __devexit mac_sonic_device_remove (struct device *device)
+static int __devexit mac_sonic_device_remove (struct platform_device *device)
 {
-        struct net_device *dev = device->driver_data;
+        struct net_device *dev = platform_get_drvdata(device);
         struct sonic_local* lp = netdev_priv(dev);
 
         unregister_netdev (dev);
@@ -592,18 +592,19 @@ static int __devexit mac_sonic_device_remove (struct device *device)
         return 0;
 }
 
-static struct device_driver mac_sonic_driver = {
-        .name   = mac_sonic_string,
-        .bus    = &platform_bus_type,
+static struct platform_driver mac_sonic_driver = {
         .probe  = mac_sonic_probe,
         .remove = __devexit_p(mac_sonic_device_remove),
+        .driver = {
+                .name = mac_sonic_string,
+        },
 };
 
 static int __init mac_sonic_init_module(void)
 {
         int err;
 
-        if ((err = driver_register(&mac_sonic_driver))) {
+        if ((err = platform_driver_register(&mac_sonic_driver))) {
                 printk(KERN_ERR "Driver registration failed\n");
                 return err;
         }
@@ -628,7 +629,7 @@ out_unregister:
 
 static void __exit mac_sonic_cleanup_module(void)
 {
-        driver_unregister(&mac_sonic_driver);
+        platform_driver_unregister(&mac_sonic_driver);
 
         if (mac_sonic_device) {
                 platform_device_unregister(mac_sonic_device);
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index 71f2c6705bc3..3cb9b3fe0cf1 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -1387,9 +1387,8 @@ static void mv643xx_netpoll(struct net_device *netdev)
  * Input :      struct device *
  * Output :     -ENOMEM if failed , 0 if success
  */
-static int mv643xx_eth_probe(struct device *ddev)
+static int mv643xx_eth_probe(struct platform_device *pdev)
 {
-        struct platform_device *pdev = to_platform_device(ddev);
         struct mv643xx_eth_platform_data *pd;
         int port_num = pdev->id;
         struct mv643xx_private *mp;
@@ -1402,7 +1401,7 @@ static int mv643xx_eth_probe(struct device *ddev)
         if (!dev)
                 return -ENOMEM;
 
-        dev_set_drvdata(ddev, dev);
+        platform_set_drvdata(pdev, dev);
 
         mp = netdev_priv(dev);
 
@@ -1546,21 +1545,20 @@ out:
         return err;
 }
 
-static int mv643xx_eth_remove(struct device *ddev)
+static int mv643xx_eth_remove(struct platform_device *pdev)
 {
-        struct net_device *dev = dev_get_drvdata(ddev);
+        struct net_device *dev = platform_get_drvdata(pdev);
 
         unregister_netdev(dev);
         flush_scheduled_work();
 
         free_netdev(dev);
-        dev_set_drvdata(ddev, NULL);
+        platform_set_drvdata(pdev, NULL);
         return 0;
 }
 
-static int mv643xx_eth_shared_probe(struct device *ddev)
+static int mv643xx_eth_shared_probe(struct platform_device *pdev)
 {
-        struct platform_device *pdev = to_platform_device(ddev);
         struct resource *res;
 
         printk(KERN_NOTICE "MV-643xx 10/100/1000 Ethernet Driver\n");
@@ -1578,7 +1576,7 @@ static int mv643xx_eth_shared_probe(struct device *ddev)
 
 }
 
-static int mv643xx_eth_shared_remove(struct device *ddev)
+static int mv643xx_eth_shared_remove(struct platform_device *pdev)
 {
         iounmap(mv643xx_eth_shared_base);
         mv643xx_eth_shared_base = NULL;
@@ -1586,18 +1584,20 @@ static int mv643xx_eth_shared_remove(struct device *ddev)
         return 0;
 }
 
-static struct device_driver mv643xx_eth_driver = {
-        .name = MV643XX_ETH_NAME,
-        .bus = &platform_bus_type,
+static struct platform_driver mv643xx_eth_driver = {
         .probe = mv643xx_eth_probe,
         .remove = mv643xx_eth_remove,
+        .driver = {
+                .name = MV643XX_ETH_NAME,
+        },
 };
 
-static struct device_driver mv643xx_eth_shared_driver = {
-        .name = MV643XX_ETH_SHARED_NAME,
-        .bus = &platform_bus_type,
+static struct platform_driver mv643xx_eth_shared_driver = {
         .probe = mv643xx_eth_shared_probe,
         .remove = mv643xx_eth_shared_remove,
+        .driver = {
+                .name = MV643XX_ETH_SHARED_NAME,
+        },
 };
 
 /*
@@ -1613,11 +1613,11 @@ static int __init mv643xx_init_module(void)
 {
         int rc;
 
-        rc = driver_register(&mv643xx_eth_shared_driver);
+        rc = platform_driver_register(&mv643xx_eth_shared_driver);
         if (!rc) {
-                rc = driver_register(&mv643xx_eth_driver);
+                rc = platform_driver_register(&mv643xx_eth_driver);
                 if (rc)
-                        driver_unregister(&mv643xx_eth_shared_driver);
+                        platform_driver_unregister(&mv643xx_eth_shared_driver);
         }
         return rc;
 }
@@ -1633,8 +1633,8 @@ static int __init mv643xx_init_module(void)
  */
 static void __exit mv643xx_cleanup_module(void)
 {
-        driver_unregister(&mv643xx_eth_driver);
-        driver_unregister(&mv643xx_eth_shared_driver);
+        platform_driver_unregister(&mv643xx_eth_driver);
+        platform_driver_unregister(&mv643xx_eth_shared_driver);
 }
 
 module_init(mv643xx_init_module);
diff --git a/drivers/net/saa9730.c b/drivers/net/saa9730.c
index 110e777f206e..b2acedbefa8f 100644
--- a/drivers/net/saa9730.c
+++ b/drivers/net/saa9730.c
@@ -1,8 +1,8 @@
 /*
- * Carsten Langgaard, carstenl@mips.com
- * Copyright (C) 2000 MIPS Technologies, Inc.  All rights reserved.
- *
- * ########################################################################
+ * Copyright (C) 2000, 2005  MIPS Technologies, Inc.  All rights reserved.
+ *      Authors: Carsten Langgaard <carstenl@mips.com>
+ *               Maciej W. Rozycki <macro@mips.com>
+ * Copyright (C) 2004 Ralf Baechle <ralf@linux-mips.org>
  *
  *  This program is free software; you can distribute it and/or modify it
  *  under the terms of the GNU General Public License (Version 2) as
@@ -17,15 +17,13 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
  *
- * ########################################################################
- *
  * SAA9730 ethernet driver.
  *
  * Changes:
- * Angelo Dell'Aera <buffer@antifork.org> : Conversion to the new PCI API (pci_driver).
- *                                          Conversion to spinlocks.
- *                                          Error handling fixes.
- *                                           
+ * Angelo Dell'Aera <buffer@antifork.org> :     Conversion to the new PCI API
+ *                                              (pci_driver).
+ *                                              Conversion to spinlocks.
+ *                                              Error handling fixes.
  */
 
 #include <linux/init.h>
@@ -36,8 +34,11 @@
 #include <linux/skbuff.h>
 #include <linux/pci.h>
 #include <linux/spinlock.h>
+#include <linux/types.h>
 
 #include <asm/addrspace.h>
+#include <asm/io.h>
+
 #include <asm/mips-boards/prom.h>
 
 #include "saa9730.h"
@@ -51,8 +52,8 @@ int lan_saa9730_debug;
 #define DRV_MODULE_NAME "saa9730"
 
 static struct pci_device_id saa9730_pci_tbl[] = {
-        { PCI_VENDOR_ID_PHILIPS, PCI_DEVICE_ID_PHILIPS_SAA9370,
-          PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
+        { PCI_VENDOR_ID_PHILIPS, PCI_DEVICE_ID_PHILIPS_SAA9730,
+          PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
         { 0, }
 };
 
@@ -61,50 +62,48 @@ MODULE_DEVICE_TABLE(pci, saa9730_pci_tbl);
 /* Non-zero only if the current card is a PCI with BIOS-set IRQ. */
 static unsigned int pci_irq_line;
 
-#define INL(a)     inl((unsigned long)a)
-#define OUTL(x,a)  outl(x,(unsigned long)a)
-
 static void evm_saa9730_enable_lan_int(struct lan_saa9730_private *lp)
 {
-        OUTL(INL(&lp->evm_saa9730_regs->InterruptBlock1) | EVM_LAN_INT,
+        outl(readl(&lp->evm_saa9730_regs->InterruptBlock1) | EVM_LAN_INT,
              &lp->evm_saa9730_regs->InterruptBlock1);
-        OUTL(INL(&lp->evm_saa9730_regs->InterruptStatus1) | EVM_LAN_INT,
+        outl(readl(&lp->evm_saa9730_regs->InterruptStatus1) | EVM_LAN_INT,
              &lp->evm_saa9730_regs->InterruptStatus1);
-        OUTL(INL(&lp->evm_saa9730_regs->InterruptEnable1) | EVM_LAN_INT |
+        outl(readl(&lp->evm_saa9730_regs->InterruptEnable1) | EVM_LAN_INT |
              EVM_MASTER_EN, &lp->evm_saa9730_regs->InterruptEnable1);
 }
+
 static void evm_saa9730_disable_lan_int(struct lan_saa9730_private *lp)
 {
-        OUTL(INL(&lp->evm_saa9730_regs->InterruptBlock1) & ~EVM_LAN_INT,
+        outl(readl(&lp->evm_saa9730_regs->InterruptBlock1) & ~EVM_LAN_INT,
              &lp->evm_saa9730_regs->InterruptBlock1);
-        OUTL(INL(&lp->evm_saa9730_regs->InterruptEnable1) & ~EVM_LAN_INT,
+        outl(readl(&lp->evm_saa9730_regs->InterruptEnable1) & ~EVM_LAN_INT,
              &lp->evm_saa9730_regs->InterruptEnable1);
 }
 
 static void evm_saa9730_clear_lan_int(struct lan_saa9730_private *lp)
 {
-        OUTL(EVM_LAN_INT, &lp->evm_saa9730_regs->InterruptStatus1);
+        outl(EVM_LAN_INT, &lp->evm_saa9730_regs->InterruptStatus1);
 }
 
 static void evm_saa9730_block_lan_int(struct lan_saa9730_private *lp)
 {
-        OUTL(INL(&lp->evm_saa9730_regs->InterruptBlock1) & ~EVM_LAN_INT,
+        outl(readl(&lp->evm_saa9730_regs->InterruptBlock1) & ~EVM_LAN_INT,
              &lp->evm_saa9730_regs->InterruptBlock1);
 }
 
 static void evm_saa9730_unblock_lan_int(struct lan_saa9730_private *lp)
 {
-        OUTL(INL(&lp->evm_saa9730_regs->InterruptBlock1) | EVM_LAN_INT,
+        outl(readl(&lp->evm_saa9730_regs->InterruptBlock1) | EVM_LAN_INT,
              &lp->evm_saa9730_regs->InterruptBlock1);
 }
 
-static void show_saa9730_regs(struct lan_saa9730_private *lp)
+static void __attribute_used__ show_saa9730_regs(struct lan_saa9730_private *lp)
 {
         int i, j;
-        printk("TxmBufferA = %x\n", lp->TxmBuffer[0][0]);
-        printk("TxmBufferB = %x\n", lp->TxmBuffer[1][0]);
-        printk("RcvBufferA = %x\n", lp->RcvBuffer[0][0]);
-        printk("RcvBufferB = %x\n", lp->RcvBuffer[1][0]);
+        printk("TxmBufferA = %p\n", lp->TxmBuffer[0][0]);
+        printk("TxmBufferB = %p\n", lp->TxmBuffer[1][0]);
+        printk("RcvBufferA = %p\n", lp->RcvBuffer[0][0]);
+        printk("RcvBufferB = %p\n", lp->RcvBuffer[1][0]);
         for (i = 0; i < LAN_SAA9730_BUFFERS; i++) {
                 for (j = 0; j < LAN_SAA9730_TXM_Q_SIZE; j++) {
                         printk("TxmBuffer[%d][%d] = %x\n", i, j,
@@ -120,13 +119,13 @@ static void show_saa9730_regs(struct lan_saa9730_private *lp)
                 }
         }
         printk("lp->evm_saa9730_regs->InterruptBlock1 = %x\n",
-               INL(&lp->evm_saa9730_regs->InterruptBlock1));
+               readl(&lp->evm_saa9730_regs->InterruptBlock1));
         printk("lp->evm_saa9730_regs->InterruptStatus1 = %x\n",
-               INL(&lp->evm_saa9730_regs->InterruptStatus1));
+               readl(&lp->evm_saa9730_regs->InterruptStatus1));
         printk("lp->evm_saa9730_regs->InterruptEnable1 = %x\n",
-               INL(&lp->evm_saa9730_regs->InterruptEnable1));
+               readl(&lp->evm_saa9730_regs->InterruptEnable1));
         printk("lp->lan_saa9730_regs->Ok2Use = %x\n",
-               INL(&lp->lan_saa9730_regs->Ok2Use));
+               readl(&lp->lan_saa9730_regs->Ok2Use));
         printk("lp->NextTxmBufferIndex = %x\n", lp->NextTxmBufferIndex);
         printk("lp->NextTxmPacketIndex = %x\n", lp->NextTxmPacketIndex);
         printk("lp->PendingTxmBufferIndex = %x\n",
@@ -134,23 +133,23 @@ static void show_saa9730_regs(struct lan_saa9730_private *lp)
         printk("lp->PendingTxmPacketIndex = %x\n",
                lp->PendingTxmPacketIndex);
         printk("lp->lan_saa9730_regs->LanDmaCtl = %x\n",
-               INL(&lp->lan_saa9730_regs->LanDmaCtl));
+               readl(&lp->lan_saa9730_regs->LanDmaCtl));
         printk("lp->lan_saa9730_regs->DmaStatus = %x\n",
-               INL(&lp->lan_saa9730_regs->DmaStatus));
+               readl(&lp->lan_saa9730_regs->DmaStatus));
         printk("lp->lan_saa9730_regs->CamCtl = %x\n",
-               INL(&lp->lan_saa9730_regs->CamCtl));
+               readl(&lp->lan_saa9730_regs->CamCtl));
         printk("lp->lan_saa9730_regs->TxCtl = %x\n",
-               INL(&lp->lan_saa9730_regs->TxCtl));
+               readl(&lp->lan_saa9730_regs->TxCtl));
         printk("lp->lan_saa9730_regs->TxStatus = %x\n",
-               INL(&lp->lan_saa9730_regs->TxStatus));
+               readl(&lp->lan_saa9730_regs->TxStatus));
         printk("lp->lan_saa9730_regs->RxCtl = %x\n",
-               INL(&lp->lan_saa9730_regs->RxCtl));
+               readl(&lp->lan_saa9730_regs->RxCtl));
         printk("lp->lan_saa9730_regs->RxStatus = %x\n",
-               INL(&lp->lan_saa9730_regs->RxStatus));
+               readl(&lp->lan_saa9730_regs->RxStatus));
         for (i = 0; i < LAN_SAA9730_CAM_DWORDS; i++) {
-                OUTL(i, &lp->lan_saa9730_regs->CamAddress);
+                outl(i, &lp->lan_saa9730_regs->CamAddress);
                 printk("lp->lan_saa9730_regs->CamData = %x\n",
-                       INL(&lp->lan_saa9730_regs->CamData));
+                       readl(&lp->lan_saa9730_regs->CamData));
         }
         printk("lp->stats.tx_packets = %lx\n", lp->stats.tx_packets);
         printk("lp->stats.tx_errors = %lx\n", lp->stats.tx_errors);
@@ -178,17 +177,17 @@ static void show_saa9730_regs(struct lan_saa9730_private *lp)
                lp->stats.rx_length_errors);
 
         printk("lp->lan_saa9730_regs->DebugPCIMasterAddr = %x\n",
-               INL(&lp->lan_saa9730_regs->DebugPCIMasterAddr));
+               readl(&lp->lan_saa9730_regs->DebugPCIMasterAddr));
         printk("lp->lan_saa9730_regs->DebugLanTxStateMachine = %x\n",
-               INL(&lp->lan_saa9730_regs->DebugLanTxStateMachine));
+               readl(&lp->lan_saa9730_regs->DebugLanTxStateMachine));
         printk("lp->lan_saa9730_regs->DebugLanRxStateMachine = %x\n",
-               INL(&lp->lan_saa9730_regs->DebugLanRxStateMachine));
+               readl(&lp->lan_saa9730_regs->DebugLanRxStateMachine));
         printk("lp->lan_saa9730_regs->DebugLanTxFifoPointers = %x\n",
-               INL(&lp->lan_saa9730_regs->DebugLanTxFifoPointers));
+               readl(&lp->lan_saa9730_regs->DebugLanTxFifoPointers));
         printk("lp->lan_saa9730_regs->DebugLanRxFifoPointers = %x\n",
-               INL(&lp->lan_saa9730_regs->DebugLanRxFifoPointers));
+               readl(&lp->lan_saa9730_regs->DebugLanRxFifoPointers));
         printk("lp->lan_saa9730_regs->DebugLanCtlStateMachine = %x\n",
-               INL(&lp->lan_saa9730_regs->DebugLanCtlStateMachine));
+               readl(&lp->lan_saa9730_regs->DebugLanCtlStateMachine));
 }
 
 static void lan_saa9730_buffer_init(struct lan_saa9730_private *lp)
@@ -214,98 +213,108 @@ static void lan_saa9730_buffer_init(struct lan_saa9730_private *lp)
         }
 }
 
-static int lan_saa9730_allocate_buffers(struct lan_saa9730_private *lp)
+static void lan_saa9730_free_buffers(struct pci_dev *pdev,
+                                     struct lan_saa9730_private *lp)
 {
-        unsigned int mem_size;
-        void *Pa;
-        unsigned int i, j, RcvBufferSize, TxmBufferSize;
-        unsigned int buffer_start;
+        pci_free_consistent(pdev, lp->buffer_size, lp->buffer_start,
+                            lp->dma_addr);
+}
 
-        /* 
-         * Allocate all RX and TX packets in one chunk. 
-         * The Rx and Tx packets must be PACKET_SIZE aligned.
-         */
-        mem_size = ((LAN_SAA9730_RCV_Q_SIZE + LAN_SAA9730_TXM_Q_SIZE) *
-                    LAN_SAA9730_PACKET_SIZE * LAN_SAA9730_BUFFERS) +
-            LAN_SAA9730_PACKET_SIZE;
-        buffer_start =
-            (unsigned int) kmalloc(mem_size, GFP_DMA | GFP_KERNEL);
-
-        if (!buffer_start)
-                return -ENOMEM;
-
-        /* 
-         * Set DMA buffer to kseg1 (uncached).
-         * Make sure to flush before using it uncached.
-         */
-        Pa = (void *) KSEG1ADDR((buffer_start + LAN_SAA9730_PACKET_SIZE) &
-                                ~(LAN_SAA9730_PACKET_SIZE - 1));
-        dma_cache_wback_inv((unsigned long) Pa, mem_size);
+static int lan_saa9730_allocate_buffers(struct pci_dev *pdev,
+                                        struct lan_saa9730_private *lp)
+{
+        void *Pa;
+        unsigned int i, j, rxoffset, txoffset;
+        int ret;
 
         /* Initialize buffer space */
-        RcvBufferSize = LAN_SAA9730_PACKET_SIZE;
-        TxmBufferSize = LAN_SAA9730_PACKET_SIZE;
         lp->DmaRcvPackets = LAN_SAA9730_RCV_Q_SIZE;
         lp->DmaTxmPackets = LAN_SAA9730_TXM_Q_SIZE;
 
+        /* Initialize Rx Buffer Index */
+        lp->NextRcvPacketIndex = 0;
+        lp->NextRcvBufferIndex = 0;
+
+        /* Set current buffer index & next available packet index */
+        lp->NextTxmPacketIndex = 0;
+        lp->NextTxmBufferIndex = 0;
+        lp->PendingTxmPacketIndex = 0;
+        lp->PendingTxmBufferIndex = 0;
+
+        /*
+         * Allocate all RX and TX packets in one chunk.
+         * The Rx and Tx packets must be PACKET_SIZE aligned.
+         */
+        lp->buffer_size = ((LAN_SAA9730_RCV_Q_SIZE + LAN_SAA9730_TXM_Q_SIZE) *
+                           LAN_SAA9730_PACKET_SIZE * LAN_SAA9730_BUFFERS) +
+                          LAN_SAA9730_PACKET_SIZE;
+        lp->buffer_start = pci_alloc_consistent(pdev, lp->buffer_size,
+                                                &lp->dma_addr);
+        if (!lp->buffer_start) {
+                ret = -ENOMEM;
+                goto out;
+        }
+
+        Pa = (void *)ALIGN((unsigned long)lp->buffer_start,
+                           LAN_SAA9730_PACKET_SIZE);
+
+        rxoffset = Pa - lp->buffer_start;
+
         /* Init RX buffers */
         for (i = 0; i < LAN_SAA9730_BUFFERS; i++) {
                 for (j = 0; j < LAN_SAA9730_RCV_Q_SIZE; j++) {
                         *(unsigned int *) Pa =
                             cpu_to_le32(RXSF_READY <<
                                         RX_STAT_CTL_OWNER_SHF);
-                        lp->RcvBuffer[i][j] = (unsigned int) Pa;
-                        Pa += RcvBufferSize;
+                        lp->RcvBuffer[i][j] = Pa;
+                        Pa += LAN_SAA9730_PACKET_SIZE;
                 }
         }
 
+        txoffset = Pa - lp->buffer_start;
+
         /* Init TX buffers */
         for (i = 0; i < LAN_SAA9730_BUFFERS; i++) {
                 for (j = 0; j < LAN_SAA9730_TXM_Q_SIZE; j++) {
                         *(unsigned int *) Pa =
                             cpu_to_le32(TXSF_EMPTY <<
                                         TX_STAT_CTL_OWNER_SHF);
-                        lp->TxmBuffer[i][j] = (unsigned int) Pa;
-                        Pa += TxmBufferSize;
+                        lp->TxmBuffer[i][j] = Pa;
+                        Pa += LAN_SAA9730_PACKET_SIZE;
                 }
         }
 
-        /* 
-         * Set rx buffer A and rx buffer B to point to the first two buffer 
+        /*
+         * Set rx buffer A and rx buffer B to point to the first two buffer
          * spaces.
          */
-        OUTL(PHYSADDR(lp->RcvBuffer[0][0]),
+        outl(lp->dma_addr + rxoffset,
              &lp->lan_saa9730_regs->RxBuffA);
-        OUTL(PHYSADDR(lp->RcvBuffer[1][0]),
+        outl(lp->dma_addr + rxoffset +
+             LAN_SAA9730_PACKET_SIZE * LAN_SAA9730_RCV_Q_SIZE,
              &lp->lan_saa9730_regs->RxBuffB);
 
-        /* Initialize Buffer Index */
-        lp->NextRcvPacketIndex = 0;
-        lp->NextRcvToUseIsA = 1;
-
-        /* Set current buffer index & next availble packet index */
-        lp->NextTxmPacketIndex = 0;
-        lp->NextTxmBufferIndex = 0;
-        lp->PendingTxmPacketIndex = 0;
-        lp->PendingTxmBufferIndex = 0;
-
-        /* 
+        /*
          * Set txm_buf_a and txm_buf_b to point to the first two buffer
-         * space 
+         * space
          */
-        OUTL(PHYSADDR(lp->TxmBuffer[0][0]),
+        outl(lp->dma_addr + txoffset,
              &lp->lan_saa9730_regs->TxBuffA);
-        OUTL(PHYSADDR(lp->TxmBuffer[1][0]),
+        outl(lp->dma_addr + txoffset +
+             LAN_SAA9730_PACKET_SIZE * LAN_SAA9730_TXM_Q_SIZE,
              &lp->lan_saa9730_regs->TxBuffB);
 
         /* Set packet number */
-        OUTL((lp->DmaRcvPackets << PK_COUNT_RX_A_SHF) |
+        outl((lp->DmaRcvPackets << PK_COUNT_RX_A_SHF) |
              (lp->DmaRcvPackets << PK_COUNT_RX_B_SHF) |
              (lp->DmaTxmPackets << PK_COUNT_TX_A_SHF) |
              (lp->DmaTxmPackets << PK_COUNT_TX_B_SHF),
              &lp->lan_saa9730_regs->PacketCount);
 
         return 0;
+
+out:
+        return ret;
 }
 
 static int lan_saa9730_cam_load(struct lan_saa9730_private *lp)
@@ -317,8 +326,8 @@ static int lan_saa9730_cam_load(struct lan_saa9730_private *lp)
 
         for (i = 0; i < LAN_SAA9730_CAM_DWORDS; i++) {
                 /* First set address to where data is written */
-                OUTL(i, &lp->lan_saa9730_regs->CamAddress);
-                OUTL((NetworkAddress[0] << 24) | (NetworkAddress[1] << 16)
+                outl(i, &lp->lan_saa9730_regs->CamAddress);
+                outl((NetworkAddress[0] << 24) | (NetworkAddress[1] << 16)
                      | (NetworkAddress[2] << 8) | NetworkAddress[3],
                      &lp->lan_saa9730_regs->CamData);
                 NetworkAddress += 4;
@@ -328,8 +337,7 @@ static int lan_saa9730_cam_load(struct lan_saa9730_private *lp)
 
 static int lan_saa9730_cam_init(struct net_device *dev)
 {
-        struct lan_saa9730_private *lp =
-            (struct lan_saa9730_private *) dev->priv;
+        struct lan_saa9730_private *lp = netdev_priv(dev);
         unsigned int i;
 
         /* Copy MAC-address into all entries. */
@@ -347,7 +355,7 @@ static int lan_saa9730_mii_init(struct lan_saa9730_private *lp)
 
         /* Check link status, spin here till station is not busy. */
         i = 0;
-        while (INL(&lp->lan_saa9730_regs->StationMgmtCtl) & MD_CA_BUSY) {
+        while (readl(&lp->lan_saa9730_regs->StationMgmtCtl) & MD_CA_BUSY) {
                 i++;
                 if (i > 100) {
                         printk("Error: lan_saa9730_mii_init: timeout\n");
@@ -357,12 +365,12 @@ static int lan_saa9730_mii_init(struct lan_saa9730_private *lp)
         }
 
         /* Now set the control and address register. */
-        OUTL(MD_CA_BUSY | PHY_STATUS | PHY_ADDRESS << MD_CA_PHY_SHF,
+        outl(MD_CA_BUSY | PHY_STATUS | PHY_ADDRESS << MD_CA_PHY_SHF,
              &lp->lan_saa9730_regs->StationMgmtCtl);
 
         /* check link status, spin here till station is not busy */
         i = 0;
-        while (INL(&lp->lan_saa9730_regs->StationMgmtCtl) & MD_CA_BUSY) {
+        while (readl(&lp->lan_saa9730_regs->StationMgmtCtl) & MD_CA_BUSY) {
                 i++;
                 if (i > 100) {
                         printk("Error: lan_saa9730_mii_init: timeout\n");
@@ -375,7 +383,7 @@ static int lan_saa9730_mii_init(struct lan_saa9730_private *lp)
         mdelay(1);
 
         /* Check the link status. */
-        if (INL(&lp->lan_saa9730_regs->StationMgmtData) &
+        if (readl(&lp->lan_saa9730_regs->StationMgmtData) &
             PHY_STATUS_LINK_UP) {
                 /* Link is up. */
                 return 0;
@@ -383,14 +391,14 @@ static int lan_saa9730_mii_init(struct lan_saa9730_private *lp)
                 /* Link is down, reset the PHY first. */
 
                 /* set PHY address = 'CONTROL' */
-                OUTL(PHY_ADDRESS << MD_CA_PHY_SHF | MD_CA_WR | PHY_CONTROL,
+                outl(PHY_ADDRESS << MD_CA_PHY_SHF | MD_CA_WR | PHY_CONTROL,
                      &lp->lan_saa9730_regs->StationMgmtCtl);
 
                 /* Wait for 1 ms. */
                 mdelay(1);
 
                 /* set 'CONTROL' = force reset and renegotiate */
-                OUTL(PHY_CONTROL_RESET | PHY_CONTROL_AUTO_NEG |
+                outl(PHY_CONTROL_RESET | PHY_CONTROL_AUTO_NEG |
                      PHY_CONTROL_RESTART_AUTO_NEG,
                      &lp->lan_saa9730_regs->StationMgmtData);
 
@@ -398,12 +406,12 @@ static int lan_saa9730_mii_init(struct lan_saa9730_private *lp)
                 mdelay(50);
 
                 /* set 'BUSY' to start operation */
-                OUTL(MD_CA_BUSY | PHY_ADDRESS << MD_CA_PHY_SHF | MD_CA_WR |
+                outl(MD_CA_BUSY | PHY_ADDRESS << MD_CA_PHY_SHF | MD_CA_WR |
                      PHY_CONTROL, &lp->lan_saa9730_regs->StationMgmtCtl);
 
                 /* await completion */
                 i = 0;
-                while (INL(&lp->lan_saa9730_regs->StationMgmtCtl) &
+                while (readl(&lp->lan_saa9730_regs->StationMgmtCtl) &
                        MD_CA_BUSY) {
                         i++;
                         if (i > 100) {
@@ -419,13 +427,13 @@ static int lan_saa9730_mii_init(struct lan_saa9730_private *lp)
 
                 for (l = 0; l < 2; l++) {
                         /* set PHY address = 'STATUS' */
-                        OUTL(MD_CA_BUSY | PHY_ADDRESS << MD_CA_PHY_SHF |
+                        outl(MD_CA_BUSY | PHY_ADDRESS << MD_CA_PHY_SHF |
                              PHY_STATUS,
                              &lp->lan_saa9730_regs->StationMgmtCtl);
 
                         /* await completion */
                         i = 0;
-                        while (INL(&lp->lan_saa9730_regs->StationMgmtCtl) &
+                        while (readl(&lp->lan_saa9730_regs->StationMgmtCtl) &
                                MD_CA_BUSY) {
                                 i++;
                                 if (i > 100) {
@@ -440,7 +448,7 @@ static int lan_saa9730_mii_init(struct lan_saa9730_private *lp)
                         mdelay(3000);
 
                         /* check the link status */
-                        if (INL(&lp->lan_saa9730_regs->StationMgmtData) &
+                        if (readl(&lp->lan_saa9730_regs->StationMgmtData) &
                             PHY_STATUS_LINK_UP) {
                                 /* link is up */
                                 break;
@@ -454,7 +462,7 @@ static int lan_saa9730_mii_init(struct lan_saa9730_private *lp)
 static int lan_saa9730_control_init(struct lan_saa9730_private *lp)
 {
         /* Initialize DMA control register. */
-        OUTL((LANMB_ANY << DMA_CTL_MAX_XFER_SHF) |
+        outl((LANMB_ANY << DMA_CTL_MAX_XFER_SHF) |
              (LANEND_LITTLE << DMA_CTL_ENDIAN_SHF) |
              (LAN_SAA9730_RCV_Q_INT_THRESHOLD << DMA_CTL_RX_INT_COUNT_SHF)
              | DMA_CTL_RX_INT_TO_EN | DMA_CTL_RX_INT_EN |
@@ -462,27 +470,27 @@ static int lan_saa9730_control_init(struct lan_saa9730_private *lp)
              &lp->lan_saa9730_regs->LanDmaCtl);
 
         /* Initial MAC control register. */
-        OUTL((MACCM_MII << MAC_CONTROL_CONN_SHF) | MAC_CONTROL_FULL_DUP,
+        outl((MACCM_MII << MAC_CONTROL_CONN_SHF) | MAC_CONTROL_FULL_DUP,
              &lp->lan_saa9730_regs->MacCtl);
 
         /* Initialize CAM control register. */
-        OUTL(CAM_CONTROL_COMP_EN | CAM_CONTROL_BROAD_ACC,
+        outl(CAM_CONTROL_COMP_EN | CAM_CONTROL_BROAD_ACC,
              &lp->lan_saa9730_regs->CamCtl);
 
-        /* 
+        /*
          * Initialize CAM enable register, only turn on first entry, should
-         * contain own addr. 
+         * contain own addr.
          */
-        OUTL(0x0001, &lp->lan_saa9730_regs->CamEnable);
+        outl(0x0001, &lp->lan_saa9730_regs->CamEnable);
 
         /* Initialize Tx control register */
-        OUTL(TX_CTL_EN_COMP, &lp->lan_saa9730_regs->TxCtl);
+        outl(TX_CTL_EN_COMP, &lp->lan_saa9730_regs->TxCtl);
 
         /* Initialize Rcv control register */
-        OUTL(RX_CTL_STRIP_CRC, &lp->lan_saa9730_regs->RxCtl);
+        outl(RX_CTL_STRIP_CRC, &lp->lan_saa9730_regs->RxCtl);
 
         /* Reset DMA engine */
-        OUTL(DMA_TEST_SW_RESET, &lp->lan_saa9730_regs->DmaTest);
+        outl(DMA_TEST_SW_RESET, &lp->lan_saa9730_regs->DmaTest);
 
         return 0;
 }
@@ -492,21 +500,21 @@ static int lan_saa9730_stop(struct lan_saa9730_private *lp)
         int i;
 
         /* Stop DMA first */
-        OUTL(INL(&lp->lan_saa9730_regs->LanDmaCtl) &
+        outl(readl(&lp->lan_saa9730_regs->LanDmaCtl) &
              ~(DMA_CTL_EN_TX_DMA | DMA_CTL_EN_RX_DMA),
              &lp->lan_saa9730_regs->LanDmaCtl);
 
         /* Set the SW Reset bits in DMA and MAC control registers */
-        OUTL(DMA_TEST_SW_RESET, &lp->lan_saa9730_regs->DmaTest);
-        OUTL(INL(&lp->lan_saa9730_regs->MacCtl) | MAC_CONTROL_RESET,
+        outl(DMA_TEST_SW_RESET, &lp->lan_saa9730_regs->DmaTest);
+        outl(readl(&lp->lan_saa9730_regs->MacCtl) | MAC_CONTROL_RESET,
              &lp->lan_saa9730_regs->MacCtl);
 
-        /* 
+        /*
          * Wait for MAC reset to have finished. The reset bit is auto cleared
          * when the reset is done.
          */
         i = 0;
-        while (INL(&lp->lan_saa9730_regs->MacCtl) & MAC_CONTROL_RESET) {
+        while (readl(&lp->lan_saa9730_regs->MacCtl) & MAC_CONTROL_RESET) {
                 i++;
                 if (i > 100) {
                         printk
@@ -524,7 +532,7 @@ static int lan_saa9730_dma_init(struct lan_saa9730_private *lp)
         /* Stop lan controller. */
         lan_saa9730_stop(lp);
 
-        OUTL(LAN_SAA9730_DEFAULT_TIME_OUT_CNT,
+        outl(LAN_SAA9730_DEFAULT_TIME_OUT_CNT,
              &lp->lan_saa9730_regs->Timeout);
 
         return 0;
@@ -536,28 +544,27 @@ static int lan_saa9730_start(struct lan_saa9730_private *lp)
 
         /* Initialize Rx Buffer Index */
         lp->NextRcvPacketIndex = 0;
-        lp->NextRcvToUseIsA = 1;
+        lp->NextRcvBufferIndex = 0;
 
-        /* Set current buffer index & next availble packet index */
+        /* Set current buffer index & next available packet index */
         lp->NextTxmPacketIndex = 0;
         lp->NextTxmBufferIndex = 0;
         lp->PendingTxmPacketIndex = 0;
         lp->PendingTxmBufferIndex = 0;
 
-        OUTL(INL(&lp->lan_saa9730_regs->LanDmaCtl) | DMA_CTL_EN_TX_DMA |
+        outl(readl(&lp->lan_saa9730_regs->LanDmaCtl) | DMA_CTL_EN_TX_DMA |
              DMA_CTL_EN_RX_DMA, &lp->lan_saa9730_regs->LanDmaCtl);
 
         /* For Tx, turn on MAC then DMA */
-        OUTL(INL(&lp->lan_saa9730_regs->TxCtl) | TX_CTL_TX_EN,
+        outl(readl(&lp->lan_saa9730_regs->TxCtl) | TX_CTL_TX_EN,
              &lp->lan_saa9730_regs->TxCtl);
 
         /* For Rx, turn on DMA then MAC */
-        OUTL(INL(&lp->lan_saa9730_regs->RxCtl) | RX_CTL_RX_EN,
+        outl(readl(&lp->lan_saa9730_regs->RxCtl) | RX_CTL_RX_EN,
              &lp->lan_saa9730_regs->RxCtl);
 
-        /* Set Ok2Use to let hardware owns the buffers */
-        OUTL(OK2USE_RX_A | OK2USE_RX_B | OK2USE_TX_A | OK2USE_TX_B,
-             &lp->lan_saa9730_regs->Ok2Use);
+        /* Set Ok2Use to let hardware own the buffers.  */
+        outl(OK2USE_RX_A | OK2USE_RX_B, &lp->lan_saa9730_regs->Ok2Use);
 
         return 0;
 }
@@ -572,8 +579,7 @@ static int lan_saa9730_restart(struct lan_saa9730_private *lp)
 
 static int lan_saa9730_tx(struct net_device *dev)
 {
-        struct lan_saa9730_private *lp =
-            (struct lan_saa9730_private *) dev->priv;
+        struct lan_saa9730_private *lp = netdev_priv(dev);
         unsigned int *pPacket;
         unsigned int tx_status;
 
@@ -581,13 +587,11 @@ static int lan_saa9730_tx(struct net_device *dev)
                 printk("lan_saa9730_tx interrupt\n");
 
         /* Clear interrupt. */
-        OUTL(DMA_STATUS_MAC_TX_INT, &lp->lan_saa9730_regs->DmaStatus);
+        outl(DMA_STATUS_MAC_TX_INT, &lp->lan_saa9730_regs->DmaStatus);
 
         while (1) {
-                pPacket =
-                    (unsigned int *) lp->TxmBuffer[lp->
-                                                   PendingTxmBufferIndex]
-                    [lp->PendingTxmPacketIndex];
+                pPacket = lp->TxmBuffer[lp->PendingTxmBufferIndex]
+                                       [lp->PendingTxmPacketIndex];
 
                 /* Get status of first packet transmitted. */
                 tx_status = le32_to_cpu(*pPacket);
@@ -605,23 +609,22 @@ static int lan_saa9730_tx(struct net_device *dev)
                         lp->stats.tx_errors++;
                         if (tx_status &
                             (TX_STATUS_EX_COLL << TX_STAT_CTL_STATUS_SHF))
-                                    lp->stats.tx_aborted_errors++;
+                                lp->stats.tx_aborted_errors++;
                         if (tx_status &
-                            (TX_STATUS_LATE_COLL <<
-                             TX_STAT_CTL_STATUS_SHF)) lp->stats.
-             tx_window_errors++;
+                            (TX_STATUS_LATE_COLL << TX_STAT_CTL_STATUS_SHF))
+                                lp->stats.tx_window_errors++;
                         if (tx_status &
                             (TX_STATUS_L_CARR << TX_STAT_CTL_STATUS_SHF))
-                                    lp->stats.tx_carrier_errors++;
+                                lp->stats.tx_carrier_errors++;
                         if (tx_status &
                             (TX_STATUS_UNDER << TX_STAT_CTL_STATUS_SHF))
-                                    lp->stats.tx_fifo_errors++;
+                                lp->stats.tx_fifo_errors++;
                         if (tx_status &
                             (TX_STATUS_SQ_ERR << TX_STAT_CTL_STATUS_SHF))
-                                    lp->stats.tx_heartbeat_errors++;
+                                lp->stats.tx_heartbeat_errors++;
 
                         lp->stats.collisions +=
-                            tx_status & TX_STATUS_TX_COLL_MSK;
+                                tx_status & TX_STATUS_TX_COLL_MSK;
                 }
 
                 /* Free buffer. */
@@ -636,21 +639,15 @@ static int lan_saa9730_tx(struct net_device *dev)
                 }
         }
 
-        /* Make sure A and B are available to hardware. */
-        OUTL(OK2USE_TX_A | OK2USE_TX_B, &lp->lan_saa9730_regs->Ok2Use);
-
-        if (netif_queue_stopped(dev)) {
-                /* The tx buffer is no longer full. */
-                netif_wake_queue(dev);
-        }
+        /* The tx buffer is no longer full. */
+        netif_wake_queue(dev);
 
         return 0;
 }
 
 static int lan_saa9730_rx(struct net_device *dev)
 {
-        struct lan_saa9730_private *lp =
-            (struct lan_saa9730_private *) dev->priv;
+        struct lan_saa9730_private *lp = netdev_priv(dev);
         int len = 0;
         struct sk_buff *skb = 0;
         unsigned int rx_status;
@@ -663,16 +660,13 @@ static int lan_saa9730_rx(struct net_device *dev)
                 printk("lan_saa9730_rx interrupt\n");
 
         /* Clear receive interrupts. */
-        OUTL(DMA_STATUS_MAC_RX_INT | DMA_STATUS_RX_INT |
+        outl(DMA_STATUS_MAC_RX_INT | DMA_STATUS_RX_INT |
              DMA_STATUS_RX_TO_INT, &lp->lan_saa9730_regs->DmaStatus);
 
         /* Address next packet */
-        if (lp->NextRcvToUseIsA)
-                BufferIndex = 0;
-        else
-                BufferIndex = 1;
+        BufferIndex = lp->NextRcvBufferIndex;
         PacketIndex = lp->NextRcvPacketIndex;
-        pPacket = (unsigned int *) lp->RcvBuffer[BufferIndex][PacketIndex];
+        pPacket = lp->RcvBuffer[BufferIndex][PacketIndex];
         rx_status = le32_to_cpu(*pPacket);
 
         /* Process each packet. */
@@ -715,51 +709,39 @@ static int lan_saa9730_rx(struct net_device *dev)
                         lp->stats.rx_errors++;
                         if (rx_status &
                             (RX_STATUS_CRC_ERR << RX_STAT_CTL_STATUS_SHF))
-                                    lp->stats.rx_crc_errors++;
+                                lp->stats.rx_crc_errors++;
                         if (rx_status &
-                            (RX_STATUS_ALIGN_ERR <<
-                             RX_STAT_CTL_STATUS_SHF)) lp->stats.
-             rx_frame_errors++;
+                            (RX_STATUS_ALIGN_ERR << RX_STAT_CTL_STATUS_SHF))
+                                lp->stats.rx_frame_errors++;
                         if (rx_status &
                             (RX_STATUS_OVERFLOW << RX_STAT_CTL_STATUS_SHF))
-                                    lp->stats.rx_fifo_errors++;
+                                lp->stats.rx_fifo_errors++;
                         if (rx_status &
                             (RX_STATUS_LONG_ERR << RX_STAT_CTL_STATUS_SHF))
-                                    lp->stats.rx_length_errors++;
+                                lp->stats.rx_length_errors++;
                 }
 
                 /* Indicate we have processed the buffer. */
-                *pPacket =
-                    cpu_to_le32(RXSF_READY << RX_STAT_CTL_OWNER_SHF);
+                *pPacket = cpu_to_le32(RXSF_READY << RX_STAT_CTL_OWNER_SHF);
+
+                /* Make sure A or B is available to hardware as appropriate. */
+                outl(BufferIndex ? OK2USE_RX_B : OK2USE_RX_A,
+                     &lp->lan_saa9730_regs->Ok2Use);
 
                 /* Go to next packet in sequence. */
                 lp->NextRcvPacketIndex++;
                 if (lp->NextRcvPacketIndex >= LAN_SAA9730_RCV_Q_SIZE) {
                         lp->NextRcvPacketIndex = 0;
-                        if (BufferIndex) {
-                                lp->NextRcvToUseIsA = 1;
-                        } else {
-                                lp->NextRcvToUseIsA = 0;
-                        }
+                        lp->NextRcvBufferIndex ^= 1;
                 }
-                OUTL(OK2USE_RX_A | OK2USE_RX_B,
-                     &lp->lan_saa9730_regs->Ok2Use);
 
                 /* Address next packet */
-                if (lp->NextRcvToUseIsA)
-                        BufferIndex = 0;
-                else
-                        BufferIndex = 1;
+                BufferIndex = lp->NextRcvBufferIndex;
                 PacketIndex = lp->NextRcvPacketIndex;
-                pPacket =
-                    (unsigned int *) lp->
-                    RcvBuffer[BufferIndex][PacketIndex];
+                pPacket = lp->RcvBuffer[BufferIndex][PacketIndex];
                 rx_status = le32_to_cpu(*pPacket);
         }
 
-        /* Make sure A and B are available to hardware. */
-        OUTL(OK2USE_RX_A | OK2USE_RX_B, &lp->lan_saa9730_regs->Ok2Use);
-
         return 0;
 }
 
@@ -767,8 +749,7 @@ static irqreturn_t lan_saa9730_interrupt(const int irq, void *dev_id,
                                   struct pt_regs *regs)
 {
         struct net_device *dev = (struct net_device *) dev_id;
-        struct lan_saa9730_private *lp =
-            (struct lan_saa9730_private *) dev->priv;
+        struct lan_saa9730_private *lp = netdev_priv(dev);
 
         if (lan_saa9730_debug > 5)
                 printk("lan_saa9730_interrupt\n");
@@ -780,11 +761,11 @@ static irqreturn_t lan_saa9730_interrupt(const int irq, void *dev_id,
         evm_saa9730_clear_lan_int(lp);
 
         /* Service pending transmit interrupts. */
-        if (INL(&lp->lan_saa9730_regs->DmaStatus) & DMA_STATUS_MAC_TX_INT)
+        if (readl(&lp->lan_saa9730_regs->DmaStatus) & DMA_STATUS_MAC_TX_INT)
                 lan_saa9730_tx(dev);
 
         /* Service pending receive interrupts. */
-        if (INL(&lp->lan_saa9730_regs->DmaStatus) &
+        if (readl(&lp->lan_saa9730_regs->DmaStatus) &
             (DMA_STATUS_MAC_RX_INT | DMA_STATUS_RX_INT |
              DMA_STATUS_RX_TO_INT)) lan_saa9730_rx(dev);
 
@@ -794,15 +775,9 @@ static irqreturn_t lan_saa9730_interrupt(const int irq, void *dev_id,
         return IRQ_HANDLED;
 }
 
-static int lan_saa9730_open_fail(struct net_device *dev)
-{
-        return -ENODEV;
-}
-
 static int lan_saa9730_open(struct net_device *dev)
 {
-        struct lan_saa9730_private *lp =
-            (struct lan_saa9730_private *) dev->priv;
+        struct lan_saa9730_private *lp = netdev_priv(dev);
 
         /* Associate IRQ with lan_saa9730_interrupt */
         if (request_irq(dev->irq, &lan_saa9730_interrupt, 0, "SAA9730 Eth",
@@ -834,15 +809,13 @@ static int lan_saa9730_write(struct lan_saa9730_private *lp,
         int PacketIndex;
 
         if (lan_saa9730_debug > 5)
-                printk("lan_saa9730_write: skb=%08x\n",
-                       (unsigned int) skb);
+                printk("lan_saa9730_write: skb=%p\n", skb);
 
         BufferIndex = lp->NextTxmBufferIndex;
         PacketIndex = lp->NextTxmPacketIndex;
 
-        tx_status =
-            le32_to_cpu(*(unsigned int *) lp->
-                        TxmBuffer[BufferIndex][PacketIndex]);
+        tx_status = le32_to_cpu(*(unsigned int *)lp->TxmBuffer[BufferIndex]
+                                                              [PacketIndex]);
         if ((tx_status & TX_STAT_CTL_OWNER_MSK) !=
             (TXSF_EMPTY << TX_STAT_CTL_OWNER_SHF)) {
                 if (lan_saa9730_debug > 4)
@@ -858,29 +831,29 @@ static int lan_saa9730_write(struct lan_saa9730_private *lp,
                 lp->NextTxmBufferIndex ^= 1;
         }
 
-        pbPacketData =
-            (unsigned char *) lp->TxmBuffer[BufferIndex][PacketIndex];
+        pbPacketData = lp->TxmBuffer[BufferIndex][PacketIndex];
         pbPacketData += 4;
 
         /* copy the bits */
         memcpy(pbPacketData, pbData, len);
 
         /* Set transmit status for hardware */
-        *(unsigned int *) lp->TxmBuffer[BufferIndex][PacketIndex] =
-            cpu_to_le32((TXSF_READY << TX_STAT_CTL_OWNER_SHF) |
-                        (TX_STAT_CTL_INT_AFTER_TX << TX_STAT_CTL_FRAME_SHF)
-                        | (len << TX_STAT_CTL_LENGTH_SHF));
-
-        /* Set hardware tx buffer. */
-        OUTL(OK2USE_TX_A | OK2USE_TX_B, &lp->lan_saa9730_regs->Ok2Use);
+        *(unsigned int *)lp->TxmBuffer[BufferIndex][PacketIndex] =
+                cpu_to_le32((TXSF_READY << TX_STAT_CTL_OWNER_SHF) |
+                            (TX_STAT_CTL_INT_AFTER_TX <<
+                             TX_STAT_CTL_FRAME_SHF) |
+                            (len << TX_STAT_CTL_LENGTH_SHF));
+
+        /* Make sure A or B is available to hardware as appropriate. */
+        outl(BufferIndex ? OK2USE_TX_B : OK2USE_TX_A,
+             &lp->lan_saa9730_regs->Ok2Use);
 
         return 0;
 }
 
 static void lan_saa9730_tx_timeout(struct net_device *dev)
 {
-        struct lan_saa9730_private *lp =
-            (struct lan_saa9730_private *) dev->priv;
+        struct lan_saa9730_private *lp = netdev_priv(dev);
 
         /* Transmitter timeout, serious problems */
         lp->stats.tx_errors++;
@@ -889,20 +862,19 @@ static void lan_saa9730_tx_timeout(struct net_device *dev)
         lan_saa9730_restart(lp);
 
         dev->trans_start = jiffies;
-        netif_start_queue(dev);
+        netif_wake_queue(dev);
 }
 
 static int lan_saa9730_start_xmit(struct sk_buff *skb,
                                   struct net_device *dev)
 {
-        struct lan_saa9730_private *lp =
-            (struct lan_saa9730_private *) dev->priv;
+        struct lan_saa9730_private *lp = netdev_priv(dev);
         unsigned long flags;
         int skblen;
         int len;
 
         if (lan_saa9730_debug > 4)
-                printk("Send packet: skb=%08x\n", (unsigned int) skb);
+                printk("Send packet: skb=%p\n", skb);
 
         skblen = skb->len;
 
@@ -912,8 +884,7 @@ static int lan_saa9730_start_xmit(struct sk_buff *skb,
 
         if (lan_saa9730_write(lp, skb, skblen)) {
                 spin_unlock_irqrestore(&lp->lock, flags);
-                printk("Error when writing packet to controller: skb=%08x\n",
-                     (unsigned int) skb);
+                printk("Error when writing packet to controller: skb=%p\n", skb);
                 netif_stop_queue(dev);
                 return -1;
         }
@@ -922,7 +893,7 @@ static int lan_saa9730_start_xmit(struct sk_buff *skb,
         lp->stats.tx_packets++;
 
         dev->trans_start = jiffies;
-        netif_start_queue(dev);
+        netif_wake_queue(dev);
         dev_kfree_skb(skb);
 
         spin_unlock_irqrestore(&lp->lock, flags);
@@ -932,8 +903,7 @@ static int lan_saa9730_start_xmit(struct sk_buff *skb,
 
 static int lan_saa9730_close(struct net_device *dev)
 {
-        struct lan_saa9730_private *lp =
-            (struct lan_saa9730_private *) dev->priv;
+        struct lan_saa9730_private *lp = netdev_priv(dev);
 
         if (lan_saa9730_debug > 1)
                 printk("lan_saa9730_close:\n");
@@ -955,33 +925,31 @@ static int lan_saa9730_close(struct net_device *dev)
 static struct net_device_stats *lan_saa9730_get_stats(struct net_device
                                                       *dev)
 {
-        struct lan_saa9730_private *lp =
-            (struct lan_saa9730_private *) dev->priv;
+        struct lan_saa9730_private *lp = netdev_priv(dev);
 
         return &lp->stats;
 }
 
 static void lan_saa9730_set_multicast(struct net_device *dev)
 {
-        struct lan_saa9730_private *lp =
-            (struct lan_saa9730_private *) dev->priv;
+        struct lan_saa9730_private *lp = netdev_priv(dev);
 
         /* Stop the controller */
         lan_saa9730_stop(lp);
 
         if (dev->flags & IFF_PROMISC) {
                 /* accept all packets */
-                OUTL(CAM_CONTROL_COMP_EN | CAM_CONTROL_STATION_ACC |
+                outl(CAM_CONTROL_COMP_EN | CAM_CONTROL_STATION_ACC |
                      CAM_CONTROL_GROUP_ACC | CAM_CONTROL_BROAD_ACC,
                      &lp->lan_saa9730_regs->CamCtl);
         } else {
                 if (dev->flags & IFF_ALLMULTI) {
                         /* accept all multicast packets */
-                        OUTL(CAM_CONTROL_COMP_EN | CAM_CONTROL_GROUP_ACC |
+                        outl(CAM_CONTROL_COMP_EN | CAM_CONTROL_GROUP_ACC |
                              CAM_CONTROL_BROAD_ACC,
                              &lp->lan_saa9730_regs->CamCtl);
                 } else {
-                        /* 
+                        /*
                          * Will handle the multicast stuff later. -carstenl
                          */
                 }
@@ -993,91 +961,86 @@ static void lan_saa9730_set_multicast(struct net_device *dev)
 
 static void __devexit saa9730_remove_one(struct pci_dev *pdev)
 {
-        struct net_device *dev = pci_get_drvdata(pdev);
-
-        if (dev) {
-                unregister_netdev(dev);
-                kfree(dev->priv);
-                free_netdev(dev);
-                pci_release_regions(pdev);
-                pci_disable_device(pdev);
-                pci_set_drvdata(pdev, NULL);
-        }
+        struct net_device *dev = pci_get_drvdata(pdev);
+        struct lan_saa9730_private *lp = netdev_priv(dev);
+
+        if (dev) {
+                unregister_netdev(dev);
+                lan_saa9730_free_buffers(pdev, lp);
+                iounmap(lp->lan_saa9730_regs);
+                iounmap(lp->evm_saa9730_regs);
+                free_netdev(dev);
+                pci_release_regions(pdev);
+                pci_disable_device(pdev);
+                pci_set_drvdata(pdev, NULL);
+        }
 }
 
 
-static int lan_saa9730_init(struct net_device *dev, int ioaddr, int irq)
+static int lan_saa9730_init(struct net_device *dev, struct pci_dev *pdev,
+        unsigned long ioaddr, int irq)
 {
-        struct lan_saa9730_private *lp;
+        struct lan_saa9730_private *lp = netdev_priv(dev);
         unsigned char ethernet_addr[6];
-        int ret = 0;
+        int ret;
 
-        dev->open = lan_saa9730_open_fail;
+        if (get_ethernet_addr(ethernet_addr)) {
+                ret = -ENODEV;
+                goto out;
+        }
 
-        if (get_ethernet_addr(ethernet_addr))
-                return -ENODEV;
-        
         memcpy(dev->dev_addr, ethernet_addr, 6);
         dev->base_addr = ioaddr;
         dev->irq = irq;
-        
-        /* 
-         * Make certain the data structures used by the controller are aligned 
-         * and DMAble. 
-         */
-        /*
-         *  XXX: that is obviously broken - kfree() won't be happy with us.
-         */
-        lp = (struct lan_saa9730_private *) (((unsigned long)
-                                              kmalloc(sizeof(*lp) + 7,
-                                                      GFP_DMA | GFP_KERNEL)
-                                              + 7) & ~7);
 
-        if (!lp)
-                return -ENOMEM;
-
-        dev->priv = lp;
-        memset(lp, 0, sizeof(*lp));
+        lp->pci_dev = pdev;
 
         /* Set SAA9730 LAN base address. */
-        lp->lan_saa9730_regs = (t_lan_saa9730_regmap *) (ioaddr +
-                                                         SAA9730_LAN_REGS_ADDR);
+        lp->lan_saa9730_regs = ioremap(ioaddr + SAA9730_LAN_REGS_ADDR,
+                                       SAA9730_LAN_REGS_SIZE);
+        if (!lp->lan_saa9730_regs) {
+                ret = -ENOMEM;
+                goto out;
+        }
 
         /* Set SAA9730 EVM base address. */
-        lp->evm_saa9730_regs = (t_evm_saa9730_regmap *) (ioaddr +
-                                                         SAA9730_EVM_REGS_ADDR);
+        lp->evm_saa9730_regs = ioremap(ioaddr + SAA9730_EVM_REGS_ADDR,
+                                       SAA9730_EVM_REGS_SIZE);
+        if (!lp->evm_saa9730_regs) {
+                ret = -ENOMEM;
+                goto out_iounmap_lan;
+        }
 
         /* Allocate LAN RX/TX frame buffer space. */
-        /* FIXME: a leak */
-        if ((ret = lan_saa9730_allocate_buffers(lp)))
-                goto out;
+        if ((ret = lan_saa9730_allocate_buffers(pdev, lp)))
+                goto out_iounmap;
 
         /* Stop LAN controller. */
-        if ((ret = lan_saa9730_stop(lp))) 
-                goto out;
-        
+        if ((ret = lan_saa9730_stop(lp)))
+                goto out_free_consistent;
+
         /* Initialize CAM registers. */
         if ((ret = lan_saa9730_cam_init(dev)))
-                goto out;
+                goto out_free_consistent;
 
         /* Initialize MII registers. */
         if ((ret = lan_saa9730_mii_init(lp)))
-                goto out;
+                goto out_free_consistent;
 
         /* Initialize control registers. */
-        if ((ret = lan_saa9730_control_init(lp))) 
-                goto out;
-        
+        if ((ret = lan_saa9730_control_init(lp)))
+                goto out_free_consistent;
+
         /* Load CAM registers. */
-        if ((ret = lan_saa9730_cam_load(lp))) 
-                goto out;
-        
+        if ((ret = lan_saa9730_cam_load(lp)))
+                goto out_free_consistent;
+
         /* Initialize DMA context registers. */
         if ((ret = lan_saa9730_dma_init(lp)))
-                goto out;
-        
+                goto out_free_consistent;
+
         spin_lock_init(&lp->lock);
-                
+
         dev->open = lan_saa9730_open;
         dev->hard_start_xmit = lan_saa9730_start_xmit;
         dev->stop = lan_saa9730_close;
@@ -1086,44 +1049,43 @@ static int lan_saa9730_init(struct net_device *dev, int ioaddr, int irq)
         dev->tx_timeout = lan_saa9730_tx_timeout;
         dev->watchdog_timeo = (HZ >> 1);
         dev->dma = 0;
-        
-        ret = register_netdev(dev);
+
+        ret = register_netdev (dev);
         if (ret)
-                goto out;
+                goto out_free_consistent;
+
         return 0;
 
- out:
-        kfree(dev->priv);
+out_free_consistent:
+        lan_saa9730_free_buffers(pdev, lp);
+out_iounmap:
+        iounmap(lp->evm_saa9730_regs);
+out_iounmap_lan:
+        iounmap(lp->lan_saa9730_regs);
+out:
         return ret;
 }
 
 
 static int __devinit saa9730_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 {
-        struct net_device *dev;
-        unsigned int pci_ioaddr;
+        struct net_device *dev = NULL;
+        unsigned long pci_ioaddr;
         int err;
 
         if (lan_saa9730_debug > 1)
                 printk("saa9730.c: PCI bios is present, checking for devices...\n");
 
-        err = -ENOMEM;
-        dev = alloc_etherdev(0);
-        if (!dev)
-                goto out;
-
-        SET_MODULE_OWNER(dev);
-
         err = pci_enable_device(pdev);
-        if (err) {
-                printk(KERN_ERR "Cannot enable PCI device, aborting.\n");
-                goto out1;
-        }
+        if (err) {
+                printk(KERN_ERR "Cannot enable PCI device, aborting.\n");
+                goto out;
+        }
 
         err = pci_request_regions(pdev, DRV_MODULE_NAME);
         if (err) {
                 printk(KERN_ERR "Cannot obtain PCI resources, aborting.\n");
-                goto out2;
+                goto out_disable_pdev;
         }
 
         pci_irq_line = pdev->irq;
@@ -1132,49 +1094,54 @@ static int __devinit saa9730_init_one(struct pci_dev *pdev, const struct pci_dev
         pci_ioaddr = pci_resource_start(pdev, 1);
         pci_set_master(pdev);
 
-        printk("Found SAA9730 (PCI) at %#x, irq %d.\n",
+        printk("Found SAA9730 (PCI) at %lx, irq %d.\n",
                pci_ioaddr, pci_irq_line);
 
-        err = lan_saa9730_init(dev, pci_ioaddr, pci_irq_line);
+        dev = alloc_etherdev(sizeof(struct lan_saa9730_private));
+        if (!dev)
+                goto out_disable_pdev;
+
+        err = lan_saa9730_init(dev, pdev, pci_ioaddr, pci_irq_line);
         if (err) {
-                printk("Lan init failed");
-                goto out2;
+                printk("LAN init failed");
+                goto out_free_netdev;
         }
 
         pci_set_drvdata(pdev, dev);
         SET_NETDEV_DEV(dev, &pdev->dev);
         return 0;
-        
-out2:
-        pci_disable_device(pdev);
-out1:
+
+out_free_netdev:
         free_netdev(dev);
+out_disable_pdev:
+        pci_disable_device(pdev);
 out:
+        pci_set_drvdata(pdev, NULL);
         return err;
 }
 
 
 static struct pci_driver saa9730_driver = {
-        .name           = DRV_MODULE_NAME,
-        .id_table       = saa9730_pci_tbl,
-        .probe          = saa9730_init_one,
-        .remove         = __devexit_p(saa9730_remove_one),
+        .name           = DRV_MODULE_NAME,
+        .id_table       = saa9730_pci_tbl,
+        .probe          = saa9730_init_one,
+        .remove         = __devexit_p(saa9730_remove_one),
 };
 
 
 static int __init saa9730_init(void)
 {
-        return pci_module_init(&saa9730_driver);
+        return pci_module_init(&saa9730_driver);
 }
 
 static void __exit saa9730_cleanup(void)
 {
-        pci_unregister_driver(&saa9730_driver);
+        pci_unregister_driver(&saa9730_driver);
 }
 
 module_init(saa9730_init);
 module_exit(saa9730_cleanup);
 
-
-
+MODULE_AUTHOR("Ralf Baechle <ralf@linux-mips.org>");
+MODULE_DESCRIPTION("Philips SAA9730 ethernet driver");
 MODULE_LICENSE("GPL");
diff --git a/drivers/net/smc91x.c b/drivers/net/smc91x.c
index 74d5f1a6fdea..c91e2e81f131 100644
--- a/drivers/net/smc91x.c
+++ b/drivers/net/smc91x.c
@@ -2183,9 +2183,8 @@ static void smc_release_datacs(struct platform_device *pdev, struct net_device *
  *      0 --> there is a device
  *      anything else, error
  */
-static int smc_drv_probe(struct device *dev)
+static int smc_drv_probe(struct platform_device *pdev)
 {
-        struct platform_device *pdev = to_platform_device(dev);
         struct net_device *ndev;
         struct resource *res;
         unsigned int __iomem *addr;
@@ -2212,7 +2211,7 @@ static int smc_drv_probe(struct device *dev)
                 goto out_release_io;
         }
         SET_MODULE_OWNER(ndev);
-        SET_NETDEV_DEV(ndev, dev);
+        SET_NETDEV_DEV(ndev, &pdev->dev);
 
         ndev->dma = (unsigned char)-1;
         ndev->irq = platform_get_irq(pdev, 0);
@@ -2233,7 +2232,7 @@ static int smc_drv_probe(struct device *dev)
                 goto out_release_attrib;
         }
 
-        dev_set_drvdata(dev, ndev);
+        platform_set_drvdata(pdev, ndev);
         ret = smc_probe(ndev, addr);
         if (ret != 0)
                 goto out_iounmap;
@@ -2249,7 +2248,7 @@ static int smc_drv_probe(struct device *dev)
         return 0;
 
  out_iounmap:
-        dev_set_drvdata(dev, NULL);
+        platform_set_drvdata(pdev, NULL);
         iounmap(addr);
  out_release_attrib:
         smc_release_attrib(pdev);
@@ -2263,14 +2262,13 @@ static int smc_drv_probe(struct device *dev)
         return ret;
 }
 
-static int smc_drv_remove(struct device *dev)
+static int smc_drv_remove(struct platform_device *pdev)
 {
-        struct platform_device *pdev = to_platform_device(dev);
-        struct net_device *ndev = dev_get_drvdata(dev);
+        struct net_device *ndev = platform_get_drvdata(pdev);
         struct smc_local *lp = netdev_priv(ndev);
         struct resource *res;
 
-        dev_set_drvdata(dev, NULL);
+        platform_set_drvdata(pdev, NULL);
 
         unregister_netdev(ndev);
 
@@ -2295,9 +2293,9 @@ static int smc_drv_remove(struct device *dev)
         return 0;
 }
 
-static int smc_drv_suspend(struct device *dev, pm_message_t state)
+static int smc_drv_suspend(struct platform_device *dev, pm_message_t state)
 {
-        struct net_device *ndev = dev_get_drvdata(dev);
+        struct net_device *ndev = platform_get_drvdata(dev);
 
         if (ndev) {
                 if (netif_running(ndev)) {
@@ -2309,14 +2307,13 @@ static int smc_drv_suspend(struct device *dev, pm_message_t state)
         return 0;
 }
 
-static int smc_drv_resume(struct device *dev)
+static int smc_drv_resume(struct platform_device *dev)
 {
-        struct platform_device *pdev = to_platform_device(dev);
-        struct net_device *ndev = dev_get_drvdata(dev);
+        struct net_device *ndev = platform_get_drvdata(dev);
 
         if (ndev) {
                 struct smc_local *lp = netdev_priv(ndev);
-                smc_enable_device(pdev);
+                smc_enable_device(dev);
                 if (netif_running(ndev)) {
                         smc_reset(ndev);
                         smc_enable(ndev);
@@ -2328,13 +2325,14 @@ static int smc_drv_resume(struct device *dev)
         return 0;
 }
 
-static struct device_driver smc_driver = {
-        .name           = CARDNAME,
-        .bus            = &platform_bus_type,
+static struct platform_driver smc_driver = {
         .probe          = smc_drv_probe,
         .remove         = smc_drv_remove,
         .suspend        = smc_drv_suspend,
         .resume         = smc_drv_resume,
+        .driver         = {
+                .name   = CARDNAME,
+        },
 };
 
 static int __init smc_init(void)
@@ -2348,12 +2346,12 @@ static int __init smc_init(void)
 #endif
 #endif
 
-        return driver_register(&smc_driver);
+        return platform_driver_register(&smc_driver);
 }
 
 static void __exit smc_cleanup(void)
 {
-        driver_unregister(&smc_driver);
+        platform_driver_unregister(&smc_driver);
 }
 
 module_init(smc_init);
diff --git a/drivers/net/smc91x.h b/drivers/net/smc91x.h
index 817f200742c3..a10cd184d597 100644
--- a/drivers/net/smc91x.h
+++ b/drivers/net/smc91x.h
@@ -289,6 +289,38 @@ static inline void SMC_outsw (unsigned long a, int r, unsigned char* p, int l)
 #define RPC_LSA_DEFAULT         RPC_LED_TX_RX
 #define RPC_LSB_DEFAULT         RPC_LED_100_10
 
+#elif defined(CONFIG_SOC_AU1X00)
+
+#include <au1xxx.h>
+
+/* We can only do 16-bit reads and writes in the static memory space. */
+#define SMC_CAN_USE_8BIT        0
+#define SMC_CAN_USE_16BIT       1
+#define SMC_CAN_USE_32BIT       0
+#define SMC_IO_SHIFT            0
+#define SMC_NOWAIT              1
+
+#define SMC_inw(a, r)           au_readw((unsigned long)((a) + (r)))
+#define SMC_insw(a, r, p, l)    \
+        do {    \
+                unsigned long _a = (unsigned long)((a) + (r)); \
+                int _l = (l); \
+                u16 *_p = (u16 *)(p); \
+                while (_l-- > 0) \
+                        *_p++ = au_readw(_a); \
+        } while(0)
+#define SMC_outw(v, a, r)       au_writew(v, (unsigned long)((a) + (r)))
+#define SMC_outsw(a, r, p, l)   \
+        do {    \
+                unsigned long _a = (unsigned long)((a) + (r)); \
+                int _l = (l); \
+                const u16 *_p = (const u16 *)(p); \
+                while (_l-- > 0) \
+                        au_writew(*_p++ , _a); \
+        } while(0)
+
+#define set_irq_type(irq, type) do {} while (0)
+
 #else
 
 #define SMC_CAN_USE_8BIT        1
diff --git a/drivers/net/tokenring/proteon.c b/drivers/net/tokenring/proteon.c
index d04c918ebef8..4f756960db2a 100644
--- a/drivers/net/tokenring/proteon.c
+++ b/drivers/net/tokenring/proteon.c
@@ -344,9 +344,10 @@ module_param_array(dma, int, NULL, 0);
 
 static struct platform_device *proteon_dev[ISATR_MAX_ADAPTERS];
 
-static struct device_driver proteon_driver = {
-        .name           = "proteon",
-        .bus            = &platform_bus_type,
+static struct platform_driver proteon_driver = {
+        .driver         = {
+                .name   = "proteon",
+        },
 };
 
 static int __init proteon_init(void)
@@ -355,7 +356,7 @@ static int __init proteon_init(void)
         struct platform_device *pdev;
         int i, num = 0, err = 0;
 
-        err = driver_register(&proteon_driver);
+        err = platform_driver_register(&proteon_driver);
         if (err)
                 return err;
 
@@ -372,7 +373,7 @@ static int __init proteon_init(void)
                 err = setup_card(dev, &pdev->dev);
                 if (!err) {
                         proteon_dev[i] = pdev;
-                        dev_set_drvdata(&pdev->dev, dev);
+                        platform_set_drvdata(pdev, dev);
                         ++num;
                 } else {
                         platform_device_unregister(pdev);
@@ -399,17 +400,17 @@ static void __exit proteon_cleanup(void)
                 
                 if (!pdev)
                         continue;
-                dev = dev_get_drvdata(&pdev->dev);
+                dev = platform_get_drvdata(pdev);
                 unregister_netdev(dev);
                 release_region(dev->base_addr, PROTEON_IO_EXTENT);
                 free_irq(dev->irq, dev);
                 free_dma(dev->dma);
                 tmsdev_term(dev);
                 free_netdev(dev);
-                dev_set_drvdata(&pdev->dev, NULL);
+                platform_set_drvdata(pdev, NULL);
                 platform_device_unregister(pdev);
         }
-        driver_unregister(&proteon_driver);
+        platform_driver_unregister(&proteon_driver);
 }
 
 module_init(proteon_init);
diff --git a/drivers/net/tokenring/skisa.c b/drivers/net/tokenring/skisa.c
index 72cf708396be..d6ba41cf3110 100644
--- a/drivers/net/tokenring/skisa.c
+++ b/drivers/net/tokenring/skisa.c
@@ -354,9 +354,10 @@ module_param_array(dma, int, NULL, 0);
 
 static struct platform_device *sk_isa_dev[ISATR_MAX_ADAPTERS];
 
-static struct device_driver sk_isa_driver = {
-        .name           = "skisa",
-        .bus            = &platform_bus_type,
+static struct platform_driver sk_isa_driver = {
+        .driver         = {
+                .name   = "skisa",
+        },
 };
 
 static int __init sk_isa_init(void)
@@ -365,7 +366,7 @@ static int __init sk_isa_init(void)
         struct platform_device *pdev;
         int i, num = 0, err = 0;
 
-        err = driver_register(&sk_isa_driver);
+        err = platform_driver_register(&sk_isa_driver);
         if (err)
                 return err;
 
@@ -382,7 +383,7 @@ static int __init sk_isa_init(void)
                 err = setup_card(dev, &pdev->dev);
                 if (!err) {
                         sk_isa_dev[i] = pdev;
-                        dev_set_drvdata(&sk_isa_dev[i]->dev, dev);
+                        platform_set_drvdata(sk_isa_dev[i], dev);
                         ++num;
                 } else {
                         platform_device_unregister(pdev);
@@ -409,17 +410,17 @@ static void __exit sk_isa_cleanup(void)
 
                 if (!pdev)
                         continue;
-                dev = dev_get_drvdata(&pdev->dev);
+                dev = platform_get_drvdata(pdev);
                 unregister_netdev(dev);
                 release_region(dev->base_addr, SK_ISA_IO_EXTENT);
                 free_irq(dev->irq, dev);
                 free_dma(dev->dma);
                 tmsdev_term(dev);
                 free_netdev(dev);
-                dev_set_drvdata(&pdev->dev, NULL);
+                platform_set_drvdata(pdev, NULL);
                 platform_device_unregister(pdev);
         }
-        driver_unregister(&sk_isa_driver);
+        platform_driver_unregister(&sk_isa_driver);
 }
 
 module_init(sk_isa_init);
diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index 7187958e40ca..00e55165b760 100644
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@ -330,7 +330,7 @@ config PCI_HERMES
 
 config ATMEL
       tristate "Atmel at76c50x chipset  802.11b support"
-      depends on NET_RADIO && EXPERIMENTAL
+      depends on NET_RADIO
       select FW_LOADER
       select CRC32
        ---help---
diff --git a/drivers/net/wireless/atmel.c b/drivers/net/wireless/atmel.c
index a3e23527fe7f..5e53c5258a33 100644
--- a/drivers/net/wireless/atmel.c
+++ b/drivers/net/wireless/atmel.c
@@ -72,7 +72,7 @@
 #include "atmel.h"
 
 #define DRIVER_MAJOR 0
-#define DRIVER_MINOR 96
+#define DRIVER_MINOR 98
 
 MODULE_AUTHOR("Simon Kelley");
 MODULE_DESCRIPTION("Support for Atmel at76c50x 802.11 wireless ethernet cards.");
@@ -1504,7 +1504,7 @@ static int atmel_read_proc(char *page, char **start, off_t off,
         return len;
 }
 
-struct net_device *init_atmel_card( unsigned short irq, int port, const AtmelFWType fw_type,  
+struct net_device *init_atmel_card( unsigned short irq, unsigned long port, const AtmelFWType fw_type,  
                                     struct device *sys_dev, int (*card_present)(void *), void *card)
 {
         struct net_device *dev;
@@ -1605,8 +1605,8 @@ struct net_device *init_atmel_card( unsigned short irq, int port, const AtmelFWT
                 goto err_out_free;
         }
 
-        if (priv->bus_type == BUS_TYPE_PCI &&
-            !request_region( dev->base_addr, 64, dev->name )) {
+        if (!request_region(dev->base_addr, 32, 
+                            priv->bus_type == BUS_TYPE_PCCARD ?  "atmel_cs" : "atmel_pci")) {
                 goto err_out_irq;
         }
         
@@ -1622,15 +1622,16 @@ struct net_device *init_atmel_card( unsigned short irq, int port, const AtmelFWT
         
         create_proc_read_entry ("driver/atmel", 0, NULL, atmel_read_proc, priv);        
         
-        printk(KERN_INFO "%s: Atmel at76c50x wireless. Version %d.%d simon@thekelleys.org.uk\n",
-               dev->name, DRIVER_MAJOR, DRIVER_MINOR);
+        printk(KERN_INFO "%s: Atmel at76c50x. Version %d.%d. MAC %.2x:%.2x:%.2x:%.2x:%.2x:%.2x\n",
+               dev->name, DRIVER_MAJOR, DRIVER_MINOR,
+               dev->dev_addr[0], dev->dev_addr[1], dev->dev_addr[2],
+               dev->dev_addr[3], dev->dev_addr[4], dev->dev_addr[5] );
         
         SET_MODULE_OWNER(dev);
         return dev;
         
  err_out_res:
-        if (priv->bus_type == BUS_TYPE_PCI)
-                release_region( dev->base_addr, 64 );
+        release_region( dev->base_addr, 32);
  err_out_irq:
         free_irq(dev->irq, dev);
  err_out_free:
@@ -1640,7 +1641,7 @@ struct net_device *init_atmel_card( unsigned short irq, int port, const AtmelFWT
 
 EXPORT_SYMBOL(init_atmel_card);
 
-void stop_atmel_card(struct net_device *dev, int freeres)
+void stop_atmel_card(struct net_device *dev)
 {
         struct atmel_private *priv = netdev_priv(dev);
                 
@@ -1654,10 +1655,7 @@ void stop_atmel_card(struct net_device *dev, int freeres)
         remove_proc_entry("driver/atmel", NULL);
         free_irq(dev->irq, dev);
         kfree(priv->firmware);
-        if (freeres) {
-                /* PCMCIA frees this stuff, so only for PCI */
-                release_region(dev->base_addr, 64);
-        }
+        release_region(dev->base_addr, 32);
         free_netdev(dev);
 }
 
@@ -1810,9 +1808,9 @@ static int atmel_set_encode(struct net_device *dev,
         }
         if(dwrq->flags & IW_ENCODE_RESTRICTED)
                 priv->exclude_unencrypted = 1;
-        if(dwrq->flags & IW_ENCODE_OPEN)
+        if(dwrq->flags & IW_ENCODE_OPEN) 
                 priv->exclude_unencrypted = 0;
-        
+       
         return -EINPROGRESS;            /* Call commit handler */
 }
 
@@ -1827,11 +1825,12 @@ static int atmel_get_encode(struct net_device *dev,
         
         if (!priv->wep_is_on)
                 dwrq->flags = IW_ENCODE_DISABLED;
-        else if (priv->exclude_unencrypted)
-                dwrq->flags = IW_ENCODE_RESTRICTED;
-        else
-                dwrq->flags = IW_ENCODE_OPEN;
-                
+        else {
+                if (priv->exclude_unencrypted)
+                        dwrq->flags = IW_ENCODE_RESTRICTED;
+                else
+                        dwrq->flags = IW_ENCODE_OPEN;
+        }
                 /* Which key do we want ? -1 -> tx index */
         if (index < 0 || index >= 4)
                 index = priv->default_key;
@@ -2645,8 +2644,8 @@ static void handle_beacon_probe(struct atmel_private *priv, u16 capability, u8 c
         } 
 }
 
- 
-static void send_authentication_request(struct atmel_private *priv, u8 *challenge, int challenge_len)
+
+static void send_authentication_request(struct atmel_private *priv, u16 system, u8 *challenge, int challenge_len)
 {
         struct ieee80211_hdr_4addr header;
         struct auth_body auth;
@@ -2658,14 +2657,11 @@ static void send_authentication_request(struct atmel_private *priv, u8 *challeng
         memcpy(header.addr2, priv->dev->dev_addr, 6);
         memcpy(header.addr3, priv->CurrentBSSID, 6);
         
-        if (priv->wep_is_on) {
-                auth.alg = cpu_to_le16(C80211_MGMT_AAN_SHAREDKEY); 
+        if (priv->wep_is_on && priv->CurrentAuthentTransactionSeqNum != 1) 
                 /* no WEP for authentication frames with TrSeqNo 1 */
-                if (priv->CurrentAuthentTransactionSeqNum != 1)
-                        header.frame_ctl |=  cpu_to_le16(IEEE80211_FCTL_PROTECTED);
-        } else {
-                auth.alg = cpu_to_le16(C80211_MGMT_AAN_OPENSYSTEM);
-        }
+                header.frame_ctl |=  cpu_to_le16(IEEE80211_FCTL_PROTECTED);
+        
+        auth.alg = cpu_to_le16(system); 
 
         auth.status = 0;
         auth.trans_seq = cpu_to_le16(priv->CurrentAuthentTransactionSeqNum);
@@ -2834,6 +2830,7 @@ static void authenticate(struct atmel_private *priv, u16 frame_len)
         struct auth_body *auth = (struct auth_body *)priv->rx_buf;
         u16 status = le16_to_cpu(auth->status);
         u16 trans_seq_no = le16_to_cpu(auth->trans_seq);
+        u16 system = le16_to_cpu(auth->alg);
         
         if (status == C80211_MGMT_SC_Success && !priv->wep_is_on) { 
                 /* no WEP */
@@ -2855,7 +2852,7 @@ static void authenticate(struct atmel_private *priv, u16 frame_len)
                                 
                 if (trans_seq_no == 0x0002 &&
                     auth->el_id == C80211_MGMT_ElementID_ChallengeText) {
-                        send_authentication_request(priv, auth->chall_text, auth->chall_text_len);
+                        send_authentication_request(priv, system, auth->chall_text, auth->chall_text_len);
                         return;
                 }
                 
@@ -2872,14 +2869,20 @@ static void authenticate(struct atmel_private *priv, u16 frame_len)
                 }
         }                       
         
-        if (status == C80211_MGMT_SC_AuthAlgNotSupported && priv->connect_to_any_BSS) {
-                int bss_index;
-                
-                priv->BSSinfo[(int)(priv->current_BSS)].channel |= 0x80;
-                
-                if ((bss_index  = retrieve_bss(priv)) != -1) {
-                        atmel_join_bss(priv, bss_index);
-                        return;
+        if (status == C80211_MGMT_SC_AuthAlgNotSupported) {
+                /* Do opensystem first, then try sharedkey */
+                if (system ==  C80211_MGMT_AAN_OPENSYSTEM) {
+                        priv->CurrentAuthentTransactionSeqNum = 0x001;
+                        send_authentication_request(priv, C80211_MGMT_AAN_SHAREDKEY, NULL, 0);
+                } else if (priv->connect_to_any_BSS) {
+                        int bss_index;
+                        
+                        priv->BSSinfo[(int)(priv->current_BSS)].channel |= 0x80;
+                        
+                        if ((bss_index  = retrieve_bss(priv)) != -1) {
+                                atmel_join_bss(priv, bss_index);
+                                return;
+                        }
                 }
         }
         
@@ -3205,7 +3208,7 @@ static void atmel_management_timer(u_long a)
                   priv->AuthenticationRequestRetryCnt++;
                   priv->CurrentAuthentTransactionSeqNum = 0x0001;
                   mod_timer(&priv->management_timer, jiffies + MGMT_JIFFIES);
-                  send_authentication_request(priv, NULL, 0);
+                  send_authentication_request(priv, C80211_MGMT_AAN_OPENSYSTEM, NULL, 0);
           }
           
           break;
@@ -3312,7 +3315,7 @@ static void atmel_command_irq(struct atmel_private *priv)
                                 
                                 mod_timer(&priv->management_timer, jiffies + MGMT_JIFFIES);
                                 priv->CurrentAuthentTransactionSeqNum = 0x0001;
-                                send_authentication_request(priv, NULL, 0);
+                                send_authentication_request(priv, C80211_MGMT_AAN_SHAREDKEY, NULL, 0);
                         }
                         return;
                 }
@@ -3482,11 +3485,6 @@ static int probe_atmel_card(struct net_device *dev)
                         printk(KERN_ALERT "%s: *** Invalid MAC address. UPGRADE Firmware ****\n", dev->name);
                         memcpy(dev->dev_addr, default_mac, 6);
                 }
-                printk(KERN_INFO "%s: MAC address %.2x:%.2x:%.2x:%.2x:%.2x:%.2x\n",
-                       dev->name,
-                       dev->dev_addr[0], dev->dev_addr[1], dev->dev_addr[2],
-                       dev->dev_addr[3], dev->dev_addr[4], dev->dev_addr[5] );
-                
         }
         
         return rc;
diff --git a/drivers/net/wireless/atmel.h b/drivers/net/wireless/atmel.h
index 825000edfc2c..b9b3e5b76544 100644
--- a/drivers/net/wireless/atmel.h
+++ b/drivers/net/wireless/atmel.h
@@ -35,9 +35,9 @@ typedef enum {
         ATMEL_FW_TYPE_506
 } AtmelFWType;
 
-struct net_device *init_atmel_card(unsigned short, int, const AtmelFWType, struct device *, 
+struct net_device *init_atmel_card(unsigned short, unsigned long, const AtmelFWType, struct device *, 
                                     int (*present_func)(void *), void * );
-void stop_atmel_card( struct net_device *, int );
+void stop_atmel_card( struct net_device *);
 int atmel_open( struct net_device * );
 
 #endif
diff --git a/drivers/net/wireless/atmel_cs.c b/drivers/net/wireless/atmel_cs.c
index 1bd13146c644..17d1fd90f832 100644
--- a/drivers/net/wireless/atmel_cs.c
+++ b/drivers/net/wireless/atmel_cs.c
@@ -63,6 +63,7 @@
    be present but disabled -- but it can then be enabled for specific
    modules at load time with a 'pc_debug=#' option to insmod.
 */
+
 #ifdef PCMCIA_DEBUG
 static int pc_debug = PCMCIA_DEBUG;
 module_param(pc_debug, int, 0);
@@ -285,41 +286,6 @@ static int card_present(void *arg)
         return 0;
 }
 
-/* list of cards we know about and their firmware requirements.
-   Go either by Manfid or version strings.
-   Cards not in this list will need a firmware parameter to the module
-   in all probability. Note that the SMC 2632 V2 and V3 have the same
-   manfids, so we ignore those and use the version1 strings. */
-
-static struct { 
-        int manf, card;
-        char *ver1;
-        AtmelFWType firmware;
-        char *name;
-} card_table[] = {
-        { 0, 0, "WLAN/802.11b PC CARD", ATMEL_FW_TYPE_502D, "Actiontec 802CAT1" },  
-        { 0, 0, "ATMEL/AT76C502AR", ATMEL_FW_TYPE_502, "NoName-RFMD" }, 
-        { 0, 0, "ATMEL/AT76C502AR_D", ATMEL_FW_TYPE_502D, "NoName-revD" }, 
-        { 0, 0, "ATMEL/AT76C502AR_E", ATMEL_FW_TYPE_502E, "NoName-revE" },
-        { 0, 0, "ATMEL/AT76C504", ATMEL_FW_TYPE_504, "NoName-504" },
-        { 0, 0, "ATMEL/AT76C504A", ATMEL_FW_TYPE_504A_2958, "NoName-504a-2958" },
-        { 0, 0, "ATMEL/AT76C504_R", ATMEL_FW_TYPE_504_2958, "NoName-504-2958" },
-        { MANFID_3COM, 0x0620, NULL, ATMEL_FW_TYPE_502_3COM, "3com 3CRWE62092B" }, 
-        { MANFID_3COM, 0x0696, NULL, ATMEL_FW_TYPE_502_3COM, "3com 3CRSHPW196" }, 
-        { 0, 0, "SMC/2632W-V2", ATMEL_FW_TYPE_502, "SMC 2632W-V2" },
-        { 0, 0, "SMC/2632W", ATMEL_FW_TYPE_502D, "SMC 2632W-V3" },
-        { 0xd601, 0x0007, NULL, ATMEL_FW_TYPE_502, "Sitecom WLAN-011" }, 
-        { 0x01bf, 0x3302, NULL, ATMEL_FW_TYPE_502E, "Belkin F5D6020-V2" }, 
-        { 0, 0, "BT/Voyager 1020 Laptop Adapter", ATMEL_FW_TYPE_502, "BT Voyager 1020" },
-        { 0, 0, "IEEE 802.11b/Wireless LAN PC Card", ATMEL_FW_TYPE_502, "Siemens Gigaset PC Card II" },
-        { 0, 0, "IEEE 802.11b/Wireless LAN Card S", ATMEL_FW_TYPE_504_2958, "Siemens Gigaset PC Card II" },
-        { 0, 0, "CNet/CNWLC 11Mbps Wireless PC Card V-5", ATMEL_FW_TYPE_502E, "CNet CNWLC-811ARL" },
-        { 0, 0, "Wireless/PC_CARD", ATMEL_FW_TYPE_502D, "Planet WL-3552" },
-        { 0, 0, "OEM/11Mbps Wireless LAN PC Card V-3", ATMEL_FW_TYPE_502, "OEM 11Mbps WLAN PCMCIA Card" },
-        { 0, 0, "11WAVE/11WP611AL-E", ATMEL_FW_TYPE_502E, "11WAVE WaveBuddy" },
-        { 0, 0, "LG/LW2100N", ATMEL_FW_TYPE_502E, "LG LW2100N 11Mbps WLAN PCMCIA Card" },
-};
-
 static void atmel_config(dev_link_t *link)
 {
         client_handle_t handle;
@@ -328,10 +294,11 @@ static void atmel_config(dev_link_t *link)
         local_info_t *dev;
         int last_fn, last_ret;
         u_char buf[64];
-        int card_index = -1, done = 0;
-        
+        struct pcmcia_device_id *did;
+
         handle = link->handle;
         dev = link->priv;
+        did = handle_to_dev(handle).driver_data;
 
         DEBUG(0, "atmel_config(0x%p)\n", link);
         
@@ -340,59 +307,6 @@ static void atmel_config(dev_link_t *link)
         tuple.TupleDataMax = sizeof(buf);
         tuple.TupleOffset = 0;
         
-        tuple.DesiredTuple = CISTPL_MANFID;
-        if (pcmcia_get_first_tuple(handle, &tuple) == 0) {
-                int i;
-                cistpl_manfid_t *manfid;
-                CS_CHECK(GetTupleData, pcmcia_get_tuple_data(handle, &tuple));
-                CS_CHECK(ParseTuple, pcmcia_parse_tuple(handle, &tuple, &parse));
-                manfid = &(parse.manfid);
-                for (i = 0; i < sizeof(card_table)/sizeof(card_table[0]); i++) {
-                        if (!card_table[i].ver1 &&
-                            manfid->manf == card_table[i].manf &&
-                            manfid->card == card_table[i].card) {
-                                card_index = i;
-                                done = 1;
-                        }
-                }
-        }
-
-        tuple.DesiredTuple = CISTPL_VERS_1;
-        if (!done && (pcmcia_get_first_tuple(handle, &tuple) == 0)) {
-                int i, j, k;
-                cistpl_vers_1_t *ver1;
-                CS_CHECK(GetTupleData, pcmcia_get_tuple_data(handle, &tuple));
-                CS_CHECK(ParseTuple, pcmcia_parse_tuple(handle, &tuple, &parse));
-                ver1 = &(parse.version_1);
-                
-                for (i = 0; i < sizeof(card_table)/sizeof(card_table[0]); i++) {
-                        for (j = 0; j < ver1->ns; j++) {
-                                char *p = card_table[i].ver1;
-                                char *q = &ver1->str[ver1->ofs[j]];
-                                if (!p)
-                                        goto mismatch;
-                                for (k = 0; k < j; k++) {
-                                        while ((*p != '\0') && (*p != '/')) p++;
-                                        if (*p == '\0') {
-                                                if (*q != '\0')
-                                                        goto mismatch;
-                                        } else {
-                                                p++;
-                                        }
-                                }
-                                while((*q != '\0') && (*p != '\0') && 
-                                      (*p != '/') && (*p == *q)) p++, q++;
-                                if (((*p != '\0') && *p != '/') || *q != '\0')
-                                        goto mismatch;
-                        }
-                        card_index = i;
-                        break;  /* done */
-                        
-                mismatch:
-                        j = 0; /* dummy stmt to shut up compiler */
-                }
-        }               
-
         /*
           This reads the card's CONFIG tuple to find its configuration
           registers.
@@ -509,12 +423,13 @@ static void atmel_config(dev_link_t *link)
         ((local_info_t*)link->priv)->eth_dev = 
                 init_atmel_card(link->irq.AssignedIRQ,
                                 link->io.BasePort1,
-                                card_index == -1 ? ATMEL_FW_TYPE_NONE :  card_table[card_index].firmware,
+                                did ? did->driver_info : ATMEL_FW_TYPE_NONE,
                                 &handle_to_dev(handle),
                                 card_present, 
                                 link);
         if (!((local_info_t*)link->priv)->eth_dev) 
-                goto cs_failed;
+                        goto cs_failed;
+        
         
         /*
           At this point, the dev_node_t structure(s) need to be
@@ -523,26 +438,7 @@ static void atmel_config(dev_link_t *link)
         strcpy(dev->node.dev_name, ((local_info_t*)link->priv)->eth_dev->name );
         dev->node.major = dev->node.minor = 0;
         link->dev = &dev->node;
-        
-        /* Finally, report what we've done */
-        printk(KERN_INFO "%s: %s%sindex 0x%02x: Vcc %d.%d",
-               dev->node.dev_name,
-               card_index == -1 ? "" :  card_table[card_index].name,
-               card_index == -1 ? "" : " ",
-               link->conf.ConfigIndex,
-               link->conf.Vcc/10, link->conf.Vcc%10);
-        if (link->conf.Vpp1)
-                printk(", Vpp %d.%d", link->conf.Vpp1/10, link->conf.Vpp1%10);
-        if (link->conf.Attributes & CONF_ENABLE_IRQ)
-                printk(", irq %d", link->irq.AssignedIRQ);
-        if (link->io.NumPorts1)
-                printk(", io 0x%04x-0x%04x", link->io.BasePort1,
-                       link->io.BasePort1+link->io.NumPorts1-1);
-        if (link->io.NumPorts2)
-                printk(" & 0x%04x-0x%04x", link->io.BasePort2,
-                       link->io.BasePort2+link->io.NumPorts2-1);
-        printk("\n");
-        
+                        
         link->state &= ~DEV_CONFIG_PENDING;
         return;
         
@@ -569,7 +465,7 @@ static void atmel_release(dev_link_t *link)
         link->dev = NULL;
         
         if (dev) 
-                stop_atmel_card(dev, 0);
+                stop_atmel_card(dev);
         ((local_info_t*)link->priv)->eth_dev = NULL; 
         
         /* Don't bother checking to see if these succeed or not */
@@ -637,25 +533,47 @@ static int atmel_event(event_t event, int priority,
 } /* atmel_event */
 
 /*====================================================================*/
+/* We use the driver_info field to store the correct firmware type for a card. */
+
+#define PCMCIA_DEVICE_MANF_CARD_INFO(manf, card, info) { \
+        .match_flags = PCMCIA_DEV_ID_MATCH_MANF_ID| \
+                        PCMCIA_DEV_ID_MATCH_CARD_ID, \
+        .manf_id = (manf), \
+        .card_id = (card), \
+        .driver_info = (kernel_ulong_t)(info), }
+
+#define PCMCIA_DEVICE_PROD_ID12_INFO(v1, v2, vh1, vh2, info) { \
+        .match_flags = PCMCIA_DEV_ID_MATCH_PROD_ID1| \
+                        PCMCIA_DEV_ID_MATCH_PROD_ID2, \
+        .prod_id = { (v1), (v2), NULL, NULL }, \
+        .prod_id_hash = { (vh1), (vh2), 0, 0 }, \
+        .driver_info = (kernel_ulong_t)(info), }
+
 static struct pcmcia_device_id atmel_ids[] = {
-        PCMCIA_DEVICE_MANF_CARD(0x0101, 0x0620),
-        PCMCIA_DEVICE_MANF_CARD(0x0101, 0x0696),
-        PCMCIA_DEVICE_MANF_CARD(0x01bf, 0x3302),
-        PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0007),
-        PCMCIA_DEVICE_PROD_ID12("11WAVE", "11WP611AL-E", 0x9eb2da1f, 0xc9a0d3f9),
-        PCMCIA_DEVICE_PROD_ID12("ATMEL", "AT76C502AR", 0xabda4164, 0x41b37e1f),
-        PCMCIA_DEVICE_PROD_ID12("ATMEL", "AT76C504", 0xabda4164, 0x5040670a),
-        PCMCIA_DEVICE_PROD_ID12("ATMEL", "AT76C504A", 0xabda4164, 0xe15ed87f),
-        PCMCIA_DEVICE_PROD_ID12("BT", "Voyager 1020 Laptop Adapter", 0xae49b86a, 0x1e957cd5),
-        PCMCIA_DEVICE_PROD_ID12("CNet", "CNWLC 11Mbps Wireless PC Card V-5", 0xbc477dde, 0x502fae6b),
-        PCMCIA_DEVICE_PROD_ID12("IEEE 802.11b", "Wireless LAN PC Card", 0x5b878724, 0x122f1df6),
-        PCMCIA_DEVICE_PROD_ID12("OEM", "11Mbps Wireless LAN PC Card V-3", 0xfea54c90, 0x1c5b0f68),
-        PCMCIA_DEVICE_PROD_ID12("SMC", "2632W", 0xc4f8b18b, 0x30f38774),
-        PCMCIA_DEVICE_PROD_ID12("SMC", "2632W-V2", 0xc4f8b18b, 0x172d1377),
-        PCMCIA_DEVICE_PROD_ID12("Wireless", "PC", 0xa407ecdd, 0x556e4d7e),
-        PCMCIA_DEVICE_PROD_ID12("WLAN", "802.11b PC CARD", 0x575c516c, 0xb1f6dbc4),
+        PCMCIA_DEVICE_MANF_CARD_INFO(0x0101, 0x0620, ATMEL_FW_TYPE_502_3COM),
+        PCMCIA_DEVICE_MANF_CARD_INFO(0x0101, 0x0696, ATMEL_FW_TYPE_502_3COM),
+        PCMCIA_DEVICE_MANF_CARD_INFO(0x01bf, 0x3302, ATMEL_FW_TYPE_502E),
+        PCMCIA_DEVICE_MANF_CARD_INFO(0xd601, 0x0007, ATMEL_FW_TYPE_502),
+        PCMCIA_DEVICE_PROD_ID12_INFO("11WAVE", "11WP611AL-E", 0x9eb2da1f, 0xc9a0d3f9, ATMEL_FW_TYPE_502E),
+        PCMCIA_DEVICE_PROD_ID12_INFO("ATMEL", "AT76C502AR", 0xabda4164, 0x41b37e1f, ATMEL_FW_TYPE_502),
+        PCMCIA_DEVICE_PROD_ID12_INFO("ATMEL", "AT76C502AR_D", 0xabda4164, 0x3675d704, ATMEL_FW_TYPE_502D),
+        PCMCIA_DEVICE_PROD_ID12_INFO("ATMEL", "AT76C502AR_E", 0xabda4164, 0x4172e792, ATMEL_FW_TYPE_502E),
+        PCMCIA_DEVICE_PROD_ID12_INFO("ATMEL", "AT76C504_R", 0xabda4164, 0x917f3d72, ATMEL_FW_TYPE_504_2958),
+        PCMCIA_DEVICE_PROD_ID12_INFO("ATMEL", "AT76C504", 0xabda4164, 0x5040670a, ATMEL_FW_TYPE_504),
+        PCMCIA_DEVICE_PROD_ID12_INFO("ATMEL", "AT76C504A", 0xabda4164, 0xe15ed87f, ATMEL_FW_TYPE_504A_2958),
+        PCMCIA_DEVICE_PROD_ID12_INFO("BT", "Voyager 1020 Laptop Adapter", 0xae49b86a, 0x1e957cd5, ATMEL_FW_TYPE_502),
+        PCMCIA_DEVICE_PROD_ID12_INFO("CNet", "CNWLC 11Mbps Wireless PC Card V-5", 0xbc477dde, 0x502fae6b, ATMEL_FW_TYPE_502E),
+        PCMCIA_DEVICE_PROD_ID12_INFO("IEEE 802.11b", "Wireless LAN PC Card", 0x5b878724, 0x122f1df6, ATMEL_FW_TYPE_502),
+        PCMCIA_DEVICE_PROD_ID12_INFO("IEEE 802.11b", "Wireless LAN Card S", 0x5b878724, 0x5fba533a, ATMEL_FW_TYPE_504_2958),
+        PCMCIA_DEVICE_PROD_ID12_INFO("OEM", "11Mbps Wireless LAN PC Card V-3", 0xfea54c90, 0x1c5b0f68, ATMEL_FW_TYPE_502),
+        PCMCIA_DEVICE_PROD_ID12_INFO("SMC", "2632W", 0xc4f8b18b, 0x30f38774, ATMEL_FW_TYPE_502D),
+        PCMCIA_DEVICE_PROD_ID12_INFO("SMC", "2632W-V2", 0xc4f8b18b, 0x172d1377, ATMEL_FW_TYPE_502),
+        PCMCIA_DEVICE_PROD_ID12_INFO("Wireless", "PC_CARD", 0xa407ecdd, 0x119f6314, ATMEL_FW_TYPE_502D),
+        PCMCIA_DEVICE_PROD_ID12_INFO("WLAN", "802.11b PC CARD", 0x575c516c, 0xb1f6dbc4, ATMEL_FW_TYPE_502D),
+        PCMCIA_DEVICE_PROD_ID12_INFO("LG", "LW2100N", 0xb474d43a, 0x6b1fec94, ATMEL_FW_TYPE_502E),
         PCMCIA_DEVICE_NULL
 };
+
 MODULE_DEVICE_TABLE(pcmcia, atmel_ids);
 
 static struct pcmcia_driver atmel_driver = {
diff --git a/drivers/net/wireless/atmel_pci.c b/drivers/net/wireless/atmel_pci.c
index 2eb00a957bbe..a61b3bc6cccf 100644
--- a/drivers/net/wireless/atmel_pci.c
+++ b/drivers/net/wireless/atmel_pci.c
@@ -72,7 +72,7 @@ static int __devinit atmel_pci_probe(struct pci_dev *pdev,
 
 static void __devexit atmel_pci_remove(struct pci_dev *pdev)
 {
-        stop_atmel_card(pci_get_drvdata(pdev), 1);
+        stop_atmel_card(pci_get_drvdata(pdev));
 }
 
 static int __init atmel_init_module(void)
diff --git a/drivers/s390/net/lcs.c b/drivers/s390/net/lcs.c
index 1c8ad2fcad8a..da8c515743e8 100644
--- a/drivers/s390/net/lcs.c
+++ b/drivers/s390/net/lcs.c
@@ -8,7 +8,7 @@
  *    Author(s): Original Code written by
  *                        DJ Barrow (djbarrow@de.ibm.com,barrow_dj@yahoo.com)
  *               Rewritten by
- *                        Frank Pavlic (pavlic@de.ibm.com) and
+ *                        Frank Pavlic (fpavlic@de.ibm.com) and
  *                        Martin Schwidefsky <schwidefsky@de.ibm.com>
  *
  *    $Revision: 1.99 $  $Date: 2005/05/11 08:10:17 $
@@ -2342,6 +2342,6 @@ __exit lcs_cleanup_module(void)
 module_init(lcs_init_module);
 module_exit(lcs_cleanup_module);
 
-MODULE_AUTHOR("Frank Pavlic <pavlic@de.ibm.com>");
+MODULE_AUTHOR("Frank Pavlic <fpavlic@de.ibm.com>");
 MODULE_LICENSE("GPL");
 
diff --git a/drivers/s390/net/qeth.h b/drivers/s390/net/qeth.h
index 38a2441564d7..d238c7ed103b 100644
--- a/drivers/s390/net/qeth.h
+++ b/drivers/s390/net/qeth.h
@@ -8,6 +8,7 @@
 #include <linux/trdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/if_vlan.h>
+#include <linux/ctype.h>
 
 #include <net/ipv6.h>
 #include <linux/in6.h>
@@ -24,7 +25,7 @@
 
 #include "qeth_mpc.h"
 
-#define VERSION_QETH_H          "$Revision: 1.142 $"
+#define VERSION_QETH_H          "$Revision: 1.152 $"
 
 #ifdef CONFIG_QETH_IPV6
 #define QETH_VERSION_IPV6       ":IPv6"
@@ -718,8 +719,6 @@ struct qeth_reply {
         atomic_t refcnt;
 };
 
-#define QETH_BROADCAST_WITH_ECHO    1
-#define QETH_BROADCAST_WITHOUT_ECHO 2
 
 struct qeth_card_blkt {
         int time_total;
@@ -727,8 +726,10 @@ struct qeth_card_blkt {
         int inter_packet_jumbo;
 };
 
-
-
+#define QETH_BROADCAST_WITH_ECHO    0x01
+#define QETH_BROADCAST_WITHOUT_ECHO 0x02
+#define QETH_LAYER2_MAC_READ        0x01
+#define QETH_LAYER2_MAC_REGISTERED  0x02
 struct qeth_card_info {
         unsigned short unit_addr2;
         unsigned short cula;
@@ -736,7 +737,7 @@ struct qeth_card_info {
         __u16 func_level;
         char mcl_level[QETH_MCL_LENGTH + 1];
         int guestlan;
-        int layer2_mac_registered;
+        int mac_bits;
         int portname_required;
         int portno;
         char portname[9];
@@ -749,6 +750,7 @@ struct qeth_card_info {
         int unique_id;
         struct qeth_card_blkt blkt;
         __u32 csum_mask;
+        enum qeth_ipa_promisc_modes promisc_mode;
 };
 
 struct qeth_card_options {
@@ -775,6 +777,7 @@ struct qeth_card_options {
 enum qeth_threads {
         QETH_SET_IP_THREAD  = 1,
         QETH_RECOVER_THREAD = 2,
+        QETH_SET_PROMISC_MODE_THREAD = 4,
 };
 
 struct qeth_osn_info {
@@ -1074,6 +1077,26 @@ qeth_get_qdio_q_format(struct qeth_card *card)
         }
 }
 
+static inline int
+qeth_isdigit(char * buf)
+{
+        while (*buf) {
+                if (!isdigit(*buf++))
+                        return 0;
+        }
+        return 1;
+}
+
+static inline int
+qeth_isxdigit(char * buf)
+{
+        while (*buf) {
+                if (!isxdigit(*buf++))
+                        return 0;
+        }
+        return 1;
+}
+
 static inline void
 qeth_ipaddr4_to_string(const __u8 *addr, char *buf)
 {
@@ -1090,18 +1113,27 @@ qeth_string_to_ipaddr4(const char *buf, __u8 *addr)
         int i;
 
         start = buf;
-        for (i = 0; i < 3; i++) {
-                if (!(end = strchr(start, '.')))
+        for (i = 0; i < 4; i++) {
+                if (i == 3) {
+                        end = strchr(start,0xa);
+                        if (end)
+                                len = end - start;
+                        else            
+                                len = strlen(start);
+                }
+                else {
+                        end = strchr(start, '.');
+                        len = end - start;
+                }
+                if ((len <= 0) || (len > 3))
                         return -EINVAL;
-                len = end - start;
                 memset(abuf, 0, 4);
                 strncpy(abuf, start, len);
+                if (!qeth_isdigit(abuf))
+                        return -EINVAL;
                 addr[i] = simple_strtoul(abuf, &tmp, 10);
                 start = end + 1;
         }
-        memset(abuf, 0, 4);
-        strcpy(abuf, start);
-        addr[3] = simple_strtoul(abuf, &tmp, 10);
         return 0;
 }
 
@@ -1128,18 +1160,27 @@ qeth_string_to_ipaddr6(const char *buf, __u8 *addr)
 
         tmp_addr = (u16 *)addr;
         start = buf;
-        for (i = 0; i < 7; i++) {
-                if (!(end = strchr(start, ':')))
+        for (i = 0; i < 8; i++) {
+                if (i == 7) {
+                        end = strchr(start,0xa);
+                        if (end)
+                                len = end - start;
+                        else
+                                len = strlen(start);
+                }
+                else {
+                        end = strchr(start, ':');
+                        len = end - start;
+                }
+                if ((len <= 0) || (len > 4))
                         return -EINVAL;
-                len = end - start;
                 memset(abuf, 0, 5);
                 strncpy(abuf, start, len);
+                if (!qeth_isxdigit(abuf))
+                        return -EINVAL;
                 tmp_addr[i] = simple_strtoul(abuf, &tmp, 16);
                 start = end + 1;
         }
-        memset(abuf, 0, 5);
-        strcpy(abuf, start);
-        tmp_addr[7] = simple_strtoul(abuf, &tmp, 16);
         return 0;
 }
 
diff --git a/drivers/s390/net/qeth_main.c b/drivers/s390/net/qeth_main.c
index 692003c9f896..99cceb242ec4 100644
--- a/drivers/s390/net/qeth_main.c
+++ b/drivers/s390/net/qeth_main.c
@@ -1,6 +1,6 @@
 /*
  *
- * linux/drivers/s390/net/qeth_main.c ($Revision: 1.224 $)
+ * linux/drivers/s390/net/qeth_main.c ($Revision: 1.242 $)
  *
  * Linux on zSeries OSA Express and HiperSockets support
  *
@@ -9,10 +9,10 @@
  *    Author(s): Original Code written by
  *                        Utz Bacher (utz.bacher@de.ibm.com)
  *               Rewritten by
- *                        Frank Pavlic (pavlic@de.ibm.com) and
+ *                        Frank Pavlic (fpavlic@de.ibm.com) and
  *                        Thomas Spatzier <tspat@de.ibm.com>
  *
- *    $Revision: 1.224 $         $Date: 2005/05/04 20:19:18 $
+ *    $Revision: 1.242 $         $Date: 2005/05/04 20:19:18 $
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -72,7 +72,7 @@
 #include "qeth_eddp.h"
 #include "qeth_tso.h"
 
-#define VERSION_QETH_C "$Revision: 1.224 $"
+#define VERSION_QETH_C "$Revision: 1.242 $"
 static const char *version = "qeth S/390 OSA-Express driver";
 
 /**
@@ -160,6 +160,9 @@ static void
 qeth_set_multicast_list(struct net_device *);
 
 static void
+qeth_setadp_promisc_mode(struct qeth_card *);
+
+static void
 qeth_notify_processes(void)
 {
         /*notify all  registered processes */
@@ -602,11 +605,20 @@ __qeth_ref_ip_on_card(struct qeth_card *card, struct qeth_ipaddr *todo,
         int found = 0;
 
         list_for_each_entry(addr, &card->ip_list, entry) {
+                if (card->options.layer2) {
+                        if ((addr->type == todo->type) &&
+                            (memcmp(&addr->mac, &todo->mac, 
+                                    OSA_ADDR_LEN) == 0)) {
+                                found = 1;
+                                break;
+                        }
+                        continue;
+                } 
                 if ((addr->proto     == QETH_PROT_IPV4)  &&
                     (todo->proto     == QETH_PROT_IPV4)  &&
                     (addr->type      == todo->type)      &&
                     (addr->u.a4.addr == todo->u.a4.addr) &&
-                    (addr->u.a4.mask == todo->u.a4.mask)   ){
+                    (addr->u.a4.mask == todo->u.a4.mask)) {
                         found = 1;
                         break;
                 }
@@ -615,12 +627,12 @@ __qeth_ref_ip_on_card(struct qeth_card *card, struct qeth_ipaddr *todo,
                     (addr->type        == todo->type)         &&
                     (addr->u.a6.pfxlen == todo->u.a6.pfxlen)  &&
                     (memcmp(&addr->u.a6.addr, &todo->u.a6.addr,
-                            sizeof(struct in6_addr)) == 0))     {
+                            sizeof(struct in6_addr)) == 0)) {
                         found = 1;
                         break;
                 }
         }
-        if (found){
+        if (found) {
                 addr->users += todo->users;
                 if (addr->users <= 0){
                         *__addr = addr;
@@ -632,7 +644,7 @@ __qeth_ref_ip_on_card(struct qeth_card *card, struct qeth_ipaddr *todo,
                         return 0;
                 }
         }
-        if (todo->users > 0){
+        if (todo->users > 0) {
                 /* for VIPA and RXIP limit refcount to 1 */
                 if (todo->type != QETH_IP_TYPE_NORMAL)
                         todo->users = 1;
@@ -682,12 +694,22 @@ __qeth_insert_ip_todo(struct qeth_card *card, struct qeth_ipaddr *addr, int add)
                 if ((addr->type == QETH_IP_TYPE_DEL_ALL_MC) &&
                     (tmp->type == QETH_IP_TYPE_DEL_ALL_MC))
                         return 0;
+                if (card->options.layer2) {
+                        if ((tmp->type  == addr->type)  &&
+                            (tmp->is_multicast == addr->is_multicast) &&
+                            (memcmp(&tmp->mac, &addr->mac, 
+                                    OSA_ADDR_LEN) == 0)) {
+                                found = 1;
+                                break;
+                        }
+                        continue;
+                }        
                 if ((tmp->proto        == QETH_PROT_IPV4)     &&
                     (addr->proto       == QETH_PROT_IPV4)     &&
                     (tmp->type         == addr->type)         &&
                     (tmp->is_multicast == addr->is_multicast) &&
                     (tmp->u.a4.addr    == addr->u.a4.addr)    &&
-                    (tmp->u.a4.mask    == addr->u.a4.mask)      ){
+                    (tmp->u.a4.mask    == addr->u.a4.mask)) {
                         found = 1;
                         break;
                 }
@@ -697,7 +719,7 @@ __qeth_insert_ip_todo(struct qeth_card *card, struct qeth_ipaddr *addr, int add)
                     (tmp->is_multicast == addr->is_multicast)  &&
                     (tmp->u.a6.pfxlen  == addr->u.a6.pfxlen)   &&
                     (memcmp(&tmp->u.a6.addr, &addr->u.a6.addr,
-                            sizeof(struct in6_addr)) == 0)        ){
+                            sizeof(struct in6_addr)) == 0)) {
                         found = 1;
                         break;
                 }
@@ -707,7 +729,7 @@ __qeth_insert_ip_todo(struct qeth_card *card, struct qeth_ipaddr *addr, int add)
                         tmp->users += addr->users;
                 else
                         tmp->users += add? 1:-1;
-                if (tmp->users == 0){
+                if (tmp->users == 0) {
                         list_del(&tmp->entry);
                         kfree(tmp);
                 }
@@ -738,12 +760,15 @@ qeth_delete_ip(struct qeth_card *card, struct qeth_ipaddr *addr)
         unsigned long flags;
         int rc = 0;
 
-        QETH_DBF_TEXT(trace,4,"delip");
-        if (addr->proto == QETH_PROT_IPV4)
-                QETH_DBF_HEX(trace,4,&addr->u.a4.addr,4);
+        QETH_DBF_TEXT(trace, 4, "delip");
+
+        if (card->options.layer2)
+                QETH_DBF_HEX(trace, 4, &addr->mac, 6);
+        else if (addr->proto == QETH_PROT_IPV4)
+                QETH_DBF_HEX(trace, 4, &addr->u.a4.addr, 4);
         else {
-                QETH_DBF_HEX(trace,4,&addr->u.a6.addr,8);
-                QETH_DBF_HEX(trace,4,((char *)&addr->u.a6.addr)+8,8);
+                QETH_DBF_HEX(trace, 4, &addr->u.a6.addr, 8);
+                QETH_DBF_HEX(trace, 4, ((char *)&addr->u.a6.addr) + 8, 8);
         }
         spin_lock_irqsave(&card->ip_lock, flags);
         rc = __qeth_insert_ip_todo(card, addr, 0);
@@ -757,12 +782,14 @@ qeth_add_ip(struct qeth_card *card, struct qeth_ipaddr *addr)
         unsigned long flags;
         int rc = 0;
 
-        QETH_DBF_TEXT(trace,4,"addip");
-        if (addr->proto == QETH_PROT_IPV4)
-                QETH_DBF_HEX(trace,4,&addr->u.a4.addr,4);
+        QETH_DBF_TEXT(trace, 4, "addip");
+        if (card->options.layer2)
+                QETH_DBF_HEX(trace, 4, &addr->mac, 6);
+        else if (addr->proto == QETH_PROT_IPV4)
+                QETH_DBF_HEX(trace, 4, &addr->u.a4.addr, 4);
         else {
-                QETH_DBF_HEX(trace,4,&addr->u.a6.addr,8);
-                QETH_DBF_HEX(trace,4,((char *)&addr->u.a6.addr)+8,8);
+                QETH_DBF_HEX(trace, 4, &addr->u.a6.addr, 8);
+                QETH_DBF_HEX(trace, 4, ((char *)&addr->u.a6.addr) + 8, 8);
         }
         spin_lock_irqsave(&card->ip_lock, flags);
         rc = __qeth_insert_ip_todo(card, addr, 1);
@@ -775,7 +802,7 @@ __qeth_delete_all_mc(struct qeth_card *card, unsigned long *flags)
 {
         struct qeth_ipaddr *addr, *tmp;
         int rc;
-
+again:
         list_for_each_entry_safe(addr, tmp, &card->ip_list, entry) {
                 if (addr->is_multicast) {
                         spin_unlock_irqrestore(&card->ip_lock, *flags);
@@ -784,6 +811,7 @@ __qeth_delete_all_mc(struct qeth_card *card, unsigned long *flags)
                         if (!rc) {
                                 list_del(&addr->entry);
                                 kfree(addr);
+                                goto again;
                         }
                 }
         }
@@ -851,6 +879,7 @@ qeth_set_ip_addr_list(struct qeth_card *card)
 
 static void qeth_delete_mc_addresses(struct qeth_card *);
 static void qeth_add_multicast_ipv4(struct qeth_card *);
+static void qeth_layer2_add_multicast(struct qeth_card *);
 #ifdef CONFIG_QETH_IPV6
 static void qeth_add_multicast_ipv6(struct qeth_card *);
 #endif
@@ -939,6 +968,24 @@ qeth_register_ip_addresses(void *ptr)
         return 0;
 }
 
+/*
+ * Drive the SET_PROMISC_MODE thread
+ */
+static int
+qeth_set_promisc_mode(void *ptr)
+{
+        struct qeth_card *card = (struct qeth_card *) ptr;
+
+        daemonize("qeth_setprm");
+        QETH_DBF_TEXT(trace,4,"setprm1");
+        if (!qeth_do_run_thread(card, QETH_SET_PROMISC_MODE_THREAD))
+                return 0;
+        QETH_DBF_TEXT(trace,4,"setprm2");
+        qeth_setadp_promisc_mode(card);
+        qeth_clear_thread_running_bit(card, QETH_SET_PROMISC_MODE_THREAD);
+        return 0;
+}
+
 static int
 qeth_recover(void *ptr)
 {
@@ -1005,6 +1052,8 @@ qeth_start_kernel_thread(struct qeth_card *card)
 
         if (qeth_do_start_thread(card, QETH_SET_IP_THREAD))
                 kernel_thread(qeth_register_ip_addresses, (void *)card,SIGCHLD);
+        if (qeth_do_start_thread(card, QETH_SET_PROMISC_MODE_THREAD))
+                kernel_thread(qeth_set_promisc_mode, (void *)card, SIGCHLD);
         if (qeth_do_start_thread(card, QETH_RECOVER_THREAD))
                 kernel_thread(qeth_recover, (void *) card, SIGCHLD);
 }
@@ -3749,7 +3798,7 @@ qeth_open(struct net_device *dev)
 
         if ( (card->info.type != QETH_CARD_TYPE_OSN) &&
              (card->options.layer2) &&
-             (!card->info.layer2_mac_registered)) {
+             (!(card->info.mac_bits & QETH_LAYER2_MAC_REGISTERED))) {
                 QETH_DBF_TEXT(trace,4,"nomacadr");
                 return -EPERM;
         }
@@ -4311,6 +4360,8 @@ qeth_do_send_packet(struct qeth_card *card, struct qeth_qdio_out_q *queue,
 out:
         if (flush_count)
                 qeth_flush_buffers(queue, 0, start_index, flush_count);
+        else if (!atomic_read(&queue->set_pci_flags_count))
+                atomic_swap(&queue->state, QETH_OUT_Q_LOCKED_FLUSH);
         /*
          * queue->state will go from LOCKED -> UNLOCKED or from
          * LOCKED_FLUSH -> LOCKED if output_handler wanted to 'notify' us
@@ -4975,6 +5026,10 @@ qeth_default_setassparms_cb(struct qeth_card *, struct qeth_reply *,
                             unsigned long);
 
 static int
+qeth_default_setadapterparms_cb(struct qeth_card *card,
+                                struct qeth_reply *reply,
+                                unsigned long data);
+static int
 qeth_send_setassparms(struct qeth_card *, struct qeth_cmd_buffer *,
                       __u16, long,
                       int (*reply_cb)
@@ -5301,8 +5356,7 @@ qeth_free_vlan_addresses4(struct qeth_card *card, unsigned short vid)
         struct qeth_ipaddr *addr;
 
         QETH_DBF_TEXT(trace, 4, "frvaddr4");
-        if (!card->vlangrp)
-                return;
+
         rcu_read_lock();
         in_dev = __in_dev_get_rcu(card->vlangrp->vlan_devices[vid]);
         if (!in_dev)
@@ -5330,8 +5384,7 @@ qeth_free_vlan_addresses6(struct qeth_card *card, unsigned short vid)
         struct qeth_ipaddr *addr;
 
         QETH_DBF_TEXT(trace, 4, "frvaddr6");
-        if (!card->vlangrp)
-                return;
+
         in6_dev = in6_dev_get(card->vlangrp->vlan_devices[vid]);
         if (!in6_dev)
                 return;
@@ -5351,10 +5404,38 @@ qeth_free_vlan_addresses6(struct qeth_card *card, unsigned short vid)
 }
 
 static void
+qeth_free_vlan_addresses(struct qeth_card *card, unsigned short vid)
+{
+        if (card->options.layer2 || !card->vlangrp)
+                return;
+        qeth_free_vlan_addresses4(card, vid);
+        qeth_free_vlan_addresses6(card, vid);
+}
+
+static int
+qeth_layer2_send_setdelvlan_cb(struct qeth_card *card,
+                               struct qeth_reply *reply,
+                               unsigned long data)
+{
+        struct qeth_ipa_cmd *cmd;
+
+        QETH_DBF_TEXT(trace, 2, "L2sdvcb");
+        cmd = (struct qeth_ipa_cmd *) data;
+        if (cmd->hdr.return_code) {
+                PRINT_ERR("Error in processing VLAN %i on %s: 0x%x. "
+                          "Continuing\n",cmd->data.setdelvlan.vlan_id, 
+                          QETH_CARD_IFNAME(card), cmd->hdr.return_code);
+                QETH_DBF_TEXT_(trace, 2, "L2VL%4x", cmd->hdr.command);
+                QETH_DBF_TEXT_(trace, 2, "L2%s", CARD_BUS_ID(card));
+                QETH_DBF_TEXT_(trace, 2, "err%d", cmd->hdr.return_code);
+        }
+        return 0;
+}
+
+static int
 qeth_layer2_send_setdelvlan(struct qeth_card *card, __u16 i,
                             enum qeth_ipa_cmds ipacmd)
 {
-        int rc;
         struct qeth_ipa_cmd *cmd;
         struct qeth_cmd_buffer *iob;
 
@@ -5362,15 +5443,8 @@ qeth_layer2_send_setdelvlan(struct qeth_card *card, __u16 i,
         iob = qeth_get_ipacmd_buffer(card, ipacmd, QETH_PROT_IPV4);
         cmd = (struct qeth_ipa_cmd *)(iob->data+IPA_PDU_HEADER_SIZE);
         cmd->data.setdelvlan.vlan_id = i;
-
-        rc = qeth_send_ipa_cmd(card, iob, NULL, NULL);
-        if (rc) {
-                PRINT_ERR("Error in processing VLAN %i on %s: 0x%x. "
-                          "Continuing\n",i, QETH_CARD_IFNAME(card), rc);
-                QETH_DBF_TEXT_(trace, 2, "L2VL%4x", ipacmd);
-                QETH_DBF_TEXT_(trace, 2, "L2%s", CARD_BUS_ID(card));
-                QETH_DBF_TEXT_(trace, 2, "err%d", rc);
-        }
+        return qeth_send_ipa_cmd(card, iob, 
+                                 qeth_layer2_send_setdelvlan_cb, NULL);
 }
 
 static void
@@ -5420,8 +5494,7 @@ qeth_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid)
         qeth_free_vlan_skbs(card, vid);
         spin_lock_irqsave(&card->vlanlock, flags);
         /* unregister IP addresses of vlan device */
-        qeth_free_vlan_addresses4(card, vid);
-        qeth_free_vlan_addresses6(card, vid);
+        qeth_free_vlan_addresses(card, vid);
         if (card->vlangrp)
                 card->vlangrp->vlan_devices[vid] = NULL;
         spin_unlock_irqrestore(&card->vlanlock, flags);
@@ -5430,6 +5503,59 @@ qeth_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid)
         qeth_set_multicast_list(card->dev);
 }
 #endif
+/**
+ * Examine hardware response to SET_PROMISC_MODE
+ */
+static int
+qeth_setadp_promisc_mode_cb(struct qeth_card *card, 
+                            struct qeth_reply *reply,
+                            unsigned long data)
+{
+        struct qeth_ipa_cmd *cmd;
+        struct qeth_ipacmd_setadpparms *setparms;
+
+        QETH_DBF_TEXT(trace,4,"prmadpcb");
+
+        cmd = (struct qeth_ipa_cmd *) data;
+        setparms = &(cmd->data.setadapterparms);
+        
+        qeth_default_setadapterparms_cb(card, reply, (unsigned long)cmd);
+        if (cmd->hdr.return_code) { 
+                QETH_DBF_TEXT_(trace,4,"prmrc%2.2x",cmd->hdr.return_code);      
+                setparms->data.mode = SET_PROMISC_MODE_OFF;
+        }
+        card->info.promisc_mode = setparms->data.mode;
+        return 0;
+}
+/*
+ * Set promiscuous mode (on or off) (SET_PROMISC_MODE command)
+ */
+static void
+qeth_setadp_promisc_mode(struct qeth_card *card)
+{
+        enum qeth_ipa_promisc_modes mode;
+        struct net_device *dev = card->dev;
+        struct qeth_cmd_buffer *iob;
+        struct qeth_ipa_cmd *cmd;
+
+        QETH_DBF_TEXT(trace, 4, "setprom");
+
+        if (((dev->flags & IFF_PROMISC) &&
+             (card->info.promisc_mode == SET_PROMISC_MODE_ON)) ||
+            (!(dev->flags & IFF_PROMISC) &&
+             (card->info.promisc_mode == SET_PROMISC_MODE_OFF)))
+                return;
+        mode = SET_PROMISC_MODE_OFF;
+        if (dev->flags & IFF_PROMISC)
+                mode = SET_PROMISC_MODE_ON;
+        QETH_DBF_TEXT_(trace, 4, "mode:%x", mode);
+
+        iob = qeth_get_adapter_cmd(card, IPA_SETADP_SET_PROMISC_MODE,
+                        sizeof(struct qeth_ipacmd_setadpparms));
+        cmd = (struct qeth_ipa_cmd *)(iob->data + IPA_PDU_HEADER_SIZE);
+        cmd->data.setadapterparms.data.mode = mode;
+        qeth_send_ipa_cmd(card, iob, qeth_setadp_promisc_mode_cb, NULL);
+}
 
 /**
  * set multicast address on card
@@ -5444,12 +5570,22 @@ qeth_set_multicast_list(struct net_device *dev)
          
         QETH_DBF_TEXT(trace,3,"setmulti");
         qeth_delete_mc_addresses(card);
+        if (card->options.layer2) {
+                qeth_layer2_add_multicast(card);
+                goto out;
+        }
         qeth_add_multicast_ipv4(card);
 #ifdef CONFIG_QETH_IPV6
         qeth_add_multicast_ipv6(card);
 #endif
+out:
         if (qeth_set_thread_start_bit(card, QETH_SET_IP_THREAD) == 0)
                 schedule_work(&card->kernel_thread_starter);
+        if (!qeth_adp_supported(card, IPA_SETADP_SET_PROMISC_MODE))
+                return;
+        if (qeth_set_thread_start_bit(card, QETH_SET_PROMISC_MODE_THREAD)==0)
+                schedule_work(&card->kernel_thread_starter);
+
 }
 
 static int
@@ -5657,6 +5793,24 @@ qeth_add_multicast_ipv4(struct qeth_card *card)
         in_dev_put(in4_dev);
 }
 
+static void
+qeth_layer2_add_multicast(struct qeth_card *card)
+{
+        struct qeth_ipaddr *ipm;
+        struct dev_mc_list *dm;
+
+        QETH_DBF_TEXT(trace,4,"L2addmc");
+        for (dm = card->dev->mc_list; dm; dm = dm->next) {
+                ipm = qeth_get_addr_buffer(QETH_PROT_IPV4);
+                if (!ipm)
+                        continue;
+                memcpy(ipm->mac,dm->dmi_addr,MAX_ADDR_LEN);
+                ipm->is_multicast = 1;
+                if (!qeth_add_ip(card, ipm))
+                        kfree(ipm);
+        }
+}
+
 #ifdef CONFIG_QETH_IPV6
 static inline void
 qeth_add_mc6(struct qeth_card *card, struct inet6_dev *in6_dev)
@@ -5825,10 +5979,10 @@ qeth_layer2_send_setmac_cb(struct qeth_card *card,
                 PRINT_WARN("Error in registering MAC address on " \
                            "device %s: x%x\n", CARD_BUS_ID(card),
                            cmd->hdr.return_code);
-                card->info.layer2_mac_registered = 0;
+                card->info.mac_bits &= ~QETH_LAYER2_MAC_REGISTERED;
                 cmd->hdr.return_code = -EIO;
         } else {
-                card->info.layer2_mac_registered = 1;
+                card->info.mac_bits |= QETH_LAYER2_MAC_REGISTERED;
                 memcpy(card->dev->dev_addr,cmd->data.setdelmac.mac,
                        OSA_ADDR_LEN);
                 PRINT_INFO("MAC address %2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x "
@@ -5866,7 +6020,7 @@ qeth_layer2_send_delmac_cb(struct qeth_card *card,
                 cmd->hdr.return_code = -EIO;
                 return 0;
         }
-        card->info.layer2_mac_registered = 0;
+        card->info.mac_bits &= ~QETH_LAYER2_MAC_REGISTERED;
 
         return 0;
 }
@@ -5874,7 +6028,7 @@ static int
 qeth_layer2_send_delmac(struct qeth_card *card, __u8 *mac)
 {
         QETH_DBF_TEXT(trace, 2, "L2Delmac");
-        if (!card->info.layer2_mac_registered)
+        if (!(card->info.mac_bits & QETH_LAYER2_MAC_REGISTERED))
                 return 0;
         return qeth_layer2_send_setdelmac(card, mac, IPA_CMD_DELVMAC,
                                           qeth_layer2_send_delmac_cb);
@@ -5896,7 +6050,7 @@ qeth_layer2_set_mac_address(struct net_device *dev, void *p)
         card = (struct qeth_card *) dev->priv;
 
         if (!card->options.layer2) {
-                PRINT_WARN("Setting MAC address on %s is not supported"
+                PRINT_WARN("Setting MAC address on %s is not supported "
                            "in Layer 3 mode.\n", dev->name);
                 QETH_DBF_TEXT(trace, 3, "setmcLY3");
                 return -EOPNOTSUPP;
@@ -6441,6 +6595,8 @@ qeth_default_setadapterparms_cb(struct qeth_card *card,
         return 0;
 }
 
+
+
 static int
 qeth_query_setadapterparms_cb(struct qeth_card *card, struct qeth_reply *reply,
                               unsigned long data)
@@ -6481,8 +6637,13 @@ qeth_setadpparms_change_macaddr_cb(struct qeth_card *card,
         QETH_DBF_TEXT(trace,4,"chgmaccb");
 
         cmd = (struct qeth_ipa_cmd *) data;
-        memcpy(card->dev->dev_addr,
-               &cmd->data.setadapterparms.data.change_addr.addr,OSA_ADDR_LEN);
+        if (!card->options.layer2 || card->info.guestlan ||
+            !(card->info.mac_bits & QETH_LAYER2_MAC_READ)) {    
+                memcpy(card->dev->dev_addr,
+                       &cmd->data.setadapterparms.data.change_addr.addr,
+                       OSA_ADDR_LEN);
+                card->info.mac_bits |= QETH_LAYER2_MAC_READ;
+        }
         qeth_default_setadapterparms_cb(card, reply, (unsigned long) cmd);
         return 0;
 }
@@ -6602,6 +6763,12 @@ qeth_layer2_initialize(struct qeth_card *card)
         QETH_DBF_TEXT(setup, 2, "doL2init");
         QETH_DBF_TEXT_(setup, 2, "doL2%s", CARD_BUS_ID(card));
 
+        rc = qeth_query_setadapterparms(card);
+        if (rc) {
+                PRINT_WARN("could not query adapter parameters on device %s: "
+                           "x%x\n", CARD_BUS_ID(card), rc);
+        }
+
         rc = qeth_setadpparms_change_macaddr(card);
         if (rc) {
                 PRINT_WARN("couldn't get MAC address on "
@@ -8548,7 +8715,7 @@ EXPORT_SYMBOL(qeth_osn_deregister);
 EXPORT_SYMBOL(qeth_osn_assist);
 module_init(qeth_init);
 module_exit(qeth_exit);
-MODULE_AUTHOR("Frank Pavlic <pavlic@de.ibm.com>");
+MODULE_AUTHOR("Frank Pavlic <fpavlic@de.ibm.com>");
 MODULE_DESCRIPTION("Linux on zSeries OSA Express and HiperSockets support\n" \
                                       "Copyright 2000,2003 IBM Corporation\n");
 
diff --git a/drivers/s390/net/qeth_mpc.c b/drivers/s390/net/qeth_mpc.c
index 30e053d3cac2..f0a080a9e515 100644
--- a/drivers/s390/net/qeth_mpc.c
+++ b/drivers/s390/net/qeth_mpc.c
@@ -4,7 +4,7 @@
  * Linux on zSeries OSA Express and HiperSockets support
  *
  * Copyright 2000,2003 IBM Corporation
- * Author(s): Frank Pavlic <pavlic@de.ibm.com>
+ * Author(s): Frank Pavlic <fpavlic@de.ibm.com>
  *            Thomas Spatzier <tspat@de.ibm.com>
  *
  */
diff --git a/drivers/s390/net/qeth_mpc.h b/drivers/s390/net/qeth_mpc.h
index 7edc5f1fc0d2..5f71486e708c 100644
--- a/drivers/s390/net/qeth_mpc.h
+++ b/drivers/s390/net/qeth_mpc.h
@@ -6,7 +6,7 @@
  * Copyright 2000,2003 IBM Corporation
  * Author(s): Utz Bacher <utz.bacher@de.ibm.com>
  *            Thomas Spatzier <tspat@de.ibm.com>
- *            Frank Pavlic <pavlic@de.ibm.com>
+ *            Frank Pavlic <fpavlic@de.ibm.com>
  *
  */
 #ifndef __QETH_MPC_H__
@@ -14,7 +14,7 @@
 
 #include <asm/qeth.h>
 
-#define VERSION_QETH_MPC_H "$Revision: 1.43 $"
+#define VERSION_QETH_MPC_H "$Revision: 1.44 $"
 
 extern const char *VERSION_QETH_MPC_C;
 
@@ -217,7 +217,7 @@ enum qeth_ipa_setadp_cmd {
         IPA_SETADP_SEND_OSA_MESSAGE             = 0x0100,
         IPA_SETADP_SET_SNMP_CONTROL             = 0x0200,
         IPA_SETADP_READ_SNMP_PARMS              = 0x0400,
-        IPA_SETADP_WRITE_SNMP_PARMS             = 0x0800,
+        IPA_SETADP_SET_PROMISC_MODE             = 0x0800,
         IPA_SETADP_QUERY_CARD_INFO              = 0x1000,
 };
 enum qeth_ipa_mac_ops {
@@ -232,9 +232,12 @@ enum qeth_ipa_addr_ops {
         CHANGE_ADDR_ADD_ADDR            = 1,
         CHANGE_ADDR_DEL_ADDR            = 2,
         CHANGE_ADDR_FLUSH_ADDR_TABLE    = 4,
-
-
 };
+enum qeth_ipa_promisc_modes {
+        SET_PROMISC_MODE_OFF            = 0,
+        SET_PROMISC_MODE_ON             = 1,
+};
+
 /* (SET)DELIP(M) IPA stuff ***************************************************/
 struct qeth_ipacmd_setdelip4 {
         __u8   ip_addr[4];
diff --git a/drivers/s390/net/qeth_sys.c b/drivers/s390/net/qeth_sys.c
index f91a02db5743..ddd6019ba092 100644
--- a/drivers/s390/net/qeth_sys.c
+++ b/drivers/s390/net/qeth_sys.c
@@ -1,6 +1,6 @@
 /*
  *
- * linux/drivers/s390/net/qeth_sys.c ($Revision: 1.55 $)
+ * linux/drivers/s390/net/qeth_sys.c ($Revision: 1.58 $)
  *
  * Linux on zSeries OSA Express and HiperSockets support
  * This file contains code related to sysfs.
@@ -8,7 +8,7 @@
  * Copyright 2000,2003 IBM Corporation
  *
  * Author(s): Thomas Spatzier <tspat@de.ibm.com>
- *            Frank Pavlic <pavlic@de.ibm.com>
+ *            Frank Pavlic <fpavlic@de.ibm.com>
  *
  */
 #include <linux/list.h>
@@ -20,7 +20,7 @@
 #include "qeth_mpc.h"
 #include "qeth_fs.h"
 
-const char *VERSION_QETH_SYS_C = "$Revision: 1.55 $";
+const char *VERSION_QETH_SYS_C = "$Revision: 1.58 $";
 
 /*****************************************************************************/
 /*                                                                           */
@@ -1117,7 +1117,7 @@ qeth_parse_ipatoe(const char* buf, enum qeth_prot_versions proto,
         start = buf;
         /* get address string */
         end = strchr(start, '/');
-        if (!end){
+        if (!end || (end-start >= 49)){
                 PRINT_WARN("Invalid format for ipato_addx/delx. "
                            "Use <ip addr>/<mask bits>\n");
                 return -EINVAL;
diff --git a/drivers/s390/net/qeth_tso.h b/drivers/s390/net/qeth_tso.h
index ad33e6f466f1..e245af3c4cbd 100644
--- a/drivers/s390/net/qeth_tso.h
+++ b/drivers/s390/net/qeth_tso.h
@@ -5,7 +5,7 @@
  *
  * Copyright 2004 IBM Corporation
  *
- *    Author(s): Frank Pavlic <pavlic@de.ibm.com>
+ *    Author(s): Frank Pavlic <fpavlic@de.ibm.com>
  *
  *    $Revision: 1.7 $   $Date: 2005/05/04 20:19:18 $
  *
diff --git a/drivers/sbus/char/display7seg.c b/drivers/sbus/char/display7seg.c
index 2c86a4b809cd..c3a51d1fae5d 100644
--- a/drivers/sbus/char/display7seg.c
+++ b/drivers/sbus/char/display7seg.c
@@ -119,7 +119,7 @@ static long d7s_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 {
         __u8 regs = readb(d7s_regs);
         __u8 ireg = 0;
-        int error = 0
+        int error = 0;
 
         if (D7S_MINOR != iminor(file->f_dentry->d_inode))
                 return -ENODEV;
diff --git a/drivers/sbus/char/rtc.c b/drivers/sbus/char/rtc.c
index 5774bdd0e26f..9b988baf0b51 100644
--- a/drivers/sbus/char/rtc.c
+++ b/drivers/sbus/char/rtc.c
@@ -210,27 +210,6 @@ static int rtc_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
         }
 }
 
-static long rtc_compat_ioctl(struct file *file, unsigned int cmd,
-        unsigned long arg)
-{
-        int rval = -ENOIOCTLCMD;
-
-        switch (cmd) {
-        /*
-         * These two are specific to this driver, the generic rtc ioctls
-         * are hanlded elsewhere.
-         */
-        case RTCGET:
-        case RTCSET:
-                lock_kernel();
-                rval = rtc_ioctl(file->f_dentry->d_inode, file, cmd, arg);
-                unlock_kernel();
-                break;
-        }
-
-        return rval;
-}
-
 static int rtc_open(struct inode *inode, struct file *file)
 {
         int ret;
@@ -258,7 +237,6 @@ static struct file_operations rtc_fops = {
         .owner =        THIS_MODULE,
         .llseek =       no_llseek,
         .ioctl =        rtc_ioctl,
-        .compat_ioctl = rtc_compat_ioctl,
         .open =         rtc_open,
         .release =      rtc_release,
 };
diff --git a/drivers/scsi/53c7xx.c b/drivers/scsi/53c7xx.c
index 7a33c708f5b3..9cb5dd48383f 100644
--- a/drivers/scsi/53c7xx.c
+++ b/drivers/scsi/53c7xx.c
@@ -343,7 +343,7 @@ static void NCR53c7x0_soft_reset (struct Scsi_Host *host);
 /* Size of event list (per host adapter) */
 static int track_events = 0;
 static struct Scsi_Host *first_host = NULL;     /* Head of list of NCR boards */
-static Scsi_Host_Template *the_template = NULL; 
+static struct scsi_host_template *the_template = NULL;
 
 /* NCR53c710 script handling code */
 
@@ -1103,7 +1103,7 @@ NCR53c7x0_init (struct Scsi_Host *host) {
 }
 
 /* 
- * Function : int ncr53c7xx_init(Scsi_Host_Template *tpnt, int board, int chip,
+ * Function : int ncr53c7xx_init(struct scsi_host_template *tpnt, int board, int chip,
  *      unsigned long base, int io_port, int irq, int dma, long long options,
  *      int clock);
  *
@@ -1118,7 +1118,7 @@ NCR53c7x0_init (struct Scsi_Host *host) {
  */
 
 int 
-ncr53c7xx_init (Scsi_Host_Template *tpnt, int board, int chip,
+ncr53c7xx_init (struct scsi_host_template *tpnt, int board, int chip,
     unsigned long base, int io_port, int irq, int dma, 
     long long options, int clock)
 {
diff --git a/drivers/scsi/53c7xx.h b/drivers/scsi/53c7xx.h
index d9098bdace05..218f3b901537 100644
--- a/drivers/scsi/53c7xx.h
+++ b/drivers/scsi/53c7xx.h
@@ -1600,7 +1600,7 @@ struct NCR53c7x0_hostdata {
 /* Paranoid people could use panic() here. */
 #define FATAL(host) shutdown((host));
 
-extern int ncr53c7xx_init(Scsi_Host_Template *tpnt, int board, int chip,
+extern int ncr53c7xx_init(struct scsi_host_template *tpnt, int board, int chip,
                           unsigned long base, int io_port, int irq, int dma,
                           long long options, int clock);
 
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index afeca325b4dc..84c42c44e04d 100644
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -1295,27 +1295,6 @@ config SCSI_QLOGIC_FAS
           To compile this driver as a module, choose M here: the
           module will be called qlogicfas.
 
-config SCSI_QLOGIC_ISP
-        tristate "Qlogic ISP SCSI support (old driver)"
-        depends on PCI && SCSI && BROKEN
-        ---help---
-          This driver works for all QLogic PCI SCSI host adapters (IQ-PCI,
-          IQ-PCI-10, IQ_PCI-D) except for the PCI-basic card.  (This latter
-          card is supported by the "AM53/79C974 PCI SCSI" driver.)
-
-          If you say Y here, make sure to choose "BIOS" at the question "PCI
-          access mode".
-
-          Please read the file <file:Documentation/scsi/qlogicisp.txt>.  You
-          should also read the SCSI-HOWTO, available from
-          <http://www.tldp.org/docs.html#howto>.
-
-          To compile this driver as a module, choose M here: the
-          module will be called qlogicisp.
-
-          These days the hardware is also supported by the more modern qla1280
-          driver.  In doubt use that one instead of qlogicisp.
-
 config SCSI_QLOGIC_FC
         tristate "Qlogic ISP FC SCSI support"
         depends on PCI && SCSI
@@ -1342,14 +1321,6 @@ config SCSI_QLOGIC_1280
           To compile this driver as a module, choose M here: the
           module will be called qla1280.
 
-config SCSI_QLOGIC_1280_1040
-        bool "Qlogic QLA 1020/1040 SCSI support"
-        depends on SCSI_QLOGIC_1280 && SCSI_QLOGIC_ISP!=y
-        help
-          Say Y here if you have a QLogic ISP1020/1040 SCSI host adapter and
-          do not want to use the old driver.  This option enables support in
-          the qla1280 driver for those host adapters.
-
 config SCSI_QLOGICPTI
         tristate "PTI Qlogic, ISP Driver"
         depends on SBUS && SCSI
diff --git a/drivers/scsi/Makefile b/drivers/scsi/Makefile
index b88b8c455598..f062ea0f813a 100644
--- a/drivers/scsi/Makefile
+++ b/drivers/scsi/Makefile
@@ -78,7 +78,6 @@ obj-$(CONFIG_SCSI_NCR_Q720)	+= NCR_Q720_mod.o
 obj-$(CONFIG_SCSI_SYM53C416)    += sym53c416.o
 obj-$(CONFIG_SCSI_QLOGIC_FAS)   += qlogicfas408.o       qlogicfas.o
 obj-$(CONFIG_PCMCIA_QLOGIC)     += qlogicfas408.o
-obj-$(CONFIG_SCSI_QLOGIC_ISP)   += qlogicisp.o 
 obj-$(CONFIG_SCSI_QLOGIC_FC)    += qlogicfc.o 
 obj-$(CONFIG_SCSI_QLOGIC_1280)  += qla1280.o 
 obj-$(CONFIG_SCSI_QLA2XXX)      += qla2xxx/
diff --git a/drivers/scsi/NCR53C9x.c b/drivers/scsi/NCR53C9x.c
index 26146a4b67b8..640590bd014a 100644
--- a/drivers/scsi/NCR53C9x.c
+++ b/drivers/scsi/NCR53C9x.c
@@ -529,7 +529,7 @@ void esp_bootup_reset(struct NCR_ESP *esp, struct ESP_regs *eregs)
 /* Allocate structure and insert basic data such as SCSI chip frequency
  * data and a pointer to the device
  */
-struct NCR_ESP* esp_allocate(Scsi_Host_Template *tpnt, void *esp_dev)
+struct NCR_ESP* esp_allocate(struct scsi_host_template *tpnt, void *esp_dev)
 {
         struct NCR_ESP *esp, *elink;
         struct Scsi_Host *esp_host;
@@ -1006,7 +1006,7 @@ static void esp_exec_cmd(struct NCR_ESP *esp)
         struct ESP_regs *eregs = esp->eregs;
         struct esp_device *esp_dev;
         Scsi_Cmnd *SCptr;
-        Scsi_Device *SDptr;
+        struct scsi_device *SDptr;
         volatile unchar *cmdp = esp->esp_command;
         unsigned char the_esp_command;
         int lun, target;
@@ -1687,7 +1687,7 @@ static inline int reconnect_lun(struct NCR_ESP *esp, struct ESP_regs *eregs)
 static inline void esp_connect(struct NCR_ESP *esp, struct ESP_regs *eregs,
                                Scsi_Cmnd *sp)
 {
-        Scsi_Device *dp = sp->device;
+        struct scsi_device *dp = sp->device;
         struct esp_device *esp_dev = dp->hostdata;
 
         if(esp->prev_soff  != esp_dev->sync_max_offset ||
@@ -3605,7 +3605,7 @@ out:
 }
 #endif
 
-int esp_slave_alloc(Scsi_Device *SDptr)
+int esp_slave_alloc(struct scsi_device *SDptr)
 {
         struct esp_device *esp_dev =
                 kmalloc(sizeof(struct esp_device), GFP_ATOMIC);
@@ -3617,7 +3617,7 @@ int esp_slave_alloc(Scsi_Device *SDptr)
         return 0;
 }
 
-void esp_slave_destroy(Scsi_Device *SDptr)
+void esp_slave_destroy(struct scsi_device *SDptr)
 {
         struct NCR_ESP *esp = (struct NCR_ESP *) SDptr->host->hostdata;
 
diff --git a/drivers/scsi/NCR53C9x.h b/drivers/scsi/NCR53C9x.h
index 06e7edf23326..65a9b377a410 100644
--- a/drivers/scsi/NCR53C9x.h
+++ b/drivers/scsi/NCR53C9x.h
@@ -653,7 +653,7 @@ extern int nesps, esps_in_use, esps_running;
 
 /* External functions */
 extern void esp_bootup_reset(struct NCR_ESP *esp, struct ESP_regs *eregs);
-extern struct NCR_ESP *esp_allocate(Scsi_Host_Template *, void *);
+extern struct NCR_ESP *esp_allocate(struct scsi_host_template *, void *);
 extern void esp_deallocate(struct NCR_ESP *);
 extern void esp_release(void);
 extern void esp_initialize(struct NCR_ESP *);
@@ -664,6 +664,6 @@ extern int esp_abort(Scsi_Cmnd *);
 extern int esp_reset(Scsi_Cmnd *);
 extern int esp_proc_info(struct Scsi_Host *shost, char *buffer, char **start, off_t offset, int length,
                          int inout);
-extern int esp_slave_alloc(Scsi_Device *);
-extern void esp_slave_destroy(Scsi_Device *);
+extern int esp_slave_alloc(struct scsi_device *);
+extern void esp_slave_destroy(struct scsi_device *);
 #endif /* !(NCR53C9X_H) */
diff --git a/drivers/scsi/NCR53c406a.c b/drivers/scsi/NCR53c406a.c
index 135376992a57..ae37d3ab9c4a 100644
--- a/drivers/scsi/NCR53c406a.c
+++ b/drivers/scsi/NCR53c406a.c
@@ -447,7 +447,7 @@ static __inline__ int NCR53c406a_pio_write(unsigned char *request, unsigned int
 }
 #endif                          /* USE_PIO */
 
-static int __init NCR53c406a_detect(Scsi_Host_Template * tpnt)
+static int __init NCR53c406a_detect(struct scsi_host_template * tpnt)
 {
         int present = 0;
         struct Scsi_Host *shpnt = NULL;
@@ -1057,7 +1057,7 @@ MODULE_LICENSE("GPL");
  * Use SG_NONE if DMA mode is enabled!
  */
 
-static Scsi_Host_Template driver_template = 
+static struct scsi_host_template driver_template =
 {
      .proc_name                 = "NCR53c406a"          /* proc_name */,        
      .name                      = "NCR53c406a"          /* name */,             
diff --git a/drivers/scsi/a2091.c b/drivers/scsi/a2091.c
index 30a14ba77a6a..54996eaae979 100644
--- a/drivers/scsi/a2091.c
+++ b/drivers/scsi/a2091.c
@@ -172,7 +172,7 @@ static void dma_stop (struct Scsi_Host *instance, Scsi_Cmnd *SCpnt,
     }
 }
 
-int __init a2091_detect(Scsi_Host_Template *tpnt)
+int __init a2091_detect(struct scsi_host_template *tpnt)
 {
     static unsigned char called = 0;
     struct Scsi_Host *instance;
@@ -233,7 +233,7 @@ static int a2091_bus_reset(Scsi_Cmnd *cmd)
 
 #define HOSTS_C
 
-static Scsi_Host_Template driver_template = {
+static struct scsi_host_template driver_template = {
         .proc_name              = "A2901",
         .name                   = "Commodore A2091/A590 SCSI",
         .detect                 = a2091_detect,
diff --git a/drivers/scsi/a2091.h b/drivers/scsi/a2091.h
index 54993972dcc6..22d6a13dd8be 100644
--- a/drivers/scsi/a2091.h
+++ b/drivers/scsi/a2091.h
@@ -11,7 +11,7 @@
 
 #include <linux/types.h>
 
-int a2091_detect(Scsi_Host_Template *);
+int a2091_detect(struct scsi_host_template *);
 int a2091_release(struct Scsi_Host *);
 const char *wd33c93_info(void);
 int wd33c93_queuecommand(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
diff --git a/drivers/scsi/a3000.c b/drivers/scsi/a3000.c
index 306caf56f3d9..f425d424bf08 100644
--- a/drivers/scsi/a3000.c
+++ b/drivers/scsi/a3000.c
@@ -168,7 +168,7 @@ static void dma_stop (struct Scsi_Host *instance, Scsi_Cmnd *SCpnt,
     }
 }
 
-int __init a3000_detect(Scsi_Host_Template *tpnt)
+int __init a3000_detect(struct scsi_host_template *tpnt)
 {
     wd33c93_regs regs;
 
@@ -221,7 +221,7 @@ static int a3000_bus_reset(Scsi_Cmnd *cmd)
 
 #define HOSTS_C
 
-static Scsi_Host_Template driver_template = {
+static struct scsi_host_template driver_template = {
         .proc_name              = "A3000",
         .name                   = "Amiga 3000 built-in SCSI",
         .detect                 = a3000_detect,
diff --git a/drivers/scsi/a3000.h b/drivers/scsi/a3000.h
index b1eda731877d..5535a65150a4 100644
--- a/drivers/scsi/a3000.h
+++ b/drivers/scsi/a3000.h
@@ -11,7 +11,7 @@
 
 #include <linux/types.h>
 
-int a3000_detect(Scsi_Host_Template *);
+int a3000_detect(struct scsi_host_template *);
 int a3000_release(struct Scsi_Host *);
 const char *wd33c93_info(void);
 int wd33c93_queuecommand(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
diff --git a/drivers/scsi/aacraid/aachba.c b/drivers/scsi/aacraid/aachba.c
index 2a128a156aa1..7139659dd952 100644
--- a/drivers/scsi/aacraid/aachba.c
+++ b/drivers/scsi/aacraid/aachba.c
@@ -1579,18 +1579,10 @@ int aac_scsi_cmd(struct scsi_cmnd * scsicmd)
                         break;
         {
                 u64 capacity;
-                char cp[12];
-                unsigned int offset = 0;
+                char cp[13];
 
                 dprintk((KERN_DEBUG "READ CAPACITY_16 command.\n"));
                 capacity = fsa_dev_ptr[cid].size - 1;
-                if (scsicmd->cmnd[13] > 12) {
-                        offset = scsicmd->cmnd[13] - 12;
-                        if (offset > sizeof(cp))
-                                break;
-                        memset(cp, 0, offset);
-                        aac_internal_transfer(scsicmd, cp, 0, offset);
-                }
                 cp[0] = (capacity >> 56) & 0xff;
                 cp[1] = (capacity >> 48) & 0xff;
                 cp[2] = (capacity >> 40) & 0xff;
@@ -1603,7 +1595,18 @@ int aac_scsi_cmd(struct scsi_cmnd * scsicmd)
                 cp[9] = 0;
                 cp[10] = 2;
                 cp[11] = 0;
-                aac_internal_transfer(scsicmd, cp, offset, sizeof(cp));
+                cp[12] = 0;
+                aac_internal_transfer(scsicmd, cp, 0,
+                  min((unsigned int)scsicmd->cmnd[13], sizeof(cp)));
+                if (sizeof(cp) < scsicmd->cmnd[13]) {
+                        unsigned int len, offset = sizeof(cp);
+
+                        memset(cp, 0, offset);
+                        do {
+                                len = min(scsicmd->cmnd[13]-offset, sizeof(cp));
+                                aac_internal_transfer(scsicmd, cp, offset, len);
+                        } while ((offset += len) < scsicmd->cmnd[13]);
+                }
 
                 /* Do not cache partition table for arrays */
                 scsicmd->device->removable = 1;
diff --git a/drivers/scsi/aacraid/commsup.c b/drivers/scsi/aacraid/commsup.c
index 723c0cea7c04..38d6d00fb0fc 100644
--- a/drivers/scsi/aacraid/commsup.c
+++ b/drivers/scsi/aacraid/commsup.c
@@ -820,7 +820,7 @@ static void aac_handle_aif(struct aac_dev * dev, struct fib * fibptr)
                                 break;
 
                         /*
-                         *      Find the Scsi_Device associated with the SCSI
+                         *      Find the scsi_device associated with the SCSI
                          * address. Make sure we have the right array, and if
                          * so set the flag to initiate a new re-config once we
                          * see an AifEnConfigChange AIF come through.
@@ -987,7 +987,7 @@ static void aac_handle_aif(struct aac_dev * dev, struct fib * fibptr)
 
 
         /*
-         *      Find the Scsi_Device associated with the SCSI address,
+         *      Find the scsi_device associated with the SCSI address,
          * and mark it as changed, invalidating the cache. This deals
          * with changes to existing device IDs.
          */
diff --git a/drivers/scsi/advansys.c b/drivers/scsi/advansys.c
index f4cfb8f29620..28b93057b607 100644
--- a/drivers/scsi/advansys.c
+++ b/drivers/scsi/advansys.c
@@ -114,7 +114,7 @@
           #include "advansys.h"
           #endif
 
-        and after "static Scsi_Host_Template builtin_scsi_hosts[] =":
+        and after "static struct scsi_host_template builtin_scsi_hosts[] =":
 
           #ifdef CONFIG_SCSI_ADVANSYS
           ADVANSYS,
@@ -160,7 +160,7 @@
            --- Driver Structures
            --- Driver Data
            --- Driver Function Prototypes
-           --- Linux 'Scsi_Host_Template' and advansys_setup() Functions
+           --- Linux 'struct scsi_host_template' and advansys_setup() Functions
            --- Loadable Driver Support
            --- Miscellaneous Driver Functions
            --- Functions Required by the Asc Library
@@ -4068,7 +4068,7 @@ STATIC void         asc_prt_hex(char *f, uchar *, int);
 
 
 /*
- * --- Linux 'Scsi_Host_Template' and advansys_setup() Functions
+ * --- Linux 'struct scsi_host_template' and advansys_setup() Functions
  */
 
 #ifdef CONFIG_PROC_FS
diff --git a/drivers/scsi/advansys.h b/drivers/scsi/advansys.h
index 3f4bde02302e..8ee7fb16a725 100644
--- a/drivers/scsi/advansys.h
+++ b/drivers/scsi/advansys.h
@@ -19,7 +19,7 @@
 #define _ADVANSYS_H
 
 /*
- * Scsi_Host_Template function prototypes.
+ * struct scsi_host_template function prototypes.
  */
 int advansys_detect(struct scsi_host_template *);
 int advansys_release(struct Scsi_Host *);
diff --git a/drivers/scsi/aha152x.c b/drivers/scsi/aha152x.c
index 9b7caf504a56..9df23b654cec 100644
--- a/drivers/scsi/aha152x.c
+++ b/drivers/scsi/aha152x.c
@@ -424,7 +424,7 @@ MODULE_DEVICE_TABLE(isapnp, id_table);
 
 static int registered_count=0;
 static struct Scsi_Host *aha152x_host[2];
-static Scsi_Host_Template aha152x_driver_template;
+static struct scsi_host_template aha152x_driver_template;
 
 /*
  * internal states of the host
@@ -3464,7 +3464,7 @@ static int aha152x_proc_info(struct Scsi_Host *shpnt, char *buffer, char **start
         return thislength < length ? thislength : length;
 }
 
-static Scsi_Host_Template aha152x_driver_template = {
+static struct scsi_host_template aha152x_driver_template = {
         .module                         = THIS_MODULE,
         .name                           = AHA152X_REVID,
         .proc_name                      = "aha152x",
diff --git a/drivers/scsi/aha1542.c b/drivers/scsi/aha1542.c
index 1b1adfb384cb..51bad7a1e773 100644
--- a/drivers/scsi/aha1542.c
+++ b/drivers/scsi/aha1542.c
@@ -1021,7 +1021,7 @@ __setup("aha1542=",do_setup);
 #endif
 
 /* return non-zero on detection */
-static int __init aha1542_detect(Scsi_Host_Template * tpnt)
+static int __init aha1542_detect(struct scsi_host_template * tpnt)
 {
         unsigned char dma_chan;
         unsigned char irq_level;
@@ -1789,7 +1789,7 @@ static int aha1542_biosparam(struct scsi_device *sdev,
 MODULE_LICENSE("GPL");
 
 
-static Scsi_Host_Template driver_template = {
+static struct scsi_host_template driver_template = {
         .proc_name              = "aha1542",
         .name                   = "Adaptec 1542",
         .detect                 = aha1542_detect,
diff --git a/drivers/scsi/aha1542.h b/drivers/scsi/aha1542.h
index 3821ee17f471..1db538552d56 100644
--- a/drivers/scsi/aha1542.h
+++ b/drivers/scsi/aha1542.h
@@ -131,7 +131,7 @@ struct ccb {			/* Command Control Block 5.3 */
                                 /* REQUEST SENSE */
 };
 
-static int aha1542_detect(Scsi_Host_Template *);
+static int aha1542_detect(struct scsi_host_template *);
 static int aha1542_queuecommand(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
 static int aha1542_bus_reset(Scsi_Cmnd * SCpnt);
 static int aha1542_dev_reset(Scsi_Cmnd * SCpnt);
diff --git a/drivers/scsi/aha1740.c b/drivers/scsi/aha1740.c
index 8f85dcc0e7fa..4b8c6a543925 100644
--- a/drivers/scsi/aha1740.c
+++ b/drivers/scsi/aha1740.c
@@ -570,7 +570,7 @@ static int aha1740_eh_abort_handler (Scsi_Cmnd *dummy)
         return 0;
 }
 
-static Scsi_Host_Template aha1740_template = {
+static struct scsi_host_template aha1740_template = {
         .module           = THIS_MODULE,
         .proc_name        = "aha1740",
         .proc_info        = aha1740_proc_info,
diff --git a/drivers/scsi/ahci.c b/drivers/scsi/ahci.c
index 10c470e7d316..4e96ec5f2ff9 100644
--- a/drivers/scsi/ahci.c
+++ b/drivers/scsi/ahci.c
@@ -134,6 +134,7 @@ enum {
                                   PORT_IRQ_D2H_REG_FIS,
 
         /* PORT_CMD bits */
+        PORT_CMD_ATAPI          = (1 << 24), /* Device is ATAPI */
         PORT_CMD_LIST_ON        = (1 << 15), /* cmd list DMA engine running */
         PORT_CMD_FIS_ON         = (1 << 14), /* FIS DMA engine running */
         PORT_CMD_FIS_RX         = (1 << 4), /* Enable FIS receive DMA engine */
@@ -255,7 +256,7 @@ static struct ata_port_info ahci_port_info[] = {
         },
 };
 
-static struct pci_device_id ahci_pci_tbl[] = {
+static const struct pci_device_id ahci_pci_tbl[] = {
         { PCI_VENDOR_ID_INTEL, 0x2652, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
           board_ahci }, /* ICH6 */
         { PCI_VENDOR_ID_INTEL, 0x2653, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
@@ -441,7 +442,7 @@ static void ahci_phy_reset(struct ata_port *ap)
         void __iomem *port_mmio = (void __iomem *) ap->ioaddr.cmd_addr;
         struct ata_taskfile tf;
         struct ata_device *dev = &ap->device[0];
-        u32 tmp;
+        u32 new_tmp, tmp;
 
         __sata_phy_reset(ap);
 
@@ -455,8 +456,21 @@ static void ahci_phy_reset(struct ata_port *ap)
         tf.nsect        = (tmp)         & 0xff;
 
         dev->class = ata_dev_classify(&tf);
-        if (!ata_dev_present(dev))
+        if (!ata_dev_present(dev)) {
                 ata_port_disable(ap);
+                return;
+        }
+
+        /* Make sure port's ATAPI bit is set appropriately */
+        new_tmp = tmp = readl(port_mmio + PORT_CMD);
+        if (dev->class == ATA_DEV_ATAPI)
+                new_tmp |= PORT_CMD_ATAPI;
+        else
+                new_tmp &= ~PORT_CMD_ATAPI;
+        if (new_tmp != tmp) {
+                writel(new_tmp, port_mmio + PORT_CMD);
+                readl(port_mmio + PORT_CMD); /* flush */
+        }
 }
 
 static u8 ahci_check_status(struct ata_port *ap)
@@ -474,11 +488,12 @@ static void ahci_tf_read(struct ata_port *ap, struct ata_taskfile *tf)
         ata_tf_from_fis(d2h_fis, tf);
 }
 
-static void ahci_fill_sg(struct ata_queued_cmd *qc)
+static unsigned int ahci_fill_sg(struct ata_queued_cmd *qc)
 {
         struct ahci_port_priv *pp = qc->ap->private_data;
         struct scatterlist *sg;
         struct ahci_sg *ahci_sg;
+        unsigned int n_sg = 0;
 
         VPRINTK("ENTER\n");
 
@@ -493,8 +508,12 @@ static void ahci_fill_sg(struct ata_queued_cmd *qc)
                 ahci_sg->addr = cpu_to_le32(addr & 0xffffffff);
                 ahci_sg->addr_hi = cpu_to_le32((addr >> 16) >> 16);
                 ahci_sg->flags_size = cpu_to_le32(sg_len - 1);
+
                 ahci_sg++;
+                n_sg++;
         }
+
+        return n_sg;
 }
 
 static void ahci_qc_prep(struct ata_queued_cmd *qc)
@@ -503,13 +522,14 @@ static void ahci_qc_prep(struct ata_queued_cmd *qc)
         struct ahci_port_priv *pp = ap->private_data;
         u32 opts;
         const u32 cmd_fis_len = 5; /* five dwords */
+        unsigned int n_elem;
 
         /*
          * Fill in command slot information (currently only one slot,
          * slot 0, is currently since we don't do queueing)
          */
 
-        opts = (qc->n_elem << 16) | cmd_fis_len;
+        opts = cmd_fis_len;
         if (qc->tf.flags & ATA_TFLAG_WRITE)
                 opts |= AHCI_CMD_WRITE;
         if (is_atapi_taskfile(&qc->tf))
@@ -533,7 +553,9 @@ static void ahci_qc_prep(struct ata_queued_cmd *qc)
         if (!(qc->flags & ATA_QCFLAG_DMAMAP))
                 return;
 
-        ahci_fill_sg(qc);
+        n_elem = ahci_fill_sg(qc);
+
+        pp->cmd_slot[0].opts |= cpu_to_le32(n_elem << 16);
 }
 
 static void ahci_intr_error(struct ata_port *ap, u32 irq_stat)
diff --git a/drivers/scsi/aic7xxx/aic79xx_osm.c b/drivers/scsi/aic7xxx/aic79xx_osm.c
index cfb46c241b38..31e9f40e79a2 100644
--- a/drivers/scsi/aic7xxx/aic79xx_osm.c
+++ b/drivers/scsi/aic7xxx/aic79xx_osm.c
@@ -436,29 +436,20 @@ ahd_linux_queue(struct scsi_cmnd * cmd, void (*scsi_done) (struct scsi_cmnd *))
 {
         struct   ahd_softc *ahd;
         struct   ahd_linux_device *dev = scsi_transport_device_data(cmd->device);
+        int rtn = SCSI_MLQUEUE_HOST_BUSY;
+        unsigned long flags;
 
         ahd = *(struct ahd_softc **)cmd->device->host->hostdata;
 
-        /*
-         * Close the race of a command that was in the process of
-         * being queued to us just as our simq was frozen.  Let
-         * DV commands through so long as we are only frozen to
-         * perform DV.
-         */
-        if (ahd->platform_data->qfrozen != 0) {
-                printf("%s: queue frozen\n", ahd_name(ahd));
+        ahd_lock(ahd, &flags);
+        if (ahd->platform_data->qfrozen == 0) {
+                cmd->scsi_done = scsi_done;
+                cmd->result = CAM_REQ_INPROG << 16;
+                rtn = ahd_linux_run_command(ahd, dev, cmd);
 
-                return SCSI_MLQUEUE_HOST_BUSY;
         }
-
-        /*
-         * Save the callback on completion function.
-         */
-        cmd->scsi_done = scsi_done;
-
-        cmd->result = CAM_REQ_INPROG << 16;
-
-        return ahd_linux_run_command(ahd, dev, cmd);
+        ahd_unlock(ahd, &flags);
+        return rtn;
 }
 
 static inline struct scsi_target **
@@ -1081,7 +1072,6 @@ ahd_linux_register_host(struct ahd_softc *ahd, struct scsi_host_template *templa
 
         *((struct ahd_softc **)host->hostdata) = ahd;
         ahd_lock(ahd, &s);
-        scsi_assign_lock(host, &ahd->platform_data->spin_lock);
         ahd->platform_data->host = host;
         host->can_queue = AHD_MAX_QUEUE;
         host->cmd_per_lun = 2;
@@ -2062,6 +2052,7 @@ ahd_linux_queue_recovery_cmd(struct scsi_cmnd *cmd, scb_flag flag)
         int    wait;
         int    disconnected;
         ahd_mode_state saved_modes;
+        unsigned long flags;
 
         pending_scb = NULL;
         paused = FALSE;
@@ -2077,7 +2068,7 @@ ahd_linux_queue_recovery_cmd(struct scsi_cmnd *cmd, scb_flag flag)
                 printf(" 0x%x", cmd->cmnd[cdb_byte]);
         printf("\n");
 
-        spin_lock_irq(&ahd->platform_data->spin_lock);
+        ahd_lock(ahd, &flags);
 
         /*
          * First determine if we currently own this command.
@@ -2291,7 +2282,8 @@ done:
                 int ret;
 
                 ahd->platform_data->flags |= AHD_SCB_UP_EH_SEM;
-                spin_unlock_irq(&ahd->platform_data->spin_lock);
+                ahd_unlock(ahd, &flags);
+
                 init_timer(&timer);
                 timer.data = (u_long)ahd;
                 timer.expires = jiffies + (5 * HZ);
@@ -2305,9 +2297,8 @@ done:
                         printf("Timer Expired\n");
                         retval = FAILED;
                 }
-                spin_lock_irq(&ahd->platform_data->spin_lock);
         }
-        spin_unlock_irq(&ahd->platform_data->spin_lock);
+                ahd_unlock(ahd, &flags);
         return (retval);
 }
 
diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm.c b/drivers/scsi/aic7xxx/aic7xxx_osm.c
index 1861407422e4..7fc6454068e4 100644
--- a/drivers/scsi/aic7xxx/aic7xxx_osm.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_osm.c
@@ -476,26 +476,20 @@ ahc_linux_queue(struct scsi_cmnd * cmd, void (*scsi_done) (struct scsi_cmnd *))
 {
         struct   ahc_softc *ahc;
         struct   ahc_linux_device *dev = scsi_transport_device_data(cmd->device);
+        int rtn = SCSI_MLQUEUE_HOST_BUSY;
+        unsigned long flags;
 
         ahc = *(struct ahc_softc **)cmd->device->host->hostdata;
 
-        /*
-         * Save the callback on completion function.
-         */
-        cmd->scsi_done = scsi_done;
-
-        /*
-         * Close the race of a command that was in the process of
-         * being queued to us just as our simq was frozen.  Let
-         * DV commands through so long as we are only frozen to
-         * perform DV.
-         */
-        if (ahc->platform_data->qfrozen != 0)
-                return SCSI_MLQUEUE_HOST_BUSY;
-
-        cmd->result = CAM_REQ_INPROG << 16;
+        ahc_lock(ahc, &flags);
+        if (ahc->platform_data->qfrozen == 0) {
+                cmd->scsi_done = scsi_done;
+                cmd->result = CAM_REQ_INPROG << 16;
+                rtn = ahc_linux_run_command(ahc, dev, cmd);
+        }
+        ahc_unlock(ahc, &flags);
 
-        return ahc_linux_run_command(ahc, dev, cmd);
+        return rtn;
 }
 
 static inline struct scsi_target **
@@ -1079,7 +1073,6 @@ ahc_linux_register_host(struct ahc_softc *ahc, struct scsi_host_template *templa
 
         *((struct ahc_softc **)host->hostdata) = ahc;
         ahc_lock(ahc, &s);
-        scsi_assign_lock(host, &ahc->platform_data->spin_lock);
         ahc->platform_data->host = host;
         host->can_queue = AHC_MAX_QUEUE;
         host->cmd_per_lun = 2;
@@ -2111,6 +2104,7 @@ ahc_linux_queue_recovery_cmd(struct scsi_cmnd *cmd, scb_flag flag)
         int    paused;
         int    wait;
         int    disconnected;
+        unsigned long flags;
 
         pending_scb = NULL;
         paused = FALSE;
@@ -2125,7 +2119,7 @@ ahc_linux_queue_recovery_cmd(struct scsi_cmnd *cmd, scb_flag flag)
                 printf(" 0x%x", cmd->cmnd[cdb_byte]);
         printf("\n");
 
-        spin_lock_irq(&ahc->platform_data->spin_lock);
+        ahc_lock(ahc, &flags);
 
         /*
          * First determine if we currently own this command.
@@ -2357,7 +2351,8 @@ done:
                 int ret;
 
                 ahc->platform_data->flags |= AHC_UP_EH_SEMAPHORE;
-                spin_unlock_irq(&ahc->platform_data->spin_lock);
+                ahc_unlock(ahc, &flags);
+
                 init_timer(&timer);
                 timer.data = (u_long)ahc;
                 timer.expires = jiffies + (5 * HZ);
@@ -2371,10 +2366,8 @@ done:
                         printf("Timer Expired\n");
                         retval = FAILED;
                 }
-                spin_lock_irq(&ahc->platform_data->spin_lock);
-        }
-
-        spin_unlock_irq(&ahc->platform_data->spin_lock);
+        } else
+                ahc_unlock(ahc, &flags);
         return (retval);
 }
 
diff --git a/drivers/scsi/aic7xxx_old.c b/drivers/scsi/aic7xxx_old.c
index 880e2d9ffe9b..33d56c344944 100644
--- a/drivers/scsi/aic7xxx_old.c
+++ b/drivers/scsi/aic7xxx_old.c
@@ -6514,7 +6514,7 @@ do_aic7xxx_isr(int irq, void *dev_id, struct pt_regs *regs)
 static void
 aic7xxx_init_transinfo(struct aic7xxx_host *p, struct aic_dev_data *aic_dev)
 {
-  Scsi_Device *sdpnt = aic_dev->SDptr;
+  struct scsi_device *sdpnt = aic_dev->SDptr;
   unsigned char tindex;
 
   tindex = sdpnt->id | (sdpnt->channel << 3);
@@ -6581,7 +6581,7 @@ aic7xxx_init_transinfo(struct aic7xxx_host *p, struct aic_dev_data *aic_dev)
  *   Set up the initial aic_dev struct pointers
  *-F*************************************************************************/
 static int
-aic7xxx_slave_alloc(Scsi_Device *SDptr)
+aic7xxx_slave_alloc(struct scsi_device *SDptr)
 {
   struct aic7xxx_host *p = (struct aic7xxx_host *)SDptr->host->hostdata;
   struct aic_dev_data *aic_dev;
@@ -6644,7 +6644,7 @@ aic7xxx_slave_alloc(Scsi_Device *SDptr)
  *   queueing to be [en|dis]abled for a specific adapter.
  *-F*************************************************************************/
 static void
-aic7xxx_device_queue_depth(struct aic7xxx_host *p, Scsi_Device *device)
+aic7xxx_device_queue_depth(struct aic7xxx_host *p, struct scsi_device *device)
 {
   int tag_enabled = FALSE;
   struct aic_dev_data *aic_dev = device->hostdata;
@@ -6734,7 +6734,7 @@ aic7xxx_device_queue_depth(struct aic7xxx_host *p, Scsi_Device *device)
  *   prepare for this device to go away
  *-F*************************************************************************/
 static void
-aic7xxx_slave_destroy(Scsi_Device *SDptr)
+aic7xxx_slave_destroy(struct scsi_device *SDptr)
 {
   struct aic_dev_data *aic_dev = SDptr->hostdata;
 
@@ -6754,7 +6754,7 @@ aic7xxx_slave_destroy(Scsi_Device *SDptr)
  *   depths, allocate command structs, etc.
  *-F*************************************************************************/
 static int
-aic7xxx_slave_configure(Scsi_Device *SDptr)
+aic7xxx_slave_configure(struct scsi_device *SDptr)
 {
   struct aic7xxx_host *p = (struct aic7xxx_host *) SDptr->host->hostdata;
   struct aic_dev_data *aic_dev;
@@ -7865,7 +7865,7 @@ detect_maxscb(struct aic7xxx_host *p)
  *   Register a Adaptec aic7xxx chip SCSI controller with the kernel.
  *-F*************************************************************************/
 static int
-aic7xxx_register(Scsi_Host_Template *template, struct aic7xxx_host *p,
+aic7xxx_register(struct scsi_host_template *template, struct aic7xxx_host *p,
   int reset_delay)
 {
   int i, result;
@@ -8412,7 +8412,7 @@ aic7xxx_chip_reset(struct aic7xxx_host *p)
  *   and a pointer to a aic7xxx_host struct upon success.
  *-F*************************************************************************/
 static struct aic7xxx_host *
-aic7xxx_alloc(Scsi_Host_Template *sht, struct aic7xxx_host *temp)
+aic7xxx_alloc(struct scsi_host_template *sht, struct aic7xxx_host *temp)
 {
   struct aic7xxx_host *p = NULL;
   struct Scsi_Host *host;
@@ -8991,7 +8991,7 @@ aic7xxx_configure_bugs(struct aic7xxx_host *p)
  *       mid-level SCSI code is overhauled.
  *-F*************************************************************************/
 static int
-aic7xxx_detect(Scsi_Host_Template *template)
+aic7xxx_detect(struct scsi_host_template *template)
 {
   struct aic7xxx_host *temp_p = NULL;
   struct aic7xxx_host *current_p = NULL;
@@ -11161,7 +11161,7 @@ MODULE_LICENSE("Dual BSD/GPL");
 MODULE_VERSION(AIC7XXX_H_VERSION);
 
 
-static Scsi_Host_Template driver_template = {
+static struct scsi_host_template driver_template = {
         .proc_info              = aic7xxx_proc_info,
         .detect                 = aic7xxx_detect,
         .release                = aic7xxx_release,
diff --git a/drivers/scsi/amiga7xx.c b/drivers/scsi/amiga7xx.c
index dea8446f5360..c0844fa32c5d 100644
--- a/drivers/scsi/amiga7xx.c
+++ b/drivers/scsi/amiga7xx.c
@@ -29,7 +29,7 @@
 #include "amiga7xx.h"
 
 
-static int amiga7xx_register_one(Scsi_Host_Template *tpnt,
+static int amiga7xx_register_one(struct scsi_host_template *tpnt,
                                  unsigned long address)
 {
     long long options;
@@ -65,7 +65,7 @@ static struct {
     { 0 }
 };
 
-static int __init amiga7xx_zorro_detect(Scsi_Host_Template *tpnt)
+static int __init amiga7xx_zorro_detect(struct scsi_host_template *tpnt)
 {
     int num = 0, i;
     struct zorro_dev *z = NULL;
@@ -89,7 +89,7 @@ static int __init amiga7xx_zorro_detect(Scsi_Host_Template *tpnt)
 #endif /* CONFIG_ZORRO */
 
 
-int __init amiga7xx_detect(Scsi_Host_Template *tpnt)
+int __init amiga7xx_detect(struct scsi_host_template *tpnt)
 {
     static unsigned char called = 0;
     int num = 0;
@@ -122,7 +122,7 @@ static int amiga7xx_release(struct Scsi_Host *shost)
         return 0;
 }
 
-static Scsi_Host_Template driver_template = {
+static struct scsi_host_template driver_template = {
         .name                   = "Amiga NCR53c710 SCSI",
         .detect                 = amiga7xx_detect,
         .release                = amiga7xx_release,
diff --git a/drivers/scsi/amiga7xx.h b/drivers/scsi/amiga7xx.h
index 8cc54a5b889e..1b637592d5ae 100644
--- a/drivers/scsi/amiga7xx.h
+++ b/drivers/scsi/amiga7xx.h
@@ -2,7 +2,7 @@
 
 #include <linux/types.h>
 
-int amiga7xx_detect(Scsi_Host_Template *);
+int amiga7xx_detect(struct scsi_host_template *);
 const char *NCR53c7x0_info(void);
 int NCR53c7xx_queue_command(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
 int NCR53c7xx_abort(Scsi_Cmnd *);
diff --git a/drivers/scsi/arm/acornscsi.c b/drivers/scsi/arm/acornscsi.c
index be2caecbbdd9..b7b20c689c24 100644
--- a/drivers/scsi/arm/acornscsi.c
+++ b/drivers/scsi/arm/acornscsi.c
@@ -896,7 +896,7 @@ void acornscsi_done(AS_Host *host, Scsi_Cmnd **SCpntp, unsigned int result)
  * Notes    : this will only be one SG entry or less
  */
 static
-void acornscsi_data_updateptr(AS_Host *host, Scsi_Pointer *SCp, unsigned int length)
+void acornscsi_data_updateptr(AS_Host *host, struct scsi_pointer *SCp, unsigned int length)
 {
     SCp->ptr += length;
     SCp->this_residual -= length;
@@ -2862,7 +2862,7 @@ int acornscsi_proc_info(struct Scsi_Host *instance, char *buffer, char **start,
                         int length, int inout)
 {
     int pos, begin = 0, devidx;
-    Scsi_Device *scd;
+    struct scsi_device *scd;
     AS_Host *host;
     char *p = buffer;
 
@@ -2971,7 +2971,7 @@ int acornscsi_proc_info(struct Scsi_Host *instance, char *buffer, char **start,
     return pos;
 }
 
-static Scsi_Host_Template acornscsi_template = {
+static struct scsi_host_template acornscsi_template = {
         .module                 = THIS_MODULE,
         .proc_info              = acornscsi_proc_info,
         .name                   = "AcornSCSI",
diff --git a/drivers/scsi/arm/acornscsi.h b/drivers/scsi/arm/acornscsi.h
index 03881f091645..2142290f8404 100644
--- a/drivers/scsi/arm/acornscsi.h
+++ b/drivers/scsi/arm/acornscsi.h
@@ -292,7 +292,7 @@ typedef struct acornscsi_hostdata {
             unsigned char       tag;            /* reconnected tag                      */
         } reconnected;
 
-        Scsi_Pointer    SCp;                    /* current commands data pointer        */
+        struct scsi_pointer     SCp;                    /* current commands data pointer        */
 
         MsgQueue_t      msgs;
 
diff --git a/drivers/scsi/arm/arxescsi.c b/drivers/scsi/arm/arxescsi.c
index 29811f5891ee..804125e35fc3 100644
--- a/drivers/scsi/arm/arxescsi.c
+++ b/drivers/scsi/arm/arxescsi.c
@@ -65,7 +65,7 @@ struct arxescsi_info {
  * Returns : 0 if we should not set CMD_WITHDMA for transfer info command
  */
 static fasdmatype_t
-arxescsi_dma_setup(struct Scsi_Host *host, Scsi_Pointer *SCp,
+arxescsi_dma_setup(struct Scsi_Host *host, struct scsi_pointer *SCp,
                        fasdmadir_t direction, fasdmatype_t min_type)
 {
         /*
@@ -111,7 +111,7 @@ static void arxescsi_pseudo_dma_write(unsigned char *addr, void __iomem *base)
  *           transfer  - minimum number of bytes we expect to transfer
  */
 static void
-arxescsi_dma_pseudo(struct Scsi_Host *host, Scsi_Pointer *SCp,
+arxescsi_dma_pseudo(struct Scsi_Host *host, struct scsi_pointer *SCp,
                     fasdmadir_t direction, int transfer)
 {
         struct arxescsi_info *info = (struct arxescsi_info *)host->hostdata;
@@ -197,7 +197,7 @@ arxescsi_dma_pseudo(struct Scsi_Host *host, Scsi_Pointer *SCp,
  * Params  : host  - host
  *           SCpnt - command
  */
-static void arxescsi_dma_stop(struct Scsi_Host *host, Scsi_Pointer *SCp)
+static void arxescsi_dma_stop(struct Scsi_Host *host, struct scsi_pointer *SCp)
 {
         /*
          * no DMA to stop
@@ -261,7 +261,7 @@ arxescsi_proc_info(struct Scsi_Host *host, char *buffer, char **start, off_t off
         return pos;
 }
 
-static Scsi_Host_Template arxescsi_template = {
+static struct scsi_host_template arxescsi_template = {
         .proc_info                      = arxescsi_proc_info,
         .name                           = "ARXE SCSI card",
         .info                           = arxescsi_info,
diff --git a/drivers/scsi/arm/cumana_1.c b/drivers/scsi/arm/cumana_1.c
index 26498553a7cc..81e266be26d0 100644
--- a/drivers/scsi/arm/cumana_1.c
+++ b/drivers/scsi/arm/cumana_1.c
@@ -238,7 +238,7 @@ static void cumanascsi_write(struct Scsi_Host *instance, int reg, int value)
 
 #include "../NCR5380.c"
 
-static Scsi_Host_Template cumanascsi_template = {
+static struct scsi_host_template cumanascsi_template = {
         .module                 = THIS_MODULE,
         .name                   = "Cumana 16-bit SCSI",
         .info                   = cumanascsi_info,
diff --git a/drivers/scsi/arm/cumana_2.c b/drivers/scsi/arm/cumana_2.c
index 0ef0644eeb29..3a7a46b0dc41 100644
--- a/drivers/scsi/arm/cumana_2.c
+++ b/drivers/scsi/arm/cumana_2.c
@@ -157,7 +157,7 @@ cumanascsi_2_intr(int irq, void *dev_id, struct pt_regs *regs)
  * Returns  : type of transfer to be performed
  */
 static fasdmatype_t
-cumanascsi_2_dma_setup(struct Scsi_Host *host, Scsi_Pointer *SCp,
+cumanascsi_2_dma_setup(struct Scsi_Host *host, struct scsi_pointer *SCp,
                        fasdmadir_t direction, fasdmatype_t min_type)
 {
         struct cumanascsi2_info *info = (struct cumanascsi2_info *)host->hostdata;
@@ -209,7 +209,7 @@ cumanascsi_2_dma_setup(struct Scsi_Host *host, Scsi_Pointer *SCp,
  *            transfer  - minimum number of bytes we expect to transfer
  */
 static void
-cumanascsi_2_dma_pseudo(struct Scsi_Host *host, Scsi_Pointer *SCp,
+cumanascsi_2_dma_pseudo(struct Scsi_Host *host, struct scsi_pointer *SCp,
                         fasdmadir_t direction, int transfer)
 {
         struct cumanascsi2_info *info = (struct cumanascsi2_info *)host->hostdata;
@@ -283,7 +283,7 @@ cumanascsi_2_dma_pseudo(struct Scsi_Host *host, Scsi_Pointer *SCp,
  *            SCpnt - command
  */
 static void
-cumanascsi_2_dma_stop(struct Scsi_Host *host, Scsi_Pointer *SCp)
+cumanascsi_2_dma_stop(struct Scsi_Host *host, struct scsi_pointer *SCp)
 {
         struct cumanascsi2_info *info = (struct cumanascsi2_info *)host->hostdata;
         if (info->info.scsi.dma != NO_DMA) {
@@ -381,7 +381,7 @@ int cumanascsi_2_proc_info (struct Scsi_Host *host, char *buffer, char **start,
         return pos;
 }
 
-static Scsi_Host_Template cumanascsi2_template = {
+static struct scsi_host_template cumanascsi2_template = {
         .module                         = THIS_MODULE,
         .proc_info                      = cumanascsi_2_proc_info,
         .name                           = "Cumana SCSI II",
diff --git a/drivers/scsi/arm/ecoscsi.c b/drivers/scsi/arm/ecoscsi.c
index f8a7fdd3c465..6adcccbf444b 100644
--- a/drivers/scsi/arm/ecoscsi.c
+++ b/drivers/scsi/arm/ecoscsi.c
@@ -155,7 +155,7 @@ printk("reading %p len %d\n",addr, len);
 
 #include "../NCR5380.c"
 
-static Scsi_Host_Template ecoscsi_template =  {
+static struct scsi_host_template ecoscsi_template =  {
         .module         = THIS_MODULE,
         .name           = "Serial Port EcoSCSI NCR5380",
         .proc_name      = "ecoscsi",
diff --git a/drivers/scsi/arm/eesox.c b/drivers/scsi/arm/eesox.c
index ce711f166cfb..4d1e8f52c924 100644
--- a/drivers/scsi/arm/eesox.c
+++ b/drivers/scsi/arm/eesox.c
@@ -158,7 +158,7 @@ eesoxscsi_intr(int irq, void *dev_id, struct pt_regs *regs)
  * Returns  : type of transfer to be performed
  */
 static fasdmatype_t
-eesoxscsi_dma_setup(struct Scsi_Host *host, Scsi_Pointer *SCp,
+eesoxscsi_dma_setup(struct Scsi_Host *host, struct scsi_pointer *SCp,
                        fasdmadir_t direction, fasdmatype_t min_type)
 {
         struct eesoxscsi_info *info = (struct eesoxscsi_info *)host->hostdata;
@@ -353,7 +353,7 @@ static void eesoxscsi_buffer_out(void *buf, int length, void __iomem *base)
 }
 
 static void
-eesoxscsi_dma_pseudo(struct Scsi_Host *host, Scsi_Pointer *SCp,
+eesoxscsi_dma_pseudo(struct Scsi_Host *host, struct scsi_pointer *SCp,
                      fasdmadir_t dir, int transfer_size)
 {
         struct eesoxscsi_info *info = (struct eesoxscsi_info *)host->hostdata;
@@ -370,7 +370,7 @@ eesoxscsi_dma_pseudo(struct Scsi_Host *host, Scsi_Pointer *SCp,
  *            SCpnt - command
  */
 static void
-eesoxscsi_dma_stop(struct Scsi_Host *host, Scsi_Pointer *SCp)
+eesoxscsi_dma_stop(struct Scsi_Host *host, struct scsi_pointer *SCp)
 {
         struct eesoxscsi_info *info = (struct eesoxscsi_info *)host->hostdata;
         if (info->info.scsi.dma != NO_DMA)
@@ -499,7 +499,7 @@ static ssize_t eesoxscsi_store_term(struct device *dev, struct device_attribute
 static DEVICE_ATTR(bus_term, S_IRUGO | S_IWUSR,
                    eesoxscsi_show_term, eesoxscsi_store_term);
 
-static Scsi_Host_Template eesox_template = {
+static struct scsi_host_template eesox_template = {
         .module                         = THIS_MODULE,
         .proc_info                      = eesoxscsi_proc_info,
         .name                           = "EESOX SCSI",
diff --git a/drivers/scsi/arm/fas216.c b/drivers/scsi/arm/fas216.c
index 4772fb317f3e..3e1053f111dc 100644
--- a/drivers/scsi/arm/fas216.c
+++ b/drivers/scsi/arm/fas216.c
@@ -173,7 +173,7 @@ static void fas216_dumpstate(FAS216_Info *info)
                 fas216_readb(info, REG_CTCH));
 }
 
-static void print_SCp(Scsi_Pointer *SCp, const char *prefix, const char *suffix)
+static void print_SCp(struct scsi_pointer *SCp, const char *prefix, const char *suffix)
 {
         printk("%sptr %p this_residual 0x%x buffer %p buffers_residual 0x%x%s",
                 prefix, SCp->ptr, SCp->this_residual, SCp->buffer,
@@ -628,7 +628,7 @@ static void fas216_handlesync(FAS216_Info *info, char *msg)
  */
 static void fas216_updateptrs(FAS216_Info *info, int bytes_transferred)
 {
-        Scsi_Pointer *SCp = &info->scsi.SCp;
+        struct scsi_pointer *SCp = &info->scsi.SCp;
 
         fas216_checkmagic(info);
 
@@ -668,7 +668,7 @@ static void fas216_updateptrs(FAS216_Info *info, int bytes_transferred)
  */
 static void fas216_pio(FAS216_Info *info, fasdmadir_t direction)
 {
-        Scsi_Pointer *SCp = &info->scsi.SCp;
+        struct scsi_pointer *SCp = &info->scsi.SCp;
 
         fas216_checkmagic(info);
 
@@ -2559,7 +2559,7 @@ int fas216_eh_bus_reset(Scsi_Cmnd *SCpnt)
 {
         FAS216_Info *info = (FAS216_Info *)SCpnt->device->host->hostdata;
         unsigned long flags;
-        Scsi_Device *SDpnt;
+        struct scsi_device *SDpnt;
 
         fas216_checkmagic(info);
         fas216_log(info, LOG_ERROR, "resetting bus");
@@ -3000,7 +3000,7 @@ int fas216_print_stats(FAS216_Info *info, char *buffer)
 int fas216_print_devices(FAS216_Info *info, char *buffer)
 {
         struct fas216_device *dev;
-        Scsi_Device *scd;
+        struct scsi_device *scd;
         char *p = buffer;
 
         p += sprintf(p, "Device/Lun TaggedQ       Parity   Sync\n");
diff --git a/drivers/scsi/arm/fas216.h b/drivers/scsi/arm/fas216.h
index 60a2a120205b..540914d6fd32 100644
--- a/drivers/scsi/arm/fas216.h
+++ b/drivers/scsi/arm/fas216.h
@@ -243,7 +243,7 @@ typedef struct {
                 unsigned int    irq;                    /* interrupt                            */
                 int             dma;                    /* dma channel                          */
 
-                Scsi_Pointer    SCp;                    /* current commands data pointer        */
+                struct scsi_pointer     SCp;                    /* current commands data pointer        */
 
                 MsgQueue_t      msgs;                   /* message queue for connected device   */
 
@@ -304,9 +304,9 @@ typedef struct {
         /* dma */
         struct {
                 fasdmatype_t    transfer_type;          /* current type of DMA transfer         */
-                fasdmatype_t    (*setup) (struct Scsi_Host *host, Scsi_Pointer *SCp, fasdmadir_t direction, fasdmatype_t min_dma);
-                void            (*pseudo)(struct Scsi_Host *host, Scsi_Pointer *SCp, fasdmadir_t direction, int transfer);
-                void            (*stop)  (struct Scsi_Host *host, Scsi_Pointer *SCp);
+                fasdmatype_t    (*setup) (struct Scsi_Host *host, struct scsi_pointer *SCp, fasdmadir_t direction, fasdmatype_t min_dma);
+                void            (*pseudo)(struct Scsi_Host *host, struct scsi_pointer *SCp, fasdmadir_t direction, int transfer);
+                void            (*stop)  (struct Scsi_Host *host, struct scsi_pointer *SCp);
         } dma;
 
         /* miscellaneous */
diff --git a/drivers/scsi/arm/oak.c b/drivers/scsi/arm/oak.c
index de24bb991f1d..d806b024c3bd 100644
--- a/drivers/scsi/arm/oak.c
+++ b/drivers/scsi/arm/oak.c
@@ -111,7 +111,7 @@ printk("reading %p len %d\n", addr, len);
 
 #include "../NCR5380.c"
 
-static Scsi_Host_Template oakscsi_template = {
+static struct scsi_host_template oakscsi_template = {
         .module                 = THIS_MODULE,
         .proc_info              = oakscsi_proc_info,
         .name                   = "Oak 16-bit SCSI",
diff --git a/drivers/scsi/arm/powertec.c b/drivers/scsi/arm/powertec.c
index abda216113f1..3333d7b39139 100644
--- a/drivers/scsi/arm/powertec.c
+++ b/drivers/scsi/arm/powertec.c
@@ -132,7 +132,7 @@ powertecscsi_intr(int irq, void *dev_id, struct pt_regs *regs)
  * Returns  : type of transfer to be performed
  */
 static fasdmatype_t
-powertecscsi_dma_setup(struct Scsi_Host *host, Scsi_Pointer *SCp,
+powertecscsi_dma_setup(struct Scsi_Host *host, struct scsi_pointer *SCp,
                        fasdmadir_t direction, fasdmatype_t min_type)
 {
         struct powertec_info *info = (struct powertec_info *)host->hostdata;
@@ -174,7 +174,7 @@ powertecscsi_dma_setup(struct Scsi_Host *host, Scsi_Pointer *SCp,
  *            SCpnt - command
  */
 static void
-powertecscsi_dma_stop(struct Scsi_Host *host, Scsi_Pointer *SCp)
+powertecscsi_dma_stop(struct Scsi_Host *host, struct scsi_pointer *SCp)
 {
         struct powertec_info *info = (struct powertec_info *)host->hostdata;
         if (info->info.scsi.dma != NO_DMA)
@@ -293,7 +293,7 @@ powertecscsi_store_term(struct device *dev, struct device_attribute *attr, const
 static DEVICE_ATTR(bus_term, S_IRUGO | S_IWUSR,
                    powertecscsi_show_term, powertecscsi_store_term);
 
-static Scsi_Host_Template powertecscsi_template = {
+static struct scsi_host_template powertecscsi_template = {
         .module                         = THIS_MODULE,
         .proc_info                      = powertecscsi_proc_info,
         .name                           = "PowerTec SCSI",
diff --git a/drivers/scsi/arm/scsi.h b/drivers/scsi/arm/scsi.h
index 19937640e2e7..6dd544a5eb56 100644
--- a/drivers/scsi/arm/scsi.h
+++ b/drivers/scsi/arm/scsi.h
@@ -18,7 +18,7 @@
  * The scatter-gather list handling.  This contains all
  * the yucky stuff that needs to be fixed properly.
  */
-static inline int copy_SCp_to_sg(struct scatterlist *sg, Scsi_Pointer *SCp, int max)
+static inline int copy_SCp_to_sg(struct scatterlist *sg, struct scsi_pointer *SCp, int max)
 {
         int bufs = SCp->buffers_residual;
 
@@ -32,7 +32,7 @@ static inline int copy_SCp_to_sg(struct scatterlist *sg, Scsi_Pointer *SCp, int
         return bufs + 1;
 }
 
-static inline int next_SCp(Scsi_Pointer *SCp)
+static inline int next_SCp(struct scsi_pointer *SCp)
 {
         int ret = SCp->buffers_residual;
         if (ret) {
@@ -49,7 +49,7 @@ static inline int next_SCp(Scsi_Pointer *SCp)
         return ret;
 }
 
-static inline unsigned char get_next_SCp_byte(Scsi_Pointer *SCp)
+static inline unsigned char get_next_SCp_byte(struct scsi_pointer *SCp)
 {
         char c = *SCp->ptr;
 
@@ -59,7 +59,7 @@ static inline unsigned char get_next_SCp_byte(Scsi_Pointer *SCp)
         return c;
 }
 
-static inline void put_next_SCp_byte(Scsi_Pointer *SCp, unsigned char c)
+static inline void put_next_SCp_byte(struct scsi_pointer *SCp, unsigned char c)
 {
         *SCp->ptr = c;
         SCp->ptr += 1;
diff --git a/drivers/scsi/ata_piix.c b/drivers/scsi/ata_piix.c
index a1bd8d95623c..855428ff37e9 100644
--- a/drivers/scsi/ata_piix.c
+++ b/drivers/scsi/ata_piix.c
@@ -95,7 +95,7 @@ static void piix_set_dmamode (struct ata_port *ap, struct ata_device *adev);
 
 static unsigned int in_module_init = 1;
 
-static struct pci_device_id piix_pci_tbl[] = {
+static const struct pci_device_id piix_pci_tbl[] = {
 #ifdef ATA_ENABLE_PATA
         { 0x8086, 0x7111, PCI_ANY_ID, PCI_ANY_ID, 0, 0, piix4_pata },
         { 0x8086, 0x24db, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich5_pata },
diff --git a/drivers/scsi/atari_NCR5380.c b/drivers/scsi/atari_NCR5380.c
index 2c12be72c4c6..2ae31ceb32a8 100644
--- a/drivers/scsi/atari_NCR5380.c
+++ b/drivers/scsi/atari_NCR5380.c
@@ -255,7 +255,7 @@
  */
 
 static struct Scsi_Host *first_instance = NULL;
-static Scsi_Host_Template *the_template = NULL;
+static struct scsi_host_template *the_template = NULL;
 
 /* Macros ease life... :-) */
 #define SETUP_HOSTDATA(in)                              \
diff --git a/drivers/scsi/atari_scsi.c b/drivers/scsi/atari_scsi.c
index af8adb629b33..f4c1ca7c1572 100644
--- a/drivers/scsi/atari_scsi.c
+++ b/drivers/scsi/atari_scsi.c
@@ -600,7 +600,7 @@ int atari_queue_command (Scsi_Cmnd *cmd, void (*done)(Scsi_Cmnd *))
 #endif
 
 
-int atari_scsi_detect (Scsi_Host_Template *host)
+int atari_scsi_detect (struct scsi_host_template *host)
 {
         static int called = 0;
         struct Scsi_Host *instance;
@@ -1141,7 +1141,7 @@ static void atari_scsi_falcon_reg_write( unsigned char reg, unsigned char value
 
 #include "atari_NCR5380.c"
 
-static Scsi_Host_Template driver_template = {
+static struct scsi_host_template driver_template = {
         .proc_info              = atari_scsi_proc_info,
         .name                   = "Atari native SCSI",
         .detect                 = atari_scsi_detect,
diff --git a/drivers/scsi/atari_scsi.h b/drivers/scsi/atari_scsi.h
index cc1256988841..f917bdd09b41 100644
--- a/drivers/scsi/atari_scsi.h
+++ b/drivers/scsi/atari_scsi.h
@@ -18,7 +18,7 @@
 /* (I_HAVE_OVERRUNS stuff removed) */
 
 #ifndef ASM
-int atari_scsi_detect (Scsi_Host_Template *);
+int atari_scsi_detect (struct scsi_host_template *);
 const char *atari_scsi_info (struct Scsi_Host *);
 int atari_scsi_reset (Scsi_Cmnd *, unsigned int);
 #ifdef MODULE
diff --git a/drivers/scsi/blz1230.c b/drivers/scsi/blz1230.c
index 4cd9fcf4dc50..763e409a1ff3 100644
--- a/drivers/scsi/blz1230.c
+++ b/drivers/scsi/blz1230.c
@@ -94,7 +94,7 @@ static volatile unsigned char cmd_buffer[16];
                                  */
 
 /***************************************************************** Detection */
-int __init blz1230_esp_detect(Scsi_Host_Template *tpnt)
+int __init blz1230_esp_detect(struct scsi_host_template *tpnt)
 {
         struct NCR_ESP *esp;
         struct zorro_dev *z = NULL;
@@ -328,7 +328,7 @@ int blz1230_esp_release(struct Scsi_Host *instance)
 }
 
 
-static Scsi_Host_Template driver_template = {
+static struct scsi_host_template driver_template = {
         .proc_name              = "esp-blz1230",
         .proc_info              = esp_proc_info,
         .name                   = "Blizzard1230 SCSI IV",
diff --git a/drivers/scsi/blz2060.c b/drivers/scsi/blz2060.c
index c5221d0de5ca..d72d05fffdfa 100644
--- a/drivers/scsi/blz2060.c
+++ b/drivers/scsi/blz2060.c
@@ -90,7 +90,7 @@ static volatile unsigned char cmd_buffer[16];
                                  */
 
 /***************************************************************** Detection */
-int __init blz2060_esp_detect(Scsi_Host_Template *tpnt)
+int __init blz2060_esp_detect(struct scsi_host_template *tpnt)
 {
         struct NCR_ESP *esp;
         struct zorro_dev *z = NULL;
@@ -282,7 +282,7 @@ int blz2060_esp_release(struct Scsi_Host *instance)
 }
 
 
-static Scsi_Host_Template driver_template = {
+static struct scsi_host_template driver_template = {
         .proc_name              = "esp-blz2060",
         .proc_info              = esp_proc_info,
         .name                   = "Blizzard2060 SCSI",
diff --git a/drivers/scsi/bvme6000.c b/drivers/scsi/bvme6000.c
index 130f30f51a9b..2958b8c2bfb7 100644
--- a/drivers/scsi/bvme6000.c
+++ b/drivers/scsi/bvme6000.c
@@ -23,7 +23,7 @@
 #include<linux/stat.h>
 
 
-int bvme6000_scsi_detect(Scsi_Host_Template *tpnt)
+int bvme6000_scsi_detect(struct scsi_host_template *tpnt)
 {
     static unsigned char called = 0;
     int clock;
@@ -59,7 +59,7 @@ static int bvme6000_scsi_release(struct Scsi_Host *shost)
         return 0;
 }
 
-static Scsi_Host_Template driver_template = {
+static struct scsi_host_template driver_template = {
         .name                   = "BVME6000 NCR53c710 SCSI",
         .detect                 = bvme6000_scsi_detect,
         .release                = bvme6000_scsi_release,
diff --git a/drivers/scsi/bvme6000.h b/drivers/scsi/bvme6000.h
index 49b6bbb0978e..7c9c0366cc08 100644
--- a/drivers/scsi/bvme6000.h
+++ b/drivers/scsi/bvme6000.h
@@ -3,7 +3,7 @@
 
 #include <linux/types.h>
 
-int bvme6000_scsi_detect(Scsi_Host_Template *);
+int bvme6000_scsi_detect(struct scsi_host_template *);
 const char *NCR53c7x0_info(void);
 int NCR53c7xx_queue_command(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
 int NCR53c7xx_abort(Scsi_Cmnd *);
diff --git a/drivers/scsi/cyberstorm.c b/drivers/scsi/cyberstorm.c
index bdbca85d1675..f9b940e56430 100644
--- a/drivers/scsi/cyberstorm.c
+++ b/drivers/scsi/cyberstorm.c
@@ -104,7 +104,7 @@ static volatile unsigned char cmd_buffer[16];
                                  */
 
 /***************************************************************** Detection */
-int __init cyber_esp_detect(Scsi_Host_Template *tpnt)
+int __init cyber_esp_detect(struct scsi_host_template *tpnt)
 {
         struct NCR_ESP *esp;
         struct zorro_dev *z = NULL;
@@ -353,7 +353,7 @@ int cyber_esp_release(struct Scsi_Host *instance)
 }
 
 
-static Scsi_Host_Template driver_template = {
+static struct scsi_host_template driver_template = {
         .proc_name              = "esp-cyberstorm",
         .proc_info              = esp_proc_info,
         .name                   = "CyberStorm SCSI",
diff --git a/drivers/scsi/cyberstormII.c b/drivers/scsi/cyberstormII.c
index 845d9259821e..a3caabfd7557 100644
--- a/drivers/scsi/cyberstormII.c
+++ b/drivers/scsi/cyberstormII.c
@@ -81,7 +81,7 @@ static volatile unsigned char cmd_buffer[16];
                                  */
 
 /***************************************************************** Detection */
-int __init cyberII_esp_detect(Scsi_Host_Template *tpnt)
+int __init cyberII_esp_detect(struct scsi_host_template *tpnt)
 {
         struct NCR_ESP *esp;
         struct zorro_dev *z = NULL;
@@ -290,7 +290,7 @@ int cyberII_esp_release(struct Scsi_Host *instance)
 }
 
 
-static Scsi_Host_Template driver_template = {
+static struct scsi_host_template driver_template = {
         .proc_name              = "esp-cyberstormII",
         .proc_info              = esp_proc_info,
         .name                   = "CyberStorm Mk II SCSI",
diff --git a/drivers/scsi/dec_esp.c b/drivers/scsi/dec_esp.c
index 256d6baf8df3..a35ee43a48df 100644
--- a/drivers/scsi/dec_esp.c
+++ b/drivers/scsi/dec_esp.c
@@ -133,7 +133,7 @@ static struct scsi_host_template driver_template = {
 #include "scsi_module.c"
 
 /***************************************************************** Detection */
-static int dec_esp_detect(Scsi_Host_Template * tpnt)
+static int dec_esp_detect(struct scsi_host_template * tpnt)
 {
         struct NCR_ESP *esp;
         struct ConfigDev *esp_dev;
diff --git a/drivers/scsi/dpti.h b/drivers/scsi/dpti.h
index 489194af43d0..2ad2a89b5db4 100644
--- a/drivers/scsi/dpti.h
+++ b/drivers/scsi/dpti.h
@@ -44,7 +44,7 @@ static int adpt_device_reset(struct scsi_cmnd* cmd);
 
 
 /*
- * Scsi_Host_Template (see hosts.h) 
+ * struct scsi_host_template (see hosts.h)
  */
 
 #define DPT_DRIVER_NAME "Adaptec I2O RAID"
diff --git a/drivers/scsi/dtc.c b/drivers/scsi/dtc.c
index 897743b23342..310d2f488668 100644
--- a/drivers/scsi/dtc.c
+++ b/drivers/scsi/dtc.c
@@ -199,7 +199,7 @@ static void __init dtc_setup(char *str, int *ints)
 #endif
 
 /* 
- * Function : int dtc_detect(Scsi_Host_Template * tpnt)
+ * Function : int dtc_detect(struct scsi_host_template * tpnt)
  *
  * Purpose : detects and initializes DTC 3180/3280 controllers
  *      that were autoprobed, overridden on the LILO command line, 
@@ -211,7 +211,7 @@ static void __init dtc_setup(char *str, int *ints)
  *
 */
 
-static int __init dtc_detect(Scsi_Host_Template * tpnt)
+static int __init dtc_detect(struct scsi_host_template * tpnt)
 {
         static int current_override = 0, current_base = 0;
         struct Scsi_Host *instance;
@@ -471,7 +471,7 @@ static int dtc_release(struct Scsi_Host *shost)
         return 0;
 }
 
-static Scsi_Host_Template driver_template = {
+static struct scsi_host_template driver_template = {
         .name                           = "DTC 3180/3280 ",
         .detect                         = dtc_detect,
         .release                        = dtc_release,
diff --git a/drivers/scsi/dtc.h b/drivers/scsi/dtc.h
index 277cd015ee4e..0b205f8c7326 100644
--- a/drivers/scsi/dtc.h
+++ b/drivers/scsi/dtc.h
@@ -35,7 +35,7 @@
 static int dtc_abort(Scsi_Cmnd *);
 static int dtc_biosparam(struct scsi_device *, struct block_device *,
                          sector_t, int*);
-static int dtc_detect(Scsi_Host_Template *);
+static int dtc_detect(struct scsi_host_template *);
 static int dtc_queue_command(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
 static int dtc_bus_reset(Scsi_Cmnd *);
 
diff --git a/drivers/scsi/fastlane.c b/drivers/scsi/fastlane.c
index ae47612b3614..ccee68b52f7e 100644
--- a/drivers/scsi/fastlane.c
+++ b/drivers/scsi/fastlane.c
@@ -125,7 +125,7 @@ static inline void dma_clear(struct NCR_ESP *esp)
 }
 
 /***************************************************************** Detection */
-int __init fastlane_esp_detect(Scsi_Host_Template *tpnt)
+int __init fastlane_esp_detect(struct scsi_host_template *tpnt)
 {
         struct NCR_ESP *esp;
         struct zorro_dev *z = NULL;
@@ -398,7 +398,7 @@ int fastlane_esp_release(struct Scsi_Host *instance)
 }
 
 
-static Scsi_Host_Template driver_template = {
+static struct scsi_host_template driver_template = {
         .proc_name              = "esp-fastlane",
         .proc_info              = esp_proc_info,
         .name                   = "Fastlane SCSI",
diff --git a/drivers/scsi/fcal.c b/drivers/scsi/fcal.c
index a6f120dcdfc3..03416548f20c 100644
--- a/drivers/scsi/fcal.c
+++ b/drivers/scsi/fcal.c
@@ -70,7 +70,7 @@ static unsigned char target2alpa[] = {
 
 static int fcal_encode_addr(Scsi_Cmnd *SCpnt, u16 *addr, fc_channel *fc, fcp_cmnd *fcmd);
 
-int fcal_slave_configure(Scsi_Device *device)
+int fcal_slave_configure(struct scsi_device *device)
 {
         int depth_to_use;
         
@@ -89,7 +89,7 @@ int fcal_slave_configure(Scsi_Device *device)
 
 /* Detect all FC Arbitrated Loops attached to the machine.
    fc4 module has done all the work for us... */
-int __init fcal_detect(Scsi_Host_Template *tpnt)
+int __init fcal_detect(struct scsi_host_template *tpnt)
 {
         int nfcals = 0;
         fc_channel *fc;
@@ -244,7 +244,7 @@ int fcal_proc_info (struct Scsi_Host *host, char *buffer, char **start, off_t of
                         SPRINTF ("  [AL-PA: %02x, Port WWN: %08x%08x, Node WWN: %08x%08x] Not responded to PRLI\n",
                                  alpa, u1[0], u1[1], u2[0], u2[1]);
                 } else {
-                        Scsi_Device *scd;
+                        struct scsi_device *scd;
                         shost_for_each_device(scd, host)
                                 if (scd->id == target) {
                                         SPRINTF ("  [AL-PA: %02x, Id: %02d, Port WWN: %08x%08x, Node WWN: %08x%08x]  ",
@@ -297,7 +297,7 @@ static int fcal_encode_addr(Scsi_Cmnd *SCpnt, u16 *addr, fc_channel *fc, fcp_cmn
         return 0;
 }
 
-static Scsi_Host_Template driver_template = {
+static struct scsi_host_template driver_template = {
         .name                   = "Fibre Channel Arbitrated Loop",
         .detect                 = fcal_detect,
         .release                = fcal_release, 
diff --git a/drivers/scsi/fcal.h b/drivers/scsi/fcal.h
index 21aa32ef9134..7ff2c3494f9e 100644
--- a/drivers/scsi/fcal.h
+++ b/drivers/scsi/fcal.h
@@ -20,8 +20,8 @@ struct fcal {
    for a particular channel */
 #define FCAL_CAN_QUEUE          512
 
-int fcal_detect(Scsi_Host_Template *);
+int fcal_detect(struct scsi_host_template *);
 int fcal_release(struct Scsi_Host *);
-int fcal_slave_configure(Scsi_Device *);
+int fcal_slave_configure(struct scsi_device *);
 
 #endif /* !(_FCAL_H) */
diff --git a/drivers/scsi/fd_mcs.c b/drivers/scsi/fd_mcs.c
index 6d44602aae78..cca485a2b438 100644
--- a/drivers/scsi/fd_mcs.c
+++ b/drivers/scsi/fd_mcs.c
@@ -343,7 +343,7 @@ static void fd_mcs_make_bus_idle(struct Scsi_Host *shpnt)
                 outb(0x01 | PARITY_MASK, TMC_Cntl_port);
 }
 
-static int fd_mcs_detect(Scsi_Host_Template * tpnt)
+static int fd_mcs_detect(struct scsi_host_template * tpnt)
 {
         int loop;
         struct Scsi_Host *shpnt;
@@ -1343,7 +1343,7 @@ static int fd_mcs_biosparam(struct scsi_device * disk, struct block_device *bdev
         return 0;
 }
 
-static Scsi_Host_Template driver_template = {
+static struct scsi_host_template driver_template = {
         .proc_name                      = "fd_mcs",
         .proc_info                      = fd_mcs_proc_info,
         .detect                         = fd_mcs_detect,
diff --git a/drivers/scsi/g_NCR5380.c b/drivers/scsi/g_NCR5380.c
index a3aa729b9d3c..45756fa90777 100644
--- a/drivers/scsi/g_NCR5380.c
+++ b/drivers/scsi/g_NCR5380.c
@@ -285,7 +285,7 @@ static int __init do_DTC3181E_setup(char *str)
  *      Locks: none
  */
 
-int __init generic_NCR5380_detect(Scsi_Host_Template * tpnt)
+int __init generic_NCR5380_detect(struct scsi_host_template * tpnt)
 {
         static int current_override = 0;
         int count, i;
@@ -798,7 +798,7 @@ static int generic_NCR5380_proc_info(struct Scsi_Host *scsi_ptr, char *buffer, c
         Scsi_Cmnd *ptr;
         struct NCR5380_hostdata *hostdata;
 #ifdef NCR5380_STATS
-        Scsi_Device *dev;
+        struct scsi_device *dev;
         extern const char *const scsi_device_types[MAX_SCSI_DEVICE_CODE];
 #endif
 
@@ -899,7 +899,7 @@ static int generic_NCR5380_proc_info(struct Scsi_Host *scsi_ptr, char *buffer, c
 #undef PRINTP
 #undef ANDP
 
-static Scsi_Host_Template driver_template = {
+static struct scsi_host_template driver_template = {
         .proc_info              = generic_NCR5380_proc_info,
         .name                   = "Generic NCR5380/NCR53C400 Scsi Driver",
         .detect                 = generic_NCR5380_detect,
diff --git a/drivers/scsi/g_NCR5380.h b/drivers/scsi/g_NCR5380.h
index c8adc5a94884..656fbe2f91f6 100644
--- a/drivers/scsi/g_NCR5380.h
+++ b/drivers/scsi/g_NCR5380.h
@@ -45,7 +45,7 @@
 
 #ifndef ASM
 static int generic_NCR5380_abort(Scsi_Cmnd *);
-static int generic_NCR5380_detect(Scsi_Host_Template *);
+static int generic_NCR5380_detect(struct scsi_host_template *);
 static int generic_NCR5380_release_resources(struct Scsi_Host *);
 static int generic_NCR5380_queue_command(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
 static int generic_NCR5380_bus_reset(Scsi_Cmnd *);
diff --git a/drivers/scsi/gdth.c b/drivers/scsi/gdth.c
index af682301beac..a6deb016584c 100644
--- a/drivers/scsi/gdth.c
+++ b/drivers/scsi/gdth.c
@@ -94,7 +94,7 @@
  * Bugfix free_irq()
  *
  * Revision 1.56  2001/08/09 11:19:39  achim
- * Scsi_Host_Template changes
+ * struct scsi_host_template changes
  *
  * Revision 1.55  2001/08/09 10:11:28  achim
  * Command HOST_UNFREEZE_IO before cache service init.
@@ -4153,7 +4153,7 @@ int __init option_setup(char *str)
     return 1;
 }
 
-static int __init gdth_detect(Scsi_Host_Template *shtp)
+static int __init gdth_detect(struct scsi_host_template *shtp)
 {
     struct Scsi_Host *shp;
     gdth_pci_str pcistr[MAXHA];
@@ -5562,7 +5562,7 @@ static void gdth_flush(int hanum)
 #else
     Scsi_Cmnd       *scp;
 #endif
-    Scsi_Device     *sdev;
+    struct scsi_device     *sdev;
     char            cmnd[MAX_COMMAND_SIZE];   
     memset(cmnd, 0xff, MAX_COMMAND_SIZE);
 
@@ -5624,10 +5624,10 @@ static int gdth_halt(struct notifier_block *nb, ulong event, void *buf)
     gdth_cmd_str    gdtcmd;
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
     Scsi_Request    *srp;
-    Scsi_Device     *sdev;
+    struct scsi_device     *sdev;
 #else
     Scsi_Cmnd       *scp;
-    Scsi_Device     *sdev;
+    struct scsi_device     *sdev;
 #endif
     char            cmnd[MAX_COMMAND_SIZE];   
 #endif
@@ -5683,7 +5683,7 @@ static int gdth_halt(struct notifier_block *nb, ulong event, void *buf)
     return NOTIFY_OK;
 }
 
-static Scsi_Host_Template driver_template = {
+static struct scsi_host_template driver_template = {
         .proc_name              = "gdth", 
         .proc_info              = gdth_proc_info,
         .name                   = "GDT SCSI Disk Array Controller",
diff --git a/drivers/scsi/gdth.h b/drivers/scsi/gdth.h
index c0f1e3411524..cc4882fb97ad 100644
--- a/drivers/scsi/gdth.h
+++ b/drivers/scsi/gdth.h
@@ -944,9 +944,9 @@ typedef struct {
     ulong               dma32_cnt, dma64_cnt;   /* statistics: DMA buffer */
 #endif
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
-    Scsi_Device         *sdev;
+    struct scsi_device         *sdev;
 #else
-    Scsi_Device         sdev;
+    struct scsi_device         sdev;
 #endif
 } gdth_ha_str;
 
diff --git a/drivers/scsi/gdth_proc.c b/drivers/scsi/gdth_proc.c
index 1bd02f8d1e6a..5e8657f9cdf6 100644
--- a/drivers/scsi/gdth_proc.c
+++ b/drivers/scsi/gdth_proc.c
@@ -54,10 +54,10 @@ static int gdth_set_info(char *buffer,int length,struct Scsi_Host *host,
     int             ret_val = -EINVAL;
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
     Scsi_Request    *scp;
-    Scsi_Device     *sdev;
+    struct scsi_device     *sdev;
 #else
     Scsi_Cmnd       *scp;
-    Scsi_Device     *sdev;
+    struct scsi_device     *sdev;
 #endif
     TRACE2(("gdth_set_info() ha %d bus %d\n",hanum,busnum));
 
@@ -232,10 +232,10 @@ static int gdth_get_info(char *buffer,char **start,off_t offset,int length,
     gdth_evt_str *estr;
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
     Scsi_Request *scp;
-    Scsi_Device *sdev; 
+    struct scsi_device *sdev;
 #else
     Scsi_Cmnd *scp;
-    Scsi_Device *sdev;
+    struct scsi_device *sdev;
 #endif
     char hrec[161];
     struct timeval tv;
@@ -275,7 +275,7 @@ static int gdth_get_info(char *buffer,char **start,off_t offset,int length,
     scp->cmd_len = 12;
     scp->use_sg = 0;
 #else
-    memset(&sdev,0,sizeof(Scsi_Device));
+    memset(&sdev,0,sizeof(struct scsi_device));
     memset(&scp, 0,sizeof(Scsi_Cmnd));
     sdev.host = scp.host = host;
     sdev.id = scp.target = sdev.host->this_id;
diff --git a/drivers/scsi/gvp11.c b/drivers/scsi/gvp11.c
index ab22387c9df1..5b154498056d 100644
--- a/drivers/scsi/gvp11.c
+++ b/drivers/scsi/gvp11.c
@@ -169,7 +169,7 @@ static void dma_stop (struct Scsi_Host *instance, Scsi_Cmnd *SCpnt,
 
 #define CHECK_WD33C93
 
-int __init gvp11_detect(Scsi_Host_Template *tpnt)
+int __init gvp11_detect(struct scsi_host_template *tpnt)
 {
     static unsigned char called = 0;
     struct Scsi_Host *instance;
@@ -361,7 +361,7 @@ static int gvp11_bus_reset(Scsi_Cmnd *cmd)
 
 #include "gvp11.h"
 
-static Scsi_Host_Template driver_template = {
+static struct scsi_host_template driver_template = {
         .proc_name              = "GVP11",
         .name                   = "GVP Series II SCSI",
         .detect                 = gvp11_detect,
diff --git a/drivers/scsi/gvp11.h b/drivers/scsi/gvp11.h
index 5148d9fada19..575d219d14ba 100644
--- a/drivers/scsi/gvp11.h
+++ b/drivers/scsi/gvp11.h
@@ -11,7 +11,7 @@
 
 #include <linux/types.h>
 
-int gvp11_detect(Scsi_Host_Template *);
+int gvp11_detect(struct scsi_host_template *);
 int gvp11_release(struct Scsi_Host *);
 const char *wd33c93_info(void);
 int wd33c93_queuecommand(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
diff --git a/drivers/scsi/ibmmca.c b/drivers/scsi/ibmmca.c
index 8d97999db60e..b60c1b9270f1 100644
--- a/drivers/scsi/ibmmca.c
+++ b/drivers/scsi/ibmmca.c
@@ -492,7 +492,7 @@ static char *ibmrate(unsigned int, int);
 static int probe_display(int);
 static int probe_bus_mode(int);
 static int device_exists(int, int, int *, int *);
-static struct Scsi_Host *ibmmca_register(Scsi_Host_Template *, int, int, int, char *);
+static struct Scsi_Host *ibmmca_register(struct scsi_host_template *, int, int, int, char *);
 static int option_setup(char *);
 /* local functions needed for proc_info */
 static int ldn_access_load(int, int);
@@ -1483,7 +1483,7 @@ static int ibmmca_getinfo(char *buf, int slot, void *dev_id)
         return len;
 }
 
-int ibmmca_detect(Scsi_Host_Template * scsi_template)
+int ibmmca_detect(struct scsi_host_template * scsi_template)
 {
         struct Scsi_Host *shpnt;
         int port, id, i, j, k, list_size, slot;
@@ -1736,7 +1736,7 @@ int ibmmca_detect(Scsi_Host_Template * scsi_template)
         return found;           /* return the number of found SCSI hosts. Should be 1 or 0. */
 }
 
-static struct Scsi_Host *ibmmca_register(Scsi_Host_Template * scsi_template, int port, int id, int adaptertype, char *hostname)
+static struct Scsi_Host *ibmmca_register(struct scsi_host_template * scsi_template, int port, int id, int adaptertype, char *hostname)
 {
         struct Scsi_Host *shpnt;
         int i, j;
@@ -2494,7 +2494,7 @@ static int option_setup(char *str)
 
 __setup("ibmmcascsi=", option_setup);
 
-static Scsi_Host_Template driver_template = {
+static struct scsi_host_template driver_template = {
           .proc_name      = "ibmmca",
           .proc_info      = ibmmca_proc_info,
           .name           = "IBM SCSI-Subsystem",
diff --git a/drivers/scsi/ibmmca.h b/drivers/scsi/ibmmca.h
index 6d68f603e9b8..017ee2fa6d63 100644
--- a/drivers/scsi/ibmmca.h
+++ b/drivers/scsi/ibmmca.h
@@ -11,7 +11,7 @@
 /* Common forward declarations for all Linux-versions: */
 
 /* Interfaces to the midlevel Linux SCSI driver */
-static int ibmmca_detect (Scsi_Host_Template *);
+static int ibmmca_detect (struct scsi_host_template *);
 static int ibmmca_release (struct Scsi_Host *);
 static int ibmmca_queuecommand (Scsi_Cmnd *, void (*done) (Scsi_Cmnd *));
 static int ibmmca_abort (Scsi_Cmnd *);
diff --git a/drivers/scsi/ide-scsi.c b/drivers/scsi/ide-scsi.c
index 3553da0e1cd5..e1960d69fb90 100644
--- a/drivers/scsi/ide-scsi.c
+++ b/drivers/scsi/ide-scsi.c
@@ -882,7 +882,7 @@ static inline int should_transform(ide_drive_t *drive, struct scsi_cmnd *cmd)
         struct gendisk *disk = cmd->request->rq_disk;
 
         if (disk) {
-                struct Scsi_Device_Template **p = disk->private_data;
+                struct struct scsi_device_Template **p = disk->private_data;
                 if (strcmp((*p)->scsi_driverfs_driver.name, "sg") == 0)
                         return test_bit(IDESCSI_SG_TRANSFORM, &scsi->transform);
         }
diff --git a/drivers/scsi/in2000.c b/drivers/scsi/in2000.c
index fe387b5ce8bd..34daa3e068de 100644
--- a/drivers/scsi/in2000.c
+++ b/drivers/scsi/in2000.c
@@ -1899,7 +1899,7 @@ static int int_tab[] in2000__INITDATA = {
 };
 
 
-static int __init in2000_detect(Scsi_Host_Template * tpnt)
+static int __init in2000_detect(struct scsi_host_template * tpnt)
 {
         struct Scsi_Host *instance;
         struct IN2000_hostdata *hostdata;
@@ -2305,7 +2305,7 @@ static int in2000_proc_info(struct Scsi_Host *instance, char *buf, char **start,
 MODULE_LICENSE("GPL");
 
 
-static Scsi_Host_Template driver_template = {
+static struct scsi_host_template driver_template = {
         .proc_name                      = "in2000",
         .proc_info                      = in2000_proc_info,
         .name                           = "Always IN2000",
diff --git a/drivers/scsi/in2000.h b/drivers/scsi/in2000.h
index a240b52554d8..0fb8b06b8392 100644
--- a/drivers/scsi/in2000.h
+++ b/drivers/scsi/in2000.h
@@ -395,7 +395,7 @@ struct IN2000_hostdata {
 # define CLISPIN_UNLOCK(host,flags) spin_unlock_irqrestore(host->host_lock, \
                                                            flags)
 
-static int in2000_detect(Scsi_Host_Template *) in2000__INIT;
+static int in2000_detect(struct scsi_host_template *) in2000__INIT;
 static int in2000_queuecommand(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
 static int in2000_abort(Scsi_Cmnd *);
 static void in2000_setup(char *, int *) in2000__INIT;
diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
index e0039dfae8e5..fa2cb3582cfa 100644
--- a/drivers/scsi/ipr.c
+++ b/drivers/scsi/ipr.c
@@ -91,11 +91,14 @@ static unsigned int ipr_max_speed = 1;
 static int ipr_testmode = 0;
 static unsigned int ipr_fastfail = 0;
 static unsigned int ipr_transop_timeout = IPR_OPERATIONAL_TIMEOUT;
+static unsigned int ipr_enable_cache = 1;
+static unsigned int ipr_debug = 0;
+static int ipr_auto_create = 1;
 static DEFINE_SPINLOCK(ipr_driver_lock);
 
 /* This table describes the differences between DMA controller chips */
 static const struct ipr_chip_cfg_t ipr_chip_cfg[] = {
-        { /* Gemstone and Citrine */
+        { /* Gemstone, Citrine, and Obsidian */
                 .mailbox = 0x0042C,
                 .cache_line_size = 0x20,
                 {
@@ -130,6 +133,8 @@ static const struct ipr_chip_cfg_t ipr_chip_cfg[] = {
 static const struct ipr_chip_t ipr_chip[] = {
         { PCI_VENDOR_ID_MYLEX, PCI_DEVICE_ID_IBM_GEMSTONE, &ipr_chip_cfg[0] },
         { PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_CITRINE, &ipr_chip_cfg[0] },
+        { PCI_VENDOR_ID_ADAPTEC2, PCI_DEVICE_ID_ADAPTEC2_OBSIDIAN, &ipr_chip_cfg[0] },
+        { PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_OBSIDIAN, &ipr_chip_cfg[0] },
         { PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_SNIPE, &ipr_chip_cfg[1] },
         { PCI_VENDOR_ID_ADAPTEC2, PCI_DEVICE_ID_ADAPTEC2_SCAMP, &ipr_chip_cfg[1] }
 };
@@ -150,6 +155,12 @@ module_param_named(fastfail, ipr_fastfail, int, 0);
 MODULE_PARM_DESC(fastfail, "Reduce timeouts and retries");
 module_param_named(transop_timeout, ipr_transop_timeout, int, 0);
 MODULE_PARM_DESC(transop_timeout, "Time in seconds to wait for adapter to come operational (default: 300)");
+module_param_named(enable_cache, ipr_enable_cache, int, 0);
+MODULE_PARM_DESC(enable_cache, "Enable adapter's non-volatile write cache (default: 1)");
+module_param_named(debug, ipr_debug, int, 0);
+MODULE_PARM_DESC(debug, "Enable device driver debugging logging. Set to 1 to enable. (default: 0)");
+module_param_named(auto_create, ipr_auto_create, int, 0);
+MODULE_PARM_DESC(auto_create, "Auto-create single device RAID 0 arrays when initialized (default: 1)");
 MODULE_LICENSE("GPL");
 MODULE_VERSION(IPR_DRIVER_VERSION);
 
@@ -285,12 +296,18 @@ struct ipr_error_table_t ipr_error_table[] = {
         "3110: Device bus error, message or command phase"},
         {0x04670400, 0, 1,
         "9091: Incorrect hardware configuration change has been detected"},
+        {0x04678000, 0, 1,
+        "9073: Invalid multi-adapter configuration"},
         {0x046E0000, 0, 1,
         "FFF4: Command to logical unit failed"},
         {0x05240000, 1, 0,
         "Illegal request, invalid request type or request packet"},
         {0x05250000, 0, 0,
         "Illegal request, invalid resource handle"},
+        {0x05258000, 0, 0,
+        "Illegal request, commands not allowed to this device"},
+        {0x05258100, 0, 0,
+        "Illegal request, command not allowed to a secondary adapter"},
         {0x05260000, 0, 0,
         "Illegal request, invalid field in parameter list"},
         {0x05260100, 0, 0,
@@ -299,6 +316,8 @@ struct ipr_error_table_t ipr_error_table[] = {
         "Illegal request, parameter value invalid"},
         {0x052C0000, 0, 0,
         "Illegal request, command sequence error"},
+        {0x052C8000, 1, 0,
+        "Illegal request, dual adapter support not enabled"},
         {0x06040500, 0, 1,
         "9031: Array protection temporarily suspended, protection resuming"},
         {0x06040600, 0, 1,
@@ -315,18 +334,26 @@ struct ipr_error_table_t ipr_error_table[] = {
         "3029: A device replacement has occurred"},
         {0x064C8000, 0, 1,
         "9051: IOA cache data exists for a missing or failed device"},
+        {0x064C8100, 0, 1,
+        "9055: Auxiliary cache IOA contains cache data needed by the primary IOA"},
         {0x06670100, 0, 1,
         "9025: Disk unit is not supported at its physical location"},
         {0x06670600, 0, 1,
         "3020: IOA detected a SCSI bus configuration error"},
         {0x06678000, 0, 1,
         "3150: SCSI bus configuration error"},
+        {0x06678100, 0, 1,
+        "9074: Asymmetric advanced function disk configuration"},
         {0x06690200, 0, 1,
         "9041: Array protection temporarily suspended"},
         {0x06698200, 0, 1,
         "9042: Corrupt array parity detected on specified device"},
         {0x066B0200, 0, 1,
         "9030: Array no longer protected due to missing or failed disk unit"},
+        {0x066B8000, 0, 1,
+        "9071: Link operational transition"},
+        {0x066B8100, 0, 1,
+        "9072: Link not operational transition"},
         {0x066B8200, 0, 1,
         "9032: Array exposed but still protected"},
         {0x07270000, 0, 0,
@@ -789,7 +816,7 @@ static void ipr_send_hcam(struct ipr_ioa_cfg *ioa_cfg, u8 type,
  **/
 static void ipr_init_res_entry(struct ipr_resource_entry *res)
 {
-        res->needs_sync_complete = 1;
+        res->needs_sync_complete = 0;
         res->in_erp = 0;
         res->add_to_ml = 0;
         res->del_from_ml = 0;
@@ -889,29 +916,74 @@ static void ipr_process_ccn(struct ipr_cmnd *ipr_cmd)
 
 /**
  * ipr_log_vpd - Log the passed VPD to the error log.
- * @vpids:                      vendor/product id struct
- * @serial_num:         serial number string
+ * @vpd:                vendor/product id/sn struct
  *
  * Return value:
  *      none
  **/
-static void ipr_log_vpd(struct ipr_std_inq_vpids *vpids, u8 *serial_num)
+static void ipr_log_vpd(struct ipr_vpd *vpd)
 {
         char buffer[IPR_VENDOR_ID_LEN + IPR_PROD_ID_LEN
                     + IPR_SERIAL_NUM_LEN];
 
-        memcpy(buffer, vpids->vendor_id, IPR_VENDOR_ID_LEN);
-        memcpy(buffer + IPR_VENDOR_ID_LEN, vpids->product_id,
+        memcpy(buffer, vpd->vpids.vendor_id, IPR_VENDOR_ID_LEN);
+        memcpy(buffer + IPR_VENDOR_ID_LEN, vpd->vpids.product_id,
                IPR_PROD_ID_LEN);
         buffer[IPR_VENDOR_ID_LEN + IPR_PROD_ID_LEN] = '\0';
         ipr_err("Vendor/Product ID: %s\n", buffer);
 
-        memcpy(buffer, serial_num, IPR_SERIAL_NUM_LEN);
+        memcpy(buffer, vpd->sn, IPR_SERIAL_NUM_LEN);
         buffer[IPR_SERIAL_NUM_LEN] = '\0';
         ipr_err("    Serial Number: %s\n", buffer);
 }
 
 /**
+ * ipr_log_ext_vpd - Log the passed extended VPD to the error log.
+ * @vpd:                vendor/product id/sn/wwn struct
+ *
+ * Return value:
+ *      none
+ **/
+static void ipr_log_ext_vpd(struct ipr_ext_vpd *vpd)
+{
+        ipr_log_vpd(&vpd->vpd);
+        ipr_err("    WWN: %08X%08X\n", be32_to_cpu(vpd->wwid[0]),
+                be32_to_cpu(vpd->wwid[1]));
+}
+
+/**
+ * ipr_log_enhanced_cache_error - Log a cache error.
+ * @ioa_cfg:    ioa config struct
+ * @hostrcb:    hostrcb struct
+ *
+ * Return value:
+ *      none
+ **/
+static void ipr_log_enhanced_cache_error(struct ipr_ioa_cfg *ioa_cfg,
+                                         struct ipr_hostrcb *hostrcb)
+{
+        struct ipr_hostrcb_type_12_error *error =
+                &hostrcb->hcam.u.error.u.type_12_error;
+
+        ipr_err("-----Current Configuration-----\n");
+        ipr_err("Cache Directory Card Information:\n");
+        ipr_log_ext_vpd(&error->ioa_vpd);
+        ipr_err("Adapter Card Information:\n");
+        ipr_log_ext_vpd(&error->cfc_vpd);
+
+        ipr_err("-----Expected Configuration-----\n");
+        ipr_err("Cache Directory Card Information:\n");
+        ipr_log_ext_vpd(&error->ioa_last_attached_to_cfc_vpd);
+        ipr_err("Adapter Card Information:\n");
+        ipr_log_ext_vpd(&error->cfc_last_attached_to_ioa_vpd);
+
+        ipr_err("Additional IOA Data: %08X %08X %08X\n",
+                     be32_to_cpu(error->ioa_data[0]),
+                     be32_to_cpu(error->ioa_data[1]),
+                     be32_to_cpu(error->ioa_data[2]));
+}
+
+/**
  * ipr_log_cache_error - Log a cache error.
  * @ioa_cfg:    ioa config struct
  * @hostrcb:    hostrcb struct
@@ -927,17 +999,15 @@ static void ipr_log_cache_error(struct ipr_ioa_cfg *ioa_cfg,
 
         ipr_err("-----Current Configuration-----\n");
         ipr_err("Cache Directory Card Information:\n");
-        ipr_log_vpd(&error->ioa_vpids, error->ioa_sn);
+        ipr_log_vpd(&error->ioa_vpd);
         ipr_err("Adapter Card Information:\n");
-        ipr_log_vpd(&error->cfc_vpids, error->cfc_sn);
+        ipr_log_vpd(&error->cfc_vpd);
 
         ipr_err("-----Expected Configuration-----\n");
         ipr_err("Cache Directory Card Information:\n");
-        ipr_log_vpd(&error->ioa_last_attached_to_cfc_vpids,
-                    error->ioa_last_attached_to_cfc_sn);
+        ipr_log_vpd(&error->ioa_last_attached_to_cfc_vpd);
         ipr_err("Adapter Card Information:\n");
-        ipr_log_vpd(&error->cfc_last_attached_to_ioa_vpids,
-                    error->cfc_last_attached_to_ioa_sn);
+        ipr_log_vpd(&error->cfc_last_attached_to_ioa_vpd);
 
         ipr_err("Additional IOA Data: %08X %08X %08X\n",
                      be32_to_cpu(error->ioa_data[0]),
@@ -946,6 +1016,46 @@ static void ipr_log_cache_error(struct ipr_ioa_cfg *ioa_cfg,
 }
 
 /**
+ * ipr_log_enhanced_config_error - Log a configuration error.
+ * @ioa_cfg:    ioa config struct
+ * @hostrcb:    hostrcb struct
+ *
+ * Return value:
+ *      none
+ **/
+static void ipr_log_enhanced_config_error(struct ipr_ioa_cfg *ioa_cfg,
+                                          struct ipr_hostrcb *hostrcb)
+{
+        int errors_logged, i;
+        struct ipr_hostrcb_device_data_entry_enhanced *dev_entry;
+        struct ipr_hostrcb_type_13_error *error;
+
+        error = &hostrcb->hcam.u.error.u.type_13_error;
+        errors_logged = be32_to_cpu(error->errors_logged);
+
+        ipr_err("Device Errors Detected/Logged: %d/%d\n",
+                be32_to_cpu(error->errors_detected), errors_logged);
+
+        dev_entry = error->dev;
+
+        for (i = 0; i < errors_logged; i++, dev_entry++) {
+                ipr_err_separator;
+
+                ipr_phys_res_err(ioa_cfg, dev_entry->dev_res_addr, "Device %d", i + 1);
+                ipr_log_ext_vpd(&dev_entry->vpd);
+
+                ipr_err("-----New Device Information-----\n");
+                ipr_log_ext_vpd(&dev_entry->new_vpd);
+
+                ipr_err("Cache Directory Card Information:\n");
+                ipr_log_ext_vpd(&dev_entry->ioa_last_with_dev_vpd);
+
+                ipr_err("Adapter Card Information:\n");
+                ipr_log_ext_vpd(&dev_entry->cfc_last_with_dev_vpd);
+        }
+}
+
+/**
  * ipr_log_config_error - Log a configuration error.
  * @ioa_cfg:    ioa config struct
  * @hostrcb:    hostrcb struct
@@ -966,30 +1076,22 @@ static void ipr_log_config_error(struct ipr_ioa_cfg *ioa_cfg,
         ipr_err("Device Errors Detected/Logged: %d/%d\n",
                 be32_to_cpu(error->errors_detected), errors_logged);
 
-        dev_entry = error->dev_entry;
+        dev_entry = error->dev;
 
         for (i = 0; i < errors_logged; i++, dev_entry++) {
                 ipr_err_separator;
 
-                if (dev_entry->dev_res_addr.bus >= IPR_MAX_NUM_BUSES) {
-                        ipr_err("Device %d: missing\n", i + 1);
-                } else {
-                        ipr_err("Device %d: %d:%d:%d:%d\n", i + 1,
-                                ioa_cfg->host->host_no, dev_entry->dev_res_addr.bus,
-                                dev_entry->dev_res_addr.target, dev_entry->dev_res_addr.lun);
-                }
-                ipr_log_vpd(&dev_entry->dev_vpids, dev_entry->dev_sn);
+                ipr_phys_res_err(ioa_cfg, dev_entry->dev_res_addr, "Device %d", i + 1);
+                ipr_log_vpd(&dev_entry->vpd);
 
                 ipr_err("-----New Device Information-----\n");
-                ipr_log_vpd(&dev_entry->new_dev_vpids, dev_entry->new_dev_sn);
+                ipr_log_vpd(&dev_entry->new_vpd);
 
                 ipr_err("Cache Directory Card Information:\n");
-                ipr_log_vpd(&dev_entry->ioa_last_with_dev_vpids,
-                            dev_entry->ioa_last_with_dev_sn);
+                ipr_log_vpd(&dev_entry->ioa_last_with_dev_vpd);
 
                 ipr_err("Adapter Card Information:\n");
-                ipr_log_vpd(&dev_entry->cfc_last_with_dev_vpids,
-                            dev_entry->cfc_last_with_dev_sn);
+                ipr_log_vpd(&dev_entry->cfc_last_with_dev_vpd);
 
                 ipr_err("Additional IOA Data: %08X %08X %08X %08X %08X\n",
                         be32_to_cpu(dev_entry->ioa_data[0]),
@@ -1001,6 +1103,57 @@ static void ipr_log_config_error(struct ipr_ioa_cfg *ioa_cfg,
 }
 
 /**
+ * ipr_log_enhanced_array_error - Log an array configuration error.
+ * @ioa_cfg:    ioa config struct
+ * @hostrcb:    hostrcb struct
+ *
+ * Return value:
+ *      none
+ **/
+static void ipr_log_enhanced_array_error(struct ipr_ioa_cfg *ioa_cfg,
+                                         struct ipr_hostrcb *hostrcb)
+{
+        int i, num_entries;
+        struct ipr_hostrcb_type_14_error *error;
+        struct ipr_hostrcb_array_data_entry_enhanced *array_entry;
+        const u8 zero_sn[IPR_SERIAL_NUM_LEN] = { [0 ... IPR_SERIAL_NUM_LEN-1] = '0' };
+
+        error = &hostrcb->hcam.u.error.u.type_14_error;
+
+        ipr_err_separator;
+
+        ipr_err("RAID %s Array Configuration: %d:%d:%d:%d\n",
+                error->protection_level,
+                ioa_cfg->host->host_no,
+                error->last_func_vset_res_addr.bus,
+                error->last_func_vset_res_addr.target,
+                error->last_func_vset_res_addr.lun);
+
+        ipr_err_separator;
+
+        array_entry = error->array_member;
+        num_entries = min_t(u32, be32_to_cpu(error->num_entries),
+                            sizeof(error->array_member));
+
+        for (i = 0; i < num_entries; i++, array_entry++) {
+                if (!memcmp(array_entry->vpd.vpd.sn, zero_sn, IPR_SERIAL_NUM_LEN))
+                        continue;
+
+                if (be32_to_cpu(error->exposed_mode_adn) == i)
+                        ipr_err("Exposed Array Member %d:\n", i);
+                else
+                        ipr_err("Array Member %d:\n", i);
+
+                ipr_log_ext_vpd(&array_entry->vpd);
+                ipr_phys_res_err(ioa_cfg, array_entry->dev_res_addr, "Current Location");
+                ipr_phys_res_err(ioa_cfg, array_entry->expected_dev_res_addr,
+                                 "Expected Location");
+
+                ipr_err_separator;
+        }
+}
+
+/**
  * ipr_log_array_error - Log an array configuration error.
  * @ioa_cfg:    ioa config struct
  * @hostrcb:    hostrcb struct
@@ -1032,36 +1185,19 @@ static void ipr_log_array_error(struct ipr_ioa_cfg *ioa_cfg,
         array_entry = error->array_member;
 
         for (i = 0; i < 18; i++) {
-                if (!memcmp(array_entry->serial_num, zero_sn, IPR_SERIAL_NUM_LEN))
+                if (!memcmp(array_entry->vpd.sn, zero_sn, IPR_SERIAL_NUM_LEN))
                         continue;
 
-                if (be32_to_cpu(error->exposed_mode_adn) == i) {
+                if (be32_to_cpu(error->exposed_mode_adn) == i)
                         ipr_err("Exposed Array Member %d:\n", i);
-                } else {
+                else
                         ipr_err("Array Member %d:\n", i);
-                }
 
-                ipr_log_vpd(&array_entry->vpids, array_entry->serial_num);
-
-                if (array_entry->dev_res_addr.bus >= IPR_MAX_NUM_BUSES) {
-                        ipr_err("Current Location: unknown\n");
-                } else {
-                        ipr_err("Current Location: %d:%d:%d:%d\n",
-                                ioa_cfg->host->host_no,
-                                array_entry->dev_res_addr.bus,
-                                array_entry->dev_res_addr.target,
-                                array_entry->dev_res_addr.lun);
-                }
+                ipr_log_vpd(&array_entry->vpd);
 
-                if (array_entry->expected_dev_res_addr.bus >= IPR_MAX_NUM_BUSES) {
-                        ipr_err("Expected Location: unknown\n");
-                } else {
-                        ipr_err("Expected Location: %d:%d:%d:%d\n",
-                                ioa_cfg->host->host_no,
-                                array_entry->expected_dev_res_addr.bus,
-                                array_entry->expected_dev_res_addr.target,
-                                array_entry->expected_dev_res_addr.lun);
-                }
+                ipr_phys_res_err(ioa_cfg, array_entry->dev_res_addr, "Current Location");
+                ipr_phys_res_err(ioa_cfg, array_entry->expected_dev_res_addr,
+                                 "Expected Location");
 
                 ipr_err_separator;
 
@@ -1073,35 +1209,95 @@ static void ipr_log_array_error(struct ipr_ioa_cfg *ioa_cfg,
 }
 
 /**
- * ipr_log_generic_error - Log an adapter error.
- * @ioa_cfg:    ioa config struct
- * @hostrcb:    hostrcb struct
+ * ipr_log_hex_data - Log additional hex IOA error data.
+ * @data:               IOA error data
+ * @len:                data length
  *
  * Return value:
  *      none
  **/
-static void ipr_log_generic_error(struct ipr_ioa_cfg *ioa_cfg,
-                                  struct ipr_hostrcb *hostrcb)
+static void ipr_log_hex_data(u32 *data, int len)
 {
         int i;
-        int ioa_data_len = be32_to_cpu(hostrcb->hcam.length);
 
-        if (ioa_data_len == 0)
+        if (len == 0)
                 return;
 
-        ipr_err("IOA Error Data:\n");
-        ipr_err("Offset    0 1 2 3  4 5 6 7  8 9 A B  C D E F\n");
-
-        for (i = 0; i < ioa_data_len / 4; i += 4) {
+        for (i = 0; i < len / 4; i += 4) {
                 ipr_err("%08X: %08X %08X %08X %08X\n", i*4,
-                        be32_to_cpu(hostrcb->hcam.u.raw.data[i]),
-                        be32_to_cpu(hostrcb->hcam.u.raw.data[i+1]),
-                        be32_to_cpu(hostrcb->hcam.u.raw.data[i+2]),
-                        be32_to_cpu(hostrcb->hcam.u.raw.data[i+3]));
+                        be32_to_cpu(data[i]),
+                        be32_to_cpu(data[i+1]),
+                        be32_to_cpu(data[i+2]),
+                        be32_to_cpu(data[i+3]));
         }
 }
 
 /**
+ * ipr_log_enhanced_dual_ioa_error - Log an enhanced dual adapter error.
+ * @ioa_cfg:    ioa config struct
+ * @hostrcb:    hostrcb struct
+ *
+ * Return value:
+ *      none
+ **/
+static void ipr_log_enhanced_dual_ioa_error(struct ipr_ioa_cfg *ioa_cfg,
+                                            struct ipr_hostrcb *hostrcb)
+{
+        struct ipr_hostrcb_type_17_error *error;
+
+        error = &hostrcb->hcam.u.error.u.type_17_error;
+        error->failure_reason[sizeof(error->failure_reason) - 1] = '\0';
+
+        ipr_err("%s\n", error->failure_reason);
+        ipr_err("Remote Adapter VPD:\n");
+        ipr_log_ext_vpd(&error->vpd);
+        ipr_log_hex_data(error->data,
+                         be32_to_cpu(hostrcb->hcam.length) -
+                         (offsetof(struct ipr_hostrcb_error, u) +
+                          offsetof(struct ipr_hostrcb_type_17_error, data)));
+}
+
+/**
+ * ipr_log_dual_ioa_error - Log a dual adapter error.
+ * @ioa_cfg:    ioa config struct
+ * @hostrcb:    hostrcb struct
+ *
+ * Return value:
+ *      none
+ **/
+static void ipr_log_dual_ioa_error(struct ipr_ioa_cfg *ioa_cfg,
+                                   struct ipr_hostrcb *hostrcb)
+{
+        struct ipr_hostrcb_type_07_error *error;
+
+        error = &hostrcb->hcam.u.error.u.type_07_error;
+        error->failure_reason[sizeof(error->failure_reason) - 1] = '\0';
+
+        ipr_err("%s\n", error->failure_reason);
+        ipr_err("Remote Adapter VPD:\n");
+        ipr_log_vpd(&error->vpd);
+        ipr_log_hex_data(error->data,
+                         be32_to_cpu(hostrcb->hcam.length) -
+                         (offsetof(struct ipr_hostrcb_error, u) +
+                          offsetof(struct ipr_hostrcb_type_07_error, data)));
+}
+
+/**
+ * ipr_log_generic_error - Log an adapter error.
+ * @ioa_cfg:    ioa config struct
+ * @hostrcb:    hostrcb struct
+ *
+ * Return value:
+ *      none
+ **/
+static void ipr_log_generic_error(struct ipr_ioa_cfg *ioa_cfg,
+                                  struct ipr_hostrcb *hostrcb)
+{
+        ipr_log_hex_data(hostrcb->hcam.u.raw.data,
+                         be32_to_cpu(hostrcb->hcam.length));
+}
+
+/**
  * ipr_get_error - Find the specfied IOASC in the ipr_error_table.
  * @ioasc:      IOASC
  *
@@ -1172,11 +1368,10 @@ static void ipr_handle_log_data(struct ipr_ioa_cfg *ioa_cfg,
 
         if (ioa_cfg->log_level < IPR_DEFAULT_LOG_LEVEL)
                 return;
+        if (be32_to_cpu(hostrcb->hcam.length) > sizeof(hostrcb->hcam.u.raw))
+                hostrcb->hcam.length = cpu_to_be32(sizeof(hostrcb->hcam.u.raw));
 
         switch (hostrcb->hcam.overlay_id) {
-        case IPR_HOST_RCB_OVERLAY_ID_1:
-                ipr_log_generic_error(ioa_cfg, hostrcb);
-                break;
         case IPR_HOST_RCB_OVERLAY_ID_2:
                 ipr_log_cache_error(ioa_cfg, hostrcb);
                 break;
@@ -1187,13 +1382,26 @@ static void ipr_handle_log_data(struct ipr_ioa_cfg *ioa_cfg,
         case IPR_HOST_RCB_OVERLAY_ID_6:
                 ipr_log_array_error(ioa_cfg, hostrcb);
                 break;
-        case IPR_HOST_RCB_OVERLAY_ID_DEFAULT:
-                ipr_log_generic_error(ioa_cfg, hostrcb);
+        case IPR_HOST_RCB_OVERLAY_ID_7:
+                ipr_log_dual_ioa_error(ioa_cfg, hostrcb);
+                break;
+        case IPR_HOST_RCB_OVERLAY_ID_12:
+                ipr_log_enhanced_cache_error(ioa_cfg, hostrcb);
+                break;
+        case IPR_HOST_RCB_OVERLAY_ID_13:
+                ipr_log_enhanced_config_error(ioa_cfg, hostrcb);
+                break;
+        case IPR_HOST_RCB_OVERLAY_ID_14:
+        case IPR_HOST_RCB_OVERLAY_ID_16:
+                ipr_log_enhanced_array_error(ioa_cfg, hostrcb);
                 break;
+        case IPR_HOST_RCB_OVERLAY_ID_17:
+                ipr_log_enhanced_dual_ioa_error(ioa_cfg, hostrcb);
+                break;
+        case IPR_HOST_RCB_OVERLAY_ID_1:
+        case IPR_HOST_RCB_OVERLAY_ID_DEFAULT:
         default:
-                dev_err(&ioa_cfg->pdev->dev,
-                        "Unknown error received. Overlay ID: %d\n",
-                        hostrcb->hcam.overlay_id);
+                ipr_log_generic_error(ioa_cfg, hostrcb);
                 break;
         }
 }
@@ -1972,6 +2180,103 @@ static struct bin_attribute ipr_trace_attr = {
 };
 #endif
 
+static const struct {
+        enum ipr_cache_state state;
+        char *name;
+} cache_state [] = {
+        { CACHE_NONE, "none" },
+        { CACHE_DISABLED, "disabled" },
+        { CACHE_ENABLED, "enabled" }
+};
+
+/**
+ * ipr_show_write_caching - Show the write caching attribute
+ * @class_dev:  class device struct
+ * @buf:                buffer
+ *
+ * Return value:
+ *      number of bytes printed to buffer
+ **/
+static ssize_t ipr_show_write_caching(struct class_device *class_dev, char *buf)
+{
+        struct Scsi_Host *shost = class_to_shost(class_dev);
+        struct ipr_ioa_cfg *ioa_cfg = (struct ipr_ioa_cfg *)shost->hostdata;
+        unsigned long lock_flags = 0;
+        int i, len = 0;
+
+        spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags);
+        for (i = 0; i < ARRAY_SIZE(cache_state); i++) {
+                if (cache_state[i].state == ioa_cfg->cache_state) {
+                        len = snprintf(buf, PAGE_SIZE, "%s\n", cache_state[i].name);
+                        break;
+                }
+        }
+        spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags);
+        return len;
+}
+
+
+/**
+ * ipr_store_write_caching - Enable/disable adapter write cache
+ * @class_dev:  class_device struct
+ * @buf:                buffer
+ * @count:              buffer size
+ *
+ * This function will enable/disable adapter write cache.
+ *
+ * Return value:
+ *      count on success / other on failure
+ **/
+static ssize_t ipr_store_write_caching(struct class_device *class_dev,
+                                        const char *buf, size_t count)
+{
+        struct Scsi_Host *shost = class_to_shost(class_dev);
+        struct ipr_ioa_cfg *ioa_cfg = (struct ipr_ioa_cfg *)shost->hostdata;
+        unsigned long lock_flags = 0;
+        enum ipr_cache_state new_state = CACHE_INVALID;
+        int i;
+
+        if (!capable(CAP_SYS_ADMIN))
+                return -EACCES;
+        if (ioa_cfg->cache_state == CACHE_NONE)
+                return -EINVAL;
+
+        for (i = 0; i < ARRAY_SIZE(cache_state); i++) {
+                if (!strncmp(cache_state[i].name, buf, strlen(cache_state[i].name))) {
+                        new_state = cache_state[i].state;
+                        break;
+                }
+        }
+
+        if (new_state != CACHE_DISABLED && new_state != CACHE_ENABLED)
+                return -EINVAL;
+
+        spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags);
+        if (ioa_cfg->cache_state == new_state) {
+                spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags);
+                return count;
+        }
+
+        ioa_cfg->cache_state = new_state;
+        dev_info(&ioa_cfg->pdev->dev, "%s adapter write cache.\n",
+                 new_state == CACHE_ENABLED ? "Enabling" : "Disabling");
+        if (!ioa_cfg->in_reset_reload)
+                ipr_initiate_ioa_reset(ioa_cfg, IPR_SHUTDOWN_NORMAL);
+        spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags);
+        wait_event(ioa_cfg->reset_wait_q, !ioa_cfg->in_reset_reload);
+
+        return count;
+}
+
+static struct class_device_attribute ipr_ioa_cache_attr = {
+        .attr = {
+                .name =         "write_cache",
+                .mode =         S_IRUGO | S_IWUSR,
+        },
+        .show = ipr_show_write_caching,
+        .store = ipr_store_write_caching
+};
+
 /**
  * ipr_show_fw_version - Show the firmware version
  * @class_dev:  class device struct
@@ -2112,6 +2417,74 @@ static struct class_device_attribute ipr_diagnostics_attr = {
 };
 
 /**
+ * ipr_show_adapter_state - Show the adapter's state
+ * @class_dev:  class device struct
+ * @buf:                buffer
+ *
+ * Return value:
+ *      number of bytes printed to buffer
+ **/
+static ssize_t ipr_show_adapter_state(struct class_device *class_dev, char *buf)
+{
+        struct Scsi_Host *shost = class_to_shost(class_dev);
+        struct ipr_ioa_cfg *ioa_cfg = (struct ipr_ioa_cfg *)shost->hostdata;
+        unsigned long lock_flags = 0;
+        int len;
+
+        spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags);
+        if (ioa_cfg->ioa_is_dead)
+                len = snprintf(buf, PAGE_SIZE, "offline\n");
+        else
+                len = snprintf(buf, PAGE_SIZE, "online\n");
+        spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags);
+        return len;
+}
+
+/**
+ * ipr_store_adapter_state - Change adapter state
+ * @class_dev:  class_device struct
+ * @buf:                buffer
+ * @count:              buffer size
+ *
+ * This function will change the adapter's state.
+ *
+ * Return value:
+ *      count on success / other on failure
+ **/
+static ssize_t ipr_store_adapter_state(struct class_device *class_dev,
+                                       const char *buf, size_t count)
+{
+        struct Scsi_Host *shost = class_to_shost(class_dev);
+        struct ipr_ioa_cfg *ioa_cfg = (struct ipr_ioa_cfg *)shost->hostdata;
+        unsigned long lock_flags;
+        int result = count;
+
+        if (!capable(CAP_SYS_ADMIN))
+                return -EACCES;
+
+        spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags);
+        if (ioa_cfg->ioa_is_dead && !strncmp(buf, "online", 6)) {
+                ioa_cfg->ioa_is_dead = 0;
+                ioa_cfg->reset_retries = 0;
+                ioa_cfg->in_ioa_bringdown = 0;
+                ipr_initiate_ioa_reset(ioa_cfg, IPR_SHUTDOWN_NONE);
+        }
+        spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags);
+        wait_event(ioa_cfg->reset_wait_q, !ioa_cfg->in_reset_reload);
+
+        return result;
+}
+
+static struct class_device_attribute ipr_ioa_state_attr = {
+        .attr = {
+                .name =         "state",
+                .mode =         S_IRUGO | S_IWUSR,
+        },
+        .show = ipr_show_adapter_state,
+        .store = ipr_store_adapter_state
+};
+
+/**
  * ipr_store_reset_adapter - Reset the adapter
  * @class_dev:  class_device struct
  * @buf:                buffer
@@ -2183,7 +2556,7 @@ static struct ipr_sglist *ipr_alloc_ucode_buffer(int buf_len)
                 num_elem = buf_len / bsize_elem;
 
         /* Allocate a scatter/gather list for the DMA */
-        sglist = kmalloc(sizeof(struct ipr_sglist) +
+        sglist = kzalloc(sizeof(struct ipr_sglist) +
                          (sizeof(struct scatterlist) * (num_elem - 1)),
                          GFP_KERNEL);
 
@@ -2192,9 +2565,6 @@ static struct ipr_sglist *ipr_alloc_ucode_buffer(int buf_len)
                 return NULL;
         }
 
-        memset(sglist, 0, sizeof(struct ipr_sglist) +
-               (sizeof(struct scatterlist) * (num_elem - 1)));
-
         scatterlist = sglist->scatterlist;
 
         sglist->order = order;
@@ -2289,31 +2659,24 @@ static int ipr_copy_ucode_buffer(struct ipr_sglist *sglist,
 }
 
 /**
- * ipr_map_ucode_buffer - Map a microcode download buffer
+ * ipr_build_ucode_ioadl - Build a microcode download IOADL
  * @ipr_cmd:    ipr command struct
  * @sglist:             scatter/gather list
- * @len:                total length of download buffer
  *
- * Maps a microcode download scatter/gather list for DMA and
- * builds the IOADL.
+ * Builds a microcode download IOA data list (IOADL).
  *
- * Return value:
- *      0 on success / -EIO on failure
  **/
-static int ipr_map_ucode_buffer(struct ipr_cmnd *ipr_cmd,
-                                struct ipr_sglist *sglist, int len)
+static void ipr_build_ucode_ioadl(struct ipr_cmnd *ipr_cmd,
+                                  struct ipr_sglist *sglist)
 {
-        struct ipr_ioa_cfg *ioa_cfg = ipr_cmd->ioa_cfg;
         struct ipr_ioarcb *ioarcb = &ipr_cmd->ioarcb;
         struct ipr_ioadl_desc *ioadl = ipr_cmd->ioadl;
         struct scatterlist *scatterlist = sglist->scatterlist;
         int i;
 
-        ipr_cmd->dma_use_sg = pci_map_sg(ioa_cfg->pdev, scatterlist,
-                                         sglist->num_sg, DMA_TO_DEVICE);
-
+        ipr_cmd->dma_use_sg = sglist->num_dma_sg;
         ioarcb->cmd_pkt.flags_hi |= IPR_FLAGS_HI_WRITE_NOT_READ;
-        ioarcb->write_data_transfer_length = cpu_to_be32(len);
+        ioarcb->write_data_transfer_length = cpu_to_be32(sglist->buffer_len);
         ioarcb->write_ioadl_len =
                 cpu_to_be32(sizeof(struct ipr_ioadl_desc) * ipr_cmd->dma_use_sg);
 
@@ -2324,15 +2687,52 @@ static int ipr_map_ucode_buffer(struct ipr_cmnd *ipr_cmd,
                         cpu_to_be32(sg_dma_address(&scatterlist[i]));
         }
 
-        if (likely(ipr_cmd->dma_use_sg)) {
-                ioadl[i-1].flags_and_data_len |=
-                        cpu_to_be32(IPR_IOADL_FLAGS_LAST);
+        ioadl[i-1].flags_and_data_len |=
+                cpu_to_be32(IPR_IOADL_FLAGS_LAST);
+}
+
+/**
+ * ipr_update_ioa_ucode - Update IOA's microcode
+ * @ioa_cfg:    ioa config struct
+ * @sglist:             scatter/gather list
+ *
+ * Initiate an adapter reset to update the IOA's microcode
+ *
+ * Return value:
+ *      0 on success / -EIO on failure
+ **/
+static int ipr_update_ioa_ucode(struct ipr_ioa_cfg *ioa_cfg,
+                                struct ipr_sglist *sglist)
+{
+        unsigned long lock_flags;
+
+        spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags);
+
+        if (ioa_cfg->ucode_sglist) {
+                spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags);
+                dev_err(&ioa_cfg->pdev->dev,
+                        "Microcode download already in progress\n");
+                return -EIO;
         }
-        else {
-                dev_err(&ioa_cfg->pdev->dev, "pci_map_sg failed!\n");
+
+        sglist->num_dma_sg = pci_map_sg(ioa_cfg->pdev, sglist->scatterlist,
+                                        sglist->num_sg, DMA_TO_DEVICE);
+
+        if (!sglist->num_dma_sg) {
+                spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags);
+                dev_err(&ioa_cfg->pdev->dev,
+                        "Failed to map microcode download buffer!\n");
                 return -EIO;
         }
 
+        ioa_cfg->ucode_sglist = sglist;
+        ipr_initiate_ioa_reset(ioa_cfg, IPR_SHUTDOWN_NORMAL);
+        spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags);
+        wait_event(ioa_cfg->reset_wait_q, !ioa_cfg->in_reset_reload);
+
+        spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags);
+        ioa_cfg->ucode_sglist = NULL;
+        spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags);
         return 0;
 }
 
@@ -2355,7 +2755,6 @@ static ssize_t ipr_store_update_fw(struct class_device *class_dev,
         struct ipr_ucode_image_header *image_hdr;
         const struct firmware *fw_entry;
         struct ipr_sglist *sglist;
-        unsigned long lock_flags;
         char fname[100];
         char *src;
         int len, result, dnld_size;
@@ -2396,35 +2795,17 @@ static ssize_t ipr_store_update_fw(struct class_device *class_dev,
         if (result) {
                 dev_err(&ioa_cfg->pdev->dev,
                         "Microcode buffer copy to DMA buffer failed\n");
-                ipr_free_ucode_buffer(sglist);
-                release_firmware(fw_entry);
-                return result;
-        }
-
-        spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags);
-
-        if (ioa_cfg->ucode_sglist) {
-                spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags);
-                dev_err(&ioa_cfg->pdev->dev,
-                        "Microcode download already in progress\n");
-                ipr_free_ucode_buffer(sglist);
-                release_firmware(fw_entry);
-                return -EIO;
+                goto out;
         }
 
-        ioa_cfg->ucode_sglist = sglist;
-        ipr_initiate_ioa_reset(ioa_cfg, IPR_SHUTDOWN_NORMAL);
-        spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags);
-        wait_event(ioa_cfg->reset_wait_q, !ioa_cfg->in_reset_reload);
-
-        spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags);
-        ioa_cfg->ucode_sglist = NULL;
-        spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags);
+        result = ipr_update_ioa_ucode(ioa_cfg, sglist);
 
+        if (!result)
+                result = count;
+out:
         ipr_free_ucode_buffer(sglist);
         release_firmware(fw_entry);
-
-        return count;
+        return result;
 }
 
 static struct class_device_attribute ipr_update_fw_attr = {
@@ -2439,8 +2820,10 @@ static struct class_device_attribute *ipr_ioa_attrs[] = {
         &ipr_fw_version_attr,
         &ipr_log_level_attr,
         &ipr_diagnostics_attr,
+        &ipr_ioa_state_attr,
         &ipr_ioa_reset_attr,
         &ipr_update_fw_attr,
+        &ipr_ioa_cache_attr,
         NULL,
 };
 
@@ -2548,14 +2931,13 @@ static int ipr_alloc_dump(struct ipr_ioa_cfg *ioa_cfg)
         unsigned long lock_flags = 0;
 
         ENTER;
-        dump = kmalloc(sizeof(struct ipr_dump), GFP_KERNEL);
+        dump = kzalloc(sizeof(struct ipr_dump), GFP_KERNEL);
 
         if (!dump) {
                 ipr_err("Dump memory allocation failed\n");
                 return -ENOMEM;
         }
 
-        memset(dump, 0, sizeof(struct ipr_dump));
         kref_init(&dump->kref);
         dump->ioa_cfg = ioa_cfg;
 
@@ -2824,8 +3206,10 @@ static int ipr_slave_configure(struct scsi_device *sdev)
         if (res) {
                 if (ipr_is_af_dasd_device(res))
                         sdev->type = TYPE_RAID;
-                if (ipr_is_af_dasd_device(res) || ipr_is_ioa_resource(res))
+                if (ipr_is_af_dasd_device(res) || ipr_is_ioa_resource(res)) {
                         sdev->scsi_level = 4;
+                        sdev->no_uld_attach = 1;
+                }
                 if (ipr_is_vset_device(res)) {
                         sdev->timeout = IPR_VSET_RW_TIMEOUT;
                         blk_queue_max_sectors(sdev->request_queue, IPR_VSET_MAX_SECTORS);
@@ -2848,13 +3232,14 @@ static int ipr_slave_configure(struct scsi_device *sdev)
  * handling new commands.
  *
  * Return value:
- *      0 on success
+ *      0 on success / -ENXIO if device does not exist
  **/
 static int ipr_slave_alloc(struct scsi_device *sdev)
 {
         struct ipr_ioa_cfg *ioa_cfg = (struct ipr_ioa_cfg *) sdev->host->hostdata;
         struct ipr_resource_entry *res;
         unsigned long lock_flags;
+        int rc = -ENXIO;
 
         sdev->hostdata = NULL;
 
@@ -2868,14 +3253,16 @@ static int ipr_slave_alloc(struct scsi_device *sdev)
                         res->add_to_ml = 0;
                         res->in_erp = 0;
                         sdev->hostdata = res;
-                        res->needs_sync_complete = 1;
+                        if (!ipr_is_naca_model(res))
+                                res->needs_sync_complete = 1;
+                        rc = 0;
                         break;
                 }
         }
 
         spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags);
 
-        return 0;
+        return rc;
 }
 
 /**
@@ -2939,7 +3326,7 @@ static int __ipr_eh_dev_reset(struct scsi_cmnd * scsi_cmd)
         ioa_cfg = (struct ipr_ioa_cfg *) scsi_cmd->device->host->hostdata;
         res = scsi_cmd->device->hostdata;
 
-        if (!res || (!ipr_is_gscsi(res) && !ipr_is_vset_device(res)))
+        if (!res)
                 return FAILED;
 
         /*
@@ -3131,7 +3518,8 @@ static int ipr_cancel_op(struct scsi_cmnd * scsi_cmd)
         }
 
         list_add_tail(&ipr_cmd->queue, &ioa_cfg->free_q);
-        res->needs_sync_complete = 1;
+        if (!ipr_is_naca_model(res))
+                res->needs_sync_complete = 1;
 
         LEAVE;
         return (IPR_IOASC_SENSE_KEY(ioasc) ? FAILED : SUCCESS);
@@ -3435,7 +3823,8 @@ static void ipr_erp_done(struct ipr_cmnd *ipr_cmd)
         }
 
         if (res) {
-                res->needs_sync_complete = 1;
+                if (!ipr_is_naca_model(res))
+                        res->needs_sync_complete = 1;
                 res->in_erp = 0;
         }
         ipr_unmap_sglist(ioa_cfg, ipr_cmd);
@@ -3705,6 +4094,30 @@ static void ipr_gen_sense(struct ipr_cmnd *ipr_cmd)
 }
 
 /**
+ * ipr_get_autosense - Copy autosense data to sense buffer
+ * @ipr_cmd:    ipr command struct
+ *
+ * This function copies the autosense buffer to the buffer
+ * in the scsi_cmd, if there is autosense available.
+ *
+ * Return value:
+ *      1 if autosense was available / 0 if not
+ **/
+static int ipr_get_autosense(struct ipr_cmnd *ipr_cmd)
+{
+        struct ipr_ioasa *ioasa = &ipr_cmd->ioasa;
+
+        if ((be32_to_cpu(ioasa->ioasc_specific) &
+             (IPR_ADDITIONAL_STATUS_FMT | IPR_AUTOSENSE_VALID)) == 0)
+                return 0;
+
+        memcpy(ipr_cmd->scsi_cmd->sense_buffer, ioasa->auto_sense.data,
+               min_t(u16, be16_to_cpu(ioasa->auto_sense.auto_sense_len),
+                   SCSI_SENSE_BUFFERSIZE));
+        return 1;
+}
+
+/**
  * ipr_erp_start - Process an error response for a SCSI op
  * @ioa_cfg:    ioa config struct
  * @ipr_cmd:    ipr command struct
@@ -3734,14 +4147,19 @@ static void ipr_erp_start(struct ipr_ioa_cfg *ioa_cfg,
 
         switch (ioasc & IPR_IOASC_IOASC_MASK) {
         case IPR_IOASC_ABORTED_CMD_TERM_BY_HOST:
-                scsi_cmd->result |= (DID_IMM_RETRY << 16);
+                if (ipr_is_naca_model(res))
+                        scsi_cmd->result |= (DID_ABORT << 16);
+                else
+                        scsi_cmd->result |= (DID_IMM_RETRY << 16);
                 break;
         case IPR_IOASC_IR_RESOURCE_HANDLE:
+        case IPR_IOASC_IR_NO_CMDS_TO_2ND_IOA:
                 scsi_cmd->result |= (DID_NO_CONNECT << 16);
                 break;
         case IPR_IOASC_HW_SEL_TIMEOUT:
                 scsi_cmd->result |= (DID_NO_CONNECT << 16);
-                res->needs_sync_complete = 1;
+                if (!ipr_is_naca_model(res))
+                        res->needs_sync_complete = 1;
                 break;
         case IPR_IOASC_SYNC_REQUIRED:
                 if (!res->in_erp)
@@ -3749,6 +4167,7 @@ static void ipr_erp_start(struct ipr_ioa_cfg *ioa_cfg,
                 scsi_cmd->result |= (DID_IMM_RETRY << 16);
                 break;
         case IPR_IOASC_MED_DO_NOT_REALLOC: /* prevent retries */
+        case IPR_IOASA_IR_DUAL_IOA_DISABLED:
                 scsi_cmd->result |= (DID_PASSTHROUGH << 16);
                 break;
         case IPR_IOASC_BUS_WAS_RESET:
@@ -3760,21 +4179,27 @@ static void ipr_erp_start(struct ipr_ioa_cfg *ioa_cfg,
                 if (!res->resetting_device)
                         scsi_report_bus_reset(ioa_cfg->host, scsi_cmd->device->channel);
                 scsi_cmd->result |= (DID_ERROR << 16);
-                res->needs_sync_complete = 1;
+                if (!ipr_is_naca_model(res))
+                        res->needs_sync_complete = 1;
                 break;
         case IPR_IOASC_HW_DEV_BUS_STATUS:
                 scsi_cmd->result |= IPR_IOASC_SENSE_STATUS(ioasc);
                 if (IPR_IOASC_SENSE_STATUS(ioasc) == SAM_STAT_CHECK_CONDITION) {
-                        ipr_erp_cancel_all(ipr_cmd);
-                        return;
+                        if (!ipr_get_autosense(ipr_cmd)) {
+                                if (!ipr_is_naca_model(res)) {
+                                        ipr_erp_cancel_all(ipr_cmd);
+                                        return;
+                                }
+                        }
                 }
-                res->needs_sync_complete = 1;
+                if (!ipr_is_naca_model(res))
+                        res->needs_sync_complete = 1;
                 break;
         case IPR_IOASC_NR_INIT_CMD_REQUIRED:
                 break;
         default:
                 scsi_cmd->result |= (DID_ERROR << 16);
-                if (!ipr_is_vset_device(res))
+                if (!ipr_is_vset_device(res) && !ipr_is_naca_model(res))
                         res->needs_sync_complete = 1;
                 break;
         }
@@ -4073,6 +4498,7 @@ static int ipr_ioa_reset_done(struct ipr_cmnd *ipr_cmd)
         ioa_cfg->in_reset_reload = 0;
         ioa_cfg->allow_cmds = 1;
         ioa_cfg->reset_cmd = NULL;
+        ioa_cfg->doorbell |= IPR_RUNTIME_RESET;
 
         list_for_each_entry(res, &ioa_cfg->used_res_q, queue) {
                 if (ioa_cfg->allow_ml_add_del && (res->add_to_ml || res->del_from_ml)) {
@@ -4146,7 +4572,7 @@ static int ipr_set_supported_devs(struct ipr_cmnd *ipr_cmd)
         ipr_cmd->job_step = ipr_ioa_reset_done;
 
         list_for_each_entry_continue(res, &ioa_cfg->used_res_q, queue) {
-                if (!ipr_is_af_dasd_device(res))
+                if (!IPR_IS_DASD_DEVICE(res->cfgte.std_inq_data))
                         continue;
 
                 ipr_cmd->u.res = res;
@@ -4179,6 +4605,36 @@ static int ipr_set_supported_devs(struct ipr_cmnd *ipr_cmd)
 }
 
 /**
+ * ipr_setup_write_cache - Disable write cache if needed
+ * @ipr_cmd:    ipr command struct
+ *
+ * This function sets up adapters write cache to desired setting
+ *
+ * Return value:
+ *      IPR_RC_JOB_CONTINUE / IPR_RC_JOB_RETURN
+ **/
+static int ipr_setup_write_cache(struct ipr_cmnd *ipr_cmd)
+{
+        struct ipr_ioa_cfg *ioa_cfg = ipr_cmd->ioa_cfg;
+
+        ipr_cmd->job_step = ipr_set_supported_devs;
+        ipr_cmd->u.res = list_entry(ioa_cfg->used_res_q.next,
+                                    struct ipr_resource_entry, queue);
+
+        if (ioa_cfg->cache_state != CACHE_DISABLED)
+                return IPR_RC_JOB_CONTINUE;
+
+        ipr_cmd->ioarcb.res_handle = cpu_to_be32(IPR_IOA_RES_HANDLE);
+        ipr_cmd->ioarcb.cmd_pkt.request_type = IPR_RQTYPE_IOACMD;
+        ipr_cmd->ioarcb.cmd_pkt.cdb[0] = IPR_IOA_SHUTDOWN;
+        ipr_cmd->ioarcb.cmd_pkt.cdb[1] = IPR_SHUTDOWN_PREPARE_FOR_NORMAL;
+
+        ipr_do_req(ipr_cmd, ipr_reset_ioa_job, ipr_timeout, IPR_INTERNAL_TIMEOUT);
+
+        return IPR_RC_JOB_RETURN;
+}
+
+/**
  * ipr_get_mode_page - Locate specified mode page
  * @mode_pages: mode page buffer
  * @page_code:  page code to find
@@ -4389,10 +4845,7 @@ static int ipr_ioafp_mode_select_page28(struct ipr_cmnd *ipr_cmd)
                               ioa_cfg->vpd_cbs_dma + offsetof(struct ipr_misc_cbs, mode_pages),
                               length);
 
-        ipr_cmd->job_step = ipr_set_supported_devs;
-        ipr_cmd->u.res = list_entry(ioa_cfg->used_res_q.next,
-                                    struct ipr_resource_entry, queue);
-
+        ipr_cmd->job_step = ipr_setup_write_cache;
         ipr_do_req(ipr_cmd, ipr_reset_ioa_job, ipr_timeout, IPR_INTERNAL_TIMEOUT);
 
         LEAVE;
@@ -4431,6 +4884,51 @@ static void ipr_build_mode_sense(struct ipr_cmnd *ipr_cmd,
 }
 
 /**
+ * ipr_reset_cmd_failed - Handle failure of IOA reset command
+ * @ipr_cmd:    ipr command struct
+ *
+ * This function handles the failure of an IOA bringup command.
+ *
+ * Return value:
+ *      IPR_RC_JOB_RETURN
+ **/
+static int ipr_reset_cmd_failed(struct ipr_cmnd *ipr_cmd)
+{
+        struct ipr_ioa_cfg *ioa_cfg = ipr_cmd->ioa_cfg;
+        u32 ioasc = be32_to_cpu(ipr_cmd->ioasa.ioasc);
+
+        dev_err(&ioa_cfg->pdev->dev,
+                "0x%02X failed with IOASC: 0x%08X\n",
+                ipr_cmd->ioarcb.cmd_pkt.cdb[0], ioasc);
+
+        ipr_initiate_ioa_reset(ioa_cfg, IPR_SHUTDOWN_NONE);
+        list_add_tail(&ipr_cmd->queue, &ioa_cfg->free_q);
+        return IPR_RC_JOB_RETURN;
+}
+
+/**
+ * ipr_reset_mode_sense_failed - Handle failure of IOAFP mode sense
+ * @ipr_cmd:    ipr command struct
+ *
+ * This function handles the failure of a Mode Sense to the IOAFP.
+ * Some adapters do not handle all mode pages.
+ *
+ * Return value:
+ *      IPR_RC_JOB_CONTINUE / IPR_RC_JOB_RETURN
+ **/
+static int ipr_reset_mode_sense_failed(struct ipr_cmnd *ipr_cmd)
+{
+        u32 ioasc = be32_to_cpu(ipr_cmd->ioasa.ioasc);
+
+        if (ioasc == IPR_IOASC_IR_INVALID_REQ_TYPE_OR_PKT) {
+                ipr_cmd->job_step = ipr_setup_write_cache;
+                return IPR_RC_JOB_CONTINUE;
+        }
+
+        return ipr_reset_cmd_failed(ipr_cmd);
+}
+
+/**
  * ipr_ioafp_mode_sense_page28 - Issue Mode Sense Page 28 to IOA
  * @ipr_cmd:    ipr command struct
  *
@@ -4451,6 +4949,7 @@ static int ipr_ioafp_mode_sense_page28(struct ipr_cmnd *ipr_cmd)
                              sizeof(struct ipr_mode_pages));
 
         ipr_cmd->job_step = ipr_ioafp_mode_select_page28;
+        ipr_cmd->job_step_failed = ipr_reset_mode_sense_failed;
 
         ipr_do_req(ipr_cmd, ipr_reset_ioa_job, ipr_timeout, IPR_INTERNAL_TIMEOUT);
 
@@ -4612,6 +5111,27 @@ static void ipr_ioafp_inquiry(struct ipr_cmnd *ipr_cmd, u8 flags, u8 page,
 }
 
 /**
+ * ipr_inquiry_page_supported - Is the given inquiry page supported
+ * @page0:              inquiry page 0 buffer
+ * @page:               page code.
+ *
+ * This function determines if the specified inquiry page is supported.
+ *
+ * Return value:
+ *      1 if page is supported / 0 if not
+ **/
+static int ipr_inquiry_page_supported(struct ipr_inquiry_page0 *page0, u8 page)
+{
+        int i;
+
+        for (i = 0; i < min_t(u8, page0->len, IPR_INQUIRY_PAGE0_ENTRIES); i++)
+                if (page0->page[i] == page)
+                        return 1;
+
+        return 0;
+}
+
+/**
  * ipr_ioafp_page3_inquiry - Send a Page 3 Inquiry to the adapter.
  * @ipr_cmd:    ipr command struct
  *
@@ -4624,6 +5144,36 @@ static void ipr_ioafp_inquiry(struct ipr_cmnd *ipr_cmd, u8 flags, u8 page,
 static int ipr_ioafp_page3_inquiry(struct ipr_cmnd *ipr_cmd)
 {
         struct ipr_ioa_cfg *ioa_cfg = ipr_cmd->ioa_cfg;
+        struct ipr_inquiry_page0 *page0 = &ioa_cfg->vpd_cbs->page0_data;
+
+        ENTER;
+
+        if (!ipr_inquiry_page_supported(page0, 1))
+                ioa_cfg->cache_state = CACHE_NONE;
+
+        ipr_cmd->job_step = ipr_ioafp_query_ioa_cfg;
+
+        ipr_ioafp_inquiry(ipr_cmd, 1, 3,
+                          ioa_cfg->vpd_cbs_dma + offsetof(struct ipr_misc_cbs, page3_data),
+                          sizeof(struct ipr_inquiry_page3));
+
+        LEAVE;
+        return IPR_RC_JOB_RETURN;
+}
+
+/**
+ * ipr_ioafp_page0_inquiry - Send a Page 0 Inquiry to the adapter.
+ * @ipr_cmd:    ipr command struct
+ *
+ * This function sends a Page 0 inquiry to the adapter
+ * to retrieve supported inquiry pages.
+ *
+ * Return value:
+ *      IPR_RC_JOB_CONTINUE / IPR_RC_JOB_RETURN
+ **/
+static int ipr_ioafp_page0_inquiry(struct ipr_cmnd *ipr_cmd)
+{
+        struct ipr_ioa_cfg *ioa_cfg = ipr_cmd->ioa_cfg;
         char type[5];
 
         ENTER;
@@ -4633,11 +5183,11 @@ static int ipr_ioafp_page3_inquiry(struct ipr_cmnd *ipr_cmd)
         type[4] = '\0';
         ioa_cfg->type = simple_strtoul((char *)type, NULL, 16);
 
-        ipr_cmd->job_step = ipr_ioafp_query_ioa_cfg;
+        ipr_cmd->job_step = ipr_ioafp_page3_inquiry;
 
-        ipr_ioafp_inquiry(ipr_cmd, 1, 3,
-                          ioa_cfg->vpd_cbs_dma + offsetof(struct ipr_misc_cbs, page3_data),
-                          sizeof(struct ipr_inquiry_page3));
+        ipr_ioafp_inquiry(ipr_cmd, 1, 0,
+                          ioa_cfg->vpd_cbs_dma + offsetof(struct ipr_misc_cbs, page0_data),
+                          sizeof(struct ipr_inquiry_page0));
 
         LEAVE;
         return IPR_RC_JOB_RETURN;
@@ -4657,7 +5207,7 @@ static int ipr_ioafp_std_inquiry(struct ipr_cmnd *ipr_cmd)
         struct ipr_ioa_cfg *ioa_cfg = ipr_cmd->ioa_cfg;
 
         ENTER;
-        ipr_cmd->job_step = ipr_ioafp_page3_inquiry;
+        ipr_cmd->job_step = ipr_ioafp_page0_inquiry;
 
         ipr_ioafp_inquiry(ipr_cmd, 0, 0,
                           ioa_cfg->vpd_cbs_dma + offsetof(struct ipr_misc_cbs, ioa_vpd),
@@ -4815,7 +5365,7 @@ static int ipr_reset_enable_ioa(struct ipr_cmnd *ipr_cmd)
         }
 
         /* Enable destructive diagnostics on IOA */
-        writel(IPR_DOORBELL, ioa_cfg->regs.set_uproc_interrupt_reg);
+        writel(ioa_cfg->doorbell, ioa_cfg->regs.set_uproc_interrupt_reg);
 
         writel(IPR_PCII_OPER_INTERRUPTS, ioa_cfg->regs.clr_interrupt_mask_reg);
         int_reg = readl(ioa_cfg->regs.sense_interrupt_mask_reg);
@@ -5147,12 +5697,7 @@ static int ipr_reset_ucode_download(struct ipr_cmnd *ipr_cmd)
         ipr_cmd->ioarcb.cmd_pkt.cdb[7] = (sglist->buffer_len & 0x00ff00) >> 8;
         ipr_cmd->ioarcb.cmd_pkt.cdb[8] = sglist->buffer_len & 0x0000ff;
 
-        if (ipr_map_ucode_buffer(ipr_cmd, sglist, sglist->buffer_len)) {
-                dev_err(&ioa_cfg->pdev->dev,
-                        "Failed to map microcode download buffer\n");
-                return IPR_RC_JOB_CONTINUE;
-        }
-
+        ipr_build_ucode_ioadl(ipr_cmd, sglist);
         ipr_cmd->job_step = ipr_reset_ucode_download_done;
 
         ipr_do_req(ipr_cmd, ipr_reset_ioa_job, ipr_timeout,
@@ -5217,7 +5762,6 @@ static int ipr_reset_shutdown_ioa(struct ipr_cmnd *ipr_cmd)
 static void ipr_reset_ioa_job(struct ipr_cmnd *ipr_cmd)
 {
         u32 rc, ioasc;
-        unsigned long scratch = ipr_cmd->u.scratch;
         struct ipr_ioa_cfg *ioa_cfg = ipr_cmd->ioa_cfg;
 
         do {
@@ -5233,17 +5777,13 @@ static void ipr_reset_ioa_job(struct ipr_cmnd *ipr_cmd)
                 }
 
                 if (IPR_IOASC_SENSE_KEY(ioasc)) {
-                        dev_err(&ioa_cfg->pdev->dev,
-                                "0x%02X failed with IOASC: 0x%08X\n",
-                                ipr_cmd->ioarcb.cmd_pkt.cdb[0], ioasc);
-
-                        ipr_initiate_ioa_reset(ioa_cfg, IPR_SHUTDOWN_NONE);
-                        list_add_tail(&ipr_cmd->queue, &ioa_cfg->free_q);
-                        return;
+                        rc = ipr_cmd->job_step_failed(ipr_cmd);
+                        if (rc == IPR_RC_JOB_RETURN)
+                                return;
                 }
 
                 ipr_reinit_ipr_cmnd(ipr_cmd);
-                ipr_cmd->u.scratch = scratch;
+                ipr_cmd->job_step_failed = ipr_reset_cmd_failed;
                 rc = ipr_cmd->job_step(ipr_cmd);
         } while(rc == IPR_RC_JOB_CONTINUE);
 }
@@ -5517,15 +6057,12 @@ static int __devinit ipr_alloc_mem(struct ipr_ioa_cfg *ioa_cfg)
         int i, rc = -ENOMEM;
 
         ENTER;
-        ioa_cfg->res_entries = kmalloc(sizeof(struct ipr_resource_entry) *
+        ioa_cfg->res_entries = kzalloc(sizeof(struct ipr_resource_entry) *
                                        IPR_MAX_PHYSICAL_DEVS, GFP_KERNEL);
 
         if (!ioa_cfg->res_entries)
                 goto out;
 
-        memset(ioa_cfg->res_entries, 0,
-               sizeof(struct ipr_resource_entry) * IPR_MAX_PHYSICAL_DEVS);
-
         for (i = 0; i < IPR_MAX_PHYSICAL_DEVS; i++)
                 list_add_tail(&ioa_cfg->res_entries[i].queue, &ioa_cfg->free_res_q);
 
@@ -5566,15 +6103,12 @@ static int __devinit ipr_alloc_mem(struct ipr_ioa_cfg *ioa_cfg)
                 list_add_tail(&ioa_cfg->hostrcb[i]->queue, &ioa_cfg->hostrcb_free_q);
         }
 
-        ioa_cfg->trace = kmalloc(sizeof(struct ipr_trace_entry) *
+        ioa_cfg->trace = kzalloc(sizeof(struct ipr_trace_entry) *
                                  IPR_NUM_TRACE_ENTRIES, GFP_KERNEL);
 
         if (!ioa_cfg->trace)
                 goto out_free_hostrcb_dma;
 
-        memset(ioa_cfg->trace, 0,
-               sizeof(struct ipr_trace_entry) * IPR_NUM_TRACE_ENTRIES);
-
         rc = 0;
 out:
         LEAVE;
@@ -5642,6 +6176,9 @@ static void __devinit ipr_init_ioa_cfg(struct ipr_ioa_cfg *ioa_cfg,
         ioa_cfg->host = host;
         ioa_cfg->pdev = pdev;
         ioa_cfg->log_level = ipr_log_level;
+        ioa_cfg->doorbell = IPR_DOORBELL;
+        if (!ipr_auto_create)
+                ioa_cfg->doorbell |= IPR_RUNTIME_RESET;
         sprintf(ioa_cfg->eye_catcher, IPR_EYECATCHER);
         sprintf(ioa_cfg->trace_start, IPR_TRACE_START_LABEL);
         sprintf(ioa_cfg->ipr_free_label, IPR_FREEQ_LABEL);
@@ -5660,6 +6197,10 @@ static void __devinit ipr_init_ioa_cfg(struct ipr_ioa_cfg *ioa_cfg,
         INIT_WORK(&ioa_cfg->work_q, ipr_worker_thread, ioa_cfg);
         init_waitqueue_head(&ioa_cfg->reset_wait_q);
         ioa_cfg->sdt_state = INACTIVE;
+        if (ipr_enable_cache)
+                ioa_cfg->cache_state = CACHE_ENABLED;
+        else
+                ioa_cfg->cache_state = CACHE_DISABLED;
 
         ipr_initialize_bus_attr(ioa_cfg);
 
@@ -6008,6 +6549,7 @@ static int __devinit ipr_probe(struct pci_dev *pdev,
         ipr_scan_vsets(ioa_cfg);
         scsi_add_device(ioa_cfg->host, IPR_IOA_BUS, IPR_IOA_TARGET, IPR_IOA_LUN);
         ioa_cfg->allow_ml_add_del = 1;
+        ioa_cfg->host->max_channel = IPR_VSET_BUS;
         schedule_work(&ioa_cfg->work_q);
         return 0;
 }
@@ -6055,12 +6597,30 @@ static struct pci_device_id ipr_pci_table[] __devinitdata = {
         { PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_CITRINE,
                 PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_571A,
               0, 0, (kernel_ulong_t)&ipr_chip_cfg[0] },
+        { PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_CITRINE,
+                PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_575B,
+                0, 0, (kernel_ulong_t)&ipr_chip_cfg[0] },
+        { PCI_VENDOR_ID_ADAPTEC2, PCI_DEVICE_ID_ADAPTEC2_OBSIDIAN,
+              PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_572A,
+              0, 0, (kernel_ulong_t)&ipr_chip_cfg[0] },
+        { PCI_VENDOR_ID_ADAPTEC2, PCI_DEVICE_ID_ADAPTEC2_OBSIDIAN,
+              PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_572B,
+              0, 0, (kernel_ulong_t)&ipr_chip_cfg[0] },
+        { PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_OBSIDIAN,
+              PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_572A,
+              0, 0, (kernel_ulong_t)&ipr_chip_cfg[0] },
+        { PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_OBSIDIAN,
+              PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_572B,
+              0, 0, (kernel_ulong_t)&ipr_chip_cfg[0] },
         { PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_SNIPE,
                 PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_2780,
                 0, 0, (kernel_ulong_t)&ipr_chip_cfg[1] },
         { PCI_VENDOR_ID_ADAPTEC2, PCI_DEVICE_ID_ADAPTEC2_SCAMP,
                 PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_571E,
                 0, 0, (kernel_ulong_t)&ipr_chip_cfg[1] },
+        { PCI_VENDOR_ID_ADAPTEC2, PCI_DEVICE_ID_ADAPTEC2_SCAMP,
+                PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_571F,
+                0, 0, (kernel_ulong_t)&ipr_chip_cfg[1] },
         { }
 };
 MODULE_DEVICE_TABLE(pci, ipr_pci_table);
diff --git a/drivers/scsi/ipr.h b/drivers/scsi/ipr.h
index 8cf967108500..6bec673c925c 100644
--- a/drivers/scsi/ipr.h
+++ b/drivers/scsi/ipr.h
@@ -36,23 +36,8 @@
 /*
  * Literals
  */
-#define IPR_DRIVER_VERSION "2.0.14"
-#define IPR_DRIVER_DATE "(May 2, 2005)"
-
-/*
- * IPR_DBG_TRACE: Setting this to 1 will turn on some general function tracing
- *                      resulting in a bunch of extra debugging printks to the console
- *
- * IPR_DEBUG:   Setting this to 1 will turn on some error path tracing.
- *                      Enables the ipr_trace macro.
- */
-#ifdef IPR_DEBUG_ALL
-#define IPR_DEBUG                               1
-#define IPR_DBG_TRACE                   1
-#else
-#define IPR_DEBUG                               0
-#define IPR_DBG_TRACE                   0
-#endif
+#define IPR_DRIVER_VERSION "2.1.0"
+#define IPR_DRIVER_DATE "(October 31, 2005)"
 
 /*
  * IPR_MAX_CMD_PER_LUN: This defines the maximum number of outstanding
@@ -76,6 +61,10 @@
 #define IPR_SUBS_DEV_ID_571A    0x02C0
 #define IPR_SUBS_DEV_ID_571B    0x02BE
 #define IPR_SUBS_DEV_ID_571E  0x02BF
+#define IPR_SUBS_DEV_ID_571F    0x02D5
+#define IPR_SUBS_DEV_ID_572A    0x02C1
+#define IPR_SUBS_DEV_ID_572B    0x02C2
+#define IPR_SUBS_DEV_ID_575B    0x030D
 
 #define IPR_NAME                                "ipr"
 
@@ -95,7 +84,10 @@
 #define IPR_IOASC_HW_DEV_BUS_STATUS                     0x04448500
 #define IPR_IOASC_IOASC_MASK                    0xFFFFFF00
 #define IPR_IOASC_SCSI_STATUS_MASK              0x000000FF
+#define IPR_IOASC_IR_INVALID_REQ_TYPE_OR_PKT    0x05240000
 #define IPR_IOASC_IR_RESOURCE_HANDLE            0x05250000
+#define IPR_IOASC_IR_NO_CMDS_TO_2ND_IOA         0x05258100
+#define IPR_IOASA_IR_DUAL_IOA_DISABLED          0x052C8000
 #define IPR_IOASC_BUS_WAS_RESET                 0x06290000
 #define IPR_IOASC_BUS_WAS_RESET_BY_OTHER                0x06298000
 #define IPR_IOASC_ABORTED_CMD_TERM_BY_HOST      0x0B5A0000
@@ -107,14 +99,14 @@
 #define IPR_NUM_LOG_HCAMS                               2
 #define IPR_NUM_CFG_CHG_HCAMS                           2
 #define IPR_NUM_HCAMS   (IPR_NUM_LOG_HCAMS + IPR_NUM_CFG_CHG_HCAMS)
-#define IPR_MAX_NUM_TARGETS_PER_BUS                     0x10
+#define IPR_MAX_NUM_TARGETS_PER_BUS                     256
 #define IPR_MAX_NUM_LUNS_PER_TARGET                     256
 #define IPR_MAX_NUM_VSET_LUNS_PER_TARGET        8
 #define IPR_VSET_BUS                                    0xff
 #define IPR_IOA_BUS                                             0xff
 #define IPR_IOA_TARGET                                  0xff
 #define IPR_IOA_LUN                                             0xff
-#define IPR_MAX_NUM_BUSES                               4
+#define IPR_MAX_NUM_BUSES                               8
 #define IPR_MAX_BUS_TO_SCAN                             IPR_MAX_NUM_BUSES
 
 #define IPR_NUM_RESET_RELOAD_RETRIES            3
@@ -205,6 +197,7 @@
 #define IPR_SDT_FMT2_EXP_ROM_SEL                        0x8
 #define IPR_FMT2_SDT_READY_TO_USE                       0xC4D4E3F2
 #define IPR_DOORBELL                                    0x82800000
+#define IPR_RUNTIME_RESET                               0x40000000
 
 #define IPR_PCII_IOA_TRANS_TO_OPER                      (0x80000000 >> 0)
 #define IPR_PCII_IOARCB_XFER_FAILED                     (0x80000000 >> 3)
@@ -261,6 +254,16 @@ struct ipr_std_inq_vpids {
         u8 product_id[IPR_PROD_ID_LEN];
 }__attribute__((packed));
 
+struct ipr_vpd {
+        struct ipr_std_inq_vpids vpids;
+        u8 sn[IPR_SERIAL_NUM_LEN];
+}__attribute__((packed));
+
+struct ipr_ext_vpd {
+        struct ipr_vpd vpd;
+        __be32 wwid[2];
+}__attribute__((packed));
+
 struct ipr_std_inq_data {
         u8 peri_qual_dev_type;
 #define IPR_STD_INQ_PERI_QUAL(peri) ((peri) >> 5)
@@ -304,6 +307,10 @@ struct ipr_config_table_entry {
 #define IPR_SUBTYPE_GENERIC_SCSI        1
 #define IPR_SUBTYPE_VOLUME_SET          2
 
+#define IPR_QUEUEING_MODEL(res) ((((res)->cfgte.flags) & 0x70) >> 4)
+#define IPR_QUEUE_FROZEN_MODEL  0
+#define IPR_QUEUE_NACA_MODEL            1
+
         struct ipr_res_addr res_addr;
         __be32 res_handle;
         __be32 reserved4[2];
@@ -410,23 +417,26 @@ struct ipr_ioadl_desc {
 struct ipr_ioasa_vset {
         __be32 failing_lba_hi;
         __be32 failing_lba_lo;
-        __be32 ioa_data[22];
+        __be32 reserved;
 }__attribute__((packed, aligned (4)));
 
 struct ipr_ioasa_af_dasd {
         __be32 failing_lba;
+        __be32 reserved[2];
 }__attribute__((packed, aligned (4)));
 
 struct ipr_ioasa_gpdd {
         u8 end_state;
         u8 bus_phase;
         __be16 reserved;
-        __be32 ioa_data[23];
+        __be32 ioa_data[2];
 }__attribute__((packed, aligned (4)));
 
-struct ipr_ioasa_raw {
-        __be32 ioa_data[24];
-}__attribute__((packed, aligned (4)));
+struct ipr_auto_sense {
+        __be16 auto_sense_len;
+        __be16 ioa_data_len;
+        __be32 data[SCSI_SENSE_BUFFERSIZE/sizeof(__be32)];
+};
 
 struct ipr_ioasa {
         __be32 ioasc;
@@ -453,6 +463,8 @@ struct ipr_ioasa {
         __be32 fd_res_handle;
 
         __be32 ioasc_specific;  /* status code specific field */
+#define IPR_ADDITIONAL_STATUS_FMT               0x80000000
+#define IPR_AUTOSENSE_VALID                     0x40000000
 #define IPR_IOASC_SPECIFIC_MASK         0x00ffffff
 #define IPR_FIELD_POINTER_VALID         (0x80000000 >> 8)
 #define IPR_FIELD_POINTER_MASK          0x0000ffff
@@ -461,8 +473,9 @@ struct ipr_ioasa {
                 struct ipr_ioasa_vset vset;
                 struct ipr_ioasa_af_dasd dasd;
                 struct ipr_ioasa_gpdd gpdd;
-                struct ipr_ioasa_raw raw;
         } u;
+
+        struct ipr_auto_sense auto_sense;
 }__attribute__((packed, aligned (4)));
 
 struct ipr_mode_parm_hdr {
@@ -536,28 +549,49 @@ struct ipr_inquiry_page3 {
         u8 patch_number[4];
 }__attribute__((packed));
 
+#define IPR_INQUIRY_PAGE0_ENTRIES 20
+struct ipr_inquiry_page0 {
+        u8 peri_qual_dev_type;
+        u8 page_code;
+        u8 reserved1;
+        u8 len;
+        u8 page[IPR_INQUIRY_PAGE0_ENTRIES];
+}__attribute__((packed));
+
 struct ipr_hostrcb_device_data_entry {
-        struct ipr_std_inq_vpids dev_vpids;
-        u8 dev_sn[IPR_SERIAL_NUM_LEN];
+        struct ipr_vpd vpd;
         struct ipr_res_addr dev_res_addr;
-        struct ipr_std_inq_vpids new_dev_vpids;
-        u8 new_dev_sn[IPR_SERIAL_NUM_LEN];
-        struct ipr_std_inq_vpids ioa_last_with_dev_vpids;
-        u8 ioa_last_with_dev_sn[IPR_SERIAL_NUM_LEN];
-        struct ipr_std_inq_vpids cfc_last_with_dev_vpids;
-        u8 cfc_last_with_dev_sn[IPR_SERIAL_NUM_LEN];
+        struct ipr_vpd new_vpd;
+        struct ipr_vpd ioa_last_with_dev_vpd;
+        struct ipr_vpd cfc_last_with_dev_vpd;
         __be32 ioa_data[5];
 }__attribute__((packed, aligned (4)));
 
+struct ipr_hostrcb_device_data_entry_enhanced {
+        struct ipr_ext_vpd vpd;
+        u8 ccin[4];
+        struct ipr_res_addr dev_res_addr;
+        struct ipr_ext_vpd new_vpd;
+        u8 new_ccin[4];
+        struct ipr_ext_vpd ioa_last_with_dev_vpd;
+        struct ipr_ext_vpd cfc_last_with_dev_vpd;
+}__attribute__((packed, aligned (4)));
+
 struct ipr_hostrcb_array_data_entry {
-        struct ipr_std_inq_vpids vpids;
-        u8 serial_num[IPR_SERIAL_NUM_LEN];
+        struct ipr_vpd vpd;
+        struct ipr_res_addr expected_dev_res_addr;
+        struct ipr_res_addr dev_res_addr;
+}__attribute__((packed, aligned (4)));
+
+struct ipr_hostrcb_array_data_entry_enhanced {
+        struct ipr_ext_vpd vpd;
+        u8 ccin[4];
         struct ipr_res_addr expected_dev_res_addr;
         struct ipr_res_addr dev_res_addr;
 }__attribute__((packed, aligned (4)));
 
 struct ipr_hostrcb_type_ff_error {
-        __be32 ioa_data[246];
+        __be32 ioa_data[502];
 }__attribute__((packed, aligned (4)));
 
 struct ipr_hostrcb_type_01_error {
@@ -568,47 +602,75 @@ struct ipr_hostrcb_type_01_error {
 }__attribute__((packed, aligned (4)));
 
 struct ipr_hostrcb_type_02_error {
-        struct ipr_std_inq_vpids ioa_vpids;
-        u8 ioa_sn[IPR_SERIAL_NUM_LEN];
-        struct ipr_std_inq_vpids cfc_vpids;
-        u8 cfc_sn[IPR_SERIAL_NUM_LEN];
-        struct ipr_std_inq_vpids ioa_last_attached_to_cfc_vpids;
-        u8 ioa_last_attached_to_cfc_sn[IPR_SERIAL_NUM_LEN];
-        struct ipr_std_inq_vpids cfc_last_attached_to_ioa_vpids;
-        u8 cfc_last_attached_to_ioa_sn[IPR_SERIAL_NUM_LEN];
+        struct ipr_vpd ioa_vpd;
+        struct ipr_vpd cfc_vpd;
+        struct ipr_vpd ioa_last_attached_to_cfc_vpd;
+        struct ipr_vpd cfc_last_attached_to_ioa_vpd;
+        __be32 ioa_data[3];
+}__attribute__((packed, aligned (4)));
+
+struct ipr_hostrcb_type_12_error {
+        struct ipr_ext_vpd ioa_vpd;
+        struct ipr_ext_vpd cfc_vpd;
+        struct ipr_ext_vpd ioa_last_attached_to_cfc_vpd;
+        struct ipr_ext_vpd cfc_last_attached_to_ioa_vpd;
         __be32 ioa_data[3];
-        u8 reserved[844];
 }__attribute__((packed, aligned (4)));
 
 struct ipr_hostrcb_type_03_error {
-        struct ipr_std_inq_vpids ioa_vpids;
-        u8 ioa_sn[IPR_SERIAL_NUM_LEN];
-        struct ipr_std_inq_vpids cfc_vpids;
-        u8 cfc_sn[IPR_SERIAL_NUM_LEN];
+        struct ipr_vpd ioa_vpd;
+        struct ipr_vpd cfc_vpd;
         __be32 errors_detected;
         __be32 errors_logged;
         u8 ioa_data[12];
-        struct ipr_hostrcb_device_data_entry dev_entry[3];
-        u8 reserved[444];
+        struct ipr_hostrcb_device_data_entry dev[3];
+}__attribute__((packed, aligned (4)));
+
+struct ipr_hostrcb_type_13_error {
+        struct ipr_ext_vpd ioa_vpd;
+        struct ipr_ext_vpd cfc_vpd;
+        __be32 errors_detected;
+        __be32 errors_logged;
+        struct ipr_hostrcb_device_data_entry_enhanced dev[3];
 }__attribute__((packed, aligned (4)));
 
 struct ipr_hostrcb_type_04_error {
-        struct ipr_std_inq_vpids ioa_vpids;
-        u8 ioa_sn[IPR_SERIAL_NUM_LEN];
-        struct ipr_std_inq_vpids cfc_vpids;
-        u8 cfc_sn[IPR_SERIAL_NUM_LEN];
+        struct ipr_vpd ioa_vpd;
+        struct ipr_vpd cfc_vpd;
         u8 ioa_data[12];
         struct ipr_hostrcb_array_data_entry array_member[10];
         __be32 exposed_mode_adn;
         __be32 array_id;
-        struct ipr_std_inq_vpids incomp_dev_vpids;
-        u8 incomp_dev_sn[IPR_SERIAL_NUM_LEN];
+        struct ipr_vpd incomp_dev_vpd;
         __be32 ioa_data2;
         struct ipr_hostrcb_array_data_entry array_member2[8];
         struct ipr_res_addr last_func_vset_res_addr;
         u8 vset_serial_num[IPR_SERIAL_NUM_LEN];
         u8 protection_level[8];
-        u8 reserved[124];
+}__attribute__((packed, aligned (4)));
+
+struct ipr_hostrcb_type_14_error {
+        struct ipr_ext_vpd ioa_vpd;
+        struct ipr_ext_vpd cfc_vpd;
+        __be32 exposed_mode_adn;
+        __be32 array_id;
+        struct ipr_res_addr last_func_vset_res_addr;
+        u8 vset_serial_num[IPR_SERIAL_NUM_LEN];
+        u8 protection_level[8];
+        __be32 num_entries;
+        struct ipr_hostrcb_array_data_entry_enhanced array_member[18];
+}__attribute__((packed, aligned (4)));
+
+struct ipr_hostrcb_type_07_error {
+        u8 failure_reason[64];
+        struct ipr_vpd vpd;
+        u32 data[222];
+}__attribute__((packed, aligned (4)));
+
+struct ipr_hostrcb_type_17_error {
+        u8 failure_reason[64];
+        struct ipr_ext_vpd vpd;
+        u32 data[476];
 }__attribute__((packed, aligned (4)));
 
 struct ipr_hostrcb_error {
@@ -622,6 +684,11 @@ struct ipr_hostrcb_error {
                 struct ipr_hostrcb_type_02_error type_02_error;
                 struct ipr_hostrcb_type_03_error type_03_error;
                 struct ipr_hostrcb_type_04_error type_04_error;
+                struct ipr_hostrcb_type_07_error type_07_error;
+                struct ipr_hostrcb_type_12_error type_12_error;
+                struct ipr_hostrcb_type_13_error type_13_error;
+                struct ipr_hostrcb_type_14_error type_14_error;
+                struct ipr_hostrcb_type_17_error type_17_error;
         } u;
 }__attribute__((packed, aligned (4)));
 
@@ -655,6 +722,12 @@ struct ipr_hcam {
 #define IPR_HOST_RCB_OVERLAY_ID_3                               0x03
 #define IPR_HOST_RCB_OVERLAY_ID_4                               0x04
 #define IPR_HOST_RCB_OVERLAY_ID_6                               0x06
+#define IPR_HOST_RCB_OVERLAY_ID_7                               0x07
+#define IPR_HOST_RCB_OVERLAY_ID_12                              0x12
+#define IPR_HOST_RCB_OVERLAY_ID_13                              0x13
+#define IPR_HOST_RCB_OVERLAY_ID_14                              0x14
+#define IPR_HOST_RCB_OVERLAY_ID_16                              0x16
+#define IPR_HOST_RCB_OVERLAY_ID_17                              0x17
 #define IPR_HOST_RCB_OVERLAY_ID_DEFAULT                 0xFF
 
         u8 reserved1[3];
@@ -743,6 +816,7 @@ struct ipr_resource_table {
 
 struct ipr_misc_cbs {
         struct ipr_ioa_vpd ioa_vpd;
+        struct ipr_inquiry_page0 page0_data;
         struct ipr_inquiry_page3 page3_data;
         struct ipr_mode_pages mode_pages;
         struct ipr_supported_device supp_dev;
@@ -813,6 +887,7 @@ struct ipr_trace_entry {
 struct ipr_sglist {
         u32 order;
         u32 num_sg;
+        u32 num_dma_sg;
         u32 buffer_len;
         struct scatterlist scatterlist[1];
 };
@@ -825,6 +900,13 @@ enum ipr_sdt_state {
         DUMP_OBTAINED
 };
 
+enum ipr_cache_state {
+        CACHE_NONE,
+        CACHE_DISABLED,
+        CACHE_ENABLED,
+        CACHE_INVALID
+};
+
 /* Per-controller data */
 struct ipr_ioa_cfg {
         char eye_catcher[8];
@@ -841,6 +923,7 @@ struct ipr_ioa_cfg {
         u8 allow_cmds:1;
         u8 allow_ml_add_del:1;
 
+        enum ipr_cache_state cache_state;
         u16 type; /* CCIN of the card */
 
         u8 log_level;
@@ -911,6 +994,7 @@ struct ipr_ioa_cfg {
         u16 reset_retries;
 
         u32 errors_logged;
+        u32 doorbell;
 
         struct Scsi_Host *host;
         struct pci_dev *pdev;
@@ -948,6 +1032,7 @@ struct ipr_cmnd {
         struct timer_list timer;
         void (*done) (struct ipr_cmnd *);
         int (*job_step) (struct ipr_cmnd *);
+        int (*job_step_failed) (struct ipr_cmnd *);
         u16 cmd_index;
         u8 sense_buffer[SCSI_SENSE_BUFFERSIZE];
         dma_addr_t sense_buffer_dma;
@@ -1083,11 +1168,7 @@ struct ipr_ucode_image_header {
 /*
  * Macros
  */
-#if IPR_DEBUG
-#define IPR_DBG_CMD(CMD) do { CMD; } while (0)
-#else
-#define IPR_DBG_CMD(CMD)
-#endif
+#define IPR_DBG_CMD(CMD) if (ipr_debug) { CMD; }
 
 #ifdef CONFIG_SCSI_IPR_TRACE
 #define ipr_create_trace_file(kobj, attr) sysfs_create_bin_file(kobj, attr)
@@ -1135,16 +1216,22 @@ struct ipr_ucode_image_header {
 #define ipr_res_dbg(ioa_cfg, res, fmt, ...) \
         IPR_DBG_CMD(ipr_res_printk(KERN_INFO, ioa_cfg, res, fmt, ##__VA_ARGS__))
 
+#define ipr_phys_res_err(ioa_cfg, res, fmt, ...)                        \
+{                                                                       \
+        if ((res).bus >= IPR_MAX_NUM_BUSES) {                           \
+                ipr_err(fmt": unknown\n", ##__VA_ARGS__);               \
+        } else {                                                        \
+                ipr_err(fmt": %d:%d:%d:%d\n",                           \
+                        ##__VA_ARGS__, (ioa_cfg)->host->host_no,        \
+                        (res).bus, (res).target, (res).lun);            \
+        }                                                               \
+}
+
 #define ipr_trace ipr_dbg("%s: %s: Line: %d\n",\
         __FILE__, __FUNCTION__, __LINE__)
 
-#if IPR_DBG_TRACE
-#define ENTER printk(KERN_INFO IPR_NAME": Entering %s\n", __FUNCTION__)
-#define LEAVE printk(KERN_INFO IPR_NAME": Leaving %s\n", __FUNCTION__)
-#else
-#define ENTER
-#define LEAVE
-#endif
+#define ENTER IPR_DBG_CMD(printk(KERN_INFO IPR_NAME": Entering %s\n", __FUNCTION__))
+#define LEAVE IPR_DBG_CMD(printk(KERN_INFO IPR_NAME": Leaving %s\n", __FUNCTION__))
 
 #define ipr_err_separator \
 ipr_err("----------------------------------------------------------\n")
@@ -1217,6 +1304,20 @@ static inline int ipr_is_gscsi(struct ipr_resource_entry *res)
 }
 
 /**
+ * ipr_is_naca_model - Determine if a resource is using NACA queueing model
+ * @res:        resource entry struct
+ *
+ * Return value:
+ *      1 if NACA queueing model / 0 if not NACA queueing model
+ **/
+static inline int ipr_is_naca_model(struct ipr_resource_entry *res)
+{
+        if (ipr_is_gscsi(res) && IPR_QUEUEING_MODEL(res) == IPR_QUEUE_NACA_MODEL)
+                return 1;
+        return 0;
+}
+
+/**
  * ipr_is_device - Determine if resource address is that of a device
  * @res_addr:   resource address struct
  *
@@ -1226,7 +1327,7 @@ static inline int ipr_is_gscsi(struct ipr_resource_entry *res)
 static inline int ipr_is_device(struct ipr_res_addr *res_addr)
 {
         if ((res_addr->bus < IPR_MAX_NUM_BUSES) &&
-            (res_addr->target < IPR_MAX_NUM_TARGETS_PER_BUS))
+            (res_addr->target < (IPR_MAX_NUM_TARGETS_PER_BUS - 1)))
                 return 1;
 
         return 0;
diff --git a/drivers/scsi/ips.c b/drivers/scsi/ips.c
index cd9b95db5a7d..3882d48a42bf 100644
--- a/drivers/scsi/ips.c
+++ b/drivers/scsi/ips.c
@@ -139,6 +139,7 @@
 /*          - Remove 3 unused "inline" functions                             */
 /* 7.12.xx  - Use STATIC functions whereever possible                        */
 /*          - Clean up deprecated MODULE_PARM calls                          */
+/* 7.12.05  - Remove Version Matching per IBM request                        */
 /*****************************************************************************/
 
 /*
@@ -210,7 +211,7 @@ module_param(ips, charp, 0);
  * DRIVER_VER
  */
 #define IPS_VERSION_HIGH        "7.12"
-#define IPS_VERSION_LOW         ".02 "
+#define IPS_VERSION_LOW         ".05 "
 
 #if !defined(__i386__) && !defined(__ia64__) && !defined(__x86_64__)
 #warning "This driver has only been tested on the x86/ia64/x86_64 platforms"
@@ -247,7 +248,7 @@ module_param(ips, charp, 0);
 /*
  * Function prototypes
  */
-static int ips_detect(Scsi_Host_Template *);
+static int ips_detect(struct scsi_host_template *);
 static int ips_release(struct Scsi_Host *);
 static int ips_eh_abort(Scsi_Cmnd *);
 static int ips_eh_reset(Scsi_Cmnd *);
@@ -347,8 +348,6 @@ static int ips_proc_info(struct Scsi_Host *, char *, char **, off_t, int, int);
 static int ips_host_info(ips_ha_t *, char *, off_t, int);
 static void copy_mem_info(IPS_INFOSTR *, char *, int);
 static int copy_info(IPS_INFOSTR *, char *, ...);
-static int ips_get_version_info(ips_ha_t * ha, dma_addr_t, int intr);
-static void ips_version_check(ips_ha_t * ha, int intr);
 static int ips_abort_init(ips_ha_t * ha, int index);
 static int ips_init_phase2(int index);
 
@@ -378,7 +377,7 @@ static char *ips_FlashData = NULL;	/* CD Boot - Flash Data Buffer      */
 static dma_addr_t ips_flashbusaddr;
 static long ips_FlashDataInUse;         /* CD Boot - Flash Data In Use Flag */
 static uint32_t MaxLiteCmds = 32;       /* Max Active Cmds for a Lite Adapter */
-static Scsi_Host_Template ips_driver_template = {
+static struct scsi_host_template ips_driver_template = {
         .detect                 = ips_detect,
         .release                = ips_release,
         .info                   = ips_info,
@@ -406,8 +405,6 @@ static Scsi_Host_Template ips_driver_template = {
 #endif
 };
 
-static IPS_DEFINE_COMPAT_TABLE( Compatable );   /* Version Compatability Table      */
-
 
 /* This table describes all ServeRAID Adapters */
 static struct  pci_device_id  ips_pci_table[] = {
@@ -590,7 +587,7 @@ __setup("ips=", ips_setup);
 /*                                                                          */
 /****************************************************************************/
 static int
-ips_detect(Scsi_Host_Template * SHT)
+ips_detect(struct scsi_host_template * SHT)
 {
         int i;
 
@@ -1265,9 +1262,9 @@ ips_proc24_info(char *buffer, char **start, off_t offset, int length,
 /*                                                                          */
 /****************************************************************************/
 static void
-ips_select_queue_depth(struct Scsi_Host *host, Scsi_Device * scsi_devs)
+ips_select_queue_depth(struct Scsi_Host *host, struct scsi_device * scsi_devs)
 {
-        Scsi_Device *device;
+        struct scsi_device *device;
         ips_ha_t *ha;
         int count = 0;
         int min;
@@ -1310,7 +1307,7 @@ ips_select_queue_depth(struct Scsi_Host *host, Scsi_Device * scsi_devs)
 /*                                                                          */
 /****************************************************************************/
 static int
-ips_slave_configure(Scsi_Device * SDptr)
+ips_slave_configure(struct scsi_device * SDptr)
 {
         ips_ha_t *ha;
         int min;
@@ -5930,7 +5927,7 @@ ips_write_driver_status(ips_ha_t * ha, int intr)
         strncpy((char *) ha->nvram->bios_high, ha->bios_version, 4);
         strncpy((char *) ha->nvram->bios_low, ha->bios_version + 4, 4);
 
-        ips_version_check(ha, intr);    /* Check BIOS/FW/Driver Versions */
+        ha->nvram->versioning = 0;      /* Indicate the Driver Does Not Support Versioning */
 
         /* now update the page */
         if (!ips_readwrite_page5(ha, TRUE, intr)) {
@@ -6847,135 +6844,6 @@ ips_verify_bios_memio(ips_ha_t * ha, char *buffer, uint32_t buffersize,
                 return (0);
 }
 
-/*---------------------------------------------------------------------------*/
-/*   Routine Name: ips_version_check                                         */
-/*                                                                           */
-/*   Dependencies:                                                           */
-/*     Assumes that ips_read_adapter_status() is called first filling in     */
-/*     the data for SubSystem Parameters.                                    */
-/*     Called from ips_write_driver_status() so it also assumes NVRAM Page 5 */
-/*     Data is available.                                                    */
-/*                                                                           */
-/*---------------------------------------------------------------------------*/
-static void
-ips_version_check(ips_ha_t * ha, int intr)
-{
-        IPS_VERSION_DATA *VersionInfo;
-        uint8_t FirmwareVersion[IPS_COMPAT_ID_LENGTH + 1];
-        uint8_t BiosVersion[IPS_COMPAT_ID_LENGTH + 1];
-        int MatchError;
-        int rc;
-        char BiosString[10];
-        char FirmwareString[10];
-
-        METHOD_TRACE("ips_version_check", 1);
-
-        VersionInfo = ( IPS_VERSION_DATA * ) ha->ioctl_data;
-
-        memset(FirmwareVersion, 0, IPS_COMPAT_ID_LENGTH + 1);
-        memset(BiosVersion, 0, IPS_COMPAT_ID_LENGTH + 1);
-
-        /* Get the Compatible BIOS Version from NVRAM Page 5 */
-        memcpy(BiosVersion, ha->nvram->BiosCompatibilityID,
-               IPS_COMPAT_ID_LENGTH);
-
-        rc = IPS_FAILURE;
-        if (ha->subsys->param[4] & IPS_GET_VERSION_SUPPORT) {   /* If Versioning is Supported */
-                /* Get the Version Info with a Get Version Command */
-                memset( VersionInfo, 0, sizeof (IPS_VERSION_DATA));
-                rc = ips_get_version_info(ha, ha->ioctl_busaddr, intr);
-                if (rc == IPS_SUCCESS)
-                        memcpy(FirmwareVersion, VersionInfo->compatibilityId,
-                               IPS_COMPAT_ID_LENGTH);
-        }
-
-        if (rc != IPS_SUCCESS) {        /* If Data Not Obtainable from a GetVersion Command */
-                /* Get the Firmware Version from Enquiry Data */
-                memcpy(FirmwareVersion, ha->enq->CodeBlkVersion,
-                       IPS_COMPAT_ID_LENGTH);
-        }
-
-        /* printk(KERN_WARNING "Adapter's BIOS Version  = %s\n", BiosVersion);          */
-        /* printk(KERN_WARNING "BIOS Compatible Version = %s\n", IPS_COMPAT_BIOS);      */
-        /* printk(KERN_WARNING "Adapter's Firmware Version  = %s\n", FirmwareVersion);  */
-        /* printk(KERN_WARNING "Firmware Compatible Version = %s \n", Compatable[ ha->nvram->adapter_type ]); */
-
-        MatchError = 0;
-
-        if (strncmp
-            (FirmwareVersion, Compatable[ha->nvram->adapter_type],
-             IPS_COMPAT_ID_LENGTH) != 0)
-                MatchError = 1;
-
-        if (strncmp(BiosVersion, IPS_COMPAT_BIOS, IPS_COMPAT_ID_LENGTH) != 0)
-                MatchError = 1;
-
-        ha->nvram->versioning = 1;      /* Indicate the Driver Supports Versioning */
-
-        if (MatchError) {
-                ha->nvram->version_mismatch = 1;
-                if (ips_cd_boot == 0) {
-                        strncpy(&BiosString[0], ha->nvram->bios_high, 4);
-                        strncpy(&BiosString[4], ha->nvram->bios_low, 4);
-                        BiosString[8] = 0;
-
-                        strncpy(&FirmwareString[0], ha->enq->CodeBlkVersion, 8);
-                        FirmwareString[8] = 0;
-
-                        IPS_PRINTK(KERN_WARNING, ha->pcidev,
-                                   "Warning ! ! ! ServeRAID Version Mismatch\n");
-                        IPS_PRINTK(KERN_WARNING, ha->pcidev,
-                                   "Bios = %s, Firmware = %s, Device Driver = %s%s\n",
-                                   BiosString, FirmwareString, IPS_VERSION_HIGH,
-                                   IPS_VERSION_LOW);
-                        IPS_PRINTK(KERN_WARNING, ha->pcidev,
-                                   "These levels should match to avoid possible compatibility problems.\n");
-                }
-        } else {
-                ha->nvram->version_mismatch = 0;
-        }
-
-        return;
-}
-
-/*---------------------------------------------------------------------------*/
-/*   Routine Name: ips_get_version_info                                      */
-/*                                                                           */
-/*   Routine Description:                                                    */
-/*     Issue an internal GETVERSION Command                                  */
-/*                                                                           */
-/*   Return Value:                                                           */
-/*     0 if Successful, else non-zero                                        */
-/*---------------------------------------------------------------------------*/
-static int
-ips_get_version_info(ips_ha_t * ha, dma_addr_t Buffer, int intr)
-{
-        ips_scb_t *scb;
-        int rc;
-
-        METHOD_TRACE("ips_get_version_info", 1);
-
-        scb = &ha->scbs[ha->max_cmds - 1];
-
-        ips_init_scb(ha, scb);
-
-        scb->timeout = ips_cmd_timeout;
-        scb->cdb[0] = IPS_CMD_GET_VERSION_INFO;
-        scb->cmd.version_info.op_code = IPS_CMD_GET_VERSION_INFO;
-        scb->cmd.version_info.command_id = IPS_COMMAND_ID(ha, scb);
-        scb->cmd.version_info.reserved = 0;
-        scb->cmd.version_info.count = sizeof (IPS_VERSION_DATA);
-        scb->cmd.version_info.reserved2 = 0;
-        scb->data_len = sizeof (IPS_VERSION_DATA);
-        scb->data_busaddr = Buffer;
-        scb->cmd.version_info.buffer_addr = Buffer;
-        scb->flags = 0;
-
-        /* issue command */
-        rc = ips_send_wait(ha, scb, ips_cmd_timeout, intr);
-        return (rc);
-}
-
 /****************************************************************************/
 /*                                                                          */
 /* Routine Name: ips_abort_init                                             */
diff --git a/drivers/scsi/ips.h b/drivers/scsi/ips.h
index adc6eabbf610..f46c382e5599 100644
--- a/drivers/scsi/ips.h
+++ b/drivers/scsi/ips.h
@@ -450,13 +450,13 @@
     */
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
    static int ips_proc24_info(char *, char **, off_t, int, int, int);
-   static void ips_select_queue_depth(struct Scsi_Host *, Scsi_Device *);
+   static void ips_select_queue_depth(struct Scsi_Host *, struct scsi_device *);
    static int ips_biosparam(Disk *disk, kdev_t dev, int geom[]);
 #else
    static int ips_proc_info(struct Scsi_Host *, char *, char **, off_t, int, int);
    static int ips_biosparam(struct scsi_device *sdev, struct block_device *bdev,
                 sector_t capacity, int geom[]);
-   static int ips_slave_configure(Scsi_Device *SDptr);
+   static int ips_slave_configure(struct scsi_device *SDptr);
 #endif
 
 /*
diff --git a/drivers/scsi/jazz_esp.c b/drivers/scsi/jazz_esp.c
index a642f736cf85..23728d1c980c 100644
--- a/drivers/scsi/jazz_esp.c
+++ b/drivers/scsi/jazz_esp.c
@@ -52,7 +52,7 @@ static volatile unsigned char cmd_buffer[16];
                                  * via PIO.
                                  */
 
-int jazz_esp_detect(Scsi_Host_Template *tpnt);
+int jazz_esp_detect(struct scsi_host_template *tpnt);
 static int jazz_esp_release(struct Scsi_Host *shost)
 {
         if (shost->irq)
@@ -65,7 +65,7 @@ static int jazz_esp_release(struct Scsi_Host *shost)
         return 0;
 }
 
-static Scsi_Host_Template driver_template = {
+static struct scsi_host_template driver_template = {
         .proc_name              = "jazz_esp",
         .proc_info              = &esp_proc_info,
         .name                   = "ESP 100/100a/200",
diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c
index a74b4071a662..e51d9a8a2796 100644
--- a/drivers/scsi/libata-core.c
+++ b/drivers/scsi/libata-core.c
@@ -4563,6 +4563,7 @@ ata_pci_init_native_mode(struct pci_dev *pdev, struct ata_port_info **port, int
 
         probe_ent->irq = pdev->irq;
         probe_ent->irq_flags = SA_SHIRQ;
+        probe_ent->private_data = port[0]->private_data;
 
         if (ports & ATA_PORT_PRIMARY) {
                 probe_ent->port[p].cmd_addr = pci_resource_start(pdev, 0);
@@ -4599,6 +4600,7 @@ static struct ata_probe_ent *ata_pci_init_legacy_port(struct pci_dev *pdev, stru
         probe_ent->legacy_mode = 1;
         probe_ent->n_ports = 1;
         probe_ent->hard_port_no = port_num;
+        probe_ent->private_data = port->private_data;
 
         switch(port_num)
         {
diff --git a/drivers/scsi/libata-scsi.c b/drivers/scsi/libata-scsi.c
index bb30fcdc9297..261be24e1df3 100644
--- a/drivers/scsi/libata-scsi.c
+++ b/drivers/scsi/libata-scsi.c
@@ -38,6 +38,7 @@
 #include <linux/spinlock.h>
 #include <scsi/scsi.h>
 #include <scsi/scsi_host.h>
+#include <scsi/scsi_eh.h>
 #include <scsi/scsi_device.h>
 #include <scsi/scsi_request.h>
 #include <linux/libata.h>
@@ -147,7 +148,8 @@ int ata_cmd_ioctl(struct scsi_device *scsidev, void __user *arg)
         u8 scsi_cmd[MAX_COMMAND_SIZE];
         u8 args[4], *argbuf = NULL;
         int argsize = 0;
-        struct scsi_request *sreq;
+        struct scsi_sense_hdr sshdr;
+        enum dma_data_direction data_dir;
 
         if (NULL == (void *)arg)
                 return -EINVAL;
@@ -155,10 +157,6 @@ int ata_cmd_ioctl(struct scsi_device *scsidev, void __user *arg)
         if (copy_from_user(args, arg, sizeof(args)))
                 return -EFAULT;
 
-        sreq = scsi_allocate_request(scsidev, GFP_KERNEL);
-        if (!sreq)
-                return -EINTR;
-
         memset(scsi_cmd, 0, sizeof(scsi_cmd));
 
         if (args[3]) {
@@ -172,11 +170,11 @@ int ata_cmd_ioctl(struct scsi_device *scsidev, void __user *arg)
                 scsi_cmd[1]  = (4 << 1); /* PIO Data-in */
                 scsi_cmd[2]  = 0x0e;     /* no off.line or cc, read from dev,
                                             block count in sector count field */
-                sreq->sr_data_direction = DMA_FROM_DEVICE;
+                data_dir = DMA_FROM_DEVICE;
         } else {
                 scsi_cmd[1]  = (3 << 1); /* Non-data */
                 /* scsi_cmd[2] is already 0 -- no off.line, cc, or data xfer */
-                sreq->sr_data_direction = DMA_NONE;
+                data_dir = DMA_NONE;
         }
 
         scsi_cmd[0] = ATA_16;
@@ -194,9 +192,8 @@ int ata_cmd_ioctl(struct scsi_device *scsidev, void __user *arg)
 
         /* Good values for timeout and retries?  Values below
            from scsi_ioctl_send_command() for default case... */
-        scsi_wait_req(sreq, scsi_cmd, argbuf, argsize, (10*HZ), 5);
-
-        if (sreq->sr_result) {
+        if (scsi_execute_req(scsidev, scsi_cmd, data_dir, argbuf, argsize,
+                             &sshdr, (10*HZ), 5)) {
                 rc = -EIO;
                 goto error;
         }
@@ -207,8 +204,6 @@ int ata_cmd_ioctl(struct scsi_device *scsidev, void __user *arg)
          && copy_to_user((void *)(arg + sizeof(args)), argbuf, argsize))
                 rc = -EFAULT;
 error:
-        scsi_release_request(sreq);
-
         if (argbuf)
                 kfree(argbuf);
 
@@ -231,7 +226,7 @@ int ata_task_ioctl(struct scsi_device *scsidev, void __user *arg)
         int rc = 0;
         u8 scsi_cmd[MAX_COMMAND_SIZE];
         u8 args[7];
-        struct scsi_request *sreq;
+        struct scsi_sense_hdr sshdr;
 
         if (NULL == (void *)arg)
                 return -EINVAL;
@@ -250,26 +245,13 @@ int ata_task_ioctl(struct scsi_device *scsidev, void __user *arg)
         scsi_cmd[12] = args[5];
         scsi_cmd[14] = args[0];
 
-        sreq = scsi_allocate_request(scsidev, GFP_KERNEL);
-        if (!sreq) {
-                rc = -EINTR;
-                goto error;
-        }
-
-        sreq->sr_data_direction = DMA_NONE;
         /* Good values for timeout and retries?  Values below
-           from scsi_ioctl_send_command() for default case... */
-        scsi_wait_req(sreq, scsi_cmd, NULL, 0, (10*HZ), 5);
-
-        if (sreq->sr_result) {
+           from scsi_ioctl_send_command() for default case... */        
+        if (scsi_execute_req(scsidev, scsi_cmd, DMA_NONE, NULL, 0, &sshdr,
+                             (10*HZ), 5))
                 rc = -EIO;
-                goto error;
-        }
 
         /* Need code to retrieve data from check condition? */
-
-error:
-        scsi_release_request(sreq);
         return rc;
 }
 
@@ -1129,6 +1111,8 @@ static unsigned int ata_scsi_rw_xlat(struct ata_queued_cmd *qc, const u8 *scsicm
                  * length 0 means transfer 0 block of data.
                  * However, for ATA R/W commands, sector count 0 means
                  * 256 or 65536 sectors, not 0 sectors as in SCSI.
+                 *
+                 * WARNING: one or two older ATA drives treat 0 as 0...
                  */
                 goto nothing_to_do;
 
diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
index c90723860a04..07498118359d 100644
--- a/drivers/scsi/lpfc/lpfc_init.c
+++ b/drivers/scsi/lpfc/lpfc_init.c
@@ -1704,7 +1704,6 @@ MODULE_DEVICE_TABLE(pci, lpfc_id_table);
 
 static struct pci_driver lpfc_driver = {
         .name           = LPFC_DRIVER_NAME,
-        .owner          = THIS_MODULE,
         .id_table       = lpfc_id_table,
         .probe          = lpfc_pci_probe_one,
         .remove         = __devexit_p(lpfc_pci_remove_one),
diff --git a/drivers/scsi/mac_esp.c b/drivers/scsi/mac_esp.c
index c94c8db84651..e31fadd61904 100644
--- a/drivers/scsi/mac_esp.c
+++ b/drivers/scsi/mac_esp.c
@@ -300,7 +300,7 @@ unsigned long get_base(int chip_num)
  * Model dependent ESP setup
  */
 
-int mac_esp_detect(Scsi_Host_Template * tpnt)
+int mac_esp_detect(struct scsi_host_template * tpnt)
 {
         int quick = 0;
         int chipnum, chipspresent = 0;
@@ -730,7 +730,7 @@ static void dma_setup_quick(struct NCR_ESP * esp, __u32 addr, int count, int wri
 #endif
 }
 
-static Scsi_Host_Template driver_template = {
+static struct scsi_host_template driver_template = {
         .proc_name              = "mac_esp",
         .name                   = "Mac 53C9x SCSI",
         .detect                 = mac_esp_detect,
diff --git a/drivers/scsi/mac_scsi.c b/drivers/scsi/mac_scsi.c
index 92d2c8379abf..777f9bcd1179 100644
--- a/drivers/scsi/mac_scsi.c
+++ b/drivers/scsi/mac_scsi.c
@@ -222,7 +222,7 @@ static struct Scsi_Host *default_instance;
 #endif
 
 /*
- * Function : int macscsi_detect(Scsi_Host_Template * tpnt)
+ * Function : int macscsi_detect(struct scsi_host_template * tpnt)
  *
  * Purpose : initializes mac NCR5380 driver based on the
  *      command line / compile time port and irq definitions.
@@ -233,7 +233,7 @@ static struct Scsi_Host *default_instance;
  *
  */
  
-int macscsi_detect(Scsi_Host_Template * tpnt)
+int macscsi_detect(struct scsi_host_template * tpnt)
 {
     static int called = 0;
     int flags = 0;
@@ -581,7 +581,7 @@ static int macscsi_pwrite (struct Scsi_Host *instance,
 
 #include "NCR5380.c"
 
-static Scsi_Host_Template driver_template = {
+static struct scsi_host_template driver_template = {
         .proc_name                      = "Mac5380",
         .proc_info                      = macscsi_proc_info,
         .name                           = "Macintosh NCR5380 SCSI",
diff --git a/drivers/scsi/mca_53c9x.c b/drivers/scsi/mca_53c9x.c
index 194c75451faf..998a8bbc1a4b 100644
--- a/drivers/scsi/mca_53c9x.c
+++ b/drivers/scsi/mca_53c9x.c
@@ -103,7 +103,7 @@ static volatile unsigned char cmd_buffer[16];
 static struct ESP_regs eregs;
 
 /***************************************************************** Detection */
-static int mca_esp_detect(Scsi_Host_Template *tpnt)
+static int mca_esp_detect(struct scsi_host_template *tpnt)
 {
         struct NCR_ESP *esp;
         static int io_port_by_pos[] = MCA_53C9X_IO_PORTS;
@@ -444,7 +444,7 @@ static void dma_led_off(struct NCR_ESP *esp)
         outb(inb(PS2_SYS_CTR) & 0x3f, PS2_SYS_CTR);
 }
 
-static Scsi_Host_Template driver_template = {
+static struct scsi_host_template driver_template = {
         .proc_name              = "mca_53c9x",
         .name                   = "NCR 53c9x SCSI",
         .detect                 = mca_esp_detect,
diff --git a/drivers/scsi/megaraid.c b/drivers/scsi/megaraid.c
index 61a6fd810bb4..dfea346b00a5 100644
--- a/drivers/scsi/megaraid.c
+++ b/drivers/scsi/megaraid.c
@@ -362,6 +362,7 @@ megaraid_queue(Scsi_Cmnd *scmd, void (*done)(Scsi_Cmnd *))
         adapter_t       *adapter;
         scb_t   *scb;
         int     busy=0;
+        unsigned long flags;
 
         adapter = (adapter_t *)scmd->device->host->hostdata;
 
@@ -377,6 +378,7 @@ megaraid_queue(Scsi_Cmnd *scmd, void (*done)(Scsi_Cmnd *))
          * return 0 in that case.
          */
 
+        spin_lock_irqsave(&adapter->lock, flags);
         scb = mega_build_cmd(adapter, scmd, &busy);
 
         if(scb) {
@@ -393,6 +395,7 @@ megaraid_queue(Scsi_Cmnd *scmd, void (*done)(Scsi_Cmnd *))
                 }
                 return 0;
         }
+        spin_unlock_irqrestore(&adapter->lock, flags);
 
         return busy;
 }
@@ -1683,7 +1686,7 @@ mega_rundoneq (adapter_t *adapter)
 
         list_for_each(pos, &adapter->completed_list) {
 
-                Scsi_Pointer* spos = (Scsi_Pointer *)pos;
+                struct scsi_pointer* spos = (struct scsi_pointer *)pos;
 
                 cmd = list_entry(spos, Scsi_Cmnd, SCp);
                 cmd->scsi_done(cmd);
@@ -1981,7 +1984,7 @@ megaraid_reset(struct scsi_cmnd *cmd)
         mc.cmd = MEGA_CLUSTER_CMD;
         mc.opcode = MEGA_RESET_RESERVATIONS;
 
-        if( mega_internal_command(adapter, LOCK_INT, &mc, NULL) != 0 ) {
+        if( mega_internal_command(adapter, &mc, NULL) != 0 ) {
                 printk(KERN_WARNING
                                 "megaraid: reservation reset failed.\n");
         }
@@ -3011,7 +3014,7 @@ proc_rdrv(adapter_t *adapter, char *page, int start, int end )
                 mc.cmd = FC_NEW_CONFIG;
                 mc.opcode = OP_DCMD_READ_CONFIG;
 
-                if( mega_internal_command(adapter, LOCK_INT, &mc, NULL) ) {
+                if( mega_internal_command(adapter, &mc, NULL) ) {
 
                         len = sprintf(page, "40LD read config failed.\n");
 
@@ -3029,11 +3032,11 @@ proc_rdrv(adapter_t *adapter, char *page, int start, int end )
         else {
                 mc.cmd = NEW_READ_CONFIG_8LD;
 
-                if( mega_internal_command(adapter, LOCK_INT, &mc, NULL) ) {
+                if( mega_internal_command(adapter, &mc, NULL) ) {
 
                         mc.cmd = READ_CONFIG_8LD;
 
-                        if( mega_internal_command(adapter, LOCK_INT, &mc,
+                        if( mega_internal_command(adapter, &mc,
                                                 NULL) ){
 
                                 len = sprintf(page,
@@ -3632,7 +3635,7 @@ megadev_ioctl(struct inode *inode, struct file *filep, unsigned int cmd,
                         /*
                          * Issue the command
                          */
-                        mega_internal_command(adapter, LOCK_INT, &mc, pthru);
+                        mega_internal_command(adapter, &mc, pthru);
 
                         rval = mega_n_to_m((void __user *)arg, &mc);
 
@@ -3715,7 +3718,7 @@ freemem_and_return:
                         /*
                          * Issue the command
                          */
-                        mega_internal_command(adapter, LOCK_INT, &mc, NULL);
+                        mega_internal_command(adapter, &mc, NULL);
 
                         rval = mega_n_to_m((void __user *)arg, &mc);
 
@@ -4234,7 +4237,7 @@ mega_do_del_logdrv(adapter_t *adapter, int logdrv)
         mc.opcode = OP_DEL_LOGDRV;
         mc.subopcode = logdrv;
 
-        rval = mega_internal_command(adapter, LOCK_INT, &mc, NULL);
+        rval = mega_internal_command(adapter, &mc, NULL);
 
         /* log this event */
         if(rval) {
@@ -4367,7 +4370,7 @@ mega_adapinq(adapter_t *adapter, dma_addr_t dma_handle)
 
         mc.xferaddr = (u32)dma_handle;
 
-        if ( mega_internal_command(adapter, LOCK_INT, &mc, NULL) != 0 ) {
+        if ( mega_internal_command(adapter, &mc, NULL) != 0 ) {
                 return -1;
         }
 
@@ -4435,7 +4438,7 @@ mega_internal_dev_inquiry(adapter_t *adapter, u8 ch, u8 tgt,
         mc.cmd = MEGA_MBOXCMD_PASSTHRU;
         mc.xferaddr = (u32)pthru_dma_handle;
 
-        rval = mega_internal_command(adapter, LOCK_INT, &mc, pthru);
+        rval = mega_internal_command(adapter, &mc, pthru);
 
         pci_free_consistent(pdev, sizeof(mega_passthru), pthru,
                         pthru_dma_handle);
@@ -4449,7 +4452,6 @@ mega_internal_dev_inquiry(adapter_t *adapter, u8 ch, u8 tgt,
 /**
  * mega_internal_command()
  * @adapter - pointer to our soft state
- * @ls - the scope of the exclusion lock.
  * @mc - the mailbox command
  * @pthru - Passthru structure for DCDB commands
  *
@@ -4463,8 +4465,7 @@ mega_internal_dev_inquiry(adapter_t *adapter, u8 ch, u8 tgt,
  * Note: parameter 'pthru' is null for non-passthru commands.
  */
 static int
-mega_internal_command(adapter_t *adapter, lockscope_t ls, megacmd_t *mc,
-                mega_passthru *pthru )
+mega_internal_command(adapter_t *adapter, megacmd_t *mc, mega_passthru *pthru)
 {
         Scsi_Cmnd       *scmd;
         struct  scsi_device *sdev;
@@ -4508,15 +4509,8 @@ mega_internal_command(adapter_t *adapter, lockscope_t ls, megacmd_t *mc,
 
         scb->idx = CMDID_INT_CMDS;
 
-        /*
-         * Get the lock only if the caller has not acquired it already
-         */
-        if( ls == LOCK_INT ) spin_lock_irqsave(&adapter->lock, flags);
-
         megaraid_queue(scmd, mega_internal_done);
 
-        if( ls == LOCK_INT ) spin_unlock_irqrestore(&adapter->lock, flags);
-
         wait_for_completion(&adapter->int_waitq);
 
         rval = scmd->result;
diff --git a/drivers/scsi/megaraid.h b/drivers/scsi/megaraid.h
index 4facf557cd19..6f9078025748 100644
--- a/drivers/scsi/megaraid.h
+++ b/drivers/scsi/megaraid.h
@@ -926,13 +926,6 @@ struct mega_hbas {
 #define MEGA_SGLIST                     0x0002
 
 /*
- * lockscope definitions, callers can specify the lock scope with this data
- * type. LOCK_INT would mean the caller has not acquired the lock before
- * making the call and LOCK_EXT would mean otherwise.
- */
-typedef enum { LOCK_INT, LOCK_EXT } lockscope_t;
-
-/*
  * Parameters for the io-mapped controllers
  */
 
@@ -1062,8 +1055,7 @@ static int mega_support_random_del(adapter_t *);
 static int mega_del_logdrv(adapter_t *, int);
 static int mega_do_del_logdrv(adapter_t *, int);
 static void mega_get_max_sgl(adapter_t *);
-static int mega_internal_command(adapter_t *, lockscope_t, megacmd_t *,
-                mega_passthru *);
+static int mega_internal_command(adapter_t *, megacmd_t *, mega_passthru *);
 static void mega_internal_done(Scsi_Cmnd *);
 static int mega_support_cluster(adapter_t *);
 #endif
diff --git a/drivers/scsi/megaraid/mega_common.h b/drivers/scsi/megaraid/mega_common.h
index 8e547130e97d..4675343228ad 100644
--- a/drivers/scsi/megaraid/mega_common.h
+++ b/drivers/scsi/megaraid/mega_common.h
@@ -96,7 +96,6 @@ typedef struct {
  * @param dpc_h                 : tasklet handle
  * @param pdev                  : pci configuration pointer for kernel
  * @param host                  : pointer to host structure of mid-layer
- * @param host_lock             : pointer to appropriate lock
  * @param lock                  : synchronization lock for mid-layer and driver
  * @param quiescent             : driver is quiescent for now.
  * @param outstanding_cmds      : number of commands pending in the driver
@@ -151,7 +150,6 @@ typedef struct {
         struct tasklet_struct   dpc_h;
         struct pci_dev          *pdev;
         struct Scsi_Host        *host;
-        spinlock_t              *host_lock;
         spinlock_t              lock;
         uint8_t                 quiescent;
         int                     outstanding_cmds;
diff --git a/drivers/scsi/megaraid/megaraid_mbox.c b/drivers/scsi/megaraid/megaraid_mbox.c
index 1a3d195a2d36..4b5d420d2f4d 100644
--- a/drivers/scsi/megaraid/megaraid_mbox.c
+++ b/drivers/scsi/megaraid/megaraid_mbox.c
@@ -533,8 +533,6 @@ megaraid_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
 
         // Initialize the synchronization lock for kernel and LLD
         spin_lock_init(&adapter->lock);
-        adapter->host_lock = &adapter->lock;
-
 
         // Initialize the command queues: the list of free SCBs and the list
         // of pending SCBs.
@@ -715,9 +713,6 @@ megaraid_io_attach(adapter_t *adapter)
         SCSIHOST2ADAP(host)     = (caddr_t)adapter;
         adapter->host           = host;
 
-        // export the parameters required by the mid-layer
-        scsi_assign_lock(host, adapter->host_lock);
-
         host->irq               = adapter->irq;
         host->unique_id         = adapter->unique_id;
         host->can_queue         = adapter->max_cmds;
@@ -1560,10 +1555,6 @@ megaraid_queue_command(struct scsi_cmnd *scp, void (* done)(struct scsi_cmnd *))
         scp->scsi_done  = done;
         scp->result     = 0;
 
-        assert_spin_locked(adapter->host_lock);
-
-        spin_unlock(adapter->host_lock);
-
         /*
          * Allocate and build a SCB request
          * if_busy flag will be set if megaraid_mbox_build_cmd() command could
@@ -1573,23 +1564,16 @@ megaraid_queue_command(struct scsi_cmnd *scp, void (* done)(struct scsi_cmnd *))
          * return 0 in that case, and we would do the callback right away.
          */
         if_busy = 0;
-        scb     = megaraid_mbox_build_cmd(adapter, scp, &if_busy);
-
-        if (scb) {
-                megaraid_mbox_runpendq(adapter, scb);
-        }
-
-        spin_lock(adapter->host_lock);
-
+        scb = megaraid_mbox_build_cmd(adapter, scp, &if_busy);
         if (!scb) {     // command already completed
                 done(scp);
                 return 0;
         }
 
+        megaraid_mbox_runpendq(adapter, scb);
         return if_busy;
 }
 
-
 /**
  * megaraid_mbox_build_cmd - transform the mid-layer scsi command to megaraid
  * firmware lingua
@@ -2546,9 +2530,7 @@ megaraid_mbox_dpc(unsigned long devp)
                 megaraid_dealloc_scb(adapter, scb);
 
                 // send the scsi packet back to kernel
-                spin_lock(adapter->host_lock);
                 scp->scsi_done(scp);
-                spin_unlock(adapter->host_lock);
         }
 
         return;
@@ -2563,7 +2545,7 @@ megaraid_mbox_dpc(unsigned long devp)
  * aborted. All the commands issued to the F/W must complete.
  **/
 static int
-__megaraid_abort_handler(struct scsi_cmnd *scp)
+megaraid_abort_handler(struct scsi_cmnd *scp)
 {
         adapter_t               *adapter;
         mraid_device_t          *raid_dev;
@@ -2577,8 +2559,6 @@ __megaraid_abort_handler(struct scsi_cmnd *scp)
         adapter         = SCP2ADAPTER(scp);
         raid_dev        = ADAP2RAIDDEV(adapter);
 
-        assert_spin_locked(adapter->host_lock);
-
         con_log(CL_ANN, (KERN_WARNING
                 "megaraid: aborting-%ld cmd=%x <c=%d t=%d l=%d>\n",
                 scp->serial_number, scp->cmnd[0], SCP2CHANNEL(scp),
@@ -2658,6 +2638,7 @@ __megaraid_abort_handler(struct scsi_cmnd *scp)
         // traverse through the list of all SCB, since driver does not
         // maintain these SCBs on any list
         found = 0;
+        spin_lock_irq(&adapter->lock);
         for (i = 0; i < MBOX_MAX_SCSI_CMDS; i++) {
                 scb = adapter->kscb_list + i;
 
@@ -2680,6 +2661,7 @@ __megaraid_abort_handler(struct scsi_cmnd *scp)
                         }
                 }
         }
+        spin_unlock_irq(&adapter->lock);
 
         if (!found) {
                 con_log(CL_ANN, (KERN_WARNING
@@ -2696,22 +2678,6 @@ __megaraid_abort_handler(struct scsi_cmnd *scp)
         return FAILED;
 }
 
-static int
-megaraid_abort_handler(struct scsi_cmnd *scp)
-{
-        adapter_t       *adapter;
-        int rc;
-
-        adapter         = SCP2ADAPTER(scp);
-
-        spin_lock_irq(adapter->host_lock);
-        rc = __megaraid_abort_handler(scp);
-        spin_unlock_irq(adapter->host_lock);
-
-        return rc;
-}
-
-
 /**
  * megaraid_reset_handler - device reset hadler for mailbox based driver
  * @scp         : reference command
@@ -2723,7 +2689,7 @@ megaraid_abort_handler(struct scsi_cmnd *scp)
  * host
  **/
 static int
-__megaraid_reset_handler(struct scsi_cmnd *scp)
+megaraid_reset_handler(struct scsi_cmnd *scp)
 {
         adapter_t       *adapter;
         scb_t           *scb;
@@ -2739,10 +2705,6 @@ __megaraid_reset_handler(struct scsi_cmnd *scp)
         adapter         = SCP2ADAPTER(scp);
         raid_dev        = ADAP2RAIDDEV(adapter);
 
-        assert_spin_locked(adapter->host_lock);
-
-        con_log(CL_ANN, (KERN_WARNING "megaraid: reseting the host...\n"));
-
         // return failure if adapter is not responding
         if (raid_dev->hw_error) {
                 con_log(CL_ANN, (KERN_NOTICE
@@ -2779,8 +2741,6 @@ __megaraid_reset_handler(struct scsi_cmnd *scp)
                         adapter->outstanding_cmds, MBOX_RESET_WAIT));
         }
 
-        spin_unlock(adapter->host_lock);
-
         recovery_window = MBOX_RESET_WAIT + MBOX_RESET_EXT_WAIT;
 
         recovering = adapter->outstanding_cmds;
@@ -2806,7 +2766,7 @@ __megaraid_reset_handler(struct scsi_cmnd *scp)
                 msleep(1000);
         }
 
-        spin_lock(adapter->host_lock);
+        spin_lock(&adapter->lock);
 
         // If still outstanding commands, bail out
         if (adapter->outstanding_cmds) {
@@ -2815,7 +2775,8 @@ __megaraid_reset_handler(struct scsi_cmnd *scp)
 
                 raid_dev->hw_error = 1;
 
-                return FAILED;
+                rval = FAILED;
+                goto out;
         }
         else {
                 con_log(CL_ANN, (KERN_NOTICE
@@ -2824,7 +2785,10 @@ __megaraid_reset_handler(struct scsi_cmnd *scp)
 
 
         // If the controller supports clustering, reset reservations
-        if (!adapter->ha) return SUCCESS;
+        if (!adapter->ha) {
+                rval = SUCCESS;
+                goto out;
+        }
 
         // clear reservations if any
         raw_mbox[0] = CLUSTER_CMD;
@@ -2841,22 +2805,11 @@ __megaraid_reset_handler(struct scsi_cmnd *scp)
                                 "megaraid: reservation reset failed\n"));
         }
 
+ out:
+        spin_unlock_irq(&adapter->lock);
         return rval;
 }
 
-static int
-megaraid_reset_handler(struct scsi_cmnd *cmd)
-{
-        int rc;
-
-        spin_lock_irq(cmd->device->host->host_lock);
-        rc = __megaraid_reset_handler(cmd);
-        spin_unlock_irq(cmd->device->host->host_lock);
-
-        return rc;
-}
-
-
 /*
  * START: internal commands library
  *
@@ -3776,9 +3729,9 @@ wait_till_fw_empty(adapter_t *adapter)
         /*
          * Set the quiescent flag to stop issuing cmds to FW.
          */
-        spin_lock_irqsave(adapter->host_lock, flags);
+        spin_lock_irqsave(&adapter->lock, flags);
         adapter->quiescent++;
-        spin_unlock_irqrestore(adapter->host_lock, flags);
+        spin_unlock_irqrestore(&adapter->lock, flags);
 
         /*
          * Wait till there are no more cmds outstanding at FW. Try for at most
diff --git a/drivers/scsi/megaraid/megaraid_sas.c b/drivers/scsi/megaraid/megaraid_sas.c
index 801a63bea8a5..3c32e69afcd9 100644
--- a/drivers/scsi/megaraid/megaraid_sas.c
+++ b/drivers/scsi/megaraid/megaraid_sas.c
@@ -766,17 +766,12 @@ static int megasas_generic_reset(struct scsi_cmnd *scmd)
                 return FAILED;
         }
 
-        spin_unlock(scmd->device->host->host_lock);
-
         ret_val = megasas_wait_for_outstanding(instance);
-
         if (ret_val == SUCCESS)
                 printk(KERN_NOTICE "megasas: reset successful \n");
         else
                 printk(KERN_ERR "megasas: failed to do reset\n");
 
-        spin_lock(scmd->device->host->host_lock);
-
         return ret_val;
 }
 
diff --git a/drivers/scsi/mvme147.c b/drivers/scsi/mvme147.c
index 33380cee9b77..cb367c2c5c78 100644
--- a/drivers/scsi/mvme147.c
+++ b/drivers/scsi/mvme147.c
@@ -63,7 +63,7 @@ static void dma_stop (struct Scsi_Host *instance, Scsi_Cmnd *SCpnt,
     m147_pcc->dma_cntrl = 0;
 }
 
-int mvme147_detect(Scsi_Host_Template *tpnt)
+int mvme147_detect(struct scsi_host_template *tpnt)
 {
     static unsigned char called = 0;
     wd33c93_regs regs;
@@ -130,7 +130,7 @@ static int mvme147_bus_reset(Scsi_Cmnd *cmd)
 
 #include "mvme147.h"
 
-static Scsi_Host_Template driver_template = {
+static struct scsi_host_template driver_template = {
         .proc_name              = "MVME147",
         .name                   = "MVME147 built-in SCSI",
         .detect                 = mvme147_detect,
diff --git a/drivers/scsi/mvme147.h b/drivers/scsi/mvme147.h
index d8903f096182..2f56d69bd180 100644
--- a/drivers/scsi/mvme147.h
+++ b/drivers/scsi/mvme147.h
@@ -10,7 +10,7 @@
 
 #include <linux/types.h>
 
-int mvme147_detect(Scsi_Host_Template *);
+int mvme147_detect(struct scsi_host_template *);
 int mvme147_release(struct Scsi_Host *);
 const char *wd33c93_info(void);
 int wd33c93_queuecommand(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
diff --git a/drivers/scsi/mvme16x.c b/drivers/scsi/mvme16x.c
index 29ec699e0e4d..890e9e232dab 100644
--- a/drivers/scsi/mvme16x.c
+++ b/drivers/scsi/mvme16x.c
@@ -21,7 +21,7 @@
 #include<linux/stat.h>
 
 
-int mvme16x_scsi_detect(Scsi_Host_Template *tpnt)
+int mvme16x_scsi_detect(struct scsi_host_template *tpnt)
 {
     static unsigned char called = 0;
     int clock;
@@ -61,7 +61,7 @@ static int mvme16x_scsi_release(struct Scsi_Host *shost)
         return 0;
 }
 
-static Scsi_Host_Template driver_template = {
+static struct scsi_host_template driver_template = {
         .name                   = "MVME16x NCR53c710 SCSI",
         .detect                 = mvme16x_scsi_detect,
         .release                = mvme16x_scsi_release,
diff --git a/drivers/scsi/mvme16x.h b/drivers/scsi/mvme16x.h
index 25173c891d3c..c7a12533fb2c 100644
--- a/drivers/scsi/mvme16x.h
+++ b/drivers/scsi/mvme16x.h
@@ -3,7 +3,7 @@
 
 #include <linux/types.h>
 
-int mvme16x_scsi_detect(Scsi_Host_Template *);
+int mvme16x_scsi_detect(struct scsi_host_template *);
 const char *NCR53c7x0_info(void);
 int NCR53c7xx_queue_command(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
 int NCR53c7xx_abort(Scsi_Cmnd *);
diff --git a/drivers/scsi/nsp32.c b/drivers/scsi/nsp32.c
index e4ff4f00676d..a279ebb61447 100644
--- a/drivers/scsi/nsp32.c
+++ b/drivers/scsi/nsp32.c
@@ -198,7 +198,7 @@ static void __devexit nsp32_remove(struct pci_dev *);
 static int  __init    init_nsp32  (void);
 static void __exit    exit_nsp32  (void);
 
-/* struct Scsi_Host_Template */
+/* struct struct scsi_host_template */
 #if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,73))
 static int         nsp32_proc_info   (struct Scsi_Host *, char *, char **, off_t, int, int);
 #else
@@ -208,7 +208,7 @@ static int         nsp32_proc_info   (char *, char **, off_t, int, int, int);
 #if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,73))
 static int         nsp32_detect      (struct pci_dev *pdev);
 #else
-static int         nsp32_detect      (Scsi_Host_Template *);
+static int         nsp32_detect      (struct scsi_host_template *);
 #endif
 static int         nsp32_queuecommand(struct scsi_cmnd *,
                 void (*done)(struct scsi_cmnd *));
@@ -2683,7 +2683,7 @@ static int nsp32_detect(struct pci_dev *pdev)
 #define DETECT_OK 1
 #define DETECT_NG 0
 #define PCIDEV    (data->Pci)
-static int nsp32_detect(Scsi_Host_Template *sht)
+static int nsp32_detect(struct scsi_host_template *sht)
 #endif
 {
         struct Scsi_Host *host; /* registered host structure */
diff --git a/drivers/scsi/oktagon_esp.c b/drivers/scsi/oktagon_esp.c
index 573d7ef93f08..5d9c9ada814f 100644
--- a/drivers/scsi/oktagon_esp.c
+++ b/drivers/scsi/oktagon_esp.c
@@ -114,7 +114,7 @@ static volatile unsigned char cmd_buffer[16];
                                  */
 
 /***************************************************************** Detection */
-int oktagon_esp_detect(Scsi_Host_Template *tpnt)
+int oktagon_esp_detect(struct scsi_host_template *tpnt)
 {
         struct NCR_ESP *esp;
         struct zorro_dev *z = NULL;
@@ -585,7 +585,7 @@ int oktagon_esp_release(struct Scsi_Host *instance)
 }
 
 
-static Scsi_Host_Template driver_template = {
+static struct scsi_host_template driver_template = {
         .proc_name              = "esp-oktagon",
         .proc_info              = &esp_proc_info,
         .name                   = "BSC Oktagon SCSI",
diff --git a/drivers/scsi/pas16.c b/drivers/scsi/pas16.c
index 72bc947e45b6..f09e94af9ade 100644
--- a/drivers/scsi/pas16.c
+++ b/drivers/scsi/pas16.c
@@ -369,7 +369,7 @@ void __init pas16_setup(char *str, int *ints)
 }
 
 /* 
- * Function : int pas16_detect(Scsi_Host_Template * tpnt)
+ * Function : int pas16_detect(struct scsi_host_template * tpnt)
  *
  * Purpose : detects and initializes PAS16 controllers
  *      that were autoprobed, overridden on the LILO command line, 
@@ -381,7 +381,7 @@ void __init pas16_setup(char *str, int *ints)
  *
  */
 
-int __init pas16_detect(Scsi_Host_Template * tpnt)
+int __init pas16_detect(struct scsi_host_template * tpnt)
 {
     static int current_override = 0;
     static unsigned short current_base = 0;
@@ -615,7 +615,7 @@ static int pas16_release(struct Scsi_Host *shost)
         return 0;
 }
 
-static Scsi_Host_Template driver_template = {
+static struct scsi_host_template driver_template = {
         .name           = "Pro Audio Spectrum-16 SCSI",
         .detect         = pas16_detect,
         .release        = pas16_release,
diff --git a/drivers/scsi/pas16.h b/drivers/scsi/pas16.h
index 65ce1cc40d9a..8dc5b1a5f5da 100644
--- a/drivers/scsi/pas16.h
+++ b/drivers/scsi/pas16.h
@@ -117,7 +117,7 @@
 static int pas16_abort(Scsi_Cmnd *);
 static int pas16_biosparam(struct scsi_device *, struct block_device *,
                            sector_t, int*);
-static int pas16_detect(Scsi_Host_Template *);
+static int pas16_detect(struct scsi_host_template *);
 static int pas16_queue_command(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
 static int pas16_bus_reset(Scsi_Cmnd *);
 
diff --git a/drivers/scsi/pci2000.h b/drivers/scsi/pci2000.h
index 6c962d7dca47..0ebd8ce9e1de 100644
--- a/drivers/scsi/pci2000.h
+++ b/drivers/scsi/pci2000.h
@@ -184,7 +184,7 @@ typedef struct _INQUIRYDATA
 #endif
 
 // function prototypes
-int Pci2000_Detect                      (Scsi_Host_Template *tpnt);
+int Pci2000_Detect                      (struct scsi_host_template *tpnt);
 int Pci2000_Command                     (Scsi_Cmnd *SCpnt);
 int Pci2000_QueueCommand        (Scsi_Cmnd *SCpnt, void (*done)(Scsi_Cmnd *));
 int Pci2000_Abort                       (Scsi_Cmnd *SCpnt);
diff --git a/drivers/scsi/pcmcia/nsp_cs.c b/drivers/scsi/pcmcia/nsp_cs.c
index 3d2f71051fe5..050ea13ff80b 100644
--- a/drivers/scsi/pcmcia/nsp_cs.c
+++ b/drivers/scsi/pcmcia/nsp_cs.c
@@ -81,7 +81,7 @@ module_param(free_ports, bool, 0);
 MODULE_PARM_DESC(free_ports, "Release IO ports after configuration? (default: 0 (=no))");
 
 /* /usr/src/linux/drivers/scsi/hosts.h */
-static Scsi_Host_Template nsp_driver_template = {
+static struct scsi_host_template nsp_driver_template = {
         .proc_name               = "nsp_cs",
         .proc_info               = nsp_proc_info,
         .name                    = "WorkBit NinjaSCSI-3/32Bi(16bit)",
@@ -1310,7 +1310,7 @@ timer_out:
 /*----------------------------------------------------------------*/
 /* look for ninja3 card and init if found                         */
 /*----------------------------------------------------------------*/
-static struct Scsi_Host *nsp_detect(Scsi_Host_Template *sht)
+static struct Scsi_Host *nsp_detect(struct scsi_host_template *sht)
 {
         struct Scsi_Host *host; /* registered host structure */
         nsp_hw_data *data_b = &nsp_data_base, *data;
@@ -1358,7 +1358,7 @@ static struct Scsi_Host *nsp_detect(Scsi_Host_Template *sht)
 }
 
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
-static int nsp_detect_old(Scsi_Host_Template *sht)
+static int nsp_detect_old(struct scsi_host_template *sht)
 {
         if (nsp_detect(sht) == NULL) {
                 return 0;
@@ -1717,7 +1717,7 @@ static void nsp_cs_config(dev_link_t *link)
         struct Scsi_Host *host;
         nsp_hw_data      *data = &nsp_data_base;
 #if !(LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,74))
-        Scsi_Device      *dev;
+        struct scsi_device       *dev;
         dev_node_t      **tail, *node;
 #endif
 
diff --git a/drivers/scsi/pcmcia/nsp_cs.h b/drivers/scsi/pcmcia/nsp_cs.h
index c201b52e063a..f8b943082717 100644
--- a/drivers/scsi/pcmcia/nsp_cs.h
+++ b/drivers/scsi/pcmcia/nsp_cs.h
@@ -303,9 +303,9 @@ static void        nsp_cs_config (dev_link_t *link);
 static int         nsp_cs_event  (event_t event, int priority, event_callback_args_t *args);
 
 /* Linux SCSI subsystem specific functions */
-static struct Scsi_Host *nsp_detect     (Scsi_Host_Template *sht);
+static struct Scsi_Host *nsp_detect     (struct scsi_host_template *sht);
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
-static        int        nsp_detect_old (Scsi_Host_Template *sht);
+static        int        nsp_detect_old (struct scsi_host_template *sht);
 static        int        nsp_release_old(struct Scsi_Host *shpnt);
 #endif
 static const  char      *nsp_info       (struct Scsi_Host *shpnt);
@@ -345,7 +345,7 @@ static int  nsp_expect_signal    (Scsi_Cmnd *SCpnt, unsigned char current_phase,
 static int  nsp_xfer             (Scsi_Cmnd *SCpnt, int phase);
 static int  nsp_dataphase_bypass (Scsi_Cmnd *SCpnt);
 static int  nsp_reselected       (Scsi_Cmnd *SCpnt);
-static struct Scsi_Host *nsp_detect(Scsi_Host_Template *sht);
+static struct Scsi_Host *nsp_detect(struct scsi_host_template *sht);
 
 /* Interrupt handler */
 //static irqreturn_t nspintr(int irq, void *dev_id, struct pt_regs *regs);
diff --git a/drivers/scsi/pcmcia/qlogic_stub.c b/drivers/scsi/pcmcia/qlogic_stub.c
index 7a516f35834e..bb091a45a880 100644
--- a/drivers/scsi/pcmcia/qlogic_stub.c
+++ b/drivers/scsi/pcmcia/qlogic_stub.c
@@ -72,7 +72,7 @@ static char *version = "qlogic_cs.c 1.79-ac 2002/10/26 (David Hinds)";
 #define DEBUG(n, args...)
 #endif
 
-static Scsi_Host_Template qlogicfas_driver_template = {
+static struct scsi_host_template qlogicfas_driver_template = {
         .module                 = THIS_MODULE,
         .name                   = qlogic_name,
         .proc_name              = qlogic_name,
@@ -108,7 +108,7 @@ static dev_link_t *dev_list = NULL;
 
 static dev_info_t dev_info = "qlogic_cs";
 
-static struct Scsi_Host *qlogic_detect(Scsi_Host_Template *host,
+static struct Scsi_Host *qlogic_detect(struct scsi_host_template *host,
                                 dev_link_t *link, int qbase, int qlirq)
 {
         int qltyp;              /* type of chip */
diff --git a/drivers/scsi/pdc_adma.c b/drivers/scsi/pdc_adma.c
index 78b4ff117af6..f557f17ca00c 100644
--- a/drivers/scsi/pdc_adma.c
+++ b/drivers/scsi/pdc_adma.c
@@ -190,7 +190,7 @@ static struct ata_port_info adma_port_info[] = {
         },
 };
 
-static struct pci_device_id adma_ata_pci_tbl[] = {
+static const struct pci_device_id adma_ata_pci_tbl[] = {
         { PCI_VENDOR_ID_PDC, 0x1841, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
           board_1841_idx },
 
diff --git a/drivers/scsi/pluto.c b/drivers/scsi/pluto.c
index c89da7d5b6df..46624ab9c3d2 100644
--- a/drivers/scsi/pluto.c
+++ b/drivers/scsi/pluto.c
@@ -71,7 +71,7 @@ static void __init pluto_detect_scsi_done(Scsi_Cmnd *SCpnt)
                 up(&fc_sem);
 }
 
-int pluto_slave_configure(Scsi_Device *device)
+int pluto_slave_configure(struct scsi_device *device)
 {
         int depth_to_use;
 
@@ -90,11 +90,11 @@ int pluto_slave_configure(Scsi_Device *device)
 
 /* Detect all SSAs attached to the machine.
    To be fast, do it on all online FC channels at the same time. */
-int __init pluto_detect(Scsi_Host_Template *tpnt)
+int __init pluto_detect(struct scsi_host_template *tpnt)
 {
         int i, retry, nplutos;
         fc_channel *fc;
-        Scsi_Device dev;
+        struct scsi_device dev;
         DEFINE_TIMER(fc_timer, pluto_detect_timeout, 0, 0);
 
         tpnt->proc_name = "pluto";
@@ -339,7 +339,7 @@ static int pluto_encode_addr(Scsi_Cmnd *SCpnt, u16 *addr, fc_channel *fc, fcp_cm
         return 0;
 }
 
-static Scsi_Host_Template driver_template = {
+static struct scsi_host_template driver_template = {
         .name                   = "Sparc Storage Array 100/200",
         .detect                 = pluto_detect,
         .release                = pluto_release,
diff --git a/drivers/scsi/pluto.h b/drivers/scsi/pluto.h
index beb844aafccd..5da20616ac36 100644
--- a/drivers/scsi/pluto.h
+++ b/drivers/scsi/pluto.h
@@ -38,10 +38,10 @@ struct pluto_inquiry {
 /* This is the max number of outstanding SCSI commands per pluto */
 #define PLUTO_CAN_QUEUE         254
 
-int pluto_detect(Scsi_Host_Template *);
+int pluto_detect(struct scsi_host_template *);
 int pluto_release(struct Scsi_Host *);
 const char * pluto_info(struct Scsi_Host *);
-int pluto_slave_configure(Scsi_Device *);
+int pluto_slave_configure(struct scsi_device *);
 
 #endif /* !(_PLUTO_H) */
 
diff --git a/drivers/scsi/psi240i.c b/drivers/scsi/psi240i.c
index 4322c95c995c..5c2cdf523c3b 100644
--- a/drivers/scsi/psi240i.c
+++ b/drivers/scsi/psi240i.c
@@ -538,7 +538,7 @@ static void ReadChipMemory (void *pdata, USHORT base, USHORT length, USHORT port
  *      Returns:                Number of adapters found.
  *
  ****************************************************************/
-static int Psi240i_Detect (Scsi_Host_Template *tpnt)
+static int Psi240i_Detect (struct scsi_host_template *tpnt)
         {
         int                                     board;
         int                                     count = 0;
@@ -669,7 +669,7 @@ static int Psi240i_BiosParam (struct scsi_device *sdev, struct block_device *dev
 
 MODULE_LICENSE("GPL");
 
-static Scsi_Host_Template driver_template = {
+static struct scsi_host_template driver_template = {
         .proc_name              = "psi240i", 
         .name                   = "PSI-240I EIDE Disk Controller",
         .detect                 = Psi240i_Detect,
diff --git a/drivers/scsi/qla1280.c b/drivers/scsi/qla1280.c
index 637fb6565d28..0878f95b5449 100644
--- a/drivers/scsi/qla1280.c
+++ b/drivers/scsi/qla1280.c
@@ -465,7 +465,7 @@ scsi_adjust_queue_depth(struct scsi_device *device, int tag, int depth)
         }
         device->queue_depth = depth;
 }
-static inline struct Scsi_Host *scsi_host_alloc(Scsi_Host_Template *t, size_t s)
+static inline struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *t, size_t s)
 {
         return scsi_register(t, s);
 }
@@ -639,10 +639,8 @@ struct qla_boards {
 static struct pci_device_id qla1280_pci_tbl[] = {
         {PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP12160,
                 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-#ifdef CONFIG_SCSI_QLOGIC_1280_1040
         {PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP1020,
                 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1},
-#endif
         {PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP1080,
                 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 2},
         {PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP1240,
@@ -1177,7 +1175,7 @@ qla1280_biosparam(struct scsi_device *sdev, struct block_device *bdev,
 
 #if LINUX_VERSION_CODE < 0x020600
 static int
-qla1280_detect(Scsi_Host_Template *template)
+qla1280_detect(struct scsi_host_template *template)
 {
         struct pci_device_id *id = &qla1280_pci_tbl[0];
         struct pci_dev *pdev = NULL;
@@ -4507,7 +4505,7 @@ static struct scsi_host_template qla1280_driver_template = {
         .use_clustering         = ENABLE_CLUSTERING,
 };
 #else
-static Scsi_Host_Template qla1280_driver_template = {
+static struct scsi_host_template qla1280_driver_template = {
         .proc_name              = "qla1280",
         .name                   = "Qlogic ISP 1280/12160",
         .detect                 = qla1280_detect,
diff --git a/drivers/scsi/qla2xxx/qla_dbg.c b/drivers/scsi/qla2xxx/qla_dbg.c
index 89793c1c06b1..5c5d2315cfab 100644
--- a/drivers/scsi/qla2xxx/qla_dbg.c
+++ b/drivers/scsi/qla2xxx/qla_dbg.c
@@ -970,7 +970,7 @@ qla24xx_fw_dump(scsi_qla_host_t *ha, int hardware_locked)
         int             rval;
         uint32_t        cnt, timer;
         uint32_t        risc_address;
-        uint16_t        mb[4];
+        uint16_t        mb[4], wd;
 
         uint32_t        stat;
         struct device_reg_24xx __iomem *reg = &ha->iobase->isp24;
@@ -1514,10 +1514,10 @@ qla24xx_fw_dump(scsi_qla_host_t *ha, int hardware_locked)
 
                 WRT_REG_DWORD(&reg->ctrl_status,
                     CSRX_ISP_SOFT_RESET|CSRX_DMA_SHUTDOWN|MWB_4096_BYTES);
-                RD_REG_DWORD(&reg->ctrl_status);
+                pci_read_config_word(ha->pdev, PCI_COMMAND, &wd);
 
+                udelay(100);
                 /* Wait for firmware to complete NVRAM accesses. */
-                udelay(5);
                 mb[0] = (uint32_t) RD_REG_WORD(&reg->mailbox0);
                 for (cnt = 10000 ; cnt && mb[0]; cnt--) {
                         udelay(5);
@@ -1525,7 +1525,7 @@ qla24xx_fw_dump(scsi_qla_host_t *ha, int hardware_locked)
                         barrier();
                 }
 
-                udelay(20);
+                /* Wait for soft-reset to complete. */
                 for (cnt = 0; cnt < 30000; cnt++) {
                         if ((RD_REG_DWORD(&reg->ctrl_status) &
                             CSRX_ISP_SOFT_RESET) == 0)
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index 72d9090df3df..2d720121a0d3 100644
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -147,8 +147,8 @@ check_fw_ready_again:
                                          * LIP to complete
                                          */
 
-                                        if (atomic_read(&ha->loop_state) ==
-                                            LOOP_DOWN && retry--) {
+                                        if (atomic_read(&ha->loop_state) !=
+                                            LOOP_READY && retry--) {
                                                 goto check_fw_ready_again;
                                         }
                                         wait_time--;
@@ -567,6 +567,7 @@ qla24xx_reset_risc(scsi_qla_host_t *ha)
         unsigned long flags = 0;
         struct device_reg_24xx __iomem *reg = &ha->iobase->isp24;
         uint32_t cnt, d2;
+        uint16_t wd;
 
         spin_lock_irqsave(&ha->hardware_lock, flags);
 
@@ -581,10 +582,10 @@ qla24xx_reset_risc(scsi_qla_host_t *ha)
 
         WRT_REG_DWORD(&reg->ctrl_status,
             CSRX_ISP_SOFT_RESET|CSRX_DMA_SHUTDOWN|MWB_4096_BYTES);
-        RD_REG_DWORD(&reg->ctrl_status);
+        pci_read_config_word(ha->pdev, PCI_COMMAND, &wd);
 
+        udelay(100);
         /* Wait for firmware to complete NVRAM accesses. */
-        udelay(5);
         d2 = (uint32_t) RD_REG_WORD(&reg->mailbox0);
         for (cnt = 10000 ; cnt && d2; cnt--) {
                 udelay(5);
@@ -592,7 +593,7 @@ qla24xx_reset_risc(scsi_qla_host_t *ha)
                 barrier();
         }
 
-        udelay(20);
+        /* Wait for soft-reset to complete. */
         d2 = RD_REG_DWORD(&reg->ctrl_status);
         for (cnt = 6000000 ; cnt && (d2 & CSRX_ISP_SOFT_RESET); cnt--) {
                 udelay(5);
@@ -1258,9 +1259,15 @@ qla2x00_configure_hba(scsi_qla_host_t *ha)
         rval = qla2x00_get_adapter_id(ha,
             &loop_id, &al_pa, &area, &domain, &topo);
         if (rval != QLA_SUCCESS) {
-                qla_printk(KERN_WARNING, ha,
-                    "ERROR -- Unable to get host loop ID.\n");
-                set_bit(ISP_ABORT_NEEDED, &ha->dpc_flags);
+                if (LOOP_NOT_READY(ha) || atomic_read(&ha->loop_down_timer) ||
+                    (rval == QLA_COMMAND_ERROR && loop_id == 0x7)) {
+                        DEBUG2(printk("%s(%ld) Loop is in a transition state\n",
+                            __func__, ha->host_no));
+                } else {
+                        qla_printk(KERN_WARNING, ha,
+                            "ERROR -- Unable to get host loop ID.\n");
+                        set_bit(ISP_ABORT_NEEDED, &ha->dpc_flags);
+                }
                 return (rval);
         }
 
@@ -1789,7 +1796,7 @@ qla2x00_configure_loop(scsi_qla_host_t *ha)
         }
 
         if (rval == QLA_SUCCESS && test_bit(RSCN_UPDATE, &flags)) {
-                if (test_bit(LOOP_RESYNC_NEEDED, &ha->dpc_flags)) {
+                if (LOOP_NOT_READY(ha)) {
                         rval = QLA_FUNCTION_FAILED;
                 } else {
                         rval = qla2x00_configure_fabric(ha);
@@ -2362,8 +2369,7 @@ qla2x00_find_all_fabric_devs(scsi_qla_host_t *ha, struct list_head *new_fcports)
                 if (qla2x00_is_reserved_id(ha, loop_id))
                         continue;
 
-                if (atomic_read(&ha->loop_down_timer) ||
-                    test_bit(LOOP_RESYNC_NEEDED, &ha->dpc_flags))
+                if (atomic_read(&ha->loop_down_timer) || LOOP_NOT_READY(ha))
                         break;
 
                 if (swl != NULL) {
diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c
index ad3cacb9192d..9746cd1e664b 100644
--- a/drivers/scsi/qla2xxx/qla_mbx.c
+++ b/drivers/scsi/qla2xxx/qla_mbx.c
@@ -868,10 +868,6 @@ qla2x00_abort_command(scsi_qla_host_t *ha, srb_t *sp)
         DEBUG11(printk("qla2x00_abort_command(%ld): entered.\n", ha->host_no);)
 
         fcport = sp->fcport;
-        if (atomic_read(&ha->loop_state) == LOOP_DOWN ||
-            atomic_read(&fcport->state) == FCS_DEVICE_LOST) {
-                return 1;
-        }
 
         spin_lock_irqsave(&ha->hardware_lock, flags);
         for (handle = 1; handle < MAX_OUTSTANDING_COMMANDS; handle++) {
@@ -1008,6 +1004,8 @@ qla2x00_get_adapter_id(scsi_qla_host_t *ha, uint16_t *id, uint8_t *al_pa,
         mcp->tov = 30;
         mcp->flags = 0;
         rval = qla2x00_mailbox_command(ha, mcp);
+        if (mcp->mb[0] == MBS_COMMAND_ERROR)
+                rval = QLA_COMMAND_ERROR;
 
         /* Return data. */
         *id = mcp->mb[1];
@@ -2179,10 +2177,6 @@ qla24xx_abort_command(scsi_qla_host_t *ha, srb_t *sp)
         DEBUG11(printk("%s(%ld): entered.\n", __func__, ha->host_no);)
 
         fcport = sp->fcport;
-        if (atomic_read(&ha->loop_state) == LOOP_DOWN ||
-            atomic_read(&fcport->state) == FCS_DEVICE_LOST) {
-                return QLA_FUNCTION_FAILED;
-        }
 
         spin_lock_irqsave(&ha->hardware_lock, flags);
         for (handle = 1; handle < MAX_OUTSTANDING_COMMANDS; handle++) {
diff --git a/drivers/scsi/qla2xxx/qla_sup.c b/drivers/scsi/qla2xxx/qla_sup.c
index 4bec0b4fb6b4..d54d2a99c3d3 100644
--- a/drivers/scsi/qla2xxx/qla_sup.c
+++ b/drivers/scsi/qla2xxx/qla_sup.c
@@ -126,6 +126,7 @@ qla2x00_write_nvram_word(scsi_qla_host_t *ha, uint32_t addr, uint16_t data)
 
         /* Wait for NVRAM to become ready */
         WRT_REG_WORD(&reg->nvram, NVR_SELECT);
+        RD_REG_WORD(&reg->nvram);               /* PCI Posting. */
         do {
                 NVRAM_DELAY();
                 word = RD_REG_WORD(&reg->nvram);
@@ -178,6 +179,7 @@ qla2x00_write_nvram_word_tmo(scsi_qla_host_t *ha, uint32_t addr, uint16_t data,
 
         /* Wait for NVRAM to become ready */
         WRT_REG_WORD(&reg->nvram, NVR_SELECT);
+        RD_REG_WORD(&reg->nvram);               /* PCI Posting. */
         do {
                 NVRAM_DELAY();
                 word = RD_REG_WORD(&reg->nvram);
@@ -235,6 +237,7 @@ qla2x00_nvram_request(scsi_qla_host_t *ha, uint32_t nv_cmd)
         /* Read data from NVRAM. */
         for (cnt = 0; cnt < 16; cnt++) {
                 WRT_REG_WORD(&reg->nvram, NVR_SELECT | NVR_CLOCK);
+                RD_REG_WORD(&reg->nvram);       /* PCI Posting. */
                 NVRAM_DELAY();
                 data <<= 1;
                 reg_data = RD_REG_WORD(&reg->nvram);
@@ -337,6 +340,7 @@ qla2x00_clear_nvram_protection(scsi_qla_host_t *ha)
 
                 /* Wait for NVRAM to become ready. */
                 WRT_REG_WORD(&reg->nvram, NVR_SELECT);
+                RD_REG_WORD(&reg->nvram);       /* PCI Posting. */
                 do {
                         NVRAM_DELAY();
                         word = RD_REG_WORD(&reg->nvram);
@@ -388,6 +392,7 @@ qla2x00_set_nvram_protection(scsi_qla_host_t *ha, int stat)
 
         /* Wait for NVRAM to become ready. */
         WRT_REG_WORD(&reg->nvram, NVR_SELECT);
+        RD_REG_WORD(&reg->nvram);               /* PCI Posting. */
         do {
                 NVRAM_DELAY();
                 word = RD_REG_WORD(&reg->nvram);
diff --git a/drivers/scsi/qla2xxx/qla_version.h b/drivers/scsi/qla2xxx/qla_version.h
index 0d5472f2f59b..f7937f7f9c68 100644
--- a/drivers/scsi/qla2xxx/qla_version.h
+++ b/drivers/scsi/qla2xxx/qla_version.h
@@ -7,9 +7,9 @@
 /*
  * Driver version
  */
-#define QLA2XXX_VERSION      "8.01.00-k"
+#define QLA2XXX_VERSION      "8.01.03-k"
 
 #define QLA_DRIVER_MAJOR_VER    8
 #define QLA_DRIVER_MINOR_VER    1
-#define QLA_DRIVER_PATCH_VER    0
+#define QLA_DRIVER_PATCH_VER    3
 #define QLA_DRIVER_BETA_VER     0
diff --git a/drivers/scsi/qlogicfas.c b/drivers/scsi/qlogicfas.c
index 55e698b651d6..94baca840efe 100644
--- a/drivers/scsi/qlogicfas.c
+++ b/drivers/scsi/qlogicfas.c
@@ -47,7 +47,7 @@ static char qlogicfas_name[] = "qlogicfas";
  *      Look for qlogic card and init if found 
  */
  
-static struct Scsi_Host *__qlogicfas_detect(Scsi_Host_Template *host,
+static struct Scsi_Host *__qlogicfas_detect(struct scsi_host_template *host,
                                                                 int qbase,
                                                                 int qlirq)
 {
@@ -142,7 +142,7 @@ module_param_array(irq, int, NULL, 0);
 MODULE_PARM_DESC(iobase, "I/O address");
 MODULE_PARM_DESC(irq, "IRQ");
 
-static int __devinit qlogicfas_detect(Scsi_Host_Template *sht)
+static int __devinit qlogicfas_detect(struct scsi_host_template *sht)
 {
         struct Scsi_Host *shost;
         struct qlogicfas408_priv *priv;
@@ -183,7 +183,7 @@ static int qlogicfas_release(struct Scsi_Host *shost)
 /*
  *      The driver template is also needed for PCMCIA
  */
-static Scsi_Host_Template qlogicfas_driver_template = {
+static struct scsi_host_template qlogicfas_driver_template = {
         .module                 = THIS_MODULE,
         .name                   = qlogicfas_name,
         .proc_name              = qlogicfas_name,
diff --git a/drivers/scsi/qlogicfc.c b/drivers/scsi/qlogicfc.c
index a4b3b3fd4815..94ef3f08d378 100644
--- a/drivers/scsi/qlogicfc.c
+++ b/drivers/scsi/qlogicfc.c
@@ -711,7 +711,7 @@ static inline void isp2x00_disable_irqs(struct Scsi_Host *host)
 }
 
 
-static int isp2x00_detect(Scsi_Host_Template * tmpt)
+static int isp2x00_detect(struct scsi_host_template * tmpt)
 {
         int hosts = 0;
         unsigned long wait_time;
@@ -2210,7 +2210,7 @@ void isp2x00_print_scsi_cmd(Scsi_Cmnd * cmd)
 
 MODULE_LICENSE("GPL");
 
-static Scsi_Host_Template driver_template = {
+static struct scsi_host_template driver_template = {
         .detect                 = isp2x00_detect,
         .release                = isp2x00_release,
         .info                   = isp2x00_info,
diff --git a/drivers/scsi/qlogicisp.c b/drivers/scsi/qlogicisp.c
deleted file mode 100644
index 6c9266b8ffdf..000000000000
--- a/drivers/scsi/qlogicisp.c
+++ /dev/null
@@ -1,1934 +0,0 @@
-/*
- * QLogic ISP1020 Intelligent SCSI Processor Driver (PCI)
- * Written by Erik H. Moe, ehm@cris.com
- * Copyright 1995, Erik H. Moe
- * Copyright 1996, 1997  Michael A. Griffith <grif@acm.org>
- * Copyright 2000, Jayson C. Vantuyl <vantuyl@csc.smsu.edu>
- *             and Bryon W. Roche    <bryon@csc.smsu.edu>
- *
- * 64-bit addressing added by Kanoj Sarcar <kanoj@sgi.com>
- *                         and Leo Dagum    <dagum@sgi.com>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2, or (at your option) any
- * later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- */
-
-#include <linux/blkdev.h>
-#include <linux/config.h>
-#include <linux/kernel.h>
-#include <linux/string.h>
-#include <linux/ioport.h>
-#include <linux/sched.h>
-#include <linux/types.h>
-#include <linux/pci.h>
-#include <linux/delay.h>
-#include <linux/unistd.h>
-#include <linux/spinlock.h>
-#include <linux/interrupt.h>
-#include <asm/io.h>
-#include <asm/irq.h>
-#include <asm/byteorder.h>
-#include "scsi.h"
-#include <scsi/scsi_host.h>
-
-/*
- * With the qlogic interface, every queue slot can hold a SCSI
- * command with up to 4 scatter/gather entries.  If we need more
- * than 4 entries, continuation entries can be used that hold
- * another 7 entries each.  Unlike for other drivers, this means
- * that the maximum number of scatter/gather entries we can
- * support at any given time is a function of the number of queue
- * slots available.  That is, host->can_queue and host->sg_tablesize
- * are dynamic and _not_ independent.  This all works fine because
- * requests are queued serially and the scatter/gather limit is
- * determined for each queue request anew.
- */
-#define QLOGICISP_REQ_QUEUE_LEN 63      /* must be power of two - 1 */
-#define QLOGICISP_MAX_SG(ql)    (4 + ((ql) > 0) ? 7*((ql) - 1) : 0)
-
-/* Configuration section *****************************************************/
-
-/* Set the following macro to 1 to reload the ISP1020's firmware.  This is
-   the latest firmware provided by QLogic.  This may be an earlier/later
-   revision than supplied by your board. */
-
-#define RELOAD_FIRMWARE         1
-
-/* Set the following macro to 1 to reload the ISP1020's defaults from nvram.
-   If you are not sure of your settings, leave this alone, the driver will
-   use a set of 'safe' defaults */
-
-#define USE_NVRAM_DEFAULTS      0
-
-/*  Macros used for debugging */
-
-#define DEBUG_ISP1020           0
-#define DEBUG_ISP1020_INTR      0
-#define DEBUG_ISP1020_SETUP     0
-#define TRACE_ISP               0
-
-#define DEFAULT_LOOP_COUNT      1000000
-
-/* End Configuration section *************************************************/
-
-#include <linux/module.h>
-
-#if TRACE_ISP
-
-# define TRACE_BUF_LEN  (32*1024)
-
-struct {
-        u_long          next;
-        struct {
-                u_long          time;
-                u_int           index;
-                u_int           addr;
-                u_char *        name;
-        } buf[TRACE_BUF_LEN];
-} trace;
-
-#define TRACE(w, i, a)                                          \
-{                                                               \
-        unsigned long flags;                                    \
-                                                                \
-        trace.buf[trace.next].name  = (w);                      \
-        trace.buf[trace.next].time  = jiffies;                  \
-        trace.buf[trace.next].index = (i);                      \
-        trace.buf[trace.next].addr  = (long) (a);               \
-        trace.next = (trace.next + 1) & (TRACE_BUF_LEN - 1);    \
-}
-
-#else
-# define TRACE(w, i, a)
-#endif
-
-#if DEBUG_ISP1020
-#define ENTER(x)        printk("isp1020 : entering %s()\n", x);
-#define LEAVE(x)        printk("isp1020 : leaving %s()\n", x);
-#define DEBUG(x)        x
-#else
-#define ENTER(x)
-#define LEAVE(x)
-#define DEBUG(x)
-#endif /* DEBUG_ISP1020 */
-
-#if DEBUG_ISP1020_INTR
-#define ENTER_INTR(x)   printk("isp1020 : entering %s()\n", x);
-#define LEAVE_INTR(x)   printk("isp1020 : leaving %s()\n", x);
-#define DEBUG_INTR(x)   x
-#else
-#define ENTER_INTR(x)
-#define LEAVE_INTR(x)
-#define DEBUG_INTR(x)
-#endif /* DEBUG ISP1020_INTR */
-
-#define ISP1020_REV_ID  1
-
-#define MAX_TARGETS     16
-#define MAX_LUNS        8
-
-/* host configuration and control registers */
-#define HOST_HCCR       0xc0    /* host command and control */
-
-/* pci bus interface registers */
-#define PCI_ID_LOW      0x00    /* vendor id */
-#define PCI_ID_HIGH     0x02    /* device id */
-#define ISP_CFG0        0x04    /* configuration register #0 */
-#define  ISP_CFG0_HWMSK  0x000f /* Hardware revision mask */
-#define  ISP_CFG0_1020   0x0001 /* ISP1020 */
-#define  ISP_CFG0_1020A  0x0002 /* ISP1020A */
-#define  ISP_CFG0_1040   0x0003 /* ISP1040 */
-#define  ISP_CFG0_1040A  0x0004 /* ISP1040A */
-#define  ISP_CFG0_1040B  0x0005 /* ISP1040B */
-#define  ISP_CFG0_1040C  0x0006 /* ISP1040C */
-#define ISP_CFG1        0x06    /* configuration register #1 */
-#define  ISP_CFG1_F128   0x0040 /* 128-byte FIFO threshold */
-#define  ISP_CFG1_F64    0x0030 /* 128-byte FIFO threshold */
-#define  ISP_CFG1_F32    0x0020 /* 128-byte FIFO threshold */
-#define  ISP_CFG1_F16    0x0010 /* 128-byte FIFO threshold */
-#define  ISP_CFG1_BENAB  0x0004 /* Global Bus burst enable */
-#define  ISP_CFG1_SXP    0x0001 /* SXP register select */
-#define PCI_INTF_CTL    0x08    /* pci interface control */
-#define PCI_INTF_STS    0x0a    /* pci interface status */
-#define PCI_SEMAPHORE   0x0c    /* pci semaphore */
-#define PCI_NVRAM       0x0e    /* pci nvram interface */
-#define CDMA_CONF       0x20    /* Command DMA Config */
-#define DDMA_CONF       0x40    /* Data DMA Config */
-#define  DMA_CONF_SENAB  0x0008 /* SXP to DMA Data enable */
-#define  DMA_CONF_RIRQ   0x0004 /* RISC interrupt enable */
-#define  DMA_CONF_BENAB  0x0002 /* Bus burst enable */
-#define  DMA_CONF_DIR    0x0001 /* DMA direction (0=fifo->host 1=host->fifo) */
-
-/* mailbox registers */
-#define MBOX0           0x70    /* mailbox 0 */
-#define MBOX1           0x72    /* mailbox 1 */
-#define MBOX2           0x74    /* mailbox 2 */
-#define MBOX3           0x76    /* mailbox 3 */
-#define MBOX4           0x78    /* mailbox 4 */
-#define MBOX5           0x7a    /* mailbox 5 */
-#define MBOX6           0x7c    /* mailbox 6 */
-#define MBOX7           0x7e    /* mailbox 7 */
-
-/* mailbox command complete status codes */
-#define MBOX_COMMAND_COMPLETE           0x4000
-#define INVALID_COMMAND                 0x4001
-#define HOST_INTERFACE_ERROR            0x4002
-#define TEST_FAILED                     0x4003
-#define COMMAND_ERROR                   0x4005
-#define COMMAND_PARAM_ERROR             0x4006
-
-/* async event status codes */
-#define ASYNC_SCSI_BUS_RESET            0x8001
-#define SYSTEM_ERROR                    0x8002
-#define REQUEST_TRANSFER_ERROR          0x8003
-#define RESPONSE_TRANSFER_ERROR         0x8004
-#define REQUEST_QUEUE_WAKEUP            0x8005
-#define EXECUTION_TIMEOUT_RESET         0x8006
-
-#ifdef CONFIG_QL_ISP_A64
-#define IOCB_SEGS                       2
-#define CONTINUATION_SEGS               5
-#define MAX_CONTINUATION_ENTRIES        254
-#else
-#define IOCB_SEGS                       4
-#define CONTINUATION_SEGS               7
-#endif /* CONFIG_QL_ISP_A64 */
-
-struct Entry_header {
-        u_char  entry_type;
-        u_char  entry_cnt;
-        u_char  sys_def_1;
-        u_char  flags;
-};
-
-/* entry header type commands */
-#ifdef CONFIG_QL_ISP_A64
-#define ENTRY_COMMAND           9
-#define ENTRY_CONTINUATION      0xa
-#else
-#define ENTRY_COMMAND           1
-#define ENTRY_CONTINUATION      2
-#endif /* CONFIG_QL_ISP_A64 */
-
-#define ENTRY_STATUS            3
-#define ENTRY_MARKER            4
-#define ENTRY_EXTENDED_COMMAND  5
-
-/* entry header flag definitions */
-#define EFLAG_CONTINUATION      1
-#define EFLAG_BUSY              2
-#define EFLAG_BAD_HEADER        4
-#define EFLAG_BAD_PAYLOAD       8
-
-struct dataseg {
-        u_int                   d_base;
-#ifdef CONFIG_QL_ISP_A64
-        u_int                   d_base_hi;
-#endif
-        u_int                   d_count;
-};
-
-struct Command_Entry {
-        struct Entry_header     hdr;
-        u_int                   handle;
-        u_char                  target_lun;
-        u_char                  target_id;
-        u_short                 cdb_length;
-        u_short                 control_flags;
-        u_short                 rsvd;
-        u_short                 time_out;
-        u_short                 segment_cnt;
-        u_char                  cdb[12];
-#ifdef CONFIG_QL_ISP_A64
-        u_int                   rsvd1;
-        u_int                   rsvd2;
-#endif
-        struct dataseg          dataseg[IOCB_SEGS];
-};
-
-/* command entry control flag definitions */
-#define CFLAG_NODISC            0x01
-#define CFLAG_HEAD_TAG          0x02
-#define CFLAG_ORDERED_TAG       0x04
-#define CFLAG_SIMPLE_TAG        0x08
-#define CFLAG_TAR_RTN           0x10
-#define CFLAG_READ              0x20
-#define CFLAG_WRITE             0x40
-
-struct Ext_Command_Entry {
-        struct Entry_header     hdr;
-        u_int                   handle;
-        u_char                  target_lun;
-        u_char                  target_id;
-        u_short                 cdb_length;
-        u_short                 control_flags;
-        u_short                 rsvd;
-        u_short                 time_out;
-        u_short                 segment_cnt;
-        u_char                  cdb[44];
-};
-
-struct Continuation_Entry {
-        struct Entry_header     hdr;
-#ifndef CONFIG_QL_ISP_A64
-        u_int                   reserved;
-#endif
-        struct dataseg          dataseg[CONTINUATION_SEGS];
-};
-
-struct Marker_Entry {
-        struct Entry_header     hdr;
-        u_int                   reserved;
-        u_char                  target_lun;
-        u_char                  target_id;
-        u_char                  modifier;
-        u_char                  rsvd;
-        u_char                  rsvds[52];
-};
-
-/* marker entry modifier definitions */
-#define SYNC_DEVICE     0
-#define SYNC_TARGET     1
-#define SYNC_ALL        2
-
-struct Status_Entry {
-        struct Entry_header     hdr;
-        u_int                   handle;
-        u_short                 scsi_status;
-        u_short                 completion_status;
-        u_short                 state_flags;
-        u_short                 status_flags;
-        u_short                 time;
-        u_short                 req_sense_len;
-        u_int                   residual;
-        u_char                  rsvd[8];
-        u_char                  req_sense_data[32];
-};
-
-/* status entry completion status definitions */
-#define CS_COMPLETE                     0x0000
-#define CS_INCOMPLETE                   0x0001
-#define CS_DMA_ERROR                    0x0002
-#define CS_TRANSPORT_ERROR              0x0003
-#define CS_RESET_OCCURRED               0x0004
-#define CS_ABORTED                      0x0005
-#define CS_TIMEOUT                      0x0006
-#define CS_DATA_OVERRUN                 0x0007
-#define CS_COMMAND_OVERRUN              0x0008
-#define CS_STATUS_OVERRUN               0x0009
-#define CS_BAD_MESSAGE                  0x000a
-#define CS_NO_MESSAGE_OUT               0x000b
-#define CS_EXT_ID_FAILED                0x000c
-#define CS_IDE_MSG_FAILED               0x000d
-#define CS_ABORT_MSG_FAILED             0x000e
-#define CS_REJECT_MSG_FAILED            0x000f
-#define CS_NOP_MSG_FAILED               0x0010
-#define CS_PARITY_ERROR_MSG_FAILED      0x0011
-#define CS_DEVICE_RESET_MSG_FAILED      0x0012
-#define CS_ID_MSG_FAILED                0x0013
-#define CS_UNEXP_BUS_FREE               0x0014
-#define CS_DATA_UNDERRUN                0x0015
-
-/* status entry state flag definitions */
-#define SF_GOT_BUS                      0x0100
-#define SF_GOT_TARGET                   0x0200
-#define SF_SENT_CDB                     0x0400
-#define SF_TRANSFERRED_DATA             0x0800
-#define SF_GOT_STATUS                   0x1000
-#define SF_GOT_SENSE                    0x2000
-
-/* status entry status flag definitions */
-#define STF_DISCONNECT                  0x0001
-#define STF_SYNCHRONOUS                 0x0002
-#define STF_PARITY_ERROR                0x0004
-#define STF_BUS_RESET                   0x0008
-#define STF_DEVICE_RESET                0x0010
-#define STF_ABORTED                     0x0020
-#define STF_TIMEOUT                     0x0040
-#define STF_NEGOTIATION                 0x0080
-
-/* interface control commands */
-#define ISP_RESET                       0x0001
-#define ISP_EN_INT                      0x0002
-#define ISP_EN_RISC                     0x0004
-
-/* host control commands */
-#define HCCR_NOP                        0x0000
-#define HCCR_RESET                      0x1000
-#define HCCR_PAUSE                      0x2000
-#define HCCR_RELEASE                    0x3000
-#define HCCR_SINGLE_STEP                0x4000
-#define HCCR_SET_HOST_INTR              0x5000
-#define HCCR_CLEAR_HOST_INTR            0x6000
-#define HCCR_CLEAR_RISC_INTR            0x7000
-#define HCCR_BP_ENABLE                  0x8000
-#define HCCR_BIOS_DISABLE               0x9000
-#define HCCR_TEST_MODE                  0xf000
-
-#define RISC_BUSY                       0x0004
-
-/* mailbox commands */
-#define MBOX_NO_OP                      0x0000
-#define MBOX_LOAD_RAM                   0x0001
-#define MBOX_EXEC_FIRMWARE              0x0002
-#define MBOX_DUMP_RAM                   0x0003
-#define MBOX_WRITE_RAM_WORD             0x0004
-#define MBOX_READ_RAM_WORD              0x0005
-#define MBOX_MAILBOX_REG_TEST           0x0006
-#define MBOX_VERIFY_CHECKSUM            0x0007
-#define MBOX_ABOUT_FIRMWARE             0x0008
-#define MBOX_CHECK_FIRMWARE             0x000e
-#define MBOX_INIT_REQ_QUEUE             0x0010
-#define MBOX_INIT_RES_QUEUE             0x0011
-#define MBOX_EXECUTE_IOCB               0x0012
-#define MBOX_WAKE_UP                    0x0013
-#define MBOX_STOP_FIRMWARE              0x0014
-#define MBOX_ABORT                      0x0015
-#define MBOX_ABORT_DEVICE               0x0016
-#define MBOX_ABORT_TARGET               0x0017
-#define MBOX_BUS_RESET                  0x0018
-#define MBOX_STOP_QUEUE                 0x0019
-#define MBOX_START_QUEUE                0x001a
-#define MBOX_SINGLE_STEP_QUEUE          0x001b
-#define MBOX_ABORT_QUEUE                0x001c
-#define MBOX_GET_DEV_QUEUE_STATUS       0x001d
-#define MBOX_GET_FIRMWARE_STATUS        0x001f
-#define MBOX_GET_INIT_SCSI_ID           0x0020
-#define MBOX_GET_SELECT_TIMEOUT         0x0021
-#define MBOX_GET_RETRY_COUNT            0x0022
-#define MBOX_GET_TAG_AGE_LIMIT          0x0023
-#define MBOX_GET_CLOCK_RATE             0x0024
-#define MBOX_GET_ACT_NEG_STATE          0x0025
-#define MBOX_GET_ASYNC_DATA_SETUP_TIME  0x0026
-#define MBOX_GET_PCI_PARAMS             0x0027
-#define MBOX_GET_TARGET_PARAMS          0x0028
-#define MBOX_GET_DEV_QUEUE_PARAMS       0x0029
-#define MBOX_SET_INIT_SCSI_ID           0x0030
-#define MBOX_SET_SELECT_TIMEOUT         0x0031
-#define MBOX_SET_RETRY_COUNT            0x0032
-#define MBOX_SET_TAG_AGE_LIMIT          0x0033
-#define MBOX_SET_CLOCK_RATE             0x0034
-#define MBOX_SET_ACTIVE_NEG_STATE       0x0035
-#define MBOX_SET_ASYNC_DATA_SETUP_TIME  0x0036
-#define MBOX_SET_PCI_CONTROL_PARAMS     0x0037
-#define MBOX_SET_TARGET_PARAMS          0x0038
-#define MBOX_SET_DEV_QUEUE_PARAMS       0x0039
-#define MBOX_RETURN_BIOS_BLOCK_ADDR     0x0040
-#define MBOX_WRITE_FOUR_RAM_WORDS       0x0041
-#define MBOX_EXEC_BIOS_IOCB             0x0042
-
-#ifdef CONFIG_QL_ISP_A64
-#define MBOX_CMD_INIT_REQUEST_QUEUE_64      0x0052
-#define MBOX_CMD_INIT_RESPONSE_QUEUE_64     0x0053
-#endif /* CONFIG_QL_ISP_A64 */
-
-#include "qlogicisp_asm.c"
-
-#define PACKB(a, b)                     (((a)<<4)|(b))
-
-static const u_char mbox_param[] = {
-        PACKB(1, 1),    /* MBOX_NO_OP */
-        PACKB(5, 5),    /* MBOX_LOAD_RAM */
-        PACKB(2, 0),    /* MBOX_EXEC_FIRMWARE */
-        PACKB(5, 5),    /* MBOX_DUMP_RAM */
-        PACKB(3, 3),    /* MBOX_WRITE_RAM_WORD */
-        PACKB(2, 3),    /* MBOX_READ_RAM_WORD */
-        PACKB(6, 6),    /* MBOX_MAILBOX_REG_TEST */
-        PACKB(2, 3),    /* MBOX_VERIFY_CHECKSUM */
-        PACKB(1, 3),    /* MBOX_ABOUT_FIRMWARE */
-        PACKB(0, 0),    /* 0x0009 */
-        PACKB(0, 0),    /* 0x000a */
-        PACKB(0, 0),    /* 0x000b */
-        PACKB(0, 0),    /* 0x000c */
-        PACKB(0, 0),    /* 0x000d */
-        PACKB(1, 2),    /* MBOX_CHECK_FIRMWARE */
-        PACKB(0, 0),    /* 0x000f */
-        PACKB(5, 5),    /* MBOX_INIT_REQ_QUEUE */
-        PACKB(6, 6),    /* MBOX_INIT_RES_QUEUE */
-        PACKB(4, 4),    /* MBOX_EXECUTE_IOCB */
-        PACKB(2, 2),    /* MBOX_WAKE_UP */
-        PACKB(1, 6),    /* MBOX_STOP_FIRMWARE */
-        PACKB(4, 4),    /* MBOX_ABORT */
-        PACKB(2, 2),    /* MBOX_ABORT_DEVICE */
-        PACKB(3, 3),    /* MBOX_ABORT_TARGET */
-        PACKB(2, 2),    /* MBOX_BUS_RESET */
-        PACKB(2, 3),    /* MBOX_STOP_QUEUE */
-        PACKB(2, 3),    /* MBOX_START_QUEUE */
-        PACKB(2, 3),    /* MBOX_SINGLE_STEP_QUEUE */
-        PACKB(2, 3),    /* MBOX_ABORT_QUEUE */
-        PACKB(2, 4),    /* MBOX_GET_DEV_QUEUE_STATUS */
-        PACKB(0, 0),    /* 0x001e */
-        PACKB(1, 3),    /* MBOX_GET_FIRMWARE_STATUS */
-        PACKB(1, 2),    /* MBOX_GET_INIT_SCSI_ID */
-        PACKB(1, 2),    /* MBOX_GET_SELECT_TIMEOUT */
-        PACKB(1, 3),    /* MBOX_GET_RETRY_COUNT */
-        PACKB(1, 2),    /* MBOX_GET_TAG_AGE_LIMIT */
-        PACKB(1, 2),    /* MBOX_GET_CLOCK_RATE */
-        PACKB(1, 2),    /* MBOX_GET_ACT_NEG_STATE */
-        PACKB(1, 2),    /* MBOX_GET_ASYNC_DATA_SETUP_TIME */
-        PACKB(1, 3),    /* MBOX_GET_PCI_PARAMS */
-        PACKB(2, 4),    /* MBOX_GET_TARGET_PARAMS */
-        PACKB(2, 4),    /* MBOX_GET_DEV_QUEUE_PARAMS */
-        PACKB(0, 0),    /* 0x002a */
-        PACKB(0, 0),    /* 0x002b */
-        PACKB(0, 0),    /* 0x002c */
-        PACKB(0, 0),    /* 0x002d */
-        PACKB(0, 0),    /* 0x002e */
-        PACKB(0, 0),    /* 0x002f */
-        PACKB(2, 2),    /* MBOX_SET_INIT_SCSI_ID */
-        PACKB(2, 2),    /* MBOX_SET_SELECT_TIMEOUT */
-        PACKB(3, 3),    /* MBOX_SET_RETRY_COUNT */
-        PACKB(2, 2),    /* MBOX_SET_TAG_AGE_LIMIT */
-        PACKB(2, 2),    /* MBOX_SET_CLOCK_RATE */
-        PACKB(2, 2),    /* MBOX_SET_ACTIVE_NEG_STATE */
-        PACKB(2, 2),    /* MBOX_SET_ASYNC_DATA_SETUP_TIME */
-        PACKB(3, 3),    /* MBOX_SET_PCI_CONTROL_PARAMS */
-        PACKB(4, 4),    /* MBOX_SET_TARGET_PARAMS */
-        PACKB(4, 4),    /* MBOX_SET_DEV_QUEUE_PARAMS */
-        PACKB(0, 0),    /* 0x003a */
-        PACKB(0, 0),    /* 0x003b */
-        PACKB(0, 0),    /* 0x003c */
-        PACKB(0, 0),    /* 0x003d */
-        PACKB(0, 0),    /* 0x003e */
-        PACKB(0, 0),    /* 0x003f */
-        PACKB(1, 2),    /* MBOX_RETURN_BIOS_BLOCK_ADDR */
-        PACKB(6, 1),    /* MBOX_WRITE_FOUR_RAM_WORDS */
-        PACKB(2, 3)     /* MBOX_EXEC_BIOS_IOCB */
-#ifdef CONFIG_QL_ISP_A64
-        ,PACKB(0, 0),   /* 0x0043 */
-        PACKB(0, 0),    /* 0x0044 */
-        PACKB(0, 0),    /* 0x0045 */
-        PACKB(0, 0),    /* 0x0046 */
-        PACKB(0, 0),    /* 0x0047 */
-        PACKB(0, 0),    /* 0x0048 */
-        PACKB(0, 0),    /* 0x0049 */
-        PACKB(0, 0),    /* 0x004a */
-        PACKB(0, 0),    /* 0x004b */
-        PACKB(0, 0),    /* 0x004c */
-        PACKB(0, 0),    /* 0x004d */
-        PACKB(0, 0),    /* 0x004e */
-        PACKB(0, 0),    /* 0x004f */
-        PACKB(0, 0),    /* 0x0050 */
-        PACKB(0, 0),    /* 0x0051 */
-        PACKB(8, 8),    /* MBOX_CMD_INIT_REQUEST_QUEUE_64 (0x0052) */
-        PACKB(8, 8)     /* MBOX_CMD_INIT_RESPONSE_QUEUE_64 (0x0053) */
-#endif /* CONFIG_QL_ISP_A64 */
-};
-
-#define MAX_MBOX_COMMAND        (sizeof(mbox_param)/sizeof(u_short))
-
-struct host_param {
-        u_short         fifo_threshold;
-        u_short         host_adapter_enable;
-        u_short         initiator_scsi_id;
-        u_short         bus_reset_delay;
-        u_short         retry_count;
-        u_short         retry_delay;
-        u_short         async_data_setup_time;
-        u_short         req_ack_active_negation;
-        u_short         data_line_active_negation;
-        u_short         data_dma_burst_enable;
-        u_short         command_dma_burst_enable;
-        u_short         tag_aging;
-        u_short         selection_timeout;
-        u_short         max_queue_depth;
-};
-
-/*
- * Device Flags:
- *
- * Bit  Name
- * ---------
- *  7   Disconnect Privilege
- *  6   Parity Checking
- *  5   Wide Data Transfers
- *  4   Synchronous Data Transfers
- *  3   Tagged Queuing
- *  2   Automatic Request Sense
- *  1   Stop Queue on Check Condition
- *  0   Renegotiate on Error
- */
-
-struct dev_param {
-        u_short         device_flags;
-        u_short         execution_throttle;
-        u_short         synchronous_period;
-        u_short         synchronous_offset;
-        u_short         device_enable;
-        u_short         reserved; /* pad */
-};
-
-/*
- * The result queue can be quite a bit smaller since continuation entries
- * do not show up there:
- */
-#define RES_QUEUE_LEN           ((QLOGICISP_REQ_QUEUE_LEN + 1) / 8 - 1)
-#define QUEUE_ENTRY_LEN         64
-#define QSIZE(entries)  (((entries) + 1) * QUEUE_ENTRY_LEN)
-
-struct isp_queue_entry {
-        char __opaque[QUEUE_ENTRY_LEN];
-};
-
-struct isp1020_hostdata {
-        void __iomem *memaddr;
-        u_char  revision;
-        struct  host_param host_param;
-        struct  dev_param dev_param[MAX_TARGETS];
-        struct  pci_dev *pci_dev;
-        
-        struct isp_queue_entry *res_cpu; /* CPU-side address of response queue. */
-        struct isp_queue_entry *req_cpu; /* CPU-size address of request queue. */
-
-        /* result and request queues (shared with isp1020): */
-        u_int   req_in_ptr;             /* index of next request slot */
-        u_int   res_out_ptr;            /* index of next result slot */
-
-        /* this is here so the queues are nicely aligned */
-        long    send_marker;            /* do we need to send a marker? */
-
-        /* The cmd->handle has a fixed size, and is only 32-bits.  We
-         * need to take care to handle 64-bit systems correctly thus what
-         * we actually place in cmd->handle is an index to the following
-         * table.  Kudos to Matt Jacob for the technique.  -DaveM
-         */
-        Scsi_Cmnd *cmd_slots[QLOGICISP_REQ_QUEUE_LEN + 1];
-
-        dma_addr_t res_dma;     /* PCI side view of response queue */
-        dma_addr_t req_dma;     /* PCI side view of request queue */
-};
-
-/* queue length's _must_ be power of two: */
-#define QUEUE_DEPTH(in, out, ql)        ((in - out) & (ql))
-#define REQ_QUEUE_DEPTH(in, out)        QUEUE_DEPTH(in, out,                 \
-                                                    QLOGICISP_REQ_QUEUE_LEN)
-#define RES_QUEUE_DEPTH(in, out)        QUEUE_DEPTH(in, out, RES_QUEUE_LEN)
-
-static void     isp1020_enable_irqs(struct Scsi_Host *);
-static void     isp1020_disable_irqs(struct Scsi_Host *);
-static int      isp1020_init(struct Scsi_Host *);
-static int      isp1020_reset_hardware(struct Scsi_Host *);
-static int      isp1020_set_defaults(struct Scsi_Host *);
-static int      isp1020_load_parameters(struct Scsi_Host *);
-static int      isp1020_mbox_command(struct Scsi_Host *, u_short []); 
-static int      isp1020_return_status(struct Status_Entry *);
-static void     isp1020_intr_handler(int, void *, struct pt_regs *);
-static irqreturn_t do_isp1020_intr_handler(int, void *, struct pt_regs *);
-
-#if USE_NVRAM_DEFAULTS
-static int      isp1020_get_defaults(struct Scsi_Host *);
-static int      isp1020_verify_nvram(struct Scsi_Host *);
-static u_short  isp1020_read_nvram_word(struct Scsi_Host *, u_short);
-#endif
-
-#if DEBUG_ISP1020
-static void     isp1020_print_scsi_cmd(Scsi_Cmnd *);
-#endif
-#if DEBUG_ISP1020_INTR
-static void     isp1020_print_status_entry(struct Status_Entry *);
-#endif
-
-/* memaddr should be used to determine if memmapped port i/o is being used
- * non-null memaddr == mmap'd
- * JV 7-Jan-2000
- */
-static inline u_short isp_inw(struct Scsi_Host *host, long offset)
-{
-        struct isp1020_hostdata *h = (struct isp1020_hostdata *)host->hostdata;
-        if (h->memaddr)
-                return readw(h->memaddr + offset);
-        else
-                return inw(host->io_port + offset);
-}
-
-static inline void isp_outw(u_short val, struct Scsi_Host *host, long offset)
-{
-        struct isp1020_hostdata *h = (struct isp1020_hostdata *)host->hostdata;
-        if (h->memaddr)
-                writew(val, h->memaddr + offset);
-        else
-                outw(val, host->io_port + offset);
-}
-
-static inline void isp1020_enable_irqs(struct Scsi_Host *host)
-{
-        isp_outw(ISP_EN_INT|ISP_EN_RISC, host, PCI_INTF_CTL);
-}
-
-
-static inline void isp1020_disable_irqs(struct Scsi_Host *host)
-{
-        isp_outw(0x0, host, PCI_INTF_CTL);
-}
-
-
-static int isp1020_detect(Scsi_Host_Template *tmpt)
-{
-        int hosts = 0;
-        struct Scsi_Host *host;
-        struct isp1020_hostdata *hostdata;
-        struct pci_dev *pdev = NULL;
-
-        ENTER("isp1020_detect");
-
-        tmpt->proc_name = "isp1020";
-
-        while ((pdev = pci_find_device(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP1020, pdev)))
-        {
-                if (pci_enable_device(pdev))
-                        continue;
-
-                host = scsi_register(tmpt, sizeof(struct isp1020_hostdata));
-                if (!host)
-                        continue;
-
-                hostdata = (struct isp1020_hostdata *) host->hostdata;
-
-                memset(hostdata, 0, sizeof(struct isp1020_hostdata));
-
-                hostdata->pci_dev = pdev;
-
-                if (isp1020_init(host))
-                        goto fail_and_unregister;
-
-                if (isp1020_reset_hardware(host)
-#if USE_NVRAM_DEFAULTS
-                    || isp1020_get_defaults(host)
-#else
-                    || isp1020_set_defaults(host)
-#endif /* USE_NVRAM_DEFAULTS */
-                    || isp1020_load_parameters(host)) {
-                        goto fail_uninit;
-                }
-
-                host->this_id = hostdata->host_param.initiator_scsi_id;
-                host->max_sectors = 64;
-
-                if (request_irq(host->irq, do_isp1020_intr_handler, SA_INTERRUPT | SA_SHIRQ,
-                                "qlogicisp", host))
-                {
-                        printk("qlogicisp : interrupt %d already in use\n",
-                               host->irq);
-                        goto fail_uninit;
-                }
-
-                isp_outw(0x0, host, PCI_SEMAPHORE);
-                isp_outw(HCCR_CLEAR_RISC_INTR, host, HOST_HCCR);
-                isp1020_enable_irqs(host);
-
-                hosts++;
-                continue;
-
-        fail_uninit:
-                iounmap(hostdata->memaddr);
-                release_region(host->io_port, 0xff);
-        fail_and_unregister:
-                if (hostdata->res_cpu)
-                        pci_free_consistent(hostdata->pci_dev,
-                                            QSIZE(RES_QUEUE_LEN),
-                                            hostdata->res_cpu,
-                                            hostdata->res_dma);
-                if (hostdata->req_cpu)
-                        pci_free_consistent(hostdata->pci_dev,
-                                            QSIZE(QLOGICISP_REQ_QUEUE_LEN),
-                                            hostdata->req_cpu,
-                                            hostdata->req_dma);
-                scsi_unregister(host);
-        }
-
-        LEAVE("isp1020_detect");
-
-        return hosts;
-}
-
-
-static int isp1020_release(struct Scsi_Host *host)
-{
-        struct isp1020_hostdata *hostdata;
-
-        ENTER("isp1020_release");
-
-        hostdata = (struct isp1020_hostdata *) host->hostdata;
-
-        isp_outw(0x0, host, PCI_INTF_CTL);
-        free_irq(host->irq, host);
-
-        iounmap(hostdata->memaddr);
-
-        release_region(host->io_port, 0xff);
-
-        LEAVE("isp1020_release");
-
-        return 0;
-}
-
-
-static const char *isp1020_info(struct Scsi_Host *host)
-{
-        static char buf[80];
-        struct isp1020_hostdata *hostdata;
-
-        ENTER("isp1020_info");
-
-        hostdata = (struct isp1020_hostdata *) host->hostdata;
-        sprintf(buf,
-                "QLogic ISP1020 SCSI on PCI bus %02x device %02x irq %d %s base 0x%lx",
-                hostdata->pci_dev->bus->number, hostdata->pci_dev->devfn, host->irq,
-                (hostdata->memaddr ? "MEM" : "I/O"),
-                (hostdata->memaddr ? (unsigned long)hostdata->memaddr : host->io_port));
-
-        LEAVE("isp1020_info");
-
-        return buf;
-}
-
-
-/*
- * The middle SCSI layer ensures that queuecommand never gets invoked
- * concurrently with itself or the interrupt handler (though the
- * interrupt handler may call this routine as part of
- * request-completion handling).
- */
-static int isp1020_queuecommand(Scsi_Cmnd *Cmnd, void (*done)(Scsi_Cmnd *))
-{
-        int i, n, num_free;
-        u_int in_ptr, out_ptr;
-        struct dataseg * ds;
-        struct scatterlist *sg;
-        struct Command_Entry *cmd;
-        struct Continuation_Entry *cont;
-        struct Scsi_Host *host;
-        struct isp1020_hostdata *hostdata;
-        dma_addr_t      dma_addr;
-
-        ENTER("isp1020_queuecommand");
-
-        host = Cmnd->device->host;
-        hostdata = (struct isp1020_hostdata *) host->hostdata;
-        Cmnd->scsi_done = done;
-
-        DEBUG(isp1020_print_scsi_cmd(Cmnd));
-
-        out_ptr = isp_inw(host, + MBOX4);
-        in_ptr  = hostdata->req_in_ptr;
-
-        DEBUG(printk("qlogicisp : request queue depth %d\n",
-                     REQ_QUEUE_DEPTH(in_ptr, out_ptr)));
-
-        cmd = (struct Command_Entry *) &hostdata->req_cpu[in_ptr];
-        in_ptr = (in_ptr + 1) & QLOGICISP_REQ_QUEUE_LEN;
-        if (in_ptr == out_ptr) {
-                printk("qlogicisp : request queue overflow\n");
-                return 1;
-        }
-
-        if (hostdata->send_marker) {
-                struct Marker_Entry *marker;
-
-                TRACE("queue marker", in_ptr, 0);
-
-                DEBUG(printk("qlogicisp : adding marker entry\n"));
-                marker = (struct Marker_Entry *) cmd;
-                memset(marker, 0, sizeof(struct Marker_Entry));
-
-                marker->hdr.entry_type = ENTRY_MARKER;
-                marker->hdr.entry_cnt = 1;
-                marker->modifier = SYNC_ALL;
-
-                hostdata->send_marker = 0;
-
-                if (((in_ptr + 1) & QLOGICISP_REQ_QUEUE_LEN) == out_ptr) {
-                        isp_outw(in_ptr, host, MBOX4);
-                        hostdata->req_in_ptr = in_ptr;
-                        printk("qlogicisp : request queue overflow\n");
-                        return 1;
-                }
-                cmd = (struct Command_Entry *) &hostdata->req_cpu[in_ptr];
-                in_ptr = (in_ptr + 1) & QLOGICISP_REQ_QUEUE_LEN;
-        }
-
-        TRACE("queue command", in_ptr, Cmnd);
-
-        memset(cmd, 0, sizeof(struct Command_Entry));
-
-        cmd->hdr.entry_type = ENTRY_COMMAND;
-        cmd->hdr.entry_cnt = 1;
-
-        cmd->target_lun = Cmnd->device->lun;
-        cmd->target_id = Cmnd->device->id;
-        cmd->cdb_length = cpu_to_le16(Cmnd->cmd_len);
-        cmd->control_flags = cpu_to_le16(CFLAG_READ | CFLAG_WRITE);
-        cmd->time_out = cpu_to_le16(30);
-
-        memcpy(cmd->cdb, Cmnd->cmnd, Cmnd->cmd_len);
-
-        if (Cmnd->use_sg) {
-                int sg_count;
-
-                sg = (struct scatterlist *) Cmnd->request_buffer;
-                ds = cmd->dataseg;
-
-                sg_count = pci_map_sg(hostdata->pci_dev, sg, Cmnd->use_sg,
-                                      Cmnd->sc_data_direction);
-
-                cmd->segment_cnt = cpu_to_le16(sg_count);
-
-                /* fill in first four sg entries: */
-                n = sg_count;
-                if (n > IOCB_SEGS)
-                        n = IOCB_SEGS;
-                for (i = 0; i < n; i++) {
-                        dma_addr = sg_dma_address(sg);
-                        ds[i].d_base  = cpu_to_le32((u32) dma_addr);
-#ifdef CONFIG_QL_ISP_A64
-                        ds[i].d_base_hi = cpu_to_le32((u32) (dma_addr>>32));
-#endif /* CONFIG_QL_ISP_A64 */
-                        ds[i].d_count = cpu_to_le32(sg_dma_len(sg));
-                        ++sg;
-                }
-                sg_count -= IOCB_SEGS;
-
-                while (sg_count > 0) {
-                        ++cmd->hdr.entry_cnt;
-                        cont = (struct Continuation_Entry *)
-                                &hostdata->req_cpu[in_ptr];
-                        in_ptr = (in_ptr + 1) & QLOGICISP_REQ_QUEUE_LEN;
-                        if (in_ptr == out_ptr) {
-                                printk("isp1020: unexpected request queue "
-                                       "overflow\n");
-                                return 1;
-                        }
-                        TRACE("queue continuation", in_ptr, 0);
-                        cont->hdr.entry_type = ENTRY_CONTINUATION;
-                        cont->hdr.entry_cnt  = 0;
-                        cont->hdr.sys_def_1  = 0;
-                        cont->hdr.flags      = 0;
-#ifndef CONFIG_QL_ISP_A64
-                        cont->reserved = 0;
-#endif
-                        ds = cont->dataseg;
-                        n = sg_count;
-                        if (n > CONTINUATION_SEGS)
-                                n = CONTINUATION_SEGS;
-                        for (i = 0; i < n; ++i) {
-                                dma_addr = sg_dma_address(sg);
-                                ds[i].d_base = cpu_to_le32((u32) dma_addr);
-#ifdef CONFIG_QL_ISP_A64
-                                ds[i].d_base_hi = cpu_to_le32((u32)(dma_addr>>32));
-#endif /* CONFIG_QL_ISP_A64 */
-                                ds[i].d_count = cpu_to_le32(sg_dma_len(sg));
-                                ++sg;
-                        }
-                        sg_count -= n;
-                }
-        } else if (Cmnd->request_bufflen) {
-                /*Cmnd->SCp.ptr = (char *)(unsigned long)*/
-                dma_addr = pci_map_single(hostdata->pci_dev,
-                                       Cmnd->request_buffer,
-                                       Cmnd->request_bufflen,
-                                       Cmnd->sc_data_direction);
-                Cmnd->SCp.ptr = (char *)(unsigned long) dma_addr;
-
-                cmd->dataseg[0].d_base =
-                        cpu_to_le32((u32) dma_addr);
-#ifdef CONFIG_QL_ISP_A64
-                cmd->dataseg[0].d_base_hi =
-                        cpu_to_le32((u32) (dma_addr>>32));
-#endif /* CONFIG_QL_ISP_A64 */
-                cmd->dataseg[0].d_count =
-                        cpu_to_le32((u32)Cmnd->request_bufflen);
-                cmd->segment_cnt = cpu_to_le16(1);
-        } else {
-                cmd->dataseg[0].d_base = 0;
-#ifdef CONFIG_QL_ISP_A64
-                cmd->dataseg[0].d_base_hi = 0;
-#endif /* CONFIG_QL_ISP_A64 */
-                cmd->dataseg[0].d_count = 0;
-                cmd->segment_cnt = cpu_to_le16(1); /* Shouldn't this be 0? */
-        }
-
-        /* Committed, record Scsi_Cmd so we can find it later. */
-        cmd->handle = in_ptr;
-        hostdata->cmd_slots[in_ptr] = Cmnd;
-
-        isp_outw(in_ptr, host, MBOX4);
-        hostdata->req_in_ptr = in_ptr;
-
-        num_free = QLOGICISP_REQ_QUEUE_LEN - REQ_QUEUE_DEPTH(in_ptr, out_ptr);
-        host->can_queue = host->host_busy + num_free;
-        host->sg_tablesize = QLOGICISP_MAX_SG(num_free);
-
-        LEAVE("isp1020_queuecommand");
-
-        return 0;
-}
-
-
-#define ASYNC_EVENT_INTERRUPT   0x01
-
-irqreturn_t do_isp1020_intr_handler(int irq, void *dev_id, struct pt_regs *regs)
-{
-        struct Scsi_Host *host = dev_id;
-        unsigned long flags;
-
-        spin_lock_irqsave(host->host_lock, flags);
-        isp1020_intr_handler(irq, dev_id, regs);
-        spin_unlock_irqrestore(host->host_lock, flags);
-
-        return IRQ_HANDLED;
-}
-
-void isp1020_intr_handler(int irq, void *dev_id, struct pt_regs *regs)
-{
-        Scsi_Cmnd *Cmnd;
-        struct Status_Entry *sts;
-        struct Scsi_Host *host = dev_id;
-        struct isp1020_hostdata *hostdata;
-        u_int in_ptr, out_ptr;
-        u_short status;
-
-        ENTER_INTR("isp1020_intr_handler");
-
-        hostdata = (struct isp1020_hostdata *) host->hostdata;
-
-        DEBUG_INTR(printk("qlogicisp : interrupt on line %d\n", irq));
-
-        if (!(isp_inw(host, PCI_INTF_STS) & 0x04)) {
-                /* spurious interrupts can happen legally */
-                DEBUG_INTR(printk("qlogicisp: got spurious interrupt\n"));
-                return;
-        }
-        in_ptr = isp_inw(host, MBOX5);
-        isp_outw(HCCR_CLEAR_RISC_INTR, host, HOST_HCCR);
-
-        if ((isp_inw(host, PCI_SEMAPHORE) & ASYNC_EVENT_INTERRUPT)) {
-                status = isp_inw(host, MBOX0);
-
-                DEBUG_INTR(printk("qlogicisp : mbox completion status: %x\n",
-                                  status));
-
-                switch (status) {
-                      case ASYNC_SCSI_BUS_RESET:
-                      case EXECUTION_TIMEOUT_RESET:
-                        hostdata->send_marker = 1;
-                        break;
-                      case INVALID_COMMAND:
-                      case HOST_INTERFACE_ERROR:
-                      case COMMAND_ERROR:
-                      case COMMAND_PARAM_ERROR:
-                        printk("qlogicisp : bad mailbox return status\n");
-                        break;
-                }
-                isp_outw(0x0, host, PCI_SEMAPHORE);
-        }
-        out_ptr = hostdata->res_out_ptr;
-
-        DEBUG_INTR(printk("qlogicisp : response queue update\n"));
-        DEBUG_INTR(printk("qlogicisp : response queue depth %d\n",
-                          QUEUE_DEPTH(in_ptr, out_ptr, RES_QUEUE_LEN)));
-
-        while (out_ptr != in_ptr) {
-                u_int cmd_slot;
-
-                sts = (struct Status_Entry *) &hostdata->res_cpu[out_ptr];
-                out_ptr = (out_ptr + 1) & RES_QUEUE_LEN;
-
-                cmd_slot = sts->handle;
-                Cmnd = hostdata->cmd_slots[cmd_slot];
-                hostdata->cmd_slots[cmd_slot] = NULL;
-
-                TRACE("done", out_ptr, Cmnd);
-
-                if (le16_to_cpu(sts->completion_status) == CS_RESET_OCCURRED
-                    || le16_to_cpu(sts->completion_status) == CS_ABORTED
-                    || (le16_to_cpu(sts->status_flags) & STF_BUS_RESET))
-                        hostdata->send_marker = 1;
-
-                if (le16_to_cpu(sts->state_flags) & SF_GOT_SENSE)
-                        memcpy(Cmnd->sense_buffer, sts->req_sense_data,
-                               sizeof(Cmnd->sense_buffer));
-
-                DEBUG_INTR(isp1020_print_status_entry(sts));
-
-                if (sts->hdr.entry_type == ENTRY_STATUS)
-                        Cmnd->result = isp1020_return_status(sts);
-                else
-                        Cmnd->result = DID_ERROR << 16;
-
-                if (Cmnd->use_sg)
-                        pci_unmap_sg(hostdata->pci_dev,
-                                     (struct scatterlist *)Cmnd->buffer,
-                                     Cmnd->use_sg,
-                                     Cmnd->sc_data_direction);
-                else if (Cmnd->request_bufflen)
-                        pci_unmap_single(hostdata->pci_dev,
-#ifdef CONFIG_QL_ISP_A64
-                                         (dma_addr_t)((long)Cmnd->SCp.ptr),
-#else
-                                         (u32)((long)Cmnd->SCp.ptr),
-#endif
-                                         Cmnd->request_bufflen,
-                                         Cmnd->sc_data_direction);
-
-                isp_outw(out_ptr, host, MBOX5);
-                (*Cmnd->scsi_done)(Cmnd);
-        }
-        hostdata->res_out_ptr = out_ptr;
-
-        LEAVE_INTR("isp1020_intr_handler");
-}
-
-
-static int isp1020_return_status(struct Status_Entry *sts)
-{
-        int host_status = DID_ERROR;
-#if DEBUG_ISP1020_INTR
-        static char *reason[] = {
-                "DID_OK",
-                "DID_NO_CONNECT",
-                "DID_BUS_BUSY",
-                "DID_TIME_OUT",
-                "DID_BAD_TARGET",
-                "DID_ABORT",
-                "DID_PARITY",
-                "DID_ERROR",
-                "DID_RESET",
-                "DID_BAD_INTR"
-        };
-#endif /* DEBUG_ISP1020_INTR */
-
-        ENTER("isp1020_return_status");
-
-        DEBUG(printk("qlogicisp : completion status = 0x%04x\n",
-                     le16_to_cpu(sts->completion_status)));
-
-        switch(le16_to_cpu(sts->completion_status)) {
-              case CS_COMPLETE:
-                host_status = DID_OK;
-                break;
-              case CS_INCOMPLETE:
-                if (!(le16_to_cpu(sts->state_flags) & SF_GOT_BUS))
-                        host_status = DID_NO_CONNECT;
-                else if (!(le16_to_cpu(sts->state_flags) & SF_GOT_TARGET))
-                        host_status = DID_BAD_TARGET;
-                else if (!(le16_to_cpu(sts->state_flags) & SF_SENT_CDB))
-                        host_status = DID_ERROR;
-                else if (!(le16_to_cpu(sts->state_flags) & SF_TRANSFERRED_DATA))
-                        host_status = DID_ERROR;
-                else if (!(le16_to_cpu(sts->state_flags) & SF_GOT_STATUS))
-                        host_status = DID_ERROR;
-                else if (!(le16_to_cpu(sts->state_flags) & SF_GOT_SENSE))
-                        host_status = DID_ERROR;
-                break;
-              case CS_DMA_ERROR:
-              case CS_TRANSPORT_ERROR:
-                host_status = DID_ERROR;
-                break;
-              case CS_RESET_OCCURRED:
-                host_status = DID_RESET;
-                break;
-              case CS_ABORTED:
-                host_status = DID_ABORT;
-                break;
-              case CS_TIMEOUT:
-                host_status = DID_TIME_OUT;
-                break;
-              case CS_DATA_OVERRUN:
-              case CS_COMMAND_OVERRUN:
-              case CS_STATUS_OVERRUN:
-              case CS_BAD_MESSAGE:
-              case CS_NO_MESSAGE_OUT:
-              case CS_EXT_ID_FAILED:
-              case CS_IDE_MSG_FAILED:
-              case CS_ABORT_MSG_FAILED:
-              case CS_NOP_MSG_FAILED:
-              case CS_PARITY_ERROR_MSG_FAILED:
-              case CS_DEVICE_RESET_MSG_FAILED:
-              case CS_ID_MSG_FAILED:
-              case CS_UNEXP_BUS_FREE:
-                host_status = DID_ERROR;
-                break;
-              case CS_DATA_UNDERRUN:
-                host_status = DID_OK;
-                break;
-              default:
-                printk("qlogicisp : unknown completion status 0x%04x\n",
-                       le16_to_cpu(sts->completion_status));
-                host_status = DID_ERROR;
-                break;
-        }
-
-        DEBUG_INTR(printk("qlogicisp : host status (%s) scsi status %x\n",
-                          reason[host_status], le16_to_cpu(sts->scsi_status)));
-
-        LEAVE("isp1020_return_status");
-
-        return (le16_to_cpu(sts->scsi_status) & STATUS_MASK) | (host_status << 16);
-}
-
-
-static int isp1020_biosparam(struct scsi_device *sdev, struct block_device *n,
-                sector_t capacity, int ip[])
-{
-        int size = capacity;
-
-        ENTER("isp1020_biosparam");
-
-        ip[0] = 64;
-        ip[1] = 32;
-        ip[2] = size >> 11;
-        if (ip[2] > 1024) {
-                ip[0] = 255;
-                ip[1] = 63;
-                ip[2] = size / (ip[0] * ip[1]);
-#if 0
-                if (ip[2] > 1023)
-                        ip[2] = 1023;
-#endif                  
-        }
-
-        LEAVE("isp1020_biosparam");
-
-        return 0;
-}
-
-
-static int isp1020_reset_hardware(struct Scsi_Host *host)
-{
-        u_short param[6];
-        int loop_count;
-
-        ENTER("isp1020_reset_hardware");
-
-        isp_outw(ISP_RESET, host, PCI_INTF_CTL);
-        udelay(100);
-        isp_outw(HCCR_RESET, host, HOST_HCCR);
-        udelay(100);
-        isp_outw(HCCR_RELEASE, host, HOST_HCCR);
-        isp_outw(HCCR_BIOS_DISABLE, host, HOST_HCCR);
-
-        loop_count = DEFAULT_LOOP_COUNT;
-        while (--loop_count && isp_inw(host, HOST_HCCR) == RISC_BUSY) {
-                barrier();
-                cpu_relax();
-        }
-        if (!loop_count)
-                printk("qlogicisp: reset_hardware loop timeout\n");
-
-        isp_outw(0, host, ISP_CFG1);
-
-#if DEBUG_ISP1020
-        printk("qlogicisp : mbox 0 0x%04x \n", isp_inw(host, MBOX0));
-        printk("qlogicisp : mbox 1 0x%04x \n", isp_inw(host, MBOX1));
-        printk("qlogicisp : mbox 2 0x%04x \n", isp_inw(host, MBOX2));
-        printk("qlogicisp : mbox 3 0x%04x \n", isp_inw(host, MBOX3));
-        printk("qlogicisp : mbox 4 0x%04x \n", isp_inw(host, MBOX4));
-        printk("qlogicisp : mbox 5 0x%04x \n", isp_inw(host, MBOX5));
-#endif /* DEBUG_ISP1020 */
-
-        param[0] = MBOX_NO_OP;
-        isp1020_mbox_command(host, param);
-        if (param[0] != MBOX_COMMAND_COMPLETE) {
-                printk("qlogicisp : NOP test failed\n");
-                return 1;
-        }
-
-        DEBUG(printk("qlogicisp : loading risc ram\n"));
-
-#if RELOAD_FIRMWARE
-        for (loop_count = 0; loop_count < risc_code_length01; loop_count++) {
-                param[0] = MBOX_WRITE_RAM_WORD;
-                param[1] = risc_code_addr01 + loop_count;
-                param[2] = risc_code01[loop_count];
-                isp1020_mbox_command(host, param);
-                if (param[0] != MBOX_COMMAND_COMPLETE) {
-                        printk("qlogicisp : firmware load failure at %d\n",
-                            loop_count);
-                        return 1;
-                }
-        }
-#endif /* RELOAD_FIRMWARE */
-
-        DEBUG(printk("qlogicisp : verifying checksum\n"));
-
-        param[0] = MBOX_VERIFY_CHECKSUM;
-        param[1] = risc_code_addr01;
-
-        isp1020_mbox_command(host, param);
-
-        if (param[0] != MBOX_COMMAND_COMPLETE) {
-                printk("qlogicisp : ram checksum failure\n");
-                return 1;
-        }
-
-        DEBUG(printk("qlogicisp : executing firmware\n"));
-
-        param[0] = MBOX_EXEC_FIRMWARE;
-        param[1] = risc_code_addr01;
-
-        isp1020_mbox_command(host, param);
-
-        param[0] = MBOX_ABOUT_FIRMWARE;
-
-        isp1020_mbox_command(host, param);
-
-        if (param[0] != MBOX_COMMAND_COMPLETE) {
-                printk("qlogicisp : about firmware failure\n");
-                return 1;
-        }
-
-        DEBUG(printk("qlogicisp : firmware major revision %d\n", param[1]));
-        DEBUG(printk("qlogicisp : firmware minor revision %d\n", param[2]));
-
-        LEAVE("isp1020_reset_hardware");
-
-        return 0;
-}
-
-
-static int isp1020_init(struct Scsi_Host *sh)
-{
-        u_long io_base, mem_base, io_flags, mem_flags;
-        struct isp1020_hostdata *hostdata;
-        u_char revision;
-        u_int irq;
-        u_short command;
-        struct pci_dev *pdev;
-
-        ENTER("isp1020_init");
-
-        hostdata = (struct isp1020_hostdata *) sh->hostdata;
-        pdev = hostdata->pci_dev;
-
-        if (pci_read_config_word(pdev, PCI_COMMAND, &command)
-            || pci_read_config_byte(pdev, PCI_CLASS_REVISION, &revision))
-        {
-                printk("qlogicisp : error reading PCI configuration\n");
-                return 1;
-        }
-
-        io_base = pci_resource_start(pdev, 0);
-        mem_base = pci_resource_start(pdev, 1);
-        io_flags = pci_resource_flags(pdev, 0);
-        mem_flags = pci_resource_flags(pdev, 1);
-        irq = pdev->irq;
-
-        if (pdev->vendor != PCI_VENDOR_ID_QLOGIC) {
-                printk("qlogicisp : 0x%04x is not QLogic vendor ID\n",
-                       pdev->vendor);
-                return 1;
-        }
-
-        if (pdev->device != PCI_DEVICE_ID_QLOGIC_ISP1020) {
-                printk("qlogicisp : 0x%04x does not match ISP1020 device id\n",
-                       pdev->device);
-                return 1;
-        }
-
-#ifdef __alpha__
-        /* Force ALPHA to use bus I/O and not bus MEM.
-           This is to avoid having to use HAE_MEM registers,
-           which is broken on some platforms and with SMP.  */
-        command &= ~PCI_COMMAND_MEMORY; 
-#endif
-
-        sh->io_port = io_base;
-
-        if (!request_region(sh->io_port, 0xff, "qlogicisp")) {
-                printk("qlogicisp : i/o region 0x%lx-0x%lx already "
-                       "in use\n",
-                       sh->io_port, sh->io_port + 0xff);
-                return 1;
-        }
-
-        if ((command & PCI_COMMAND_MEMORY) &&
-            ((mem_flags & 1) == 0)) {
-                hostdata->memaddr = ioremap(mem_base, PAGE_SIZE);
-                if (!hostdata->memaddr) {
-                        printk("qlogicisp : i/o remapping failed.\n");
-                        goto out_release;
-                }
-        } else {
-                if (command & PCI_COMMAND_IO && (io_flags & 3) != 1) {
-                        printk("qlogicisp : i/o mapping is disabled\n");
-                        goto out_release;
-                }
-                hostdata->memaddr = NULL; /* zero to signify no i/o mapping */
-                mem_base = 0;
-        }
-
-        if (revision != ISP1020_REV_ID)
-                printk("qlogicisp : new isp1020 revision ID (%d)\n", revision);
-
-        if (isp_inw(sh,  PCI_ID_LOW) != PCI_VENDOR_ID_QLOGIC
-            || isp_inw(sh, PCI_ID_HIGH) != PCI_DEVICE_ID_QLOGIC_ISP1020)
-        {
-                printk("qlogicisp : can't decode %s address space 0x%lx\n",
-                       (io_base ? "I/O" : "MEM"),
-                       (io_base ? io_base : mem_base));
-                goto out_unmap;
-        }
-
-        hostdata->revision = revision;
-
-        sh->irq = irq;
-        sh->max_id = MAX_TARGETS;
-        sh->max_lun = MAX_LUNS;
-
-        hostdata->res_cpu = pci_alloc_consistent(hostdata->pci_dev,
-                                                 QSIZE(RES_QUEUE_LEN),
-                                                 &hostdata->res_dma);
-        if (hostdata->res_cpu == NULL) {
-                printk("qlogicisp : can't allocate response queue\n");
-                goto out_unmap;
-        }
-
-        hostdata->req_cpu = pci_alloc_consistent(hostdata->pci_dev,
-                                                 QSIZE(QLOGICISP_REQ_QUEUE_LEN),
-                                                 &hostdata->req_dma);
-        if (hostdata->req_cpu == NULL) {
-                pci_free_consistent(hostdata->pci_dev,
-                                    QSIZE(RES_QUEUE_LEN),
-                                    hostdata->res_cpu,
-                                    hostdata->res_dma);
-                printk("qlogicisp : can't allocate request queue\n");
-                goto out_unmap;
-        }
-
-        pci_set_master(pdev);
-
-        LEAVE("isp1020_init");
-
-        return 0;
-
-out_unmap:
-        iounmap(hostdata->memaddr);
-out_release:
-        release_region(sh->io_port, 0xff);
-        return 1;
-}
-
-
-#if USE_NVRAM_DEFAULTS
-
-static int isp1020_get_defaults(struct Scsi_Host *host)
-{
-        int i;
-        u_short value;
-        struct isp1020_hostdata *hostdata =
-                (struct isp1020_hostdata *) host->hostdata;
-
-        ENTER("isp1020_get_defaults");
-
-        if (!isp1020_verify_nvram(host)) {
-                printk("qlogicisp : nvram checksum failure\n");
-                printk("qlogicisp : attempting to use default parameters\n");
-                return isp1020_set_defaults(host);
-        }
-
-        value = isp1020_read_nvram_word(host, 2);
-        hostdata->host_param.fifo_threshold = (value >> 8) & 0x03;
-        hostdata->host_param.host_adapter_enable = (value >> 11) & 0x01;
-        hostdata->host_param.initiator_scsi_id = (value >> 12) & 0x0f;
-
-        value = isp1020_read_nvram_word(host, 3);
-        hostdata->host_param.bus_reset_delay = value & 0xff;
-        hostdata->host_param.retry_count = value >> 8;
-
-        value = isp1020_read_nvram_word(host, 4);
-        hostdata->host_param.retry_delay = value & 0xff;
-        hostdata->host_param.async_data_setup_time = (value >> 8) & 0x0f;
-        hostdata->host_param.req_ack_active_negation = (value >> 12) & 0x01;
-        hostdata->host_param.data_line_active_negation = (value >> 13) & 0x01;
-        hostdata->host_param.data_dma_burst_enable = (value >> 14) & 0x01;
-        hostdata->host_param.command_dma_burst_enable = (value >> 15);
-
-        value = isp1020_read_nvram_word(host, 5);
-        hostdata->host_param.tag_aging = value & 0xff;
-
-        value = isp1020_read_nvram_word(host, 6);
-        hostdata->host_param.selection_timeout = value & 0xffff;
-
-        value = isp1020_read_nvram_word(host, 7);
-        hostdata->host_param.max_queue_depth = value & 0xffff;
-
-#if DEBUG_ISP1020_SETUP
-        printk("qlogicisp : fifo threshold=%d\n",
-               hostdata->host_param.fifo_threshold);
-        printk("qlogicisp : initiator scsi id=%d\n",
-               hostdata->host_param.initiator_scsi_id);
-        printk("qlogicisp : bus reset delay=%d\n",
-               hostdata->host_param.bus_reset_delay);
-        printk("qlogicisp : retry count=%d\n",
-               hostdata->host_param.retry_count);
-        printk("qlogicisp : retry delay=%d\n",
-               hostdata->host_param.retry_delay);
-        printk("qlogicisp : async data setup time=%d\n",
-               hostdata->host_param.async_data_setup_time);
-        printk("qlogicisp : req/ack active negation=%d\n",
-               hostdata->host_param.req_ack_active_negation);
-        printk("qlogicisp : data line active negation=%d\n",
-               hostdata->host_param.data_line_active_negation);
-        printk("qlogicisp : data DMA burst enable=%d\n",
-               hostdata->host_param.data_dma_burst_enable);
-        printk("qlogicisp : command DMA burst enable=%d\n",
-               hostdata->host_param.command_dma_burst_enable);
-        printk("qlogicisp : tag age limit=%d\n",
-               hostdata->host_param.tag_aging);
-        printk("qlogicisp : selection timeout limit=%d\n",
-               hostdata->host_param.selection_timeout);
-        printk("qlogicisp : max queue depth=%d\n",
-               hostdata->host_param.max_queue_depth);
-#endif /* DEBUG_ISP1020_SETUP */
-
-        for (i = 0; i < MAX_TARGETS; i++) {
-
-                value = isp1020_read_nvram_word(host, 14 + i * 3);
-                hostdata->dev_param[i].device_flags = value & 0xff;
-                hostdata->dev_param[i].execution_throttle = value >> 8;
-
-                value = isp1020_read_nvram_word(host, 15 + i * 3);
-                hostdata->dev_param[i].synchronous_period = value & 0xff;
-                hostdata->dev_param[i].synchronous_offset = (value >> 8) & 0x0f;
-                hostdata->dev_param[i].device_enable = (value >> 12) & 0x01;
-
-#if DEBUG_ISP1020_SETUP
-                printk("qlogicisp : target 0x%02x\n", i);
-                printk("qlogicisp :     device flags=0x%02x\n",
-                       hostdata->dev_param[i].device_flags);
-                printk("qlogicisp :     execution throttle=%d\n",
-                       hostdata->dev_param[i].execution_throttle);
-                printk("qlogicisp :     synchronous period=%d\n",
-                       hostdata->dev_param[i].synchronous_period);
-                printk("qlogicisp :     synchronous offset=%d\n",
-                       hostdata->dev_param[i].synchronous_offset);
-                printk("qlogicisp :     device enable=%d\n",
-                       hostdata->dev_param[i].device_enable);
-#endif /* DEBUG_ISP1020_SETUP */
-        }
-
-        LEAVE("isp1020_get_defaults");
-
-        return 0;
-}
-
-
-#define ISP1020_NVRAM_LEN       0x40
-#define ISP1020_NVRAM_SIG1      0x5349
-#define ISP1020_NVRAM_SIG2      0x2050
-
-static int isp1020_verify_nvram(struct Scsi_Host *host)
-{
-        int     i;
-        u_short value;
-        u_char checksum = 0;
-
-        for (i = 0; i < ISP1020_NVRAM_LEN; i++) {
-                value = isp1020_read_nvram_word(host, i);
-
-                switch (i) {
-                      case 0:
-                        if (value != ISP1020_NVRAM_SIG1) return 0;
-                        break;
-                      case 1:
-                        if (value != ISP1020_NVRAM_SIG2) return 0;
-                        break;
-                      case 2:
-                        if ((value & 0xff) != 0x02) return 0;
-                        break;
-                }
-                checksum += value & 0xff;
-                checksum += value >> 8;
-        }
-
-        return (checksum == 0);
-}
-
-#define NVRAM_DELAY() udelay(2) /* 2 microsecond delay */
-
-
-u_short isp1020_read_nvram_word(struct Scsi_Host *host, u_short byte)
-{
-        int i;
-        u_short value, output, input;
-
-        byte &= 0x3f; byte |= 0x0180;
-
-        for (i = 8; i >= 0; i--) {
-                output = ((byte >> i) & 0x1) ? 0x4 : 0x0;
-                isp_outw(output | 0x2, host, PCI_NVRAM); NVRAM_DELAY();
-                isp_outw(output | 0x3, host, PCI_NVRAM); NVRAM_DELAY();
-                isp_outw(output | 0x2, host, PCI_NVRAM); NVRAM_DELAY();
-        }
-
-        for (i = 0xf, value = 0; i >= 0; i--) {
-                value <<= 1;
-                isp_outw(0x3, host, PCI_NVRAM); NVRAM_DELAY();
-                input = isp_inw(host, PCI_NVRAM); NVRAM_DELAY();
-                isp_outw(0x2, host, PCI_NVRAM); NVRAM_DELAY();
-                if (input & 0x8) value |= 1;
-        }
-
-        isp_outw(0x0, host, PCI_NVRAM); NVRAM_DELAY();
-
-        return value;
-}
-
-#endif /* USE_NVRAM_DEFAULTS */
-
-
-static int isp1020_set_defaults(struct Scsi_Host *host)
-{
-        struct isp1020_hostdata *hostdata =
-                (struct isp1020_hostdata *) host->hostdata;
-        int i;
-
-        ENTER("isp1020_set_defaults");
-
-        hostdata->host_param.fifo_threshold = 2;
-        hostdata->host_param.host_adapter_enable = 1;
-        hostdata->host_param.initiator_scsi_id = 7;
-        hostdata->host_param.bus_reset_delay = 3;
-        hostdata->host_param.retry_count = 0;
-        hostdata->host_param.retry_delay = 1;
-        hostdata->host_param.async_data_setup_time = 6;
-        hostdata->host_param.req_ack_active_negation = 1;
-        hostdata->host_param.data_line_active_negation = 1;
-        hostdata->host_param.data_dma_burst_enable = 1;
-        hostdata->host_param.command_dma_burst_enable = 1;
-        hostdata->host_param.tag_aging = 8;
-        hostdata->host_param.selection_timeout = 250;
-        hostdata->host_param.max_queue_depth = 256;
-
-        for (i = 0; i < MAX_TARGETS; i++) {
-                hostdata->dev_param[i].device_flags = 0xfd;
-                hostdata->dev_param[i].execution_throttle = 16;
-                hostdata->dev_param[i].synchronous_period = 25;
-                hostdata->dev_param[i].synchronous_offset = 12;
-                hostdata->dev_param[i].device_enable = 1;
-        }
-
-        LEAVE("isp1020_set_defaults");
-
-        return 0;
-}
-
-
-static int isp1020_load_parameters(struct Scsi_Host *host)
-{
-        int i, k;
-#ifdef CONFIG_QL_ISP_A64
-        u_long queue_addr;
-        u_short param[8];
-#else
-        u_int queue_addr;
-        u_short param[6];
-#endif
-        u_short isp_cfg1, hwrev;
-        struct isp1020_hostdata *hostdata =
-                (struct isp1020_hostdata *) host->hostdata;
-
-        ENTER("isp1020_load_parameters");
-
-        hwrev = isp_inw(host, ISP_CFG0) & ISP_CFG0_HWMSK;
-        isp_cfg1 = ISP_CFG1_F64 | ISP_CFG1_BENAB;
-        if (hwrev == ISP_CFG0_1040A) {
-                /* Busted fifo, says mjacob. */
-                isp_cfg1 &= ISP_CFG1_BENAB;
-        }
-
-        isp_outw(isp_inw(host, ISP_CFG1) | isp_cfg1, host, ISP_CFG1);
-        isp_outw(isp_inw(host, CDMA_CONF) | DMA_CONF_BENAB, host, CDMA_CONF);
-        isp_outw(isp_inw(host, DDMA_CONF) | DMA_CONF_BENAB, host, DDMA_CONF);
-
-        param[0] = MBOX_SET_INIT_SCSI_ID;
-        param[1] = hostdata->host_param.initiator_scsi_id;
-
-        isp1020_mbox_command(host, param);
-
-        if (param[0] != MBOX_COMMAND_COMPLETE) {
-                printk("qlogicisp : set initiator id failure\n");
-                return 1;
-        }
-
-        param[0] = MBOX_SET_RETRY_COUNT;
-        param[1] = hostdata->host_param.retry_count;
-        param[2] = hostdata->host_param.retry_delay;
-
-        isp1020_mbox_command(host, param);
-
-        if (param[0] != MBOX_COMMAND_COMPLETE) {
-                printk("qlogicisp : set retry count failure\n");
-                return 1;
-        }
-
-        param[0] = MBOX_SET_ASYNC_DATA_SETUP_TIME;
-        param[1] = hostdata->host_param.async_data_setup_time;
-
-        isp1020_mbox_command(host, param);
-
-        if (param[0] != MBOX_COMMAND_COMPLETE) {
-                printk("qlogicisp : async data setup time failure\n");
-                return 1;
-        }
-
-        param[0] = MBOX_SET_ACTIVE_NEG_STATE;
-        param[1] = (hostdata->host_param.req_ack_active_negation << 4)
-                | (hostdata->host_param.data_line_active_negation << 5);
-
-        isp1020_mbox_command(host, param);
-
-        if (param[0] != MBOX_COMMAND_COMPLETE) {
-                printk("qlogicisp : set active negation state failure\n");
-                return 1;
-        }
-
-        param[0] = MBOX_SET_PCI_CONTROL_PARAMS;
-        param[1] = hostdata->host_param.data_dma_burst_enable << 1;
-        param[2] = hostdata->host_param.command_dma_burst_enable << 1;
-
-        isp1020_mbox_command(host, param);
-
-        if (param[0] != MBOX_COMMAND_COMPLETE) {
-                printk("qlogicisp : set pci control parameter failure\n");
-                return 1;
-        }
-
-        param[0] = MBOX_SET_TAG_AGE_LIMIT;
-        param[1] = hostdata->host_param.tag_aging;
-
-        isp1020_mbox_command(host, param);
-
-        if (param[0] != MBOX_COMMAND_COMPLETE) {
-                printk("qlogicisp : set tag age limit failure\n");
-                return 1;
-        }
-
-        param[0] = MBOX_SET_SELECT_TIMEOUT;
-        param[1] = hostdata->host_param.selection_timeout;
-
-        isp1020_mbox_command(host, param);
-
-        if (param[0] != MBOX_COMMAND_COMPLETE) {
-                printk("qlogicisp : set selection timeout failure\n");
-                return 1;
-        }
-
-        for (i = 0; i < MAX_TARGETS; i++) {
-
-                if (!hostdata->dev_param[i].device_enable)
-                        continue;
-
-                param[0] = MBOX_SET_TARGET_PARAMS;
-                param[1] = i << 8;
-                param[2] = hostdata->dev_param[i].device_flags << 8;
-                param[3] = (hostdata->dev_param[i].synchronous_offset << 8)
-                        | hostdata->dev_param[i].synchronous_period;
-
-                isp1020_mbox_command(host, param);
-
-                if (param[0] != MBOX_COMMAND_COMPLETE) {
-                        printk("qlogicisp : set target parameter failure\n");
-                        return 1;
-                }
-
-                for (k = 0; k < MAX_LUNS; k++) {
-
-                        param[0] = MBOX_SET_DEV_QUEUE_PARAMS;
-                        param[1] = (i << 8) | k;
-                        param[2] = hostdata->host_param.max_queue_depth;
-                        param[3] = hostdata->dev_param[i].execution_throttle;
-
-                        isp1020_mbox_command(host, param);
-
-                        if (param[0] != MBOX_COMMAND_COMPLETE) {
-                                printk("qlogicisp : set device queue "
-                                       "parameter failure\n");
-                                return 1;
-                        }
-                }
-        }
-
-        queue_addr = hostdata->res_dma;
-#ifdef CONFIG_QL_ISP_A64
-        param[0] = MBOX_CMD_INIT_RESPONSE_QUEUE_64;
-#else
-        param[0] = MBOX_INIT_RES_QUEUE;
-#endif
-        param[1] = RES_QUEUE_LEN + 1;
-        param[2] = (u_short) (queue_addr >> 16);
-        param[3] = (u_short) (queue_addr & 0xffff);
-        param[4] = 0;
-        param[5] = 0;
-#ifdef CONFIG_QL_ISP_A64
-        param[6] = (u_short) (queue_addr >> 48);
-        param[7] = (u_short) (queue_addr >> 32);
-#endif
-
-        isp1020_mbox_command(host, param);
-
-        if (param[0] != MBOX_COMMAND_COMPLETE) {
-                printk("qlogicisp : set response queue failure\n");
-                return 1;
-        }
-
-        queue_addr = hostdata->req_dma;
-#ifdef CONFIG_QL_ISP_A64
-        param[0] = MBOX_CMD_INIT_REQUEST_QUEUE_64;
-#else
-        param[0] = MBOX_INIT_REQ_QUEUE;
-#endif
-        param[1] = QLOGICISP_REQ_QUEUE_LEN + 1;
-        param[2] = (u_short) (queue_addr >> 16);
-        param[3] = (u_short) (queue_addr & 0xffff);
-        param[4] = 0;
-
-#ifdef CONFIG_QL_ISP_A64
-        param[5] = 0;
-        param[6] = (u_short) (queue_addr >> 48);
-        param[7] = (u_short) (queue_addr >> 32);
-#endif
-
-        isp1020_mbox_command(host, param);
-
-        if (param[0] != MBOX_COMMAND_COMPLETE) {
-                printk("qlogicisp : set request queue failure\n");
-                return 1;
-        }
-
-        LEAVE("isp1020_load_parameters");
-
-        return 0;
-}
-
-
-/*
- * currently, this is only called during initialization or abort/reset,
- * at which times interrupts are disabled, so polling is OK, I guess...
- */
-static int isp1020_mbox_command(struct Scsi_Host *host, u_short param[])
-{
-        int loop_count;
-
-        if (mbox_param[param[0]] == 0)
-                return 1;
-
-        loop_count = DEFAULT_LOOP_COUNT;
-        while (--loop_count && isp_inw(host, HOST_HCCR) & 0x0080) {
-                barrier();
-                cpu_relax();
-        }
-        if (!loop_count)
-                printk("qlogicisp: mbox_command loop timeout #1\n");
-
-        switch(mbox_param[param[0]] >> 4) {
-              case 8: isp_outw(param[7], host, MBOX7);
-              case 7: isp_outw(param[6], host, MBOX6);
-              case 6: isp_outw(param[5], host, MBOX5);
-              case 5: isp_outw(param[4], host, MBOX4);
-              case 4: isp_outw(param[3], host, MBOX3);
-              case 3: isp_outw(param[2], host, MBOX2);
-              case 2: isp_outw(param[1], host, MBOX1);
-              case 1: isp_outw(param[0], host, MBOX0);
-        }
-
-        isp_outw(0x0, host, PCI_SEMAPHORE);
-        isp_outw(HCCR_CLEAR_RISC_INTR, host, HOST_HCCR);
-        isp_outw(HCCR_SET_HOST_INTR, host, HOST_HCCR);
-
-        loop_count = DEFAULT_LOOP_COUNT;
-        while (--loop_count && !(isp_inw(host, PCI_INTF_STS) & 0x04)) {
-                barrier();
-                cpu_relax();
-        }
-        if (!loop_count)
-                printk("qlogicisp: mbox_command loop timeout #2\n");
-
-        loop_count = DEFAULT_LOOP_COUNT;
-        while (--loop_count && isp_inw(host, MBOX0) == 0x04) {
-                barrier();
-                cpu_relax();
-        }
-        if (!loop_count)
-                printk("qlogicisp: mbox_command loop timeout #3\n");
-
-        switch(mbox_param[param[0]] & 0xf) {
-              case 8: param[7] = isp_inw(host, MBOX7);
-              case 7: param[6] = isp_inw(host, MBOX6);
-              case 6: param[5] = isp_inw(host, MBOX5);
-              case 5: param[4] = isp_inw(host, MBOX4);
-              case 4: param[3] = isp_inw(host, MBOX3);
-              case 3: param[2] = isp_inw(host, MBOX2);
-              case 2: param[1] = isp_inw(host, MBOX1);
-              case 1: param[0] = isp_inw(host, MBOX0);
-        }
-
-        isp_outw(0x0, host, PCI_SEMAPHORE);
-        isp_outw(HCCR_CLEAR_RISC_INTR, host, HOST_HCCR);
-
-        return 0;
-}
-
-
-#if DEBUG_ISP1020_INTR
-
-void isp1020_print_status_entry(struct Status_Entry *status)
-{
-        int i;
-
-        printk("qlogicisp : entry count = 0x%02x, type = 0x%02x, flags = 0x%02x\n",
-               status->hdr.entry_cnt, status->hdr.entry_type, status->hdr.flags);
-        printk("qlogicisp : scsi status = 0x%04x, completion status = 0x%04x\n",
-               le16_to_cpu(status->scsi_status), le16_to_cpu(status->completion_status));
-        printk("qlogicisp : state flags = 0x%04x, status flags = 0x%04x\n",
-               le16_to_cpu(status->state_flags), le16_to_cpu(status->status_flags));
-        printk("qlogicisp : time = 0x%04x, request sense length = 0x%04x\n",
-               le16_to_cpu(status->time), le16_to_cpu(status->req_sense_len));
-        printk("qlogicisp : residual transfer length = 0x%08x\n",
-               le32_to_cpu(status->residual));
-
-        for (i = 0; i < le16_to_cpu(status->req_sense_len); i++)
-                printk("qlogicisp : sense data = 0x%02x\n", status->req_sense_data[i]);
-}
-
-#endif /* DEBUG_ISP1020_INTR */
-
-
-#if DEBUG_ISP1020
-
-void isp1020_print_scsi_cmd(Scsi_Cmnd *cmd)
-{
-        int i;
-
-        printk("qlogicisp : target = 0x%02x, lun = 0x%02x, cmd_len = 0x%02x\n",
-               cmd->target, cmd->lun, cmd->cmd_len);
-        printk("qlogicisp : command = ");
-        for (i = 0; i < cmd->cmd_len; i++)
-                printk("0x%02x ", cmd->cmnd[i]);
-        printk("\n");
-}
-
-#endif /* DEBUG_ISP1020 */
-
-MODULE_LICENSE("GPL");
-
-static Scsi_Host_Template driver_template = {
-        .detect                 = isp1020_detect,
-        .release                = isp1020_release,
-        .info                   = isp1020_info, 
-        .queuecommand           = isp1020_queuecommand,
-        .bios_param             = isp1020_biosparam,
-        .can_queue              = QLOGICISP_REQ_QUEUE_LEN,
-        .this_id                = -1,
-        .sg_tablesize           = QLOGICISP_MAX_SG(QLOGICISP_REQ_QUEUE_LEN),
-        .cmd_per_lun            = 1,
-        .use_clustering         = DISABLE_CLUSTERING,
-};
-#include "scsi_module.c"
diff --git a/drivers/scsi/qlogicisp_asm.c b/drivers/scsi/qlogicisp_asm.c
deleted file mode 100644
index 9ea4beca4ac5..000000000000
--- a/drivers/scsi/qlogicisp_asm.c
+++ /dev/null
@@ -1,2034 +0,0 @@
-/*
- *      Firmware Version 7.63.00 (12:07 Jan 27, 1999)
- */
-static const unsigned short risc_code_version = 7*1024+63;
-
-static const unsigned short risc_code_addr01 = 0x1000 ;
-
-#if RELOAD_FIRMWARE
-
-static const unsigned short risc_code01[] = {
-        0x0078, 0x103a, 0x0000, 0x3f14, 0x0000, 0x2043, 0x4f50, 0x5952,
-        0x4947, 0x4854, 0x2031, 0x3939, 0x3520, 0x514c, 0x4f47, 0x4943,
-        0x2043, 0x4f52, 0x504f, 0x5241, 0x5449, 0x4f4e, 0x2049, 0x5350,
-        0x3130, 0x3230, 0x2049, 0x2f54, 0x2046, 0x6972, 0x6d77, 0x6172,
-        0x6520, 0x2056, 0x6572, 0x7369, 0x6f6e, 0x2030, 0x372e, 0x3633,
-        0x2020, 0x2043, 0x7573, 0x746f, 0x6d65, 0x7220, 0x4e6f, 0x2e20,
-        0x3030, 0x2050, 0x726f, 0x6475, 0x6374, 0x204e, 0x6f2e, 0x2020,
-        0x3031, 0x2024, 0x2001, 0x04fd, 0x2004, 0xa082, 0x0005, 0x0048,
-        0x1045, 0x0038, 0x104b, 0x0078, 0x1047, 0x0028, 0x104b, 0x20b9,
-        0x1212, 0x0078, 0x104d, 0x20b9, 0x2222, 0x20c1, 0x0008, 0x2071,
-        0x0010, 0x70c3, 0x0004, 0x20c9, 0x76ff, 0x2089, 0x1186, 0x70c7,
-        0x4953, 0x70cb, 0x5020, 0x70cf, 0x2020, 0x70d3, 0x0007, 0x3f00,
-        0x70d6, 0x20c1, 0x0008, 0x2019, 0x0000, 0x2009, 0xfeff, 0x2100,
-        0x200b, 0xa5a5, 0xa1ec, 0x7fff, 0x2d64, 0x206b, 0x0a0a, 0xaddc,
-        0x3fff, 0x2b54, 0x205b, 0x5050, 0x2114, 0xa286, 0xa5a5, 0x0040,
-        0x10bf, 0xa386, 0x000f, 0x0040, 0x1085, 0x2c6a, 0x2a5a, 0x20c1,
-        0x0000, 0x2019, 0x000f, 0x0078, 0x1065, 0x2c6a, 0x2a5a, 0x20c1,
-        0x0008, 0x2009, 0x7fff, 0x2148, 0x2944, 0x204b, 0x0a0a, 0xa9bc,
-        0x3fff, 0x2734, 0x203b, 0x5050, 0x2114, 0xa286, 0x0a0a, 0x0040,
-        0x10a9, 0x284a, 0x263a, 0x20c1, 0x0004, 0x2009, 0x3fff, 0x2134,
-        0x200b, 0x5050, 0x2114, 0xa286, 0x5050, 0x0040, 0x10aa, 0x0078,
-        0x118e, 0x284a, 0x263a, 0x98c0, 0xa188, 0x1000, 0x212c, 0x200b,
-        0xa5a5, 0x2114, 0xa286, 0xa5a5, 0x0040, 0x10bc, 0x250a, 0xa18a,
-        0x1000, 0x98c1, 0x0078, 0x10c1, 0x250a, 0x0078, 0x10c1, 0x2c6a,
-        0x2a5a, 0x2130, 0xa18a, 0x0040, 0x2128, 0xa1a2, 0x5000, 0x8424,
-        0x8424, 0x8424, 0x8424, 0x8424, 0x8424, 0xa192, 0x7700, 0x2009,
-        0x0000, 0x2001, 0x0031, 0x1078, 0x1c9d, 0x2218, 0x2079, 0x5000,
-        0x2fa0, 0x2408, 0x2011, 0x0000, 0x20a9, 0x0040, 0x42a4, 0x8109,
-        0x00c0, 0x10dc, 0x7ef2, 0x8528, 0x7de6, 0x7cea, 0x7bee, 0x7883,
-        0x0000, 0x2031, 0x0030, 0x78cf, 0x0101, 0x780b, 0x0002, 0x780f,
-        0x0002, 0x784f, 0x0003, 0x2069, 0x5040, 0x2001, 0x04fd, 0x2004,
-        0xa082, 0x0005, 0x0048, 0x1104, 0x0038, 0x1100, 0x0078, 0x1108,
-        0x681b, 0x003c, 0x0078, 0x110a, 0x00a8, 0x1108, 0x681b, 0x003c,
-        0x681b, 0x0028, 0x6807, 0x0007, 0x680b, 0x00fa, 0x680f, 0x0008,
-        0x6813, 0x0005, 0x6823, 0x0000, 0x6827, 0x0006, 0x6817, 0x0008,
-        0x682b, 0x0000, 0x681f, 0x0019, 0x2069, 0x5280, 0x2011, 0x0020,
-        0x2009, 0x0010, 0x680b, 0x080c, 0x680f, 0x0019, 0x6803, 0xfd00,
-        0x6807, 0x0018, 0x6a1a, 0x2d00, 0xa0e8, 0x0008, 0xa290, 0x0004,
-        0x8109, 0x00c0, 0x1122, 0x2069, 0x5300, 0x2009, 0x0002, 0x20a9,
-        0x0100, 0x6837, 0x0000, 0x680b, 0x0040, 0x7bf0, 0xa386, 0xfeff,
-        0x00c0, 0x1148, 0x6817, 0x0100, 0x681f, 0x0064, 0x0078, 0x114c,
-        0x6817, 0x0064, 0x681f, 0x0002, 0xade8, 0x0010, 0x0070, 0x1152,
-        0x0078, 0x1139, 0x8109, 0x00c0, 0x1137, 0x1078, 0x21e9, 0x1078,
-        0x46e9, 0x1078, 0x1946, 0x1078, 0x4bdf, 0x3200, 0xa085, 0x000d,
-        0x2090, 0x70c3, 0x0000, 0x0090, 0x116c, 0x70c0, 0xa086, 0x0002,
-        0x00c0, 0x116c, 0x1078, 0x1284, 0x1078, 0x1196, 0x78cc, 0xa005,
-        0x00c0, 0x117a, 0x1078, 0x1cc6, 0x0010, 0x1180, 0x0068, 0x1180,
-        0x1078, 0x20c8, 0x0010, 0x1180, 0x0068, 0x1180, 0x1078, 0x1a2b,
-        0x00e0, 0x116c, 0x1078, 0x4a66, 0x0078, 0x116c, 0x118e, 0x1190,
-        0x23ea, 0x23ea, 0x476a, 0x476a, 0x23ea, 0x23ea, 0x0078, 0x118e,
-        0x0078, 0x1190, 0x0078, 0x1192, 0x0078, 0x1194, 0x0068, 0x1201,
-        0x2061, 0x0000, 0x6018, 0xa084, 0x0001, 0x00c0, 0x1201, 0x7814,
-        0xa005, 0x00c0, 0x11a7, 0x0010, 0x1202, 0x0078, 0x1201, 0x2009,
-        0x505b, 0x2104, 0xa005, 0x00c0, 0x1201, 0x2009, 0x5064, 0x200b,
-        0x0000, 0x7914, 0xa186, 0x0042, 0x00c0, 0x11cc, 0x7816, 0x2009,
-        0x5062, 0x2164, 0x200b, 0x0000, 0x6018, 0x70c6, 0x6014, 0x70ca,
-        0x611c, 0xa18c, 0xff00, 0x6020, 0xa084, 0x00ff, 0xa105, 0x70ce,
-        0x1078, 0x192b, 0x0078, 0x11ff, 0x7814, 0xa086, 0x0018, 0x00c0,
-        0x11d3, 0x1078, 0x165a, 0x7817, 0x0000, 0x2009, 0x5062, 0x2104,
-        0xa065, 0x0040, 0x11ef, 0x0c7e, 0x609c, 0x2060, 0x1078, 0x1996,
-        0x0c7f, 0x609f, 0x0000, 0x1078, 0x1730, 0x2009, 0x000c, 0x6007,
-        0x0103, 0x1078, 0x1907, 0x00c0, 0x11fb, 0x1078, 0x192b, 0x2009,
-        0x5062, 0x200b, 0x0000, 0x2009, 0x505c, 0x2104, 0x200b, 0x0000,
-        0xa005, 0x0040, 0x11ff, 0x2001, 0x4005, 0x0078, 0x1286, 0x0078,
-        0x1284, 0x007c, 0x70c3, 0x0000, 0x70c7, 0x0000, 0x70cb, 0x0000,
-        0x70cf, 0x0000, 0x70c0, 0xa0bc, 0xffc0, 0x00c0, 0x1252, 0x2038,
-        0x0079, 0x1212, 0x1284, 0x12e5, 0x12a9, 0x12fe, 0x130d, 0x1313,
-        0x12a0, 0x1748, 0x1317, 0x1298, 0x12ad, 0x12af, 0x12b1, 0x12b3,
-        0x174d, 0x1298, 0x1329, 0x1360, 0x1672, 0x1742, 0x12b5, 0x1591,
-        0x15ad, 0x15c9, 0x15f4, 0x154a, 0x1558, 0x156c, 0x1580, 0x13df,
-        0x1298, 0x138d, 0x1393, 0x1398, 0x139d, 0x13a3, 0x13a8, 0x13ad,
-        0x13b2, 0x13b7, 0x13bb, 0x13d0, 0x13dc, 0x1298, 0x1298, 0x1298,
-        0x1298, 0x13eb, 0x13f4, 0x1403, 0x1429, 0x1433, 0x143a, 0x1480,
-        0x148f, 0x149e, 0x14b0, 0x152a, 0x153a, 0x1298, 0x1298, 0x1298,
-        0x1298, 0x153f, 0xa0bc, 0xffa0, 0x00c0, 0x1298, 0x2038, 0xa084,
-        0x001f, 0x0079, 0x125b, 0x1786, 0x1789, 0x1799, 0x1298, 0x1298,
-        0x18d8, 0x18f5, 0x1298, 0x1298, 0x1298, 0x18f9, 0x1901, 0x1298,
-        0x1298, 0x1298, 0x1298, 0x12db, 0x12f4, 0x131f, 0x1356, 0x1668,
-        0x1764, 0x1778, 0x1298, 0x1829, 0x1298, 0x18b4, 0x18be, 0x18c2,
-        0x18d0, 0x1298, 0x1298, 0x72ca, 0x71c6, 0x2001, 0x4006, 0x0078,
-        0x1286, 0x73ce, 0x72ca, 0x71c6, 0x2001, 0x4000, 0x70c2, 0x0068,
-        0x1287, 0x2061, 0x0000, 0x601b, 0x0001, 0x2091, 0x5000, 0x00e0,
-        0x128f, 0x00e0, 0x1291, 0x0068, 0x1291, 0x2091, 0x4080, 0x007c,
-        0x70c3, 0x4001, 0x0078, 0x1287, 0x70c3, 0x4006, 0x0078, 0x1287,
-        0x2099, 0x0041, 0x20a1, 0x0041, 0x20a9, 0x0005, 0x53a3, 0x0078,
-        0x1284, 0x70c4, 0x70c3, 0x0004, 0x007a, 0x0078, 0x1284, 0x0078,
-        0x1284, 0x0078, 0x1284, 0x0078, 0x1284, 0x2091, 0x8000, 0x70c3,
-        0x0000, 0x70c7, 0x4953, 0x70cb, 0x5020, 0x70cf, 0x2020, 0x70d3,
-        0x0007, 0x3f00, 0x70d6, 0x2079, 0x0000, 0x781b, 0x0001, 0x2031,
-        0x0030, 0x2059, 0x1000, 0x2029, 0x0457, 0x2051, 0x0470, 0x2061,
-        0x0472, 0x20b9, 0xffff, 0x20c1, 0x0000, 0x2091, 0x5000, 0x2091,
-        0x4080, 0x0078, 0x0455, 0x1078, 0x1b36, 0x00c0, 0x129c, 0x75d8,
-        0x74dc, 0x75da, 0x74de, 0x0078, 0x12e8, 0x2029, 0x0000, 0x2520,
-        0x71d0, 0x73c8, 0x72cc, 0x70c4, 0x1078, 0x1a70, 0x0040, 0x1284,
-        0x70c3, 0x4002, 0x0078, 0x1284, 0x1078, 0x1b36, 0x00c0, 0x129c,
-        0x75d8, 0x74dc, 0x75da, 0x74de, 0x0078, 0x1301, 0x2029, 0x0000,
-        0x2520, 0x71d0, 0x73c8, 0x72cc, 0x70c4, 0x1078, 0x1ad0, 0x0040,
-        0x1284, 0x70c3, 0x4002, 0x0078, 0x1284, 0x71c4, 0x70c8, 0x2114,
-        0x200a, 0x0078, 0x1282, 0x71c4, 0x2114, 0x0078, 0x1282, 0x70c7,
-        0x0007, 0x70cb, 0x003f, 0x70cf, 0x0000, 0x0078, 0x1284, 0x1078,
-        0x1b36, 0x00c0, 0x129c, 0x75d8, 0x76dc, 0x75da, 0x76de, 0x0078,
-        0x132c, 0x2029, 0x0000, 0x2530, 0x70c4, 0x72c8, 0x73cc, 0x74d0,
-        0x70c6, 0x72ca, 0x73ce, 0x74d2, 0xa005, 0x0040, 0x1350, 0x8001,
-        0x7892, 0xa084, 0xfc00, 0x0040, 0x1345, 0x78cc, 0xa085, 0x0001,
-        0x78ce, 0x2001, 0x4005, 0x0078, 0x1286, 0x7a9a, 0x7b9e, 0x7da2,
-        0x7ea6, 0x7c96, 0x78cc, 0xa084, 0xfffc, 0x78ce, 0x0078, 0x1354,
-        0x78cc, 0xa085, 0x0001, 0x78ce, 0x0078, 0x1284, 0x1078, 0x1b36,
-        0x00c0, 0x129c, 0x75d8, 0x76dc, 0x75da, 0x76de, 0x0078, 0x1363,
-        0x2029, 0x0000, 0x2530, 0x70c4, 0x72c8, 0x73cc, 0x74d4, 0x70c6,
-        0x72ca, 0x73ce, 0x74d6, 0xa005, 0x0040, 0x1387, 0x8001, 0x78ae,
-        0xa084, 0xfc00, 0x0040, 0x137c, 0x78cc, 0xa085, 0x0100, 0x78ce,
-        0x2001, 0x4005, 0x0078, 0x1286, 0x7ab6, 0x7bba, 0x7dbe, 0x7ec2,
-        0x7cb2, 0x78cc, 0xa084, 0xfcff, 0x78ce, 0x0078, 0x138b, 0x78cc,
-        0xa085, 0x0100, 0x78ce, 0x0078, 0x1284, 0x2009, 0x5061, 0x210c,
-        0x7aec, 0x0078, 0x1282, 0x2009, 0x5041, 0x210c, 0x0078, 0x1283,
-        0x2009, 0x5042, 0x210c, 0x0078, 0x1283, 0x2061, 0x5040, 0x610c,
-        0x6210, 0x0078, 0x1282, 0x2009, 0x5045, 0x210c, 0x0078, 0x1283,
-        0x2009, 0x5046, 0x210c, 0x0078, 0x1283, 0x2009, 0x5048, 0x210c,
-        0x0078, 0x1283, 0x2009, 0x5049, 0x210c, 0x0078, 0x1283, 0x7908,
-        0x7a0c, 0x0078, 0x1282, 0x71c4, 0x8107, 0xa084, 0x000f, 0x8003,
-        0x8003, 0x8003, 0xa0e8, 0x5280, 0x6a00, 0x6804, 0xa084, 0x0008,
-        0x0040, 0x13cd, 0x6b08, 0x0078, 0x13ce, 0x6b0c, 0x0078, 0x1281,
-        0x77c4, 0x1078, 0x1956, 0x2091, 0x8000, 0x6b1c, 0x6a14, 0x2091,
-        0x8001, 0x2708, 0x0078, 0x1281, 0x794c, 0x0078, 0x1283, 0x77c4,
-        0x1078, 0x1956, 0x2091, 0x8000, 0x6908, 0x6a18, 0x6b10, 0x2091,
-        0x8001, 0x0078, 0x1281, 0x71c4, 0xa182, 0x0010, 0x00c8, 0x127c,
-        0x1078, 0x22c1, 0x0078, 0x1281, 0x71c4, 0xa182, 0x0010, 0x00c8,
-        0x127c, 0x2011, 0x5041, 0x2204, 0x007e, 0x2112, 0x1078, 0x227a,
-        0x017f, 0x0078, 0x1283, 0x71c4, 0x2011, 0x1421, 0x20a9, 0x0008,
-        0x2204, 0xa106, 0x0040, 0x1413, 0x8210, 0x0070, 0x1411, 0x0078,
-        0x1408, 0x0078, 0x127c, 0xa292, 0x1421, 0x027e, 0x2011, 0x5042,
-        0x2204, 0x2112, 0x017f, 0x007e, 0x1078, 0x2286, 0x017f, 0x0078,
-        0x1283, 0x03e8, 0x00fa, 0x01f4, 0x02ee, 0x0064, 0x0019, 0x0032,
-        0x004b, 0x2061, 0x5040, 0x610c, 0x6210, 0x70c4, 0x600e, 0x70c8,
-        0x6012, 0x0078, 0x1282, 0x2061, 0x5040, 0x6114, 0x70c4, 0x6016,
-        0x0078, 0x1283, 0x2061, 0x5040, 0x71c4, 0x2011, 0x0004, 0x601f,
-        0x0019, 0x2019, 0x1212, 0xa186, 0x0028, 0x0040, 0x145b, 0x2011,
-        0x0005, 0x601f, 0x0019, 0x2019, 0x1212, 0xa186, 0x0032, 0x0040,
-        0x145b, 0x2011, 0x0006, 0x601f, 0x000c, 0x2019, 0x2222, 0xa186,
-        0x003c, 0x00c0, 0x127c, 0x6018, 0x007e, 0x611a, 0x7800, 0xa084,
-        0x0001, 0x00c0, 0x1476, 0x2001, 0x04fd, 0x2004, 0xa082, 0x0005,
-        0x0048, 0x146e, 0x0038, 0x1472, 0x0078, 0x1476, 0x0028, 0x1472,
-        0x0078, 0x1476, 0x2019, 0x2222, 0x0078, 0x1478, 0x2019, 0x1212,
-        0x23b8, 0x1078, 0x2297, 0x1078, 0x4bdf, 0x017f, 0x0078, 0x1283,
-        0x71c4, 0xa184, 0xffcf, 0x00c0, 0x127c, 0x2011, 0x5048, 0x2204,
-        0x2112, 0x007e, 0x1078, 0x22b9, 0x017f, 0x0078, 0x1283, 0x71c4,
-        0xa182, 0x0010, 0x00c8, 0x127c, 0x2011, 0x5049, 0x2204, 0x007e,
-        0x2112, 0x1078, 0x22a8, 0x017f, 0x0078, 0x1283, 0x71c4, 0x72c8,
-        0xa184, 0xfffd, 0x00c0, 0x127b, 0xa284, 0xfffd, 0x00c0, 0x127b,
-        0x2100, 0x7908, 0x780a, 0x2200, 0x7a0c, 0x780e, 0x0078, 0x1282,
-        0x71c4, 0x8107, 0xa084, 0x000f, 0x8003, 0x8003, 0x8003, 0xa0e8,
-        0x5280, 0x2019, 0x0000, 0x72c8, 0xa284, 0x0080, 0x0040, 0x14c6,
-        0x6c14, 0x84ff, 0x00c0, 0x14c6, 0x6817, 0x0040, 0xa284, 0x0040,
-        0x0040, 0x14d0, 0x6c10, 0x84ff, 0x00c0, 0x14d0, 0x6813, 0x0001,
-        0x6800, 0x007e, 0xa226, 0x0040, 0x14f3, 0x6a02, 0xa484, 0x2000,
-        0x0040, 0x14dc, 0xa39d, 0x0010, 0xa484, 0x1000, 0x0040, 0x14e2,
-        0xa39d, 0x0008, 0xa484, 0x4000, 0x0040, 0x14f3, 0x810f, 0xa284,
-        0x4000, 0x0040, 0x14ef, 0x1078, 0x22db, 0x0078, 0x14f3, 0x1078,
-        0x22cd, 0x0078, 0x14f3, 0x72cc, 0x6808, 0xa206, 0x0040, 0x1522,
-        0xa2a4, 0x00ff, 0x2061, 0x5040, 0x6118, 0xa186, 0x0028, 0x0040,
-        0x1509, 0xa186, 0x0032, 0x0040, 0x150f, 0xa186, 0x003c, 0x0040,
-        0x1515, 0xa482, 0x0064, 0x0048, 0x151f, 0x0078, 0x1519, 0xa482,
-        0x0050, 0x0048, 0x151f, 0x0078, 0x1519, 0xa482, 0x0043, 0x0048,
-        0x151f, 0x71c4, 0x71c6, 0x027f, 0x72ca, 0x0078, 0x127d, 0x6a0a,
-        0xa39d, 0x000a, 0x6804, 0xa305, 0x6806, 0x027f, 0x6b0c, 0x71c4,
-        0x0078, 0x1281, 0x77c4, 0x1078, 0x1956, 0x2091, 0x8000, 0x6a14,
-        0x6b1c, 0x2091, 0x8001, 0x70c8, 0x6816, 0x70cc, 0x681e, 0x2708,
-        0x0078, 0x1281, 0x70c4, 0x794c, 0x784e, 0x0078, 0x1283, 0x71c4,
-        0x72c8, 0x73cc, 0xa182, 0x0010, 0x00c8, 0x127c, 0x1078, 0x22e9,
-        0x0078, 0x1281, 0x77c4, 0x1078, 0x1956, 0x2091, 0x8000, 0x6a08,
-        0xa295, 0x0002, 0x6a0a, 0x2091, 0x8001, 0x2708, 0x0078, 0x1282,
-        0x77c4, 0x1078, 0x1956, 0x2091, 0x8000, 0x6a08, 0xa294, 0xfff9,
-        0x6a0a, 0x6804, 0xa005, 0x0040, 0x1567, 0x1078, 0x21b1, 0x2091,
-        0x8001, 0x2708, 0x0078, 0x1282, 0x77c4, 0x1078, 0x1956, 0x2091,
-        0x8000, 0x6a08, 0xa295, 0x0004, 0x6a0a, 0x6804, 0xa005, 0x0040,
-        0x157b, 0x1078, 0x21b1, 0x2091, 0x8001, 0x2708, 0x0078, 0x1282,
-        0x77c4, 0x2041, 0x0001, 0x2049, 0x0005, 0x2051, 0x0020, 0x2091,
-        0x8000, 0x1078, 0x1963, 0x2091, 0x8001, 0x2708, 0x6a08, 0x0078,
-        0x1282, 0x77c4, 0x72c8, 0x73cc, 0x77c6, 0x72ca, 0x73ce, 0x1078,
-        0x19c4, 0x00c0, 0x15a9, 0x6818, 0xa005, 0x0040, 0x15a9, 0x2708,
-        0x1078, 0x22f9, 0x00c0, 0x15a9, 0x7817, 0x0015, 0x2091, 0x8001,
-        0x007c, 0x2091, 0x8001, 0x0078, 0x1284, 0x77c4, 0x77c6, 0x2041,
-        0x0021, 0x2049, 0x0005, 0x2051, 0x0020, 0x2091, 0x8000, 0x1078,
-        0x1963, 0x2061, 0x5040, 0x606f, 0x0003, 0x6782, 0x6093, 0x000f,
-        0x6073, 0x0000, 0x7817, 0x0016, 0x1078, 0x21b1, 0x2091, 0x8001,
-        0x007c, 0x77c8, 0x77ca, 0x77c4, 0x77c6, 0xa7bc, 0xff00, 0x2091,
-        0x8000, 0x2061, 0x5040, 0x606f, 0x0002, 0x6073, 0x0000, 0x6782,
-        0x6093, 0x000f, 0x7817, 0x0017, 0x1078, 0x21b1, 0x2091, 0x8001,
-        0x2041, 0x0021, 0x2049, 0x0004, 0x2051, 0x0010, 0x2091, 0x8000,
-        0x1078, 0x1963, 0x70c8, 0x6836, 0x8738, 0xa784, 0x001f, 0x00c0,
-        0x15e8, 0x2091, 0x8001, 0x007c, 0x78cc, 0xa084, 0x0003, 0x00c0,
-        0x1618, 0x2039, 0x0000, 0x2041, 0x0021, 0x2049, 0x0004, 0x2051,
-        0x0008, 0x1078, 0x1956, 0x2091, 0x8000, 0x6808, 0xa80d, 0x690a,
-        0x2091, 0x8001, 0x8738, 0xa784, 0x001f, 0x00c0, 0x1601, 0xa7bc,
-        0xff00, 0x873f, 0x8738, 0x873f, 0xa784, 0x0f00, 0x00c0, 0x1601,
-        0x2091, 0x8000, 0x2069, 0x0100, 0x6830, 0xa084, 0x0040, 0x0040,
-        0x1641, 0x684b, 0x0004, 0x20a9, 0x0014, 0x6848, 0xa084, 0x0004,
-        0x0040, 0x162e, 0x0070, 0x162e, 0x0078, 0x1625, 0x684b, 0x0009,
-        0x20a9, 0x0014, 0x6848, 0xa084, 0x0001, 0x0040, 0x163b, 0x0070,
-        0x163b, 0x0078, 0x1632, 0x20a9, 0x00fa, 0x0070, 0x1641, 0x0078,
-        0x163d, 0x2079, 0x5000, 0x7817, 0x0018, 0x2061, 0x5040, 0x606f,
-        0x0001, 0x6073, 0x0000, 0x6093, 0x000f, 0x78cc, 0xa085, 0x0002,
-        0x78ce, 0x6808, 0xa084, 0xfffd, 0x680a, 0x681b, 0x0048, 0x2091,
-        0x8001, 0x007c, 0x78cc, 0xa084, 0xfffd, 0x78ce, 0xa084, 0x0001,
-        0x00c0, 0x1664, 0x1078, 0x1a0e, 0x71c4, 0x71c6, 0x794a, 0x007c,
-        0x1078, 0x1b36, 0x00c0, 0x129c, 0x75d8, 0x74dc, 0x75da, 0x74de,
-        0x0078, 0x1675, 0x2029, 0x0000, 0x2520, 0x71c4, 0x73c8, 0x72cc,
-        0x71c6, 0x73ca, 0x72ce, 0x2079, 0x5000, 0x2091, 0x8000, 0x1078,
-        0x1911, 0x2091, 0x8001, 0x0040, 0x172c, 0x20a9, 0x0005, 0x20a1,
-        0x5018, 0x2091, 0x8000, 0x41a1, 0x2091, 0x8001, 0x2009, 0x0020,
-        0x1078, 0x190c, 0x0040, 0x1698, 0x1078, 0x192b, 0x0078, 0x172c,
-        0x6004, 0xa084, 0xff00, 0x8007, 0x8009, 0x0040, 0x16fb, 0x0c7e,
-        0x2c68, 0x2091, 0x8000, 0x1078, 0x1911, 0x2091, 0x8001, 0x0040,
-        0x16cc, 0x2c00, 0x689e, 0x8109, 0x00c0, 0x16a0, 0x609f, 0x0000,
-        0x0c7f, 0x0c7e, 0x7218, 0x731c, 0x7420, 0x7524, 0x2c68, 0x689c,
-        0xa065, 0x0040, 0x16fa, 0x2009, 0x0020, 0x1078, 0x190c, 0x00c0,
-        0x16e3, 0x6004, 0xa084, 0x00ff, 0xa086, 0x0002, 0x00c0, 0x16cc,
-        0x2d00, 0x6002, 0x0078, 0x16b2, 0x0c7f, 0x0c7e, 0x609c, 0x2060,
-        0x1078, 0x1996, 0x0c7f, 0x609f, 0x0000, 0x1078, 0x1730, 0x2009,
-        0x000c, 0x6008, 0xa085, 0x0200, 0x600a, 0x1078, 0x1907, 0x1078,
-        0x192b, 0x0078, 0x172c, 0x0c7f, 0x0c7e, 0x609c, 0x2060, 0x1078,
-        0x1996, 0x0c7f, 0x609f, 0x0000, 0x1078, 0x1730, 0x2009, 0x000c,
-        0x6007, 0x0103, 0x601b, 0x0003, 0x1078, 0x1907, 0x1078, 0x192b,
-        0x0078, 0x172c, 0x0c7f, 0x74c4, 0x73c8, 0x72cc, 0x6014, 0x2091,
-        0x8000, 0x7817, 0x0012, 0x0e7e, 0x2071, 0x5040, 0x706f, 0x0005,
-        0x7073, 0x0000, 0x7376, 0x727a, 0x747e, 0x7082, 0x7087, 0x0000,
-        0x2c00, 0x708a, 0x708f, 0x0000, 0xa02e, 0x2530, 0x611c, 0x61a2,
-        0xa184, 0x0060, 0x0040, 0x171e, 0x1078, 0x467f, 0x0e7f, 0x6596,
-        0x65a6, 0x669a, 0x66aa, 0x60af, 0x0000, 0x60b3, 0x0000, 0x1078,
-        0x21b1, 0x2091, 0x8001, 0x007c, 0x70c3, 0x4005, 0x0078, 0x1287,
-        0x20a9, 0x0005, 0x2099, 0x5018, 0x2091, 0x8000, 0x530a, 0x2091,
-        0x8001, 0x2100, 0xa210, 0xa399, 0x0000, 0xa4a1, 0x0000, 0xa5a9,
-        0x0000, 0x007c, 0x71c4, 0x70c7, 0x0000, 0x7906, 0x0078, 0x1284,
-        0x71c4, 0x71c6, 0x2168, 0x0078, 0x174f, 0x2069, 0x1000, 0x690c,
-        0xa016, 0x2d04, 0xa210, 0x8d68, 0x8109, 0x00c0, 0x1751, 0xa285,
-        0x0000, 0x00c0, 0x175f, 0x70c3, 0x4000, 0x0078, 0x1761, 0x70c3,
-        0x4003, 0x70ca, 0x0078, 0x1287, 0x2011, 0x5067, 0x220c, 0x70c4,
-        0x8003, 0x0048, 0x1771, 0x1078, 0x3b49, 0xa184, 0x7fff, 0x0078,
-        0x1775, 0x1078, 0x3b3c, 0xa185, 0x8000, 0x2012, 0x0078, 0x1283,
-        0x71c4, 0x1078, 0x3b33, 0x6100, 0x2001, 0x5067, 0x2004, 0xa084,
-        0x8000, 0xa10d, 0x6204, 0x6308, 0x0078, 0x1281, 0x79e4, 0x0078,
-        0x1283, 0x71c4, 0x71c6, 0x2198, 0x20a1, 0x0042, 0x20a9, 0x0004,
-        0x53a3, 0x21a0, 0x2099, 0x0042, 0x20a9, 0x0004, 0x53a3, 0x0078,
-        0x1284, 0x70c4, 0x2068, 0x2079, 0x5000, 0x2091, 0x8000, 0x1078,
-        0x1911, 0x2091, 0x8001, 0x0040, 0x1825, 0x6007, 0x0001, 0x600b,
-        0x0000, 0x602b, 0x0000, 0x601b, 0x0006, 0x6a10, 0xa28c, 0x000f,
-        0xa284, 0x00f0, 0x8003, 0x8003, 0x8003, 0x8003, 0xa105, 0x6016,
-        0xa284, 0x0800, 0x0040, 0x17c0, 0x601b, 0x000a, 0x0078, 0x17c6,
-        0xa284, 0x1000, 0x0040, 0x17c6, 0x601b, 0x000c, 0xa284, 0x0300,
-        0x0040, 0x17cf, 0x602b, 0x0001, 0x8004, 0x8004, 0x8004, 0xa085,
-        0x0001, 0x601e, 0x6023, 0x0000, 0x6027, 0x0000, 0xa284, 0x0400,
-        0x0040, 0x17dc, 0x602b, 0x0000, 0x20a9, 0x0006, 0xac80, 0x000b,
-        0x20a0, 0xad80, 0x0005, 0x2098, 0x53a3, 0xa284, 0x0300, 0x00c0,
-        0x17f1, 0x6046, 0x604a, 0x604e, 0x6052, 0x6096, 0x609a, 0x0078,
-        0x17fb, 0x6800, 0x6046, 0x6804, 0x604a, 0x6e08, 0x664e, 0x6d0c,
-        0x6552, 0x6596, 0x669a, 0x6014, 0x2091, 0x8000, 0x7817, 0x0042,
-        0x2c08, 0x2061, 0x5040, 0x606f, 0x0005, 0x6073, 0x0000, 0x6077,
-        0x0000, 0x607b, 0x0000, 0x607f, 0x0000, 0x6082, 0x618a, 0xa284,
-        0x0400, 0x608e, 0x2091, 0x8001, 0x0e7e, 0x2071, 0x0020, 0x7007,
-        0x000a, 0x7007, 0x0002, 0x7003, 0x0000, 0x0e7f, 0x2091, 0x8000,
-        0x1078, 0x21b1, 0x2091, 0x8001, 0x007c, 0x70c3, 0x4005, 0x0078,
-        0x1287, 0x0c7e, 0x0d7e, 0x0e7e, 0x0f7e, 0x2091, 0x8000, 0x2071,
-        0x5040, 0x2079, 0x0100, 0x2061, 0x0010, 0x70a0, 0xa06d, 0x0040,
-        0x18aa, 0x6a04, 0xa294, 0x00ff, 0xa286, 0x0007, 0x0040, 0x1844,
-        0xa286, 0x000f, 0x00c0, 0x18aa, 0x691c, 0xa184, 0x0080, 0x00c0,
-        0x18aa, 0x6824, 0xa18c, 0xff00, 0xa085, 0x0019, 0x6826, 0x71b0,
-        0x81ff, 0x0040, 0x1865, 0x0d7e, 0x2069, 0x0020, 0x6908, 0x6808,
-        0xa106, 0x00c0, 0x1856, 0x690c, 0x680c, 0xa106, 0x00c0, 0x185b,
-        0xa184, 0x00ff, 0x00c0, 0x185b, 0x0d7f, 0x78b8, 0xa084, 0x801f,
-        0x00c0, 0x1865, 0x7848, 0xa085, 0x000c, 0x784a, 0x71b0, 0x81ff,
-        0x0040, 0x1888, 0x70b3, 0x0000, 0x0d7e, 0x2069, 0x0020, 0x6807,
-        0x0008, 0x6804, 0xa084, 0x0008, 0x00c0, 0x1879, 0x6807, 0x0008,
-        0x6804, 0xa084, 0x0008, 0x00c0, 0x1880, 0x6807, 0x0002, 0x0d7f,
-        0x61c4, 0x62c8, 0x63cc, 0x61c6, 0x62ca, 0x63ce, 0x0e7e, 0x2071,
-        0x5000, 0x7266, 0x736a, 0xae80, 0x0019, 0x0e7f, 0x1078, 0x4598,
-        0x78a3, 0x0000, 0x7858, 0xa084, 0xedff, 0x785a, 0x70b4, 0xa080,
-        0x00da, 0x781a, 0x0f7f, 0x0e7f, 0x0d7f, 0x0c7f, 0x2091, 0x8001,
-        0x0078, 0x1284, 0x0f7f, 0x0e7f, 0x0d7f, 0x0c7f, 0x2091, 0x8001,
-        0x2001, 0x4005, 0x0078, 0x1286, 0x7980, 0x71c6, 0x71c4, 0xa182,
-        0x0003, 0x00c8, 0x127c, 0x7982, 0x0078, 0x1284, 0x7980, 0x71c6,
-        0x0078, 0x1284, 0x7974, 0x71c6, 0x71c4, 0x7976, 0x7978, 0x71ca,
-        0x71c8, 0x797a, 0x797c, 0x71ce, 0x71cc, 0x797e, 0x0078, 0x1284,
-        0x7974, 0x71c6, 0x7978, 0x71ca, 0x797c, 0x71ce, 0x0078, 0x1284,
-        0x7900, 0x71c6, 0x71c4, 0x7902, 0x2001, 0x04fd, 0x2004, 0xa082,
-        0x0005, 0x0048, 0x18e7, 0x0038, 0x18e9, 0x0078, 0x18f3, 0x00a8,
-        0x18f3, 0xa18c, 0x0001, 0x00c0, 0x18f1, 0x20b9, 0x2222, 0x0078,
-        0x18f3, 0x20b9, 0x1212, 0x0078, 0x1284, 0x7900, 0x71c6, 0x0078,
-        0x1284, 0x2009, 0x5074, 0x2104, 0x70c6, 0x70c4, 0x200a, 0x0078,
-        0x1284, 0x2009, 0x5074, 0x2104, 0x70c6, 0x0078, 0x1284, 0xac80,
-        0x0001, 0x1078, 0x1af2, 0x007c, 0xac80, 0x0001, 0x1078, 0x1a92,
-        0x007c, 0x7850, 0xa065, 0x0040, 0x1919, 0x2c04, 0x7852, 0x2063,
-        0x0000, 0x007c, 0x0f7e, 0x2079, 0x5000, 0x7850, 0xa06d, 0x0040,
-        0x1929, 0x2d04, 0x7852, 0x6803, 0x0000, 0x6807, 0x0000, 0x680b,
-        0x0000, 0x0f7f, 0x007c, 0x2091, 0x8000, 0x0f7e, 0x2079, 0x5000,
-        0x7850, 0x2062, 0x2c00, 0xa005, 0x00c0, 0x1938, 0x1078, 0x23ca,
-        0x7852, 0x0f7f, 0x2091, 0x8001, 0x007c, 0x0f7e, 0x2079, 0x5000,
-        0x7850, 0x206a, 0x2d00, 0x7852, 0x0f7f, 0x007c, 0x2011, 0x7700,
-        0x7a52, 0x7bec, 0x8319, 0x0040, 0x1953, 0xa280, 0x0031, 0x2012,
-        0x2010, 0x0078, 0x194a, 0x2013, 0x0000, 0x007c, 0xa784, 0x0f00,
-        0x800b, 0xa784, 0x001f, 0x8003, 0x8003, 0x8003, 0x8003, 0xa105,
-        0xa0e8, 0x5300, 0x007c, 0x1078, 0x1956, 0x2900, 0x682a, 0x2a00,
-        0x682e, 0x6808, 0xa084, 0xffef, 0xa80d, 0x690a, 0x2009, 0x5052,
-        0x210c, 0x6804, 0xa005, 0x0040, 0x1995, 0xa116, 0x00c0, 0x1980,
-        0x2060, 0x6000, 0x6806, 0x017e, 0x200b, 0x0000, 0x0078, 0x1983,
-        0x2009, 0x0000, 0x017e, 0x6804, 0xa065, 0x0040, 0x1992, 0x6000,
-        0x6806, 0x1078, 0x19a3, 0x1078, 0x1c42, 0x6810, 0x8001, 0x6812,
-        0x00c0, 0x1983, 0x017f, 0x6902, 0x6906, 0x007c, 0xa065, 0x0040,
-        0x19a2, 0x609c, 0x609f, 0x0000, 0x2008, 0x1078, 0x192b, 0x2100,
-        0x0078, 0x1996, 0x007c, 0x6007, 0x0103, 0x608f, 0x0000, 0x20a9,
-        0x001c, 0xac80, 0x0005, 0x20a0, 0x2001, 0x0000, 0x40a4, 0x6828,
-        0x601a, 0x682c, 0x6022, 0x007c, 0x0e7e, 0x2071, 0x5040, 0x704c,
-        0xa08c, 0x0200, 0x00c0, 0x19c2, 0xa088, 0x5080, 0x2d0a, 0x8000,
-        0x704e, 0xa006, 0x0e7f, 0x007c, 0x1078, 0x1956, 0x2091, 0x8000,
-        0x6804, 0x781e, 0xa065, 0x0040, 0x1a0d, 0x0078, 0x19d5, 0x2c00,
-        0x781e, 0x6000, 0xa065, 0x0040, 0x1a0d, 0x600c, 0xa306, 0x00c0,
-        0x19cf, 0x6010, 0xa206, 0x00c0, 0x19cf, 0x2c28, 0x2001, 0x5052,
-        0x2004, 0xac06, 0x00c0, 0x19e6, 0x0078, 0x1a0b, 0x6804, 0xac06,
-        0x00c0, 0x19f3, 0x6000, 0xa065, 0x6806, 0x00c0, 0x19fd, 0x6803,
-        0x0000, 0x0078, 0x19fd, 0x6400, 0x781c, 0x2060, 0x6402, 0xa486,
-        0x0000, 0x00c0, 0x19fd, 0x2c00, 0x6802, 0x2560, 0x1078, 0x19a3,
-        0x601b, 0x0005, 0x6023, 0x0020, 0x1078, 0x1c42, 0x6810, 0x8001,
-        0x1050, 0x23ca, 0x6812, 0xa085, 0xffff, 0x007c, 0x2039, 0x0000,
-        0x2041, 0x0021, 0x2049, 0x0004, 0x2051, 0x0008, 0x2091, 0x8000,
-        0x1078, 0x1963, 0x8738, 0xa784, 0x001f, 0x00c0, 0x1a18, 0xa7bc,
-        0xff00, 0x873f, 0x8738, 0x873f, 0xa784, 0x0f00, 0x00c0, 0x1a18,
-        0x2091, 0x8001, 0x007c, 0x2061, 0x0000, 0x6018, 0xa084, 0x0001,
-        0x00c0, 0x1a3c, 0x2091, 0x8000, 0x78e0, 0x78e3, 0x0000, 0x2091,
-        0x8001, 0xa005, 0x00c0, 0x1a3d, 0x007c, 0xa08c, 0xfff0, 0x0040,
-        0x1a43, 0x1078, 0x23ca, 0x0079, 0x1a45, 0x1a55, 0x1a58, 0x1a5e,
-        0x1a62, 0x1a56, 0x1a66, 0x1a6c, 0x1a56, 0x1a56, 0x1c0c, 0x1c30,
-        0x1c34, 0x1a56, 0x1a56, 0x1a56, 0x1a56, 0x007c, 0x1078, 0x23ca,
-        0x1078, 0x1a0e, 0x2001, 0x8001, 0x0078, 0x1c3a, 0x2001, 0x8003,
-        0x0078, 0x1c3a, 0x2001, 0x8004, 0x0078, 0x1c3a, 0x1078, 0x1a0e,
-        0x2001, 0x8006, 0x0078, 0x1c3a, 0x2001, 0x8007, 0x0078, 0x1c3a,
-        0x2030, 0x2138, 0xa782, 0x0021, 0x0048, 0x1a78, 0x2009, 0x0020,
-        0x2600, 0x1078, 0x1a92, 0x00c0, 0x1a91, 0xa7ba, 0x0020, 0x0048,
-        0x1a90, 0x0040, 0x1a90, 0x2708, 0xa6b0, 0x0020, 0xa290, 0x0040,
-        0xa399, 0x0000, 0xa4a1, 0x0000, 0xa5a9, 0x0000, 0x0078, 0x1a72,
-        0xa006, 0x007c, 0x81ff, 0x0040, 0x1acd, 0x2099, 0x0030, 0x20a0,
-        0x700c, 0xa084, 0x00ff, 0x0040, 0x1aa4, 0x7007, 0x0004, 0x7004,
-        0xa084, 0x0004, 0x00c0, 0x1a9f, 0x21a8, 0x7017, 0x0000, 0x810b,
-        0x7112, 0x721a, 0x731e, 0x7422, 0x7526, 0x780c, 0xa085, 0x0001,
-        0x7002, 0x7007, 0x0001, 0x2001, 0x04fd, 0x2004, 0xa082, 0x0005,
-        0x00c8, 0x1ac1, 0x2009, 0x0022, 0x2104, 0xa084, 0x4000, 0x00c0,
-        0x1ab3, 0x7008, 0x800b, 0x00c8, 0x1ab3, 0x7007, 0x0002, 0xa08c,
-        0x01e0, 0x00c0, 0x1acd, 0x53a5, 0xa006, 0x7003, 0x0000, 0x007c,
-        0x2030, 0x2138, 0xa782, 0x0021, 0x0048, 0x1ad8, 0x2009, 0x0020,
-        0x2600, 0x1078, 0x1af2, 0x00c0, 0x1af1, 0xa7ba, 0x0020, 0x0048,
-        0x1af0, 0x0040, 0x1af0, 0x2708, 0xa6b0, 0x0020, 0xa290, 0x0040,
-        0xa399, 0x0000, 0xa4a1, 0x0000, 0xa5a9, 0x0000, 0x0078, 0x1ad2,
-        0xa006, 0x007c, 0x81ff, 0x0040, 0x1b33, 0x2098, 0x20a1, 0x0030,
-        0x700c, 0xa084, 0x00ff, 0x0040, 0x1b04, 0x7007, 0x0004, 0x7004,
-        0xa084, 0x0004, 0x00c0, 0x1aff, 0x21a8, 0x7017, 0x0000, 0x810b,
-        0x7112, 0x721a, 0x731e, 0x7422, 0x7526, 0x780c, 0xa085, 0x0000,
-        0x7002, 0x53a6, 0x7007, 0x0001, 0x2001, 0x04fd, 0x2004, 0xa082,
-        0x0005, 0x00c8, 0x1b22, 0x2009, 0x0022, 0x2104, 0xa084, 0x4000,
-        0x00c0, 0x1b14, 0x7010, 0xa084, 0xf000, 0x0040, 0x1b2b, 0x7007,
-        0x0008, 0x0078, 0x1b2f, 0x7108, 0x8103, 0x00c8, 0x1b14, 0x7007,
-        0x0002, 0xa184, 0x01e0, 0x7003, 0x0000, 0x007c, 0x2001, 0x04fd,
-        0x2004, 0xa082, 0x0004, 0x00c8, 0x1b3f, 0x0078, 0x1b42, 0xa006,
-        0x0078, 0x1b44, 0xa085, 0x0001, 0x007c, 0x0e7e, 0x2071, 0x5000,
-        0x2d08, 0x7058, 0x6802, 0xa005, 0x00c0, 0x1b4f, 0x715e, 0x715a,
-        0x0e7f, 0x007c, 0x2c08, 0x7858, 0x6002, 0xa005, 0x00c0, 0x1b59,
-        0x795e, 0x795a, 0x007c, 0x2091, 0x8000, 0x6003, 0x0000, 0x2c08,
-        0x785c, 0xa065, 0x00c0, 0x1b67, 0x795a, 0x0078, 0x1b68, 0x6102,
-        0x795e, 0x2091, 0x8001, 0x1078, 0x21ce, 0x007c, 0x0e7e, 0x2071,
-        0x5000, 0x7058, 0xa06d, 0x0040, 0x1b7c, 0x6800, 0x705a, 0xa005,
-        0x00c0, 0x1b7b, 0x705e, 0x8dff, 0x0e7f, 0x007c, 0x0d7e, 0x0c7e,
-        0x0f7e, 0x2079, 0x5000, 0xaf80, 0x0016, 0x2060, 0x6000, 0xa005,
-        0x0040, 0x1bac, 0x2068, 0x6814, 0xa306, 0x00c0, 0x1b95, 0x6828,
-        0xa084, 0x00ff, 0xa406, 0x0040, 0x1b98, 0x2d60, 0x0078, 0x1b86,
-        0x6800, 0xa005, 0x6002, 0x00c0, 0x1ba4, 0xaf80, 0x0016, 0xac06,
-        0x0040, 0x1ba3, 0x2c00, 0x785e, 0x0d7e, 0x689c, 0xa005, 0x0040,
-        0x1bab, 0x1078, 0x1996, 0x007f, 0x0f7f, 0x0c7f, 0x0d7f, 0xa005,
-        0x007c, 0x0d7e, 0x0c7e, 0x0f7e, 0x2079, 0x5000, 0xaf80, 0x0016,
-        0x2060, 0x6000, 0xa005, 0x0040, 0x1bdb, 0x2068, 0x6814, 0xa084,
-        0x00ff, 0xa306, 0x0040, 0x1bc7, 0x2d60, 0x0078, 0x1bb9, 0x6800,
-        0xa005, 0x6002, 0x00c0, 0x1bd3, 0xaf80, 0x0016, 0xac06, 0x0040,
-        0x1bd2, 0x2c00, 0x785e, 0x0d7e, 0x689c, 0xa005, 0x0040, 0x1bda,
-        0x1078, 0x1996, 0x007f, 0x0f7f, 0x0c7f, 0x0d7f, 0xa005, 0x007c,
-        0x0d7e, 0x0c7e, 0x0f7e, 0x2079, 0x5000, 0xaf80, 0x0016, 0x2060,
-        0x6000, 0xa06d, 0x0040, 0x1c07, 0x6814, 0xa306, 0x0040, 0x1bf3,
-        0x2d60, 0x0078, 0x1be8, 0x6800, 0xa005, 0x6002, 0x00c0, 0x1bff,
-        0xaf80, 0x0016, 0xac06, 0x0040, 0x1bfe, 0x2c00, 0x785e, 0x0d7e,
-        0x689c, 0xa005, 0x0040, 0x1c06, 0x1078, 0x1996, 0x007f, 0x0f7f,
-        0x0c7f, 0x0d7f, 0xa005, 0x007c, 0x2091, 0x8000, 0x2069, 0x5040,
-        0x6800, 0xa086, 0x0000, 0x0040, 0x1c1a, 0x2091, 0x8001, 0x78e3,
-        0x0009, 0x007c, 0x6880, 0xa0bc, 0xff00, 0x2041, 0x0021, 0x2049,
-        0x0004, 0x2051, 0x0010, 0x1078, 0x1963, 0x8738, 0xa784, 0x001f,
-        0x00c0, 0x1c23, 0x2091, 0x8001, 0x2001, 0x800a, 0x0078, 0x1c3a,
-        0x2001, 0x800c, 0x0078, 0x1c3a, 0x1078, 0x1a0e, 0x2001, 0x800d,
-        0x0078, 0x1c3a, 0x70c2, 0x2061, 0x0000, 0x601b, 0x0001, 0x2091,
-        0x4080, 0x007c, 0x6004, 0x2c08, 0x2063, 0x0000, 0x7884, 0x8000,
-        0x7886, 0x7888, 0xa005, 0x798a, 0x0040, 0x1c51, 0x2c02, 0x0078,
-        0x1c52, 0x798e, 0x007c, 0x6807, 0x0103, 0x0c7e, 0x2061, 0x5000,
-        0x2d08, 0x206b, 0x0000, 0x6084, 0x8000, 0x6086, 0x6088, 0xa005,
-        0x618a, 0x0040, 0x1c66, 0x2d02, 0x0078, 0x1c67, 0x618e, 0x0c7f,
-        0x007c, 0x1078, 0x1c7a, 0x0040, 0x1c79, 0x0c7e, 0x609c, 0xa065,
-        0x0040, 0x1c74, 0x1078, 0x1996, 0x0c7f, 0x609f, 0x0000, 0x1078,
-        0x192b, 0x007c, 0x788c, 0xa065, 0x0040, 0x1c8c, 0x2091, 0x8000,
-        0x7884, 0x8001, 0x7886, 0x2c04, 0x788e, 0xa005, 0x00c0, 0x1c8a,
-        0x788a, 0x8000, 0x2091, 0x8001, 0x007c, 0x20a9, 0x0010, 0xa006,
-        0x8004, 0x8086, 0x818e, 0x00c8, 0x1c96, 0xa200, 0x0070, 0x1c9a,
-        0x0078, 0x1c91, 0x8086, 0x818e, 0x007c, 0x157e, 0x20a9, 0x0010,
-        0xa005, 0x0040, 0x1cc0, 0xa11a, 0x00c8, 0x1cc0, 0x8213, 0x818d,
-        0x0048, 0x1cb1, 0xa11a, 0x00c8, 0x1cb2, 0x0070, 0x1cb8, 0x0078,
-        0x1ca6, 0xa11a, 0x2308, 0x8210, 0x0070, 0x1cb8, 0x0078, 0x1ca6,
-        0x007e, 0x3200, 0xa084, 0xf7ff, 0x2080, 0x007f, 0x157f, 0x007c,
-        0x007e, 0x3200, 0xa085, 0x0800, 0x0078, 0x1cbc, 0x7994, 0x70d0,
-        0xa106, 0x0040, 0x1d34, 0x2091, 0x8000, 0x2071, 0x0020, 0x7004,
-        0xa005, 0x00c0, 0x1d34, 0x7008, 0x7208, 0xa206, 0x00c0, 0x1d34,
-        0xa286, 0x0008, 0x00c0, 0x1d34, 0x2071, 0x0010, 0x1078, 0x1911,
-        0x0040, 0x1d34, 0x7a9c, 0x7b98, 0x7ca4, 0x7da0, 0xa184, 0xff00,
-        0x0040, 0x1d02, 0x2031, 0x0000, 0x810b, 0x86b5, 0x810b, 0x86b5,
-        0x810b, 0x86b5, 0x810b, 0x86b5, 0x810b, 0x86b5, 0x810b, 0x86b5,
-        0x2100, 0xa210, 0x2600, 0xa319, 0xa4a1, 0x0000, 0xa5a9, 0x0000,
-        0x0078, 0x1d0c, 0x8107, 0x8004, 0x8004, 0xa210, 0xa399, 0x0000,
-        0xa4a1, 0x0000, 0xa5a9, 0x0000, 0x2009, 0x0020, 0x1078, 0x190c,
-        0x2091, 0x8001, 0x0040, 0x1d2b, 0x1078, 0x192b, 0x78a8, 0x8000,
-        0x78aa, 0xa086, 0x0002, 0x00c0, 0x1d34, 0x2091, 0x8000, 0x78e3,
-        0x0002, 0x78ab, 0x0000, 0x78cc, 0xa085, 0x0003, 0x78ce, 0x2091,
-        0x8001, 0x0078, 0x1d34, 0x78ab, 0x0000, 0x1078, 0x208b, 0x6004,
-        0xa084, 0x000f, 0x0079, 0x1d39, 0x2071, 0x0010, 0x2091, 0x8001,
-        0x007c, 0x1d49, 0x1d6b, 0x1d91, 0x1d49, 0x1dae, 0x1d58, 0x1f0d,
-        0x1f28, 0x1d49, 0x1d65, 0x1d8b, 0x1df6, 0x1e63, 0x1eb3, 0x1ec5,
-        0x1f24, 0x2039, 0x0400, 0x78dc, 0xa705, 0x78de, 0x6008, 0xa705,
-        0x600a, 0x1078, 0x1fa6, 0x609c, 0x78da, 0x1078, 0x2073, 0x007c,
-        0x78dc, 0xa084, 0x0100, 0x0040, 0x1d5f, 0x0078, 0x1d49, 0x601c,
-        0xa085, 0x0080, 0x601e, 0x0078, 0x1d72, 0x1078, 0x1b36, 0x00c0,
-        0x1d49, 0x1078, 0x20a5, 0x78dc, 0xa084, 0x0100, 0x0040, 0x1d72,
-        0x0078, 0x1d49, 0x78df, 0x0000, 0x6004, 0x8007, 0xa084, 0x00ff,
-        0x78d2, 0x8001, 0x609f, 0x0000, 0x0040, 0x1d88, 0x1078, 0x1fa6,
-        0x0040, 0x1d88, 0x78dc, 0xa085, 0x0100, 0x78de, 0x0078, 0x1d8a,
-        0x1078, 0x1fca, 0x007c, 0x1078, 0x1b36, 0x00c0, 0x1d49, 0x1078,
-        0x20a1, 0x78dc, 0xa08c, 0x0e00, 0x00c0, 0x1d9a, 0xa084, 0x0100,
-        0x00c0, 0x1d9c, 0x0078, 0x1d49, 0x1078, 0x1fa6, 0x00c0, 0x1dad,
-        0x6104, 0xa18c, 0x00ff, 0xa186, 0x0007, 0x0040, 0x1f63, 0xa186,
-        0x000f, 0x0040, 0x1f63, 0x1078, 0x1fca, 0x007c, 0x78dc, 0xa084,
-        0x0100, 0x0040, 0x1db5, 0x0078, 0x1d49, 0x78df, 0x0000, 0x6714,
-        0x2011, 0x0001, 0x20a9, 0x0001, 0x6018, 0xa084, 0x00ff, 0xa005,
-        0x0040, 0x1dd8, 0x2011, 0x0001, 0xa7bc, 0xff00, 0x20a9, 0x0020,
-        0xa08e, 0x0001, 0x0040, 0x1dd8, 0x2039, 0x0000, 0x2011, 0x0002,
-        0x20a9, 0x0100, 0xa08e, 0x0002, 0x0040, 0x1dd8, 0x0078, 0x1df3,
-        0x1078, 0x1956, 0x2091, 0x8000, 0x682b, 0x0000, 0x682f, 0x0000,
-        0x6808, 0xa084, 0xffde, 0x680a, 0xade8, 0x0010, 0x2091, 0x8001,
-        0x0070, 0x1dec, 0x0078, 0x1dda, 0x8211, 0x0040, 0x1df3, 0x20a9,
-        0x0100, 0x0078, 0x1dda, 0x1078, 0x192b, 0x007c, 0x2001, 0x5067,
-        0x2004, 0xa084, 0x8000, 0x0040, 0x1f8b, 0x6114, 0x1078, 0x20c2,
-        0x6900, 0xa184, 0x0001, 0x0040, 0x1e17, 0x6028, 0xa084, 0x00ff,
-        0x00c0, 0x1f83, 0x6800, 0xa084, 0x0001, 0x0040, 0x1f8b, 0x6803,
-        0x0000, 0x680b, 0x0000, 0x6807, 0x0000, 0x0078, 0x1f93, 0x2011,
-        0x0001, 0x6020, 0xa084, 0x4000, 0x0040, 0x1e20, 0xa295, 0x0002,
-        0x6020, 0xa084, 0x0100, 0x0040, 0x1e27, 0xa295, 0x0008, 0x601c,
-        0xa084, 0x0002, 0x0040, 0x1e2e, 0xa295, 0x0004, 0x602c, 0xa08c,
-        0x00ff, 0xa182, 0x0002, 0x0048, 0x1f8f, 0xa182, 0x001b, 0x00c8,
-        0x1f8f, 0x0040, 0x1f8f, 0x690e, 0x602c, 0x8007, 0xa08c, 0x00ff,
-        0xa182, 0x0002, 0x0048, 0x1f8f, 0xa182, 0x001b, 0x00c8, 0x1f8f,
-        0x0040, 0x1f8f, 0x6912, 0x6030, 0xa005, 0x00c0, 0x1e51, 0x2001,
-        0x001e, 0x8000, 0x6816, 0x6028, 0xa084, 0x00ff, 0x0040, 0x1f8b,
-        0x6806, 0x6028, 0x8007, 0xa084, 0x00ff, 0x0040, 0x1f8b, 0x680a,
-        0x6a02, 0x0078, 0x1f93, 0x2001, 0x5067, 0x2004, 0xa084, 0x8000,
-        0x0040, 0x1f8b, 0x6114, 0x1078, 0x20c2, 0x2091, 0x8000, 0x6a04,
-        0x6b08, 0x6418, 0xa484, 0x0003, 0x0040, 0x1e89, 0x6128, 0xa18c,
-        0x00ff, 0x8001, 0x00c0, 0x1e82, 0x2100, 0xa210, 0x0048, 0x1eaf,
-        0x0078, 0x1e89, 0x8001, 0x00c0, 0x1eaf, 0x2100, 0xa212, 0x0048,
-        0x1eaf, 0xa484, 0x000c, 0x0040, 0x1ea3, 0x6128, 0x810f, 0xa18c,
-        0x00ff, 0xa082, 0x0004, 0x00c0, 0x1e9b, 0x2100, 0xa318, 0x0048,
-        0x1eaf, 0x0078, 0x1ea3, 0xa082, 0x0004, 0x00c0, 0x1eaf, 0x2100,
-        0xa31a, 0x0048, 0x1eaf, 0x6030, 0xa005, 0x0040, 0x1ea9, 0x8000,
-        0x6816, 0x6a06, 0x6b0a, 0x2091, 0x8001, 0x0078, 0x1f93, 0x2091,
-        0x8001, 0x0078, 0x1f8f, 0x6114, 0x1078, 0x20c2, 0x2091, 0x8000,
-        0x6b08, 0x8318, 0x0048, 0x1ec1, 0x6b0a, 0x2091, 0x8001, 0x0078,
-        0x1fa2, 0x2091, 0x8001, 0x0078, 0x1f8f, 0x6024, 0x8007, 0xa084,
-        0x00ff, 0x0040, 0x1ee3, 0xa086, 0x0080, 0x00c0, 0x1f0b, 0x20a9,
-        0x0008, 0x2069, 0x7410, 0x2091, 0x8000, 0x6800, 0xa084, 0xfcff,
-        0x6802, 0xade8, 0x0008, 0x0070, 0x1edf, 0x0078, 0x1ed5, 0x2091,
-        0x8001, 0x0078, 0x1f93, 0x6028, 0xa015, 0x0040, 0x1f0b, 0x6114,
-        0x1078, 0x20c2, 0x0d7e, 0xade8, 0x0007, 0x2091, 0x8000, 0x6800,
-        0xa00d, 0x0040, 0x1f08, 0xa206, 0x0040, 0x1ef9, 0x2168, 0x0078,
-        0x1eef, 0x0c7e, 0x2160, 0x6000, 0x6802, 0x1078, 0x192b, 0x0c7f,
-        0x0d7f, 0x6808, 0x8000, 0x680a, 0x2091, 0x8001, 0x0078, 0x1fa2,
-        0x2091, 0x8001, 0x0d7f, 0x0078, 0x1f8b, 0x6114, 0x1078, 0x20c2,
-        0x6800, 0xa084, 0x0001, 0x0040, 0x1f7b, 0x2091, 0x8000, 0x6a04,
-        0x8210, 0x0048, 0x1f20, 0x6a06, 0x2091, 0x8001, 0x0078, 0x1fa2,
-        0x2091, 0x8001, 0x0078, 0x1f8f, 0x1078, 0x1b36, 0x00c0, 0x1d49,
-        0x6114, 0x1078, 0x20c2, 0x60be, 0x6900, 0xa184, 0x0008, 0x0040,
-        0x1f35, 0x6020, 0xa085, 0x0100, 0x6022, 0xa184, 0x0001, 0x0040,
-        0x1f8b, 0xa184, 0x0100, 0x00c0, 0x1f77, 0xa184, 0x0200, 0x00c0,
-        0x1f73, 0x681c, 0xa005, 0x00c0, 0x1f7f, 0x6004, 0xa084, 0x00ff,
-        0xa086, 0x000f, 0x00c0, 0x1f4e, 0x1078, 0x20a5, 0x78df, 0x0000,
-        0x6004, 0x8007, 0xa084, 0x00ff, 0x78d2, 0x8001, 0x609f, 0x0000,
-        0x0040, 0x1f63, 0x1078, 0x1fa6, 0x0040, 0x1f63, 0x78dc, 0xa085,
-        0x0100, 0x78de, 0x007c, 0x78d7, 0x0000, 0x78db, 0x0000, 0x6024,
-        0xa084, 0xff00, 0x6026, 0x1078, 0x39aa, 0x0040, 0x1cc6, 0x1078,
-        0x1b5b, 0x0078, 0x1cc6, 0x2009, 0x0017, 0x0078, 0x1f95, 0x2009,
-        0x000e, 0x0078, 0x1f95, 0x2009, 0x0007, 0x0078, 0x1f95, 0x2009,
-        0x0035, 0x0078, 0x1f95, 0x2009, 0x003e, 0x0078, 0x1f95, 0x2009,
-        0x0004, 0x0078, 0x1f95, 0x2009, 0x0006, 0x0078, 0x1f95, 0x2009,
-        0x0016, 0x0078, 0x1f95, 0x2009, 0x0001, 0x6024, 0xa084, 0xff00,
-        0xa105, 0x6026, 0x2091, 0x8000, 0x1078, 0x1c42, 0x2091, 0x8001,
-        0x0078, 0x1cc6, 0x1078, 0x192b, 0x0078, 0x1cc6, 0x78d4, 0xa06d,
-        0x00c0, 0x1fb1, 0x2c00, 0x78d6, 0x78da, 0x609f, 0x0000, 0x0078,
-        0x1fbd, 0x2c00, 0x689e, 0x609f, 0x0000, 0x78d6, 0x2d00, 0x6002,
-        0x78d8, 0xad06, 0x00c0, 0x1fbd, 0x6002, 0x78d0, 0x8001, 0x78d2,
-        0x00c0, 0x1fc9, 0x78dc, 0xa084, 0xfeff, 0x78de, 0x78d8, 0x2060,
-        0xa006, 0x007c, 0xa02e, 0x2530, 0x611c, 0x61a2, 0xa184, 0xe1ff,
-        0x601e, 0xa184, 0x0060, 0x0040, 0x1fd9, 0x0e7e, 0x1078, 0x467f,
-        0x0e7f, 0x6596, 0x65a6, 0x669a, 0x66aa, 0x60af, 0x0000, 0x60b3,
-        0x0000, 0x6714, 0x1078, 0x1956, 0x2091, 0x8000, 0x60a0, 0xa084,
-        0x8000, 0x00c0, 0x2000, 0x6808, 0xa084, 0x0001, 0x0040, 0x2000,
-        0x2091, 0x8001, 0x1078, 0x19a3, 0x2091, 0x8000, 0x1078, 0x1c42,
-        0x2091, 0x8001, 0x78d7, 0x0000, 0x78db, 0x0000, 0x0078, 0x2072,
-        0x6024, 0xa096, 0x0001, 0x00c0, 0x2007, 0x8000, 0x6026, 0x6a10,
-        0x6814, 0x2091, 0x8001, 0xa202, 0x0048, 0x2016, 0x0040, 0x2016,
-        0x2039, 0x0200, 0x1078, 0x2073, 0x0078, 0x2072, 0x2c08, 0x2091,
-        0x8000, 0x60a0, 0xa084, 0x8000, 0x0040, 0x2043, 0x6800, 0xa065,
-        0x0040, 0x2048, 0x6a04, 0x0e7e, 0x2071, 0x5040, 0x7000, 0xa084,
-        0x0001, 0x0040, 0x203d, 0x7048, 0xa206, 0x00c0, 0x203d, 0x6b04,
-        0x231c, 0x2160, 0x6302, 0x2300, 0xa005, 0x00c0, 0x2038, 0x6902,
-        0x2260, 0x6102, 0x0e7f, 0x0078, 0x204f, 0x2160, 0x6202, 0x6906,
-        0x0e7f, 0x0078, 0x204f, 0x6800, 0xa065, 0x0040, 0x2048, 0x6102,
-        0x6902, 0x00c0, 0x204c, 0x6906, 0x2160, 0x6003, 0x0000, 0x2160,
-        0x60a0, 0xa084, 0x8000, 0x0040, 0x2059, 0x6808, 0xa084, 0xfffc,
-        0x680a, 0x6810, 0x8000, 0x6812, 0x2091, 0x8001, 0x6808, 0xa08c,
-        0x0040, 0x0040, 0x2068, 0xa086, 0x0040, 0x680a, 0x1078, 0x19b4,
-        0x2091, 0x8000, 0x1078, 0x21b1, 0x2091, 0x8001, 0x78db, 0x0000,
-        0x78d7, 0x0000, 0x007c, 0x6008, 0xa705, 0x600a, 0x2091, 0x8000,
-        0x1078, 0x1c42, 0x2091, 0x8001, 0x78d8, 0xa065, 0x0040, 0x2086,
-        0x609c, 0x78da, 0x609f, 0x0000, 0x0078, 0x2076, 0x78d7, 0x0000,
-        0x78db, 0x0000, 0x007c, 0x7990, 0x7894, 0x8000, 0xa10a, 0x00c8,
-        0x2092, 0xa006, 0x7896, 0x70d2, 0x7804, 0xa005, 0x0040, 0x20a0,
-        0x8001, 0x7806, 0x00c0, 0x20a0, 0x0068, 0x20a0, 0x2091, 0x4080,
-        0x007c, 0x2039, 0x20b9, 0x0078, 0x20a7, 0x2039, 0x20bf, 0x2704,
-        0xa005, 0x0040, 0x20b8, 0xac00, 0x2068, 0x6b08, 0x6c0c, 0x6910,
-        0x6a14, 0x690a, 0x6a0e, 0x6b12, 0x6c16, 0x8738, 0x0078, 0x20a7,
-        0x007c, 0x0003, 0x0009, 0x000f, 0x0015, 0x001b, 0x0000, 0x0015,
-        0x001b, 0x0000, 0x0c7e, 0x1078, 0x3b33, 0x2c68, 0x0c7f, 0x007c,
-        0x0010, 0x2139, 0x0068, 0x2139, 0x2029, 0x0000, 0x78cb, 0x0000,
-        0x788c, 0xa065, 0x0040, 0x2132, 0x2009, 0x5074, 0x2104, 0xa084,
-        0x0001, 0x0040, 0x2100, 0x6004, 0xa086, 0x0103, 0x00c0, 0x2100,
-        0x6018, 0xa005, 0x00c0, 0x2100, 0x6014, 0xa005, 0x00c0, 0x2100,
-        0x0d7e, 0x2069, 0x0000, 0x6818, 0xa084, 0x0001, 0x00c0, 0x20ff,
-        0x600c, 0x70c6, 0x6010, 0x70ca, 0x70c3, 0x8020, 0x681b, 0x0001,
-        0x2091, 0x4080, 0x0d7f, 0x1078, 0x1c69, 0x0078, 0x2137, 0x0d7f,
-        0x1078, 0x213a, 0x0040, 0x2132, 0x6204, 0xa294, 0x00ff, 0xa296,
-        0x0003, 0x0040, 0x2112, 0x6204, 0xa296, 0x0110, 0x00c0, 0x2120,
-        0x78cb, 0x0001, 0x6204, 0xa294, 0xff00, 0x8217, 0x8211, 0x0040,
-        0x2120, 0x85ff, 0x00c0, 0x2132, 0x8210, 0xa202, 0x00c8, 0x2132,
-        0x057e, 0x1078, 0x2149, 0x057f, 0x0040, 0x212d, 0x78e0, 0xa086,
-        0x0003, 0x0040, 0x2132, 0x0078, 0x2120, 0x8528, 0x78c8, 0xa005,
-        0x0040, 0x20d0, 0x85ff, 0x0040, 0x2139, 0x2091, 0x4080, 0x78b0,
-        0x70d6, 0x007c, 0x7bac, 0x79b0, 0x70d4, 0xa102, 0x00c0, 0x2143,
-        0x2300, 0xa005, 0x007c, 0x0048, 0x2147, 0xa302, 0x007c, 0x8002,
-        0x007c, 0x2001, 0x04fd, 0x2004, 0xa082, 0x0005, 0x00c8, 0x2163,
-        0x2091, 0x8000, 0x2071, 0x0020, 0x7004, 0xa005, 0x00c0, 0x2198,
-        0x7008, 0x7208, 0xa206, 0x00c0, 0x2198, 0xa286, 0x0008, 0x00c0,
-        0x2198, 0x2071, 0x0010, 0x1078, 0x219d, 0x2009, 0x0020, 0x6004,
-        0xa086, 0x0103, 0x00c0, 0x2172, 0x6028, 0xa005, 0x00c0, 0x2172,
-        0x2009, 0x000c, 0x1078, 0x1907, 0x0040, 0x218b, 0x78c4, 0x8000,
-        0x78c6, 0xa086, 0x0002, 0x00c0, 0x2198, 0x2091, 0x8000, 0x78e3,
-        0x0003, 0x78c7, 0x0000, 0x78cc, 0xa085, 0x0300, 0x78ce, 0x2091,
-        0x8001, 0x0078, 0x2198, 0x78c7, 0x0000, 0x1078, 0x1c69, 0x79ac,
-        0x78b0, 0x8000, 0xa10a, 0x00c8, 0x2196, 0xa006, 0x78b2, 0xa006,
-        0x2071, 0x0010, 0x2091, 0x8001, 0x007c, 0x8107, 0x8004, 0x8004,
-        0x7ab8, 0x7bb4, 0x7cc0, 0x7dbc, 0xa210, 0xa399, 0x0000, 0xa4a1,
-        0x0000, 0xa5a9, 0x0000, 0x007c, 0x2009, 0x505b, 0x2091, 0x8000,
-        0x200a, 0x0f7e, 0x0e7e, 0x2071, 0x5040, 0x7000, 0xa086, 0x0000,
-        0x00c0, 0x21cb, 0x2009, 0x5012, 0x2104, 0xa005, 0x00c0, 0x21cb,
-        0x2079, 0x0100, 0x7830, 0xa084, 0x00c0, 0x00c0, 0x21cb, 0x0018,
-        0x21cb, 0x781b, 0x004b, 0x0e7f, 0x0f7f, 0x007c, 0x0f7e, 0x0e7e,
-        0x2071, 0x5040, 0x2091, 0x8000, 0x7000, 0xa086, 0x0000, 0x00c0,
-        0x21e4, 0x2079, 0x0100, 0x7830, 0xa084, 0x00c0, 0x00c0, 0x21e4,
-        0x0018, 0x21e4, 0x781b, 0x004d, 0x2091, 0x8001, 0x0e7f, 0x0f7f,
-        0x007c, 0x127e, 0x2091, 0x2300, 0x2071, 0x5040, 0x2079, 0x0100,
-        0x784b, 0x000f, 0x0098, 0x21f7, 0x7838, 0x0078, 0x21f0, 0x20a9,
-        0x0040, 0x7800, 0xa082, 0x0004, 0x0048, 0x2200, 0x20a9, 0x0060,
-        0x789b, 0x0000, 0x78af, 0x0000, 0x78af, 0x0000, 0x0070, 0x220a,
-        0x0078, 0x2202, 0x7800, 0xa082, 0x0004, 0x0048, 0x2219, 0x70b7,
-        0x009b, 0x2019, 0x4da4, 0x1078, 0x2255, 0x702f, 0x8001, 0x0078,
-        0x2225, 0x70b7, 0x0000, 0x2019, 0x4c1c, 0x1078, 0x2255, 0x2019,
-        0x4c5b, 0x1078, 0x2255, 0x702f, 0x8000, 0x7003, 0x0000, 0x1078,
-        0x235e, 0x7004, 0xa084, 0x000f, 0x017e, 0x2009, 0x04fd, 0x210c,
-        0xa18a, 0x0005, 0x0048, 0x223a, 0x0038, 0x2240, 0xa085, 0x6280,
-        0x0078, 0x2242, 0x0028, 0x2240, 0xa085, 0x6280, 0x0078, 0x2242,
-        0xa085, 0x62c0, 0x017f, 0x7806, 0x780f, 0xb204, 0x7843, 0x00d8,
-        0x7853, 0x0080, 0x780b, 0x0008, 0x7047, 0x0008, 0x7053, 0x507f,
-        0x704f, 0x0000, 0x127f, 0x2000, 0x007c, 0x137e, 0x147e, 0x157e,
-        0x047e, 0x20a1, 0x012b, 0x2304, 0xa005, 0x789a, 0x0040, 0x2275,
-        0x8318, 0x2324, 0x8318, 0x2398, 0x24a8, 0xa484, 0xff00, 0x0040,
-        0x226d, 0xa482, 0x0100, 0x20a9, 0x0100, 0x2020, 0x53a6, 0xa005,
-        0x00c0, 0x2264, 0x3318, 0x0078, 0x225b, 0x047f, 0x157f, 0x147f,
-        0x137f, 0x007c, 0xa18c, 0x000f, 0x2011, 0x0101, 0x2204, 0xa084,
-        0xfff0, 0xa105, 0x2012, 0x1078, 0x235e, 0x007c, 0x2011, 0x0101,
-        0x20a9, 0x0009, 0x810b, 0x0070, 0x228f, 0x0078, 0x228a, 0xa18c,
-        0x0e00, 0x2204, 0xa084, 0xf1ff, 0xa105, 0x2012, 0x007c, 0x2009,
-        0x0101, 0x20a9, 0x0005, 0x8213, 0x0070, 0x22a0, 0x0078, 0x229b,
-        0xa294, 0x00e0, 0x2104, 0xa084, 0xff1f, 0xa205, 0x200a, 0x007c,
-        0x2011, 0x0101, 0x20a9, 0x000c, 0x810b, 0x0070, 0x22b1, 0x0078,
-        0x22ac, 0xa18c, 0xf000, 0x2204, 0xa084, 0x0fff, 0xa105, 0x2012,
-        0x007c, 0x2011, 0x0102, 0x2204, 0xa084, 0xffcf, 0xa105, 0x2012,
-        0x007c, 0x8103, 0x8003, 0xa080, 0x0020, 0x0c7e, 0x2061, 0x0100,
-        0x609a, 0x62ac, 0x63ac, 0x0c7f, 0x007c, 0x8103, 0x8003, 0xa080,
-        0x0022, 0x0c7e, 0x2061, 0x0100, 0x609a, 0x60a4, 0xa084, 0xffdf,
-        0x60ae, 0x0c7f, 0x007c, 0x8103, 0x8003, 0xa080, 0x0022, 0x0c7e,
-        0x2061, 0x0100, 0x609a, 0x60a4, 0xa085, 0x0020, 0x60ae, 0x0c7f,
-        0x007c, 0x8103, 0x8003, 0xa080, 0x0020, 0x0c7e, 0x2061, 0x0100,
-        0x609a, 0x60a4, 0x62ae, 0x2010, 0x60a4, 0x63ae, 0x2018, 0x0c7f,
-        0x007c, 0x2091, 0x8000, 0x0c7e, 0x0e7e, 0x6818, 0xa005, 0x0040,
-        0x233c, 0x2061, 0x7400, 0x1078, 0x2344, 0x0040, 0x2328, 0x20a9,
-        0x0000, 0x2061, 0x7300, 0x0c7e, 0x1078, 0x2344, 0x0040, 0x2318,
-        0x0c7f, 0x8c60, 0x0070, 0x2316, 0x0078, 0x230b, 0x0078, 0x233c,
-        0x007f, 0xa082, 0x7300, 0x2071, 0x5040, 0x7086, 0x7182, 0x2001,
-        0x0004, 0x706e, 0x7093, 0x000f, 0x1078, 0x21ac, 0x0078, 0x2338,
-        0x60c0, 0xa005, 0x00c0, 0x233c, 0x2071, 0x5040, 0x7182, 0x2c00,
-        0x708a, 0x2001, 0x0006, 0x706e, 0x7093, 0x000f, 0x1078, 0x21ac,
-        0x2001, 0x0000, 0x0078, 0x233e, 0x2001, 0x0001, 0x2091, 0x8001,
-        0xa005, 0x0e7f, 0x0c7f, 0x007c, 0x2c04, 0xa005, 0x0040, 0x235b,
-        0x2060, 0x600c, 0xa306, 0x00c0, 0x2358, 0x6010, 0xa206, 0x00c0,
-        0x2358, 0x6014, 0xa106, 0x00c0, 0x2358, 0xa006, 0x0078, 0x235d,
-        0x6000, 0x0078, 0x2345, 0xa085, 0x0001, 0x007c, 0x2011, 0x5041,
-        0x220c, 0xa18c, 0x000f, 0x2011, 0x013b, 0x2204, 0xa084, 0x0100,
-        0x0040, 0x2374, 0x2021, 0xff04, 0x2122, 0x810b, 0x810b, 0x810b,
-        0x810b, 0xa18d, 0x0f00, 0x2104, 0x007c, 0x0e7e, 0x68e4, 0xa08c,
-        0x0020, 0x0040, 0x23c8, 0xa084, 0x0006, 0x00c0, 0x23c8, 0x6014,
-        0x8007, 0xa084, 0x000f, 0x8003, 0x8003, 0x8003, 0xa0f0, 0x5280,
-        0x7004, 0xa084, 0x000a, 0x00c0, 0x23c8, 0x7108, 0xa194, 0xff00,
-        0x0040, 0x23c8, 0xa18c, 0x00ff, 0x2001, 0x000c, 0xa106, 0x0040,
-        0x23af, 0x2001, 0x0012, 0xa106, 0x0040, 0x23b3, 0x2001, 0x0014,
-        0xa106, 0x0040, 0x23b7, 0x2001, 0x0019, 0xa106, 0x0040, 0x23bb,
-        0x2001, 0x0032, 0xa106, 0x0040, 0x23bf, 0x0078, 0x23c3, 0x2009,
-        0x0012, 0x0078, 0x23c5, 0x2009, 0x0014, 0x0078, 0x23c5, 0x2009,
-        0x0019, 0x0078, 0x23c5, 0x2009, 0x0020, 0x0078, 0x23c5, 0x2009,
-        0x003f, 0x0078, 0x23c5, 0x2011, 0x0000, 0x2100, 0xa205, 0x700a,
-        0x0e7f, 0x007c, 0x0068, 0x23ca, 0x2091, 0x8000, 0x2071, 0x0000,
-        0x007e, 0x7018, 0xa084, 0x0001, 0x00c0, 0x23d1, 0x007f, 0x2071,
-        0x0010, 0x70ca, 0x007f, 0x70c6, 0x70c3, 0x8002, 0x70db, 0x073f,
-        0x70df, 0x0000, 0x2071, 0x0000, 0x701b, 0x0001, 0x2091, 0x4080,
-        0x0078, 0x23e8, 0x107e, 0x007e, 0x127e, 0x2091, 0x2300, 0x7f3c,
-        0x7e58, 0x7c30, 0x7d38, 0x77c2, 0x74c6, 0x76ca, 0x75ce, 0xa594,
-        0x003f, 0xa49c, 0x0003, 0xa484, 0x000f, 0x0079, 0x23ff, 0x2411,
-        0x2411, 0x2411, 0x274b, 0x3907, 0x240f, 0x2440, 0x244a, 0x240f,
-        0x240f, 0x240f, 0x240f, 0x240f, 0x240f, 0x240f, 0x240f, 0x1078,
-        0x23ca, 0x8507, 0xa084, 0x001f, 0x0079, 0x2416, 0x2454, 0x274b,
-        0x2905, 0x2a02, 0x2a2a, 0x2cc3, 0x2f6e, 0x2fb1, 0x2ffc, 0x3081,
-        0x3139, 0x31e2, 0x2440, 0x2827, 0x2f43, 0x2436, 0x3c78, 0x3c98,
-        0x3e5e, 0x3e6a, 0x3f3f, 0x2436, 0x2436, 0x4012, 0x4016, 0x3c76,
-        0x2436, 0x3dc9, 0x2436, 0x3b56, 0x244a, 0x2436, 0x1078, 0x23ca,
-        0x0018, 0x23ef, 0x127f, 0x2091, 0x8001, 0x007f, 0x107f, 0x007c,
-        0x2019, 0x4cfd, 0x1078, 0x2255, 0x702f, 0x0001, 0x781b, 0x004f,
-        0x0078, 0x2438, 0x2019, 0x4c5b, 0x1078, 0x2255, 0x702f, 0x8000,
-        0x781b, 0x00d5, 0x0078, 0x2438, 0x7242, 0x2009, 0x500f, 0x200b,
-        0x0000, 0xa584, 0x0001, 0x00c0, 0x3b6a, 0x0040, 0x2471, 0x1078,
-        0x23ca, 0x7003, 0x0000, 0x704b, 0x0000, 0x7043, 0x0000, 0x7037,
-        0x0000, 0x1078, 0x38de, 0x0018, 0x23ef, 0x2009, 0x500f, 0x200b,
-        0x0000, 0x7068, 0xa005, 0x00c0, 0x253c, 0x706c, 0xa084, 0x0007,
-        0x0079, 0x247a, 0x2573, 0x2482, 0x248e, 0x24ab, 0x24cd, 0x251a,
-        0x24f3, 0x2482, 0x1078, 0x38c6, 0x2009, 0x0048, 0x1078, 0x2e0f,
-        0x00c0, 0x248c, 0x7003, 0x0004, 0x0078, 0x2438, 0x1078, 0x38c6,
-        0x00c0, 0x24a9, 0x7080, 0x8007, 0x7882, 0x789b, 0x0010, 0x78ab,
-        0x000c, 0x789b, 0x0060, 0x78ab, 0x0001, 0x785b, 0x0004, 0x2009,
-        0x00e5, 0x1078, 0x2e03, 0x00c0, 0x24a9, 0x7003, 0x0004, 0x7093,
-        0x000f, 0x0078, 0x2438, 0x1078, 0x38c6, 0x00c0, 0x24cb, 0x7180,
-        0x8107, 0x7882, 0x789b, 0x0010, 0xa18c, 0x001f, 0xa18d, 0x00c0,
-        0x79aa, 0x78ab, 0x0006, 0x789b, 0x0060, 0x78ab, 0x0002, 0x785b,
-        0x0004, 0x2009, 0x00e5, 0x1078, 0x2e03, 0x00c0, 0x24cb, 0x7003,
-        0x0004, 0x7093, 0x000f, 0x0078, 0x2438, 0x1078, 0x38c6, 0x00c0,
-        0x24f1, 0x7180, 0x8107, 0x7882, 0x789b, 0x0010, 0xa18c, 0x001f,
-        0xa18d, 0x00c0, 0x79aa, 0x78ab, 0x0020, 0x7184, 0x79aa, 0x78ab,
-        0x000d, 0x789b, 0x0060, 0x78ab, 0x0004, 0x785b, 0x0004, 0x2009,
-        0x00e5, 0x1078, 0x2e03, 0x00c0, 0x24f1, 0x7003, 0x0004, 0x7093,
-        0x000f, 0x0078, 0x2438, 0x1078, 0x38c6, 0x00c0, 0x2518, 0x7180,
-        0x8107, 0x7882, 0x789b, 0x0010, 0xa18c, 0x001f, 0xa18d, 0x00c0,
-        0x79aa, 0x78ab, 0x0006, 0x789b, 0x0060, 0x78ab, 0x0002, 0x785b,
-        0x0004, 0x2009, 0x00e5, 0x1078, 0x2e03, 0x00c0, 0x2518, 0x7088,
-        0x708b, 0x0000, 0x2068, 0x704a, 0x7003, 0x0002, 0x7093, 0x000f,
-        0x0078, 0x2438, 0x1078, 0x38c6, 0x00c0, 0x2438, 0x7088, 0x2068,
-        0x6f14, 0x1078, 0x37bd, 0x2c50, 0x1078, 0x3978, 0x789b, 0x0010,
-        0x6814, 0xa084, 0x001f, 0xa085, 0x0080, 0x78aa, 0x6e1c, 0x2041,
-        0x0001, 0x708c, 0xa084, 0x0400, 0x2001, 0x0004, 0x0040, 0x253a,
-        0x2001, 0x0006, 0x0078, 0x265b, 0x1078, 0x38c6, 0x00c0, 0x2438,
-        0x789b, 0x0010, 0x7068, 0x2068, 0x6f14, 0x1078, 0x37bd, 0x2c50,
-        0x1078, 0x3978, 0x6008, 0xa085, 0x0010, 0x600a, 0x6824, 0xa005,
-        0x0040, 0x255a, 0xa082, 0x0006, 0x0048, 0x2558, 0x0078, 0x255a,
-        0x6827, 0x0005, 0x6b14, 0xa39c, 0x001f, 0xa39d, 0x00c0, 0x7058,
-        0xa084, 0x8000, 0x0040, 0x2568, 0xa684, 0x0001, 0x0040, 0x256a,
-        0xa39c, 0xffbf, 0x7baa, 0x2031, 0x0020, 0x2041, 0x0001, 0x2001,
-        0x0003, 0x0078, 0x265b, 0x0018, 0x23ef, 0x744c, 0xa485, 0x0000,
-        0x0040, 0x258d, 0xa080, 0x5080, 0x2030, 0x7150, 0x8108, 0xa12a,
-        0x0048, 0x2584, 0x2009, 0x5080, 0x2164, 0x6504, 0x85ff, 0x00c0,
-        0x259e, 0x8421, 0x00c0, 0x257e, 0x7152, 0x7003, 0x0000, 0x704b,
-        0x0000, 0x7040, 0xa005, 0x0040, 0x3b6a, 0x0078, 0x2438, 0x764c,
-        0xa6b0, 0x5080, 0x7150, 0x2600, 0x0078, 0x2589, 0x7152, 0x2568,
-        0x2558, 0x754a, 0x2c50, 0x6034, 0xa085, 0x0000, 0x00c0, 0x259b,
-        0x6708, 0x773a, 0xa784, 0x033f, 0x0040, 0x25d4, 0xa784, 0x0021,
-        0x00c0, 0x259b, 0xa784, 0x0002, 0x0040, 0x25bd, 0xa784, 0x0004,
-        0x0040, 0x259b, 0xa7bc, 0xfffb, 0x670a, 0xa784, 0x0008, 0x00c0,
-        0x259b, 0xa784, 0x0010, 0x00c0, 0x259b, 0xa784, 0x0200, 0x00c0,
-        0x259b, 0xa784, 0x0100, 0x0040, 0x25d4, 0x6018, 0xa005, 0x00c0,
-        0x259b, 0xa7bc, 0xfeff, 0x670a, 0x6823, 0x0000, 0x6e1c, 0xa684,
-        0x000e, 0x6118, 0x0040, 0x25e4, 0x601c, 0xa102, 0x0048, 0x25e7,
-        0x0040, 0x25e7, 0x0078, 0x2597, 0x81ff, 0x00c0, 0x2597, 0x68c3,
-        0x0000, 0xa784, 0x0080, 0x00c0, 0x25ef, 0x700c, 0x6022, 0xa7bc,
-        0xff7f, 0x670a, 0x1078, 0x3978, 0x0018, 0x23ef, 0x789b, 0x0010,
-        0xa046, 0x1078, 0x38c6, 0x00c0, 0x2438, 0x6b14, 0xa39c, 0x001f,
-        0xa39d, 0x00c0, 0x7058, 0xa084, 0x8000, 0x0040, 0x260b, 0xa684,
-        0x0001, 0x0040, 0x260d, 0xa39c, 0xffbf, 0xa684, 0x0010, 0x0040,
-        0x2613, 0xa39d, 0x0020, 0x7baa, 0x8840, 0xa684, 0x000e, 0x00c0,
-        0x261e, 0xa7bd, 0x0010, 0x670a, 0x0078, 0x2659, 0x7158, 0xa18c,
-        0x0800, 0x0040, 0x33d7, 0x2011, 0x0020, 0xa684, 0x0008, 0x00c0,
-        0x262f, 0x8210, 0xa684, 0x0002, 0x00c0, 0x262f, 0x8210, 0x7aaa,
-        0x8840, 0x1078, 0x38de, 0x6a14, 0x610c, 0x8108, 0xa18c, 0x00ff,
-        0xa1e0, 0x7300, 0x2c64, 0x8cff, 0x0040, 0x2650, 0x6014, 0xa206,
-        0x00c0, 0x263a, 0x60b8, 0x8001, 0x60ba, 0x00c0, 0x2635, 0x0c7e,
-        0x2a60, 0x6008, 0xa085, 0x0100, 0x600a, 0x0c7f, 0x0078, 0x2573,
-        0x1078, 0x38c6, 0x00c0, 0x2438, 0x2a60, 0x610e, 0x79aa, 0x8840,
-        0x7132, 0x2001, 0x0001, 0x007e, 0x715c, 0xa184, 0x0018, 0x0040,
-        0x2676, 0xa184, 0x0010, 0x0040, 0x2669, 0x1078, 0x35d6, 0x00c0,
-        0x2699, 0xa184, 0x0008, 0x0040, 0x2676, 0x69a0, 0xa184, 0x0600,
-        0x00c0, 0x2676, 0x1078, 0x34c7, 0x0078, 0x2699, 0x69a0, 0xa184,
-        0x0800, 0x0040, 0x268d, 0x0c7e, 0x027e, 0x2960, 0x6000, 0xa085,
-        0x2000, 0x6002, 0x6104, 0xa18d, 0x0010, 0x6106, 0x027f, 0x0c7f,
-        0x1078, 0x35d6, 0x00c0, 0x2699, 0x69a0, 0xa184, 0x0200, 0x0040,
-        0x2695, 0x1078, 0x3516, 0x0078, 0x2699, 0xa184, 0x0400, 0x00c0,
-        0x2672, 0x69a0, 0xa184, 0x1000, 0x0040, 0x26a4, 0x6914, 0xa18c,
-        0xff00, 0x810f, 0x1078, 0x22cd, 0x007f, 0x7002, 0xa68c, 0x00e0,
-        0xa684, 0x0060, 0x0040, 0x26b2, 0xa086, 0x0060, 0x00c0, 0x26b2,
-        0xa18d, 0x4000, 0x88ff, 0x0040, 0x26b7, 0xa18d, 0x0004, 0x795a,
-        0x69b6, 0x789b, 0x0060, 0x2800, 0x78aa, 0x789b, 0x0061, 0x6818,
-        0xa08d, 0x8000, 0xa084, 0x7fff, 0x691a, 0xa68c, 0x0080, 0x0040,
-        0x26d6, 0x7097, 0x0000, 0xa08a, 0x000d, 0x0050, 0x26d4, 0xa08a,
-        0x000c, 0x7196, 0x2001, 0x000c, 0x800c, 0x719a, 0x78aa, 0x8008,
-        0x810c, 0x0040, 0x33dd, 0xa18c, 0x00f8, 0x00c0, 0x33dd, 0x157e,
-        0x137e, 0x147e, 0x20a1, 0x012b, 0x789b, 0x0000, 0x8000, 0x80ac,
-        0xad80, 0x000b, 0x2098, 0x53a6, 0x147f, 0x137f, 0x157f, 0x6814,
-        0x8007, 0x7882, 0x6d94, 0x7dd6, 0x7dde, 0x6e98, 0x7ed2, 0x7eda,
-        0x1078, 0x38c6, 0x00c0, 0x270d, 0x702c, 0x8003, 0x0048, 0x2706,
-        0x2019, 0x4c5b, 0x1078, 0x2255, 0x702f, 0x8000, 0x7830, 0xa084,
-        0x00c0, 0x00c0, 0x270d, 0x0098, 0x2715, 0x6008, 0xa084, 0xffef,
-        0x600a, 0x1078, 0x38de, 0x0078, 0x2461, 0x7200, 0xa284, 0x0007,
-        0xa086, 0x0001, 0x00c0, 0x2722, 0x781b, 0x004f, 0x1078, 0x38de,
-        0x0078, 0x2733, 0x6ab4, 0xa295, 0x2000, 0x7a5a, 0x781b, 0x004f,
-        0x1078, 0x38de, 0x7200, 0x2500, 0xa605, 0x0040, 0x2733, 0xa284,
-        0x0007, 0x1079, 0x2741, 0xad80, 0x0009, 0x7036, 0xa284, 0x0007,
-        0xa086, 0x0001, 0x00c0, 0x2438, 0x6018, 0x8000, 0x601a, 0x0078,
-        0x2438, 0x2749, 0x48f7, 0x48f7, 0x48e6, 0x48f7, 0x2749, 0x48e6,
-        0x2749, 0x1078, 0x23ca, 0x1078, 0x38c6, 0x0f7e, 0x2079, 0x5000,
-        0x78cc, 0x0f7f, 0xa084, 0x0001, 0x0040, 0x276f, 0x706c, 0xa086,
-        0x0001, 0x00c0, 0x275e, 0x706e, 0x0078, 0x2802, 0x706c, 0xa086,
-        0x0005, 0x00c0, 0x276d, 0x7088, 0x2068, 0x681b, 0x0004, 0x6817,
-        0x0000, 0x6820, 0xa085, 0x0008, 0x6822, 0x706f, 0x0000, 0x2011,
-        0x0004, 0x716c, 0xa186, 0x0001, 0x0040, 0x2790, 0xa186, 0x0007,
-        0x00c0, 0x2780, 0x2009, 0x5038, 0x200b, 0x0005, 0x0078, 0x2790,
-        0x2009, 0x5013, 0x2104, 0x2009, 0x5012, 0x200a, 0x2009, 0x5038,
-        0x200b, 0x0001, 0x706f, 0x0000, 0x7073, 0x0001, 0x0078, 0x2792,
-        0x706f, 0x0000, 0x1078, 0x4633, 0x157e, 0x20a9, 0x0010, 0x2039,
-        0x0000, 0x1078, 0x36b0, 0xa7b8, 0x0100, 0x0070, 0x27a1, 0x0078,
-        0x2799, 0x157f, 0x7000, 0x0079, 0x27a5, 0x27d3, 0x27ba, 0x27ba,
-        0x27ad, 0x27d3, 0x27d3, 0x27d3, 0x27d3, 0x2021, 0x505a, 0x2404,
-        0xa005, 0x0040, 0x27d3, 0xad06, 0x00c0, 0x27ba, 0x6800, 0x2022,
-        0x0078, 0x27ca, 0x6820, 0xa084, 0x0001, 0x00c0, 0x27c6, 0x6f14,
-        0x1078, 0x37bd, 0x1078, 0x33ae, 0x0078, 0x27ca, 0x7060, 0x2060,
-        0x6800, 0x6002, 0x6a1a, 0x6817, 0x0000, 0x6820, 0xa085, 0x0008,
-        0x6822, 0x1078, 0x1c53, 0x2021, 0x7400, 0x1078, 0x280f, 0x2021,
-        0x505a, 0x1078, 0x280f, 0x157e, 0x20a9, 0x0000, 0x2021, 0x7300,
-        0x1078, 0x280f, 0x8420, 0x0070, 0x27e7, 0x0078, 0x27e0, 0x2061,
-        0x5300, 0x2021, 0x0002, 0x20a9, 0x0100, 0x6018, 0x6110, 0x81ff,
-        0x0040, 0x27f6, 0xa102, 0x0050, 0x27f6, 0x6012, 0x601b, 0x0000,
-        0xace0, 0x0010, 0x0070, 0x27fe, 0x0078, 0x27ed, 0x8421, 0x00c0,
-        0x27eb, 0x157f, 0x709c, 0xa084, 0x8000, 0x0040, 0x2809, 0x1078,
-        0x39cc, 0x7003, 0x0000, 0x704b, 0x0000, 0x0078, 0x2438, 0x047e,
-        0x2404, 0xa005, 0x0040, 0x2823, 0x2068, 0x6800, 0x007e, 0x6a1a,
-        0x6817, 0x0000, 0x6820, 0xa085, 0x0008, 0x6822, 0x1078, 0x1c53,
-        0x007f, 0x0078, 0x2811, 0x047f, 0x2023, 0x0000, 0x007c, 0xa282,
-        0x0003, 0x0050, 0x282d, 0x1078, 0x23ca, 0x2300, 0x0079, 0x2830,
-        0x2833, 0x28a6, 0x28c3, 0xa282, 0x0002, 0x0040, 0x2839, 0x1078,
-        0x23ca, 0x706c, 0x706f, 0x0000, 0x7093, 0x0000, 0x0079, 0x2840,
-        0x2848, 0x2848, 0x284a, 0x287e, 0x33e3, 0x2848, 0x287e, 0x2848,
-        0x1078, 0x23ca, 0x7780, 0x1078, 0x36b0, 0x7780, 0xa7bc, 0x0f00,
-        0x1078, 0x37bd, 0x6018, 0xa005, 0x0040, 0x2875, 0x2021, 0x7400,
-        0x2009, 0x0004, 0x2011, 0x0010, 0x1078, 0x28de, 0x0040, 0x2875,
-        0x157e, 0x20a9, 0x0000, 0x2021, 0x7300, 0x047e, 0x2009, 0x0004,
-        0x2011, 0x0010, 0x1078, 0x28de, 0x047f, 0x0040, 0x2874, 0x8420,
-        0x0070, 0x2874, 0x0078, 0x2865, 0x157f, 0x8738, 0xa784, 0x001f,
-        0x00c0, 0x2850, 0x0078, 0x2461, 0x0078, 0x2461, 0x7780, 0x1078,
-        0x37bd, 0x6018, 0xa005, 0x0040, 0x28a4, 0x2021, 0x7400, 0x2009,
-        0x0005, 0x2011, 0x0020, 0x1078, 0x28de, 0x0040, 0x28a4, 0x157e,
-        0x20a9, 0x0000, 0x2021, 0x7300, 0x047e, 0x2009, 0x0005, 0x2011,
-        0x0020, 0x1078, 0x28de, 0x047f, 0x0040, 0x28a3, 0x8420, 0x0070,
-        0x28a3, 0x0078, 0x2894, 0x157f, 0x0078, 0x2461, 0x2200, 0x0079,
-        0x28a9, 0x28ac, 0x28ae, 0x28ae, 0x1078, 0x23ca, 0x2009, 0x0012,
-        0x706c, 0xa086, 0x0002, 0x0040, 0x28b7, 0x2009, 0x000e, 0x6818,
-        0xa084, 0x8000, 0x0040, 0x28bd, 0x691a, 0x706f, 0x0000, 0x7073,
-        0x0001, 0x0078, 0x3854, 0x2200, 0x0079, 0x28c6, 0x28cb, 0x28ae,
-        0x28c9, 0x1078, 0x23ca, 0x1078, 0x4633, 0x7000, 0xa086, 0x0001,
-        0x00c0, 0x3373, 0x1078, 0x33c4, 0x6008, 0xa084, 0xffef, 0x600a,
-        0x1078, 0x3366, 0x0040, 0x3373, 0x0078, 0x2573, 0x2404, 0xa005,
-        0x0040, 0x2901, 0x2068, 0x2d04, 0x007e, 0x6814, 0xa706, 0x0040,
-        0x28ed, 0x2d20, 0x007f, 0x0078, 0x28df, 0x007f, 0x2022, 0x691a,
-        0x6817, 0x0000, 0x6820, 0xa205, 0x6822, 0x1078, 0x1c53, 0x6010,
-        0x8001, 0x6012, 0x6008, 0xa084, 0xffef, 0x600a, 0x1078, 0x33c4,
-        0x007c, 0xa085, 0x0001, 0x0078, 0x2900, 0x2300, 0x0079, 0x2908,
-        0x290d, 0x290b, 0x29a6, 0x1078, 0x23ca, 0x78ec, 0xa084, 0x0001,
-        0x00c0, 0x2921, 0x7000, 0xa086, 0x0004, 0x00c0, 0x2919, 0x0078,
-        0x2944, 0x1078, 0x33c4, 0x6008, 0xa084, 0xffef, 0x600a, 0x0078,
-        0x3373, 0x78e4, 0xa005, 0x00d0, 0x2944, 0x0018, 0x2438, 0x2008,
-        0xa084, 0x0030, 0x00c0, 0x2930, 0x781b, 0x004f, 0x0078, 0x2438,
-        0x78ec, 0xa084, 0x0003, 0x0040, 0x292c, 0x2100, 0xa084, 0x0007,
-        0x0079, 0x293a, 0x297d, 0x2988, 0x296e, 0x2942, 0x38b9, 0x38b9,
-        0x2942, 0x2997, 0x1078, 0x23ca, 0x7000, 0xa086, 0x0004, 0x00c0,
-        0x295e, 0x706c, 0xa086, 0x0002, 0x00c0, 0x2954, 0x2011, 0x0002,
-        0x2019, 0x0000, 0x0078, 0x2827, 0x706c, 0xa086, 0x0006, 0x0040,
-        0x294e, 0x706c, 0xa086, 0x0004, 0x0040, 0x294e, 0x79e4, 0xa184,
-        0x0030, 0x0040, 0x2968, 0x78ec, 0xa084, 0x0003, 0x00c0, 0x296a,
-        0x0078, 0x2f43, 0x2001, 0x0003, 0x0078, 0x2cd7, 0x6818, 0xa084,
-        0x8000, 0x0040, 0x2975, 0x681b, 0x001d, 0x1078, 0x368f, 0x782b,
-        0x3008, 0x781b, 0x0056, 0x0078, 0x2438, 0x6818, 0xa084, 0x8000,
-        0x0040, 0x2984, 0x681b, 0x001d, 0x1078, 0x368f, 0x0078, 0x3884,
-        0x6818, 0xa084, 0x8000, 0x0040, 0x298f, 0x681b, 0x001d, 0x1078,
-        0x368f, 0x782b, 0x3008, 0x781b, 0x00d2, 0x0078, 0x2438, 0x6818,
-        0xa084, 0x8000, 0x0040, 0x299e, 0x681b, 0x001d, 0x1078, 0x368f,
-        0x782b, 0x3008, 0x781b, 0x0093, 0x0078, 0x2438, 0xa584, 0x000f,
-        0x00c0, 0x29c3, 0x7000, 0x0079, 0x29ad, 0x2461, 0x29b7, 0x29b5,
-        0x3373, 0x3373, 0x3373, 0x3373, 0x29b5, 0x1078, 0x23ca, 0x1078,
-        0x33c4, 0x6008, 0xa084, 0xffef, 0x600a, 0x1078, 0x3366, 0x0040,
-        0x3373, 0x0078, 0x2573, 0x78e4, 0xa005, 0x00d0, 0x2944, 0x0018,
-        0x2944, 0x2008, 0xa084, 0x0030, 0x00c0, 0x29d2, 0x781b, 0x004f,
-        0x0078, 0x2438, 0x78ec, 0xa084, 0x0003, 0x0040, 0x29ce, 0x2100,
-        0xa184, 0x0007, 0x0079, 0x29dc, 0x29ee, 0x29f2, 0x29e6, 0x29e4,
-        0x38b9, 0x38b9, 0x29e4, 0x38af, 0x1078, 0x23ca, 0x1078, 0x3697,
-        0x782b, 0x3008, 0x781b, 0x0056, 0x0078, 0x2438, 0x1078, 0x3697,
-        0x0078, 0x3884, 0x1078, 0x3697, 0x782b, 0x3008, 0x781b, 0x00d2,
-        0x0078, 0x2438, 0x1078, 0x3697, 0x782b, 0x3008, 0x781b, 0x0093,
-        0x0078, 0x2438, 0x2300, 0x0079, 0x2a05, 0x2a0a, 0x2a08, 0x2a0c,
-        0x1078, 0x23ca, 0x0078, 0x3081, 0x681b, 0x0008, 0x78a3, 0x0000,
-        0x79e4, 0xa184, 0x0030, 0x0040, 0x3081, 0x78ec, 0xa084, 0x0003,
-        0x0040, 0x3081, 0xa184, 0x0007, 0x0079, 0x2a1e, 0x2a26, 0x29f2,
-        0x296e, 0x3854, 0x38b9, 0x38b9, 0x2a26, 0x38af, 0x1078, 0x3868,
-        0x0078, 0x2438, 0xa282, 0x0005, 0x0050, 0x2a30, 0x1078, 0x23ca,
-        0x2300, 0x0079, 0x2a33, 0x2a36, 0x2c84, 0x2c92, 0x2200, 0x0079,
-        0x2a39, 0x2a53, 0x2a40, 0x2a53, 0x2a3e, 0x2c69, 0x1078, 0x23ca,
-        0x789b, 0x0018, 0x78a8, 0xa084, 0x00ff, 0xa082, 0x0020, 0x0048,
-        0x366b, 0xa08a, 0x0004, 0x00c8, 0x366b, 0x0079, 0x2a4f, 0x366b,
-        0x366b, 0x366b, 0x3619, 0x789b, 0x0018, 0x79a8, 0xa184, 0x0080,
-        0x0040, 0x2a64, 0x0078, 0x366b, 0x7000, 0xa005, 0x00c0, 0x2a5a,
-        0x2011, 0x0004, 0x0078, 0x31f5, 0xa184, 0x00ff, 0xa08a, 0x0010,
-        0x00c8, 0x366b, 0x0079, 0x2a6c, 0x2a7e, 0x2a7c, 0x2a96, 0x2a9a,
-        0x2b55, 0x366b, 0x366b, 0x2b57, 0x366b, 0x366b, 0x2c65, 0x2c65,
-        0x366b, 0x366b, 0x366b, 0x2c67, 0x1078, 0x23ca, 0xa684, 0x1000,
-        0x0040, 0x2a8b, 0x2001, 0x0500, 0x8000, 0x8000, 0x783a, 0x781b,
-        0x0091, 0x0078, 0x2438, 0x6818, 0xa084, 0x8000, 0x0040, 0x2a94,
-        0x681b, 0x001d, 0x0078, 0x2a82, 0x0078, 0x3854, 0x681b, 0x001d,
-        0x0078, 0x367b, 0x6920, 0x6922, 0xa684, 0x1800, 0x00c0, 0x2adb,
-        0x6820, 0xa084, 0x0001, 0x00c0, 0x2ae1, 0x6818, 0xa086, 0x0008,
-        0x00c0, 0x2aac, 0x681b, 0x0000, 0xa684, 0x0400, 0x0040, 0x2b51,
-        0xa684, 0x0080, 0x0040, 0x2ad7, 0x7097, 0x0000, 0x6818, 0xa084,
-        0x003f, 0xa08a, 0x000d, 0x0050, 0x2ad7, 0xa08a, 0x000c, 0x7196,
-        0x2001, 0x000c, 0x800c, 0x719a, 0x789b, 0x0061, 0x78aa, 0x157e,
-        0x137e, 0x147e, 0x20a1, 0x012b, 0x789b, 0x0000, 0x8000, 0x80ac,
-        0xad80, 0x000b, 0x2098, 0x53a6, 0x147f, 0x137f, 0x157f, 0x781b,
-        0x0058, 0x0078, 0x2438, 0xa684, 0x1000, 0x0040, 0x2ae1, 0x0078,
-        0x2438, 0xa684, 0x0060, 0x0040, 0x2b4d, 0xa684, 0x0800, 0x0040,
-        0x2b4d, 0xa684, 0x8000, 0x00c0, 0x2aef, 0x0078, 0x2b09, 0xa6b4,
-        0x7fff, 0x7e5a, 0x6eb6, 0x789b, 0x0076, 0x7aac, 0x79ac, 0x78ac,
-        0x801b, 0x00c8, 0x2afc, 0x8000, 0xa084, 0x003f, 0xa108, 0xa291,
-        0x0000, 0x6b98, 0x2100, 0xa302, 0x68b2, 0x6b94, 0x2200, 0xa303,
-        0x68ae, 0xa684, 0x4000, 0x0040, 0x2b11, 0xa6b4, 0xbfff, 0x7e5a,
-        0x6eb6, 0x7000, 0xa086, 0x0003, 0x00c0, 0x2b1e, 0x1078, 0x46e9,
-        0x1078, 0x48e6, 0x781b, 0x0064, 0x0078, 0x2438, 0xa006, 0x1078,
-        0x49ed, 0x6ab0, 0x69ac, 0x6c98, 0x6b94, 0x2200, 0xa105, 0x0040,
-        0x2b2d, 0x2200, 0xa422, 0x2100, 0xa31b, 0x6caa, 0x7cd2, 0x7cda,
-        0x6ba6, 0x7bd6, 0x7bde, 0x2300, 0xa405, 0x00c0, 0x2b3f, 0xa6b5,
-        0x4000, 0x7e5a, 0x6eb6, 0x781b, 0x0064, 0x0078, 0x2438, 0x781b,
-        0x0064, 0x2200, 0xa115, 0x00c0, 0x2b49, 0x1078, 0x48f7, 0x0078,
-        0x2438, 0x1078, 0x4942, 0x0078, 0x2438, 0x781b, 0x0065, 0x0078,
-        0x2438, 0x781b, 0x0058, 0x0078, 0x2438, 0x1078, 0x23ca, 0x0078,
-        0x2bb8, 0x6920, 0xa184, 0x0100, 0x0040, 0x2b6f, 0xa18c, 0xfeff,
-        0x6922, 0x0c7e, 0x7054, 0x2060, 0x6000, 0xa084, 0xefff, 0x6002,
-        0x6004, 0xa084, 0xfff5, 0x6006, 0x0c7f, 0x0078, 0x2ba7, 0xa184,
-        0x0200, 0x0040, 0x2ba7, 0xa18c, 0xfdff, 0x6922, 0x0c7e, 0x7054,
-        0x2060, 0x6000, 0xa084, 0xdfff, 0x6002, 0x6004, 0xa084, 0xffef,
-        0x6006, 0x2008, 0x2c48, 0x0c7f, 0xa184, 0x0008, 0x0040, 0x2ba7,
-        0x1078, 0x37b9, 0x1078, 0x34c7, 0x88ff, 0x0040, 0x2ba7, 0x789b,
-        0x0060, 0x2800, 0x78aa, 0x7e58, 0xa6b5, 0x0004, 0x7e5a, 0xa684,
-        0x0400, 0x00c0, 0x2ba1, 0x782b, 0x3008, 0x781b, 0x0056, 0x0078,
-        0x2438, 0x782b, 0x3008, 0x781b, 0x0065, 0x0078, 0x2438, 0x7e58,
-        0xa684, 0x0400, 0x00c0, 0x2bb0, 0x781b, 0x0058, 0x0078, 0x2438,
-        0x781b, 0x0065, 0x0078, 0x2438, 0x0078, 0x3673, 0x0078, 0x3673,
-        0x2019, 0x0000, 0x7990, 0xa18c, 0x0007, 0x0040, 0x2bb6, 0x789b,
-        0x0010, 0x78a8, 0xa094, 0x00ff, 0xa286, 0x0001, 0x00c0, 0x2bf6,
-        0x2300, 0x7ca8, 0xa400, 0x2018, 0xa102, 0x0040, 0x2bee, 0x0048,
-        0x2bd3, 0x0078, 0x2bf0, 0xa380, 0x0002, 0xa102, 0x00c8, 0x2bee,
-        0x6920, 0xa18c, 0xfcff, 0x6922, 0x0c7e, 0x7054, 0x2060, 0x6000,
-        0xa084, 0xefef, 0x6002, 0x6004, 0xa084, 0xffe5, 0x6006, 0x0c7f,
-        0x7e58, 0xa6b4, 0xfffb, 0x7e5a, 0x0078, 0x2ba8, 0x0078, 0x2b59,
-        0x24a8, 0x7aa8, 0x00f0, 0x2bf0, 0x0078, 0x2bc1, 0xa284, 0x00f0,
-        0xa086, 0x0020, 0x00c0, 0x2c56, 0x8318, 0x8318, 0x2300, 0xa102,
-        0x0040, 0x2c06, 0x0048, 0x2c06, 0x0078, 0x2c53, 0xa286, 0x0023,
-        0x0040, 0x2bb6, 0x681c, 0xa084, 0xfff1, 0x681e, 0x7e58, 0xa684,
-        0xfff1, 0xa085, 0x0010, 0x2030, 0x7e5a, 0x6008, 0xa085, 0x0010,
-        0x600a, 0x0c7e, 0x7054, 0x2060, 0x6004, 0x2008, 0x2c48, 0x0c7f,
-        0xa184, 0x0010, 0x0040, 0x2c2a, 0x1078, 0x37b9, 0x1078, 0x35d6,
-        0x0078, 0x2c39, 0x0c7e, 0x7054, 0x2060, 0x6004, 0x2008, 0x2c48,
-        0x0c7f, 0xa184, 0x0008, 0x0040, 0x2ba7, 0x1078, 0x37b9, 0x1078,
-        0x34c7, 0x88ff, 0x0040, 0x2ba7, 0x789b, 0x0060, 0x2800, 0x78aa,
-        0xa6b5, 0x0004, 0x7e5a, 0xa684, 0x0400, 0x00c0, 0x2c4d, 0x782b,
-        0x3008, 0x781b, 0x0056, 0x0078, 0x2438, 0x782b, 0x3008, 0x781b,
-        0x0065, 0x0078, 0x2438, 0x7aa8, 0x0078, 0x2bc1, 0x8318, 0x2300,
-        0xa102, 0x0040, 0x2c5f, 0x0048, 0x2c5f, 0x0078, 0x2bc1, 0xa284,
-        0x0080, 0x00c0, 0x367b, 0x0078, 0x3673, 0x0078, 0x367b, 0x0078,
-        0x366b, 0x789b, 0x0018, 0x78a8, 0xa084, 0x00ff, 0xa08e, 0x0001,
-        0x0040, 0x2c74, 0x1078, 0x23ca, 0x7aa8, 0xa294, 0x00ff, 0x78a8,
-        0xa084, 0x00ff, 0xa08a, 0x0004, 0x00c8, 0x366b, 0x0079, 0x2c80,
-        0x366b, 0x3414, 0x366b, 0x356b, 0xa282, 0x0000, 0x00c0, 0x2c8a,
-        0x1078, 0x23ca, 0x1078, 0x368f, 0x782b, 0x3008, 0x781b, 0x0065,
-        0x0078, 0x2438, 0xa282, 0x0003, 0x00c0, 0x2c98, 0x1078, 0x23ca,
-        0xa484, 0x8000, 0x00c0, 0x2cbb, 0x706c, 0xa005, 0x0040, 0x2ca2,
-        0x1078, 0x23ca, 0x6f14, 0x7782, 0xa7bc, 0x0f00, 0x1078, 0x37bd,
-        0x6008, 0xa085, 0x0021, 0x600a, 0x8738, 0xa784, 0x001f, 0x00c0,
-        0x2ca6, 0x1078, 0x3693, 0x706f, 0x0002, 0x2009, 0x5038, 0x200b,
-        0x0009, 0x0078, 0x2cbd, 0x1078, 0x369f, 0x782b, 0x3008, 0x781b,
-        0x0065, 0x0078, 0x2438, 0xa282, 0x0004, 0x0050, 0x2cc9, 0x1078,
-        0x23ca, 0x2300, 0x0079, 0x2ccc, 0x2ccf, 0x2db8, 0x2deb, 0xa286,
-        0x0003, 0x0040, 0x2cd5, 0x1078, 0x23ca, 0x2001, 0x0000, 0x007e,
-        0x68c0, 0xa005, 0x0040, 0x2cde, 0x7003, 0x0003, 0x68a0, 0xa084,
-        0x2000, 0x0040, 0x2ce7, 0x6008, 0xa085, 0x0002, 0x600a, 0x007f,
-        0x703e, 0x7000, 0xa084, 0x0007, 0x0079, 0x2cee, 0x2461, 0x2cf8,
-        0x2cf8, 0x2eed, 0x2f29, 0x2461, 0x2f29, 0x2cf6, 0x1078, 0x23ca,
-        0xa684, 0x1000, 0x00c0, 0x2d00, 0x1078, 0x4633, 0x0040, 0x2d92,
-        0x7868, 0xa08c, 0x00ff, 0x0040, 0x2d48, 0xa186, 0x0008, 0x00c0,
-        0x2d17, 0x1078, 0x33c4, 0x6008, 0xa084, 0xffef, 0x600a, 0x1078,
-        0x3366, 0x0040, 0x2d48, 0x1078, 0x4633, 0x0078, 0x2d2f, 0xa186,
-        0x0028, 0x00c0, 0x2d48, 0x1078, 0x4633, 0x6008, 0xa084, 0xffef,
-        0x600a, 0x6018, 0xa005, 0x0040, 0x2d2f, 0x8001, 0x601a, 0xa005,
-        0x0040, 0x2d2f, 0x8001, 0xa005, 0x0040, 0x2d2f, 0x601e, 0x6820,
-        0xa084, 0x0001, 0x0040, 0x2461, 0x6820, 0xa084, 0xfffe, 0x6822,
-        0x7060, 0x0c7e, 0x2060, 0x6800, 0x6002, 0x0c7f, 0x6004, 0x6802,
-        0xa005, 0x2d00, 0x00c0, 0x2d45, 0x6002, 0x6006, 0x0078, 0x2461,
-        0x017e, 0x1078, 0x2e1c, 0x017f, 0xa684, 0xdf00, 0x681e, 0x682b,
-        0x0000, 0x6f14, 0x81ff, 0x0040, 0x2d92, 0xa186, 0x0002, 0x00c0,
-        0x2d92, 0xa684, 0x0800, 0x00c0, 0x2d65, 0xa684, 0x0060, 0x0040,
-        0x2d65, 0x78d8, 0x7adc, 0x682e, 0x6a32, 0x6820, 0xa084, 0x0800,
-        0x00c0, 0x2d92, 0x8717, 0xa294, 0x000f, 0x8213, 0x8213, 0x8213,
-        0xa290, 0x5280, 0xa290, 0x0000, 0x221c, 0xa384, 0x0100, 0x00c0,
-        0x2d7b, 0x0078, 0x2d81, 0x8210, 0x2204, 0xa085, 0x0018, 0x2012,
-        0x8211, 0xa384, 0x0400, 0x0040, 0x2d8e, 0x68a0, 0xa084, 0x0100,
-        0x00c0, 0x2d8e, 0x1078, 0x2ea0, 0x0078, 0x2461, 0x6008, 0xa085,
-        0x0002, 0x600a, 0x6916, 0x6818, 0xa084, 0x8000, 0x0040, 0x2d9a,
-        0x703c, 0x681a, 0xa68c, 0xdf00, 0x691e, 0x1078, 0x33b5, 0x1078,
-        0x33c4, 0x00c0, 0x2da7, 0x6008, 0xa084, 0xffef, 0x600a, 0x6820,
-        0xa084, 0x0001, 0x00c0, 0x2db0, 0x1078, 0x33ae, 0x0078, 0x2db4,
-        0x7060, 0x2060, 0x6800, 0x6002, 0x1078, 0x1c53, 0x0078, 0x2461,
-        0xa282, 0x0004, 0x0048, 0x2dbe, 0x1078, 0x23ca, 0x2200, 0x0079,
-        0x2dc1, 0x2dbc, 0x2dc5, 0x2dd2, 0x2dc5, 0x7000, 0xa086, 0x0005,
-        0x0040, 0x2dce, 0x1078, 0x368f, 0x782b, 0x3008, 0x781b, 0x0065,
-        0x0078, 0x2438, 0x7890, 0x8007, 0x8001, 0xa084, 0x0007, 0xa080,
-        0x0018, 0x789a, 0x79a8, 0xa18c, 0x00ff, 0xa186, 0x0003, 0x0040,
-        0x2de7, 0xa186, 0x0000, 0x0040, 0x2de7, 0x0078, 0x366b, 0x781b,
-        0x0065, 0x0078, 0x2438, 0x6820, 0xa085, 0x0004, 0x6822, 0x82ff,
-        0x00c0, 0x2df6, 0x1078, 0x368f, 0x0078, 0x2dfd, 0x8211, 0x0040,
-        0x2dfb, 0x1078, 0x23ca, 0x1078, 0x369f, 0x782b, 0x3008, 0x781b,
-        0x0065, 0x0078, 0x2438, 0x702c, 0x8003, 0x0048, 0x2e0d, 0x2019,
-        0x4c5b, 0x1078, 0x2255, 0x702f, 0x8000, 0x1078, 0x38de, 0x7830,
-        0xa084, 0x00c0, 0x00c0, 0x2e19, 0x0018, 0x2e19, 0x791a, 0xa006,
-        0x007c, 0xa085, 0x0001, 0x007c, 0xa684, 0x0060, 0x00c0, 0x2e26,
-        0x682f, 0x0000, 0x6833, 0x0000, 0x0078, 0x2e9f, 0xa684, 0x0800,
-        0x00c0, 0x2e48, 0x68b4, 0xa084, 0x4800, 0xa635, 0xa684, 0x0800,
-        0x00c0, 0x2e48, 0x6998, 0x6a94, 0x692e, 0x6a32, 0x703c, 0xa005,
-        0x00c0, 0x2e40, 0x2200, 0xa105, 0x0040, 0x2e47, 0x703f, 0x0015,
-        0x7000, 0xa086, 0x0006, 0x0040, 0x2e47, 0x1078, 0x4633, 0x007c,
-        0xa684, 0x0020, 0x0040, 0x2e6a, 0xa684, 0x4000, 0x0040, 0x2e56,
-        0x682f, 0x0000, 0x6833, 0x0000, 0x0078, 0x2e40, 0x68b4, 0xa084,
-        0x4800, 0xa635, 0xa684, 0x4000, 0x00c0, 0x2e50, 0x703c, 0xa005,
-        0x00c0, 0x2e64, 0x703f, 0x0015, 0x79d8, 0x7adc, 0x692e, 0x6a32,
-        0x0078, 0x2e40, 0xa684, 0x4000, 0x0040, 0x2e74, 0x682f, 0x0000,
-        0x6833, 0x0000, 0x0078, 0x2e40, 0x68b4, 0xa084, 0x4800, 0xa635,
-        0xa684, 0x4000, 0x00c0, 0x2e6e, 0x703c, 0xa005, 0x00c0, 0x2e82,
-        0x703f, 0x0015, 0x79d8, 0x7adc, 0x78d0, 0x80fb, 0x00c8, 0x2e89,
-        0x8000, 0xa084, 0x003f, 0xa108, 0xa291, 0x0000, 0x692e, 0x6a32,
-        0x2100, 0xa205, 0x00c0, 0x2e96, 0x0078, 0x2e40, 0x7000, 0xa086,
-        0x0006, 0x0040, 0x2e9f, 0x1078, 0x49ed, 0x0078, 0x2e40, 0x007c,
-        0x6008, 0xa085, 0x0200, 0x600a, 0xa384, 0x0200, 0x0040, 0x2eac,
-        0x6008, 0xa085, 0x0002, 0x600a, 0x681b, 0x0006, 0x688f, 0x0000,
-        0x6893, 0x0000, 0x6a30, 0x692c, 0x6a3e, 0x6942, 0x682f, 0x0003,
-        0x6833, 0x0000, 0x6837, 0x0020, 0x6897, 0x0000, 0x689b, 0x0020,
-        0x68b3, 0x0000, 0x68af, 0x0000, 0x7000, 0x0079, 0x2ec7, 0x2461,
-        0x2ed1, 0x2eda, 0x2ecf, 0x2ecf, 0x2ecf, 0x2ecf, 0x2ecf, 0x1078,
-        0x23ca, 0x6820, 0xa084, 0x0001, 0x00c0, 0x2eda, 0x1078, 0x33ae,
-        0x0078, 0x2ee0, 0x7060, 0x2c50, 0x2060, 0x6800, 0x6002, 0x2a60,
-        0x2021, 0x505a, 0x2404, 0xa005, 0x0040, 0x2ee9, 0x2020, 0x0078,
-        0x2ee2, 0x2d22, 0x206b, 0x0000, 0x007c, 0x1078, 0x33b5, 0x1078,
-        0x33c4, 0x6008, 0xa084, 0xfdff, 0x600a, 0x682b, 0x0000, 0x789b,
-        0x000e, 0x6f14, 0x6817, 0x0002, 0x1078, 0x4a35, 0xa684, 0x0800,
-        0x0040, 0x2f06, 0x691c, 0xa18d, 0x2000, 0x691e, 0x6818, 0xa084,
-        0x8000, 0x0040, 0x2f16, 0x7868, 0xa08c, 0x00ff, 0x0040, 0x2f14,
-        0x681b, 0x001e, 0x0078, 0x2f16, 0x681b, 0x0000, 0x2021, 0x505a,
-        0x2404, 0xad06, 0x0040, 0x2f1d, 0x7460, 0x6800, 0x2022, 0x68c3,
-        0x0000, 0x6a3c, 0x6940, 0x6a32, 0x692e, 0x1078, 0x1c53, 0x0078,
-        0x2461, 0x1078, 0x2e1c, 0x682b, 0x0000, 0x2001, 0x000e, 0x6f14,
-        0x1078, 0x38e4, 0xa08c, 0x00ff, 0x6916, 0x6818, 0xa084, 0x8000,
-        0x0040, 0x2f3c, 0x703c, 0x681a, 0xa68c, 0xdf00, 0x691e, 0x706f,
-        0x0000, 0x0078, 0x2461, 0x7000, 0xa005, 0x00c0, 0x2f49, 0x0078,
-        0x2461, 0xa006, 0x1078, 0x4633, 0x6817, 0x0000, 0x681b, 0x0014,
-        0xa68c, 0xdf00, 0x691e, 0x682b, 0x0000, 0x6820, 0xa085, 0x00ff,
-        0x6822, 0x7000, 0x0079, 0x2f5c, 0x2461, 0x2f66, 0x2f66, 0x2f68,
-        0x2f68, 0x2f68, 0x2f68, 0x2f64, 0x1078, 0x23ca, 0x1078, 0x33c4,
-        0x6008, 0xa084, 0xffef, 0x600a, 0x0078, 0x337e, 0x2300, 0x0079,
-        0x2f71, 0x2f74, 0x2f76, 0x2faf, 0x1078, 0x23ca, 0x7000, 0x0079,
-        0x2f79, 0x2461, 0x2f83, 0x2f83, 0x2f9e, 0x2f83, 0x2fab, 0x2f9e,
-        0x2f81, 0x1078, 0x23ca, 0xa684, 0x0060, 0xa086, 0x0060, 0x00c0,
-        0x2f9a, 0xa6b4, 0xffdf, 0xa6b4, 0xbfff, 0xa6b5, 0x2000, 0x7e5a,
-        0x681c, 0xa084, 0xffdf, 0x681e, 0x1078, 0x4633, 0x1078, 0x48f7,
-        0x0078, 0x3854, 0xa684, 0x2000, 0x0040, 0x2f8d, 0x6818, 0xa084,
-        0x8000, 0x0040, 0x2fab, 0x681b, 0x0015, 0xa684, 0x4000, 0x0040,
-        0x2fab, 0x681b, 0x0007, 0x1078, 0x3868, 0x0078, 0x2438, 0x1078,
-        0x23ca, 0x2300, 0x0079, 0x2fb4, 0x2fb7, 0x2fb9, 0x2fec, 0x1078,
-        0x23ca, 0x7000, 0x0079, 0x2fbc, 0x2461, 0x2fc6, 0x2fc6, 0x2fe1,
-        0x2fc6, 0x2fe8, 0x2fe1, 0x2fc4, 0x1078, 0x23ca, 0xa684, 0x0060,
-        0xa086, 0x0060, 0x00c0, 0x2fdd, 0xa6b4, 0xffbf, 0xa6b4, 0xbfff,
-        0xa6b5, 0x2000, 0x7e5a, 0x681c, 0xa084, 0xffbf, 0x681e, 0x1078,
-        0x4633, 0x1078, 0x48f7, 0x0078, 0x3854, 0xa684, 0x2000, 0x0040,
-        0x2fd0, 0x6818, 0xa084, 0x8000, 0x0040, 0x2fe8, 0x681b, 0x0007,
-        0x781b, 0x00d2, 0x0078, 0x2438, 0x6820, 0xa085, 0x0004, 0x6822,
-        0x1078, 0x381f, 0xa6b5, 0x0800, 0x1078, 0x368f, 0x782b, 0x3008,
-        0x781b, 0x0065, 0x0078, 0x2438, 0x2300, 0x0079, 0x2fff, 0x3002,
-        0x3004, 0x3006, 0x1078, 0x23ca, 0x0078, 0x367b, 0xa684, 0x0400,
-        0x00c0, 0x302f, 0x79e4, 0xa184, 0x0020, 0x0040, 0x3016, 0x78ec,
-        0xa084, 0x0003, 0x0040, 0x3016, 0x782b, 0x3009, 0x789b, 0x0060,
-        0x78ab, 0x0000, 0xa684, 0xfffb, 0x785a, 0x79e4, 0xa184, 0x0020,
-        0x0040, 0x3027, 0x78ec, 0xa084, 0x0003, 0x00c0, 0x302b, 0x2001,
-        0x0014, 0x0078, 0x2cd7, 0xa184, 0x0007, 0x0079, 0x3067, 0x7a90,
-        0xa294, 0x0007, 0x789b, 0x0060, 0x79a8, 0x81ff, 0x0040, 0x3065,
-        0x789b, 0x0010, 0x7ba8, 0xa384, 0x0001, 0x00c0, 0x3056, 0x7ba8,
-        0x7ba8, 0xa386, 0x0001, 0x00c0, 0x3049, 0x2009, 0xfff7, 0x0078,
-        0x304f, 0xa386, 0x0003, 0x00c0, 0x3056, 0x2009, 0xffef, 0x0c7e,
-        0x7054, 0x2060, 0x6004, 0xa104, 0x6006, 0x0c7f, 0x789b, 0x0060,
-        0x78ab, 0x0000, 0xa684, 0xfffb, 0x785a, 0x782b, 0x3009, 0x6920,
-        0xa18c, 0xfdff, 0xa18c, 0xfeff, 0x6922, 0x0078, 0x3854, 0x297d,
-        0x2988, 0x3071, 0x3079, 0x306f, 0x306f, 0x3854, 0x3854, 0x1078,
-        0x23ca, 0x6920, 0xa18c, 0xfdff, 0xa18c, 0xfeff, 0x6922, 0x0078,
-        0x385e, 0x6920, 0xa18c, 0xfdff, 0xa18c, 0xfeff, 0x6922, 0x0078,
-        0x3854, 0x79e4, 0xa184, 0x0030, 0x0040, 0x308b, 0x78ec, 0xa084,
-        0x0003, 0x00c0, 0x30b2, 0x7000, 0xa086, 0x0004, 0x00c0, 0x30a5,
-        0x706c, 0xa086, 0x0002, 0x00c0, 0x309b, 0x2011, 0x0002, 0x2019,
-        0x0000, 0x0078, 0x2827, 0x706c, 0xa086, 0x0006, 0x0040, 0x3095,
-        0x706c, 0xa086, 0x0004, 0x0040, 0x3095, 0x7000, 0xa086, 0x0000,
-        0x0040, 0x2438, 0x6818, 0xa085, 0x8000, 0x681a, 0x2001, 0x0014,
-        0x0078, 0x2cd7, 0xa184, 0x0007, 0x0079, 0x30b6, 0x3854, 0x3854,
-        0x30be, 0x3854, 0x38b9, 0x38b9, 0x3854, 0x3854, 0xa684, 0x0080,
-        0x0040, 0x30ed, 0x7194, 0x81ff, 0x0040, 0x30ed, 0xa182, 0x000d,
-        0x00d0, 0x30ce, 0x7097, 0x0000, 0x0078, 0x30d3, 0xa182, 0x000c,
-        0x7096, 0x2009, 0x000c, 0x789b, 0x0061, 0x79aa, 0x157e, 0x137e,
-        0x147e, 0x7098, 0x8114, 0xa210, 0x729a, 0xa080, 0x000b, 0xad00,
-        0x2098, 0x20a1, 0x012b, 0x789b, 0x0000, 0x8108, 0x81ac, 0x53a6,
-        0x147f, 0x137f, 0x157f, 0x0078, 0x385e, 0xa684, 0x0400, 0x00c0,
-        0x312e, 0x6820, 0xa084, 0x0001, 0x0040, 0x385e, 0xa68c, 0x0060,
-        0xa684, 0x0060, 0x0040, 0x3102, 0xa086, 0x0060, 0x00c0, 0x3102,
-        0xa18d, 0x4000, 0xa18c, 0xfffb, 0x795a, 0x69b6, 0x789b, 0x0060,
-        0x78ab, 0x0000, 0x789b, 0x0061, 0x6818, 0xa085, 0x8000, 0x681a,
-        0x78aa, 0x8008, 0x810c, 0x0040, 0x33dd, 0xa18c, 0x00f8, 0x00c0,
-        0x33dd, 0x157e, 0x137e, 0x147e, 0x20a1, 0x012b, 0x789b, 0x0000,
-        0x8000, 0x80ac, 0xad80, 0x000b, 0x2098, 0x53a6, 0x147f, 0x137f,
-        0x157f, 0x6814, 0x8007, 0x7882, 0x0078, 0x385e, 0x6818, 0xa084,
-        0x8000, 0x0040, 0x3135, 0x681b, 0x0008, 0x781b, 0x00c8, 0x0078,
-        0x2438, 0x2300, 0x0079, 0x313c, 0x3141, 0x31e0, 0x313f, 0x1078,
-        0x23ca, 0x7000, 0xa084, 0x0007, 0x0079, 0x3146, 0x2461, 0x3150,
-        0x3185, 0x315b, 0x314e, 0x2461, 0x314e, 0x314e, 0x1078, 0x23ca,
-        0x681c, 0xa084, 0x2000, 0x0040, 0x3169, 0x6008, 0xa085, 0x0002,
-        0x600a, 0x0078, 0x3169, 0x68c0, 0xa005, 0x00c0, 0x3185, 0x6920,
-        0xa18d, 0x0001, 0x6922, 0x68c3, 0x0001, 0x6800, 0x706a, 0x0078,
-        0x317f, 0x6920, 0xa18d, 0x0001, 0x6922, 0x6800, 0x6006, 0xa005,
-        0x00c0, 0x3173, 0x6002, 0x681c, 0xa084, 0x000e, 0x0040, 0x317f,
-        0x7014, 0x68ba, 0x7130, 0xa188, 0x7300, 0x0078, 0x3181, 0x2009,
-        0x7400, 0x2104, 0x6802, 0x2d0a, 0x7162, 0x6eb6, 0xa684, 0x0060,
-        0x0040, 0x31de, 0xa684, 0x0800, 0x00c0, 0x3199, 0xa684, 0x7fff,
-        0x68b6, 0x6894, 0x68a6, 0x6898, 0x68aa, 0x1078, 0x4633, 0x0078,
-        0x31de, 0xa684, 0x0020, 0x0040, 0x31ae, 0x68c0, 0xa005, 0x0040,
-        0x31a5, 0x1078, 0x4a35, 0x0078, 0x31a8, 0xa006, 0x1078, 0x49ed,
-        0x79d8, 0x7adc, 0x69aa, 0x6aa6, 0x0078, 0x31b4, 0x1078, 0x37ca,
-        0x69aa, 0x6aa6, 0x1078, 0x49ed, 0xa684, 0x8000, 0x0040, 0x31de,
-        0xa684, 0x7fff, 0x68b6, 0x2001, 0x0076, 0x1078, 0x38e4, 0x2010,
-        0x2001, 0x0078, 0x1078, 0x38e4, 0x2008, 0xa684, 0x0020, 0x00c0,
-        0x31d6, 0x2001, 0x007a, 0x1078, 0x38e4, 0x801b, 0x00c8, 0x31d1,
-        0x8000, 0xa084, 0x003f, 0xa108, 0xa291, 0x0000, 0x6b98, 0x2100,
-        0xa302, 0x68b2, 0x6b94, 0x2200, 0xa303, 0x68ae, 0x0078, 0x2461,
-        0x0078, 0x367b, 0x7037, 0x0000, 0xa282, 0x0006, 0x0050, 0x31ea,
-        0x1078, 0x23ca, 0x7000, 0xa084, 0x0007, 0x10c0, 0x398a, 0x2300,
-        0x0079, 0x31f2, 0x31f5, 0x321e, 0x3232, 0x2200, 0x0079, 0x31f8,
-        0x321c, 0x367b, 0x31fe, 0x321c, 0x324e, 0x3290, 0x7003, 0x0005,
-        0x2001, 0x7510, 0x2068, 0x704a, 0x157e, 0x20a9, 0x0031, 0x2003,
-        0x0000, 0x8000, 0x0070, 0x320e, 0x0078, 0x3207, 0x157f, 0xad80,
-        0x0009, 0x7036, 0x6817, 0x0000, 0x68b7, 0x0700, 0x6823, 0x0800,
-        0x6827, 0x0003, 0x0078, 0x366b, 0x1078, 0x23ca, 0x7003, 0x0005,
-        0x2001, 0x7510, 0x2068, 0x704a, 0xad80, 0x0009, 0x7036, 0x2200,
-        0x0079, 0x322a, 0x367b, 0x3230, 0x3230, 0x324e, 0x3230, 0x367b,
-        0x1078, 0x23ca, 0x7003, 0x0005, 0x2001, 0x7510, 0x2068, 0x704a,
-        0xad80, 0x0009, 0x7036, 0x2200, 0x0079, 0x323e, 0x3246, 0x3244,
-        0x3244, 0x3246, 0x3244, 0x3246, 0x1078, 0x23ca, 0x1078, 0x369f,
-        0x782b, 0x3008, 0x781b, 0x0065, 0x0078, 0x2438, 0x7003, 0x0002,
-        0x7a80, 0xa294, 0x0f00, 0x789b, 0x0018, 0x7ca8, 0xa484, 0x001f,
-        0xa215, 0x2069, 0x7400, 0x2d04, 0x2d08, 0x7162, 0x2068, 0xa005,
-        0x0040, 0x3269, 0x6814, 0xa206, 0x0040, 0x3285, 0x6800, 0x0078,
-        0x325c, 0x7003, 0x0005, 0x2001, 0x7510, 0x2068, 0x704a, 0x7036,
-        0x157e, 0x20a9, 0x0031, 0x2003, 0x0000, 0x8000, 0x0070, 0x327a,
-        0x0078, 0x3273, 0x157f, 0xad80, 0x0009, 0x7036, 0x6a16, 0x68b7,
-        0x0700, 0x6823, 0x0800, 0x6827, 0x0003, 0x6eb4, 0x7e5a, 0x6820,
-        0xa084, 0x0c00, 0x0040, 0x32df, 0x1078, 0x3697, 0x0078, 0x32df,
-        0x7003, 0x0002, 0x7a80, 0xa294, 0x0f00, 0x789b, 0x0018, 0x7ca8,
-        0xa484, 0x001f, 0xa215, 0x79a8, 0x79a8, 0xa18c, 0x00ff, 0xa1e8,
-        0x7300, 0x2d04, 0x2d08, 0x7162, 0x2068, 0xa005, 0x0040, 0x32af,
-        0x6814, 0xa206, 0x0040, 0x32ca, 0x6800, 0x0078, 0x32a2, 0x7003,
-        0x0005, 0x2001, 0x7510, 0x2068, 0x704a, 0x157e, 0x20a9, 0x0031,
-        0x2003, 0x0000, 0x8000, 0x0070, 0x32bf, 0x0078, 0x32b8, 0x157f,
-        0xad80, 0x0009, 0x7036, 0x6a16, 0x68b7, 0x0700, 0x6823, 0x0800,
-        0x6827, 0x0003, 0x6eb4, 0x7e5a, 0x6820, 0xa084, 0x0c00, 0x0040,
-        0x32df, 0xa084, 0x0800, 0x0040, 0x32d9, 0x1078, 0x369b, 0x0078,
-        0x32df, 0x1078, 0x3697, 0x708b, 0x0000, 0x0078, 0x32df, 0x027e,
-        0x8207, 0xa084, 0x000f, 0x8003, 0x8003, 0x8003, 0xa080, 0x5280,
-        0x2060, 0x7056, 0x6000, 0x705a, 0x6004, 0x705e, 0xa684, 0x0060,
-        0x0040, 0x3337, 0x6b98, 0x6c94, 0x69ac, 0x68b0, 0xa105, 0x00c0,
-        0x3319, 0x7bd2, 0x7bda, 0x7cd6, 0x7cde, 0xa6b4, 0xb7ff, 0x7e5a,
-        0xa684, 0x0060, 0xa086, 0x0060, 0x0040, 0x3337, 0x68c0, 0xa005,
-        0x0040, 0x3312, 0x7003, 0x0003, 0x682b, 0x0000, 0x1078, 0x48e6,
-        0x0078, 0x3314, 0x1078, 0x48f7, 0xa6b5, 0x2000, 0x7e5a, 0x0078,
-        0x3337, 0x68b0, 0xa31a, 0x2100, 0xa423, 0x2400, 0xa305, 0x0040,
-        0x3337, 0x7bd2, 0x7bda, 0x7cd6, 0x7cde, 0x68b0, 0xa6b4, 0xbfff,
-        0x7e5a, 0x007e, 0x68c0, 0xa005, 0x007f, 0x0040, 0x3335, 0x7003,
-        0x0003, 0x1078, 0x48e6, 0x0078, 0x3337, 0x1078, 0x4942, 0x077f,
-        0x1078, 0x37bd, 0x2009, 0x0065, 0xa684, 0x0004, 0x0040, 0x3358,
-        0x78e4, 0xa084, 0x0030, 0x0040, 0x3350, 0x78ec, 0xa084, 0x0003,
-        0x0040, 0x3350, 0x782b, 0x3008, 0x2009, 0x0065, 0x0078, 0x3358,
-        0x0f7e, 0x2079, 0x5000, 0x1078, 0x4633, 0x0f7f, 0x0040, 0x2461,
-        0x791a, 0x2d00, 0x704a, 0x8207, 0xa084, 0x000f, 0x8003, 0x8003,
-        0x8003, 0xa080, 0x5280, 0x2048, 0x0078, 0x2438, 0x6020, 0xa005,
-        0x0040, 0x3372, 0x8001, 0x6022, 0x6008, 0xa085, 0x0008, 0x600a,
-        0x7010, 0x6026, 0x007c, 0xa006, 0x1078, 0x4633, 0x6817, 0x0000,
-        0x681b, 0x0001, 0x6823, 0x0040, 0x681f, 0x0100, 0x7000, 0xa084,
-        0x0007, 0x0079, 0x3383, 0x2461, 0x338d, 0x338d, 0x33aa, 0x3395,
-        0x3393, 0x3395, 0x338b, 0x1078, 0x23ca, 0x1078, 0x33b5, 0x1078,
-        0x33ae, 0x1078, 0x1c53, 0x0078, 0x2461, 0x706c, 0x706f, 0x0000,
-        0x7093, 0x0000, 0x0079, 0x339c, 0x33a6, 0x33a6, 0x33a4, 0x33a4,
-        0x33a4, 0x33a6, 0x33a4, 0x33a6, 0x0079, 0x2840, 0x706f, 0x0000,
-        0x0078, 0x2461, 0x681b, 0x0000, 0x0078, 0x2eed, 0x6800, 0xa005,
-        0x00c0, 0x33b3, 0x6002, 0x6006, 0x007c, 0x6010, 0xa005, 0x0040,
-        0x33be, 0x8001, 0x00d0, 0x33be, 0x1078, 0x23ca, 0x6012, 0x6008,
-        0xa084, 0xffef, 0x600a, 0x007c, 0x6018, 0xa005, 0x0040, 0x33ca,
-        0x8001, 0x601a, 0x007c, 0x1078, 0x38de, 0x681b, 0x0018, 0x0078,
-        0x3401, 0x1078, 0x38de, 0x681b, 0x0019, 0x0078, 0x3401, 0x1078,
-        0x38de, 0x681b, 0x001a, 0x0078, 0x3401, 0x1078, 0x38de, 0x681b,
-        0x0003, 0x0078, 0x3401, 0x7780, 0x1078, 0x37bd, 0x7184, 0xa18c,
-        0x00ff, 0xa1e8, 0x7300, 0x2d04, 0x2d08, 0x2068, 0xa005, 0x00c0,
-        0x33f3, 0x0078, 0x2461, 0x6814, 0x7280, 0xa206, 0x0040, 0x33fb,
-        0x6800, 0x0078, 0x33ec, 0x6800, 0x200a, 0x681b, 0x0005, 0x708b,
-        0x0000, 0x1078, 0x33b5, 0x6820, 0xa084, 0x0001, 0x00c0, 0x340a,
-        0x1078, 0x33ae, 0x1078, 0x33c4, 0x681f, 0x0000, 0x6823, 0x0020,
-        0x1078, 0x1c53, 0x0078, 0x2461, 0xa282, 0x0003, 0x00c0, 0x366b,
-        0x7da8, 0xa5ac, 0x00ff, 0x7ca8, 0xa4a4, 0x00ff, 0x6920, 0xa18d,
-        0x0080, 0x6922, 0xa184, 0x0100, 0x0040, 0x3478, 0xa18c, 0xfeff,
-        0x6922, 0xa4a4, 0x00ff, 0x0040, 0x3462, 0xa482, 0x000c, 0x0048,
-        0x3435, 0x0040, 0x3435, 0x2021, 0x000c, 0x852b, 0x852b, 0x1078,
-        0x372e, 0x0040, 0x343f, 0x1078, 0x3531, 0x0078, 0x346b, 0x1078,
-        0x36e9, 0x0c7e, 0x2960, 0x6004, 0xa084, 0xfff5, 0x6006, 0x1078,
-        0x3558, 0x0c7f, 0x6920, 0xa18d, 0x0100, 0x6922, 0x7e58, 0xa6b5,
-        0x0004, 0x7e5a, 0xa684, 0x0400, 0x00c0, 0x345c, 0x782b, 0x3008,
-        0x781b, 0x0056, 0x0078, 0x2438, 0x782b, 0x3008, 0x781b, 0x0065,
-        0x0078, 0x2438, 0x0c7e, 0x2960, 0x6004, 0xa084, 0xfff5, 0x6006,
-        0x1078, 0x3558, 0x0c7f, 0x7e58, 0xa684, 0x0400, 0x00c0, 0x3474,
-        0x781b, 0x0058, 0x0078, 0x2438, 0x781b, 0x0065, 0x0078, 0x2438,
-        0x0c7e, 0x7054, 0x2060, 0x6100, 0xa18c, 0x1000, 0x0040, 0x34b8,
-        0x6208, 0x8217, 0xa294, 0x00ff, 0xa282, 0x000c, 0x0048, 0x348c,
-        0x0040, 0x348c, 0x2011, 0x000c, 0x2400, 0xa202, 0x00c8, 0x3491,
-        0x2220, 0x6208, 0xa294, 0x00ff, 0x7018, 0xa086, 0x0028, 0x00c0,
-        0x34a1, 0xa282, 0x0019, 0x00c8, 0x34a7, 0x2011, 0x0019, 0x0078,
-        0x34a7, 0xa282, 0x000c, 0x00c8, 0x34a7, 0x2011, 0x000c, 0x2200,
-        0xa502, 0x00c8, 0x34ac, 0x2228, 0x1078, 0x36ed, 0x852b, 0x852b,
-        0x1078, 0x372e, 0x0040, 0x34b8, 0x1078, 0x3531, 0x0078, 0x34bc,
-        0x1078, 0x36e9, 0x1078, 0x3558, 0x7858, 0xa085, 0x0004, 0x785a,
-        0x0c7f, 0x782b, 0x3008, 0x781b, 0x0065, 0x0078, 0x2438, 0x0c7e,
-        0x2960, 0x6000, 0xa084, 0x1000, 0x00c0, 0x34df, 0x6010, 0xa084,
-        0x000f, 0x00c0, 0x34d9, 0x6104, 0xa18c, 0xfff5, 0x6106, 0x0c7f,
-        0x007c, 0x2011, 0x0032, 0x2019, 0x0000, 0x0078, 0x3506, 0x68a0,
-        0xa084, 0x0200, 0x00c0, 0x34d9, 0x6208, 0xa294, 0x00ff, 0x7018,
-        0xa086, 0x0028, 0x00c0, 0x34f4, 0xa282, 0x0019, 0x00c8, 0x34fa,
-        0x2011, 0x0019, 0x0078, 0x34fa, 0xa282, 0x000c, 0x00c8, 0x34fa,
-        0x2011, 0x000c, 0x6308, 0x831f, 0xa39c, 0x00ff, 0xa382, 0x000c,
-        0x0048, 0x3506, 0x0040, 0x3506, 0x2019, 0x000c, 0x78ab, 0x0001,
-        0x78ab, 0x0003, 0x78ab, 0x0001, 0x7aaa, 0x7baa, 0xa8c0, 0x0005,
-        0x6820, 0xa085, 0x0100, 0x6822, 0x0c7f, 0x007c, 0x0c7e, 0x2960,
-        0xa18c, 0xfff5, 0x6106, 0x2011, 0x0032, 0x2019, 0x0000, 0x0078,
-        0x3521, 0x78ab, 0x0001, 0x78ab, 0x0003, 0x78ab, 0x0001, 0x7aaa,
-        0x7baa, 0xa8c0, 0x0005, 0x6820, 0xa085, 0x0100, 0x6822, 0x0c7f,
-        0x007c, 0x0c7e, 0x7154, 0x2160, 0x1078, 0x3538, 0x0c7f, 0x007c,
-        0x2008, 0xa084, 0xfff0, 0xa425, 0x7c86, 0x6018, 0x789a, 0x7cae,
-        0x6412, 0x78a4, 0xa084, 0xfff8, 0xa18c, 0x0007, 0xa105, 0x78a6,
-        0x6016, 0x788a, 0xa4a4, 0x000f, 0x8427, 0x8204, 0x8004, 0xa084,
-        0x00ff, 0xa405, 0x600e, 0x6004, 0xa084, 0xfff5, 0x6006, 0x007c,
-        0x0c7e, 0x7054, 0x2060, 0x1078, 0x355f, 0x0c7f, 0x007c, 0x6018,
-        0x789a, 0x78a4, 0xa084, 0xfff0, 0x78a6, 0x6012, 0x7884, 0xa084,
-        0xfff0, 0x7886, 0x007c, 0xa282, 0x0002, 0x00c0, 0x366b, 0x7aa8,
-        0x6920, 0xa18d, 0x0080, 0x6922, 0xa184, 0x0200, 0x0040, 0x35b4,
-        0xa18c, 0xfdff, 0x6922, 0xa294, 0x00ff, 0xa282, 0x0002, 0x00c8,
-        0x366b, 0x1078, 0x35fd, 0x1078, 0x3558, 0xa980, 0x0001, 0x200c,
-        0x1078, 0x37b9, 0x1078, 0x34c7, 0x88ff, 0x0040, 0x35a7, 0x789b,
-        0x0060, 0x2800, 0x78aa, 0x7e58, 0xa6b5, 0x0004, 0x7e5a, 0xa684,
-        0x0400, 0x00c0, 0x35a1, 0x782b, 0x3008, 0x781b, 0x0056, 0x0078,
-        0x2438, 0x782b, 0x3008, 0x781b, 0x0065, 0x0078, 0x2438, 0x7e58,
-        0xa684, 0x0400, 0x00c0, 0x35b0, 0x781b, 0x0058, 0x0078, 0x2438,
-        0x781b, 0x0065, 0x0078, 0x2438, 0xa282, 0x0002, 0x00c8, 0x35bc,
-        0xa284, 0x0001, 0x0040, 0x35c6, 0x7154, 0xa188, 0x0000, 0x210c,
-        0xa18c, 0x2000, 0x00c0, 0x35c6, 0x2011, 0x0000, 0x1078, 0x36db,
-        0x1078, 0x35fd, 0x1078, 0x3558, 0x7858, 0xa085, 0x0004, 0x785a,
-        0x782b, 0x3008, 0x781b, 0x0065, 0x0078, 0x2438, 0x0c7e, 0x027e,
-        0x2960, 0x6000, 0x2011, 0x0001, 0xa084, 0x2000, 0x00c0, 0x35ed,
-        0x6014, 0xa084, 0x0040, 0x00c0, 0x35eb, 0xa18c, 0xffef, 0x6106,
-        0xa006, 0x0078, 0x35fa, 0x2011, 0x0000, 0x78ab, 0x0001, 0x78ab,
-        0x0002, 0x78ab, 0x0003, 0x7aaa, 0xa8c0, 0x0004, 0x6820, 0xa085,
-        0x0200, 0x6822, 0x027f, 0x0c7f, 0x007c, 0x0c7e, 0x7054, 0x2060,
-        0x1078, 0x3604, 0x0c7f, 0x007c, 0x82ff, 0x0040, 0x3609, 0x2011,
-        0x0040, 0x6018, 0xa080, 0x0002, 0x789a, 0x78a4, 0xa084, 0xffbf,
-        0xa205, 0x78a6, 0x788a, 0x6016, 0x6004, 0xa084, 0xffef, 0x6006,
-        0x007c, 0x007e, 0x7000, 0xa086, 0x0003, 0x0040, 0x3622, 0x007f,
-        0x0078, 0x3625, 0x007f, 0x0078, 0x3667, 0xa684, 0x0020, 0x0040,
-        0x3667, 0x7888, 0xa084, 0x0040, 0x0040, 0x3667, 0x7bb8, 0xa384,
-        0x003f, 0x831b, 0x00c8, 0x3635, 0x8000, 0xa005, 0x0040, 0x364b,
-        0x831b, 0x00c8, 0x363e, 0x8001, 0x0040, 0x3663, 0xa684, 0x4000,
-        0x0040, 0x364b, 0x78b8, 0x801b, 0x00c8, 0x3647, 0x8000, 0xa084,
-        0x003f, 0x00c0, 0x3663, 0xa6b4, 0xbfff, 0x7e5a, 0x79d8, 0x7adc,
-        0x2001, 0x0001, 0xa108, 0x00c8, 0x3657, 0xa291, 0x0000, 0x79d2,
-        0x79da, 0x7ad6, 0x7ade, 0x1078, 0x49ed, 0x781b, 0x0064, 0x1078,
-        0x4872, 0x0078, 0x2438, 0x781b, 0x0064, 0x0078, 0x2438, 0x781b,
-        0x0065, 0x0078, 0x2438, 0x1078, 0x36a3, 0x782b, 0x3008, 0x781b,
-        0x0065, 0x0078, 0x2438, 0x1078, 0x368f, 0x782b, 0x3008, 0x781b,
-        0x0065, 0x0078, 0x2438, 0x6827, 0x0002, 0x1078, 0x3697, 0x78e4,
-        0xa084, 0x0030, 0x0040, 0x2461, 0x78ec, 0xa084, 0x0003, 0x0040,
-        0x2461, 0x782b, 0x3008, 0x781b, 0x0065, 0x0078, 0x2438, 0x2001,
-        0x0005, 0x0078, 0x36a5, 0x2001, 0x000c, 0x0078, 0x36a5, 0x2001,
-        0x0006, 0x0078, 0x36a5, 0x2001, 0x000d, 0x0078, 0x36a5, 0x2001,
-        0x0009, 0x0078, 0x36a5, 0x2001, 0x0007, 0x789b, 0x0010, 0x78aa,
-        0x789b, 0x0060, 0x78ab, 0x0001, 0xa6b5, 0x0004, 0x7e5a, 0x007c,
-        0x077e, 0x873f, 0xa7bc, 0x000f, 0x873b, 0x873b, 0x8703, 0xa0e0,
-        0x5280, 0xa7b8, 0x0020, 0x7f9a, 0x79a4, 0xa184, 0x000f, 0x0040,
-        0x36c9, 0xa184, 0xfff0, 0x78a6, 0x6012, 0x6004, 0xa085, 0x0008,
-        0x6006, 0x8738, 0x8738, 0x7f9a, 0x79a4, 0xa184, 0x0040, 0x0040,
-        0x36d9, 0xa184, 0xffbf, 0x78a6, 0x6016, 0x6004, 0xa085, 0x0010,
-        0x6006, 0x077f, 0x007c, 0x789b, 0x0010, 0x78ab, 0x0001, 0x78ab,
-        0x0002, 0x78ab, 0x0003, 0x7aaa, 0x789b, 0x0060, 0x78ab, 0x0004,
-        0x007c, 0x2021, 0x0000, 0x2029, 0x0032, 0x789b, 0x0010, 0x78ab,
-        0x0001, 0x78ab, 0x0003, 0x78ab, 0x0001, 0x7daa, 0x7caa, 0x789b,
-        0x0060, 0x78ab, 0x0005, 0x007c, 0x157e, 0x8007, 0xa084, 0x00ff,
-        0x8003, 0x8003, 0xa080, 0x0020, 0x789a, 0x79a4, 0xa18c, 0xfff0,
-        0x2001, 0x5046, 0x2004, 0xa082, 0x0028, 0x0040, 0x3717, 0x2021,
-        0x37a0, 0x2019, 0x0014, 0x20a9, 0x000c, 0x0078, 0x371d, 0x2021,
-        0x37ac, 0x2019, 0x0019, 0x20a9, 0x000d, 0x2011, 0x0064, 0x2404,
-        0xa084, 0xfff0, 0xa106, 0x0040, 0x372c, 0x8420, 0x2300, 0xa210,
-        0x0070, 0x372c, 0x0078, 0x371f, 0x157f, 0x007c, 0x157e, 0x2009,
-        0x5046, 0x210c, 0xa182, 0x0032, 0x0048, 0x3742, 0x0040, 0x3746,
-        0x2009, 0x3792, 0x2019, 0x0011, 0x20a9, 0x000e, 0x2011, 0x0032,
-        0x0078, 0x3758, 0xa182, 0x0028, 0x0040, 0x3750, 0x2009, 0x37a0,
-        0x2019, 0x0014, 0x20a9, 0x000c, 0x2011, 0x0064, 0x0078, 0x3758,
-        0x2009, 0x37ac, 0x2019, 0x0019, 0x20a9, 0x000d, 0x2011, 0x0064,
-        0x2200, 0xa502, 0x0040, 0x3768, 0x0048, 0x3768, 0x8108, 0x2300,
-        0xa210, 0x0070, 0x3765, 0x0078, 0x3758, 0x157f, 0xa006, 0x007c,
-        0x157f, 0xa582, 0x0064, 0x00c8, 0x3777, 0x7808, 0xa085, 0x0070,
-        0x780a, 0x7044, 0xa085, 0x0070, 0x7046, 0x0078, 0x3777, 0x78ec,
-        0xa084, 0x0300, 0x0040, 0x377f, 0x2104, 0x0078, 0x3790, 0x2104,
-        0xa09e, 0x1102, 0x00c0, 0x3790, 0x2001, 0x04fd, 0x2004, 0xa082,
-        0x0005, 0x0048, 0x378f, 0x2001, 0x1201, 0x0078, 0x3790, 0x2104,
-        0xa005, 0x007c, 0x1102, 0x3002, 0x3202, 0x4203, 0x4403, 0x5404,
-        0x5604, 0x6605, 0x6805, 0x7806, 0x7a06, 0x0c07, 0x0c07, 0x0e07,
-        0x3202, 0x4202, 0x5202, 0x6202, 0x7202, 0x6605, 0x7605, 0x7805,
-        0x7a05, 0x7c05, 0x7e05, 0x7f05, 0x2202, 0x3202, 0x4202, 0x5202,
-        0x5404, 0x6404, 0x7404, 0x7604, 0x7804, 0x7a04, 0x7c04, 0x7e04,
-        0x7f04, 0x789b, 0x0010, 0xa046, 0x007c, 0xa784, 0x0f00, 0x800b,
-        0xa784, 0x001f, 0x8003, 0x8003, 0x8003, 0x8003, 0xa105, 0xa0e0,
-        0x5300, 0x007c, 0x79d8, 0x7adc, 0x78d0, 0x801b, 0x00c8, 0x37d1,
-        0x8000, 0xa084, 0x003f, 0xa108, 0xa291, 0x0000, 0x007c, 0x0f7e,
-        0x2079, 0x0100, 0x2009, 0x5040, 0x2091, 0x8000, 0x2104, 0x0079,
-        0x37e1, 0x3817, 0x37eb, 0x37eb, 0x37eb, 0x37eb, 0x37eb, 0x37eb,
-        0x381b, 0x1078, 0x23ca, 0x784b, 0x0004, 0x7848, 0xa084, 0x0004,
-        0x00c0, 0x37ed, 0x784b, 0x0008, 0x7848, 0xa084, 0x0008, 0x00c0,
-        0x37f4, 0x68b4, 0xa085, 0x4000, 0x68b6, 0x7858, 0xa085, 0x4000,
-        0x785a, 0x7830, 0xa084, 0x0080, 0x00c0, 0x3817, 0x0018, 0x3817,
-        0x681c, 0xa084, 0x0020, 0x00c0, 0x3815, 0x0e7e, 0x2071, 0x5040,
-        0x1078, 0x3868, 0x0e7f, 0x0078, 0x3817, 0x781b, 0x00d2, 0x2091,
-        0x8001, 0x0f7f, 0x007c, 0x1078, 0x3a42, 0x0078, 0x3817, 0x0c7e,
-        0x6814, 0x8007, 0xa084, 0x000f, 0x8003, 0x8003, 0x8003, 0xa0e0,
-        0x5280, 0x6004, 0xa084, 0x000a, 0x00c0, 0x3852, 0x6108, 0xa194,
-        0xff00, 0x0040, 0x3852, 0xa18c, 0x00ff, 0x2001, 0x0019, 0xa106,
-        0x0040, 0x3841, 0x2001, 0x0032, 0xa106, 0x0040, 0x3845, 0x0078,
-        0x3849, 0x2009, 0x0020, 0x0078, 0x384b, 0x2009, 0x003f, 0x0078,
-        0x384b, 0x2011, 0x0000, 0x2100, 0xa205, 0x600a, 0x6004, 0xa085,
-        0x0002, 0x6006, 0x0c7f, 0x007c, 0x781b, 0x0065, 0x0078, 0x2438,
-        0x782b, 0x3008, 0x781b, 0x0065, 0x0078, 0x2438, 0x781b, 0x0058,
-        0x0078, 0x2438, 0x782b, 0x3008, 0x781b, 0x0056, 0x0078, 0x2438,
-        0x2009, 0x5020, 0x210c, 0xa186, 0x0000, 0x0040, 0x387c, 0xa186,
-        0x0001, 0x0040, 0x387f, 0x2009, 0x5038, 0x200b, 0x000b, 0x706f,
-        0x0001, 0x781b, 0x0048, 0x007c, 0x781b, 0x00cc, 0x007c, 0x2009,
-        0x5038, 0x200b, 0x000a, 0x007c, 0x2009, 0x5020, 0x210c, 0xa186,
-        0x0000, 0x0040, 0x389f, 0xa186, 0x0001, 0x0040, 0x3899, 0x2009,
-        0x5038, 0x200b, 0x000b, 0x706f, 0x0001, 0x781b, 0x0048, 0x0078,
-        0x2438, 0x2009, 0x5038, 0x200b, 0x000a, 0x0078, 0x2438, 0x782b,
-        0x3008, 0x781b, 0x00cc, 0x0078, 0x2438, 0x781b, 0x00d2, 0x0078,
-        0x2438, 0x782b, 0x3008, 0x781b, 0x00d2, 0x0078, 0x2438, 0x781b,
-        0x0093, 0x0078, 0x2438, 0x782b, 0x3008, 0x781b, 0x0093, 0x0078,
-        0x2438, 0x6818, 0xa084, 0x8000, 0x0040, 0x38c0, 0x681b, 0x001d,
-        0x706f, 0x0001, 0x781b, 0x0048, 0x0078, 0x2438, 0x007e, 0x7830,
-        0xa084, 0x00c0, 0x00c0, 0x38dc, 0x7808, 0xa084, 0xfffc, 0x780a,
-        0x0005, 0x0005, 0x0005, 0x0005, 0x78ec, 0xa084, 0x0021, 0x0040,
-        0x38dc, 0x7044, 0x780a, 0xa005, 0x007f, 0x007c, 0x7044, 0xa085,
-        0x0002, 0x7046, 0x780a, 0x007c, 0x007e, 0x7830, 0xa084, 0x0040,
-        0x00c0, 0x38e5, 0x0098, 0x38f0, 0x007f, 0x789a, 0x78ac, 0x007c,
-        0x7808, 0xa084, 0xfffd, 0x780a, 0x0005, 0x0005, 0x0005, 0x0005,
-        0x78ec, 0xa084, 0x0021, 0x0040, 0x38ff, 0x0098, 0x38fd, 0x007f,
-        0x789a, 0x78ac, 0x007e, 0x7044, 0x780a, 0x007f, 0x007c, 0x78ec,
-        0xa084, 0x0002, 0x00c0, 0x461d, 0xa784, 0x007d, 0x00c0, 0x3913,
-        0x2700, 0x1078, 0x23ca, 0xa784, 0x0001, 0x00c0, 0x2f43, 0xa784,
-        0x0070, 0x0040, 0x3923, 0x0c7e, 0x2d60, 0x2f68, 0x1078, 0x2375,
-        0x2d78, 0x2c68, 0x0c7f, 0xa784, 0x0008, 0x0040, 0x3930, 0x784b,
-        0x0008, 0x78ec, 0xa084, 0x0003, 0x0040, 0x2461, 0x0078, 0x3854,
-        0xa784, 0x0004, 0x0040, 0x3963, 0x78b8, 0xa084, 0x4001, 0x0040,
-        0x3963, 0x784b, 0x0008, 0x78ec, 0xa084, 0x0003, 0x0040, 0x2461,
-        0x78e4, 0xa084, 0x0007, 0xa086, 0x0001, 0x00c0, 0x3963, 0x78c0,
-        0xa085, 0x4800, 0x2030, 0x7e5a, 0x781b, 0x00d2, 0x0078, 0x2438,
-        0x784b, 0x0008, 0x6818, 0xa084, 0x8000, 0x0040, 0x395f, 0x681b,
-        0x0015, 0xa684, 0x4000, 0x0040, 0x395f, 0x681b, 0x0007, 0x1078,
-        0x3868, 0x0078, 0x2438, 0x681b, 0x0003, 0x7858, 0xa084, 0x3f00,
-        0x681e, 0x682f, 0x0000, 0x6833, 0x0000, 0x784b, 0x0008, 0x78ec,
-        0xa084, 0x0003, 0x0040, 0x2944, 0x0018, 0x2438, 0x0078, 0x3673,
-        0x6b14, 0x8307, 0xa084, 0x000f, 0x8003, 0x8003, 0x8003, 0xa080,
-        0x5280, 0x2060, 0x2048, 0x7056, 0x6000, 0x705a, 0x6004, 0x705e,
-        0x2a60, 0x007c, 0x0079, 0x398c, 0x3994, 0x3995, 0x3994, 0x3997,
-        0x3994, 0x3994, 0x3994, 0x399c, 0x007c, 0x1078, 0x33c4, 0x1078,
-        0x4633, 0x7038, 0x600a, 0x007c, 0x70a0, 0xa005, 0x0040, 0x39a9,
-        0x2068, 0x1078, 0x1b45, 0x1078, 0x45b5, 0x1078, 0x45bc, 0x70a3,
-        0x0000, 0x007c, 0x0e7e, 0x2091, 0x8000, 0x2071, 0x5040, 0x7000,
-        0xa086, 0x0007, 0x00c0, 0x39c0, 0x6110, 0x70bc, 0xa106, 0x00c0,
-        0x39c0, 0x0e7f, 0x1078, 0x1b52, 0x1078, 0x39c6, 0xa006, 0x007c,
-        0x2091, 0x8001, 0x0e7f, 0xa085, 0x0001, 0x007c, 0x0f7e, 0x0e7e,
-        0x2071, 0x5040, 0x0078, 0x21d9, 0x785b, 0x0000, 0x70af, 0x000e,
-        0x2009, 0x0100, 0x017e, 0x70a0, 0xa06d, 0x0040, 0x39db, 0x70a3,
-        0x0000, 0x0078, 0x39e1, 0x70b3, 0x0000, 0x1078, 0x1b6e, 0x0040,
-        0x39e7, 0x70ac, 0x6826, 0x1078, 0x3ac2, 0x0078, 0x39db, 0x017f,
-        0x157e, 0x0c7e, 0x0d7e, 0x20a9, 0x0008, 0x2061, 0x7410, 0x6000,
-        0xa105, 0x6002, 0x601c, 0xa06d, 0x0040, 0x39ff, 0x6800, 0x601e,
-        0x1078, 0x193d, 0x6008, 0x8000, 0x600a, 0x0078, 0x39f2, 0x6018,
-        0xa06d, 0x0040, 0x3a09, 0x6800, 0x601a, 0x1078, 0x193d, 0x0078,
-        0x39ff, 0xace0, 0x0008, 0x0070, 0x3a0f, 0x0078, 0x39ef, 0x709c,
-        0xa084, 0x8000, 0x0040, 0x3a16, 0x1078, 0x3b3c, 0x0d7f, 0x0c7f,
-        0x157f, 0x007c, 0x127e, 0x2091, 0x2300, 0x6804, 0xa084, 0x000f,
-        0x0079, 0x3a22, 0x3a32, 0x3a32, 0x3a32, 0x3a32, 0x3a32, 0x3a32,
-        0x3a34, 0x3a3a, 0x3a32, 0x3a32, 0x3a32, 0x3a32, 0x3a32, 0x3a3c,
-        0x3a32, 0x3a34, 0x1078, 0x23ca, 0x1078, 0x4466, 0x1078, 0x193d,
-        0x0078, 0x3a40, 0x6827, 0x000b, 0x1078, 0x4466, 0x1078, 0x3ac2,
-        0x127f, 0x007c, 0x127e, 0x2091, 0x2300, 0x0098, 0x3a5e, 0x7830,
-        0xa084, 0x00c0, 0x00c0, 0x3a5e, 0x0d7e, 0x1078, 0x45c5, 0x2d00,
-        0x682e, 0x2009, 0x0004, 0x2001, 0x0000, 0x6827, 0x0084, 0x1078,
-        0x457e, 0x1078, 0x3ac2, 0x0d7f, 0x0078, 0x3a90, 0x7948, 0xa185,
-        0x4000, 0x784a, 0x0098, 0x3a67, 0x794a, 0x0078, 0x3a4c, 0x7828,
-        0xa086, 0x1834, 0x00c0, 0x3a70, 0xa185, 0x0004, 0x0078, 0x3a77,
-        0x7828, 0xa186, 0x1814, 0x00c0, 0x3a64, 0xa185, 0x000c, 0x784a,
-        0x789b, 0x000e, 0x78ab, 0x0002, 0x7858, 0xa084, 0x00ff, 0xa085,
-        0x0400, 0x785a, 0x70b4, 0xa080, 0x0091, 0x781a, 0x6827, 0x0002,
-        0x6827, 0x0084, 0x2009, 0x0004, 0x2001, 0x0000, 0x1078, 0x457e,
-        0x127f, 0x007c, 0x0d7e, 0x6b14, 0x1078, 0x1be0, 0x0040, 0x3a9f,
-        0x2068, 0x6827, 0x0002, 0x1078, 0x3ac2, 0x0078, 0x3a94, 0x0d7f,
-        0x007c, 0x0d7e, 0x6b14, 0x6c28, 0xa4a4, 0x00ff, 0x1078, 0x1b7e,
-        0x0040, 0x3aaf, 0x2068, 0x6827, 0x0002, 0x1078, 0x3ac2, 0x0d7f,
-        0x007c, 0x0d7e, 0x6b14, 0xa39c, 0x00ff, 0x1078, 0x1bb1, 0x0040,
-        0x3ac0, 0x2068, 0x6827, 0x0002, 0x1078, 0x3ac2, 0x0078, 0x3ab5,
-        0x0d7f, 0x007c, 0x0c7e, 0x6914, 0x1078, 0x3b33, 0x6904, 0xa18c,
-        0x00ff, 0xa186, 0x0006, 0x0040, 0x3add, 0xa186, 0x000d, 0x0040,
-        0x3afc, 0xa186, 0x0017, 0x00c0, 0x3ad9, 0x1078, 0x193d, 0x0078,
-        0x3adb, 0x1078, 0x1c55, 0x0c7f, 0x007c, 0x6004, 0x8001, 0x0048,
-        0x3afa, 0x6006, 0x2009, 0x0000, 0xa684, 0x0001, 0x00c0, 0x3aea,
-        0xa18d, 0x8000, 0xa684, 0x0004, 0x0040, 0x3af0, 0xa18d, 0x0002,
-        0x691e, 0x6823, 0x0000, 0x7104, 0x810f, 0x6818, 0xa105, 0x681a,
-        0x0078, 0x3ad9, 0x1078, 0x23ca, 0x6018, 0xa005, 0x00c0, 0x3b0b,
-        0x6008, 0x8001, 0x0048, 0x3b0b, 0x600a, 0x601c, 0x6802, 0x2d00,
-        0x601e, 0x0078, 0x3b21, 0xac88, 0x0006, 0x2104, 0xa005, 0x0040,
-        0x3b14, 0x2008, 0x0078, 0x3b0d, 0x6802, 0x2d0a, 0x6008, 0x8001,
-        0x0048, 0x3adb, 0x600a, 0x6018, 0x2068, 0x6800, 0x601a, 0x0078,
-        0x3b05, 0x157e, 0x137e, 0x147e, 0x0c7e, 0x0d7e, 0x1078, 0x191a,
-        0x2da0, 0x137f, 0x20a9, 0x0031, 0x53a3, 0x0c7f, 0x147f, 0x137f,
-        0x157f, 0x0078, 0x3ad9, 0xa184, 0x001f, 0x8003, 0x8003, 0x8003,
-        0xa080, 0x7410, 0x2060, 0x007c, 0x2019, 0x5051, 0x2304, 0xa085,
-        0x0001, 0x201a, 0x2019, 0x0102, 0x2304, 0xa085, 0x0001, 0x201a,
-        0x007c, 0x2019, 0x5051, 0x2304, 0xa084, 0xfffe, 0x201a, 0x2019,
-        0x0102, 0x2304, 0xa084, 0xfffe, 0x201a, 0x007c, 0x7990, 0xa18c,
-        0xfff8, 0x7992, 0x70b4, 0xa080, 0x00d8, 0x781a, 0x0078, 0x2438,
-        0x70a3, 0x0000, 0x7003, 0x0000, 0x7043, 0x0001, 0x7037, 0x0000,
-        0x0018, 0x23ef, 0x1078, 0x1b6e, 0x0040, 0x3b91, 0x2009, 0x500f,
-        0x200b, 0x0000, 0x68bc, 0x2060, 0x6100, 0xa184, 0x0300, 0x0040,
-        0x3b85, 0x6827, 0x000e, 0xa084, 0x0200, 0x0040, 0x3b81, 0x6827,
-        0x0017, 0x1078, 0x3ac2, 0x0078, 0x3b60, 0x7000, 0xa086, 0x0007,
-        0x00c0, 0x3be3, 0x2d00, 0x70a2, 0xad80, 0x000f, 0x7036, 0x0078,
-        0x3b98, 0x7040, 0xa086, 0x0001, 0x0040, 0x2471, 0x0078, 0x2438,
-        0x2031, 0x0000, 0x691c, 0xa184, 0x0002, 0x0040, 0x3ba1, 0xa6b5,
-        0x0004, 0xa184, 0x00c0, 0x8003, 0x8003, 0x8007, 0xa080, 0x3c72,
-        0x2004, 0xa635, 0x6820, 0xa084, 0x0400, 0x0040, 0x3bb9, 0x789b,
-        0x0018, 0x78ab, 0x0003, 0x789b, 0x0081, 0x78ab, 0x0001, 0xa6b5,
-        0x1000, 0x6820, 0xa084, 0x8000, 0x0040, 0x3bc5, 0xa6b5, 0x0400,
-        0x789b, 0x000e, 0x6824, 0x8007, 0x78aa, 0xa684, 0x0200, 0x0040,
-        0x3bdf, 0x682c, 0x78d2, 0x6830, 0x78d6, 0xa684, 0x0100, 0x0040,
-        0x3bdd, 0x682c, 0xa084, 0x0001, 0x0040, 0x3bdd, 0x7888, 0xa084,
-        0x0040, 0x0040, 0x3bdd, 0xa6b5, 0x8000, 0x1078, 0x45ad, 0x7e5a,
-        0x6eb6, 0x0078, 0x45e4, 0x1078, 0x38c6, 0x00c0, 0x3c6c, 0x702c,
-        0x8004, 0x0048, 0x3bf1, 0x2019, 0x4cfd, 0x1078, 0x2255, 0x702f,
-        0x0001, 0x2011, 0x0001, 0x2031, 0x1000, 0x789b, 0x0018, 0x6814,
-        0xa084, 0x001f, 0xa085, 0x0080, 0x78aa, 0x691c, 0xa184, 0x0002,
-        0x0040, 0x3c0a, 0xa6b5, 0x0004, 0x78ab, 0x0020, 0x6828, 0x78aa,
-        0xa290, 0x0002, 0x6820, 0xa084, 0x8000, 0x0040, 0x3c18, 0xa6b5,
-        0x0400, 0x789b, 0x000e, 0x6824, 0x8007, 0x78aa, 0x0078, 0x3c26,
-        0x681c, 0xa084, 0x8000, 0x00c0, 0x3c26, 0xa6b5, 0x0800, 0x6820,
-        0xa084, 0x0100, 0x0040, 0x3c26, 0xa6b5, 0x4000, 0x681c, 0xa084,
-        0x00c0, 0x8003, 0x8003, 0x8007, 0xa080, 0x3c72, 0x2004, 0xa635,
-        0xa684, 0x0100, 0x0040, 0x3c40, 0x682c, 0xa084, 0x0001, 0x0040,
-        0x3c40, 0x7888, 0xa084, 0x0040, 0x0040, 0x3c40, 0xa6b5, 0x8000,
-        0x789b, 0x007e, 0x7eae, 0x6eb6, 0x6814, 0x8007, 0x78aa, 0x7882,
-        0x7aaa, 0x7830, 0xa084, 0x00c0, 0x00c0, 0x3c6c, 0x0018, 0x3c6c,
-        0x70b4, 0xa080, 0x00dd, 0x781a, 0x1078, 0x38de, 0xa684, 0x0200,
-        0x0040, 0x3c60, 0x682c, 0x78d2, 0x6830, 0x78d6, 0x1078, 0x45ad,
-        0x2d00, 0x70a2, 0x704a, 0x6810, 0x70be, 0x7003, 0x0007, 0xad80,
-        0x000f, 0x7036, 0x0078, 0x2438, 0x1078, 0x1b45, 0x1078, 0x38de,
-        0x0078, 0x2438, 0x0000, 0x0300, 0x0200, 0x0000, 0x1078, 0x23ca,
-        0x2300, 0x0079, 0x3c7b, 0x3c7e, 0x3c7e, 0x3c80, 0x1078, 0x23ca,
-        0x1078, 0x45bc, 0x6924, 0xa184, 0x00ff, 0xa086, 0x000a, 0x0040,
-        0x3c92, 0xa184, 0xff00, 0xa085, 0x000a, 0x6826, 0x1078, 0x1b45,
-        0x0078, 0x3b60, 0x2001, 0x000a, 0x1078, 0x454c, 0x0078, 0x3b60,
-        0xa282, 0x0005, 0x0050, 0x3c9e, 0x1078, 0x23ca, 0x7000, 0xa084,
-        0x0007, 0x10c0, 0x398a, 0x1078, 0x191a, 0x00c0, 0x3cbd, 0xa684,
-        0x0004, 0x0040, 0x3caf, 0x2001, 0x2800, 0x0078, 0x3cb1, 0x2001,
-        0x0800, 0x71b4, 0xa188, 0x0091, 0x789b, 0x000e, 0x78aa, 0x2031,
-        0x0400, 0x7e5a, 0x791a, 0x0078, 0x2438, 0x6807, 0x0106, 0x680b,
-        0x0000, 0x689f, 0x0000, 0x6827, 0x0000, 0xa386, 0x0002, 0x00c0,
-        0x3cde, 0xa286, 0x0002, 0x00c0, 0x3cde, 0x78a0, 0xa005, 0x00c0,
-        0x3cde, 0xa484, 0x8000, 0x00c0, 0x3cde, 0x78e4, 0xa084, 0x0008,
-        0x0040, 0x3cde, 0xa6b5, 0x0008, 0x2019, 0x0000, 0x1078, 0x40d3,
-        0x2d00, 0x70a2, 0x704a, 0x7003, 0x0007, 0x7037, 0x0000, 0x6824,
-        0xa084, 0x0080, 0x0040, 0x3cf0, 0x1078, 0x4180, 0x0078, 0x2438,
-        0x2300, 0x0079, 0x3cf3, 0x3cf6, 0x3d77, 0x3d96, 0x2200, 0x0079,
-        0x3cf9, 0x3cfe, 0x3d0e, 0x3d34, 0x3d40, 0x3d63, 0x2029, 0x0001,
-        0xa026, 0x2011, 0x0000, 0x1078, 0x428d, 0x0079, 0x3d07, 0x3d0c,
-        0x2438, 0x3b60, 0x3d0c, 0x3d0c, 0x1078, 0x23ca, 0x7990, 0xa18c,
-        0x0007, 0x00c0, 0x3d15, 0x2009, 0x0008, 0x2011, 0x0001, 0xa684,
-        0x0004, 0x0040, 0x3d1d, 0x2011, 0x0003, 0x2220, 0xa12a, 0x2011,
-        0x0001, 0x1078, 0x428d, 0x0079, 0x3d25, 0x3d2a, 0x2438, 0x3b60,
-        0x3d32, 0x3d2c, 0x0078, 0x45ea, 0x70ab, 0x3d30, 0x0078, 0x2438,
-        0x0078, 0x3d2a, 0x1078, 0x23ca, 0xa684, 0x0010, 0x0040, 0x3d3e,
-        0x1078, 0x414f, 0x0040, 0x3d3e, 0x0078, 0x2438, 0x0078, 0x41bc,
-        0x6000, 0xa084, 0x0002, 0x0040, 0x3d5d, 0x70b4, 0xa080, 0x00cd,
-        0x781a, 0x0d7e, 0x1078, 0x45c5, 0x2d00, 0x682e, 0x6827, 0x0000,
-        0x1078, 0x3ac2, 0x0d7f, 0x1078, 0x193d, 0x7003, 0x0000, 0x7037,
-        0x0000, 0x704b, 0x0000, 0x0078, 0x3b60, 0xa684, 0x0004, 0x00c0,
-        0x3d63, 0x0078, 0x45ea, 0x6000, 0xa084, 0x0004, 0x00c0, 0x3d75,
-        0x6000, 0xa084, 0x0001, 0x0040, 0x3d75, 0x70ab, 0x3d75, 0x2001,
-        0x0007, 0x1078, 0x4544, 0x0078, 0x45f0, 0x0078, 0x45ea, 0x2200,
-        0x0079, 0x3d7a, 0x3d7f, 0x3d7f, 0x3d7f, 0x3d81, 0x3d7f, 0x1078,
-        0x23ca, 0x70a7, 0x3d85, 0x0078, 0x45f6, 0x2011, 0x0018, 0x1078,
-        0x4287, 0x0079, 0x3d8b, 0x3d90, 0x2438, 0x3b60, 0x3d92, 0x3d94,
-        0x1078, 0x23ca, 0x1078, 0x23ca, 0x1078, 0x23ca, 0x2200, 0x0079,
-        0x3d99, 0x3d9e, 0x3da0, 0x3da0, 0x3d9e, 0x3d9e, 0x1078, 0x23ca,
-        0x78e4, 0xa084, 0x0008, 0x0040, 0x3db5, 0x70a7, 0x3da9, 0x0078,
-        0x45f6, 0x2011, 0x0004, 0x1078, 0x4287, 0x0079, 0x3daf, 0x3db5,
-        0x2438, 0x3b60, 0x3db5, 0x3dbf, 0x3dc3, 0x70ab, 0x3dbd, 0x2001,
-        0x0003, 0x1078, 0x4544, 0x0078, 0x45f0, 0x0078, 0x45ea, 0x70ab,
-        0x3db5, 0x0078, 0x2438, 0x70ab, 0x3dc7, 0x0078, 0x2438, 0x0078,
-        0x3dbd, 0xa282, 0x0003, 0x0050, 0x3dcf, 0x1078, 0x23ca, 0xa386,
-        0x0002, 0x00c0, 0x3de8, 0xa286, 0x0002, 0x00c0, 0x3dee, 0x78a0,
-        0xa005, 0x00c0, 0x3dee, 0xa484, 0x8000, 0x00c0, 0x3dee, 0x78e4,
-        0xa084, 0x0008, 0x0040, 0x3de8, 0xa6b5, 0x0008, 0x2019, 0x0000,
-        0xa684, 0x0008, 0x0040, 0x3dee, 0x1078, 0x412c, 0x6810, 0x70be,
-        0x7003, 0x0007, 0x2300, 0x0079, 0x3df5, 0x3df8, 0x3e25, 0x3e2d,
-        0x2200, 0x0079, 0x3dfb, 0x3e00, 0x3dfe, 0x3e19, 0x1078, 0x23ca,
-        0x7990, 0xa1ac, 0x0007, 0xa026, 0x2011, 0x0001, 0x1078, 0x428d,
-        0x0079, 0x3e0a, 0x3e0f, 0x2438, 0x3b60, 0x3e17, 0x3e11, 0x0078,
-        0x45ea, 0x70ab, 0x3e15, 0x0078, 0x2438, 0x0078, 0x3e0f, 0x1078,
-        0x23ca, 0xa684, 0x0010, 0x0040, 0x3e23, 0x1078, 0x414f, 0x0040,
-        0x3e23, 0x0078, 0x2438, 0x0078, 0x41bc, 0x2200, 0x0079, 0x3e28,
-        0x3e2b, 0x3e2b, 0x3e2b, 0x1078, 0x23ca, 0x2200, 0x0079, 0x3e30,
-        0x3e33, 0x3e35, 0x3e35, 0x1078, 0x23ca, 0x78e4, 0xa084, 0x0008,
-        0x0040, 0x3e4a, 0x70a7, 0x3e3e, 0x0078, 0x45f6, 0x2011, 0x0004,
-        0x1078, 0x4287, 0x0079, 0x3e44, 0x3e4a, 0x2438, 0x3b60, 0x3e4a,
-        0x3e54, 0x3e58, 0x70ab, 0x3e52, 0x2001, 0x0003, 0x1078, 0x4544,
-        0x0078, 0x45f0, 0x0078, 0x45ea, 0x70ab, 0x3e4a, 0x0078, 0x2438,
-        0x70ab, 0x3e5c, 0x0078, 0x2438, 0x0078, 0x3e52, 0x2300, 0x0079,
-        0x3e61, 0x3e66, 0x3e68, 0x3e64, 0x1078, 0x23ca, 0x70a4, 0x007a,
-        0x70a4, 0x007a, 0xa282, 0x0002, 0x0050, 0x3e70, 0x1078, 0x23ca,
-        0xa684, 0x0200, 0x0040, 0x3e7a, 0x1078, 0x45b5, 0x1078, 0x426f,
-        0x1078, 0x45bc, 0x2300, 0x0079, 0x3e7d, 0x3e80, 0x3ea4, 0x3f0a,
-        0xa286, 0x0001, 0x0040, 0x3e86, 0x1078, 0x23ca, 0xa684, 0x0200,
-        0x0040, 0x3e8e, 0x1078, 0x45b5, 0x1078, 0x45bc, 0x2001, 0x0001,
-        0x1078, 0x454c, 0x78b8, 0xa084, 0xc001, 0x0040, 0x3ea0, 0x7848,
-        0xa085, 0x0008, 0x784a, 0x7848, 0xa084, 0x0008, 0x00c0, 0x3e9b,
-        0x7003, 0x0000, 0x0078, 0x3b60, 0x2200, 0x0079, 0x3ea7, 0x3ea9,
-        0x3eda, 0x70a7, 0x3ead, 0x0078, 0x45f6, 0x2011, 0x000d, 0x1078,
-        0x4287, 0x0079, 0x3eb3, 0x3eba, 0x2438, 0x3b60, 0x3ec2, 0x3eca,
-        0x3ed0, 0x3ed2, 0xa6b4, 0x00ff, 0xa6b5, 0x0400, 0x6eb6, 0x7e5a,
-        0x0078, 0x45e4, 0xa6b4, 0x00ff, 0xa6b5, 0x0400, 0x6eb6, 0x7e5a,
-        0x0078, 0x45e4, 0x70ab, 0x3ece, 0x0078, 0x2438, 0x0078, 0x3eba,
-        0x1078, 0x23ca, 0x70ab, 0x3ed6, 0x0078, 0x2438, 0x1078, 0x45fc,
-        0x0078, 0x2438, 0x70a7, 0x3ede, 0x0078, 0x45f6, 0x2011, 0x0012,
-        0x1078, 0x4287, 0x0079, 0x3ee4, 0x3eea, 0x2438, 0x3b60, 0x3ef6,
-        0x3efe, 0x3f04, 0xa6b4, 0x00ff, 0xa6b5, 0x0400, 0x6eb6, 0x7e5a,
-        0x70b4, 0xa080, 0x00a5, 0x781a, 0x0078, 0x2438, 0xa6b4, 0x00ff,
-        0xa6b5, 0x0400, 0x6eb6, 0x7e5a, 0x0078, 0x45e4, 0x70ab, 0x3f02,
-        0x0078, 0x2438, 0x0078, 0x3eea, 0x70ab, 0x3f08, 0x0078, 0x2438,
-        0x0078, 0x3ef6, 0xa286, 0x0001, 0x0040, 0x3f10, 0x1078, 0x23ca,
-        0x70a7, 0x3f14, 0x0078, 0x45f6, 0x2011, 0x0015, 0x1078, 0x4287,
-        0x0079, 0x3f1a, 0x3f1f, 0x2438, 0x3b60, 0x3f2d, 0x3f39, 0xa6b4,
-        0x00ff, 0xa6b5, 0x0400, 0x6eb6, 0x7e5a, 0x783b, 0x1301, 0x70b4,
-        0xa080, 0x00b5, 0x781a, 0x0078, 0x2438, 0xa6b4, 0x00ff, 0xa6b5,
-        0x0400, 0x6eb6, 0x7e5a, 0x70b4, 0xa080, 0x00a5, 0x781a, 0x0078,
-        0x2438, 0x70ab, 0x3f3d, 0x0078, 0x2438, 0x0078, 0x3f1f, 0xa282,
-        0x0003, 0x0050, 0x3f45, 0x1078, 0x23ca, 0x2300, 0x0079, 0x3f48,
-        0x3f4b, 0x3f82, 0x3fdd, 0xa286, 0x0001, 0x0040, 0x3f51, 0x1078,
-        0x23ca, 0x6804, 0xa084, 0x00ff, 0xa086, 0x0006, 0x00c0, 0x3f5e,
-        0x1078, 0x3ac2, 0x7003, 0x0000, 0x0078, 0x3b60, 0x683b, 0x0000,
-        0x6837, 0x0000, 0xa684, 0x0200, 0x0040, 0x3f6c, 0x1078, 0x45b5,
-        0x1078, 0x426f, 0x1078, 0x45bc, 0x2001, 0x0001, 0x1078, 0x454c,
-        0x78b8, 0xa084, 0xc001, 0x0040, 0x3f7e, 0x7848, 0xa085, 0x0008,
-        0x784a, 0x7848, 0xa084, 0x0008, 0x00c0, 0x3f79, 0x7003, 0x0000,
-        0x0078, 0x3b60, 0x2200, 0x0079, 0x3f85, 0x3f87, 0x3fb8, 0x70a7,
-        0x3f8b, 0x0078, 0x45f6, 0x2011, 0x000d, 0x1078, 0x4287, 0x0079,
-        0x3f91, 0x3f98, 0x2438, 0x3b60, 0x3fa0, 0x3fa8, 0x3fae, 0x3fb0,
-        0xa6b4, 0x00ff, 0xa6b5, 0x0800, 0x6eb6, 0x7e5a, 0x0078, 0x45e4,
-        0xa6b4, 0x00ff, 0xa6b5, 0x0800, 0x6eb6, 0x7e5a, 0x0078, 0x45e4,
-        0x70ab, 0x3fac, 0x0078, 0x2438, 0x0078, 0x3f98, 0x1078, 0x23ca,
-        0x70ab, 0x3fb4, 0x0078, 0x2438, 0x1078, 0x45fc, 0x0078, 0x2438,
-        0x70a7, 0x3fbc, 0x0078, 0x45f6, 0x2011, 0x0005, 0x1078, 0x4287,
-        0x0079, 0x3fc2, 0x3fc7, 0x2438, 0x3b60, 0x3fcf, 0x3fd7, 0xa6b4,
-        0x00ff, 0xa6b5, 0x0800, 0x6eb6, 0x7e5a, 0x0078, 0x45e4, 0xa6b4,
-        0x00ff, 0xa6b5, 0x0800, 0x6eb6, 0x7e5a, 0x0078, 0x45e4, 0x70ab,
-        0x3fdb, 0x0078, 0x2438, 0x0078, 0x3fc7, 0xa286, 0x0001, 0x0040,
-        0x3fe3, 0x1078, 0x23ca, 0x70a7, 0x3fe7, 0x0078, 0x45f6, 0x2011,
-        0x0006, 0x1078, 0x4287, 0x0079, 0x3fed, 0x3ff2, 0x2438, 0x3b60,
-        0x3ff8, 0x4002, 0xa6b5, 0x0800, 0x6eb6, 0x7e5a, 0x0078, 0x45e4,
-        0xa6b4, 0x00ff, 0xa6b5, 0x0800, 0x6eb6, 0xa6b5, 0x4000, 0x7e5a,
-        0x0078, 0x45e4, 0x70ab, 0x4006, 0x0078, 0x2438, 0x0078, 0x3ff2,
-        0x2300, 0x0079, 0x400b, 0x4010, 0x400e, 0x400e, 0x1078, 0x23ca,
-        0x1078, 0x23ca, 0x2300, 0x71a8, 0xa005, 0x017a, 0x6810, 0x70be,
-        0xa282, 0x0003, 0x0050, 0x401e, 0x1078, 0x23ca, 0x2300, 0x0079,
-        0x4021, 0x4024, 0x4037, 0x4059, 0x82ff, 0x00c0, 0x4029, 0x1078,
-        0x23ca, 0xa684, 0x0200, 0x0040, 0x4031, 0x1078, 0x45b5, 0x1078,
-        0x45bc, 0x2001, 0x0001, 0x1078, 0x454c, 0x0078, 0x2438, 0xa296,
-        0x0002, 0x0040, 0x4040, 0x82ff, 0x0040, 0x4040, 0x1078, 0x23ca,
-        0x70a7, 0x4044, 0x0078, 0x45f6, 0x2011, 0x0018, 0x1078, 0x4287,
-        0x0079, 0x404a, 0x404f, 0x2438, 0x3b60, 0x4051, 0x4053, 0x0078,
-        0x45e4, 0x0078, 0x45e4, 0x70ab, 0x4057, 0x0078, 0x2438, 0x0078,
-        0x404f, 0x2200, 0x0079, 0x405c, 0x405e, 0x4077, 0x70a7, 0x4062,
-        0x0078, 0x45f6, 0x2011, 0x0017, 0x1078, 0x4287, 0x0079, 0x4068,
-        0x406d, 0x2438, 0x3b60, 0x406f, 0x4071, 0x0078, 0x45e4, 0x0078,
-        0x45e4, 0x70ab, 0x4075, 0x0078, 0x2438, 0x0078, 0x406d, 0xa484,
-        0x8000, 0x00c0, 0x40c1, 0xa684, 0x0100, 0x0040, 0x408b, 0x1078,
-        0x45b5, 0x1078, 0x426f, 0x1078, 0x45bc, 0x7848, 0xa085, 0x000c,
-        0x784a, 0x0078, 0x408f, 0x78d8, 0x78d2, 0x78dc, 0x78d6, 0xa6b4,
-        0xefff, 0x7e5a, 0x70a7, 0x4096, 0x0078, 0x45f6, 0x2011, 0x000d,
-        0x1078, 0x4287, 0x0079, 0x409c, 0x40a3, 0x2438, 0x3b60, 0x40a3,
-        0x40b1, 0x40b7, 0x40b9, 0xa684, 0x0100, 0x0040, 0x40af, 0x1078,
-        0x4573, 0x682c, 0x78d2, 0x6830, 0x78d6, 0x1078, 0x45ad, 0x0078,
-        0x45e4, 0x70ab, 0x40b5, 0x0078, 0x2438, 0x0078, 0x40a3, 0x1078,
-        0x23ca, 0x70ab, 0x40bd, 0x0078, 0x2438, 0x1078, 0x45fc, 0x0078,
-        0x2438, 0x1078, 0x45bc, 0x70ab, 0x40cb, 0x2001, 0x0003, 0x1078,
-        0x4544, 0x0078, 0x45f0, 0x1078, 0x45ad, 0x682c, 0x78d2, 0x6830,
-        0x78d6, 0x0078, 0x45e4, 0x70b8, 0x6812, 0x70be, 0x8000, 0x70ba,
-        0x681b, 0x0000, 0xa684, 0x0008, 0x0040, 0x40f6, 0x157e, 0x137e,
-        0x147e, 0x7890, 0x8004, 0x8004, 0x8004, 0x8004, 0xa084, 0x000f,
-        0x681a, 0x80ac, 0x789b, 0x0000, 0xaf80, 0x002b, 0x2098, 0xad80,
-        0x000b, 0x20a0, 0x53a5, 0x147f, 0x137f, 0x157f, 0xa6c4, 0x0f00,
-        0xa684, 0x0002, 0x00c0, 0x4102, 0x692c, 0x810d, 0x810d, 0x810d,
-        0x0078, 0x410f, 0x789b, 0x0010, 0x79ac, 0x0078, 0x410f, 0x017e,
-        0x2009, 0x0005, 0x2001, 0x3d00, 0x1078, 0x457e, 0x017f, 0xa184,
-        0x001f, 0xa805, 0x6816, 0x1078, 0x3b33, 0x68be, 0xa684, 0x0004,
-        0x0040, 0x4120, 0xa18c, 0xff00, 0x78a8, 0xa084, 0x00ff, 0xa105,
-        0x682a, 0xa6b4, 0x00ff, 0x6000, 0xa084, 0x0008, 0x0040, 0x412a,
-        0xa6b5, 0x4000, 0x6eb6, 0x007c, 0x157e, 0x137e, 0x147e, 0x6918,
-        0x7890, 0x8004, 0x8004, 0x8004, 0x8004, 0xa084, 0x000f, 0x007e,
-        0xa100, 0x681a, 0x007f, 0x8000, 0x8004, 0x0040, 0x414b, 0x20a8,
-        0x8104, 0xa080, 0x000b, 0xad00, 0x20a0, 0x789b, 0x0000, 0xaf80,
-        0x002b, 0x2098, 0x53a5, 0x147f, 0x137f, 0x157f, 0x007c, 0x682c,
-        0xa084, 0x0020, 0x00c0, 0x4157, 0x620c, 0x0078, 0x4158, 0x6210,
-        0x6b18, 0x2300, 0xa202, 0x0040, 0x4178, 0x2018, 0xa382, 0x000e,
-        0x0048, 0x4168, 0x0040, 0x4168, 0x2019, 0x000e, 0x0078, 0x416c,
-        0x7858, 0xa084, 0xffef, 0x785a, 0x783b, 0x1b01, 0x7893, 0x0000,
-        0x7ba2, 0x70b4, 0xa080, 0x008e, 0x781a, 0xa085, 0x0001, 0x007c,
-        0x7858, 0xa084, 0xffef, 0x785a, 0x7893, 0x0000, 0xa006, 0x007c,
-        0x6904, 0xa18c, 0x00ff, 0xa196, 0x0007, 0x0040, 0x418d, 0xa196,
-        0x000f, 0x0040, 0x418d, 0x6807, 0x0117, 0x6914, 0x1078, 0x3b33,
-        0x6100, 0x8104, 0x00c8, 0x41a8, 0x601c, 0xa005, 0x0040, 0x419c,
-        0x2001, 0x0800, 0x0078, 0x41aa, 0x0d7e, 0x6824, 0x007e, 0x1078,
-        0x45c5, 0x007f, 0x6826, 0x2d00, 0x682e, 0x1078, 0x3ac2, 0x0d7f,
-        0x2001, 0x0200, 0x6826, 0x8007, 0x789b, 0x000e, 0x78aa, 0x6820,
-        0xa085, 0x8000, 0x6822, 0x2031, 0x0400, 0x6eb6, 0x7e5a, 0x71b4,
-        0xa188, 0x0091, 0x791a, 0x007c, 0xa6c4, 0x0f00, 0xa684, 0x0002,
-        0x00c0, 0x41cf, 0x692c, 0x810d, 0x810d, 0x810d, 0xa184, 0x001f,
-        0xa805, 0x6816, 0x1078, 0x3b33, 0x68be, 0x0078, 0x41d2, 0x6914,
-        0x1078, 0x3b33, 0x6100, 0x8104, 0x00c8, 0x421c, 0xa184, 0x0300,
-        0x0040, 0x41de, 0x6807, 0x0117, 0x0078, 0x41fc, 0x6004, 0xa005,
-        0x00c0, 0x4205, 0x6807, 0x0117, 0x601c, 0xa005, 0x00c0, 0x41f2,
-        0x0d7e, 0x1078, 0x45c5, 0x6827, 0x0034, 0x2d00, 0x682e, 0x1078,
-        0x3ac2, 0x0d7f, 0xa684, 0x0004, 0x0040, 0x41fc, 0x2031, 0x0400,
-        0x2001, 0x2800, 0x0078, 0x4200, 0x2031, 0x0400, 0x2001, 0x0800,
-        0x71b4, 0xa188, 0x0091, 0x0078, 0x424a, 0x6018, 0xa005, 0x00c0,
-        0x41f2, 0x601c, 0xa005, 0x00c0, 0x41f2, 0x689f, 0x0000, 0x6827,
-        0x003d, 0xa684, 0x0001, 0x0040, 0x4258, 0xa6b5, 0x0800, 0x71b4,
-        0xa188, 0x00ae, 0x0078, 0x4253, 0x6807, 0x0117, 0x2031, 0x0400,
-        0x692c, 0xa18c, 0x00ff, 0xa186, 0x0012, 0x00c0, 0x422d, 0x2001,
-        0x4265, 0x2009, 0x0001, 0x0078, 0x423e, 0xa186, 0x0003, 0x00c0,
-        0x4237, 0x2001, 0x4266, 0x2009, 0x0012, 0x0078, 0x423e, 0x2001,
-        0x0200, 0x71b4, 0xa188, 0x0091, 0x0078, 0x424a, 0x1078, 0x4598,
-        0x78a3, 0x0000, 0x681c, 0xa085, 0x0040, 0x681e, 0x71b4, 0xa188,
-        0x00da, 0xa006, 0x6826, 0x8007, 0x789b, 0x000e, 0x78aa, 0x6820,
-        0xa085, 0x8000, 0x6822, 0x6eb6, 0x7e5a, 0x791a, 0x0078, 0x2438,
-        0x6eb6, 0x1078, 0x3ac2, 0x6810, 0x70be, 0x7003, 0x0007, 0x70a3,
-        0x0000, 0x704b, 0x0000, 0x0078, 0x2438, 0x0023, 0x0070, 0x0005,
-        0x0000, 0x0a00, 0x0000, 0x0000, 0x0025, 0x0000, 0x0000, 0x683b,
-        0x0000, 0x6837, 0x0000, 0xa684, 0x0200, 0x0040, 0x4286, 0x78b8,
-        0xa08c, 0x001f, 0xa084, 0x8000, 0x0040, 0x427f, 0x8108, 0x78d8,
-        0xa100, 0x6836, 0x78dc, 0xa081, 0x0000, 0x683a, 0x007c, 0x7990,
-        0x810f, 0xa5ac, 0x0007, 0x2021, 0x0000, 0xa480, 0x0010, 0x789a,
-        0x79a8, 0xa18c, 0x00ff, 0xa184, 0x0080, 0x00c0, 0x42b5, 0xa182,
-        0x0020, 0x00c8, 0x42cf, 0xa182, 0x0012, 0x00c8, 0x4536, 0x2100,
-        0x1079, 0x42a3, 0x007c, 0x4536, 0x447e, 0x4536, 0x4536, 0x42dc,
-        0x42df, 0x4319, 0x434f, 0x4381, 0x4384, 0x4536, 0x4536, 0x433a,
-        0x43a8, 0x43e2, 0x4536, 0x4536, 0x4409, 0xa18c, 0x001f, 0x6814,
-        0xa084, 0x001f, 0xa106, 0x0040, 0x42cc, 0x70b4, 0xa080, 0x00cd,
-        0x781a, 0x2001, 0x0014, 0x1078, 0x454c, 0x1078, 0x45bc, 0x7003,
-        0x0000, 0x2001, 0x0002, 0x007c, 0x2001, 0x0000, 0x007c, 0xa182,
-        0x0024, 0x00c8, 0x4536, 0xa184, 0x0003, 0x1079, 0x42a3, 0x007c,
-        0x4536, 0x4536, 0x4536, 0x4536, 0x1078, 0x4536, 0x007c, 0x2200,
-        0x0079, 0x42e2, 0x440c, 0x440c, 0x4306, 0x4306, 0x4306, 0x4306,
-        0x4306, 0x4306, 0x4306, 0x4306, 0x4304, 0x4306, 0x42fb, 0x4306,
-        0x4306, 0x4306, 0x4306, 0x4306, 0x430e, 0x4311, 0x440c, 0x4311,
-        0x4306, 0x4306, 0x4306, 0x0c7e, 0x077e, 0x6f14, 0x1078, 0x36b0,
-        0x077f, 0x0c7f, 0x0078, 0x4306, 0x1078, 0x44d1, 0x6827, 0x02b3,
-        0x2009, 0x000b, 0x2001, 0x4800, 0x0078, 0x4440, 0x1078, 0x452b,
-        0x007c, 0x6827, 0x0093, 0x2009, 0x000b, 0x2001, 0x4800, 0x0078,
-        0x4428, 0x2d58, 0x6804, 0xa084, 0x00ff, 0xa086, 0x0006, 0x00c0,
-        0x4323, 0x6807, 0x0117, 0x6827, 0x0002, 0x1078, 0x45c5, 0x6827,
-        0x0036, 0x6932, 0x2d00, 0x682e, 0x0d7e, 0x1078, 0x3a92, 0x1078,
-        0x4466, 0x2b68, 0x1078, 0x3ac2, 0x0d7f, 0x1078, 0x3ac2, 0x2001,
-        0x0002, 0x007c, 0x1078, 0x4466, 0x2001, 0x0017, 0x1078, 0x454c,
-        0x70a3, 0x0000, 0x2009, 0x5038, 0x200b, 0x0006, 0x70af, 0x0017,
-        0x2009, 0x0200, 0x1078, 0x39d2, 0x2001, 0x0001, 0x007c, 0x2200,
-        0x0079, 0x4352, 0x440c, 0x443d, 0x443d, 0x443d, 0x4373, 0x444d,
-        0x4379, 0x444d, 0x444d, 0x4450, 0x4450, 0x4455, 0x4455, 0x436b,
-        0x436b, 0x443d, 0x443d, 0x444d, 0x443d, 0x4379, 0x440c, 0x4379,
-        0x4379, 0x4379, 0x4379, 0x6827, 0x0084, 0x2009, 0x000b, 0x2001,
-        0x4300, 0x0078, 0x445f, 0x2009, 0x000b, 0x2001, 0x4300, 0x0078,
-        0x4440, 0x6827, 0x0093, 0x2009, 0x000b, 0x2001, 0x4300, 0x0078,
-        0x4428, 0x2001, 0x0000, 0x007c, 0x2200, 0x0079, 0x4387, 0x440c,
-        0x43a0, 0x43a0, 0x43a0, 0x43a0, 0x444d, 0x444d, 0x444d, 0x444d,
-        0x444d, 0x444d, 0x444d, 0x444d, 0x43a0, 0x43a0, 0x43a0, 0x43a0,
-        0x444d, 0x43a0, 0x43a0, 0x444d, 0x444d, 0x444d, 0x444d, 0x440c,
-        0x6827, 0x0093, 0x2009, 0x000b, 0x2001, 0x4300, 0x0078, 0x4428,
-        0xa684, 0x0004, 0x00c0, 0x43bc, 0x6804, 0xa084, 0x00ff, 0xa086,
-        0x0006, 0x00c0, 0x4536, 0x1078, 0x4466, 0x6807, 0x0117, 0x1078,
-        0x3ac2, 0x2001, 0x0002, 0x007c, 0x6000, 0xa084, 0x0004, 0x0040,
-        0x4536, 0x2d58, 0x6804, 0xa084, 0x00ff, 0xa086, 0x0006, 0x00c0,
-        0x43cb, 0x6807, 0x0117, 0x6827, 0x0002, 0x1078, 0x45c5, 0x6827,
-        0x0036, 0x6932, 0x2d00, 0x682e, 0x0d7e, 0x1078, 0x3aa1, 0x1078,
-        0x4466, 0x2b68, 0x1078, 0x3ac2, 0x0d7f, 0x1078, 0x3ac2, 0x2001,
-        0x0002, 0x007c, 0x6000, 0xa084, 0x0004, 0x0040, 0x4536, 0x2d58,
-        0x6a04, 0xa294, 0x00ff, 0xa286, 0x0006, 0x00c0, 0x43f1, 0x6807,
-        0x0117, 0x6827, 0x0002, 0x2d58, 0x1078, 0x45c5, 0x6827, 0x0036,
-        0x6932, 0x2d00, 0x682e, 0x0d7e, 0x1078, 0x3ab1, 0x1078, 0x4466,
-        0x2b68, 0x1078, 0x3ac2, 0x0d7f, 0x1078, 0x3ac2, 0x2001, 0x0002,
-        0x007c, 0x1078, 0x4536, 0x007c, 0x70b4, 0xa080, 0x00cd, 0x781a,
-        0x2001, 0x0001, 0x1078, 0x454c, 0x1078, 0x45bc, 0x7003, 0x0000,
-        0x2001, 0x0002, 0x007c, 0x1078, 0x457e, 0x1078, 0x45b5, 0x1078,
-        0x426f, 0x1078, 0x4180, 0x1078, 0x45bc, 0x2001, 0x0001, 0x007c,
-        0x1078, 0x457e, 0x1078, 0x45b5, 0x1078, 0x426f, 0x70b4, 0xa080,
-        0x00cd, 0x781a, 0x2001, 0x0013, 0x1078, 0x454c, 0x1078, 0x45bc,
-        0x7003, 0x0000, 0x2001, 0x0002, 0x007c, 0x1078, 0x4536, 0x007c,
-        0x1078, 0x457e, 0x1078, 0x45b5, 0x1078, 0x426f, 0x1078, 0x4180,
-        0x1078, 0x45bc, 0x2001, 0x0001, 0x007c, 0x2001, 0x0003, 0x007c,
-        0x1078, 0x44d1, 0x2001, 0x0000, 0x007c, 0x0c7e, 0x077e, 0x6f14,
-        0x1078, 0x36b0, 0x077f, 0x0c7f, 0x2001, 0x0000, 0x007c, 0x1078,
-        0x457e, 0x1078, 0x4536, 0x2001, 0x0006, 0x007c, 0x6904, 0xa18c,
-        0x00ff, 0xa186, 0x0007, 0x0040, 0x4471, 0xa186, 0x000f, 0x00c0,
-        0x4475, 0x1078, 0x45b5, 0x1078, 0x426f, 0x70b4, 0xa080, 0x00cd,
-        0x781a, 0x1078, 0x45bc, 0x7003, 0x0000, 0x007c, 0x7aa8, 0xa294,
-        0x00ff, 0x78a8, 0xa084, 0x00ff, 0xa08a, 0x0004, 0x00c8, 0x4536,
-        0x1079, 0x448b, 0x007c, 0x4536, 0x448f, 0x4536, 0x44df, 0xa282,
-        0x0003, 0x0040, 0x4496, 0x1078, 0x4536, 0x007c, 0x7da8, 0xa5ac,
-        0x00ff, 0x7ca8, 0xa4a4, 0x00ff, 0xa482, 0x000c, 0x0048, 0x44a4,
-        0x0040, 0x44a4, 0x2021, 0x000c, 0x701c, 0xa502, 0x00c8, 0x44a9,
-        0x751c, 0x1078, 0x451c, 0x852b, 0x852b, 0x1078, 0x372e, 0x0040,
-        0x44b5, 0x1078, 0x44c3, 0x0078, 0x44b9, 0x1078, 0x4518, 0x1078,
-        0x44d1, 0xa6b5, 0x1000, 0x7e5a, 0x70b4, 0xa080, 0x00b9, 0x781a,
-        0x2001, 0x0004, 0x007c, 0x0c7e, 0x6914, 0x810f, 0xa18c, 0x000f,
-        0x810b, 0x810b, 0x810b, 0xa1e0, 0x5280, 0x1078, 0x3538, 0x0c7f,
-        0x007c, 0x0c7e, 0x6814, 0x8007, 0xa084, 0x000f, 0x8003, 0x8003,
-        0x8003, 0xa0e0, 0x5280, 0x1078, 0x355f, 0x0c7f, 0x007c, 0xa282,
-        0x0002, 0x00c0, 0x4536, 0x7aa8, 0xa294, 0x00ff, 0xa284, 0xfffe,
-        0x0040, 0x44ec, 0x2011, 0x0001, 0x1078, 0x450a, 0x1078, 0x44fc,
-        0x1078, 0x44d1, 0xa6b5, 0x1000, 0x7e5a, 0x70b4, 0xa080, 0x00b9,
-        0x781a, 0x2001, 0x0004, 0x007c, 0x0c7e, 0x6814, 0x8007, 0xa084,
-        0x000f, 0x8003, 0x8003, 0x8003, 0xa0e0, 0x5280, 0x1078, 0x3604,
-        0x0c7f, 0x007c, 0x789b, 0x0018, 0x78ab, 0x0001, 0x78ab, 0x0002,
-        0x78ab, 0x0003, 0x7aaa, 0x789b, 0x0081, 0x78ab, 0x0004, 0x007c,
-        0x2021, 0x0000, 0x2029, 0x0032, 0x789b, 0x0018, 0x78ab, 0x0001,
-        0x78ab, 0x0003, 0x78ab, 0x0001, 0x7daa, 0x7caa, 0x789b, 0x0081,
-        0x78ab, 0x0005, 0x007c, 0x2001, 0x0003, 0x1078, 0x4544, 0x70b4,
-        0xa080, 0x00b9, 0x781a, 0x2001, 0x0005, 0x007c, 0x2001, 0x0007,
-        0x1078, 0x4544, 0xa6b5, 0x1000, 0x7e5a, 0x70b4, 0xa080, 0x00b9,
-        0x781a, 0x2001, 0x0004, 0x007c, 0x789b, 0x0018, 0x78aa, 0x789b,
-        0x0081, 0x78ab, 0x0001, 0x007c, 0x6904, 0xa18c, 0x00ff, 0xa196,
-        0x0007, 0x0040, 0x455a, 0xa196, 0x000f, 0x0040, 0x455a, 0x1078,
-        0x193d, 0x007c, 0x6924, 0xa194, 0x003f, 0x00c0, 0x4563, 0xa18c,
-        0xffc0, 0xa105, 0x6826, 0x1078, 0x3ac2, 0x691c, 0xa184, 0x0100,
-        0x0040, 0x4572, 0x1078, 0x1b7e, 0x6914, 0x1078, 0x3b33, 0x6204,
-        0x8210, 0x6206, 0x007c, 0x692c, 0x6834, 0x682e, 0xa112, 0x6930,
-        0x6838, 0x6832, 0xa11b, 0xa200, 0xa301, 0x007c, 0x0c7e, 0xade0,
-        0x0018, 0x6003, 0x0070, 0x6106, 0x600b, 0x0000, 0x600f, 0x0a00,
-        0x6013, 0x0000, 0x6017, 0x0000, 0x8007, 0x601a, 0x601f, 0x0000,
-        0x6023, 0x0000, 0x0c7f, 0x6824, 0xa085, 0x0080, 0x6826, 0x007c,
-        0x157e, 0x137e, 0x147e, 0x2098, 0xaf80, 0x002d, 0x20a0, 0x81ac,
-        0x0040, 0x45a3, 0x53a6, 0xa184, 0x0001, 0x0040, 0x45a9, 0x3304,
-        0x78be, 0x147f, 0x137f, 0x157f, 0x007c, 0x70b0, 0xa005, 0x10c0,
-        0x23ca, 0x70b3, 0x8000, 0x0078, 0x48f7, 0x71b0, 0x81ff, 0x0040,
-        0x45bb, 0x1078, 0x49ed, 0x007c, 0x71b0, 0x81ff, 0x0040, 0x45c4,
-        0x70b3, 0x0000, 0x1078, 0x4633, 0x007c, 0x0c7e, 0x0d7e, 0x1078,
-        0x191a, 0x0c7f, 0x157e, 0x137e, 0x147e, 0x2da0, 0x2c98, 0x20a9,
-        0x0031, 0x53a3, 0x147f, 0x137f, 0x157f, 0x6807, 0x010d, 0x680b,
-        0x0000, 0x7004, 0x8007, 0x681a, 0x6823, 0x0000, 0x681f, 0x0000,
-        0x689f, 0x0000, 0x0c7f, 0x007c, 0x70b4, 0xa080, 0x0091, 0x781a,
-        0x0078, 0x2438, 0x70b4, 0xa080, 0x0081, 0x781a, 0x0078, 0x2438,
-        0x70b4, 0xa080, 0x00b9, 0x781a, 0x0078, 0x2438, 0x70b4, 0xa080,
-        0x00c3, 0x781a, 0x0078, 0x2438, 0x6904, 0xa18c, 0x00ff, 0xa196,
-        0x0007, 0x0040, 0x4609, 0xa196, 0x000f, 0x0040, 0x4609, 0x6807,
-        0x0117, 0x2001, 0x0200, 0x6826, 0x8007, 0x789b, 0x000e, 0x78aa,
-        0x6820, 0xa085, 0x8000, 0x6822, 0x2031, 0x0400, 0x6eb6, 0x7e5a,
-        0x71b4, 0xa188, 0x0091, 0x791a, 0x007c, 0x1078, 0x45bc, 0x7848,
-        0xa085, 0x000c, 0x784a, 0x70b4, 0xa080, 0x00cd, 0x781a, 0x2009,
-        0x000b, 0x2001, 0x4400, 0x1078, 0x457e, 0x2001, 0x0013, 0x1078,
-        0x454c, 0x0078, 0x3b60, 0x127e, 0x2091, 0x2200, 0x2049, 0x4633,
-        0x7000, 0x7204, 0xa205, 0x720c, 0xa215, 0x7008, 0xa084, 0xfff7,
-        0xa205, 0x0040, 0x4645, 0x0078, 0x464a, 0x7003, 0x0000, 0x127f,
-        0x2000, 0x007c, 0x7000, 0xa084, 0x0001, 0x00c0, 0x4678, 0x7108,
-        0x8103, 0x00c8, 0x4657, 0x1078, 0x477a, 0x0078, 0x464f, 0x700c,
-        0xa08c, 0x00ff, 0x0040, 0x4678, 0x7004, 0x8004, 0x00c8, 0x466f,
-        0x7014, 0xa005, 0x00c0, 0x466b, 0x7010, 0xa005, 0x0040, 0x466f,
-        0xa102, 0x00c8, 0x464f, 0x7007, 0x0010, 0x0078, 0x4678, 0x8aff,
-        0x0040, 0x4678, 0x1078, 0x49c4, 0x00c0, 0x4672, 0x0040, 0x464f,
-        0x1078, 0x4703, 0x7003, 0x0000, 0x127f, 0x2000, 0x007c, 0x017e,
-        0x6104, 0xa18c, 0x00ff, 0xa186, 0x0007, 0x0040, 0x468b, 0xa18e,
-        0x000f, 0x00c0, 0x468e, 0x6040, 0x0078, 0x468f, 0x6428, 0x017f,
-        0x84ff, 0x0040, 0x46b9, 0x2c70, 0x7004, 0xa0bc, 0x000f, 0xa7b8,
-        0x46c9, 0x273c, 0x87fb, 0x00c0, 0x46a7, 0x0048, 0x46a1, 0x1078,
-        0x23ca, 0x609c, 0xa075, 0x0040, 0x46b9, 0x0078, 0x4694, 0x2704,
-        0xae68, 0x6808, 0xa630, 0x680c, 0xa529, 0x8421, 0x0040, 0x46b9,
-        0x8738, 0x2704, 0xa005, 0x00c0, 0x46a8, 0x709c, 0xa075, 0x00c0,
-        0x4694, 0x007c, 0x0000, 0x0005, 0x0009, 0x000d, 0x0011, 0x0015,
-        0x0019, 0x001d, 0x0000, 0x0003, 0x0009, 0x000f, 0x0015, 0x001b,
-        0x0000, 0x0000, 0x46be, 0x46bb, 0x0000, 0x0000, 0x8000, 0x0000,
-        0x46be, 0x0000, 0x46c6, 0x46c3, 0x0000, 0x0000, 0x0000, 0x0000,
-        0x46c6, 0x0000, 0x46c1, 0x46c1, 0x0000, 0x0000, 0x8000, 0x0000,
-        0x46c1, 0x0000, 0x46c7, 0x46c7, 0x0000, 0x0000, 0x0000, 0x0000,
-        0x46c7, 0x127e, 0x2091, 0x2200, 0x2079, 0x5000, 0x2071, 0x0010,
-        0x7007, 0x000a, 0x7007, 0x0002, 0x7003, 0x0000, 0x2071, 0x0020,
-        0x7007, 0x000a, 0x7007, 0x0002, 0x7003, 0x0000, 0x2049, 0x0000,
-        0x127f, 0x2000, 0x007c, 0x2049, 0x4703, 0x2019, 0x0000, 0x7004,
-        0x8004, 0x00c8, 0x4756, 0x7007, 0x0012, 0x7108, 0x7008, 0xa106,
-        0x00c0, 0x470d, 0xa184, 0x01e0, 0x0040, 0x4718, 0x1078, 0x23ca,
-        0x2001, 0x04fd, 0x2004, 0xa082, 0x0005, 0x00c8, 0x4723, 0xa184,
-        0x4000, 0x00c0, 0x470d, 0xa19c, 0x300c, 0xa386, 0x2004, 0x0040,
-        0x4731, 0xa386, 0x0008, 0x0040, 0x473c, 0xa386, 0x200c, 0x00c0,
-        0x470d, 0x7200, 0x8204, 0x0048, 0x473c, 0x730c, 0xa384, 0x00ff,
-        0x0040, 0x473c, 0x1078, 0x23ca, 0x7007, 0x0012, 0x7000, 0xa084,
-        0x0001, 0x00c0, 0x4756, 0x7008, 0xa084, 0x01e0, 0x00c0, 0x4756,
-        0x7310, 0x7014, 0xa305, 0x0040, 0x4756, 0x710c, 0xa184, 0x0300,
-        0x00c0, 0x4756, 0xa184, 0x00ff, 0x00c0, 0x4703, 0x7007, 0x0012,
-        0x7007, 0x0008, 0x7004, 0xa084, 0x0008, 0x00c0, 0x475a, 0x7007,
-        0x0012, 0x7108, 0x8103, 0x0048, 0x475f, 0x7003, 0x0000, 0x2049,
-        0x0000, 0x007c, 0x107e, 0x007e, 0x127e, 0x157e, 0x2091, 0x2200,
-        0x7108, 0x1078, 0x477a, 0x157f, 0x127f, 0x2091, 0x8001, 0x007f,
-        0x107f, 0x007c, 0x7204, 0x7500, 0x730c, 0xa384, 0x0300, 0x00c0,
-        0x47a1, 0xa184, 0x01e0, 0x00c0, 0x47c5, 0x7108, 0xa184, 0x01e0,
-        0x00c0, 0x47c5, 0x2001, 0x04fd, 0x2004, 0xa082, 0x0005, 0x00c8,
-        0x4795, 0xa184, 0x4000, 0x00c0, 0x4785, 0xa184, 0x0007, 0x0079,
-        0x4799, 0x47a3, 0x47b5, 0x47a1, 0x47b5, 0x47a1, 0x4801, 0x47a1,
-        0x47ff, 0x1078, 0x23ca, 0x7004, 0xa084, 0x0010, 0xa085, 0x0002,
-        0x7006, 0x8aff, 0x00c0, 0x47b0, 0x2049, 0x0000, 0x0078, 0x47b4,
-        0x1078, 0x49c4, 0x00c0, 0x47b0, 0x007c, 0x7004, 0xa084, 0x0010,
-        0xa085, 0x0002, 0x7006, 0x8aff, 0x00c0, 0x47c0, 0x0078, 0x47c4,
-        0x1078, 0x49c4, 0x00c0, 0x47c0, 0x007c, 0x7007, 0x0012, 0x7108,
-        0x00e0, 0x47c8, 0x2091, 0x6000, 0x00e0, 0x47cc, 0x2091, 0x6000,
-        0x7007, 0x0012, 0x7007, 0x0008, 0x7004, 0xa084, 0x0008, 0x00c0,
-        0x47d4, 0x7007, 0x0012, 0x7108, 0x8103, 0x0048, 0x47d9, 0x7003,
-        0x0000, 0x7000, 0xa005, 0x00c0, 0x47ed, 0x7004, 0xa005, 0x00c0,
-        0x47ed, 0x700c, 0xa005, 0x0040, 0x47ef, 0x0078, 0x47d0, 0x2049,
-        0x0000, 0x1078, 0x37d7, 0x6818, 0xa084, 0x8000, 0x0040, 0x47fa,
-        0x681b, 0x0002, 0x007c, 0x1078, 0x23ca, 0x1078, 0x23ca, 0x1078,
-        0x485d, 0x7210, 0x7114, 0x700c, 0xa09c, 0x00ff, 0x2800, 0xa300,
-        0xa211, 0xa189, 0x0000, 0x1078, 0x485d, 0x2704, 0x2c58, 0xac60,
-        0x6308, 0x2200, 0xa322, 0x630c, 0x2100, 0xa31b, 0x2400, 0xa305,
-        0x0040, 0x4824, 0x00c8, 0x4824, 0x8412, 0x8210, 0x830a, 0xa189,
-        0x0000, 0x2b60, 0x0078, 0x480b, 0x2b60, 0x8a07, 0x007e, 0x6004,
-        0xa084, 0x0008, 0x0040, 0x4830, 0xa7ba, 0x46c3, 0x0078, 0x4832,
-        0xa7ba, 0x46bb, 0x007f, 0xa73d, 0x2c00, 0x6886, 0x6f8a, 0x6c92,
-        0x6b8e, 0x7007, 0x0012, 0x1078, 0x4703, 0x007c, 0x8738, 0x2704,
-        0xa005, 0x00c0, 0x4851, 0x609c, 0xa005, 0x0040, 0x485a, 0x2060,
-        0x6004, 0xa084, 0x000f, 0xa080, 0x46c9, 0x203c, 0x87fb, 0x1040,
-        0x23ca, 0x8a51, 0x0040, 0x4859, 0x7008, 0xa084, 0x0003, 0xa086,
-        0x0003, 0x007c, 0x2051, 0x0000, 0x007c, 0x8a50, 0x8739, 0x2704,
-        0xa004, 0x00c0, 0x4871, 0x6000, 0xa064, 0x00c0, 0x4868, 0x2d60,
-        0x6004, 0xa084, 0x000f, 0xa080, 0x46d9, 0x203c, 0x87fb, 0x1040,
-        0x23ca, 0x007c, 0x127e, 0x0d7e, 0x2091, 0x2200, 0x0d7f, 0x6884,
-        0x2060, 0x6888, 0x6b8c, 0x6c90, 0x8057, 0xaad4, 0x00ff, 0xa084,
-        0x00ff, 0x007e, 0x6804, 0xa084, 0x0008, 0x007f, 0x0040, 0x488c,
-        0xa0b8, 0x46c3, 0x0078, 0x488e, 0xa0b8, 0x46bb, 0x7e08, 0xa6b5,
-        0x000c, 0x6904, 0xa18c, 0x00ff, 0xa186, 0x0007, 0x0040, 0x489c,
-        0xa18e, 0x000f, 0x00c0, 0x48a5, 0x681c, 0xa084, 0x0040, 0x0040,
-        0x48ac, 0xa6b5, 0x0001, 0x0078, 0x48ac, 0x681c, 0xa084, 0x0040,
-        0x0040, 0x48ac, 0xa6b5, 0x0001, 0x7007, 0x0004, 0x7004, 0xa084,
-        0x0004, 0x00c0, 0x48ae, 0x2400, 0xa305, 0x00c0, 0x48b9, 0x0078,
-        0x48df, 0x2c58, 0x2704, 0x6104, 0xac60, 0x6000, 0xa400, 0x701a,
-        0x6004, 0xa301, 0x701e, 0xa184, 0x0008, 0x0040, 0x48cf, 0x6010,
-        0xa081, 0x0000, 0x7022, 0x6014, 0xa081, 0x0000, 0x7026, 0x6208,
-        0x2400, 0xa202, 0x7012, 0x620c, 0x2300, 0xa203, 0x7016, 0x7602,
-        0x7007, 0x0001, 0x2b60, 0x1078, 0x483e, 0x0078, 0x48e1, 0x1078,
-        0x49c4, 0x00c0, 0x48df, 0x127f, 0x2000, 0x007c, 0x127e, 0x0d7e,
-        0x2091, 0x2200, 0x0d7f, 0x7007, 0x0004, 0x7004, 0xa084, 0x0004,
-        0x00c0, 0x48ed, 0x7003, 0x0008, 0x127f, 0x2000, 0x007c, 0x127e,
-        0x0d7e, 0x2091, 0x2200, 0x0d7f, 0x2049, 0x48f7, 0x7007, 0x0004,
-        0x7004, 0xa084, 0x0004, 0x00c0, 0x4900, 0x7e08, 0xa6b5, 0x000c,
-        0x6904, 0xa18c, 0x00ff, 0xa186, 0x0007, 0x0040, 0x4913, 0xa18e,
-        0x000f, 0x00c0, 0x491e, 0x681c, 0xa084, 0x0040, 0x0040, 0x491a,
-        0xa6b5, 0x0001, 0x6840, 0x2050, 0x0078, 0x4927, 0x681c, 0xa084,
-        0x0020, 0x00c0, 0x4925, 0xa6b5, 0x0001, 0x6828, 0x2050, 0x2d60,
-        0x6004, 0xa0bc, 0x000f, 0xa7b8, 0x46c9, 0x273c, 0x87fb, 0x00c0,
-        0x493b, 0x0048, 0x4935, 0x1078, 0x23ca, 0x689c, 0xa065, 0x0040,
-        0x493f, 0x0078, 0x4928, 0x1078, 0x49c4, 0x00c0, 0x493b, 0x127f,
-        0x2000, 0x007c, 0x127e, 0x007e, 0x017e, 0x0d7e, 0x2091, 0x2200,
-        0x0d7f, 0x037f, 0x047f, 0x7e08, 0xa6b5, 0x000c, 0x6904, 0xa18c,
-        0x00ff, 0xa186, 0x0007, 0x0040, 0x4959, 0xa18e, 0x000f, 0x00c0,
-        0x4962, 0x681c, 0xa084, 0x0040, 0x0040, 0x4969, 0xa6b5, 0x0001,
-        0x0078, 0x4969, 0x681c, 0xa084, 0x0040, 0x0040, 0x4969, 0xa6b5,
-        0x0001, 0x2049, 0x4942, 0x017e, 0x6904, 0xa18c, 0x00ff, 0xa186,
-        0x0007, 0x0040, 0x4977, 0xa18e, 0x000f, 0x00c0, 0x497a, 0x6840,
-        0x0078, 0x497b, 0x6828, 0x017f, 0xa055, 0x0040, 0x49c1, 0x2d70,
-        0x2e60, 0x7004, 0xa0bc, 0x000f, 0xa7b8, 0x46c9, 0x273c, 0x87fb,
-        0x00c0, 0x4995, 0x0048, 0x498e, 0x1078, 0x23ca, 0x709c, 0xa075,
-        0x2060, 0x0040, 0x49c1, 0x0078, 0x4981, 0x2704, 0xae68, 0x6808,
-        0xa422, 0x680c, 0xa31b, 0x0048, 0x49ae, 0x8a51, 0x00c0, 0x49a2,
-        0x1078, 0x23ca, 0x8738, 0x2704, 0xa005, 0x00c0, 0x4996, 0x709c,
-        0xa075, 0x2060, 0x0040, 0x49c1, 0x0078, 0x4981, 0x8422, 0x8420,
-        0x831a, 0xa399, 0x0000, 0x6908, 0x2400, 0xa122, 0x690c, 0x2300,
-        0xa11b, 0x00c8, 0x49bd, 0x1078, 0x23ca, 0x2071, 0x0020, 0x0078,
-        0x48ac, 0x127f, 0x2000, 0x007c, 0x7008, 0xa084, 0x0003, 0xa086,
-        0x0003, 0x0040, 0x49ec, 0x2704, 0xac08, 0x2104, 0x701a, 0x8108,
-        0x2104, 0x701e, 0x8108, 0x2104, 0x7012, 0x8108, 0x2104, 0x7016,
-        0x6004, 0xa084, 0x0008, 0x0040, 0x49e3, 0x8108, 0x2104, 0x7022,
-        0x8108, 0x2104, 0x7026, 0x7602, 0x7004, 0xa084, 0x0010, 0xa085,
-        0x0001, 0x7006, 0x1078, 0x483e, 0x007c, 0x127e, 0x007e, 0x0d7e,
-        0x2091, 0x2200, 0x2049, 0x49ed, 0x0d7f, 0x087f, 0x7108, 0xa184,
-        0x0003, 0x00c0, 0x4a17, 0x017e, 0x6904, 0xa18c, 0x00ff, 0xa186,
-        0x0007, 0x0040, 0x4a07, 0xa18e, 0x000f, 0x00c0, 0x4a0a, 0x6840,
-        0x0078, 0x4a0b, 0x6828, 0x017f, 0xa005, 0x0040, 0x4a25, 0x0078,
-        0x464a, 0x0020, 0x4a17, 0x1078, 0x4801, 0x0078, 0x4a25, 0x00a0,
-        0x4a1e, 0x7108, 0x1078, 0x477a, 0x0078, 0x49f6, 0x7007, 0x0010,
-        0x00a0, 0x4a20, 0x7108, 0x1078, 0x477a, 0x7008, 0xa086, 0x0008,
-        0x00c0, 0x49f6, 0x7000, 0xa005, 0x00c0, 0x49f6, 0x7003, 0x0000,
-        0x2049, 0x0000, 0x127f, 0x2000, 0x007c, 0x127e, 0x147e, 0x137e,
-        0x157e, 0x0c7e, 0x0d7e, 0x2091, 0x2200, 0x0d7f, 0x2049, 0x4a35,
-        0xad80, 0x0011, 0x20a0, 0x2099, 0x0031, 0x700c, 0xa084, 0x00ff,
-        0x682a, 0x7007, 0x0008, 0x7007, 0x0002, 0x7003, 0x0001, 0x0040,
-        0x4a54, 0x8000, 0x80ac, 0x53a5, 0x7007, 0x0004, 0x7004, 0xa084,
-        0x0004, 0x00c0, 0x4a56, 0x0c7f, 0x2049, 0x0000, 0x7003, 0x0000,
-        0x157f, 0x137f, 0x147f, 0x127f, 0x2000, 0x007c, 0x2091, 0x6000,
-        0x2091, 0x8000, 0x78cc, 0xa005, 0x0040, 0x4a7d, 0x7994, 0x70d0,
-        0xa106, 0x00c0, 0x4a7d, 0x7804, 0xa005, 0x0040, 0x4a7d, 0x7807,
-        0x0000, 0x0068, 0x4a7d, 0x2091, 0x4080, 0x7820, 0x8001, 0x7822,
-        0x00c0, 0x4ad8, 0x7824, 0x7822, 0x2069, 0x5040, 0x6800, 0xa084,
-        0x0007, 0x0040, 0x4a9b, 0xa086, 0x0002, 0x0040, 0x4a9b, 0x6834,
-        0xa00d, 0x0040, 0x4a9b, 0x2104, 0xa005, 0x0040, 0x4a9b, 0x8001,
-        0x200a, 0x0040, 0x4b80, 0x7848, 0xa005, 0x0040, 0x4aa9, 0x8001,
-        0x784a, 0x00c0, 0x4aa9, 0x2009, 0x0102, 0x6844, 0x200a, 0x1078,
-        0x21b1, 0x6890, 0xa005, 0x0040, 0x4ab5, 0x8001, 0x6892, 0x00c0,
-        0x4ab5, 0x686f, 0x0000, 0x6873, 0x0001, 0x2061, 0x5300, 0x20a9,
-        0x0100, 0x2009, 0x0002, 0x6034, 0xa005, 0x0040, 0x4acb, 0x8001,
-        0x6036, 0x00c0, 0x4acb, 0x6010, 0xa005, 0x0040, 0x4acb, 0x017e,
-        0x1078, 0x21b1, 0x017f, 0xace0, 0x0010, 0x0070, 0x4ad1, 0x0078,
-        0x4abb, 0x8109, 0x0040, 0x4ad8, 0x20a9, 0x0100, 0x0078, 0x4abb,
-        0x1078, 0x4ae5, 0x1078, 0x4b0a, 0x2009, 0x5051, 0x2104, 0x2009,
-        0x0102, 0x200a, 0x2091, 0x8001, 0x007c, 0x7834, 0x8001, 0x7836,
-        0x00c0, 0x4b09, 0x7838, 0x7836, 0x2091, 0x8000, 0x7844, 0xa005,
-        0x00c0, 0x4af4, 0x2001, 0x0101, 0x8001, 0x7846, 0xa080, 0x7300,
-        0x2040, 0x2004, 0xa065, 0x0040, 0x4b09, 0x6024, 0xa005, 0x0040,
-        0x4b05, 0x8001, 0x6026, 0x0040, 0x4b39, 0x6000, 0x2c40, 0x0078,
-        0x4afa, 0x007c, 0x7828, 0x8001, 0x782a, 0x00c0, 0x4b38, 0x782c,
-        0x782a, 0x7830, 0xa005, 0x00c0, 0x4b17, 0x2001, 0x0200, 0x8001,
-        0x7832, 0x8003, 0x8003, 0x8003, 0x8003, 0xa090, 0x5300, 0xa298,
-        0x0002, 0x2304, 0xa084, 0x0008, 0x0040, 0x4b38, 0xa290, 0x0009,
-        0x2204, 0xa005, 0x0040, 0x4b30, 0x8001, 0x2012, 0x00c0, 0x4b38,
-        0x2304, 0xa084, 0xfff7, 0xa085, 0x0080, 0x201a, 0x1078, 0x21b1,
-        0x007c, 0x2069, 0x5040, 0x6800, 0xa005, 0x0040, 0x4b43, 0x6848,
-        0xac06, 0x0040, 0x4b80, 0x601b, 0x0006, 0x60b4, 0xa084, 0x3f00,
-        0x601e, 0x6020, 0xa084, 0x00ff, 0xa085, 0x0060, 0x6022, 0x6000,
-        0x2042, 0x6714, 0x6f82, 0x1078, 0x1956, 0x6818, 0xa005, 0x0040,
-        0x4b5b, 0x8001, 0x681a, 0x6808, 0xa084, 0xffef, 0x680a, 0x6810,
-        0x8001, 0x00d0, 0x4b65, 0x1078, 0x23ca, 0x6812, 0x602f, 0x0000,
-        0x6033, 0x0000, 0x2c68, 0x1078, 0x1c53, 0x2069, 0x5040, 0x7944,
-        0xa184, 0x0100, 0x2001, 0x0006, 0x686e, 0x00c0, 0x4b7b, 0x6986,
-        0x2001, 0x0004, 0x686e, 0x1078, 0x21ac, 0x2091, 0x8001, 0x007c,
-        0x2069, 0x0100, 0x2009, 0x5040, 0x2104, 0xa084, 0x0007, 0x0040,
-        0x4bdc, 0xa086, 0x0007, 0x00c0, 0x4b96, 0x0d7e, 0x2009, 0x5052,
-        0x216c, 0x1078, 0x3a1a, 0x0d7f, 0x0078, 0x4bdc, 0x2009, 0x5052,
-        0x2164, 0x1078, 0x2375, 0x601b, 0x0006, 0x6858, 0xa084, 0x3f00,
-        0x601e, 0x6020, 0xa084, 0x00ff, 0xa085, 0x0048, 0x6022, 0x602f,
-        0x0000, 0x6033, 0x0000, 0x6830, 0xa084, 0x0040, 0x0040, 0x4bd0,
-        0x684b, 0x0004, 0x20a9, 0x0014, 0x6848, 0xa084, 0x0004, 0x0040,
-        0x4bbd, 0x0070, 0x4bbd, 0x0078, 0x4bb4, 0x684b, 0x0009, 0x20a9,
-        0x0014, 0x6848, 0xa084, 0x0001, 0x0040, 0x4bca, 0x0070, 0x4bca,
-        0x0078, 0x4bc1, 0x20a9, 0x00fa, 0x0070, 0x4bd0, 0x0078, 0x4bcc,
-        0x6808, 0xa084, 0xfffd, 0x680a, 0x681b, 0x0048, 0x2009, 0x505b,
-        0x200b, 0x0007, 0x784c, 0x784a, 0x2091, 0x8001, 0x007c, 0x2079,
-        0x5000, 0x1078, 0x4c0a, 0x1078, 0x4bee, 0x1078, 0x4bfc, 0x7833,
-        0x0000, 0x7847, 0x0000, 0x784b, 0x0000, 0x007c, 0x2019, 0x0003,
-        0x2011, 0x5046, 0x2204, 0xa086, 0x003c, 0x0040, 0x4bf9, 0x2019,
-        0x0002, 0x7b2a, 0x7b2e, 0x007c, 0x2019, 0x0039, 0x2011, 0x5046,
-        0x2204, 0xa086, 0x003c, 0x0040, 0x4c07, 0x2019, 0x0027, 0x7b36,
-        0x7b3a, 0x007c, 0x2019, 0x3971, 0x2011, 0x5046, 0x2204, 0xa086,
-        0x003c, 0x0040, 0x4c15, 0x2019, 0x2626, 0x7b22, 0x7b26, 0x783f,
-        0x0000, 0x7843, 0x000a, 0x007c, 0x0020, 0x002b, 0x0000, 0x0020,
-        0x0000, 0x0020, 0x0000, 0x0020, 0x0000, 0x0020, 0x0000, 0x0020,
-        0x0000, 0x0020, 0x0000, 0x0020, 0x0000, 0x0020, 0x0000, 0x0020,
-        0x0000, 0x0020, 0x0000, 0x0020, 0x0000, 0x0020, 0x0000, 0x0020,
-        0x0000, 0x0020, 0x0000, 0x0020, 0x0000, 0x0020, 0x0000, 0x0014,
-        0x0014, 0x9849, 0x0014, 0x0014, 0x0014, 0x0014, 0x0014, 0x0014,
-        0x0014, 0x0080, 0x000f, 0x0000, 0x0201, 0x0604, 0x0c08, 0x2120,
-        0x4022, 0xf880, 0x0018, 0x300b, 0xa201, 0x0014, 0xa200, 0x0014,
-        0xa200, 0x0214, 0x0000, 0x006c, 0x0002, 0x0014, 0x98d5, 0x009e,
-        0x009b, 0xa202, 0x8838, 0x3806, 0x8839, 0x20c3, 0x0864, 0x9889,
-        0x28c1, 0x9cb6, 0xa203, 0x300c, 0x2846, 0x8161, 0x846a, 0x8300,
-        0x1856, 0x883a, 0x9865, 0x28f2, 0x9c95, 0x9858, 0x300c, 0x28e1,
-        0x9c95, 0x2809, 0xa206, 0x64c0, 0x67a0, 0x6fc0, 0x1814, 0x883b,
-        0x782c, 0x786d, 0x9879, 0x282b, 0xa207, 0x64a0, 0x67a0, 0x6fc0,
-        0x1814, 0x883b, 0x7822, 0x883e, 0x987d, 0x8576, 0x8677, 0x206b,
-        0x28c1, 0x9cb6, 0x2044, 0x2103, 0x20a2, 0x2081, 0x9865, 0xa209,
-        0x2901, 0x9891, 0x0014, 0xa205, 0xa300, 0x1872, 0x879a, 0x883c,
-        0x1fe2, 0xc601, 0xa20a, 0x856e, 0x0704, 0x9c95, 0x0014, 0xa204,
-        0xa300, 0x3009, 0x19e2, 0xf868, 0x8176, 0x86eb, 0x85eb, 0x872e,
-        0x87a9, 0x883f, 0x08e6, 0x9895, 0xf881, 0x9890, 0xc801, 0x0014,
-        0xf8c1, 0x0016, 0x85b2, 0x80f0, 0x9532, 0xfb02, 0x1de2, 0x0014,
-        0x8532, 0xf241, 0x0014, 0x1de2, 0x84a8, 0xd7a0, 0x1fe6, 0x0014,
-        0xa208, 0x6043, 0x8008, 0x1dc1, 0x0016, 0x8300, 0x8160, 0x842a,
-        0xf041, 0x3008, 0x84a8, 0x11d6, 0x7042, 0x20dd, 0x0011, 0x20d5,
-        0x8822, 0x0016, 0x8000, 0x2847, 0x1011, 0x98c8, 0x8000, 0xa000,
-        0x2802, 0x1011, 0x98ce, 0x9865, 0x283e, 0x1011, 0x98d2, 0xa20b,
-        0x0017, 0x300c, 0xa300, 0x1de2, 0xdb81, 0x0014, 0x0210, 0x98df,
-        0x0014, 0x26e0, 0x873a, 0xfb02, 0x19f2, 0x1fe2, 0x0014, 0xa20d,
-        0x3806, 0x0210, 0x9cbb, 0x0704, 0x0000, 0x006c, 0x0002, 0x984f,
-        0x0014, 0x009e, 0x00a0, 0x0017, 0x60ff, 0x300c, 0x8720, 0xa211,
-        0x9cd0, 0x8772, 0x8837, 0x2101, 0x987a, 0x10d2, 0x78e2, 0x9cd3,
-        0x9859, 0xd984, 0xf0e2, 0xf0a1, 0x98cd, 0x0014, 0x8831, 0xd166,
-        0x8830, 0x800f, 0x9401, 0xb520, 0xc802, 0x8820, 0x987a, 0x2301,
-        0x987a, 0x10d2, 0x78e4, 0x9cd3, 0x8821, 0x8820, 0x9859, 0xf123,
-        0xf142, 0xf101, 0x98c6, 0x10d2, 0x70f6, 0x8832, 0x8203, 0x870c,
-        0xd99e, 0x6001, 0x0014, 0x6845, 0x0214, 0xa21b, 0x9cd0, 0x2001,
-        0x98c5, 0x8201, 0x1852, 0xd184, 0xd163, 0x8834, 0x8001, 0x988d,
-        0x3027, 0x84a8, 0x1a56, 0x8833, 0x0014, 0xa218, 0x6981, 0x9cbc,
-        0x6b2a, 0x6902, 0x1834, 0x989d, 0x1814, 0x8010, 0x8592, 0x8026,
-        0x84b9, 0x7021, 0x0014, 0xa300, 0x69e1, 0x9ca9, 0x694b, 0xa213,
-        0x1462, 0xa213, 0x8000, 0x16e1, 0x98b5, 0x8023, 0x16e1, 0x8001,
-        0x10f1, 0x0016, 0x6969, 0xa214, 0x61c2, 0x8002, 0x14e1, 0x8004,
-        0x16e1, 0x0101, 0x300a, 0x8827, 0x0014, 0xa217, 0x9cbc, 0x0014,
-        0xa300, 0x8181, 0x842a, 0x84a8, 0x1ce6, 0x882c, 0x0016, 0xa212,
-        0x9cd0, 0x10d2, 0x70e4, 0x0004, 0x8007, 0x9424, 0xcc1a, 0x9cd3,
-        0x98c5, 0x8827, 0x300a, 0x0013, 0x8000, 0x84a4, 0x0016, 0x11c2,
-        0x211e, 0x870e, 0xa21d, 0x0014, 0x878e, 0x0016, 0xa21c, 0x1035,
-        0x9891, 0xa210, 0xa000, 0x8010, 0x8592, 0x853b, 0xd044, 0x8022,
-        0x3807, 0x84bb, 0x98ea, 0x8021, 0x3807, 0x84b9, 0x300c, 0x817e,
-        0x872b, 0x8772, 0x9891, 0x0000, 0x0020, 0x002b, 0x0000, 0x0020,
-        0x0000, 0x0020, 0x0000, 0x0020, 0x0000, 0x0020, 0x0000, 0x0020,
-        0x0000, 0x0020, 0x0000, 0x0020, 0x0000, 0x0020, 0x0000, 0x0020,
-        0x0000, 0x0020, 0x0000, 0x0020, 0x0000, 0x0020, 0x0000, 0x0020,
-        0x0000, 0x0020, 0x0000, 0x0020, 0x0000, 0x0020, 0x0000, 0x0014,
-        0x0014, 0x9849, 0x0014, 0x0014, 0x98ea, 0x98d5, 0x0014, 0x0014,
-        0x0014, 0x0080, 0x013f, 0x0000, 0x0201, 0x0604, 0x0c08, 0x2120,
-        0x4022, 0xf880, 0x0018, 0x300b, 0xa201, 0x0014, 0xa200, 0x0014,
-        0xa200, 0x0214, 0xa202, 0x8838, 0x3806, 0x8839, 0x20c3, 0x0864,
-        0xa833, 0x28c1, 0x9cb6, 0xa203, 0x300c, 0x2846, 0x8161, 0x846a,
-        0x8300, 0x1856, 0x883a, 0xa804, 0x28f2, 0x9c95, 0xa8f4, 0x300c,
-        0x28e1, 0x9c95, 0x2809, 0xa206, 0x64c0, 0x67a0, 0x6fc0, 0x1814,
-        0x883b, 0x782c, 0x786d, 0xa808, 0x282b, 0xa207, 0x64a0, 0x67a0,
-        0x6fc0, 0x1814, 0x883b, 0x7822, 0x883e, 0xa802, 0x8576, 0x8677,
-        0x206b, 0x28c1, 0x9cb6, 0x2044, 0x2103, 0x20a2, 0x2081, 0xa8e0,
-        0xa209, 0x2901, 0xa809, 0x0014, 0xa205, 0xa300, 0x1872, 0x879a,
-        0x883c, 0x1fe2, 0xc601, 0xa20a, 0x856e, 0x0704, 0x9c95, 0x0014,
-        0xa204, 0xa300, 0x3009, 0x19e2, 0xf868, 0x8176, 0x86eb, 0x85eb,
-        0x872e, 0x87a9, 0x883f, 0x08e6, 0xa8f3, 0xf881, 0xa8ec, 0xc801,
-        0x0014, 0xf8c1, 0x0016, 0x85b2, 0x80f0, 0x9532, 0xfb02, 0x1de2,
-        0x0014, 0x8532, 0xf241, 0x0014, 0x1de2, 0x84a8, 0xd7a0, 0x1fe6,
-        0x0014, 0xa208, 0x6043, 0x8008, 0x1dc1, 0x0016, 0x8300, 0x8160,
-        0x842a, 0xf041, 0x3008, 0x84a8, 0x11d6, 0x7042, 0x20dd, 0x0011,
-        0x20d5, 0x8822, 0x0016, 0x8000, 0x2847, 0x1011, 0xa8fc, 0x8000,
-        0xa000, 0x2802, 0x1011, 0xa8fd, 0xa893, 0x283e, 0x1011, 0xa8fd,
-        0xa20b, 0x0017, 0x300c, 0xa300, 0x1de2, 0xdb81, 0x0014, 0x0210,
-        0xa801, 0x0014, 0x26e0, 0x873a, 0xfb02, 0x19f2, 0x1fe2, 0x0014,
-        0xa20d, 0x3806, 0x0210, 0x9cbb, 0x0704, 0x0017, 0x60ff, 0x300c,
-        0x8720, 0xa211, 0x9d6b, 0x8772, 0x8837, 0x2101, 0xa821, 0x10d2,
-        0x78e2, 0x9d6e, 0xa8fc, 0xd984, 0xf0e2, 0xf0a1, 0xa86c, 0x0014,
-        0x8831, 0xd166, 0x8830, 0x800f, 0x9401, 0xb520, 0xc802, 0x8820,
-        0xa80f, 0x2301, 0xa80d, 0x10d2, 0x78e4, 0x9d6e, 0x8821, 0x8820,
-        0xa8e6, 0xf123, 0xf142, 0xf101, 0xa84f, 0x10d2, 0x70f6, 0x8832,
-        0x8203, 0x870c, 0xd99e, 0x6001, 0x0014, 0x6845, 0x0214, 0xa21b,
-        0x9d6b, 0x2001, 0xa840, 0x8201, 0x1852, 0xd184, 0xd163, 0x8834,
-        0x8001, 0xa801, 0x3027, 0x84a8, 0x1a56, 0x8833, 0x0014, 0xa218,
-        0x6981, 0x9d57, 0x6b2a, 0x6902, 0x1834, 0xa805, 0x1814, 0x8010,
-        0x8592, 0x8026, 0x84b9, 0x7021, 0x0014, 0xa300, 0x69e1, 0x9d44,
-        0x694b, 0xa213, 0x1462, 0xa213, 0x8000, 0x16e1, 0xa80c, 0x8023,
-        0x16e1, 0x8001, 0x10f1, 0x0016, 0x6969, 0xa214, 0x61c2, 0x8002,
-        0x14e1, 0x8004, 0x16e1, 0x0101, 0x300a, 0x8827, 0x0014, 0xa217,
-        0x9d57, 0x0014, 0xa300, 0x8181, 0x842a, 0x84a8, 0x1ce6, 0x882c,
-        0x0016, 0xa212, 0x9d6b, 0x10d2, 0x70e4, 0x0004, 0x8007, 0x9424,
-        0xcc1a, 0x9d6e, 0xa8f8, 0x8827, 0x300a, 0x0013, 0x8000, 0x84a4,
-        0x0016, 0x11c2, 0x211e, 0x870e, 0xa21d, 0x0014, 0x878e, 0x0016,
-        0xa21c, 0x1035, 0xa8b4, 0xa210, 0x3807, 0x300c, 0x817e, 0x872b,
-        0x8772, 0xa8ad, 0x0000, 0x8ec6
-};
-
-#endif /* RELOAD_FIRMWARE */
-
-static const unsigned short risc_code_length01 = 0x3f14;
diff --git a/drivers/scsi/raid_class.c b/drivers/scsi/raid_class.c
index caa0c3629626..5b1c12041a4f 100644
--- a/drivers/scsi/raid_class.c
+++ b/drivers/scsi/raid_class.c
@@ -1,5 +1,13 @@
 /*
- * RAID Attributes
+ * raid_class.c - implementation of a simple raid visualisation class
+ *
+ * Copyright (c) 2005 - James Bottomley <James.Bottomley@steeleye.com>
+ *
+ * This file is licensed under GPLv2
+ *
+ * This class is designed to allow raid attributes to be visualised and
+ * manipulated in a form independent of the underlying raid.  Ultimately this
+ * should work for both hardware and software raids.
  */
 #include <linux/init.h>
 #include <linux/module.h>
@@ -24,7 +32,7 @@ struct raid_internal {
 
 struct raid_component {
         struct list_head node;
-        struct device *dev;
+        struct class_device cdev;
         int num;
 };
 
@@ -74,11 +82,10 @@ static int raid_setup(struct transport_container *tc, struct device *dev,
 
         BUG_ON(class_get_devdata(cdev));
 
-        rd = kmalloc(sizeof(*rd), GFP_KERNEL);
+        rd = kzalloc(sizeof(*rd), GFP_KERNEL);
         if (!rd)
                 return -ENOMEM;
 
-        memset(rd, 0, sizeof(*rd));
         INIT_LIST_HEAD(&rd->component_list);
         class_set_devdata(cdev, rd);
                 
@@ -90,15 +97,15 @@ static int raid_remove(struct transport_container *tc, struct device *dev,
 {
         struct raid_data *rd = class_get_devdata(cdev);
         struct raid_component *rc, *next;
+        dev_printk(KERN_ERR, dev, "RAID REMOVE\n");
         class_set_devdata(cdev, NULL);
         list_for_each_entry_safe(rc, next, &rd->component_list, node) {
-                char buf[40];
-                snprintf(buf, sizeof(buf), "component-%d", rc->num);
                 list_del(&rc->node);
-                sysfs_remove_link(&cdev->kobj, buf);
-                kfree(rc);
+                dev_printk(KERN_ERR, rc->cdev.dev, "RAID COMPONENT REMOVE\n");
+                class_device_unregister(&rc->cdev);
         }
-        kfree(class_get_devdata(cdev));
+        dev_printk(KERN_ERR, dev, "RAID REMOVE DONE\n");
+        kfree(rd);
         return 0;
 }
 
@@ -112,10 +119,11 @@ static struct {
         enum raid_state value;
         char            *name;
 } raid_states[] = {
-        { RAID_ACTIVE, "active" },
-        { RAID_DEGRADED, "degraded" },
-        { RAID_RESYNCING, "resyncing" },
-        { RAID_OFFLINE, "offline" },
+        { RAID_STATE_UNKNOWN, "unknown" },
+        { RAID_STATE_ACTIVE, "active" },
+        { RAID_STATE_DEGRADED, "degraded" },
+        { RAID_STATE_RESYNCING, "resyncing" },
+        { RAID_STATE_OFFLINE, "offline" },
 };
 
 static const char *raid_state_name(enum raid_state state)
@@ -132,6 +140,33 @@ static const char *raid_state_name(enum raid_state state)
         return name;
 }
 
+static struct {
+        enum raid_level value;
+        char *name;
+} raid_levels[] = {
+        { RAID_LEVEL_UNKNOWN, "unknown" },
+        { RAID_LEVEL_LINEAR, "linear" },
+        { RAID_LEVEL_0, "raid0" },
+        { RAID_LEVEL_1, "raid1" },
+        { RAID_LEVEL_3, "raid3" },
+        { RAID_LEVEL_4, "raid4" },
+        { RAID_LEVEL_5, "raid5" },
+        { RAID_LEVEL_6, "raid6" },
+};
+
+static const char *raid_level_name(enum raid_level level)
+{
+        int i;
+        char *name = NULL;
+
+        for (i = 0; i < sizeof(raid_levels)/sizeof(raid_levels[0]); i++) {
+                if (raid_levels[i].value == level) {
+                        name = raid_levels[i].name;
+                        break;
+                }
+        }
+        return name;
+}
 
 #define raid_attr_show_internal(attr, fmt, var, code)                   \
 static ssize_t raid_show_##attr(struct class_device *cdev, char *buf)   \
@@ -161,11 +196,22 @@ static CLASS_DEVICE_ATTR(attr, S_IRUGO, raid_show_##attr, NULL)
 
 #define raid_attr_ro(attr)      raid_attr_ro_internal(attr, )
 #define raid_attr_ro_fn(attr)   raid_attr_ro_internal(attr, ATTR_CODE(attr))
-#define raid_attr_ro_state(attr)        raid_attr_ro_states(attr, attr, ATTR_CODE(attr))
+#define raid_attr_ro_state(attr)        raid_attr_ro_states(attr, attr, )
+#define raid_attr_ro_state_fn(attr)     raid_attr_ro_states(attr, attr, ATTR_CODE(attr))
+
 
-raid_attr_ro(level);
+raid_attr_ro_state(level);
 raid_attr_ro_fn(resync);
-raid_attr_ro_state(state);
+raid_attr_ro_state_fn(state);
+
+static void raid_component_release(struct class_device *cdev)
+{
+        struct raid_component *rc = container_of(cdev, struct raid_component,
+                                                 cdev);
+        dev_printk(KERN_ERR, rc->cdev.dev, "COMPONENT RELEASE\n");
+        put_device(rc->cdev.dev);
+        kfree(rc);
+}
 
 void raid_component_add(struct raid_template *r,struct device *raid_dev,
                         struct device *component_dev)
@@ -175,34 +221,36 @@ void raid_component_add(struct raid_template *r,struct device *raid_dev,
                                                       raid_dev);
         struct raid_component *rc;
         struct raid_data *rd = class_get_devdata(cdev);
-        char buf[40];
 
-        rc = kmalloc(sizeof(*rc), GFP_KERNEL);
+        rc = kzalloc(sizeof(*rc), GFP_KERNEL);
         if (!rc)
                 return;
 
         INIT_LIST_HEAD(&rc->node);
-        rc->dev = component_dev;
+        class_device_initialize(&rc->cdev);
+        rc->cdev.release = raid_component_release;
+        rc->cdev.dev = get_device(component_dev);
         rc->num = rd->component_count++;
 
-        snprintf(buf, sizeof(buf), "component-%d", rc->num);
+        snprintf(rc->cdev.class_id, sizeof(rc->cdev.class_id),
+                 "component-%d", rc->num);
         list_add_tail(&rc->node, &rd->component_list);
-        sysfs_create_link(&cdev->kobj, &component_dev->kobj, buf);
+        rc->cdev.parent = cdev;
+        rc->cdev.class = &raid_class.class;
+        class_device_add(&rc->cdev);
 }
 EXPORT_SYMBOL(raid_component_add);
 
 struct raid_template *
 raid_class_attach(struct raid_function_template *ft)
 {
-        struct raid_internal *i = kmalloc(sizeof(struct raid_internal),
+        struct raid_internal *i = kzalloc(sizeof(struct raid_internal),
                                           GFP_KERNEL);
         int count = 0;
 
         if (unlikely(!i))
                 return NULL;
 
-        memset(i, 0, sizeof(*i));
-
         i->f = ft;
 
         i->r.raid_attrs.ac.class = &raid_class.class;
diff --git a/drivers/scsi/sata_mv.c b/drivers/scsi/sata_mv.c
index 93d55233af7b..257c128f4aaa 100644
--- a/drivers/scsi/sata_mv.c
+++ b/drivers/scsi/sata_mv.c
@@ -349,7 +349,7 @@ static struct ata_port_info mv_port_info[] = {
         },
 };
 
-static struct pci_device_id mv_pci_tbl[] = {
+static const struct pci_device_id mv_pci_tbl[] = {
         {PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x5040), 0, 0, chip_504x},
         {PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x5041), 0, 0, chip_504x},
         {PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x5080), 0, 0, chip_508x},
@@ -359,6 +359,8 @@ static struct pci_device_id mv_pci_tbl[] = {
         {PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x6041), 0, 0, chip_604x},
         {PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x6080), 0, 0, chip_608x},
         {PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x6081), 0, 0, chip_608x},
+
+        {PCI_DEVICE(PCI_VENDOR_ID_ADAPTEC2, 0x0241), 0, 0, chip_604x},
         {}                      /* terminate list */
 };
 
diff --git a/drivers/scsi/sata_nv.c b/drivers/scsi/sata_nv.c
index 37a4fae95ed4..4954896dfdb9 100644
--- a/drivers/scsi/sata_nv.c
+++ b/drivers/scsi/sata_nv.c
@@ -137,7 +137,7 @@ enum nv_host_type
         CK804
 };
 
-static struct pci_device_id nv_pci_tbl[] = {
+static const struct pci_device_id nv_pci_tbl[] = {
         { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE2S_SATA,
                 PCI_ANY_ID, PCI_ANY_ID, 0, 0, NFORCE2 },
         { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE3S_SATA,
diff --git a/drivers/scsi/sata_promise.c b/drivers/scsi/sata_promise.c
index 9edc9d91efc3..242d906987ad 100644
--- a/drivers/scsi/sata_promise.c
+++ b/drivers/scsi/sata_promise.c
@@ -193,7 +193,7 @@ static struct ata_port_info pdc_port_info[] = {
         },
 };
 
-static struct pci_device_id pdc_ata_pci_tbl[] = {
+static const struct pci_device_id pdc_ata_pci_tbl[] = {
         { PCI_VENDOR_ID_PROMISE, 0x3371, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
           board_2037x },
         { PCI_VENDOR_ID_PROMISE, 0x3570, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
diff --git a/drivers/scsi/sata_qstor.c b/drivers/scsi/sata_qstor.c
index d274ab235781..4a6d3067d23c 100644
--- a/drivers/scsi/sata_qstor.c
+++ b/drivers/scsi/sata_qstor.c
@@ -184,7 +184,7 @@ static struct ata_port_info qs_port_info[] = {
         },
 };
 
-static struct pci_device_id qs_ata_pci_tbl[] = {
+static const struct pci_device_id qs_ata_pci_tbl[] = {
         { PCI_VENDOR_ID_PDC, 0x2068, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
           board_2068_idx },
 
@@ -268,7 +268,7 @@ static void qs_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val)
         writel(val, (void __iomem *)(ap->ioaddr.scr_addr + (sc_reg * 8)));
 }
 
-static void qs_fill_sg(struct ata_queued_cmd *qc)
+static unsigned int qs_fill_sg(struct ata_queued_cmd *qc)
 {
         struct scatterlist *sg;
         struct ata_port *ap = qc->ap;
@@ -296,6 +296,8 @@ static void qs_fill_sg(struct ata_queued_cmd *qc)
                                         (unsigned long long)addr, len);
                 nelem++;
         }
+
+        return nelem;
 }
 
 static void qs_qc_prep(struct ata_queued_cmd *qc)
@@ -304,6 +306,7 @@ static void qs_qc_prep(struct ata_queued_cmd *qc)
         u8 dflags = QS_DF_PORD, *buf = pp->pkt;
         u8 hflags = QS_HF_DAT | QS_HF_IEN | QS_HF_VLD;
         u64 addr;
+        unsigned int nelem;
 
         VPRINTK("ENTER\n");
 
@@ -313,7 +316,7 @@ static void qs_qc_prep(struct ata_queued_cmd *qc)
                 return;
         }
 
-        qs_fill_sg(qc);
+        nelem = qs_fill_sg(qc);
 
         if ((qc->tf.flags & ATA_TFLAG_WRITE))
                 hflags |= QS_HF_DIRO;
@@ -324,7 +327,7 @@ static void qs_qc_prep(struct ata_queued_cmd *qc)
         buf[ 0] = QS_HCB_HDR;
         buf[ 1] = hflags;
         *(__le32 *)(&buf[ 4]) = cpu_to_le32(qc->nsect * ATA_SECT_SIZE);
-        *(__le32 *)(&buf[ 8]) = cpu_to_le32(qc->n_elem);
+        *(__le32 *)(&buf[ 8]) = cpu_to_le32(nelem);
         addr = ((u64)pp->pkt_dma) + QS_CPB_BYTES;
         *(__le64 *)(&buf[16]) = cpu_to_le64(addr);
 
diff --git a/drivers/scsi/sata_sil.c b/drivers/scsi/sata_sil.c
index d0e3c3c6c25f..36091868560d 100644
--- a/drivers/scsi/sata_sil.c
+++ b/drivers/scsi/sata_sil.c
@@ -87,7 +87,7 @@ static void sil_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val);
 static void sil_post_set_mode (struct ata_port *ap);
 
 
-static struct pci_device_id sil_pci_tbl[] = {
+static const struct pci_device_id sil_pci_tbl[] = {
         { 0x1095, 0x3112, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sil_3112_m15w },
         { 0x1095, 0x0240, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sil_3112_m15w },
         { 0x1095, 0x3512, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sil_3112 },
diff --git a/drivers/scsi/sata_sil24.c b/drivers/scsi/sata_sil24.c
index 4682a50650b4..d3198d9a72c1 100644
--- a/drivers/scsi/sata_sil24.c
+++ b/drivers/scsi/sata_sil24.c
@@ -240,7 +240,7 @@ static void sil24_port_stop(struct ata_port *ap);
 static void sil24_host_stop(struct ata_host_set *host_set);
 static int sil24_init_one(struct pci_dev *pdev, const struct pci_device_id *ent);
 
-static struct pci_device_id sil24_pci_tbl[] = {
+static const struct pci_device_id sil24_pci_tbl[] = {
         { 0x1095, 0x3124, PCI_ANY_ID, PCI_ANY_ID, 0, 0, BID_SIL3124 },
         { 0x1095, 0x3132, PCI_ANY_ID, PCI_ANY_ID, 0, 0, BID_SIL3132 },
         { 0x1095, 0x3131, PCI_ANY_ID, PCI_ANY_ID, 0, 0, BID_SIL3131 },
diff --git a/drivers/scsi/sata_sis.c b/drivers/scsi/sata_sis.c
index 42d7c4e92501..32e12620b162 100644
--- a/drivers/scsi/sata_sis.c
+++ b/drivers/scsi/sata_sis.c
@@ -67,7 +67,7 @@ static int sis_init_one (struct pci_dev *pdev, const struct pci_device_id *ent);
 static u32 sis_scr_read (struct ata_port *ap, unsigned int sc_reg);
 static void sis_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val);
 
-static struct pci_device_id sis_pci_tbl[] = {
+static const struct pci_device_id sis_pci_tbl[] = {
         { PCI_VENDOR_ID_SI, 0x180, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sis_180 },
         { PCI_VENDOR_ID_SI, 0x181, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sis_180 },
         { PCI_VENDOR_ID_SI, 0x182, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sis_180 },
diff --git a/drivers/scsi/sata_svw.c b/drivers/scsi/sata_svw.c
index 9895d1caefcf..57e5a9d964c3 100644
--- a/drivers/scsi/sata_svw.c
+++ b/drivers/scsi/sata_svw.c
@@ -466,7 +466,7 @@ err_out:
  * 0x24a is device ID for BCM5785 (aka HT1000) HT southbridge integrated SATA
  * controller
  * */
-static struct pci_device_id k2_sata_pci_tbl[] = {
+static const struct pci_device_id k2_sata_pci_tbl[] = {
         { 0x1166, 0x0240, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4 },
         { 0x1166, 0x0241, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4 },
         { 0x1166, 0x0242, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 8 },
diff --git a/drivers/scsi/sata_sx4.c b/drivers/scsi/sata_sx4.c
index d5a38784352b..b4bbe48acab0 100644
--- a/drivers/scsi/sata_sx4.c
+++ b/drivers/scsi/sata_sx4.c
@@ -229,7 +229,7 @@ static struct ata_port_info pdc_port_info[] = {
 
 };
 
-static struct pci_device_id pdc_sata_pci_tbl[] = {
+static const struct pci_device_id pdc_sata_pci_tbl[] = {
         { PCI_VENDOR_ID_PROMISE, 0x6622, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
           board_20621 },
         { }     /* terminate list */
diff --git a/drivers/scsi/sata_uli.c b/drivers/scsi/sata_uli.c
index cf0baaa4e045..b2422a0f25c8 100644
--- a/drivers/scsi/sata_uli.c
+++ b/drivers/scsi/sata_uli.c
@@ -55,7 +55,7 @@ static int uli_init_one (struct pci_dev *pdev, const struct pci_device_id *ent);
 static u32 uli_scr_read (struct ata_port *ap, unsigned int sc_reg);
 static void uli_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val);
 
-static struct pci_device_id uli_pci_tbl[] = {
+static const struct pci_device_id uli_pci_tbl[] = {
         { PCI_VENDOR_ID_AL, 0x5289, PCI_ANY_ID, PCI_ANY_ID, 0, 0, uli_5289 },
         { PCI_VENDOR_ID_AL, 0x5287, PCI_ANY_ID, PCI_ANY_ID, 0, 0, uli_5287 },
         { PCI_VENDOR_ID_AL, 0x5281, PCI_ANY_ID, PCI_ANY_ID, 0, 0, uli_5281 },
diff --git a/drivers/scsi/sata_via.c b/drivers/scsi/sata_via.c
index ab19d2ba2a4b..c76215692da2 100644
--- a/drivers/scsi/sata_via.c
+++ b/drivers/scsi/sata_via.c
@@ -75,7 +75,7 @@ static int svia_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
 static u32 svia_scr_read (struct ata_port *ap, unsigned int sc_reg);
 static void svia_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val);
 
-static struct pci_device_id svia_pci_tbl[] = {
+static const struct pci_device_id svia_pci_tbl[] = {
         { 0x1106, 0x3149, PCI_ANY_ID, PCI_ANY_ID, 0, 0, vt6420 },
         { 0x1106, 0x3249, PCI_ANY_ID, PCI_ANY_ID, 0, 0, vt6421 },
 
diff --git a/drivers/scsi/sata_vsc.c b/drivers/scsi/sata_vsc.c
index ce8a2fd7da84..77a6e4b9262d 100644
--- a/drivers/scsi/sata_vsc.c
+++ b/drivers/scsi/sata_vsc.c
@@ -400,7 +400,7 @@ err_out:
  * 0x8086/0x3200 is the Intel 31244, which is supposed to be identical
  * compatibility is untested as of yet
  */
-static struct pci_device_id vsc_sata_pci_tbl[] = {
+static const struct pci_device_id vsc_sata_pci_tbl[] = {
         { 0x1725, 0x7174, PCI_ANY_ID, PCI_ANY_ID, 0x10600, 0xFFFFFF, 0 },
         { 0x8086, 0x3200, PCI_ANY_ID, PCI_ANY_ID, 0x10600, 0xFFFFFF, 0 },
         { }
diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c
index b61fb1295b8b..3ded9daaf4a0 100644
--- a/drivers/scsi/scsi_debug.c
+++ b/drivers/scsi/scsi_debug.c
@@ -178,7 +178,7 @@ struct sdebug_queued_cmd {
 };
 static struct sdebug_queued_cmd queued_arr[SCSI_DEBUG_CANQUEUE];
 
-static Scsi_Host_Template sdebug_driver_template = {
+static struct scsi_host_template sdebug_driver_template = {
         .proc_info =            scsi_debug_proc_info,
         .name =                 "SCSI DEBUG",
         .info =                 scsi_debug_info,
diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
index 0c5b02d4c7f8..18c5d2523014 100644
--- a/drivers/scsi/scsi_error.c
+++ b/drivers/scsi/scsi_error.c
@@ -417,43 +417,15 @@ static int scsi_eh_completed_normally(struct scsi_cmnd *scmd)
 }
 
 /**
- * scsi_eh_times_out - timeout function for error handling.
- * @scmd:       Cmd that is timing out.
- *
- * Notes:
- *    During error handling, the kernel thread will be sleeping waiting
- *    for some action to complete on the device.  our only job is to
- *    record that it timed out, and to wake up the thread.
- **/
-static void scsi_eh_times_out(struct scsi_cmnd *scmd)
-{
-        scmd->eh_eflags |= SCSI_EH_REC_TIMEOUT;
-        SCSI_LOG_ERROR_RECOVERY(3, printk("%s: scmd:%p\n", __FUNCTION__,
-                                          scmd));
-
-        up(scmd->device->host->eh_action);
-}
-
-/**
  * scsi_eh_done - Completion function for error handling.
  * @scmd:       Cmd that is done.
  **/
 static void scsi_eh_done(struct scsi_cmnd *scmd)
 {
-        /*
-         * if the timeout handler is already running, then just set the
-         * flag which says we finished late, and return.  we have no
-         * way of stopping the timeout handler from running, so we must
-         * always defer to it.
-         */
-        if (del_timer(&scmd->eh_timeout)) {
-                scmd->request->rq_status = RQ_SCSI_DONE;
-
-                SCSI_LOG_ERROR_RECOVERY(3, printk("%s scmd: %p result: %x\n",
-                                           __FUNCTION__, scmd, scmd->result));
-
-                up(scmd->device->host->eh_action);
-        }
+        SCSI_LOG_ERROR_RECOVERY(3,
+                printk("%s scmd: %p result: %x\n",
+                        __FUNCTION__, scmd, scmd->result));
+        complete(scmd->device->host->eh_action);
 }
 
 /**
@@ -461,10 +433,6 @@ static void scsi_eh_done(struct scsi_cmnd *scmd)
  * @scmd:       SCSI Cmd to send.
  * @timeout:    Timeout for cmd.
  *
- * Notes:
- *    The initialization of the structures is quite a bit different in
- *    this case, and furthermore, there is a different completion handler
- *    vs scsi_dispatch_cmd.
  * Return value:
  *    SUCCESS or FAILED or NEEDS_RETRY
  **/
@@ -472,24 +440,16 @@ static int scsi_send_eh_cmnd(struct scsi_cmnd *scmd, int timeout)
 {
         struct scsi_device *sdev = scmd->device;
         struct Scsi_Host *shost = sdev->host;
-        DECLARE_MUTEX_LOCKED(sem);
+        DECLARE_COMPLETION(done);
+        unsigned long timeleft;
         unsigned long flags;
-        int rtn = SUCCESS;
+        int rtn;
 
-        /*
-         * we will use a queued command if possible, otherwise we will
-         * emulate the queuing and calling of completion function ourselves.
-         */
         if (sdev->scsi_level <= SCSI_2)
                 scmd->cmnd[1] = (scmd->cmnd[1] & 0x1f) |
                         (sdev->lun << 5 & 0xe0);
 
-        scsi_add_timer(scmd, timeout, scsi_eh_times_out);
-
-        /*
-         * set up the semaphore so we wait for the command to complete.
-         */
-        shost->eh_action = &sem;
+        shost->eh_action = &done;
         scmd->request->rq_status = RQ_SCSI_BUSY;
 
         spin_lock_irqsave(shost->host_lock, flags);
@@ -497,47 +457,29 @@ static int scsi_send_eh_cmnd(struct scsi_cmnd *scmd, int timeout)
         shost->hostt->queuecommand(scmd, scsi_eh_done);
         spin_unlock_irqrestore(shost->host_lock, flags);
 
-        down(&sem);
-        scsi_log_completion(scmd, SUCCESS);
+        timeleft = wait_for_completion_timeout(&done, timeout);
 
+        scmd->request->rq_status = RQ_SCSI_DONE;
         shost->eh_action = NULL;
 
-        /*
-         * see if timeout.  if so, tell the host to forget about it.
-         * in other words, we don't want a callback any more.
-         */
-        if (scmd->eh_eflags & SCSI_EH_REC_TIMEOUT) {
-                scmd->eh_eflags &= ~SCSI_EH_REC_TIMEOUT;
-
-                /*
-                 * as far as the low level driver is
-                 * concerned, this command is still active, so
-                 * we must give the low level driver a chance
-                 * to abort it. (db) 
-                 *
-                 * FIXME(eric) - we are not tracking whether we could
-                 * abort a timed out command or not.  not sure how
-                 * we should treat them differently anyways.
-                 */
-                if (shost->hostt->eh_abort_handler)
-                        shost->hostt->eh_abort_handler(scmd);
-                        
-                scmd->request->rq_status = RQ_SCSI_DONE;
-                rtn = FAILED;
-        }
+        scsi_log_completion(scmd, SUCCESS);
 
-        SCSI_LOG_ERROR_RECOVERY(3, printk("%s: scmd: %p, rtn:%x\n",
-                                          __FUNCTION__, scmd, rtn));
+        SCSI_LOG_ERROR_RECOVERY(3,
+                printk("%s: scmd: %p, timeleft: %ld\n",
+                        __FUNCTION__, scmd, timeleft));
 
         /*
-         * now examine the actual status codes to see whether the command
-         * actually did complete normally.
+         * If there is time left scsi_eh_done got called, and we will
+         * examine the actual status codes to see whether the command
+         * actually did complete normally, else tell the host to forget
+         * about this command.
          */
-        if (rtn == SUCCESS) {
+        if (timeleft) {
                 rtn = scsi_eh_completed_normally(scmd);
                 SCSI_LOG_ERROR_RECOVERY(3,
                         printk("%s: scsi_eh_completed_normally %x\n",
                                __FUNCTION__, rtn));
+
                 switch (rtn) {
                 case SUCCESS:
                 case NEEDS_RETRY:
@@ -547,6 +489,15 @@ static int scsi_send_eh_cmnd(struct scsi_cmnd *scmd, int timeout)
                         rtn = FAILED;
                         break;
                 }
+        } else {
+                /*
+                 * FIXME(eric) - we are not tracking whether we could
+                 * abort a timed out command or not.  not sure how
+                 * we should treat them differently anyways.
+                 */
+                if (shost->hostt->eh_abort_handler)
+                        shost->hostt->eh_abort_handler(scmd);
+                rtn = FAILED;
         }
 
         return rtn;
@@ -1571,50 +1522,41 @@ static void scsi_unjam_host(struct Scsi_Host *shost)
 }
 
 /**
- * scsi_error_handler - Handle errors/timeouts of SCSI cmds.
+ * scsi_error_handler - SCSI error handler thread
  * @data:       Host for which we are running.
  *
  * Notes:
- *    This is always run in the context of a kernel thread.  The idea is
- *    that we start this thing up when the kernel starts up (one per host
- *    that we detect), and it immediately goes to sleep and waits for some
- *    event (i.e. failure).  When this takes place, we have the job of
- *    trying to unjam the bus and restarting things.
+ *    This is the main error handling loop.  This is run as a kernel thread
+ *    for every SCSI host and handles all error handling activity.
  **/
 int scsi_error_handler(void *data)
 {
-        struct Scsi_Host *shost = (struct Scsi_Host *) data;
-        int rtn;
+        struct Scsi_Host *shost = data;
 
         current->flags |= PF_NOFREEZE;
 
-        
         /*
-         * Note - we always use TASK_INTERRUPTIBLE even if the module
-         * was loaded as part of the kernel.  The reason is that
-         * UNINTERRUPTIBLE would cause this thread to be counted in
-         * the load average as a running process, and an interruptible
-         * wait doesn't.
+         * We use TASK_INTERRUPTIBLE so that the thread is not
+         * counted against the load average as a running process.
+         * We never actually get interrupted because kthread_run
+         * disables singal delivery for the created thread.
          */
         set_current_state(TASK_INTERRUPTIBLE);
         while (!kthread_should_stop()) {
                 if (shost->host_failed == 0 ||
                     shost->host_failed != shost->host_busy) {
-                        SCSI_LOG_ERROR_RECOVERY(1, printk("Error handler"
-                                                          " scsi_eh_%d"
-                                                          " sleeping\n",
-                                                          shost->host_no));
+                        SCSI_LOG_ERROR_RECOVERY(1,
+                                printk("Error handler scsi_eh_%d sleeping\n",
+                                        shost->host_no));
                         schedule();
                         set_current_state(TASK_INTERRUPTIBLE);
                         continue;
                 }
 
                 __set_current_state(TASK_RUNNING);
-                SCSI_LOG_ERROR_RECOVERY(1, printk("Error handler"
-                                                  " scsi_eh_%d waking"
-                                                  " up\n",shost->host_no));
-
-                shost->eh_active = 1;
+                SCSI_LOG_ERROR_RECOVERY(1,
+                        printk("Error handler scsi_eh_%d waking up\n",
+                                shost->host_no));
 
                 /*
                  * We have a host that is failing for some reason.  Figure out
@@ -1622,12 +1564,10 @@ int scsi_error_handler(void *data)
                  * If we fail, we end up taking the thing offline.
                  */
                 if (shost->hostt->eh_strategy_handler) 
-                        rtn = shost->hostt->eh_strategy_handler(shost);
+                        shost->hostt->eh_strategy_handler(shost);
                 else
                         scsi_unjam_host(shost);
 
-                shost->eh_active = 0;
-
                 /*
                  * Note - if the above fails completely, the action is to take
                  * individual devices offline and flush the queue of any
@@ -1638,15 +1578,10 @@ int scsi_error_handler(void *data)
                 scsi_restart_operations(shost);
                 set_current_state(TASK_INTERRUPTIBLE);
         }
-
         __set_current_state(TASK_RUNNING);
 
-        SCSI_LOG_ERROR_RECOVERY(1, printk("Error handler scsi_eh_%d"
-                                          " exiting\n",shost->host_no));
-
-        /*
-         * Make sure that nobody tries to wake us up again.
-         */
+        SCSI_LOG_ERROR_RECOVERY(1,
+                printk("Error handler scsi_eh_%d exiting\n", shost->host_no));
         shost->ehandler = NULL;
         return 0;
 }
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index e40c8b66da40..ce9d73a292e2 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -254,55 +254,6 @@ void scsi_do_req(struct scsi_request *sreq, const void *cmnd,
 }
 EXPORT_SYMBOL(scsi_do_req);
 
-/* This is the end routine we get to if a command was never attached
- * to the request.  Simply complete the request without changing
- * rq_status; this will cause a DRIVER_ERROR. */
-static void scsi_wait_req_end_io(struct request *req)
-{
-        BUG_ON(!req->waiting);
-
-        complete(req->waiting);
-}
-
-void scsi_wait_req(struct scsi_request *sreq, const void *cmnd, void *buffer,
-                   unsigned bufflen, int timeout, int retries)
-{
-        DECLARE_COMPLETION(wait);
-        int write = (sreq->sr_data_direction == DMA_TO_DEVICE);
-        struct request *req;
-
-        req = blk_get_request(sreq->sr_device->request_queue, write,
-                              __GFP_WAIT);
-        if (bufflen && blk_rq_map_kern(sreq->sr_device->request_queue, req,
-                                       buffer, bufflen, __GFP_WAIT)) {
-                sreq->sr_result = DRIVER_ERROR << 24;
-                blk_put_request(req);
-                return;
-        }
-
-        req->flags |= REQ_NOMERGE;
-        req->waiting = &wait;
-        req->end_io = scsi_wait_req_end_io;
-        req->cmd_len = COMMAND_SIZE(((u8 *)cmnd)[0]);
-        req->sense = sreq->sr_sense_buffer;
-        req->sense_len = 0;
-        memcpy(req->cmd, cmnd, req->cmd_len);
-        req->timeout = timeout;
-        req->flags |= REQ_BLOCK_PC;
-        req->rq_disk = NULL;
-        blk_insert_request(sreq->sr_device->request_queue, req,
-                           sreq->sr_data_direction == DMA_TO_DEVICE, NULL);
-        wait_for_completion(&wait);
-        sreq->sr_request->waiting = NULL;
-        sreq->sr_result = req->errors;
-        if (req->errors)
-                sreq->sr_result |= (DRIVER_ERROR << 24);
-
-        blk_put_request(req);
-}
-
-EXPORT_SYMBOL(scsi_wait_req);
-
 /**
  * scsi_execute - insert request and wait for the result
  * @sdev:       scsi device
@@ -591,10 +542,17 @@ static void scsi_requeue_command(struct request_queue *q, struct scsi_cmnd *cmd)
 
 void scsi_next_command(struct scsi_cmnd *cmd)
 {
-        struct request_queue *q = cmd->device->request_queue;
+        struct scsi_device *sdev = cmd->device;
+        struct request_queue *q = sdev->request_queue;
+
+        /* need to hold a reference on the device before we let go of the cmd */
+        get_device(&sdev->sdev_gendev);
 
         scsi_put_command(cmd);
         scsi_run_queue(q);
+
+        /* ok to remove device now */
+        put_device(&sdev->sdev_gendev);
 }
 
 void scsi_run_host_queues(struct Scsi_Host *shost)
diff --git a/drivers/scsi/scsi_priv.h b/drivers/scsi/scsi_priv.h
index d05f778d31a8..d632d9e1493c 100644
--- a/drivers/scsi/scsi_priv.h
+++ b/drivers/scsi/scsi_priv.h
@@ -22,7 +22,6 @@ struct Scsi_Host;
  * Scsi Error Handler Flags
  */
 #define SCSI_EH_CANCEL_CMD      0x0001  /* Cancel this cmd */
-#define SCSI_EH_REC_TIMEOUT     0x0002  /* EH retry timed out */
 
 #define SCSI_SENSE_VALID(scmd) \
         (((scmd)->sense_buffer[0] & 0x70) == 0x70)
diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
index 7eb3a2d40dc5..374853df9cca 100644
--- a/drivers/scsi/scsi_scan.c
+++ b/drivers/scsi/scsi_scan.c
@@ -9,7 +9,7 @@
  * global variable (boot or module load time) settings.
  *
  * A specific LUN is scanned via an INQUIRY command; if the LUN has a
- * device attached, a Scsi_Device is allocated and setup for it.
+ * device attached, a scsi_device is allocated and setup for it.
  *
  * For every id of every channel on the given host:
  *
@@ -17,7 +17,7 @@
  *      device or storage attached to LUN 0):
  *
  *              If LUN 0 has a device attached, allocate and setup a
- *              Scsi_Device for it.
+ *              scsi_device for it.
  *
  *              If target is SCSI-3 or up, issue a REPORT LUN, and scan
  *              all of the LUNs returned by the REPORT LUN; else,
@@ -441,7 +441,7 @@ void scsi_target_reap(struct scsi_target *starget)
  *
  *     If the INQUIRY is successful, zero is returned and the
  *     INQUIRY data is in @inq_result; the scsi_level and INQUIRY length
- *     are copied to the Scsi_Device any flags value is stored in *@bflags.
+ *     are copied to the scsi_device any flags value is stored in *@bflags.
  **/
 static int scsi_probe_lun(struct scsi_device *sdev, char *inq_result,
                           int result_len, int *bflags)
@@ -509,8 +509,8 @@ static int scsi_probe_lun(struct scsi_device *sdev, char *inq_result,
                 /*
                  * Get any flags for this device.
                  *
-                 * XXX add a bflags to Scsi_Device, and replace the
-                 * corresponding bit fields in Scsi_Device, so bflags
+                 * XXX add a bflags to scsi_device, and replace the
+                 * corresponding bit fields in scsi_device, so bflags
                  * need not be passed as an argument.
                  */
                 *bflags = scsi_get_device_flags(sdev, &inq_result[8],
@@ -592,21 +592,21 @@ static int scsi_probe_lun(struct scsi_device *sdev, char *inq_result,
 }
 
 /**
- * scsi_add_lun - allocate and fully initialze a Scsi_Device
- * @sdevscan:   holds information to be stored in the new Scsi_Device
- * @sdevnew:    store the address of the newly allocated Scsi_Device
+ * scsi_add_lun - allocate and fully initialze a scsi_device
+ * @sdevscan:   holds information to be stored in the new scsi_device
+ * @sdevnew:    store the address of the newly allocated scsi_device
  * @inq_result: holds the result of a previous INQUIRY to the LUN
  * @bflags:     black/white list flag
  *
  * Description:
- *     Allocate and initialize a Scsi_Device matching sdevscan. Optionally
+ *     Allocate and initialize a scsi_device matching sdevscan. Optionally
  *     set fields based on values in *@bflags. If @sdevnew is not
- *     NULL, store the address of the new Scsi_Device in *@sdevnew (needed
+ *     NULL, store the address of the new scsi_device in *@sdevnew (needed
  *     when scanning a particular LUN).
  *
  * Return:
- *     SCSI_SCAN_NO_RESPONSE: could not allocate or setup a Scsi_Device
- *     SCSI_SCAN_LUN_PRESENT: a new Scsi_Device was allocated and initialized
+ *     SCSI_SCAN_NO_RESPONSE: could not allocate or setup a scsi_device
+ *     SCSI_SCAN_LUN_PRESENT: a new scsi_device was allocated and initialized
  **/
 static int scsi_add_lun(struct scsi_device *sdev, char *inq_result, int *bflags)
 {
@@ -674,7 +674,7 @@ static int scsi_add_lun(struct scsi_device *sdev, char *inq_result, int *bflags)
          *
          * The above is vague, as it implies that we could treat 001 and
          * 011 the same. Stay compatible with previous code, and create a
-         * Scsi_Device for a PQ of 1
+         * scsi_device for a PQ of 1
          *
          * Don't set the device offline here; rather let the upper
          * level drivers eval the PQ to decide whether they should
@@ -784,8 +784,8 @@ static inline void scsi_destroy_sdev(struct scsi_device *sdev)
  * scsi_probe_and_add_lun - probe a LUN, if a LUN is found add it
  * @starget:    pointer to target device structure
  * @lun:        LUN of target device
- * @sdevscan:   probe the LUN corresponding to this Scsi_Device
- * @sdevnew:    store the value of any new Scsi_Device allocated
+ * @sdevscan:   probe the LUN corresponding to this scsi_device
+ * @sdevnew:    store the value of any new scsi_device allocated
  * @bflagsp:    store bflags here if not NULL
  *
  * Description:
@@ -793,10 +793,10 @@ static inline void scsi_destroy_sdev(struct scsi_device *sdev)
  *     allocate and set it up by calling scsi_add_lun.
  *
  * Return:
- *     SCSI_SCAN_NO_RESPONSE: could not allocate or setup a Scsi_Device
+ *     SCSI_SCAN_NO_RESPONSE: could not allocate or setup a scsi_device
  *     SCSI_SCAN_TARGET_PRESENT: target responded, but no device is
  *         attached at the LUN
- *     SCSI_SCAN_LUN_PRESENT: a new Scsi_Device was allocated and initialized
+ *     SCSI_SCAN_LUN_PRESENT: a new scsi_device was allocated and initialized
  **/
 static int scsi_probe_and_add_lun(struct scsi_target *starget,
                                   uint lun, int *bflagsp,
@@ -1046,7 +1046,7 @@ EXPORT_SYMBOL(int_to_scsilun);
 
 /**
  * scsi_report_lun_scan - Scan using SCSI REPORT LUN results
- * @sdevscan:   scan the host, channel, and id of this Scsi_Device
+ * @sdevscan:   scan the host, channel, and id of this scsi_device
  *
  * Description:
  *     If @sdevscan is for a SCSI-3 or up device, send a REPORT LUN
@@ -1074,6 +1074,7 @@ static int scsi_report_lun_scan(struct scsi_target *starget, int bflags,
         struct scsi_sense_hdr sshdr;
         struct scsi_device *sdev;
         struct Scsi_Host *shost = dev_to_shost(&starget->dev);
+        int ret = 0;
 
         /*
          * Only support SCSI-3 and up devices if BLIST_NOREPORTLUN is not set.
@@ -1169,8 +1170,8 @@ static int scsi_report_lun_scan(struct scsi_target *starget, int bflags,
                 /*
                  * The device probably does not support a REPORT LUN command
                  */
-                kfree(lun_data);
-                return 1;
+                ret = 1;
+                goto out_err;
         }
 
         /*
@@ -1238,6 +1239,7 @@ static int scsi_report_lun_scan(struct scsi_target *starget, int bflags,
                 }
         }
 
+ out_err:
         kfree(lun_data);
  out:
         scsi_device_put(sdev);
@@ -1246,7 +1248,7 @@ static int scsi_report_lun_scan(struct scsi_target *starget, int bflags,
                  * the sdev we used didn't appear in the report luns scan
                  */
                 scsi_destroy_sdev(sdev);
-        return 0;
+        return ret;
 }
 
 struct scsi_device *__scsi_add_device(struct Scsi_Host *shost, uint channel,
@@ -1472,16 +1474,16 @@ void scsi_forget_host(struct Scsi_Host *shost)
 /*
  * Function:    scsi_get_host_dev()
  *
- * Purpose:     Create a Scsi_Device that points to the host adapter itself.
+ * Purpose:     Create a scsi_device that points to the host adapter itself.
  *
- * Arguments:   SHpnt   - Host that needs a Scsi_Device
+ * Arguments:   SHpnt   - Host that needs a scsi_device
  *
  * Lock status: None assumed.
  *
- * Returns:     The Scsi_Device or NULL
+ * Returns:     The scsi_device or NULL
  *
  * Notes:
- *      Attach a single Scsi_Device to the Scsi_Host - this should
+ *      Attach a single scsi_device to the Scsi_Host - this should
  *      be made to look like a "pseudo-device" that points to the
  *      HA itself.
  *
@@ -1518,7 +1520,7 @@ EXPORT_SYMBOL(scsi_get_host_dev);
  *
  * Purpose:     Free a scsi_device that points to the host adapter itself.
  *
- * Arguments:   SHpnt   - Host that needs a Scsi_Device
+ * Arguments:   SHpnt   - Host that needs a scsi_device
  *
  * Lock status: None assumed.
  *
diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
index 72a6550a056c..46349293de08 100644
--- a/drivers/scsi/scsi_sysfs.c
+++ b/drivers/scsi/scsi_sysfs.c
@@ -691,16 +691,19 @@ int scsi_sysfs_add_sdev(struct scsi_device *sdev)
 
 void __scsi_remove_device(struct scsi_device *sdev)
 {
+        struct device *dev = &sdev->sdev_gendev;
+
         if (scsi_device_set_state(sdev, SDEV_CANCEL) != 0)
                 return;
 
         class_device_unregister(&sdev->sdev_classdev);
-        device_del(&sdev->sdev_gendev);
+        transport_remove_device(dev);
+        device_del(dev);
         scsi_device_set_state(sdev, SDEV_DEL);
         if (sdev->host->hostt->slave_destroy)
                 sdev->host->hostt->slave_destroy(sdev);
-        transport_unregister_device(&sdev->sdev_gendev);
-        put_device(&sdev->sdev_gendev);
+        transport_destroy_device(dev);
+        put_device(dev);
 }
 
 /**
diff --git a/drivers/scsi/scsi_typedefs.h b/drivers/scsi/scsi_typedefs.h
index 6c431323581c..29f038b42f60 100644
--- a/drivers/scsi/scsi_typedefs.h
+++ b/drivers/scsi/scsi_typedefs.h
@@ -1,6 +1,3 @@
 
-typedef struct scsi_host_template Scsi_Host_Template;
-typedef struct scsi_device Scsi_Device;
 typedef struct scsi_cmnd Scsi_Cmnd;
 typedef struct scsi_request Scsi_Request;
-typedef struct scsi_pointer Scsi_Pointer;
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index bb5b242ac6b4..8613a1317712 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -769,20 +769,16 @@ static void sd_end_flush(request_queue_t *q, struct request *flush_rq)
 static int sd_prepare_flush(request_queue_t *q, struct request *rq)
 {
         struct scsi_device *sdev = q->queuedata;
-        struct scsi_disk *sdkp = scsi_disk_get_from_dev(&sdev->sdev_gendev);
-        int ret = 0;
+        struct scsi_disk *sdkp = dev_get_drvdata(&sdev->sdev_gendev);
 
-        if (sdkp) {
-                if (sdkp->WCE) {
-                        memset(rq->cmd, 0, sizeof(rq->cmd));
-                        rq->flags |= REQ_BLOCK_PC | REQ_SOFTBARRIER;
-                        rq->timeout = SD_TIMEOUT;
-                        rq->cmd[0] = SYNCHRONIZE_CACHE;
-                        ret = 1;
-                }
-                scsi_disk_put(sdkp);
-        }
-        return ret;
+        if (!sdkp || !sdkp->WCE)
+                return 0;
+
+        memset(rq->cmd, 0, sizeof(rq->cmd));
+        rq->flags |= REQ_BLOCK_PC | REQ_SOFTBARRIER;
+        rq->timeout = SD_TIMEOUT;
+        rq->cmd[0] = SYNCHRONIZE_CACHE;
+        return 1;
 }
 
 static void sd_rescan(struct device *dev)
diff --git a/drivers/scsi/seagate.c b/drivers/scsi/seagate.c
index a0cace9aeb79..0ff83ddf13fe 100644
--- a/drivers/scsi/seagate.c
+++ b/drivers/scsi/seagate.c
@@ -418,7 +418,7 @@ static inline void borken_wait (void)
 #define ULOOP( i ) for (clock = i*8;;)
 #define TIMEOUT (!(clock--))
 
-int __init seagate_st0x_detect (Scsi_Host_Template * tpnt)
+int __init seagate_st0x_detect (struct scsi_host_template * tpnt)
 {
         struct Scsi_Host *instance;
         int i, j;
@@ -1649,7 +1649,7 @@ static int seagate_st0x_release(struct Scsi_Host *shost)
         return 0;
 }
 
-static Scsi_Host_Template driver_template = {
+static struct scsi_host_template driver_template = {
         .detect                 = seagate_st0x_detect,
         .release                = seagate_st0x_release,
         .info                   = seagate_st0x_info,
diff --git a/drivers/scsi/seagate.h b/drivers/scsi/seagate.h
index 8889ff1a6b20..fb5f380fa4b3 100644
--- a/drivers/scsi/seagate.h
+++ b/drivers/scsi/seagate.h
@@ -9,7 +9,7 @@
 #ifndef _SEAGATE_H
 #define SEAGATE_H
 
-static int seagate_st0x_detect(Scsi_Host_Template *);
+static int seagate_st0x_detect(struct scsi_host_template *);
 static int seagate_st0x_queue_command(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
 
 static int seagate_st0x_abort(Scsi_Cmnd *);
diff --git a/drivers/scsi/sgiwd93.c b/drivers/scsi/sgiwd93.c
index f37147f8f7bf..bf2ceb54354c 100644
--- a/drivers/scsi/sgiwd93.c
+++ b/drivers/scsi/sgiwd93.c
@@ -217,7 +217,7 @@ static inline void init_hpc_chain(struct hpc_data *hd)
 }
 
 static struct Scsi_Host * __init sgiwd93_setup_scsi(
-        Scsi_Host_Template *SGIblows, int unit, int irq,
+        struct scsi_host_template *SGIblows, int unit, int irq,
         struct hpc3_scsiregs *hregs, unsigned char *wdregs)
 {
         struct ip22_hostdata *hdata;
@@ -265,7 +265,7 @@ out_unregister:
         return NULL;
 }
 
-int __init sgiwd93_detect(Scsi_Host_Template *SGIblows)
+int __init sgiwd93_detect(struct scsi_host_template *SGIblows)
 {
         int found = 0;
 
@@ -324,7 +324,7 @@ static int sgiwd93_bus_reset(Scsi_Cmnd *cmd)
  * arguments not with pointers.  So this is going to blow up beautyfully
  * on 64-bit systems with memory outside the compat address spaces.
  */
-static Scsi_Host_Template driver_template = {
+static struct scsi_host_template driver_template = {
         .proc_name              = "SGIWD93",
         .name                   = "SGI WD93",
         .detect                 = sgiwd93_detect,
diff --git a/drivers/scsi/sun3_NCR5380.c b/drivers/scsi/sun3_NCR5380.c
index 7e19589e71a0..c041bfd56e12 100644
--- a/drivers/scsi/sun3_NCR5380.c
+++ b/drivers/scsi/sun3_NCR5380.c
@@ -257,7 +257,7 @@
  */
 
 static struct Scsi_Host *first_instance = NULL;
-static Scsi_Host_Template *the_template = NULL;
+static struct scsi_host_template *the_template = NULL;
 
 /* Macros ease life... :-) */
 #define SETUP_HOSTDATA(in)                              \
diff --git a/drivers/scsi/sun3_scsi.c b/drivers/scsi/sun3_scsi.c
index e3ea99f23d60..837173415d4c 100644
--- a/drivers/scsi/sun3_scsi.c
+++ b/drivers/scsi/sun3_scsi.c
@@ -185,7 +185,7 @@ static inline void sun3_udc_write(unsigned short val, unsigned char reg)
 static struct Scsi_Host *default_instance;
 
 /*
- * Function : int sun3scsi_detect(Scsi_Host_Template * tpnt)
+ * Function : int sun3scsi_detect(struct scsi_host_template * tpnt)
  *
  * Purpose : initializes mac NCR5380 driver based on the
  *      command line / compile time port and irq definitions.
@@ -196,7 +196,7 @@ static struct Scsi_Host *default_instance;
  *
  */
  
-int sun3scsi_detect(Scsi_Host_Template * tpnt)
+int sun3scsi_detect(struct scsi_host_template * tpnt)
 {
         unsigned long ioaddr;
         static int called = 0;
@@ -621,7 +621,7 @@ static int sun3scsi_dma_finish(int write_flag)
         
 #include "sun3_NCR5380.c"
 
-static Scsi_Host_Template driver_template = {
+static struct scsi_host_template driver_template = {
         .name                   = SUN3_SCSI_NAME,
         .detect                 = sun3scsi_detect,
         .release                = sun3scsi_release,
diff --git a/drivers/scsi/sun3_scsi.h b/drivers/scsi/sun3_scsi.h
index 155282b92a95..834dab428019 100644
--- a/drivers/scsi/sun3_scsi.h
+++ b/drivers/scsi/sun3_scsi.h
@@ -48,7 +48,7 @@
 #define IOBASE_SUN3_VMESCSI 0xff200000
 
 static int sun3scsi_abort (Scsi_Cmnd *);
-static int sun3scsi_detect (Scsi_Host_Template *);
+static int sun3scsi_detect (struct scsi_host_template *);
 static const char *sun3scsi_info (struct Scsi_Host *);
 static int sun3scsi_bus_reset(Scsi_Cmnd *);
 static int sun3scsi_queue_command (Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
diff --git a/drivers/scsi/sun3_scsi_vme.c b/drivers/scsi/sun3_scsi_vme.c
index 9acb5ddebb07..008a82ab8521 100644
--- a/drivers/scsi/sun3_scsi_vme.c
+++ b/drivers/scsi/sun3_scsi_vme.c
@@ -127,7 +127,7 @@ static inline void sun3scsi_write(int reg, int value)
 static struct Scsi_Host *default_instance;
 
 /*
- * Function : int sun3scsi_detect(Scsi_Host_Template * tpnt)
+ * Function : int sun3scsi_detect(struct scsi_host_template * tpnt)
  *
  * Purpose : initializes mac NCR5380 driver based on the
  *      command line / compile time port and irq definitions.
@@ -138,7 +138,7 @@ static struct Scsi_Host *default_instance;
  *
  */
  
-static int sun3scsi_detect(Scsi_Host_Template * tpnt)
+static int sun3scsi_detect(struct scsi_host_template * tpnt)
 {
         unsigned long ioaddr, irq = 0;
         static int called = 0;
@@ -564,7 +564,7 @@ static int sun3scsi_dma_finish(int write_flag)
 
 #include "sun3_NCR5380.c"
 
-static Scsi_Host_Template driver_template = {
+static struct scsi_host_template driver_template = {
         .name                   = SUN3_SCSI_NAME,
         .detect                 = sun3scsi_detect,
         .release                = sun3scsi_release,
diff --git a/drivers/scsi/sun3x_esp.c b/drivers/scsi/sun3x_esp.c
index 09d7639079b4..cc990bed9683 100644
--- a/drivers/scsi/sun3x_esp.c
+++ b/drivers/scsi/sun3x_esp.c
@@ -47,7 +47,7 @@ static void dma_advance_sg (Scsi_Cmnd *sp);
 /* Detecting ESP chips on the machine.  This is the simple and easy
  * version.
  */
-int sun3x_esp_detect(Scsi_Host_Template *tpnt)
+int sun3x_esp_detect(struct scsi_host_template *tpnt)
 {
         struct NCR_ESP *esp;
         struct ConfigDev *esp_dev;
@@ -367,7 +367,7 @@ static int sun3x_esp_release(struct Scsi_Host *instance)
 
 }
 
-static Scsi_Host_Template driver_template = {
+static struct scsi_host_template driver_template = {
         .proc_name              = "sun3x_esp",
         .proc_info              = &esp_proc_info,
         .name                   = "Sun ESP 100/100a/200",
diff --git a/drivers/scsi/sym53c416.c b/drivers/scsi/sym53c416.c
index 93dc7b665ccf..8640253d6215 100644
--- a/drivers/scsi/sym53c416.c
+++ b/drivers/scsi/sym53c416.c
@@ -633,7 +633,7 @@ static void sym53c416_probe(void)
         }
 }
 
-int __init sym53c416_detect(Scsi_Host_Template *tpnt)
+int __init sym53c416_detect(struct scsi_host_template *tpnt)
 {
         unsigned long flags;
         struct Scsi_Host * shpnt = NULL;
@@ -849,7 +849,7 @@ module_param_array(sym53c416_3, uint, NULL, 0);
 
 #endif
 
-static Scsi_Host_Template driver_template = {
+static struct scsi_host_template driver_template = {
         .proc_name =            "sym53c416",
         .name =                 "Symbios Logic 53c416",
         .detect =               sym53c416_detect,
diff --git a/drivers/scsi/sym53c416.h b/drivers/scsi/sym53c416.h
index fd6b120d38c4..77860d0748ff 100644
--- a/drivers/scsi/sym53c416.h
+++ b/drivers/scsi/sym53c416.h
@@ -22,7 +22,7 @@
 
 #define SYM53C416_SCSI_ID 7
 
-static int sym53c416_detect(Scsi_Host_Template *);
+static int sym53c416_detect(struct scsi_host_template *);
 static const char *sym53c416_info(struct Scsi_Host *);
 static int sym53c416_release(struct Scsi_Host *);
 static int sym53c416_queuecommand(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
diff --git a/drivers/scsi/t128.c b/drivers/scsi/t128.c
index f4b780e35cb6..21305fc91479 100644
--- a/drivers/scsi/t128.c
+++ b/drivers/scsi/t128.c
@@ -183,7 +183,7 @@ void __init t128_setup(char *str, int *ints){
 }
 
 /* 
- * Function : int t128_detect(Scsi_Host_Template * tpnt)
+ * Function : int t128_detect(struct scsi_host_template * tpnt)
  *
  * Purpose : detects and initializes T128,T128F, or T228 controllers
  *      that were autoprobed, overridden on the LILO command line, 
@@ -195,7 +195,7 @@ void __init t128_setup(char *str, int *ints){
  *
  */
 
-int __init t128_detect(Scsi_Host_Template * tpnt){
+int __init t128_detect(struct scsi_host_template * tpnt){
     static int current_override = 0, current_base = 0;
     struct Scsi_Host *instance;
     unsigned long base;
@@ -430,7 +430,7 @@ MODULE_LICENSE("GPL");
 
 #include "NCR5380.c"
 
-static Scsi_Host_Template driver_template = {
+static struct scsi_host_template driver_template = {
         .name           = "Trantor T128/T128F/T228",
         .detect         = t128_detect,
         .release        = t128_release,
diff --git a/drivers/scsi/t128.h b/drivers/scsi/t128.h
index 596f3a32a1c6..646e840266e2 100644
--- a/drivers/scsi/t128.h
+++ b/drivers/scsi/t128.h
@@ -95,7 +95,7 @@
 static int t128_abort(Scsi_Cmnd *);
 static int t128_biosparam(struct scsi_device *, struct block_device *,
                           sector_t, int*);
-static int t128_detect(Scsi_Host_Template *);
+static int t128_detect(struct scsi_host_template *);
 static int t128_queue_command(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
 static int t128_bus_reset(Scsi_Cmnd *);
 
diff --git a/drivers/scsi/u14-34f.c b/drivers/scsi/u14-34f.c
index 1ce29ba683eb..33cd90fc657b 100644
--- a/drivers/scsi/u14-34f.c
+++ b/drivers/scsi/u14-34f.c
@@ -282,7 +282,7 @@
  *  clustering is enabled. ENABLE_CLUSTERING provides a performance increase
  *  up to 50% on sequential access.
  *
- *  Since the Scsi_Host_Template structure is shared among all 14F and 34F,
+ *  Since the struct scsi_host_template structure is shared among all 14F and 34F,
  *  the last setting of use_clustering is in effect for all of these boards.
  *
  *  Here a sample configuration using two U14F boards:
diff --git a/drivers/scsi/ultrastor.c b/drivers/scsi/ultrastor.c
index 486551bd54ba..e681681ab7a2 100644
--- a/drivers/scsi/ultrastor.c
+++ b/drivers/scsi/ultrastor.c
@@ -343,7 +343,7 @@ static void log_ultrastor_abort(struct ultrastor_config *config,
 }
 #endif
 
-static int ultrastor_14f_detect(Scsi_Host_Template * tpnt)
+static int ultrastor_14f_detect(struct scsi_host_template * tpnt)
 {
     size_t i;
     unsigned char in_byte, version_byte = 0;
@@ -525,7 +525,7 @@ out_release_port:
     return FALSE;
 }
 
-static int ultrastor_24f_detect(Scsi_Host_Template * tpnt)
+static int ultrastor_24f_detect(struct scsi_host_template * tpnt)
 {
   int i;
   struct Scsi_Host * shpnt = NULL;
@@ -637,7 +637,7 @@ static int ultrastor_24f_detect(Scsi_Host_Template * tpnt)
   return FALSE;
 }
 
-static int ultrastor_detect(Scsi_Host_Template * tpnt)
+static int ultrastor_detect(struct scsi_host_template * tpnt)
 {
         tpnt->proc_name = "ultrastor";
         return ultrastor_14f_detect(tpnt) || ultrastor_24f_detect(tpnt);
@@ -1184,7 +1184,7 @@ static irqreturn_t do_ultrastor_interrupt(int irq, void *dev_id,
 
 MODULE_LICENSE("GPL");
 
-static Scsi_Host_Template driver_template = {
+static struct scsi_host_template driver_template = {
         .name              = "UltraStor 14F/24F/34F",
         .detect            = ultrastor_detect,
         .release           = ultrastor_release,
diff --git a/drivers/scsi/ultrastor.h b/drivers/scsi/ultrastor.h
index 0a0f8df9e871..da759a11deff 100644
--- a/drivers/scsi/ultrastor.h
+++ b/drivers/scsi/ultrastor.h
@@ -13,7 +13,7 @@
 #ifndef _ULTRASTOR_H
 #define _ULTRASTOR_H
 
-static int ultrastor_detect(Scsi_Host_Template *);
+static int ultrastor_detect(struct scsi_host_template *);
 static const char *ultrastor_info(struct Scsi_Host * shpnt);
 static int ultrastor_queuecommand(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
 static int ultrastor_abort(Scsi_Cmnd *);
diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
index 98820603e75f..3742753241ee 100644
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
@@ -2381,9 +2381,9 @@ void serial8250_resume_port(int line)
  * list is terminated with a zero flags entry, which means we expect
  * all entries to have at least UPF_BOOT_AUTOCONF set.
  */
-static int __devinit serial8250_probe(struct device *dev)
+static int __devinit serial8250_probe(struct platform_device *dev)
 {
-        struct plat_serial8250_port *p = dev->platform_data;
+        struct plat_serial8250_port *p = dev->dev.platform_data;
         struct uart_port port;
         int ret, i;
 
@@ -2399,12 +2399,12 @@ static int __devinit serial8250_probe(struct device *dev)
                 port.flags      = p->flags;
                 port.mapbase    = p->mapbase;
                 port.hub6       = p->hub6;
-                port.dev        = dev;
+                port.dev        = &dev->dev;
                 if (share_irqs)
                         port.flags |= UPF_SHARE_IRQ;
                 ret = serial8250_register_port(&port);
                 if (ret < 0) {
-                        dev_err(dev, "unable to register port at index %d "
+                        dev_err(&dev->dev, "unable to register port at index %d "
                                 "(IO%lx MEM%lx IRQ%d): %d\n", i,
                                 p->iobase, p->mapbase, p->irq, ret);
                 }
@@ -2415,54 +2415,55 @@ static int __devinit serial8250_probe(struct device *dev)
 /*
  * Remove serial ports registered against a platform device.
  */
-static int __devexit serial8250_remove(struct device *dev)
+static int __devexit serial8250_remove(struct platform_device *dev)
 {
         int i;
 
         for (i = 0; i < UART_NR; i++) {
                 struct uart_8250_port *up = &serial8250_ports[i];
 
-                if (up->port.dev == dev)
+                if (up->port.dev == &dev->dev)
                         serial8250_unregister_port(i);
         }
         return 0;
 }
 
-static int serial8250_suspend(struct device *dev, pm_message_t state)
+static int serial8250_suspend(struct platform_device *dev, pm_message_t state)
 {
         int i;
 
         for (i = 0; i < UART_NR; i++) {
                 struct uart_8250_port *up = &serial8250_ports[i];
 
-                if (up->port.type != PORT_UNKNOWN && up->port.dev == dev)
+                if (up->port.type != PORT_UNKNOWN && up->port.dev == &dev->dev)
                         uart_suspend_port(&serial8250_reg, &up->port);
         }
 
         return 0;
 }
 
-static int serial8250_resume(struct device *dev)
+static int serial8250_resume(struct platform_device *dev)
 {
         int i;
 
         for (i = 0; i < UART_NR; i++) {
                 struct uart_8250_port *up = &serial8250_ports[i];
 
-                if (up->port.type != PORT_UNKNOWN && up->port.dev == dev)
+                if (up->port.type != PORT_UNKNOWN && up->port.dev == &dev->dev)
                         uart_resume_port(&serial8250_reg, &up->port);
         }
 
         return 0;
 }
 
-static struct device_driver serial8250_isa_driver = {
-        .name           = "serial8250",
-        .bus            = &platform_bus_type,
+static struct platform_driver serial8250_isa_driver = {
         .probe          = serial8250_probe,
         .remove         = __devexit_p(serial8250_remove),
         .suspend        = serial8250_suspend,
         .resume         = serial8250_resume,
+        .driver         = {
+                .name   = "serial8250",
+        },
 };
 
 /*
@@ -2608,7 +2609,7 @@ static int __init serial8250_init(void)
 
         serial8250_register_ports(&serial8250_reg, &serial8250_isa_devs->dev);
 
-        ret = driver_register(&serial8250_isa_driver);
+        ret = platform_driver_register(&serial8250_isa_driver);
         if (ret == 0)
                 goto out;
 
@@ -2630,7 +2631,7 @@ static void __exit serial8250_exit(void)
          */
         serial8250_isa_devs = NULL;
 
-        driver_unregister(&serial8250_isa_driver);
+        platform_driver_unregister(&serial8250_isa_driver);
         platform_device_unregister(isa_dev);
 
         uart_unregister_driver(&serial8250_reg);
diff --git a/drivers/serial/imx.c b/drivers/serial/imx.c
index 4a54ff584700..355cd93a8a87 100644
--- a/drivers/serial/imx.c
+++ b/drivers/serial/imx.c
@@ -921,9 +921,9 @@ static struct uart_driver imx_reg = {
         .cons           = IMX_CONSOLE,
 };
 
-static int serial_imx_suspend(struct device *_dev, pm_message_t state)
+static int serial_imx_suspend(struct platform_device *dev, pm_message_t state)
 {
-        struct imx_port *sport = dev_get_drvdata(_dev);
+        struct imx_port *sport = platform_get_drvdata(dev);
 
         if (sport)
                 uart_suspend_port(&imx_reg, &sport->port);
@@ -931,9 +931,9 @@ static int serial_imx_suspend(struct device *_dev, pm_message_t state)
         return 0;
 }
 
-static int serial_imx_resume(struct device *_dev)
+static int serial_imx_resume(struct platform_device *dev)
 {
-        struct imx_port *sport = dev_get_drvdata(_dev);
+        struct imx_port *sport = platform_get_drvdata(dev);
 
         if (sport)
                 uart_resume_port(&imx_reg, &sport->port);
@@ -941,21 +941,19 @@ static int serial_imx_resume(struct device *_dev)
         return 0;
 }
 
-static int serial_imx_probe(struct device *_dev)
+static int serial_imx_probe(struct platform_device *dev)
 {
-        struct platform_device *dev = to_platform_device(_dev);
-
-        imx_ports[dev->id].port.dev = _dev;
+        imx_ports[dev->id].port.dev = &dev->dev;
         uart_add_one_port(&imx_reg, &imx_ports[dev->id].port);
-        dev_set_drvdata(_dev, &imx_ports[dev->id]);
+        platform_set_drvdata(dev, &imx_ports[dev->id]);
         return 0;
 }
 
-static int serial_imx_remove(struct device *_dev)
+static int serial_imx_remove(struct platform_device *dev)
 {
-        struct imx_port *sport = dev_get_drvdata(_dev);
+        struct imx_port *sport = platform_get_drvdata(dev);
 
-        dev_set_drvdata(_dev, NULL);
+        platform_set_drvdata(dev, NULL);
 
         if (sport)
                 uart_remove_one_port(&imx_reg, &sport->port);
@@ -963,14 +961,15 @@ static int serial_imx_remove(struct device *_dev)
         return 0;
 }
 
-static struct device_driver serial_imx_driver = {
-        .name           = "imx-uart",
-        .bus            = &platform_bus_type,
+static struct platform_driver serial_imx_driver = {
         .probe          = serial_imx_probe,
         .remove         = serial_imx_remove,
 
         .suspend        = serial_imx_suspend,
         .resume         = serial_imx_resume,
+        .driver         = {
+                .name   = "imx-uart",
+        },
 };
 
 static int __init imx_serial_init(void)
@@ -985,7 +984,7 @@ static int __init imx_serial_init(void)
         if (ret)
                 return ret;
 
-        ret = driver_register(&serial_imx_driver);
+        ret = platform_driver_register(&serial_imx_driver);
         if (ret != 0)
                 uart_unregister_driver(&imx_reg);
 
diff --git a/drivers/serial/mpc52xx_uart.c b/drivers/serial/mpc52xx_uart.c
index 0dd08a09e7e6..5d3cb8486447 100644
--- a/drivers/serial/mpc52xx_uart.c
+++ b/drivers/serial/mpc52xx_uart.c
@@ -717,10 +717,9 @@ static struct uart_driver mpc52xx_uart_driver = {
 /* ======================================================================== */
 
 static int __devinit
-mpc52xx_uart_probe(struct device *dev)
+mpc52xx_uart_probe(struct platform_device *dev)
 {
-        struct platform_device *pdev = to_platform_device(dev);
-        struct resource *res = pdev->resource;
+        struct resource *res = dev->resource;
 
         struct uart_port *port = NULL;
         int i, idx, ret;
@@ -761,17 +760,17 @@ mpc52xx_uart_probe(struct device *dev)
         /* Add the port to the uart sub-system */
         ret = uart_add_one_port(&mpc52xx_uart_driver, port);
         if (!ret)
-                dev_set_drvdata(dev, (void*)port);
+                platform_set_drvdata(dev, (void*)port);
 
         return ret;
 }
 
 static int
-mpc52xx_uart_remove(struct device *dev)
+mpc52xx_uart_remove(struct platform_device *dev)
 {
-        struct uart_port *port = (struct uart_port *) dev_get_drvdata(dev);
+        struct uart_port *port = (struct uart_port *) platform_get_drvdata(dev);
 
-        dev_set_drvdata(dev, NULL);
+        platform_set_drvdata(dev, NULL);
 
         if (port)
                 uart_remove_one_port(&mpc52xx_uart_driver, port);
@@ -781,9 +780,9 @@ mpc52xx_uart_remove(struct device *dev)
 
 #ifdef CONFIG_PM
 static int
-mpc52xx_uart_suspend(struct device *dev, pm_message_t state)
+mpc52xx_uart_suspend(struct platform_device *dev, pm_message_t state)
 {
-        struct uart_port *port = (struct uart_port *) dev_get_drvdata(dev);
+        struct uart_port *port = (struct uart_port *) platform_get_drvdata(dev);
 
         if (sport)
                 uart_suspend_port(&mpc52xx_uart_driver, port);
@@ -792,9 +791,9 @@ mpc52xx_uart_suspend(struct device *dev, pm_message_t state)
 }
 
 static int
-mpc52xx_uart_resume(struct device *dev)
+mpc52xx_uart_resume(struct platform_device *dev)
 {
-        struct uart_port *port = (struct uart_port *) dev_get_drvdata(dev);
+        struct uart_port *port = (struct uart_port *) platform_get_drvdata(dev);
 
         if (port)
                 uart_resume_port(&mpc52xx_uart_driver, port);
@@ -803,15 +802,16 @@ mpc52xx_uart_resume(struct device *dev)
 }
 #endif
 
-static struct device_driver mpc52xx_uart_platform_driver = {
-        .name           = "mpc52xx-psc",
-        .bus            = &platform_bus_type,
+static struct platform_driver mpc52xx_uart_platform_driver = {
         .probe          = mpc52xx_uart_probe,
         .remove         = mpc52xx_uart_remove,
 #ifdef CONFIG_PM
         .suspend        = mpc52xx_uart_suspend,
         .resume         = mpc52xx_uart_resume,
 #endif
+        .driver         = {
+                .name   = "mpc52xx-psc",
+        },
 };
 
 
@@ -828,7 +828,7 @@ mpc52xx_uart_init(void)
 
         ret = uart_register_driver(&mpc52xx_uart_driver);
         if (ret == 0) {
-                ret = driver_register(&mpc52xx_uart_platform_driver);
+                ret = platform_driver_register(&mpc52xx_uart_platform_driver);
                 if (ret)
                         uart_unregister_driver(&mpc52xx_uart_driver);
         }
@@ -839,7 +839,7 @@ mpc52xx_uart_init(void)
 static void __exit
 mpc52xx_uart_exit(void)
 {
-        driver_unregister(&mpc52xx_uart_platform_driver);
+        platform_driver_unregister(&mpc52xx_uart_platform_driver);
         uart_unregister_driver(&mpc52xx_uart_driver);
 }
 
diff --git a/drivers/serial/mpsc.c b/drivers/serial/mpsc.c
index ba8838b234da..8f83e4007ecd 100644
--- a/drivers/serial/mpsc.c
+++ b/drivers/serial/mpsc.c
@@ -1551,15 +1551,14 @@ mpsc_shared_unmap_regs(void)
 }
 
 static int
-mpsc_shared_drv_probe(struct device *dev)
+mpsc_shared_drv_probe(struct platform_device *dev)
 {
-        struct platform_device          *pd = to_platform_device(dev);
         struct mpsc_shared_pdata        *pdata;
         int                              rc = -ENODEV;
 
-        if (pd->id == 0) {
-                if (!(rc = mpsc_shared_map_regs(pd)))  {
-                        pdata = (struct mpsc_shared_pdata *)dev->platform_data;
+        if (dev->id == 0) {
+                if (!(rc = mpsc_shared_map_regs(dev)))  {
+                        pdata = (struct mpsc_shared_pdata *)dev->dev.platform_data;
 
                         mpsc_shared_regs.MPSC_MRR_m = pdata->mrr_val;
                         mpsc_shared_regs.MPSC_RCRR_m= pdata->rcrr_val;
@@ -1577,12 +1576,11 @@ mpsc_shared_drv_probe(struct device *dev)
 }
 
 static int
-mpsc_shared_drv_remove(struct device *dev)
+mpsc_shared_drv_remove(struct platform_device *dev)
 {
-        struct platform_device  *pd = to_platform_device(dev);
         int     rc = -ENODEV;
 
-        if (pd->id == 0) {
+        if (dev->id == 0) {
                 mpsc_shared_unmap_regs();
                 mpsc_shared_regs.MPSC_MRR_m = 0;
                 mpsc_shared_regs.MPSC_RCRR_m = 0;
@@ -1595,11 +1593,12 @@ mpsc_shared_drv_remove(struct device *dev)
         return rc;
 }
 
-static struct device_driver mpsc_shared_driver = {
-        .name   = MPSC_SHARED_NAME,
-        .bus    = &platform_bus_type,
+static struct platform_driver mpsc_shared_driver = {
         .probe  = mpsc_shared_drv_probe,
         .remove = mpsc_shared_drv_remove,
+        .driver = {
+                .name = MPSC_SHARED_NAME,
+        },
 };
 
 /*
@@ -1732,19 +1731,18 @@ mpsc_drv_get_platform_data(struct mpsc_port_info *pi,
 }
 
 static int
-mpsc_drv_probe(struct device *dev)
+mpsc_drv_probe(struct platform_device *dev)
 {
-        struct platform_device  *pd = to_platform_device(dev);
         struct mpsc_port_info   *pi;
         int                     rc = -ENODEV;
 
-        pr_debug("mpsc_drv_probe: Adding MPSC %d\n", pd->id);
+        pr_debug("mpsc_drv_probe: Adding MPSC %d\n", dev->id);
 
-        if (pd->id < MPSC_NUM_CTLRS) {
-                pi = &mpsc_ports[pd->id];
+        if (dev->id < MPSC_NUM_CTLRS) {
+                pi = &mpsc_ports[dev->id];
 
-                if (!(rc = mpsc_drv_map_regs(pi, pd))) {
-                        mpsc_drv_get_platform_data(pi, pd, pd->id);
+                if (!(rc = mpsc_drv_map_regs(pi, dev))) {
+                        mpsc_drv_get_platform_data(pi, dev, dev->id);
 
                         if (!(rc = mpsc_make_ready(pi)))
                                 if (!(rc = uart_add_one_port(&mpsc_reg,
@@ -1764,27 +1762,26 @@ mpsc_drv_probe(struct device *dev)
 }
 
 static int
-mpsc_drv_remove(struct device *dev)
+mpsc_drv_remove(struct platform_device *dev)
 {
-        struct platform_device  *pd = to_platform_device(dev);
+        pr_debug("mpsc_drv_exit: Removing MPSC %d\n", dev->id);
 
-        pr_debug("mpsc_drv_exit: Removing MPSC %d\n", pd->id);
-
-        if (pd->id < MPSC_NUM_CTLRS) {
-                uart_remove_one_port(&mpsc_reg, &mpsc_ports[pd->id].port);
-                mpsc_release_port((struct uart_port *)&mpsc_ports[pd->id].port);
-                mpsc_drv_unmap_regs(&mpsc_ports[pd->id]);
+        if (dev->id < MPSC_NUM_CTLRS) {
+                uart_remove_one_port(&mpsc_reg, &mpsc_ports[dev->id].port);
+                mpsc_release_port((struct uart_port *)&mpsc_ports[dev->id].port);
+                mpsc_drv_unmap_regs(&mpsc_ports[dev->id]);
                 return 0;
         }
         else
                 return -ENODEV;
 }
 
-static struct device_driver mpsc_driver = {
-        .name   = MPSC_CTLR_NAME,
-        .bus    = &platform_bus_type,
+static struct platform_driver mpsc_driver = {
         .probe  = mpsc_drv_probe,
         .remove = mpsc_drv_remove,
+        .driver = {
+                .name = MPSC_CTLR_NAME,
+        },
 };
 
 static int __init
@@ -1798,9 +1795,9 @@ mpsc_drv_init(void)
         memset(&mpsc_shared_regs, 0, sizeof(mpsc_shared_regs));
 
         if (!(rc = uart_register_driver(&mpsc_reg))) {
-                if (!(rc = driver_register(&mpsc_shared_driver))) {
-                        if ((rc = driver_register(&mpsc_driver))) {
-                                driver_unregister(&mpsc_shared_driver);
+                if (!(rc = platform_driver_register(&mpsc_shared_driver))) {
+                        if ((rc = platform_driver_register(&mpsc_driver))) {
+                                platform_driver_unregister(&mpsc_shared_driver);
                                 uart_unregister_driver(&mpsc_reg);
                         }
                 }
@@ -1815,8 +1812,8 @@ mpsc_drv_init(void)
 static void __exit
 mpsc_drv_exit(void)
 {
-        driver_unregister(&mpsc_driver);
-        driver_unregister(&mpsc_shared_driver);
+        platform_driver_unregister(&mpsc_driver);
+        platform_driver_unregister(&mpsc_shared_driver);
         uart_unregister_driver(&mpsc_reg);
         memset(mpsc_ports, 0, sizeof(mpsc_ports));
         memset(&mpsc_shared_regs, 0, sizeof(mpsc_shared_regs));
diff --git a/drivers/serial/pxa.c b/drivers/serial/pxa.c
index 16b2f9417af9..ff5e6309d682 100644
--- a/drivers/serial/pxa.c
+++ b/drivers/serial/pxa.c
@@ -805,9 +805,9 @@ static struct uart_driver serial_pxa_reg = {
         .cons           = PXA_CONSOLE,
 };
 
-static int serial_pxa_suspend(struct device *_dev, pm_message_t state)
+static int serial_pxa_suspend(struct platform_device *dev, pm_message_t state)
 {
-        struct uart_pxa_port *sport = dev_get_drvdata(_dev);
+        struct uart_pxa_port *sport = platform_get_drvdata(dev);
 
         if (sport)
                 uart_suspend_port(&serial_pxa_reg, &sport->port);
@@ -815,9 +815,9 @@ static int serial_pxa_suspend(struct device *_dev, pm_message_t state)
         return 0;
 }
 
-static int serial_pxa_resume(struct device *_dev)
+static int serial_pxa_resume(struct platform_device *dev)
 {
-        struct uart_pxa_port *sport = dev_get_drvdata(_dev);
+        struct uart_pxa_port *sport = platform_get_drvdata(dev);
 
         if (sport)
                 uart_resume_port(&serial_pxa_reg, &sport->port);
@@ -825,21 +825,19 @@ static int serial_pxa_resume(struct device *_dev)
         return 0;
 }
 
-static int serial_pxa_probe(struct device *_dev)
+static int serial_pxa_probe(struct platform_device *dev)
 {
-        struct platform_device *dev = to_platform_device(_dev);
-
-        serial_pxa_ports[dev->id].port.dev = _dev;
+        serial_pxa_ports[dev->id].port.dev = &dev->dev;
         uart_add_one_port(&serial_pxa_reg, &serial_pxa_ports[dev->id].port);
-        dev_set_drvdata(_dev, &serial_pxa_ports[dev->id]);
+        platform_set_drvdata(dev, &serial_pxa_ports[dev->id]);
         return 0;
 }
 
-static int serial_pxa_remove(struct device *_dev)
+static int serial_pxa_remove(struct platform_device *dev)
 {
-        struct uart_pxa_port *sport = dev_get_drvdata(_dev);
+        struct uart_pxa_port *sport = platform_get_drvdata(dev);
 
-        dev_set_drvdata(_dev, NULL);
+        platform_set_drvdata(dev, NULL);
 
         if (sport)
                 uart_remove_one_port(&serial_pxa_reg, &sport->port);
@@ -847,14 +845,15 @@ static int serial_pxa_remove(struct device *_dev)
         return 0;
 }
 
-static struct device_driver serial_pxa_driver = {
-        .name           = "pxa2xx-uart",
-        .bus            = &platform_bus_type,
+static struct platform_driver serial_pxa_driver = {
         .probe          = serial_pxa_probe,
         .remove         = serial_pxa_remove,
 
         .suspend        = serial_pxa_suspend,
         .resume         = serial_pxa_resume,
+        .driver         = {
+                .name   = "pxa2xx-uart",
+        },
 };
 
 int __init serial_pxa_init(void)
@@ -865,7 +864,7 @@ int __init serial_pxa_init(void)
         if (ret != 0)
                 return ret;
 
-        ret = driver_register(&serial_pxa_driver);
+        ret = platform_driver_register(&serial_pxa_driver);
         if (ret != 0)
                 uart_unregister_driver(&serial_pxa_reg);
 
@@ -874,7 +873,7 @@ int __init serial_pxa_init(void)
 
 void __exit serial_pxa_exit(void)
 {
-        driver_unregister(&serial_pxa_driver);
+        platform_driver_unregister(&serial_pxa_driver);
         uart_unregister_driver(&serial_pxa_reg);
 }
 
diff --git a/drivers/serial/s3c2410.c b/drivers/serial/s3c2410.c
index 036792328d49..47681c4654e4 100644
--- a/drivers/serial/s3c2410.c
+++ b/drivers/serial/s3c2410.c
@@ -1092,14 +1092,13 @@ static int s3c24xx_serial_init_port(struct s3c24xx_uart_port *ourport,
 
 static int probe_index = 0;
 
-static int s3c24xx_serial_probe(struct device *_dev,
+static int s3c24xx_serial_probe(struct platform_device *dev,
                                 struct s3c24xx_uart_info *info)
 {
         struct s3c24xx_uart_port *ourport;
-        struct platform_device *dev = to_platform_device(_dev);
         int ret;
 
-        dbg("s3c24xx_serial_probe(%p, %p) %d\n", _dev, info, probe_index);
+        dbg("s3c24xx_serial_probe(%p, %p) %d\n", dev, info, probe_index);
 
         ourport = &s3c24xx_serial_ports[probe_index];
         probe_index++;
@@ -1112,7 +1111,7 @@ static int s3c24xx_serial_probe(struct device *_dev,
 
         dbg("%s: adding port\n", __FUNCTION__);
         uart_add_one_port(&s3c24xx_uart_drv, &ourport->port);
-        dev_set_drvdata(_dev, &ourport->port);
+        platform_set_drvdata(dev, &ourport->port);
 
         return 0;
 
@@ -1120,9 +1119,9 @@ static int s3c24xx_serial_probe(struct device *_dev,
         return ret;
 }
 
-static int s3c24xx_serial_remove(struct device *_dev)
+static int s3c24xx_serial_remove(struct platform_device *dev)
 {
-        struct uart_port *port = s3c24xx_dev_to_port(_dev);
+        struct uart_port *port = s3c24xx_dev_to_port(&dev->dev);
 
         if (port)
                 uart_remove_one_port(&s3c24xx_uart_drv, port);
@@ -1134,9 +1133,9 @@ static int s3c24xx_serial_remove(struct device *_dev)
 
 #ifdef CONFIG_PM
 
-static int s3c24xx_serial_suspend(struct device *dev, pm_message_t state)
+static int s3c24xx_serial_suspend(struct platform_device *dev, pm_message_t state)
 {
-        struct uart_port *port = s3c24xx_dev_to_port(dev);
+        struct uart_port *port = s3c24xx_dev_to_port(&dev->dev);
 
         if (port)
                 uart_suspend_port(&s3c24xx_uart_drv, port);
@@ -1144,9 +1143,9 @@ static int s3c24xx_serial_suspend(struct device *dev, pm_message_t state)
         return 0;
 }
 
-static int s3c24xx_serial_resume(struct device *dev)
+static int s3c24xx_serial_resume(struct platform_device *dev)
 {
-        struct uart_port *port = s3c24xx_dev_to_port(dev);
+        struct uart_port *port = s3c24xx_dev_to_port(&dev->dev);
         struct s3c24xx_uart_port *ourport = to_ourport(port);
 
         if (port) {
@@ -1165,11 +1164,11 @@ static int s3c24xx_serial_resume(struct device *dev)
 #define s3c24xx_serial_resume  NULL
 #endif
 
-static int s3c24xx_serial_init(struct device_driver *drv,
+static int s3c24xx_serial_init(struct platform_driver *drv,
                                struct s3c24xx_uart_info *info)
 {
         dbg("s3c24xx_serial_init(%p,%p)\n", drv, info);
-        return driver_register(drv);
+        return platform_driver_register(drv);
 }
 
 
@@ -1228,19 +1227,20 @@ static struct s3c24xx_uart_info s3c2400_uart_inf = {
         .reset_port     = s3c2400_serial_resetport,
 };
 
-static int s3c2400_serial_probe(struct device *dev)
+static int s3c2400_serial_probe(struct platform_device *dev)
 {
         return s3c24xx_serial_probe(dev, &s3c2400_uart_inf);
 }
 
-static struct device_driver s3c2400_serial_drv = {
-        .name           = "s3c2400-uart",
-        .owner          = THIS_MODULE,
-        .bus            = &platform_bus_type,
+static struct platform_driver s3c2400_serial_drv = {
         .probe          = s3c2400_serial_probe,
         .remove         = s3c24xx_serial_remove,
         .suspend        = s3c24xx_serial_suspend,
         .resume         = s3c24xx_serial_resume,
+        .driver         = {
+                .name   = "s3c2400-uart",
+                .owner  = THIS_MODULE,
+        },
 };
 
 static inline int s3c2400_serial_init(void)
@@ -1250,7 +1250,7 @@ static inline int s3c2400_serial_init(void)
 
 static inline void s3c2400_serial_exit(void)
 {
-        driver_unregister(&s3c2400_serial_drv);
+        platform_driver_unregister(&s3c2400_serial_drv);
 }
 
 #define s3c2400_uart_inf_at &s3c2400_uart_inf
@@ -1332,19 +1332,20 @@ static struct s3c24xx_uart_info s3c2410_uart_inf = {
 
 /* device management */
 
-static int s3c2410_serial_probe(struct device *dev)
+static int s3c2410_serial_probe(struct platform_device *dev)
 {
         return s3c24xx_serial_probe(dev, &s3c2410_uart_inf);
 }
 
-static struct device_driver s3c2410_serial_drv = {
-        .name           = "s3c2410-uart",
-        .owner          = THIS_MODULE,
-        .bus            = &platform_bus_type,
+static struct platform_driver s3c2410_serial_drv = {
         .probe          = s3c2410_serial_probe,
         .remove         = s3c24xx_serial_remove,
         .suspend        = s3c24xx_serial_suspend,
         .resume         = s3c24xx_serial_resume,
+        .driver         = {
+                .name   = "s3c2410-uart",
+                .owner  = THIS_MODULE,
+        },
 };
 
 static inline int s3c2410_serial_init(void)
@@ -1354,7 +1355,7 @@ static inline int s3c2410_serial_init(void)
 
 static inline void s3c2410_serial_exit(void)
 {
-        driver_unregister(&s3c2410_serial_drv);
+        platform_driver_unregister(&s3c2410_serial_drv);
 }
 
 #define s3c2410_uart_inf_at &s3c2410_uart_inf
@@ -1493,20 +1494,21 @@ static struct s3c24xx_uart_info s3c2440_uart_inf = {
 
 /* device management */
 
-static int s3c2440_serial_probe(struct device *dev)
+static int s3c2440_serial_probe(struct platform_device *dev)
 {
         dbg("s3c2440_serial_probe: dev=%p\n", dev);
         return s3c24xx_serial_probe(dev, &s3c2440_uart_inf);
 }
 
-static struct device_driver s3c2440_serial_drv = {
-        .name           = "s3c2440-uart",
-        .owner          = THIS_MODULE,
-        .bus            = &platform_bus_type,
+static struct platform_driver s3c2440_serial_drv = {
         .probe          = s3c2440_serial_probe,
         .remove         = s3c24xx_serial_remove,
         .suspend        = s3c24xx_serial_suspend,
         .resume         = s3c24xx_serial_resume,
+        .driver         = {
+                .name   = "s3c2440-uart",
+                .owner  = THIS_MODULE,
+        },
 };
 
 
@@ -1517,7 +1519,7 @@ static inline int s3c2440_serial_init(void)
 
 static inline void s3c2440_serial_exit(void)
 {
-        driver_unregister(&s3c2440_serial_drv);
+        platform_driver_unregister(&s3c2440_serial_drv);
 }
 
 #define s3c2440_uart_inf_at &s3c2440_uart_inf
diff --git a/drivers/serial/sa1100.c b/drivers/serial/sa1100.c
index ed618cc7ae96..fd9deee20e05 100644
--- a/drivers/serial/sa1100.c
+++ b/drivers/serial/sa1100.c
@@ -834,9 +834,9 @@ static struct uart_driver sa1100_reg = {
         .cons                   = SA1100_CONSOLE,
 };
 
-static int sa1100_serial_suspend(struct device *_dev, pm_message_t state)
+static int sa1100_serial_suspend(struct platform_device *dev, pm_message_t state)
 {
-        struct sa1100_port *sport = dev_get_drvdata(_dev);
+        struct sa1100_port *sport = platform_get_drvdata(dev);
 
         if (sport)
                 uart_suspend_port(&sa1100_reg, &sport->port);
@@ -844,9 +844,9 @@ static int sa1100_serial_suspend(struct device *_dev, pm_message_t state)
         return 0;
 }
 
-static int sa1100_serial_resume(struct device *_dev)
+static int sa1100_serial_resume(struct platform_device *dev)
 {
-        struct sa1100_port *sport = dev_get_drvdata(_dev);
+        struct sa1100_port *sport = platform_get_drvdata(dev);
 
         if (sport)
                 uart_resume_port(&sa1100_reg, &sport->port);
@@ -854,9 +854,8 @@ static int sa1100_serial_resume(struct device *_dev)
         return 0;
 }
 
-static int sa1100_serial_probe(struct device *_dev)
+static int sa1100_serial_probe(struct platform_device *dev)
 {
-        struct platform_device *dev = to_platform_device(_dev);
         struct resource *res = dev->resource;
         int i;
 
@@ -869,9 +868,9 @@ static int sa1100_serial_probe(struct device *_dev)
                         if (sa1100_ports[i].port.mapbase != res->start)
                                 continue;
 
-                        sa1100_ports[i].port.dev = _dev;
+                        sa1100_ports[i].port.dev = &dev->dev;
                         uart_add_one_port(&sa1100_reg, &sa1100_ports[i].port);
-                        dev_set_drvdata(_dev, &sa1100_ports[i]);
+                        platform_set_drvdata(dev, &sa1100_ports[i]);
                         break;
                 }
         }
@@ -879,11 +878,11 @@ static int sa1100_serial_probe(struct device *_dev)
         return 0;
 }
 
-static int sa1100_serial_remove(struct device *_dev)
+static int sa1100_serial_remove(struct platform_device *pdev)
 {
-        struct sa1100_port *sport = dev_get_drvdata(_dev);
+        struct sa1100_port *sport = platform_get_drvdata(pdev);
 
-        dev_set_drvdata(_dev, NULL);
+        platform_set_drvdata(pdev, NULL);
 
         if (sport)
                 uart_remove_one_port(&sa1100_reg, &sport->port);
@@ -891,13 +890,14 @@ static int sa1100_serial_remove(struct device *_dev)
         return 0;
 }
 
-static struct device_driver sa11x0_serial_driver = {
-        .name           = "sa11x0-uart",
-        .bus            = &platform_bus_type,
+static struct platform_driver sa11x0_serial_driver = {
         .probe          = sa1100_serial_probe,
         .remove         = sa1100_serial_remove,
         .suspend        = sa1100_serial_suspend,
         .resume         = sa1100_serial_resume,
+        .driver         = {
+                .name   = "sa11x0-uart",
+        },
 };
 
 static int __init sa1100_serial_init(void)
@@ -910,7 +910,7 @@ static int __init sa1100_serial_init(void)
 
         ret = uart_register_driver(&sa1100_reg);
         if (ret == 0) {
-                ret = driver_register(&sa11x0_serial_driver);
+                ret = platform_driver_register(&sa11x0_serial_driver);
                 if (ret)
                         uart_unregister_driver(&sa1100_reg);
         }
@@ -919,7 +919,7 @@ static int __init sa1100_serial_init(void)
 
 static void __exit sa1100_serial_exit(void)
 {
-        driver_unregister(&sa11x0_serial_driver);
+        platform_driver_unregister(&sa11x0_serial_driver);
         uart_unregister_driver(&sa1100_reg);
 }
 
diff --git a/drivers/serial/vr41xx_siu.c b/drivers/serial/vr41xx_siu.c
index 01696b3e3f61..865d4dea65df 100644
--- a/drivers/serial/vr41xx_siu.c
+++ b/drivers/serial/vr41xx_siu.c
@@ -924,7 +924,7 @@ static struct uart_driver siu_uart_driver = {
         .cons           = SERIAL_VR41XX_CONSOLE,
 };
 
-static int siu_probe(struct device *dev)
+static int siu_probe(struct platform_device *dev)
 {
         struct uart_port *port;
         int num, i, retval;
@@ -941,7 +941,7 @@ static int siu_probe(struct device *dev)
         for (i = 0; i < num; i++) {
                 port = &siu_uart_ports[i];
                 port->ops = &siu_uart_ops;
-                port->dev = dev;
+                port->dev = &dev->dev;
 
                 retval = uart_add_one_port(&siu_uart_driver, port);
                 if (retval < 0) {
@@ -958,14 +958,14 @@ static int siu_probe(struct device *dev)
         return 0;
 }
 
-static int siu_remove(struct device *dev)
+static int siu_remove(struct platform_device *dev)
 {
         struct uart_port *port;
         int i;
 
         for (i = 0; i < siu_uart_driver.nr; i++) {
                 port = &siu_uart_ports[i];
-                if (port->dev == dev) {
+                if (port->dev == &dev->dev) {
                         uart_remove_one_port(&siu_uart_driver, port);
                         port->dev = NULL;
                 }
@@ -976,7 +976,7 @@ static int siu_remove(struct device *dev)
         return 0;
 }
 
-static int siu_suspend(struct device *dev, pm_message_t state)
+static int siu_suspend(struct platform_device *dev, pm_message_t state)
 {
         struct uart_port *port;
         int i;
@@ -984,7 +984,7 @@ static int siu_suspend(struct device *dev, pm_message_t state)
         for (i = 0; i < siu_uart_driver.nr; i++) {
                 port = &siu_uart_ports[i];
                 if ((port->type == PORT_VR41XX_SIU ||
-                     port->type == PORT_VR41XX_DSIU) && port->dev == dev)
+                     port->type == PORT_VR41XX_DSIU) && port->dev == &dev->dev)
                         uart_suspend_port(&siu_uart_driver, port);
 
         }
@@ -992,7 +992,7 @@ static int siu_suspend(struct device *dev, pm_message_t state)
         return 0;
 }
 
-static int siu_resume(struct device *dev)
+static int siu_resume(struct platform_device *dev)
 {
         struct uart_port *port;
         int i;
@@ -1000,7 +1000,7 @@ static int siu_resume(struct device *dev)
         for (i = 0; i < siu_uart_driver.nr; i++) {
                 port = &siu_uart_ports[i];
                 if ((port->type == PORT_VR41XX_SIU ||
-                     port->type == PORT_VR41XX_DSIU) && port->dev == dev)
+                     port->type == PORT_VR41XX_DSIU) && port->dev == &dev->dev)
                         uart_resume_port(&siu_uart_driver, port);
         }
 
@@ -1009,13 +1009,14 @@ static int siu_resume(struct device *dev)
 
 static struct platform_device *siu_platform_device;
 
-static struct device_driver siu_device_driver = {
-        .name           = "SIU",
-        .bus            = &platform_bus_type,
+static struct platform_driver siu_device_driver = {
         .probe          = siu_probe,
         .remove         = siu_remove,
         .suspend        = siu_suspend,
         .resume         = siu_resume,
+        .driver         = {
+                .name   = "SIU",
+        },
 };
 
 static int __devinit vr41xx_siu_init(void)
@@ -1026,7 +1027,7 @@ static int __devinit vr41xx_siu_init(void)
         if (IS_ERR(siu_platform_device))
                 return PTR_ERR(siu_platform_device);
 
-        retval = driver_register(&siu_device_driver);
+        retval = platform_driver_register(&siu_device_driver);
         if (retval < 0)
                 platform_device_unregister(siu_platform_device);
 
@@ -1035,7 +1036,7 @@ static int __devinit vr41xx_siu_init(void)
 
 static void __devexit vr41xx_siu_exit(void)
 {
-        driver_unregister(&siu_device_driver);
+        platform_driver_unregister(&siu_device_driver);
 
         platform_device_unregister(siu_platform_device);
 }
diff --git a/drivers/usb/gadget/dummy_hcd.c b/drivers/usb/gadget/dummy_hcd.c
index 904519085334..1e407745c115 100644
--- a/drivers/usb/gadget/dummy_hcd.c
+++ b/drivers/usb/gadget/dummy_hcd.c
@@ -896,7 +896,7 @@ dummy_gadget_release (struct device *dev)
 #endif
 }
 
-static int dummy_udc_probe (struct device *dev)
+static int dummy_udc_probe (struct platform_device *dev)
 {
         struct dummy    *dum = the_controller;
         int             rc;
@@ -909,7 +909,7 @@ static int dummy_udc_probe (struct device *dev)
         dum->gadget.is_otg = (dummy_to_hcd(dum)->self.otg_port != 0);
 
         strcpy (dum->gadget.dev.bus_id, "gadget");
-        dum->gadget.dev.parent = dev;
+        dum->gadget.dev.parent = &dev->dev;
         dum->gadget.dev.release = dummy_gadget_release;
         rc = device_register (&dum->gadget.dev);
         if (rc < 0)
@@ -919,26 +919,26 @@ static int dummy_udc_probe (struct device *dev)
         usb_bus_get (&dummy_to_hcd (dum)->self);
 #endif
 
-        dev_set_drvdata (dev, dum);
+        platform_set_drvdata (dev, dum);
         device_create_file (&dum->gadget.dev, &dev_attr_function);
         return rc;
 }
 
-static int dummy_udc_remove (struct device *dev)
+static int dummy_udc_remove (struct platform_device *dev)
 {
-        struct dummy    *dum = dev_get_drvdata (dev);
+        struct dummy    *dum = platform_get_drvdata (dev);
 
-        dev_set_drvdata (dev, NULL);
+        platform_set_drvdata (dev, NULL);
         device_remove_file (&dum->gadget.dev, &dev_attr_function);
         device_unregister (&dum->gadget.dev);
         return 0;
 }
 
-static int dummy_udc_suspend (struct device *dev, pm_message_t state)
+static int dummy_udc_suspend (struct platform_device *dev, pm_message_t state)
 {
-        struct dummy    *dum = dev_get_drvdata(dev);
+        struct dummy    *dum = platform_get_drvdata(dev);
 
-        dev_dbg (dev, "%s\n", __FUNCTION__);
+        dev_dbg (&dev->dev, "%s\n", __FUNCTION__);
         spin_lock_irq (&dum->lock);
         dum->udc_suspended = 1;
         set_link_state (dum);
@@ -949,29 +949,30 @@ static int dummy_udc_suspend (struct device *dev, pm_message_t state)
         return 0;
 }
 
-static int dummy_udc_resume (struct device *dev)
+static int dummy_udc_resume (struct platform_device *dev)
 {
-        struct dummy    *dum = dev_get_drvdata(dev);
+        struct dummy    *dum = platform_get_drvdata(dev);
 
-        dev_dbg (dev, "%s\n", __FUNCTION__);
+        dev_dbg (&dev->dev, "%s\n", __FUNCTION__);
         spin_lock_irq (&dum->lock);
         dum->udc_suspended = 0;
         set_link_state (dum);
         spin_unlock_irq (&dum->lock);
 
-        dev->power.power_state = PMSG_ON;
+        dev->dev.power.power_state = PMSG_ON;
         usb_hcd_poll_rh_status (dummy_to_hcd (dum));
         return 0;
 }
 
-static struct device_driver dummy_udc_driver = {
-        .name           = (char *) gadget_name,
-        .owner          = THIS_MODULE,
-        .bus            = &platform_bus_type,
+static struct platform_driver dummy_udc_driver = {
         .probe          = dummy_udc_probe,
         .remove         = dummy_udc_remove,
         .suspend        = dummy_udc_suspend,
         .resume         = dummy_udc_resume,
+        .driver         = {
+                .name   = (char *) gadget_name,
+                .owner  = THIS_MODULE,
+        },
 };
 
 /*-------------------------------------------------------------------------*/
@@ -1898,14 +1899,14 @@ static const struct hc_driver dummy_hcd = {
         .bus_resume =           dummy_bus_resume,
 };
 
-static int dummy_hcd_probe (struct device *dev)
+static int dummy_hcd_probe (struct platform_device *dev)
 {
         struct usb_hcd          *hcd;
         int                     retval;
 
         dev_info (dev, "%s, driver " DRIVER_VERSION "\n", driver_desc);
 
-        hcd = usb_create_hcd (&dummy_hcd, dev, dev->bus_id);
+        hcd = usb_create_hcd (&dummy_hcd, &dev->dev, dev->dev.bus_id);
         if (!hcd)
                 return -ENOMEM;
         the_controller = hcd_to_dummy (hcd);
@@ -1918,48 +1919,49 @@ static int dummy_hcd_probe (struct device *dev)
         return retval;
 }
 
-static int dummy_hcd_remove (struct device *dev)
+static int dummy_hcd_remove (struct platform_device *dev)
 {
         struct usb_hcd          *hcd;
 
-        hcd = dev_get_drvdata (dev);
+        hcd = platform_get_drvdata (dev);
         usb_remove_hcd (hcd);
         usb_put_hcd (hcd);
         the_controller = NULL;
         return 0;
 }
 
-static int dummy_hcd_suspend (struct device *dev, pm_message_t state)
+static int dummy_hcd_suspend (struct platform_device *dev, pm_message_t state)
 {
         struct usb_hcd          *hcd;
 
-        dev_dbg (dev, "%s\n", __FUNCTION__);
-        hcd = dev_get_drvdata (dev);
+        dev_dbg (&dev->dev, "%s\n", __FUNCTION__);
+        hcd = platform_get_drvdata (dev);
 
         hcd->state = HC_STATE_SUSPENDED;
         return 0;
 }
 
-static int dummy_hcd_resume (struct device *dev)
+static int dummy_hcd_resume (struct platform_device *dev)
 {
         struct usb_hcd          *hcd;
 
-        dev_dbg (dev, "%s\n", __FUNCTION__);
-        hcd = dev_get_drvdata (dev);
+        dev_dbg (&dev->dev, "%s\n", __FUNCTION__);
+        hcd = platform_get_drvdata (dev);
         hcd->state = HC_STATE_RUNNING;
 
         usb_hcd_poll_rh_status (hcd);
         return 0;
 }
 
-static struct device_driver dummy_hcd_driver = {
-        .name           = (char *) driver_name,
-        .owner          = THIS_MODULE,
-        .bus            = &platform_bus_type,
+static struct platform_driver dummy_hcd_driver = {
         .probe          = dummy_hcd_probe,
         .remove         = dummy_hcd_remove,
         .suspend        = dummy_hcd_suspend,
         .resume         = dummy_hcd_resume,
+        .driver         = {
+                .name   = (char *) driver_name,
+                .owner  = THIS_MODULE,
+        },
 };
 
 /*-------------------------------------------------------------------------*/
@@ -1995,11 +1997,11 @@ static int __init init (void)
         if (usb_disabled ())
                 return -ENODEV;
 
-        retval = driver_register (&dummy_hcd_driver);
+        retval = platform_driver_register (&dummy_hcd_driver);
         if (retval < 0)
                 return retval;
 
-        retval = driver_register (&dummy_udc_driver);
+        retval = platform_driver_register (&dummy_udc_driver);
         if (retval < 0)
                 goto err_register_udc_driver;
 
@@ -2015,9 +2017,9 @@ static int __init init (void)
 err_register_udc:
         platform_device_unregister (&the_hcd_pdev);
 err_register_hcd:
-        driver_unregister (&dummy_udc_driver);
+        platform_driver_unregister (&dummy_udc_driver);
 err_register_udc_driver:
-        driver_unregister (&dummy_hcd_driver);
+        platform_driver_unregister (&dummy_hcd_driver);
         return retval;
 }
 module_init (init);
@@ -2026,7 +2028,7 @@ static void __exit cleanup (void)
 {
         platform_device_unregister (&the_udc_pdev);
         platform_device_unregister (&the_hcd_pdev);
-        driver_unregister (&dummy_udc_driver);
-        driver_unregister (&dummy_hcd_driver);
+        platform_driver_unregister (&dummy_udc_driver);
+        platform_driver_unregister (&dummy_hcd_driver);
 }
 module_exit (cleanup);
diff --git a/drivers/usb/gadget/lh7a40x_udc.c b/drivers/usb/gadget/lh7a40x_udc.c
index bc6269f10cbb..e02fea5a5433 100644
--- a/drivers/usb/gadget/lh7a40x_udc.c
+++ b/drivers/usb/gadget/lh7a40x_udc.c
@@ -2085,21 +2085,21 @@ static struct lh7a40x_udc memory = {
 /*
  *      probe - binds to the platform device
  */
-static int lh7a40x_udc_probe(struct device *_dev)
+static int lh7a40x_udc_probe(struct platform_device *pdev)
 {
         struct lh7a40x_udc *dev = &memory;
         int retval;
 
-        DEBUG("%s: %p\n", __FUNCTION__, _dev);
+        DEBUG("%s: %p\n", __FUNCTION__, pdev);
 
         spin_lock_init(&dev->lock);
-        dev->dev = _dev;
+        dev->dev = &pdev->dev;
 
         device_initialize(&dev->gadget.dev);
-        dev->gadget.dev.parent = _dev;
+        dev->gadget.dev.parent = &pdev->dev;
 
         the_controller = dev;
-        dev_set_drvdata(_dev, dev);
+        platform_set_drvdata(pdev, dev);
 
         udc_disable(dev);
         udc_reinit(dev);
@@ -2119,11 +2119,11 @@ static int lh7a40x_udc_probe(struct device *_dev)
         return retval;
 }
 
-static int lh7a40x_udc_remove(struct device *_dev)
+static int lh7a40x_udc_remove(struct platform_device *pdev)
 {
-        struct lh7a40x_udc *dev = _dev->driver_data;
+        struct lh7a40x_udc *dev = platform_get_drvdata(pdev);
 
-        DEBUG("%s: %p\n", __FUNCTION__, dev);
+        DEBUG("%s: %p\n", __FUNCTION__, pdev);
 
         udc_disable(dev);
         remove_proc_files();
@@ -2131,7 +2131,7 @@ static int lh7a40x_udc_remove(struct device *_dev)
 
         free_irq(IRQ_USBINTR, dev);
 
-        dev_set_drvdata(_dev, 0);
+        platform_set_drvdata(pdev, 0);
 
         the_controller = 0;
 
@@ -2140,26 +2140,27 @@ static int lh7a40x_udc_remove(struct device *_dev)
 
 /*-------------------------------------------------------------------------*/
 
-static struct device_driver udc_driver = {
-        .name = (char *)driver_name,
-        .owner = THIS_MODULE,
-        .bus = &platform_bus_type,
+static struct platform_driver udc_driver = {
         .probe = lh7a40x_udc_probe,
         .remove = lh7a40x_udc_remove
             /* FIXME power management support */
             /* .suspend = ... disable UDC */
             /* .resume = ... re-enable UDC */
+        .driver = {
+                .name = (char *)driver_name,
+                .owner = THIS_MODULE,
+        },
 };
 
 static int __init udc_init(void)
 {
         DEBUG("%s: %s version %s\n", __FUNCTION__, driver_name, DRIVER_VERSION);
-        return driver_register(&udc_driver);
+        return platform_driver_register(&udc_driver);
 }
 
 static void __exit udc_exit(void)
 {
-        driver_unregister(&udc_driver);
+        platform_driver_unregister(&udc_driver);
 }
 
 module_init(udc_init);
diff --git a/drivers/usb/gadget/omap_udc.c b/drivers/usb/gadget/omap_udc.c
index 387692a3611e..a8972d7c97be 100644
--- a/drivers/usb/gadget/omap_udc.c
+++ b/drivers/usb/gadget/omap_udc.c
@@ -2707,18 +2707,17 @@ omap_udc_setup(struct platform_device *odev, struct otg_transceiver *xceiv)
         return 0;
 }
 
-static int __init omap_udc_probe(struct device *dev)
+static int __init omap_udc_probe(struct platform_device *pdev)
 {
-        struct platform_device  *odev = to_platform_device(dev);
         int                     status = -ENODEV;
         int                     hmc;
         struct otg_transceiver  *xceiv = NULL;
         const char              *type = NULL;
-        struct omap_usb_config  *config = dev->platform_data;
+        struct omap_usb_config  *config = pdev->dev.platform_data;
 
         /* NOTE:  "knows" the order of the resources! */
-        if (!request_mem_region(odev->resource[0].start, 
-                        odev->resource[0].end - odev->resource[0].start + 1,
+        if (!request_mem_region(pdev->resource[0].start, 
+                        pdev->resource[0].end - pdev->resource[0].start + 1,
                         driver_name)) {
                 DBG("request_mem_region failed\n");
                 return -EBUSY;
@@ -2803,7 +2802,7 @@ bad_on_1710:
         INFO("hmc mode %d, %s transceiver\n", hmc, type);
 
         /* a "gadget" abstracts/virtualizes the controller */
-        status = omap_udc_setup(odev, xceiv);
+        status = omap_udc_setup(pdev, xceiv);
         if (status) {
                 goto cleanup0;
         }
@@ -2821,28 +2820,28 @@ bad_on_1710:
                 udc->clr_halt = UDC_RESET_EP;
 
         /* USB general purpose IRQ:  ep0, state changes, dma, etc */
-        status = request_irq(odev->resource[1].start, omap_udc_irq,
+        status = request_irq(pdev->resource[1].start, omap_udc_irq,
                         SA_SAMPLE_RANDOM, driver_name, udc);
         if (status != 0) {
                 ERR( "can't get irq %ld, err %d\n",
-                        odev->resource[1].start, status);
+                        pdev->resource[1].start, status);
                 goto cleanup1;
         }
 
         /* USB "non-iso" IRQ (PIO for all but ep0) */
-        status = request_irq(odev->resource[2].start, omap_udc_pio_irq,
+        status = request_irq(pdev->resource[2].start, omap_udc_pio_irq,
                         SA_SAMPLE_RANDOM, "omap_udc pio", udc);
         if (status != 0) {
                 ERR( "can't get irq %ld, err %d\n",
-                        odev->resource[2].start, status);
+                        pdev->resource[2].start, status);
                 goto cleanup2;
         }
 #ifdef  USE_ISO
-        status = request_irq(odev->resource[3].start, omap_udc_iso_irq,
+        status = request_irq(pdev->resource[3].start, omap_udc_iso_irq,
                         SA_INTERRUPT, "omap_udc iso", udc);
         if (status != 0) {
                 ERR("can't get irq %ld, err %d\n",
-                        odev->resource[3].start, status);
+                        pdev->resource[3].start, status);
                 goto cleanup3;
         }
 #endif
@@ -2853,11 +2852,11 @@ bad_on_1710:
 
 #ifdef  USE_ISO
 cleanup3:
-        free_irq(odev->resource[2].start, udc);
+        free_irq(pdev->resource[2].start, udc);
 #endif
 
 cleanup2:
-        free_irq(odev->resource[1].start, udc);
+        free_irq(pdev->resource[1].start, udc);
 
 cleanup1:
         kfree (udc);
@@ -2866,14 +2865,13 @@ cleanup1:
 cleanup0:
         if (xceiv)
                 put_device(xceiv->dev);
-        release_mem_region(odev->resource[0].start,
-                        odev->resource[0].end - odev->resource[0].start + 1);
+        release_mem_region(pdev->resource[0].start,
+                        pdev->resource[0].end - pdev->resource[0].start + 1);
         return status;
 }
 
-static int __exit omap_udc_remove(struct device *dev)
+static int __exit omap_udc_remove(struct platform_device *pdev)
 {
-        struct platform_device  *odev = to_platform_device(dev);
         DECLARE_COMPLETION(done);
 
         if (!udc)
@@ -2891,13 +2889,13 @@ static int __exit omap_udc_remove(struct device *dev)
         remove_proc_file();
 
 #ifdef  USE_ISO
-        free_irq(odev->resource[3].start, udc);
+        free_irq(pdev->resource[3].start, udc);
 #endif
-        free_irq(odev->resource[2].start, udc);
-        free_irq(odev->resource[1].start, udc);
+        free_irq(pdev->resource[2].start, udc);
+        free_irq(pdev->resource[1].start, udc);
 
-        release_mem_region(odev->resource[0].start,
-                        odev->resource[0].end - odev->resource[0].start + 1);
+        release_mem_region(pdev->resource[0].start,
+                        pdev->resource[0].end - pdev->resource[0].start + 1);
 
         device_unregister(&udc->gadget.dev);
         wait_for_completion(&done);
@@ -2915,7 +2913,7 @@ static int __exit omap_udc_remove(struct device *dev)
  * may involve talking to an external transceiver (e.g. isp1301).
  */
 
-static int omap_udc_suspend(struct device *dev, pm_message_t message)
+static int omap_udc_suspend(struct platform_device *dev, pm_message_t message)
 {
         u32     devstat;
 
@@ -2935,7 +2933,7 @@ static int omap_udc_suspend(struct device *dev, pm_message_t message)
         return 0;
 }
 
-static int omap_udc_resume(struct device *dev)
+static int omap_udc_resume(struct platform_device *dev)
 {
         DBG("resume + wakeup/SRP\n");
         omap_pullup(&udc->gadget, 1);
@@ -2947,14 +2945,15 @@ static int omap_udc_resume(struct device *dev)
 
 /*-------------------------------------------------------------------------*/
 
-static struct device_driver udc_driver = {
-        .name           = (char *) driver_name,
-        .owner          = THIS_MODULE,
-        .bus            = &platform_bus_type,
+static struct platform_driver udc_driver = {
         .probe          = omap_udc_probe,
         .remove         = __exit_p(omap_udc_remove),
         .suspend        = omap_udc_suspend,
         .resume         = omap_udc_resume,
+        .driver         = {
+                .owner  = THIS_MODULE,
+                .name   = (char *) driver_name,
+        },
 };
 
 static int __init udc_init(void)
@@ -2965,13 +2964,13 @@ static int __init udc_init(void)
 #endif
                 "%s\n", driver_desc,
                 use_dma ?  " (dma)" : "");
-        return driver_register(&udc_driver);
+        return platform_driver_register(&udc_driver);
 }
 module_init(udc_init);
 
 static void __exit udc_exit(void)
 {
-        driver_unregister(&udc_driver);
+        platform_driver_unregister(&udc_driver);
 }
 module_exit(udc_exit);
 
diff --git a/drivers/usb/gadget/pxa2xx_udc.c b/drivers/usb/gadget/pxa2xx_udc.c
index 510d28a924db..bb028c5b8952 100644
--- a/drivers/usb/gadget/pxa2xx_udc.c
+++ b/drivers/usb/gadget/pxa2xx_udc.c
@@ -2432,7 +2432,7 @@ static struct pxa2xx_udc memory = {
 /*
  *      probe - binds to the platform device
  */
-static int __init pxa2xx_udc_probe(struct device *_dev)
+static int __init pxa2xx_udc_probe(struct platform_device *pdev)
 {
         struct pxa2xx_udc *dev = &memory;
         int retval, out_dma = 1;
@@ -2495,19 +2495,19 @@ static int __init pxa2xx_udc_probe(struct device *_dev)
 #endif
 
         /* other non-static parts of init */
-        dev->dev = _dev;
-        dev->mach = _dev->platform_data;
+        dev->dev = &pdev->dev;
+        dev->mach = pdev->dev.platform_data;
 
         init_timer(&dev->timer);
         dev->timer.function = udc_watchdog;
         dev->timer.data = (unsigned long) dev;
 
         device_initialize(&dev->gadget.dev);
-        dev->gadget.dev.parent = _dev;
-        dev->gadget.dev.dma_mask = _dev->dma_mask;
+        dev->gadget.dev.parent = &pdev->dev;
+        dev->gadget.dev.dma_mask = pdev->dev.dma_mask;
 
         the_controller = dev;
-        dev_set_drvdata(_dev, dev);
+        platform_set_drvdata(pdev, dev);
 
         udc_disable(dev);
         udc_reinit(dev);
@@ -2559,14 +2559,14 @@ lubbock_fail0:
         return 0;
 }
 
-static void pxa2xx_udc_shutdown(struct device *_dev)
+static void pxa2xx_udc_shutdown(struct platform_device *_dev)
 {
         pullup_off();
 }
 
-static int __exit pxa2xx_udc_remove(struct device *_dev)
+static int __exit pxa2xx_udc_remove(struct platform_device *pdev)
 {
-        struct pxa2xx_udc *dev = dev_get_drvdata(_dev);
+        struct pxa2xx_udc *dev = platform_get_drvdata(pdev);
 
         udc_disable(dev);
         remove_proc_files();
@@ -2580,7 +2580,7 @@ static int __exit pxa2xx_udc_remove(struct device *_dev)
                 free_irq(LUBBOCK_USB_DISC_IRQ, dev);
                 free_irq(LUBBOCK_USB_IRQ, dev);
         }
-        dev_set_drvdata(_dev, NULL);
+        platform_set_drvdata(pdev, NULL);
         the_controller = NULL;
         return 0;
 }
@@ -2601,9 +2601,9 @@ static int __exit pxa2xx_udc_remove(struct device *_dev)
  * VBUS IRQs should probably be ignored so that the PXA device just acts
  * "dead" to USB hosts until system resume.
  */
-static int pxa2xx_udc_suspend(struct device *dev, pm_message_t state)
+static int pxa2xx_udc_suspend(struct platform_device *dev, pm_message_t state)
 {
-        struct pxa2xx_udc       *udc = dev_get_drvdata(dev);
+        struct pxa2xx_udc       *udc = platform_get_drvdata(dev);
 
         if (!udc->mach->udc_command)
                 WARN("USB host won't detect disconnect!\n");
@@ -2612,9 +2612,9 @@ static int pxa2xx_udc_suspend(struct device *dev, pm_message_t state)
         return 0;
 }
 
-static int pxa2xx_udc_resume(struct device *dev)
+static int pxa2xx_udc_resume(struct platform_device *dev)
 {
-        struct pxa2xx_udc       *udc = dev_get_drvdata(dev);
+        struct pxa2xx_udc       *udc = platform_get_drvdata(dev);
 
         pullup(udc, 1);
 
@@ -2628,27 +2628,28 @@ static int pxa2xx_udc_resume(struct device *dev)
 
 /*-------------------------------------------------------------------------*/
 
-static struct device_driver udc_driver = {
-        .name           = "pxa2xx-udc",
-        .owner          = THIS_MODULE,
-        .bus            = &platform_bus_type,
+static struct platform_driver udc_driver = {
         .probe          = pxa2xx_udc_probe,
         .shutdown       = pxa2xx_udc_shutdown,
         .remove         = __exit_p(pxa2xx_udc_remove),
         .suspend        = pxa2xx_udc_suspend,
         .resume         = pxa2xx_udc_resume,
+        .driver         = {
+                .owner  = THIS_MODULE,
+                .name   = "pxa2xx-udc",
+        },
 };
 
 static int __init udc_init(void)
 {
         printk(KERN_INFO "%s: version %s\n", driver_name, DRIVER_VERSION);
-        return driver_register(&udc_driver);
+        return platform_driver_register(&udc_driver);
 }
 module_init(udc_init);
 
 static void __exit udc_exit(void)
 {
-        driver_unregister(&udc_driver);
+        platform_driver_unregister(&udc_driver);
 }
 module_exit(udc_exit);
 
diff --git a/drivers/usb/host/isp116x-hcd.c b/drivers/usb/host/isp116x-hcd.c
index f9c3f5b8dd1c..82f64986bc22 100644
--- a/drivers/usb/host/isp116x-hcd.c
+++ b/drivers/usb/host/isp116x-hcd.c
@@ -1633,17 +1633,15 @@ static struct hc_driver isp116x_hc_driver = {
 
 /*----------------------------------------------------------------*/
 
-static int __init_or_module isp116x_remove(struct device *dev)
+static int __init_or_module isp116x_remove(struct platform_device *pdev)
 {
-        struct usb_hcd *hcd = dev_get_drvdata(dev);
+        struct usb_hcd *hcd = platform_get_drvdata(pdev);
         struct isp116x *isp116x;
-        struct platform_device *pdev;
         struct resource *res;
 
         if (!hcd)
                 return 0;
         isp116x = hcd_to_isp116x(hcd);
-        pdev = container_of(dev, struct platform_device, dev);
         remove_debug_file(isp116x);
         usb_remove_hcd(hcd);
 
@@ -1660,18 +1658,16 @@ static int __init_or_module isp116x_remove(struct device *dev)
 
 #define resource_len(r) (((r)->end - (r)->start) + 1)
 
-static int __init isp116x_probe(struct device *dev)
+static int __init isp116x_probe(struct platform_device *pdev)
 {
         struct usb_hcd *hcd;
         struct isp116x *isp116x;
-        struct platform_device *pdev;
         struct resource *addr, *data;
         void __iomem *addr_reg;
         void __iomem *data_reg;
         int irq;
         int ret = 0;
 
-        pdev = container_of(dev, struct platform_device, dev);
         if (pdev->num_resources < 3) {
                 ret = -ENODEV;
                 goto err1;
@@ -1685,7 +1681,7 @@ static int __init isp116x_probe(struct device *dev)
                 goto err1;
         }
 
-        if (dev->dma_mask) {
+        if (pdev->dev.dma_mask) {
                 DBG("DMA not supported\n");
                 ret = -EINVAL;
                 goto err1;
@@ -1711,7 +1707,7 @@ static int __init isp116x_probe(struct device *dev)
         }
 
         /* allocate and initialize hcd */
-        hcd = usb_create_hcd(&isp116x_hc_driver, dev, dev->bus_id);
+        hcd = usb_create_hcd(&isp116x_hc_driver, &pdev->dev, pdev->dev.bus_id);
         if (!hcd) {
                 ret = -ENOMEM;
                 goto err5;
@@ -1723,7 +1719,7 @@ static int __init isp116x_probe(struct device *dev)
         isp116x->addr_reg = addr_reg;
         spin_lock_init(&isp116x->lock);
         INIT_LIST_HEAD(&isp116x->async);
-        isp116x->board = dev->platform_data;
+        isp116x->board = pdev->dev.platform_data;
 
         if (!isp116x->board) {
                 ERR("Platform data structure not initialized\n");
@@ -1764,13 +1760,13 @@ static int __init isp116x_probe(struct device *dev)
 /*
   Suspend of platform device
 */
-static int isp116x_suspend(struct device *dev, pm_message_t state)
+static int isp116x_suspend(struct platform_device *dev, pm_message_t state)
 {
         int ret = 0;
 
         VDBG("%s: state %x\n", __func__, state);
 
-        dev->power.power_state = state;
+        dev->dev.power.power_state = state;
 
         return ret;
 }
@@ -1778,13 +1774,13 @@ static int isp116x_suspend(struct device *dev, pm_message_t state)
 /*
   Resume platform device
 */
-static int isp116x_resume(struct device *dev)
+static int isp116x_resume(struct platform_device *dev)
 {
         int ret = 0;
 
-        VDBG("%s:  state %x\n", __func__, dev->power.power_state);
+        VDBG("%s:  state %x\n", __func__, dev->dev.power.power_state);
 
-        dev->power.power_state = PMSG_ON;
+        dev->dev.power.power_state = PMSG_ON;
 
         return ret;
 }
@@ -1796,13 +1792,14 @@ static int isp116x_resume(struct device *dev)
 
 #endif
 
-static struct device_driver isp116x_driver = {
-        .name = (char *)hcd_name,
-        .bus = &platform_bus_type,
+static struct platform_driver isp116x_driver = {
         .probe = isp116x_probe,
         .remove = isp116x_remove,
         .suspend = isp116x_suspend,
         .resume = isp116x_resume,
+        .driver = {
+                .name = (char *)hcd_name,
+        },
 };
 
 /*-----------------------------------------------------------------*/
@@ -1813,14 +1810,14 @@ static int __init isp116x_init(void)
                 return -ENODEV;
 
         INFO("driver %s, %s\n", hcd_name, DRIVER_VERSION);
-        return driver_register(&isp116x_driver);
+        return platform_driver_register(&isp116x_driver);
 }
 
 module_init(isp116x_init);
 
 static void __exit isp116x_cleanup(void)
 {
-        driver_unregister(&isp116x_driver);
+        platform_driver_unregister(&isp116x_driver);
 }
 
 module_exit(isp116x_cleanup);
diff --git a/drivers/usb/host/ohci-au1xxx.c b/drivers/usb/host/ohci-au1xxx.c
index f0c78cf14b6c..d9cf3b327d96 100644
--- a/drivers/usb/host/ohci-au1xxx.c
+++ b/drivers/usb/host/ohci-au1xxx.c
@@ -225,9 +225,8 @@ static const struct hc_driver ohci_au1xxx_hc_driver = {
 
 /*-------------------------------------------------------------------------*/
 
-static int ohci_hcd_au1xxx_drv_probe(struct device *dev)
+static int ohci_hcd_au1xxx_drv_probe(struct platform_device *pdev)
 {
-        struct platform_device *pdev = to_platform_device(dev);
         int ret;
 
         pr_debug ("In ohci_hcd_au1xxx_drv_probe");
@@ -239,39 +238,37 @@ static int ohci_hcd_au1xxx_drv_probe(struct device *dev)
         return ret;
 }
 
-static int ohci_hcd_au1xxx_drv_remove(struct device *dev)
+static int ohci_hcd_au1xxx_drv_remove(struct platform_device *pdev)
 {
-        struct platform_device *pdev = to_platform_device(dev);
-        struct usb_hcd *hcd = dev_get_drvdata(dev);
+        struct usb_hcd *hcd = platform_get_drvdata(pdev);
 
         usb_hcd_au1xxx_remove(hcd, pdev);
         return 0;
 }
         /*TBD*/
-/*static int ohci_hcd_au1xxx_drv_suspend(struct device *dev)
+/*static int ohci_hcd_au1xxx_drv_suspend(struct platform_device *dev)
 {
-        struct platform_device *pdev = to_platform_device(dev);
-        struct usb_hcd *hcd = dev_get_drvdata(dev);
+        struct usb_hcd *hcd = platform_get_drvdata(dev);
 
         return 0;
 }
-static int ohci_hcd_au1xxx_drv_resume(struct device *dev)
+static int ohci_hcd_au1xxx_drv_resume(struct platform_device *dev)
 {
-        struct platform_device *pdev = to_platform_device(dev);
-        struct usb_hcd *hcd = dev_get_drvdata(dev);
+        struct usb_hcd *hcd = platform_get_drvdata(dev);
 
         return 0;
 }
 */
 
-static struct device_driver ohci_hcd_au1xxx_driver = {
-        .name           = "au1xxx-ohci",
-        .owner          = THIS_MODULE,
-        .bus            = &platform_bus_type,
+static struct platform_driver ohci_hcd_au1xxx_driver = {
         .probe          = ohci_hcd_au1xxx_drv_probe,
         .remove         = ohci_hcd_au1xxx_drv_remove,
         /*.suspend      = ohci_hcd_au1xxx_drv_suspend, */
         /*.resume       = ohci_hcd_au1xxx_drv_resume, */
+        .driver         = {
+                .name   = "au1xxx-ohci",
+                .owner  = THIS_MODULE,
+        },
 };
 
 static int __init ohci_hcd_au1xxx_init (void)
@@ -280,12 +277,12 @@ static int __init ohci_hcd_au1xxx_init (void)
         pr_debug ("block sizes: ed %d td %d\n",
                 sizeof (struct ed), sizeof (struct td));
 
-        return driver_register(&ohci_hcd_au1xxx_driver);
+        return platform_driver_register(&ohci_hcd_au1xxx_driver);
 }
 
 static void __exit ohci_hcd_au1xxx_cleanup (void)
 {
-        driver_unregister(&ohci_hcd_au1xxx_driver);
+        platform_driver_unregister(&ohci_hcd_au1xxx_driver);
 }
 
 module_init (ohci_hcd_au1xxx_init);
diff --git a/drivers/usb/host/ohci-lh7a404.c b/drivers/usb/host/ohci-lh7a404.c
index 336c766c6e29..081ec3f5cff4 100644
--- a/drivers/usb/host/ohci-lh7a404.c
+++ b/drivers/usb/host/ohci-lh7a404.c
@@ -204,9 +204,8 @@ static const struct hc_driver ohci_lh7a404_hc_driver = {
 
 /*-------------------------------------------------------------------------*/
 
-static int ohci_hcd_lh7a404_drv_probe(struct device *dev)
+static int ohci_hcd_lh7a404_drv_probe(struct platform_device *pdev)
 {
-        struct platform_device *pdev = to_platform_device(dev);
         int ret;
 
         pr_debug ("In ohci_hcd_lh7a404_drv_probe");
@@ -218,40 +217,38 @@ static int ohci_hcd_lh7a404_drv_probe(struct device *dev)
         return ret;
 }
 
-static int ohci_hcd_lh7a404_drv_remove(struct device *dev)
+static int ohci_hcd_lh7a404_drv_remove(struct platform_device *pdev)
 {
-        struct platform_device *pdev = to_platform_device(dev);
-        struct usb_hcd *hcd = dev_get_drvdata(dev);
+        struct usb_hcd *hcd = platform_get_drvdata(dev);
 
         usb_hcd_lh7a404_remove(hcd, pdev);
         return 0;
 }
         /*TBD*/
-/*static int ohci_hcd_lh7a404_drv_suspend(struct device *dev)
+/*static int ohci_hcd_lh7a404_drv_suspend(struct platform_device *dev)
 {
-        struct platform_device *pdev = to_platform_device(dev);
-        struct usb_hcd *hcd = dev_get_drvdata(dev);
+        struct usb_hcd *hcd = platform_get_drvdata(dev);
 
         return 0;
 }
-static int ohci_hcd_lh7a404_drv_resume(struct device *dev)
+static int ohci_hcd_lh7a404_drv_resume(struct platform_device *dev)
 {
-        struct platform_device *pdev = to_platform_device(dev);
-        struct usb_hcd *hcd = dev_get_drvdata(dev);
+        struct usb_hcd *hcd = platform_get_drvdata(dev);
 
 
         return 0;
 }
 */
 
-static struct device_driver ohci_hcd_lh7a404_driver = {
-        .name           = "lh7a404-ohci",
-        .owner          = THIS_MODULE,
-        .bus            = &platform_bus_type,
+static struct platform_driver ohci_hcd_lh7a404_driver = {
         .probe          = ohci_hcd_lh7a404_drv_probe,
         .remove         = ohci_hcd_lh7a404_drv_remove,
         /*.suspend      = ohci_hcd_lh7a404_drv_suspend, */
         /*.resume       = ohci_hcd_lh7a404_drv_resume, */
+        .driver         = {
+                .name   = "lh7a404-ohci",
+                .owner  = THIS_MODULE,
+        },
 };
 
 static int __init ohci_hcd_lh7a404_init (void)
@@ -260,12 +257,12 @@ static int __init ohci_hcd_lh7a404_init (void)
         pr_debug ("block sizes: ed %d td %d\n",
                 sizeof (struct ed), sizeof (struct td));
 
-        return driver_register(&ohci_hcd_lh7a404_driver);
+        return platform_driver_register(&ohci_hcd_lh7a404_driver);
 }
 
 static void __exit ohci_hcd_lh7a404_cleanup (void)
 {
-        driver_unregister(&ohci_hcd_lh7a404_driver);
+        platform_driver_unregister(&ohci_hcd_lh7a404_driver);
 }
 
 module_init (ohci_hcd_lh7a404_init);
diff --git a/drivers/usb/host/ohci-omap.c b/drivers/usb/host/ohci-omap.c
index e46cc540cf4d..c9e29d808711 100644
--- a/drivers/usb/host/ohci-omap.c
+++ b/drivers/usb/host/ohci-omap.c
@@ -433,24 +433,22 @@ static const struct hc_driver ohci_omap_hc_driver = {
 
 /*-------------------------------------------------------------------------*/
 
-static int ohci_hcd_omap_drv_probe(struct device *dev)
+static int ohci_hcd_omap_drv_probe(struct platform_device *dev)
 {
-        return usb_hcd_omap_probe(&ohci_omap_hc_driver,
-                                to_platform_device(dev));
+        return usb_hcd_omap_probe(&ohci_omap_hc_driver, dev);
 }
 
-static int ohci_hcd_omap_drv_remove(struct device *dev)
+static int ohci_hcd_omap_drv_remove(struct platform_device *dev)
 {
-        struct platform_device  *pdev = to_platform_device(dev);
-        struct usb_hcd          *hcd = dev_get_drvdata(dev);
+        struct usb_hcd          *hcd = platform_get_drvdata(dev);
         struct ohci_hcd         *ohci = hcd_to_ohci (hcd);
 
-        usb_hcd_omap_remove(hcd, pdev);
+        usb_hcd_omap_remove(hcd, dev);
         if (ohci->transceiver) {
                 (void) otg_set_host(ohci->transceiver, 0);
                 put_device(ohci->transceiver->dev);
         }
-        dev_set_drvdata(dev, NULL);
+        platform_set_drvdata(dev, NULL);
 
         return 0;
 }
@@ -459,9 +457,9 @@ static int ohci_hcd_omap_drv_remove(struct device *dev)
 
 #ifdef  CONFIG_PM
 
-static int ohci_omap_suspend(struct device *dev, pm_message_t message)
+static int ohci_omap_suspend(struct platform_device *dev, pm_message_t message)
 {
-        struct ohci_hcd *ohci = hcd_to_ohci(dev_get_drvdata(dev));
+        struct ohci_hcd *ohci = hcd_to_ohci(platform_get_drvdata(dev));
 
         if (time_before(jiffies, ohci->next_statechange))
                 msleep(5);
@@ -473,9 +471,9 @@ static int ohci_omap_suspend(struct device *dev, pm_message_t message)
         return 0;
 }
 
-static int ohci_omap_resume(struct device *dev)
+static int ohci_omap_resume(struct platform_device *dev)
 {
-        struct ohci_hcd *ohci = hcd_to_ohci(dev_get_drvdata(dev));
+        struct ohci_hcd *ohci = hcd_to_ohci(platform_get_drvdata(dev));
 
         if (time_before(jiffies, ohci->next_statechange))
                 msleep(5);
@@ -494,16 +492,17 @@ static int ohci_omap_resume(struct device *dev)
 /*
  * Driver definition to register with the OMAP bus
  */
-static struct device_driver ohci_hcd_omap_driver = {
-        .name           = "ohci",
-        .owner          = THIS_MODULE,
-        .bus            = &platform_bus_type,
+static struct platform_driver ohci_hcd_omap_driver = {
         .probe          = ohci_hcd_omap_drv_probe,
         .remove         = ohci_hcd_omap_drv_remove,
 #ifdef  CONFIG_PM
         .suspend        = ohci_omap_suspend,
         .resume         = ohci_omap_resume,
 #endif
+        .driver         = {
+                .owner  = THIS_MODULE,
+                .name   = "ohci",
+        },
 };
 
 static int __init ohci_hcd_omap_init (void)
@@ -515,12 +514,12 @@ static int __init ohci_hcd_omap_init (void)
         pr_debug("%s: block sizes: ed %Zd td %Zd\n", hcd_name,
                 sizeof (struct ed), sizeof (struct td));
 
-        return driver_register(&ohci_hcd_omap_driver);
+        return platform_driver_register(&ohci_hcd_omap_driver);
 }
 
 static void __exit ohci_hcd_omap_cleanup (void)
 {
-        driver_unregister(&ohci_hcd_omap_driver);
+        platform_driver_unregister(&ohci_hcd_omap_driver);
 }
 
 module_init (ohci_hcd_omap_init);
diff --git a/drivers/usb/host/ohci-ppc-soc.c b/drivers/usb/host/ohci-ppc-soc.c
index 92cf6f4a1374..18755766e406 100644
--- a/drivers/usb/host/ohci-ppc-soc.c
+++ b/drivers/usb/host/ohci-ppc-soc.c
@@ -172,9 +172,8 @@ static const struct hc_driver ohci_ppc_soc_hc_driver = {
         .start_port_reset =     ohci_start_port_reset,
 };
 
-static int ohci_hcd_ppc_soc_drv_probe(struct device *dev)
+static int ohci_hcd_ppc_soc_drv_probe(struct platform_device *pdev)
 {
-        struct platform_device *pdev = to_platform_device(dev);
         int ret;
 
         if (usb_disabled())
@@ -184,25 +183,25 @@ static int ohci_hcd_ppc_soc_drv_probe(struct device *dev)
         return ret;
 }
 
-static int ohci_hcd_ppc_soc_drv_remove(struct device *dev)
+static int ohci_hcd_ppc_soc_drv_remove(struct platform_device *pdev)
 {
-        struct platform_device *pdev = to_platform_device(dev);
-        struct usb_hcd *hcd = dev_get_drvdata(dev);
+        struct usb_hcd *hcd = platform_get_drvdata(dev);
 
         usb_hcd_ppc_soc_remove(hcd, pdev);
         return 0;
 }
 
-static struct device_driver ohci_hcd_ppc_soc_driver = {
-        .name           = "ppc-soc-ohci",
-        .owner          = THIS_MODULE,
-        .bus            = &platform_bus_type,
+static struct platform_driver ohci_hcd_ppc_soc_driver = {
         .probe          = ohci_hcd_ppc_soc_drv_probe,
         .remove         = ohci_hcd_ppc_soc_drv_remove,
 #ifdef  CONFIG_PM
         /*.suspend      = ohci_hcd_ppc_soc_drv_suspend,*/
         /*.resume       = ohci_hcd_ppc_soc_drv_resume,*/
 #endif
+        .driver         = {
+                .name   = "ppc-soc-ohci",
+                .owner  = THIS_MODULE,
+        },
 };
 
 static int __init ohci_hcd_ppc_soc_init(void)
@@ -211,12 +210,12 @@ static int __init ohci_hcd_ppc_soc_init(void)
         pr_debug("block sizes: ed %d td %d\n", sizeof(struct ed),
                                                         sizeof(struct td));
 
-        return driver_register(&ohci_hcd_ppc_soc_driver);
+        return platform_driver_register(&ohci_hcd_ppc_soc_driver);
 }
 
 static void __exit ohci_hcd_ppc_soc_cleanup(void)
 {
-        driver_unregister(&ohci_hcd_ppc_soc_driver);
+        platform_driver_unregister(&ohci_hcd_ppc_soc_driver);
 }
 
 module_init(ohci_hcd_ppc_soc_init);
diff --git a/drivers/usb/host/ohci-pxa27x.c b/drivers/usb/host/ohci-pxa27x.c
index 59e20568e8f9..9d65ec307990 100644
--- a/drivers/usb/host/ohci-pxa27x.c
+++ b/drivers/usb/host/ohci-pxa27x.c
@@ -290,9 +290,8 @@ static const struct hc_driver ohci_pxa27x_hc_driver = {
 
 /*-------------------------------------------------------------------------*/
 
-static int ohci_hcd_pxa27x_drv_probe(struct device *dev)
+static int ohci_hcd_pxa27x_drv_probe(struct platform_device *pdev)
 {
-        struct platform_device *pdev = to_platform_device(dev);
         int ret;
 
         pr_debug ("In ohci_hcd_pxa27x_drv_probe");
@@ -304,41 +303,39 @@ static int ohci_hcd_pxa27x_drv_probe(struct device *dev)
         return ret;
 }
 
-static int ohci_hcd_pxa27x_drv_remove(struct device *dev)
+static int ohci_hcd_pxa27x_drv_remove(struct platform_device *pdev)
 {
-        struct platform_device *pdev = to_platform_device(dev);
-        struct usb_hcd *hcd = dev_get_drvdata(dev);
+        struct usb_hcd *hcd = platform_get_drvdata(pdev);
 
         usb_hcd_pxa27x_remove(hcd, pdev);
         return 0;
 }
 
-static int ohci_hcd_pxa27x_drv_suspend(struct device *dev, pm_message_t state)
+static int ohci_hcd_pxa27x_drv_suspend(struct platform_device *dev, pm_message_t state)
 {
-//      struct platform_device *pdev = to_platform_device(dev);
-//      struct usb_hcd *hcd = dev_get_drvdata(dev);
+//      struct usb_hcd *hcd = platform_get_drvdata(dev);
         printk("%s: not implemented yet\n", __FUNCTION__);
 
         return 0;
 }
 
-static int ohci_hcd_pxa27x_drv_resume(struct device *dev)
+static int ohci_hcd_pxa27x_drv_resume(struct platform_device *dev)
 {
-//      struct platform_device *pdev = to_platform_device(dev);
-//      struct usb_hcd *hcd = dev_get_drvdata(dev);
+//      struct usb_hcd *hcd = platform_get_drvdata(dev);
         printk("%s: not implemented yet\n", __FUNCTION__);
 
         return 0;
 }
 
 
-static struct device_driver ohci_hcd_pxa27x_driver = {
-        .name           = "pxa27x-ohci",
-        .bus            = &platform_bus_type,
+static struct platform_driver ohci_hcd_pxa27x_driver = {
         .probe          = ohci_hcd_pxa27x_drv_probe,
         .remove         = ohci_hcd_pxa27x_drv_remove,
         .suspend        = ohci_hcd_pxa27x_drv_suspend, 
-        .resume         = ohci_hcd_pxa27x_drv_resume, 
+        .resume         = ohci_hcd_pxa27x_drv_resume,
+        .driver         = {
+                .name   = "pxa27x-ohci",
+        },
 };
 
 static int __init ohci_hcd_pxa27x_init (void)
@@ -347,12 +344,12 @@ static int __init ohci_hcd_pxa27x_init (void)
         pr_debug ("block sizes: ed %d td %d\n",
                 sizeof (struct ed), sizeof (struct td));
 
-        return driver_register(&ohci_hcd_pxa27x_driver);
+        return platform_driver_register(&ohci_hcd_pxa27x_driver);
 }
 
 static void __exit ohci_hcd_pxa27x_cleanup (void)
 {
-        driver_unregister(&ohci_hcd_pxa27x_driver);
+        platform_driver_unregister(&ohci_hcd_pxa27x_driver);
 }
 
 module_init (ohci_hcd_pxa27x_init);
diff --git a/drivers/usb/host/ohci-s3c2410.c b/drivers/usb/host/ohci-s3c2410.c
index ee1fc605b402..35cc9402adc0 100644
--- a/drivers/usb/host/ohci-s3c2410.c
+++ b/drivers/usb/host/ohci-s3c2410.c
@@ -459,39 +459,38 @@ static const struct hc_driver ohci_s3c2410_hc_driver = {
 
 /* device driver */
 
-static int ohci_hcd_s3c2410_drv_probe(struct device *dev)
+static int ohci_hcd_s3c2410_drv_probe(struct platform_device *pdev)
 {
-        struct platform_device *pdev = to_platform_device(dev);
         return usb_hcd_s3c2410_probe(&ohci_s3c2410_hc_driver, pdev);
 }
 
-static int ohci_hcd_s3c2410_drv_remove(struct device *dev)
+static int ohci_hcd_s3c2410_drv_remove(struct platform_device *pdev)
 {
-        struct platform_device *pdev = to_platform_device(dev);
-        struct usb_hcd *hcd = dev_get_drvdata(dev);
+        struct usb_hcd *hcd = platform_get_drvdata(pdev);
 
         usb_hcd_s3c2410_remove(hcd, pdev);
         return 0;
 }
 
-static struct device_driver ohci_hcd_s3c2410_driver = {
-        .name           = "s3c2410-ohci",
-        .owner          = THIS_MODULE,
-        .bus            = &platform_bus_type,
+static struct platform_driver ohci_hcd_s3c2410_driver = {
         .probe          = ohci_hcd_s3c2410_drv_probe,
         .remove         = ohci_hcd_s3c2410_drv_remove,
         /*.suspend      = ohci_hcd_s3c2410_drv_suspend, */
         /*.resume       = ohci_hcd_s3c2410_drv_resume, */
+        .driver         = {
+                .owner  = THIS_MODULE,
+                .name   = "s3c2410-ohci",
+        },
 };
 
 static int __init ohci_hcd_s3c2410_init (void)
 {
-        return driver_register(&ohci_hcd_s3c2410_driver);
+        return platform_driver_register(&ohci_hcd_s3c2410_driver);
 }
 
 static void __exit ohci_hcd_s3c2410_cleanup (void)
 {
-        driver_unregister(&ohci_hcd_s3c2410_driver);
+        platform_driver_unregister(&ohci_hcd_s3c2410_driver);
 }
 
 module_init (ohci_hcd_s3c2410_init);
diff --git a/drivers/usb/host/sl811-hcd.c b/drivers/usb/host/sl811-hcd.c
index 5607c0ae6835..a7722a6a5a5b 100644
--- a/drivers/usb/host/sl811-hcd.c
+++ b/drivers/usb/host/sl811-hcd.c
@@ -1631,24 +1631,21 @@ static struct hc_driver sl811h_hc_driver = {
 /*-------------------------------------------------------------------------*/
 
 static int __devexit
-sl811h_remove(struct device *dev)
+sl811h_remove(struct platform_device *dev)
 {
-        struct usb_hcd          *hcd = dev_get_drvdata(dev);
+        struct usb_hcd          *hcd = platform_get_drvdata(dev);
         struct sl811            *sl811 = hcd_to_sl811(hcd);
-        struct platform_device  *pdev;
         struct resource         *res;
 
-        pdev = container_of(dev, struct platform_device, dev);
-
         remove_debug_file(sl811);
         usb_remove_hcd(hcd);
 
         /* some platforms may use IORESOURCE_IO */
-        res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
+        res = platform_get_resource(dev, IORESOURCE_MEM, 1);
         if (res)
                 iounmap(sl811->data_reg);
 
-        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        res = platform_get_resource(dev, IORESOURCE_MEM, 0);
         if (res)
                 iounmap(sl811->addr_reg);
 
@@ -1657,11 +1654,10 @@ sl811h_remove(struct device *dev)
 }
 
 static int __devinit
-sl811h_probe(struct device *dev)
+sl811h_probe(struct platform_device *dev)
 {
         struct usb_hcd          *hcd;
         struct sl811            *sl811;
-        struct platform_device  *pdev;
         struct resource         *addr, *data;
         int                     irq;
         void __iomem            *addr_reg;
@@ -1674,24 +1670,23 @@ sl811h_probe(struct device *dev)
          * specific platform_data.  we don't probe for IRQs, and do only
          * minimal sanity checking.
          */
-        pdev = container_of(dev, struct platform_device, dev);
-        irq = platform_get_irq(pdev, 0);
-        if (pdev->num_resources < 3 || irq < 0)
+        irq = platform_get_irq(dev, 0);
+        if (dev->num_resources < 3 || irq < 0)
                 return -ENODEV;
 
         /* refuse to confuse usbcore */
-        if (dev->dma_mask) {
+        if (dev->dev.dma_mask) {
                 DBG("no we won't dma\n");
                 return -EINVAL;
         }
 
         /* the chip may be wired for either kind of addressing */
-        addr = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        data = platform_get_resource(pdev, IORESOURCE_MEM, 1);
+        addr = platform_get_resource(dev, IORESOURCE_MEM, 0);
+        data = platform_get_resource(dev, IORESOURCE_MEM, 1);
         retval = -EBUSY;
         if (!addr || !data) {
-                addr = platform_get_resource(pdev, IORESOURCE_IO, 0);
-                data = platform_get_resource(pdev, IORESOURCE_IO, 1);
+                addr = platform_get_resource(dev, IORESOURCE_IO, 0);
+                data = platform_get_resource(dev, IORESOURCE_IO, 1);
                 if (!addr || !data)
                         return -ENODEV;
                 ioaddr = 1;
@@ -1713,7 +1708,7 @@ sl811h_probe(struct device *dev)
         }
 
         /* allocate and initialize hcd */
-        hcd = usb_create_hcd(&sl811h_hc_driver, dev, dev->bus_id);
+        hcd = usb_create_hcd(&sl811h_hc_driver, &dev->dev, dev->dev.bus_id);
         if (!hcd) {
                 retval = -ENOMEM;
                 goto err5;
@@ -1723,7 +1718,7 @@ sl811h_probe(struct device *dev)
 
         spin_lock_init(&sl811->lock);
         INIT_LIST_HEAD(&sl811->async);
-        sl811->board = dev->platform_data;
+        sl811->board = dev->dev.platform_data;
         init_timer(&sl811->timer);
         sl811->timer.function = sl811h_timer;
         sl811->timer.data = (unsigned long) sl811;
@@ -1785,9 +1780,9 @@ sl811h_probe(struct device *dev)
  */
 
 static int
-sl811h_suspend(struct device *dev, pm_message_t state)
+sl811h_suspend(struct platform_device *dev, pm_message_t state)
 {
-        struct usb_hcd  *hcd = dev_get_drvdata(dev);
+        struct usb_hcd  *hcd = platform_get_drvdata(dev);
         struct sl811    *sl811 = hcd_to_sl811(hcd);
         int             retval = 0;
 
@@ -1796,27 +1791,27 @@ sl811h_suspend(struct device *dev, pm_message_t state)
         else if (state.event == PM_EVENT_SUSPEND)
                 port_power(sl811, 0);
         if (retval == 0)
-                dev->power.power_state = state;
+                dev->dev.power.power_state = state;
         return retval;
 }
 
 static int
-sl811h_resume(struct device *dev)
+sl811h_resume(struct platform_device *dev)
 {
-        struct usb_hcd  *hcd = dev_get_drvdata(dev);
+        struct usb_hcd  *hcd = platform_get_drvdata(dev);
         struct sl811    *sl811 = hcd_to_sl811(hcd);
 
         /* with no "check to see if VBUS is still powered" board hook,
          * let's assume it'd only be powered to enable remote wakeup.
          */
-        if (dev->power.power_state.event == PM_EVENT_SUSPEND
+        if (dev->dev.power.power_state.event == PM_EVENT_SUSPEND
                         || !hcd->can_wakeup) {
                 sl811->port1 = 0;
                 port_power(sl811, 1);
                 return 0;
         }
 
-        dev->power.power_state = PMSG_ON;
+        dev->dev.power.power_state = PMSG_ON;
         return sl811h_bus_resume(hcd);
 }
 
@@ -1829,16 +1824,16 @@ sl811h_resume(struct device *dev)
 
 
 /* this driver is exported so sl811_cs can depend on it */
-struct device_driver sl811h_driver = {
-        .name =         (char *) hcd_name,
-        .bus =          &platform_bus_type,
-        .owner =        THIS_MODULE,
-
+struct platform_driver sl811h_driver = {
         .probe =        sl811h_probe,
         .remove =       __devexit_p(sl811h_remove),
 
         .suspend =      sl811h_suspend,
         .resume =       sl811h_resume,
+        .driver = {
+                .name = (char *) hcd_name,
+                .owner = THIS_MODULE,
+        },
 };
 EXPORT_SYMBOL(sl811h_driver);
 
@@ -1850,12 +1845,12 @@ static int __init sl811h_init(void)
                 return -ENODEV;
 
         INFO("driver %s, %s\n", hcd_name, DRIVER_VERSION);
-        return driver_register(&sl811h_driver);
+        return platform_driver_register(&sl811h_driver);
 }
 module_init(sl811h_init);
 
 static void __exit sl811h_cleanup(void)
 {
-        driver_unregister(&sl811h_driver);
+        platform_driver_unregister(&sl811h_driver);
 }
 module_exit(sl811h_cleanup);
diff --git a/drivers/usb/image/microtek.c b/drivers/usb/image/microtek.c
index c89d0769b3da..61a2604cce4f 100644
--- a/drivers/usb/image/microtek.c
+++ b/drivers/usb/image/microtek.c
@@ -632,7 +632,7 @@ out:
         return err;
 }
 
-static Scsi_Host_Template mts_scsi_host_template = {
+static struct scsi_host_template mts_scsi_host_template = {
         .module                 = THIS_MODULE,
         .name                   = "microtekX6",
         .proc_name              = "microtekX6",
diff --git a/drivers/video/acornfb.c b/drivers/video/acornfb.c
index 193b482570c7..750cebb18306 100644
--- a/drivers/video/acornfb.c
+++ b/drivers/video/acornfb.c
@@ -1279,7 +1279,7 @@ free_unused_pages(unsigned int virtual_start, unsigned int virtual_end)
         printk("acornfb: freed %dK memory\n", mb_freed);
 }
 
-static int __init acornfb_probe(struct device *dev)
+static int __init acornfb_probe(struct platform_device *dev)
 {
         unsigned long size;
         u_int h_sync, v_sync;
@@ -1292,7 +1292,7 @@ static int __init acornfb_probe(struct device *dev)
 
         acornfb_init_fbinfo();
 
-        current_par.dev = dev;
+        current_par.dev = &dev->dev;
 
         if (current_par.montype == -1)
                 current_par.montype = acornfb_detect_monitortype();
@@ -1453,15 +1453,16 @@ static int __init acornfb_probe(struct device *dev)
         return 0;
 }
 
-static struct device_driver acornfb_driver = {
-        .name   = "acornfb",
-        .bus    = &platform_bus_type,
+static struct platform_driver acornfb_driver = {
         .probe  = acornfb_probe,
+        .driver = {
+                .name   = "acornfb",
+        },
 };
 
 static int __init acornfb_init(void)
 {
-        return driver_register(&acornfb_driver);
+        return platform_driver_register(&acornfb_driver);
 }
 
 module_init(acornfb_init);
diff --git a/drivers/video/arcfb.c b/drivers/video/arcfb.c
index a1fc8bbb1090..080db812ca48 100644
--- a/drivers/video/arcfb.c
+++ b/drivers/video/arcfb.c
@@ -514,9 +514,8 @@ static struct fb_ops arcfb_ops = {
         .fb_ioctl       = arcfb_ioctl,
 };
 
-static int __init arcfb_probe(struct device *device)
+static int __init arcfb_probe(struct platform_device *dev)
 {
-        struct platform_device *dev = to_platform_device(device);
         struct fb_info *info;
         int retval = -ENOMEM;
         int videomemorysize;
@@ -559,7 +558,7 @@ static int __init arcfb_probe(struct device *device)
         retval = register_framebuffer(info);
         if (retval < 0)
                 goto err1;
-        dev_set_drvdata(&dev->dev, info);
+        platform_set_drvdata(dev, info);
         if (irq) {
                 par->irq = irq;
                 if (request_irq(par->irq, &arcfb_interrupt, SA_SHIRQ,
@@ -600,9 +599,9 @@ err:
         return retval;
 }
 
-static int arcfb_remove(struct device *device)
+static int arcfb_remove(struct platform_device *dev)
 {
-        struct fb_info *info = dev_get_drvdata(device);
+        struct fb_info *info = platform_get_drvdata(dev);
 
         if (info) {
                 unregister_framebuffer(info);
@@ -612,11 +611,12 @@ static int arcfb_remove(struct device *device)
         return 0;
 }
 
-static struct device_driver arcfb_driver = {
-        .name   = "arcfb",
-        .bus    = &platform_bus_type,
+static struct platform_driver arcfb_driver = {
         .probe  = arcfb_probe,
         .remove = arcfb_remove,
+        .driver = {
+                .name   = "arcfb",
+        },
 };
 
 static struct platform_device *arcfb_device;
@@ -628,7 +628,7 @@ static int __init arcfb_init(void)
         if (!arcfb_enable)
                 return -ENXIO;
 
-        ret = driver_register(&arcfb_driver);
+        ret = platform_driver_register(&arcfb_driver);
         if (!ret) {
                 arcfb_device = platform_device_alloc("arcfb", 0);
                 if (arcfb_device) {
@@ -638,7 +638,7 @@ static int __init arcfb_init(void)
                 }
                 if (ret) {
                         platform_device_put(arcfb_device);
-                        driver_unregister(&arcfb_driver);
+                        platform_driver_unregister(&arcfb_driver);
                 }
         }
         return ret;
@@ -648,7 +648,7 @@ static int __init arcfb_init(void)
 static void __exit arcfb_exit(void)
 {
         platform_device_unregister(arcfb_device);
-        driver_unregister(&arcfb_driver);
+        platform_driver_unregister(&arcfb_driver);
 }
 
 module_param(num_cols, ulong, 0);
diff --git a/drivers/video/backlight/corgi_bl.c b/drivers/video/backlight/corgi_bl.c
index bd9a6996aee7..6a219b2c77e3 100644
--- a/drivers/video/backlight/corgi_bl.c
+++ b/drivers/video/backlight/corgi_bl.c
@@ -79,13 +79,13 @@ static void corgibl_blank(int blank)
 }
 
 #ifdef CONFIG_PM
-static int corgibl_suspend(struct device *dev, pm_message_t state)
+static int corgibl_suspend(struct platform_device *dev, pm_message_t state)
 {
         corgibl_blank(FB_BLANK_POWERDOWN);
         return 0;
 }
 
-static int corgibl_resume(struct device *dev)
+static int corgibl_resume(struct platform_device *dev)
 {
         corgibl_blank(FB_BLANK_UNBLANK);
         return 0;
@@ -143,9 +143,9 @@ static struct backlight_properties corgibl_data = {
 
 static struct backlight_device *corgi_backlight_device;
 
-static int __init corgibl_probe(struct device *dev)
+static int __init corgibl_probe(struct platform_device *pdev)
 {
-        struct corgibl_machinfo *machinfo = dev->platform_data;
+        struct corgibl_machinfo *machinfo = pdev->dev.platform_data;
 
         corgibl_data.max_brightness = machinfo->max_intensity;
         corgibl_mach_set_intensity = machinfo->set_bl_intensity;
@@ -162,7 +162,7 @@ static int __init corgibl_probe(struct device *dev)
         return 0;
 }
 
-static int corgibl_remove(struct device *dev)
+static int corgibl_remove(struct platform_device *dev)
 {
         backlight_device_unregister(corgi_backlight_device);
 
@@ -172,23 +172,24 @@ static int corgibl_remove(struct device *dev)
         return 0;
 }
 
-static struct device_driver corgibl_driver = {
-        .name           = "corgi-bl",
-        .bus            = &platform_bus_type,
+static struct platform_driver corgibl_driver = {
         .probe          = corgibl_probe,
         .remove         = corgibl_remove,
         .suspend        = corgibl_suspend,
         .resume         = corgibl_resume,
+        .driver         = {
+                .name   = "corgi-bl",
+        },
 };
 
 static int __init corgibl_init(void)
 {
-        return driver_register(&corgibl_driver);
+        return platform_driver_register(&corgibl_driver);
 }
 
 static void __exit corgibl_exit(void)
 {
-        driver_unregister(&corgibl_driver);
+        platform_driver_unregister(&corgibl_driver);
 }
 
 module_init(corgibl_init);
diff --git a/drivers/video/bw2.c b/drivers/video/bw2.c
index f53bf3ba1278..d3728f60961e 100644
--- a/drivers/video/bw2.c
+++ b/drivers/video/bw2.c
@@ -51,6 +51,9 @@ static struct fb_ops bw2_ops = {
         .fb_imageblit           = cfb_imageblit,
         .fb_mmap                = bw2_mmap,
         .fb_ioctl               = bw2_ioctl,
+#ifdef CONFIG_COMPAT
+        .fb_compat_ioctl        = sbusfb_compat_ioctl,
+#endif
 };
 
 /* OBio addresses for the bwtwo registers */
diff --git a/drivers/video/cg14.c b/drivers/video/cg14.c
index 030d4b13b1c2..1bed50f2a276 100644
--- a/drivers/video/cg14.c
+++ b/drivers/video/cg14.c
@@ -49,6 +49,9 @@ static struct fb_ops cg14_ops = {
         .fb_imageblit           = cfb_imageblit,
         .fb_mmap                = cg14_mmap,
         .fb_ioctl               = cg14_ioctl,
+#ifdef CONFIG_COMPAT
+        .fb_compat_ioctl        = sbusfb_compat_ioctl,
+#endif
 };
 
 #define CG14_MCR_INTENABLE_SHIFT        7
diff --git a/drivers/video/cg3.c b/drivers/video/cg3.c
index b94eee8c42d5..a1354e7e0513 100644
--- a/drivers/video/cg3.c
+++ b/drivers/video/cg3.c
@@ -50,6 +50,9 @@ static struct fb_ops cg3_ops = {
         .fb_imageblit           = cfb_imageblit,
         .fb_mmap                = cg3_mmap,
         .fb_ioctl               = cg3_ioctl,
+#ifdef CONFIG_COMPAT
+        .fb_compat_ioctl        = sbusfb_compat_ioctl,
+#endif
 };
 
 
diff --git a/drivers/video/cg6.c b/drivers/video/cg6.c
index 414c4409e924..9debe642fd2f 100644
--- a/drivers/video/cg6.c
+++ b/drivers/video/cg6.c
@@ -54,6 +54,9 @@ static struct fb_ops cg6_ops = {
         .fb_sync                = cg6_sync,
         .fb_mmap                = cg6_mmap,
         .fb_ioctl               = cg6_ioctl,
+#ifdef CONFIG_COMPAT
+        .fb_compat_ioctl        = sbusfb_compat_ioctl,
+#endif
 };
 
 /* Offset of interesting structures in the OBIO space */
diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig
index 94c5f1392cce..5f74df993406 100644
--- a/drivers/video/console/Kconfig
+++ b/drivers/video/console/Kconfig
@@ -215,12 +215,5 @@ config FONT_10x18
           big letters. It fits between the sun 12x22 and the normal 8x16 font.
           If other fonts are too big or too small for you, say Y, otherwise say N.
 
-config FONT_RL
-        bool "console Roman Large 8x16 font" if FONTS
-        depends on FRAMEBUFFER_CONSOLE
-        help
-          This is the visually-appealing "RL" console font that is
-          included with the kbd package.
-
 endmenu
 
diff --git a/drivers/video/console/Makefile b/drivers/video/console/Makefile
index fed600c9ca55..9b26dda18a38 100644
--- a/drivers/video/console/Makefile
+++ b/drivers/video/console/Makefile
@@ -15,7 +15,6 @@ font-objs-$(CONFIG_FONT_10x18)     += font_10x18.o
 font-objs-$(CONFIG_FONT_PEARL_8x8) += font_pearl_8x8.o
 font-objs-$(CONFIG_FONT_ACORN_8x8) += font_acorn_8x8.o
 font-objs-$(CONFIG_FONT_MINI_4x6)  += font_mini_4x6.o
-font-objs-$(CONFIG_FONT_RL)  += font_rl.o
 
 font-objs += $(font-objs-y)
 
diff --git a/drivers/video/console/font_rl.c b/drivers/video/console/font_rl.c
deleted file mode 100644
index dfecc27d8ded..000000000000
--- a/drivers/video/console/font_rl.c
+++ /dev/null
@@ -1,4374 +0,0 @@
-
-/* This font is simply the "rl.fnt" console font from the kbd utility.
- * Converted by Zack T Smith, fbui@comcast.net.
- * The original binary file is covered under the GNU Public License.
- */
-
-#include <linux/font.h>
-
-#define FONTDATAMAX 4096
-
-static unsigned char patterns[4096] = {
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x00,
-0x3c,
-0x42,
-0x81,
-0xe7,
-0xa5,
-0x99,
-0x81,
-0x81,
-0x99,
-0x42,
-0x3c,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x00,
-0x3c,
-0x7e,
-0xff,
-0x99,
-0xdb,
-0xe7,
-0xff,
-0xff,
-0xe7,
-0x7e,
-0x3c,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x00,
-0x00,
-0x6c,
-0xfe,
-0xfe,
-0xfe,
-0xfe,
-0xfe,
-0x7c,
-0x38,
-0x10,
-0x00,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x00,
-0x00,
-0x00,
-0x10,
-0x38,
-0x7c,
-0xfe,
-0x7c,
-0x38,
-0x10,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x00,
-0x38,
-0x38,
-0x10,
-0xd6,
-0xfe,
-0xd6,
-0x10,
-0x10,
-0x38,
-0x7c,
-0x00,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x00,
-0x10,
-0x38,
-0x7c,
-0xfe,
-0xfe,
-0x54,
-0x10,
-0x10,
-0x38,
-0x7c,
-0x00,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x18,
-0x3c,
-0x3c,
-0x18,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-
-0xff,
-0xff,
-0xff,
-0xff,
-0xff,
-0xff,
-0xe7,
-0xc3,
-0xc3,
-0xe7,
-0xff,
-0xff,
-0xff,
-0xff,
-0xff,
-0xff,
-
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x3c,
-0x66,
-0x42,
-0x42,
-0x66,
-0x3c,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-
-0xff,
-0xff,
-0xff,
-0xff,
-0xff,
-0xc3,
-0x99,
-0xbd,
-0xbd,
-0x99,
-0xc3,
-0xff,
-0xff,
-0xff,
-0xff,
-0xff,
-
-0x00,
-0x00,
-0x0f,
-0x07,
-0x0d,
-0x18,
-0x78,
-0xcc,
-0xcc,
-0xcc,
-0xcc,
-0x78,
-0x00,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x00,
-0x3c,
-0x66,
-0x66,
-0x66,
-0x3c,
-0x18,
-0x7e,
-0x18,
-0x18,
-0x18,
-0x00,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x08,
-0x0c,
-0x0a,
-0x0a,
-0x0a,
-0x08,
-0x08,
-0x08,
-0x38,
-0x78,
-0x30,
-0x00,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x10,
-0x18,
-0x1c,
-0x1e,
-0x1e,
-0x16,
-0x12,
-0x72,
-0xf2,
-0x62,
-0x0e,
-0x1e,
-0x0c,
-0x00,
-0x00,
-
-0x00,
-0x00,
-0x00,
-0x10,
-0x92,
-0x54,
-0x38,
-0xfe,
-0x38,
-0x54,
-0x92,
-0x10,
-0x00,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x00,
-0x00,
-0x80,
-0xc0,
-0xe0,
-0xb8,
-0x8e,
-0xb8,
-0xe0,
-0xc0,
-0x80,
-0x00,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x00,
-0x00,
-0x02,
-0x06,
-0x0e,
-0x3a,
-0xe2,
-0x3a,
-0x0e,
-0x06,
-0x02,
-0x00,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x00,
-0x10,
-0x38,
-0x7c,
-0xd6,
-0x10,
-0x10,
-0x10,
-0x10,
-0xd6,
-0x7c,
-0x38,
-0x10,
-0x00,
-0x00,
-
-0x00,
-0x42,
-0xe7,
-0xe7,
-0xe7,
-0xe7,
-0x42,
-0x42,
-0x42,
-0x00,
-0x66,
-0x66,
-0x66,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x7f,
-0xca,
-0xca,
-0xca,
-0xca,
-0x7a,
-0x0a,
-0x0a,
-0x0a,
-0x0a,
-0x0a,
-0x1b,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x1e,
-0x31,
-0x78,
-0xcc,
-0xc6,
-0xc3,
-0x63,
-0x33,
-0x1e,
-0x8c,
-0x78,
-0x00,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0xfe,
-0xfe,
-0xfe,
-0xfe,
-0x00,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x00,
-0x10,
-0x38,
-0x7c,
-0xd6,
-0x10,
-0x10,
-0x10,
-0x10,
-0xd6,
-0x7c,
-0x38,
-0x10,
-0xfe,
-0x00,
-
-0x00,
-0x00,
-0x10,
-0x38,
-0x7c,
-0xd6,
-0x10,
-0x10,
-0x10,
-0x10,
-0x10,
-0x10,
-0x10,
-0x10,
-0x00,
-0x00,
-
-0x00,
-0x00,
-0x10,
-0x10,
-0x10,
-0x10,
-0x10,
-0x10,
-0x10,
-0x10,
-0xd6,
-0x7c,
-0x38,
-0x10,
-0x00,
-0x00,
-
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x08,
-0x0c,
-0x06,
-0xff,
-0x06,
-0x0c,
-0x08,
-0x00,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x10,
-0x30,
-0x60,
-0xff,
-0x60,
-0x30,
-0x10,
-0x00,
-0x00,
-0x00,
-0x00,
-
-0x22,
-0x44,
-0x88,
-0xcc,
-0xee,
-0x44,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x24,
-0x42,
-0xff,
-0x42,
-0x24,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x00,
-0x00,
-0x10,
-0x38,
-0x38,
-0x6c,
-0x6c,
-0xc6,
-0xfe,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x00,
-0x00,
-0xfe,
-0xc6,
-0x6c,
-0x6c,
-0x38,
-0x38,
-0x10,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x18,
-0x3c,
-0x3c,
-0x3c,
-0x3c,
-0x18,
-0x18,
-0x18,
-0x10,
-0x00,
-0x18,
-0x18,
-0x00,
-0x00,
-0x00,
-
-0x22,
-0x77,
-0x33,
-0x11,
-0x22,
-0x44,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x00,
-0x12,
-0x12,
-0x12,
-0x7f,
-0x24,
-0x24,
-0x24,
-0xfe,
-0x48,
-0x48,
-0x48,
-0x00,
-0x00,
-0x00,
-
-0x10,
-0x10,
-0x7c,
-0xd2,
-0xd0,
-0xd0,
-0xd0,
-0x7c,
-0x16,
-0x16,
-0x16,
-0x96,
-0x7c,
-0x10,
-0x10,
-0x00,
-
-0x00,
-0x42,
-0xbe,
-0x44,
-0x0c,
-0x08,
-0x18,
-0x10,
-0x30,
-0x20,
-0x64,
-0x4a,
-0xc4,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x38,
-0x6c,
-0x6c,
-0x6c,
-0x38,
-0x37,
-0x72,
-0xdc,
-0xcc,
-0xcc,
-0xcc,
-0x77,
-0x00,
-0x00,
-0x00,
-
-0x10,
-0x38,
-0x18,
-0x08,
-0x10,
-0x20,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x04,
-0x08,
-0x10,
-0x10,
-0x30,
-0x30,
-0x30,
-0x30,
-0x30,
-0x10,
-0x10,
-0x08,
-0x04,
-0x00,
-0x00,
-
-0x00,
-0x20,
-0x10,
-0x08,
-0x08,
-0x0c,
-0x0c,
-0x0c,
-0x0c,
-0x0c,
-0x08,
-0x08,
-0x10,
-0x20,
-0x00,
-0x00,
-
-0x00,
-0x00,
-0x00,
-0x00,
-0x44,
-0x28,
-0x38,
-0xfe,
-0x38,
-0x28,
-0x44,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x18,
-0x18,
-0x7e,
-0x18,
-0x18,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x10,
-0x38,
-0x18,
-0x08,
-0x10,
-0x20,
-
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x7e,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x10,
-0x38,
-0x10,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x06,
-0x06,
-0x0c,
-0x0c,
-0x18,
-0x18,
-0x30,
-0x30,
-0x60,
-0x60,
-0xc0,
-0xc0,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x00,
-0x00,
-0x00,
-0x3c,
-0x46,
-0xc6,
-0xc6,
-0xc6,
-0xc6,
-0xc6,
-0xc4,
-0x78,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x00,
-0x00,
-0x00,
-0x08,
-0x18,
-0x78,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x7e,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x00,
-0x00,
-0x00,
-0x7c,
-0x86,
-0x06,
-0x0c,
-0x18,
-0x20,
-0x40,
-0xc1,
-0xfe,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x00,
-0x00,
-0x00,
-0x3c,
-0x46,
-0x04,
-0x08,
-0x1c,
-0x06,
-0x06,
-0x06,
-0x06,
-0x0c,
-0x70,
-0x00,
-
-0x00,
-0x00,
-0x00,
-0x00,
-0x04,
-0x08,
-0x10,
-0x2c,
-0x4c,
-0x8c,
-0x8c,
-0xfe,
-0x0c,
-0x0c,
-0x0c,
-0x00,
-
-0x00,
-0x00,
-0x00,
-0x02,
-0x3c,
-0x20,
-0x20,
-0x70,
-0x0c,
-0x06,
-0x06,
-0x06,
-0x06,
-0x0c,
-0x70,
-0x00,
-
-0x00,
-0x00,
-0x18,
-0x20,
-0x40,
-0xc0,
-0xdc,
-0xc6,
-0xc6,
-0xc6,
-0xc6,
-0x44,
-0x38,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x00,
-0x00,
-0x40,
-0x7e,
-0x82,
-0x06,
-0x04,
-0x0c,
-0x18,
-0x18,
-0x30,
-0x30,
-0x30,
-0x30,
-0x00,
-
-0x00,
-0x00,
-0x7c,
-0xc6,
-0xc6,
-0x64,
-0x38,
-0x4c,
-0xc6,
-0xc6,
-0xc6,
-0xc6,
-0x7c,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x00,
-0x00,
-0x00,
-0x38,
-0x44,
-0xc6,
-0xc6,
-0x76,
-0x06,
-0x06,
-0x06,
-0x04,
-0x08,
-0x30,
-0x00,
-
-0x00,
-0x00,
-0x00,
-0x00,
-0x10,
-0x38,
-0x10,
-0x00,
-0x00,
-0x00,
-0x10,
-0x38,
-0x10,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x00,
-0x00,
-0x00,
-0x10,
-0x38,
-0x10,
-0x00,
-0x00,
-0x00,
-0x10,
-0x38,
-0x18,
-0x08,
-0x10,
-0x20,
-
-0x00,
-0x06,
-0x0c,
-0x18,
-0x30,
-0x60,
-0xa0,
-0xa0,
-0x60,
-0x30,
-0x18,
-0x0c,
-0x06,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x7e,
-0x00,
-0x00,
-0x7e,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x60,
-0x30,
-0x18,
-0x0c,
-0x06,
-0x05,
-0x05,
-0x06,
-0x0c,
-0x18,
-0x30,
-0x60,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x7c,
-0x86,
-0xc6,
-0x06,
-0x04,
-0x08,
-0x10,
-0x10,
-0x18,
-0x00,
-0x18,
-0x18,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x00,
-0x3c,
-0x46,
-0xc6,
-0xce,
-0xd6,
-0xd6,
-0xd6,
-0xdc,
-0xc0,
-0xc4,
-0x78,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x18,
-0x18,
-0x18,
-0x3c,
-0x2c,
-0x2c,
-0x2c,
-0x7e,
-0x46,
-0x46,
-0x46,
-0xef,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0xfc,
-0x66,
-0x66,
-0x66,
-0x66,
-0x7c,
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-0xfc,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x3a,
-0x66,
-0xc2,
-0xc0,
-0xc0,
-0xc0,
-0xc0,
-0xc0,
-0xc0,
-0xc0,
-0x62,
-0x3c,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0xfc,
-0x66,
-0x63,
-0x63,
-0x63,
-0x63,
-0x63,
-0x63,
-0x63,
-0x63,
-0x66,
-0xfc,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0xff,
-0x61,
-0x60,
-0x60,
-0x64,
-0x7c,
-0x64,
-0x60,
-0x60,
-0x60,
-0x61,
-0xfe,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0xff,
-0x61,
-0x61,
-0x60,
-0x64,
-0x7c,
-0x64,
-0x60,
-0x60,
-0x60,
-0x60,
-0xf0,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x3a,
-0x66,
-0xc2,
-0xc0,
-0xc0,
-0xc0,
-0xcf,
-0xc6,
-0xc6,
-0xc6,
-0x66,
-0x38,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0xf7,
-0x62,
-0x62,
-0x62,
-0x62,
-0x7e,
-0x62,
-0x62,
-0x62,
-0x62,
-0x62,
-0xf7,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x3c,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x3c,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x1e,
-0x0c,
-0x0c,
-0x0c,
-0x0c,
-0x0c,
-0x0c,
-0x0c,
-0x0c,
-0x0c,
-0x0c,
-0x0c,
-0x0c,
-0x08,
-0xf0,
-
-0x00,
-0xf7,
-0x64,
-0x6c,
-0x68,
-0x68,
-0x78,
-0x6c,
-0x6c,
-0x6c,
-0x66,
-0x66,
-0xf7,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0xf8,
-0x60,
-0x60,
-0x60,
-0x60,
-0x60,
-0x60,
-0x60,
-0x60,
-0x60,
-0x61,
-0xfe,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0xc3,
-0x66,
-0x76,
-0x7e,
-0x56,
-0x56,
-0x46,
-0x46,
-0x46,
-0x46,
-0x46,
-0xef,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0xe7,
-0x62,
-0x62,
-0x72,
-0x52,
-0x5a,
-0x4a,
-0x4e,
-0x46,
-0x46,
-0x42,
-0xe2,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x3c,
-0x66,
-0xc3,
-0xc3,
-0xc3,
-0xc3,
-0xc3,
-0xc3,
-0xc3,
-0xc3,
-0x66,
-0x3c,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0xfc,
-0x66,
-0x66,
-0x66,
-0x66,
-0x6c,
-0x60,
-0x60,
-0x60,
-0x60,
-0x60,
-0xf0,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x3c,
-0x66,
-0xc3,
-0xc3,
-0xc3,
-0xc3,
-0xc3,
-0xc3,
-0xc3,
-0xc3,
-0x66,
-0x3c,
-0x10,
-0x39,
-0x0e,
-
-0x00,
-0xfc,
-0x66,
-0x66,
-0x66,
-0x66,
-0x7c,
-0x6c,
-0x66,
-0x66,
-0x66,
-0x66,
-0xf3,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x7a,
-0xc6,
-0xc2,
-0xc0,
-0x70,
-0x3c,
-0x0e,
-0x06,
-0x06,
-0x86,
-0xc6,
-0xbc,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0xff,
-0x99,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x3c,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0xf7,
-0x62,
-0x62,
-0x62,
-0x62,
-0x62,
-0x62,
-0x62,
-0x62,
-0x62,
-0x62,
-0x3c,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0xf7,
-0x62,
-0x62,
-0x62,
-0x76,
-0x34,
-0x34,
-0x34,
-0x3c,
-0x18,
-0x18,
-0x18,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0xf7,
-0x62,
-0x62,
-0x62,
-0x62,
-0x6a,
-0x6a,
-0x6a,
-0x6a,
-0x7e,
-0x7e,
-0x34,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0xf7,
-0x62,
-0x62,
-0x34,
-0x34,
-0x18,
-0x18,
-0x2c,
-0x2c,
-0x46,
-0x46,
-0xef,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0xf7,
-0x62,
-0x62,
-0x62,
-0x34,
-0x34,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x3c,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x7f,
-0x46,
-0x86,
-0x0c,
-0x0c,
-0x18,
-0x18,
-0x30,
-0x30,
-0x61,
-0x62,
-0xfe,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x3c,
-0x30,
-0x30,
-0x30,
-0x30,
-0x30,
-0x30,
-0x30,
-0x30,
-0x30,
-0x30,
-0x3c,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0xc0,
-0xc0,
-0x60,
-0x60,
-0x30,
-0x30,
-0x18,
-0x18,
-0x0c,
-0x0c,
-0x06,
-0x06,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x3c,
-0x0c,
-0x0c,
-0x0c,
-0x0c,
-0x0c,
-0x0c,
-0x0c,
-0x0c,
-0x0c,
-0x0c,
-0x3c,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x10,
-0x38,
-0x4c,
-0x86,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0xff,
-0x00,
-0x00,
-
-0x00,
-0x18,
-0x20,
-0x30,
-0x38,
-0x10,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x78,
-0x8c,
-0x0c,
-0x3c,
-0xcc,
-0xcc,
-0xcd,
-0x76,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x20,
-0xe0,
-0x60,
-0x60,
-0x6c,
-0x76,
-0x66,
-0x66,
-0x66,
-0x66,
-0x76,
-0x6c,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x3c,
-0x66,
-0x60,
-0x60,
-0x60,
-0x60,
-0x62,
-0x3c,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x04,
-0x1c,
-0x0c,
-0x0c,
-0x6c,
-0xdc,
-0xcc,
-0xcc,
-0xcc,
-0xcc,
-0xdc,
-0x66,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x3c,
-0x66,
-0x7e,
-0x60,
-0x60,
-0x60,
-0x62,
-0x3c,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x1e,
-0x31,
-0x33,
-0x30,
-0x30,
-0x78,
-0x30,
-0x30,
-0x30,
-0x30,
-0x30,
-0x78,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x7b,
-0xce,
-0xcc,
-0xcc,
-0xcc,
-0x78,
-0x60,
-0x7c,
-0x86,
-0xc6,
-0x7c,
-
-0x00,
-0x20,
-0xe0,
-0x60,
-0x60,
-0x6c,
-0x76,
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-0xf7,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x10,
-0x38,
-0x10,
-0x00,
-0x18,
-0x38,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x3c,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x08,
-0x1c,
-0x08,
-0x00,
-0x0c,
-0x1c,
-0x0c,
-0x0c,
-0x0c,
-0x0c,
-0x0c,
-0x6c,
-0x4c,
-0x38,
-0x00,
-
-0x00,
-0x20,
-0xe0,
-0x60,
-0x60,
-0x67,
-0x66,
-0x6c,
-0x78,
-0x6c,
-0x6c,
-0x66,
-0xe7,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x08,
-0x38,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x3c,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x6a,
-0xfe,
-0x6a,
-0x6a,
-0x6a,
-0x62,
-0x62,
-0xf7,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x5c,
-0xf6,
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-0xf7,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x3c,
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-0x3c,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x5c,
-0xe6,
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-0x7c,
-0x60,
-0x60,
-0xf0,
-
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x76,
-0xcc,
-0xcc,
-0xcc,
-0xcc,
-0xcc,
-0xcc,
-0x7c,
-0x0c,
-0x0c,
-0x1e,
-
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x5e,
-0xf6,
-0x60,
-0x60,
-0x60,
-0x60,
-0x60,
-0xf0,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x7a,
-0xc6,
-0x72,
-0x1c,
-0x06,
-0x86,
-0xc6,
-0xbc,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x00,
-0x00,
-0x10,
-0x30,
-0x7c,
-0x30,
-0x30,
-0x30,
-0x30,
-0x30,
-0x34,
-0x18,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0xee,
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-0x67,
-0x3a,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0xf7,
-0x62,
-0x76,
-0x34,
-0x34,
-0x3c,
-0x18,
-0x18,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0xf7,
-0x62,
-0x6a,
-0x6a,
-0x6a,
-0x6a,
-0x7e,
-0x24,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0xf7,
-0x62,
-0x34,
-0x18,
-0x2c,
-0x46,
-0x46,
-0xef,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0xf7,
-0x62,
-0x62,
-0x34,
-0x34,
-0x18,
-0x18,
-0x18,
-0x10,
-0xb0,
-0xe0,
-
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0xfe,
-0x8c,
-0x18,
-0x30,
-0x30,
-0x60,
-0xc2,
-0xfe,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x0e,
-0x18,
-0x10,
-0x10,
-0x08,
-0x70,
-0x70,
-0x08,
-0x10,
-0x10,
-0x18,
-0x0e,
-0x00,
-0x00,
-0x00,
-
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x00,
-0x00,
-
-0x00,
-0x70,
-0x18,
-0x08,
-0x08,
-0x10,
-0x0e,
-0x0e,
-0x10,
-0x08,
-0x08,
-0x18,
-0x70,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x76,
-0xdc,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x00,
-0x00,
-0x00,
-0x10,
-0x38,
-0x6c,
-0xc6,
-0xc6,
-0xc6,
-0xfe,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x00,
-0x3a,
-0x66,
-0xc2,
-0xc0,
-0xc0,
-0xc0,
-0xc0,
-0xc0,
-0x62,
-0x3c,
-0x18,
-0x0c,
-0x24,
-0x18,
-
-0x00,
-0x00,
-0x66,
-0x00,
-0x00,
-0xee,
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-0x3b,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x0c,
-0x18,
-0x20,
-0x00,
-0x3c,
-0x66,
-0x7e,
-0x60,
-0x60,
-0x60,
-0x62,
-0x3c,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x30,
-0x58,
-0x8c,
-0x00,
-0x78,
-0x8c,
-0x0c,
-0x3c,
-0xcc,
-0xcc,
-0xcd,
-0x76,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x00,
-0x66,
-0x00,
-0x00,
-0x78,
-0x8c,
-0x0c,
-0x3c,
-0xcc,
-0xcc,
-0xcd,
-0x76,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x30,
-0x18,
-0x04,
-0x00,
-0x78,
-0x8c,
-0x0c,
-0x3c,
-0xcc,
-0xcc,
-0xcd,
-0x76,
-0x00,
-0x00,
-0x00,
-
-0x38,
-0x44,
-0x44,
-0x38,
-0x00,
-0x78,
-0x8c,
-0x0c,
-0x3c,
-0xcc,
-0xcc,
-0xcd,
-0x76,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x3c,
-0x66,
-0x60,
-0x60,
-0x60,
-0x60,
-0x62,
-0x3c,
-0x08,
-0x24,
-0x18,
-
-0x00,
-0x18,
-0x2c,
-0x46,
-0x00,
-0x3c,
-0x66,
-0x7e,
-0x60,
-0x60,
-0x60,
-0x62,
-0x3c,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x00,
-0x66,
-0x00,
-0x00,
-0x3c,
-0x66,
-0x7e,
-0x60,
-0x60,
-0x60,
-0x62,
-0x3c,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x30,
-0x18,
-0x04,
-0x00,
-0x3c,
-0x66,
-0x7e,
-0x60,
-0x60,
-0x60,
-0x62,
-0x3c,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x00,
-0x66,
-0x00,
-0x00,
-0x38,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x3c,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x18,
-0x2c,
-0x46,
-0x00,
-0x38,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x3c,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x60,
-0x30,
-0x08,
-0x00,
-0x38,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x3c,
-0x00,
-0x00,
-0x00,
-
-0x66,
-0x18,
-0x18,
-0x18,
-0x3c,
-0x2c,
-0x2c,
-0x2c,
-0x7e,
-0x46,
-0x46,
-0x46,
-0xef,
-0x00,
-0x00,
-0x00,
-
-0x18,
-0x24,
-0x18,
-0x18,
-0x3c,
-0x2c,
-0x2c,
-0x2c,
-0x7e,
-0x46,
-0x46,
-0x46,
-0xef,
-0x00,
-0x00,
-0x00,
-
-0x0c,
-0x18,
-0xff,
-0x61,
-0x60,
-0x60,
-0x64,
-0x7c,
-0x64,
-0x60,
-0x60,
-0x61,
-0xfe,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x76,
-0x9b,
-0x1b,
-0x3f,
-0xd8,
-0xd8,
-0xd9,
-0x6e,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x1f,
-0x1d,
-0x1d,
-0x3c,
-0x2c,
-0x2e,
-0x2c,
-0x7c,
-0x4c,
-0x4c,
-0x4d,
-0xef,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x18,
-0x2c,
-0x46,
-0x00,
-0x3c,
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-0x3c,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x00,
-0x66,
-0x00,
-0x00,
-0x3c,
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-0x3c,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x30,
-0x18,
-0x04,
-0x00,
-0x3c,
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-0x3c,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x18,
-0x2c,
-0x46,
-0x00,
-0xee,
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-0x67,
-0x3a,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x30,
-0x18,
-0x04,
-0x00,
-0xee,
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-0x67,
-0x3a,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x00,
-0x66,
-0x00,
-0x00,
-0xf7,
-0x62,
-0x62,
-0x34,
-0x34,
-0x18,
-0x18,
-0x18,
-0x10,
-0xb0,
-0xe0,
-
-0x66,
-0x00,
-0x3c,
-0x66,
-0xc3,
-0xc3,
-0xc3,
-0xc3,
-0xc3,
-0xc3,
-0xc3,
-0x66,
-0x3c,
-0x00,
-0x00,
-0x00,
-
-0x66,
-0x00,
-0xf7,
-0x62,
-0x62,
-0x62,
-0x62,
-0x62,
-0x62,
-0x62,
-0x62,
-0x62,
-0x3c,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x00,
-0x10,
-0x10,
-0x10,
-0x7c,
-0xc6,
-0xc0,
-0xc0,
-0xc0,
-0xc0,
-0xc2,
-0x7c,
-0x10,
-0x10,
-0x00,
-
-0x00,
-0x38,
-0x64,
-0x6c,
-0x60,
-0x60,
-0xf0,
-0x60,
-0x60,
-0x60,
-0x60,
-0x66,
-0xfc,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x81,
-0xc3,
-0x66,
-0x3c,
-0x18,
-0xff,
-0x18,
-0x18,
-0xff,
-0x18,
-0x18,
-0x18,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0xfe,
-0x63,
-0x63,
-0x63,
-0x63,
-0x6e,
-0x60,
-0x64,
-0x6e,
-0x64,
-0x64,
-0xf5,
-0x06,
-0x00,
-0x00,
-
-0x00,
-0x0e,
-0x19,
-0x1b,
-0x18,
-0x18,
-0x3c,
-0x18,
-0x18,
-0x18,
-0x18,
-0xd8,
-0x98,
-0x70,
-0x00,
-0x00,
-
-0x00,
-0x0c,
-0x18,
-0x20,
-0x00,
-0x78,
-0x8c,
-0x0c,
-0x3c,
-0xcc,
-0xcc,
-0xcd,
-0x76,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x06,
-0x0c,
-0x10,
-0x00,
-0x38,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x3c,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x0c,
-0x18,
-0x20,
-0x00,
-0x3c,
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-0x3c,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x0c,
-0x18,
-0x20,
-0x00,
-0xee,
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-0x67,
-0x3a,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x00,
-0x32,
-0x4c,
-0x00,
-0x5c,
-0xf6,
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-0xf7,
-0x00,
-0x00,
-0x00,
-
-0x32,
-0x4c,
-0x00,
-0xe7,
-0x72,
-0x52,
-0x5a,
-0x4a,
-0x4e,
-0x46,
-0x46,
-0x42,
-0xe2,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x78,
-0x8c,
-0x0c,
-0x3c,
-0xcc,
-0xcc,
-0xcd,
-0x76,
-0x00,
-0xfe,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x3c,
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-0x3c,
-0x00,
-0x7e,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x30,
-0x30,
-0x00,
-0x30,
-0x10,
-0x10,
-0x20,
-0x40,
-0xc0,
-0xc6,
-0xc2,
-0x7c,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0xfe,
-0xc0,
-0xc0,
-0xc0,
-0xc0,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0xfe,
-0x06,
-0x06,
-0x06,
-0x06,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x20,
-0xe0,
-0x63,
-0x66,
-0xfc,
-0x18,
-0x30,
-0x60,
-0xce,
-0x93,
-0x06,
-0x0c,
-0x1f,
-0x00,
-0x00,
-
-0x00,
-0x20,
-0xe0,
-0x63,
-0x66,
-0xfc,
-0x18,
-0x30,
-0x64,
-0xc8,
-0x96,
-0x3f,
-0x06,
-0x06,
-0x00,
-0x00,
-
-0x00,
-0x18,
-0x18,
-0x00,
-0x08,
-0x18,
-0x18,
-0x18,
-0x3c,
-0x3c,
-0x3c,
-0x3c,
-0x18,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x36,
-0x6c,
-0xd8,
-0xd8,
-0x6c,
-0x36,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0xd8,
-0x6c,
-0x36,
-0x36,
-0x6c,
-0xd8,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-
-0x82,
-0x10,
-0x82,
-0x10,
-0x82,
-0x10,
-0x82,
-0x10,
-0x82,
-0x10,
-0x82,
-0x10,
-0x82,
-0x10,
-0x82,
-0x10,
-
-0x00,
-0x95,
-0x00,
-0xa9,
-0x00,
-0x95,
-0x00,
-0xa9,
-0x00,
-0x95,
-0x00,
-0xa9,
-0x00,
-0x95,
-0x00,
-0xa9,
-
-0x92,
-0x49,
-0x92,
-0x49,
-0x92,
-0x49,
-0x92,
-0x49,
-0x92,
-0x49,
-0x92,
-0x49,
-0x92,
-0x49,
-0x92,
-0x49,
-
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0xf8,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0xf8,
-0x18,
-0x18,
-0xf8,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-0xe6,
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0xfe,
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0xf8,
-0x18,
-0x18,
-0xf8,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-0xe6,
-0x06,
-0x06,
-0xe6,
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0xfe,
-0x06,
-0x06,
-0xe6,
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-0xe6,
-0x06,
-0x06,
-0xfe,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-0xfe,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0xf8,
-0x18,
-0x18,
-0xf8,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0xf8,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x1f,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0xff,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0xff,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x1f,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0xff,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0xff,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x1f,
-0x18,
-0x18,
-0x1f,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-0x67,
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-0x67,
-0x60,
-0x60,
-0x7f,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x7f,
-0x60,
-0x60,
-0x67,
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-0xe7,
-0x00,
-0x00,
-0xff,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0xff,
-0x00,
-0x00,
-0xe7,
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-0x67,
-0x60,
-0x60,
-0x67,
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0xff,
-0x00,
-0x00,
-0xff,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-0xe7,
-0x00,
-0x00,
-0xe7,
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0xff,
-0x00,
-0x00,
-0xff,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-0xff,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0xff,
-0x00,
-0x00,
-0xff,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0xff,
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-0x7f,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x1f,
-0x18,
-0x18,
-0x1f,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x1f,
-0x18,
-0x18,
-0x1f,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x7f,
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-0xff,
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0xff,
-0x00,
-0x00,
-0xff,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0xf8,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x1f,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-
-0xff,
-0xff,
-0xff,
-0xff,
-0xff,
-0xff,
-0xff,
-0xff,
-0xff,
-0xff,
-0xff,
-0xff,
-0xff,
-0xff,
-0xff,
-0xff,
-
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0xff,
-0xff,
-0xff,
-0xff,
-0xff,
-0xff,
-0xff,
-0xff,
-
-0xf0,
-0xf0,
-0xf0,
-0xf0,
-0xf0,
-0xf0,
-0xf0,
-0xf0,
-0xf0,
-0xf0,
-0xf0,
-0xf0,
-0xf0,
-0xf0,
-0xf0,
-0xf0,
-
-0x0f,
-0x0f,
-0x0f,
-0x0f,
-0x0f,
-0x0f,
-0x0f,
-0x0f,
-0x0f,
-0x0f,
-0x0f,
-0x0f,
-0x0f,
-0x0f,
-0x0f,
-0x0f,
-
-0xff,
-0xff,
-0xff,
-0xff,
-0xff,
-0xff,
-0xff,
-0xff,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x77,
-0xcc,
-0xcc,
-0xcc,
-0xcc,
-0xde,
-0x73,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x7c,
-0xc6,
-0xc6,
-0xc6,
-0xc4,
-0xc8,
-0xc4,
-0xc6,
-0xc6,
-0xc6,
-0xc6,
-0xdc,
-0xc0,
-0xc0,
-0x00,
-
-0x00,
-0xff,
-0x61,
-0x60,
-0x60,
-0x60,
-0x60,
-0x60,
-0x60,
-0x60,
-0x60,
-0x60,
-0xf0,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x00,
-0x00,
-0x00,
-0x01,
-0x7e,
-0xa4,
-0x24,
-0x2c,
-0x6c,
-0x6c,
-0x6c,
-0x48,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0xff,
-0xc1,
-0x60,
-0x30,
-0x18,
-0x0c,
-0x18,
-0x30,
-0x60,
-0xc0,
-0xc1,
-0xfe,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x7f,
-0xc8,
-0xc8,
-0xc8,
-0xc8,
-0xc8,
-0xc8,
-0x70,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x22,
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-0x7c,
-0x60,
-0x60,
-0x60,
-0xc0,
-
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x76,
-0xdc,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x10,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x38,
-0x10,
-0x7c,
-0xd6,
-0xd6,
-0xd6,
-0xd6,
-0xd6,
-0xd6,
-0x7c,
-0x10,
-0x38,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x38,
-0x6c,
-0xc6,
-0xc6,
-0xc6,
-0xfe,
-0xc6,
-0xc6,
-0xc6,
-0xc6,
-0x6c,
-0x38,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x3c,
-0x66,
-0xc3,
-0xc3,
-0xc3,
-0xc3,
-0xc3,
-0x66,
-0x24,
-0x24,
-0xa5,
-0xe7,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x1e,
-0x31,
-0x30,
-0x18,
-0x0c,
-0x3e,
-0x66,
-0x66,
-0x66,
-0x66,
-0x66,
-0x3c,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x00,
-0x00,
-0x00,
-0x6e,
-0xff,
-0x99,
-0x99,
-0x99,
-0x99,
-0xff,
-0x76,
-0x00,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x00,
-0x00,
-0x02,
-0x04,
-0x7c,
-0xca,
-0x92,
-0xa6,
-0x7c,
-0x40,
-0x80,
-0x00,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x1c,
-0x30,
-0x60,
-0x60,
-0x60,
-0x7c,
-0x60,
-0x60,
-0x60,
-0x60,
-0x30,
-0x1c,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x00,
-0x7c,
-0xc6,
-0xc6,
-0xc6,
-0xc6,
-0xc6,
-0xc6,
-0xc6,
-0xc6,
-0xc6,
-0xc6,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x00,
-0x00,
-0xfe,
-0x00,
-0x00,
-0x00,
-0x7c,
-0x00,
-0x00,
-0x00,
-0xfe,
-0x00,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x00,
-0x00,
-0x00,
-0x18,
-0x18,
-0x7e,
-0x18,
-0x18,
-0x00,
-0x00,
-0x7e,
-0x00,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x00,
-0x00,
-0x30,
-0x18,
-0x0c,
-0x06,
-0x0c,
-0x18,
-0x30,
-0x00,
-0x7e,
-0x00,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x00,
-0x00,
-0x0c,
-0x18,
-0x30,
-0x60,
-0x30,
-0x18,
-0x0c,
-0x00,
-0x7e,
-0x00,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x00,
-0x00,
-0x0e,
-0x19,
-0x1b,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0x18,
-0xd8,
-0x98,
-0x70,
-0x00,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x00,
-0x00,
-0x00,
-0x18,
-0x18,
-0x00,
-0x7e,
-0x00,
-0x18,
-0x18,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x76,
-0xdc,
-0x00,
-0x00,
-0x76,
-0xdc,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x38,
-0x44,
-0x44,
-0x44,
-0x38,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x18,
-0x18,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x18,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x00,
-0x07,
-0x06,
-0x06,
-0x0c,
-0x0c,
-0x08,
-0x98,
-0xd0,
-0xf0,
-0x60,
-0x20,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0xcc,
-0x76,
-0x66,
-0x66,
-0x66,
-0x66,
-0xf7,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x70,
-0x98,
-0x18,
-0x30,
-0x60,
-0x88,
-0xf8,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x7c,
-0x64,
-0x64,
-0x64,
-0x64,
-0x64,
-0x7c,
-0x00,
-0x00,
-0x00,
-0x00,
-
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-0x00,
-
-};
-
-
-const struct font_desc font_rl = {
-        RL_IDX,
-        "RomanLarge",
-        8,
-        16,
-        patterns,
-        -1
-};
diff --git a/drivers/video/console/fonts.c b/drivers/video/console/fonts.c
index 9be83bed1959..4fd07d9eca03 100644
--- a/drivers/video/console/fonts.c
+++ b/drivers/video/console/fonts.c
@@ -64,10 +64,6 @@ static const struct font_desc *fonts[] = {
 #undef NO_FONTS
     &font_mini_4x6,
 #endif
-#ifdef CONFIG_FONT_RL
-#undef NO_FONTS
-    &font_rl,
-#endif
 };
 
 #define num_fonts (sizeof(fonts)/sizeof(*fonts))
diff --git a/drivers/video/dnfb.c b/drivers/video/dnfb.c
index 957a3ada2b75..5abd3cb00671 100644
--- a/drivers/video/dnfb.c
+++ b/drivers/video/dnfb.c
@@ -227,9 +227,8 @@ void dnfb_copyarea(struct fb_info *info, const struct fb_copyarea *area)
  * Initialization
  */
 
-static int __devinit dnfb_probe(struct device *device)
+static int __devinit dnfb_probe(struct platform_device *dev)
 {
-        struct platform_device *dev = to_platform_device(device);
         struct fb_info *info;
         int err = 0;
 
@@ -257,7 +256,7 @@ static int __devinit dnfb_probe(struct device *device)
                 framebuffer_release(info);
                 return err;
         }
-        dev_set_drvdata(&dev->dev, info);
+        platform_set_drvdata(dev, info);
 
         /* now we have registered we can safely setup the hardware */
         out_8(AP_CONTROL_3A, RESET_CREG);
@@ -271,10 +270,11 @@ static int __devinit dnfb_probe(struct device *device)
         return err;
 }
 
-static struct device_driver dnfb_driver = {
-        .name   = "dnfb",
-        .bus    = &platform_bus_type,
+static struct platform_driver dnfb_driver = {
         .probe  = dnfb_probe,
+        .driver = {
+                .name   = "dnfb",
+        },
 };
 
 static struct platform_device dnfb_device = {
@@ -288,12 +288,12 @@ int __init dnfb_init(void)
         if (fb_get_options("dnfb", NULL))
                 return -ENODEV;
 
-        ret = driver_register(&dnfb_driver);
+        ret = platform_driver_register(&dnfb_driver);
 
         if (!ret) {
                 ret = platform_device_register(&dnfb_device);
                 if (ret)
-                        driver_unregister(&dnfb_driver);
+                        platform_driver_unregister(&dnfb_driver);
         }
         return ret;
 }
diff --git a/drivers/video/epson1355fb.c b/drivers/video/epson1355fb.c
index 6a81a1dd8f3d..3b0e71383448 100644
--- a/drivers/video/epson1355fb.c
+++ b/drivers/video/epson1355fb.c
@@ -609,9 +609,9 @@ static void epson1355fb_platform_release(struct device *device)
 {
 }
 
-static int epson1355fb_remove(struct device *device)
+static int epson1355fb_remove(struct platform_device *dev)
 {
-        struct fb_info *info = dev_get_drvdata(device);
+        struct fb_info *info = platform_get_drvdata(dev);
         struct epson1355_par *par = info->par;
 
         backlight_enable(0);
@@ -632,9 +632,8 @@ static int epson1355fb_remove(struct device *device)
         return 0;
 }
 
-int __init epson1355fb_probe(struct device *device)
+int __init epson1355fb_probe(struct platform_device *dev)
 {
-        struct platform_device *dev = to_platform_device(device);
         struct epson1355_par *default_par;
         struct fb_info *info;
         u8 revision;
@@ -713,7 +712,7 @@ int __init epson1355fb_probe(struct device *device)
         /*
          * Our driver data.
          */
-        dev_set_drvdata(&dev->dev, info);
+        platform_set_drvdata(dev, info);
 
         printk(KERN_INFO "fb%d: %s frame buffer device\n",
                info->node, info->fix.id);
@@ -721,15 +720,16 @@ int __init epson1355fb_probe(struct device *device)
         return 0;
 
       bail:
-        epson1355fb_remove(device);
+        epson1355fb_remove(dev);
         return rc;
 }
 
-static struct device_driver epson1355fb_driver = {
-        .name   = "epson1355fb",
-        .bus    = &platform_bus_type,
+static struct platform_driver epson1355fb_driver = {
         .probe  = epson1355fb_probe,
         .remove = epson1355fb_remove,
+        .driver = {
+                .name   = "epson1355fb",
+        },
 };
 
 static struct platform_device epson1355fb_device = {
@@ -747,11 +747,11 @@ int __init epson1355fb_init(void)
         if (fb_get_options("epson1355fb", NULL))
                 return -ENODEV;
 
-        ret = driver_register(&epson1355fb_driver);
+        ret = platform_driver_register(&epson1355fb_driver);
         if (!ret) {
                 ret = platform_device_register(&epson1355fb_device);
                 if (ret)
-                        driver_unregister(&epson1355fb_driver);
+                        platform_driver_unregister(&epson1355fb_driver);
         }
         return ret;
 }
@@ -762,7 +762,7 @@ module_init(epson1355fb_init);
 static void __exit epson1355fb_exit(void)
 {
         platform_device_unregister(&epson1355fb_device);
-        driver_unregister(&epson1355fb_driver);
+        platform_driver_unregister(&epson1355fb_driver);
 }
 
 /* ------------------------------------------------------------------------- */
diff --git a/drivers/video/ffb.c b/drivers/video/ffb.c
index 04417dc16c2e..2584daec7bbf 100644
--- a/drivers/video/ffb.c
+++ b/drivers/video/ffb.c
@@ -57,6 +57,9 @@ static struct fb_ops ffb_ops = {
         .fb_sync                = ffb_sync,
         .fb_mmap                = ffb_mmap,
         .fb_ioctl               = ffb_ioctl,
+#ifdef CONFIG_COMPAT
+        .fb_compat_ioctl        = sbusfb_compat_ioctl,
+#endif
 };
 
 /* Register layout and definitions */
diff --git a/drivers/video/gbefb.c b/drivers/video/gbefb.c
index 9d5e4f342110..d744c51807b7 100644
--- a/drivers/video/gbefb.c
+++ b/drivers/video/gbefb.c
@@ -1105,12 +1105,11 @@ int __init gbefb_setup(char *options)
         return 0;
 }
 
-static int __init gbefb_probe(struct device *dev)
+static int __init gbefb_probe(struct platform_device *p_dev)
 {
         int i, ret = 0;
         struct fb_info *info;
         struct gbefb_par *par;
-        struct platform_device *p_dev = to_platform_device(dev);
 #ifndef MODULE
         char *options = NULL;
 #endif
@@ -1204,8 +1203,8 @@ static int __init gbefb_probe(struct device *dev)
                 goto out_gbe_unmap;
         }
 
-        dev_set_drvdata(&p_dev->dev, info);
-        gbefb_create_sysfs(dev);
+        platform_set_drvdata(p_dev, info);
+        gbefb_create_sysfs(&p_dev->dev);
 
         printk(KERN_INFO "fb%d: %s rev %d @ 0x%08x using %dkB memory\n",
                info->node, info->fix.id, gbe_revision, (unsigned) GBE_BASE,
@@ -1231,10 +1230,9 @@ out_release_framebuffer:
         return ret;
 }
 
-static int __devexit gbefb_remove(struct device* dev)
+static int __devexit gbefb_remove(struct platform_device* p_dev)
 {
-        struct platform_device *p_dev = to_platform_device(dev);
-        struct fb_info *info = dev_get_drvdata(&p_dev->dev);
+        struct fb_info *info = platform_get_drvdata(p_dev);
 
         unregister_framebuffer(info);
         gbe_turn_off();
@@ -1252,18 +1250,19 @@ static int __devexit gbefb_remove(struct device* dev)
         return 0;
 }
 
-static struct device_driver gbefb_driver = {
-        .name = "gbefb",
-        .bus = &platform_bus_type,
+static struct platform_driver gbefb_driver = {
         .probe = gbefb_probe,
         .remove = __devexit_p(gbefb_remove),
+        .driver = {
+                .name = "gbefb",
+        },
 };
 
 static struct platform_device *gbefb_device;
 
 int __init gbefb_init(void)
 {
-        int ret = driver_register(&gbefb_driver);
+        int ret = platform_driver_register(&gbefb_driver);
         if (!ret) {
                 gbefb_device = platform_device_alloc("gbefb", 0);
                 if (gbefb_device) {
@@ -1273,7 +1272,7 @@ int __init gbefb_init(void)
                 }
                 if (ret) {
                         platform_device_put(gbefb_device);
-                        driver_unregister(&gbefb_driver);
+                        platform_driver_unregister(&gbefb_driver);
                 }
         }
         return ret;
@@ -1282,7 +1281,7 @@ int __init gbefb_init(void)
 void __exit gbefb_exit(void)
 {
         platform_device_unregister(gbefb_device);
-        driver_unregister(&gbefb_driver);
+        platform_driver_unregister(&gbefb_driver);
 }
 
 module_init(gbefb_init);
diff --git a/drivers/video/imxfb.c b/drivers/video/imxfb.c
index e20b9f3a255f..5924cc225c95 100644
--- a/drivers/video/imxfb.c
+++ b/drivers/video/imxfb.c
@@ -423,18 +423,18 @@ static void imxfb_setup_gpio(struct imxfb_info *fbi)
  * Power management hooks.  Note that we won't be called from IRQ context,
  * unlike the blank functions above, so we may sleep.
  */
-static int imxfb_suspend(struct device *dev, pm_message_t state)
+static int imxfb_suspend(struct platform_device *dev, pm_message_t state)
 {
-        struct imxfb_info *fbi = dev_get_drvdata(dev);
+        struct imxfb_info *fbi = platform_get_drvdata(dev);
         pr_debug("%s\n",__FUNCTION__);
 
         imxfb_disable_controller(fbi);
         return 0;
 }
 
-static int imxfb_resume(struct device *dev)
+static int imxfb_resume(struct platform_device *dev)
 {
-        struct imxfb_info *fbi = dev_get_drvdata(dev);
+        struct imxfb_info *fbi = platform_get_drvdata(dev);
         pr_debug("%s\n",__FUNCTION__);
 
         imxfb_enable_controller(fbi);
@@ -538,9 +538,8 @@ static int __init imxfb_map_video_memory(struct fb_info *info)
         return fbi->map_cpu ? 0 : -ENOMEM;
 }
 
-static int __init imxfb_probe(struct device *dev)
+static int __init imxfb_probe(struct platform_device *pdev)
 {
-        struct platform_device *pdev = to_platform_device(dev);
         struct imxfb_info *fbi;
         struct fb_info *info;
         struct imxfb_mach_info *inf;
@@ -553,21 +552,21 @@ static int __init imxfb_probe(struct device *dev)
         if(!res)
                 return -ENODEV;
 
-        inf = dev->platform_data;
+        inf = pdev->dev.platform_data;
         if(!inf) {
                 dev_err(dev,"No platform_data available\n");
                 return -ENOMEM;
         }
 
-        info = framebuffer_alloc(sizeof(struct imxfb_info), dev);
+        info = framebuffer_alloc(sizeof(struct imxfb_info), &pdev->dev);
         if(!info)
                 return -ENOMEM;
 
         fbi = info->par;
 
-        dev_set_drvdata(dev, info);
+        platform_set_drvdata(pdev, info);
 
-        ret = imxfb_init_fbinfo(dev);
+        ret = imxfb_init_fbinfo(&pdev->dev);
         if( ret < 0 )
                 goto failed_init;
 
@@ -621,22 +620,21 @@ failed_register:
         fb_dealloc_cmap(&info->cmap);
 failed_cmap:
         if (!inf->fixed_screen_cpu)
-                dma_free_writecombine(dev,fbi->map_size,fbi->map_cpu,
+                dma_free_writecombine(&pdev->dev,fbi->map_size,fbi->map_cpu,
                            fbi->map_dma);
 failed_map:
         kfree(info->pseudo_palette);
 failed_regs:
         release_mem_region(res->start, res->end - res->start);
 failed_init:
-        dev_set_drvdata(dev, NULL);
+        platform_set_drvdata(pdev, NULL);
         framebuffer_release(info);
         return ret;
 }
 
-static int imxfb_remove(struct device *dev)
+static int imxfb_remove(struct platform_device *pdev)
 {
-        struct platform_device *pdev = to_platform_device(dev);
-        struct fb_info *info = dev_get_drvdata(dev);
+        struct fb_info *info = platform_get_drvdata(pdev);
         struct imxfb_info *fbi = info->par;
         struct resource *res;
 
@@ -651,36 +649,37 @@ static int imxfb_remove(struct device *dev)
         framebuffer_release(info);
 
         release_mem_region(res->start, res->end - res->start + 1);
-        dev_set_drvdata(dev, NULL);
+        platform_set_drvdata(pdev, NULL);
 
         return 0;
 }
 
-void  imxfb_shutdown(struct device * dev)
+void  imxfb_shutdown(struct platform_device * dev)
 {
-        struct fb_info *info = dev_get_drvdata(dev);
+        struct fb_info *info = platform_get_drvdata(dev);
         struct imxfb_info *fbi = info->par;
         imxfb_disable_controller(fbi);
 }
 
-static struct device_driver imxfb_driver = {
-        .name           = "imx-fb",
-        .bus            = &platform_bus_type,
+static struct platform_driver imxfb_driver = {
         .probe          = imxfb_probe,
         .suspend        = imxfb_suspend,
         .resume         = imxfb_resume,
         .remove         = imxfb_remove,
         .shutdown       = imxfb_shutdown,
+        .driver         = {
+                .name   = "imx-fb",
+        },
 };
 
 int __init imxfb_init(void)
 {
-        return driver_register(&imxfb_driver);
+        return platform_driver_register(&imxfb_driver);
 }
 
 static void __exit imxfb_cleanup(void)
 {
-        driver_unregister(&imxfb_driver);
+        platform_driver_unregister(&imxfb_driver);
 }
 
 module_init(imxfb_init);
diff --git a/drivers/video/leo.c b/drivers/video/leo.c
index 84a7fe435bb8..376d4a171ec7 100644
--- a/drivers/video/leo.c
+++ b/drivers/video/leo.c
@@ -51,6 +51,9 @@ static struct fb_ops leo_ops = {
         .fb_imageblit           = cfb_imageblit,
         .fb_mmap                = leo_mmap,
         .fb_ioctl               = leo_ioctl,
+#ifdef CONFIG_COMPAT
+        .fb_compat_ioctl        = sbusfb_compat_ioctl,
+#endif
 };
 
 #define LEO_OFF_LC_SS0_KRN      0x00200000UL
diff --git a/drivers/video/p9100.c b/drivers/video/p9100.c
index 9aaf65fb623a..18bcda23d2cf 100644
--- a/drivers/video/p9100.c
+++ b/drivers/video/p9100.c
@@ -48,6 +48,9 @@ static struct fb_ops p9100_ops = {
         .fb_imageblit           = cfb_imageblit,
         .fb_mmap                = p9100_mmap,
         .fb_ioctl               = p9100_ioctl,
+#ifdef CONFIG_COMPAT
+        .fb_compat_ioctl        = sbusfb_compat_ioctl,
+#endif
 };
 
 /* P9100 control registers */
diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c
index f305a5b77b23..7b4cd250bec8 100644
--- a/drivers/video/pxafb.c
+++ b/drivers/video/pxafb.c
@@ -980,17 +980,17 @@ pxafb_freq_policy(struct notifier_block *nb, unsigned long val, void *data)
  * Power management hooks.  Note that we won't be called from IRQ context,
  * unlike the blank functions above, so we may sleep.
  */
-static int pxafb_suspend(struct device *dev, pm_message_t state)
+static int pxafb_suspend(struct platform_device *dev, pm_message_t state)
 {
-        struct pxafb_info *fbi = dev_get_drvdata(dev);
+        struct pxafb_info *fbi = platform_get_drvdata(dev);
 
         set_ctrlr_state(fbi, C_DISABLE_PM);
         return 0;
 }
 
-static int pxafb_resume(struct device *dev)
+static int pxafb_resume(struct platform_device *dev)
 {
-        struct pxafb_info *fbi = dev_get_drvdata(dev);
+        struct pxafb_info *fbi = platform_get_drvdata(dev);
 
         set_ctrlr_state(fbi, C_ENABLE_PM);
         return 0;
@@ -1268,7 +1268,7 @@ static int __init pxafb_parse_options(struct device *dev, char *options)
 }
 #endif
 
-int __init pxafb_probe(struct device *dev)
+int __init pxafb_probe(struct platform_device *dev)
 {
         struct pxafb_info *fbi;
         struct pxafb_mach_info *inf;
@@ -1276,14 +1276,14 @@ int __init pxafb_probe(struct device *dev)
 
         dev_dbg(dev, "pxafb_probe\n");
 
-        inf = dev->platform_data;
+        inf = dev->dev.platform_data;
         ret = -ENOMEM;
         fbi = NULL;
         if (!inf)
                 goto failed;
 
 #ifdef CONFIG_FB_PXA_PARAMETERS
-        ret = pxafb_parse_options(dev, g_options);
+        ret = pxafb_parse_options(&dev->dev, g_options);
         if (ret < 0)
                 goto failed;
 #endif
@@ -1293,36 +1293,36 @@ int __init pxafb_probe(struct device *dev)
          * a warning is given. */
 
         if (inf->lccr0 & LCCR0_INVALID_CONFIG_MASK)
-                dev_warn(dev, "machine LCCR0 setting contains illegal bits: %08x\n",
+                dev_warn(&dev->dev, "machine LCCR0 setting contains illegal bits: %08x\n",
                         inf->lccr0 & LCCR0_INVALID_CONFIG_MASK);
         if (inf->lccr3 & LCCR3_INVALID_CONFIG_MASK)
-                dev_warn(dev, "machine LCCR3 setting contains illegal bits: %08x\n",
+                dev_warn(&dev->dev, "machine LCCR3 setting contains illegal bits: %08x\n",
                         inf->lccr3 & LCCR3_INVALID_CONFIG_MASK);
         if (inf->lccr0 & LCCR0_DPD &&
             ((inf->lccr0 & LCCR0_PAS) != LCCR0_Pas ||
              (inf->lccr0 & LCCR0_SDS) != LCCR0_Sngl ||
              (inf->lccr0 & LCCR0_CMS) != LCCR0_Mono))
-                dev_warn(dev, "Double Pixel Data (DPD) mode is only valid in passive mono"
+                dev_warn(&dev->dev, "Double Pixel Data (DPD) mode is only valid in passive mono"
                          " single panel mode\n");
         if ((inf->lccr0 & LCCR0_PAS) == LCCR0_Act &&
             (inf->lccr0 & LCCR0_SDS) == LCCR0_Dual)
-                dev_warn(dev, "Dual panel only valid in passive mode\n");
+                dev_warn(&dev->dev, "Dual panel only valid in passive mode\n");
         if ((inf->lccr0 & LCCR0_PAS) == LCCR0_Pas &&
              (inf->upper_margin || inf->lower_margin))
-                dev_warn(dev, "Upper and lower margins must be 0 in passive mode\n");
+                dev_warn(&dev->dev, "Upper and lower margins must be 0 in passive mode\n");
 #endif
 
-        dev_dbg(dev, "got a %dx%dx%d LCD\n",inf->xres, inf->yres, inf->bpp);
+        dev_dbg(&dev->dev, "got a %dx%dx%d LCD\n",inf->xres, inf->yres, inf->bpp);
         if (inf->xres == 0 || inf->yres == 0 || inf->bpp == 0) {
-                dev_err(dev, "Invalid resolution or bit depth\n");
+                dev_err(&dev->dev, "Invalid resolution or bit depth\n");
                 ret = -EINVAL;
                 goto failed;
         }
         pxafb_backlight_power = inf->pxafb_backlight_power;
         pxafb_lcd_power = inf->pxafb_lcd_power;
-        fbi = pxafb_init_fbinfo(dev);
+        fbi = pxafb_init_fbinfo(&dev->dev);
         if (!fbi) {
-                dev_err(dev, "Failed to initialize framebuffer device\n");
+                dev_err(&dev->dev, "Failed to initialize framebuffer device\n");
                 ret = -ENOMEM; // only reason for pxafb_init_fbinfo to fail is kmalloc
                 goto failed;
         }
@@ -1330,14 +1330,14 @@ int __init pxafb_probe(struct device *dev)
         /* Initialize video memory */
         ret = pxafb_map_video_memory(fbi);
         if (ret) {
-                dev_err(dev, "Failed to allocate video RAM: %d\n", ret);
+                dev_err(&dev->dev, "Failed to allocate video RAM: %d\n", ret);
                 ret = -ENOMEM;
                 goto failed;
         }
 
         ret = request_irq(IRQ_LCD, pxafb_handle_irq, SA_INTERRUPT, "LCD", fbi);
         if (ret) {
-                dev_err(dev, "request_irq failed: %d\n", ret);
+                dev_err(&dev->dev, "request_irq failed: %d\n", ret);
                 ret = -EBUSY;
                 goto failed;
         }
@@ -1349,11 +1349,11 @@ int __init pxafb_probe(struct device *dev)
         pxafb_check_var(&fbi->fb.var, &fbi->fb);
         pxafb_set_par(&fbi->fb);
 
-        dev_set_drvdata(dev, fbi);
+        platform_set_drvdata(dev, fbi);
 
         ret = register_framebuffer(&fbi->fb);
         if (ret < 0) {
-                dev_err(dev, "Failed to register framebuffer device: %d\n", ret);
+                dev_err(&dev->dev, "Failed to register framebuffer device: %d\n", ret);
                 goto failed;
         }
 
@@ -1376,19 +1376,20 @@ int __init pxafb_probe(struct device *dev)
         return 0;
 
 failed:
-        dev_set_drvdata(dev, NULL);
+        platform_set_drvdata(dev, NULL);
         kfree(fbi);
         return ret;
 }
 
-static struct device_driver pxafb_driver = {
-        .name           = "pxa2xx-fb",
-        .bus            = &platform_bus_type,
+static struct platform_driver pxafb_driver = {
         .probe          = pxafb_probe,
 #ifdef CONFIG_PM
         .suspend        = pxafb_suspend,
         .resume         = pxafb_resume,
 #endif
+        .driver         = {
+                .name   = "pxa2xx-fb",
+        },
 };
 
 #ifndef MODULE
@@ -1415,7 +1416,7 @@ int __devinit pxafb_init(void)
                 return -ENODEV;
         pxafb_setup(option);
 #endif
-        return driver_register(&pxafb_driver);
+        return platform_driver_register(&pxafb_driver);
 }
 
 module_init(pxafb_init);
diff --git a/drivers/video/q40fb.c b/drivers/video/q40fb.c
index bfc41f2c902a..fc91dbf896d2 100644
--- a/drivers/video/q40fb.c
+++ b/drivers/video/q40fb.c
@@ -86,9 +86,8 @@ static struct fb_ops q40fb_ops = {
         .fb_imageblit   = cfb_imageblit,
 };
 
-static int __init q40fb_probe(struct device *device)
+static int __init q40fb_probe(struct platform_device *dev)
 {
-        struct platform_device *dev = to_platform_device(device);
         struct fb_info *info;
 
         if (!MACH_IS_Q40)
@@ -128,10 +127,11 @@ static int __init q40fb_probe(struct device *device)
         return 0;
 }
 
-static struct device_driver q40fb_driver = {
-        .name   = "q40fb",
-        .bus    = &platform_bus_type,
+static struct platform_driver q40fb_driver = {
         .probe  = q40fb_probe,
+        .driver = {
+                .name   = "q40fb",
+        },
 };
 
 static struct platform_device q40fb_device = {
@@ -145,12 +145,12 @@ int __init q40fb_init(void)
         if (fb_get_options("q40fb", NULL))
                 return -ENODEV;
 
-        ret = driver_register(&q40fb_driver);
+        ret = platform_driver_register(&q40fb_driver);
 
         if (!ret) {
                 ret = platform_device_register(&q40fb_device);
                 if (ret)
-                        driver_unregister(&q40fb_driver);
+                        platform_driver_unregister(&q40fb_driver);
         }
         return ret;
 }
diff --git a/drivers/video/s1d13xxxfb.c b/drivers/video/s1d13xxxfb.c
index 3edbd14c5c46..e5d0f92eeae3 100644
--- a/drivers/video/s1d13xxxfb.c
+++ b/drivers/video/s1d13xxxfb.c
@@ -503,10 +503,9 @@ s1d13xxxfb_fetch_hw_state(struct fb_info *info)
 
 
 static int
-s1d13xxxfb_remove(struct device *dev)
+s1d13xxxfb_remove(struct platform_device *pdev)
 {
-        struct fb_info *info = dev_get_drvdata(dev);
-        struct platform_device *pdev = to_platform_device(dev);
+        struct fb_info *info = platform_get_drvdata(pdev);
         struct s1d13xxxfb_par *par = NULL;
 
         if (info) {
@@ -534,9 +533,8 @@ s1d13xxxfb_remove(struct device *dev)
 }
 
 static int __devinit
-s1d13xxxfb_probe(struct device *dev)
+s1d13xxxfb_probe(struct platform_device *pdev)
 {
-        struct platform_device *pdev = to_platform_device(dev);
         struct s1d13xxxfb_par *default_par;
         struct fb_info *info;
         struct s1d13xxxfb_pdata *pdata = NULL;
@@ -548,8 +546,8 @@ s1d13xxxfb_probe(struct device *dev)
         printk(KERN_INFO "Epson S1D13XXX FB Driver\n");
 
         /* enable platform-dependent hardware glue, if any */
-        if (dev->platform_data)
-                pdata = dev->platform_data;
+        if (pdev->dev.platform_data)
+                pdata = pdev->dev.platform_data;
 
         if (pdata && pdata->platform_init_video)
                 pdata->platform_init_video();
@@ -572,14 +570,14 @@ s1d13xxxfb_probe(struct device *dev)
 
         if (!request_mem_region(pdev->resource[0].start,
                 pdev->resource[0].end - pdev->resource[0].start +1, "s1d13xxxfb mem")) {
-                dev_dbg(dev, "request_mem_region failed\n");
+                dev_dbg(&pdev->dev, "request_mem_region failed\n");
                 ret = -EBUSY;
                 goto bail;
         }
 
         if (!request_mem_region(pdev->resource[1].start,
                 pdev->resource[1].end - pdev->resource[1].start +1, "s1d13xxxfb regs")) {
-                dev_dbg(dev, "request_mem_region failed\n");
+                dev_dbg(&pdev->dev, "request_mem_region failed\n");
                 ret = -EBUSY;
                 goto bail;
         }
@@ -640,7 +638,7 @@ s1d13xxxfb_probe(struct device *dev)
                 goto bail;
         }
 
-        dev_set_drvdata(&pdev->dev, info);
+        platform_set_drvdata(pdev, info);
 
         printk(KERN_INFO "fb%d: %s frame buffer device\n",
                info->node, info->fix.id);
@@ -648,15 +646,15 @@ s1d13xxxfb_probe(struct device *dev)
         return 0;
 
 bail:
-        s1d13xxxfb_remove(dev);
+        s1d13xxxfb_remove(pdev);
         return ret;
 
 }
 
 #ifdef CONFIG_PM
-static int s1d13xxxfb_suspend(struct device *dev, pm_message_t state)
+static int s1d13xxxfb_suspend(struct platform_device *dev, pm_message_t state)
 {
-        struct fb_info *info = dev_get_drvdata(dev);
+        struct fb_info *info = platform_get_drvdata(dev);
         struct s1d13xxxfb_par *s1dfb = info->par;
         struct s1d13xxxfb_pdata *pdata = NULL;
 
@@ -664,8 +662,8 @@ static int s1d13xxxfb_suspend(struct device *dev, pm_message_t state)
         lcd_enable(s1dfb, 0);
         crt_enable(s1dfb, 0);
 
-        if (dev->platform_data)
-                pdata = dev->platform_data;
+        if (dev->dev.platform_data)
+                pdata = dev->dev.platform_data;
 
 #if 0
         if (!s1dfb->disp_save)
@@ -701,9 +699,9 @@ static int s1d13xxxfb_suspend(struct device *dev, pm_message_t state)
                 return 0;
 }
 
-static int s1d13xxxfb_resume(struct device *dev)
+static int s1d13xxxfb_resume(struct platform_device *dev)
 {
-        struct fb_info *info = dev_get_drvdata(dev);
+        struct fb_info *info = platform_get_drvdata(dev);
         struct s1d13xxxfb_par *s1dfb = info->par;
         struct s1d13xxxfb_pdata *pdata = NULL;
 
@@ -714,8 +712,8 @@ static int s1d13xxxfb_resume(struct device *dev)
         while ((s1d13xxxfb_readreg(s1dfb, S1DREG_PS_STATUS) & 0x01))
                 udelay(10);
 
-        if (dev->platform_data)
-                pdata = dev->platform_data;
+        if (dev->dev.platform_data)
+                pdata = dev->dev.platform_data;
 
         if (s1dfb->regs_save) {
                 /* will write RO regs, *should* get away with it :) */
@@ -741,15 +739,16 @@ static int s1d13xxxfb_resume(struct device *dev)
 }
 #endif /* CONFIG_PM */
 
-static struct device_driver s1d13xxxfb_driver = {
-        .name           = S1D_DEVICENAME,
-        .bus            = &platform_bus_type,
+static struct platform_driver s1d13xxxfb_driver = {
         .probe          = s1d13xxxfb_probe,
         .remove         = s1d13xxxfb_remove,
 #ifdef CONFIG_PM
         .suspend        = s1d13xxxfb_suspend,
-        .resume         = s1d13xxxfb_resume
+        .resume         = s1d13xxxfb_resume,
 #endif
+        .driver         = {
+                .name   = S1D_DEVICENAME,
+        },
 };
 
 
@@ -759,14 +758,14 @@ s1d13xxxfb_init(void)
         if (fb_get_options("s1d13xxxfb", NULL))
                 return -ENODEV;
 
-        return driver_register(&s1d13xxxfb_driver);
+        return platform_driver_register(&s1d13xxxfb_driver);
 }
 
 
 static void __exit
 s1d13xxxfb_exit(void)
 {
-        driver_unregister(&s1d13xxxfb_driver);
+        platform_driver_unregister(&s1d13xxxfb_driver);
 }
 
 module_init(s1d13xxxfb_init);
diff --git a/drivers/video/s3c2410fb.c b/drivers/video/s3c2410fb.c
index 855a6778b9eb..ce6e749db3a7 100644
--- a/drivers/video/s3c2410fb.c
+++ b/drivers/video/s3c2410fb.c
@@ -634,19 +634,18 @@ static irqreturn_t s3c2410fb_irq(int irq, void *dev_id, struct pt_regs *r)
 
 static char driver_name[]="s3c2410fb";
 
-int __init s3c2410fb_probe(struct device *dev)
+int __init s3c2410fb_probe(struct platform_device *pdev)
 {
         struct s3c2410fb_info *info;
         struct fb_info     *fbinfo;
-        struct platform_device *pdev = to_platform_device(dev);
         struct s3c2410fb_hw *mregs;
         int ret;
         int irq;
         int i;
 
-        mach_info = dev->platform_data;
+        mach_info = pdev->dev.platform_data;
         if (mach_info == NULL) {
-                dev_err(dev,"no platform data for lcd, cannot attach\n");
+                dev_err(&pdev->dev,"no platform data for lcd, cannot attach\n");
                 return -EINVAL;
         }
 
@@ -654,11 +653,11 @@ int __init s3c2410fb_probe(struct device *dev)
 
         irq = platform_get_irq(pdev, 0);
         if (irq < 0) {
-                dev_err(dev, "no irq for device\n");
+                dev_err(&pdev->dev, "no irq for device\n");
                 return -ENOENT;
         }
 
-        fbinfo = framebuffer_alloc(sizeof(struct s3c2410fb_info), dev);
+        fbinfo = framebuffer_alloc(sizeof(struct s3c2410fb_info), &pdev->dev);
         if (!fbinfo) {
                 return -ENOMEM;
         }
@@ -666,7 +665,7 @@ int __init s3c2410fb_probe(struct device *dev)
 
         info = fbinfo->par;
         info->fb = fbinfo;
-        dev_set_drvdata(dev, fbinfo);
+        platform_set_drvdata(pdev, fbinfo);
 
         s3c2410fb_init_registers(info);
 
@@ -676,7 +675,7 @@ int __init s3c2410fb_probe(struct device *dev)
 
         memcpy(&info->regs, &mach_info->regs, sizeof(info->regs));
 
-        info->mach_info             = dev->platform_data;
+        info->mach_info             = pdev->dev.platform_data;
 
         fbinfo->fix.type            = FB_TYPE_PACKED_PIXELS;
         fbinfo->fix.type_aux        = 0;
@@ -735,7 +734,7 @@ int __init s3c2410fb_probe(struct device *dev)
 
         ret = request_irq(irq, s3c2410fb_irq, SA_INTERRUPT, pdev->name, info);
         if (ret) {
-                dev_err(dev, "cannot get irq %d - err %d\n", irq, ret);
+                dev_err(&pdev->dev, "cannot get irq %d - err %d\n", irq, ret);
                 ret = -EBUSY;
                 goto release_mem;
         }
@@ -773,7 +772,7 @@ int __init s3c2410fb_probe(struct device *dev)
         }
 
         /* create device files */
-        device_create_file(dev, &dev_attr_debug);
+        device_create_file(&pdev->dev, &dev_attr_debug);
 
         printk(KERN_INFO "fb%d: %s frame buffer device\n",
                 fbinfo->node, fbinfo->fix.id);
@@ -816,10 +815,9 @@ static void s3c2410fb_stop_lcd(void)
 /*
  *  Cleanup
  */
-static int s3c2410fb_remove(struct device *dev)
+static int s3c2410fb_remove(struct platform_device *pdev)
 {
-        struct platform_device *pdev = to_platform_device(dev);
-        struct fb_info     *fbinfo = dev_get_drvdata(dev);
+        struct fb_info     *fbinfo = platform_get_drvdata(pdev);
         struct s3c2410fb_info *info = fbinfo->par;
         int irq;
 
@@ -847,9 +845,9 @@ static int s3c2410fb_remove(struct device *dev)
 
 /* suspend and resume support for the lcd controller */
 
-static int s3c2410fb_suspend(struct device *dev, pm_message_t state)
+static int s3c2410fb_suspend(struct platform_device *dev, pm_message_t state)
 {
-        struct fb_info     *fbinfo = dev_get_drvdata(dev);
+        struct fb_info     *fbinfo = platform_get_drvdata(dev);
         struct s3c2410fb_info *info = fbinfo->par;
 
         s3c2410fb_stop_lcd();
@@ -864,9 +862,9 @@ static int s3c2410fb_suspend(struct device *dev, pm_message_t state)
         return 0;
 }
 
-static int s3c2410fb_resume(struct device *dev)
+static int s3c2410fb_resume(struct platform_device *dev)
 {
-        struct fb_info     *fbinfo = dev_get_drvdata(dev);
+        struct fb_info     *fbinfo = platform_get_drvdata(dev);
         struct s3c2410fb_info *info = fbinfo->par;
 
         clk_enable(info->clk);
@@ -882,24 +880,25 @@ static int s3c2410fb_resume(struct device *dev)
 #define s3c2410fb_resume  NULL
 #endif
 
-static struct device_driver s3c2410fb_driver = {
-        .name           = "s3c2410-lcd",
-        .owner          = THIS_MODULE,
-        .bus            = &platform_bus_type,
+static struct platform_driver s3c2410fb_driver = {
         .probe          = s3c2410fb_probe,
+        .remove         = s3c2410fb_remove,
         .suspend        = s3c2410fb_suspend,
         .resume         = s3c2410fb_resume,
-        .remove         = s3c2410fb_remove
+        .driver         = {
+                .name   = "s3c2410-lcd",
+                .owner  = THIS_MODULE,
+        },
 };
 
 int __devinit s3c2410fb_init(void)
 {
-        return driver_register(&s3c2410fb_driver);
+        return platform_driver_register(&s3c2410fb_driver);
 }
 
 static void __exit s3c2410fb_cleanup(void)
 {
-        driver_unregister(&s3c2410fb_driver);
+        platform_driver_unregister(&s3c2410fb_driver);
 }
 
 
diff --git a/drivers/video/sa1100fb.c b/drivers/video/sa1100fb.c
index a5184575cfae..2ea1354e439f 100644
--- a/drivers/video/sa1100fb.c
+++ b/drivers/video/sa1100fb.c
@@ -1308,17 +1308,17 @@ sa1100fb_freq_policy(struct notifier_block *nb, unsigned long val,
  * Power management hooks.  Note that we won't be called from IRQ context,
  * unlike the blank functions above, so we may sleep.
  */
-static int sa1100fb_suspend(struct device *dev, pm_message_t state)
+static int sa1100fb_suspend(struct platform_device *dev, pm_message_t state)
 {
-        struct sa1100fb_info *fbi = dev_get_drvdata(dev);
+        struct sa1100fb_info *fbi = platform_get_drvdata(dev);
 
         set_ctrlr_state(fbi, C_DISABLE_PM);
         return 0;
 }
 
-static int sa1100fb_resume(struct device *dev)
+static int sa1100fb_resume(struct platform_device *dev)
 {
-        struct sa1100fb_info *fbi = dev_get_drvdata(dev);
+        struct sa1100fb_info *fbi = platform_get_drvdata(dev);
 
         set_ctrlr_state(fbi, C_ENABLE_PM);
         return 0;
@@ -1452,7 +1452,7 @@ static struct sa1100fb_info * __init sa1100fb_init_fbinfo(struct device *dev)
         return fbi;
 }
 
-static int __init sa1100fb_probe(struct device *dev)
+static int __init sa1100fb_probe(struct platform_device *pdev)
 {
         struct sa1100fb_info *fbi;
         int ret;
@@ -1460,7 +1460,7 @@ static int __init sa1100fb_probe(struct device *dev)
         if (!request_mem_region(0xb0100000, 0x10000, "LCD"))
                 return -EBUSY;
 
-        fbi = sa1100fb_init_fbinfo(dev);
+        fbi = sa1100fb_init_fbinfo(&pdev->dev);
         ret = -ENOMEM;
         if (!fbi)
                 goto failed;
@@ -1488,7 +1488,7 @@ static int __init sa1100fb_probe(struct device *dev)
          */
         sa1100fb_check_var(&fbi->fb.var, &fbi->fb);
 
-        dev_set_drvdata(dev, fbi);
+        platform_set_drvdata(pdev, fbi);
 
         ret = register_framebuffer(&fbi->fb);
         if (ret < 0)
@@ -1505,18 +1505,19 @@ static int __init sa1100fb_probe(struct device *dev)
         return 0;
 
 failed:
-        dev_set_drvdata(dev, NULL);
+        platform_set_drvdata(pdev, NULL);
         kfree(fbi);
         release_mem_region(0xb0100000, 0x10000);
         return ret;
 }
 
-static struct device_driver sa1100fb_driver = {
-        .name           = "sa11x0-fb",
-        .bus            = &platform_bus_type,
+static struct platform_driver sa1100fb_driver = {
         .probe          = sa1100fb_probe,
         .suspend        = sa1100fb_suspend,
         .resume         = sa1100fb_resume,
+        .driver         = {
+                .name   = "sa11x0-fb",
+        },
 };
 
 int __init sa1100fb_init(void)
@@ -1524,7 +1525,7 @@ int __init sa1100fb_init(void)
         if (fb_get_options("sa1100fb", NULL))
                 return -ENODEV;
 
-        return driver_register(&sa1100fb_driver);
+        return platform_driver_register(&sa1100fb_driver);
 }
 
 int __init sa1100fb_setup(char *options)
diff --git a/drivers/video/sbuslib.c b/drivers/video/sbuslib.c
index 34f72edba820..646c43f921c5 100644
--- a/drivers/video/sbuslib.c
+++ b/drivers/video/sbuslib.c
@@ -3,6 +3,7 @@
  * Copyright (C) 2003 David S. Miller (davem@redhat.com)
  */
 
+#include <linux/compat.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/string.h>
@@ -182,3 +183,109 @@ int sbusfb_ioctl_helper(unsigned long cmd, unsigned long arg,
         };
 }
 EXPORT_SYMBOL(sbusfb_ioctl_helper);
+
+#ifdef CONFIG_COMPAT
+struct  fbcmap32 {
+        int             index;          /* first element (0 origin) */
+        int             count;
+        u32             red;
+        u32             green;
+        u32             blue;
+};
+
+#define FBIOPUTCMAP32   _IOW('F', 3, struct fbcmap32)
+#define FBIOGETCMAP32   _IOW('F', 4, struct fbcmap32)
+
+static int fbiogetputcmap(struct file *file, struct fb_info *info,
+                unsigned int cmd, unsigned long arg)
+{
+        struct fbcmap32 __user *argp = (void __user *)arg;
+        struct fbcmap __user *p = compat_alloc_user_space(sizeof(*p));
+        u32 addr;
+        int ret;
+
+        ret = copy_in_user(p, argp, 2 * sizeof(int));
+        ret |= get_user(addr, &argp->red);
+        ret |= put_user(compat_ptr(addr), &p->red);
+        ret |= get_user(addr, &argp->green);
+        ret |= put_user(compat_ptr(addr), &p->green);
+        ret |= get_user(addr, &argp->blue);
+        ret |= put_user(compat_ptr(addr), &p->blue);
+        if (ret)
+                return -EFAULT;
+        return info->fbops->fb_ioctl(file->f_dentry->d_inode, file,
+                        (cmd == FBIOPUTCMAP32) ?
+                        FBIOPUTCMAP_SPARC : FBIOGETCMAP_SPARC,
+                        (unsigned long)p, info);
+}
+
+struct fbcursor32 {
+        short set;              /* what to set, choose from the list above */
+        short enable;           /* cursor on/off */
+        struct fbcurpos pos;    /* cursor position */
+        struct fbcurpos hot;    /* cursor hot spot */
+        struct fbcmap32 cmap;   /* color map info */
+        struct fbcurpos size;   /* cursor bit map size */
+        u32     image;          /* cursor image bits */
+        u32     mask;           /* cursor mask bits */
+};
+
+#define FBIOSCURSOR32   _IOW('F', 24, struct fbcursor32)
+#define FBIOGCURSOR32   _IOW('F', 25, struct fbcursor32)
+
+static int fbiogscursor(struct file *file, struct fb_info *info,
+                unsigned long arg)
+{
+        struct fbcursor __user *p = compat_alloc_user_space(sizeof(*p));
+        struct fbcursor32 __user *argp =  (void __user *)arg;
+        compat_uptr_t addr;
+        int ret;
+
+        ret = copy_in_user(p, argp,
+                              2 * sizeof (short) + 2 * sizeof(struct fbcurpos));
+        ret |= copy_in_user(&p->size, &argp->size, sizeof(struct fbcurpos));
+        ret |= copy_in_user(&p->cmap, &argp->cmap, 2 * sizeof(int));
+        ret |= get_user(addr, &argp->cmap.red);
+        ret |= put_user(compat_ptr(addr), &p->cmap.red);
+        ret |= get_user(addr, &argp->cmap.green);
+        ret |= put_user(compat_ptr(addr), &p->cmap.green);
+        ret |= get_user(addr, &argp->cmap.blue);
+        ret |= put_user(compat_ptr(addr), &p->cmap.blue);
+        ret |= get_user(addr, &argp->mask);
+        ret |= put_user(compat_ptr(addr), &p->mask);
+        ret |= get_user(addr, &argp->image);
+        ret |= put_user(compat_ptr(addr), &p->image);
+        if (ret)
+                return -EFAULT;
+        return info->fbops->fb_ioctl(file->f_dentry->d_inode, file,
+                        FBIOSCURSOR, (unsigned long)p, info);
+}
+
+long sbusfb_compat_ioctl(struct file *file, unsigned int cmd,
+                unsigned long arg, struct fb_info *info)
+{
+        switch (cmd) {
+        case FBIOGTYPE:
+        case FBIOSATTR:
+        case FBIOGATTR:
+        case FBIOSVIDEO:
+        case FBIOGVIDEO:
+        case FBIOGCURSOR32:     /* This is not implemented yet.
+                                   Later it should be converted... */
+        case FBIOSCURPOS:
+        case FBIOGCURPOS:
+        case FBIOGCURMAX:
+                return info->fbops->fb_ioctl(file->f_dentry->d_inode,
+                                file, cmd, arg, info);
+        case FBIOPUTCMAP32:
+                return fbiogetputcmap(file, info, cmd, arg);
+        case FBIOGETCMAP32:
+                return fbiogetputcmap(file, info, cmd, arg);
+        case FBIOSCURSOR32:
+                return fbiogscursor(file, info, arg);
+        default:
+                return -ENOIOCTLCMD;
+        }
+}
+EXPORT_SYMBOL(sbusfb_compat_ioctl);
+#endif
diff --git a/drivers/video/sbuslib.h b/drivers/video/sbuslib.h
index a6aa33ba09d6..b470e52ce9e2 100644
--- a/drivers/video/sbuslib.h
+++ b/drivers/video/sbuslib.h
@@ -20,5 +20,7 @@ extern int sbusfb_mmap_helper(struct sbus_mmap_map *map,
 int sbusfb_ioctl_helper(unsigned long cmd, unsigned long arg,
                         struct fb_info *info,
                         int type, int fb_depth, unsigned long fb_size);
+long sbusfb_compat_ioctl(struct file *file, unsigned int cmd,
+                unsigned long arg, struct fb_info *info);
 
 #endif /* _SBUSLIB_H */
diff --git a/drivers/video/sgivwfb.c b/drivers/video/sgivwfb.c
index 2e8769dd345a..7054660767e4 100644
--- a/drivers/video/sgivwfb.c
+++ b/drivers/video/sgivwfb.c
@@ -750,9 +750,8 @@ int __init sgivwfb_setup(char *options)
 /*
  *  Initialisation
  */
-static int __init sgivwfb_probe(struct device *device)
+static int __init sgivwfb_probe(struct platform_device *dev)
 {
-        struct platform_device *dev = to_platform_device(device);
         struct sgivw_par *par;
         struct fb_info *info;
         char *monitor;
@@ -813,7 +812,7 @@ static int __init sgivwfb_probe(struct device *device)
                 goto fail_register_framebuffer;
         }
 
-        dev_set_drvdata(&dev->dev, info);
+        platform_set_drvdata(dev, info);
 
         printk(KERN_INFO "fb%d: SGI DBE frame buffer device, using %ldK of video memory at %#lx\n",      
                 info->node, sgivwfb_mem_size >> 10, sgivwfb_mem_phys);
@@ -831,9 +830,9 @@ fail_ioremap_regs:
         return -ENXIO;
 }
 
-static int sgivwfb_remove(struct device *device)
+static int sgivwfb_remove(struct platform_device *dev)
 {
-        struct fb_info *info = dev_get_drvdata(device);
+        struct fb_info *info = platform_get_drvdata(dev);
 
         if (info) {
                 struct sgivw_par *par = info->par;
@@ -847,11 +846,12 @@ static int sgivwfb_remove(struct device *device)
         return 0;
 }
 
-static struct device_driver sgivwfb_driver = {
-        .name   = "sgivwfb",
-        .bus    = &platform_bus_type,
+static struct platform_driver sgivwfb_driver = {
         .probe  = sgivwfb_probe,
         .remove = sgivwfb_remove,
+        .driver = {
+                .name   = "sgivwfb",
+        },
 };
 
 static struct platform_device *sgivwfb_device;
@@ -867,7 +867,7 @@ int __init sgivwfb_init(void)
                 return -ENODEV;
         sgivwfb_setup(option);
 #endif
-        ret = driver_register(&sgivwfb_driver);
+        ret = platform_driver_register(&sgivwfb_driver);
         if (!ret) {
                 sgivwfb_device = platform_device_alloc("sgivwfb", 0);
                 if (sgivwfb_device) {
@@ -875,7 +875,7 @@ int __init sgivwfb_init(void)
                 } else
                         ret = -ENOMEM;
                 if (ret) {
-                        driver_unregister(&sgivwfb_driver);
+                        platform_driver_unregister(&sgivwfb_driver);
                         platform_device_put(sgivwfb_device);
                 }
         }
@@ -890,7 +890,7 @@ MODULE_LICENSE("GPL");
 static void __exit sgivwfb_exit(void)
 {
         platform_device_unregister(sgivwfb_device);
-        driver_unregister(&sgivwfb_driver);
+        platform_driver_unregister(&sgivwfb_driver);
 }
 
 module_exit(sgivwfb_exit);
diff --git a/drivers/video/tcx.c b/drivers/video/tcx.c
index 59fff29bc02e..fe4f63f3849d 100644
--- a/drivers/video/tcx.c
+++ b/drivers/video/tcx.c
@@ -52,6 +52,9 @@ static struct fb_ops tcx_ops = {
         .fb_imageblit           = cfb_imageblit,
         .fb_mmap                = tcx_mmap,
         .fb_ioctl               = tcx_ioctl,
+#ifdef CONFIG_COMPAT
+        .fb_compat_ioctl        = sbusfb_compat_ioctl,
+#endif
 };
 
 /* THC definitions */
diff --git a/drivers/video/vesafb.c b/drivers/video/vesafb.c
index e25eae1a78c1..2c3aa2fcfd91 100644
--- a/drivers/video/vesafb.c
+++ b/drivers/video/vesafb.c
@@ -245,9 +245,8 @@ static int __init vesafb_setup(char *options)
         return 0;
 }
 
-static int __init vesafb_probe(struct device *device)
+static int __init vesafb_probe(struct platform_device *dev)
 {
-        struct platform_device *dev = to_platform_device(device);
         struct fb_info *info;
         int i, err;
         unsigned int size_vmode;
@@ -480,10 +479,11 @@ err:
         return err;
 }
 
-static struct device_driver vesafb_driver = {
-        .name   = "vesafb",
-        .bus    = &platform_bus_type,
+static struct platform_driver vesafb_driver = {
         .probe  = vesafb_probe,
+        .driver = {
+                .name   = "vesafb",
+        },
 };
 
 static struct platform_device vesafb_device = {
@@ -498,12 +498,12 @@ static int __init vesafb_init(void)
         /* ignore error return of fb_get_options */
         fb_get_options("vesafb", &option);
         vesafb_setup(option);
-        ret = driver_register(&vesafb_driver);
+        ret = platform_driver_register(&vesafb_driver);
 
         if (!ret) {
                 ret = platform_device_register(&vesafb_device);
                 if (ret)
-                        driver_unregister(&vesafb_driver);
+                        platform_driver_unregister(&vesafb_driver);
         }
         return ret;
 }
diff --git a/drivers/video/vfb.c b/drivers/video/vfb.c
index 8794dc5d2466..ffa1ad474226 100644
--- a/drivers/video/vfb.c
+++ b/drivers/video/vfb.c
@@ -403,9 +403,8 @@ static void vfb_platform_release(struct device *device)
         // This is called when the reference count goes to zero.
 }
 
-static int __init vfb_probe(struct device *device)
+static int __init vfb_probe(struct platform_device *dev)
 {
-        struct platform_device *dev = to_platform_device(device);
         struct fb_info *info;
         int retval = -ENOMEM;
 
@@ -447,7 +446,7 @@ static int __init vfb_probe(struct device *device)
         retval = register_framebuffer(info);
         if (retval < 0)
                 goto err2;
-        dev_set_drvdata(&dev->dev, info);
+        platform_set_drvdata(dev, info);
 
         printk(KERN_INFO
                "fb%d: Virtual frame buffer device, using %ldK of video memory\n",
@@ -462,9 +461,9 @@ err:
         return retval;
 }
 
-static int vfb_remove(struct device *device)
+static int vfb_remove(struct platform_device *dev)
 {
-        struct fb_info *info = dev_get_drvdata(device);
+        struct fb_info *info = platform_get_drvdata(dev);
 
         if (info) {
                 unregister_framebuffer(info);
@@ -474,11 +473,12 @@ static int vfb_remove(struct device *device)
         return 0;
 }
 
-static struct device_driver vfb_driver = {
-        .name   = "vfb",
-        .bus    = &platform_bus_type,
+static struct platform_driver vfb_driver = {
         .probe  = vfb_probe,
         .remove = vfb_remove,
+        .driver = {
+                .name   = "vfb",
+        },
 };
 
 static struct platform_device vfb_device = {
@@ -504,12 +504,12 @@ static int __init vfb_init(void)
         if (!vfb_enable)
                 return -ENXIO;
 
-        ret = driver_register(&vfb_driver);
+        ret = platform_driver_register(&vfb_driver);
 
         if (!ret) {
                 ret = platform_device_register(&vfb_device);
                 if (ret)
-                        driver_unregister(&vfb_driver);
+                        platform_driver_unregister(&vfb_driver);
         }
         return ret;
 }
@@ -520,7 +520,7 @@ module_init(vfb_init);
 static void __exit vfb_exit(void)
 {
         platform_device_unregister(&vfb_device);
-        driver_unregister(&vfb_driver);
+        platform_driver_unregister(&vfb_driver);
 }
 
 module_exit(vfb_exit);
diff --git a/drivers/video/w100fb.c b/drivers/video/w100fb.c
index 48e70f153c4b..daa46051f55d 100644
--- a/drivers/video/w100fb.c
+++ b/drivers/video/w100fb.c
@@ -437,9 +437,9 @@ static void w100fb_restore_vidmem(struct w100fb_par *par)
         }
 }
 
-static int w100fb_suspend(struct device *dev, pm_message_t state)
+static int w100fb_suspend(struct platform_device *dev, pm_message_t state)
 {
-        struct fb_info *info = dev_get_drvdata(dev);
+        struct fb_info *info = platform_get_drvdata(dev);
         struct w100fb_par *par=info->par;
         struct w100_tg_info *tg = par->mach->tg;
 
@@ -452,9 +452,9 @@ static int w100fb_suspend(struct device *dev, pm_message_t state)
         return 0;
 }
 
-static int w100fb_resume(struct device *dev)
+static int w100fb_resume(struct platform_device *dev)
 {
-        struct fb_info *info = dev_get_drvdata(dev);
+        struct fb_info *info = platform_get_drvdata(dev);
         struct w100fb_par *par=info->par;
         struct w100_tg_info *tg = par->mach->tg;
 
@@ -473,13 +473,12 @@ static int w100fb_resume(struct device *dev)
 #endif
 
 
-int __init w100fb_probe(struct device *dev)
+int __init w100fb_probe(struct platform_device *pdev)
 {
         int err = -EIO;
         struct w100fb_mach_info *inf;
         struct fb_info *info = NULL;
         struct w100fb_par *par;
-        struct platform_device *pdev = to_platform_device(dev);
         struct resource *mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         unsigned int chip_id;
 
@@ -522,9 +521,9 @@ int __init w100fb_probe(struct device *dev)
         }
 
         par = info->par;
-        dev_set_drvdata(dev, info);
+        platform_set_drvdata(pdev, info);
 
-        inf = dev->platform_data;
+        inf = pdev->dev.platform_data;
         par->chip_id = chip_id;
         par->mach = inf;
         par->fastpll_mode = 0;
@@ -600,10 +599,10 @@ int __init w100fb_probe(struct device *dev)
                 goto out;
         }
 
-        device_create_file(dev, &dev_attr_fastpllclk);
-        device_create_file(dev, &dev_attr_reg_read);
-        device_create_file(dev, &dev_attr_reg_write);
-        device_create_file(dev, &dev_attr_flip);
+        device_create_file(&pdev->dev, &dev_attr_fastpllclk);
+        device_create_file(&pdev->dev, &dev_attr_reg_read);
+        device_create_file(&pdev->dev, &dev_attr_reg_write);
+        device_create_file(&pdev->dev, &dev_attr_flip);
 
         printk(KERN_INFO "fb%d: %s frame buffer device\n", info->node, info->fix.id);
         return 0;
@@ -622,15 +621,15 @@ out:
 }
 
 
-static int w100fb_remove(struct device *dev)
+static int w100fb_remove(struct platform_device *pdev)
 {
-        struct fb_info *info = dev_get_drvdata(dev);
+        struct fb_info *info = platform_get_drvdata(pdev);
         struct w100fb_par *par=info->par;
 
-        device_remove_file(dev, &dev_attr_fastpllclk);
-        device_remove_file(dev, &dev_attr_reg_read);
-        device_remove_file(dev, &dev_attr_reg_write);
-        device_remove_file(dev, &dev_attr_flip);
+        device_remove_file(&pdev->dev, &dev_attr_fastpllclk);
+        device_remove_file(&pdev->dev, &dev_attr_reg_read);
+        device_remove_file(&pdev->dev, &dev_attr_reg_write);
+        device_remove_file(&pdev->dev, &dev_attr_flip);
 
         unregister_framebuffer(info);
 
@@ -1448,23 +1447,24 @@ static void w100_vsync(void)
         writel(0x00000002, remapped_regs + mmGEN_INT_STATUS);
 }
 
-static struct device_driver w100fb_driver = {
-        .name           = "w100fb",
-        .bus            = &platform_bus_type,
+static struct platform_driver w100fb_driver = {
         .probe          = w100fb_probe,
         .remove         = w100fb_remove,
         .suspend        = w100fb_suspend,
         .resume         = w100fb_resume,
+        .driver         = {
+                .name   = "w100fb",
+        },
 };
 
 int __devinit w100fb_init(void)
 {
-        return driver_register(&w100fb_driver);
+        return platform_driver_register(&w100fb_driver);
 }
 
 void __exit w100fb_cleanup(void)
 {
-        driver_unregister(&w100fb_driver);
+        platform_driver_unregister(&w100fb_driver);
 }
 
 module_init(w100fb_init);