Merge linux-2.6 with linux-acpi-2.6

517 files changed, 30554 insertions, 18542 deletions

diff --git a/drivers/atm/zatm.c b/drivers/atm/zatm.c
index c4b75ecf946..55959e4d1cb 100644
--- a/drivers/atm/zatm.c
+++ b/drivers/atm/zatm.c
@@ -417,9 +417,9 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy[0],dummy[1]);
                 chan = (here[3] & uPD98401_AAL5_CHAN) >>
                     uPD98401_AAL5_CHAN_SHIFT;
                 if (chan < zatm_dev->chans && zatm_dev->rx_map[chan]) {
-                        int pos = ZATM_VCC(vcc)->pool;
-
+                        int pos;
                         vcc = zatm_dev->rx_map[chan];
+                        pos = ZATM_VCC(vcc)->pool;
                         if (skb == zatm_dev->last_free[pos])
                                 zatm_dev->last_free[pos] = NULL;
                         skb_unlink(skb, zatm_dev->pool + pos);
diff --git a/drivers/base/attribute_container.c b/drivers/base/attribute_container.c
index ec615d854be..373e7b728fa 100644
--- a/drivers/base/attribute_container.c
+++ b/drivers/base/attribute_container.c
@@ -22,11 +22,26 @@
 /* This is a private structure used to tie the classdev and the
  * container .. it should never be visible outside this file */
 struct internal_container {
-        struct list_head node;
+        struct klist_node node;
         struct attribute_container *cont;
         struct class_device classdev;
 };
 
+static void internal_container_klist_get(struct klist_node *n)
+{
+        struct internal_container *ic =
+                container_of(n, struct internal_container, node);
+        class_device_get(&ic->classdev);
+}
+
+static void internal_container_klist_put(struct klist_node *n)
+{
+        struct internal_container *ic =
+                container_of(n, struct internal_container, node);
+        class_device_put(&ic->classdev);
+}
+
+
 /**
  * attribute_container_classdev_to_container - given a classdev, return the container
  *
@@ -57,7 +72,8 @@ int
 attribute_container_register(struct attribute_container *cont)
 {
         INIT_LIST_HEAD(&cont->node);
-        INIT_LIST_HEAD(&cont->containers);
+        klist_init(&cont->containers,internal_container_klist_get,
+                   internal_container_klist_put);
                 
         down(&attribute_container_mutex);
         list_add_tail(&cont->node, &attribute_container_list);
@@ -77,11 +93,13 @@ attribute_container_unregister(struct attribute_container *cont)
 {
         int retval = -EBUSY;
         down(&attribute_container_mutex);
-        if (!list_empty(&cont->containers))
+        spin_lock(&cont->containers.k_lock);
+        if (!list_empty(&cont->containers.k_list))
                 goto out;
         retval = 0;
         list_del(&cont->node);
  out:
+        spin_unlock(&cont->containers.k_lock);
         up(&attribute_container_mutex);
         return retval;
                 
@@ -140,7 +158,6 @@ attribute_container_add_device(struct device *dev,
                         continue;
                 }
                 memset(ic, 0, sizeof(struct internal_container));
-                INIT_LIST_HEAD(&ic->node);
                 ic->cont = cont;
                 class_device_initialize(&ic->classdev);
                 ic->classdev.dev = get_device(dev);
@@ -151,11 +168,22 @@ attribute_container_add_device(struct device *dev,
                         fn(cont, dev, &ic->classdev);
                 else
                         attribute_container_add_class_device(&ic->classdev);
-                list_add_tail(&ic->node, &cont->containers);
+                klist_add_tail(&ic->node, &cont->containers);
         }
         up(&attribute_container_mutex);
 }
 
+/* FIXME: can't break out of this unless klist_iter_exit is also
+ * called before doing the break
+ */
+#define klist_for_each_entry(pos, head, member, iter) \
+        for (klist_iter_init(head, iter); (pos = ({ \
+                struct klist_node *n = klist_next(iter); \
+                n ? container_of(n, typeof(*pos), member) : \
+                        ({ klist_iter_exit(iter) ; NULL; }); \
+        }) ) != NULL; )
+                        
+
 /**
  * attribute_container_remove_device - make device eligible for removal.
  *
@@ -182,17 +210,19 @@ attribute_container_remove_device(struct device *dev,
 
         down(&attribute_container_mutex);
         list_for_each_entry(cont, &attribute_container_list, node) {
-                struct internal_container *ic, *tmp;
+                struct internal_container *ic;
+                struct klist_iter iter;
 
                 if (attribute_container_no_classdevs(cont))
                         continue;
 
                 if (!cont->match(cont, dev))
                         continue;
-                list_for_each_entry_safe(ic, tmp, &cont->containers, node) {
+
+                klist_for_each_entry(ic, &cont->containers, node, &iter) {
                         if (dev != ic->classdev.dev)
                                 continue;
-                        list_del(&ic->node);
+                        klist_del(&ic->node);
                         if (fn)
                                 fn(cont, dev, &ic->classdev);
                         else {
@@ -225,12 +255,18 @@ attribute_container_device_trigger(struct device *dev,
 
         down(&attribute_container_mutex);
         list_for_each_entry(cont, &attribute_container_list, node) {
-                struct internal_container *ic, *tmp;
+                struct internal_container *ic;
+                struct klist_iter iter;
 
                 if (!cont->match(cont, dev))
                         continue;
 
-                list_for_each_entry_safe(ic, tmp, &cont->containers, node) {
+                if (attribute_container_no_classdevs(cont)) {
+                        fn(cont, dev, NULL);
+                        continue;
+                }
+
+                klist_for_each_entry(ic, &cont->containers, node, &iter) {
                         if (dev == ic->classdev.dev)
                                 fn(cont, dev, &ic->classdev);
                 }
@@ -368,6 +404,36 @@ attribute_container_class_device_del(struct class_device *classdev)
 }
 EXPORT_SYMBOL_GPL(attribute_container_class_device_del);
 
+/**
+ * attribute_container_find_class_device - find the corresponding class_device
+ *
+ * @cont:       the container
+ * @dev:        the generic device
+ *
+ * Looks up the device in the container's list of class devices and returns
+ * the corresponding class_device.
+ */
+struct class_device *
+attribute_container_find_class_device(struct attribute_container *cont,
+                                      struct device *dev)
+{
+        struct class_device *cdev = NULL;
+        struct internal_container *ic;
+        struct klist_iter iter;
+
+        klist_for_each_entry(ic, &cont->containers, node, &iter) {
+                if (ic->classdev.dev == dev) {
+                        cdev = &ic->classdev;
+                        /* FIXME: must exit iterator then break */
+                        klist_iter_exit(&iter);
+                        break;
+                }
+        }
+
+        return cdev;
+}
+EXPORT_SYMBOL_GPL(attribute_container_find_class_device);
+
 int __init
 attribute_container_init(void)
 {
diff --git a/drivers/base/bus.c b/drivers/base/bus.c
index ab53832d57e..03204bfd17a 100644
--- a/drivers/base/bus.c
+++ b/drivers/base/bus.c
@@ -156,7 +156,9 @@ static ssize_t driver_unbind(struct device_driver *drv,
                 device_release_driver(dev);
                 err = count;
         }
-        return err;
+        if (err)
+                return err;
+        return count;
 }
 static DRIVER_ATTR(unbind, S_IWUSR, NULL, driver_unbind);
 
@@ -358,7 +360,7 @@ int bus_add_device(struct device * dev)
         if (bus) {
                 pr_debug("bus %s: add device %s\n", bus->name, dev->bus_id);
                 device_attach(dev);
-                klist_add_tail(&bus->klist_devices, &dev->knode_bus);
+                klist_add_tail(&dev->knode_bus, &bus->klist_devices);
                 error = device_add_attrs(bus, dev);
                 if (!error) {
                         sysfs_create_link(&bus->devices.kobj, &dev->kobj, dev->bus_id);
@@ -446,7 +448,7 @@ int bus_add_driver(struct device_driver * drv)
                 }
 
                 driver_attach(drv);
-                klist_add_tail(&bus->klist_drivers, &drv->knode_bus);
+                klist_add_tail(&drv->knode_bus, &bus->klist_drivers);
                 module_add_driver(drv->owner, drv);
 
                 driver_add_attrs(bus, drv);
@@ -566,6 +568,36 @@ static void bus_remove_attrs(struct bus_type * bus)
         }
 }
 
+static void klist_devices_get(struct klist_node *n)
+{
+        struct device *dev = container_of(n, struct device, knode_bus);
+
+        get_device(dev);
+}
+
+static void klist_devices_put(struct klist_node *n)
+{
+        struct device *dev = container_of(n, struct device, knode_bus);
+
+        put_device(dev);
+}
+
+static void klist_drivers_get(struct klist_node *n)
+{
+        struct device_driver *drv = container_of(n, struct device_driver,
+                                                 knode_bus);
+
+        get_driver(drv);
+}
+
+static void klist_drivers_put(struct klist_node *n)
+{
+        struct device_driver *drv = container_of(n, struct device_driver,
+                                                 knode_bus);
+
+        put_driver(drv);
+}
+
 /**
  *      bus_register - register a bus with the system.
  *      @bus:   bus.
@@ -600,8 +632,8 @@ int bus_register(struct bus_type * bus)
         if (retval)
                 goto bus_drivers_fail;
 
-        klist_init(&bus->klist_devices);
-        klist_init(&bus->klist_drivers);
+        klist_init(&bus->klist_devices, klist_devices_get, klist_devices_put);
+        klist_init(&bus->klist_drivers, klist_drivers_get, klist_drivers_put);
         bus_add_attrs(bus);
 
         pr_debug("bus type '%s' registered\n", bus->name);
diff --git a/drivers/base/class.c b/drivers/base/class.c
index 0154a1623b2..d164c32a97a 100644
--- a/drivers/base/class.c
+++ b/drivers/base/class.c
@@ -299,10 +299,8 @@ static void class_dev_release(struct kobject * kobj)
 
         pr_debug("device class '%s': release.\n", cd->class_id);
 
-        if (cd->devt_attr) {
-                kfree(cd->devt_attr);
-                cd->devt_attr = NULL;
-        }
+        kfree(cd->devt_attr);
+        cd->devt_attr = NULL;
 
         if (cls->release)
                 cls->release(cd);
@@ -452,10 +450,29 @@ void class_device_initialize(struct class_device *class_dev)
         INIT_LIST_HEAD(&class_dev->node);
 }
 
+static char *make_class_name(struct class_device *class_dev)
+{
+        char *name;
+        int size;
+
+        size = strlen(class_dev->class->name) +
+                strlen(kobject_name(&class_dev->kobj)) + 2;
+
+        name = kmalloc(size, GFP_KERNEL);
+        if (!name)
+                return ERR_PTR(-ENOMEM);
+
+        strcpy(name, class_dev->class->name);
+        strcat(name, ":");
+        strcat(name, kobject_name(&class_dev->kobj));
+        return name;
+}
+
 int class_device_add(struct class_device *class_dev)
 {
         struct class * parent = NULL;
         struct class_interface * class_intf;
+        char *class_name = NULL;
         int error;
 
         class_dev = class_device_get(class_dev);
@@ -500,9 +517,13 @@ int class_device_add(struct class_device *class_dev)
         }
 
         class_device_add_attrs(class_dev);
-        if (class_dev->dev)
+        if (class_dev->dev) {
+                class_name = make_class_name(class_dev);
                 sysfs_create_link(&class_dev->kobj,
                                   &class_dev->dev->kobj, "device");
+                sysfs_create_link(&class_dev->dev->kobj, &class_dev->kobj,
+                                  class_name);
+        }
 
         /* notify any interfaces this device is now here */
         if (parent) {
@@ -519,6 +540,7 @@ int class_device_add(struct class_device *class_dev)
         if (error && parent)
                 class_put(parent);
         class_device_put(class_dev);
+        kfree(class_name);
         return error;
 }
 
@@ -584,6 +606,7 @@ void class_device_del(struct class_device *class_dev)
 {
         struct class * parent = class_dev->class;
         struct class_interface * class_intf;
+        char *class_name = NULL;
 
         if (parent) {
                 down(&parent->sem);
@@ -594,8 +617,11 @@ void class_device_del(struct class_device *class_dev)
                 up(&parent->sem);
         }
 
-        if (class_dev->dev)
+        if (class_dev->dev) {
+                class_name = make_class_name(class_dev);
                 sysfs_remove_link(&class_dev->kobj, "device");
+                sysfs_remove_link(&class_dev->dev->kobj, class_name);
+        }
         if (class_dev->devt_attr)
                 class_device_remove_file(class_dev, class_dev->devt_attr);
         class_device_remove_attrs(class_dev);
@@ -605,6 +631,7 @@ void class_device_del(struct class_device *class_dev)
 
         if (parent)
                 class_put(parent);
+        kfree(class_name);
 }
 
 void class_device_unregister(struct class_device *class_dev)
diff --git a/drivers/base/core.c b/drivers/base/core.c
index efe03a024a5..6ab73f5c799 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -191,6 +191,20 @@ void device_remove_file(struct device * dev, struct device_attribute * attr)
         }
 }
 
+static void klist_children_get(struct klist_node *n)
+{
+        struct device *dev = container_of(n, struct device, knode_parent);
+
+        get_device(dev);
+}
+
+static void klist_children_put(struct klist_node *n)
+{
+        struct device *dev = container_of(n, struct device, knode_parent);
+
+        put_device(dev);
+}
+
 
 /**
  *      device_initialize - init device structure.
@@ -207,7 +221,8 @@ void device_initialize(struct device *dev)
 {
         kobj_set_kset_s(dev, devices_subsys);
         kobject_init(&dev->kobj);
-        klist_init(&dev->klist_children);
+        klist_init(&dev->klist_children, klist_children_get,
+                   klist_children_put);
         INIT_LIST_HEAD(&dev->dma_pools);
         init_MUTEX(&dev->sem);
 }
@@ -249,7 +264,7 @@ int device_add(struct device *dev)
         if ((error = bus_add_device(dev)))
                 goto BusError;
         if (parent)
-                klist_add_tail(&parent->klist_children, &dev->knode_parent);
+                klist_add_tail(&dev->knode_parent, &parent->klist_children);
 
         /* notify platform of device entry */
         if (platform_notify)
diff --git a/drivers/base/dd.c b/drivers/base/dd.c
index 16323f9cbff..d5bbce38282 100644
--- a/drivers/base/dd.c
+++ b/drivers/base/dd.c
@@ -42,7 +42,7 @@ void device_bind_driver(struct device * dev)
 {
         pr_debug("bound device '%s' to driver '%s'\n",
                  dev->bus_id, dev->driver->name);
-        klist_add_tail(&dev->driver->klist_devices, &dev->knode_driver);
+        klist_add_tail(&dev->knode_driver, &dev->driver->klist_devices);
         sysfs_create_link(&dev->driver->kobj, &dev->kobj,
                           kobject_name(&dev->kobj));
         sysfs_create_link(&dev->kobj, &dev->driver->kobj, "driver");
diff --git a/drivers/base/driver.c b/drivers/base/driver.c
index 291c5954a3a..ef3fe513e39 100644
--- a/drivers/base/driver.c
+++ b/drivers/base/driver.c
@@ -142,6 +142,19 @@ void put_driver(struct device_driver * drv)
         kobject_put(&drv->kobj);
 }
 
+static void klist_devices_get(struct klist_node *n)
+{
+        struct device *dev = container_of(n, struct device, knode_driver);
+
+        get_device(dev);
+}
+
+static void klist_devices_put(struct klist_node *n)
+{
+        struct device *dev = container_of(n, struct device, knode_driver);
+
+        put_device(dev);
+}
 
 /**
  *      driver_register - register driver with bus
@@ -157,7 +170,7 @@ void put_driver(struct device_driver * drv)
  */
 int driver_register(struct device_driver * drv)
 {
-        klist_init(&drv->klist_devices);
+        klist_init(&drv->klist_devices, klist_devices_get, klist_devices_put);
         init_completion(&drv->unloaded);
         return bus_add_driver(drv);
 }
diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
index 652281402c9..5bfa2e9a7c2 100644
--- a/drivers/base/firmware_class.c
+++ b/drivers/base/firmware_class.c
@@ -28,6 +28,7 @@ enum {
         FW_STATUS_DONE,
         FW_STATUS_ABORT,
         FW_STATUS_READY,
+        FW_STATUS_READY_NOHOTPLUG,
 };
 
 static int loading_timeout = 10;        /* In seconds */
@@ -344,7 +345,7 @@ error_kfree:
 
 static int
 fw_setup_class_device(struct firmware *fw, struct class_device **class_dev_p,
-                      const char *fw_name, struct device *device)
+                      const char *fw_name, struct device *device, int hotplug)
 {
         struct class_device *class_dev;
         struct firmware_priv *fw_priv;
@@ -376,7 +377,10 @@ fw_setup_class_device(struct firmware *fw, struct class_device **class_dev_p,
                 goto error_unreg;
         }
 
-        set_bit(FW_STATUS_READY, &fw_priv->status);
+        if (hotplug)
+                set_bit(FW_STATUS_READY, &fw_priv->status);
+        else
+                set_bit(FW_STATUS_READY_NOHOTPLUG, &fw_priv->status);
         *class_dev_p = class_dev;
         goto out;
 
@@ -386,21 +390,9 @@ out:
         return retval;
 }
 
-/**
- * request_firmware: - request firmware to hotplug and wait for it
- * Description:
- *      @firmware will be used to return a firmware image by the name
- *      of @name for device @device.
- *
- *      Should be called from user context where sleeping is allowed.
- *
- *      @name will be use as $FIRMWARE in the hotplug environment and
- *      should be distinctive enough not to be confused with any other
- *      firmware image for this or any other device.
- **/
-int
-request_firmware(const struct firmware **firmware_p, const char *name,
-                 struct device *device)
+static int
+_request_firmware(const struct firmware **firmware_p, const char *name,
+                 struct device *device, int hotplug)
 {
         struct class_device *class_dev;
         struct firmware_priv *fw_priv;
@@ -419,22 +411,25 @@ request_firmware(const struct firmware **firmware_p, const char *name,
         }
         memset(firmware, 0, sizeof (*firmware));
 
-        retval = fw_setup_class_device(firmware, &class_dev, name, device);
+        retval = fw_setup_class_device(firmware, &class_dev, name, device,
+                hotplug);
         if (retval)
                 goto error_kfree_fw;
 
         fw_priv = class_get_devdata(class_dev);
 
-        if (loading_timeout > 0) {
-                fw_priv->timeout.expires = jiffies + loading_timeout * HZ;
-                add_timer(&fw_priv->timeout);
-        }
-
-        kobject_hotplug(&class_dev->kobj, KOBJ_ADD);
-        wait_for_completion(&fw_priv->completion);
-        set_bit(FW_STATUS_DONE, &fw_priv->status);
+        if (hotplug) {
+                if (loading_timeout > 0) {
+                        fw_priv->timeout.expires = jiffies + loading_timeout * HZ;
+                        add_timer(&fw_priv->timeout);
+                }
 
-        del_timer_sync(&fw_priv->timeout);
+                kobject_hotplug(&class_dev->kobj, KOBJ_ADD);
+                wait_for_completion(&fw_priv->completion);
+                set_bit(FW_STATUS_DONE, &fw_priv->status);
+                del_timer_sync(&fw_priv->timeout);
+        } else
+                wait_for_completion(&fw_priv->completion);
 
         down(&fw_lock);
         if (!fw_priv->fw->size || test_bit(FW_STATUS_ABORT, &fw_priv->status)) {
@@ -455,6 +450,26 @@ out:
 }
 
 /**
+ * request_firmware: - request firmware to hotplug and wait for it
+ * Description:
+ *      @firmware will be used to return a firmware image by the name
+ *      of @name for device @device.
+ *
+ *      Should be called from user context where sleeping is allowed.
+ *
+ *      @name will be use as $FIRMWARE in the hotplug environment and
+ *      should be distinctive enough not to be confused with any other
+ *      firmware image for this or any other device.
+ **/
+int
+request_firmware(const struct firmware **firmware_p, const char *name,
+                 struct device *device)
+{
+        int hotplug = 1;
+        return _request_firmware(firmware_p, name, device, hotplug);
+}
+
+/**
  * release_firmware: - release the resource associated with a firmware image
  **/
 void
@@ -491,6 +506,7 @@ struct firmware_work {
         struct device *device;
         void *context;
         void (*cont)(const struct firmware *fw, void *context);
+        int hotplug;
 };
 
 static int
@@ -503,7 +519,8 @@ request_firmware_work_func(void *arg)
                 return 0;
         }
         daemonize("%s/%s", "firmware", fw_work->name);
-        request_firmware(&fw, fw_work->name, fw_work->device);
+        _request_firmware(&fw, fw_work->name, fw_work->device,
+                fw_work->hotplug);
         fw_work->cont(fw, fw_work->context);
         release_firmware(fw);
         module_put(fw_work->module);
@@ -518,6 +535,9 @@ request_firmware_work_func(void *arg)
  *      Asynchronous variant of request_firmware() for contexts where
  *      it is not possible to sleep.
  *
+ *      @hotplug invokes hotplug event to copy the firmware image if this flag
+ *      is non-zero else the firmware copy must be done manually.
+ *
  *      @cont will be called asynchronously when the firmware request is over.
  *
  *      @context will be passed over to @cont.
@@ -527,7 +547,7 @@ request_firmware_work_func(void *arg)
  **/
 int
 request_firmware_nowait(
-        struct module *module,
+        struct module *module, int hotplug,
         const char *name, struct device *device, void *context,
         void (*cont)(const struct firmware *fw, void *context))
 {
@@ -548,6 +568,7 @@ request_firmware_nowait(
                 .device = device,
                 .context = context,
                 .cont = cont,
+                .hotplug = hotplug,
         };
 
         ret = kernel_thread(request_firmware_work_func, fw_work,
diff --git a/drivers/base/node.c b/drivers/base/node.c
index 904b27caf69..16c513aa4d4 100644
--- a/drivers/base/node.c
+++ b/drivers/base/node.c
@@ -39,13 +39,25 @@ static ssize_t node_read_meminfo(struct sys_device * dev, char * buf)
         int n;
         int nid = dev->id;
         struct sysinfo i;
+        struct page_state ps;
         unsigned long inactive;
         unsigned long active;
         unsigned long free;
 
         si_meminfo_node(&i, nid);
+        get_page_state_node(&ps, nid);
         __get_zone_counts(&active, &inactive, &free, NODE_DATA(nid));
 
+        /* Check for negative values in these approximate counters */
+        if ((long)ps.nr_dirty < 0)
+                ps.nr_dirty = 0;
+        if ((long)ps.nr_writeback < 0)
+                ps.nr_writeback = 0;
+        if ((long)ps.nr_mapped < 0)
+                ps.nr_mapped = 0;
+        if ((long)ps.nr_slab < 0)
+                ps.nr_slab = 0;
+
         n = sprintf(buf, "\n"
                        "Node %d MemTotal:     %8lu kB\n"
                        "Node %d MemFree:      %8lu kB\n"
@@ -55,7 +67,11 @@ static ssize_t node_read_meminfo(struct sys_device * dev, char * buf)
                        "Node %d HighTotal:    %8lu kB\n"
                        "Node %d HighFree:     %8lu kB\n"
                        "Node %d LowTotal:     %8lu kB\n"
-                       "Node %d LowFree:      %8lu kB\n",
+                       "Node %d LowFree:      %8lu kB\n"
+                       "Node %d Dirty:        %8lu kB\n"
+                       "Node %d Writeback:    %8lu kB\n"
+                       "Node %d Mapped:       %8lu kB\n"
+                       "Node %d Slab:         %8lu kB\n",
                        nid, K(i.totalram),
                        nid, K(i.freeram),
                        nid, K(i.totalram - i.freeram),
@@ -64,7 +80,11 @@ static ssize_t node_read_meminfo(struct sys_device * dev, char * buf)
                        nid, K(i.totalhigh),
                        nid, K(i.freehigh),
                        nid, K(i.totalram - i.totalhigh),
-                       nid, K(i.freeram - i.freehigh));
+                       nid, K(i.freeram - i.freehigh),
+                       nid, K(ps.nr_dirty),
+                       nid, K(ps.nr_writeback),
+                       nid, K(ps.nr_mapped),
+                       nid, K(ps.nr_slab));
         n += hugetlb_report_node_meminfo(nid, buf + n);
         return n;
 }
diff --git a/drivers/base/power/resume.c b/drivers/base/power/resume.c
index bdd96b03b88..0a7aa07b9a2 100644
--- a/drivers/base/power/resume.c
+++ b/drivers/base/power/resume.c
@@ -26,11 +26,11 @@ int resume_device(struct device * dev)
 
         down(&dev->sem);
         if (dev->power.pm_parent
-                        && dev->power.pm_parent->power.power_state) {
+                        && dev->power.pm_parent->power.power_state.event) {
                 dev_err(dev, "PM: resume from %d, parent %s still %d\n",
-                        dev->power.power_state,
+                        dev->power.power_state.event,
                         dev->power.pm_parent->bus_id,
-                        dev->power.pm_parent->power.power_state);
+                        dev->power.pm_parent->power.power_state.event);
         }
         if (dev->bus && dev->bus->resume) {
                 dev_dbg(dev,"resuming\n");
@@ -54,7 +54,7 @@ void dpm_resume(void)
                 list_add_tail(entry, &dpm_active);
 
                 up(&dpm_list_sem);
-                if (!dev->power.prev_state)
+                if (!dev->power.prev_state.event)
                         resume_device(dev);
                 down(&dpm_list_sem);
                 put_device(dev);
diff --git a/drivers/base/power/runtime.c b/drivers/base/power/runtime.c
index 325962d8019..e8f0519f5df 100644
--- a/drivers/base/power/runtime.c
+++ b/drivers/base/power/runtime.c
@@ -13,10 +13,10 @@
 static void runtime_resume(struct device * dev)
 {
         dev_dbg(dev, "resuming\n");
-        if (!dev->power.power_state)
+        if (!dev->power.power_state.event)
                 return;
         if (!resume_device(dev))
-                dev->power.power_state = 0;
+                dev->power.power_state = PMSG_ON;
 }
 
 
@@ -49,10 +49,10 @@ int dpm_runtime_suspend(struct device * dev, pm_message_t state)
         int error = 0;
 
         down(&dpm_sem);
-        if (dev->power.power_state == state)
+        if (dev->power.power_state.event == state.event)
                 goto Done;
 
-        if (dev->power.power_state)
+        if (dev->power.power_state.event)
                 runtime_resume(dev);
 
         if (!(error = suspend_device(dev, state)))
diff --git a/drivers/base/power/suspend.c b/drivers/base/power/suspend.c
index 2ccee3763ac..50501764d05 100644
--- a/drivers/base/power/suspend.c
+++ b/drivers/base/power/suspend.c
@@ -40,22 +40,22 @@ int suspend_device(struct device * dev, pm_message_t state)
         int error = 0;
 
         down(&dev->sem);
-        if (dev->power.power_state) {
+        if (dev->power.power_state.event) {
                 dev_dbg(dev, "PM: suspend %d-->%d\n",
-                        dev->power.power_state, state);
+                        dev->power.power_state.event, state.event);
         }
         if (dev->power.pm_parent
-                        && dev->power.pm_parent->power.power_state) {
+                        && dev->power.pm_parent->power.power_state.event) {
                 dev_err(dev,
                         "PM: suspend %d->%d, parent %s already %d\n",
-                        dev->power.power_state, state,
+                        dev->power.power_state.event, state.event,
                         dev->power.pm_parent->bus_id,
-                        dev->power.pm_parent->power.power_state);
+                        dev->power.pm_parent->power.power_state.event);
         }
 
         dev->power.prev_state = dev->power.power_state;
 
-        if (dev->bus && dev->bus->suspend && !dev->power.power_state) {
+        if (dev->bus && dev->bus->suspend && !dev->power.power_state.event) {
                 dev_dbg(dev, "suspending\n");
                 error = dev->bus->suspend(dev, state);
         }
diff --git a/drivers/base/power/sysfs.c b/drivers/base/power/sysfs.c
index f82b3df9545..8d04fb435c1 100644
--- a/drivers/base/power/sysfs.c
+++ b/drivers/base/power/sysfs.c
@@ -26,19 +26,19 @@
 
 static ssize_t state_show(struct device * dev, struct device_attribute *attr, char * buf)
 {
-        return sprintf(buf, "%u\n", dev->power.power_state);
+        return sprintf(buf, "%u\n", dev->power.power_state.event);
 }
 
 static ssize_t state_store(struct device * dev, struct device_attribute *attr, const char * buf, size_t n)
 {
-        u32 state;
+        pm_message_t state;
         char * rest;
         int error = 0;
 
-        state = simple_strtoul(buf, &rest, 10);
+        state.event = simple_strtoul(buf, &rest, 10);
         if (*rest)
                 return -EINVAL;
-        if (state)
+        if (state.event)
                 error = dpm_runtime_suspend(dev, state);
         else
                 dpm_runtime_resume(dev);
diff --git a/drivers/base/sys.c b/drivers/base/sys.c
index 214b9643540..3431eb6004c 100644
--- a/drivers/base/sys.c
+++ b/drivers/base/sys.c
@@ -288,6 +288,27 @@ void sysdev_shutdown(void)
         up(&sysdev_drivers_lock);
 }
 
+static void __sysdev_resume(struct sys_device *dev)
+{
+        struct sysdev_class *cls = dev->cls;
+        struct sysdev_driver *drv;
+
+        /* First, call the class-specific one */
+        if (cls->resume)
+                cls->resume(dev);
+
+        /* Call auxillary drivers next. */
+        list_for_each_entry(drv, &cls->drivers, entry) {
+                if (drv->resume)
+                        drv->resume(dev);
+        }
+
+        /* Call global drivers. */
+        list_for_each_entry(drv, &sysdev_drivers, entry) {
+                if (drv->resume)
+                        drv->resume(dev);
+        }
+}
 
 /**
  *      sysdev_suspend - Suspend all system devices.
@@ -305,38 +326,93 @@ void sysdev_shutdown(void)
 int sysdev_suspend(pm_message_t state)
 {
         struct sysdev_class * cls;
+        struct sys_device *sysdev, *err_dev;
+        struct sysdev_driver *drv, *err_drv;
+        int ret;
 
         pr_debug("Suspending System Devices\n");
 
         list_for_each_entry_reverse(cls, &system_subsys.kset.list,
                                     kset.kobj.entry) {
-                struct sys_device * sysdev;
 
                 pr_debug("Suspending type '%s':\n",
                          kobject_name(&cls->kset.kobj));
 
                 list_for_each_entry(sysdev, &cls->kset.list, kobj.entry) {
-                        struct sysdev_driver * drv;
                         pr_debug(" %s\n", kobject_name(&sysdev->kobj));
 
                         /* Call global drivers first. */
                         list_for_each_entry(drv, &sysdev_drivers, entry) {
-                                if (drv->suspend)
-                                        drv->suspend(sysdev, state);
+                                if (drv->suspend) {
+                                        ret = drv->suspend(sysdev, state);
+                                        if (ret)
+                                                goto gbl_driver;
+                                }
                         }
 
                         /* Call auxillary drivers next. */
                         list_for_each_entry(drv, &cls->drivers, entry) {
-                                if (drv->suspend)
-                                        drv->suspend(sysdev, state);
+                                if (drv->suspend) {
+                                        ret = drv->suspend(sysdev, state);
+                                        if (ret)
+                                                goto aux_driver;
+                                }
                         }
 
                         /* Now call the generic one */
-                        if (cls->suspend)
-                                cls->suspend(sysdev, state);
+                        if (cls->suspend) {
+                                ret = cls->suspend(sysdev, state);
+                                if (ret)
+                                        goto cls_driver;
+                        }
                 }
         }
         return 0;
+        /* resume current sysdev */
+cls_driver:
+        drv = NULL;
+        printk(KERN_ERR "Class suspend failed for %s\n",
+                kobject_name(&sysdev->kobj));
+
+aux_driver:
+        if (drv)
+                printk(KERN_ERR "Class driver suspend failed for %s\n",
+                                kobject_name(&sysdev->kobj));
+        list_for_each_entry(err_drv, &cls->drivers, entry) {
+                if (err_drv == drv)
+                        break;
+                if (err_drv->resume)
+                        err_drv->resume(sysdev);
+        }
+        drv = NULL;
+
+gbl_driver:
+        if (drv)
+                printk(KERN_ERR "sysdev driver suspend failed for %s\n",
+                                kobject_name(&sysdev->kobj));
+        list_for_each_entry(err_drv, &sysdev_drivers, entry) {
+                if (err_drv == drv)
+                        break;
+                if (err_drv->resume)
+                        err_drv->resume(sysdev);
+        }
+        /* resume other sysdevs in current class */
+        list_for_each_entry(err_dev, &cls->kset.list, kobj.entry) {
+                if (err_dev == sysdev)
+                        break;
+                pr_debug(" %s\n", kobject_name(&err_dev->kobj));
+                __sysdev_resume(err_dev);
+        }
+
+        /* resume other classes */
+        list_for_each_entry_continue(cls, &system_subsys.kset.list,
+                                        kset.kobj.entry) {
+                list_for_each_entry(err_dev, &cls->kset.list, kobj.entry) {
+                        pr_debug(" %s\n", kobject_name(&err_dev->kobj));
+                        __sysdev_resume(err_dev);
+                }
+        }
+        return ret;
 }
 
 
@@ -362,25 +438,9 @@ int sysdev_resume(void)
                          kobject_name(&cls->kset.kobj));
 
                 list_for_each_entry(sysdev, &cls->kset.list, kobj.entry) {
-                        struct sysdev_driver * drv;
                         pr_debug(" %s\n", kobject_name(&sysdev->kobj));
 
-                        /* First, call the class-specific one */
-                        if (cls->resume)
-                                cls->resume(sysdev);
-
-                        /* Call auxillary drivers next. */
-                        list_for_each_entry(drv, &cls->drivers, entry) {
-                                if (drv->resume)
-                                        drv->resume(sysdev);
-                        }
-
-                        /* Call global drivers. */
-                        list_for_each_entry(drv, &sysdev_drivers, entry) {
-                                if (drv->resume)
-                                        drv->resume(sysdev);
-                        }
-
+                        __sysdev_resume(sysdev);
                 }
         }
         return 0;
diff --git a/drivers/base/transport_class.c b/drivers/base/transport_class.c
index 6c2b447a333..f25e7c6b2d2 100644
--- a/drivers/base/transport_class.c
+++ b/drivers/base/transport_class.c
@@ -7,7 +7,7 @@
  * This file is licensed under GPLv2
  *
  * The basic idea here is to allow any "device controller" (which
- * would most often be a Host Bus Adapter" to use the services of one
+ * would most often be a Host Bus Adapter to use the services of one
  * or more tranport classes for performing transport specific
  * services.  Transport specific services are things that the generic
  * command layer doesn't want to know about (speed settings, line
@@ -64,7 +64,9 @@ void transport_class_unregister(struct transport_class *tclass)
 }
 EXPORT_SYMBOL_GPL(transport_class_unregister);
 
-static int anon_transport_dummy_function(struct device *dev)
+static int anon_transport_dummy_function(struct transport_container *tc,
+                                         struct device *dev,
+                                         struct class_device *cdev)
 {
         /* do nothing */
         return 0;
@@ -115,9 +117,10 @@ static int transport_setup_classdev(struct attribute_container *cont,
                                     struct class_device *classdev)
 {
         struct transport_class *tclass = class_to_transport_class(cont->class);
+        struct transport_container *tcont = attribute_container_to_transport_container(cont);
 
         if (tclass->setup)
-                tclass->setup(dev);
+                tclass->setup(tcont, dev, classdev);
 
         return 0;
 }
@@ -178,12 +181,14 @@ void transport_add_device(struct device *dev)
 EXPORT_SYMBOL_GPL(transport_add_device);
 
 static int transport_configure(struct attribute_container *cont,
-                               struct device *dev)
+                               struct device *dev,
+                               struct class_device *cdev)
 {
         struct transport_class *tclass = class_to_transport_class(cont->class);
+        struct transport_container *tcont = attribute_container_to_transport_container(cont);
 
         if (tclass->configure)
-                tclass->configure(dev);
+                tclass->configure(tcont, dev, cdev);
 
         return 0;
 }
@@ -202,7 +207,7 @@ static int transport_configure(struct attribute_container *cont,
  */
 void transport_configure_device(struct device *dev)
 {
-        attribute_container_trigger(dev, transport_configure);
+        attribute_container_device_trigger(dev, transport_configure);
 }
 EXPORT_SYMBOL_GPL(transport_configure_device);
 
@@ -215,7 +220,7 @@ static int transport_remove_classdev(struct attribute_container *cont,
         struct transport_class *tclass = class_to_transport_class(cont->class);
 
         if (tclass->remove)
-                tclass->remove(dev);
+                tclass->remove(tcont, dev, classdev);
 
         if (tclass->remove != anon_transport_dummy_function) {
                 if (tcont->statistics)
diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index b594768b024..51b0af1cebe 100644
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -6,7 +6,7 @@ menu "Block devices"
 
 config BLK_DEV_FD
         tristate "Normal floppy disk support"
-        depends on (!ARCH_S390 && !M68K && !IA64 && !UML && !ARM) || Q40 || (SUN3X && BROKEN) || ARCH_RPC || ARCH_EBSA285
+        depends on ARCH_MAY_HAVE_PC_FDC
         ---help---
           If you want to use the floppy disk drive(s) of your PC under Linux,
           say Y. Information about this driver, especially important for IBM
@@ -408,54 +408,12 @@ config BLK_DEV_INITRD
           "real" root file system, etc. See <file:Documentation/initrd.txt>
           for details.
 
-config INITRAMFS_SOURCE
-        string "Initramfs source file(s)"
-        default ""
-        help
-          This can be either a single cpio archive with a .cpio suffix or a
-          space-separated list of directories and files for building the
-          initramfs image.  A cpio archive should contain a filesystem archive
-          to be used as an initramfs image.  Directories should contain a
-          filesystem layout to be included in the initramfs image.  Files
-          should contain entries according to the format described by the
-          "usr/gen_init_cpio" program in the kernel tree.
-
-          When multiple directories and files are specified then the
-          initramfs image will be the aggregate of all of them.
-
-          See <file:Documentation/early-userspace/README for more details.
-
-          If you are not sure, leave it blank.
-
-config INITRAMFS_ROOT_UID
-        int "User ID to map to 0 (user root)"
-        depends on INITRAMFS_SOURCE!=""
-        default "0"
-        help
-          This setting is only meaningful if the INITRAMFS_SOURCE is
-          contains a directory.  Setting this user ID (UID) to something
-          other than "0" will cause all files owned by that UID to be
-          owned by user root in the initial ramdisk image.
-
-          If you are not sure, leave it set to "0".
-
-config INITRAMFS_ROOT_GID
-        int "Group ID to map to 0 (group root)"
-        depends on INITRAMFS_SOURCE!=""
-        default "0"
-        help
-          This setting is only meaningful if the INITRAMFS_SOURCE is
-          contains a directory.  Setting this group ID (GID) to something
-          other than "0" will cause all files owned by that GID to be
-          owned by group root in the initial ramdisk image.
-
-          If you are not sure, leave it set to "0".
 
 #XXX - it makes sense to enable this only for 32-bit subarch's, not for x86_64
 #for instance.
 config LBD
         bool "Support for Large Block Devices"
-        depends on X86 || MIPS32 || PPC32 || ARCH_S390_31 || SUPERH || UML
+        depends on X86 || (MIPS && 32BIT) || PPC32 || ARCH_S390_31 || SUPERH || UML
         help
           Say Y here if you want to attach large (bigger than 2TB) discs to
           your machine, or if you want to have a raid or loopback device
diff --git a/drivers/block/aoe/aoedev.c b/drivers/block/aoe/aoedev.c
index 6e231c5a119..ded33ba31ac 100644
--- a/drivers/block/aoe/aoedev.c
+++ b/drivers/block/aoe/aoedev.c
@@ -35,7 +35,7 @@ aoedev_newdev(ulong nframes)
         struct aoedev *d;
         struct frame *f, *e;
 
-        d = kcalloc(1, sizeof *d, GFP_ATOMIC);
+        d = kzalloc(sizeof *d, GFP_ATOMIC);
         if (d == NULL)
                 return NULL;
         f = kcalloc(nframes, sizeof *f, GFP_ATOMIC);
diff --git a/drivers/block/cfq-iosched.c b/drivers/block/cfq-iosched.c
index cd056e7e64e..30c0903c7cd 100644
--- a/drivers/block/cfq-iosched.c
+++ b/drivers/block/cfq-iosched.c
@@ -2260,8 +2260,6 @@ static void cfq_put_cfqd(struct cfq_data *cfqd)
         if (!atomic_dec_and_test(&cfqd->ref))
                 return;
 
-        blk_put_queue(q);
-
         cfq_shutdown_timer_wq(cfqd);
         q->elevator->elevator_data = NULL;
 
@@ -2318,7 +2316,6 @@ static int cfq_init_queue(request_queue_t *q, elevator_t *e)
         e->elevator_data = cfqd;
 
         cfqd->queue = q;
-        atomic_inc(&q->refcnt);
 
         cfqd->max_queued = q->nr_requests / 4;
         q->nr_batching = cfq_queued;
diff --git a/drivers/block/cryptoloop.c b/drivers/block/cryptoloop.c
index 5be6f998d8c..3d4261c39f1 100644
--- a/drivers/block/cryptoloop.c
+++ b/drivers/block/cryptoloop.c
@@ -57,9 +57,11 @@ cryptoloop_init(struct loop_device *lo, const struct loop_info64 *info)
         mode = strsep(&cmsp, "-");
 
         if (mode == NULL || strcmp(mode, "cbc") == 0)
-                tfm = crypto_alloc_tfm(cipher, CRYPTO_TFM_MODE_CBC);
+                tfm = crypto_alloc_tfm(cipher, CRYPTO_TFM_MODE_CBC |
+                                               CRYPTO_TFM_REQ_MAY_SLEEP);
         else if (strcmp(mode, "ecb") == 0)
-                tfm = crypto_alloc_tfm(cipher, CRYPTO_TFM_MODE_ECB);
+                tfm = crypto_alloc_tfm(cipher, CRYPTO_TFM_MODE_ECB |
+                                               CRYPTO_TFM_REQ_MAY_SLEEP);
         if (tfm == NULL)
                 return -EINVAL;
 
diff --git a/drivers/block/deadline-iosched.c b/drivers/block/deadline-iosched.c
index ff5201e0215..24594c57c32 100644
--- a/drivers/block/deadline-iosched.c
+++ b/drivers/block/deadline-iosched.c
@@ -507,18 +507,12 @@ static int deadline_dispatch_requests(struct deadline_data *dd)
         const int reads = !list_empty(&dd->fifo_list[READ]);
         const int writes = !list_empty(&dd->fifo_list[WRITE]);
         struct deadline_rq *drq;
-        int data_dir, other_dir;
+        int data_dir;
 
         /*
          * batches are currently reads XOR writes
          */
-        drq = NULL;
-
-        if (dd->next_drq[READ])
-                drq = dd->next_drq[READ];
-
-        if (dd->next_drq[WRITE])
-                drq = dd->next_drq[WRITE];
+        drq = dd->next_drq[WRITE] ? : dd->next_drq[READ];
 
         if (drq) {
                 /* we have a "next request" */
@@ -544,7 +538,6 @@ static int deadline_dispatch_requests(struct deadline_data *dd)
                         goto dispatch_writes;
 
                 data_dir = READ;
-                other_dir = WRITE;
 
                 goto dispatch_find_request;
         }
@@ -560,7 +553,6 @@ dispatch_writes:
                 dd->starved = 0;
 
                 data_dir = WRITE;
-                other_dir = READ;
 
                 goto dispatch_find_request;
         }
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index f0c1084b840..888dad5eef3 100644
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -493,6 +493,8 @@ static struct floppy_struct user_params[N_DRIVE];
 
 static sector_t floppy_sizes[256];
 
+static char floppy_device_name[] = "floppy";
+
 /*
  * The driver is trying to determine the correct media format
  * while probing is set. rw_interrupt() clears it after a
@@ -4191,18 +4193,24 @@ static int __init floppy_setup(char *str)
 
 static int have_no_fdc = -ENODEV;
 
+static ssize_t floppy_cmos_show(struct device *dev,
+                                struct device_attribute *attr, char *buf)
+{
+        struct platform_device *p;
+        int drive;
+
+        p = container_of(dev, struct platform_device,dev);
+        drive = p->id;
+        return sprintf(buf, "%X\n", UDP->cmos);
+}
+DEVICE_ATTR(cmos,S_IRUGO,floppy_cmos_show,NULL);
+
 static void floppy_device_release(struct device *dev)
 {
         complete(&device_release);
 }
 
-static struct platform_device floppy_device = {
-        .name           = "floppy",
-        .id             = 0,
-        .dev            = {
-                        .release = floppy_device_release,
-                        }
-};
+static struct platform_device floppy_device[N_DRIVE];
 
 static struct kobject *floppy_find(dev_t dev, int *part, void *data)
 {
@@ -4370,20 +4378,26 @@ static int __init floppy_init(void)
                 goto out_flush_work;
         }
 
-        err = platform_device_register(&floppy_device);
-        if (err)
-                goto out_flush_work;
-
         for (drive = 0; drive < N_DRIVE; drive++) {
                 if (!(allowed_drive_mask & (1 << drive)))
                         continue;
                 if (fdc_state[FDC(drive)].version == FDC_NONE)
                         continue;
+
+                floppy_device[drive].name = floppy_device_name;
+                floppy_device[drive].id = drive;
+                floppy_device[drive].dev.release = floppy_device_release;
+
+                err = platform_device_register(&floppy_device[drive]);
+                if (err)
+                        goto out_flush_work;
+
+                device_create_file(&floppy_device[drive].dev,&dev_attr_cmos);
                 /* to be cleaned up... */
                 disks[drive]->private_data = (void *)(long)drive;
                 disks[drive]->queue = floppy_queue;
                 disks[drive]->flags |= GENHD_FL_REMOVABLE;
-                disks[drive]->driverfs_dev = &floppy_device.dev;
+                disks[drive]->driverfs_dev = &floppy_device[drive].dev;
                 add_disk(disks[drive]);
         }
 
@@ -4603,10 +4617,11 @@ void cleanup_module(void)
                     fdc_state[FDC(drive)].version != FDC_NONE) {
                         del_gendisk(disks[drive]);
                         unregister_devfs_entries(drive);
+                        device_remove_file(&floppy_device[drive].dev, &dev_attr_cmos);
+                        platform_device_unregister(&floppy_device[drive]);
                 }
                 put_disk(disks[drive]);
         }
-        platform_device_unregister(&floppy_device);
         devfs_remove("floppy");
 
         del_timer_sync(&fd_timeout);
diff --git a/drivers/block/genhd.c b/drivers/block/genhd.c
index 47fd3659a06..d42840cc0d1 100644
--- a/drivers/block/genhd.c
+++ b/drivers/block/genhd.c
@@ -45,7 +45,7 @@ int get_blkdev_list(char *p, int used)
         struct blk_major_name *n;
         int i, len;
 
-        len = sprintf(p, "\nBlock devices:\n");
+        len = snprintf(p, (PAGE_SIZE-used), "\nBlock devices:\n");
 
         down(&block_subsys_sem);
         for (i = 0; i < ARRAY_SIZE(major_names); i++) {
diff --git a/drivers/block/ll_rw_blk.c b/drivers/block/ll_rw_blk.c
index 3c818544475..483d71b10cf 100644
--- a/drivers/block/ll_rw_blk.c
+++ b/drivers/block/ll_rw_blk.c
@@ -235,8 +235,8 @@ void blk_queue_make_request(request_queue_t * q, make_request_fn * mfn)
          * set defaults
          */
         q->nr_requests = BLKDEV_MAX_RQ;
-        q->max_phys_segments = MAX_PHYS_SEGMENTS;
-        q->max_hw_segments = MAX_HW_SEGMENTS;
+        blk_queue_max_phys_segments(q, MAX_PHYS_SEGMENTS);
+        blk_queue_max_hw_segments(q, MAX_HW_SEGMENTS);
         q->make_request_fn = mfn;
         q->backing_dev_info.ra_pages = (VM_MAX_READAHEAD * 1024) / PAGE_CACHE_SIZE;
         q->backing_dev_info.state = 0;
@@ -284,6 +284,7 @@ static inline void rq_init(request_queue_t *q, struct request *rq)
         rq->special = NULL;
         rq->data_len = 0;
         rq->data = NULL;
+        rq->nr_phys_segments = 0;
         rq->sense = NULL;
         rq->end_io = NULL;
         rq->end_io_data = NULL;
@@ -2115,7 +2116,7 @@ EXPORT_SYMBOL(blk_insert_request);
 /**
  * blk_rq_map_user - map user data to a request, for REQ_BLOCK_PC usage
  * @q:          request queue where request should be inserted
- * @rw:         READ or WRITE data
+ * @rq:         request structure to fill
  * @ubuf:       the user buffer
  * @len:        length of user data
  *
@@ -2132,21 +2133,19 @@ EXPORT_SYMBOL(blk_insert_request);
  *    original bio must be passed back in to blk_rq_unmap_user() for proper
  *    unmapping.
  */
-struct request *blk_rq_map_user(request_queue_t *q, int rw, void __user *ubuf,
-                                unsigned int len)
+int blk_rq_map_user(request_queue_t *q, struct request *rq, void __user *ubuf,
+                    unsigned int len)
 {
         unsigned long uaddr;
-        struct request *rq;
         struct bio *bio;
+        int reading;
 
         if (len > (q->max_sectors << 9))
-                return ERR_PTR(-EINVAL);
-        if ((!len && ubuf) || (len && !ubuf))
-                return ERR_PTR(-EINVAL);
+                return -EINVAL;
+        if (!len || !ubuf)
+                return -EINVAL;
 
-        rq = blk_get_request(q, rw, __GFP_WAIT);
-        if (!rq)
-                return ERR_PTR(-ENOMEM);
+        reading = rq_data_dir(rq) == READ;
 
         /*
          * if alignment requirement is satisfied, map in user pages for
@@ -2154,9 +2153,9 @@ struct request *blk_rq_map_user(request_queue_t *q, int rw, void __user *ubuf,
          */
         uaddr = (unsigned long) ubuf;
         if (!(uaddr & queue_dma_alignment(q)) && !(len & queue_dma_alignment(q)))
-                bio = bio_map_user(q, NULL, uaddr, len, rw == READ);
+                bio = bio_map_user(q, NULL, uaddr, len, reading);
         else
-                bio = bio_copy_user(q, uaddr, len, rw == READ);
+                bio = bio_copy_user(q, uaddr, len, reading);
 
         if (!IS_ERR(bio)) {
                 rq->bio = rq->biotail = bio;
@@ -2164,28 +2163,70 @@ struct request *blk_rq_map_user(request_queue_t *q, int rw, void __user *ubuf,
 
                 rq->buffer = rq->data = NULL;
                 rq->data_len = len;
-                return rq;
+                return 0;
         }
 
         /*
          * bio is the err-ptr
          */
-        blk_put_request(rq);
-        return (struct request *) bio;
+        return PTR_ERR(bio);
 }
 
 EXPORT_SYMBOL(blk_rq_map_user);
 
 /**
+ * blk_rq_map_user_iov - map user data to a request, for REQ_BLOCK_PC usage
+ * @q:          request queue where request should be inserted
+ * @rq:         request to map data to
+ * @iov:        pointer to the iovec
+ * @iov_count:  number of elements in the iovec
+ *
+ * Description:
+ *    Data will be mapped directly for zero copy io, if possible. Otherwise
+ *    a kernel bounce buffer is used.
+ *
+ *    A matching blk_rq_unmap_user() must be issued at the end of io, while
+ *    still in process context.
+ *
+ *    Note: The mapped bio may need to be bounced through blk_queue_bounce()
+ *    before being submitted to the device, as pages mapped may be out of
+ *    reach. It's the callers responsibility to make sure this happens. The
+ *    original bio must be passed back in to blk_rq_unmap_user() for proper
+ *    unmapping.
+ */
+int blk_rq_map_user_iov(request_queue_t *q, struct request *rq,
+                        struct sg_iovec *iov, int iov_count)
+{
+        struct bio *bio;
+
+        if (!iov || iov_count <= 0)
+                return -EINVAL;
+
+        /* we don't allow misaligned data like bio_map_user() does.  If the
+         * user is using sg, they're expected to know the alignment constraints
+         * and respect them accordingly */
+        bio = bio_map_user_iov(q, NULL, iov, iov_count, rq_data_dir(rq)== READ);
+        if (IS_ERR(bio))
+                return PTR_ERR(bio);
+
+        rq->bio = rq->biotail = bio;
+        blk_rq_bio_prep(q, rq, bio);
+        rq->buffer = rq->data = NULL;
+        rq->data_len = bio->bi_size;
+        return 0;
+}
+
+EXPORT_SYMBOL(blk_rq_map_user_iov);
+
+/**
  * blk_rq_unmap_user - unmap a request with user data
- * @rq:         request to be unmapped
- * @bio:        bio for the request
+ * @bio:        bio to be unmapped
  * @ulen:       length of user buffer
  *
  * Description:
- *    Unmap a request previously mapped by blk_rq_map_user().
+ *    Unmap a bio previously mapped by blk_rq_map_user().
  */
-int blk_rq_unmap_user(struct request *rq, struct bio *bio, unsigned int ulen)
+int blk_rq_unmap_user(struct bio *bio, unsigned int ulen)
 {
         int ret = 0;
 
@@ -2196,31 +2237,89 @@ int blk_rq_unmap_user(struct request *rq, struct bio *bio, unsigned int ulen)
                         ret = bio_uncopy_user(bio);
         }
 
-        blk_put_request(rq);
-        return ret;
+        return 0;
 }
 
 EXPORT_SYMBOL(blk_rq_unmap_user);
 
 /**
+ * blk_rq_map_kern - map kernel data to a request, for REQ_BLOCK_PC usage
+ * @q:          request queue where request should be inserted
+ * @rq:         request to fill
+ * @kbuf:       the kernel buffer
+ * @len:        length of user data
+ * @gfp_mask:   memory allocation flags
+ */
+int blk_rq_map_kern(request_queue_t *q, struct request *rq, void *kbuf,
+                    unsigned int len, unsigned int gfp_mask)
+{
+        struct bio *bio;
+
+        if (len > (q->max_sectors << 9))
+                return -EINVAL;
+        if (!len || !kbuf)
+                return -EINVAL;
+
+        bio = bio_map_kern(q, kbuf, len, gfp_mask);
+        if (IS_ERR(bio))
+                return PTR_ERR(bio);
+
+        if (rq_data_dir(rq) == WRITE)
+                bio->bi_rw |= (1 << BIO_RW);
+
+        rq->bio = rq->biotail = bio;
+        blk_rq_bio_prep(q, rq, bio);
+
+        rq->buffer = rq->data = NULL;
+        rq->data_len = len;
+        return 0;
+}
+
+EXPORT_SYMBOL(blk_rq_map_kern);
+
+/**
+ * blk_execute_rq_nowait - insert a request into queue for execution
+ * @q:          queue to insert the request in
+ * @bd_disk:    matching gendisk
+ * @rq:         request to insert
+ * @at_head:    insert request at head or tail of queue
+ * @done:       I/O completion handler
+ *
+ * Description:
+ *    Insert a fully prepared request at the back of the io scheduler queue
+ *    for execution.  Don't wait for completion.
+ */
+void blk_execute_rq_nowait(request_queue_t *q, struct gendisk *bd_disk,
+                           struct request *rq, int at_head,
+                           void (*done)(struct request *))
+{
+        int where = at_head ? ELEVATOR_INSERT_FRONT : ELEVATOR_INSERT_BACK;
+
+        rq->rq_disk = bd_disk;
+        rq->flags |= REQ_NOMERGE;
+        rq->end_io = done;
+        elv_add_request(q, rq, where, 1);
+        generic_unplug_device(q);
+}
+
+/**
  * blk_execute_rq - insert a request into queue for execution
  * @q:          queue to insert the request in
  * @bd_disk:    matching gendisk
  * @rq:         request to insert
+ * @at_head:    insert request at head or tail of queue
  *
  * Description:
  *    Insert a fully prepared request at the back of the io scheduler queue
- *    for execution.
+ *    for execution and wait for completion.
  */
 int blk_execute_rq(request_queue_t *q, struct gendisk *bd_disk,
-                   struct request *rq)
+                   struct request *rq, int at_head)
 {
         DECLARE_COMPLETION(wait);
         char sense[SCSI_SENSE_BUFFERSIZE];
         int err = 0;
 
-        rq->rq_disk = bd_disk;
-
         /*
          * we need an extra reference to the request, so we can look at
          * it after io completion
@@ -2233,11 +2332,8 @@ int blk_execute_rq(request_queue_t *q, struct gendisk *bd_disk,
                 rq->sense_len = 0;
         }
 
-        rq->flags |= REQ_NOMERGE;
         rq->waiting = &wait;
-        rq->end_io = blk_end_sync_rq;
-        elv_add_request(q, rq, ELEVATOR_INSERT_BACK, 1);
-        generic_unplug_device(q);
+        blk_execute_rq_nowait(q, bd_disk, rq, at_head, blk_end_sync_rq);
         wait_for_completion(&wait);
         rq->waiting = NULL;
 
@@ -2277,6 +2373,44 @@ int blkdev_issue_flush(struct block_device *bdev, sector_t *error_sector)
 
 EXPORT_SYMBOL(blkdev_issue_flush);
 
+/**
+ * blkdev_scsi_issue_flush_fn - issue flush for SCSI devices
+ * @q:          device queue
+ * @disk:       gendisk
+ * @error_sector:       error offset
+ *
+ * Description:
+ *    Devices understanding the SCSI command set, can use this function as
+ *    a helper for issuing a cache flush. Note: driver is required to store
+ *    the error offset (in case of error flushing) in ->sector of struct
+ *    request.
+ */
+int blkdev_scsi_issue_flush_fn(request_queue_t *q, struct gendisk *disk,
+                               sector_t *error_sector)
+{
+        struct request *rq = blk_get_request(q, WRITE, __GFP_WAIT);
+        int ret;
+
+        rq->flags |= REQ_BLOCK_PC | REQ_SOFTBARRIER;
+        rq->sector = 0;
+        memset(rq->cmd, 0, sizeof(rq->cmd));
+        rq->cmd[0] = 0x35;
+        rq->cmd_len = 12;
+        rq->data = NULL;
+        rq->data_len = 0;
+        rq->timeout = 60 * HZ;
+
+        ret = blk_execute_rq(q, disk, rq, 0);
+
+        if (ret && error_sector)
+                *error_sector = rq->sector;
+
+        blk_put_request(rq);
+        return ret;
+}
+
+EXPORT_SYMBOL(blkdev_scsi_issue_flush_fn);
+
 static void drive_stat_acct(struct request *rq, int nr_sectors, int new_io)
 {
         int rw = rq_data_dir(rq);
diff --git a/drivers/block/scsi_ioctl.c b/drivers/block/scsi_ioctl.c
index 681871ca5d6..abb2df249fd 100644
--- a/drivers/block/scsi_ioctl.c
+++ b/drivers/block/scsi_ioctl.c
@@ -216,7 +216,7 @@ static int sg_io(struct file *file, request_queue_t *q,
                 struct gendisk *bd_disk, struct sg_io_hdr *hdr)
 {
         unsigned long start_time;
-        int reading, writing;
+        int writing = 0, ret = 0;
         struct request *rq;
         struct bio *bio;
         char sense[SCSI_SENSE_BUFFERSIZE];
@@ -231,38 +231,48 @@ static int sg_io(struct file *file, request_queue_t *q,
         if (verify_command(file, cmd))
                 return -EPERM;
 
-        /*
-         * we'll do that later
-         */
-        if (hdr->iovec_count)
-                return -EOPNOTSUPP;
-
         if (hdr->dxfer_len > (q->max_sectors << 9))
                 return -EIO;
 
-        reading = writing = 0;
-        if (hdr->dxfer_len) {
+        if (hdr->dxfer_len)
                 switch (hdr->dxfer_direction) {
                 default:
                         return -EINVAL;
                 case SG_DXFER_TO_FROM_DEV:
-                        reading = 1;
-                        /* fall through */
                 case SG_DXFER_TO_DEV:
                         writing = 1;
                         break;
                 case SG_DXFER_FROM_DEV:
-                        reading = 1;
                         break;
                 }
 
-                rq = blk_rq_map_user(q, writing ? WRITE : READ, hdr->dxferp,
-                                     hdr->dxfer_len);
+        rq = blk_get_request(q, writing ? WRITE : READ, GFP_KERNEL);
+        if (!rq)
+                return -ENOMEM;
+
+        if (hdr->iovec_count) {
+                const int size = sizeof(struct sg_iovec) * hdr->iovec_count;
+                struct sg_iovec *iov;
+
+                iov = kmalloc(size, GFP_KERNEL);
+                if (!iov) {
+                        ret = -ENOMEM;
+                        goto out;
+                }
+
+                if (copy_from_user(iov, hdr->dxferp, size)) {
+                        kfree(iov);
+                        ret = -EFAULT;
+                        goto out;
+                }
+
+                ret = blk_rq_map_user_iov(q, rq, iov, hdr->iovec_count);
+                kfree(iov);
+        } else if (hdr->dxfer_len)
+                ret = blk_rq_map_user(q, rq, hdr->dxferp, hdr->dxfer_len);
 
-                if (IS_ERR(rq))
-                        return PTR_ERR(rq);
-        } else
-                rq = blk_get_request(q, READ, __GFP_WAIT);
+        if (ret)
+                goto out;
 
         /*
          * fill in request structure
@@ -298,7 +308,7 @@ static int sg_io(struct file *file, request_queue_t *q,
          * (if he doesn't check that is his problem).
          * N.B. a non-zero SCSI status is _not_ necessarily an error.
          */
-        blk_execute_rq(q, bd_disk, rq);
+        blk_execute_rq(q, bd_disk, rq, 0);
 
         /* write to all output members */
         hdr->status = 0xff & rq->errors;
@@ -320,12 +330,14 @@ static int sg_io(struct file *file, request_queue_t *q,
                         hdr->sb_len_wr = len;
         }
 
-        if (blk_rq_unmap_user(rq, bio, hdr->dxfer_len))
-                return -EFAULT;
+        if (blk_rq_unmap_user(bio, hdr->dxfer_len))
+                ret = -EFAULT;
 
         /* may not have succeeded, but output values written to control
          * structure (struct sg_io_hdr).  */
-        return 0;
+out:
+        blk_put_request(rq);
+        return ret;
 }
 
 #define OMAX_SB_LEN 16          /* For backward compatibility */
@@ -408,7 +420,7 @@ static int sg_scsi_ioctl(struct file *file, request_queue_t *q,
         rq->data_len = bytes;
         rq->flags |= REQ_BLOCK_PC;
 
-        blk_execute_rq(q, bd_disk, rq);
+        blk_execute_rq(q, bd_disk, rq, 0);
         err = rq->errors & 0xff;        /* only 8 bit SCSI status */
         if (err) {
                 if (rq->sense_len && rq->sense) {
@@ -561,7 +573,7 @@ int scsi_cmd_ioctl(struct file *file, struct gendisk *bd_disk, unsigned int cmd,
                         rq->cmd[0] = GPCMD_START_STOP_UNIT;
                         rq->cmd[4] = 0x02 + (close != 0);
                         rq->cmd_len = 6;
-                        err = blk_execute_rq(q, bd_disk, rq);
+                        err = blk_execute_rq(q, bd_disk, rq, 0);
                         blk_put_request(rq);
                         break;
                 default:
diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
index beaa561f2ed..15396034841 100644
--- a/drivers/cdrom/cdrom.c
+++ b/drivers/cdrom/cdrom.c
@@ -2097,6 +2097,10 @@ static int cdrom_read_cdda_bpc(struct cdrom_device_info *cdi, __u8 __user *ubuf,
         if (!q)
                 return -ENXIO;
 
+        rq = blk_get_request(q, READ, GFP_KERNEL);
+        if (!rq)
+                return -ENOMEM;
+
         cdi->last_sense = 0;
 
         while (nframes) {
@@ -2108,9 +2112,9 @@ static int cdrom_read_cdda_bpc(struct cdrom_device_info *cdi, __u8 __user *ubuf,
 
                 len = nr * CD_FRAMESIZE_RAW;
 
-                rq = blk_rq_map_user(q, READ, ubuf, len);
-                if (IS_ERR(rq))
-                        return PTR_ERR(rq);
+                ret = blk_rq_map_user(q, rq, ubuf, len);
+                if (ret)
+                        break;
 
                 memset(rq->cmd, 0, sizeof(rq->cmd));
                 rq->cmd[0] = GPCMD_READ_CD;
@@ -2132,13 +2136,13 @@ static int cdrom_read_cdda_bpc(struct cdrom_device_info *cdi, __u8 __user *ubuf,
                 if (rq->bio)
                         blk_queue_bounce(q, &rq->bio);
 
-                if (blk_execute_rq(q, cdi->disk, rq)) {
+                if (blk_execute_rq(q, cdi->disk, rq, 0)) {
                         struct request_sense *s = rq->sense;
                         ret = -EIO;
                         cdi->last_sense = s->sense_key;
                 }
 
-                if (blk_rq_unmap_user(rq, bio, len))
+                if (blk_rq_unmap_user(bio, len))
                         ret = -EFAULT;
 
                 if (ret)
@@ -2149,6 +2153,7 @@ static int cdrom_read_cdda_bpc(struct cdrom_device_info *cdi, __u8 __user *ubuf,
                 ubuf += len;
         }
 
+        blk_put_request(rq);
         return ret;
 }
 
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 7333b41d422..2bc9d64db10 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -138,7 +138,7 @@ config CYZ_INTR
 
 config DIGIEPCA
         tristate "Digiboard Intelligent Async Support"
-        depends on SERIAL_NONSTANDARD && BROKEN_ON_SMP && (!64BIT || BROKEN)
+        depends on SERIAL_NONSTANDARD
         ---help---
           This is a driver for Digi International's Xx, Xeve, and Xem series
           of cards which provide multiple serial ports. You would need
@@ -735,7 +735,7 @@ config SGI_IP27_RTC
 
 config GEN_RTC
         tristate "Generic /dev/rtc emulation"
-        depends on RTC!=y && !IA64 && !ARM && !PPC64 && !M32R && !SPARC32
+        depends on RTC!=y && !IA64 && !ARM && !PPC64 && !M32R && !SPARC32 && !SPARC64
         ---help---
           If you say Y here and create a character special file /dev/rtc with
           major number 10 and minor number 135 using mknod ("man mknod"), you
@@ -842,8 +842,7 @@ config SONYPI
 
 config TANBAC_TB0219
         tristate "TANBAC TB0219 base board support"
-        depends TANBAC_TB0229
-
+        depends TANBAC_TB022X
 
 menu "Ftape, the floppy tape device driver"
 
diff --git a/drivers/char/digi1.h b/drivers/char/digi1.h
index 184378d23f8..94d4eab5d3c 100644
--- a/drivers/char/digi1.h
+++ b/drivers/char/digi1.h
@@ -1,46 +1,46 @@
 /*          Definitions for DigiBoard ditty(1) command.                 */
 
 #if !defined(TIOCMODG)
-#define TIOCMODG        ('d'<<8) | 250          /* get modem ctrl state */
-#define TIOCMODS        ('d'<<8) | 251          /* set modem ctrl state */
+#define TIOCMODG        (('d'<<8) | 250)        /* get modem ctrl state */
+#define TIOCMODS        (('d'<<8) | 251)        /* set modem ctrl state */
 #endif
 
 #if !defined(TIOCMSET)
-#define TIOCMSET        ('d'<<8) | 252          /* set modem ctrl state */
-#define TIOCMGET        ('d'<<8) | 253          /* set modem ctrl state */
+#define TIOCMSET        (('d'<<8) | 252)        /* set modem ctrl state */
+#define TIOCMGET        (('d'<<8) | 253)        /* set modem ctrl state */
 #endif
 
 #if !defined(TIOCMBIC)
-#define TIOCMBIC        ('d'<<8) | 254          /* set modem ctrl state */
-#define TIOCMBIS        ('d'<<8) | 255          /* set modem ctrl state */
+#define TIOCMBIC        (('d'<<8) | 254)        /* set modem ctrl state */
+#define TIOCMBIS        (('d'<<8) | 255)        /* set modem ctrl state */
 #endif
 
 #if !defined(TIOCSDTR)
-#define TIOCSDTR        ('e'<<8) | 0            /* set DTR              */
-#define TIOCCDTR        ('e'<<8) | 1            /* clear DTR            */
+#define TIOCSDTR        (('e'<<8) | 0)          /* set DTR              */
+#define TIOCCDTR        (('e'<<8) | 1)          /* clear DTR            */
 #endif
 
 /************************************************************************
  * Ioctl command arguments for DIGI parameters.
  ************************************************************************/
-#define DIGI_GETA       ('e'<<8) | 94           /* Read params          */
+#define DIGI_GETA       (('e'<<8) | 94)         /* Read params          */
 
-#define DIGI_SETA       ('e'<<8) | 95           /* Set params           */
-#define DIGI_SETAW      ('e'<<8) | 96           /* Drain & set params   */
-#define DIGI_SETAF      ('e'<<8) | 97           /* Drain, flush & set params */
+#define DIGI_SETA       (('e'<<8) | 95)         /* Set params           */
+#define DIGI_SETAW      (('e'<<8) | 96)         /* Drain & set params   */
+#define DIGI_SETAF      (('e'<<8) | 97)         /* Drain, flush & set params */
 
-#define DIGI_GETFLOW    ('e'<<8) | 99           /* Get startc/stopc flow */
+#define DIGI_GETFLOW    (('e'<<8) | 99)         /* Get startc/stopc flow */
                                                 /* control characters    */
-#define DIGI_SETFLOW    ('e'<<8) | 100          /* Set startc/stopc flow */
+#define DIGI_SETFLOW    (('e'<<8) | 100)        /* Set startc/stopc flow */
                                                 /* control characters    */
-#define DIGI_GETAFLOW   ('e'<<8) | 101          /* Get Aux. startc/stopc */
+#define DIGI_GETAFLOW   (('e'<<8) | 101)        /* Get Aux. startc/stopc */
                                                 /* flow control chars    */
-#define DIGI_SETAFLOW   ('e'<<8) | 102          /* Set Aux. startc/stopc */
+#define DIGI_SETAFLOW   (('e'<<8) | 102)        /* Set Aux. startc/stopc */
                                                 /* flow control chars    */
 
-#define DIGI_GETINFO    ('e'<<8) | 103          /* Fill in digi_info */
-#define DIGI_POLLER     ('e'<<8) | 104          /* Turn on/off poller */
-#define DIGI_INIT       ('e'<<8) | 105          /* Allow things to run. */
+#define DIGI_GETINFO    (('e'<<8) | 103)        /* Fill in digi_info */
+#define DIGI_POLLER     (('e'<<8) | 104)        /* Turn on/off poller */
+#define DIGI_INIT       (('e'<<8) | 105)        /* Allow things to run. */
 
 struct  digiflow_struct 
 {
diff --git a/drivers/char/digiFep1.h b/drivers/char/digiFep1.h
index c47d7fcb840..3c1f1922c79 100644
--- a/drivers/char/digiFep1.h
+++ b/drivers/char/digiFep1.h
@@ -13,88 +13,88 @@
 
 struct global_data 
 {
-        volatile ushort cin;
-        volatile ushort cout;
-        volatile ushort cstart;
-        volatile ushort cmax;
-        volatile ushort ein;
-        volatile ushort eout;
-        volatile ushort istart;
-        volatile ushort imax;
+        u16 cin;
+        u16 cout;
+        u16 cstart;
+        u16 cmax;
+        u16 ein;
+        u16 eout;
+        u16 istart;
+        u16 imax;
 };
 
 
 struct board_chan 
 {
-        int filler1; 
-        int filler2;
-        volatile ushort tseg;
-        volatile ushort tin;
-        volatile ushort tout;
-        volatile ushort tmax;
-        
-        volatile ushort rseg;
-        volatile ushort rin;
-        volatile ushort rout;
-        volatile ushort rmax;
-        
-        volatile ushort tlow;
-        volatile ushort rlow;
-        volatile ushort rhigh;
-        volatile ushort incr;
-        
-        volatile ushort etime;
-        volatile ushort edelay;
-        volatile unchar *dev;
-        
-        volatile ushort iflag;
-        volatile ushort oflag;
-        volatile ushort cflag;
-        volatile ushort gmask;
-        
-        volatile ushort col;
-        volatile ushort delay;
-        volatile ushort imask;
-        volatile ushort tflush;
-
-        int filler3;
-        int filler4;
-        int filler5;
-        int filler6;
-        
-        volatile unchar num;
-        volatile unchar ract;
-        volatile unchar bstat;
-        volatile unchar tbusy;
-        volatile unchar iempty;
-        volatile unchar ilow;
-        volatile unchar idata;
-        volatile unchar eflag;
-        
-        volatile unchar tflag;
-        volatile unchar rflag;
-        volatile unchar xmask;
-        volatile unchar xval;
-        volatile unchar mstat;
-        volatile unchar mchange;
-        volatile unchar mint;
-        volatile unchar lstat;
-
-        volatile unchar mtran;
-        volatile unchar orun;
-        volatile unchar startca;
-        volatile unchar stopca;
-        volatile unchar startc;
-        volatile unchar stopc;
-        volatile unchar vnext;
-        volatile unchar hflow;
-
-        volatile unchar fillc;
-        volatile unchar ochar;
-        volatile unchar omask;
-
-        unchar filler7;
-        unchar filler8[28];
+        u32 filler1;
+        u32 filler2;
+        u16 tseg;
+        u16 tin;
+        u16 tout;
+        u16 tmax;
+
+        u16 rseg;
+        u16 rin;
+        u16 rout;
+        u16 rmax;
+
+        u16 tlow;
+        u16 rlow;
+        u16 rhigh;
+        u16 incr;
+
+        u16 etime;
+        u16 edelay;
+        unchar *dev;
+
+        u16 iflag;
+        u16 oflag;
+        u16 cflag;
+        u16 gmask;
+
+        u16 col;
+        u16 delay;
+        u16 imask;
+        u16 tflush;
+
+        u32 filler3;
+        u32 filler4;
+        u32 filler5;
+        u32 filler6;
+
+        u8 num;
+        u8 ract;
+        u8 bstat;
+        u8 tbusy;
+        u8 iempty;
+        u8 ilow;
+        u8 idata;
+        u8 eflag;
+
+        u8 tflag;
+        u8 rflag;
+        u8 xmask;
+        u8 xval;
+        u8 mstat;
+        u8 mchange;
+        u8 mint;
+        u8 lstat;
+
+        u8 mtran;
+        u8 orun;
+        u8 startca;
+        u8 stopca;
+        u8 startc;
+        u8 stopc;
+        u8 vnext;
+        u8 hflow;
+
+        u8 fillc;
+        u8 ochar;
+        u8 omask;
+
+        u8 filler7;
+        u8 filler8[28];
 }; 
 
 
diff --git a/drivers/char/drm/drm_bufs.c b/drivers/char/drm/drm_bufs.c
index e0743ebbe4b..f28e70ae660 100644
--- a/drivers/char/drm/drm_bufs.c
+++ b/drivers/char/drm/drm_bufs.c
@@ -48,8 +48,8 @@ unsigned long drm_get_resource_len(drm_device_t *dev, unsigned int resource)
 }
 EXPORT_SYMBOL(drm_get_resource_len);
 
-static drm_local_map_t *drm_find_matching_map(drm_device_t *dev,
-                                              drm_local_map_t *map)
+static drm_map_list_t *drm_find_matching_map(drm_device_t *dev,
+                                             drm_local_map_t *map)
 {
         struct list_head *list;
 
@@ -57,7 +57,7 @@ static drm_local_map_t *drm_find_matching_map(drm_device_t *dev,
                 drm_map_list_t *entry = list_entry(list, drm_map_list_t, head);
                 if (entry->map && map->type == entry->map->type &&
                     entry->map->offset == map->offset) {
-                        return entry->map;
+                        return entry;
                 }
         }
 
@@ -114,14 +114,13 @@ static __inline__ unsigned int HandleID(unsigned long lhandle, drm_device_t *dev
  * type.  Adds the map to the map list drm_device::maplist. Adds MTRR's where
  * applicable and if supported by the kernel.
  */
-int drm_addmap(drm_device_t * dev, unsigned int offset,
-               unsigned int size, drm_map_type_t type,
-               drm_map_flags_t flags, drm_local_map_t ** map_ptr)
+int drm_addmap_core(drm_device_t * dev, unsigned int offset,
+                    unsigned int size, drm_map_type_t type,
+                    drm_map_flags_t flags, drm_map_list_t **maplist)
 {
         drm_map_t *map;
         drm_map_list_t *list;
         drm_dma_handle_t *dmah;
-        drm_local_map_t *found_map;
 
         map = drm_alloc( sizeof(*map), DRM_MEM_MAPS );
         if ( !map )
@@ -166,17 +165,17 @@ int drm_addmap(drm_device_t * dev, unsigned int offset,
                  * needing to be aware of it.  Therefore, we just return success
                  * when the server tries to create a duplicate map.
                  */
-                found_map = drm_find_matching_map(dev, map);
-                if (found_map != NULL) {
-                        if (found_map->size != map->size) {
+                list = drm_find_matching_map(dev, map);
+                if (list != NULL) {
+                        if (list->map->size != map->size) {
                                 DRM_DEBUG("Matching maps of type %d with "
                                    "mismatched sizes, (%ld vs %ld)\n",
-                                    map->type, map->size, found_map->size);
-                                found_map->size = map->size;
+                                    map->type, map->size, list->map->size);
+                                list->map->size = map->size;
                         }
 
                         drm_free(map, sizeof(*map), DRM_MEM_MAPS);
-                        *map_ptr = found_map;
+                        *maplist = list;
                         return 0;
                 }
 
@@ -264,9 +263,22 @@ int drm_addmap(drm_device_t * dev, unsigned int offset,
                                     : map->offset, dev);
         up(&dev->struct_sem);
 
-        *map_ptr = map;
+        *maplist = list;
         return 0;
 }
+
+int drm_addmap(drm_device_t *dev, unsigned int offset,
+               unsigned int size, drm_map_type_t type,
+               drm_map_flags_t flags, drm_local_map_t **map_ptr)
+{
+        drm_map_list_t *list;
+        int rc;
+
+        rc = drm_addmap_core(dev, offset, size, type, flags, &list);
+        if (!rc)
+                *map_ptr = list->map;
+        return rc;
+}
 EXPORT_SYMBOL(drm_addmap);
 
 int drm_addmap_ioctl(struct inode *inode, struct file *filp,
@@ -275,10 +287,9 @@ int drm_addmap_ioctl(struct inode *inode, struct file *filp,
         drm_file_t *priv = filp->private_data;
         drm_device_t *dev = priv->head->dev;
         drm_map_t map;
-        drm_map_t *map_ptr;
+        drm_map_list_t *maplist;
         drm_map_t __user *argp = (void __user *)arg;
         int err;
-        unsigned long handle = 0;
 
         if (!(filp->f_mode & 3))
                 return -EACCES; /* Require read/write */
@@ -287,26 +298,15 @@ int drm_addmap_ioctl(struct inode *inode, struct file *filp,
                 return -EFAULT;
         }
 
-        err = drm_addmap(dev, map.offset, map.size, map.type, map.flags,
-                         &map_ptr);
+        err = drm_addmap_core(dev, map.offset, map.size, map.type, map.flags,
+                              &maplist);
 
-        if (err) {
+        if (err) 
                 return err;
-        }
-
-        {
-                drm_map_list_t *_entry;
-                list_for_each_entry(_entry, &dev->maplist->head, head) {
-                        if (_entry->map == map_ptr)
-                                handle = _entry->user_token;
-                }
-                if (!handle)
-                        return -EFAULT;
-        }
 
-        if (copy_to_user(argp, map_ptr, sizeof(*map_ptr)))
+        if (copy_to_user(argp, maplist->map, sizeof(drm_map_t)))
                 return -EFAULT;
-        if (put_user(handle, &argp->handle))
+        if (put_user(maplist->user_token, &argp->handle))
                 return -EFAULT;
         return 0;
 }
@@ -1041,7 +1041,7 @@ static int drm_addbufs_sg(drm_device_t *dev, drm_buf_desc_t *request)
         return 0;
 }
 
-int drm_addbufs_fb(drm_device_t *dev, drm_buf_desc_t *request)
+static int drm_addbufs_fb(drm_device_t *dev, drm_buf_desc_t *request)
 {
         drm_device_dma_t *dma = dev->dma;
         drm_buf_entry_t *entry;
diff --git a/drivers/char/drm/drm_context.c b/drivers/char/drm/drm_context.c
index f515567e5b6..502892794c1 100644
--- a/drivers/char/drm/drm_context.c
+++ b/drivers/char/drm/drm_context.c
@@ -308,7 +308,7 @@ found:
  *
  * Attempt to set drm_device::context_flag.
  */
-int drm_context_switch( drm_device_t *dev, int old, int new )
+static int drm_context_switch( drm_device_t *dev, int old, int new )
 {
         if ( test_and_set_bit( 0, &dev->context_flag ) ) {
                 DRM_ERROR( "Reentering -- FIXME\n" );
diff --git a/drivers/char/drm/drm_sysfs.c b/drivers/char/drm/drm_sysfs.c
index 2fc10c4bbcd..475cc5e555e 100644
--- a/drivers/char/drm/drm_sysfs.c
+++ b/drivers/char/drm/drm_sysfs.c
@@ -17,6 +17,7 @@
 #include <linux/err.h>
 
 #include "drm_core.h"
+#include "drmP.h"
 
 struct drm_sysfs_class {
         struct class_device_attribute attr;
diff --git a/drivers/char/drm/mga_dma.c b/drivers/char/drm/mga_dma.c
index 567b425b784..fc7d4a594bc 100644
--- a/drivers/char/drm/mga_dma.c
+++ b/drivers/char/drm/mga_dma.c
@@ -417,6 +417,7 @@ int mga_driver_preinit(drm_device_t *dev, unsigned long flags)
         return 0;
 }
 
+#if __OS_HAS_AGP
 /**
  * Bootstrap the driver for AGP DMA.
  * 
@@ -560,6 +561,13 @@ static int mga_do_agp_dma_bootstrap(drm_device_t * dev,
         DRM_INFO("Initialized card for AGP DMA.\n");
         return 0;
 }
+#else
+static int mga_do_agp_dma_bootstrap(drm_device_t * dev,
+                                    drm_mga_dma_bootstrap_t * dma_bs)
+{
+        return -EINVAL;
+}
+#endif
 
 /**
  * Bootstrap the driver for PCI DMA.
@@ -697,7 +705,6 @@ static int mga_do_dma_bootstrap(drm_device_t * dev,
          * carve off portions of it for internal uses.  The remaining memory
          * is returned to user-mode to be used for AGP textures.
          */
-
         if (is_agp) {
                 err = mga_do_agp_dma_bootstrap(dev, dma_bs);
         }
@@ -932,6 +939,7 @@ static int mga_do_cleanup_dma( drm_device_t *dev )
                         drm_core_ioremapfree(dev->agp_buffer_map, dev);
 
                 if (dev_priv->used_new_dma_init) {
+#if __OS_HAS_AGP
                         if (dev_priv->agp_mem != NULL) {
                                 dev_priv->agp_textures = NULL;
                                 drm_unbind_agp(dev_priv->agp_mem);
@@ -944,7 +952,7 @@ static int mga_do_cleanup_dma( drm_device_t *dev )
                         if ((dev->agp != NULL) && dev->agp->acquired) {
                                 err = drm_agp_release(dev);
                         }
-
+#endif
                         dev_priv->used_new_dma_init = 0;
                 }
 
@@ -965,7 +973,7 @@ static int mga_do_cleanup_dma( drm_device_t *dev )
                 }
         }
 
-        return 0;
+        return err;
 }
 
 int mga_dma_init( DRM_IOCTL_ARGS )
diff --git a/drivers/char/epca.c b/drivers/char/epca.c
index 6025e1866c7..58d3738a2b7 100644
--- a/drivers/char/epca.c
+++ b/drivers/char/epca.c
@@ -6,6 +6,8 @@
         For technical support please email digiLinux@dgii.com or
         call Digi tech support at (612) 912-3456
 
+        ** This driver is no longer supported by Digi **
+
         Much of this design and code came from epca.c which was 
         copyright (C) 1994, 1995 Troy De Jongh, and subsquently 
         modified by David Nugent, Christoph Lameter, Mike McLagan. 
@@ -43,31 +45,19 @@
 #include <linux/interrupt.h>
 #include <asm/uaccess.h>
 #include <asm/io.h>
-
-#ifdef CONFIG_PCI
-#define ENABLE_PCI
-#endif /* CONFIG_PCI */
-
-#define putUser(arg1, arg2) put_user(arg1, (unsigned long __user *)arg2)
-#define getUser(arg1, arg2) get_user(arg1, (unsigned __user *)arg2)
-
-#ifdef ENABLE_PCI
+#include <linux/spinlock.h>
 #include <linux/pci.h>
 #include "digiPCI.h"
-#endif /* ENABLE_PCI */
+
 
 #include "digi1.h"
 #include "digiFep1.h"
 #include "epca.h"
 #include "epcaconfig.h"
 
-#if BITS_PER_LONG != 32
-#  error FIXME: this driver only works on 32-bit platforms
-#endif
-
 /* ---------------------- Begin defines ------------------------ */
 
-#define VERSION            "1.3.0.1-LK"
+#define VERSION            "1.3.0.1-LK2.6"
 
 /* This major needs to be submitted to Linux to join the majors list */
 
@@ -81,13 +71,17 @@
 
 /* ----------------- Begin global definitions ------------------- */
 
-static char mesg[100];
 static int nbdevs, num_cards, liloconfig;
 static int digi_poller_inhibited = 1 ;
 
 static int setup_error_code;
 static int invalid_lilo_config;
 
+/* The ISA boards do window flipping into the same spaces so its only sane
+   with a single lock. It's still pretty efficient */
+
+static spinlock_t epca_lock = SPIN_LOCK_UNLOCKED;
+
 /* -----------------------------------------------------------------------
         MAXBOARDS is typically 12, but ISA and EISA cards are restricted to 
         7 below.
@@ -129,58 +123,58 @@ static struct timer_list epca_timer;
         configured.
 ----------------------------------------------------------------------- */
         
-static inline void memwinon(struct board_info *b, unsigned int win);
-static inline void memwinoff(struct board_info *b, unsigned int win);
-static inline void globalwinon(struct channel *ch);
-static inline void rxwinon(struct channel *ch);
-static inline void txwinon(struct channel *ch);
-static inline void memoff(struct channel *ch);
-static inline void assertgwinon(struct channel *ch);
-static inline void assertmemoff(struct channel *ch);
+static void memwinon(struct board_info *b, unsigned int win);
+static void memwinoff(struct board_info *b, unsigned int win);
+static void globalwinon(struct channel *ch);
+static void rxwinon(struct channel *ch);
+static void txwinon(struct channel *ch);
+static void memoff(struct channel *ch);
+static void assertgwinon(struct channel *ch);
+static void assertmemoff(struct channel *ch);
 
 /* ---- Begin more 'specific' memory functions for cx_like products --- */
 
-static inline void pcxem_memwinon(struct board_info *b, unsigned int win);
-static inline void pcxem_memwinoff(struct board_info *b, unsigned int win);
-static inline void pcxem_globalwinon(struct channel *ch);
-static inline void pcxem_rxwinon(struct channel *ch);
-static inline void pcxem_txwinon(struct channel *ch);
-static inline void pcxem_memoff(struct channel *ch);
+static void pcxem_memwinon(struct board_info *b, unsigned int win);
+static void pcxem_memwinoff(struct board_info *b, unsigned int win);
+static void pcxem_globalwinon(struct channel *ch);
+static void pcxem_rxwinon(struct channel *ch);
+static void pcxem_txwinon(struct channel *ch);
+static void pcxem_memoff(struct channel *ch);
 
 /* ------ Begin more 'specific' memory functions for the pcxe ------- */
 
-static inline void pcxe_memwinon(struct board_info *b, unsigned int win);
-static inline void pcxe_memwinoff(struct board_info *b, unsigned int win);
-static inline void pcxe_globalwinon(struct channel *ch);
-static inline void pcxe_rxwinon(struct channel *ch);
-static inline void pcxe_txwinon(struct channel *ch);
-static inline void pcxe_memoff(struct channel *ch);
+static void pcxe_memwinon(struct board_info *b, unsigned int win);
+static void pcxe_memwinoff(struct board_info *b, unsigned int win);
+static void pcxe_globalwinon(struct channel *ch);
+static void pcxe_rxwinon(struct channel *ch);
+static void pcxe_txwinon(struct channel *ch);
+static void pcxe_memoff(struct channel *ch);
 
 /* ---- Begin more 'specific' memory functions for the pc64xe and pcxi ---- */
 /* Note : pc64xe and pcxi share the same windowing routines */
 
-static inline void pcxi_memwinon(struct board_info *b, unsigned int win);
-static inline void pcxi_memwinoff(struct board_info *b, unsigned int win);
-static inline void pcxi_globalwinon(struct channel *ch);
-static inline void pcxi_rxwinon(struct channel *ch);
-static inline void pcxi_txwinon(struct channel *ch);
-static inline void pcxi_memoff(struct channel *ch);
+static void pcxi_memwinon(struct board_info *b, unsigned int win);
+static void pcxi_memwinoff(struct board_info *b, unsigned int win);
+static void pcxi_globalwinon(struct channel *ch);
+static void pcxi_rxwinon(struct channel *ch);
+static void pcxi_txwinon(struct channel *ch);
+static void pcxi_memoff(struct channel *ch);
 
 /* - Begin 'specific' do nothing memory functions needed for some cards - */
 
-static inline void dummy_memwinon(struct board_info *b, unsigned int win);
-static inline void dummy_memwinoff(struct board_info *b, unsigned int win);
-static inline void dummy_globalwinon(struct channel *ch);
-static inline void dummy_rxwinon(struct channel *ch);
-static inline void dummy_txwinon(struct channel *ch);
-static inline void dummy_memoff(struct channel *ch);
-static inline void dummy_assertgwinon(struct channel *ch);
-static inline void dummy_assertmemoff(struct channel *ch);
+static void dummy_memwinon(struct board_info *b, unsigned int win);
+static void dummy_memwinoff(struct board_info *b, unsigned int win);
+static void dummy_globalwinon(struct channel *ch);
+static void dummy_rxwinon(struct channel *ch);
+static void dummy_txwinon(struct channel *ch);
+static void dummy_memoff(struct channel *ch);
+static void dummy_assertgwinon(struct channel *ch);
+static void dummy_assertmemoff(struct channel *ch);
 
 /* ------------------- Begin declare functions ----------------------- */
 
-static inline struct channel *verifyChannel(register struct tty_struct *);
-static inline void pc_sched_event(struct channel *, int);
+static struct channel *verifyChannel(struct tty_struct *);
+static void pc_sched_event(struct channel *, int);
 static void epca_error(int, char *);
 static void pc_close(struct tty_struct *, struct file *);
 static void shutdown(struct channel *);
@@ -215,15 +209,11 @@ static void pc_unthrottle(struct tty_struct *tty);
 static void digi_send_break(struct channel *ch, int msec);
 static void setup_empty_event(struct tty_struct *tty, struct channel *ch);
 void epca_setup(char *, int *);
-void console_print(const char *);
 
 static int get_termio(struct tty_struct *, struct termio __user *);
 static int pc_write(struct tty_struct *, const unsigned char *, int);
-int pc_init(void);
-
-#ifdef ENABLE_PCI
+static int pc_init(void);
 static int init_PCI(void);
-#endif /* ENABLE_PCI */
 
 
 /* ------------------------------------------------------------------
@@ -237,41 +227,41 @@ static int init_PCI(void);
         making direct calls deserves what they get.
 -------------------------------------------------------------------- */
 
-static inline void memwinon(struct board_info *b, unsigned int win)
+static void memwinon(struct board_info *b, unsigned int win)
 {
         (b->memwinon)(b, win);
 }
 
-static inline void memwinoff(struct board_info *b, unsigned int win)
+static void memwinoff(struct board_info *b, unsigned int win)
 {
         (b->memwinoff)(b, win);
 }
 
-static inline void globalwinon(struct channel *ch)
+static void globalwinon(struct channel *ch)
 {
         (ch->board->globalwinon)(ch);
 }
 
-static inline void rxwinon(struct channel *ch)
+static void rxwinon(struct channel *ch)
 {
         (ch->board->rxwinon)(ch);
 }
 
-static inline void txwinon(struct channel *ch)
+static void txwinon(struct channel *ch)
 {
         (ch->board->txwinon)(ch);
 }
 
-static inline void memoff(struct channel *ch)
+static void memoff(struct channel *ch)
 {
         (ch->board->memoff)(ch);
 }
-static inline void assertgwinon(struct channel *ch)
+static void assertgwinon(struct channel *ch)
 {
         (ch->board->assertgwinon)(ch);
 }
 
-static inline void assertmemoff(struct channel *ch)
+static void assertmemoff(struct channel *ch)
 {
         (ch->board->assertmemoff)(ch);
 }
@@ -281,66 +271,66 @@ static inline void assertmemoff(struct channel *ch)
         and CX series cards.
 ------------------------------------------------------------ */
 
-static inline void pcxem_memwinon(struct board_info *b, unsigned int win)
+static void pcxem_memwinon(struct board_info *b, unsigned int win)
 {
-        outb_p(FEPWIN|win, (int)b->port + 1);
+        outb_p(FEPWIN|win, b->port + 1);
 }
 
-static inline void pcxem_memwinoff(struct board_info *b, unsigned int win)
+static void pcxem_memwinoff(struct board_info *b, unsigned int win)
 {
-        outb_p(0, (int)b->port + 1);
+        outb_p(0, b->port + 1);
 }
 
-static inline void pcxem_globalwinon(struct channel *ch)
+static void pcxem_globalwinon(struct channel *ch)
 {
         outb_p( FEPWIN, (int)ch->board->port + 1);
 }
 
-static inline void pcxem_rxwinon(struct channel *ch)
+static void pcxem_rxwinon(struct channel *ch)
 {
         outb_p(ch->rxwin, (int)ch->board->port + 1);
 }
 
-static inline void pcxem_txwinon(struct channel *ch)
+static void pcxem_txwinon(struct channel *ch)
 {
         outb_p(ch->txwin, (int)ch->board->port + 1);
 }
 
-static inline void pcxem_memoff(struct channel *ch)
+static void pcxem_memoff(struct channel *ch)
 {
         outb_p(0, (int)ch->board->port + 1);
 }
 
 /* ----------------- Begin pcxe memory window stuff ------------------ */
 
-static inline void pcxe_memwinon(struct board_info *b, unsigned int win)
+static void pcxe_memwinon(struct board_info *b, unsigned int win)
 {
-               outb_p(FEPWIN | win, (int)b->port + 1);
+               outb_p(FEPWIN | win, b->port + 1);
 }
 
-static inline void pcxe_memwinoff(struct board_info *b, unsigned int win)
+static void pcxe_memwinoff(struct board_info *b, unsigned int win)
 {
-        outb_p(inb((int)b->port) & ~FEPMEM,
-                   (int)b->port + 1);
-        outb_p(0, (int)b->port + 1);
+        outb_p(inb(b->port) & ~FEPMEM,
+                   b->port + 1);
+        outb_p(0, b->port + 1);
 }
 
-static inline void pcxe_globalwinon(struct channel *ch)
+static void pcxe_globalwinon(struct channel *ch)
 {
         outb_p( FEPWIN, (int)ch->board->port + 1);
 }
 
-static inline void pcxe_rxwinon(struct channel *ch)
+static void pcxe_rxwinon(struct channel *ch)
 {
                 outb_p(ch->rxwin, (int)ch->board->port + 1);
 }
 
-static inline void pcxe_txwinon(struct channel *ch)
+static void pcxe_txwinon(struct channel *ch)
 {
                 outb_p(ch->txwin, (int)ch->board->port + 1);
 }
 
-static inline void pcxe_memoff(struct channel *ch)
+static void pcxe_memoff(struct channel *ch)
 {
         outb_p(0, (int)ch->board->port);
         outb_p(0, (int)ch->board->port + 1);
@@ -348,44 +338,44 @@ static inline void pcxe_memoff(struct channel *ch)
 
 /* ------------- Begin pc64xe and pcxi memory window stuff -------------- */
 
-static inline void pcxi_memwinon(struct board_info *b, unsigned int win)
+static void pcxi_memwinon(struct board_info *b, unsigned int win)
 {
-               outb_p(inb((int)b->port) | FEPMEM, (int)b->port);
+               outb_p(inb(b->port) | FEPMEM, b->port);
 }
 
-static inline void pcxi_memwinoff(struct board_info *b, unsigned int win)
+static void pcxi_memwinoff(struct board_info *b, unsigned int win)
 {
-        outb_p(inb((int)b->port) & ~FEPMEM, (int)b->port);
+        outb_p(inb(b->port) & ~FEPMEM, b->port);
 }
 
-static inline void pcxi_globalwinon(struct channel *ch)
+static void pcxi_globalwinon(struct channel *ch)
 {
-        outb_p(FEPMEM, (int)ch->board->port);
+        outb_p(FEPMEM, ch->board->port);
 }
 
-static inline void pcxi_rxwinon(struct channel *ch)
+static void pcxi_rxwinon(struct channel *ch)
 {
-                outb_p(FEPMEM, (int)ch->board->port);
+                outb_p(FEPMEM, ch->board->port);
 }
 
-static inline void pcxi_txwinon(struct channel *ch)
+static void pcxi_txwinon(struct channel *ch)
 {
-                outb_p(FEPMEM, (int)ch->board->port);
+                outb_p(FEPMEM, ch->board->port);
 }
 
-static inline void pcxi_memoff(struct channel *ch)
+static void pcxi_memoff(struct channel *ch)
 {
-        outb_p(0, (int)ch->board->port);
+        outb_p(0, ch->board->port);
 }
 
-static inline void pcxi_assertgwinon(struct channel *ch)
+static void pcxi_assertgwinon(struct channel *ch)
 {
-        epcaassert(inb((int)ch->board->port) & FEPMEM, "Global memory off");
+        epcaassert(inb(ch->board->port) & FEPMEM, "Global memory off");
 }
 
-static inline void pcxi_assertmemoff(struct channel *ch)
+static void pcxi_assertmemoff(struct channel *ch)
 {
-        epcaassert(!(inb((int)ch->board->port) & FEPMEM), "Memory on");
+        epcaassert(!(inb(ch->board->port) & FEPMEM), "Memory on");
 }
 
 
@@ -398,185 +388,143 @@ static inline void pcxi_assertmemoff(struct channel *ch)
         may or may not do anything.
 ---------------------------------------------------------------------------*/
 
-static inline void dummy_memwinon(struct board_info *b, unsigned int win)
+static void dummy_memwinon(struct board_info *b, unsigned int win)
 {
 }
 
-static inline void dummy_memwinoff(struct board_info *b, unsigned int win)
+static void dummy_memwinoff(struct board_info *b, unsigned int win)
 {
 }
 
-static inline void dummy_globalwinon(struct channel *ch)
+static void dummy_globalwinon(struct channel *ch)
 {
 }
 
-static inline void dummy_rxwinon(struct channel *ch)
+static void dummy_rxwinon(struct channel *ch)
 {
 }
 
-static inline void dummy_txwinon(struct channel *ch)
+static void dummy_txwinon(struct channel *ch)
 {
 }
 
-static inline void dummy_memoff(struct channel *ch)
+static void dummy_memoff(struct channel *ch)
 {
 }
 
-static inline void dummy_assertgwinon(struct channel *ch)
+static void dummy_assertgwinon(struct channel *ch)
 {
 }
 
-static inline void dummy_assertmemoff(struct channel *ch)
+static void dummy_assertmemoff(struct channel *ch)
 {
 }
 
 /* ----------------- Begin verifyChannel function ----------------------- */
-static inline struct channel *verifyChannel(register struct tty_struct *tty)
+static struct channel *verifyChannel(struct tty_struct *tty)
 { /* Begin verifyChannel */
-
         /* --------------------------------------------------------------------
                 This routine basically provides a sanity check.  It insures that
                 the channel returned is within the proper range of addresses as
                 well as properly initialized.  If some bogus info gets passed in
                 through tty->driver_data this should catch it.
-        --------------------------------------------------------------------- */
-
-        if (tty) 
-        { /* Begin if tty */
-
-                register struct channel *ch = (struct channel *)tty->driver_data;
-
-                if ((ch >= &digi_channels[0]) && (ch < &digi_channels[nbdevs])) 
-                {
+                --------------------------------------------------------------------- */
+        if (tty) {
+                struct channel *ch = (struct channel *)tty->driver_data;
+                if ((ch >= &digi_channels[0]) && (ch < &digi_channels[nbdevs])) {
                         if (ch->magic == EPCA_MAGIC)
                                 return ch;
                 }
-
-        } /* End if tty */
-
-        /* Else return a NULL for invalid */
+        }
         return NULL;
 
 } /* End verifyChannel */
 
 /* ------------------ Begin pc_sched_event ------------------------- */
 
-static inline void pc_sched_event(struct channel *ch, int event)
-{ /* Begin pc_sched_event */
-
-
+static void pc_sched_event(struct channel *ch, int event)
+{
         /* ----------------------------------------------------------------------
                 We call this to schedule interrupt processing on some event.  The 
                 kernel sees our request and calls the related routine in OUR driver.
         -------------------------------------------------------------------------*/
-
         ch->event |= 1 << event;
         schedule_work(&ch->tqueue);
-
-
 } /* End pc_sched_event */
 
 /* ------------------ Begin epca_error ------------------------- */
 
 static void epca_error(int line, char *msg)
-{ /* Begin epca_error */
-
+{
         printk(KERN_ERR "epca_error (Digi): line = %d %s\n",line,msg);
-        return;
-
-} /* End epca_error */
+}
 
 /* ------------------ Begin pc_close ------------------------- */
 static void pc_close(struct tty_struct * tty, struct file * filp)
-{ /* Begin pc_close */
-
+{
         struct channel *ch;
         unsigned long flags;
-
         /* ---------------------------------------------------------
                 verifyChannel returns the channel from the tty struct
                 if it is valid.  This serves as a sanity check.
         ------------------------------------------------------------- */
-
-        if ((ch = verifyChannel(tty)) != NULL) 
-        { /* Begin if ch != NULL */
-
-                save_flags(flags);
-                cli();
-
-                if (tty_hung_up_p(filp)) 
-                {
-                        restore_flags(flags);
+        if ((ch = verifyChannel(tty)) != NULL)  { /* Begin if ch != NULL */
+                spin_lock_irqsave(&epca_lock, flags);
+                if (tty_hung_up_p(filp)) {
+                        spin_unlock_irqrestore(&epca_lock, flags);
                         return;
                 }
-
                 /* Check to see if the channel is open more than once */
-                if (ch->count-- > 1) 
-                { /* Begin channel is open more than once */
-
+                if (ch->count-- > 1)  {
+                        /* Begin channel is open more than once */
                         /* -------------------------------------------------------------
                                 Return without doing anything.  Someone might still be using
                                 the channel.
                         ---------------------------------------------------------------- */
-
-                        restore_flags(flags);
+                        spin_unlock_irqrestore(&epca_lock, flags);
                         return;
                 } /* End channel is open more than once */
 
                 /* Port open only once go ahead with shutdown & reset */
-
-                if (ch->count < 0) 
-                {
-                        ch->count = 0;
-                }
+                if (ch->count < 0)
+                        BUG();
 
                 /* ---------------------------------------------------------------
                         Let the rest of the driver know the channel is being closed.
                         This becomes important if an open is attempted before close 
                         is finished.
                 ------------------------------------------------------------------ */
-
                 ch->asyncflags |= ASYNC_CLOSING;
-        
                 tty->closing = 1;
 
-                if (ch->asyncflags & ASYNC_INITIALIZED) 
-                {
+                spin_unlock_irqrestore(&epca_lock, flags);
+
+                if (ch->asyncflags & ASYNC_INITIALIZED)  {
                         /* Setup an event to indicate when the transmit buffer empties */
                         setup_empty_event(tty, ch);             
                         tty_wait_until_sent(tty, 3000); /* 30 seconds timeout */
                 }
-        
                 if (tty->driver->flush_buffer)
                         tty->driver->flush_buffer(tty);
 
                 tty_ldisc_flush(tty);
                 shutdown(ch);
+
+                spin_lock_irqsave(&epca_lock, flags);
                 tty->closing = 0;
                 ch->event = 0;
                 ch->tty = NULL;
+                spin_unlock_irqrestore(&epca_lock, flags);
 
-                if (ch->blocked_open) 
-                { /* Begin if blocked_open */
-
+                if (ch->blocked_open)  { /* Begin if blocked_open */
                         if (ch->close_delay) 
-                        {
                                 msleep_interruptible(jiffies_to_msecs(ch->close_delay));
-                        }
-
                         wake_up_interruptible(&ch->open_wait);
-
                 } /* End if blocked_open */
-
                 ch->asyncflags &= ~(ASYNC_NORMAL_ACTIVE | ASYNC_INITIALIZED | 
                                       ASYNC_CLOSING);
                 wake_up_interruptible(&ch->close_wait);
-
-
-                restore_flags(flags);
-
         } /* End if ch != NULL */
-
 } /* End pc_close */ 
 
 /* ------------------ Begin shutdown  ------------------------- */
@@ -586,15 +534,14 @@ static void shutdown(struct channel *ch)
 
         unsigned long flags;
         struct tty_struct *tty;
-        volatile struct board_chan *bc;
+        struct board_chan *bc;
 
         if (!(ch->asyncflags & ASYNC_INITIALIZED)) 
                 return;
 
-        save_flags(flags);
-        cli();
-        globalwinon(ch);
+        spin_lock_irqsave(&epca_lock, flags);
 
+        globalwinon(ch);
         bc = ch->brdchan;
 
         /* ------------------------------------------------------------------
@@ -604,20 +551,17 @@ static void shutdown(struct channel *ch)
         --------------------------------------------------------------------- */ 
 
         if (bc)
-                bc->idata = 0;
-
+                writeb(0, &bc->idata);
         tty = ch->tty;
 
         /* ----------------------------------------------------------------
            If we're a modem control device and HUPCL is on, drop RTS & DTR.
         ------------------------------------------------------------------ */
 
-        if (tty->termios->c_cflag & HUPCL) 
-        {
+        if (tty->termios->c_cflag & HUPCL)  {
                 ch->omodem &= ~(ch->m_rts | ch->m_dtr);
                 fepcmd(ch, SETMODEM, 0, ch->m_dtr | ch->m_rts, 10, 1);
         }
-
         memoff(ch);
 
         /* ------------------------------------------------------------------
@@ -628,7 +572,7 @@ static void shutdown(struct channel *ch)
         /* Prevent future Digi programmed interrupts from coming active */
 
         ch->asyncflags &= ~ASYNC_INITIALIZED;
-        restore_flags(flags);
+        spin_unlock_irqrestore(&epca_lock, flags);
 
 } /* End shutdown */
 
@@ -636,7 +580,6 @@ static void shutdown(struct channel *ch)
 
 static void pc_hangup(struct tty_struct *tty)
 { /* Begin pc_hangup */
-
         struct channel *ch;
         
         /* ---------------------------------------------------------
@@ -644,25 +587,21 @@ static void pc_hangup(struct tty_struct *tty)
                 if it is valid.  This serves as a sanity check.
         ------------------------------------------------------------- */
 
-        if ((ch = verifyChannel(tty)) != NULL) 
-        { /* Begin if ch != NULL */
-
+        if ((ch = verifyChannel(tty)) != NULL)  { /* Begin if ch != NULL */
                 unsigned long flags;
 
-                save_flags(flags);
-                cli();
                 if (tty->driver->flush_buffer)
                         tty->driver->flush_buffer(tty);
                 tty_ldisc_flush(tty);
                 shutdown(ch);
 
+                spin_lock_irqsave(&epca_lock, flags);
                 ch->tty   = NULL;
                 ch->event = 0;
                 ch->count = 0;
-                restore_flags(flags);
                 ch->asyncflags &= ~(ASYNC_NORMAL_ACTIVE | ASYNC_INITIALIZED);
+                spin_unlock_irqrestore(&epca_lock, flags);
                 wake_up_interruptible(&ch->open_wait);
-
         } /* End if ch != NULL */
 
 } /* End pc_hangup */
@@ -672,18 +611,14 @@ static void pc_hangup(struct tty_struct *tty)
 static int pc_write(struct tty_struct * tty,
                     const unsigned char *buf, int bytesAvailable)
 { /* Begin pc_write */
-
-        register unsigned int head, tail;
-        register int dataLen;
-        register int size;
-        register int amountCopied;
-
-
+        unsigned int head, tail;
+        int dataLen;
+        int size;
+        int amountCopied;
         struct channel *ch;
         unsigned long flags;
         int remain;
-        volatile struct board_chan *bc;
-
+        struct board_chan *bc;
 
         /* ----------------------------------------------------------------
                 pc_write is primarily called directly by the kernel routine
@@ -706,24 +641,20 @@ static int pc_write(struct tty_struct * tty,
 
         bc   = ch->brdchan;
         size = ch->txbufsize;
-
         amountCopied = 0;
-        save_flags(flags);
-        cli();
 
+        spin_lock_irqsave(&epca_lock, flags);
         globalwinon(ch);
 
-        head = bc->tin & (size - 1);
-        tail = bc->tout;
+        head = readw(&bc->tin) & (size - 1);
+        tail = readw(&bc->tout);
 
-        if (tail != bc->tout)
-                tail = bc->tout;
+        if (tail != readw(&bc->tout))
+                tail = readw(&bc->tout);
         tail &= (size - 1);
 
         /*      If head >= tail, head has not wrapped around. */ 
-        if (head >= tail) 
-        { /* Begin head has not wrapped */
-
+        if (head >= tail)  { /* Begin head has not wrapped */
                 /* ---------------------------------------------------------------
                         remain (much like dataLen above) represents the total amount of
                         space available on the card for data.  Here dataLen represents
@@ -731,26 +662,19 @@ static int pc_write(struct tty_struct * tty,
                         buffer.  This is important because a memcpy cannot be told to
                         automatically wrap around when it hits the buffer end.
                 ------------------------------------------------------------------ */ 
-
                 dataLen = size - head;
                 remain = size - (head - tail) - 1;
-
-        } /* End head has not wrapped */
-        else 
-        { /* Begin head has wrapped around */
+        } else { /* Begin head has wrapped around */
 
                 remain = tail - head - 1;
                 dataLen = remain;
 
         } /* End head has wrapped around */
-
         /* -------------------------------------------------------------------
                         Check the space on the card.  If we have more data than 
                         space; reduce the amount of data to fit the space.
         ---------------------------------------------------------------------- */
-
         bytesAvailable = min(remain, bytesAvailable);
-
         txwinon(ch);
         while (bytesAvailable > 0) 
         { /* Begin while there is data to copy onto card */
@@ -767,26 +691,21 @@ static int pc_write(struct tty_struct * tty,
                 amountCopied += dataLen;
                 bytesAvailable -= dataLen;
 
-                if (head >= size) 
-                {
+                if (head >= size) {
                         head = 0;
                         dataLen = tail;
                 }
-
         } /* End while there is data to copy onto card */
-
         ch->statusflags |= TXBUSY;
         globalwinon(ch);
-        bc->tin = head;
+        writew(head, &bc->tin);
 
-        if ((ch->statusflags & LOWWAIT) == 0) 
-        {
+        if ((ch->statusflags & LOWWAIT) == 0)  {
                 ch->statusflags |= LOWWAIT;
-                bc->ilow = 1;
+                writeb(1, &bc->ilow);
         }
         memoff(ch);
-        restore_flags(flags);
-
+        spin_unlock_irqrestore(&epca_lock, flags);
         return(amountCopied);
 
 } /* End pc_write */
@@ -795,11 +714,7 @@ static int pc_write(struct tty_struct * tty,
 
 static void pc_put_char(struct tty_struct *tty, unsigned char c)
 { /* Begin pc_put_char */
-
-   
         pc_write(tty, &c, 1);
-        return;
-
 } /* End pc_put_char */
 
 /* ------------------ Begin pc_write_room  ------------------------- */
@@ -811,7 +726,7 @@ static int pc_write_room(struct tty_struct *tty)
         struct channel *ch;
         unsigned long flags;
         unsigned int head, tail;
-        volatile struct board_chan *bc;
+        struct board_chan *bc;
 
         remain = 0;
 
@@ -820,33 +735,29 @@ static int pc_write_room(struct tty_struct *tty)
                 if it is valid.  This serves as a sanity check.
         ------------------------------------------------------------- */
 
-        if ((ch = verifyChannel(tty)) != NULL) 
-        {
-                save_flags(flags);
-                cli();
+        if ((ch = verifyChannel(tty)) != NULL)  {
+                spin_lock_irqsave(&epca_lock, flags);
                 globalwinon(ch);
 
                 bc   = ch->brdchan;
-                head = bc->tin & (ch->txbufsize - 1);
-                tail = bc->tout;
+                head = readw(&bc->tin) & (ch->txbufsize - 1);
+                tail = readw(&bc->tout);
 
-                if (tail != bc->tout)
-                        tail = bc->tout;
+                if (tail != readw(&bc->tout))
+                        tail = readw(&bc->tout);
                 /* Wrap tail if necessary */
                 tail &= (ch->txbufsize - 1);
 
                 if ((remain = tail - head - 1) < 0 )
                         remain += ch->txbufsize;
 
-                if (remain && (ch->statusflags & LOWWAIT) == 0) 
-                {
+                if (remain && (ch->statusflags & LOWWAIT) == 0) {
                         ch->statusflags |= LOWWAIT;
-                        bc->ilow = 1;
+                        writeb(1, &bc->ilow);
                 }
                 memoff(ch);
-                restore_flags(flags);
+                spin_unlock_irqrestore(&epca_lock, flags);
         }
-
         /* Return how much room is left on card */
         return remain;
 
@@ -862,8 +773,7 @@ static int pc_chars_in_buffer(struct tty_struct *tty)
         int remain;
         unsigned long flags;
         struct channel *ch;
-        volatile struct board_chan *bc;
-
+        struct board_chan *bc;
 
         /* ---------------------------------------------------------
                 verifyChannel returns the channel from the tty struct
@@ -873,34 +783,27 @@ static int pc_chars_in_buffer(struct tty_struct *tty)
         if ((ch = verifyChannel(tty)) == NULL)
                 return(0);
 
-        save_flags(flags);
-        cli();
+        spin_lock_irqsave(&epca_lock, flags);
         globalwinon(ch);
 
         bc = ch->brdchan;
-        tail = bc->tout;
-        head = bc->tin;
-        ctail = ch->mailbox->cout;
+        tail = readw(&bc->tout);
+        head = readw(&bc->tin);
+        ctail = readw(&ch->mailbox->cout);
 
-        if (tail == head && ch->mailbox->cin == ctail && bc->tbusy == 0)
+        if (tail == head && readw(&ch->mailbox->cin) == ctail && readb(&bc->tbusy) == 0)
                 chars = 0;
-        else 
-        { /* Begin if some space on the card has been used */
-
-                head = bc->tin & (ch->txbufsize - 1);
+        else  { /* Begin if some space on the card has been used */
+                head = readw(&bc->tin) & (ch->txbufsize - 1);
                 tail &= (ch->txbufsize - 1);
-
                 /*  --------------------------------------------------------------
                         The logic here is basically opposite of the above pc_write_room
                         here we are finding the amount of bytes in the buffer filled.
                         Not the amount of bytes empty.
                 ------------------------------------------------------------------- */
-
                 if ((remain = tail - head - 1) < 0 )
                         remain += ch->txbufsize;
-
                 chars = (int)(ch->txbufsize - remain);
-
                 /* -------------------------------------------------------------  
                         Make it possible to wakeup anything waiting for output
                         in tty_ioctl.c, etc.
@@ -908,15 +811,12 @@ static int pc_chars_in_buffer(struct tty_struct *tty)
                         If not already set.  Setup an event to indicate when the
                         transmit buffer empties 
                 ----------------------------------------------------------------- */
-
                 if (!(ch->statusflags & EMPTYWAIT))
                         setup_empty_event(tty,ch);
 
         } /* End if some space on the card has been used */
-
         memoff(ch);
-        restore_flags(flags);
-
+        spin_unlock_irqrestore(&epca_lock, flags);
         /* Return number of characters residing on card. */
         return(chars);
 
@@ -930,67 +830,46 @@ static void pc_flush_buffer(struct tty_struct *tty)
         unsigned int tail;
         unsigned long flags;
         struct channel *ch;
-        volatile struct board_chan *bc;
-
-
+        struct board_chan *bc;
         /* ---------------------------------------------------------
                 verifyChannel returns the channel from the tty struct
                 if it is valid.  This serves as a sanity check.
         ------------------------------------------------------------- */
-
         if ((ch = verifyChannel(tty)) == NULL)
                 return;
 
-        save_flags(flags);
-        cli();
-
+        spin_lock_irqsave(&epca_lock, flags);
         globalwinon(ch);
-
         bc   = ch->brdchan;
-        tail = bc->tout;
-
+        tail = readw(&bc->tout);
         /* Have FEP move tout pointer; effectively flushing transmit buffer */
-
         fepcmd(ch, STOUT, (unsigned) tail, 0, 0, 0);
-
         memoff(ch);
-        restore_flags(flags);
-
+        spin_unlock_irqrestore(&epca_lock, flags);
         wake_up_interruptible(&tty->write_wait);
         tty_wakeup(tty);
-
 } /* End pc_flush_buffer */
 
 /* ------------------ Begin pc_flush_chars  ---------------------- */
 
 static void pc_flush_chars(struct tty_struct *tty)
 { /* Begin pc_flush_chars */
-
         struct channel * ch;
-
         /* ---------------------------------------------------------
                 verifyChannel returns the channel from the tty struct
                 if it is valid.  This serves as a sanity check.
         ------------------------------------------------------------- */
-
-        if ((ch = verifyChannel(tty)) != NULL) 
-        {
+        if ((ch = verifyChannel(tty)) != NULL) {
                 unsigned long flags;
-
-                save_flags(flags);
-                cli();
-
+                spin_lock_irqsave(&epca_lock, flags);
                 /* ----------------------------------------------------------------
                         If not already set and the transmitter is busy setup an event
                         to indicate when the transmit empties.
                 ------------------------------------------------------------------- */
-
                 if ((ch->statusflags & TXBUSY) && !(ch->statusflags & EMPTYWAIT))
                         setup_empty_event(tty,ch);
-
-                restore_flags(flags);
+                spin_unlock_irqrestore(&epca_lock, flags);
         }
-
 } /* End pc_flush_chars */
 
 /* ------------------ Begin block_til_ready  ---------------------- */
@@ -998,14 +877,11 @@ static void pc_flush_chars(struct tty_struct *tty)
 static int block_til_ready(struct tty_struct *tty, 
                            struct file *filp, struct channel *ch)
 { /* Begin block_til_ready */
-
         DECLARE_WAITQUEUE(wait,current);
         int     retval, do_clocal = 0;
         unsigned long flags;
 
-
-        if (tty_hung_up_p(filp))
-        {
+        if (tty_hung_up_p(filp)) {
                 if (ch->asyncflags & ASYNC_HUP_NOTIFY)
                         retval = -EAGAIN;
                 else
@@ -1017,8 +893,7 @@ static int block_til_ready(struct tty_struct *tty,
                 If the device is in the middle of being closed, then block
                 until it's done, and then try again.
         -------------------------------------------------------------------- */
-        if (ch->asyncflags & ASYNC_CLOSING) 
-        {
+        if (ch->asyncflags & ASYNC_CLOSING) {
                 interruptible_sleep_on(&ch->close_wait);
 
                 if (ch->asyncflags & ASYNC_HUP_NOTIFY)
@@ -1027,43 +902,29 @@ static int block_til_ready(struct tty_struct *tty,
                         return -ERESTARTSYS;
         }
 
-        if (filp->f_flags & O_NONBLOCK) 
-        {
+        if (filp->f_flags & O_NONBLOCK)  {
                 /* ----------------------------------------------------------------- 
                  If non-blocking mode is set, then make the check up front
                  and then exit.
                 -------------------------------------------------------------------- */
-
                 ch->asyncflags |= ASYNC_NORMAL_ACTIVE;
-
                 return 0;
         }
-
-
         if (tty->termios->c_cflag & CLOCAL)
                 do_clocal = 1;
-        
-   /* Block waiting for the carrier detect and the line to become free */
+        /* Block waiting for the carrier detect and the line to become free */
         
         retval = 0;
         add_wait_queue(&ch->open_wait, &wait);
-        save_flags(flags);
-        cli();
-
 
+        spin_lock_irqsave(&epca_lock, flags);
         /* We dec count so that pc_close will know when to free things */
         if (!tty_hung_up_p(filp))
                 ch->count--;
-
-        restore_flags(flags);
-
         ch->blocked_open++;
-
         while(1) 
         { /* Begin forever while  */
-
                 set_current_state(TASK_INTERRUPTIBLE);
-
                 if (tty_hung_up_p(filp) ||
                     !(ch->asyncflags & ASYNC_INITIALIZED)) 
                 {
@@ -1073,17 +934,14 @@ static int block_til_ready(struct tty_struct *tty,
                                 retval = -ERESTARTSYS;  
                         break;
                 }
-
                 if (!(ch->asyncflags & ASYNC_CLOSING) && 
                           (do_clocal || (ch->imodem & ch->dcd)))
                         break;
-
-                if (signal_pending(current)) 
-                {
+                if (signal_pending(current)) {
                         retval = -ERESTARTSYS;
                         break;
                 }
-
+                spin_unlock_irqrestore(&epca_lock, flags);
                 /* ---------------------------------------------------------------
                         Allow someone else to be scheduled.  We will occasionally go
                         through this loop until one of the above conditions change.
@@ -1091,25 +949,23 @@ static int block_til_ready(struct tty_struct *tty,
                         prevent this loop from hogging the cpu.
                 ------------------------------------------------------------------ */
                 schedule();
+                spin_lock_irqsave(&epca_lock, flags);
 
         } /* End forever while  */
 
         current->state = TASK_RUNNING;
         remove_wait_queue(&ch->open_wait, &wait);
-        cli();
         if (!tty_hung_up_p(filp))
                 ch->count++;
-        restore_flags(flags);
-
         ch->blocked_open--;
 
+        spin_unlock_irqrestore(&epca_lock, flags);
+
         if (retval)
                 return retval;
 
         ch->asyncflags |= ASYNC_NORMAL_ACTIVE;
-
         return 0;
-
 } /* End block_til_ready */     
 
 /* ------------------ Begin pc_open  ---------------------- */
@@ -1120,17 +976,12 @@ static int pc_open(struct tty_struct *tty, struct file * filp)
         struct channel *ch;
         unsigned long flags;
         int line, retval, boardnum;
-        volatile struct board_chan *bc;
-        volatile unsigned int head;
+        struct board_chan *bc;
+        unsigned int head;
 
         line = tty->index;
-        if (line < 0 || line >= nbdevs) 
-        {
-                printk(KERN_ERR "<Error> - pc_open : line out of range in pc_open\n");
-                tty->driver_data = NULL;
-                return(-ENODEV);
-        }
-
+        if (line < 0 || line >= nbdevs)
+                return -ENODEV;
 
         ch = &digi_channels[line];
         boardnum = ch->boardnum;
@@ -1143,66 +994,49 @@ static int pc_open(struct tty_struct *tty, struct file * filp)
                 goes here.
         ---------------------------------------------------------------------- */
 
-        if (invalid_lilo_config)
-        {
+        if (invalid_lilo_config) {
                 if (setup_error_code & INVALID_BOARD_TYPE)
-                        printk(KERN_ERR "<Error> - pc_open: Invalid board type specified in LILO command\n");
-
+                        printk(KERN_ERR "epca: pc_open: Invalid board type specified in kernel options.\n");
                 if (setup_error_code & INVALID_NUM_PORTS)
-                        printk(KERN_ERR "<Error> - pc_open: Invalid number of ports specified in LILO command\n");
-
+                        printk(KERN_ERR "epca: pc_open: Invalid number of ports specified in kernel options.\n");
                 if (setup_error_code & INVALID_MEM_BASE)
-                        printk(KERN_ERR "<Error> - pc_open: Invalid board memory address specified in LILO command\n");
-
+                        printk(KERN_ERR "epca: pc_open: Invalid board memory address specified in kernel options.\n");
                 if (setup_error_code & INVALID_PORT_BASE)
-                        printk(KERN_ERR "<Error> - pc_open: Invalid board port address specified in LILO command\n");
-
+                        printk(KERN_ERR "epca; pc_open: Invalid board port address specified in kernel options.\n");
                 if (setup_error_code & INVALID_BOARD_STATUS)
-                        printk(KERN_ERR "<Error> - pc_open: Invalid board status specified in LILO command\n");
-
+                        printk(KERN_ERR "epca: pc_open: Invalid board status specified in kernel options.\n");
                 if (setup_error_code & INVALID_ALTPIN)
-                        printk(KERN_ERR "<Error> - pc_open: Invalid board altpin specified in LILO command\n");
-
+                        printk(KERN_ERR "epca: pc_open: Invalid board altpin specified in kernel options;\n");
                 tty->driver_data = NULL;   /* Mark this device as 'down' */
-                return(-ENODEV);
+                return -ENODEV;
         }
-
-        if ((boardnum >= num_cards) || (boards[boardnum].status == DISABLED)) 
-        {
+        if (boardnum >= num_cards || boards[boardnum].status == DISABLED)  {
                 tty->driver_data = NULL;   /* Mark this device as 'down' */
                 return(-ENODEV);
         }
         
-        if (( bc = ch->brdchan) == 0) 
-        {
+        if ((bc = ch->brdchan) == 0) {
                 tty->driver_data = NULL;
-                return(-ENODEV);
+                return -ENODEV;
         }
 
+        spin_lock_irqsave(&epca_lock, flags);
         /* ------------------------------------------------------------------
                 Every time a channel is opened, increment a counter.  This is 
                 necessary because we do not wish to flush and shutdown the channel
                 until the last app holding the channel open, closes it.         
         --------------------------------------------------------------------- */
-
         ch->count++;
-
         /* ----------------------------------------------------------------
                 Set a kernel structures pointer to our local channel 
                 structure.  This way we can get to it when passed only
                 a tty struct.
         ------------------------------------------------------------------ */
-
         tty->driver_data = ch;
-        
         /* ----------------------------------------------------------------
                 If this is the first time the channel has been opened, initialize
                 the tty->termios struct otherwise let pc_close handle it.
         -------------------------------------------------------------------- */
-
-        save_flags(flags);
-        cli();
-
         globalwinon(ch);
         ch->statusflags = 0;
 
@@ -1213,8 +1047,8 @@ static int pc_open(struct tty_struct *tty, struct file * filp)
            Set receive head and tail ptrs to each other.  This indicates
            no data available to read.
         ----------------------------------------------------------------- */
-        head = bc->rin;
-        bc->rout = head;
+        head = readw(&bc->rin);
+        writew(head, &bc->rout);
 
         /* Set the channels associated tty structure */
         ch->tty = tty;
@@ -1224,122 +1058,74 @@ static int pc_open(struct tty_struct *tty, struct file * filp)
                 issues, etc.... It effect both control flags and input flags.
         -------------------------------------------------------------------- */
         epcaparam(tty,ch);
-
         ch->asyncflags |= ASYNC_INITIALIZED;
         memoff(ch);
-
-        restore_flags(flags);
+        spin_unlock_irqrestore(&epca_lock, flags);
 
         retval = block_til_ready(tty, filp, ch);
         if (retval)
-        {
                 return retval;
-        }
-
         /* -------------------------------------------------------------
                 Set this again in case a hangup set it to zero while this 
                 open() was waiting for the line...
         --------------------------------------------------------------- */
+        spin_lock_irqsave(&epca_lock, flags);
         ch->tty = tty;
-
-        save_flags(flags);
-        cli();
         globalwinon(ch);
-
         /* Enable Digi Data events */
-        bc->idata = 1;
-
+        writeb(1, &bc->idata);
         memoff(ch);
-        restore_flags(flags);
-
+        spin_unlock_irqrestore(&epca_lock, flags);
         return 0;
-
 } /* End pc_open */
 
-#ifdef MODULE
 static int __init epca_module_init(void)
 { /* Begin init_module */
-
-        unsigned long   flags;
-
-        save_flags(flags);
-        cli();
-
-        pc_init();
-
-        restore_flags(flags);
-
-        return(0);
+        return pc_init();
 }
 
 module_init(epca_module_init);
-#endif
 
-#ifdef ENABLE_PCI
 static struct pci_driver epca_driver;
-#endif
-
-#ifdef MODULE
-/* -------------------- Begin cleanup_module  ---------------------- */
 
 static void __exit epca_module_exit(void)
 {
-
         int               count, crd;
         struct board_info *bd;
         struct channel    *ch;
-        unsigned long     flags;
 
         del_timer_sync(&epca_timer);
 
-        save_flags(flags);
-        cli();
-
         if ((tty_unregister_driver(pc_driver)) ||  
             (tty_unregister_driver(pc_info)))
         {
-                printk(KERN_WARNING "<Error> - DIGI : cleanup_module failed to un-register tty driver\n");
-                restore_flags(flags);
+                printk(KERN_WARNING "epca: cleanup_module failed to un-register tty driver\n");
                 return;
         }
         put_tty_driver(pc_driver);
         put_tty_driver(pc_info);
 
-        for (crd = 0; crd < num_cards; crd++) 
-        { /* Begin for each card */
-
+        for (crd = 0; crd < num_cards; crd++)  { /* Begin for each card */
                 bd = &boards[crd];
-
                 if (!bd)
                 { /* Begin sanity check */
                         printk(KERN_ERR "<Error> - Digi : cleanup_module failed\n");
                         return;
                 } /* End sanity check */
-
-                ch = card_ptr[crd]; 
-
+                ch = card_ptr[crd];
                 for (count = 0; count < bd->numports; count++, ch++) 
                 { /* Begin for each port */
-
-                        if (ch) 
-                        {
+                        if (ch) {
                                 if (ch->tty)
                                         tty_hangup(ch->tty);
                                 kfree(ch->tmp_buf);
                         }
-
                 } /* End for each port */
         } /* End for each card */
-
-#ifdef ENABLE_PCI
         pci_unregister_driver (&epca_driver);
-#endif
-
-        restore_flags(flags);
-
 }
+
 module_exit(epca_module_exit);
-#endif /* MODULE */
 
 static struct tty_operations pc_ops = {
         .open = pc_open,
@@ -1371,34 +1157,15 @@ static struct tty_operations info_ops = {
 
 /* ------------------ Begin pc_init  ---------------------- */
 
-int __init pc_init(void)
+static int __init pc_init(void)
 { /* Begin pc_init */
-
-        /* ----------------------------------------------------------------
-                pc_init is called by the operating system during boot up prior to
-                any open calls being made.  In the older versions of Linux (Prior
-                to 2.0.0) an entry is made into tty_io.c.  A pointer to the last
-                memory location (from kernel space) used (kmem_start) is passed
-                to pc_init.  It is pc_inits responsibility to modify this value 
-                for any memory that the Digi driver might need and then return
-                this value to the operating system.  For example if the driver
-                wishes to allocate 1K of kernel memory, pc_init would return 
-                (kmem_start + 1024).  This memory (Between kmem_start and kmem_start
-                + 1024) would then be available for use exclusively by the driver.  
-                In this case our driver does not allocate any of this kernel 
-                memory.
-        ------------------------------------------------------------------*/
-
-        ulong flags;
         int crd;
         struct board_info *bd;
         unsigned char board_id = 0;
 
-#ifdef ENABLE_PCI
         int pci_boards_found, pci_count;
 
         pci_count = 0;
-#endif /* ENABLE_PCI */
 
         pc_driver = alloc_tty_driver(MAX_ALLOC);
         if (!pc_driver)
@@ -1416,8 +1183,7 @@ int __init pc_init(void)
                 Note : If LILO has ran epca_setup then epca_setup will handle defining
                 num_cards as well as copying the data into the board structure.
         -------------------------------------------------------------------------- */
-        if (!liloconfig)
-        { /* Begin driver has been configured via. epcaconfig */
+        if (!liloconfig) { /* Begin driver has been configured via. epcaconfig */
 
                 nbdevs = NBDEVS;
                 num_cards = NUMCARDS;
@@ -1440,8 +1206,6 @@ int __init pc_init(void)
 
         printk(KERN_INFO "DIGI epca driver version %s loaded.\n",VERSION);
 
-#ifdef ENABLE_PCI
-
         /* ------------------------------------------------------------------
                 NOTE : This code assumes that the number of ports found in 
                        the boards array is correct.  This could be wrong if
@@ -1467,8 +1231,6 @@ int __init pc_init(void)
                 pci_boards_found += init_PCI();
         num_cards += pci_boards_found;
 
-#endif /* ENABLE_PCI */
-
         pc_driver->owner = THIS_MODULE;
         pc_driver->name = "ttyD"; 
         pc_driver->devfs_name = "tts/D";
@@ -1499,9 +1261,6 @@ int __init pc_init(void)
         tty_set_operations(pc_info, &info_ops);
 
 
-        save_flags(flags);
-        cli();
-
         for (crd = 0; crd < num_cards; crd++) 
         { /* Begin for each card */
 
@@ -1610,11 +1369,7 @@ int __init pc_init(void)
                                         if ((board_id & 0x30) == 0x30) 
                                                 bd->memory_seg = 0x8000;
 
-                                } /* End it is an XI card */
-                                else
-                                {
-                                        printk(KERN_ERR "<Error> - Board at 0x%x doesn't appear to be an XI\n",(int)bd->port);
-                                }
+                                } else printk(KERN_ERR "epca: Board at 0x%x doesn't appear to be an XI\n",(int)bd->port);
                         break;
 
                 } /* End switch on bd->type */
@@ -1634,9 +1389,6 @@ int __init pc_init(void)
         init_timer(&epca_timer);
         epca_timer.function = epcapoll;
         mod_timer(&epca_timer, jiffies + HZ/25);
-
-        restore_flags(flags);
-
         return 0;
 
 } /* End pc_init */
@@ -1647,10 +1399,10 @@ static void post_fep_init(unsigned int crd)
 { /* Begin post_fep_init */
 
         int i;
-        unchar *memaddr;
-        volatile struct global_data *gd;
+        unsigned char *memaddr;
+        struct global_data *gd;
         struct board_info *bd;
-        volatile struct board_chan *bc;
+        struct board_chan *bc;
         struct channel *ch; 
         int shrinkmem = 0, lowwater ; 
  
@@ -1669,9 +1421,7 @@ static void post_fep_init(unsigned int crd)
                 after DIGI_INIT has been called will return the proper values. 
         ------------------------------------------------------------------- */
 
-        if (bd->type >= PCIXEM) /* If the board in question is PCI */
-        { /* Begin get PCI number of ports */
-
+        if (bd->type >= PCIXEM) { /* Begin get PCI number of ports */
                 /* --------------------------------------------------------------------
                         Below we use XEMPORTS as a memory offset regardless of which PCI
                         card it is.  This is because all of the supported PCI cards have
@@ -1685,15 +1435,15 @@ static void post_fep_init(unsigned int crd)
                         (FYI - The id should be located at 0x1ac (And may use up to 4 bytes
                         if the box in question is a XEM or CX)).  
                 ------------------------------------------------------------------------ */ 
-
-                bd->numports = (unsigned short)*(unsigned char *)bus_to_virt((unsigned long)
-                                                       (bd->re_map_membase + XEMPORTS));
-
-                
+                /* PCI cards are already remapped at this point ISA are not */
+                bd->numports = readw(bd->re_map_membase + XEMPORTS);
                 epcaassert(bd->numports <= 64,"PCI returned a invalid number of ports");
                 nbdevs += (bd->numports);
-
-        } /* End get PCI number of ports */
+        } else {
+                /* Fix up the mappings for ISA/EISA etc */
+                /* FIXME: 64K - can we be smarter ? */
+                bd->re_map_membase = ioremap(bd->membase, 0x10000);
+        }
 
         if (crd != 0)
                 card_ptr[crd] = card_ptr[crd-1] + boards[crd-1].numports;
@@ -1701,19 +1451,9 @@ static void post_fep_init(unsigned int crd)
                 card_ptr[crd] = &digi_channels[crd]; /* <- For card 0 only */
 
         ch = card_ptr[crd];
-
-
         epcaassert(ch <= &digi_channels[nbdevs - 1], "ch out of range");
 
-        memaddr = (unchar *)bd->re_map_membase;
-
-        /* 
-           The below command is necessary because newer kernels (2.1.x and
-           up) do not have a 1:1 virtual to physical mapping.  The below
-           call adjust for that.
-        */
-
-        memaddr = (unsigned char *)bus_to_virt((unsigned long)memaddr);
+        memaddr = bd->re_map_membase;
 
         /* -----------------------------------------------------------------
                 The below assignment will set bc to point at the BEGINING of
@@ -1721,7 +1461,7 @@ static void post_fep_init(unsigned int crd)
                 8 and 64 of these structures.
         -------------------------------------------------------------------- */
 
-        bc = (volatile struct board_chan *)((ulong)memaddr + CHANSTRUCT);
+        bc = (struct board_chan *)(memaddr + CHANSTRUCT);
 
         /* -------------------------------------------------------------------
                 The below assignment will set gd to point at the BEGINING of
@@ -1730,20 +1470,18 @@ static void post_fep_init(unsigned int crd)
                 pointer begins at 0xd10.
         ---------------------------------------------------------------------- */
 
-        gd = (volatile struct global_data *)((ulong)memaddr + GLOBAL);
+        gd = (struct global_data *)(memaddr + GLOBAL);
 
         /* --------------------------------------------------------------------
                 XEPORTS (address 0xc22) points at the number of channels the
                 card supports. (For 64XE, XI, XEM, and XR use 0xc02)
         ----------------------------------------------------------------------- */
 
-        if (((bd->type == PCXEVE) | (bd->type == PCXE)) &&
-            (*(ushort *)((ulong)memaddr + XEPORTS) < 3))
+        if ((bd->type == PCXEVE || bd->type == PCXE) && (readw(memaddr + XEPORTS) < 3))
                 shrinkmem = 1;
         if (bd->type < PCIXEM)
                 if (!request_region((int)bd->port, 4, board_desc[bd->type]))
                         return;         
-
         memwinon(bd, 0);
 
         /*  --------------------------------------------------------------------
@@ -1753,17 +1491,16 @@ static void post_fep_init(unsigned int crd)
 
         /* For every port on the card do ..... */
 
-        for (i = 0; i < bd->numports; i++, ch++, bc++) 
-        { /* Begin for each port */
+        for (i = 0; i < bd->numports; i++, ch++, bc++)  { /* Begin for each port */
+                unsigned long flags;
 
                 ch->brdchan        = bc;
                 ch->mailbox        = gd; 
                 INIT_WORK(&ch->tqueue, do_softint, ch);
                 ch->board          = &boards[crd];
 
-                switch (bd->type)
-                { /* Begin switch bd->type */
-
+                spin_lock_irqsave(&epca_lock, flags);
+                switch (bd->type) {
                         /* ----------------------------------------------------------------
                                 Since some of the boards use different bitmaps for their
                                 control signals we cannot hard code these values and retain
@@ -1796,14 +1533,12 @@ static void post_fep_init(unsigned int crd)
         
                 } /* End switch bd->type */
 
-                if (boards[crd].altpin) 
-                {
+                if (boards[crd].altpin) {
                         ch->dsr = ch->m_dcd;
                         ch->dcd = ch->m_dsr;
                         ch->digiext.digi_flags |= DIGI_ALTPIN;
                 }
-                else 
-                { 
+                else {
                         ch->dcd = ch->m_dcd;
                         ch->dsr = ch->m_dsr;
                 }
@@ -1813,14 +1548,12 @@ static void post_fep_init(unsigned int crd)
                 ch->magic      = EPCA_MAGIC;
                 ch->tty        = NULL;
 
-                if (shrinkmem) 
-                {
+                if (shrinkmem) {
                         fepcmd(ch, SETBUFFER, 32, 0, 0, 0);
                         shrinkmem = 0;
                 }
 
-                switch (bd->type)
-                { /* Begin switch bd->type */
+                switch (bd->type) {
 
                         case PCIXEM:
                         case PCIXRJ:
@@ -1878,13 +1611,13 @@ static void post_fep_init(unsigned int crd)
 
                 fepcmd(ch, SRXHWATER, (3 * ch->rxbufsize / 4), 0, 10, 0);
 
-                bc->edelay = 100;
-                bc->idata = 1;
+                writew(100, &bc->edelay);
+                writeb(1, &bc->idata);
         
-                ch->startc  = bc->startc;
-                ch->stopc   = bc->stopc;
-                ch->startca = bc->startca;
-                ch->stopca  = bc->stopca;
+                ch->startc  = readb(&bc->startc);
+                ch->stopc   = readb(&bc->stopc);
+                ch->startca = readb(&bc->startca);
+                ch->stopca  = readb(&bc->stopca);
         
                 ch->fepcflag = 0;
                 ch->fepiflag = 0;
@@ -1899,27 +1632,23 @@ static void post_fep_init(unsigned int crd)
                 ch->blocked_open = 0;
                 init_waitqueue_head(&ch->open_wait);
                 init_waitqueue_head(&ch->close_wait);
+
+                spin_unlock_irqrestore(&epca_lock, flags);
+
                 ch->tmp_buf = kmalloc(ch->txbufsize,GFP_KERNEL);
-                if (!(ch->tmp_buf))
-                {
+                if (!ch->tmp_buf) {
                         printk(KERN_ERR "POST FEP INIT : kmalloc failed for port 0x%x\n",i);
                         release_region((int)bd->port, 4);
                         while(i-- > 0)
                                 kfree((ch--)->tmp_buf);
                         return;
-                }
-                else 
+                } else
                         memset((void *)ch->tmp_buf,0,ch->txbufsize);
         } /* End for each port */
 
         printk(KERN_INFO 
                 "Digi PC/Xx Driver V%s:  %s I/O = 0x%lx Mem = 0x%lx Ports = %d\n", 
                 VERSION, board_desc[bd->type], (long)bd->port, (long)bd->membase, bd->numports);
-        sprintf(mesg, 
-                "Digi PC/Xx Driver V%s:  %s I/O = 0x%lx Mem = 0x%lx Ports = %d\n", 
-                VERSION, board_desc[bd->type], (long)bd->port, (long)bd->membase, bd->numports);
-        console_print(mesg);
-
         memwinoff(bd, 0);
 
 } /* End post_fep_init */
@@ -1943,9 +1672,6 @@ static void epcapoll(unsigned long ignored)
                 buffer empty) and acts on those events.
         ----------------------------------------------------------------------- */
         
-        save_flags(flags);
-        cli();
-
         for (crd = 0; crd < num_cards; crd++) 
         { /* Begin for each card */
 
@@ -1961,6 +1687,8 @@ static void epcapoll(unsigned long ignored)
                         some legacy boards.
                 ---------------------------------------------------------------- */
 
+                spin_lock_irqsave(&epca_lock, flags);
+
                 assertmemoff(ch);
 
                 globalwinon(ch);
@@ -1970,21 +1698,19 @@ static void epcapoll(unsigned long ignored)
                         the transmit or receive queue.
                 ------------------------------------------------------------------- */
 
-                head = ch->mailbox->ein;
-                tail = ch->mailbox->eout;
+                head = readw(&ch->mailbox->ein);
+                tail = readw(&ch->mailbox->eout);
                 
                 /* If head isn't equal to tail we have an event */
 
                 if (head != tail)
                         doevent(crd);
-
                 memoff(ch);
 
-        } /* End for each card */
+                spin_unlock_irqrestore(&epca_lock, flags);
 
+        } /* End for each card */
         mod_timer(&epca_timer, jiffies + (HZ / 25));
-
-        restore_flags(flags);
 } /* End epcapoll */
 
 /* --------------------- Begin doevent  ------------------------ */
@@ -1992,53 +1718,42 @@ static void epcapoll(unsigned long ignored)
 static void doevent(int crd)
 { /* Begin doevent */
 
-        volatile unchar *eventbuf;
+        void *eventbuf;
         struct channel *ch, *chan0;
         static struct tty_struct *tty;
-        volatile struct board_info *bd;
-        volatile struct board_chan *bc;
-        register volatile unsigned int tail, head;
-        register int event, channel;
-        register int mstat, lstat;
+        struct board_info *bd;
+        struct board_chan *bc;
+        unsigned int tail, head;
+        int event, channel;
+        int mstat, lstat;
 
         /* -------------------------------------------------------------------
                 This subroutine is called by epcapoll when an event is detected 
                 in the event queue.  This routine responds to those events.
         --------------------------------------------------------------------- */
-
         bd = &boards[crd];
 
         chan0 = card_ptr[crd];
         epcaassert(chan0 <= &digi_channels[nbdevs - 1], "ch out of range");
-
         assertgwinon(chan0);
-
-        while ((tail = chan0->mailbox->eout) != (head = chan0->mailbox->ein)) 
+        while ((tail = readw(&chan0->mailbox->eout)) != (head = readw(&chan0->mailbox->ein)))
         { /* Begin while something in event queue */
-
                 assertgwinon(chan0);
-
-                eventbuf = (volatile unchar *)bus_to_virt((ulong)(bd->re_map_membase + tail + ISTART));
-
+                eventbuf = bd->re_map_membase + tail + ISTART;
                 /* Get the channel the event occurred on */
-                channel = eventbuf[0];
-
+                channel = readb(eventbuf);
                 /* Get the actual event code that occurred */
-                event = eventbuf[1];
-
+                event = readb(eventbuf + 1);
                 /*  ----------------------------------------------------------------
                         The two assignments below get the current modem status (mstat)
                         and the previous modem status (lstat).  These are useful becuase
                         an event could signal a change in modem signals itself.
                 ------------------------------------------------------------------- */
-
-                mstat = eventbuf[2];
-                lstat = eventbuf[3];
+                mstat = readb(eventbuf + 2);
+                lstat = readb(eventbuf + 3);
 
                 ch = chan0 + channel;
-
-                if ((unsigned)channel >= bd->numports || !ch) 
-                { 
+                if ((unsigned)channel >= bd->numports || !ch)  {
                         if (channel >= bd->numports)
                                 ch = chan0;
                         bc = ch->brdchan;
@@ -2048,97 +1763,53 @@ static void doevent(int crd)
                 if ((bc = ch->brdchan) == NULL)
                         goto next;
 
-                if (event & DATA_IND) 
-                { /* Begin DATA_IND */
-
+                if (event & DATA_IND)  { /* Begin DATA_IND */
                         receive_data(ch);
                         assertgwinon(ch);
-
                 } /* End DATA_IND */
                 /* else *//* Fix for DCD transition missed bug */
-                if (event & MODEMCHG_IND) 
-                { /* Begin MODEMCHG_IND */
-
+                if (event & MODEMCHG_IND)  { /* Begin MODEMCHG_IND */
                         /* A modem signal change has been indicated */
-
                         ch->imodem = mstat;
-
-                        if (ch->asyncflags & ASYNC_CHECK_CD) 
-                        {
+                        if (ch->asyncflags & ASYNC_CHECK_CD)  {
                                 if (mstat & ch->dcd)  /* We are now receiving dcd */
                                         wake_up_interruptible(&ch->open_wait);
                                 else
                                         pc_sched_event(ch, EPCA_EVENT_HANGUP); /* No dcd; hangup */
                         }
-
                 } /* End MODEMCHG_IND */
-
                 tty = ch->tty;
-                if (tty) 
-                { /* Begin if valid tty */
-
-                        if (event & BREAK_IND) 
-                        { /* Begin if BREAK_IND */
-
+                if (tty)  { /* Begin if valid tty */
+                        if (event & BREAK_IND)  { /* Begin if BREAK_IND */
                                 /* A break has been indicated */
-
                                 tty->flip.count++;
                                 *tty->flip.flag_buf_ptr++ = TTY_BREAK;
-
                                 *tty->flip.char_buf_ptr++ = 0;
-
                                 tty_schedule_flip(tty); 
-
-                        } /* End if BREAK_IND */
-                        else
-                        if (event & LOWTX_IND) 
-                        { /* Begin LOWTX_IND */
-
+                        } else if (event & LOWTX_IND)  { /* Begin LOWTX_IND */
                                 if (ch->statusflags & LOWWAIT) 
                                 { /* Begin if LOWWAIT */
-
                                         ch->statusflags &= ~LOWWAIT;
                                         tty_wakeup(tty);
                                         wake_up_interruptible(&tty->write_wait);
-
                                 } /* End if LOWWAIT */
-
-                        } /* End LOWTX_IND */
-                        else
-                        if (event & EMPTYTX_IND) 
-                        { /* Begin EMPTYTX_IND */
-
+                        } else if (event & EMPTYTX_IND)  { /* Begin EMPTYTX_IND */
                                 /* This event is generated by setup_empty_event */
-
                                 ch->statusflags &= ~TXBUSY;
-                                if (ch->statusflags & EMPTYWAIT) 
-                                { /* Begin if EMPTYWAIT */
-
+                                if (ch->statusflags & EMPTYWAIT)  { /* Begin if EMPTYWAIT */
                                         ch->statusflags &= ~EMPTYWAIT;
                                         tty_wakeup(tty);
-
                                         wake_up_interruptible(&tty->write_wait);
-
                                 } /* End if EMPTYWAIT */
-
                         } /* End EMPTYTX_IND */
-
                 } /* End if valid tty */
-
-
         next:
                 globalwinon(ch);
-
-                if (!bc)
-                        printk(KERN_ERR "<Error> - bc == NULL in doevent!\n");
-                else 
-                        bc->idata = 1;
-
-                chan0->mailbox->eout = (tail + 4) & (IMAX - ISTART - 4);
+                BUG_ON(!bc);
+                writew(1, &bc->idata);
+                writew((tail + 4) & (IMAX - ISTART - 4), &chan0->mailbox->eout);
                 globalwinon(chan0);
-
         } /* End while something in event queue */
-
 } /* End doevent */
 
 /* --------------------- Begin fepcmd  ------------------------ */
@@ -2146,7 +1817,6 @@ static void doevent(int crd)
 static void fepcmd(struct channel *ch, int cmd, int word_or_byte,
                    int byte2, int ncmds, int bytecmd)
 { /* Begin fepcmd */
-
         unchar *memaddr;
         unsigned int head, cmdTail, cmdStart, cmdMax;
         long count;
@@ -2155,93 +1825,57 @@ static void fepcmd(struct channel *ch, int cmd, int word_or_byte,
         /* This is the routine in which commands may be passed to the card. */
 
         if (ch->board->status == DISABLED)
-        {
                 return;
-        }
-
         assertgwinon(ch);
-
         /* Remember head (As well as max) is just an offset not a base addr */
-        head = ch->mailbox->cin;
-
+        head = readw(&ch->mailbox->cin);
         /* cmdStart is a base address */
-        cmdStart = ch->mailbox->cstart;
-
+        cmdStart = readw(&ch->mailbox->cstart);
         /* ------------------------------------------------------------------
                 We do the addition below because we do not want a max pointer 
                 relative to cmdStart.  We want a max pointer that points at the 
                 physical end of the command queue.
         -------------------------------------------------------------------- */
-
-        cmdMax = (cmdStart + 4 + (ch->mailbox->cmax));
-
+        cmdMax = (cmdStart + 4 + readw(&ch->mailbox->cmax));
         memaddr = ch->board->re_map_membase;
 
-        /* 
-           The below command is necessary because newer kernels (2.1.x and
-           up) do not have a 1:1 virtual to physical mapping.  The below
-           call adjust for that.
-        */
-
-        memaddr = (unsigned char *)bus_to_virt((unsigned long)memaddr);
-
-        if (head >= (cmdMax - cmdStart) || (head & 03)) 
-        {
-                printk(KERN_ERR "line %d: Out of range, cmd = %x, head = %x\n", __LINE__, 
-              cmd, head);
-                printk(KERN_ERR "line %d: Out of range, cmdMax = %x, cmdStart = %x\n", __LINE__, 
-              cmdMax, cmdStart);
+        if (head >= (cmdMax - cmdStart) || (head & 03))  {
+                printk(KERN_ERR "line %d: Out of range, cmd = %x, head = %x\n", __LINE__,  cmd, head);
+                printk(KERN_ERR "line %d: Out of range, cmdMax = %x, cmdStart = %x\n", __LINE__,  cmdMax, cmdStart);
                 return;
         }
-
-        if (bytecmd) 
-        {
-                *(volatile unchar *)(memaddr + head + cmdStart + 0) = (unchar)cmd;
-
-                *(volatile unchar *)(memaddr + head + cmdStart + 1) = (unchar)ch->channelnum;
+        if (bytecmd)  {
+                writeb(cmd, memaddr + head + cmdStart + 0);
+                writeb(ch->channelnum,  memaddr + head + cmdStart + 1);
                 /* Below word_or_byte is bits to set */
-                *(volatile unchar *)(memaddr + head + cmdStart + 2) = (unchar)word_or_byte;
+                writeb(word_or_byte,  memaddr + head + cmdStart + 2);
                 /* Below byte2 is bits to reset */
-                *(volatile unchar *)(memaddr + head + cmdStart + 3) = (unchar)byte2;
-
-        } 
-        else 
-        {
-                *(volatile unchar *)(memaddr + head + cmdStart + 0) = (unchar)cmd;
-                *(volatile unchar *)(memaddr + head + cmdStart + 1) = (unchar)ch->channelnum;
-                *(volatile ushort*)(memaddr + head + cmdStart + 2) = (ushort)word_or_byte;
+                writeb(byte2, memaddr + head + cmdStart + 3);
+        }  else {
+                writeb(cmd, memaddr + head + cmdStart + 0);
+                writeb(ch->channelnum,  memaddr + head + cmdStart + 1);
+                writeb(word_or_byte,  memaddr + head + cmdStart + 2);
         }
-
         head = (head + 4) & (cmdMax - cmdStart - 4);
-        ch->mailbox->cin = head;
-
+        writew(head, &ch->mailbox->cin);
         count = FEPTIMEOUT;
 
-        for (;;) 
-        { /* Begin forever loop */
-
+        for (;;)  { /* Begin forever loop */
                 count--;
-                if (count == 0) 
-                {
+                if (count == 0)  {
                         printk(KERN_ERR "<Error> - Fep not responding in fepcmd()\n");
                         return;
                 }
-
-                head = ch->mailbox->cin;
-                cmdTail = ch->mailbox->cout;
-
+                head = readw(&ch->mailbox->cin);
+                cmdTail = readw(&ch->mailbox->cout);
                 n = (head - cmdTail) & (cmdMax - cmdStart - 4);
-
                 /* ----------------------------------------------------------
                         Basically this will break when the FEP acknowledges the 
                         command by incrementing cmdTail (Making it equal to head).
                 ------------------------------------------------------------- */
-
                 if (n <= ncmds * (sizeof(short) * 4))
                         break; /* Well nearly forever :-) */
-
         } /* End forever loop */
-
 } /* End fepcmd */
 
 /* ---------------------------------------------------------------------
@@ -2255,11 +1889,9 @@ static void fepcmd(struct channel *ch, int cmd, int word_or_byte,
 
 static unsigned termios2digi_h(struct channel *ch, unsigned cflag)
 { /* Begin termios2digi_h */
-
         unsigned res = 0;
 
-        if (cflag & CRTSCTS) 
-        {
+        if (cflag & CRTSCTS) {
                 ch->digiext.digi_flags |= (RTSPACE | CTSPACE);
                 res |= ((ch->m_cts) | (ch->m_rts));
         }
@@ -2295,7 +1927,6 @@ static unsigned termios2digi_i(struct channel *ch, unsigned iflag)
 
         unsigned res = iflag & (IGNBRK | BRKINT | IGNPAR | PARMRK | 
                                 INPCK | ISTRIP|IXON|IXANY|IXOFF);
-        
         if (ch->digiext.digi_flags & DIGI_AIXON)
                 res |= IAIXON;
         return res;
@@ -2308,28 +1939,15 @@ static unsigned termios2digi_c(struct channel *ch, unsigned cflag)
 { /* Begin termios2digi_c */
 
         unsigned res = 0;
-
-#ifdef SPEED_HACK
-        /* CL: HACK to force 115200 at 38400 and 57600 at 19200 Baud */
-        if ((cflag & CBAUD)== B38400) cflag=cflag - B38400 + B115200;
-        if ((cflag & CBAUD)== B19200) cflag=cflag - B19200 + B57600;
-#endif /* SPEED_HACK */
-
-        if (cflag & CBAUDEX)
-        { /* Begin detected CBAUDEX */
-
+        if (cflag & CBAUDEX) { /* Begin detected CBAUDEX */
                 ch->digiext.digi_flags |= DIGI_FAST;
-
                 /* -------------------------------------------------------------
                    HUPCL bit is used by FEP to indicate fast baud
                    table is to be used.
                 ----------------------------------------------------------------- */
-
                 res |= FEP_HUPCL;
-
         } /* End detected CBAUDEX */
         else ch->digiext.digi_flags &= ~DIGI_FAST; 
-
         /* -------------------------------------------------------------------
                 CBAUD has bit position 0x1000 set these days to indicate Linux
                 baud rate remap.  Digi hardware can't handle the bit assignment.
@@ -2337,7 +1955,6 @@ static unsigned termios2digi_c(struct channel *ch, unsigned cflag)
                 bit out.
         ---------------------------------------------------------------------- */
         res |= cflag & ((CBAUD ^ CBAUDEX) | PARODD | PARENB | CSTOPB | CSIZE);
-
         /* -------------------------------------------------------------
                 This gets a little confusing.  The Digi cards have their own
                 representation of c_cflags controling baud rate.  For the most
@@ -2357,10 +1974,8 @@ static unsigned termios2digi_c(struct channel *ch, unsigned cflag)
                 should be checked for a screened out prior to termios2digi_c 
                 returning.  Since CLOCAL isn't used by the board this can be
                 ignored as long as the returned value is used only by Digi hardware. 
-        ----------------------------------------------------------------- */
-
-        if (cflag & CBAUDEX)
-        {
+                ----------------------------------------------------------------- */
+        if (cflag & CBAUDEX) {
                 /* -------------------------------------------------------------
                         The below code is trying to guarantee that only baud rates
                         115200 and 230400 are remapped.  We use exclusive or because
@@ -2371,138 +1986,96 @@ static unsigned termios2digi_c(struct channel *ch, unsigned cflag)
                                 
                 if ((!((cflag & 0x7) ^ (B115200 & ~CBAUDEX))) || 
                     (!((cflag & 0x7) ^ (B230400 & ~CBAUDEX))))
-                {
                         res += 1;
-                }
         }
-
         return res;
 
 } /* End termios2digi_c */
 
 /* --------------------- Begin epcaparam  ----------------------- */
 
+/* Caller must hold the locks */
 static void epcaparam(struct tty_struct *tty, struct channel *ch)
 { /* Begin epcaparam */
 
         unsigned int cmdHead;
         struct termios *ts;
-        volatile struct board_chan *bc;
+        struct board_chan *bc;
         unsigned mval, hflow, cflag, iflag;
 
         bc = ch->brdchan;
         epcaassert(bc !=0, "bc out of range");
 
         assertgwinon(ch);
-
         ts = tty->termios;
-
-        if ((ts->c_cflag & CBAUD) == 0) 
-        { /* Begin CBAUD detected */
-
-                cmdHead = bc->rin;
+        if ((ts->c_cflag & CBAUD) == 0)  { /* Begin CBAUD detected */
+                cmdHead = readw(&bc->rin);
                 bc->rout = cmdHead;
-                cmdHead = bc->tin;
-
+                cmdHead = readw(&bc->tin);
                 /* Changing baud in mid-stream transmission can be wonderful */
                 /* ---------------------------------------------------------------
                         Flush current transmit buffer by setting cmdTail pointer (tout)
                         to cmdHead pointer (tin).  Hopefully the transmit buffer is empty.
                 ----------------------------------------------------------------- */
-
                 fepcmd(ch, STOUT, (unsigned) cmdHead, 0, 0, 0);
                 mval = 0;
-
-        } /* End CBAUD detected */
-        else 
-        { /* Begin CBAUD not detected */
-
+        } else  { /* Begin CBAUD not detected */
                 /* -------------------------------------------------------------------
                         c_cflags have changed but that change had nothing to do with BAUD.
                         Propagate the change to the card.
                 ---------------------------------------------------------------------- */ 
-
                 cflag = termios2digi_c(ch, ts->c_cflag);
-
-                if (cflag != ch->fepcflag) 
-                {
+                if (cflag != ch->fepcflag)  {
                         ch->fepcflag = cflag;
                         /* Set baud rate, char size, stop bits, parity */
                         fepcmd(ch, SETCTRLFLAGS, (unsigned) cflag, 0, 0, 0);
                 }
-
-
                 /* ----------------------------------------------------------------
                         If the user has not forced CLOCAL and if the device is not a 
                         CALLOUT device (Which is always CLOCAL) we set flags such that
                         the driver will wait on carrier detect.
                 ------------------------------------------------------------------- */
-
                 if (ts->c_cflag & CLOCAL)
-                { /* Begin it is a cud device or a ttyD device with CLOCAL on */
                         ch->asyncflags &= ~ASYNC_CHECK_CD;
-                } /* End it is a cud device or a ttyD device with CLOCAL on */
                 else
-                { /* Begin it is a ttyD device */
                         ch->asyncflags |= ASYNC_CHECK_CD;
-                } /* End it is a ttyD device */
-
                 mval = ch->m_dtr | ch->m_rts;
-
         } /* End CBAUD not detected */
-
         iflag = termios2digi_i(ch, ts->c_iflag);
-
         /* Check input mode flags */
-
-        if (iflag != ch->fepiflag) 
-        {
+        if (iflag != ch->fepiflag)  {
                 ch->fepiflag = iflag;
-
                 /* ---------------------------------------------------------------
                         Command sets channels iflag structure on the board. Such things 
                         as input soft flow control, handling of parity errors, and
                         break handling are all set here.
                 ------------------------------------------------------------------- */
-
                 /* break handling, parity handling, input stripping, flow control chars */
                 fepcmd(ch, SETIFLAGS, (unsigned int) ch->fepiflag, 0, 0, 0);
         }
-
         /* ---------------------------------------------------------------
                 Set the board mint value for this channel.  This will cause hardware
                 events to be generated each time the DCD signal (Described in mint) 
                 changes.        
         ------------------------------------------------------------------- */
-        bc->mint = ch->dcd;
-
+        writeb(ch->dcd, &bc->mint);
         if ((ts->c_cflag & CLOCAL) || (ch->digiext.digi_flags & DIGI_FORCEDCD))
                 if (ch->digiext.digi_flags & DIGI_FORCEDCD)
-                        bc->mint = 0;
-
-        ch->imodem = bc->mstat;
-
+                        writeb(0, &bc->mint);
+        ch->imodem = readb(&bc->mstat);
         hflow = termios2digi_h(ch, ts->c_cflag);
-
-        if (hflow != ch->hflow) 
-        {
+        if (hflow != ch->hflow)  {
                 ch->hflow = hflow;
-
                 /* --------------------------------------------------------------
                         Hard flow control has been selected but the board is not
                         using it.  Activate hard flow control now.
                 ----------------------------------------------------------------- */
-
                 fepcmd(ch, SETHFLOW, hflow, 0xff, 0, 1);
         }
-        
-
         mval ^= ch->modemfake & (mval ^ ch->modem);
 
-        if (ch->omodem ^ mval) 
-        {
+        if (ch->omodem ^ mval)  {
                 ch->omodem = mval;
-
                 /* --------------------------------------------------------------
                         The below command sets the DTR and RTS mstat structure.  If
                         hard flow control is NOT active these changes will drive the
@@ -2514,87 +2087,65 @@ static void epcaparam(struct tty_struct *tty, struct channel *ch)
                 /* First reset DTR & RTS; then set them */
                 fepcmd(ch, SETMODEM, 0, ((ch->m_dtr)|(ch->m_rts)), 0, 1);
                 fepcmd(ch, SETMODEM, mval, 0, 0, 1);
-
         }
-
-        if (ch->startc != ch->fepstartc || ch->stopc != ch->fepstopc) 
-        {
+        if (ch->startc != ch->fepstartc || ch->stopc != ch->fepstopc)  {
                 ch->fepstartc = ch->startc;
                 ch->fepstopc = ch->stopc;
-
                 /* ------------------------------------------------------------
                         The XON / XOFF characters have changed; propagate these
                         changes to the card.    
                 --------------------------------------------------------------- */
-
                 fepcmd(ch, SONOFFC, ch->fepstartc, ch->fepstopc, 0, 1);
         }
-
-        if (ch->startca != ch->fepstartca || ch->stopca != ch->fepstopca) 
-        {
+        if (ch->startca != ch->fepstartca || ch->stopca != ch->fepstopca)  {
                 ch->fepstartca = ch->startca;
                 ch->fepstopca = ch->stopca;
-
                 /* ---------------------------------------------------------------
                         Similar to the above, this time the auxilarly XON / XOFF 
                         characters have changed; propagate these changes to the card.
                 ------------------------------------------------------------------ */
-
                 fepcmd(ch, SAUXONOFFC, ch->fepstartca, ch->fepstopca, 0, 1);
         }
-
 } /* End epcaparam */
 
 /* --------------------- Begin receive_data  ----------------------- */
-
+/* Caller holds lock */
 static void receive_data(struct channel *ch)
 { /* Begin receive_data */
 
         unchar *rptr;
         struct termios *ts = NULL;
         struct tty_struct *tty;
-        volatile struct board_chan *bc;
-        register int dataToRead, wrapgap, bytesAvailable;
-        register unsigned int tail, head;
+        struct board_chan *bc;
+        int dataToRead, wrapgap, bytesAvailable;
+        unsigned int tail, head;
         unsigned int wrapmask;
         int rc;
 
-
         /* ---------------------------------------------------------------
                 This routine is called by doint when a receive data event 
                 has taken place.
         ------------------------------------------------------------------- */
 
         globalwinon(ch);
-
         if (ch->statusflags & RXSTOPPED)
                 return;
-
         tty = ch->tty;
         if (tty)
                 ts = tty->termios;
-
         bc = ch->brdchan;
-
-        if (!bc) 
-        {
-                printk(KERN_ERR "<Error> - bc is NULL in receive_data!\n");
-                return;
-        }
-
+        BUG_ON(!bc);
         wrapmask = ch->rxbufsize - 1;
 
         /* --------------------------------------------------------------------- 
                 Get the head and tail pointers to the receiver queue.  Wrap the 
                 head pointer if it has reached the end of the buffer.
         ------------------------------------------------------------------------ */
-
-        head = bc->rin;
+        head = readw(&bc->rin);
         head &= wrapmask;
-        tail = bc->rout & wrapmask;
+        tail = readw(&bc->rout) & wrapmask;
 
         bytesAvailable = (head - tail) & wrapmask;
-
         if (bytesAvailable == 0)
                 return;
 
@@ -2602,8 +2153,7 @@ static void receive_data(struct channel *ch)
            If CREAD bit is off or device not open, set TX tail to head
         --------------------------------------------------------------------- */
 
-        if (!tty || !ts || !(ts->c_cflag & CREAD)) 
-        {
+        if (!tty || !ts || !(ts->c_cflag & CREAD))  {
                 bc->rout = head;
                 return;
         }
@@ -2611,64 +2161,45 @@ static void receive_data(struct channel *ch)
         if (tty->flip.count == TTY_FLIPBUF_SIZE) 
                 return;
 
-        if (bc->orun) 
-        {
-                bc->orun = 0;
-                printk(KERN_WARNING "overrun! DigiBoard device %s\n",tty->name);
+        if (readb(&bc->orun)) {
+                writeb(0, &bc->orun);
+                printk(KERN_WARNING "epca; overrun! DigiBoard device %s\n",tty->name);
         }
-
         rxwinon(ch);
         rptr = tty->flip.char_buf_ptr;
         rc = tty->flip.count;
-
-        while (bytesAvailable > 0) 
-        { /* Begin while there is data on the card */
-
+        while (bytesAvailable > 0)  { /* Begin while there is data on the card */
                 wrapgap = (head >= tail) ? head - tail : ch->rxbufsize - tail;
-
                 /* ---------------------------------------------------------------
                         Even if head has wrapped around only report the amount of
                         data to be equal to the size - tail.  Remember memcpy can't
                         automaticly wrap around the receive buffer.
                 ----------------------------------------------------------------- */
-
                 dataToRead = (wrapgap < bytesAvailable) ? wrapgap : bytesAvailable;
-
                 /* --------------------------------------------------------------
                    Make sure we don't overflow the buffer
                 ----------------------------------------------------------------- */
-
                 if ((rc + dataToRead) > TTY_FLIPBUF_SIZE)
                         dataToRead = TTY_FLIPBUF_SIZE - rc;
-
                 if (dataToRead == 0)
                         break;
-
                 /* ---------------------------------------------------------------
                         Move data read from our card into the line disciplines buffer
                         for translation if necessary.
                 ------------------------------------------------------------------ */
-
-                if ((memcpy(rptr, ch->rxptr + tail, dataToRead)) != rptr)
-                        printk(KERN_ERR "<Error> - receive_data : memcpy failed\n");
-                        
+                memcpy_fromio(rptr, ch->rxptr + tail, dataToRead);
                 rc   += dataToRead;
                 rptr += dataToRead;
                 tail = (tail + dataToRead) & wrapmask;
                 bytesAvailable -= dataToRead;
-
         } /* End while there is data on the card */
-
-
         tty->flip.count = rc;
         tty->flip.char_buf_ptr = rptr;
         globalwinon(ch);
-        bc->rout = tail;
-
+        writew(tail, &bc->rout);
         /* Must be called with global data */
         tty_schedule_flip(ch->tty); 
         return;
-
 } /* End receive_data */
 
 static int info_ioctl(struct tty_struct *tty, struct file * file,
@@ -2676,17 +2207,15 @@ static int info_ioctl(struct tty_struct *tty, struct file * file,
 {
         switch (cmd) 
         { /* Begin switch cmd */
-
                 case DIGI_GETINFO:
                 { /* Begin case DIGI_GETINFO */
-
                         struct digi_info di ;
                         int brd;
 
-                        getUser(brd, (unsigned int __user *)arg);
-
-                        if ((brd < 0) || (brd >= num_cards) || (num_cards == 0))
-                                return (-ENODEV);
+                        if(get_user(brd, (unsigned int __user *)arg))
+                                return -EFAULT;
+                        if (brd < 0 || brd >= num_cards || num_cards == 0)
+                                return -ENODEV;
 
                         memset(&di, 0, sizeof(di));
 
@@ -2694,8 +2223,9 @@ static int info_ioctl(struct tty_struct *tty, struct file * file,
                         di.status = boards[brd].status;
                         di.type = boards[brd].type ;
                         di.numports = boards[brd].numports ;
-                        di.port = boards[brd].port ;
-                        di.membase = boards[brd].membase ;
+                        /* Legacy fixups - just move along nothing to see */
+                        di.port = (unsigned char *)boards[brd].port ;
+                        di.membase = (unsigned char *)boards[brd].membase ;
 
                         if (copy_to_user((void __user *)arg, &di, sizeof (di)))
                                 return -EFAULT;
@@ -2709,39 +2239,29 @@ static int info_ioctl(struct tty_struct *tty, struct file * file,
                         int brd = arg & 0xff000000 >> 16 ; 
                         unsigned char state = arg & 0xff ; 
 
-                        if ((brd < 0) || (brd >= num_cards))
-                        {
-                                printk(KERN_ERR "<Error> - DIGI POLLER : brd not valid!\n");
+                        if (brd < 0 || brd >= num_cards) {
+                                printk(KERN_ERR "epca: DIGI POLLER : brd not valid!\n");
                                 return (-ENODEV);
                         }
-
                         digi_poller_inhibited = state ;
                         break ; 
-
                 } /* End case DIGI_POLLER */
 
                 case DIGI_INIT:
                 { /* Begin case DIGI_INIT */
-
                         /* ------------------------------------------------------------
                                 This call is made by the apps to complete the initilization
                                 of the board(s).  This routine is responsible for setting
                                 the card to its initial state and setting the drivers control
                                 fields to the sutianle settings for the card in question.
                         ---------------------------------------------------------------- */
-                
                         int crd ; 
                         for (crd = 0; crd < num_cards; crd++) 
                                 post_fep_init (crd);
-
                         break ; 
-
                 } /* End case DIGI_INIT */
-
-
                 default:
-                        return -ENOIOCTLCMD;
-
+                        return -ENOTTY;
         } /* End switch cmd */
         return (0) ;
 }
@@ -2750,43 +2270,33 @@ static int info_ioctl(struct tty_struct *tty, struct file * file,
 static int pc_tiocmget(struct tty_struct *tty, struct file *file)
 {
         struct channel *ch = (struct channel *) tty->driver_data;
-        volatile struct board_chan *bc;
+        struct board_chan *bc;
         unsigned int mstat, mflag = 0;
         unsigned long flags;
 
         if (ch)
                 bc = ch->brdchan;
         else
-        {
-                printk(KERN_ERR "<Error> - ch is NULL in pc_tiocmget!\n");
-                return(-EINVAL);
-        }
+                return -EINVAL;
 
-        save_flags(flags);
-        cli();
+        spin_lock_irqsave(&epca_lock, flags);
         globalwinon(ch);
-        mstat = bc->mstat;
+        mstat = readb(&bc->mstat);
         memoff(ch);
-        restore_flags(flags);
+        spin_unlock_irqrestore(&epca_lock, flags);
 
         if (mstat & ch->m_dtr)
                 mflag |= TIOCM_DTR;
-
         if (mstat & ch->m_rts)
                 mflag |= TIOCM_RTS;
-
         if (mstat & ch->m_cts)
                 mflag |= TIOCM_CTS;
-
         if (mstat & ch->dsr)
                 mflag |= TIOCM_DSR;
-
         if (mstat & ch->m_ri)
                 mflag |= TIOCM_RI;
-
         if (mstat & ch->dcd)
                 mflag |= TIOCM_CD;
-
         return mflag;
 }
 
@@ -2796,13 +2306,10 @@ static int pc_tiocmset(struct tty_struct *tty, struct file *file,
         struct channel *ch = (struct channel *) tty->driver_data;
         unsigned long flags;
 
-        if (!ch) {
-                printk(KERN_ERR "<Error> - ch is NULL in pc_tiocmset!\n");
-                return(-EINVAL);
-        }
+        if (!ch)
+                return -EINVAL;
 
-        save_flags(flags);
-        cli();
+        spin_lock_irqsave(&epca_lock, flags);
         /*
          * I think this modemfake stuff is broken.  It doesn't
          * correctly reflect the behaviour desired by the TIOCM*
@@ -2824,17 +2331,14 @@ static int pc_tiocmset(struct tty_struct *tty, struct file *file,
                 ch->modemfake |= ch->m_dtr;
                 ch->modem &= ~ch->m_dtr;
         }
-
         globalwinon(ch);
-
         /*  --------------------------------------------------------------
                 The below routine generally sets up parity, baud, flow control
                 issues, etc.... It effect both control flags and input flags.
         ------------------------------------------------------------------ */
-
         epcaparam(tty,ch);
         memoff(ch);
-        restore_flags(flags);
+        spin_unlock_irqrestore(&epca_lock, flags);
         return 0;
 }
 
@@ -2847,19 +2351,14 @@ static int pc_ioctl(struct tty_struct *tty, struct file * file,
         unsigned long flags;
         unsigned int mflag, mstat;
         unsigned char startc, stopc;
-        volatile struct board_chan *bc;
+        struct board_chan *bc;
         struct channel *ch = (struct channel *) tty->driver_data;
         void __user *argp = (void __user *)arg;
         
         if (ch)
                 bc = ch->brdchan;
         else 
-        {
-                printk(KERN_ERR "<Error> - ch is NULL in pc_ioctl!\n");
-                return(-EINVAL);
-        }
-
-        save_flags(flags);
+                return -EINVAL;
 
         /* -------------------------------------------------------------------
                 For POSIX compliance we need to add more ioctls.  See tty_ioctl.c
@@ -2871,46 +2370,39 @@ static int pc_ioctl(struct tty_struct *tty, struct file * file,
         { /* Begin switch cmd */
 
                 case TCGETS:
-                        if (copy_to_user(argp, 
-                                         tty->termios, sizeof(struct termios)))
+                        if (copy_to_user(argp, tty->termios, sizeof(struct termios)))
                                 return -EFAULT;
-                        return(0);
-
+                        return 0;
                 case TCGETA:
                         return get_termio(tty, argp);
-
                 case TCSBRK:    /* SVID version: non-zero arg --> no break */
-
                         retval = tty_check_change(tty);
                         if (retval)
                                 return retval;
-
                         /* Setup an event to indicate when the transmit buffer empties */
-
+                        spin_lock_irqsave(&epca_lock, flags);
                         setup_empty_event(tty,ch);              
+                        spin_unlock_irqrestore(&epca_lock, flags);
                         tty_wait_until_sent(tty, 0);
                         if (!arg)
                                 digi_send_break(ch, HZ/4);    /* 1/4 second */
                         return 0;
-
                 case TCSBRKP:   /* support for POSIX tcsendbreak() */
-
                         retval = tty_check_change(tty);
                         if (retval)
                                 return retval;
 
                         /* Setup an event to indicate when the transmit buffer empties */
-
+                        spin_lock_irqsave(&epca_lock, flags);
                         setup_empty_event(tty,ch);              
+                        spin_unlock_irqrestore(&epca_lock, flags);
                         tty_wait_until_sent(tty, 0);
                         digi_send_break(ch, arg ? arg*(HZ/10) : HZ/4);
                         return 0;
-
                 case TIOCGSOFTCAR:
                         if (put_user(C_CLOCAL(tty)?1:0, (unsigned long __user *)arg))
                                 return -EFAULT;
                         return 0;
-
                 case TIOCSSOFTCAR:
                 {
                         unsigned int value;
@@ -2922,75 +2414,63 @@ static int pc_ioctl(struct tty_struct *tty, struct file * file,
                                  (value ? CLOCAL : 0));
                         return 0;
                 }
-
                 case TIOCMODG:
                         mflag = pc_tiocmget(tty, file);
                         if (put_user(mflag, (unsigned long __user *)argp))
                                 return -EFAULT;
                         break;
-
                 case TIOCMODS:
                         if (get_user(mstat, (unsigned __user *)argp))
                                 return -EFAULT;
                         return pc_tiocmset(tty, file, mstat, ~mstat);
-
                 case TIOCSDTR:
+                        spin_lock_irqsave(&epca_lock, flags);
                         ch->omodem |= ch->m_dtr;
-                        cli();
                         globalwinon(ch);
                         fepcmd(ch, SETMODEM, ch->m_dtr, 0, 10, 1);
                         memoff(ch);
-                        restore_flags(flags);
+                        spin_unlock_irqrestore(&epca_lock, flags);
                         break;
 
                 case TIOCCDTR:
+                        spin_lock_irqsave(&epca_lock, flags);
                         ch->omodem &= ~ch->m_dtr;
-                        cli();
                         globalwinon(ch);
                         fepcmd(ch, SETMODEM, 0, ch->m_dtr, 10, 1);
                         memoff(ch);
-                        restore_flags(flags);
+                        spin_unlock_irqrestore(&epca_lock, flags);
                         break;
-
                 case DIGI_GETA:
                         if (copy_to_user(argp, &ch->digiext, sizeof(digi_t)))
                                 return -EFAULT;
                         break;
-
                 case DIGI_SETAW:
                 case DIGI_SETAF:
-                        if ((cmd) == (DIGI_SETAW)) 
-                        {
+                        if (cmd == DIGI_SETAW) {
                                 /* Setup an event to indicate when the transmit buffer empties */
-
+                                spin_lock_irqsave(&epca_lock, flags);
                                 setup_empty_event(tty,ch);              
+                                spin_unlock_irqrestore(&epca_lock, flags);
                                 tty_wait_until_sent(tty, 0);
-                        }
-                        else 
-                        {
+                        } else  {
                                 /* ldisc lock already held in ioctl */
                                 if (tty->ldisc.flush_buffer)
                                         tty->ldisc.flush_buffer(tty);
                         }
-
                         /* Fall Thru */
-
                 case DIGI_SETA:
                         if (copy_from_user(&ch->digiext, argp, sizeof(digi_t)))
                                 return -EFAULT;
                         
-                        if (ch->digiext.digi_flags & DIGI_ALTPIN) 
-                        {
+                        if (ch->digiext.digi_flags & DIGI_ALTPIN)  {
                                 ch->dcd = ch->m_dsr;
                                 ch->dsr = ch->m_dcd;
-                        } 
-                        else 
-                        {
+                        } else {
                                 ch->dcd = ch->m_dcd;
                                 ch->dsr = ch->m_dsr;
                         }
                 
-                        cli();
+                        spin_lock_irqsave(&epca_lock, flags);
                         globalwinon(ch);
 
                         /* -----------------------------------------------------------------
@@ -3000,25 +2480,22 @@ static int pc_ioctl(struct tty_struct *tty, struct file * file,
 
                         epcaparam(tty,ch);
                         memoff(ch);
-                        restore_flags(flags);
+                        spin_unlock_irqrestore(&epca_lock, flags);
                         break;
 
                 case DIGI_GETFLOW:
                 case DIGI_GETAFLOW:
-                        cli();  
+                        spin_lock_irqsave(&epca_lock, flags);
                         globalwinon(ch);
-                        if ((cmd) == (DIGI_GETFLOW)) 
-                        {
-                                dflow.startc = bc->startc;
-                                dflow.stopc = bc->stopc;
-                        }
-                        else 
-                        {
-                                dflow.startc = bc->startca;
-                                dflow.stopc = bc->stopca;
+                        if (cmd == DIGI_GETFLOW) {
+                                dflow.startc = readb(&bc->startc);
+                                dflow.stopc = readb(&bc->stopc);
+                        } else {
+                                dflow.startc = readb(&bc->startca);
+                                dflow.stopc = readb(&bc->stopca);
                         }
                         memoff(ch);
-                        restore_flags(flags);
+                        spin_unlock_irqrestore(&epca_lock, flags);
 
                         if (copy_to_user(argp, &dflow, sizeof(dflow)))
                                 return -EFAULT;
@@ -3026,13 +2503,10 @@ static int pc_ioctl(struct tty_struct *tty, struct file * file,
 
                 case DIGI_SETAFLOW:
                 case DIGI_SETFLOW:
-                        if ((cmd) == (DIGI_SETFLOW)) 
-                        {
+                        if (cmd == DIGI_SETFLOW) {
                                 startc = ch->startc;
                                 stopc = ch->stopc;
-                        } 
-                        else 
-                        {
+                        } else {
                                 startc = ch->startca;
                                 stopc = ch->stopca;
                         }
@@ -3040,40 +2514,31 @@ static int pc_ioctl(struct tty_struct *tty, struct file * file,
                         if (copy_from_user(&dflow, argp, sizeof(dflow)))
                                 return -EFAULT;
 
-                        if (dflow.startc != startc || dflow.stopc != stopc) 
-                        { /* Begin  if setflow toggled */
-                                cli();
+                        if (dflow.startc != startc || dflow.stopc != stopc) { /* Begin  if setflow toggled */
+                                spin_lock_irqsave(&epca_lock, flags);
                                 globalwinon(ch);
 
-                                if ((cmd) == (DIGI_SETFLOW)) 
-                                {
+                                if (cmd == DIGI_SETFLOW) {
                                         ch->fepstartc = ch->startc = dflow.startc;
                                         ch->fepstopc = ch->stopc = dflow.stopc;
                                         fepcmd(ch, SONOFFC, ch->fepstartc, ch->fepstopc, 0, 1);
-                                } 
-                                else 
-                                {
+                                } else {
                                         ch->fepstartca = ch->startca = dflow.startc;
                                         ch->fepstopca  = ch->stopca = dflow.stopc;
                                         fepcmd(ch, SAUXONOFFC, ch->fepstartca, ch->fepstopca, 0, 1);
                                 }
 
-                                if      (ch->statusflags & TXSTOPPED)
+                                if (ch->statusflags & TXSTOPPED)
                                         pc_start(tty);
 
                                 memoff(ch);
-                                restore_flags(flags);
-
+                                spin_unlock_irqrestore(&epca_lock, flags);
                         } /* End if setflow toggled */
                         break;
-
                 default:
                         return -ENOIOCTLCMD;
-
         } /* End switch cmd */
-
         return 0;
-
 } /* End pc_ioctl */
 
 /* --------------------- Begin pc_set_termios  ----------------------- */
@@ -3083,20 +2548,16 @@ static void pc_set_termios(struct tty_struct *tty, struct termios *old_termios)
 
         struct channel *ch;
         unsigned long flags;
-
         /* ---------------------------------------------------------
                 verifyChannel returns the channel from the tty struct
                 if it is valid.  This serves as a sanity check.
         ------------------------------------------------------------- */
-
-        if ((ch = verifyChannel(tty)) != NULL) 
-        { /* Begin if channel valid */
-
-                save_flags(flags);
-                cli();
+        if ((ch = verifyChannel(tty)) != NULL)  { /* Begin if channel valid */
+                spin_lock_irqsave(&epca_lock, flags);
                 globalwinon(ch);
                 epcaparam(tty, ch);
                 memoff(ch);
+                spin_unlock_irqrestore(&epca_lock, flags);
 
                 if ((old_termios->c_cflag & CRTSCTS) &&
                          ((tty->termios->c_cflag & CRTSCTS) == 0))
@@ -3106,8 +2567,6 @@ static void pc_set_termios(struct tty_struct *tty, struct termios *old_termios)
                          (tty->termios->c_cflag & CLOCAL))
                         wake_up_interruptible(&ch->open_wait);
 
-                restore_flags(flags);
-
         } /* End if channel valid */
 
 } /* End pc_set_termios */
@@ -3116,29 +2575,18 @@ static void pc_set_termios(struct tty_struct *tty, struct termios *old_termios)
 
 static void do_softint(void *private_)
 { /* Begin do_softint */
-
         struct channel *ch = (struct channel *) private_;
-        
-
         /* Called in response to a modem change event */
-
-        if (ch && ch->magic == EPCA_MAGIC) 
-        { /* Begin EPCA_MAGIC */
-
+        if (ch && ch->magic == EPCA_MAGIC)  { /* Begin EPCA_MAGIC */
                 struct tty_struct *tty = ch->tty;
 
-                if (tty && tty->driver_data) 
-                { 
-                        if (test_and_clear_bit(EPCA_EVENT_HANGUP, &ch->event)) 
-                        { /* Begin if clear_bit */
-
+                if (tty && tty->driver_data) {
+                        if (test_and_clear_bit(EPCA_EVENT_HANGUP, &ch->event)) { /* Begin if clear_bit */
                                 tty_hangup(tty);        /* FIXME: module removal race here - AKPM */
                                 wake_up_interruptible(&ch->open_wait);
                                 ch->asyncflags &= ~ASYNC_NORMAL_ACTIVE;
-
                         } /* End if clear_bit */
                 }
-
         } /* End EPCA_MAGIC */
 } /* End do_softint */
 
@@ -3154,82 +2602,49 @@ static void pc_stop(struct tty_struct *tty)
 
         struct channel *ch;
         unsigned long flags;
-
         /* ---------------------------------------------------------
                 verifyChannel returns the channel from the tty struct
                 if it is valid.  This serves as a sanity check.
         ------------------------------------------------------------- */
-
-        if ((ch = verifyChannel(tty)) != NULL) 
-        { /* Begin if valid channel */
-
-                save_flags(flags); 
-                cli();
-
-                if ((ch->statusflags & TXSTOPPED) == 0) 
-                { /* Begin if transmit stop requested */
-
+        if ((ch = verifyChannel(tty)) != NULL)  { /* Begin if valid channel */
+                spin_lock_irqsave(&epca_lock, flags);
+                if ((ch->statusflags & TXSTOPPED) == 0)  { /* Begin if transmit stop requested */
                         globalwinon(ch);
-
                         /* STOP transmitting now !! */
-
                         fepcmd(ch, PAUSETX, 0, 0, 0, 0);
-
                         ch->statusflags |= TXSTOPPED;
                         memoff(ch);
-
                 } /* End if transmit stop requested */
-
-                restore_flags(flags);
-
+                spin_unlock_irqrestore(&epca_lock, flags);
         } /* End if valid channel */
-
 } /* End pc_stop */
 
 /* --------------------- Begin pc_start  ----------------------- */
 
 static void pc_start(struct tty_struct *tty)
 { /* Begin pc_start */
-
         struct channel *ch;
-
         /* ---------------------------------------------------------
                 verifyChannel returns the channel from the tty struct
                 if it is valid.  This serves as a sanity check.
         ------------------------------------------------------------- */
-
-        if ((ch = verifyChannel(tty)) != NULL) 
-        { /* Begin if channel valid */
-
+        if ((ch = verifyChannel(tty)) != NULL) { /* Begin if channel valid */
                 unsigned long flags;
-
-                save_flags(flags);
-                cli();
-
+                spin_lock_irqsave(&epca_lock, flags);
                 /* Just in case output was resumed because of a change in Digi-flow */
-                if (ch->statusflags & TXSTOPPED) 
-                { /* Begin transmit resume requested */
-
-                        volatile struct board_chan *bc;
-
+                if (ch->statusflags & TXSTOPPED)  { /* Begin transmit resume requested */
+                        struct board_chan *bc;
                         globalwinon(ch);
                         bc = ch->brdchan;
                         if (ch->statusflags & LOWWAIT)
-                                bc->ilow = 1;
-
+                                writeb(1, &bc->ilow);
                         /* Okay, you can start transmitting again... */
-
                         fepcmd(ch, RESUMETX, 0, 0, 0, 0);
-
                         ch->statusflags &= ~TXSTOPPED;
                         memoff(ch);
-
                 } /* End transmit resume requested */
-
-                restore_flags(flags);
-
+                spin_unlock_irqrestore(&epca_lock, flags);
         } /* End if channel valid */
-
 } /* End pc_start */
 
 /* ------------------------------------------------------------------
@@ -3244,86 +2659,55 @@ ______________________________________________________________________ */
 
 static void pc_throttle(struct tty_struct * tty)
 { /* Begin pc_throttle */
-
         struct channel *ch;
         unsigned long flags;
-
         /* ---------------------------------------------------------
                 verifyChannel returns the channel from the tty struct
                 if it is valid.  This serves as a sanity check.
         ------------------------------------------------------------- */
-
-        if ((ch = verifyChannel(tty)) != NULL) 
-        { /* Begin if channel valid */
-
-
-                save_flags(flags);
-                cli();
-
-                if ((ch->statusflags & RXSTOPPED) == 0)
-                {
+        if ((ch = verifyChannel(tty)) != NULL)  { /* Begin if channel valid */
+                spin_lock_irqsave(&epca_lock, flags);
+                if ((ch->statusflags & RXSTOPPED) == 0) {
                         globalwinon(ch);
                         fepcmd(ch, PAUSERX, 0, 0, 0, 0);
-
                         ch->statusflags |= RXSTOPPED;
                         memoff(ch);
                 }
-                restore_flags(flags);
-
+                spin_unlock_irqrestore(&epca_lock, flags);
         } /* End if channel valid */
-
 } /* End pc_throttle */
 
 /* --------------------- Begin unthrottle  ----------------------- */
 
 static void pc_unthrottle(struct tty_struct *tty)
 { /* Begin pc_unthrottle */
-
         struct channel *ch;
         unsigned long flags;
-        volatile struct board_chan *bc;
-
-
         /* ---------------------------------------------------------
                 verifyChannel returns the channel from the tty struct
                 if it is valid.  This serves as a sanity check.
         ------------------------------------------------------------- */
-
-        if ((ch = verifyChannel(tty)) != NULL) 
-        { /* Begin if channel valid */
-
-
+        if ((ch = verifyChannel(tty)) != NULL)  { /* Begin if channel valid */
                 /* Just in case output was resumed because of a change in Digi-flow */
-                save_flags(flags);
-                cli();
-
-                if (ch->statusflags & RXSTOPPED) 
-                {
-
+                spin_lock_irqsave(&epca_lock, flags);
+                if (ch->statusflags & RXSTOPPED) {
                         globalwinon(ch);
-                        bc = ch->brdchan;
                         fepcmd(ch, RESUMERX, 0, 0, 0, 0);
-
                         ch->statusflags &= ~RXSTOPPED;
                         memoff(ch);
                 }
-                restore_flags(flags);
-
+                spin_unlock_irqrestore(&epca_lock, flags);
         } /* End if channel valid */
-
 } /* End pc_unthrottle */
 
 /* --------------------- Begin digi_send_break  ----------------------- */
 
 void digi_send_break(struct channel *ch, int msec)
 { /* Begin digi_send_break */
-
         unsigned long flags;
 
-        save_flags(flags);
-        cli();
+        spin_lock_irqsave(&epca_lock, flags);
         globalwinon(ch);
-
         /* -------------------------------------------------------------------- 
            Maybe I should send an infinite break here, schedule() for
            msec amount of time, and then stop the break.  This way,
@@ -3331,36 +2715,28 @@ void digi_send_break(struct channel *ch, int msec)
            to be called (i.e. via an ioctl()) more than once in msec amount 
            of time.  Try this for now...
         ------------------------------------------------------------------------ */
-
         fepcmd(ch, SENDBREAK, msec, 0, 10, 0);
         memoff(ch);
-
-        restore_flags(flags);
-
+        spin_unlock_irqrestore(&epca_lock, flags);
 } /* End digi_send_break */
 
 /* --------------------- Begin setup_empty_event  ----------------------- */
 
+/* Caller MUST hold the lock */
+
 static void setup_empty_event(struct tty_struct *tty, struct channel *ch)
 { /* Begin setup_empty_event */
 
-        volatile struct board_chan *bc = ch->brdchan;
-        unsigned long int flags;
+        struct board_chan *bc = ch->brdchan;
 
-        save_flags(flags);
-        cli();
         globalwinon(ch);
         ch->statusflags |= EMPTYWAIT;
-        
         /* ------------------------------------------------------------------
                 When set the iempty flag request a event to be generated when the 
                 transmit buffer is empty (If there is no BREAK in progress).
         --------------------------------------------------------------------- */
-
-        bc->iempty = 1;
+        writeb(1, &bc->iempty);
         memoff(ch);
-        restore_flags(flags);
-
 } /* End setup_empty_event */
 
 /* --------------------- Begin get_termio ----------------------- */
@@ -3369,10 +2745,10 @@ static int get_termio(struct tty_struct * tty, struct termio __user * termio)
 { /* Begin get_termio */
         return kernel_termios_to_user_termio(termio, tty->termios);
 } /* End get_termio */
+
 /* ---------------------- Begin epca_setup  -------------------------- */
 void epca_setup(char *str, int *ints)
 { /* Begin epca_setup */
-
         struct board_info board;
         int               index, loop, last;
         char              *temp, *t2;
@@ -3394,49 +2770,41 @@ void epca_setup(char *str, int *ints)
         for (last = 0, index = 1; index <= ints[0]; index++)
                 switch(index)
                 { /* Begin parse switch */
-
                         case 1:
                                 board.status = ints[index];
-                                
                                 /* ---------------------------------------------------------
                                         We check for 2 (As opposed to 1; because 2 is a flag
                                         instructing the driver to ignore epcaconfig.)  For this
                                         reason we check for 2.
                                 ------------------------------------------------------------ */ 
-                                if (board.status == 2)
-                                { /* Begin ignore epcaconfig as well as lilo cmd line */
+                                if (board.status == 2) { /* Begin ignore epcaconfig as well as lilo cmd line */
                                         nbdevs = 0;
                                         num_cards = 0;
                                         return;
                                 } /* End ignore epcaconfig as well as lilo cmd line */
         
-                                if (board.status > 2)
-                                {
-                                        printk(KERN_ERR "<Error> - epca_setup: Invalid board status 0x%x\n", board.status);
+                                if (board.status > 2) {
+                                        printk(KERN_ERR "epca_setup: Invalid board status 0x%x\n", board.status);
                                         invalid_lilo_config = 1;
                                         setup_error_code |= INVALID_BOARD_STATUS;
                                         return;
                                 }
                                 last = index;
                                 break;
-
                         case 2:
                                 board.type = ints[index];
-                                if (board.type >= PCIXEM) 
-                                {
-                                        printk(KERN_ERR "<Error> - epca_setup: Invalid board type 0x%x\n", board.type);
+                                if (board.type >= PCIXEM)  {
+                                        printk(KERN_ERR "epca_setup: Invalid board type 0x%x\n", board.type);
                                         invalid_lilo_config = 1;
                                         setup_error_code |= INVALID_BOARD_TYPE;
                                         return;
                                 }
                                 last = index;
                                 break;
-
                         case 3:
                                 board.altpin = ints[index];
-                                if (board.altpin > 1)
-                                {
-                                        printk(KERN_ERR "<Error> - epca_setup: Invalid board altpin 0x%x\n", board.altpin);
+                                if (board.altpin > 1) {
+                                        printk(KERN_ERR "epca_setup: Invalid board altpin 0x%x\n", board.altpin);
                                         invalid_lilo_config = 1;
                                         setup_error_code |= INVALID_ALTPIN;
                                         return;
@@ -3446,9 +2814,8 @@ void epca_setup(char *str, int *ints)
 
                         case 4:
                                 board.numports = ints[index];
-                                if ((board.numports < 2) || (board.numports > 256))
-                                {
-                                        printk(KERN_ERR "<Error> - epca_setup: Invalid board numports 0x%x\n", board.numports);
+                                if (board.numports < 2 || board.numports > 256) {
+                                        printk(KERN_ERR "epca_setup: Invalid board numports 0x%x\n", board.numports);
                                         invalid_lilo_config = 1;
                                         setup_error_code |= INVALID_NUM_PORTS;
                                         return;
@@ -3458,10 +2825,9 @@ void epca_setup(char *str, int *ints)
                                 break;
 
                         case 5:
-                                board.port = (unsigned char *)ints[index];
-                                if (ints[index] <= 0)
-                                {
-                                        printk(KERN_ERR "<Error> - epca_setup: Invalid io port 0x%x\n", (unsigned int)board.port);
+                                board.port = ints[index];
+                                if (ints[index] <= 0) {
+                                        printk(KERN_ERR "epca_setup: Invalid io port 0x%x\n", (unsigned int)board.port);
                                         invalid_lilo_config = 1;
                                         setup_error_code |= INVALID_PORT_BASE;
                                         return;
@@ -3470,10 +2836,9 @@ void epca_setup(char *str, int *ints)
                                 break;
 
                         case 6:
-                                board.membase = (unsigned char *)ints[index];
-                                if (ints[index] <= 0)
-                                {
-                                        printk(KERN_ERR "<Error> - epca_setup: Invalid memory base 0x%x\n",(unsigned int)board.membase);
+                                board.membase = ints[index];
+                                if (ints[index] <= 0) {
+                                        printk(KERN_ERR "epca_setup: Invalid memory base 0x%x\n",(unsigned int)board.membase);
                                         invalid_lilo_config = 1;
                                         setup_error_code |= INVALID_MEM_BASE;
                                         return;
@@ -3487,21 +2852,16 @@ void epca_setup(char *str, int *ints)
 
                 } /* End parse switch */
 
-        while (str && *str) 
-        { /* Begin while there is a string arg */
-
+        while (str && *str)  { /* Begin while there is a string arg */
                 /* find the next comma or terminator */
                 temp = str;
-
                 /* While string is not null, and a comma hasn't been found */
                 while (*temp && (*temp != ','))
                         temp++;
-
                 if (!*temp)
                         temp = NULL;
                 else
                         *temp++ = 0;
-
                 /* Set index to the number of args + 1 */
                 index = last + 1;
 
@@ -3511,12 +2871,10 @@ void epca_setup(char *str, int *ints)
                                 len = strlen(str);
                                 if (strncmp("Disable", str, len) == 0) 
                                         board.status = 0;
-                                else
-                                if (strncmp("Enable", str, len) == 0)
+                                else if (strncmp("Enable", str, len) == 0)
                                         board.status = 1;
-                                else
-                                {
-                                        printk(KERN_ERR "<Error> - epca_setup: Invalid status %s\n", str);
+                                else {
+                                        printk(KERN_ERR "epca_setup: Invalid status %s\n", str);
                                         invalid_lilo_config = 1;
                                         setup_error_code |= INVALID_BOARD_STATUS;
                                         return;
@@ -3525,22 +2883,17 @@ void epca_setup(char *str, int *ints)
                                 break;
 
                         case 2:
-
                                 for(loop = 0; loop < EPCA_NUM_TYPES; loop++)
                                         if (strcmp(board_desc[loop], str) == 0)
                                                 break;
-
-
                                 /* ---------------------------------------------------------------
                                         If the index incremented above refers to a legitamate board 
                                         type set it here. 
                                 ------------------------------------------------------------------*/
-
                                 if (index < EPCA_NUM_TYPES) 
                                         board.type = loop;
-                                else
-                                {
-                                        printk(KERN_ERR "<Error> - epca_setup: Invalid board type: %s\n", str);
+                                else {
+                                        printk(KERN_ERR "epca_setup: Invalid board type: %s\n", str);
                                         invalid_lilo_config = 1;
                                         setup_error_code |= INVALID_BOARD_TYPE;
                                         return;
@@ -3552,12 +2905,10 @@ void epca_setup(char *str, int *ints)
                                 len = strlen(str);
                                 if (strncmp("Disable", str, len) == 0) 
                                         board.altpin = 0;
-                                else
-                                if (strncmp("Enable", str, len) == 0)
+                                else if (strncmp("Enable", str, len) == 0)
                                         board.altpin = 1;
-                                else
-                                {
-                                        printk(KERN_ERR "<Error> - epca_setup: Invalid altpin %s\n", str);
+                                else {
+                                        printk(KERN_ERR "epca_setup: Invalid altpin %s\n", str);
                                         invalid_lilo_config = 1;
                                         setup_error_code |= INVALID_ALTPIN;
                                         return;
@@ -3570,9 +2921,8 @@ void epca_setup(char *str, int *ints)
                                 while (isdigit(*t2))
                                         t2++;
 
-                                if (*t2)
-                                {
-                                        printk(KERN_ERR "<Error> - epca_setup: Invalid port count %s\n", str);
+                                if (*t2) {
+                                        printk(KERN_ERR "epca_setup: Invalid port count %s\n", str);
                                         invalid_lilo_config = 1;
                                         setup_error_code |= INVALID_NUM_PORTS;
                                         return;
@@ -3601,15 +2951,14 @@ void epca_setup(char *str, int *ints)
                                 while (isxdigit(*t2))
                                         t2++;
 
-                                if (*t2)
-                                {
-                                        printk(KERN_ERR "<Error> - epca_setup: Invalid i/o address %s\n", str);
+                                if (*t2) {
+                                        printk(KERN_ERR "epca_setup: Invalid i/o address %s\n", str);
                                         invalid_lilo_config = 1;
                                         setup_error_code |= INVALID_PORT_BASE;
                                         return;
                                 }
 
-                                board.port = (unsigned char *)simple_strtoul(str, NULL, 16);
+                                board.port = simple_strtoul(str, NULL, 16);
                                 last = index;
                                 break;
 
@@ -3618,52 +2967,38 @@ void epca_setup(char *str, int *ints)
                                 while (isxdigit(*t2))
                                         t2++;
 
-                                if (*t2)
-                                {
-                                        printk(KERN_ERR "<Error> - epca_setup: Invalid memory base %s\n",str);
+                                if (*t2) {
+                                        printk(KERN_ERR "epca_setup: Invalid memory base %s\n",str);
                                         invalid_lilo_config = 1;
                                         setup_error_code |= INVALID_MEM_BASE;
                                         return;
                                 }
-
-                                board.membase = (unsigned char *)simple_strtoul(str, NULL, 16);
+                                board.membase = simple_strtoul(str, NULL, 16);
                                 last = index;
                                 break;
-
                         default:
-                                printk(KERN_ERR "PC/Xx: Too many string parms\n");
+                                printk(KERN_ERR "epca: Too many string parms\n");
                                 return;
                 }
                 str = temp;
-
         } /* End while there is a string arg */
 
-
-        if (last < 6)  
-        {
-                printk(KERN_ERR "PC/Xx: Insufficient parms specified\n");
+        if (last < 6) {
+                printk(KERN_ERR "epca: Insufficient parms specified\n");
                 return;
         }
  
         /* I should REALLY validate the stuff here */
-
         /* Copies our local copy of board into boards */
         memcpy((void *)&boards[num_cards],(void *)&board, sizeof(board));
-
-
         /* Does this get called once per lilo arg are what ? */
-
         printk(KERN_INFO "PC/Xx: Added board %i, %s %i ports at 0x%4.4X base 0x%6.6X\n", 
                 num_cards, board_desc[board.type], 
                 board.numports, (int)board.port, (unsigned int) board.membase);
-
         num_cards++;
-
 } /* End epca_setup */
 
 
-
-#ifdef ENABLE_PCI
 /* ------------------------ Begin init_PCI  --------------------------- */
 
 enum epic_board_types {
@@ -3685,7 +3020,6 @@ static struct {
         { PCIXRJ, 2, },
 };
 
-
 static int __devinit epca_init_one (struct pci_dev *pdev,
                                  const struct pci_device_id *ent)
 {
@@ -3711,10 +3045,8 @@ static int __devinit epca_init_one (struct pci_dev *pdev,
         boards[board_idx].status = ENABLED;
         boards[board_idx].type = epca_info_tbl[info_idx].board_type;
         boards[board_idx].numports = 0x0;
-        boards[board_idx].port =
-                (unsigned char *)((char *) addr + PCI_IO_OFFSET);
-        boards[board_idx].membase =
-                (unsigned char *)((char *) addr);
+        boards[board_idx].port = addr + PCI_IO_OFFSET;
+        boards[board_idx].membase = addr;
 
         if (!request_mem_region (addr + PCI_IO_OFFSET, 0x200000, "epca")) {
                 printk (KERN_ERR PFX "resource 0x%x @ 0x%lx unavailable\n",
@@ -3775,15 +3107,13 @@ static struct pci_device_id epca_pci_tbl[] = {
 MODULE_DEVICE_TABLE(pci, epca_pci_tbl);
 
 int __init init_PCI (void)
-{ /* Begin init_PCI */
+{       /* Begin init_PCI */
         memset (&epca_driver, 0, sizeof (epca_driver));
         epca_driver.name = "epca";
         epca_driver.id_table = epca_pci_tbl;
         epca_driver.probe = epca_init_one;
 
         return pci_register_driver(&epca_driver);
-} /* End init_PCI */
-
-#endif /* ENABLE_PCI */
+}
 
 MODULE_LICENSE("GPL");
diff --git a/drivers/char/epca.h b/drivers/char/epca.h
index 52205ef7131..20eeb5a70e1 100644
--- a/drivers/char/epca.h
+++ b/drivers/char/epca.h
@@ -85,73 +85,73 @@ static char *board_desc[] =
 struct channel 
 {
         long   magic;
-        unchar boardnum;
-        unchar channelnum;
-        unchar omodem;         /* FEP output modem status     */
-        unchar imodem;         /* FEP input modem status      */
-        unchar modemfake;      /* Modem values to be forced   */
-        unchar modem;          /* Force values                */
-        unchar hflow;
-        unchar dsr;
-        unchar dcd;
-        unchar m_rts ;          /* The bits used in whatever FEP */
-        unchar m_dcd ;          /* is indiginous to this board to */
-        unchar m_dsr ;          /* represent each of the physical */
-        unchar m_cts ;          /* handshake lines */
-        unchar m_ri ;
-        unchar m_dtr ;
-        unchar stopc;
-        unchar startc;
-        unchar stopca;
-        unchar startca;
-        unchar fepstopc;
-        unchar fepstartc;
-        unchar fepstopca;
-        unchar fepstartca;
-        unchar txwin;
-        unchar rxwin;
-        ushort fepiflag;
-        ushort fepcflag;
-        ushort fepoflag;
-        ushort txbufhead;
-        ushort txbufsize;
-        ushort rxbufhead;
-        ushort rxbufsize;
+        unsigned char boardnum;
+        unsigned char channelnum;
+        unsigned char omodem;         /* FEP output modem status     */
+        unsigned char imodem;         /* FEP input modem status      */
+        unsigned char modemfake;      /* Modem values to be forced   */
+        unsigned char modem;          /* Force values                */
+        unsigned char hflow;
+        unsigned char dsr;
+        unsigned char dcd;
+        unsigned char m_rts ;           /* The bits used in whatever FEP */
+        unsigned char m_dcd ;           /* is indiginous to this board to */
+        unsigned char m_dsr ;           /* represent each of the physical */
+        unsigned char m_cts ;           /* handshake lines */
+        unsigned char m_ri ;
+        unsigned char m_dtr ;
+        unsigned char stopc;
+        unsigned char startc;
+        unsigned char stopca;
+        unsigned char startca;
+        unsigned char fepstopc;
+        unsigned char fepstartc;
+        unsigned char fepstopca;
+        unsigned char fepstartca;
+        unsigned char txwin;
+        unsigned char rxwin;
+        unsigned short fepiflag;
+        unsigned short fepcflag;
+        unsigned short fepoflag;
+        unsigned short txbufhead;
+        unsigned short txbufsize;
+        unsigned short rxbufhead;
+        unsigned short rxbufsize;
         int    close_delay;
         int    count;
         int    blocked_open;
-        ulong  event;
+        unsigned long  event;
         int    asyncflags;
         uint   dev;
-        ulong  statusflags;
-        ulong  c_iflag;
-        ulong  c_cflag;
-        ulong  c_lflag;
-        ulong  c_oflag;
-        unchar *txptr;
-        unchar *rxptr;
-        unchar *tmp_buf;
+        unsigned long  statusflags;
+        unsigned long  c_iflag;
+        unsigned long  c_cflag;
+        unsigned long  c_lflag;
+        unsigned long  c_oflag;
+        unsigned char *txptr;
+        unsigned char *rxptr;
+        unsigned char *tmp_buf;
         struct board_info           *board;
-        volatile struct board_chan  *brdchan;
+        struct board_chan           *brdchan;
         struct digi_struct          digiext;
         struct tty_struct           *tty;
         wait_queue_head_t           open_wait;
         wait_queue_head_t           close_wait;
-        struct work_struct            tqueue;
-        volatile struct global_data *mailbox;
+        struct work_struct          tqueue;
+        struct global_data          *mailbox;
 };
 
 struct board_info       
 {
-        unchar status;
-        unchar type;
-        unchar altpin;
-        ushort numports;
-        unchar *port;
-        unchar *membase;
-        unchar __iomem *re_map_port;
-        unchar *re_map_membase;
-        ulong  memory_seg;
+        unsigned char status;
+        unsigned char type;
+        unsigned char altpin;
+        unsigned short numports;
+        unsigned long port;
+        unsigned long membase;
+        unsigned char __iomem *re_map_port;
+        unsigned char *re_map_membase;
+        unsigned long  memory_seg;
         void ( * memwinon )     (struct board_info *, unsigned int) ;
         void ( * memwinoff )    (struct board_info *, unsigned int) ;
         void ( * globalwinon )  (struct channel *) ;
@@ -160,6 +160,6 @@ struct board_info
         void ( * memoff )       (struct channel *) ;
         void ( * assertgwinon ) (struct channel *) ;
         void ( * assertmemoff ) (struct channel *) ;
-        unchar poller_inhibited ;
+        unsigned char poller_inhibited ;
 };
 
diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c
index 97feb7f7024..5fe8461271f 100644
--- a/drivers/char/hpet.c
+++ b/drivers/char/hpet.c
@@ -44,7 +44,7 @@
 /*
  * The High Precision Event Timer driver.
  * This driver is closely modelled after the rtc.c driver.
- * http://www.intel.com/labs/platcomp/hpet/hpetspec.htm
+ * http://www.intel.com/hardwaredesign/hpetspec.htm
  */
 #define HPET_USER_FREQ  (64)
 #define HPET_DRIFT      (500)
@@ -712,7 +712,7 @@ static void hpet_register_interpolator(struct hpets *hpetp)
         ti->shift = 10;
         ti->addr = &hpetp->hp_hpet->hpet_mc;
         ti->frequency = hpet_time_div(hpets->hp_period);
-        ti->drift = ti->frequency * HPET_DRIFT / 1000000;
+        ti->drift = HPET_DRIFT;
         ti->mask = -1;
 
         hpetp->hp_interpolator = ti;
diff --git a/drivers/char/ipmi/ipmi_bt_sm.c b/drivers/char/ipmi/ipmi_bt_sm.c
index 5ce9c626903..33862670e28 100644
--- a/drivers/char/ipmi/ipmi_bt_sm.c
+++ b/drivers/char/ipmi/ipmi_bt_sm.c
@@ -31,8 +31,6 @@
 #include <linux/ipmi_msgdefs.h>         /* for completion codes */
 #include "ipmi_si_sm.h"
 
-#define IPMI_BT_VERSION "v33"
-
 static int bt_debug = 0x00;     /* Production value 0, see following flags */
 
 #define BT_DEBUG_ENABLE 1
@@ -163,7 +161,8 @@ static int bt_start_transaction(struct si_sm_data *bt,
 {
         unsigned int i;
 
-        if ((size < 2) || (size > IPMI_MAX_MSG_LENGTH)) return -1;
+        if ((size < 2) || (size > IPMI_MAX_MSG_LENGTH))
+               return -1;
 
         if ((bt->state != BT_STATE_IDLE) && (bt->state != BT_STATE_HOSED))
                 return -2;
@@ -171,7 +170,8 @@ static int bt_start_transaction(struct si_sm_data *bt,
         if (bt_debug & BT_DEBUG_MSG) {
                 printk(KERN_WARNING "+++++++++++++++++++++++++++++++++++++\n");
                 printk(KERN_WARNING "BT: write seq=0x%02X:", bt->seq);
-                for (i = 0; i < size; i ++) printk (" %02x", data[i]);
+                for (i = 0; i < size; i ++)
+                       printk (" %02x", data[i]);
                 printk("\n");
         }
         bt->write_data[0] = size + 1;   /* all data plus seq byte */
@@ -210,15 +210,18 @@ static int bt_get_result(struct si_sm_data *bt,
         } else {
                 data[0] = bt->read_data[1];
                 data[1] = bt->read_data[3];
-                if (length < msg_len) bt->truncated = 1;
+                if (length < msg_len)
+                       bt->truncated = 1;
                 if (bt->truncated) {    /* can be set in read_all_bytes() */
                         data[2] = IPMI_ERR_MSG_TRUNCATED;
                         msg_len = 3;
-                } else memcpy(data + 2, bt->read_data + 4, msg_len - 2);
+                } else
+                       memcpy(data + 2, bt->read_data + 4, msg_len - 2);
 
                 if (bt_debug & BT_DEBUG_MSG) {
                         printk (KERN_WARNING "BT: res (raw)");
-                        for (i = 0; i < msg_len; i++) printk(" %02x", data[i]);
+                        for (i = 0; i < msg_len; i++)
+                               printk(" %02x", data[i]);
                         printk ("\n");
                 }
         }
@@ -231,8 +234,10 @@ static int bt_get_result(struct si_sm_data *bt,
 
 static void reset_flags(struct si_sm_data *bt)
 {
-        if (BT_STATUS & BT_H_BUSY) BT_CONTROL(BT_H_BUSY);
-        if (BT_STATUS & BT_B_BUSY) BT_CONTROL(BT_B_BUSY);
+        if (BT_STATUS & BT_H_BUSY)
+               BT_CONTROL(BT_H_BUSY);
+        if (BT_STATUS & BT_B_BUSY)
+               BT_CONTROL(BT_B_BUSY);
         BT_CONTROL(BT_CLR_WR_PTR);
         BT_CONTROL(BT_SMS_ATN);
 #ifdef DEVELOPMENT_ONLY_NOT_FOR_PRODUCTION
@@ -241,7 +246,8 @@ static void reset_flags(struct si_sm_data *bt)
                 BT_CONTROL(BT_H_BUSY);
                 BT_CONTROL(BT_B2H_ATN);
                 BT_CONTROL(BT_CLR_RD_PTR);
-                for (i = 0; i < IPMI_MAX_MSG_LENGTH + 2; i++) BMC2HOST;
+                for (i = 0; i < IPMI_MAX_MSG_LENGTH + 2; i++)
+                       BMC2HOST;
                 BT_CONTROL(BT_H_BUSY);
         }
 #endif
@@ -258,7 +264,8 @@ static inline void write_all_bytes(struct si_sm_data *bt)
                         printk (" %02x", bt->write_data[i]);
                 printk ("\n");
         }
-        for (i = 0; i < bt->write_count; i++) HOST2BMC(bt->write_data[i]);
+        for (i = 0; i < bt->write_count; i++)
+               HOST2BMC(bt->write_data[i]);
 }
 
 static inline int read_all_bytes(struct si_sm_data *bt)
@@ -278,7 +285,8 @@ static inline int read_all_bytes(struct si_sm_data *bt)
                 bt->truncated = 1;
                 return 1;       /* let next XACTION START clean it up */
         }
-        for (i = 1; i <= bt->read_count; i++) bt->read_data[i] = BMC2HOST;
+        for (i = 1; i <= bt->read_count; i++)
+               bt->read_data[i] = BMC2HOST;
         bt->read_count++;       /* account for the length byte */
 
         if (bt_debug & BT_DEBUG_MSG) {
@@ -295,7 +303,8 @@ static inline int read_all_bytes(struct si_sm_data *bt)
                 ((bt->read_data[1] & 0xF8) == (bt->write_data[1] & 0xF8)))
                         return 1;
 
-        if (bt_debug & BT_DEBUG_MSG) printk(KERN_WARNING "BT: bad packet: "
+        if (bt_debug & BT_DEBUG_MSG)
+               printk(KERN_WARNING "BT: bad packet: "
                 "want 0x(%02X, %02X, %02X) got (%02X, %02X, %02X)\n",
                 bt->write_data[1], bt->write_data[2], bt->write_data[3],
                 bt->read_data[1],  bt->read_data[2],  bt->read_data[3]);
@@ -359,7 +368,8 @@ static enum si_sm_result bt_event(struct si_sm_data *bt, long time)
                         time);
         bt->last_state = bt->state;
 
-        if (bt->state == BT_STATE_HOSED) return SI_SM_HOSED;
+        if (bt->state == BT_STATE_HOSED)
+               return SI_SM_HOSED;
 
         if (bt->state != BT_STATE_IDLE) {       /* do timeout test */
 
@@ -371,7 +381,8 @@ static enum si_sm_result bt_event(struct si_sm_data *bt, long time)
         /* FIXME: bt_event is sometimes called with time > BT_NORMAL_TIMEOUT
               (noticed in ipmi_smic_sm.c January 2004) */
 
-                if ((time <= 0) || (time >= BT_NORMAL_TIMEOUT)) time = 100;
+                if ((time <= 0) || (time >= BT_NORMAL_TIMEOUT))
+                       time = 100;
                 bt->timeout -= time;
                 if ((bt->timeout < 0) && (bt->state < BT_STATE_RESET1)) {
                         error_recovery(bt, "timed out");
@@ -393,12 +404,14 @@ static enum si_sm_result bt_event(struct si_sm_data *bt, long time)
                         BT_CONTROL(BT_H_BUSY);
                         break;
                 }
-                if (status & BT_B2H_ATN) break;
+                if (status & BT_B2H_ATN)
+                       break;
                 bt->state = BT_STATE_WRITE_BYTES;
                 return SI_SM_CALL_WITHOUT_DELAY;        /* for logging */
 
         case BT_STATE_WRITE_BYTES:
-                if (status & (BT_B_BUSY | BT_H2B_ATN)) break;
+                if (status & (BT_B_BUSY | BT_H2B_ATN))
+                       break;
                 BT_CONTROL(BT_CLR_WR_PTR);
                 write_all_bytes(bt);
                 BT_CONTROL(BT_H2B_ATN); /* clears too fast to catch? */
@@ -406,7 +419,8 @@ static enum si_sm_result bt_event(struct si_sm_data *bt, long time)
                 return SI_SM_CALL_WITHOUT_DELAY; /* it MIGHT sail through */
 
         case BT_STATE_WRITE_CONSUME: /* BMCs usually blow right thru here */
-                if (status & (BT_H2B_ATN | BT_B_BUSY)) break;
+                if (status & (BT_H2B_ATN | BT_B_BUSY))
+                       break;
                 bt->state = BT_STATE_B2H_WAIT;
                 /* fall through with status */
 
@@ -415,15 +429,18 @@ static enum si_sm_result bt_event(struct si_sm_data *bt, long time)
            generation of B2H_ATN so ALWAYS return CALL_WITH_DELAY. */
 
         case BT_STATE_B2H_WAIT:
-                if (!(status & BT_B2H_ATN)) break;
+                if (!(status & BT_B2H_ATN))
+                       break;
 
                 /* Assume ordered, uncached writes: no need to wait */
-                if (!(status & BT_H_BUSY)) BT_CONTROL(BT_H_BUSY); /* set */
+                if (!(status & BT_H_BUSY))
+                       BT_CONTROL(BT_H_BUSY); /* set */
                 BT_CONTROL(BT_B2H_ATN);         /* clear it, ACK to the BMC */
                 BT_CONTROL(BT_CLR_RD_PTR);      /* reset the queue */
                 i = read_all_bytes(bt);
                 BT_CONTROL(BT_H_BUSY);          /* clear */
-                if (!i) break;                  /* Try this state again */
+                if (!i)                         /* Try this state again */
+                       break;
                 bt->state = BT_STATE_READ_END;
                 return SI_SM_CALL_WITHOUT_DELAY;        /* for logging */
 
@@ -436,7 +453,8 @@ static enum si_sm_result bt_event(struct si_sm_data *bt, long time)
 
 #ifdef MAKE_THIS_TRUE_IF_NECESSARY
 
-                if (status & BT_H_BUSY) break;
+                if (status & BT_H_BUSY)
+                       break;
 #endif
                 bt->seq++;
                 bt->state = BT_STATE_IDLE;
@@ -459,7 +477,8 @@ static enum si_sm_result bt_event(struct si_sm_data *bt, long time)
                 break;
 
         case BT_STATE_RESET3:
-                if (bt->timeout > 0) return SI_SM_CALL_WITH_DELAY;
+                if (bt->timeout > 0)
+                       return SI_SM_CALL_WITH_DELAY;
                 bt->state = BT_STATE_RESTART;   /* printk in debug modes */
                 break;
 
@@ -485,7 +504,8 @@ static int bt_detect(struct si_sm_data *bt)
            but that's what you get from reading a bogus address, so we
            test that first.  The calling routine uses negative logic. */
 
-        if ((BT_STATUS == 0xFF) && (BT_INTMASK_R == 0xFF)) return 1;
+        if ((BT_STATUS == 0xFF) && (BT_INTMASK_R == 0xFF))
+               return 1;
         reset_flags(bt);
         return 0;
 }
@@ -501,7 +521,6 @@ static int bt_size(void)
 
 struct si_sm_handlers bt_smi_handlers =
 {
-        .version           = IPMI_BT_VERSION,
         .init_data         = bt_init_data,
         .start_transaction = bt_start_transaction,
         .get_result        = bt_get_result,
diff --git a/drivers/char/ipmi/ipmi_devintf.c b/drivers/char/ipmi/ipmi_devintf.c
index e0a53570fea..883ac4352be 100644
--- a/drivers/char/ipmi/ipmi_devintf.c
+++ b/drivers/char/ipmi/ipmi_devintf.c
@@ -47,8 +47,6 @@
 #include <linux/device.h>
 #include <linux/compat.h>
 
-#define IPMI_DEVINTF_VERSION "v33"
-
 struct ipmi_file_private
 {
         ipmi_user_t          user;
@@ -411,6 +409,7 @@ static int ipmi_ioctl(struct inode  *inode,
                 break;
         }
 
+        /* The next four are legacy, not per-channel. */
         case IPMICTL_SET_MY_ADDRESS_CMD:
         {
                 unsigned int val;
@@ -420,22 +419,25 @@ static int ipmi_ioctl(struct inode  *inode,
                         break;
                 }
 
-                ipmi_set_my_address(priv->user, val);
-                rv = 0;
+                rv = ipmi_set_my_address(priv->user, 0, val);
                 break;
         }
 
         case IPMICTL_GET_MY_ADDRESS_CMD:
         {
-                unsigned int val;
+                unsigned int  val;
+                unsigned char rval;
+
+                rv = ipmi_get_my_address(priv->user, 0, &rval);
+                if (rv)
+                        break;
 
-                val = ipmi_get_my_address(priv->user);
+                val = rval;
 
                 if (copy_to_user(arg, &val, sizeof(val))) {
                         rv = -EFAULT;
                         break;
                 }
-                rv = 0;
                 break;
         }
 
@@ -448,24 +450,94 @@ static int ipmi_ioctl(struct inode  *inode,
                         break;
                 }
 
-                ipmi_set_my_LUN(priv->user, val);
-                rv = 0;
+                rv = ipmi_set_my_LUN(priv->user, 0, val);
                 break;
         }
 
         case IPMICTL_GET_MY_LUN_CMD:
         {
-                unsigned int val;
+                unsigned int  val;
+                unsigned char rval;
 
-                val = ipmi_get_my_LUN(priv->user);
+                rv = ipmi_get_my_LUN(priv->user, 0, &rval);
+                if (rv)
+                        break;
+
+                val = rval;
+
+                if (copy_to_user(arg, &val, sizeof(val))) {
+                        rv = -EFAULT;
+                        break;
+                }
+                break;
+        }
+
+        case IPMICTL_SET_MY_CHANNEL_ADDRESS_CMD:
+        {
+                struct ipmi_channel_lun_address_set val;
+
+                if (copy_from_user(&val, arg, sizeof(val))) {
+                        rv = -EFAULT;
+                        break;
+                }
+
+                return ipmi_set_my_address(priv->user, val.channel, val.value);
+                break;
+        }
+
+        case IPMICTL_GET_MY_CHANNEL_ADDRESS_CMD:
+        {
+                struct ipmi_channel_lun_address_set val;
+
+                if (copy_from_user(&val, arg, sizeof(val))) {
+                        rv = -EFAULT;
+                        break;
+                }
+
+                rv = ipmi_get_my_address(priv->user, val.channel, &val.value);
+                if (rv)
+                        break;
+
+                if (copy_to_user(arg, &val, sizeof(val))) {
+                        rv = -EFAULT;
+                        break;
+                }
+                break;
+        }
+
+        case IPMICTL_SET_MY_CHANNEL_LUN_CMD:
+        {
+                struct ipmi_channel_lun_address_set val;
+
+                if (copy_from_user(&val, arg, sizeof(val))) {
+                        rv = -EFAULT;
+                        break;
+                }
+
+                rv = ipmi_set_my_LUN(priv->user, val.channel, val.value);
+                break;
+        }
+
+        case IPMICTL_GET_MY_CHANNEL_LUN_CMD:
+        {
+                struct ipmi_channel_lun_address_set val;
+
+                if (copy_from_user(&val, arg, sizeof(val))) {
+                        rv = -EFAULT;
+                        break;
+                }
+
+                rv = ipmi_get_my_LUN(priv->user, val.channel, &val.value);
+                if (rv)
+                        break;
 
                 if (copy_to_user(arg, &val, sizeof(val))) {
                         rv = -EFAULT;
                         break;
                 }
-                rv = 0;
                 break;
         }
+
         case IPMICTL_SET_TIMING_PARMS_CMD:
         {
                 struct ipmi_timing_parms parms;
@@ -748,8 +820,7 @@ static __init int init_ipmi_devintf(void)
         if (ipmi_major < 0)
                 return -EINVAL;
 
-        printk(KERN_INFO "ipmi device interface version "
-               IPMI_DEVINTF_VERSION "\n");
+        printk(KERN_INFO "ipmi device interface\n");
 
         ipmi_class = class_create(THIS_MODULE, "ipmi");
         if (IS_ERR(ipmi_class)) {
@@ -792,3 +863,5 @@ static __exit void cleanup_ipmi(void)
 module_exit(cleanup_ipmi);
 
 MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Corey Minyard <minyard@mvista.com>");
+MODULE_DESCRIPTION("Linux device interface for the IPMI message handler.");
diff --git a/drivers/char/ipmi/ipmi_kcs_sm.c b/drivers/char/ipmi/ipmi_kcs_sm.c
index 48cce24329b..d21853a594a 100644
--- a/drivers/char/ipmi/ipmi_kcs_sm.c
+++ b/drivers/char/ipmi/ipmi_kcs_sm.c
@@ -42,8 +42,6 @@
 #include <linux/ipmi_msgdefs.h>         /* for completion codes */
 #include "ipmi_si_sm.h"
 
-#define IPMI_KCS_VERSION "v33"
-
 /* Set this if you want a printout of why the state machine was hosed
    when it gets hosed. */
 #define DEBUG_HOSED_REASON
@@ -489,7 +487,6 @@ static void kcs_cleanup(struct si_sm_data *kcs)
 
 struct si_sm_handlers kcs_smi_handlers =
 {
-        .version           = IPMI_KCS_VERSION,
         .init_data         = init_kcs_data,
         .start_transaction = start_kcs_transaction,
         .get_result        = get_kcs_result,
diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c
index e16c13fe698..463351d4f94 100644
--- a/drivers/char/ipmi/ipmi_msghandler.c
+++ b/drivers/char/ipmi/ipmi_msghandler.c
@@ -47,7 +47,8 @@
 #include <linux/proc_fs.h>
 
 #define PFX "IPMI message handler: "
-#define IPMI_MSGHANDLER_VERSION "v33"
+
+#define IPMI_DRIVER_VERSION "36.0"
 
 static struct ipmi_recv_msg *ipmi_alloc_recv_msg(void);
 static int ipmi_init_msghandler(void);
@@ -116,7 +117,7 @@ struct seq_table
         do {                                                            \
                 seq = ((msgid >> 26) & 0x3f);                           \
                 seqid = (msgid & 0x3fffff);                             \
-        } while(0)
+        } while (0)
 
 #define NEXT_SEQID(seqid) (((seqid) + 1) & 0x3fffff)
 
@@ -124,6 +125,14 @@ struct ipmi_channel
 {
         unsigned char medium;
         unsigned char protocol;
+
+        /* My slave address.  This is initialized to IPMI_BMC_SLAVE_ADDR,
+           but may be changed by the user. */
+        unsigned char address;
+
+        /* My LUN.  This should generally stay the SMS LUN, but just in
+           case... */
+        unsigned char lun;
 };
 
 #ifdef CONFIG_PROC_FS
@@ -135,7 +144,7 @@ struct ipmi_proc_entry
 #endif
 
 #define IPMI_IPMB_NUM_SEQ       64
-#define IPMI_MAX_CHANNELS       8
+#define IPMI_MAX_CHANNELS       16
 struct ipmi_smi
 {
         /* What interface number are we? */
@@ -193,20 +202,6 @@ struct ipmi_smi
         struct list_head waiting_events;
         unsigned int     waiting_events_count; /* How many events in queue? */
 
-        /* This will be non-null if someone registers to receive all
-           IPMI commands (this is for interface emulation).  There
-           may not be any things in the cmd_rcvrs list above when
-           this is registered. */
-        ipmi_user_t all_cmd_rcvr;
-
-        /* My slave address.  This is initialized to IPMI_BMC_SLAVE_ADDR,
-           but may be changed by the user. */
-        unsigned char my_address;
-
-        /* My LUN.  This should generally stay the SMS LUN, but just in
-           case... */
-        unsigned char my_lun;
-
         /* The event receiver for my BMC, only really used at panic
            shutdown as a place to store this. */
         unsigned char event_receiver;
@@ -218,7 +213,7 @@ struct ipmi_smi
            interface comes in with a NULL user, call this routine with
            it.  Note that the message will still be freed by the
            caller.  This only works on the system interface. */
-        void (*null_user_handler)(ipmi_smi_t intf, struct ipmi_smi_msg *msg);
+        void (*null_user_handler)(ipmi_smi_t intf, struct ipmi_recv_msg *msg);
 
         /* When we are scanning the channels for an SMI, this will
            tell which channel we are scanning. */
@@ -325,7 +320,7 @@ int ipmi_smi_watcher_register(struct ipmi_smi_watcher *watcher)
         down_read(&interfaces_sem);
         down_write(&smi_watchers_sem);
         list_add(&(watcher->link), &smi_watchers);
-        for (i=0; i<MAX_IPMI_INTERFACES; i++) {
+        for (i = 0; i < MAX_IPMI_INTERFACES; i++) {
                 if (ipmi_interfaces[i] != NULL) {
                         watcher->new_smi(i);
                 }
@@ -458,7 +453,27 @@ unsigned int ipmi_addr_length(int addr_type)
 
 static void deliver_response(struct ipmi_recv_msg *msg)
 {
-        msg->user->handler->ipmi_recv_hndl(msg, msg->user->handler_data);
+        if (! msg->user) {
+                ipmi_smi_t    intf = msg->user_msg_data;
+                unsigned long flags;
+
+                /* Special handling for NULL users. */
+                if (intf->null_user_handler) {
+                        intf->null_user_handler(intf, msg);
+                        spin_lock_irqsave(&intf->counter_lock, flags);
+                        intf->handled_local_responses++;
+                        spin_unlock_irqrestore(&intf->counter_lock, flags);
+                } else {
+                        /* No handler, so give up. */
+                        spin_lock_irqsave(&intf->counter_lock, flags);
+                        intf->unhandled_local_responses++;
+                        spin_unlock_irqrestore(&intf->counter_lock, flags);
+                }
+                ipmi_free_recv_msg(msg);
+        } else {
+                msg->user->handler->ipmi_recv_hndl(msg,
+                                                   msg->user->handler_data);
+        }
 }
 
 /* Find the next sequence number not being used and add the given
@@ -475,9 +490,9 @@ static int intf_next_seq(ipmi_smi_t           intf,
         int          rv = 0;
         unsigned int i;
 
-        for (i=intf->curr_seq;
+        for (i = intf->curr_seq;
              (i+1)%IPMI_IPMB_NUM_SEQ != intf->curr_seq;
-             i=(i+1)%IPMI_IPMB_NUM_SEQ)
+             i = (i+1)%IPMI_IPMB_NUM_SEQ)
         {
                 if (! intf->seq_table[i].inuse)
                         break;
@@ -712,7 +727,7 @@ static int ipmi_destroy_user_nolock(ipmi_user_t user)
 
         /* Remove the user from the interfaces sequence table. */
         spin_lock_irqsave(&(user->intf->seq_lock), flags);
-        for (i=0; i<IPMI_IPMB_NUM_SEQ; i++) {
+        for (i = 0; i < IPMI_IPMB_NUM_SEQ; i++) {
                 if (user->intf->seq_table[i].inuse
                     && (user->intf->seq_table[i].recv_msg->user == user))
                 {
@@ -766,26 +781,44 @@ void ipmi_get_version(ipmi_user_t   user,
         *minor = user->intf->version_minor;
 }
 
-void ipmi_set_my_address(ipmi_user_t   user,
-                         unsigned char address)
+int ipmi_set_my_address(ipmi_user_t   user,
+                        unsigned int  channel,
+                        unsigned char address)
 {
-        user->intf->my_address = address;
+        if (channel >= IPMI_MAX_CHANNELS)
+                return -EINVAL;
+        user->intf->channels[channel].address = address;
+        return 0;
 }
 
-unsigned char ipmi_get_my_address(ipmi_user_t user)
+int ipmi_get_my_address(ipmi_user_t   user,
+                        unsigned int  channel,
+                        unsigned char *address)
 {
-        return user->intf->my_address;
+        if (channel >= IPMI_MAX_CHANNELS)
+                return -EINVAL;
+        *address = user->intf->channels[channel].address;
+        return 0;
 }
 
-void ipmi_set_my_LUN(ipmi_user_t   user,
-                     unsigned char LUN)
+int ipmi_set_my_LUN(ipmi_user_t   user,
+                    unsigned int  channel,
+                    unsigned char LUN)
 {
-        user->intf->my_lun = LUN & 0x3;
+        if (channel >= IPMI_MAX_CHANNELS)
+                return -EINVAL;
+        user->intf->channels[channel].lun = LUN & 0x3;
+        return 0;
 }
 
-unsigned char ipmi_get_my_LUN(ipmi_user_t user)
+int ipmi_get_my_LUN(ipmi_user_t   user,
+                    unsigned int  channel,
+                    unsigned char *address)
 {
-        return user->intf->my_lun;
+        if (channel >= IPMI_MAX_CHANNELS)
+                return -EINVAL;
+        *address = user->intf->channels[channel].lun;
+        return 0;
 }
 
 int ipmi_set_gets_events(ipmi_user_t user, int val)
@@ -828,11 +861,6 @@ int ipmi_register_for_cmd(ipmi_user_t   user,
 
         read_lock(&(user->intf->users_lock));
         write_lock_irqsave(&(user->intf->cmd_rcvr_lock), flags);
-        if (user->intf->all_cmd_rcvr != NULL) {
-                rv = -EBUSY;
-                goto out_unlock;
-        }
-
         /* Make sure the command/netfn is not already registered. */
         list_for_each_entry(cmp, &(user->intf->cmd_rcvrs), link) {
                 if ((cmp->netfn == netfn) && (cmp->cmd == cmd)) {
@@ -847,7 +875,7 @@ int ipmi_register_for_cmd(ipmi_user_t   user,
                 rcvr->user = user;
                 list_add_tail(&(rcvr->link), &(user->intf->cmd_rcvrs));
         }
- out_unlock:
+
         write_unlock_irqrestore(&(user->intf->cmd_rcvr_lock), flags);
         read_unlock(&(user->intf->users_lock));
 
@@ -1213,7 +1241,7 @@ static inline int i_ipmi_request(ipmi_user_t          user,
                 unsigned char         ipmb_seq;
                 long                  seqid;
 
-                if (addr->channel > IPMI_NUM_CHANNELS) {
+                if (addr->channel >= IPMI_NUM_CHANNELS) {
                         spin_lock_irqsave(&intf->counter_lock, flags);
                         intf->sent_invalid_commands++;
                         spin_unlock_irqrestore(&intf->counter_lock, flags);
@@ -1331,7 +1359,7 @@ static inline int i_ipmi_request(ipmi_user_t          user,
 #ifdef DEBUG_MSGING
         {
                 int m;
-                for (m=0; m<smi_msg->data_size; m++)
+                for (m = 0; m < smi_msg->data_size; m++)
                         printk(" %2.2x", smi_msg->data[m]);
                 printk("\n");
         }
@@ -1346,6 +1374,18 @@ static inline int i_ipmi_request(ipmi_user_t          user,
         return rv;
 }
 
+static int check_addr(ipmi_smi_t       intf,
+                      struct ipmi_addr *addr,
+                      unsigned char    *saddr,
+                      unsigned char    *lun)
+{
+        if (addr->channel >= IPMI_MAX_CHANNELS)
+                return -EINVAL;
+        *lun = intf->channels[addr->channel].lun;
+        *saddr = intf->channels[addr->channel].address;
+        return 0;
+}
+
 int ipmi_request_settime(ipmi_user_t      user,
                          struct ipmi_addr *addr,
                          long             msgid,
@@ -1355,6 +1395,14 @@ int ipmi_request_settime(ipmi_user_t      user,
                          int              retries,
                          unsigned int     retry_time_ms)
 {
+        unsigned char saddr, lun;
+        int           rv;
+
+        if (! user)
+                return -EINVAL;
+        rv = check_addr(user->intf, addr, &saddr, &lun);
+        if (rv)
+                return rv;
         return i_ipmi_request(user,
                               user->intf,
                               addr,
@@ -1363,8 +1411,8 @@ int ipmi_request_settime(ipmi_user_t      user,
                               user_msg_data,
                               NULL, NULL,
                               priority,
-                              user->intf->my_address,
-                              user->intf->my_lun,
+                              saddr,
+                              lun,
                               retries,
                               retry_time_ms);
 }
@@ -1378,6 +1426,14 @@ int ipmi_request_supply_msgs(ipmi_user_t          user,
                              struct ipmi_recv_msg *supplied_recv,
                              int                  priority)
 {
+        unsigned char saddr, lun;
+        int           rv;
+
+        if (! user)
+                return -EINVAL;
+        rv = check_addr(user->intf, addr, &saddr, &lun);
+        if (rv)
+                return rv;
         return i_ipmi_request(user,
                               user->intf,
                               addr,
@@ -1387,8 +1443,8 @@ int ipmi_request_supply_msgs(ipmi_user_t          user,
                               supplied_smi,
                               supplied_recv,
                               priority,
-                              user->intf->my_address,
-                              user->intf->my_lun,
+                              saddr,
+                              lun,
                               -1, 0);
 }
 
@@ -1397,8 +1453,15 @@ static int ipmb_file_read_proc(char *page, char **start, off_t off,
 {
         char       *out = (char *) page;
         ipmi_smi_t intf = data;
+        int        i;
+        int        rv= 0;
 
-        return sprintf(out, "%x\n", intf->my_address);
+        for (i = 0; i < IPMI_MAX_CHANNELS; i++)
+                rv += sprintf(out+rv, "%x ", intf->channels[i].address);
+        out[rv-1] = '\n'; /* Replace the final space with a newline */
+        out[rv] = '\0';
+        rv++;
+        return rv;
 }
 
 static int version_file_read_proc(char *page, char **start, off_t off,
@@ -1588,29 +1651,30 @@ send_channel_info_cmd(ipmi_smi_t intf, int chan)
                               (struct ipmi_addr *) &si,
                               0,
                               &msg,
-                              NULL,
+                              intf,
                               NULL,
                               NULL,
                               0,
-                              intf->my_address,
-                              intf->my_lun,
+                              intf->channels[0].address,
+                              intf->channels[0].lun,
                               -1, 0);
 }
 
 static void
-channel_handler(ipmi_smi_t intf, struct ipmi_smi_msg *msg)
+channel_handler(ipmi_smi_t intf, struct ipmi_recv_msg *msg)
 {
         int rv = 0;
         int chan;
 
-        if ((msg->rsp[0] == (IPMI_NETFN_APP_RESPONSE << 2))
-            && (msg->rsp[1] == IPMI_GET_CHANNEL_INFO_CMD))
+        if ((msg->addr.addr_type == IPMI_SYSTEM_INTERFACE_ADDR_TYPE)
+            && (msg->msg.netfn == IPMI_NETFN_APP_RESPONSE)
+            && (msg->msg.cmd == IPMI_GET_CHANNEL_INFO_CMD))
         {
                 /* It's the one we want */
-                if (msg->rsp[2] != 0) {
+                if (msg->msg.data[0] != 0) {
                         /* Got an error from the channel, just go on. */
 
-                        if (msg->rsp[2] == IPMI_INVALID_COMMAND_ERR) {
+                        if (msg->msg.data[0] == IPMI_INVALID_COMMAND_ERR) {
                                 /* If the MC does not support this
                                    command, that is legal.  We just
                                    assume it has one IPMB at channel
@@ -1627,13 +1691,13 @@ channel_handler(ipmi_smi_t intf, struct ipmi_smi_msg *msg)
                         }
                         goto next_channel;
                 }
-                if (msg->rsp_size < 6) {
+                if (msg->msg.data_len < 4) {
                         /* Message not big enough, just go on. */
                         goto next_channel;
                 }
                 chan = intf->curr_channel;
-                intf->channels[chan].medium = msg->rsp[4] & 0x7f;
-                intf->channels[chan].protocol = msg->rsp[5] & 0x1f;
+                intf->channels[chan].medium = msg->msg.data[2] & 0x7f;
+                intf->channels[chan].protocol = msg->msg.data[3] & 0x1f;
 
         next_channel:
                 intf->curr_channel++;
@@ -1691,22 +1755,24 @@ int ipmi_register_smi(struct ipmi_smi_handlers *handlers,
         rv = -ENOMEM;
 
         down_write(&interfaces_sem);
-        for (i=0; i<MAX_IPMI_INTERFACES; i++) {
+        for (i = 0; i < MAX_IPMI_INTERFACES; i++) {
                 if (ipmi_interfaces[i] == NULL) {
                         new_intf->intf_num = i;
                         new_intf->version_major = version_major;
                         new_intf->version_minor = version_minor;
-                        if (slave_addr == 0)
-                                new_intf->my_address = IPMI_BMC_SLAVE_ADDR;
-                        else
-                                new_intf->my_address = slave_addr;
-                        new_intf->my_lun = 2;  /* the SMS LUN. */
+                        for (j = 0; j < IPMI_MAX_CHANNELS; j++) {
+                                new_intf->channels[j].address
+                                        = IPMI_BMC_SLAVE_ADDR;
+                                new_intf->channels[j].lun = 2;
+                        }
+                        if (slave_addr != 0)
+                                new_intf->channels[0].address = slave_addr;
                         rwlock_init(&(new_intf->users_lock));
                         INIT_LIST_HEAD(&(new_intf->users));
                         new_intf->handlers = handlers;
                         new_intf->send_info = send_info;
                         spin_lock_init(&(new_intf->seq_lock));
-                        for (j=0; j<IPMI_IPMB_NUM_SEQ; j++) {
+                        for (j = 0; j < IPMI_IPMB_NUM_SEQ; j++) {
                                 new_intf->seq_table[j].inuse = 0;
                                 new_intf->seq_table[j].seqid = 0;
                         }
@@ -1722,7 +1788,6 @@ int ipmi_register_smi(struct ipmi_smi_handlers *handlers,
                         rwlock_init(&(new_intf->cmd_rcvr_lock));
                         init_waitqueue_head(&new_intf->waitq);
                         INIT_LIST_HEAD(&(new_intf->cmd_rcvrs));
-                        new_intf->all_cmd_rcvr = NULL;
 
                         spin_lock_init(&(new_intf->counter_lock));
 
@@ -1814,7 +1879,7 @@ static void clean_up_interface_data(ipmi_smi_t intf)
         free_recv_msg_list(&(intf->waiting_events));
         free_cmd_rcvr_list(&(intf->cmd_rcvrs));
 
-        for (i=0; i<IPMI_IPMB_NUM_SEQ; i++) {
+        for (i = 0; i < IPMI_IPMB_NUM_SEQ; i++) {
                 if ((intf->seq_table[i].inuse)
                     && (intf->seq_table[i].recv_msg))
                 {
@@ -1833,7 +1898,7 @@ int ipmi_unregister_smi(ipmi_smi_t intf)
         down_write(&interfaces_sem);
         if (list_empty(&(intf->users)))
         {
-                for (i=0; i<MAX_IPMI_INTERFACES; i++) {
+                for (i = 0; i < MAX_IPMI_INTERFACES; i++) {
                         if (ipmi_interfaces[i] == intf) {
                                 remove_proc_entries(intf);
                                 spin_lock_irqsave(&interfaces_lock, flags);
@@ -1960,15 +2025,11 @@ static int handle_ipmb_get_msg_cmd(ipmi_smi_t          intf,
 
         read_lock(&(intf->cmd_rcvr_lock));
         
-        if (intf->all_cmd_rcvr) {
-                user = intf->all_cmd_rcvr;
-        } else {
-                /* Find the command/netfn. */
-                list_for_each_entry(rcvr, &(intf->cmd_rcvrs), link) {
-                        if ((rcvr->netfn == netfn) && (rcvr->cmd == cmd)) {
-                                user = rcvr->user;
-                                break;
-                        }
+        /* Find the command/netfn. */
+        list_for_each_entry(rcvr, &(intf->cmd_rcvrs), link) {
+                if ((rcvr->netfn == netfn) && (rcvr->cmd == cmd)) {
+                        user = rcvr->user;
+                        break;
                 }
         }
         read_unlock(&(intf->cmd_rcvr_lock));
@@ -1985,7 +2046,7 @@ static int handle_ipmb_get_msg_cmd(ipmi_smi_t          intf,
                 msg->data[3] = msg->rsp[6];
                 msg->data[4] = ((netfn + 1) << 2) | (msg->rsp[7] & 0x3);
                 msg->data[5] = ipmb_checksum(&(msg->data[3]), 2);
-                msg->data[6] = intf->my_address;
+                msg->data[6] = intf->channels[msg->rsp[3] & 0xf].address;
                 /* rqseq/lun */
                 msg->data[7] = (msg->rsp[7] & 0xfc) | (msg->rsp[4] & 0x3);
                 msg->data[8] = msg->rsp[8]; /* cmd */
@@ -1997,7 +2058,7 @@ static int handle_ipmb_get_msg_cmd(ipmi_smi_t          intf,
         {
                 int m;
                 printk("Invalid command:");
-                for (m=0; m<msg->data_size; m++)
+                for (m = 0; m < msg->data_size; m++)
                         printk(" %2.2x", msg->data[m]);
                 printk("\n");
         }
@@ -2145,15 +2206,11 @@ static int handle_lan_get_msg_cmd(ipmi_smi_t          intf,
 
         read_lock(&(intf->cmd_rcvr_lock));
 
-        if (intf->all_cmd_rcvr) {
-                user = intf->all_cmd_rcvr;
-        } else {
-                /* Find the command/netfn. */
-                list_for_each_entry(rcvr, &(intf->cmd_rcvrs), link) {
-                        if ((rcvr->netfn == netfn) && (rcvr->cmd == cmd)) {
-                                user = rcvr->user;
-                                break;
-                        }
+        /* Find the command/netfn. */
+        list_for_each_entry(rcvr, &(intf->cmd_rcvrs), link) {
+                if ((rcvr->netfn == netfn) && (rcvr->cmd == cmd)) {
+                        user = rcvr->user;
+                        break;
                 }
         }
         read_unlock(&(intf->cmd_rcvr_lock));
@@ -2330,6 +2387,14 @@ static int handle_bmc_rsp(ipmi_smi_t          intf,
         unsigned long        flags;
 
         recv_msg = (struct ipmi_recv_msg *) msg->user_data;
+        if (recv_msg == NULL)
+        {
+                printk(KERN_WARNING"IPMI message received with no owner. This\n"
+                        "could be because of a malformed message, or\n"
+                        "because of a hardware error.  Contact your\n"
+                        "hardware vender for assistance\n");
+                return 0;
+        }
 
         /* Make sure the user still exists. */
         list_for_each_entry(user, &(intf->users), link) {
@@ -2340,19 +2405,11 @@ static int handle_bmc_rsp(ipmi_smi_t          intf,
                 }
         }
 
-        if (!found) {
-                /* Special handling for NULL users. */
-                if (!recv_msg->user && intf->null_user_handler){
-                        intf->null_user_handler(intf, msg);
-                        spin_lock_irqsave(&intf->counter_lock, flags);
-                        intf->handled_local_responses++;
-                        spin_unlock_irqrestore(&intf->counter_lock, flags);
-                }else{
-                        /* The user for the message went away, so give up. */
-                        spin_lock_irqsave(&intf->counter_lock, flags);
-                        intf->unhandled_local_responses++;
-                        spin_unlock_irqrestore(&intf->counter_lock, flags);
-                }
+        if ((! found) && recv_msg->user) {
+                /* The user for the message went away, so give up. */
+                spin_lock_irqsave(&intf->counter_lock, flags);
+                intf->unhandled_local_responses++;
+                spin_unlock_irqrestore(&intf->counter_lock, flags);
                 ipmi_free_recv_msg(recv_msg);
         } else {
                 struct ipmi_system_interface_addr *smi_addr;
@@ -2392,7 +2449,7 @@ static int handle_new_recv_msg(ipmi_smi_t          intf,
 #ifdef DEBUG_MSGING
         int m;
         printk("Recv:");
-        for (m=0; m<msg->rsp_size; m++)
+        for (m = 0; m < msg->rsp_size; m++)
                 printk(" %2.2x", msg->rsp[m]);
         printk("\n");
 #endif
@@ -2626,7 +2683,7 @@ smi_from_recv_msg(ipmi_smi_t intf, struct ipmi_recv_msg *recv_msg,
         {
                 int m;
                 printk("Resend: ");
-                for (m=0; m<smi_msg->data_size; m++)
+                for (m = 0; m < smi_msg->data_size; m++)
                         printk(" %2.2x", smi_msg->data[m]);
                 printk("\n");
         }
@@ -2647,7 +2704,7 @@ ipmi_timeout_handler(long timeout_period)
         INIT_LIST_HEAD(&timeouts);
 
         spin_lock(&interfaces_lock);
-        for (i=0; i<MAX_IPMI_INTERFACES; i++) {
+        for (i = 0; i < MAX_IPMI_INTERFACES; i++) {
                 intf = ipmi_interfaces[i];
                 if (intf == NULL)
                         continue;
@@ -2672,7 +2729,7 @@ ipmi_timeout_handler(long timeout_period)
                    have timed out, putting them in the timeouts
                    list. */
                 spin_lock_irqsave(&(intf->seq_lock), flags);
-                for (j=0; j<IPMI_IPMB_NUM_SEQ; j++) {
+                for (j = 0; j < IPMI_IPMB_NUM_SEQ; j++) {
                         struct seq_table *ent = &(intf->seq_table[j]);
                         if (!ent->inuse)
                                 continue;
@@ -2712,7 +2769,7 @@ ipmi_timeout_handler(long timeout_period)
                                 spin_unlock(&intf->counter_lock);
                                 smi_msg = smi_from_recv_msg(intf,
                                                 ent->recv_msg, j, ent->seqid);
-                                if(!smi_msg)
+                                if (! smi_msg)
                                         continue;
 
                                 spin_unlock_irqrestore(&(intf->seq_lock),flags);
@@ -2743,7 +2800,7 @@ static void ipmi_request_event(void)
         int        i;
 
         spin_lock(&interfaces_lock);
-        for (i=0; i<MAX_IPMI_INTERFACES; i++) {
+        for (i = 0; i < MAX_IPMI_INTERFACES; i++) {
                 intf = ipmi_interfaces[i];
                 if (intf == NULL)
                         continue;
@@ -2838,28 +2895,30 @@ static void dummy_recv_done_handler(struct ipmi_recv_msg *msg)
 }
 
 #ifdef CONFIG_IPMI_PANIC_STRING
-static void event_receiver_fetcher(ipmi_smi_t intf, struct ipmi_smi_msg *msg)
+static void event_receiver_fetcher(ipmi_smi_t intf, struct ipmi_recv_msg *msg)
 {
-        if ((msg->rsp[0] == (IPMI_NETFN_SENSOR_EVENT_RESPONSE << 2))
-            && (msg->rsp[1] == IPMI_GET_EVENT_RECEIVER_CMD)
-            && (msg->rsp[2] == IPMI_CC_NO_ERROR))
+        if ((msg->addr.addr_type == IPMI_SYSTEM_INTERFACE_ADDR_TYPE)
+            && (msg->msg.netfn == IPMI_NETFN_SENSOR_EVENT_RESPONSE)
+            && (msg->msg.cmd == IPMI_GET_EVENT_RECEIVER_CMD)
+            && (msg->msg.data[0] == IPMI_CC_NO_ERROR))
         {
                 /* A get event receiver command, save it. */
-                intf->event_receiver = msg->rsp[3];
-                intf->event_receiver_lun = msg->rsp[4] & 0x3;
+                intf->event_receiver = msg->msg.data[1];
+                intf->event_receiver_lun = msg->msg.data[2] & 0x3;
         }
 }
 
-static void device_id_fetcher(ipmi_smi_t intf, struct ipmi_smi_msg *msg)
+static void device_id_fetcher(ipmi_smi_t intf, struct ipmi_recv_msg *msg)
 {
-        if ((msg->rsp[0] == (IPMI_NETFN_APP_RESPONSE << 2))
-            && (msg->rsp[1] == IPMI_GET_DEVICE_ID_CMD)
-            && (msg->rsp[2] == IPMI_CC_NO_ERROR))
+        if ((msg->addr.addr_type == IPMI_SYSTEM_INTERFACE_ADDR_TYPE)
+            && (msg->msg.netfn == IPMI_NETFN_APP_RESPONSE)
+            && (msg->msg.cmd == IPMI_GET_DEVICE_ID_CMD)
+            && (msg->msg.data[0] == IPMI_CC_NO_ERROR))
         {
                 /* A get device id command, save if we are an event
                    receiver or generator. */
-                intf->local_sel_device = (msg->rsp[8] >> 2) & 1;
-                intf->local_event_generator = (msg->rsp[8] >> 5) & 1;
+                intf->local_sel_device = (msg->msg.data[6] >> 2) & 1;
+                intf->local_event_generator = (msg->msg.data[6] >> 5) & 1;
         }
 }
 #endif
@@ -2903,7 +2962,7 @@ static void send_panic_events(char *str)
         recv_msg.done = dummy_recv_done_handler;
 
         /* For every registered interface, send the event. */
-        for (i=0; i<MAX_IPMI_INTERFACES; i++) {
+        for (i = 0; i < MAX_IPMI_INTERFACES; i++) {
                 intf = ipmi_interfaces[i];
                 if (intf == NULL)
                         continue;
@@ -2915,12 +2974,12 @@ static void send_panic_events(char *str)
                                &addr,
                                0,
                                &msg,
-                               NULL,
+                               intf,
                                &smi_msg,
                                &recv_msg,
                                0,
-                               intf->my_address,
-                               intf->my_lun,
+                               intf->channels[0].address,
+                               intf->channels[0].lun,
                                0, 1); /* Don't retry, and don't wait. */
         }
 
@@ -2930,7 +2989,7 @@ static void send_panic_events(char *str)
         if (!str) 
                 return;
 
-        for (i=0; i<MAX_IPMI_INTERFACES; i++) {
+        for (i = 0; i < MAX_IPMI_INTERFACES; i++) {
                 char                  *p = str;
                 struct ipmi_ipmb_addr *ipmb;
                 int                   j;
@@ -2961,12 +3020,12 @@ static void send_panic_events(char *str)
                                &addr,
                                0,
                                &msg,
-                               NULL,
+                               intf,
                                &smi_msg,
                                &recv_msg,
                                0,
-                               intf->my_address,
-                               intf->my_lun,
+                               intf->channels[0].address,
+                               intf->channels[0].lun,
                                0, 1); /* Don't retry, and don't wait. */
 
                 if (intf->local_event_generator) {
@@ -2981,12 +3040,12 @@ static void send_panic_events(char *str)
                                        &addr,
                                        0,
                                        &msg,
-                                       NULL,
+                                       intf,
                                        &smi_msg,
                                        &recv_msg,
                                        0,
-                                       intf->my_address,
-                                       intf->my_lun,
+                                       intf->channels[0].address,
+                                       intf->channels[0].lun,
                                        0, 1); /* no retry, and no wait. */
                 }
                 intf->null_user_handler = NULL;
@@ -2996,7 +3055,7 @@ static void send_panic_events(char *str)
                    be zero, and it must not be my address. */
                 if (((intf->event_receiver & 1) == 0)
                     && (intf->event_receiver != 0)
-                    && (intf->event_receiver != intf->my_address))
+                    && (intf->event_receiver != intf->channels[0].address))
                 {
                         /* The event receiver is valid, send an IPMB
                            message. */
@@ -3031,7 +3090,7 @@ static void send_panic_events(char *str)
                         data[0] = 0;
                         data[1] = 0;
                         data[2] = 0xf0; /* OEM event without timestamp. */
-                        data[3] = intf->my_address;
+                        data[3] = intf->channels[0].address;
                         data[4] = j++; /* sequence # */
                         /* Always give 11 bytes, so strncpy will fill
                            it with zeroes for me. */
@@ -3043,12 +3102,12 @@ static void send_panic_events(char *str)
                                        &addr,
                                        0,
                                        &msg,
-                                       NULL,
+                                       intf,
                                        &smi_msg,
                                        &recv_msg,
                                        0,
-                                       intf->my_address,
-                                       intf->my_lun,
+                                       intf->channels[0].address,
+                                       intf->channels[0].lun,
                                        0, 1); /* no retry, and no wait. */
                 }
         }       
@@ -3070,7 +3129,7 @@ static int panic_event(struct notifier_block *this,
         has_paniced = 1;
 
         /* For every registered interface, set it to run to completion. */
-        for (i=0; i<MAX_IPMI_INTERFACES; i++) {
+        for (i = 0; i < MAX_IPMI_INTERFACES; i++) {
                 intf = ipmi_interfaces[i];
                 if (intf == NULL)
                         continue;
@@ -3099,9 +3158,9 @@ static int ipmi_init_msghandler(void)
                 return 0;
 
         printk(KERN_INFO "ipmi message handler version "
-               IPMI_MSGHANDLER_VERSION "\n");
+               IPMI_DRIVER_VERSION "\n");
 
-        for (i=0; i<MAX_IPMI_INTERFACES; i++) {
+        for (i = 0; i < MAX_IPMI_INTERFACES; i++) {
                 ipmi_interfaces[i] = NULL;
         }
 
@@ -3171,6 +3230,9 @@ module_exit(cleanup_ipmi);
 
 module_init(ipmi_init_msghandler_mod);
 MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Corey Minyard <minyard@mvista.com>");
+MODULE_DESCRIPTION("Incoming and outgoing message routing for an IPMI interface.");
+MODULE_VERSION(IPMI_DRIVER_VERSION);
 
 EXPORT_SYMBOL(ipmi_create_user);
 EXPORT_SYMBOL(ipmi_destroy_user);
diff --git a/drivers/char/ipmi/ipmi_poweroff.c b/drivers/char/ipmi/ipmi_poweroff.c
index f951c30236c..e82a96ba396 100644
--- a/drivers/char/ipmi/ipmi_poweroff.c
+++ b/drivers/char/ipmi/ipmi_poweroff.c
@@ -42,7 +42,6 @@
 #include <linux/ipmi_smi.h>
 
 #define PFX "IPMI poweroff: "
-#define IPMI_POWEROFF_VERSION   "v33"
 
 /* Where to we insert our poweroff function? */
 extern void (*pm_power_off)(void);
@@ -53,16 +52,17 @@ extern void (*pm_power_off)(void);
 #define IPMI_CHASSIS_POWER_CYCLE        0x02    /* power cycle */
 
 /* the IPMI data command */
-static int poweroff_control = IPMI_CHASSIS_POWER_DOWN;
+static int poweroff_powercycle;
 
 /* parameter definition to allow user to flag power cycle */
-module_param(poweroff_control, int, IPMI_CHASSIS_POWER_DOWN);
-MODULE_PARM_DESC(poweroff_control, " Set to 2 to enable power cycle instead of power down. Power cycle is contingent on hardware support, otherwise it defaults back to power down.");
+module_param(poweroff_powercycle, int, 0);
+MODULE_PARM_DESC(poweroff_powercycles, " Set to non-zero to enable power cycle instead of power down. Power cycle is contingent on hardware support, otherwise it defaults back to power down.");
 
 /* Stuff from the get device id command. */
 static unsigned int mfg_id;
 static unsigned int prod_id;
 static unsigned char capabilities;
+static unsigned char ipmi_version;
 
 /* We use our own messages for this operation, we don't let the system
    allocate them, since we may be in a panic situation.  The whole
@@ -338,6 +338,25 @@ static void ipmi_poweroff_cpi1 (ipmi_user_t user)
 }
 
 /*
+ * ipmi_dell_chassis_detect()
+ * Dell systems with IPMI < 1.5 don't set the chassis capability bit
+ * but they can handle a chassis poweroff or powercycle command.
+ */
+
+#define DELL_IANA_MFR_ID {0xA2, 0x02, 0x00}
+static int ipmi_dell_chassis_detect (ipmi_user_t user)
+{
+        const char ipmi_version_major = ipmi_version & 0xF;
+        const char ipmi_version_minor = (ipmi_version >> 4) & 0xF;
+        const char mfr[3]=DELL_IANA_MFR_ID;
+        if (!memcmp(mfr, &mfg_id, sizeof(mfr)) &&
+            ipmi_version_major <= 1 &&
+            ipmi_version_minor < 5)
+                return 1;
+        return 0;
+}
+
+/*
  * Standard chassis support
  */
 
@@ -366,37 +385,34 @@ static void ipmi_poweroff_chassis (ipmi_user_t user)
 
  powercyclefailed:
         printk(KERN_INFO PFX "Powering %s via IPMI chassis control command\n",
-                ((poweroff_control != IPMI_CHASSIS_POWER_CYCLE) ? "down" : "cycle"));
+                (poweroff_powercycle ? "cycle" : "down"));
 
         /*
          * Power down
          */
         send_msg.netfn = IPMI_NETFN_CHASSIS_REQUEST;
         send_msg.cmd = IPMI_CHASSIS_CONTROL_CMD;
-        data[0] = poweroff_control;
+        if (poweroff_powercycle)
+                data[0] = IPMI_CHASSIS_POWER_CYCLE;
+        else
+                data[0] = IPMI_CHASSIS_POWER_DOWN;
         send_msg.data = data;
         send_msg.data_len = sizeof(data);
         rv = ipmi_request_in_rc_mode(user,
                                      (struct ipmi_addr *) &smi_addr,
                                      &send_msg);
         if (rv) {
-                switch (poweroff_control) {
-                        case IPMI_CHASSIS_POWER_CYCLE:
-                                /* power cycle failed, default to power down */
-                                printk(KERN_ERR PFX "Unable to send chassis power " \
-                                        "cycle message, IPMI error 0x%x\n", rv);
-                                poweroff_control = IPMI_CHASSIS_POWER_DOWN;
-                                goto powercyclefailed;
-
-                        case IPMI_CHASSIS_POWER_DOWN:
-                        default:
-                                printk(KERN_ERR PFX "Unable to send chassis power " \
-                                        "down message, IPMI error 0x%x\n", rv);
-                                break;
+                if (poweroff_powercycle) {
+                        /* power cycle failed, default to power down */
+                        printk(KERN_ERR PFX "Unable to send chassis power " \
+                               "cycle message, IPMI error 0x%x\n", rv);
+                        poweroff_powercycle = 0;
+                        goto powercyclefailed;
                 }
-        }
 
-        return;
+                printk(KERN_ERR PFX "Unable to send chassis power " \
+                       "down message, IPMI error 0x%x\n", rv);
+        }
 }
 
 
@@ -414,6 +430,9 @@ static struct poweroff_function poweroff_functions[] = {
         { .platform_type        = "CPI1",
           .detect               = ipmi_cpi1_detect,
           .poweroff_func        = ipmi_poweroff_cpi1 },
+        { .platform_type        = "chassis",
+          .detect               = ipmi_dell_chassis_detect,
+          .poweroff_func        = ipmi_poweroff_chassis },
         /* Chassis should generally be last, other things should override
            it. */
         { .platform_type        = "chassis",
@@ -499,10 +518,11 @@ static void ipmi_po_new_smi(int if_num)
         prod_id = (halt_recv_msg.msg.data[10]
                    | (halt_recv_msg.msg.data[11] << 8));
         capabilities = halt_recv_msg.msg.data[6];
+        ipmi_version = halt_recv_msg.msg.data[5];
 
 
         /* Scan for a poweroff method */
-        for (i=0; i<NUM_PO_FUNCS; i++) {
+        for (i = 0; i < NUM_PO_FUNCS; i++) {
                 if (poweroff_functions[i].detect(ipmi_user))
                         goto found;
         }
@@ -538,39 +558,35 @@ static struct ipmi_smi_watcher smi_watcher =
 
 
 #ifdef CONFIG_PROC_FS
-/* displays properties to proc */
-static int proc_read_chassctrl(char *page, char **start, off_t off, int count,
-                               int *eof, void *data)
-{
-        return sprintf(page, "%d\t[ 0=powerdown 2=powercycle ]\n",
-                        poweroff_control);
-}
+#include <linux/sysctl.h>
+
+static ctl_table ipmi_table[] = {
+        { .ctl_name     = DEV_IPMI_POWEROFF_POWERCYCLE,
+          .procname     = "poweroff_powercycle",
+          .data         = &poweroff_powercycle,
+          .maxlen       = sizeof(poweroff_powercycle),
+          .mode         = 0644,
+          .proc_handler = &proc_dointvec },
+        { }
+};
 
-/* process property writes from proc */
-static int proc_write_chassctrl(struct file *file, const char *buffer,
-                                unsigned long count, void *data)
-{
-        int          rv = count;
-        unsigned int newval = 0;
-
-        sscanf(buffer, "%d", &newval);
-        switch (newval) {
-                case IPMI_CHASSIS_POWER_CYCLE:
-                        printk(KERN_INFO PFX "power cycle is now enabled\n");
-                        poweroff_control = newval;
-                        break;
-
-                case IPMI_CHASSIS_POWER_DOWN:
-                        poweroff_control = IPMI_CHASSIS_POWER_DOWN;
-                        break;
-
-                default:
-                        rv = -EINVAL;
-                        break;
-        }
+static ctl_table ipmi_dir_table[] = {
+        { .ctl_name     = DEV_IPMI,
+          .procname     = "ipmi",
+          .mode         = 0555,
+          .child        = ipmi_table },
+        { }
+};
 
-        return rv;
-}
+static ctl_table ipmi_root_table[] = {
+        { .ctl_name     = CTL_DEV,
+          .procname     = "dev",
+          .mode         = 0555,
+          .child        = ipmi_dir_table },
+        { }
+};
+
+static struct ctl_table_header *ipmi_table_header;
 #endif /* CONFIG_PROC_FS */
 
 /*
@@ -578,42 +594,32 @@ static int proc_write_chassctrl(struct file *file, const char *buffer,
  */
 static int ipmi_poweroff_init (void)
 {
-        int                   rv;
-        struct proc_dir_entry *file;
+        int rv;
 
         printk ("Copyright (C) 2004 MontaVista Software -"
-                " IPMI Powerdown via sys_reboot version "
-                IPMI_POWEROFF_VERSION ".\n");
-
-        switch (poweroff_control) {
-                case IPMI_CHASSIS_POWER_CYCLE:
-                        printk(KERN_INFO PFX "Power cycle is enabled.\n");
-                        break;
-
-                case IPMI_CHASSIS_POWER_DOWN:
-                default:
-                        poweroff_control = IPMI_CHASSIS_POWER_DOWN;
-                        break;
+                " IPMI Powerdown via sys_reboot.\n");
+
+        if (poweroff_powercycle)
+                printk(KERN_INFO PFX "Power cycle is enabled.\n");
+
+#ifdef CONFIG_PROC_FS
+        ipmi_table_header = register_sysctl_table(ipmi_root_table, 1);
+        if (!ipmi_table_header) {
+                printk(KERN_ERR PFX "Unable to register powercycle sysctl\n");
+                rv = -ENOMEM;
+                goto out_err;
         }
+#endif
 
+#ifdef CONFIG_PROC_FS
         rv = ipmi_smi_watcher_register(&smi_watcher);
+#endif
         if (rv) {
+                unregister_sysctl_table(ipmi_table_header);
                 printk(KERN_ERR PFX "Unable to register SMI watcher: %d\n", rv);
                 goto out_err;
         }
 
-#ifdef CONFIG_PROC_FS
-        file = create_proc_entry("poweroff_control", 0, proc_ipmi_root);
-        if (!file) {
-                printk(KERN_ERR PFX "Unable to create proc power control\n");
-        } else {
-                file->nlink = 1;
-                file->read_proc = proc_read_chassctrl;
-                file->write_proc = proc_write_chassctrl;
-                file->owner = THIS_MODULE;
-        }
-#endif
-
  out_err:
         return rv;
 }
@@ -624,7 +630,7 @@ static __exit void ipmi_poweroff_cleanup(void)
         int rv;
 
 #ifdef CONFIG_PROC_FS
-        remove_proc_entry("poweroff_control", proc_ipmi_root);
+        unregister_sysctl_table(ipmi_table_header);
 #endif
 
         ipmi_smi_watcher_unregister(&smi_watcher);
@@ -642,3 +648,5 @@ module_exit(ipmi_poweroff_cleanup);
 
 module_init(ipmi_poweroff_init);
 MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Corey Minyard <minyard@mvista.com>");
+MODULE_DESCRIPTION("IPMI Poweroff extension to sys_reboot");
diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
index adbec73b80a..278f8410499 100644
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
@@ -61,11 +61,11 @@
 # endif
 static inline void add_usec_to_timer(struct timer_list *t, long v)
 {
-        t->sub_expires += nsec_to_arch_cycle(v * 1000);
-        while (t->sub_expires >= arch_cycles_per_jiffy)
+        t->arch_cycle_expires += nsec_to_arch_cycle(v * 1000);
+        while (t->arch_cycle_expires >= arch_cycles_per_jiffy)
         {
                 t->expires++;
-                t->sub_expires -= arch_cycles_per_jiffy;
+                t->arch_cycle_expires -= arch_cycles_per_jiffy;
         }
 }
 #endif
@@ -75,8 +75,7 @@ static inline void add_usec_to_timer(struct timer_list *t, long v)
 #include <asm/io.h>
 #include "ipmi_si_sm.h"
 #include <linux/init.h>
-
-#define IPMI_SI_VERSION "v33"
+#include <linux/dmi.h>
 
 /* Measure times between events in the driver. */
 #undef DEBUG_TIMING
@@ -109,6 +108,21 @@ enum si_type {
     SI_KCS, SI_SMIC, SI_BT
 };
 
+struct ipmi_device_id {
+        unsigned char device_id;
+        unsigned char device_revision;
+        unsigned char firmware_revision_1;
+        unsigned char firmware_revision_2;
+        unsigned char ipmi_version;
+        unsigned char additional_device_support;
+        unsigned char manufacturer_id[3];
+        unsigned char product_id[2];
+        unsigned char aux_firmware_revision[4];
+} __attribute__((packed));
+
+#define ipmi_version_major(v) ((v)->ipmi_version & 0xf)
+#define ipmi_version_minor(v) ((v)->ipmi_version >> 4)
+
 struct smi_info
 {
         ipmi_smi_t             intf;
@@ -131,12 +145,24 @@ struct smi_info
         void (*irq_cleanup)(struct smi_info *info);
         unsigned int io_size;
 
+        /* Per-OEM handler, called from handle_flags().
+           Returns 1 when handle_flags() needs to be re-run
+           or 0 indicating it set si_state itself.
+        */
+        int (*oem_data_avail_handler)(struct smi_info *smi_info);
+
         /* Flags from the last GET_MSG_FLAGS command, used when an ATTN
            is set to hold the flags until we are done handling everything
            from the flags. */
 #define RECEIVE_MSG_AVAIL       0x01
 #define EVENT_MSG_BUFFER_FULL   0x02
 #define WDT_PRE_TIMEOUT_INT     0x08
+#define OEM0_DATA_AVAIL     0x20
+#define OEM1_DATA_AVAIL     0x40
+#define OEM2_DATA_AVAIL     0x80
+#define OEM_DATA_AVAIL      (OEM0_DATA_AVAIL | \
+                             OEM1_DATA_AVAIL | \
+                             OEM2_DATA_AVAIL)
         unsigned char       msg_flags;
 
         /* If set to true, this will request events the next time the
@@ -175,11 +201,7 @@ struct smi_info
            interrupts. */
         int interrupt_disabled;
 
-        unsigned char ipmi_si_dev_rev;
-        unsigned char ipmi_si_fw_rev_major;
-        unsigned char ipmi_si_fw_rev_minor;
-        unsigned char ipmi_version_major;
-        unsigned char ipmi_version_minor;
+        struct ipmi_device_id device_id;
 
         /* Slave address, could be reported from DMI. */
         unsigned char slave_addr;
@@ -245,7 +267,7 @@ static enum si_sm_result start_next_msg(struct smi_info *smi_info)
                 entry = smi_info->xmit_msgs.next;
         }
 
-        if (!entry) {
+        if (! entry) {
                 smi_info->curr_msg = NULL;
                 rv = SI_SM_IDLE;
         } else {
@@ -306,7 +328,7 @@ static void start_clear_flags(struct smi_info *smi_info)
    memory, we will re-enable the interrupt. */
 static inline void disable_si_irq(struct smi_info *smi_info)
 {
-        if ((smi_info->irq) && (!smi_info->interrupt_disabled)) {
+        if ((smi_info->irq) && (! smi_info->interrupt_disabled)) {
                 disable_irq_nosync(smi_info->irq);
                 smi_info->interrupt_disabled = 1;
         }
@@ -322,6 +344,7 @@ static inline void enable_si_irq(struct smi_info *smi_info)
 
 static void handle_flags(struct smi_info *smi_info)
 {
+ retry:
         if (smi_info->msg_flags & WDT_PRE_TIMEOUT_INT) {
                 /* Watchdog pre-timeout */
                 spin_lock(&smi_info->count_lock);
@@ -336,7 +359,7 @@ static void handle_flags(struct smi_info *smi_info)
         } else if (smi_info->msg_flags & RECEIVE_MSG_AVAIL) {
                 /* Messages available. */
                 smi_info->curr_msg = ipmi_alloc_smi_msg();
-                if (!smi_info->curr_msg) {
+                if (! smi_info->curr_msg) {
                         disable_si_irq(smi_info);
                         smi_info->si_state = SI_NORMAL;
                         return;
@@ -355,7 +378,7 @@ static void handle_flags(struct smi_info *smi_info)
         } else if (smi_info->msg_flags & EVENT_MSG_BUFFER_FULL) {
                 /* Events available. */
                 smi_info->curr_msg = ipmi_alloc_smi_msg();
-                if (!smi_info->curr_msg) {
+                if (! smi_info->curr_msg) {
                         disable_si_irq(smi_info);
                         smi_info->si_state = SI_NORMAL;
                         return;
@@ -371,6 +394,10 @@ static void handle_flags(struct smi_info *smi_info)
                         smi_info->curr_msg->data,
                         smi_info->curr_msg->data_size);
                 smi_info->si_state = SI_GETTING_EVENTS;
+        } else if (smi_info->msg_flags & OEM_DATA_AVAIL) {
+                if (smi_info->oem_data_avail_handler)
+                        if (smi_info->oem_data_avail_handler(smi_info))
+                                goto retry;
         } else {
                 smi_info->si_state = SI_NORMAL;
         }
@@ -387,7 +414,7 @@ static void handle_transaction_done(struct smi_info *smi_info)
 #endif
         switch (smi_info->si_state) {
         case SI_NORMAL:
-                if (!smi_info->curr_msg)
+                if (! smi_info->curr_msg)
                         break;
 
                 smi_info->curr_msg->rsp_size
@@ -761,18 +788,20 @@ static void si_restart_short_timer(struct smi_info *smi_info)
 #if defined(CONFIG_HIGH_RES_TIMERS)
         unsigned long flags;
         unsigned long jiffies_now;
+        unsigned long seq;
 
         if (del_timer(&(smi_info->si_timer))) {
                 /* If we don't delete the timer, then it will go off
                    immediately, anyway.  So we only process if we
                    actually delete the timer. */
 
-                /* We already have irqsave on, so no need for it
-                   here. */
-                read_lock(&xtime_lock);
-                jiffies_now = jiffies;
-                smi_info->si_timer.expires = jiffies_now;
-                smi_info->si_timer.sub_expires = get_arch_cycles(jiffies_now);
+                do {
+                        seq = read_seqbegin_irqsave(&xtime_lock, flags);
+                        jiffies_now = jiffies;
+                        smi_info->si_timer.expires = jiffies_now;
+                        smi_info->si_timer.arch_cycle_expires
+                                = get_arch_cycles(jiffies_now);
+                } while (read_seqretry_irqrestore(&xtime_lock, seq, flags));
 
                 add_usec_to_timer(&smi_info->si_timer, SI_SHORT_TIMEOUT_USEC);
 
@@ -826,15 +855,19 @@ static void smi_timeout(unsigned long data)
         /* If the state machine asks for a short delay, then shorten
            the timer timeout. */
         if (smi_result == SI_SM_CALL_WITH_DELAY) {
+#if defined(CONFIG_HIGH_RES_TIMERS)
+                unsigned long seq;
+#endif
                 spin_lock_irqsave(&smi_info->count_lock, flags);
                 smi_info->short_timeouts++;
                 spin_unlock_irqrestore(&smi_info->count_lock, flags);
 #if defined(CONFIG_HIGH_RES_TIMERS)
-                read_lock(&xtime_lock);
-                smi_info->si_timer.expires = jiffies;
-                smi_info->si_timer.sub_expires
-                        = get_arch_cycles(smi_info->si_timer.expires);
-                read_unlock(&xtime_lock);
+                do {
+                        seq = read_seqbegin_irqsave(&xtime_lock, flags);
+                        smi_info->si_timer.expires = jiffies;
+                        smi_info->si_timer.arch_cycle_expires
+                                = get_arch_cycles(smi_info->si_timer.expires);
+                } while (read_seqretry_irqrestore(&xtime_lock, seq, flags));
                 add_usec_to_timer(&smi_info->si_timer, SI_SHORT_TIMEOUT_USEC);
 #else
                 smi_info->si_timer.expires = jiffies + 1;
@@ -845,7 +878,7 @@ static void smi_timeout(unsigned long data)
                 spin_unlock_irqrestore(&smi_info->count_lock, flags);
                 smi_info->si_timer.expires = jiffies + SI_TIMEOUT_JIFFIES;
 #if defined(CONFIG_HIGH_RES_TIMERS)
-                smi_info->si_timer.sub_expires = 0;
+                smi_info->si_timer.arch_cycle_expires = 0;
 #endif
         }
 
@@ -1014,7 +1047,7 @@ static int std_irq_setup(struct smi_info *info)
 {
         int rv;
 
-        if (!info->irq)
+        if (! info->irq)
                 return 0;
 
         if (info->si_type == SI_BT) {
@@ -1023,7 +1056,7 @@ static int std_irq_setup(struct smi_info *info)
                                  SA_INTERRUPT,
                                  DEVICE_NAME,
                                  info);
-                if (!rv)
+                if (! rv)
                         /* Enable the interrupt in the BT interface. */
                         info->io.outputb(&info->io, IPMI_BT_INTMASK_REG,
                                          IPMI_BT_INTMASK_ENABLE_IRQ_BIT);
@@ -1048,7 +1081,7 @@ static int std_irq_setup(struct smi_info *info)
 
 static void std_irq_cleanup(struct smi_info *info)
 {
-        if (!info->irq)
+        if (! info->irq)
                 return;
 
         if (info->si_type == SI_BT)
@@ -1121,7 +1154,7 @@ static int port_setup(struct smi_info *info)
         unsigned int *addr = info->io.info;
         int           mapsize;
 
-        if (!addr || (!*addr))
+        if (! addr || (! *addr))
                 return -ENODEV;
 
         info->io_cleanup = port_cleanup;
@@ -1164,15 +1197,15 @@ static int try_init_port(int intf_num, struct smi_info **new_info)
 {
         struct smi_info *info;
 
-        if (!ports[intf_num])
+        if (! ports[intf_num])
                 return -ENODEV;
 
-        if (!is_new_interface(intf_num, IPMI_IO_ADDR_SPACE,
+        if (! is_new_interface(intf_num, IPMI_IO_ADDR_SPACE,
                               ports[intf_num]))
                 return -ENODEV;
 
         info = kmalloc(sizeof(*info), GFP_KERNEL);
-        if (!info) {
+        if (! info) {
                 printk(KERN_ERR "ipmi_si: Could not allocate SI data (1)\n");
                 return -ENOMEM;
         }
@@ -1182,10 +1215,10 @@ static int try_init_port(int intf_num, struct smi_info **new_info)
         info->io.info = &(ports[intf_num]);
         info->io.addr = NULL;
         info->io.regspacing = regspacings[intf_num];
-        if (!info->io.regspacing)
+        if (! info->io.regspacing)
                 info->io.regspacing = DEFAULT_REGSPACING;
         info->io.regsize = regsizes[intf_num];
-        if (!info->io.regsize)
+        if (! info->io.regsize)
                 info->io.regsize = DEFAULT_REGSPACING;
         info->io.regshift = regshifts[intf_num];
         info->irq = 0;
@@ -1270,7 +1303,7 @@ static int mem_setup(struct smi_info *info)
         unsigned long *addr = info->io.info;
         int           mapsize;
 
-        if (!addr || (!*addr))
+        if (! addr || (! *addr))
                 return -ENODEV;
 
         info->io_cleanup = mem_cleanup;
@@ -1325,15 +1358,15 @@ static int try_init_mem(int intf_num, struct smi_info **new_info)
 {
         struct smi_info *info;
 
-        if (!addrs[intf_num])
+        if (! addrs[intf_num])
                 return -ENODEV;
 
-        if (!is_new_interface(intf_num, IPMI_MEM_ADDR_SPACE,
+        if (! is_new_interface(intf_num, IPMI_MEM_ADDR_SPACE,
                               addrs[intf_num]))
                 return -ENODEV;
 
         info = kmalloc(sizeof(*info), GFP_KERNEL);
-        if (!info) {
+        if (! info) {
                 printk(KERN_ERR "ipmi_si: Could not allocate SI data (2)\n");
                 return -ENOMEM;
         }
@@ -1343,10 +1376,10 @@ static int try_init_mem(int intf_num, struct smi_info **new_info)
         info->io.info = &addrs[intf_num];
         info->io.addr = NULL;
         info->io.regspacing = regspacings[intf_num];
-        if (!info->io.regspacing)
+        if (! info->io.regspacing)
                 info->io.regspacing = DEFAULT_REGSPACING;
         info->io.regsize = regsizes[intf_num];
-        if (!info->io.regsize)
+        if (! info->io.regsize)
                 info->io.regsize = DEFAULT_REGSPACING;
         info->io.regshift = regshifts[intf_num];
         info->irq = 0;
@@ -1404,7 +1437,7 @@ static int acpi_gpe_irq_setup(struct smi_info *info)
 {
         acpi_status status;
 
-        if (!info->irq)
+        if (! info->irq)
                 return 0;
 
         /* FIXME - is level triggered right? */
@@ -1428,7 +1461,7 @@ static int acpi_gpe_irq_setup(struct smi_info *info)
 
 static void acpi_gpe_irq_cleanup(struct smi_info *info)
 {
-        if (!info->irq)
+        if (! info->irq)
                 return;
 
         acpi_remove_gpe_handler(NULL, info->irq, &ipmi_acpi_gpe);
@@ -1507,10 +1540,10 @@ static int try_init_acpi(int intf_num, struct smi_info **new_info)
                 addr_space = IPMI_MEM_ADDR_SPACE;
         else
                 addr_space = IPMI_IO_ADDR_SPACE;
-        if (!is_new_interface(-1, addr_space, spmi->addr.address))
+        if (! is_new_interface(-1, addr_space, spmi->addr.address))
                 return -ENODEV;
 
-        if (!spmi->addr.register_bit_width) {
+        if (! spmi->addr.register_bit_width) {
                 acpi_failure = 1;
                 return -ENODEV;
         }
@@ -1537,7 +1570,7 @@ static int try_init_acpi(int intf_num, struct smi_info **new_info)
         }
 
         info = kmalloc(sizeof(*info), GFP_KERNEL);
-        if (!info) {
+        if (! info) {
                 printk(KERN_ERR "ipmi_si: Could not allocate SI data (3)\n");
                 return -ENOMEM;
         }
@@ -1613,22 +1646,15 @@ typedef struct dmi_ipmi_data
 static dmi_ipmi_data_t dmi_data[SI_MAX_DRIVERS];
 static int dmi_data_entries;
 
-typedef struct dmi_header
-{
-        u8      type;
-        u8      length;
-        u16     handle;
-} dmi_header_t;
-
-static int decode_dmi(dmi_header_t __iomem *dm, int intf_num)
+static int __init decode_dmi(struct dmi_header *dm, int intf_num)
 {
-        u8              __iomem *data = (u8 __iomem *)dm;
+        u8              *data = (u8 *)dm;
         unsigned long   base_addr;
         u8              reg_spacing;
-        u8              len = readb(&dm->length);
+        u8              len = dm->length;
         dmi_ipmi_data_t *ipmi_data = dmi_data+intf_num;
 
-        ipmi_data->type = readb(&data[4]);
+        ipmi_data->type = data[4];
 
         memcpy(&base_addr, data+8, sizeof(unsigned long));
         if (len >= 0x11) {
@@ -1643,12 +1669,12 @@ static int decode_dmi(dmi_header_t __iomem *dm, int intf_num)
                 }
                 /* If bit 4 of byte 0x10 is set, then the lsb for the address
                    is odd. */
-                ipmi_data->base_addr = base_addr | ((readb(&data[0x10]) & 0x10) >> 4);
+                ipmi_data->base_addr = base_addr | ((data[0x10] & 0x10) >> 4);
 
-                ipmi_data->irq = readb(&data[0x11]);
+                ipmi_data->irq = data[0x11];
 
                 /* The top two bits of byte 0x10 hold the register spacing. */
-                reg_spacing = (readb(&data[0x10]) & 0xC0) >> 6;
+                reg_spacing = (data[0x10] & 0xC0) >> 6;
                 switch(reg_spacing){
                 case 0x00: /* Byte boundaries */
                     ipmi_data->offset = 1;
@@ -1676,7 +1702,7 @@ static int decode_dmi(dmi_header_t __iomem *dm, int intf_num)
                 ipmi_data->offset = 1;
         }
 
-        ipmi_data->slave_addr = readb(&data[6]);
+        ipmi_data->slave_addr = data[6];
 
         if (is_new_interface(-1, ipmi_data->addr_space,ipmi_data->base_addr)) {
                 dmi_data_entries++;
@@ -1688,94 +1714,29 @@ static int decode_dmi(dmi_header_t __iomem *dm, int intf_num)
         return -1;
 }
 
-static int dmi_table(u32 base, int len, int num)
+static void __init dmi_find_bmc(void)
 {
-        u8                __iomem *buf;
-        struct dmi_header __iomem *dm;
-        u8                __iomem *data;
-        int               i=1;
-        int               status=-1;
+        struct dmi_device *dev = NULL;
         int               intf_num = 0;
 
-        buf = ioremap(base, len);
-        if(buf==NULL)
-                return -1;
-
-        data = buf;
-
-        while(i<num && (data - buf) < len)
-        {
-                dm=(dmi_header_t __iomem *)data;
-
-                if((data-buf+readb(&dm->length)) >= len)
-                        break;
-
-                if (readb(&dm->type) == 38) {
-                        if (decode_dmi(dm, intf_num) == 0) {
-                                intf_num++;
-                                if (intf_num >= SI_MAX_DRIVERS)
-                                        break;
-                        }
-                }
-
-                data+=readb(&dm->length);
-                while((data-buf) < len && (readb(data)||readb(data+1)))
-                        data++;
-                data+=2;
-                i++;
-        }
-        iounmap(buf);
-
-        return status;
-}
-
-static inline int dmi_checksum(u8 *buf)
-{
-        u8   sum=0;
-        int  a;
-
-        for(a=0; a<15; a++)
-                sum+=buf[a];
-        return (sum==0);
-}
-
-static int dmi_decode(void)
-{
-        u8   buf[15];
-        u32  fp=0xF0000;
-
-#ifdef CONFIG_SIMNOW
-        return -1;
-#endif
-
-        while(fp < 0xFFFFF)
-        {
-                isa_memcpy_fromio(buf, fp, 15);
-                if(memcmp(buf, "_DMI_", 5)==0 && dmi_checksum(buf))
-                {
-                        u16 num=buf[13]<<8|buf[12];
-                        u16 len=buf[7]<<8|buf[6];
-                        u32 base=buf[11]<<24|buf[10]<<16|buf[9]<<8|buf[8];
+        while ((dev = dmi_find_device(DMI_DEV_TYPE_IPMI, NULL, dev))) {
+                if (intf_num >= SI_MAX_DRIVERS)
+                        break;
 
-                        if(dmi_table(base, len, num) == 0)
-                                return 0;
-                }
-                fp+=16;
+                decode_dmi((struct dmi_header *) dev->device_data, intf_num++);
         }
-
-        return -1;
 }
 
 static int try_init_smbios(int intf_num, struct smi_info **new_info)
 {
-        struct smi_info   *info;
-        dmi_ipmi_data_t   *ipmi_data = dmi_data+intf_num;
-        char              *io_type;
+        struct smi_info *info;
+        dmi_ipmi_data_t *ipmi_data = dmi_data+intf_num;
+        char            *io_type;
 
         if (intf_num >= dmi_data_entries)
                 return -ENODEV;
 
-        switch(ipmi_data->type) {
+        switch (ipmi_data->type) {
                 case 0x01: /* KCS */
                         si_type[intf_num] = "kcs";
                         break;
@@ -1790,7 +1751,7 @@ static int try_init_smbios(int intf_num, struct smi_info **new_info)
         }
 
         info = kmalloc(sizeof(*info), GFP_KERNEL);
-        if (!info) {
+        if (! info) {
                 printk(KERN_ERR "ipmi_si: Could not allocate SI data (4)\n");
                 return -ENOMEM;
         }
@@ -1814,7 +1775,7 @@ static int try_init_smbios(int intf_num, struct smi_info **new_info)
 
         regspacings[intf_num] = ipmi_data->offset;
         info->io.regspacing = regspacings[intf_num];
-        if (!info->io.regspacing)
+        if (! info->io.regspacing)
                 info->io.regspacing = DEFAULT_REGSPACING;
         info->io.regsize = DEFAULT_REGSPACING;
         info->io.regshift = regshifts[intf_num];
@@ -1856,14 +1817,14 @@ static int find_pci_smic(int intf_num, struct smi_info **new_info)
 
         pci_smic_checked = 1;
 
-        if ((pci_dev = pci_get_device(PCI_HP_VENDOR_ID, PCI_MMC_DEVICE_ID,
-                                       NULL)))
-                ;
-        else if ((pci_dev = pci_get_class(PCI_ERMC_CLASSCODE, NULL)) &&
-                 pci_dev->subsystem_vendor == PCI_HP_VENDOR_ID)
-                fe_rmc = 1;
-        else
-                return -ENODEV;
+        pci_dev = pci_get_device(PCI_HP_VENDOR_ID, PCI_MMC_DEVICE_ID, NULL);
+        if (! pci_dev) {
+                pci_dev = pci_get_class(PCI_ERMC_CLASSCODE, NULL);
+                if (pci_dev && (pci_dev->subsystem_vendor == PCI_HP_VENDOR_ID))
+                        fe_rmc = 1;
+                else
+                        return -ENODEV;
+        }
 
         error = pci_read_config_word(pci_dev, PCI_MMC_ADDR_CW, &base_addr);
         if (error)
@@ -1876,7 +1837,7 @@ static int find_pci_smic(int intf_num, struct smi_info **new_info)
         }
 
         /* Bit 0: 1 specifies programmed I/O, 0 specifies memory mapped I/O */
-        if (!(base_addr & 0x0001))
+        if (! (base_addr & 0x0001))
         {
                 pci_dev_put(pci_dev);
                 printk(KERN_ERR
@@ -1886,17 +1847,17 @@ static int find_pci_smic(int intf_num, struct smi_info **new_info)
         }
 
         base_addr &= 0xFFFE;
-        if (!fe_rmc)
+        if (! fe_rmc)
                 /* Data register starts at base address + 1 in eRMC */
                 ++base_addr;
 
-        if (!is_new_interface(-1, IPMI_IO_ADDR_SPACE, base_addr)) {
+        if (! is_new_interface(-1, IPMI_IO_ADDR_SPACE, base_addr)) {
                 pci_dev_put(pci_dev);
                 return -ENODEV;
         }
 
         info = kmalloc(sizeof(*info), GFP_KERNEL);
-        if (!info) {
+        if (! info) {
                 pci_dev_put(pci_dev);
                 printk(KERN_ERR "ipmi_si: Could not allocate SI data (5)\n");
                 return -ENOMEM;
@@ -1907,7 +1868,7 @@ static int find_pci_smic(int intf_num, struct smi_info **new_info)
         ports[intf_num] = base_addr;
         info->io.info = &(ports[intf_num]);
         info->io.regspacing = regspacings[intf_num];
-        if (!info->io.regspacing)
+        if (! info->io.regspacing)
                 info->io.regspacing = DEFAULT_REGSPACING;
         info->io.regsize = DEFAULT_REGSPACING;
         info->io.regshift = regshifts[intf_num];
@@ -1928,7 +1889,7 @@ static int find_pci_smic(int intf_num, struct smi_info **new_info)
 static int try_init_plug_and_play(int intf_num, struct smi_info **new_info)
 {
 #ifdef CONFIG_PCI
-        if (find_pci_smic(intf_num, new_info)==0)
+        if (find_pci_smic(intf_num, new_info) == 0)
                 return 0;
 #endif
         /* Include other methods here. */
@@ -1946,7 +1907,7 @@ static int try_get_dev_id(struct smi_info *smi_info)
         int               rv = 0;
 
         resp = kmalloc(IPMI_MAX_MSG_LENGTH, GFP_KERNEL);
-        if (!resp)
+        if (! resp)
                 return -ENOMEM;
 
         /* Do a Get Device ID command, since it comes back with some
@@ -1995,11 +1956,8 @@ static int try_get_dev_id(struct smi_info *smi_info)
         }
 
         /* Record info from the get device id, in case we need it. */
-        smi_info->ipmi_si_dev_rev = resp[4] & 0xf;
-        smi_info->ipmi_si_fw_rev_major = resp[5] & 0x7f;
-        smi_info->ipmi_si_fw_rev_minor = resp[6];
-        smi_info->ipmi_version_major = resp[7] & 0xf;
-        smi_info->ipmi_version_minor = resp[7] >> 4;
+        memcpy(&smi_info->device_id, &resp[3],
+               min_t(unsigned long, resp_len-3, sizeof(smi_info->device_id)));
 
  out:
         kfree(resp);
@@ -2031,7 +1989,7 @@ static int stat_file_read_proc(char *page, char **start, off_t off,
         struct smi_info *smi = data;
 
         out += sprintf(out, "interrupts_enabled:    %d\n",
-                       smi->irq && !smi->interrupt_disabled);
+                       smi->irq && ! smi->interrupt_disabled);
         out += sprintf(out, "short_timeouts:        %ld\n",
                        smi->short_timeouts);
         out += sprintf(out, "long_timeouts:         %ld\n",
@@ -2060,6 +2018,73 @@ static int stat_file_read_proc(char *page, char **start, off_t off,
         return (out - ((char *) page));
 }
 
+/*
+ * oem_data_avail_to_receive_msg_avail
+ * @info - smi_info structure with msg_flags set
+ *
+ * Converts flags from OEM_DATA_AVAIL to RECEIVE_MSG_AVAIL
+ * Returns 1 indicating need to re-run handle_flags().
+ */
+static int oem_data_avail_to_receive_msg_avail(struct smi_info *smi_info)
+{
+        smi_info->msg_flags = ((smi_info->msg_flags & ~OEM_DATA_AVAIL) |
+                                RECEIVE_MSG_AVAIL);
+        return 1;
+}
+
+/*
+ * setup_dell_poweredge_oem_data_handler
+ * @info - smi_info.device_id must be populated
+ *
+ * Systems that match, but have firmware version < 1.40 may assert
+ * OEM0_DATA_AVAIL on their own, without being told via Set Flags that
+ * it's safe to do so.  Such systems will de-assert OEM1_DATA_AVAIL
+ * upon receipt of IPMI_GET_MSG_CMD, so we should treat these flags
+ * as RECEIVE_MSG_AVAIL instead.
+ *
+ * As Dell has no plans to release IPMI 1.5 firmware that *ever*
+ * assert the OEM[012] bits, and if it did, the driver would have to
+ * change to handle that properly, we don't actually check for the
+ * firmware version.
+ * Device ID = 0x20                BMC on PowerEdge 8G servers
+ * Device Revision = 0x80
+ * Firmware Revision1 = 0x01       BMC version 1.40
+ * Firmware Revision2 = 0x40       BCD encoded
+ * IPMI Version = 0x51             IPMI 1.5
+ * Manufacturer ID = A2 02 00      Dell IANA
+ *
+ */
+#define DELL_POWEREDGE_8G_BMC_DEVICE_ID  0x20
+#define DELL_POWEREDGE_8G_BMC_DEVICE_REV 0x80
+#define DELL_POWEREDGE_8G_BMC_IPMI_VERSION 0x51
+#define DELL_IANA_MFR_ID {0xA2, 0x02, 0x00}
+static void setup_dell_poweredge_oem_data_handler(struct smi_info *smi_info)
+{
+        struct ipmi_device_id *id = &smi_info->device_id;
+        const char mfr[3]=DELL_IANA_MFR_ID;
+        if (! memcmp(mfr, id->manufacturer_id, sizeof(mfr))
+            && (id->device_id       == DELL_POWEREDGE_8G_BMC_DEVICE_ID)
+            && (id->device_revision == DELL_POWEREDGE_8G_BMC_DEVICE_REV)
+            && (id->ipmi_version    == DELL_POWEREDGE_8G_BMC_IPMI_VERSION))
+        {
+                smi_info->oem_data_avail_handler =
+                        oem_data_avail_to_receive_msg_avail;
+        }
+}
+
+/*
+ * setup_oem_data_handler
+ * @info - smi_info.device_id must be filled in already
+ *
+ * Fills in smi_info.device_id.oem_data_available_handler
+ * when we know what function to use there.
+ */
+
+static void setup_oem_data_handler(struct smi_info *smi_info)
+{
+        setup_dell_poweredge_oem_data_handler(smi_info);
+}
+
 /* Returns 0 if initialized, or negative on an error. */
 static int init_one_smi(int intf_num, struct smi_info **smi)
 {
@@ -2071,19 +2096,15 @@ static int init_one_smi(int intf_num, struct smi_info **smi)
         if (rv)
                 rv = try_init_port(intf_num, &new_smi);
 #ifdef CONFIG_ACPI
-        if ((rv) && (si_trydefaults)) {
+        if (rv && si_trydefaults)
                 rv = try_init_acpi(intf_num, &new_smi);
-        }
 #endif
 #ifdef CONFIG_X86
-        if ((rv) && (si_trydefaults)) {
+        if (rv && si_trydefaults)
                 rv = try_init_smbios(intf_num, &new_smi);
-        }
 #endif
-        if ((rv) && (si_trydefaults)) {
+        if (rv && si_trydefaults)
                 rv = try_init_plug_and_play(intf_num, &new_smi);
-        }
-
 
         if (rv)
                 return rv;
@@ -2093,7 +2114,7 @@ static int init_one_smi(int intf_num, struct smi_info **smi)
         new_smi->si_sm = NULL;
         new_smi->handlers = NULL;
 
-        if (!new_smi->irq_setup) {
+        if (! new_smi->irq_setup) {
                 new_smi->irq = irqs[intf_num];
                 new_smi->irq_setup = std_irq_setup;
                 new_smi->irq_cleanup = std_irq_cleanup;
@@ -2127,7 +2148,7 @@ static int init_one_smi(int intf_num, struct smi_info **smi)
 
         /* Allocate the state machine's data and initialize it. */
         new_smi->si_sm = kmalloc(new_smi->handlers->size(), GFP_KERNEL);
-        if (!new_smi->si_sm) {
+        if (! new_smi->si_sm) {
                 printk(" Could not allocate state machine memory\n");
                 rv = -ENOMEM;
                 goto out_err;
@@ -2158,6 +2179,8 @@ static int init_one_smi(int intf_num, struct smi_info **smi)
         if (rv)
                 goto out_err;
 
+        setup_oem_data_handler(new_smi);
+
         /* Try to claim any interrupts. */
         new_smi->irq_setup(new_smi);
 
@@ -2191,8 +2214,8 @@ static int init_one_smi(int intf_num, struct smi_info **smi)
 
         rv = ipmi_register_smi(&handlers,
                                new_smi,
-                               new_smi->ipmi_version_major,
-                               new_smi->ipmi_version_minor,
+                               ipmi_version_major(&new_smi->device_id),
+                               ipmi_version_minor(&new_smi->device_id),
                                new_smi->slave_addr,
                                &(new_smi->intf));
         if (rv) {
@@ -2233,7 +2256,7 @@ static int init_one_smi(int intf_num, struct smi_info **smi)
 
         /* Wait for the timer to stop.  This avoids problems with race
            conditions removing the timer here. */
-        while (!new_smi->timer_stopped) {
+        while (! new_smi->timer_stopped) {
                 set_current_state(TASK_UNINTERRUPTIBLE);
                 schedule_timeout(1);
         }
@@ -2273,7 +2296,7 @@ static __init int init_ipmi_si(void)
         /* Parse out the si_type string into its components. */
         str = si_type_str;
         if (*str != '\0') {
-                for (i=0; (i<SI_MAX_PARMS) && (*str != '\0'); i++) {
+                for (i = 0; (i < SI_MAX_PARMS) && (*str != '\0'); i++) {
                         si_type[i] = str;
                         str = strchr(str, ',');
                         if (str) {
@@ -2285,22 +2308,14 @@ static __init int init_ipmi_si(void)
                 }
         }
 
-        printk(KERN_INFO "IPMI System Interface driver version "
-               IPMI_SI_VERSION);
-        if (kcs_smi_handlers.version)
-                printk(", KCS version %s", kcs_smi_handlers.version);
-        if (smic_smi_handlers.version)
-                printk(", SMIC version %s", smic_smi_handlers.version);
-        if (bt_smi_handlers.version)
-                printk(", BT version %s", bt_smi_handlers.version);
-        printk("\n");
+        printk(KERN_INFO "IPMI System Interface driver.\n");
 
 #ifdef CONFIG_X86
-        dmi_decode();
+        dmi_find_bmc();
 #endif
 
         rv = init_one_smi(0, &(smi_infos[pos]));
-        if (rv && !ports[0] && si_trydefaults) {
+        if (rv && ! ports[0] && si_trydefaults) {
                 /* If we are trying defaults and the initial port is
                    not set, then set it. */
                 si_type[0] = "kcs";
@@ -2322,7 +2337,7 @@ static __init int init_ipmi_si(void)
         if (rv == 0)
                 pos++;
 
-        for (i=1; i < SI_MAX_PARMS; i++) {
+        for (i = 1; i < SI_MAX_PARMS; i++) {
                 rv = init_one_smi(i, &(smi_infos[pos]));
                 if (rv == 0)
                         pos++;
@@ -2364,14 +2379,14 @@ static void __exit cleanup_one_si(struct smi_info *to_clean)
 
         /* Wait for the timer to stop.  This avoids problems with race
            conditions removing the timer here. */
-        while (!to_clean->timer_stopped) {
+        while (! to_clean->timer_stopped) {
                 set_current_state(TASK_UNINTERRUPTIBLE);
                 schedule_timeout(1);
         }
 
         /* Interrupts and timeouts are stopped, now make sure the
            interface is in a clean state. */
-        while ((to_clean->curr_msg) || (to_clean->si_state != SI_NORMAL)) {
+        while (to_clean->curr_msg || (to_clean->si_state != SI_NORMAL)) {
                 poll(to_clean);
                 set_current_state(TASK_UNINTERRUPTIBLE);
                 schedule_timeout(1);
@@ -2395,13 +2410,15 @@ static __exit void cleanup_ipmi_si(void)
 {
         int i;
 
-        if (!initialized)
+        if (! initialized)
                 return;
 
-        for (i=0; i<SI_MAX_DRIVERS; i++) {
+        for (i = 0; i < SI_MAX_DRIVERS; i++) {
                 cleanup_one_si(smi_infos[i]);
         }
 }
 module_exit(cleanup_ipmi_si);
 
 MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Corey Minyard <minyard@mvista.com>");
+MODULE_DESCRIPTION("Interface to the IPMI driver for the KCS, SMIC, and BT system interfaces.");
diff --git a/drivers/char/ipmi/ipmi_smic_sm.c b/drivers/char/ipmi/ipmi_smic_sm.c
index ae18747e670..add2aa2732f 100644
--- a/drivers/char/ipmi/ipmi_smic_sm.c
+++ b/drivers/char/ipmi/ipmi_smic_sm.c
@@ -46,8 +46,6 @@
 #include <linux/ipmi_msgdefs.h>         /* for completion codes */
 #include "ipmi_si_sm.h"
 
-#define IPMI_SMIC_VERSION "v33"
-
 /* smic_debug is a bit-field
  *      SMIC_DEBUG_ENABLE -     turned on for now
  *      SMIC_DEBUG_MSG -        commands and their responses
@@ -588,7 +586,6 @@ static int smic_size(void)
 
 struct si_sm_handlers smic_smi_handlers =
 {
-        .version           = IPMI_SMIC_VERSION,
         .init_data         = init_smic_data,
         .start_transaction = start_smic_transaction,
         .get_result        = smic_get_result,
diff --git a/drivers/char/ipmi/ipmi_watchdog.c b/drivers/char/ipmi/ipmi_watchdog.c
index d35a953961c..e71aaae855a 100644
--- a/drivers/char/ipmi/ipmi_watchdog.c
+++ b/drivers/char/ipmi/ipmi_watchdog.c
@@ -53,8 +53,6 @@
 
 #define PFX "IPMI Watchdog: "
 
-#define IPMI_WATCHDOG_VERSION "v33"
-
 /*
  * The IPMI command/response information for the watchdog timer.
  */
@@ -259,7 +257,7 @@ static int i_ipmi_set_timeout(struct ipmi_smi_msg  *smi_msg,
 
         data[1] = 0;
         WDOG_SET_TIMEOUT_ACT(data[1], ipmi_watchdog_state);
-        if (pretimeout > 0) {
+        if ((pretimeout > 0) && (ipmi_watchdog_state != WDOG_TIMEOUT_NONE)) {
             WDOG_SET_PRETIMEOUT_ACT(data[1], preaction_val);
             data[2] = pretimeout;
         } else {
@@ -659,19 +657,18 @@ static ssize_t ipmi_read(struct file *file,
 
 static int ipmi_open(struct inode *ino, struct file *filep)
 {
-        switch (iminor(ino))
-        {
-                case WATCHDOG_MINOR:
-                    if(test_and_set_bit(0, &ipmi_wdog_open))
+        switch (iminor(ino)) {
+        case WATCHDOG_MINOR:
+                if (test_and_set_bit(0, &ipmi_wdog_open))
                         return -EBUSY;
 
-                    /* Don't start the timer now, let it start on the
-                       first heartbeat. */
-                    ipmi_start_timer_on_heartbeat = 1;
-                    return nonseekable_open(ino, filep);
+                /* Don't start the timer now, let it start on the
+                   first heartbeat. */
+                ipmi_start_timer_on_heartbeat = 1;
+                return nonseekable_open(ino, filep);
 
-                default:
-                    return (-ENODEV);
+        default:
+                return (-ENODEV);
         }
 }
 
@@ -817,15 +814,19 @@ static void ipmi_register_watchdog(int ipmi_intf)
 static int
 ipmi_nmi(void *dev_id, struct pt_regs *regs, int cpu, int handled)
 {
+        /* If we are not expecting a timeout, ignore it. */
+        if (ipmi_watchdog_state == WDOG_TIMEOUT_NONE)
+                return NOTIFY_DONE;
+
         /* If no one else handled the NMI, we assume it was the IPMI
            watchdog. */
-        if ((!handled) && (preop_val == WDOG_PREOP_PANIC))
+        if ((!handled) && (preop_val == WDOG_PREOP_PANIC)) {
+                /* On some machines, the heartbeat will give
+                   an error and not work unless we re-enable
+                   the timer.   So do so. */
+                pretimeout_since_last_heartbeat = 1;
                 panic(PFX "pre-timeout");
-
-        /* On some machines, the heartbeat will give
-           an error and not work unless we re-enable
-           the timer.   So do so. */
-        pretimeout_since_last_heartbeat = 1;
+        }
 
         return NOTIFY_DONE;
 }
@@ -924,9 +925,6 @@ static int __init ipmi_wdog_init(void)
 {
         int rv;
 
-        printk(KERN_INFO PFX "driver version "
-               IPMI_WATCHDOG_VERSION "\n");
-
         if (strcmp(action, "reset") == 0) {
                 action_val = WDOG_TIMEOUT_RESET;
         } else if (strcmp(action, "none") == 0) {
@@ -1011,6 +1009,8 @@ static int __init ipmi_wdog_init(void)
         register_reboot_notifier(&wdog_reboot_notifier);
         notifier_chain_register(&panic_notifier_list, &wdog_panic_notifier);
 
+        printk(KERN_INFO PFX "driver initialized\n");
+
         return 0;
 }
 
@@ -1062,3 +1062,5 @@ static void __exit ipmi_wdog_exit(void)
 module_exit(ipmi_wdog_exit);
 module_init(ipmi_wdog_init);
 MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Corey Minyard <minyard@mvista.com>");
+MODULE_DESCRIPTION("watchdog timer based upon the IPMI interface.");
diff --git a/drivers/char/mbcs.c b/drivers/char/mbcs.c
index 115dbb35334..3fa64c63110 100644
--- a/drivers/char/mbcs.c
+++ b/drivers/char/mbcs.c
@@ -750,7 +750,7 @@ static int mbcs_probe(struct cx_dev *dev, const struct cx_device_id *id)
 
         dev->soft = NULL;
 
-        soft = kcalloc(1, sizeof(struct mbcs_soft), GFP_KERNEL);
+        soft = kzalloc(sizeof(struct mbcs_soft), GFP_KERNEL);
         if (soft == NULL)
                 return -ENOMEM;
 
diff --git a/drivers/char/mem.c b/drivers/char/mem.c
index 850a78c9c4b..f182752fe91 100644
--- a/drivers/char/mem.c
+++ b/drivers/char/mem.c
@@ -35,10 +35,6 @@
 # include <linux/efi.h>
 #endif
 
-#if defined(CONFIG_S390_TAPE) && defined(CONFIG_S390_TAPE_CHAR)
-extern void tapechar_init(void);
-#endif
-
 /*
  * Architectures vary in how they handle caching for addresses
  * outside of main memory.
diff --git a/drivers/char/misc.c b/drivers/char/misc.c
index 931efd58f87..0c8375165e2 100644
--- a/drivers/char/misc.c
+++ b/drivers/char/misc.c
@@ -63,8 +63,6 @@ static DECLARE_MUTEX(misc_sem);
 #define DYNAMIC_MINORS 64 /* like dynamic majors */
 static unsigned char misc_minors[DYNAMIC_MINORS / 8];
 
-extern int rtc_DP8570A_init(void);
-extern int rtc_MK48T08_init(void);
 extern int pmu_device_init(void);
 
 #ifdef CONFIG_PROC_FS
@@ -303,12 +301,7 @@ static int __init misc_init(void)
         misc_class = class_create(THIS_MODULE, "misc");
         if (IS_ERR(misc_class))
                 return PTR_ERR(misc_class);
-#ifdef CONFIG_MVME16x
-        rtc_MK48T08_init();
-#endif
-#ifdef CONFIG_BVME6000
-        rtc_DP8570A_init();
-#endif
+
         if (register_chrdev(MISC_MAJOR,"misc",&misc_fops)) {
                 printk("unable to get major %d for misc devices\n",
                        MISC_MAJOR);
diff --git a/drivers/char/moxa.c b/drivers/char/moxa.c
index 95f7046ff05..79e490ef2cf 100644
--- a/drivers/char/moxa.c
+++ b/drivers/char/moxa.c
@@ -339,7 +339,7 @@ static int __init moxa_init(void)
 
         init_MUTEX(&moxaBuffSem);
         moxaDriver->owner = THIS_MODULE;
-        moxaDriver->name = "ttya";
+        moxaDriver->name = "ttyMX";
         moxaDriver->devfs_name = "tts/a";
         moxaDriver->major = ttymajor;
         moxaDriver->minor_start = 0;
diff --git a/drivers/char/mxser.c b/drivers/char/mxser.c
index f022f094443..d0ef1ae4129 100644
--- a/drivers/char/mxser.c
+++ b/drivers/char/mxser.c
@@ -63,7 +63,6 @@
 #include <asm/system.h>
 #include <asm/io.h>
 #include <asm/irq.h>
-#include <asm/segment.h>
 #include <asm/bitops.h>
 #include <asm/uaccess.h>
 
diff --git a/drivers/char/rtc.c b/drivers/char/rtc.c
index cd4fe8b1709..63fff7c1244 100644
--- a/drivers/char/rtc.c
+++ b/drivers/char/rtc.c
@@ -938,10 +938,9 @@ found:
 
         /*
          * XXX Interrupt pin #7 in Espresso is shared between RTC and
-         * PCI Slot 2 INTA# (and some INTx# in Slot 1). SA_INTERRUPT here
-         * is asking for trouble with add-on boards. Change to SA_SHIRQ.
+         * PCI Slot 2 INTA# (and some INTx# in Slot 1).
          */
-        if (request_irq(rtc_irq, rtc_interrupt, SA_INTERRUPT, "rtc", (void *)&rtc_port)) {
+        if (request_irq(rtc_irq, rtc_interrupt, SA_SHIRQ, "rtc", (void *)&rtc_port)) {
                 /*
                  * Standard way for sparc to print irq's is to use
                  * __irq_itoa(). I think for EBus it's ok to use %d.
diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c
index cefbe985e55..36ae9ad2598 100644
--- a/drivers/char/sonypi.c
+++ b/drivers/char/sonypi.c
@@ -98,12 +98,13 @@ MODULE_PARM_DESC(useinput,
 
 #define SONYPI_DEVICE_MODEL_TYPE1       1
 #define SONYPI_DEVICE_MODEL_TYPE2       2
+#define SONYPI_DEVICE_MODEL_TYPE3       3
 
 /* type1 models use those */
 #define SONYPI_IRQ_PORT                 0x8034
 #define SONYPI_IRQ_SHIFT                22
-#define SONYPI_BASE                     0x50
-#define SONYPI_G10A                     (SONYPI_BASE+0x14)
+#define SONYPI_TYPE1_BASE               0x50
+#define SONYPI_G10A                     (SONYPI_TYPE1_BASE+0x14)
 #define SONYPI_TYPE1_REGION_SIZE        0x08
 #define SONYPI_TYPE1_EVTYPE_OFFSET      0x04
 
@@ -114,6 +115,13 @@ MODULE_PARM_DESC(useinput,
 #define SONYPI_TYPE2_REGION_SIZE        0x20
 #define SONYPI_TYPE2_EVTYPE_OFFSET      0x12
 
+/* type3 series specifics */
+#define SONYPI_TYPE3_BASE               0x40
+#define SONYPI_TYPE3_GID2               (SONYPI_TYPE3_BASE+0x48) /* 16 bits */
+#define SONYPI_TYPE3_MISC               (SONYPI_TYPE3_BASE+0x6d) /* 8 bits  */
+#define SONYPI_TYPE3_REGION_SIZE        0x20
+#define SONYPI_TYPE3_EVTYPE_OFFSET      0x12
+
 /* battery / brightness addresses */
 #define SONYPI_BAT_FLAGS        0x81
 #define SONYPI_LCD_LIGHT        0x96
@@ -159,6 +167,10 @@ static struct sonypi_ioport_list sonypi_type2_ioport_list[] = {
         { 0x0, 0x0 }
 };
 
+/* same as in type 2 models */
+static struct sonypi_ioport_list *sonypi_type3_ioport_list =
+        sonypi_type2_ioport_list;
+
 /* The set of possible interrupts */
 struct sonypi_irq_list {
         u16     irq;
@@ -180,6 +192,9 @@ static struct sonypi_irq_list sonypi_type2_irq_list[] = {
         {  0, 0x00 }    /* no IRQ, 0x00 in SIRQ in AML */
 };
 
+/* same as in type2 models */
+static struct sonypi_irq_list *sonypi_type3_irq_list = sonypi_type2_irq_list;
+
 #define SONYPI_CAMERA_BRIGHTNESS                0
 #define SONYPI_CAMERA_CONTRAST                  1
 #define SONYPI_CAMERA_HUE                       2
@@ -223,6 +238,7 @@ static struct sonypi_irq_list sonypi_type2_irq_list[] = {
 #define SONYPI_MEYE_MASK                        0x00000400
 #define SONYPI_MEMORYSTICK_MASK                 0x00000800
 #define SONYPI_BATTERY_MASK                     0x00001000
+#define SONYPI_WIRELESS_MASK                    0x00002000
 
 struct sonypi_event {
         u8      data;
@@ -305,6 +321,13 @@ static struct sonypi_event sonypi_blueev[] = {
         { 0, 0 }
 };
 
+/* The set of possible wireless events */
+static struct sonypi_event sonypi_wlessev[] = {
+        { 0x59, SONYPI_EVENT_WIRELESS_ON },
+        { 0x5a, SONYPI_EVENT_WIRELESS_OFF },
+        { 0, 0 }
+};
+
 /* The set of possible back button events */
 static struct sonypi_event sonypi_backev[] = {
         { 0x20, SONYPI_EVENT_BACK_PRESSED },
@@ -383,7 +406,6 @@ static struct sonypi_eventtypes {
         { SONYPI_DEVICE_MODEL_TYPE2, 0x31, SONYPI_BLUETOOTH_MASK, sonypi_blueev },
         { SONYPI_DEVICE_MODEL_TYPE2, 0x08, SONYPI_PKEY_MASK, sonypi_pkeyev },
         { SONYPI_DEVICE_MODEL_TYPE2, 0x11, SONYPI_BACK_MASK, sonypi_backev },
-        { SONYPI_DEVICE_MODEL_TYPE2, 0x08, SONYPI_HELP_MASK, sonypi_helpev },
         { SONYPI_DEVICE_MODEL_TYPE2, 0x21, SONYPI_HELP_MASK, sonypi_helpev },
         { SONYPI_DEVICE_MODEL_TYPE2, 0x21, SONYPI_ZOOM_MASK, sonypi_zoomev },
         { SONYPI_DEVICE_MODEL_TYPE2, 0x20, SONYPI_THUMBPHRASE_MASK, sonypi_thumbphraseev },
@@ -391,6 +413,12 @@ static struct sonypi_eventtypes {
         { SONYPI_DEVICE_MODEL_TYPE2, 0x41, SONYPI_BATTERY_MASK, sonypi_batteryev },
         { SONYPI_DEVICE_MODEL_TYPE2, 0x31, SONYPI_PKEY_MASK, sonypi_pkeyev },
 
+        { SONYPI_DEVICE_MODEL_TYPE3, 0, 0xffffffff, sonypi_releaseev },
+        { SONYPI_DEVICE_MODEL_TYPE3, 0x21, SONYPI_FNKEY_MASK, sonypi_fnkeyev },
+        { SONYPI_DEVICE_MODEL_TYPE3, 0x31, SONYPI_WIRELESS_MASK, sonypi_wlessev },
+        { SONYPI_DEVICE_MODEL_TYPE3, 0x31, SONYPI_MEMORYSTICK_MASK, sonypi_memorystickev },
+        { SONYPI_DEVICE_MODEL_TYPE3, 0x41, SONYPI_BATTERY_MASK, sonypi_batteryev },
+        { SONYPI_DEVICE_MODEL_TYPE3, 0x31, SONYPI_PKEY_MASK, sonypi_pkeyev },
         { 0 }
 };
 
@@ -563,6 +591,23 @@ static void sonypi_type2_srs(void)
         udelay(10);
 }
 
+static void sonypi_type3_srs(void)
+{
+        u16 v16;
+        u8  v8;
+
+        /* This model type uses the same initialiazation of
+         * the embedded controller as the type2 models. */
+        sonypi_type2_srs();
+
+        /* Initialization of PCI config space of the LPC interface bridge. */
+        v16 = (sonypi_device.ioport1 & 0xFFF0) | 0x01;
+        pci_write_config_word(sonypi_device.dev, SONYPI_TYPE3_GID2, v16);
+        pci_read_config_byte(sonypi_device.dev, SONYPI_TYPE3_MISC, &v8);
+        v8 = (v8 & 0xCF) | 0x10;
+        pci_write_config_byte(sonypi_device.dev, SONYPI_TYPE3_MISC, v8);
+}
+
 /* Disables the device - this comes from the AML code in the ACPI bios */
 static void sonypi_type1_dis(void)
 {
@@ -587,6 +632,13 @@ static void sonypi_type2_dis(void)
                 printk(KERN_WARNING "ec_write failed\n");
 }
 
+static void sonypi_type3_dis(void)
+{
+        sonypi_type2_dis();
+        udelay(10);
+        pci_write_config_word(sonypi_device.dev, SONYPI_TYPE3_GID2, 0);
+}
+
 static u8 sonypi_call1(u8 dev)
 {
         u8 v1, v2;
@@ -1067,10 +1119,17 @@ static struct miscdevice sonypi_misc_device = {
 
 static void sonypi_enable(unsigned int camera_on)
 {
-        if (sonypi_device.model == SONYPI_DEVICE_MODEL_TYPE2)
-                sonypi_type2_srs();
-        else
+        switch (sonypi_device.model) {
+        case SONYPI_DEVICE_MODEL_TYPE1:
                 sonypi_type1_srs();
+                break;
+        case SONYPI_DEVICE_MODEL_TYPE2:
+                sonypi_type2_srs();
+                break;
+        case SONYPI_DEVICE_MODEL_TYPE3:
+                sonypi_type3_srs();
+                break;
+        }
 
         sonypi_call1(0x82);
         sonypi_call2(0x81, 0xff);
@@ -1094,10 +1153,18 @@ static int sonypi_disable(void)
         if (!SONYPI_ACPI_ACTIVE && fnkeyinit)
                 outb(0xf1, 0xb2);
 
-        if (sonypi_device.model == SONYPI_DEVICE_MODEL_TYPE2)
-                sonypi_type2_dis();
-        else
+        switch (sonypi_device.model) {
+        case SONYPI_DEVICE_MODEL_TYPE1:
                 sonypi_type1_dis();
+                break;
+        case SONYPI_DEVICE_MODEL_TYPE2:
+                sonypi_type2_dis();
+                break;
+        case SONYPI_DEVICE_MODEL_TYPE3:
+                sonypi_type3_dis();
+                break;
+        }
+
         return 0;
 }
 
@@ -1143,12 +1210,16 @@ static int __devinit sonypi_probe(void)
         struct sonypi_irq_list *irq_list;
         struct pci_dev *pcidev;
 
-        pcidev = pci_get_device(PCI_VENDOR_ID_INTEL,
-                                PCI_DEVICE_ID_INTEL_82371AB_3, NULL);
+        if ((pcidev = pci_get_device(PCI_VENDOR_ID_INTEL,
+                                     PCI_DEVICE_ID_INTEL_82371AB_3, NULL)))
+                sonypi_device.model = SONYPI_DEVICE_MODEL_TYPE1;
+        else if ((pcidev = pci_get_device(PCI_VENDOR_ID_INTEL,
+                                          PCI_DEVICE_ID_INTEL_ICH6_1, NULL)))
+                sonypi_device.model = SONYPI_DEVICE_MODEL_TYPE3;
+        else
+                sonypi_device.model = SONYPI_DEVICE_MODEL_TYPE2;
 
         sonypi_device.dev = pcidev;
-        sonypi_device.model = pcidev ?
-                SONYPI_DEVICE_MODEL_TYPE1 : SONYPI_DEVICE_MODEL_TYPE2;
 
         spin_lock_init(&sonypi_device.fifo_lock);
         sonypi_device.fifo = kfifo_alloc(SONYPI_BUF_SIZE, GFP_KERNEL,
@@ -1176,16 +1247,22 @@ static int __devinit sonypi_probe(void)
                 goto out_miscreg;
         }
 
-        if (sonypi_device.model == SONYPI_DEVICE_MODEL_TYPE2) {
+
+        if (sonypi_device.model == SONYPI_DEVICE_MODEL_TYPE1) {
+                ioport_list = sonypi_type1_ioport_list;
+                sonypi_device.region_size = SONYPI_TYPE1_REGION_SIZE;
+                sonypi_device.evtype_offset = SONYPI_TYPE1_EVTYPE_OFFSET;
+                irq_list = sonypi_type1_irq_list;
+        } else if (sonypi_device.model == SONYPI_DEVICE_MODEL_TYPE2) {
                 ioport_list = sonypi_type2_ioport_list;
                 sonypi_device.region_size = SONYPI_TYPE2_REGION_SIZE;
                 sonypi_device.evtype_offset = SONYPI_TYPE2_EVTYPE_OFFSET;
                 irq_list = sonypi_type2_irq_list;
         } else {
-                ioport_list = sonypi_type1_ioport_list;
-                sonypi_device.region_size = SONYPI_TYPE1_REGION_SIZE;
-                sonypi_device.evtype_offset = SONYPI_TYPE1_EVTYPE_OFFSET;
-                irq_list = sonypi_type1_irq_list;
+                ioport_list = sonypi_type3_ioport_list;
+                sonypi_device.region_size = SONYPI_TYPE3_REGION_SIZE;
+                sonypi_device.evtype_offset = SONYPI_TYPE3_EVTYPE_OFFSET;
+                irq_list = sonypi_type3_irq_list;
         }
 
         for (i = 0; ioport_list[i].port1; i++) {
@@ -1274,11 +1351,10 @@ static int __devinit sonypi_probe(void)
 
         printk(KERN_INFO "sonypi: Sony Programmable I/O Controller Driver"
                "v%s.\n", SONYPI_DRIVER_VERSION);
-        printk(KERN_INFO "sonypi: detected %s model, "
+        printk(KERN_INFO "sonypi: detected type%d model, "
                "verbose = %d, fnkeyinit = %s, camera = %s, "
                "compat = %s, mask = 0x%08lx, useinput = %s, acpi = %s\n",
-               (sonypi_device.model == SONYPI_DEVICE_MODEL_TYPE1) ?
-                        "type1" : "type2",
+               sonypi_device.model,
                verbose,
                fnkeyinit ? "on" : "off",
                camera ? "on" : "off",
diff --git a/drivers/char/tpm/tpm_atmel.c b/drivers/char/tpm/tpm_atmel.c
index cc2cc77fd17..c0d64914595 100644
--- a/drivers/char/tpm/tpm_atmel.c
+++ b/drivers/char/tpm/tpm_atmel.c
@@ -206,6 +206,9 @@ static struct pci_device_id tpm_pci_tbl[] __devinitdata = {
         {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801DB_0)},
         {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801DB_12)},
         {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801EB_0)},
+        {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH6_0)},
+        {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH6_1)},
+        {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH7_0)},
         {PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8111_LPC)},
         {PCI_DEVICE(PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_CSB6LPC)},
         {0,}
diff --git a/drivers/char/tpm/tpm_infineon.c b/drivers/char/tpm/tpm_infineon.c
index dc8c540391f..939e51e119e 100644
--- a/drivers/char/tpm/tpm_infineon.c
+++ b/drivers/char/tpm/tpm_infineon.c
@@ -14,7 +14,6 @@
  * License.
  */
 
-#include <acpi/acpi_bus.h>
 #include <linux/pnp.h>
 #include "tpm.h"
 
@@ -29,9 +28,10 @@
 #define TPM_MAX_TRIES           5000
 #define TPM_INFINEON_DEV_VEN_VALUE      0x15D1
 
-/* These values will be filled after ACPI-call */
+/* These values will be filled after PnP-call */
 static int TPM_INF_DATA = 0;
 static int TPM_INF_ADDR = 0;
+static int pnp_registered = 0;
 
 /* TPM header definitions */
 enum infineon_tpm_header {
@@ -356,24 +356,26 @@ static const struct pnp_device_id tpm_pnp_tbl[] = {
         {"IFX0102", 0},
         {"", 0}
 };
+MODULE_DEVICE_TABLE(pnp, tpm_pnp_tbl);
 
-static int __devinit tpm_inf_acpi_probe(struct pnp_dev *dev,
+static int __devinit tpm_inf_pnp_probe(struct pnp_dev *dev,
                                         const struct pnp_device_id *dev_id)
 {
-        TPM_INF_ADDR = (pnp_port_start(dev, 0) & 0xff);
-        TPM_INF_DATA = ((TPM_INF_ADDR + 1) & 0xff);
-        tpm_inf.base = pnp_port_start(dev, 1);
-        dev_info(&dev->dev, "Found %s with ID %s\n",
-                 dev->name, dev_id->id);
-        if (!((tpm_inf.base >> 8) & 0xff))
-                tpm_inf.base = 0;
-        return 0;
+        if (pnp_port_valid(dev, 0)) {
+                TPM_INF_ADDR = (pnp_port_start(dev, 0) & 0xff);
+                TPM_INF_DATA = ((TPM_INF_ADDR + 1) & 0xff);
+                tpm_inf.base = pnp_port_start(dev, 1);
+                dev_info(&dev->dev, "Found %s with ID %s\n",
+                dev->name, dev_id->id);
+                return 0;
+        }
+        return -ENODEV;
 }
 
 static struct pnp_driver tpm_inf_pnp = {
         .name = "tpm_inf_pnp",
         .id_table = tpm_pnp_tbl,
-        .probe = tpm_inf_acpi_probe,
+        .probe = tpm_inf_pnp_probe,
 };
 
 static int __devinit tpm_inf_probe(struct pci_dev *pci_dev,
@@ -386,19 +388,30 @@ static int __devinit tpm_inf_probe(struct pci_dev *pci_dev,
         int productid[2];
         char chipname[20];
 
-        if (pci_enable_device(pci_dev))
-                return -EIO;
+        rc = pci_enable_device(pci_dev);
+        if (rc)
+                return rc;
 
         dev_info(&pci_dev->dev, "LPC-bus found at 0x%x\n", pci_id->device);
 
-        /* read IO-ports from ACPI */
-        pnp_register_driver(&tpm_inf_pnp);
-        pnp_unregister_driver(&tpm_inf_pnp);
+        /* read IO-ports from PnP */
+        rc = pnp_register_driver(&tpm_inf_pnp);
+        if (rc < 0) {
+                dev_err(&pci_dev->dev,
+                        "Error %x from pnp_register_driver!\n",rc);
+                goto error2;
+        }
+        if (!rc) {
+                dev_info(&pci_dev->dev, "No Infineon TPM found!\n");
+                goto error;
+        } else {
+                pnp_registered = 1;
+        }
 
         /* Make sure, we have received valid config ports */
         if (!TPM_INF_ADDR) {
-                pci_disable_device(pci_dev);
-                return -EIO;
+                dev_err(&pci_dev->dev, "No valid IO-ports received!\n");
+                goto error;
         }
 
         /* query chip for its vendor, its version number a.s.o. */
@@ -418,23 +431,21 @@ static int __devinit tpm_inf_probe(struct pci_dev *pci_dev,
 
         switch ((productid[0] << 8) | productid[1]) {
         case 6:
-                sprintf(chipname, " (SLD 9630 TT 1.1)");
+                snprintf(chipname, sizeof(chipname), " (SLD 9630 TT 1.1)");
                 break;
         case 11:
-                sprintf(chipname, " (SLB 9635 TT 1.2)");
+                snprintf(chipname, sizeof(chipname), " (SLB 9635 TT 1.2)");
                 break;
         default:
-                sprintf(chipname, " (unknown chip)");
+                snprintf(chipname, sizeof(chipname), " (unknown chip)");
                 break;
         }
-        chipname[19] = 0;
 
         if ((vendorid[0] << 8 | vendorid[1]) == (TPM_INFINEON_DEV_VEN_VALUE)) {
 
                 if (tpm_inf.base == 0) {
                         dev_err(&pci_dev->dev, "No IO-ports found!\n");
-                        pci_disable_device(pci_dev);
-                        return -EIO;
+                        goto error;
                 }
                 /* configure TPM with IO-ports */
                 outb(IOLIMH, TPM_INF_ADDR);
@@ -452,8 +463,7 @@ static int __devinit tpm_inf_probe(struct pci_dev *pci_dev,
                         dev_err(&pci_dev->dev,
                                 "Could not set IO-ports to %04x\n",
                                 tpm_inf.base);
-                        pci_disable_device(pci_dev);
-                        return -EIO;
+                        goto error;
                 }
 
                 /* activate register */
@@ -479,14 +489,16 @@ static int __devinit tpm_inf_probe(struct pci_dev *pci_dev,
                          productid[0], productid[1], chipname);
 
                 rc = tpm_register_hardware(pci_dev, &tpm_inf);
-                if (rc < 0) {
-                        pci_disable_device(pci_dev);
-                        return -ENODEV;
-                }
+                if (rc < 0)
+                        goto error;
                 return 0;
         } else {
                 dev_info(&pci_dev->dev, "No Infineon TPM found!\n");
+error:
+                pnp_unregister_driver(&tpm_inf_pnp);
+error2:
                 pci_disable_device(pci_dev);
+                pnp_registered = 0;
                 return -ENODEV;
         }
 }
@@ -521,6 +533,8 @@ static int __init init_inf(void)
 
 static void __exit cleanup_inf(void)
 {
+        if (pnp_registered)
+                pnp_unregister_driver(&tpm_inf_pnp);
         pci_unregister_driver(&inf_pci_driver);
 }
 
diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
index 6e4be3bb2d8..9d657127f31 100644
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
@@ -153,7 +153,6 @@ static int tty_release(struct inode *, struct file *);
 int tty_ioctl(struct inode * inode, struct file * file,
               unsigned int cmd, unsigned long arg);
 static int tty_fasync(int fd, struct file * filp, int on);
-extern void rs_360_init(void);
 static void release_mem(struct tty_struct *tty, int idx);
 
 
@@ -2911,11 +2910,6 @@ void __init console_init(void)
 #ifdef CONFIG_EARLY_PRINTK
         disable_early_printk();
 #endif
-#ifdef CONFIG_SERIAL_68360
-        /* This is not a console initcall. I know not what it's doing here.
-           So I haven't moved it. dwmw2 */
-        rs_360_init();
-#endif
         call = __con_initcall_start;
         while (call < __con_initcall_end) {
                 (*call)();
diff --git a/drivers/char/vt.c b/drivers/char/vt.c
index 665103ccaee..b8d0c290b0d 100644
--- a/drivers/char/vt.c
+++ b/drivers/char/vt.c
@@ -434,21 +434,25 @@ void invert_screen(struct vc_data *vc, int offset, int count, int viewed)
 /* used by selection: complement pointer position */
 void complement_pos(struct vc_data *vc, int offset)
 {
-        static unsigned short *p;
+        static int old_offset = -1;
         static unsigned short old;
         static unsigned short oldx, oldy;
 
         WARN_CONSOLE_UNLOCKED();
 
-        if (p) {
-                scr_writew(old, p);
+        if (old_offset != -1 && old_offset >= 0 &&
+            old_offset < vc->vc_screenbuf_size) {
+                scr_writew(old, screenpos(vc, old_offset, 1));
                 if (DO_UPDATE(vc))
                         vc->vc_sw->con_putc(vc, old, oldy, oldx);
         }
-        if (offset == -1)
-                p = NULL;
-        else {
+
+        old_offset = offset;
+
+        if (offset != -1 && offset >= 0 &&
+            offset < vc->vc_screenbuf_size) {
                 unsigned short new;
+                unsigned short *p;
                 p = screenpos(vc, offset, 1);
                 old = scr_readw(p);
                 new = old ^ vc->vc_complement_mask;
@@ -459,6 +463,7 @@ void complement_pos(struct vc_data *vc, int offset)
                         vc->vc_sw->con_putc(vc, new, oldy, oldx);
                 }
         }
+
 }
 
 static void insert_char(struct vc_data *vc, unsigned int nr)
@@ -2272,7 +2277,9 @@ int tioclinux(struct tty_struct *tty, unsigned long arg)
                         ret = paste_selection(tty);
                         break;
                 case TIOCL_UNBLANKSCREEN:
+                        acquire_console_sem();
                         unblank_screen();
+                        release_console_sem();
                         break;
                 case TIOCL_SELLOADLUT:
                         ret = sel_loadlut(p);
@@ -2317,8 +2324,10 @@ int tioclinux(struct tty_struct *tty, unsigned long arg)
                         }
                         break;
                 case TIOCL_BLANKSCREEN: /* until explicitly unblanked, not only poked */
+                        acquire_console_sem();
                         ignore_poke = 1;
                         do_blank_screen(0);
+                        release_console_sem();
                         break;
                 case TIOCL_BLANKEDSCREEN:
                         ret = console_blanked;
diff --git a/drivers/char/watchdog/Kconfig b/drivers/char/watchdog/Kconfig
index b53e2e2b5ae..c3898afce3a 100644
--- a/drivers/char/watchdog/Kconfig
+++ b/drivers/char/watchdog/Kconfig
@@ -346,6 +346,13 @@ config 8xx_WDT
         tristate "MPC8xx Watchdog Timer"
         depends on WATCHDOG && 8xx
 
+config BOOKE_WDT
+        tristate "PowerPC Book-E Watchdog Timer"
+        depends on WATCHDOG && (BOOKE || 4xx)
+        ---help---
+          Please see Documentation/watchdog/watchdog-api.txt for
+          more information.
+
 # MIPS Architecture
 
 config INDYDOG
diff --git a/drivers/char/watchdog/Makefile b/drivers/char/watchdog/Makefile
index c1838834ea7..cfeac6f1013 100644
--- a/drivers/char/watchdog/Makefile
+++ b/drivers/char/watchdog/Makefile
@@ -2,42 +2,68 @@
 # Makefile for the WatchDog device drivers.
 #
 
+# Only one watchdog can succeed. We probe the ISA/PCI/USB based
+# watchdog-cards first, then the architecture specific watchdog
+# drivers and then the architecture independant "softdog" driver.
+# This means that if your ISA/PCI/USB card isn't detected that
+# you can fall back to an architecture specific driver and if
+# that also fails then you can fall back to the software watchdog
+# to give you some cover.
+
+# ISA-based Watchdog Cards
 obj-$(CONFIG_PCWATCHDOG) += pcwd.o
-obj-$(CONFIG_ACQUIRE_WDT) += acquirewdt.o
-obj-$(CONFIG_ADVANTECH_WDT) += advantechwdt.o
-obj-$(CONFIG_IB700_WDT) += ib700wdt.o
 obj-$(CONFIG_MIXCOMWD) += mixcomwd.o
-obj-$(CONFIG_SCx200_WDT) += scx200_wdt.o
-obj-$(CONFIG_60XX_WDT) += sbc60xxwdt.o
 obj-$(CONFIG_WDT) += wdt.o
+
+# PCI-based Watchdog Cards
+obj-$(CONFIG_PCIPCWATCHDOG) += pcwd_pci.o
 obj-$(CONFIG_WDTPCI) += wdt_pci.o
+
+# USB-based Watchdog Cards
+obj-$(CONFIG_USBPCWATCHDOG) += pcwd_usb.o
+
+# ARM Architecture
 obj-$(CONFIG_21285_WATCHDOG) += wdt285.o
 obj-$(CONFIG_977_WATCHDOG) += wdt977.o
-obj-$(CONFIG_I8XX_TCO) += i8xx_tco.o
-obj-$(CONFIG_MACHZ_WDT) += machzwd.o
-obj-$(CONFIG_SH_WDT) += shwdt.o
+obj-$(CONFIG_IXP2000_WATCHDOG) += ixp2000_wdt.o
+obj-$(CONFIG_IXP4XX_WATCHDOG) += ixp4xx_wdt.o
 obj-$(CONFIG_S3C2410_WATCHDOG) += s3c2410_wdt.o
 obj-$(CONFIG_SA1100_WATCHDOG) += sa1100_wdt.o
-obj-$(CONFIG_EUROTECH_WDT) += eurotechwdt.o
-obj-$(CONFIG_W83877F_WDT) += w83877f_wdt.o
-obj-$(CONFIG_W83627HF_WDT) += w83627hf_wdt.o
-obj-$(CONFIG_SC520_WDT) += sc520_wdt.o
-obj-$(CONFIG_ALIM7101_WDT) += alim7101_wdt.o
+
+# X86 (i386 + ia64 + x86_64) Architecture
+obj-$(CONFIG_ACQUIRE_WDT) += acquirewdt.o
+obj-$(CONFIG_ADVANTECH_WDT) += advantechwdt.o
 obj-$(CONFIG_ALIM1535_WDT) += alim1535_wdt.o
-obj-$(CONFIG_SC1200_WDT) += sc1200wdt.o
+obj-$(CONFIG_ALIM7101_WDT) += alim7101_wdt.o
+obj-$(CONFIG_SC520_WDT) += sc520_wdt.o
+obj-$(CONFIG_EUROTECH_WDT) += eurotechwdt.o
+obj-$(CONFIG_IB700_WDT) += ib700wdt.o
 obj-$(CONFIG_WAFER_WDT) += wafer5823wdt.o
+obj-$(CONFIG_I8XX_TCO) += i8xx_tco.o
+obj-$(CONFIG_SC1200_WDT) += sc1200wdt.o
+obj-$(CONFIG_SCx200_WDT) += scx200_wdt.o
+obj-$(CONFIG_60XX_WDT) += sbc60xxwdt.o
 obj-$(CONFIG_CPU5_WDT) += cpu5wdt.o
-obj-$(CONFIG_INDYDOG) += indydog.o
-obj-$(CONFIG_PCIPCWATCHDOG) += pcwd_pci.o
-obj-$(CONFIG_USBPCWATCHDOG) += pcwd_usb.o
-obj-$(CONFIG_IXP4XX_WATCHDOG) += ixp4xx_wdt.o
-obj-$(CONFIG_IXP2000_WATCHDOG) += ixp2000_wdt.o
+obj-$(CONFIG_W83627HF_WDT) += w83627hf_wdt.o
+obj-$(CONFIG_W83877F_WDT) += w83877f_wdt.o
+obj-$(CONFIG_MACHZ_WDT) += machzwd.o
+
+# PowerPC Architecture
 obj-$(CONFIG_8xx_WDT) += mpc8xx_wdt.o
+
+# PPC64 Architecture
 obj-$(CONFIG_WATCHDOG_RTAS) += wdrtas.o
+obj-$(CONFIG_BOOKE_WDT) += booke_wdt.o
+
+# MIPS Architecture
+obj-$(CONFIG_INDYDOG) += indydog.o
+
+# S390 Architecture
+
+# SUPERH Architecture
+obj-$(CONFIG_SH_WDT) += shwdt.o
 
-# Only one watchdog can succeed. We probe the hardware watchdog
-# drivers first, then the softdog driver.  This means if your hardware
-# watchdog dies or is 'borrowed' for some reason the software watchdog
-# still gives you some cover.
+# SPARC64 Architecture
 
+# Architecture Independant
 obj-$(CONFIG_SOFT_WATCHDOG) += softdog.o
diff --git a/drivers/char/watchdog/booke_wdt.c b/drivers/char/watchdog/booke_wdt.c
new file mode 100644
index 00000000000..abc30cca664
--- /dev/null
+++ b/drivers/char/watchdog/booke_wdt.c
@@ -0,0 +1,192 @@
+/*
+ * drivers/char/watchdog/booke_wdt.c
+ *
+ * Watchdog timer for PowerPC Book-E systems
+ *
+ * Author: Matthew McClintock
+ * Maintainer: Kumar Gala <kumar.gala@freescale.com>
+ *
+ * Copyright 2005 Freescale Semiconductor Inc.
+ *
+ * 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 of the  License, or (at your
+ * option) any later version.
+ */
+
+#include <linux/config.h>
+#include <linux/module.h>
+#include <linux/fs.h>
+#include <linux/miscdevice.h>
+#include <linux/notifier.h>
+#include <linux/watchdog.h>
+
+#include <asm/reg_booke.h>
+#include <asm/uaccess.h>
+#include <asm/system.h>
+
+/* If the kernel parameter wdt_enable=1, the watchdog will be enabled at boot.
+ * Also, the wdt_period sets the watchdog timer period timeout.
+ * For E500 cpus the wdt_period sets which bit changing from 0->1 will
+ * trigger a watchog timeout. This watchdog timeout will occur 3 times, the
+ * first time nothing will happen, the second time a watchdog exception will
+ * occur, and the final time the board will reset.
+ */
+
+#ifdef  CONFIG_FSL_BOOKE
+#define WDT_PERIOD_DEFAULT 63   /* Ex. wdt_period=28 bus=333Mhz , reset=~40sec */
+#else
+#define WDT_PERIOD_DEFAULT 4    /* Refer to the PPC40x and PPC4xx manuals */
+#endif                          /* for timing information */
+
+u32 booke_wdt_enabled = 0;
+u32 booke_wdt_period = WDT_PERIOD_DEFAULT;
+
+#ifdef  CONFIG_FSL_BOOKE
+#define WDTP(x)         ((((63-x)&0x3)<<30)|(((63-x)&0x3c)<<15))
+#else
+#define WDTP(x)         (TCR_WP(x))
+#endif
+
+/*
+ * booke_wdt_enable:
+ */
+static __inline__ void booke_wdt_enable(void)
+{
+        u32 val;
+
+        val = mfspr(SPRN_TCR);
+        val |= (TCR_WIE|TCR_WRC(WRC_CHIP)|WDTP(booke_wdt_period));
+
+        mtspr(SPRN_TCR, val);
+}
+
+/*
+ * booke_wdt_ping:
+ */
+static __inline__ void booke_wdt_ping(void)
+{
+        mtspr(SPRN_TSR, TSR_ENW|TSR_WIS);
+}
+
+/*
+ * booke_wdt_write:
+ */
+static ssize_t booke_wdt_write (struct file *file, const char *buf,
+                                size_t count, loff_t *ppos)
+{
+        booke_wdt_ping();
+        return count;
+}
+
+static struct watchdog_info ident = {
+  .options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING,
+  .firmware_version = 0,
+  .identity = "PowerPC Book-E Watchdog",
+};
+
+/*
+ * booke_wdt_ioctl:
+ */
+static int booke_wdt_ioctl (struct inode *inode, struct file *file,
+                            unsigned int cmd, unsigned long arg)
+{
+        u32 tmp = 0;
+
+        switch (cmd) {
+        case WDIOC_GETSUPPORT:
+                if (copy_to_user ((struct watchdog_info *) arg, &ident,
+                                sizeof(struct watchdog_info)))
+                        return -EFAULT;
+        case WDIOC_GETSTATUS:
+                return put_user(ident.options, (u32 *) arg);
+        case WDIOC_GETBOOTSTATUS:
+                /* XXX: something is clearing TSR */
+                tmp = mfspr(SPRN_TSR) & TSR_WRS(3);
+                /* returns 1 if last reset was caused by the WDT */
+                return (tmp ? 1 : 0);
+        case WDIOC_KEEPALIVE:
+                booke_wdt_ping();
+                return 0;
+        case WDIOC_SETTIMEOUT:
+                if (get_user(booke_wdt_period, (u32 *) arg))
+                        return -EFAULT;
+                mtspr(SPRN_TCR, (mfspr(SPRN_TCR)&~WDTP(0))|WDTP(booke_wdt_period));
+                return 0;
+        case WDIOC_GETTIMEOUT:
+                return put_user(booke_wdt_period, (u32 *) arg);
+        case WDIOC_SETOPTIONS:
+                if (get_user(tmp, (u32 *) arg))
+                        return -EINVAL;
+                if (tmp == WDIOS_ENABLECARD) {
+                        booke_wdt_ping();
+                        break;
+                } else
+                        return -EINVAL;
+                return 0;
+        default:
+                return -ENOIOCTLCMD;
+        }
+
+        return 0;
+}
+/*
+ * booke_wdt_open:
+ */
+static int booke_wdt_open (struct inode *inode, struct file *file)
+{
+        if (booke_wdt_enabled == 0) {
+                booke_wdt_enabled = 1;
+                booke_wdt_enable();
+                printk (KERN_INFO "PowerPC Book-E Watchdog Timer Enabled (wdt_period=%d)\n",
+                                booke_wdt_period);
+        }
+
+        return 0;
+}
+
+static struct file_operations booke_wdt_fops = {
+  .owner = THIS_MODULE,
+  .llseek = no_llseek,
+  .write = booke_wdt_write,
+  .ioctl = booke_wdt_ioctl,
+  .open = booke_wdt_open,
+};
+
+static struct miscdevice booke_wdt_miscdev = {
+  .minor = WATCHDOG_MINOR,
+  .name = "watchdog",
+  .fops = &booke_wdt_fops,
+};
+
+static void __exit booke_wdt_exit(void)
+{
+        misc_deregister(&booke_wdt_miscdev);
+}
+
+/*
+ * booke_wdt_init:
+ */
+static int __init booke_wdt_init(void)
+{
+        int ret = 0;
+
+        printk (KERN_INFO "PowerPC Book-E Watchdog Timer Loaded\n");
+        ident.firmware_version = cpu_specs[0].pvr_value;
+
+        ret = misc_register(&booke_wdt_miscdev);
+        if (ret) {
+                printk (KERN_CRIT "Cannot register miscdev on minor=%d (err=%d)\n",
+                                WATCHDOG_MINOR, ret);
+                return ret;
+        }
+
+        if (booke_wdt_enabled == 1) {
+                printk (KERN_INFO "PowerPC Book-E Watchdog Timer Enabled (wdt_period=%d)\n",
+                                booke_wdt_period);
+                booke_wdt_enable();
+        }
+
+        return ret;
+}
+device_initcall(booke_wdt_init);
diff --git a/drivers/char/watchdog/ixp2000_wdt.c b/drivers/char/watchdog/ixp2000_wdt.c
index e7640bc4904..0cfb9b9c4a4 100644
--- a/drivers/char/watchdog/ixp2000_wdt.c
+++ b/drivers/char/watchdog/ixp2000_wdt.c
@@ -182,7 +182,7 @@ static struct file_operations ixp2000_wdt_fops =
 static struct miscdevice ixp2000_wdt_miscdev =
 {
         .minor          = WATCHDOG_MINOR,
-        .name           = "IXP2000 Watchdog",
+        .name           = "watchdog",
         .fops           = &ixp2000_wdt_fops,
 };
 
diff --git a/drivers/char/watchdog/ixp4xx_wdt.c b/drivers/char/watchdog/ixp4xx_wdt.c
index 8d916afbf4f..b5be8b11104 100644
--- a/drivers/char/watchdog/ixp4xx_wdt.c
+++ b/drivers/char/watchdog/ixp4xx_wdt.c
@@ -176,7 +176,7 @@ static struct file_operations ixp4xx_wdt_fops =
 static struct miscdevice ixp4xx_wdt_miscdev =
 {
         .minor          = WATCHDOG_MINOR,
-        .name           = "IXP4xx Watchdog",
+        .name           = "watchdog",
         .fops           = &ixp4xx_wdt_fops,
 };
 
diff --git a/drivers/char/watchdog/s3c2410_wdt.c b/drivers/char/watchdog/s3c2410_wdt.c
index f85ac898a49..8b292bf343c 100644
--- a/drivers/char/watchdog/s3c2410_wdt.c
+++ b/drivers/char/watchdog/s3c2410_wdt.c
@@ -27,7 +27,10 @@
  *                              Fixed tmr_count / wdt_count confusion
  *                              Added configurable debug
  *
- *      11-Jan-2004     BJD     Fixed divide-by-2 in timeout code
+ *      11-Jan-2005     BJD     Fixed divide-by-2 in timeout code
+ *
+ *      25-Jan-2005     DA      Added suspend/resume support
+ *                              Replaced reboot notifier with .shutdown method
  *
  *      10-Mar-2005     LCVR    Changed S3C2410_VA to S3C24XX_VA
 */
@@ -40,8 +43,6 @@
 #include <linux/miscdevice.h>
 #include <linux/watchdog.h>
 #include <linux/fs.h>
-#include <linux/notifier.h>
-#include <linux/reboot.h>
 #include <linux/init.h>
 #include <linux/device.h>
 #include <linux/interrupt.h>
@@ -317,20 +318,6 @@ static int s3c2410wdt_ioctl(struct inode *inode, struct file *file,
         }
 }
 
-/*
- *      Notifier for system down
- */
-
-static int s3c2410wdt_notify_sys(struct notifier_block *this, unsigned long code,
-                              void *unused)
-{
-        if(code==SYS_DOWN || code==SYS_HALT) {
-                /* Turn the WDT off */
-                s3c2410wdt_stop();
-        }
-        return NOTIFY_DONE;
-}
-
 /* kernel interface */
 
 static struct file_operations s3c2410wdt_fops = {
@@ -348,10 +335,6 @@ static struct miscdevice s3c2410wdt_miscdev = {
         .fops           = &s3c2410wdt_fops,
 };
 
-static struct notifier_block s3c2410wdt_notifier = {
-        .notifier_call  = s3c2410wdt_notify_sys,
-};
-
 /* interrupt handler code */
 
 static irqreturn_t s3c2410wdt_irq(int irqno, void *param,
@@ -432,18 +415,10 @@ static int s3c2410wdt_probe(struct device *dev)
                 }
         }
 
-        ret = register_reboot_notifier(&s3c2410wdt_notifier);
-        if (ret) {
-                printk (KERN_ERR PFX "cannot register reboot notifier (%d)\n",
-                        ret);
-                return ret;
-        }
-
         ret = misc_register(&s3c2410wdt_miscdev);
         if (ret) {
                 printk (KERN_ERR PFX "cannot register miscdev on minor=%d (%d)\n",
                         WATCHDOG_MINOR, ret);
-                unregister_reboot_notifier(&s3c2410wdt_notifier);
                 return ret;
         }
 
@@ -479,15 +454,63 @@ static int s3c2410wdt_remove(struct device *dev)
         return 0;
 }
 
+static void s3c2410wdt_shutdown(struct device *dev)
+{
+        s3c2410wdt_stop();      
+}
+
+#ifdef CONFIG_PM
+
+static unsigned long wtcon_save;
+static unsigned long wtdat_save;
+
+static int s3c2410wdt_suspend(struct device *dev, u32 state, u32 level)
+{
+        if (level == SUSPEND_POWER_DOWN) {
+                /* Save watchdog state, and turn it off. */
+                wtcon_save = readl(wdt_base + S3C2410_WTCON);
+                wtdat_save = readl(wdt_base + S3C2410_WTDAT);
+
+                /* Note that WTCNT doesn't need to be saved. */
+                s3c2410wdt_stop();
+        }
+
+        return 0;
+}
+
+static int s3c2410wdt_resume(struct device *dev, u32 level)
+{
+        if (level == RESUME_POWER_ON) {
+                /* Restore watchdog state. */
+
+                writel(wtdat_save, wdt_base + S3C2410_WTDAT);
+                writel(wtdat_save, wdt_base + S3C2410_WTCNT); /* Reset count */
+                writel(wtcon_save, wdt_base + S3C2410_WTCON);
+
+                printk(KERN_INFO PFX "watchdog %sabled\n",
+                       (wtcon_save & S3C2410_WTCON_ENABLE) ? "en" : "dis");
+        }
+
+        return 0;
+}
+
+#else
+#define s3c2410wdt_suspend NULL
+#define s3c2410wdt_resume  NULL
+#endif /* CONFIG_PM */
+
+
 static struct device_driver s3c2410wdt_driver = {
         .name           = "s3c2410-wdt",
         .bus            = &platform_bus_type,
         .probe          = s3c2410wdt_probe,
         .remove         = s3c2410wdt_remove,
+        .shutdown       = s3c2410wdt_shutdown,
+        .suspend        = s3c2410wdt_suspend,
+        .resume         = s3c2410wdt_resume,
 };
 
 
-
 static char banner[] __initdata = KERN_INFO "S3C2410 Watchdog Timer, (c) 2004 Simtec Electronics\n";
 
 static int __init watchdog_init(void)
@@ -499,13 +522,13 @@ static int __init watchdog_init(void)
 static void __exit watchdog_exit(void)
 {
         driver_unregister(&s3c2410wdt_driver);
-        unregister_reboot_notifier(&s3c2410wdt_notifier);
 }
 
 module_init(watchdog_init);
 module_exit(watchdog_exit);
 
-MODULE_AUTHOR("Ben Dooks <ben@simtec.co.uk>");
+MODULE_AUTHOR("Ben Dooks <ben@simtec.co.uk>, "
+              "Dimitry Andric <dimitry.andric@tomtom.com>");
 MODULE_DESCRIPTION("S3C2410 Watchdog Device Driver");
 MODULE_LICENSE("GPL");
 MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
diff --git a/drivers/char/watchdog/scx200_wdt.c b/drivers/char/watchdog/scx200_wdt.c
index c4568569f3a..b4a102a2d7e 100644
--- a/drivers/char/watchdog/scx200_wdt.c
+++ b/drivers/char/watchdog/scx200_wdt.c
@@ -206,7 +206,7 @@ static struct file_operations scx200_wdt_fops = {
 
 static struct miscdevice scx200_wdt_miscdev = {
         .minor = WATCHDOG_MINOR,
-        .name  = NAME,
+        .name  = "watchdog",
         .fops  = &scx200_wdt_fops,
 };
 
diff --git a/drivers/char/watchdog/softdog.c b/drivers/char/watchdog/softdog.c
index 4d7ed931f5c..20e5eb8667f 100644
--- a/drivers/char/watchdog/softdog.c
+++ b/drivers/char/watchdog/softdog.c
@@ -77,7 +77,7 @@ static void watchdog_fire(unsigned long);
 
 static struct timer_list watchdog_ticktock =
                 TIMER_INITIALIZER(watchdog_fire, 0, 0);
-static unsigned long timer_alive;
+static unsigned long driver_open, orphan_timer;
 static char expect_close;
 
 
@@ -87,6 +87,9 @@ static char expect_close;
 
 static void watchdog_fire(unsigned long data)
 {
+        if (test_and_clear_bit(0, &orphan_timer))
+                module_put(THIS_MODULE);
+
         if (soft_noboot)
                 printk(KERN_CRIT PFX "Triggered - Reboot ignored.\n");
         else
@@ -128,9 +131,9 @@ static int softdog_set_heartbeat(int t)
 
 static int softdog_open(struct inode *inode, struct file *file)
 {
-        if(test_and_set_bit(0, &timer_alive))
+        if (test_and_set_bit(0, &driver_open))
                 return -EBUSY;
-        if (nowayout)
+        if (!test_and_clear_bit(0, &orphan_timer))
                 __module_get(THIS_MODULE);
         /*
          *      Activate timer
@@ -147,11 +150,13 @@ static int softdog_release(struct inode *inode, struct file *file)
          */
         if (expect_close == 42) {
                 softdog_stop();
+                module_put(THIS_MODULE);
         } else {
                 printk(KERN_CRIT PFX "Unexpected close, not stopping watchdog!\n");
+                set_bit(0, &orphan_timer);
                 softdog_keepalive();
         }
-        clear_bit(0, &timer_alive);
+        clear_bit(0, &driver_open);
         expect_close = 0;
         return 0;
 }
diff --git a/drivers/char/watchdog/w83627hf_wdt.c b/drivers/char/watchdog/w83627hf_wdt.c
index 465e0fd0423..b5d82101542 100644
--- a/drivers/char/watchdog/w83627hf_wdt.c
+++ b/drivers/char/watchdog/w83627hf_wdt.c
@@ -93,6 +93,12 @@ w83627hf_init(void)
 
         w83627hf_select_wd_register();
 
+        outb_p(0xF6, WDT_EFER); /* Select CRF6 */
+        t=inb_p(WDT_EFDR);      /* read CRF6 */
+        if (t != 0) {
+                printk (KERN_INFO PFX "Watchdog already running. Resetting timeout to %d sec\n", timeout);
+                outb_p(timeout, WDT_EFDR);    /* Write back to CRF6 */
+        }
         outb_p(0xF5, WDT_EFER); /* Select CRF5 */
         t=inb_p(WDT_EFDR);      /* read CRF5 */
         t&=~0x0C;               /* set second mode & disable keyboard turning off watchdog */
diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig
index 5b29c3b2a33..327b58e6487 100644
--- a/drivers/firmware/Kconfig
+++ b/drivers/firmware/Kconfig
@@ -58,4 +58,31 @@ config EFI_PCDP
 
           See <http://www.dig64.org/specifications/DIG64_HCDPv20_042804.pdf>
 
+config DELL_RBU
+        tristate "BIOS update support for DELL systems via sysfs"
+        select FW_LOADER
+        help
+         Say m if you want to have the option of updating the BIOS for your
+         DELL system. Note you need a Dell OpenManage or Dell Update package (DUP)
+         supporting application to comunicate with the BIOS regarding the new
+         image for the image update to take effect.
+         See <file:Documentation/dell_rbu.txt> for more details on the driver.
+
+config DCDBAS
+        tristate "Dell Systems Management Base Driver"
+        depends on X86 || X86_64
+        default m
+        help
+          The Dell Systems Management Base Driver provides a sysfs interface
+          for systems management software to perform System Management
+          Interrupts (SMIs) and Host Control Actions (system power cycle or
+          power off after OS shutdown) on certain Dell systems.
+
+          See <file:Documentation/dcdbas.txt> for more details on the driver
+          and the Dell systems on which Dell systems management software makes
+          use of this driver.
+
+          Say Y or M here to enable the driver for use by Dell systems
+          management software such as Dell OpenManage.
+
 endmenu
diff --git a/drivers/firmware/Makefile b/drivers/firmware/Makefile
index 90fd0b26db8..85429979d0d 100644
--- a/drivers/firmware/Makefile
+++ b/drivers/firmware/Makefile
@@ -4,3 +4,5 @@
 obj-$(CONFIG_EDD)               += edd.o
 obj-$(CONFIG_EFI_VARS)          += efivars.o
 obj-$(CONFIG_EFI_PCDP)          += pcdp.o
+obj-$(CONFIG_DELL_RBU)          += dell_rbu.o
+obj-$(CONFIG_DCDBAS)            += dcdbas.o
diff --git a/drivers/firmware/dcdbas.c b/drivers/firmware/dcdbas.c
new file mode 100644
index 00000000000..955537fe995
--- /dev/null
+++ b/drivers/firmware/dcdbas.c
@@ -0,0 +1,596 @@
+/*
+ *  dcdbas.c: Dell Systems Management Base Driver
+ *
+ *  The Dell Systems Management Base Driver provides a sysfs interface for
+ *  systems management software to perform System Management Interrupts (SMIs)
+ *  and Host Control Actions (power cycle or power off after OS shutdown) on
+ *  Dell systems.
+ *
+ *  See Documentation/dcdbas.txt for more information.
+ *
+ *  Copyright (C) 1995-2005 Dell Inc.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License v2.0 as published by
+ *  the Free Software Foundation.
+ *
+ *  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/device.h>
+#include <linux/dma-mapping.h>
+#include <linux/errno.h>
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/mc146818rtc.h>
+#include <linux/module.h>
+#include <linux/reboot.h>
+#include <linux/sched.h>
+#include <linux/smp.h>
+#include <linux/spinlock.h>
+#include <linux/string.h>
+#include <linux/types.h>
+#include <asm/io.h>
+#include <asm/semaphore.h>
+
+#include "dcdbas.h"
+
+#define DRIVER_NAME             "dcdbas"
+#define DRIVER_VERSION          "5.6.0-1"
+#define DRIVER_DESCRIPTION      "Dell Systems Management Base Driver"
+
+static struct platform_device *dcdbas_pdev;
+
+static u8 *smi_data_buf;
+static dma_addr_t smi_data_buf_handle;
+static unsigned long smi_data_buf_size;
+static u32 smi_data_buf_phys_addr;
+static DECLARE_MUTEX(smi_data_lock);
+
+static unsigned int host_control_action;
+static unsigned int host_control_smi_type;
+static unsigned int host_control_on_shutdown;
+
+/**
+ * smi_data_buf_free: free SMI data buffer
+ */
+static void smi_data_buf_free(void)
+{
+        if (!smi_data_buf)
+                return;
+
+        dev_dbg(&dcdbas_pdev->dev, "%s: phys: %x size: %lu\n",
+                __FUNCTION__, smi_data_buf_phys_addr, smi_data_buf_size);
+
+        dma_free_coherent(&dcdbas_pdev->dev, smi_data_buf_size, smi_data_buf,
+                          smi_data_buf_handle);
+        smi_data_buf = NULL;
+        smi_data_buf_handle = 0;
+        smi_data_buf_phys_addr = 0;
+        smi_data_buf_size = 0;
+}
+
+/**
+ * smi_data_buf_realloc: grow SMI data buffer if needed
+ */
+static int smi_data_buf_realloc(unsigned long size)
+{
+        void *buf;
+        dma_addr_t handle;
+
+        if (smi_data_buf_size >= size)
+                return 0;
+
+        if (size > MAX_SMI_DATA_BUF_SIZE)
+                return -EINVAL;
+
+        /* new buffer is needed */
+        buf = dma_alloc_coherent(&dcdbas_pdev->dev, size, &handle, GFP_KERNEL);
+        if (!buf) {
+                dev_dbg(&dcdbas_pdev->dev,
+                        "%s: failed to allocate memory size %lu\n",
+                        __FUNCTION__, size);
+                return -ENOMEM;
+        }
+        /* memory zeroed by dma_alloc_coherent */
+
+        if (smi_data_buf)
+                memcpy(buf, smi_data_buf, smi_data_buf_size);
+
+        /* free any existing buffer */
+        smi_data_buf_free();
+
+        /* set up new buffer for use */
+        smi_data_buf = buf;
+        smi_data_buf_handle = handle;
+        smi_data_buf_phys_addr = (u32) virt_to_phys(buf);
+        smi_data_buf_size = size;
+
+        dev_dbg(&dcdbas_pdev->dev, "%s: phys: %x size: %lu\n",
+                __FUNCTION__, smi_data_buf_phys_addr, smi_data_buf_size);
+
+        return 0;
+}
+
+static ssize_t smi_data_buf_phys_addr_show(struct device *dev,
+                                           struct device_attribute *attr,
+                                           char *buf)
+{
+        return sprintf(buf, "%x\n", smi_data_buf_phys_addr);
+}
+
+static ssize_t smi_data_buf_size_show(struct device *dev,
+                                      struct device_attribute *attr,
+                                      char *buf)
+{
+        return sprintf(buf, "%lu\n", smi_data_buf_size);
+}
+
+static ssize_t smi_data_buf_size_store(struct device *dev,
+                                       struct device_attribute *attr,
+                                       const char *buf, size_t count)
+{
+        unsigned long buf_size;
+        ssize_t ret;
+
+        buf_size = simple_strtoul(buf, NULL, 10);
+
+        /* make sure SMI data buffer is at least buf_size */
+        down(&smi_data_lock);
+        ret = smi_data_buf_realloc(buf_size);
+        up(&smi_data_lock);
+        if (ret)
+                return ret;
+
+        return count;
+}
+
+static ssize_t smi_data_read(struct kobject *kobj, char *buf, loff_t pos,
+                             size_t count)
+{
+        size_t max_read;
+        ssize_t ret;
+
+        down(&smi_data_lock);
+
+        if (pos >= smi_data_buf_size) {
+                ret = 0;
+                goto out;
+        }
+
+        max_read = smi_data_buf_size - pos;
+        ret = min(max_read, count);
+        memcpy(buf, smi_data_buf + pos, ret);
+out:
+        up(&smi_data_lock);
+        return ret;
+}
+
+static ssize_t smi_data_write(struct kobject *kobj, char *buf, loff_t pos,
+                              size_t count)
+{
+        ssize_t ret;
+
+        down(&smi_data_lock);
+
+        ret = smi_data_buf_realloc(pos + count);
+        if (ret)
+                goto out;
+
+        memcpy(smi_data_buf + pos, buf, count);
+        ret = count;
+out:
+        up(&smi_data_lock);
+        return ret;
+}
+
+static ssize_t host_control_action_show(struct device *dev,
+                                        struct device_attribute *attr,
+                                        char *buf)
+{
+        return sprintf(buf, "%u\n", host_control_action);
+}
+
+static ssize_t host_control_action_store(struct device *dev,
+                                         struct device_attribute *attr,
+                                         const char *buf, size_t count)
+{
+        ssize_t ret;
+
+        /* make sure buffer is available for host control command */
+        down(&smi_data_lock);
+        ret = smi_data_buf_realloc(sizeof(struct apm_cmd));
+        up(&smi_data_lock);
+        if (ret)
+                return ret;
+
+        host_control_action = simple_strtoul(buf, NULL, 10);
+        return count;
+}
+
+static ssize_t host_control_smi_type_show(struct device *dev,
+                                          struct device_attribute *attr,
+                                          char *buf)
+{
+        return sprintf(buf, "%u\n", host_control_smi_type);
+}
+
+static ssize_t host_control_smi_type_store(struct device *dev,
+                                           struct device_attribute *attr,
+                                           const char *buf, size_t count)
+{
+        host_control_smi_type = simple_strtoul(buf, NULL, 10);
+        return count;
+}
+
+static ssize_t host_control_on_shutdown_show(struct device *dev,
+                                             struct device_attribute *attr,
+                                             char *buf)
+{
+        return sprintf(buf, "%u\n", host_control_on_shutdown);
+}
+
+static ssize_t host_control_on_shutdown_store(struct device *dev,
+                                              struct device_attribute *attr,
+                                              const char *buf, size_t count)
+{
+        host_control_on_shutdown = simple_strtoul(buf, NULL, 10);
+        return count;
+}
+
+/**
+ * smi_request: generate SMI request
+ *
+ * Called with smi_data_lock.
+ */
+static int smi_request(struct smi_cmd *smi_cmd)
+{
+        cpumask_t old_mask;
+        int ret = 0;
+
+        if (smi_cmd->magic != SMI_CMD_MAGIC) {
+                dev_info(&dcdbas_pdev->dev, "%s: invalid magic value\n",
+                         __FUNCTION__);
+                return -EBADR;
+        }
+
+        /* SMI requires CPU 0 */
+        old_mask = current->cpus_allowed;
+        set_cpus_allowed(current, cpumask_of_cpu(0));
+        if (smp_processor_id() != 0) {
+                dev_dbg(&dcdbas_pdev->dev, "%s: failed to get CPU 0\n",
+                        __FUNCTION__);
+                ret = -EBUSY;
+                goto out;
+        }
+
+        /* generate SMI */
+        asm volatile (
+                "outb %b0,%w1"
+                : /* no output args */
+                : "a" (smi_cmd->command_code),
+                  "d" (smi_cmd->command_address),
+                  "b" (smi_cmd->ebx),
+                  "c" (smi_cmd->ecx)
+                : "memory"
+        );
+
+out:
+        set_cpus_allowed(current, old_mask);
+        return ret;
+}
+
+/**
+ * smi_request_store:
+ *
+ * The valid values are:
+ * 0: zero SMI data buffer
+ * 1: generate calling interface SMI
+ * 2: generate raw SMI
+ *
+ * User application writes smi_cmd to smi_data before telling driver
+ * to generate SMI.
+ */
+static ssize_t smi_request_store(struct device *dev,
+                                 struct device_attribute *attr,
+                                 const char *buf, size_t count)
+{
+        struct smi_cmd *smi_cmd;
+        unsigned long val = simple_strtoul(buf, NULL, 10);
+        ssize_t ret;
+
+        down(&smi_data_lock);
+
+        if (smi_data_buf_size < sizeof(struct smi_cmd)) {
+                ret = -ENODEV;
+                goto out;
+        }
+        smi_cmd = (struct smi_cmd *)smi_data_buf;
+
+        switch (val) {
+        case 2:
+                /* Raw SMI */
+                ret = smi_request(smi_cmd);
+                if (!ret)
+                        ret = count;
+                break;
+        case 1:
+                /* Calling Interface SMI */
+                smi_cmd->ebx = (u32) virt_to_phys(smi_cmd->command_buffer);
+                ret = smi_request(smi_cmd);
+                if (!ret)
+                        ret = count;
+                break;
+        case 0:
+                memset(smi_data_buf, 0, smi_data_buf_size);
+                ret = count;
+                break;
+        default:
+                ret = -EINVAL;
+                break;
+        }
+
+out:
+        up(&smi_data_lock);
+        return ret;
+}
+
+/**
+ * host_control_smi: generate host control SMI
+ *
+ * Caller must set up the host control command in smi_data_buf.
+ */
+static int host_control_smi(void)
+{
+        struct apm_cmd *apm_cmd;
+        u8 *data;
+        unsigned long flags;
+        u32 num_ticks;
+        s8 cmd_status;
+        u8 index;
+
+        apm_cmd = (struct apm_cmd *)smi_data_buf;
+        apm_cmd->status = ESM_STATUS_CMD_UNSUCCESSFUL;
+
+        switch (host_control_smi_type) {
+        case HC_SMITYPE_TYPE1:
+                spin_lock_irqsave(&rtc_lock, flags);
+                /* write SMI data buffer physical address */
+                data = (u8 *)&smi_data_buf_phys_addr;
+                for (index = PE1300_CMOS_CMD_STRUCT_PTR;
+                     index < (PE1300_CMOS_CMD_STRUCT_PTR + 4);
+                     index++, data++) {
+                        outb(index,
+                             (CMOS_BASE_PORT + CMOS_PAGE2_INDEX_PORT_PIIX4));
+                        outb(*data,
+                             (CMOS_BASE_PORT + CMOS_PAGE2_DATA_PORT_PIIX4));
+                }
+
+                /* first set status to -1 as called by spec */
+                cmd_status = ESM_STATUS_CMD_UNSUCCESSFUL;
+                outb((u8) cmd_status, PCAT_APM_STATUS_PORT);
+
+                /* generate SMM call */
+                outb(ESM_APM_CMD, PCAT_APM_CONTROL_PORT);
+                spin_unlock_irqrestore(&rtc_lock, flags);
+
+                /* wait a few to see if it executed */
+                num_ticks = TIMEOUT_USEC_SHORT_SEMA_BLOCKING;
+                while ((cmd_status = inb(PCAT_APM_STATUS_PORT))
+                       == ESM_STATUS_CMD_UNSUCCESSFUL) {
+                        num_ticks--;
+                        if (num_ticks == EXPIRED_TIMER)
+                                return -ETIME;
+                }
+                break;
+
+        case HC_SMITYPE_TYPE2:
+        case HC_SMITYPE_TYPE3:
+                spin_lock_irqsave(&rtc_lock, flags);
+                /* write SMI data buffer physical address */
+                data = (u8 *)&smi_data_buf_phys_addr;
+                for (index = PE1400_CMOS_CMD_STRUCT_PTR;
+                     index < (PE1400_CMOS_CMD_STRUCT_PTR + 4);
+                     index++, data++) {
+                        outb(index, (CMOS_BASE_PORT + CMOS_PAGE1_INDEX_PORT));
+                        outb(*data, (CMOS_BASE_PORT + CMOS_PAGE1_DATA_PORT));
+                }
+
+                /* generate SMM call */
+                if (host_control_smi_type == HC_SMITYPE_TYPE3)
+                        outb(ESM_APM_CMD, PCAT_APM_CONTROL_PORT);
+                else
+                        outb(ESM_APM_CMD, PE1400_APM_CONTROL_PORT);
+
+                /* restore RTC index pointer since it was written to above */
+                CMOS_READ(RTC_REG_C);
+                spin_unlock_irqrestore(&rtc_lock, flags);
+
+                /* read control port back to serialize write */
+                cmd_status = inb(PE1400_APM_CONTROL_PORT);
+
+                /* wait a few to see if it executed */
+                num_ticks = TIMEOUT_USEC_SHORT_SEMA_BLOCKING;
+                while (apm_cmd->status == ESM_STATUS_CMD_UNSUCCESSFUL) {
+                        num_ticks--;
+                        if (num_ticks == EXPIRED_TIMER)
+                                return -ETIME;
+                }
+                break;
+
+        default:
+                dev_dbg(&dcdbas_pdev->dev, "%s: invalid SMI type %u\n",
+                        __FUNCTION__, host_control_smi_type);
+                return -ENOSYS;
+        }
+
+        return 0;
+}
+
+/**
+ * dcdbas_host_control: initiate host control
+ *
+ * This function is called by the driver after the system has
+ * finished shutting down if the user application specified a
+ * host control action to perform on shutdown.  It is safe to
+ * use smi_data_buf at this point because the system has finished
+ * shutting down and no userspace apps are running.
+ */
+static void dcdbas_host_control(void)
+{
+        struct apm_cmd *apm_cmd;
+        u8 action;
+
+        if (host_control_action == HC_ACTION_NONE)
+                return;
+
+        action = host_control_action;
+        host_control_action = HC_ACTION_NONE;
+
+        if (!smi_data_buf) {
+                dev_dbg(&dcdbas_pdev->dev, "%s: no SMI buffer\n", __FUNCTION__);
+                return;
+        }
+
+        if (smi_data_buf_size < sizeof(struct apm_cmd)) {
+                dev_dbg(&dcdbas_pdev->dev, "%s: SMI buffer too small\n",
+                        __FUNCTION__);
+                return;
+        }
+
+        apm_cmd = (struct apm_cmd *)smi_data_buf;
+
+        /* power off takes precedence */
+        if (action & HC_ACTION_HOST_CONTROL_POWEROFF) {
+                apm_cmd->command = ESM_APM_POWER_CYCLE;
+                apm_cmd->reserved = 0;
+                *((s16 *)&apm_cmd->parameters.shortreq.parm[0]) = (s16) 0;
+                host_control_smi();
+        } else if (action & HC_ACTION_HOST_CONTROL_POWERCYCLE) {
+                apm_cmd->command = ESM_APM_POWER_CYCLE;
+                apm_cmd->reserved = 0;
+                *((s16 *)&apm_cmd->parameters.shortreq.parm[0]) = (s16) 20;
+                host_control_smi();
+        }
+}
+
+/**
+ * dcdbas_reboot_notify: handle reboot notification for host control
+ */
+static int dcdbas_reboot_notify(struct notifier_block *nb, unsigned long code,
+                                void *unused)
+{
+        static unsigned int notify_cnt = 0;
+
+        switch (code) {
+        case SYS_DOWN:
+        case SYS_HALT:
+        case SYS_POWER_OFF:
+                if (host_control_on_shutdown) {
+                        /* firmware is going to perform host control action */
+                        if (++notify_cnt == 2) {
+                                printk(KERN_WARNING
+                                       "Please wait for shutdown "
+                                       "action to complete...\n");
+                                dcdbas_host_control();
+                        }
+                        /*
+                         * register again and initiate the host control
+                         * action on the second notification to allow
+                         * everyone that registered to be notified
+                         */
+                        register_reboot_notifier(nb);
+                }
+                break;
+        }
+
+        return NOTIFY_DONE;
+}
+
+static struct notifier_block dcdbas_reboot_nb = {
+        .notifier_call = dcdbas_reboot_notify,
+        .next = NULL,
+        .priority = 0
+};
+
+static DCDBAS_BIN_ATTR_RW(smi_data);
+
+static struct bin_attribute *dcdbas_bin_attrs[] = {
+        &bin_attr_smi_data,
+        NULL
+};
+
+static DCDBAS_DEV_ATTR_RW(smi_data_buf_size);
+static DCDBAS_DEV_ATTR_RO(smi_data_buf_phys_addr);
+static DCDBAS_DEV_ATTR_WO(smi_request);
+static DCDBAS_DEV_ATTR_RW(host_control_action);
+static DCDBAS_DEV_ATTR_RW(host_control_smi_type);
+static DCDBAS_DEV_ATTR_RW(host_control_on_shutdown);
+
+static struct device_attribute *dcdbas_dev_attrs[] = {
+        &dev_attr_smi_data_buf_size,
+        &dev_attr_smi_data_buf_phys_addr,
+        &dev_attr_smi_request,
+        &dev_attr_host_control_action,
+        &dev_attr_host_control_smi_type,
+        &dev_attr_host_control_on_shutdown,
+        NULL
+};
+
+/**
+ * dcdbas_init: initialize driver
+ */
+static int __init dcdbas_init(void)
+{
+        int i;
+
+        host_control_action = HC_ACTION_NONE;
+        host_control_smi_type = HC_SMITYPE_NONE;
+
+        dcdbas_pdev = platform_device_register_simple(DRIVER_NAME, -1, NULL, 0);
+        if (IS_ERR(dcdbas_pdev))
+                return PTR_ERR(dcdbas_pdev);
+
+        /*
+         * BIOS SMI calls require buffer addresses be in 32-bit address space.
+         * This is done by setting the DMA mask below.
+         */
+        dcdbas_pdev->dev.coherent_dma_mask = DMA_32BIT_MASK;
+        dcdbas_pdev->dev.dma_mask = &dcdbas_pdev->dev.coherent_dma_mask;
+
+        register_reboot_notifier(&dcdbas_reboot_nb);
+
+        for (i = 0; dcdbas_bin_attrs[i]; i++)
+                sysfs_create_bin_file(&dcdbas_pdev->dev.kobj,
+                                      dcdbas_bin_attrs[i]);
+
+        for (i = 0; dcdbas_dev_attrs[i]; i++)
+                device_create_file(&dcdbas_pdev->dev, dcdbas_dev_attrs[i]);
+
+        dev_info(&dcdbas_pdev->dev, "%s (version %s)\n",
+                 DRIVER_DESCRIPTION, DRIVER_VERSION);
+
+        return 0;
+}
+
+/**
+ * dcdbas_exit: perform driver cleanup
+ */
+static void __exit dcdbas_exit(void)
+{
+        platform_device_unregister(dcdbas_pdev);
+        unregister_reboot_notifier(&dcdbas_reboot_nb);
+        smi_data_buf_free();
+}
+
+module_init(dcdbas_init);
+module_exit(dcdbas_exit);
+
+MODULE_DESCRIPTION(DRIVER_DESCRIPTION " (version " DRIVER_VERSION ")");
+MODULE_VERSION(DRIVER_VERSION);
+MODULE_AUTHOR("Dell Inc.");
+MODULE_LICENSE("GPL");
+
diff --git a/drivers/firmware/dcdbas.h b/drivers/firmware/dcdbas.h
new file mode 100644
index 00000000000..58a85182b3e
--- /dev/null
+++ b/drivers/firmware/dcdbas.h
@@ -0,0 +1,107 @@
+/*
+ *  dcdbas.h: Definitions for Dell Systems Management Base driver
+ *
+ *  Copyright (C) 1995-2005 Dell Inc.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License v2.0 as published by
+ *  the Free Software Foundation.
+ *
+ *  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.
+ */
+
+#ifndef _DCDBAS_H_
+#define _DCDBAS_H_
+
+#include <linux/device.h>
+#include <linux/input.h>
+#include <linux/sysfs.h>
+#include <linux/types.h>
+
+#define MAX_SMI_DATA_BUF_SIZE                   (256 * 1024)
+
+#define HC_ACTION_NONE                          (0)
+#define HC_ACTION_HOST_CONTROL_POWEROFF         BIT(1)
+#define HC_ACTION_HOST_CONTROL_POWERCYCLE       BIT(2)
+
+#define HC_SMITYPE_NONE                         (0)
+#define HC_SMITYPE_TYPE1                        (1)
+#define HC_SMITYPE_TYPE2                        (2)
+#define HC_SMITYPE_TYPE3                        (3)
+
+#define ESM_APM_CMD                             (0x0A0)
+#define ESM_APM_POWER_CYCLE                     (0x10)
+#define ESM_STATUS_CMD_UNSUCCESSFUL             (-1)
+
+#define CMOS_BASE_PORT                          (0x070)
+#define CMOS_PAGE1_INDEX_PORT                   (0)
+#define CMOS_PAGE1_DATA_PORT                    (1)
+#define CMOS_PAGE2_INDEX_PORT_PIIX4             (2)
+#define CMOS_PAGE2_DATA_PORT_PIIX4              (3)
+#define PE1400_APM_CONTROL_PORT                 (0x0B0)
+#define PCAT_APM_CONTROL_PORT                   (0x0B2)
+#define PCAT_APM_STATUS_PORT                    (0x0B3)
+#define PE1300_CMOS_CMD_STRUCT_PTR              (0x38)
+#define PE1400_CMOS_CMD_STRUCT_PTR              (0x70)
+
+#define MAX_SYSMGMT_SHORTCMD_PARMBUF_LEN        (14)
+#define MAX_SYSMGMT_LONGCMD_SGENTRY_NUM         (16)
+
+#define TIMEOUT_USEC_SHORT_SEMA_BLOCKING        (10000)
+#define EXPIRED_TIMER                           (0)
+
+#define SMI_CMD_MAGIC                           (0x534D4931)
+
+#define DCDBAS_DEV_ATTR_RW(_name) \
+        DEVICE_ATTR(_name,0600,_name##_show,_name##_store);
+
+#define DCDBAS_DEV_ATTR_RO(_name) \
+        DEVICE_ATTR(_name,0400,_name##_show,NULL);
+
+#define DCDBAS_DEV_ATTR_WO(_name) \
+        DEVICE_ATTR(_name,0200,NULL,_name##_store);
+
+#define DCDBAS_BIN_ATTR_RW(_name) \
+struct bin_attribute bin_attr_##_name = { \
+        .attr =  { .name = __stringify(_name), \
+                   .mode = 0600, \
+                   .owner = THIS_MODULE }, \
+        .read =  _name##_read, \
+        .write = _name##_write, \
+}
+
+struct smi_cmd {
+        __u32 magic;
+        __u32 ebx;
+        __u32 ecx;
+        __u16 command_address;
+        __u8 command_code;
+        __u8 reserved;
+        __u8 command_buffer[1];
+} __attribute__ ((packed));
+
+struct apm_cmd {
+        __u8 command;
+        __s8 status;
+        __u16 reserved;
+        union {
+                struct {
+                        __u8 parm[MAX_SYSMGMT_SHORTCMD_PARMBUF_LEN];
+                } __attribute__ ((packed)) shortreq;
+
+                struct {
+                        __u16 num_sg_entries;
+                        struct {
+                                __u32 size;
+                                __u64 addr;
+                        } __attribute__ ((packed))
+                            sglist[MAX_SYSMGMT_LONGCMD_SGENTRY_NUM];
+                } __attribute__ ((packed)) longreq;
+        } __attribute__ ((packed)) parameters;
+} __attribute__ ((packed));
+
+#endif /* _DCDBAS_H_ */
+
diff --git a/drivers/firmware/dell_rbu.c b/drivers/firmware/dell_rbu.c
new file mode 100644
index 00000000000..3b865f34a09
--- /dev/null
+++ b/drivers/firmware/dell_rbu.c
@@ -0,0 +1,634 @@
+/*
+ * dell_rbu.c
+ * Bios Update driver for Dell systems
+ * Author: Dell Inc
+ *         Abhay Salunke <abhay_salunke@dell.com>
+ *
+ * Copyright (C) 2005 Dell Inc.
+ *
+ * Remote BIOS Update (rbu) driver is used for updating DELL BIOS by
+ * creating entries in the /sys file systems on Linux 2.6 and higher
+ * kernels. The driver supports two mechanism to update the BIOS namely
+ * contiguous and packetized. Both these methods still require having some
+ * application to set the CMOS bit indicating the BIOS to update itself
+ * after a reboot.
+ *
+ * Contiguous method:
+ * This driver writes the incoming data in a monolithic image by allocating
+ * contiguous physical pages large enough to accommodate the incoming BIOS
+ * image size.
+ *
+ * Packetized method:
+ * The driver writes the incoming packet image by allocating a new packet
+ * on every time the packet data is written. This driver requires an
+ * application to break the BIOS image in to fixed sized packet chunks.
+ *
+ * See Documentation/dell_rbu.txt for more info.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License v2.0 as published by
+ * the Free Software Foundation
+ *
+ * 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/version.h>
+#include <linux/config.h>
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/string.h>
+#include <linux/errno.h>
+#include <linux/blkdev.h>
+#include <linux/device.h>
+#include <linux/spinlock.h>
+#include <linux/moduleparam.h>
+#include <linux/firmware.h>
+#include <linux/dma-mapping.h>
+
+MODULE_AUTHOR("Abhay Salunke <abhay_salunke@dell.com>");
+MODULE_DESCRIPTION("Driver for updating BIOS image on DELL systems");
+MODULE_LICENSE("GPL");
+MODULE_VERSION("1.0");
+
+#define BIOS_SCAN_LIMIT 0xffffffff
+#define MAX_IMAGE_LENGTH 16
+static struct _rbu_data {
+        void *image_update_buffer;
+        unsigned long image_update_buffer_size;
+        unsigned long bios_image_size;
+        int image_update_ordernum;
+        int dma_alloc;
+        spinlock_t lock;
+        unsigned long packet_read_count;
+        unsigned long packet_write_count;
+        unsigned long num_packets;
+        unsigned long packetsize;
+} rbu_data;
+
+static char image_type[MAX_IMAGE_LENGTH] = "mono";
+module_param_string(image_type, image_type, sizeof(image_type), 0);
+MODULE_PARM_DESC(image_type, "BIOS image type. choose- mono or packet");
+
+struct packet_data {
+        struct list_head list;
+        size_t length;
+        void *data;
+        int ordernum;
+};
+
+static struct packet_data packet_data_head;
+
+static struct platform_device *rbu_device;
+static int context;
+static dma_addr_t dell_rbu_dmaaddr;
+
+static void init_packet_head(void)
+{
+        INIT_LIST_HEAD(&packet_data_head.list);
+        rbu_data.packet_write_count = 0;
+        rbu_data.packet_read_count = 0;
+        rbu_data.num_packets = 0;
+        rbu_data.packetsize = 0;
+}
+
+static int fill_last_packet(void *data, size_t length)
+{
+        struct list_head *ptemp_list;
+        struct packet_data *packet = NULL;
+        int packet_count = 0;
+
+        pr_debug("fill_last_packet: entry \n");
+
+        if (!rbu_data.num_packets) {
+                pr_debug("fill_last_packet: num_packets=0\n");
+                return -ENOMEM;
+        }
+
+        packet_count = rbu_data.num_packets;
+
+        ptemp_list = (&packet_data_head.list)->prev;
+
+        packet = list_entry(ptemp_list, struct packet_data, list);
+
+        if ((rbu_data.packet_write_count + length) > rbu_data.packetsize) {
+                pr_debug("dell_rbu:%s: packet size data "
+                         "overrun\n", __FUNCTION__);
+                return -EINVAL;
+        }
+
+        pr_debug("fill_last_packet : buffer = %p\n", packet->data);
+
+        memcpy((packet->data + rbu_data.packet_write_count), data, length);
+
+        if ((rbu_data.packet_write_count + length) == rbu_data.packetsize) {
+                /*
+                 * this was the last data chunk in the packet
+                 * so reinitialize the packet data counter to zero
+                 */
+                rbu_data.packet_write_count = 0;
+        } else
+                rbu_data.packet_write_count += length;
+
+        pr_debug("fill_last_packet: exit \n");
+        return 0;
+}
+
+static int create_packet(size_t length)
+{
+        struct packet_data *newpacket;
+        int ordernum = 0;
+
+        pr_debug("create_packet: entry \n");
+
+        if (!rbu_data.packetsize) {
+                pr_debug("create_packet: packetsize not specified\n");
+                return -EINVAL;
+        }
+
+        newpacket = kmalloc(sizeof(struct packet_data), GFP_KERNEL);
+        if (!newpacket) {
+                printk(KERN_WARNING
+                       "dell_rbu:%s: failed to allocate new "
+                       "packet\n", __FUNCTION__);
+                return -ENOMEM;
+        }
+
+        ordernum = get_order(length);
+        /*
+         * there is no upper limit on memory
+         * address for packetized mechanism
+         */
+        newpacket->data = (unsigned char *)__get_free_pages(GFP_KERNEL,
+                                                            ordernum);
+
+        pr_debug("create_packet: newpacket %p\n", newpacket->data);
+
+        if (!newpacket->data) {
+                printk(KERN_WARNING
+                       "dell_rbu:%s: failed to allocate new "
+                       "packet\n", __FUNCTION__);
+                kfree(newpacket);
+                return -ENOMEM;
+        }
+
+        newpacket->ordernum = ordernum;
+        ++rbu_data.num_packets;
+        /*
+         * initialize the newly created packet headers
+         */
+        INIT_LIST_HEAD(&newpacket->list);
+        list_add_tail(&newpacket->list, &packet_data_head.list);
+        /*
+         * packets have fixed size
+         */
+        newpacket->length = rbu_data.packetsize;
+
+        pr_debug("create_packet: exit \n");
+
+        return 0;
+}
+
+static int packetize_data(void *data, size_t length)
+{
+        int rc = 0;
+
+        if (!rbu_data.packet_write_count) {
+                if ((rc = create_packet(length)))
+                        return rc;
+        }
+        if ((rc = fill_last_packet(data, length)))
+                return rc;
+
+        return rc;
+}
+
+static int
+do_packet_read(char *data, struct list_head *ptemp_list,
+               int length, int bytes_read, int *list_read_count)
+{
+        void *ptemp_buf;
+        struct packet_data *newpacket = NULL;
+        int bytes_copied = 0;
+        int j = 0;
+
+        newpacket = list_entry(ptemp_list, struct packet_data, list);
+        *list_read_count += newpacket->length;
+
+        if (*list_read_count > bytes_read) {
+                /* point to the start of unread data */
+                j = newpacket->length - (*list_read_count - bytes_read);
+                /* point to the offset in the packet buffer */
+                ptemp_buf = (u8 *) newpacket->data + j;
+                /*
+                 * check if there is enough room in
+                 * * the incoming buffer
+                 */
+                if (length > (*list_read_count - bytes_read))
+                        /*
+                         * copy what ever is there in this
+                         * packet and move on
+                         */
+                        bytes_copied = (*list_read_count - bytes_read);
+                else
+                        /* copy the remaining */
+                        bytes_copied = length;
+                memcpy(data, ptemp_buf, bytes_copied);
+        }
+        return bytes_copied;
+}
+
+static int packet_read_list(char *data, size_t * pread_length)
+{
+        struct list_head *ptemp_list;
+        int temp_count = 0;
+        int bytes_copied = 0;
+        int bytes_read = 0;
+        int remaining_bytes = 0;
+        char *pdest = data;
+
+        /* check if we have any packets */
+        if (0 == rbu_data.num_packets)
+                return -ENOMEM;
+
+        remaining_bytes = *pread_length;
+        bytes_read = rbu_data.packet_read_count;
+
+        ptemp_list = (&packet_data_head.list)->next;
+        while (!list_empty(ptemp_list)) {
+                bytes_copied = do_packet_read(pdest, ptemp_list,
+                                              remaining_bytes, bytes_read,
+                                              &temp_count);
+                remaining_bytes -= bytes_copied;
+                bytes_read += bytes_copied;
+                pdest += bytes_copied;
+                /*
+                 * check if we reached end of buffer before reaching the
+                 * last packet
+                 */
+                if (remaining_bytes == 0)
+                        break;
+
+                ptemp_list = ptemp_list->next;
+        }
+        /*finally set the bytes read */
+        *pread_length = bytes_read - rbu_data.packet_read_count;
+        rbu_data.packet_read_count = bytes_read;
+        return 0;
+}
+
+static void packet_empty_list(void)
+{
+        struct list_head *ptemp_list;
+        struct list_head *pnext_list;
+        struct packet_data *newpacket;
+
+        ptemp_list = (&packet_data_head.list)->next;
+        while (!list_empty(ptemp_list)) {
+                newpacket =
+                    list_entry(ptemp_list, struct packet_data, list);
+                pnext_list = ptemp_list->next;
+                list_del(ptemp_list);
+                ptemp_list = pnext_list;
+                /*
+                 * zero out the RBU packet memory before freeing
+                 * to make sure there are no stale RBU packets left in memory
+                 */
+                memset(newpacket->data, 0, rbu_data.packetsize);
+                free_pages((unsigned long)newpacket->data,
+                           newpacket->ordernum);
+                kfree(newpacket);
+        }
+        rbu_data.packet_write_count = 0;
+        rbu_data.packet_read_count = 0;
+        rbu_data.num_packets = 0;
+        rbu_data.packetsize = 0;
+}
+
+/*
+ * img_update_free: Frees the buffer allocated for storing BIOS image
+ * Always called with lock held and returned with lock held
+ */
+static void img_update_free(void)
+{
+        if (!rbu_data.image_update_buffer)
+                return;
+        /*
+         * zero out this buffer before freeing it to get rid of any stale
+         * BIOS image copied in memory.
+         */
+        memset(rbu_data.image_update_buffer, 0,
+               rbu_data.image_update_buffer_size);
+        if (rbu_data.dma_alloc == 1)
+                dma_free_coherent(NULL, rbu_data.bios_image_size,
+                                  rbu_data.image_update_buffer,
+                                  dell_rbu_dmaaddr);
+        else
+                free_pages((unsigned long)rbu_data.image_update_buffer,
+                           rbu_data.image_update_ordernum);
+
+        /*
+         * Re-initialize the rbu_data variables after a free
+         */
+        rbu_data.image_update_ordernum = -1;
+        rbu_data.image_update_buffer = NULL;
+        rbu_data.image_update_buffer_size = 0;
+        rbu_data.bios_image_size = 0;
+        rbu_data.dma_alloc = 0;
+}
+
+/*
+ * img_update_realloc: This function allocates the contiguous pages to
+ * accommodate the requested size of data. The memory address and size
+ * values are stored globally and on every call to this function the new
+ * size is checked to see if more data is required than the existing size.
+ * If true the previous memory is freed and new allocation is done to
+ * accommodate the new size. If the incoming size is less then than the
+ * already allocated size, then that memory is reused. This function is
+ * called with lock held and returns with lock held.
+ */
+static int img_update_realloc(unsigned long size)
+{
+        unsigned char *image_update_buffer = NULL;
+        unsigned long rc;
+        unsigned long img_buf_phys_addr;
+        int ordernum;
+        int dma_alloc = 0;
+
+        /*
+         * check if the buffer of sufficient size has been
+         * already allocated
+         */
+        if (rbu_data.image_update_buffer_size >= size) {
+                /*
+                 * check for corruption
+                 */
+                if ((size != 0) && (rbu_data.image_update_buffer == NULL)) {
+                        printk(KERN_ERR "dell_rbu:%s: corruption "
+                               "check failed\n", __FUNCTION__);
+                        return -EINVAL;
+                }
+                /*
+                 * we have a valid pre-allocated buffer with
+                 * sufficient size
+                 */
+                return 0;
+        }
+
+        /*
+         * free any previously allocated buffer
+         */
+        img_update_free();
+
+        spin_unlock(&rbu_data.lock);
+
+        ordernum = get_order(size);
+        image_update_buffer =
+            (unsigned char *)__get_free_pages(GFP_KERNEL, ordernum);
+
+        img_buf_phys_addr =
+            (unsigned long)virt_to_phys(image_update_buffer);
+
+        if (img_buf_phys_addr > BIOS_SCAN_LIMIT) {
+                free_pages((unsigned long)image_update_buffer, ordernum);
+                ordernum = -1;
+                image_update_buffer = dma_alloc_coherent(NULL, size,
+                                                         &dell_rbu_dmaaddr,
+                                                         GFP_KERNEL);
+                dma_alloc = 1;
+        }
+
+        spin_lock(&rbu_data.lock);
+
+        if (image_update_buffer != NULL) {
+                rbu_data.image_update_buffer = image_update_buffer;
+                rbu_data.image_update_buffer_size = size;
+                rbu_data.bios_image_size =
+                    rbu_data.image_update_buffer_size;
+                rbu_data.image_update_ordernum = ordernum;
+                rbu_data.dma_alloc = dma_alloc;
+                rc = 0;
+        } else {
+                pr_debug("Not enough memory for image update:"
+                         "size = %ld\n", size);
+                rc = -ENOMEM;
+        }
+
+        return rc;
+}
+
+static ssize_t read_packet_data(char *buffer, loff_t pos, size_t count)
+{
+        int retval;
+        size_t bytes_left;
+        size_t data_length;
+        char *ptempBuf = buffer;
+        unsigned long imagesize;
+
+        /* check to see if we have something to return */
+        if (rbu_data.num_packets == 0) {
+                pr_debug("read_packet_data: no packets written\n");
+                retval = -ENOMEM;
+                goto read_rbu_data_exit;
+        }
+
+        imagesize = rbu_data.num_packets * rbu_data.packetsize;
+
+        if (pos > imagesize) {
+                retval = 0;
+                printk(KERN_WARNING "dell_rbu:read_packet_data: "
+                       "data underrun\n");
+                goto read_rbu_data_exit;
+        }
+
+        bytes_left = imagesize - pos;
+        data_length = min(bytes_left, count);
+
+        if ((retval = packet_read_list(ptempBuf, &data_length)) < 0)
+                goto read_rbu_data_exit;
+
+        if ((pos + count) > imagesize) {
+                rbu_data.packet_read_count = 0;
+                /* this was the last copy */
+                retval = bytes_left;
+        } else
+                retval = count;
+
+      read_rbu_data_exit:
+        return retval;
+}
+
+static ssize_t read_rbu_mono_data(char *buffer, loff_t pos, size_t count)
+{
+        unsigned char *ptemp = NULL;
+        size_t bytes_left = 0;
+        size_t data_length = 0;
+        ssize_t ret_count = 0;
+
+        /* check to see if we have something to return */
+        if ((rbu_data.image_update_buffer == NULL) ||
+            (rbu_data.bios_image_size == 0)) {
+                pr_debug("read_rbu_data_mono: image_update_buffer %p ,"
+                         "bios_image_size %lu\n",
+                         rbu_data.image_update_buffer,
+                         rbu_data.bios_image_size);
+                ret_count = -ENOMEM;
+                goto read_rbu_data_exit;
+        }
+
+        if (pos > rbu_data.bios_image_size) {
+                ret_count = 0;
+                goto read_rbu_data_exit;
+        }
+
+        bytes_left = rbu_data.bios_image_size - pos;
+        data_length = min(bytes_left, count);
+
+        ptemp = rbu_data.image_update_buffer;
+        memcpy(buffer, (ptemp + pos), data_length);
+
+        if ((pos + count) > rbu_data.bios_image_size)
+                /* this was the last copy */
+                ret_count = bytes_left;
+        else
+                ret_count = count;
+      read_rbu_data_exit:
+        return ret_count;
+}
+
+static ssize_t
+read_rbu_data(struct kobject *kobj, char *buffer, loff_t pos, size_t count)
+{
+        ssize_t ret_count = 0;
+
+        spin_lock(&rbu_data.lock);
+
+        if (!strcmp(image_type, "mono"))
+                ret_count = read_rbu_mono_data(buffer, pos, count);
+        else if (!strcmp(image_type, "packet"))
+                ret_count = read_packet_data(buffer, pos, count);
+        else
+                pr_debug("read_rbu_data: invalid image type specified\n");
+
+        spin_unlock(&rbu_data.lock);
+        return ret_count;
+}
+
+static ssize_t
+read_rbu_image_type(struct kobject *kobj, char *buffer, loff_t pos,
+                    size_t count)
+{
+        int size = 0;
+        if (!pos)
+                size = sprintf(buffer, "%s\n", image_type);
+        return size;
+}
+
+static ssize_t
+write_rbu_image_type(struct kobject *kobj, char *buffer, loff_t pos,
+                     size_t count)
+{
+        int rc = count;
+        spin_lock(&rbu_data.lock);
+
+        if (strlen(buffer) < MAX_IMAGE_LENGTH)
+                sscanf(buffer, "%s", image_type);
+        else
+                printk(KERN_WARNING "dell_rbu: image_type is invalid"
+                       "max chars = %d, \n incoming str--%s-- \n",
+                       MAX_IMAGE_LENGTH, buffer);
+
+        /* we must free all previous allocations */
+        packet_empty_list();
+        img_update_free();
+
+        spin_unlock(&rbu_data.lock);
+        return rc;
+
+}
+
+static struct bin_attribute rbu_data_attr = {
+        .attr = {.name = "data",.owner = THIS_MODULE,.mode = 0444},
+        .read = read_rbu_data,
+};
+
+static struct bin_attribute rbu_image_type_attr = {
+        .attr = {.name = "image_type",.owner = THIS_MODULE,.mode = 0644},
+        .read = read_rbu_image_type,
+        .write = write_rbu_image_type,
+};
+
+static void callbackfn_rbu(const struct firmware *fw, void *context)
+{
+        int rc = 0;
+
+        if (!fw || !fw->size)
+                return;
+
+        spin_lock(&rbu_data.lock);
+        if (!strcmp(image_type, "mono")) {
+                if (!img_update_realloc(fw->size))
+                        memcpy(rbu_data.image_update_buffer,
+                               fw->data, fw->size);
+        } else if (!strcmp(image_type, "packet")) {
+                if (!rbu_data.packetsize)
+                        rbu_data.packetsize = fw->size;
+                else if (rbu_data.packetsize != fw->size) {
+                        packet_empty_list();
+                        rbu_data.packetsize = fw->size;
+                }
+                packetize_data(fw->data, fw->size);
+        } else
+                pr_debug("invalid image type specified.\n");
+        spin_unlock(&rbu_data.lock);
+
+        rc = request_firmware_nowait(THIS_MODULE, FW_ACTION_NOHOTPLUG,
+                                     "dell_rbu", &rbu_device->dev,
+                                     &context, callbackfn_rbu);
+        if (rc)
+                printk(KERN_ERR
+                       "dell_rbu:%s request_firmware_nowait failed"
+                       " %d\n", __FUNCTION__, rc);
+}
+
+static int __init dcdrbu_init(void)
+{
+        int rc = 0;
+        spin_lock_init(&rbu_data.lock);
+
+        init_packet_head();
+        rbu_device =
+            platform_device_register_simple("dell_rbu", -1, NULL, 0);
+        if (!rbu_device) {
+                printk(KERN_ERR
+                       "dell_rbu:%s:platform_device_register_simple "
+                       "failed\n", __FUNCTION__);
+                return -EIO;
+        }
+
+        sysfs_create_bin_file(&rbu_device->dev.kobj, &rbu_data_attr);
+        sysfs_create_bin_file(&rbu_device->dev.kobj, &rbu_image_type_attr);
+
+        rc = request_firmware_nowait(THIS_MODULE, FW_ACTION_NOHOTPLUG,
+                                     "dell_rbu", &rbu_device->dev,
+                                     &context, callbackfn_rbu);
+        if (rc)
+                printk(KERN_ERR "dell_rbu:%s:request_firmware_nowait"
+                       " failed %d\n", __FUNCTION__, rc);
+
+        return rc;
+
+}
+
+static __exit void dcdrbu_exit(void)
+{
+        spin_lock(&rbu_data.lock);
+        packet_empty_list();
+        img_update_free();
+        spin_unlock(&rbu_data.lock);
+        platform_device_unregister(rbu_device);
+}
+
+module_exit(dcdrbu_exit);
+module_init(dcdrbu_init);
diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index 140d5f851a5..138dc50270e 100644
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -12,12 +12,20 @@ config HWMON
           of a system. Most modern motherboards include such a device. It
           can include temperature sensors, voltage sensors, fan speed
           sensors and various additional features such as the ability to
-          control the speed of the fans.
+          control the speed of the fans.  If you want this support you
+          should say Y here and also to the specific driver(s) for your
+          sensors chip(s) below.
+
+          This support can also be built as a module.  If so, the module
+          will be called hwmon.
+
+config HWMON_VID
+        tristate
+        default n
 
 config SENSORS_ADM1021
         tristate "Analog Devices ADM1021 and compatibles"
         depends on HWMON && I2C
-        select I2C_SENSOR
         help
           If you say yes here you get support for Analog Devices ADM1021
           and ADM1023 sensor chips and clones: Maxim MAX1617 and MAX1617A,
@@ -30,7 +38,7 @@ config SENSORS_ADM1021
 config SENSORS_ADM1025
         tristate "Analog Devices ADM1025 and compatibles"
         depends on HWMON && I2C && EXPERIMENTAL
-        select I2C_SENSOR
+        select HWMON_VID
         help
           If you say yes here you get support for Analog Devices ADM1025
           and Philips NE1619 sensor chips.
@@ -41,7 +49,7 @@ config SENSORS_ADM1025
 config SENSORS_ADM1026
         tristate "Analog Devices ADM1026 and compatibles"
         depends on HWMON && I2C && EXPERIMENTAL
-        select I2C_SENSOR
+        select HWMON_VID
         help
           If you say yes here you get support for Analog Devices ADM1026
           sensor chip.
@@ -52,7 +60,6 @@ config SENSORS_ADM1026
 config SENSORS_ADM1031
         tristate "Analog Devices ADM1031 and compatibles"
         depends on HWMON && I2C && EXPERIMENTAL
-        select I2C_SENSOR
         help
           If you say yes here you get support for Analog Devices ADM1031
           and ADM1030 sensor chips.
@@ -63,7 +70,7 @@ config SENSORS_ADM1031
 config SENSORS_ADM9240
         tristate "Analog Devices ADM9240 and compatibles"
         depends on HWMON && I2C && EXPERIMENTAL
-        select I2C_SENSOR
+        select HWMON_VID
         help
           If you say yes here you get support for Analog Devices ADM9240,
           Dallas DS1780, National Semiconductor LM81 sensor chips.
@@ -74,7 +81,7 @@ config SENSORS_ADM9240
 config SENSORS_ASB100
         tristate "Asus ASB100 Bach"
         depends on HWMON && I2C && EXPERIMENTAL
-        select I2C_SENSOR
+        select HWMON_VID
         help
           If you say yes here you get support for the ASB100 Bach sensor
           chip found on some Asus mainboards.
@@ -85,7 +92,7 @@ config SENSORS_ASB100
 config SENSORS_ATXP1
         tristate "Attansic ATXP1 VID controller"
         depends on HWMON && I2C && EXPERIMENTAL
-        select I2C_SENSOR
+        select HWMON_VID
         help
           If you say yes here you get support for the Attansic ATXP1 VID
           controller.
@@ -99,7 +106,6 @@ config SENSORS_ATXP1
 config SENSORS_DS1621
         tristate "Dallas Semiconductor DS1621 and DS1625"
         depends on HWMON && I2C && EXPERIMENTAL
-        select I2C_SENSOR
         help
           If you say yes here you get support for Dallas Semiconductor
           DS1621 and DS1625 sensor chips.
@@ -110,7 +116,6 @@ config SENSORS_DS1621
 config SENSORS_FSCHER
         tristate "FSC Hermes"
         depends on HWMON && I2C && EXPERIMENTAL
-        select I2C_SENSOR
         help
           If you say yes here you get support for Fujitsu Siemens
           Computers Hermes sensor chips.
@@ -121,7 +126,6 @@ config SENSORS_FSCHER
 config SENSORS_FSCPOS
         tristate "FSC Poseidon"
         depends on HWMON && I2C && EXPERIMENTAL
-        select I2C_SENSOR
         help
           If you say yes here you get support for Fujitsu Siemens
           Computers Poseidon sensor chips.
@@ -132,7 +136,6 @@ config SENSORS_FSCPOS
 config SENSORS_GL518SM
         tristate "Genesys Logic GL518SM"
         depends on HWMON && I2C
-        select I2C_SENSOR
         help
           If you say yes here you get support for Genesys Logic GL518SM
           sensor chips.
@@ -143,7 +146,7 @@ config SENSORS_GL518SM
 config SENSORS_GL520SM
         tristate "Genesys Logic GL520SM"
         depends on HWMON && I2C && EXPERIMENTAL
-        select I2C_SENSOR
+        select HWMON_VID
         help
           If you say yes here you get support for Genesys Logic GL520SM
           sensor chips.
@@ -154,7 +157,8 @@ config SENSORS_GL520SM
 config SENSORS_IT87
         tristate "ITE IT87xx and compatibles"
         depends on HWMON && I2C
-        select I2C_SENSOR
+        select I2C_ISA
+        select HWMON_VID
         help
           If you say yes here you get support for ITE IT87xx sensor chips
           and clones: SiS960.
@@ -165,7 +169,6 @@ config SENSORS_IT87
 config SENSORS_LM63
         tristate "National Semiconductor LM63"
         depends on HWMON && I2C && EXPERIMENTAL
-        select I2C_SENSOR
         help
           If you say yes here you get support for the National Semiconductor
           LM63 remote diode digital temperature sensor with integrated fan
@@ -178,7 +181,6 @@ config SENSORS_LM63
 config SENSORS_LM75
         tristate "National Semiconductor LM75 and compatibles"
         depends on HWMON && I2C
-        select I2C_SENSOR
         help
           If you say yes here you get support for National Semiconductor LM75
           sensor chips and clones: Dallas Semiconductor DS75 and DS1775 (in
@@ -194,7 +196,6 @@ config SENSORS_LM75
 config SENSORS_LM77
         tristate "National Semiconductor LM77"
         depends on HWMON && I2C && EXPERIMENTAL
-        select I2C_SENSOR
         help
           If you say yes here you get support for National Semiconductor LM77
           sensor chips.
@@ -205,7 +206,8 @@ config SENSORS_LM77
 config SENSORS_LM78
         tristate "National Semiconductor LM78 and compatibles"
         depends on HWMON && I2C && EXPERIMENTAL
-        select I2C_SENSOR
+        select I2C_ISA
+        select HWMON_VID
         help
           If you say yes here you get support for National Semiconductor LM78,
           LM78-J and LM79.
@@ -216,7 +218,6 @@ config SENSORS_LM78
 config SENSORS_LM80
         tristate "National Semiconductor LM80"
         depends on HWMON && I2C && EXPERIMENTAL
-        select I2C_SENSOR
         help
           If you say yes here you get support for National Semiconductor
           LM80 sensor chips.
@@ -227,7 +228,6 @@ config SENSORS_LM80
 config SENSORS_LM83
         tristate "National Semiconductor LM83"
         depends on HWMON && I2C
-        select I2C_SENSOR
         help
           If you say yes here you get support for National Semiconductor
           LM83 sensor chips.
@@ -238,7 +238,7 @@ config SENSORS_LM83
 config SENSORS_LM85
         tristate "National Semiconductor LM85 and compatibles"
         depends on HWMON && I2C && EXPERIMENTAL
-        select I2C_SENSOR
+        select HWMON_VID
         help
           If you say yes here you get support for National Semiconductor LM85
           sensor chips and clones: ADT7463, EMC6D100, EMC6D102 and ADM1027.
@@ -249,7 +249,7 @@ config SENSORS_LM85
 config SENSORS_LM87
         tristate "National Semiconductor LM87"
         depends on HWMON && I2C && EXPERIMENTAL
-        select I2C_SENSOR
+        select HWMON_VID
         help
           If you say yes here you get support for National Semiconductor LM87
           sensor chips.
@@ -260,7 +260,6 @@ config SENSORS_LM87
 config SENSORS_LM90
         tristate "National Semiconductor LM90 and compatibles"
         depends on HWMON && I2C
-        select I2C_SENSOR
         help
           If you say yes here you get support for National Semiconductor LM90,
           LM86, LM89 and LM99, Analog Devices ADM1032 and Maxim MAX6657 and
@@ -275,7 +274,6 @@ config SENSORS_LM90
 config SENSORS_LM92
         tristate "National Semiconductor LM92 and compatibles"
         depends on HWMON && I2C && EXPERIMENTAL
-        select I2C_SENSOR
         help
           If you say yes here you get support for National Semiconductor LM92
           and Maxim MAX6635 sensor chips.
@@ -286,7 +284,6 @@ config SENSORS_LM92
 config SENSORS_MAX1619
         tristate "Maxim MAX1619 sensor chip"
         depends on HWMON && I2C && EXPERIMENTAL
-        select I2C_SENSOR
         help
           If you say yes here you get support for MAX1619 sensor chip.
 
@@ -296,8 +293,8 @@ config SENSORS_MAX1619
 config SENSORS_PC87360
         tristate "National Semiconductor PC87360 family"
         depends on HWMON && I2C && EXPERIMENTAL
-        select I2C_SENSOR
         select I2C_ISA
+        select HWMON_VID
         help
           If you say yes here you get access to the hardware monitoring
           functions of the National Semiconductor PC8736x Super-I/O chips.
@@ -311,7 +308,6 @@ config SENSORS_PC87360
 config SENSORS_SIS5595
         tristate "Silicon Integrated Systems Corp. SiS5595"
         depends on HWMON && I2C && PCI && EXPERIMENTAL
-        select I2C_SENSOR
         select I2C_ISA
         help
           If you say yes here you get support for the integrated sensors in
@@ -323,7 +319,6 @@ config SENSORS_SIS5595
 config SENSORS_SMSC47M1
         tristate "SMSC LPC47M10x and compatibles"
         depends on HWMON && I2C && EXPERIMENTAL
-        select I2C_SENSOR
         select I2C_ISA
         help
           If you say yes here you get support for the integrated fan
@@ -336,7 +331,6 @@ config SENSORS_SMSC47M1
 config SENSORS_SMSC47B397
         tristate "SMSC LPC47B397-NC"
         depends on HWMON && I2C && EXPERIMENTAL
-        select I2C_SENSOR
         select I2C_ISA
         help
           If you say yes here you get support for the SMSC LPC47B397-NC
@@ -348,7 +342,6 @@ config SENSORS_SMSC47B397
 config SENSORS_VIA686A
         tristate "VIA686A"
         depends on HWMON && I2C && PCI
-        select I2C_SENSOR
         select I2C_ISA
         help
           If you say yes here you get support for the integrated sensors in
@@ -360,7 +353,8 @@ config SENSORS_VIA686A
 config SENSORS_W83781D
         tristate "Winbond W83781D, W83782D, W83783S, W83627HF, Asus AS99127F"
         depends on HWMON && I2C
-        select I2C_SENSOR
+        select I2C_ISA
+        select HWMON_VID
         help
           If you say yes here you get support for the Winbond W8378x series
           of sensor chips: the W83781D, W83782D, W83783S and W83627HF,
@@ -369,10 +363,18 @@ config SENSORS_W83781D
           This driver can also be built as a module.  If so, the module
           will be called w83781d.
 
+config SENSORS_W83792D
+        tristate "Winbond W83792D"
+        depends on HWMON && I2C && EXPERIMENTAL
+        help
+          If you say yes here you get support for the Winbond W83792D chip.
+
+          This driver can also be built as a module.  If so, the module
+          will be called w83792d.
+
 config SENSORS_W83L785TS
         tristate "Winbond W83L785TS-S"
         depends on HWMON && I2C && EXPERIMENTAL
-        select I2C_SENSOR
         help
           If you say yes here you get support for the Winbond W83L785TS-S
           sensor chip, which is used on the Asus A7N8X, among other
@@ -384,8 +386,8 @@ config SENSORS_W83L785TS
 config SENSORS_W83627HF
         tristate "Winbond W83627HF, W83627THF, W83637HF, W83697HF"
         depends on HWMON && I2C && EXPERIMENTAL
-        select I2C_SENSOR
         select I2C_ISA
+        select HWMON_VID
         help
           If you say yes here you get support for the Winbond W836X7 series
           of sensor chips: the W83627HF, W83627THF, W83637HF, and the W83697HF
@@ -396,7 +398,6 @@ config SENSORS_W83627HF
 config SENSORS_W83627EHF
         tristate "Winbond W83627EHF"
         depends on HWMON && I2C && EXPERIMENTAL
-        select I2C_SENSOR
         select I2C_ISA
         help
           If you say yes here you get preliminary support for the hardware
@@ -404,6 +405,9 @@ config SENSORS_W83627EHF
           Only fan and temperature inputs are supported at the moment, while
           the chip does much more than that.
 
+          This driver also supports the W83627EHG, which is the lead-free
+          version of the W83627EHF.
+
           This driver can also be built as a module.  If so, the module
           will be called w83627ehf.
 
diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile
index 2781403a023..381f1bf04cc 100644
--- a/drivers/hwmon/Makefile
+++ b/drivers/hwmon/Makefile
@@ -2,9 +2,13 @@
 # Makefile for sensor chip drivers.
 #
 
+obj-$(CONFIG_HWMON)             += hwmon.o
+obj-$(CONFIG_HWMON_VID)         += hwmon-vid.o
+
 # asb100, then w83781d go first, as they can override other drivers' addresses.
 obj-$(CONFIG_SENSORS_ASB100)    += asb100.o
 obj-$(CONFIG_SENSORS_W83627HF)  += w83627hf.o
+obj-$(CONFIG_SENSORS_W83792D)   += w83792d.o
 obj-$(CONFIG_SENSORS_W83781D)   += w83781d.o
 
 obj-$(CONFIG_SENSORS_ADM1021)   += adm1021.o
diff --git a/drivers/hwmon/adm1021.c b/drivers/hwmon/adm1021.c
index d2c774c32f4..e928cdb041c 100644
--- a/drivers/hwmon/adm1021.c
+++ b/drivers/hwmon/adm1021.c
@@ -24,7 +24,8 @@
 #include <linux/slab.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
+#include <linux/hwmon.h>
+#include <linux/err.h>
 
 
 /* Addresses to scan */
@@ -32,10 +33,9 @@ static unsigned short normal_i2c[] = { 0x18, 0x19, 0x1a,
                                         0x29, 0x2a, 0x2b,
                                         0x4c, 0x4d, 0x4e, 
                                         I2C_CLIENT_END };
-static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
 
 /* Insmod parameters */
-SENSORS_INSMOD_8(adm1021, adm1023, max1617, max1617a, thmc10, lm84, gl523sm, mc1066);
+I2C_CLIENT_INSMOD_8(adm1021, adm1023, max1617, max1617a, thmc10, lm84, gl523sm, mc1066);
 
 /* adm1021 constants specified below */
 
@@ -89,6 +89,7 @@ clearing it.  Weird, ey?   --Phil  */
 /* Each client has this additional data */
 struct adm1021_data {
         struct i2c_client client;
+        struct class_device *class_dev;
         enum chips type;
 
         struct semaphore update_lock;
@@ -185,7 +186,7 @@ static int adm1021_attach_adapter(struct i2c_adapter *adapter)
 {
         if (!(adapter->class & I2C_CLASS_HWMON))
                 return 0;
-        return i2c_detect(adapter, &addr_data, adm1021_detect);
+        return i2c_probe(adapter, &addr_data, adm1021_detect);
 }
 
 static int adm1021_detect(struct i2c_adapter *adapter, int address, int kind)
@@ -196,15 +197,6 @@ static int adm1021_detect(struct i2c_adapter *adapter, int address, int kind)
         int err = 0;
         const char *type_name = "";
 
-        /* Make sure we aren't probing the ISA bus!! This is just a safety check
-           at this moment; i2c_detect really won't call us. */
-#ifdef DEBUG
-        if (i2c_is_isa_adapter(adapter)) {
-                dev_dbg(&adapter->dev, "adm1021_detect called for an ISA bus adapter?!?\n");
-                return 0;
-        }
-#endif
-
         if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))
                 goto error0;
 
@@ -295,6 +287,12 @@ static int adm1021_detect(struct i2c_adapter *adapter, int address, int kind)
                 adm1021_init_client(new_client);
 
         /* Register sysfs hooks */
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto error2;
+        }
+
         device_create_file(&new_client->dev, &dev_attr_temp1_max);
         device_create_file(&new_client->dev, &dev_attr_temp1_min);
         device_create_file(&new_client->dev, &dev_attr_temp1_input);
@@ -305,6 +303,8 @@ static int adm1021_detect(struct i2c_adapter *adapter, int address, int kind)
 
         return 0;
 
+error2:
+        i2c_detach_client(new_client);
 error1:
         kfree(data);
 error0:
@@ -322,14 +322,15 @@ static void adm1021_init_client(struct i2c_client *client)
 
 static int adm1021_detach_client(struct i2c_client *client)
 {
+        struct adm1021_data *data = i2c_get_clientdata(client);
         int err;
 
-        if ((err = i2c_detach_client(client))) {
-                dev_err(&client->dev, "Client deregistration failed, client not detached.\n");
+        hwmon_device_unregister(data->class_dev);
+
+        if ((err = i2c_detach_client(client)))
                 return err;
-        }
 
-        kfree(i2c_get_clientdata(client));
+        kfree(data);
         return 0;
 }
 
diff --git a/drivers/hwmon/adm1025.c b/drivers/hwmon/adm1025.c
index e452d0daf90..526b7ff179e 100644
--- a/drivers/hwmon/adm1025.c
+++ b/drivers/hwmon/adm1025.c
@@ -50,8 +50,9 @@
 #include <linux/slab.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
-#include <linux/i2c-vid.h>
+#include <linux/hwmon.h>
+#include <linux/hwmon-vid.h>
+#include <linux/err.h>
 
 /*
  * Addresses to scan
@@ -60,13 +61,12 @@
  */
 
 static unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, I2C_CLIENT_END };
-static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
 
 /*
  * Insmod parameters
  */
 
-SENSORS_INSMOD_2(adm1025, ne1619);
+I2C_CLIENT_INSMOD_2(adm1025, ne1619);
 
 /*
  * The ADM1025 registers
@@ -132,6 +132,7 @@ static struct i2c_driver adm1025_driver = {
 
 struct adm1025_data {
         struct i2c_client client;
+        struct class_device *class_dev;
         struct semaphore update_lock;
         char valid; /* zero until following fields are valid */
         unsigned long last_updated; /* in jiffies */
@@ -312,7 +313,7 @@ static int adm1025_attach_adapter(struct i2c_adapter *adapter)
 {
         if (!(adapter->class & I2C_CLASS_HWMON))
                 return 0;
-        return i2c_detect(adapter, &addr_data, adm1025_detect);
+        return i2c_probe(adapter, &addr_data, adm1025_detect);
 }
 
 /*
@@ -416,6 +417,12 @@ static int adm1025_detect(struct i2c_adapter *adapter, int address, int kind)
         adm1025_init_client(new_client);
 
         /* Register sysfs hooks */
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto exit_detach;
+        }
+
         device_create_file(&new_client->dev, &dev_attr_in0_input);
         device_create_file(&new_client->dev, &dev_attr_in1_input);
         device_create_file(&new_client->dev, &dev_attr_in2_input);
@@ -452,6 +459,8 @@ static int adm1025_detect(struct i2c_adapter *adapter, int address, int kind)
 
         return 0;
 
+exit_detach:
+        i2c_detach_client(new_client);
 exit_free:
         kfree(data);
 exit:
@@ -464,7 +473,7 @@ static void adm1025_init_client(struct i2c_client *client)
         struct adm1025_data *data = i2c_get_clientdata(client);
         int i;
 
-        data->vrm = i2c_which_vrm();
+        data->vrm = vid_which_vrm();
 
         /*
          * Set high limits
@@ -502,15 +511,15 @@ static void adm1025_init_client(struct i2c_client *client)
 
 static int adm1025_detach_client(struct i2c_client *client)
 {
+        struct adm1025_data *data = i2c_get_clientdata(client);
         int err;
 
-        if ((err = i2c_detach_client(client))) {
-                dev_err(&client->dev, "Client deregistration failed, "
-                        "client not detached.\n");
+        hwmon_device_unregister(data->class_dev);
+
+        if ((err = i2c_detach_client(client)))
                 return err;
-        }
 
-        kfree(i2c_get_clientdata(client));
+        kfree(data);
         return 0;
 }
 
diff --git a/drivers/hwmon/adm1026.c b/drivers/hwmon/adm1026.c
index c8a7f47911f..625158110fd 100644
--- a/drivers/hwmon/adm1026.c
+++ b/drivers/hwmon/adm1026.c
@@ -28,16 +28,16 @@
 #include <linux/slab.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
-#include <linux/i2c-vid.h>
+#include <linux/hwmon.h>
 #include <linux/hwmon-sysfs.h>
+#include <linux/hwmon-vid.h>
+#include <linux/err.h>
 
 /* Addresses to scan */
 static unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, I2C_CLIENT_END };
-static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
 
 /* Insmod parameters */
-SENSORS_INSMOD_1(adm1026);
+I2C_CLIENT_INSMOD_1(adm1026);
 
 static int gpio_input[17]  = { -1, -1, -1, -1, -1, -1, -1, -1, -1,
                                 -1, -1, -1, -1, -1, -1, -1, -1 }; 
@@ -259,6 +259,7 @@ struct pwm_data {
 
 struct adm1026_data {
         struct i2c_client client;
+        struct class_device *class_dev;
         struct semaphore lock;
         enum chips type;
 
@@ -319,13 +320,15 @@ int adm1026_attach_adapter(struct i2c_adapter *adapter)
         if (!(adapter->class & I2C_CLASS_HWMON)) {
                 return 0;
         }
-        return i2c_detect(adapter, &addr_data, adm1026_detect);
+        return i2c_probe(adapter, &addr_data, adm1026_detect);
 }
 
 int adm1026_detach_client(struct i2c_client *client)
 {
+        struct adm1026_data *data = i2c_get_clientdata(client);
+        hwmon_device_unregister(data->class_dev);
         i2c_detach_client(client);
-        kfree(i2c_get_clientdata(client));
+        kfree(data);
         return 0;
 }
 
@@ -1549,12 +1552,18 @@ int adm1026_detect(struct i2c_adapter *adapter, int address,
                 goto exitfree;
 
         /* Set the VRM version */
-        data->vrm = i2c_which_vrm();
+        data->vrm = vid_which_vrm();
 
         /* Initialize the ADM1026 chip */
         adm1026_init_client(new_client);
 
         /* Register sysfs hooks */
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto exitdetach;
+        }
+
         device_create_file(&new_client->dev, &sensor_dev_attr_in0_input.dev_attr);
         device_create_file(&new_client->dev, &sensor_dev_attr_in0_max.dev_attr);
         device_create_file(&new_client->dev, &sensor_dev_attr_in0_min.dev_attr);
@@ -1690,6 +1699,8 @@ int adm1026_detect(struct i2c_adapter *adapter, int address,
         return 0;
 
         /* Error out and cleanup code */
+exitdetach:
+        i2c_detach_client(new_client);
 exitfree:
         kfree(data);
 exit:
diff --git a/drivers/hwmon/adm1031.c b/drivers/hwmon/adm1031.c
index 93625095727..58338ed7c8a 100644
--- a/drivers/hwmon/adm1031.c
+++ b/drivers/hwmon/adm1031.c
@@ -26,7 +26,8 @@
 #include <linux/slab.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
+#include <linux/hwmon.h>
+#include <linux/err.h>
 
 /* Following macros takes channel parameter starting from 0 to 2 */
 #define ADM1031_REG_FAN_SPEED(nr)       (0x08 + (nr))
@@ -59,16 +60,16 @@
 
 /* Addresses to scan */
 static unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, I2C_CLIENT_END };
-static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
 
 /* Insmod parameters */
-SENSORS_INSMOD_2(adm1030, adm1031);
+I2C_CLIENT_INSMOD_2(adm1030, adm1031);
 
 typedef u8 auto_chan_table_t[8][2];
 
 /* Each client has this additional data */
 struct adm1031_data {
         struct i2c_client client;
+        struct class_device *class_dev;
         struct semaphore update_lock;
         int chip_type;
         char valid;             /* !=0 if following fields are valid */
@@ -725,10 +726,10 @@ static int adm1031_attach_adapter(struct i2c_adapter *adapter)
 {
         if (!(adapter->class & I2C_CLASS_HWMON))
                 return 0;
-        return i2c_detect(adapter, &addr_data, adm1031_detect);
+        return i2c_probe(adapter, &addr_data, adm1031_detect);
 }
 
-/* This function is called by i2c_detect */
+/* This function is called by i2c_probe */
 static int adm1031_detect(struct i2c_adapter *adapter, int address, int kind)
 {
         struct i2c_client *new_client;
@@ -788,6 +789,12 @@ static int adm1031_detect(struct i2c_adapter *adapter, int address, int kind)
         adm1031_init_client(new_client);
 
         /* Register sysfs hooks */
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto exit_detach;
+        }
+
         device_create_file(&new_client->dev, &dev_attr_fan1_input);
         device_create_file(&new_client->dev, &dev_attr_fan1_div);
         device_create_file(&new_client->dev, &dev_attr_fan1_min);
@@ -833,6 +840,8 @@ static int adm1031_detect(struct i2c_adapter *adapter, int address, int kind)
 
         return 0;
 
+exit_detach:
+        i2c_detach_client(new_client);
 exit_free:
         kfree(data);
 exit:
@@ -841,11 +850,14 @@ exit:
 
 static int adm1031_detach_client(struct i2c_client *client)
 {
+        struct adm1031_data *data = i2c_get_clientdata(client);
         int ret;
+
+        hwmon_device_unregister(data->class_dev);
         if ((ret = i2c_detach_client(client)) != 0) {
                 return ret;
         }
-        kfree(i2c_get_clientdata(client));
+        kfree(data);
         return 0;
 }
 
diff --git a/drivers/hwmon/adm9240.c b/drivers/hwmon/adm9240.c
index ce2a6eb93f6..bc7faef162f 100644
--- a/drivers/hwmon/adm9240.c
+++ b/drivers/hwmon/adm9240.c
@@ -45,17 +45,16 @@
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
-#include <linux/i2c-vid.h>
+#include <linux/hwmon.h>
+#include <linux/hwmon-vid.h>
+#include <linux/err.h>
 
 /* Addresses to scan */
 static unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, 0x2f,
                                         I2C_CLIENT_END };
 
-static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
-
 /* Insmod parameters */
-SENSORS_INSMOD_3(adm9240, ds1780, lm81);
+I2C_CLIENT_INSMOD_3(adm9240, ds1780, lm81);
 
 /* ADM9240 registers */
 #define ADM9240_REG_MAN_ID              0x3e
@@ -150,6 +149,7 @@ static struct i2c_driver adm9240_driver = {
 struct adm9240_data {
         enum chips type;
         struct i2c_client client;
+        struct class_device *class_dev;
         struct semaphore update_lock;
         char valid;
         unsigned long last_updated_measure;
@@ -582,6 +582,12 @@ static int adm9240_detect(struct i2c_adapter *adapter, int address, int kind)
         adm9240_init_client(new_client);
 
         /* populate sysfs filesystem */
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto exit_detach;
+        }
+
         device_create_file(&new_client->dev, &dev_attr_in0_input);
         device_create_file(&new_client->dev, &dev_attr_in0_min);
         device_create_file(&new_client->dev, &dev_attr_in0_max);
@@ -615,6 +621,9 @@ static int adm9240_detect(struct i2c_adapter *adapter, int address, int kind)
         device_create_file(&new_client->dev, &dev_attr_cpu0_vid);
 
         return 0;
+
+exit_detach:
+        i2c_detach_client(new_client);
 exit_free:
         kfree(data);
 exit:
@@ -625,20 +634,20 @@ static int adm9240_attach_adapter(struct i2c_adapter *adapter)
 {
         if (!(adapter->class & I2C_CLASS_HWMON))
                 return 0;
-        return i2c_detect(adapter, &addr_data, adm9240_detect);
+        return i2c_probe(adapter, &addr_data, adm9240_detect);
 }
 
 static int adm9240_detach_client(struct i2c_client *client)
 {
+        struct adm9240_data *data = i2c_get_clientdata(client);
         int err;
 
-        if ((err = i2c_detach_client(client))) {
-                dev_err(&client->dev, "Client deregistration failed, "
-                                "client not detached.\n");
+        hwmon_device_unregister(data->class_dev);
+
+        if ((err = i2c_detach_client(client)))
                 return err;
-        }
 
-        kfree(i2c_get_clientdata(client));
+        kfree(data);
         return 0;
 }
 
@@ -648,7 +657,7 @@ static void adm9240_init_client(struct i2c_client *client)
         u8 conf = adm9240_read_value(client, ADM9240_REG_CONFIG);
         u8 mode = adm9240_read_value(client, ADM9240_REG_TEMP_CONF) & 3;
 
-        data->vrm = i2c_which_vrm(); /* need this to report vid as mV */
+        data->vrm = vid_which_vrm(); /* need this to report vid as mV */
 
         dev_info(&client->dev, "Using VRM: %d.%d\n", data->vrm / 10,
                         data->vrm % 10);
diff --git a/drivers/hwmon/asb100.c b/drivers/hwmon/asb100.c
index 70d996d6fe0..8e34855a627 100644
--- a/drivers/hwmon/asb100.c
+++ b/drivers/hwmon/asb100.c
@@ -39,8 +39,9 @@
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
-#include <linux/i2c-vid.h>
+#include <linux/hwmon.h>
+#include <linux/hwmon-vid.h>
+#include <linux/err.h>
 #include <linux/init.h>
 #include <linux/jiffies.h>
 #include "lm75.h"
@@ -54,11 +55,8 @@
 /* I2C addresses to scan */
 static unsigned short normal_i2c[] = { 0x2d, I2C_CLIENT_END };
 
-/* ISA addresses to scan (none) */
-static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
-
 /* Insmod parameters */
-SENSORS_INSMOD_1(asb100);
+I2C_CLIENT_INSMOD_1(asb100);
 I2C_CLIENT_MODULE_PARM(force_subclients, "List of subclient addresses: "
         "{bus, clientaddr, subclientaddr1, subclientaddr2}");
 
@@ -183,6 +181,7 @@ static u8 DIV_TO_REG(long val)
    dynamically allocated, at the same time the client itself is allocated. */
 struct asb100_data {
         struct i2c_client client;
+        struct class_device *class_dev;
         struct semaphore lock;
         enum chips type;
 
@@ -621,7 +620,7 @@ static int asb100_attach_adapter(struct i2c_adapter *adapter)
 {
         if (!(adapter->class & I2C_CLASS_HWMON))
                 return 0;
-        return i2c_detect(adapter, &addr_data, asb100_detect);
+        return i2c_probe(adapter, &addr_data, asb100_detect);
 }
 
 static int asb100_detect_subclients(struct i2c_adapter *adapter, int address,
@@ -714,14 +713,6 @@ static int asb100_detect(struct i2c_adapter *adapter, int address, int kind)
         struct i2c_client *new_client;
         struct asb100_data *data;
 
-        /* asb100 is SMBus only */
-        if (i2c_is_isa_adapter(adapter)) {
-                pr_debug("asb100.o: detect failed, "
-                                "cannot attach to legacy adapter!\n");
-                err = -ENODEV;
-                goto ERROR0;
-        }
-
         if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) {
                 pr_debug("asb100.o: detect failed, "
                                 "smbus byte data not supported!\n");
@@ -821,6 +812,12 @@ static int asb100_detect(struct i2c_adapter *adapter, int address, int kind)
         data->fan_min[2] = asb100_read_value(new_client, ASB100_REG_FAN_MIN(2));
 
         /* Register sysfs hooks */
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto ERROR3;
+        }
+
         device_create_file_in(new_client, 0);
         device_create_file_in(new_client, 1);
         device_create_file_in(new_client, 2);
@@ -847,6 +844,11 @@ static int asb100_detect(struct i2c_adapter *adapter, int address, int kind)
 
         return 0;
 
+ERROR3:
+        i2c_detach_client(data->lm75[1]);
+        i2c_detach_client(data->lm75[0]);
+        kfree(data->lm75[1]);
+        kfree(data->lm75[0]);
 ERROR2:
         i2c_detach_client(new_client);
 ERROR1:
@@ -857,21 +859,23 @@ ERROR0:
 
 static int asb100_detach_client(struct i2c_client *client)
 {
+        struct asb100_data *data = i2c_get_clientdata(client);
         int err;
 
-        if ((err = i2c_detach_client(client))) {
-                dev_err(&client->dev, "client deregistration failed; "
-                        "client not detached.\n");
+        /* main client */
+        if (data)
+                hwmon_device_unregister(data->class_dev);
+
+        if ((err = i2c_detach_client(client)))
                 return err;
-        }
 
-        if (i2c_get_clientdata(client)==NULL) {
-                /* subclients */
+        /* main client */
+        if (data)
+                kfree(data);
+
+        /* subclient */
+        else
                 kfree(client);
-        } else {
-                /* main client */
-                kfree(i2c_get_clientdata(client));
-        }
 
         return 0;
 }
@@ -969,7 +973,7 @@ static void asb100_init_client(struct i2c_client *client)
 
         vid = asb100_read_value(client, ASB100_REG_VID_FANDIV) & 0x0f;
         vid |= (asb100_read_value(client, ASB100_REG_CHIPID) & 0x01) << 4;
-        data->vrm = i2c_which_vrm();
+        data->vrm = vid_which_vrm();
         vid = vid_from_reg(vid, data->vrm);
 
         /* Start monitoring */
diff --git a/drivers/hwmon/atxp1.c b/drivers/hwmon/atxp1.c
index fca3fc1cef7..deb4d34c953 100644
--- a/drivers/hwmon/atxp1.c
+++ b/drivers/hwmon/atxp1.c
@@ -23,8 +23,9 @@
 #include <linux/module.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
-#include <linux/i2c-vid.h>
+#include <linux/hwmon.h>
+#include <linux/hwmon-vid.h>
+#include <linux/err.h>
 
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("System voltages control via Attansic ATXP1");
@@ -40,9 +41,8 @@ MODULE_AUTHOR("Sebastian Witt <se.witt@gmx.net>");
 #define ATXP1_GPIO1MASK 0x0f
 
 static unsigned short normal_i2c[] = { 0x37, 0x4e, I2C_CLIENT_END };
-static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
 
-SENSORS_INSMOD_1(atxp1);
+I2C_CLIENT_INSMOD_1(atxp1);
 
 static int atxp1_attach_adapter(struct i2c_adapter * adapter);
 static int atxp1_detach_client(struct i2c_client * client);
@@ -59,6 +59,7 @@ static struct i2c_driver atxp1_driver = {
 
 struct atxp1_data {
         struct i2c_client client;
+        struct class_device *class_dev;
         struct semaphore update_lock;
         unsigned long last_updated;
         u8 valid;
@@ -252,7 +253,7 @@ static DEVICE_ATTR(gpio2, S_IRUGO | S_IWUSR, atxp1_showgpio2, atxp1_storegpio2);
 
 static int atxp1_attach_adapter(struct i2c_adapter *adapter)
 {
-        return i2c_detect(adapter, &addr_data, &atxp1_detect);
+        return i2c_probe(adapter, &addr_data, &atxp1_detect);
 };
 
 static int atxp1_detect(struct i2c_adapter *adapter, int address, int kind)
@@ -295,7 +296,7 @@ static int atxp1_detect(struct i2c_adapter *adapter, int address, int kind)
         }
 
         /* Get VRM */
-        data->vrm = i2c_which_vrm();
+        data->vrm = vid_which_vrm();
 
         if ((data->vrm != 90) && (data->vrm != 91)) {
                 dev_err(&new_client->dev, "Not supporting VRM %d.%d\n",
@@ -317,6 +318,12 @@ static int atxp1_detect(struct i2c_adapter *adapter, int address, int kind)
                 goto exit_free;
         }
 
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto exit_detach;
+        }
+
         device_create_file(&new_client->dev, &dev_attr_gpio1);
         device_create_file(&new_client->dev, &dev_attr_gpio2);
         device_create_file(&new_client->dev, &dev_attr_cpu0_vid);
@@ -326,6 +333,8 @@ static int atxp1_detect(struct i2c_adapter *adapter, int address, int kind)
 
         return 0;
 
+exit_detach:
+        i2c_detach_client(new_client);
 exit_free:
         kfree(data);
 exit:
@@ -334,14 +343,17 @@ exit:
 
 static int atxp1_detach_client(struct i2c_client * client)
 {
+        struct atxp1_data * data = i2c_get_clientdata(client);
         int err;
 
+        hwmon_device_unregister(data->class_dev);
+
         err = i2c_detach_client(client);
 
         if (err)
                 dev_err(&client->dev, "Failed to detach client.\n");
         else
-                kfree(i2c_get_clientdata(client));
+                kfree(data);
 
         return err;
 };
diff --git a/drivers/hwmon/ds1621.c b/drivers/hwmon/ds1621.c
index 5360d58804f..b0199e063d0 100644
--- a/drivers/hwmon/ds1621.c
+++ b/drivers/hwmon/ds1621.c
@@ -26,16 +26,16 @@
 #include <linux/slab.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
+#include <linux/hwmon.h>
+#include <linux/err.h>
 #include "lm75.h"
 
 /* Addresses to scan */
 static unsigned short normal_i2c[] = { 0x48, 0x49, 0x4a, 0x4b, 0x4c,
                                         0x4d, 0x4e, 0x4f, I2C_CLIENT_END };
-static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
 
 /* Insmod parameters */
-SENSORS_INSMOD_1(ds1621);
+I2C_CLIENT_INSMOD_1(ds1621);
 static int polarity = -1;
 module_param(polarity, int, 0);
 MODULE_PARM_DESC(polarity, "Output's polarity: 0 = active high, 1 = active low");
@@ -71,6 +71,7 @@ MODULE_PARM_DESC(polarity, "Output's polarity: 0 = active high, 1 = active low")
 /* Each client has this additional data */
 struct ds1621_data {
         struct i2c_client client;
+        struct class_device *class_dev;
         struct semaphore update_lock;
         char valid;                     /* !=0 if following fields are valid */
         unsigned long last_updated;     /* In jiffies */
@@ -179,10 +180,10 @@ static DEVICE_ATTR(temp1_max, S_IWUSR | S_IRUGO, show_temp_max, set_temp_max);
 
 static int ds1621_attach_adapter(struct i2c_adapter *adapter)
 {
-        return i2c_detect(adapter, &addr_data, ds1621_detect);
+        return i2c_probe(adapter, &addr_data, ds1621_detect);
 }
 
-/* This function is called by i2c_detect */
+/* This function is called by i2c_probe */
 int ds1621_detect(struct i2c_adapter *adapter, int address,
                   int kind)
 {
@@ -250,6 +251,12 @@ int ds1621_detect(struct i2c_adapter *adapter, int address,
         ds1621_init_client(new_client);
 
         /* Register sysfs hooks */
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto exit_detach;
+        }
+
         device_create_file(&new_client->dev, &dev_attr_alarms);
         device_create_file(&new_client->dev, &dev_attr_temp1_input);
         device_create_file(&new_client->dev, &dev_attr_temp1_min);
@@ -259,6 +266,8 @@ int ds1621_detect(struct i2c_adapter *adapter, int address,
 
 /* OK, this is not exactly good programming practice, usually. But it is
    very code-efficient in this case. */
+      exit_detach:
+        i2c_detach_client(new_client);
       exit_free:
         kfree(data);
       exit:
@@ -267,15 +276,15 @@ int ds1621_detect(struct i2c_adapter *adapter, int address,
 
 static int ds1621_detach_client(struct i2c_client *client)
 {
+        struct ds1621_data *data = i2c_get_clientdata(client);
         int err;
 
-        if ((err = i2c_detach_client(client))) {
-                dev_err(&client->dev, "Client deregistration failed, "
-                        "client not detached.\n");
+        hwmon_device_unregister(data->class_dev);
+
+        if ((err = i2c_detach_client(client)))
                 return err;
-        }
 
-        kfree(i2c_get_clientdata(client));
+        kfree(data);
 
         return 0;
 }
diff --git a/drivers/hwmon/fscher.c b/drivers/hwmon/fscher.c
index da411741c2c..eef6061d786 100644
--- a/drivers/hwmon/fscher.c
+++ b/drivers/hwmon/fscher.c
@@ -31,20 +31,20 @@
 #include <linux/slab.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
+#include <linux/hwmon.h>
+#include <linux/err.h>
 
 /*
  * Addresses to scan
  */
 
 static unsigned short normal_i2c[] = { 0x73, I2C_CLIENT_END };
-static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
 
 /*
  * Insmod parameters
  */
 
-SENSORS_INSMOD_1(fscher);
+I2C_CLIENT_INSMOD_1(fscher);
 
 /*
  * The FSCHER registers
@@ -132,6 +132,7 @@ static struct i2c_driver fscher_driver = {
 
 struct fscher_data {
         struct i2c_client client;
+        struct class_device *class_dev;
         struct semaphore update_lock;
         char valid; /* zero until following fields are valid */
         unsigned long last_updated; /* in jiffies */
@@ -287,7 +288,7 @@ static int fscher_attach_adapter(struct i2c_adapter *adapter)
 {
         if (!(adapter->class & I2C_CLASS_HWMON))
                 return 0;
-        return i2c_detect(adapter, &addr_data, fscher_detect);
+        return i2c_probe(adapter, &addr_data, fscher_detect);
 }
 
 static int fscher_detect(struct i2c_adapter *adapter, int address, int kind)
@@ -341,6 +342,12 @@ static int fscher_detect(struct i2c_adapter *adapter, int address, int kind)
         fscher_init_client(new_client);
 
         /* Register sysfs hooks */
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto exit_detach;
+        }
+
         device_create_file_revision(new_client);
         device_create_file_alarms(new_client);
         device_create_file_control(new_client);
@@ -360,6 +367,8 @@ static int fscher_detect(struct i2c_adapter *adapter, int address, int kind)
 
         return 0;
 
+exit_detach:
+        i2c_detach_client(new_client);
 exit_free:
         kfree(data);
 exit:
@@ -368,15 +377,15 @@ exit:
 
 static int fscher_detach_client(struct i2c_client *client)
 {
+        struct fscher_data *data = i2c_get_clientdata(client);
         int err;
 
-        if ((err = i2c_detach_client(client))) {
-                dev_err(&client->dev, "Client deregistration failed, "
-                        "client not detached.\n");
+        hwmon_device_unregister(data->class_dev);
+
+        if ((err = i2c_detach_client(client)))
                 return err;
-        }
 
-        kfree(i2c_get_clientdata(client));
+        kfree(data);
         return 0;
 }
 
diff --git a/drivers/hwmon/fscpos.c b/drivers/hwmon/fscpos.c
index 301ae98bd0a..5fc77a5fed0 100644
--- a/drivers/hwmon/fscpos.c
+++ b/drivers/hwmon/fscpos.c
@@ -34,19 +34,19 @@
 #include <linux/slab.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
 #include <linux/init.h>
+#include <linux/hwmon.h>
+#include <linux/err.h>
 
 /*
  * Addresses to scan
  */
 static unsigned short normal_i2c[] = { 0x73, I2C_CLIENT_END };
-static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
 
 /*
  * Insmod parameters
  */
-SENSORS_INSMOD_1(fscpos);
+I2C_CLIENT_INSMOD_1(fscpos);
 
 /*
  * The FSCPOS registers
@@ -113,6 +113,7 @@ static struct i2c_driver fscpos_driver = {
  */
 struct fscpos_data {
         struct i2c_client client;
+        struct class_device *class_dev;
         struct semaphore update_lock;
         char valid;             /* 0 until following fields are valid */
         unsigned long last_updated;     /* In jiffies */
@@ -434,7 +435,7 @@ static int fscpos_attach_adapter(struct i2c_adapter *adapter)
 {
         if (!(adapter->class & I2C_CLASS_HWMON))
                 return 0;
-        return i2c_detect(adapter, &addr_data, fscpos_detect);
+        return i2c_probe(adapter, &addr_data, fscpos_detect);
 }
 
 int fscpos_detect(struct i2c_adapter *adapter, int address, int kind)
@@ -496,6 +497,12 @@ int fscpos_detect(struct i2c_adapter *adapter, int address, int kind)
         dev_info(&new_client->dev, "Found fscpos chip, rev %u\n", data->revision);
 
         /* Register sysfs hooks */
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto exit_detach;
+        }
+
         device_create_file(&new_client->dev, &dev_attr_event);
         device_create_file(&new_client->dev, &dev_attr_in0_input);
         device_create_file(&new_client->dev, &dev_attr_in1_input);
@@ -526,6 +533,8 @@ int fscpos_detect(struct i2c_adapter *adapter, int address, int kind)
 
         return 0;
 
+exit_detach:
+        i2c_detach_client(new_client);
 exit_free:
         kfree(data);
 exit:
@@ -534,14 +543,14 @@ exit:
 
 static int fscpos_detach_client(struct i2c_client *client)
 {
+        struct fscpos_data *data = i2c_get_clientdata(client);
         int err;
 
-        if ((err = i2c_detach_client(client))) {
-                dev_err(&client->dev, "Client deregistration failed, client"
-                                                        " not detached.\n");
+        hwmon_device_unregister(data->class_dev);
+
+        if ((err = i2c_detach_client(client)))
                 return err;
-        }
-        kfree(i2c_get_clientdata(client));
+        kfree(data);
         return 0;
 }
 
diff --git a/drivers/hwmon/gl518sm.c b/drivers/hwmon/gl518sm.c
index 6bedf729dcf..256b9323c84 100644
--- a/drivers/hwmon/gl518sm.c
+++ b/drivers/hwmon/gl518sm.c
@@ -41,14 +41,14 @@
 #include <linux/slab.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
+#include <linux/hwmon.h>
+#include <linux/err.h>
 
 /* Addresses to scan */
 static unsigned short normal_i2c[] = { 0x2c, 0x2d, I2C_CLIENT_END };
-static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
 
 /* Insmod parameters */
-SENSORS_INSMOD_2(gl518sm_r00, gl518sm_r80);
+I2C_CLIENT_INSMOD_2(gl518sm_r00, gl518sm_r80);
 
 /* Many GL518 constants specified below */
 
@@ -117,6 +117,7 @@ static inline u8 FAN_TO_REG(long rpm, int div)
 /* Each client has this additional data */
 struct gl518_data {
         struct i2c_client client;
+        struct class_device *class_dev;
         enum chips type;
 
         struct semaphore update_lock;
@@ -346,7 +347,7 @@ static int gl518_attach_adapter(struct i2c_adapter *adapter)
 {
         if (!(adapter->class & I2C_CLASS_HWMON))
                 return 0;
-        return i2c_detect(adapter, &addr_data, gl518_detect);
+        return i2c_probe(adapter, &addr_data, gl518_detect);
 }
 
 static int gl518_detect(struct i2c_adapter *adapter, int address, int kind)
@@ -419,6 +420,12 @@ static int gl518_detect(struct i2c_adapter *adapter, int address, int kind)
         gl518_init_client((struct i2c_client *) new_client);
 
         /* Register sysfs hooks */
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto exit_detach;
+        }
+
         device_create_file(&new_client->dev, &dev_attr_in0_input);
         device_create_file(&new_client->dev, &dev_attr_in1_input);
         device_create_file(&new_client->dev, &dev_attr_in2_input);
@@ -450,6 +457,8 @@ static int gl518_detect(struct i2c_adapter *adapter, int address, int kind)
 /* OK, this is not exactly good programming practice, usually. But it is
    very code-efficient in this case. */
 
+exit_detach:
+        i2c_detach_client(new_client);
 exit_free:
         kfree(data);
 exit:
@@ -477,16 +486,15 @@ static void gl518_init_client(struct i2c_client *client)
 
 static int gl518_detach_client(struct i2c_client *client)
 {
+        struct gl518_data *data = i2c_get_clientdata(client);
         int err;
 
-        if ((err = i2c_detach_client(client))) {
-                dev_err(&client->dev, "Client deregistration failed, "
-                        "client not detached.\n");
-                return err;
-        }
+        hwmon_device_unregister(data->class_dev);
 
-        kfree(i2c_get_clientdata(client));
+        if ((err = i2c_detach_client(client)))
+                return err;
 
+        kfree(data);
         return 0;
 }
 
diff --git a/drivers/hwmon/gl520sm.c b/drivers/hwmon/gl520sm.c
index 80ae8d30c2a..12fd757066f 100644
--- a/drivers/hwmon/gl520sm.c
+++ b/drivers/hwmon/gl520sm.c
@@ -26,8 +26,9 @@
 #include <linux/slab.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
-#include <linux/i2c-vid.h>
+#include <linux/hwmon.h>
+#include <linux/hwmon-vid.h>
+#include <linux/err.h>
 
 /* Type of the extra sensor */
 static unsigned short extra_sensor_type;
@@ -36,10 +37,9 @@ MODULE_PARM_DESC(extra_sensor_type, "Type of extra sensor (0=autodetect, 1=tempe
 
 /* Addresses to scan */
 static unsigned short normal_i2c[] = { 0x2c, 0x2d, I2C_CLIENT_END };
-static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
 
 /* Insmod parameters */
-SENSORS_INSMOD_1(gl520sm);
+I2C_CLIENT_INSMOD_1(gl520sm);
 
 /* Many GL520 constants specified below 
 One of the inputs can be configured as either temp or voltage.
@@ -120,6 +120,7 @@ static struct i2c_driver gl520_driver = {
 /* Client data */
 struct gl520_data {
         struct i2c_client client;
+        struct class_device *class_dev;
         struct semaphore update_lock;
         char valid;             /* zero until the following fields are valid */
         unsigned long last_updated;     /* in jiffies */
@@ -518,7 +519,7 @@ static int gl520_attach_adapter(struct i2c_adapter *adapter)
 {
         if (!(adapter->class & I2C_CLASS_HWMON))
                 return 0;
-        return i2c_detect(adapter, &addr_data, gl520_detect);
+        return i2c_probe(adapter, &addr_data, gl520_detect);
 }
 
 static int gl520_detect(struct i2c_adapter *adapter, int address, int kind)
@@ -571,6 +572,12 @@ static int gl520_detect(struct i2c_adapter *adapter, int address, int kind)
         gl520_init_client(new_client);
 
         /* Register sysfs hooks */
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto exit_detach;
+        }
+
         device_create_file_vid(new_client, 0);
 
         device_create_file_in(new_client, 0);
@@ -592,6 +599,8 @@ static int gl520_detect(struct i2c_adapter *adapter, int address, int kind)
 
         return 0;
 
+exit_detach:
+        i2c_detach_client(new_client);
 exit_free:
         kfree(data);
 exit:
@@ -608,7 +617,7 @@ static void gl520_init_client(struct i2c_client *client)
         conf = oldconf = gl520_read_value(client, GL520_REG_CONF);
 
         data->alarm_mask = 0xff;
-        data->vrm = i2c_which_vrm();
+        data->vrm = vid_which_vrm();
 
         if (extra_sensor_type == 1)
                 conf &= ~0x10;
@@ -639,15 +648,15 @@ static void gl520_init_client(struct i2c_client *client)
 
 static int gl520_detach_client(struct i2c_client *client)
 {
+        struct gl520_data *data = i2c_get_clientdata(client);
         int err;
 
-        if ((err = i2c_detach_client(client))) {
-                dev_err(&client->dev, "Client deregistration failed, "
-                        "client not detached.\n");
+        hwmon_device_unregister(data->class_dev);
+
+        if ((err = i2c_detach_client(client)))
                 return err;
-        }
 
-        kfree(i2c_get_clientdata(client));
+        kfree(data);
         return 0;
 }
 
diff --git a/drivers/hwmon/hwmon-vid.c b/drivers/hwmon/hwmon-vid.c
new file mode 100644
index 00000000000..312769ad4da
--- /dev/null
+++ b/drivers/hwmon/hwmon-vid.c
@@ -0,0 +1,189 @@
+/*
+    hwmon-vid.c - VID/VRM/VRD voltage conversions
+
+    Copyright (c) 2004 Rudolf Marek <r.marek@sh.cvut.cz>
+
+    Partly imported from i2c-vid.h of the lm_sensors project
+    Copyright (c) 2002 Mark D. Studebaker <mdsxyz123@yahoo.com>
+    With assistance from Trent Piepho <xyzzy@speakeasy.org>
+
+    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 of the License, 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.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include <linux/config.h>
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/hwmon-vid.h>
+
+/*
+    Common code for decoding VID pins.
+
+    References:
+
+    For VRM 8.4 to 9.1, "VRM x.y DC-DC Converter Design Guidelines",
+    available at http://developer.intel.com/.
+
+    For VRD 10.0 and up, "VRD x.y Design Guide",
+    available at http://developer.intel.com/.
+
+    AMD Opteron processors don't follow the Intel specifications.
+    I'm going to "make up" 2.4 as the spec number for the Opterons.
+    No good reason just a mnemonic for the 24x Opteron processor
+    series.
+
+    Opteron VID encoding is:
+       00000  =  1.550 V
+       00001  =  1.525 V
+        . . . .
+       11110  =  0.800 V
+       11111  =  0.000 V (off)
+*/
+
+/* vrm is the VRM/VRD document version multiplied by 10.
+   val is the 4-, 5- or 6-bit VID code.
+   Returned value is in mV to avoid floating point in the kernel. */
+int vid_from_reg(int val, int vrm)
+{
+        int vid;
+
+        switch(vrm) {
+
+        case  0:
+                return 0;
+
+        case 100:               /* VRD 10.0 */
+                if((val & 0x1f) == 0x1f)
+                        return 0;
+                if((val & 0x1f) <= 0x09 || val == 0x0a)
+                        vid = 10875 - (val & 0x1f) * 250;
+                else
+                        vid = 18625 - (val & 0x1f) * 250;
+                if(val & 0x20)
+                        vid -= 125;
+                vid /= 10;      /* only return 3 dec. places for now */
+                return vid;
+
+        case 24:                /* Opteron processor */
+                return(val == 0x1f ? 0 : 1550 - val * 25);
+
+        case 91:                /* VRM 9.1 */
+        case 90:                /* VRM 9.0 */
+                return(val == 0x1f ? 0 :
+                                       1850 - val * 25);
+
+        case 85:                /* VRM 8.5 */
+                return((val & 0x10  ? 25 : 0) +
+                       ((val & 0x0f) > 0x04 ? 2050 : 1250) -
+                       ((val & 0x0f) * 50));
+
+        case 84:                /* VRM 8.4 */
+                val &= 0x0f;
+                                /* fall through */
+        default:                /* VRM 8.2 */
+                return(val == 0x1f ? 0 :
+                       val & 0x10  ? 5100 - (val) * 100 :
+                                     2050 - (val) * 50);
+        }
+}
+
+
+/*
+    After this point is the code to automatically determine which
+    VRM/VRD specification should be used depending on the CPU.
+*/
+
+struct vrm_model {
+        u8 vendor;
+        u8 eff_family;
+        u8 eff_model;
+        int vrm_type;
+};
+
+#define ANY 0xFF
+
+#ifdef CONFIG_X86
+
+static struct vrm_model vrm_models[] = {
+        {X86_VENDOR_AMD, 0x6, ANY, 90},         /* Athlon Duron etc */
+        {X86_VENDOR_AMD, 0xF, ANY, 24},         /* Athlon 64, Opteron */
+        {X86_VENDOR_INTEL, 0x6, 0x9, 85},       /* 0.13um too */
+        {X86_VENDOR_INTEL, 0x6, 0xB, 85},       /* Tualatin */
+        {X86_VENDOR_INTEL, 0x6, ANY, 82},       /* any P6 */
+        {X86_VENDOR_INTEL, 0x7, ANY, 0},        /* Itanium */
+        {X86_VENDOR_INTEL, 0xF, 0x0, 90},       /* P4 */
+        {X86_VENDOR_INTEL, 0xF, 0x1, 90},       /* P4 Willamette */
+        {X86_VENDOR_INTEL, 0xF, 0x2, 90},       /* P4 Northwood */
+        {X86_VENDOR_INTEL, 0xF, 0x3, 100},      /* P4 Prescott */
+        {X86_VENDOR_INTEL, 0xF, 0x4, 100},      /* P4 Prescott */
+        {X86_VENDOR_INTEL, 0x10,ANY, 0},        /* Itanium 2 */
+        {X86_VENDOR_UNKNOWN, ANY, ANY, 0}       /* stop here */
+};
+
+static int find_vrm(u8 eff_family, u8 eff_model, u8 vendor)
+{
+        int i = 0;
+
+        while (vrm_models[i].vendor!=X86_VENDOR_UNKNOWN) {
+                if (vrm_models[i].vendor==vendor)
+                        if ((vrm_models[i].eff_family==eff_family)
+                         && ((vrm_models[i].eff_model==eff_model) ||
+                             (vrm_models[i].eff_model==ANY)))
+                                return vrm_models[i].vrm_type;
+                i++;
+        }
+
+        return 0;
+}
+
+int vid_which_vrm(void)
+{
+        struct cpuinfo_x86 *c = cpu_data;
+        u32 eax;
+        u8 eff_family, eff_model;
+        int vrm_ret;
+
+        if (c->x86 < 6)         /* Any CPU with family lower than 6 */
+                return 0;       /* doesn't have VID and/or CPUID */
+
+        eax = cpuid_eax(1);
+        eff_family = ((eax & 0x00000F00)>>8);
+        eff_model  = ((eax & 0x000000F0)>>4);
+        if (eff_family == 0xF) {        /* use extended model & family */
+                eff_family += ((eax & 0x00F00000)>>20);
+                eff_model += ((eax & 0x000F0000)>>16)<<4;
+        }
+        vrm_ret = find_vrm(eff_family,eff_model,c->x86_vendor);
+        if (vrm_ret == 0)
+                printk(KERN_INFO "hwmon-vid: Unknown VRM version of your "
+                       "x86 CPU\n");
+        return vrm_ret;
+}
+
+/* and now something completely different for the non-x86 world */
+#else
+int vid_which_vrm(void)
+{
+        printk(KERN_INFO "hwmon-vid: Unknown VRM version of your CPU\n");
+        return 0;
+}
+#endif
+
+EXPORT_SYMBOL(vid_from_reg);
+EXPORT_SYMBOL(vid_which_vrm);
+
+MODULE_AUTHOR("Rudolf Marek <r.marek@sh.cvut.cz>");
+
+MODULE_DESCRIPTION("hwmon-vid driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/hwmon/hwmon.c b/drivers/hwmon/hwmon.c
new file mode 100644
index 00000000000..9b41c9bd805
--- /dev/null
+++ b/drivers/hwmon/hwmon.c
@@ -0,0 +1,98 @@
+/*
+    hwmon.c - part of lm_sensors, Linux kernel modules for hardware monitoring
+
+    This file defines the sysfs class "hwmon", for use by sensors drivers.
+
+    Copyright (C) 2005 Mark M. Hoffman <mhoffman@lightlink.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; version 2 of the License.
+*/
+
+#include <linux/module.h>
+#include <linux/device.h>
+#include <linux/err.h>
+#include <linux/kdev_t.h>
+#include <linux/idr.h>
+#include <linux/hwmon.h>
+
+#define HWMON_ID_PREFIX "hwmon"
+#define HWMON_ID_FORMAT HWMON_ID_PREFIX "%d"
+
+static struct class *hwmon_class;
+
+static DEFINE_IDR(hwmon_idr);
+
+/**
+ * hwmon_device_register - register w/ hwmon sysfs class
+ * @dev: the device to register
+ *
+ * hwmon_device_unregister() must be called when the class device is no
+ * longer needed.
+ *
+ * Returns the pointer to the new struct class device.
+ */
+struct class_device *hwmon_device_register(struct device *dev)
+{
+        struct class_device *cdev;
+        int id;
+
+        if (idr_pre_get(&hwmon_idr, GFP_KERNEL) == 0)
+                return ERR_PTR(-ENOMEM);
+
+        if (idr_get_new(&hwmon_idr, NULL, &id) < 0)
+                return ERR_PTR(-ENOMEM);
+
+        id = id & MAX_ID_MASK;
+        cdev = class_device_create(hwmon_class, MKDEV(0,0), dev,
+                                        HWMON_ID_FORMAT, id);
+
+        if (IS_ERR(cdev))
+                idr_remove(&hwmon_idr, id);
+
+        return cdev;
+}
+
+/**
+ * hwmon_device_unregister - removes the previously registered class device
+ *
+ * @cdev: the class device to destroy
+ */
+void hwmon_device_unregister(struct class_device *cdev)
+{
+        int id;
+
+        if (sscanf(cdev->class_id, HWMON_ID_FORMAT, &id) == 1) {
+                class_device_unregister(cdev);
+                idr_remove(&hwmon_idr, id);
+        } else
+                dev_dbg(cdev->dev,
+                        "hwmon_device_unregister() failed: bad class ID!\n");
+}
+
+static int __init hwmon_init(void)
+{
+        hwmon_class = class_create(THIS_MODULE, "hwmon");
+        if (IS_ERR(hwmon_class)) {
+                printk(KERN_ERR "hwmon.c: couldn't create sysfs class\n");
+                return PTR_ERR(hwmon_class);
+        }
+        return 0;
+}
+
+static void __exit hwmon_exit(void)
+{
+        class_destroy(hwmon_class);
+}
+
+module_init(hwmon_init);
+module_exit(hwmon_exit);
+
+EXPORT_SYMBOL_GPL(hwmon_device_register);
+EXPORT_SYMBOL_GPL(hwmon_device_unregister);
+
+MODULE_AUTHOR("Mark M. Hoffman <mhoffman@lightlink.com>");
+MODULE_DESCRIPTION("hardware monitoring sysfs/class support");
+MODULE_LICENSE("GPL");
+
diff --git a/drivers/hwmon/it87.c b/drivers/hwmon/it87.c
index db20c9e4739..53cc2b6d638 100644
--- a/drivers/hwmon/it87.c
+++ b/drivers/hwmon/it87.c
@@ -36,19 +36,21 @@
 #include <linux/slab.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
-#include <linux/i2c-vid.h>
+#include <linux/i2c-isa.h>
+#include <linux/hwmon.h>
 #include <linux/hwmon-sysfs.h>
+#include <linux/hwmon-vid.h>
+#include <linux/err.h>
 #include <asm/io.h>
 
 
 /* Addresses to scan */
 static unsigned short normal_i2c[] = { 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d,
                                         0x2e, 0x2f, I2C_CLIENT_END };
-static unsigned int normal_isa[] = { 0x0290, I2C_CLIENT_ISA_END };
+static unsigned short isa_address = 0x290;
 
 /* Insmod parameters */
-SENSORS_INSMOD_2(it87, it8712);
+I2C_CLIENT_INSMOD_2(it87, it8712);
 
 #define REG     0x2e    /* The register to read/write */
 #define DEV     0x07    /* Register: Logical device select */
@@ -192,6 +194,7 @@ static int DIV_TO_REG(int val)
    allocated. */
 struct it87_data {
         struct i2c_client client;
+        struct class_device *class_dev;
         struct semaphore lock;
         enum chips type;
 
@@ -218,7 +221,7 @@ struct it87_data {
 
 
 static int it87_attach_adapter(struct i2c_adapter *adapter);
-static int it87_find(int *address);
+static int it87_isa_attach_adapter(struct i2c_adapter *adapter);
 static int it87_detect(struct i2c_adapter *adapter, int address, int kind);
 static int it87_detach_client(struct i2c_client *client);
 
@@ -239,6 +242,14 @@ static struct i2c_driver it87_driver = {
         .detach_client  = it87_detach_client,
 };
 
+static struct i2c_driver it87_isa_driver = {
+        .owner          = THIS_MODULE,
+        .name           = "it87-isa",
+        .attach_adapter = it87_isa_attach_adapter,
+        .detach_client  = it87_detach_client,
+};
+
+
 static ssize_t show_in(struct device *dev, struct device_attribute *attr,
                 char *buf)
 {
@@ -686,11 +697,16 @@ static int it87_attach_adapter(struct i2c_adapter *adapter)
 {
         if (!(adapter->class & I2C_CLASS_HWMON))
                 return 0;
-        return i2c_detect(adapter, &addr_data, it87_detect);
+        return i2c_probe(adapter, &addr_data, it87_detect);
 }
 
-/* SuperIO detection - will change normal_isa[0] if a chip is found */
-static int it87_find(int *address)
+static int it87_isa_attach_adapter(struct i2c_adapter *adapter)
+{
+        return it87_detect(adapter, isa_address, -1);
+}
+
+/* SuperIO detection - will change isa_address if a chip is found */
+static int __init it87_find(int *address)
 {
         int err = -ENODEV;
 
@@ -721,7 +737,7 @@ exit:
         return err;
 }
 
-/* This function is called by i2c_detect */
+/* This function is called by i2c_probe */
 int it87_detect(struct i2c_adapter *adapter, int address, int kind)
 {
         int i;
@@ -738,7 +754,7 @@ int it87_detect(struct i2c_adapter *adapter, int address, int kind)
 
         /* Reserve the ISA region */
         if (is_isa)
-                if (!request_region(address, IT87_EXTENT, it87_driver.name))
+                if (!request_region(address, IT87_EXTENT, it87_isa_driver.name))
                         goto ERROR0;
 
         /* Probe whether there is anything available on this address. Already
@@ -784,7 +800,7 @@ int it87_detect(struct i2c_adapter *adapter, int address, int kind)
         i2c_set_clientdata(new_client, data);
         new_client->addr = address;
         new_client->adapter = adapter;
-        new_client->driver = &it87_driver;
+        new_client->driver = is_isa ? &it87_isa_driver : &it87_driver;
         new_client->flags = 0;
 
         /* Now, we do the remaining detection. */
@@ -840,6 +856,12 @@ int it87_detect(struct i2c_adapter *adapter, int address, int kind)
         it87_init_client(new_client, data);
 
         /* Register sysfs hooks */
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto ERROR3;
+        }
+
         device_create_file(&new_client->dev, &sensor_dev_attr_in0_input.dev_attr);
         device_create_file(&new_client->dev, &sensor_dev_attr_in1_input.dev_attr);
         device_create_file(&new_client->dev, &sensor_dev_attr_in2_input.dev_attr);
@@ -897,13 +919,15 @@ int it87_detect(struct i2c_adapter *adapter, int address, int kind)
         }
 
         if (data->type == it8712) {
-                data->vrm = i2c_which_vrm();
+                data->vrm = vid_which_vrm();
                 device_create_file_vrm(new_client);
                 device_create_file_vid(new_client);
         }
 
         return 0;
 
+ERROR3:
+        i2c_detach_client(new_client);
 ERROR2:
         kfree(data);
 ERROR1:
@@ -915,17 +939,17 @@ ERROR0:
 
 static int it87_detach_client(struct i2c_client *client)
 {
+        struct it87_data *data = i2c_get_clientdata(client);
         int err;
 
-        if ((err = i2c_detach_client(client))) {
-                dev_err(&client->dev,
-                        "Client deregistration failed, client not detached.\n");
+        hwmon_device_unregister(data->class_dev);
+
+        if ((err = i2c_detach_client(client)))
                 return err;
-        }
 
         if(i2c_is_isa_client(client))
                 release_region(client->addr, IT87_EXTENT);
-        kfree(i2c_get_clientdata(client));
+        kfree(data);
 
         return 0;
 }
@@ -1158,16 +1182,28 @@ static struct it87_data *it87_update_device(struct device *dev)
 
 static int __init sm_it87_init(void)
 {
-        int addr;
+        int addr, res;
 
         if (!it87_find(&addr)) {
-                normal_isa[0] = addr;
+                isa_address = addr;
+        }
+
+        res = i2c_add_driver(&it87_driver);
+        if (res)
+                return res;
+
+        res = i2c_isa_add_driver(&it87_isa_driver);
+        if (res) {
+                i2c_del_driver(&it87_driver);
+                return res;
         }
-        return i2c_add_driver(&it87_driver);
+
+        return 0;
 }
 
 static void __exit sm_it87_exit(void)
 {
+        i2c_isa_del_driver(&it87_isa_driver);
         i2c_del_driver(&it87_driver);
 }
 
diff --git a/drivers/hwmon/lm63.c b/drivers/hwmon/lm63.c
index 7c6f9ea5a25..be5c7095ecb 100644
--- a/drivers/hwmon/lm63.c
+++ b/drivers/hwmon/lm63.c
@@ -42,8 +42,9 @@
 #include <linux/slab.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
 #include <linux/hwmon-sysfs.h>
+#include <linux/hwmon.h>
+#include <linux/err.h>
 
 /*
  * Addresses to scan
@@ -51,13 +52,12 @@
  */
 
 static unsigned short normal_i2c[] = { 0x4c, I2C_CLIENT_END };
-static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
 
 /*
  * Insmod parameters
  */
 
-SENSORS_INSMOD_1(lm63);
+I2C_CLIENT_INSMOD_1(lm63);
 
 /*
  * The LM63 registers
@@ -152,6 +152,7 @@ static struct i2c_driver lm63_driver = {
 
 struct lm63_data {
         struct i2c_client client;
+        struct class_device *class_dev;
         struct semaphore update_lock;
         char valid; /* zero until following fields are valid */
         unsigned long last_updated; /* in jiffies */
@@ -358,7 +359,7 @@ static int lm63_attach_adapter(struct i2c_adapter *adapter)
 {
         if (!(adapter->class & I2C_CLASS_HWMON))
                 return 0;
-        return i2c_detect(adapter, &addr_data, lm63_detect);
+        return i2c_probe(adapter, &addr_data, lm63_detect);
 }
 
 /*
@@ -437,6 +438,12 @@ static int lm63_detect(struct i2c_adapter *adapter, int address, int kind)
         lm63_init_client(new_client);
 
         /* Register sysfs hooks */
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto exit_detach;
+        }
+
         if (data->config & 0x04) { /* tachometer enabled */
                 device_create_file(&new_client->dev,
                                    &sensor_dev_attr_fan1_input.dev_attr);
@@ -462,6 +469,8 @@ static int lm63_detect(struct i2c_adapter *adapter, int address, int kind)
 
         return 0;
 
+exit_detach:
+        i2c_detach_client(new_client);
 exit_free:
         kfree(data);
 exit:
@@ -505,15 +514,15 @@ static void lm63_init_client(struct i2c_client *client)
 
 static int lm63_detach_client(struct i2c_client *client)
 {
+        struct lm63_data *data = i2c_get_clientdata(client);
         int err;
 
-        if ((err = i2c_detach_client(client))) {
-                dev_err(&client->dev, "Client deregistration failed, "
-                        "client not detached\n");
+        hwmon_device_unregister(data->class_dev);
+
+        if ((err = i2c_detach_client(client)))
                 return err;
-        }
 
-        kfree(i2c_get_clientdata(client));
+        kfree(data);
         return 0;
 }
 
diff --git a/drivers/hwmon/lm75.c b/drivers/hwmon/lm75.c
index 5be164ed278..9a3ebdf583f 100644
--- a/drivers/hwmon/lm75.c
+++ b/drivers/hwmon/lm75.c
@@ -23,17 +23,17 @@
 #include <linux/slab.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
+#include <linux/hwmon.h>
+#include <linux/err.h>
 #include "lm75.h"
 
 
 /* Addresses to scan */
 static unsigned short normal_i2c[] = { 0x48, 0x49, 0x4a, 0x4b, 0x4c,
                                         0x4d, 0x4e, 0x4f, I2C_CLIENT_END };
-static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
 
 /* Insmod parameters */
-SENSORS_INSMOD_1(lm75);
+I2C_CLIENT_INSMOD_1(lm75);
 
 /* Many LM75 constants specified below */
 
@@ -46,6 +46,7 @@ SENSORS_INSMOD_1(lm75);
 /* Each client has this additional data */
 struct lm75_data {
         struct i2c_client       client;
+        struct class_device *class_dev;
         struct semaphore        update_lock;
         char                    valid;          /* !=0 if following fields are valid */
         unsigned long           last_updated;   /* In jiffies */
@@ -107,10 +108,10 @@ static int lm75_attach_adapter(struct i2c_adapter *adapter)
 {
         if (!(adapter->class & I2C_CLASS_HWMON))
                 return 0;
-        return i2c_detect(adapter, &addr_data, lm75_detect);
+        return i2c_probe(adapter, &addr_data, lm75_detect);
 }
 
-/* This function is called by i2c_detect */
+/* This function is called by i2c_probe */
 static int lm75_detect(struct i2c_adapter *adapter, int address, int kind)
 {
         int i;
@@ -119,16 +120,6 @@ static int lm75_detect(struct i2c_adapter *adapter, int address, int kind)
         int err = 0;
         const char *name = "";
 
-        /* Make sure we aren't probing the ISA bus!! This is just a safety check
-           at this moment; i2c_detect really won't call us. */
-#ifdef DEBUG
-        if (i2c_is_isa_adapter(adapter)) {
-                dev_dbg(&adapter->dev,
-                        "lm75_detect called for an ISA bus adapter?!?\n");
-                goto exit;
-        }
-#endif
-
         if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA |
                                      I2C_FUNC_SMBUS_WORD_DATA))
                 goto exit;
@@ -208,12 +199,20 @@ static int lm75_detect(struct i2c_adapter *adapter, int address, int kind)
         lm75_init_client(new_client);
         
         /* Register sysfs hooks */
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto exit_detach;
+        }
+
         device_create_file(&new_client->dev, &dev_attr_temp1_max);
         device_create_file(&new_client->dev, &dev_attr_temp1_max_hyst);
         device_create_file(&new_client->dev, &dev_attr_temp1_input);
 
         return 0;
 
+exit_detach:
+        i2c_detach_client(new_client);
 exit_free:
         kfree(data);
 exit:
@@ -222,8 +221,10 @@ exit:
 
 static int lm75_detach_client(struct i2c_client *client)
 {
+        struct lm75_data *data = i2c_get_clientdata(client);
+        hwmon_device_unregister(data->class_dev);
         i2c_detach_client(client);
-        kfree(i2c_get_clientdata(client));
+        kfree(data);
         return 0;
 }
 
@@ -251,8 +252,12 @@ static int lm75_write_value(struct i2c_client *client, u8 reg, u16 value)
 
 static void lm75_init_client(struct i2c_client *client)
 {
-        /* Initialize the LM75 chip */
-        lm75_write_value(client, LM75_REG_CONF, 0);
+        int reg;
+
+        /* Enable if in shutdown mode */
+        reg = lm75_read_value(client, LM75_REG_CONF);
+        if (reg >= 0 && (reg & 0x01))
+                lm75_write_value(client, LM75_REG_CONF, reg & 0xfe);
 }
 
 static struct lm75_data *lm75_update_device(struct device *dev)
diff --git a/drivers/hwmon/lm75.h b/drivers/hwmon/lm75.h
index 63e3f2fb4c2..af7dc650ee1 100644
--- a/drivers/hwmon/lm75.h
+++ b/drivers/hwmon/lm75.h
@@ -25,7 +25,7 @@
     which contains this code, we don't worry about the wasted space.
 */
 
-#include <linux/i2c-sensor.h>
+#include <linux/hwmon.h>
 
 /* straight from the datasheet */
 #define LM75_TEMP_MIN (-55000)
diff --git a/drivers/hwmon/lm77.c b/drivers/hwmon/lm77.c
index b98f4495299..866eab96a6f 100644
--- a/drivers/hwmon/lm77.c
+++ b/drivers/hwmon/lm77.c
@@ -30,15 +30,14 @@
 #include <linux/slab.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
-
+#include <linux/hwmon.h>
+#include <linux/err.h>
 
 /* Addresses to scan */
 static unsigned short normal_i2c[] = { 0x48, 0x49, 0x4a, 0x4b, I2C_CLIENT_END };
-static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
 
 /* Insmod parameters */
-SENSORS_INSMOD_1(lm77);
+I2C_CLIENT_INSMOD_1(lm77);
 
 /* The LM77 registers */
 #define LM77_REG_TEMP           0x00
@@ -51,6 +50,7 @@ SENSORS_INSMOD_1(lm77);
 /* Each client has this additional data */
 struct lm77_data {
         struct i2c_client       client;
+        struct class_device *class_dev;
         struct semaphore        update_lock;
         char                    valid;
         unsigned long           last_updated;   /* In jiffies */
@@ -208,10 +208,10 @@ static int lm77_attach_adapter(struct i2c_adapter *adapter)
 {
         if (!(adapter->class & I2C_CLASS_HWMON))
                 return 0;
-        return i2c_detect(adapter, &addr_data, lm77_detect);
+        return i2c_probe(adapter, &addr_data, lm77_detect);
 }
 
-/* This function is called by i2c_detect */
+/* This function is called by i2c_probe */
 static int lm77_detect(struct i2c_adapter *adapter, int address, int kind)
 {
         struct i2c_client *new_client;
@@ -317,6 +317,12 @@ static int lm77_detect(struct i2c_adapter *adapter, int address, int kind)
         lm77_init_client(new_client);
 
         /* Register sysfs hooks */
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto exit_detach;
+        }
+
         device_create_file(&new_client->dev, &dev_attr_temp1_input);
         device_create_file(&new_client->dev, &dev_attr_temp1_crit);
         device_create_file(&new_client->dev, &dev_attr_temp1_min);
@@ -327,6 +333,8 @@ static int lm77_detect(struct i2c_adapter *adapter, int address, int kind)
         device_create_file(&new_client->dev, &dev_attr_alarms);
         return 0;
 
+exit_detach:
+        i2c_detach_client(new_client);
 exit_free:
         kfree(data);
 exit:
@@ -335,8 +343,10 @@ exit:
 
 static int lm77_detach_client(struct i2c_client *client)
 {
+        struct lm77_data *data = i2c_get_clientdata(client);
+        hwmon_device_unregister(data->class_dev);
         i2c_detach_client(client);
-        kfree(i2c_get_clientdata(client));
+        kfree(data);
         return 0;
 }
 
diff --git a/drivers/hwmon/lm78.c b/drivers/hwmon/lm78.c
index 29241469dcb..f6730dc3573 100644
--- a/drivers/hwmon/lm78.c
+++ b/drivers/hwmon/lm78.c
@@ -23,7 +23,10 @@
 #include <linux/slab.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
+#include <linux/i2c-isa.h>
+#include <linux/hwmon.h>
+#include <linux/hwmon-vid.h>
+#include <linux/err.h>
 #include <asm/io.h>
 
 /* Addresses to scan */
@@ -31,10 +34,10 @@ static unsigned short normal_i2c[] = { 0x20, 0x21, 0x22, 0x23, 0x24,
                                         0x25, 0x26, 0x27, 0x28, 0x29,
                                         0x2a, 0x2b, 0x2c, 0x2d, 0x2e,
                                         0x2f, I2C_CLIENT_END };
-static unsigned int normal_isa[] = { 0x0290, I2C_CLIENT_ISA_END };
+static unsigned short isa_address = 0x290;
 
 /* Insmod parameters */
-SENSORS_INSMOD_3(lm78, lm78j, lm79);
+I2C_CLIENT_INSMOD_2(lm78, lm79);
 
 /* Many LM78 constants specified below */
 
@@ -104,13 +107,6 @@ static inline int TEMP_FROM_REG(s8 val)
         return val * 1000;
 }
 
-/* VID: mV
-   REG: (see doc/vid) */
-static inline int VID_FROM_REG(u8 val)
-{
-        return val==0x1f ? 0 : val>=0x10 ? 5100-val*100 : 2050-val*50;
-}
-
 #define DIV_FROM_REG(val) (1 << (val))
 
 /* There are some complications in a module like this. First off, LM78 chips
@@ -134,6 +130,7 @@ static inline int VID_FROM_REG(u8 val)
    allocated. */
 struct lm78_data {
         struct i2c_client client;
+        struct class_device *class_dev;
         struct semaphore lock;
         enum chips type;
 
@@ -156,6 +153,7 @@ struct lm78_data {
 
 
 static int lm78_attach_adapter(struct i2c_adapter *adapter);
+static int lm78_isa_attach_adapter(struct i2c_adapter *adapter);
 static int lm78_detect(struct i2c_adapter *adapter, int address, int kind);
 static int lm78_detach_client(struct i2c_client *client);
 
@@ -174,6 +172,14 @@ static struct i2c_driver lm78_driver = {
         .detach_client  = lm78_detach_client,
 };
 
+static struct i2c_driver lm78_isa_driver = {
+        .owner          = THIS_MODULE,
+        .name           = "lm78-isa",
+        .attach_adapter = lm78_isa_attach_adapter,
+        .detach_client  = lm78_detach_client,
+};
+
+
 /* 7 Voltages */
 static ssize_t show_in(struct device *dev, char *buf, int nr)
 {
@@ -445,7 +451,7 @@ static DEVICE_ATTR(fan3_div, S_IRUGO, show_fan_3_div, NULL);
 static ssize_t show_vid(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct lm78_data *data = lm78_update_device(dev);
-        return sprintf(buf, "%d\n", VID_FROM_REG(data->vid));
+        return sprintf(buf, "%d\n", vid_from_reg(82, data->vid));
 }
 static DEVICE_ATTR(cpu0_vid, S_IRUGO, show_vid, NULL);
 
@@ -465,10 +471,15 @@ static int lm78_attach_adapter(struct i2c_adapter *adapter)
 {
         if (!(adapter->class & I2C_CLASS_HWMON))
                 return 0;
-        return i2c_detect(adapter, &addr_data, lm78_detect);
+        return i2c_probe(adapter, &addr_data, lm78_detect);
+}
+
+static int lm78_isa_attach_adapter(struct i2c_adapter *adapter)
+{
+        return lm78_detect(adapter, isa_address, -1);
 }
 
-/* This function is called by i2c_detect */
+/* This function is called by i2c_probe */
 int lm78_detect(struct i2c_adapter *adapter, int address, int kind)
 {
         int i, err;
@@ -485,7 +496,8 @@ int lm78_detect(struct i2c_adapter *adapter, int address, int kind)
 
         /* Reserve the ISA region */
         if (is_isa)
-                if (!request_region(address, LM78_EXTENT, lm78_driver.name)) {
+                if (!request_region(address, LM78_EXTENT,
+                                    lm78_isa_driver.name)) {
                         err = -EBUSY;
                         goto ERROR0;
                 }
@@ -540,7 +552,7 @@ int lm78_detect(struct i2c_adapter *adapter, int address, int kind)
         i2c_set_clientdata(new_client, data);
         new_client->addr = address;
         new_client->adapter = adapter;
-        new_client->driver = &lm78_driver;
+        new_client->driver = is_isa ? &lm78_isa_driver : &lm78_driver;
         new_client->flags = 0;
 
         /* Now, we do the remaining detection. */
@@ -559,10 +571,9 @@ int lm78_detect(struct i2c_adapter *adapter, int address, int kind)
         /* Determine the chip type. */
         if (kind <= 0) {
                 i = lm78_read_value(new_client, LM78_REG_CHIPID);
-                if (i == 0x00 || i == 0x20)
+                if (i == 0x00 || i == 0x20      /* LM78 */
+                 || i == 0x40)                  /* LM78-J */
                         kind = lm78;
-                else if (i == 0x40)
-                        kind = lm78j;
                 else if ((i & 0xfe) == 0xc0)
                         kind = lm79;
                 else {
@@ -578,8 +589,6 @@ int lm78_detect(struct i2c_adapter *adapter, int address, int kind)
 
         if (kind == lm78) {
                 client_name = "lm78";
-        } else if (kind == lm78j) {
-                client_name = "lm78-j";
         } else if (kind == lm79) {
                 client_name = "lm79";
         }
@@ -605,6 +614,12 @@ int lm78_detect(struct i2c_adapter *adapter, int address, int kind)
         }
 
         /* Register sysfs hooks */
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto ERROR3;
+        }
+
         device_create_file(&new_client->dev, &dev_attr_in0_input);
         device_create_file(&new_client->dev, &dev_attr_in0_min);
         device_create_file(&new_client->dev, &dev_attr_in0_max);
@@ -643,6 +658,8 @@ int lm78_detect(struct i2c_adapter *adapter, int address, int kind)
 
         return 0;
 
+ERROR3:
+        i2c_detach_client(new_client);
 ERROR2:
         kfree(data);
 ERROR1:
@@ -654,18 +671,18 @@ ERROR0:
 
 static int lm78_detach_client(struct i2c_client *client)
 {
+        struct lm78_data *data = i2c_get_clientdata(client);
         int err;
 
-        if ((err = i2c_detach_client(client))) {
-                dev_err(&client->dev,
-                    "Client deregistration failed, client not detached.\n");
+        hwmon_device_unregister(data->class_dev);
+
+        if ((err = i2c_detach_client(client)))
                 return err;
-        }
 
         if(i2c_is_isa_client(client))
                 release_region(client->addr, LM78_EXTENT);
 
-        kfree(i2c_get_clientdata(client));
+        kfree(data);
 
         return 0;
 }
@@ -777,18 +794,31 @@ static struct lm78_data *lm78_update_device(struct device *dev)
 
 static int __init sm_lm78_init(void)
 {
-        return i2c_add_driver(&lm78_driver);
+        int res;
+
+        res = i2c_add_driver(&lm78_driver);
+        if (res)
+                return res;
+
+        res = i2c_isa_add_driver(&lm78_isa_driver);
+        if (res) {
+                i2c_del_driver(&lm78_driver);
+                return res;
+        }
+
+        return 0;
 }
 
 static void __exit sm_lm78_exit(void)
 {
+        i2c_isa_del_driver(&lm78_isa_driver);
         i2c_del_driver(&lm78_driver);
 }
 
 
 
 MODULE_AUTHOR("Frodo Looijaard <frodol@dds.nl>");
-MODULE_DESCRIPTION("LM78, LM78-J and LM79 driver");
+MODULE_DESCRIPTION("LM78/LM79 driver");
 MODULE_LICENSE("GPL");
 
 module_init(sm_lm78_init);
diff --git a/drivers/hwmon/lm80.c b/drivers/hwmon/lm80.c
index 8100595feb4..83af8b3a0ca 100644
--- a/drivers/hwmon/lm80.c
+++ b/drivers/hwmon/lm80.c
@@ -26,15 +26,15 @@
 #include <linux/slab.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
+#include <linux/hwmon.h>
+#include <linux/err.h>
 
 /* Addresses to scan */
 static unsigned short normal_i2c[] = { 0x28, 0x29, 0x2a, 0x2b, 0x2c,
                                         0x2d, 0x2e, 0x2f, I2C_CLIENT_END };
-static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
 
 /* Insmod parameters */
-SENSORS_INSMOD_1(lm80);
+I2C_CLIENT_INSMOD_1(lm80);
 
 /* Many LM80 constants specified below */
 
@@ -107,6 +107,7 @@ static inline long TEMP_FROM_REG(u16 temp)
 
 struct lm80_data {
         struct i2c_client client;
+        struct class_device *class_dev;
         struct semaphore update_lock;
         char valid;             /* !=0 if following fields are valid */
         unsigned long last_updated;     /* In jiffies */
@@ -389,7 +390,7 @@ static int lm80_attach_adapter(struct i2c_adapter *adapter)
 {
         if (!(adapter->class & I2C_CLASS_HWMON))
                 return 0;
-        return i2c_detect(adapter, &addr_data, lm80_detect);
+        return i2c_probe(adapter, &addr_data, lm80_detect);
 }
 
 int lm80_detect(struct i2c_adapter *adapter, int address, int kind)
@@ -451,6 +452,12 @@ int lm80_detect(struct i2c_adapter *adapter, int address, int kind)
         data->fan_min[1] = lm80_read_value(new_client, LM80_REG_FAN_MIN(2));
 
         /* Register sysfs hooks */
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto error_detach;
+        }
+
         device_create_file(&new_client->dev, &dev_attr_in0_min);
         device_create_file(&new_client->dev, &dev_attr_in1_min);
         device_create_file(&new_client->dev, &dev_attr_in2_min);
@@ -487,6 +494,8 @@ int lm80_detect(struct i2c_adapter *adapter, int address, int kind)
 
         return 0;
 
+error_detach:
+        i2c_detach_client(new_client);
 error_free:
         kfree(data);
 exit:
@@ -495,15 +504,15 @@ exit:
 
 static int lm80_detach_client(struct i2c_client *client)
 {
+        struct lm80_data *data = i2c_get_clientdata(client);
         int err;
 
-        if ((err = i2c_detach_client(client))) {
-                dev_err(&client->dev, "Client deregistration failed, "
-                        "client not detached.\n");
+        hwmon_device_unregister(data->class_dev);
+
+        if ((err = i2c_detach_client(client)))
                 return err;
-        }
 
-        kfree(i2c_get_clientdata(client));
+        kfree(data);
         return 0;
 }
 
diff --git a/drivers/hwmon/lm83.c b/drivers/hwmon/lm83.c
index a49008b444c..d74b2c20c71 100644
--- a/drivers/hwmon/lm83.c
+++ b/drivers/hwmon/lm83.c
@@ -32,8 +32,9 @@
 #include <linux/slab.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
 #include <linux/hwmon-sysfs.h>
+#include <linux/hwmon.h>
+#include <linux/err.h>
 
 /*
  * Addresses to scan
@@ -45,13 +46,12 @@ static unsigned short normal_i2c[] = { 0x18, 0x19, 0x1a,
                                         0x29, 0x2a, 0x2b,
                                         0x4c, 0x4d, 0x4e,
                                         I2C_CLIENT_END };
-static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
 
 /*
  * Insmod parameters
  */
 
-SENSORS_INSMOD_1(lm83);
+I2C_CLIENT_INSMOD_1(lm83);
 
 /*
  * The LM83 registers
@@ -138,6 +138,7 @@ static struct i2c_driver lm83_driver = {
 
 struct lm83_data {
         struct i2c_client client;
+        struct class_device *class_dev;
         struct semaphore update_lock;
         char valid; /* zero until following fields are valid */
         unsigned long last_updated; /* in jiffies */
@@ -212,7 +213,7 @@ static int lm83_attach_adapter(struct i2c_adapter *adapter)
 {
         if (!(adapter->class & I2C_CLASS_HWMON))
                 return 0;
-        return i2c_detect(adapter, &addr_data, lm83_detect);
+        return i2c_probe(adapter, &addr_data, lm83_detect);
 }
 
 /*
@@ -312,6 +313,12 @@ static int lm83_detect(struct i2c_adapter *adapter, int address, int kind)
          */
 
         /* Register sysfs hooks */
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto exit_detach;
+        }
+
         device_create_file(&new_client->dev,
                            &sensor_dev_attr_temp1_input.dev_attr);
         device_create_file(&new_client->dev,
@@ -340,6 +347,8 @@ static int lm83_detect(struct i2c_adapter *adapter, int address, int kind)
 
         return 0;
 
+exit_detach:
+        i2c_detach_client(new_client);
 exit_free:
         kfree(data);
 exit:
@@ -348,15 +357,15 @@ exit:
 
 static int lm83_detach_client(struct i2c_client *client)
 {
+        struct lm83_data *data = i2c_get_clientdata(client);
         int err;
 
-        if ((err = i2c_detach_client(client))) {
-                dev_err(&client->dev,
-                    "Client deregistration failed, client not detached.\n");
+        hwmon_device_unregister(data->class_dev);
+
+        if ((err = i2c_detach_client(client)))
                 return err;
-        }
 
-        kfree(i2c_get_clientdata(client));
+        kfree(data);
         return 0;
 }
 
diff --git a/drivers/hwmon/lm85.c b/drivers/hwmon/lm85.c
index b4d7fd41826..ab214df9624 100644
--- a/drivers/hwmon/lm85.c
+++ b/drivers/hwmon/lm85.c
@@ -28,15 +28,15 @@
 #include <linux/slab.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
-#include <linux/i2c-vid.h>
+#include <linux/hwmon.h>
+#include <linux/hwmon-vid.h>
+#include <linux/err.h>
 
 /* Addresses to scan */
 static unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, I2C_CLIENT_END };
-static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
 
 /* Insmod parameters */
-SENSORS_INSMOD_6(lm85b, lm85c, adm1027, adt7463, emc6d100, emc6d102);
+I2C_CLIENT_INSMOD_6(lm85b, lm85c, adm1027, adt7463, emc6d100, emc6d102);
 
 /* The LM85 registers */
 
@@ -281,15 +281,6 @@ static int ZONE_TO_REG( int zone )
 #define PPR_TO_REG(val,fan) (SENSORS_LIMIT((val)-1,0,3)<<(fan *2))
 #define PPR_FROM_REG(val,fan) ((((val)>>(fan * 2))&0x03)+1)
 
-/* i2c-vid.h defines vid_from_reg() */
-#define VID_FROM_REG(val,vrm) (vid_from_reg((val),(vrm)))
-
-/* Unlike some other drivers we DO NOT set initial limits.  Use
- * the config file to set limits.  Some users have reported
- * motherboards shutting down when we set limits in a previous
- * version of the driver.
- */
-
 /* Chip sampling rates
  *
  * Some sensors are not updated more frequently than once per second
@@ -339,6 +330,7 @@ struct lm85_autofan {
 
 struct lm85_data {
         struct i2c_client client;
+        struct class_device *class_dev;
         struct semaphore lock;
         enum chips type;
 
@@ -1019,7 +1011,7 @@ int lm85_attach_adapter(struct i2c_adapter *adapter)
 {
         if (!(adapter->class & I2C_CLASS_HWMON))
                 return 0;
-        return i2c_detect(adapter, &addr_data, lm85_detect);
+        return i2c_probe(adapter, &addr_data, lm85_detect);
 }
 
 int lm85_detect(struct i2c_adapter *adapter, int address,
@@ -1031,11 +1023,6 @@ int lm85_detect(struct i2c_adapter *adapter, int address,
         int err = 0;
         const char *type_name = "";
 
-        if (i2c_is_isa_adapter(adapter)) {
-                /* This chip has no ISA interface */
-                goto ERROR0 ;
-        };
-
         if (!i2c_check_functionality(adapter,
                                         I2C_FUNC_SMBUS_BYTE_DATA)) {
                 /* We need to be able to do byte I/O */
@@ -1160,12 +1147,18 @@ int lm85_detect(struct i2c_adapter *adapter, int address,
                 goto ERROR1;
 
         /* Set the VRM version */
-        data->vrm = i2c_which_vrm();
+        data->vrm = vid_which_vrm();
 
         /* Initialize the LM85 chip */
         lm85_init_client(new_client);
 
         /* Register sysfs hooks */
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto ERROR2;
+        }
+
         device_create_file(&new_client->dev, &dev_attr_fan1_input);
         device_create_file(&new_client->dev, &dev_attr_fan2_input);
         device_create_file(&new_client->dev, &dev_attr_fan3_input);
@@ -1235,6 +1228,8 @@ int lm85_detect(struct i2c_adapter *adapter, int address,
         return 0;
 
         /* Error out and cleanup code */
+    ERROR2:
+        i2c_detach_client(new_client);
     ERROR1:
         kfree(data);
     ERROR0:
@@ -1243,8 +1238,10 @@ int lm85_detect(struct i2c_adapter *adapter, int address,
 
 int lm85_detach_client(struct i2c_client *client)
 {
+        struct lm85_data *data = i2c_get_clientdata(client);
+        hwmon_device_unregister(data->class_dev);
         i2c_detach_client(client);
-        kfree(i2c_get_clientdata(client));
+        kfree(data);
         return 0;
 }
 
diff --git a/drivers/hwmon/lm87.c b/drivers/hwmon/lm87.c
index 1921ed1af18..dca996de4c3 100644
--- a/drivers/hwmon/lm87.c
+++ b/drivers/hwmon/lm87.c
@@ -57,8 +57,9 @@
 #include <linux/slab.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
-#include <linux/i2c-vid.h>
+#include <linux/hwmon.h>
+#include <linux/hwmon-vid.h>
+#include <linux/err.h>
 
 /*
  * Addresses to scan
@@ -66,13 +67,12 @@
  */
 
 static unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, I2C_CLIENT_END };
-static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
 
 /*
  * Insmod parameters
  */
 
-SENSORS_INSMOD_1(lm87);
+I2C_CLIENT_INSMOD_1(lm87);
 
 /*
  * The LM87 registers
@@ -175,6 +175,7 @@ static struct i2c_driver lm87_driver = {
 
 struct lm87_data {
         struct i2c_client client;
+        struct class_device *class_dev;
         struct semaphore update_lock;
         char valid; /* zero until following fields are valid */
         unsigned long last_updated; /* In jiffies */
@@ -537,7 +538,7 @@ static int lm87_attach_adapter(struct i2c_adapter *adapter)
 {
         if (!(adapter->class & I2C_CLASS_HWMON))
                 return 0;
-        return i2c_detect(adapter, &addr_data, lm87_detect);
+        return i2c_probe(adapter, &addr_data, lm87_detect);
 }
 
 /*
@@ -608,6 +609,12 @@ static int lm87_detect(struct i2c_adapter *adapter, int address, int kind)
         data->in_scale[7] = 1875;
 
         /* Register sysfs hooks */
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto exit_detach;
+        }
+
         device_create_file(&new_client->dev, &dev_attr_in1_input);
         device_create_file(&new_client->dev, &dev_attr_in1_min);
         device_create_file(&new_client->dev, &dev_attr_in1_max);
@@ -673,6 +680,8 @@ static int lm87_detect(struct i2c_adapter *adapter, int address, int kind)
 
         return 0;
 
+exit_detach:
+        i2c_detach_client(new_client);
 exit_free:
         kfree(data);
 exit:
@@ -685,7 +694,7 @@ static void lm87_init_client(struct i2c_client *client)
         u8 config;
 
         data->channel = lm87_read_value(client, LM87_REG_CHANNEL_MODE);
-        data->vrm = i2c_which_vrm();
+        data->vrm = vid_which_vrm();
 
         config = lm87_read_value(client, LM87_REG_CONFIG);
         if (!(config & 0x01)) {
@@ -719,15 +728,15 @@ static void lm87_init_client(struct i2c_client *client)
 
 static int lm87_detach_client(struct i2c_client *client)
 {
+        struct lm87_data *data = i2c_get_clientdata(client);
         int err;
 
-        if ((err = i2c_detach_client(client))) {
-                dev_err(&client->dev, "Client deregistration failed, "
-                        "client not detached.\n");
+        hwmon_device_unregister(data->class_dev);
+
+        if ((err = i2c_detach_client(client)))
                 return err;
-        }
 
-        kfree(i2c_get_clientdata(client));
+        kfree(data);
         return 0;
 }
 
diff --git a/drivers/hwmon/lm90.c b/drivers/hwmon/lm90.c
index a67dcadf7cb..14de05fcd43 100644
--- a/drivers/hwmon/lm90.c
+++ b/drivers/hwmon/lm90.c
@@ -75,8 +75,9 @@
 #include <linux/slab.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
 #include <linux/hwmon-sysfs.h>
+#include <linux/hwmon.h>
+#include <linux/err.h>
 
 /*
  * Addresses to scan
@@ -89,13 +90,12 @@
  */
 
 static unsigned short normal_i2c[] = { 0x4c, 0x4d, I2C_CLIENT_END };
-static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
 
 /*
  * Insmod parameters
  */
 
-SENSORS_INSMOD_6(lm90, adm1032, lm99, lm86, max6657, adt7461);
+I2C_CLIENT_INSMOD_6(lm90, adm1032, lm99, lm86, max6657, adt7461);
 
 /*
  * The LM90 registers
@@ -200,6 +200,7 @@ static struct i2c_driver lm90_driver = {
 
 struct lm90_data {
         struct i2c_client client;
+        struct class_device *class_dev;
         struct semaphore update_lock;
         char valid; /* zero until following fields are valid */
         unsigned long last_updated; /* in jiffies */
@@ -352,7 +353,7 @@ static int lm90_attach_adapter(struct i2c_adapter *adapter)
 {
         if (!(adapter->class & I2C_CLASS_HWMON))
                 return 0;
-        return i2c_detect(adapter, &addr_data, lm90_detect);
+        return i2c_probe(adapter, &addr_data, lm90_detect);
 }
 
 /*
@@ -500,6 +501,12 @@ static int lm90_detect(struct i2c_adapter *adapter, int address, int kind)
         lm90_init_client(new_client);
 
         /* Register sysfs hooks */
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto exit_detach;
+        }
+
         device_create_file(&new_client->dev,
                            &sensor_dev_attr_temp1_input.dev_attr);
         device_create_file(&new_client->dev,
@@ -524,6 +531,8 @@ static int lm90_detect(struct i2c_adapter *adapter, int address, int kind)
 
         return 0;
 
+exit_detach:
+        i2c_detach_client(new_client);
 exit_free:
         kfree(data);
 exit:
@@ -547,15 +556,15 @@ static void lm90_init_client(struct i2c_client *client)
 
 static int lm90_detach_client(struct i2c_client *client)
 {
+        struct lm90_data *data = i2c_get_clientdata(client);
         int err;
 
-        if ((err = i2c_detach_client(client))) {
-                dev_err(&client->dev, "Client deregistration failed, "
-                        "client not detached.\n");
+        hwmon_device_unregister(data->class_dev);
+
+        if ((err = i2c_detach_client(client)))
                 return err;
-        }
 
-        kfree(i2c_get_clientdata(client));
+        kfree(data);
         return 0;
 }
 
diff --git a/drivers/hwmon/lm92.c b/drivers/hwmon/lm92.c
index 215c8e40ffd..647b7c7cd57 100644
--- a/drivers/hwmon/lm92.c
+++ b/drivers/hwmon/lm92.c
@@ -44,17 +44,16 @@
 #include <linux/init.h>
 #include <linux/slab.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
-
+#include <linux/hwmon.h>
+#include <linux/err.h>
 
 /* The LM92 and MAX6635 have 2 two-state pins for address selection,
    resulting in 4 possible addresses. */
 static unsigned short normal_i2c[] = { 0x48, 0x49, 0x4a, 0x4b,
                                        I2C_CLIENT_END };
-static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
 
 /* Insmod parameters */
-SENSORS_INSMOD_1(lm92);
+I2C_CLIENT_INSMOD_1(lm92);
 
 /* The LM92 registers */
 #define LM92_REG_CONFIG                 0x01 /* 8-bit, RW */
@@ -96,6 +95,7 @@ static struct i2c_driver lm92_driver;
 /* Client data (each client gets its own) */
 struct lm92_data {
         struct i2c_client client;
+        struct class_device *class_dev;
         struct semaphore update_lock;
         char valid; /* zero until following fields are valid */
         unsigned long last_updated; /* in jiffies */
@@ -359,6 +359,12 @@ static int lm92_detect(struct i2c_adapter *adapter, int address, int kind)
         lm92_init_client(new_client);
 
         /* Register sysfs hooks */
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto exit_detach;
+        }
+
         device_create_file(&new_client->dev, &dev_attr_temp1_input);
         device_create_file(&new_client->dev, &dev_attr_temp1_crit);
         device_create_file(&new_client->dev, &dev_attr_temp1_crit_hyst);
@@ -370,6 +376,8 @@ static int lm92_detect(struct i2c_adapter *adapter, int address, int kind)
 
         return 0;
 
+exit_detach:
+        i2c_detach_client(new_client);
 exit_free:
         kfree(data);
 exit:
@@ -380,20 +388,20 @@ static int lm92_attach_adapter(struct i2c_adapter *adapter)
 {
         if (!(adapter->class & I2C_CLASS_HWMON))
                 return 0;
-        return i2c_detect(adapter, &addr_data, lm92_detect);
+        return i2c_probe(adapter, &addr_data, lm92_detect);
 }
 
 static int lm92_detach_client(struct i2c_client *client)
 {
+        struct lm92_data *data = i2c_get_clientdata(client);
         int err;
 
-        if ((err = i2c_detach_client(client))) {
-                dev_err(&client->dev, "Client deregistration failed, "
-                        "client not detached.\n");
+        hwmon_device_unregister(data->class_dev);
+
+        if ((err = i2c_detach_client(client)))
                 return err;
-        }
 
-        kfree(i2c_get_clientdata(client));
+        kfree(data);
         return 0;
 }
 
diff --git a/drivers/hwmon/max1619.c b/drivers/hwmon/max1619.c
index 3c159f1d49e..16bf71f3a04 100644
--- a/drivers/hwmon/max1619.c
+++ b/drivers/hwmon/max1619.c
@@ -31,20 +31,19 @@
 #include <linux/slab.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
-
+#include <linux/hwmon.h>
+#include <linux/err.h>
 
 static unsigned short normal_i2c[] = { 0x18, 0x19, 0x1a,
                                         0x29, 0x2a, 0x2b,
                                         0x4c, 0x4d, 0x4e,
                                         I2C_CLIENT_END };
-static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
 
 /*
  * Insmod parameters
  */
 
-SENSORS_INSMOD_1(max1619);
+I2C_CLIENT_INSMOD_1(max1619);
 
 /*
  * The MAX1619 registers
@@ -104,6 +103,7 @@ static struct i2c_driver max1619_driver = {
 
 struct max1619_data {
         struct i2c_client client;
+        struct class_device *class_dev;
         struct semaphore update_lock;
         char valid; /* zero until following fields are valid */
         unsigned long last_updated; /* in jiffies */
@@ -179,7 +179,7 @@ static int max1619_attach_adapter(struct i2c_adapter *adapter)
 {
         if (!(adapter->class & I2C_CLASS_HWMON))
                 return 0;
-        return i2c_detect(adapter, &addr_data, max1619_detect);
+        return i2c_probe(adapter, &addr_data, max1619_detect);
 }
 
 /*
@@ -275,6 +275,12 @@ static int max1619_detect(struct i2c_adapter *adapter, int address, int kind)
         max1619_init_client(new_client);
 
         /* Register sysfs hooks */
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto exit_detach;
+        }
+
         device_create_file(&new_client->dev, &dev_attr_temp1_input);
         device_create_file(&new_client->dev, &dev_attr_temp2_input);
         device_create_file(&new_client->dev, &dev_attr_temp2_min);
@@ -285,6 +291,8 @@ static int max1619_detect(struct i2c_adapter *adapter, int address, int kind)
 
         return 0;
 
+exit_detach:
+        i2c_detach_client(new_client);
 exit_free:
         kfree(data);
 exit:
@@ -308,15 +316,15 @@ static void max1619_init_client(struct i2c_client *client)
 
 static int max1619_detach_client(struct i2c_client *client)
 {
+        struct max1619_data *data = i2c_get_clientdata(client);
         int err;
 
-        if ((err = i2c_detach_client(client))) {
-                dev_err(&client->dev, "Client deregistration failed, "
-                        "client not detached.\n");
+        hwmon_device_unregister(data->class_dev);
+
+        if ((err = i2c_detach_client(client)))
                 return err;
-        }
 
-        kfree(i2c_get_clientdata(client));
+        kfree(data);
         return 0;
 }
 
diff --git a/drivers/hwmon/pc87360.c b/drivers/hwmon/pc87360.c
index fa4032d53b7..cf2a35799c7 100644
--- a/drivers/hwmon/pc87360.c
+++ b/drivers/hwmon/pc87360.c
@@ -38,23 +38,19 @@
 #include <linux/slab.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
-#include <linux/i2c-vid.h>
+#include <linux/i2c-isa.h>
+#include <linux/hwmon.h>
+#include <linux/hwmon-sysfs.h>
+#include <linux/hwmon-vid.h>
+#include <linux/err.h>
 #include <asm/io.h>
 
-static unsigned short normal_i2c[] = { I2C_CLIENT_END };
-static unsigned int normal_isa[] = { 0, I2C_CLIENT_ISA_END };
-static struct i2c_force_data forces[] = {{ NULL }};
 static u8 devid;
-static unsigned int extra_isa[3];
+static unsigned short address;
+static unsigned short extra_isa[3];
 static u8 confreg[4];
 
 enum chips { any_chip, pc87360, pc87363, pc87364, pc87365, pc87366 };
-static struct i2c_address_data addr_data = {
-        .normal_i2c             = normal_i2c,
-        .normal_isa             = normal_isa,
-        .forces                 = forces,
-};
 
 static int init = 1;
 module_param(init, int, 0);
@@ -186,6 +182,7 @@ static inline u8 PWM_TO_REG(int val, int inv)
 
 struct pc87360_data {
         struct i2c_client client;
+        struct class_device *class_dev;
         struct semaphore lock;
         struct semaphore update_lock;
         char valid;             /* !=0 if following fields are valid */
@@ -224,8 +221,7 @@ struct pc87360_data {
  * Functions declaration
  */
 
-static int pc87360_attach_adapter(struct i2c_adapter *adapter);
-static int pc87360_detect(struct i2c_adapter *adapter, int address, int kind);
+static int pc87360_detect(struct i2c_adapter *adapter);
 static int pc87360_detach_client(struct i2c_client *client);
 
 static int pc87360_read_value(struct pc87360_data *data, u8 ldi, u8 bank,
@@ -242,8 +238,7 @@ static struct pc87360_data *pc87360_update_device(struct device *dev);
 static struct i2c_driver pc87360_driver = {
         .owner          = THIS_MODULE,
         .name           = "pc87360",
-        .flags          = I2C_DF_NOTIFY,
-        .attach_adapter = pc87360_attach_adapter,
+        .attach_adapter = pc87360_detect,
         .detach_client  = pc87360_detach_client,
 };
 
@@ -251,168 +246,178 @@ static struct i2c_driver pc87360_driver = {
  * Sysfs stuff
  */
 
-static ssize_t set_fan_min(struct device *dev, const char *buf,
-        size_t count, int nr)
+static ssize_t show_fan_input(struct device *dev, struct device_attribute *devattr, char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct pc87360_data *data = pc87360_update_device(dev);
+        return sprintf(buf, "%u\n", FAN_FROM_REG(data->fan[attr->index],
+                       FAN_DIV_FROM_REG(data->fan_status[attr->index])));
+}
+static ssize_t show_fan_min(struct device *dev, struct device_attribute *devattr, char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct pc87360_data *data = pc87360_update_device(dev);
+        return sprintf(buf, "%u\n", FAN_FROM_REG(data->fan_min[attr->index],
+                       FAN_DIV_FROM_REG(data->fan_status[attr->index])));
+}
+static ssize_t show_fan_div(struct device *dev, struct device_attribute *devattr, char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct pc87360_data *data = pc87360_update_device(dev);
+        return sprintf(buf, "%u\n",
+                       FAN_DIV_FROM_REG(data->fan_status[attr->index]));
+}
+static ssize_t show_fan_status(struct device *dev, struct device_attribute *devattr, char *buf)
 {
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct pc87360_data *data = pc87360_update_device(dev);
+        return sprintf(buf, "%u\n",
+                       FAN_STATUS_FROM_REG(data->fan_status[attr->index]));
+}
+static ssize_t set_fan_min(struct device *dev, struct device_attribute *devattr, const char *buf,
+        size_t count)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
         struct i2c_client *client = to_i2c_client(dev);
         struct pc87360_data *data = i2c_get_clientdata(client);
         long fan_min = simple_strtol(buf, NULL, 10);
 
         down(&data->update_lock);
-        fan_min = FAN_TO_REG(fan_min, FAN_DIV_FROM_REG(data->fan_status[nr]));
+        fan_min = FAN_TO_REG(fan_min, FAN_DIV_FROM_REG(data->fan_status[attr->index]));
 
         /* If it wouldn't fit, change clock divisor */
         while (fan_min > 255
-            && (data->fan_status[nr] & 0x60) != 0x60) {
+            && (data->fan_status[attr->index] & 0x60) != 0x60) {
                 fan_min >>= 1;
-                data->fan[nr] >>= 1;
-                data->fan_status[nr] += 0x20;
+                data->fan[attr->index] >>= 1;
+                data->fan_status[attr->index] += 0x20;
         }
-        data->fan_min[nr] = fan_min > 255 ? 255 : fan_min;
-        pc87360_write_value(data, LD_FAN, NO_BANK, PC87360_REG_FAN_MIN(nr),
-                            data->fan_min[nr]);
+        data->fan_min[attr->index] = fan_min > 255 ? 255 : fan_min;
+        pc87360_write_value(data, LD_FAN, NO_BANK, PC87360_REG_FAN_MIN(attr->index),
+                            data->fan_min[attr->index]);
 
         /* Write new divider, preserve alarm bits */
-        pc87360_write_value(data, LD_FAN, NO_BANK, PC87360_REG_FAN_STATUS(nr),
-                            data->fan_status[nr] & 0xF9);
+        pc87360_write_value(data, LD_FAN, NO_BANK, PC87360_REG_FAN_STATUS(attr->index),
+                            data->fan_status[attr->index] & 0xF9);
         up(&data->update_lock);
 
         return count;
 }
 
 #define show_and_set_fan(offset) \
-static ssize_t show_fan##offset##_input(struct device *dev, struct device_attribute *attr, char *buf) \
-{ \
-        struct pc87360_data *data = pc87360_update_device(dev); \
-        return sprintf(buf, "%u\n", FAN_FROM_REG(data->fan[offset-1], \
-                       FAN_DIV_FROM_REG(data->fan_status[offset-1]))); \
-} \
-static ssize_t show_fan##offset##_min(struct device *dev, struct device_attribute *attr, char *buf) \
-{ \
-        struct pc87360_data *data = pc87360_update_device(dev); \
-        return sprintf(buf, "%u\n", FAN_FROM_REG(data->fan_min[offset-1], \
-                       FAN_DIV_FROM_REG(data->fan_status[offset-1]))); \
-} \
-static ssize_t show_fan##offset##_div(struct device *dev, struct device_attribute *attr, char *buf) \
-{ \
-        struct pc87360_data *data = pc87360_update_device(dev); \
-        return sprintf(buf, "%u\n", \
-                       FAN_DIV_FROM_REG(data->fan_status[offset-1])); \
-} \
-static ssize_t show_fan##offset##_status(struct device *dev, struct device_attribute *attr, char *buf) \
-{ \
-        struct pc87360_data *data = pc87360_update_device(dev); \
-        return sprintf(buf, "%u\n", \
-                       FAN_STATUS_FROM_REG(data->fan_status[offset-1])); \
-} \
-static ssize_t set_fan##offset##_min(struct device *dev, struct device_attribute *attr, const char *buf, \
-        size_t count) \
-{ \
-        return set_fan_min(dev, buf, count, offset-1); \
-} \
-static DEVICE_ATTR(fan##offset##_input, S_IRUGO, \
-        show_fan##offset##_input, NULL); \
-static DEVICE_ATTR(fan##offset##_min, S_IWUSR | S_IRUGO, \
-        show_fan##offset##_min, set_fan##offset##_min); \
-static DEVICE_ATTR(fan##offset##_div, S_IRUGO, \
-        show_fan##offset##_div, NULL); \
-static DEVICE_ATTR(fan##offset##_status, S_IRUGO, \
-        show_fan##offset##_status, NULL);
+static SENSOR_DEVICE_ATTR(fan##offset##_input, S_IRUGO, \
+        show_fan_input, NULL, offset-1); \
+static SENSOR_DEVICE_ATTR(fan##offset##_min, S_IWUSR | S_IRUGO, \
+        show_fan_min, set_fan_min, offset-1); \
+static SENSOR_DEVICE_ATTR(fan##offset##_div, S_IRUGO, \
+        show_fan_div, NULL, offset-1); \
+static SENSOR_DEVICE_ATTR(fan##offset##_status, S_IRUGO, \
+        show_fan_status, NULL, offset-1);
 show_and_set_fan(1)
 show_and_set_fan(2)
 show_and_set_fan(3)
 
+static ssize_t show_pwm(struct device *dev, struct device_attribute *devattr, char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct pc87360_data *data = pc87360_update_device(dev);
+        return sprintf(buf, "%u\n",
+                       PWM_FROM_REG(data->pwm[attr->index],
+                                    FAN_CONFIG_INVERT(data->fan_conf,
+                                                      attr->index)));
+}
+static ssize_t set_pwm(struct device *dev, struct device_attribute *devattr, const char *buf,
+        size_t count)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct i2c_client *client = to_i2c_client(dev);
+        struct pc87360_data *data = i2c_get_clientdata(client);
+        long val = simple_strtol(buf, NULL, 10);
+
+        down(&data->update_lock);
+        data->pwm[attr->index] = PWM_TO_REG(val,
+                              FAN_CONFIG_INVERT(data->fan_conf, attr->index));
+        pc87360_write_value(data, LD_FAN, NO_BANK, PC87360_REG_PWM(attr->index),
+                            data->pwm[attr->index]);
+        up(&data->update_lock);
+        return count;
+}
+
 #define show_and_set_pwm(offset) \
-static ssize_t show_pwm##offset(struct device *dev, struct device_attribute *attr, char *buf) \
-{ \
-        struct pc87360_data *data = pc87360_update_device(dev); \
-        return sprintf(buf, "%u\n", \
-                       PWM_FROM_REG(data->pwm[offset-1], \
-                                    FAN_CONFIG_INVERT(data->fan_conf, \
-                                                      offset-1))); \
-} \
-static ssize_t set_pwm##offset(struct device *dev, struct device_attribute *attr, const char *buf, \
-        size_t count) \
-{ \
-        struct i2c_client *client = to_i2c_client(dev); \
-        struct pc87360_data *data = i2c_get_clientdata(client); \
-        long val = simple_strtol(buf, NULL, 10); \
- \
-        down(&data->update_lock); \
-        data->pwm[offset-1] = PWM_TO_REG(val, \
-                              FAN_CONFIG_INVERT(data->fan_conf, offset-1)); \
-        pc87360_write_value(data, LD_FAN, NO_BANK, PC87360_REG_PWM(offset-1), \
-                            data->pwm[offset-1]); \
-        up(&data->update_lock); \
-        return count; \
-} \
-static DEVICE_ATTR(pwm##offset, S_IWUSR | S_IRUGO, \
-        show_pwm##offset, set_pwm##offset);
+static SENSOR_DEVICE_ATTR(pwm##offset, S_IWUSR | S_IRUGO, \
+        show_pwm, set_pwm, offset-1);
 show_and_set_pwm(1)
 show_and_set_pwm(2)
 show_and_set_pwm(3)
 
+static ssize_t show_in_input(struct device *dev, struct device_attribute *devattr, char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct pc87360_data *data = pc87360_update_device(dev);
+        return sprintf(buf, "%u\n", IN_FROM_REG(data->in[attr->index],
+                       data->in_vref));
+}
+static ssize_t show_in_min(struct device *dev, struct device_attribute *devattr, char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct pc87360_data *data = pc87360_update_device(dev);
+        return sprintf(buf, "%u\n", IN_FROM_REG(data->in_min[attr->index],
+                       data->in_vref));
+}
+static ssize_t show_in_max(struct device *dev, struct device_attribute *devattr, char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct pc87360_data *data = pc87360_update_device(dev);
+        return sprintf(buf, "%u\n", IN_FROM_REG(data->in_max[attr->index],
+                       data->in_vref));
+}
+static ssize_t show_in_status(struct device *dev, struct device_attribute *devattr, char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct pc87360_data *data = pc87360_update_device(dev);
+        return sprintf(buf, "%u\n", data->in_status[attr->index]);
+}
+static ssize_t set_in_min(struct device *dev, struct device_attribute *devattr, const char *buf,
+        size_t count)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct i2c_client *client = to_i2c_client(dev);
+        struct pc87360_data *data = i2c_get_clientdata(client);
+        long val = simple_strtol(buf, NULL, 10);
+
+        down(&data->update_lock);
+        data->in_min[attr->index] = IN_TO_REG(val, data->in_vref);
+        pc87360_write_value(data, LD_IN, attr->index, PC87365_REG_IN_MIN,
+                            data->in_min[attr->index]);
+        up(&data->update_lock);
+        return count;
+}
+static ssize_t set_in_max(struct device *dev, struct device_attribute *devattr, const char *buf,
+        size_t count)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct i2c_client *client = to_i2c_client(dev);
+        struct pc87360_data *data = i2c_get_clientdata(client);
+        long val = simple_strtol(buf, NULL, 10);
+
+        down(&data->update_lock);
+        data->in_max[attr->index] = IN_TO_REG(val,
+                               data->in_vref);
+        pc87360_write_value(data, LD_IN, attr->index, PC87365_REG_IN_MAX,
+                            data->in_max[attr->index]);
+        up(&data->update_lock);
+        return count;
+}
+
 #define show_and_set_in(offset) \
-static ssize_t show_in##offset##_input(struct device *dev, struct device_attribute *attr, char *buf) \
-{ \
-        struct pc87360_data *data = pc87360_update_device(dev); \
-        return sprintf(buf, "%u\n", IN_FROM_REG(data->in[offset], \
-                       data->in_vref)); \
-} \
-static ssize_t show_in##offset##_min(struct device *dev, struct device_attribute *attr, char *buf) \
-{ \
-        struct pc87360_data *data = pc87360_update_device(dev); \
-        return sprintf(buf, "%u\n", IN_FROM_REG(data->in_min[offset], \
-                       data->in_vref)); \
-} \
-static ssize_t show_in##offset##_max(struct device *dev, struct device_attribute *attr, char *buf) \
-{ \
-        struct pc87360_data *data = pc87360_update_device(dev); \
-        return sprintf(buf, "%u\n", IN_FROM_REG(data->in_max[offset], \
-                       data->in_vref)); \
-} \
-static ssize_t show_in##offset##_status(struct device *dev, struct device_attribute *attr, char *buf) \
-{ \
-        struct pc87360_data *data = pc87360_update_device(dev); \
-        return sprintf(buf, "%u\n", data->in_status[offset]); \
-} \
-static ssize_t set_in##offset##_min(struct device *dev, struct device_attribute *attr, const char *buf, \
-        size_t count) \
-{ \
-        struct i2c_client *client = to_i2c_client(dev); \
-        struct pc87360_data *data = i2c_get_clientdata(client); \
-        long val = simple_strtol(buf, NULL, 10); \
- \
-        down(&data->update_lock); \
-        data->in_min[offset] = IN_TO_REG(val, data->in_vref); \
-        pc87360_write_value(data, LD_IN, offset, PC87365_REG_IN_MIN, \
-                            data->in_min[offset]); \
-        up(&data->update_lock); \
-        return count; \
-} \
-static ssize_t set_in##offset##_max(struct device *dev, struct device_attribute *attr, const char *buf, \
-        size_t count) \
-{ \
-        struct i2c_client *client = to_i2c_client(dev); \
-        struct pc87360_data *data = i2c_get_clientdata(client); \
-        long val = simple_strtol(buf, NULL, 10); \
- \
-        down(&data->update_lock); \
-        data->in_max[offset] = IN_TO_REG(val, \
-                               data->in_vref); \
-        pc87360_write_value(data, LD_IN, offset, PC87365_REG_IN_MAX, \
-                            data->in_max[offset]); \
-        up(&data->update_lock); \
-        return count; \
-} \
-static DEVICE_ATTR(in##offset##_input, S_IRUGO, \
-        show_in##offset##_input, NULL); \
-static DEVICE_ATTR(in##offset##_min, S_IWUSR | S_IRUGO, \
-        show_in##offset##_min, set_in##offset##_min); \
-static DEVICE_ATTR(in##offset##_max, S_IWUSR | S_IRUGO, \
-        show_in##offset##_max, set_in##offset##_max); \
-static DEVICE_ATTR(in##offset##_status, S_IRUGO, \
-        show_in##offset##_status, NULL);
+static SENSOR_DEVICE_ATTR(in##offset##_input, S_IRUGO, \
+        show_in_input, NULL, offset); \
+static SENSOR_DEVICE_ATTR(in##offset##_min, S_IWUSR | S_IRUGO, \
+        show_in_min, set_in_min, offset); \
+static SENSOR_DEVICE_ATTR(in##offset##_max, S_IWUSR | S_IRUGO, \
+        show_in_max, set_in_max, offset); \
+static SENSOR_DEVICE_ATTR(in##offset##_status, S_IRUGO, \
+        show_in_status, NULL, offset);
 show_and_set_in(0)
 show_and_set_in(1)
 show_and_set_in(2)
@@ -425,88 +430,97 @@ show_and_set_in(8)
 show_and_set_in(9)
 show_and_set_in(10)
 
+static ssize_t show_therm_input(struct device *dev, struct device_attribute *devattr, char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct pc87360_data *data = pc87360_update_device(dev);
+        return sprintf(buf, "%u\n", IN_FROM_REG(data->in[attr->index],
+                       data->in_vref));
+}
+static ssize_t show_therm_min(struct device *dev, struct device_attribute *devattr, char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct pc87360_data *data = pc87360_update_device(dev);
+        return sprintf(buf, "%u\n", IN_FROM_REG(data->in_min[attr->index],
+                       data->in_vref));
+}
+static ssize_t show_therm_max(struct device *dev, struct device_attribute *devattr, char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct pc87360_data *data = pc87360_update_device(dev);
+        return sprintf(buf, "%u\n", IN_FROM_REG(data->in_max[attr->index],
+                       data->in_vref));
+}
+static ssize_t show_therm_crit(struct device *dev, struct device_attribute *devattr, char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct pc87360_data *data = pc87360_update_device(dev);
+        return sprintf(buf, "%u\n", IN_FROM_REG(data->in_crit[attr->index-11],
+                       data->in_vref));
+}
+static ssize_t show_therm_status(struct device *dev, struct device_attribute *devattr, char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct pc87360_data *data = pc87360_update_device(dev);
+        return sprintf(buf, "%u\n", data->in_status[attr->index]);
+}
+static ssize_t set_therm_min(struct device *dev, struct device_attribute *devattr, const char *buf,
+        size_t count)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct i2c_client *client = to_i2c_client(dev);
+        struct pc87360_data *data = i2c_get_clientdata(client);
+        long val = simple_strtol(buf, NULL, 10);
+
+        down(&data->update_lock);
+        data->in_min[attr->index] = IN_TO_REG(val, data->in_vref);
+        pc87360_write_value(data, LD_IN, attr->index, PC87365_REG_TEMP_MIN,
+                            data->in_min[attr->index]);
+        up(&data->update_lock);
+        return count;
+}
+static ssize_t set_therm_max(struct device *dev, struct device_attribute *devattr, const char *buf,
+        size_t count)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct i2c_client *client = to_i2c_client(dev);
+        struct pc87360_data *data = i2c_get_clientdata(client);
+        long val = simple_strtol(buf, NULL, 10);
+
+        down(&data->update_lock);
+        data->in_max[attr->index] = IN_TO_REG(val, data->in_vref);
+        pc87360_write_value(data, LD_IN, attr->index, PC87365_REG_TEMP_MAX,
+                            data->in_max[attr->index]);
+        up(&data->update_lock);
+        return count;
+}
+static ssize_t set_therm_crit(struct device *dev, struct device_attribute *devattr, const char *buf,
+        size_t count)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct i2c_client *client = to_i2c_client(dev);
+        struct pc87360_data *data = i2c_get_clientdata(client);
+        long val = simple_strtol(buf, NULL, 10);
+
+        down(&data->update_lock);
+        data->in_crit[attr->index-11] = IN_TO_REG(val, data->in_vref);
+        pc87360_write_value(data, LD_IN, attr->index, PC87365_REG_TEMP_CRIT,
+                            data->in_crit[attr->index-11]);
+        up(&data->update_lock);
+        return count;
+}
+
 #define show_and_set_therm(offset) \
-static ssize_t show_temp##offset##_input(struct device *dev, struct device_attribute *attr, char *buf) \
-{ \
-        struct pc87360_data *data = pc87360_update_device(dev); \
-        return sprintf(buf, "%u\n", IN_FROM_REG(data->in[offset+7], \
-                       data->in_vref)); \
-} \
-static ssize_t show_temp##offset##_min(struct device *dev, struct device_attribute *attr, char *buf) \
-{ \
-        struct pc87360_data *data = pc87360_update_device(dev); \
-        return sprintf(buf, "%u\n", IN_FROM_REG(data->in_min[offset+7], \
-                       data->in_vref)); \
-} \
-static ssize_t show_temp##offset##_max(struct device *dev, struct device_attribute *attr, char *buf) \
-{ \
-        struct pc87360_data *data = pc87360_update_device(dev); \
-        return sprintf(buf, "%u\n", IN_FROM_REG(data->in_max[offset+7], \
-                       data->in_vref)); \
-} \
-static ssize_t show_temp##offset##_crit(struct device *dev, struct device_attribute *attr, char *buf) \
-{ \
-        struct pc87360_data *data = pc87360_update_device(dev); \
-        return sprintf(buf, "%u\n", IN_FROM_REG(data->in_crit[offset-4], \
-                       data->in_vref)); \
-} \
-static ssize_t show_temp##offset##_status(struct device *dev, struct device_attribute *attr, char *buf) \
-{ \
-        struct pc87360_data *data = pc87360_update_device(dev); \
-        return sprintf(buf, "%u\n", data->in_status[offset+7]); \
-} \
-static ssize_t set_temp##offset##_min(struct device *dev, struct device_attribute *attr, const char *buf, \
-        size_t count) \
-{ \
-        struct i2c_client *client = to_i2c_client(dev); \
-        struct pc87360_data *data = i2c_get_clientdata(client); \
-        long val = simple_strtol(buf, NULL, 10); \
- \
-        down(&data->update_lock); \
-        data->in_min[offset+7] = IN_TO_REG(val, data->in_vref); \
-        pc87360_write_value(data, LD_IN, offset+7, PC87365_REG_TEMP_MIN, \
-                            data->in_min[offset+7]); \
-        up(&data->update_lock); \
-        return count; \
-} \
-static ssize_t set_temp##offset##_max(struct device *dev, struct device_attribute *attr, const char *buf, \
-        size_t count) \
-{ \
-        struct i2c_client *client = to_i2c_client(dev); \
-        struct pc87360_data *data = i2c_get_clientdata(client); \
-        long val = simple_strtol(buf, NULL, 10); \
- \
-        down(&data->update_lock); \
-        data->in_max[offset+7] = IN_TO_REG(val, data->in_vref); \
-        pc87360_write_value(data, LD_IN, offset+7, PC87365_REG_TEMP_MAX, \
-                            data->in_max[offset+7]); \
-        up(&data->update_lock); \
-        return count; \
-} \
-static ssize_t set_temp##offset##_crit(struct device *dev, struct device_attribute *attr, const char *buf, \
-        size_t count) \
-{ \
-        struct i2c_client *client = to_i2c_client(dev); \
-        struct pc87360_data *data = i2c_get_clientdata(client); \
-        long val = simple_strtol(buf, NULL, 10); \
- \
-        down(&data->update_lock); \
-        data->in_crit[offset-4] = IN_TO_REG(val, data->in_vref); \
-        pc87360_write_value(data, LD_IN, offset+7, PC87365_REG_TEMP_CRIT, \
-                            data->in_crit[offset-4]); \
-        up(&data->update_lock); \
-        return count; \
-} \
-static DEVICE_ATTR(temp##offset##_input, S_IRUGO, \
-        show_temp##offset##_input, NULL); \
-static DEVICE_ATTR(temp##offset##_min, S_IWUSR | S_IRUGO, \
-        show_temp##offset##_min, set_temp##offset##_min); \
-static DEVICE_ATTR(temp##offset##_max, S_IWUSR | S_IRUGO, \
-        show_temp##offset##_max, set_temp##offset##_max); \
-static DEVICE_ATTR(temp##offset##_crit, S_IWUSR | S_IRUGO, \
-        show_temp##offset##_crit, set_temp##offset##_crit); \
-static DEVICE_ATTR(temp##offset##_status, S_IRUGO, \
-        show_temp##offset##_status, NULL);
+static SENSOR_DEVICE_ATTR(temp##offset##_input, S_IRUGO, \
+        show_therm_input, NULL, 11+offset-4); \
+static SENSOR_DEVICE_ATTR(temp##offset##_min, S_IWUSR | S_IRUGO, \
+        show_therm_min, set_therm_min, 11+offset-4); \
+static SENSOR_DEVICE_ATTR(temp##offset##_max, S_IWUSR | S_IRUGO, \
+        show_therm_max, set_therm_max, 11+offset-4); \
+static SENSOR_DEVICE_ATTR(temp##offset##_crit, S_IWUSR | S_IRUGO, \
+        show_therm_crit, set_therm_crit, 11+offset-4); \
+static SENSOR_DEVICE_ATTR(temp##offset##_status, S_IRUGO, \
+        show_therm_status, NULL, 11+offset-4);
 show_and_set_therm(4)
 show_and_set_therm(5)
 show_and_set_therm(6)
@@ -539,84 +553,93 @@ static ssize_t show_in_alarms(struct device *dev, struct device_attribute *attr,
 }
 static DEVICE_ATTR(alarms_in, S_IRUGO, show_in_alarms, NULL);
 
+static ssize_t show_temp_input(struct device *dev, struct device_attribute *devattr, char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct pc87360_data *data = pc87360_update_device(dev);
+        return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp[attr->index]));
+}
+static ssize_t show_temp_min(struct device *dev, struct device_attribute *devattr, char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct pc87360_data *data = pc87360_update_device(dev);
+        return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_min[attr->index]));
+}
+static ssize_t show_temp_max(struct device *dev, struct device_attribute *devattr, char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct pc87360_data *data = pc87360_update_device(dev);
+        return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_max[attr->index]));
+}
+static ssize_t show_temp_crit(struct device *dev, struct device_attribute *devattr, char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct pc87360_data *data = pc87360_update_device(dev);
+        return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_crit[attr->index]));
+}
+static ssize_t show_temp_status(struct device *dev, struct device_attribute *devattr, char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct pc87360_data *data = pc87360_update_device(dev);
+        return sprintf(buf, "%d\n", data->temp_status[attr->index]);
+}
+static ssize_t set_temp_min(struct device *dev, struct device_attribute *devattr, const char *buf,
+        size_t count)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct i2c_client *client = to_i2c_client(dev);
+        struct pc87360_data *data = i2c_get_clientdata(client);
+        long val = simple_strtol(buf, NULL, 10);
+
+        down(&data->update_lock);
+        data->temp_min[attr->index] = TEMP_TO_REG(val);
+        pc87360_write_value(data, LD_TEMP, attr->index, PC87365_REG_TEMP_MIN,
+                            data->temp_min[attr->index]);
+        up(&data->update_lock);
+        return count;
+}
+static ssize_t set_temp_max(struct device *dev, struct device_attribute *devattr, const char *buf,
+        size_t count)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct i2c_client *client = to_i2c_client(dev);
+        struct pc87360_data *data = i2c_get_clientdata(client);
+        long val = simple_strtol(buf, NULL, 10);
+
+        down(&data->update_lock);
+        data->temp_max[attr->index] = TEMP_TO_REG(val);
+        pc87360_write_value(data, LD_TEMP, attr->index, PC87365_REG_TEMP_MAX,
+                            data->temp_max[attr->index]);
+        up(&data->update_lock);
+        return count;
+}
+static ssize_t set_temp_crit(struct device *dev, struct device_attribute *devattr, const char *buf,
+        size_t count)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct i2c_client *client = to_i2c_client(dev);
+        struct pc87360_data *data = i2c_get_clientdata(client);
+        long val = simple_strtol(buf, NULL, 10);
+
+        down(&data->update_lock);
+        data->temp_crit[attr->index] = TEMP_TO_REG(val);
+        pc87360_write_value(data, LD_TEMP, attr->index, PC87365_REG_TEMP_CRIT,
+                            data->temp_crit[attr->index]);
+        up(&data->update_lock);
+        return count;
+}
+
 #define show_and_set_temp(offset) \
-static ssize_t show_temp##offset##_input(struct device *dev, struct device_attribute *attr, char *buf) \
-{ \
-        struct pc87360_data *data = pc87360_update_device(dev); \
-        return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp[offset-1])); \
-} \
-static ssize_t show_temp##offset##_min(struct device *dev, struct device_attribute *attr, char *buf) \
-{ \
-        struct pc87360_data *data = pc87360_update_device(dev); \
-        return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_min[offset-1])); \
-} \
-static ssize_t show_temp##offset##_max(struct device *dev, struct device_attribute *attr, char *buf) \
-{ \
-        struct pc87360_data *data = pc87360_update_device(dev); \
-        return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_max[offset-1])); \
-}\
-static ssize_t show_temp##offset##_crit(struct device *dev, struct device_attribute *attr, char *buf) \
-{ \
-        struct pc87360_data *data = pc87360_update_device(dev); \
-        return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_crit[offset-1])); \
-}\
-static ssize_t show_temp##offset##_status(struct device *dev, struct device_attribute *attr, char *buf) \
-{ \
-        struct pc87360_data *data = pc87360_update_device(dev); \
-        return sprintf(buf, "%d\n", data->temp_status[offset-1]); \
-}\
-static ssize_t set_temp##offset##_min(struct device *dev, struct device_attribute *attr, const char *buf, \
-        size_t count) \
-{ \
-        struct i2c_client *client = to_i2c_client(dev); \
-        struct pc87360_data *data = i2c_get_clientdata(client); \
-        long val = simple_strtol(buf, NULL, 10); \
- \
-        down(&data->update_lock); \
-        data->temp_min[offset-1] = TEMP_TO_REG(val); \
-        pc87360_write_value(data, LD_TEMP, offset-1, PC87365_REG_TEMP_MIN, \
-                            data->temp_min[offset-1]); \
-        up(&data->update_lock); \
-        return count; \
-} \
-static ssize_t set_temp##offset##_max(struct device *dev, struct device_attribute *attr, const char *buf, \
-        size_t count) \
-{ \
-        struct i2c_client *client = to_i2c_client(dev); \
-        struct pc87360_data *data = i2c_get_clientdata(client); \
-        long val = simple_strtol(buf, NULL, 10); \
- \
-        down(&data->update_lock); \
-        data->temp_max[offset-1] = TEMP_TO_REG(val); \
-        pc87360_write_value(data, LD_TEMP, offset-1, PC87365_REG_TEMP_MAX, \
-                            data->temp_max[offset-1]); \
-        up(&data->update_lock); \
-        return count; \
-} \
-static ssize_t set_temp##offset##_crit(struct device *dev, struct device_attribute *attr, const char *buf, \
-        size_t count) \
-{ \
-        struct i2c_client *client = to_i2c_client(dev); \
-        struct pc87360_data *data = i2c_get_clientdata(client); \
-        long val = simple_strtol(buf, NULL, 10); \
- \
-        down(&data->update_lock); \
-        data->temp_crit[offset-1] = TEMP_TO_REG(val); \
-        pc87360_write_value(data, LD_TEMP, offset-1, PC87365_REG_TEMP_CRIT, \
-                            data->temp_crit[offset-1]); \
-        up(&data->update_lock); \
-        return count; \
-} \
-static DEVICE_ATTR(temp##offset##_input, S_IRUGO, \
-        show_temp##offset##_input, NULL); \
-static DEVICE_ATTR(temp##offset##_min, S_IWUSR | S_IRUGO, \
-        show_temp##offset##_min, set_temp##offset##_min); \
-static DEVICE_ATTR(temp##offset##_max, S_IWUSR | S_IRUGO, \
-        show_temp##offset##_max, set_temp##offset##_max); \
-static DEVICE_ATTR(temp##offset##_crit, S_IWUSR | S_IRUGO, \
-        show_temp##offset##_crit, set_temp##offset##_crit); \
-static DEVICE_ATTR(temp##offset##_status, S_IRUGO, \
-        show_temp##offset##_status, NULL);
+static SENSOR_DEVICE_ATTR(temp##offset##_input, S_IRUGO, \
+        show_temp_input, NULL, offset-1); \
+static SENSOR_DEVICE_ATTR(temp##offset##_min, S_IWUSR | S_IRUGO, \
+        show_temp_min, set_temp_min, offset-1); \
+static SENSOR_DEVICE_ATTR(temp##offset##_max, S_IWUSR | S_IRUGO, \
+        show_temp_max, set_temp_max, offset-1); \
+static SENSOR_DEVICE_ATTR(temp##offset##_crit, S_IWUSR | S_IRUGO, \
+        show_temp_crit, set_temp_crit, offset-1); \
+static SENSOR_DEVICE_ATTR(temp##offset##_status, S_IRUGO, \
+        show_temp_status, NULL, offset-1);
 show_and_set_temp(1)
 show_and_set_temp(2)
 show_and_set_temp(3)
@@ -632,12 +655,7 @@ static DEVICE_ATTR(alarms_temp, S_IRUGO, show_temp_alarms, NULL);
  * Device detection, registration and update
  */
 
-static int pc87360_attach_adapter(struct i2c_adapter *adapter)
-{
-        return i2c_detect(adapter, &addr_data, pc87360_detect);
-}
-
-static int pc87360_find(int sioaddr, u8 *devid, int *address)
+static int __init pc87360_find(int sioaddr, u8 *devid, unsigned short *addresses)
 {
         u16 val;
         int i;
@@ -683,7 +701,7 @@ static int pc87360_find(int sioaddr, u8 *devid, int *address)
                         continue;
                 }
 
-                address[i] = val;
+                addresses[i] = val;
 
                 if (i==0) { /* Fans */
                         confreg[0] = superio_inb(sioaddr, 0xF0);
@@ -727,9 +745,7 @@ static int pc87360_find(int sioaddr, u8 *devid, int *address)
         return 0;
 }
 
-/* We don't really care about the address.
-   Read from extra_isa instead. */
-int pc87360_detect(struct i2c_adapter *adapter, int address, int kind)
+static int pc87360_detect(struct i2c_adapter *adapter)
 {
         int i;
         struct i2c_client *new_client;
@@ -738,9 +754,6 @@ int pc87360_detect(struct i2c_adapter *adapter, int address, int kind)
         const char *name = "pc87360";
         int use_thermistors = 0;
 
-        if (!i2c_is_isa_adapter(adapter))
-                return -ENODEV;
-
         if (!(data = kmalloc(sizeof(struct pc87360_data), GFP_KERNEL)))
                 return -ENOMEM;
         memset(data, 0x00, sizeof(struct pc87360_data));
@@ -838,51 +851,57 @@ int pc87360_detect(struct i2c_adapter *adapter, int address, int kind)
         }
 
         /* Register sysfs hooks */
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto ERROR3;
+        }
+
         if (data->innr) {
-                device_create_file(&new_client->dev, &dev_attr_in0_input);
-                device_create_file(&new_client->dev, &dev_attr_in1_input);
-                device_create_file(&new_client->dev, &dev_attr_in2_input);
-                device_create_file(&new_client->dev, &dev_attr_in3_input);
-                device_create_file(&new_client->dev, &dev_attr_in4_input);
-                device_create_file(&new_client->dev, &dev_attr_in5_input);
-                device_create_file(&new_client->dev, &dev_attr_in6_input);
-                device_create_file(&new_client->dev, &dev_attr_in7_input);
-                device_create_file(&new_client->dev, &dev_attr_in8_input);
-                device_create_file(&new_client->dev, &dev_attr_in9_input);
-                device_create_file(&new_client->dev, &dev_attr_in10_input);
-                device_create_file(&new_client->dev, &dev_attr_in0_min);
-                device_create_file(&new_client->dev, &dev_attr_in1_min);
-                device_create_file(&new_client->dev, &dev_attr_in2_min);
-                device_create_file(&new_client->dev, &dev_attr_in3_min);
-                device_create_file(&new_client->dev, &dev_attr_in4_min);
-                device_create_file(&new_client->dev, &dev_attr_in5_min);
-                device_create_file(&new_client->dev, &dev_attr_in6_min);
-                device_create_file(&new_client->dev, &dev_attr_in7_min);
-                device_create_file(&new_client->dev, &dev_attr_in8_min);
-                device_create_file(&new_client->dev, &dev_attr_in9_min);
-                device_create_file(&new_client->dev, &dev_attr_in10_min);
-                device_create_file(&new_client->dev, &dev_attr_in0_max);
-                device_create_file(&new_client->dev, &dev_attr_in1_max);
-                device_create_file(&new_client->dev, &dev_attr_in2_max);
-                device_create_file(&new_client->dev, &dev_attr_in3_max);
-                device_create_file(&new_client->dev, &dev_attr_in4_max);
-                device_create_file(&new_client->dev, &dev_attr_in5_max);
-                device_create_file(&new_client->dev, &dev_attr_in6_max);
-                device_create_file(&new_client->dev, &dev_attr_in7_max);
-                device_create_file(&new_client->dev, &dev_attr_in8_max);
-                device_create_file(&new_client->dev, &dev_attr_in9_max);
-                device_create_file(&new_client->dev, &dev_attr_in10_max);
-                device_create_file(&new_client->dev, &dev_attr_in0_status);
-                device_create_file(&new_client->dev, &dev_attr_in1_status);
-                device_create_file(&new_client->dev, &dev_attr_in2_status);
-                device_create_file(&new_client->dev, &dev_attr_in3_status);
-                device_create_file(&new_client->dev, &dev_attr_in4_status);
-                device_create_file(&new_client->dev, &dev_attr_in5_status);
-                device_create_file(&new_client->dev, &dev_attr_in6_status);
-                device_create_file(&new_client->dev, &dev_attr_in7_status);
-                device_create_file(&new_client->dev, &dev_attr_in8_status);
-                device_create_file(&new_client->dev, &dev_attr_in9_status);
-                device_create_file(&new_client->dev, &dev_attr_in10_status);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in0_input.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in1_input.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in2_input.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in3_input.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in4_input.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in5_input.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in6_input.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in7_input.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in8_input.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in9_input.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in10_input.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in0_min.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in1_min.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in2_min.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in3_min.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in4_min.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in5_min.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in6_min.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in7_min.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in8_min.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in9_min.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in10_min.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in0_max.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in1_max.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in2_max.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in3_max.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in4_max.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in5_max.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in6_max.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in7_max.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in8_max.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in9_max.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in10_max.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in0_status.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in1_status.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in2_status.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in3_status.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in4_status.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in5_status.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in6_status.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in7_status.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in8_status.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in9_status.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in10_status.dev_attr);
 
                 device_create_file(&new_client->dev, &dev_attr_cpu0_vid);
                 device_create_file(&new_client->dev, &dev_attr_vrm);
@@ -890,90 +909,92 @@ int pc87360_detect(struct i2c_adapter *adapter, int address, int kind)
         }
 
         if (data->tempnr) {
-                device_create_file(&new_client->dev, &dev_attr_temp1_input);
-                device_create_file(&new_client->dev, &dev_attr_temp2_input);
-                device_create_file(&new_client->dev, &dev_attr_temp1_min);
-                device_create_file(&new_client->dev, &dev_attr_temp2_min);
-                device_create_file(&new_client->dev, &dev_attr_temp1_max);
-                device_create_file(&new_client->dev, &dev_attr_temp2_max);
-                device_create_file(&new_client->dev, &dev_attr_temp1_crit);
-                device_create_file(&new_client->dev, &dev_attr_temp2_crit);
-                device_create_file(&new_client->dev, &dev_attr_temp1_status);
-                device_create_file(&new_client->dev, &dev_attr_temp2_status);
+                device_create_file(&new_client->dev, &sensor_dev_attr_temp1_input.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_temp2_input.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_temp1_min.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_temp2_min.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_temp1_max.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_temp2_max.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_temp1_crit.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_temp2_crit.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_temp1_status.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_temp2_status.dev_attr);
 
                 device_create_file(&new_client->dev, &dev_attr_alarms_temp);
         }
         if (data->tempnr == 3) {
-                device_create_file(&new_client->dev, &dev_attr_temp3_input);
-                device_create_file(&new_client->dev, &dev_attr_temp3_min);
-                device_create_file(&new_client->dev, &dev_attr_temp3_max);
-                device_create_file(&new_client->dev, &dev_attr_temp3_crit);
-                device_create_file(&new_client->dev, &dev_attr_temp3_status);
+                device_create_file(&new_client->dev, &sensor_dev_attr_temp3_input.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_temp3_min.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_temp3_max.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_temp3_crit.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_temp3_status.dev_attr);
         }
         if (data->innr == 14) {
-                device_create_file(&new_client->dev, &dev_attr_temp4_input);
-                device_create_file(&new_client->dev, &dev_attr_temp5_input);
-                device_create_file(&new_client->dev, &dev_attr_temp6_input);
-                device_create_file(&new_client->dev, &dev_attr_temp4_min);
-                device_create_file(&new_client->dev, &dev_attr_temp5_min);
-                device_create_file(&new_client->dev, &dev_attr_temp6_min);
-                device_create_file(&new_client->dev, &dev_attr_temp4_max);
-                device_create_file(&new_client->dev, &dev_attr_temp5_max);
-                device_create_file(&new_client->dev, &dev_attr_temp6_max);
-                device_create_file(&new_client->dev, &dev_attr_temp4_crit);
-                device_create_file(&new_client->dev, &dev_attr_temp5_crit);
-                device_create_file(&new_client->dev, &dev_attr_temp6_crit);
-                device_create_file(&new_client->dev, &dev_attr_temp4_status);
-                device_create_file(&new_client->dev, &dev_attr_temp5_status);
-                device_create_file(&new_client->dev, &dev_attr_temp6_status);
+                device_create_file(&new_client->dev, &sensor_dev_attr_temp4_input.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_temp5_input.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_temp6_input.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_temp4_min.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_temp5_min.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_temp6_min.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_temp4_max.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_temp5_max.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_temp6_max.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_temp4_crit.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_temp5_crit.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_temp6_crit.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_temp4_status.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_temp5_status.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_temp6_status.dev_attr);
         }
 
         if (data->fannr) {
                 if (FAN_CONFIG_MONITOR(data->fan_conf, 0)) {
                         device_create_file(&new_client->dev,
-                                           &dev_attr_fan1_input);
+                                           &sensor_dev_attr_fan1_input.dev_attr);
                         device_create_file(&new_client->dev,
-                                           &dev_attr_fan1_min);
+                                           &sensor_dev_attr_fan1_min.dev_attr);
                         device_create_file(&new_client->dev,
-                                           &dev_attr_fan1_div);
+                                           &sensor_dev_attr_fan1_div.dev_attr);
                         device_create_file(&new_client->dev,
-                                           &dev_attr_fan1_status);
+                                           &sensor_dev_attr_fan1_status.dev_attr);
                 }
 
                 if (FAN_CONFIG_MONITOR(data->fan_conf, 1)) {
                         device_create_file(&new_client->dev,
-                                           &dev_attr_fan2_input);
+                                           &sensor_dev_attr_fan2_input.dev_attr);
                         device_create_file(&new_client->dev,
-                                           &dev_attr_fan2_min);
+                                           &sensor_dev_attr_fan2_min.dev_attr);
                         device_create_file(&new_client->dev,
-                                           &dev_attr_fan2_div);
+                                           &sensor_dev_attr_fan2_div.dev_attr);
                         device_create_file(&new_client->dev,
-                                           &dev_attr_fan2_status);
+                                           &sensor_dev_attr_fan2_status.dev_attr);
                 }
 
                 if (FAN_CONFIG_CONTROL(data->fan_conf, 0))
-                        device_create_file(&new_client->dev, &dev_attr_pwm1);
+                        device_create_file(&new_client->dev, &sensor_dev_attr_pwm1.dev_attr);
                 if (FAN_CONFIG_CONTROL(data->fan_conf, 1))
-                        device_create_file(&new_client->dev, &dev_attr_pwm2);
+                        device_create_file(&new_client->dev, &sensor_dev_attr_pwm2.dev_attr);
         }
         if (data->fannr == 3) {
                 if (FAN_CONFIG_MONITOR(data->fan_conf, 2)) {
                         device_create_file(&new_client->dev,
-                                           &dev_attr_fan3_input);
+                                           &sensor_dev_attr_fan3_input.dev_attr);
                         device_create_file(&new_client->dev,
-                                           &dev_attr_fan3_min);
+                                           &sensor_dev_attr_fan3_min.dev_attr);
                         device_create_file(&new_client->dev,
-                                           &dev_attr_fan3_div);
+                                           &sensor_dev_attr_fan3_div.dev_attr);
                         device_create_file(&new_client->dev,
-                                           &dev_attr_fan3_status);
+                                           &sensor_dev_attr_fan3_status.dev_attr);
                 }
 
                 if (FAN_CONFIG_CONTROL(data->fan_conf, 2))
-                        device_create_file(&new_client->dev, &dev_attr_pwm3);
+                        device_create_file(&new_client->dev, &sensor_dev_attr_pwm3.dev_attr);
         }
 
         return 0;
 
+ERROR3:
+        i2c_detach_client(new_client);
 ERROR2:
         for (i = 0; i < 3; i++) {
                 if (data->address[i]) {
@@ -990,11 +1011,10 @@ static int pc87360_detach_client(struct i2c_client *client)
         struct pc87360_data *data = i2c_get_clientdata(client);
         int i;
 
-        if ((i = i2c_detach_client(client))) {
-                dev_err(&client->dev, "Client deregistration failed, "
-                        "client not detached.\n");
+        hwmon_device_unregister(data->class_dev);
+
+        if ((i = i2c_detach_client(client)))
                 return i;
-        }
 
         for (i = 0; i < 3; i++) {
                 if (data->address[i]) {
@@ -1320,23 +1340,23 @@ static int __init pc87360_init(void)
         /* Arbitrarily pick one of the addresses */
         for (i = 0; i < 3; i++) {
                 if (extra_isa[i] != 0x0000) {
-                        normal_isa[0] = extra_isa[i];
+                        address = extra_isa[i];
                         break;
                 }
         }
 
-        if (normal_isa[0] == 0x0000) {
+        if (address == 0x0000) {
                 printk(KERN_WARNING "pc87360: No active logical device, "
                        "module not inserted.\n");
                 return -ENODEV;
         }
 
-        return i2c_add_driver(&pc87360_driver);
+        return i2c_isa_add_driver(&pc87360_driver);
 }
 
 static void __exit pc87360_exit(void)
 {
-        i2c_del_driver(&pc87360_driver);
+        i2c_isa_del_driver(&pc87360_driver);
 }
 
 
diff --git a/drivers/hwmon/sis5595.c b/drivers/hwmon/sis5595.c
index 6bbfc8fb4f1..8610bce0824 100644
--- a/drivers/hwmon/sis5595.c
+++ b/drivers/hwmon/sis5595.c
@@ -55,7 +55,9 @@
 #include <linux/ioport.h>
 #include <linux/pci.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
+#include <linux/i2c-isa.h>
+#include <linux/hwmon.h>
+#include <linux/err.h>
 #include <linux/init.h>
 #include <linux/jiffies.h>
 #include <asm/io.h>
@@ -68,14 +70,10 @@ module_param(force_addr, ushort, 0);
 MODULE_PARM_DESC(force_addr,
                  "Initialize the base address of the sensors");
 
-/* Addresses to scan.
+/* Device address
    Note that we can't determine the ISA address until we have initialized
    our module */
-static unsigned short normal_i2c[] = { I2C_CLIENT_END };
-static unsigned int normal_isa[] = { 0x0000, I2C_CLIENT_ISA_END };
-
-/* Insmod parameters */
-SENSORS_INSMOD_1(sis5595);
+static unsigned short address;
 
 /* Many SIS5595 constants specified below */
 
@@ -168,6 +166,7 @@ static inline u8 DIV_TO_REG(int val)
    allocated. */
 struct sis5595_data {
         struct i2c_client client;
+        struct class_device *class_dev;
         struct semaphore lock;
 
         struct semaphore update_lock;
@@ -190,8 +189,7 @@ struct sis5595_data {
 
 static struct pci_dev *s_bridge;        /* pointer to the (only) sis5595 */
 
-static int sis5595_attach_adapter(struct i2c_adapter *adapter);
-static int sis5595_detect(struct i2c_adapter *adapter, int address, int kind);
+static int sis5595_detect(struct i2c_adapter *adapter);
 static int sis5595_detach_client(struct i2c_client *client);
 
 static int sis5595_read_value(struct i2c_client *client, u8 register);
@@ -202,9 +200,7 @@ static void sis5595_init_client(struct i2c_client *client);
 static struct i2c_driver sis5595_driver = {
         .owner          = THIS_MODULE,
         .name           = "sis5595",
-        .id             = I2C_DRIVERID_SIS5595,
-        .flags          = I2C_DF_NOTIFY,
-        .attach_adapter = sis5595_attach_adapter,
+        .attach_adapter = sis5595_detect,
         .detach_client  = sis5595_detach_client,
 };
 
@@ -476,14 +472,7 @@ static ssize_t show_alarms(struct device *dev, struct device_attribute *attr, ch
 static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL);
  
 /* This is called when the module is loaded */
-static int sis5595_attach_adapter(struct i2c_adapter *adapter)
-{
-        if (!(adapter->class & I2C_CLASS_HWMON))
-                return 0;
-        return i2c_detect(adapter, &addr_data, sis5595_detect);
-}
-
-int sis5595_detect(struct i2c_adapter *adapter, int address, int kind)
+static int sis5595_detect(struct i2c_adapter *adapter)
 {
         int err = 0;
         int i;
@@ -492,10 +481,6 @@ int sis5595_detect(struct i2c_adapter *adapter, int address, int kind)
         char val;
         u16 a;
 
-        /* Make sure we are probing the ISA bus!!  */
-        if (!i2c_is_isa_adapter(adapter))
-                goto exit;
-
         if (force_addr)
                 address = force_addr & ~(SIS5595_EXTENT - 1);
         /* Reserve the ISA region */
@@ -578,6 +563,12 @@ int sis5595_detect(struct i2c_adapter *adapter, int address, int kind)
         }
 
         /* Register sysfs hooks */
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto exit_detach;
+        }
+
         device_create_file(&new_client->dev, &dev_attr_in0_input);
         device_create_file(&new_client->dev, &dev_attr_in0_min);
         device_create_file(&new_client->dev, &dev_attr_in0_max);
@@ -608,7 +599,9 @@ int sis5595_detect(struct i2c_adapter *adapter, int address, int kind)
                 device_create_file(&new_client->dev, &dev_attr_temp1_max_hyst);
         }
         return 0;
-        
+
+exit_detach:
+        i2c_detach_client(new_client);
 exit_free:
         kfree(data);
 exit_release:
@@ -619,18 +612,17 @@ exit:
 
 static int sis5595_detach_client(struct i2c_client *client)
 {
+        struct sis5595_data *data = i2c_get_clientdata(client);
         int err;
 
-        if ((err = i2c_detach_client(client))) {
-                dev_err(&client->dev,
-                    "Client deregistration failed, client not detached.\n");
+        hwmon_device_unregister(data->class_dev);
+
+        if ((err = i2c_detach_client(client)))
                 return err;
-        }
 
-        if (i2c_is_isa_client(client))
-                release_region(client->addr, SIS5595_EXTENT);
+        release_region(client->addr, SIS5595_EXTENT);
 
-        kfree(i2c_get_clientdata(client));
+        kfree(data);
 
         return 0;
 }
@@ -745,7 +737,6 @@ static int __devinit sis5595_pci_probe(struct pci_dev *dev,
 {
         u16 val;
         int *i;
-        int addr = 0;
 
         for (i = blacklist; *i != 0; i++) {
                 struct pci_dev *dev;
@@ -761,22 +752,19 @@ static int __devinit sis5595_pci_probe(struct pci_dev *dev,
             pci_read_config_word(dev, SIS5595_BASE_REG, &val))
                 return -ENODEV;
         
-        addr = val & ~(SIS5595_EXTENT - 1);
-        if (addr == 0 && force_addr == 0) {
+        address = val & ~(SIS5595_EXTENT - 1);
+        if (address == 0 && force_addr == 0) {
                 dev_err(&dev->dev, "Base address not set - upgrade BIOS or use force_addr=0xaddr\n");
                 return -ENODEV;
         }
-        if (force_addr)
-                addr = force_addr;      /* so detect will get called */
 
-        if (!addr) {
+        if (!address) {
                 dev_err(&dev->dev,"No SiS 5595 sensors found.\n");
                 return -ENODEV;
         }
-        normal_isa[0] = addr;
 
         s_bridge = pci_dev_get(dev);
-        if (i2c_add_driver(&sis5595_driver)) {
+        if (i2c_isa_add_driver(&sis5595_driver)) {
                 pci_dev_put(s_bridge);
                 s_bridge = NULL;
         }
@@ -803,7 +791,7 @@ static void __exit sm_sis5595_exit(void)
 {
         pci_unregister_driver(&sis5595_pci_driver);
         if (s_bridge != NULL) {
-                i2c_del_driver(&sis5595_driver);
+                i2c_isa_del_driver(&sis5595_driver);
                 pci_dev_put(s_bridge);
                 s_bridge = NULL;
         }
diff --git a/drivers/hwmon/smsc47b397.c b/drivers/hwmon/smsc47b397.c
index fdeeb3ab6f2..7fe71576dea 100644
--- a/drivers/hwmon/smsc47b397.c
+++ b/drivers/hwmon/smsc47b397.c
@@ -31,23 +31,14 @@
 #include <linux/ioport.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
+#include <linux/i2c-isa.h>
+#include <linux/hwmon.h>
+#include <linux/err.h>
 #include <linux/init.h>
 #include <asm/io.h>
 
-static unsigned short normal_i2c[] = { I2C_CLIENT_END };
 /* Address is autodetected, there is no default value */
-static unsigned int normal_isa[] = { 0x0000, I2C_CLIENT_ISA_END };
-static struct i2c_force_data forces[] = {{NULL}};
-
-enum chips { any_chip, smsc47b397 };
-static struct i2c_address_data addr_data = {
-        .normal_i2c             = normal_i2c,
-        .normal_isa             = normal_isa,
-        .probe                  = normal_i2c,           /* cheat */
-        .ignore                 = normal_i2c,           /* cheat */
-        .forces                 = forces,
-};
+static unsigned short address;
 
 /* Super-I/0 registers and commands */
 
@@ -100,6 +91,7 @@ static u8 smsc47b397_reg_temp[] = {0x25, 0x26, 0x27, 0x80};
 
 struct smsc47b397_data {
         struct i2c_client client;
+        struct class_device *class_dev;
         struct semaphore lock;
 
         struct semaphore update_lock;
@@ -215,52 +207,40 @@ sysfs_fan(4);
 #define device_create_file_fan(client, num) \
         device_create_file(&client->dev, &dev_attr_fan##num##_input)
 
-static int smsc47b397_detect(struct i2c_adapter *adapter, int addr, int kind);
-
-static int smsc47b397_attach_adapter(struct i2c_adapter *adapter)
-{
-        if (!(adapter->class & I2C_CLASS_HWMON))
-                return 0;
-        return i2c_detect(adapter, &addr_data, smsc47b397_detect);
-}
-
 static int smsc47b397_detach_client(struct i2c_client *client)
 {
+        struct smsc47b397_data *data = i2c_get_clientdata(client);
         int err;
 
-        if ((err = i2c_detach_client(client))) {
-                dev_err(&client->dev, "Client deregistration failed, "
-                        "client not detached.\n");
+        hwmon_device_unregister(data->class_dev);
+
+        if ((err = i2c_detach_client(client)))
                 return err;
-        }
 
         release_region(client->addr, SMSC_EXTENT);
-        kfree(i2c_get_clientdata(client));
+        kfree(data);
 
         return 0;
 }
 
+static int smsc47b397_detect(struct i2c_adapter *adapter);
+
 static struct i2c_driver smsc47b397_driver = {
         .owner          = THIS_MODULE,
         .name           = "smsc47b397",
-        .id             = I2C_DRIVERID_SMSC47B397,
-        .flags          = I2C_DF_NOTIFY,
-        .attach_adapter = smsc47b397_attach_adapter,
+        .attach_adapter = smsc47b397_detect,
         .detach_client  = smsc47b397_detach_client,
 };
 
-static int smsc47b397_detect(struct i2c_adapter *adapter, int addr, int kind)
+static int smsc47b397_detect(struct i2c_adapter *adapter)
 {
         struct i2c_client *new_client;
         struct smsc47b397_data *data;
         int err = 0;
 
-        if (!i2c_is_isa_adapter(adapter)) {
-                return 0;
-        }
-
-        if (!request_region(addr, SMSC_EXTENT, smsc47b397_driver.name)) {
-                dev_err(&adapter->dev, "Region 0x%x already in use!\n", addr);
+        if (!request_region(address, SMSC_EXTENT, smsc47b397_driver.name)) {
+                dev_err(&adapter->dev, "Region 0x%x already in use!\n",
+                        address);
                 return -EBUSY;
         }
 
@@ -272,7 +252,7 @@ static int smsc47b397_detect(struct i2c_adapter *adapter, int addr, int kind)
 
         new_client = &data->client;
         i2c_set_clientdata(new_client, data);
-        new_client->addr = addr;
+        new_client->addr = address;
         init_MUTEX(&data->lock);
         new_client->adapter = adapter;
         new_client->driver = &smsc47b397_driver;
@@ -285,6 +265,12 @@ static int smsc47b397_detect(struct i2c_adapter *adapter, int addr, int kind)
         if ((err = i2c_attach_client(new_client)))
                 goto error_free;
 
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto error_detach;
+        }
+
         device_create_file_temp(new_client, 1);
         device_create_file_temp(new_client, 2);
         device_create_file_temp(new_client, 3);
@@ -297,14 +283,16 @@ static int smsc47b397_detect(struct i2c_adapter *adapter, int addr, int kind)
 
         return 0;
 
+error_detach:
+        i2c_detach_client(new_client);
 error_free:
         kfree(data);
 error_release:
-        release_region(addr, SMSC_EXTENT);
+        release_region(address, SMSC_EXTENT);
         return err;
 }
 
-static int __init smsc47b397_find(unsigned int *addr)
+static int __init smsc47b397_find(unsigned short *addr)
 {
         u8 id, rev;
 
@@ -333,15 +321,15 @@ static int __init smsc47b397_init(void)
 {
         int ret;
 
-        if ((ret = smsc47b397_find(normal_isa)))
+        if ((ret = smsc47b397_find(&address)))
                 return ret;
 
-        return i2c_add_driver(&smsc47b397_driver);
+        return i2c_isa_add_driver(&smsc47b397_driver);
 }
 
 static void __exit smsc47b397_exit(void)
 {
-        i2c_del_driver(&smsc47b397_driver);
+        i2c_isa_del_driver(&smsc47b397_driver);
 }
 
 MODULE_AUTHOR("Mark M. Hoffman <mhoffman@lightlink.com>");
diff --git a/drivers/hwmon/smsc47m1.c b/drivers/hwmon/smsc47m1.c
index 7166ad0b2fd..7e699a8ede2 100644
--- a/drivers/hwmon/smsc47m1.c
+++ b/drivers/hwmon/smsc47m1.c
@@ -30,21 +30,14 @@
 #include <linux/ioport.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
+#include <linux/i2c-isa.h>
+#include <linux/hwmon.h>
+#include <linux/err.h>
 #include <linux/init.h>
 #include <asm/io.h>
 
-static unsigned short normal_i2c[] = { I2C_CLIENT_END };
 /* Address is autodetected, there is no default value */
-static unsigned int normal_isa[] = { 0x0000, I2C_CLIENT_ISA_END };
-static struct i2c_force_data forces[] = {{NULL}};
-
-enum chips { any_chip, smsc47m1 };
-static struct i2c_address_data addr_data = {
-        .normal_i2c             = normal_i2c,
-        .normal_isa             = normal_isa,
-        .forces                 = forces,
-};
+static unsigned short address;
 
 /* Super-I/0 registers and commands */
 
@@ -108,6 +101,7 @@ superio_exit(void)
 
 struct smsc47m1_data {
         struct i2c_client client;
+        struct class_device *class_dev;
         struct semaphore lock;
 
         struct semaphore update_lock;
@@ -121,9 +115,7 @@ struct smsc47m1_data {
 };
 
 
-static int smsc47m1_attach_adapter(struct i2c_adapter *adapter);
-static int smsc47m1_find(int *address);
-static int smsc47m1_detect(struct i2c_adapter *adapter, int address, int kind);
+static int smsc47m1_detect(struct i2c_adapter *adapter);
 static int smsc47m1_detach_client(struct i2c_client *client);
 
 static int smsc47m1_read_value(struct i2c_client *client, u8 reg);
@@ -136,9 +128,7 @@ static struct smsc47m1_data *smsc47m1_update_device(struct device *dev,
 static struct i2c_driver smsc47m1_driver = {
         .owner          = THIS_MODULE,
         .name           = "smsc47m1",
-        .id             = I2C_DRIVERID_SMSC47M1,
-        .flags          = I2C_DF_NOTIFY,
-        .attach_adapter = smsc47m1_attach_adapter,
+        .attach_adapter = smsc47m1_detect,
         .detach_client  = smsc47m1_detach_client,
 };
 
@@ -354,14 +344,7 @@ fan_present(2);
 
 static DEVICE_ATTR(alarms, S_IRUGO, get_alarms, NULL);
 
-static int smsc47m1_attach_adapter(struct i2c_adapter *adapter)
-{
-        if (!(adapter->class & I2C_CLASS_HWMON))
-                return 0;
-        return i2c_detect(adapter, &addr_data, smsc47m1_detect);
-}
-
-static int smsc47m1_find(int *address)
+static int __init smsc47m1_find(unsigned short *addr)
 {
         u8 val;
 
@@ -388,10 +371,10 @@ static int smsc47m1_find(int *address)
         }
 
         superio_select();
-        *address = (superio_inb(SUPERIO_REG_BASE) << 8)
-                 |  superio_inb(SUPERIO_REG_BASE + 1);
+        *addr = (superio_inb(SUPERIO_REG_BASE) << 8)
+              |  superio_inb(SUPERIO_REG_BASE + 1);
         val = superio_inb(SUPERIO_REG_ACT);
-        if (*address == 0 || (val & 0x01) == 0) {
+        if (*addr == 0 || (val & 0x01) == 0) {
                 printk(KERN_INFO "smsc47m1: Device is disabled, will not use\n");
                 superio_exit();
                 return -ENODEV;
@@ -401,17 +384,13 @@ static int smsc47m1_find(int *address)
         return 0;
 }
 
-static int smsc47m1_detect(struct i2c_adapter *adapter, int address, int kind)
+static int smsc47m1_detect(struct i2c_adapter *adapter)
 {
         struct i2c_client *new_client;
         struct smsc47m1_data *data;
         int err = 0;
         int fan1, fan2, pwm1, pwm2;
 
-        if (!i2c_is_isa_adapter(adapter)) {
-                return 0;
-        }
-
         if (!request_region(address, SMSC_EXTENT, smsc47m1_driver.name)) {
                 dev_err(&adapter->dev, "Region 0x%x already in use!\n", address);
                 return -EBUSY;
@@ -461,6 +440,13 @@ static int smsc47m1_detect(struct i2c_adapter *adapter, int address, int kind)
            function. */
         smsc47m1_update_device(&new_client->dev, 1);
 
+        /* Register sysfs hooks */
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto error_detach;
+        }
+
         if (fan1) {
                 device_create_file(&new_client->dev, &dev_attr_fan1_input);
                 device_create_file(&new_client->dev, &dev_attr_fan1_min);
@@ -494,6 +480,8 @@ static int smsc47m1_detect(struct i2c_adapter *adapter, int address, int kind)
 
         return 0;
 
+error_detach:
+        i2c_detach_client(new_client);
 error_free:
         kfree(data);
 error_release:
@@ -503,16 +491,16 @@ error_release:
 
 static int smsc47m1_detach_client(struct i2c_client *client)
 {
+        struct smsc47m1_data *data = i2c_get_clientdata(client);
         int err;
 
-        if ((err = i2c_detach_client(client))) {
-                dev_err(&client->dev, "Client deregistration failed, "
-                        "client not detached.\n");
+        hwmon_device_unregister(data->class_dev);
+
+        if ((err = i2c_detach_client(client)))
                 return err;
-        }
 
         release_region(client->addr, SMSC_EXTENT);
-        kfree(i2c_get_clientdata(client));
+        kfree(data);
 
         return 0;
 }
@@ -573,16 +561,16 @@ static struct smsc47m1_data *smsc47m1_update_device(struct device *dev,
 
 static int __init sm_smsc47m1_init(void)
 {
-        if (smsc47m1_find(normal_isa)) {
+        if (smsc47m1_find(&address)) {
                 return -ENODEV;
         }
 
-        return i2c_add_driver(&smsc47m1_driver);
+        return i2c_isa_add_driver(&smsc47m1_driver);
 }
 
 static void __exit sm_smsc47m1_exit(void)
 {
-        i2c_del_driver(&smsc47m1_driver);
+        i2c_isa_del_driver(&smsc47m1_driver);
 }
 
 MODULE_AUTHOR("Mark D. Studebaker <mdsxyz123@yahoo.com>");
diff --git a/drivers/hwmon/via686a.c b/drivers/hwmon/via686a.c
index 164d4794839..eb84997627c 100644
--- a/drivers/hwmon/via686a.c
+++ b/drivers/hwmon/via686a.c
@@ -35,7 +35,9 @@
 #include <linux/pci.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
+#include <linux/i2c-isa.h>
+#include <linux/hwmon.h>
+#include <linux/err.h>
 #include <linux/init.h>
 #include <asm/io.h>
 
@@ -47,14 +49,10 @@ module_param(force_addr, ushort, 0);
 MODULE_PARM_DESC(force_addr,
                  "Initialize the base address of the sensors");
 
-/* Addresses to scan.
+/* Device address
    Note that we can't determine the ISA address until we have initialized
    our module */
-static unsigned short normal_i2c[] = { I2C_CLIENT_END };
-static unsigned int normal_isa[] = { 0x0000, I2C_CLIENT_ISA_END };
-
-/* Insmod parameters */
-SENSORS_INSMOD_1(via686a);
+static unsigned short address;
 
 /*
    The Via 686a southbridge has a LM78-like chip integrated on the same IC.
@@ -297,6 +295,7 @@ static inline long TEMP_FROM_REG10(u16 val)
    via686a client is allocated. */
 struct via686a_data {
         struct i2c_client client;
+        struct class_device *class_dev;
         struct semaphore update_lock;
         char valid;             /* !=0 if following fields are valid */
         unsigned long last_updated;     /* In jiffies */
@@ -315,8 +314,7 @@ struct via686a_data {
 
 static struct pci_dev *s_bridge;        /* pointer to the (only) via686a */
 
-static int via686a_attach_adapter(struct i2c_adapter *adapter);
-static int via686a_detect(struct i2c_adapter *adapter, int address, int kind);
+static int via686a_detect(struct i2c_adapter *adapter);
 static int via686a_detach_client(struct i2c_client *client);
 
 static inline int via686a_read_value(struct i2c_client *client, u8 reg)
@@ -576,22 +574,13 @@ static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL);
 static struct i2c_driver via686a_driver = {
         .owner          = THIS_MODULE,
         .name           = "via686a",
-        .id             = I2C_DRIVERID_VIA686A,
-        .flags          = I2C_DF_NOTIFY,
-        .attach_adapter = via686a_attach_adapter,
+        .attach_adapter = via686a_detect,
         .detach_client  = via686a_detach_client,
 };
 
 
 /* This is called when the module is loaded */
-static int via686a_attach_adapter(struct i2c_adapter *adapter)
-{
-        if (!(adapter->class & I2C_CLASS_HWMON))
-                return 0;
-        return i2c_detect(adapter, &addr_data, via686a_detect);
-}
-
-static int via686a_detect(struct i2c_adapter *adapter, int address, int kind)
+static int via686a_detect(struct i2c_adapter *adapter)
 {
         struct i2c_client *new_client;
         struct via686a_data *data;
@@ -599,13 +588,6 @@ static int via686a_detect(struct i2c_adapter *adapter, int address, int kind)
         const char client_name[] = "via686a";
         u16 val;
 
-        /* Make sure we are probing the ISA bus!!  */
-        if (!i2c_is_isa_adapter(adapter)) {
-                dev_err(&adapter->dev,
-                "via686a_detect called for an I2C bus adapter?!?\n");
-                return 0;
-        }
-
         /* 8231 requires multiple of 256, we enforce that on 686 as well */
         if (force_addr)
                 address = force_addr & 0xFF00;
@@ -637,7 +619,7 @@ static int via686a_detect(struct i2c_adapter *adapter, int address, int kind)
 
         if (!(data = kmalloc(sizeof(struct via686a_data), GFP_KERNEL))) {
                 err = -ENOMEM;
-                goto ERROR0;
+                goto exit_release;
         }
         memset(data, 0, sizeof(struct via686a_data));
 
@@ -655,12 +637,18 @@ static int via686a_detect(struct i2c_adapter *adapter, int address, int kind)
         init_MUTEX(&data->update_lock);
         /* Tell the I2C layer a new client has arrived */
         if ((err = i2c_attach_client(new_client)))
-                goto ERROR3;
+                goto exit_free;
 
         /* Initialize the VIA686A chip */
         via686a_init_client(new_client);
 
         /* Register sysfs hooks */
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto exit_detach;
+        }
+
         device_create_file(&new_client->dev, &dev_attr_in0_input);
         device_create_file(&new_client->dev, &dev_attr_in1_input);
         device_create_file(&new_client->dev, &dev_attr_in2_input);
@@ -695,25 +683,27 @@ static int via686a_detect(struct i2c_adapter *adapter, int address, int kind)
 
         return 0;
 
-ERROR3:
+exit_detach:
+        i2c_detach_client(new_client);
+exit_free:
         kfree(data);
-ERROR0:
+exit_release:
         release_region(address, VIA686A_EXTENT);
         return err;
 }
 
 static int via686a_detach_client(struct i2c_client *client)
 {
+        struct via686a_data *data = i2c_get_clientdata(client);
         int err;
 
-        if ((err = i2c_detach_client(client))) {
-                dev_err(&client->dev,
-                "Client deregistration failed, client not detached.\n");
+        hwmon_device_unregister(data->class_dev);
+
+        if ((err = i2c_detach_client(client)))
                 return err;
-        }
 
         release_region(client->addr, VIA686A_EXTENT);
-        kfree(i2c_get_clientdata(client));
+        kfree(data);
 
         return 0;
 }
@@ -810,29 +800,25 @@ static int __devinit via686a_pci_probe(struct pci_dev *dev,
                                        const struct pci_device_id *id)
 {
         u16 val;
-        int addr = 0;
 
         if (PCIBIOS_SUCCESSFUL !=
             pci_read_config_word(dev, VIA686A_BASE_REG, &val))
                 return -ENODEV;
 
-        addr = val & ~(VIA686A_EXTENT - 1);
-        if (addr == 0 && force_addr == 0) {
+        address = val & ~(VIA686A_EXTENT - 1);
+        if (address == 0 && force_addr == 0) {
                 dev_err(&dev->dev, "base address not set - upgrade BIOS "
                         "or use force_addr=0xaddr\n");
                 return -ENODEV;
         }
-        if (force_addr)
-                addr = force_addr;      /* so detect will get called */
 
-        if (!addr) {
+        if (!address) {
                 dev_err(&dev->dev, "No Via 686A sensors found.\n");
                 return -ENODEV;
         }
-        normal_isa[0] = addr;
 
         s_bridge = pci_dev_get(dev);
-        if (i2c_add_driver(&via686a_driver)) {
+        if (i2c_isa_add_driver(&via686a_driver)) {
                 pci_dev_put(s_bridge);
                 s_bridge = NULL;
         }
@@ -859,7 +845,7 @@ static void __exit sm_via686a_exit(void)
 {
         pci_unregister_driver(&via686a_pci_driver);
         if (s_bridge != NULL) {
-                i2c_del_driver(&via686a_driver);
+                i2c_isa_del_driver(&via686a_driver);
                 pci_dev_put(s_bridge);
                 s_bridge = NULL;
         }
diff --git a/drivers/hwmon/w83627ehf.c b/drivers/hwmon/w83627ehf.c
index 8a40b6976e1..b60efe8f8b2 100644
--- a/drivers/hwmon/w83627ehf.c
+++ b/drivers/hwmon/w83627ehf.c
@@ -9,6 +9,9 @@
     Thanks to Leon Moonen, Steve Cliffe and Grant Coady for their help
     in testing and debugging this driver.
 
+    This driver also supports the W83627EHG, which is the lead-free
+    version of the W83627EHF.
+
     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 of the License, or
@@ -37,17 +40,14 @@
 #include <linux/init.h>
 #include <linux/slab.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
+#include <linux/i2c-isa.h>
+#include <linux/hwmon.h>
+#include <linux/err.h>
 #include <asm/io.h>
 #include "lm75.h"
 
-/* Addresses to scan
-   The actual ISA address is read from Super-I/O configuration space */
-static unsigned short normal_i2c[] = { I2C_CLIENT_END };
-static unsigned int normal_isa[] = { 0, I2C_CLIENT_ISA_END };
-
-/* Insmod parameters */
-SENSORS_INSMOD_1(w83627ehf);
+/* The actual ISA address is read from Super-I/O configuration space */
+static unsigned short address;
 
 /*
  * Super-I/O constants and functions
@@ -174,6 +174,7 @@ temp1_to_reg(int temp)
 
 struct w83627ehf_data {
         struct i2c_client client;
+        struct class_device *class_dev;
         struct semaphore lock;
 
         struct semaphore update_lock;
@@ -666,15 +667,12 @@ static void w83627ehf_init_client(struct i2c_client *client)
         }
 }
 
-static int w83627ehf_detect(struct i2c_adapter *adapter, int address, int kind)
+static int w83627ehf_detect(struct i2c_adapter *adapter)
 {
         struct i2c_client *client;
         struct w83627ehf_data *data;
         int i, err = 0;
 
-        if (!i2c_is_isa_adapter(adapter))
-                return 0;
-
         if (!request_region(address, REGION_LENGTH, w83627ehf_driver.name)) {
                 err = -EBUSY;
                 goto exit;
@@ -720,6 +718,12 @@ static int w83627ehf_detect(struct i2c_adapter *adapter, int address, int kind)
                 data->has_fan |= (1 << 4);
 
         /* Register sysfs hooks */
+        data->class_dev = hwmon_device_register(&client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto exit_detach;
+        }
+
         device_create_file(&client->dev, &dev_attr_fan1_input);
         device_create_file(&client->dev, &dev_attr_fan1_min);
         device_create_file(&client->dev, &dev_attr_fan1_div);
@@ -753,6 +757,8 @@ static int w83627ehf_detect(struct i2c_adapter *adapter, int address, int kind)
 
         return 0;
 
+exit_detach:
+        i2c_detach_client(client);
 exit_free:
         kfree(data);
 exit_release:
@@ -761,24 +767,17 @@ exit:
         return err;
 }
 
-static int w83627ehf_attach_adapter(struct i2c_adapter *adapter)
-{
-        if (!(adapter->class & I2C_CLASS_HWMON))
-                return 0;
-        return i2c_detect(adapter, &addr_data, w83627ehf_detect);
-}
-
 static int w83627ehf_detach_client(struct i2c_client *client)
 {
+        struct w83627ehf_data *data = i2c_get_clientdata(client);
         int err;
 
-        if ((err = i2c_detach_client(client))) {
-                dev_err(&client->dev, "Client deregistration failed, "
-                        "client not detached.\n");
+        hwmon_device_unregister(data->class_dev);
+
+        if ((err = i2c_detach_client(client)))
                 return err;
-        }
         release_region(client->addr, REGION_LENGTH);
-        kfree(i2c_get_clientdata(client));
+        kfree(data);
 
         return 0;
 }
@@ -786,12 +785,11 @@ static int w83627ehf_detach_client(struct i2c_client *client)
 static struct i2c_driver w83627ehf_driver = {
         .owner          = THIS_MODULE,
         .name           = "w83627ehf",
-        .flags          = I2C_DF_NOTIFY,
-        .attach_adapter = w83627ehf_attach_adapter,
+        .attach_adapter = w83627ehf_detect,
         .detach_client  = w83627ehf_detach_client,
 };
 
-static int __init w83627ehf_find(int sioaddr, int *address)
+static int __init w83627ehf_find(int sioaddr, unsigned short *addr)
 {
         u16 val;
 
@@ -809,8 +807,8 @@ static int __init w83627ehf_find(int sioaddr, int *address)
         superio_select(W83627EHF_LD_HWM);
         val = (superio_inb(SIO_REG_ADDR) << 8)
             | superio_inb(SIO_REG_ADDR + 1);
-        *address = val & ~(REGION_LENGTH - 1);
-        if (*address == 0) {
+        *addr = val & ~(REGION_LENGTH - 1);
+        if (*addr == 0) {
                 superio_exit();
                 return -ENODEV;
         }
@@ -826,16 +824,16 @@ static int __init w83627ehf_find(int sioaddr, int *address)
 
 static int __init sensors_w83627ehf_init(void)
 {
-        if (w83627ehf_find(0x2e, &normal_isa[0])
-         && w83627ehf_find(0x4e, &normal_isa[0]))
+        if (w83627ehf_find(0x2e, &address)
+         && w83627ehf_find(0x4e, &address))
                 return -ENODEV;
 
-        return i2c_add_driver(&w83627ehf_driver);
+        return i2c_isa_add_driver(&w83627ehf_driver);
 }
 
 static void __exit sensors_w83627ehf_exit(void)
 {
-        i2c_del_driver(&w83627ehf_driver);
+        i2c_isa_del_driver(&w83627ehf_driver);
 }
 
 MODULE_AUTHOR("Jean Delvare <khali@linux-fr.org>");
diff --git a/drivers/hwmon/w83627hf.c b/drivers/hwmon/w83627hf.c
index bd87a42e068..02bd5c0239a 100644
--- a/drivers/hwmon/w83627hf.c
+++ b/drivers/hwmon/w83627hf.c
@@ -42,8 +42,10 @@
 #include <linux/slab.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
-#include <linux/i2c-vid.h>
+#include <linux/i2c-isa.h>
+#include <linux/hwmon.h>
+#include <linux/hwmon-vid.h>
+#include <linux/err.h>
 #include <asm/io.h>
 #include "lm75.h"
 
@@ -56,12 +58,11 @@ module_param(force_i2c, byte, 0);
 MODULE_PARM_DESC(force_i2c,
                  "Initialize the i2c address of the sensors");
 
-/* Addresses to scan */
-static unsigned short normal_i2c[] = { I2C_CLIENT_END };
-static unsigned int normal_isa[] = { 0, I2C_CLIENT_ISA_END };
+/* The actual ISA address is read from Super-I/O configuration space */
+static unsigned short address;
 
 /* Insmod parameters */
-SENSORS_INSMOD_4(w83627hf, w83627thf, w83697hf, w83637hf);
+enum chips { any_chip, w83627hf, w83627thf, w83697hf, w83637hf };
 
 static int init = 1;
 module_param(init, bool, 0);
@@ -277,6 +278,7 @@ static inline u8 DIV_TO_REG(long val)
    dynamically allocated, at the same time when a new client is allocated. */
 struct w83627hf_data {
         struct i2c_client client;
+        struct class_device *class_dev;
         struct semaphore lock;
         enum chips type;
 
@@ -314,9 +316,7 @@ struct w83627hf_data {
 };
 
 
-static int w83627hf_attach_adapter(struct i2c_adapter *adapter);
-static int w83627hf_detect(struct i2c_adapter *adapter, int address,
-                          int kind);
+static int w83627hf_detect(struct i2c_adapter *adapter);
 static int w83627hf_detach_client(struct i2c_client *client);
 
 static int w83627hf_read_value(struct i2c_client *client, u16 register);
@@ -328,9 +328,7 @@ static void w83627hf_init_client(struct i2c_client *client);
 static struct i2c_driver w83627hf_driver = {
         .owner          = THIS_MODULE,
         .name           = "w83627hf",
-        .id             = I2C_DRIVERID_W83627HF,
-        .flags          = I2C_DF_NOTIFY,
-        .attach_adapter = w83627hf_attach_adapter,
+        .attach_adapter = w83627hf_detect,
         .detach_client  = w83627hf_detach_client,
 };
 
@@ -959,16 +957,7 @@ device_create_file(&client->dev, &dev_attr_temp##offset##_type); \
 } while (0)
 
 
-/* This function is called when:
-     * w83627hf_driver is inserted (when this module is loaded), for each
-       available adapter
-     * when a new adapter is inserted (and w83627hf_driver is still present) */
-static int w83627hf_attach_adapter(struct i2c_adapter *adapter)
-{
-        return i2c_detect(adapter, &addr_data, w83627hf_detect);
-}
-
-static int w83627hf_find(int sioaddr, int *address)
+static int __init w83627hf_find(int sioaddr, unsigned short *addr)
 {
         u16 val;
 
@@ -988,32 +977,24 @@ static int w83627hf_find(int sioaddr, int *address)
         superio_select(W83627HF_LD_HWM);
         val = (superio_inb(WINB_BASE_REG) << 8) |
                superio_inb(WINB_BASE_REG + 1);
-        *address = val & ~(WINB_EXTENT - 1);
-        if (*address == 0 && force_addr == 0) {
+        *addr = val & ~(WINB_EXTENT - 1);
+        if (*addr == 0 && force_addr == 0) {
                 superio_exit();
                 return -ENODEV;
         }
-        if (force_addr)
-                *address = force_addr;  /* so detect will get called */
 
         superio_exit();
         return 0;
 }
 
-int w83627hf_detect(struct i2c_adapter *adapter, int address,
-                   int kind)
+static int w83627hf_detect(struct i2c_adapter *adapter)
 {
-        int val;
+        int val, kind;
         struct i2c_client *new_client;
         struct w83627hf_data *data;
         int err = 0;
         const char *client_name = "";
 
-        if (!i2c_is_isa_adapter(adapter)) {
-                err = -ENODEV;
-                goto ERROR0;
-        }
-
         if(force_addr)
                 address = force_addr & ~(WINB_EXTENT - 1);
 
@@ -1102,6 +1083,12 @@ int w83627hf_detect(struct i2c_adapter *adapter, int address,
         data->fan_min[2] = w83627hf_read_value(new_client, W83781D_REG_FAN_MIN(3));
 
         /* Register sysfs hooks */
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto ERROR3;
+        }
+
         device_create_file_in(new_client, 0);
         if (kind != w83697hf)
                 device_create_file_in(new_client, 1);
@@ -1152,6 +1139,8 @@ int w83627hf_detect(struct i2c_adapter *adapter, int address,
 
         return 0;
 
+      ERROR3:
+        i2c_detach_client(new_client);
       ERROR2:
         kfree(data);
       ERROR1:
@@ -1162,16 +1151,16 @@ int w83627hf_detect(struct i2c_adapter *adapter, int address,
 
 static int w83627hf_detach_client(struct i2c_client *client)
 {
+        struct w83627hf_data *data = i2c_get_clientdata(client);
         int err;
 
-        if ((err = i2c_detach_client(client))) {
-                dev_err(&client->dev,
-                       "Client deregistration failed, client not detached.\n");
+        hwmon_device_unregister(data->class_dev);
+
+        if ((err = i2c_detach_client(client)))
                 return err;
-        }
 
         release_region(client->addr, WINB_EXTENT);
-        kfree(i2c_get_clientdata(client));
+        kfree(data);
 
         return 0;
 }
@@ -1327,7 +1316,7 @@ static void w83627hf_init_client(struct i2c_client *client)
                 data->vrm = (data->vrm_ovt & 0x01) ? 90 : 82;
         } else {
                 /* Convert VID to voltage based on default VRM */
-                data->vrm = i2c_which_vrm();
+                data->vrm = vid_which_vrm();
         }
 
         tmp = w83627hf_read_value(client, W83781D_REG_SCFG1);
@@ -1485,20 +1474,17 @@ static struct w83627hf_data *w83627hf_update_device(struct device *dev)
 
 static int __init sensors_w83627hf_init(void)
 {
-        int addr;
-
-        if (w83627hf_find(0x2e, &addr)
-         && w83627hf_find(0x4e, &addr)) {
+        if (w83627hf_find(0x2e, &address)
+         && w83627hf_find(0x4e, &address)) {
                 return -ENODEV;
         }
-        normal_isa[0] = addr;
 
-        return i2c_add_driver(&w83627hf_driver);
+        return i2c_isa_add_driver(&w83627hf_driver);
 }
 
 static void __exit sensors_w83627hf_exit(void)
 {
-        i2c_del_driver(&w83627hf_driver);
+        i2c_isa_del_driver(&w83627hf_driver);
 }
 
 MODULE_AUTHOR("Frodo Looijaard <frodol@dds.nl>, "
diff --git a/drivers/hwmon/w83781d.c b/drivers/hwmon/w83781d.c
index 0bb131ce09e..4c43337ca78 100644
--- a/drivers/hwmon/w83781d.c
+++ b/drivers/hwmon/w83781d.c
@@ -38,8 +38,10 @@
 #include <linux/slab.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
-#include <linux/i2c-vid.h>
+#include <linux/i2c-isa.h>
+#include <linux/hwmon.h>
+#include <linux/hwmon-vid.h>
+#include <linux/err.h>
 #include <asm/io.h>
 #include "lm75.h"
 
@@ -47,10 +49,10 @@
 static unsigned short normal_i2c[] = { 0x20, 0x21, 0x22, 0x23, 0x24, 0x25,
                                         0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b,
                                         0x2c, 0x2d, 0x2e, 0x2f, I2C_CLIENT_END };
-static unsigned int normal_isa[] = { 0x0290, I2C_CLIENT_ISA_END };
+static unsigned short isa_address = 0x290;
 
 /* Insmod parameters */
-SENSORS_INSMOD_5(w83781d, w83782d, w83783s, w83627hf, as99127f);
+I2C_CLIENT_INSMOD_5(w83781d, w83782d, w83783s, w83627hf, as99127f);
 I2C_CLIENT_MODULE_PARM(force_subclients, "List of subclient addresses: "
                     "{bus, clientaddr, subclientaddr1, subclientaddr2}");
 
@@ -218,6 +220,7 @@ DIV_TO_REG(long val, enum chips type)
    allocated. */
 struct w83781d_data {
         struct i2c_client client;
+        struct class_device *class_dev;
         struct semaphore lock;
         enum chips type;
 
@@ -255,6 +258,7 @@ struct w83781d_data {
 };
 
 static int w83781d_attach_adapter(struct i2c_adapter *adapter);
+static int w83781d_isa_attach_adapter(struct i2c_adapter *adapter);
 static int w83781d_detect(struct i2c_adapter *adapter, int address, int kind);
 static int w83781d_detach_client(struct i2c_client *client);
 
@@ -273,6 +277,14 @@ static struct i2c_driver w83781d_driver = {
         .detach_client = w83781d_detach_client,
 };
 
+static struct i2c_driver w83781d_isa_driver = {
+        .owner = THIS_MODULE,
+        .name = "w83781d-isa",
+        .attach_adapter = w83781d_isa_attach_adapter,
+        .detach_client = w83781d_detach_client,
+};
+
+
 /* following are the sysfs callback functions */
 #define show_in_reg(reg) \
 static ssize_t show_##reg (struct device *dev, char *buf, int nr) \
@@ -856,7 +868,13 @@ w83781d_attach_adapter(struct i2c_adapter *adapter)
 {
         if (!(adapter->class & I2C_CLASS_HWMON))
                 return 0;
-        return i2c_detect(adapter, &addr_data, w83781d_detect);
+        return i2c_probe(adapter, &addr_data, w83781d_detect);
+}
+
+static int
+w83781d_isa_attach_adapter(struct i2c_adapter *adapter)
+{
+        return w83781d_detect(adapter, isa_address, -1);
 }
 
 /* Assumes that adapter is of I2C, not ISA variety.
@@ -961,10 +979,10 @@ w83781d_detect_subclients(struct i2c_adapter *adapter, int address, int kind,
 ERROR_SC_3:
         i2c_detach_client(data->lm75[0]);
 ERROR_SC_2:
-        if (NULL != data->lm75[1])
+        if (data->lm75[1])
                 kfree(data->lm75[1]);
 ERROR_SC_1:
-        if (NULL != data->lm75[0])
+        if (data->lm75[0])
                 kfree(data->lm75[0]);
 ERROR_SC_0:
         return err;
@@ -999,7 +1017,7 @@ w83781d_detect(struct i2c_adapter *adapter, int address, int kind)
         
         if (is_isa)
                 if (!request_region(address, W83781D_EXTENT,
-                                    w83781d_driver.name)) {
+                                    w83781d_isa_driver.name)) {
                         dev_dbg(&adapter->dev, "Request of region "
                                 "0x%x-0x%x for w83781d failed\n", address,
                                 address + W83781D_EXTENT - 1);
@@ -1057,7 +1075,7 @@ w83781d_detect(struct i2c_adapter *adapter, int address, int kind)
         new_client->addr = address;
         init_MUTEX(&data->lock);
         new_client->adapter = adapter;
-        new_client->driver = &w83781d_driver;
+        new_client->driver = is_isa ? &w83781d_isa_driver : &w83781d_driver;
         new_client->flags = 0;
 
         /* Now, we do the remaining detection. */
@@ -1189,6 +1207,12 @@ w83781d_detect(struct i2c_adapter *adapter, int address, int kind)
                         data->pwmenable[i] = 1;
 
         /* Register sysfs hooks */
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto ERROR4;
+        }
+
         device_create_file_in(new_client, 0);
         if (kind != w83783s)
                 device_create_file_in(new_client, 1);
@@ -1241,6 +1265,15 @@ w83781d_detect(struct i2c_adapter *adapter, int address, int kind)
 
         return 0;
 
+ERROR4:
+        if (data->lm75[1]) {
+                i2c_detach_client(data->lm75[1]);
+                kfree(data->lm75[1]);
+        }
+        if (data->lm75[0]) {
+                i2c_detach_client(data->lm75[0]);
+                kfree(data->lm75[0]);
+        }
 ERROR3:
         i2c_detach_client(new_client);
 ERROR2:
@@ -1255,24 +1288,26 @@ ERROR0:
 static int
 w83781d_detach_client(struct i2c_client *client)
 {
+        struct w83781d_data *data = i2c_get_clientdata(client);
         int err;
 
+        /* main client */
+        if (data)
+                hwmon_device_unregister(data->class_dev);
+
         if (i2c_is_isa_client(client))
                 release_region(client->addr, W83781D_EXTENT);
 
-        if ((err = i2c_detach_client(client))) {
-                dev_err(&client->dev,
-                       "Client deregistration failed, client not detached.\n");
+        if ((err = i2c_detach_client(client)))
                 return err;
-        }
 
-        if (i2c_get_clientdata(client)==NULL) {
-                /* subclients */
+        /* main client */
+        if (data)
+                kfree(data);
+
+        /* subclient */
+        else
                 kfree(client);
-        } else {
-                /* main client */
-                kfree(i2c_get_clientdata(client));
-        }
 
         return 0;
 }
@@ -1443,7 +1478,7 @@ w83781d_init_client(struct i2c_client *client)
                 w83781d_write_value(client, W83781D_REG_BEEP_INTS2, 0);
         }
 
-        data->vrm = i2c_which_vrm();
+        data->vrm = vid_which_vrm();
 
         if ((type != w83781d) && (type != as99127f)) {
                 tmp = w83781d_read_value(client, W83781D_REG_SCFG1);
@@ -1613,12 +1648,25 @@ static struct w83781d_data *w83781d_update_device(struct device *dev)
 static int __init
 sensors_w83781d_init(void)
 {
-        return i2c_add_driver(&w83781d_driver);
+        int res;
+
+        res = i2c_add_driver(&w83781d_driver);
+        if (res)
+                return res;
+
+        res = i2c_isa_add_driver(&w83781d_isa_driver);
+        if (res) {
+                i2c_del_driver(&w83781d_driver);
+                return res;
+        }
+
+        return 0;
 }
 
 static void __exit
 sensors_w83781d_exit(void)
 {
+        i2c_isa_del_driver(&w83781d_isa_driver);
         i2c_del_driver(&w83781d_driver);
 }
 
diff --git a/drivers/hwmon/w83792d.c b/drivers/hwmon/w83792d.c
new file mode 100644
index 00000000000..ba0c28015f6
--- /dev/null
+++ b/drivers/hwmon/w83792d.c
@@ -0,0 +1,1649 @@
+/*
+    w83792d.c - Part of lm_sensors, Linux kernel modules for hardware
+                monitoring
+    Copyright (C) 2004, 2005 Winbond Electronics Corp.
+                        Chunhao Huang <DZShen@Winbond.com.tw>,
+                        Rudolf Marek <r.marek@sh.cvut.cz>
+
+    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 of the License, 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.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+    Note:
+    1. This driver is only for 2.6 kernel, 2.4 kernel need a different driver.
+    2. This driver is only for Winbond W83792D C version device, there
+       are also some motherboards with B version W83792D device. The
+       calculation method to in6-in7(measured value, limits) is a little
+       different between C and B version. C or B version can be identified
+       by CR[0x49h].
+*/
+
+/*
+    Supports following chips:
+
+    Chip        #vin    #fanin  #pwm    #temp   wchipid vendid  i2c     ISA
+    w83792d     9       7       7       3       0x7a    0x5ca3  yes     no
+*/
+
+#include <linux/config.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <linux/i2c.h>
+#include <linux/hwmon.h>
+#include <linux/hwmon-sysfs.h>
+#include <linux/err.h>
+
+/* Addresses to scan */
+static unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, 0x2f, I2C_CLIENT_END };
+
+/* Insmod parameters */
+I2C_CLIENT_INSMOD_1(w83792d);
+I2C_CLIENT_MODULE_PARM(force_subclients, "List of subclient addresses: "
+                        "{bus, clientaddr, subclientaddr1, subclientaddr2}");
+
+static int init;
+module_param(init, bool, 0);
+MODULE_PARM_DESC(init, "Set to one to force chip initialization");
+
+/* The W83792D registers */
+static const u8 W83792D_REG_IN[9] = {
+        0x20,   /* Vcore A in DataSheet */
+        0x21,   /* Vcore B in DataSheet */
+        0x22,   /* VIN0 in DataSheet */
+        0x23,   /* VIN1 in DataSheet */
+        0x24,   /* VIN2 in DataSheet */
+        0x25,   /* VIN3 in DataSheet */
+        0x26,   /* 5VCC in DataSheet */
+        0xB0,   /* 5VSB in DataSheet */
+        0xB1    /* VBAT in DataSheet */
+};
+#define W83792D_REG_LOW_BITS1 0x3E  /* Low Bits I in DataSheet */
+#define W83792D_REG_LOW_BITS2 0x3F  /* Low Bits II in DataSheet */
+static const u8 W83792D_REG_IN_MAX[9] = {
+        0x2B,   /* Vcore A High Limit in DataSheet */
+        0x2D,   /* Vcore B High Limit in DataSheet */
+        0x2F,   /* VIN0 High Limit in DataSheet */
+        0x31,   /* VIN1 High Limit in DataSheet */
+        0x33,   /* VIN2 High Limit in DataSheet */
+        0x35,   /* VIN3 High Limit in DataSheet */
+        0x37,   /* 5VCC High Limit in DataSheet */
+        0xB4,   /* 5VSB High Limit in DataSheet */
+        0xB6    /* VBAT High Limit in DataSheet */
+};
+static const u8 W83792D_REG_IN_MIN[9] = {
+        0x2C,   /* Vcore A Low Limit in DataSheet */
+        0x2E,   /* Vcore B Low Limit in DataSheet */
+        0x30,   /* VIN0 Low Limit in DataSheet */
+        0x32,   /* VIN1 Low Limit in DataSheet */
+        0x34,   /* VIN2 Low Limit in DataSheet */
+        0x36,   /* VIN3 Low Limit in DataSheet */
+        0x38,   /* 5VCC Low Limit in DataSheet */
+        0xB5,   /* 5VSB Low Limit in DataSheet */
+        0xB7    /* VBAT Low Limit in DataSheet */
+};
+static const u8 W83792D_REG_FAN[7] = {
+        0x28,   /* FAN 1 Count in DataSheet */
+        0x29,   /* FAN 2 Count in DataSheet */
+        0x2A,   /* FAN 3 Count in DataSheet */
+        0xB8,   /* FAN 4 Count in DataSheet */
+        0xB9,   /* FAN 5 Count in DataSheet */
+        0xBA,   /* FAN 6 Count in DataSheet */
+        0xBE    /* FAN 7 Count in DataSheet */
+};
+static const u8 W83792D_REG_FAN_MIN[7] = {
+        0x3B,   /* FAN 1 Count Low Limit in DataSheet */
+        0x3C,   /* FAN 2 Count Low Limit in DataSheet */
+        0x3D,   /* FAN 3 Count Low Limit in DataSheet */
+        0xBB,   /* FAN 4 Count Low Limit in DataSheet */
+        0xBC,   /* FAN 5 Count Low Limit in DataSheet */
+        0xBD,   /* FAN 6 Count Low Limit in DataSheet */
+        0xBF    /* FAN 7 Count Low Limit in DataSheet */
+};
+#define W83792D_REG_FAN_CFG 0x84        /* FAN Configuration in DataSheet */
+static const u8 W83792D_REG_FAN_DIV[4] = {
+        0x47,   /* contains FAN2 and FAN1 Divisor */
+        0x5B,   /* contains FAN4 and FAN3 Divisor */
+        0x5C,   /* contains FAN6 and FAN5 Divisor */
+        0x9E    /* contains FAN7 Divisor. */
+};
+static const u8 W83792D_REG_PWM[7] = {
+        0x81,   /* FAN 1 Duty Cycle, be used to control */
+        0x83,   /* FAN 2 Duty Cycle, be used to control */
+        0x94,   /* FAN 3 Duty Cycle, be used to control */
+        0xA3,   /* FAN 4 Duty Cycle, be used to control */
+        0xA4,   /* FAN 5 Duty Cycle, be used to control */
+        0xA5,   /* FAN 6 Duty Cycle, be used to control */
+        0xA6    /* FAN 7 Duty Cycle, be used to control */
+};
+#define W83792D_REG_BANK                0x4E
+#define W83792D_REG_TEMP2_CONFIG        0xC2
+#define W83792D_REG_TEMP3_CONFIG        0xCA
+
+static const u8 W83792D_REG_TEMP1[3] = {
+        0x27,   /* TEMP 1 in DataSheet */
+        0x39,   /* TEMP 1 Over in DataSheet */
+        0x3A,   /* TEMP 1 Hyst in DataSheet */
+};
+
+static const u8 W83792D_REG_TEMP_ADD[2][6] = {
+        { 0xC0,         /* TEMP 2 in DataSheet */
+          0xC1,         /* TEMP 2(0.5 deg) in DataSheet */
+          0xC5,         /* TEMP 2 Over High part in DataSheet */
+          0xC6,         /* TEMP 2 Over Low part in DataSheet */
+          0xC3,         /* TEMP 2 Thyst High part in DataSheet */
+          0xC4 },       /* TEMP 2 Thyst Low part in DataSheet */
+        { 0xC8,         /* TEMP 3 in DataSheet */
+          0xC9,         /* TEMP 3(0.5 deg) in DataSheet */
+          0xCD,         /* TEMP 3 Over High part in DataSheet */
+          0xCE,         /* TEMP 3 Over Low part in DataSheet */
+          0xCB,         /* TEMP 3 Thyst High part in DataSheet */
+          0xCC }        /* TEMP 3 Thyst Low part in DataSheet */
+};
+
+static const u8 W83792D_REG_THERMAL[3] = {
+        0x85,   /* SmartFanI: Fan1 target value */
+        0x86,   /* SmartFanI: Fan2 target value */
+        0x96    /* SmartFanI: Fan3 target value */
+};
+
+static const u8 W83792D_REG_TOLERANCE[3] = {
+        0x87,   /* (bit3-0)SmartFan Fan1 tolerance */
+        0x87,   /* (bit7-4)SmartFan Fan2 tolerance */
+        0x97    /* (bit3-0)SmartFan Fan3 tolerance */
+};
+
+static const u8 W83792D_REG_POINTS[3][4] = {
+        { 0x85,         /* SmartFanII: Fan1 temp point 1 */
+          0xE3,         /* SmartFanII: Fan1 temp point 2 */
+          0xE4,         /* SmartFanII: Fan1 temp point 3 */
+          0xE5 },       /* SmartFanII: Fan1 temp point 4 */
+        { 0x86,         /* SmartFanII: Fan2 temp point 1 */
+          0xE6,         /* SmartFanII: Fan2 temp point 2 */
+          0xE7,         /* SmartFanII: Fan2 temp point 3 */
+          0xE8 },       /* SmartFanII: Fan2 temp point 4 */
+        { 0x96,         /* SmartFanII: Fan3 temp point 1 */
+          0xE9,         /* SmartFanII: Fan3 temp point 2 */
+          0xEA,         /* SmartFanII: Fan3 temp point 3 */
+          0xEB }        /* SmartFanII: Fan3 temp point 4 */
+};
+
+static const u8 W83792D_REG_LEVELS[3][4] = {
+        { 0x88,         /* (bit3-0) SmartFanII: Fan1 Non-Stop */
+          0x88,         /* (bit7-4) SmartFanII: Fan1 Level 1 */
+          0xE0,         /* (bit7-4) SmartFanII: Fan1 Level 2 */
+          0xE0 },       /* (bit3-0) SmartFanII: Fan1 Level 3 */
+        { 0x89,         /* (bit3-0) SmartFanII: Fan2 Non-Stop */
+          0x89,         /* (bit7-4) SmartFanII: Fan2 Level 1 */
+          0xE1,         /* (bit7-4) SmartFanII: Fan2 Level 2 */
+          0xE1 },       /* (bit3-0) SmartFanII: Fan2 Level 3 */
+        { 0x98,         /* (bit3-0) SmartFanII: Fan3 Non-Stop */
+          0x98,         /* (bit7-4) SmartFanII: Fan3 Level 1 */
+          0xE2,         /* (bit7-4) SmartFanII: Fan3 Level 2 */
+          0xE2 }        /* (bit3-0) SmartFanII: Fan3 Level 3 */
+};
+
+#define W83792D_REG_CONFIG              0x40
+#define W83792D_REG_VID_FANDIV          0x47
+#define W83792D_REG_CHIPID              0x49
+#define W83792D_REG_WCHIPID             0x58
+#define W83792D_REG_CHIPMAN             0x4F
+#define W83792D_REG_PIN                 0x4B
+#define W83792D_REG_I2C_SUBADDR         0x4A
+
+#define W83792D_REG_ALARM1 0xA9         /* realtime status register1 */
+#define W83792D_REG_ALARM2 0xAA         /* realtime status register2 */
+#define W83792D_REG_ALARM3 0xAB         /* realtime status register3 */
+#define W83792D_REG_CHASSIS 0x42        /* Bit 5: Case Open status bit */
+#define W83792D_REG_CHASSIS_CLR 0x44    /* Bit 7: Case Open CLR_CHS/Reset bit */
+
+/* control in0/in1 's limit modifiability */
+#define W83792D_REG_VID_IN_B            0x17
+
+#define W83792D_REG_VBAT                0x5D
+#define W83792D_REG_I2C_ADDR            0x48
+
+/* Conversions. Rounding and limit checking is only done on the TO_REG
+   variants. Note that you should be a bit careful with which arguments
+   these macros are called: arguments may be evaluated more than once.
+   Fixing this is just not worth it. */
+#define IN_FROM_REG(nr,val) (((nr)<=1)?(val*2): \
+                                ((((nr)==6)||((nr)==7))?(val*6):(val*4)))
+#define IN_TO_REG(nr,val) (((nr)<=1)?(val/2): \
+                                ((((nr)==6)||((nr)==7))?(val/6):(val/4)))
+
+static inline u8
+FAN_TO_REG(long rpm, int div)
+{
+        if (rpm == 0)
+                return 255;
+        rpm = SENSORS_LIMIT(rpm, 1, 1000000);
+        return SENSORS_LIMIT((1350000 + rpm * div / 2) / (rpm * div), 1, 254);
+}
+
+#define FAN_FROM_REG(val,div)   ((val) == 0   ? -1 : \
+                                ((val) == 255 ? 0 : \
+                                                1350000 / ((val) * (div))))
+
+/* for temp1 */
+#define TEMP1_TO_REG(val)       (SENSORS_LIMIT(((val) < 0 ? (val)+0x100*1000 \
+                                        : (val)) / 1000, 0, 0xff))
+#define TEMP1_FROM_REG(val)     (((val) & 0x80 ? (val)-0x100 : (val)) * 1000)
+/* for temp2 and temp3, because they need addtional resolution */
+#define TEMP_ADD_FROM_REG(val1, val2) \
+        ((((val1) & 0x80 ? (val1)-0x100 \
+                : (val1)) * 1000) + ((val2 & 0x80) ? 500 : 0))
+#define TEMP_ADD_TO_REG_HIGH(val) \
+        (SENSORS_LIMIT(((val) < 0 ? (val)+0x100*1000 \
+                        : (val)) / 1000, 0, 0xff))
+#define TEMP_ADD_TO_REG_LOW(val)        ((val%1000) ? 0x80 : 0x00)
+
+#define PWM_FROM_REG(val)               (val)
+#define PWM_TO_REG(val)                 (SENSORS_LIMIT((val),0,255))
+#define DIV_FROM_REG(val)               (1 << (val))
+
+static inline u8
+DIV_TO_REG(long val)
+{
+        int i;
+        val = SENSORS_LIMIT(val, 1, 128) >> 1;
+        for (i = 0; i < 6; i++) {
+                if (val == 0)
+                        break;
+                val >>= 1;
+        }
+        return ((u8) i);
+}
+
+struct w83792d_data {
+        struct i2c_client client;
+        struct class_device *class_dev;
+        struct semaphore lock;
+        enum chips type;
+
+        struct semaphore update_lock;
+        char valid;             /* !=0 if following fields are valid */
+        unsigned long last_updated;     /* In jiffies */
+
+        /* array of 2 pointers to subclients */
+        struct i2c_client *lm75[2];
+
+        u8 in[9];               /* Register value */
+        u8 in_max[9];           /* Register value */
+        u8 in_min[9];           /* Register value */
+        u8 low_bits[2];         /* Additional resolution to voltage in0-6 */
+        u8 fan[7];              /* Register value */
+        u8 fan_min[7];          /* Register value */
+        u8 temp1[3];            /* current, over, thyst */
+        u8 temp_add[2][6];      /* Register value */
+        u8 fan_div[7];          /* Register encoding, shifted right */
+        u8 pwm[7];              /* We only consider the first 3 set of pwm,
+                                   although 792 chip has 7 set of pwm. */
+        u8 pwmenable[3];
+        u8 pwm_mode[7];         /* indicates PWM or DC mode: 1->PWM; 0->DC */
+        u32 alarms;             /* realtime status register encoding,combined */
+        u8 chassis;             /* Chassis status */
+        u8 chassis_clear;       /* CLR_CHS, clear chassis intrusion detection */
+        u8 thermal_cruise[3];   /* Smart FanI: Fan1,2,3 target value */
+        u8 tolerance[3];        /* Fan1,2,3 tolerance(Smart Fan I/II) */
+        u8 sf2_points[3][4];    /* Smart FanII: Fan1,2,3 temperature points */
+        u8 sf2_levels[3][4];    /* Smart FanII: Fan1,2,3 duty cycle levels */
+};
+
+static int w83792d_attach_adapter(struct i2c_adapter *adapter);
+static int w83792d_detect(struct i2c_adapter *adapter, int address, int kind);
+static int w83792d_detach_client(struct i2c_client *client);
+
+static int w83792d_read_value(struct i2c_client *client, u8 register);
+static int w83792d_write_value(struct i2c_client *client, u8 register,
+                                u8 value);
+static struct w83792d_data *w83792d_update_device(struct device *dev);
+
+#ifdef DEBUG
+static void w83792d_print_debug(struct w83792d_data *data, struct device *dev);
+#endif
+
+static void w83792d_init_client(struct i2c_client *client);
+
+static struct i2c_driver w83792d_driver = {
+        .owner = THIS_MODULE,
+        .name = "w83792d",
+        .flags = I2C_DF_NOTIFY,
+        .attach_adapter = w83792d_attach_adapter,
+        .detach_client = w83792d_detach_client,
+};
+
+static long in_count_from_reg(int nr, struct w83792d_data *data)
+{
+        u16 vol_count = data->in[nr];
+        u16 low_bits = 0;
+        vol_count = (vol_count << 2);
+        switch (nr)
+        {
+        case 0:  /* vin0 */
+                low_bits = (data->low_bits[0]) & 0x03;
+                break;
+        case 1:  /* vin1 */
+                low_bits = ((data->low_bits[0]) & 0x0c) >> 2;
+                break;
+        case 2:  /* vin2 */
+                low_bits = ((data->low_bits[0]) & 0x30) >> 4;
+                break;
+        case 3:  /* vin3 */
+                low_bits = ((data->low_bits[0]) & 0xc0) >> 6;
+                break;
+        case 4:  /* vin4 */
+                low_bits = (data->low_bits[1]) & 0x03;
+                break;
+        case 5:  /* vin5 */
+                low_bits = ((data->low_bits[1]) & 0x0c) >> 2;
+                break;
+        case 6:  /* vin6 */
+                low_bits = ((data->low_bits[1]) & 0x30) >> 4;
+        default:
+                break;
+        }
+        vol_count = vol_count | low_bits;
+        return vol_count;
+}
+
+/* following are the sysfs callback functions */
+static ssize_t show_in(struct device *dev, struct device_attribute *attr,
+                        char *buf)
+{
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
+        struct w83792d_data *data = w83792d_update_device(dev);
+        return sprintf(buf,"%ld\n", IN_FROM_REG(nr,(in_count_from_reg(nr, data))));
+}
+
+#define show_in_reg(reg) \
+static ssize_t show_##reg(struct device *dev, struct device_attribute *attr, \
+                        char *buf) \
+{ \
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr); \
+        int nr = sensor_attr->index; \
+        struct w83792d_data *data = w83792d_update_device(dev); \
+        return sprintf(buf,"%ld\n", (long)(IN_FROM_REG(nr, (data->reg[nr])*4))); \
+}
+
+show_in_reg(in_min);
+show_in_reg(in_max);
+
+#define store_in_reg(REG, reg) \
+static ssize_t store_in_##reg (struct device *dev, \
+                                struct device_attribute *attr, \
+                                const char *buf, size_t count) \
+{ \
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr); \
+        int nr = sensor_attr->index; \
+        struct i2c_client *client = to_i2c_client(dev); \
+        struct w83792d_data *data = i2c_get_clientdata(client); \
+        u32 val; \
+         \
+        val = simple_strtoul(buf, NULL, 10); \
+        data->in_##reg[nr] = SENSORS_LIMIT(IN_TO_REG(nr, val)/4, 0, 255); \
+        w83792d_write_value(client, W83792D_REG_IN_##REG[nr], data->in_##reg[nr]); \
+         \
+        return count; \
+}
+store_in_reg(MIN, min);
+store_in_reg(MAX, max);
+
+#define sysfs_in_reg(offset) \
+static SENSOR_DEVICE_ATTR(in##offset##_input, S_IRUGO, show_in, \
+                                NULL, offset); \
+static SENSOR_DEVICE_ATTR(in##offset##_min, S_IRUGO | S_IWUSR, \
+                                show_in_min, store_in_min, offset); \
+static SENSOR_DEVICE_ATTR(in##offset##_max, S_IRUGO | S_IWUSR, \
+                                show_in_max, store_in_max, offset);
+
+sysfs_in_reg(0);
+sysfs_in_reg(1);
+sysfs_in_reg(2);
+sysfs_in_reg(3);
+sysfs_in_reg(4);
+sysfs_in_reg(5);
+sysfs_in_reg(6);
+sysfs_in_reg(7);
+sysfs_in_reg(8);
+
+#define device_create_file_in(client, offset) \
+do { \
+device_create_file(&client->dev, &sensor_dev_attr_in##offset##_input.dev_attr); \
+device_create_file(&client->dev, &sensor_dev_attr_in##offset##_max.dev_attr); \
+device_create_file(&client->dev, &sensor_dev_attr_in##offset##_min.dev_attr); \
+} while (0)
+
+#define show_fan_reg(reg) \
+static ssize_t show_##reg (struct device *dev, struct device_attribute *attr, \
+                        char *buf) \
+{ \
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr); \
+        int nr = sensor_attr->index - 1; \
+        struct w83792d_data *data = w83792d_update_device(dev); \
+        return sprintf(buf,"%d\n", \
+                FAN_FROM_REG(data->reg[nr], DIV_FROM_REG(data->fan_div[nr]))); \
+}
+
+show_fan_reg(fan);
+show_fan_reg(fan_min);
+
+static ssize_t
+store_fan_min(struct device *dev, struct device_attribute *attr,
+                const char *buf, size_t count)
+{
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index - 1;
+        struct i2c_client *client = to_i2c_client(dev);
+        struct w83792d_data *data = i2c_get_clientdata(client);
+        u32 val;
+
+        val = simple_strtoul(buf, NULL, 10);
+        data->fan_min[nr] = FAN_TO_REG(val, DIV_FROM_REG(data->fan_div[nr]));
+        w83792d_write_value(client, W83792D_REG_FAN_MIN[nr],
+                                data->fan_min[nr]);
+
+        return count;
+}
+
+static ssize_t
+show_fan_div(struct device *dev, struct device_attribute *attr,
+                char *buf)
+{
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
+        struct w83792d_data *data = w83792d_update_device(dev);
+        return sprintf(buf, "%u\n", DIV_FROM_REG(data->fan_div[nr - 1]));
+}
+
+/* Note: we save and restore the fan minimum here, because its value is
+   determined in part by the fan divisor.  This follows the principle of
+   least suprise; the user doesn't expect the fan minimum to change just
+   because the divisor changed. */
+static ssize_t
+store_fan_div(struct device *dev, struct device_attribute *attr,
+                const char *buf, size_t count)
+{
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index - 1;
+        struct i2c_client *client = to_i2c_client(dev);
+        struct w83792d_data *data = i2c_get_clientdata(client);
+        unsigned long min;
+        /*u8 reg;*/
+        u8 fan_div_reg = 0;
+        u8 tmp_fan_div;
+
+        /* Save fan_min */
+        min = FAN_FROM_REG(data->fan_min[nr],
+                           DIV_FROM_REG(data->fan_div[nr]));
+
+        data->fan_div[nr] = DIV_TO_REG(simple_strtoul(buf, NULL, 10));
+
+        fan_div_reg = w83792d_read_value(client, W83792D_REG_FAN_DIV[nr >> 1]);
+        fan_div_reg &= (nr & 0x01) ? 0x8f : 0xf8;
+        tmp_fan_div = (nr & 0x01) ? (((data->fan_div[nr]) << 4) & 0x70)
+                                        : ((data->fan_div[nr]) & 0x07);
+        w83792d_write_value(client, W83792D_REG_FAN_DIV[nr >> 1],
+                                        fan_div_reg | tmp_fan_div);
+
+        /* Restore fan_min */
+        data->fan_min[nr] = FAN_TO_REG(min, DIV_FROM_REG(data->fan_div[nr]));
+        w83792d_write_value(client, W83792D_REG_FAN_MIN[nr], data->fan_min[nr]);
+
+        return count;
+}
+
+#define sysfs_fan(offset) \
+static SENSOR_DEVICE_ATTR(fan##offset##_input, S_IRUGO, show_fan, NULL, \
+                                offset); \
+static SENSOR_DEVICE_ATTR(fan##offset##_div, S_IRUGO | S_IWUSR, \
+                                show_fan_div, store_fan_div, offset); \
+static SENSOR_DEVICE_ATTR(fan##offset##_min, S_IRUGO | S_IWUSR, \
+                                show_fan_min, store_fan_min, offset);
+
+sysfs_fan(1);
+sysfs_fan(2);
+sysfs_fan(3);
+sysfs_fan(4);
+sysfs_fan(5);
+sysfs_fan(6);
+sysfs_fan(7);
+
+#define device_create_file_fan(client, offset) \
+do { \
+device_create_file(&client->dev, &sensor_dev_attr_fan##offset##_input.dev_attr); \
+device_create_file(&client->dev, &sensor_dev_attr_fan##offset##_div.dev_attr); \
+device_create_file(&client->dev, &sensor_dev_attr_fan##offset##_min.dev_attr); \
+} while (0)
+
+
+/* read/write the temperature1, includes measured value and limits */
+
+static ssize_t show_temp1(struct device *dev, struct device_attribute *attr,
+                                char *buf)
+{
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
+        struct w83792d_data *data = w83792d_update_device(dev);
+        return sprintf(buf, "%d\n", TEMP1_FROM_REG(data->temp1[nr]));
+}
+
+static ssize_t store_temp1(struct device *dev, struct device_attribute *attr,
+                                const char *buf, size_t count)
+{
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
+        struct i2c_client *client = to_i2c_client(dev);
+        struct w83792d_data *data = i2c_get_clientdata(client);
+        s32 val;
+
+        val = simple_strtol(buf, NULL, 10);
+
+        data->temp1[nr] = TEMP1_TO_REG(val);
+        w83792d_write_value(client, W83792D_REG_TEMP1[nr],
+                data->temp1[nr]);
+
+        return count;
+}
+
+
+static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO, show_temp1, NULL, 0);
+static SENSOR_DEVICE_ATTR(temp1_max, S_IRUGO | S_IWUSR, show_temp1,
+                                store_temp1, 1);
+static SENSOR_DEVICE_ATTR(temp1_max_hyst, S_IRUGO | S_IWUSR, show_temp1,
+                                store_temp1, 2);
+
+#define device_create_file_temp1(client) \
+do { \
+device_create_file(&client->dev, &sensor_dev_attr_temp1_input.dev_attr); \
+device_create_file(&client->dev, &sensor_dev_attr_temp1_max.dev_attr); \
+device_create_file(&client->dev, &sensor_dev_attr_temp1_max_hyst.dev_attr); \
+} while (0)
+
+
+/* read/write the temperature2-3, includes measured value and limits */
+
+static ssize_t show_temp23(struct device *dev, struct device_attribute *attr,
+                                char *buf)
+{
+        struct sensor_device_attribute_2 *sensor_attr = to_sensor_dev_attr_2(attr);
+        int nr = sensor_attr->nr;
+        int index = sensor_attr->index;
+        struct w83792d_data *data = w83792d_update_device(dev);
+        return sprintf(buf,"%ld\n",
+                (long)TEMP_ADD_FROM_REG(data->temp_add[nr][index],
+                        data->temp_add[nr][index+1]));
+}
+
+static ssize_t store_temp23(struct device *dev, struct device_attribute *attr,
+                                const char *buf, size_t count)
+{
+        struct sensor_device_attribute_2 *sensor_attr = to_sensor_dev_attr_2(attr);
+        int nr = sensor_attr->nr;
+        int index = sensor_attr->index;
+        struct i2c_client *client = to_i2c_client(dev);
+        struct w83792d_data *data = i2c_get_clientdata(client);
+        s32 val;
+
+        val = simple_strtol(buf, NULL, 10);
+
+        data->temp_add[nr][index] = TEMP_ADD_TO_REG_HIGH(val);
+        data->temp_add[nr][index+1] = TEMP_ADD_TO_REG_LOW(val);
+        w83792d_write_value(client, W83792D_REG_TEMP_ADD[nr][index],
+                data->temp_add[nr][index]);
+        w83792d_write_value(client, W83792D_REG_TEMP_ADD[nr][index+1],
+                data->temp_add[nr][index+1]);
+
+        return count;
+}
+
+#define sysfs_temp23(name,idx) \
+static SENSOR_DEVICE_ATTR_2(name##_input, S_IRUGO, show_temp23, NULL, \
+                                idx, 0); \
+static SENSOR_DEVICE_ATTR_2(name##_max, S_IRUGO | S_IWUSR, \
+                                show_temp23, store_temp23, idx, 2); \
+static SENSOR_DEVICE_ATTR_2(name##_max_hyst, S_IRUGO | S_IWUSR, \
+                                show_temp23, store_temp23, idx, 4);
+
+sysfs_temp23(temp2,0)
+sysfs_temp23(temp3,1)
+
+#define device_create_file_temp_add(client, offset) \
+do { \
+device_create_file(&client->dev, &sensor_dev_attr_temp##offset##_input.dev_attr); \
+device_create_file(&client->dev, &sensor_dev_attr_temp##offset##_max.dev_attr); \
+device_create_file(&client->dev, \
+&sensor_dev_attr_temp##offset##_max_hyst.dev_attr); \
+} while (0)
+
+
+/* get reatime status of all sensors items: voltage, temp, fan */
+static ssize_t
+show_alarms_reg(struct device *dev, struct device_attribute *attr, char *buf)
+{
+        struct w83792d_data *data = w83792d_update_device(dev);
+        return sprintf(buf, "%d\n", data->alarms);
+}
+
+static
+DEVICE_ATTR(alarms, S_IRUGO, show_alarms_reg, NULL);
+#define device_create_file_alarms(client) \
+device_create_file(&client->dev, &dev_attr_alarms);
+
+
+
+static ssize_t
+show_pwm(struct device *dev, struct device_attribute *attr,
+                char *buf)
+{
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
+        struct w83792d_data *data = w83792d_update_device(dev);
+        return sprintf(buf, "%ld\n", (long) PWM_FROM_REG(data->pwm[nr-1]));
+}
+
+static ssize_t
+show_pwmenable(struct device *dev, struct device_attribute *attr,
+                        char *buf)
+{
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index - 1;
+        struct w83792d_data *data = w83792d_update_device(dev);
+        long pwm_enable_tmp = 1;
+
+        switch (data->pwmenable[nr]) {
+        case 0:
+                pwm_enable_tmp = 1; /* manual mode */
+                break;
+        case 1:
+                pwm_enable_tmp = 3; /*thermal cruise/Smart Fan I */
+                break;
+        case 2:
+                pwm_enable_tmp = 2; /* Smart Fan II */
+                break;
+        }
+
+        return sprintf(buf, "%ld\n", pwm_enable_tmp);
+}
+
+static ssize_t
+store_pwm(struct device *dev, struct device_attribute *attr,
+                const char *buf, size_t count)
+{
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index - 1;
+        struct i2c_client *client = to_i2c_client(dev);
+        struct w83792d_data *data = i2c_get_clientdata(client);
+        u32 val;
+
+        val = simple_strtoul(buf, NULL, 10);
+        data->pwm[nr] = PWM_TO_REG(val);
+        w83792d_write_value(client, W83792D_REG_PWM[nr], data->pwm[nr]);
+
+        return count;
+}
+
+static ssize_t
+store_pwmenable(struct device *dev, struct device_attribute *attr,
+                        const char *buf, size_t count)
+{
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index - 1;
+        struct i2c_client *client = to_i2c_client(dev);
+        struct w83792d_data *data = i2c_get_clientdata(client);
+        u32 val;
+        u8 fan_cfg_tmp, cfg1_tmp, cfg2_tmp, cfg3_tmp, cfg4_tmp;
+
+        val = simple_strtoul(buf, NULL, 10);
+        switch (val) {
+        case 1:
+                data->pwmenable[nr] = 0; /* manual mode */
+                break;
+        case 2:
+                data->pwmenable[nr] = 2; /* Smart Fan II */
+                break;
+        case 3:
+                data->pwmenable[nr] = 1; /* thermal cruise/Smart Fan I */
+                break;
+        default:
+                return -EINVAL;
+        }
+        cfg1_tmp = data->pwmenable[0];
+        cfg2_tmp = (data->pwmenable[1]) << 2;
+        cfg3_tmp = (data->pwmenable[2]) << 4;
+        cfg4_tmp = w83792d_read_value(client,W83792D_REG_FAN_CFG) & 0xc0;
+        fan_cfg_tmp = ((cfg4_tmp | cfg3_tmp) | cfg2_tmp) | cfg1_tmp;
+        w83792d_write_value(client, W83792D_REG_FAN_CFG, fan_cfg_tmp);
+
+        return count;
+}
+
+#define sysfs_pwm(offset) \
+static SENSOR_DEVICE_ATTR(pwm##offset, S_IRUGO | S_IWUSR, \
+                                show_pwm, store_pwm, offset); \
+static SENSOR_DEVICE_ATTR(pwm##offset##_enable, S_IRUGO | S_IWUSR, \
+                                show_pwmenable, store_pwmenable, offset); \
+
+sysfs_pwm(1);
+sysfs_pwm(2);
+sysfs_pwm(3);
+
+
+#define device_create_file_pwm(client, offset) \
+do { \
+device_create_file(&client->dev, &sensor_dev_attr_pwm##offset.dev_attr); \
+} while (0)
+
+#define device_create_file_pwmenable(client, offset) \
+do { \
+device_create_file(&client->dev, &sensor_dev_attr_pwm##offset##_enable.dev_attr); \
+} while (0)
+
+
+static ssize_t
+show_pwm_mode(struct device *dev, struct device_attribute *attr,
+                        char *buf)
+{
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
+        struct w83792d_data *data = w83792d_update_device(dev);
+        return sprintf(buf, "%d\n", data->pwm_mode[nr-1]);
+}
+
+static ssize_t
+store_pwm_mode(struct device *dev, struct device_attribute *attr,
+                        const char *buf, size_t count)
+{
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index - 1;
+        struct i2c_client *client = to_i2c_client(dev);
+        struct w83792d_data *data = i2c_get_clientdata(client);
+        u32 val;
+        u8 pwm_mode_mask = 0;
+
+        val = simple_strtoul(buf, NULL, 10);
+        data->pwm_mode[nr] = SENSORS_LIMIT(val, 0, 1);
+        pwm_mode_mask = w83792d_read_value(client,
+                W83792D_REG_PWM[nr]) & 0x7f;
+        w83792d_write_value(client, W83792D_REG_PWM[nr],
+                ((data->pwm_mode[nr]) << 7) | pwm_mode_mask);
+
+        return count;
+}
+
+#define sysfs_pwm_mode(offset) \
+static SENSOR_DEVICE_ATTR(pwm##offset##_mode, S_IRUGO | S_IWUSR, \
+                                show_pwm_mode, store_pwm_mode, offset);
+
+sysfs_pwm_mode(1);
+sysfs_pwm_mode(2);
+sysfs_pwm_mode(3);
+
+#define device_create_file_pwm_mode(client, offset) \
+do { \
+device_create_file(&client->dev, &sensor_dev_attr_pwm##offset##_mode.dev_attr); \
+} while (0)
+
+
+static ssize_t
+show_regs_chassis(struct device *dev, struct device_attribute *attr,
+                        char *buf)
+{
+        struct w83792d_data *data = w83792d_update_device(dev);
+        return sprintf(buf, "%d\n", data->chassis);
+}
+
+static DEVICE_ATTR(chassis, S_IRUGO, show_regs_chassis, NULL);
+
+#define device_create_file_chassis(client) \
+do { \
+device_create_file(&client->dev, &dev_attr_chassis); \
+} while (0)
+
+
+static ssize_t
+show_chassis_clear(struct device *dev, struct device_attribute *attr, char *buf)
+{
+        struct w83792d_data *data = w83792d_update_device(dev);
+        return sprintf(buf, "%d\n", data->chassis_clear);
+}
+
+static ssize_t
+store_chassis_clear(struct device *dev, struct device_attribute *attr,
+                        const char *buf, size_t count)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        struct w83792d_data *data = i2c_get_clientdata(client);
+        u32 val;
+        u8 temp1 = 0, temp2 = 0;
+
+        val = simple_strtoul(buf, NULL, 10);
+
+        data->chassis_clear = SENSORS_LIMIT(val, 0 ,1);
+        temp1 = ((data->chassis_clear) << 7) & 0x80;
+        temp2 = w83792d_read_value(client,
+                W83792D_REG_CHASSIS_CLR) & 0x7f;
+        w83792d_write_value(client, W83792D_REG_CHASSIS_CLR, temp1 | temp2);
+
+        return count;
+}
+
+static DEVICE_ATTR(chassis_clear, S_IRUGO | S_IWUSR,
+                show_chassis_clear, store_chassis_clear);
+
+#define device_create_file_chassis_clear(client) \
+do { \
+device_create_file(&client->dev, &dev_attr_chassis_clear); \
+} while (0)
+
+
+
+/* For Smart Fan I / Thermal Cruise */
+static ssize_t
+show_thermal_cruise(struct device *dev, struct device_attribute *attr,
+                        char *buf)
+{
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
+        struct w83792d_data *data = w83792d_update_device(dev);
+        return sprintf(buf, "%ld\n", (long)data->thermal_cruise[nr-1]);
+}
+
+static ssize_t
+store_thermal_cruise(struct device *dev, struct device_attribute *attr,
+                        const char *buf, size_t count)
+{
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index - 1;
+        struct i2c_client *client = to_i2c_client(dev);
+        struct w83792d_data *data = i2c_get_clientdata(client);
+        u32 val;
+        u8 target_tmp=0, target_mask=0;
+
+        val = simple_strtoul(buf, NULL, 10);
+        target_tmp = val;
+        target_tmp = target_tmp & 0x7f;
+        target_mask = w83792d_read_value(client, W83792D_REG_THERMAL[nr]) & 0x80;
+        data->thermal_cruise[nr] = SENSORS_LIMIT(target_tmp, 0, 255);
+        w83792d_write_value(client, W83792D_REG_THERMAL[nr],
+                (data->thermal_cruise[nr]) | target_mask);
+
+        return count;
+}
+
+#define sysfs_thermal_cruise(offset) \
+static SENSOR_DEVICE_ATTR(thermal_cruise##offset, S_IRUGO | S_IWUSR, \
+                        show_thermal_cruise, store_thermal_cruise, offset);
+
+sysfs_thermal_cruise(1);
+sysfs_thermal_cruise(2);
+sysfs_thermal_cruise(3);
+
+#define device_create_file_thermal_cruise(client, offset) \
+do { \
+device_create_file(&client->dev, \
+&sensor_dev_attr_thermal_cruise##offset.dev_attr); \
+} while (0)
+
+
+/* For Smart Fan I/Thermal Cruise and Smart Fan II */
+static ssize_t
+show_tolerance(struct device *dev, struct device_attribute *attr,
+                char *buf)
+{
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
+        struct w83792d_data *data = w83792d_update_device(dev);
+        return sprintf(buf, "%ld\n", (long)data->tolerance[nr-1]);
+}
+
+static ssize_t
+store_tolerance(struct device *dev, struct device_attribute *attr,
+                const char *buf, size_t count)
+{
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index - 1;
+        struct i2c_client *client = to_i2c_client(dev);
+        struct w83792d_data *data = i2c_get_clientdata(client);
+        u32 val;
+        u8 tol_tmp, tol_mask;
+
+        val = simple_strtoul(buf, NULL, 10);
+        tol_mask = w83792d_read_value(client,
+                W83792D_REG_TOLERANCE[nr]) & ((nr == 1) ? 0x0f : 0xf0);
+        tol_tmp = SENSORS_LIMIT(val, 0, 15);
+        tol_tmp &= 0x0f;
+        data->tolerance[nr] = tol_tmp;
+        if (nr == 1) {
+                tol_tmp <<= 4;
+        }
+        w83792d_write_value(client, W83792D_REG_TOLERANCE[nr],
+                tol_mask | tol_tmp);
+
+        return count;
+}
+
+#define sysfs_tolerance(offset) \
+static SENSOR_DEVICE_ATTR(tolerance##offset, S_IRUGO | S_IWUSR, \
+                                show_tolerance, store_tolerance, offset);
+
+sysfs_tolerance(1);
+sysfs_tolerance(2);
+sysfs_tolerance(3);
+
+#define device_create_file_tolerance(client, offset) \
+do { \
+device_create_file(&client->dev, &sensor_dev_attr_tolerance##offset.dev_attr); \
+} while (0)
+
+
+/* For Smart Fan II */
+static ssize_t
+show_sf2_point(struct device *dev, struct device_attribute *attr,
+                char *buf)
+{
+        struct sensor_device_attribute_2 *sensor_attr = to_sensor_dev_attr_2(attr);
+        int nr = sensor_attr->nr;
+        int index = sensor_attr->index;
+        struct w83792d_data *data = w83792d_update_device(dev);
+        return sprintf(buf, "%ld\n", (long)data->sf2_points[index-1][nr-1]);
+}
+
+static ssize_t
+store_sf2_point(struct device *dev, struct device_attribute *attr,
+                const char *buf, size_t count)
+{
+        struct sensor_device_attribute_2 *sensor_attr = to_sensor_dev_attr_2(attr);
+        int nr = sensor_attr->nr - 1;
+        int index = sensor_attr->index - 1;
+        struct i2c_client *client = to_i2c_client(dev);
+        struct w83792d_data *data = i2c_get_clientdata(client);
+        u32 val;
+        u8 mask_tmp = 0;
+
+        val = simple_strtoul(buf, NULL, 10);
+        data->sf2_points[index][nr] = SENSORS_LIMIT(val, 0, 127);
+        mask_tmp = w83792d_read_value(client,
+                                        W83792D_REG_POINTS[index][nr]) & 0x80;
+        w83792d_write_value(client, W83792D_REG_POINTS[index][nr],
+                mask_tmp|data->sf2_points[index][nr]);
+
+        return count;
+}
+
+#define sysfs_sf2_point(offset, index) \
+static SENSOR_DEVICE_ATTR_2(sf2_point##offset##_fan##index, S_IRUGO | S_IWUSR, \
+                                show_sf2_point, store_sf2_point, offset, index);
+
+sysfs_sf2_point(1, 1);  /* Fan1 */
+sysfs_sf2_point(2, 1);  /* Fan1 */
+sysfs_sf2_point(3, 1);  /* Fan1 */
+sysfs_sf2_point(4, 1);  /* Fan1 */
+sysfs_sf2_point(1, 2);  /* Fan2 */
+sysfs_sf2_point(2, 2);  /* Fan2 */
+sysfs_sf2_point(3, 2);  /* Fan2 */
+sysfs_sf2_point(4, 2);  /* Fan2 */
+sysfs_sf2_point(1, 3);  /* Fan3 */
+sysfs_sf2_point(2, 3);  /* Fan3 */
+sysfs_sf2_point(3, 3);  /* Fan3 */
+sysfs_sf2_point(4, 3);  /* Fan3 */
+
+#define device_create_file_sf2_point(client, offset, index) \
+do { \
+device_create_file(&client->dev, \
+&sensor_dev_attr_sf2_point##offset##_fan##index.dev_attr); \
+} while (0)
+
+
+static ssize_t
+show_sf2_level(struct device *dev, struct device_attribute *attr,
+                char *buf)
+{
+        struct sensor_device_attribute_2 *sensor_attr = to_sensor_dev_attr_2(attr);
+        int nr = sensor_attr->nr;
+        int index = sensor_attr->index;
+        struct w83792d_data *data = w83792d_update_device(dev);
+        return sprintf(buf, "%d\n",
+                        (((data->sf2_levels[index-1][nr]) * 100) / 15));
+}
+
+static ssize_t
+store_sf2_level(struct device *dev, struct device_attribute *attr,
+                const char *buf, size_t count)
+{
+        struct sensor_device_attribute_2 *sensor_attr = to_sensor_dev_attr_2(attr);
+        int nr = sensor_attr->nr;
+        int index = sensor_attr->index - 1;
+        struct i2c_client *client = to_i2c_client(dev);
+        struct w83792d_data *data = i2c_get_clientdata(client);
+        u32 val;
+        u8 mask_tmp=0, level_tmp=0;
+
+        val = simple_strtoul(buf, NULL, 10);
+        data->sf2_levels[index][nr] = SENSORS_LIMIT((val * 15) / 100, 0, 15);
+        mask_tmp = w83792d_read_value(client, W83792D_REG_LEVELS[index][nr])
+                & ((nr==3) ? 0xf0 : 0x0f);
+        if (nr==3) {
+                level_tmp = data->sf2_levels[index][nr];
+        } else {
+                level_tmp = data->sf2_levels[index][nr] << 4;
+        }
+        w83792d_write_value(client, W83792D_REG_LEVELS[index][nr], level_tmp | mask_tmp);
+
+        return count;
+}
+
+#define sysfs_sf2_level(offset, index) \
+static SENSOR_DEVICE_ATTR_2(sf2_level##offset##_fan##index, S_IRUGO | S_IWUSR, \
+                                show_sf2_level, store_sf2_level, offset, index);
+
+sysfs_sf2_level(1, 1);  /* Fan1 */
+sysfs_sf2_level(2, 1);  /* Fan1 */
+sysfs_sf2_level(3, 1);  /* Fan1 */
+sysfs_sf2_level(1, 2);  /* Fan2 */
+sysfs_sf2_level(2, 2);  /* Fan2 */
+sysfs_sf2_level(3, 2);  /* Fan2 */
+sysfs_sf2_level(1, 3);  /* Fan3 */
+sysfs_sf2_level(2, 3);  /* Fan3 */
+sysfs_sf2_level(3, 3);  /* Fan3 */
+
+#define device_create_file_sf2_level(client, offset, index) \
+do { \
+device_create_file(&client->dev, \
+&sensor_dev_attr_sf2_level##offset##_fan##index.dev_attr); \
+} while (0)
+
+
+/* This function is called when:
+     * w83792d_driver is inserted (when this module is loaded), for each
+       available adapter
+     * when a new adapter is inserted (and w83792d_driver is still present) */
+static int
+w83792d_attach_adapter(struct i2c_adapter *adapter)
+{
+        if (!(adapter->class & I2C_CLASS_HWMON))
+                return 0;
+        return i2c_probe(adapter, &addr_data, w83792d_detect);
+}
+
+
+static int
+w83792d_create_subclient(struct i2c_adapter *adapter,
+                                struct i2c_client *new_client, int addr,
+                                struct i2c_client **sub_cli)
+{
+        int err;
+        struct i2c_client *sub_client;
+
+        (*sub_cli) = sub_client = kmalloc(sizeof(struct i2c_client), GFP_KERNEL);
+        if (!(sub_client)) {
+                return -ENOMEM;
+        }
+        memset(sub_client, 0x00, sizeof(struct i2c_client));
+        sub_client->addr = 0x48 + addr;
+        i2c_set_clientdata(sub_client, NULL);
+        sub_client->adapter = adapter;
+        sub_client->driver = &w83792d_driver;
+        sub_client->flags = 0;
+        strlcpy(sub_client->name, "w83792d subclient", I2C_NAME_SIZE);
+        if ((err = i2c_attach_client(sub_client))) {
+                dev_err(&new_client->dev, "subclient registration "
+                        "at address 0x%x failed\n", sub_client->addr);
+                kfree(sub_client);
+                return err;
+        }
+        return 0;
+}
+
+
+static int
+w83792d_detect_subclients(struct i2c_adapter *adapter, int address, int kind,
+                struct i2c_client *new_client)
+{
+        int i, id, err;
+        u8 val;
+        struct w83792d_data *data = i2c_get_clientdata(new_client);
+
+        id = i2c_adapter_id(adapter);
+        if (force_subclients[0] == id && force_subclients[1] == address) {
+                for (i = 2; i <= 3; i++) {
+                        if (force_subclients[i] < 0x48 ||
+                            force_subclients[i] > 0x4f) {
+                                dev_err(&new_client->dev, "invalid subclient "
+                                        "address %d; must be 0x48-0x4f\n",
+                                        force_subclients[i]);
+                                err = -ENODEV;
+                                goto ERROR_SC_0;
+                        }
+                }
+                w83792d_write_value(new_client, W83792D_REG_I2C_SUBADDR,
+                                        (force_subclients[2] & 0x07) |
+                                        ((force_subclients[3] & 0x07) << 4));
+        }
+
+        val = w83792d_read_value(new_client, W83792D_REG_I2C_SUBADDR);
+        if (!(val & 0x08)) {
+                err = w83792d_create_subclient(adapter, new_client, val & 0x7,
+                                                &data->lm75[0]);
+                if (err < 0)
+                        goto ERROR_SC_0;
+        }
+        if (!(val & 0x80)) {
+                if ((data->lm75[0] != NULL) &&
+                        ((val & 0x7) == ((val >> 4) & 0x7))) {
+                        dev_err(&new_client->dev, "duplicate addresses 0x%x, "
+                                "use force_subclient\n", data->lm75[0]->addr);
+                        err = -ENODEV;
+                        goto ERROR_SC_1;
+                }
+                err = w83792d_create_subclient(adapter, new_client,
+                                                (val >> 4) & 0x7, &data->lm75[1]);
+                if (err < 0)
+                        goto ERROR_SC_1;
+        }
+
+        return 0;
+
+/* Undo inits in case of errors */
+
+ERROR_SC_1:
+        if (data->lm75[0] != NULL) {
+                i2c_detach_client(data->lm75[0]);
+                kfree(data->lm75[0]);
+        }
+ERROR_SC_0:
+        return err;
+}
+
+
+static int
+w83792d_detect(struct i2c_adapter *adapter, int address, int kind)
+{
+        int i = 0, val1 = 0, val2;
+        struct i2c_client *new_client;
+        struct w83792d_data *data;
+        int err = 0;
+        const char *client_name = "";
+
+        if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) {
+                goto ERROR0;
+        }
+
+        /* OK. For now, we presume we have a valid client. We now create the
+           client structure, even though we cannot fill it completely yet.
+           But it allows us to access w83792d_{read,write}_value. */
+
+        if (!(data = kmalloc(sizeof(struct w83792d_data), GFP_KERNEL))) {
+                err = -ENOMEM;
+                goto ERROR0;
+        }
+        memset(data, 0, sizeof(struct w83792d_data));
+
+        new_client = &data->client;
+        i2c_set_clientdata(new_client, data);
+        new_client->addr = address;
+        init_MUTEX(&data->lock);
+        new_client->adapter = adapter;
+        new_client->driver = &w83792d_driver;
+        new_client->flags = 0;
+
+        /* Now, we do the remaining detection. */
+
+        /* The w83792d may be stuck in some other bank than bank 0. This may
+           make reading other information impossible. Specify a force=... or
+           force_*=... parameter, and the Winbond will be reset to the right
+           bank. */
+        if (kind < 0) {
+                if (w83792d_read_value(new_client, W83792D_REG_CONFIG) & 0x80) {
+                        dev_warn(&new_client->dev, "Detection failed at step "
+                                "3\n");
+                        goto ERROR1;
+                }
+                val1 = w83792d_read_value(new_client, W83792D_REG_BANK);
+                val2 = w83792d_read_value(new_client, W83792D_REG_CHIPMAN);
+                /* Check for Winbond ID if in bank 0 */
+                if (!(val1 & 0x07)) {  /* is Bank0 */
+                        if (((!(val1 & 0x80)) && (val2 != 0xa3)) ||
+                             ((val1 & 0x80) && (val2 != 0x5c))) {
+                                goto ERROR1;
+                        }
+                }
+                /* If Winbond chip, address of chip and W83792D_REG_I2C_ADDR
+                   should match */
+                if (w83792d_read_value(new_client,
+                                        W83792D_REG_I2C_ADDR) != address) {
+                        dev_warn(&new_client->dev, "Detection failed "
+                                "at step 5\n");
+                        goto ERROR1;
+                }
+        }
+
+        /* We have either had a force parameter, or we have already detected the
+           Winbond. Put it now into bank 0 and Vendor ID High Byte */
+        w83792d_write_value(new_client,
+                            W83792D_REG_BANK,
+                            (w83792d_read_value(new_client,
+                                W83792D_REG_BANK) & 0x78) | 0x80);
+
+        /* Determine the chip type. */
+        if (kind <= 0) {
+                /* get vendor ID */
+                val2 = w83792d_read_value(new_client, W83792D_REG_CHIPMAN);
+                if (val2 != 0x5c) {  /* the vendor is NOT Winbond */
+                        goto ERROR1;
+                }
+                val1 = w83792d_read_value(new_client, W83792D_REG_WCHIPID);
+                if (val1 == 0x7a && address >= 0x2c) {
+                        kind = w83792d;
+                } else {
+                        if (kind == 0)
+                                        dev_warn(&new_client->dev,
+                                        "w83792d: Ignoring 'force' parameter for"
+                                        " unknown chip at adapter %d, address"
+                                        " 0x%02x\n", i2c_adapter_id(adapter),
+                                        address);
+                        goto ERROR1;
+                }
+        }
+
+        if (kind == w83792d) {
+                client_name = "w83792d";
+        } else {
+                dev_err(&new_client->dev, "w83792d: Internal error: unknown"
+                                          " kind (%d)?!?", kind);
+                goto ERROR1;
+        }
+
+        /* Fill in the remaining client fields and put into the global list */
+        strlcpy(new_client->name, client_name, I2C_NAME_SIZE);
+        data->type = kind;
+
+        data->valid = 0;
+        init_MUTEX(&data->update_lock);
+
+        /* Tell the I2C layer a new client has arrived */
+        if ((err = i2c_attach_client(new_client)))
+                goto ERROR1;
+
+        if ((err = w83792d_detect_subclients(adapter, address,
+                        kind, new_client)))
+                goto ERROR2;
+
+        /* Initialize the chip */
+        w83792d_init_client(new_client);
+
+        /* A few vars need to be filled upon startup */
+        for (i = 1; i <= 7; i++) {
+                data->fan_min[i - 1] = w83792d_read_value(new_client,
+                                        W83792D_REG_FAN_MIN[i]);
+        }
+
+        /* Register sysfs hooks */
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto ERROR3;
+        }
+        device_create_file_in(new_client, 0);
+        device_create_file_in(new_client, 1);
+        device_create_file_in(new_client, 2);
+        device_create_file_in(new_client, 3);
+        device_create_file_in(new_client, 4);
+        device_create_file_in(new_client, 5);
+        device_create_file_in(new_client, 6);
+        device_create_file_in(new_client, 7);
+        device_create_file_in(new_client, 8);
+
+        device_create_file_fan(new_client, 1);
+        device_create_file_fan(new_client, 2);
+        device_create_file_fan(new_client, 3);
+        device_create_file_fan(new_client, 4);
+        device_create_file_fan(new_client, 5);
+        device_create_file_fan(new_client, 6);
+        device_create_file_fan(new_client, 7);
+
+        device_create_file_temp1(new_client);           /* Temp1 */
+        device_create_file_temp_add(new_client, 2);     /* Temp2 */
+        device_create_file_temp_add(new_client, 3);     /* Temp3 */
+
+        device_create_file_alarms(new_client);
+
+        device_create_file_pwm(new_client, 1);
+        device_create_file_pwm(new_client, 2);
+        device_create_file_pwm(new_client, 3);
+
+        device_create_file_pwmenable(new_client, 1);
+        device_create_file_pwmenable(new_client, 2);
+        device_create_file_pwmenable(new_client, 3);
+
+        device_create_file_pwm_mode(new_client, 1);
+        device_create_file_pwm_mode(new_client, 2);
+        device_create_file_pwm_mode(new_client, 3);
+
+        device_create_file_chassis(new_client);
+        device_create_file_chassis_clear(new_client);
+
+        device_create_file_thermal_cruise(new_client, 1);
+        device_create_file_thermal_cruise(new_client, 2);
+        device_create_file_thermal_cruise(new_client, 3);
+
+        device_create_file_tolerance(new_client, 1);
+        device_create_file_tolerance(new_client, 2);
+        device_create_file_tolerance(new_client, 3);
+
+        device_create_file_sf2_point(new_client, 1, 1); /* Fan1 */
+        device_create_file_sf2_point(new_client, 2, 1); /* Fan1 */
+        device_create_file_sf2_point(new_client, 3, 1); /* Fan1 */
+        device_create_file_sf2_point(new_client, 4, 1); /* Fan1 */
+        device_create_file_sf2_point(new_client, 1, 2); /* Fan2 */
+        device_create_file_sf2_point(new_client, 2, 2); /* Fan2 */
+        device_create_file_sf2_point(new_client, 3, 2); /* Fan2 */
+        device_create_file_sf2_point(new_client, 4, 2); /* Fan2 */
+        device_create_file_sf2_point(new_client, 1, 3); /* Fan3 */
+        device_create_file_sf2_point(new_client, 2, 3); /* Fan3 */
+        device_create_file_sf2_point(new_client, 3, 3); /* Fan3 */
+        device_create_file_sf2_point(new_client, 4, 3); /* Fan3 */
+
+        device_create_file_sf2_level(new_client, 1, 1); /* Fan1 */
+        device_create_file_sf2_level(new_client, 2, 1); /* Fan1 */
+        device_create_file_sf2_level(new_client, 3, 1); /* Fan1 */
+        device_create_file_sf2_level(new_client, 1, 2); /* Fan2 */
+        device_create_file_sf2_level(new_client, 2, 2); /* Fan2 */
+        device_create_file_sf2_level(new_client, 3, 2); /* Fan2 */
+        device_create_file_sf2_level(new_client, 1, 3); /* Fan3 */
+        device_create_file_sf2_level(new_client, 2, 3); /* Fan3 */
+        device_create_file_sf2_level(new_client, 3, 3); /* Fan3 */
+
+        return 0;
+
+ERROR3:
+        if (data->lm75[0] != NULL) {
+                i2c_detach_client(data->lm75[0]);
+                kfree(data->lm75[0]);
+        }
+        if (data->lm75[1] != NULL) {
+                i2c_detach_client(data->lm75[1]);
+                kfree(data->lm75[1]);
+        }
+ERROR2:
+        i2c_detach_client(new_client);
+ERROR1:
+        kfree(data);
+ERROR0:
+        return err;
+}
+
+static int
+w83792d_detach_client(struct i2c_client *client)
+{
+        struct w83792d_data *data = i2c_get_clientdata(client);
+        int err;
+
+        /* main client */
+        if (data)
+                hwmon_device_unregister(data->class_dev);
+
+        if ((err = i2c_detach_client(client)))
+                return err;
+
+        /* main client */
+        if (data)
+                kfree(data);
+        /* subclient */
+        else
+                kfree(client);
+
+        return 0;
+}
+
+/* The SMBus locks itself, usually, but nothing may access the Winbond between
+   bank switches. ISA access must always be locked explicitly!
+   We ignore the W83792D BUSY flag at this moment - it could lead to deadlocks,
+   would slow down the W83792D access and should not be necessary.
+   There are some ugly typecasts here, but the good news is - they should
+   nowhere else be necessary! */
+static int
+w83792d_read_value(struct i2c_client *client, u8 reg)
+{
+        int res=0;
+        res = i2c_smbus_read_byte_data(client, reg);
+
+        return res;
+}
+
+static int
+w83792d_write_value(struct i2c_client *client, u8 reg, u8 value)
+{
+        i2c_smbus_write_byte_data(client, reg,  value);
+        return 0;
+}
+
+/* Called when we have found a new W83792D. It should set limits, etc. */
+static void
+w83792d_init_client(struct i2c_client *client)
+{
+        u8 temp2_cfg, temp3_cfg, vid_in_b;
+
+        if (init) {
+                w83792d_write_value(client, W83792D_REG_CONFIG, 0x80);
+        }
+        /* Clear the bit6 of W83792D_REG_VID_IN_B(set it into 0):
+           W83792D_REG_VID_IN_B bit6 = 0: the high/low limit of
+             vin0/vin1 can be modified by user;
+           W83792D_REG_VID_IN_B bit6 = 1: the high/low limit of
+             vin0/vin1 auto-updated, can NOT be modified by user. */
+        vid_in_b = w83792d_read_value(client, W83792D_REG_VID_IN_B);
+        w83792d_write_value(client, W83792D_REG_VID_IN_B,
+                            vid_in_b & 0xbf);
+
+        temp2_cfg = w83792d_read_value(client, W83792D_REG_TEMP2_CONFIG);
+        temp3_cfg = w83792d_read_value(client, W83792D_REG_TEMP3_CONFIG);
+        w83792d_write_value(client, W83792D_REG_TEMP2_CONFIG,
+                                temp2_cfg & 0xe6);
+        w83792d_write_value(client, W83792D_REG_TEMP3_CONFIG,
+                                temp3_cfg & 0xe6);
+
+        /* Start monitoring */
+        w83792d_write_value(client, W83792D_REG_CONFIG,
+                            (w83792d_read_value(client,
+                                                W83792D_REG_CONFIG) & 0xf7)
+                            | 0x01);
+}
+
+static struct w83792d_data *w83792d_update_device(struct device *dev)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        struct w83792d_data *data = i2c_get_clientdata(client);
+        int i, j;
+        u8 reg_array_tmp[4], pwm_array_tmp[7], reg_tmp;
+
+        down(&data->update_lock);
+
+        if (time_after
+            (jiffies - data->last_updated, (unsigned long) (HZ * 3))
+            || time_before(jiffies, data->last_updated) || !data->valid) {
+                dev_dbg(dev, "Starting device update\n");
+
+                /* Update the voltages measured value and limits */
+                for (i = 0; i < 9; i++) {
+                        data->in[i] = w83792d_read_value(client,
+                                                W83792D_REG_IN[i]);
+                        data->in_max[i] = w83792d_read_value(client,
+                                                W83792D_REG_IN_MAX[i]);
+                        data->in_min[i] = w83792d_read_value(client,
+                                                W83792D_REG_IN_MIN[i]);
+                }
+                data->low_bits[0] = w83792d_read_value(client,
+                                                W83792D_REG_LOW_BITS1);
+                data->low_bits[1] = w83792d_read_value(client,
+                                                W83792D_REG_LOW_BITS2);
+                for (i = 0; i < 7; i++) {
+                        /* Update the Fan measured value and limits */
+                        data->fan[i] = w83792d_read_value(client,
+                                                W83792D_REG_FAN[i]);
+                        data->fan_min[i] = w83792d_read_value(client,
+                                                W83792D_REG_FAN_MIN[i]);
+                        /* Update the PWM/DC Value and PWM/DC flag */
+                        pwm_array_tmp[i] = w83792d_read_value(client,
+                                                W83792D_REG_PWM[i]);
+                        data->pwm[i] = pwm_array_tmp[i] & 0x0f;
+                        data->pwm_mode[i] = (pwm_array_tmp[i] >> 7) & 0x01;
+                }
+
+                reg_tmp = w83792d_read_value(client, W83792D_REG_FAN_CFG);
+                data->pwmenable[0] = reg_tmp & 0x03;
+                data->pwmenable[1] = (reg_tmp>>2) & 0x03;
+                data->pwmenable[2] = (reg_tmp>>4) & 0x03;
+
+                for (i = 0; i < 3; i++) {
+                        data->temp1[i] = w83792d_read_value(client,
+                                                        W83792D_REG_TEMP1[i]);
+                }
+                for (i = 0; i < 2; i++) {
+                        for (j = 0; j < 6; j++) {
+                                data->temp_add[i][j] = w83792d_read_value(
+                                        client,W83792D_REG_TEMP_ADD[i][j]);
+                        }
+                }
+
+                /* Update the Fan Divisor */
+                for (i = 0; i < 4; i++) {
+                        reg_array_tmp[i] = w83792d_read_value(client,
+                                                        W83792D_REG_FAN_DIV[i]);
+                }
+                data->fan_div[0] = reg_array_tmp[0] & 0x07;
+                data->fan_div[1] = (reg_array_tmp[0] >> 4) & 0x07;
+                data->fan_div[2] = reg_array_tmp[1] & 0x07;
+                data->fan_div[3] = (reg_array_tmp[1] >> 4) & 0x07;
+                data->fan_div[4] = reg_array_tmp[2] & 0x07;
+                data->fan_div[5] = (reg_array_tmp[2] >> 4) & 0x07;
+                data->fan_div[6] = reg_array_tmp[3] & 0x07;
+
+                /* Update the realtime status */
+                data->alarms = w83792d_read_value(client, W83792D_REG_ALARM1) +
+                        (w83792d_read_value(client, W83792D_REG_ALARM2) << 8) +
+                        (w83792d_read_value(client, W83792D_REG_ALARM3) << 16);
+
+                /* Update CaseOpen status and it's CLR_CHS. */
+                data->chassis = (w83792d_read_value(client,
+                        W83792D_REG_CHASSIS) >> 5) & 0x01;
+                data->chassis_clear = (w83792d_read_value(client,
+                        W83792D_REG_CHASSIS_CLR) >> 7) & 0x01;
+
+                /* Update Thermal Cruise/Smart Fan I target value */
+                for (i = 0; i < 3; i++) {
+                        data->thermal_cruise[i] =
+                                w83792d_read_value(client,
+                                W83792D_REG_THERMAL[i]) & 0x7f;
+                }
+
+                /* Update Smart Fan I/II tolerance */
+                reg_tmp = w83792d_read_value(client, W83792D_REG_TOLERANCE[0]);
+                data->tolerance[0] = reg_tmp & 0x0f;
+                data->tolerance[1] = (reg_tmp >> 4) & 0x0f;
+                data->tolerance[2] = w83792d_read_value(client,
+                                        W83792D_REG_TOLERANCE[2]) & 0x0f;
+
+                /* Update Smart Fan II temperature points */
+                for (i = 0; i < 3; i++) {
+                        for (j = 0; j < 4; j++) {
+                                data->sf2_points[i][j] = w83792d_read_value(
+                                        client,W83792D_REG_POINTS[i][j]) & 0x7f;
+                        }
+                }
+
+                /* Update Smart Fan II duty cycle levels */
+                for (i = 0; i < 3; i++) {
+                        reg_tmp = w83792d_read_value(client,
+                                                W83792D_REG_LEVELS[i][0]);
+                        data->sf2_levels[i][0] = reg_tmp & 0x0f;
+                        data->sf2_levels[i][1] = (reg_tmp >> 4) & 0x0f;
+                        reg_tmp = w83792d_read_value(client,
+                                                W83792D_REG_LEVELS[i][2]);
+                        data->sf2_levels[i][2] = (reg_tmp >> 4) & 0x0f;
+                        data->sf2_levels[i][3] = reg_tmp & 0x0f;
+                }
+
+                data->last_updated = jiffies;
+                data->valid = 1;
+        }
+
+        up(&data->update_lock);
+
+#ifdef DEBUG
+        w83792d_print_debug(data, dev);
+#endif
+
+        return data;
+}
+
+#ifdef DEBUG
+static void w83792d_print_debug(struct w83792d_data *data, struct device *dev)
+{
+        int i=0, j=0;
+        dev_dbg(dev, "==========The following is the debug message...========\n");
+        dev_dbg(dev, "9 set of Voltages: =====>\n");
+        for (i=0; i<9; i++) {
+                dev_dbg(dev, "vin[%d] is: 0x%x\n", i, data->in[i]);
+                dev_dbg(dev, "vin[%d] max is: 0x%x\n", i, data->in_max[i]);
+                dev_dbg(dev, "vin[%d] min is: 0x%x\n", i, data->in_min[i]);
+        }
+        dev_dbg(dev, "Low Bit1 is: 0x%x\n", data->low_bits[0]);
+        dev_dbg(dev, "Low Bit2 is: 0x%x\n", data->low_bits[1]);
+        dev_dbg(dev, "7 set of Fan Counts and Duty Cycles: =====>\n");
+        for (i=0; i<7; i++) {
+                dev_dbg(dev, "fan[%d] is: 0x%x\n", i, data->fan[i]);
+                dev_dbg(dev, "fan[%d] min is: 0x%x\n", i, data->fan_min[i]);
+                dev_dbg(dev, "pwm[%d]     is: 0x%x\n", i, data->pwm[i]);
+                dev_dbg(dev, "pwm_mode[%d] is: 0x%x\n", i, data->pwm_mode[i]);
+        }
+        dev_dbg(dev, "3 set of Temperatures: =====>\n");
+        for (i=0; i<3; i++) {
+                dev_dbg(dev, "temp1[%d] is: 0x%x\n", i, data->temp1[i]);
+        }
+
+        for (i=0; i<2; i++) {
+                for (j=0; j<6; j++) {
+                        dev_dbg(dev, "temp_add[%d][%d] is: 0x%x\n", i, j,
+                                                        data->temp_add[i][j]);
+                }
+        }
+
+        for (i=0; i<7; i++) {
+                dev_dbg(dev, "fan_div[%d] is: 0x%x\n", i, data->fan_div[i]);
+        }
+        dev_dbg(dev, "==========End of the debug message...==================\n");
+        dev_dbg(dev, "\n");
+}
+#endif
+
+static int __init
+sensors_w83792d_init(void)
+{
+        return i2c_add_driver(&w83792d_driver);
+}
+
+static void __exit
+sensors_w83792d_exit(void)
+{
+        i2c_del_driver(&w83792d_driver);
+}
+
+MODULE_AUTHOR("Chunhao Huang @ Winbond <DZShen@Winbond.com.tw>");
+MODULE_DESCRIPTION("W83792AD/D driver for linux-2.6");
+MODULE_LICENSE("GPL");
+
+module_init(sensors_w83792d_init);
+module_exit(sensors_w83792d_exit);
+
diff --git a/drivers/hwmon/w83l785ts.c b/drivers/hwmon/w83l785ts.c
index 4469d52aba4..133e34ab1d0 100644
--- a/drivers/hwmon/w83l785ts.c
+++ b/drivers/hwmon/w83l785ts.c
@@ -36,7 +36,8 @@
 #include <linux/slab.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
+#include <linux/hwmon.h>
+#include <linux/err.h>
 
 /* How many retries on register read error */
 #define MAX_RETRIES     5
@@ -47,13 +48,12 @@
  */
 
 static unsigned short normal_i2c[] = { 0x2e, I2C_CLIENT_END };
-static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
 
 /*
  * Insmod parameters
  */
 
-SENSORS_INSMOD_1(w83l785ts);
+I2C_CLIENT_INSMOD_1(w83l785ts);
 
 /*
  * The W83L785TS-S registers
@@ -105,6 +105,7 @@ static struct i2c_driver w83l785ts_driver = {
 
 struct w83l785ts_data {
         struct i2c_client client;
+        struct class_device *class_dev;
         struct semaphore update_lock;
         char valid; /* zero until following fields are valid */
         unsigned long last_updated; /* in jiffies */
@@ -140,7 +141,7 @@ static int w83l785ts_attach_adapter(struct i2c_adapter *adapter)
 {
         if (!(adapter->class & I2C_CLASS_HWMON))
                 return 0;
-        return i2c_detect(adapter, &addr_data, w83l785ts_detect);
+        return i2c_probe(adapter, &addr_data, w83l785ts_detect);
 }
 
 /*
@@ -239,11 +240,19 @@ static int w83l785ts_detect(struct i2c_adapter *adapter, int address, int kind)
          */
 
         /* Register sysfs hooks */
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto exit_detach;
+        }
+
         device_create_file(&new_client->dev, &dev_attr_temp1_input);
         device_create_file(&new_client->dev, &dev_attr_temp1_max);
 
         return 0;
 
+exit_detach:
+        i2c_detach_client(new_client);
 exit_free:
         kfree(data);
 exit:
@@ -252,15 +261,15 @@ exit:
 
 static int w83l785ts_detach_client(struct i2c_client *client)
 {
+        struct w83l785ts_data *data = i2c_get_clientdata(client);
         int err;
 
-        if ((err = i2c_detach_client(client))) {
-                dev_err(&client->dev, "Client deregistration failed, "
-                        "client not detached.\n");
+        hwmon_device_unregister(data->class_dev);
+
+        if ((err = i2c_detach_client(client)))
                 return err;
-        }
 
-        kfree(i2c_get_clientdata(client));
+        kfree(data);
         return 0;
 }
 
diff --git a/drivers/i2c/Makefile b/drivers/i2c/Makefile
index cd170395a8c..71c5a854ac5 100644
--- a/drivers/i2c/Makefile
+++ b/drivers/i2c/Makefile
@@ -4,12 +4,8 @@
 
 obj-$(CONFIG_I2C)               += i2c-core.o
 obj-$(CONFIG_I2C_CHARDEV)       += i2c-dev.o
-obj-$(CONFIG_I2C_SENSOR)        += i2c-sensor.o
 obj-y                           += busses/ chips/ algos/
 
-i2c-sensor-objs := i2c-sensor-detect.o i2c-sensor-vid.o
-
-
 ifeq ($(CONFIG_I2C_DEBUG_CORE),y)
 EXTRA_CFLAGS += -DDEBUG
 endif
diff --git a/drivers/i2c/algos/i2c-algo-bit.c b/drivers/i2c/algos/i2c-algo-bit.c
index fb5b732238e..df05df1a0ef 100644
--- a/drivers/i2c/algos/i2c-algo-bit.c
+++ b/drivers/i2c/algos/i2c-algo-bit.c
@@ -519,8 +519,6 @@ static u32 bit_func(struct i2c_adapter *adap)
 /* -----exported algorithm data: -------------------------------------  */
 
 static struct i2c_algorithm i2c_bit_algo = {
-        .name           = "Bit-shift algorithm",
-        .id             = I2C_ALGO_BIT,
         .master_xfer    = bit_xfer,
         .functionality  = bit_func,
 };
@@ -541,8 +539,6 @@ int i2c_bit_add_bus(struct i2c_adapter *adap)
         DEB2(dev_dbg(&adap->dev, "hw routines registered.\n"));
 
         /* register new adapter to i2c module... */
-
-        adap->id |= i2c_bit_algo.id;
         adap->algo = &i2c_bit_algo;
 
         adap->timeout = 100;    /* default values, should       */
diff --git a/drivers/i2c/algos/i2c-algo-ite.c b/drivers/i2c/algos/i2c-algo-ite.c
index e6cae39f47a..2db7bfc8522 100644
--- a/drivers/i2c/algos/i2c-algo-ite.c
+++ b/drivers/i2c/algos/i2c-algo-ite.c
@@ -713,8 +713,6 @@ static u32 iic_func(struct i2c_adapter *adap)
 /* -----exported algorithm data: -------------------------------------  */
 
 static struct i2c_algorithm iic_algo = {
-        .name           = "ITE IIC algorithm",
-        .id             = I2C_ALGO_IIC,
         .master_xfer    = iic_xfer,
         .algo_control   = algo_control, /* ioctl */
         .functionality  = iic_func,
@@ -738,8 +736,6 @@ int i2c_iic_add_bus(struct i2c_adapter *adap)
                     adap->name));
 
         /* register new adapter to i2c module... */
-
-        adap->id |= iic_algo.id;
         adap->algo = &iic_algo;
 
         adap->timeout = 100;    /* default values, should       */
diff --git a/drivers/i2c/algos/i2c-algo-pca.c b/drivers/i2c/algos/i2c-algo-pca.c
index cc3a952401f..beb10edfe9c 100644
--- a/drivers/i2c/algos/i2c-algo-pca.c
+++ b/drivers/i2c/algos/i2c-algo-pca.c
@@ -187,12 +187,14 @@ static int pca_xfer(struct i2c_adapter *i2c_adap,
         int numbytes = 0;
         int state;
         int ret;
+        int timeout = 100;
 
-        state = pca_status(adap);
-        if ( state != 0xF8 ) {
-                dev_dbg(&i2c_adap->dev, "bus is not idle. status is %#04x\n", state );
-                /* FIXME: what to do. Force stop ? */
-                return -EREMOTEIO;
+        while ((state = pca_status(adap)) != 0xf8 && timeout--) {
+                msleep(10);
+        }
+        if (state != 0xf8) {
+                dev_dbg(&i2c_adap->dev, "bus is not idle. status is %#04x\n", state);
+                return -EIO;
         }
 
         DEB1("{{{ XFER %d messages\n", num);
@@ -354,8 +356,6 @@ static int pca_init(struct i2c_algo_pca_data *adap)
 }
 
 static struct i2c_algorithm pca_algo = {
-        .name           = "PCA9564 algorithm",
-        .id             = I2C_ALGO_PCA,
         .master_xfer    = pca_xfer,
         .functionality  = pca_func,
 };
@@ -369,8 +369,6 @@ int i2c_pca_add_bus(struct i2c_adapter *adap)
         int rval;
 
         /* register new adapter to i2c module... */
-
-        adap->id |= pca_algo.id;
         adap->algo = &pca_algo;
 
         adap->timeout = 100;            /* default values, should       */
diff --git a/drivers/i2c/algos/i2c-algo-pcf.c b/drivers/i2c/algos/i2c-algo-pcf.c
index 8d087dac32a..6e498df1f71 100644
--- a/drivers/i2c/algos/i2c-algo-pcf.c
+++ b/drivers/i2c/algos/i2c-algo-pcf.c
@@ -459,8 +459,6 @@ static u32 pcf_func(struct i2c_adapter *adap)
 /* -----exported algorithm data: -------------------------------------  */
 
 static struct i2c_algorithm pcf_algo = {
-        .name           = "PCF8584 algorithm",
-        .id             = I2C_ALGO_PCF,
         .master_xfer    = pcf_xfer,
         .functionality  = pcf_func,
 };
@@ -476,8 +474,6 @@ int i2c_pcf_add_bus(struct i2c_adapter *adap)
         DEB2(dev_dbg(&adap->dev, "hw routines registered.\n"));
 
         /* register new adapter to i2c module... */
-
-        adap->id |= pcf_algo.id;
         adap->algo = &pcf_algo;
 
         adap->timeout = 100;            /* default values, should       */
diff --git a/drivers/i2c/algos/i2c-algo-sgi.c b/drivers/i2c/algos/i2c-algo-sgi.c
index 422721b241e..932c4fa86c7 100644
--- a/drivers/i2c/algos/i2c-algo-sgi.c
+++ b/drivers/i2c/algos/i2c-algo-sgi.c
@@ -149,7 +149,7 @@ static int sgi_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg *msgs,
                         err = i2c_write(adap, p->buf, p->len);
         }
 
-        return err;
+        return (err < 0) ? err : i;
 }
 
 static u32 sgi_func(struct i2c_adapter *adap)
@@ -158,8 +158,6 @@ static u32 sgi_func(struct i2c_adapter *adap)
 }
 
 static struct i2c_algorithm sgi_algo = {
-        .name           = "SGI algorithm",
-        .id             = I2C_ALGO_SGI,
         .master_xfer    = sgi_xfer,
         .functionality  = sgi_func,
 };
@@ -169,7 +167,6 @@ static struct i2c_algorithm sgi_algo = {
  */
 int i2c_sgi_add_bus(struct i2c_adapter *adap)
 {
-        adap->id |= sgi_algo.id;
         adap->algo = &sgi_algo;
 
         return i2c_add_adapter(adap);
diff --git a/drivers/i2c/algos/i2c-algo-sibyte.c b/drivers/i2c/algos/i2c-algo-sibyte.c
index f2785499237..8ed5ad12552 100644
--- a/drivers/i2c/algos/i2c-algo-sibyte.c
+++ b/drivers/i2c/algos/i2c-algo-sibyte.c
@@ -135,8 +135,6 @@ static u32 bit_func(struct i2c_adapter *adap)
 /* -----exported algorithm data: -------------------------------------  */
 
 static struct i2c_algorithm i2c_sibyte_algo = {
-        .name           = "SiByte algorithm",
-        .id             = I2C_ALGO_SIBYTE,
         .smbus_xfer     = smbus_xfer,
         .algo_control   = algo_control, /* ioctl */
         .functionality  = bit_func,
@@ -151,8 +149,6 @@ int i2c_sibyte_add_bus(struct i2c_adapter *i2c_adap, int speed)
         struct i2c_algo_sibyte_data *adap = i2c_adap->algo_data;
 
         /* register new adapter to i2c module... */
-
-        i2c_adap->id |= i2c_sibyte_algo.id;
         i2c_adap->algo = &i2c_sibyte_algo;
         
         /* Set the frequency to 100 kHz */
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index 916ba5e40a9..6e9da137222 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -182,14 +182,8 @@ config I2C_IOP3XX
           will be called i2c-iop3xx.
 
 config I2C_ISA
-        tristate "ISA Bus support"
+        tristate
         depends on I2C
-        help
-          If you say yes to this option, support will be included for i2c
-          interfaces that are on the ISA bus.
-
-          This driver can also be built as a module.  If so, the module
-          will be called i2c-isa.
 
 config I2C_ITE
         tristate "ITE I2C Adapter"
diff --git a/drivers/i2c/busses/i2c-ali1535.c b/drivers/i2c/busses/i2c-ali1535.c
index f634a0780cf..f021acd2674 100644
--- a/drivers/i2c/busses/i2c-ali1535.c
+++ b/drivers/i2c/busses/i2c-ali1535.c
@@ -472,8 +472,6 @@ static u32 ali1535_func(struct i2c_adapter *adapter)
 }
 
 static struct i2c_algorithm smbus_algorithm = {
-        .name           = "Non-i2c SMBus adapter",
-        .id             = I2C_ALGO_SMBUS,
         .smbus_xfer     = ali1535_access,
         .functionality  = ali1535_func,
 };
diff --git a/drivers/i2c/busses/i2c-ali1563.c b/drivers/i2c/busses/i2c-ali1563.c
index fdd881aee61..86947504aea 100644
--- a/drivers/i2c/busses/i2c-ali1563.c
+++ b/drivers/i2c/busses/i2c-ali1563.c
@@ -366,8 +366,6 @@ static void ali1563_shutdown(struct pci_dev *dev)
 }
 
 static struct i2c_algorithm ali1563_algorithm = {
-        .name           = "Non-i2c SMBus adapter",
-        .id             = I2C_ALGO_SMBUS,
         .smbus_xfer     = ali1563_access,
         .functionality  = ali1563_func,
 };
diff --git a/drivers/i2c/busses/i2c-ali15x3.c b/drivers/i2c/busses/i2c-ali15x3.c
index 0f781a1a332..b3f50bff39a 100644
--- a/drivers/i2c/busses/i2c-ali15x3.c
+++ b/drivers/i2c/busses/i2c-ali15x3.c
@@ -462,8 +462,6 @@ static u32 ali15x3_func(struct i2c_adapter *adapter)
 }
 
 static struct i2c_algorithm smbus_algorithm = {
-        .name           = "Non-I2C SMBus adapter",
-        .id             = I2C_ALGO_SMBUS,
         .smbus_xfer     = ali15x3_access,
         .functionality  = ali15x3_func,
 };
diff --git a/drivers/i2c/busses/i2c-amd756.c b/drivers/i2c/busses/i2c-amd756.c
index 6347ebc6fb5..6ad0603384b 100644
--- a/drivers/i2c/busses/i2c-amd756.c
+++ b/drivers/i2c/busses/i2c-amd756.c
@@ -295,8 +295,6 @@ static u32 amd756_func(struct i2c_adapter *adapter)
 }
 
 static struct i2c_algorithm smbus_algorithm = {
-        .name           = "Non-I2C SMBus adapter",
-        .id             = I2C_ALGO_SMBUS,
         .smbus_xfer     = amd756_access,
         .functionality  = amd756_func,
 };
diff --git a/drivers/i2c/busses/i2c-amd8111.c b/drivers/i2c/busses/i2c-amd8111.c
index d6644481d2a..45ea24ba14d 100644
--- a/drivers/i2c/busses/i2c-amd8111.c
+++ b/drivers/i2c/busses/i2c-amd8111.c
@@ -323,8 +323,6 @@ static u32 amd8111_func(struct i2c_adapter *adapter)
 }
 
 static struct i2c_algorithm smbus_algorithm = {
-        .name = "Non-I2C SMBus 2.0 adapter",
-        .id = I2C_ALGO_SMBUS,
         .smbus_xfer = amd8111_access,
         .functionality = amd8111_func,
 };
diff --git a/drivers/i2c/busses/i2c-au1550.c b/drivers/i2c/busses/i2c-au1550.c
index a7ff112e49b..d06edce03bf 100644
--- a/drivers/i2c/busses/i2c-au1550.c
+++ b/drivers/i2c/busses/i2c-au1550.c
@@ -283,8 +283,6 @@ au1550_func(struct i2c_adapter *adap)
 }
 
 static struct i2c_algorithm au1550_algo = {
-        .name           = "Au1550 algorithm",
-        .id             = I2C_ALGO_AU1550,
         .master_xfer    = au1550_xfer,
         .functionality  = au1550_func,
 };
diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c
index 1ab41313ce5..709beab7660 100644
--- a/drivers/i2c/busses/i2c-i801.c
+++ b/drivers/i2c/busses/i2c-i801.c
@@ -535,8 +535,6 @@ static u32 i801_func(struct i2c_adapter *adapter)
 }
 
 static struct i2c_algorithm smbus_algorithm = {
-        .name           = "Non-I2C SMBus adapter",
-        .id             = I2C_ALGO_SMBUS,
         .smbus_xfer     = i801_access,
         .functionality  = i801_func,
 };
diff --git a/drivers/i2c/busses/i2c-ibm_iic.c b/drivers/i2c/busses/i2c-ibm_iic.c
index 93ca36dc777..a3ed9590f02 100644
--- a/drivers/i2c/busses/i2c-ibm_iic.c
+++ b/drivers/i2c/busses/i2c-ibm_iic.c
@@ -627,8 +627,6 @@ static u32 iic_func(struct i2c_adapter *adap)
 }
 
 static struct i2c_algorithm iic_algo = {
-        .name           = "IBM IIC algorithm",
-        .id             = I2C_ALGO_OCP,
         .master_xfer    = iic_xfer,
         .functionality  = iic_func
 };
@@ -727,7 +725,7 @@ static int __devinit iic_probe(struct ocp_device *ocp){
         adap = &dev->adap;
         strcpy(adap->name, "IBM IIC");
         i2c_set_adapdata(adap, dev);
-        adap->id = I2C_HW_OCP | iic_algo.id;
+        adap->id = I2C_HW_OCP;
         adap->algo = &iic_algo;
         adap->client_register = NULL;
         adap->client_unregister = NULL;
diff --git a/drivers/i2c/busses/i2c-iop3xx.c b/drivers/i2c/busses/i2c-iop3xx.c
index 6b682e903f0..7bd9102db70 100644
--- a/drivers/i2c/busses/i2c-iop3xx.c
+++ b/drivers/i2c/busses/i2c-iop3xx.c
@@ -399,8 +399,6 @@ iop3xx_i2c_func(struct i2c_adapter *adap)
 }
 
 static struct i2c_algorithm iop3xx_i2c_algo = {
-        .name           = "IOP3xx I2C algorithm",
-        .id             = I2C_ALGO_IOP3XX,
         .master_xfer    = iop3xx_i2c_master_xfer,
         .algo_control   = iop3xx_i2c_algo_control,
         .functionality  = iop3xx_i2c_func,
diff --git a/drivers/i2c/busses/i2c-isa.c b/drivers/i2c/busses/i2c-isa.c
index 00e7f7157b7..bdc6806dafa 100644
--- a/drivers/i2c/busses/i2c-isa.c
+++ b/drivers/i2c/busses/i2c-isa.c
@@ -1,6 +1,8 @@
 /*
-    i2c-isa.c - Part of lm_sensors, Linux kernel modules for hardware
-            monitoring
+    i2c-isa.c - an i2c-core-like thing for ISA hardware monitoring chips
+    Copyright (C) 2005  Jean Delvare <khali@linux-fr.org>
+
+    Based on the i2c-isa pseudo-adapter from the lm_sensors project
     Copyright (c) 1998, 1999  Frodo Looijaard <frodol@dds.nl> 
 
     This program is free software; you can redistribute it and/or modify
@@ -18,30 +20,36 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-/* This implements an i2c algorithm/adapter for ISA bus. Not that this is
-   on first sight very useful; almost no functionality is preserved.
-   Except that it makes writing drivers for chips which can be on both
-   the SMBus and the ISA bus very much easier. See lm78.c for an example
-   of this. */
+/* This implements an i2c-core-like thing for ISA hardware monitoring
+   chips. Such chips are linked to the i2c subsystem for historical
+   reasons (because the early ISA hardware monitoring chips such as the
+   LM78 had both an I2C and an ISA interface). They used to be
+   registered with the main i2c-core, but as a first step in the
+   direction of a clean separation between I2C and ISA chip drivers,
+   we now have this separate core for ISA ones. It is significantly
+   more simple than the real one, of course, because we don't have to
+   handle multiple busses: there is only one (fake) ISA adapter.
+   It is worth noting that we still rely on i2c-core for some things
+   at the moment - but hopefully this won't last. */
 
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/i2c.h>
+#include <linux/i2c-isa.h>
 
 static u32 isa_func(struct i2c_adapter *adapter);
 
 /* This is the actual algorithm we define */
 static struct i2c_algorithm isa_algorithm = {
-        .name           = "ISA bus algorithm",
-        .id             = I2C_ALGO_ISA,
         .functionality  = isa_func,
 };
 
 /* There can only be one... */
 static struct i2c_adapter isa_adapter = {
         .owner          = THIS_MODULE,
+        .id             = I2C_HW_ISA,
         .class          = I2C_CLASS_HWMON,
         .algo           = &isa_algorithm,
         .name           = "ISA main adapter",
@@ -53,17 +61,146 @@ static u32 isa_func(struct i2c_adapter *adapter)
         return 0;
 }
 
+
+/* Copied from i2c-core */
+static ssize_t show_adapter_name(struct device *dev,
+                struct device_attribute *attr, char *buf)
+{
+        struct i2c_adapter *adap = dev_to_i2c_adapter(dev);
+        return sprintf(buf, "%s\n", adap->name);
+}
+static DEVICE_ATTR(name, S_IRUGO, show_adapter_name, NULL);
+
+static int i2c_isa_device_probe(struct device *dev)
+{
+        return -ENODEV;
+}
+
+static int i2c_isa_device_remove(struct device *dev)
+{
+        return 0;
+}
+
+
+/* We implement an interface which resembles i2c_{add,del}_driver,
+   but for i2c-isa drivers. We don't have to remember and handle lists
+   of drivers and adapters so this is much more simple, of course. */
+
+int i2c_isa_add_driver(struct i2c_driver *driver)
+{
+        int res;
+
+        /* Add the driver to the list of i2c drivers in the driver core */
+        driver->driver.name = driver->name;
+        driver->driver.bus = &i2c_bus_type;
+        driver->driver.probe = i2c_isa_device_probe;
+        driver->driver.remove = i2c_isa_device_remove;
+        res = driver_register(&driver->driver);
+        if (res)
+                return res;
+        dev_dbg(&isa_adapter.dev, "Driver %s registered\n", driver->name);
+
+        /* Now look for clients */
+        driver->attach_adapter(&isa_adapter);
+
+        return 0;
+}
+
+int i2c_isa_del_driver(struct i2c_driver *driver)
+{
+        struct list_head *item, *_n;
+        struct i2c_client *client;
+        int res;
+
+        /* Detach all clients belonging to this one driver */
+        list_for_each_safe(item, _n, &isa_adapter.clients) {
+                client = list_entry(item, struct i2c_client, list);
+                if (client->driver != driver)
+                        continue;
+                dev_dbg(&isa_adapter.dev, "Detaching client %s at 0x%x\n",
+                        client->name, client->addr);
+                if ((res = driver->detach_client(client))) {
+                        dev_err(&isa_adapter.dev, "Failed, driver "
+                                "%s not unregistered!\n",
+                                driver->name);
+                        return res;
+                }
+        }
+
+        /* Get the driver off the core list */
+        driver_unregister(&driver->driver);
+        dev_dbg(&isa_adapter.dev, "Driver %s unregistered\n", driver->name);
+
+        return 0;
+}
+
+
 static int __init i2c_isa_init(void)
 {
-        return i2c_add_adapter(&isa_adapter);
+        init_MUTEX(&isa_adapter.clist_lock);
+        INIT_LIST_HEAD(&isa_adapter.clients);
+
+        isa_adapter.nr = ANY_I2C_ISA_BUS;
+        isa_adapter.dev.parent = &platform_bus;
+        sprintf(isa_adapter.dev.bus_id, "i2c-%d", isa_adapter.nr);
+        isa_adapter.dev.driver = &i2c_adapter_driver;
+        isa_adapter.dev.release = &i2c_adapter_dev_release;
+        device_register(&isa_adapter.dev);
+        device_create_file(&isa_adapter.dev, &dev_attr_name);
+
+        /* Add this adapter to the i2c_adapter class */
+        memset(&isa_adapter.class_dev, 0x00, sizeof(struct class_device));
+        isa_adapter.class_dev.dev = &isa_adapter.dev;
+        isa_adapter.class_dev.class = &i2c_adapter_class;
+        strlcpy(isa_adapter.class_dev.class_id, isa_adapter.dev.bus_id,
+                BUS_ID_SIZE);
+        class_device_register(&isa_adapter.class_dev);
+
+        dev_dbg(&isa_adapter.dev, "%s registered\n", isa_adapter.name);
+
+        return 0;
 }
 
 static void __exit i2c_isa_exit(void)
 {
-        i2c_del_adapter(&isa_adapter);
+#ifdef DEBUG
+        struct list_head  *item, *_n;
+        struct i2c_client *client = NULL;
+#endif
+
+        /* There should be no more active client */
+#ifdef DEBUG
+        dev_dbg(&isa_adapter.dev, "Looking for clients\n");
+        list_for_each_safe(item, _n, &isa_adapter.clients) {
+                client = list_entry(item, struct i2c_client, list);
+                dev_err(&isa_adapter.dev, "Driver %s still has an active "
+                        "ISA client at 0x%x\n", client->driver->name,
+                        client->addr);
+        }
+        if (client != NULL)
+                return;
+#endif
+
+        /* Clean up the sysfs representation */
+        dev_dbg(&isa_adapter.dev, "Unregistering from sysfs\n");
+        init_completion(&isa_adapter.dev_released);
+        init_completion(&isa_adapter.class_dev_released);
+        class_device_unregister(&isa_adapter.class_dev);
+        device_remove_file(&isa_adapter.dev, &dev_attr_name);
+        device_unregister(&isa_adapter.dev);
+
+        /* Wait for sysfs to drop all references */
+        dev_dbg(&isa_adapter.dev, "Waiting for sysfs completion\n");
+        wait_for_completion(&isa_adapter.dev_released);
+        wait_for_completion(&isa_adapter.class_dev_released);
+
+        dev_dbg(&isa_adapter.dev, "%s unregistered\n", isa_adapter.name);
 }
 
-MODULE_AUTHOR("Frodo Looijaard <frodol@dds.nl>");
+EXPORT_SYMBOL(i2c_isa_add_driver);
+EXPORT_SYMBOL(i2c_isa_del_driver);
+
+MODULE_AUTHOR("Jean Delvare <khali@linux-fr.org>");
 MODULE_DESCRIPTION("ISA bus access through i2c");
 MODULE_LICENSE("GPL");
 
diff --git a/drivers/i2c/busses/i2c-keywest.c b/drivers/i2c/busses/i2c-keywest.c
index 94ae808314f..37b49c2daf5 100644
--- a/drivers/i2c/busses/i2c-keywest.c
+++ b/drivers/i2c/busses/i2c-keywest.c
@@ -87,12 +87,9 @@ static const char *__kw_state_names[] = {
 };
 #endif /* DEBUG */
 
-static int probe;
-
 MODULE_AUTHOR("Benjamin Herrenschmidt <benh@kernel.crashing.org>");
 MODULE_DESCRIPTION("I2C driver for Apple's Keywest");
 MODULE_LICENSE("GPL");
-module_param(probe, bool, 0);
 
 #ifdef POLLED_MODE
 /* Don't schedule, the g5 fan controller is too
@@ -498,8 +495,6 @@ keywest_func(struct i2c_adapter * adapter)
 
 /* For now, we only handle combined mode (smbus) */
 static struct i2c_algorithm keywest_algorithm = {
-        .name           = "Keywest i2c",
-        .id             = I2C_ALGO_SMBUS,
         .smbus_xfer     = keywest_smbus_xfer,
         .master_xfer    = keywest_xfer,
         .functionality  = keywest_func,
@@ -621,7 +616,6 @@ create_iface(struct device_node *np, struct device *dev)
                 sprintf(chan->adapter.name, "%s %d", np->parent->name, i);
                 chan->iface = iface;
                 chan->chan_no = i;
-                chan->adapter.id = I2C_ALGO_SMBUS;
                 chan->adapter.algo = &keywest_algorithm;
                 chan->adapter.algo_data = NULL;
                 chan->adapter.client_register = NULL;
@@ -635,15 +629,6 @@ create_iface(struct device_node *np, struct device *dev)
                                 chan->adapter.name);
                         i2c_set_adapdata(&chan->adapter, NULL);
                 }
-                if (probe) {
-                        printk("Probe: ");
-                        for (addr = 0x00; addr <= 0x7f; addr++) {
-                                if (i2c_smbus_xfer(&chan->adapter,addr,
-                                    0,0,0,I2C_SMBUS_QUICK,NULL) >= 0)
-                                        printk("%02x ", addr);
-                        }
-                        printk("\n");
-                }
         }
 
         printk(KERN_INFO "Found KeyWest i2c on \"%s\", %d channel%s, stepping: %d bits\n",
diff --git a/drivers/i2c/busses/i2c-mpc.c b/drivers/i2c/busses/i2c-mpc.c
index 9ad3e9262e8..f065583ddcf 100644
--- a/drivers/i2c/busses/i2c-mpc.c
+++ b/drivers/i2c/busses/i2c-mpc.c
@@ -272,8 +272,6 @@ static u32 mpc_functionality(struct i2c_adapter *adap)
 }
 
 static struct i2c_algorithm mpc_algo = {
-        .name = "MPC algorithm",
-        .id = I2C_ALGO_MPC107,
         .master_xfer = mpc_xfer,
         .functionality = mpc_functionality,
 };
@@ -281,7 +279,7 @@ static struct i2c_algorithm mpc_algo = {
 static struct i2c_adapter mpc_ops = {
         .owner = THIS_MODULE,
         .name = "MPC adapter",
-        .id = I2C_ALGO_MPC107 | I2C_HW_MPC107,
+        .id = I2C_HW_MPC107,
         .algo = &mpc_algo,
         .class = I2C_CLASS_HWMON,
         .timeout = 1,
diff --git a/drivers/i2c/busses/i2c-mv64xxx.c b/drivers/i2c/busses/i2c-mv64xxx.c
index 5b852782d2f..99abca45fec 100644
--- a/drivers/i2c/busses/i2c-mv64xxx.c
+++ b/drivers/i2c/busses/i2c-mv64xxx.c
@@ -423,18 +423,16 @@ static int
 mv64xxx_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num)
 {
         struct mv64xxx_i2c_data *drv_data = i2c_get_adapdata(adap);
-        int     i, rc = 0;
+        int     i, rc;
 
         for (i=0; i<num; i++)
-                if ((rc = mv64xxx_i2c_execute_msg(drv_data, &msgs[i])) != 0)
-                        break;
+                if ((rc = mv64xxx_i2c_execute_msg(drv_data, &msgs[i])) < 0)
+                        return rc;
 
-        return rc;
+        return num;
 }
 
 static struct i2c_algorithm mv64xxx_i2c_algo = {
-        .name = MV64XXX_I2C_CTLR_NAME " algorithm",
-        .id = I2C_ALGO_MV64XXX,
         .master_xfer = mv64xxx_i2c_xfer,
         .functionality = mv64xxx_i2c_functionality,
 };
@@ -523,7 +521,7 @@ mv64xxx_i2c_probe(struct device *dev)
         drv_data->freq_m = pdata->freq_m;
         drv_data->freq_n = pdata->freq_n;
         drv_data->irq = platform_get_irq(pd, 0);
-        drv_data->adapter.id = I2C_ALGO_MV64XXX | I2C_HW_MV64XXX;
+        drv_data->adapter.id = I2C_HW_MV64XXX;
         drv_data->adapter.algo = &mv64xxx_i2c_algo;
         drv_data->adapter.owner = THIS_MODULE;
         drv_data->adapter.class = I2C_CLASS_HWMON;
diff --git a/drivers/i2c/busses/i2c-nforce2.c b/drivers/i2c/busses/i2c-nforce2.c
index 74eb89aa935..e0b7a913431 100644
--- a/drivers/i2c/busses/i2c-nforce2.c
+++ b/drivers/i2c/busses/i2c-nforce2.c
@@ -110,8 +110,6 @@ static u32 nforce2_func(struct i2c_adapter *adapter);
 
 
 static struct i2c_algorithm smbus_algorithm = {
-        .name = "Non-I2C SMBus adapter",
-        .id = I2C_ALGO_SMBUS,
         .smbus_xfer = nforce2_access,
         .functionality = nforce2_func,
 };
@@ -131,7 +129,6 @@ static s32 nforce2_access(struct i2c_adapter * adap, u16 addr,
         struct nforce2_smbus *smbus = adap->algo_data;
         unsigned char protocol, pec, temp;
         unsigned char len = 0; /* to keep the compiler quiet */
-        int timeout = 0;
         int i;
 
         protocol = (read_write == I2C_SMBUS_READ) ? NVIDIA_SMB_PRTCL_READ :
@@ -191,29 +188,10 @@ static s32 nforce2_access(struct i2c_adapter * adap, u16 addr,
                 case I2C_SMBUS_PROC_CALL:
                         dev_err(&adap->dev, "I2C_SMBUS_PROC_CALL not supported!\n");
                         return -1;
-                        /*
-                        outb_p(command, NVIDIA_SMB_CMD);
-                        outb_p(data->word, NVIDIA_SMB_DATA);
-                        outb_p(data->word >> 8, NVIDIA_SMB_DATA + 1);
-                        protocol = NVIDIA_SMB_PRTCL_PROC_CALL | pec;
-                        read_write = I2C_SMBUS_READ;
-                        break;
-                         */
 
                 case I2C_SMBUS_BLOCK_PROC_CALL:
                         dev_err(&adap->dev, "I2C_SMBUS_BLOCK_PROC_CALL not supported!\n");
                         return -1;
-                        /*
-                        protocol |= pec;
-                        len = min_t(u8, data->block[0], 31);
-                        outb_p(command, NVIDIA_SMB_CMD);
-                        outb_p(len, NVIDIA_SMB_BCNT);
-                        for (i = 0; i < len; i++)
-                                outb_p(data->block[i + 1], NVIDIA_SMB_DATA + i);
-                        protocol = NVIDIA_SMB_PRTCL_BLOCK_PROC_CALL | pec;
-                        read_write = I2C_SMBUS_READ;
-                        break;
-                        */
 
                 case I2C_SMBUS_WORD_DATA_PEC:
                 case I2C_SMBUS_BLOCK_DATA_PEC:
@@ -232,12 +210,6 @@ static s32 nforce2_access(struct i2c_adapter * adap, u16 addr,
 
         temp = inb_p(NVIDIA_SMB_STS);
 
-#if 0
-        do {
-                i2c_do_pause(1);
-                temp = inb_p(NVIDIA_SMB_STS);
-        } while (((temp & NVIDIA_SMB_STS_DONE) == 0) && (timeout++ < MAX_TIMEOUT));
-#endif
         if (~temp & NVIDIA_SMB_STS_DONE) {
                 udelay(500);
                 temp = inb_p(NVIDIA_SMB_STS);
@@ -247,9 +219,10 @@ static s32 nforce2_access(struct i2c_adapter * adap, u16 addr,
                 temp = inb_p(NVIDIA_SMB_STS);
         }
 
-        if ((timeout >= MAX_TIMEOUT) || (~temp & NVIDIA_SMB_STS_DONE)
-                || (temp & NVIDIA_SMB_STS_STATUS))
+        if ((~temp & NVIDIA_SMB_STS_DONE) || (temp & NVIDIA_SMB_STS_STATUS)) {
+                dev_dbg(&adap->dev, "SMBus Timeout! (0x%02x)\n", temp);
                 return -1;
+        }
 
         if (read_write == I2C_SMBUS_WRITE)
                 return 0;
diff --git a/drivers/i2c/busses/i2c-piix4.c b/drivers/i2c/busses/i2c-piix4.c
index 6d34ee381ce..6d48a4da7be 100644
--- a/drivers/i2c/busses/i2c-piix4.c
+++ b/drivers/i2c/busses/i2c-piix4.c
@@ -399,8 +399,6 @@ static u32 piix4_func(struct i2c_adapter *adapter)
 }
 
 static struct i2c_algorithm smbus_algorithm = {
-        .name           = "Non-I2C SMBus adapter",
-        .id             = I2C_ALGO_SMBUS,
         .smbus_xfer     = piix4_access,
         .functionality  = piix4_func,
 };
diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c
index a3b38257cc3..73a092fb0e7 100644
--- a/drivers/i2c/busses/i2c-s3c2410.c
+++ b/drivers/i2c/busses/i2c-s3c2410.c
@@ -568,7 +568,6 @@ static u32 s3c24xx_i2c_func(struct i2c_adapter *adap)
 /* i2c bus registration info */
 
 static struct i2c_algorithm s3c24xx_i2c_algorithm = {
-        .name                   = "S3C2410-I2C-Algorithm",
         .master_xfer            = s3c24xx_i2c_xfer,
         .functionality          = s3c24xx_i2c_func,
 };
diff --git a/drivers/i2c/busses/i2c-sis5595.c b/drivers/i2c/busses/i2c-sis5595.c
index bbd5e4e52f0..080318d6f54 100644
--- a/drivers/i2c/busses/i2c-sis5595.c
+++ b/drivers/i2c/busses/i2c-sis5595.c
@@ -357,8 +357,6 @@ static u32 sis5595_func(struct i2c_adapter *adapter)
 }
 
 static struct i2c_algorithm smbus_algorithm = {
-        .name           = "Non-I2C SMBus adapter",
-        .id             = I2C_ALGO_SMBUS,
         .smbus_xfer     = sis5595_access,
         .functionality  = sis5595_func,
 };
diff --git a/drivers/i2c/busses/i2c-sis630.c b/drivers/i2c/busses/i2c-sis630.c
index f58455e7689..86f0f448fa0 100644
--- a/drivers/i2c/busses/i2c-sis630.c
+++ b/drivers/i2c/busses/i2c-sis630.c
@@ -448,8 +448,6 @@ exit:
 
 
 static struct i2c_algorithm smbus_algorithm = {
-        .name           = "Non-I2C SMBus adapter",
-        .id             = I2C_ALGO_SMBUS,
         .smbus_xfer     = sis630_access,
         .functionality  = sis630_func,
 };
diff --git a/drivers/i2c/busses/i2c-sis96x.c b/drivers/i2c/busses/i2c-sis96x.c
index 6484792e23a..ead2ff3cf60 100644
--- a/drivers/i2c/busses/i2c-sis96x.c
+++ b/drivers/i2c/busses/i2c-sis96x.c
@@ -249,8 +249,6 @@ static u32 sis96x_func(struct i2c_adapter *adapter)
 }
 
 static struct i2c_algorithm smbus_algorithm = {
-        .name           = "Non-I2C SMBus adapter",
-        .id             = I2C_ALGO_SMBUS,
         .smbus_xfer     = sis96x_access,
         .functionality  = sis96x_func,
 };
diff --git a/drivers/i2c/busses/i2c-stub.c b/drivers/i2c/busses/i2c-stub.c
index 00d94e88695..73f481e93a3 100644
--- a/drivers/i2c/busses/i2c-stub.c
+++ b/drivers/i2c/busses/i2c-stub.c
@@ -109,8 +109,6 @@ static u32 stub_func(struct i2c_adapter *adapter)
 }
 
 static struct i2c_algorithm smbus_algorithm = {
-        .name           = "Non-I2C SMBus adapter",
-        .id             = I2C_ALGO_SMBUS,
         .functionality  = stub_func,
         .smbus_xfer     = stub_xfer,
 };
diff --git a/drivers/i2c/busses/i2c-viapro.c b/drivers/i2c/busses/i2c-viapro.c
index 6b5008005c6..99d209e0485 100644
--- a/drivers/i2c/busses/i2c-viapro.c
+++ b/drivers/i2c/busses/i2c-viapro.c
@@ -286,8 +286,6 @@ static u32 vt596_func(struct i2c_adapter *adapter)
 }
 
 static struct i2c_algorithm smbus_algorithm = {
-        .name           = "Non-I2C SMBus adapter",
-        .id             = I2C_ALGO_SMBUS,
         .smbus_xfer     = vt596_access,
         .functionality  = vt596_func,
 };
diff --git a/drivers/i2c/busses/scx200_acb.c b/drivers/i2c/busses/scx200_acb.c
index a18bdd9aa7b..a1d580e0536 100644
--- a/drivers/i2c/busses/scx200_acb.c
+++ b/drivers/i2c/busses/scx200_acb.c
@@ -395,8 +395,6 @@ static u32 scx200_acb_func(struct i2c_adapter *adapter)
 
 /* For now, we only handle combined mode (smbus) */
 static struct i2c_algorithm scx200_acb_algorithm = {
-        .name           = "NatSemi SCx200 ACCESS.bus",
-        .id             = I2C_ALGO_SMBUS,
         .smbus_xfer     = scx200_acb_smbus_xfer,
         .functionality  = scx200_acb_func,
 };
@@ -456,7 +454,7 @@ static int  __init scx200_acb_create(int base, int index)
         i2c_set_adapdata(adapter, iface);
         snprintf(adapter->name, I2C_NAME_SIZE, "SCx200 ACB%d", index);
         adapter->owner = THIS_MODULE;
-        adapter->id = I2C_ALGO_SMBUS;
+        adapter->id = I2C_HW_SMBUS_SCX200;
         adapter->algo = &scx200_acb_algorithm;
         adapter->class = I2C_CLASS_HWMON;
 
diff --git a/drivers/i2c/chips/Kconfig b/drivers/i2c/chips/Kconfig
index 43f70dbfc03..6bd44a44cd2 100644
--- a/drivers/i2c/chips/Kconfig
+++ b/drivers/i2c/chips/Kconfig
@@ -2,17 +2,12 @@
 # Miscellaneous I2C chip drivers configuration
 #
 
-config I2C_SENSOR
-        tristate
-        default n
-
 menu "Miscellaneous I2C Chip support"
         depends on I2C
 
 config SENSORS_DS1337
         tristate "Dallas Semiconductor DS1337 and DS1339 Real Time Clock"
         depends on I2C && EXPERIMENTAL
-        select I2C_SENSOR
         help
           If you say yes here you get support for Dallas Semiconductor
           DS1337 and DS1339 real-time clock chips.
@@ -23,7 +18,6 @@ config SENSORS_DS1337
 config SENSORS_DS1374
         tristate "Maxim/Dallas Semiconductor DS1374 Real Time Clock"
         depends on I2C && EXPERIMENTAL
-        select I2C_SENSOR
         help
           If you say yes here you get support for Dallas Semiconductor
           DS1374 real-time clock chips.
@@ -34,7 +28,6 @@ config SENSORS_DS1374
 config SENSORS_EEPROM
         tristate "EEPROM reader"
         depends on I2C && EXPERIMENTAL
-        select I2C_SENSOR
         help
           If you say yes here you get read-only access to the EEPROM data
           available on modern memory DIMMs and Sony Vaio laptops.  Such
@@ -46,7 +39,6 @@ config SENSORS_EEPROM
 config SENSORS_PCF8574
         tristate "Philips PCF8574 and PCF8574A"
         depends on I2C && EXPERIMENTAL
-        select I2C_SENSOR
         help
           If you say yes here you get support for Philips PCF8574 and 
           PCF8574A chips.
@@ -67,7 +59,6 @@ config SENSORS_PCA9539
 config SENSORS_PCF8591
         tristate "Philips PCF8591"
         depends on I2C && EXPERIMENTAL
-        select I2C_SENSOR
         help
           If you say yes here you get support for Philips PCF8591 chips.
 
@@ -77,7 +68,6 @@ config SENSORS_PCF8591
 config SENSORS_RTC8564
         tristate "Epson 8564 RTC chip"
         depends on I2C && EXPERIMENTAL
-        select I2C_SENSOR
         help
           If you say yes here you get support for the Epson 8564 RTC chip.
 
diff --git a/drivers/i2c/chips/ds1337.c b/drivers/i2c/chips/ds1337.c
index 82cf959989f..9d3175c0339 100644
--- a/drivers/i2c/chips/ds1337.c
+++ b/drivers/i2c/chips/ds1337.c
@@ -17,7 +17,6 @@
 #include <linux/init.h>
 #include <linux/slab.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
 #include <linux/string.h>
 #include <linux/rtc.h>          /* get the user-level API */
 #include <linux/bcd.h>
@@ -39,9 +38,8 @@
  * Functions declaration
  */
 static unsigned short normal_i2c[] = { 0x68, I2C_CLIENT_END };
-static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
 
-SENSORS_INSMOD_1(ds1337);
+I2C_CLIENT_INSMOD_1(ds1337);
 
 static int ds1337_attach_adapter(struct i2c_adapter *adapter);
 static int ds1337_detect(struct i2c_adapter *adapter, int address, int kind);
@@ -227,7 +225,7 @@ int ds1337_do_command(int bus, int cmd, void *arg)
 
 static int ds1337_attach_adapter(struct i2c_adapter *adapter)
 {
-        return i2c_detect(adapter, &addr_data, ds1337_detect);
+        return i2c_probe(adapter, &addr_data, ds1337_detect);
 }
 
 /*
@@ -354,11 +352,8 @@ static int ds1337_detach_client(struct i2c_client *client)
         int err;
         struct ds1337_data *data = i2c_get_clientdata(client);
 
-        if ((err = i2c_detach_client(client))) {
-                dev_err(&client->dev, "Client deregistration failed, "
-                        "client not detached.\n");
+        if ((err = i2c_detach_client(client)))
                 return err;
-        }
 
         list_del(&data->list);
         kfree(data);
diff --git a/drivers/i2c/chips/ds1374.c b/drivers/i2c/chips/ds1374.c
index a445736d883..0936327a946 100644
--- a/drivers/i2c/chips/ds1374.c
+++ b/drivers/i2c/chips/ds1374.c
@@ -53,7 +53,6 @@ static struct i2c_client_address_data addr_data = {
         .normal_i2c = normal_addr,
         .probe = ignore,
         .ignore = ignore,
-        .force = ignore,
 };
 
 static ulong ds1374_read_rtc(void)
@@ -166,7 +165,7 @@ static void ds1374_set_tlet(ulong arg)
                          "can't confirm time set from rtc chip\n");
 }
 
-ulong new_time;
+static ulong new_time;
 
 DECLARE_TASKLET_DISABLED(ds1374_tasklet, ds1374_set_tlet, (ulong) & new_time);
 
diff --git a/drivers/i2c/chips/eeprom.c b/drivers/i2c/chips/eeprom.c
index a2da31b0dd7..d58403a4790 100644
--- a/drivers/i2c/chips/eeprom.c
+++ b/drivers/i2c/chips/eeprom.c
@@ -33,15 +33,13 @@
 #include <linux/sched.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
 
 /* Addresses to scan */
 static unsigned short normal_i2c[] = { 0x50, 0x51, 0x52, 0x53, 0x54,
                                         0x55, 0x56, 0x57, I2C_CLIENT_END };
-static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
 
 /* Insmod parameters */
-SENSORS_INSMOD_1(eeprom);
+I2C_CLIENT_INSMOD_1(eeprom);
 
 
 /* Size of EEPROM in bytes */
@@ -153,21 +151,16 @@ static struct bin_attribute eeprom_attr = {
 
 static int eeprom_attach_adapter(struct i2c_adapter *adapter)
 {
-        return i2c_detect(adapter, &addr_data, eeprom_detect);
+        return i2c_probe(adapter, &addr_data, eeprom_detect);
 }
 
-/* This function is called by i2c_detect */
+/* This function is called by i2c_probe */
 int eeprom_detect(struct i2c_adapter *adapter, int address, int kind)
 {
         struct i2c_client *new_client;
         struct eeprom_data *data;
         int err = 0;
 
-        /* prevent 24RF08 corruption */
-        if (kind < 0)
-                i2c_smbus_xfer(adapter, address, 0, 0, 0,
-                               I2C_SMBUS_QUICK, NULL);
-
         /* There are three ways we can read the EEPROM data:
            (1) I2C block reads (faster, but unsupported by most adapters)
            (2) Consecutive byte reads (100% overhead)
@@ -231,10 +224,8 @@ static int eeprom_detach_client(struct i2c_client *client)
         int err;
 
         err = i2c_detach_client(client);
-        if (err) {
-                dev_err(&client->dev, "Client deregistration failed, client not detached.\n");
+        if (err)
                 return err;
-        }
 
         kfree(i2c_get_clientdata(client));
 
diff --git a/drivers/i2c/chips/isp1301_omap.c b/drivers/i2c/chips/isp1301_omap.c
index 354a2629567..8ee56d4b389 100644
--- a/drivers/i2c/chips/isp1301_omap.c
+++ b/drivers/i2c/chips/isp1301_omap.c
@@ -1489,7 +1489,7 @@ static int isp1301_probe(struct i2c_adapter *bus, int address, int kind)
         if (the_transceiver)
                 return 0;
 
-        isp = kcalloc(1, sizeof *isp, GFP_KERNEL);
+        isp = kzalloc(sizeof *isp, GFP_KERNEL);
         if (!isp)
                 return 0;
 
diff --git a/drivers/i2c/chips/m41t00.c b/drivers/i2c/chips/m41t00.c
index 778d7e12859..3f14528a52a 100644
--- a/drivers/i2c/chips/m41t00.c
+++ b/drivers/i2c/chips/m41t00.c
@@ -42,7 +42,6 @@ static struct i2c_client_address_data addr_data = {
         .normal_i2c             = normal_addr,
         .probe                  = ignore,
         .ignore                 = ignore,
-        .force                  = ignore,
 };
 
 ulong
@@ -145,7 +144,7 @@ m41t00_set_tlet(ulong arg)
         return;
 }
 
-ulong   new_time;
+static ulong    new_time;
 
 DECLARE_TASKLET_DISABLED(m41t00_tasklet, m41t00_set_tlet, (ulong)&new_time);
 
diff --git a/drivers/i2c/chips/max6875.c b/drivers/i2c/chips/max6875.c
index 0230375f72e..9e1aeb69abf 100644
--- a/drivers/i2c/chips/max6875.c
+++ b/drivers/i2c/chips/max6875.c
@@ -5,97 +5,60 @@
 
     Based on i2c/chips/eeprom.c
 
-    The MAX6875 has two EEPROM sections: config and user.
-    At reset, the config EEPROM is read into the registers.
+    The MAX6875 has a bank of registers and two banks of EEPROM.
+    Address ranges are defined as follows:
+     * 0x0000 - 0x0046 = configuration registers
+     * 0x8000 - 0x8046 = configuration EEPROM
+     * 0x8100 - 0x82FF = user EEPROM
 
-    This driver make 3 binary files available in sysfs:
-      reg_config    - direct access to the registers
-      eeprom_config - acesses configuration eeprom space
-      eeprom_user   - free for application use
+    This driver makes the user EEPROM available for read.
 
-    In our application, we put device serial & model numbers in user eeprom.
+    The registers & config EEPROM should be accessed via i2c-dev.
 
-    Notes:
-      1) The datasheet says that register 0x44 / EEPROM 0x8044 should NOT
-         be overwritten, so the driver explicitly prevents that.
-      2) It's a good idea to keep the config (0x45) locked in config EEPROM.
-         You can temporarily enable config writes by changing register 0x45.
+    The MAX6875 ignores the lowest address bit, so each chip responds to
+    two addresses - 0x50/0x51 and 0x52/0x53.
+
+    Note that the MAX6875 uses i2c_smbus_write_byte_data() to set the read
+    address, so this driver is destructive if loaded for the wrong EEPROM chip.
 
     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; version 2 of the License.
 */
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/slab.h>
-#include <linux/sched.h>
-#include <linux/delay.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
+#include <asm/semaphore.h>
 
-/* Addresses to scan */
-/* No address scanned by default, as this could corrupt standard EEPROMS. */
+/* Do not scan - the MAX6875 access method will write to some EEPROM chips */
 static unsigned short normal_i2c[] = {I2C_CLIENT_END};
-static unsigned int normal_isa[] = {I2C_CLIENT_ISA_END};
 
 /* Insmod parameters */
-SENSORS_INSMOD_1(max6875);
-
-/* this param will prevent 'accidental' writes to the eeprom */
-static int allow_write = 0;
-module_param(allow_write, int, 0);
-MODULE_PARM_DESC(allow_write,
-                 "Enable write access:\n"
-                 "*0: Read only\n"
-                 " 1: Read/Write access");
+I2C_CLIENT_INSMOD_1(max6875);
 
 /* The MAX6875 can only read/write 16 bytes at a time */
 #define SLICE_SIZE                      16
 #define SLICE_BITS                      4
 
-/* CONFIG EEPROM is at addresses 0x8000 - 0x8045, registers are at 0 - 0x45 */
-#define CONFIG_EEPROM_BASE              0x8000
-#define CONFIG_EEPROM_SIZE              0x0046
-#define CONFIG_EEPROM_SLICES            5
-
 /* USER EEPROM is at addresses 0x8100 - 0x82FF */
 #define USER_EEPROM_BASE                0x8100
 #define USER_EEPROM_SIZE                0x0200
 #define USER_EEPROM_SLICES              32
 
 /* MAX6875 commands */
-#define MAX6875_CMD_BLOCK_WRITE         0x83
-#define MAX6875_CMD_BLOCK_READ          0x84
-#define MAX6875_CMD_REBOOT              0x88
-
-enum max6875_area_type {
-        max6875_register_config=0,
-        max6875_eeprom_config,
-        max6875_eeprom_user,
-        max6857_max
-};
-
-struct eeprom_block {
-        enum max6875_area_type  type;
-        u8                      slices;
-        u32                     size;
-        u32                     valid;
-        u32                     base;
-        unsigned long           *updated;
-        u8                      *data;
-};
+#define MAX6875_CMD_BLK_READ            0x84
 
 /* Each client has this additional data */
 struct max6875_data {
         struct i2c_client       client;
         struct semaphore        update_lock;
-        struct eeprom_block     blocks[max6857_max];
-        /* the above structs point into the arrays below */
-        u8 data[USER_EEPROM_SIZE + (CONFIG_EEPROM_SIZE*2)];
-        unsigned long last_updated[USER_EEPROM_SLICES + (CONFIG_EEPROM_SLICES*2)];
+
+        u32                     valid;
+        u8                      data[USER_EEPROM_SIZE];
+        unsigned long           last_updated[USER_EEPROM_SLICES];
 };
 
 static int max6875_attach_adapter(struct i2c_adapter *adapter);
@@ -111,337 +74,160 @@ static struct i2c_driver max6875_driver = {
         .detach_client  = max6875_detach_client,
 };
 
-static int max6875_update_slice(struct i2c_client *client,
-                                struct eeprom_block *blk,
-                                int slice)
+static void max6875_update_slice(struct i2c_client *client, int slice)
 {
         struct max6875_data *data = i2c_get_clientdata(client);
-        int i, j, addr, count;
-        u8 rdbuf[SLICE_SIZE];
-        int retval = 0;
+        int i, j, addr;
+        u8 *buf;
 
-        if (slice >= blk->slices)
-                return -1;
+        if (slice >= USER_EEPROM_SLICES)
+                return;
 
         down(&data->update_lock);
 
-        if (!(blk->valid & (1 << slice)) ||
-            (jiffies - blk->updated[slice] > 300 * HZ) ||
-            (jiffies < blk->updated[slice])) {
-                dev_dbg(&client->dev, "Starting eeprom update, slice %u, base %u\n",
-                        slice, blk->base);
+        buf = &data->data[slice << SLICE_BITS];
 
-                addr = blk->base + (slice << SLICE_BITS);
-                count = blk->size - (slice << SLICE_BITS);
-                if (count > SLICE_SIZE) {
-                        count = SLICE_SIZE;
-                }
+        if (!(data->valid & (1 << slice)) ||
+            time_after(jiffies, data->last_updated[slice])) {
 
-                /* Preset the read address */
-                if (addr < 0x100) {
-                        /* select the register */
-                        if (i2c_smbus_write_byte(client, addr & 0xFF)) {
-                                dev_dbg(&client->dev, "max6875 register select has failed!\n");
-                                retval = -1;
-                                goto exit;
-                        }
-                } else {
-                        /* select the eeprom */
-                        if (i2c_smbus_write_byte_data(client, addr >> 8, addr & 0xFF)) {
-                                dev_dbg(&client->dev, "max6875 address set has failed!\n");
-                                retval = -1;
-                                goto exit;
-                        }
+                dev_dbg(&client->dev, "Starting update of slice %u\n", slice);
+
+                data->valid &= ~(1 << slice);
+
+                addr = USER_EEPROM_BASE + (slice << SLICE_BITS);
+
+                /* select the eeprom address */
+                if (i2c_smbus_write_byte_data(client, addr >> 8, addr & 0xFF)) {
+                        dev_err(&client->dev, "address set failed\n");
+                        goto exit_up;
                 }
 
-                if (i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_READ_I2C_BLOCK)) {
-                        if (i2c_smbus_read_i2c_block_data(client, MAX6875_CMD_BLOCK_READ,
-                                                          rdbuf) != SLICE_SIZE)
-                        {
-                                retval = -1;
-                                goto exit;
+                if (i2c_check_functionality(client->adapter,
+                                            I2C_FUNC_SMBUS_READ_I2C_BLOCK)) {
+                        if (i2c_smbus_read_i2c_block_data(client,
+                                                          MAX6875_CMD_BLK_READ,
+                                                          buf) != SLICE_SIZE) {
+                                goto exit_up;
                         }
-
-                        memcpy(&blk->data[slice << SLICE_BITS], rdbuf, count);
                 } else {
-                        for (i = 0; i < count; i++) {
+                        for (i = 0; i < SLICE_SIZE; i++) {
                                 j = i2c_smbus_read_byte(client);
-                                if (j < 0)
-                                {
-                                        retval = -1;
-                                        goto exit;
+                                if (j < 0) {
+                                        goto exit_up;
                                 }
-                                blk->data[(slice << SLICE_BITS) + i] = (u8) j;
+                                buf[i] = j;
                         }
                 }
-                blk->updated[slice] = jiffies;
-                blk->valid |= (1 << slice);
+                data->last_updated[slice] = jiffies;
+                data->valid |= (1 << slice);
         }
-        exit:
+exit_up:
         up(&data->update_lock);
-        return retval;
 }
 
-static ssize_t max6875_read(struct kobject *kobj, char *buf, loff_t off, size_t count,
-                            enum max6875_area_type area_type)
+static ssize_t max6875_read(struct kobject *kobj, char *buf, loff_t off,
+                            size_t count)
 {
-        struct i2c_client *client = to_i2c_client(container_of(kobj, struct device, kobj));
+        struct i2c_client *client = kobj_to_i2c_client(kobj);
         struct max6875_data *data = i2c_get_clientdata(client);
-        struct eeprom_block *blk;
-        int slice;
-
-        blk = &data->blocks[area_type];
+        int slice, max_slice;
 
-        if (off > blk->size)
+        if (off > USER_EEPROM_SIZE)
                 return 0;
-        if (off + count > blk->size)
-                count = blk->size - off;
 
-        /* Only refresh slices which contain requested bytes */
-        for (slice = (off >> SLICE_BITS); slice <= ((off + count - 1) >> SLICE_BITS); slice++)
-                max6875_update_slice(client, blk, slice);
+        if (off + count > USER_EEPROM_SIZE)
+                count = USER_EEPROM_SIZE - off;
 
-        memcpy(buf, &blk->data[off], count);
+        /* refresh slices which contain requested bytes */
+        max_slice = (off + count - 1) >> SLICE_BITS;
+        for (slice = (off >> SLICE_BITS); slice <= max_slice; slice++)
+                max6875_update_slice(client, slice);
 
-        return count;
-}
-
-static ssize_t max6875_user_read(struct kobject *kobj, char *buf, loff_t off, size_t count)
-{
-        return max6875_read(kobj, buf, off, count, max6875_eeprom_user);
-}
-
-static ssize_t max6875_config_read(struct kobject *kobj, char *buf, loff_t off, size_t count)
-{
-        return max6875_read(kobj, buf, off, count, max6875_eeprom_config);
-}
-
-static ssize_t max6875_cfgreg_read(struct kobject *kobj, char *buf, loff_t off, size_t count)
-{
-        return max6875_read(kobj, buf, off, count, max6875_register_config);
-}
-
-
-static ssize_t max6875_write(struct kobject *kobj, char *buf, loff_t off, size_t count,
-                             enum max6875_area_type area_type)
-{
-        struct i2c_client *client = to_i2c_client(container_of(kobj, struct device, kobj));
-        struct max6875_data *data = i2c_get_clientdata(client);
-        struct eeprom_block *blk;
-        int slice, addr, retval;
-        ssize_t sent = 0;
-
-        blk = &data->blocks[area_type];
-
-        if (off > blk->size)
-                return 0;
-        if ((off + count) > blk->size)
-                count = blk->size - off;
-
-        if (down_interruptible(&data->update_lock))
-                return -EAGAIN;
-
-        /* writing to a register is done with i2c_smbus_write_byte_data() */
-        if (blk->type == max6875_register_config) {
-                for (sent = 0; sent < count; sent++) {
-                        addr = off + sent;
-                        if (addr == 0x44)
-                                continue;
-
-                        retval = i2c_smbus_write_byte_data(client, addr, buf[sent]);
-                }
-        } else {
-                int cmd, val;
-
-                /* We are writing to EEPROM */
-                for (sent = 0; sent < count; sent++) {
-                        addr = blk->base + off + sent;
-                        cmd = addr >> 8;
-                        val = (addr & 0xff) | (buf[sent] << 8); // reversed
-
-                        if (addr == 0x8044)
-                                continue;
-
-                        retval = i2c_smbus_write_word_data(client, cmd, val);
-
-                        if (retval) {
-                                goto error_exit;
-                        }
+        memcpy(buf, &data->data[off], count);
 
-                        /* A write takes up to 11 ms */
-                        msleep(11);
-                }
-        }
-
-        /* Invalidate the scratch buffer */
-        for (slice = (off >> SLICE_BITS); slice <= ((off + count - 1) >> SLICE_BITS); slice++)
-                blk->valid &= ~(1 << slice);
-
-        error_exit:
-        up(&data->update_lock);
-
-        return sent;
-}
-
-static ssize_t max6875_user_write(struct kobject *kobj, char *buf, loff_t off, size_t count)
-{
-        return max6875_write(kobj, buf, off, count, max6875_eeprom_user);
-}
-
-static ssize_t max6875_config_write(struct kobject *kobj, char *buf, loff_t off, size_t count)
-{
-        return max6875_write(kobj, buf, off, count, max6875_eeprom_config);
-}
-
-static ssize_t max6875_cfgreg_write(struct kobject *kobj, char *buf, loff_t off, size_t count)
-{
-        return max6875_write(kobj, buf, off, count, max6875_register_config);
+        return count;
 }
 
 static struct bin_attribute user_eeprom_attr = {
         .attr = {
-                .name = "eeprom_user",
-                .mode = S_IRUGO | S_IWUSR | S_IWGRP,
-                .owner = THIS_MODULE,
-        },
-        .size  = USER_EEPROM_SIZE,
-        .read  = max6875_user_read,
-        .write = max6875_user_write,
-};
-
-static struct bin_attribute config_eeprom_attr = {
-        .attr = {
-                .name = "eeprom_config",
-                .mode = S_IRUGO | S_IWUSR,
-                .owner = THIS_MODULE,
-        },
-        .size  = CONFIG_EEPROM_SIZE,
-        .read  = max6875_config_read,
-        .write = max6875_config_write,
-};
-
-static struct bin_attribute config_register_attr = {
-        .attr = {
-                .name = "reg_config",
-                .mode = S_IRUGO | S_IWUSR,
+                .name = "eeprom",
+                .mode = S_IRUGO,
                 .owner = THIS_MODULE,
         },
-        .size  = CONFIG_EEPROM_SIZE,
-        .read  = max6875_cfgreg_read,
-        .write = max6875_cfgreg_write,
+        .size = USER_EEPROM_SIZE,
+        .read = max6875_read,
 };
 
 static int max6875_attach_adapter(struct i2c_adapter *adapter)
 {
-        return i2c_detect(adapter, &addr_data, max6875_detect);
+        return i2c_probe(adapter, &addr_data, max6875_detect);
 }
 
-/* This function is called by i2c_detect */
+/* This function is called by i2c_probe */
 static int max6875_detect(struct i2c_adapter *adapter, int address, int kind)
 {
-        struct i2c_client *new_client;
+        struct i2c_client *real_client;
+        struct i2c_client *fake_client;
         struct max6875_data *data;
         int err = 0;
 
-        /* Prevent 24RF08 corruption (in case of user error) */
-        if (kind < 0)
-                i2c_smbus_xfer(adapter, address, 0, 0, 0,
-                               I2C_SMBUS_QUICK, NULL);
-
-        /* There are three ways we can read the EEPROM data:
-           (1) I2C block reads (faster, but unsupported by most adapters)
-           (2) Consecutive byte reads (100% overhead)
-           (3) Regular byte data reads (200% overhead)
-           The third method is not implemented by this driver because all
-           known adapters support at least the second. */
-        if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_READ_BYTE_DATA |
-                                     I2C_FUNC_SMBUS_BYTE |
-                                     I2C_FUNC_SMBUS_WRITE_BYTE_DATA))
-                goto exit;
-
-        /* OK. For now, we presume we have a valid client. We now create the
-           client structure, even though we cannot fill it completely yet.
-           But it allows us to access eeprom_{read,write}_value. */
-        if (!(data = kmalloc(sizeof(struct max6875_data), GFP_KERNEL))) {
-                err = -ENOMEM;
-                goto exit;
-        }
+        if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_WRITE_BYTE_DATA
+                                     | I2C_FUNC_SMBUS_READ_BYTE))
+                return 0;
+
+        /* Only check even addresses */
+        if (address & 1)
+                return 0;
+
+        if (!(data = kmalloc(sizeof(struct max6875_data), GFP_KERNEL)))
+                return -ENOMEM;
         memset(data, 0, sizeof(struct max6875_data));
 
-        new_client = &data->client;
-        i2c_set_clientdata(new_client, data);
-        new_client->addr = address;
-        new_client->adapter = adapter;
-        new_client->driver = &max6875_driver;
-        new_client->flags = 0;
-
-        /* Setup the user section */
-        data->blocks[max6875_eeprom_user].type    = max6875_eeprom_user;
-        data->blocks[max6875_eeprom_user].slices  = USER_EEPROM_SLICES;
-        data->blocks[max6875_eeprom_user].size    = USER_EEPROM_SIZE;
-        data->blocks[max6875_eeprom_user].base    = USER_EEPROM_BASE;
-        data->blocks[max6875_eeprom_user].data    = data->data;
-        data->blocks[max6875_eeprom_user].updated = data->last_updated;
-
-        /* Setup the config section */
-        data->blocks[max6875_eeprom_config].type    = max6875_eeprom_config;
-        data->blocks[max6875_eeprom_config].slices  = CONFIG_EEPROM_SLICES;
-        data->blocks[max6875_eeprom_config].size    = CONFIG_EEPROM_SIZE;
-        data->blocks[max6875_eeprom_config].base    = CONFIG_EEPROM_BASE;
-        data->blocks[max6875_eeprom_config].data    = &data->data[USER_EEPROM_SIZE];
-        data->blocks[max6875_eeprom_config].updated = &data->last_updated[USER_EEPROM_SLICES];
-
-        /* Setup the register section */
-        data->blocks[max6875_register_config].type    = max6875_register_config;
-        data->blocks[max6875_register_config].slices  = CONFIG_EEPROM_SLICES;
-        data->blocks[max6875_register_config].size    = CONFIG_EEPROM_SIZE;
-        data->blocks[max6875_register_config].base    = 0;
-        data->blocks[max6875_register_config].data    = &data->data[USER_EEPROM_SIZE+CONFIG_EEPROM_SIZE];
-        data->blocks[max6875_register_config].updated = &data->last_updated[USER_EEPROM_SLICES+CONFIG_EEPROM_SLICES];
-
-        /* Init the data */
-        memset(data->data, 0xff, sizeof(data->data));
-
-        /* Fill in the remaining client fields */
-        strlcpy(new_client->name, "max6875", I2C_NAME_SIZE);
+        /* A fake client is created on the odd address */
+        if (!(fake_client = kmalloc(sizeof(struct i2c_client), GFP_KERNEL))) {
+                err = -ENOMEM;
+                goto exit_kfree1;
+        }
+        memset(fake_client, 0, sizeof(struct i2c_client));
+
+        /* Init real i2c_client */
+        real_client = &data->client;
+        i2c_set_clientdata(real_client, data);
+        real_client->addr = address;
+        real_client->adapter = adapter;
+        real_client->driver = &max6875_driver;
+        real_client->flags = 0;
+        strlcpy(real_client->name, "max6875", I2C_NAME_SIZE);
         init_MUTEX(&data->update_lock);
 
-        /* Verify that the chip is really what we think it is */
-        if ((max6875_update_slice(new_client, &data->blocks[max6875_eeprom_config], 4) < 0) ||
-            (max6875_update_slice(new_client, &data->blocks[max6875_register_config], 4) < 0))
-                goto exit_kfree;
-
-        /* 0x41,0x42 must be zero and 0x40 must match in eeprom and registers */
-        if ((data->blocks[max6875_eeprom_config].data[0x41] != 0) ||
-            (data->blocks[max6875_eeprom_config].data[0x42] != 0) ||
-            (data->blocks[max6875_register_config].data[0x41] != 0) ||
-            (data->blocks[max6875_register_config].data[0x42] != 0) ||
-            (data->blocks[max6875_eeprom_config].data[0x40] !=
-             data->blocks[max6875_register_config].data[0x40]))
-                goto exit_kfree;
-
-        /* Tell the I2C layer a new client has arrived */
-        if ((err = i2c_attach_client(new_client)))
-                goto exit_kfree;
-
-        /* create the sysfs eeprom files with the correct permissions */
-        if (allow_write == 0) {
-                user_eeprom_attr.attr.mode &= ~S_IWUGO;
-                user_eeprom_attr.write = NULL;
-                config_eeprom_attr.attr.mode &= ~S_IWUGO;
-                config_eeprom_attr.write = NULL;
-                config_register_attr.attr.mode &= ~S_IWUGO;
-                config_register_attr.write = NULL;
-        }
-        sysfs_create_bin_file(&new_client->dev.kobj, &user_eeprom_attr);
-        sysfs_create_bin_file(&new_client->dev.kobj, &config_eeprom_attr);
-        sysfs_create_bin_file(&new_client->dev.kobj, &config_register_attr);
+        /* Init fake client data */
+        /* set the client data to the i2c_client so that it will get freed */
+        i2c_set_clientdata(fake_client, fake_client);
+        fake_client->addr = address | 1;
+        fake_client->adapter = adapter;
+        fake_client->driver = &max6875_driver;
+        fake_client->flags = 0;
+        strlcpy(fake_client->name, "max6875 subclient", I2C_NAME_SIZE);
+
+        /* Prevent 24RF08 corruption (in case of user error) */
+        i2c_smbus_write_quick(real_client, 0);
+
+        if ((err = i2c_attach_client(real_client)) != 0)
+                goto exit_kfree2;
+
+        if ((err = i2c_attach_client(fake_client)) != 0)
+                goto exit_detach;
+
+        sysfs_create_bin_file(&real_client->dev.kobj, &user_eeprom_attr);
 
         return 0;
 
-exit_kfree:
+exit_detach:
+        i2c_detach_client(real_client);
+exit_kfree2:
+        kfree(fake_client);
+exit_kfree1:
         kfree(data);
-exit:
         return err;
 }
 
@@ -450,13 +236,9 @@ static int max6875_detach_client(struct i2c_client *client)
         int err;
 
         err = i2c_detach_client(client);
-        if (err) {
-                dev_err(&client->dev, "Client deregistration failed, client not detached.\n");
+        if (err)
                 return err;
-        }
-
         kfree(i2c_get_clientdata(client));
-
         return 0;
 }
 
diff --git a/drivers/i2c/chips/pca9539.c b/drivers/i2c/chips/pca9539.c
index 9f3ad45daae..225577fdda4 100644
--- a/drivers/i2c/chips/pca9539.c
+++ b/drivers/i2c/chips/pca9539.c
@@ -13,14 +13,12 @@
 #include <linux/slab.h>
 #include <linux/i2c.h>
 #include <linux/hwmon-sysfs.h>
-#include <linux/i2c-sensor.h>
 
 /* Addresses to scan */
 static unsigned short normal_i2c[] = {0x74, 0x75, 0x76, 0x77, I2C_CLIENT_END};
-static unsigned int normal_isa[] = {I2C_CLIENT_ISA_END};
 
 /* Insmod parameters */
-SENSORS_INSMOD_1(pca9539);
+I2C_CLIENT_INSMOD_1(pca9539);
 
 enum pca9539_cmd
 {
@@ -109,10 +107,10 @@ static struct attribute_group pca9539_defattr_group = {
 
 static int pca9539_attach_adapter(struct i2c_adapter *adapter)
 {
-        return i2c_detect(adapter, &addr_data, pca9539_detect);
+        return i2c_probe(adapter, &addr_data, pca9539_detect);
 }
 
-/* This function is called by i2c_detect */
+/* This function is called by i2c_probe */
 static int pca9539_detect(struct i2c_adapter *adapter, int address, int kind)
 {
         struct i2c_client *new_client;
@@ -164,10 +162,8 @@ static int pca9539_detach_client(struct i2c_client *client)
 {
         int err;
 
-        if ((err = i2c_detach_client(client))) {
-                dev_err(&client->dev, "Client deregistration failed.\n");
+        if ((err = i2c_detach_client(client)))
                 return err;
-        }
 
         kfree(i2c_get_clientdata(client));
         return 0;
diff --git a/drivers/i2c/chips/pcf8574.c b/drivers/i2c/chips/pcf8574.c
index cfcf6465408..6525743ff9f 100644
--- a/drivers/i2c/chips/pcf8574.c
+++ b/drivers/i2c/chips/pcf8574.c
@@ -39,16 +39,14 @@
 #include <linux/init.h>
 #include <linux/slab.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
 
 /* Addresses to scan */
 static unsigned short normal_i2c[] = { 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27,
                                         0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,
                                         I2C_CLIENT_END };
-static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
 
 /* Insmod parameters */
-SENSORS_INSMOD_2(pcf8574, pcf8574a);
+I2C_CLIENT_INSMOD_2(pcf8574, pcf8574a);
 
 /* Initial values */
 #define PCF8574_INIT 255        /* All outputs on (input mode) */
@@ -113,10 +111,10 @@ static DEVICE_ATTR(write, S_IWUSR | S_IRUGO, show_write, set_write);
 
 static int pcf8574_attach_adapter(struct i2c_adapter *adapter)
 {
-        return i2c_detect(adapter, &addr_data, pcf8574_detect);
+        return i2c_probe(adapter, &addr_data, pcf8574_detect);
 }
 
-/* This function is called by i2c_detect */
+/* This function is called by i2c_probe */
 int pcf8574_detect(struct i2c_adapter *adapter, int address, int kind)
 {
         struct i2c_client *new_client;
@@ -186,11 +184,8 @@ static int pcf8574_detach_client(struct i2c_client *client)
 {
         int err;
 
-        if ((err = i2c_detach_client(client))) {
-                dev_err(&client->dev,
-                        "Client deregistration failed, client not detached.\n");
+        if ((err = i2c_detach_client(client)))
                 return err;
-        }
 
         kfree(i2c_get_clientdata(client));
         return 0;
diff --git a/drivers/i2c/chips/pcf8591.c b/drivers/i2c/chips/pcf8591.c
index db812ade856..80f1df9a450 100644
--- a/drivers/i2c/chips/pcf8591.c
+++ b/drivers/i2c/chips/pcf8591.c
@@ -24,15 +24,13 @@
 #include <linux/init.h>
 #include <linux/slab.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
 
 /* Addresses to scan */
 static unsigned short normal_i2c[] = { 0x48, 0x49, 0x4a, 0x4b, 0x4c,
                                         0x4d, 0x4e, 0x4f, I2C_CLIENT_END };
-static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
 
 /* Insmod parameters */
-SENSORS_INSMOD_1(pcf8591);
+I2C_CLIENT_INSMOD_1(pcf8591);
 
 static int input_mode;
 module_param(input_mode, int, 0);
@@ -164,10 +162,10 @@ static DEVICE_ATTR(out0_enable, S_IWUSR | S_IRUGO,
  */
 static int pcf8591_attach_adapter(struct i2c_adapter *adapter)
 {
-        return i2c_detect(adapter, &addr_data, pcf8591_detect);
+        return i2c_probe(adapter, &addr_data, pcf8591_detect);
 }
 
-/* This function is called by i2c_detect */
+/* This function is called by i2c_probe */
 int pcf8591_detect(struct i2c_adapter *adapter, int address, int kind)
 {
         struct i2c_client *new_client;
@@ -241,11 +239,8 @@ static int pcf8591_detach_client(struct i2c_client *client)
 {
         int err;
 
-        if ((err = i2c_detach_client(client))) {
-                dev_err(&client->dev,
-                        "Client deregistration failed, client not detached.\n");
+        if ((err = i2c_detach_client(client)))
                 return err;
-        }
 
         kfree(i2c_get_clientdata(client));
         return 0;
diff --git a/drivers/i2c/chips/rtc8564.c b/drivers/i2c/chips/rtc8564.c
index 588fc2261a9..0b5385c892b 100644
--- a/drivers/i2c/chips/rtc8564.c
+++ b/drivers/i2c/chips/rtc8564.c
@@ -67,7 +67,6 @@ static struct i2c_client_address_data addr_data = {
         .normal_i2c             = normal_addr,
         .probe                  = ignore,
         .ignore                 = ignore,
-        .force                  = ignore,
 };
 
 static int rtc8564_read_mem(struct i2c_client *client, struct mem *mem);
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index 4a9ead27759..dda472e5e8b 100644
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -61,7 +61,7 @@ static int i2c_bus_resume(struct device * dev)
         return rc;
 }
 
-static struct bus_type i2c_bus_type = {
+struct bus_type i2c_bus_type = {
         .name =         "i2c",
         .match =        i2c_device_match,
         .suspend =      i2c_bus_suspend,
@@ -78,13 +78,13 @@ static int i2c_device_remove(struct device *dev)
         return 0;
 }
 
-static void i2c_adapter_dev_release(struct device *dev)
+void i2c_adapter_dev_release(struct device *dev)
 {
         struct i2c_adapter *adap = dev_to_i2c_adapter(dev);
         complete(&adap->dev_released);
 }
 
-static struct device_driver i2c_adapter_driver = {
+struct device_driver i2c_adapter_driver = {
         .name = "i2c_adapter",
         .bus = &i2c_bus_type,
         .probe = i2c_device_probe,
@@ -97,7 +97,7 @@ static void i2c_adapter_class_dev_release(struct class_device *dev)
         complete(&adap->class_dev_released);
 }
 
-static struct class i2c_adapter_class = {
+struct class i2c_adapter_class = {
         .name =         "i2c-adapter",
         .release =      &i2c_adapter_class_dev_release,
 };
@@ -188,6 +188,8 @@ int i2c_add_adapter(struct i2c_adapter *adap)
         strlcpy(adap->class_dev.class_id, adap->dev.bus_id, BUS_ID_SIZE);
         class_device_register(&adap->class_dev);
 
+        dev_dbg(&adap->dev, "adapter [%s] registered\n", adap->name);
+
         /* inform drivers of new adapters */
         list_for_each(item,&drivers) {
                 driver = list_entry(item, struct i2c_driver, list);
@@ -196,8 +198,6 @@ int i2c_add_adapter(struct i2c_adapter *adap)
                         driver->attach_adapter(adap);
         }
 
-        dev_dbg(&adap->dev, "registered as adapter #%d\n", adap->nr);
-
 out_unlock:
         up(&core_lists);
         return res;
@@ -220,8 +220,8 @@ int i2c_del_adapter(struct i2c_adapter *adap)
                         break;
         }
         if (adap_from_list != adap) {
-                pr_debug("I2C: Attempting to delete an unregistered "
-                         "adapter\n");
+                pr_debug("i2c-core: attempting to delete unregistered "
+                         "adapter [%s]\n", adap->name);
                 res = -EINVAL;
                 goto out_unlock;
         }
@@ -230,9 +230,8 @@ int i2c_del_adapter(struct i2c_adapter *adap)
                 driver = list_entry(item, struct i2c_driver, list);
                 if (driver->detach_adapter)
                         if ((res = driver->detach_adapter(adap))) {
-                                dev_warn(&adap->dev, "can't detach adapter "
-                                         "while detaching driver %s: driver "
-                                         "not detached!\n", driver->name);
+                                dev_err(&adap->dev, "detach_adapter failed "
+                                        "for driver [%s]\n", driver->name);
                                 goto out_unlock;
                         }
         }
@@ -247,9 +246,8 @@ int i2c_del_adapter(struct i2c_adapter *adap)
                  * must be deleted, as this would cause invalid states.
                  */
                 if ((res=client->driver->detach_client(client))) {
-                        dev_err(&adap->dev, "adapter not "
-                                "unregistered, because client at "
-                                "address %02x can't be detached. ",
+                        dev_err(&adap->dev, "detach_client failed for client "
+                                "[%s] at address 0x%02x\n", client->name,
                                 client->addr);
                         goto out_unlock;
                 }
@@ -270,7 +268,7 @@ int i2c_del_adapter(struct i2c_adapter *adap)
         /* free dynamically allocated bus id */
         idr_remove(&i2c_adapter_idr, adap->nr);
 
-        dev_dbg(&adap->dev, "adapter unregistered\n");
+        dev_dbg(&adap->dev, "adapter [%s] unregistered\n", adap->name);
 
  out_unlock:
         up(&core_lists);
@@ -303,7 +301,7 @@ int i2c_add_driver(struct i2c_driver *driver)
                 goto out_unlock;
         
         list_add_tail(&driver->list,&drivers);
-        pr_debug("i2c-core: driver %s registered.\n", driver->name);
+        pr_debug("i2c-core: driver [%s] registered\n", driver->name);
 
         /* now look for instances of driver on our adapters */
         if (driver->flags & I2C_DF_NOTIFY) {
@@ -331,21 +329,17 @@ int i2c_del_driver(struct i2c_driver *driver)
         /* Have a look at each adapter, if clients of this driver are still
          * attached. If so, detach them to be able to kill the driver 
          * afterwards.
-         */
-        pr_debug("i2c-core: unregister_driver - looking for clients.\n");
-        /* removing clients does not depend on the notify flag, else 
+         *
+         * Removing clients does not depend on the notify flag, else
          * invalid operation might (will!) result, when using stale client
          * pointers.
          */
         list_for_each(item1,&adapters) {
                 adap = list_entry(item1, struct i2c_adapter, list);
-                dev_dbg(&adap->dev, "examining adapter\n");
                 if (driver->detach_adapter) {
                         if ((res = driver->detach_adapter(adap))) {
-                                dev_warn(&adap->dev, "while unregistering "
-                                       "dummy driver %s, adapter could "
-                                       "not be detached properly; driver "
-                                       "not unloaded!",driver->name);
+                                dev_err(&adap->dev, "detach_adapter failed "
+                                        "for driver [%s]\n", driver->name);
                                 goto out_unlock;
                         }
                 } else {
@@ -353,16 +347,13 @@ int i2c_del_driver(struct i2c_driver *driver)
                                 client = list_entry(item2, struct i2c_client, list);
                                 if (client->driver != driver)
                                         continue;
-                                pr_debug("i2c-core.o: detaching client %s:\n", client->name);
+                                dev_dbg(&adap->dev, "detaching client [%s] "
+                                        "at 0x%02x\n", client->name,
+                                        client->addr);
                                 if ((res = driver->detach_client(client))) {
-                                        dev_err(&adap->dev, "while "
-                                                "unregistering driver "
-                                                "`%s', the client at "
-                                                "address %02x of "
-                                                "adapter could not "
-                                                "be detached; driver "
-                                                "not unloaded!",
-                                                driver->name,
+                                        dev_err(&adap->dev, "detach_client "
+                                                "failed for client [%s] at "
+                                                "0x%02x\n", client->name,
                                                 client->addr);
                                         goto out_unlock;
                                 }
@@ -372,7 +363,7 @@ int i2c_del_driver(struct i2c_driver *driver)
 
         driver_unregister(&driver->driver);
         list_del(&driver->list);
-        pr_debug("i2c-core: driver unregistered: %s\n", driver->name);
+        pr_debug("i2c-core: driver [%s] unregistered\n", driver->name);
 
  out_unlock:
         up(&core_lists);
@@ -417,15 +408,12 @@ int i2c_attach_client(struct i2c_client *client)
         
         if (adapter->client_register)  {
                 if (adapter->client_register(client))  {
-                        dev_warn(&adapter->dev, "warning: client_register "
-                                "seems to have failed for client %02x\n",
-                                client->addr);
+                        dev_dbg(&adapter->dev, "client_register "
+                                "failed for client [%s] at 0x%02x\n",
+                                client->name, client->addr);
                 }
         }
 
-        dev_dbg(&adapter->dev, "client [%s] registered to adapter\n",
-                client->name);
-
         if (client->flags & I2C_CLIENT_ALLOW_USE)
                 client->usage_count = 0;
 
@@ -436,7 +424,8 @@ int i2c_attach_client(struct i2c_client *client)
         
         snprintf(&client->dev.bus_id[0], sizeof(client->dev.bus_id),
                 "%d-%04x", i2c_adapter_id(adapter), client->addr);
-        pr_debug("registering %s\n", client->dev.bus_id);
+        dev_dbg(&adapter->dev, "client [%s] registered with bus id %s\n",
+                client->name, client->dev.bus_id);
         device_register(&client->dev);
         device_create_file(&client->dev, &dev_attr_client_name);
         
@@ -449,8 +438,12 @@ int i2c_detach_client(struct i2c_client *client)
         struct i2c_adapter *adapter = client->adapter;
         int res = 0;
         
-        if ((client->flags & I2C_CLIENT_ALLOW_USE) && (client->usage_count > 0))
+        if ((client->flags & I2C_CLIENT_ALLOW_USE)
+         && (client->usage_count > 0)) {
+                dev_warn(&client->dev, "Client [%s] still busy, "
+                         "can't detach\n", client->name);
                 return -EBUSY;
+        }
 
         if (adapter->client_unregister)  {
                 res = adapter->client_unregister(client);
@@ -669,98 +662,128 @@ int i2c_control(struct i2c_client *client,
  * Will not work for 10-bit addresses!
  * ----------------------------------------------------
  */
+static int i2c_probe_address(struct i2c_adapter *adapter, int addr, int kind,
+                             int (*found_proc) (struct i2c_adapter *, int, int))
+{
+        int err;
+
+        /* Make sure the address is valid */
+        if (addr < 0x03 || addr > 0x77) {
+                dev_warn(&adapter->dev, "Invalid probe address 0x%02x\n",
+                         addr);
+                return -EINVAL;
+        }
+
+        /* Skip if already in use */
+        if (i2c_check_addr(adapter, addr))
+                return 0;
+
+        /* Make sure there is something at this address, unless forced */
+        if (kind < 0) {
+                if (i2c_smbus_xfer(adapter, addr, 0, 0, 0,
+                                   I2C_SMBUS_QUICK, NULL) < 0)
+                        return 0;
+
+                /* prevent 24RF08 corruption */
+                if ((addr & ~0x0f) == 0x50)
+                        i2c_smbus_xfer(adapter, addr, 0, 0, 0,
+                                       I2C_SMBUS_QUICK, NULL);
+        }
+
+        /* Finally call the custom detection function */
+        err = found_proc(adapter, addr, kind);
+
+        /* -ENODEV can be returned if there is a chip at the given address
+           but it isn't supported by this chip driver. We catch it here as
+           this isn't an error. */
+        return (err == -ENODEV) ? 0 : err;
+}
+
 int i2c_probe(struct i2c_adapter *adapter,
               struct i2c_client_address_data *address_data,
               int (*found_proc) (struct i2c_adapter *, int, int))
 {
-        int addr,i,found,err;
+        int i, err;
         int adap_id = i2c_adapter_id(adapter);
 
         /* Forget it if we can't probe using SMBUS_QUICK */
         if (! i2c_check_functionality(adapter,I2C_FUNC_SMBUS_QUICK))
                 return -1;
 
-        for (addr = 0x00; addr <= 0x7f; addr++) {
-
-                /* Skip if already in use */
-                if (i2c_check_addr(adapter,addr))
-                        continue;
-
-                /* If it is in one of the force entries, we don't do any detection
-                   at all */
-                found = 0;
-
-                for (i = 0; !found && (address_data->force[i] != I2C_CLIENT_END); i += 2) {
-                        if (((adap_id == address_data->force[i]) || 
-                             (address_data->force[i] == ANY_I2C_BUS)) &&
-                             (addr == address_data->force[i+1])) {
-                                dev_dbg(&adapter->dev, "found force parameter for adapter %d, addr %04x\n",
-                                        adap_id, addr);
-                                if ((err = found_proc(adapter,addr,0)))
-                                        return err;
-                                found = 1;
-                        }
-                }
-                if (found) 
-                        continue;
-
-                /* If this address is in one of the ignores, we can forget about
-                   it right now */
-                for (i = 0;
-                     !found && (address_data->ignore[i] != I2C_CLIENT_END);
-                     i += 2) {
-                        if (((adap_id == address_data->ignore[i]) || 
-                            ((address_data->ignore[i] == ANY_I2C_BUS))) &&
-                            (addr == address_data->ignore[i+1])) {
-                                dev_dbg(&adapter->dev, "found ignore parameter for adapter %d, "
-                                        "addr %04x\n", adap_id ,addr);
-                                found = 1;
+        /* Force entries are done first, and are not affected by ignore
+           entries */
+        if (address_data->forces) {
+                unsigned short **forces = address_data->forces;
+                int kind;
+
+                for (kind = 0; forces[kind]; kind++) {
+                        for (i = 0; forces[kind][i] != I2C_CLIENT_END;
+                             i += 2) {
+                                if (forces[kind][i] == adap_id
+                                 || forces[kind][i] == ANY_I2C_BUS) {
+                                        dev_dbg(&adapter->dev, "found force "
+                                                "parameter for adapter %d, "
+                                                "addr 0x%02x, kind %d\n",
+                                                adap_id, forces[kind][i + 1],
+                                                kind);
+                                        err = i2c_probe_address(adapter,
+                                                forces[kind][i + 1],
+                                                kind, found_proc);
+                                        if (err)
+                                                return err;
+                                }
                         }
                 }
-                if (found) 
-                        continue;
+        }
 
-                /* Now, we will do a detection, but only if it is in the normal or 
-                   probe entries */  
-                for (i = 0;
-                     !found && (address_data->normal_i2c[i] != I2C_CLIENT_END);
-                     i += 1) {
-                        if (addr == address_data->normal_i2c[i]) {
-                                found = 1;
-                                dev_dbg(&adapter->dev, "found normal i2c entry for adapter %d, "
-                                        "addr %02x\n", adap_id, addr);
-                        }
+        /* Probe entries are done second, and are not affected by ignore
+           entries either */
+        for (i = 0; address_data->probe[i] != I2C_CLIENT_END; i += 2) {
+                if (address_data->probe[i] == adap_id
+                 || address_data->probe[i] == ANY_I2C_BUS) {
+                        dev_dbg(&adapter->dev, "found probe parameter for "
+                                "adapter %d, addr 0x%02x\n", adap_id,
+                                address_data->probe[i + 1]);
+                        err = i2c_probe_address(adapter,
+                                                address_data->probe[i + 1],
+                                                -1, found_proc);
+                        if (err)
+                                return err;
                 }
+        }
 
-                for (i = 0;
-                     !found && (address_data->probe[i] != I2C_CLIENT_END);
-                     i += 2) {
-                        if (((adap_id == address_data->probe[i]) ||
-                            ((address_data->probe[i] == ANY_I2C_BUS))) &&
-                            (addr == address_data->probe[i+1])) {
-                                found = 1;
-                                dev_dbg(&adapter->dev, "found probe parameter for adapter %d, "
-                                        "addr %04x\n", adap_id,addr);
+        /* Normal entries are done last, unless shadowed by an ignore entry */
+        for (i = 0; address_data->normal_i2c[i] != I2C_CLIENT_END; i += 1) {
+                int j, ignore;
+
+                ignore = 0;
+                for (j = 0; address_data->ignore[j] != I2C_CLIENT_END;
+                     j += 2) {
+                        if ((address_data->ignore[j] == adap_id ||
+                             address_data->ignore[j] == ANY_I2C_BUS)
+                         && address_data->ignore[j + 1]
+                            == address_data->normal_i2c[i]) {
+                                dev_dbg(&adapter->dev, "found ignore "
+                                        "parameter for adapter %d, "
+                                        "addr 0x%02x\n", adap_id,
+                                        address_data->ignore[j + 1]);
                         }
+                        ignore = 1;
+                        break;
                 }
-                if (!found) 
+                if (ignore)
                         continue;
 
-                /* OK, so we really should examine this address. First check
-                   whether there is some client here at all! */
-                if (i2c_smbus_xfer(adapter,addr,0,0,0,I2C_SMBUS_QUICK,NULL) >= 0)
-                        if ((err = found_proc(adapter,addr,-1)))
-                                return err;
+                dev_dbg(&adapter->dev, "found normal entry for adapter %d, "
+                        "addr 0x%02x\n", adap_id,
+                        address_data->normal_i2c[i]);
+                err = i2c_probe_address(adapter, address_data->normal_i2c[i],
+                                        -1, found_proc);
+                if (err)
+                        return err;
         }
-        return 0;
-}
 
-/*
- * return id number for a specific adapter
- */
-int i2c_adapter_id(struct i2c_adapter *adap)
-{
-        return adap->nr;
+        return 0;
 }
 
 struct i2c_adapter* i2c_get_adapter(int id)
@@ -1171,6 +1194,12 @@ s32 i2c_smbus_xfer(struct i2c_adapter * adapter, u16 addr, unsigned short flags,
 }
 
 
+/* Next four are needed by i2c-isa */
+EXPORT_SYMBOL_GPL(i2c_adapter_dev_release);
+EXPORT_SYMBOL_GPL(i2c_adapter_driver);
+EXPORT_SYMBOL_GPL(i2c_adapter_class);
+EXPORT_SYMBOL_GPL(i2c_bus_type);
+
 EXPORT_SYMBOL(i2c_add_adapter);
 EXPORT_SYMBOL(i2c_del_adapter);
 EXPORT_SYMBOL(i2c_add_driver);
@@ -1186,7 +1215,6 @@ EXPORT_SYMBOL(i2c_master_send);
 EXPORT_SYMBOL(i2c_master_recv);
 EXPORT_SYMBOL(i2c_control);
 EXPORT_SYMBOL(i2c_transfer);
-EXPORT_SYMBOL(i2c_adapter_id);
 EXPORT_SYMBOL(i2c_get_adapter);
 EXPORT_SYMBOL(i2c_put_adapter);
 EXPORT_SYMBOL(i2c_probe);
diff --git a/drivers/i2c/i2c-dev.c b/drivers/i2c/i2c-dev.c
index bc5d557e5dd..aa7a4fadef6 100644
--- a/drivers/i2c/i2c-dev.c
+++ b/drivers/i2c/i2c-dev.c
@@ -434,7 +434,8 @@ static int i2cdev_attach_adapter(struct i2c_adapter *adap)
 
         devfs_mk_cdev(MKDEV(I2C_MAJOR, i2c_dev->minor),
                         S_IFCHR|S_IRUSR|S_IWUSR, "i2c/%d", i2c_dev->minor);
-        dev_dbg(&adap->dev, "Registered as minor %d\n", i2c_dev->minor);
+        pr_debug("i2c-dev: adapter [%s] registered as minor %d\n",
+                 adap->name, i2c_dev->minor);
 
         /* register this i2c device with the driver core */
         i2c_dev->adap = adap;
@@ -471,7 +472,7 @@ static int i2cdev_detach_adapter(struct i2c_adapter *adap)
         wait_for_completion(&i2c_dev->released);
         kfree(i2c_dev);
 
-        dev_dbg(&adap->dev, "Adapter unregistered\n");
+        pr_debug("i2c-dev: adapter [%s] unregistered\n", adap->name);
         return 0;
 }
 
diff --git a/drivers/i2c/i2c-sensor-detect.c b/drivers/i2c/i2c-sensor-detect.c
deleted file mode 100644
index f99a8161a9f..00000000000
--- a/drivers/i2c/i2c-sensor-detect.c
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
-    i2c-sensor-detect.c - Part of lm_sensors, Linux kernel modules for hardware
-                          monitoring
-    Copyright (c) 1998 - 2001 Frodo Looijaard <frodol@dds.nl> and
-    Mark D. Studebaker <mdsxyz123@yahoo.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 of the License, 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.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
-
-static unsigned short empty[] = {I2C_CLIENT_END};
-static unsigned int empty_isa[] = {I2C_CLIENT_ISA_END};
-
-/* Very inefficient for ISA detects, and won't work for 10-bit addresses! */
-int i2c_detect(struct i2c_adapter *adapter,
-               struct i2c_address_data *address_data,
-               int (*found_proc) (struct i2c_adapter *, int, int))
-{
-        int addr, i, found, j, err;
-        struct i2c_force_data *this_force;
-        int is_isa = i2c_is_isa_adapter(adapter);
-        int adapter_id =
-            is_isa ? ANY_I2C_ISA_BUS : i2c_adapter_id(adapter);
-        unsigned short *normal_i2c;
-        unsigned int *normal_isa;
-        unsigned short *probe;
-        unsigned short *ignore;
-
-        /* Forget it if we can't probe using SMBUS_QUICK */
-        if ((!is_isa) &&
-            !i2c_check_functionality(adapter, I2C_FUNC_SMBUS_QUICK))
-                return -1;
-        
-        /* Use default "empty" list if the adapter doesn't specify any */
-        normal_i2c = probe = ignore = empty;
-        normal_isa = empty_isa;
-        if (address_data->normal_i2c)
-                normal_i2c = address_data->normal_i2c;
-        if (address_data->normal_isa)
-                normal_isa = address_data->normal_isa;
-        if (address_data->probe)
-                probe = address_data->probe;
-        if (address_data->ignore)
-                ignore = address_data->ignore;
-
-        for (addr = 0x00; addr <= (is_isa ? 0xffff : 0x7f); addr++) {
-                if (!is_isa && i2c_check_addr(adapter, addr))
-                        continue;
-
-                /* If it is in one of the force entries, we don't do any
-                   detection at all */
-                found = 0;
-                for (i = 0; !found && (this_force = address_data->forces + i, this_force->force); i++) {
-                        for (j = 0; !found && (this_force->force[j] != I2C_CLIENT_END); j += 2) {
-                                if ( ((adapter_id == this_force->force[j]) ||
-                                      ((this_force->force[j] == ANY_I2C_BUS) && !is_isa)) &&
-                                      (addr == this_force->force[j + 1]) ) {
-                                        dev_dbg(&adapter->dev, "found force parameter for adapter %d, addr %04x\n", adapter_id, addr);
-                                        if ((err = found_proc(adapter, addr, this_force->kind)))
-                                                return err;
-                                        found = 1;
-                                }
-                        }
-                }
-                if (found)
-                        continue;
-
-                /* If this address is in one of the ignores, we can forget about it
-                   right now */
-                for (i = 0; !found && (ignore[i] != I2C_CLIENT_END); i += 2) {
-                        if ( ((adapter_id == ignore[i]) ||
-                              ((ignore[i] == ANY_I2C_BUS) &&
-                               !is_isa)) &&
-                              (addr == ignore[i + 1])) {
-                                dev_dbg(&adapter->dev, "found ignore parameter for adapter %d, addr %04x\n", adapter_id, addr);
-                                found = 1;
-                        }
-                }
-                if (found)
-                        continue;
-
-                /* Now, we will do a detection, but only if it is in the normal or 
-                   probe entries */
-                if (is_isa) {
-                        for (i = 0; !found && (normal_isa[i] != I2C_CLIENT_ISA_END); i += 1) {
-                                if (addr == normal_isa[i]) {
-                                        dev_dbg(&adapter->dev, "found normal isa entry for adapter %d, addr %04x\n", adapter_id, addr);
-                                        found = 1;
-                                }
-                        }
-                } else {
-                        for (i = 0; !found && (normal_i2c[i] != I2C_CLIENT_END); i += 1) {
-                                if (addr == normal_i2c[i]) {
-                                        found = 1;
-                                        dev_dbg(&adapter->dev, "found normal i2c entry for adapter %d, addr %02x\n", adapter_id, addr);
-                                }
-                        }
-                }
-
-                for (i = 0;
-                     !found && (probe[i] != I2C_CLIENT_END);
-                     i += 2) {
-                        if (((adapter_id == probe[i]) ||
-                             ((probe[i] == ANY_I2C_BUS) && !is_isa))
-                            && (addr == probe[i + 1])) {
-                                dev_dbg(&adapter->dev, "found probe parameter for adapter %d, addr %04x\n", adapter_id, addr);
-                                found = 1;
-                        }
-                }
-                if (!found)
-                        continue;
-
-                /* OK, so we really should examine this address. First check
-                   whether there is some client here at all! */
-                if (is_isa ||
-                    (i2c_smbus_xfer (adapter, addr, 0, 0, 0, I2C_SMBUS_QUICK, NULL) >= 0))
-                        if ((err = found_proc(adapter, addr, -1)))
-                                return err;
-        }
-        return 0;
-}
-
-EXPORT_SYMBOL(i2c_detect);
-
-MODULE_AUTHOR("Frodo Looijaard <frodol@dds.nl>, "
-              "Rudolf Marek <r.marek@sh.cvut.cz>");
-
-MODULE_DESCRIPTION("i2c-sensor driver");
-MODULE_LICENSE("GPL");
diff --git a/drivers/i2c/i2c-sensor-vid.c b/drivers/i2c/i2c-sensor-vid.c
deleted file mode 100644
index 922e22f054b..00000000000
--- a/drivers/i2c/i2c-sensor-vid.c
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
-    i2c-sensor-vid.c -  Part of lm_sensors, Linux kernel modules for hardware
-                        monitoring
-
-    Copyright (c) 2004 Rudolf Marek <r.marek@sh.cvut.cz>
-
-    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 of the License, 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.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-#include <linux/config.h>
-#include <linux/module.h>
-#include <linux/kernel.h>
-
-struct vrm_model {
-        u8 vendor;
-        u8 eff_family;
-        u8 eff_model;
-        int vrm_type;
-};
-
-#define ANY 0xFF
-
-#ifdef CONFIG_X86
-
-static struct vrm_model vrm_models[] = {
-        {X86_VENDOR_AMD, 0x6, ANY, 90},         /* Athlon Duron etc */
-        {X86_VENDOR_AMD, 0xF, ANY, 24},         /* Athlon 64, Opteron */
-        {X86_VENDOR_INTEL, 0x6, 0x9, 85},       /* 0.13um too */
-        {X86_VENDOR_INTEL, 0x6, 0xB, 85},       /* 0xB Tualatin */
-        {X86_VENDOR_INTEL, 0x6, ANY, 82},       /* any P6 */
-        {X86_VENDOR_INTEL, 0x7, ANY, 0},        /* Itanium */
-        {X86_VENDOR_INTEL, 0xF, 0x3, 100},      /* P4 Prescott */
-        {X86_VENDOR_INTEL, 0xF, ANY, 90},       /* P4 before Prescott */
-        {X86_VENDOR_INTEL, 0x10,ANY, 0},        /* Itanium 2 */
-        {X86_VENDOR_UNKNOWN, ANY, ANY, 0}       /* stop here */
-        };
-
-static int find_vrm(u8 eff_family, u8 eff_model, u8 vendor)
-{
-        int i = 0;
-
-        while (vrm_models[i].vendor!=X86_VENDOR_UNKNOWN) {
-                if (vrm_models[i].vendor==vendor)
-                        if ((vrm_models[i].eff_family==eff_family)&& \
-                        ((vrm_models[i].eff_model==eff_model)|| \
-                        (vrm_models[i].eff_model==ANY)))
-                                return vrm_models[i].vrm_type;
-                i++;
-        }
-
-        return 0;
-}
-
-int i2c_which_vrm(void)
-{
-        struct cpuinfo_x86 *c = cpu_data;
-        u32 eax;
-        u8 eff_family, eff_model;
-        int vrm_ret;
-
-        if (c->x86 < 6) return 0;       /* any CPU with familly lower than 6
-                                        dont have VID and/or CPUID */
-        eax = cpuid_eax(1);
-        eff_family = ((eax & 0x00000F00)>>8);
-        eff_model  = ((eax & 0x000000F0)>>4);
-        if (eff_family == 0xF) {        /* use extended model & family */
-                eff_family += ((eax & 0x00F00000)>>20);
-                eff_model += ((eax & 0x000F0000)>>16)<<4;
-        }
-        vrm_ret = find_vrm(eff_family,eff_model,c->x86_vendor);
-        if (vrm_ret == 0)
-                printk(KERN_INFO "i2c-sensor.o: Unknown VRM version of your"
-                " x86 CPU\n");
-        return vrm_ret;
-}
-
-/* and now for something completely different for Non-x86 world*/
-#else
-int i2c_which_vrm(void)
-{
-        printk(KERN_INFO "i2c-sensor.o: Unknown VRM version of your CPU\n");
-        return 0;
-}
-#endif
-
-EXPORT_SYMBOL(i2c_which_vrm);
diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c
index c9d3a00a3c0..234f5de3e92 100644
--- a/drivers/ide/ide-disk.c
+++ b/drivers/ide/ide-disk.c
@@ -754,7 +754,7 @@ static int idedisk_issue_flush(request_queue_t *q, struct gendisk *disk,
 
         idedisk_prepare_flush(q, rq);
 
-        ret = blk_execute_rq(q, disk, rq);
+        ret = blk_execute_rq(q, disk, rq, 0);
 
         /*
          * if we failed and caller wants error offset, get it
diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
index 248e3cc8b35..f174aee659e 100644
--- a/drivers/ide/ide-io.c
+++ b/drivers/ide/ide-io.c
@@ -150,7 +150,7 @@ static void ide_complete_power_step(ide_drive_t *drive, struct request *rq, u8 s
 
         switch (rq->pm->pm_step) {
         case ide_pm_flush_cache:        /* Suspend step 1 (flush cache) complete */
-                if (rq->pm->pm_state == 4)
+                if (rq->pm->pm_state == PM_EVENT_FREEZE)
                         rq->pm->pm_step = ide_pm_state_completed;
                 else
                         rq->pm->pm_step = idedisk_pm_standby;
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index dae1bd5b8c3..73ca8f73917 100644
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -1229,7 +1229,7 @@ static int generic_ide_suspend(struct device *dev, pm_message_t state)
         rq.special = &args;
         rq.pm = &rqpm;
         rqpm.pm_step = ide_pm_state_start_suspend;
-        rqpm.pm_state = state;
+        rqpm.pm_state = state.event;
 
         return ide_do_drive_cmd(drive, &rq, ide_wait);
 }
@@ -1248,7 +1248,7 @@ static int generic_ide_resume(struct device *dev)
         rq.special = &args;
         rq.pm = &rqpm;
         rqpm.pm_step = ide_pm_state_start_resume;
-        rqpm.pm_state = 0;
+        rqpm.pm_state = PM_EVENT_ON;
 
         return ide_do_drive_cmd(drive, &rq, ide_head_wait);
 }
diff --git a/drivers/ide/pci/sc1200.c b/drivers/ide/pci/sc1200.c
index 10592cec6c4..24e21b2838c 100644
--- a/drivers/ide/pci/sc1200.c
+++ b/drivers/ide/pci/sc1200.c
@@ -350,9 +350,9 @@ static int sc1200_suspend (struct pci_dev *dev, pm_message_t state)
 {
         ide_hwif_t              *hwif = NULL;
 
-        printk("SC1200: suspend(%u)\n", state);
+        printk("SC1200: suspend(%u)\n", state.event);
 
-        if (state == 0) {
+        if (state.event == PM_EVENT_ON) {
                 // we only save state when going from full power to less
 
                 //
@@ -386,8 +386,8 @@ static int sc1200_suspend (struct pci_dev *dev, pm_message_t state)
         /* You don't need to iterate over disks -- sysfs should have done that for you already */ 
 
         pci_disable_device(dev);
-        pci_set_power_state(dev,state);
-        dev->current_state = state;
+        pci_set_power_state(dev, pci_choose_state(dev, state));
+        dev->current_state = state.event;
         return 0;
 }
 
@@ -396,8 +396,8 @@ static int sc1200_resume (struct pci_dev *dev)
         ide_hwif_t      *hwif = NULL;
 
 printk("SC1200: resume\n");
-        pci_set_power_state(dev,0);     // bring chip back from sleep state
-        dev->current_state = 0;
+        pci_set_power_state(dev, PCI_D0);       // bring chip back from sleep state
+        dev->current_state = PM_EVENT_ON;
         pci_enable_device(dev);
         //
         // loop over all interfaces that are part of this pci device:
diff --git a/drivers/ide/ppc/pmac.c b/drivers/ide/ppc/pmac.c
index ea65b070a36..87d1f8a1f41 100644
--- a/drivers/ide/ppc/pmac.c
+++ b/drivers/ide/ppc/pmac.c
@@ -1504,12 +1504,12 @@ pmac_ide_macio_attach(struct macio_dev *mdev, const struct of_device_id *match)
 }
 
 static int
-pmac_ide_macio_suspend(struct macio_dev *mdev, u32 state)
+pmac_ide_macio_suspend(struct macio_dev *mdev, pm_message_t state)
 {
         ide_hwif_t      *hwif = (ide_hwif_t *)dev_get_drvdata(&mdev->ofdev.dev);
         int             rc = 0;
 
-        if (state != mdev->ofdev.dev.power.power_state && state >= 2) {
+        if (state.event != mdev->ofdev.dev.power.power_state.event && state.event >= PM_EVENT_SUSPEND) {
                 rc = pmac_ide_do_suspend(hwif);
                 if (rc == 0)
                         mdev->ofdev.dev.power.power_state = state;
@@ -1524,10 +1524,10 @@ pmac_ide_macio_resume(struct macio_dev *mdev)
         ide_hwif_t      *hwif = (ide_hwif_t *)dev_get_drvdata(&mdev->ofdev.dev);
         int             rc = 0;
         
-        if (mdev->ofdev.dev.power.power_state != 0) {
+        if (mdev->ofdev.dev.power.power_state.event != PM_EVENT_ON) {
                 rc = pmac_ide_do_resume(hwif);
                 if (rc == 0)
-                        mdev->ofdev.dev.power.power_state = 0;
+                        mdev->ofdev.dev.power.power_state = PMSG_ON;
         }
 
         return rc;
@@ -1608,12 +1608,12 @@ pmac_ide_pci_attach(struct pci_dev *pdev, const struct pci_device_id *id)
 }
 
 static int
-pmac_ide_pci_suspend(struct pci_dev *pdev, u32 state)
+pmac_ide_pci_suspend(struct pci_dev *pdev, pm_message_t state)
 {
         ide_hwif_t      *hwif = (ide_hwif_t *)pci_get_drvdata(pdev);
         int             rc = 0;
         
-        if (state != pdev->dev.power.power_state && state >= 2) {
+        if (state.event != pdev->dev.power.power_state.event && state.event >= 2) {
                 rc = pmac_ide_do_suspend(hwif);
                 if (rc == 0)
                         pdev->dev.power.power_state = state;
@@ -1628,10 +1628,10 @@ pmac_ide_pci_resume(struct pci_dev *pdev)
         ide_hwif_t      *hwif = (ide_hwif_t *)pci_get_drvdata(pdev);
         int             rc = 0;
         
-        if (pdev->dev.power.power_state != 0) {
+        if (pdev->dev.power.power_state.event != PM_EVENT_ON) {
                 rc = pmac_ide_do_resume(hwif);
                 if (rc == 0)
-                        pdev->dev.power.power_state = 0;
+                        pdev->dev.power.power_state = PMSG_ON;
         }
 
         return rc;
diff --git a/drivers/ieee1394/nodemgr.c b/drivers/ieee1394/nodemgr.c
index bebcc47ab06..b23322523ef 100644
--- a/drivers/ieee1394/nodemgr.c
+++ b/drivers/ieee1394/nodemgr.c
@@ -1068,6 +1068,8 @@ static int nodemgr_hotplug(struct class_device *cdev, char **envp, int num_envp,
         struct unit_directory *ud;
         int i = 0;
         int length = 0;
+        /* ieee1394:venNmoNspNverN */
+        char buf[8 + 1 + 3 + 8 + 2 + 8 + 2 + 8 + 3 + 8 + 1];
 
         if (!cdev)
                 return -ENODEV;
@@ -1094,6 +1096,12 @@ do {								\
         PUT_ENVP("GUID=%016Lx", (unsigned long long)ud->ne->guid);
         PUT_ENVP("SPECIFIER_ID=%06x", ud->specifier_id);
         PUT_ENVP("VERSION=%06x", ud->version);
+        snprintf(buf, sizeof(buf), "ieee1394:ven%08Xmo%08Xsp%08Xver%08X",
+                        ud->vendor_id,
+                        ud->model_id,
+                        ud->specifier_id,
+                        ud->version);
+        PUT_ENVP("MODALIAS=%s", buf);
 
 #undef PUT_ENVP
 
diff --git a/drivers/ieee1394/pcilynx.c b/drivers/ieee1394/pcilynx.c
index 36074e6eeeb..6b1ab875333 100644
--- a/drivers/ieee1394/pcilynx.c
+++ b/drivers/ieee1394/pcilynx.c
@@ -1464,26 +1464,6 @@ static int __devinit add_card(struct pci_dev *dev,
                                                   { 0x50, I2C_M_RD, 20, (unsigned char*) lynx->bus_info_block }
                                                 };
 
-
-#ifdef CONFIG_IEEE1394_VERBOSEDEBUG
-                        union i2c_smbus_data data;
-
-                        if (i2c_smbus_xfer(i2c_ad, 80, 0, I2C_SMBUS_WRITE, 0, I2C_SMBUS_BYTE,NULL))
-                                PRINT(KERN_ERR, lynx->id,"eeprom read start has failed");
-                        else
-                        {
-                                u16 addr;
-                                for (addr=0x00; addr < 0x100; addr++) {
-                                        if (i2c_smbus_xfer(i2c_ad, 80, 0, I2C_SMBUS_READ, 0, I2C_SMBUS_BYTE,& data)) {
-                                                PRINT(KERN_ERR, lynx->id, "unable to read i2c %x", addr);
-                                                break;
-                                        }
-                                        else
-                                                PRINT(KERN_DEBUG, lynx->id,"got serial eeprom data at %x: %x",addr, data.byte);
-                                }
-                        }
-#endif
-
                         /* we use i2c_transfer, because i2c_smbus_read_block_data does not work properly and we
                            do it more efficiently in one transaction rather then using several reads */
                         if (i2c_transfer(i2c_ad, msg, 2) < 0) {
diff --git a/drivers/infiniband/core/sysfs.c b/drivers/infiniband/core/sysfs.c
index fae1c2dcee5..211ba3223f6 100644
--- a/drivers/infiniband/core/sysfs.c
+++ b/drivers/infiniband/core/sysfs.c
@@ -463,7 +463,7 @@ alloc_group_attrs(ssize_t (*show)(struct ib_port *,
                 return NULL;
 
         for (i = 0; i < len; i++) {
-                element = kcalloc(1, sizeof(struct port_table_attribute),
+                element = kzalloc(sizeof(struct port_table_attribute),
                                   GFP_KERNEL);
                 if (!element)
                         goto err;
diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c
index 20e3a165989..19c14c4beb4 100644
--- a/drivers/input/evdev.c
+++ b/drivers/input/evdev.c
@@ -160,6 +160,8 @@ struct input_event_compat {
 #  define COMPAT_TEST IS_IA32_PROCESS(ia64_task_regs(current))
 #elif defined(CONFIG_ARCH_S390)
 #  define COMPAT_TEST test_thread_flag(TIF_31BIT)
+#elif defined(CONFIG_MIPS)
+#  define COMPAT_TEST (current->thread.mflags & MF_32BIT_ADDR)
 #else
 #  define COMPAT_TEST test_thread_flag(TIF_32BIT)
 #endif
@@ -391,6 +393,7 @@ static long evdev_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                                                 case EV_LED: bits = dev->ledbit; len = LED_MAX; break;
                                                 case EV_SND: bits = dev->sndbit; len = SND_MAX; break;
                                                 case EV_FF:  bits = dev->ffbit;  len = FF_MAX;  break;
+                                                case EV_SW:  bits = dev->swbit;  len = SW_MAX;  break;
                                                 default: return -EINVAL;
                                         }
                                         len = NBITS(len) * sizeof(long);
@@ -419,6 +422,13 @@ static long evdev_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                                         return copy_to_user(p, dev->snd, len) ? -EFAULT : len;
                                 }
 
+                                if (_IOC_NR(cmd) == _IOC_NR(EVIOCGSW(0))) {
+                                        int len;
+                                        len = NBITS(SW_MAX) * sizeof(long);
+                                        if (len > _IOC_SIZE(cmd)) len = _IOC_SIZE(cmd);
+                                        return copy_to_user(p, dev->sw, len) ? -EFAULT : len;
+                                }
+
                                 if (_IOC_NR(cmd) == _IOC_NR(EVIOCGNAME(0))) {
                                         int len;
                                         if (!dev->name) return -ENOENT;
diff --git a/drivers/input/gameport/emu10k1-gp.c b/drivers/input/gameport/emu10k1-gp.c
index a0118038330..462f8d300aa 100644
--- a/drivers/input/gameport/emu10k1-gp.c
+++ b/drivers/input/gameport/emu10k1-gp.c
@@ -75,7 +75,7 @@ static int __devinit emu_probe(struct pci_dev *pdev, const struct pci_device_id
         if (!request_region(ioport, iolen, "emu10k1-gp"))
                 return -EBUSY;
 
-        emu = kcalloc(1, sizeof(struct emu), GFP_KERNEL);
+        emu = kzalloc(sizeof(struct emu), GFP_KERNEL);
         port = gameport_allocate_port();
         if (!emu || !port) {
                 printk(KERN_ERR "emu10k1-gp: Memory allocation failed\n");
diff --git a/drivers/input/gameport/fm801-gp.c b/drivers/input/gameport/fm801-gp.c
index 57615bc6390..47e93daa0fa 100644
--- a/drivers/input/gameport/fm801-gp.c
+++ b/drivers/input/gameport/fm801-gp.c
@@ -83,7 +83,7 @@ static int __devinit fm801_gp_probe(struct pci_dev *pci, const struct pci_device
         struct fm801_gp *gp;
         struct gameport *port;
 
-        gp = kcalloc(1, sizeof(struct fm801_gp), GFP_KERNEL);
+        gp = kzalloc(sizeof(struct fm801_gp), GFP_KERNEL);
         port = gameport_allocate_port();
         if (!gp || !port) {
                 printk(KERN_ERR "fm801-gp: Memory allocation failed\n");
diff --git a/drivers/input/gameport/ns558.c b/drivers/input/gameport/ns558.c
index 70f051894a3..d2e55dc956b 100644
--- a/drivers/input/gameport/ns558.c
+++ b/drivers/input/gameport/ns558.c
@@ -142,7 +142,7 @@ static int ns558_isa_probe(int io)
                         return -EBUSY;
         }
 
-        ns558 = kcalloc(1, sizeof(struct ns558), GFP_KERNEL);
+        ns558 = kzalloc(sizeof(struct ns558), GFP_KERNEL);
         port = gameport_allocate_port();
         if (!ns558 || !port) {
                 printk(KERN_ERR "ns558: Memory allocation failed.\n");
@@ -215,7 +215,7 @@ static int ns558_pnp_probe(struct pnp_dev *dev, const struct pnp_device_id *did)
         if (!request_region(ioport, iolen, "ns558-pnp"))
                 return -EBUSY;
 
-        ns558 = kcalloc(1, sizeof(struct ns558), GFP_KERNEL);
+        ns558 = kzalloc(sizeof(struct ns558), GFP_KERNEL);
         port = gameport_allocate_port();
         if (!ns558 || !port) {
                 printk(KERN_ERR "ns558: Memory allocation failed\n");
diff --git a/drivers/input/input.c b/drivers/input/input.c
index a275211c8e1..88636a20452 100644
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -89,6 +89,15 @@ void input_event(struct input_dev *dev, unsigned int type, unsigned int code, in
 
                         break;
 
+                case EV_SW:
+
+                        if (code > SW_MAX || !test_bit(code, dev->swbit) || !!test_bit(code, dev->sw) == value)
+                                return;
+
+                        change_bit(code, dev->sw);
+
+                        break;
+
                 case EV_ABS:
 
                         if (code > ABS_MAX || !test_bit(code, dev->absbit))
@@ -402,6 +411,7 @@ static void input_call_hotplug(char *verb, struct input_dev *dev)
         SPRINTF_BIT_A2(ledbit, "LED=", LED_MAX, EV_LED);
         SPRINTF_BIT_A2(sndbit, "SND=", SND_MAX, EV_SND);
         SPRINTF_BIT_A2(ffbit,  "FF=",  FF_MAX, EV_FF);
+        SPRINTF_BIT_A2(swbit,  "SW=",  SW_MAX, EV_SW);
 
         envp[i++] = NULL;
 
@@ -490,6 +500,7 @@ static int input_devices_read(char *buf, char **start, off_t pos, int count, int
                 SPRINTF_BIT_B2(ledbit, "LED=", LED_MAX, EV_LED);
                 SPRINTF_BIT_B2(sndbit, "SND=", SND_MAX, EV_SND);
                 SPRINTF_BIT_B2(ffbit,  "FF=",  FF_MAX, EV_FF);
+                SPRINTF_BIT_B2(swbit,  "SW=",  SW_MAX, EV_SW);
 
                 len += sprintf(buf + len, "\n");
 
diff --git a/drivers/input/joystick/a3d.c b/drivers/input/joystick/a3d.c
index bf34f75b946..bf65430181f 100644
--- a/drivers/input/joystick/a3d.c
+++ b/drivers/input/joystick/a3d.c
@@ -269,7 +269,7 @@ static int a3d_connect(struct gameport *gameport, struct gameport_driver *drv)
         int i;
         int err;
 
-        if (!(a3d = kcalloc(1, sizeof(struct a3d), GFP_KERNEL)))
+        if (!(a3d = kzalloc(sizeof(struct a3d), GFP_KERNEL)))
                 return -ENOMEM;
 
         a3d->gameport = gameport;
diff --git a/drivers/input/joystick/adi.c b/drivers/input/joystick/adi.c
index 265962956c6..cf35ae638a0 100644
--- a/drivers/input/joystick/adi.c
+++ b/drivers/input/joystick/adi.c
@@ -469,7 +469,7 @@ static int adi_connect(struct gameport *gameport, struct gameport_driver *drv)
         int i;
         int err;
 
-        if (!(port = kcalloc(1, sizeof(struct adi_port), GFP_KERNEL)))
+        if (!(port = kzalloc(sizeof(struct adi_port), GFP_KERNEL)))
                 return -ENOMEM;
 
         port->gameport = gameport;
diff --git a/drivers/input/joystick/analog.c b/drivers/input/joystick/analog.c
index c3a5739030c..64b1313a3c6 100644
--- a/drivers/input/joystick/analog.c
+++ b/drivers/input/joystick/analog.c
@@ -655,7 +655,7 @@ static int analog_connect(struct gameport *gameport, struct gameport_driver *drv
         int i;
         int err;
 
-        if (!(port = kcalloc(1, sizeof(struct analog_port), GFP_KERNEL)))
+        if (!(port = kzalloc(sizeof(struct analog_port), GFP_KERNEL)))
                 return - ENOMEM;
 
         err = analog_init_port(gameport, drv, port);
diff --git a/drivers/input/joystick/cobra.c b/drivers/input/joystick/cobra.c
index a6002205328..0b2e9fa2657 100644
--- a/drivers/input/joystick/cobra.c
+++ b/drivers/input/joystick/cobra.c
@@ -163,7 +163,7 @@ static int cobra_connect(struct gameport *gameport, struct gameport_driver *drv)
         int i, j;
         int err;
 
-        if (!(cobra = kcalloc(1, sizeof(struct cobra), GFP_KERNEL)))
+        if (!(cobra = kzalloc(sizeof(struct cobra), GFP_KERNEL)))
                 return -ENOMEM;
 
         cobra->gameport = gameport;
diff --git a/drivers/input/joystick/db9.c b/drivers/input/joystick/db9.c
index fbd3eed07f9..2a3e4bb2da5 100644
--- a/drivers/input/joystick/db9.c
+++ b/drivers/input/joystick/db9.c
@@ -572,7 +572,7 @@ static struct db9 __init *db9_probe(int *config, int nargs)
                 }
         }
 
-        if (!(db9 = kcalloc(1, sizeof(struct db9), GFP_KERNEL))) {
+        if (!(db9 = kzalloc(sizeof(struct db9), GFP_KERNEL))) {
                 parport_put_port(pp);
                 return NULL;
         }
diff --git a/drivers/input/joystick/gamecon.c b/drivers/input/joystick/gamecon.c
index 95bbdd302aa..5427bf9fc86 100644
--- a/drivers/input/joystick/gamecon.c
+++ b/drivers/input/joystick/gamecon.c
@@ -554,7 +554,7 @@ static struct gc __init *gc_probe(int *config, int nargs)
                 return NULL;
         }
 
-        if (!(gc = kcalloc(1, sizeof(struct gc), GFP_KERNEL))) {
+        if (!(gc = kzalloc(sizeof(struct gc), GFP_KERNEL))) {
                 parport_put_port(pp);
                 return NULL;
         }
diff --git a/drivers/input/joystick/gf2k.c b/drivers/input/joystick/gf2k.c
index 7d969420066..8e4f92b115e 100644
--- a/drivers/input/joystick/gf2k.c
+++ b/drivers/input/joystick/gf2k.c
@@ -242,7 +242,7 @@ static int gf2k_connect(struct gameport *gameport, struct gameport_driver *drv)
         unsigned char data[GF2K_LENGTH];
         int i, err;
 
-        if (!(gf2k = kcalloc(1, sizeof(struct gf2k), GFP_KERNEL)))
+        if (!(gf2k = kzalloc(sizeof(struct gf2k), GFP_KERNEL)))
                 return -ENOMEM;
 
         gf2k->gameport = gameport;
diff --git a/drivers/input/joystick/grip.c b/drivers/input/joystick/grip.c
index d1500d2562d..9d3f910dd56 100644
--- a/drivers/input/joystick/grip.c
+++ b/drivers/input/joystick/grip.c
@@ -301,7 +301,7 @@ static int grip_connect(struct gameport *gameport, struct gameport_driver *drv)
         int i, j, t;
         int err;
 
-        if (!(grip = kcalloc(1, sizeof(struct grip), GFP_KERNEL)))
+        if (!(grip = kzalloc(sizeof(struct grip), GFP_KERNEL)))
                 return -ENOMEM;
 
         grip->gameport = gameport;
diff --git a/drivers/input/joystick/grip_mp.c b/drivers/input/joystick/grip_mp.c
index 0da7bd133cc..da17eee6f57 100644
--- a/drivers/input/joystick/grip_mp.c
+++ b/drivers/input/joystick/grip_mp.c
@@ -607,7 +607,7 @@ static int grip_connect(struct gameport *gameport, struct gameport_driver *drv)
         struct grip_mp *grip;
         int err;
 
-        if (!(grip = kcalloc(1, sizeof(struct grip_mp), GFP_KERNEL)))
+        if (!(grip = kzalloc(sizeof(struct grip_mp), GFP_KERNEL)))
                 return -ENOMEM;
 
         grip->gameport = gameport;
diff --git a/drivers/input/joystick/guillemot.c b/drivers/input/joystick/guillemot.c
index f93da7bc082..6a70ec429f0 100644
--- a/drivers/input/joystick/guillemot.c
+++ b/drivers/input/joystick/guillemot.c
@@ -183,7 +183,7 @@ static int guillemot_connect(struct gameport *gameport, struct gameport_driver *
         int i, t;
         int err;
 
-        if (!(guillemot = kcalloc(1, sizeof(struct guillemot), GFP_KERNEL)))
+        if (!(guillemot = kzalloc(sizeof(struct guillemot), GFP_KERNEL)))
                 return -ENOMEM;
 
         guillemot->gameport = gameport;
diff --git a/drivers/input/joystick/interact.c b/drivers/input/joystick/interact.c
index 9d3f8c38cb0..d7b3472bd68 100644
--- a/drivers/input/joystick/interact.c
+++ b/drivers/input/joystick/interact.c
@@ -212,7 +212,7 @@ static int interact_connect(struct gameport *gameport, struct gameport_driver *d
         int i, t;
         int err;
 
-        if (!(interact = kcalloc(1, sizeof(struct interact), GFP_KERNEL)))
+        if (!(interact = kzalloc(sizeof(struct interact), GFP_KERNEL)))
                 return -ENOMEM;
 
         interact->gameport = gameport;
diff --git a/drivers/input/joystick/sidewinder.c b/drivers/input/joystick/sidewinder.c
index 47144a7ed9e..9e0353721a3 100644
--- a/drivers/input/joystick/sidewinder.c
+++ b/drivers/input/joystick/sidewinder.c
@@ -590,7 +590,7 @@ static int sw_connect(struct gameport *gameport, struct gameport_driver *drv)
 
         comment[0] = 0;
 
-        sw = kcalloc(1, sizeof(struct sw), GFP_KERNEL);
+        sw = kzalloc(sizeof(struct sw), GFP_KERNEL);
         buf = kmalloc(SW_LENGTH, GFP_KERNEL);
         idbuf = kmalloc(SW_LENGTH, GFP_KERNEL);
         if (!sw || !buf || !idbuf) {
diff --git a/drivers/input/joystick/tmdc.c b/drivers/input/joystick/tmdc.c
index 9eb9954cac6..7431efc4330 100644
--- a/drivers/input/joystick/tmdc.c
+++ b/drivers/input/joystick/tmdc.c
@@ -262,7 +262,7 @@ static int tmdc_connect(struct gameport *gameport, struct gameport_driver *drv)
         int i, j, k, l, m;
         int err;
 
-        if (!(tmdc = kcalloc(1, sizeof(struct tmdc), GFP_KERNEL)))
+        if (!(tmdc = kzalloc(sizeof(struct tmdc), GFP_KERNEL)))
                 return -ENOMEM;
 
         tmdc->gameport = gameport;
diff --git a/drivers/input/joystick/turbografx.c b/drivers/input/joystick/turbografx.c
index 28100d461cb..0c5b9c8297c 100644
--- a/drivers/input/joystick/turbografx.c
+++ b/drivers/input/joystick/turbografx.c
@@ -178,7 +178,7 @@ static struct tgfx __init *tgfx_probe(int *config, int nargs)
                 return NULL;
         }
 
-        if (!(tgfx = kcalloc(1, sizeof(struct tgfx), GFP_KERNEL))) {
+        if (!(tgfx = kzalloc(sizeof(struct tgfx), GFP_KERNEL))) {
                 parport_put_port(pp);
                 return NULL;
         }
diff --git a/drivers/input/keyboard/corgikbd.c b/drivers/input/keyboard/corgikbd.c
index a8551711e8d..cd4b6e79501 100644
--- a/drivers/input/keyboard/corgikbd.c
+++ b/drivers/input/keyboard/corgikbd.c
@@ -16,6 +16,7 @@
 #include <linux/init.h>
 #include <linux/input.h>
 #include <linux/interrupt.h>
+#include <linux/jiffies.h>
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <asm/irq.h>
@@ -32,7 +33,6 @@
 /* zero code, 124 scancodes + 3 hinge combinations */
 #define NR_SCANCODES            ( SCANCODE(KB_ROWS-1,KB_COLS-1) +1 +1 +3 )
 #define SCAN_INTERVAL           (HZ/10)
-#define CORGIKBD_PRESSED        1
 
 #define HINGE_SCAN_INTERVAL             (HZ/4)
 
@@ -73,25 +73,13 @@ struct corgikbd {
         struct input_dev input;
         char phys[32];
 
-        unsigned char state[ARRAY_SIZE(corgikbd_keycode)];
         spinlock_t lock;
-
         struct timer_list timer;
         struct timer_list htimer;
-};
 
-static void handle_scancode(unsigned int pressed,unsigned int scancode, struct corgikbd *corgikbd_data)
-{
-        if (pressed && !(corgikbd_data->state[scancode] & CORGIKBD_PRESSED)) {
-                corgikbd_data->state[scancode] |= CORGIKBD_PRESSED;
-                input_report_key(&corgikbd_data->input, corgikbd_data->keycode[scancode], 1);
-                if (corgikbd_data->keycode[scancode] == CORGI_KEY_OFF)
-                        input_event(&corgikbd_data->input, EV_PWR, CORGI_KEY_OFF, 1);
-        } else if (!pressed && corgikbd_data->state[scancode] & CORGIKBD_PRESSED) {
-                corgikbd_data->state[scancode] &= ~CORGIKBD_PRESSED;
-                input_report_key(&corgikbd_data->input, corgikbd_data->keycode[scancode], 0);
-        }
-}
+        unsigned int suspended;
+        unsigned long suspend_jiffies;
+};
 
 #define KB_DISCHARGE_DELAY      10
 #define KB_ACTIVATE_DELAY       10
@@ -105,36 +93,36 @@ static void handle_scancode(unsigned int pressed,unsigned int scancode, struct c
  */
 static inline void corgikbd_discharge_all(void)
 {
-        // STROBE All HiZ
+        /* STROBE All HiZ */
         GPCR2  = CORGI_GPIO_ALL_STROBE_BIT;
         GPDR2 &= ~CORGI_GPIO_ALL_STROBE_BIT;
 }
 
 static inline void corgikbd_activate_all(void)
 {
-        // STROBE ALL -> High
+        /* STROBE ALL -> High */
         GPSR2  = CORGI_GPIO_ALL_STROBE_BIT;
         GPDR2 |= CORGI_GPIO_ALL_STROBE_BIT;
 
         udelay(KB_DISCHARGE_DELAY);
 
-        // Clear any interrupts we may have triggered when altering the GPIO lines
+        /* Clear any interrupts we may have triggered when altering the GPIO lines */
         GEDR1 = CORGI_GPIO_HIGH_SENSE_BIT;
         GEDR2 = CORGI_GPIO_LOW_SENSE_BIT;
 }
 
 static inline void corgikbd_activate_col(int col)
 {
-        // STROBE col -> High, not col -> HiZ
+        /* STROBE col -> High, not col -> HiZ */
         GPSR2 = CORGI_GPIO_STROBE_BIT(col);
         GPDR2 = (GPDR2 & ~CORGI_GPIO_ALL_STROBE_BIT) | CORGI_GPIO_STROBE_BIT(col);
 }
 
 static inline void corgikbd_reset_col(int col)
 {
-        // STROBE col -> Low
+        /* STROBE col -> Low */
         GPCR2 = CORGI_GPIO_STROBE_BIT(col);
-        // STROBE col -> out, not col -> HiZ
+        /* STROBE col -> out, not col -> HiZ */
         GPDR2 = (GPDR2 & ~CORGI_GPIO_ALL_STROBE_BIT) | CORGI_GPIO_STROBE_BIT(col);
 }
 
@@ -149,10 +137,13 @@ static inline void corgikbd_reset_col(int col)
 /* Scan the hardware keyboard and push any changes up through the input layer */
 static void corgikbd_scankeyboard(struct corgikbd *corgikbd_data, struct pt_regs *regs)
 {
-        unsigned int row, col, rowd, scancode;
+        unsigned int row, col, rowd;
         unsigned long flags;
         unsigned int num_pressed;
 
+        if (corgikbd_data->suspended)
+                return;
+
         spin_lock_irqsave(&corgikbd_data->lock, flags);
 
         if (regs)
@@ -173,10 +164,21 @@ static void corgikbd_scankeyboard(struct corgikbd *corgikbd_data, struct pt_regs
 
                 rowd = GET_ROWS_STATUS(col);
                 for (row = 0; row < KB_ROWS; row++) {
+                        unsigned int scancode, pressed;
+
                         scancode = SCANCODE(row, col);
-                        handle_scancode((rowd & KB_ROWMASK(row)), scancode, corgikbd_data);
-                        if (rowd & KB_ROWMASK(row))
+                        pressed = rowd & KB_ROWMASK(row);
+
+                        input_report_key(&corgikbd_data->input, corgikbd_data->keycode[scancode], pressed);
+
+                        if (pressed)
                                 num_pressed++;
+
+                        if (pressed && (corgikbd_data->keycode[scancode] == CORGI_KEY_OFF)
+                                        && time_after(jiffies, corgikbd_data->suspend_jiffies + HZ)) {
+                                input_event(&corgikbd_data->input, EV_PWR, CORGI_KEY_OFF, 1);
+                                corgikbd_data->suspend_jiffies=jiffies;
+                        }
                 }
                 corgikbd_reset_col(col);
         }
@@ -221,8 +223,11 @@ static void corgikbd_timer_callback(unsigned long data)
  * The hinge switches generate no interrupt so they need to be
  * monitored by a timer.
  *
- * When we detect changes, we debounce it and then pass the three
- * positions the system can take as keypresses to the input system.
+ * We debounce the switches and pass them to the input system.
+ *
+ *  gprr == 0x00 - Keyboard with Landscape Screen
+ *          0x08 - No Keyboard with Portrait Screen
+ *          0x0c - Keyboard and Screen Closed
  */
 
 #define HINGE_STABLE_COUNT 2
@@ -235,7 +240,7 @@ static void corgikbd_hinge_timer(unsigned long data)
         unsigned long gprr;
         unsigned long flags;
 
-        gprr = read_scoop_reg(SCOOP_GPRR) & (CORGI_SCP_SWA | CORGI_SCP_SWB);
+        gprr = read_scoop_reg(&corgiscoop_device.dev, SCOOP_GPRR) & (CORGI_SCP_SWA | CORGI_SCP_SWB);
         if (gprr != sharpsl_hinge_state) {
                 hinge_count = 0;
                 sharpsl_hinge_state = gprr;
@@ -244,9 +249,8 @@ static void corgikbd_hinge_timer(unsigned long data)
                 if (hinge_count >= HINGE_STABLE_COUNT) {
                         spin_lock_irqsave(&corgikbd_data->lock, flags);
 
-                        handle_scancode((sharpsl_hinge_state == 0x00), 125, corgikbd_data); /* Keyboard with Landscape Screen */
-                        handle_scancode((sharpsl_hinge_state == 0x08), 126, corgikbd_data); /* No Keyboard with Portrait Screen */
-                        handle_scancode((sharpsl_hinge_state == 0x0c), 127, corgikbd_data); /* Keyboard and Screen Closed  */
+                        input_report_switch(&corgikbd_data->input, SW_0, ((sharpsl_hinge_state & CORGI_SCP_SWA) != 0));
+                        input_report_switch(&corgikbd_data->input, SW_1, ((sharpsl_hinge_state & CORGI_SCP_SWB) != 0));
                         input_sync(&corgikbd_data->input);
 
                         spin_unlock_irqrestore(&corgikbd_data->lock, flags);
@@ -255,19 +259,45 @@ static void corgikbd_hinge_timer(unsigned long data)
         mod_timer(&corgikbd_data->htimer, jiffies + HINGE_SCAN_INTERVAL);
 }
 
+#ifdef CONFIG_PM
+static int corgikbd_suspend(struct device *dev, pm_message_t state, uint32_t level)
+{
+        if (level == SUSPEND_POWER_DOWN) {
+                struct corgikbd *corgikbd = dev_get_drvdata(dev);
+                corgikbd->suspended = 1;
+        }
+        return 0;
+}
+
+static int corgikbd_resume(struct device *dev, uint32_t level)
+{
+        if (level == RESUME_POWER_ON) {
+                struct corgikbd *corgikbd = dev_get_drvdata(dev);
+
+                /* Upon resume, ignore the suspend key for a short while */
+                corgikbd->suspend_jiffies=jiffies;
+                corgikbd->suspended = 0;
+        }
+        return 0;
+}
+#else
+#define corgikbd_suspend        NULL
+#define corgikbd_resume         NULL
+#endif
+
 static int __init corgikbd_probe(struct device *dev)
 {
         int i;
         struct corgikbd *corgikbd;
 
-        corgikbd = kcalloc(1, sizeof(struct corgikbd), GFP_KERNEL);
+        corgikbd = kzalloc(sizeof(struct corgikbd), GFP_KERNEL);
         if (!corgikbd)
                 return -ENOMEM;
 
         dev_set_drvdata(dev,corgikbd);
         strcpy(corgikbd->phys, "corgikbd/input0");
 
-        spin_lock_init(corgikbd->lock);
+        spin_lock_init(&corgikbd->lock);
 
         /* Init Keyboard rescan timer */
         init_timer(&corgikbd->timer);
@@ -279,6 +309,8 @@ static int __init corgikbd_probe(struct device *dev)
         corgikbd->htimer.function = corgikbd_hinge_timer;
         corgikbd->htimer.data = (unsigned long) corgikbd;
 
+        corgikbd->suspend_jiffies=jiffies;
+
         init_input_dev(&corgikbd->input);
         corgikbd->input.private = corgikbd;
         corgikbd->input.name = "Corgi Keyboard";
@@ -288,7 +320,7 @@ static int __init corgikbd_probe(struct device *dev)
         corgikbd->input.id.vendor = 0x0001;
         corgikbd->input.id.product = 0x0001;
         corgikbd->input.id.version = 0x0100;
-        corgikbd->input.evbit[0] = BIT(EV_KEY) | BIT(EV_REP) | BIT(EV_PWR);
+        corgikbd->input.evbit[0] = BIT(EV_KEY) | BIT(EV_REP) | BIT(EV_PWR) | BIT(EV_SW);
         corgikbd->input.keycode = corgikbd->keycode;
         corgikbd->input.keycodesize = sizeof(unsigned char);
         corgikbd->input.keycodemax = ARRAY_SIZE(corgikbd_keycode);
@@ -297,6 +329,8 @@ static int __init corgikbd_probe(struct device *dev)
         for (i = 0; i < ARRAY_SIZE(corgikbd_keycode); i++)
                 set_bit(corgikbd->keycode[i], corgikbd->input.keybit);
         clear_bit(0, corgikbd->input.keybit);
+        set_bit(SW_0, corgikbd->input.swbit);
+        set_bit(SW_1, corgikbd->input.swbit);
 
         input_register_device(&corgikbd->input);
         mod_timer(&corgikbd->htimer, jiffies + HINGE_SCAN_INTERVAL);
@@ -343,6 +377,8 @@ static struct device_driver corgikbd_driver = {
         .bus            = &platform_bus_type,
         .probe          = corgikbd_probe,
         .remove         = corgikbd_remove,
+        .suspend        = corgikbd_suspend,
+        .resume         = corgikbd_resume,
 };
 
 static int __devinit corgikbd_init(void)
diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c
index 2bb2fe78bdc..12bdd3eff92 100644
--- a/drivers/input/mouse/psmouse-base.c
+++ b/drivers/input/mouse/psmouse-base.c
@@ -883,7 +883,7 @@ static int psmouse_connect(struct serio *serio, struct serio_driver *drv)
                 psmouse_deactivate(parent);
         }
 
-        if (!(psmouse = kcalloc(1, sizeof(struct psmouse), GFP_KERNEL))) {
+        if (!(psmouse = kzalloc(sizeof(struct psmouse), GFP_KERNEL))) {
                 retval = -ENOMEM;
                 goto out;
         }
diff --git a/drivers/input/serio/serport.c b/drivers/input/serio/serport.c
index 79ca3846915..1bd88fca054 100644
--- a/drivers/input/serio/serport.c
+++ b/drivers/input/serio/serport.c
@@ -87,7 +87,7 @@ static int serport_ldisc_open(struct tty_struct *tty)
         if (!capable(CAP_SYS_ADMIN))
                 return -EPERM;
 
-        serport = kcalloc(1, sizeof(struct serport), GFP_KERNEL);
+        serport = kzalloc(sizeof(struct serport), GFP_KERNEL);
         if (!serport)
                 return -ENOMEM;
 
@@ -165,7 +165,7 @@ static ssize_t serport_ldisc_read(struct tty_struct * tty, struct file * file, u
         if (test_and_set_bit(SERPORT_BUSY, &serport->flags))
                 return -EBUSY;
 
-        serport->serio = serio = kcalloc(1, sizeof(struct serio), GFP_KERNEL);
+        serport->serio = serio = kzalloc(sizeof(struct serio), GFP_KERNEL);
         if (!serio)
                 return -ENOMEM;
 
diff --git a/drivers/input/touchscreen/corgi_ts.c b/drivers/input/touchscreen/corgi_ts.c
index 3f8b61cfbc3..5d19261b884 100644
--- a/drivers/input/touchscreen/corgi_ts.c
+++ b/drivers/input/touchscreen/corgi_ts.c
@@ -53,11 +53,8 @@ struct corgi_ts {
 
 #define SyncHS()        while((STATUS_HSYNC) == 0); while((STATUS_HSYNC) != 0);
 #define CCNT(a)         asm volatile ("mrc p14, 0, %0, C1, C0, 0" : "=r"(a))
-#define CCNT_ON()       {int pmnc = 1; asm volatile ("mcr p14, 0, %0, C0, C0, 0" : : "r"(pmnc));}
-#define CCNT_OFF()      {int pmnc = 0; asm volatile ("mcr p14, 0, %0, C0, C0, 0" : : "r"(pmnc));}
-
-#define WAIT_HS_400_VGA         7013U   // 17.615us
-#define WAIT_HS_400_QVGA        16622U  // 41.750us
+#define PMNC_GET(x)     asm volatile ("mrc p14, 0, %0, C0, C0, 0" : "=r"(x))
+#define PMNC_SET(x)     asm volatile ("mcr p14, 0, %0, C0, C0, 0" : : "r"(x))
 
 
 /* ADS7846 Touch Screen Controller bit definitions */
@@ -69,41 +66,29 @@ struct corgi_ts {
 #define ADSCTRL_STS             (1u << 7)       /* Start Bit */
 
 /* External Functions */
-extern int w100fb_get_xres(void);
-extern int w100fb_get_blanking(void);
-extern int w100fb_get_fastsysclk(void);
+extern unsigned long w100fb_get_hsynclen(struct device *dev);
 extern unsigned int get_clk_frequency_khz(int info);
 
 static unsigned long calc_waittime(void)
 {
-        int w100fb_xres = w100fb_get_xres();
-        unsigned int waittime = 0;
-
-        if (w100fb_xres == 480 || w100fb_xres == 640) {
-                waittime = WAIT_HS_400_VGA * get_clk_frequency_khz(0) / 398131U;
-
-                if (w100fb_get_fastsysclk() == 100)
-                        waittime = waittime * 75 / 100;
-
-                if (w100fb_xres == 640)
-                        waittime *= 3;
+        unsigned long hsync_len = w100fb_get_hsynclen(&corgifb_device.dev);
 
-                return waittime;
-        }
-
-        return WAIT_HS_400_QVGA * get_clk_frequency_khz(0) / 398131U;
+        if (hsync_len)
+                return get_clk_frequency_khz(0)*1000/hsync_len;
+        else
+                return 0;
 }
 
 static int sync_receive_data_send_cmd(int doRecive, int doSend, unsigned int address, unsigned long wait_time)
 {
+        unsigned long timer1 = 0, timer2, pmnc = 0;
         int pos = 0;
-        unsigned long timer1 = 0, timer2;
-        int dosleep;
 
-        dosleep = !w100fb_get_blanking();
+        if (wait_time && doSend) {
+                PMNC_GET(pmnc);
+                if (!(pmnc & 0x01))
+                        PMNC_SET(0x01);
 
-        if (dosleep && doSend) {
-                CCNT_ON();
                 /* polling HSync */
                 SyncHS();
                 /* get CCNT */
@@ -119,11 +104,11 @@ static int sync_receive_data_send_cmd(int doRecive, int doSend, unsigned int add
                 corgi_ssp_ads7846_put(cmd);
                 corgi_ssp_ads7846_get();
 
-                if (dosleep) {
+                if (wait_time) {
                         /* Wait after HSync */
                         CCNT(timer2);
                         if (timer2-timer1 > wait_time) {
-                                /* timeout */
+                                /* too slow - timeout, try again */
                                 SyncHS();
                                 /* get OSCR */
                                 CCNT(timer1);
@@ -134,8 +119,8 @@ static int sync_receive_data_send_cmd(int doRecive, int doSend, unsigned int add
                                 CCNT(timer2);
                 }
                 corgi_ssp_ads7846_put(cmd);
-                if (dosleep)
-                        CCNT_OFF();
+                if (wait_time && !(pmnc & 0x01))
+                        PMNC_SET(pmnc);
         }
         return pos;
 }
@@ -244,7 +229,7 @@ static irqreturn_t ts_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 }
 
 #ifdef CONFIG_PM
-static int corgits_suspend(struct device *dev, uint32_t state, uint32_t level)
+static int corgits_suspend(struct device *dev, pm_message_t state, uint32_t level)
 {
         if (level == SUSPEND_POWER_DOWN) {
                 struct corgi_ts *corgi_ts = dev_get_drvdata(dev);
diff --git a/drivers/isdn/hisax/hisax.h b/drivers/isdn/hisax/hisax.h
index 17cf7663c58..26c545fa223 100644
--- a/drivers/isdn/hisax/hisax.h
+++ b/drivers/isdn/hisax/hisax.h
@@ -10,7 +10,6 @@
 #include <linux/errno.h>
 #include <linux/fs.h>
 #include <linux/major.h>
-#include <asm/segment.h>
 #include <asm/io.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
@@ -1242,6 +1241,8 @@ struct IsdnCardState {
 
 #ifdef CONFIG_HISAX_ENTERNOW_PCI
 #define CARD_FN_ENTERNOW_PCI 1
+#else
+#define CARD_FN_ENTERNOW_PCI 0
 #endif
 
 #define TEI_PER_CARD 1
diff --git a/drivers/isdn/i4l/isdn_v110.c b/drivers/isdn/i4l/isdn_v110.c
index f47f2b9846d..38619e8cd82 100644
--- a/drivers/isdn/i4l/isdn_v110.c
+++ b/drivers/isdn/i4l/isdn_v110.c
@@ -516,11 +516,11 @@ buffer_full:
 }
 
 int
-isdn_v110_stat_callback(int idx, isdn_ctrl * c)
+isdn_v110_stat_callback(int idx, isdn_ctrl *c)
 {
         isdn_v110_stream *v = NULL;
         int i;
-        int ret;
+        int ret = 0;
 
         if (idx < 0)
                 return 0;
diff --git a/drivers/macintosh/mediabay.c b/drivers/macintosh/mediabay.c
index 7c16c25fc5d..c0712a1ea5a 100644
--- a/drivers/macintosh/mediabay.c
+++ b/drivers/macintosh/mediabay.c
@@ -708,7 +708,7 @@ static int __pmac media_bay_suspend(struct macio_dev *mdev, pm_message_t state)
 {
         struct media_bay_info   *bay = macio_get_drvdata(mdev);
 
-        if (state != mdev->ofdev.dev.power.power_state && state == PM_SUSPEND_MEM) {
+        if (state.event != mdev->ofdev.dev.power.power_state.event && state.event == PM_EVENT_SUSPEND) {
                 down(&bay->lock);
                 bay->sleeping = 1;
                 set_mb_power(bay, 0);
@@ -723,8 +723,8 @@ static int __pmac media_bay_resume(struct macio_dev *mdev)
 {
         struct media_bay_info   *bay = macio_get_drvdata(mdev);
 
-        if (mdev->ofdev.dev.power.power_state != 0) {
-                mdev->ofdev.dev.power.power_state = 0;
+        if (mdev->ofdev.dev.power.power_state.event != PM_EVENT_ON) {
+                mdev->ofdev.dev.power.power_state = PMSG_ON;
 
                 /* We re-enable the bay using it's previous content
                    only if it did not change. Note those bozo timings,
diff --git a/drivers/macintosh/via-pmu.c b/drivers/macintosh/via-pmu.c
index 4a0a0ad2d03..645a2e5c70a 100644
--- a/drivers/macintosh/via-pmu.c
+++ b/drivers/macintosh/via-pmu.c
@@ -3065,7 +3065,7 @@ static int pmu_sys_suspended = 0;
 
 static int pmu_sys_suspend(struct sys_device *sysdev, pm_message_t state)
 {
-        if (state != PM_SUSPEND_DISK || pmu_sys_suspended)
+        if (state.event != PM_EVENT_SUSPEND || pmu_sys_suspended)
                 return 0;
 
         /* Suspend PMU event interrupts */
diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c
index d0a4bab220e..b82bc315047 100644
--- a/drivers/md/dm-crypt.c
+++ b/drivers/md/dm-crypt.c
@@ -144,7 +144,7 @@ static int crypt_iv_essiv_ctr(struct crypt_config *cc, struct dm_target *ti,
         }
 
         /* Hash the cipher key with the given hash algorithm */
-        hash_tfm = crypto_alloc_tfm(opts, 0);
+        hash_tfm = crypto_alloc_tfm(opts, CRYPTO_TFM_REQ_MAY_SLEEP);
         if (hash_tfm == NULL) {
                 ti->error = PFX "Error initializing ESSIV hash";
                 return -EINVAL;
@@ -172,7 +172,8 @@ static int crypt_iv_essiv_ctr(struct crypt_config *cc, struct dm_target *ti,
 
         /* Setup the essiv_tfm with the given salt */
         essiv_tfm = crypto_alloc_tfm(crypto_tfm_alg_name(cc->tfm),
-                                     CRYPTO_TFM_MODE_ECB);
+                                     CRYPTO_TFM_MODE_ECB |
+                                     CRYPTO_TFM_REQ_MAY_SLEEP);
         if (essiv_tfm == NULL) {
                 ti->error = PFX "Error allocating crypto tfm for ESSIV";
                 kfree(salt);
@@ -587,7 +588,7 @@ static int crypt_ctr(struct dm_target *ti, unsigned int argc, char **argv)
                 goto bad1;
         }
 
-        tfm = crypto_alloc_tfm(cipher, crypto_flags);
+        tfm = crypto_alloc_tfm(cipher, crypto_flags | CRYPTO_TFM_REQ_MAY_SLEEP);
         if (!tfm) {
                 ti->error = PFX "Error allocating crypto tfm";
                 goto bad1;
diff --git a/drivers/md/dm-io.c b/drivers/md/dm-io.c
index 45754bb6a79..9de000131a8 100644
--- a/drivers/md/dm-io.c
+++ b/drivers/md/dm-io.c
@@ -239,6 +239,11 @@ static void vm_dp_init(struct dpages *dp, void *data)
         dp->context_ptr = data;
 }
 
+static void dm_bio_destructor(struct bio *bio)
+{
+        bio_free(bio, _bios);
+}
+
 /*-----------------------------------------------------------------
  * IO routines that accept a list of pages.
  *---------------------------------------------------------------*/
@@ -263,6 +268,7 @@ static void do_region(int rw, unsigned int region, struct io_region *where,
                 bio->bi_bdev = where->bdev;
                 bio->bi_end_io = endio;
                 bio->bi_private = io;
+                bio->bi_destructor = dm_bio_destructor;
                 bio_set_region(bio, region);
 
                 /*
diff --git a/drivers/md/dm.c b/drivers/md/dm.c
index d487d9deb98..930b9fc2795 100644
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@ -399,6 +399,11 @@ struct clone_info {
         unsigned short idx;
 };
 
+static void dm_bio_destructor(struct bio *bio)
+{
+        bio_free(bio, dm_set);
+}
+
 /*
  * Creates a little bio that is just does part of a bvec.
  */
@@ -410,6 +415,7 @@ static struct bio *split_bvec(struct bio *bio, sector_t sector,
         struct bio_vec *bv = bio->bi_io_vec + idx;
 
         clone = bio_alloc_bioset(GFP_NOIO, 1, dm_set);
+        clone->bi_destructor = dm_bio_destructor;
         *clone->bi_io_vec = *bv;
 
         clone->bi_sector = sector;
diff --git a/drivers/media/common/saa7146_i2c.c b/drivers/media/common/saa7146_i2c.c
index 781f23f0cbc..6284894505c 100644
--- a/drivers/media/common/saa7146_i2c.c
+++ b/drivers/media/common/saa7146_i2c.c
@@ -387,8 +387,6 @@ static int saa7146_i2c_xfer(struct i2c_adapter* adapter, struct i2c_msg *msg, in
 
 /* exported algorithm data */
 static struct i2c_algorithm saa7146_algo = {
-        .name           = "saa7146 i2c algorithm",
-        .id             = I2C_ALGO_SAA7146,
         .master_xfer    = saa7146_i2c_xfer,
         .functionality  = saa7146_i2c_func,
 };
@@ -412,7 +410,7 @@ int saa7146_i2c_adapter_prepare(struct saa7146_dev *dev, struct i2c_adapter *i2c
 #endif
                 i2c_adapter->algo          = &saa7146_algo;
                 i2c_adapter->algo_data     = NULL;
-                i2c_adapter->id            = I2C_ALGO_SAA7146;
+                i2c_adapter->id            = I2C_HW_SAA7146;
                 i2c_adapter->timeout = SAA7146_I2C_TIMEOUT;
                 i2c_adapter->retries = SAA7146_I2C_RETRIES;
         }
diff --git a/drivers/media/dvb/b2c2/flexcop-i2c.c b/drivers/media/dvb/b2c2/flexcop-i2c.c
index be4266d4ae9..56495cb6cd0 100644
--- a/drivers/media/dvb/b2c2/flexcop-i2c.c
+++ b/drivers/media/dvb/b2c2/flexcop-i2c.c
@@ -172,8 +172,6 @@ static u32 flexcop_i2c_func(struct i2c_adapter *adapter)
 }
 
 static struct i2c_algorithm flexcop_algo = {
-        .name                   = "FlexCop I2C algorithm",
-        .id                             = I2C_ALGO_BIT,
         .master_xfer    = flexcop_master_xfer,
         .functionality  = flexcop_i2c_func,
 };
@@ -192,7 +190,6 @@ int flexcop_i2c_init(struct flexcop_device *fc)
         fc->i2c_adap.class          = I2C_CLASS_TV_DIGITAL;
         fc->i2c_adap.algo       = &flexcop_algo;
         fc->i2c_adap.algo_data  = NULL;
-        fc->i2c_adap.id         = I2C_ALGO_BIT;
 
         if ((ret = i2c_add_adapter(&fc->i2c_adap)) < 0)
                 return ret;
diff --git a/drivers/media/dvb/bt8xx/Kconfig b/drivers/media/dvb/bt8xx/Kconfig
index b12545f093f..1e85d16491b 100644
--- a/drivers/media/dvb/bt8xx/Kconfig
+++ b/drivers/media/dvb/bt8xx/Kconfig
@@ -1,5 +1,5 @@
 config DVB_BT8XX
-        tristate "Nebula/Pinnacle PCTV/Twinhan PCI cards"
+        tristate "BT8xx based PCI cards"
         depends on DVB_CORE && PCI && VIDEO_BT848
         select DVB_MT352
         select DVB_SP887X
@@ -8,8 +8,8 @@ config DVB_BT8XX
         select DVB_OR51211
         help
           Support for PCI cards based on the Bt8xx PCI bridge. Examples are
-          the Nebula cards, the Pinnacle PCTV cards, the Twinhan DST cards and
-          pcHDTV HD2000 cards.
+          the Nebula cards, the Pinnacle PCTV cards, the Twinhan DST cards,
+          the pcHDTV HD2000 cards, and certain AVerMedia cards.
 
           Since these cards have no MPEG decoder onboard, they transmit
           only compressed MPEG data over the PCI bus, so you need
diff --git a/drivers/media/dvb/cinergyT2/cinergyT2.c b/drivers/media/dvb/cinergyT2/cinergyT2.c
index 7d8b3cad350..9ea5747b121 100644
--- a/drivers/media/dvb/cinergyT2/cinergyT2.c
+++ b/drivers/media/dvb/cinergyT2/cinergyT2.c
@@ -888,7 +888,7 @@ static int cinergyt2_suspend (struct usb_interface *intf, pm_message_t state)
         if (down_interruptible(&cinergyt2->sem))
                 return -ERESTARTSYS;
 
-        if (state > 0) {        /* state 0 seems to mean DEVICE_PM_ON */
+        if (state.event > PM_EVENT_ON) {
                 struct cinergyt2 *cinergyt2 = usb_get_intfdata (intf);
 #ifdef ENABLE_RC
                 cancel_delayed_work(&cinergyt2->rc_query_work);
diff --git a/drivers/media/dvb/dvb-usb/cxusb.c b/drivers/media/dvb/dvb-usb/cxusb.c
index c3e1b661aae..9e96a188f1e 100644
--- a/drivers/media/dvb/dvb-usb/cxusb.c
+++ b/drivers/media/dvb/dvb-usb/cxusb.c
@@ -141,8 +141,6 @@ static u32 cxusb_i2c_func(struct i2c_adapter *adapter)
 }
 
 static struct i2c_algorithm cxusb_i2c_algo = {
-        .name          = "Conexant USB I2C algorithm",
-        .id            = I2C_ALGO_BIT,
         .master_xfer   = cxusb_i2c_xfer,
         .functionality = cxusb_i2c_func,
 };
diff --git a/drivers/media/dvb/dvb-usb/dibusb-common.c b/drivers/media/dvb/dvb-usb/dibusb-common.c
index 9b9d6f8ee74..00b946419b4 100644
--- a/drivers/media/dvb/dvb-usb/dibusb-common.c
+++ b/drivers/media/dvb/dvb-usb/dibusb-common.c
@@ -156,8 +156,6 @@ static u32 dibusb_i2c_func(struct i2c_adapter *adapter)
 }
 
 struct i2c_algorithm dibusb_i2c_algo = {
-        .name          = "DiBcom USB I2C algorithm",
-        .id            = I2C_ALGO_BIT,
         .master_xfer   = dibusb_i2c_xfer,
         .functionality = dibusb_i2c_func,
 };
diff --git a/drivers/media/dvb/dvb-usb/digitv.c b/drivers/media/dvb/dvb-usb/digitv.c
index 9a676afc1d6..f70e0be0920 100644
--- a/drivers/media/dvb/dvb-usb/digitv.c
+++ b/drivers/media/dvb/dvb-usb/digitv.c
@@ -77,8 +77,6 @@ static u32 digitv_i2c_func(struct i2c_adapter *adapter)
 }
 
 static struct i2c_algorithm digitv_i2c_algo = {
-        .name          = "Nebula DigiTV USB I2C algorithm",
-        .id            = I2C_ALGO_BIT,
         .master_xfer   = digitv_i2c_xfer,
         .functionality = digitv_i2c_func,
 };
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c b/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c
index 9f0a8d90d14..da970947dfc 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c
@@ -27,7 +27,6 @@ int dvb_usb_i2c_init(struct dvb_usb_device *d)
 #endif
         d->i2c_adap.algo      = d->props.i2c_algo;
         d->i2c_adap.algo_data = NULL;
-        d->i2c_adap.id        = I2C_ALGO_BIT;
 
         i2c_set_adapdata(&d->i2c_adap, d);
 
diff --git a/drivers/media/dvb/frontends/lgdt330x.c b/drivers/media/dvb/frontends/lgdt330x.c
index 1f1cd7a8d50..7142b9c51dd 100644
--- a/drivers/media/dvb/frontends/lgdt330x.c
+++ b/drivers/media/dvb/frontends/lgdt330x.c
@@ -69,8 +69,8 @@ struct lgdt330x_state
 };
 
 static int i2c_write_demod_bytes (struct lgdt330x_state* state,
-                           u8 *buf, /* data bytes to send */
-                           int len  /* number of bytes to send */ )
+                                  u8 *buf, /* data bytes to send */
+                                  int len  /* number of bytes to send */ )
 {
         struct i2c_msg msg =
                 { .addr = state->config->demod_address,
@@ -129,13 +129,13 @@ static int lgdt3302_SwReset(struct lgdt330x_state* state)
         };
 
         ret = i2c_write_demod_bytes(state,
-                             reset, sizeof(reset));
+                                    reset, sizeof(reset));
         if (ret == 0) {
 
                 /* force reset high (inactive) and unmask interrupts */
                 reset[1] = 0x7f;
                 ret = i2c_write_demod_bytes(state,
-                                     reset, sizeof(reset));
+                                            reset, sizeof(reset));
         }
         return ret;
 }
@@ -149,13 +149,13 @@ static int lgdt3303_SwReset(struct lgdt330x_state* state)
         };
 
         ret = i2c_write_demod_bytes(state,
-                             reset, sizeof(reset));
+                                    reset, sizeof(reset));
         if (ret == 0) {
 
                 /* force reset high (inactive) */
                 reset[1] = 0x01;
                 ret = i2c_write_demod_bytes(state,
-                                     reset, sizeof(reset));
+                                            reset, sizeof(reset));
         }
         return ret;
 }
@@ -172,7 +172,6 @@ static int lgdt330x_SwReset(struct lgdt330x_state* state)
         }
 }
 
-
 static int lgdt330x_init(struct dvb_frontend* fe)
 {
         /* Hardware reset is done using gpio[0] of cx23880x chip.
@@ -229,13 +228,13 @@ static int lgdt330x_init(struct dvb_frontend* fe)
         case LGDT3302:
                 chip_name = "LGDT3302";
                 err = i2c_write_demod_bytes(state, lgdt3302_init_data,
-                                                                        sizeof(lgdt3302_init_data));
-                break;
+                                            sizeof(lgdt3302_init_data));
+                break;
         case LGDT3303:
                 chip_name = "LGDT3303";
                 err = i2c_write_demod_bytes(state, lgdt3303_init_data,
-                                                                        sizeof(lgdt3303_init_data));
-                break;
+                                            sizeof(lgdt3303_init_data));
+                break;
         default:
                 chip_name = "undefined";
                 printk (KERN_WARNING "Only LGDT3302 and LGDT3303 are supported chips.\n");
@@ -262,15 +261,15 @@ static int lgdt330x_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)
         switch (state->config->demod_chip) {
         case LGDT3302:
                 err = i2c_read_demod_bytes(state, LGDT3302_PACKET_ERR_COUNTER1,
-                                                                  buf, sizeof(buf));
-                break;
+                                           buf, sizeof(buf));
+                break;
         case LGDT3303:
                 err = i2c_read_demod_bytes(state, LGDT3303_PACKET_ERR_COUNTER1,
-                                                                  buf, sizeof(buf));
-                break;
+                                           buf, sizeof(buf));
+                break;
         default:
                 printk(KERN_WARNING
-                           "Only LGDT3302 and LGDT3303 are supported chips.\n");
+                       "Only LGDT3302 and LGDT3303 are supported chips.\n");
                 err = -ENODEV;
         }
 
@@ -330,7 +329,7 @@ static int lgdt330x_set_parameters(struct dvb_frontend* fe,
 
                         if (state->config->demod_chip == LGDT3303) {
                                 err = i2c_write_demod_bytes(state, lgdt3303_8vsb_44_data,
-                                                                                        sizeof(lgdt3303_8vsb_44_data));
+                                                            sizeof(lgdt3303_8vsb_44_data));
                         }
                         break;
 
@@ -378,18 +377,19 @@ static int lgdt330x_set_parameters(struct dvb_frontend* fe,
 
                 /* Select the requested mode */
                 i2c_write_demod_bytes(state, top_ctrl_cfg,
-                                                          sizeof(top_ctrl_cfg));
-                state->config->set_ts_params(fe, 0);
+                                      sizeof(top_ctrl_cfg));
+                if (state->config->set_ts_params)
+                        state->config->set_ts_params(fe, 0);
                 state->current_modulation = param->u.vsb.modulation;
         }
 
-        /* Change only if we are actually changing the channel */
-        if (state->current_frequency != param->frequency) {
-                /* Tune to the new frequency */
+        /* Tune to the specified frequency */
+        if (state->config->pll_set)
                 state->config->pll_set(fe, param);
-                /* Keep track of the new frequency */
-                state->current_frequency = param->frequency;
-        }
+
+        /* Keep track of the new frequency */
+        state->current_frequency = param->frequency;
+
         lgdt330x_SwReset(state);
         return 0;
 }
diff --git a/drivers/media/dvb/pluto2/pluto2.c b/drivers/media/dvb/pluto2/pluto2.c
index 706e0bcb5ed..85b437bbddc 100644
--- a/drivers/media/dvb/pluto2/pluto2.c
+++ b/drivers/media/dvb/pluto2/pluto2.c
@@ -633,7 +633,6 @@ static int __devinit pluto2_probe(struct pci_dev *pdev,
         i2c_set_adapdata(&pluto->i2c_adap, pluto);
         strcpy(pluto->i2c_adap.name, DRIVER_NAME);
         pluto->i2c_adap.owner = THIS_MODULE;
-        pluto->i2c_adap.id = I2C_ALGO_BIT;
         pluto->i2c_adap.class = I2C_CLASS_TV_DIGITAL;
         pluto->i2c_adap.dev.parent = &pdev->dev;
         pluto->i2c_adap.algo_data = &pluto->i2c_bit;
diff --git a/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c b/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
index aa43b5fcb8e..7daf7b1598a 100644
--- a/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
+++ b/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
@@ -1472,8 +1472,6 @@ static void frontend_init(struct ttusb* ttusb)
 
 
 static struct i2c_algorithm ttusb_dec_algo = {
-        .name           = "ttusb dec i2c algorithm",
-        .id             = I2C_ALGO_BIT,
         .master_xfer    = master_xfer,
         .functionality  = functionality,
 };
@@ -1525,7 +1523,6 @@ static int ttusb_probe(struct usb_interface *intf, const struct usb_device_id *i
 #endif
         ttusb->i2c_adap.algo              = &ttusb_dec_algo;
         ttusb->i2c_adap.algo_data         = NULL;
-        ttusb->i2c_adap.id                = I2C_ALGO_BIT;
 
         result = i2c_add_adapter(&ttusb->i2c_adap);
         if (result) {
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index 3f574239609..16c85c081e6 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -254,6 +254,7 @@ config VIDEO_SAA7134_DVB
         select VIDEO_BUF_DVB
         select DVB_MT352
         select DVB_CX22702
+        select DVB_TDA1004X
         ---help---
           This adds support for DVB cards based on the
           Philips saa7134 chip.
diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile
index 810e7aac0a5..3e6f5347da2 100644
--- a/drivers/media/video/Makefile
+++ b/drivers/media/video/Makefile
@@ -29,7 +29,7 @@ obj-$(CONFIG_VIDEO_ZORAN_LML33R10) += saa7114.o adv7170.o zr36060.o
 obj-$(CONFIG_VIDEO_ZORAN) += zr36067.o videocodec.o
 obj-$(CONFIG_VIDEO_PMS) += pms.o
 obj-$(CONFIG_VIDEO_PLANB) += planb.o
-obj-$(CONFIG_VIDEO_VINO) += vino.o
+obj-$(CONFIG_VIDEO_VINO) += vino.o saa7191.o indycam.o
 obj-$(CONFIG_VIDEO_STRADIS) += stradis.o
 obj-$(CONFIG_VIDEO_CPIA) += cpia.o
 obj-$(CONFIG_VIDEO_CPIA_PP) += cpia_pp.o
diff --git a/drivers/media/video/adv7170.c b/drivers/media/video/adv7170.c
index 48989eda240..1ca2b67aedf 100644
--- a/drivers/media/video/adv7170.c
+++ b/drivers/media/video/adv7170.c
@@ -43,7 +43,6 @@
 #include <asm/pgtable.h>
 #include <asm/page.h>
 #include <linux/sched.h>
-#include <asm/segment.h>
 #include <linux/types.h>
 
 #include <linux/videodev.h>
@@ -391,7 +390,6 @@ static struct i2c_client_address_data addr_data = {
         .normal_i2c             = normal_i2c,
         .probe                  = &ignore,
         .ignore                 = &ignore,
-        .force                  = &ignore,
 };
 
 static struct i2c_driver i2c_driver_adv7170;
diff --git a/drivers/media/video/adv7175.c b/drivers/media/video/adv7175.c
index f898b658637..173bca1e029 100644
--- a/drivers/media/video/adv7175.c
+++ b/drivers/media/video/adv7175.c
@@ -39,7 +39,6 @@
 #include <asm/pgtable.h>
 #include <asm/page.h>
 #include <linux/sched.h>
-#include <asm/segment.h>
 #include <linux/types.h>
 
 #include <linux/videodev.h>
@@ -441,7 +440,6 @@ static struct i2c_client_address_data addr_data = {
         .normal_i2c             = normal_i2c,
         .probe                  = &ignore,
         .ignore                 = &ignore,
-        .force                  = &ignore,
 };
 
 static struct i2c_driver i2c_driver_adv7175;
diff --git a/drivers/media/video/bt819.c b/drivers/media/video/bt819.c
index 8733588f6db..3ee0afca76a 100644
--- a/drivers/media/video/bt819.c
+++ b/drivers/media/video/bt819.c
@@ -43,7 +43,6 @@
 #include <asm/pgtable.h>
 #include <asm/page.h>
 #include <linux/sched.h>
-#include <asm/segment.h>
 #include <linux/types.h>
 
 #include <linux/videodev.h>
@@ -507,7 +506,6 @@ static struct i2c_client_address_data addr_data = {
         .normal_i2c             = normal_i2c,
         .probe                  = &ignore,
         .ignore                 = &ignore,
-        .force                  = &ignore,
 };
 
 static struct i2c_driver i2c_driver_bt819;
diff --git a/drivers/media/video/bt832.c b/drivers/media/video/bt832.c
index a070417e65e..76c1b63ebdf 100644
--- a/drivers/media/video/bt832.c
+++ b/drivers/media/video/bt832.c
@@ -188,7 +188,7 @@ static int bt832_probe(struct i2c_adapter *adap)
         if (adap->class & I2C_CLASS_TV_ANALOG)
                 return i2c_probe(adap, &addr_data, bt832_attach);
 #else
-        if (adap->id == (I2C_ALGO_BIT | I2C_HW_B_BT848))
+        if (adap->id == I2C_HW_B_BT848)
                 return i2c_probe(adap, &addr_data, bt832_attach);
 #endif
         return 0;
@@ -241,7 +241,7 @@ static struct i2c_driver driver = {
 };
 static struct i2c_client client_template =
 {
-        I2C_DEVNAME("bt832"),
+        .name       = "bt832",
         .flags      = I2C_CLIENT_ALLOW_USE,
         .driver     = &driver,
 };
diff --git a/drivers/media/video/bt856.c b/drivers/media/video/bt856.c
index a5d529ccf3a..8eb871d0e85 100644
--- a/drivers/media/video/bt856.c
+++ b/drivers/media/video/bt856.c
@@ -43,7 +43,6 @@
 #include <asm/pgtable.h>
 #include <asm/page.h>
 #include <linux/sched.h>
-#include <asm/segment.h>
 #include <linux/types.h>
 
 #include <linux/videodev.h>
@@ -295,7 +294,6 @@ static struct i2c_client_address_data addr_data = {
         .normal_i2c             = normal_i2c,
         .probe                  = &ignore,
         .ignore                 = &ignore,
-        .force                  = &ignore,
 };
 
 static struct i2c_driver i2c_driver_bt856;
diff --git a/drivers/media/video/bttv-driver.c b/drivers/media/video/bttv-driver.c
index eee9322ce21..087efb4dea0 100644
--- a/drivers/media/video/bttv-driver.c
+++ b/drivers/media/video/bttv-driver.c
@@ -4047,7 +4047,6 @@ static int bttv_suspend(struct pci_dev *pci_dev, pm_message_t state)
         struct bttv_buffer_set idle;
         unsigned long flags;
 
-        dprintk("bttv%d: suspend %d\n", btv->c.nr, state);
 
         /* stop dma + irqs */
         spin_lock_irqsave(&btv->s_lock,flags);
diff --git a/drivers/media/video/bttv-i2c.c b/drivers/media/video/bttv-i2c.c
index 234a8556376..706dc48df96 100644
--- a/drivers/media/video/bttv-i2c.c
+++ b/drivers/media/video/bttv-i2c.c
@@ -109,7 +109,7 @@ static struct i2c_adapter bttv_i2c_adap_sw_template = {
 #ifdef I2C_CLASS_TV_ANALOG
         .class             = I2C_CLASS_TV_ANALOG,
 #endif
-        I2C_DEVNAME("bt848"),
+        .name              = "bt848",
         .id                = I2C_HW_B_BT848,
         .client_register   = attach_inform,
 };
@@ -270,8 +270,6 @@ static int bttv_i2c_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg *msgs, int
 }
 
 static struct i2c_algorithm bttv_algo = {
-        .name          = "bt878",
-        .id            = I2C_ALGO_BIT | I2C_HW_B_BT848 /* FIXME */,
         .master_xfer   = bttv_i2c_xfer,
         .algo_control  = algo_control,
         .functionality = functionality,
@@ -282,8 +280,8 @@ static struct i2c_adapter bttv_i2c_adap_hw_template = {
 #ifdef I2C_CLASS_TV_ANALOG
         .class         = I2C_CLASS_TV_ANALOG,
 #endif
-        I2C_DEVNAME("bt878"),
-        .id            = I2C_ALGO_BIT | I2C_HW_B_BT848 /* FIXME */,
+        .name          = "bt878",
+        .id            = I2C_HW_B_BT848 /* FIXME */,
         .algo          = &bttv_algo,
         .client_register = attach_inform,
 };
@@ -298,7 +296,7 @@ static int attach_inform(struct i2c_client *client)
         if (bttv_debug)
                 printk(KERN_DEBUG "bttv%d: %s i2c attach [addr=0x%x,client=%s]\n",
                         btv->c.nr,client->driver->name,client->addr,
-                        i2c_clientname(client));
+                        client->name);
         if (!client->driver->command)
                 return 0;
 
@@ -326,7 +324,7 @@ void bttv_call_i2c_clients(struct bttv *btv, unsigned int cmd, void *arg)
 }
 
 static struct i2c_client bttv_i2c_client_template = {
-        I2C_DEVNAME("bttv internal"),
+        .name   = "bttv internal",
 };
 
 
diff --git a/drivers/media/video/cx88/cx88-i2c.c b/drivers/media/video/cx88/cx88-i2c.c
index a628a55299c..7f598039e02 100644
--- a/drivers/media/video/cx88/cx88-i2c.c
+++ b/drivers/media/video/cx88/cx88-i2c.c
@@ -95,7 +95,7 @@ static int attach_inform(struct i2c_client *client)
         struct cx88_core *core = i2c_get_adapdata(client->adapter);
 
         dprintk(1, "%s i2c attach [addr=0x%x,client=%s]\n",
-                client->driver->name,client->addr,i2c_clientname(client));
+                client->driver->name, client->addr, client->name);
         if (!client->driver->command)
                 return 0;
 
@@ -128,7 +128,7 @@ static int detach_inform(struct i2c_client *client)
 {
         struct cx88_core *core = i2c_get_adapdata(client->adapter);
 
-        dprintk(1, "i2c detach [client=%s]\n", i2c_clientname(client));
+        dprintk(1, "i2c detach [client=%s]\n", client->name);
         return 0;
 }
 
@@ -152,7 +152,7 @@ static struct i2c_algo_bit_data cx8800_i2c_algo_template = {
 /* ----------------------------------------------------------------------- */
 
 static struct i2c_adapter cx8800_i2c_adap_template = {
-        I2C_DEVNAME("cx2388x"),
+        .name              = "cx2388x",
         .owner             = THIS_MODULE,
         .id                = I2C_HW_B_CX2388x,
         .client_register   = attach_inform,
@@ -160,7 +160,7 @@ static struct i2c_adapter cx8800_i2c_adap_template = {
 };
 
 static struct i2c_client cx8800_i2c_client_template = {
-        I2C_DEVNAME("cx88xx internal"),
+        .name   = "cx88xx internal",
 };
 
 static char *i2c_devs[128] = {
diff --git a/drivers/media/video/indycam.c b/drivers/media/video/indycam.c
new file mode 100644
index 00000000000..b2b0384cd4b
--- /dev/null
+++ b/drivers/media/video/indycam.c
@@ -0,0 +1,412 @@
+/*
+ *  indycam.c - Silicon Graphics IndyCam digital camera driver
+ *
+ *  Copyright (C) 2003 Ladislav Michl <ladis@linux-mips.org>
+ *  Copyright (C) 2004,2005 Mikael Nousiainen <tmnousia@cc.hut.fi>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ */
+
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/delay.h>
+#include <linux/errno.h>
+#include <linux/fs.h>
+#include <linux/kernel.h>
+#include <linux/major.h>
+#include <linux/slab.h>
+#include <linux/mm.h>
+#include <linux/sched.h>
+
+#include <linux/videodev.h>
+/* IndyCam decodes stream of photons into digital image representation ;-) */
+#include <linux/video_decoder.h>
+#include <linux/i2c.h>
+
+#include "indycam.h"
+
+//#define INDYCAM_DEBUG
+
+#define INDYCAM_MODULE_VERSION "0.0.3"
+
+MODULE_DESCRIPTION("SGI IndyCam driver");
+MODULE_VERSION(INDYCAM_MODULE_VERSION);
+MODULE_AUTHOR("Mikael Nousiainen <tmnousia@cc.hut.fi>");
+MODULE_LICENSE("GPL");
+
+#ifdef INDYCAM_DEBUG
+#define dprintk(x...) printk("IndyCam: " x);
+#define indycam_regdump(client) indycam_regdump_debug(client)
+#else
+#define dprintk(x...)
+#define indycam_regdump(client)
+#endif
+
+#define VINO_ADAPTER    (I2C_ALGO_SGI | I2C_HW_SGI_VINO)
+
+struct indycam {
+        struct i2c_client *client;
+        int version;
+};
+
+static struct i2c_driver i2c_driver_indycam;
+
+static const unsigned char initseq[] = {
+        INDYCAM_CONTROL_AGCENA,         /* INDYCAM_CONTROL */
+        INDYCAM_SHUTTER_DEFAULT,        /* INDYCAM_SHUTTER */
+        INDYCAM_GAIN_DEFAULT,           /* INDYCAM_GAIN */
+        0x00,                           /* INDYCAM_BRIGHTNESS (read-only) */
+        INDYCAM_RED_BALANCE_DEFAULT,    /* INDYCAM_RED_BALANCE */
+        INDYCAM_BLUE_BALANCE_DEFAULT,   /* INDYCAM_BLUE_BALANCE */
+        INDYCAM_RED_SATURATION_DEFAULT, /* INDYCAM_RED_SATURATION */
+        INDYCAM_BLUE_SATURATION_DEFAULT,/* INDYCAM_BLUE_SATURATION */
+};
+
+/* IndyCam register handling */
+
+static int indycam_read_reg(struct i2c_client *client, unsigned char reg,
+                             unsigned char *value)
+{
+        int ret;
+
+        if (reg == INDYCAM_RESET) {
+                dprintk("indycam_read_reg(): "
+                        "skipping write-only register %d\n", reg);
+                *value = 0;
+                return 0;
+        }
+
+        ret = i2c_smbus_read_byte_data(client, reg);
+        if (ret < 0) {
+                printk(KERN_ERR "IndyCam: indycam_read_reg(): read failed, "
+                       "register = 0x%02x\n", reg);
+                return ret;
+        }
+
+        *value = (unsigned char)ret;
+
+        return 0;
+}
+
+static int indycam_write_reg(struct i2c_client *client, unsigned char reg,
+                             unsigned char value)
+{
+        int err;
+
+        if ((reg == INDYCAM_BRIGHTNESS)
+            || (reg == INDYCAM_VERSION)) {
+                dprintk("indycam_write_reg(): "
+                        "skipping read-only register %d\n", reg);
+                return 0;
+        }
+
+        dprintk("Writing Reg %d = 0x%02x\n", reg, value);
+        err = i2c_smbus_write_byte_data(client, reg, value);
+        if (err) {
+                printk(KERN_ERR "IndyCam: indycam_write_reg(): write failed, "
+                       "register = 0x%02x, value = 0x%02x\n", reg, value);
+        }
+        return err;
+}
+
+static int indycam_write_block(struct i2c_client *client, unsigned char reg,
+                                unsigned char length, unsigned char *data)
+{
+        unsigned char i;
+        int err;
+
+        for (i = reg; i < length; i++) {
+                err = indycam_write_reg(client, reg + i, data[i]);
+                if (err)
+                        return err;
+        }
+
+        return 0;
+}
+
+/* Helper functions */
+
+#ifdef INDYCAM_DEBUG
+static void indycam_regdump_debug(struct i2c_client *client)
+{
+        int i;
+        unsigned char val;
+
+        for (i = 0; i < 9; i++) {
+                indycam_read_reg(client, i, &val);
+                dprintk("Reg %d = 0x%02x\n", i, val);
+        }
+}
+#endif
+
+static int indycam_get_controls(struct i2c_client *client,
+                                struct indycam_control *ctrl)
+{
+        unsigned char ctrl_reg;
+
+        indycam_read_reg(client, INDYCAM_CONTROL, &ctrl_reg);
+        ctrl->agc = (ctrl_reg & INDYCAM_CONTROL_AGCENA)
+                ? INDYCAM_VALUE_ENABLED
+                : INDYCAM_VALUE_DISABLED;
+        ctrl->awb = (ctrl_reg & INDYCAM_CONTROL_AWBCTL)
+                ? INDYCAM_VALUE_ENABLED
+                : INDYCAM_VALUE_DISABLED;
+        indycam_read_reg(client, INDYCAM_SHUTTER,
+                         (unsigned char *)&ctrl->shutter);
+        indycam_read_reg(client, INDYCAM_GAIN,
+                         (unsigned char *)&ctrl->gain);
+        indycam_read_reg(client, INDYCAM_RED_BALANCE,
+                         (unsigned char *)&ctrl->red_balance);
+        indycam_read_reg(client, INDYCAM_BLUE_BALANCE,
+                         (unsigned char *)&ctrl->blue_balance);
+        indycam_read_reg(client, INDYCAM_RED_SATURATION,
+                         (unsigned char *)&ctrl->red_saturation);
+        indycam_read_reg(client, INDYCAM_BLUE_SATURATION,
+                         (unsigned char *)&ctrl->blue_saturation);
+        indycam_read_reg(client, INDYCAM_GAMMA,
+                         (unsigned char *)&ctrl->gamma);
+
+        return 0;
+}
+
+static int indycam_set_controls(struct i2c_client *client,
+                                struct indycam_control *ctrl)
+{
+        unsigned char ctrl_reg;
+
+        indycam_read_reg(client, INDYCAM_CONTROL, &ctrl_reg);
+        if (ctrl->agc != INDYCAM_VALUE_UNCHANGED) {
+                if (ctrl->agc)
+                        ctrl_reg |= INDYCAM_CONTROL_AGCENA;
+                else
+                        ctrl_reg &= ~INDYCAM_CONTROL_AGCENA;
+        }
+        if (ctrl->awb != INDYCAM_VALUE_UNCHANGED) {
+                if (ctrl->awb)
+                        ctrl_reg |= INDYCAM_CONTROL_AWBCTL;
+                else
+                        ctrl_reg &= ~INDYCAM_CONTROL_AWBCTL;
+        }
+        indycam_write_reg(client, INDYCAM_CONTROL, ctrl_reg);
+
+        if (ctrl->shutter >= 0)
+                indycam_write_reg(client, INDYCAM_SHUTTER, ctrl->shutter);
+        if (ctrl->gain >= 0)
+                indycam_write_reg(client, INDYCAM_GAIN, ctrl->gain);
+        if (ctrl->red_balance >= 0)
+                indycam_write_reg(client, INDYCAM_RED_BALANCE,
+                                  ctrl->red_balance);
+        if (ctrl->blue_balance >= 0)
+                indycam_write_reg(client, INDYCAM_BLUE_BALANCE,
+                                  ctrl->blue_balance);
+        if (ctrl->red_saturation >= 0)
+                indycam_write_reg(client, INDYCAM_RED_SATURATION,
+                                  ctrl->red_saturation);
+        if (ctrl->blue_saturation >= 0)
+                indycam_write_reg(client, INDYCAM_BLUE_SATURATION,
+                                  ctrl->blue_saturation);
+        if (ctrl->gamma >= 0)
+                indycam_write_reg(client, INDYCAM_GAMMA, ctrl->gamma);
+
+        return 0;
+}
+
+/* I2C-interface */
+
+static int indycam_attach(struct i2c_adapter *adap, int addr, int kind)
+{
+        int err = 0;
+        struct indycam *camera;
+        struct i2c_client *client;
+
+        printk(KERN_INFO "SGI IndyCam driver version %s\n",
+               INDYCAM_MODULE_VERSION);
+
+        client = kmalloc(sizeof(struct i2c_client), GFP_KERNEL);
+        if (!client)
+                return -ENOMEM;
+        camera = kmalloc(sizeof(struct indycam), GFP_KERNEL);
+        if (!camera) {
+                err = -ENOMEM;
+                goto out_free_client;
+        }
+
+        memset(client, 0, sizeof(struct i2c_client));
+        memset(camera, 0, sizeof(struct indycam));
+
+        client->addr = addr;
+        client->adapter = adap;
+        client->driver = &i2c_driver_indycam;
+        client->flags = 0;
+        strcpy(client->name, "IndyCam client");
+        i2c_set_clientdata(client, camera);
+
+        camera->client = client;
+
+        err = i2c_attach_client(client);
+        if (err)
+                goto out_free_camera;
+
+        camera->version = i2c_smbus_read_byte_data(client, INDYCAM_VERSION);
+        if (camera->version != CAMERA_VERSION_INDY &&
+            camera->version != CAMERA_VERSION_MOOSE) {
+                err = -ENODEV;
+                goto out_detach_client;
+        }
+        printk(KERN_INFO "IndyCam v%d.%d detected\n",
+               INDYCAM_VERSION_MAJOR(camera->version),
+               INDYCAM_VERSION_MINOR(camera->version));
+
+        indycam_regdump(client);
+
+        // initialize
+        err = indycam_write_block(client, 0, sizeof(initseq),
+                                  (unsigned char *)&initseq);
+        if (err) {
+                printk(KERN_ERR "IndyCam initalization failed\n");
+                err = -EIO;
+                goto out_detach_client;
+        }
+
+        indycam_regdump(client);
+
+        // white balance
+        err = indycam_write_reg(client, INDYCAM_CONTROL,
+                          INDYCAM_CONTROL_AGCENA | INDYCAM_CONTROL_AWBCTL);
+        if (err) {
+                printk(KERN_ERR "IndyCam white balance "
+                       "initialization failed\n");
+                err = -EIO;
+                goto out_detach_client;
+        }
+
+        indycam_regdump(client);
+
+        printk(KERN_INFO "IndyCam initialized\n");
+
+        return 0;
+
+out_detach_client:
+        i2c_detach_client(client);
+out_free_camera:
+        kfree(camera);
+out_free_client:
+        kfree(client);
+        return err;
+}
+
+static int indycam_probe(struct i2c_adapter *adap)
+{
+        /* Indy specific crap */
+        if (adap->id == VINO_ADAPTER)
+                return indycam_attach(adap, INDYCAM_ADDR, 0);
+        /* Feel free to add probe here :-) */
+        return -ENODEV;
+}
+
+static int indycam_detach(struct i2c_client *client)
+{
+        struct indycam *camera = i2c_get_clientdata(client);
+
+        i2c_detach_client(client);
+        kfree(camera);
+        kfree(client);
+        return 0;
+}
+
+static int indycam_command(struct i2c_client *client, unsigned int cmd,
+                           void *arg)
+{
+        // struct indycam *camera = i2c_get_clientdata(client);
+
+        /* The old video_decoder interface just isn't enough,
+         * so we'll use some custom commands. */
+        switch (cmd) {
+        case DECODER_GET_CAPABILITIES: {
+                struct video_decoder_capability *cap = arg;
+
+                cap->flags  = VIDEO_DECODER_NTSC;
+                cap->inputs = 1;
+                cap->outputs = 1;
+                break;
+        }
+        case DECODER_GET_STATUS: {
+                int *iarg = arg;
+
+                *iarg = DECODER_STATUS_GOOD | DECODER_STATUS_NTSC |
+                        DECODER_STATUS_COLOR;
+                break;
+        }
+        case DECODER_SET_NORM: {
+                int *iarg = arg;
+
+                switch (*iarg) {
+                case VIDEO_MODE_NTSC:
+                        break;
+                default:
+                        return -EINVAL;
+                }
+                break;
+        }
+        case DECODER_SET_INPUT: {
+                int *iarg = arg;
+
+                if (*iarg != 0)
+                        return -EINVAL;
+                break;
+        }
+        case DECODER_SET_OUTPUT: {
+                int *iarg = arg;
+
+                if (*iarg != 0)
+                        return -EINVAL;
+                break;
+        }
+        case DECODER_ENABLE_OUTPUT: {
+                /* Always enabled */
+                break;
+        }
+        case DECODER_SET_PICTURE: {
+                // struct video_picture *pic = arg;
+                /* TODO: convert values for indycam_set_controls() */
+                break;
+        }
+        case DECODER_INDYCAM_GET_CONTROLS: {
+                struct indycam_control *ctrl = arg;
+                indycam_get_controls(client, ctrl);
+        }
+        case DECODER_INDYCAM_SET_CONTROLS: {
+                struct indycam_control *ctrl = arg;
+                indycam_set_controls(client, ctrl);
+        }
+        default:
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+static struct i2c_driver i2c_driver_indycam = {
+        .owner          = THIS_MODULE,
+        .name           = "indycam",
+        .id             = I2C_DRIVERID_INDYCAM,
+        .flags          = I2C_DF_NOTIFY,
+        .attach_adapter = indycam_probe,
+        .detach_client  = indycam_detach,
+        .command        = indycam_command,
+};
+
+static int __init indycam_init(void)
+{
+        return i2c_add_driver(&i2c_driver_indycam);
+}
+
+static void __exit indycam_exit(void)
+{
+        i2c_del_driver(&i2c_driver_indycam);
+}
+
+module_init(indycam_init);
+module_exit(indycam_exit);
diff --git a/drivers/media/video/indycam.h b/drivers/media/video/indycam.h
new file mode 100644
index 00000000000..d9ddb6b79a0
--- /dev/null
+++ b/drivers/media/video/indycam.h
@@ -0,0 +1,112 @@
+/*
+ *  indycam.h - Silicon Graphics IndyCam digital camera driver
+ *
+ *  Copyright (C) 2003 Ladislav Michl <ladis@linux-mips.org>
+ *  Copyright (C) 2004,2005 Mikael Nousiainen <tmnousia@cc.hut.fi>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ */
+
+#ifndef _INDYCAM_H_
+#define _INDYCAM_H_
+
+/* I2C address for the Guinness Camera */
+#define INDYCAM_ADDR                    0x56
+
+/* Camera version */
+#define CAMERA_VERSION_INDY             0x10    /* v1.0 */
+#define CAMERA_VERSION_MOOSE            0x12    /* v1.2 */
+#define INDYCAM_VERSION_MAJOR(x)        (((x) & 0xf0) >> 4)
+#define INDYCAM_VERSION_MINOR(x)        ((x) & 0x0f)
+
+/* Register bus addresses */
+#define INDYCAM_CONTROL                 0x00
+#define INDYCAM_SHUTTER                 0x01
+#define INDYCAM_GAIN                    0x02
+#define INDYCAM_BRIGHTNESS              0x03 /* read-only */
+#define INDYCAM_RED_BALANCE             0x04
+#define INDYCAM_BLUE_BALANCE            0x05
+#define INDYCAM_RED_SATURATION          0x06
+#define INDYCAM_BLUE_SATURATION         0x07
+#define INDYCAM_GAMMA                   0x08
+#define INDYCAM_VERSION                 0x0e /* read-only */
+#define INDYCAM_RESET                   0x0f /* write-only */
+
+#define INDYCAM_LED                     0x46
+#define INDYCAM_ORIENTATION             0x47
+#define INDYCAM_BUTTON                  0x48
+
+/* Field definitions of registers */
+#define INDYCAM_CONTROL_AGCENA          (1<<0) /* automatic gain control */
+#define INDYCAM_CONTROL_AWBCTL          (1<<1) /* automatic white balance */
+                                                /* 2-3 are reserved */
+#define INDYCAM_CONTROL_EVNFLD          (1<<4)  /* read-only */
+
+#define INDYCAM_SHUTTER_10000           0x02    /* 1/10000 second */
+#define INDYCAM_SHUTTER_4000            0x04    /* 1/4000 second */
+#define INDYCAM_SHUTTER_2000            0x08    /* 1/2000 second */
+#define INDYCAM_SHUTTER_1000            0x10    /* 1/1000 second */
+#define INDYCAM_SHUTTER_500             0x20    /* 1/500 second */
+#define INDYCAM_SHUTTER_250             0x3f    /* 1/250 second */
+#define INDYCAM_SHUTTER_125             0x7e    /* 1/125 second */
+#define INDYCAM_SHUTTER_100             0x9e    /* 1/100 second */
+#define INDYCAM_SHUTTER_60              0x00    /* 1/60 second */
+
+#define INDYCAM_LED_ACTIVE                      0x10
+#define INDYCAM_LED_INACTIVE                    0x30
+#define INDYCAM_ORIENTATION_BOTTOM_TO_TOP       0x40
+#define INDYCAM_BUTTON_RELEASED                 0x10
+
+#define INDYCAM_SHUTTER_MIN             0x00
+#define INDYCAM_SHUTTER_MAX             0xff
+#define INDYCAM_GAIN_MIN                0x00
+#define INDYCAM_GAIN_MAX                0xff
+#define INDYCAM_RED_BALANCE_MIN         0x00 /* the effect is the opposite? */
+#define INDYCAM_RED_BALANCE_MAX         0xff
+#define INDYCAM_BLUE_BALANCE_MIN        0x00 /* the effect is the opposite? */
+#define INDYCAM_BLUE_BALANCE_MAX        0xff
+#define INDYCAM_RED_SATURATION_MIN      0x00
+#define INDYCAM_RED_SATURATION_MAX      0xff
+#define INDYCAM_BLUE_SATURATION_MIN     0x00
+#define INDYCAM_BLUE_SATURATION_MAX     0xff
+#define INDYCAM_GAMMA_MIN               0x00
+#define INDYCAM_GAMMA_MAX               0xff
+
+/* Driver interface definitions */
+
+#define INDYCAM_VALUE_ENABLED           1
+#define INDYCAM_VALUE_DISABLED          0
+#define INDYCAM_VALUE_UNCHANGED         -1
+
+/* When setting controls, a value of -1 leaves the control unchanged. */
+struct indycam_control {
+        int agc;        /* boolean */
+        int awb;        /* boolean */
+        int shutter;
+        int gain;
+        int red_balance;
+        int blue_balance;
+        int red_saturation;
+        int blue_saturation;
+        int gamma;
+};
+
+#define DECODER_INDYCAM_GET_CONTROLS    _IOR('d', 193, struct indycam_control)
+#define DECODER_INDYCAM_SET_CONTROLS    _IOW('d', 194, struct indycam_control)
+
+/* Default values for controls */
+
+#define INDYCAM_AGC_DEFAULT             INDYCAM_VALUE_ENABLED
+#define INDYCAM_AWB_DEFAULT             INDYCAM_VALUE_ENABLED
+
+#define INDYCAM_SHUTTER_DEFAULT         INDYCAM_SHUTTER_60
+#define INDYCAM_GAIN_DEFAULT            0x80
+#define INDYCAM_RED_BALANCE_DEFAULT     0x18
+#define INDYCAM_BLUE_BALANCE_DEFAULT    0xa4
+#define INDYCAM_RED_SATURATION_DEFAULT  0x80
+#define INDYCAM_BLUE_SATURATION_DEFAULT 0xc0
+#define INDYCAM_GAMMA_DEFAULT           0x80
+
+#endif
diff --git a/drivers/media/video/ir-kbd-i2c.c b/drivers/media/video/ir-kbd-i2c.c
index 9fc5055e001..1e273ff3f95 100644
--- a/drivers/media/video/ir-kbd-i2c.c
+++ b/drivers/media/video/ir-kbd-i2c.c
@@ -308,7 +308,7 @@ static struct i2c_driver driver = {
 
 static struct i2c_client client_template =
 {
-        I2C_DEVNAME("unset"),
+        .name = "unset",
         .driver = &driver
 };
 
@@ -429,10 +429,10 @@ static int ir_probe(struct i2c_adapter *adap)
         struct i2c_client c; char buf; int i,rc;
 
         switch (adap->id) {
-        case I2C_ALGO_BIT | I2C_HW_B_BT848:
+        case I2C_HW_B_BT848:
                 probe = probe_bttv;
                 break;
-        case I2C_ALGO_SAA7134:
+        case I2C_HW_SAA7134:
                 probe = probe_saa7134;
                 break;
         }
diff --git a/drivers/media/video/meye.c b/drivers/media/video/meye.c
index fe194012bcc..3f2a882bc20 100644
--- a/drivers/media/video/meye.c
+++ b/drivers/media/video/meye.c
@@ -37,6 +37,7 @@
 #include <linux/delay.h>
 #include <linux/interrupt.h>
 #include <linux/vmalloc.h>
+#include <linux/dma-mapping.h>
 
 #include "meye.h"
 #include <linux/meye.h>
@@ -121,7 +122,7 @@ static int ptable_alloc(void)
         memset(meye.mchip_ptable, 0, sizeof(meye.mchip_ptable));
 
         /* give only 32 bit DMA addresses */
-        if (dma_set_mask(&meye.mchip_dev->dev, 0xffffffff))
+        if (dma_set_mask(&meye.mchip_dev->dev, DMA_32BIT_MASK))
                 return -1;
 
         meye.mchip_ptable_toc = dma_alloc_coherent(&meye.mchip_dev->dev,
diff --git a/drivers/media/video/msp3400.c b/drivers/media/video/msp3400.c
index 62f1b8ddb98..ca02f6f14b0 100644
--- a/drivers/media/video/msp3400.c
+++ b/drivers/media/video/msp3400.c
@@ -1416,7 +1416,7 @@ static int msp_detach(struct i2c_client *client);
 static int msp_probe(struct i2c_adapter *adap);
 static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg);
 
-static int msp_suspend(struct device * dev, u32 state, u32 level);
+static int msp_suspend(struct device * dev, pm_message_t state, u32 level);
 static int msp_resume(struct device * dev, u32 level);
 
 static void msp_wake_thread(struct i2c_client *client);
@@ -1437,7 +1437,7 @@ static struct i2c_driver driver = {
 
 static struct i2c_client client_template =
 {
-        I2C_DEVNAME("(unset)"),
+        .name      = "(unset)",
         .flags     = I2C_CLIENT_ALLOW_USE,
         .driver    = &driver,
 };
@@ -1509,7 +1509,7 @@ static int msp_attach(struct i2c_adapter *adap, int addr, int kind)
         }
 
         /* hello world :-) */
-        printk(KERN_INFO "msp34xx: init: chip=%s",i2c_clientname(c));
+        printk(KERN_INFO "msp34xx: init: chip=%s", c->name);
         if (HAVE_NICAM(msp))
                 printk(" +nicam");
         if (HAVE_SIMPLE(msp))
@@ -1817,7 +1817,7 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg)
         return 0;
 }
 
-static int msp_suspend(struct device * dev, u32 state, u32 level)
+static int msp_suspend(struct device * dev, pm_message_t state, u32 level)
 {
         struct i2c_client *c = container_of(dev, struct i2c_client, dev);
 
diff --git a/drivers/media/video/ovcamchip/ov6x20.c b/drivers/media/video/ovcamchip/ov6x20.c
index 3433619ad93..b3f4d266ced 100644
--- a/drivers/media/video/ovcamchip/ov6x20.c
+++ b/drivers/media/video/ovcamchip/ov6x20.c
@@ -164,10 +164,10 @@ static int ov6x20_init(struct i2c_client *c)
         DDEBUG(4, &c->dev, "entered");
 
         switch (c->adapter->id) {
-        case I2C_ALGO_SMBUS | I2C_HW_SMBUS_OV511:
+        case I2C_HW_SMBUS_OV511:
                 rc = ov_write_regvals(c, regvals_init_6x20_511);
                 break;
-        case I2C_ALGO_SMBUS | I2C_HW_SMBUS_OV518:
+        case I2C_HW_SMBUS_OV518:
                 rc = ov_write_regvals(c, regvals_init_6x20_518);
                 break;
         default:
@@ -338,7 +338,7 @@ static int ov6x20_mode_init(struct i2c_client *c, struct ovcamchip_window *win)
         /******** Palette-specific regs ********/
 
         /* OV518 needs 8 bit multiplexed in color mode, and 16 bit in B&W */
-        if (c->adapter->id == (I2C_ALGO_SMBUS | I2C_HW_SMBUS_OV518)) {
+        if (c->adapter->id == I2C_HW_SMBUS_OV518) {
                 if (win->format == VIDEO_PALETTE_GREY)
                         ov_write_mask(c, 0x13, 0x00, 0x20);
                 else
diff --git a/drivers/media/video/ovcamchip/ov6x30.c b/drivers/media/video/ovcamchip/ov6x30.c
index 44a842379b4..6eab458ab79 100644
--- a/drivers/media/video/ovcamchip/ov6x30.c
+++ b/drivers/media/video/ovcamchip/ov6x30.c
@@ -301,7 +301,7 @@ static int ov6x30_mode_init(struct i2c_client *c, struct ovcamchip_window *win)
         /******** Palette-specific regs ********/
 
         if (win->format == VIDEO_PALETTE_GREY) {
-                if (c->adapter->id == (I2C_ALGO_SMBUS | I2C_HW_SMBUS_OV518)) {
+                if (c->adapter->id == I2C_HW_SMBUS_OV518) {
                         /* Do nothing - we're already in 8-bit mode */
                 } else {
                         ov_write_mask(c, 0x13, 0x20, 0x20);
@@ -313,7 +313,7 @@ static int ov6x30_mode_init(struct i2c_client *c, struct ovcamchip_window *win)
                  * Therefore, the OV6630 needs to be in 8-bit multiplexed
                  * output mode */
 
-                if (c->adapter->id == (I2C_ALGO_SMBUS | I2C_HW_SMBUS_OV518)) {
+                if (c->adapter->id == I2C_HW_SMBUS_OV518) {
                         /* Do nothing - we want to stay in 8-bit mode */
                         /* Warning: Messing with reg 0x13 breaks OV518 color */
                 } else {
diff --git a/drivers/media/video/ovcamchip/ovcamchip_core.c b/drivers/media/video/ovcamchip/ovcamchip_core.c
index 54dd5612d3b..2de34ebf067 100644
--- a/drivers/media/video/ovcamchip/ovcamchip_core.c
+++ b/drivers/media/video/ovcamchip/ovcamchip_core.c
@@ -296,10 +296,10 @@ static int ovcamchip_attach(struct i2c_adapter *adap)
          * attach to adapters that are known to contain OV camera chips. */
 
         switch (adap->id) {
-        case (I2C_ALGO_SMBUS | I2C_HW_SMBUS_OV511):
-        case (I2C_ALGO_SMBUS | I2C_HW_SMBUS_OV518):
-        case (I2C_ALGO_SMBUS | I2C_HW_SMBUS_OVFX2):
-        case (I2C_ALGO_SMBUS | I2C_HW_SMBUS_W9968CF):
+        case I2C_HW_SMBUS_OV511:
+        case I2C_HW_SMBUS_OV518:
+        case I2C_HW_SMBUS_OVFX2:
+        case I2C_HW_SMBUS_W9968CF:
                 PDEBUG(1, "Adapter ID 0x%06x accepted", adap->id);
                 break;
         default:
@@ -314,7 +314,7 @@ static int ovcamchip_attach(struct i2c_adapter *adap)
         }
         memcpy(c, &client_template, sizeof *c);
         c->adapter = adap;
-        strcpy(i2c_clientname(c), "OV????");
+        strcpy(c->name, "OV????");
 
         ov = kmalloc(sizeof *ov, GFP_KERNEL);
         if (!ov) {
@@ -328,7 +328,7 @@ static int ovcamchip_attach(struct i2c_adapter *adap)
         if (rc < 0)
                 goto error;
 
-        strcpy(i2c_clientname(c), chip_names[ov->subtype]);
+        strcpy(c->name, chip_names[ov->subtype]);
 
         PDEBUG(1, "Camera chip detection complete");
 
@@ -421,7 +421,7 @@ static struct i2c_driver driver = {
 };
 
 static struct i2c_client client_template = {
-        I2C_DEVNAME("(unset)"),
+        .name =         "(unset)",
         .driver =       &driver,
 };
 
diff --git a/drivers/media/video/saa7110.c b/drivers/media/video/saa7110.c
index 22d055d8a69..e116bdbed31 100644
--- a/drivers/media/video/saa7110.c
+++ b/drivers/media/video/saa7110.c
@@ -470,7 +470,6 @@ static struct i2c_client_address_data addr_data = {
         .normal_i2c             = normal_i2c,
         .probe                  = &ignore,
         .ignore                 = &ignore,
-        .force                  = &ignore,
 };
 
 static struct i2c_driver i2c_driver_saa7110;
diff --git a/drivers/media/video/saa7111.c b/drivers/media/video/saa7111.c
index fcd897382fc..fe8a5e45396 100644
--- a/drivers/media/video/saa7111.c
+++ b/drivers/media/video/saa7111.c
@@ -42,7 +42,6 @@
 #include <asm/pgtable.h>
 #include <asm/page.h>
 #include <linux/sched.h>
-#include <asm/segment.h>
 #include <linux/types.h>
 
 #include <linux/videodev.h>
@@ -489,7 +488,6 @@ static struct i2c_client_address_data addr_data = {
         .normal_i2c             = normal_i2c,
         .probe                  = &ignore,
         .ignore                 = &ignore,
-        .force                  = &ignore,
 };
 
 static struct i2c_driver i2c_driver_saa7111;
diff --git a/drivers/media/video/saa7114.c b/drivers/media/video/saa7114.c
index 2ba997f5ef1..d9f50e2f7b9 100644
--- a/drivers/media/video/saa7114.c
+++ b/drivers/media/video/saa7114.c
@@ -45,7 +45,6 @@
 #include <asm/pgtable.h>
 #include <asm/page.h>
 #include <linux/sched.h>
-#include <asm/segment.h>
 #include <linux/types.h>
 
 #include <linux/videodev.h>
@@ -827,7 +826,6 @@ static struct i2c_client_address_data addr_data = {
         .normal_i2c             = normal_i2c,
         .probe                  = &ignore,
         .ignore                 = &ignore,
-        .force                  = &ignore,
 };
 
 static struct i2c_driver i2c_driver_saa7114;
diff --git a/drivers/media/video/saa7134/saa6752hs.c b/drivers/media/video/saa7134/saa6752hs.c
index 79d05ea1b69..382911c6ef2 100644
--- a/drivers/media/video/saa7134/saa6752hs.c
+++ b/drivers/media/video/saa7134/saa6752hs.c
@@ -598,7 +598,7 @@ static struct i2c_driver driver = {
 
 static struct i2c_client client_template =
 {
-        I2C_DEVNAME("saa6752hs"),
+        .name       = "saa6752hs",
         .flags      = I2C_CLIENT_ALLOW_USE,
         .driver     = &driver,
 };
diff --git a/drivers/media/video/saa7134/saa7134-i2c.c b/drivers/media/video/saa7134/saa7134-i2c.c
index 1203b93a572..eae6b529713 100644
--- a/drivers/media/video/saa7134/saa7134-i2c.c
+++ b/drivers/media/video/saa7134/saa7134-i2c.c
@@ -334,7 +334,7 @@ static int attach_inform(struct i2c_client *client)
         struct tuner_setup tun_setup;
 
         d1printk( "%s i2c attach [addr=0x%x,client=%s]\n",
-                client->driver->name,client->addr,i2c_clientname(client));
+                 client->driver->name, client->addr, client->name);
 
         if (!client->driver->command)
                 return 0;
@@ -370,8 +370,6 @@ static int attach_inform(struct i2c_client *client)
 }
 
 static struct i2c_algorithm saa7134_algo = {
-        .name          = "saa7134",
-        .id            = I2C_ALGO_SAA7134,
         .master_xfer   = saa7134_i2c_xfer,
         .algo_control  = algo_control,
         .functionality = functionality,
@@ -382,14 +380,14 @@ static struct i2c_adapter saa7134_adap_template = {
 #ifdef I2C_CLASS_TV_ANALOG
         .class         = I2C_CLASS_TV_ANALOG,
 #endif
-        I2C_DEVNAME("saa7134"),
-        .id            = I2C_ALGO_SAA7134,
+        .name          = "saa7134",
+        .id            = I2C_HW_SAA7134,
         .algo          = &saa7134_algo,
         .client_register = attach_inform,
 };
 
 static struct i2c_client saa7134_client_template = {
-        I2C_DEVNAME("saa7134 internal"),
+        .name   = "saa7134 internal",
 };
 
 /* ----------------------------------------------------------- */
diff --git a/drivers/media/video/saa7185.c b/drivers/media/video/saa7185.c
index 108e7a4a027..132aa7943c1 100644
--- a/drivers/media/video/saa7185.c
+++ b/drivers/media/video/saa7185.c
@@ -39,7 +39,6 @@
 #include <asm/pgtable.h>
 #include <asm/page.h>
 #include <linux/sched.h>
-#include <asm/segment.h>
 #include <linux/types.h>
 
 #include <linux/videodev.h>
@@ -387,7 +386,6 @@ static struct i2c_client_address_data addr_data = {
         .normal_i2c             = normal_i2c,
         .probe                  = &ignore,
         .ignore                 = &ignore,
-        .force                  = &ignore,
 };
 
 static struct i2c_driver i2c_driver_saa7185;
diff --git a/drivers/media/video/saa7191.c b/drivers/media/video/saa7191.c
new file mode 100644
index 00000000000..454f5c1199b
--- /dev/null
+++ b/drivers/media/video/saa7191.c
@@ -0,0 +1,512 @@
+/*
+ *  saa7191.c - Philips SAA7191 video decoder driver
+ *
+ *  Copyright (C) 2003 Ladislav Michl <ladis@linux-mips.org>
+ *  Copyright (C) 2004,2005 Mikael Nousiainen <tmnousia@cc.hut.fi>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ */
+
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/delay.h>
+#include <linux/errno.h>
+#include <linux/fs.h>
+#include <linux/kernel.h>
+#include <linux/major.h>
+#include <linux/slab.h>
+#include <linux/mm.h>
+#include <linux/sched.h>
+
+#include <linux/videodev.h>
+#include <linux/video_decoder.h>
+#include <linux/i2c.h>
+
+#include "saa7191.h"
+
+#define SAA7191_MODULE_VERSION "0.0.3"
+
+MODULE_DESCRIPTION("Philips SAA7191 video decoder driver");
+MODULE_VERSION(SAA7191_MODULE_VERSION);
+MODULE_AUTHOR("Mikael Nousiainen <tmnousia@cc.hut.fi>");
+MODULE_LICENSE("GPL");
+
+#define VINO_ADAPTER    (I2C_ALGO_SGI | I2C_HW_SGI_VINO)
+
+struct saa7191 {
+        struct i2c_client *client;
+
+        /* the register values are stored here as the actual
+         * I2C-registers are write-only */
+        unsigned char reg[25];
+
+        unsigned char norm;
+        unsigned char input;
+};
+
+static struct i2c_driver i2c_driver_saa7191;
+
+static const unsigned char initseq[] = {
+        0,      /* Subaddress */
+        0x50,   /* SAA7191_REG_IDEL */
+        0x30,   /* SAA7191_REG_HSYB */
+        0x00,   /* SAA7191_REG_HSYS */
+        0xe8,   /* SAA7191_REG_HCLB */
+        0xb6,   /* SAA7191_REG_HCLS */
+        0xf4,   /* SAA7191_REG_HPHI */
+        0x01,   /* SAA7191_REG_LUMA - chrominance trap active (CVBS) */
+        0x00,   /* SAA7191_REG_HUEC */
+        0xf8,   /* SAA7191_REG_CKTQ */
+        0xf8,   /* SAA7191_REG_CKTS */
+        0x90,   /* SAA7191_REG_PLSE */
+        0x90,   /* SAA7191_REG_SESE */
+        0x00,   /* SAA7191_REG_GAIN */
+        0x0c,   /* SAA7191_REG_STDC - not SECAM, slow time constant */
+        0x78,   /* SAA7191_REG_IOCK - chrominance from CVBS, GPSW1 & 2 off */
+        0x99,   /* SAA7191_REG_CTL3 - automatic field detection */
+        0x00,   /* SAA7191_REG_CTL4 */
+        0x2c,   /* SAA7191_REG_CHCV */
+        0x00,   /* unused */
+        0x00,   /* unused */
+        0x34,   /* SAA7191_REG_HS6B */
+        0x0a,   /* SAA7191_REG_HS6S */
+        0xf4,   /* SAA7191_REG_HC6B */
+        0xce,   /* SAA7191_REG_HC6S */
+        0xf4,   /* SAA7191_REG_HP6I */
+};
+
+/* SAA7191 register handling */
+
+static unsigned char saa7191_read_reg(struct i2c_client *client,
+                                      unsigned char reg)
+{
+        return ((struct saa7191 *)i2c_get_clientdata(client))->reg[reg];
+}
+
+static int saa7191_read_status(struct i2c_client *client,
+                               unsigned char *value)
+{
+        int ret;
+
+        ret = i2c_master_recv(client, value, 1);
+        if (ret < 0) {
+                printk(KERN_ERR "SAA7191: saa7191_read_status(): read failed");
+                return ret;
+        }
+
+        return 0;
+}
+
+
+static int saa7191_write_reg(struct i2c_client *client, unsigned char reg,
+                             unsigned char value)
+{
+
+        ((struct saa7191 *)i2c_get_clientdata(client))->reg[reg] = value;
+        return i2c_smbus_write_byte_data(client, reg, value);
+}
+
+/* the first byte of data must be the first subaddress number (register) */
+static int saa7191_write_block(struct i2c_client *client,
+                               unsigned char length, unsigned char *data)
+{
+        int i;
+        int ret;
+
+        struct saa7191 *decoder = (struct saa7191 *)i2c_get_clientdata(client);
+        for (i = 0; i < (length - 1); i++) {
+                decoder->reg[data[0] + i] = data[i + 1];
+        }
+
+        ret = i2c_master_send(client, data, length);
+        if (ret < 0) {
+                printk(KERN_ERR "SAA7191: saa7191_write_block(): "
+                       "write failed");
+                return ret;
+        }
+
+        return 0;
+}
+
+/* Helper functions */
+
+static int saa7191_set_input(struct i2c_client *client, int input)
+{
+        unsigned char luma = saa7191_read_reg(client, SAA7191_REG_LUMA);
+        unsigned char iock = saa7191_read_reg(client, SAA7191_REG_IOCK);
+        int err;
+
+        switch (input) {
+        case SAA7191_INPUT_COMPOSITE: /* Set Composite input */
+                iock &= ~(SAA7191_IOCK_CHRS | SAA7191_IOCK_GPSW1
+                          | SAA7191_IOCK_GPSW2);
+                /* Chrominance trap active */
+                luma &= ~SAA7191_LUMA_BYPS;
+                break;
+        case SAA7191_INPUT_SVIDEO: /* Set S-Video input */
+                iock |= SAA7191_IOCK_CHRS | SAA7191_IOCK_GPSW2;
+                /* Chrominance trap bypassed */
+                luma |= SAA7191_LUMA_BYPS;
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        err = saa7191_write_reg(client, SAA7191_REG_LUMA, luma);
+        if (err)
+                return -EIO;
+        err = saa7191_write_reg(client, SAA7191_REG_IOCK, iock);
+        if (err)
+                return -EIO;
+
+        return 0;
+}
+
+static int saa7191_set_norm(struct i2c_client *client, int norm)
+{
+        struct saa7191 *decoder = i2c_get_clientdata(client);
+        unsigned char stdc = saa7191_read_reg(client, SAA7191_REG_STDC);
+        unsigned char ctl3 = saa7191_read_reg(client, SAA7191_REG_CTL3);
+        unsigned char chcv = saa7191_read_reg(client, SAA7191_REG_CHCV);
+        int err;
+
+        switch(norm) {
+        case SAA7191_NORM_AUTO: {
+                unsigned char status;
+
+                // does status depend on current norm ?
+                if (saa7191_read_status(client, &status))
+                        return -EIO;
+
+                stdc &= ~SAA7191_STDC_SECS;
+                ctl3 &= ~SAA7191_CTL3_FSEL;
+                ctl3 |= SAA7191_CTL3_AUFD;
+                chcv = (status & SAA7191_STATUS_FIDT)
+                               ? SAA7191_CHCV_NTSC : SAA7191_CHCV_PAL;
+                break;
+        }
+        case SAA7191_NORM_PAL:
+                stdc &= ~SAA7191_STDC_SECS;
+                ctl3 &= ~(SAA7191_CTL3_AUFD | SAA7191_CTL3_FSEL);
+                chcv = SAA7191_CHCV_PAL;
+                break;
+        case SAA7191_NORM_NTSC:
+                stdc &= ~SAA7191_STDC_SECS;
+                ctl3 &= ~SAA7191_CTL3_AUFD;
+                ctl3 |= SAA7191_CTL3_FSEL;
+                chcv = SAA7191_CHCV_NTSC;
+                break;
+        case SAA7191_NORM_SECAM:
+                stdc |= SAA7191_STDC_SECS;
+                ctl3 &= ~(SAA7191_CTL3_AUFD | SAA7191_CTL3_FSEL);
+                chcv = SAA7191_CHCV_PAL;
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        err = saa7191_write_reg(client, SAA7191_REG_CTL3, ctl3);
+        if (err)
+                return -EIO;
+        err = saa7191_write_reg(client, SAA7191_REG_STDC, stdc);
+        if (err)
+                return -EIO;
+        err = saa7191_write_reg(client, SAA7191_REG_CHCV, chcv);
+        if (err)
+                return -EIO;
+
+        decoder->norm = norm;
+
+        return 0;
+}
+
+static int saa7191_get_controls(struct i2c_client *client,
+                                struct saa7191_control *ctrl)
+{
+        unsigned char hue = saa7191_read_reg(client, SAA7191_REG_HUEC);
+        unsigned char stdc = saa7191_read_reg(client, SAA7191_REG_STDC);
+
+        if (hue < 0x80) {
+                hue += 0x80;
+        } else {
+                hue -= 0x80;
+        }
+        ctrl->hue = hue;
+
+        ctrl->vtrc = (stdc & SAA7191_STDC_VTRC)
+                ? SAA7191_VALUE_ENABLED : SAA7191_VALUE_DISABLED;
+
+        return 0;
+}
+
+static int saa7191_set_controls(struct i2c_client *client,
+                                struct saa7191_control *ctrl)
+{
+        int err;
+
+        if (ctrl->hue >= 0) {
+                unsigned char hue = ctrl->hue & 0xff;
+                if (hue < 0x80) {
+                        hue += 0x80;
+                } else {
+                        hue -= 0x80;
+                }
+                err = saa7191_write_reg(client, SAA7191_REG_HUEC, hue);
+                if (err)
+                        return -EIO;
+        }
+        if (ctrl->vtrc >= 0) {
+                unsigned char stdc =
+                        saa7191_read_reg(client, SAA7191_REG_STDC);
+
+                if (ctrl->vtrc) {
+                        stdc |= SAA7191_STDC_VTRC;
+                } else {
+                        stdc &= ~SAA7191_STDC_VTRC;
+                }
+
+                err = saa7191_write_reg(client, SAA7191_REG_STDC, stdc);
+                if (err)
+                        return -EIO;
+        }
+
+        return 0;
+}
+
+/* I2C-interface */
+
+static int saa7191_attach(struct i2c_adapter *adap, int addr, int kind)
+{
+        int err = 0;
+        struct saa7191 *decoder;
+        struct i2c_client *client;
+
+        printk(KERN_INFO "Philips SAA7191 driver version %s\n",
+               SAA7191_MODULE_VERSION);
+
+        client = kmalloc(sizeof(*client), GFP_KERNEL);
+        if (!client)
+                return -ENOMEM;
+        decoder = kmalloc(sizeof(*decoder), GFP_KERNEL);
+        if (!decoder) {
+                err = -ENOMEM;
+                goto out_free_client;
+        }
+
+        memset(client, 0, sizeof(struct i2c_client));
+        memset(decoder, 0, sizeof(struct saa7191));
+
+        client->addr = addr;
+        client->adapter = adap;
+        client->driver = &i2c_driver_saa7191;
+        client->flags = 0;
+        strcpy(client->name, "saa7191 client");
+        i2c_set_clientdata(client, decoder);
+
+        decoder->client = client;
+
+        err = i2c_attach_client(client);
+        if (err)
+                goto out_free_decoder;
+
+        decoder->input = SAA7191_INPUT_COMPOSITE;
+        decoder->norm = SAA7191_NORM_AUTO;
+
+        err = saa7191_write_block(client, sizeof(initseq),
+                                  (unsigned char *)initseq);
+        if (err) {
+                printk(KERN_ERR "SAA7191 initialization failed\n");
+                goto out_detach_client;
+        }
+
+        printk(KERN_INFO "SAA7191 initialized\n");
+
+        return 0;
+
+out_detach_client:
+        i2c_detach_client(client);
+out_free_decoder:
+        kfree(decoder);
+out_free_client:
+        kfree(client);
+        return err;
+}
+
+static int saa7191_probe(struct i2c_adapter *adap)
+{
+        /* Always connected to VINO */
+        if (adap->id == VINO_ADAPTER)
+                return saa7191_attach(adap, SAA7191_ADDR, 0);
+        /* Feel free to add probe here :-) */
+        return -ENODEV;
+}
+
+static int saa7191_detach(struct i2c_client *client)
+{
+        struct saa7191 *decoder = i2c_get_clientdata(client);
+
+        i2c_detach_client(client);
+        kfree(decoder);
+        kfree(client);
+        return 0;
+}
+
+static int saa7191_command(struct i2c_client *client, unsigned int cmd,
+                           void *arg)
+{
+        struct saa7191 *decoder = i2c_get_clientdata(client);
+
+        switch (cmd) {
+        case DECODER_GET_CAPABILITIES: {
+                struct video_decoder_capability *cap = arg;
+
+                cap->flags  = VIDEO_DECODER_PAL | VIDEO_DECODER_NTSC |
+                              VIDEO_DECODER_SECAM | VIDEO_DECODER_AUTO;
+                cap->inputs = (client->adapter->id == VINO_ADAPTER) ? 2 : 1;
+                cap->outputs = 1;
+                break;
+        }
+        case DECODER_GET_STATUS: {
+                int *iarg = arg;
+                unsigned char status;
+                int res = 0;
+
+                if (saa7191_read_status(client, &status)) {
+                        return -EIO;
+                }
+                if ((status & SAA7191_STATUS_HLCK) == 0)
+                        res |= DECODER_STATUS_GOOD;
+                if (status & SAA7191_STATUS_CODE)
+                        res |= DECODER_STATUS_COLOR;
+                switch (decoder->norm) {
+                case SAA7191_NORM_NTSC:
+                        res |= DECODER_STATUS_NTSC;
+                        break;
+                case SAA7191_NORM_PAL:
+                        res |= DECODER_STATUS_PAL;
+                        break;
+                case SAA7191_NORM_SECAM:
+                        res |= DECODER_STATUS_SECAM;
+                        break;
+                case SAA7191_NORM_AUTO:
+                default:
+                        if (status & SAA7191_STATUS_FIDT)
+                                res |= DECODER_STATUS_NTSC;
+                        else
+                                res |= DECODER_STATUS_PAL;
+                        break;
+                }
+                *iarg = res;
+                break;
+        }
+        case DECODER_SET_NORM: {
+                int *iarg = arg;
+
+                switch (*iarg) {
+                case VIDEO_MODE_AUTO:
+                        return saa7191_set_norm(client, SAA7191_NORM_AUTO);
+                case VIDEO_MODE_PAL:
+                        return saa7191_set_norm(client, SAA7191_NORM_PAL);
+                case VIDEO_MODE_NTSC:
+                        return saa7191_set_norm(client, SAA7191_NORM_NTSC);
+                case VIDEO_MODE_SECAM:
+                        return saa7191_set_norm(client, SAA7191_NORM_SECAM);
+                default:
+                        return -EINVAL;
+                }
+                break;
+        }
+        case DECODER_SET_INPUT: {
+                int *iarg = arg;
+
+                switch (client->adapter->id) {
+                case VINO_ADAPTER:
+                        return saa7191_set_input(client, *iarg);
+                default:
+                        if (*iarg != 0)
+                                return -EINVAL;
+                }
+                break;
+        }
+        case DECODER_SET_OUTPUT: {
+                int *iarg = arg;
+
+                /* not much choice of outputs */
+                if (*iarg != 0)
+                        return -EINVAL;
+                break;
+        }
+        case DECODER_ENABLE_OUTPUT: {
+                /* Always enabled */
+                break;
+        }
+        case DECODER_SET_PICTURE: {
+                struct video_picture *pic = arg;
+                unsigned val;
+                int err;
+
+                val = (pic->hue >> 8) - 0x80;
+                err = saa7191_write_reg(client, SAA7191_REG_HUEC, val);
+                if (err)
+                        return -EIO;
+                break;
+        }
+        case DECODER_SAA7191_GET_STATUS: {
+                struct saa7191_status *status = arg;
+                unsigned char status_reg;
+
+                if (saa7191_read_status(client, &status_reg))
+                        return -EIO;
+                status->signal = ((status_reg & SAA7191_STATUS_HLCK) == 0)
+                        ? SAA7191_VALUE_ENABLED : SAA7191_VALUE_DISABLED;
+                status->ntsc = (status_reg & SAA7191_STATUS_FIDT)
+                        ? SAA7191_VALUE_ENABLED : SAA7191_VALUE_DISABLED;
+                status->color = (status_reg & SAA7191_STATUS_CODE)
+                        ? SAA7191_VALUE_ENABLED : SAA7191_VALUE_DISABLED;
+
+                status->input = decoder->input;
+                status->norm = decoder->norm;
+        }
+        case DECODER_SAA7191_SET_NORM: {
+                int *norm = arg;
+                return saa7191_set_norm(client, *norm);
+        }
+        case DECODER_SAA7191_GET_CONTROLS: {
+                struct saa7191_control *ctrl = arg;
+                return saa7191_get_controls(client, ctrl);
+        }
+        case DECODER_SAA7191_SET_CONTROLS: {
+                struct saa7191_control *ctrl = arg;
+                return saa7191_set_controls(client, ctrl);
+        }
+        default:
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+static struct i2c_driver i2c_driver_saa7191 = {
+        .owner          = THIS_MODULE,
+        .name           = "saa7191",
+        .id             = I2C_DRIVERID_SAA7191,
+        .flags          = I2C_DF_NOTIFY,
+        .attach_adapter = saa7191_probe,
+        .detach_client  = saa7191_detach,
+        .command        = saa7191_command
+};
+
+static int saa7191_init(void)
+{
+        return i2c_add_driver(&i2c_driver_saa7191);
+}
+
+static void saa7191_exit(void)
+{
+        i2c_del_driver(&i2c_driver_saa7191);
+}
+
+module_init(saa7191_init);
+module_exit(saa7191_exit);
diff --git a/drivers/media/video/saa7191.h b/drivers/media/video/saa7191.h
new file mode 100644
index 00000000000..27204503143
--- /dev/null
+++ b/drivers/media/video/saa7191.h
@@ -0,0 +1,139 @@
+/*
+ *  saa7191.h - Philips SAA7191 video decoder driver
+ *
+ *  Copyright (C) 2003 Ladislav Michl <ladis@linux-mips.org>
+ *  Copyright (C) 2004,2005 Mikael Nousiainen <tmnousia@cc.hut.fi>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ */
+
+#ifndef _SAA7191_H_
+#define _SAA7191_H_
+
+/* Philips SAA7191 DMSD I2C bus address */
+#define SAA7191_ADDR            0x8a
+
+/* Register subaddresses. */
+#define SAA7191_REG_IDEL        0x00
+#define SAA7191_REG_HSYB        0x01
+#define SAA7191_REG_HSYS        0x02
+#define SAA7191_REG_HCLB        0x03
+#define SAA7191_REG_HCLS        0x04
+#define SAA7191_REG_HPHI        0x05
+#define SAA7191_REG_LUMA        0x06
+#define SAA7191_REG_HUEC        0x07
+#define SAA7191_REG_CKTQ        0x08
+#define SAA7191_REG_CKTS        0x09
+#define SAA7191_REG_PLSE        0x0a
+#define SAA7191_REG_SESE        0x0b
+#define SAA7191_REG_GAIN        0x0c
+#define SAA7191_REG_STDC        0x0d
+#define SAA7191_REG_IOCK        0x0e
+#define SAA7191_REG_CTL3        0x0f
+#define SAA7191_REG_CTL4        0x10
+#define SAA7191_REG_CHCV        0x11
+#define SAA7191_REG_HS6B        0x14
+#define SAA7191_REG_HS6S        0x15
+#define SAA7191_REG_HC6B        0x16
+#define SAA7191_REG_HC6S        0x17
+#define SAA7191_REG_HP6I        0x18
+#define SAA7191_REG_STATUS      0xff    /* not really a subaddress */
+
+/* Status Register definitions */
+#define SAA7191_STATUS_CODE     0x01    /* color detected flag */
+#define SAA7191_STATUS_FIDT     0x20    /* format type NTSC/PAL */
+#define SAA7191_STATUS_HLCK     0x40    /* PLL unlocked/locked */
+#define SAA7191_STATUS_STTC     0x80    /* tv/vtr time constant */
+
+/* Luminance Control Register definitions */
+#define SAA7191_LUMA_BYPS       0x80
+
+/* Chroma Gain Control Settings Register definitions */
+/* 0=automatic colour-killer enabled, 1=forced colour on */
+#define SAA7191_GAIN_COLO       0x80
+
+/* Standard/Mode Control Register definitions */
+/* tv/vtr mode bit: 0=TV mode (slow time constant),
+ * 1=VTR mode (fast time constant) */
+#define SAA7191_STDC_VTRC       0x80
+/* SECAM mode bit: 0=other standards, 1=SECAM */
+#define SAA7191_STDC_SECS       0x01
+/* the bit fields above must be or'd with this value */
+#define SAA7191_STDC_VALUE      0x0c
+
+/* I/O and Clock Control Register definitions */
+/* horizontal clock PLL: 0=PLL closed,
+ * 1=PLL circuit open and horizontal freq fixed */
+#define SAA7191_IOCK_HPLL       0x80
+/* S-VHS bit (chrominance from CVBS or from chrominance input):
+ * 0=controlled by BYPS-bit, 1=from chrominance input */
+#define SAA7191_IOCK_CHRS       0x04
+/* general purpose switch 2
+ * VINO-specific: 0=used with CVBS, 1=used with S-Video */
+#define SAA7191_IOCK_GPSW2      0x02
+/* general purpose switch 1 */
+/* VINO-specific: 0=always, 1=not used!*/
+#define SAA7191_IOCK_GPSW1      0x01
+
+/* Miscellaneous Control #1 Register definitions */
+/* automatic field detection (50/60Hz standard) */
+#define SAA7191_CTL3_AUFD       0x80
+/* field select: (if AUFD=0)
+ * 0=50Hz (625 lines), 1=60Hz (525 lines) */
+#define SAA7191_CTL3_FSEL       0x40
+/* the bit fields above must be or'd with this value */
+#define SAA7191_CTL3_VALUE      0x19
+
+/* Chrominance Gain Control Register definitions
+ * (nominal value for UV CCIR level) */
+#define SAA7191_CHCV_NTSC       0x2c
+#define SAA7191_CHCV_PAL        0x59
+
+/* Driver interface definitions */
+#define SAA7191_INPUT_COMPOSITE 0
+#define SAA7191_INPUT_SVIDEO    1
+
+#define SAA7191_NORM_AUTO       0
+#define SAA7191_NORM_PAL        1
+#define SAA7191_NORM_NTSC       2
+#define SAA7191_NORM_SECAM      3
+
+#define SAA7191_VALUE_ENABLED           1
+#define SAA7191_VALUE_DISABLED          0
+#define SAA7191_VALUE_UNCHANGED         -1
+
+struct saa7191_status {
+        /* 0=no signal, 1=signal active*/
+        int signal;
+        /* 0=50hz (pal) signal, 1=60hz (ntsc) signal */
+        int ntsc;
+        /* 0=no color detected, 1=color detected */
+        int color;
+
+        /* current SAA7191_INPUT_ */
+        int input;
+        /* current SAA7191_NORM_ */
+        int norm;
+};
+
+#define SAA7191_HUE_MIN         0x00
+#define SAA7191_HUE_MAX         0xff
+#define SAA7191_HUE_DEFAULT     0x80
+
+#define SAA7191_VTRC_MIN        0x00
+#define SAA7191_VTRC_MAX        0x01
+#define SAA7191_VTRC_DEFAULT    0x00
+
+struct saa7191_control {
+        int hue;
+        int vtrc;
+};
+
+#define DECODER_SAA7191_GET_STATUS      _IOR('d', 195, struct saa7191_status)
+#define DECODER_SAA7191_SET_NORM        _IOW('d', 196, int)
+#define DECODER_SAA7191_GET_CONTROLS    _IOR('d', 197, struct saa7191_control)
+#define DECODER_SAA7191_SET_CONTROLS    _IOW('d', 198, struct saa7191_control)
+
+#endif
diff --git a/drivers/media/video/tda7432.c b/drivers/media/video/tda7432.c
index 7cb1fb3e66f..255b6088ebf 100644
--- a/drivers/media/video/tda7432.c
+++ b/drivers/media/video/tda7432.c
@@ -328,7 +328,7 @@ static int tda7432_probe(struct i2c_adapter *adap)
         if (adap->class & I2C_CLASS_TV_ANALOG)
                 return i2c_probe(adap, &addr_data, tda7432_attach);
 #else
-        if (adap->id == (I2C_ALGO_BIT | I2C_HW_B_BT848))
+        if (adap->id == I2C_HW_B_BT848)
                 return i2c_probe(adap, &addr_data, tda7432_attach);
 #endif
         return 0;
@@ -513,7 +513,7 @@ static struct i2c_driver driver = {
 
 static struct i2c_client client_template =
 {
-        I2C_DEVNAME("tda7432"),
+        .name       = "tda7432",
         .driver     = &driver,
 };
 
diff --git a/drivers/media/video/tda9840.c b/drivers/media/video/tda9840.c
index c29bdfc3244..1794686612c 100644
--- a/drivers/media/video/tda9840.c
+++ b/drivers/media/video/tda9840.c
@@ -205,7 +205,7 @@ static int detect(struct i2c_adapter *adapter, int address, int kind)
 static int attach(struct i2c_adapter *adapter)
 {
         /* let's see whether this is a know adapter we can attach to */
-        if (adapter->id != I2C_ALGO_SAA7146) {
+        if (adapter->id != I2C_HW_SAA7146) {
                 dprintk("refusing to probe on unknown adapter [name='%s',id=0x%x]\n", adapter->name, adapter->id);
                 return -ENODEV;
         }
@@ -231,7 +231,7 @@ static struct i2c_driver driver = {
 };
 
 static struct i2c_client client_template = {
-        I2C_DEVNAME("tda9840"),
+        .name = "tda9840",
         .driver = &driver,
 };
 
diff --git a/drivers/media/video/tda9875.c b/drivers/media/video/tda9875.c
index 566e1a5ca13..7e3dcdb262b 100644
--- a/drivers/media/video/tda9875.c
+++ b/drivers/media/video/tda9875.c
@@ -262,7 +262,7 @@ static int tda9875_probe(struct i2c_adapter *adap)
         if (adap->class & I2C_CLASS_TV_ANALOG)
                 return i2c_probe(adap, &addr_data, tda9875_attach);
 #else
-        if (adap->id == (I2C_ALGO_BIT | I2C_HW_B_BT848))
+        if (adap->id == I2C_HW_B_BT848)
                 return i2c_probe(adap, &addr_data, tda9875_attach);
 #endif
         return 0;
@@ -384,7 +384,7 @@ static struct i2c_driver driver = {
 
 static struct i2c_client client_template =
 {
-        I2C_DEVNAME("tda9875"),
+        .name      = "tda9875",
         .driver    = &driver,
 };
 
diff --git a/drivers/media/video/tda9887.c b/drivers/media/video/tda9887.c
index 108c3ad7d62..d60fc562aec 100644
--- a/drivers/media/video/tda9887.c
+++ b/drivers/media/video/tda9887.c
@@ -618,9 +618,9 @@ static int tda9887_probe(struct i2c_adapter *adap)
                 return i2c_probe(adap, &addr_data, tda9887_attach);
 #else
         switch (adap->id) {
-        case I2C_ALGO_BIT | I2C_HW_B_BT848:
-        case I2C_ALGO_BIT | I2C_HW_B_RIVA:
-        case I2C_ALGO_SAA7134:
+        case I2C_HW_B_BT848:
+        case I2C_HW_B_RIVA:
+        case I2C_HW_SAA7134:
                 return i2c_probe(adap, &addr_data, tda9887_attach);
                 break;
         }
@@ -760,7 +760,7 @@ tda9887_command(struct i2c_client *client, unsigned int cmd, void *arg)
         return 0;
 }
 
-static int tda9887_suspend(struct device * dev, u32 state, u32 level)
+static int tda9887_suspend(struct device * dev, pm_message_t state, u32 level)
 {
         dprintk("tda9887: suspend\n");
         return 0;
@@ -793,7 +793,7 @@ static struct i2c_driver driver = {
 };
 static struct i2c_client client_template =
 {
-        I2C_DEVNAME("tda9887"),
+        .name      = "tda9887",
         .flags     = I2C_CLIENT_ALLOW_USE,
         .driver    = &driver,
 };
diff --git a/drivers/media/video/tea6415c.c b/drivers/media/video/tea6415c.c
index b44db8a7b94..ee3688348b6 100644
--- a/drivers/media/video/tea6415c.c
+++ b/drivers/media/video/tea6415c.c
@@ -86,7 +86,7 @@ static int detect(struct i2c_adapter *adapter, int address, int kind)
 static int attach(struct i2c_adapter *adapter)
 {
         /* let's see whether this is a know adapter we can attach to */
-        if (adapter->id != I2C_ALGO_SAA7146) {
+        if (adapter->id != I2C_HW_SAA7146) {
                 dprintk("refusing to probe on unknown adapter [name='%s',id=0x%x]\n", adapter->name, adapter->id);
                 return -ENODEV;
         }
@@ -200,7 +200,7 @@ static struct i2c_driver driver = {
 };
 
 static struct i2c_client client_template = {
-        I2C_DEVNAME("tea6415c"),
+        .name = "tea6415c",
         .driver = &driver,
 };
 
diff --git a/drivers/media/video/tea6420.c b/drivers/media/video/tea6420.c
index 48d4db7d507..17975c19da5 100644
--- a/drivers/media/video/tea6420.c
+++ b/drivers/media/video/tea6420.c
@@ -135,7 +135,7 @@ static int tea6420_detect(struct i2c_adapter *adapter, int address, int kind)
 static int attach(struct i2c_adapter *adapter)
 {
         /* let's see whether this is a know adapter we can attach to */
-        if (adapter->id != I2C_ALGO_SAA7146) {
+        if (adapter->id != I2C_HW_SAA7146) {
                 dprintk("refusing to probe on unknown adapter [name='%s',id=0x%x]\n", adapter->name, adapter->id);
                 return -ENODEV;
         }
@@ -177,7 +177,7 @@ static struct i2c_driver driver = {
 };
 
 static struct i2c_client client_template = {
-        I2C_DEVNAME("tea6420"),
+        .name = "tea6420",
         .driver = &driver,
 };
 
diff --git a/drivers/media/video/tuner-3036.c b/drivers/media/video/tuner-3036.c
index 7d825e510ff..79203595b9c 100644
--- a/drivers/media/video/tuner-3036.c
+++ b/drivers/media/video/tuner-3036.c
@@ -41,7 +41,6 @@ static struct i2c_client_address_data addr_data = {
         .normal_i2c     = normal_i2c,
         .probe          = &ignore,
         .ignore         = &ignore,
-        .force          = &ignore,
 };
 
 /* ---------------------------------------------------------------------- */
@@ -166,7 +165,7 @@ static int
 tuner_probe(struct i2c_adapter *adap)
 {
         this_adap = 0;
-        if (adap->id == (I2C_ALGO_BIT | I2C_HW_B_LP))
+        if (adap->id == I2C_HW_B_LP)
                 return i2c_probe(adap, &addr_data, tuner_attach);
         return 0;
 }
diff --git a/drivers/media/video/tuner-core.c b/drivers/media/video/tuner-core.c
index f0a579827a2..3b1893c2ae3 100644
--- a/drivers/media/video/tuner-core.c
+++ b/drivers/media/video/tuner-core.c
@@ -672,7 +672,7 @@ static int tuner_command(struct i2c_client *client, unsigned int cmd, void *arg)
         return 0;
 }
 
-static int tuner_suspend(struct device *dev, u32 state, u32 level)
+static int tuner_suspend(struct device *dev, pm_message_t state, u32 level)
 {
         struct i2c_client *c = container_of (dev, struct i2c_client, dev);
         struct tuner *t = i2c_get_clientdata (c);
@@ -709,7 +709,7 @@ static struct i2c_driver driver = {
                    },
 };
 static struct i2c_client client_template = {
-        I2C_DEVNAME("(tuner unset)"),
+        .name = "(tuner unset)",
         .flags = I2C_CLIENT_ALLOW_USE,
         .driver = &driver,
 };
diff --git a/drivers/media/video/tvaudio.c b/drivers/media/video/tvaudio.c
index f42a1efa8fc..258724b2d6d 100644
--- a/drivers/media/video/tvaudio.c
+++ b/drivers/media/video/tvaudio.c
@@ -162,24 +162,23 @@ static int chip_write(struct CHIPSTATE *chip, int subaddr, int val)
         unsigned char buffer[2];
 
         if (-1 == subaddr) {
-                dprintk("%s: chip_write: 0x%x\n",
-                        i2c_clientname(&chip->c), val);
+                dprintk("%s: chip_write: 0x%x\n", chip->c.name, val);
                 chip->shadow.bytes[1] = val;
                 buffer[0] = val;
                 if (1 != i2c_master_send(&chip->c,buffer,1)) {
                         printk(KERN_WARNING "%s: I/O error (write 0x%x)\n",
-                               i2c_clientname(&chip->c), val);
+                               chip->c.name, val);
                         return -1;
                 }
         } else {
                 dprintk("%s: chip_write: reg%d=0x%x\n",
-                        i2c_clientname(&chip->c), subaddr, val);
+                        chip->c.name, subaddr, val);
                 chip->shadow.bytes[subaddr+1] = val;
                 buffer[0] = subaddr;
                 buffer[1] = val;
                 if (2 != i2c_master_send(&chip->c,buffer,2)) {
                         printk(KERN_WARNING "%s: I/O error (write reg%d=0x%x)\n",
-                               i2c_clientname(&chip->c), subaddr, val);
+                               chip->c.name, subaddr, val);
                         return -1;
                 }
         }
@@ -203,11 +202,10 @@ static int chip_read(struct CHIPSTATE *chip)
         unsigned char buffer;
 
         if (1 != i2c_master_recv(&chip->c,&buffer,1)) {
-                printk(KERN_WARNING "%s: I/O error (read)\n",
-                       i2c_clientname(&chip->c));
+                printk(KERN_WARNING "%s: I/O error (read)\n", chip->c.name);
                 return -1;
         }
-        dprintk("%s: chip_read: 0x%x\n",i2c_clientname(&chip->c),buffer);
+        dprintk("%s: chip_read: 0x%x\n", chip->c.name, buffer);
         return buffer;
 }
 
@@ -222,12 +220,11 @@ static int chip_read2(struct CHIPSTATE *chip, int subaddr)
         write[0] = subaddr;
 
         if (2 != i2c_transfer(chip->c.adapter,msgs,2)) {
-                printk(KERN_WARNING "%s: I/O error (read2)\n",
-                       i2c_clientname(&chip->c));
+                printk(KERN_WARNING "%s: I/O error (read2)\n", chip->c.name);
                 return -1;
         }
         dprintk("%s: chip_read2: reg%d=0x%x\n",
-                i2c_clientname(&chip->c),subaddr,read[0]);
+                chip->c.name, subaddr, read[0]);
         return read[0];
 }
 
@@ -240,7 +237,7 @@ static int chip_cmd(struct CHIPSTATE *chip, char *name, audiocmd *cmd)
 
         /* update our shadow register set; print bytes if (debug > 0) */
         dprintk("%s: chip_cmd(%s): reg=%d, data:",
-                i2c_clientname(&chip->c),name,cmd->bytes[0]);
+                chip->c.name, name, cmd->bytes[0]);
         for (i = 1; i < cmd->count; i++) {
                 dprintk(" 0x%x",cmd->bytes[i]);
                 chip->shadow.bytes[i+cmd->bytes[0]] = cmd->bytes[i];
@@ -249,7 +246,7 @@ static int chip_cmd(struct CHIPSTATE *chip, char *name, audiocmd *cmd)
 
         /* send data to the chip */
         if (cmd->count != i2c_master_send(&chip->c,cmd->bytes,cmd->count)) {
-                printk(KERN_WARNING "%s: I/O error (%s)\n", i2c_clientname(&chip->c), name);
+                printk(KERN_WARNING "%s: I/O error (%s)\n", chip->c.name, name);
                 return -1;
         }
         return 0;
@@ -274,9 +271,9 @@ static int chip_thread(void *data)
         struct CHIPSTATE *chip = data;
         struct CHIPDESC  *desc = chiplist + chip->type;
 
-        daemonize("%s",i2c_clientname(&chip->c));
+        daemonize("%s", chip->c.name);
         allow_signal(SIGTERM);
-        dprintk("%s: thread started\n", i2c_clientname(&chip->c));
+        dprintk("%s: thread started\n", chip->c.name);
 
         for (;;) {
                 add_wait_queue(&chip->wq, &wait);
@@ -288,7 +285,7 @@ static int chip_thread(void *data)
                 try_to_freeze();
                 if (chip->done || signal_pending(current))
                         break;
-                dprintk("%s: thread wakeup\n", i2c_clientname(&chip->c));
+                dprintk("%s: thread wakeup\n", chip->c.name);
 
                 /* don't do anything for radio or if mode != auto */
                 if (chip->norm == VIDEO_MODE_RADIO || chip->mode != 0)
@@ -301,7 +298,7 @@ static int chip_thread(void *data)
                 mod_timer(&chip->wt, jiffies+2*HZ);
         }
 
-        dprintk("%s: thread exiting\n", i2c_clientname(&chip->c));
+        dprintk("%s: thread exiting\n", chip->c.name);
         complete_and_exit(&chip->texit, 0);
         return 0;
 }
@@ -314,7 +311,7 @@ static void generic_checkmode(struct CHIPSTATE *chip)
         if (mode == chip->prevmode)
             return;
 
-        dprintk("%s: thread checkmode\n", i2c_clientname(&chip->c));
+        dprintk("%s: thread checkmode\n", chip->c.name);
         chip->prevmode = mode;
 
         if (mode & VIDEO_SOUND_STEREO)
@@ -1098,7 +1095,7 @@ static int tda8425_initialize(struct CHIPSTATE *chip)
                             /* extern   */ TDA8425_S1_CH1, /* intern */ TDA8425_S1_OFF,
                             /* off      */ TDA8425_S1_OFF, /* on     */ TDA8425_S1_CH2};
 
-        if (chip->c.adapter->id == (I2C_ALGO_BIT | I2C_HW_B_RIVA)) {
+        if (chip->c.adapter->id == I2C_HW_B_RIVA) {
                 memcpy (desc->inputmap, inputmap, sizeof (inputmap));
         }
         return 0;
@@ -1501,7 +1498,7 @@ static int chip_attach(struct i2c_adapter *adap, int addr, int kind)
                 (desc->flags & CHIP_HAS_INPUTSEL)   ? " audiomux"    : "");
 
         /* fill required data structures */
-        strcpy(i2c_clientname(&chip->c),desc->name);
+        strcpy(chip->c.name, desc->name);
         chip->type = desc-chiplist;
         chip->shadow.count = desc->registers+1;
         chip->prevmode = -1;
@@ -1538,7 +1535,7 @@ static int chip_attach(struct i2c_adapter *adap, int addr, int kind)
                 chip->tpid = kernel_thread(chip_thread,(void *)chip,0);
                 if (chip->tpid < 0)
                         printk(KERN_WARNING "%s: kernel_thread() failed\n",
-                               i2c_clientname(&chip->c));
+                               chip->c.name);
                 wake_up_interruptible(&chip->wq);
         }
         return 0;
@@ -1548,16 +1545,16 @@ static int chip_probe(struct i2c_adapter *adap)
 {
         /* don't attach on saa7146 based cards,
            because dedicated drivers are used */
-        if ((adap->id & I2C_ALGO_SAA7146))
+        if (adap->id == I2C_HW_SAA7146)
                 return 0;
 #ifdef I2C_CLASS_TV_ANALOG
         if (adap->class & I2C_CLASS_TV_ANALOG)
                 return i2c_probe(adap, &addr_data, chip_attach);
 #else
         switch (adap->id) {
-        case I2C_ALGO_BIT | I2C_HW_B_BT848:
-        case I2C_ALGO_BIT | I2C_HW_B_RIVA:
-        case I2C_ALGO_SAA7134:
+        case I2C_HW_B_BT848:
+        case I2C_HW_B_RIVA:
+        case I2C_HW_SAA7134:
                 return i2c_probe(adap, &addr_data, chip_attach);
         }
 #endif
@@ -1591,7 +1588,7 @@ static int chip_command(struct i2c_client *client,
         struct CHIPSTATE *chip = i2c_get_clientdata(client);
         struct CHIPDESC  *desc = chiplist + chip->type;
 
-        dprintk("%s: chip_command 0x%x\n",i2c_clientname(&chip->c),cmd);
+        dprintk("%s: chip_command 0x%x\n", chip->c.name, cmd);
 
         switch (cmd) {
         case AUDC_SET_INPUT:
@@ -1702,7 +1699,7 @@ static struct i2c_driver driver = {
 
 static struct i2c_client client_template =
 {
-        I2C_DEVNAME("(unset)"),
+        .name       = "(unset)",
         .flags      = I2C_CLIENT_ALLOW_USE,
         .driver     = &driver,
 };
diff --git a/drivers/media/video/tveeprom.c b/drivers/media/video/tveeprom.c
index 127ec38ebd6..3c3356a01cc 100644
--- a/drivers/media/video/tveeprom.c
+++ b/drivers/media/video/tveeprom.c
@@ -534,7 +534,7 @@ static int
 tveeprom_attach_adapter (struct i2c_adapter *adapter)
 {
         dprintk(1,"%s: id 0x%x\n",__FUNCTION__,adapter->id);
-        if (adapter->id != (I2C_ALGO_BIT | I2C_HW_B_BT848))
+        if (adapter->id != I2C_HW_B_BT848)
                 return 0;
         return i2c_probe(adapter, &addr_data, tveeprom_detect_client);
 }
diff --git a/drivers/media/video/tvmixer.c b/drivers/media/video/tvmixer.c
index 51b99cdbf29..a43301a154a 100644
--- a/drivers/media/video/tvmixer.c
+++ b/drivers/media/video/tvmixer.c
@@ -91,7 +91,7 @@ static int tvmixer_ioctl(struct inode *inode, struct file *file, unsigned int cm
         if (cmd == SOUND_MIXER_INFO) {
                 mixer_info info;
                 strlcpy(info.id, "tv card", sizeof(info.id));
-                strlcpy(info.name, i2c_clientname(client), sizeof(info.name));
+                strlcpy(info.name, client->name, sizeof(info.name));
                 info.modify_counter = 42 /* FIXME */;
                 if (copy_to_user(argp, &info, sizeof(info)))
                         return -EFAULT;
@@ -100,7 +100,7 @@ static int tvmixer_ioctl(struct inode *inode, struct file *file, unsigned int cm
         if (cmd == SOUND_OLD_MIXER_INFO) {
                 _old_mixer_info info;
                 strlcpy(info.id, "tv card", sizeof(info.id));
-                strlcpy(info.name, i2c_clientname(client), sizeof(info.name));
+                strlcpy(info.name, client->name, sizeof(info.name));
                 if (copy_to_user(argp, &info, sizeof(info)))
                         return -EFAULT;
                 return 0;
@@ -276,9 +276,9 @@ static int tvmixer_clients(struct i2c_client *client)
 #else
         /* TV card ??? */
         switch (client->adapter->id) {
-        case I2C_ALGO_BIT | I2C_HW_SMBUS_VOODOO3:
-        case I2C_ALGO_BIT | I2C_HW_B_BT848:
-        case I2C_ALGO_BIT | I2C_HW_B_RIVA:
+        case I2C_HW_SMBUS_VOODOO3:
+        case I2C_HW_B_BT848:
+        case I2C_HW_B_RIVA:
                 /* ok, have a look ... */
                 break;
         default:
@@ -295,7 +295,7 @@ static int tvmixer_clients(struct i2c_client *client)
                         devices[i].dev = NULL;
                         devices[i].minor = -1;
                         printk("tvmixer: %s unregistered (#1)\n",
-                               i2c_clientname(client));
+                               client->name);
                         return 0;
                 }
         }
@@ -354,7 +354,7 @@ static void __exit tvmixer_cleanup_module(void)
                 if (devices[i].minor != -1) {
                         unregister_sound_mixer(devices[i].minor);
                         printk("tvmixer: %s unregistered (#2)\n",
-                               i2c_clientname(devices[i].dev));
+                               devices[i].dev->name);
                 }
         }
 }
diff --git a/drivers/media/video/vino.c b/drivers/media/video/vino.c
index 76e8681d65c..d8a0f763ca1 100644
--- a/drivers/media/video/vino.c
+++ b/drivers/media/video/vino.c
@@ -1,80 +1,606 @@
 /*
- * (incomplete) Driver for the VINO (Video In No Out) system found in SGI Indys.
+ * Driver for the VINO (Video In No Out) system found in SGI Indys.
  *
  * This file is subject to the terms and conditions of the GNU General Public
  * License version 2 as published by the Free Software Foundation.
  *
+ * Copyright (C) 2004,2005 Mikael Nousiainen <tmnousia@cc.hut.fi>
+ *
+ * Based on the previous version of the driver for 2.4 kernels by:
  * Copyright (C) 2003 Ladislav Michl <ladis@linux-mips.org>
  */
 
-#include <linux/module.h>
+/*
+ * TODO:
+ * - remove "hacks" from memory allocation code and implement nopage()
+ * - check decimation, calculating and reporting image size when
+ *   using decimation
+ * - check vino_acquire_input(), vino_set_input() and channel
+ *   ownership handling
+ * - report VINO error-interrupts via ioctls ?
+ * - implement picture controls (all implemented?)
+ * - use macros for boolean values (?)
+ * - implement user mode buffers and overlay (?)
+ */
+
 #include <linux/init.h>
-#include <linux/types.h>
-#include <linux/mm.h>
-#include <linux/slab.h>
-#include <linux/wrapper.h>
-#include <linux/errno.h>
-#include <linux/irq.h>
+#include <linux/module.h>
 #include <linux/delay.h>
-#include <linux/videodev.h>
+#include <linux/errno.h>
+#include <linux/fs.h>
+#include <linux/kernel.h>
+#include <linux/mm.h>
+#include <linux/interrupt.h>
+#include <linux/dma-mapping.h>
+#include <linux/time.h>
+#include <linux/moduleparam.h>
+
+#ifdef CONFIG_KMOD
+#include <linux/kmod.h>
+#endif
+
 #include <linux/i2c.h>
 #include <linux/i2c-algo-sgi.h>
 
-#include <asm/addrspace.h>
-#include <asm/system.h>
-#include <asm/bootinfo.h>
-#include <asm/pgtable.h>
+#include <linux/videodev.h>
+#include <linux/videodev2.h>
+#include <linux/video_decoder.h>
+
 #include <asm/paccess.h>
 #include <asm/io.h>
 #include <asm/sgi/ip22.h>
-#include <asm/sgi/hpc3.h>
 #include <asm/sgi/mc.h>
 
 #include "vino.h"
+#include "saa7191.h"
+#include "indycam.h"
+
+/* Uncomment the following line to get lots and lots of (mostly useless)
+ * debug info.
+ * Note that the debug output also slows down the driver significantly */
+// #define VINO_DEBUG
+
+#define VINO_MODULE_VERSION "0.0.3"
+#define VINO_VERSION_CODE KERNEL_VERSION(0, 0, 3)
+
+MODULE_DESCRIPTION("SGI VINO Video4Linux2 driver");
+MODULE_VERSION(VINO_MODULE_VERSION);
+MODULE_AUTHOR("Mikael Nousiainen <tmnousia@cc.hut.fi>");
+MODULE_LICENSE("GPL");
 
-/* debugging? */
-#if 1
-#define DEBUG(x...)     printk(x);
+#define mem_map_reserve(p) set_bit(PG_reserved, &((p)->flags))
+#define mem_map_unreserve(p) clear_bit(PG_reserved, &((p)->flags))
+
+#ifdef VINO_DEBUG
+#define dprintk(x...) printk("VINO: " x);
 #else
-#define DEBUG(x...)
+#define dprintk(x...)
 #endif
 
+#define VINO_NO_CHANNEL                 0
+#define VINO_CHANNEL_A                  1
+#define VINO_CHANNEL_B                  2
+
+#define VINO_PAL_WIDTH                  768
+#define VINO_PAL_HEIGHT                 576
+#define VINO_NTSC_WIDTH                 640
+#define VINO_NTSC_HEIGHT                480
+
+#define VINO_MIN_WIDTH                  32
+#define VINO_MIN_HEIGHT                 32
+
+#define VINO_CLIPPING_START_ODD_D1      1
+#define VINO_CLIPPING_START_ODD_PAL     1
+#define VINO_CLIPPING_START_ODD_NTSC    1
+
+#define VINO_CLIPPING_START_EVEN_D1     2
+#define VINO_CLIPPING_START_EVEN_PAL    2
+#define VINO_CLIPPING_START_EVEN_NTSC   2
+
+#define VINO_INPUT_CHANNEL_COUNT        3
+
+#define VINO_INPUT_NONE                 -1
+#define VINO_INPUT_COMPOSITE            0
+#define VINO_INPUT_SVIDEO               1
+#define VINO_INPUT_D1                   2
+
+#define VINO_PAGE_RATIO                 (PAGE_SIZE / VINO_PAGE_SIZE)
+
+#define VINO_FIFO_THRESHOLD_DEFAULT     512
+
+/*#define VINO_FRAMEBUFFER_SIZE         (VINO_PAL_WIDTH * VINO_PAL_HEIGHT * 4 \
+  + 2 * PAGE_SIZE)*/
+#define VINO_FRAMEBUFFER_SIZE           ((VINO_PAL_WIDTH \
+                                          * VINO_PAL_HEIGHT * 4 \
+                                          + 3 * PAGE_SIZE) & ~(PAGE_SIZE - 1))
+
+#define VINO_FRAMEBUFFER_MAX_COUNT      8
+
+#define VINO_FRAMEBUFFER_UNUSED         0
+#define VINO_FRAMEBUFFER_IN_USE         1
+#define VINO_FRAMEBUFFER_READY          2
+
+#define VINO_QUEUE_ERROR                -1
+#define VINO_QUEUE_MAGIC                0x20050125
+
+#define VINO_MEMORY_NONE                0
+#define VINO_MEMORY_MMAP                1
+#define VINO_MEMORY_USERPTR             2
+
+#define VINO_DUMMY_DESC_COUNT           4
+#define VINO_DESC_FETCH_DELAY           5       /* microseconds */
+
+/* the number is the index for vino_data_formats */
+#define VINO_DATA_FMT_NONE              -1
+#define VINO_DATA_FMT_GREY              0
+#define VINO_DATA_FMT_RGB332            1
+#define VINO_DATA_FMT_RGB32             2
+#define VINO_DATA_FMT_YUV               3
+//#define VINO_DATA_FMT_RGB24           4
+
+#define VINO_DATA_FMT_COUNT             4
+
+#define VINO_DATA_NORM_NONE             -1
+#define VINO_DATA_NORM_NTSC             0
+#define VINO_DATA_NORM_PAL              1
+#define VINO_DATA_NORM_SECAM            2
+#define VINO_DATA_NORM_D1               3
+/* The following is a special entry that can be used to
+ * autodetect the norm. */
+#define VINO_DATA_NORM_AUTO             0xff
+
+#define VINO_DATA_NORM_COUNT            4
 
-/* VINO ASIC registers */
-struct sgi_vino *vino;
+/* Internal data structure definitions */
 
-static const char *vinostr = "VINO IndyCam/TV";
-static int threshold_a = 512;
-static int threshold_b = 512;
+struct vino_input {
+        char *name;
+        v4l2_std_id std;
+};
+
+struct vino_clipping {
+        unsigned int left, right, top, bottom;
+};
+
+struct vino_data_format {
+        /* the description */
+        char *description;
+        /* bytes per pixel */
+        unsigned int bpp;
+        /* V4L2 fourcc code */
+        __u32 pixelformat;
+        /* V4L2 colorspace (duh!) */
+        enum v4l2_colorspace colorspace;
+};
+
+struct vino_data_norm {
+        char *description;
+        unsigned int width, height;
+        struct vino_clipping odd;
+        struct vino_clipping even;
+
+        v4l2_std_id std;
+        unsigned int fps_min, fps_max;
+        __u32 framelines;
+};
+
+struct vino_descriptor_table {
+        /* the number of PAGE_SIZE sized pages in the buffer */
+        unsigned int page_count;
+        /* virtual (kmalloc'd) pointers to the actual data
+         * (in PAGE_SIZE chunks, used with mmap streaming) */
+        unsigned long *virtual;
+
+        /* cpu address for the VINO descriptor table
+         * (contains DMA addresses, VINO_PAGE_SIZE chunks) */
+        unsigned long *dma_cpu;
+        /* dma address for the VINO descriptor table
+         * (contains DMA addresses, VINO_PAGE_SIZE chunks) */
+        dma_addr_t dma;
+};
+
+struct vino_framebuffer {
+        /* identifier nubmer */
+        unsigned int id;
+        /* the length of the whole buffer */
+        unsigned int size;
+        /* the length of actual data in buffer */
+        unsigned int data_size;
+        /* the data format */
+        unsigned int data_format;
+        /* the state of buffer data */
+        unsigned int state;
+        /* is the buffer mapped in user space? */
+        unsigned int map_count;
+        /* memory offset for mmap() */
+        unsigned int offset;
+        /* frame counter */
+        unsigned int frame_counter;
+        /* timestamp (written when image capture finishes) */
+        struct timeval timestamp;
+
+        struct vino_descriptor_table desc_table;
+
+        spinlock_t state_lock;
+};
 
-struct vino_device {
-        struct video_device vdev;
-#define VINO_CHAN_A             1
-#define VINO_CHAN_B             2
-        int chan;
+struct vino_framebuffer_fifo {
+        unsigned int length;
+
+        unsigned int used;
+        unsigned int head;
+        unsigned int tail;
+
+        unsigned int data[VINO_FRAMEBUFFER_MAX_COUNT];
+};
+
+struct vino_framebuffer_queue {
+        unsigned int magic;
+
+        /* VINO_MEMORY_NONE, VINO_MEMORY_MMAP or VINO_MEMORY_USERPTR */
+        unsigned int type;
+        unsigned int length;
+
+        /* data field of in and out contain index numbers for buffer */
+        struct vino_framebuffer_fifo in;
+        struct vino_framebuffer_fifo out;
+
+        struct vino_framebuffer *buffer[VINO_FRAMEBUFFER_MAX_COUNT];
+
+        spinlock_t queue_lock;
+        struct semaphore queue_sem;
+        wait_queue_head_t frame_wait_queue;
+};
+
+struct vino_channel_settings {
+        unsigned int channel;
+
+        int input;
+        unsigned int data_format;
+        unsigned int data_norm;
+        struct vino_clipping clipping;
+        unsigned int decimation;
+        unsigned int line_size;
+        unsigned int alpha;
+        unsigned int fps;
+        unsigned int framert_reg;
+
+        unsigned int fifo_threshold;
+
+        struct vino_framebuffer_queue fb_queue;
+
+        /* number of the current field */
+        unsigned int field;
+
+        /* read in progress */
+        int reading;
+        /* streaming is active */
+        int streaming;
+        /* the driver is currently processing the queue */
+        int capturing;
+
+        struct semaphore sem;
+        spinlock_t capture_lock;
+
+        unsigned int users;
+
+        /* V4L support */
+        struct video_device *v4l_device;
 };
 
 struct vino_client {
+        /* the channel which owns this client:
+         * VINO_NO_CHANNEL, VINO_CHANNEL_A or VINO_CHANNEL_B */
+        unsigned int owner;
         struct i2c_client *driver;
-        int owner;
 };
 
-struct vino_video {
-        struct vino_device chA;
-        struct vino_device chB;
+struct vino_settings {
+        struct vino_channel_settings a;
+        struct vino_channel_settings b;
 
         struct vino_client decoder;
         struct vino_client camera;
 
-        struct semaphore input_lock;
+        /* a lock for vino register access */
+        spinlock_t vino_lock;
+        /* a lock for channel input changes */
+        spinlock_t input_lock;
 
-        /* Loaded into VINO descriptors to clear End Of Descriptors table
-         * interupt condition */
         unsigned long dummy_page;
-        unsigned int dummy_buf[4] __attribute__((aligned(8)));
+        struct vino_descriptor_table dummy_desc_table;
 };
 
-static struct vino_video *Vino;
+/* Module parameters */
+
+/*
+ * Using vino_pixel_conversion the ARGB32-format pixels supplied
+ * by the VINO chip can be converted to more common formats
+ * like RGBA32 (or probably RGB24 in the future). This way we
+ * can give out data that can be specified correctly with
+ * the V4L2-definitions.
+ *
+ * The pixel format is specified as RGBA32 when no conversion
+ * is used.
+ *
+ * Note that this only affects the 32-bit bit depth.
+ *
+ * Use non-zero value to enable conversion.
+ */
+static int vino_pixel_conversion = 0;
+module_param_named(pixelconv, vino_pixel_conversion, int, 0);
+MODULE_PARM_DESC(pixelconv,
+                 "enable pixel conversion (non-zero value enables)");
+
+/* Internal data structures */
+
+static struct sgi_vino *vino;
+
+static struct vino_settings *vino_drvdata;
+
+static const char *vino_driver_name = "vino";
+static const char *vino_driver_description = "SGI VINO";
+static const char *vino_bus_name = "GIO64 bus";
+static const char *vino_v4l_device_name_a = "SGI VINO Channel A";
+static const char *vino_v4l_device_name_b = "SGI VINO Channel B";
+
+static const struct vino_input vino_inputs[] = {
+        {
+                .name           = "Composite",
+                .std            = V4L2_STD_NTSC | V4L2_STD_PAL | V4L2_STD_SECAM,
+        },{
+                .name           = "S-Video",
+                .std            = V4L2_STD_NTSC | V4L2_STD_PAL | V4L2_STD_SECAM,
+        },{
+                .name           = "D1 (IndyCam)",
+                .std            = V4L2_STD_NTSC,
+        }
+};
+
+static const struct vino_data_format vino_data_formats[] = {
+        {
+                .description    = "8-bit greyscale",
+                .bpp            = 1,
+                .pixelformat    = V4L2_PIX_FMT_GREY,
+                .colorspace     = V4L2_COLORSPACE_SMPTE170M,
+        },{
+                .description    = "8-bit dithered RGB 3-3-2",
+                .bpp            = 1,
+                .pixelformat    = V4L2_PIX_FMT_RGB332,
+                .colorspace     = V4L2_COLORSPACE_SRGB,
+        },{
+                .description    = "32-bit RGB",
+                .bpp            = 4,
+                .pixelformat    = V4L2_PIX_FMT_RGB32,
+                .colorspace     = V4L2_COLORSPACE_SRGB,
+        },{
+                .description    = "YUV 4:2:2",
+                .bpp            = 4,
+                .pixelformat    = V4L2_PIX_FMT_YUYV, // XXX: swapped?
+                .colorspace     = V4L2_COLORSPACE_SMPTE170M,
+        }/*,{
+                .description    = "24-bit RGB",
+                .bpp            = 3,
+                .pixelformat    = V4L2_PIX_FMT_RGB24,
+                .colorspace     = V4L2_COLORSPACE_SRGB,
+                }*/
+};
+
+static const struct vino_data_norm vino_data_norms[] = {
+        {
+                .description    = "NTSC",
+                .std            = V4L2_STD_NTSC,
+                .fps_min        = 6,
+                .fps_max        = 30,
+                .framelines     = 525,
+                .width          = VINO_NTSC_WIDTH,
+                .height         = VINO_NTSC_HEIGHT,
+                .odd            = {
+                        .top    = VINO_CLIPPING_START_ODD_NTSC,
+                        .left   = 0,
+                        .bottom = VINO_CLIPPING_START_ODD_NTSC
+                        + VINO_NTSC_HEIGHT / 2 - 1,
+                        .right  = VINO_NTSC_WIDTH,
+                },
+                .even           = {
+                        .top    = VINO_CLIPPING_START_EVEN_NTSC,
+                        .left   = 0,
+                        .bottom = VINO_CLIPPING_START_EVEN_NTSC
+                        + VINO_NTSC_HEIGHT / 2 - 1,
+                        .right  = VINO_NTSC_WIDTH,
+                },
+        },{
+                .description    = "PAL",
+                .std            = V4L2_STD_PAL,
+                .fps_min        = 5,
+                .fps_max        = 25,
+                .framelines     = 625,
+                .width          = VINO_PAL_WIDTH,
+                .height         = VINO_PAL_HEIGHT,
+                .odd            = {
+                        .top    = VINO_CLIPPING_START_ODD_PAL,
+                        .left   = 0,
+                        .bottom = VINO_CLIPPING_START_ODD_PAL
+                        + VINO_PAL_HEIGHT / 2 - 1,
+                        .right  = VINO_PAL_WIDTH,
+                },
+                .even           = {
+                        .top    = VINO_CLIPPING_START_EVEN_PAL,
+                        .left   = 0,
+                        .bottom = VINO_CLIPPING_START_EVEN_PAL
+                        + VINO_PAL_HEIGHT / 2 - 1,
+                        .right  = VINO_PAL_WIDTH,
+                },
+        },{
+                .description    = "SECAM",
+                .std            = V4L2_STD_SECAM,
+                .fps_min        = 5,
+                .fps_max        = 25,
+                .framelines     = 625,
+                .width          = VINO_PAL_WIDTH,
+                .height         = VINO_PAL_HEIGHT,
+                .odd            = {
+                        .top    = VINO_CLIPPING_START_ODD_PAL,
+                        .left   = 0,
+                        .bottom = VINO_CLIPPING_START_ODD_PAL
+                        + VINO_PAL_HEIGHT / 2 - 1,
+                        .right  = VINO_PAL_WIDTH,
+                },
+                .even           = {
+                        .top    = VINO_CLIPPING_START_EVEN_PAL,
+                        .left   = 0,
+                        .bottom = VINO_CLIPPING_START_EVEN_PAL
+                        + VINO_PAL_HEIGHT / 2 - 1,
+                        .right  = VINO_PAL_WIDTH,
+                },
+        },{
+                .description    = "NTSC (D1 input)",
+                .std            = V4L2_STD_NTSC,
+                .fps_min        = 6,
+                .fps_max        = 30,
+                .framelines     = 525,
+                .width          = VINO_NTSC_WIDTH,
+                .height         = VINO_NTSC_HEIGHT,
+                .odd            = {
+                        .top    = VINO_CLIPPING_START_ODD_D1,
+                        .left   = 0,
+                        .bottom = VINO_CLIPPING_START_ODD_D1
+                        + VINO_NTSC_HEIGHT / 2 - 1,
+                        .right  = VINO_NTSC_WIDTH,
+                },
+                .even           = {
+                        .top    = VINO_CLIPPING_START_EVEN_D1,
+                        .left   = 0,
+                        .bottom = VINO_CLIPPING_START_EVEN_D1
+                        + VINO_NTSC_HEIGHT / 2 - 1,
+                        .right  = VINO_NTSC_WIDTH,
+                },
+        }
+};
+
+#define VINO_INDYCAM_V4L2_CONTROL_COUNT         9
+
+struct v4l2_queryctrl vino_indycam_v4l2_controls[] = {
+        {
+                .id = V4L2_CID_AUTOGAIN,
+                .type = V4L2_CTRL_TYPE_BOOLEAN,
+                .name = "Automatic Gain Control",
+                .minimum = 0,
+                .maximum = 1,
+                .step = 1,
+                .default_value = INDYCAM_AGC_DEFAULT,
+                .flags = 0,
+                .reserved = { 0, 0 },
+        },{
+                .id = V4L2_CID_AUTO_WHITE_BALANCE,
+                .type = V4L2_CTRL_TYPE_BOOLEAN,
+                .name = "Automatic White Balance",
+                .minimum = 0,
+                .maximum = 1,
+                .step = 1,
+                .default_value = INDYCAM_AWB_DEFAULT,
+                .flags = 0,
+                .reserved = { 0, 0 },
+        },{
+                .id = V4L2_CID_GAIN,
+                .type = V4L2_CTRL_TYPE_INTEGER,
+                .name = "Gain",
+                .minimum = INDYCAM_GAIN_MIN,
+                .maximum = INDYCAM_GAIN_MAX,
+                .step = 1,
+                .default_value = INDYCAM_GAIN_DEFAULT,
+                .flags = 0,
+                .reserved = { 0, 0 },
+        },{
+                .id = V4L2_CID_PRIVATE_BASE,
+                .type = V4L2_CTRL_TYPE_INTEGER,
+                .name = "Red Saturation",
+                .minimum = INDYCAM_RED_SATURATION_MIN,
+                .maximum = INDYCAM_RED_SATURATION_MAX,
+                .step = 1,
+                .default_value = INDYCAM_RED_SATURATION_DEFAULT,
+                .flags = 0,
+                .reserved = { 0, 0 },
+        },{
+                .id = V4L2_CID_PRIVATE_BASE + 1,
+                .type = V4L2_CTRL_TYPE_INTEGER,
+                .name = "Blue Saturation",
+                .minimum = INDYCAM_BLUE_SATURATION_MIN,
+                .maximum = INDYCAM_BLUE_SATURATION_MAX,
+                .step = 1,
+                .default_value = INDYCAM_BLUE_SATURATION_DEFAULT,
+                .flags = 0,
+                .reserved = { 0, 0 },
+        },{
+                .id = V4L2_CID_RED_BALANCE,
+                .type = V4L2_CTRL_TYPE_INTEGER,
+                .name = "Red Balance",
+                .minimum = INDYCAM_RED_BALANCE_MIN,
+                .maximum = INDYCAM_RED_BALANCE_MAX,
+                .step = 1,
+                .default_value = INDYCAM_RED_BALANCE_DEFAULT,
+                .flags = 0,
+                .reserved = { 0, 0 },
+        },{
+                .id = V4L2_CID_BLUE_BALANCE,
+                .type = V4L2_CTRL_TYPE_INTEGER,
+                .name = "Blue Balance",
+                .minimum = INDYCAM_BLUE_BALANCE_MIN,
+                .maximum = INDYCAM_BLUE_BALANCE_MAX,
+                .step = 1,
+                .default_value = INDYCAM_BLUE_BALANCE_DEFAULT,
+                .flags = 0,
+                .reserved = { 0, 0 },
+        },{
+                .id = V4L2_CID_EXPOSURE,
+                .type = V4L2_CTRL_TYPE_INTEGER,
+                .name = "Shutter Control",
+                .minimum = INDYCAM_SHUTTER_MIN,
+                .maximum = INDYCAM_SHUTTER_MAX,
+                .step = 1,
+                .default_value = INDYCAM_SHUTTER_DEFAULT,
+                .flags = 0,
+                .reserved = { 0, 0 },
+        },{
+                .id = V4L2_CID_GAMMA,
+                .type = V4L2_CTRL_TYPE_INTEGER,
+                .name = "Gamma",
+                .minimum = INDYCAM_GAMMA_MIN,
+                .maximum = INDYCAM_GAMMA_MAX,
+                .step = 1,
+                .default_value = INDYCAM_GAMMA_DEFAULT,
+                .flags = 0,
+                .reserved = { 0, 0 },
+        }
+};
+
+#define VINO_SAA7191_V4L2_CONTROL_COUNT         2
+
+struct v4l2_queryctrl vino_saa7191_v4l2_controls[] = {
+        {
+                .id = V4L2_CID_HUE,
+                .type = V4L2_CTRL_TYPE_INTEGER,
+                .name = "Hue",
+                .minimum = SAA7191_HUE_MIN,
+                .maximum = SAA7191_HUE_MAX,
+                .step = 1,
+                .default_value = SAA7191_HUE_DEFAULT,
+                .flags = 0,
+                .reserved = { 0, 0 },
+        },{
+                .id = V4L2_CID_PRIVATE_BASE,
+                .type = V4L2_CTRL_TYPE_BOOLEAN,
+                .name = "VTR Time Constant",
+                .minimum = SAA7191_VTRC_MIN,
+                .maximum = SAA7191_VTRC_MAX,
+                .step = 1,
+                .default_value = SAA7191_VTRC_DEFAULT,
+                .flags = 0,
+                .reserved = { 0, 0 },
+        }
+};
+
+/* VINO I2C bus functions */
 
 unsigned i2c_vino_getctrl(void *data)
 {
@@ -112,49 +638,49 @@ static struct i2c_algo_sgi_data i2c_sgi_vino_data =
  */
 static int i2c_vino_client_reg(struct i2c_client *client)
 {
-        int res = 0;
+        int ret = 0;
 
-        down(&Vino->input_lock);
+        spin_lock(&vino_drvdata->input_lock);
         switch (client->driver->id) {
         case I2C_DRIVERID_SAA7191:
-                if (Vino->decoder.driver)
-                        res = -EBUSY;
+                if (vino_drvdata->decoder.driver)
+                        ret = -EBUSY;
                 else
-                        Vino->decoder.driver = client;
+                        vino_drvdata->decoder.driver = client;
                 break;
         case I2C_DRIVERID_INDYCAM:
-                if (Vino->camera.driver)
-                        res = -EBUSY;
+                if (vino_drvdata->camera.driver)
+                        ret = -EBUSY;
                 else
-                        Vino->camera.driver = client;
+                        vino_drvdata->camera.driver = client;
                 break;
         default:
-                res = -ENODEV;
+                ret = -ENODEV;
         }
-        up(&Vino->input_lock);
+        spin_unlock(&vino_drvdata->input_lock);
 
-        return res;
+        return ret;
 }
 
 static int i2c_vino_client_unreg(struct i2c_client *client)
 {
-        int res = 0;
+        int ret = 0;
 
-        down(&Vino->input_lock);
-        if (client == Vino->decoder.driver) {
-                if (Vino->decoder.owner)
-                        res = -EBUSY;
+        spin_lock(&vino_drvdata->input_lock);
+        if (client == vino_drvdata->decoder.driver) {
+                if (vino_drvdata->decoder.owner != VINO_NO_CHANNEL)
+                        ret = -EBUSY;
                 else
-                        Vino->decoder.driver = NULL;
-        } else if (client == Vino->camera.driver) {
-                if (Vino->camera.owner)
-                        res = -EBUSY;
+                        vino_drvdata->decoder.driver = NULL;
+        } else if (client == vino_drvdata->camera.driver) {
+                if (vino_drvdata->camera.owner != VINO_NO_CHANNEL)
+                        ret = -EBUSY;
                 else
-                        Vino->camera.driver = NULL;
+                        vino_drvdata->camera.driver = NULL;
         }
-        up(&Vino->input_lock);
+        spin_unlock(&vino_drvdata->input_lock);
 
-        return res;
+        return ret;
 }
 
 static struct i2c_adapter vino_i2c_adapter =
@@ -176,172 +702,3591 @@ static int vino_i2c_del_bus(void)
         return i2c_sgi_del_bus(&vino_i2c_adapter);
 }
 
+static int i2c_camera_command(unsigned int cmd, void *arg)
+{
+        return vino_drvdata->camera.driver->
+                driver->command(vino_drvdata->camera.driver,
+                                cmd, arg);
+}
+
+static int i2c_decoder_command(unsigned int cmd, void *arg)
+{
+        return vino_drvdata->decoder.driver->
+                driver->command(vino_drvdata->decoder.driver,
+                                cmd, arg);
+}
+
+/* VINO framebuffer/DMA descriptor management */
+
+static void vino_free_buffer_with_count(struct vino_framebuffer *fb,
+                                               unsigned int count)
+{
+        unsigned int i;
+
+        dprintk("vino_free_buffer_with_count(): count = %d\n", count);
+
+        for (i = 0; i < count; i++) {
+                mem_map_unreserve(virt_to_page(fb->desc_table.virtual[i]));
+                dma_unmap_single(NULL,
+                                 fb->desc_table.dma_cpu[VINO_PAGE_RATIO * i],
+                                 PAGE_SIZE, DMA_FROM_DEVICE);
+                free_page(fb->desc_table.virtual[i]);
+        }
+
+        dma_free_coherent(NULL,
+                          VINO_PAGE_RATIO * (fb->desc_table.page_count + 4) *
+                          sizeof(dma_addr_t), (void *)fb->desc_table.dma_cpu,
+                          fb->desc_table.dma);
+        kfree(fb->desc_table.virtual);
+
+        memset(fb, 0, sizeof(struct vino_framebuffer));
+}
+
+static void vino_free_buffer(struct vino_framebuffer *fb)
+{
+        vino_free_buffer_with_count(fb, fb->desc_table.page_count);
+}
+
+static int vino_allocate_buffer(struct vino_framebuffer *fb,
+                                unsigned int size)
+{
+        unsigned int count, i, j;
+        int ret = 0;
+
+        dprintk("vino_allocate_buffer():\n");
+
+        if (size < 1)
+                return -EINVAL;
+
+        memset(fb, 0, sizeof(struct vino_framebuffer));
+
+        count = ((size / PAGE_SIZE) + 4) & ~3;
+
+        dprintk("vino_allocate_buffer(): size = %d, count = %d\n",
+                size, count);
+
+        /* allocate memory for table with virtual (page) addresses */
+        fb->desc_table.virtual = (unsigned long *)
+                kmalloc(count * sizeof(unsigned long), GFP_KERNEL);
+        if (!fb->desc_table.virtual)
+                return -ENOMEM;
+
+        /* allocate memory for table with dma addresses
+         * (has space for four extra descriptors) */
+        fb->desc_table.dma_cpu =
+                dma_alloc_coherent(NULL, VINO_PAGE_RATIO * (count + 4) *
+                                   sizeof(dma_addr_t), &fb->desc_table.dma,
+                                   GFP_KERNEL | GFP_DMA);
+        if (!fb->desc_table.dma_cpu) {
+                ret = -ENOMEM;
+                goto out_free_virtual;
+        }
+
+        /* allocate pages for the buffer and acquire the according
+         * dma addresses */
+        for (i = 0; i < count; i++) {
+                dma_addr_t dma_data_addr;
+
+                fb->desc_table.virtual[i] =
+                        get_zeroed_page(GFP_KERNEL | GFP_DMA);
+                if (!fb->desc_table.virtual[i]) {
+                        ret = -ENOBUFS;
+                        break;
+                }
+
+                dma_data_addr =
+                        dma_map_single(NULL,
+                                       (void *)fb->desc_table.virtual[i],
+                                       PAGE_SIZE, DMA_FROM_DEVICE);
+
+                for (j = 0; j < VINO_PAGE_RATIO; j++) {
+                        fb->desc_table.dma_cpu[VINO_PAGE_RATIO * i + j] =
+                                dma_data_addr + VINO_PAGE_SIZE * j;
+                }
+
+                mem_map_reserve(virt_to_page(fb->desc_table.virtual[i]));
+        }
+
+        /* page_count needs to be set anyway, because the descriptor table has
+         * been allocated according to this number */
+        fb->desc_table.page_count = count;
+
+        if (ret) {
+                /* the descriptor with index i doesn't contain
+                 * a valid address yet */
+                vino_free_buffer_with_count(fb, i);
+                return ret;
+        }
+
+        //fb->size = size;
+        fb->size = count * PAGE_SIZE;
+        fb->data_format = VINO_DATA_FMT_NONE;
+
+        /* set the dma stop-bit for the last (count+1)th descriptor */
+        fb->desc_table.dma_cpu[VINO_PAGE_RATIO * count] = VINO_DESC_STOP;
+        return 0;
+
+ out_free_virtual:
+        kfree(fb->desc_table.virtual);
+        return ret;
+}
+
+#if 0
+/* user buffers not fully implemented yet */
+static int vino_prepare_user_buffer(struct vino_framebuffer *fb,
+                                     void *user,
+                                     unsigned int size)
+{
+        unsigned int count, i, j;
+        int ret = 0;
+
+        dprintk("vino_prepare_user_buffer():\n");
+
+        if (size < 1)
+                return -EINVAL;
+
+        memset(fb, 0, sizeof(struct vino_framebuffer));
+
+        count = ((size / PAGE_SIZE)) & ~3;
+
+        dprintk("vino_prepare_user_buffer(): size = %d, count = %d\n",
+                size, count);
+
+        /* allocate memory for table with virtual (page) addresses */
+        fb->desc_table.virtual = (unsigned long *)
+                kmalloc(count * sizeof(unsigned long), GFP_KERNEL);
+        if (!fb->desc_table.virtual)
+                return -ENOMEM;
+
+        /* allocate memory for table with dma addresses
+         * (has space for four extra descriptors) */
+        fb->desc_table.dma_cpu =
+                dma_alloc_coherent(NULL, VINO_PAGE_RATIO * (count + 4) *
+                                   sizeof(dma_addr_t), &fb->desc_table.dma,
+                                   GFP_KERNEL | GFP_DMA);
+        if (!fb->desc_table.dma_cpu) {
+                ret = -ENOMEM;
+                goto out_free_virtual;
+        }
+
+        /* allocate pages for the buffer and acquire the according
+         * dma addresses */
+        for (i = 0; i < count; i++) {
+                dma_addr_t dma_data_addr;
+
+                fb->desc_table.virtual[i] =
+                        get_zeroed_page(GFP_KERNEL | GFP_DMA);
+                if (!fb->desc_table.virtual[i]) {
+                        ret = -ENOBUFS;
+                        break;
+                }
+
+                dma_data_addr =
+                        dma_map_single(NULL,
+                                       (void *)fb->desc_table.virtual[i],
+                                       PAGE_SIZE, DMA_FROM_DEVICE);
+
+                for (j = 0; j < VINO_PAGE_RATIO; j++) {
+                        fb->desc_table.dma_cpu[VINO_PAGE_RATIO * i + j] =
+                                dma_data_addr + VINO_PAGE_SIZE * j;
+                }
+
+                mem_map_reserve(virt_to_page(fb->desc_table.virtual[i]));
+        }
+
+        /* page_count needs to be set anyway, because the descriptor table has
+         * been allocated according to this number */
+        fb->desc_table.page_count = count;
+
+        if (ret) {
+                /* the descriptor with index i doesn't contain
+                 * a valid address yet */
+                vino_free_buffer_with_count(fb, i);
+                return ret;
+        }
+
+        //fb->size = size;
+        fb->size = count * PAGE_SIZE;
+
+        /* set the dma stop-bit for the last (count+1)th descriptor */
+        fb->desc_table.dma_cpu[VINO_PAGE_RATIO * count] = VINO_DESC_STOP;
+        return 0;
+
+ out_free_virtual:
+        kfree(fb->desc_table.virtual);
+        return ret;
+}
+#endif
+
+static void vino_sync_buffer(struct vino_framebuffer *fb)
+{
+        int i;
+
+        dprintk("vino_sync_buffer():\n");
+
+        for (i = 0; i < fb->desc_table.page_count; i++)
+                dma_sync_single(NULL,
+                                fb->desc_table.dma_cpu[VINO_PAGE_RATIO * i],
+                                PAGE_SIZE, DMA_FROM_DEVICE);
+}
+
+/* Framebuffer fifo functions (need to be locked externally) */
+
+static void vino_fifo_init(struct vino_framebuffer_fifo *f,
+                           unsigned int length)
+{
+        f->length = 0;
+        f->used = 0;
+        f->head = 0;
+        f->tail = 0;
+
+        if (length > VINO_FRAMEBUFFER_MAX_COUNT)
+                length = VINO_FRAMEBUFFER_MAX_COUNT;
+
+        f->length = length;
+}
+
+/* returns true/false */
+static int vino_fifo_has_id(struct vino_framebuffer_fifo *f, unsigned int id)
+{
+        unsigned int i;
+        for (i = f->head; i == (f->tail - 1); i = (i + 1) % f->length) {
+                if (f->data[i] == id)
+                        return 1;
+        }
+
+        return 0;
+}
+
+/* returns true/false */
+static int vino_fifo_full(struct vino_framebuffer_fifo *f)
+{
+        return (f->used == f->length);
+}
+
+static unsigned int vino_fifo_get_used(struct vino_framebuffer_fifo *f)
+{
+        return f->used;
+}
 
-static void vino_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+static int vino_fifo_enqueue(struct vino_framebuffer_fifo *f, unsigned int id)
 {
+        if (id >= f->length) {
+                return VINO_QUEUE_ERROR;
+        }
+
+        if (vino_fifo_has_id(f, id)) {
+                return VINO_QUEUE_ERROR;
+        }
+
+        if (f->used < f->length) {
+                f->data[f->tail] = id;
+                f->tail = (f->tail + 1) % f->length;
+                f->used++;
+        } else {
+                return VINO_QUEUE_ERROR;
+        }
+
+        return 0;
 }
 
-static int vino_open(struct video_device *dev, int flags)
+static int vino_fifo_peek(struct vino_framebuffer_fifo *f, unsigned int *id)
 {
-        struct vino_device *videv = (struct vino_device *)dev;
+        if (f->used > 0) {
+                *id = f->data[f->head];
+        } else {
+                return VINO_QUEUE_ERROR;
+        }
 
         return 0;
 }
 
-static void vino_close(struct video_device *dev)
+static int vino_fifo_dequeue(struct vino_framebuffer_fifo *f, unsigned int *id)
 {
-        struct vino_device *videv = (struct vino_device *)dev;
+        if (f->used > 0) {
+                *id = f->data[f->head];
+                f->head = (f->head + 1) % f->length;
+                f->used--;
+        } else {
+                return VINO_QUEUE_ERROR;
+        }
+
+        return 0;
 }
 
-static int vino_mmap(struct video_device *dev, const char *adr,
-                     unsigned long size)
+/* Framebuffer queue functions */
+
+/* execute with queue_lock locked */
+static void vino_queue_free_with_count(struct vino_framebuffer_queue *q,
+                                       unsigned int length)
 {
-        struct vino_device *videv = (struct vino_device *)dev;
+        unsigned int i;
 
-        return -EINVAL;
+        q->length = 0;
+        memset(&q->in, 0, sizeof(struct vino_framebuffer_fifo));
+        memset(&q->out, 0, sizeof(struct vino_framebuffer_fifo));
+        for (i = 0; i < length; i++) {
+                dprintk("vino_queue_free_with_count(): freeing buffer %d\n",
+                        i);
+                vino_free_buffer(q->buffer[i]);
+                kfree(q->buffer[i]);
+        }
+
+        q->type = VINO_MEMORY_NONE;
+        q->magic = 0;
 }
 
-static int vino_ioctl(struct video_device *dev, unsigned int cmd, void *arg)
+static void vino_queue_free(struct vino_framebuffer_queue *q)
 {
-        struct vino_device *videv = (struct vino_device *)dev;
+        dprintk("vino_queue_free():\n");
+
+        if (q->magic != VINO_QUEUE_MAGIC)
+                return;
+        if (q->type != VINO_MEMORY_MMAP)
+                return;
+
+        down(&q->queue_sem);
+
+        vino_queue_free_with_count(q, q->length);
+
+        up(&q->queue_sem);
+}
+
+static int vino_queue_init(struct vino_framebuffer_queue *q,
+                           unsigned int *length)
+{
+        unsigned int i;
+        int ret = 0;
+
+        dprintk("vino_queue_init(): length = %d\n", *length);
+
+        if (q->magic == VINO_QUEUE_MAGIC) {
+                dprintk("vino_queue_init(): queue already initialized!\n");
+                return -EINVAL;
+        }
+
+        if (q->type != VINO_MEMORY_NONE) {
+                dprintk("vino_queue_init(): queue already initialized!\n");
+                return -EINVAL;
+        }
+
+        if (*length < 1)
+                return -EINVAL;
+
+        down(&q->queue_sem);
+
+        if (*length > VINO_FRAMEBUFFER_MAX_COUNT)
+                *length = VINO_FRAMEBUFFER_MAX_COUNT;
+
+        q->length = 0;
+
+        for (i = 0; i < *length; i++) {
+                dprintk("vino_queue_init(): allocating buffer %d\n", i);
+                q->buffer[i] = kmalloc(sizeof(struct vino_framebuffer),
+                                       GFP_KERNEL);
+                if (!q->buffer[i]) {
+                        dprintk("vino_queue_init(): kmalloc() failed\n");
+                        ret = -ENOMEM;
+                        break;
+                }
+
+                ret = vino_allocate_buffer(q->buffer[i],
+                                           VINO_FRAMEBUFFER_SIZE);
+                if (ret) {
+                        kfree(q->buffer[i]);
+                        dprintk("vino_queue_init(): "
+                                "vino_allocate_buffer() failed\n");
+                        break;
+                }
+
+                q->buffer[i]->id = i;
+                if (i > 0) {
+                        q->buffer[i]->offset = q->buffer[i - 1]->offset +
+                                q->buffer[i - 1]->size;
+                } else {
+                        q->buffer[i]->offset = 0;
+                }
+
+                spin_lock_init(&q->buffer[i]->state_lock);
+
+                dprintk("vino_queue_init(): buffer = %d, offset = %d, "
+                        "size = %d\n", i, q->buffer[i]->offset,
+                        q->buffer[i]->size);
+        }
+
+        if (ret) {
+                vino_queue_free_with_count(q, i);
+                *length = 0;
+        } else {
+                q->length = *length;
+                vino_fifo_init(&q->in, q->length);
+                vino_fifo_init(&q->out, q->length);
+                q->type = VINO_MEMORY_MMAP;
+                q->magic = VINO_QUEUE_MAGIC;
+        }
+
+        up(&q->queue_sem);
+
+        return ret;
+}
+
+static struct vino_framebuffer *vino_queue_add(struct
+                                               vino_framebuffer_queue *q,
+                                               unsigned int id)
+{
+        struct vino_framebuffer *ret = NULL;
+        unsigned int total;
+        unsigned long flags;
+
+        dprintk("vino_queue_add(): id = %d\n", id);
+
+        if (q->magic != VINO_QUEUE_MAGIC) {
+                return ret;
+        }
+
+        spin_lock_irqsave(&q->queue_lock, flags);
+
+        if (q->length == 0)
+                goto out;
+
+        if (id >= q->length)
+                goto out;
+
+        /* not needed?: if (vino_fifo_full(&q->out)) {
+                goto out;
+                }*/
+        /* check that outgoing queue isn't already full
+         * (or that it won't become full) */
+        total = vino_fifo_get_used(&q->in) +
+                vino_fifo_get_used(&q->out);
+        if (total >= q->length)
+                goto out;
+
+        if (vino_fifo_enqueue(&q->in, id))
+                goto out;
+
+        ret = q->buffer[id];
+
+out:
+        spin_unlock_irqrestore(&q->queue_lock, flags);
+
+        return ret;
+}
+
+static struct vino_framebuffer *vino_queue_transfer(struct
+                                                    vino_framebuffer_queue *q)
+{
+        struct vino_framebuffer *ret = NULL;
+        struct vino_framebuffer *fb;
+        int id;
+        unsigned long flags;
+
+        dprintk("vino_queue_transfer():\n");
+
+        if (q->magic != VINO_QUEUE_MAGIC) {
+                return ret;
+        }
+
+        spin_lock_irqsave(&q->queue_lock, flags);
+
+        if (q->length == 0)
+                goto out;
+
+        // now this actually removes an entry from the incoming queue
+        if (vino_fifo_dequeue(&q->in, &id)) {
+                goto out;
+        }
+
+        dprintk("vino_queue_transfer(): id = %d\n", id);
+        fb = q->buffer[id];
+
+        // we have already checked that the outgoing queue is not full, but...
+        if (vino_fifo_enqueue(&q->out, id)) {
+                printk(KERN_ERR "vino_queue_transfer(): "
+                       "outgoing queue is full, this shouldn't happen!\n");
+                goto out;
+        }
+
+        ret = fb;
+out:
+        spin_unlock_irqrestore(&q->queue_lock, flags);
+
+        return ret;
+}
+
+/* returns true/false */
+static int vino_queue_incoming_contains(struct vino_framebuffer_queue *q,
+                                        unsigned int id)
+{
+        int ret = 0;
+        unsigned long flags;
+
+        if (q->magic != VINO_QUEUE_MAGIC) {
+                return ret;
+        }
+
+        spin_lock_irqsave(&q->queue_lock, flags);
+
+        if (q->length == 0)
+                goto out;
+
+        ret = vino_fifo_has_id(&q->in, id);
+
+out:
+        spin_unlock_irqrestore(&q->queue_lock, flags);
+
+        return ret;
+}
+
+/* returns true/false */
+static int vino_queue_outgoing_contains(struct vino_framebuffer_queue *q,
+                                        unsigned int id)
+{
+        int ret = 0;
+        unsigned long flags;
+
+        if (q->magic != VINO_QUEUE_MAGIC) {
+                return ret;
+        }
+
+        spin_lock_irqsave(&q->queue_lock, flags);
+
+        if (q->length == 0)
+                goto out;
+
+        ret = vino_fifo_has_id(&q->out, id);
+
+out:
+        spin_unlock_irqrestore(&q->queue_lock, flags);
+
+        return ret;
+}
+
+static int vino_queue_get_incoming(struct vino_framebuffer_queue *q,
+                                   unsigned int *used)
+{
+        int ret = 0;
+        unsigned long flags;
+
+        if (q->magic != VINO_QUEUE_MAGIC) {
+                return VINO_QUEUE_ERROR;
+        }
+
+        spin_lock_irqsave(&q->queue_lock, flags);
+
+        if (q->length == 0) {
+                ret = VINO_QUEUE_ERROR;
+                goto out;
+        }
+
+        *used = vino_fifo_get_used(&q->in);
+
+out:
+        spin_unlock_irqrestore(&q->queue_lock, flags);
+
+        return ret;
+}
+
+static int vino_queue_get_outgoing(struct vino_framebuffer_queue *q,
+                                   unsigned int *used)
+{
+        int ret = 0;
+        unsigned long flags;
+
+        if (q->magic != VINO_QUEUE_MAGIC) {
+                return VINO_QUEUE_ERROR;
+        }
+
+        spin_lock_irqsave(&q->queue_lock, flags);
+
+        if (q->length == 0) {
+                ret = VINO_QUEUE_ERROR;
+                goto out;
+        }
+
+        *used = vino_fifo_get_used(&q->out);
+
+out:
+        spin_unlock_irqrestore(&q->queue_lock, flags);
+
+        return ret;
+}
+
+static int vino_queue_get_total(struct vino_framebuffer_queue *q,
+                                unsigned int *total)
+{
+        int ret = 0;
+        unsigned long flags;
+
+        if (q->magic != VINO_QUEUE_MAGIC) {
+                return VINO_QUEUE_ERROR;
+        }
+
+        spin_lock_irqsave(&q->queue_lock, flags);
+
+        if (q->length == 0) {
+                ret = VINO_QUEUE_ERROR;
+                goto out;
+        }
+
+        *total = vino_fifo_get_used(&q->in) +
+                vino_fifo_get_used(&q->out);
+
+out:
+        spin_unlock_irqrestore(&q->queue_lock, flags);
+
+        return ret;
+}
+
+static struct vino_framebuffer *vino_queue_peek(struct
+                                                vino_framebuffer_queue *q,
+                                                unsigned int *id)
+{
+        struct vino_framebuffer *ret = NULL;
+        unsigned long flags;
+
+        if (q->magic != VINO_QUEUE_MAGIC) {
+                return ret;
+        }
+
+        spin_lock_irqsave(&q->queue_lock, flags);
+
+        if (q->length == 0)
+                goto out;
+
+        if (vino_fifo_peek(&q->in, id)) {
+                goto out;
+        }
+
+        ret = q->buffer[*id];
+out:
+        spin_unlock_irqrestore(&q->queue_lock, flags);
+
+        return ret;
+}
+
+static struct vino_framebuffer *vino_queue_remove(struct
+                                                  vino_framebuffer_queue *q,
+                                                  unsigned int *id)
+{
+        struct vino_framebuffer *ret = NULL;
+        unsigned long flags;
+        dprintk("vino_queue_remove():\n");
+
+        if (q->magic != VINO_QUEUE_MAGIC) {
+                return ret;
+        }
+
+        spin_lock_irqsave(&q->queue_lock, flags);
+
+        if (q->length == 0)
+                goto out;
+
+        if (vino_fifo_dequeue(&q->out, id)) {
+                goto out;
+        }
+
+        dprintk("vino_queue_remove(): id = %d\n", *id);
+        ret = q->buffer[*id];
+out:
+        spin_unlock_irqrestore(&q->queue_lock, flags);
+
+        return ret;
+}
+
+static struct
+vino_framebuffer *vino_queue_get_buffer(struct vino_framebuffer_queue *q,
+                                        unsigned int id)
+{
+        struct vino_framebuffer *ret = NULL;
+        unsigned long flags;
+
+        if (q->magic != VINO_QUEUE_MAGIC) {
+                return ret;
+        }
+
+        spin_lock_irqsave(&q->queue_lock, flags);
+
+        if (q->length == 0)
+                goto out;
+
+        if (id >= q->length)
+                goto out;
+
+        ret = q->buffer[id];
+ out:
+        spin_unlock_irqrestore(&q->queue_lock, flags);
+
+        return ret;
+}
+
+static unsigned int vino_queue_get_length(struct vino_framebuffer_queue *q)
+{
+        unsigned int length = 0;
+        unsigned long flags;
+
+        if (q->magic != VINO_QUEUE_MAGIC) {
+                return length;
+        }
+
+        spin_lock_irqsave(&q->queue_lock, flags);
+        length = q->length;
+        spin_unlock_irqrestore(&q->queue_lock, flags);
+
+        return length;
+}
+
+static int vino_queue_has_mapped_buffers(struct vino_framebuffer_queue *q)
+{
+        unsigned int i;
+        int ret = 0;
+        unsigned long flags;
+
+        if (q->magic != VINO_QUEUE_MAGIC) {
+                return ret;
+        }
+
+        spin_lock_irqsave(&q->queue_lock, flags);
+        for (i = 0; i < q->length; i++) {
+                if (q->buffer[i]->map_count > 0) {
+                        ret = 1;
+                        break;
+                }
+        }
+        spin_unlock_irqrestore(&q->queue_lock, flags);
+
+        return ret;
+}
+
+/* VINO functions */
+
+/* execute with input_lock locked */
+static void vino_update_line_size(struct vino_channel_settings *vcs)
+{
+        unsigned int w = vcs->clipping.right - vcs->clipping.left;
+        unsigned int d = vcs->decimation;
+        unsigned int bpp = vino_data_formats[vcs->data_format].bpp;
+        unsigned int lsize;
+
+        dprintk("update_line_size(): before: w = %d, d = %d, "
+                "line_size = %d\n", w, d, vcs->line_size);
+        /* line size must be multiple of 8 bytes */
+        lsize = (bpp * (w / d)) & ~7;
+        w = (lsize / bpp) * d;
+
+        vcs->clipping.right = vcs->clipping.left + w;
+        vcs->line_size = lsize;
+        dprintk("update_line_size(): after: w = %d, d = %d, "
+                "line_size = %d\n", w, d, vcs->line_size);
+}
+
+/* execute with input_lock locked */
+static void vino_set_clipping(struct vino_channel_settings *vcs,
+                              unsigned int x, unsigned int y,
+                              unsigned int w, unsigned int h)
+{
+        unsigned int maxwidth, maxheight;
+        unsigned int d;
+
+        maxwidth = vino_data_norms[vcs->data_norm].width;
+        maxheight = vino_data_norms[vcs->data_norm].height;
+        d = vcs->decimation;
+
+        y &= ~1;        /* odd/even fields */
+
+        if (x > maxwidth) {
+                x = 0;
+        }
+        if (y > maxheight) {
+                y = 0;
+        }
+
+        if (((w / d) < VINO_MIN_WIDTH)
+            || ((h / d) < VINO_MIN_HEIGHT)) {
+                w = VINO_MIN_WIDTH * d;
+                h = VINO_MIN_HEIGHT * d;
+        }
+
+        if ((x + w) > maxwidth) {
+                w = maxwidth - x;
+                if ((w / d) < VINO_MIN_WIDTH)
+                        x = maxwidth - VINO_MIN_WIDTH * d;
+        }
+        if ((y + h) > maxheight) {
+                h = maxheight - y;
+                if ((h / d) < VINO_MIN_HEIGHT)
+                        y = maxheight - VINO_MIN_HEIGHT * d;
+        }
+
+        vcs->clipping.left = x;
+        vcs->clipping.top = y;
+        vcs->clipping.right = x + w;
+        vcs->clipping.bottom = y + h;
+
+        vino_update_line_size(vcs);
+
+        dprintk("clipping %d, %d, %d, %d / %d - %d\n",
+                vcs->clipping.left, vcs->clipping.top, vcs->clipping.right,
+                vcs->clipping.bottom, vcs->decimation, vcs->line_size);
+}
+
+/* execute with input_lock locked */
+static void vino_set_default_clipping(struct vino_channel_settings *vcs)
+{
+        vino_set_clipping(vcs, 0, 0, vino_data_norms[vcs->data_norm].width,
+                          vino_data_norms[vcs->data_norm].height);
+}
+
+/* execute with input_lock locked */
+static void vino_set_scaling(struct vino_channel_settings *vcs,
+                             unsigned int w, unsigned int h)
+{
+        unsigned int x, y, curw, curh, d;
+
+        x = vcs->clipping.left;
+        y = vcs->clipping.top;
+        curw = vcs->clipping.right - vcs->clipping.left;
+        curh = vcs->clipping.bottom - vcs->clipping.top;
+
+        d = max(curw / w, curh / h);
+
+        dprintk("scaling w: %d, h: %d, curw: %d, curh: %d, d: %d\n",
+                w, h, curw, curh, d);
+
+        if (d < 1) {
+                d = 1;
+        }
+        if (d > 8) {
+                d = 8;
+        }
+
+        vcs->decimation = d;
+        vino_set_clipping(vcs, x, y, w * d, h * d);
+
+        dprintk("scaling %d, %d, %d, %d / %d - %d\n", vcs->clipping.left,
+                vcs->clipping.top, vcs->clipping.right, vcs->clipping.bottom,
+                vcs->decimation, vcs->line_size);
+}
+
+/* execute with input_lock locked */
+static void vino_reset_scaling(struct vino_channel_settings *vcs)
+{
+        vino_set_scaling(vcs, vcs->clipping.right - vcs->clipping.left,
+                         vcs->clipping.bottom - vcs->clipping.top);
+}
+
+/* execute with input_lock locked */
+static void vino_set_framerate(struct vino_channel_settings *vcs,
+                               unsigned int fps)
+{
+        unsigned int mask;
+
+        switch (vcs->data_norm) {
+        case VINO_DATA_NORM_NTSC:
+        case VINO_DATA_NORM_D1:
+                fps = (unsigned int)(fps / 6) * 6; // FIXME: round!
+
+                if (fps < vino_data_norms[vcs->data_norm].fps_min)
+                        fps = vino_data_norms[vcs->data_norm].fps_min;
+                if (fps > vino_data_norms[vcs->data_norm].fps_max)
+                        fps = vino_data_norms[vcs->data_norm].fps_max;
+
+                switch (fps) {
+                case 6:
+                        mask = 0x003;
+                        break;
+                case 12:
+                        mask = 0x0c3;
+                        break;
+                case 18:
+                        mask = 0x333;
+                        break;
+                case 24:
+                        mask = 0x3ff;
+                        break;
+                case 30:
+                        mask = 0xfff;
+                        break;
+                default:
+                        mask = VINO_FRAMERT_FULL;
+                }
+                vcs->framert_reg = VINO_FRAMERT_RT(mask);
+                break;
+        case VINO_DATA_NORM_PAL:
+        case VINO_DATA_NORM_SECAM:
+                fps = (unsigned int)(fps / 5) * 5; // FIXME: round!
+
+                if (fps < vino_data_norms[vcs->data_norm].fps_min)
+                        fps = vino_data_norms[vcs->data_norm].fps_min;
+                if (fps > vino_data_norms[vcs->data_norm].fps_max)
+                        fps = vino_data_norms[vcs->data_norm].fps_max;
+
+                switch (fps) {
+                case 5:
+                        mask = 0x003;
+                        break;
+                case 10:
+                        mask = 0x0c3;
+                        break;
+                case 15:
+                        mask = 0x333;
+                        break;
+                case 20:
+                        mask = 0x0ff;
+                        break;
+                case 25:
+                        mask = 0x3ff;
+                        break;
+                default:
+                        mask = VINO_FRAMERT_FULL;
+                }
+                vcs->framert_reg = VINO_FRAMERT_RT(mask) | VINO_FRAMERT_PAL;
+                break;
+        }
+
+        vcs->fps = fps;
+}
+
+/* execute with input_lock locked */
+static void vino_set_default_framerate(struct vino_channel_settings *vcs)
+{
+        vino_set_framerate(vcs, vino_data_norms[vcs->data_norm].fps_max);
+}
+
+/*
+ * Prepare VINO for DMA transfer...
+ * (execute only with vino_lock and input_lock locked)
+ */
+static int vino_dma_setup(struct vino_channel_settings *vcs,
+                          struct vino_framebuffer *fb)
+{
+        u32 ctrl, intr;
+        struct sgi_vino_channel *ch;
+        const struct vino_data_norm *norm;
+
+        dprintk("vino_dma_setup():\n");
+
+        vcs->field = 0;
+        fb->frame_counter = 0;
+
+        ch = (vcs->channel == VINO_CHANNEL_A) ? &vino->a : &vino->b;
+        norm = &vino_data_norms[vcs->data_norm];
+
+        ch->page_index = 0;
+        ch->line_count = 0;
+
+        /* VINO line size register is set 8 bytes less than actual */
+        ch->line_size = vcs->line_size - 8;
+
+        /* let VINO know where to transfer data */
+        ch->start_desc_tbl = fb->desc_table.dma;
+        ch->next_4_desc = fb->desc_table.dma;
+
+        /* give vino time to fetch the first four descriptors, 5 usec
+         * should be more than enough time */
+        udelay(VINO_DESC_FETCH_DELAY);
+
+        /* set the alpha register */
+        ch->alpha = vcs->alpha;
+
+        /* set clipping registers */
+        ch->clip_start = VINO_CLIP_ODD(norm->odd.top + vcs->clipping.top / 2) |
+                VINO_CLIP_EVEN(norm->even.top +
+                               vcs->clipping.top / 2) |
+                VINO_CLIP_X(vcs->clipping.left);
+        ch->clip_end = VINO_CLIP_ODD(norm->odd.top +
+                                     vcs->clipping.bottom / 2 - 1) |
+                VINO_CLIP_EVEN(norm->even.top +
+                               vcs->clipping.bottom / 2 - 1) |
+                VINO_CLIP_X(vcs->clipping.right);
+        /* FIXME: end-of-field bug workaround
+                       VINO_CLIP_X(VINO_PAL_WIDTH);
+         */
+
+        /* set the size of actual content in the buffer (DECIMATION !) */
+        fb->data_size = ((vcs->clipping.right - vcs->clipping.left) /
+                         vcs->decimation) *
+                ((vcs->clipping.bottom - vcs->clipping.top) /
+                 vcs->decimation) *
+                vino_data_formats[vcs->data_format].bpp;
+
+        ch->frame_rate = vcs->framert_reg;
+
+        ctrl = vino->control;
+        intr = vino->intr_status;
+
+        if (vcs->channel == VINO_CHANNEL_A) {
+                /* All interrupt conditions for this channel was cleared
+                 * so clear the interrupt status register and enable
+                 * interrupts */
+                intr &= ~VINO_INTSTAT_A;
+                ctrl |= VINO_CTRL_A_INT;
+
+                /* enable synchronization */
+                ctrl |= VINO_CTRL_A_SYNC_ENBL;
+
+                /* enable frame assembly */
+                ctrl |= VINO_CTRL_A_INTERLEAVE_ENBL;
+
+                /* set decimation used */
+                if (vcs->decimation < 2)
+                        ctrl &= ~VINO_CTRL_A_DEC_ENBL;
+                else {
+                        ctrl |= VINO_CTRL_A_DEC_ENBL;
+                        ctrl &= ~VINO_CTRL_A_DEC_SCALE_MASK;
+                        ctrl |= (vcs->decimation - 1) <<
+                                VINO_CTRL_A_DEC_SCALE_SHIFT;
+                }
+
+                /* select input interface */
+                if (vcs->input == VINO_INPUT_D1)
+                        ctrl |= VINO_CTRL_A_SELECT;
+                else
+                        ctrl &= ~VINO_CTRL_A_SELECT;
+
+                /* palette */
+                ctrl &= ~(VINO_CTRL_A_LUMA_ONLY | VINO_CTRL_A_RGB |
+                          VINO_CTRL_A_DITHER);
+        } else {
+                intr &= ~VINO_INTSTAT_B;
+                ctrl |= VINO_CTRL_B_INT;
+
+                ctrl |= VINO_CTRL_B_SYNC_ENBL;
+                ctrl |= VINO_CTRL_B_INTERLEAVE_ENBL;
+
+                if (vcs->decimation < 2)
+                        ctrl &= ~VINO_CTRL_B_DEC_ENBL;
+                else {
+                        ctrl |= VINO_CTRL_B_DEC_ENBL;
+                        ctrl &= ~VINO_CTRL_B_DEC_SCALE_MASK;
+                        ctrl |= (vcs->decimation - 1) <<
+                                VINO_CTRL_B_DEC_SCALE_SHIFT;
+
+                }
+                if (vcs->input == VINO_INPUT_D1)
+                        ctrl |= VINO_CTRL_B_SELECT;
+                else
+                        ctrl &= ~VINO_CTRL_B_SELECT;
+
+                ctrl &= ~(VINO_CTRL_B_LUMA_ONLY | VINO_CTRL_B_RGB |
+                          VINO_CTRL_B_DITHER);
+        }
+
+        /* set palette */
+        fb->data_format = vcs->data_format;
+
+        switch (vcs->data_format) {
+                case VINO_DATA_FMT_GREY:
+                        ctrl |= (vcs->channel == VINO_CHANNEL_A) ?
+                                VINO_CTRL_A_LUMA_ONLY : VINO_CTRL_B_LUMA_ONLY;
+                        break;
+                case VINO_DATA_FMT_RGB32:
+                        ctrl |= (vcs->channel == VINO_CHANNEL_A) ?
+                                VINO_CTRL_A_RGB : VINO_CTRL_B_RGB;
+                        break;
+                case VINO_DATA_FMT_YUV:
+                        /* nothing needs to be done */
+                        break;
+                case VINO_DATA_FMT_RGB332:
+                        ctrl |= (vcs->channel == VINO_CHANNEL_A) ?
+                                VINO_CTRL_A_RGB | VINO_CTRL_A_DITHER :
+                                VINO_CTRL_B_RGB | VINO_CTRL_B_DITHER;
+                        break;
+        }
+
+        vino->intr_status = intr;
+        vino->control = ctrl;
+
+        return 0;
+}
+
+/* (execute only with vino_lock locked) */
+static void vino_dma_start(struct vino_channel_settings *vcs)
+{
+        u32 ctrl = vino->control;
+
+        dprintk("vino_dma_start():\n");
+        ctrl |= (vcs->channel == VINO_CHANNEL_A) ?
+                VINO_CTRL_A_DMA_ENBL : VINO_CTRL_B_DMA_ENBL;
+        vino->control = ctrl;
+}
+
+/* (execute only with vino_lock locked) */
+static void vino_dma_stop(struct vino_channel_settings *vcs)
+{
+        u32 ctrl = vino->control;
+
+        ctrl &= (vcs->channel == VINO_CHANNEL_A) ?
+                ~VINO_CTRL_A_DMA_ENBL : ~VINO_CTRL_B_DMA_ENBL;
+        vino->control = ctrl;
+        dprintk("vino_dma_stop():\n");
+}
+
+/*
+ * Load dummy page to descriptor registers. This prevents generating of
+ * spurious interrupts. (execute only with vino_lock locked)
+ */
+static void vino_clear_interrupt(struct vino_channel_settings *vcs)
+{
+        struct sgi_vino_channel *ch;
+
+        ch = (vcs->channel == VINO_CHANNEL_A) ? &vino->a : &vino->b;
+
+        ch->page_index = 0;
+        ch->line_count = 0;
+
+        ch->start_desc_tbl = vino_drvdata->dummy_desc_table.dma;
+        ch->next_4_desc = vino_drvdata->dummy_desc_table.dma;
+
+        udelay(VINO_DESC_FETCH_DELAY);
+        dprintk("channel %c clear interrupt condition\n",
+               (vcs->channel == VINO_CHANNEL_A) ? 'A':'B');
+}
+
+static int vino_capture(struct vino_channel_settings *vcs,
+                        struct vino_framebuffer *fb)
+{
+        int err = 0;
+        unsigned long flags, flags2;
+
+        spin_lock_irqsave(&fb->state_lock, flags);
+
+        if (fb->state == VINO_FRAMEBUFFER_IN_USE)
+                err = -EBUSY;
+        fb->state = VINO_FRAMEBUFFER_IN_USE;
+
+        spin_unlock_irqrestore(&fb->state_lock, flags);
+
+        if (err)
+                return err;
+
+        spin_lock_irqsave(&vino_drvdata->vino_lock, flags);
+        spin_lock_irqsave(&vino_drvdata->input_lock, flags2);
+
+        vino_dma_setup(vcs, fb);
+        vino_dma_start(vcs);
+
+        spin_unlock_irqrestore(&vino_drvdata->input_lock, flags2);
+        spin_unlock_irqrestore(&vino_drvdata->vino_lock, flags);
+
+        return err;
+}
+
+static
+struct vino_framebuffer *vino_capture_enqueue(struct
+                                              vino_channel_settings *vcs,
+                                              unsigned int index)
+{
+        struct vino_framebuffer *fb;
+        unsigned long flags;
+
+        dprintk("vino_capture_enqueue():\n");
+
+        spin_lock_irqsave(&vcs->capture_lock, flags);
+
+        fb = vino_queue_add(&vcs->fb_queue, index);
+        if (fb == NULL) {
+                dprintk("vino_capture_enqueue(): vino_queue_add() failed, "
+                        "queue full?\n");
+                goto out;
+        }
+out:
+        spin_unlock_irqrestore(&vcs->capture_lock, flags);
+
+        return fb;
+}
+
+static int vino_capture_next(struct vino_channel_settings *vcs, int start)
+{
+        struct vino_framebuffer *fb;
+        unsigned int incoming, id;
+        int err = 0;
+        unsigned long flags, flags2;
+
+        dprintk("vino_capture_next():\n");
+
+        spin_lock_irqsave(&vcs->capture_lock, flags);
+
+        if (start) {
+                /* start capture only if capture isn't in progress already */
+                if (vcs->capturing) {
+                        spin_unlock_irqrestore(&vcs->capture_lock, flags);
+                        return 0;
+                }
+
+        } else {
+                /* capture next frame:
+                 * stop capture if capturing is not set */
+                if (!vcs->capturing) {
+                        spin_unlock_irqrestore(&vcs->capture_lock, flags);
+                        return 0;
+                }
+        }
+
+        err = vino_queue_get_incoming(&vcs->fb_queue, &incoming);
+        if (err) {
+                dprintk("vino_capture_next(): vino_queue_get_incoming() "
+                        "failed\n");
+                err = -EINVAL;
+                goto out;
+        }
+        if (incoming == 0) {
+                dprintk("vino_capture_next(): no buffers available\n");
+                goto out;
+        }
+
+        fb = vino_queue_peek(&vcs->fb_queue, &id);
+        if (fb == NULL) {
+                dprintk("vino_capture_next(): vino_queue_peek() failed\n");
+                err = -EINVAL;
+                goto out;
+        }
+
+        spin_lock_irqsave(&fb->state_lock, flags2);
+        fb->state = VINO_FRAMEBUFFER_UNUSED;
+        spin_unlock_irqrestore(&fb->state_lock, flags2);
+
+        if (start) {
+                vcs->capturing = 1;
+        }
+
+        spin_unlock_irqrestore(&vcs->capture_lock, flags);
+
+        err = vino_capture(vcs, fb);
+
+        return err;
+
+out:
+        vcs->capturing = 0;
+        spin_unlock_irqrestore(&vcs->capture_lock, flags);
+
+        return err;
+}
+
+static int vino_is_capturing(struct vino_channel_settings *vcs)
+{
+        int ret;
+        unsigned long flags;
+
+        spin_lock_irqsave(&vcs->capture_lock, flags);
+
+        ret = vcs->capturing;
+
+        spin_unlock_irqrestore(&vcs->capture_lock, flags);
+
+        return ret;
+}
+
+/* waits until a frame is captured */
+static int vino_wait_for_frame(struct vino_channel_settings *vcs)
+{
+        wait_queue_t wait;
+        int err = 0;
+
+        dprintk("vino_wait_for_frame():\n");
+
+        init_waitqueue_entry(&wait, current);
+        /* add ourselves into wait queue */
+        add_wait_queue(&vcs->fb_queue.frame_wait_queue, &wait);
+        /* and set current state */
+        set_current_state(TASK_INTERRUPTIBLE);
+
+        /* to ensure that schedule_timeout will return immediately
+         * if VINO interrupt was triggred meanwhile */
+        schedule_timeout(HZ / 10);
+
+        if (signal_pending(current))
+                err = -EINTR;
+
+        remove_wait_queue(&vcs->fb_queue.frame_wait_queue, &wait);
+
+        dprintk("vino_wait_for_frame(): waiting for frame %s\n",
+                err ? "failed" : "ok");
+
+        return err;
+}
+
+/* the function assumes that PAGE_SIZE % 4 == 0 */
+static void vino_convert_to_rgba(struct vino_framebuffer *fb) {
+        unsigned char *pageptr;
+        unsigned int page, i;
+        unsigned char a;
+
+        for (page = 0; page < fb->desc_table.page_count; page++) {
+                pageptr = (unsigned char *)fb->desc_table.virtual[page];
+
+                for (i = 0; i < PAGE_SIZE; i += 4) {
+                        a = pageptr[0];
+                        pageptr[0] = pageptr[3];
+                        pageptr[1] = pageptr[2];
+                        pageptr[2] = pageptr[1];
+                        pageptr[3] = a;
+                        pageptr += 4;
+                }
+        }
+}
+
+/* checks if the buffer is in correct state and syncs data */
+static int vino_check_buffer(struct vino_channel_settings *vcs,
+                             struct vino_framebuffer *fb)
+{
+        int err = 0;
+        unsigned long flags;
+
+        dprintk("vino_check_buffer():\n");
+
+        spin_lock_irqsave(&fb->state_lock, flags);
+        switch (fb->state) {
+        case VINO_FRAMEBUFFER_IN_USE:
+                err = -EIO;
+                break;
+        case VINO_FRAMEBUFFER_READY:
+                vino_sync_buffer(fb);
+                fb->state = VINO_FRAMEBUFFER_UNUSED;
+                break;
+        default:
+                err = -EINVAL;
+        }
+        spin_unlock_irqrestore(&fb->state_lock, flags);
+
+        if (!err) {
+                if (vino_pixel_conversion
+                    && (fb->data_format == VINO_DATA_FMT_RGB32)) {
+                        vino_convert_to_rgba(fb);
+                }
+        } else if (err && (err != -EINVAL)) {
+                dprintk("vino_check_buffer(): buffer not ready\n");
+
+                spin_lock_irqsave(&vino_drvdata->vino_lock, flags);
+                vino_dma_stop(vcs);
+                vino_clear_interrupt(vcs);
+                spin_unlock_irqrestore(&vino_drvdata->vino_lock, flags);
+        }
+
+        return err;
+}
+
+/* forcefully terminates capture */
+static void vino_capture_stop(struct vino_channel_settings *vcs)
+{
+        unsigned int incoming = 0, outgoing = 0, id;
+        unsigned long flags, flags2;
+
+        dprintk("vino_capture_stop():\n");
+
+        spin_lock_irqsave(&vcs->capture_lock, flags);
+        /* unset capturing to stop queue processing */
+        vcs->capturing = 0;
+
+        spin_lock_irqsave(&vino_drvdata->vino_lock, flags2);
+
+        vino_dma_stop(vcs);
+        vino_clear_interrupt(vcs);
+
+        spin_unlock_irqrestore(&vino_drvdata->vino_lock, flags2);
+
+        /* remove all items from the queue */
+        if (vino_queue_get_incoming(&vcs->fb_queue, &incoming)) {
+                dprintk("vino_capture_stop(): "
+                        "vino_queue_get_incoming() failed\n");
+                goto out;
+        }
+        while (incoming > 0) {
+                vino_queue_transfer(&vcs->fb_queue);
+
+                if (vino_queue_get_incoming(&vcs->fb_queue, &incoming)) {
+                        dprintk("vino_capture_stop(): "
+                                "vino_queue_get_incoming() failed\n");
+                        goto out;
+                }
+        }
+
+        if (vino_queue_get_outgoing(&vcs->fb_queue, &outgoing)) {
+                dprintk("vino_capture_stop(): "
+                        "vino_queue_get_outgoing() failed\n");
+                goto out;
+        }
+        while (outgoing > 0) {
+                vino_queue_remove(&vcs->fb_queue, &id);
+
+                if (vino_queue_get_outgoing(&vcs->fb_queue, &outgoing)) {
+                        dprintk("vino_capture_stop(): "
+                                "vino_queue_get_outgoing() failed\n");
+                        goto out;
+                }
+        }
+
+out:
+        spin_unlock_irqrestore(&vcs->capture_lock, flags);
+}
+
+static int vino_capture_failed(struct vino_channel_settings *vcs)
+{
+        struct vino_framebuffer *fb;
+        unsigned long flags;
+        unsigned int i;
+        int ret;
+
+        dprintk("vino_capture_failed():\n");
+
+        spin_lock_irqsave(&vino_drvdata->vino_lock, flags);
+
+        vino_dma_stop(vcs);
+        vino_clear_interrupt(vcs);
+
+        spin_unlock_irqrestore(&vino_drvdata->vino_lock, flags);
+
+        ret = vino_queue_get_incoming(&vcs->fb_queue, &i);
+        if (ret == VINO_QUEUE_ERROR) {
+                dprintk("vino_queue_get_incoming() failed\n");
+                return -EINVAL;
+        }
+        if (i == 0) {
+                /* no buffers to process */
+                return 0;
+        }
+
+        fb = vino_queue_peek(&vcs->fb_queue, &i);
+        if (fb == NULL) {
+                dprintk("vino_queue_peek() failed\n");
+                return -EINVAL;
+        }
+
+        spin_lock_irqsave(&fb->state_lock, flags);
+        if (fb->state == VINO_FRAMEBUFFER_IN_USE) {
+                fb->state = VINO_FRAMEBUFFER_UNUSED;
+                vino_queue_transfer(&vcs->fb_queue);
+                vino_queue_remove(&vcs->fb_queue, &i);
+                /* we should actually discard the newest frame,
+                 * but who cares ... */
+        }
+        spin_unlock_irqrestore(&fb->state_lock, flags);
+
+        return 0;
+}
+
+static void vino_frame_done(struct vino_channel_settings *vcs,
+                            unsigned int fc)
+{
+        struct vino_framebuffer *fb;
+        unsigned long flags;
+
+        spin_lock_irqsave(&vcs->capture_lock, flags);
+        fb = vino_queue_transfer(&vcs->fb_queue);
+        if (!fb) {
+                spin_unlock_irqrestore(&vcs->capture_lock, flags);
+                dprintk("vino_frame_done(): vino_queue_transfer() failed!\n");
+                return;
+        }
+        spin_unlock_irqrestore(&vcs->capture_lock, flags);
+
+        fb->frame_counter = fc;
+        do_gettimeofday(&fb->timestamp);
+
+        spin_lock_irqsave(&fb->state_lock, flags);
+        if (fb->state == VINO_FRAMEBUFFER_IN_USE)
+                fb->state = VINO_FRAMEBUFFER_READY;
+        spin_unlock_irqrestore(&fb->state_lock, flags);
+
+        wake_up(&vcs->fb_queue.frame_wait_queue);
+
+        vino_capture_next(vcs, 0);
+}
+
+static irqreturn_t vino_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+{
+        u32 intr;
+        unsigned int fc_a, fc_b;
+        int done_a = 0;
+        int done_b = 0;
+
+        spin_lock(&vino_drvdata->vino_lock);
+
+        intr = vino->intr_status;
+        fc_a = vino->a.field_counter / 2;
+        fc_b = vino->b.field_counter / 2;
+
+        // TODO: handle error-interrupts in some special way ?
+
+        if (intr & VINO_INTSTAT_A) {
+                if (intr & VINO_INTSTAT_A_EOF) {
+                        vino_drvdata->a.field++;
+                        if (vino_drvdata->a.field > 1) {
+                                vino_dma_stop(&vino_drvdata->a);
+                                vino_clear_interrupt(&vino_drvdata->a);
+                                vino_drvdata->a.field = 0;
+                                done_a = 1;
+                        }
+                        dprintk("intr: channel A end-of-field interrupt: "
+                                "%04x\n", intr);
+                } else {
+                        vino_dma_stop(&vino_drvdata->a);
+                        vino_clear_interrupt(&vino_drvdata->a);
+                        done_a = 1;
+                        dprintk("channel A error interrupt: %04x\n", intr);
+                }
+        }
+        if (intr & VINO_INTSTAT_B) {
+                if (intr & VINO_INTSTAT_B_EOF) {
+                        vino_drvdata->b.field++;
+                        if (vino_drvdata->b.field > 1) {
+                                vino_dma_stop(&vino_drvdata->b);
+                                vino_clear_interrupt(&vino_drvdata->b);
+                                vino_drvdata->b.field = 0;
+                                done_b = 1;
+                        }
+                        dprintk("intr: channel B end-of-field interrupt: "
+                                "%04x\n", intr);
+                } else {
+                        vino_dma_stop(&vino_drvdata->b);
+                        vino_clear_interrupt(&vino_drvdata->b);
+                        done_b = 1;
+                        dprintk("channel B error interrupt: %04x\n", intr);
+                }
+        }
+
+        /* always remember to clear interrupt status */
+        vino->intr_status = ~intr;
+
+        spin_unlock(&vino_drvdata->vino_lock);
+
+        if (done_a) {
+                vino_frame_done(&vino_drvdata->a, fc_a);
+                dprintk("channel A frame done, interrupt: %d\n", intr);
+        }
+        if (done_b) {
+                vino_frame_done(&vino_drvdata->b, fc_b);
+                dprintk("channel B frame done, interrupt: %d\n", intr);
+        }
 
-        return -EINVAL;
+        return IRQ_HANDLED;
 }
 
-static const struct video_device vino_device = {
+/* VINO video input management */
+
+static int vino_get_saa7191_input(int input)
+{
+        switch (input) {
+        case VINO_INPUT_COMPOSITE:
+                return SAA7191_INPUT_COMPOSITE;
+        case VINO_INPUT_SVIDEO:
+                return SAA7191_INPUT_SVIDEO;
+        default:
+                printk(KERN_ERR "VINO: vino_get_saa7191_input(): "
+                       "invalid input!\n");
+                return -1;
+        }
+}
+
+static int vino_get_saa7191_norm(int norm)
+{
+        switch (norm) {
+        case VINO_DATA_NORM_AUTO:
+                return SAA7191_NORM_AUTO;
+        case VINO_DATA_NORM_PAL:
+                return SAA7191_NORM_PAL;
+        case VINO_DATA_NORM_NTSC:
+                return SAA7191_NORM_NTSC;
+        case VINO_DATA_NORM_SECAM:
+                return SAA7191_NORM_SECAM;
+        default:
+                printk(KERN_ERR "VINO: vino_get_saa7191_norm(): "
+                       "invalid norm!\n");
+                return -1;
+        }
+}
+
+/* execute with input_lock locked */
+static int vino_is_input_owner(struct vino_channel_settings *vcs)
+{
+        switch(vcs->input) {
+        case VINO_INPUT_COMPOSITE:
+        case VINO_INPUT_SVIDEO:
+                return (vino_drvdata->decoder.owner == vcs->channel);
+        case VINO_INPUT_D1:
+                return (vino_drvdata->camera.owner == vcs->channel);
+        default:
+                return 0;
+        }
+}
+
+static int vino_acquire_input(struct vino_channel_settings *vcs)
+{
+        int ret = 0;
+
+        dprintk("vino_acquire_input():\n");
+
+        spin_lock(&vino_drvdata->input_lock);
+
+        /* First try D1 and then SAA7191 */
+        if (vino_drvdata->camera.driver
+            && (vino_drvdata->camera.owner == VINO_NO_CHANNEL)) {
+                if (i2c_use_client(vino_drvdata->camera.driver)) {
+                        ret = -ENODEV;
+                        goto out;
+                }
+
+                vino_drvdata->camera.owner = vcs->channel;
+                vcs->input = VINO_INPUT_D1;
+                vcs->data_norm = VINO_DATA_NORM_D1;
+        } else if (vino_drvdata->decoder.driver
+                   && (vino_drvdata->decoder.owner == VINO_NO_CHANNEL)) {
+                int saa7191_input;
+                int saa7191_norm;
+
+                if (i2c_use_client(vino_drvdata->decoder.driver)) {
+                        ret = -ENODEV;
+                        goto out;
+                }
+
+                vino_drvdata->decoder.owner = vcs->channel;
+                vcs->input = VINO_INPUT_COMPOSITE;
+                vcs->data_norm = VINO_DATA_NORM_PAL;
+
+                saa7191_input = vino_get_saa7191_input(vcs->input);
+                i2c_decoder_command(DECODER_SET_INPUT, &saa7191_input);
+
+                saa7191_norm = vino_get_saa7191_norm(vcs->data_norm);
+                i2c_decoder_command(DECODER_SAA7191_SET_NORM, &saa7191_norm);
+        } else {
+                vcs->input = (vcs->channel == VINO_CHANNEL_A) ?
+                        vino_drvdata->b.input : vino_drvdata->a.input;
+                vcs->data_norm = (vcs->channel == VINO_CHANNEL_A) ?
+                        vino_drvdata->b.data_norm : vino_drvdata->a.data_norm;
+        }
+
+        if (vcs->input == VINO_INPUT_NONE) {
+                ret = -ENODEV;
+                goto out;
+        }
+
+        if (vino_is_input_owner(vcs)) {
+                vino_set_default_clipping(vcs);
+                vino_set_default_framerate(vcs);
+        }
+
+        dprintk("vino_acquire_input(): %s\n", vino_inputs[vcs->input].name);
+
+out:
+        spin_unlock(&vino_drvdata->input_lock);
+
+        return ret;
+}
+
+static int vino_set_input(struct vino_channel_settings *vcs, int input)
+{
+        struct vino_channel_settings *vcs2 = (vcs->channel == VINO_CHANNEL_A) ?
+                &vino_drvdata->b : &vino_drvdata->a;
+        int ret = 0;
+
+        dprintk("vino_set_input():\n");
+
+        spin_lock(&vino_drvdata->input_lock);
+
+        if (vcs->input == input)
+                goto out;
+
+        switch(input) {
+        case VINO_INPUT_COMPOSITE:
+        case VINO_INPUT_SVIDEO:
+                if (!vino_drvdata->decoder.driver) {
+                        ret = -EINVAL;
+                        goto out;
+                }
+
+                if (vino_drvdata->decoder.owner == VINO_NO_CHANNEL) {
+                        if (i2c_use_client(vino_drvdata->decoder.driver)) {
+                                ret = -ENODEV;
+                                goto out;
+                        }
+                        vino_drvdata->decoder.owner = vcs->channel;
+                }
+
+                if (vino_drvdata->decoder.owner == vcs->channel) {
+                        int saa7191_input;
+                        int saa7191_norm;
+
+                        vcs->input = input;
+                        vcs->data_norm = VINO_DATA_NORM_PAL;
+
+                        saa7191_input = vino_get_saa7191_input(vcs->input);
+                        i2c_decoder_command(DECODER_SET_INPUT, &saa7191_input);
+                        saa7191_norm = vino_get_saa7191_norm(vcs->data_norm);
+                        i2c_decoder_command(DECODER_SAA7191_SET_NORM,
+                                            &saa7191_norm);
+                } else {
+                        if (vcs2->input != input) {
+                                ret = -EBUSY;
+                                goto out;
+                        }
+
+                        vcs->input = input;
+                        vcs->data_norm = vcs2->data_norm;
+                }
+
+                if (vino_drvdata->camera.owner == vcs->channel) {
+                        /* Transfer the ownership or release the input */
+                        if (vcs2->input == VINO_INPUT_D1) {
+                                vino_drvdata->camera.owner = vcs2->channel;
+                        } else {
+                                i2c_release_client(vino_drvdata->
+                                                   camera.driver);
+                                vino_drvdata->camera.owner = VINO_NO_CHANNEL;
+                        }
+                }
+                break;
+        case VINO_INPUT_D1:
+                if (!vino_drvdata->camera.driver) {
+                        ret = -EINVAL;
+                        goto out;
+                }
+
+                if (vino_drvdata->camera.owner == VINO_NO_CHANNEL) {
+                        if (i2c_use_client(vino_drvdata->camera.driver)) {
+                                ret = -ENODEV;
+                                goto out;
+                        }
+                        vino_drvdata->camera.owner = vcs->channel;
+                }
+
+                if (vino_drvdata->decoder.owner == vcs->channel) {
+                        /* Transfer the ownership or release the input */
+                        if ((vcs2->input == VINO_INPUT_COMPOSITE) ||
+                                 (vcs2->input == VINO_INPUT_SVIDEO)) {
+                                vino_drvdata->decoder.owner = vcs2->channel;
+                        } else {
+                                i2c_release_client(vino_drvdata->
+                                                   decoder.driver);
+                                vino_drvdata->decoder.owner = VINO_NO_CHANNEL;
+                        }
+                }
+
+                vcs->input = input;
+                vcs->data_norm = VINO_DATA_NORM_D1;
+                break;
+        default:
+                ret = -EINVAL;
+                goto out;
+        }
+
+        vino_set_default_clipping(vcs);
+        vino_set_default_framerate(vcs);
+
+        dprintk("vino_set_input(): %s\n", vino_inputs[vcs->input].name);
+
+out:
+        spin_unlock(&vino_drvdata->input_lock);
+
+        return ret;
+}
+
+static void vino_release_input(struct vino_channel_settings *vcs)
+{
+        struct vino_channel_settings *vcs2 = (vcs->channel == VINO_CHANNEL_A) ?
+                &vino_drvdata->b : &vino_drvdata->a;
+
+        dprintk("vino_release_input():\n");
+
+        spin_lock(&vino_drvdata->input_lock);
+
+        /* Release ownership of the channel
+         * and if the other channel takes input from
+         * the same source, transfer the ownership */
+        if (vino_drvdata->camera.owner == vcs->channel) {
+                if (vcs2->input == VINO_INPUT_D1) {
+                        vino_drvdata->camera.owner = vcs2->channel;
+                } else {
+                        i2c_release_client(vino_drvdata->camera.driver);
+                        vino_drvdata->camera.owner = VINO_NO_CHANNEL;
+                }
+        } else if (vino_drvdata->decoder.owner == vcs->channel) {
+                if ((vcs2->input == VINO_INPUT_COMPOSITE) ||
+                         (vcs2->input == VINO_INPUT_SVIDEO)) {
+                        vino_drvdata->decoder.owner = vcs2->channel;
+                } else {
+                        i2c_release_client(vino_drvdata->decoder.driver);
+                        vino_drvdata->decoder.owner = VINO_NO_CHANNEL;
+                }
+        }
+        vcs->input = VINO_INPUT_NONE;
+
+        spin_unlock(&vino_drvdata->input_lock);
+}
+
+/* execute with input_lock locked */
+static int vino_set_data_norm(struct vino_channel_settings *vcs,
+                              unsigned int data_norm)
+{
+        int saa7191_norm;
+
+        switch (vcs->input) {
+        case VINO_INPUT_D1:
+                /* only one "norm" supported */
+                if (data_norm != VINO_DATA_NORM_D1)
+                        return -EINVAL;
+                break;
+        case VINO_INPUT_COMPOSITE:
+        case VINO_INPUT_SVIDEO:
+
+                saa7191_norm = vino_get_saa7191_norm(data_norm);
+
+                i2c_decoder_command(DECODER_SAA7191_SET_NORM, &saa7191_norm);
+                vcs->data_norm = data_norm;
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+/* V4L2 helper functions */
+
+static int vino_find_data_format(__u32 pixelformat)
+{
+        int i;
+
+        for (i = 0; i < VINO_DATA_FMT_COUNT; i++) {
+                if (vino_data_formats[i].pixelformat == pixelformat)
+                        return i;
+        }
+
+        return VINO_DATA_FMT_NONE;
+}
+
+static int vino_enum_data_norm(struct vino_channel_settings *vcs, __u32 index)
+{
+        int data_norm = VINO_DATA_NORM_NONE;
+
+        spin_lock(&vino_drvdata->input_lock);
+        switch(vcs->input) {
+        case VINO_INPUT_COMPOSITE:
+        case VINO_INPUT_SVIDEO:
+                if (index == 0) {
+                        data_norm = VINO_DATA_NORM_PAL;
+                } else if (index == 1) {
+                        data_norm = VINO_DATA_NORM_NTSC;
+                } else if (index == 2) {
+                        data_norm = VINO_DATA_NORM_SECAM;
+                }
+                break;
+        case VINO_INPUT_D1:
+                if (index == 0) {
+                        data_norm = VINO_DATA_NORM_D1;
+                }
+                break;
+        }
+        spin_unlock(&vino_drvdata->input_lock);
+
+        return data_norm;
+}
+
+static int vino_enum_input(struct vino_channel_settings *vcs, __u32 index)
+{
+        int input = VINO_INPUT_NONE;
+
+        spin_lock(&vino_drvdata->input_lock);
+        if (vino_drvdata->decoder.driver && vino_drvdata->camera.driver) {
+                switch (index) {
+                case 0:
+                        input = VINO_INPUT_COMPOSITE;
+                        break;
+                case 1:
+                        input = VINO_INPUT_SVIDEO;
+                        break;
+                case 2:
+                        input = VINO_INPUT_D1;
+                        break;
+                }
+        } else if (vino_drvdata->decoder.driver) {
+                switch (index) {
+                case 0:
+                        input = VINO_INPUT_COMPOSITE;
+                        break;
+                case 1:
+                        input = VINO_INPUT_SVIDEO;
+                        break;
+                }
+        } else if (vino_drvdata->camera.driver) {
+                switch (index) {
+                case 0:
+                        input = VINO_INPUT_D1;
+                        break;
+                }
+        }
+        spin_unlock(&vino_drvdata->input_lock);
+
+        return input;
+}
+
+/* execute with input_lock locked */
+static __u32 vino_find_input_index(struct vino_channel_settings *vcs)
+{
+        __u32 index = 0;
+        // FIXME: detect when no inputs available
+
+        if (vino_drvdata->decoder.driver && vino_drvdata->camera.driver) {
+                switch (vcs->input) {
+                case VINO_INPUT_COMPOSITE:
+                        index = 0;
+                        break;
+                case VINO_INPUT_SVIDEO:
+                        index = 1;
+                        break;
+                case VINO_INPUT_D1:
+                        index = 2;
+                        break;
+                }
+        } else if (vino_drvdata->decoder.driver) {
+                switch (vcs->input) {
+                case VINO_INPUT_COMPOSITE:
+                        index = 0;
+                        break;
+                case VINO_INPUT_SVIDEO:
+                        index = 1;
+                        break;
+                }
+        } else if (vino_drvdata->camera.driver) {
+                switch (vcs->input) {
+                case VINO_INPUT_D1:
+                        index = 0;
+                        break;
+                }
+        }
+
+        return index;
+}
+
+/* V4L2 ioctls */
+
+static void vino_v4l2_querycap(struct v4l2_capability *cap)
+{
+        memset(cap, 0, sizeof(struct v4l2_capability));
+
+        strcpy(cap->driver, vino_driver_name);
+        strcpy(cap->card, vino_driver_description);
+        strcpy(cap->bus_info, vino_bus_name);
+        cap->version = VINO_VERSION_CODE;
+        cap->capabilities =
+                V4L2_CAP_VIDEO_CAPTURE |
+                V4L2_CAP_STREAMING;
+        // V4L2_CAP_OVERLAY, V4L2_CAP_READWRITE
+}
+
+static int vino_v4l2_enuminput(struct vino_channel_settings *vcs,
+                               struct v4l2_input *i)
+{
+        __u32 index = i->index;
+        int input;
+        dprintk("requested index = %d\n", index);
+
+        input = vino_enum_input(vcs, index);
+        if (input == VINO_INPUT_NONE)
+                return -EINVAL;
+
+        memset(i, 0, sizeof(struct v4l2_input));
+
+        i->index = index;
+        i->type = V4L2_INPUT_TYPE_CAMERA;
+        i->std = vino_inputs[input].std;
+        strcpy(i->name, vino_inputs[input].name);
+
+        if ((input == VINO_INPUT_COMPOSITE)
+            || (input == VINO_INPUT_SVIDEO)) {
+                struct saa7191_status status;
+                i2c_decoder_command(DECODER_SAA7191_GET_STATUS, &status);
+                i->status |= status.signal ? 0 : V4L2_IN_ST_NO_SIGNAL;
+                i->status |= status.color ? 0 : V4L2_IN_ST_NO_COLOR;
+        }
+
+        return 0;
+}
+
+static int vino_v4l2_g_input(struct vino_channel_settings *vcs,
+                             struct v4l2_input *i)
+{
+        __u32 index;
+        int input;
+
+        spin_lock(&vino_drvdata->input_lock);
+        input = vcs->input;
+        index = vino_find_input_index(vcs);
+        spin_unlock(&vino_drvdata->input_lock);
+
+        dprintk("input = %d\n", input);
+
+        if (input == VINO_INPUT_NONE) {
+                return -EINVAL;
+        }
+
+        memset(i, 0, sizeof(struct v4l2_input));
+
+        i->index = index;
+        i->type = V4L2_INPUT_TYPE_CAMERA;
+        i->std = vino_inputs[input].std;
+        strcpy(i->name, vino_inputs[input].name);
+
+        return 0;
+}
+
+static int vino_v4l2_s_input(struct vino_channel_settings *vcs,
+                             struct v4l2_input *i)
+{
+        int input;
+        dprintk("requested input = %d\n", i->index);
+
+        input = vino_enum_input(vcs, i->index);
+        if (input == VINO_INPUT_NONE)
+                return -EINVAL;
+
+        return vino_set_input(vcs, input);
+}
+
+static int vino_v4l2_enumstd(struct vino_channel_settings *vcs,
+                             struct v4l2_standard *s)
+{
+        int index = s->index;
+        int data_norm = vino_enum_data_norm(vcs, index);
+        dprintk("standard index = %d\n", index);
+
+        if (data_norm == VINO_DATA_NORM_NONE)
+                return -EINVAL;
+
+        dprintk("standard name = %s\n",
+               vino_data_norms[data_norm].description);
+
+        memset(s, 0, sizeof(struct v4l2_standard));
+        s->index = index;
+
+        s->id = vino_data_norms[data_norm].std;
+        s->frameperiod.numerator = 1;
+        s->frameperiod.denominator =
+                vino_data_norms[data_norm].fps_max;
+        s->framelines =
+                vino_data_norms[data_norm].framelines;
+        strcpy(s->name,
+               vino_data_norms[data_norm].description);
+
+        return 0;
+}
+
+static int vino_v4l2_g_std(struct vino_channel_settings *vcs,
+                           v4l2_std_id *std)
+{
+        spin_lock(&vino_drvdata->input_lock);
+        dprintk("current standard = %d\n", vcs->data_norm);
+        *std = vino_data_norms[vcs->data_norm].std;
+        spin_unlock(&vino_drvdata->input_lock);
+
+        return 0;
+}
+
+static int vino_v4l2_s_std(struct vino_channel_settings *vcs,
+                           v4l2_std_id *std)
+{
+        int ret = 0;
+
+        spin_lock(&vino_drvdata->input_lock);
+
+        /* check if the standard is valid for the current input */
+        if (vino_is_input_owner(vcs)
+            && (vino_inputs[vcs->input].std & (*std))) {
+                dprintk("standard accepted\n");
+
+                /* change the video norm for SAA7191
+                 * and accept NTSC for D1 (do nothing) */
+
+                if (vcs->input == VINO_INPUT_D1)
+                        goto out;
+
+                if ((*std) & V4L2_STD_PAL) {
+                        vino_set_data_norm(vcs, VINO_DATA_NORM_PAL);
+                        vcs->data_norm = VINO_DATA_NORM_PAL;
+                } else if ((*std) & V4L2_STD_NTSC) {
+                        vino_set_data_norm(vcs, VINO_DATA_NORM_NTSC);
+                        vcs->data_norm = VINO_DATA_NORM_NTSC;
+                } else if ((*std) & V4L2_STD_SECAM) {
+                        vino_set_data_norm(vcs, VINO_DATA_NORM_SECAM);
+                        vcs->data_norm = VINO_DATA_NORM_SECAM;
+                } else {
+                        ret = -EINVAL;
+                }
+        } else {
+                ret = -EINVAL;
+        }
+
+out:
+        spin_unlock(&vino_drvdata->input_lock);
+
+        return ret;
+}
+
+static int vino_v4l2_enum_fmt(struct vino_channel_settings *vcs,
+                              struct v4l2_fmtdesc *fd)
+{
+        enum v4l2_buf_type type = fd->type;
+        int index = fd->index;
+        dprintk("format index = %d\n", index);
+
+        switch (fd->type) {
+        case V4L2_BUF_TYPE_VIDEO_CAPTURE:
+                if ((fd->index < 0) ||
+                    (fd->index >= VINO_DATA_FMT_COUNT))
+                        return -EINVAL;
+                dprintk("format name = %s\n",
+                       vino_data_formats[index].description);
+
+                memset(fd, 0, sizeof(struct v4l2_fmtdesc));
+                fd->index = index;
+                fd->type = type;
+                fd->pixelformat = vino_data_formats[index].pixelformat;
+                strcpy(fd->description, vino_data_formats[index].description);
+                break;
+        case V4L2_BUF_TYPE_VIDEO_OVERLAY:
+        default:
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+static int vino_v4l2_try_fmt(struct vino_channel_settings *vcs,
+                             struct v4l2_format *f)
+{
+        struct vino_channel_settings tempvcs;
+
+        switch (f->type) {
+        case V4L2_BUF_TYPE_VIDEO_CAPTURE: {
+                struct v4l2_pix_format *pf = &f->fmt.pix;
+
+                dprintk("requested: w = %d, h = %d\n",
+                       pf->width, pf->height);
+
+                spin_lock(&vino_drvdata->input_lock);
+                memcpy(&tempvcs, vcs, sizeof(struct vino_channel_settings));
+                spin_unlock(&vino_drvdata->input_lock);
+
+                tempvcs.data_format = vino_find_data_format(pf->pixelformat);
+                if (tempvcs.data_format == VINO_DATA_FMT_NONE) {
+                        tempvcs.data_format = VINO_DATA_FMT_RGB32;
+                        pf->pixelformat =
+                                vino_data_formats[tempvcs.data_format].
+                                pixelformat;
+                }
+
+                /* data format must be set before clipping/scaling */
+                vino_set_scaling(&tempvcs, pf->width, pf->height);
+
+                dprintk("data format = %s\n",
+                       vino_data_formats[tempvcs.data_format].description);
+
+                pf->width = (tempvcs.clipping.right - tempvcs.clipping.left) /
+                        tempvcs.decimation;
+                pf->height = (tempvcs.clipping.bottom - tempvcs.clipping.top) /
+                        tempvcs.decimation;
+
+                pf->field = V4L2_FIELD_INTERLACED;
+                pf->bytesperline = tempvcs.line_size;
+                pf->sizeimage = tempvcs.line_size *
+                        (tempvcs.clipping.bottom - tempvcs.clipping.top) /
+                        tempvcs.decimation;
+                pf->colorspace =
+                        vino_data_formats[tempvcs.data_format].colorspace;
+
+                pf->priv = 0;
+                break;
+        }
+        case V4L2_BUF_TYPE_VIDEO_OVERLAY:
+        default:
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+static int vino_v4l2_g_fmt(struct vino_channel_settings *vcs,
+                           struct v4l2_format *f)
+{
+        switch (f->type) {
+        case V4L2_BUF_TYPE_VIDEO_CAPTURE: {
+                struct v4l2_pix_format *pf = &f->fmt.pix;
+                spin_lock(&vino_drvdata->input_lock);
+
+                pf->width = (vcs->clipping.right - vcs->clipping.left) /
+                        vcs->decimation;
+                pf->height = (vcs->clipping.bottom - vcs->clipping.top) /
+                        vcs->decimation;
+                pf->pixelformat =
+                        vino_data_formats[vcs->data_format].pixelformat;
+
+                pf->field = V4L2_FIELD_INTERLACED;
+                pf->bytesperline = vcs->line_size;
+                pf->sizeimage = vcs->line_size *
+                        (vcs->clipping.bottom - vcs->clipping.top) /
+                        vcs->decimation;
+                pf->colorspace =
+                        vino_data_formats[vcs->data_format].colorspace;
+
+                pf->priv = 0;
+
+                spin_unlock(&vino_drvdata->input_lock);
+                break;
+        }
+        case V4L2_BUF_TYPE_VIDEO_OVERLAY:
+        default:
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+static int vino_v4l2_s_fmt(struct vino_channel_settings *vcs,
+                           struct v4l2_format *f)
+{
+        int data_format;
+
+        switch (f->type) {
+        case V4L2_BUF_TYPE_VIDEO_CAPTURE: {
+                struct v4l2_pix_format *pf = &f->fmt.pix;
+                spin_lock(&vino_drvdata->input_lock);
+
+                if (!vino_is_input_owner(vcs)) {
+                        spin_unlock(&vino_drvdata->input_lock);
+                        return -EINVAL;
+                }
+
+                data_format = vino_find_data_format(pf->pixelformat);
+                if (data_format == VINO_DATA_FMT_NONE) {
+                        vcs->data_format = VINO_DATA_FMT_RGB32;
+                        pf->pixelformat =
+                                vino_data_formats[vcs->data_format].
+                                pixelformat;
+                } else {
+                        vcs->data_format = data_format;
+                }
+
+                /* data format must be set before clipping/scaling */
+                vino_set_scaling(vcs, pf->width, pf->height);
+
+                dprintk("data format = %s\n",
+                       vino_data_formats[vcs->data_format].description);
+
+                pf->width = vcs->clipping.right - vcs->clipping.left;
+                pf->height = vcs->clipping.bottom - vcs->clipping.top;
+
+                pf->field = V4L2_FIELD_INTERLACED;
+                pf->bytesperline = vcs->line_size;
+                pf->sizeimage = vcs->line_size *
+                        (vcs->clipping.bottom - vcs->clipping.top) /
+                        vcs->decimation;
+                pf->colorspace =
+                        vino_data_formats[vcs->data_format].colorspace;
+
+                pf->priv = 0;
+
+                spin_unlock(&vino_drvdata->input_lock);
+                break;
+        }
+        case V4L2_BUF_TYPE_VIDEO_OVERLAY:
+        default:
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+static int vino_v4l2_cropcap(struct vino_channel_settings *vcs,
+                             struct v4l2_cropcap *ccap)
+{
+        const struct vino_data_norm *norm;
+
+        switch (ccap->type) {
+        case V4L2_BUF_TYPE_VIDEO_CAPTURE:
+                spin_lock(&vino_drvdata->input_lock);
+                norm = &vino_data_norms[vcs->data_norm];
+                spin_unlock(&vino_drvdata->input_lock);
+
+                ccap->bounds.left = 0;
+                ccap->bounds.top = 0;
+                ccap->bounds.width = norm->width;
+                ccap->bounds.height = norm->height;
+                memcpy(&ccap->defrect, &ccap->bounds,
+                       sizeof(struct v4l2_rect));
+
+                ccap->pixelaspect.numerator = 1;
+                ccap->pixelaspect.denominator = 1;
+                break;
+        case V4L2_BUF_TYPE_VIDEO_OVERLAY:
+        default:
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+static int vino_v4l2_g_crop(struct vino_channel_settings *vcs,
+                            struct v4l2_crop *c)
+{
+        switch (c->type) {
+        case V4L2_BUF_TYPE_VIDEO_CAPTURE:
+                spin_lock(&vino_drvdata->input_lock);
+
+                c->c.left = vcs->clipping.left;
+                c->c.top = vcs->clipping.top;
+                c->c.width = vcs->clipping.right - vcs->clipping.left;
+                c->c.height = vcs->clipping.bottom - vcs->clipping.top;
+
+                spin_unlock(&vino_drvdata->input_lock);
+                break;
+        case V4L2_BUF_TYPE_VIDEO_OVERLAY:
+        default:
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+static int vino_v4l2_s_crop(struct vino_channel_settings *vcs,
+                            struct v4l2_crop *c)
+{
+        switch (c->type) {
+        case V4L2_BUF_TYPE_VIDEO_CAPTURE:
+                spin_lock(&vino_drvdata->input_lock);
+
+                if (!vino_is_input_owner(vcs)) {
+                        spin_unlock(&vino_drvdata->input_lock);
+                        return -EINVAL;
+                }
+                vino_set_clipping(vcs, c->c.left, c->c.top,
+                                  c->c.width, c->c.height);
+
+                spin_unlock(&vino_drvdata->input_lock);
+                break;
+        case V4L2_BUF_TYPE_VIDEO_OVERLAY:
+        default:
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+static int vino_v4l2_g_parm(struct vino_channel_settings *vcs,
+                            struct v4l2_streamparm *sp)
+{
+        switch (sp->type) {
+        case V4L2_BUF_TYPE_VIDEO_CAPTURE: {
+                struct v4l2_captureparm *cp = &sp->parm.capture;
+                memset(cp, 0, sizeof(struct v4l2_captureparm));
+
+                cp->capability = V4L2_CAP_TIMEPERFRAME;
+                cp->timeperframe.numerator = 1;
+
+                spin_lock(&vino_drvdata->input_lock);
+                cp->timeperframe.denominator = vcs->fps;
+                spin_unlock(&vino_drvdata->input_lock);
+
+                // TODO: cp->readbuffers = xxx;
+                break;
+        }
+        case V4L2_BUF_TYPE_VIDEO_OVERLAY:
+        default:
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+static int vino_v4l2_s_parm(struct vino_channel_settings *vcs,
+                            struct v4l2_streamparm *sp)
+{
+        switch (sp->type) {
+        case V4L2_BUF_TYPE_VIDEO_CAPTURE: {
+                struct v4l2_captureparm *cp = &sp->parm.capture;
+
+                spin_lock(&vino_drvdata->input_lock);
+                if (!vino_is_input_owner(vcs)) {
+                        spin_unlock(&vino_drvdata->input_lock);
+                        return -EINVAL;
+                }
+
+                if ((cp->timeperframe.numerator == 0) ||
+                    (cp->timeperframe.denominator == 0)) {
+                        /* reset framerate */
+                        vino_set_default_framerate(vcs);
+                } else {
+                        vino_set_framerate(vcs, cp->timeperframe.denominator /
+                                           cp->timeperframe.numerator);
+                }
+                spin_unlock(&vino_drvdata->input_lock);
+
+                // TODO: set buffers according to cp->readbuffers
+                break;
+        }
+        case V4L2_BUF_TYPE_VIDEO_OVERLAY:
+        default:
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+static int vino_v4l2_reqbufs(struct vino_channel_settings *vcs,
+                             struct v4l2_requestbuffers *rb)
+{
+        if (vcs->reading)
+                return -EBUSY;
+
+        switch (rb->type) {
+        case V4L2_BUF_TYPE_VIDEO_CAPTURE: {
+                // TODO: check queue type
+                if (rb->memory != V4L2_MEMORY_MMAP) {
+                        dprintk("type not mmap\n");
+                        return -EINVAL;
+                }
+
+                if (vino_is_capturing(vcs)) {
+                        dprintk("busy, capturing\n");
+                        return -EBUSY;
+                }
+
+                dprintk("count = %d\n", rb->count);
+                if (rb->count > 0) {
+                        if (vino_queue_has_mapped_buffers(&vcs->fb_queue)) {
+                                dprintk("busy, buffers still mapped\n");
+                                return -EBUSY;
+                        } else {
+                                vino_queue_free(&vcs->fb_queue);
+                                vino_queue_init(&vcs->fb_queue, &rb->count);
+                        }
+                } else {
+                        vino_capture_stop(vcs);
+                        vino_queue_free(&vcs->fb_queue);
+                }
+                break;
+        }
+        case V4L2_BUF_TYPE_VIDEO_OVERLAY:
+        default:
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+static void vino_v4l2_get_buffer_status(struct vino_channel_settings *vcs,
+                                        struct vino_framebuffer *fb,
+                                        struct v4l2_buffer *b)
+{
+        if (vino_queue_outgoing_contains(&vcs->fb_queue,
+                                         fb->id)) {
+                b->flags &= ~V4L2_BUF_FLAG_QUEUED;
+                b->flags |= V4L2_BUF_FLAG_DONE;
+        } else if (vino_queue_incoming_contains(&vcs->fb_queue,
+                                       fb->id)) {
+                b->flags &= ~V4L2_BUF_FLAG_DONE;
+                b->flags |= V4L2_BUF_FLAG_QUEUED;
+        } else {
+                b->flags &= ~(V4L2_BUF_FLAG_DONE |
+                              V4L2_BUF_FLAG_QUEUED);
+        }
+
+        b->flags &= ~(V4L2_BUF_FLAG_TIMECODE);
+
+        if (fb->map_count > 0)
+                b->flags |= V4L2_BUF_FLAG_MAPPED;
+
+        b->index = fb->id;
+        b->memory = (vcs->fb_queue.type == VINO_MEMORY_MMAP) ?
+                V4L2_MEMORY_MMAP : V4L2_MEMORY_USERPTR;
+        b->m.offset = fb->offset;
+        b->bytesused = fb->data_size;
+        b->length = fb->size;
+        b->field = V4L2_FIELD_INTERLACED;
+        b->sequence = fb->frame_counter;
+        memcpy(&b->timestamp, &fb->timestamp,
+               sizeof(struct timeval));
+        // b->input ?
+
+        dprintk("buffer %d: length = %d, bytesused = %d, offset = %d\n",
+                fb->id, fb->size, fb->data_size, fb->offset);
+}
+
+static int vino_v4l2_querybuf(struct vino_channel_settings *vcs,
+                              struct v4l2_buffer *b)
+{
+        if (vcs->reading)
+                return -EBUSY;
+
+        switch (b->type) {
+        case V4L2_BUF_TYPE_VIDEO_CAPTURE: {
+                struct vino_framebuffer *fb;
+
+                // TODO: check queue type
+                if (b->index >= vino_queue_get_length(&vcs->fb_queue)) {
+                        dprintk("invalid index = %d\n",
+                               b->index);
+                        return -EINVAL;
+                }
+
+                fb = vino_queue_get_buffer(&vcs->fb_queue,
+                                           b->index);
+                if (fb == NULL) {
+                        dprintk("vino_queue_get_buffer() failed");
+                        return -EINVAL;
+                }
+
+                vino_v4l2_get_buffer_status(vcs, fb, b);
+                break;
+        }
+        case V4L2_BUF_TYPE_VIDEO_OVERLAY:
+        default:
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+static int vino_v4l2_qbuf(struct vino_channel_settings *vcs,
+                          struct v4l2_buffer *b)
+{
+        if (vcs->reading)
+                return -EBUSY;
+
+        switch (b->type) {
+        case V4L2_BUF_TYPE_VIDEO_CAPTURE: {
+                struct vino_framebuffer *fb;
+                int ret;
+
+                // TODO: check queue type
+                if (b->memory != V4L2_MEMORY_MMAP) {
+                        dprintk("type not mmap\n");
+                        return -EINVAL;
+                }
+
+                fb = vino_capture_enqueue(vcs, b->index);
+                if (fb == NULL)
+                        return -EINVAL;
+
+                vino_v4l2_get_buffer_status(vcs, fb, b);
+
+                if (vcs->streaming) {
+                        ret = vino_capture_next(vcs, 1);
+                        if (ret)
+                                return ret;
+                }
+                break;
+        }
+        case V4L2_BUF_TYPE_VIDEO_OVERLAY:
+        default:
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+static int vino_v4l2_dqbuf(struct vino_channel_settings *vcs,
+                           struct v4l2_buffer *b,
+                           unsigned int nonblocking)
+{
+        if (vcs->reading)
+                return -EBUSY;
+
+        switch (b->type) {
+        case V4L2_BUF_TYPE_VIDEO_CAPTURE: {
+                struct vino_framebuffer *fb;
+                unsigned int incoming, outgoing;
+                int err;
+
+                // TODO: check queue type
+
+                err = vino_queue_get_incoming(&vcs->fb_queue, &incoming);
+                if (err) {
+                        dprintk("vino_queue_get_incoming() failed\n");
+                        return -EIO;
+                }
+                err = vino_queue_get_outgoing(&vcs->fb_queue, &outgoing);
+                if (err) {
+                        dprintk("vino_queue_get_outgoing() failed\n");
+                        return -EIO;
+                }
+
+                dprintk("incoming = %d, outgoing = %d\n", incoming, outgoing);
+
+                if (outgoing == 0) {
+                        if (incoming == 0) {
+                                dprintk("no incoming or outgoing buffers\n");
+                                return -EINVAL;
+                        }
+                        if (nonblocking) {
+                                dprintk("non-blocking I/O was selected and "
+                                        "there are no buffers to dequeue\n");
+                                return -EAGAIN;
+                        }
+
+                        err = vino_wait_for_frame(vcs);
+                        if (err) {
+                                err = vino_wait_for_frame(vcs);
+                                if (err) {
+                                        /* interrupted */
+                                        vino_capture_failed(vcs);
+                                        return -EIO;
+                                }
+                        }
+                }
+
+                fb = vino_queue_remove(&vcs->fb_queue, &b->index);
+                if (fb == NULL) {
+                        dprintk("vino_queue_remove() failed\n");
+                        return -EINVAL;
+                }
+
+                err = vino_check_buffer(vcs, fb);
+                if (err)
+                        return -EIO;
+
+                vino_v4l2_get_buffer_status(vcs, fb, b);
+                break;
+        }
+        case V4L2_BUF_TYPE_VIDEO_OVERLAY:
+        default:
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+static int vino_v4l2_streamon(struct vino_channel_settings *vcs)
+{
+        unsigned int incoming;
+        int ret;
+        if (vcs->reading)
+                return -EBUSY;
+
+        if (vcs->streaming)
+                return 0;
+
+        // TODO: check queue type
+
+        if (vino_queue_get_length(&vcs->fb_queue) < 1) {
+                dprintk("no buffers allocated\n");
+                return -EINVAL;
+        }
+
+        ret = vino_queue_get_incoming(&vcs->fb_queue, &incoming);
+        if (ret) {
+                dprintk("vino_queue_get_incoming() failed\n");
+                return -EINVAL;
+        }
+
+        vcs->streaming = 1;
+
+        if (incoming > 0) {
+                ret = vino_capture_next(vcs, 1);
+                if (ret) {
+                        vcs->streaming = 0;
+
+                        dprintk("couldn't start capture\n");
+                        return -EINVAL;
+                }
+        }
+
+        return 0;
+}
+
+static int vino_v4l2_streamoff(struct vino_channel_settings *vcs)
+{
+        if (vcs->reading)
+                return -EBUSY;
+
+        if (!vcs->streaming)
+                return 0;
+
+        vino_capture_stop(vcs);
+        vcs->streaming = 0;
+
+        return 0;
+}
+
+static int vino_v4l2_queryctrl(struct vino_channel_settings *vcs,
+                               struct v4l2_queryctrl *queryctrl)
+{
+        int i;
+        int err = 0;
+
+        spin_lock(&vino_drvdata->input_lock);
+
+        switch (vcs->input) {
+        case VINO_INPUT_D1:
+                for (i = 0; i < VINO_INDYCAM_V4L2_CONTROL_COUNT; i++) {
+                        if (vino_indycam_v4l2_controls[i].id ==
+                            queryctrl->id) {
+                                memcpy(queryctrl,
+                                       &vino_indycam_v4l2_controls[i],
+                                       sizeof(struct v4l2_queryctrl));
+                                goto found;
+                        }
+                }
+
+                err =  -EINVAL;
+                break;
+        case VINO_INPUT_COMPOSITE:
+        case VINO_INPUT_SVIDEO:
+                for (i = 0; i < VINO_SAA7191_V4L2_CONTROL_COUNT; i++) {
+                        if (vino_saa7191_v4l2_controls[i].id ==
+                            queryctrl->id) {
+                                memcpy(queryctrl,
+                                       &vino_saa7191_v4l2_controls[i],
+                                       sizeof(struct v4l2_queryctrl));
+                                goto found;
+                        }
+                }
+
+                err =  -EINVAL;
+                break;
+        default:
+                err =  -EINVAL;
+        }
+
+ found:
+        spin_unlock(&vino_drvdata->input_lock);
+
+        return err;
+}
+
+static int vino_v4l2_g_ctrl(struct vino_channel_settings *vcs,
+                            struct v4l2_control *control)
+{
+        struct indycam_control indycam_ctrl;
+        struct saa7191_control saa7191_ctrl;
+        int err = 0;
+
+        spin_lock(&vino_drvdata->input_lock);
+
+        switch (vcs->input) {
+        case VINO_INPUT_D1:
+                i2c_camera_command(DECODER_INDYCAM_GET_CONTROLS,
+                                   &indycam_ctrl);
+
+                switch(control->id) {
+                case V4L2_CID_AUTOGAIN:
+                        control->value = indycam_ctrl.agc;
+                        break;
+                case V4L2_CID_AUTO_WHITE_BALANCE:
+                        control->value = indycam_ctrl.awb;
+                        break;
+                case V4L2_CID_GAIN:
+                        control->value = indycam_ctrl.gain;
+                        break;
+                case V4L2_CID_PRIVATE_BASE:
+                        control->value = indycam_ctrl.red_saturation;
+                        break;
+                case V4L2_CID_PRIVATE_BASE + 1:
+                        control->value = indycam_ctrl.blue_saturation;
+                        break;
+                case V4L2_CID_RED_BALANCE:
+                        control->value = indycam_ctrl.red_balance;
+                        break;
+                case V4L2_CID_BLUE_BALANCE:
+                        control->value = indycam_ctrl.blue_balance;
+                        break;
+                case V4L2_CID_EXPOSURE:
+                        control->value = indycam_ctrl.shutter;
+                        break;
+                case V4L2_CID_GAMMA:
+                        control->value = indycam_ctrl.gamma;
+                        break;
+                default:
+                        err = -EINVAL;
+                }
+                break;
+        case VINO_INPUT_COMPOSITE:
+        case VINO_INPUT_SVIDEO:
+                i2c_decoder_command(DECODER_SAA7191_GET_CONTROLS,
+                                   &saa7191_ctrl);
+
+                switch(control->id) {
+                case V4L2_CID_HUE:
+                        control->value = saa7191_ctrl.hue;
+                        break;
+                case V4L2_CID_PRIVATE_BASE:
+                        control->value = saa7191_ctrl.vtrc;
+                        break;
+                default:
+                        err = -EINVAL;
+                }
+                break;
+        default:
+                err =  -EINVAL;
+        }
+
+        spin_unlock(&vino_drvdata->input_lock);
+
+        return err;
+}
+
+static int vino_v4l2_s_ctrl(struct vino_channel_settings *vcs,
+                            struct v4l2_control *control)
+{
+        struct indycam_control indycam_ctrl;
+        struct saa7191_control saa7191_ctrl;
+        int i;
+        int err = 0;
+
+        spin_lock(&vino_drvdata->input_lock);
+
+        switch (vcs->input) {
+        case VINO_INPUT_D1:
+                for (i = 0; i < VINO_INDYCAM_V4L2_CONTROL_COUNT; i++) {
+                        if (vino_indycam_v4l2_controls[i].id ==
+                            control->id) {
+                                if ((control->value >=
+                                     vino_indycam_v4l2_controls[i].minimum)
+                                    && (control->value <=
+                                        vino_indycam_v4l2_controls[i].
+                                        maximum)) {
+                                        goto ok1;
+                                } else {
+                                        err = -ERANGE;
+                                        goto error;
+                                }
+                        }
+                }
+                err = -EINVAL;
+                goto error;
+
+ok1:
+                indycam_ctrl.agc = INDYCAM_VALUE_UNCHANGED;
+                indycam_ctrl.awb = INDYCAM_VALUE_UNCHANGED;
+                indycam_ctrl.shutter = INDYCAM_VALUE_UNCHANGED;
+                indycam_ctrl.gain = INDYCAM_VALUE_UNCHANGED;
+                indycam_ctrl.red_balance = INDYCAM_VALUE_UNCHANGED;
+                indycam_ctrl.blue_balance = INDYCAM_VALUE_UNCHANGED;
+                indycam_ctrl.red_saturation = INDYCAM_VALUE_UNCHANGED;
+                indycam_ctrl.blue_saturation = INDYCAM_VALUE_UNCHANGED;
+                indycam_ctrl.gamma = INDYCAM_VALUE_UNCHANGED;
+
+                switch(control->id) {
+                case V4L2_CID_AUTOGAIN:
+                        indycam_ctrl.agc = control->value;
+                        break;
+                case V4L2_CID_AUTO_WHITE_BALANCE:
+                        indycam_ctrl.awb = control->value;
+                        break;
+                case V4L2_CID_GAIN:
+                        indycam_ctrl.gain = control->value;
+                        break;
+                case V4L2_CID_PRIVATE_BASE:
+                        indycam_ctrl.red_saturation = control->value;
+                        break;
+                case V4L2_CID_PRIVATE_BASE + 1:
+                        indycam_ctrl.blue_saturation = control->value;
+                        break;
+                case V4L2_CID_RED_BALANCE:
+                        indycam_ctrl.red_balance = control->value;
+                        break;
+                case V4L2_CID_BLUE_BALANCE:
+                        indycam_ctrl.blue_balance = control->value;
+                        break;
+                case V4L2_CID_EXPOSURE:
+                        indycam_ctrl.shutter = control->value;
+                        break;
+                case V4L2_CID_GAMMA:
+                        indycam_ctrl.gamma = control->value;
+                        break;
+                default:
+                        err =  -EINVAL;
+                }
+
+                if (!err)
+                        i2c_camera_command(DECODER_INDYCAM_SET_CONTROLS,
+                                           &indycam_ctrl);
+                break;
+        case VINO_INPUT_COMPOSITE:
+        case VINO_INPUT_SVIDEO:
+                for (i = 0; i < VINO_SAA7191_V4L2_CONTROL_COUNT; i++) {
+                        if (vino_saa7191_v4l2_controls[i].id ==
+                            control->id) {
+                                if ((control->value >=
+                                     vino_saa7191_v4l2_controls[i].minimum)
+                                    && (control->value <=
+                                        vino_saa7191_v4l2_controls[i].
+                                        maximum)) {
+                                        goto ok2;
+                                } else {
+                                        err = -ERANGE;
+                                        goto error;
+                                }
+                        }
+                }
+                err = -EINVAL;
+                goto error;
+
+ok2:
+                saa7191_ctrl.hue = SAA7191_VALUE_UNCHANGED;
+                saa7191_ctrl.vtrc = SAA7191_VALUE_UNCHANGED;
+
+                switch(control->id) {
+                case V4L2_CID_HUE:
+                        saa7191_ctrl.hue = control->value;
+                        break;
+                case V4L2_CID_PRIVATE_BASE:
+                        saa7191_ctrl.vtrc = control->value;
+                        break;
+                default:
+                        err =  -EINVAL;
+                }
+
+                if (!err)
+                        i2c_decoder_command(DECODER_SAA7191_SET_CONTROLS,
+                                            &saa7191_ctrl);
+                break;
+        default:
+                err =  -EINVAL;
+        }
+
+error:
+        spin_unlock(&vino_drvdata->input_lock);
+
+        return err;
+}
+
+/* File operations */
+
+static int vino_open(struct inode *inode, struct file *file)
+{
+        struct video_device *dev = video_devdata(file);
+        struct vino_channel_settings *vcs = video_get_drvdata(dev);
+        int ret = 0;
+        dprintk("open(): channel = %c\n",
+               (vcs->channel == VINO_CHANNEL_A) ? 'A' : 'B');
+
+        down(&vcs->sem);
+
+        if (vcs->users) {
+                dprintk("open(): driver busy\n");
+                ret = -EBUSY;
+                goto out;
+        }
+
+        ret = vino_acquire_input(vcs);
+        if (ret) {
+                dprintk("open(): vino_acquire_input() failed\n");
+                goto out;
+        }
+
+        vcs->users++;
+
+ out:
+        up(&vcs->sem);
+
+        dprintk("open(): %s!\n", ret ? "failed" : "complete");
+
+        return ret;
+}
+
+static int vino_close(struct inode *inode, struct file *file)
+{
+        struct video_device *dev = video_devdata(file);
+        struct vino_channel_settings *vcs = video_get_drvdata(dev);
+        dprintk("close():\n");
+
+        down(&vcs->sem);
+
+        vcs->users--;
+
+        if (!vcs->users) {
+                vino_release_input(vcs);
+
+                /* stop DMA and free buffers */
+                vino_capture_stop(vcs);
+                vino_queue_free(&vcs->fb_queue);
+        }
+
+        up(&vcs->sem);
+
+        return 0;
+}
+
+static void vino_vm_open(struct vm_area_struct *vma)
+{
+        struct vino_framebuffer *fb = vma->vm_private_data;
+
+        fb->map_count++;
+        dprintk("vino_vm_open(): count = %d\n", fb->map_count);
+}
+
+static void vino_vm_close(struct vm_area_struct *vma)
+{
+        struct vino_framebuffer *fb = vma->vm_private_data;
+
+        fb->map_count--;
+        dprintk("vino_vm_close(): count = %d\n", fb->map_count);
+}
+
+static struct vm_operations_struct vino_vm_ops = {
+        .open   = vino_vm_open,
+        .close  = vino_vm_close,
+};
+
+static int vino_mmap(struct file *file, struct vm_area_struct *vma)
+{
+        struct video_device *dev = video_devdata(file);
+        struct vino_channel_settings *vcs = video_get_drvdata(dev);
+
+        unsigned long start = vma->vm_start;
+        unsigned long size = vma->vm_end - vma->vm_start;
+        unsigned long offset = vma->vm_pgoff << PAGE_SHIFT;
+
+        struct vino_framebuffer *fb = NULL;
+        unsigned int i, length;
+        int ret = 0;
+
+        dprintk("mmap():\n");
+
+        // TODO: reject mmap if already mapped
+
+        if (down_interruptible(&vcs->sem))
+                return -EINTR;
+
+        if (vcs->reading) {
+                ret = -EBUSY;
+                goto out;
+        }
+
+        // TODO: check queue type
+
+        if (!(vma->vm_flags & VM_WRITE)) {
+                dprintk("mmap(): app bug: PROT_WRITE please\n");
+                ret = -EINVAL;
+                goto out;
+        }
+        if (!(vma->vm_flags & VM_SHARED)) {
+                dprintk("mmap(): app bug: MAP_SHARED please\n");
+                ret = -EINVAL;
+                goto out;
+        }
+
+        /* find the correct buffer using offset */
+        length = vino_queue_get_length(&vcs->fb_queue);
+        if (length == 0) {
+                dprintk("mmap(): queue not initialized\n");
+                ret = -EINVAL;
+                goto out;
+        }
+
+        for (i = 0; i < length; i++) {
+                fb = vino_queue_get_buffer(&vcs->fb_queue, i);
+                if (fb == NULL) {
+                        dprintk("mmap(): vino_queue_get_buffer() failed\n");
+                        ret = -EINVAL;
+                        goto out;
+                }
+
+                if (fb->offset == offset)
+                        goto found;
+        }
+
+        dprintk("mmap(): invalid offset = %lu\n", offset);
+        ret = -EINVAL;
+        goto out;
+
+found:
+        dprintk("mmap(): buffer = %d\n", i);
+
+        if (size > (fb->desc_table.page_count * PAGE_SIZE)) {
+                dprintk("mmap(): failed: size = %lu > %lu\n",
+                        size, fb->desc_table.page_count * PAGE_SIZE);
+                ret = -EINVAL;
+                goto out;
+        }
+
+        for (i = 0; i < fb->desc_table.page_count; i++) {
+                unsigned long pfn =
+                        virt_to_phys((void *)fb->desc_table.virtual[i]) >>
+                        PAGE_SHIFT;
+
+                if (size < PAGE_SIZE)
+                        break;
+
+                // protection was: PAGE_READONLY
+                if (remap_pfn_range(vma, start, pfn, PAGE_SIZE,
+                                    vma->vm_page_prot)) {
+                        dprintk("mmap(): remap_pfn_range() failed\n");
+                        ret = -EAGAIN;
+                        goto out;
+                }
+
+                start += PAGE_SIZE;
+                size -= PAGE_SIZE;
+        }
+
+        fb->map_count = 1;
+
+        vma->vm_flags |= VM_DONTEXPAND | VM_RESERVED;
+        vma->vm_flags &= ~VM_IO;
+        vma->vm_private_data = fb;
+        vma->vm_file = file;
+        vma->vm_ops = &vino_vm_ops;
+
+out:
+        up(&vcs->sem);
+
+        return ret;
+}
+
+static unsigned int vino_poll(struct file *file, poll_table *pt)
+{
+        struct video_device *dev = video_devdata(file);
+        struct vino_channel_settings *vcs = video_get_drvdata(dev);
+        unsigned int outgoing;
+        unsigned int ret = 0;
+
+        // lock mutex (?)
+        // TODO: this has to be corrected for different read modes
+
+        dprintk("poll():\n");
+
+        if (vino_queue_get_outgoing(&vcs->fb_queue, &outgoing)) {
+                dprintk("poll(): vino_queue_get_outgoing() failed\n");
+                ret = POLLERR;
+                goto error;
+        }
+        if (outgoing > 0)
+                goto over;
+
+        poll_wait(file, &vcs->fb_queue.frame_wait_queue, pt);
+
+        if (vino_queue_get_outgoing(&vcs->fb_queue, &outgoing)) {
+                dprintk("poll(): vino_queue_get_outgoing() failed\n");
+                ret = POLLERR;
+                goto error;
+        }
+
+over:
+        dprintk("poll(): data %savailable\n",
+                (outgoing > 0) ? "" : "not ");
+        if (outgoing > 0) {
+                ret = POLLIN | POLLRDNORM;
+        }
+
+error:
+
+        return ret;
+}
+
+static int vino_do_ioctl(struct inode *inode, struct file *file,
+                      unsigned int cmd, void *arg)
+{
+        struct video_device *dev = video_devdata(file);
+        struct vino_channel_settings *vcs = video_get_drvdata(dev);
+
+        switch (_IOC_TYPE(cmd)) {
+        case 'v':
+                dprintk("ioctl(): V4L1 unsupported (0x%08x)\n", cmd);
+                break;
+        case 'V':
+                dprintk("ioctl(): V4L2 %s (0x%08x)\n",
+                        v4l2_ioctl_names[_IOC_NR(cmd)], cmd);
+                break;
+        default:
+                dprintk("ioctl(): unsupported command 0x%08x\n", cmd);
+        }
+
+        switch (cmd) {
+        /* TODO: V4L1 interface (use compatibility layer?) */
+        /* V4L2 interface */
+        case VIDIOC_QUERYCAP: {
+                vino_v4l2_querycap(arg);
+                break;
+        }
+        case VIDIOC_ENUMINPUT: {
+                return vino_v4l2_enuminput(vcs, arg);
+        }
+        case VIDIOC_G_INPUT: {
+                return vino_v4l2_g_input(vcs, arg);
+        }
+        case VIDIOC_S_INPUT: {
+                return vino_v4l2_s_input(vcs, arg);
+        }
+        case VIDIOC_ENUMSTD: {
+                return vino_v4l2_enumstd(vcs, arg);
+        }
+        case VIDIOC_G_STD: {
+                return vino_v4l2_g_std(vcs, arg);
+        }
+        case VIDIOC_S_STD: {
+                return vino_v4l2_s_std(vcs, arg);
+        }
+        case VIDIOC_ENUM_FMT: {
+                return vino_v4l2_enum_fmt(vcs, arg);
+        }
+        case VIDIOC_TRY_FMT: {
+                return vino_v4l2_try_fmt(vcs, arg);
+        }
+        case VIDIOC_G_FMT: {
+                return vino_v4l2_g_fmt(vcs, arg);
+        }
+        case VIDIOC_S_FMT: {
+                return vino_v4l2_s_fmt(vcs, arg);
+        }
+        case VIDIOC_CROPCAP: {
+                return vino_v4l2_cropcap(vcs, arg);
+        }
+        case VIDIOC_G_CROP: {
+                return vino_v4l2_g_crop(vcs, arg);
+        }
+        case VIDIOC_S_CROP: {
+                return vino_v4l2_s_crop(vcs, arg);
+        }
+        case VIDIOC_G_PARM: {
+                return vino_v4l2_g_parm(vcs, arg);
+        }
+        case VIDIOC_S_PARM: {
+                return vino_v4l2_s_parm(vcs, arg);
+        }
+        case VIDIOC_REQBUFS: {
+                return vino_v4l2_reqbufs(vcs, arg);
+        }
+        case VIDIOC_QUERYBUF: {
+                return vino_v4l2_querybuf(vcs, arg);
+        }
+        case VIDIOC_QBUF: {
+                return vino_v4l2_qbuf(vcs, arg);
+        }
+        case VIDIOC_DQBUF: {
+                return vino_v4l2_dqbuf(vcs, arg, file->f_flags & O_NONBLOCK);
+        }
+        case VIDIOC_STREAMON: {
+                return vino_v4l2_streamon(vcs);
+        }
+        case VIDIOC_STREAMOFF: {
+                return vino_v4l2_streamoff(vcs);
+        }
+        case VIDIOC_QUERYCTRL: {
+                return vino_v4l2_queryctrl(vcs, arg);
+        }
+        case VIDIOC_G_CTRL: {
+                return vino_v4l2_g_ctrl(vcs, arg);
+        }
+        case VIDIOC_S_CTRL: {
+                return vino_v4l2_s_ctrl(vcs, arg);
+        }
+        default:
+                return -ENOIOCTLCMD;
+        }
+
+        return 0;
+}
+
+static int vino_ioctl(struct inode *inode, struct file *file,
+                      unsigned int cmd, unsigned long arg)
+{
+        struct video_device *dev = video_devdata(file);
+        struct vino_channel_settings *vcs = video_get_drvdata(dev);
+        int ret;
+
+        if (down_interruptible(&vcs->sem))
+                return -EINTR;
+
+        ret = video_usercopy(inode, file, cmd, arg, vino_do_ioctl);
+
+        up(&vcs->sem);
+
+        return ret;
+}
+
+/* Initialization and cleanup */
+
+// __initdata
+static int vino_init_stage = 0;
+
+static struct file_operations vino_fops = {
         .owner          = THIS_MODULE,
-        .type           = VID_TYPE_CAPTURE | VID_TYPE_SUBCAPTURE,
-        .hardware       = VID_HARDWARE_VINO,
-        .name           = "VINO",
         .open           = vino_open,
-        .close          = vino_close,
+        .release        = vino_close,
         .ioctl          = vino_ioctl,
         .mmap           = vino_mmap,
+        .poll           = vino_poll,
+        .llseek         = no_llseek,
 };
 
-static int __init vino_init(void)
+static struct video_device v4l_device_template = {
+        .name           = "NOT SET",
+        //.type         = VID_TYPE_CAPTURE | VID_TYPE_SUBCAPTURE |
+        //      VID_TYPE_CLIPPING | VID_TYPE_SCALES, VID_TYPE_OVERLAY
+        .hardware       = VID_HARDWARE_VINO,
+        .fops           = &vino_fops,
+        .minor          = -1,
+};
+
+static void vino_module_cleanup(int stage)
+{
+        switch(stage) {
+        case 10:
+                video_unregister_device(vino_drvdata->b.v4l_device);
+                vino_drvdata->b.v4l_device = NULL;
+        case 9:
+                video_unregister_device(vino_drvdata->a.v4l_device);
+                vino_drvdata->a.v4l_device = NULL;
+        case 8:
+                vino_i2c_del_bus();
+        case 7:
+                free_irq(SGI_VINO_IRQ, NULL);
+        case 6:
+                if (vino_drvdata->b.v4l_device) {
+                        video_device_release(vino_drvdata->b.v4l_device);
+                        vino_drvdata->b.v4l_device = NULL;
+                }
+        case 5:
+                if (vino_drvdata->a.v4l_device) {
+                        video_device_release(vino_drvdata->a.v4l_device);
+                        vino_drvdata->a.v4l_device = NULL;
+                }
+        case 4:
+                /* all entries in dma_cpu dummy table have the same address */
+                dma_unmap_single(NULL,
+                                 vino_drvdata->dummy_desc_table.dma_cpu[0],
+                                 PAGE_SIZE, DMA_FROM_DEVICE);
+                dma_free_coherent(NULL, VINO_DUMMY_DESC_COUNT
+                                  * sizeof(dma_addr_t),
+                                  (void *)vino_drvdata->
+                                  dummy_desc_table.dma_cpu,
+                                  vino_drvdata->dummy_desc_table.dma);
+        case 3:
+                free_page(vino_drvdata->dummy_page);
+        case 2:
+                kfree(vino_drvdata);
+        case 1:
+                iounmap(vino);
+        case 0:
+                break;
+        default:
+                dprintk("vino_module_cleanup(): invalid cleanup stage = %d\n",
+                        stage);
+        }
+}
+
+static int vino_probe(void)
 {
-        unsigned long rev;
-        int i, ret = 0;
+        unsigned long rev_id;
 
-        /* VINO is Indy specific beast */
-        if (ip22_is_fullhouse())
+        if (ip22_is_fullhouse()) {
+                printk(KERN_ERR "VINO doesn't exist in IP22 Fullhouse\n");
                 return -ENODEV;
+        }
 
-        /*
-         * VINO is in the EISA address space, so the sysid register will tell
-         * us if the EISA_PRESENT pin on MC has been pulled low.
-         *
-         * If EISA_PRESENT is not set we definitely don't have a VINO equiped
-         * system.
-         */
         if (!(sgimc->systemid & SGIMC_SYSID_EPRESENT)) {
-                printk(KERN_ERR "VINO not found\n");
+                printk(KERN_ERR "VINO is not found (EISA BUS not present)\n");
                 return -ENODEV;
         }
 
         vino = (struct sgi_vino *)ioremap(VINO_BASE, sizeof(struct sgi_vino));
-        if (!vino)
+        if (!vino) {
+                printk(KERN_ERR "VINO: ioremap() failed\n");
                 return -EIO;
+        }
+        vino_init_stage++;
 
-        /* Okay, once we know that VINO is present we'll read its revision
-         * safe way. One never knows... */
-        if (get_dbe(rev, &(vino->rev_id))) {
-                printk(KERN_ERR "VINO: failed to read revision register\n");
-                ret = -ENODEV;
-                goto out_unmap;
+        if (get_dbe(rev_id, &(vino->rev_id))) {
+                printk(KERN_ERR "Failed to read VINO revision register\n");
+                vino_module_cleanup(vino_init_stage);
+                return -ENODEV;
         }
-        if (VINO_ID_VALUE(rev) != VINO_CHIP_ID) {
-                printk(KERN_ERR "VINO is not VINO (Rev/ID: 0x%04lx)\n", rev);
-                ret = -ENODEV;
-                goto out_unmap;
+
+        if (VINO_ID_VALUE(rev_id) != VINO_CHIP_ID) {
+                printk(KERN_ERR "Unknown VINO chip ID (Rev/ID: 0x%02lx)\n",
+                       rev_id);
+                vino_module_cleanup(vino_init_stage);
+                return -ENODEV;
         }
-        printk(KERN_INFO "VINO Rev: 0x%02lx\n", VINO_REV_NUM(rev));
 
-        Vino = (struct vino_video *)
-                kmalloc(sizeof(struct vino_video), GFP_KERNEL);
-        if (!Vino) {
-                ret = -ENOMEM;
-                goto out_unmap;
+        printk(KERN_INFO "VINO with chip ID %ld, revision %ld found\n",
+               VINO_ID_VALUE(rev_id), VINO_REV_NUM(rev_id));
+
+        return 0;
+}
+
+static int vino_init(void)
+{
+        dma_addr_t dma_dummy_address;
+        int i;
+
+        vino_drvdata = (struct vino_settings *)
+                kmalloc(sizeof(struct vino_settings), GFP_KERNEL);
+        if (!vino_drvdata) {
+                vino_module_cleanup(vino_init_stage);
+                return -ENOMEM;
         }
+        memset(vino_drvdata, 0, sizeof(struct vino_settings));
+        vino_init_stage++;
 
-        Vino->dummy_page = get_zeroed_page(GFP_KERNEL | GFP_DMA);
-        if (!Vino->dummy_page) {
-                ret = -ENOMEM;
-                goto out_free_vino;
+        /* create a dummy dma descriptor */
+        vino_drvdata->dummy_page = get_zeroed_page(GFP_KERNEL | GFP_DMA);
+        if (!vino_drvdata->dummy_page) {
+                vino_module_cleanup(vino_init_stage);
+                return -ENOMEM;
         }
-        for (i = 0; i < 4; i++)
-                Vino->dummy_buf[i] = PHYSADDR(Vino->dummy_page);
+        vino_init_stage++;
+
+        // TODO: use page_count in dummy_desc_table
+
+        vino_drvdata->dummy_desc_table.dma_cpu =
+                dma_alloc_coherent(NULL,
+                VINO_DUMMY_DESC_COUNT * sizeof(dma_addr_t),
+                &vino_drvdata->dummy_desc_table.dma,
+                GFP_KERNEL | GFP_DMA);
+        if (!vino_drvdata->dummy_desc_table.dma_cpu) {
+                vino_module_cleanup(vino_init_stage);
+                return -ENOMEM;
+        }
+        vino_init_stage++;
+
+        dma_dummy_address = dma_map_single(NULL,
+                                           (void *)vino_drvdata->dummy_page,
+                                        PAGE_SIZE, DMA_FROM_DEVICE);
+        for (i = 0; i < VINO_DUMMY_DESC_COUNT; i++) {
+                vino_drvdata->dummy_desc_table.dma_cpu[i] = dma_dummy_address;
+        }
+
+        /* initialize VINO */
 
         vino->control = 0;
-        /* prevent VINO from throwing spurious interrupts */
-        vino->a.next_4_desc = PHYSADDR(Vino->dummy_buf);
-        vino->b.next_4_desc = PHYSADDR(Vino->dummy_buf);
-        udelay(5);
+        vino->a.next_4_desc = vino_drvdata->dummy_desc_table.dma;
+        vino->b.next_4_desc = vino_drvdata->dummy_desc_table.dma;
+        udelay(VINO_DESC_FETCH_DELAY);
+
         vino->intr_status = 0;
-        /* set threshold level */
-        vino->a.fifo_thres = threshold_a;
-        vino->b.fifo_thres = threshold_b;
 
-        init_MUTEX(&Vino->input_lock);
+        vino->a.fifo_thres = VINO_FIFO_THRESHOLD_DEFAULT;
+        vino->b.fifo_thres = VINO_FIFO_THRESHOLD_DEFAULT;
+
+        return 0;
+}
+
+static int vino_init_channel_settings(struct vino_channel_settings *vcs,
+                                 unsigned int channel, const char *name)
+{
+        vcs->channel = channel;
+        vcs->input = VINO_INPUT_NONE;
+        vcs->alpha = 0;
+        vcs->users = 0;
+        vcs->data_format = VINO_DATA_FMT_GREY;
+        vcs->data_norm = VINO_DATA_NORM_NTSC;
+        vcs->decimation = 1;
+        vino_set_default_clipping(vcs);
+        vino_set_default_framerate(vcs);
+
+        vcs->capturing = 0;
+
+        init_MUTEX(&vcs->sem);
+        spin_lock_init(&vcs->capture_lock);
+
+        init_MUTEX(&vcs->fb_queue.queue_sem);
+        spin_lock_init(&vcs->fb_queue.queue_lock);
+        init_waitqueue_head(&vcs->fb_queue.frame_wait_queue);
+
+        vcs->v4l_device = video_device_alloc();
+        if (!vcs->v4l_device) {
+                vino_module_cleanup(vino_init_stage);
+                return -ENOMEM;
+        }
+        vino_init_stage++;
+
+        memcpy(vcs->v4l_device, &v4l_device_template,
+               sizeof(struct video_device));
+        strcpy(vcs->v4l_device->name, name);
+        vcs->v4l_device->release = video_device_release;
+
+        video_set_drvdata(vcs->v4l_device, vcs);
+
+        return 0;
+}
+
+static int __init vino_module_init(void)
+{
+        int ret;
+
+        printk(KERN_INFO "SGI VINO driver version %s\n",
+               VINO_MODULE_VERSION);
+
+        ret = vino_probe();
+        if (ret)
+                return ret;
+
+        ret = vino_init();
+        if (ret)
+                return ret;
+
+        /* initialize data structures */
 
-        if (request_irq(SGI_VINO_IRQ, vino_interrupt, 0, vinostr, NULL)) {
-                printk(KERN_ERR "VINO: irq%02d registration failed\n",
+        spin_lock_init(&vino_drvdata->vino_lock);
+        spin_lock_init(&vino_drvdata->input_lock);
+
+        ret = vino_init_channel_settings(&vino_drvdata->a, VINO_CHANNEL_A,
+                                    vino_v4l_device_name_a);
+        if (ret)
+                return ret;
+
+        ret = vino_init_channel_settings(&vino_drvdata->b, VINO_CHANNEL_B,
+                                    vino_v4l_device_name_b);
+        if (ret)
+                return ret;
+
+        /* initialize hardware and register V4L devices */
+
+        ret = request_irq(SGI_VINO_IRQ, vino_interrupt, 0,
+                vino_driver_description, NULL);
+        if (ret) {
+                printk(KERN_ERR "VINO: requesting IRQ %02d failed\n",
                        SGI_VINO_IRQ);
-                ret = -EAGAIN;
-                goto out_free_page;
+                vino_module_cleanup(vino_init_stage);
+                return -EAGAIN;
         }
+        vino_init_stage++;
 
         ret = vino_i2c_add_bus();
         if (ret) {
-                printk(KERN_ERR "VINO: I2C bus registration failed\n");
-                goto out_free_irq;
+                printk(KERN_ERR "VINO I2C bus registration failed\n");
+                vino_module_cleanup(vino_init_stage);
+                return ret;
         }
+        vino_init_stage++;
 
-        if (video_register_device(&Vino->chA.vdev, VFL_TYPE_GRABBER, -1) < 0) {
-                printk("%s, chnl %d: device registration failed.\n",
-                        Vino->chA.vdev.name, Vino->chA.chan);
-                ret = -EINVAL;
-                goto out_i2c_del_bus;
+        ret = video_register_device(vino_drvdata->a.v4l_device,
+                                    VFL_TYPE_GRABBER, -1);
+        if (ret < 0) {
+                printk(KERN_ERR "VINO channel A Video4Linux-device "
+                       "registration failed\n");
+                vino_module_cleanup(vino_init_stage);
+                return -EINVAL;
         }
-        if (video_register_device(&Vino->chB.vdev, VFL_TYPE_GRABBER, -1) < 0) {
-                printk("%s, chnl %d: device registration failed.\n",
-                        Vino->chB.vdev.name, Vino->chB.chan);
-                ret = -EINVAL;
-                goto out_unregister_vdev;
+        vino_init_stage++;
+
+        ret = video_register_device(vino_drvdata->b.v4l_device,
+                                    VFL_TYPE_GRABBER, -1);
+        if (ret < 0) {
+                printk(KERN_ERR "VINO channel B Video4Linux-device "
+                       "registration failed\n");
+                vino_module_cleanup(vino_init_stage);
+                return -EINVAL;
         }
+        vino_init_stage++;
 
-        return 0;
+#if defined(CONFIG_KMOD) && defined(MODULE)
+        request_module("saa7191");
+        request_module("indycam");
+#endif
 
-out_unregister_vdev:
-        video_unregister_device(&Vino->chA.vdev);
-out_i2c_del_bus:
-        vino_i2c_del_bus();
-out_free_irq:
-        free_irq(SGI_VINO_IRQ, NULL);
-out_free_page:
-        free_page(Vino->dummy_page);
-out_free_vino:
-        kfree(Vino);
-out_unmap:
-        iounmap(vino);
+        dprintk("init complete!\n");
 
-        return ret;
+        return 0;
 }
 
-static void __exit vino_exit(void)
+static void __exit vino_module_exit(void)
 {
-        video_unregister_device(&Vino->chA.vdev);
-        video_unregister_device(&Vino->chB.vdev);
-        vino_i2c_del_bus();
-        free_irq(SGI_VINO_IRQ, NULL);
-        free_page(Vino->dummy_page);
-        kfree(Vino);
-        iounmap(vino);
+        dprintk("exiting, stage = %d ...\n", vino_init_stage);
+        vino_module_cleanup(vino_init_stage);
+        dprintk("cleanup complete, exit!\n");
 }
 
-module_init(vino_init);
-module_exit(vino_exit);
-
-MODULE_DESCRIPTION("Video4Linux driver for SGI Indy VINO (IndyCam)");
-MODULE_LICENSE("GPL");
+module_init(vino_module_init);
+module_exit(vino_module_exit);
diff --git a/drivers/media/video/vino.h b/drivers/media/video/vino.h
index d2fce472f35..de2d615ae7c 100644
--- a/drivers/media/video/vino.h
+++ b/drivers/media/video/vino.h
@@ -1,13 +1,19 @@
 /*
+ * Driver for the VINO (Video In No Out) system found in SGI Indys.
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License version 2 as published by the Free Software Foundation.
+ *
  * Copyright (C) 1999 Ulf Karlsson <ulfc@bun.falkenberg.se>
  * Copyright (C) 2003 Ladislav Michl <ladis@linux-mips.org>
  */
 
-#ifndef VINO_H
-#define VINO_H
+#ifndef _VINO_H_
+#define _VINO_H_
 
 #define VINO_BASE       0x00080000      /* Vino is in the EISA address space,
                                          * but it is not an EISA bus card */
+#define VINO_PAGE_SIZE  4096
 
 struct sgi_vino_channel {
         u32 _pad_alpha;
@@ -21,8 +27,9 @@ struct sgi_vino_channel {
         u32 _pad_clip_end;
         volatile u32 clip_end;
 
+#define VINO_FRAMERT_FULL       0xfff
 #define VINO_FRAMERT_PAL        (1<<0)                  /* 0=NTSC 1=PAL */
-#define VINO_FRAMERT_RT(x)      (((x) & 0x1fff) << 1)   /* bits 1:12 */
+#define VINO_FRAMERT_RT(x)      (((x) & 0xfff) << 1)    /* bits 1:12 */
         u32 _pad_frame_rate;
         volatile u32 frame_rate;
 
@@ -67,18 +74,18 @@ struct sgi_vino {
         volatile u32 rev_id;
 
 #define VINO_CTRL_LITTLE_ENDIAN         (1<<0)
-#define VINO_CTRL_A_FIELD_TRANS_INT     (1<<1)  /* Field transferred int */
-#define VINO_CTRL_A_FIFO_OF_INT         (1<<2)  /* FIFO overflow int */
-#define VINO_CTRL_A_END_DESC_TBL_INT    (1<<3)  /* End of desc table int */
-#define VINO_CTRL_A_INT                 (VINO_CTRL_A_FIELD_TRANS_INT | \
-                                         VINO_CTRL_A_FIFO_OF_INT | \
-                                         VINO_CTRL_A_END_DESC_TBL_INT)
-#define VINO_CTRL_B_FIELD_TRANS_INT     (1<<4)  /* Field transferred int */
-#define VINO_CTRL_B_FIFO_OF_INT         (1<<5)  /* FIFO overflow int */
-#define VINO_CTRL_B_END_DESC_TBL_INT    (1<<6)  /* End of desc table int */
-#define VINO_CTRL_B_INT                 (VINO_CTRL_B_FIELD_TRANS_INT | \
-                                         VINO_CTRL_B_FIFO_OF_INT | \
-                                         VINO_CTRL_B_END_DESC_TBL_INT)
+#define VINO_CTRL_A_EOF_INT             (1<<1)  /* Field transferred int */
+#define VINO_CTRL_A_FIFO_INT            (1<<2)  /* FIFO overflow int */
+#define VINO_CTRL_A_EOD_INT             (1<<3)  /* End of desc table int */
+#define VINO_CTRL_A_INT                 (VINO_CTRL_A_EOF_INT | \
+                                         VINO_CTRL_A_FIFO_INT | \
+                                         VINO_CTRL_A_EOD_INT)
+#define VINO_CTRL_B_EOF_INT             (1<<4)  /* Field transferred int */
+#define VINO_CTRL_B_FIFO_INT            (1<<5)  /* FIFO overflow int */
+#define VINO_CTRL_B_EOD_INT             (1<<6)  /* End of desc table int */
+#define VINO_CTRL_B_INT                 (VINO_CTRL_B_EOF_INT | \
+                                         VINO_CTRL_B_FIFO_INT | \
+                                         VINO_CTRL_B_EOD_INT)
 #define VINO_CTRL_A_DMA_ENBL            (1<<7)
 #define VINO_CTRL_A_INTERLEAVE_ENBL     (1<<8)
 #define VINO_CTRL_A_SYNC_ENBL           (1<<9)
@@ -104,18 +111,18 @@ struct sgi_vino {
         u32 _pad_control;
         volatile u32 control;
 
-#define VINO_INTSTAT_A_FIELD_TRANS      (1<<0)  /* Field transferred int */
-#define VINO_INTSTAT_A_FIFO_OF          (1<<1)  /* FIFO overflow int */
-#define VINO_INTSTAT_A_END_DESC_TBL     (1<<2)  /* End of desc table int */
-#define VINO_INTSTAT_A                  (VINO_INTSTAT_A_FIELD_TRANS | \
-                                         VINO_INTSTAT_A_FIFO_OF | \
-                                         VINO_INTSTAT_A_END_DESC_TBL)
-#define VINO_INTSTAT_B_FIELD_TRANS      (1<<3)  /* Field transferred int */
-#define VINO_INTSTAT_B_FIFO_OF          (1<<4)  /* FIFO overflow int */
-#define VINO_INTSTAT_B_END_DESC_TBL     (1<<5)  /* End of desc table int */
-#define VINO_INTSTAT_B                  (VINO_INTSTAT_B_FIELD_TRANS | \
-                                         VINO_INTSTAT_B_FIFO_OF | \
-                                         VINO_INTSTAT_B_END_DESC_TBL)
+#define VINO_INTSTAT_A_EOF              (1<<0)  /* Field transferred int */
+#define VINO_INTSTAT_A_FIFO             (1<<1)  /* FIFO overflow int */
+#define VINO_INTSTAT_A_EOD              (1<<2)  /* End of desc table int */
+#define VINO_INTSTAT_A                  (VINO_INTSTAT_A_EOF | \
+                                         VINO_INTSTAT_A_FIFO | \
+                                         VINO_INTSTAT_A_EOD)
+#define VINO_INTSTAT_B_EOF              (1<<3)  /* Field transferred int */
+#define VINO_INTSTAT_B_FIFO             (1<<4)  /* FIFO overflow int */
+#define VINO_INTSTAT_B_EOD              (1<<5)  /* End of desc table int */
+#define VINO_INTSTAT_B                  (VINO_INTSTAT_B_EOF | \
+                                         VINO_INTSTAT_B_FIFO | \
+                                         VINO_INTSTAT_B_EOD)
         u32 _pad_intr_status;
         volatile u32 intr_status;
 
diff --git a/drivers/media/video/vpx3220.c b/drivers/media/video/vpx3220.c
index 5dbd9f6bf35..4437bdebe24 100644
--- a/drivers/media/video/vpx3220.c
+++ b/drivers/media/video/vpx3220.c
@@ -576,7 +576,6 @@ static struct i2c_client_address_data addr_data = {
         .normal_i2c             = normal_i2c,
         .probe                  = &ignore,
         .ignore                 = &ignore,
-        .force                  = &ignore,
 };
 
 static struct i2c_driver vpx3220_i2c_driver;
diff --git a/drivers/media/video/zoran_card.c b/drivers/media/video/zoran_card.c
index 25743085b2d..eed2acea177 100644
--- a/drivers/media/video/zoran_card.c
+++ b/drivers/media/video/zoran_card.c
@@ -737,7 +737,7 @@ static struct i2c_algo_bit_data zoran_i2c_bit_data_template = {
 };
 
 static struct i2c_adapter zoran_i2c_adapter_template = {
-        I2C_DEVNAME("zr36057"),
+        .name = "zr36057",
         .id = I2C_HW_B_ZR36067,
         .algo = NULL,
         .client_register = zoran_i2c_client_register,
diff --git a/drivers/message/fusion/lsi/mpi.h b/drivers/message/fusion/lsi/mpi.h
index 9f98334e507..b61e3d17507 100644
--- a/drivers/message/fusion/lsi/mpi.h
+++ b/drivers/message/fusion/lsi/mpi.h
@@ -6,7 +6,7 @@
  *          Title:  MPI Message independent structures and definitions
  *  Creation Date:  July 27, 2000
  *
- *    mpi.h Version:  01.05.07
+ *    mpi.h Version:  01.05.08
  *
  *  Version History
  *  ---------------
@@ -71,6 +71,9 @@
  *  03-11-05  01.05.07  Removed function codes for SCSI IO 32 and
  *                      TargetAssistExtended requests.
  *                      Removed EEDP IOCStatus codes.
+ *  06-24-05  01.05.08  Added function codes for SCSI IO 32 and
+ *                      TargetAssistExtended requests.
+ *                      Added EEDP IOCStatus codes.
  *  --------------------------------------------------------------------------
  */
 
@@ -101,7 +104,7 @@
 /* Note: The major versions of 0xe0 through 0xff are reserved */
 
 /* versioning for this MPI header set */
-#define MPI_HEADER_VERSION_UNIT             (0x09)
+#define MPI_HEADER_VERSION_UNIT             (0x0A)
 #define MPI_HEADER_VERSION_DEV              (0x00)
 #define MPI_HEADER_VERSION_UNIT_MASK        (0xFF00)
 #define MPI_HEADER_VERSION_UNIT_SHIFT       (8)
@@ -292,10 +295,13 @@
 #define MPI_FUNCTION_DIAG_BUFFER_POST               (0x1D)
 #define MPI_FUNCTION_DIAG_RELEASE                   (0x1E)
 
+#define MPI_FUNCTION_SCSI_IO_32                     (0x1F)
+
 #define MPI_FUNCTION_LAN_SEND                       (0x20)
 #define MPI_FUNCTION_LAN_RECEIVE                    (0x21)
 #define MPI_FUNCTION_LAN_RESET                      (0x22)
 
+#define MPI_FUNCTION_TARGET_ASSIST_EXTENDED         (0x23)
 #define MPI_FUNCTION_TARGET_CMD_BUF_BASE_POST       (0x24)
 #define MPI_FUNCTION_TARGET_CMD_BUF_LIST_POST       (0x25)
 
@@ -681,6 +687,15 @@ typedef struct _MSG_DEFAULT_REPLY
 #define MPI_IOCSTATUS_SCSI_EXT_TERMINATED       (0x004C)
 
 /****************************************************************************/
+/*  For use by SCSI Initiator and SCSI Target end-to-end data protection    */
+/****************************************************************************/
+
+#define MPI_IOCSTATUS_EEDP_GUARD_ERROR          (0x004D)
+#define MPI_IOCSTATUS_EEDP_REF_TAG_ERROR        (0x004E)
+#define MPI_IOCSTATUS_EEDP_APP_TAG_ERROR        (0x004F)
+
+
+/****************************************************************************/
 /*  SCSI Target values                                                      */
 /****************************************************************************/
 
diff --git a/drivers/message/fusion/lsi/mpi_cnfg.h b/drivers/message/fusion/lsi/mpi_cnfg.h
index 15b12b06799..d8339896f73 100644
--- a/drivers/message/fusion/lsi/mpi_cnfg.h
+++ b/drivers/message/fusion/lsi/mpi_cnfg.h
@@ -6,7 +6,7 @@
  *          Title:  MPI Config message, structures, and Pages
  *  Creation Date:  July 27, 2000
  *
- *    mpi_cnfg.h Version:  01.05.08
+ *    mpi_cnfg.h Version:  01.05.09
  *
  *  Version History
  *  ---------------
@@ -232,6 +232,23 @@
  *                      New physical mapping mode in SAS IO Unit Page 2.
  *                      Added CONFIG_PAGE_SAS_ENCLOSURE_0.
  *                      Added Slot and Enclosure fields to SAS Device Page 0.
+ *  06-24-05  01.05.09  Added EEDP defines to IOC Page 1.
+ *                      Added more RAID type defines to IOC Page 2.
+ *                      Added Port Enable Delay settings to BIOS Page 1.
+ *                      Added Bad Block Table Full define to RAID Volume Page 0.
+ *                      Added Previous State defines to RAID Physical Disk
+ *                      Page 0.
+ *                      Added Max Sata Targets define for DiscoveryStatus field
+ *                      of SAS IO Unit Page 0.
+ *                      Added Device Self Test to Control Flags of SAS IO Unit
+ *                      Page 1.
+ *                      Added Direct Attach Starting Slot Number define for SAS
+ *                      IO Unit Page 2.
+ *                      Added new fields in SAS Device Page 2 for enclosure
+ *                      mapping.
+ *                      Added OwnerDevHandle and Flags field to SAS PHY Page 0.
+ *                      Added IOC GPIO Flags define to SAS Enclosure Page 0.
+ *                      Fixed the value for MPI_SAS_IOUNIT1_CONTROL_DEV_SATA_SUPPORT.
  *  --------------------------------------------------------------------------
  */
 
@@ -477,6 +494,7 @@ typedef struct _MSG_CONFIG_REPLY
 #define MPI_MANUFACTPAGE_DEVICEID_FC929X            (0x0626)
 #define MPI_MANUFACTPAGE_DEVICEID_FC939X            (0x0642)
 #define MPI_MANUFACTPAGE_DEVICEID_FC949X            (0x0640)
+#define MPI_MANUFACTPAGE_DEVICEID_FC949ES           (0x0646)
 /* SCSI */
 #define MPI_MANUFACTPAGE_DEVID_53C1030              (0x0030)
 #define MPI_MANUFACTPAGE_DEVID_53C1030ZC            (0x0031)
@@ -769,9 +787,13 @@ typedef struct _CONFIG_PAGE_IOC_1
 } CONFIG_PAGE_IOC_1, MPI_POINTER PTR_CONFIG_PAGE_IOC_1,
   IOCPage1_t, MPI_POINTER pIOCPage1_t;
 
-#define MPI_IOCPAGE1_PAGEVERSION                        (0x02)
+#define MPI_IOCPAGE1_PAGEVERSION                        (0x03)
 
 /* defines for the Flags field */
+#define MPI_IOCPAGE1_EEDP_MODE_MASK                     (0x07000000)
+#define MPI_IOCPAGE1_EEDP_MODE_OFF                      (0x00000000)
+#define MPI_IOCPAGE1_EEDP_MODE_T10                      (0x01000000)
+#define MPI_IOCPAGE1_EEDP_MODE_LSI_1                    (0x02000000)
 #define MPI_IOCPAGE1_INITIATOR_CONTEXT_REPLY_DISABLE    (0x00000010)
 #define MPI_IOCPAGE1_REPLY_COALESCING                   (0x00000001)
 
@@ -795,6 +817,11 @@ typedef struct _CONFIG_PAGE_IOC_2_RAID_VOL
 #define MPI_RAID_VOL_TYPE_IS                        (0x00)
 #define MPI_RAID_VOL_TYPE_IME                       (0x01)
 #define MPI_RAID_VOL_TYPE_IM                        (0x02)
+#define MPI_RAID_VOL_TYPE_RAID_5                    (0x03)
+#define MPI_RAID_VOL_TYPE_RAID_6                    (0x04)
+#define MPI_RAID_VOL_TYPE_RAID_10                   (0x05)
+#define MPI_RAID_VOL_TYPE_RAID_50                   (0x06)
+#define MPI_RAID_VOL_TYPE_UNKNOWN                   (0xFF)
 
 /* IOC Page 2 Volume Flags values */
 
@@ -820,13 +847,17 @@ typedef struct _CONFIG_PAGE_IOC_2
 } CONFIG_PAGE_IOC_2, MPI_POINTER PTR_CONFIG_PAGE_IOC_2,
   IOCPage2_t, MPI_POINTER pIOCPage2_t;
 
-#define MPI_IOCPAGE2_PAGEVERSION                        (0x02)
+#define MPI_IOCPAGE2_PAGEVERSION                        (0x03)
 
 /* IOC Page 2 Capabilities flags */
 
 #define MPI_IOCPAGE2_CAP_FLAGS_IS_SUPPORT               (0x00000001)
 #define MPI_IOCPAGE2_CAP_FLAGS_IME_SUPPORT              (0x00000002)
 #define MPI_IOCPAGE2_CAP_FLAGS_IM_SUPPORT               (0x00000004)
+#define MPI_IOCPAGE2_CAP_FLAGS_RAID_5_SUPPORT           (0x00000008)
+#define MPI_IOCPAGE2_CAP_FLAGS_RAID_6_SUPPORT           (0x00000010)
+#define MPI_IOCPAGE2_CAP_FLAGS_RAID_10_SUPPORT          (0x00000020)
+#define MPI_IOCPAGE2_CAP_FLAGS_RAID_50_SUPPORT          (0x00000040)
 #define MPI_IOCPAGE2_CAP_FLAGS_SES_SUPPORT              (0x20000000)
 #define MPI_IOCPAGE2_CAP_FLAGS_SAFTE_SUPPORT            (0x40000000)
 #define MPI_IOCPAGE2_CAP_FLAGS_CROSS_CHANNEL_SUPPORT    (0x80000000)
@@ -945,7 +976,7 @@ typedef struct _CONFIG_PAGE_BIOS_1
 } CONFIG_PAGE_BIOS_1, MPI_POINTER PTR_CONFIG_PAGE_BIOS_1,
   BIOSPage1_t, MPI_POINTER pBIOSPage1_t;
 
-#define MPI_BIOSPAGE1_PAGEVERSION                       (0x01)
+#define MPI_BIOSPAGE1_PAGEVERSION                       (0x02)
 
 /* values for the BiosOptions field */
 #define MPI_BIOSPAGE1_OPTIONS_SPI_ENABLE                (0x00000400)
@@ -954,6 +985,8 @@ typedef struct _CONFIG_PAGE_BIOS_1
 #define MPI_BIOSPAGE1_OPTIONS_DISABLE_BIOS              (0x00000001)
 
 /* values for the IOCSettings field */
+#define MPI_BIOSPAGE1_IOCSET_MASK_PORT_ENABLE_DELAY     (0x00F00000)
+#define MPI_BIOSPAGE1_IOCSET_SHIFT_PORT_ENABLE_DELAY    (20)
 #define MPI_BIOSPAGE1_IOCSET_MASK_BOOT_PREFERENCE       (0x00030000)
 #define MPI_BIOSPAGE1_IOCSET_ENCLOSURE_SLOT_BOOT        (0x00000000)
 #define MPI_BIOSPAGE1_IOCSET_SAS_ADDRESS_BOOT           (0x00010000)
@@ -1167,6 +1200,7 @@ typedef struct _CONFIG_PAGE_BIOS_2
 #define MPI_BIOSPAGE2_FORM_PCI_SLOT_NUMBER              (0x03)
 #define MPI_BIOSPAGE2_FORM_FC_WWN                       (0x04)
 #define MPI_BIOSPAGE2_FORM_SAS_WWN                      (0x05)
+#define MPI_BIOSPAGE2_FORM_ENCLOSURE_SLOT               (0x06)
 
 
 /****************************************************************************
@@ -1957,11 +1991,11 @@ typedef struct _RAID_VOL0_STATUS
   RaidVol0Status_t, MPI_POINTER pRaidVol0Status_t;
 
 /* RAID Volume Page 0 VolumeStatus defines */
-
 #define MPI_RAIDVOL0_STATUS_FLAG_ENABLED                (0x01)
 #define MPI_RAIDVOL0_STATUS_FLAG_QUIESCED               (0x02)
 #define MPI_RAIDVOL0_STATUS_FLAG_RESYNC_IN_PROGRESS     (0x04)
 #define MPI_RAIDVOL0_STATUS_FLAG_VOLUME_INACTIVE        (0x08)
+#define MPI_RAIDVOL0_STATUS_FLAG_BAD_BLOCK_TABLE_FULL   (0x10)
 
 #define MPI_RAIDVOL0_STATUS_STATE_OPTIMAL               (0x00)
 #define MPI_RAIDVOL0_STATUS_STATE_DEGRADED              (0x01)
@@ -2025,7 +2059,7 @@ typedef struct _CONFIG_PAGE_RAID_VOL_0
 } CONFIG_PAGE_RAID_VOL_0, MPI_POINTER PTR_CONFIG_PAGE_RAID_VOL_0,
   RaidVolumePage0_t, MPI_POINTER pRaidVolumePage0_t;
 
-#define MPI_RAIDVOLPAGE0_PAGEVERSION                    (0x04)
+#define MPI_RAIDVOLPAGE0_PAGEVERSION                    (0x05)
 
 /* values for RAID Volume Page 0 InactiveStatus field */
 #define MPI_RAIDVOLPAGE0_UNKNOWN_INACTIVE               (0x00)
@@ -2104,6 +2138,8 @@ typedef struct _RAID_PHYS_DISK0_STATUS
 #define MPI_PHYSDISK0_STATUS_FLAG_OUT_OF_SYNC           (0x01)
 #define MPI_PHYSDISK0_STATUS_FLAG_QUIESCED              (0x02)
 #define MPI_PHYSDISK0_STATUS_FLAG_INACTIVE_VOLUME       (0x04)
+#define MPI_PHYSDISK0_STATUS_FLAG_OPTIMAL_PREVIOUS      (0x00)
+#define MPI_PHYSDISK0_STATUS_FLAG_NOT_OPTIMAL_PREVIOUS  (0x08)
 
 #define MPI_PHYSDISK0_STATUS_ONLINE                     (0x00)
 #define MPI_PHYSDISK0_STATUS_MISSING                    (0x01)
@@ -2132,7 +2168,7 @@ typedef struct _CONFIG_PAGE_RAID_PHYS_DISK_0
 } CONFIG_PAGE_RAID_PHYS_DISK_0, MPI_POINTER PTR_CONFIG_PAGE_RAID_PHYS_DISK_0,
   RaidPhysDiskPage0_t, MPI_POINTER pRaidPhysDiskPage0_t;
 
-#define MPI_RAIDPHYSDISKPAGE0_PAGEVERSION           (0x01)
+#define MPI_RAIDPHYSDISKPAGE0_PAGEVERSION           (0x02)
 
 
 typedef struct _RAID_PHYS_DISK1_PATH
@@ -2263,7 +2299,7 @@ typedef struct _CONFIG_PAGE_SAS_IO_UNIT_0
 } CONFIG_PAGE_SAS_IO_UNIT_0, MPI_POINTER PTR_CONFIG_PAGE_SAS_IO_UNIT_0,
   SasIOUnitPage0_t, MPI_POINTER pSasIOUnitPage0_t;
 
-#define MPI_SASIOUNITPAGE0_PAGEVERSION      (0x02)
+#define MPI_SASIOUNITPAGE0_PAGEVERSION      (0x03)
 
 /* values for SAS IO Unit Page 0 PortFlags */
 #define MPI_SAS_IOUNIT0_PORT_FLAGS_DISCOVERY_IN_PROGRESS    (0x08)
@@ -2299,6 +2335,7 @@ typedef struct _CONFIG_PAGE_SAS_IO_UNIT_0
 #define MPI_SAS_IOUNIT0_DS_SUBTRACTIVE_LINK                 (0x00000200)
 #define MPI_SAS_IOUNIT0_DS_TABLE_LINK                       (0x00000400)
 #define MPI_SAS_IOUNIT0_DS_UNSUPPORTED_DEVICE               (0x00000800)
+#define MPI_SAS_IOUNIT0_DS_MAX_SATA_TARGETS                 (0x00001000)
 
 
 typedef struct _MPI_SAS_IO_UNIT1_PHY_DATA
@@ -2336,6 +2373,7 @@ typedef struct _CONFIG_PAGE_SAS_IO_UNIT_1
 #define MPI_SASIOUNITPAGE1_PAGEVERSION      (0x04)
 
 /* values for SAS IO Unit Page 1 ControlFlags */
+#define MPI_SAS_IOUNIT1_CONTROL_DEVICE_SELF_TEST        (0x8000)
 #define MPI_SAS_IOUNIT1_CONTROL_SATA_3_0_MAX            (0x4000)
 #define MPI_SAS_IOUNIT1_CONTROL_SATA_1_5_MAX            (0x2000)
 #define MPI_SAS_IOUNIT1_CONTROL_SATA_SW_PRESERVE        (0x1000)
@@ -2345,9 +2383,8 @@ typedef struct _CONFIG_PAGE_SAS_IO_UNIT_1
 #define MPI_SAS_IOUNIT1_CONTROL_SHIFT_DEV_SUPPORT       (9)
 #define MPI_SAS_IOUNIT1_CONTROL_DEV_SUPPORT_BOTH        (0x00)
 #define MPI_SAS_IOUNIT1_CONTROL_DEV_SAS_SUPPORT         (0x01)
-#define MPI_SAS_IOUNIT1_CONTROL_DEV_SATA_SUPPORT        (0x10)
+#define MPI_SAS_IOUNIT1_CONTROL_DEV_SATA_SUPPORT        (0x02)
 
-#define MPI_SAS_IOUNIT1_CONTROL_AUTO_PORT_SAME_SAS_ADDR (0x0100)
 #define MPI_SAS_IOUNIT1_CONTROL_SATA_48BIT_LBA_REQUIRED (0x0080)
 #define MPI_SAS_IOUNIT1_CONTROL_SATA_SMART_REQUIRED     (0x0040)
 #define MPI_SAS_IOUNIT1_CONTROL_SATA_NCQ_REQUIRED       (0x0020)
@@ -2390,7 +2427,7 @@ typedef struct _CONFIG_PAGE_SAS_IO_UNIT_2
 } CONFIG_PAGE_SAS_IO_UNIT_2, MPI_POINTER PTR_CONFIG_PAGE_SAS_IO_UNIT_2,
   SasIOUnitPage2_t, MPI_POINTER pSasIOUnitPage2_t;
 
-#define MPI_SASIOUNITPAGE2_PAGEVERSION      (0x03)
+#define MPI_SASIOUNITPAGE2_PAGEVERSION      (0x04)
 
 /* values for SAS IO Unit Page 2 Status field */
 #define MPI_SAS_IOUNIT2_STATUS_DISABLED_PERSISTENT_MAPPINGS (0x02)
@@ -2406,6 +2443,7 @@ typedef struct _CONFIG_PAGE_SAS_IO_UNIT_2
 #define MPI_SAS_IOUNIT2_FLAGS_ENCLOSURE_SLOT_PHYS_MAP       (0x02)
 
 #define MPI_SAS_IOUNIT2_FLAGS_RESERVE_ID_0_FOR_BOOT         (0x10)
+#define MPI_SAS_IOUNIT2_FLAGS_DA_STARTING_SLOT              (0x20)
 
 
 typedef struct _CONFIG_PAGE_SAS_IO_UNIT_3
@@ -2584,11 +2622,19 @@ typedef struct _CONFIG_PAGE_SAS_DEVICE_2
 {
     CONFIG_EXTENDED_PAGE_HEADER         Header;                 /* 00h */
     U64                                 PhysicalIdentifier;     /* 08h */
-    U32                                 Reserved1;              /* 10h */
+    U32                                 EnclosureMapping;       /* 10h */
 } CONFIG_PAGE_SAS_DEVICE_2, MPI_POINTER PTR_CONFIG_PAGE_SAS_DEVICE_2,
   SasDevicePage2_t, MPI_POINTER pSasDevicePage2_t;
 
-#define MPI_SASDEVICE2_PAGEVERSION          (0x00)
+#define MPI_SASDEVICE2_PAGEVERSION          (0x01)
+
+/* defines for SAS Device Page 2 EnclosureMapping field */
+#define MPI_SASDEVICE2_ENC_MAP_MASK_MISSING_COUNT       (0x0000000F)
+#define MPI_SASDEVICE2_ENC_MAP_SHIFT_MISSING_COUNT      (0)
+#define MPI_SASDEVICE2_ENC_MAP_MASK_NUM_SLOTS           (0x000007F0)
+#define MPI_SASDEVICE2_ENC_MAP_SHIFT_NUM_SLOTS          (4)
+#define MPI_SASDEVICE2_ENC_MAP_MASK_START_INDEX         (0x001FF800)
+#define MPI_SASDEVICE2_ENC_MAP_SHIFT_START_INDEX        (11)
 
 
 /****************************************************************************
@@ -2598,7 +2644,8 @@ typedef struct _CONFIG_PAGE_SAS_DEVICE_2
 typedef struct _CONFIG_PAGE_SAS_PHY_0
 {
     CONFIG_EXTENDED_PAGE_HEADER         Header;                 /* 00h */
-    U32                                 Reserved1;              /* 08h */
+    U16                                 OwnerDevHandle;         /* 08h */
+    U16                                 Reserved1;              /* 0Ah */
     U64                                 SASAddress;             /* 0Ch */
     U16                                 AttachedDevHandle;      /* 14h */
     U8                                  AttachedPhyIdentifier;  /* 16h */
@@ -2607,12 +2654,12 @@ typedef struct _CONFIG_PAGE_SAS_PHY_0
     U8                                  ProgrammedLinkRate;     /* 20h */
     U8                                  HwLinkRate;             /* 21h */
     U8                                  ChangeCount;            /* 22h */
-    U8                                  Reserved3;              /* 23h */
+    U8                                  Flags;                  /* 23h */
     U32                                 PhyInfo;                /* 24h */
 } CONFIG_PAGE_SAS_PHY_0, MPI_POINTER PTR_CONFIG_PAGE_SAS_PHY_0,
   SasPhyPage0_t, MPI_POINTER pSasPhyPage0_t;
 
-#define MPI_SASPHY0_PAGEVERSION             (0x00)
+#define MPI_SASPHY0_PAGEVERSION             (0x01)
 
 /* values for SAS PHY Page 0 ProgrammedLinkRate field */
 #define MPI_SAS_PHY0_PRATE_MAX_RATE_MASK                        (0xF0)
@@ -2632,6 +2679,9 @@ typedef struct _CONFIG_PAGE_SAS_PHY_0
 #define MPI_SAS_PHY0_HWRATE_MIN_RATE_1_5                        (0x08)
 #define MPI_SAS_PHY0_HWRATE_MIN_RATE_3_0                        (0x09)
 
+/* values for SAS PHY Page 0 Flags field */
+#define MPI_SAS_PHY0_FLAGS_SGPIO_DIRECT_ATTACH_ENC              (0x01)
+
 /* values for SAS PHY Page 0 PhyInfo field */
 #define MPI_SAS_PHY0_PHYINFO_SATA_PORT_ACTIVE                   (0x00004000)
 #define MPI_SAS_PHY0_PHYINFO_SATA_PORT_SELECTOR                 (0x00002000)
@@ -2690,7 +2740,7 @@ typedef struct _CONFIG_PAGE_SAS_ENCLOSURE_0
 } CONFIG_PAGE_SAS_ENCLOSURE_0, MPI_POINTER PTR_CONFIG_PAGE_SAS_ENCLOSURE_0,
   SasEnclosurePage0_t, MPI_POINTER pSasEnclosurePage0_t;
 
-#define MPI_SASENCLOSURE0_PAGEVERSION       (0x00)
+#define MPI_SASENCLOSURE0_PAGEVERSION       (0x01)
 
 /* values for SAS Enclosure Page 0 Flags field */
 #define MPI_SAS_ENCLS0_FLAGS_SEP_BUS_ID_VALID       (0x0020)
@@ -2702,6 +2752,7 @@ typedef struct _CONFIG_PAGE_SAS_ENCLOSURE_0
 #define MPI_SAS_ENCLS0_FLAGS_MNG_IOC_SGPIO          (0x0002)
 #define MPI_SAS_ENCLS0_FLAGS_MNG_EXP_SGPIO          (0x0003)
 #define MPI_SAS_ENCLS0_FLAGS_MNG_SES_ENCLOSURE      (0x0004)
+#define MPI_SAS_ENCLS0_FLAGS_MNG_IOC_GPIO           (0x0005)
 
 
 /****************************************************************************
diff --git a/drivers/message/fusion/lsi/mpi_history.txt b/drivers/message/fusion/lsi/mpi_history.txt
index c9edbee41ed..1a30ef16adb 100644
--- a/drivers/message/fusion/lsi/mpi_history.txt
+++ b/drivers/message/fusion/lsi/mpi_history.txt
@@ -6,17 +6,17 @@
  Copyright (c) 2000-2005 LSI Logic Corporation.
 
  ---------------------------------------
- Header Set Release Version:    01.05.09
+ Header Set Release Version:    01.05.10
  Header Set Release Date:       03-11-05
  ---------------------------------------
 
  Filename               Current version     Prior version
  ----------             ---------------     -------------
- mpi.h                  01.05.07            01.05.06
- mpi_ioc.h              01.05.08            01.05.07
- mpi_cnfg.h             01.05.08            01.05.07
- mpi_init.h             01.05.04            01.05.03
- mpi_targ.h             01.05.04            01.05.03
+ mpi.h                  01.05.08            01.05.07
+ mpi_ioc.h              01.05.09            01.05.08
+ mpi_cnfg.h             01.05.09            01.05.08
+ mpi_init.h             01.05.05            01.05.04
+ mpi_targ.h             01.05.05            01.05.04
  mpi_fc.h               01.05.01            01.05.01
  mpi_lan.h              01.05.01            01.05.01
  mpi_raid.h             01.05.02            01.05.02
@@ -24,7 +24,7 @@
  mpi_inb.h              01.05.01            01.05.01
  mpi_sas.h              01.05.01            01.05.01
  mpi_type.h             01.05.01            01.05.01
- mpi_history.txt        01.05.09            01.05.08
+ mpi_history.txt        01.05.09            01.05.09
 
 
  *  Date      Version   Description
@@ -88,6 +88,9 @@ mpi.h
  *  03-11-05  01.05.07  Removed function codes for SCSI IO 32 and
  *                      TargetAssistExtended requests.
  *                      Removed EEDP IOCStatus codes.
+ *  06-24-05  01.05.08  Added function codes for SCSI IO 32 and
+ *                      TargetAssistExtended requests.
+ *                      Added EEDP IOCStatus codes.
  *  --------------------------------------------------------------------------
 
 mpi_ioc.h
@@ -159,6 +162,8 @@ mpi_ioc.h
  *                      Reply and IOC Init Request.
  *  03-11-05  01.05.08  Added family code for 1068E family.
  *                      Removed IOCFacts Reply EEDP Capability bit.
+ *  06-24-05  01.05.09  Added 5 new IOCFacts Reply IOCCapabilities bits.
+ *                      Added Max SATA Targets to SAS Discovery Error event.
  *  --------------------------------------------------------------------------
 
 mpi_cnfg.h
@@ -380,6 +385,23 @@ mpi_cnfg.h
  *                      New physical mapping mode in SAS IO Unit Page 2.
  *                      Added CONFIG_PAGE_SAS_ENCLOSURE_0.
  *                      Added Slot and Enclosure fields to SAS Device Page 0.
+ *  06-24-05  01.05.09  Added EEDP defines to IOC Page 1.
+ *                      Added more RAID type defines to IOC Page 2.
+ *                      Added Port Enable Delay settings to BIOS Page 1.
+ *                      Added Bad Block Table Full define to RAID Volume Page 0.
+ *                      Added Previous State defines to RAID Physical Disk
+ *                      Page 0.
+ *                      Added Max Sata Targets define for DiscoveryStatus field
+ *                      of SAS IO Unit Page 0.
+ *                      Added Device Self Test to Control Flags of SAS IO Unit
+ *                      Page 1.
+ *                      Added Direct Attach Starting Slot Number define for SAS
+ *                      IO Unit Page 2.
+ *                      Added new fields in SAS Device Page 2 for enclosure
+ *                      mapping.
+ *                      Added OwnerDevHandle and Flags field to SAS PHY Page 0.
+ *                      Added IOC GPIO Flags define to SAS Enclosure Page 0.
+ *                      Fixed the value for MPI_SAS_IOUNIT1_CONTROL_DEV_SATA_SUPPORT.
  *  --------------------------------------------------------------------------
 
 mpi_init.h
@@ -418,6 +440,8 @@ mpi_init.h
  *                      Modified SCSI Enclosure Processor Request and Reply to
  *                      support Enclosure/Slot addressing rather than WWID
  *                      addressing.
+ *  06-24-05  01.05.05  Added SCSI IO 32 structures and defines.
+ *                      Added four new defines for SEP SlotStatus.
  *  --------------------------------------------------------------------------
 
 mpi_targ.h
@@ -461,6 +485,7 @@ mpi_targ.h
  *  10-05-04  01.05.02  MSG_TARGET_CMD_BUFFER_POST_BASE_LIST_REPLY added.
  *  02-22-05  01.05.03  Changed a comment.
  *  03-11-05  01.05.04  Removed TargetAssistExtended Request.
+ *  06-24-05  01.05.05  Added TargetAssistExtended structures and defines.
  *  --------------------------------------------------------------------------
 
 mpi_fc.h
@@ -571,20 +596,20 @@ mpi_type.h
 
 mpi_history.txt         Parts list history
 
-Filename    01.05.09
-----------  --------
-mpi.h       01.05.07
-mpi_ioc.h   01.05.08
-mpi_cnfg.h  01.05.08
-mpi_init.h  01.05.04
-mpi_targ.h  01.05.04
-mpi_fc.h    01.05.01
-mpi_lan.h   01.05.01
-mpi_raid.h  01.05.02
-mpi_tool.h  01.05.03
-mpi_inb.h   01.05.01
-mpi_sas.h   01.05.01
-mpi_type.h  01.05.01
+Filename    01.05.10  01.05.09
+----------  --------  --------
+mpi.h       01.05.08  01.05.07
+mpi_ioc.h   01.05.09  01.05.08
+mpi_cnfg.h  01.05.09  01.05.08
+mpi_init.h  01.05.05  01.05.04
+mpi_targ.h  01.05.05  01.05.04
+mpi_fc.h    01.05.01  01.05.01
+mpi_lan.h   01.05.01  01.05.01
+mpi_raid.h  01.05.02  01.05.02
+mpi_tool.h  01.05.03  01.05.03
+mpi_inb.h   01.05.01  01.05.01
+mpi_sas.h   01.05.01  01.05.01
+mpi_type.h  01.05.01  01.05.01
 
 Filename    01.05.08   01.05.07   01.05.06   01.05.05   01.05.04   01.05.03
 ----------  --------   --------   --------   --------   --------   --------
diff --git a/drivers/message/fusion/lsi/mpi_init.h b/drivers/message/fusion/lsi/mpi_init.h
index aca035801a8..d5af75afbd9 100644
--- a/drivers/message/fusion/lsi/mpi_init.h
+++ b/drivers/message/fusion/lsi/mpi_init.h
@@ -6,7 +6,7 @@
  *          Title:  MPI initiator mode messages and structures
  *  Creation Date:  June 8, 2000
  *
- *    mpi_init.h Version:  01.05.04
+ *    mpi_init.h Version:  01.05.05
  *
  *  Version History
  *  ---------------
@@ -48,6 +48,8 @@
  *                      Modified SCSI Enclosure Processor Request and Reply to
  *                      support Enclosure/Slot addressing rather than WWID
  *                      addressing.
+ *  06-24-05  01.05.05  Added SCSI IO 32 structures and defines.
+ *                      Added four new defines for SEP SlotStatus.
  *  --------------------------------------------------------------------------
  */
 
@@ -203,6 +205,197 @@ typedef struct _MSG_SCSI_IO_REPLY
 
 
 /****************************************************************************/
+/*  SCSI IO 32 messages and associated structures                           */
+/****************************************************************************/
+
+typedef struct
+{
+    U8                      CDB[20];                    /* 00h */
+    U32                     PrimaryReferenceTag;        /* 14h */
+    U16                     PrimaryApplicationTag;      /* 18h */
+    U16                     PrimaryApplicationTagMask;  /* 1Ah */
+    U32                     TransferLength;             /* 1Ch */
+} MPI_SCSI_IO32_CDB_EEDP32, MPI_POINTER PTR_MPI_SCSI_IO32_CDB_EEDP32,
+  MpiScsiIo32CdbEedp32_t, MPI_POINTER pMpiScsiIo32CdbEedp32_t;
+
+typedef struct
+{
+    U8                      CDB[16];                    /* 00h */
+    U32                     DataLength;                 /* 10h */
+    U32                     PrimaryReferenceTag;        /* 14h */
+    U16                     PrimaryApplicationTag;      /* 18h */
+    U16                     PrimaryApplicationTagMask;  /* 1Ah */
+    U32                     TransferLength;             /* 1Ch */
+} MPI_SCSI_IO32_CDB_EEDP16, MPI_POINTER PTR_MPI_SCSI_IO32_CDB_EEDP16,
+  MpiScsiIo32CdbEedp16_t, MPI_POINTER pMpiScsiIo32CdbEedp16_t;
+
+typedef union
+{
+    U8                       CDB32[32];
+    MPI_SCSI_IO32_CDB_EEDP32 EEDP32;
+    MPI_SCSI_IO32_CDB_EEDP16 EEDP16;
+    SGE_SIMPLE_UNION         SGE;
+} MPI_SCSI_IO32_CDB_UNION, MPI_POINTER PTR_MPI_SCSI_IO32_CDB_UNION,
+  MpiScsiIo32Cdb_t, MPI_POINTER pMpiScsiIo32Cdb_t;
+
+typedef struct
+{
+    U8                      TargetID;           /* 00h */
+    U8                      Bus;                /* 01h */
+    U16                     Reserved1;          /* 02h */
+    U32                     Reserved2;          /* 04h */
+} MPI_SCSI_IO32_BUS_TARGET_ID_FORM, MPI_POINTER PTR_MPI_SCSI_IO32_BUS_TARGET_ID_FORM,
+  MpiScsiIo32BusTargetIdForm_t, MPI_POINTER pMpiScsiIo32BusTargetIdForm_t;
+
+typedef union
+{
+    MPI_SCSI_IO32_BUS_TARGET_ID_FORM    SCSIID;
+    U64                                 WWID;
+} MPI_SCSI_IO32_ADDRESS, MPI_POINTER PTR_MPI_SCSI_IO32_ADDRESS,
+  MpiScsiIo32Address_t, MPI_POINTER pMpiScsiIo32Address_t;
+
+typedef struct _MSG_SCSI_IO32_REQUEST
+{
+    U8                          Port;                           /* 00h */
+    U8                          Reserved1;                      /* 01h */
+    U8                          ChainOffset;                    /* 02h */
+    U8                          Function;                       /* 03h */
+    U8                          CDBLength;                      /* 04h */
+    U8                          SenseBufferLength;              /* 05h */
+    U8                          Flags;                          /* 06h */
+    U8                          MsgFlags;                       /* 07h */
+    U32                         MsgContext;                     /* 08h */
+    U8                          LUN[8];                         /* 0Ch */
+    U32                         Control;                        /* 14h */
+    MPI_SCSI_IO32_CDB_UNION     CDB;                            /* 18h */
+    U32                         DataLength;                     /* 38h */
+    U32                         BidirectionalDataLength;        /* 3Ch */
+    U32                         SecondaryReferenceTag;          /* 40h */
+    U16                         SecondaryApplicationTag;        /* 44h */
+    U16                         Reserved2;                      /* 46h */
+    U16                         EEDPFlags;                      /* 48h */
+    U16                         ApplicationTagTranslationMask;  /* 4Ah */
+    U32                         EEDPBlockSize;                  /* 4Ch */
+    MPI_SCSI_IO32_ADDRESS       DeviceAddress;                  /* 50h */
+    U8                          SGLOffset0;                     /* 58h */
+    U8                          SGLOffset1;                     /* 59h */
+    U8                          SGLOffset2;                     /* 5Ah */
+    U8                          SGLOffset3;                     /* 5Bh */
+    U32                         Reserved3;                      /* 5Ch */
+    U32                         Reserved4;                      /* 60h */
+    U32                         SenseBufferLowAddr;             /* 64h */
+    SGE_IO_UNION                SGL;                            /* 68h */
+} MSG_SCSI_IO32_REQUEST, MPI_POINTER PTR_MSG_SCSI_IO32_REQUEST,
+  SCSIIO32Request_t, MPI_POINTER pSCSIIO32Request_t;
+
+/* SCSI IO 32 MsgFlags bits */
+#define MPI_SCSIIO32_MSGFLGS_SENSE_WIDTH                (0x01)
+#define MPI_SCSIIO32_MSGFLGS_SENSE_WIDTH_32             (0x00)
+#define MPI_SCSIIO32_MSGFLGS_SENSE_WIDTH_64             (0x01)
+
+#define MPI_SCSIIO32_MSGFLGS_SENSE_LOCATION             (0x02)
+#define MPI_SCSIIO32_MSGFLGS_SENSE_LOC_HOST             (0x00)
+#define MPI_SCSIIO32_MSGFLGS_SENSE_LOC_IOC              (0x02)
+
+#define MPI_SCSIIO32_MSGFLGS_CMD_DETERMINES_DATA_DIR    (0x04)
+#define MPI_SCSIIO32_MSGFLGS_SGL_OFFSETS_CHAINS         (0x08)
+#define MPI_SCSIIO32_MSGFLGS_MULTICAST                  (0x10)
+#define MPI_SCSIIO32_MSGFLGS_BIDIRECTIONAL              (0x20)
+#define MPI_SCSIIO32_MSGFLGS_LARGE_CDB                  (0x40)
+
+/* SCSI IO 32 Flags bits */
+#define MPI_SCSIIO32_FLAGS_FORM_MASK                    (0x03)
+#define MPI_SCSIIO32_FLAGS_FORM_SCSIID                  (0x00)
+#define MPI_SCSIIO32_FLAGS_FORM_WWID                    (0x01)
+
+/* SCSI IO 32 LUN fields */
+#define MPI_SCSIIO32_LUN_FIRST_LEVEL_ADDRESSING     (0x0000FFFF)
+#define MPI_SCSIIO32_LUN_SECOND_LEVEL_ADDRESSING    (0xFFFF0000)
+#define MPI_SCSIIO32_LUN_THIRD_LEVEL_ADDRESSING     (0x0000FFFF)
+#define MPI_SCSIIO32_LUN_FOURTH_LEVEL_ADDRESSING    (0xFFFF0000)
+#define MPI_SCSIIO32_LUN_LEVEL_1_WORD               (0xFF00)
+#define MPI_SCSIIO32_LUN_LEVEL_1_DWORD              (0x0000FF00)
+
+/* SCSI IO 32 Control bits */
+#define MPI_SCSIIO32_CONTROL_DATADIRECTION_MASK     (0x03000000)
+#define MPI_SCSIIO32_CONTROL_NODATATRANSFER         (0x00000000)
+#define MPI_SCSIIO32_CONTROL_WRITE                  (0x01000000)
+#define MPI_SCSIIO32_CONTROL_READ                   (0x02000000)
+#define MPI_SCSIIO32_CONTROL_BIDIRECTIONAL          (0x03000000)
+
+#define MPI_SCSIIO32_CONTROL_ADDCDBLEN_MASK         (0xFC000000)
+#define MPI_SCSIIO32_CONTROL_ADDCDBLEN_SHIFT        (26)
+
+#define MPI_SCSIIO32_CONTROL_TASKATTRIBUTE_MASK     (0x00000700)
+#define MPI_SCSIIO32_CONTROL_SIMPLEQ                (0x00000000)
+#define MPI_SCSIIO32_CONTROL_HEADOFQ                (0x00000100)
+#define MPI_SCSIIO32_CONTROL_ORDEREDQ               (0x00000200)
+#define MPI_SCSIIO32_CONTROL_ACAQ                   (0x00000400)
+#define MPI_SCSIIO32_CONTROL_UNTAGGED               (0x00000500)
+#define MPI_SCSIIO32_CONTROL_NO_DISCONNECT          (0x00000700)
+
+#define MPI_SCSIIO32_CONTROL_TASKMANAGE_MASK        (0x00FF0000)
+#define MPI_SCSIIO32_CONTROL_OBSOLETE               (0x00800000)
+#define MPI_SCSIIO32_CONTROL_CLEAR_ACA_RSV          (0x00400000)
+#define MPI_SCSIIO32_CONTROL_TARGET_RESET           (0x00200000)
+#define MPI_SCSIIO32_CONTROL_LUN_RESET_RSV          (0x00100000)
+#define MPI_SCSIIO32_CONTROL_RESERVED               (0x00080000)
+#define MPI_SCSIIO32_CONTROL_CLR_TASK_SET_RSV       (0x00040000)
+#define MPI_SCSIIO32_CONTROL_ABORT_TASK_SET         (0x00020000)
+#define MPI_SCSIIO32_CONTROL_RESERVED2              (0x00010000)
+
+/* SCSI IO 32 EEDPFlags */
+#define MPI_SCSIIO32_EEDPFLAGS_MASK_OP              (0x0007)
+#define MPI_SCSIIO32_EEDPFLAGS_NOOP_OP              (0x0000)
+#define MPI_SCSIIO32_EEDPFLAGS_CHK_OP               (0x0001)
+#define MPI_SCSIIO32_EEDPFLAGS_STRIP_OP             (0x0002)
+#define MPI_SCSIIO32_EEDPFLAGS_CHKRM_OP             (0x0003)
+#define MPI_SCSIIO32_EEDPFLAGS_INSERT_OP            (0x0004)
+#define MPI_SCSIIO32_EEDPFLAGS_REPLACE_OP           (0x0006)
+#define MPI_SCSIIO32_EEDPFLAGS_CHKREGEN_OP          (0x0007)
+
+#define MPI_SCSIIO32_EEDPFLAGS_PASS_REF_TAG         (0x0008)
+#define MPI_SCSIIO32_EEDPFLAGS_8_9THS_MODE          (0x0010)
+
+#define MPI_SCSIIO32_EEDPFLAGS_T10_CHK_MASK         (0x0700)
+#define MPI_SCSIIO32_EEDPFLAGS_T10_CHK_GUARD        (0x0100)
+#define MPI_SCSIIO32_EEDPFLAGS_T10_CHK_REFTAG       (0x0200)
+#define MPI_SCSIIO32_EEDPFLAGS_T10_CHK_LBATAG       (0x0400)
+#define MPI_SCSIIO32_EEDPFLAGS_T10_CHK_SHIFT        (8)
+
+#define MPI_SCSIIO32_EEDPFLAGS_INC_SEC_APPTAG       (0x1000)
+#define MPI_SCSIIO32_EEDPFLAGS_INC_PRI_APPTAG       (0x2000)
+#define MPI_SCSIIO32_EEDPFLAGS_INC_SEC_REFTAG       (0x4000)
+#define MPI_SCSIIO32_EEDPFLAGS_INC_PRI_REFTAG       (0x8000)
+
+
+/* SCSIIO32 IO reply structure */
+typedef struct _MSG_SCSIIO32_IO_REPLY
+{
+    U8                      Port;                       /* 00h */
+    U8                      Reserved1;                  /* 01h */
+    U8                      MsgLength;                  /* 02h */
+    U8                      Function;                   /* 03h */
+    U8                      CDBLength;                  /* 04h */
+    U8                      SenseBufferLength;          /* 05h */
+    U8                      Flags;                      /* 06h */
+    U8                      MsgFlags;                   /* 07h */
+    U32                     MsgContext;                 /* 08h */
+    U8                      SCSIStatus;                 /* 0Ch */
+    U8                      SCSIState;                  /* 0Dh */
+    U16                     IOCStatus;                  /* 0Eh */
+    U32                     IOCLogInfo;                 /* 10h */
+    U32                     TransferCount;              /* 14h */
+    U32                     SenseCount;                 /* 18h */
+    U32                     ResponseInfo;               /* 1Ch */
+    U16                     TaskTag;                    /* 20h */
+    U16                     Reserved2;                  /* 22h */
+    U32                     BidirectionalTransferCount; /* 24h */
+} MSG_SCSIIO32_IO_REPLY, MPI_POINTER PTR_MSG_SCSIIO32_IO_REPLY,
+  SCSIIO32Reply_t, MPI_POINTER pSCSIIO32Reply_t;
+
+
+/****************************************************************************/
 /*  SCSI Task Management messages                                           */
 /****************************************************************************/
 
@@ -310,10 +503,14 @@ typedef struct _MSG_SEP_REQUEST
 #define MPI_SEP_REQ_SLOTSTATUS_UNCONFIGURED             (0x00000080)
 #define MPI_SEP_REQ_SLOTSTATUS_HOT_SPARE                (0x00000100)
 #define MPI_SEP_REQ_SLOTSTATUS_REBUILD_STOPPED          (0x00000200)
+#define MPI_SEP_REQ_SLOTSTATUS_REQ_CONSISTENCY_CHECK    (0x00001000)
+#define MPI_SEP_REQ_SLOTSTATUS_DISABLE                  (0x00002000)
+#define MPI_SEP_REQ_SLOTSTATUS_REQ_RESERVED_DEVICE      (0x00004000)
 #define MPI_SEP_REQ_SLOTSTATUS_IDENTIFY_REQUEST         (0x00020000)
 #define MPI_SEP_REQ_SLOTSTATUS_REQUEST_REMOVE           (0x00040000)
 #define MPI_SEP_REQ_SLOTSTATUS_REQUEST_INSERT           (0x00080000)
 #define MPI_SEP_REQ_SLOTSTATUS_DO_NOT_MOVE              (0x00400000)
+#define MPI_SEP_REQ_SLOTSTATUS_ACTIVE                   (0x00800000)
 #define MPI_SEP_REQ_SLOTSTATUS_B_ENABLE_BYPASS          (0x04000000)
 #define MPI_SEP_REQ_SLOTSTATUS_A_ENABLE_BYPASS          (0x08000000)
 #define MPI_SEP_REQ_SLOTSTATUS_DEV_OFF                  (0x10000000)
@@ -352,11 +549,15 @@ typedef struct _MSG_SEP_REPLY
 #define MPI_SEP_REPLY_SLOTSTATUS_UNCONFIGURED           (0x00000080)
 #define MPI_SEP_REPLY_SLOTSTATUS_HOT_SPARE              (0x00000100)
 #define MPI_SEP_REPLY_SLOTSTATUS_REBUILD_STOPPED        (0x00000200)
+#define MPI_SEP_REPLY_SLOTSTATUS_CONSISTENCY_CHECK      (0x00001000)
+#define MPI_SEP_REPLY_SLOTSTATUS_DISABLE                (0x00002000)
+#define MPI_SEP_REPLY_SLOTSTATUS_RESERVED_DEVICE        (0x00004000)
 #define MPI_SEP_REPLY_SLOTSTATUS_REPORT                 (0x00010000)
 #define MPI_SEP_REPLY_SLOTSTATUS_IDENTIFY_REQUEST       (0x00020000)
 #define MPI_SEP_REPLY_SLOTSTATUS_REMOVE_READY           (0x00040000)
 #define MPI_SEP_REPLY_SLOTSTATUS_INSERT_READY           (0x00080000)
 #define MPI_SEP_REPLY_SLOTSTATUS_DO_NOT_REMOVE          (0x00400000)
+#define MPI_SEP_REPLY_SLOTSTATUS_ACTIVE                 (0x00800000)
 #define MPI_SEP_REPLY_SLOTSTATUS_B_BYPASS_ENABLED       (0x01000000)
 #define MPI_SEP_REPLY_SLOTSTATUS_A_BYPASS_ENABLED       (0x02000000)
 #define MPI_SEP_REPLY_SLOTSTATUS_B_ENABLE_BYPASS        (0x04000000)
diff --git a/drivers/message/fusion/lsi/mpi_ioc.h b/drivers/message/fusion/lsi/mpi_ioc.h
index f91eb4efe8c..93b70e2b426 100644
--- a/drivers/message/fusion/lsi/mpi_ioc.h
+++ b/drivers/message/fusion/lsi/mpi_ioc.h
@@ -6,7 +6,7 @@
  *          Title:  MPI IOC, Port, Event, FW Download, and FW Upload messages
  *  Creation Date:  August 11, 2000
  *
- *    mpi_ioc.h Version:  01.05.08
+ *    mpi_ioc.h Version:  01.05.09
  *
  *  Version History
  *  ---------------
@@ -81,6 +81,8 @@
  *                      Reply and IOC Init Request.
  *  03-11-05  01.05.08  Added family code for 1068E family.
  *                      Removed IOCFacts Reply EEDP Capability bit.
+ *  06-24-05  01.05.09  Added 5 new IOCFacts Reply IOCCapabilities bits.
+ *                      Added Max SATA Targets to SAS Discovery Error event.
  *  --------------------------------------------------------------------------
  */
 
@@ -261,7 +263,11 @@ typedef struct _MSG_IOC_FACTS_REPLY
 #define MPI_IOCFACTS_CAPABILITY_DIAG_TRACE_BUFFER       (0x00000008)
 #define MPI_IOCFACTS_CAPABILITY_SNAPSHOT_BUFFER         (0x00000010)
 #define MPI_IOCFACTS_CAPABILITY_EXTENDED_BUFFER         (0x00000020)
-
+#define MPI_IOCFACTS_CAPABILITY_EEDP                    (0x00000040)
+#define MPI_IOCFACTS_CAPABILITY_BIDIRECTIONAL           (0x00000080)
+#define MPI_IOCFACTS_CAPABILITY_MULTICAST               (0x00000100)
+#define MPI_IOCFACTS_CAPABILITY_SCSIIO32                (0x00000200)
+#define MPI_IOCFACTS_CAPABILITY_NO_SCSIIO16             (0x00000400)
 
 
 /*****************************************************************************
@@ -677,6 +683,7 @@ typedef struct _EVENT_DATA_DISCOVERY_ERROR
 #define MPI_EVENT_DSCVRY_ERR_DS_MULTPL_SUBTRACTIVE          (0x00000200)
 #define MPI_EVENT_DSCVRY_ERR_DS_TABLE_TO_TABLE              (0x00000400)
 #define MPI_EVENT_DSCVRY_ERR_DS_MULTPL_PATHS                (0x00000800)
+#define MPI_EVENT_DSCVRY_ERR_DS_MAX_SATA_TARGETS            (0x00001000)
 
 
 /*****************************************************************************
diff --git a/drivers/message/fusion/lsi/mpi_targ.h b/drivers/message/fusion/lsi/mpi_targ.h
index 623901fd82b..3f462859cee 100644
--- a/drivers/message/fusion/lsi/mpi_targ.h
+++ b/drivers/message/fusion/lsi/mpi_targ.h
@@ -6,7 +6,7 @@
  *          Title:  MPI Target mode messages and structures
  *  Creation Date:  June 22, 2000
  *
- *    mpi_targ.h Version:  01.05.04
+ *    mpi_targ.h Version:  01.05.05
  *
  *  Version History
  *  ---------------
@@ -53,6 +53,7 @@
  *  10-05-04  01.05.02  MSG_TARGET_CMD_BUFFER_POST_BASE_LIST_REPLY added.
  *  02-22-05  01.05.03  Changed a comment.
  *  03-11-05  01.05.04  Removed TargetAssistExtended Request.
+ *  06-24-05  01.05.05  Added TargetAssistExtended structures and defines.
  *  --------------------------------------------------------------------------
  */
 
@@ -371,6 +372,77 @@ typedef struct _MSG_TARGET_ERROR_REPLY
 
 
 /****************************************************************************/
+/* Target Assist Extended Request                                           */
+/****************************************************************************/
+
+typedef struct _MSG_TARGET_ASSIST_EXT_REQUEST
+{
+    U8                      StatusCode;                     /* 00h */
+    U8                      TargetAssistFlags;              /* 01h */
+    U8                      ChainOffset;                    /* 02h */
+    U8                      Function;                       /* 03h */
+    U16                     QueueTag;                       /* 04h */
+    U8                      Reserved1;                      /* 06h */
+    U8                      MsgFlags;                       /* 07h */
+    U32                     MsgContext;                     /* 08h */
+    U32                     ReplyWord;                      /* 0Ch */
+    U8                      LUN[8];                         /* 10h */
+    U32                     RelativeOffset;                 /* 18h */
+    U32                     Reserved2;                      /* 1Ch */
+    U32                     Reserved3;                      /* 20h */
+    U32                     PrimaryReferenceTag;            /* 24h */
+    U16                     PrimaryApplicationTag;          /* 28h */
+    U16                     PrimaryApplicationTagMask;      /* 2Ah */
+    U32                     Reserved4;                      /* 2Ch */
+    U32                     DataLength;                     /* 30h */
+    U32                     BidirectionalDataLength;        /* 34h */
+    U32                     SecondaryReferenceTag;          /* 38h */
+    U16                     SecondaryApplicationTag;        /* 3Ch */
+    U16                     Reserved5;                      /* 3Eh */
+    U16                     EEDPFlags;                      /* 40h */
+    U16                     ApplicationTagTranslationMask;  /* 42h */
+    U32                     EEDPBlockSize;                  /* 44h */
+    U8                      SGLOffset0;                     /* 48h */
+    U8                      SGLOffset1;                     /* 49h */
+    U8                      SGLOffset2;                     /* 4Ah */
+    U8                      SGLOffset3;                     /* 4Bh */
+    U32                     Reserved6;                      /* 4Ch */
+    SGE_IO_UNION            SGL[1];                         /* 50h */
+} MSG_TARGET_ASSIST_EXT_REQUEST, MPI_POINTER PTR_MSG_TARGET_ASSIST_EXT_REQUEST,
+  TargetAssistExtRequest_t, MPI_POINTER pTargetAssistExtRequest_t;
+
+/* see the defines after MSG_TARGET_ASSIST_REQUEST for TargetAssistFlags */
+
+/* defines for the MsgFlags field */
+#define TARGET_ASSIST_EXT_MSGFLAGS_BIDIRECTIONAL        (0x20)
+#define TARGET_ASSIST_EXT_MSGFLAGS_MULTICAST            (0x10)
+#define TARGET_ASSIST_EXT_MSGFLAGS_SGL_OFFSET_CHAINS    (0x08)
+
+/* defines for the EEDPFlags field */
+#define TARGET_ASSIST_EXT_EEDP_MASK_OP          (0x0007)
+#define TARGET_ASSIST_EXT_EEDP_NOOP_OP          (0x0000)
+#define TARGET_ASSIST_EXT_EEDP_CHK_OP           (0x0001)
+#define TARGET_ASSIST_EXT_EEDP_STRIP_OP         (0x0002)
+#define TARGET_ASSIST_EXT_EEDP_CHKRM_OP         (0x0003)
+#define TARGET_ASSIST_EXT_EEDP_INSERT_OP        (0x0004)
+#define TARGET_ASSIST_EXT_EEDP_REPLACE_OP       (0x0006)
+#define TARGET_ASSIST_EXT_EEDP_CHKREGEN_OP      (0x0007)
+
+#define TARGET_ASSIST_EXT_EEDP_PASS_REF_TAG     (0x0008)
+
+#define TARGET_ASSIST_EXT_EEDP_T10_CHK_MASK     (0x0700)
+#define TARGET_ASSIST_EXT_EEDP_T10_CHK_GUARD    (0x0100)
+#define TARGET_ASSIST_EXT_EEDP_T10_CHK_APPTAG   (0x0200)
+#define TARGET_ASSIST_EXT_EEDP_T10_CHK_REFTAG   (0x0400)
+#define TARGET_ASSIST_EXT_EEDP_T10_CHK_SHIFT    (8)
+
+#define TARGET_ASSIST_EXT_EEDP_INC_SEC_APPTAG   (0x1000)
+#define TARGET_ASSIST_EXT_EEDP_INC_PRI_APPTAG   (0x2000)
+#define TARGET_ASSIST_EXT_EEDP_INC_SEC_REFTAG   (0x4000)
+#define TARGET_ASSIST_EXT_EEDP_INC_PRI_REFTAG   (0x8000)
+
+
+/****************************************************************************/
 /* Target Status Send Request                                               */
 /****************************************************************************/
 
diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
index ffbe6f4720e..f517d0692d5 100644
--- a/drivers/message/fusion/mptbase.c
+++ b/drivers/message/fusion/mptbase.c
@@ -218,8 +218,7 @@ pci_enable_io_access(struct pci_dev *pdev)
  *      (also referred to as a IO Controller or IOC).
  *      This routine must clear the interrupt from the adapter and does
  *      so by reading the reply FIFO.  Multiple replies may be processed
- *      per single call to this routine; up to MPT_MAX_REPLIES_PER_ISR
- *      which is currently set to 32 in mptbase.h.
+ *      per single call to this routine.
  *
  *      This routine handles register-level access of the adapter but
  *      dispatches (calls) a protocol-specific callback routine to handle
@@ -279,11 +278,11 @@ mpt_interrupt(int irq, void *bus_id, struct pt_regs *r)
                         cb_idx = mr->u.frame.hwhdr.msgctxu.fld.cb_idx;
                         mf = MPT_INDEX_2_MFPTR(ioc, req_idx);
 
-                        dmfprintk((MYIOC_s_INFO_FMT "Got non-TURBO reply=%p req_idx=%x\n",
-                                        ioc->name, mr, req_idx));
+                        dmfprintk((MYIOC_s_INFO_FMT "Got non-TURBO reply=%p req_idx=%x cb_idx=%x Function=%x\n",
+                                        ioc->name, mr, req_idx, cb_idx, mr->u.hdr.Function));
                         DBG_DUMP_REPLY_FRAME(mr)
 
-                        /*  Check/log IOC log info
+                         /*  Check/log IOC log info
                          */
                         ioc_stat = le16_to_cpu(mr->u.reply.IOCStatus);
                         if (ioc_stat & MPI_IOCSTATUS_FLAG_LOG_INFO_AVAILABLE) {
@@ -345,7 +344,7 @@ mpt_interrupt(int irq, void *bus_id, struct pt_regs *r)
                         if ((mf) && ((mf >= MPT_INDEX_2_MFPTR(ioc, ioc->req_depth))
                                 || (mf < ioc->req_frames)) ) {
                                 printk(MYIOC_s_WARN_FMT
-                                        "mpt_interrupt: Invalid mf (%p) req_idx (%d)!\n", ioc->name, (void *)mf, req_idx);
+                                        "mpt_interrupt: Invalid mf (%p)!\n", ioc->name, (void *)mf);
                                 cb_idx = 0;
                                 pa = 0;
                                 freeme = 0;
@@ -399,7 +398,7 @@ mpt_interrupt(int irq, void *bus_id, struct pt_regs *r)
  *      @mf: Pointer to original MPT request frame
  *      @reply: Pointer to MPT reply frame (NULL if TurboReply)
  *
-        *       Returns 1 indicating original alloc'd request frame ptr
+ *      Returns 1 indicating original alloc'd request frame ptr
  *      should be freed, or 0 if it shouldn't.
  */
 static int
@@ -408,28 +407,17 @@ mpt_base_reply(MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf, MPT_FRAME_HDR *reply)
         int freereq = 1;
         u8 func;
 
-        dprintk((MYIOC_s_INFO_FMT "mpt_base_reply() called\n", ioc->name));
-
-        if ((mf == NULL) ||
-            (mf >= MPT_INDEX_2_MFPTR(ioc, ioc->req_depth))) {
-                printk(MYIOC_s_ERR_FMT "NULL or BAD request frame ptr! (=%p)\n",
-                                ioc->name, (void *)mf);
-                return 1;
-        }
-
-        if (reply == NULL) {
-                dprintk((MYIOC_s_ERR_FMT "Unexpected NULL Event (turbo?) reply!\n",
-                                ioc->name));
-                return 1;
-        }
+        dmfprintk((MYIOC_s_INFO_FMT "mpt_base_reply() called\n", ioc->name));
 
+#if defined(MPT_DEBUG_MSG_FRAME)
         if (!(reply->u.hdr.MsgFlags & MPI_MSGFLAGS_CONTINUATION_REPLY)) {
                 dmfprintk((KERN_INFO MYNAM ": Original request frame (@%p) header\n", mf));
                 DBG_DUMP_REQUEST_FRAME_HDR(mf)
         }
+#endif
 
         func = reply->u.hdr.Function;
-        dprintk((MYIOC_s_INFO_FMT "mpt_base_reply, Function=%02Xh\n",
+        dmfprintk((MYIOC_s_INFO_FMT "mpt_base_reply, Function=%02Xh\n",
                         ioc->name, func));
 
         if (func == MPI_FUNCTION_EVENT_NOTIFICATION) {
@@ -448,8 +436,14 @@ mpt_base_reply(MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf, MPT_FRAME_HDR *reply)
                  *      Hmmm...  It seems that EventNotificationReply is an exception
                  *      to the rule of one reply per request.
                  */
-                if (pEvReply->MsgFlags & MPI_MSGFLAGS_CONTINUATION_REPLY)
+                if (pEvReply->MsgFlags & MPI_MSGFLAGS_CONTINUATION_REPLY) {
                         freereq = 0;
+                        devtprintk((MYIOC_s_WARN_FMT "EVENT_NOTIFICATION reply %p does not return Request frame\n",
+                                ioc->name, pEvReply));
+                } else {
+                        devtprintk((MYIOC_s_WARN_FMT "EVENT_NOTIFICATION reply %p returns Request frame\n",
+                                ioc->name, pEvReply));
+                }
 
 #ifdef CONFIG_PROC_FS
 //              LogEvent(ioc, pEvReply);
@@ -491,10 +485,21 @@ mpt_base_reply(MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf, MPT_FRAME_HDR *reply)
 
                                 pCfg->status = status;
                                 if (status == MPI_IOCSTATUS_SUCCESS) {
-                                        pCfg->hdr->PageVersion = pReply->Header.PageVersion;
-                                        pCfg->hdr->PageLength = pReply->Header.PageLength;
-                                        pCfg->hdr->PageNumber = pReply->Header.PageNumber;
-                                        pCfg->hdr->PageType = pReply->Header.PageType;
+                                        if ((pReply->Header.PageType &
+                                            MPI_CONFIG_PAGETYPE_MASK) ==
+                                            MPI_CONFIG_PAGETYPE_EXTENDED) {
+                                                pCfg->cfghdr.ehdr->ExtPageLength =
+                                                    le16_to_cpu(pReply->ExtPageLength);
+                                                pCfg->cfghdr.ehdr->ExtPageType =
+                                                    pReply->ExtPageType;
+                                        }
+                                        pCfg->cfghdr.hdr->PageVersion = pReply->Header.PageVersion;
+
+                                        /* If this is a regular header, save PageLength. */
+                                        /* LMP Do this better so not using a reserved field! */
+                                        pCfg->cfghdr.hdr->PageLength = pReply->Header.PageLength;
+                                        pCfg->cfghdr.hdr->PageNumber = pReply->Header.PageNumber;
+                                        pCfg->cfghdr.hdr->PageType = pReply->Header.PageType;
                                 }
                         }
 
@@ -705,7 +710,7 @@ mpt_device_driver_deregister(int cb_idx)
                 if (dd_cbfunc->remove)
                         dd_cbfunc->remove(ioc->pcidev);
         }
-        
+
         MptDeviceDriverHandlers[cb_idx] = NULL;
 }
 
@@ -818,7 +823,7 @@ mpt_put_msg_frame(int handle, MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf)
         }
 #endif
 
-        mf_dma_addr = (ioc->req_frames_low_dma + req_offset) | ioc->RequestNB[req_idx];  
+        mf_dma_addr = (ioc->req_frames_low_dma + req_offset) | ioc->RequestNB[req_idx];
         dsgprintk((MYIOC_s_INFO_FMT "mf_dma_addr=%x req_idx=%d RequestNB=%x\n", ioc->name, mf_dma_addr, req_idx, ioc->RequestNB[req_idx]));
         CHIPREG_WRITE32(&ioc->chip->RequestFifo, mf_dma_addr);
 }
@@ -920,7 +925,7 @@ mpt_send_handshake_request(int handle, MPT_ADAPTER *ioc, int reqBytes, u32 *req,
 
         /* Make sure there are no doorbells */
         CHIPREG_WRITE32(&ioc->chip->IntStatus, 0);
-        
+
         CHIPREG_WRITE32(&ioc->chip->Doorbell,
                         ((MPI_FUNCTION_HANDSHAKE<<MPI_DOORBELL_FUNCTION_SHIFT) |
                          ((reqBytes/4)<<MPI_DOORBELL_ADD_DWORDS_SHIFT)));
@@ -935,14 +940,14 @@ mpt_send_handshake_request(int handle, MPT_ADAPTER *ioc, int reqBytes, u32 *req,
                 return -5;
 
         dhsprintk((KERN_INFO MYNAM ": %s: mpt_send_handshake_request start, WaitCnt=%d\n",
-                        ioc->name, ii));
+                ioc->name, ii));
 
         CHIPREG_WRITE32(&ioc->chip->IntStatus, 0);
 
         if ((r = WaitForDoorbellAck(ioc, 5, sleepFlag)) < 0) {
                 return -2;
         }
-                
+
         /* Send request via doorbell handshake */
         req_as_bytes = (u8 *) req;
         for (ii = 0; ii < reqBytes/4; ii++) {
@@ -988,9 +993,9 @@ mpt_verify_adapter(int iocid, MPT_ADAPTER **iocpp)
                 if (ioc->id == iocid) {
                         *iocpp =ioc;
                         return iocid;
-                } 
+                }
         }
-        
+
         *iocpp = NULL;
         return -1;
 }
@@ -1032,9 +1037,9 @@ mpt_attach(struct pci_dev *pdev, const struct pci_device_id *id)
 
         if (pci_enable_device(pdev))
                 return r;
-        
+
         dinitprintk((KERN_WARNING MYNAM ": mpt_adapter_install\n"));
-        
+
         if (!pci_set_dma_mask(pdev, DMA_64BIT_MASK)) {
                 dprintk((KERN_INFO MYNAM
                         ": 64 BIT PCI BUS DMA ADDRESSING SUPPORTED\n"));
@@ -1059,7 +1064,7 @@ mpt_attach(struct pci_dev *pdev, const struct pci_device_id *id)
         ioc->alloc_total = sizeof(MPT_ADAPTER);
         ioc->req_sz = MPT_DEFAULT_FRAME_SIZE;           /* avoid div by zero! */
         ioc->reply_sz = MPT_REPLY_FRAME_SIZE;
-        
+
         ioc->pcidev = pdev;
         ioc->diagPending = 0;
         spin_lock_init(&ioc->diagLock);
@@ -1088,7 +1093,7 @@ mpt_attach(struct pci_dev *pdev, const struct pci_device_id *id)
         /* Find lookup slot. */
         INIT_LIST_HEAD(&ioc->list);
         ioc->id = mpt_ids++;
-        
+
         mem_phys = msize = 0;
         port = psize = 0;
         for (ii=0; ii < DEVICE_COUNT_RESOURCE; ii++) {
@@ -1143,7 +1148,7 @@ mpt_attach(struct pci_dev *pdev, const struct pci_device_id *id)
                 ioc->prod_name = "LSIFC909";
                 ioc->bus_type = FC;
         }
-        if (pdev->device == MPI_MANUFACTPAGE_DEVICEID_FC929) {
+        else if (pdev->device == MPI_MANUFACTPAGE_DEVICEID_FC929) {
                 ioc->prod_name = "LSIFC929";
                 ioc->bus_type = FC;
         }
@@ -1322,7 +1327,7 @@ mpt_detach(struct pci_dev *pdev)
         remove_proc_entry(pname, NULL);
         sprintf(pname, MPT_PROCFS_MPTBASEDIR "/%s", ioc->name);
         remove_proc_entry(pname, NULL);
-        
+
         /* call per device driver remove entry point */
         for(ii=0; ii<MPT_MAX_PROTOCOL_DRIVERS; ii++) {
                 if(MptDeviceDriverHandlers[ii] &&
@@ -1330,7 +1335,7 @@ mpt_detach(struct pci_dev *pdev)
                         MptDeviceDriverHandlers[ii]->remove(pdev);
                 }
         }
-        
+
         /* Disable interrupts! */
         CHIPREG_WRITE32(&ioc->chip->IntMask, 0xFFFFFFFF);
 
@@ -1403,7 +1408,7 @@ mpt_resume(struct pci_dev *pdev)
         u32 device_state = pdev->current_state;
         int recovery_state;
         int ii;
-        
+
         printk(MYIOC_s_INFO_FMT
         "pci-resume: pdev=0x%p, slot=%s, Previous operating state [D%d]\n",
                 ioc->name, pdev, pci_name(pdev), device_state);
@@ -1534,7 +1539,7 @@ mpt_do_ioc_recovery(MPT_ADAPTER *ioc, u32 reason, int sleepFlag)
                 if ((rc = GetIocFacts(ioc, sleepFlag, reason)) == 0)
                         break;
         }
-        
+
 
         if (ii == 5) {
                 dinitprintk((MYIOC_s_INFO_FMT "Retry IocFacts failed rc=%x\n", ioc->name, rc));
@@ -1542,7 +1547,7 @@ mpt_do_ioc_recovery(MPT_ADAPTER *ioc, u32 reason, int sleepFlag)
         } else if (reason == MPT_HOSTEVENT_IOC_BRINGUP) {
                 MptDisplayIocCapabilities(ioc);
         }
-        
+
         if (alt_ioc_ready) {
                 if ((rc = GetIocFacts(ioc->alt_ioc, sleepFlag, reason)) != 0) {
                         dinitprintk((MYIOC_s_INFO_FMT "Initial Alt IocFacts failed rc=%x\n", ioc->name, rc));
@@ -1613,7 +1618,7 @@ mpt_do_ioc_recovery(MPT_ADAPTER *ioc, u32 reason, int sleepFlag)
 
         if (reset_alt_ioc_active && ioc->alt_ioc) {
                 /* (re)Enable alt-IOC! (reply interrupt) */
-                dprintk((KERN_INFO MYNAM ": alt-%s reply irq re-enabled\n",
+                dinitprintk((KERN_INFO MYNAM ": alt-%s reply irq re-enabled\n",
                                 ioc->alt_ioc->name));
                 CHIPREG_WRITE32(&ioc->alt_ioc->chip->IntMask, ~(MPI_HIM_RIM));
                 ioc->alt_ioc->active = 1;
@@ -1670,7 +1675,7 @@ mpt_do_ioc_recovery(MPT_ADAPTER *ioc, u32 reason, int sleepFlag)
 
                         /* Find IM volumes
                          */
-                        if (ioc->facts.MsgVersion >= 0x0102)
+                        if (ioc->facts.MsgVersion >= MPI_VERSION_01_02)
                                 mpt_findImVolumes(ioc);
 
                         /* Check, and possibly reset, the coalescing value
@@ -1700,7 +1705,7 @@ mpt_do_ioc_recovery(MPT_ADAPTER *ioc, u32 reason, int sleepFlag)
                         }
 
                         if (alt_ioc_ready && MptResetHandlers[ii]) {
-                                dprintk((MYIOC_s_INFO_FMT "Calling alt-%s post_reset handler #%d\n",
+                                drsprintk((MYIOC_s_INFO_FMT "Calling alt-%s post_reset handler #%d\n",
                                                 ioc->name, ioc->alt_ioc->name, ii));
                                 rc += (*(MptResetHandlers[ii]))(ioc->alt_ioc, MPT_IOC_POST_RESET);
                                 handlers++;
@@ -1733,8 +1738,8 @@ mpt_detect_bound_ports(MPT_ADAPTER *ioc, struct pci_dev *pdev)
 
         dprintk((MYIOC_s_INFO_FMT "PCI device %s devfn=%x/%x,"
             " searching for devfn match on %x or %x\n",
-                ioc->name, pci_name(pdev), pdev->devfn,
-                func-1, func+1));
+                ioc->name, pci_name(pdev), pdev->bus->number,
+                pdev->devfn, func-1, func+1));
 
         peer = pci_get_slot(pdev->bus, PCI_DEVFN(slot,func-1));
         if (!peer) {
@@ -1861,36 +1866,39 @@ mpt_adapter_disable(MPT_ADAPTER *ioc)
 static void
 mpt_adapter_dispose(MPT_ADAPTER *ioc)
 {
-        if (ioc != NULL) {
-                int sz_first, sz_last;
+        int sz_first, sz_last;
 
-                sz_first = ioc->alloc_total;
+        if (ioc == NULL)
+                return;
 
-                mpt_adapter_disable(ioc);
+        sz_first = ioc->alloc_total;
 
-                if (ioc->pci_irq != -1) {
-                        free_irq(ioc->pci_irq, ioc);
-                        ioc->pci_irq = -1;
-                }
+        mpt_adapter_disable(ioc);
 
-                if (ioc->memmap != NULL)
-                        iounmap(ioc->memmap);
+        if (ioc->pci_irq != -1) {
+                free_irq(ioc->pci_irq, ioc);
+                ioc->pci_irq = -1;
+        }
+
+        if (ioc->memmap != NULL) {
+                iounmap(ioc->memmap);
+                ioc->memmap = NULL;
+        }
 
 #if defined(CONFIG_MTRR) && 0
-                if (ioc->mtrr_reg > 0) {
-                        mtrr_del(ioc->mtrr_reg, 0, 0);
-                        dprintk((KERN_INFO MYNAM ": %s: MTRR region de-registered\n", ioc->name));
-                }
+        if (ioc->mtrr_reg > 0) {
+                mtrr_del(ioc->mtrr_reg, 0, 0);
+                dprintk((KERN_INFO MYNAM ": %s: MTRR region de-registered\n", ioc->name));
+        }
 #endif
 
-                /*  Zap the adapter lookup ptr!  */
-                list_del(&ioc->list);
+        /*  Zap the adapter lookup ptr!  */
+        list_del(&ioc->list);
 
-                sz_last = ioc->alloc_total;
-                dprintk((KERN_INFO MYNAM ": %s: free'd %d of %d bytes\n",
-                                ioc->name, sz_first-sz_last+(int)sizeof(*ioc), sz_first));
-                kfree(ioc);
-        }
+        sz_last = ioc->alloc_total;
+        dprintk((KERN_INFO MYNAM ": %s: free'd %d of %d bytes\n",
+                        ioc->name, sz_first-sz_last+(int)sizeof(*ioc), sz_first));
+        kfree(ioc);
 }
 
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
@@ -1977,7 +1985,7 @@ MakeIocReady(MPT_ADAPTER *ioc, int force, int sleepFlag)
         }
 
         /* Is it already READY? */
-        if (!statefault && (ioc_state & MPI_IOC_STATE_MASK) == MPI_IOC_STATE_READY) 
+        if (!statefault && (ioc_state & MPI_IOC_STATE_MASK) == MPI_IOC_STATE_READY)
                 return 0;
 
         /*
@@ -1995,7 +2003,7 @@ MakeIocReady(MPT_ADAPTER *ioc, int force, int sleepFlag)
          *      Hmmm...  Did it get left operational?
          */
         if ((ioc_state & MPI_IOC_STATE_MASK) == MPI_IOC_STATE_OPERATIONAL) {
-                dinitprintk((MYIOC_s_WARN_FMT "IOC operational unexpected\n",
+                dinitprintk((MYIOC_s_INFO_FMT "IOC operational unexpected\n",
                                 ioc->name));
 
                 /* Check WhoInit.
@@ -2004,8 +2012,8 @@ MakeIocReady(MPT_ADAPTER *ioc, int force, int sleepFlag)
                  * Else, fall through to KickStart case
                  */
                 whoinit = (ioc_state & MPI_DOORBELL_WHO_INIT_MASK) >> MPI_DOORBELL_WHO_INIT_SHIFT;
-                dprintk((KERN_WARNING MYNAM
-                        ": whoinit 0x%x\n statefault %d force %d\n",
+                dinitprintk((KERN_INFO MYNAM
+                        ": whoinit 0x%x statefault %d force %d\n",
                         whoinit, statefault, force));
                 if (whoinit == MPI_WHOINIT_PCI_PEER)
                         return -4;
@@ -2140,8 +2148,8 @@ GetIocFacts(MPT_ADAPTER *ioc, int sleepFlag, int reason)
         get_facts.Function = MPI_FUNCTION_IOC_FACTS;
         /* Assert: All other get_facts fields are zero! */
 
-        dinitprintk((MYIOC_s_INFO_FMT 
-            "Sending get IocFacts request req_sz=%d reply_sz=%d\n", 
+        dinitprintk((MYIOC_s_INFO_FMT
+            "Sending get IocFacts request req_sz=%d reply_sz=%d\n",
             ioc->name, req_sz, reply_sz));
 
         /* No non-zero fields in the get_facts request are greater than
@@ -2174,7 +2182,7 @@ GetIocFacts(MPT_ADAPTER *ioc, int sleepFlag, int reason)
                 facts->IOCExceptions = le16_to_cpu(facts->IOCExceptions);
                 facts->IOCStatus = le16_to_cpu(facts->IOCStatus);
                 facts->IOCLogInfo = le32_to_cpu(facts->IOCLogInfo);
-                status = facts->IOCStatus & MPI_IOCSTATUS_MASK;
+                status = le16_to_cpu(facts->IOCStatus) & MPI_IOCSTATUS_MASK;
                 /* CHECKME! IOCStatus, IOCLogInfo */
 
                 facts->ReplyQueueDepth = le16_to_cpu(facts->ReplyQueueDepth);
@@ -2221,7 +2229,7 @@ GetIocFacts(MPT_ADAPTER *ioc, int sleepFlag, int reason)
                 if ( sz & 0x02 )
                         sz += 2;
                 facts->FWImageSize = sz;
-                
+
                 if (!facts->RequestFrameSize) {
                         /*  Something is wrong!  */
                         printk(MYIOC_s_ERR_FMT "IOC reported invalid 0 request size!\n",
@@ -2240,7 +2248,7 @@ GetIocFacts(MPT_ADAPTER *ioc, int sleepFlag, int reason)
                 ioc->NBShiftFactor  = shiftFactor;
                 dinitprintk((MYIOC_s_INFO_FMT "NB_for_64_byte_frame=%x NBShiftFactor=%x BlockSize=%x\n",
                                         ioc->name, vv, shiftFactor, r));
-    
+
                 if (reason == MPT_HOSTEVENT_IOC_BRINGUP) {
                         /*
                          * Set values for this IOC's request & reply frame sizes,
@@ -2261,7 +2269,7 @@ GetIocFacts(MPT_ADAPTER *ioc, int sleepFlag, int reason)
                                 return r;
                 }
         } else {
-                printk(MYIOC_s_ERR_FMT 
+                printk(MYIOC_s_ERR_FMT
                      "Invalid IOC facts reply, msgLength=%d offsetof=%zd!\n",
                      ioc->name, facts->MsgLength, (offsetof(IOCFactsReply_t,
                      RequestFrameSize)/sizeof(u32)));
@@ -2413,9 +2421,11 @@ SendIocInit(MPT_ADAPTER *ioc, int sleepFlag)
 
         dhsprintk((MYIOC_s_INFO_FMT "Sending PortEnable (req @ %p)\n",
                         ioc->name, &ioc_init));
-        
-        if ((r = SendPortEnable(ioc, 0, sleepFlag)) != 0)
+
+        if ((r = SendPortEnable(ioc, 0, sleepFlag)) != 0) {
+                printk(MYIOC_s_ERR_FMT "Sending PortEnable failed(%d)!\n",ioc->name, r);
                 return r;
+        }
 
         /* YIKES!  SUPER IMPORTANT!!!
          *  Poll IocState until _OPERATIONAL while IOC is doing
@@ -2440,7 +2450,7 @@ SendIocInit(MPT_ADAPTER *ioc, int sleepFlag)
                 state = mpt_GetIocState(ioc, 1);
                 count++;
         }
-        dhsprintk((MYIOC_s_INFO_FMT "INFO - Wait IOC_OPERATIONAL state (cnt=%d)\n",
+        dinitprintk((MYIOC_s_INFO_FMT "INFO - Wait IOC_OPERATIONAL state (cnt=%d)\n",
                         ioc->name, count));
 
         return r;
@@ -2529,7 +2539,7 @@ mpt_free_fw_memory(MPT_ADAPTER *ioc)
         int sz;
 
         sz = ioc->facts.FWImageSize;
-        dinitprintk((KERN_WARNING MYNAM "free_fw_memory: FW Image  @ %p[%p], sz=%d[%x] bytes\n",
+        dinitprintk((KERN_INFO MYNAM "free_fw_memory: FW Image  @ %p[%p], sz=%d[%x] bytes\n",
                  ioc->cached_fw, (void *)(ulong)ioc->cached_fw_dma, sz, sz));
         pci_free_consistent(ioc->pcidev, sz,
                         ioc->cached_fw, ioc->cached_fw_dma);
@@ -2573,9 +2583,9 @@ mpt_do_upload(MPT_ADAPTER *ioc, int sleepFlag)
 
         mpt_alloc_fw_memory(ioc, sz);
 
-        dinitprintk((KERN_WARNING MYNAM ": FW Image  @ %p[%p], sz=%d[%x] bytes\n",
+        dinitprintk((KERN_INFO MYNAM ": FW Image  @ %p[%p], sz=%d[%x] bytes\n",
                  ioc->cached_fw, (void *)(ulong)ioc->cached_fw_dma, sz, sz));
-        
+
         if (ioc->cached_fw == NULL) {
                 /* Major Failure.
                  */
@@ -2605,14 +2615,14 @@ mpt_do_upload(MPT_ADAPTER *ioc, int sleepFlag)
         mpt_add_sge(&request[sgeoffset], flagsLength, ioc->cached_fw_dma);
 
         sgeoffset += sizeof(u32) + sizeof(dma_addr_t);
-        dinitprintk((KERN_WARNING MYNAM "Sending FW Upload (req @ %p) sgeoffset=%d \n",
+        dinitprintk((KERN_INFO MYNAM ": Sending FW Upload (req @ %p) sgeoffset=%d \n",
                         prequest, sgeoffset));
         DBG_DUMP_FW_REQUEST_FRAME(prequest)
 
         ii = mpt_handshake_req_reply_wait(ioc, sgeoffset, (u32*)prequest,
                                 reply_sz, (u16*)preply, 65 /*seconds*/, sleepFlag);
 
-        dinitprintk((KERN_WARNING MYNAM "FW Upload completed rc=%x \n", ii));
+        dinitprintk((KERN_INFO MYNAM ": FW Upload completed rc=%x \n", ii));
 
         cmdStatus = -EFAULT;
         if (ii == 0) {
@@ -2627,10 +2637,10 @@ mpt_do_upload(MPT_ADAPTER *ioc, int sleepFlag)
                                 cmdStatus = 0;
                 }
         }
-        dinitprintk((MYIOC_s_INFO_FMT ": do_upload status %d \n",
+        dinitprintk((MYIOC_s_INFO_FMT ": do_upload cmdStatus=%d \n",
                         ioc->name, cmdStatus));
 
-        
+
         if (cmdStatus) {
 
                 ddlprintk((MYIOC_s_INFO_FMT ": fw upload failed, freeing image \n",
@@ -2761,8 +2771,8 @@ mpt_downloadboot(MPT_ADAPTER *ioc, int sleepFlag)
                 fwSize = (pExtImage->ImageSize + 3) >> 2;
                 ptrFw = (u32 *)pExtImage;
 
-                ddlprintk((MYIOC_s_INFO_FMT "Write Ext Image: 0x%x bytes @ %p load_addr=%x\n",
-                                                ioc->name, fwSize*4, ptrFw, load_addr));
+                ddlprintk((MYIOC_s_INFO_FMT "Write Ext Image: 0x%x (%d) bytes @ %p load_addr=%x\n",
+                                                ioc->name, fwSize*4, fwSize*4, ptrFw, load_addr));
                 CHIPREG_PIO_WRITE32(&ioc->pio_chip->DiagRwAddress, load_addr);
 
                 while (fwSize--) {
@@ -2845,9 +2855,9 @@ mpt_downloadboot(MPT_ADAPTER *ioc, int sleepFlag)
  *                        0 else
  *
  *      Returns:
- *               1 - hard reset, READY  
- *               0 - no reset due to History bit, READY 
- *              -1 - no reset due to History bit but not READY  
+ *               1 - hard reset, READY
+ *               0 - no reset due to History bit, READY
+ *              -1 - no reset due to History bit but not READY
  *                   OR reset but failed to come READY
  *              -2 - no reset, could not enter DIAG mode
  *              -3 - reset but bad FW bit
@@ -2990,7 +3000,7 @@ mpt_diag_reset(MPT_ADAPTER *ioc, int ignore, int sleepFlag)
                  *
                  */
                 CHIPREG_WRITE32(&ioc->chip->Diagnostic, diag0val | MPI_DIAG_DISABLE_ARM);
-                mdelay (1);
+                mdelay(1);
 
                 /*
                  * Now hit the reset bit in the Diagnostic register
@@ -3170,7 +3180,7 @@ SendIocReset(MPT_ADAPTER *ioc, u8 reset_type, int sleepFlag)
         u32 state;
         int cntdn, count;
 
-        drsprintk((KERN_WARNING MYNAM ": %s: Sending IOC reset(0x%02x)!\n",
+        drsprintk((KERN_INFO MYNAM ": %s: Sending IOC reset(0x%02x)!\n",
                         ioc->name, reset_type));
         CHIPREG_WRITE32(&ioc->chip->Doorbell, reset_type<<MPI_DOORBELL_FUNCTION_SHIFT);
         if ((r = WaitForDoorbellAck(ioc, 5, sleepFlag)) < 0)
@@ -3374,6 +3384,9 @@ PrimeIocFifos(MPT_ADAPTER *ioc)
                 ioc->reply_frames = (MPT_FRAME_HDR *) mem;
                 ioc->reply_frames_low_dma = (u32) (alloc_dma & 0xFFFFFFFF);
 
+                dinitprintk((KERN_INFO MYNAM ": %s ReplyBuffers @ %p[%p]\n",
+                        ioc->name, ioc->reply_frames, (void *)(ulong)alloc_dma));
+
                 alloc_dma += reply_sz;
                 mem += reply_sz;
 
@@ -3382,7 +3395,7 @@ PrimeIocFifos(MPT_ADAPTER *ioc)
                 ioc->req_frames = (MPT_FRAME_HDR *) mem;
                 ioc->req_frames_dma = alloc_dma;
 
-                dinitprintk((KERN_INFO MYNAM ": %s.RequestBuffers @ %p[%p]\n",
+                dinitprintk((KERN_INFO MYNAM ": %s RequestBuffers @ %p[%p]\n",
                                 ioc->name, mem, (void *)(ulong)alloc_dma));
 
                 ioc->req_frames_low_dma = (u32) (alloc_dma & 0xFFFFFFFF);
@@ -3408,7 +3421,7 @@ PrimeIocFifos(MPT_ADAPTER *ioc)
                 ioc->ChainBuffer = mem;
                 ioc->ChainBufferDMA = alloc_dma;
 
-                dinitprintk((KERN_INFO MYNAM " :%s.ChainBuffers @ %p(%p)\n",
+                dinitprintk((KERN_INFO MYNAM " :%s ChainBuffers @ %p(%p)\n",
                         ioc->name, ioc->ChainBuffer, (void *)(ulong)ioc->ChainBufferDMA));
 
                 /* Initialize the free chain Q.
@@ -3513,7 +3526,7 @@ out_fail:
  */
 static int
 mpt_handshake_req_reply_wait(MPT_ADAPTER *ioc, int reqBytes, u32 *req,
-                                int replyBytes, u16 *u16reply, int maxwait, int sleepFlag)
+                int replyBytes, u16 *u16reply, int maxwait, int sleepFlag)
 {
         MPIDefaultReply_t *mptReply;
         int failcnt = 0;
@@ -3588,7 +3601,7 @@ mpt_handshake_req_reply_wait(MPT_ADAPTER *ioc, int reqBytes, u32 *req,
                  */
                 if (!failcnt && (t = WaitForDoorbellReply(ioc, maxwait, sleepFlag)) < 0)
                         failcnt++;
-                
+
                 dhsprintk((MYIOC_s_INFO_FMT "HandShake reply count=%d%s\n",
                                 ioc->name, t, failcnt ? " - MISSING DOORBELL REPLY!" : ""));
 
@@ -3747,7 +3760,7 @@ WaitForDoorbellReply(MPT_ADAPTER *ioc, int howlong, int sleepFlag)
         }
 
         dhsprintk((MYIOC_s_INFO_FMT "WaitCnt=%d First handshake reply word=%08x%s\n",
-                        ioc->name, t, le32_to_cpu(*(u32 *)hs_reply), 
+                        ioc->name, t, le32_to_cpu(*(u32 *)hs_reply),
                         failcnt ? " - MISSING DOORBELL HANDSHAKE!" : ""));
 
         /*
@@ -3819,7 +3832,7 @@ GetLanConfigPages(MPT_ADAPTER *ioc)
         hdr.PageLength = 0;
         hdr.PageNumber = 0;
         hdr.PageType = MPI_CONFIG_PAGETYPE_LAN;
-        cfg.hdr = &hdr;
+        cfg.cfghdr.hdr = &hdr;
         cfg.physAddr = -1;
         cfg.action = MPI_CONFIG_ACTION_PAGE_HEADER;
         cfg.dir = 0;
@@ -3863,7 +3876,7 @@ GetLanConfigPages(MPT_ADAPTER *ioc)
         hdr.PageLength = 0;
         hdr.PageNumber = 1;
         hdr.PageType = MPI_CONFIG_PAGETYPE_LAN;
-        cfg.hdr = &hdr;
+        cfg.cfghdr.hdr = &hdr;
         cfg.physAddr = -1;
         cfg.action = MPI_CONFIG_ACTION_PAGE_HEADER;
         cfg.dir = 0;
@@ -3930,7 +3943,7 @@ GetFcPortPage0(MPT_ADAPTER *ioc, int portnum)
         hdr.PageLength = 0;
         hdr.PageNumber = 0;
         hdr.PageType = MPI_CONFIG_PAGETYPE_FC_PORT;
-        cfg.hdr = &hdr;
+        cfg.cfghdr.hdr = &hdr;
         cfg.physAddr = -1;
         cfg.action = MPI_CONFIG_ACTION_PAGE_HEADER;
         cfg.dir = 0;
@@ -4012,7 +4025,7 @@ GetIoUnitPage2(MPT_ADAPTER *ioc)
         hdr.PageLength = 0;
         hdr.PageNumber = 2;
         hdr.PageType = MPI_CONFIG_PAGETYPE_IO_UNIT;
-        cfg.hdr = &hdr;
+        cfg.cfghdr.hdr = &hdr;
         cfg.physAddr = -1;
         cfg.action = MPI_CONFIG_ACTION_PAGE_HEADER;
         cfg.dir = 0;
@@ -4102,7 +4115,7 @@ mpt_GetScsiPortSettings(MPT_ADAPTER *ioc, int portnum)
         header.PageLength = 0;
         header.PageNumber = 0;
         header.PageType = MPI_CONFIG_PAGETYPE_SCSI_PORT;
-        cfg.hdr = &header;
+        cfg.cfghdr.hdr = &header;
         cfg.physAddr = -1;
         cfg.pageAddr = portnum;
         cfg.action = MPI_CONFIG_ACTION_PAGE_HEADER;
@@ -4122,6 +4135,8 @@ mpt_GetScsiPortSettings(MPT_ADAPTER *ioc, int portnum)
                                 ioc->spi_data.minSyncFactor = MPT_ASYNC;
                                 ioc->spi_data.busType = MPT_HOST_BUS_UNKNOWN;
                                 rc = 1;
+                                ddvprintk((MYIOC_s_INFO_FMT "Unable to read PortPage0 minSyncFactor=%x\n",
+                                        ioc->name, ioc->spi_data.minSyncFactor));
                         } else {
                                 /* Save the Port Page 0 data
                                  */
@@ -4131,7 +4146,7 @@ mpt_GetScsiPortSettings(MPT_ADAPTER *ioc, int portnum)
 
                                 if ( (pPP0->Capabilities & MPI_SCSIPORTPAGE0_CAP_QAS) == 0 ) {
                                         ioc->spi_data.noQas |= MPT_TARGET_NO_NEGO_QAS;
-                                        dinitprintk((KERN_INFO MYNAM " :%s noQas due to Capabilities=%x\n",
+                                        ddvprintk((KERN_INFO MYNAM " :%s noQas due to Capabilities=%x\n",
                                                 ioc->name, pPP0->Capabilities));
                                 }
                                 ioc->spi_data.maxBusWidth = pPP0->Capabilities & MPI_SCSIPORTPAGE0_CAP_WIDE ? 1 : 0;
@@ -4140,6 +4155,8 @@ mpt_GetScsiPortSettings(MPT_ADAPTER *ioc, int portnum)
                                         ioc->spi_data.maxSyncOffset = (u8) (data >> 16);
                                         data = pPP0->Capabilities & MPI_SCSIPORTPAGE0_CAP_MIN_SYNC_PERIOD_MASK;
                                         ioc->spi_data.minSyncFactor = (u8) (data >> 8);
+                                        ddvprintk((MYIOC_s_INFO_FMT "PortPage0 minSyncFactor=%x\n",
+                                                ioc->name, ioc->spi_data.minSyncFactor));
                                 } else {
                                         ioc->spi_data.maxSyncOffset = 0;
                                         ioc->spi_data.minSyncFactor = MPT_ASYNC;
@@ -4152,8 +4169,11 @@ mpt_GetScsiPortSettings(MPT_ADAPTER *ioc, int portnum)
                                 if ((ioc->spi_data.busType == MPI_SCSIPORTPAGE0_PHY_SIGNAL_HVD) ||
                                         (ioc->spi_data.busType == MPI_SCSIPORTPAGE0_PHY_SIGNAL_SE))  {
 
-                                if (ioc->spi_data.minSyncFactor < MPT_ULTRA)
+                                        if (ioc->spi_data.minSyncFactor < MPT_ULTRA) {
                                                 ioc->spi_data.minSyncFactor = MPT_ULTRA;
+                                                ddvprintk((MYIOC_s_INFO_FMT "HVD or SE detected, minSyncFactor=%x\n",
+                                                        ioc->name, ioc->spi_data.minSyncFactor));
+                                        }
                                 }
                         }
                         if (pbuf) {
@@ -4168,7 +4188,7 @@ mpt_GetScsiPortSettings(MPT_ADAPTER *ioc, int portnum)
         header.PageLength = 0;
         header.PageNumber = 2;
         header.PageType = MPI_CONFIG_PAGETYPE_SCSI_PORT;
-        cfg.hdr = &header;
+        cfg.cfghdr.hdr = &header;
         cfg.physAddr = -1;
         cfg.pageAddr = portnum;
         cfg.action = MPI_CONFIG_ACTION_PAGE_HEADER;
@@ -4236,7 +4256,7 @@ mpt_readScsiDevicePageHeaders(MPT_ADAPTER *ioc, int portnum)
         header.PageLength = 0;
         header.PageNumber = 1;
         header.PageType = MPI_CONFIG_PAGETYPE_SCSI_DEVICE;
-        cfg.hdr = &header;
+        cfg.cfghdr.hdr = &header;
         cfg.physAddr = -1;
         cfg.pageAddr = portnum;
         cfg.action = MPI_CONFIG_ACTION_PAGE_HEADER;
@@ -4245,8 +4265,8 @@ mpt_readScsiDevicePageHeaders(MPT_ADAPTER *ioc, int portnum)
         if (mpt_config(ioc, &cfg) != 0)
                  return -EFAULT;
 
-        ioc->spi_data.sdp1version = cfg.hdr->PageVersion;
-        ioc->spi_data.sdp1length = cfg.hdr->PageLength;
+        ioc->spi_data.sdp1version = cfg.cfghdr.hdr->PageVersion;
+        ioc->spi_data.sdp1length = cfg.cfghdr.hdr->PageLength;
 
         header.PageVersion = 0;
         header.PageLength = 0;
@@ -4255,8 +4275,8 @@ mpt_readScsiDevicePageHeaders(MPT_ADAPTER *ioc, int portnum)
         if (mpt_config(ioc, &cfg) != 0)
                  return -EFAULT;
 
-        ioc->spi_data.sdp0version = cfg.hdr->PageVersion;
-        ioc->spi_data.sdp0length = cfg.hdr->PageLength;
+        ioc->spi_data.sdp0version = cfg.cfghdr.hdr->PageVersion;
+        ioc->spi_data.sdp0length = cfg.cfghdr.hdr->PageLength;
 
         dcprintk((MYIOC_s_INFO_FMT "Headers: 0: version %d length %d\n",
                         ioc->name, ioc->spi_data.sdp0version, ioc->spi_data.sdp0length));
@@ -4298,7 +4318,7 @@ mpt_findImVolumes(MPT_ADAPTER *ioc)
         header.PageLength = 0;
         header.PageNumber = 2;
         header.PageType = MPI_CONFIG_PAGETYPE_IOC;
-        cfg.hdr = &header;
+        cfg.cfghdr.hdr = &header;
         cfg.physAddr = -1;
         cfg.pageAddr = 0;
         cfg.action = MPI_CONFIG_ACTION_PAGE_HEADER;
@@ -4394,7 +4414,7 @@ mpt_read_ioc_pg_3(MPT_ADAPTER *ioc)
         header.PageLength = 0;
         header.PageNumber = 3;
         header.PageType = MPI_CONFIG_PAGETYPE_IOC;
-        cfg.hdr = &header;
+        cfg.cfghdr.hdr = &header;
         cfg.physAddr = -1;
         cfg.pageAddr = 0;
         cfg.action = MPI_CONFIG_ACTION_PAGE_HEADER;
@@ -4446,7 +4466,7 @@ mpt_read_ioc_pg_4(MPT_ADAPTER *ioc)
         header.PageLength = 0;
         header.PageNumber = 4;
         header.PageType = MPI_CONFIG_PAGETYPE_IOC;
-        cfg.hdr = &header;
+        cfg.cfghdr.hdr = &header;
         cfg.physAddr = -1;
         cfg.pageAddr = 0;
         cfg.action = MPI_CONFIG_ACTION_PAGE_HEADER;
@@ -4498,7 +4518,7 @@ mpt_read_ioc_pg_1(MPT_ADAPTER *ioc)
         header.PageLength = 0;
         header.PageNumber = 1;
         header.PageType = MPI_CONFIG_PAGETYPE_IOC;
-        cfg.hdr = &header;
+        cfg.cfghdr.hdr = &header;
         cfg.physAddr = -1;
         cfg.pageAddr = 0;
         cfg.action = MPI_CONFIG_ACTION_PAGE_HEADER;
@@ -4580,13 +4600,13 @@ SendEventNotification(MPT_ADAPTER *ioc, u8 EvSwitch)
 
         evnp = (EventNotification_t *) mpt_get_msg_frame(mpt_base_index, ioc);
         if (evnp == NULL) {
-                dprintk((MYIOC_s_WARN_FMT "Unable to allocate event request frame!\n",
+                devtprintk((MYIOC_s_WARN_FMT "Unable to allocate event request frame!\n",
                                 ioc->name));
                 return 0;
         }
         memset(evnp, 0, sizeof(*evnp));
 
-        dprintk((MYIOC_s_INFO_FMT "Sending EventNotification(%d)\n", ioc->name, EvSwitch));
+        devtprintk((MYIOC_s_INFO_FMT "Sending EventNotification (%d) request %p\n", ioc->name, EvSwitch, evnp));
 
         evnp->Function = MPI_FUNCTION_EVENT_NOTIFICATION;
         evnp->ChainOffset = 0;
@@ -4610,8 +4630,10 @@ SendEventAck(MPT_ADAPTER *ioc, EventNotificationReply_t *evnp)
         EventAck_t      *pAck;
 
         if ((pAck = (EventAck_t *) mpt_get_msg_frame(mpt_base_index, ioc)) == NULL) {
-                printk(MYIOC_s_WARN_FMT "Unable to allocate event ACK request frame!\n",
-                                ioc->name);
+                printk(MYIOC_s_WARN_FMT "Unable to allocate event ACK "
+                        "request frame for Event=%x EventContext=%x EventData=%x!\n",
+                        ioc->name, evnp->Event, le32_to_cpu(evnp->EventContext),
+                        le32_to_cpu(evnp->Data[0]));
                 return -1;
         }
         memset(pAck, 0, sizeof(*pAck));
@@ -4647,10 +4669,11 @@ int
 mpt_config(MPT_ADAPTER *ioc, CONFIGPARMS *pCfg)
 {
         Config_t        *pReq;
+        ConfigExtendedPageHeader_t  *pExtHdr = NULL;
         MPT_FRAME_HDR   *mf;
         unsigned long    flags;
         int              ii, rc;
-        u32              flagsLength;
+        int              flagsLength;
         int              in_isr;
 
         /*      Prevent calling wait_event() (below), if caller happens
@@ -4675,16 +4698,30 @@ mpt_config(MPT_ADAPTER *ioc, CONFIGPARMS *pCfg)
         pReq->Reserved = 0;
         pReq->ChainOffset = 0;
         pReq->Function = MPI_FUNCTION_CONFIG;
+
+        /* Assume page type is not extended and clear "reserved" fields. */
         pReq->ExtPageLength = 0;
         pReq->ExtPageType = 0;
         pReq->MsgFlags = 0;
+
         for (ii=0; ii < 8; ii++)
                 pReq->Reserved2[ii] = 0;
 
-        pReq->Header.PageVersion = pCfg->hdr->PageVersion;
-        pReq->Header.PageLength = pCfg->hdr->PageLength;
-        pReq->Header.PageNumber = pCfg->hdr->PageNumber;
-        pReq->Header.PageType = (pCfg->hdr->PageType & MPI_CONFIG_PAGETYPE_MASK);
+        pReq->Header.PageVersion = pCfg->cfghdr.hdr->PageVersion;
+        pReq->Header.PageLength = pCfg->cfghdr.hdr->PageLength;
+        pReq->Header.PageNumber = pCfg->cfghdr.hdr->PageNumber;
+        pReq->Header.PageType = (pCfg->cfghdr.hdr->PageType & MPI_CONFIG_PAGETYPE_MASK);
+
+        if ((pCfg->cfghdr.hdr->PageType & MPI_CONFIG_PAGETYPE_MASK) == MPI_CONFIG_PAGETYPE_EXTENDED) {
+                pExtHdr = (ConfigExtendedPageHeader_t *)pCfg->cfghdr.ehdr;
+                pReq->ExtPageLength = cpu_to_le16(pExtHdr->ExtPageLength);
+                pReq->ExtPageType = pExtHdr->ExtPageType;
+                pReq->Header.PageType = MPI_CONFIG_PAGETYPE_EXTENDED;
+
+                /* Page Length must be treated as a reserved field for the extended header. */
+                pReq->Header.PageLength = 0;
+        }
+
         pReq->PageAddress = cpu_to_le32(pCfg->pageAddr);
 
         /* Add a SGE to the config request.
@@ -4694,12 +4731,20 @@ mpt_config(MPT_ADAPTER *ioc, CONFIGPARMS *pCfg)
         else
                 flagsLength = MPT_SGE_FLAGS_SSIMPLE_READ;
 
-        flagsLength |= pCfg->hdr->PageLength * 4;
+        if ((pCfg->cfghdr.hdr->PageType & MPI_CONFIG_PAGETYPE_MASK) == MPI_CONFIG_PAGETYPE_EXTENDED) {
+                flagsLength |= pExtHdr->ExtPageLength * 4;
 
-        mpt_add_sge((char *)&pReq->PageBufferSGE, flagsLength, pCfg->physAddr);
+                dcprintk((MYIOC_s_INFO_FMT "Sending Config request type %d, page %d and action %d\n",
+                        ioc->name, pReq->ExtPageType, pReq->Header.PageNumber, pReq->Action));
+        }
+        else {
+                flagsLength |= pCfg->cfghdr.hdr->PageLength * 4;
+
+                dcprintk((MYIOC_s_INFO_FMT "Sending Config request type %d, page %d and action %d\n",
+                        ioc->name, pReq->Header.PageType, pReq->Header.PageNumber, pReq->Action));
+        }
 
-        dcprintk((MYIOC_s_INFO_FMT "Sending Config request type %d, page %d and action %d\n",
-                ioc->name, pReq->Header.PageType, pReq->Header.PageNumber, pReq->Action));
+        mpt_add_sge((char *)&pReq->PageBufferSGE, flagsLength, pCfg->physAddr);
 
         /* Append pCfg pointer to end of mf
          */
@@ -4789,8 +4834,8 @@ mpt_toolbox(MPT_ADAPTER *ioc, CONFIGPARMS *pCfg)
         pReq->Reserved3 = 0;
         pReq->NumAddressBytes = 0x01;
         pReq->Reserved4 = 0;
-        pReq->DataLength = 0x04;
-        pdev = (struct pci_dev *) ioc->pcidev;
+        pReq->DataLength = cpu_to_le16(0x04);
+        pdev = ioc->pcidev;
         if (pdev->devfn & 1)
                 pReq->DeviceAddr = 0xB2;
         else
@@ -5504,6 +5549,8 @@ ProcessEventNotification(MPT_ADAPTER *ioc, EventNotificationReply_t *pEventReply
          *  If needed, send (a single) EventAck.
          */
         if (pEventReply->AckRequired == MPI_EVENT_NOTIFICATION_ACK_REQUIRED) {
+                devtprintk((MYIOC_s_WARN_FMT
+                        "EventAck required\n",ioc->name));
                 if ((ii = SendEventAck(ioc, pEventReply)) != 0) {
                         devtprintk((MYIOC_s_WARN_FMT "SendEventAck returned %d\n",
                                         ioc->name, ii));
@@ -5584,7 +5631,7 @@ mpt_sp_log_info(MPT_ADAPTER *ioc, u32 log_info)
         case 0x00080000:
                 desc = "Outbound DMA Overrun";
                 break;
-        
+
         case 0x00090000:
                 desc = "Task Management";
                 break;
@@ -5600,7 +5647,7 @@ mpt_sp_log_info(MPT_ADAPTER *ioc, u32 log_info)
         case 0x000C0000:
                 desc = "Untagged Table Size";
                 break;
-        
+
         }
 
         printk(MYIOC_s_INFO_FMT "LogInfo(0x%08x): F/W: %s\n", ioc->name, log_info, desc);
@@ -5692,7 +5739,7 @@ mpt_sp_ioc_info(MPT_ADAPTER *ioc, u32 ioc_status, MPT_FRAME_HDR *mf)
                 break;
 
         case MPI_IOCSTATUS_SCSI_DATA_UNDERRUN: /* 0x0045 */
-                /* This error is checked in scsi_io_done(). Skip. 
+                /* This error is checked in scsi_io_done(). Skip.
                 desc = "SCSI Data Underrun";
                 */
                 break;
diff --git a/drivers/message/fusion/mptbase.h b/drivers/message/fusion/mptbase.h
index 848fb236b17..f4827d92373 100644
--- a/drivers/message/fusion/mptbase.h
+++ b/drivers/message/fusion/mptbase.h
@@ -915,7 +915,10 @@ struct scsi_cmnd;
 typedef struct _x_config_parms {
         struct list_head         linkage;       /* linked list */
         struct timer_list        timer;         /* timer function for this request  */
-        ConfigPageHeader_t      *hdr;
+        union {
+                ConfigExtendedPageHeader_t      *ehdr;
+                ConfigPageHeader_t      *hdr;
+        } cfghdr;
         dma_addr_t               physAddr;
         int                      wait_done;     /* wait for this request */
         u32                      pageAddr;      /* properly formatted */
diff --git a/drivers/message/fusion/mptctl.c b/drivers/message/fusion/mptctl.c
index 05ea5944c48..7577c2417e2 100644
--- a/drivers/message/fusion/mptctl.c
+++ b/drivers/message/fusion/mptctl.c
@@ -242,7 +242,7 @@ mptctl_reply(MPT_ADAPTER *ioc, MPT_FRAME_HDR *req, MPT_FRAME_HDR *reply)
                 /* Set the command status to GOOD if IOC Status is GOOD
                  * OR if SCSI I/O cmd and data underrun or recovered error.
                  */
-                iocStatus = reply->u.reply.IOCStatus & MPI_IOCSTATUS_MASK;
+                iocStatus = le16_to_cpu(reply->u.reply.IOCStatus) & MPI_IOCSTATUS_MASK;
                 if (iocStatus  == MPI_IOCSTATUS_SUCCESS)
                         ioc->ioctl->status |= MPT_IOCTL_STATUS_COMMAND_GOOD;
 
@@ -2324,7 +2324,7 @@ mptctl_hp_hostinfo(unsigned long arg, unsigned int data_size)
         hdr.PageLength = 0;
         hdr.PageNumber = 0;
         hdr.PageType = MPI_CONFIG_PAGETYPE_MANUFACTURING;
-        cfg.hdr = &hdr;
+        cfg.cfghdr.hdr = &hdr;
         cfg.physAddr = -1;
         cfg.pageAddr = 0;
         cfg.action = MPI_CONFIG_ACTION_PAGE_HEADER;
@@ -2333,7 +2333,7 @@ mptctl_hp_hostinfo(unsigned long arg, unsigned int data_size)
 
         strncpy(karg.serial_number, " ", 24);
         if (mpt_config(ioc, &cfg) == 0) {
-                if (cfg.hdr->PageLength > 0) {
+                if (cfg.cfghdr.hdr->PageLength > 0) {
                         /* Issue the second config page request */
                         cfg.action = MPI_CONFIG_ACTION_PAGE_READ_CURRENT;
 
@@ -2479,7 +2479,7 @@ mptctl_hp_targetinfo(unsigned long arg)
                 hdr.PageNumber = 0;
                 hdr.PageType = MPI_CONFIG_PAGETYPE_SCSI_DEVICE;
 
-                cfg.hdr = &hdr;
+                cfg.cfghdr.hdr = &hdr;
                 cfg.action = MPI_CONFIG_ACTION_PAGE_READ_CURRENT;
                 cfg.dir = 0;
                 cfg.timeout = 0;
@@ -2527,15 +2527,15 @@ mptctl_hp_targetinfo(unsigned long arg)
         hdr.PageNumber = 3;
         hdr.PageType = MPI_CONFIG_PAGETYPE_SCSI_DEVICE;
 
-        cfg.hdr = &hdr;
+        cfg.cfghdr.hdr = &hdr;
         cfg.action = MPI_CONFIG_ACTION_PAGE_HEADER;
         cfg.dir = 0;
         cfg.timeout = 0;
         cfg.physAddr = -1;
-        if ((mpt_config(ioc, &cfg) == 0) && (cfg.hdr->PageLength > 0)) {
+        if ((mpt_config(ioc, &cfg) == 0) && (cfg.cfghdr.hdr->PageLength > 0)) {
                 /* Issue the second config page request */
                 cfg.action = MPI_CONFIG_ACTION_PAGE_READ_CURRENT;
-                data_sz = (int) cfg.hdr->PageLength * 4;
+                data_sz = (int) cfg.cfghdr.hdr->PageLength * 4;
                 pg3_alloc = (SCSIDevicePage3_t *) pci_alloc_consistent(
                                                         ioc->pcidev, data_sz, &page_dma);
                 if (pg3_alloc) {
diff --git a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c
index b9d4f78725b..4a003dc5fde 100644
--- a/drivers/message/fusion/mptscsih.c
+++ b/drivers/message/fusion/mptscsih.c
@@ -281,12 +281,12 @@ mptscsih_getFreeChainBuffer(MPT_ADAPTER *ioc, int *retIndex)
                 offset = (u8 *)chainBuf - (u8 *)ioc->ChainBuffer;
                 chain_idx = offset / ioc->req_sz;
                 rc = SUCCESS;
-                dsgprintk((MYIOC_s_INFO_FMT "getFreeChainBuffer (index %d), got buf=%p\n",
-                        ioc->name, *retIndex, chainBuf));
+                dsgprintk((MYIOC_s_ERR_FMT "getFreeChainBuffer chainBuf=%p ChainBuffer=%p offset=%d chain_idx=%d\n",
+                        ioc->name, chainBuf, ioc->ChainBuffer, offset, chain_idx));
         } else {
                 rc = FAILED;
                 chain_idx = MPT_HOST_NO_CHAIN;
-                dfailprintk((MYIOC_s_ERR_FMT "getFreeChainBuffer failed\n",
+                dfailprintk((MYIOC_s_INFO_FMT "getFreeChainBuffer failed\n",
                         ioc->name));
         }
         spin_unlock_irqrestore(&ioc->FreeQlock, flags);
@@ -432,7 +432,7 @@ nextSGEset:
                          */
                         pReq->ChainOffset = 0;
                         RequestNB = (((sgeOffset - 1) >> ioc->NBShiftFactor)  + 1) & 0x03;
-                        dsgprintk((MYIOC_s_ERR_FMT 
+                        dsgprintk((MYIOC_s_INFO_FMT
                             "Single Buffer RequestNB=%x, sgeOffset=%d\n", ioc->name, RequestNB, sgeOffset));
                         ioc->RequestNB[req_idx] = RequestNB;
                 }
@@ -491,11 +491,12 @@ nextSGEset:
                 /* NOTE: psge points to the beginning of the chain element
                  * in current buffer. Get a chain buffer.
                  */
-                dsgprintk((MYIOC_s_INFO_FMT 
-                    "calling getFreeChainBuffer SCSI cmd=%02x (%p)\n",
-                    ioc->name, pReq->CDB[0], SCpnt));
-                if ((mptscsih_getFreeChainBuffer(ioc, &newIndex)) == FAILED)
+                if ((mptscsih_getFreeChainBuffer(ioc, &newIndex)) == FAILED) {
+                        dfailprintk((MYIOC_s_INFO_FMT
+                            "getFreeChainBuffer FAILED SCSI cmd=%02x (%p)\n",
+                            ioc->name, pReq->CDB[0], SCpnt));
                         return FAILED;
+                }
 
                 /* Update the tracking arrays.
                  * If chainSge == NULL, update ReqToChain, else ChainToChain
@@ -577,14 +578,20 @@ mptscsih_io_done(MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf, MPT_FRAME_HDR *mr)
                 return 1;
         }
 
-        dmfprintk((MYIOC_s_INFO_FMT
-                "ScsiDone (mf=%p,mr=%p,sc=%p,idx=%d)\n",
-                ioc->name, mf, mr, sc, req_idx));
-
         sc->result = DID_OK << 16;              /* Set default reply as OK */
         pScsiReq = (SCSIIORequest_t *) mf;
         pScsiReply = (SCSIIOReply_t *) mr;
 
+        if((ioc->facts.MsgVersion >= MPI_VERSION_01_05) && pScsiReply){
+                dmfprintk((MYIOC_s_INFO_FMT
+                        "ScsiDone (mf=%p,mr=%p,sc=%p,idx=%d,task-tag=%d)\n",
+                        ioc->name, mf, mr, sc, req_idx, pScsiReply->TaskTag));
+        }else{
+                dmfprintk((MYIOC_s_INFO_FMT
+                        "ScsiDone (mf=%p,mr=%p,sc=%p,idx=%d)\n",
+                        ioc->name, mf, mr, sc, req_idx));
+        }
+
         if (pScsiReply == NULL) {
                 /* special context reply handling */
                 ;
@@ -658,8 +665,8 @@ mptscsih_io_done(MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf, MPT_FRAME_HDR *mr)
                                 /* Sufficient data transfer occurred */
                                 sc->result = (DID_OK << 16) | scsi_status;
                         } else if ( xfer_cnt == 0 ) {
-                                /* A CRC Error causes this condition; retry */ 
-                                sc->result = (DRIVER_SENSE << 24) | (DID_OK << 16) | 
+                                /* A CRC Error causes this condition; retry */
+                                sc->result = (DRIVER_SENSE << 24) | (DID_OK << 16) |
                                         (CHECK_CONDITION << 1);
                                 sc->sense_buffer[0] = 0x70;
                                 sc->sense_buffer[2] = NO_SENSE;
@@ -668,7 +675,9 @@ mptscsih_io_done(MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf, MPT_FRAME_HDR *mr)
                         } else {
                                 sc->result = DID_SOFT_ERROR << 16;
                         }
-                        dreplyprintk((KERN_NOTICE "RESIDUAL_MISMATCH: result=%x on id=%d\n", sc->result, sc->target));
+                        dreplyprintk((KERN_NOTICE
+                            "RESIDUAL_MISMATCH: result=%x on id=%d\n",
+                            sc->result, sc->device->id));
                         break;
 
                 case MPI_IOCSTATUS_SCSI_DATA_UNDERRUN:          /* 0x0045 */
@@ -796,7 +805,6 @@ mptscsih_io_done(MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf, MPT_FRAME_HDR *mr)
         return 1;
 }
 
-
 /*
  *      mptscsih_flush_running_cmds - For each command found, search
  *              Scsi_Host instance taskQ and reply to OS.
@@ -1017,7 +1025,7 @@ mptscsih_remove(struct pci_dev *pdev)
         scsi_host_put(host);
 
         mpt_detach(pdev);
-        
+
 }
 
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
@@ -1072,7 +1080,7 @@ mptscsih_resume(struct pci_dev *pdev)
         MPT_SCSI_HOST           *hd;
 
         mpt_resume(pdev);
-        
+
         if(!host)
                 return 0;
 
@@ -1214,8 +1222,8 @@ mptscsih_proc_info(struct Scsi_Host *host, char *buffer, char **start, off_t off
         int size = 0;
 
         if (func) {
-                /* 
-                 * write is not supported 
+                /*
+                 * write is not supported
                  */
         } else {
                 if (start)
@@ -1535,17 +1543,17 @@ mptscsih_TMHandler(MPT_SCSI_HOST *hd, u8 type, u8 channel, u8 target, u8 lun, in
          */
         if (mptscsih_tm_pending_wait(hd) == FAILED) {
                 if (type == MPI_SCSITASKMGMT_TASKTYPE_ABORT_TASK) {
-                        dtmprintk((KERN_WARNING MYNAM ": %s: TMHandler abort: "
+                        dtmprintk((KERN_INFO MYNAM ": %s: TMHandler abort: "
                            "Timed out waiting for last TM (%d) to complete! \n",
                            hd->ioc->name, hd->tmPending));
                         return FAILED;
                 } else if (type == MPI_SCSITASKMGMT_TASKTYPE_TARGET_RESET) {
-                        dtmprintk((KERN_WARNING MYNAM ": %s: TMHandler target reset: "
+                        dtmprintk((KERN_INFO MYNAM ": %s: TMHandler target reset: "
                            "Timed out waiting for last TM (%d) to complete! \n",
                            hd->ioc->name, hd->tmPending));
                         return FAILED;
                 } else if (type == MPI_SCSITASKMGMT_TASKTYPE_RESET_BUS) {
-                        dtmprintk((KERN_WARNING MYNAM ": %s: TMHandler bus reset: "
+                        dtmprintk((KERN_INFO MYNAM ": %s: TMHandler bus reset: "
                            "Timed out waiting for last TM (%d) to complete! \n",
                            hd->ioc->name, hd->tmPending));
                         if (hd->tmPending & (1 << MPI_SCSITASKMGMT_TASKTYPE_RESET_BUS))
@@ -1631,8 +1639,7 @@ mptscsih_IssueTaskMgmt(MPT_SCSI_HOST *hd, u8 type, u8 channel, u8 target, u8 lun
         if ((mf = mpt_get_msg_frame(hd->ioc->TaskCtx, hd->ioc)) == NULL) {
                 dfailprintk((MYIOC_s_ERR_FMT "IssueTaskMgmt, no msg frames!!\n",
                                 hd->ioc->name));
-                //return FAILED;
-                return -999;
+                return FAILED;
         }
         dtmprintk((MYIOC_s_INFO_FMT "IssueTaskMgmt request @ %p\n",
                         hd->ioc->name, mf));
@@ -1661,9 +1668,8 @@ mptscsih_IssueTaskMgmt(MPT_SCSI_HOST *hd, u8 type, u8 channel, u8 target, u8 lun
 
         pScsiTm->TaskMsgContext = ctx2abort;
 
-        dtmprintk((MYIOC_s_INFO_FMT
-                "IssueTaskMgmt: ctx2abort (0x%08x) type=%d\n",
-                hd->ioc->name, ctx2abort, type));
+        dtmprintk((MYIOC_s_INFO_FMT "IssueTaskMgmt: ctx2abort (0x%08x) type=%d\n",
+                        hd->ioc->name, ctx2abort, type));
 
         DBG_DUMP_TM_REQUEST_FRAME((u32 *)pScsiTm);
 
@@ -1902,13 +1908,13 @@ mptscsih_host_reset(struct scsi_cmnd *SCpnt)
 
         /*  If we can't locate the host to reset, then we failed. */
         if ((hd = (MPT_SCSI_HOST *) SCpnt->device->host->hostdata) == NULL){
-                dtmprintk( ( KERN_WARNING MYNAM ": mptscsih_host_reset: "
+                dtmprintk( ( KERN_INFO MYNAM ": mptscsih_host_reset: "
                              "Can't locate host! (sc=%p)\n",
                              SCpnt ) );
                 return FAILED;
         }
 
-        printk(KERN_WARNING MYNAM ": %s: >> Attempting host reset! (sc=%p)\n",
+        printk(KERN_WARNING MYNAM ": %s: Attempting host reset! (sc=%p)\n",
                hd->ioc->name, SCpnt);
 
         /*  If our attempts to reset the host failed, then return a failed
@@ -1924,7 +1930,7 @@ mptscsih_host_reset(struct scsi_cmnd *SCpnt)
                 hd->tmState = TM_STATE_NONE;
         }
 
-        dtmprintk( ( KERN_WARNING MYNAM ": mptscsih_host_reset: "
+        dtmprintk( ( KERN_INFO MYNAM ": mptscsih_host_reset: "
                      "Status = %s\n",
                      (status == SUCCESS) ? "SUCCESS" : "FAILED" ) );
 
@@ -1951,8 +1957,8 @@ mptscsih_tm_pending_wait(MPT_SCSI_HOST * hd)
                 if (hd->tmState == TM_STATE_NONE) {
                         hd->tmState = TM_STATE_IN_PROGRESS;
                         hd->tmPending = 1;
-                        status = SUCCESS;
                         spin_unlock_irqrestore(&hd->ioc->FreeQlock, flags);
+                        status = SUCCESS;
                         break;
                 }
                 spin_unlock_irqrestore(&hd->ioc->FreeQlock, flags);
@@ -1980,7 +1986,7 @@ mptscsih_tm_wait_for_completion(MPT_SCSI_HOST * hd, ulong timeout )
                 spin_lock_irqsave(&hd->ioc->FreeQlock, flags);
                 if(hd->tmPending == 0) {
                         status = SUCCESS;
-                        spin_unlock_irqrestore(&hd->ioc->FreeQlock, flags);
+                        spin_unlock_irqrestore(&hd->ioc->FreeQlock, flags);
                         break;
                 }
                 spin_unlock_irqrestore(&hd->ioc->FreeQlock, flags);
@@ -2318,10 +2324,10 @@ mptscsih_slave_configure(struct scsi_device *device)
         if (pTarget == NULL) {
                 /* Driver doesn't know about this device.
                  * Kernel may generate a "Dummy Lun 0" which
-                 * may become a real Lun if a 
+                 * may become a real Lun if a
                  * "scsi add-single-device" command is executed
-                 * while the driver is active (hot-plug a 
-                 * device).  LSI Raid controllers need 
+                 * while the driver is active (hot-plug a
+                 * device).  LSI Raid controllers need
                  * queue_depth set to DEV_HIGH for this reason.
                  */
                 scsi_adjust_queue_depth(device, MSG_SIMPLE_TAG,
@@ -2691,7 +2697,7 @@ mptscsih_initTarget(MPT_SCSI_HOST *hd, int bus_id, int target_id, u8 lun, char *
          * If the peripheral qualifier filter is enabled then if the target reports a 0x1
          * (i.e. The targer is capable of supporting the specified peripheral device type
          * on this logical unit; however, the physical device is not currently connected
-         * to this logical unit) it will be converted to a 0x3 (i.e. The target is not 
+         * to this logical unit) it will be converted to a 0x3 (i.e. The target is not
          * capable of supporting a physical device on this logical unit). This is to work
          * around a bug in th emid-layer in some distributions in which the mid-layer will
          * continue to try to communicate to the LUN and evntually create a dummy LUN.
@@ -3194,8 +3200,8 @@ mptscsih_writeSDP1(MPT_SCSI_HOST *hd, int portnum, int target_id, int flags)
                 /* Get a MF for this command.
                  */
                 if ((mf = mpt_get_msg_frame(ioc->DoneCtx, ioc)) == NULL) {
-                        dprintk((MYIOC_s_WARN_FMT "write SDP1: no msg frames!\n",
-                                                ioc->name));
+                        dfailprintk((MYIOC_s_WARN_FMT "write SDP1: no msg frames!\n",
+                                ioc->name));
                         return -EAGAIN;
                 }
 
@@ -3289,7 +3295,7 @@ mptscsih_writeIOCPage4(MPT_SCSI_HOST *hd, int target_id, int bus)
         /* Get a MF for this command.
          */
         if ((mf = mpt_get_msg_frame(ioc->DoneCtx, ioc)) == NULL) {
-                dprintk((MYIOC_s_WARN_FMT "writeIOCPage4 : no msg frames!\n",
+                dfailprintk((MYIOC_s_WARN_FMT "writeIOCPage4 : no msg frames!\n",
                                         ioc->name));
                 return -EAGAIN;
         }
@@ -3447,7 +3453,7 @@ mptscsih_scandv_complete(MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf, MPT_FRAME_HDR *mr)
                                  * some type of error occurred.
                                  */
                                 MpiRaidActionReply_t    *pr = (MpiRaidActionReply_t *)mr;
-                                if (pr->ActionStatus == MPI_RAID_ACTION_ASTATUS_SUCCESS)
+                                if (le16_to_cpu(pr->ActionStatus) == MPI_RAID_ACTION_ASTATUS_SUCCESS)
                                         completionCode = MPT_SCANDV_GOOD;
                                 else
                                         completionCode = MPT_SCANDV_SOME_ERROR;
@@ -3955,7 +3961,7 @@ mptscsih_synchronize_cache(MPT_SCSI_HOST *hd, int portnum)
                                 header1.PageLength = ioc->spi_data.sdp1length;
                                 header1.PageNumber = 1;
                                 header1.PageType = MPI_CONFIG_PAGETYPE_SCSI_DEVICE;
-                                cfg.hdr = &header1;
+                                cfg.cfghdr.hdr = &header1;
                                 cfg.physAddr = cfg1_dma_addr;
                                 cfg.action = MPI_CONFIG_ACTION_PAGE_WRITE_CURRENT;
                                 cfg.dir = 1;
@@ -3996,9 +4002,9 @@ mptscsih_synchronize_cache(MPT_SCSI_HOST *hd, int portnum)
                         dnegoprintk(("syncronize cache: id=%d width=0 factor=MPT_ASYNC "
                                 "offset=0 negoFlags=%x request=%x config=%x\n",
                                 id, flags, requested, configuration));
-                        pcfg1Data->RequestedParameters = le32_to_cpu(requested);
+                        pcfg1Data->RequestedParameters = cpu_to_le32(requested);
                         pcfg1Data->Reserved = 0;
-                        pcfg1Data->Configuration = le32_to_cpu(configuration);
+                        pcfg1Data->Configuration = cpu_to_le32(configuration);
                         cfg.pageAddr = (bus<<8) | id;
                         mpt_config(hd->ioc, &cfg);
                 }
@@ -4353,7 +4359,7 @@ mptscsih_doDv(MPT_SCSI_HOST *hd, int bus_number, int id)
         /* Prep cfg structure
          */
         cfg.pageAddr = (bus<<8) | id;
-        cfg.hdr = NULL;
+        cfg.cfghdr.hdr = NULL;
 
         /* Prep SDP0 header
          */
@@ -4399,7 +4405,7 @@ mptscsih_doDv(MPT_SCSI_HOST *hd, int bus_number, int id)
         pcfg1Data = (SCSIDevicePage1_t *) (pDvBuf + sz);
         cfg1_dma_addr = dvbuf_dma + sz;
 
-        /* Skip this ID? Set cfg.hdr to force config page write
+        /* Skip this ID? Set cfg.cfghdr.hdr to force config page write
          */
         {
                 ScsiCfgData *pspi_data = &hd->ioc->spi_data;
@@ -4417,7 +4423,7 @@ mptscsih_doDv(MPT_SCSI_HOST *hd, int bus_number, int id)
 
                                 dv.cmd = MPT_SET_MAX;
                                 mptscsih_dv_parms(hd, &dv, (void *)pcfg1Data);
-                                cfg.hdr = &header1;
+                                cfg.cfghdr.hdr = &header1;
 
                                 /* Save the final negotiated settings to
                                  * SCSI device page 1.
@@ -4483,7 +4489,7 @@ mptscsih_doDv(MPT_SCSI_HOST *hd, int bus_number, int id)
                 dv.cmd = MPT_SET_MIN;
                 mptscsih_dv_parms(hd, &dv, (void *)pcfg1Data);
 
-                cfg.hdr = &header1;
+                cfg.cfghdr.hdr = &header1;
                 cfg.physAddr = cfg1_dma_addr;
                 cfg.action = MPI_CONFIG_ACTION_PAGE_WRITE_CURRENT;
                 cfg.dir = 1;
@@ -4596,8 +4602,8 @@ mptscsih_doDv(MPT_SCSI_HOST *hd, int bus_number, int id)
                                 if ((pbuf1[56] & 0x02) == 0) {
                                         pTarget->negoFlags |= MPT_TARGET_NO_NEGO_QAS;
                                         hd->ioc->spi_data.noQas = MPT_TARGET_NO_NEGO_QAS;
-                                        ddvprintk((MYIOC_s_NOTE_FMT 
-                                            "DV: Start Basic noQas on id=%d due to pbuf1[56]=%x\n", 
+                                        ddvprintk((MYIOC_s_NOTE_FMT
+                                            "DV: Start Basic noQas on id=%d due to pbuf1[56]=%x\n",
                                             ioc->name, id, pbuf1[56]));
                                 }
                         }
@@ -4637,7 +4643,7 @@ mptscsih_doDv(MPT_SCSI_HOST *hd, int bus_number, int id)
                                         u32 sdp0_info;
                                         u32 sdp0_nego;
 
-                                        cfg.hdr = &header0;
+                                        cfg.cfghdr.hdr = &header0;
                                         cfg.physAddr = cfg0_dma_addr;
                                         cfg.action = MPI_CONFIG_ACTION_PAGE_READ_CURRENT;
                                         cfg.dir = 0;
@@ -4673,7 +4679,7 @@ mptscsih_doDv(MPT_SCSI_HOST *hd, int bus_number, int id)
                                                 if (!firstPass)
                                                         doFallback = 1;
                                         } else {
-                                                ddvprintk((MYIOC_s_NOTE_FMT 
+                                                ddvprintk((MYIOC_s_NOTE_FMT
                                                     "DV:Inquiry compared id=%d, calling initTarget\n", ioc->name, id));
                                                 hd->ioc->spi_data.dvStatus[id] &= ~MPT_SCSICFG_DV_NOT_DONE;
                                                 mptscsih_initTarget(hd,
@@ -4689,8 +4695,8 @@ mptscsih_doDv(MPT_SCSI_HOST *hd, int bus_number, int id)
 
                         } else if (rc == MPT_SCANDV_ISSUE_SENSE)
                                 doFallback = 1; /* set fallback flag */
-                        else if ((rc == MPT_SCANDV_DID_RESET) || 
-                                 (rc == MPT_SCANDV_SENSE) || 
+                        else if ((rc == MPT_SCANDV_DID_RESET) ||
+                                 (rc == MPT_SCANDV_SENSE) ||
                                  (rc == MPT_SCANDV_FALLBACK))
                                 doFallback = 1; /* set fallback flag */
                         else
@@ -4722,7 +4728,7 @@ mptscsih_doDv(MPT_SCSI_HOST *hd, int bus_number, int id)
          * 4) release
          * 5) update nego parms to target struct
          */
-        cfg.hdr = &header1;
+        cfg.cfghdr.hdr = &header1;
         cfg.physAddr = cfg1_dma_addr;
         cfg.action = MPI_CONFIG_ACTION_PAGE_WRITE_CURRENT;
         cfg.dir = 1;
@@ -5121,12 +5127,12 @@ target_done:
 
         /* Set if cfg1_dma_addr contents is valid
          */
-        if ((cfg.hdr != NULL) && (retcode == 0)){
+        if ((cfg.cfghdr.hdr != NULL) && (retcode == 0)){
                 /* If disk, not U320, disable QAS
                  */
                 if ((inq0 == 0) && (dv.now.factor > MPT_ULTRA320)) {
                         hd->ioc->spi_data.noQas = MPT_TARGET_NO_NEGO_QAS;
-                        ddvprintk((MYIOC_s_NOTE_FMT 
+                        ddvprintk((MYIOC_s_NOTE_FMT
                             "noQas set due to id=%d has factor=%x\n", ioc->name, id, dv.now.factor));
                 }
 
@@ -5137,7 +5143,7 @@ target_done:
                  * skip save of the final negotiated settings to
                  * SCSI device page 1.
                  *
-                cfg.hdr = &header1;
+                cfg.cfghdr.hdr = &header1;
                 cfg.physAddr = cfg1_dma_addr;
                 cfg.action = MPI_CONFIG_ACTION_PAGE_WRITE_CURRENT;
                 cfg.dir = 1;
@@ -5248,7 +5254,7 @@ mptscsih_dv_parms(MPT_SCSI_HOST *hd, DVPARAMETERS *dv,void *pPage)
                 /* Update tmax values with those from Device Page 0.*/
                 pPage0 = (SCSIDevicePage0_t *) pPage;
                 if (pPage0) {
-                        val = cpu_to_le32(pPage0->NegotiatedParameters);
+                        val = le32_to_cpu(pPage0->NegotiatedParameters);
                         dv->max.width = val & MPI_SCSIDEVPAGE0_NP_WIDE ? 1 : 0;
                         dv->max.offset = (val&MPI_SCSIDEVPAGE0_NP_NEG_SYNC_OFFSET_MASK) >> 16;
                         dv->max.factor = (val&MPI_SCSIDEVPAGE0_NP_NEG_SYNC_PERIOD_MASK) >> 8;
@@ -5276,12 +5282,12 @@ mptscsih_dv_parms(MPT_SCSI_HOST *hd, DVPARAMETERS *dv,void *pPage)
                                 dv->now.offset, &val, &configuration, dv->now.flags);
                         dnegoprintk(("Setting Max: id=%d width=%d factor=%x offset=%x negoFlags=%x request=%x config=%x\n",
                                 id, dv->now.width, dv->now.factor, dv->now.offset, dv->now.flags, val, configuration));
-                        pPage1->RequestedParameters = le32_to_cpu(val);
+                        pPage1->RequestedParameters = cpu_to_le32(val);
                         pPage1->Reserved = 0;
-                        pPage1->Configuration = le32_to_cpu(configuration);
+                        pPage1->Configuration = cpu_to_le32(configuration);
                 }
 
-                ddvprintk(("id=%d width=%d factor=%x offset=%x flags=%x request=%x configuration=%x\n",
+                ddvprintk(("id=%d width=%d factor=%x offset=%x negoFlags=%x request=%x configuration=%x\n",
                                 id, dv->now.width, dv->now.factor, dv->now.offset, dv->now.flags, val, configuration));
                 break;
 
@@ -5301,9 +5307,9 @@ mptscsih_dv_parms(MPT_SCSI_HOST *hd, DVPARAMETERS *dv,void *pPage)
                                 offset, &val, &configuration, negoFlags);
                         dnegoprintk(("Setting Min: id=%d width=%d factor=%x offset=%x negoFlags=%x request=%x config=%x\n",
                                 id, width, factor, offset, negoFlags, val, configuration));
-                        pPage1->RequestedParameters = le32_to_cpu(val);
+                        pPage1->RequestedParameters = cpu_to_le32(val);
                         pPage1->Reserved = 0;
-                        pPage1->Configuration = le32_to_cpu(configuration);
+                        pPage1->Configuration = cpu_to_le32(configuration);
                 }
                 ddvprintk(("id=%d width=%d factor=%x offset=%x request=%x config=%x negoFlags=%x\n",
                                 id, width, factor, offset, val, configuration, negoFlags));
@@ -5377,12 +5383,12 @@ mptscsih_dv_parms(MPT_SCSI_HOST *hd, DVPARAMETERS *dv,void *pPage)
                 if (pPage1) {
                         mptscsih_setDevicePage1Flags (width, factor, offset, &val,
                                                 &configuration, dv->now.flags);
-                        dnegoprintk(("Finish: id=%d width=%d offset=%d factor=%x flags=%x request=%x config=%x\n",
+                        dnegoprintk(("Finish: id=%d width=%d offset=%d factor=%x negoFlags=%x request=%x config=%x\n",
                              id, width, offset, factor, dv->now.flags, val, configuration));
 
-                        pPage1->RequestedParameters = le32_to_cpu(val);
+                        pPage1->RequestedParameters = cpu_to_le32(val);
                         pPage1->Reserved = 0;
-                        pPage1->Configuration = le32_to_cpu(configuration);
+                        pPage1->Configuration = cpu_to_le32(configuration);
                 }
 
                 ddvprintk(("Finish: id=%d offset=%d factor=%x width=%d request=%x config=%x\n",
diff --git a/drivers/message/fusion/mptspi.c b/drivers/message/fusion/mptspi.c
index dfa8806b1e1..587d1274fd7 100644
--- a/drivers/message/fusion/mptspi.c
+++ b/drivers/message/fusion/mptspi.c
@@ -162,15 +162,15 @@ mptspi_probe(struct pci_dev *pdev, const struct pci_device_id *id)
         u8                      *mem;
         int                     error=0;
         int                     r;
-        
+
         if ((r = mpt_attach(pdev,id)) != 0)
                 return r;
-        
+
         ioc = pci_get_drvdata(pdev);
         ioc->DoneCtx = mptspiDoneCtx;
         ioc->TaskCtx = mptspiTaskCtx;
         ioc->InternalCtx = mptspiInternalCtx;
-        
+
         /*  Added sanity check on readiness of the MPT adapter.
          */
         if (ioc->last_state != MPI_IOC_STATE_OPERATIONAL) {
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index dea6589d153..7fc692a8f5b 100644
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -6,7 +6,7 @@ menu "Misc devices"
 
 config IBM_ASM
         tristate "Device driver for IBM RSA service processor"
-        depends on X86 && PCI && EXPERIMENTAL && BROKEN
+        depends on X86 && PCI && EXPERIMENTAL
         ---help---
           This option enables device driver support for in-band access to the
           IBM RSA (Condor) service processor in eServer xSeries systems.
diff --git a/drivers/misc/ibmasm/uart.c b/drivers/misc/ibmasm/uart.c
index 914804512db..7e98434cfa3 100644
--- a/drivers/misc/ibmasm/uart.c
+++ b/drivers/misc/ibmasm/uart.c
@@ -25,15 +25,15 @@
 #include <linux/termios.h>
 #include <linux/tty.h>
 #include <linux/serial_core.h>
-#include <linux/serial.h>
 #include <linux/serial_reg.h>
+#include <linux/serial_8250.h>
 #include "ibmasm.h"
 #include "lowlevel.h"
 
 
 void ibmasm_register_uart(struct service_processor *sp)
 {
-        struct serial_struct serial;
+        struct uart_port uport;
         void __iomem *iomem_base;
 
         iomem_base = sp->base_address + SCOUT_COM_B_BASE;
@@ -47,14 +47,14 @@ void ibmasm_register_uart(struct service_processor *sp)
                 return;
         }
 
-        memset(&serial, 0, sizeof(serial));
-        serial.irq              = sp->irq;
-        serial.baud_base        = 3686400 / 16;
-        serial.flags            = UPF_AUTOPROBE | UPF_SHARE_IRQ;
-        serial.io_type          = UPIO_MEM;
-        serial.iomem_base       = iomem_base;
+        memset(&uport, 0, sizeof(struct uart_port));
+        uport.irq       = sp->irq;
+        uport.uartclk   = 3686400;
+        uport.flags     = UPF_AUTOPROBE | UPF_SHARE_IRQ;
+        uport.iotype    = UPIO_MEM;
+        uport.membase   = iomem_base;
 
-        sp->serial_line = register_serial(&serial);
+        sp->serial_line = serial8250_register_port(&uport);
         if (sp->serial_line < 0) {
                 dev_err(sp->dev, "Failed to register serial port\n");
                 return;
@@ -68,5 +68,5 @@ void ibmasm_unregister_uart(struct service_processor *sp)
                 return;
 
         disable_uart_interrupts(sp->base_address);
-        unregister_serial(sp->serial_line);
+        serial8250_unregister_port(sp->serial_line);
 }
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
index 3c5904834fe..0a117c61cd1 100644
--- a/drivers/mmc/mmc.c
+++ b/drivers/mmc/mmc.c
@@ -2,6 +2,8 @@
  *  linux/drivers/mmc/mmc.c
  *
  *  Copyright (C) 2003-2004 Russell King, All Rights Reserved.
+ *  SD support Copyright (C) 2004 Ian Molton, All Rights Reserved.
+ *  SD support Copyright (C) 2005 Pierre Ossman, All Rights Reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -16,6 +18,8 @@
 #include <linux/delay.h>
 #include <linux/pagemap.h>
 #include <linux/err.h>
+#include <asm/scatterlist.h>
+#include <linux/scatterlist.h>
 
 #include <linux/mmc/card.h>
 #include <linux/mmc/host.h>
@@ -172,7 +176,81 @@ int mmc_wait_for_cmd(struct mmc_host *host, struct mmc_command *cmd, int retries
 
 EXPORT_SYMBOL(mmc_wait_for_cmd);
 
+/**
+ *      mmc_wait_for_app_cmd - start an application command and wait for
+                               completion
+ *      @host: MMC host to start command
+ *      @rca: RCA to send MMC_APP_CMD to
+ *      @cmd: MMC command to start
+ *      @retries: maximum number of retries
+ *
+ *      Sends a MMC_APP_CMD, checks the card response, sends the command
+ *      in the parameter and waits for it to complete. Return any error
+ *      that occurred while the command was executing.  Do not attempt to
+ *      parse the response.
+ */
+int mmc_wait_for_app_cmd(struct mmc_host *host, unsigned int rca,
+        struct mmc_command *cmd, int retries)
+{
+        struct mmc_request mrq;
+        struct mmc_command appcmd;
+
+        int i, err;
+
+        BUG_ON(host->card_busy == NULL);
+        BUG_ON(retries < 0);
+
+        err = MMC_ERR_INVALID;
+
+        /*
+         * We have to resend MMC_APP_CMD for each attempt so
+         * we cannot use the retries field in mmc_command.
+         */
+        for (i = 0;i <= retries;i++) {
+                memset(&mrq, 0, sizeof(struct mmc_request));
+
+                appcmd.opcode = MMC_APP_CMD;
+                appcmd.arg = rca << 16;
+                appcmd.flags = MMC_RSP_R1;
+                appcmd.retries = 0;
+                memset(appcmd.resp, 0, sizeof(appcmd.resp));
+                appcmd.data = NULL;
+
+                mrq.cmd = &appcmd;
+                appcmd.data = NULL;
+
+                mmc_wait_for_req(host, &mrq);
+
+                if (appcmd.error) {
+                        err = appcmd.error;
+                        continue;
+                }
+
+                /* Check that card supported application commands */
+                if (!(appcmd.resp[0] & R1_APP_CMD))
+                        return MMC_ERR_FAILED;
+
+                memset(&mrq, 0, sizeof(struct mmc_request));
+
+                memset(cmd->resp, 0, sizeof(cmd->resp));
+                cmd->retries = 0;
+
+                mrq.cmd = cmd;
+                cmd->data = NULL;
+
+                mmc_wait_for_req(host, &mrq);
 
+                err = cmd->error;
+                if (cmd->error == MMC_ERR_NONE)
+                        break;
+        }
+
+        return err;
+}
+
+EXPORT_SYMBOL(mmc_wait_for_app_cmd);
+
+static int mmc_select_card(struct mmc_host *host, struct mmc_card *card);
 
 /**
  *      __mmc_claim_host - exclusively claim a host
@@ -206,16 +284,10 @@ int __mmc_claim_host(struct mmc_host *host, struct mmc_card *card)
         spin_unlock_irqrestore(&host->lock, flags);
         remove_wait_queue(&host->wq, &wait);
 
-        if (card != (void *)-1 && host->card_selected != card) {
-                struct mmc_command cmd;
-
-                host->card_selected = card;
-
-                cmd.opcode = MMC_SELECT_CARD;
-                cmd.arg = card->rca << 16;
-                cmd.flags = MMC_RSP_R1;
-
-                err = mmc_wait_for_cmd(host, &cmd, CMD_RETRIES);
+        if (card != (void *)-1) {
+                err = mmc_select_card(host, card);
+                if (err != MMC_ERR_NONE)
+                        return err;
         }
 
         return err;
@@ -245,6 +317,63 @@ void mmc_release_host(struct mmc_host *host)
 
 EXPORT_SYMBOL(mmc_release_host);
 
+static int mmc_select_card(struct mmc_host *host, struct mmc_card *card)
+{
+        int err;
+        struct mmc_command cmd;
+
+        BUG_ON(host->card_busy == NULL);
+
+        if (host->card_selected == card)
+                return MMC_ERR_NONE;
+
+        host->card_selected = card;
+
+        cmd.opcode = MMC_SELECT_CARD;
+        cmd.arg = card->rca << 16;
+        cmd.flags = MMC_RSP_R1;
+
+        err = mmc_wait_for_cmd(host, &cmd, CMD_RETRIES);
+        if (err != MMC_ERR_NONE)
+                return err;
+
+        /*
+         * Default bus width is 1 bit.
+         */
+        host->ios.bus_width = MMC_BUS_WIDTH_1;
+
+        /*
+         * We can only change the bus width of the selected
+         * card so therefore we have to put the handling
+         * here.
+         */
+        if (host->caps & MMC_CAP_4_BIT_DATA) {
+                /*
+                 * The card is in 1 bit mode by default so
+                 * we only need to change if it supports the
+                 * wider version.
+                 */
+                if (mmc_card_sd(card) &&
+                        (card->scr.bus_widths & SD_SCR_BUS_WIDTH_4)) {
+                        struct mmc_command cmd;
+                        cmd.opcode = SD_APP_SET_BUS_WIDTH;
+                        cmd.arg = SD_BUS_WIDTH_4;
+                        cmd.flags = MMC_RSP_R1;
+
+                        err = mmc_wait_for_app_cmd(host, card->rca, &cmd,
+                                CMD_RETRIES);
+                        if (err != MMC_ERR_NONE)
+                                return err;
+
+                        host->ios.bus_width = MMC_BUS_WIDTH_4;
+                }
+        }
+
+        host->ops->set_ios(host, &host->ios);
+
+        return MMC_ERR_NONE;
+}
+
 /*
  * Ensure that no card is selected.
  */
@@ -322,48 +451,69 @@ static void mmc_decode_cid(struct mmc_card *card)
 
         memset(&card->cid, 0, sizeof(struct mmc_cid));
 
-        /*
-         * The selection of the format here is guesswork based upon
-         * information people have sent to date.
-         */
-        switch (card->csd.mmca_vsn) {
-        case 0: /* MMC v1.? */
-        case 1: /* MMC v1.4 */
-                card->cid.manfid        = UNSTUFF_BITS(resp, 104, 24);
-                card->cid.prod_name[0]  = UNSTUFF_BITS(resp, 96, 8);
-                card->cid.prod_name[1]  = UNSTUFF_BITS(resp, 88, 8);
-                card->cid.prod_name[2]  = UNSTUFF_BITS(resp, 80, 8);
-                card->cid.prod_name[3]  = UNSTUFF_BITS(resp, 72, 8);
-                card->cid.prod_name[4]  = UNSTUFF_BITS(resp, 64, 8);
-                card->cid.prod_name[5]  = UNSTUFF_BITS(resp, 56, 8);
-                card->cid.prod_name[6]  = UNSTUFF_BITS(resp, 48, 8);
-                card->cid.hwrev         = UNSTUFF_BITS(resp, 44, 4);
-                card->cid.fwrev         = UNSTUFF_BITS(resp, 40, 4);
-                card->cid.serial        = UNSTUFF_BITS(resp, 16, 24);
-                card->cid.month         = UNSTUFF_BITS(resp, 12, 4);
-                card->cid.year          = UNSTUFF_BITS(resp, 8, 4) + 1997;
-                break;
-
-        case 2: /* MMC v2.x ? */
-        case 3: /* MMC v3.x ? */
-                card->cid.manfid        = UNSTUFF_BITS(resp, 120, 8);
-                card->cid.oemid         = UNSTUFF_BITS(resp, 104, 16);
-                card->cid.prod_name[0]  = UNSTUFF_BITS(resp, 96, 8);
-                card->cid.prod_name[1]  = UNSTUFF_BITS(resp, 88, 8);
-                card->cid.prod_name[2]  = UNSTUFF_BITS(resp, 80, 8);
-                card->cid.prod_name[3]  = UNSTUFF_BITS(resp, 72, 8);
-                card->cid.prod_name[4]  = UNSTUFF_BITS(resp, 64, 8);
-                card->cid.prod_name[5]  = UNSTUFF_BITS(resp, 56, 8);
-                card->cid.serial        = UNSTUFF_BITS(resp, 16, 32);
-                card->cid.month         = UNSTUFF_BITS(resp, 12, 4);
-                card->cid.year          = UNSTUFF_BITS(resp, 8, 4) + 1997;
-                break;
-
-        default:
-                printk("%s: card has unknown MMCA version %d\n",
-                        mmc_hostname(card->host), card->csd.mmca_vsn);
-                mmc_card_set_bad(card);
-                break;
+        if (mmc_card_sd(card)) {
+                /*
+                 * SD doesn't currently have a version field so we will
+                 * have to assume we can parse this.
+                 */
+                card->cid.manfid                = UNSTUFF_BITS(resp, 120, 8);
+                card->cid.oemid                 = UNSTUFF_BITS(resp, 104, 16);
+                card->cid.prod_name[0]          = UNSTUFF_BITS(resp, 96, 8);
+                card->cid.prod_name[1]          = UNSTUFF_BITS(resp, 88, 8);
+                card->cid.prod_name[2]          = UNSTUFF_BITS(resp, 80, 8);
+                card->cid.prod_name[3]          = UNSTUFF_BITS(resp, 72, 8);
+                card->cid.prod_name[4]          = UNSTUFF_BITS(resp, 64, 8);
+                card->cid.hwrev                 = UNSTUFF_BITS(resp, 60, 4);
+                card->cid.fwrev                 = UNSTUFF_BITS(resp, 56, 4);
+                card->cid.serial                = UNSTUFF_BITS(resp, 24, 32);
+                card->cid.year                  = UNSTUFF_BITS(resp, 12, 8);
+                card->cid.month                 = UNSTUFF_BITS(resp, 8, 4);
+
+                card->cid.year += 2000; /* SD cards year offset */
+        } else {
+                /*
+                 * The selection of the format here is based upon published
+                 * specs from sandisk and from what people have reported.
+                 */
+                switch (card->csd.mmca_vsn) {
+                case 0: /* MMC v1.0 - v1.2 */
+                case 1: /* MMC v1.4 */
+                        card->cid.manfid        = UNSTUFF_BITS(resp, 104, 24);
+                        card->cid.prod_name[0]  = UNSTUFF_BITS(resp, 96, 8);
+                        card->cid.prod_name[1]  = UNSTUFF_BITS(resp, 88, 8);
+                        card->cid.prod_name[2]  = UNSTUFF_BITS(resp, 80, 8);
+                        card->cid.prod_name[3]  = UNSTUFF_BITS(resp, 72, 8);
+                        card->cid.prod_name[4]  = UNSTUFF_BITS(resp, 64, 8);
+                        card->cid.prod_name[5]  = UNSTUFF_BITS(resp, 56, 8);
+                        card->cid.prod_name[6]  = UNSTUFF_BITS(resp, 48, 8);
+                        card->cid.hwrev         = UNSTUFF_BITS(resp, 44, 4);
+                        card->cid.fwrev         = UNSTUFF_BITS(resp, 40, 4);
+                        card->cid.serial        = UNSTUFF_BITS(resp, 16, 24);
+                        card->cid.month         = UNSTUFF_BITS(resp, 12, 4);
+                        card->cid.year          = UNSTUFF_BITS(resp, 8, 4) + 1997;
+                        break;
+
+                case 2: /* MMC v2.0 - v2.2 */
+                case 3: /* MMC v3.1 - v3.3 */
+                        card->cid.manfid        = UNSTUFF_BITS(resp, 120, 8);
+                        card->cid.oemid         = UNSTUFF_BITS(resp, 104, 16);
+                        card->cid.prod_name[0]  = UNSTUFF_BITS(resp, 96, 8);
+                        card->cid.prod_name[1]  = UNSTUFF_BITS(resp, 88, 8);
+                        card->cid.prod_name[2]  = UNSTUFF_BITS(resp, 80, 8);
+                        card->cid.prod_name[3]  = UNSTUFF_BITS(resp, 72, 8);
+                        card->cid.prod_name[4]  = UNSTUFF_BITS(resp, 64, 8);
+                        card->cid.prod_name[5]  = UNSTUFF_BITS(resp, 56, 8);
+                        card->cid.serial        = UNSTUFF_BITS(resp, 16, 32);
+                        card->cid.month         = UNSTUFF_BITS(resp, 12, 4);
+                        card->cid.year          = UNSTUFF_BITS(resp, 8, 4) + 1997;
+                        break;
+
+                default:
+                        printk("%s: card has unknown MMCA version %d\n",
+                                mmc_hostname(card->host), card->csd.mmca_vsn);
+                        mmc_card_set_bad(card);
+                        break;
+                }
         }
 }
 
@@ -376,34 +526,86 @@ static void mmc_decode_csd(struct mmc_card *card)
         unsigned int e, m, csd_struct;
         u32 *resp = card->raw_csd;
 
-        /*
-         * We only understand CSD structure v1.1 and v2.
-         * v2 has extra information in bits 15, 11 and 10.
-         */
-        csd_struct = UNSTUFF_BITS(resp, 126, 2);
-        if (csd_struct != 1 && csd_struct != 2) {
-                printk("%s: unrecognised CSD structure version %d\n",
-                        mmc_hostname(card->host), csd_struct);
-                mmc_card_set_bad(card);
-                return;
+        if (mmc_card_sd(card)) {
+                csd_struct = UNSTUFF_BITS(resp, 126, 2);
+                if (csd_struct != 0) {
+                        printk("%s: unrecognised CSD structure version %d\n",
+                                mmc_hostname(card->host), csd_struct);
+                        mmc_card_set_bad(card);
+                        return;
+                }
+
+                m = UNSTUFF_BITS(resp, 115, 4);
+                e = UNSTUFF_BITS(resp, 112, 3);
+                csd->tacc_ns     = (tacc_exp[e] * tacc_mant[m] + 9) / 10;
+                csd->tacc_clks   = UNSTUFF_BITS(resp, 104, 8) * 100;
+
+                m = UNSTUFF_BITS(resp, 99, 4);
+                e = UNSTUFF_BITS(resp, 96, 3);
+                csd->max_dtr      = tran_exp[e] * tran_mant[m];
+                csd->cmdclass     = UNSTUFF_BITS(resp, 84, 12);
+
+                e = UNSTUFF_BITS(resp, 47, 3);
+                m = UNSTUFF_BITS(resp, 62, 12);
+                csd->capacity     = (1 + m) << (e + 2);
+
+                csd->read_blkbits = UNSTUFF_BITS(resp, 80, 4);
+        } else {
+                /*
+                 * We only understand CSD structure v1.1 and v1.2.
+                 * v1.2 has extra information in bits 15, 11 and 10.
+                 */
+                csd_struct = UNSTUFF_BITS(resp, 126, 2);
+                if (csd_struct != 1 && csd_struct != 2) {
+                        printk("%s: unrecognised CSD structure version %d\n",
+                                mmc_hostname(card->host), csd_struct);
+                        mmc_card_set_bad(card);
+                        return;
+                }
+
+                csd->mmca_vsn    = UNSTUFF_BITS(resp, 122, 4);
+                m = UNSTUFF_BITS(resp, 115, 4);
+                e = UNSTUFF_BITS(resp, 112, 3);
+                csd->tacc_ns     = (tacc_exp[e] * tacc_mant[m] + 9) / 10;
+                csd->tacc_clks   = UNSTUFF_BITS(resp, 104, 8) * 100;
+
+                m = UNSTUFF_BITS(resp, 99, 4);
+                e = UNSTUFF_BITS(resp, 96, 3);
+                csd->max_dtr      = tran_exp[e] * tran_mant[m];
+                csd->cmdclass     = UNSTUFF_BITS(resp, 84, 12);
+
+                e = UNSTUFF_BITS(resp, 47, 3);
+                m = UNSTUFF_BITS(resp, 62, 12);
+                csd->capacity     = (1 + m) << (e + 2);
+
+                csd->read_blkbits = UNSTUFF_BITS(resp, 80, 4);
         }
+}
+
+/*
+ * Given a 64-bit response, decode to our card SCR structure.
+ */
+static void mmc_decode_scr(struct mmc_card *card)
+{
+        struct sd_scr *scr = &card->scr;
+        unsigned int scr_struct;
+        u32 resp[4];
 
-        csd->mmca_vsn    = UNSTUFF_BITS(resp, 122, 4);
-        m = UNSTUFF_BITS(resp, 115, 4);
-        e = UNSTUFF_BITS(resp, 112, 3);
-        csd->tacc_ns     = (tacc_exp[e] * tacc_mant[m] + 9) / 10;
-        csd->tacc_clks   = UNSTUFF_BITS(resp, 104, 8) * 100;
+        BUG_ON(!mmc_card_sd(card));
 
-        m = UNSTUFF_BITS(resp, 99, 4);
-        e = UNSTUFF_BITS(resp, 96, 3);
-        csd->max_dtr      = tran_exp[e] * tran_mant[m];
-        csd->cmdclass     = UNSTUFF_BITS(resp, 84, 12);
+        resp[3] = card->raw_scr[1];
+        resp[2] = card->raw_scr[0];
 
-        e = UNSTUFF_BITS(resp, 47, 3);
-        m = UNSTUFF_BITS(resp, 62, 12);
-        csd->capacity     = (1 + m) << (e + 2);
+        scr_struct = UNSTUFF_BITS(resp, 60, 4);
+        if (scr_struct != 0) {
+                printk("%s: unrecognised SCR structure version %d\n",
+                        mmc_hostname(card->host), scr_struct);
+                mmc_card_set_bad(card);
+                return;
+        }
 
-        csd->read_blkbits = UNSTUFF_BITS(resp, 80, 4);
+        scr->sda_vsn = UNSTUFF_BITS(resp, 56, 4);
+        scr->bus_widths = UNSTUFF_BITS(resp, 48, 4);
 }
 
 /*
@@ -457,6 +659,11 @@ static void mmc_idle_cards(struct mmc_host *host)
 {
         struct mmc_command cmd;
 
+        host->ios.chip_select = MMC_CS_HIGH;
+        host->ops->set_ios(host, &host->ios);
+
+        mmc_delay(1);
+
         cmd.opcode = MMC_GO_IDLE_STATE;
         cmd.arg = 0;
         cmd.flags = MMC_RSP_NONE;
@@ -464,6 +671,11 @@ static void mmc_idle_cards(struct mmc_host *host)
         mmc_wait_for_cmd(host, &cmd, 0);
 
         mmc_delay(1);
+
+        host->ios.chip_select = MMC_CS_DONTCARE;
+        host->ops->set_ios(host, &host->ios);
+
+        mmc_delay(1);
 }
 
 /*
@@ -475,7 +687,9 @@ static void mmc_power_up(struct mmc_host *host)
 
         host->ios.vdd = bit;
         host->ios.bus_mode = MMC_BUSMODE_OPENDRAIN;
+        host->ios.chip_select = MMC_CS_DONTCARE;
         host->ios.power_mode = MMC_POWER_UP;
+        host->ios.bus_width = MMC_BUS_WIDTH_1;
         host->ops->set_ios(host, &host->ios);
 
         mmc_delay(1);
@@ -492,7 +706,9 @@ static void mmc_power_off(struct mmc_host *host)
         host->ios.clock = 0;
         host->ios.vdd = 0;
         host->ios.bus_mode = MMC_BUSMODE_OPENDRAIN;
+        host->ios.chip_select = MMC_CS_DONTCARE;
         host->ios.power_mode = MMC_POWER_OFF;
+        host->ios.bus_width = MMC_BUS_WIDTH_1;
         host->ops->set_ios(host, &host->ios);
 }
 
@@ -524,6 +740,34 @@ static int mmc_send_op_cond(struct mmc_host *host, u32 ocr, u32 *rocr)
         return err;
 }
 
+static int mmc_send_app_op_cond(struct mmc_host *host, u32 ocr, u32 *rocr)
+{
+        struct mmc_command cmd;
+        int i, err = 0;
+
+        cmd.opcode = SD_APP_OP_COND;
+        cmd.arg = ocr;
+        cmd.flags = MMC_RSP_R3;
+
+        for (i = 100; i; i--) {
+                err = mmc_wait_for_app_cmd(host, 0, &cmd, CMD_RETRIES);
+                if (err != MMC_ERR_NONE)
+                        break;
+
+                if (cmd.resp[0] & MMC_CARD_BUSY || ocr == 0)
+                        break;
+
+                err = MMC_ERR_TIMEOUT;
+
+                mmc_delay(10);
+        }
+
+        if (rocr)
+                *rocr = cmd.resp[0];
+
+        return err;
+}
+
 /*
  * Discover cards by requesting their CID.  If this command
  * times out, it is not an error; there are no further cards
@@ -567,13 +811,38 @@ static void mmc_discover_cards(struct mmc_host *host)
 
                 card->state &= ~MMC_STATE_DEAD;
 
-                cmd.opcode = MMC_SET_RELATIVE_ADDR;
-                cmd.arg = card->rca << 16;
-                cmd.flags = MMC_RSP_R1;
+                if (host->mode == MMC_MODE_SD) {
+                        mmc_card_set_sd(card);
 
-                err = mmc_wait_for_cmd(host, &cmd, CMD_RETRIES);
-                if (err != MMC_ERR_NONE)
-                        mmc_card_set_dead(card);
+                        cmd.opcode = SD_SEND_RELATIVE_ADDR;
+                        cmd.arg = 0;
+                        cmd.flags = MMC_RSP_R1;
+
+                        err = mmc_wait_for_cmd(host, &cmd, CMD_RETRIES);
+                        if (err != MMC_ERR_NONE)
+                                mmc_card_set_dead(card);
+                        else {
+                                card->rca = cmd.resp[0] >> 16;
+
+                                if (!host->ops->get_ro) {
+                                        printk(KERN_WARNING "%s: host does not "
+                                                "support reading read-only "
+                                                "switch. assuming write-enable.\n",
+                                                mmc_hostname(host));
+                                } else {
+                                        if (host->ops->get_ro(host))
+                                                mmc_card_set_readonly(card);
+                                }
+                        }
+                } else {
+                        cmd.opcode = MMC_SET_RELATIVE_ADDR;
+                        cmd.arg = card->rca << 16;
+                        cmd.flags = MMC_RSP_R1;
+
+                        err = mmc_wait_for_cmd(host, &cmd, CMD_RETRIES);
+                        if (err != MMC_ERR_NONE)
+                                mmc_card_set_dead(card);
+                }
         }
 }
 
@@ -605,6 +874,79 @@ static void mmc_read_csds(struct mmc_host *host)
         }
 }
 
+static void mmc_read_scrs(struct mmc_host *host)
+{
+        int err;
+        struct mmc_card *card;
+
+        struct mmc_request mrq;
+        struct mmc_command cmd;
+        struct mmc_data data;
+
+        struct scatterlist sg;
+
+        list_for_each_entry(card, &host->cards, node) {
+                if (card->state & (MMC_STATE_DEAD|MMC_STATE_PRESENT))
+                        continue;
+                if (!mmc_card_sd(card))
+                        continue;
+
+                err = mmc_select_card(host, card);
+                if (err != MMC_ERR_NONE) {
+                        mmc_card_set_dead(card);
+                        continue;
+                }
+
+                memset(&cmd, 0, sizeof(struct mmc_command));
+
+                cmd.opcode = MMC_APP_CMD;
+                cmd.arg = card->rca << 16;
+                cmd.flags = MMC_RSP_R1;
+
+                err = mmc_wait_for_cmd(host, &cmd, 0);
+                if ((err != MMC_ERR_NONE) || !(cmd.resp[0] & R1_APP_CMD)) {
+                        mmc_card_set_dead(card);
+                        continue;
+                }
+
+                memset(&cmd, 0, sizeof(struct mmc_command));
+
+                cmd.opcode = SD_APP_SEND_SCR;
+                cmd.arg = 0;
+                cmd.flags = MMC_RSP_R1;
+
+                memset(&data, 0, sizeof(struct mmc_data));
+
+                data.timeout_ns = card->csd.tacc_ns * 10;
+                data.timeout_clks = card->csd.tacc_clks * 10;
+                data.blksz_bits = 3;
+                data.blocks = 1;
+                data.flags = MMC_DATA_READ;
+                data.sg = &sg;
+                data.sg_len = 1;
+
+                memset(&mrq, 0, sizeof(struct mmc_request));
+
+                mrq.cmd = &cmd;
+                mrq.data = &data;
+
+                sg_init_one(&sg, (u8*)card->raw_scr, 8);
+
+                err = mmc_wait_for_req(host, &mrq);
+                if (err != MMC_ERR_NONE) {
+                        mmc_card_set_dead(card);
+                        continue;
+                }
+
+                card->raw_scr[0] = ntohl(card->raw_scr[0]);
+                card->raw_scr[1] = ntohl(card->raw_scr[1]);
+
+                mmc_decode_scr(card);
+        }
+
+        mmc_deselect_cards(host);
+}
+
 static unsigned int mmc_calculate_clock(struct mmc_host *host)
 {
         struct mmc_card *card;
@@ -657,12 +999,24 @@ static void mmc_setup(struct mmc_host *host)
                 int err;
                 u32 ocr;
 
+                host->mode = MMC_MODE_SD;
+
                 mmc_power_up(host);
                 mmc_idle_cards(host);
 
-                err = mmc_send_op_cond(host, 0, &ocr);
-                if (err != MMC_ERR_NONE)
-                        return;
+                err = mmc_send_app_op_cond(host, 0, &ocr);
+
+                /*
+                 * If we fail to detect any SD cards then try
+                 * searching for MMC cards.
+                 */
+                if (err != MMC_ERR_NONE) {
+                        host->mode = MMC_MODE_MMC;
+
+                        err = mmc_send_op_cond(host, 0, &ocr);
+                        if (err != MMC_ERR_NONE)
+                                return;
+                }
 
                 host->ocr = mmc_select_voltage(host, ocr);
 
@@ -702,7 +1056,10 @@ static void mmc_setup(struct mmc_host *host)
          * all get the idea that they should be ready for CMD2.
          * (My SanDisk card seems to need this.)
          */
-        mmc_send_op_cond(host, host->ocr, NULL);
+        if (host->mode == MMC_MODE_SD)
+                mmc_send_app_op_cond(host, host->ocr, NULL);
+        else
+                mmc_send_op_cond(host, host->ocr, NULL);
 
         mmc_discover_cards(host);
 
@@ -713,6 +1070,9 @@ static void mmc_setup(struct mmc_host *host)
         host->ops->set_ios(host, &host->ios);
 
         mmc_read_csds(host);
+
+        if (host->mode == MMC_MODE_SD)
+                mmc_read_scrs(host);
 }
 
 
diff --git a/drivers/mmc/mmc_block.c b/drivers/mmc/mmc_block.c
index d4eee99c2bf..fa83f15fdf1 100644
--- a/drivers/mmc/mmc_block.c
+++ b/drivers/mmc/mmc_block.c
@@ -95,6 +95,10 @@ static int mmc_blk_open(struct inode *inode, struct file *filp)
                 if (md->usage == 2)
                         check_disk_change(inode->i_bdev);
                 ret = 0;
+
+                if ((filp->f_mode & FMODE_WRITE) &&
+                        mmc_card_readonly(md->queue.card))
+                        ret = -EROFS;
         }
 
         return ret;
@@ -403,9 +407,10 @@ static int mmc_blk_probe(struct mmc_card *card)
         if (err)
                 goto out;
 
-        printk(KERN_INFO "%s: %s %s %dKiB\n",
+        printk(KERN_INFO "%s: %s %s %dKiB %s\n",
                 md->disk->disk_name, mmc_card_id(card), mmc_card_name(card),
-                (card->csd.capacity << card->csd.read_blkbits) / 1024);
+                (card->csd.capacity << card->csd.read_blkbits) / 1024,
+                mmc_card_readonly(card)?"(ro)":"");
 
         mmc_set_drvdata(card, md);
         add_disk(md->disk);
diff --git a/drivers/mmc/mmc_sysfs.c b/drivers/mmc/mmc_sysfs.c
index ad8949810fc..3f4a66ca955 100644
--- a/drivers/mmc/mmc_sysfs.c
+++ b/drivers/mmc/mmc_sysfs.c
@@ -34,6 +34,7 @@ MMC_ATTR(cid, "%08x%08x%08x%08x\n", card->raw_cid[0], card->raw_cid[1],
         card->raw_cid[2], card->raw_cid[3]);
 MMC_ATTR(csd, "%08x%08x%08x%08x\n", card->raw_csd[0], card->raw_csd[1],
         card->raw_csd[2], card->raw_csd[3]);
+MMC_ATTR(scr, "%08x%08x\n", card->raw_scr[0], card->raw_scr[1]);
 MMC_ATTR(date, "%02d/%04d\n", card->cid.month, card->cid.year);
 MMC_ATTR(fwrev, "0x%x\n", card->cid.fwrev);
 MMC_ATTR(hwrev, "0x%x\n", card->cid.hwrev);
@@ -57,6 +58,8 @@ static struct device_attribute mmc_dev_attrs[] = {
         __ATTR_NULL
 };
 
+static struct device_attribute mmc_dev_attr_scr = MMC_ATTR_RO(scr);
+
 
 static void mmc_release_card(struct device *dev)
 {
@@ -207,10 +210,20 @@ void mmc_init_card(struct mmc_card *card, struct mmc_host *host)
  */
 int mmc_register_card(struct mmc_card *card)
 {
+        int ret;
+
         snprintf(card->dev.bus_id, sizeof(card->dev.bus_id),
                  "%s:%04x", mmc_hostname(card->host), card->rca);
 
-        return device_add(&card->dev);
+        ret = device_add(&card->dev);
+        if (ret == 0) {
+                if (mmc_card_sd(card)) {
+                        ret = device_create_file(&card->dev, &mmc_dev_attr_scr);
+                        if (ret)
+                                device_del(&card->dev);
+                }
+        }
+        return ret;
 }
 
 /*
@@ -219,8 +232,12 @@ int mmc_register_card(struct mmc_card *card)
  */
 void mmc_remove_card(struct mmc_card *card)
 {
-        if (mmc_card_present(card))
+        if (mmc_card_present(card)) {
+                if (mmc_card_sd(card))
+                        device_remove_file(&card->dev, &mmc_dev_attr_scr);
+
                 device_del(&card->dev);
+        }
 
         put_device(&card->dev);
 }
diff --git a/drivers/mmc/pxamci.c b/drivers/mmc/pxamci.c
index b78beb1b015..e99a53b09e3 100644
--- a/drivers/mmc/pxamci.c
+++ b/drivers/mmc/pxamci.c
@@ -362,6 +362,16 @@ static void pxamci_request(struct mmc_host *mmc, struct mmc_request *mrq)
         pxamci_start_cmd(host, mrq->cmd, cmdat);
 }
 
+static int pxamci_get_ro(struct mmc_host *mmc)
+{
+        struct pxamci_host *host = mmc_priv(mmc);
+
+        if (host->pdata && host->pdata->get_ro)
+                return host->pdata->get_ro(mmc->dev);
+        /* Host doesn't support read only detection so assume writeable */
+        return 0;
+}
+
 static void pxamci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
 {
         struct pxamci_host *host = mmc_priv(mmc);
@@ -401,6 +411,7 @@ static void pxamci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
 
 static struct mmc_host_ops pxamci_ops = {
         .request        = pxamci_request,
+        .get_ro         = pxamci_get_ro,
         .set_ios        = pxamci_set_ios,
 };
 
diff --git a/drivers/mmc/wbsd.c b/drivers/mmc/wbsd.c
index 402c2d661fb..dec01d38c78 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.3"
+#define DRIVER_VERSION "1.4"
 
 #ifdef CONFIG_MMC_DEBUG
 #define DBG(x...) \
@@ -720,11 +720,28 @@ static void wbsd_prepare_data(struct wbsd_host* host, struct mmc_data* data)
          * calculate CRC.
          *
          * Space for CRC must be included in the size.
+         * Two bytes are needed for each data line.
          */
-        blksize = (1 << data->blksz_bits) + 2;
+        if (host->bus_width == MMC_BUS_WIDTH_1)
+        {
+                blksize = (1 << data->blksz_bits) + 2;
+
+                wbsd_write_index(host, WBSD_IDX_PBSMSB, (blksize >> 4) & 0xF0);
+                wbsd_write_index(host, WBSD_IDX_PBSLSB, blksize & 0xFF);
+        }
+        else if (host->bus_width == MMC_BUS_WIDTH_4)
+        {
+                blksize = (1 << data->blksz_bits) + 2 * 4;
         
-        wbsd_write_index(host, WBSD_IDX_PBSMSB, (blksize >> 4) & 0xF0);
-        wbsd_write_index(host, WBSD_IDX_PBSLSB, blksize & 0xFF);
+                wbsd_write_index(host, WBSD_IDX_PBSMSB, ((blksize >> 4) & 0xF0)
+                        | WBSD_DATA_WIDTH);
+                wbsd_write_index(host, WBSD_IDX_PBSLSB, blksize & 0xFF);
+        }
+        else
+        {
+                data->error = MMC_ERR_INVALID;
+                return;
+        }
 
         /*
          * Clear the FIFO. This is needed even for DMA
@@ -960,8 +977,9 @@ static void wbsd_set_ios(struct mmc_host* mmc, struct mmc_ios* ios)
         struct wbsd_host* host = mmc_priv(mmc);
         u8 clk, setup, pwr;
         
-        DBGF("clock %uHz busmode %u powermode %u Vdd %u\n",
-                ios->clock, ios->bus_mode, ios->power_mode, ios->vdd);
+        DBGF("clock %uHz busmode %u powermode %u cs %u Vdd %u width %u\n",
+             ios->clock, ios->bus_mode, ios->power_mode, ios->chip_select,
+             ios->vdd, ios->bus_width);
 
         spin_lock_bh(&host->lock);
 
@@ -1003,30 +1021,63 @@ static void wbsd_set_ios(struct mmc_host* mmc, struct mmc_ios* ios)
 
         /*
          * MMC cards need to have pin 1 high during init.
-         * Init time corresponds rather nicely with the bus mode.
          * It wreaks havoc with the card detection though so
-         * that needs to be disabed.
+         * that needs to be disabled.
          */
         setup = wbsd_read_index(host, WBSD_IDX_SETUP);
-        if ((ios->power_mode == MMC_POWER_ON) &&
-                (ios->bus_mode == MMC_BUSMODE_OPENDRAIN))
+        if (ios->chip_select == MMC_CS_HIGH)
         {
+                BUG_ON(ios->bus_width != MMC_BUS_WIDTH_1);
                 setup |= WBSD_DAT3_H;
                 host->flags |= WBSD_FIGNORE_DETECT;
         }
         else
         {
                 setup &= ~WBSD_DAT3_H;
-                host->flags &= ~WBSD_FIGNORE_DETECT;
+
+                /*
+                 * We cannot resume card detection immediatly
+                 * because of capacitance and delays in the chip.
+                 */
+                mod_timer(&host->ignore_timer, jiffies + HZ/100);
         }
         wbsd_write_index(host, WBSD_IDX_SETUP, setup);
         
+        /*
+         * Store bus width for later. Will be used when
+         * setting up the data transfer.
+         */
+        host->bus_width = ios->bus_width;
+
+        spin_unlock_bh(&host->lock);
+}
+
+static int wbsd_get_ro(struct mmc_host* mmc)
+{
+        struct wbsd_host* host = mmc_priv(mmc);
+        u8 csr;
+
+        spin_lock_bh(&host->lock);
+
+        csr = inb(host->base + WBSD_CSR);
+        csr |= WBSD_MSLED;
+        outb(csr, host->base + WBSD_CSR);
+
+        mdelay(1);
+
+        csr = inb(host->base + WBSD_CSR);
+        csr &= ~WBSD_MSLED;
+        outb(csr, host->base + WBSD_CSR);
+
         spin_unlock_bh(&host->lock);
+
+        return csr & WBSD_WRPT;
 }
 
 static struct mmc_host_ops wbsd_ops = {
         .request        = wbsd_request,
         .set_ios        = wbsd_set_ios,
+        .get_ro         = wbsd_get_ro,
 };
 
 /*****************************************************************************\
@@ -1036,6 +1087,31 @@ static struct mmc_host_ops wbsd_ops = {
 \*****************************************************************************/
 
 /*
+ * Helper function to reset detection ignore
+ */
+
+static void wbsd_reset_ignore(unsigned long data)
+{
+        struct wbsd_host *host = (struct wbsd_host*)data;
+
+        BUG_ON(host == NULL);
+
+        DBG("Resetting card detection ignore\n");
+
+        spin_lock_bh(&host->lock);
+
+        host->flags &= ~WBSD_FIGNORE_DETECT;
+
+        /*
+         * Card status might have changed during the
+         * blackout.
+         */
+        tasklet_schedule(&host->card_tasklet);
+
+        spin_unlock_bh(&host->lock);
+}
+
+/*
  * Helper function for card detection
  */
 static void wbsd_detect_card(unsigned long data)
@@ -1097,7 +1173,7 @@ static void wbsd_tasklet_card(unsigned long param)
                          * Delay card detection to allow electrical connections
                          * to stabilise.
                          */
-                        mod_timer(&host->timer, jiffies + HZ/2);
+                        mod_timer(&host->detect_timer, jiffies + HZ/2);
                 }
                 
                 spin_unlock(&host->lock);
@@ -1124,6 +1200,8 @@ static void wbsd_tasklet_card(unsigned long param)
 
                 mmc_detect_change(host->mmc);
         }
+        else
+                spin_unlock(&host->lock);
 }
 
 static void wbsd_tasklet_fifo(unsigned long param)
@@ -1324,15 +1402,20 @@ static int __devinit wbsd_alloc_mmc(struct device* dev)
         mmc->f_min = 375000;
         mmc->f_max = 24000000;
         mmc->ocr_avail = MMC_VDD_32_33|MMC_VDD_33_34;
+        mmc->caps = MMC_CAP_4_BIT_DATA;
         
         spin_lock_init(&host->lock);
         
         /*
-         * Set up detection timer
+         * Set up timers
          */
-        init_timer(&host->timer);
-        host->timer.data = (unsigned long)host;
-        host->timer.function = wbsd_detect_card;
+        init_timer(&host->detect_timer);
+        host->detect_timer.data = (unsigned long)host;
+        host->detect_timer.function = wbsd_detect_card;
+
+        init_timer(&host->ignore_timer);
+        host->ignore_timer.data = (unsigned long)host;
+        host->ignore_timer.function = wbsd_reset_ignore;
         
         /*
          * Maximum number of segments. Worst case is one sector per segment
@@ -1370,7 +1453,8 @@ static void __devexit wbsd_free_mmc(struct device* dev)
         host = mmc_priv(mmc);
         BUG_ON(host == NULL);
         
-        del_timer_sync(&host->timer);
+        del_timer_sync(&host->ignore_timer);
+        del_timer_sync(&host->detect_timer);
         
         mmc_free_host(mmc);
         
diff --git a/drivers/mmc/wbsd.h b/drivers/mmc/wbsd.h
index 661a9f6a6e6..9005b5241b3 100644
--- a/drivers/mmc/wbsd.h
+++ b/drivers/mmc/wbsd.h
@@ -106,6 +106,8 @@
 #define WBSD_CLK_16M            0x02
 #define WBSD_CLK_24M            0x03
 
+#define WBSD_DATA_WIDTH         0x01
+
 #define WBSD_DAT3_H             0x08
 #define WBSD_FIFO_RESET         0x04
 #define WBSD_SOFT_RESET         0x02
@@ -164,6 +166,7 @@ struct wbsd_host
         int                     firsterr;       /* See fifo functions */
         
         u8                      clk;            /* Current clock speed */
+        unsigned char           bus_width;      /* Current bus width */
         
         int                     config;         /* Config port */
         u8                      unlock_code;    /* Code to unlock config */
@@ -181,5 +184,6 @@ struct wbsd_host
         struct tasklet_struct   finish_tasklet;
         struct tasklet_struct   block_tasklet;
         
-        struct timer_list       timer;          /* Card detection timer */
+        struct timer_list       detect_timer;   /* Card detection timer */
+        struct timer_list       ignore_timer;   /* Ignore detection timer */
 };
diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
index eee5115658c..04e54318bc6 100644
--- a/drivers/mtd/nand/nand_base.c
+++ b/drivers/mtd/nand/nand_base.c
@@ -526,6 +526,7 @@ static void nand_wait_ready(struct mtd_info *mtd)
         do {
                 if (this->dev_ready(mtd))
                         return;
+                touch_softlockup_watchdog();
         } while (time_before(jiffies, timeo));  
 }
 
diff --git a/drivers/net/3c59x.c b/drivers/net/3c59x.c
index 07746b95fd8..455ba915ede 100644
--- a/drivers/net/3c59x.c
+++ b/drivers/net/3c59x.c
@@ -973,6 +973,11 @@ static int vortex_suspend (struct pci_dev *pdev, pm_message_t state)
                         netif_device_detach(dev);
                         vortex_down(dev, 1);
                 }
+                pci_save_state(pdev);
+                pci_enable_wake(pdev, pci_choose_state(pdev, state), 0);
+                free_irq(dev->irq, dev);
+                pci_disable_device(pdev);
+                pci_set_power_state(pdev, pci_choose_state(pdev, state));
         }
         return 0;
 }
@@ -980,8 +985,19 @@ static int vortex_suspend (struct pci_dev *pdev, pm_message_t state)
 static int vortex_resume (struct pci_dev *pdev)
 {
         struct net_device *dev = pci_get_drvdata(pdev);
+        struct vortex_private *vp = netdev_priv(dev);
 
-        if (dev && dev->priv) {
+        if (dev && vp) {
+                pci_set_power_state(pdev, PCI_D0);
+                pci_restore_state(pdev);
+                pci_enable_device(pdev);
+                pci_set_master(pdev);
+                if (request_irq(dev->irq, vp->full_bus_master_rx ?
+                                &boomerang_interrupt : &vortex_interrupt, SA_SHIRQ, dev->name, dev)) {
+                        printk(KERN_WARNING "%s: Could not reserve IRQ %d\n", dev->name, dev->irq);
+                        pci_disable_device(pdev);
+                        return -EBUSY;
+                }
                 if (netif_running(dev)) {
                         vortex_up(dev);
                         netif_device_attach(dev);
@@ -1873,6 +1889,7 @@ vortex_timer(unsigned long data)
                 {
                         spin_lock_bh(&vp->lock);
                         mii_status = mdio_read(dev, vp->phys[0], 1);
+                        mii_status = mdio_read(dev, vp->phys[0], 1);
                         ok = 1;
                         if (vortex_debug > 2)
                                 printk(KERN_DEBUG "%s: MII transceiver has status %4.4x.\n",
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 7d8bcb38797..6bb9232514b 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -397,7 +397,7 @@ config SUN3LANCE
           If you're not building a kernel for a Sun 3, say N.
 
 config SUN3_82586
-        tristate "Sun3 on-board Intel 82586 support"
+        bool "Sun3 on-board Intel 82586 support"
         depends on NET_ETHERNET && SUN3
         help
           This driver enables support for the on-board Intel 82586 based
@@ -1924,12 +1924,15 @@ config R8169_VLAN
           If in doubt, say Y.
 
 config SIS190
-        tristate "SiS190 gigabit ethernet support"
+        tristate "SiS190/SiS191 gigabit ethernet support"
         depends on PCI
         select CRC32
         select MII
         ---help---
-          Say Y here if you have a SiS 190 PCI Gigabit Ethernet adapter.
+          Say Y here if you have a SiS 190 PCI Fast Ethernet adapter or
+          a SiS 191 PCI Gigabit Ethernet adapter. Both are expected to
+          appear in lan on motherboard designs which are based on SiS 965
+          and SiS 966 south bridge.
 
           To compile this driver as a module, choose M here: the module
           will be called sis190.  This is recommended.
@@ -2055,6 +2058,13 @@ config BNX2
           To compile this driver as a module, choose M here: the module
           will be called bnx2.  This is recommended.
 
+config SPIDER_NET
+        tristate "Spider Gigabit Ethernet driver"
+        depends on PCI && PPC_BPA
+        help
+          This driver supports the Gigabit Ethernet chips present on the
+          Cell Processor-Based Blades from IBM.
+
 config GIANFAR
         tristate "Gianfar Ethernet"
         depends on 85xx || 83xx
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 5baafcd5561..8645c843cf4 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -54,6 +54,8 @@ obj-$(CONFIG_STNIC) += stnic.o 8390.o
 obj-$(CONFIG_FEALNX) += fealnx.o
 obj-$(CONFIG_TIGON3) += tg3.o
 obj-$(CONFIG_BNX2) += bnx2.o
+spidernet-y += spider_net.o spider_net_ethtool.o sungem_phy.o
+obj-$(CONFIG_SPIDER_NET) += spidernet.o
 obj-$(CONFIG_TC35815) += tc35815.o
 obj-$(CONFIG_SKGE) += skge.o
 obj-$(CONFIG_SK98LIN) += sk98lin/
diff --git a/drivers/net/ac3200.c b/drivers/net/ac3200.c
index 91791ba3776..8a0af5453e2 100644
--- a/drivers/net/ac3200.c
+++ b/drivers/net/ac3200.c
@@ -275,7 +275,7 @@ static int __init ac_probe1(int ioaddr, struct net_device *dev)
         return 0;
 out2:
         if (ei_status.reg0)
-                iounmap((void *)dev->mem_start);
+                iounmap(ei_status.mem);
 out1:
         free_irq(dev->irq, dev);
 out:
diff --git a/drivers/net/arcnet/arcnet.c b/drivers/net/arcnet/arcnet.c
index 4f9f69e22c1..12ef52c193a 100644
--- a/drivers/net/arcnet/arcnet.c
+++ b/drivers/net/arcnet/arcnet.c
@@ -597,7 +597,7 @@ static int arcnet_send_packet(struct sk_buff *skb, struct net_device *dev)
         struct ArcProto *proto;
         int txbuf;
         unsigned long flags;
-        int freeskb = 0;
+        int freeskb, retval;
 
         BUGMSG(D_DURING,
                "transmit requested (status=%Xh, txbufs=%d/%d, len=%d, protocol %x)\n",
@@ -615,7 +615,7 @@ static int arcnet_send_packet(struct sk_buff *skb, struct net_device *dev)
         if (skb->len - ARC_HDR_SIZE > XMTU && !proto->continue_tx) {
                 BUGMSG(D_NORMAL, "fixme: packet too large: compensating badly!\n");
                 dev_kfree_skb(skb);
-                return 0;       /* don't try again */
+                return NETDEV_TX_OK;    /* don't try again */
         }
 
         /* We're busy transmitting a packet... */
@@ -623,8 +623,11 @@ static int arcnet_send_packet(struct sk_buff *skb, struct net_device *dev)
 
         spin_lock_irqsave(&lp->lock, flags);
         AINTMASK(0);
-
-        txbuf = get_arcbuf(dev);
+        if(lp->next_tx == -1)
+                txbuf = get_arcbuf(dev);
+        else {
+                txbuf = -1;
+        }
         if (txbuf != -1) {
                 if (proto->prepare_tx(dev, pkt, skb->len, txbuf) &&
                     !proto->ack_tx) {
@@ -638,6 +641,8 @@ static int arcnet_send_packet(struct sk_buff *skb, struct net_device *dev)
                         lp->outgoing.skb = skb;
                         lp->outgoing.pkt = pkt;
 
+                        freeskb = 0;
+
                         if (proto->continue_tx &&
                             proto->continue_tx(dev, txbuf)) {
                           BUGMSG(D_NORMAL,
@@ -645,10 +650,12 @@ static int arcnet_send_packet(struct sk_buff *skb, struct net_device *dev)
                                  "(proto='%c')\n", proto->suffix);
                         }
                 }
-
+                retval = NETDEV_TX_OK;
+                dev->trans_start = jiffies;
                 lp->next_tx = txbuf;
         } else {
-                freeskb = 1;
+                retval = NETDEV_TX_BUSY;
+                freeskb = 0;
         }
 
         BUGMSG(D_DEBUG, "%s: %d: %s, status: %x\n",__FILE__,__LINE__,__FUNCTION__,ASTATUS());
@@ -664,7 +671,7 @@ static int arcnet_send_packet(struct sk_buff *skb, struct net_device *dev)
         if (freeskb) {
                 dev_kfree_skb(skb);
         }
-        return 0;               /* no need to try again */
+        return retval;          /* no need to try again */
 }
 
 
@@ -690,7 +697,6 @@ static int go_tx(struct net_device *dev)
         /* start sending */
         ACOMMAND(TXcmd | (lp->cur_tx << 3));
 
-        dev->trans_start = jiffies;
         lp->stats.tx_packets++;
         lp->lasttrans_dest = lp->lastload_dest;
         lp->lastload_dest = 0;
@@ -917,6 +923,9 @@ irqreturn_t arcnet_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 
                         BUGMSG(D_RECON, "Network reconfiguration detected (status=%Xh)\n",
                                status);
+                        /* MYRECON bit is at bit 7 of diagstatus */
+                        if(diagstatus & 0x80)
+                                BUGMSG(D_RECON,"Put out that recon myself\n");
 
                         /* is the RECON info empty or old? */
                         if (!lp->first_recon || !lp->last_recon ||
diff --git a/drivers/net/atarilance.c b/drivers/net/atarilance.c
index ad011214c7f..e01b6a78ec6 100644
--- a/drivers/net/atarilance.c
+++ b/drivers/net/atarilance.c
@@ -235,7 +235,7 @@ struct lance_private {
 #define MEM             lp->mem
 #define DREG    IO->data
 #define AREG    IO->addr
-#define REGA(a) ( AREG = (a), DREG )
+#define REGA(a) (*( AREG = (a), &DREG ))
 
 /* Definitions for packet buffer access: */
 #define PKT_BUF_SZ              1544
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index 7babf6af4e2..55a72c7ad00 100644
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -2004,14 +2004,14 @@ bnx2_init_cpus(struct bnx2 *bp)
 }
 
 static int
-bnx2_set_power_state(struct bnx2 *bp, int state)
+bnx2_set_power_state(struct bnx2 *bp, pci_power_t state)
 {
         u16 pmcsr;
 
         pci_read_config_word(bp->pdev, bp->pm_cap + PCI_PM_CTRL, &pmcsr);
 
         switch (state) {
-        case 0: {
+        case PCI_D0: {
                 u32 val;
 
                 pci_write_config_word(bp->pdev, bp->pm_cap + PCI_PM_CTRL,
@@ -2032,7 +2032,7 @@ bnx2_set_power_state(struct bnx2 *bp, int state)
                 REG_WR(bp, BNX2_RPM_CONFIG, val);
                 break;
         }
-        case 3: {
+        case PCI_D3hot: {
                 int i;
                 u32 val, wol_msg;
 
@@ -3886,7 +3886,7 @@ bnx2_open(struct net_device *dev)
         struct bnx2 *bp = dev->priv;
         int rc;
 
-        bnx2_set_power_state(bp, 0);
+        bnx2_set_power_state(bp, PCI_D0);
         bnx2_disable_int(bp);
 
         rc = bnx2_alloc_mem(bp);
@@ -4197,7 +4197,7 @@ bnx2_close(struct net_device *dev)
         bnx2_free_mem(bp);
         bp->link_up = 0;
         netif_carrier_off(bp->dev);
-        bnx2_set_power_state(bp, 3);
+        bnx2_set_power_state(bp, PCI_D3hot);
         return 0;
 }
 
@@ -5203,7 +5203,7 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev)
                                BNX2_PCICFG_MISC_CONFIG_REG_WINDOW_ENA |
                                BNX2_PCICFG_MISC_CONFIG_TARGET_MB_WORD_SWAP);
 
-        bnx2_set_power_state(bp, 0);
+        bnx2_set_power_state(bp, PCI_D0);
 
         bp->chip_id = REG_RD(bp, BNX2_MISC_ID);
 
@@ -5495,7 +5495,7 @@ bnx2_remove_one(struct pci_dev *pdev)
 }
 
 static int
-bnx2_suspend(struct pci_dev *pdev, u32 state)
+bnx2_suspend(struct pci_dev *pdev, pm_message_t state)
 {
         struct net_device *dev = pci_get_drvdata(pdev);
         struct bnx2 *bp = dev->priv;
@@ -5513,7 +5513,7 @@ bnx2_suspend(struct pci_dev *pdev, u32 state)
                 reset_code = BNX2_DRV_MSG_CODE_SUSPEND_NO_WOL;
         bnx2_reset_chip(bp, reset_code);
         bnx2_free_skbs(bp);
-        bnx2_set_power_state(bp, state);
+        bnx2_set_power_state(bp, pci_choose_state(pdev, state));
         return 0;
 }
 
@@ -5526,7 +5526,7 @@ bnx2_resume(struct pci_dev *pdev)
         if (!netif_running(dev))
                 return 0;
 
-        bnx2_set_power_state(bp, 0);
+        bnx2_set_power_state(bp, PCI_D0);
         netif_device_attach(dev);
         bnx2_init_nic(bp);
         bnx2_netif_start(bp);
diff --git a/drivers/net/chelsio/common.h b/drivers/net/chelsio/common.h
index f09348802b4..bf3e7b6a7a1 100644
--- a/drivers/net/chelsio/common.h
+++ b/drivers/net/chelsio/common.h
@@ -88,7 +88,7 @@ struct t1_rx_mode {
 
 static inline u8 *t1_get_next_mcaddr(struct t1_rx_mode *rm)
 {
-        u8 *addr = 0;
+        u8 *addr = NULL;
 
         if (rm->idx++ < rm->dev->mc_count) {
                 addr = rm->list->dmi_addr;
@@ -190,7 +190,7 @@ struct sge;
 struct peespi;
 
 struct adapter {
-        u8 *regs;
+        u8 __iomem *regs;
         struct pci_dev *pdev;
         unsigned long registered_device_map;
         unsigned long open_device_map;
diff --git a/drivers/net/chelsio/cxgb2.c b/drivers/net/chelsio/cxgb2.c
index 28ae478b386..349ebe783ed 100644
--- a/drivers/net/chelsio/cxgb2.c
+++ b/drivers/net/chelsio/cxgb2.c
@@ -824,7 +824,7 @@ static void cxgb_proc_cleanup(struct adapter *adapter,
 static int t1_ioctl(struct net_device *dev, struct ifreq *req, int cmd)
 {
         struct adapter *adapter = dev->priv;
-        struct mii_ioctl_data *data = (struct mii_ioctl_data *)&req->ifr_data;
+        struct mii_ioctl_data *data = if_mii(req);
 
         switch (cmd) {
         case SIOCGMIIPHY:
diff --git a/drivers/net/dm9000.c b/drivers/net/dm9000.c
index 6440a892bb8..e54fc10f684 100644
--- a/drivers/net/dm9000.c
+++ b/drivers/net/dm9000.c
@@ -1140,7 +1140,7 @@ dm9000_phy_write(struct net_device *dev, int phyaddr_unused, int reg, int value)
 }
 
 static int
-dm9000_drv_suspend(struct device *dev, u32 state, u32 level)
+dm9000_drv_suspend(struct device *dev, pm_message_t state, u32 level)
 {
         struct net_device *ndev = dev_get_drvdata(dev);
 
diff --git a/drivers/net/e1000/e1000_hw.h b/drivers/net/e1000/e1000_hw.h
index 93e9f878875..51c2b3a18b6 100644
--- a/drivers/net/e1000/e1000_hw.h
+++ b/drivers/net/e1000/e1000_hw.h
@@ -1270,7 +1270,7 @@ struct e1000_hw_stats {
 
 /* Structure containing variables used by the shared code (e1000_hw.c) */
 struct e1000_hw {
-    uint8_t *hw_addr;
+    uint8_t __iomem *hw_addr;
     uint8_t *flash_address;
     e1000_mac_type mac_type;
     e1000_phy_type phy_type;
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 9b596e0bbf9..7c8a0a22dcd 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -162,7 +162,7 @@ static void e1000_vlan_rx_add_vid(struct net_device *netdev, uint16_t vid);
 static void e1000_vlan_rx_kill_vid(struct net_device *netdev, uint16_t vid);
 static void e1000_restore_vlan(struct e1000_adapter *adapter);
 
-static int e1000_suspend(struct pci_dev *pdev, uint32_t state);
+static int e1000_suspend(struct pci_dev *pdev, pm_message_t state);
 #ifdef CONFIG_PM
 static int e1000_resume(struct pci_dev *pdev);
 #endif
@@ -3642,7 +3642,7 @@ e1000_set_spd_dplx(struct e1000_adapter *adapter, uint16_t spddplx)
 }
 
 static int
-e1000_suspend(struct pci_dev *pdev, uint32_t state)
+e1000_suspend(struct pci_dev *pdev, pm_message_t state)
 {
         struct net_device *netdev = pci_get_drvdata(pdev);
         struct e1000_adapter *adapter = netdev_priv(netdev);
@@ -3726,9 +3726,7 @@ e1000_suspend(struct pci_dev *pdev, uint32_t state)
         }
 
         pci_disable_device(pdev);
-
-        state = (state > 0) ? 3 : 0;
-        pci_set_power_state(pdev, state);
+        pci_set_power_state(pdev, pci_choose_state(pdev, state));
 
         return 0;
 }
@@ -3741,13 +3739,13 @@ e1000_resume(struct pci_dev *pdev)
         struct e1000_adapter *adapter = netdev_priv(netdev);
         uint32_t manc, ret_val, swsm;
 
-        pci_set_power_state(pdev, 0);
+        pci_set_power_state(pdev, PCI_D0);
         pci_restore_state(pdev);
         ret_val = pci_enable_device(pdev);
         pci_set_master(pdev);
 
-        pci_enable_wake(pdev, 3, 0);
-        pci_enable_wake(pdev, 4, 0); /* 4 == D3 cold */
+        pci_enable_wake(pdev, PCI_D3hot, 0);
+        pci_enable_wake(pdev, PCI_D3cold, 0);
 
         e1000_reset(adapter);
         E1000_WRITE_REG(&adapter->hw, WUS, ~0);
diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c
index 7d93948aec8..d6eefdb71c1 100644
--- a/drivers/net/forcedeth.c
+++ b/drivers/net/forcedeth.c
@@ -1372,7 +1372,7 @@ static int nv_change_mtu(struct net_device *dev, int new_mtu)
 
         /* synchronized against open : rtnl_lock() held by caller */
         if (netif_running(dev)) {
-                u8 *base = get_hwbase(dev);
+                u8 __iomem *base = get_hwbase(dev);
                 /*
                  * It seems that the nic preloads valid ring entries into an
                  * internal buffer. The procedure for flushing everything is
@@ -1423,7 +1423,7 @@ static int nv_change_mtu(struct net_device *dev, int new_mtu)
 
 static void nv_copy_mac_to_hw(struct net_device *dev)
 {
-        u8 *base = get_hwbase(dev);
+        u8 __iomem *base = get_hwbase(dev);
         u32 mac[2];
 
         mac[0] = (dev->dev_addr[0] << 0) + (dev->dev_addr[1] << 8) +
diff --git a/drivers/net/hamachi.c b/drivers/net/hamachi.c
index d9df1d9a573..bc9a3bf8d56 100644
--- a/drivers/net/hamachi.c
+++ b/drivers/net/hamachi.c
@@ -204,6 +204,10 @@ KERN_INFO "   Further modifications by Keith Underwood <keithu@parl.clemson.edu>
 
 #define RUN_AT(x) (jiffies + (x))
 
+#ifndef ADDRLEN
+#define ADDRLEN 32
+#endif
+
 /* Condensed bus+endian portability operations. */
 #if ADDRLEN == 64
 #define cpu_to_leXX(addr)       cpu_to_le64(addr)
diff --git a/drivers/net/irda/smsc-ircc2.c b/drivers/net/irda/smsc-ircc2.c
index 10125a1dba2..dd89bda1f13 100644
--- a/drivers/net/irda/smsc-ircc2.c
+++ b/drivers/net/irda/smsc-ircc2.c
@@ -4,10 +4,10 @@
  * Description:   Driver for the SMC Infrared Communications Controller
  * Status:        Experimental.
  * Author:        Daniele Peri (peri@csai.unipa.it)
- * Created at:    
- * Modified at:   
- * Modified by:   
- * 
+ * Created at:
+ * Modified at:
+ * Modified by:
+ *
  *     Copyright (c) 2002      Daniele Peri
  *     All Rights Reserved.
  *     Copyright (c) 2002      Jean Tourrilhes
@@ -17,26 +17,26 @@
  *
  *     Copyright (c) 2001      Stefani Seibold
  *     Copyright (c) 1999-2001 Dag Brattli
- *     Copyright (c) 1998-1999 Thomas Davis, 
+ *     Copyright (c) 1998-1999 Thomas Davis,
  *
  *      and irport.c:
  *
  *     Copyright (c) 1997, 1998, 1999-2000 Dag Brattli, All Rights Reserved.
  *
- * 
- *     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 of 
+ *
+ *     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 of
  *     the License, 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.
- * 
- *     You should have received a copy of the GNU General Public License 
- *     along with this program; if not, write to the Free Software 
- *     Foundation, Inc., 59 Temple Place, Suite 330, Boston, 
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program; if not, write to the Free Software
+ *     Foundation, Inc., 59 Temple Place, Suite 330, Boston,
  *     MA 02111-1307 USA
  *
  ********************************************************************/
@@ -68,24 +68,42 @@
 #include "smsc-ircc2.h"
 #include "smsc-sio.h"
 
+
+MODULE_AUTHOR("Daniele Peri <peri@csai.unipa.it>");
+MODULE_DESCRIPTION("SMC IrCC SIR/FIR controller driver");
+MODULE_LICENSE("GPL");
+
+static int ircc_dma = 255;
+module_param(ircc_dma, int, 0);
+MODULE_PARM_DESC(ircc_dma, "DMA channel");
+
+static int ircc_irq = 255;
+module_param(ircc_irq, int, 0);
+MODULE_PARM_DESC(ircc_irq, "IRQ line");
+
+static int ircc_fir;
+module_param(ircc_fir, int, 0);
+MODULE_PARM_DESC(ircc_fir, "FIR Base Address");
+
+static int ircc_sir;
+module_param(ircc_sir, int, 0);
+MODULE_PARM_DESC(ircc_sir, "SIR Base Address");
+
+static int ircc_cfg;
+module_param(ircc_cfg, int, 0);
+MODULE_PARM_DESC(ircc_cfg, "Configuration register base address");
+
+static int ircc_transceiver;
+module_param(ircc_transceiver, int, 0);
+MODULE_PARM_DESC(ircc_transceiver, "Transceiver type");
+
 /* Types */
 
 struct smsc_transceiver {
         char *name;
-        void (*set_for_speed)(int fir_base, u32 speed); 
+        void (*set_for_speed)(int fir_base, u32 speed);
         int  (*probe)(int fir_base);
 };
-typedef struct smsc_transceiver smsc_transceiver_t;
-
-#if 0
-struct smc_chip {
-        char *name;
-        u16 flags;
-        u8 devid;
-        u8 rev;
-};
-typedef struct smc_chip smc_chip_t;
-#endif
 
 struct smsc_chip {
         char *name;
@@ -96,20 +114,18 @@ struct smsc_chip {
         u8 devid;
         u8 rev;
 };
-typedef struct smsc_chip smsc_chip_t;
 
 struct smsc_chip_address {
         unsigned int cfg_base;
         unsigned int type;
 };
-typedef struct smsc_chip_address smsc_chip_address_t;
 
 /* Private data for each instance */
 struct smsc_ircc_cb {
         struct net_device *netdev;     /* Yes! we are some kind of netdevice */
         struct net_device_stats stats;
         struct irlap_cb    *irlap; /* The link layer we are binded to */
-        
+
         chipio_t io;               /* IrDA controller information */
         iobuff_t tx_buff;          /* Transmit buffer */
         iobuff_t rx_buff;          /* Receive buffer */
@@ -119,7 +135,7 @@ struct smsc_ircc_cb {
         struct qos_info qos;       /* QoS capabilities for this device */
 
         spinlock_t lock;           /* For serializing operations */
-        
+
         __u32 new_speed;
         __u32 flags;               /* Interface flags */
 
@@ -127,18 +143,20 @@ struct smsc_ircc_cb {
         int tx_len;                /* Number of frames in tx_buff */
 
         int transceiver;
-        struct pm_dev *pmdev;
+        struct platform_device *pldev;
 };
 
 /* Constants */
 
-static const char *driver_name = "smsc-ircc2";
-#define DIM(x)  (sizeof(x)/(sizeof(*(x))))
+#define SMSC_IRCC2_DRIVER_NAME                  "smsc-ircc2"
+
 #define SMSC_IRCC2_C_IRDA_FALLBACK_SPEED        9600
 #define SMSC_IRCC2_C_DEFAULT_TRANSCEIVER        1
-#define SMSC_IRCC2_C_NET_TIMEOUT                        0
+#define SMSC_IRCC2_C_NET_TIMEOUT                0
 #define SMSC_IRCC2_C_SIR_STOP                   0
 
+static const char *driver_name = SMSC_IRCC2_DRIVER_NAME;
+
 /* Prototypes */
 
 static int smsc_ircc_open(unsigned int firbase, unsigned int sirbase, u8 dma, u8 irq);
@@ -147,15 +165,15 @@ static void smsc_ircc_setup_io(struct smsc_ircc_cb *self, unsigned int fir_base,
 static void smsc_ircc_setup_qos(struct smsc_ircc_cb *self);
 static void smsc_ircc_init_chip(struct smsc_ircc_cb *self);
 static int __exit smsc_ircc_close(struct smsc_ircc_cb *self);
-static int  smsc_ircc_dma_receive(struct smsc_ircc_cb *self, int iobase); 
-static void smsc_ircc_dma_receive_complete(struct smsc_ircc_cb *self, int iobase);
+static int  smsc_ircc_dma_receive(struct smsc_ircc_cb *self);
+static void smsc_ircc_dma_receive_complete(struct smsc_ircc_cb *self);
 static void smsc_ircc_sir_receive(struct smsc_ircc_cb *self);
 static int  smsc_ircc_hard_xmit_sir(struct sk_buff *skb, struct net_device *dev);
 static int  smsc_ircc_hard_xmit_fir(struct sk_buff *skb, struct net_device *dev);
-static void smsc_ircc_dma_xmit(struct smsc_ircc_cb *self, int iobase, int bofs);
-static void smsc_ircc_dma_xmit_complete(struct smsc_ircc_cb *self, int iobase);
-static void smsc_ircc_change_speed(void *priv, u32 speed);
-static void smsc_ircc_set_sir_speed(void *priv, u32 speed);
+static void smsc_ircc_dma_xmit(struct smsc_ircc_cb *self, int bofs);
+static void smsc_ircc_dma_xmit_complete(struct smsc_ircc_cb *self);
+static void smsc_ircc_change_speed(struct smsc_ircc_cb *self, u32 speed);
+static void smsc_ircc_set_sir_speed(struct smsc_ircc_cb *self, u32 speed);
 static irqreturn_t smsc_ircc_interrupt(int irq, void *dev_id, struct pt_regs *regs);
 static irqreturn_t smsc_ircc_interrupt_sir(struct net_device *dev);
 static void smsc_ircc_sir_start(struct smsc_ircc_cb *self);
@@ -171,7 +189,6 @@ static int  smsc_ircc_net_ioctl(struct net_device *dev, struct ifreq *rq, int cm
 static void smsc_ircc_timeout(struct net_device *dev);
 #endif
 static struct net_device_stats *smsc_ircc_net_get_stats(struct net_device *dev);
-static int  smsc_ircc_pmproc(struct pm_dev *dev, pm_request_t rqst, void *data);
 static int smsc_ircc_is_receiving(struct smsc_ircc_cb *self);
 static void smsc_ircc_probe_transceiver(struct smsc_ircc_cb *self);
 static void smsc_ircc_set_transceiver_for_speed(struct smsc_ircc_cb *self, u32 speed);
@@ -179,9 +196,9 @@ static void smsc_ircc_sir_wait_hw_transmitter_finish(struct smsc_ircc_cb *self);
 
 /* Probing */
 static int __init smsc_ircc_look_for_chips(void);
-static const smsc_chip_t * __init smsc_ircc_probe(unsigned short cfg_base,u8 reg,const smsc_chip_t *chip,char *type);
-static int __init smsc_superio_flat(const smsc_chip_t *chips, unsigned short cfg_base, char *type);
-static int __init smsc_superio_paged(const smsc_chip_t *chips, unsigned short cfg_base, char *type);
+static const struct smsc_chip * __init smsc_ircc_probe(unsigned short cfg_base, u8 reg, const struct smsc_chip *chip, char *type);
+static int __init smsc_superio_flat(const struct smsc_chip *chips, unsigned short cfg_base, char *type);
+static int __init smsc_superio_paged(const struct smsc_chip *chips, unsigned short cfg_base, char *type);
 static int __init smsc_superio_fdc(unsigned short cfg_base);
 static int __init smsc_superio_lpc(unsigned short cfg_base);
 
@@ -196,21 +213,26 @@ static int  smsc_ircc_probe_transceiver_smsc_ircc_atc(int fir_base);
 
 /* Power Management */
 
-static void smsc_ircc_suspend(struct smsc_ircc_cb *self);
-static void smsc_ircc_wakeup(struct smsc_ircc_cb *self);
-static int smsc_ircc_pmproc(struct pm_dev *dev, pm_request_t rqst, void *data);
+static int smsc_ircc_suspend(struct device *dev, pm_message_t state, u32 level);
+static int smsc_ircc_resume(struct device *dev, u32 level);
 
+static struct device_driver smsc_ircc_driver = {
+        .name           = SMSC_IRCC2_DRIVER_NAME,
+        .bus            = &platform_bus_type,
+        .suspend        = smsc_ircc_suspend,
+        .resume         = smsc_ircc_resume,
+};
 
 /* Transceivers for SMSC-ircc */
 
-static smsc_transceiver_t smsc_transceivers[]=
+static struct smsc_transceiver smsc_transceivers[] =
 {
-        { "Toshiba Satellite 1800 (GP data pin select)", smsc_ircc_set_transceiver_toshiba_sat1800, smsc_ircc_probe_transceiver_toshiba_sat1800},
-        { "Fast pin select", smsc_ircc_set_transceiver_smsc_ircc_fast_pin_select, smsc_ircc_probe_transceiver_smsc_ircc_fast_pin_select},
-        { "ATC IRMode", smsc_ircc_set_transceiver_smsc_ircc_atc, smsc_ircc_probe_transceiver_smsc_ircc_atc},
-        { NULL, NULL}
+        { "Toshiba Satellite 1800 (GP data pin select)", smsc_ircc_set_transceiver_toshiba_sat1800, smsc_ircc_probe_transceiver_toshiba_sat1800 },
+        { "Fast pin select", smsc_ircc_set_transceiver_smsc_ircc_fast_pin_select, smsc_ircc_probe_transceiver_smsc_ircc_fast_pin_select },
+        { "ATC IRMode", smsc_ircc_set_transceiver_smsc_ircc_atc, smsc_ircc_probe_transceiver_smsc_ircc_atc },
+        { NULL, NULL }
 };
-#define SMSC_IRCC2_C_NUMBER_OF_TRANSCEIVERS (DIM(smsc_transceivers)-1)
+#define SMSC_IRCC2_C_NUMBER_OF_TRANSCEIVERS (ARRAY_SIZE(smsc_transceivers) - 1)
 
 /*  SMC SuperIO chipsets definitions */
 
@@ -221,7 +243,7 @@ static smsc_transceiver_t smsc_transceivers[]=
 #define FIR     4       /* SuperIO Chip has fast IRDA */
 #define SERx4   8       /* SuperIO Chip supports 115,2 KBaud * 4=460,8 KBaud */
 
-static smsc_chip_t __initdata fdc_chips_flat[]=
+static struct smsc_chip __initdata fdc_chips_flat[] =
 {
         /* Base address 0x3f0 or 0x370 */
         { "37C44",      KEY55_1|NoIRDA,         0x00, 0x00 }, /* This chip cannot be detected */
@@ -235,7 +257,7 @@ static smsc_chip_t __initdata fdc_chips_flat[]=
         { NULL }
 };
 
-static smsc_chip_t __initdata fdc_chips_paged[]=
+static struct smsc_chip __initdata fdc_chips_paged[] =
 {
         /* Base address 0x3f0 or 0x370 */
         { "37B72X",     KEY55_1|SIR|SERx4,      0x4c, 0x00 },
@@ -254,7 +276,7 @@ static smsc_chip_t __initdata fdc_chips_paged[]=
         { NULL }
 };
 
-static smsc_chip_t __initdata lpc_chips_flat[]=
+static struct smsc_chip __initdata lpc_chips_flat[] =
 {
         /* Base address 0x2E or 0x4E */
         { "47N227",     KEY55_1|FIR|SERx4,      0x5a, 0x00 },
@@ -262,7 +284,7 @@ static smsc_chip_t __initdata lpc_chips_flat[]=
         { NULL }
 };
 
-static smsc_chip_t __initdata lpc_chips_paged[]=
+static struct smsc_chip __initdata lpc_chips_paged[] =
 {
         /* Base address 0x2E or 0x4E */
         { "47B27X",     KEY55_1|SIR|SERx4,      0x51, 0x00 },
@@ -281,33 +303,25 @@ static smsc_chip_t __initdata lpc_chips_paged[]=
 #define SMSCSIO_TYPE_FLAT       4
 #define SMSCSIO_TYPE_PAGED      8
 
-static smsc_chip_address_t __initdata possible_addresses[]=
+static struct smsc_chip_address __initdata possible_addresses[] =
 {
-        {0x3f0, SMSCSIO_TYPE_FDC|SMSCSIO_TYPE_FLAT|SMSCSIO_TYPE_PAGED},
-        {0x370, SMSCSIO_TYPE_FDC|SMSCSIO_TYPE_FLAT|SMSCSIO_TYPE_PAGED},
-        {0xe0, SMSCSIO_TYPE_FDC|SMSCSIO_TYPE_FLAT|SMSCSIO_TYPE_PAGED},
-        {0x2e, SMSCSIO_TYPE_LPC|SMSCSIO_TYPE_FLAT|SMSCSIO_TYPE_PAGED},
-        {0x4e, SMSCSIO_TYPE_LPC|SMSCSIO_TYPE_FLAT|SMSCSIO_TYPE_PAGED},
-        {0,0}
+        { 0x3f0, SMSCSIO_TYPE_FDC|SMSCSIO_TYPE_FLAT|SMSCSIO_TYPE_PAGED },
+        { 0x370, SMSCSIO_TYPE_FDC|SMSCSIO_TYPE_FLAT|SMSCSIO_TYPE_PAGED },
+        { 0xe0,  SMSCSIO_TYPE_FDC|SMSCSIO_TYPE_FLAT|SMSCSIO_TYPE_PAGED },
+        { 0x2e,  SMSCSIO_TYPE_LPC|SMSCSIO_TYPE_FLAT|SMSCSIO_TYPE_PAGED },
+        { 0x4e,  SMSCSIO_TYPE_LPC|SMSCSIO_TYPE_FLAT|SMSCSIO_TYPE_PAGED },
+        { 0, 0 }
 };
 
 /* Globals */
 
-static struct smsc_ircc_cb *dev_self[] = { NULL, NULL};
-
-static int ircc_irq=255;
-static int ircc_dma=255;
-static int ircc_fir=0;
-static int ircc_sir=0;
-static int ircc_cfg=0;
-static int ircc_transceiver=0;
-
-static unsigned short   dev_count=0;
+static struct smsc_ircc_cb *dev_self[] = { NULL, NULL };
+static unsigned short dev_count;
 
 static inline void register_bank(int iobase, int bank)
 {
-        outb(((inb(iobase+IRCC_MASTER) & 0xf0) | (bank & 0x07)),
-               iobase+IRCC_MASTER);
+        outb(((inb(iobase + IRCC_MASTER) & 0xf0) | (bank & 0x07)),
+               iobase + IRCC_MASTER);
 }
 
 
@@ -327,34 +341,44 @@ static inline void register_bank(int iobase, int bank)
  */
 static int __init smsc_ircc_init(void)
 {
-        int ret=-ENODEV;
+        int ret;
 
         IRDA_DEBUG(1, "%s\n", __FUNCTION__);
 
-        dev_count=0;
- 
-        if ((ircc_fir>0)&&(ircc_sir>0)) {
+        ret = driver_register(&smsc_ircc_driver);
+        if (ret) {
+                IRDA_ERROR("%s, Can't register driver!\n", driver_name);
+                return ret;
+        }
+
+        dev_count = 0;
+
+        if (ircc_fir > 0 && ircc_sir > 0) {
                 IRDA_MESSAGE(" Overriding FIR address 0x%04x\n", ircc_fir);
                 IRDA_MESSAGE(" Overriding SIR address 0x%04x\n", ircc_sir);
 
-                if (smsc_ircc_open(ircc_fir, ircc_sir, ircc_dma, ircc_irq) == 0)
-                        return 0;
-
-                return -ENODEV;
-        }
+                if (smsc_ircc_open(ircc_fir, ircc_sir, ircc_dma, ircc_irq))
+                        ret = -ENODEV;
+        } else {
+                ret = -ENODEV;
+
+                /* try user provided configuration register base address */
+                if (ircc_cfg > 0) {
+                        IRDA_MESSAGE(" Overriding configuration address "
+                                     "0x%04x\n", ircc_cfg);
+                        if (!smsc_superio_fdc(ircc_cfg))
+                                ret = 0;
+                        if (!smsc_superio_lpc(ircc_cfg))
+                                ret = 0;
+                }
 
-        /* try user provided configuration register base address */
-        if (ircc_cfg>0) {
-                IRDA_MESSAGE(" Overriding configuration address 0x%04x\n",
-                             ircc_cfg);
-                if (!smsc_superio_fdc(ircc_cfg))
-                        ret = 0;
-                if (!smsc_superio_lpc(ircc_cfg))
+                if (smsc_ircc_look_for_chips() > 0)
                         ret = 0;
         }
-        
-        if(smsc_ircc_look_for_chips()>0) ret = 0;
-        
+
+        if (ret)
+                driver_unregister(&smsc_ircc_driver);
+
         return ret;
 }
 
@@ -369,15 +393,15 @@ static int __init smsc_ircc_open(unsigned int fir_base, unsigned int sir_base, u
         struct smsc_ircc_cb *self;
         struct net_device *dev;
         int err;
-        
+
         IRDA_DEBUG(1, "%s\n", __FUNCTION__);
 
         err = smsc_ircc_present(fir_base, sir_base);
-        if(err) 
+        if (err)
                 goto err_out;
-                
+
         err = -ENOMEM;
-        if (dev_count > DIM(dev_self)) {
+        if (dev_count >= ARRAY_SIZE(dev_self)) {
                 IRDA_WARNING("%s(), too many devices!\n", __FUNCTION__);
                 goto err_out1;
         }
@@ -396,14 +420,14 @@ static int __init smsc_ircc_open(unsigned int fir_base, unsigned int sir_base, u
         dev->hard_start_xmit = smsc_ircc_hard_xmit_sir;
 #if SMSC_IRCC2_C_NET_TIMEOUT
         dev->tx_timeout      = smsc_ircc_timeout;
-        dev->watchdog_timeo  = HZ*2;  /* Allow enough time for speed change */
+        dev->watchdog_timeo  = HZ * 2;  /* Allow enough time for speed change */
 #endif
         dev->open            = smsc_ircc_net_open;
         dev->stop            = smsc_ircc_net_close;
         dev->do_ioctl        = smsc_ircc_net_ioctl;
         dev->get_stats       = smsc_ircc_net_get_stats;
-        
-        self = dev->priv;
+
+        self = netdev_priv(dev);
         self->netdev = dev;
 
         /* Make ifconfig display some details */
@@ -411,10 +435,10 @@ static int __init smsc_ircc_open(unsigned int fir_base, unsigned int sir_base, u
         dev->irq = self->io.irq = irq;
 
         /* Need to store self somewhere */
-        dev_self[dev_count++] = self;
+        dev_self[dev_count] = self;
         spin_lock_init(&self->lock);
 
-        self->rx_buff.truesize = SMSC_IRCC2_RX_BUFF_TRUESIZE; 
+        self->rx_buff.truesize = SMSC_IRCC2_RX_BUFF_TRUESIZE;
         self->tx_buff.truesize = SMSC_IRCC2_TX_BUFF_TRUESIZE;
 
         self->rx_buff.head =
@@ -442,33 +466,40 @@ static int __init smsc_ircc_open(unsigned int fir_base, unsigned int sir_base, u
         self->rx_buff.state = OUTSIDE_FRAME;
         self->tx_buff.data = self->tx_buff.head;
         self->rx_buff.data = self->rx_buff.head;
-           
-        smsc_ircc_setup_io(self, fir_base, sir_base, dma, irq);
 
+        smsc_ircc_setup_io(self, fir_base, sir_base, dma, irq);
         smsc_ircc_setup_qos(self);
-
         smsc_ircc_init_chip(self);
-        
-        if(ircc_transceiver > 0  && 
-           ircc_transceiver < SMSC_IRCC2_C_NUMBER_OF_TRANSCEIVERS)
+
+        if (ircc_transceiver > 0  &&
+            ircc_transceiver < SMSC_IRCC2_C_NUMBER_OF_TRANSCEIVERS)
                 self->transceiver = ircc_transceiver;
         else
                 smsc_ircc_probe_transceiver(self);
 
         err = register_netdev(self->netdev);
-        if(err) {
+        if (err) {
                 IRDA_ERROR("%s, Network device registration failed!\n",
                            driver_name);
                 goto err_out4;
         }
 
-        self->pmdev = pm_register(PM_SYS_DEV, PM_SYS_IRDA, smsc_ircc_pmproc);
-        if (self->pmdev)
-                self->pmdev->data = self;
+        self->pldev = platform_device_register_simple(SMSC_IRCC2_DRIVER_NAME,
+                                                      dev_count, NULL, 0);
+        if (IS_ERR(self->pldev)) {
+                err = PTR_ERR(self->pldev);
+                goto err_out5;
+        }
+        dev_set_drvdata(&self->pldev->dev, self);
 
         IRDA_MESSAGE("IrDA: Registered device %s\n", dev->name);
+        dev_count++;
 
         return 0;
+
+ err_out5:
+        unregister_netdev(self->netdev);
+
  err_out4:
         dma_free_coherent(NULL, self->tx_buff.truesize,
                           self->tx_buff.head, self->tx_buff_dma);
@@ -477,7 +508,7 @@ static int __init smsc_ircc_open(unsigned int fir_base, unsigned int sir_base, u
                           self->rx_buff.head, self->rx_buff_dma);
  err_out2:
         free_netdev(self->netdev);
-        dev_self[--dev_count] = NULL;
+        dev_self[dev_count] = NULL;
  err_out1:
         release_region(fir_base, SMSC_IRCC2_FIR_CHIP_IO_EXTENT);
         release_region(sir_base, SMSC_IRCC2_SIR_CHIP_IO_EXTENT);
@@ -511,16 +542,16 @@ static int smsc_ircc_present(unsigned int fir_base, unsigned int sir_base)
 
         register_bank(fir_base, 3);
 
-        high    = inb(fir_base+IRCC_ID_HIGH);
-        low     = inb(fir_base+IRCC_ID_LOW);
-        chip    = inb(fir_base+IRCC_CHIP_ID);
-        version = inb(fir_base+IRCC_VERSION);
-        config  = inb(fir_base+IRCC_INTERFACE);
+        high    = inb(fir_base + IRCC_ID_HIGH);
+        low     = inb(fir_base + IRCC_ID_LOW);
+        chip    = inb(fir_base + IRCC_CHIP_ID);
+        version = inb(fir_base + IRCC_VERSION);
+        config  = inb(fir_base + IRCC_INTERFACE);
         dma     = config & IRCC_INTERFACE_DMA_MASK;
         irq     = (config & IRCC_INTERFACE_IRQ_MASK) >> 4;
 
-        if (high != 0x10 || low != 0xb8 || (chip != 0xf1 && chip != 0xf2)) { 
-                IRDA_WARNING("%s(), addr 0x%04x - no device found!\n",
+        if (high != 0x10 || low != 0xb8 || (chip != 0xf1 && chip != 0xf2)) {
+                IRDA_WARNING("%s(), addr 0x%04x - no device found!\n",
                              __FUNCTION__, fir_base);
                 goto out3;
         }
@@ -529,6 +560,7 @@ static int smsc_ircc_present(unsigned int fir_base, unsigned int sir_base)
                      chip & 0x0f, version, fir_base, sir_base, dma, irq);
 
         return 0;
+
  out3:
         release_region(sir_base, SMSC_IRCC2_SIR_CHIP_IO_EXTENT);
  out2:
@@ -543,16 +575,16 @@ static int smsc_ircc_present(unsigned int fir_base, unsigned int sir_base)
  *    Setup I/O
  *
  */
-static void smsc_ircc_setup_io(struct smsc_ircc_cb *self, 
-                               unsigned int fir_base, unsigned int sir_base, 
+static void smsc_ircc_setup_io(struct smsc_ircc_cb *self,
+                               unsigned int fir_base, unsigned int sir_base,
                                u8 dma, u8 irq)
 {
         unsigned char config, chip_dma, chip_irq;
 
         register_bank(fir_base, 3);
-        config  = inb(fir_base+IRCC_INTERFACE);
-        chip_dma     = config & IRCC_INTERFACE_DMA_MASK;
-        chip_irq     = (config & IRCC_INTERFACE_IRQ_MASK) >> 4;
+        config = inb(fir_base + IRCC_INTERFACE);
+        chip_dma = config & IRCC_INTERFACE_DMA_MASK;
+        chip_irq = (config & IRCC_INTERFACE_IRQ_MASK) >> 4;
 
         self->io.fir_base  = fir_base;
         self->io.sir_base  = sir_base;
@@ -566,17 +598,15 @@ static void smsc_ircc_setup_io(struct smsc_ircc_cb *self,
                         IRDA_MESSAGE("%s, Overriding IRQ - chip says %d, using %d\n",
                                      driver_name, chip_irq, irq);
                 self->io.irq = irq;
-        }
-        else
+        } else
                 self->io.irq = chip_irq;
-        
+
         if (dma < 255) {
                 if (dma != chip_dma)
                         IRDA_MESSAGE("%s, Overriding DMA - chip says %d, using %d\n",
                                      driver_name, chip_dma, dma);
                 self->io.dma = dma;
-        }
-        else
+        } else
                 self->io.dma = chip_dma;
 
 }
@@ -591,7 +621,7 @@ static void smsc_ircc_setup_qos(struct smsc_ircc_cb *self)
 {
         /* Initialize QoS for this device */
         irda_init_max_qos_capabilies(&self->qos);
-        
+
         self->qos.baud_rate.bits = IR_9600|IR_19200|IR_38400|IR_57600|
                 IR_115200|IR_576000|IR_1152000|(IR_4000000 << 8);
 
@@ -608,43 +638,43 @@ static void smsc_ircc_setup_qos(struct smsc_ircc_cb *self)
  */
 static void smsc_ircc_init_chip(struct smsc_ircc_cb *self)
 {
-        int iobase, ir_mode, ctrl, fast; 
-        
-        IRDA_ASSERT( self != NULL, return; );
-        iobase = self->io.fir_base;
+        int iobase, ir_mode, ctrl, fast;
+
+        IRDA_ASSERT(self != NULL, return;);
 
+        iobase = self->io.fir_base;
         ir_mode = IRCC_CFGA_IRDA_SIR_A;
         ctrl = 0;
         fast = 0;
 
         register_bank(iobase, 0);
-        outb(IRCC_MASTER_RESET, iobase+IRCC_MASTER);
-        outb(0x00, iobase+IRCC_MASTER);
+        outb(IRCC_MASTER_RESET, iobase + IRCC_MASTER);
+        outb(0x00, iobase + IRCC_MASTER);
 
         register_bank(iobase, 1);
-        outb(((inb(iobase+IRCC_SCE_CFGA) & 0x87) | ir_mode), 
-             iobase+IRCC_SCE_CFGA);
+        outb(((inb(iobase + IRCC_SCE_CFGA) & 0x87) | ir_mode),
+             iobase + IRCC_SCE_CFGA);
 
 #ifdef smsc_669 /* Uses pin 88/89 for Rx/Tx */
-        outb(((inb(iobase+IRCC_SCE_CFGB) & 0x3f) | IRCC_CFGB_MUX_COM), 
-             iobase+IRCC_SCE_CFGB);
-#else   
-        outb(((inb(iobase+IRCC_SCE_CFGB) & 0x3f) | IRCC_CFGB_MUX_IR),
-             iobase+IRCC_SCE_CFGB);
-#endif  
-        (void) inb(iobase+IRCC_FIFO_THRESHOLD);
-        outb(SMSC_IRCC2_FIFO_THRESHOLD, iobase+IRCC_FIFO_THRESHOLD);
-        
+        outb(((inb(iobase + IRCC_SCE_CFGB) & 0x3f) | IRCC_CFGB_MUX_COM),
+             iobase + IRCC_SCE_CFGB);
+#else
+        outb(((inb(iobase + IRCC_SCE_CFGB) & 0x3f) | IRCC_CFGB_MUX_IR),
+             iobase + IRCC_SCE_CFGB);
+#endif
+        (void) inb(iobase + IRCC_FIFO_THRESHOLD);
+        outb(SMSC_IRCC2_FIFO_THRESHOLD, iobase + IRCC_FIFO_THRESHOLD);
+
         register_bank(iobase, 4);
-        outb((inb(iobase+IRCC_CONTROL) & 0x30) | ctrl, iobase+IRCC_CONTROL);
-        
+        outb((inb(iobase + IRCC_CONTROL) & 0x30) | ctrl, iobase + IRCC_CONTROL);
+
         register_bank(iobase, 0);
-        outb(fast, iobase+IRCC_LCR_A);
+        outb(fast, iobase + IRCC_LCR_A);
 
         smsc_ircc_set_sir_speed(self, SMSC_IRCC2_C_IRDA_FALLBACK_SPEED);
-        
+
         /* Power on device */
-        outb(0x00, iobase+IRCC_MASTER);
+        outb(0x00, iobase + IRCC_MASTER);
 }
 
 /*
@@ -662,12 +692,12 @@ static int smsc_ircc_net_ioctl(struct net_device *dev, struct ifreq *rq, int cmd
 
         IRDA_ASSERT(dev != NULL, return -1;);
 
-        self = dev->priv;
+        self = netdev_priv(dev);
 
         IRDA_ASSERT(self != NULL, return -1;);
 
         IRDA_DEBUG(2, "%s(), %s, (cmd=0x%X)\n", __FUNCTION__, dev->name, cmd);
-        
+
         switch (cmd) {
         case SIOCSBANDWIDTH: /* Set bandwidth */
                 if (!capable(CAP_NET_ADMIN))
@@ -703,14 +733,14 @@ static int smsc_ircc_net_ioctl(struct net_device *dev, struct ifreq *rq, int cmd
         default:
                 ret = -EOPNOTSUPP;
         }
-        
+
         return ret;
 }
 
 static struct net_device_stats *smsc_ircc_net_get_stats(struct net_device *dev)
 {
-        struct smsc_ircc_cb *self = (struct smsc_ircc_cb *) dev->priv;
-        
+        struct smsc_ircc_cb *self = netdev_priv(dev);
+
         return &self->stats;
 }
 
@@ -724,11 +754,9 @@ static struct net_device_stats *smsc_ircc_net_get_stats(struct net_device *dev)
 
 static void smsc_ircc_timeout(struct net_device *dev)
 {
-        struct smsc_ircc_cb *self;
+        struct smsc_ircc_cb *self = netdev_priv(dev);
         unsigned long flags;
 
-        self = (struct smsc_ircc_cb *) dev->priv;
-        
         IRDA_WARNING("%s: transmit timed out, changing speed to: %d\n",
                      dev->name, self->io.speed);
         spin_lock_irqsave(&self->lock, flags);
@@ -751,26 +779,23 @@ int smsc_ircc_hard_xmit_sir(struct sk_buff *skb, struct net_device *dev)
 {
         struct smsc_ircc_cb *self;
         unsigned long flags;
-        int iobase;
         s32 speed;
 
         IRDA_DEBUG(1, "%s\n", __FUNCTION__);
 
         IRDA_ASSERT(dev != NULL, return 0;);
-        
-        self = (struct smsc_ircc_cb *) dev->priv;
-        IRDA_ASSERT(self != NULL, return 0;);
 
-        iobase = self->io.sir_base;
+        self = netdev_priv(dev);
+        IRDA_ASSERT(self != NULL, return 0;);
 
         netif_stop_queue(dev);
-        
+
         /* Make sure test of self->io.speed & speed change are atomic */
         spin_lock_irqsave(&self->lock, flags);
 
         /* Check if we need to change the speed */
         speed = irda_get_next_speed(skb);
-        if ((speed != self->io.speed) && (speed != -1)) {
+        if (speed != self->io.speed && speed != -1) {
                 /* Check for empty frame */
                 if (!skb->len) {
                         /*
@@ -787,27 +812,26 @@ int smsc_ircc_hard_xmit_sir(struct sk_buff *skb, struct net_device *dev)
                         spin_unlock_irqrestore(&self->lock, flags);
                         dev_kfree_skb(skb);
                         return 0;
-                } else {
-                        self->new_speed = speed;
                 }
+                self->new_speed = speed;
         }
 
         /* Init tx buffer */
         self->tx_buff.data = self->tx_buff.head;
 
         /* Copy skb to tx_buff while wrapping, stuffing and making CRC */
-        self->tx_buff.len = async_wrap_skb(skb, self->tx_buff.data, 
+        self->tx_buff.len = async_wrap_skb(skb, self->tx_buff.data,
                                            self->tx_buff.truesize);
-        
+
         self->stats.tx_bytes += self->tx_buff.len;
 
         /* Turn on transmit finished interrupt. Will fire immediately!  */
-        outb(UART_IER_THRI, iobase+UART_IER); 
+        outb(UART_IER_THRI, self->io.sir_base + UART_IER);
 
         spin_unlock_irqrestore(&self->lock, flags);
 
         dev_kfree_skb(skb);
-        
+
         return 0;
 }
 
@@ -826,9 +850,9 @@ static void smsc_ircc_set_fir_speed(struct smsc_ircc_cb *self, u32 speed)
 
         self->io.speed = speed;
 
-        switch(speed) {
+        switch (speed) {
         default:
-        case 576000:            
+        case 576000:
                 ir_mode = IRCC_CFGA_IRDA_HDLC;
                 ctrl = IRCC_CRC;
                 fast = 0;
@@ -853,14 +877,14 @@ static void smsc_ircc_set_fir_speed(struct smsc_ircc_cb *self, u32 speed)
         Now in tranceiver!
         /* This causes an interrupt */
         register_bank(fir_base, 0);
-        outb((inb(fir_base+IRCC_LCR_A) &  0xbf) | fast, fir_base+IRCC_LCR_A);
+        outb((inb(fir_base + IRCC_LCR_A) &  0xbf) | fast, fir_base + IRCC_LCR_A);
         #endif
-        
+
         register_bank(fir_base, 1);
-        outb(((inb(fir_base+IRCC_SCE_CFGA) & IRCC_SCE_CFGA_BLOCK_CTRL_BITS_MASK) | ir_mode), fir_base+IRCC_SCE_CFGA);
-        
+        outb(((inb(fir_base + IRCC_SCE_CFGA) & IRCC_SCE_CFGA_BLOCK_CTRL_BITS_MASK) | ir_mode), fir_base + IRCC_SCE_CFGA);
+
         register_bank(fir_base, 4);
-        outb((inb(fir_base+IRCC_CONTROL) & 0x30) | ctrl, fir_base+IRCC_CONTROL);
+        outb((inb(fir_base + IRCC_CONTROL) & 0x30) | ctrl, fir_base + IRCC_CONTROL);
 }
 
 /*
@@ -885,31 +909,31 @@ static void smsc_ircc_fir_start(struct smsc_ircc_cb *self)
         /* Reset everything */
 
         /* Install FIR transmit handler */
-        dev->hard_start_xmit = smsc_ircc_hard_xmit_fir; 
+        dev->hard_start_xmit = smsc_ircc_hard_xmit_fir;
 
         /* Clear FIFO */
-        outb(inb(fir_base+IRCC_LCR_A)|IRCC_LCR_A_FIFO_RESET, fir_base+IRCC_LCR_A);
+        outb(inb(fir_base + IRCC_LCR_A) | IRCC_LCR_A_FIFO_RESET, fir_base + IRCC_LCR_A);
 
         /* Enable interrupt */
-        /*outb(IRCC_IER_ACTIVE_FRAME|IRCC_IER_EOM, fir_base+IRCC_IER);*/
+        /*outb(IRCC_IER_ACTIVE_FRAME|IRCC_IER_EOM, fir_base + IRCC_IER);*/
 
         register_bank(fir_base, 1);
 
-        /* Select the TX/RX interface */        
+        /* Select the TX/RX interface */
 #ifdef SMSC_669 /* Uses pin 88/89 for Rx/Tx */
-        outb(((inb(fir_base+IRCC_SCE_CFGB) & 0x3f) | IRCC_CFGB_MUX_COM), 
-             fir_base+IRCC_SCE_CFGB);
-#else   
-        outb(((inb(fir_base+IRCC_SCE_CFGB) & 0x3f) | IRCC_CFGB_MUX_IR),
-             fir_base+IRCC_SCE_CFGB);
-#endif  
-        (void) inb(fir_base+IRCC_FIFO_THRESHOLD);
+        outb(((inb(fir_base + IRCC_SCE_CFGB) & 0x3f) | IRCC_CFGB_MUX_COM),
+             fir_base + IRCC_SCE_CFGB);
+#else
+        outb(((inb(fir_base + IRCC_SCE_CFGB) & 0x3f) | IRCC_CFGB_MUX_IR),
+             fir_base + IRCC_SCE_CFGB);
+#endif
+        (void) inb(fir_base + IRCC_FIFO_THRESHOLD);
 
         /* Enable SCE interrupts */
-        outb(0, fir_base+IRCC_MASTER);
+        outb(0, fir_base + IRCC_MASTER);
         register_bank(fir_base, 0);
-        outb(IRCC_IER_ACTIVE_FRAME|IRCC_IER_EOM, fir_base+IRCC_IER);
-        outb(IRCC_MASTER_INT_EN, fir_base+IRCC_MASTER);
+        outb(IRCC_IER_ACTIVE_FRAME | IRCC_IER_EOM, fir_base + IRCC_IER);
+        outb(IRCC_MASTER_INT_EN, fir_base + IRCC_MASTER);
 }
 
 /*
@@ -923,13 +947,13 @@ static void smsc_ircc_fir_stop(struct smsc_ircc_cb *self)
         int fir_base;
 
         IRDA_DEBUG(1, "%s\n", __FUNCTION__);
-        
+
         IRDA_ASSERT(self != NULL, return;);
 
         fir_base = self->io.fir_base;
         register_bank(fir_base, 0);
-        /*outb(IRCC_MASTER_RESET, fir_base+IRCC_MASTER);*/      
-        outb(inb(fir_base+IRCC_LCR_B) & IRCC_LCR_B_SIP_ENABLE, fir_base+IRCC_LCR_B);
+        /*outb(IRCC_MASTER_RESET, fir_base + IRCC_MASTER);*/
+        outb(inb(fir_base + IRCC_LCR_B) & IRCC_LCR_B_SIP_ENABLE, fir_base + IRCC_LCR_B);
 }
 
 
@@ -941,18 +965,15 @@ static void smsc_ircc_fir_stop(struct smsc_ircc_cb *self)
  * This function *must* be called with spinlock held, because it may
  * be called from the irq handler. - Jean II
  */
-static void smsc_ircc_change_speed(void *priv, u32 speed)
+static void smsc_ircc_change_speed(struct smsc_ircc_cb *self, u32 speed)
 {
-        struct smsc_ircc_cb *self = (struct smsc_ircc_cb *) priv;
         struct net_device *dev;
-        int iobase;
         int last_speed_was_sir;
-        
+
         IRDA_DEBUG(0, "%s() changing speed to: %d\n", __FUNCTION__, speed);
 
         IRDA_ASSERT(self != NULL, return;);
         dev = self->netdev;
-        iobase = self->io.fir_base;
 
         last_speed_was_sir = self->io.speed <= SMSC_IRCC2_MAX_SIR_SPEED;
 
@@ -961,30 +982,30 @@ static void smsc_ircc_change_speed(void *priv, u32 speed)
         speed= 1152000;
         self->io.speed = speed;
         last_speed_was_sir = 0;
-        smsc_ircc_fir_start(self);      
+        smsc_ircc_fir_start(self);
         #endif
-        
-        if(self->io.speed == 0)
+
+        if (self->io.speed == 0)
                 smsc_ircc_sir_start(self);
 
         #if 0
-        if(!last_speed_was_sir) speed = self->io.speed;
+        if (!last_speed_was_sir) speed = self->io.speed;
         #endif
 
-        if(self->io.speed != speed) smsc_ircc_set_transceiver_for_speed(self, speed);
+        if (self->io.speed != speed)
+                smsc_ircc_set_transceiver_for_speed(self, speed);
 
         self->io.speed = speed;
-        
-        if(speed <= SMSC_IRCC2_MAX_SIR_SPEED) {
-                if(!last_speed_was_sir) {
+
+        if (speed <= SMSC_IRCC2_MAX_SIR_SPEED) {
+                if (!last_speed_was_sir) {
                         smsc_ircc_fir_stop(self);
                         smsc_ircc_sir_start(self);
                 }
-                smsc_ircc_set_sir_speed(self, speed); 
-        }
-        else {
-                if(last_speed_was_sir) {
-                        #if SMSC_IRCC2_C_SIR_STOP               
+                smsc_ircc_set_sir_speed(self, speed);
+        } else {
+                if (last_speed_was_sir) {
+                        #if SMSC_IRCC2_C_SIR_STOP
                         smsc_ircc_sir_stop(self);
                         #endif
                         smsc_ircc_fir_start(self);
@@ -994,13 +1015,13 @@ static void smsc_ircc_change_speed(void *priv, u32 speed)
                 #if 0
                 self->tx_buff.len = 10;
                 self->tx_buff.data = self->tx_buff.head;
-                
-                smsc_ircc_dma_xmit(self, iobase, 4000);
+
+                smsc_ircc_dma_xmit(self, 4000);
                 #endif
                 /* Be ready for incoming frames */
-                smsc_ircc_dma_receive(self, iobase);
+                smsc_ircc_dma_receive(self);
         }
-        
+
         netif_wake_queue(dev);
 }
 
@@ -1010,10 +1031,9 @@ static void smsc_ircc_change_speed(void *priv, u32 speed)
  *    Set speed of IrDA port to specified baudrate
  *
  */
-void smsc_ircc_set_sir_speed(void *priv, __u32 speed)
+void smsc_ircc_set_sir_speed(struct smsc_ircc_cb *self, __u32 speed)
 {
-        struct smsc_ircc_cb *self = (struct smsc_ircc_cb *) priv;
-        int iobase; 
+        int iobase;
         int fcr;    /* FIFO control reg */
         int lcr;    /* Line control reg */
         int divisor;
@@ -1022,38 +1042,36 @@ void smsc_ircc_set_sir_speed(void *priv, __u32 speed)
 
         IRDA_ASSERT(self != NULL, return;);
         iobase = self->io.sir_base;
-        
+
         /* Update accounting for new speed */
         self->io.speed = speed;
 
         /* Turn off interrupts */
-        outb(0, iobase+UART_IER); 
+        outb(0, iobase + UART_IER);
+
+        divisor = SMSC_IRCC2_MAX_SIR_SPEED / speed;
 
-        divisor = SMSC_IRCC2_MAX_SIR_SPEED/speed;
-        
         fcr = UART_FCR_ENABLE_FIFO;
 
-        /* 
+        /*
          * Use trigger level 1 to avoid 3 ms. timeout delay at 9600 bps, and
          * almost 1,7 ms at 19200 bps. At speeds above that we can just forget
-         * about this timeout since it will always be fast enough. 
+         * about this timeout since it will always be fast enough.
          */
-        if (self->io.speed < 38400)
-                fcr |= UART_FCR_TRIGGER_1;
-        else 
-                fcr |= UART_FCR_TRIGGER_14;
-        
+        fcr |= self->io.speed < 38400 ?
+                UART_FCR_TRIGGER_1 : UART_FCR_TRIGGER_14;
+
         /* IrDA ports use 8N1 */
         lcr = UART_LCR_WLEN8;
-        
-        outb(UART_LCR_DLAB | lcr, iobase+UART_LCR); /* Set DLAB */
-        outb(divisor & 0xff,      iobase+UART_DLL); /* Set speed */
-        outb(divisor >> 8,        iobase+UART_DLM);
-        outb(lcr,                 iobase+UART_LCR); /* Set 8N1  */
-        outb(fcr,                 iobase+UART_FCR); /* Enable FIFO's */
+
+        outb(UART_LCR_DLAB | lcr, iobase + UART_LCR); /* Set DLAB */
+        outb(divisor & 0xff,      iobase + UART_DLL); /* Set speed */
+        outb(divisor >> 8,        iobase + UART_DLM);
+        outb(lcr,                 iobase + UART_LCR); /* Set 8N1 */
+        outb(fcr,                 iobase + UART_FCR); /* Enable FIFO's */
 
         /* Turn on interrups */
-        outb(UART_IER_RLSI|UART_IER_RDI|UART_IER_THRI, iobase+UART_IER);
+        outb(UART_IER_RLSI | UART_IER_RDI | UART_IER_THRI, iobase + UART_IER);
 
         IRDA_DEBUG(2, "%s() speed changed to: %d\n", __FUNCTION__, speed);
 }
@@ -1070,15 +1088,12 @@ static int smsc_ircc_hard_xmit_fir(struct sk_buff *skb, struct net_device *dev)
         struct smsc_ircc_cb *self;
         unsigned long flags;
         s32 speed;
-        int iobase;
         int mtt;
 
         IRDA_ASSERT(dev != NULL, return 0;);
-        self = (struct smsc_ircc_cb *) dev->priv;
+        self = netdev_priv(dev);
         IRDA_ASSERT(self != NULL, return 0;);
 
-        iobase = self->io.fir_base;
-
         netif_stop_queue(dev);
 
         /* Make sure test of self->io.speed & speed change are atomic */
@@ -1086,30 +1101,31 @@ static int smsc_ircc_hard_xmit_fir(struct sk_buff *skb, struct net_device *dev)
 
         /* Check if we need to change the speed after this frame */
         speed = irda_get_next_speed(skb);
-        if ((speed != self->io.speed) && (speed != -1)) {
+        if (speed != self->io.speed && speed != -1) {
                 /* Check for empty frame */
                 if (!skb->len) {
                         /* Note : you should make sure that speed changes
                          * are not going to corrupt any outgoing frame.
                          * Look at nsc-ircc for the gory details - Jean II */
-                        smsc_ircc_change_speed(self, speed); 
+                        smsc_ircc_change_speed(self, speed);
                         spin_unlock_irqrestore(&self->lock, flags);
                         dev_kfree_skb(skb);
                         return 0;
-                } else
-                        self->new_speed = speed;
+                }
+
+                self->new_speed = speed;
         }
-        
+
         memcpy(self->tx_buff.head, skb->data, skb->len);
 
         self->tx_buff.len = skb->len;
         self->tx_buff.data = self->tx_buff.head;
-        
-        mtt = irda_get_mtt(skb);        
+
+        mtt = irda_get_mtt(skb);
         if (mtt) {
                 int bofs;
 
-                /* 
+                /*
                  * Compute how many BOFs (STA or PA's) we need to waste the
                  * min turn time given the speed of the link.
                  */
@@ -1117,11 +1133,12 @@ static int smsc_ircc_hard_xmit_fir(struct sk_buff *skb, struct net_device *dev)
                 if (bofs > 4095)
                         bofs = 4095;
 
-                smsc_ircc_dma_xmit(self, iobase, bofs);
+                smsc_ircc_dma_xmit(self, bofs);
         } else {
                 /* Transmit frame */
-                smsc_ircc_dma_xmit(self, iobase, 0);
+                smsc_ircc_dma_xmit(self, 0);
         }
+
         spin_unlock_irqrestore(&self->lock, flags);
         dev_kfree_skb(skb);
 
@@ -1129,43 +1146,44 @@ static int smsc_ircc_hard_xmit_fir(struct sk_buff *skb, struct net_device *dev)
 }
 
 /*
- * Function smsc_ircc_dma_xmit (self, iobase)
+ * Function smsc_ircc_dma_xmit (self, bofs)
  *
  *    Transmit data using DMA
  *
  */
-static void smsc_ircc_dma_xmit(struct smsc_ircc_cb *self, int iobase, int bofs)
+static void smsc_ircc_dma_xmit(struct smsc_ircc_cb *self, int bofs)
 {
+        int iobase = self->io.fir_base;
         u8 ctrl;
 
         IRDA_DEBUG(3, "%s\n", __FUNCTION__);
 #if 1
         /* Disable Rx */
         register_bank(iobase, 0);
-        outb(0x00, iobase+IRCC_LCR_B);
+        outb(0x00, iobase + IRCC_LCR_B);
 #endif
         register_bank(iobase, 1);
-        outb(inb(iobase+IRCC_SCE_CFGB) & ~IRCC_CFGB_DMA_ENABLE, 
-             iobase+IRCC_SCE_CFGB);
+        outb(inb(iobase + IRCC_SCE_CFGB) & ~IRCC_CFGB_DMA_ENABLE,
+             iobase + IRCC_SCE_CFGB);
 
         self->io.direction = IO_XMIT;
 
         /* Set BOF additional count for generating the min turn time */
         register_bank(iobase, 4);
-        outb(bofs & 0xff, iobase+IRCC_BOF_COUNT_LO);
-        ctrl = inb(iobase+IRCC_CONTROL) & 0xf0;
-        outb(ctrl | ((bofs >> 8) & 0x0f), iobase+IRCC_BOF_COUNT_HI);
+        outb(bofs & 0xff, iobase + IRCC_BOF_COUNT_LO);
+        ctrl = inb(iobase + IRCC_CONTROL) & 0xf0;
+        outb(ctrl | ((bofs >> 8) & 0x0f), iobase + IRCC_BOF_COUNT_HI);
 
         /* Set max Tx frame size */
-        outb(self->tx_buff.len >> 8, iobase+IRCC_TX_SIZE_HI);
-        outb(self->tx_buff.len & 0xff, iobase+IRCC_TX_SIZE_LO);
+        outb(self->tx_buff.len >> 8, iobase + IRCC_TX_SIZE_HI);
+        outb(self->tx_buff.len & 0xff, iobase + IRCC_TX_SIZE_LO);
 
         /*outb(UART_MCR_OUT2, self->io.sir_base + UART_MCR);*/
-        
+
         /* Enable burst mode chip Tx DMA */
         register_bank(iobase, 1);
-        outb(inb(iobase+IRCC_SCE_CFGB) | IRCC_CFGB_DMA_ENABLE |
-             IRCC_CFGB_DMA_BURST, iobase+IRCC_SCE_CFGB);
+        outb(inb(iobase + IRCC_SCE_CFGB) | IRCC_CFGB_DMA_ENABLE |
+             IRCC_CFGB_DMA_BURST, iobase + IRCC_SCE_CFGB);
 
         /* Setup DMA controller (must be done after enabling chip DMA) */
         irda_setup_dma(self->io.dma, self->tx_buff_dma, self->tx_buff.len,
@@ -1174,50 +1192,52 @@ static void smsc_ircc_dma_xmit(struct smsc_ircc_cb *self, int iobase, int bofs)
         /* Enable interrupt */
 
         register_bank(iobase, 0);
-        outb(IRCC_IER_ACTIVE_FRAME | IRCC_IER_EOM, iobase+IRCC_IER);
-        outb(IRCC_MASTER_INT_EN, iobase+IRCC_MASTER);
-        
+        outb(IRCC_IER_ACTIVE_FRAME | IRCC_IER_EOM, iobase + IRCC_IER);
+        outb(IRCC_MASTER_INT_EN, iobase + IRCC_MASTER);
+
         /* Enable transmit */
-        outb(IRCC_LCR_B_SCE_TRANSMIT | IRCC_LCR_B_SIP_ENABLE, iobase+IRCC_LCR_B);
+        outb(IRCC_LCR_B_SCE_TRANSMIT | IRCC_LCR_B_SIP_ENABLE, iobase + IRCC_LCR_B);
 }
 
 /*
  * Function smsc_ircc_dma_xmit_complete (self)
  *
- *    The transfer of a frame in finished. This function will only be called 
+ *    The transfer of a frame in finished. This function will only be called
  *    by the interrupt handler
  *
  */
-static void smsc_ircc_dma_xmit_complete(struct smsc_ircc_cb *self, int iobase)
+static void smsc_ircc_dma_xmit_complete(struct smsc_ircc_cb *self)
 {
+        int iobase = self->io.fir_base;
+
         IRDA_DEBUG(3, "%s\n", __FUNCTION__);
 #if 0
         /* Disable Tx */
         register_bank(iobase, 0);
-        outb(0x00, iobase+IRCC_LCR_B);
+        outb(0x00, iobase + IRCC_LCR_B);
 #endif
-        register_bank(self->io.fir_base, 1);
-        outb(inb(self->io.fir_base+IRCC_SCE_CFGB) & ~IRCC_CFGB_DMA_ENABLE,
-             self->io.fir_base+IRCC_SCE_CFGB);
+        register_bank(iobase, 1);
+        outb(inb(iobase + IRCC_SCE_CFGB) & ~IRCC_CFGB_DMA_ENABLE,
+             iobase + IRCC_SCE_CFGB);
 
         /* Check for underrun! */
         register_bank(iobase, 0);
-        if (inb(iobase+IRCC_LSR) & IRCC_LSR_UNDERRUN) {
+        if (inb(iobase + IRCC_LSR) & IRCC_LSR_UNDERRUN) {
                 self->stats.tx_errors++;
                 self->stats.tx_fifo_errors++;
 
                 /* Reset error condition */
                 register_bank(iobase, 0);
-                outb(IRCC_MASTER_ERROR_RESET, iobase+IRCC_MASTER);
-                outb(0x00, iobase+IRCC_MASTER);
+                outb(IRCC_MASTER_ERROR_RESET, iobase + IRCC_MASTER);
+                outb(0x00, iobase + IRCC_MASTER);
         } else {
                 self->stats.tx_packets++;
-                self->stats.tx_bytes +=  self->tx_buff.len;
+                self->stats.tx_bytes += self->tx_buff.len;
         }
 
         /* Check if it's time to change the speed */
         if (self->new_speed) {
-                smsc_ircc_change_speed(self, self->new_speed);          
+                smsc_ircc_change_speed(self, self->new_speed);
                 self->new_speed = 0;
         }
 
@@ -1231,31 +1251,32 @@ static void smsc_ircc_dma_xmit_complete(struct smsc_ircc_cb *self, int iobase)
  *    if it starts to receive a frame.
  *
  */
-static int smsc_ircc_dma_receive(struct smsc_ircc_cb *self, int iobase) 
+static int smsc_ircc_dma_receive(struct smsc_ircc_cb *self)
 {
+        int iobase = self->io.fir_base;
 #if 0
         /* Turn off chip DMA */
         register_bank(iobase, 1);
-        outb(inb(iobase+IRCC_SCE_CFGB) & ~IRCC_CFGB_DMA_ENABLE, 
-             iobase+IRCC_SCE_CFGB);
+        outb(inb(iobase + IRCC_SCE_CFGB) & ~IRCC_CFGB_DMA_ENABLE,
+             iobase + IRCC_SCE_CFGB);
 #endif
-        
+
         /* Disable Tx */
         register_bank(iobase, 0);
-        outb(0x00, iobase+IRCC_LCR_B);
+        outb(0x00, iobase + IRCC_LCR_B);
 
         /* Turn off chip DMA */
         register_bank(iobase, 1);
-        outb(inb(iobase+IRCC_SCE_CFGB) & ~IRCC_CFGB_DMA_ENABLE, 
-             iobase+IRCC_SCE_CFGB);
+        outb(inb(iobase + IRCC_SCE_CFGB) & ~IRCC_CFGB_DMA_ENABLE,
+             iobase + IRCC_SCE_CFGB);
 
         self->io.direction = IO_RECV;
         self->rx_buff.data = self->rx_buff.head;
 
         /* Set max Rx frame size */
         register_bank(iobase, 4);
-        outb((2050 >> 8) & 0x0f, iobase+IRCC_RX_SIZE_HI);
-        outb(2050 & 0xff, iobase+IRCC_RX_SIZE_LO);
+        outb((2050 >> 8) & 0x0f, iobase + IRCC_RX_SIZE_HI);
+        outb(2050 & 0xff, iobase + IRCC_RX_SIZE_LO);
 
         /* Setup DMA controller */
         irda_setup_dma(self->io.dma, self->rx_buff_dma, self->rx_buff.truesize,
@@ -1263,83 +1284,83 @@ static int smsc_ircc_dma_receive(struct smsc_ircc_cb *self, int iobase)
 
         /* Enable burst mode chip Rx DMA */
         register_bank(iobase, 1);
-        outb(inb(iobase+IRCC_SCE_CFGB) | IRCC_CFGB_DMA_ENABLE | 
-             IRCC_CFGB_DMA_BURST, iobase+IRCC_SCE_CFGB);
+        outb(inb(iobase + IRCC_SCE_CFGB) | IRCC_CFGB_DMA_ENABLE |
+             IRCC_CFGB_DMA_BURST, iobase + IRCC_SCE_CFGB);
 
         /* Enable interrupt */
         register_bank(iobase, 0);
-        outb(IRCC_IER_ACTIVE_FRAME | IRCC_IER_EOM, iobase+IRCC_IER);
-        outb(IRCC_MASTER_INT_EN, iobase+IRCC_MASTER);
-
+        outb(IRCC_IER_ACTIVE_FRAME | IRCC_IER_EOM, iobase + IRCC_IER);
+        outb(IRCC_MASTER_INT_EN, iobase + IRCC_MASTER);
 
         /* Enable receiver */
         register_bank(iobase, 0);
-        outb(IRCC_LCR_B_SCE_RECEIVE | IRCC_LCR_B_SIP_ENABLE, 
-             iobase+IRCC_LCR_B);
-        
+        outb(IRCC_LCR_B_SCE_RECEIVE | IRCC_LCR_B_SIP_ENABLE,
+             iobase + IRCC_LCR_B);
+
         return 0;
 }
 
 /*
- * Function smsc_ircc_dma_receive_complete(self, iobase)
+ * Function smsc_ircc_dma_receive_complete(self)
  *
  *    Finished with receiving frames
  *
  */
-static void smsc_ircc_dma_receive_complete(struct smsc_ircc_cb *self, int iobase)
+static void smsc_ircc_dma_receive_complete(struct smsc_ircc_cb *self)
 {
         struct sk_buff *skb;
         int len, msgcnt, lsr;
-        
+        int iobase = self->io.fir_base;
+
         register_bank(iobase, 0);
-        
+
         IRDA_DEBUG(3, "%s\n", __FUNCTION__);
 #if 0
         /* Disable Rx */
         register_bank(iobase, 0);
-        outb(0x00, iobase+IRCC_LCR_B);
+        outb(0x00, iobase + IRCC_LCR_B);
 #endif
         register_bank(iobase, 0);
-        outb(inb(iobase+IRCC_LSAR) & ~IRCC_LSAR_ADDRESS_MASK, iobase+IRCC_LSAR);
-        lsr= inb(iobase+IRCC_LSR);
-        msgcnt = inb(iobase+IRCC_LCR_B) & 0x08;
+        outb(inb(iobase + IRCC_LSAR) & ~IRCC_LSAR_ADDRESS_MASK, iobase + IRCC_LSAR);
+        lsr= inb(iobase + IRCC_LSR);
+        msgcnt = inb(iobase + IRCC_LCR_B) & 0x08;
 
         IRDA_DEBUG(2, "%s: dma count = %d\n", __FUNCTION__,
                    get_dma_residue(self->io.dma));
 
         len = self->rx_buff.truesize - get_dma_residue(self->io.dma);
 
-        /* Look for errors 
-         */     
-
-        if(lsr & (IRCC_LSR_FRAME_ERROR | IRCC_LSR_CRC_ERROR | IRCC_LSR_SIZE_ERROR)) {
+        /* Look for errors */
+        if (lsr & (IRCC_LSR_FRAME_ERROR | IRCC_LSR_CRC_ERROR | IRCC_LSR_SIZE_ERROR)) {
                 self->stats.rx_errors++;
-                if(lsr & IRCC_LSR_FRAME_ERROR) self->stats.rx_frame_errors++;
-                if(lsr & IRCC_LSR_CRC_ERROR) self->stats.rx_crc_errors++;
-                if(lsr & IRCC_LSR_SIZE_ERROR) self->stats.rx_length_errors++;
-                if(lsr & (IRCC_LSR_UNDERRUN | IRCC_LSR_OVERRUN)) self->stats.rx_length_errors++;
+                if (lsr & IRCC_LSR_FRAME_ERROR)
+                        self->stats.rx_frame_errors++;
+                if (lsr & IRCC_LSR_CRC_ERROR)
+                        self->stats.rx_crc_errors++;
+                if (lsr & IRCC_LSR_SIZE_ERROR)
+                        self->stats.rx_length_errors++;
+                if (lsr & (IRCC_LSR_UNDERRUN | IRCC_LSR_OVERRUN))
+                        self->stats.rx_length_errors++;
                 return;
         }
+
         /* Remove CRC */
-        if (self->io.speed < 4000000)
-                len -= 2;
-        else
-                len -= 4;
+        len -= self->io.speed < 4000000 ? 2 : 4;
 
-        if ((len < 2) || (len > 2050)) {
+        if (len < 2 || len > 2050) {
                 IRDA_WARNING("%s(), bogus len=%d\n", __FUNCTION__, len);
                 return;
         }
         IRDA_DEBUG(2, "%s: msgcnt = %d, len=%d\n", __FUNCTION__, msgcnt, len);
 
-        skb = dev_alloc_skb(len+1);
-        if (!skb)  {
+        skb = dev_alloc_skb(len + 1);
+        if (!skb) {
                 IRDA_WARNING("%s(), memory squeeze, dropping frame.\n",
                              __FUNCTION__);
                 return;
-        }                       
+        }
         /* Make sure IP header gets aligned */
-        skb_reserve(skb, 1); 
+        skb_reserve(skb, 1);
 
         memcpy(skb_put(skb, len), self->rx_buff.data, len);
         self->stats.rx_packets++;
@@ -1357,7 +1378,7 @@ static void smsc_ircc_dma_receive_complete(struct smsc_ircc_cb *self, int iobase
  *    Receive one frame from the infrared port
  *
  */
-static void smsc_ircc_sir_receive(struct smsc_ircc_cb *self) 
+static void smsc_ircc_sir_receive(struct smsc_ircc_cb *self)
 {
         int boguscount = 0;
         int iobase;
@@ -1366,20 +1387,20 @@ static void smsc_ircc_sir_receive(struct smsc_ircc_cb *self)
 
         iobase = self->io.sir_base;
 
-        /*  
-         * Receive all characters in Rx FIFO, unwrap and unstuff them. 
-         * async_unwrap_char will deliver all found frames  
+        /*
+         * Receive all characters in Rx FIFO, unwrap and unstuff them.
+         * async_unwrap_char will deliver all found frames
          */
         do {
-                async_unwrap_char(self->netdev, &self->stats, &self->rx_buff, 
-                                  inb(iobase+UART_RX));
+                async_unwrap_char(self->netdev, &self->stats, &self->rx_buff,
+                                  inb(iobase + UART_RX));
 
                 /* Make sure we don't stay here to long */
                 if (boguscount++ > 32) {
                         IRDA_DEBUG(2, "%s(), breaking!\n", __FUNCTION__);
                         break;
                 }
-        } while (inb(iobase+UART_LSR) & UART_LSR_DR);   
+        } while (inb(iobase + UART_LSR) & UART_LSR_DR);
 }
 
 
@@ -1397,18 +1418,19 @@ static irqreturn_t smsc_ircc_interrupt(int irq, void *dev_id, struct pt_regs *re
         irqreturn_t ret = IRQ_NONE;
 
         if (dev == NULL) {
-                printk(KERN_WARNING "%s: irq %d for unknown device.\n", 
+                printk(KERN_WARNING "%s: irq %d for unknown device.\n",
                        driver_name, irq);
                 goto irq_ret;
         }
-        self = (struct smsc_ircc_cb *) dev->priv;
+
+        self = netdev_priv(dev);
         IRDA_ASSERT(self != NULL, return IRQ_NONE;);
 
         /* Serialise the interrupt handler in various CPUs, stop Tx path */
-        spin_lock(&self->lock); 
+        spin_lock(&self->lock);
 
         /* Check if we should use the SIR interrupt handler */
-        if (self->io.speed <=  SMSC_IRCC2_MAX_SIR_SPEED) {
+        if (self->io.speed <= SMSC_IRCC2_MAX_SIR_SPEED) {
                 ret = smsc_ircc_interrupt_sir(dev);
                 goto irq_ret_unlock;
         }
@@ -1416,25 +1438,25 @@ static irqreturn_t smsc_ircc_interrupt(int irq, void *dev_id, struct pt_regs *re
         iobase = self->io.fir_base;
 
         register_bank(iobase, 0);
-        iir = inb(iobase+IRCC_IIR);
-        if (iir == 0) 
+        iir = inb(iobase + IRCC_IIR);
+        if (iir == 0)
                 goto irq_ret_unlock;
         ret = IRQ_HANDLED;
 
         /* Disable interrupts */
-        outb(0, iobase+IRCC_IER);
-        lcra = inb(iobase+IRCC_LCR_A);
-        lsr = inb(iobase+IRCC_LSR);
-        
+        outb(0, iobase + IRCC_IER);
+        lcra = inb(iobase + IRCC_LCR_A);
+        lsr = inb(iobase + IRCC_LSR);
+
         IRDA_DEBUG(2, "%s(), iir = 0x%02x\n", __FUNCTION__, iir);
 
         if (iir & IRCC_IIR_EOM) {
                 if (self->io.direction == IO_RECV)
-                        smsc_ircc_dma_receive_complete(self, iobase);
+                        smsc_ircc_dma_receive_complete(self);
                 else
-                        smsc_ircc_dma_xmit_complete(self, iobase);
-                
-                smsc_ircc_dma_receive(self, iobase);
+                        smsc_ircc_dma_xmit_complete(self);
+
+                smsc_ircc_dma_receive(self);
         }
 
         if (iir & IRCC_IIR_ACTIVE_FRAME) {
@@ -1444,7 +1466,7 @@ static irqreturn_t smsc_ircc_interrupt(int irq, void *dev_id, struct pt_regs *re
         /* Enable interrupts again */
 
         register_bank(iobase, 0);
-        outb(IRCC_IER_ACTIVE_FRAME|IRCC_IER_EOM, iobase+IRCC_IER);
+        outb(IRCC_IER_ACTIVE_FRAME | IRCC_IER_EOM, iobase + IRCC_IER);
 
  irq_ret_unlock:
         spin_unlock(&self->lock);
@@ -1459,7 +1481,7 @@ static irqreturn_t smsc_ircc_interrupt(int irq, void *dev_id, struct pt_regs *re
  */
 static irqreturn_t smsc_ircc_interrupt_sir(struct net_device *dev)
 {
-        struct smsc_ircc_cb *self = dev->priv;
+        struct smsc_ircc_cb *self = netdev_priv(dev);
         int boguscount = 0;
         int iobase;
         int iir, lsr;
@@ -1469,14 +1491,14 @@ static irqreturn_t smsc_ircc_interrupt_sir(struct net_device *dev)
 
         iobase = self->io.sir_base;
 
-        iir = inb(iobase+UART_IIR) & UART_IIR_ID;
+        iir = inb(iobase + UART_IIR) & UART_IIR_ID;
         if (iir == 0)
                 return IRQ_NONE;
         while (iir) {
                 /* Clear interrupt */
-                lsr = inb(iobase+UART_LSR);
+                lsr = inb(iobase + UART_LSR);
 
-                IRDA_DEBUG(4, "%s(), iir=%02x, lsr=%02x, iobase=%#x\n", 
+                IRDA_DEBUG(4, "%s(), iir=%02x, lsr=%02x, iobase=%#x\n",
                             __FUNCTION__, iir, lsr, iobase);
 
                 switch (iir) {
@@ -1496,13 +1518,13 @@ static irqreturn_t smsc_ircc_interrupt_sir(struct net_device *dev)
                         IRDA_DEBUG(0, "%s(), unhandled IIR=%#x\n",
                                    __FUNCTION__, iir);
                         break;
-                } 
-                
+                }
+
                 /* Make sure we don't stay here to long */
                 if (boguscount++ > 100)
                         break;
 
-                iir = inb(iobase + UART_IIR) & UART_IIR_ID;
+                iir = inb(iobase + UART_IIR) & UART_IIR_ID;
         }
         /*spin_unlock(&self->lock);*/
         return IRQ_HANDLED;
@@ -1529,7 +1551,7 @@ static int ircc_is_receiving(struct smsc_ircc_cb *self)
                    get_dma_residue(self->io.dma));
 
         status = (self->rx_buff.state != OUTSIDE_FRAME);
-        
+
         return status;
 }
 #endif /* unused */
@@ -1544,19 +1566,16 @@ static int ircc_is_receiving(struct smsc_ircc_cb *self)
 static int smsc_ircc_net_open(struct net_device *dev)
 {
         struct smsc_ircc_cb *self;
-        int iobase;
         char hwname[16];
         unsigned long flags;
 
         IRDA_DEBUG(1, "%s\n", __FUNCTION__);
-        
+
         IRDA_ASSERT(dev != NULL, return -1;);
-        self = (struct smsc_ircc_cb *) dev->priv;
+        self = netdev_priv(dev);
         IRDA_ASSERT(self != NULL, return 0;);
-        
-        iobase = self->io.fir_base;
 
-        if (request_irq(self->io.irq, smsc_ircc_interrupt, 0, dev->name, 
+        if (request_irq(self->io.irq, smsc_ircc_interrupt, 0, dev->name,
                         (void *) dev)) {
                 IRDA_DEBUG(0, "%s(), unable to allocate irq=%d\n",
                            __FUNCTION__, self->io.irq);
@@ -1568,14 +1587,14 @@ static int smsc_ircc_net_open(struct net_device *dev)
         self->io.speed = 0;
         smsc_ircc_change_speed(self, SMSC_IRCC2_C_IRDA_FALLBACK_SPEED);
         spin_unlock_irqrestore(&self->lock, flags);
-        
+
         /* Give self a hardware name */
         /* It would be cool to offer the chip revision here - Jean II */
         sprintf(hwname, "SMSC @ 0x%03x", self->io.fir_base);
 
-        /* 
+        /*
          * Open new IrLAP layer instance, now that everything should be
-         * initialized properly 
+         * initialized properly
          */
         self->irlap = irlap_open(dev, &self->qos, hwname);
 
@@ -1590,7 +1609,7 @@ static int smsc_ircc_net_open(struct net_device *dev)
                              __FUNCTION__, self->io.dma);
                 return -EAGAIN;
         }
-        
+
         netif_start_queue(dev);
 
         return 0;
@@ -1605,73 +1624,53 @@ static int smsc_ircc_net_open(struct net_device *dev)
 static int smsc_ircc_net_close(struct net_device *dev)
 {
         struct smsc_ircc_cb *self;
-        int iobase;
 
         IRDA_DEBUG(1, "%s\n", __FUNCTION__);
-        
+
         IRDA_ASSERT(dev != NULL, return -1;);
-        self = (struct smsc_ircc_cb *) dev->priv;       
+        self = netdev_priv(dev);
         IRDA_ASSERT(self != NULL, return 0;);
-        
-        iobase = self->io.fir_base;
 
         /* Stop device */
         netif_stop_queue(dev);
-        
+
         /* Stop and remove instance of IrLAP */
         if (self->irlap)
                 irlap_close(self->irlap);
         self->irlap = NULL;
 
         free_irq(self->io.irq, dev);
-
         disable_dma(self->io.dma);
-
         free_dma(self->io.dma);
 
         return 0;
 }
 
-
-static void smsc_ircc_suspend(struct smsc_ircc_cb *self)
+static int smsc_ircc_suspend(struct device *dev, pm_message_t state, u32 level)
 {
-        IRDA_MESSAGE("%s, Suspending\n", driver_name);
+        struct smsc_ircc_cb *self = dev_get_drvdata(dev);
 
-        if (self->io.suspended)
-                return;
+        IRDA_MESSAGE("%s, Suspending\n", driver_name);
 
-        smsc_ircc_net_close(self->netdev);
+        if (level == SUSPEND_DISABLE && !self->io.suspended) {
+                smsc_ircc_net_close(self->netdev);
+                self->io.suspended = 1;
+        }
 
-        self->io.suspended = 1;
+        return 0;
 }
 
-static void smsc_ircc_wakeup(struct smsc_ircc_cb *self)
+static int smsc_ircc_resume(struct device *dev, u32 level)
 {
-        if (!self->io.suspended)
-                return;
+        struct smsc_ircc_cb *self = dev_get_drvdata(dev);
 
-        /* The code was doing a "cli()" here, but this can't be right.
-         * If you need protection, do it in net_open with a spinlock
-         * or give a good reason. - Jean II */
+        if (level == RESUME_ENABLE && self->io.suspended) {
 
-        smsc_ircc_net_open(self->netdev);
-        
-        IRDA_MESSAGE("%s, Waking up\n", driver_name);
-}
+                smsc_ircc_net_open(self->netdev);
+                self->io.suspended = 0;
 
-static int smsc_ircc_pmproc(struct pm_dev *dev, pm_request_t rqst, void *data)
-{
-        struct smsc_ircc_cb *self = (struct smsc_ircc_cb*) dev->data;
-        if (self) {
-                switch (rqst) {
-                case PM_SUSPEND:
-                        smsc_ircc_suspend(self);
-                        break;
-                case PM_RESUME:
-                        smsc_ircc_wakeup(self);
-                        break;
-                }
-        }
+                IRDA_MESSAGE("%s, Waking up\n", driver_name);
+        }
         return 0;
 }
 
@@ -1690,10 +1689,7 @@ static int __exit smsc_ircc_close(struct smsc_ircc_cb *self)
 
         IRDA_ASSERT(self != NULL, return -1;);
 
-        iobase = self->io.fir_base;
-
-        if (self->pmdev)
-                pm_unregister(self->pmdev);
+        platform_device_unregister(self->pldev);
 
         /* Remove netdevice */
         unregister_netdev(self->netdev);
@@ -1702,15 +1698,16 @@ static int __exit smsc_ircc_close(struct smsc_ircc_cb *self)
         spin_lock_irqsave(&self->lock, flags);
 
         /* Stop interrupts */
+        iobase = self->io.fir_base;
         register_bank(iobase, 0);
-        outb(0, iobase+IRCC_IER);
-        outb(IRCC_MASTER_RESET, iobase+IRCC_MASTER);
-        outb(0x00, iobase+IRCC_MASTER);
+        outb(0, iobase + IRCC_IER);
+        outb(IRCC_MASTER_RESET, iobase + IRCC_MASTER);
+        outb(0x00, iobase + IRCC_MASTER);
 #if 0
         /* Reset to SIR mode */
         register_bank(iobase, 1);
-        outb(IRCC_CFGA_IRDA_SIR_A|IRCC_CFGA_TX_POLARITY, iobase+IRCC_SCE_CFGA);
-        outb(IRCC_CFGB_IR, iobase+IRCC_SCE_CFGB);
+        outb(IRCC_CFGA_IRDA_SIR_A|IRCC_CFGA_TX_POLARITY, iobase + IRCC_SCE_CFGA);
+        outb(IRCC_CFGB_IR, iobase + IRCC_SCE_CFGB);
 #endif
         spin_unlock_irqrestore(&self->lock, flags);
 
@@ -1720,7 +1717,7 @@ static int __exit smsc_ircc_close(struct smsc_ircc_cb *self)
 
         release_region(self->io.fir_base, self->io.fir_ext);
 
-        IRDA_DEBUG(0, "%s(), releasing 0x%03x\n", __FUNCTION__, 
+        IRDA_DEBUG(0, "%s(), releasing 0x%03x\n", __FUNCTION__,
                    self->io.sir_base);
 
         release_region(self->io.sir_base, self->io.sir_ext);
@@ -1728,7 +1725,7 @@ static int __exit smsc_ircc_close(struct smsc_ircc_cb *self)
         if (self->tx_buff.head)
                 dma_free_coherent(NULL, self->tx_buff.truesize,
                                   self->tx_buff.head, self->tx_buff_dma);
-        
+
         if (self->rx_buff.head)
                 dma_free_coherent(NULL, self->rx_buff.truesize,
                                   self->rx_buff.head, self->rx_buff_dma);
@@ -1744,10 +1741,12 @@ static void __exit smsc_ircc_cleanup(void)
 
         IRDA_DEBUG(1, "%s\n", __FUNCTION__);
 
-        for (i=0; i < 2; i++) {
+        for (i = 0; i < 2; i++) {
                 if (dev_self[i])
                         smsc_ircc_close(dev_self[i]);
         }
+
+        driver_unregister(&smsc_ircc_driver);
 }
 
 /*
@@ -1763,34 +1762,34 @@ void smsc_ircc_sir_start(struct smsc_ircc_cb *self)
 
         IRDA_DEBUG(3, "%s\n", __FUNCTION__);
 
-        IRDA_ASSERT(self != NULL, return;);     
-        dev= self->netdev;
-        IRDA_ASSERT(dev != NULL, return;);              
+        IRDA_ASSERT(self != NULL, return;);
+        dev = self->netdev;
+        IRDA_ASSERT(dev != NULL, return;);
         dev->hard_start_xmit = &smsc_ircc_hard_xmit_sir;
 
         fir_base = self->io.fir_base;
         sir_base = self->io.sir_base;
 
         /* Reset everything */
-        outb(IRCC_MASTER_RESET, fir_base+IRCC_MASTER);
+        outb(IRCC_MASTER_RESET, fir_base + IRCC_MASTER);
 
         #if SMSC_IRCC2_C_SIR_STOP
         /*smsc_ircc_sir_stop(self);*/
         #endif
 
         register_bank(fir_base, 1);
-        outb(((inb(fir_base+IRCC_SCE_CFGA) & IRCC_SCE_CFGA_BLOCK_CTRL_BITS_MASK) | IRCC_CFGA_IRDA_SIR_A), fir_base+IRCC_SCE_CFGA);
+        outb(((inb(fir_base + IRCC_SCE_CFGA) & IRCC_SCE_CFGA_BLOCK_CTRL_BITS_MASK) | IRCC_CFGA_IRDA_SIR_A), fir_base + IRCC_SCE_CFGA);
 
         /* Initialize UART */
-        outb(UART_LCR_WLEN8, sir_base+UART_LCR);  /* Reset DLAB */
-        outb((UART_MCR_DTR | UART_MCR_RTS | UART_MCR_OUT2), sir_base+UART_MCR);
-        
+        outb(UART_LCR_WLEN8, sir_base + UART_LCR);  /* Reset DLAB */
+        outb((UART_MCR_DTR | UART_MCR_RTS | UART_MCR_OUT2), sir_base + UART_MCR);
+
         /* Turn on interrups */
-        outb(UART_IER_RLSI | UART_IER_RDI |UART_IER_THRI, sir_base+UART_IER);
+        outb(UART_IER_RLSI | UART_IER_RDI |UART_IER_THRI, sir_base + UART_IER);
 
         IRDA_DEBUG(3, "%s() - exit\n", __FUNCTION__);
 
-        outb(0x00, fir_base+IRCC_MASTER);
+        outb(0x00, fir_base + IRCC_MASTER);
 }
 
 #if SMSC_IRCC2_C_SIR_STOP
@@ -1802,10 +1801,10 @@ void smsc_ircc_sir_stop(struct smsc_ircc_cb *self)
         iobase = self->io.sir_base;
 
         /* Reset UART */
-        outb(0, iobase+UART_MCR);
-        
+        outb(0, iobase + UART_MCR);
+
         /* Turn off interrupts */
-        outb(0, iobase+UART_IER);
+        outb(0, iobase + UART_IER);
 }
 #endif
 
@@ -1831,16 +1830,16 @@ static void smsc_ircc_sir_write_wakeup(struct smsc_ircc_cb *self)
         /* Finished with frame?  */
         if (self->tx_buff.len > 0)  {
                 /* Write data left in transmit buffer */
-                actual = smsc_ircc_sir_write(iobase, self->io.fifo_size, 
+                actual = smsc_ircc_sir_write(iobase, self->io.fifo_size,
                                       self->tx_buff.data, self->tx_buff.len);
                 self->tx_buff.data += actual;
                 self->tx_buff.len  -= actual;
         } else {
-        
+
         /*if (self->tx_buff.len ==0)  {*/
-                
-                /* 
-                 *  Now serial buffer is almost free & we can start 
+
+                /*
+                 *  Now serial buffer is almost free & we can start
                  *  transmission of another packet. But first we must check
                  *  if we need to change the speed of the hardware
                  */
@@ -1856,21 +1855,19 @@ static void smsc_ircc_sir_write_wakeup(struct smsc_ircc_cb *self)
                 }
                 self->stats.tx_packets++;
 
-                if(self->io.speed <= 115200) {
-                /* 
-                 * Reset Rx FIFO to make sure that all reflected transmit data
-                 * is discarded. This is needed for half duplex operation
-                 */
-                fcr = UART_FCR_ENABLE_FIFO | UART_FCR_CLEAR_RCVR;
-                if (self->io.speed < 38400)
-                        fcr |= UART_FCR_TRIGGER_1;
-                else 
-                        fcr |= UART_FCR_TRIGGER_14;
+                if (self->io.speed <= 115200) {
+                        /*
+                         * Reset Rx FIFO to make sure that all reflected transmit data
+                         * is discarded. This is needed for half duplex operation
+                         */
+                        fcr = UART_FCR_ENABLE_FIFO | UART_FCR_CLEAR_RCVR;
+                        fcr |= self->io.speed < 38400 ?
+                                        UART_FCR_TRIGGER_1 : UART_FCR_TRIGGER_14;
 
-                outb(fcr, iobase+UART_FCR);
+                        outb(fcr, iobase + UART_FCR);
 
-                /* Turn on receive interrupts */
-                outb(UART_IER_RDI, iobase+UART_IER);
+                        /* Turn on receive interrupts */
+                        outb(UART_IER_RDI, iobase + UART_IER);
                 }
         }
 }
@@ -1884,17 +1881,17 @@ static void smsc_ircc_sir_write_wakeup(struct smsc_ircc_cb *self)
 static int smsc_ircc_sir_write(int iobase, int fifo_size, __u8 *buf, int len)
 {
         int actual = 0;
-        
+
         /* Tx FIFO should be empty! */
-        if (!(inb(iobase+UART_LSR) & UART_LSR_THRE)) {
+        if (!(inb(iobase + UART_LSR) & UART_LSR_THRE)) {
                 IRDA_WARNING("%s(), failed, fifo not empty!\n", __FUNCTION__);
                 return 0;
         }
-        
+
         /* Fill FIFO with current frame */
-        while ((fifo_size-- > 0) && (actual < len)) {
+        while (fifo_size-- > 0 && actual < len) {
                 /* Transmit next byte */
-                outb(buf[actual], iobase+UART_TX);
+                outb(buf[actual], iobase + UART_TX);
                 actual++;
         }
         return actual;
@@ -1921,20 +1918,21 @@ static int smsc_ircc_is_receiving(struct smsc_ircc_cb *self)
 static void smsc_ircc_probe_transceiver(struct smsc_ircc_cb *self)
 {
         unsigned int    i;
-        
+
         IRDA_ASSERT(self != NULL, return;);
-        
-        for(i=0; smsc_transceivers[i].name!=NULL; i++) 
-                if((*smsc_transceivers[i].probe)(self->io.fir_base)) {
+
+        for (i = 0; smsc_transceivers[i].name != NULL; i++)
+                if (smsc_transceivers[i].probe(self->io.fir_base)) {
                         IRDA_MESSAGE(" %s transceiver found\n",
                                      smsc_transceivers[i].name);
-                        self->transceiver= i+1;
+                        self->transceiver= i + 1;
                         return;
                 }
+
         IRDA_MESSAGE("No transceiver found. Defaulting to %s\n",
                      smsc_transceivers[SMSC_IRCC2_C_DEFAULT_TRANSCEIVER].name);
-                        
-        self->transceiver= SMSC_IRCC2_C_DEFAULT_TRANSCEIVER;
+
+        self->transceiver = SMSC_IRCC2_C_DEFAULT_TRANSCEIVER;
 }
 
 
@@ -1947,9 +1945,10 @@ static void smsc_ircc_probe_transceiver(struct smsc_ircc_cb *self)
 static void smsc_ircc_set_transceiver_for_speed(struct smsc_ircc_cb *self, u32 speed)
 {
         unsigned int trx;
-        
+
         trx = self->transceiver;
-        if(trx>0) (*smsc_transceivers[trx-1].set_for_speed)(self->io.fir_base, speed);
+        if (trx > 0)
+                smsc_transceivers[trx - 1].set_for_speed(self->io.fir_base, speed);
 }
 
 /*
@@ -1977,16 +1976,14 @@ static void smsc_ircc_set_transceiver_for_speed(struct smsc_ircc_cb *self, u32 s
 
 static void smsc_ircc_sir_wait_hw_transmitter_finish(struct smsc_ircc_cb *self)
 {
-        int iobase;
+        int iobase = self->io.sir_base;
         int count = SMSC_IRCC2_HW_TRANSMITTER_TIMEOUT_US;
-        
-        iobase = self->io.sir_base;
-        
+
         /* Calibrated busy loop */
-        while((count-- > 0) && !(inb(iobase+UART_LSR) & UART_LSR_TEMT))
+        while (count-- > 0 && !(inb(iobase + UART_LSR) & UART_LSR_TEMT))
                 udelay(1);
 
-        if(count == 0)
+        if (count == 0)
                 IRDA_DEBUG(0, "%s(): stuck transmitter\n", __FUNCTION__);
 }
 
@@ -1998,40 +1995,42 @@ static void smsc_ircc_sir_wait_hw_transmitter_finish(struct smsc_ircc_cb *self)
 
 static int __init smsc_ircc_look_for_chips(void)
 {
-        smsc_chip_address_t *address;
-        char    *type;
+        struct smsc_chip_address *address;
+        char *type;
         unsigned int cfg_base, found;
-        
+
         found = 0;
         address = possible_addresses;
-        
-        while(address->cfg_base){
+
+        while (address->cfg_base) {
                 cfg_base = address->cfg_base;
-                
+
                 /*printk(KERN_WARNING "%s(): probing: 0x%02x for: 0x%02x\n", __FUNCTION__, cfg_base, address->type);*/
-                
-                if( address->type & SMSCSIO_TYPE_FDC){
+
+                if (address->type & SMSCSIO_TYPE_FDC) {
                         type = "FDC";
-                        if((address->type) & SMSCSIO_TYPE_FLAT) {
-                                if(!smsc_superio_flat(fdc_chips_flat,cfg_base, type)) found++;
-                        }
-                        if((address->type) & SMSCSIO_TYPE_PAGED) {
-                                if(!smsc_superio_paged(fdc_chips_paged,cfg_base, type)) found++;                
-                        }                       
+                        if (address->type & SMSCSIO_TYPE_FLAT)
+                                if (!smsc_superio_flat(fdc_chips_flat, cfg_base, type))
+                                        found++;
+
+                        if (address->type & SMSCSIO_TYPE_PAGED)
+                                if (!smsc_superio_paged(fdc_chips_paged, cfg_base, type))
+                                        found++;
                 }
-                if( address->type & SMSCSIO_TYPE_LPC){
+                if (address->type & SMSCSIO_TYPE_LPC) {
                         type = "LPC";
-                        if((address->type) & SMSCSIO_TYPE_FLAT) {
-                                if(!smsc_superio_flat(lpc_chips_flat,cfg_base,type)) found++;
-                        }
-                        if((address->type) & SMSCSIO_TYPE_PAGED) {
-                                if(!smsc_superio_paged(lpc_chips_paged,cfg_base,"LPC")) found++;                
-                        }                       
+                        if (address->type & SMSCSIO_TYPE_FLAT)
+                                if (!smsc_superio_flat(lpc_chips_flat, cfg_base, type))
+                                        found++;
+
+                        if (address->type & SMSCSIO_TYPE_PAGED)
+                                if (!smsc_superio_paged(lpc_chips_paged, cfg_base, type))
+                                        found++;
                 }
                 address++;
         }
         return found;
-} 
+}
 
 /*
  * Function smsc_superio_flat (chip, base, type)
@@ -2039,7 +2038,7 @@ static int __init smsc_ircc_look_for_chips(void)
  *    Try to get configuration of a smc SuperIO chip with flat register model
  *
  */
-static int __init smsc_superio_flat(const smsc_chip_t *chips, unsigned short cfgbase, char *type)
+static int __init smsc_superio_flat(const struct smsc_chip *chips, unsigned short cfgbase, char *type)
 {
         unsigned short firbase, sirbase;
         u8 mode, dma, irq;
@@ -2047,39 +2046,37 @@ static int __init smsc_superio_flat(const smsc_chip_t *chips, unsigned short cfg
 
         IRDA_DEBUG(1, "%s\n", __FUNCTION__);
 
-        if (smsc_ircc_probe(cfgbase, SMSCSIOFLAT_DEVICEID_REG, chips, type)==NULL)
+        if (smsc_ircc_probe(cfgbase, SMSCSIOFLAT_DEVICEID_REG, chips, type) == NULL)
                 return ret;
 
         outb(SMSCSIOFLAT_UARTMODE0C_REG, cfgbase);
-        mode = inb(cfgbase+1);
-        
+        mode = inb(cfgbase + 1);
+
         /*printk(KERN_WARNING "%s(): mode: 0x%02x\n", __FUNCTION__, mode);*/
-        
-        if(!(mode & SMSCSIOFLAT_UART2MODE_VAL_IRDA))
+
+        if (!(mode & SMSCSIOFLAT_UART2MODE_VAL_IRDA))
                 IRDA_WARNING("%s(): IrDA not enabled\n", __FUNCTION__);
 
         outb(SMSCSIOFLAT_UART2BASEADDR_REG, cfgbase);
-        sirbase = inb(cfgbase+1) << 2;
+        sirbase = inb(cfgbase + 1) << 2;
 
-        /* FIR iobase */
+        /* FIR iobase */
         outb(SMSCSIOFLAT_FIRBASEADDR_REG, cfgbase);
-        firbase = inb(cfgbase+1) << 3;
+        firbase = inb(cfgbase + 1) << 3;
 
         /* DMA */
         outb(SMSCSIOFLAT_FIRDMASELECT_REG, cfgbase);
-        dma = inb(cfgbase+1) & SMSCSIOFLAT_FIRDMASELECT_MASK;
-        
+        dma = inb(cfgbase + 1) & SMSCSIOFLAT_FIRDMASELECT_MASK;
+
         /* IRQ */
         outb(SMSCSIOFLAT_UARTIRQSELECT_REG, cfgbase);
-        irq = inb(cfgbase+1) & SMSCSIOFLAT_UART2IRQSELECT_MASK;
+        irq = inb(cfgbase + 1) & SMSCSIOFLAT_UART2IRQSELECT_MASK;
 
         IRDA_MESSAGE("%s(): fir: 0x%02x, sir: 0x%02x, dma: %02d, irq: %d, mode: 0x%02x\n", __FUNCTION__, firbase, sirbase, dma, irq, mode);
 
-        if (firbase) {
-                if (smsc_ircc_open(firbase, sirbase, dma, irq) == 0)
-                        ret=0; 
-        }
-        
+        if (firbase && smsc_ircc_open(firbase, sirbase, dma, irq) == 0)
+                ret = 0;
+
         /* Exit configuration */
         outb(SMSCSIO_CFGEXITKEY, cfgbase);
 
@@ -2092,26 +2089,26 @@ static int __init smsc_superio_flat(const smsc_chip_t *chips, unsigned short cfg
  *    Try  to get configuration of a smc SuperIO chip with paged register model
  *
  */
-static int __init smsc_superio_paged(const smsc_chip_t *chips, unsigned short cfg_base, char *type)
+static int __init smsc_superio_paged(const struct smsc_chip *chips, unsigned short cfg_base, char *type)
 {
         unsigned short fir_io, sir_io;
         int ret = -ENODEV;
-        
+
         IRDA_DEBUG(1, "%s\n", __FUNCTION__);
 
-        if (smsc_ircc_probe(cfg_base,0x20,chips,type)==NULL)
+        if (smsc_ircc_probe(cfg_base, 0x20, chips, type) == NULL)
                 return ret;
-        
+
         /* Select logical device (UART2) */
         outb(0x07, cfg_base);
         outb(0x05, cfg_base + 1);
-                
+
         /* SIR iobase */
         outb(0x60, cfg_base);
-        sir_io  = inb(cfg_base + 1) << 8;
+        sir_io = inb(cfg_base + 1) << 8;
         outb(0x61, cfg_base);
         sir_io |= inb(cfg_base + 1);
-                
+
         /* Read FIR base */
         outb(0x62, cfg_base);
         fir_io = inb(cfg_base + 1) << 8;
@@ -2119,11 +2116,9 @@ static int __init smsc_superio_paged(const smsc_chip_t *chips, unsigned short cf
         fir_io |= inb(cfg_base + 1);
         outb(0x2b, cfg_base); /* ??? */
 
-        if (fir_io) {
-                if (smsc_ircc_open(fir_io, sir_io, ircc_dma, ircc_irq) == 0)
-                        ret=0; 
-        }
-        
+        if (fir_io && smsc_ircc_open(fir_io, sir_io, ircc_dma, ircc_irq) == 0)
+                ret = 0;
+
         /* Exit configuration */
         outb(SMSCSIO_CFGEXITKEY, cfg_base);
 
@@ -2131,21 +2126,17 @@ static int __init smsc_superio_paged(const smsc_chip_t *chips, unsigned short cf
 }
 
 
-static int __init smsc_access(unsigned short cfg_base,unsigned char reg)
+static int __init smsc_access(unsigned short cfg_base, unsigned char reg)
 {
         IRDA_DEBUG(1, "%s\n", __FUNCTION__);
 
         outb(reg, cfg_base);
-
-        if (inb(cfg_base)!=reg)
-                return -1;
-
-        return 0;
+        return inb(cfg_base) != reg ? -1 : 0;
 }
 
-static const smsc_chip_t * __init smsc_ircc_probe(unsigned short cfg_base,u8 reg,const smsc_chip_t *chip,char *type)
+static const struct smsc_chip * __init smsc_ircc_probe(unsigned short cfg_base, u8 reg, const struct smsc_chip *chip, char *type)
 {
-        u8 devid,xdevid,rev; 
+        u8 devid, xdevid, rev;
 
         IRDA_DEBUG(1, "%s\n", __FUNCTION__);
 
@@ -2158,7 +2149,7 @@ static const smsc_chip_t * __init smsc_ircc_probe(unsigned short cfg_base,u8 reg
 
         outb(reg, cfg_base);
 
-        xdevid=inb(cfg_base+1);
+        xdevid = inb(cfg_base + 1);
 
         /* Enter configuration */
 
@@ -2168,51 +2159,49 @@ static const smsc_chip_t * __init smsc_ircc_probe(unsigned short cfg_base,u8 reg
         if (smsc_access(cfg_base,0x55)) /* send second key and check */
                 return NULL;
         #endif
-        
+
         /* probe device ID */
 
-        if (smsc_access(cfg_base,reg))
+        if (smsc_access(cfg_base, reg))
                 return NULL;
 
-        devid=inb(cfg_base+1);
-        
-        if (devid==0)                   /* typical value for unused port */
-                return NULL;
+        devid = inb(cfg_base + 1);
 
-        if (devid==0xff)                /* typical value for unused port */
+        if (devid == 0 || devid == 0xff)        /* typical values for unused port */
                 return NULL;
 
         /* probe revision ID */
 
-        if (smsc_access(cfg_base,reg+1))
+        if (smsc_access(cfg_base, reg + 1))
                 return NULL;
 
-        rev=inb(cfg_base+1);
+        rev = inb(cfg_base + 1);
 
-        if (rev>=128)                   /* i think this will make no sense */
+        if (rev >= 128)                 /* i think this will make no sense */
                 return NULL;
 
-        if (devid==xdevid)              /* protection against false positives */        
+        if (devid == xdevid)            /* protection against false positives */
                 return NULL;
 
         /* Check for expected device ID; are there others? */
 
-        while(chip->devid!=devid) {
+        while (chip->devid != devid) {
 
                 chip++;
 
-                if (chip->name==NULL)
+                if (chip->name == NULL)
                         return NULL;
         }
 
-        IRDA_MESSAGE("found SMC SuperIO Chip (devid=0x%02x rev=%02X base=0x%04x): %s%s\n",devid,rev,cfg_base,type,chip->name);
+        IRDA_MESSAGE("found SMC SuperIO Chip (devid=0x%02x rev=%02X base=0x%04x): %s%s\n",
+                     devid, rev, cfg_base, type, chip->name);
 
-        if (chip->rev>rev){
-                IRDA_MESSAGE("Revision higher than expected\n");        
+        if (chip->rev > rev) {
+                IRDA_MESSAGE("Revision higher than expected\n");
                 return NULL;
         }
-        
-        if (chip->flags&NoIRDA)
+
+        if (chip->flags & NoIRDA)
                 IRDA_MESSAGE("chipset does not support IRDA\n");
 
         return chip;
@@ -2226,8 +2215,8 @@ static int __init smsc_superio_fdc(unsigned short cfg_base)
                 IRDA_WARNING("%s: can't get cfg_base of 0x%03x\n",
                              __FUNCTION__, cfg_base);
         } else {
-                if (!smsc_superio_flat(fdc_chips_flat,cfg_base,"FDC")
-                    ||!smsc_superio_paged(fdc_chips_paged,cfg_base,"FDC"))
+                if (!smsc_superio_flat(fdc_chips_flat, cfg_base, "FDC") ||
+                    !smsc_superio_paged(fdc_chips_paged, cfg_base, "FDC"))
                         ret =  0;
 
                 release_region(cfg_base, 2);
@@ -2244,9 +2233,10 @@ static int __init smsc_superio_lpc(unsigned short cfg_base)
                 IRDA_WARNING("%s: can't get cfg_base of 0x%03x\n",
                              __FUNCTION__, cfg_base);
         } else {
-                if (!smsc_superio_flat(lpc_chips_flat,cfg_base,"LPC")
-                    ||!smsc_superio_paged(lpc_chips_paged,cfg_base,"LPC"))
+                if (!smsc_superio_flat(lpc_chips_flat, cfg_base, "LPC") ||
+                    !smsc_superio_paged(lpc_chips_paged, cfg_base, "LPC"))
                         ret = 0;
+
                 release_region(cfg_base, 2);
         }
         return ret;
@@ -2269,18 +2259,23 @@ static int __init smsc_superio_lpc(unsigned short cfg_base)
 static void smsc_ircc_set_transceiver_smsc_ircc_atc(int fir_base, u32 speed)
 {
         unsigned long jiffies_now, jiffies_timeout;
-        u8      val;
-        
-        jiffies_now= jiffies;
-        jiffies_timeout= jiffies+SMSC_IRCC2_ATC_PROGRAMMING_TIMEOUT_JIFFIES;
-        
+        u8 val;
+
+        jiffies_now = jiffies;
+        jiffies_timeout = jiffies + SMSC_IRCC2_ATC_PROGRAMMING_TIMEOUT_JIFFIES;
+
         /* ATC */
         register_bank(fir_base, 4);
-        outb((inb(fir_base+IRCC_ATC) & IRCC_ATC_MASK) |IRCC_ATC_nPROGREADY|IRCC_ATC_ENABLE, fir_base+IRCC_ATC);
-        while((val=(inb(fir_base+IRCC_ATC) & IRCC_ATC_nPROGREADY)) && !time_after(jiffies, jiffies_timeout));
-        if(val)
+        outb((inb(fir_base + IRCC_ATC) & IRCC_ATC_MASK) | IRCC_ATC_nPROGREADY|IRCC_ATC_ENABLE,
+             fir_base + IRCC_ATC);
+
+        while ((val = (inb(fir_base + IRCC_ATC) & IRCC_ATC_nPROGREADY)) &&
+                !time_after(jiffies, jiffies_timeout))
+                /* empty */;
+
+        if (val)
                 IRDA_WARNING("%s(): ATC: 0x%02x\n", __FUNCTION__,
-                             inb(fir_base+IRCC_ATC));
+                             inb(fir_base + IRCC_ATC));
 }
 
 /*
@@ -2298,34 +2293,32 @@ static int smsc_ircc_probe_transceiver_smsc_ircc_atc(int fir_base)
 /*
  * Function smsc_ircc_set_transceiver_smsc_ircc_fast_pin_select(self, speed)
  *
- *    Set transceiver 
+ *    Set transceiver
  *
  */
 
 static void smsc_ircc_set_transceiver_smsc_ircc_fast_pin_select(int fir_base, u32 speed)
 {
-        u8      fast_mode;
-        
-        switch(speed)
-        {
-                default:
-                case 576000 :
-                fast_mode = 0; 
+        u8 fast_mode;
+
+        switch (speed) {
+        default:
+        case 576000 :
+                fast_mode = 0;
                 break;
-                case 1152000 :
-                case 4000000 :
+        case 1152000 :
+        case 4000000 :
                 fast_mode = IRCC_LCR_A_FAST;
                 break;
-                
         }
         register_bank(fir_base, 0);
-        outb((inb(fir_base+IRCC_LCR_A) &  0xbf) | fast_mode, fir_base+IRCC_LCR_A);
+        outb((inb(fir_base + IRCC_LCR_A) & 0xbf) | fast_mode, fir_base + IRCC_LCR_A);
 }
 
 /*
  * Function smsc_ircc_probe_transceiver_smsc_ircc_fast_pin_select(fir_base)
  *
- *    Probe transceiver 
+ *    Probe transceiver
  *
  */
 
@@ -2337,35 +2330,34 @@ static int smsc_ircc_probe_transceiver_smsc_ircc_fast_pin_select(int fir_base)
 /*
  * Function smsc_ircc_set_transceiver_toshiba_sat1800(fir_base, speed)
  *
- *    Set transceiver 
+ *    Set transceiver
  *
  */
 
 static void smsc_ircc_set_transceiver_toshiba_sat1800(int fir_base, u32 speed)
 {
-        u8      fast_mode;
-        
-        switch(speed)
-        {
-                default:
-                case 576000 :
-                fast_mode = 0; 
+        u8 fast_mode;
+
+        switch (speed) {
+        default:
+        case 576000 :
+                fast_mode = 0;
                 break;
-                case 1152000 :
-                case 4000000 :
+        case 1152000 :
+        case 4000000 :
                 fast_mode = /*IRCC_LCR_A_FAST |*/ IRCC_LCR_A_GP_DATA;
                 break;
-                
+
         }
         /* This causes an interrupt */
         register_bank(fir_base, 0);
-        outb((inb(fir_base+IRCC_LCR_A) &  0xbf) | fast_mode, fir_base+IRCC_LCR_A);
+        outb((inb(fir_base + IRCC_LCR_A) &  0xbf) | fast_mode, fir_base + IRCC_LCR_A);
 }
 
 /*
  * Function smsc_ircc_probe_transceiver_toshiba_sat1800(fir_base)
  *
- *    Probe transceiver 
+ *    Probe transceiver
  *
  */
 
@@ -2377,20 +2369,3 @@ static int smsc_ircc_probe_transceiver_toshiba_sat1800(int fir_base)
 
 module_init(smsc_ircc_init);
 module_exit(smsc_ircc_cleanup);
-
-MODULE_AUTHOR("Daniele Peri <peri@csai.unipa.it>");
-MODULE_DESCRIPTION("SMC IrCC SIR/FIR controller driver");
-MODULE_LICENSE("GPL");
-
-module_param(ircc_dma, int, 0);
-MODULE_PARM_DESC(ircc_dma, "DMA channel");
-module_param(ircc_irq, int, 0);
-MODULE_PARM_DESC(ircc_irq, "IRQ line");
-module_param(ircc_fir, int, 0);
-MODULE_PARM_DESC(ircc_fir, "FIR Base Address");
-module_param(ircc_sir, int, 0);
-MODULE_PARM_DESC(ircc_sir, "SIR Base Address");
-module_param(ircc_cfg, int, 0);
-MODULE_PARM_DESC(ircc_cfg, "Configuration register base address");
-module_param(ircc_transceiver, int, 0);
-MODULE_PARM_DESC(ircc_transceiver, "Transceiver type");
diff --git a/drivers/net/irda/smsc-ircc2.h b/drivers/net/irda/smsc-ircc2.h
index 458611cc0d4..0c36286d87f 100644
--- a/drivers/net/irda/smsc-ircc2.h
+++ b/drivers/net/irda/smsc-ircc2.h
@@ -1,5 +1,5 @@
 /*********************************************************************
- * $Id: smsc-ircc2.h,v 1.12.2.1 2002/10/27 10:52:37 dip Exp $               
+ * $Id: smsc-ircc2.h,v 1.12.2.1 2002/10/27 10:52:37 dip Exp $
  *
  * Description:   Definitions for the SMC IrCC chipset
  * Status:        Experimental.
@@ -9,25 +9,25 @@
  *     All Rights Reserved.
  *
  * Based on smc-ircc.h:
- * 
+ *
  *     Copyright (c) 1999-2000, Dag Brattli <dagb@cs.uit.no>
  *     Copyright (c) 1998-1999, Thomas Davis (tadavis@jps.net>
  *     All Rights Reserved
  *
- *      
- *     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 of 
+ *
+ *     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 of
  *     the License, 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.
- * 
- *     You should have received a copy of the GNU General Public License 
- *     along with this program; if not, write to the Free Software 
- *     Foundation, Inc., 59 Temple Place, Suite 330, Boston, 
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program; if not, write to the Free Software
+ *     Foundation, Inc., 59 Temple Place, Suite 330, Boston,
  *     MA 02111-1307 USA
  *
  ********************************************************************/
@@ -112,10 +112,10 @@
 
 #define   IRCC_CFGA_COM                         0x00
 #define         IRCC_SCE_CFGA_BLOCK_CTRL_BITS_MASK      0x87
-#define         IRCC_CFGA_IRDA_SIR_A    0x08
-#define         IRCC_CFGA_ASK_SIR               0x10
-#define         IRCC_CFGA_IRDA_SIR_B    0x18
-#define         IRCC_CFGA_IRDA_HDLC             0x20
+#define         IRCC_CFGA_IRDA_SIR_A    0x08
+#define         IRCC_CFGA_ASK_SIR               0x10
+#define         IRCC_CFGA_IRDA_SIR_B    0x18
+#define         IRCC_CFGA_IRDA_HDLC             0x20
 #define         IRCC_CFGA_IRDA_4PPM             0x28
 #define         IRCC_CFGA_CONSUMER              0x30
 #define         IRCC_CFGA_RAW_IR                0x38
@@ -130,7 +130,7 @@
 #define IRCC_CFGB_LPBCK_TX_CRC     0x10
 #define IRCC_CFGB_NOWAIT           0x08
 #define IRCC_CFGB_STRING_MOVE      0x04
-#define IRCC_CFGB_DMA_BURST        0x02
+#define IRCC_CFGB_DMA_BURST        0x02
 #define IRCC_CFGB_DMA_ENABLE       0x01
 
 #define IRCC_CFGB_MUX_COM          0x00
@@ -141,11 +141,11 @@
 /* Register block 3 - Identification Registers! */
 #define IRCC_ID_HIGH               0x00   /* 0x10 */
 #define IRCC_ID_LOW                0x01   /* 0xB8 */
-#define IRCC_CHIP_ID               0x02   /* 0xF1 */
+#define IRCC_CHIP_ID               0x02   /* 0xF1 */
 #define IRCC_VERSION               0x03   /* 0x01 */
 #define IRCC_INTERFACE             0x04   /* low 4 = DMA, high 4 = IRQ */
-#define         IRCC_INTERFACE_DMA_MASK 0x0F   /* low 4 = DMA, high 4 = IRQ */
-#define         IRCC_INTERFACE_IRQ_MASK 0xF0   /* low 4 = DMA, high 4 = IRQ */
+#define         IRCC_INTERFACE_DMA_MASK 0x0F   /* low 4 = DMA, high 4 = IRQ */
+#define         IRCC_INTERFACE_IRQ_MASK 0xF0   /* low 4 = DMA, high 4 = IRQ */
 
 /* Register block 4 - IrDA */
 #define IRCC_CONTROL               0x00
@@ -163,10 +163,10 @@
 
 /* Register block 5 - IrDA */
 #define IRCC_ATC                                        0x00
-#define         IRCC_ATC_nPROGREADY             0x80
-#define         IRCC_ATC_SPEED                  0x40
-#define         IRCC_ATC_ENABLE                 0x20
-#define         IRCC_ATC_MASK                   0xE0
+#define         IRCC_ATC_nPROGREADY             0x80
+#define         IRCC_ATC_SPEED                  0x40
+#define         IRCC_ATC_ENABLE                 0x20
+#define         IRCC_ATC_MASK                   0xE0
 
 
 #define IRCC_IRHALFDUPLEX_TIMEOUT       0x01
@@ -178,8 +178,8 @@
  */
 
 #define SMSC_IRCC2_MAX_SIR_SPEED                115200
-#define SMSC_IRCC2_FIR_CHIP_IO_EXTENT   8
-#define SMSC_IRCC2_SIR_CHIP_IO_EXTENT   8
+#define SMSC_IRCC2_FIR_CHIP_IO_EXTENT   8
+#define SMSC_IRCC2_SIR_CHIP_IO_EXTENT   8
 #define SMSC_IRCC2_FIFO_SIZE                    16
 #define SMSC_IRCC2_FIFO_THRESHOLD               64
 /* Max DMA buffer size needed = (data_size + 6) * (window_size) + 6; */
diff --git a/drivers/net/irda/vlsi_ir.c b/drivers/net/irda/vlsi_ir.c
index 006e4f57560..6d9de626c96 100644
--- a/drivers/net/irda/vlsi_ir.c
+++ b/drivers/net/irda/vlsi_ir.c
@@ -1749,11 +1749,6 @@ static int vlsi_irda_suspend(struct pci_dev *pdev, pm_message_t state)
         struct net_device *ndev = pci_get_drvdata(pdev);
         vlsi_irda_dev_t *idev;
 
-        if (state < 1 || state > 3 ) {
-                IRDA_ERROR("%s - %s: invalid pm state request: %u\n",
-                           __FUNCTION__, PCIDEV_NAME(pdev), state);
-                return 0;
-        }
         if (!ndev) {
                 IRDA_ERROR("%s - %s: no netdevice \n",
                            __FUNCTION__, PCIDEV_NAME(pdev));
@@ -1762,12 +1757,12 @@ static int vlsi_irda_suspend(struct pci_dev *pdev, pm_message_t state)
         idev = ndev->priv;      
         down(&idev->sem);
         if (pdev->current_state != 0) {                 /* already suspended */
-                if (state > pdev->current_state) {      /* simply go deeper */
-                        pci_set_power_state(pdev,state);
-                        pdev->current_state = state;
+                if (state.event > pdev->current_state) {        /* simply go deeper */
+                        pci_set_power_state(pdev, pci_choose_state(pdev, state));
+                        pdev->current_state = state.event;
                 }
                 else
-                        IRDA_ERROR("%s - %s: invalid suspend request %u -> %u\n", __FUNCTION__, PCIDEV_NAME(pdev), pdev->current_state, state);
+                        IRDA_ERROR("%s - %s: invalid suspend request %u -> %u\n", __FUNCTION__, PCIDEV_NAME(pdev), pdev->current_state, state.event);
                 up(&idev->sem);
                 return 0;
         }
@@ -1781,8 +1776,8 @@ static int vlsi_irda_suspend(struct pci_dev *pdev, pm_message_t state)
                         idev->new_baud = idev->baud;
         }
 
-        pci_set_power_state(pdev,state);
-        pdev->current_state = state;
+        pci_set_power_state(pdev, pci_choose_state(pdev, state));
+        pdev->current_state = state.event;
         idev->resume_ok = 1;
         up(&idev->sem);
         return 0;
@@ -1807,8 +1802,8 @@ static int vlsi_irda_resume(struct pci_dev *pdev)
                 return 0;
         }
         
-        pci_set_power_state(pdev, 0);
-        pdev->current_state = 0;
+        pci_set_power_state(pdev, PCI_D0);
+        pdev->current_state = PM_EVENT_ON;
 
         if (!idev->resume_ok) {
                 /* should be obsolete now - but used to happen due to:
diff --git a/drivers/net/iseries_veth.c b/drivers/net/iseries_veth.c
index dc5d089bf18..3d56cf5a4e2 100644
--- a/drivers/net/iseries_veth.c
+++ b/drivers/net/iseries_veth.c
@@ -4,6 +4,7 @@
  * Copyright (C) 2001 Kyle A. Lucke (klucke@us.ibm.com), IBM Corp.
  * Substantially cleaned up by:
  * Copyright (C) 2003 David Gibson <dwg@au1.ibm.com>, IBM Corporation.
+ * Copyright (C) 2004-2005 Michael Ellerman, IBM Corporation.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index fb6b232069d..7c9dbc8c942 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -58,11 +58,10 @@
 
 #define INT_CAUSE_UNMASK_ALL            0x0007ffff
 #define INT_CAUSE_UNMASK_ALL_EXT        0x0011ffff
-#ifdef MV643XX_RX_QUEUE_FILL_ON_TASK
 #define INT_CAUSE_MASK_ALL              0x00000000
+#define INT_CAUSE_MASK_ALL_EXT          0x00000000
 #define INT_CAUSE_CHECK_BITS            INT_CAUSE_UNMASK_ALL
 #define INT_CAUSE_CHECK_BITS_EXT        INT_CAUSE_UNMASK_ALL_EXT
-#endif
 
 #ifdef MV643XX_CHECKSUM_OFFLOAD_TX
 #define MAX_DESCS_PER_SKB       (MAX_SKB_FRAGS + 1)
@@ -259,14 +258,13 @@ static void mv643xx_eth_update_mac_address(struct net_device *dev)
 static void mv643xx_eth_set_rx_mode(struct net_device *dev)
 {
         struct mv643xx_private *mp = netdev_priv(dev);
-        u32 config_reg;
 
-        config_reg = ethernet_get_config_reg(mp->port_num);
         if (dev->flags & IFF_PROMISC)
-                config_reg |= (u32) MV643XX_ETH_UNICAST_PROMISCUOUS_MODE;
+                mp->port_config |= (u32) MV643XX_ETH_UNICAST_PROMISCUOUS_MODE;
         else
-                config_reg &= ~(u32) MV643XX_ETH_UNICAST_PROMISCUOUS_MODE;
-        ethernet_set_config_reg(mp->port_num, config_reg);
+                mp->port_config &= ~(u32) MV643XX_ETH_UNICAST_PROMISCUOUS_MODE;
+
+        mv_write(MV643XX_ETH_PORT_CONFIG_REG(mp->port_num), mp->port_config);
 }
 
 /*
@@ -369,15 +367,6 @@ static int mv643xx_eth_free_tx_queue(struct net_device *dev,
 
                         dev_kfree_skb_irq(pkt_info.return_info);
                         released = 0;
-
-                        /*
-                         * Decrement the number of outstanding skbs counter on
-                         * the TX queue.
-                         */
-                        if (mp->tx_ring_skbs == 0)
-                                panic("ERROR - TX outstanding SKBs"
-                                                " counter is corrupted");
-                        mp->tx_ring_skbs--;
                 } else
                         dma_unmap_page(NULL, pkt_info.buf_ptr,
                                         pkt_info.byte_cnt, DMA_TO_DEVICE);
@@ -412,15 +401,13 @@ static int mv643xx_eth_receive_queue(struct net_device *dev)
         struct pkt_info pkt_info;
 
 #ifdef MV643XX_NAPI
-        while (eth_port_receive(mp, &pkt_info) == ETH_OK && budget > 0) {
+        while (budget-- > 0 && eth_port_receive(mp, &pkt_info) == ETH_OK) {
 #else
         while (eth_port_receive(mp, &pkt_info) == ETH_OK) {
 #endif
                 mp->rx_ring_skbs--;
                 received_packets++;
-#ifdef MV643XX_NAPI
-                budget--;
-#endif
+
                 /* Update statistics. Note byte count includes 4 byte CRC count */
                 stats->rx_packets++;
                 stats->rx_bytes += pkt_info.byte_cnt;
@@ -1044,9 +1031,6 @@ static void mv643xx_tx(struct net_device *dev)
                                                 DMA_TO_DEVICE);
 
                         dev_kfree_skb_irq(pkt_info.return_info);
-
-                        if (mp->tx_ring_skbs)
-                                mp->tx_ring_skbs--;
                 } else
                         dma_unmap_page(NULL, pkt_info.buf_ptr,
                                         pkt_info.byte_cnt, DMA_TO_DEVICE);
@@ -1189,7 +1173,6 @@ linear:
                 pkt_info.buf_ptr = dma_map_single(NULL, skb->data, skb->len,
                                                         DMA_TO_DEVICE);
                 pkt_info.return_info = skb;
-                mp->tx_ring_skbs++;
                 status = eth_port_send(mp, &pkt_info);
                 if ((status == ETH_ERROR) || (status == ETH_QUEUE_FULL))
                         printk(KERN_ERR "%s: Error on transmitting packet\n",
@@ -1274,7 +1257,6 @@ linear:
                                 pkt_info.cmd_sts |= ETH_TX_ENABLE_INTERRUPT |
                                                         ETH_TX_LAST_DESC;
                                 pkt_info.return_info = skb;
-                                mp->tx_ring_skbs++;
                         } else {
                                 pkt_info.return_info = 0;
                         }
@@ -1311,7 +1293,6 @@ linear:
         pkt_info.buf_ptr = dma_map_single(NULL, skb->data, skb->len,
                                                                 DMA_TO_DEVICE);
         pkt_info.return_info = skb;
-        mp->tx_ring_skbs++;
         status = eth_port_send(mp, &pkt_info);
         if ((status == ETH_ERROR) || (status == ETH_QUEUE_FULL))
                 printk(KERN_ERR "%s: Error on transmitting packet\n",
@@ -1356,6 +1337,43 @@ static struct net_device_stats *mv643xx_eth_get_stats(struct net_device *dev)
         return &mp->stats;
 }
 
+#ifdef CONFIG_NET_POLL_CONTROLLER
+static inline void mv643xx_enable_irq(struct mv643xx_private *mp)
+{
+        int port_num = mp->port_num;
+        unsigned long flags;
+
+        spin_lock_irqsave(&mp->lock, flags);
+        mv_write(MV643XX_ETH_INTERRUPT_MASK_REG(port_num),
+                                        INT_CAUSE_UNMASK_ALL);
+        mv_write(MV643XX_ETH_INTERRUPT_EXTEND_MASK_REG(port_num),
+                                        INT_CAUSE_UNMASK_ALL_EXT);
+        spin_unlock_irqrestore(&mp->lock, flags);
+}
+
+static inline void mv643xx_disable_irq(struct mv643xx_private *mp)
+{
+        int port_num = mp->port_num;
+        unsigned long flags;
+
+        spin_lock_irqsave(&mp->lock, flags);
+        mv_write(MV643XX_ETH_INTERRUPT_MASK_REG(port_num),
+                                        INT_CAUSE_MASK_ALL);
+        mv_write(MV643XX_ETH_INTERRUPT_EXTEND_MASK_REG(port_num),
+                                        INT_CAUSE_MASK_ALL_EXT);
+        spin_unlock_irqrestore(&mp->lock, flags);
+}
+
+static void mv643xx_netpoll(struct net_device *netdev)
+{
+        struct mv643xx_private *mp = netdev_priv(netdev);
+
+        mv643xx_disable_irq(mp);
+        mv643xx_eth_int_handler(netdev->irq, netdev, NULL);
+        mv643xx_enable_irq(mp);
+}
+#endif
+
 /*/
  * mv643xx_eth_probe
  *
@@ -1406,6 +1424,10 @@ static int mv643xx_eth_probe(struct device *ddev)
         dev->weight = 64;
 #endif
 
+#ifdef CONFIG_NET_POLL_CONTROLLER
+        dev->poll_controller = mv643xx_netpoll;
+#endif
+
         dev->watchdog_timeo = 2 * HZ;
         dev->tx_queue_len = mp->tx_ring_size;
         dev->base_addr = 0;
@@ -1883,6 +1905,9 @@ static void eth_port_start(struct mv643xx_private *mp)
         /* Enable port Rx. */
         mv_write(MV643XX_ETH_RECEIVE_QUEUE_COMMAND_REG(port_num),
                                                 mp->port_rx_queue_command);
+
+        /* Disable port bandwidth limits by clearing MTU register */
+        mv_write(MV643XX_ETH_MAXIMUM_TRANSMIT_UNIT(port_num), 0);
 }
 
 /*
@@ -2292,34 +2317,6 @@ static void eth_port_reset(unsigned int port_num)
         mv_write(MV643XX_ETH_PORT_SERIAL_CONTROL_REG(port_num), reg_data);
 }
 
-/*
- * ethernet_set_config_reg - Set specified bits in configuration register.
- *
- * DESCRIPTION:
- *      This function sets specified bits in the given ethernet
- *      configuration register.
- *
- * INPUT:
- *      unsigned int    eth_port_num    Ethernet Port number.
- *      unsigned int    value           32 bit value.
- *
- * OUTPUT:
- *      The set bits in the value parameter are set in the configuration
- *      register.
- *
- * RETURN:
- *      None.
- *
- */
-static void ethernet_set_config_reg(unsigned int eth_port_num,
-                                                        unsigned int value)
-{
-        unsigned int eth_config_reg;
-
-        eth_config_reg = mv_read(MV643XX_ETH_PORT_CONFIG_REG(eth_port_num));
-        eth_config_reg |= value;
-        mv_write(MV643XX_ETH_PORT_CONFIG_REG(eth_port_num), eth_config_reg);
-}
 
 static int eth_port_autoneg_supported(unsigned int eth_port_num)
 {
@@ -2346,31 +2343,6 @@ static int eth_port_link_is_up(unsigned int eth_port_num)
 }
 
 /*
- * ethernet_get_config_reg - Get the port configuration register
- *
- * DESCRIPTION:
- *      This function returns the configuration register value of the given
- *      ethernet port.
- *
- * INPUT:
- *      unsigned int    eth_port_num    Ethernet Port number.
- *
- * OUTPUT:
- *      None.
- *
- * RETURN:
- *      Port configuration register value.
- */
-static unsigned int ethernet_get_config_reg(unsigned int eth_port_num)
-{
-        unsigned int eth_config_reg;
-
-        eth_config_reg = mv_read(MV643XX_ETH_PORT_CONFIG_EXTEND_REG
-                                                                (eth_port_num));
-        return eth_config_reg;
-}
-
-/*
  * eth_port_read_smi_reg - Read PHY registers
  *
  * DESCRIPTION:
@@ -2528,6 +2500,9 @@ static ETH_FUNC_RET_STATUS eth_port_send(struct mv643xx_private *mp,
                 return ETH_ERROR;
         }
 
+        mp->tx_ring_skbs++;
+        BUG_ON(mp->tx_ring_skbs > mp->tx_ring_size);
+
         /* Get the Tx Desc ring indexes */
         tx_desc_curr = mp->tx_curr_desc_q;
         tx_desc_used = mp->tx_used_desc_q;
@@ -2594,6 +2569,9 @@ static ETH_FUNC_RET_STATUS eth_port_send(struct mv643xx_private *mp,
         if (mp->tx_resource_err)
                 return ETH_QUEUE_FULL;
 
+        mp->tx_ring_skbs++;
+        BUG_ON(mp->tx_ring_skbs > mp->tx_ring_size);
+
         /* Get the Tx Desc ring indexes */
         tx_desc_curr = mp->tx_curr_desc_q;
         tx_desc_used = mp->tx_used_desc_q;
@@ -2694,6 +2672,9 @@ static ETH_FUNC_RET_STATUS eth_tx_return_desc(struct mv643xx_private *mp,
         /* Any Tx return cancels the Tx resource error status */
         mp->tx_resource_err = 0;
 
+        BUG_ON(mp->tx_ring_skbs == 0);
+        mp->tx_ring_skbs--;
+
         return ETH_OK;
 }
 
diff --git a/drivers/net/mv643xx_eth.h b/drivers/net/mv643xx_eth.h
index 7678b59c295..bcfda5192da 100644
--- a/drivers/net/mv643xx_eth.h
+++ b/drivers/net/mv643xx_eth.h
@@ -408,10 +408,6 @@ static void eth_port_init(struct mv643xx_private *mp);
 static void eth_port_reset(unsigned int eth_port_num);
 static void eth_port_start(struct mv643xx_private *mp);
 
-static void ethernet_set_config_reg(unsigned int eth_port_num,
-                                    unsigned int value);
-static unsigned int ethernet_get_config_reg(unsigned int eth_port_num);
-
 /* Port MAC address routines */
 static void eth_port_uc_addr_set(unsigned int eth_port_num,
                                  unsigned char *p_addr);
diff --git a/drivers/net/ne3210.c b/drivers/net/ne3210.c
index 6c92f096901..73501d84658 100644
--- a/drivers/net/ne3210.c
+++ b/drivers/net/ne3210.c
@@ -26,9 +26,6 @@
         Updated to EISA probing API 5/2003 by Marc Zyngier.
 */
 
-static const char *version =
-        "ne3210.c: Driver revision v0.03, 30/09/98\n";
-
 #include <linux/module.h>
 #include <linux/eisa.h>
 #include <linux/kernel.h>
@@ -197,7 +194,7 @@ static int __init ne3210_eisa_probe (struct device *device)
         ei_status.priv = phys_mem;
 
         if (ei_debug > 0)
-                printk(version);
+                printk("ne3210 loaded.\n");
 
         ei_status.reset_8390 = &ne3210_reset_8390;
         ei_status.block_input = &ne3210_block_input;
@@ -360,12 +357,12 @@ MODULE_DESCRIPTION("NE3210 EISA Ethernet driver");
 MODULE_LICENSE("GPL");
 MODULE_DEVICE_TABLE(eisa, ne3210_ids);
 
-int ne3210_init(void)
+static int ne3210_init(void)
 {
         return eisa_driver_register (&ne3210_eisa_driver);
 }
 
-void ne3210_cleanup(void)
+static void ne3210_cleanup(void)
 {
         eisa_driver_unregister (&ne3210_eisa_driver);
 }
diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig
index 6a2fe358347..14f4de1a818 100644
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
@@ -6,7 +6,7 @@ menu "PHY device support"
 
 config PHYLIB
         tristate "PHY Device support and infrastructure"
-        depends on NET_ETHERNET
+        depends on NET_ETHERNET && (BROKEN || !ARCH_S390)
         help
           Ethernet controllers are usually attached to PHY
           devices.  This option provides infrastructure for
diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c
index 41f62c0c5fc..90630672703 100644
--- a/drivers/net/phy/mdio_bus.c
+++ b/drivers/net/phy/mdio_bus.c
@@ -128,7 +128,7 @@ static int mdio_bus_match(struct device *dev, struct device_driver *drv)
 /* Suspend and resume.  Copied from platform_suspend and
  * platform_resume
  */
-static int mdio_bus_suspend(struct device * dev, u32 state)
+static int mdio_bus_suspend(struct device * dev, pm_message_t state)
 {
         int ret = 0;
         struct device_driver *drv = dev->driver;
@@ -170,7 +170,7 @@ int __init mdio_bus_init(void)
         return bus_register(&mdio_bus_type);
 }
 
-void __exit mdio_bus_exit(void)
+void mdio_bus_exit(void)
 {
         bus_unregister(&mdio_bus_type);
 }
diff --git a/drivers/net/s2io-regs.h b/drivers/net/s2io-regs.h
index 2234a8f05eb..7cefe5507b9 100644
--- a/drivers/net/s2io-regs.h
+++ b/drivers/net/s2io-regs.h
@@ -1,5 +1,5 @@
 /************************************************************************
- * regs.h: A Linux PCI-X Ethernet driver for S2IO 10GbE Server NIC
+ * regs.h: A Linux PCI-X Ethernet driver for Neterion 10GbE Server NIC
  * Copyright(c) 2002-2005 Neterion Inc.
 
  * This software may be used and distributed according to the terms of
@@ -713,13 +713,16 @@ typedef struct _XENA_dev_config {
         u64 mc_err_reg;
 #define MC_ERR_REG_ECC_DB_ERR_L            BIT(14)
 #define MC_ERR_REG_ECC_DB_ERR_U            BIT(15)
+#define MC_ERR_REG_MIRI_ECC_DB_ERR_0       BIT(18)
+#define MC_ERR_REG_MIRI_ECC_DB_ERR_1       BIT(20)
 #define MC_ERR_REG_MIRI_CRI_ERR_0          BIT(22)
 #define MC_ERR_REG_MIRI_CRI_ERR_1          BIT(23)
 #define MC_ERR_REG_SM_ERR                  BIT(31)
-#define MC_ERR_REG_ECC_ALL_SNG             (BIT(6) | \
-                                        BIT(7) | BIT(17) | BIT(19))
-#define MC_ERR_REG_ECC_ALL_DBL             (BIT(14) | \
-                                        BIT(15) | BIT(18) | BIT(20))
+#define MC_ERR_REG_ECC_ALL_SNG             (BIT(2) | BIT(3) | BIT(4) | BIT(5) |\
+                                            BIT(6) | BIT(7) | BIT(17) | BIT(19))
+#define MC_ERR_REG_ECC_ALL_DBL             (BIT(10) | BIT(11) | BIT(12) |\
+                                            BIT(13) | BIT(14) | BIT(15) |\
+                                            BIT(18) | BIT(20))
         u64 mc_err_mask;
         u64 mc_err_alarm;
 
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index 7ca78228b10..c829e6a2e8a 100644
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
@@ -1,5 +1,5 @@
 /************************************************************************
- * s2io.c: A Linux PCI-X Ethernet driver for S2IO 10GbE Server NIC
+ * s2io.c: A Linux PCI-X Ethernet driver for Neterion 10GbE Server NIC
  * Copyright(c) 2002-2005 Neterion Inc.
 
  * This software may be used and distributed according to the terms of
@@ -28,7 +28,7 @@
  * explaination of all the variables.
  * rx_ring_num : This can be used to program the number of receive rings used
  * in the driver.
- * rx_ring_len: This defines the number of descriptors each ring can have. This
+ * rx_ring_sz: This defines the number of descriptors each ring can have. This
  * is also an array of size 8.
  * tx_fifo_num: This defines the number of Tx FIFOs thats used int the driver.
  * tx_fifo_len: This too is an array of 8. Each element defines the number of
@@ -67,7 +67,7 @@
 
 /* S2io Driver name & version. */
 static char s2io_driver_name[] = "Neterion";
-static char s2io_driver_version[] = "Version 2.0.3.1";
+static char s2io_driver_version[] = "Version 2.0.8.1";
 
 static inline int RXD_IS_UP2DT(RxD_t *rxdp)
 {
@@ -354,7 +354,7 @@ static int init_shared_mem(struct s2io_nic *nic)
         int lst_size, lst_per_page;
         struct net_device *dev = nic->dev;
 #ifdef CONFIG_2BUFF_MODE
-        u64 tmp;
+        unsigned long tmp;
         buffAdd_t *ba;
 #endif
 
@@ -404,7 +404,7 @@ static int init_shared_mem(struct s2io_nic *nic)
                     config->tx_cfg[i].fifo_len - 1;
                 mac_control->fifos[i].fifo_no = i;
                 mac_control->fifos[i].nic = nic;
-                mac_control->fifos[i].max_txds = MAX_SKB_FRAGS;
+                mac_control->fifos[i].max_txds = MAX_SKB_FRAGS + 1;
 
                 for (j = 0; j < page_num; j++) {
                         int k = 0;
@@ -418,6 +418,26 @@ static int init_shared_mem(struct s2io_nic *nic)
                                 DBG_PRINT(ERR_DBG, "failed for TxDL\n");
                                 return -ENOMEM;
                         }
+                        /* If we got a zero DMA address(can happen on
+                         * certain platforms like PPC), reallocate.
+                         * Store virtual address of page we don't want,
+                         * to be freed later.
+                         */
+                        if (!tmp_p) {
+                                mac_control->zerodma_virt_addr = tmp_v;
+                                DBG_PRINT(INIT_DBG, 
+                                "%s: Zero DMA address for TxDL. ", dev->name);
+                                DBG_PRINT(INIT_DBG, 
+                                "Virtual address %llx\n", (u64)tmp_v);
+                                tmp_v = pci_alloc_consistent(nic->pdev,
+                                                     PAGE_SIZE, &tmp_p);
+                                if (!tmp_v) {
+                                        DBG_PRINT(ERR_DBG,
+                                          "pci_alloc_consistent ");
+                                        DBG_PRINT(ERR_DBG, "failed for TxDL\n");
+                                        return -ENOMEM;
+                                }
+                        }
                         while (k < lst_per_page) {
                                 int l = (j * lst_per_page) + k;
                                 if (l == config->tx_cfg[i].fifo_len)
@@ -542,18 +562,18 @@ static int init_shared_mem(struct s2io_nic *nic)
                                     (BUF0_LEN + ALIGN_SIZE, GFP_KERNEL);
                                 if (!ba->ba_0_org)
                                         return -ENOMEM;
-                                tmp = (u64) ba->ba_0_org;
+                                tmp = (unsigned long) ba->ba_0_org;
                                 tmp += ALIGN_SIZE;
-                                tmp &= ~((u64) ALIGN_SIZE);
+                                tmp &= ~((unsigned long) ALIGN_SIZE);
                                 ba->ba_0 = (void *) tmp;
 
                                 ba->ba_1_org = (void *) kmalloc
                                     (BUF1_LEN + ALIGN_SIZE, GFP_KERNEL);
                                 if (!ba->ba_1_org)
                                         return -ENOMEM;
-                                tmp = (u64) ba->ba_1_org;
+                                tmp = (unsigned long) ba->ba_1_org;
                                 tmp += ALIGN_SIZE;
-                                tmp &= ~((u64) ALIGN_SIZE);
+                                tmp &= ~((unsigned long) ALIGN_SIZE);
                                 ba->ba_1 = (void *) tmp;
                                 k++;
                         }
@@ -600,7 +620,7 @@ static void free_shared_mem(struct s2io_nic *nic)
         mac_info_t *mac_control;
         struct config_param *config;
         int lst_size, lst_per_page;
-
+        struct net_device *dev = nic->dev;
 
         if (!nic)
                 return;
@@ -616,9 +636,10 @@ static void free_shared_mem(struct s2io_nic *nic)
                                                 lst_per_page);
                 for (j = 0; j < page_num; j++) {
                         int mem_blks = (j * lst_per_page);
-                        if ((!mac_control->fifos[i].list_info) ||
-                                (!mac_control->fifos[i].list_info[mem_blks].
-                                 list_virt_addr))
+                        if (!mac_control->fifos[i].list_info)
+                                return; 
+                        if (!mac_control->fifos[i].list_info[mem_blks].
+                                 list_virt_addr)
                                 break;
                         pci_free_consistent(nic->pdev, PAGE_SIZE,
                                             mac_control->fifos[i].
@@ -628,6 +649,18 @@ static void free_shared_mem(struct s2io_nic *nic)
                                             list_info[mem_blks].
                                             list_phy_addr);
                 }
+                /* If we got a zero DMA address during allocation,
+                 * free the page now
+                 */
+                if (mac_control->zerodma_virt_addr) {
+                        pci_free_consistent(nic->pdev, PAGE_SIZE,
+                                            mac_control->zerodma_virt_addr,
+                                            (dma_addr_t)0);
+                        DBG_PRINT(INIT_DBG, 
+                        "%s: Freeing TxDL with zero DMA addr. ", dev->name);
+                        DBG_PRINT(INIT_DBG, "Virtual address %llx\n",
+                        (u64)(mac_control->zerodma_virt_addr));
+                }
                 kfree(mac_control->fifos[i].list_info);
         }
 
@@ -686,7 +719,7 @@ static void free_shared_mem(struct s2io_nic *nic)
 
 static int s2io_verify_pci_mode(nic_t *nic)
 {
-        XENA_dev_config_t *bar0 = (XENA_dev_config_t *) nic->bar0;
+        XENA_dev_config_t __iomem *bar0 = nic->bar0;
         register u64 val64 = 0;
         int     mode;
 
@@ -704,7 +737,7 @@ static int s2io_verify_pci_mode(nic_t *nic)
  */
 static int s2io_print_pci_mode(nic_t *nic)
 {
-        XENA_dev_config_t *bar0 = (XENA_dev_config_t *) nic->bar0;
+        XENA_dev_config_t __iomem *bar0 = nic->bar0;
         register u64 val64 = 0;
         int     mode;
         struct config_param *config = &nic->config;
@@ -1403,7 +1436,7 @@ static int init_nic(struct s2io_nic *nic)
         writeq(0xffbbffbbffbbffbbULL, &bar0->mc_pause_thresh_q4q7);
 
         /* Disable RMAC PAD STRIPPING */
-        add = (void *) &bar0->mac_cfg;
+        add = &bar0->mac_cfg;
         val64 = readq(&bar0->mac_cfg);
         val64 &= ~(MAC_CFG_RMAC_STRIP_PAD);
         writeq(RMAC_CFG_KEY(0x4C0D), &bar0->rmac_cfg_key);
@@ -1934,7 +1967,7 @@ static int start_nic(struct s2io_nic *nic)
                 val64 |= 0x0000800000000000ULL;
                 writeq(val64, &bar0->gpio_control);
                 val64 = 0x0411040400000000ULL;
-                writeq(val64, (void __iomem *) ((u8 *) bar0 + 0x2700));
+                writeq(val64, (void __iomem *)bar0 + 0x2700);
         }
 
         /*
@@ -2395,7 +2428,7 @@ static int s2io_poll(struct net_device *dev, int *budget)
         int pkt_cnt = 0, org_pkts_to_process;
         mac_info_t *mac_control;
         struct config_param *config;
-        XENA_dev_config_t *bar0 = (XENA_dev_config_t *) nic->bar0;
+        XENA_dev_config_t __iomem *bar0 = nic->bar0;
         u64 val64;
         int i;
 
@@ -2479,9 +2512,10 @@ static void rx_intr_handler(ring_info_t *ring_data)
 #endif
         spin_lock(&nic->rx_lock);
         if (atomic_read(&nic->card_state) == CARD_DOWN) {
-                DBG_PRINT(ERR_DBG, "%s: %s going down for reset\n",
+                DBG_PRINT(INTR_DBG, "%s: %s going down for reset\n",
                           __FUNCTION__, dev->name);
                 spin_unlock(&nic->rx_lock);
+                return;
         }
 
         get_info = ring_data->rx_curr_get_info;
@@ -2596,8 +2630,14 @@ static void tx_intr_handler(fifo_info_t *fifo_data)
                 if (txdlp->Control_1 & TXD_T_CODE) {
                         unsigned long long err;
                         err = txdlp->Control_1 & TXD_T_CODE;
-                        DBG_PRINT(ERR_DBG, "***TxD error %llx\n",
-                                  err);
+                        if ((err >> 48) == 0xA) {
+                                DBG_PRINT(TX_DBG, "TxD returned due \
+                                                to loss of link\n");
+                        }
+                        else {
+                                DBG_PRINT(ERR_DBG, "***TxD error \
+                                                %llx\n", err);
+                        }
                 }
 
                 skb = (struct sk_buff *) ((unsigned long)
@@ -2689,12 +2729,16 @@ static void alarm_intr_handler(struct s2io_nic *nic)
                 if (val64 & MC_ERR_REG_ECC_ALL_DBL) {
                         nic->mac_control.stats_info->sw_stat.
                                 double_ecc_errs++;
-                        DBG_PRINT(ERR_DBG, "%s: Device indicates ",
+                        DBG_PRINT(INIT_DBG, "%s: Device indicates ",
                                   dev->name);
-                        DBG_PRINT(ERR_DBG, "double ECC error!!\n");
+                        DBG_PRINT(INIT_DBG, "double ECC error!!\n");
                         if (nic->device_type != XFRAME_II_DEVICE) {
-                                netif_stop_queue(dev);
-                                schedule_work(&nic->rst_timer_task);
+                                /* Reset XframeI only if critical error */
+                                if (val64 & (MC_ERR_REG_MIRI_ECC_DB_ERR_0 |
+                                             MC_ERR_REG_MIRI_ECC_DB_ERR_1)) {
+                                        netif_stop_queue(dev);
+                                        schedule_work(&nic->rst_timer_task);
+                                }
                         }
                 } else {
                         nic->mac_control.stats_info->sw_stat.
@@ -2706,7 +2750,8 @@ static void alarm_intr_handler(struct s2io_nic *nic)
         val64 = readq(&bar0->serr_source);
         if (val64 & SERR_SOURCE_ANY) {
                 DBG_PRINT(ERR_DBG, "%s: Device indicates ", dev->name);
-                DBG_PRINT(ERR_DBG, "serious error!!\n");
+                DBG_PRINT(ERR_DBG, "serious error %llx!!\n", 
+                          (unsigned long long)val64);
                 netif_stop_queue(dev);
                 schedule_work(&nic->rst_timer_task);
         }
@@ -2831,7 +2876,7 @@ void s2io_reset(nic_t * sp)
                 val64 |= 0x0000800000000000ULL;
                 writeq(val64, &bar0->gpio_control);
                 val64 = 0x0411040400000000ULL;
-                writeq(val64, (void __iomem *) ((u8 *) bar0 + 0x2700));
+                writeq(val64, (void __iomem *)bar0 + 0x2700);
         }
 
         /*
@@ -3130,7 +3175,7 @@ int s2io_xmit(struct sk_buff *skb, struct net_device *dev)
         queue_len = mac_control->fifos[queue].tx_curr_put_info.fifo_len + 1;
         /* Avoid "put" pointer going beyond "get" pointer */
         if (txdp->Host_Control || (((put_off + 1) % queue_len) == get_off)) {
-                DBG_PRINT(ERR_DBG, "Error in xmit, No free TXDs.\n");
+                DBG_PRINT(TX_DBG, "Error in xmit, No free TXDs.\n");
                 netif_stop_queue(dev);
                 dev_kfree_skb(skb);
                 spin_unlock_irqrestore(&sp->tx_lock, flags);
@@ -3234,7 +3279,7 @@ s2io_alarm_handle(unsigned long data)
 
 static void s2io_txpic_intr_handle(nic_t *sp)
 {
-        XENA_dev_config_t *bar0 = (XENA_dev_config_t *) sp->bar0;
+        XENA_dev_config_t __iomem *bar0 = sp->bar0;
         u64 val64;
 
         val64 = readq(&bar0->pic_int_status);
@@ -3528,7 +3573,7 @@ static void s2io_set_multicast(struct net_device *dev)
 
                 val64 = readq(&bar0->mac_cfg);
                 sp->promisc_flg = 1;
-                DBG_PRINT(ERR_DBG, "%s: entered promiscuous mode\n",
+                DBG_PRINT(INFO_DBG, "%s: entered promiscuous mode\n",
                           dev->name);
         } else if (!(dev->flags & IFF_PROMISC) && (sp->promisc_flg)) {
                 /*  Remove the NIC from promiscuous mode */
@@ -3543,7 +3588,7 @@ static void s2io_set_multicast(struct net_device *dev)
 
                 val64 = readq(&bar0->mac_cfg);
                 sp->promisc_flg = 0;
-                DBG_PRINT(ERR_DBG, "%s: left promiscuous mode\n",
+                DBG_PRINT(INFO_DBG, "%s: left promiscuous mode\n",
                           dev->name);
         }
 
@@ -5325,7 +5370,7 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre)
                         break;
                 }
         }
-        config->max_txds = MAX_SKB_FRAGS;
+        config->max_txds = MAX_SKB_FRAGS + 1;
 
         /* Rx side parameters. */
         if (rx_ring_sz[0] == 0)
@@ -5525,9 +5570,14 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre)
         if (sp->device_type & XFRAME_II_DEVICE) {
                 DBG_PRINT(ERR_DBG, "%s: Neterion Xframe II 10GbE adapter ",
                           dev->name);
-                DBG_PRINT(ERR_DBG, "(rev %d), Driver %s\n",
+                DBG_PRINT(ERR_DBG, "(rev %d), %s",
                                 get_xena_rev_id(sp->pdev),
                                 s2io_driver_version);
+#ifdef CONFIG_2BUFF_MODE
+                DBG_PRINT(ERR_DBG, ", Buffer mode %d",2);
+#endif
+
+                DBG_PRINT(ERR_DBG, "\nCopyright(c) 2002-2005 Neterion Inc.\n");
                 DBG_PRINT(ERR_DBG, "MAC ADDR: %02x:%02x:%02x:%02x:%02x:%02x\n",
                           sp->def_mac_addr[0].mac_addr[0],
                           sp->def_mac_addr[0].mac_addr[1],
@@ -5544,9 +5594,13 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre)
         } else {
                 DBG_PRINT(ERR_DBG, "%s: Neterion Xframe I 10GbE adapter ",
                           dev->name);
-                DBG_PRINT(ERR_DBG, "(rev %d), Driver %s\n",
+                DBG_PRINT(ERR_DBG, "(rev %d), %s",
                                         get_xena_rev_id(sp->pdev),
                                         s2io_driver_version);
+#ifdef CONFIG_2BUFF_MODE
+                DBG_PRINT(ERR_DBG, ", Buffer mode %d",2);
+#endif
+                DBG_PRINT(ERR_DBG, "\nCopyright(c) 2002-2005 Neterion Inc.\n");
                 DBG_PRINT(ERR_DBG, "MAC ADDR: %02x:%02x:%02x:%02x:%02x:%02x\n",
                           sp->def_mac_addr[0].mac_addr[0],
                           sp->def_mac_addr[0].mac_addr[1],
diff --git a/drivers/net/s2io.h b/drivers/net/s2io.h
index bc64d967f08..89151cb5218 100644
--- a/drivers/net/s2io.h
+++ b/drivers/net/s2io.h
@@ -1,5 +1,5 @@
 /************************************************************************
- * s2io.h: A Linux PCI-X Ethernet driver for S2IO 10GbE Server NIC
+ * s2io.h: A Linux PCI-X Ethernet driver for Neterion 10GbE Server NIC
  * Copyright(c) 2002-2005 Neterion Inc.
 
  * This software may be used and distributed according to the terms of
@@ -622,6 +622,9 @@ typedef struct mac_info {
         /* Fifo specific structure */
         fifo_info_t fifos[MAX_TX_FIFOS];
 
+        /* Save virtual address of TxD page with zero DMA addr(if any) */
+        void *zerodma_virt_addr;
+
 /* rx side stuff */
         /* Ring specific structure */
         ring_info_t rings[MAX_RX_RINGS];
diff --git a/drivers/net/sis190.c b/drivers/net/sis190.c
index bf3440aa6c2..92f75529eff 100644
--- a/drivers/net/sis190.c
+++ b/drivers/net/sis190.c
@@ -179,14 +179,6 @@ enum sis190_register_content {
         TxInterFrameGapShift    = 24,
         TxDMAShift              = 8, /* DMA burst value (0-7) is shift this many bits */
 
-        /* StationControl */
-        _1000bpsF               = 0x1c00,
-        _1000bpsH               = 0x0c00,
-        _100bpsF                = 0x1800,
-        _100bpsH                = 0x0800,
-        _10bpsF                 = 0x1400,
-        _10bpsH                 = 0x0400,
-
         LinkStatus              = 0x02,         // unused
         FullDup                 = 0x01,         // unused
 
@@ -279,6 +271,12 @@ enum sis190_eeprom_address {
         EEPROMMACAddr   = 0x03
 };
 
+enum sis190_feature {
+        F_HAS_RGMII     = 1,
+        F_PHY_88E1111   = 2,
+        F_PHY_BCM5461   = 4
+};
+
 struct sis190_private {
         void __iomem *mmio_addr;
         struct pci_dev *pci_dev;
@@ -300,6 +298,7 @@ struct sis190_private {
         u32 msg_enable;
         struct mii_if_info mii_if;
         struct list_head first_phy;
+        u32 features;
 };
 
 struct sis190_phy {
@@ -321,24 +320,25 @@ static struct mii_chip_info {
         const char *name;
         u16 id[2];
         unsigned int type;
+        u32 feature;
 } mii_chip_table[] = {
-        { "Broadcom PHY BCM5461", { 0x0020, 0x60c0 }, LAN },
-        { "Agere PHY ET1101B",    { 0x0282, 0xf010 }, LAN },
-        { "Marvell PHY 88E1111",  { 0x0141, 0x0cc0 }, LAN },
-        { "Realtek PHY RTL8201",  { 0x0000, 0x8200 }, LAN },
+        { "Broadcom PHY BCM5461", { 0x0020, 0x60c0 }, LAN, F_PHY_BCM5461 },
+        { "Agere PHY ET1101B",    { 0x0282, 0xf010 }, LAN, 0 },
+        { "Marvell PHY 88E1111",  { 0x0141, 0x0cc0 }, LAN, F_PHY_88E1111 },
+        { "Realtek PHY RTL8201",  { 0x0000, 0x8200 }, LAN, 0 },
         { NULL, }
 };
 
 const static struct {
         const char *name;
-        u8 version;             /* depend on docs */
-        u32 RxConfigMask;       /* clear the bits supported by this chip */
 } sis_chip_info[] = {
-        { DRV_NAME, 0x00, 0xff7e1880, },
+        { "SiS 190 PCI Fast Ethernet adapter" },
+        { "SiS 191 PCI Gigabit Ethernet adapter" },
 };
 
 static struct pci_device_id sis190_pci_tbl[] __devinitdata = {
         { PCI_DEVICE(PCI_VENDOR_ID_SI, 0x0190), 0, 0, 0 },
+        { PCI_DEVICE(PCI_VENDOR_ID_SI, 0x0191), 0, 0, 1 },
         { 0, },
 };
 
@@ -360,7 +360,7 @@ MODULE_VERSION(DRV_VERSION);
 MODULE_LICENSE("GPL");
 
 static const u32 sis190_intr_mask =
-        RxQEmpty | RxQInt | TxQ1Int | TxQ0Int | RxHalt | TxHalt;
+        RxQEmpty | RxQInt | TxQ1Int | TxQ0Int | RxHalt | TxHalt | LinkChange;
 
 /*
  * Maximum number of multicast addresses to filter (vs. Rx-all-multicast).
@@ -879,11 +879,6 @@ static void sis190_hw_start(struct net_device *dev)
 
         SIS_W32(IntrStatus, 0xffffffff);
         SIS_W32(IntrMask, 0x0);
-        /*
-         * Default is 100Mbps.
-         * A bit strange: 100Mbps is 0x1801 elsewhere -- FR 2005/06/09
-         */
-        SIS_W16(StationControl, 0x1901);
         SIS_W32(GMIIControl, 0x0);
         SIS_W32(TxMacControl, 0x60);
         SIS_W16(RxMacControl, 0x02);
@@ -923,35 +918,30 @@ static void sis190_phy_task(void * data)
                      BMSR_ANEGCOMPLETE)) {
                 net_link(tp, KERN_WARNING "%s: PHY reset until link up.\n",
                          dev->name);
+                netif_carrier_off(dev);
                 mdio_write(ioaddr, phy_id, MII_BMCR, val | BMCR_RESET);
                 mod_timer(&tp->timer, jiffies + SIS190_PHY_TIMEOUT);
         } else {
                 /* Rejoice ! */
                 struct {
                         int val;
+                        u32 ctl;
                         const char *msg;
-                        u16 ctl;
                 } reg31[] = {
-                        { LPA_1000XFULL | LPA_SLCT,
-                                "1000 Mbps Full Duplex",
-                                0x01 | _1000bpsF },
-                        { LPA_1000XHALF | LPA_SLCT,
-                                "1000 Mbps Half Duplex",
-                                0x01 | _1000bpsH },
-                        { LPA_100FULL,
-                                "100 Mbps Full Duplex",
-                                0x01 | _100bpsF },
-                        { LPA_100HALF,
-                                "100 Mbps Half Duplex",
-                                0x01 | _100bpsH },
-                        { LPA_10FULL,
-                                "10 Mbps Full Duplex",
-                                0x01 | _10bpsF },
-                        { LPA_10HALF,
-                                "10 Mbps Half Duplex",
-                                0x01 | _10bpsH },
-                        { 0, "unknown", 0x0000 }
-                }, *p;
+                        { LPA_1000XFULL | LPA_SLCT, 0x07000c00 | 0x00001000,
+                                "1000 Mbps Full Duplex" },
+                        { LPA_1000XHALF | LPA_SLCT, 0x07000c00,
+                                "1000 Mbps Half Duplex" },
+                        { LPA_100FULL, 0x04000800 | 0x00001000,
+                                "100 Mbps Full Duplex" },
+                        { LPA_100HALF, 0x04000800,
+                                "100 Mbps Half Duplex" },
+                        { LPA_10FULL, 0x04000400 | 0x00001000,
+                                "10 Mbps Full Duplex" },
+                        { LPA_10HALF, 0x04000400,
+                                "10 Mbps Half Duplex" },
+                        { 0, 0x04000400, "unknown" }
+                }, *p;
                 u16 adv;
 
                 val = mdio_read(ioaddr, phy_id, 0x1f);
@@ -964,12 +954,29 @@ static void sis190_phy_task(void * data)
 
                 val &= adv;
 
-                for (p = reg31; p->ctl; p++) {
+                for (p = reg31; p->val; p++) {
                         if ((val & p->val) == p->val)
                                 break;
                 }
-                if (p->ctl)
-                        SIS_W16(StationControl, p->ctl);
+
+                p->ctl |= SIS_R32(StationControl) & ~0x0f001c00;
+
+                if ((tp->features & F_HAS_RGMII) &&
+                    (tp->features & F_PHY_BCM5461)) {
+                        // Set Tx Delay in RGMII mode.
+                        mdio_write(ioaddr, phy_id, 0x18, 0xf1c7);
+                        udelay(200);
+                        mdio_write(ioaddr, phy_id, 0x1c, 0x8c00);
+                        p->ctl |= 0x03000000;
+                }
+
+                SIS_W32(StationControl, p->ctl);
+
+                if (tp->features & F_HAS_RGMII) {
+                        SIS_W32(RGDelay, 0x0441);
+                        SIS_W32(RGDelay, 0x0440);
+                }
+
                 net_link(tp, KERN_INFO "%s: link on %s mode.\n", dev->name,
                          p->msg);
                 netif_carrier_on(dev);
@@ -1308,6 +1315,7 @@ static void sis190_init_phy(struct net_device *dev, struct sis190_private *tp,
                 phy->type = (p->type == MIX) ?
                         ((mii_status & (BMSR_100FULL | BMSR_100HALF)) ?
                                 LAN : HOME) : p->type;
+                tp->features |= p->feature;
         } else
                 phy->type = UNKNOWN;
 
@@ -1316,6 +1324,25 @@ static void sis190_init_phy(struct net_device *dev, struct sis190_private *tp,
                   (phy->type == UNKNOWN) ? "Unknown PHY" : p->name, phy_id);
 }
 
+static void sis190_mii_probe_88e1111_fixup(struct sis190_private *tp)
+{
+        if (tp->features & F_PHY_88E1111) {
+                void __iomem *ioaddr = tp->mmio_addr;
+                int phy_id = tp->mii_if.phy_id;
+                u16 reg[2][2] = {
+                        { 0x808b, 0x0ce1 },
+                        { 0x808f, 0x0c60 }
+                }, *p;
+
+                p = (tp->features & F_HAS_RGMII) ? reg[0] : reg[1];
+
+                mdio_write(ioaddr, phy_id, 0x1b, p[0]);
+                udelay(200);
+                mdio_write(ioaddr, phy_id, 0x14, p[1]);
+                udelay(200);
+        }
+}
+
 /**
  *      sis190_mii_probe - Probe MII PHY for sis190
  *      @dev: the net device to probe for
@@ -1366,6 +1393,8 @@ static int __devinit sis190_mii_probe(struct net_device *dev)
         /* Select default PHY for mac */
         sis190_default_phy(dev);
 
+        sis190_mii_probe_88e1111_fixup(tp);
+
         mii_if->dev = dev;
         mii_if->mdio_read = __mdio_read;
         mii_if->mdio_write = __mdio_write;
@@ -1505,6 +1534,11 @@ static void sis190_tx_timeout(struct net_device *dev)
         netif_wake_queue(dev);
 }
 
+static void sis190_set_rgmii(struct sis190_private *tp, u8 reg)
+{
+        tp->features |= (reg & 0x80) ? F_HAS_RGMII : 0;
+}
+
 static int __devinit sis190_get_mac_addr_from_eeprom(struct pci_dev *pdev,
                                                      struct net_device *dev)
 {
@@ -1532,6 +1566,8 @@ static int __devinit sis190_get_mac_addr_from_eeprom(struct pci_dev *pdev,
                 ((u16 *)dev->dev_addr)[0] = le16_to_cpu(w);
         }
 
+        sis190_set_rgmii(tp, sis190_read_eeprom(ioaddr, EEPROMInfo));
+
         return 0;
 }
 
@@ -1577,6 +1613,8 @@ static int __devinit sis190_get_mac_addr_from_apc(struct pci_dev *pdev,
         outb(0x12, 0x78);
         reg = inb(0x79);
 
+        sis190_set_rgmii(tp, reg);
+
         /* Restore the value to ISA Bridge */
         pci_write_config_byte(isa_bridge, 0x48, tmp8);
         pci_dev_put(isa_bridge);
@@ -1799,6 +1837,9 @@ static int __devinit sis190_init_one(struct pci_dev *pdev,
                dev->dev_addr[2], dev->dev_addr[3],
                dev->dev_addr[4], dev->dev_addr[5]);
 
+        net_probe(tp, KERN_INFO "%s: %s mode.\n", dev->name,
+                  (tp->features & F_HAS_RGMII) ? "RGMII" : "GMII");
+
         netif_carrier_off(dev);
 
         sis190_set_speed_auto(dev);
diff --git a/drivers/net/smc91x.h b/drivers/net/smc91x.h
index a9b06b8d8e3..ac9ce6509ee 100644
--- a/drivers/net/smc91x.h
+++ b/drivers/net/smc91x.h
@@ -986,7 +986,7 @@ static const char * chip_ids[ 16 ] =  {
         })
 #endif
 
-#if SMC_CAN_USE_DATACS
+#ifdef SMC_CAN_USE_DATACS
 #define SMC_PUSH_DATA(p, l)                                             \
         if ( lp->datacs ) {                                             \
                 unsigned char *__ptr = (p);                             \
diff --git a/drivers/net/spider_net.c b/drivers/net/spider_net.c
new file mode 100644
index 00000000000..4e19220473d
--- /dev/null
+++ b/drivers/net/spider_net.c
@@ -0,0 +1,2334 @@
+/*
+ * Network device driver for Cell Processor-Based Blade
+ *
+ * (C) Copyright IBM Corp. 2005
+ *
+ * Authors : Utz Bacher <utz.bacher@de.ibm.com>
+ *           Jens Osterkamp <Jens.Osterkamp@de.ibm.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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <linux/config.h>
+
+#include <linux/compiler.h>
+#include <linux/crc32.h>
+#include <linux/delay.h>
+#include <linux/etherdevice.h>
+#include <linux/ethtool.h>
+#include <linux/firmware.h>
+#include <linux/if_vlan.h>
+#include <linux/init.h>
+#include <linux/ioport.h>
+#include <linux/ip.h>
+#include <linux/kernel.h>
+#include <linux/mii.h>
+#include <linux/module.h>
+#include <linux/netdevice.h>
+#include <linux/device.h>
+#include <linux/pci.h>
+#include <linux/skbuff.h>
+#include <linux/slab.h>
+#include <linux/tcp.h>
+#include <linux/types.h>
+#include <linux/wait.h>
+#include <linux/workqueue.h>
+#include <asm/bitops.h>
+#include <asm/pci-bridge.h>
+#include <net/checksum.h>
+
+#include "spider_net.h"
+
+MODULE_AUTHOR("Utz Bacher <utz.bacher@de.ibm.com> and Jens Osterkamp " \
+              "<Jens.Osterkamp@de.ibm.com>");
+MODULE_DESCRIPTION("Spider Southbridge Gigabit Ethernet driver");
+MODULE_LICENSE("GPL");
+
+static int rx_descriptors = SPIDER_NET_RX_DESCRIPTORS_DEFAULT;
+static int tx_descriptors = SPIDER_NET_TX_DESCRIPTORS_DEFAULT;
+
+module_param(rx_descriptors, int, 0644);
+module_param(tx_descriptors, int, 0644);
+
+MODULE_PARM_DESC(rx_descriptors, "number of descriptors used " \
+                 "in rx chains");
+MODULE_PARM_DESC(tx_descriptors, "number of descriptors used " \
+                 "in tx chain");
+
+char spider_net_driver_name[] = "spidernet";
+
+static struct pci_device_id spider_net_pci_tbl[] = {
+        { PCI_VENDOR_ID_TOSHIBA_2, PCI_DEVICE_ID_TOSHIBA_SPIDER_NET,
+          PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
+        { 0, }
+};
+
+MODULE_DEVICE_TABLE(pci, spider_net_pci_tbl);
+
+/**
+ * spider_net_read_reg - reads an SMMIO register of a card
+ * @card: device structure
+ * @reg: register to read from
+ *
+ * returns the content of the specified SMMIO register.
+ */
+static u32
+spider_net_read_reg(struct spider_net_card *card, u32 reg)
+{
+        u32 value;
+
+        value = readl(card->regs + reg);
+        value = le32_to_cpu(value);
+
+        return value;
+}
+
+/**
+ * spider_net_write_reg - writes to an SMMIO register of a card
+ * @card: device structure
+ * @reg: register to write to
+ * @value: value to write into the specified SMMIO register
+ */
+static void
+spider_net_write_reg(struct spider_net_card *card, u32 reg, u32 value)
+{
+        value = cpu_to_le32(value);
+        writel(value, card->regs + reg);
+}
+
+/**
+ * spider_net_write_reg_sync - writes to an SMMIO register of a card
+ * @card: device structure
+ * @reg: register to write to
+ * @value: value to write into the specified SMMIO register
+ *
+ * Unlike spider_net_write_reg, this will also make sure the
+ * data arrives on the card by reading the reg again.
+ */
+static void
+spider_net_write_reg_sync(struct spider_net_card *card, u32 reg, u32 value)
+{
+        value = cpu_to_le32(value);
+        writel(value, card->regs + reg);
+        (void)readl(card->regs + reg);
+}
+
+/**
+ * spider_net_rx_irq_off - switch off rx irq on this spider card
+ * @card: device structure
+ *
+ * switches off rx irq by masking them out in the GHIINTnMSK register
+ */
+static void
+spider_net_rx_irq_off(struct spider_net_card *card)
+{
+        u32 regvalue;
+        unsigned long flags;
+
+        spin_lock_irqsave(&card->intmask_lock, flags);
+        regvalue = spider_net_read_reg(card, SPIDER_NET_GHIINT0MSK);
+        regvalue &= ~SPIDER_NET_RXINT;
+        spider_net_write_reg_sync(card, SPIDER_NET_GHIINT0MSK, regvalue);
+        spin_unlock_irqrestore(&card->intmask_lock, flags);
+}
+
+/** spider_net_write_phy - write to phy register
+ * @netdev: adapter to be written to
+ * @mii_id: id of MII
+ * @reg: PHY register
+ * @val: value to be written to phy register
+ *
+ * spider_net_write_phy_register writes to an arbitrary PHY
+ * register via the spider GPCWOPCMD register. We assume the queue does
+ * not run full (not more than 15 commands outstanding).
+ **/
+static void
+spider_net_write_phy(struct net_device *netdev, int mii_id,
+                     int reg, int val)
+{
+        struct spider_net_card *card = netdev_priv(netdev);
+        u32 writevalue;
+
+        writevalue = ((u32)mii_id << 21) |
+                ((u32)reg << 16) | ((u32)val);
+
+        spider_net_write_reg(card, SPIDER_NET_GPCWOPCMD, writevalue);
+}
+
+/** spider_net_read_phy - read from phy register
+ * @netdev: network device to be read from
+ * @mii_id: id of MII
+ * @reg: PHY register
+ *
+ * Returns value read from PHY register
+ *
+ * spider_net_write_phy reads from an arbitrary PHY
+ * register via the spider GPCROPCMD register
+ **/
+static int
+spider_net_read_phy(struct net_device *netdev, int mii_id, int reg)
+{
+        struct spider_net_card *card = netdev_priv(netdev);
+        u32 readvalue;
+
+        readvalue = ((u32)mii_id << 21) | ((u32)reg << 16);
+        spider_net_write_reg(card, SPIDER_NET_GPCROPCMD, readvalue);
+
+        /* we don't use semaphores to wait for an SPIDER_NET_GPROPCMPINT
+         * interrupt, as we poll for the completion of the read operation
+         * in spider_net_read_phy. Should take about 50 us */
+        do {
+                readvalue = spider_net_read_reg(card, SPIDER_NET_GPCROPCMD);
+        } while (readvalue & SPIDER_NET_GPREXEC);
+
+        readvalue &= SPIDER_NET_GPRDAT_MASK;
+
+        return readvalue;
+}
+
+/**
+ * spider_net_rx_irq_on - switch on rx irq on this spider card
+ * @card: device structure
+ *
+ * switches on rx irq by enabling them in the GHIINTnMSK register
+ */
+static void
+spider_net_rx_irq_on(struct spider_net_card *card)
+{
+        u32 regvalue;
+        unsigned long flags;
+
+        spin_lock_irqsave(&card->intmask_lock, flags);
+        regvalue = spider_net_read_reg(card, SPIDER_NET_GHIINT0MSK);
+        regvalue |= SPIDER_NET_RXINT;
+        spider_net_write_reg_sync(card, SPIDER_NET_GHIINT0MSK, regvalue);
+        spin_unlock_irqrestore(&card->intmask_lock, flags);
+}
+
+/**
+ * spider_net_tx_irq_off - switch off tx irq on this spider card
+ * @card: device structure
+ *
+ * switches off tx irq by masking them out in the GHIINTnMSK register
+ */
+static void
+spider_net_tx_irq_off(struct spider_net_card *card)
+{
+        u32 regvalue;
+        unsigned long flags;
+
+        spin_lock_irqsave(&card->intmask_lock, flags);
+        regvalue = spider_net_read_reg(card, SPIDER_NET_GHIINT0MSK);
+        regvalue &= ~SPIDER_NET_TXINT;
+        spider_net_write_reg_sync(card, SPIDER_NET_GHIINT0MSK, regvalue);
+        spin_unlock_irqrestore(&card->intmask_lock, flags);
+}
+
+/**
+ * spider_net_tx_irq_on - switch on tx irq on this spider card
+ * @card: device structure
+ *
+ * switches on tx irq by enabling them in the GHIINTnMSK register
+ */
+static void
+spider_net_tx_irq_on(struct spider_net_card *card)
+{
+        u32 regvalue;
+        unsigned long flags;
+
+        spin_lock_irqsave(&card->intmask_lock, flags);
+        regvalue = spider_net_read_reg(card, SPIDER_NET_GHIINT0MSK);
+        regvalue |= SPIDER_NET_TXINT;
+        spider_net_write_reg_sync(card, SPIDER_NET_GHIINT0MSK, regvalue);
+        spin_unlock_irqrestore(&card->intmask_lock, flags);
+}
+
+/**
+ * spider_net_set_promisc - sets the unicast address or the promiscuous mode
+ * @card: card structure
+ *
+ * spider_net_set_promisc sets the unicast destination address filter and
+ * thus either allows for non-promisc mode or promisc mode
+ */
+static void
+spider_net_set_promisc(struct spider_net_card *card)
+{
+        u32 macu, macl;
+        struct net_device *netdev = card->netdev;
+
+        if (netdev->flags & IFF_PROMISC) {
+                /* clear destination entry 0 */
+                spider_net_write_reg(card, SPIDER_NET_GMRUAFILnR, 0);
+                spider_net_write_reg(card, SPIDER_NET_GMRUAFILnR + 0x04, 0);
+                spider_net_write_reg(card, SPIDER_NET_GMRUA0FIL15R,
+                                     SPIDER_NET_PROMISC_VALUE);
+        } else {
+                macu = netdev->dev_addr[0];
+                macu <<= 8;
+                macu |= netdev->dev_addr[1];
+                memcpy(&macl, &netdev->dev_addr[2], sizeof(macl));
+
+                macu |= SPIDER_NET_UA_DESCR_VALUE;
+                spider_net_write_reg(card, SPIDER_NET_GMRUAFILnR, macu);
+                spider_net_write_reg(card, SPIDER_NET_GMRUAFILnR + 0x04, macl);
+                spider_net_write_reg(card, SPIDER_NET_GMRUA0FIL15R,
+                                     SPIDER_NET_NONPROMISC_VALUE);
+        }
+}
+
+/**
+ * spider_net_get_mac_address - read mac address from spider card
+ * @card: device structure
+ *
+ * reads MAC address from GMACUNIMACU and GMACUNIMACL registers
+ */
+static int
+spider_net_get_mac_address(struct net_device *netdev)
+{
+        struct spider_net_card *card = netdev_priv(netdev);
+        u32 macl, macu;
+
+        macl = spider_net_read_reg(card, SPIDER_NET_GMACUNIMACL);
+        macu = spider_net_read_reg(card, SPIDER_NET_GMACUNIMACU);
+
+        netdev->dev_addr[0] = (macu >> 24) & 0xff;
+        netdev->dev_addr[1] = (macu >> 16) & 0xff;
+        netdev->dev_addr[2] = (macu >> 8) & 0xff;
+        netdev->dev_addr[3] = macu & 0xff;
+        netdev->dev_addr[4] = (macl >> 8) & 0xff;
+        netdev->dev_addr[5] = macl & 0xff;
+
+        if (!is_valid_ether_addr(&netdev->dev_addr[0]))
+                return -EINVAL;
+
+        return 0;
+}
+
+/**
+ * spider_net_get_descr_status -- returns the status of a descriptor
+ * @descr: descriptor to look at
+ *
+ * returns the status as in the dmac_cmd_status field of the descriptor
+ */
+static enum spider_net_descr_status
+spider_net_get_descr_status(struct spider_net_descr *descr)
+{
+        u32 cmd_status;
+        rmb();
+        cmd_status = descr->dmac_cmd_status;
+        rmb();
+        cmd_status >>= SPIDER_NET_DESCR_IND_PROC_SHIFT;
+        /* no need to mask out any bits, as cmd_status is 32 bits wide only
+         * (and unsigned) */
+        return cmd_status;
+}
+
+/**
+ * spider_net_set_descr_status -- sets the status of a descriptor
+ * @descr: descriptor to change
+ * @status: status to set in the descriptor
+ *
+ * changes the status to the specified value. Doesn't change other bits
+ * in the status
+ */
+static void
+spider_net_set_descr_status(struct spider_net_descr *descr,
+                            enum spider_net_descr_status status)
+{
+        u32 cmd_status;
+        /* read the status */
+        mb();
+        cmd_status = descr->dmac_cmd_status;
+        /* clean the upper 4 bits */
+        cmd_status &= SPIDER_NET_DESCR_IND_PROC_MASKO;
+        /* add the status to it */
+        cmd_status |= ((u32)status)<<SPIDER_NET_DESCR_IND_PROC_SHIFT;
+        /* and write it back */
+        descr->dmac_cmd_status = cmd_status;
+        wmb();
+}
+
+/**
+ * spider_net_free_chain - free descriptor chain
+ * @card: card structure
+ * @chain: address of chain
+ *
+ */
+static void
+spider_net_free_chain(struct spider_net_card *card,
+                      struct spider_net_descr_chain *chain)
+{
+        struct spider_net_descr *descr;
+
+        for (descr = chain->tail; !descr->bus_addr; descr = descr->next) {
+                pci_unmap_single(card->pdev, descr->bus_addr,
+                                 SPIDER_NET_DESCR_SIZE, PCI_DMA_BIDIRECTIONAL);
+                descr->bus_addr = 0;
+        }
+}
+
+/**
+ * spider_net_init_chain - links descriptor chain
+ * @card: card structure
+ * @chain: address of chain
+ * @start_descr: address of descriptor array
+ * @no: number of descriptors
+ *
+ * we manage a circular list that mirrors the hardware structure,
+ * except that the hardware uses bus addresses.
+ *
+ * returns 0 on success, <0 on failure
+ */
+static int
+spider_net_init_chain(struct spider_net_card *card,
+                       struct spider_net_descr_chain *chain,
+                       struct spider_net_descr *start_descr, int no)
+{
+        int i;
+        struct spider_net_descr *descr;
+
+        spin_lock_init(&card->chain_lock);
+
+        descr = start_descr;
+        memset(descr, 0, sizeof(*descr) * no);
+
+        /* set up the hardware pointers in each descriptor */
+        for (i=0; i<no; i++, descr++) {
+                spider_net_set_descr_status(descr, SPIDER_NET_DESCR_NOT_IN_USE);
+
+                descr->bus_addr =
+                        pci_map_single(card->pdev, descr,
+                                       SPIDER_NET_DESCR_SIZE,
+                                       PCI_DMA_BIDIRECTIONAL);
+
+                if (descr->bus_addr == DMA_ERROR_CODE)
+                        goto iommu_error;
+
+                descr->next = descr + 1;
+                descr->prev = descr - 1;
+
+        }
+        /* do actual circular list */
+        (descr-1)->next = start_descr;
+        start_descr->prev = descr-1;
+
+        descr = start_descr;
+        for (i=0; i < no; i++, descr++) {
+                descr->next_descr_addr = descr->next->bus_addr;
+        }
+
+        chain->head = start_descr;
+        chain->tail = start_descr;
+
+        return 0;
+
+iommu_error:
+        descr = start_descr;
+        for (i=0; i < no; i++, descr++)
+                if (descr->bus_addr)
+                        pci_unmap_single(card->pdev, descr->bus_addr,
+                                         SPIDER_NET_DESCR_SIZE, PCI_DMA_BIDIRECTIONAL);
+        return -ENOMEM;
+}
+
+/**
+ * spider_net_free_rx_chain_contents - frees descr contents in rx chain
+ * @card: card structure
+ *
+ * returns 0 on success, <0 on failure
+ */
+static void
+spider_net_free_rx_chain_contents(struct spider_net_card *card)
+{
+        struct spider_net_descr *descr;
+
+        descr = card->rx_chain.head;
+        while (descr->next != card->rx_chain.head) {
+                if (descr->skb) {
+                        dev_kfree_skb(descr->skb);
+                        pci_unmap_single(card->pdev, descr->buf_addr,
+                                         SPIDER_NET_MAX_MTU,
+                                         PCI_DMA_BIDIRECTIONAL);
+                }
+                descr = descr->next;
+        }
+}
+
+/**
+ * spider_net_prepare_rx_descr - reinitializes a rx descriptor
+ * @card: card structure
+ * @descr: descriptor to re-init
+ *
+ * return 0 on succes, <0 on failure
+ *
+ * allocates a new rx skb, iommu-maps it and attaches it to the descriptor.
+ * Activate the descriptor state-wise
+ */
+static int
+spider_net_prepare_rx_descr(struct spider_net_card *card,
+                            struct spider_net_descr *descr)
+{
+        int error = 0;
+        int offset;
+        int bufsize;
+
+        /* we need to round up the buffer size to a multiple of 128 */
+        bufsize = (SPIDER_NET_MAX_MTU + SPIDER_NET_RXBUF_ALIGN - 1) &
+                (~(SPIDER_NET_RXBUF_ALIGN - 1));
+
+        /* and we need to have it 128 byte aligned, therefore we allocate a
+         * bit more */
+        /* allocate an skb */
+        descr->skb = dev_alloc_skb(bufsize + SPIDER_NET_RXBUF_ALIGN - 1);
+        if (!descr->skb) {
+                if (net_ratelimit())
+                        if (netif_msg_rx_err(card))
+                                pr_err("Not enough memory to allocate "
+                                        "rx buffer\n");
+                return -ENOMEM;
+        }
+        descr->buf_size = bufsize;
+        descr->result_size = 0;
+        descr->valid_size = 0;
+        descr->data_status = 0;
+        descr->data_error = 0;
+
+        offset = ((unsigned long)descr->skb->data) &
+                (SPIDER_NET_RXBUF_ALIGN - 1);
+        if (offset)
+                skb_reserve(descr->skb, SPIDER_NET_RXBUF_ALIGN - offset);
+        /* io-mmu-map the skb */
+        descr->buf_addr = pci_map_single(card->pdev, descr->skb->data,
+                                         SPIDER_NET_MAX_MTU,
+                                         PCI_DMA_BIDIRECTIONAL);
+        if (descr->buf_addr == DMA_ERROR_CODE) {
+                dev_kfree_skb_any(descr->skb);
+                if (netif_msg_rx_err(card))
+                        pr_err("Could not iommu-map rx buffer\n");
+                spider_net_set_descr_status(descr, SPIDER_NET_DESCR_NOT_IN_USE);
+        } else {
+                descr->dmac_cmd_status = SPIDER_NET_DMAC_RX_CARDOWNED;
+        }
+
+        return error;
+}
+
+/**
+ * spider_net_enable_rxctails - sets RX dmac chain tail addresses
+ * @card: card structure
+ *
+ * spider_net_enable_rxctails sets the RX DMAC chain tail adresses in the
+ * chip by writing to the appropriate register. DMA is enabled in
+ * spider_net_enable_rxdmac.
+ */
+static void
+spider_net_enable_rxchtails(struct spider_net_card *card)
+{
+        /* assume chain is aligned correctly */
+        spider_net_write_reg(card, SPIDER_NET_GDADCHA ,
+                             card->rx_chain.tail->bus_addr);
+}
+
+/**
+ * spider_net_enable_rxdmac - enables a receive DMA controller
+ * @card: card structure
+ *
+ * spider_net_enable_rxdmac enables the DMA controller by setting RX_DMA_EN
+ * in the GDADMACCNTR register
+ */
+static void
+spider_net_enable_rxdmac(struct spider_net_card *card)
+{
+        spider_net_write_reg(card, SPIDER_NET_GDADMACCNTR,
+                             SPIDER_NET_DMA_RX_VALUE);
+}
+
+/**
+ * spider_net_refill_rx_chain - refills descriptors/skbs in the rx chains
+ * @card: card structure
+ *
+ * refills descriptors in all chains (last used chain first): allocates skbs
+ * and iommu-maps them.
+ */
+static void
+spider_net_refill_rx_chain(struct spider_net_card *card)
+{
+        struct spider_net_descr_chain *chain;
+        int count = 0;
+        unsigned long flags;
+
+        chain = &card->rx_chain;
+
+        spin_lock_irqsave(&card->chain_lock, flags);
+        while (spider_net_get_descr_status(chain->head) ==
+                                SPIDER_NET_DESCR_NOT_IN_USE) {
+                if (spider_net_prepare_rx_descr(card, chain->head))
+                        break;
+                count++;
+                chain->head = chain->head->next;
+        }
+        spin_unlock_irqrestore(&card->chain_lock, flags);
+
+        /* could be optimized, only do that, if we know the DMA processing
+         * has terminated */
+        if (count)
+                spider_net_enable_rxdmac(card);
+}
+
+/**
+ * spider_net_alloc_rx_skbs - allocates rx skbs in rx descriptor chains
+ * @card: card structure
+ *
+ * returns 0 on success, <0 on failure
+ */
+static int
+spider_net_alloc_rx_skbs(struct spider_net_card *card)
+{
+        int result;
+        struct spider_net_descr_chain *chain;
+
+        result = -ENOMEM;
+
+        chain = &card->rx_chain;
+        /* put at least one buffer into the chain. if this fails,
+         * we've got a problem. if not, spider_net_refill_rx_chain
+         * will do the rest at the end of this function */
+        if (spider_net_prepare_rx_descr(card, chain->head))
+                goto error;
+        else
+                chain->head = chain->head->next;
+
+        /* this will allocate the rest of the rx buffers; if not, it's
+         * business as usual later on */
+        spider_net_refill_rx_chain(card);
+        return 0;
+
+error:
+        spider_net_free_rx_chain_contents(card);
+        return result;
+}
+
+/**
+ * spider_net_release_tx_descr - processes a used tx descriptor
+ * @card: card structure
+ * @descr: descriptor to release
+ *
+ * releases a used tx descriptor (unmapping, freeing of skb)
+ */
+static void
+spider_net_release_tx_descr(struct spider_net_card *card,
+                            struct spider_net_descr *descr)
+{
+        struct sk_buff *skb;
+
+        /* unmap the skb */
+        skb = descr->skb;
+        pci_unmap_single(card->pdev, descr->buf_addr, skb->len,
+                         PCI_DMA_BIDIRECTIONAL);
+
+        dev_kfree_skb_any(skb);
+
+        /* set status to not used */
+        spider_net_set_descr_status(descr, SPIDER_NET_DESCR_NOT_IN_USE);
+}
+
+/**
+ * spider_net_release_tx_chain - processes sent tx descriptors
+ * @card: adapter structure
+ * @brutal: if set, don't care about whether descriptor seems to be in use
+ *
+ * releases the tx descriptors that spider has finished with (if non-brutal)
+ * or simply release tx descriptors (if brutal)
+ */
+static void
+spider_net_release_tx_chain(struct spider_net_card *card, int brutal)
+{
+        struct spider_net_descr_chain *tx_chain = &card->tx_chain;
+        enum spider_net_descr_status status;
+
+        spider_net_tx_irq_off(card);
+
+        /* no lock for chain needed, if this is only executed once at a time */
+again:
+        for (;;) {
+                status = spider_net_get_descr_status(tx_chain->tail);
+                switch (status) {
+                case SPIDER_NET_DESCR_CARDOWNED:
+                        if (!brutal) goto out;
+                        /* fallthrough, if we release the descriptors
+                         * brutally (then we don't care about
+                         * SPIDER_NET_DESCR_CARDOWNED) */
+                case SPIDER_NET_DESCR_RESPONSE_ERROR:
+                case SPIDER_NET_DESCR_PROTECTION_ERROR:
+                case SPIDER_NET_DESCR_FORCE_END:
+                        if (netif_msg_tx_err(card))
+                                pr_err("%s: forcing end of tx descriptor "
+                                       "with status x%02x\n",
+                                       card->netdev->name, status);
+                        card->netdev_stats.tx_dropped++;
+                        break;
+
+                case SPIDER_NET_DESCR_COMPLETE:
+                        card->netdev_stats.tx_packets++;
+                        card->netdev_stats.tx_bytes +=
+                                tx_chain->tail->skb->len;
+                        break;
+
+                default: /* any other value (== SPIDER_NET_DESCR_NOT_IN_USE) */
+                        goto out;
+                }
+                spider_net_release_tx_descr(card, tx_chain->tail);
+                tx_chain->tail = tx_chain->tail->next;
+        }
+out:
+        netif_wake_queue(card->netdev);
+
+        if (!brutal) {
+                /* switch on tx irqs (while we are still in the interrupt
+                 * handler, so we don't get an interrupt), check again
+                 * for done descriptors. This results in fewer interrupts */
+                spider_net_tx_irq_on(card);
+                status = spider_net_get_descr_status(tx_chain->tail);
+                switch (status) {
+                        case SPIDER_NET_DESCR_RESPONSE_ERROR:
+                        case SPIDER_NET_DESCR_PROTECTION_ERROR:
+                        case SPIDER_NET_DESCR_FORCE_END:
+                        case SPIDER_NET_DESCR_COMPLETE:
+                                goto again;
+                        default:
+                                break;
+                }
+        }
+
+}
+
+/**
+ * spider_net_get_multicast_hash - generates hash for multicast filter table
+ * @addr: multicast address
+ *
+ * returns the hash value.
+ *
+ * spider_net_get_multicast_hash calculates a hash value for a given multicast
+ * address, that is used to set the multicast filter tables
+ */
+static u8
+spider_net_get_multicast_hash(struct net_device *netdev, __u8 *addr)
+{
+        /* FIXME: an addr of 01:00:5e:00:00:01 must result in 0xa9,
+         * ff:ff:ff:ff:ff:ff must result in 0xfd */
+        u32 crc;
+        u8 hash;
+
+        crc = crc32_be(~0, addr, netdev->addr_len);
+
+        hash = (crc >> 27);
+        hash <<= 3;
+        hash |= crc & 7;
+
+        return hash;
+}
+
+/**
+ * spider_net_set_multi - sets multicast addresses and promisc flags
+ * @netdev: interface device structure
+ *
+ * spider_net_set_multi configures multicast addresses as needed for the
+ * netdev interface. It also sets up multicast, allmulti and promisc
+ * flags appropriately
+ */
+static void
+spider_net_set_multi(struct net_device *netdev)
+{
+        struct dev_mc_list *mc;
+        u8 hash;
+        int i;
+        u32 reg;
+        struct spider_net_card *card = netdev_priv(netdev);
+        unsigned long bitmask[SPIDER_NET_MULTICAST_HASHES / BITS_PER_LONG] =
+                {0, };
+
+        spider_net_set_promisc(card);
+
+        if (netdev->flags & IFF_ALLMULTI) {
+                for (i = 0; i < SPIDER_NET_MULTICAST_HASHES; i++) {
+                        set_bit(i, bitmask);
+                }
+                goto write_hash;
+        }
+
+        /* well, we know, what the broadcast hash value is: it's xfd
+        hash = spider_net_get_multicast_hash(netdev, netdev->broadcast); */
+        set_bit(0xfd, bitmask);
+
+        for (mc = netdev->mc_list; mc; mc = mc->next) {
+                hash = spider_net_get_multicast_hash(netdev, mc->dmi_addr);
+                set_bit(hash, bitmask);
+        }
+
+write_hash:
+        for (i = 0; i < SPIDER_NET_MULTICAST_HASHES / 4; i++) {
+                reg = 0;
+                if (test_bit(i * 4, bitmask))
+                        reg += 0x08;
+                reg <<= 8;
+                if (test_bit(i * 4 + 1, bitmask))
+                        reg += 0x08;
+                reg <<= 8;
+                if (test_bit(i * 4 + 2, bitmask))
+                        reg += 0x08;
+                reg <<= 8;
+                if (test_bit(i * 4 + 3, bitmask))
+                        reg += 0x08;
+
+                spider_net_write_reg(card, SPIDER_NET_GMRMHFILnR + i * 4, reg);
+        }
+}
+
+/**
+ * spider_net_disable_rxdmac - disables the receive DMA controller
+ * @card: card structure
+ *
+ * spider_net_disable_rxdmac terminates processing on the DMA controller by
+ * turing off DMA and issueing a force end
+ */
+static void
+spider_net_disable_rxdmac(struct spider_net_card *card)
+{
+        spider_net_write_reg(card, SPIDER_NET_GDADMACCNTR,
+                             SPIDER_NET_DMA_RX_FEND_VALUE);
+}
+
+/**
+ * spider_net_stop - called upon ifconfig down
+ * @netdev: interface device structure
+ *
+ * always returns 0
+ */
+int
+spider_net_stop(struct net_device *netdev)
+{
+        struct spider_net_card *card = netdev_priv(netdev);
+
+        netif_poll_disable(netdev);
+        netif_carrier_off(netdev);
+        netif_stop_queue(netdev);
+
+        /* disable/mask all interrupts */
+        spider_net_write_reg(card, SPIDER_NET_GHIINT0MSK, 0);
+        spider_net_write_reg(card, SPIDER_NET_GHIINT1MSK, 0);
+        spider_net_write_reg(card, SPIDER_NET_GHIINT2MSK, 0);
+
+        /* free_irq(netdev->irq, netdev);*/
+        free_irq(to_pci_dev(netdev->class_dev.dev)->irq, netdev);
+
+        spider_net_write_reg(card, SPIDER_NET_GDTDMACCNTR,
+                             SPIDER_NET_DMA_TX_FEND_VALUE);
+
+        /* turn off DMA, force end */
+        spider_net_disable_rxdmac(card);
+
+        /* release chains */
+        spider_net_release_tx_chain(card, 1);
+
+        spider_net_free_chain(card, &card->tx_chain);
+        spider_net_free_chain(card, &card->rx_chain);
+
+        return 0;
+}
+
+/**
+ * spider_net_get_next_tx_descr - returns the next available tx descriptor
+ * @card: device structure to get descriptor from
+ *
+ * returns the address of the next descriptor, or NULL if not available.
+ */
+static struct spider_net_descr *
+spider_net_get_next_tx_descr(struct spider_net_card *card)
+{
+        /* check, if head points to not-in-use descr */
+        if ( spider_net_get_descr_status(card->tx_chain.head) ==
+             SPIDER_NET_DESCR_NOT_IN_USE ) {
+                return card->tx_chain.head;
+        } else {
+                return NULL;
+        }
+}
+
+/**
+ * spider_net_set_txdescr_cmdstat - sets the tx descriptor command field
+ * @descr: descriptor structure to fill out
+ * @skb: packet to consider
+ *
+ * fills out the command and status field of the descriptor structure,
+ * depending on hardware checksum settings. This function assumes a wmb()
+ * has executed before.
+ */
+static void
+spider_net_set_txdescr_cmdstat(struct spider_net_descr *descr,
+                               struct sk_buff *skb)
+{
+        if (skb->ip_summed != CHECKSUM_HW) {
+                descr->dmac_cmd_status = SPIDER_NET_DMAC_CMDSTAT_NOCS;
+                return;
+        }
+
+        /* is packet ip?
+         * if yes: tcp? udp? */
+        if (skb->protocol == htons(ETH_P_IP)) {
+                if (skb->nh.iph->protocol == IPPROTO_TCP) {
+                        descr->dmac_cmd_status = SPIDER_NET_DMAC_CMDSTAT_TCPCS;
+                } else if (skb->nh.iph->protocol == IPPROTO_UDP) {
+                        descr->dmac_cmd_status = SPIDER_NET_DMAC_CMDSTAT_UDPCS;
+                } else { /* the stack should checksum non-tcp and non-udp
+                            packets on his own: NETIF_F_IP_CSUM */
+                        descr->dmac_cmd_status = SPIDER_NET_DMAC_CMDSTAT_NOCS;
+                }
+        }
+}
+
+/**
+ * spider_net_prepare_tx_descr - fill tx descriptor with skb data
+ * @card: card structure
+ * @descr: descriptor structure to fill out
+ * @skb: packet to use
+ *
+ * returns 0 on success, <0 on failure.
+ *
+ * fills out the descriptor structure with skb data and len. Copies data,
+ * if needed (32bit DMA!)
+ */
+static int
+spider_net_prepare_tx_descr(struct spider_net_card *card,
+                            struct spider_net_descr *descr,
+                            struct sk_buff *skb)
+{
+        descr->buf_addr = pci_map_single(card->pdev, skb->data,
+                                         skb->len, PCI_DMA_BIDIRECTIONAL);
+        if (descr->buf_addr == DMA_ERROR_CODE) {
+                if (netif_msg_tx_err(card))
+                        pr_err("could not iommu-map packet (%p, %i). "
+                                  "Dropping packet\n", skb->data, skb->len);
+                return -ENOMEM;
+        }
+
+        descr->buf_size = skb->len;
+        descr->skb = skb;
+        descr->data_status = 0;
+
+        /* make sure the above values are in memory before we change the
+         * status */
+        wmb();
+
+        spider_net_set_txdescr_cmdstat(descr,skb);
+
+        return 0;
+}
+
+/**
+ * spider_net_kick_tx_dma - enables TX DMA processing
+ * @card: card structure
+ * @descr: descriptor address to enable TX processing at
+ *
+ * spider_net_kick_tx_dma writes the current tx chain head as start address
+ * of the tx descriptor chain and enables the transmission DMA engine
+ */
+static void
+spider_net_kick_tx_dma(struct spider_net_card *card,
+                       struct spider_net_descr *descr)
+{
+        /* this is the only descriptor in the output chain.
+         * Enable TX DMA */
+
+        spider_net_write_reg(card, SPIDER_NET_GDTDCHA,
+                             descr->bus_addr);
+
+        spider_net_write_reg(card, SPIDER_NET_GDTDMACCNTR,
+                             SPIDER_NET_DMA_TX_VALUE);
+}
+
+/**
+ * spider_net_xmit - transmits a frame over the device
+ * @skb: packet to send out
+ * @netdev: interface device structure
+ *
+ * returns 0 on success, <0 on failure
+ */
+static int
+spider_net_xmit(struct sk_buff *skb, struct net_device *netdev)
+{
+        struct spider_net_card *card = netdev_priv(netdev);
+        struct spider_net_descr *descr;
+        int result;
+
+        descr = spider_net_get_next_tx_descr(card);
+
+        if (!descr) {
+                netif_stop_queue(netdev);
+
+                descr = spider_net_get_next_tx_descr(card);
+                if (!descr)
+                        goto error;
+                else
+                        netif_start_queue(netdev);
+        }
+
+        result = spider_net_prepare_tx_descr(card, descr, skb);
+        if (result)
+                goto error;
+
+        card->tx_chain.head = card->tx_chain.head->next;
+
+        /* make sure the status from spider_net_prepare_tx_descr is in
+         * memory before we check out the previous descriptor */
+        wmb();
+
+        if (spider_net_get_descr_status(descr->prev) !=
+            SPIDER_NET_DESCR_CARDOWNED)
+                spider_net_kick_tx_dma(card, descr);
+
+        return NETDEV_TX_OK;
+
+error:
+        card->netdev_stats.tx_dropped++;
+        return NETDEV_TX_LOCKED;
+}
+
+/**
+ * spider_net_do_ioctl - called for device ioctls
+ * @netdev: interface device structure
+ * @ifr: request parameter structure for ioctl
+ * @cmd: command code for ioctl
+ *
+ * returns 0 on success, <0 on failure. Currently, we have no special ioctls.
+ * -EOPNOTSUPP is returned, if an unknown ioctl was requested
+ */
+static int
+spider_net_do_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)
+{
+        switch (cmd) {
+        default:
+                return -EOPNOTSUPP;
+        }
+}
+
+/**
+ * spider_net_pass_skb_up - takes an skb from a descriptor and passes it on
+ * @descr: descriptor to process
+ * @card: card structure
+ *
+ * returns 1 on success, 0 if no packet was passed to the stack
+ *
+ * iommu-unmaps the skb, fills out skb structure and passes the data to the
+ * stack. The descriptor state is not changed.
+ */
+static int
+spider_net_pass_skb_up(struct spider_net_descr *descr,
+                       struct spider_net_card *card)
+{
+        struct sk_buff *skb;
+        struct net_device *netdev;
+        u32 data_status, data_error;
+
+        data_status = descr->data_status;
+        data_error = descr->data_error;
+
+        netdev = card->netdev;
+
+        /* check for errors in the data_error flag */
+        if ((data_error & SPIDER_NET_DATA_ERROR_MASK) &&
+            netif_msg_rx_err(card))
+                pr_err("error in received descriptor found, "
+                       "data_status=x%08x, data_error=x%08x\n",
+                       data_status, data_error);
+
+        /* prepare skb, unmap descriptor */
+        skb = descr->skb;
+        pci_unmap_single(card->pdev, descr->buf_addr, SPIDER_NET_MAX_MTU,
+                         PCI_DMA_BIDIRECTIONAL);
+
+        /* the cases we'll throw away the packet immediately */
+        if (data_error & SPIDER_NET_DESTROY_RX_FLAGS)
+                return 0;
+
+        skb->dev = netdev;
+        skb_put(skb, descr->valid_size);
+
+        /* the card seems to add 2 bytes of junk in front
+         * of the ethernet frame */
+#define SPIDER_MISALIGN         2
+        skb_pull(skb, SPIDER_MISALIGN);
+        skb->protocol = eth_type_trans(skb, netdev);
+
+        /* checksum offload */
+        if (card->options.rx_csum) {
+                if ( (data_status & SPIDER_NET_DATA_STATUS_CHK_MASK) &&
+                     (!(data_error & SPIDER_NET_DATA_ERROR_CHK_MASK)) )
+                        skb->ip_summed = CHECKSUM_UNNECESSARY;
+                else
+                        skb->ip_summed = CHECKSUM_NONE;
+        } else {
+                skb->ip_summed = CHECKSUM_NONE;
+        }
+
+        if (data_status & SPIDER_NET_VLAN_PACKET) {
+                /* further enhancements: HW-accel VLAN
+                 * vlan_hwaccel_receive_skb
+                 */
+        }
+
+        /* pass skb up to stack */
+        netif_receive_skb(skb);
+
+        /* update netdevice statistics */
+        card->netdev_stats.rx_packets++;
+        card->netdev_stats.rx_bytes += skb->len;
+
+        return 1;
+}
+
+/**
+ * spider_net_decode_descr - processes an rx descriptor
+ * @card: card structure
+ *
+ * returns 1 if a packet has been sent to the stack, otherwise 0
+ *
+ * processes an rx descriptor by iommu-unmapping the data buffer and passing
+ * the packet up to the stack
+ */
+static int
+spider_net_decode_one_descr(struct spider_net_card *card)
+{
+        enum spider_net_descr_status status;
+        struct spider_net_descr *descr;
+        struct spider_net_descr_chain *chain;
+        int result;
+
+        chain = &card->rx_chain;
+        descr = chain->tail;
+
+        status = spider_net_get_descr_status(descr);
+
+        if (status == SPIDER_NET_DESCR_CARDOWNED) {
+                /* nothing in the descriptor yet */
+                return 0;
+        }
+
+        if (status == SPIDER_NET_DESCR_NOT_IN_USE) {
+                /* not initialized yet, I bet chain->tail == chain->head
+                 * and the ring is empty */
+                spider_net_refill_rx_chain(card);
+                return 0;
+        }
+
+        /* descriptor definitively used -- move on head */
+        chain->tail = descr->next;
+
+        result = 0;
+        if ( (status == SPIDER_NET_DESCR_RESPONSE_ERROR) ||
+             (status == SPIDER_NET_DESCR_PROTECTION_ERROR) ||
+             (status == SPIDER_NET_DESCR_FORCE_END) ) {
+                if (netif_msg_rx_err(card))
+                        pr_err("%s: dropping RX descriptor with state %d\n",
+                               card->netdev->name, status);
+                card->netdev_stats.rx_dropped++;
+                goto refill;
+        }
+
+        if ( (status != SPIDER_NET_DESCR_COMPLETE) &&
+             (status != SPIDER_NET_DESCR_FRAME_END) ) {
+                if (netif_msg_rx_err(card))
+                        pr_err("%s: RX descriptor with state %d\n",
+                               card->netdev->name, status);
+                goto refill;
+        }
+
+        /* ok, we've got a packet in descr */
+        result = spider_net_pass_skb_up(descr, card);
+refill:
+        spider_net_set_descr_status(descr, SPIDER_NET_DESCR_NOT_IN_USE);
+        /* change the descriptor state: */
+        spider_net_refill_rx_chain(card);
+
+        return result;
+}
+
+/**
+ * spider_net_poll - NAPI poll function called by the stack to return packets
+ * @netdev: interface device structure
+ * @budget: number of packets we can pass to the stack at most
+ *
+ * returns 0 if no more packets available to the driver/stack. Returns 1,
+ * if the quota is exceeded, but the driver has still packets.
+ *
+ * spider_net_poll returns all packets from the rx descriptors to the stack
+ * (using netif_receive_skb). If all/enough packets are up, the driver
+ * reenables interrupts and returns 0. If not, 1 is returned.
+ */
+static int
+spider_net_poll(struct net_device *netdev, int *budget)
+{
+        struct spider_net_card *card = netdev_priv(netdev);
+        int packets_to_do, packets_done = 0;
+        int no_more_packets = 0;
+
+        packets_to_do = min(*budget, netdev->quota);
+
+        while (packets_to_do) {
+                if (spider_net_decode_one_descr(card)) {
+                        packets_done++;
+                        packets_to_do--;
+                } else {
+                        /* no more packets for the stack */
+                        no_more_packets = 1;
+                        break;
+                }
+        }
+
+        netdev->quota -= packets_done;
+        *budget -= packets_done;
+
+        /* if all packets are in the stack, enable interrupts and return 0 */
+        /* if not, return 1 */
+        if (no_more_packets) {
+                netif_rx_complete(netdev);
+                spider_net_rx_irq_on(card);
+                return 0;
+        }
+
+        return 1;
+}
+
+/**
+ * spider_net_vlan_rx_reg - initializes VLAN structures in the driver and card
+ * @netdev: interface device structure
+ * @grp: vlan_group structure that is registered (NULL on destroying interface)
+ */
+static void
+spider_net_vlan_rx_reg(struct net_device *netdev, struct vlan_group *grp)
+{
+        /* further enhancement... yet to do */
+        return;
+}
+
+/**
+ * spider_net_vlan_rx_add - adds VLAN id to the card filter
+ * @netdev: interface device structure
+ * @vid: VLAN id to add
+ */
+static void
+spider_net_vlan_rx_add(struct net_device *netdev, uint16_t vid)
+{
+        /* further enhancement... yet to do */
+        /* add vid to card's VLAN filter table */
+        return;
+}
+
+/**
+ * spider_net_vlan_rx_kill - removes VLAN id to the card filter
+ * @netdev: interface device structure
+ * @vid: VLAN id to remove
+ */
+static void
+spider_net_vlan_rx_kill(struct net_device *netdev, uint16_t vid)
+{
+        /* further enhancement... yet to do */
+        /* remove vid from card's VLAN filter table */
+}
+
+/**
+ * spider_net_get_stats - get interface statistics
+ * @netdev: interface device structure
+ *
+ * returns the interface statistics residing in the spider_net_card struct
+ */
+static struct net_device_stats *
+spider_net_get_stats(struct net_device *netdev)
+{
+        struct spider_net_card *card = netdev_priv(netdev);
+        struct net_device_stats *stats = &card->netdev_stats;
+        return stats;
+}
+
+/**
+ * spider_net_change_mtu - changes the MTU of an interface
+ * @netdev: interface device structure
+ * @new_mtu: new MTU value
+ *
+ * returns 0 on success, <0 on failure
+ */
+static int
+spider_net_change_mtu(struct net_device *netdev, int new_mtu)
+{
+        /* no need to re-alloc skbs or so -- the max mtu is about 2.3k
+         * and mtu is outbound only anyway */
+        if ( (new_mtu < SPIDER_NET_MIN_MTU ) ||
+                (new_mtu > SPIDER_NET_MAX_MTU) )
+                return -EINVAL;
+        netdev->mtu = new_mtu;
+        return 0;
+}
+
+/**
+ * spider_net_set_mac - sets the MAC of an interface
+ * @netdev: interface device structure
+ * @ptr: pointer to new MAC address
+ *
+ * Returns 0 on success, <0 on failure. Currently, we don't support this
+ * and will always return EOPNOTSUPP.
+ */
+static int
+spider_net_set_mac(struct net_device *netdev, void *p)
+{
+        struct spider_net_card *card = netdev_priv(netdev);
+        u32 macl, macu, regvalue;
+        struct sockaddr *addr = p;
+
+        if (!is_valid_ether_addr(addr->sa_data))
+                return -EADDRNOTAVAIL;
+
+        /* switch off GMACTPE and GMACRPE */
+        regvalue = spider_net_read_reg(card, SPIDER_NET_GMACOPEMD);
+        regvalue &= ~((1 << 5) | (1 << 6));
+        spider_net_write_reg(card, SPIDER_NET_GMACOPEMD, regvalue);
+
+        /* write mac */
+        macu = (addr->sa_data[0]<<24) + (addr->sa_data[1]<<16) +
+                (addr->sa_data[2]<<8) + (addr->sa_data[3]);
+        macl = (addr->sa_data[4]<<8) + (addr->sa_data[5]);
+        spider_net_write_reg(card, SPIDER_NET_GMACUNIMACU, macu);
+        spider_net_write_reg(card, SPIDER_NET_GMACUNIMACL, macl);
+
+        /* switch GMACTPE and GMACRPE back on */
+        regvalue = spider_net_read_reg(card, SPIDER_NET_GMACOPEMD);
+        regvalue |= ((1 << 5) | (1 << 6));
+        spider_net_write_reg(card, SPIDER_NET_GMACOPEMD, regvalue);
+
+        spider_net_set_promisc(card);
+
+        /* look up, whether we have been successful */
+        if (spider_net_get_mac_address(netdev))
+                return -EADDRNOTAVAIL;
+        if (memcmp(netdev->dev_addr,addr->sa_data,netdev->addr_len))
+                return -EADDRNOTAVAIL;
+
+        return 0;
+}
+
+/**
+ * spider_net_enable_txdmac - enables a TX DMA controller
+ * @card: card structure
+ *
+ * spider_net_enable_txdmac enables the TX DMA controller by setting the
+ * descriptor chain tail address
+ */
+static void
+spider_net_enable_txdmac(struct spider_net_card *card)
+{
+        /* assume chain is aligned correctly */
+        spider_net_write_reg(card, SPIDER_NET_GDTDCHA,
+                             card->tx_chain.tail->bus_addr);
+}
+
+/**
+ * spider_net_handle_error_irq - handles errors raised by an interrupt
+ * @card: card structure
+ * @status_reg: interrupt status register 0 (GHIINT0STS)
+ *
+ * spider_net_handle_error_irq treats or ignores all error conditions
+ * found when an interrupt is presented
+ */
+static void
+spider_net_handle_error_irq(struct spider_net_card *card, u32 status_reg)
+{
+        u32 error_reg1, error_reg2;
+        u32 i;
+        int show_error = 1;
+
+        error_reg1 = spider_net_read_reg(card, SPIDER_NET_GHIINT1STS);
+        error_reg2 = spider_net_read_reg(card, SPIDER_NET_GHIINT2STS);
+
+        /* check GHIINT0STS ************************************/
+        if (status_reg)
+                for (i = 0; i < 32; i++)
+                        if (status_reg & (1<<i))
+                                switch (i)
+        {
+        /* let error_reg1 and error_reg2 evaluation decide, what to do
+        case SPIDER_NET_PHYINT:
+        case SPIDER_NET_GMAC2INT:
+        case SPIDER_NET_GMAC1INT:
+        case SPIDER_NET_GIPSINT:
+        case SPIDER_NET_GFIFOINT:
+        case SPIDER_NET_DMACINT:
+        case SPIDER_NET_GSYSINT:
+                break; */
+
+        case SPIDER_NET_GPWOPCMPINT:
+                /* PHY write operation completed */
+                show_error = 0;
+                break;
+        case SPIDER_NET_GPROPCMPINT:
+                /* PHY read operation completed */
+                /* we don't use semaphores, as we poll for the completion
+                 * of the read operation in spider_net_read_phy. Should take
+                 * about 50 us */
+                show_error = 0;
+                break;
+        case SPIDER_NET_GPWFFINT:
+                /* PHY command queue full */
+                if (netif_msg_intr(card))
+                        pr_err("PHY write queue full\n");
+                show_error = 0;
+                break;
+
+        /* case SPIDER_NET_GRMDADRINT: not used. print a message */
+        /* case SPIDER_NET_GRMARPINT: not used. print a message */
+        /* case SPIDER_NET_GRMMPINT: not used. print a message */
+
+        case SPIDER_NET_GDTDEN0INT:
+                /* someone has set TX_DMA_EN to 0 */
+                show_error = 0;
+                break;
+
+        case SPIDER_NET_GDDDEN0INT: /* fallthrough */
+        case SPIDER_NET_GDCDEN0INT: /* fallthrough */
+        case SPIDER_NET_GDBDEN0INT: /* fallthrough */
+        case SPIDER_NET_GDADEN0INT:
+                /* someone has set RX_DMA_EN to 0 */
+                show_error = 0;
+                break;
+
+        /* RX interrupts */
+        case SPIDER_NET_GDDFDCINT:
+        case SPIDER_NET_GDCFDCINT:
+        case SPIDER_NET_GDBFDCINT:
+        case SPIDER_NET_GDAFDCINT:
+        /* case SPIDER_NET_GDNMINT: not used. print a message */
+        /* case SPIDER_NET_GCNMINT: not used. print a message */
+        /* case SPIDER_NET_GBNMINT: not used. print a message */
+        /* case SPIDER_NET_GANMINT: not used. print a message */
+        /* case SPIDER_NET_GRFNMINT: not used. print a message */
+                show_error = 0;
+                break;
+
+        /* TX interrupts */
+        case SPIDER_NET_GDTFDCINT:
+                show_error = 0;
+                break;
+        case SPIDER_NET_GTTEDINT:
+                show_error = 0;
+                break;
+        case SPIDER_NET_GDTDCEINT:
+                /* chain end. If a descriptor should be sent, kick off
+                 * tx dma
+                if (card->tx_chain.tail == card->tx_chain.head)
+                        spider_net_kick_tx_dma(card);
+                show_error = 0; */
+                break;
+
+        /* case SPIDER_NET_G1TMCNTINT: not used. print a message */
+        /* case SPIDER_NET_GFREECNTINT: not used. print a message */
+        }
+
+        /* check GHIINT1STS ************************************/
+        if (error_reg1)
+                for (i = 0; i < 32; i++)
+                        if (error_reg1 & (1<<i))
+                                switch (i)
+        {
+        case SPIDER_NET_GTMFLLINT:
+                if (netif_msg_intr(card))
+                        pr_err("Spider TX RAM full\n");
+                show_error = 0;
+                break;
+        case SPIDER_NET_GRMFLLINT:
+                if (netif_msg_intr(card))
+                        pr_err("Spider RX RAM full, incoming packets "
+                               "might be discarded !\n");
+                netif_rx_schedule(card->netdev);
+                spider_net_enable_rxchtails(card);
+                spider_net_enable_rxdmac(card);
+                break;
+
+        /* case SPIDER_NET_GTMSHTINT: problem, print a message */
+        case SPIDER_NET_GDTINVDINT:
+                /* allrighty. tx from previous descr ok */
+                show_error = 0;
+                break;
+        /* case SPIDER_NET_GRFDFLLINT: print a message down there */
+        /* case SPIDER_NET_GRFCFLLINT: print a message down there */
+        /* case SPIDER_NET_GRFBFLLINT: print a message down there */
+        /* case SPIDER_NET_GRFAFLLINT: print a message down there */
+
+        /* chain end */
+        case SPIDER_NET_GDDDCEINT: /* fallthrough */
+        case SPIDER_NET_GDCDCEINT: /* fallthrough */
+        case SPIDER_NET_GDBDCEINT: /* fallthrough */
+        case SPIDER_NET_GDADCEINT:
+                if (netif_msg_intr(card))
+                        pr_err("got descriptor chain end interrupt, "
+                               "restarting DMAC %c.\n",
+                               'D'+i-SPIDER_NET_GDDDCEINT);
+                spider_net_refill_rx_chain(card);
+                show_error = 0;
+                break;
+
+        /* invalid descriptor */
+        case SPIDER_NET_GDDINVDINT: /* fallthrough */
+        case SPIDER_NET_GDCINVDINT: /* fallthrough */
+        case SPIDER_NET_GDBINVDINT: /* fallthrough */
+        case SPIDER_NET_GDAINVDINT:
+                /* could happen when rx chain is full */
+                spider_net_refill_rx_chain(card);
+                show_error = 0;
+                break;
+
+        /* case SPIDER_NET_GDTRSERINT: problem, print a message */
+        /* case SPIDER_NET_GDDRSERINT: problem, print a message */
+        /* case SPIDER_NET_GDCRSERINT: problem, print a message */
+        /* case SPIDER_NET_GDBRSERINT: problem, print a message */
+        /* case SPIDER_NET_GDARSERINT: problem, print a message */
+        /* case SPIDER_NET_GDSERINT: problem, print a message */
+        /* case SPIDER_NET_GDTPTERINT: problem, print a message */
+        /* case SPIDER_NET_GDDPTERINT: problem, print a message */
+        /* case SPIDER_NET_GDCPTERINT: problem, print a message */
+        /* case SPIDER_NET_GDBPTERINT: problem, print a message */
+        /* case SPIDER_NET_GDAPTERINT: problem, print a message */
+        default:
+                show_error = 1;
+                break;
+        }
+
+        /* check GHIINT2STS ************************************/
+        if (error_reg2)
+                for (i = 0; i < 32; i++)
+                        if (error_reg2 & (1<<i))
+                                switch (i)
+        {
+        /* there is nothing we can (want  to) do at this time. Log a
+         * message, we can switch on and off the specific values later on
+        case SPIDER_NET_GPROPERINT:
+        case SPIDER_NET_GMCTCRSNGINT:
+        case SPIDER_NET_GMCTLCOLINT:
+        case SPIDER_NET_GMCTTMOTINT:
+        case SPIDER_NET_GMCRCAERINT:
+        case SPIDER_NET_GMCRCALERINT:
+        case SPIDER_NET_GMCRALNERINT:
+        case SPIDER_NET_GMCROVRINT:
+        case SPIDER_NET_GMCRRNTINT:
+        case SPIDER_NET_GMCRRXERINT:
+        case SPIDER_NET_GTITCSERINT:
+        case SPIDER_NET_GTIFMTERINT:
+        case SPIDER_NET_GTIPKTRVKINT:
+        case SPIDER_NET_GTISPINGINT:
+        case SPIDER_NET_GTISADNGINT:
+        case SPIDER_NET_GTISPDNGINT:
+        case SPIDER_NET_GRIFMTERINT:
+        case SPIDER_NET_GRIPKTRVKINT:
+        case SPIDER_NET_GRISPINGINT:
+        case SPIDER_NET_GRISADNGINT:
+        case SPIDER_NET_GRISPDNGINT:
+                break;
+        */
+                default:
+                        break;
+        }
+
+        if ((show_error) && (netif_msg_intr(card)))
+                pr_err("Got error interrupt, GHIINT0STS = 0x%08x, "
+                       "GHIINT1STS = 0x%08x, GHIINT2STS = 0x%08x\n",
+                       status_reg, error_reg1, error_reg2);
+
+        /* clear interrupt sources */
+        spider_net_write_reg(card, SPIDER_NET_GHIINT1STS, error_reg1);
+        spider_net_write_reg(card, SPIDER_NET_GHIINT2STS, error_reg2);
+}
+
+/**
+ * spider_net_interrupt - interrupt handler for spider_net
+ * @irq: interupt number
+ * @ptr: pointer to net_device
+ * @regs: PU registers
+ *
+ * returns IRQ_HANDLED, if interrupt was for driver, or IRQ_NONE, if no
+ * interrupt found raised by card.
+ *
+ * This is the interrupt handler, that turns off
+ * interrupts for this device and makes the stack poll the driver
+ */
+static irqreturn_t
+spider_net_interrupt(int irq, void *ptr, struct pt_regs *regs)
+{
+        struct net_device *netdev = ptr;
+        struct spider_net_card *card = netdev_priv(netdev);
+        u32 status_reg;
+
+        status_reg = spider_net_read_reg(card, SPIDER_NET_GHIINT0STS);
+
+        if (!status_reg)
+                return IRQ_NONE;
+
+        if (status_reg & SPIDER_NET_TXINT)
+                spider_net_release_tx_chain(card, 0);
+
+        if (status_reg & SPIDER_NET_RXINT ) {
+                spider_net_rx_irq_off(card);
+                netif_rx_schedule(netdev);
+        }
+
+        /* we do this after rx and tx processing, as we want the tx chain
+         * processed to see, whether we should restart tx dma processing */
+        spider_net_handle_error_irq(card, status_reg);
+
+        /* clear interrupt sources */
+        spider_net_write_reg(card, SPIDER_NET_GHIINT0STS, status_reg);
+
+        return IRQ_HANDLED;
+}
+
+#ifdef CONFIG_NET_POLL_CONTROLLER
+/**
+ * spider_net_poll_controller - artificial interrupt for netconsole etc.
+ * @netdev: interface device structure
+ *
+ * see Documentation/networking/netconsole.txt
+ */
+static void
+spider_net_poll_controller(struct net_device *netdev)
+{
+        disable_irq(netdev->irq);
+        spider_net_interrupt(netdev->irq, netdev, NULL);
+        enable_irq(netdev->irq);
+}
+#endif /* CONFIG_NET_POLL_CONTROLLER */
+
+/**
+ * spider_net_init_card - initializes the card
+ * @card: card structure
+ *
+ * spider_net_init_card initializes the card so that other registers can
+ * be used
+ */
+static void
+spider_net_init_card(struct spider_net_card *card)
+{
+        spider_net_write_reg(card, SPIDER_NET_CKRCTRL,
+                             SPIDER_NET_CKRCTRL_STOP_VALUE);
+
+        spider_net_write_reg(card, SPIDER_NET_CKRCTRL,
+                             SPIDER_NET_CKRCTRL_RUN_VALUE);
+}
+
+/**
+ * spider_net_enable_card - enables the card by setting all kinds of regs
+ * @card: card structure
+ *
+ * spider_net_enable_card sets a lot of SMMIO registers to enable the device
+ */
+static void
+spider_net_enable_card(struct spider_net_card *card)
+{
+        int i;
+        /* the following array consists of (register),(value) pairs
+         * that are set in this function. A register of 0 ends the list */
+        u32 regs[][2] = {
+                { SPIDER_NET_GRESUMINTNUM, 0 },
+                { SPIDER_NET_GREINTNUM, 0 },
+
+                /* set interrupt frame number registers */
+                /* clear the single DMA engine registers first */
+                { SPIDER_NET_GFAFRMNUM, SPIDER_NET_GFXFRAMES_VALUE },
+                { SPIDER_NET_GFBFRMNUM, SPIDER_NET_GFXFRAMES_VALUE },
+                { SPIDER_NET_GFCFRMNUM, SPIDER_NET_GFXFRAMES_VALUE },
+                { SPIDER_NET_GFDFRMNUM, SPIDER_NET_GFXFRAMES_VALUE },
+                /* then set, what we really need */
+                { SPIDER_NET_GFFRMNUM, SPIDER_NET_FRAMENUM_VALUE },
+
+                /* timer counter registers and stuff */
+                { SPIDER_NET_GFREECNNUM, 0 },
+                { SPIDER_NET_GONETIMENUM, 0 },
+                { SPIDER_NET_GTOUTFRMNUM, 0 },
+
+                /* RX mode setting */
+                { SPIDER_NET_GRXMDSET, SPIDER_NET_RXMODE_VALUE },
+                /* TX mode setting */
+                { SPIDER_NET_GTXMDSET, SPIDER_NET_TXMODE_VALUE },
+                /* IPSEC mode setting */
+                { SPIDER_NET_GIPSECINIT, SPIDER_NET_IPSECINIT_VALUE },
+
+                { SPIDER_NET_GFTRESTRT, SPIDER_NET_RESTART_VALUE },
+
+                { SPIDER_NET_GMRWOLCTRL, 0 },
+                { SPIDER_NET_GTESTMD, 0 },
+
+                { SPIDER_NET_GMACINTEN, 0 },
+
+                /* flow control stuff */
+                { SPIDER_NET_GMACAPAUSE, SPIDER_NET_MACAPAUSE_VALUE },
+                { SPIDER_NET_GMACTXPAUSE, SPIDER_NET_TXPAUSE_VALUE },
+
+                { SPIDER_NET_GMACBSTLMT, SPIDER_NET_BURSTLMT_VALUE },
+                { 0, 0}
+        };
+
+        i = 0;
+        while (regs[i][0]) {
+                spider_net_write_reg(card, regs[i][0], regs[i][1]);
+                i++;
+        }
+
+        /* clear unicast filter table entries 1 to 14 */
+        for (i = 1; i <= 14; i++) {
+                spider_net_write_reg(card,
+                                     SPIDER_NET_GMRUAFILnR + i * 8,
+                                     0x00080000);
+                spider_net_write_reg(card,
+                                     SPIDER_NET_GMRUAFILnR + i * 8 + 4,
+                                     0x00000000);
+        }
+
+        spider_net_write_reg(card, SPIDER_NET_GMRUA0FIL15R, 0x08080000);
+
+        spider_net_write_reg(card, SPIDER_NET_ECMODE, SPIDER_NET_ECMODE_VALUE);
+
+        /* set chain tail adress for RX chains and
+         * enable DMA */
+        spider_net_enable_rxchtails(card);
+        spider_net_enable_rxdmac(card);
+
+        spider_net_write_reg(card, SPIDER_NET_GRXDMAEN, SPIDER_NET_WOL_VALUE);
+
+        /* set chain tail adress for TX chain */
+        spider_net_enable_txdmac(card);
+
+        spider_net_write_reg(card, SPIDER_NET_GMACLENLMT,
+                             SPIDER_NET_LENLMT_VALUE);
+        spider_net_write_reg(card, SPIDER_NET_GMACMODE,
+                             SPIDER_NET_MACMODE_VALUE);
+        spider_net_write_reg(card, SPIDER_NET_GMACOPEMD,
+                             SPIDER_NET_OPMODE_VALUE);
+
+        /* set interrupt mask registers */
+        spider_net_write_reg(card, SPIDER_NET_GHIINT0MSK,
+                             SPIDER_NET_INT0_MASK_VALUE);
+        spider_net_write_reg(card, SPIDER_NET_GHIINT1MSK,
+                             SPIDER_NET_INT1_MASK_VALUE);
+        spider_net_write_reg(card, SPIDER_NET_GHIINT2MSK,
+                             SPIDER_NET_INT2_MASK_VALUE);
+}
+
+/**
+ * spider_net_open - called upon ifonfig up
+ * @netdev: interface device structure
+ *
+ * returns 0 on success, <0 on failure
+ *
+ * spider_net_open allocates all the descriptors and memory needed for
+ * operation, sets up multicast list and enables interrupts
+ */
+int
+spider_net_open(struct net_device *netdev)
+{
+        struct spider_net_card *card = netdev_priv(netdev);
+        int result;
+
+        result = -ENOMEM;
+        if (spider_net_init_chain(card, &card->tx_chain,
+                          card->descr, tx_descriptors))
+                goto alloc_tx_failed;
+        if (spider_net_init_chain(card, &card->rx_chain,
+                          card->descr + tx_descriptors, rx_descriptors))
+                goto alloc_rx_failed;
+
+        /* allocate rx skbs */
+        if (spider_net_alloc_rx_skbs(card))
+                goto alloc_skbs_failed;
+
+        spider_net_set_multi(netdev);
+
+        /* further enhancement: setup hw vlan, if needed */
+
+        result = -EBUSY;
+        if (request_irq(netdev->irq, spider_net_interrupt,
+                             SA_SHIRQ, netdev->name, netdev))
+                goto register_int_failed;
+
+        spider_net_enable_card(card);
+
+        netif_start_queue(netdev);
+        netif_carrier_on(netdev);
+        netif_poll_enable(netdev);
+
+        return 0;
+
+register_int_failed:
+        spider_net_free_rx_chain_contents(card);
+alloc_skbs_failed:
+        spider_net_free_chain(card, &card->rx_chain);
+alloc_rx_failed:
+        spider_net_free_chain(card, &card->tx_chain);
+alloc_tx_failed:
+        return result;
+}
+
+/**
+ * spider_net_setup_phy - setup PHY
+ * @card: card structure
+ *
+ * returns 0 on success, <0 on failure
+ *
+ * spider_net_setup_phy is used as part of spider_net_probe. Sets
+ * the PHY to 1000 Mbps
+ **/
+static int
+spider_net_setup_phy(struct spider_net_card *card)
+{
+        struct mii_phy *phy = &card->phy;
+
+        spider_net_write_reg(card, SPIDER_NET_GDTDMASEL,
+                             SPIDER_NET_DMASEL_VALUE);
+        spider_net_write_reg(card, SPIDER_NET_GPCCTRL,
+                             SPIDER_NET_PHY_CTRL_VALUE);
+        phy->mii_id = 1;
+        phy->dev = card->netdev;
+        phy->mdio_read = spider_net_read_phy;
+        phy->mdio_write = spider_net_write_phy;
+
+        mii_phy_probe(phy, phy->mii_id);
+
+        if (phy->def->ops->setup_forced)
+                phy->def->ops->setup_forced(phy, SPEED_1000, DUPLEX_FULL);
+
+        /* the following two writes could be moved to sungem_phy.c */
+        /* enable fiber mode */
+        spider_net_write_phy(card->netdev, 1, MII_NCONFIG, 0x9020);
+        /* LEDs active in both modes, autosense prio = fiber */
+        spider_net_write_phy(card->netdev, 1, MII_NCONFIG, 0x945f);
+
+        phy->def->ops->read_link(phy);
+        pr_info("Found %s with %i Mbps, %s-duplex.\n", phy->def->name,
+                phy->speed, phy->duplex==1 ? "Full" : "Half");
+
+        return 0;
+}
+
+/**
+ * spider_net_download_firmware - loads firmware into the adapter
+ * @card: card structure
+ * @firmware: firmware pointer
+ *
+ * spider_net_download_firmware loads the firmware opened by
+ * spider_net_init_firmware into the adapter.
+ */
+static void
+spider_net_download_firmware(struct spider_net_card *card,
+                             const struct firmware *firmware)
+{
+        int sequencer, i;
+        u32 *fw_ptr = (u32 *)firmware->data;
+
+        /* stop sequencers */
+        spider_net_write_reg(card, SPIDER_NET_GSINIT,
+                             SPIDER_NET_STOP_SEQ_VALUE);
+
+        for (sequencer = 0; sequencer < 6; sequencer++) {
+                spider_net_write_reg(card,
+                                     SPIDER_NET_GSnPRGADR + sequencer * 8, 0);
+                for (i = 0; i < SPIDER_NET_FIRMWARE_LEN; i++) {
+                        spider_net_write_reg(card, SPIDER_NET_GSnPRGDAT +
+                                             sequencer * 8, *fw_ptr);
+                        fw_ptr++;
+                }
+        }
+
+        spider_net_write_reg(card, SPIDER_NET_GSINIT,
+                             SPIDER_NET_RUN_SEQ_VALUE);
+}
+
+/**
+ * spider_net_init_firmware - reads in firmware parts
+ * @card: card structure
+ *
+ * Returns 0 on success, <0 on failure
+ *
+ * spider_net_init_firmware opens the sequencer firmware and does some basic
+ * checks. This function opens and releases the firmware structure. A call
+ * to download the firmware is performed before the release.
+ *
+ * Firmware format
+ * ===============
+ * spider_fw.bin is expected to be a file containing 6*1024*4 bytes, 4k being
+ * the program for each sequencer. Use the command
+ *    tail -q -n +2 Seq_code1_0x088.txt Seq_code2_0x090.txt              \
+ *         Seq_code3_0x098.txt Seq_code4_0x0A0.txt Seq_code5_0x0A8.txt   \
+ *         Seq_code6_0x0B0.txt | xxd -r -p -c4 > spider_fw.bin
+ *
+ * to generate spider_fw.bin, if you have sequencer programs with something
+ * like the following contents for each sequencer:
+ *    <ONE LINE COMMENT>
+ *    <FIRST 4-BYTES-WORD FOR SEQUENCER>
+ *    <SECOND 4-BYTES-WORD FOR SEQUENCER>
+ *     ...
+ *    <1024th 4-BYTES-WORD FOR SEQUENCER>
+ */
+static int
+spider_net_init_firmware(struct spider_net_card *card)
+{
+        const struct firmware *firmware;
+        int err = -EIO;
+
+        if (request_firmware(&firmware,
+                             SPIDER_NET_FIRMWARE_NAME, &card->pdev->dev) < 0) {
+                if (netif_msg_probe(card))
+                        pr_err("Couldn't read in sequencer data file %s.\n",
+                               SPIDER_NET_FIRMWARE_NAME);
+                firmware = NULL;
+                goto out;
+        }
+
+        if (firmware->size != 6 * SPIDER_NET_FIRMWARE_LEN * sizeof(u32)) {
+                if (netif_msg_probe(card))
+                        pr_err("Invalid size of sequencer data file %s.\n",
+                               SPIDER_NET_FIRMWARE_NAME);
+                goto out;
+        }
+
+        spider_net_download_firmware(card, firmware);
+
+        err = 0;
+out:
+        release_firmware(firmware);
+
+        return err;
+}
+
+/**
+ * spider_net_workaround_rxramfull - work around firmware bug
+ * @card: card structure
+ *
+ * no return value
+ **/
+static void
+spider_net_workaround_rxramfull(struct spider_net_card *card)
+{
+        int i, sequencer = 0;
+
+        /* cancel reset */
+        spider_net_write_reg(card, SPIDER_NET_CKRCTRL,
+                             SPIDER_NET_CKRCTRL_RUN_VALUE);
+
+        /* empty sequencer data */
+        for (sequencer = 0; sequencer < 6; sequencer++) {
+                spider_net_write_reg(card, SPIDER_NET_GSnPRGDAT +
+                                     sequencer * 8, 0x0);
+                for (i = 0; i < SPIDER_NET_FIRMWARE_LEN; i++) {
+                        spider_net_write_reg(card, SPIDER_NET_GSnPRGDAT +
+                                             sequencer * 8, 0x0);
+                }
+        }
+
+        /* set sequencer operation */
+        spider_net_write_reg(card, SPIDER_NET_GSINIT, 0x000000fe);
+
+        /* reset */
+        spider_net_write_reg(card, SPIDER_NET_CKRCTRL,
+                             SPIDER_NET_CKRCTRL_STOP_VALUE);
+}
+
+/**
+ * spider_net_tx_timeout_task - task scheduled by the watchdog timeout
+ * function (to be called not under interrupt status)
+ * @data: data, is interface device structure
+ *
+ * called as task when tx hangs, resets interface (if interface is up)
+ */
+static void
+spider_net_tx_timeout_task(void *data)
+{
+        struct net_device *netdev = data;
+        struct spider_net_card *card = netdev_priv(netdev);
+
+        if (!(netdev->flags & IFF_UP))
+                goto out;
+
+        netif_device_detach(netdev);
+        spider_net_stop(netdev);
+
+        spider_net_workaround_rxramfull(card);
+        spider_net_init_card(card);
+
+        if (spider_net_setup_phy(card))
+                goto out;
+        if (spider_net_init_firmware(card))
+                goto out;
+
+        spider_net_open(netdev);
+        spider_net_kick_tx_dma(card, card->tx_chain.head);
+        netif_device_attach(netdev);
+
+out:
+        atomic_dec(&card->tx_timeout_task_counter);
+}
+
+/**
+ * spider_net_tx_timeout - called when the tx timeout watchdog kicks in.
+ * @netdev: interface device structure
+ *
+ * called, if tx hangs. Schedules a task that resets the interface
+ */
+static void
+spider_net_tx_timeout(struct net_device *netdev)
+{
+        struct spider_net_card *card;
+
+        card = netdev_priv(netdev);
+        atomic_inc(&card->tx_timeout_task_counter);
+        if (netdev->flags & IFF_UP)
+                schedule_work(&card->tx_timeout_task);
+        else
+                atomic_dec(&card->tx_timeout_task_counter);
+}
+
+/**
+ * spider_net_setup_netdev_ops - initialization of net_device operations
+ * @netdev: net_device structure
+ *
+ * fills out function pointers in the net_device structure
+ */
+static void
+spider_net_setup_netdev_ops(struct net_device *netdev)
+{
+        netdev->open = &spider_net_open;
+        netdev->stop = &spider_net_stop;
+        netdev->hard_start_xmit = &spider_net_xmit;
+        netdev->get_stats = &spider_net_get_stats;
+        netdev->set_multicast_list = &spider_net_set_multi;
+        netdev->set_mac_address = &spider_net_set_mac;
+        netdev->change_mtu = &spider_net_change_mtu;
+        netdev->do_ioctl = &spider_net_do_ioctl;
+        /* tx watchdog */
+        netdev->tx_timeout = &spider_net_tx_timeout;
+        netdev->watchdog_timeo = SPIDER_NET_WATCHDOG_TIMEOUT;
+        /* NAPI */
+        netdev->poll = &spider_net_poll;
+        netdev->weight = SPIDER_NET_NAPI_WEIGHT;
+        /* HW VLAN */
+        netdev->vlan_rx_register = &spider_net_vlan_rx_reg;
+        netdev->vlan_rx_add_vid = &spider_net_vlan_rx_add;
+        netdev->vlan_rx_kill_vid = &spider_net_vlan_rx_kill;
+#ifdef CONFIG_NET_POLL_CONTROLLER
+        /* poll controller */
+        netdev->poll_controller = &spider_net_poll_controller;
+#endif /* CONFIG_NET_POLL_CONTROLLER */
+        /* ethtool ops */
+        netdev->ethtool_ops = &spider_net_ethtool_ops;
+}
+
+/**
+ * spider_net_setup_netdev - initialization of net_device
+ * @card: card structure
+ *
+ * Returns 0 on success or <0 on failure
+ *
+ * spider_net_setup_netdev initializes the net_device structure
+ **/
+static int
+spider_net_setup_netdev(struct spider_net_card *card)
+{
+        int result;
+        struct net_device *netdev = card->netdev;
+        struct device_node *dn;
+        struct sockaddr addr;
+        u8 *mac;
+
+        SET_MODULE_OWNER(netdev);
+        SET_NETDEV_DEV(netdev, &card->pdev->dev);
+
+        pci_set_drvdata(card->pdev, netdev);
+        spin_lock_init(&card->intmask_lock);
+        netdev->irq = card->pdev->irq;
+
+        card->options.rx_csum = SPIDER_NET_RX_CSUM_DEFAULT;
+
+        spider_net_setup_netdev_ops(netdev);
+
+        netdev->features = 0;
+        /* some time: NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX |
+         *              NETIF_F_HW_VLAN_FILTER */
+
+        netdev->irq = card->pdev->irq;
+
+        dn = pci_device_to_OF_node(card->pdev);
+        if (!dn)
+                return -EIO;
+
+        mac = (u8 *)get_property(dn, "local-mac-address", NULL);
+        if (!mac)
+                return -EIO;
+        memcpy(addr.sa_data, mac, ETH_ALEN);
+
+        result = spider_net_set_mac(netdev, &addr);
+        if ((result) && (netif_msg_probe(card)))
+                pr_err("Failed to set MAC address: %i\n", result);
+
+        result = register_netdev(netdev);
+        if (result) {
+                if (netif_msg_probe(card))
+                        pr_err("Couldn't register net_device: %i\n",
+                                  result);
+                return result;
+        }
+
+        if (netif_msg_probe(card))
+                pr_info("Initialized device %s.\n", netdev->name);
+
+        return 0;
+}
+
+/**
+ * spider_net_alloc_card - allocates net_device and card structure
+ *
+ * returns the card structure or NULL in case of errors
+ *
+ * the card and net_device structures are linked to each other
+ */
+static struct spider_net_card *
+spider_net_alloc_card(void)
+{
+        struct net_device *netdev;
+        struct spider_net_card *card;
+        size_t alloc_size;
+
+        alloc_size = sizeof (*card) +
+                sizeof (struct spider_net_descr) * rx_descriptors +
+                sizeof (struct spider_net_descr) * tx_descriptors;
+        netdev = alloc_etherdev(alloc_size);
+        if (!netdev)
+                return NULL;
+
+        card = netdev_priv(netdev);
+        card->netdev = netdev;
+        card->msg_enable = SPIDER_NET_DEFAULT_MSG;
+        INIT_WORK(&card->tx_timeout_task, spider_net_tx_timeout_task, netdev);
+        init_waitqueue_head(&card->waitq);
+        atomic_set(&card->tx_timeout_task_counter, 0);
+
+        return card;
+}
+
+/**
+ * spider_net_undo_pci_setup - releases PCI ressources
+ * @card: card structure
+ *
+ * spider_net_undo_pci_setup releases the mapped regions
+ */
+static void
+spider_net_undo_pci_setup(struct spider_net_card *card)
+{
+        iounmap(card->regs);
+        pci_release_regions(card->pdev);
+}
+
+/**
+ * spider_net_setup_pci_dev - sets up the device in terms of PCI operations
+ * @card: card structure
+ * @pdev: PCI device
+ *
+ * Returns the card structure or NULL if any errors occur
+ *
+ * spider_net_setup_pci_dev initializes pdev and together with the
+ * functions called in spider_net_open configures the device so that
+ * data can be transferred over it
+ * The net_device structure is attached to the card structure, if the
+ * function returns without error.
+ **/
+static struct spider_net_card *
+spider_net_setup_pci_dev(struct pci_dev *pdev)
+{
+        struct spider_net_card *card;
+        unsigned long mmio_start, mmio_len;
+
+        if (pci_enable_device(pdev)) {
+                pr_err("Couldn't enable PCI device\n");
+                return NULL;
+        }
+
+        if (!(pci_resource_flags(pdev, 0) & IORESOURCE_MEM)) {
+                pr_err("Couldn't find proper PCI device base address.\n");
+                goto out_disable_dev;
+        }
+
+        if (pci_request_regions(pdev, spider_net_driver_name)) {
+                pr_err("Couldn't obtain PCI resources, aborting.\n");
+                goto out_disable_dev;
+        }
+
+        pci_set_master(pdev);
+
+        card = spider_net_alloc_card();
+        if (!card) {
+                pr_err("Couldn't allocate net_device structure, "
+                          "aborting.\n");
+                goto out_release_regions;
+        }
+        card->pdev = pdev;
+
+        /* fetch base address and length of first resource */
+        mmio_start = pci_resource_start(pdev, 0);
+        mmio_len = pci_resource_len(pdev, 0);
+
+        card->netdev->mem_start = mmio_start;
+        card->netdev->mem_end = mmio_start + mmio_len;
+        card->regs = ioremap(mmio_start, mmio_len);
+
+        if (!card->regs) {
+                pr_err("Couldn't obtain PCI resources, aborting.\n");
+                goto out_release_regions;
+        }
+
+        return card;
+
+out_release_regions:
+        pci_release_regions(pdev);
+out_disable_dev:
+        pci_disable_device(pdev);
+        pci_set_drvdata(pdev, NULL);
+        return NULL;
+}
+
+/**
+ * spider_net_probe - initialization of a device
+ * @pdev: PCI device
+ * @ent: entry in the device id list
+ *
+ * Returns 0 on success, <0 on failure
+ *
+ * spider_net_probe initializes pdev and registers a net_device
+ * structure for it. After that, the device can be ifconfig'ed up
+ **/
+static int __devinit
+spider_net_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
+{
+        int err = -EIO;
+        struct spider_net_card *card;
+
+        card = spider_net_setup_pci_dev(pdev);
+        if (!card)
+                goto out;
+
+        spider_net_workaround_rxramfull(card);
+        spider_net_init_card(card);
+
+        err = spider_net_setup_phy(card);
+        if (err)
+                goto out_undo_pci;
+
+        err = spider_net_init_firmware(card);
+        if (err)
+                goto out_undo_pci;
+
+        err = spider_net_setup_netdev(card);
+        if (err)
+                goto out_undo_pci;
+
+        return 0;
+
+out_undo_pci:
+        spider_net_undo_pci_setup(card);
+        free_netdev(card->netdev);
+out:
+        return err;
+}
+
+/**
+ * spider_net_remove - removal of a device
+ * @pdev: PCI device
+ *
+ * Returns 0 on success, <0 on failure
+ *
+ * spider_net_remove is called to remove the device and unregisters the
+ * net_device
+ **/
+static void __devexit
+spider_net_remove(struct pci_dev *pdev)
+{
+        struct net_device *netdev;
+        struct spider_net_card *card;
+
+        netdev = pci_get_drvdata(pdev);
+        card = netdev_priv(netdev);
+
+        wait_event(card->waitq,
+                   atomic_read(&card->tx_timeout_task_counter) == 0);
+
+        unregister_netdev(netdev);
+
+        /* switch off card */
+        spider_net_write_reg(card, SPIDER_NET_CKRCTRL,
+                             SPIDER_NET_CKRCTRL_STOP_VALUE);
+        spider_net_write_reg(card, SPIDER_NET_CKRCTRL,
+                             SPIDER_NET_CKRCTRL_RUN_VALUE);
+
+        spider_net_undo_pci_setup(card);
+        free_netdev(netdev);
+}
+
+static struct pci_driver spider_net_driver = {
+        .owner          = THIS_MODULE,
+        .name           = spider_net_driver_name,
+        .id_table       = spider_net_pci_tbl,
+        .probe          = spider_net_probe,
+        .remove         = __devexit_p(spider_net_remove)
+};
+
+/**
+ * spider_net_init - init function when the driver is loaded
+ *
+ * spider_net_init registers the device driver
+ */
+static int __init spider_net_init(void)
+{
+        if (rx_descriptors < SPIDER_NET_RX_DESCRIPTORS_MIN) {
+                rx_descriptors = SPIDER_NET_RX_DESCRIPTORS_MIN;
+                pr_info("adjusting rx descriptors to %i.\n", rx_descriptors);
+        }
+        if (rx_descriptors > SPIDER_NET_RX_DESCRIPTORS_MAX) {
+                rx_descriptors = SPIDER_NET_RX_DESCRIPTORS_MAX;
+                pr_info("adjusting rx descriptors to %i.\n", rx_descriptors);
+        }
+        if (tx_descriptors < SPIDER_NET_TX_DESCRIPTORS_MIN) {
+                tx_descriptors = SPIDER_NET_TX_DESCRIPTORS_MIN;
+                pr_info("adjusting tx descriptors to %i.\n", tx_descriptors);
+        }
+        if (tx_descriptors > SPIDER_NET_TX_DESCRIPTORS_MAX) {
+                tx_descriptors = SPIDER_NET_TX_DESCRIPTORS_MAX;
+                pr_info("adjusting tx descriptors to %i.\n", tx_descriptors);
+        }
+
+        return pci_register_driver(&spider_net_driver);
+}
+
+/**
+ * spider_net_cleanup - exit function when driver is unloaded
+ *
+ * spider_net_cleanup unregisters the device driver
+ */
+static void __exit spider_net_cleanup(void)
+{
+        pci_unregister_driver(&spider_net_driver);
+}
+
+module_init(spider_net_init);
+module_exit(spider_net_cleanup);
diff --git a/drivers/net/spider_net.h b/drivers/net/spider_net.h
new file mode 100644
index 00000000000..22b2f234735
--- /dev/null
+++ b/drivers/net/spider_net.h
@@ -0,0 +1,469 @@
+/*
+ * Network device driver for Cell Processor-Based Blade
+ *
+ * (C) Copyright IBM Corp. 2005
+ *
+ * Authors : Utz Bacher <utz.bacher@de.ibm.com>
+ *           Jens Osterkamp <Jens.Osterkamp@de.ibm.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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#ifndef _SPIDER_NET_H
+#define _SPIDER_NET_H
+
+#include "sungem_phy.h"
+
+extern int spider_net_stop(struct net_device *netdev);
+extern int spider_net_open(struct net_device *netdev);
+
+extern struct ethtool_ops spider_net_ethtool_ops;
+
+extern char spider_net_driver_name[];
+
+#define SPIDER_NET_MAX_MTU                      2308
+#define SPIDER_NET_MIN_MTU                      64
+
+#define SPIDER_NET_RXBUF_ALIGN                  128
+
+#define SPIDER_NET_RX_DESCRIPTORS_DEFAULT       64
+#define SPIDER_NET_RX_DESCRIPTORS_MIN           16
+#define SPIDER_NET_RX_DESCRIPTORS_MAX           256
+
+#define SPIDER_NET_TX_DESCRIPTORS_DEFAULT       64
+#define SPIDER_NET_TX_DESCRIPTORS_MIN           16
+#define SPIDER_NET_TX_DESCRIPTORS_MAX           256
+
+#define SPIDER_NET_RX_CSUM_DEFAULT              1
+
+#define SPIDER_NET_WATCHDOG_TIMEOUT 5*HZ
+#define SPIDER_NET_NAPI_WEIGHT 64
+
+#define SPIDER_NET_FIRMWARE_LEN         1024
+#define SPIDER_NET_FIRMWARE_NAME        "spider_fw.bin"
+
+/** spider_net SMMIO registers */
+#define SPIDER_NET_GHIINT0STS           0x00000000
+#define SPIDER_NET_GHIINT1STS           0x00000004
+#define SPIDER_NET_GHIINT2STS           0x00000008
+#define SPIDER_NET_GHIINT0MSK           0x00000010
+#define SPIDER_NET_GHIINT1MSK           0x00000014
+#define SPIDER_NET_GHIINT2MSK           0x00000018
+
+#define SPIDER_NET_GRESUMINTNUM         0x00000020
+#define SPIDER_NET_GREINTNUM            0x00000024
+
+#define SPIDER_NET_GFFRMNUM             0x00000028
+#define SPIDER_NET_GFAFRMNUM            0x0000002c
+#define SPIDER_NET_GFBFRMNUM            0x00000030
+#define SPIDER_NET_GFCFRMNUM            0x00000034
+#define SPIDER_NET_GFDFRMNUM            0x00000038
+
+/* clear them (don't use it) */
+#define SPIDER_NET_GFREECNNUM           0x0000003c
+#define SPIDER_NET_GONETIMENUM          0x00000040
+
+#define SPIDER_NET_GTOUTFRMNUM          0x00000044
+
+#define SPIDER_NET_GTXMDSET             0x00000050
+#define SPIDER_NET_GPCCTRL              0x00000054
+#define SPIDER_NET_GRXMDSET             0x00000058
+#define SPIDER_NET_GIPSECINIT           0x0000005c
+#define SPIDER_NET_GFTRESTRT            0x00000060
+#define SPIDER_NET_GRXDMAEN             0x00000064
+#define SPIDER_NET_GMRWOLCTRL           0x00000068
+#define SPIDER_NET_GPCWOPCMD            0x0000006c
+#define SPIDER_NET_GPCROPCMD            0x00000070
+#define SPIDER_NET_GTTFRMCNT            0x00000078
+#define SPIDER_NET_GTESTMD              0x0000007c
+
+#define SPIDER_NET_GSINIT               0x00000080
+#define SPIDER_NET_GSnPRGADR            0x00000084
+#define SPIDER_NET_GSnPRGDAT            0x00000088
+
+#define SPIDER_NET_GMACOPEMD            0x00000100
+#define SPIDER_NET_GMACLENLMT           0x00000108
+#define SPIDER_NET_GMACINTEN            0x00000118
+#define SPIDER_NET_GMACPHYCTRL          0x00000120
+
+#define SPIDER_NET_GMACAPAUSE           0x00000154
+#define SPIDER_NET_GMACTXPAUSE          0x00000164
+
+#define SPIDER_NET_GMACMODE             0x000001b0
+#define SPIDER_NET_GMACBSTLMT           0x000001b4
+
+#define SPIDER_NET_GMACUNIMACU          0x000001c0
+#define SPIDER_NET_GMACUNIMACL          0x000001c8
+
+#define SPIDER_NET_GMRMHFILnR           0x00000400
+#define SPIDER_NET_MULTICAST_HASHES     256
+
+#define SPIDER_NET_GMRUAFILnR           0x00000500
+#define SPIDER_NET_GMRUA0FIL15R         0x00000578
+
+/* RX DMA controller registers, all 0x00000a.. are for DMA controller A,
+ * 0x00000b.. for DMA controller B, etc. */
+#define SPIDER_NET_GDADCHA              0x00000a00
+#define SPIDER_NET_GDADMACCNTR          0x00000a04
+#define SPIDER_NET_GDACTDPA             0x00000a08
+#define SPIDER_NET_GDACTDCNT            0x00000a0c
+#define SPIDER_NET_GDACDBADDR           0x00000a20
+#define SPIDER_NET_GDACDBSIZE           0x00000a24
+#define SPIDER_NET_GDACNEXTDA           0x00000a28
+#define SPIDER_NET_GDACCOMST            0x00000a2c
+#define SPIDER_NET_GDAWBCOMST           0x00000a30
+#define SPIDER_NET_GDAWBRSIZE           0x00000a34
+#define SPIDER_NET_GDAWBVSIZE           0x00000a38
+#define SPIDER_NET_GDAWBTRST            0x00000a3c
+#define SPIDER_NET_GDAWBTRERR           0x00000a40
+
+/* TX DMA controller registers */
+#define SPIDER_NET_GDTDCHA              0x00000e00
+#define SPIDER_NET_GDTDMACCNTR          0x00000e04
+#define SPIDER_NET_GDTCDPA              0x00000e08
+#define SPIDER_NET_GDTDMASEL            0x00000e14
+
+#define SPIDER_NET_ECMODE               0x00000f00
+/* clock and reset control register */
+#define SPIDER_NET_CKRCTRL              0x00000ff0
+
+/** SCONFIG registers */
+#define SPIDER_NET_SCONFIG_IOACTE       0x00002810
+
+/** hardcoded register values */
+#define SPIDER_NET_INT0_MASK_VALUE      0x3f7fe3ff
+#define SPIDER_NET_INT1_MASK_VALUE      0xffffffff
+/* no MAC aborts -> auto retransmission */
+#define SPIDER_NET_INT2_MASK_VALUE      0xfffffff1
+
+/* clear counter when interrupt sources are cleared
+#define SPIDER_NET_FRAMENUM_VALUE       0x0001f001 */
+/* we rely on flagged descriptor interrupts */
+#define SPIDER_NET_FRAMENUM_VALUE       0x00000000
+/* set this first, then the FRAMENUM_VALUE */
+#define SPIDER_NET_GFXFRAMES_VALUE      0x00000000
+
+#define SPIDER_NET_STOP_SEQ_VALUE       0x00000000
+#define SPIDER_NET_RUN_SEQ_VALUE        0x0000007e
+
+#define SPIDER_NET_PHY_CTRL_VALUE       0x00040040
+/* #define SPIDER_NET_PHY_CTRL_VALUE    0x01070080*/
+#define SPIDER_NET_RXMODE_VALUE         0x00000011
+/* auto retransmission in case of MAC aborts */
+#define SPIDER_NET_TXMODE_VALUE         0x00010000
+#define SPIDER_NET_RESTART_VALUE        0x00000000
+#define SPIDER_NET_WOL_VALUE            0x00001111
+#if 0
+#define SPIDER_NET_WOL_VALUE            0x00000000
+#endif
+#define SPIDER_NET_IPSECINIT_VALUE      0x00f000f8
+
+/* pause frames: automatic, no upper retransmission count */
+/* outside loopback mode: ETOMOD signal dont matter, not connected */
+#define SPIDER_NET_OPMODE_VALUE         0x00000063
+/*#define SPIDER_NET_OPMODE_VALUE               0x001b0062*/
+#define SPIDER_NET_LENLMT_VALUE         0x00000908
+
+#define SPIDER_NET_MACAPAUSE_VALUE      0x00000800 /* about 1 ms */
+#define SPIDER_NET_TXPAUSE_VALUE        0x00000000
+
+#define SPIDER_NET_MACMODE_VALUE        0x00000001
+#define SPIDER_NET_BURSTLMT_VALUE       0x00000200 /* about 16 us */
+
+/* 1(0)                                 enable r/tx dma
+ *  0000000                             fixed to 0
+ *
+ *         000000                       fixed to 0
+ *               0(1)                   en/disable descr writeback on force end
+ *                0(1)                  force end
+ *
+ *                 000000               fixed to 0
+ *                       00             burst alignment: 128 bytes
+ *
+ *                         00000        fixed to 0
+ *                              0       descr writeback size 32 bytes
+ *                               0(1)   descr chain end interrupt enable
+ *                                0(1)  descr status writeback enable */
+
+/* to set RX_DMA_EN */
+#define SPIDER_NET_DMA_RX_VALUE         0x80000000
+#define SPIDER_NET_DMA_RX_FEND_VALUE    0x00030003
+/* to set TX_DMA_EN */
+#define SPIDER_NET_DMA_TX_VALUE         0x80000000
+#define SPIDER_NET_DMA_TX_FEND_VALUE    0x00030003
+
+/* SPIDER_NET_UA_DESCR_VALUE is OR'ed with the unicast address */
+#define SPIDER_NET_UA_DESCR_VALUE       0x00080000
+#define SPIDER_NET_PROMISC_VALUE        0x00080000
+#define SPIDER_NET_NONPROMISC_VALUE     0x00000000
+
+#define SPIDER_NET_DMASEL_VALUE         0x00000001
+
+#define SPIDER_NET_ECMODE_VALUE         0x00000000
+
+#define SPIDER_NET_CKRCTRL_RUN_VALUE    0x1fff010f
+#define SPIDER_NET_CKRCTRL_STOP_VALUE   0x0000010f
+
+#define SPIDER_NET_SBIMSTATE_VALUE      0x00000000
+#define SPIDER_NET_SBTMSTATE_VALUE      0x00000000
+
+/* SPIDER_NET_GHIINT0STS bits, in reverse order so that they can be used
+ * with 1 << SPIDER_NET_... */
+enum spider_net_int0_status {
+        SPIDER_NET_GPHYINT = 0,
+        SPIDER_NET_GMAC2INT,
+        SPIDER_NET_GMAC1INT,
+        SPIDER_NET_GIPSINT,
+        SPIDER_NET_GFIFOINT,
+        SPIDER_NET_GDMACINT,
+        SPIDER_NET_GSYSINT,
+        SPIDER_NET_GPWOPCMPINT,
+        SPIDER_NET_GPROPCMPINT,
+        SPIDER_NET_GPWFFINT,
+        SPIDER_NET_GRMDADRINT,
+        SPIDER_NET_GRMARPINT,
+        SPIDER_NET_GRMMPINT,
+        SPIDER_NET_GDTDEN0INT,
+        SPIDER_NET_GDDDEN0INT,
+        SPIDER_NET_GDCDEN0INT,
+        SPIDER_NET_GDBDEN0INT,
+        SPIDER_NET_GDADEN0INT,
+        SPIDER_NET_GDTFDCINT,
+        SPIDER_NET_GDDFDCINT,
+        SPIDER_NET_GDCFDCINT,
+        SPIDER_NET_GDBFDCINT,
+        SPIDER_NET_GDAFDCINT,
+        SPIDER_NET_GTTEDINT,
+        SPIDER_NET_GDTDCEINT,
+        SPIDER_NET_GRFDNMINT,
+        SPIDER_NET_GRFCNMINT,
+        SPIDER_NET_GRFBNMINT,
+        SPIDER_NET_GRFANMINT,
+        SPIDER_NET_GRFNMINT,
+        SPIDER_NET_G1TMCNTINT,
+        SPIDER_NET_GFREECNTINT
+};
+/* GHIINT1STS bits */
+enum spider_net_int1_status {
+        SPIDER_NET_GTMFLLINT = 0,
+        SPIDER_NET_GRMFLLINT,
+        SPIDER_NET_GTMSHTINT,
+        SPIDER_NET_GDTINVDINT,
+        SPIDER_NET_GRFDFLLINT,
+        SPIDER_NET_GDDDCEINT,
+        SPIDER_NET_GDDINVDINT,
+        SPIDER_NET_GRFCFLLINT,
+        SPIDER_NET_GDCDCEINT,
+        SPIDER_NET_GDCINVDINT,
+        SPIDER_NET_GRFBFLLINT,
+        SPIDER_NET_GDBDCEINT,
+        SPIDER_NET_GDBINVDINT,
+        SPIDER_NET_GRFAFLLINT,
+        SPIDER_NET_GDADCEINT,
+        SPIDER_NET_GDAINVDINT,
+        SPIDER_NET_GDTRSERINT,
+        SPIDER_NET_GDDRSERINT,
+        SPIDER_NET_GDCRSERINT,
+        SPIDER_NET_GDBRSERINT,
+        SPIDER_NET_GDARSERINT,
+        SPIDER_NET_GDSERINT,
+        SPIDER_NET_GDTPTERINT,
+        SPIDER_NET_GDDPTERINT,
+        SPIDER_NET_GDCPTERINT,
+        SPIDER_NET_GDBPTERINT,
+        SPIDER_NET_GDAPTERINT
+};
+/* GHIINT2STS bits */
+enum spider_net_int2_status {
+        SPIDER_NET_GPROPERINT = 0,
+        SPIDER_NET_GMCTCRSNGINT,
+        SPIDER_NET_GMCTLCOLINT,
+        SPIDER_NET_GMCTTMOTINT,
+        SPIDER_NET_GMCRCAERINT,
+        SPIDER_NET_GMCRCALERINT,
+        SPIDER_NET_GMCRALNERINT,
+        SPIDER_NET_GMCROVRINT,
+        SPIDER_NET_GMCRRNTINT,
+        SPIDER_NET_GMCRRXERINT,
+        SPIDER_NET_GTITCSERINT,
+        SPIDER_NET_GTIFMTERINT,
+        SPIDER_NET_GTIPKTRVKINT,
+        SPIDER_NET_GTISPINGINT,
+        SPIDER_NET_GTISADNGINT,
+        SPIDER_NET_GTISPDNGINT,
+        SPIDER_NET_GRIFMTERINT,
+        SPIDER_NET_GRIPKTRVKINT,
+        SPIDER_NET_GRISPINGINT,
+        SPIDER_NET_GRISADNGINT,
+        SPIDER_NET_GRISPDNGINT
+};
+
+#define SPIDER_NET_TXINT        ( (1 << SPIDER_NET_GTTEDINT) | \
+                                  (1 << SPIDER_NET_GDTDCEINT) | \
+                                  (1 << SPIDER_NET_GDTFDCINT) )
+
+/* we rely on flagged descriptor interrupts*/
+#define SPIDER_NET_RXINT        ( (1 << SPIDER_NET_GDAFDCINT) | \
+                                  (1 << SPIDER_NET_GRMFLLINT) )
+
+#define SPIDER_NET_GPREXEC              0x80000000
+#define SPIDER_NET_GPRDAT_MASK          0x0000ffff
+
+/* descriptor bits
+ *
+ * 1010                                 descriptor ready
+ *     0                                descr in middle of chain
+ *      000                             fixed to 0
+ *
+ *         0                            no interrupt on completion
+ *          000                         fixed to 0
+ *             1                        no ipsec processing
+ *              1                       last descriptor for this frame
+ *               00                     no checksum
+ *               10                     tcp checksum
+ *               11                     udp checksum
+ *
+ *                 00                   fixed to 0
+ *                   0                  fixed to 0
+ *                    0                 no interrupt on response errors
+ *                     0                no interrupt on invalid descr
+ *                      0               no interrupt on dma process termination
+ *                       0              no interrupt on descr chain end
+ *                        0             no interrupt on descr complete
+ *
+ *                         000          fixed to 0
+ *                            0         response error interrupt status
+ *                             0        invalid descr status
+ *                              0       dma termination status
+ *                               0      descr chain end status
+ *                                0     descr complete status */
+#define SPIDER_NET_DMAC_CMDSTAT_NOCS    0xa00c0000
+#define SPIDER_NET_DMAC_CMDSTAT_TCPCS   0xa00e0000
+#define SPIDER_NET_DMAC_CMDSTAT_UDPCS   0xa00f0000
+#define SPIDER_NET_DESCR_IND_PROC_SHIFT 28
+#define SPIDER_NET_DESCR_IND_PROC_MASKO 0x0fffffff
+
+/* descr ready, descr is in middle of chain, get interrupt on completion */
+#define SPIDER_NET_DMAC_RX_CARDOWNED    0xa0800000
+
+/* multicast is no problem */
+#define SPIDER_NET_DATA_ERROR_MASK      0xffffbfff
+
+enum spider_net_descr_status {
+        SPIDER_NET_DESCR_COMPLETE               = 0x00, /* used in rx and tx */
+        SPIDER_NET_DESCR_RESPONSE_ERROR         = 0x01, /* used in rx and tx */
+        SPIDER_NET_DESCR_PROTECTION_ERROR       = 0x02, /* used in rx and tx */
+        SPIDER_NET_DESCR_FRAME_END              = 0x04, /* used in rx */
+        SPIDER_NET_DESCR_FORCE_END              = 0x05, /* used in rx and tx */
+        SPIDER_NET_DESCR_CARDOWNED              = 0x0a, /* used in rx and tx */
+        SPIDER_NET_DESCR_NOT_IN_USE /* any other value */
+};
+
+struct spider_net_descr {
+        /* as defined by the hardware */
+        dma_addr_t buf_addr;
+        u32 buf_size;
+        dma_addr_t next_descr_addr;
+        u32 dmac_cmd_status;
+        u32 result_size;
+        u32 valid_size; /* all zeroes for tx */
+        u32 data_status;
+        u32 data_error; /* all zeroes for tx */
+
+        /* used in the driver */
+        struct sk_buff *skb;
+        dma_addr_t bus_addr;
+        struct spider_net_descr *next;
+        struct spider_net_descr *prev;
+} __attribute__((aligned(32)));
+
+struct spider_net_descr_chain {
+        /* we walk from tail to head */
+        struct spider_net_descr *head;
+        struct spider_net_descr *tail;
+};
+
+/* descriptor data_status bits */
+#define SPIDER_NET_RXIPCHK              29
+#define SPIDER_NET_TCPUDPIPCHK          28
+#define SPIDER_NET_DATA_STATUS_CHK_MASK (1 << SPIDER_NET_RXIPCHK | \
+                                         1 << SPIDER_NET_TCPUDPIPCHK)
+
+#define SPIDER_NET_VLAN_PACKET          21
+
+/* descriptor data_error bits */
+#define SPIDER_NET_RXIPCHKERR           27
+#define SPIDER_NET_RXTCPCHKERR          26
+#define SPIDER_NET_DATA_ERROR_CHK_MASK  (1 << SPIDER_NET_RXIPCHKERR | \
+                                         1 << SPIDER_NET_RXTCPCHKERR)
+
+/* the cases we don't pass the packet to the stack */
+#define SPIDER_NET_DESTROY_RX_FLAGS     0x70138000
+
+#define SPIDER_NET_DESCR_SIZE           32
+
+/* this will be bigger some time */
+struct spider_net_options {
+        int rx_csum; /* for rx: if 0 ip_summed=NONE,
+                        if 1 and hw has verified, ip_summed=UNNECESSARY */
+};
+
+#define SPIDER_NET_DEFAULT_MSG          ( NETIF_MSG_DRV | \
+                                          NETIF_MSG_PROBE | \
+                                          NETIF_MSG_LINK | \
+                                          NETIF_MSG_TIMER | \
+                                          NETIF_MSG_IFDOWN | \
+                                          NETIF_MSG_IFUP | \
+                                          NETIF_MSG_RX_ERR | \
+                                          NETIF_MSG_TX_ERR | \
+                                          NETIF_MSG_TX_QUEUED | \
+                                          NETIF_MSG_INTR | \
+                                          NETIF_MSG_TX_DONE | \
+                                          NETIF_MSG_RX_STATUS | \
+                                          NETIF_MSG_PKTDATA | \
+                                          NETIF_MSG_HW | \
+                                          NETIF_MSG_WOL )
+
+struct spider_net_card {
+        struct net_device *netdev;
+        struct pci_dev *pdev;
+        struct mii_phy phy;
+
+        void __iomem *regs;
+
+        struct spider_net_descr_chain tx_chain;
+        struct spider_net_descr_chain rx_chain;
+        spinlock_t chain_lock;
+
+        struct net_device_stats netdev_stats;
+
+        struct spider_net_options options;
+
+        spinlock_t intmask_lock;
+
+        struct work_struct tx_timeout_task;
+        atomic_t tx_timeout_task_counter;
+        wait_queue_head_t waitq;
+
+        /* for ethtool */
+        int msg_enable;
+
+        struct spider_net_descr descr[0];
+};
+
+#define pr_err(fmt,arg...) \
+        printk(KERN_ERR fmt ,##arg)
+
+#endif
diff --git a/drivers/net/spider_net_ethtool.c b/drivers/net/spider_net_ethtool.c
new file mode 100644
index 00000000000..d42e60ba74c
--- /dev/null
+++ b/drivers/net/spider_net_ethtool.c
@@ -0,0 +1,126 @@
+/*
+ * Network device driver for Cell Processor-Based Blade
+ *
+ * (C) Copyright IBM Corp. 2005
+ *
+ * Authors : Utz Bacher <utz.bacher@de.ibm.com>
+ *           Jens Osterkamp <Jens.Osterkamp@de.ibm.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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <linux/netdevice.h>
+#include <linux/ethtool.h>
+#include <linux/pci.h>
+
+#include "spider_net.h"
+
+static int
+spider_net_ethtool_get_settings(struct net_device *netdev,
+                               struct ethtool_cmd *cmd)
+{
+        struct spider_net_card *card;
+        card = netdev_priv(netdev);
+
+        cmd->supported   = (SUPPORTED_1000baseT_Full |
+                             SUPPORTED_FIBRE);
+        cmd->advertising = (ADVERTISED_1000baseT_Full |
+                             ADVERTISED_FIBRE);
+        cmd->port = PORT_FIBRE;
+        cmd->speed = card->phy.speed;
+        cmd->duplex = DUPLEX_FULL;
+
+        return 0;
+}
+
+static void
+spider_net_ethtool_get_drvinfo(struct net_device *netdev,
+                               struct ethtool_drvinfo *drvinfo)
+{
+        struct spider_net_card *card;
+        card = netdev_priv(netdev);
+
+        /* clear and fill out info */
+        memset(drvinfo, 0, sizeof(struct ethtool_drvinfo));
+        strncpy(drvinfo->driver, spider_net_driver_name, 32);
+        strncpy(drvinfo->version, "0.1", 32);
+        strcpy(drvinfo->fw_version, "no information");
+        strncpy(drvinfo->bus_info, pci_name(card->pdev), 32);
+}
+
+static void
+spider_net_ethtool_get_wol(struct net_device *netdev,
+                           struct ethtool_wolinfo *wolinfo)
+{
+        /* no support for wol */
+        wolinfo->supported = 0;
+        wolinfo->wolopts = 0;
+}
+
+static u32
+spider_net_ethtool_get_msglevel(struct net_device *netdev)
+{
+        struct spider_net_card *card;
+        card = netdev_priv(netdev);
+        return card->msg_enable;
+}
+
+static void
+spider_net_ethtool_set_msglevel(struct net_device *netdev,
+                                u32 level)
+{
+        struct spider_net_card *card;
+        card = netdev_priv(netdev);
+        card->msg_enable = level;
+}
+
+static int
+spider_net_ethtool_nway_reset(struct net_device *netdev)
+{
+        if (netif_running(netdev)) {
+                spider_net_stop(netdev);
+                spider_net_open(netdev);
+        }
+        return 0;
+}
+
+static u32
+spider_net_ethtool_get_rx_csum(struct net_device *netdev)
+{
+        struct spider_net_card *card = netdev->priv;
+
+        return card->options.rx_csum;
+}
+
+static int
+spider_net_ethtool_set_rx_csum(struct net_device *netdev, u32 n)
+{
+        struct spider_net_card *card = netdev->priv;
+
+        card->options.rx_csum = n;
+        return 0;
+}
+
+struct ethtool_ops spider_net_ethtool_ops = {
+        .get_settings           = spider_net_ethtool_get_settings,
+        .get_drvinfo            = spider_net_ethtool_get_drvinfo,
+        .get_wol                = spider_net_ethtool_get_wol,
+        .get_msglevel           = spider_net_ethtool_get_msglevel,
+        .set_msglevel           = spider_net_ethtool_set_msglevel,
+        .nway_reset             = spider_net_ethtool_nway_reset,
+        .get_rx_csum            = spider_net_ethtool_get_rx_csum,
+        .set_rx_csum            = spider_net_ethtool_set_rx_csum,
+};
+
diff --git a/drivers/net/sun3lance.c b/drivers/net/sun3lance.c
index 1f43bbfbc1c..5c8fcd40ef4 100644
--- a/drivers/net/sun3lance.c
+++ b/drivers/net/sun3lance.c
@@ -162,7 +162,7 @@ struct lance_private {
 #define MEM     lp->mem
 #define DREG    lp->iobase[0]
 #define AREG    lp->iobase[1]
-#define REGA(a) ( AREG = (a), DREG )
+#define REGA(a) (*( AREG = (a), &DREG ))
 
 /* Definitions for the Lance */
 
diff --git a/drivers/net/sungem.c b/drivers/net/sungem.c
index 2608e7a3d21..3f67a42e850 100644
--- a/drivers/net/sungem.c
+++ b/drivers/net/sungem.c
@@ -948,6 +948,7 @@ static irqreturn_t gem_interrupt(int irq, void *dev_id, struct pt_regs *regs)
                 u32 gem_status = readl(gp->regs + GREG_STAT);
 
                 if (gem_status == 0) {
+                        netif_poll_enable(dev);
                         spin_unlock_irqrestore(&gp->lock, flags);
                         return IRQ_NONE;
                 }
diff --git a/drivers/net/sungem.h b/drivers/net/sungem.h
index 7143fd7cf3f..ff8ae5f7997 100644
--- a/drivers/net/sungem.h
+++ b/drivers/net/sungem.h
@@ -1020,7 +1020,7 @@ struct gem {
                 
         struct gem_init_block   *init_block;
         struct sk_buff          *rx_skbs[RX_RING_SIZE];
-        struct sk_buff          *tx_skbs[RX_RING_SIZE];
+        struct sk_buff          *tx_skbs[TX_RING_SIZE];
         dma_addr_t              gblock_dvma;
 
         struct pci_dev          *pdev;
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index af8263a1580..dc57352e5a9 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -36,6 +36,7 @@
 #include <linux/ip.h>
 #include <linux/tcp.h>
 #include <linux/workqueue.h>
+#include <linux/prefetch.h>
 
 #include <net/checksum.h>
 
@@ -66,8 +67,8 @@
 
 #define DRV_MODULE_NAME         "tg3"
 #define PFX DRV_MODULE_NAME     ": "
-#define DRV_MODULE_VERSION      "3.37"
-#define DRV_MODULE_RELDATE      "August 25, 2005"
+#define DRV_MODULE_VERSION      "3.39"
+#define DRV_MODULE_RELDATE      "September 5, 2005"
 
 #define TG3_DEF_MAC_MODE        0
 #define TG3_DEF_RX_MODE         0
@@ -121,12 +122,9 @@
                                    TG3_RX_RCB_RING_SIZE(tp))
 #define TG3_TX_RING_BYTES       (sizeof(struct tg3_tx_buffer_desc) * \
                                  TG3_TX_RING_SIZE)
-#define TX_RING_GAP(TP) \
-        (TG3_TX_RING_SIZE - (TP)->tx_pending)
 #define TX_BUFFS_AVAIL(TP)                                              \
-        (((TP)->tx_cons <= (TP)->tx_prod) ?                             \
-          (TP)->tx_cons + (TP)->tx_pending - (TP)->tx_prod :            \
-          (TP)->tx_cons - (TP)->tx_prod - TX_RING_GAP(TP))
+        ((TP)->tx_pending -                                             \
+         (((TP)->tx_prod - (TP)->tx_cons) & (TG3_TX_RING_SIZE - 1)))
 #define NEXT_TX(N)              (((N) + 1) & (TG3_TX_RING_SIZE - 1))
 
 #define RX_PKT_BUF_SZ           (1536 + tp->rx_offset + 64)
@@ -490,7 +488,8 @@ static void tg3_disable_ints(struct tg3 *tp)
 
 static inline void tg3_cond_int(struct tg3 *tp)
 {
-        if (tp->hw_status->status & SD_STATUS_UPDATED)
+        if (!(tp->tg3_flags & TG3_FLAG_TAGGED_STATUS) &&
+            (tp->hw_status->status & SD_STATUS_UPDATED))
                 tw32(GRC_LOCAL_CTRL, tp->grc_local_ctrl | GRC_LCLCTRL_SETINT);
 }
 
@@ -2880,9 +2879,13 @@ static void tg3_tx(struct tg3 *tp)
 
         tp->tx_cons = sw_idx;
 
-        if (netif_queue_stopped(tp->dev) &&
-            (TX_BUFFS_AVAIL(tp) > TG3_TX_WAKEUP_THRESH))
-                netif_wake_queue(tp->dev);
+        if (unlikely(netif_queue_stopped(tp->dev))) {
+                spin_lock(&tp->tx_lock);
+                if (netif_queue_stopped(tp->dev) &&
+                    (TX_BUFFS_AVAIL(tp) > TG3_TX_WAKEUP_THRESH))
+                        netif_wake_queue(tp->dev);
+                spin_unlock(&tp->tx_lock);
+        }
 }
 
 /* Returns size of skb allocated or < 0 on error.
@@ -3198,9 +3201,7 @@ static int tg3_poll(struct net_device *netdev, int *budget)
 
         /* run TX completion thread */
         if (sblk->idx[0].tx_consumer != tp->tx_cons) {
-                spin_lock(&tp->tx_lock);
                 tg3_tx(tp);
-                spin_unlock(&tp->tx_lock);
         }
 
         /* run RX thread, within the bounds set by NAPI.
@@ -3220,18 +3221,17 @@ static int tg3_poll(struct net_device *netdev, int *budget)
                 netdev->quota -= work_done;
         }
 
-        if (tp->tg3_flags & TG3_FLAG_TAGGED_STATUS)
+        if (tp->tg3_flags & TG3_FLAG_TAGGED_STATUS) {
                 tp->last_tag = sblk->status_tag;
-        rmb();
-        sblk->status &= ~SD_STATUS_UPDATED;
+                rmb();
+        } else
+                sblk->status &= ~SD_STATUS_UPDATED;
 
         /* if no more work, tell net stack and NIC we're done */
         done = !tg3_has_work(tp);
         if (done) {
-                spin_lock(&tp->lock);
                 netif_rx_complete(netdev);
                 tg3_restart_ints(tp);
-                spin_unlock(&tp->lock);
         }
 
         return (done ? 0 : 1);
@@ -3279,8 +3279,9 @@ static irqreturn_t tg3_msi(int irq, void *dev_id, struct pt_regs *regs)
 {
         struct net_device *dev = dev_id;
         struct tg3 *tp = netdev_priv(dev);
-        struct tg3_hw_status *sblk = tp->hw_status;
 
+        prefetch(tp->hw_status);
+        prefetch(&tp->rx_rcb[tp->rx_rcb_ptr]);
         /*
          * Writing any value to intr-mbox-0 clears PCI INTA# and
          * chip-internal interrupt pending events.
@@ -3289,19 +3290,9 @@ static irqreturn_t tg3_msi(int irq, void *dev_id, struct pt_regs *regs)
          * event coalescing.
          */
         tw32_mailbox(MAILBOX_INTERRUPT_0 + TG3_64BIT_REG_LOW, 0x00000001);
-        tp->last_tag = sblk->status_tag;
-        rmb();
-        if (tg3_irq_sync(tp))
-                goto out;
-        sblk->status &= ~SD_STATUS_UPDATED;
-        if (likely(tg3_has_work(tp)))
+        if (likely(!tg3_irq_sync(tp)))
                 netif_rx_schedule(dev);         /* schedule NAPI poll */
-        else {
-                /* No work, re-enable interrupts.  */
-                tw32_mailbox(MAILBOX_INTERRUPT_0 + TG3_64BIT_REG_LOW,
-                             tp->last_tag << 24);
-        }
-out:
+
         return IRQ_RETVAL(1);
 }
 
@@ -3331,9 +3322,10 @@ static irqreturn_t tg3_interrupt(int irq, void *dev_id, struct pt_regs *regs)
                 if (tg3_irq_sync(tp))
                         goto out;
                 sblk->status &= ~SD_STATUS_UPDATED;
-                if (likely(tg3_has_work(tp)))
+                if (likely(tg3_has_work(tp))) {
+                        prefetch(&tp->rx_rcb[tp->rx_rcb_ptr]);
                         netif_rx_schedule(dev);         /* schedule NAPI poll */
-                else {
+                } else {
                         /* No work, shared interrupt perhaps?  re-enable
                          * interrupts, and flush that PCI write
                          */
@@ -3359,7 +3351,7 @@ static irqreturn_t tg3_interrupt_tagged(int irq, void *dev_id, struct pt_regs *r
          * Reading the PCI State register will confirm whether the
          * interrupt is ours and will flush the status block.
          */
-        if ((sblk->status & SD_STATUS_UPDATED) ||
+        if ((sblk->status_tag != tp->last_tag) ||
             !(tr32(TG3PCI_PCISTATE) & PCISTATE_INT_NOT_ACTIVE)) {
                 /*
                  * writing any value to intr-mbox-0 clears PCI INTA# and
@@ -3370,19 +3362,17 @@ static irqreturn_t tg3_interrupt_tagged(int irq, void *dev_id, struct pt_regs *r
                  */
                 tw32_mailbox(MAILBOX_INTERRUPT_0 + TG3_64BIT_REG_LOW,
                              0x00000001);
-                tp->last_tag = sblk->status_tag;
-                rmb();
                 if (tg3_irq_sync(tp))
                         goto out;
-                sblk->status &= ~SD_STATUS_UPDATED;
-                if (likely(tg3_has_work(tp)))
-                        netif_rx_schedule(dev);         /* schedule NAPI poll */
-                else {
-                        /* no work, shared interrupt perhaps?  re-enable
-                         * interrupts, and flush that PCI write
+                if (netif_rx_schedule_prep(dev)) {
+                        prefetch(&tp->rx_rcb[tp->rx_rcb_ptr]);
+                        /* Update last_tag to mark that this status has been
+                         * seen. Because interrupt may be shared, we may be
+                         * racing with tg3_poll(), so only update last_tag
+                         * if tg3_poll() is not scheduled.
                          */
-                        tw32_mailbox_f(MAILBOX_INTERRUPT_0 + TG3_64BIT_REG_LOW,
-                                       tp->last_tag << 24);
+                        tp->last_tag = sblk->status_tag;
+                        __netif_rx_schedule(dev);
                 }
         } else {        /* shared interrupt */
                 handled = 0;
@@ -3716,8 +3706,11 @@ static int tg3_start_xmit(struct sk_buff *skb, struct net_device *dev)
         tw32_tx_mbox((MAILBOX_SNDHOST_PROD_IDX_0 + TG3_64BIT_REG_LOW), entry);
 
         tp->tx_prod = entry;
-        if (TX_BUFFS_AVAIL(tp) <= (MAX_SKB_FRAGS + 1))
+        if (TX_BUFFS_AVAIL(tp) <= (MAX_SKB_FRAGS + 1)) {
                 netif_stop_queue(dev);
+                if (TX_BUFFS_AVAIL(tp) > TG3_TX_WAKEUP_THRESH)
+                        netif_wake_queue(tp->dev);
+        }
 
 out_unlock:
         mmiowb();
@@ -5960,7 +5953,7 @@ static int tg3_reset_hw(struct tg3 *tp)
         tw32(MAC_LED_CTRL, tp->led_ctrl);
 
         tw32(MAC_MI_STAT, MAC_MI_STAT_LNKSTAT_ATTN_ENAB);
-        if (tp->tg3_flags2 & TG3_FLG2_PHY_SERDES) {
+        if (tp->tg3_flags2 & TG3_FLG2_ANY_SERDES) {
                 tw32_f(MAC_RX_MODE, RX_MODE_RESET);
                 udelay(10);
         }
@@ -6242,6 +6235,7 @@ static int tg3_test_interrupt(struct tg3 *tp)
         if (err)
                 return err;
 
+        tp->hw_status->status &= ~SD_STATUS_UPDATED;
         tg3_enable_ints(tp);
 
         tw32_f(HOSTCC_MODE, tp->coalesce_mode | HOSTCC_MODE_ENABLE |
@@ -7557,6 +7551,38 @@ static void tg3_get_strings (struct net_device *dev, u32 stringset, u8 *buf)
         }
 }
 
+static int tg3_phys_id(struct net_device *dev, u32 data)
+{
+        struct tg3 *tp = netdev_priv(dev);
+        int i;
+
+        if (!netif_running(tp->dev))
+                return -EAGAIN;
+
+        if (data == 0)
+                data = 2;
+
+        for (i = 0; i < (data * 2); i++) {
+                if ((i % 2) == 0)
+                        tw32(MAC_LED_CTRL, LED_CTRL_LNKLED_OVERRIDE |
+                                           LED_CTRL_1000MBPS_ON |
+                                           LED_CTRL_100MBPS_ON |
+                                           LED_CTRL_10MBPS_ON |
+                                           LED_CTRL_TRAFFIC_OVERRIDE |
+                                           LED_CTRL_TRAFFIC_BLINK |
+                                           LED_CTRL_TRAFFIC_LED);
+        
+                else
+                        tw32(MAC_LED_CTRL, LED_CTRL_LNKLED_OVERRIDE |
+                                           LED_CTRL_TRAFFIC_OVERRIDE);
+
+                if (msleep_interruptible(500))
+                        break;
+        }
+        tw32(MAC_LED_CTRL, tp->led_ctrl);
+        return 0;
+}
+
 static void tg3_get_ethtool_stats (struct net_device *dev,
                                    struct ethtool_stats *estats, u64 *tmp_stats)
 {
@@ -7616,7 +7642,7 @@ static int tg3_test_link(struct tg3 *tp)
         if (!netif_running(tp->dev))
                 return -ENODEV;
 
-        if (tp->tg3_flags2 & TG3_FLG2_PHY_SERDES)
+        if (tp->tg3_flags2 & TG3_FLG2_ANY_SERDES)
                 max = TG3_SERDES_TIMEOUT_SEC;
         else
                 max = TG3_COPPER_TIMEOUT_SEC;
@@ -7901,9 +7927,12 @@ static int tg3_test_memory(struct tg3 *tp)
         return err;
 }
 
-static int tg3_test_loopback(struct tg3 *tp)
+#define TG3_MAC_LOOPBACK        0
+#define TG3_PHY_LOOPBACK        1
+
+static int tg3_run_loopback(struct tg3 *tp, int loopback_mode)
 {
-        u32 mac_mode, send_idx, rx_start_idx, rx_idx, tx_idx, opaque_key;
+        u32 mac_mode, rx_start_idx, rx_idx, tx_idx, opaque_key;
         u32 desc_idx;
         struct sk_buff *skb, *rx_skb;
         u8 *tx_data;
@@ -7911,18 +7940,26 @@ static int tg3_test_loopback(struct tg3 *tp)
         int num_pkts, tx_len, rx_len, i, err;
         struct tg3_rx_buffer_desc *desc;
 
-        if (!netif_running(tp->dev))
-                return -ENODEV;
+        if (loopback_mode == TG3_MAC_LOOPBACK) {
+                mac_mode = (tp->mac_mode & ~MAC_MODE_PORT_MODE_MASK) |
+                           MAC_MODE_PORT_INT_LPBACK | MAC_MODE_LINK_POLARITY |
+                           MAC_MODE_PORT_MODE_GMII;
+                tw32(MAC_MODE, mac_mode);
+        } else if (loopback_mode == TG3_PHY_LOOPBACK) {
+                mac_mode = (tp->mac_mode & ~MAC_MODE_PORT_MODE_MASK) |
+                           MAC_MODE_LINK_POLARITY | MAC_MODE_PORT_MODE_GMII;
+                if ((tp->phy_id & PHY_ID_MASK) == PHY_ID_BCM5401)
+                        mac_mode &= ~MAC_MODE_LINK_POLARITY;
+                tw32(MAC_MODE, mac_mode);
+
+                tg3_writephy(tp, MII_BMCR, BMCR_LOOPBACK | BMCR_FULLDPLX |
+                                           BMCR_SPEED1000);
+        }
+        else
+                return -EINVAL;
 
         err = -EIO;
 
-        tg3_reset_hw(tp);
-
-        mac_mode = (tp->mac_mode & ~MAC_MODE_PORT_MODE_MASK) |
-                   MAC_MODE_PORT_INT_LPBACK | MAC_MODE_LINK_POLARITY |
-                   MAC_MODE_PORT_MODE_GMII;
-        tw32(MAC_MODE, mac_mode);
-
         tx_len = 1514;
         skb = dev_alloc_skb(tx_len);
         tx_data = skb_put(skb, tx_len);
@@ -7943,15 +7980,15 @@ static int tg3_test_loopback(struct tg3 *tp)
 
         rx_start_idx = tp->hw_status->idx[0].rx_producer;
 
-        send_idx = 0;
         num_pkts = 0;
 
-        tg3_set_txd(tp, send_idx, map, tx_len, 0, 1);
+        tg3_set_txd(tp, tp->tx_prod, map, tx_len, 0, 1);
 
-        send_idx++;
+        tp->tx_prod++;
         num_pkts++;
 
-        tw32_tx_mbox(MAILBOX_SNDHOST_PROD_IDX_0 + TG3_64BIT_REG_LOW, send_idx);
+        tw32_tx_mbox(MAILBOX_SNDHOST_PROD_IDX_0 + TG3_64BIT_REG_LOW,
+                     tp->tx_prod);
         tr32_mailbox(MAILBOX_SNDHOST_PROD_IDX_0 + TG3_64BIT_REG_LOW);
 
         udelay(10);
@@ -7964,7 +8001,7 @@ static int tg3_test_loopback(struct tg3 *tp)
 
                 tx_idx = tp->hw_status->idx[0].tx_consumer;
                 rx_idx = tp->hw_status->idx[0].rx_producer;
-                if ((tx_idx == send_idx) &&
+                if ((tx_idx == tp->tx_prod) &&
                     (rx_idx == (rx_start_idx + num_pkts)))
                         break;
         }
@@ -7972,7 +8009,7 @@ static int tg3_test_loopback(struct tg3 *tp)
         pci_unmap_single(tp->pdev, map, tx_len, PCI_DMA_TODEVICE);
         dev_kfree_skb(skb);
 
-        if (tx_idx != send_idx)
+        if (tx_idx != tp->tx_prod)
                 goto out;
 
         if (rx_idx != rx_start_idx + num_pkts)
@@ -8008,6 +8045,30 @@ out:
         return err;
 }
 
+#define TG3_MAC_LOOPBACK_FAILED         1
+#define TG3_PHY_LOOPBACK_FAILED         2
+#define TG3_LOOPBACK_FAILED             (TG3_MAC_LOOPBACK_FAILED |      \
+                                         TG3_PHY_LOOPBACK_FAILED)
+
+static int tg3_test_loopback(struct tg3 *tp)
+{
+        int err = 0;
+
+        if (!netif_running(tp->dev))
+                return TG3_LOOPBACK_FAILED;
+
+        tg3_reset_hw(tp);
+
+        if (tg3_run_loopback(tp, TG3_MAC_LOOPBACK))
+                err |= TG3_MAC_LOOPBACK_FAILED;
+        if (!(tp->tg3_flags2 & TG3_FLG2_PHY_SERDES)) {
+                if (tg3_run_loopback(tp, TG3_PHY_LOOPBACK))
+                        err |= TG3_PHY_LOOPBACK_FAILED;
+        }
+
+        return err;
+}
+
 static void tg3_self_test(struct net_device *dev, struct ethtool_test *etest,
                           u64 *data)
 {
@@ -8048,10 +8109,8 @@ static void tg3_self_test(struct net_device *dev, struct ethtool_test *etest,
                         etest->flags |= ETH_TEST_FL_FAILED;
                         data[3] = 1;
                 }
-                if (tg3_test_loopback(tp) != 0) {
+                if ((data[4] = tg3_test_loopback(tp)) != 0)
                         etest->flags |= ETH_TEST_FL_FAILED;
-                        data[4] = 1;
-                }
 
                 tg3_full_unlock(tp);
 
@@ -8239,6 +8298,7 @@ static struct ethtool_ops tg3_ethtool_ops = {
         .self_test_count        = tg3_get_test_count,
         .self_test              = tg3_self_test,
         .get_strings            = tg3_get_strings,
+        .phys_id                = tg3_phys_id,
         .get_stats_count        = tg3_get_stats_count,
         .get_ethtool_stats      = tg3_get_ethtool_stats,
         .get_coalesce           = tg3_get_coalesce,
@@ -8303,7 +8363,8 @@ static void __devinit tg3_get_nvram_info(struct tg3 *tp)
                 tw32(NVRAM_CFG1, nvcfg1);
         }
 
-        if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5750) {
+        if ((GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5750) ||
+            (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5780)) {
                 switch (nvcfg1 & NVRAM_CFG1_VENDOR_MASK) {
                         case FLASH_VENDOR_ATMEL_FLASH_BUFFERED:
                                 tp->nvram_jedecnum = JEDEC_ATMEL;
@@ -8717,8 +8778,9 @@ static int tg3_nvram_write_block_buffered(struct tg3 *tp, u32 offset, u32 len,
                 if (i == (len - 4))
                         nvram_cmd |= NVRAM_CMD_LAST;
 
-                if ((tp->nvram_jedecnum == JEDEC_ST) &&
-                        (nvram_cmd & NVRAM_CMD_FIRST)) {
+                if ((GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5752) &&
+                    (tp->nvram_jedecnum == JEDEC_ST) &&
+                    (nvram_cmd & NVRAM_CMD_FIRST)) {
 
                         if ((ret = tg3_nvram_exec_cmd(tp,
                                 NVRAM_CMD_WREN | NVRAM_CMD_GO |
diff --git a/drivers/net/tulip/uli526x.c b/drivers/net/tulip/uli526x.c
index 5ae22b7bc5c..1a431633625 100644
--- a/drivers/net/tulip/uli526x.c
+++ b/drivers/net/tulip/uli526x.c
@@ -21,7 +21,6 @@
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/timer.h>
-#include <linux/ptrace.h>
 #include <linux/errno.h>
 #include <linux/ioport.h>
 #include <linux/slab.h>
@@ -34,6 +33,7 @@
 #include <linux/skbuff.h>
 #include <linux/delay.h>
 #include <linux/spinlock.h>
+#include <linux/dma-mapping.h>
 
 #include <asm/processor.h>
 #include <asm/bitops.h>
diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index effab0b9adc..50b8c6754b1 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -18,6 +18,9 @@
 /*
  *  Changes:
  *
+ *  Mike Kershaw <dragorn@kismetwireless.net> 2005/08/14
+ *    Add TUNSETLINK ioctl to set the link encapsulation
+ *
  *  Mark Smith <markzzzsmith@yahoo.com.au>
  *   Use random_ether_addr() for tap MAC address.
  *
@@ -612,6 +615,18 @@ static int tun_chr_ioctl(struct inode *inode, struct file *file,
                 DBG(KERN_INFO "%s: owner set to %d\n", tun->dev->name, tun->owner);
                 break;
 
+        case TUNSETLINK:
+                /* Only allow setting the type when the interface is down */
+                if (tun->dev->flags & IFF_UP) {
+                        DBG(KERN_INFO "%s: Linktype set failed because interface is up\n",
+                                tun->dev->name);
+                        return -EBUSY;
+                } else {
+                        tun->dev->type = (int) arg;
+                        DBG(KERN_INFO "%s: linktype set to %d\n", tun->dev->name, tun->dev->type);
+                }
+                break;
+
 #ifdef TUN_DEBUG
         case TUNSETDEBUG:
                 tun->debug = arg;
diff --git a/drivers/net/wan/syncppp.c b/drivers/net/wan/syncppp.c
index f58c794a963..b56a7b516d2 100644
--- a/drivers/net/wan/syncppp.c
+++ b/drivers/net/wan/syncppp.c
@@ -1440,6 +1440,7 @@ static void sppp_print_bytes (u_char *p, u16 len)
  *      @skb:   The buffer to process
  *      @dev:   The device it arrived on
  *      @p: Unused
+ *      @orig_dev: Unused
  *
  *      Protocol glue. This drives the deferred processing mode the poorer
  *      cards use. This can be called directly by cards that do not have
diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index dd7dbf7b14d..00a07f32a81 100644
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@ -289,8 +289,8 @@ config APPLE_AIRPORT
           a non-standard interface
 
 config PLX_HERMES
-        tristate "Hermes in PLX9052 based PCI adaptor support (Netgear MA301 etc.) (EXPERIMENTAL)"
-        depends on PCI && HERMES && EXPERIMENTAL
+        tristate "Hermes in PLX9052 based PCI adaptor support (Netgear MA301 etc.)"
+        depends on PCI && HERMES
         help
           Enable support for PCMCIA cards supported by the "Hermes" (aka
           orinoco) driver when used in PLX9052 based PCI adaptors.  These
@@ -299,12 +299,9 @@ config PLX_HERMES
           802.11b PCMCIA cards can be used in desktop machines.  The Netgear
           MA301 is such an adaptor.
 
-          Support for these adaptors is so far still incomplete and buggy.
-          You have been warned.
-
 config TMD_HERMES
-        tristate "Hermes in TMD7160 based PCI adaptor support (EXPERIMENTAL)"
-        depends on PCI && HERMES && EXPERIMENTAL
+        tristate "Hermes in TMD7160 based PCI adaptor support"
+        depends on PCI && HERMES
         help
           Enable support for PCMCIA cards supported by the "Hermes" (aka
           orinoco) driver when used in TMD7160 based PCI adaptors.  These
@@ -312,12 +309,18 @@ config TMD_HERMES
           PCI <-> PCMCIA bridge.  Several vendors sell such adaptors so that
           802.11b PCMCIA cards can be used in desktop machines.
 
-          Support for these adaptors is so far still incomplete and buggy.
-          You have been warned.
+config NORTEL_HERMES
+        tristate "Nortel emobility PCI adaptor support"
+        depends on PCI && HERMES
+        help
+          Enable support for PCMCIA cards supported by the "Hermes" (aka
+          orinoco) driver when used in Nortel emobility PCI adaptors.  These
+          adaptors are not full PCMCIA controllers, but act as a more limited
+          PCI <-> PCMCIA bridge.
 
 config PCI_HERMES
-        tristate "Prism 2.5 PCI 802.11b adaptor support (EXPERIMENTAL)"
-        depends on PCI && HERMES && EXPERIMENTAL
+        tristate "Prism 2.5 PCI 802.11b adaptor support"
+        depends on PCI && HERMES
         help
           Enable support for PCI and mini-PCI 802.11b wireless NICs based on
           the Prism 2.5 chipset.  These are true PCI cards, not the 802.11b
@@ -372,6 +375,19 @@ config PCMCIA_HERMES
           configure your card and that /etc/pcmcia/wireless.opts works:
           <http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html>.
 
+config PCMCIA_SPECTRUM
+        tristate "Symbol Spectrum24 Trilogy PCMCIA card support"
+        depends on NET_RADIO && PCMCIA && HERMES
+        ---help---
+
+          This is a driver for 802.11b cards using RAM-loadable Symbol
+          firmware, such as Symbol Wireless Networker LA4100, CompactFlash
+          cards by Socket Communications and Intel PRO/Wireless 2011B.
+
+          This driver requires firmware download on startup.  Utilities
+          for downloading Symbol firmware are available at
+          <http://sourceforge.net/projects/orinoco/>
+
 config AIRO_CS
         tristate "Cisco/Aironet 34X/35X/4500/4800 PCMCIA cards"
         depends on NET_RADIO && PCMCIA && (BROKEN || !M32R)
diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile
index 0953cc0cdee..3a6f7ba326c 100644
--- a/drivers/net/wireless/Makefile
+++ b/drivers/net/wireless/Makefile
@@ -22,6 +22,8 @@ obj-$(CONFIG_APPLE_AIRPORT)	+= airport.o
 obj-$(CONFIG_PLX_HERMES)        += orinoco_plx.o
 obj-$(CONFIG_PCI_HERMES)        += orinoco_pci.o
 obj-$(CONFIG_TMD_HERMES)        += orinoco_tmd.o
+obj-$(CONFIG_NORTEL_HERMES)     += orinoco_nortel.o
+obj-$(CONFIG_PCMCIA_SPECTRUM)   += spectrum_cs.o
 
 obj-$(CONFIG_AIRO)              += airo.o
 obj-$(CONFIG_AIRO_CS)           += airo_cs.o airo.o
diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
index 6db1fb6461d..2be65d308fb 100644
--- a/drivers/net/wireless/airo.c
+++ b/drivers/net/wireless/airo.c
@@ -1308,7 +1308,7 @@ static int micsetup(struct airo_info *ai) {
         int i;
 
         if (ai->tfm == NULL)
-                ai->tfm = crypto_alloc_tfm("aes", 0);
+                ai->tfm = crypto_alloc_tfm("aes", CRYPTO_TFM_REQ_MAY_SLEEP);
 
         if (ai->tfm == NULL) {
                 printk(KERN_ERR "airo: failed to load transform for AES\n");
@@ -2239,7 +2239,7 @@ static void airo_read_stats(struct airo_info *ai) {
         u32 *vals = stats_rid.vals;
 
         clear_bit(JOB_STATS, &ai->flags);
-        if (ai->power) {
+        if (ai->power.event) {
                 up(&ai->sem);
                 return;
         }
@@ -2410,8 +2410,7 @@ void stop_airo_card( struct net_device *dev, int freeres )
                 }
         }
 #ifdef MICSUPPORT
-        if (ai->tfm)
-                crypto_free_tfm(ai->tfm);
+        crypto_free_tfm(ai->tfm);
 #endif
         del_airo_dev( dev );
         free_netdev( dev );
@@ -2969,7 +2968,7 @@ static int airo_thread(void *data) {
                         break;
                 }
 
-                if (ai->power || test_bit(FLAG_FLASHING, &ai->flags)) {
+                if (ai->power.event || test_bit(FLAG_FLASHING, &ai->flags)) {
                         up(&ai->sem);
                         continue;
                 }
@@ -3259,7 +3258,7 @@ badrx:
                                 wstats.noise = apriv->wstats.qual.noise;
                                 wstats.updated = IW_QUAL_LEVEL_UPDATED
                                         | IW_QUAL_QUAL_UPDATED
-                                        | IW_QUAL_NOISE_UPDATED;
+                                        | IW_QUAL_DBM;
                                 /* Update spy records */
                                 wireless_spy_update(dev, sa, &wstats);
                         }
@@ -3605,7 +3604,7 @@ void mpi_receive_802_11 (struct airo_info *ai)
                 wstats.noise = ai->wstats.qual.noise;
                 wstats.updated = IW_QUAL_QUAL_UPDATED
                         | IW_QUAL_LEVEL_UPDATED
-                        | IW_QUAL_NOISE_UPDATED;
+                        | IW_QUAL_DBM;
                 /* Update spy records */
                 wireless_spy_update(ai->dev, sa, &wstats);
         }
@@ -5521,7 +5520,7 @@ static int airo_pci_resume(struct pci_dev *pdev)
         pci_restore_state(pdev);
         pci_enable_wake(pdev, pci_choose_state(pdev, ai->power), 0);
 
-        if (ai->power > 1) {
+        if (ai->power.event > 1) {
                 reset_card(dev, 0);
                 mpi_init_descriptors(ai);
                 setup_card(ai, dev->dev_addr, 0);
@@ -6490,22 +6489,20 @@ static int airo_get_range(struct net_device *dev,
                 range->max_qual.qual = 100;     /* % */
         else
                 range->max_qual.qual = airo_get_max_quality(&cap_rid);
-        range->max_qual.level = 0;      /* 0 means we use dBm  */
-        range->max_qual.noise = 0;
-        range->max_qual.updated = 0;
+        range->max_qual.level = 0x100 - 120;    /* -120 dBm */
+        range->max_qual.noise = 0x100 - 120;    /* -120 dBm */
 
         /* Experimental measurements - boundary 11/5.5 Mb/s */
         /* Note : with or without the (local->rssi), results
          * are somewhat different. - Jean II */
         if (local->rssi) {
-                range->avg_qual.qual = 50;      /* % */
-                range->avg_qual.level = 186;    /* -70 dBm */
+                range->avg_qual.qual = 50;              /* % */
+                range->avg_qual.level = 0x100 - 70;     /* -70 dBm */
         } else {
                 range->avg_qual.qual = airo_get_avg_quality(&cap_rid);
-                range->avg_qual.level = 176;    /* -80 dBm */
+                range->avg_qual.level = 0x100 - 80;     /* -80 dBm */
         }
-        range->avg_qual.noise = 0;
-        range->avg_qual.updated = 0;
+        range->avg_qual.noise = 0x100 - 85;             /* -85 dBm */
 
         for(i = 0 ; i < 8 ; i++) {
                 range->bitrate[i] = cap_rid.supportedRates[i] * 500000;
@@ -6728,15 +6725,17 @@ static int airo_get_aplist(struct net_device *dev,
                 if (local->rssi) {
                         qual[i].level = 0x100 - BSSList.dBm;
                         qual[i].qual = airo_dbm_to_pct( local->rssi, BSSList.dBm );
-                        qual[i].updated = IW_QUAL_QUAL_UPDATED;
+                        qual[i].updated = IW_QUAL_QUAL_UPDATED
+                                        | IW_QUAL_LEVEL_UPDATED
+                                        | IW_QUAL_DBM;
                 } else {
                         qual[i].level = (BSSList.dBm + 321) / 2;
                         qual[i].qual = 0;
-                        qual[i].updated = IW_QUAL_QUAL_INVALID;
+                        qual[i].updated = IW_QUAL_QUAL_INVALID
+                                        | IW_QUAL_LEVEL_UPDATED
+                                        | IW_QUAL_DBM;
                 }
                 qual[i].noise = local->wstats.qual.noise;
-                qual[i].updated = IW_QUAL_LEVEL_UPDATED
-                                | IW_QUAL_NOISE_UPDATED;
                 if (BSSList.index == 0xffff)
                         break;
         }
@@ -6862,15 +6861,17 @@ static inline char *airo_translate_scan(struct net_device *dev,
         if (ai->rssi) {
                 iwe.u.qual.level = 0x100 - bss->dBm;
                 iwe.u.qual.qual = airo_dbm_to_pct( ai->rssi, bss->dBm );
-                iwe.u.qual.updated = IW_QUAL_QUAL_UPDATED;
+                iwe.u.qual.updated = IW_QUAL_QUAL_UPDATED
+                                | IW_QUAL_LEVEL_UPDATED
+                                | IW_QUAL_DBM;
         } else {
                 iwe.u.qual.level = (bss->dBm + 321) / 2;
                 iwe.u.qual.qual = 0;
-                iwe.u.qual.updated = IW_QUAL_QUAL_INVALID;
+                iwe.u.qual.updated = IW_QUAL_QUAL_INVALID
+                                | IW_QUAL_LEVEL_UPDATED
+                                | IW_QUAL_DBM;
         }
         iwe.u.qual.noise = ai->wstats.qual.noise;
-        iwe.u.qual.updated = IW_QUAL_LEVEL_UPDATED
-                        | IW_QUAL_NOISE_UPDATED;
         current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe, IW_EV_QUAL_LEN);
 
         /* Add encryption capability */
@@ -7123,7 +7124,7 @@ static int airo_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
         int rc = 0;
         struct airo_info *ai = (struct airo_info *)dev->priv;
 
-        if (ai->power)
+        if (ai->power.event)
                 return 0;
 
         switch (cmd) {
@@ -7202,7 +7203,7 @@ static void airo_read_wireless_stats(struct airo_info *local)
 
         /* Get stats out of the card */
         clear_bit(JOB_WSTATS, &local->flags);
-        if (local->power) {
+        if (local->power.event) {
                 up(&local->sem);
                 return;
         }
@@ -7223,13 +7224,12 @@ static void airo_read_wireless_stats(struct airo_info *local)
                 local->wstats.qual.level = (status_rid.normalizedSignalStrength + 321) / 2;
                 local->wstats.qual.qual = airo_get_quality(&status_rid, &cap_rid);
         }
-        local->wstats.qual.updated = IW_QUAL_QUAL_UPDATED | IW_QUAL_LEVEL_UPDATED;
         if (status_rid.len >= 124) {
                 local->wstats.qual.noise = 0x100 - status_rid.noisedBm;
-                local->wstats.qual.updated |= IW_QUAL_NOISE_UPDATED;
+                local->wstats.qual.updated = IW_QUAL_ALL_UPDATED | IW_QUAL_DBM;
         } else {
                 local->wstats.qual.noise = 0;
-                local->wstats.qual.updated |= IW_QUAL_NOISE_INVALID;
+                local->wstats.qual.updated = IW_QUAL_QUAL_UPDATED | IW_QUAL_LEVEL_UPDATED | IW_QUAL_NOISE_INVALID | IW_QUAL_DBM;
         }
 
         /* Packets discarded in the wireless adapter due to wireless
diff --git a/drivers/net/wireless/atmel.c b/drivers/net/wireless/atmel.c
index f48a6e72922..587869d86ee 100644
--- a/drivers/net/wireless/atmel.c
+++ b/drivers/net/wireless/atmel.c
@@ -1593,7 +1593,6 @@ struct net_device *init_atmel_card( unsigned short irq, int port, const AtmelFWT
         dev->set_mac_address = atmel_set_mac_address;
         dev->hard_start_xmit = start_tx;
         dev->get_stats = atmel_get_stats;
-        dev->get_wireless_stats = atmel_get_wireless_stats;
         dev->wireless_handlers = (struct iw_handler_def *)&atmel_handler_def;
         dev->do_ioctl = atmel_ioctl;
         dev->irq = irq;
@@ -2411,7 +2410,8 @@ static const struct iw_handler_def	atmel_handler_def =
         .num_private_args = sizeof(atmel_private_args)/sizeof(struct iw_priv_args), 
         .standard       = (iw_handler *) atmel_handler,
         .private        = (iw_handler *) atmel_private_handler, 
-        .private_args   = (struct iw_priv_args *) atmel_private_args
+        .private_args   = (struct iw_priv_args *) atmel_private_args,
+        .get_wireless_stats = atmel_get_wireless_stats
 };
 
 static int atmel_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
@@ -2424,19 +2424,6 @@ static int atmel_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
         char domain[REGDOMAINSZ+1];
 
         switch (cmd) {
-        case SIOCGIWPRIV:
-                if(wrq->u.data.pointer) {
-                        /* Set the number of ioctl available */
-                        wrq->u.data.length = sizeof(atmel_private_args) / sizeof(atmel_private_args[0]);
-                        
-                        /* Copy structure to the user buffer */
-                        if (copy_to_user(wrq->u.data.pointer,
-                                         (u_char *) atmel_private_args,
-                                         sizeof(atmel_private_args)))
-                                rc = -EFAULT;
-                }
-                break;
-
         case ATMELIDIFC:
                 wrq->u.param.value = ATMELMAGIC;                
                 break;
diff --git a/drivers/net/wireless/hostap/hostap_pci.c b/drivers/net/wireless/hostap/hostap_pci.c
index 4f567ef6178..025f8cdb556 100644
--- a/drivers/net/wireless/hostap/hostap_pci.c
+++ b/drivers/net/wireless/hostap/hostap_pci.c
@@ -416,7 +416,7 @@ static int prism2_pci_suspend(struct pci_dev *pdev, pm_message_t state)
         prism2_suspend(dev);
         pci_save_state(pdev);
         pci_disable_device(pdev);
-        pci_set_power_state(pdev, 3);
+        pci_set_power_state(pdev, PCI_D3hot);
 
         return 0;
 }
diff --git a/drivers/net/wireless/ipw2100.c b/drivers/net/wireless/ipw2100.c
index a47fce4bead..2414e6493aa 100644
--- a/drivers/net/wireless/ipw2100.c
+++ b/drivers/net/wireless/ipw2100.c
@@ -327,38 +327,38 @@ static struct iw_handler_def ipw2100_wx_handler_def;
 
 static inline void read_register(struct net_device *dev, u32 reg, u32 *val)
 {
-        *val = readl((void *)(dev->base_addr + reg));
+        *val = readl((void __iomem *)(dev->base_addr + reg));
         IPW_DEBUG_IO("r: 0x%08X => 0x%08X\n", reg, *val);
 }
 
 static inline void write_register(struct net_device *dev, u32 reg, u32 val)
 {
-        writel(val, (void *)(dev->base_addr + reg));
+        writel(val, (void __iomem *)(dev->base_addr + reg));
         IPW_DEBUG_IO("w: 0x%08X <= 0x%08X\n", reg, val);
 }
 
 static inline void read_register_word(struct net_device *dev, u32 reg, u16 *val)
 {
-        *val = readw((void *)(dev->base_addr + reg));
+        *val = readw((void __iomem *)(dev->base_addr + reg));
         IPW_DEBUG_IO("r: 0x%08X => %04X\n", reg, *val);
 }
 
 static inline void read_register_byte(struct net_device *dev, u32 reg, u8 *val)
 {
-        *val = readb((void *)(dev->base_addr + reg));
+        *val = readb((void __iomem *)(dev->base_addr + reg));
         IPW_DEBUG_IO("r: 0x%08X => %02X\n", reg, *val);
 }
 
 static inline void write_register_word(struct net_device *dev, u32 reg, u16 val)
 {
-        writew(val, (void *)(dev->base_addr + reg));
+        writew(val, (void __iomem *)(dev->base_addr + reg));
         IPW_DEBUG_IO("w: 0x%08X <= %04X\n", reg, val);
 }
 
 
 static inline void write_register_byte(struct net_device *dev, u32 reg, u8 val)
 {
-        writeb(val, (void *)(dev->base_addr + reg));
+        writeb(val, (void __iomem *)(dev->base_addr + reg));
         IPW_DEBUG_IO("w: 0x%08X =< %02X\n", reg, val);
 }
 
@@ -498,7 +498,7 @@ static inline void read_nic_memory(struct net_device *dev, u32 addr, u32 len,
 static inline int ipw2100_hw_is_adapter_in_system(struct net_device *dev)
 {
         return (dev->base_addr &&
-                (readl((void *)(dev->base_addr + IPW_REG_DOA_DEBUG_AREA_START))
+                (readl((void __iomem *)(dev->base_addr + IPW_REG_DOA_DEBUG_AREA_START))
                  == IPW_DATA_DOA_DEBUG_VALUE));
 }
 
@@ -2125,19 +2125,19 @@ static void isr_indicate_scanning(struct ipw2100_priv *priv, u32 status)
 }
 
 static const struct ipw2100_status_indicator status_handlers[] = {
-        IPW2100_HANDLER(IPW_STATE_INITIALIZED, 0),
-        IPW2100_HANDLER(IPW_STATE_COUNTRY_FOUND, 0),
+        IPW2100_HANDLER(IPW_STATE_INITIALIZED, NULL),
+        IPW2100_HANDLER(IPW_STATE_COUNTRY_FOUND, NULL),
         IPW2100_HANDLER(IPW_STATE_ASSOCIATED, isr_indicate_associated),
         IPW2100_HANDLER(IPW_STATE_ASSN_LOST, isr_indicate_association_lost),
-        IPW2100_HANDLER(IPW_STATE_ASSN_CHANGED, 0),
+        IPW2100_HANDLER(IPW_STATE_ASSN_CHANGED, NULL),
         IPW2100_HANDLER(IPW_STATE_SCAN_COMPLETE, isr_scan_complete),
-        IPW2100_HANDLER(IPW_STATE_ENTERED_PSP, 0),
-        IPW2100_HANDLER(IPW_STATE_LEFT_PSP, 0),
+        IPW2100_HANDLER(IPW_STATE_ENTERED_PSP, NULL),
+        IPW2100_HANDLER(IPW_STATE_LEFT_PSP, NULL),
         IPW2100_HANDLER(IPW_STATE_RF_KILL, isr_indicate_rf_kill),
-        IPW2100_HANDLER(IPW_STATE_DISABLED, 0),
-        IPW2100_HANDLER(IPW_STATE_POWER_DOWN, 0),
+        IPW2100_HANDLER(IPW_STATE_DISABLED, NULL),
+        IPW2100_HANDLER(IPW_STATE_POWER_DOWN, NULL),
         IPW2100_HANDLER(IPW_STATE_SCANNING, isr_indicate_scanning),
-        IPW2100_HANDLER(-1, 0)
+        IPW2100_HANDLER(-1, NULL)
 };
 
 
@@ -6327,7 +6327,7 @@ static void ipw2100_irq_tasklet(struct ipw2100_priv *priv);
 
 static struct net_device *ipw2100_alloc_device(
         struct pci_dev *pci_dev,
-        char *base_addr,
+        void __iomem *base_addr,
         unsigned long mem_start,
         unsigned long mem_len)
 {
@@ -6474,7 +6474,7 @@ static int ipw2100_pci_init_one(struct pci_dev *pci_dev,
                                 const struct pci_device_id *ent)
 {
         unsigned long mem_start, mem_len, mem_flags;
-        char *base_addr = NULL;
+        void __iomem *base_addr = NULL;
         struct net_device *dev = NULL;
         struct ipw2100_priv *priv = NULL;
         int err = 0;
@@ -6664,7 +6664,7 @@ static int ipw2100_pci_init_one(struct pci_dev *pci_dev,
         }
 
         if (base_addr)
-                iounmap((char*)base_addr);
+                iounmap(base_addr);
 
         pci_release_regions(pci_dev);
         pci_disable_device(pci_dev);
@@ -6714,7 +6714,7 @@ static void __devexit ipw2100_pci_remove_one(struct pci_dev *pci_dev)
                         free_irq(dev->irq, priv);
 
                 if (dev->base_addr)
-                        iounmap((unsigned char *)dev->base_addr);
+                        iounmap((void __iomem *)dev->base_addr);
 
                 free_ieee80211(dev);
         }
@@ -8574,6 +8574,7 @@ static int ipw2100_ucode_download(struct ipw2100_priv *priv,
         struct net_device *dev = priv->net_dev;
         const unsigned char *microcode_data = fw->uc.data;
         unsigned int microcode_data_left = fw->uc.size;
+        void __iomem *reg = (void __iomem *)dev->base_addr;
 
         struct symbol_alive_response response;
         int i, j;
@@ -8581,23 +8582,23 @@ static int ipw2100_ucode_download(struct ipw2100_priv *priv,
 
         /* Symbol control */
         write_nic_word(dev, IPW2100_CONTROL_REG, 0x703);
-        readl((void *)(dev->base_addr));
+        readl(reg);
         write_nic_word(dev, IPW2100_CONTROL_REG, 0x707);
-        readl((void *)(dev->base_addr));
+        readl(reg);
 
         /* HW config */
         write_nic_byte(dev, 0x210014, 0x72);    /* fifo width =16 */
-        readl((void *)(dev->base_addr));
+        readl(reg);
         write_nic_byte(dev, 0x210014, 0x72);    /* fifo width =16 */
-        readl((void *)(dev->base_addr));
+        readl(reg);
 
         /* EN_CS_ACCESS bit to reset control store pointer */
         write_nic_byte(dev, 0x210000, 0x40);
-        readl((void *)(dev->base_addr));
+        readl(reg);
         write_nic_byte(dev, 0x210000, 0x0);
-        readl((void *)(dev->base_addr));
+        readl(reg);
         write_nic_byte(dev, 0x210000, 0x40);
-        readl((void *)(dev->base_addr));
+        readl(reg);
 
         /* copy microcode from buffer into Symbol */
 
@@ -8609,31 +8610,31 @@ static int ipw2100_ucode_download(struct ipw2100_priv *priv,
 
         /* EN_CS_ACCESS bit to reset the control store pointer */
         write_nic_byte(dev, 0x210000, 0x0);
-        readl((void *)(dev->base_addr));
+        readl(reg);
 
         /* Enable System (Reg 0)
          * first enable causes garbage in RX FIFO */
         write_nic_byte(dev, 0x210000, 0x0);
-        readl((void *)(dev->base_addr));
+        readl(reg);
         write_nic_byte(dev, 0x210000, 0x80);
-        readl((void *)(dev->base_addr));
+        readl(reg);
 
         /* Reset External Baseband Reg */
         write_nic_word(dev, IPW2100_CONTROL_REG, 0x703);
-        readl((void *)(dev->base_addr));
+        readl(reg);
         write_nic_word(dev, IPW2100_CONTROL_REG, 0x707);
-        readl((void *)(dev->base_addr));
+        readl(reg);
 
         /* HW Config (Reg 5) */
         write_nic_byte(dev, 0x210014, 0x72);    // fifo width =16
-        readl((void *)(dev->base_addr));
+        readl(reg);
         write_nic_byte(dev, 0x210014, 0x72);    // fifo width =16
-        readl((void *)(dev->base_addr));
+        readl(reg);
 
         /* Enable System (Reg 0)
          * second enable should be OK */
         write_nic_byte(dev, 0x210000, 0x00);    // clear enable system
-        readl((void *)(dev->base_addr));
+        readl(reg);
         write_nic_byte(dev, 0x210000, 0x80);    // set enable system
 
         /* check Symbol is enabled - upped this from 5 as it wasn't always
diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c
index 6d0b6b1df4c..b7f275c00de 100644
--- a/drivers/net/wireless/ipw2200.c
+++ b/drivers/net/wireless/ipw2200.c
@@ -72,7 +72,8 @@ static void ipw_rx_queue_replenish(void *);
 static int ipw_up(struct ipw_priv *);
 static void ipw_down(struct ipw_priv *);
 static int ipw_config(struct ipw_priv *);
-static int init_supported_rates(struct ipw_priv *priv, struct ipw_supported_rates *prates);
+static int init_supported_rates(struct ipw_priv *priv,
+                                struct ipw_supported_rates *prates);
 
 static u8 band_b_active_channel[MAX_B_CHANNELS] = {
         1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 0
@@ -102,7 +103,7 @@ static int is_valid_channel(int mode_mask, int channel)
 }
 
 static char *snprint_line(char *buf, size_t count,
-                          const u8 *data, u32 len, u32 ofs)
+                          const u8 * data, u32 len, u32 ofs)
 {
         int out, i, j, l;
         char c;
@@ -136,7 +137,7 @@ static char *snprint_line(char *buf, size_t count,
         return buf;
 }
 
-static void printk_buf(int level, const u8 *data, u32 len)
+static void printk_buf(int level, const u8 * data, u32 len)
 {
         char line[81];
         u32 ofs = 0;
@@ -161,21 +162,24 @@ static u8 _ipw_read_reg8(struct ipw_priv *ipw, u32 reg);
 static void _ipw_write_reg8(struct ipw_priv *priv, u32 reg, u8 value);
 static inline void ipw_write_reg8(struct ipw_priv *a, u32 b, u8 c)
 {
-        IPW_DEBUG_IO("%s %d: write_indirect8(0x%08X, 0x%08X)\n", __FILE__, __LINE__, (u32)(b), (u32)(c));
+        IPW_DEBUG_IO("%s %d: write_indirect8(0x%08X, 0x%08X)\n", __FILE__,
+                     __LINE__, (u32) (b), (u32) (c));
         _ipw_write_reg8(a, b, c);
 }
 
 static void _ipw_write_reg16(struct ipw_priv *priv, u32 reg, u16 value);
 static inline void ipw_write_reg16(struct ipw_priv *a, u32 b, u16 c)
 {
-        IPW_DEBUG_IO("%s %d: write_indirect16(0x%08X, 0x%08X)\n", __FILE__, __LINE__, (u32)(b), (u32)(c));
+        IPW_DEBUG_IO("%s %d: write_indirect16(0x%08X, 0x%08X)\n", __FILE__,
+                     __LINE__, (u32) (b), (u32) (c));
         _ipw_write_reg16(a, b, c);
 }
 
 static void _ipw_write_reg32(struct ipw_priv *priv, u32 reg, u32 value);
 static inline void ipw_write_reg32(struct ipw_priv *a, u32 b, u32 c)
 {
-        IPW_DEBUG_IO("%s %d: write_indirect32(0x%08X, 0x%08X)\n", __FILE__, __LINE__, (u32)(b), (u32)(c));
+        IPW_DEBUG_IO("%s %d: write_indirect32(0x%08X, 0x%08X)\n", __FILE__,
+                     __LINE__, (u32) (b), (u32) (c));
         _ipw_write_reg32(a, b, c);
 }
 
@@ -195,24 +199,30 @@ static inline void ipw_write_reg32(struct ipw_priv *a, u32 b, u32 c)
  _ipw_write32(ipw, ofs, val)
 
 #define _ipw_read8(ipw, ofs) readb((ipw)->hw_base + (ofs))
-static inline u8 __ipw_read8(char *f, u32 l, struct ipw_priv *ipw, u32 ofs) {
-        IPW_DEBUG_IO("%s %d: read_direct8(0x%08X)\n", f, l, (u32)(ofs));
+static inline u8 __ipw_read8(char *f, u32 l, struct ipw_priv *ipw, u32 ofs)
+{
+        IPW_DEBUG_IO("%s %d: read_direct8(0x%08X)\n", f, l, (u32) (ofs));
         return _ipw_read8(ipw, ofs);
 }
+
 #define ipw_read8(ipw, ofs) __ipw_read8(__FILE__, __LINE__, ipw, ofs)
 
 #define _ipw_read16(ipw, ofs) readw((ipw)->hw_base + (ofs))
-static inline u16 __ipw_read16(char *f, u32 l, struct ipw_priv *ipw, u32 ofs) {
-        IPW_DEBUG_IO("%s %d: read_direct16(0x%08X)\n", f, l, (u32)(ofs));
+static inline u16 __ipw_read16(char *f, u32 l, struct ipw_priv *ipw, u32 ofs)
+{
+        IPW_DEBUG_IO("%s %d: read_direct16(0x%08X)\n", f, l, (u32) (ofs));
         return _ipw_read16(ipw, ofs);
 }
+
 #define ipw_read16(ipw, ofs) __ipw_read16(__FILE__, __LINE__, ipw, ofs)
 
 #define _ipw_read32(ipw, ofs) readl((ipw)->hw_base + (ofs))
-static inline u32 __ipw_read32(char *f, u32 l, struct ipw_priv *ipw, u32 ofs) {
-        IPW_DEBUG_IO("%s %d: read_direct32(0x%08X)\n", f, l, (u32)(ofs));
+static inline u32 __ipw_read32(char *f, u32 l, struct ipw_priv *ipw, u32 ofs)
+{
+        IPW_DEBUG_IO("%s %d: read_direct32(0x%08X)\n", f, l, (u32) (ofs));
         return _ipw_read32(ipw, ofs);
 }
+
 #define ipw_read32(ipw, ofs) __ipw_read32(__FILE__, __LINE__, ipw, ofs)
 
 static void _ipw_read_indirect(struct ipw_priv *, u32, u8 *, int);
@@ -220,34 +230,30 @@ static void _ipw_read_indirect(struct ipw_priv *, u32, u8 *, int);
         IPW_DEBUG_IO("%s %d: read_inddirect(0x%08X) %d bytes\n", __FILE__, __LINE__, (u32)(b), d); \
         _ipw_read_indirect(a, b, c, d)
 
-static void _ipw_write_indirect(struct ipw_priv *priv, u32 addr, u8 *data, int num);
+static void _ipw_write_indirect(struct ipw_priv *priv, u32 addr, u8 * data,
+                                int num);
 #define ipw_write_indirect(a, b, c, d) \
         IPW_DEBUG_IO("%s %d: write_indirect(0x%08X) %d bytes\n", __FILE__, __LINE__, (u32)(b), d); \
         _ipw_write_indirect(a, b, c, d)
 
 /* indirect write s */
-static void _ipw_write_reg32(struct ipw_priv *priv, u32 reg,
-                             u32 value)
+static void _ipw_write_reg32(struct ipw_priv *priv, u32 reg, u32 value)
 {
-        IPW_DEBUG_IO(" %p : reg = 0x%8X : value = 0x%8X\n",
-                     priv, reg, value);
+        IPW_DEBUG_IO(" %p : reg = 0x%8X : value = 0x%8X\n", priv, reg, value);
         _ipw_write32(priv, CX2_INDIRECT_ADDR, reg);
         _ipw_write32(priv, CX2_INDIRECT_DATA, value);
 }
 
-
 static void _ipw_write_reg8(struct ipw_priv *priv, u32 reg, u8 value)
 {
         IPW_DEBUG_IO(" reg = 0x%8X : value = 0x%8X\n", reg, value);
         _ipw_write32(priv, CX2_INDIRECT_ADDR, reg & CX2_INDIRECT_ADDR_MASK);
         _ipw_write8(priv, CX2_INDIRECT_DATA, value);
         IPW_DEBUG_IO(" reg = 0x%8lX : value = 0x%8X\n",
-                     (unsigned long)(priv->hw_base + CX2_INDIRECT_DATA),
-                     value);
+                     (unsigned long)(priv->hw_base + CX2_INDIRECT_DATA), value);
 }
 
-static void _ipw_write_reg16(struct ipw_priv *priv, u32 reg,
-                             u16 value)
+static void _ipw_write_reg16(struct ipw_priv *priv, u32 reg, u16 value)
 {
         IPW_DEBUG_IO(" reg = 0x%8X : value = 0x%8X\n", reg, value);
         _ipw_write32(priv, CX2_INDIRECT_ADDR, reg & CX2_INDIRECT_ADDR_MASK);
@@ -262,7 +268,7 @@ static u8 _ipw_read_reg8(struct ipw_priv *priv, u32 reg)
         _ipw_write32(priv, CX2_INDIRECT_ADDR, reg & CX2_INDIRECT_ADDR_MASK);
         IPW_DEBUG_IO(" reg = 0x%8X : \n", reg);
         word = _ipw_read32(priv, CX2_INDIRECT_DATA);
-        return (word >> ((reg & 0x3)*8)) & 0xff;
+        return (word >> ((reg & 0x3) * 8)) & 0xff;
 }
 
 static u32 _ipw_read_reg32(struct ipw_priv *priv, u32 reg)
@@ -302,7 +308,7 @@ static void _ipw_read_indirect(struct ipw_priv *priv, u32 addr, u8 * buf,
         _ipw_write32(priv, CX2_AUTOINC_ADDR, aligned_addr);
         aligned_len = num & CX2_INDIRECT_ADDR_MASK;
         for (i = 0; i < aligned_len; i += 4, buf += 4, aligned_addr += 4)
-                *(u32*)buf = ipw_read32(priv, CX2_AUTOINC_DATA);
+                *(u32 *) buf = ipw_read32(priv, CX2_AUTOINC_DATA);
 
         /* Copy the last nibble */
         dif_len = num - aligned_len;
@@ -311,7 +317,7 @@ static void _ipw_read_indirect(struct ipw_priv *priv, u32 addr, u8 * buf,
                 *buf = ipw_read8(priv, CX2_INDIRECT_DATA + i);
 }
 
-static void _ipw_write_indirect(struct ipw_priv *priv, u32 addr, u8 *buf,
+static void _ipw_write_indirect(struct ipw_priv *priv, u32 addr, u8 * buf,
                                 int num)
 {
         u32 aligned_addr = addr & CX2_INDIRECT_ADDR_MASK;
@@ -335,7 +341,7 @@ static void _ipw_write_indirect(struct ipw_priv *priv, u32 addr, u8 *buf,
         _ipw_write32(priv, CX2_AUTOINC_ADDR, aligned_addr);
         aligned_len = num & CX2_INDIRECT_ADDR_MASK;
         for (i = 0; i < aligned_len; i += 4, buf += 4, aligned_addr += 4)
-                _ipw_write32(priv, CX2_AUTOINC_DATA, *(u32*)buf);
+                _ipw_write32(priv, CX2_AUTOINC_DATA, *(u32 *) buf);
 
         /* Copy the last nibble */
         dif_len = num - aligned_len;
@@ -428,20 +434,18 @@ static void ipw_dump_nic_error_log(struct ipw_priv *priv)
         }
 
         for (i = ERROR_START_OFFSET;
-             i <= count * ERROR_ELEM_SIZE;
-             i += ERROR_ELEM_SIZE) {
-                desc   = ipw_read_reg32(priv, base + i);
-                time   = ipw_read_reg32(priv, base + i + 1*sizeof(u32));
-                blink1 = ipw_read_reg32(priv, base + i + 2*sizeof(u32));
-                blink2 = ipw_read_reg32(priv, base + i + 3*sizeof(u32));
-                ilink1 = ipw_read_reg32(priv, base + i + 4*sizeof(u32));
-                ilink2 = ipw_read_reg32(priv, base + i + 5*sizeof(u32));
-                idata =  ipw_read_reg32(priv, base + i + 6*sizeof(u32));
+             i <= count * ERROR_ELEM_SIZE; i += ERROR_ELEM_SIZE) {
+                desc = ipw_read_reg32(priv, base + i);
+                time = ipw_read_reg32(priv, base + i + 1 * sizeof(u32));
+                blink1 = ipw_read_reg32(priv, base + i + 2 * sizeof(u32));
+                blink2 = ipw_read_reg32(priv, base + i + 3 * sizeof(u32));
+                ilink1 = ipw_read_reg32(priv, base + i + 4 * sizeof(u32));
+                ilink2 = ipw_read_reg32(priv, base + i + 5 * sizeof(u32));
+                idata = ipw_read_reg32(priv, base + i + 6 * sizeof(u32));
 
-                IPW_ERROR(
-                        "%s %i 0x%08x  0x%08x  0x%08x  0x%08x  0x%08x\n",
-                        ipw_error_desc(desc), time, blink1, blink2,
-                        ilink1, ilink2, idata);
+                IPW_ERROR("%s %i 0x%08x  0x%08x  0x%08x  0x%08x  0x%08x\n",
+                          ipw_error_desc(desc), time, blink1, blink2,
+                          ilink1, ilink2, idata);
         }
 }
 
@@ -456,11 +460,10 @@ static void ipw_dump_nic_event_log(struct ipw_priv *priv)
                 IPW_ERROR("Start IPW Event Log Dump:\n");
 
         for (i = EVENT_START_OFFSET;
-             i <= count * EVENT_ELEM_SIZE;
-             i += EVENT_ELEM_SIZE) {
+             i <= count * EVENT_ELEM_SIZE; i += EVENT_ELEM_SIZE) {
                 ev = ipw_read_reg32(priv, base + i);
-                time  = ipw_read_reg32(priv, base + i + 1*sizeof(u32));
-                data  = ipw_read_reg32(priv, base + i + 2*sizeof(u32));
+                time = ipw_read_reg32(priv, base + i + 1 * sizeof(u32));
+                data = ipw_read_reg32(priv, base + i + 2 * sizeof(u32));
 
 #ifdef CONFIG_IPW_DEBUG
                 IPW_ERROR("%i\t0x%08x\t%i\n", time, data, ev);
@@ -468,8 +471,7 @@ static void ipw_dump_nic_event_log(struct ipw_priv *priv)
         }
 }
 
-static int ipw_get_ordinal(struct ipw_priv *priv, u32 ord, void *val,
-                           u32 *len)
+static int ipw_get_ordinal(struct ipw_priv *priv, u32 ord, void *val, u32 * len)
 {
         u32 addr, field_info, field_len, field_count, total_len;
 
@@ -513,11 +515,11 @@ static int ipw_get_ordinal(struct ipw_priv *priv, u32 ord, void *val,
                 }
 
                 IPW_DEBUG_ORD("Reading TABLE0[%i] from offset 0x%08x\n",
-                              ord, priv->table0_addr + (ord  << 2));
+                              ord, priv->table0_addr + (ord << 2));
 
                 *len = sizeof(u32);
                 ord <<= 2;
-                *((u32 *)val) = ipw_read32(priv, priv->table0_addr + ord);
+                *((u32 *) val) = ipw_read32(priv, priv->table0_addr + ord);
                 break;
 
         case IPW_ORD_TABLE_1_MASK:
@@ -545,7 +547,8 @@ static int ipw_get_ordinal(struct ipw_priv *priv, u32 ord, void *val,
                         return -EINVAL;
                 }
 
-                *((u32 *)val) = ipw_read_reg32(priv, (priv->table1_addr + (ord << 2)));
+                *((u32 *) val) =
+                    ipw_read_reg32(priv, (priv->table1_addr + (ord << 2)));
                 *len = sizeof(u32);
                 break;
 
@@ -573,13 +576,16 @@ static int ipw_get_ordinal(struct ipw_priv *priv, u32 ord, void *val,
 
                 /* get the second DW of statistics ;
                  * two 16-bit words - first is length, second is count */
-                field_info = ipw_read_reg32(priv, priv->table2_addr + (ord << 3) + sizeof(u32));
+                field_info =
+                    ipw_read_reg32(priv,
+                                   priv->table2_addr + (ord << 3) +
+                                   sizeof(u32));
 
                 /* get each entry length */
-                field_len = *((u16 *)&field_info);
+                field_len = *((u16 *) & field_info);
 
                 /* get number of entries */
-                field_count = *(((u16 *)&field_info) + 1);
+                field_count = *(((u16 *) & field_info) + 1);
 
                 /* abort if not enought memory */
                 total_len = field_len * field_count;
@@ -604,7 +610,6 @@ static int ipw_get_ordinal(struct ipw_priv *priv, u32 ord, void *val,
 
         }
 
-
         return 0;
 }
 
@@ -624,7 +629,7 @@ static void ipw_init_ordinals(struct ipw_priv *priv)
 
         priv->table2_addr = ipw_read32(priv, IPW_ORDINALS_TABLE_2);
         priv->table2_len = ipw_read_reg32(priv, priv->table2_addr);
-        priv->table2_len &= 0x0000ffff; /* use first two bytes */
+        priv->table2_len &= 0x0000ffff; /* use first two bytes */
 
         IPW_DEBUG_ORD("table 2 offset at 0x%08x, len = %i\n",
                       priv->table2_addr, priv->table2_len);
@@ -643,7 +648,7 @@ static ssize_t show_debug_level(struct device_driver *d, char *buf)
         return sprintf(buf, "0x%08X\n", ipw_debug_level);
 }
 static ssize_t store_debug_level(struct device_driver *d,
-                                const char *buf, size_t count)
+                                 const char *buf, size_t count)
 {
         char *p = (char *)buf;
         u32 val;
@@ -668,11 +673,12 @@ static DRIVER_ATTR(debug_level, S_IWUSR | S_IRUGO,
                    show_debug_level, store_debug_level);
 
 static ssize_t show_status(struct device *d,
-                        struct device_attribute *attr, char *buf)
+                           struct device_attribute *attr, char *buf)
 {
         struct ipw_priv *p = d->driver_data;
         return sprintf(buf, "0x%08x\n", (int)p->status);
 }
+
 static DEVICE_ATTR(status, S_IRUGO, show_status, NULL);
 
 static ssize_t show_cfg(struct device *d, struct device_attribute *attr,
@@ -681,10 +687,11 @@ static ssize_t show_cfg(struct device *d, struct device_attribute *attr,
         struct ipw_priv *p = d->driver_data;
         return sprintf(buf, "0x%08x\n", (int)p->config);
 }
+
 static DEVICE_ATTR(cfg, S_IRUGO, show_cfg, NULL);
 
 static ssize_t show_nic_type(struct device *d,
-                        struct device_attribute *attr, char *buf)
+                             struct device_attribute *attr, char *buf)
 {
         struct ipw_priv *p = d->driver_data;
         u8 type = p->eeprom[EEPROM_NIC_TYPE];
@@ -704,44 +711,50 @@ static ssize_t show_nic_type(struct device *d,
 
         return sprintf(buf, "UNKNOWN\n");
 }
+
 static DEVICE_ATTR(nic_type, S_IRUGO, show_nic_type, NULL);
 
 static ssize_t dump_error_log(struct device *d,
-                struct device_attribute *attr, const char *buf, size_t count)
+                              struct device_attribute *attr, const char *buf,
+                              size_t count)
 {
         char *p = (char *)buf;
 
         if (p[0] == '1')
-                ipw_dump_nic_error_log((struct ipw_priv*)d->driver_data);
+                ipw_dump_nic_error_log((struct ipw_priv *)d->driver_data);
 
         return strnlen(buf, count);
 }
+
 static DEVICE_ATTR(dump_errors, S_IWUSR, NULL, dump_error_log);
 
 static ssize_t dump_event_log(struct device *d,
-                struct device_attribute *attr, const char *buf, size_t count)
+                              struct device_attribute *attr, const char *buf,
+                              size_t count)
 {
         char *p = (char *)buf;
 
         if (p[0] == '1')
-                ipw_dump_nic_event_log((struct ipw_priv*)d->driver_data);
+                ipw_dump_nic_event_log((struct ipw_priv *)d->driver_data);
 
         return strnlen(buf, count);
 }
+
 static DEVICE_ATTR(dump_events, S_IWUSR, NULL, dump_event_log);
 
 static ssize_t show_ucode_version(struct device *d,
-                        struct device_attribute *attr, char *buf)
+                                  struct device_attribute *attr, char *buf)
 {
         u32 len = sizeof(u32), tmp = 0;
         struct ipw_priv *p = d->driver_data;
 
-        if(ipw_get_ordinal(p, IPW_ORD_STAT_UCODE_VERSION, &tmp, &len))
+        if (ipw_get_ordinal(p, IPW_ORD_STAT_UCODE_VERSION, &tmp, &len))
                 return 0;
 
         return sprintf(buf, "0x%08x\n", tmp);
 }
-static DEVICE_ATTR(ucode_version, S_IWUSR|S_IRUGO, show_ucode_version, NULL);
+
+static DEVICE_ATTR(ucode_version, S_IWUSR | S_IRUGO, show_ucode_version, NULL);
 
 static ssize_t show_rtc(struct device *d, struct device_attribute *attr,
                         char *buf)
@@ -749,36 +762,38 @@ static ssize_t show_rtc(struct device *d, struct device_attribute *attr,
         u32 len = sizeof(u32), tmp = 0;
         struct ipw_priv *p = d->driver_data;
 
-        if(ipw_get_ordinal(p, IPW_ORD_STAT_RTC, &tmp, &len))
+        if (ipw_get_ordinal(p, IPW_ORD_STAT_RTC, &tmp, &len))
                 return 0;
 
         return sprintf(buf, "0x%08x\n", tmp);
 }
-static DEVICE_ATTR(rtc, S_IWUSR|S_IRUGO, show_rtc, NULL);
+
+static DEVICE_ATTR(rtc, S_IWUSR | S_IRUGO, show_rtc, NULL);
 
 /*
  * Add a device attribute to view/control the delay between eeprom
  * operations.
  */
 static ssize_t show_eeprom_delay(struct device *d,
-                        struct device_attribute *attr, char *buf)
+                                 struct device_attribute *attr, char *buf)
 {
-        int n = ((struct ipw_priv*)d->driver_data)->eeprom_delay;
+        int n = ((struct ipw_priv *)d->driver_data)->eeprom_delay;
         return sprintf(buf, "%i\n", n);
 }
 static ssize_t store_eeprom_delay(struct device *d,
-                        struct device_attribute *attr, const char *buf,
-                        size_t count)
+                                  struct device_attribute *attr,
+                                  const char *buf, size_t count)
 {
         struct ipw_priv *p = d->driver_data;
         sscanf(buf, "%i", &p->eeprom_delay);
         return strnlen(buf, count);
 }
-static DEVICE_ATTR(eeprom_delay, S_IWUSR|S_IRUGO,
-                   show_eeprom_delay,store_eeprom_delay);
+
+static DEVICE_ATTR(eeprom_delay, S_IWUSR | S_IRUGO,
+                   show_eeprom_delay, store_eeprom_delay);
 
 static ssize_t show_command_event_reg(struct device *d,
-                        struct device_attribute *attr, char *buf)
+                                      struct device_attribute *attr, char *buf)
 {
         u32 reg = 0;
         struct ipw_priv *p = d->driver_data;
@@ -787,8 +802,8 @@ static ssize_t show_command_event_reg(struct device *d,
         return sprintf(buf, "0x%08x\n", reg);
 }
 static ssize_t store_command_event_reg(struct device *d,
-                                struct device_attribute *attr, const char *buf,
-                                size_t count)
+                                       struct device_attribute *attr,
+                                       const char *buf, size_t count)
 {
         u32 reg;
         struct ipw_priv *p = d->driver_data;
@@ -797,11 +812,12 @@ static ssize_t store_command_event_reg(struct device *d,
         ipw_write_reg32(p, CX2_INTERNAL_CMD_EVENT, reg);
         return strnlen(buf, count);
 }
-static DEVICE_ATTR(command_event_reg, S_IWUSR|S_IRUGO,
-                   show_command_event_reg,store_command_event_reg);
+
+static DEVICE_ATTR(command_event_reg, S_IWUSR | S_IRUGO,
+                   show_command_event_reg, store_command_event_reg);
 
 static ssize_t show_mem_gpio_reg(struct device *d,
-                                struct device_attribute *attr, char *buf)
+                                 struct device_attribute *attr, char *buf)
 {
         u32 reg = 0;
         struct ipw_priv *p = d->driver_data;
@@ -810,8 +826,8 @@ static ssize_t show_mem_gpio_reg(struct device *d,
         return sprintf(buf, "0x%08x\n", reg);
 }
 static ssize_t store_mem_gpio_reg(struct device *d,
-                        struct device_attribute *attr, const char *buf,
-                        size_t count)
+                                  struct device_attribute *attr,
+                                  const char *buf, size_t count)
 {
         u32 reg;
         struct ipw_priv *p = d->driver_data;
@@ -820,11 +836,12 @@ static ssize_t store_mem_gpio_reg(struct device *d,
         ipw_write_reg32(p, 0x301100, reg);
         return strnlen(buf, count);
 }
-static DEVICE_ATTR(mem_gpio_reg, S_IWUSR|S_IRUGO,
-                   show_mem_gpio_reg,store_mem_gpio_reg);
+
+static DEVICE_ATTR(mem_gpio_reg, S_IWUSR | S_IRUGO,
+                   show_mem_gpio_reg, store_mem_gpio_reg);
 
 static ssize_t show_indirect_dword(struct device *d,
-                                struct device_attribute *attr, char *buf)
+                                   struct device_attribute *attr, char *buf)
 {
         u32 reg = 0;
         struct ipw_priv *priv = d->driver_data;
@@ -836,8 +853,8 @@ static ssize_t show_indirect_dword(struct device *d,
         return sprintf(buf, "0x%08x\n", reg);
 }
 static ssize_t store_indirect_dword(struct device *d,
-                                struct device_attribute *attr, const char *buf,
-                                size_t count)
+                                    struct device_attribute *attr,
+                                    const char *buf, size_t count)
 {
         struct ipw_priv *priv = d->driver_data;
 
@@ -845,11 +862,12 @@ static ssize_t store_indirect_dword(struct device *d,
         priv->status |= STATUS_INDIRECT_DWORD;
         return strnlen(buf, count);
 }
-static DEVICE_ATTR(indirect_dword, S_IWUSR|S_IRUGO,
-                   show_indirect_dword,store_indirect_dword);
+
+static DEVICE_ATTR(indirect_dword, S_IWUSR | S_IRUGO,
+                   show_indirect_dword, store_indirect_dword);
 
 static ssize_t show_indirect_byte(struct device *d,
-                        struct device_attribute *attr, char *buf)
+                                  struct device_attribute *attr, char *buf)
 {
         u8 reg = 0;
         struct ipw_priv *priv = d->driver_data;
@@ -861,8 +879,8 @@ static ssize_t show_indirect_byte(struct device *d,
         return sprintf(buf, "0x%02x\n", reg);
 }
 static ssize_t store_indirect_byte(struct device *d,
-                                struct device_attribute *attr, const char *buf,
-                                size_t count)
+                                   struct device_attribute *attr,
+                                   const char *buf, size_t count)
 {
         struct ipw_priv *priv = d->driver_data;
 
@@ -870,11 +888,12 @@ static ssize_t store_indirect_byte(struct device *d,
         priv->status |= STATUS_INDIRECT_BYTE;
         return strnlen(buf, count);
 }
-static DEVICE_ATTR(indirect_byte, S_IWUSR|S_IRUGO,
+
+static DEVICE_ATTR(indirect_byte, S_IWUSR | S_IRUGO,
                    show_indirect_byte, store_indirect_byte);
 
 static ssize_t show_direct_dword(struct device *d,
-                                struct device_attribute *attr, char *buf)
+                                 struct device_attribute *attr, char *buf)
 {
         u32 reg = 0;
         struct ipw_priv *priv = d->driver_data;
@@ -887,8 +906,8 @@ static ssize_t show_direct_dword(struct device *d,
         return sprintf(buf, "0x%08x\n", reg);
 }
 static ssize_t store_direct_dword(struct device *d,
-                        struct device_attribute *attr, const char *buf,
-                        size_t count)
+                                  struct device_attribute *attr,
+                                  const char *buf, size_t count)
 {
         struct ipw_priv *priv = d->driver_data;
 
@@ -896,9 +915,9 @@ static ssize_t store_direct_dword(struct device *d,
         priv->status |= STATUS_DIRECT_DWORD;
         return strnlen(buf, count);
 }
-static DEVICE_ATTR(direct_dword, S_IWUSR|S_IRUGO,
-                   show_direct_dword,store_direct_dword);
 
+static DEVICE_ATTR(direct_dword, S_IWUSR | S_IRUGO,
+                   show_direct_dword, store_direct_dword);
 
 static inline int rf_kill_active(struct ipw_priv *priv)
 {
@@ -911,7 +930,7 @@ static inline int rf_kill_active(struct ipw_priv *priv)
 }
 
 static ssize_t show_rf_kill(struct device *d, struct device_attribute *attr,
-                                char *buf)
+                            char *buf)
 {
         /* 0 - RF kill not enabled
            1 - SW based RF kill active (sysfs)
@@ -919,7 +938,7 @@ static ssize_t show_rf_kill(struct device *d, struct device_attribute *attr,
            3 - Both HW and SW baed RF kill active */
         struct ipw_priv *priv = d->driver_data;
         int val = ((priv->status & STATUS_RF_KILL_SW) ? 0x1 : 0x0) |
-                (rf_kill_active(priv) ? 0x2 : 0x0);
+            (rf_kill_active(priv) ? 0x2 : 0x0);
         return sprintf(buf, "%i\n", val);
 }
 
@@ -927,7 +946,7 @@ static int ipw_radio_kill_sw(struct ipw_priv *priv, int disable_radio)
 {
         if ((disable_radio ? 1 : 0) ==
             (priv->status & STATUS_RF_KILL_SW ? 1 : 0))
-                return 0 ;
+                return 0;
 
         IPW_DEBUG_RF_KILL("Manual SW RF Kill set to: RADIO  %s\n",
                           disable_radio ? "OFF" : "ON");
@@ -956,8 +975,8 @@ static int ipw_radio_kill_sw(struct ipw_priv *priv, int disable_radio)
         return 1;
 }
 
-static ssize_t store_rf_kill(struct device *d,  struct device_attribute *attr,
-                                const char *buf, size_t count)
+static ssize_t store_rf_kill(struct device *d, struct device_attribute *attr,
+                             const char *buf, size_t count)
 {
         struct ipw_priv *priv = d->driver_data;
 
@@ -965,7 +984,8 @@ static ssize_t store_rf_kill(struct device *d,  struct device_attribute *attr,
 
         return count;
 }
-static DEVICE_ATTR(rf_kill, S_IWUSR|S_IRUGO, show_rf_kill, store_rf_kill);
+
+static DEVICE_ATTR(rf_kill, S_IWUSR | S_IRUGO, show_rf_kill, store_rf_kill);
 
 static void ipw_irq_tasklet(struct ipw_priv *priv)
 {
@@ -990,7 +1010,7 @@ static void ipw_irq_tasklet(struct ipw_priv *priv)
 
         if (inta & CX2_INTA_BIT_TX_CMD_QUEUE) {
                 IPW_DEBUG_HC("Command completed.\n");
-                rc = ipw_queue_tx_reclaim( priv, &priv->txq_cmd, -1);
+                rc = ipw_queue_tx_reclaim(priv, &priv->txq_cmd, -1);
                 priv->status &= ~STATUS_HCMD_ACTIVE;
                 wake_up_interruptible(&priv->wait_command_queue);
                 handled |= CX2_INTA_BIT_TX_CMD_QUEUE;
@@ -998,25 +1018,25 @@ static void ipw_irq_tasklet(struct ipw_priv *priv)
 
         if (inta & CX2_INTA_BIT_TX_QUEUE_1) {
                 IPW_DEBUG_TX("TX_QUEUE_1\n");
-                rc = ipw_queue_tx_reclaim( priv, &priv->txq[0], 0);
+                rc = ipw_queue_tx_reclaim(priv, &priv->txq[0], 0);
                 handled |= CX2_INTA_BIT_TX_QUEUE_1;
         }
 
         if (inta & CX2_INTA_BIT_TX_QUEUE_2) {
                 IPW_DEBUG_TX("TX_QUEUE_2\n");
-                rc = ipw_queue_tx_reclaim( priv, &priv->txq[1], 1);
+                rc = ipw_queue_tx_reclaim(priv, &priv->txq[1], 1);
                 handled |= CX2_INTA_BIT_TX_QUEUE_2;
         }
 
         if (inta & CX2_INTA_BIT_TX_QUEUE_3) {
                 IPW_DEBUG_TX("TX_QUEUE_3\n");
-                rc = ipw_queue_tx_reclaim( priv, &priv->txq[2], 2);
+                rc = ipw_queue_tx_reclaim(priv, &priv->txq[2], 2);
                 handled |= CX2_INTA_BIT_TX_QUEUE_3;
         }
 
         if (inta & CX2_INTA_BIT_TX_QUEUE_4) {
                 IPW_DEBUG_TX("TX_QUEUE_4\n");
-                rc = ipw_queue_tx_reclaim( priv, &priv->txq[3], 3);
+                rc = ipw_queue_tx_reclaim(priv, &priv->txq[3], 3);
                 handled |= CX2_INTA_BIT_TX_QUEUE_4;
         }
 
@@ -1074,8 +1094,7 @@ static void ipw_irq_tasklet(struct ipw_priv *priv)
         }
 
         if (handled != inta) {
-                IPW_ERROR("Unhandled INTA bits 0x%08x\n",
-                                inta & ~handled);
+                IPW_ERROR("Unhandled INTA bits 0x%08x\n", inta & ~handled);
         }
 
         /* enable all interrupts */
@@ -1143,7 +1162,7 @@ static char *get_cmd_string(u8 cmd)
                 return "UNKNOWN";
         }
 }
-#endif /* CONFIG_IPW_DEBUG */
+#endif                          /* CONFIG_IPW_DEBUG */
 
 #define HOST_COMPLETE_TIMEOUT HZ
 static int ipw_send_cmd(struct ipw_priv *priv, struct host_cmd *cmd)
@@ -1159,15 +1178,16 @@ static int ipw_send_cmd(struct ipw_priv *priv, struct host_cmd *cmd)
 
         IPW_DEBUG_HC("Sending %s command (#%d), %d bytes\n",
                      get_cmd_string(cmd->cmd), cmd->cmd, cmd->len);
-        printk_buf(IPW_DL_HOST_COMMAND, (u8*)cmd->param, cmd->len);
+        printk_buf(IPW_DL_HOST_COMMAND, (u8 *) cmd->param, cmd->len);
 
         rc = ipw_queue_tx_hcmd(priv, cmd->cmd, &cmd->param, cmd->len, 0);
         if (rc)
                 return rc;
 
-        rc = wait_event_interruptible_timeout(
-                priv->wait_command_queue, !(priv->status & STATUS_HCMD_ACTIVE),
-                HOST_COMPLETE_TIMEOUT);
+        rc = wait_event_interruptible_timeout(priv->wait_command_queue,
+                                              !(priv->
+                                                status & STATUS_HCMD_ACTIVE),
+                                              HOST_COMPLETE_TIMEOUT);
         if (rc == 0) {
                 IPW_DEBUG_INFO("Command completion failed out after %dms.\n",
                                jiffies_to_msecs(HOST_COMPLETE_TIMEOUT));
@@ -1215,7 +1235,7 @@ static int ipw_send_system_config(struct ipw_priv *priv,
                 return -1;
         }
 
-        memcpy(&cmd.param,config,sizeof(*config));
+        memcpy(&cmd.param, config, sizeof(*config));
         if (ipw_send_cmd(priv, &cmd)) {
                 IPW_ERROR("failed to send SYSTEM_CONFIG command\n");
                 return -1;
@@ -1224,7 +1244,7 @@ static int ipw_send_system_config(struct ipw_priv *priv,
         return 0;
 }
 
-static int ipw_send_ssid(struct ipw_priv *priv, u8 *ssid, int len)
+static int ipw_send_ssid(struct ipw_priv *priv, u8 * ssid, int len)
 {
         struct host_cmd cmd = {
                 .cmd = IPW_CMD_SSID,
@@ -1245,7 +1265,7 @@ static int ipw_send_ssid(struct ipw_priv *priv, u8 *ssid, int len)
         return 0;
 }
 
-static int ipw_send_adapter_address(struct ipw_priv *priv, u8 *mac)
+static int ipw_send_adapter_address(struct ipw_priv *priv, u8 * mac)
 {
         struct host_cmd cmd = {
                 .cmd = IPW_CMD_ADAPTER_ADDRESS,
@@ -1284,9 +1304,6 @@ static void ipw_adapter_restart(void *adapter)
         }
 }
 
-
-
-
 #define IPW_SCAN_CHECK_WATCHDOG (5 * HZ)
 
 static void ipw_scan_check(void *data)
@@ -1313,7 +1330,7 @@ static int ipw_send_scan_request_ext(struct ipw_priv *priv,
                 return -1;
         }
 
-        memcpy(&cmd.param,request,sizeof(*request));
+        memcpy(&cmd.param, request, sizeof(*request));
         if (ipw_send_cmd(priv, &cmd)) {
                 IPW_ERROR("failed to send SCAN_REQUEST_EXT command\n");
                 return -1;
@@ -1351,7 +1368,7 @@ static int ipw_set_sensitivity(struct ipw_priv *priv, u16 sens)
                 .len = sizeof(struct ipw_sensitivity_calib)
         };
         struct ipw_sensitivity_calib *calib = (struct ipw_sensitivity_calib *)
-                &cmd.param;
+            &cmd.param;
         calib->beacon_rssi_raw = sens;
         if (ipw_send_cmd(priv, &cmd)) {
                 IPW_ERROR("failed to send SENSITIVITY CALIB command\n");
@@ -1374,7 +1391,7 @@ static int ipw_send_associate(struct ipw_priv *priv,
                 return -1;
         }
 
-        memcpy(&cmd.param,associate,sizeof(*associate));
+        memcpy(&cmd.param, associate, sizeof(*associate));
         if (ipw_send_cmd(priv, &cmd)) {
                 IPW_ERROR("failed to send ASSOCIATE command\n");
                 return -1;
@@ -1396,7 +1413,7 @@ static int ipw_send_supported_rates(struct ipw_priv *priv,
                 return -1;
         }
 
-        memcpy(&cmd.param,rates,sizeof(*rates));
+        memcpy(&cmd.param, rates, sizeof(*rates));
         if (ipw_send_cmd(priv, &cmd)) {
                 IPW_ERROR("failed to send SUPPORTED_RATES command\n");
                 return -1;
@@ -1440,7 +1457,7 @@ static int ipw_send_card_disable(struct ipw_priv *priv, u32 phy_off)
                 return -1;
         }
 
-        *((u32*)&cmd.param) = phy_off;
+        *((u32 *) & cmd.param) = phy_off;
 
         if (ipw_send_cmd(priv, &cmd)) {
                 IPW_ERROR("failed to send CARD_DISABLE command\n");
@@ -1451,8 +1468,7 @@ static int ipw_send_card_disable(struct ipw_priv *priv, u32 phy_off)
 }
 #endif
 
-static int ipw_send_tx_power(struct ipw_priv *priv,
-                             struct ipw_tx_power *power)
+static int ipw_send_tx_power(struct ipw_priv *priv, struct ipw_tx_power *power)
 {
         struct host_cmd cmd = {
                 .cmd = IPW_CMD_TX_POWER,
@@ -1464,7 +1480,7 @@ static int ipw_send_tx_power(struct ipw_priv *priv,
                 return -1;
         }
 
-        memcpy(&cmd.param,power,sizeof(*power));
+        memcpy(&cmd.param, power, sizeof(*power));
         if (ipw_send_cmd(priv, &cmd)) {
                 IPW_ERROR("failed to send TX_POWER command\n");
                 return -1;
@@ -1527,7 +1543,7 @@ static int ipw_send_power_mode(struct ipw_priv *priv, u32 mode)
                 .cmd = IPW_CMD_POWER_MODE,
                 .len = sizeof(u32)
         };
-        u32 *param = (u32*)(&cmd.param);
+        u32 *param = (u32 *) (&cmd.param);
 
         if (!priv) {
                 IPW_ERROR("Invalid args\n");
@@ -1585,67 +1601,67 @@ static inline void eeprom_write_reg(struct ipw_priv *p, u32 data)
 }
 
 /* perform a chip select operation */
-static inline void eeprom_cs(struct ipw_priv* priv)
+static inline void eeprom_cs(struct ipw_priv *priv)
 {
-        eeprom_write_reg(priv,0);
-        eeprom_write_reg(priv,EEPROM_BIT_CS);
-        eeprom_write_reg(priv,EEPROM_BIT_CS|EEPROM_BIT_SK);
-        eeprom_write_reg(priv,EEPROM_BIT_CS);
+        eeprom_write_reg(priv, 0);
+        eeprom_write_reg(priv, EEPROM_BIT_CS);
+        eeprom_write_reg(priv, EEPROM_BIT_CS | EEPROM_BIT_SK);
+        eeprom_write_reg(priv, EEPROM_BIT_CS);
 }
 
 /* perform a chip select operation */
-static inline void eeprom_disable_cs(struct ipw_priv* priv)
+static inline void eeprom_disable_cs(struct ipw_priv *priv)
 {
-        eeprom_write_reg(priv,EEPROM_BIT_CS);
-        eeprom_write_reg(priv,0);
-        eeprom_write_reg(priv,EEPROM_BIT_SK);
+        eeprom_write_reg(priv, EEPROM_BIT_CS);
+        eeprom_write_reg(priv, 0);
+        eeprom_write_reg(priv, EEPROM_BIT_SK);
 }
 
 /* push a single bit down to the eeprom */
-static inline void eeprom_write_bit(struct ipw_priv *p,u8 bit)
+static inline void eeprom_write_bit(struct ipw_priv *p, u8 bit)
 {
-        int d = ( bit ? EEPROM_BIT_DI : 0);
-        eeprom_write_reg(p,EEPROM_BIT_CS|d);
-        eeprom_write_reg(p,EEPROM_BIT_CS|d|EEPROM_BIT_SK);
+        int d = (bit ? EEPROM_BIT_DI : 0);
+        eeprom_write_reg(p, EEPROM_BIT_CS | d);
+        eeprom_write_reg(p, EEPROM_BIT_CS | d | EEPROM_BIT_SK);
 }
 
 /* push an opcode followed by an address down to the eeprom */
-static void eeprom_op(struct ipw_priv* priv, u8 op, u8 addr)
+static void eeprom_op(struct ipw_priv *priv, u8 op, u8 addr)
 {
         int i;
 
         eeprom_cs(priv);
-        eeprom_write_bit(priv,1);
-        eeprom_write_bit(priv,op&2);
-        eeprom_write_bit(priv,op&1);
-        for ( i=7; i>=0; i-- ) {
-                eeprom_write_bit(priv,addr&(1<<i));
+        eeprom_write_bit(priv, 1);
+        eeprom_write_bit(priv, op & 2);
+        eeprom_write_bit(priv, op & 1);
+        for (i = 7; i >= 0; i--) {
+                eeprom_write_bit(priv, addr & (1 << i));
         }
 }
 
 /* pull 16 bits off the eeprom, one bit at a time */
-static u16 eeprom_read_u16(struct ipw_priv* priv, u8 addr)
+static u16 eeprom_read_u16(struct ipw_priv *priv, u8 addr)
 {
         int i;
-        u16 r=0;
+        u16 r = 0;
 
         /* Send READ Opcode */
-        eeprom_op(priv,EEPROM_CMD_READ,addr);
+        eeprom_op(priv, EEPROM_CMD_READ, addr);
 
         /* Send dummy bit */
-        eeprom_write_reg(priv,EEPROM_BIT_CS);
+        eeprom_write_reg(priv, EEPROM_BIT_CS);
 
         /* Read the byte off the eeprom one bit at a time */
-        for ( i=0; i<16; i++ ) {
+        for (i = 0; i < 16; i++) {
                 u32 data = 0;
-                eeprom_write_reg(priv,EEPROM_BIT_CS|EEPROM_BIT_SK);
-                eeprom_write_reg(priv,EEPROM_BIT_CS);
-                data = ipw_read_reg32(priv,FW_MEM_REG_EEPROM_ACCESS);
-                r = (r<<1) | ((data & EEPROM_BIT_DO)?1:0);
+                eeprom_write_reg(priv, EEPROM_BIT_CS | EEPROM_BIT_SK);
+                eeprom_write_reg(priv, EEPROM_BIT_CS);
+                data = ipw_read_reg32(priv, FW_MEM_REG_EEPROM_ACCESS);
+                r = (r << 1) | ((data & EEPROM_BIT_DO) ? 1 : 0);
         }
 
         /* Send another dummy bit */
-        eeprom_write_reg(priv,0);
+        eeprom_write_reg(priv, 0);
         eeprom_disable_cs(priv);
 
         return r;
@@ -1653,9 +1669,9 @@ static u16 eeprom_read_u16(struct ipw_priv* priv, u8 addr)
 
 /* helper function for pulling the mac address out of the private */
 /* data's copy of the eeprom data                                 */
-static void eeprom_parse_mac(struct ipw_priv* priv, u8* mac)
+static void eeprom_parse_mac(struct ipw_priv *priv, u8 * mac)
 {
-        u8* ee = (u8*)priv->eeprom;
+        u8 *ee = (u8 *) priv->eeprom;
         memcpy(mac, &ee[EEPROM_MAC_ADDRESS], 6);
 }
 
@@ -1670,26 +1686,25 @@ static void eeprom_parse_mac(struct ipw_priv* priv, u8* mac)
 static void ipw_eeprom_init_sram(struct ipw_priv *priv)
 {
         int i;
-        u16 *eeprom = (u16 *)priv->eeprom;
+        u16 *eeprom = (u16 *) priv->eeprom;
 
         IPW_DEBUG_TRACE(">>\n");
 
         /* read entire contents of eeprom into private buffer */
-        for ( i=0; i<128; i++ )
-                eeprom[i] = eeprom_read_u16(priv,(u8)i);
+        for (i = 0; i < 128; i++)
+                eeprom[i] = eeprom_read_u16(priv, (u8) i);
 
         /*
            If the data looks correct, then copy it to our private
            copy.  Otherwise let the firmware know to perform the operation
            on it's own
-        */
+         */
         if ((priv->eeprom + EEPROM_VERSION) != 0) {
                 IPW_DEBUG_INFO("Writing EEPROM data into SRAM\n");
 
                 /* write the eeprom data to sram */
-                for( i=0; i<CX2_EEPROM_IMAGE_SIZE; i++ )
-                        ipw_write8(priv, IPW_EEPROM_DATA + i,
-                                   priv->eeprom[i]);
+                for (i = 0; i < CX2_EEPROM_IMAGE_SIZE; i++)
+                        ipw_write8(priv, IPW_EEPROM_DATA + i, priv->eeprom[i]);
 
                 /* Do not load eeprom data on fatal error or suspend */
                 ipw_write32(priv, IPW_EEPROM_LOAD_DISABLE, 0);
@@ -1703,11 +1718,11 @@ static void ipw_eeprom_init_sram(struct ipw_priv *priv)
         IPW_DEBUG_TRACE("<<\n");
 }
 
-
 static inline void ipw_zero_memory(struct ipw_priv *priv, u32 start, u32 count)
 {
         count >>= 2;
-        if (!count) return;
+        if (!count)
+                return;
         _ipw_write32(priv, CX2_AUTOINC_ADDR, start);
         while (count--)
                 _ipw_write32(priv, CX2_AUTOINC_DATA, 0);
@@ -1721,7 +1736,7 @@ static inline void ipw_fw_dma_reset_command_blocks(struct ipw_priv *priv)
 }
 
 static int ipw_fw_dma_enable(struct ipw_priv *priv)
-{ /* start dma engine but no transfers yet*/
+{                               /* start dma engine but no transfers yet */
 
         IPW_DEBUG_FW(">> : \n");
 
@@ -1749,12 +1764,16 @@ static void ipw_fw_dma_abort(struct ipw_priv *priv)
         IPW_DEBUG_FW("<< \n");
 }
 
-static int ipw_fw_dma_write_command_block(struct ipw_priv *priv, int index, struct command_block *cb)
+static int ipw_fw_dma_write_command_block(struct ipw_priv *priv, int index,
+                                          struct command_block *cb)
 {
-        u32 address = CX2_SHARED_SRAM_DMA_CONTROL + (sizeof(struct command_block) * index);
+        u32 address =
+            CX2_SHARED_SRAM_DMA_CONTROL +
+            (sizeof(struct command_block) * index);
         IPW_DEBUG_FW(">> :\n");
 
-        ipw_write_indirect(priv, address, (u8*)cb, (int)sizeof(struct command_block));
+        ipw_write_indirect(priv, address, (u8 *) cb,
+                           (int)sizeof(struct command_block));
 
         IPW_DEBUG_FW("<< :\n");
         return 0;
@@ -1764,17 +1783,20 @@ static int ipw_fw_dma_write_command_block(struct ipw_priv *priv, int index, stru
 static int ipw_fw_dma_kick(struct ipw_priv *priv)
 {
         u32 control = 0;
-        u32 index=0;
+        u32 index = 0;
 
         IPW_DEBUG_FW(">> :\n");
 
         for (index = 0; index < priv->sram_desc.last_cb_index; index++)
-                ipw_fw_dma_write_command_block(priv, index, &priv->sram_desc.cb_list[index]);
+                ipw_fw_dma_write_command_block(priv, index,
+                                               &priv->sram_desc.cb_list[index]);
 
         /* Enable the DMA in the CSR register */
-        ipw_clear_bit(priv, CX2_RESET_REG,CX2_RESET_REG_MASTER_DISABLED | CX2_RESET_REG_STOP_MASTER);
+        ipw_clear_bit(priv, CX2_RESET_REG,
+                      CX2_RESET_REG_MASTER_DISABLED |
+                      CX2_RESET_REG_STOP_MASTER);
 
-        /* Set the Start bit. */
+        /* Set the Start bit. */
         control = DMA_CONTROL_SMALL_CB_CONST_VALUE | DMA_CB_START;
         ipw_write_reg32(priv, CX2_DMA_I_DMA_CONTROL, control);
 
@@ -1785,25 +1807,25 @@ static int ipw_fw_dma_kick(struct ipw_priv *priv)
 static void ipw_fw_dma_dump_command_block(struct ipw_priv *priv)
 {
         u32 address;
-        u32 register_value=0;
-        u32 cb_fields_address=0;
+        u32 register_value = 0;
+        u32 cb_fields_address = 0;
 
         IPW_DEBUG_FW(">> :\n");
-        address = ipw_read_reg32(priv,CX2_DMA_I_CURRENT_CB);
-        IPW_DEBUG_FW_INFO("Current CB is 0x%x \n",address);
+        address = ipw_read_reg32(priv, CX2_DMA_I_CURRENT_CB);
+        IPW_DEBUG_FW_INFO("Current CB is 0x%x \n", address);
 
         /* Read the DMA Controlor register */
         register_value = ipw_read_reg32(priv, CX2_DMA_I_DMA_CONTROL);
-        IPW_DEBUG_FW_INFO("CX2_DMA_I_DMA_CONTROL is 0x%x \n",register_value);
+        IPW_DEBUG_FW_INFO("CX2_DMA_I_DMA_CONTROL is 0x%x \n", register_value);
 
-        /* Print the CB values*/
+        /* Print the CB values */
         cb_fields_address = address;
         register_value = ipw_read_reg32(priv, cb_fields_address);
-        IPW_DEBUG_FW_INFO("Current CB ControlField is 0x%x \n",register_value);
+        IPW_DEBUG_FW_INFO("Current CB ControlField is 0x%x \n", register_value);
 
         cb_fields_address += sizeof(u32);
         register_value = ipw_read_reg32(priv, cb_fields_address);
-        IPW_DEBUG_FW_INFO("Current CB Source Field is 0x%x \n",register_value);
+        IPW_DEBUG_FW_INFO("Current CB Source Field is 0x%x \n", register_value);
 
         cb_fields_address += sizeof(u32);
         register_value = ipw_read_reg32(priv, cb_fields_address);
@@ -1812,7 +1834,7 @@ static void ipw_fw_dma_dump_command_block(struct ipw_priv *priv)
 
         cb_fields_address += sizeof(u32);
         register_value = ipw_read_reg32(priv, cb_fields_address);
-        IPW_DEBUG_FW_INFO("Current CB Status Field is 0x%x \n",register_value);
+        IPW_DEBUG_FW_INFO("Current CB Status Field is 0x%x \n", register_value);
 
         IPW_DEBUG_FW(">> :\n");
 }
@@ -1823,13 +1845,13 @@ static int ipw_fw_dma_command_block_index(struct ipw_priv *priv)
         u32 current_cb_index = 0;
 
         IPW_DEBUG_FW("<< :\n");
-        current_cb_address= ipw_read_reg32(priv, CX2_DMA_I_CURRENT_CB);
+        current_cb_address = ipw_read_reg32(priv, CX2_DMA_I_CURRENT_CB);
 
-        current_cb_index = (current_cb_address - CX2_SHARED_SRAM_DMA_CONTROL )/
-                sizeof (struct command_block);
+        current_cb_index = (current_cb_address - CX2_SHARED_SRAM_DMA_CONTROL) /
+            sizeof(struct command_block);
 
         IPW_DEBUG_FW_INFO("Current CB index 0x%x address = 0x%X \n",
-                          current_cb_index, current_cb_address );
+                          current_cb_index, current_cb_address);
 
         IPW_DEBUG_FW(">> :\n");
         return current_cb_index;
@@ -1840,15 +1862,14 @@ static int ipw_fw_dma_add_command_block(struct ipw_priv *priv,
                                         u32 src_address,
                                         u32 dest_address,
                                         u32 length,
-                                        int interrupt_enabled,
-                                        int is_last)
+                                        int interrupt_enabled, int is_last)
 {
 
         u32 control = CB_VALID | CB_SRC_LE | CB_DEST_LE | CB_SRC_AUTOINC |
-                CB_SRC_IO_GATED | CB_DEST_AUTOINC | CB_SRC_SIZE_LONG |
-                CB_DEST_SIZE_LONG;
+            CB_SRC_IO_GATED | CB_DEST_AUTOINC | CB_SRC_SIZE_LONG |
+            CB_DEST_SIZE_LONG;
         struct command_block *cb;
-        u32 last_cb_element=0;
+        u32 last_cb_element = 0;
 
         IPW_DEBUG_FW_INFO("src_address=0x%x dest_address=0x%x length=0x%x\n",
                           src_address, dest_address, length);
@@ -1861,7 +1882,7 @@ static int ipw_fw_dma_add_command_block(struct ipw_priv *priv,
         priv->sram_desc.last_cb_index++;
 
         /* Calculate the new CB control word */
-        if (interrupt_enabled )
+        if (interrupt_enabled)
                 control |= CB_INT_ENABLED;
 
         if (is_last)
@@ -1870,7 +1891,7 @@ static int ipw_fw_dma_add_command_block(struct ipw_priv *priv,
         control |= length;
 
         /* Calculate the CB Element's checksum value */
-        cb->status = control ^src_address ^dest_address;
+        cb->status = control ^ src_address ^ dest_address;
 
         /* Copy the Source and Destination addresses */
         cb->dest_addr = dest_address;
@@ -1883,22 +1904,21 @@ static int ipw_fw_dma_add_command_block(struct ipw_priv *priv,
 }
 
 static int ipw_fw_dma_add_buffer(struct ipw_priv *priv,
-                                 u32 src_phys,
-                                 u32 dest_address,
-                                 u32 length)
+                                 u32 src_phys, u32 dest_address, u32 length)
 {
         u32 bytes_left = length;
-        u32 src_offset=0;
-        u32 dest_offset=0;
+        u32 src_offset = 0;
+        u32 dest_offset = 0;
         int status = 0;
         IPW_DEBUG_FW(">> \n");
         IPW_DEBUG_FW_INFO("src_phys=0x%x dest_address=0x%x length=0x%x\n",
                           src_phys, dest_address, length);
         while (bytes_left > CB_MAX_LENGTH) {
-                status = ipw_fw_dma_add_command_block( priv,
-                                                       src_phys + src_offset,
-                                                       dest_address + dest_offset,
-                                                       CB_MAX_LENGTH, 0, 0);
+                status = ipw_fw_dma_add_command_block(priv,
+                                                      src_phys + src_offset,
+                                                      dest_address +
+                                                      dest_offset,
+                                                      CB_MAX_LENGTH, 0, 0);
                 if (status) {
                         IPW_DEBUG_FW_INFO(": Failed\n");
                         return -1;
@@ -1912,18 +1932,18 @@ static int ipw_fw_dma_add_buffer(struct ipw_priv *priv,
 
         /* add the buffer tail */
         if (bytes_left > 0) {
-                status = ipw_fw_dma_add_command_block(
-                        priv, src_phys + src_offset,
-                        dest_address + dest_offset,
-                        bytes_left, 0, 0);
+                status =
+                    ipw_fw_dma_add_command_block(priv, src_phys + src_offset,
+                                                 dest_address + dest_offset,
+                                                 bytes_left, 0, 0);
                 if (status) {
                         IPW_DEBUG_FW_INFO(": Failed on the buffer tail\n");
                         return -1;
                 } else
-                        IPW_DEBUG_FW_INFO(": Adding new cb - the buffer tail\n");
+                        IPW_DEBUG_FW_INFO
+                            (": Adding new cb - the buffer tail\n");
         }
 
-
         IPW_DEBUG_FW("<< \n");
         return 0;
 }
@@ -1937,7 +1957,7 @@ static int ipw_fw_dma_wait(struct ipw_priv *priv)
 
         current_index = ipw_fw_dma_command_block_index(priv);
         IPW_DEBUG_FW_INFO("sram_desc.last_cb_index:0x%8X\n",
-                          (int) priv->sram_desc.last_cb_index);
+                          (int)priv->sram_desc.last_cb_index);
 
         while (current_index < priv->sram_desc.last_cb_index) {
                 udelay(50);
@@ -1955,8 +1975,8 @@ static int ipw_fw_dma_wait(struct ipw_priv *priv)
 
         ipw_fw_dma_abort(priv);
 
-        /*Disable the DMA in the CSR register*/
-        ipw_set_bit(priv, CX2_RESET_REG,
+        /*Disable the DMA in the CSR register */
+        ipw_set_bit(priv, CX2_RESET_REG,
                     CX2_RESET_REG_MASTER_DISABLED | CX2_RESET_REG_STOP_MASTER);
 
         IPW_DEBUG_FW("<< dmaWaitSync \n");
@@ -2011,8 +2031,7 @@ static inline int ipw_poll_bit(struct ipw_priv *priv, u32 addr, u32 mask,
  * image and the caller is handling the memory allocation and clean up.
  */
 
-
-static int ipw_stop_master(struct ipw_priv * priv)
+static int ipw_stop_master(struct ipw_priv *priv)
 {
         int rc;
 
@@ -2071,14 +2090,13 @@ struct fw_chunk {
 #define IPW_FW_NAME(x) "ipw2200_" x ".fw"
 #endif
 
-static int ipw_load_ucode(struct ipw_priv *priv, u8 * data,
-                          size_t len)
+static int ipw_load_ucode(struct ipw_priv *priv, u8 * data, size_t len)
 {
         int rc = 0, i, addr;
         u8 cr = 0;
         u16 *image;
 
-        image = (u16 *)data;
+        image = (u16 *) data;
 
         IPW_DEBUG_TRACE(">> \n");
 
@@ -2087,7 +2105,7 @@ static int ipw_load_ucode(struct ipw_priv *priv, u8 * data,
         if (rc < 0)
                 return rc;
 
-//      spin_lock_irqsave(&priv->lock, flags);
+//      spin_lock_irqsave(&priv->lock, flags);
 
         for (addr = CX2_SHARED_LOWER_BOUND;
              addr < CX2_REGISTER_DOMAIN1_END; addr += 4) {
@@ -2099,7 +2117,7 @@ static int ipw_load_ucode(struct ipw_priv *priv, u8 * data,
         /* destroy DMA queues */
         /* reset sequence */
 
-        ipw_write_reg32(priv, CX2_MEM_HALT_AND_RESET ,CX2_BIT_HALT_RESET_ON);
+        ipw_write_reg32(priv, CX2_MEM_HALT_AND_RESET, CX2_BIT_HALT_RESET_ON);
         ipw_arc_release(priv);
         ipw_write_reg32(priv, CX2_MEM_HALT_AND_RESET, CX2_BIT_HALT_RESET_OFF);
         mdelay(1);
@@ -2128,13 +2146,11 @@ static int ipw_load_ucode(struct ipw_priv *priv, u8 * data,
         for (i = 0; i < len / 2; i++)
                 ipw_write_reg16(priv, CX2_BASEBAND_CONTROL_STORE, image[i]);
 
-
         /* enable DINO */
         ipw_write_reg8(priv, CX2_BASEBAND_CONTROL_STATUS, 0);
-        ipw_write_reg8(priv, CX2_BASEBAND_CONTROL_STATUS,
-                       DINO_ENABLE_SYSTEM );
+        ipw_write_reg8(priv, CX2_BASEBAND_CONTROL_STATUS, DINO_ENABLE_SYSTEM);
 
-        /* this is where the igx / win driver deveates from the VAP driver.*/
+        /* this is where the igx / win driver deveates from the VAP driver. */
 
         /* wait for alive response */
         for (i = 0; i < 100; i++) {
@@ -2151,25 +2167,24 @@ static int ipw_load_ucode(struct ipw_priv *priv, u8 * data,
 
                 for (i = 0; i < ARRAY_SIZE(response_buffer); i++)
                         response_buffer[i] =
-                                ipw_read_reg32(priv,
-                                               CX2_BASEBAND_RX_FIFO_READ);
+                            ipw_read_reg32(priv, CX2_BASEBAND_RX_FIFO_READ);
                 memcpy(&priv->dino_alive, response_buffer,
                        sizeof(priv->dino_alive));
                 if (priv->dino_alive.alive_command == 1
                     && priv->dino_alive.ucode_valid == 1) {
                         rc = 0;
-                        IPW_DEBUG_INFO(
-                                "Microcode OK, rev. %d (0x%x) dev. %d (0x%x) "
-                                "of %02d/%02d/%02d %02d:%02d\n",
-                                priv->dino_alive.software_revision,
-                                priv->dino_alive.software_revision,
-                                priv->dino_alive.device_identifier,
-                                priv->dino_alive.device_identifier,
-                                priv->dino_alive.time_stamp[0],
-                                priv->dino_alive.time_stamp[1],
-                                priv->dino_alive.time_stamp[2],
-                                priv->dino_alive.time_stamp[3],
-                                priv->dino_alive.time_stamp[4]);
+                        IPW_DEBUG_INFO
+                            ("Microcode OK, rev. %d (0x%x) dev. %d (0x%x) "
+                             "of %02d/%02d/%02d %02d:%02d\n",
+                             priv->dino_alive.software_revision,
+                             priv->dino_alive.software_revision,
+                             priv->dino_alive.device_identifier,
+                             priv->dino_alive.device_identifier,
+                             priv->dino_alive.time_stamp[0],
+                             priv->dino_alive.time_stamp[1],
+                             priv->dino_alive.time_stamp[2],
+                             priv->dino_alive.time_stamp[3],
+                             priv->dino_alive.time_stamp[4]);
                 } else {
                         IPW_DEBUG_INFO("Microcode is not alive\n");
                         rc = -EINVAL;
@@ -2183,13 +2198,12 @@ static int ipw_load_ucode(struct ipw_priv *priv, u8 * data,
            firmware have problem getting alive resp. */
         ipw_write_reg8(priv, CX2_BASEBAND_CONTROL_STATUS, 0);
 
-//      spin_unlock_irqrestore(&priv->lock, flags);
+//      spin_unlock_irqrestore(&priv->lock, flags);
 
         return rc;
 }
 
-static int ipw_load_firmware(struct ipw_priv *priv, u8 * data,
-                             size_t len)
+static int ipw_load_firmware(struct ipw_priv *priv, u8 * data, size_t len)
 {
         int rc = -1;
         int offset = 0;
@@ -2231,7 +2245,7 @@ static int ipw_load_firmware(struct ipw_priv *priv, u8 * data,
                 offset += chunk->length;
         } while (offset < len);
 
-        /* Run the DMA and wait for the answer*/
+        /* Run the DMA and wait for the answer */
         rc = ipw_fw_dma_kick(priv);
         if (rc) {
                 IPW_ERROR("dmaKick Failed\n");
@@ -2243,8 +2257,8 @@ static int ipw_load_firmware(struct ipw_priv *priv, u8 * data,
                 IPW_ERROR("dmaWaitSync Failed\n");
                 goto out;
         }
- out:
-        pci_free_consistent( priv->pci_dev, len, shared_virt, shared_phys);
+      out:
+        pci_free_consistent(priv->pci_dev, len, shared_virt, shared_phys);
         return rc;
 }
 
@@ -2253,7 +2267,7 @@ static int ipw_stop_nic(struct ipw_priv *priv)
 {
         int rc = 0;
 
-        /* stop*/
+        /* stop */
         ipw_write32(priv, CX2_RESET_REG, CX2_RESET_REG_STOP_MASTER);
 
         rc = ipw_poll_bit(priv, CX2_RESET_REG,
@@ -2272,14 +2286,15 @@ static void ipw_start_nic(struct ipw_priv *priv)
 {
         IPW_DEBUG_TRACE(">>\n");
 
-        /* prvHwStartNic  release ARC*/
+        /* prvHwStartNic  release ARC */
         ipw_clear_bit(priv, CX2_RESET_REG,
                       CX2_RESET_REG_MASTER_DISABLED |
                       CX2_RESET_REG_STOP_MASTER |
                       CBD_RESET_REG_PRINCETON_RESET);
 
         /* enable power management */
-        ipw_set_bit(priv, CX2_GP_CNTRL_RW, CX2_GP_CNTRL_BIT_HOST_ALLOWS_STANDBY);
+        ipw_set_bit(priv, CX2_GP_CNTRL_RW,
+                    CX2_GP_CNTRL_BIT_HOST_ALLOWS_STANDBY);
 
         IPW_DEBUG_TRACE("<<\n");
 }
@@ -2295,12 +2310,13 @@ static int ipw_init_nic(struct ipw_priv *priv)
         ipw_set_bit(priv, CX2_GP_CNTRL_RW, CX2_GP_CNTRL_BIT_INIT_DONE);
 
         /* low-level PLL activation */
-        ipw_write32(priv, CX2_READ_INT_REGISTER,  CX2_BIT_INT_HOST_SRAM_READ_INT_REGISTER);
+        ipw_write32(priv, CX2_READ_INT_REGISTER,
+                    CX2_BIT_INT_HOST_SRAM_READ_INT_REGISTER);
 
         /* wait for clock stabilization */
         rc = ipw_poll_bit(priv, CX2_GP_CNTRL_RW,
                           CX2_GP_CNTRL_BIT_CLOCK_READY, 250);
-        if (rc < 0 )
+        if (rc < 0)
                 IPW_DEBUG_INFO("FAILED wait for clock stablization\n");
 
         /* assert SW reset */
@@ -2315,7 +2331,6 @@ static int ipw_init_nic(struct ipw_priv *priv)
         return 0;
 }
 
-
 /* Call this function from process context, it will sleep in request_firmware.
  * Probe is an ok place to call this from.
  */
@@ -2383,8 +2398,7 @@ static inline void ipw_rx_queue_reset(struct ipw_priv *priv,
                  * to an SKB, so we need to unmap and free potential storage */
                 if (rxq->pool[i].skb != NULL) {
                         pci_unmap_single(priv->pci_dev, rxq->pool[i].dma_addr,
-                                         CX2_RX_BUF_SIZE,
-                                         PCI_DMA_FROMDEVICE);
+                                         CX2_RX_BUF_SIZE, PCI_DMA_FROMDEVICE);
                         dev_kfree_skb(rxq->pool[i].skb);
                 }
                 list_add_tail(&rxq->pool[i].list, &rxq->rx_used);
@@ -2438,12 +2452,12 @@ static int ipw_load(struct ipw_priv *priv)
                         if (rc)
                                 goto error;
 
-                        rc = ipw_get_fw(priv, &firmware, IPW_FW_NAME("sniffer"));
+                        rc = ipw_get_fw(priv, &firmware,
+                                        IPW_FW_NAME("sniffer"));
                         break;
 #endif
                 case IW_MODE_INFRA:
-                        rc = ipw_get_fw(priv, &ucode,
-                                        IPW_FW_NAME("bss_ucode"));
+                        rc = ipw_get_fw(priv, &ucode, IPW_FW_NAME("bss_ucode"));
                         if (rc)
                                 goto error;
 
@@ -2471,7 +2485,7 @@ static int ipw_load(struct ipw_priv *priv)
                 goto error;
         }
 
- retry:
+      retry:
         /* Ensure interrupts are disabled */
         ipw_write32(priv, CX2_INTA_MASK_R, ~CX2_INTA_MASK_ALL);
         priv->status &= ~STATUS_INT_ENABLED;
@@ -2528,7 +2542,7 @@ static int ipw_load(struct ipw_priv *priv)
         rc = ipw_load_firmware(priv, firmware->data +
                                sizeof(struct fw_header),
                                firmware->size - sizeof(struct fw_header));
-        if (rc < 0 ) {
+        if (rc < 0) {
                 IPW_ERROR("Unable to load firmware\n");
                 goto error;
         }
@@ -2593,7 +2607,7 @@ static int ipw_load(struct ipw_priv *priv)
 #endif
         return 0;
 
- error:
+      error:
         if (priv->rxq) {
                 ipw_rx_queue_free(priv, priv->rxq);
                 priv->rxq = NULL;
@@ -2671,8 +2685,7 @@ static inline int ipw_queue_inc_wrap(int index, int n_bd)
  *                         (not offset within BAR, full address)
  */
 static void ipw_queue_init(struct ipw_priv *priv, struct clx2_queue *q,
-                           int count, u32 read, u32 write,
-                           u32 base, u32 size)
+                           int count, u32 read, u32 write, u32 base, u32 size)
 {
         q->n_bd = count;
 
@@ -2698,8 +2711,7 @@ static void ipw_queue_init(struct ipw_priv *priv, struct clx2_queue *q,
 
 static int ipw_queue_tx_init(struct ipw_priv *priv,
                              struct clx2_tx_queue *q,
-                             int count, u32 read, u32 write,
-                             u32 base, u32 size)
+                             int count, u32 read, u32 write, u32 base, u32 size)
 {
         struct pci_dev *dev = priv->pci_dev;
 
@@ -2709,10 +2721,11 @@ static int ipw_queue_tx_init(struct ipw_priv *priv,
                 return -ENOMEM;
         }
 
-        q->bd = pci_alloc_consistent(dev,sizeof(q->bd[0])*count, &q->q.dma_addr);
+        q->bd =
+            pci_alloc_consistent(dev, sizeof(q->bd[0]) * count, &q->q.dma_addr);
         if (!q->bd) {
                 IPW_ERROR("pci_alloc_consistent(%zd) failed\n",
-                                sizeof(q->bd[0]) * count);
+                          sizeof(q->bd[0]) * count);
                 kfree(q->txb);
                 q->txb = NULL;
                 return -ENOMEM;
@@ -2768,8 +2781,7 @@ static void ipw_queue_tx_free_tfd(struct ipw_priv *priv,
  * @param dev
  * @param q
  */
-static void ipw_queue_tx_free(struct ipw_priv *priv,
-                            struct clx2_tx_queue *txq)
+static void ipw_queue_tx_free(struct ipw_priv *priv, struct clx2_tx_queue *txq)
 {
         struct clx2_queue *q = &txq->q;
         struct pci_dev *dev = priv->pci_dev;
@@ -2784,7 +2796,7 @@ static void ipw_queue_tx_free(struct ipw_priv *priv,
         }
 
         /* free buffers belonging to queue itself */
-        pci_free_consistent(dev, sizeof(txq->bd[0])*q->n_bd, txq->bd,
+        pci_free_consistent(dev, sizeof(txq->bd[0]) * q->n_bd, txq->bd,
                             q->dma_addr);
         kfree(txq->txb);
 
@@ -2792,7 +2804,6 @@ static void ipw_queue_tx_free(struct ipw_priv *priv,
         memset(txq, 0, sizeof(*txq));
 }
 
-
 /**
  * Destroy all DMA queues and structures
  *
@@ -2825,7 +2836,7 @@ static void inline __maybe_wake_tx(struct ipw_priv *priv)
 
 }
 
-static inline void ipw_create_bssid(struct ipw_priv *priv, u8 *bssid)
+static inline void ipw_create_bssid(struct ipw_priv *priv, u8 * bssid)
 {
         /* First 3 bytes are manufacturer */
         bssid[0] = priv->mac_addr[0];
@@ -2833,13 +2844,13 @@ static inline void ipw_create_bssid(struct ipw_priv *priv, u8 *bssid)
         bssid[2] = priv->mac_addr[2];
 
         /* Last bytes are random */
-        get_random_bytes(&bssid[3], ETH_ALEN-3);
+        get_random_bytes(&bssid[3], ETH_ALEN - 3);
 
-        bssid[0] &= 0xfe;       /* clear multicast bit */
-        bssid[0] |= 0x02;       /* set local assignment bit (IEEE802) */
+        bssid[0] &= 0xfe;       /* clear multicast bit */
+        bssid[0] |= 0x02;       /* set local assignment bit (IEEE802) */
 }
 
-static inline u8 ipw_add_station(struct ipw_priv *priv, u8 *bssid)
+static inline u8 ipw_add_station(struct ipw_priv *priv, u8 * bssid)
 {
         struct ipw_station_entry entry;
         int i;
@@ -2866,14 +2877,13 @@ static inline u8 ipw_add_station(struct ipw_priv *priv, u8 *bssid)
         memcpy(entry.mac_addr, bssid, ETH_ALEN);
         memcpy(priv->stations[i], bssid, ETH_ALEN);
         ipw_write_direct(priv, IPW_STATION_TABLE_LOWER + i * sizeof(entry),
-                         &entry,
-                         sizeof(entry));
+                         &entry, sizeof(entry));
         priv->num_stations++;
 
         return i;
 }
 
-static inline u8 ipw_find_station(struct ipw_priv *priv, u8 *bssid)
+static inline u8 ipw_find_station(struct ipw_priv *priv, u8 * bssid)
 {
         int i;
 
@@ -2944,26 +2954,34 @@ static const struct ipw_status_code ipw_status_codes[] = {
          "association exists"},
         {0x0C, "Association denied due to reason outside the scope of this "
          "standard"},
-        {0x0D, "Responding station does not support the specified authentication "
+        {0x0D,
+         "Responding station does not support the specified authentication "
          "algorithm"},
-        {0x0E, "Received an Authentication frame with authentication sequence "
+        {0x0E,
+         "Received an Authentication frame with authentication sequence "
          "transaction sequence number out of expected sequence"},
         {0x0F, "Authentication rejected because of challenge failure"},
         {0x10, "Authentication rejected due to timeout waiting for next "
          "frame in sequence"},
         {0x11, "Association denied because AP is unable to handle additional "
          "associated stations"},
-        {0x12, "Association denied due to requesting station not supporting all "
+        {0x12,
+         "Association denied due to requesting station not supporting all "
          "of the datarates in the BSSBasicServiceSet Parameter"},
-        {0x13, "Association denied due to requesting station not supporting "
+        {0x13,
+         "Association denied due to requesting station not supporting "
          "short preamble operation"},
-        {0x14, "Association denied due to requesting station not supporting "
+        {0x14,
+         "Association denied due to requesting station not supporting "
          "PBCC encoding"},
-        {0x15, "Association denied due to requesting station not supporting "
+        {0x15,
+         "Association denied due to requesting station not supporting "
          "channel agility"},
-        {0x19, "Association denied due to requesting station not supporting "
+        {0x19,
+         "Association denied due to requesting station not supporting "
          "short slot operation"},
-        {0x1A, "Association denied due to requesting station not supporting "
+        {0x1A,
+         "Association denied due to requesting station not supporting "
          "DSSS-OFDM operation"},
         {0x28, "Invalid Information Element"},
         {0x29, "Group Cipher is not valid"},
@@ -3043,7 +3061,6 @@ static void ipw_reset_stats(struct ipw_priv *priv)
 
 }
 
-
 static inline u32 ipw_get_max_rate(struct ipw_priv *priv)
 {
         u32 i = 0x80000000;
@@ -3056,20 +3073,21 @@ static inline u32 ipw_get_max_rate(struct ipw_priv *priv)
         /* TODO: Verify that the rate is supported by the current rates
          * list. */
 
-        while (i && !(mask & i)) i >>= 1;
+        while (i && !(mask & i))
+                i >>= 1;
         switch (i) {
-        case IEEE80211_CCK_RATE_1MB_MASK: return 1000000;
-        case IEEE80211_CCK_RATE_2MB_MASK: return 2000000;
-        case IEEE80211_CCK_RATE_5MB_MASK: return 5500000;
-        case IEEE80211_OFDM_RATE_6MB_MASK: return 6000000;
-        case IEEE80211_OFDM_RATE_9MB_MASK: return 9000000;
-        case IEEE80211_CCK_RATE_11MB_MASK: return 11000000;
-        case IEEE80211_OFDM_RATE_12MB_MASK: return 12000000;
-        case IEEE80211_OFDM_RATE_18MB_MASK: return 18000000;
-        case IEEE80211_OFDM_RATE_24MB_MASK: return 24000000;
-        case IEEE80211_OFDM_RATE_36MB_MASK: return 36000000;
-        case IEEE80211_OFDM_RATE_48MB_MASK: return 48000000;
-        case IEEE80211_OFDM_RATE_54MB_MASK: return 54000000;
+        case IEEE80211_CCK_RATE_1MB_MASK:       return 1000000;
+        case IEEE80211_CCK_RATE_2MB_MASK:       return 2000000;
+        case IEEE80211_CCK_RATE_5MB_MASK:       return 5500000;
+        case IEEE80211_OFDM_RATE_6MB_MASK:      return 6000000;
+        case IEEE80211_OFDM_RATE_9MB_MASK:      return 9000000;
+        case IEEE80211_CCK_RATE_11MB_MASK:      return 11000000;
+        case IEEE80211_OFDM_RATE_12MB_MASK:     return 12000000;
+        case IEEE80211_OFDM_RATE_18MB_MASK:     return 18000000;
+        case IEEE80211_OFDM_RATE_24MB_MASK:     return 24000000;
+        case IEEE80211_OFDM_RATE_36MB_MASK:     return 36000000;
+        case IEEE80211_OFDM_RATE_48MB_MASK:     return 48000000;
+        case IEEE80211_OFDM_RATE_54MB_MASK:     return 54000000;
         }
 
         if (priv->ieee->mode == IEEE_B)
@@ -3097,18 +3115,18 @@ static u32 ipw_get_current_rate(struct ipw_priv *priv)
                 return ipw_get_max_rate(priv);
 
         switch (rate) {
-        case IPW_TX_RATE_1MB:  return  1000000;
-        case IPW_TX_RATE_2MB:  return  2000000;
-        case IPW_TX_RATE_5MB:  return  5500000;
-        case IPW_TX_RATE_6MB:  return  6000000;
-        case IPW_TX_RATE_9MB:  return  9000000;
-        case IPW_TX_RATE_11MB: return 11000000;
-        case IPW_TX_RATE_12MB: return 12000000;
-        case IPW_TX_RATE_18MB: return 18000000;
-        case IPW_TX_RATE_24MB: return 24000000;
-        case IPW_TX_RATE_36MB: return 36000000;
-        case IPW_TX_RATE_48MB: return 48000000;
-        case IPW_TX_RATE_54MB: return 54000000;
+        case IPW_TX_RATE_1MB:   return 1000000;
+        case IPW_TX_RATE_2MB:   return 2000000;
+        case IPW_TX_RATE_5MB:   return 5500000;
+        case IPW_TX_RATE_6MB:   return 6000000;
+        case IPW_TX_RATE_9MB:   return 9000000;
+        case IPW_TX_RATE_11MB:  return 11000000;
+        case IPW_TX_RATE_12MB:  return 12000000;
+        case IPW_TX_RATE_18MB:  return 18000000;
+        case IPW_TX_RATE_24MB:  return 24000000;
+        case IPW_TX_RATE_36MB:  return 36000000;
+        case IPW_TX_RATE_48MB:  return 48000000;
+        case IPW_TX_RATE_54MB:  return 54000000;
         }
 
         return 0;
@@ -3126,7 +3144,7 @@ static void ipw_gather_stats(struct ipw_priv *priv)
         u32 len = sizeof(u32);
         s16 rssi;
         u32 beacon_quality, signal_quality, tx_quality, rx_quality,
-                rate_quality;
+            rate_quality;
 
         if (!(priv->status & STATUS_ASSOCIATED)) {
                 priv->quality = 0;
@@ -3136,13 +3154,12 @@ static void ipw_gather_stats(struct ipw_priv *priv)
         /* Update the statistics */
         ipw_get_ordinal(priv, IPW_ORD_STAT_MISSED_BEACONS,
                         &priv->missed_beacons, &len);
-        missed_beacons_delta = priv->missed_beacons -
-                priv->last_missed_beacons;
+        missed_beacons_delta = priv->missed_beacons - priv->last_missed_beacons;
         priv->last_missed_beacons = priv->missed_beacons;
         if (priv->assoc_request.beacon_interval) {
                 missed_beacons_percent = missed_beacons_delta *
-                        (HZ * priv->assoc_request.beacon_interval) /
-                        (IPW_STATS_INTERVAL * 10);
+                    (HZ * priv->assoc_request.beacon_interval) /
+                    (IPW_STATS_INTERVAL * 10);
         } else {
                 missed_beacons_percent = 0;
         }
@@ -3179,28 +3196,26 @@ static void ipw_gather_stats(struct ipw_priv *priv)
                 beacon_quality = 0;
         else
                 beacon_quality = (beacon_quality - BEACON_THRESHOLD) * 100 /
-                        (100 - BEACON_THRESHOLD);
+                    (100 - BEACON_THRESHOLD);
         IPW_DEBUG_STATS("Missed beacon: %3d%% (%d%%)\n",
                         beacon_quality, missed_beacons_percent);
 
         priv->last_rate = ipw_get_current_rate(priv);
-        rate_quality =  priv->last_rate * 40 / priv->last_rate + 60;
+        rate_quality = priv->last_rate * 40 / priv->last_rate + 60;
         IPW_DEBUG_STATS("Rate quality : %3d%% (%dMbs)\n",
                         rate_quality, priv->last_rate / 1000000);
 
-        if (rx_packets_delta > 100 &&
-            rx_packets_delta + rx_err_delta)
+        if (rx_packets_delta > 100 && rx_packets_delta + rx_err_delta)
                 rx_quality = 100 - (rx_err_delta * 100) /
-                        (rx_packets_delta + rx_err_delta);
+                    (rx_packets_delta + rx_err_delta);
         else
                 rx_quality = 100;
         IPW_DEBUG_STATS("Rx quality   : %3d%% (%u errors, %u packets)\n",
                         rx_quality, rx_err_delta, rx_packets_delta);
 
-        if (tx_packets_delta > 100 &&
-            tx_packets_delta + tx_failures_delta)
+        if (tx_packets_delta > 100 && tx_packets_delta + tx_failures_delta)
                 tx_quality = 100 - (tx_failures_delta * 100) /
-                        (tx_packets_delta + tx_failures_delta);
+                    (tx_packets_delta + tx_failures_delta);
         else
                 tx_quality = 100;
         IPW_DEBUG_STATS("Tx quality   : %3d%% (%u errors, %u packets)\n",
@@ -3213,7 +3228,7 @@ static void ipw_gather_stats(struct ipw_priv *priv)
                 signal_quality = 0;
         else
                 signal_quality = (rssi - WORST_RSSI) * 100 /
-                        (PERFECT_RSSI - WORST_RSSI);
+                    (PERFECT_RSSI - WORST_RSSI);
         IPW_DEBUG_STATS("Signal level : %3d%% (%d dBm)\n",
                         signal_quality, rssi);
 
@@ -3221,25 +3236,20 @@ static void ipw_gather_stats(struct ipw_priv *priv)
                       min(rate_quality,
                           min(tx_quality, min(rx_quality, signal_quality))));
         if (quality == beacon_quality)
-                IPW_DEBUG_STATS(
-                        "Quality (%d%%): Clamped to missed beacons.\n",
-                        quality);
+                IPW_DEBUG_STATS("Quality (%d%%): Clamped to missed beacons.\n",
+                                quality);
         if (quality == rate_quality)
-                IPW_DEBUG_STATS(
-                        "Quality (%d%%): Clamped to rate quality.\n",
-                        quality);
+                IPW_DEBUG_STATS("Quality (%d%%): Clamped to rate quality.\n",
+                                quality);
         if (quality == tx_quality)
-                IPW_DEBUG_STATS(
-                        "Quality (%d%%): Clamped to Tx quality.\n",
-                        quality);
+                IPW_DEBUG_STATS("Quality (%d%%): Clamped to Tx quality.\n",
+                                quality);
         if (quality == rx_quality)
-                IPW_DEBUG_STATS(
-                        "Quality (%d%%): Clamped to Rx quality.\n",
-                        quality);
+                IPW_DEBUG_STATS("Quality (%d%%): Clamped to Rx quality.\n",
+                                quality);
         if (quality == signal_quality)
-                IPW_DEBUG_STATS(
-                        "Quality (%d%%): Clamped to signal quality.\n",
-                        quality);
+                IPW_DEBUG_STATS("Quality (%d%%): Clamped to signal quality.\n",
+                                quality);
 
         priv->quality = quality;
 
@@ -3251,402 +3261,454 @@ static void ipw_gather_stats(struct ipw_priv *priv)
  * Handle host notification packet.
  * Called from interrupt routine
  */
-static inline void ipw_rx_notification(struct ipw_priv* priv,
+static inline void ipw_rx_notification(struct ipw_priv *priv,
                                        struct ipw_rx_notification *notif)
 {
-        IPW_DEBUG_NOTIF("type = %i (%d bytes)\n",
-                        notif->subtype, notif->size);
+        IPW_DEBUG_NOTIF("type = %i (%d bytes)\n", notif->subtype, notif->size);
 
         switch (notif->subtype) {
-        case HOST_NOTIFICATION_STATUS_ASSOCIATED: {
-                struct notif_association *assoc = &notif->u.assoc;
-
-                switch (assoc->state) {
-                case CMAS_ASSOCIATED: {
-                        IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE | IPW_DL_ASSOC,
-                                  "associated: '%s' " MAC_FMT " \n",
-                                  escape_essid(priv->essid, priv->essid_len),
-                                  MAC_ARG(priv->bssid));
-
-                        switch (priv->ieee->iw_mode) {
-                        case IW_MODE_INFRA:
-                                memcpy(priv->ieee->bssid, priv->bssid,
-                                       ETH_ALEN);
-                                break;
-
-                        case IW_MODE_ADHOC:
-                                memcpy(priv->ieee->bssid, priv->bssid,
-                                       ETH_ALEN);
-
-                                /* clear out the station table */
-                                priv->num_stations = 0;
-
-                                IPW_DEBUG_ASSOC("queueing adhoc check\n");
-                                queue_delayed_work(priv->workqueue,
-                                                   &priv->adhoc_check,
-                                                   priv->assoc_request.beacon_interval);
-                                break;
-                        }
-
-                        priv->status &= ~STATUS_ASSOCIATING;
-                        priv->status |= STATUS_ASSOCIATED;
-
-                        netif_carrier_on(priv->net_dev);
-                        if (netif_queue_stopped(priv->net_dev)) {
-                                IPW_DEBUG_NOTIF("waking queue\n");
-                                netif_wake_queue(priv->net_dev);
-                        } else {
-                                IPW_DEBUG_NOTIF("starting queue\n");
-                                netif_start_queue(priv->net_dev);
-                        }
-
-                        ipw_reset_stats(priv);
-                        /* Ensure the rate is updated immediately */
-                        priv->last_rate = ipw_get_current_rate(priv);
-                        schedule_work(&priv->gather_stats);
-                        notify_wx_assoc_event(priv);
+        case HOST_NOTIFICATION_STATUS_ASSOCIATED:{
+                        struct notif_association *assoc = &notif->u.assoc;
+
+                        switch (assoc->state) {
+                        case CMAS_ASSOCIATED:{
+                                        IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE |
+                                                  IPW_DL_ASSOC,
+                                                  "associated: '%s' " MAC_FMT
+                                                  " \n",
+                                                  escape_essid(priv->essid,
+                                                               priv->essid_len),
+                                                  MAC_ARG(priv->bssid));
+
+                                        switch (priv->ieee->iw_mode) {
+                                        case IW_MODE_INFRA:
+                                                memcpy(priv->ieee->bssid,
+                                                       priv->bssid, ETH_ALEN);
+                                                break;
+
+                                        case IW_MODE_ADHOC:
+                                                memcpy(priv->ieee->bssid,
+                                                       priv->bssid, ETH_ALEN);
+
+                                                /* clear out the station table */
+                                                priv->num_stations = 0;
+
+                                                IPW_DEBUG_ASSOC
+                                                    ("queueing adhoc check\n");
+                                                queue_delayed_work(priv->
+                                                                   workqueue,
+                                                                   &priv->
+                                                                   adhoc_check,
+                                                                   priv->
+                                                                   assoc_request.
+                                                                   beacon_interval);
+                                                break;
+                                        }
+
+                                        priv->status &= ~STATUS_ASSOCIATING;
+                                        priv->status |= STATUS_ASSOCIATED;
+
+                                        netif_carrier_on(priv->net_dev);
+                                        if (netif_queue_stopped(priv->net_dev)) {
+                                                IPW_DEBUG_NOTIF
+                                                    ("waking queue\n");
+                                                netif_wake_queue(priv->net_dev);
+                                        } else {
+                                                IPW_DEBUG_NOTIF
+                                                    ("starting queue\n");
+                                                netif_start_queue(priv->
+                                                                  net_dev);
+                                        }
+
+                                        ipw_reset_stats(priv);
+                                        /* Ensure the rate is updated immediately */
+                                        priv->last_rate =
+                                            ipw_get_current_rate(priv);
+                                        schedule_work(&priv->gather_stats);
+                                        notify_wx_assoc_event(priv);
 
 /*                      queue_delayed_work(priv->workqueue,
                                            &priv->request_scan,
                                            SCAN_ASSOCIATED_INTERVAL);
 */
-                        break;
-                }
+                                        break;
+                                }
 
-                case CMAS_AUTHENTICATED: {
-                        if (priv->status & (STATUS_ASSOCIATED | STATUS_AUTH)) {
+                        case CMAS_AUTHENTICATED:{
+                                        if (priv->
+                                            status & (STATUS_ASSOCIATED |
+                                                      STATUS_AUTH)) {
 #ifdef CONFIG_IPW_DEBUG
-                                struct notif_authenticate *auth = &notif->u.auth;
-                                IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE | IPW_DL_ASSOC,
-                                          "deauthenticated: '%s' " MAC_FMT ": (0x%04X) - %s \n",
-                                          escape_essid(priv->essid, priv->essid_len),
-                                          MAC_ARG(priv->bssid),
-                                          ntohs(auth->status),
-                                          ipw_get_status_code(ntohs(auth->status)));
+                                                struct notif_authenticate *auth
+                                                    = &notif->u.auth;
+                                                IPW_DEBUG(IPW_DL_NOTIF |
+                                                          IPW_DL_STATE |
+                                                          IPW_DL_ASSOC,
+                                                          "deauthenticated: '%s' "
+                                                          MAC_FMT
+                                                          ": (0x%04X) - %s \n",
+                                                          escape_essid(priv->
+                                                                       essid,
+                                                                       priv->
+                                                                       essid_len),
+                                                          MAC_ARG(priv->bssid),
+                                                          ntohs(auth->status),
+                                                          ipw_get_status_code
+                                                          (ntohs
+                                                           (auth->status)));
 #endif
 
-                                priv->status &= ~(STATUS_ASSOCIATING |
-                                                  STATUS_AUTH |
-                                                  STATUS_ASSOCIATED);
+                                                priv->status &=
+                                                    ~(STATUS_ASSOCIATING |
+                                                      STATUS_AUTH |
+                                                      STATUS_ASSOCIATED);
+
+                                                netif_carrier_off(priv->
+                                                                  net_dev);
+                                                netif_stop_queue(priv->net_dev);
+                                                queue_work(priv->workqueue,
+                                                           &priv->request_scan);
+                                                notify_wx_assoc_event(priv);
+                                                break;
+                                        }
+
+                                        IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE |
+                                                  IPW_DL_ASSOC,
+                                                  "authenticated: '%s' " MAC_FMT
+                                                  "\n",
+                                                  escape_essid(priv->essid,
+                                                               priv->essid_len),
+                                                  MAC_ARG(priv->bssid));
+                                        break;
+                                }
+
+                        case CMAS_INIT:{
+                                        IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE |
+                                                  IPW_DL_ASSOC,
+                                                  "disassociated: '%s' " MAC_FMT
+                                                  " \n",
+                                                  escape_essid(priv->essid,
+                                                               priv->essid_len),
+                                                  MAC_ARG(priv->bssid));
+
+                                        priv->status &=
+                                            ~(STATUS_DISASSOCIATING |
+                                              STATUS_ASSOCIATING |
+                                              STATUS_ASSOCIATED | STATUS_AUTH);
+
+                                        netif_stop_queue(priv->net_dev);
+                                        if (!(priv->status & STATUS_ROAMING)) {
+                                                netif_carrier_off(priv->
+                                                                  net_dev);
+                                                notify_wx_assoc_event(priv);
+
+                                                /* Cancel any queued work ... */
+                                                cancel_delayed_work(&priv->
+                                                                    request_scan);
+                                                cancel_delayed_work(&priv->
+                                                                    adhoc_check);
+
+                                                /* Queue up another scan... */
+                                                queue_work(priv->workqueue,
+                                                           &priv->request_scan);
+
+                                                cancel_delayed_work(&priv->
+                                                                    gather_stats);
+                                        } else {
+                                                priv->status |= STATUS_ROAMING;
+                                                queue_work(priv->workqueue,
+                                                           &priv->request_scan);
+                                        }
+
+                                        ipw_reset_stats(priv);
+                                        break;
+                                }
 
-                                netif_carrier_off(priv->net_dev);
-                                netif_stop_queue(priv->net_dev);
-                                queue_work(priv->workqueue, &priv->request_scan);
-                                notify_wx_assoc_event(priv);
+                        default:
+                                IPW_ERROR("assoc: unknown (%d)\n",
+                                          assoc->state);
                                 break;
                         }
 
-                        IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE | IPW_DL_ASSOC,
-                                  "authenticated: '%s' " MAC_FMT "\n",
-                                  escape_essid(priv->essid, priv->essid_len),
-                                  MAC_ARG(priv->bssid));
                         break;
                 }
 
-                case CMAS_INIT: {
-                        IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE | IPW_DL_ASSOC,
-                                  "disassociated: '%s' " MAC_FMT " \n",
-                                  escape_essid(priv->essid, priv->essid_len),
-                                  MAC_ARG(priv->bssid));
+        case HOST_NOTIFICATION_STATUS_AUTHENTICATE:{
+                        struct notif_authenticate *auth = &notif->u.auth;
+                        switch (auth->state) {
+                        case CMAS_AUTHENTICATED:
+                                IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE,
+                                          "authenticated: '%s' " MAC_FMT " \n",
+                                          escape_essid(priv->essid,
+                                                       priv->essid_len),
+                                          MAC_ARG(priv->bssid));
+                                priv->status |= STATUS_AUTH;
+                                break;
 
-                        priv->status &= ~(
-                                STATUS_DISASSOCIATING |
-                                STATUS_ASSOCIATING |
-                                STATUS_ASSOCIATED |
-                                STATUS_AUTH);
+                        case CMAS_INIT:
+                                if (priv->status & STATUS_AUTH) {
+                                        IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE |
+                                                  IPW_DL_ASSOC,
+                                                  "authentication failed (0x%04X): %s\n",
+                                                  ntohs(auth->status),
+                                                  ipw_get_status_code(ntohs
+                                                                      (auth->
+                                                                       status)));
+                                }
+                                IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE |
+                                          IPW_DL_ASSOC,
+                                          "deauthenticated: '%s' " MAC_FMT "\n",
+                                          escape_essid(priv->essid,
+                                                       priv->essid_len),
+                                          MAC_ARG(priv->bssid));
 
-                        netif_stop_queue(priv->net_dev);
-                        if (!(priv->status & STATUS_ROAMING)) {
-                                netif_carrier_off(priv->net_dev);
-                                notify_wx_assoc_event(priv);
-
-                                /* Cancel any queued work ... */
-                                cancel_delayed_work(&priv->request_scan);
-                                cancel_delayed_work(&priv->adhoc_check);
+                                priv->status &= ~(STATUS_ASSOCIATING |
+                                                  STATUS_AUTH |
+                                                  STATUS_ASSOCIATED);
 
-                                /* Queue up another scan... */
+                                netif_carrier_off(priv->net_dev);
+                                netif_stop_queue(priv->net_dev);
                                 queue_work(priv->workqueue,
                                            &priv->request_scan);
+                                notify_wx_assoc_event(priv);
+                                break;
 
-                                cancel_delayed_work(&priv->gather_stats);
-                        } else {
-                                priv->status |= STATUS_ROAMING;
-                                queue_work(priv->workqueue,
-                                           &priv->request_scan);
+                        case CMAS_TX_AUTH_SEQ_1:
+                                IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE |
+                                          IPW_DL_ASSOC, "AUTH_SEQ_1\n");
+                                break;
+                        case CMAS_RX_AUTH_SEQ_2:
+                                IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE |
+                                          IPW_DL_ASSOC, "AUTH_SEQ_2\n");
+                                break;
+                        case CMAS_AUTH_SEQ_1_PASS:
+                                IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE |
+                                          IPW_DL_ASSOC, "AUTH_SEQ_1_PASS\n");
+                                break;
+                        case CMAS_AUTH_SEQ_1_FAIL:
+                                IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE |
+                                          IPW_DL_ASSOC, "AUTH_SEQ_1_FAIL\n");
+                                break;
+                        case CMAS_TX_AUTH_SEQ_3:
+                                IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE |
+                                          IPW_DL_ASSOC, "AUTH_SEQ_3\n");
+                                break;
+                        case CMAS_RX_AUTH_SEQ_4:
+                                IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE |
+                                          IPW_DL_ASSOC, "RX_AUTH_SEQ_4\n");
+                                break;
+                        case CMAS_AUTH_SEQ_2_PASS:
+                                IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE |
+                                          IPW_DL_ASSOC, "AUTH_SEQ_2_PASS\n");
+                                break;
+                        case CMAS_AUTH_SEQ_2_FAIL:
+                                IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE |
+                                          IPW_DL_ASSOC, "AUT_SEQ_2_FAIL\n");
+                                break;
+                        case CMAS_TX_ASSOC:
+                                IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE |
+                                          IPW_DL_ASSOC, "TX_ASSOC\n");
+                                break;
+                        case CMAS_RX_ASSOC_RESP:
+                                IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE |
+                                          IPW_DL_ASSOC, "RX_ASSOC_RESP\n");
+                                break;
+                        case CMAS_ASSOCIATED:
+                                IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE |
+                                          IPW_DL_ASSOC, "ASSOCIATED\n");
+                                break;
+                        default:
+                                IPW_DEBUG_NOTIF("auth: failure - %d\n",
+                                                auth->state);
+                                break;
                         }
-
-                        ipw_reset_stats(priv);
-                        break;
-                }
-
-                default:
-                        IPW_ERROR("assoc: unknown (%d)\n",
-                                  assoc->state);
                         break;
                 }
 
-                break;
-        }
+        case HOST_NOTIFICATION_STATUS_SCAN_CHANNEL_RESULT:{
+                        struct notif_channel_result *x =
+                            &notif->u.channel_result;
 
-        case HOST_NOTIFICATION_STATUS_AUTHENTICATE: {
-                struct notif_authenticate *auth = &notif->u.auth;
-                switch (auth->state) {
-                case CMAS_AUTHENTICATED:
-                        IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE,
-                                  "authenticated: '%s' " MAC_FMT " \n",
-                                  escape_essid(priv->essid, priv->essid_len),
-                                  MAC_ARG(priv->bssid));
-                        priv->status |= STATUS_AUTH;
-                        break;
-
-                case CMAS_INIT:
-                        if (priv->status & STATUS_AUTH) {
-                                IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE | IPW_DL_ASSOC,
-                                          "authentication failed (0x%04X): %s\n",
-                                          ntohs(auth->status),
-                                          ipw_get_status_code(ntohs(auth->status)));
+                        if (notif->size == sizeof(*x)) {
+                                IPW_DEBUG_SCAN("Scan result for channel %d\n",
+                                               x->channel_num);
+                        } else {
+                                IPW_DEBUG_SCAN("Scan result of wrong size %d "
+                                               "(should be %zd)\n",
+                                               notif->size, sizeof(*x));
                         }
-                        IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE | IPW_DL_ASSOC,
-                                  "deauthenticated: '%s' " MAC_FMT "\n",
-                                  escape_essid(priv->essid, priv->essid_len),
-                                  MAC_ARG(priv->bssid));
-
-                        priv->status &= ~(STATUS_ASSOCIATING |
-                                          STATUS_AUTH |
-                                          STATUS_ASSOCIATED);
-
-                        netif_carrier_off(priv->net_dev);
-                        netif_stop_queue(priv->net_dev);
-                        queue_work(priv->workqueue, &priv->request_scan);
-                        notify_wx_assoc_event(priv);
-                        break;
-
-                case CMAS_TX_AUTH_SEQ_1:
-                        IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE | IPW_DL_ASSOC,
-                                  "AUTH_SEQ_1\n");
-                        break;
-                case CMAS_RX_AUTH_SEQ_2:
-                        IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE | IPW_DL_ASSOC,
-                                  "AUTH_SEQ_2\n");
-                        break;
-                case CMAS_AUTH_SEQ_1_PASS:
-                        IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE | IPW_DL_ASSOC,
-                                  "AUTH_SEQ_1_PASS\n");
-                        break;
-                case CMAS_AUTH_SEQ_1_FAIL:
-                        IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE | IPW_DL_ASSOC,
-                                  "AUTH_SEQ_1_FAIL\n");
-                        break;
-                case CMAS_TX_AUTH_SEQ_3:
-                        IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE | IPW_DL_ASSOC,
-                                  "AUTH_SEQ_3\n");
-                        break;
-                case CMAS_RX_AUTH_SEQ_4:
-                        IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE | IPW_DL_ASSOC,
-                                  "RX_AUTH_SEQ_4\n");
-                        break;
-                case CMAS_AUTH_SEQ_2_PASS:
-                        IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE | IPW_DL_ASSOC,
-                                  "AUTH_SEQ_2_PASS\n");
-                        break;
-                case CMAS_AUTH_SEQ_2_FAIL:
-                        IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE | IPW_DL_ASSOC,
-                                  "AUT_SEQ_2_FAIL\n");
-                        break;
-                case CMAS_TX_ASSOC:
-                        IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE | IPW_DL_ASSOC,
-                                  "TX_ASSOC\n");
-                        break;
-                case CMAS_RX_ASSOC_RESP:
-                        IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE | IPW_DL_ASSOC,
-                                  "RX_ASSOC_RESP\n");
-                        break;
-                case CMAS_ASSOCIATED:
-                        IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE | IPW_DL_ASSOC,
-                                  "ASSOCIATED\n");
-                        break;
-                default:
-                        IPW_DEBUG_NOTIF("auth: failure - %d\n", auth->state);
                         break;
                 }
-                break;
-        }
-
-        case HOST_NOTIFICATION_STATUS_SCAN_CHANNEL_RESULT: {
-                struct notif_channel_result *x = &notif->u.channel_result;
-
-                if (notif->size == sizeof(*x)) {
-                        IPW_DEBUG_SCAN("Scan result for channel %d\n",
-                                       x->channel_num);
-                } else {
-                        IPW_DEBUG_SCAN("Scan result of wrong size %d "
-                                       "(should be %zd)\n",
-                                       notif->size, sizeof(*x));
-                }
-                break;
-        }
 
-        case HOST_NOTIFICATION_STATUS_SCAN_COMPLETED: {
-                struct notif_scan_complete* x = &notif->u.scan_complete;
-                if (notif->size == sizeof(*x)) {
-                        IPW_DEBUG_SCAN("Scan completed: type %d, %d channels, "
-                                       "%d status\n",
-                                       x->scan_type,
-                                       x->num_channels,
-                                       x->status);
-                } else {
-                        IPW_ERROR("Scan completed of wrong size %d "
-                                  "(should be %zd)\n",
-                                  notif->size, sizeof(*x));
-                }
-
-                priv->status &= ~(STATUS_SCANNING | STATUS_SCAN_ABORTING);
-
-                cancel_delayed_work(&priv->scan_check);
-
-                if (!(priv->status & (STATUS_ASSOCIATED |
-                                      STATUS_ASSOCIATING |
-                                      STATUS_ROAMING |
-                                      STATUS_DISASSOCIATING)))
-                        queue_work(priv->workqueue, &priv->associate);
-                else if (priv->status & STATUS_ROAMING) {
-                        /* If a scan completed and we are in roam mode, then
-                         * the scan that completed was the one requested as a
-                         * result of entering roam... so, schedule the
-                         * roam work */
-                        queue_work(priv->workqueue, &priv->roam);
-                } else if (priv->status & STATUS_SCAN_PENDING)
-                        queue_work(priv->workqueue, &priv->request_scan);
-
-                priv->ieee->scans++;
-                break;
-        }
+        case HOST_NOTIFICATION_STATUS_SCAN_COMPLETED:{
+                        struct notif_scan_complete *x = &notif->u.scan_complete;
+                        if (notif->size == sizeof(*x)) {
+                                IPW_DEBUG_SCAN
+                                    ("Scan completed: type %d, %d channels, "
+                                     "%d status\n", x->scan_type,
+                                     x->num_channels, x->status);
+                        } else {
+                                IPW_ERROR("Scan completed of wrong size %d "
+                                          "(should be %zd)\n",
+                                          notif->size, sizeof(*x));
+                        }
 
-        case HOST_NOTIFICATION_STATUS_FRAG_LENGTH: {
-                struct notif_frag_length *x = &notif->u.frag_len;
+                        priv->status &=
+                            ~(STATUS_SCANNING | STATUS_SCAN_ABORTING);
+
+                        cancel_delayed_work(&priv->scan_check);
+
+                        if (!(priv->status & (STATUS_ASSOCIATED |
+                                              STATUS_ASSOCIATING |
+                                              STATUS_ROAMING |
+                                              STATUS_DISASSOCIATING)))
+                                queue_work(priv->workqueue, &priv->associate);
+                        else if (priv->status & STATUS_ROAMING) {
+                                /* If a scan completed and we are in roam mode, then
+                                 * the scan that completed was the one requested as a
+                                 * result of entering roam... so, schedule the
+                                 * roam work */
+                                queue_work(priv->workqueue, &priv->roam);
+                        } else if (priv->status & STATUS_SCAN_PENDING)
+                                queue_work(priv->workqueue,
+                                           &priv->request_scan);
 
-                if (notif->size == sizeof(*x)) {
-                        IPW_ERROR("Frag length: %d\n", x->frag_length);
-                } else {
-                        IPW_ERROR("Frag length of wrong size %d "
-                                  "(should be %zd)\n",
-                                  notif->size, sizeof(*x));
+                        priv->ieee->scans++;
+                        break;
                 }
-                break;
-        }
 
-        case HOST_NOTIFICATION_STATUS_LINK_DETERIORATION: {
-                struct notif_link_deterioration *x =
-                        &notif->u.link_deterioration;
-                if (notif->size==sizeof(*x)) {
-                        IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE,
-                                  "link deterioration: '%s' " MAC_FMT " \n",
-                                  escape_essid(priv->essid, priv->essid_len),
-                                  MAC_ARG(priv->bssid));
-                        memcpy(&priv->last_link_deterioration, x, sizeof(*x));
-                } else {
-                        IPW_ERROR("Link Deterioration of wrong size %d "
-                                  "(should be %zd)\n",
-                                  notif->size, sizeof(*x));
-                }
-                break;
-        }
+        case HOST_NOTIFICATION_STATUS_FRAG_LENGTH:{
+                        struct notif_frag_length *x = &notif->u.frag_len;
 
-        case HOST_NOTIFICATION_DINO_CONFIG_RESPONSE: {
-                IPW_ERROR("Dino config\n");
-                if (priv->hcmd && priv->hcmd->cmd == HOST_CMD_DINO_CONFIG) {
-                        /* TODO: Do anything special? */
-                } else {
-                        IPW_ERROR("Unexpected DINO_CONFIG_RESPONSE\n");
+                        if (notif->size == sizeof(*x)) {
+                                IPW_ERROR("Frag length: %d\n", x->frag_length);
+                        } else {
+                                IPW_ERROR("Frag length of wrong size %d "
+                                          "(should be %zd)\n",
+                                          notif->size, sizeof(*x));
+                        }
+                        break;
                 }
-                break;
-        }
 
-        case HOST_NOTIFICATION_STATUS_BEACON_STATE: {
-                struct notif_beacon_state *x = &notif->u.beacon_state;
-                if (notif->size != sizeof(*x)) {
-                        IPW_ERROR("Beacon state of wrong size %d (should "
-                                  "be %zd)\n", notif->size, sizeof(*x));
+        case HOST_NOTIFICATION_STATUS_LINK_DETERIORATION:{
+                        struct notif_link_deterioration *x =
+                            &notif->u.link_deterioration;
+                        if (notif->size == sizeof(*x)) {
+                                IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE,
+                                          "link deterioration: '%s' " MAC_FMT
+                                          " \n", escape_essid(priv->essid,
+                                                              priv->essid_len),
+                                          MAC_ARG(priv->bssid));
+                                memcpy(&priv->last_link_deterioration, x,
+                                       sizeof(*x));
+                        } else {
+                                IPW_ERROR("Link Deterioration of wrong size %d "
+                                          "(should be %zd)\n",
+                                          notif->size, sizeof(*x));
+                        }
                         break;
                 }
 
-                if (x->state == HOST_NOTIFICATION_STATUS_BEACON_MISSING) {
-                        if (priv->status & STATUS_SCANNING) {
-                                /* Stop scan to keep fw from getting
-                                 * stuck... */
-                                queue_work(priv->workqueue,
-                                           &priv->abort_scan);
+        case HOST_NOTIFICATION_DINO_CONFIG_RESPONSE:{
+                        IPW_ERROR("Dino config\n");
+                        if (priv->hcmd
+                            && priv->hcmd->cmd == HOST_CMD_DINO_CONFIG) {
+                                /* TODO: Do anything special? */
+                        } else {
+                                IPW_ERROR("Unexpected DINO_CONFIG_RESPONSE\n");
                         }
+                        break;
+                }
 
-                        if (x->number > priv->missed_beacon_threshold &&
-                            priv->status & STATUS_ASSOCIATED) {
-                                IPW_DEBUG(IPW_DL_INFO | IPW_DL_NOTIF |
-                                          IPW_DL_STATE,
-                                          "Missed beacon: %d - disassociate\n",
-                                          x->number);
-                                queue_work(priv->workqueue,
-                                           &priv->disassociate);
-                        } else if (x->number > priv->roaming_threshold) {
-                                IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE,
-                                          "Missed beacon: %d - initiate "
-                                          "roaming\n",
-                                          x->number);
-                                queue_work(priv->workqueue,
-                                           &priv->roam);
-                        } else {
-                                IPW_DEBUG_NOTIF("Missed beacon: %d\n",
-                                                x->number);
+        case HOST_NOTIFICATION_STATUS_BEACON_STATE:{
+                        struct notif_beacon_state *x = &notif->u.beacon_state;
+                        if (notif->size != sizeof(*x)) {
+                                IPW_ERROR
+                                    ("Beacon state of wrong size %d (should "
+                                     "be %zd)\n", notif->size, sizeof(*x));
+                                break;
                         }
 
-                        priv->notif_missed_beacons = x->number;
+                        if (x->state == HOST_NOTIFICATION_STATUS_BEACON_MISSING) {
+                                if (priv->status & STATUS_SCANNING) {
+                                        /* Stop scan to keep fw from getting
+                                         * stuck... */
+                                        queue_work(priv->workqueue,
+                                                   &priv->abort_scan);
+                                }
+
+                                if (x->number > priv->missed_beacon_threshold &&
+                                    priv->status & STATUS_ASSOCIATED) {
+                                        IPW_DEBUG(IPW_DL_INFO | IPW_DL_NOTIF |
+                                                  IPW_DL_STATE,
+                                                  "Missed beacon: %d - disassociate\n",
+                                                  x->number);
+                                        queue_work(priv->workqueue,
+                                                   &priv->disassociate);
+                                } else if (x->number > priv->roaming_threshold) {
+                                        IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE,
+                                                  "Missed beacon: %d - initiate "
+                                                  "roaming\n", x->number);
+                                        queue_work(priv->workqueue,
+                                                   &priv->roam);
+                                } else {
+                                        IPW_DEBUG_NOTIF("Missed beacon: %d\n",
+                                                        x->number);
+                                }
+
+                                priv->notif_missed_beacons = x->number;
 
-                }
+                        }
 
+                        break;
+                }
 
-                break;
-        }
+        case HOST_NOTIFICATION_STATUS_TGI_TX_KEY:{
+                        struct notif_tgi_tx_key *x = &notif->u.tgi_tx_key;
+                        if (notif->size == sizeof(*x)) {
+                                IPW_ERROR("TGi Tx Key: state 0x%02x sec type "
+                                          "0x%02x station %d\n",
+                                          x->key_state, x->security_type,
+                                          x->station_index);
+                                break;
+                        }
 
-        case HOST_NOTIFICATION_STATUS_TGI_TX_KEY: {
-                struct notif_tgi_tx_key *x = &notif->u.tgi_tx_key;
-                if (notif->size==sizeof(*x)) {
-                        IPW_ERROR("TGi Tx Key: state 0x%02x sec type "
-                                  "0x%02x station %d\n",
-                                  x->key_state,x->security_type,
-                                  x->station_index);
+                        IPW_ERROR
+                            ("TGi Tx Key of wrong size %d (should be %zd)\n",
+                             notif->size, sizeof(*x));
                         break;
                 }
 
-                IPW_ERROR("TGi Tx Key of wrong size %d (should be %zd)\n",
-                          notif->size, sizeof(*x));
-                break;
-        }
+        case HOST_NOTIFICATION_CALIB_KEEP_RESULTS:{
+                        struct notif_calibration *x = &notif->u.calibration;
 
-        case HOST_NOTIFICATION_CALIB_KEEP_RESULTS: {
-                struct notif_calibration *x = &notif->u.calibration;
+                        if (notif->size == sizeof(*x)) {
+                                memcpy(&priv->calib, x, sizeof(*x));
+                                IPW_DEBUG_INFO("TODO: Calibration\n");
+                                break;
+                        }
 
-                if (notif->size == sizeof(*x)) {
-                        memcpy(&priv->calib, x, sizeof(*x));
-                        IPW_DEBUG_INFO("TODO: Calibration\n");
+                        IPW_ERROR
+                            ("Calibration of wrong size %d (should be %zd)\n",
+                             notif->size, sizeof(*x));
                         break;
                 }
 
-                IPW_ERROR("Calibration of wrong size %d (should be %zd)\n",
-                          notif->size, sizeof(*x));
-                break;
-        }
+        case HOST_NOTIFICATION_NOISE_STATS:{
+                        if (notif->size == sizeof(u32)) {
+                                priv->last_noise =
+                                    (u8) (notif->u.noise.value & 0xff);
+                                average_add(&priv->average_noise,
+                                            priv->last_noise);
+                                break;
+                        }
 
-        case HOST_NOTIFICATION_NOISE_STATS: {
-                if (notif->size == sizeof(u32)) {
-                        priv->last_noise = (u8)(notif->u.noise.value & 0xff);
-                        average_add(&priv->average_noise, priv->last_noise);
+                        IPW_ERROR
+                            ("Noise stat is wrong size %d (should be %zd)\n",
+                             notif->size, sizeof(u32));
                         break;
                 }
 
-                IPW_ERROR("Noise stat is wrong size %d (should be %zd)\n",
-                          notif->size, sizeof(u32));
-                break;
-        }
-
         default:
                 IPW_ERROR("Unknown notification: "
                           "subtype=%d,flags=0x%2x,size=%d\n",
@@ -3680,8 +3742,7 @@ static int ipw_queue_reset(struct ipw_priv *priv)
         rc = ipw_queue_tx_init(priv, &priv->txq[0], nTx,
                                CX2_TX_QUEUE_0_READ_INDEX,
                                CX2_TX_QUEUE_0_WRITE_INDEX,
-                               CX2_TX_QUEUE_0_BD_BASE,
-                               CX2_TX_QUEUE_0_BD_SIZE);
+                               CX2_TX_QUEUE_0_BD_BASE, CX2_TX_QUEUE_0_BD_SIZE);
         if (rc) {
                 IPW_ERROR("Tx 0 queue init failed\n");
                 goto error;
@@ -3689,8 +3750,7 @@ static int ipw_queue_reset(struct ipw_priv *priv)
         rc = ipw_queue_tx_init(priv, &priv->txq[1], nTx,
                                CX2_TX_QUEUE_1_READ_INDEX,
                                CX2_TX_QUEUE_1_WRITE_INDEX,
-                               CX2_TX_QUEUE_1_BD_BASE,
-                               CX2_TX_QUEUE_1_BD_SIZE);
+                               CX2_TX_QUEUE_1_BD_BASE, CX2_TX_QUEUE_1_BD_SIZE);
         if (rc) {
                 IPW_ERROR("Tx 1 queue init failed\n");
                 goto error;
@@ -3698,8 +3758,7 @@ static int ipw_queue_reset(struct ipw_priv *priv)
         rc = ipw_queue_tx_init(priv, &priv->txq[2], nTx,
                                CX2_TX_QUEUE_2_READ_INDEX,
                                CX2_TX_QUEUE_2_WRITE_INDEX,
-                               CX2_TX_QUEUE_2_BD_BASE,
-                               CX2_TX_QUEUE_2_BD_SIZE);
+                               CX2_TX_QUEUE_2_BD_BASE, CX2_TX_QUEUE_2_BD_SIZE);
         if (rc) {
                 IPW_ERROR("Tx 2 queue init failed\n");
                 goto error;
@@ -3707,8 +3766,7 @@ static int ipw_queue_reset(struct ipw_priv *priv)
         rc = ipw_queue_tx_init(priv, &priv->txq[3], nTx,
                                CX2_TX_QUEUE_3_READ_INDEX,
                                CX2_TX_QUEUE_3_WRITE_INDEX,
-                               CX2_TX_QUEUE_3_BD_BASE,
-                               CX2_TX_QUEUE_3_BD_SIZE);
+                               CX2_TX_QUEUE_3_BD_BASE, CX2_TX_QUEUE_3_BD_SIZE);
         if (rc) {
                 IPW_ERROR("Tx 3 queue init failed\n");
                 goto error;
@@ -3718,7 +3776,7 @@ static int ipw_queue_reset(struct ipw_priv *priv)
         priv->rx_pend_max = 0;
         return rc;
 
- error:
+      error:
         ipw_tx_queue_free(priv);
         return rc;
 }
@@ -3746,8 +3804,8 @@ static int ipw_queue_tx_reclaim(struct ipw_priv *priv,
         hw_tail = ipw_read32(priv, q->reg_r);
         if (hw_tail >= q->n_bd) {
                 IPW_ERROR
-                        ("Read index for DMA queue (%d) is out of range [0-%d)\n",
-                         hw_tail, q->n_bd);
+                    ("Read index for DMA queue (%d) is out of range [0-%d)\n",
+                     hw_tail, q->n_bd);
                 goto done;
         }
         for (; q->last_used != hw_tail;
@@ -3755,7 +3813,7 @@ static int ipw_queue_tx_reclaim(struct ipw_priv *priv,
                 ipw_queue_tx_free_tfd(priv, txq);
                 priv->tx_packets++;
         }
- done:
+      done:
         if (ipw_queue_space(q) > q->low_mark && qindex >= 0) {
                 __maybe_wake_tx(priv);
         }
@@ -3795,8 +3853,6 @@ static int ipw_queue_tx_hcmd(struct ipw_priv *priv, int hcmd, void *buf,
         return 0;
 }
 
-
-
 /*
  * Rx theory of operation
  *
@@ -3933,9 +3989,9 @@ static void ipw_rx_queue_replenish(void *data)
                 list_del(element);
 
                 rxb->rxb = (struct ipw_rx_buffer *)rxb->skb->data;
-                rxb->dma_addr = pci_map_single(
-                        priv->pci_dev, rxb->skb->data, CX2_RX_BUF_SIZE,
-                        PCI_DMA_FROMDEVICE);
+                rxb->dma_addr =
+                    pci_map_single(priv->pci_dev, rxb->skb->data,
+                                   CX2_RX_BUF_SIZE, PCI_DMA_FROMDEVICE);
 
                 list_add_tail(&rxb->list, &rxq->rx_free);
                 rxq->free_count++;
@@ -3950,8 +4006,7 @@ static void ipw_rx_queue_replenish(void *data)
  * This free routine walks the list of POOL entries and if SKB is set to
  * non NULL it is unmapped and freed
  */
-static void ipw_rx_queue_free(struct ipw_priv *priv,
-                              struct ipw_rx_queue *rxq)
+static void ipw_rx_queue_free(struct ipw_priv *priv, struct ipw_rx_queue *rxq)
 {
         int i;
 
@@ -3961,8 +4016,7 @@ static void ipw_rx_queue_free(struct ipw_priv *priv,
         for (i = 0; i < RX_QUEUE_SIZE + RX_FREE_BUFFERS; i++) {
                 if (rxq->pool[i].skb != NULL) {
                         pci_unmap_single(priv->pci_dev, rxq->pool[i].dma_addr,
-                                         CX2_RX_BUF_SIZE,
-                                         PCI_DMA_FROMDEVICE);
+                                         CX2_RX_BUF_SIZE, PCI_DMA_FROMDEVICE);
                         dev_kfree_skb(rxq->pool[i].skb);
                 }
         }
@@ -4001,28 +4055,28 @@ static int ipw_is_rate_in_mask(struct ipw_priv *priv, int ieee_mode, u8 rate)
                 switch (rate) {
                 case IEEE80211_OFDM_RATE_6MB:
                         return priv->rates_mask & IEEE80211_OFDM_RATE_6MB_MASK ?
-                                1 : 0;
+                            1 : 0;
                 case IEEE80211_OFDM_RATE_9MB:
                         return priv->rates_mask & IEEE80211_OFDM_RATE_9MB_MASK ?
-                                1 : 0;
+                            1 : 0;
                 case IEEE80211_OFDM_RATE_12MB:
-                        return priv->rates_mask & IEEE80211_OFDM_RATE_12MB_MASK ?
-                                1 : 0;
+                        return priv->
+                            rates_mask & IEEE80211_OFDM_RATE_12MB_MASK ? 1 : 0;
                 case IEEE80211_OFDM_RATE_18MB:
-                        return priv->rates_mask & IEEE80211_OFDM_RATE_18MB_MASK ?
-                                1 : 0;
+                        return priv->
+                            rates_mask & IEEE80211_OFDM_RATE_18MB_MASK ? 1 : 0;
                 case IEEE80211_OFDM_RATE_24MB:
-                        return priv->rates_mask & IEEE80211_OFDM_RATE_24MB_MASK ?
-                                1 : 0;
+                        return priv->
+                            rates_mask & IEEE80211_OFDM_RATE_24MB_MASK ? 1 : 0;
                 case IEEE80211_OFDM_RATE_36MB:
-                        return priv->rates_mask & IEEE80211_OFDM_RATE_36MB_MASK ?
-                                1 : 0;
+                        return priv->
+                            rates_mask & IEEE80211_OFDM_RATE_36MB_MASK ? 1 : 0;
                 case IEEE80211_OFDM_RATE_48MB:
-                        return priv->rates_mask & IEEE80211_OFDM_RATE_48MB_MASK ?
-                                1 : 0;
+                        return priv->
+                            rates_mask & IEEE80211_OFDM_RATE_48MB_MASK ? 1 : 0;
                 case IEEE80211_OFDM_RATE_54MB:
-                        return priv->rates_mask & IEEE80211_OFDM_RATE_54MB_MASK ?
-                                1 : 0;
+                        return priv->
+                            rates_mask & IEEE80211_OFDM_RATE_54MB_MASK ? 1 : 0;
                 default:
                         return 0;
                 }
@@ -4074,10 +4128,11 @@ static int ipw_compatible_rates(struct ipw_priv *priv,
         int num_rates, i;
 
         memset(rates, 0, sizeof(*rates));
-        num_rates = min(network->rates_len, (u8)IPW_MAX_RATES);
+        num_rates = min(network->rates_len, (u8) IPW_MAX_RATES);
         rates->num_rates = 0;
         for (i = 0; i < num_rates; i++) {
-                if (!ipw_is_rate_in_mask(priv, network->mode, network->rates[i])) {
+                if (!ipw_is_rate_in_mask
+                    (priv, network->mode, network->rates[i])) {
                         IPW_DEBUG_SCAN("Rate %02X masked : 0x%08X\n",
                                        network->rates[i], priv->rates_mask);
                         continue;
@@ -4086,15 +4141,18 @@ static int ipw_compatible_rates(struct ipw_priv *priv,
                 rates->supported_rates[rates->num_rates++] = network->rates[i];
         }
 
-        num_rates = min(network->rates_ex_len, (u8)(IPW_MAX_RATES - num_rates));
+        num_rates =
+            min(network->rates_ex_len, (u8) (IPW_MAX_RATES - num_rates));
         for (i = 0; i < num_rates; i++) {
-                if (!ipw_is_rate_in_mask(priv, network->mode, network->rates_ex[i])) {
+                if (!ipw_is_rate_in_mask
+                    (priv, network->mode, network->rates_ex[i])) {
                         IPW_DEBUG_SCAN("Rate %02X masked : 0x%08X\n",
                                        network->rates_ex[i], priv->rates_mask);
                         continue;
                 }
 
-                rates->supported_rates[rates->num_rates++] = network->rates_ex[i];
+                rates->supported_rates[rates->num_rates++] =
+                    network->rates_ex[i];
         }
 
         return rates->num_rates;
@@ -4113,65 +4171,65 @@ static inline void ipw_copy_rates(struct ipw_supported_rates *dest,
  * mask should ever be used -- right now all callers to add the scan rates are
  * set with the modulation = CCK, so BASIC_RATE_MASK is never set... */
 static void ipw_add_cck_scan_rates(struct ipw_supported_rates *rates,
-                               u8 modulation, u32 rate_mask)
+                                   u8 modulation, u32 rate_mask)
 {
         u8 basic_mask = (IEEE80211_OFDM_MODULATION == modulation) ?
-                IEEE80211_BASIC_RATE_MASK : 0;
+            IEEE80211_BASIC_RATE_MASK : 0;
 
         if (rate_mask & IEEE80211_CCK_RATE_1MB_MASK)
                 rates->supported_rates[rates->num_rates++] =
-                        IEEE80211_BASIC_RATE_MASK | IEEE80211_CCK_RATE_1MB;
+                    IEEE80211_BASIC_RATE_MASK | IEEE80211_CCK_RATE_1MB;
 
         if (rate_mask & IEEE80211_CCK_RATE_2MB_MASK)
                 rates->supported_rates[rates->num_rates++] =
-                        IEEE80211_BASIC_RATE_MASK | IEEE80211_CCK_RATE_2MB;
+                    IEEE80211_BASIC_RATE_MASK | IEEE80211_CCK_RATE_2MB;
 
         if (rate_mask & IEEE80211_CCK_RATE_5MB_MASK)
                 rates->supported_rates[rates->num_rates++] = basic_mask |
-                        IEEE80211_CCK_RATE_5MB;
+                    IEEE80211_CCK_RATE_5MB;
 
         if (rate_mask & IEEE80211_CCK_RATE_11MB_MASK)
                 rates->supported_rates[rates->num_rates++] = basic_mask |
-                        IEEE80211_CCK_RATE_11MB;
+                    IEEE80211_CCK_RATE_11MB;
 }
 
 static void ipw_add_ofdm_scan_rates(struct ipw_supported_rates *rates,
-                                u8 modulation, u32 rate_mask)
+                                    u8 modulation, u32 rate_mask)
 {
         u8 basic_mask = (IEEE80211_OFDM_MODULATION == modulation) ?
-                IEEE80211_BASIC_RATE_MASK : 0;
+            IEEE80211_BASIC_RATE_MASK : 0;
 
         if (rate_mask & IEEE80211_OFDM_RATE_6MB_MASK)
                 rates->supported_rates[rates->num_rates++] = basic_mask |
-                        IEEE80211_OFDM_RATE_6MB;
+                    IEEE80211_OFDM_RATE_6MB;
 
         if (rate_mask & IEEE80211_OFDM_RATE_9MB_MASK)
                 rates->supported_rates[rates->num_rates++] =
-                        IEEE80211_OFDM_RATE_9MB;
+                    IEEE80211_OFDM_RATE_9MB;
 
         if (rate_mask & IEEE80211_OFDM_RATE_12MB_MASK)
                 rates->supported_rates[rates->num_rates++] = basic_mask |
-                        IEEE80211_OFDM_RATE_12MB;
+                    IEEE80211_OFDM_RATE_12MB;
 
         if (rate_mask & IEEE80211_OFDM_RATE_18MB_MASK)
                 rates->supported_rates[rates->num_rates++] =
-                        IEEE80211_OFDM_RATE_18MB;
+                    IEEE80211_OFDM_RATE_18MB;
 
         if (rate_mask & IEEE80211_OFDM_RATE_24MB_MASK)
                 rates->supported_rates[rates->num_rates++] = basic_mask |
-                        IEEE80211_OFDM_RATE_24MB;
+                    IEEE80211_OFDM_RATE_24MB;
 
         if (rate_mask & IEEE80211_OFDM_RATE_36MB_MASK)
                 rates->supported_rates[rates->num_rates++] =
-                        IEEE80211_OFDM_RATE_36MB;
+                    IEEE80211_OFDM_RATE_36MB;
 
         if (rate_mask & IEEE80211_OFDM_RATE_48MB_MASK)
                 rates->supported_rates[rates->num_rates++] =
-                        IEEE80211_OFDM_RATE_48MB;
+                    IEEE80211_OFDM_RATE_48MB;
 
         if (rate_mask & IEEE80211_OFDM_RATE_54MB_MASK)
                 rates->supported_rates[rates->num_rates++] =
-                        IEEE80211_OFDM_RATE_54MB;
+                    IEEE80211_OFDM_RATE_54MB;
 }
 
 struct ipw_network_match {
@@ -4179,11 +4237,9 @@ struct ipw_network_match {
         struct ipw_supported_rates rates;
 };
 
-static int ipw_best_network(
-        struct ipw_priv *priv,
-        struct ipw_network_match *match,
-        struct ieee80211_network *network,
-        int roaming)
+static int ipw_best_network(struct ipw_priv *priv,
+                            struct ipw_network_match *match,
+                            struct ieee80211_network *network, int roaming)
 {
         struct ipw_supported_rates rates;
 
@@ -4231,21 +4287,21 @@ static int ipw_best_network(
                      memcmp(network->ssid, priv->essid,
                             min(network->ssid_len, priv->essid_len)))) {
                         char escaped[IW_ESSID_MAX_SIZE * 2 + 1];
-                        strncpy(escaped, escape_essid(
-                                        network->ssid, network->ssid_len),
+                        strncpy(escaped,
+                                escape_essid(network->ssid, network->ssid_len),
                                 sizeof(escaped));
                         IPW_DEBUG_ASSOC("Network '%s (" MAC_FMT ")' excluded "
                                         "because of ESSID mismatch: '%s'.\n",
                                         escaped, MAC_ARG(network->bssid),
-                                        escape_essid(priv->essid, priv->essid_len));
+                                        escape_essid(priv->essid,
+                                                     priv->essid_len));
                         return 0;
                 }
         }
 
         /* If the old network rate is better than this one, don't bother
          * testing everything else. */
-        if (match->network && match->network->stats.rssi >
-            network->stats.rssi) {
+        if (match->network && match->network->stats.rssi > network->stats.rssi) {
                 char escaped[IW_ESSID_MAX_SIZE * 2 + 1];
                 strncpy(escaped,
                         escape_essid(network->ssid, network->ssid_len),
@@ -4303,7 +4359,7 @@ static int ipw_best_network(
                                 priv->capability & CAP_PRIVACY_ON ? "on" :
                                 "off",
                                 network->capability &
-                                WLAN_CAPABILITY_PRIVACY ?"on" : "off");
+                                WLAN_CAPABILITY_PRIVACY ? "on" : "off");
                 return 0;
         }
 
@@ -4312,8 +4368,7 @@ static int ipw_best_network(
                 IPW_DEBUG_ASSOC("Network '%s (" MAC_FMT ")' excluded "
                                 "because of BSSID mismatch: " MAC_FMT ".\n",
                                 escape_essid(network->ssid, network->ssid_len),
-                                MAC_ARG(network->bssid),
-                                MAC_ARG(priv->bssid));
+                                MAC_ARG(network->bssid), MAC_ARG(priv->bssid));
                 return 0;
         }
 
@@ -4351,9 +4406,8 @@ static int ipw_best_network(
         return 1;
 }
 
-
 static void ipw_adhoc_create(struct ipw_priv *priv,
-                            struct ieee80211_network *network)
+                             struct ieee80211_network *network)
 {
         /*
          * For the purposes of scanning, we can set our wireless mode
@@ -4393,8 +4447,7 @@ static void ipw_adhoc_create(struct ipw_priv *priv,
         if (priv->capability & CAP_PRIVACY_ON)
                 network->capability |= WLAN_CAPABILITY_PRIVACY;
         network->rates_len = min(priv->rates.num_rates, MAX_RATES_LENGTH);
-        memcpy(network->rates, priv->rates.supported_rates,
-               network->rates_len);
+        memcpy(network->rates, priv->rates.supported_rates, network->rates_len);
         network->rates_ex_len = priv->rates.num_rates - network->rates_len;
         memcpy(network->rates_ex,
                &priv->rates.supported_rates[network->rates_len],
@@ -4404,13 +4457,13 @@ static void ipw_adhoc_create(struct ipw_priv *priv,
         network->last_associate = 0;
         network->time_stamp[0] = 0;
         network->time_stamp[1] = 0;
-        network->beacon_interval = 100; /* Default */
-        network->listen_interval = 10;  /* Default */
-        network->atim_window = 0;       /* Default */
+        network->beacon_interval = 100; /* Default */
+        network->listen_interval = 10;  /* Default */
+        network->atim_window = 0;       /* Default */
 #ifdef CONFIG_IEEE80211_WPA
         network->wpa_ie_len = 0;
         network->rsn_ie_len = 0;
-#endif /* CONFIG_IEEE80211_WPA */
+#endif                          /* CONFIG_IEEE80211_WPA */
 }
 
 static void ipw_send_wep_keys(struct ipw_priv *priv)
@@ -4464,14 +4517,12 @@ static void ipw_debug_config(struct ipw_priv *priv)
         IPW_DEBUG_INFO("Scan completed, no valid APs matched "
                        "[CFG 0x%08X]\n", priv->config);
         if (priv->config & CFG_STATIC_CHANNEL)
-                IPW_DEBUG_INFO("Channel locked to %d\n",
-                               priv->channel);
+                IPW_DEBUG_INFO("Channel locked to %d\n", priv->channel);
         else
                 IPW_DEBUG_INFO("Channel unlocked.\n");
         if (priv->config & CFG_STATIC_ESSID)
                 IPW_DEBUG_INFO("ESSID locked to '%s'\n",
-                               escape_essid(priv->essid,
-                                            priv->essid_len));
+                               escape_essid(priv->essid, priv->essid_len));
         else
                 IPW_DEBUG_INFO("ESSID unlocked.\n");
         if (priv->config & CFG_STATIC_BSSID)
@@ -4502,7 +4553,7 @@ static inline void ipw_set_fixed_rate(struct ipw_priv *priv,
          * Tx rates */
 
         switch (priv->ieee->freq_band) {
-        case IEEE80211_52GHZ_BAND: /* A only */
+        case IEEE80211_52GHZ_BAND:      /* A only */
                 /* IEEE_A */
                 if (priv->rates_mask & ~IEEE80211_OFDM_RATES_MASK) {
                         /* Invalid fixed rate mask */
@@ -4513,7 +4564,7 @@ static inline void ipw_set_fixed_rate(struct ipw_priv *priv,
                 fr.tx_rates >>= IEEE80211_OFDM_SHIFT_MASK_A;
                 break;
 
-        default: /* 2.4Ghz or Mixed */
+        default:                /* 2.4Ghz or Mixed */
                 /* IEEE_B */
                 if (network->mode == IEEE_B) {
                         if (fr.tx_rates & ~IEEE80211_CCK_RATES_MASK) {
@@ -4551,13 +4602,12 @@ static inline void ipw_set_fixed_rate(struct ipw_priv *priv,
         }
 
         reg = ipw_read32(priv, IPW_MEM_FIXED_OVERRIDE);
-        ipw_write_reg32(priv, reg, *(u32*)&fr);
+        ipw_write_reg32(priv, reg, *(u32 *) & fr);
 }
 
 static int ipw_associate_network(struct ipw_priv *priv,
                                  struct ieee80211_network *network,
-                                 struct ipw_supported_rates *rates,
-                                 int roaming)
+                                 struct ipw_supported_rates *rates, int roaming)
 {
         int err;
 
@@ -4566,7 +4616,7 @@ static int ipw_associate_network(struct ipw_priv *priv,
 
         if (!(priv->config & CFG_STATIC_ESSID)) {
                 priv->essid_len = min(network->ssid_len,
-                                      (u8)IW_ESSID_MAX_SIZE);
+                                      (u8) IW_ESSID_MAX_SIZE);
                 memcpy(priv->essid, network->ssid, priv->essid_len);
         }
 
@@ -4612,13 +4662,11 @@ static int ipw_associate_network(struct ipw_priv *priv,
                         priv->capability & CAP_PRIVACY_ON ? " key=" : "",
                         priv->capability & CAP_PRIVACY_ON ?
                         '1' + priv->sec.active_key : '.',
-                        priv->capability & CAP_PRIVACY_ON ?
-                        '.' : ' ');
+                        priv->capability & CAP_PRIVACY_ON ? '.' : ' ');
 
         priv->assoc_request.beacon_interval = network->beacon_interval;
         if ((priv->ieee->iw_mode == IW_MODE_ADHOC) &&
-            (network->time_stamp[0] == 0) &&
-            (network->time_stamp[1] == 0)) {
+            (network->time_stamp[0] == 0) && (network->time_stamp[1] == 0)) {
                 priv->assoc_request.assoc_type = HC_IBSS_START;
                 priv->assoc_request.assoc_tsf_msw = 0;
                 priv->assoc_request.assoc_tsf_lsw = 0;
@@ -4637,8 +4685,7 @@ static int ipw_associate_network(struct ipw_priv *priv,
                 memset(&priv->assoc_request.dest, 0xFF, ETH_ALEN);
                 priv->assoc_request.atim_window = network->atim_window;
         } else {
-                memcpy(&priv->assoc_request.dest, network->bssid,
-                       ETH_ALEN);
+                memcpy(&priv->assoc_request.dest, network->bssid, ETH_ALEN);
                 priv->assoc_request.atim_window = 0;
         }
 
@@ -4772,14 +4819,13 @@ static void ipw_associate(void *data)
 
         if (!(priv->config & CFG_ASSOCIATE) &&
             !(priv->config & (CFG_STATIC_ESSID |
-                              CFG_STATIC_CHANNEL |
-                              CFG_STATIC_BSSID))) {
+                              CFG_STATIC_CHANNEL | CFG_STATIC_BSSID))) {
                 IPW_DEBUG_ASSOC("Not attempting association (associate=0)\n");
                 return;
         }
 
         list_for_each_entry(network, &priv->ieee->network_list, list)
-                ipw_best_network(priv, &match, network, 0);
+            ipw_best_network(priv, &match, network, 0);
 
         network = match.network;
         rates = &match.rates;
@@ -4790,8 +4836,7 @@ static void ipw_associate(void *data)
             priv->config & CFG_STATIC_ESSID &&
             !list_empty(&priv->ieee->network_free_list)) {
                 element = priv->ieee->network_free_list.next;
-                network = list_entry(element, struct ieee80211_network,
-                                     list);
+                network = list_entry(element, struct ieee80211_network, list);
                 ipw_adhoc_create(priv, network);
                 rates = &priv->rates;
                 list_del(element);
@@ -4813,8 +4858,8 @@ static void ipw_associate(void *data)
 }
 
 static inline void ipw_handle_data_packet(struct ipw_priv *priv,
-                                              struct ipw_rx_mem_buffer *rxb,
-                                              struct ieee80211_rx_stats *stats)
+                                          struct ipw_rx_mem_buffer *rxb,
+                                          struct ieee80211_rx_stats *stats)
 {
         struct ipw_rx_packet *pkt = (struct ipw_rx_packet *)rxb->skb->data;
 
@@ -4846,11 +4891,10 @@ static inline void ipw_handle_data_packet(struct ipw_priv *priv,
 
         if (!ieee80211_rx(priv->ieee, rxb->skb, stats))
                 priv->ieee->stats.rx_errors++;
-        else /* ieee80211_rx succeeded, so it now owns the SKB */
+        else                    /* ieee80211_rx succeeded, so it now owns the SKB */
                 rxb->skb = NULL;
 }
 
-
 /*
  * Main entry function for recieving a packet with 80211 headers.  This
  * should be called when ever the FW has notified us that there is a new
@@ -4885,125 +4929,152 @@ static void ipw_rx(struct ipw_priv *priv)
                 pkt = (struct ipw_rx_packet *)rxb->skb->data;
                 IPW_DEBUG_RX("Packet: type=%02X seq=%02X bits=%02X\n",
                              pkt->header.message_type,
-                             pkt->header.rx_seq_num,
-                             pkt->header.control_bits);
+                             pkt->header.rx_seq_num, pkt->header.control_bits);
 
                 switch (pkt->header.message_type) {
-                case RX_FRAME_TYPE: /* 802.11 frame */ {
-                        struct ieee80211_rx_stats stats = {
-                                .rssi = pkt->u.frame.rssi_dbm -
-                                IPW_RSSI_TO_DBM,
-                                .signal = pkt->u.frame.signal,
-                                .rate = pkt->u.frame.rate,
-                                .mac_time = jiffies,
-                                .received_channel =
-                                pkt->u.frame.received_channel,
-                                .freq = (pkt->u.frame.control & (1<<0)) ?
-                                IEEE80211_24GHZ_BAND : IEEE80211_52GHZ_BAND,
-                                .len = pkt->u.frame.length,
-                        };
-
-                        if (stats.rssi != 0)
-                                stats.mask |= IEEE80211_STATMASK_RSSI;
-                        if (stats.signal != 0)
-                                stats.mask |= IEEE80211_STATMASK_SIGNAL;
-                        if (stats.rate != 0)
-                                stats.mask |= IEEE80211_STATMASK_RATE;
-
-                        priv->rx_packets++;
+                case RX_FRAME_TYPE:     /* 802.11 frame */  {
+                                struct ieee80211_rx_stats stats = {
+                                        .rssi = pkt->u.frame.rssi_dbm -
+                                            IPW_RSSI_TO_DBM,
+                                        .signal = pkt->u.frame.signal,
+                                        .rate = pkt->u.frame.rate,
+                                        .mac_time = jiffies,
+                                        .received_channel =
+                                            pkt->u.frame.received_channel,
+                                        .freq =
+                                            (pkt->u.frame.
+                                             control & (1 << 0)) ?
+                                            IEEE80211_24GHZ_BAND :
+                                            IEEE80211_52GHZ_BAND,
+                                        .len = pkt->u.frame.length,
+                                };
+
+                                if (stats.rssi != 0)
+                                        stats.mask |= IEEE80211_STATMASK_RSSI;
+                                if (stats.signal != 0)
+                                        stats.mask |= IEEE80211_STATMASK_SIGNAL;
+                                if (stats.rate != 0)
+                                        stats.mask |= IEEE80211_STATMASK_RATE;
+
+                                priv->rx_packets++;
 
 #ifdef CONFIG_IPW_PROMISC
-                        if (priv->ieee->iw_mode == IW_MODE_MONITOR) {
-                                ipw_handle_data_packet(priv, rxb, &stats);
-                                break;
-                        }
+                                if (priv->ieee->iw_mode == IW_MODE_MONITOR) {
+                                        ipw_handle_data_packet(priv, rxb,
+                                                               &stats);
+                                        break;
+                                }
 #endif
 
-                        header = (struct ieee80211_hdr *)(rxb->skb->data +
-                                                          IPW_RX_FRAME_SIZE);
+                                header =
+                                    (struct ieee80211_hdr *)(rxb->skb->data +
+                                                             IPW_RX_FRAME_SIZE);
                                 /* TODO: Check Ad-Hoc dest/source and make sure
                                  * that we are actually parsing these packets
                                  * correctly -- we should probably use the
                                  * frame control of the packet and disregard
                                  * the current iw_mode */
-                        switch (priv->ieee->iw_mode) {
-                        case IW_MODE_ADHOC:
-                                network_packet =
-                                        !memcmp(header->addr1,
-                                                priv->net_dev->dev_addr,
-                                                ETH_ALEN) ||
-                                        !memcmp(header->addr3,
-                                                priv->bssid, ETH_ALEN) ||
-                                        is_broadcast_ether_addr(header->addr1) ||
-                                        is_multicast_ether_addr(header->addr1);
-                                break;
-
-                        case IW_MODE_INFRA:
-                        default:
-                                network_packet =
-                                        !memcmp(header->addr3,
-                                                priv->bssid, ETH_ALEN) ||
-                                        !memcmp(header->addr1,
-                                                priv->net_dev->dev_addr,
-                                                ETH_ALEN) ||
-                                        is_broadcast_ether_addr(header->addr1) ||
-                                        is_multicast_ether_addr(header->addr1);
+                                switch (priv->ieee->iw_mode) {
+                                case IW_MODE_ADHOC:
+                                        network_packet =
+                                            !memcmp(header->addr1,
+                                                    priv->net_dev->dev_addr,
+                                                    ETH_ALEN) ||
+                                            !memcmp(header->addr3,
+                                                    priv->bssid, ETH_ALEN) ||
+                                            is_broadcast_ether_addr(header->
+                                                                    addr1)
+                                            || is_multicast_ether_addr(header->
+                                                                       addr1);
+                                        break;
+
+                                case IW_MODE_INFRA:
+                                default:
+                                        network_packet =
+                                            !memcmp(header->addr3,
+                                                    priv->bssid, ETH_ALEN) ||
+                                            !memcmp(header->addr1,
+                                                    priv->net_dev->dev_addr,
+                                                    ETH_ALEN) ||
+                                            is_broadcast_ether_addr(header->
+                                                                    addr1)
+                                            || is_multicast_ether_addr(header->
+                                                                       addr1);
+                                        break;
+                                }
+
+                                if (network_packet && priv->assoc_network) {
+                                        priv->assoc_network->stats.rssi =
+                                            stats.rssi;
+                                        average_add(&priv->average_rssi,
+                                                    stats.rssi);
+                                        priv->last_rx_rssi = stats.rssi;
+                                }
+
+                                IPW_DEBUG_RX("Frame: len=%u\n",
+                                             pkt->u.frame.length);
+
+                                if (pkt->u.frame.length < frame_hdr_len(header)) {
+                                        IPW_DEBUG_DROP
+                                            ("Received packet is too small. "
+                                             "Dropping.\n");
+                                        priv->ieee->stats.rx_errors++;
+                                        priv->wstats.discard.misc++;
+                                        break;
+                                }
+
+                                switch (WLAN_FC_GET_TYPE(header->frame_ctl)) {
+                                case IEEE80211_FTYPE_MGMT:
+                                        ieee80211_rx_mgt(priv->ieee, header,
+                                                         &stats);
+                                        if (priv->ieee->iw_mode == IW_MODE_ADHOC
+                                            &&
+                                            ((WLAN_FC_GET_STYPE
+                                              (header->frame_ctl) ==
+                                              IEEE80211_STYPE_PROBE_RESP)
+                                             ||
+                                             (WLAN_FC_GET_STYPE
+                                              (header->frame_ctl) ==
+                                              IEEE80211_STYPE_BEACON))
+                                            && !memcmp(header->addr3,
+                                                       priv->bssid, ETH_ALEN))
+                                                ipw_add_station(priv,
+                                                                header->addr2);
+                                        break;
+
+                                case IEEE80211_FTYPE_CTL:
+                                        break;
+
+                                case IEEE80211_FTYPE_DATA:
+                                        if (network_packet)
+                                                ipw_handle_data_packet(priv,
+                                                                       rxb,
+                                                                       &stats);
+                                        else
+                                                IPW_DEBUG_DROP("Dropping: "
+                                                               MAC_FMT ", "
+                                                               MAC_FMT ", "
+                                                               MAC_FMT "\n",
+                                                               MAC_ARG(header->
+                                                                       addr1),
+                                                               MAC_ARG(header->
+                                                                       addr2),
+                                                               MAC_ARG(header->
+                                                                       addr3));
+                                        break;
+                                }
                                 break;
                         }
 
-                        if (network_packet && priv->assoc_network) {
-                                priv->assoc_network->stats.rssi = stats.rssi;
-                                average_add(&priv->average_rssi,
-                                            stats.rssi);
-                                priv->last_rx_rssi = stats.rssi;
-                        }
-
-                        IPW_DEBUG_RX("Frame: len=%u\n", pkt->u.frame.length);
-
-                        if (pkt->u.frame.length < frame_hdr_len(header)) {
-                                IPW_DEBUG_DROP("Received packet is too small. "
-                                               "Dropping.\n");
-                                priv->ieee->stats.rx_errors++;
-                                priv->wstats.discard.misc++;
-                                break;
-                        }
-
-                        switch (WLAN_FC_GET_TYPE(header->frame_ctl)) {
-                        case IEEE80211_FTYPE_MGMT:
-                                ieee80211_rx_mgt(priv->ieee, header, &stats);
-                                if (priv->ieee->iw_mode == IW_MODE_ADHOC &&
-                                    ((WLAN_FC_GET_STYPE(header->frame_ctl) ==
-                                      IEEE80211_STYPE_PROBE_RESP) ||
-                                     (WLAN_FC_GET_STYPE(header->frame_ctl) ==
-                                      IEEE80211_STYPE_BEACON)) &&
-                                    !memcmp(header->addr3, priv->bssid, ETH_ALEN))
-                                        ipw_add_station(priv, header->addr2);
-                                break;
-
-                        case IEEE80211_FTYPE_CTL:
-                                break;
-
-                        case IEEE80211_FTYPE_DATA:
-                                if (network_packet)
-                                        ipw_handle_data_packet(priv, rxb, &stats);
-                                else
-                                        IPW_DEBUG_DROP("Dropping: " MAC_FMT
-                                                       ", " MAC_FMT ", " MAC_FMT "\n",
-                                                       MAC_ARG(header->addr1), MAC_ARG(header->addr2),
-                                                       MAC_ARG(header->addr3));
-                                break;
-                        }
-                        break;
-                }
-
-                case RX_HOST_NOTIFICATION_TYPE: {
-                        IPW_DEBUG_RX("Notification: subtype=%02X flags=%02X size=%d\n",
+                case RX_HOST_NOTIFICATION_TYPE:{
+                                IPW_DEBUG_RX
+                                    ("Notification: subtype=%02X flags=%02X size=%d\n",
                                      pkt->u.notification.subtype,
                                      pkt->u.notification.flags,
                                      pkt->u.notification.size);
-                        ipw_rx_notification(priv, &pkt->u.notification);
-                        break;
-                }
+                                ipw_rx_notification(priv, &pkt->u.notification);
+                                break;
+                        }
 
                 default:
                         IPW_DEBUG_RX("Bad Rx packet of type %d\n",
@@ -5088,10 +5159,10 @@ static int ipw_request_scan(struct ipw_priv *priv)
         /* If we are roaming, then make this a directed scan for the current
          * network.  Otherwise, ensure that every other scan is a fast
          * channel hop scan */
-        if ((priv->status & STATUS_ROAMING) || (
-                    !(priv->status & STATUS_ASSOCIATED) &&
-                    (priv->config & CFG_STATIC_ESSID) &&
-                    (scan.full_scan_index % 2))) {
+        if ((priv->status & STATUS_ROAMING)
+            || (!(priv->status & STATUS_ASSOCIATED)
+                && (priv->config & CFG_STATIC_ESSID)
+                && (scan.full_scan_index % 2))) {
                 err = ipw_send_ssid(priv, priv->essid, priv->essid_len);
                 if (err) {
                         IPW_DEBUG_HC("Attempt to send SSID command failed.\n");
@@ -5103,7 +5174,7 @@ static int ipw_request_scan(struct ipw_priv *priv)
                 scan_type = IPW_SCAN_ACTIVE_BROADCAST_SCAN;
         }
 
-        if (priv->ieee->freq_band & IEEE80211_52GHZ_BAND) {
+        if (priv->ieee->freq_band & IEEE80211_52GHZ_BAND) {
                 int start = channel_index;
                 for (i = 0; i < MAX_A_CHANNELS; i++) {
                         if (band_a_active_channel[i] == 0)
@@ -5113,18 +5184,18 @@ static int ipw_request_scan(struct ipw_priv *priv)
                                 continue;
                         channel_index++;
                         scan.channels_list[channel_index] =
-                                band_a_active_channel[i];
+                            band_a_active_channel[i];
                         ipw_set_scan_type(&scan, channel_index, scan_type);
                 }
 
                 if (start != channel_index) {
-                        scan.channels_list[start] = (u8)(IPW_A_MODE << 6) |
-                                (channel_index - start);
+                        scan.channels_list[start] = (u8) (IPW_A_MODE << 6) |
+                            (channel_index - start);
                         channel_index++;
                 }
         }
 
-        if (priv->ieee->freq_band & IEEE80211_24GHZ_BAND) {
+        if (priv->ieee->freq_band & IEEE80211_24GHZ_BAND) {
                 int start = channel_index;
                 for (i = 0; i < MAX_B_CHANNELS; i++) {
                         if (band_b_active_channel[i] == 0)
@@ -5134,20 +5205,19 @@ static int ipw_request_scan(struct ipw_priv *priv)
                                 continue;
                         channel_index++;
                         scan.channels_list[channel_index] =
-                                band_b_active_channel[i];
+                            band_b_active_channel[i];
                         ipw_set_scan_type(&scan, channel_index, scan_type);
                 }
 
                 if (start != channel_index) {
-                        scan.channels_list[start] = (u8)(IPW_B_MODE << 6) |
-                                (channel_index - start);
+                        scan.channels_list[start] = (u8) (IPW_B_MODE << 6) |
+                            (channel_index - start);
                 }
         }
 
         err = ipw_send_scan_request_ext(priv, &scan);
         if (err) {
-                IPW_DEBUG_HC("Sending scan command failed: %08X\n",
-                             err);
+                IPW_DEBUG_HC("Sending scan command failed: %08X\n", err);
                 return -EIO;
         }
 
@@ -5199,9 +5269,8 @@ static int ipw_set_channel(struct ipw_priv *priv, u8 channel)
         priv->config |= CFG_STATIC_CHANNEL;
 
         if (priv->channel == channel) {
-                IPW_DEBUG_INFO(
-                        "Request to set channel to current value (%d)\n",
-                        channel);
+                IPW_DEBUG_INFO("Request to set channel to current value (%d)\n",
+                               channel);
                 return 0;
         }
 
@@ -5229,8 +5298,7 @@ static int ipw_wx_set_freq(struct net_device *dev,
 
         /* if setting by freq convert to channel */
         if (fwrq->e == 1) {
-                if ((fwrq->m >= (int) 2.412e8 &&
-                     fwrq->m <= (int) 2.487e8)) {
+                if ((fwrq->m >= (int)2.412e8 && fwrq->m <= (int)2.487e8)) {
                         int f = fwrq->m / 100000;
                         int c = 0;
 
@@ -5248,12 +5316,11 @@ static int ipw_wx_set_freq(struct net_device *dev,
                 return -EOPNOTSUPP;
 
         IPW_DEBUG_WX("SET Freq/Channel -> %d \n", fwrq->m);
-        return ipw_set_channel(priv, (u8)fwrq->m);
+        return ipw_set_channel(priv, (u8) fwrq->m);
 
         return 0;
 }
 
-
 static int ipw_wx_get_freq(struct net_device *dev,
                            struct iw_request_info *info,
                            union iwreq_data *wrqu, char *extra)
@@ -5306,7 +5373,7 @@ static int ipw_wx_set_mode(struct net_device *dev,
 
         if (wrqu->mode == IW_MODE_MONITOR)
                 priv->net_dev->type = ARPHRD_IEEE80211;
-#endif /* CONFIG_IPW_PROMISC */
+#endif                          /* CONFIG_IPW_PROMISC */
 
 #ifdef CONFIG_PM
         /* Free the existing firmware and reset the fw_loaded
@@ -5324,12 +5391,12 @@ static int ipw_wx_set_mode(struct net_device *dev,
         priv->ieee->iw_mode = wrqu->mode;
         ipw_adapter_restart(priv);
 
-        return err;
+        return err;
 }
 
 static int ipw_wx_get_mode(struct net_device *dev,
-                               struct iw_request_info *info,
-                               union iwreq_data *wrqu, char *extra)
+                           struct iw_request_info *info,
+                           union iwreq_data *wrqu, char *extra)
 {
         struct ipw_priv *priv = ieee80211_priv(dev);
 
@@ -5339,7 +5406,6 @@ static int ipw_wx_get_mode(struct net_device *dev,
         return 0;
 }
 
-
 #define DEFAULT_RTS_THRESHOLD     2304U
 #define MIN_RTS_THRESHOLD         1U
 #define MAX_RTS_THRESHOLD         2304U
@@ -5383,19 +5449,19 @@ static int ipw_wx_get_range(struct net_device *dev,
         /* TODO: Find real max RSSI and stick here */
         range->max_qual.level = 0;
         range->max_qual.noise = 0;
-        range->max_qual.updated = 7; /* Updated all three */
+        range->max_qual.updated = 7;    /* Updated all three */
 
         range->avg_qual.qual = 70;
         /* TODO: Find real 'good' to 'bad' threshol value for RSSI */
-        range->avg_qual.level = 0; /* FIXME to real average level */
+        range->avg_qual.level = 0;      /* FIXME to real average level */
         range->avg_qual.noise = 0;
-        range->avg_qual.updated = 7; /* Updated all three */
+        range->avg_qual.updated = 7;    /* Updated all three */
 
-        range->num_bitrates = min(priv->rates.num_rates, (u8)IW_MAX_BITRATES);
+        range->num_bitrates = min(priv->rates.num_rates, (u8) IW_MAX_BITRATES);
 
         for (i = 0; i < range->num_bitrates; i++)
                 range->bitrate[i] = (priv->rates.supported_rates[i] & 0x7F) *
-                        500000;
+                    500000;
 
         range->max_rts = DEFAULT_RTS_THRESHOLD;
         range->min_frag = MIN_FRAG_THRESHOLD;
@@ -5410,7 +5476,7 @@ static int ipw_wx_get_range(struct net_device *dev,
         range->we_version_compiled = WIRELESS_EXT;
         range->we_version_source = 16;
 
-        range->num_channels = FREQ_COUNT;
+        range->num_channels = FREQ_COUNT;
 
         val = 0;
         for (i = 0; i < FREQ_COUNT; i++) {
@@ -5506,7 +5572,7 @@ static int ipw_wx_set_essid(struct net_device *dev,
                             union iwreq_data *wrqu, char *extra)
 {
         struct ipw_priv *priv = ieee80211_priv(dev);
-        char *essid = ""; /* ANY */
+        char *essid = "";       /* ANY */
         int length = 0;
 
         if (wrqu->essid.flags && wrqu->essid.length) {
@@ -5567,11 +5633,11 @@ static int ipw_wx_get_essid(struct net_device *dev,
                              escape_essid(priv->essid, priv->essid_len));
                 memcpy(extra, priv->essid, priv->essid_len);
                 wrqu->essid.length = priv->essid_len;
-                wrqu->essid.flags = 1; /* active */
+                wrqu->essid.flags = 1;  /* active */
         } else {
                 IPW_DEBUG_WX("Getting essid: ANY\n");
                 wrqu->essid.length = 0;
-                wrqu->essid.flags = 0; /* active */
+                wrqu->essid.flags = 0;  /* active */
         }
 
         return 0;
@@ -5587,15 +5653,14 @@ static int ipw_wx_set_nick(struct net_device *dev,
         if (wrqu->data.length > IW_ESSID_MAX_SIZE)
                 return -E2BIG;
 
-        wrqu->data.length = min((size_t)wrqu->data.length, sizeof(priv->nick));
+        wrqu->data.length = min((size_t) wrqu->data.length, sizeof(priv->nick));
         memset(priv->nick, 0, sizeof(priv->nick));
-        memcpy(priv->nick, extra,  wrqu->data.length);
+        memcpy(priv->nick, extra, wrqu->data.length);
         IPW_DEBUG_TRACE("<<\n");
         return 0;
 
 }
 
-
 static int ipw_wx_get_nick(struct net_device *dev,
                            struct iw_request_info *info,
                            union iwreq_data *wrqu, char *extra)
@@ -5604,11 +5669,10 @@ static int ipw_wx_get_nick(struct net_device *dev,
         IPW_DEBUG_WX("Getting nick\n");
         wrqu->data.length = strlen(priv->nick) + 1;
         memcpy(extra, priv->nick, wrqu->data.length);
-        wrqu->data.flags = 1; /* active */
+        wrqu->data.flags = 1;   /* active */
         return 0;
 }
 
-
 static int ipw_wx_set_rate(struct net_device *dev,
                            struct iw_request_info *info,
                            union iwreq_data *wrqu, char *extra)
@@ -5621,14 +5685,13 @@ static int ipw_wx_get_rate(struct net_device *dev,
                            struct iw_request_info *info,
                            union iwreq_data *wrqu, char *extra)
 {
-        struct ipw_priv * priv = ieee80211_priv(dev);
+        struct ipw_priv *priv = ieee80211_priv(dev);
         wrqu->bitrate.value = priv->last_rate;
 
         IPW_DEBUG_WX("GET Rate -> %d \n", wrqu->bitrate.value);
         return 0;
 }
 
-
 static int ipw_wx_set_rts(struct net_device *dev,
                           struct iw_request_info *info,
                           union iwreq_data *wrqu, char *extra)
@@ -5657,14 +5720,12 @@ static int ipw_wx_get_rts(struct net_device *dev,
         struct ipw_priv *priv = ieee80211_priv(dev);
         wrqu->rts.value = priv->rts_threshold;
         wrqu->rts.fixed = 0;    /* no auto select */
-        wrqu->rts.disabled =
-                (wrqu->rts.value == DEFAULT_RTS_THRESHOLD);
+        wrqu->rts.disabled = (wrqu->rts.value == DEFAULT_RTS_THRESHOLD);
 
         IPW_DEBUG_WX("GET RTS Threshold -> %d \n", wrqu->rts.value);
         return 0;
 }
 
-
 static int ipw_wx_set_txpow(struct net_device *dev,
                             struct iw_request_info *info,
                             union iwreq_data *wrqu, char *extra)
@@ -5679,8 +5740,7 @@ static int ipw_wx_set_txpow(struct net_device *dev,
         if (wrqu->power.flags != IW_TXPOW_DBM)
                 return -EINVAL;
 
-        if ((wrqu->power.value > 20) ||
-            (wrqu->power.value < -12))
+        if ((wrqu->power.value > 20) || (wrqu->power.value < -12))
                 return -EINVAL;
 
         priv->tx_power = wrqu->power.value;
@@ -5704,11 +5764,10 @@ static int ipw_wx_set_txpow(struct net_device *dev,
 
         return 0;
 
- error:
+      error:
         return -EIO;
 }
 
-
 static int ipw_wx_get_txpow(struct net_device *dev,
                             struct iw_request_info *info,
                             union iwreq_data *wrqu, char *extra)
@@ -5721,15 +5780,14 @@ static int ipw_wx_get_txpow(struct net_device *dev,
         wrqu->power.disabled = (priv->status & STATUS_RF_KILL_MASK) ? 1 : 0;
 
         IPW_DEBUG_WX("GET TX Power -> %s %d \n",
-                     wrqu->power.disabled ? "ON" : "OFF",
-                     wrqu->power.value);
+                     wrqu->power.disabled ? "ON" : "OFF", wrqu->power.value);
 
         return 0;
 }
 
 static int ipw_wx_set_frag(struct net_device *dev,
-                               struct iw_request_info *info,
-                               union iwreq_data *wrqu, char *extra)
+                           struct iw_request_info *info,
+                           union iwreq_data *wrqu, char *extra)
 {
         struct ipw_priv *priv = ieee80211_priv(dev);
 
@@ -5749,14 +5807,13 @@ static int ipw_wx_set_frag(struct net_device *dev,
 }
 
 static int ipw_wx_get_frag(struct net_device *dev,
-                               struct iw_request_info *info,
-                               union iwreq_data *wrqu, char *extra)
+                           struct iw_request_info *info,
+                           union iwreq_data *wrqu, char *extra)
 {
         struct ipw_priv *priv = ieee80211_priv(dev);
         wrqu->frag.value = priv->ieee->fts;
         wrqu->frag.fixed = 0;   /* no auto select */
-        wrqu->frag.disabled =
-                (wrqu->frag.value == DEFAULT_FTS);
+        wrqu->frag.disabled = (wrqu->frag.value == DEFAULT_FTS);
 
         IPW_DEBUG_WX("GET Frag Threshold -> %d \n", wrqu->frag.value);
 
@@ -5771,7 +5828,6 @@ static int ipw_wx_set_retry(struct net_device *dev,
         return -EOPNOTSUPP;
 }
 
-
 static int ipw_wx_get_retry(struct net_device *dev,
                             struct iw_request_info *info,
                             union iwreq_data *wrqu, char *extra)
@@ -5780,7 +5836,6 @@ static int ipw_wx_get_retry(struct net_device *dev,
         return -EOPNOTSUPP;
 }
 
-
 static int ipw_wx_set_scan(struct net_device *dev,
                            struct iw_request_info *info,
                            union iwreq_data *wrqu, char *extra)
@@ -5801,24 +5856,24 @@ static int ipw_wx_get_scan(struct net_device *dev,
 }
 
 static int ipw_wx_set_encode(struct net_device *dev,
-                                 struct iw_request_info *info,
-                                 union iwreq_data *wrqu, char *key)
+                             struct iw_request_info *info,
+                             union iwreq_data *wrqu, char *key)
 {
         struct ipw_priv *priv = ieee80211_priv(dev);
         return ieee80211_wx_set_encode(priv->ieee, info, wrqu, key);
 }
 
 static int ipw_wx_get_encode(struct net_device *dev,
-                                 struct iw_request_info *info,
-                                 union iwreq_data *wrqu, char *key)
+                             struct iw_request_info *info,
+                             union iwreq_data *wrqu, char *key)
 {
         struct ipw_priv *priv = ieee80211_priv(dev);
         return ieee80211_wx_get_encode(priv->ieee, info, wrqu, key);
 }
 
 static int ipw_wx_set_power(struct net_device *dev,
-                                struct iw_request_info *info,
-                                union iwreq_data *wrqu, char *extra)
+                            struct iw_request_info *info,
+                            union iwreq_data *wrqu, char *extra)
 {
         struct ipw_priv *priv = ieee80211_priv(dev);
         int err;
@@ -5837,11 +5892,11 @@ static int ipw_wx_set_power(struct net_device *dev,
         }
 
         switch (wrqu->power.flags & IW_POWER_MODE) {
-        case IW_POWER_ON:    /* If not specified */
-        case IW_POWER_MODE:  /* If set all mask */
-        case IW_POWER_ALL_R: /* If explicitely state all */
+        case IW_POWER_ON:       /* If not specified */
+        case IW_POWER_MODE:     /* If set all mask */
+        case IW_POWER_ALL_R:    /* If explicitely state all */
                 break;
-        default: /* Otherwise we don't support it */
+        default:                /* Otherwise we don't support it */
                 IPW_DEBUG_WX("SET PM Mode: %X not supported.\n",
                              wrqu->power.flags);
                 return -EOPNOTSUPP;
@@ -5849,7 +5904,7 @@ static int ipw_wx_set_power(struct net_device *dev,
 
         /* If the user hasn't specified a power management mode yet, default
          * to BATTERY */
-        if (IPW_POWER_LEVEL(priv->power_mode) == IPW_POWER_AC)
+        if (IPW_POWER_LEVEL(priv->power_mode) == IPW_POWER_AC)
                 priv->power_mode = IPW_POWER_ENABLED | IPW_POWER_BATTERY;
         else
                 priv->power_mode = IPW_POWER_ENABLED | priv->power_mode;
@@ -5859,15 +5914,14 @@ static int ipw_wx_set_power(struct net_device *dev,
                 return err;
         }
 
-        IPW_DEBUG_WX("SET Power Management Mode -> 0x%02X\n",
-                     priv->power_mode);
+        IPW_DEBUG_WX("SET Power Management Mode -> 0x%02X\n", priv->power_mode);
 
         return 0;
 }
 
 static int ipw_wx_get_power(struct net_device *dev,
-                                struct iw_request_info *info,
-                                union iwreq_data *wrqu, char *extra)
+                            struct iw_request_info *info,
+                            union iwreq_data *wrqu, char *extra)
 {
         struct ipw_priv *priv = ieee80211_priv(dev);
 
@@ -5883,8 +5937,8 @@ static int ipw_wx_get_power(struct net_device *dev,
 }
 
 static int ipw_wx_set_powermode(struct net_device *dev,
-                                    struct iw_request_info *info,
-                                    union iwreq_data *wrqu, char *extra)
+                                struct iw_request_info *info,
+                                union iwreq_data *wrqu, char *extra)
 {
         struct ipw_priv *priv = ieee80211_priv(dev);
         int mode = *(int *)extra;
@@ -5911,8 +5965,8 @@ static int ipw_wx_set_powermode(struct net_device *dev,
 
 #define MAX_WX_STRING 80
 static int ipw_wx_get_powermode(struct net_device *dev,
-                                    struct iw_request_info *info,
-                                    union iwreq_data *wrqu, char *extra)
+                                struct iw_request_info *info,
+                                union iwreq_data *wrqu, char *extra)
 {
         struct ipw_priv *priv = ieee80211_priv(dev);
         int level = IPW_POWER_LEVEL(priv->power_mode);
@@ -5935,7 +5989,7 @@ static int ipw_wx_get_powermode(struct net_device *dev,
         }
 
         if (!(priv->power_mode & IPW_POWER_ENABLED))
-                p += snprintf(p, MAX_WX_STRING - (p - extra)," OFF");
+                p += snprintf(p, MAX_WX_STRING - (p - extra), " OFF");
 
         wrqu->data.length = p - extra + 1;
 
@@ -5943,16 +5997,15 @@ static int ipw_wx_get_powermode(struct net_device *dev,
 }
 
 static int ipw_wx_set_wireless_mode(struct net_device *dev,
-                                    struct iw_request_info *info,
-                                    union iwreq_data *wrqu, char *extra)
+                                    struct iw_request_info *info,
+                                    union iwreq_data *wrqu, char *extra)
 {
-        struct ipw_priv *priv = ieee80211_priv(dev);
+        struct ipw_priv *priv = ieee80211_priv(dev);
         int mode = *(int *)extra;
         u8 band = 0, modulation = 0;
 
         if (mode == 0 || mode & ~IEEE_MODE_MASK) {
-                IPW_WARNING("Attempt to set invalid wireless mode: %d\n",
-                            mode);
+                IPW_WARNING("Attempt to set invalid wireless mode: %d\n", mode);
                 return -EINVAL;
         }
 
@@ -5988,31 +6041,30 @@ static int ipw_wx_set_wireless_mode(struct net_device *dev,
         priv->ieee->mode = mode;
         priv->ieee->freq_band = band;
         priv->ieee->modulation = modulation;
-        init_supported_rates(priv, &priv->rates);
+        init_supported_rates(priv, &priv->rates);
 
         /* If we are currently associated, or trying to associate
-         * then see if this is a new configuration (causing us to
+         * then see if this is a new configuration (causing us to
          * disassociate) */
-        if (priv->status & (STATUS_ASSOCIATED | STATUS_ASSOCIATING)) {
+        if (priv->status & (STATUS_ASSOCIATED | STATUS_ASSOCIATING)) {
                 /* The resulting association will trigger
                  * the new rates to be sent to the device */
-                IPW_DEBUG_ASSOC("Disassociating due to mode change.\n");
-                ipw_disassociate(priv);
+                IPW_DEBUG_ASSOC("Disassociating due to mode change.\n");
+                ipw_disassociate(priv);
         } else
                 ipw_send_supported_rates(priv, &priv->rates);
 
         IPW_DEBUG_WX("PRIV SET MODE: %c%c%c\n",
                      mode & IEEE_A ? 'a' : '.',
-                     mode & IEEE_B ? 'b' : '.',
-                     mode & IEEE_G ? 'g' : '.');
+                     mode & IEEE_B ? 'b' : '.', mode & IEEE_G ? 'g' : '.');
         return 0;
 }
 
 static int ipw_wx_get_wireless_mode(struct net_device *dev,
-                                    struct iw_request_info *info,
-                                    union iwreq_data *wrqu, char *extra)
+                                    struct iw_request_info *info,
+                                    union iwreq_data *wrqu, char *extra)
 {
-        struct ipw_priv *priv = ieee80211_priv(dev);
+        struct ipw_priv *priv = ieee80211_priv(dev);
 
         switch (priv->ieee->freq_band) {
         case IEEE80211_24GHZ_BAND:
@@ -6033,7 +6085,7 @@ static int ipw_wx_get_wireless_mode(struct net_device *dev,
                 strncpy(extra, "802.11a (1)", MAX_WX_STRING);
                 break;
 
-        default: /* Mixed Band */
+        default:                /* Mixed Band */
                 switch (priv->ieee->modulation) {
                 case IEEE80211_CCK_MODULATION:
                         strncpy(extra, "802.11ab (3)", MAX_WX_STRING);
@@ -6050,9 +6102,9 @@ static int ipw_wx_get_wireless_mode(struct net_device *dev,
 
         IPW_DEBUG_WX("PRIV GET MODE: %s\n", extra);
 
-        wrqu->data.length = strlen(extra) + 1;
+        wrqu->data.length = strlen(extra) + 1;
 
-        return 0;
+        return 0;
 }
 
 #ifdef CONFIG_IPW_PROMISC
@@ -6081,7 +6133,6 @@ static int ipw_wx_set_promisc(struct net_device *dev,
         return 0;
 }
 
-
 static int ipw_wx_reset(struct net_device *dev,
                         struct iw_request_info *info,
                         union iwreq_data *wrqu, char *extra)
@@ -6091,40 +6142,39 @@ static int ipw_wx_reset(struct net_device *dev,
         ipw_adapter_restart(priv);
         return 0;
 }
-#endif // CONFIG_IPW_PROMISC
+#endif                          // CONFIG_IPW_PROMISC
 
 /* Rebase the WE IOCTLs to zero for the handler array */
 #define IW_IOCTL(x) [(x)-SIOCSIWCOMMIT]
-static iw_handler ipw_wx_handlers[] =
-{
-        IW_IOCTL(SIOCGIWNAME)   = ipw_wx_get_name,
-        IW_IOCTL(SIOCSIWFREQ)   = ipw_wx_set_freq,
-        IW_IOCTL(SIOCGIWFREQ)   = ipw_wx_get_freq,
-        IW_IOCTL(SIOCSIWMODE)   = ipw_wx_set_mode,
-        IW_IOCTL(SIOCGIWMODE)   = ipw_wx_get_mode,
-        IW_IOCTL(SIOCGIWRANGE)  = ipw_wx_get_range,
-        IW_IOCTL(SIOCSIWAP)     = ipw_wx_set_wap,
-        IW_IOCTL(SIOCGIWAP)     = ipw_wx_get_wap,
-        IW_IOCTL(SIOCSIWSCAN)   = ipw_wx_set_scan,
-        IW_IOCTL(SIOCGIWSCAN)   = ipw_wx_get_scan,
-        IW_IOCTL(SIOCSIWESSID)  = ipw_wx_set_essid,
-        IW_IOCTL(SIOCGIWESSID)  = ipw_wx_get_essid,
-        IW_IOCTL(SIOCSIWNICKN)  = ipw_wx_set_nick,
-        IW_IOCTL(SIOCGIWNICKN)  = ipw_wx_get_nick,
-        IW_IOCTL(SIOCSIWRATE)   = ipw_wx_set_rate,
-        IW_IOCTL(SIOCGIWRATE)   = ipw_wx_get_rate,
-        IW_IOCTL(SIOCSIWRTS)    = ipw_wx_set_rts,
-        IW_IOCTL(SIOCGIWRTS)    = ipw_wx_get_rts,
-        IW_IOCTL(SIOCSIWFRAG)   = ipw_wx_set_frag,
-        IW_IOCTL(SIOCGIWFRAG)   = ipw_wx_get_frag,
-        IW_IOCTL(SIOCSIWTXPOW)  = ipw_wx_set_txpow,
-        IW_IOCTL(SIOCGIWTXPOW)  = ipw_wx_get_txpow,
-        IW_IOCTL(SIOCSIWRETRY)  = ipw_wx_set_retry,
-        IW_IOCTL(SIOCGIWRETRY)  = ipw_wx_get_retry,
-        IW_IOCTL(SIOCSIWENCODE) = ipw_wx_set_encode,
-        IW_IOCTL(SIOCGIWENCODE) = ipw_wx_get_encode,
-        IW_IOCTL(SIOCSIWPOWER)  = ipw_wx_set_power,
-        IW_IOCTL(SIOCGIWPOWER)  = ipw_wx_get_power,
+static iw_handler ipw_wx_handlers[] = {
+        IW_IOCTL(SIOCGIWNAME)   = ipw_wx_get_name,
+        IW_IOCTL(SIOCSIWFREQ)   = ipw_wx_set_freq,
+        IW_IOCTL(SIOCGIWFREQ)   = ipw_wx_get_freq,
+        IW_IOCTL(SIOCSIWMODE)   = ipw_wx_set_mode,
+        IW_IOCTL(SIOCGIWMODE)   = ipw_wx_get_mode,
+        IW_IOCTL(SIOCGIWRANGE)  = ipw_wx_get_range,
+        IW_IOCTL(SIOCSIWAP)     = ipw_wx_set_wap,
+        IW_IOCTL(SIOCGIWAP)     = ipw_wx_get_wap,
+        IW_IOCTL(SIOCSIWSCAN)   = ipw_wx_set_scan,
+        IW_IOCTL(SIOCGIWSCAN)   = ipw_wx_get_scan,
+        IW_IOCTL(SIOCSIWESSID)  = ipw_wx_set_essid,
+        IW_IOCTL(SIOCGIWESSID)  = ipw_wx_get_essid,
+        IW_IOCTL(SIOCSIWNICKN)  = ipw_wx_set_nick,
+        IW_IOCTL(SIOCGIWNICKN)  = ipw_wx_get_nick,
+        IW_IOCTL(SIOCSIWRATE)   = ipw_wx_set_rate,
+        IW_IOCTL(SIOCGIWRATE)   = ipw_wx_get_rate,
+        IW_IOCTL(SIOCSIWRTS)    = ipw_wx_set_rts,
+        IW_IOCTL(SIOCGIWRTS)    = ipw_wx_get_rts,
+        IW_IOCTL(SIOCSIWFRAG)   = ipw_wx_set_frag,
+        IW_IOCTL(SIOCGIWFRAG)   = ipw_wx_get_frag,
+        IW_IOCTL(SIOCSIWTXPOW)  = ipw_wx_set_txpow,
+        IW_IOCTL(SIOCGIWTXPOW)  = ipw_wx_get_txpow,
+        IW_IOCTL(SIOCSIWRETRY)  = ipw_wx_set_retry,
+        IW_IOCTL(SIOCGIWRETRY)  = ipw_wx_get_retry,
+        IW_IOCTL(SIOCSIWENCODE) = ipw_wx_set_encode,
+        IW_IOCTL(SIOCGIWENCODE) = ipw_wx_get_encode,
+        IW_IOCTL(SIOCSIWPOWER)  = ipw_wx_set_power,
+        IW_IOCTL(SIOCGIWPOWER)  = ipw_wx_get_power,
 };
 
 #define IPW_PRIV_SET_POWER      SIOCIWFIRSTPRIV
@@ -6134,38 +6184,31 @@ static iw_handler ipw_wx_handlers[] =
 #define IPW_PRIV_SET_PROMISC    SIOCIWFIRSTPRIV+4
 #define IPW_PRIV_RESET          SIOCIWFIRSTPRIV+5
 
-
 static struct iw_priv_args ipw_priv_args[] = {
         {
-                .cmd = IPW_PRIV_SET_POWER,
-                .set_args = IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
-                .name = "set_power"
-        },
+         .cmd = IPW_PRIV_SET_POWER,
+         .set_args = IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
+         .name = "set_power"},
         {
-                .cmd = IPW_PRIV_GET_POWER,
-                .get_args = IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_FIXED | MAX_WX_STRING,
-                .name = "get_power"
-        },
+         .cmd = IPW_PRIV_GET_POWER,
+         .get_args = IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_FIXED | MAX_WX_STRING,
+         .name = "get_power"},
         {
-                .cmd = IPW_PRIV_SET_MODE,
-                .set_args = IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
-                .name = "set_mode"
-        },
+         .cmd = IPW_PRIV_SET_MODE,
+         .set_args = IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
+         .name = "set_mode"},
         {
-                .cmd = IPW_PRIV_GET_MODE,
-                .get_args = IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_FIXED | MAX_WX_STRING,
-                .name = "get_mode"
-        },
+         .cmd = IPW_PRIV_GET_MODE,
+         .get_args = IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_FIXED | MAX_WX_STRING,
+         .name = "get_mode"},
 #ifdef CONFIG_IPW_PROMISC
         {
-                IPW_PRIV_SET_PROMISC,
-                IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 2, 0, "monitor"
-        },
+         IPW_PRIV_SET_PROMISC,
+         IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 2, 0, "monitor"},
         {
-                IPW_PRIV_RESET,
-                IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 0, 0, "reset"
-        },
-#endif /* CONFIG_IPW_PROMISC */
+         IPW_PRIV_RESET,
+         IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 0, 0, "reset"},
+#endif                          /* CONFIG_IPW_PROMISC */
 };
 
 static iw_handler ipw_priv_handler[] = {
@@ -6179,25 +6222,21 @@ static iw_handler ipw_priv_handler[] = {
 #endif
 };
 
-static struct iw_handler_def ipw_wx_handler_def =
-{
-        .standard       = ipw_wx_handlers,
-        .num_standard   = ARRAY_SIZE(ipw_wx_handlers),
-        .num_private    = ARRAY_SIZE(ipw_priv_handler),
-        .num_private_args = ARRAY_SIZE(ipw_priv_args),
-        .private        = ipw_priv_handler,
-        .private_args   = ipw_priv_args,
+static struct iw_handler_def ipw_wx_handler_def = {
+        .standard               = ipw_wx_handlers,
+        .num_standard           = ARRAY_SIZE(ipw_wx_handlers),
+        .num_private            = ARRAY_SIZE(ipw_priv_handler),
+        .num_private_args       = ARRAY_SIZE(ipw_priv_args),
+        .private                = ipw_priv_handler,
+        .private_args           = ipw_priv_args,
 };
 
-
-
-
 /*
  * Get wireless statistics.
  * Called by /proc/net/wireless
  * Also called by SIOCGIWSTATS
  */
-static struct iw_statistics *ipw_get_wireless_stats(struct net_device * dev)
+static struct iw_statistics *ipw_get_wireless_stats(struct net_device *dev)
 {
         struct ipw_priv *priv = ieee80211_priv(dev);
         struct iw_statistics *wstats;
@@ -6217,7 +6256,7 @@ static struct iw_statistics *ipw_get_wireless_stats(struct net_device * dev)
                 wstats->qual.noise = 0;
                 wstats->qual.updated = 7;
                 wstats->qual.updated |= IW_QUAL_NOISE_INVALID |
-                        IW_QUAL_QUAL_INVALID | IW_QUAL_LEVEL_INVALID;
+                    IW_QUAL_QUAL_INVALID | IW_QUAL_LEVEL_INVALID;
                 return wstats;
         }
 
@@ -6225,7 +6264,7 @@ static struct iw_statistics *ipw_get_wireless_stats(struct net_device * dev)
         wstats->qual.level = average_value(&priv->average_rssi);
         wstats->qual.noise = average_value(&priv->average_noise);
         wstats->qual.updated = IW_QUAL_QUAL_UPDATED | IW_QUAL_LEVEL_UPDATED |
-                IW_QUAL_NOISE_UPDATED;
+            IW_QUAL_NOISE_UPDATED;
 
         wstats->miss.beacon = average_value(&priv->average_missed_beacons);
         wstats->discard.retries = priv->last_tx_failures;
@@ -6238,13 +6277,12 @@ static struct iw_statistics *ipw_get_wireless_stats(struct net_device * dev)
         return wstats;
 }
 
-
 /* net device stuff */
 
 static inline void init_sys_config(struct ipw_sys_config *sys_config)
 {
-        memset(sys_config, 0, sizeof(struct ipw_sys_config));
-        sys_config->bt_coexistence = 1; /* We may need to look into prvStaBtConfig */
+        memset(sys_config, 0, sizeof(struct ipw_sys_config));
+        sys_config->bt_coexistence = 1; /* We may need to look into prvStaBtConfig */
         sys_config->answer_broadcast_ssid_probe = 0;
         sys_config->accept_all_data_frames = 0;
         sys_config->accept_non_directed_frames = 1;
@@ -6253,7 +6291,7 @@ static inline void init_sys_config(struct ipw_sys_config *sys_config)
         sys_config->exclude_multicast_unencrypted = 0;
         sys_config->disable_multicast_decryption = 1;
         sys_config->antenna_diversity = CFG_SYS_ANTENNA_BOTH;
-        sys_config->pass_crc_to_host = 0; /* TODO: See if 1 gives us FCS */
+        sys_config->pass_crc_to_host = 0;       /* TODO: See if 1 gives us FCS */
         sys_config->dot11g_auto_detection = 0;
         sys_config->enable_cts_to_self = 0;
         sys_config->bt_coexist_collision_thr = 0;
@@ -6288,7 +6326,7 @@ we need to heavily modify the ieee80211_skb_to_txb.
 static inline void ipw_tx_skb(struct ipw_priv *priv, struct ieee80211_txb *txb)
 {
         struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)
-                txb->fragments[0]->data;
+            txb->fragments[0]->data;
         int i = 0;
         struct tfd_frame *tfd;
         struct clx2_tx_queue *txq = &priv->txq[0];
@@ -6300,7 +6338,7 @@ static inline void ipw_tx_skb(struct ipw_priv *priv, struct ieee80211_txb *txb)
         case IW_MODE_ADHOC:
                 hdr_len = IEEE80211_3ADDR_LEN;
                 unicast = !is_broadcast_ether_addr(hdr->addr1) &&
-                        !is_multicast_ether_addr(hdr->addr1);
+                    !is_multicast_ether_addr(hdr->addr1);
                 id = ipw_find_station(priv, hdr->addr1);
                 if (id == IPW_INVALID_STATION) {
                         id = ipw_add_station(priv, hdr->addr1);
@@ -6316,7 +6354,7 @@ static inline void ipw_tx_skb(struct ipw_priv *priv, struct ieee80211_txb *txb)
         case IW_MODE_INFRA:
         default:
                 unicast = !is_broadcast_ether_addr(hdr->addr3) &&
-                        !is_multicast_ether_addr(hdr->addr3);
+                    !is_multicast_ether_addr(hdr->addr3);
                 hdr_len = IEEE80211_3ADDR_LEN;
                 id = 0;
                 break;
@@ -6349,7 +6387,7 @@ static inline void ipw_tx_skb(struct ipw_priv *priv, struct ieee80211_txb *txb)
         memcpy(&tfd->u.data.tfd.tfd_24.mchdr, hdr, hdr_len);
 
         /* payload */
-        tfd->u.data.num_chunks = min((u8)(NUM_TFD_CHUNKS - 2), txb->nr_frags);
+        tfd->u.data.num_chunks = min((u8) (NUM_TFD_CHUNKS - 2), txb->nr_frags);
         for (i = 0; i < tfd->u.data.num_chunks; i++) {
                 IPW_DEBUG_TX("Dumping TX packet frag %i of %i (%d bytes):\n",
                              i, tfd->u.data.num_chunks,
@@ -6357,9 +6395,11 @@ static inline void ipw_tx_skb(struct ipw_priv *priv, struct ieee80211_txb *txb)
                 printk_buf(IPW_DL_TX, txb->fragments[i]->data + hdr_len,
                            txb->fragments[i]->len - hdr_len);
 
-                tfd->u.data.chunk_ptr[i] = pci_map_single(
-                        priv->pci_dev, txb->fragments[i]->data + hdr_len,
-                        txb->fragments[i]->len - hdr_len, PCI_DMA_TODEVICE);
+                tfd->u.data.chunk_ptr[i] =
+                    pci_map_single(priv->pci_dev,
+                                   txb->fragments[i]->data + hdr_len,
+                                   txb->fragments[i]->len - hdr_len,
+                                   PCI_DMA_TODEVICE);
                 tfd->u.data.chunk_len[i] = txb->fragments[i]->len - hdr_len;
         }
 
@@ -6379,16 +6419,16 @@ static inline void ipw_tx_skb(struct ipw_priv *priv, struct ieee80211_txb *txb)
                         for (j = i; j < txb->nr_frags; j++) {
                                 int size = txb->fragments[j]->len - hdr_len;
                                 printk(KERN_INFO "Adding frag %d %d...\n",
-                                        j, size);
+                                       j, size);
                                 memcpy(skb_put(skb, size),
-                                        txb->fragments[j]->data + hdr_len,
-                                        size);
+                                       txb->fragments[j]->data + hdr_len, size);
                         }
                         dev_kfree_skb_any(txb->fragments[i]);
                         txb->fragments[i] = skb;
-                        tfd->u.data.chunk_ptr[i] = pci_map_single(
-                                priv->pci_dev, skb->data,
-                                tfd->u.data.chunk_len[i], PCI_DMA_TODEVICE);
+                        tfd->u.data.chunk_ptr[i] =
+                            pci_map_single(priv->pci_dev, skb->data,
+                                           tfd->u.data.chunk_len[i],
+                                           PCI_DMA_TODEVICE);
                         tfd->u.data.num_chunks++;
                 }
         }
@@ -6402,7 +6442,7 @@ static inline void ipw_tx_skb(struct ipw_priv *priv, struct ieee80211_txb *txb)
 
         return;
 
- drop:
+      drop:
         IPW_DEBUG_DROP("Silently dropping Tx packet.\n");
         ieee80211_txb_free(txb);
 }
@@ -6429,7 +6469,7 @@ static int ipw_net_hard_start_xmit(struct ieee80211_txb *txb,
         spin_unlock_irqrestore(&priv->lock, flags);
         return 0;
 
- fail_unlock:
+      fail_unlock:
         spin_unlock_irqrestore(&priv->lock, flags);
         return 1;
 }
@@ -6478,7 +6518,7 @@ static void ipw_ethtool_get_drvinfo(struct net_device *dev,
         len = sizeof(date);
         ipw_get_ordinal(p, IPW_ORD_STAT_FW_DATE, date, &len);
 
-        snprintf(info->fw_version, sizeof(info->fw_version),"%s (%s)",
+        snprintf(info->fw_version, sizeof(info->fw_version), "%s (%s)",
                  vers, date);
         strcpy(info->bus_info, pci_name(p->pci_dev));
         info->eedump_len = CX2_EEPROM_IMAGE_SIZE;
@@ -6496,19 +6536,19 @@ static int ipw_ethtool_get_eeprom_len(struct net_device *dev)
 }
 
 static int ipw_ethtool_get_eeprom(struct net_device *dev,
-                                  struct ethtool_eeprom *eeprom, u8 *bytes)
+                                  struct ethtool_eeprom *eeprom, u8 * bytes)
 {
         struct ipw_priv *p = ieee80211_priv(dev);
 
         if (eeprom->offset + eeprom->len > CX2_EEPROM_IMAGE_SIZE)
                 return -EINVAL;
 
-        memcpy(bytes, &((u8 *)p->eeprom)[eeprom->offset], eeprom->len);
+        memcpy(bytes, &((u8 *) p->eeprom)[eeprom->offset], eeprom->len);
         return 0;
 }
 
 static int ipw_ethtool_set_eeprom(struct net_device *dev,
-                                  struct ethtool_eeprom *eeprom, u8 *bytes)
+                                  struct ethtool_eeprom *eeprom, u8 * bytes)
 {
         struct ipw_priv *p = ieee80211_priv(dev);
         int i;
@@ -6516,21 +6556,20 @@ static int ipw_ethtool_set_eeprom(struct net_device *dev,
         if (eeprom->offset + eeprom->len > CX2_EEPROM_IMAGE_SIZE)
                 return -EINVAL;
 
-        memcpy(&((u8 *)p->eeprom)[eeprom->offset], bytes, eeprom->len);
+        memcpy(&((u8 *) p->eeprom)[eeprom->offset], bytes, eeprom->len);
         for (i = IPW_EEPROM_DATA;
-             i < IPW_EEPROM_DATA + CX2_EEPROM_IMAGE_SIZE;
-             i++)
+             i < IPW_EEPROM_DATA + CX2_EEPROM_IMAGE_SIZE; i++)
                 ipw_write8(p, i, p->eeprom[i]);
 
         return 0;
 }
 
 static struct ethtool_ops ipw_ethtool_ops = {
-         .get_link       = ipw_ethtool_get_link,
-         .get_drvinfo    = ipw_ethtool_get_drvinfo,
-         .get_eeprom_len = ipw_ethtool_get_eeprom_len,
-         .get_eeprom     = ipw_ethtool_get_eeprom,
-         .set_eeprom     = ipw_ethtool_set_eeprom,
+        .get_link       = ipw_ethtool_get_link,
+        .get_drvinfo    = ipw_ethtool_get_drvinfo,
+        .get_eeprom_len = ipw_ethtool_get_eeprom_len,
+        .get_eeprom     = ipw_ethtool_get_eeprom,
+        .set_eeprom     = ipw_ethtool_set_eeprom,
 };
 
 static irqreturn_t ipw_isr(int irq, void *data, struct pt_regs *regs)
@@ -6574,10 +6613,10 @@ static irqreturn_t ipw_isr(int irq, void *data, struct pt_regs *regs)
 
         tasklet_schedule(&priv->irq_tasklet);
 
-        spin_unlock(&priv->lock);
+        spin_unlock(&priv->lock);
 
         return IRQ_HANDLED;
- none:
+      none:
         spin_unlock(&priv->lock);
         return IRQ_NONE;
 }
@@ -6609,7 +6648,7 @@ static void ipw_rf_kill(void *adapter)
                 IPW_DEBUG_RF_KILL("HW RF Kill deactivated.  SW RF Kill still "
                                   "enabled\n");
 
- exit_unlock:
+      exit_unlock:
         spin_unlock_irqrestore(&priv->lock, flags);
 }
 
@@ -6642,7 +6681,6 @@ static int ipw_setup_deferred_work(struct ipw_priv *priv)
         return ret;
 }
 
-
 static void shim__set_security(struct net_device *dev,
                                struct ieee80211_security *sec)
 {
@@ -6683,8 +6721,7 @@ static void shim__set_security(struct net_device *dev,
                 priv->status |= STATUS_SECURITY_UPDATED;
         }
 
-        if (sec->flags & SEC_ENABLED &&
-            priv->sec.enabled != sec->enabled) {
+        if (sec->flags & SEC_ENABLED && priv->sec.enabled != sec->enabled) {
                 priv->sec.flags |= SEC_ENABLED;
                 priv->sec.enabled = sec->enabled;
                 priv->status |= STATUS_SECURITY_UPDATED;
@@ -6694,8 +6731,7 @@ static void shim__set_security(struct net_device *dev,
                         priv->capability &= ~CAP_PRIVACY_ON;
         }
 
-        if (sec->flags & SEC_LEVEL &&
-            priv->sec.level != sec->level) {
+        if (sec->flags & SEC_LEVEL && priv->sec.level != sec->level) {
                 priv->sec.level = sec->level;
                 priv->sec.flags |= SEC_LEVEL;
                 priv->status |= STATUS_SECURITY_UPDATED;
@@ -6709,7 +6745,7 @@ static void shim__set_security(struct net_device *dev,
             (((priv->assoc_request.capability &
                WLAN_CAPABILITY_PRIVACY) && !sec->enabled) ||
              (!(priv->assoc_request.capability &
-                 WLAN_CAPABILITY_PRIVACY) && sec->enabled))) {
+                WLAN_CAPABILITY_PRIVACY) && sec->enabled))) {
                 IPW_DEBUG_ASSOC("Disassociating due to capability "
                                 "change.\n");
                 ipw_disassociate(priv);
@@ -6723,7 +6759,7 @@ static int init_supported_rates(struct ipw_priv *priv,
         /* TODO: Mask out rates based on priv->rates_mask */
 
         memset(rates, 0, sizeof(*rates));
-        /* configure supported rates */
+        /* configure supported rates */
         switch (priv->ieee->freq_band) {
         case IEEE80211_52GHZ_BAND:
                 rates->ieee_mode = IPW_A_MODE;
@@ -6732,7 +6768,7 @@ static int init_supported_rates(struct ipw_priv *priv,
                                         IEEE80211_OFDM_DEFAULT_RATES_MASK);
                 break;
 
-        default: /* Mixed or 2.4Ghz */
+        default:                /* Mixed or 2.4Ghz */
                 rates->ieee_mode = IPW_G_MODE;
                 rates->purpose = IPW_RATE_CAPABILITIES;
                 ipw_add_cck_scan_rates(rates, IEEE80211_CCK_MODULATION,
@@ -6783,8 +6819,8 @@ static int ipw_config(struct ipw_priv *priv)
         if (ipw_send_system_config(priv, &priv->sys_config))
                 goto error;
 
-        init_supported_rates(priv, &priv->rates);
-        if (ipw_send_supported_rates(priv, &priv->rates))
+        init_supported_rates(priv, &priv->rates);
+        if (ipw_send_supported_rates(priv, &priv->rates))
                 goto error;
 
         /* Set request-to-send threshold */
@@ -6806,7 +6842,7 @@ static int ipw_config(struct ipw_priv *priv)
 
         return 0;
 
- error:
+      error:
         return -EIO;
 }
 
@@ -6818,13 +6854,12 @@ static int ipw_up(struct ipw_priv *priv)
         if (priv->status & STATUS_EXIT_PENDING)
                 return -EIO;
 
-        for (i = 0; i < MAX_HW_RESTARTS; i++ ) {
+        for (i = 0; i < MAX_HW_RESTARTS; i++) {
                 /* Load the microcode, firmware, and eeprom.
                  * Also start the clocks. */
                 rc = ipw_load(priv);
                 if (rc) {
-                        IPW_ERROR("Unable to load firmware: 0x%08X\n",
-                                        rc);
+                        IPW_ERROR("Unable to load firmware: 0x%08X\n", rc);
                         return rc;
                 }
 
@@ -6857,8 +6892,7 @@ static int ipw_up(struct ipw_priv *priv)
 
         /* tried to restart and config the device for as long as our
          * patience could withstand */
-        IPW_ERROR("Unable to initialize device after %d attempts.\n",
-                  i);
+        IPW_ERROR("Unable to initialize device after %d attempts.\n", i);
         return -EIO;
 }
 
@@ -6923,10 +6957,10 @@ static struct pci_device_id card_ids[] = {
         {PCI_VENDOR_ID_INTEL, 0x1043, 0x8086, 0x2761, 0, 0, 0},
         {PCI_VENDOR_ID_INTEL, 0x1043, 0x8086, 0x2762, 0, 0, 0},
         {PCI_VENDOR_ID_INTEL, 0x104f, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_INTEL, 0x4220, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, /* BG */
-        {PCI_VENDOR_ID_INTEL, 0x4221, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, /* 2225BG */
-        {PCI_VENDOR_ID_INTEL, 0x4223, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, /* ABG */
-        {PCI_VENDOR_ID_INTEL, 0x4224, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, /* ABG */
+        {PCI_VENDOR_ID_INTEL, 0x4220, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, /* BG */
+        {PCI_VENDOR_ID_INTEL, 0x4221, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, /* 2225BG */
+        {PCI_VENDOR_ID_INTEL, 0x4223, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, /* ABG */
+        {PCI_VENDOR_ID_INTEL, 0x4224, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, /* ABG */
 
         /* required last entry */
         {0,}
@@ -6954,11 +6988,10 @@ static struct attribute *ipw_sysfs_entries[] = {
 
 static struct attribute_group ipw_attribute_group = {
         .name = NULL,           /* put in device directory */
-        .attrs  = ipw_sysfs_entries,
+        .attrs = ipw_sysfs_entries,
 };
 
-static int ipw_pci_probe(struct pci_dev *pdev,
-                         const struct pci_device_id *ent)
+static int ipw_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 {
         int err = 0;
         struct net_device *net_dev;
@@ -7051,7 +7084,7 @@ static int ipw_pci_probe(struct pci_dev *pdev,
                 priv->config |= CFG_STATIC_CHANNEL;
                 priv->channel = channel;
                 IPW_DEBUG_INFO("Bind to static channel %d\n", channel);
-                IPW_DEBUG_INFO("Bind to static channel %d\n", channel);
+                IPW_DEBUG_INFO("Bind to static channel %d\n", channel);
                 /* TODO: Validate that provided channel is in range */
         }
 
@@ -7078,9 +7111,9 @@ static int ipw_pci_probe(struct pci_dev *pdev,
                 priv->ieee->abg_ture = 1;
                 band = IEEE80211_52GHZ_BAND | IEEE80211_24GHZ_BAND;
                 modulation = IEEE80211_OFDM_MODULATION |
-                        IEEE80211_CCK_MODULATION;
+                    IEEE80211_CCK_MODULATION;
                 priv->adapter = IPW_2915ABG;
-                priv->ieee->mode = IEEE_A|IEEE_G|IEEE_B;
+                priv->ieee->mode = IEEE_A | IEEE_G | IEEE_B;
         } else {
                 if (priv->pci_dev->device == 0x4221)
                         printk(KERN_INFO DRV_NAME
@@ -7094,9 +7127,9 @@ static int ipw_pci_probe(struct pci_dev *pdev,
                 priv->ieee->abg_ture = 0;
                 band = IEEE80211_24GHZ_BAND;
                 modulation = IEEE80211_OFDM_MODULATION |
-                        IEEE80211_CCK_MODULATION;
+                    IEEE80211_CCK_MODULATION;
                 priv->adapter = IPW_2200BG;
-                priv->ieee->mode = IEEE_G|IEEE_B;
+                priv->ieee->mode = IEEE_G | IEEE_B;
         }
 
         priv->ieee->freq_band = band;
@@ -7110,11 +7143,10 @@ static int ipw_pci_probe(struct pci_dev *pdev,
         priv->rts_threshold = DEFAULT_RTS_THRESHOLD;
 
         /* If power management is turned on, default to AC mode */
-        priv->power_mode = IPW_POWER_AC;
+        priv->power_mode = IPW_POWER_AC;
         priv->tx_power = IPW_DEFAULT_TX_POWER;
 
-        err = request_irq(pdev->irq, ipw_isr, SA_SHIRQ, DRV_NAME,
-                          priv);
+        err = request_irq(pdev->irq, ipw_isr, SA_SHIRQ, DRV_NAME, priv);
         if (err) {
                 IPW_ERROR("Error allocating IRQ %d\n", pdev->irq);
                 goto out_destroy_workqueue;
@@ -7136,7 +7168,7 @@ static int ipw_pci_probe(struct pci_dev *pdev,
         net_dev->wireless_handlers = &ipw_wx_handler_def;
         net_dev->ethtool_ops = &ipw_ethtool_ops;
         net_dev->irq = pdev->irq;
-        net_dev->base_addr = (unsigned long )priv->hw_base;
+        net_dev->base_addr = (unsigned long)priv->hw_base;
         net_dev->mem_start = pci_resource_start(pdev, 0);
         net_dev->mem_end = net_dev->mem_start + pci_resource_len(pdev, 0) - 1;
 
@@ -7154,23 +7186,23 @@ static int ipw_pci_probe(struct pci_dev *pdev,
 
         return 0;
 
- out_remove_group:
+      out_remove_group:
         sysfs_remove_group(&pdev->dev.kobj, &ipw_attribute_group);
- out_release_irq:
+      out_release_irq:
         free_irq(pdev->irq, priv);
- out_destroy_workqueue:
+      out_destroy_workqueue:
         destroy_workqueue(priv->workqueue);
         priv->workqueue = NULL;
- out_iounmap:
+      out_iounmap:
         iounmap(priv->hw_base);
- out_pci_release_regions:
+      out_pci_release_regions:
         pci_release_regions(pdev);
- out_pci_disable_device:
+      out_pci_disable_device:
         pci_disable_device(pdev);
         pci_set_drvdata(pdev, NULL);
- out_free_ieee80211:
+      out_free_ieee80211:
         free_ieee80211(priv->net_dev);
- out:
+      out:
         return err;
 }
 
@@ -7223,16 +7255,15 @@ static void ipw_pci_remove(struct pci_dev *pdev)
 #endif
 }
 
-
 #ifdef CONFIG_PM
-static int ipw_pci_suspend(struct pci_dev *pdev, u32 state)
+static int ipw_pci_suspend(struct pci_dev *pdev, pm_message_t state)
 {
         struct ipw_priv *priv = pci_get_drvdata(pdev);
         struct net_device *dev = priv->net_dev;
 
         printk(KERN_INFO "%s: Going into suspend...\n", dev->name);
 
-        /* Take down the device; powers it off, etc. */
+        /* Take down the device; powers it off, etc. */
         ipw_down(priv);
 
         /* Remove the PRESENT state of the device */
@@ -7240,7 +7271,7 @@ static int ipw_pci_suspend(struct pci_dev *pdev, u32 state)
 
         pci_save_state(pdev);
         pci_disable_device(pdev);
-        pci_set_power_state(pdev, state);
+        pci_set_power_state(pdev, pci_choose_state(pdev, state));
 
         return 0;
 }
@@ -7306,8 +7337,7 @@ static int __init ipw_init(void)
                 return ret;
         }
 
-        ret = driver_create_file(&ipw_driver.driver,
-                                 &driver_attr_debug_level);
+        ret = driver_create_file(&ipw_driver.driver, &driver_attr_debug_level);
         if (ret) {
                 IPW_ERROR("Unable to create driver sysfs file\n");
                 pci_unregister_driver(&ipw_driver);
diff --git a/drivers/net/wireless/ipw2200.h b/drivers/net/wireless/ipw2200.h
index 3bff09d9315..5b00882133f 100644
--- a/drivers/net/wireless/ipw2200.h
+++ b/drivers/net/wireless/ipw2200.h
@@ -42,9 +42,11 @@
 #include <linux/etherdevice.h>
 #include <linux/delay.h>
 #include <linux/random.h>
+#include <linux/dma-mapping.h>
 
 #include <linux/firmware.h>
 #include <linux/wireless.h>
+#include <linux/dma-mapping.h>
 #include <asm/io.h>
 
 #include <net/ieee80211.h>
@@ -54,8 +56,7 @@
 #include <linux/workqueue.h>
 
 /* Authentication  and Association States */
-enum connection_manager_assoc_states
-{
+enum connection_manager_assoc_states {
         CMAS_INIT = 0,
         CMAS_TX_AUTH_SEQ_1,
         CMAS_RX_AUTH_SEQ_2,
@@ -72,7 +73,6 @@ enum connection_manager_assoc_states
         CMAS_LAST
 };
 
-
 #define IPW_WAIT                     (1<<0)
 #define IPW_QUIET                    (1<<1)
 #define IPW_ROAMING                  (1<<2)
@@ -188,7 +188,6 @@ enum connection_manager_assoc_states
 #define DCT_FLAG_EXT_MODE_CCK  0x01
 #define DCT_FLAG_EXT_MODE_OFDM 0x00
 
-
 #define TX_RX_TYPE_MASK                    0xFF
 #define TX_FRAME_TYPE                      0x00
 #define TX_HOST_COMMAND_TYPE               0x01
@@ -240,107 +239,97 @@ enum connection_manager_assoc_states
  * Contains common data for Rx and Tx queues
  */
 struct clx2_queue {
-        int n_bd;                      /**< number of BDs in this queue */
-        int first_empty;               /**< 1-st empty entry (index) */
-        int last_used;                 /**< last used entry (index) */
-        u32 reg_w;                   /**< 'write' reg (queue head), addr in domain 1 */
-        u32 reg_r;                   /**< 'read' reg (queue tail), addr in domain 1 */
-        dma_addr_t dma_addr;            /**< physical addr for BD's */
-        int low_mark;                  /**< low watermark, resume queue if free space more than this */
-        int high_mark;                 /**< high watermark, stop queue if free space less than this */
+        int n_bd;                      /**< number of BDs in this queue */
+        int first_empty;               /**< 1-st empty entry (index) */
+        int last_used;                 /**< last used entry (index) */
+        u32 reg_w;                   /**< 'write' reg (queue head), addr in domain 1 */
+        u32 reg_r;                   /**< 'read' reg (queue tail), addr in domain 1 */
+        dma_addr_t dma_addr;            /**< physical addr for BD's */
+        int low_mark;                  /**< low watermark, resume queue if free space more than this */
+        int high_mark;                 /**< high watermark, stop queue if free space less than this */
 } __attribute__ ((packed));
 
-struct machdr32
-{
+struct machdr32 {
         u16 frame_ctl;
-        u16 duration;     // watch out for endians!
-        u8 addr1[ MACADRR_BYTE_LEN ];
-        u8 addr2[ MACADRR_BYTE_LEN ];
-        u8 addr3[ MACADRR_BYTE_LEN ];
-        u16 seq_ctrl;     // more endians!
-        u8 addr4[ MACADRR_BYTE_LEN ];
+        u16 duration;           // watch out for endians!
+        u8 addr1[MACADRR_BYTE_LEN];
+        u8 addr2[MACADRR_BYTE_LEN];
+        u8 addr3[MACADRR_BYTE_LEN];
+        u16 seq_ctrl;           // more endians!
+        u8 addr4[MACADRR_BYTE_LEN];
         u16 qos_ctrl;
-} __attribute__ ((packed)) ;
+} __attribute__ ((packed));
 
-struct machdr30
-{
+struct machdr30 {
         u16 frame_ctl;
-        u16 duration;     // watch out for endians!
-        u8 addr1[ MACADRR_BYTE_LEN ];
-        u8 addr2[ MACADRR_BYTE_LEN ];
-        u8 addr3[ MACADRR_BYTE_LEN ];
-        u16 seq_ctrl;     // more endians!
-        u8 addr4[ MACADRR_BYTE_LEN ];
-} __attribute__ ((packed)) ;
-
-struct machdr26
-{
+        u16 duration;           // watch out for endians!
+        u8 addr1[MACADRR_BYTE_LEN];
+        u8 addr2[MACADRR_BYTE_LEN];
+        u8 addr3[MACADRR_BYTE_LEN];
+        u16 seq_ctrl;           // more endians!
+        u8 addr4[MACADRR_BYTE_LEN];
+} __attribute__ ((packed));
+
+struct machdr26 {
         u16 frame_ctl;
-        u16 duration;     // watch out for endians!
-        u8 addr1[ MACADRR_BYTE_LEN ];
-        u8 addr2[ MACADRR_BYTE_LEN ];
-        u8 addr3[ MACADRR_BYTE_LEN ];
-        u16 seq_ctrl;     // more endians!
+        u16 duration;           // watch out for endians!
+        u8 addr1[MACADRR_BYTE_LEN];
+        u8 addr2[MACADRR_BYTE_LEN];
+        u8 addr3[MACADRR_BYTE_LEN];
+        u16 seq_ctrl;           // more endians!
         u16 qos_ctrl;
-} __attribute__ ((packed)) ;
+} __attribute__ ((packed));
 
-struct machdr24
-{
+struct machdr24 {
         u16 frame_ctl;
-        u16 duration;     // watch out for endians!
-        u8 addr1[ MACADRR_BYTE_LEN ];
-        u8 addr2[ MACADRR_BYTE_LEN ];
-        u8 addr3[ MACADRR_BYTE_LEN ];
-        u16 seq_ctrl;     // more endians!
-} __attribute__ ((packed)) ;
+        u16 duration;           // watch out for endians!
+        u8 addr1[MACADRR_BYTE_LEN];
+        u8 addr2[MACADRR_BYTE_LEN];
+        u8 addr3[MACADRR_BYTE_LEN];
+        u16 seq_ctrl;           // more endians!
+} __attribute__ ((packed));
 
 // TX TFD with 32 byte MAC Header
-struct tx_tfd_32
-{
-        struct machdr32    mchdr;                      // 32
-        u32                uivplaceholder[2];          // 8
-} __attribute__ ((packed)) ;
+struct tx_tfd_32 {
+        struct machdr32 mchdr;  // 32
+        u32 uivplaceholder[2];  // 8
+} __attribute__ ((packed));
 
 // TX TFD with 30 byte MAC Header
-struct tx_tfd_30
-{
-        struct machdr30    mchdr;                      // 30
-        u8                 reserved[2];                // 2
-        u32                uivplaceholder[2];          // 8
-} __attribute__ ((packed)) ;
+struct tx_tfd_30 {
+        struct machdr30 mchdr;  // 30
+        u8 reserved[2];         // 2
+        u32 uivplaceholder[2];  // 8
+} __attribute__ ((packed));
 
 // tx tfd with 26 byte mac header
-struct tx_tfd_26
-{
-        struct machdr26    mchdr;                      // 26
-        u8                 reserved1[2];               // 2
-        u32                uivplaceholder[2];          // 8
-        u8                 reserved2[4];               // 4
-} __attribute__ ((packed)) ;
+struct tx_tfd_26 {
+        struct machdr26 mchdr;  // 26
+        u8 reserved1[2];        // 2
+        u32 uivplaceholder[2];  // 8
+        u8 reserved2[4];        // 4
+} __attribute__ ((packed));
 
 // tx tfd with 24 byte mac header
-struct tx_tfd_24
-{
-        struct machdr24    mchdr;                      // 24
-        u32                uivplaceholder[2];          // 8
-        u8                 reserved[8];                // 8
-} __attribute__ ((packed)) ;
-
+struct tx_tfd_24 {
+        struct machdr24 mchdr;  // 24
+        u32 uivplaceholder[2];  // 8
+        u8 reserved[8];         // 8
+} __attribute__ ((packed));
 
 #define DCT_WEP_KEY_FIELD_LENGTH 16
 
-struct tfd_command
-{
+struct tfd_command {
         u8 index;
         u8 length;
         u16 reserved;
         u8 payload[0];
-} __attribute__ ((packed)) ;
+} __attribute__ ((packed));
 
 struct tfd_data {
         /* Header */
         u32 work_area_ptr;
-        u8 station_number; /* 0 for BSS */
+        u8 station_number;      /* 0 for BSS */
         u8 reserved1;
         u16 reserved2;
 
@@ -357,14 +346,13 @@ struct tfd_data {
         u8 antenna;
         u16 next_packet_duration;
         u16 next_frag_len;
-        u16 back_off_counter; //////txop;
+        u16 back_off_counter;   //////txop;
         u8 retrylimit;
         u16 cwcurrent;
         u8 reserved3;
 
         /* 802.11 MAC Header */
-        union
-        {
+        union {
                 struct tx_tfd_24 tfd_24;
                 struct tx_tfd_26 tfd_26;
                 struct tx_tfd_30 tfd_30;
@@ -377,8 +365,7 @@ struct tfd_data {
         u16 chunk_len[NUM_TFD_CHUNKS];
 } __attribute__ ((packed));
 
-struct txrx_control_flags
-{
+struct txrx_control_flags {
         u8 message_type;
         u8 rx_seq_num;
         u8 control_bits;
@@ -388,17 +375,16 @@ struct txrx_control_flags
 #define  TFD_SIZE                           128
 #define  TFD_CMD_IMMEDIATE_PAYLOAD_LENGTH   (TFD_SIZE - sizeof(struct txrx_control_flags))
 
-struct tfd_frame
-{
+struct tfd_frame {
         struct txrx_control_flags control_flags;
         union {
                 struct tfd_data data;
                 struct tfd_command cmd;
                 u8 raw[TFD_CMD_IMMEDIATE_PAYLOAD_LENGTH];
         } u;
-} __attribute__ ((packed)) ;
+} __attribute__ ((packed));
 
-typedef void destructor_func(const void*);
+typedef void destructor_func(const void *);
 
 /**
  * Tx Queue for DMA. Queue consists of circular buffer of
@@ -406,7 +392,7 @@ typedef void destructor_func(const void*);
  */
 struct clx2_tx_queue {
         struct clx2_queue q;
-        struct tfd_frame* bd;
+        struct tfd_frame *bd;
         struct ieee80211_txb **txb;
 };
 
@@ -421,8 +407,7 @@ struct clx2_tx_queue {
 #define SUP_RATE_11G_MAX_NUM_CHANNELS  (12)
 
 // Used for passing to driver number of successes and failures per rate
-struct rate_histogram
-{
+struct rate_histogram {
         union {
                 u32 a[SUP_RATE_11A_MAX_NUM_CHANNELS];
                 u32 b[SUP_RATE_11B_MAX_NUM_CHANNELS];
@@ -473,12 +458,12 @@ struct notif_scan_complete {
         u8 num_channels;
         u8 status;
         u8 reserved;
-}  __attribute__ ((packed));
+} __attribute__ ((packed));
 
 struct notif_frag_length {
         u16 frag_length;
         u16 reserved;
-}  __attribute__ ((packed));
+} __attribute__ ((packed));
 
 struct notif_beacon_state {
         u32 state;
@@ -541,11 +526,11 @@ struct ipw_rx_notification {
 
 struct ipw_rx_frame {
         u32 reserved1;
-        u8 parent_tsf[4];     // fw_use[0] is boolean for OUR_TSF_IS_GREATER
-        u8 received_channel;  // The channel that this frame was received on.
-                              // Note that for .11b this does not have to be
-                              // the same as the channel that it was sent.
-                              // Filled by LMAC
+        u8 parent_tsf[4];       // fw_use[0] is boolean for OUR_TSF_IS_GREATER
+        u8 received_channel;    // The channel that this frame was received on.
+        // Note that for .11b this does not have to be
+        // the same as the channel that it was sent.
+        // Filled by LMAC
         u8 frameStatus;
         u8 rate;
         u8 rssi;
@@ -554,10 +539,10 @@ struct ipw_rx_frame {
         u16 signal;
         u16 noise;
         u8 antennaAndPhy;
-        u8 control;           // control bit should be on in bg
-        u8 rtscts_rate;       // rate of rts or cts (in rts cts sequence rate
-                              // is identical)
-        u8 rtscts_seen;       // 0x1 RTS seen ; 0x2 CTS seen
+        u8 control;             // control bit should be on in bg
+        u8 rtscts_rate;         // rate of rts or cts (in rts cts sequence rate
+        // is identical)
+        u8 rtscts_seen;         // 0x1 RTS seen ; 0x2 CTS seen
         u16 length;
         u8 data[0];
 } __attribute__ ((packed));
@@ -569,8 +554,7 @@ struct ipw_rx_header {
         u8 reserved;
 } __attribute__ ((packed));
 
-struct ipw_rx_packet
-{
+struct ipw_rx_packet {
         struct ipw_rx_header header;
         union {
                 struct ipw_rx_frame frame;
@@ -587,21 +571,20 @@ struct ipw_rx_mem_buffer {
         struct ipw_rx_buffer *rxb;
         struct sk_buff *skb;
         struct list_head list;
-}; /* Not transferred over network, so not  __attribute__ ((packed)) */
+};                              /* Not transferred over network, so not  __attribute__ ((packed)) */
 
 struct ipw_rx_queue {
         struct ipw_rx_mem_buffer pool[RX_QUEUE_SIZE + RX_FREE_BUFFERS];
         struct ipw_rx_mem_buffer *queue[RX_QUEUE_SIZE];
-        u32 processed; /* Internal index to last handled Rx packet */
-        u32 read;      /* Shared index to newest available Rx buffer */
-        u32 write;     /* Shared index to oldest written Rx packet */
-        u32 free_count;/* Number of pre-allocated buffers in rx_free */
+        u32 processed;          /* Internal index to last handled Rx packet */
+        u32 read;               /* Shared index to newest available Rx buffer */
+        u32 write;              /* Shared index to oldest written Rx packet */
+        u32 free_count;         /* Number of pre-allocated buffers in rx_free */
         /* Each of these lists is used as a FIFO for ipw_rx_mem_buffers */
-        struct list_head rx_free;  /* Own an SKBs */
-        struct list_head rx_used;  /* No SKB allocated */
+        struct list_head rx_free;       /* Own an SKBs */
+        struct list_head rx_used;       /* No SKB allocated */
         spinlock_t lock;
-}; /* Not transferred over network, so not  __attribute__ ((packed)) */
-
+};                              /* Not transferred over network, so not  __attribute__ ((packed)) */
 
 struct alive_command_responce {
         u8 alive_command;
@@ -625,8 +608,7 @@ struct ipw_rates {
         u8 rates[IPW_MAX_RATES];
 } __attribute__ ((packed));
 
-struct command_block
-{
+struct command_block {
         unsigned int control;
         u32 source_addr;
         u32 dest_addr;
@@ -634,18 +616,16 @@ struct command_block
 } __attribute__ ((packed));
 
 #define CB_NUMBER_OF_ELEMENTS_SMALL 64
-struct fw_image_desc
-{
+struct fw_image_desc {
         unsigned long last_cb_index;
         unsigned long current_cb_index;
         struct command_block cb_list[CB_NUMBER_OF_ELEMENTS_SMALL];
-        void * v_addr;
+        void *v_addr;
         unsigned long p_addr;
         unsigned long len;
 };
 
-struct ipw_sys_config
-{
+struct ipw_sys_config {
         u8 bt_coexistence;
         u8 reserved1;
         u8 answer_broadcast_ssid_probe;
@@ -668,8 +648,7 @@ struct ipw_sys_config
         u8 reserved3;
 } __attribute__ ((packed));
 
-struct ipw_multicast_addr
-{
+struct ipw_multicast_addr {
         u8 num_of_multicast_addresses;
         u8 reserved[3];
         u8 mac1[6];
@@ -678,8 +657,7 @@ struct ipw_multicast_addr
         u8 mac4[6];
 } __attribute__ ((packed));
 
-struct ipw_wep_key
-{
+struct ipw_wep_key {
         u8 cmd_id;
         u8 seq_num;
         u8 key_index;
@@ -687,8 +665,7 @@ struct ipw_wep_key
         u8 key[16];
 } __attribute__ ((packed));
 
-struct ipw_tgi_tx_key
-{
+struct ipw_tgi_tx_key {
         u8 key_id;
         u8 security_type;
         u8 station_index;
@@ -699,8 +676,7 @@ struct ipw_tgi_tx_key
 
 #define IPW_SCAN_CHANNELS 54
 
-struct ipw_scan_request
-{
+struct ipw_scan_request {
         u8 scan_type;
         u16 dwell_time;
         u8 channels_list[IPW_SCAN_CHANNELS];
@@ -716,8 +692,7 @@ enum {
         IPW_SCAN_TYPES
 };
 
-struct ipw_scan_request_ext
-{
+struct ipw_scan_request_ext {
         u32 full_scan_index;
         u8 channels_list[IPW_SCAN_CHANNELS];
         u8 scan_type[IPW_SCAN_CHANNELS / 2];
@@ -738,19 +713,16 @@ extern inline void ipw_set_scan_type(struct ipw_scan_request_ext *scan,
 {
         if (index % 2)
                 scan->scan_type[index / 2] =
-                        (scan->scan_type[index / 2] & 0xF0) |
-                        (scan_type & 0x0F);
+                    (scan->scan_type[index / 2] & 0xF0) | (scan_type & 0x0F);
         else
                 scan->scan_type[index / 2] =
-                        (scan->scan_type[index / 2] & 0x0F) |
-                        ((scan_type & 0x0F) << 4);
+                    (scan->scan_type[index / 2] & 0x0F) |
+                    ((scan_type & 0x0F) << 4);
 }
 
-struct ipw_associate
-{
+struct ipw_associate {
         u8 channel;
-        u8 auth_type:4,
-           auth_key:4;
+        u8 auth_type:4, auth_key:4;
         u8 assoc_type;
         u8 reserved;
         u16 policy_support;
@@ -769,8 +741,7 @@ struct ipw_associate
         u16 reserved2;
 } __attribute__ ((packed));
 
-struct ipw_supported_rates
-{
+struct ipw_supported_rates {
         u8 ieee_mode;
         u8 num_rates;
         u8 purpose;
@@ -778,42 +749,36 @@ struct ipw_supported_rates
         u8 supported_rates[IPW_MAX_RATES];
 } __attribute__ ((packed));
 
-struct ipw_rts_threshold
-{
+struct ipw_rts_threshold {
         u16 rts_threshold;
         u16 reserved;
 } __attribute__ ((packed));
 
-struct ipw_frag_threshold
-{
+struct ipw_frag_threshold {
         u16 frag_threshold;
         u16 reserved;
 } __attribute__ ((packed));
 
-struct ipw_retry_limit
-{
+struct ipw_retry_limit {
         u8 short_retry_limit;
         u8 long_retry_limit;
         u16 reserved;
 } __attribute__ ((packed));
 
-struct ipw_dino_config
-{
+struct ipw_dino_config {
         u32 dino_config_addr;
         u16 dino_config_size;
         u8 dino_response;
         u8 reserved;
 } __attribute__ ((packed));
 
-struct ipw_aironet_info
-{
+struct ipw_aironet_info {
         u8 id;
         u8 length;
         u16 reserved;
 } __attribute__ ((packed));
 
-struct ipw_rx_key
-{
+struct ipw_rx_key {
         u8 station_index;
         u8 key_type;
         u8 key_id;
@@ -824,23 +789,20 @@ struct ipw_rx_key
         u8 reserved;
 } __attribute__ ((packed));
 
-struct ipw_country_channel_info
-{
+struct ipw_country_channel_info {
         u8 first_channel;
         u8 no_channels;
         s8 max_tx_power;
 } __attribute__ ((packed));
 
-struct ipw_country_info
-{
+struct ipw_country_info {
         u8 id;
         u8 length;
         u8 country_str[3];
         struct ipw_country_channel_info groups[7];
 } __attribute__ ((packed));
 
-struct ipw_channel_tx_power
-{
+struct ipw_channel_tx_power {
         u8 channel_number;
         s8 tx_power;
 } __attribute__ ((packed));
@@ -850,15 +812,13 @@ struct ipw_channel_tx_power
 #define MAX_A_CHANNELS  37
 #define MAX_B_CHANNELS  14
 
-struct ipw_tx_power
-{
+struct ipw_tx_power {
         u8 num_channels;
         u8 ieee_mode;
         struct ipw_channel_tx_power channels_tx_power[MAX_A_CHANNELS];
 } __attribute__ ((packed));
 
-struct ipw_qos_parameters
-{
+struct ipw_qos_parameters {
         u16 cw_min[4];
         u16 cw_max[4];
         u8 aifs[4];
@@ -866,15 +826,13 @@ struct ipw_qos_parameters
         u16 tx_op_limit[4];
 } __attribute__ ((packed));
 
-struct ipw_rsn_capabilities
-{
+struct ipw_rsn_capabilities {
         u8 id;
         u8 length;
         u16 version;
 } __attribute__ ((packed));
 
-struct ipw_sensitivity_calib
-{
+struct ipw_sensitivity_calib {
         u16 beacon_rssi_raw;
         u16 reserved;
 } __attribute__ ((packed));
@@ -893,10 +851,11 @@ struct ipw_sensitivity_calib
  * - \a param filled with status parameters.
  */
 struct ipw_cmd {
-  u32 cmd;         /**< Host command */
-  u32 status;      /**< Status */
-  u32 status_len;  /**< How many 32 bit parameters in the status */
-  u32 len;         /**< incoming parameters length, bytes */
+        u32 cmd;   /**< Host command */
+        u32 status;/**< Status */
+        u32 status_len;
+                   /**< How many 32 bit parameters in the status */
+        u32 len;   /**< incoming parameters length, bytes */
   /**
    * command parameters.
    * There should be enough space for incoming and
@@ -904,10 +863,10 @@ struct ipw_cmd {
    * Incoming parameters listed 1-st, followed by outcoming params.
    * nParams=(len+3)/4+status_len
    */
-  u32 param[0];
+        u32 param[0];
 } __attribute__ ((packed));
 
-#define STATUS_HCMD_ACTIVE      (1<<0)  /**< host command in progress */
+#define STATUS_HCMD_ACTIVE      (1<<0)  /**< host command in progress */
 
 #define STATUS_INT_ENABLED      (1<<1)
 #define STATUS_RF_KILL_HW       (1<<2)
@@ -930,15 +889,15 @@ struct ipw_cmd {
 #define STATUS_SCANNING         (1<<21)
 #define STATUS_SCAN_ABORTING    (1<<22)
 
-#define STATUS_INDIRECT_BYTE    (1<<28) /* sysfs entry configured for access */
-#define STATUS_INDIRECT_DWORD   (1<<29) /* sysfs entry configured for access */
-#define STATUS_DIRECT_DWORD     (1<<30) /* sysfs entry configured for access */
+#define STATUS_INDIRECT_BYTE    (1<<28) /* sysfs entry configured for access */
+#define STATUS_INDIRECT_DWORD   (1<<29) /* sysfs entry configured for access */
+#define STATUS_DIRECT_DWORD     (1<<30) /* sysfs entry configured for access */
 
-#define STATUS_SECURITY_UPDATED (1<<31) /* Security sync needed */
+#define STATUS_SECURITY_UPDATED (1<<31) /* Security sync needed */
 
-#define CFG_STATIC_CHANNEL      (1<<0) /* Restrict assoc. to single channel */
-#define CFG_STATIC_ESSID        (1<<1) /* Restrict assoc. to single SSID */
-#define CFG_STATIC_BSSID        (1<<2) /* Restrict assoc. to single BSSID */
+#define CFG_STATIC_CHANNEL      (1<<0)  /* Restrict assoc. to single channel */
+#define CFG_STATIC_ESSID        (1<<1)  /* Restrict assoc. to single SSID */
+#define CFG_STATIC_BSSID        (1<<2)  /* Restrict assoc. to single BSSID */
 #define CFG_CUSTOM_MAC          (1<<3)
 #define CFG_PREAMBLE            (1<<4)
 #define CFG_ADHOC_PERSIST       (1<<5)
@@ -946,8 +905,8 @@ struct ipw_cmd {
 #define CFG_FIXED_RATE          (1<<7)
 #define CFG_ADHOC_CREATE        (1<<8)
 
-#define CAP_SHARED_KEY          (1<<0) /* Off = OPEN */
-#define CAP_PRIVACY_ON          (1<<1) /* Off = No privacy */
+#define CAP_SHARED_KEY          (1<<0)  /* Off = OPEN */
+#define CAP_PRIVACY_ON          (1<<1)  /* Off = No privacy */
 
 #define MAX_STATIONS            32
 #define IPW_INVALID_STATION     (0xff)
@@ -987,8 +946,8 @@ struct ipw_priv {
         /* result of ucode download */
         struct alive_command_responce dino_alive;
 
-        wait_queue_head_t wait_command_queue;
-        wait_queue_head_t wait_state;
+        wait_queue_head_t wait_command_queue;
+        wait_queue_head_t wait_state;
 
         /* Rx and Tx DMA processing queues */
         struct ipw_rx_queue *rxq;
@@ -1004,9 +963,9 @@ struct ipw_priv {
         struct average average_rssi;
         struct average average_noise;
         u32 port_type;
-        int rx_bufs_min;          /**< minimum number of bufs in Rx queue */
-        int rx_pend_max;          /**< maximum pending buffers for one IRQ */
-        u32 hcmd_seq;             /**< sequence number for hcmd */
+        int rx_bufs_min;          /**< minimum number of bufs in Rx queue */
+        int rx_pend_max;          /**< maximum pending buffers for one IRQ */
+        u32 hcmd_seq;             /**< sequence number for hcmd */
         u32 missed_beacon_threshold;
         u32 roaming_threshold;
 
@@ -1015,17 +974,17 @@ struct ipw_priv {
 
         unsigned long ts_scan_abort;
         struct ipw_supported_rates rates;
-        struct ipw_rates phy[3];           /**< PHY restrictions, per band */
-        struct ipw_rates supp;             /**< software defined */
-        struct ipw_rates extended;         /**< use for corresp. IE, AP only */
+        struct ipw_rates phy[3];           /**< PHY restrictions, per band */
+        struct ipw_rates supp;             /**< software defined */
+        struct ipw_rates extended;         /**< use for corresp. IE, AP only */
 
         struct notif_link_deterioration last_link_deterioration; /** for statistics */
-        struct ipw_cmd* hcmd; /**< host command currently executed */
+        struct ipw_cmd *hcmd; /**< host command currently executed */
 
         wait_queue_head_t hcmd_wq;     /**< host command waits for execution */
-        u32 tsf_bcn[2];              /**< TSF from latest beacon */
+        u32 tsf_bcn[2];              /**< TSF from latest beacon */
 
-        struct notif_calibration calib; /**< last calibration */
+        struct notif_calibration calib; /**< last calibration */
 
         /* ordinal interface with firmware */
         u32 table0_addr;
@@ -1065,8 +1024,8 @@ struct ipw_priv {
         u32 tx_packets;
         u32 quality;
 
-        /* eeprom */
-        u8 eeprom[0x100];  /* 256 bytes of eeprom */
+        /* eeprom */
+        u8 eeprom[0x100];       /* 256 bytes of eeprom */
         int eeprom_delay;
 
         struct iw_statistics wstats;
@@ -1089,7 +1048,6 @@ struct ipw_priv {
 
         struct tasklet_struct irq_tasklet;
 
-
 #define IPW_2200BG  1
 #define IPW_2915ABG 2
         u8 adapter;
@@ -1112,7 +1070,6 @@ struct ipw_priv {
         u32 indirect_byte;
 };                              /*ipw_priv */
 
-
 /* debug macros */
 
 #ifdef CONFIG_IPW_DEBUG
@@ -1168,7 +1125,6 @@ do { if (ipw_debug_level & (level)) \
 #define IPW_DL_RF_KILL       (1<<17)
 #define IPW_DL_FW_ERRORS     (1<<18)
 
-
 #define IPW_DL_ORD           (1<<20)
 
 #define IPW_DL_FRAG          (1<<21)
@@ -1182,7 +1138,6 @@ do { if (ipw_debug_level & (level)) \
 
 #define IPW_DL_STATS         (1<<29)
 
-
 #define IPW_ERROR(f, a...) printk(KERN_ERR DRV_NAME ": " f, ## a)
 #define IPW_WARNING(f, a...) printk(KERN_WARNING DRV_NAME ": " f, ## a)
 #define IPW_DEBUG_INFO(f, a...)    IPW_DEBUG(IPW_DL_INFO, f, ## a)
@@ -1251,12 +1206,12 @@ do { if (ipw_debug_level & (level)) \
 /*
  * RESET Register Bit Indexes
  */
-#define CBD_RESET_REG_PRINCETON_RESET 0x00000001  /* Bit 0 (LSB) */
-#define CX2_RESET_REG_SW_RESET        0x00000080  /* Bit 7       */
-#define CX2_RESET_REG_MASTER_DISABLED 0x00000100  /* Bit 8       */
-#define CX2_RESET_REG_STOP_MASTER     0x00000200  /* Bit 9       */
-#define CX2_ARC_KESHET_CONFIG         0x08000000  /* Bit 27      */
-#define CX2_START_STANDBY             0x00000004  /* Bit 2       */
+#define CBD_RESET_REG_PRINCETON_RESET 0x00000001        /* Bit 0 (LSB) */
+#define CX2_RESET_REG_SW_RESET        0x00000080        /* Bit 7       */
+#define CX2_RESET_REG_MASTER_DISABLED 0x00000100        /* Bit 8       */
+#define CX2_RESET_REG_STOP_MASTER     0x00000200        /* Bit 9       */
+#define CX2_ARC_KESHET_CONFIG         0x08000000        /* Bit 27      */
+#define CX2_START_STANDBY             0x00000004        /* Bit 2       */
 
 #define CX2_CSR_CIS_UPPER_BOUND 0x00000200
 #define CX2_DOMAIN_0_END 0x1000
@@ -1287,14 +1242,12 @@ do { if (ipw_debug_level & (level)) \
 #define CB_SRC_SIZE_LONG  0x00200000
 #define CB_DEST_SIZE_LONG 0x00020000
 
-
 /* DMA DEFINES */
 
 #define DMA_CONTROL_SMALL_CB_CONST_VALUE 0x00540000
 #define DMA_CB_STOP_AND_ABORT            0x00000C00
 #define DMA_CB_START                     0x00000100
 
-
 #define CX2_SHARED_SRAM_SIZE               0x00030000
 #define CX2_SHARED_SRAM_DMA_CONTROL        0x00027000
 #define CB_MAX_LENGTH                      0x1FFF
@@ -1302,7 +1255,6 @@ do { if (ipw_debug_level & (level)) \
 #define CX2_HOST_EEPROM_DATA_SRAM_SIZE 0xA18
 #define CX2_EEPROM_IMAGE_SIZE          0x100
 
-
 /* DMA defs */
 #define CX2_DMA_I_CURRENT_CB  0x003000D0
 #define CX2_DMA_O_CURRENT_CB  0x003000D4
@@ -1354,7 +1306,6 @@ do { if (ipw_debug_level & (level)) \
 #define IPW_WHO_IS_AWAKE             (CX2_SHARED_LOWER_BOUND + 0xB14)
 #define IPW_DURING_ATIM_WINDOW       (CX2_SHARED_LOWER_BOUND + 0xB18)
 
-
 #define MSB                             1
 #define LSB                             0
 #define WORD_TO_BYTE(_word)             ((_word) * sizeof(u16))
@@ -1363,16 +1314,16 @@ do { if (ipw_debug_level & (level)) \
     ( WORD_TO_BYTE(_wordoffset) + (_byteoffset) )
 
 /* EEPROM access by BYTE */
-#define EEPROM_PME_CAPABILITY   (GET_EEPROM_ADDR(0x09,MSB))     /* 1 byte   */
-#define EEPROM_MAC_ADDRESS      (GET_EEPROM_ADDR(0x21,LSB))     /* 6 byte   */
-#define EEPROM_VERSION          (GET_EEPROM_ADDR(0x24,MSB))     /* 1 byte   */
-#define EEPROM_NIC_TYPE         (GET_EEPROM_ADDR(0x25,LSB))     /* 1 byte   */
-#define EEPROM_SKU_CAPABILITY   (GET_EEPROM_ADDR(0x25,MSB))     /* 1 byte   */
-#define EEPROM_COUNTRY_CODE     (GET_EEPROM_ADDR(0x26,LSB))     /* 3 bytes  */
-#define EEPROM_IBSS_CHANNELS_BG (GET_EEPROM_ADDR(0x28,LSB))     /* 2 bytes  */
-#define EEPROM_IBSS_CHANNELS_A  (GET_EEPROM_ADDR(0x29,MSB))     /* 5 bytes  */
-#define EEPROM_BSS_CHANNELS_BG  (GET_EEPROM_ADDR(0x2c,LSB))     /* 2 bytes  */
-#define EEPROM_HW_VERSION       (GET_EEPROM_ADDR(0x72,LSB))     /* 2 bytes  */
+#define EEPROM_PME_CAPABILITY   (GET_EEPROM_ADDR(0x09,MSB))     /* 1 byte   */
+#define EEPROM_MAC_ADDRESS      (GET_EEPROM_ADDR(0x21,LSB))     /* 6 byte   */
+#define EEPROM_VERSION          (GET_EEPROM_ADDR(0x24,MSB))     /* 1 byte   */
+#define EEPROM_NIC_TYPE         (GET_EEPROM_ADDR(0x25,LSB))     /* 1 byte   */
+#define EEPROM_SKU_CAPABILITY   (GET_EEPROM_ADDR(0x25,MSB))     /* 1 byte   */
+#define EEPROM_COUNTRY_CODE     (GET_EEPROM_ADDR(0x26,LSB))     /* 3 bytes  */
+#define EEPROM_IBSS_CHANNELS_BG (GET_EEPROM_ADDR(0x28,LSB))     /* 2 bytes  */
+#define EEPROM_IBSS_CHANNELS_A  (GET_EEPROM_ADDR(0x29,MSB))     /* 5 bytes  */
+#define EEPROM_BSS_CHANNELS_BG  (GET_EEPROM_ADDR(0x2c,LSB))     /* 2 bytes  */
+#define EEPROM_HW_VERSION       (GET_EEPROM_ADDR(0x72,LSB))     /* 2 bytes  */
 
 /* NIC type as found in the one byte EEPROM_NIC_TYPE  offset*/
 #define EEPROM_NIC_TYPE_STANDARD        0
@@ -1477,7 +1428,6 @@ enum {
 #define IPW_RATE_CAPABILITIES 1
 #define IPW_RATE_CONNECT      0
 
-
 /*
  * Rate values and masks
  */
@@ -1522,12 +1472,6 @@ enum {
         IPW_ORD_STAT_TX_DIR_DATA_B_11,
         /* Hole */
 
-
-
-
-
-
-
         IPW_ORD_STAT_TX_DIR_DATA_G_1 = IPW_ORD_TABLE_0_MASK + 19,
         IPW_ORD_STAT_TX_DIR_DATA_G_2,
         IPW_ORD_STAT_TX_DIR_DATA_G_5_5,
@@ -1547,12 +1491,6 @@ enum {
         IPW_ORD_STAT_TX_NON_DIR_DATA_B_11,
         /* Hole */
 
-
-
-
-
-
-
         IPW_ORD_STAT_TX_NON_DIR_DATA_G_1 = IPW_ORD_TABLE_0_MASK + 44,
         IPW_ORD_STAT_TX_NON_DIR_DATA_G_2,
         IPW_ORD_STAT_TX_NON_DIR_DATA_G_5_5,
@@ -1683,7 +1621,7 @@ struct host_cmd {
 #define CFG_BT_COEXISTENCE_WME_OVER_BT          0x08
 #define CFG_BT_COEXISTENCE_OOB                  0x10
 #define CFG_BT_COEXISTENCE_MAX                  0xFF
-#define CFG_BT_COEXISTENCE_DEF                  0x80 /* read Bt from EEPROM*/
+#define CFG_BT_COEXISTENCE_DEF                  0x80    /* read Bt from EEPROM */
 
 #define CFG_CTS_TO_ITSELF_ENABLED_MIN   0x0
 #define CFG_CTS_TO_ITSELF_ENABLED_MAX   0x1
@@ -1725,11 +1663,11 @@ static inline u32 frame_hdr_len(struct ieee80211_hdr *hdr)
         fc = le16_to_cpu(hdr->frame_ctl);
 
         /*
-         * Function     ToDS    FromDS
-         * IBSS         0       0
-         * To AP        1       0
-         * From AP      0       1
-         * WDS (bridge) 1       1
+         * Function     ToDS    FromDS
+         * IBSS         0       0
+         * To AP        1       0
+         * From AP      0       1
+         * WDS (bridge) 1       1
          *
          * Only WDS frames use Address4 among them. --YZ
          */
@@ -1739,4 +1677,4 @@ static inline u32 frame_hdr_len(struct ieee80211_hdr *hdr)
         return retval;
 }
 
-#endif /* __ipw2200_h__ */
+#endif                          /* __ipw2200_h__ */
diff --git a/drivers/net/wireless/netwave_cs.c b/drivers/net/wireless/netwave_cs.c
index 5f507c49907..ca6c03c8992 100644
--- a/drivers/net/wireless/netwave_cs.c
+++ b/drivers/net/wireless/netwave_cs.c
@@ -471,12 +471,12 @@ static dev_link_t *netwave_attach(void)
     dev->get_stats  = &netwave_get_stats;
     dev->set_multicast_list = &set_multicast_list;
     /* wireless extensions */
-#ifdef WIRELESS_EXT
+#if WIRELESS_EXT <= 16
     dev->get_wireless_stats = &netwave_get_wireless_stats;
+#endif /* WIRELESS_EXT <= 16 */
 #if WIRELESS_EXT > 12
     dev->wireless_handlers = (struct iw_handler_def *)&netwave_handler_def;
 #endif /* WIRELESS_EXT > 12 */
-#endif /* WIRELESS_EXT */
     dev->do_ioctl = &netwave_ioctl;
 
     dev->tx_timeout = &netwave_watchdog;
@@ -839,6 +839,9 @@ static const struct iw_handler_def	netwave_handler_def =
         .standard       = (iw_handler *) netwave_handler,
         .private        = (iw_handler *) netwave_private_handler,
         .private_args   = (struct iw_priv_args *) netwave_private_args,
+#if WIRELESS_EXT > 16
+        .get_wireless_stats = netwave_get_wireless_stats,
+#endif /* WIRELESS_EXT > 16 */
 };
 #endif /* WIRELESS_EXT > 12 */
 
diff --git a/drivers/net/wireless/orinoco.c b/drivers/net/wireless/orinoco.c
index d7947358e49..8de49fe5723 100644
--- a/drivers/net/wireless/orinoco.c
+++ b/drivers/net/wireless/orinoco.c
@@ -1053,8 +1053,9 @@ static void orinoco_join_ap(struct net_device *dev)
                 u16 channel;
         } __attribute__ ((packed)) req;
         const int atom_len = offsetof(struct prism2_scan_apinfo, atim);
-        struct prism2_scan_apinfo *atom;
+        struct prism2_scan_apinfo *atom = NULL;
         int offset = 4;
+        int found = 0;
         u8 *buf;
         u16 len;
 
@@ -1089,15 +1090,18 @@ static void orinoco_join_ap(struct net_device *dev)
          * we were requested to join */
         for (; offset + atom_len <= len; offset += atom_len) {
                 atom = (struct prism2_scan_apinfo *) (buf + offset);
-                if (memcmp(&atom->bssid, priv->desired_bssid, ETH_ALEN) == 0)
-                        goto found;
+                if (memcmp(&atom->bssid, priv->desired_bssid, ETH_ALEN) == 0) {
+                        found = 1;
+                        break;
+                }
         }
 
-        DEBUG(1, "%s: Requested AP not found in scan results\n",
-              dev->name);
-        goto out;
+        if (! found) {
+                DEBUG(1, "%s: Requested AP not found in scan results\n",
+                      dev->name);
+                goto out;
+        }
 
- found:
         memcpy(req.bssid, priv->desired_bssid, ETH_ALEN);
         req.channel = atom->channel;    /* both are little-endian */
         err = HERMES_WRITE_RECORD(hw, USER_BAP, HERMES_RID_CNFJOINREQUEST,
@@ -1284,8 +1288,10 @@ static void __orinoco_ev_info(struct net_device *dev, hermes_t *hw)
                 /* Read scan data */
                 err = hermes_bap_pread(hw, IRQ_BAP, (void *) buf, len,
                                        infofid, sizeof(info));
-                if (err)
+                if (err) {
+                        kfree(buf);
                         break;
+                }
 
 #ifdef ORINOCO_DEBUG
                 {
@@ -4021,7 +4027,8 @@ static int orinoco_ioctl_setscan(struct net_device *dev,
 }
 
 /* Translate scan data returned from the card to a card independant
- * format that the Wireless Tools will understand - Jean II */
+ * format that the Wireless Tools will understand - Jean II
+ * Return message length or -errno for fatal errors */
 static inline int orinoco_translate_scan(struct net_device *dev,
                                          char *buffer,
                                          char *scan,
@@ -4061,13 +4068,19 @@ static inline int orinoco_translate_scan(struct net_device *dev,
                 break;
         case FIRMWARE_TYPE_INTERSIL:
                 offset = 4;
-                if (priv->has_hostscan)
-                        atom_len = scan[0] + (scan[1] << 8);
-                else
+                if (priv->has_hostscan) {
+                        atom_len = le16_to_cpup((u16 *)scan);
+                        /* Sanity check for atom_len */
+                        if (atom_len < sizeof(struct prism2_scan_apinfo)) {
+                                printk(KERN_ERR "%s: Invalid atom_len in scan data: %d\n",
+                                dev->name, atom_len);
+                                return -EIO;
+                        }
+                } else
                         atom_len = offsetof(struct prism2_scan_apinfo, atim);
                 break;
         default:
-                return 0;
+                return -EOPNOTSUPP;
         }
 
         /* Check that we got an whole number of atoms */
@@ -4075,7 +4088,7 @@ static inline int orinoco_translate_scan(struct net_device *dev,
                 printk(KERN_ERR "%s: Unexpected scan data length %d, "
                        "atom_len %d, offset %d\n", dev->name, scan_len,
                        atom_len, offset);
-                return 0;
+                return -EIO;
         }
 
         /* Read the entries one by one */
@@ -4210,33 +4223,41 @@ static int orinoco_ioctl_getscan(struct net_device *dev,
                 /* We have some results to push back to user space */
 
                 /* Translate to WE format */
-                srq->length = orinoco_translate_scan(dev, extra,
-                                                     priv->scan_result,
-                                                     priv->scan_len);
-
-                /* Return flags */
-                srq->flags = (__u16) priv->scan_mode;
+                int ret = orinoco_translate_scan(dev, extra,
+                                                 priv->scan_result,
+                                                 priv->scan_len);
+
+                if (ret < 0) {
+                        err = ret;
+                        kfree(priv->scan_result);
+                        priv->scan_result = NULL;
+                } else {
+                        srq->length = ret;
 
-                /* Results are here, so scan no longer in progress */
-                priv->scan_inprogress = 0;
+                        /* Return flags */
+                        srq->flags = (__u16) priv->scan_mode;
 
-                /* In any case, Scan results will be cleaned up in the
-                 * reset function and when exiting the driver.
-                 * The person triggering the scanning may never come to
-                 * pick the results, so we need to do it in those places.
-                 * Jean II */
+                        /* In any case, Scan results will be cleaned up in the
+                         * reset function and when exiting the driver.
+                         * The person triggering the scanning may never come to
+                         * pick the results, so we need to do it in those places.
+                         * Jean II */
 
 #ifdef SCAN_SINGLE_READ
-                /* If you enable this option, only one client (the first
-                 * one) will be able to read the result (and only one
-                 * time). If there is multiple concurent clients that
-                 * want to read scan results, this behavior is not
-                 * advisable - Jean II */
-                kfree(priv->scan_result);
-                priv->scan_result = NULL;
+                        /* If you enable this option, only one client (the first
+                         * one) will be able to read the result (and only one
+                         * time). If there is multiple concurent clients that
+                         * want to read scan results, this behavior is not
+                         * advisable - Jean II */
+                        kfree(priv->scan_result);
+                        priv->scan_result = NULL;
 #endif /* SCAN_SINGLE_READ */
-                /* Here, if too much time has elapsed since last scan,
-                 * we may want to clean up scan results... - Jean II */
+                        /* Here, if too much time has elapsed since last scan,
+                         * we may want to clean up scan results... - Jean II */
+                }
+
+                /* Scan is no longer in progress */
+                priv->scan_inprogress = 0;
         }
           
         orinoco_unlock(priv, &flags);
diff --git a/drivers/net/wireless/orinoco_cs.c b/drivers/net/wireless/orinoco_cs.c
index 1cc1492083c..d1fb1bab8aa 100644
--- a/drivers/net/wireless/orinoco_cs.c
+++ b/drivers/net/wireless/orinoco_cs.c
@@ -604,7 +604,6 @@ static char version[] __initdata = DRIVER_NAME " " DRIVER_VERSION
 
 static struct pcmcia_device_id orinoco_cs_ids[] = {
         PCMCIA_DEVICE_MANF_CARD(0x000b, 0x7300),
-        PCMCIA_DEVICE_MANF_CARD(0x0089, 0x0001),
         PCMCIA_DEVICE_MANF_CARD(0x0138, 0x0002),
         PCMCIA_DEVICE_MANF_CARD(0x0156, 0x0002),
         PCMCIA_DEVICE_MANF_CARD(0x01eb, 0x080a),
diff --git a/drivers/net/wireless/orinoco_nortel.c b/drivers/net/wireless/orinoco_nortel.c
new file mode 100644
index 00000000000..86fa58e5cfa
--- /dev/null
+++ b/drivers/net/wireless/orinoco_nortel.c
@@ -0,0 +1,324 @@
+/* orinoco_nortel.c
+ * 
+ * Driver for Prism II devices which would usually be driven by orinoco_cs,
+ * but are connected to the PCI bus by a Nortel PCI-PCMCIA-Adapter. 
+ *
+ * Copyright (C) 2002 Tobias Hoffmann
+ *           (C) 2003 Christoph Jungegger <disdos@traum404.de>
+ *
+ * Some of this code is borrowed from orinoco_plx.c
+ *      Copyright (C) 2001 Daniel Barlow
+ * Some of this code is borrowed from orinoco_pci.c 
+ *  Copyright (C) 2001 Jean Tourrilhes
+ * Some of this code is "inspired" by linux-wlan-ng-0.1.10, but nothing
+ * has been copied from it. linux-wlan-ng-0.1.10 is originally :
+ *      Copyright (C) 1999 AbsoluteValue Systems, Inc.  All Rights Reserved.
+ * 
+ * The contents of this file are subject to the Mozilla Public License
+ * Version 1.1 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License
+ * at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+ * the License for the specific language governing rights and
+ * limitations under the License.
+ *
+ * Alternatively, the contents of this file may be used under the
+ * terms of the GNU General Public License version 2 (the "GPL"), in
+ * which case the provisions of the GPL are applicable instead of the
+ * above.  If you wish to allow the use of your version of this file
+ * only under the terms of the GPL and not to allow others to use your
+ * version of this file under the MPL, indicate your decision by
+ * deleting the provisions above and replace them with the notice and
+ * other provisions required by the GPL.  If you do not delete the
+ * provisions above, a recipient may use your version of this file
+ * under either the MPL or the GPL.
+ */
+
+#define DRIVER_NAME "orinoco_nortel"
+#define PFX DRIVER_NAME ": "
+
+#include <linux/config.h>
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/sched.h>
+#include <linux/ptrace.h>
+#include <linux/slab.h>
+#include <linux/string.h>
+#include <linux/timer.h>
+#include <linux/ioport.h>
+#include <asm/uaccess.h>
+#include <asm/io.h>
+#include <asm/system.h>
+#include <linux/netdevice.h>
+#include <linux/if_arp.h>
+#include <linux/etherdevice.h>
+#include <linux/list.h>
+#include <linux/pci.h>
+#include <linux/fcntl.h>
+
+#include <pcmcia/cisreg.h>
+
+#include "hermes.h"
+#include "orinoco.h"
+
+#define COR_OFFSET    (0xe0)    /* COR attribute offset of Prism2 PC card */
+#define COR_VALUE     (COR_LEVEL_REQ | COR_FUNC_ENA)    /* Enable PC card with interrupt in level trigger */
+
+
+/* Nortel specific data */
+struct nortel_pci_card {
+        unsigned long iobase1;
+        unsigned long iobase2;
+};
+
+/*
+ * Do a soft reset of the PCI card using the Configuration Option Register
+ * We need this to get going...
+ * This is the part of the code that is strongly inspired from wlan-ng
+ *
+ * Note bis : Don't try to access HERMES_CMD during the reset phase.
+ * It just won't work !
+ */
+static int nortel_pci_cor_reset(struct orinoco_private *priv)
+{
+        struct nortel_pci_card *card = priv->card;
+
+        /* Assert the reset until the card notice */
+        outw_p(8, card->iobase1 + 2);
+        inw(card->iobase2 + COR_OFFSET);
+        outw_p(0x80, card->iobase2 + COR_OFFSET);
+        mdelay(1);
+
+        /* Give time for the card to recover from this hard effort */
+        outw_p(0, card->iobase2 + COR_OFFSET);
+        outw_p(0, card->iobase2 + COR_OFFSET);
+        mdelay(1);
+
+        /* set COR as usual */
+        outw_p(COR_VALUE, card->iobase2 + COR_OFFSET);
+        outw_p(COR_VALUE, card->iobase2 + COR_OFFSET);
+        mdelay(1);
+
+        outw_p(0x228, card->iobase1 + 2);
+
+        return 0;
+}
+
+int nortel_pci_hw_init(struct nortel_pci_card *card)
+{
+        int i;
+        u32 reg;
+
+        /* setup bridge */
+        if (inw(card->iobase1) & 1) {
+                printk(KERN_ERR PFX "brg1 answer1 wrong\n");
+                return -EBUSY;
+        }
+        outw_p(0x118, card->iobase1 + 2);
+        outw_p(0x108, card->iobase1 + 2);
+        mdelay(30);
+        outw_p(0x8, card->iobase1 + 2);
+        for (i = 0; i < 30; i++) {
+                mdelay(30);
+                if (inw(card->iobase1) & 0x10) {
+                        break;
+                }
+        }
+        if (i == 30) {
+                printk(KERN_ERR PFX "brg1 timed out\n");
+                return -EBUSY;
+        }
+        if (inw(card->iobase2 + 0xe0) & 1) {
+                printk(KERN_ERR PFX "brg2 answer1 wrong\n");
+                return -EBUSY;
+        }
+        if (inw(card->iobase2 + 0xe2) & 1) {
+                printk(KERN_ERR PFX "brg2 answer2 wrong\n");
+                return -EBUSY;
+        }
+        if (inw(card->iobase2 + 0xe4) & 1) {
+                printk(KERN_ERR PFX "brg2 answer3 wrong\n");
+                return -EBUSY;
+        }
+
+        /* set the PCMCIA COR-Register */
+        outw_p(COR_VALUE, card->iobase2 + COR_OFFSET);
+        mdelay(1);
+        reg = inw(card->iobase2 + COR_OFFSET);
+        if (reg != COR_VALUE) {
+                printk(KERN_ERR PFX "Error setting COR value (reg=%x)\n",
+                       reg);
+                return -EBUSY;
+        }
+
+        /* set leds */
+        outw_p(1, card->iobase1 + 10);
+        return 0;
+}
+
+static int nortel_pci_init_one(struct pci_dev *pdev,
+                               const struct pci_device_id *ent)
+{
+        int err;
+        struct orinoco_private *priv;
+        struct nortel_pci_card *card;
+        struct net_device *dev;
+        void __iomem *iomem;
+
+        err = pci_enable_device(pdev);
+        if (err) {
+                printk(KERN_ERR PFX "Cannot enable PCI device\n");
+                return err;
+        }
+
+        err = pci_request_regions(pdev, DRIVER_NAME);
+        if (err != 0) {
+                printk(KERN_ERR PFX "Cannot obtain PCI resources\n");
+                goto fail_resources;
+        }
+
+        iomem = pci_iomap(pdev, 3, 0);
+        if (!iomem) {
+                err = -ENOMEM;
+                goto fail_map_io;
+        }
+
+        /* Allocate network device */
+        dev = alloc_orinocodev(sizeof(*card), nortel_pci_cor_reset);
+        if (!dev) {
+                printk(KERN_ERR PFX "Cannot allocate network device\n");
+                err = -ENOMEM;
+                goto fail_alloc;
+        }
+
+        priv = netdev_priv(dev);
+        card = priv->card;
+        card->iobase1 = pci_resource_start(pdev, 0);
+        card->iobase2 = pci_resource_start(pdev, 1);
+        dev->base_addr = pci_resource_start(pdev, 2);
+        SET_MODULE_OWNER(dev);
+        SET_NETDEV_DEV(dev, &pdev->dev);
+
+        hermes_struct_init(&priv->hw, iomem, HERMES_16BIT_REGSPACING);
+
+        printk(KERN_DEBUG PFX "Detected Nortel PCI device at %s irq:%d, "
+               "io addr:0x%lx\n", pci_name(pdev), pdev->irq, dev->base_addr);
+
+        err = request_irq(pdev->irq, orinoco_interrupt, SA_SHIRQ,
+                          dev->name, dev);
+        if (err) {
+                printk(KERN_ERR PFX "Cannot allocate IRQ %d\n", pdev->irq);
+                err = -EBUSY;
+                goto fail_irq;
+        }
+        dev->irq = pdev->irq;
+
+        err = nortel_pci_hw_init(card);
+        if (err) {
+                printk(KERN_ERR PFX "Hardware initialization failed\n");
+                goto fail;
+        }
+
+        err = nortel_pci_cor_reset(priv);
+        if (err) {
+                printk(KERN_ERR PFX "Initial reset failed\n");
+                goto fail;
+        }
+
+
+        err = register_netdev(dev);
+        if (err) {
+                printk(KERN_ERR PFX "Cannot register network device\n");
+                goto fail;
+        }
+
+        pci_set_drvdata(pdev, dev);
+
+        return 0;
+
+ fail:
+        free_irq(pdev->irq, dev);
+
+ fail_irq:
+        pci_set_drvdata(pdev, NULL);
+        free_orinocodev(dev);
+
+ fail_alloc:
+        pci_iounmap(pdev, iomem);
+
+ fail_map_io:
+        pci_release_regions(pdev);
+
+ fail_resources:
+        pci_disable_device(pdev);
+
+        return err;
+}
+
+static void __devexit nortel_pci_remove_one(struct pci_dev *pdev)
+{
+        struct net_device *dev = pci_get_drvdata(pdev);
+        struct orinoco_private *priv = netdev_priv(dev);
+        struct nortel_pci_card *card = priv->card;
+
+        /* clear leds */
+        outw_p(0, card->iobase1 + 10);
+
+        unregister_netdev(dev);
+        free_irq(dev->irq, dev);
+        pci_set_drvdata(pdev, NULL);
+        free_orinocodev(dev);
+        pci_iounmap(pdev, priv->hw.iobase);
+        pci_release_regions(pdev);
+        pci_disable_device(pdev);
+}
+
+
+static struct pci_device_id nortel_pci_id_table[] = {
+        /* Nortel emobility PCI */
+        {0x126c, 0x8030, PCI_ANY_ID, PCI_ANY_ID,},
+        {0,},
+};
+
+MODULE_DEVICE_TABLE(pci, nortel_pci_id_table);
+
+static struct pci_driver nortel_pci_driver = {
+        .name = DRIVER_NAME,
+        .id_table = nortel_pci_id_table,
+        .probe = nortel_pci_init_one,
+        .remove = __devexit_p(nortel_pci_remove_one),
+};
+
+static char version[] __initdata = DRIVER_NAME " " DRIVER_VERSION
+        " (Tobias Hoffmann & Christoph Jungegger <disdos@traum404.de>)";
+MODULE_AUTHOR("Christoph Jungegger <disdos@traum404.de>");
+MODULE_DESCRIPTION
+    ("Driver for wireless LAN cards using the Nortel PCI bridge");
+MODULE_LICENSE("Dual MPL/GPL");
+
+static int __init nortel_pci_init(void)
+{
+        printk(KERN_DEBUG "%s\n", version);
+        return pci_module_init(&nortel_pci_driver);
+}
+
+static void __exit nortel_pci_exit(void)
+{
+        pci_unregister_driver(&nortel_pci_driver);
+        ssleep(1);
+}
+
+module_init(nortel_pci_init);
+module_exit(nortel_pci_exit);
+
+/*
+ * Local variables:
+ *  c-indent-level: 8
+ *  c-basic-offset: 8
+ *  tab-width: 8
+ * End:
+ */
diff --git a/drivers/net/wireless/orinoco_pci.c b/drivers/net/wireless/orinoco_pci.c
index 7a6f52ea7fa..42e03438291 100644
--- a/drivers/net/wireless/orinoco_pci.c
+++ b/drivers/net/wireless/orinoco_pci.c
@@ -301,8 +301,6 @@ static int orinoco_pci_suspend(struct pci_dev *pdev, pm_message_t state)
         unsigned long flags;
         int err;
         
-        printk(KERN_DEBUG "%s: Orinoco-PCI entering sleep mode (state=%d)\n",
-               dev->name, state);
 
         err = orinoco_lock(priv, &flags);
         if (err) {
diff --git a/drivers/net/wireless/prism54/isl_ioctl.c b/drivers/net/wireless/prism54/isl_ioctl.c
index 0f29a9c7bc2..9a8790e3580 100644
--- a/drivers/net/wireless/prism54/isl_ioctl.c
+++ b/drivers/net/wireless/prism54/isl_ioctl.c
@@ -2727,6 +2727,9 @@ const struct iw_handler_def prism54_handler_def = {
         .standard = (iw_handler *) prism54_handler,
         .private = (iw_handler *) prism54_private_handler,
         .private_args = (struct iw_priv_args *) prism54_private_args,
+#if WIRELESS_EXT > 16
+        .get_wireless_stats = prism54_get_wireless_stats,
+#endif /* WIRELESS_EXT > 16 */
 #if WIRELESS_EXT == 16
         .spy_offset = offsetof(islpci_private, spy_data),
 #endif /* WIRELESS_EXT == 16 */
diff --git a/drivers/net/wireless/prism54/islpci_dev.c b/drivers/net/wireless/prism54/islpci_dev.c
index efab07e9e24..6f13d4a8e2d 100644
--- a/drivers/net/wireless/prism54/islpci_dev.c
+++ b/drivers/net/wireless/prism54/islpci_dev.c
@@ -815,7 +815,6 @@ islpci_setup(struct pci_dev *pdev)
         ndev->open = &islpci_open;
         ndev->stop = &islpci_close;
         ndev->get_stats = &islpci_statistics;
-        ndev->get_wireless_stats = &prism54_get_wireless_stats;
         ndev->do_ioctl = &prism54_ioctl;
         ndev->wireless_handlers =
             (struct iw_handler_def *) &prism54_handler_def;
@@ -844,6 +843,8 @@ islpci_setup(struct pci_dev *pdev)
         /* Add pointers to enable iwspy support. */
         priv->wireless_data.spy_data = &priv->spy_data;
         ndev->wireless_data = &priv->wireless_data;
+#else  /* WIRELESS_EXT > 16 */
+        ndev->get_wireless_stats = &prism54_get_wireless_stats;
 #endif /* WIRELESS_EXT > 16 */
 
         /* save the start and end address of the PCI memory area */
diff --git a/drivers/net/wireless/prism54/islpci_hotplug.c b/drivers/net/wireless/prism54/islpci_hotplug.c
index c17391d947f..dc040caab7d 100644
--- a/drivers/net/wireless/prism54/islpci_hotplug.c
+++ b/drivers/net/wireless/prism54/islpci_hotplug.c
@@ -267,8 +267,6 @@ prism54_suspend(struct pci_dev *pdev, pm_message_t state)
         islpci_private *priv = ndev ? netdev_priv(ndev) : NULL;
         BUG_ON(!priv);
 
-        printk(KERN_NOTICE "%s: got suspend request (state %d)\n",
-               ndev->name, state);
 
         pci_save_state(pdev);
 
diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c
index 0e0ba614259..e9c5ea0f553 100644
--- a/drivers/net/wireless/ray_cs.c
+++ b/drivers/net/wireless/ray_cs.c
@@ -53,6 +53,7 @@
 #include <pcmcia/ds.h>
 #include <pcmcia/mem_op.h>
 
+#include <net/ieee80211.h>
 #include <linux/wireless.h>
 
 #include <asm/io.h>
@@ -64,7 +65,6 @@
 #define WIRELESS_SPY            /* Enable spying addresses */
 /* Definitions we need for spy */
 typedef struct iw_statistics    iw_stats;
-typedef struct iw_quality       iw_qual;
 typedef u_char  mac_addr[ETH_ALEN];     /* Hardware address */
 
 #include "rayctl.h"
@@ -101,7 +101,6 @@ static int ray_dev_close(struct net_device *dev);
 static int ray_dev_config(struct net_device *dev, struct ifmap *map);
 static struct net_device_stats *ray_get_stats(struct net_device *dev);
 static int ray_dev_init(struct net_device *dev);
-static int ray_dev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd);
 
 static struct ethtool_ops netdev_ethtool_ops;
 
@@ -114,9 +113,8 @@ static int translate_frame(ray_dev_t *local, struct tx_msg __iomem *ptx,
 static void ray_build_header(ray_dev_t *local, struct tx_msg __iomem *ptx, UCHAR msg_type,
                 unsigned char *data);
 static void untranslate(ray_dev_t *local, struct sk_buff *skb, int len);
-#if WIRELESS_EXT > 7    /* If wireless extension exist in the kernel */
 static iw_stats * ray_get_wireless_stats(struct net_device *    dev);
-#endif  /* WIRELESS_EXT > 7 */
+static const struct iw_handler_def      ray_handler_def;
 
 /***** Prototypes for raylink functions **************************************/
 static int asc_to_int(char a);
@@ -373,11 +371,12 @@ static dev_link_t *ray_attach(void)
     dev->hard_start_xmit = &ray_dev_start_xmit;
     dev->set_config = &ray_dev_config;
     dev->get_stats  = &ray_get_stats;
-    dev->do_ioctl = &ray_dev_ioctl;
     SET_ETHTOOL_OPS(dev, &netdev_ethtool_ops);
-#if WIRELESS_EXT > 7    /* If wireless extension exist in the kernel */
-    dev->get_wireless_stats = ray_get_wireless_stats;
-#endif
+    dev->wireless_handlers = &ray_handler_def;
+#ifdef WIRELESS_SPY
+    local->wireless_data.spy_data = &local->spy_data;
+    dev->wireless_data = &local->wireless_data;
+#endif  /* WIRELESS_SPY */
 
     dev->set_multicast_list = &set_multicast_list;
 
@@ -1201,436 +1200,420 @@ static struct ethtool_ops netdev_ethtool_ops = {
 
 /*====================================================================*/
 
-static int ray_dev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
+/*------------------------------------------------------------------*/
+/*
+ * Wireless Handler : get protocol name
+ */
+static int ray_get_name(struct net_device *dev,
+                        struct iw_request_info *info,
+                        char *cwrq,
+                        char *extra)
 {
-    ray_dev_t *local = (ray_dev_t *)dev->priv;
-    dev_link_t *link = local->finder;
-    int err = 0;
-#if WIRELESS_EXT > 7
-    struct iwreq *wrq = (struct iwreq *) ifr;
-#endif  /* WIRELESS_EXT > 7 */
-#ifdef WIRELESS_SPY
-    struct sockaddr     address[IW_MAX_SPY];
-#endif  /* WIRELESS_SPY */
+        strcpy(cwrq, "IEEE 802.11-FH");
+        return 0;
+}
 
-    if (!(link->state & DEV_PRESENT)) {
-        DEBUG(2,"ray_dev_ioctl - device not present\n");
-        return -1;
-    }
-    DEBUG(2,"ray_cs IOCTL dev=%p, ifr=%p, cmd = 0x%x\n",dev,ifr,cmd);
-    /* Validate the command */
-    switch (cmd)
-    {
-#if WIRELESS_EXT > 7
-      /* --------------- WIRELESS EXTENSIONS --------------- */
-      /* Get name */
-    case SIOCGIWNAME:
-      strcpy(wrq->u.name, "IEEE 802.11-FH");
-      break;
-
-      /* Get frequency/channel */
-    case SIOCGIWFREQ:
-      wrq->u.freq.m = local->sparm.b5.a_hop_pattern;
-      wrq->u.freq.e = 0;
-      break;
-
-      /* Set frequency/channel */
-    case SIOCSIWFREQ:
-      /* Reject if card is already initialised */
-      if(local->card_status != CARD_AWAITING_PARAM)
-        {
-          err = -EBUSY;
-          break;
-        }
+/*------------------------------------------------------------------*/
+/*
+ * Wireless Handler : set frequency
+ */
+static int ray_set_freq(struct net_device *dev,
+                        struct iw_request_info *info,
+                        struct iw_freq *fwrq,
+                        char *extra)
+{
+        ray_dev_t *local = (ray_dev_t *)dev->priv;
+        int err = -EINPROGRESS;         /* Call commit handler */
 
-      /* Setting by channel number */
-      if ((wrq->u.freq.m > USA_HOP_MOD) || (wrq->u.freq.e > 0))
-        err = -EOPNOTSUPP;
-      else
-          local->sparm.b5.a_hop_pattern = wrq->u.freq.m;
-      break;
+        /* Reject if card is already initialised */
+        if(local->card_status != CARD_AWAITING_PARAM)
+                return -EBUSY;
 
-      /* Get current network name (ESSID) */
-    case SIOCGIWESSID:
-      if (wrq->u.data.pointer)
-        {
-          char essid[IW_ESSID_MAX_SIZE + 1];
-          /* Get the essid that was set */
-          memcpy(essid, local->sparm.b5.a_current_ess_id,
-                 IW_ESSID_MAX_SIZE);
-          essid[IW_ESSID_MAX_SIZE] = '\0';
-
-          /* Push it out ! */
-          wrq->u.data.length = strlen(essid) + 1;
-          wrq->u.data.flags = 1; /* active */
-          if (copy_to_user(wrq->u.data.pointer, essid, sizeof(essid)))
-                  err = -EFAULT;
-        }
-      break;
+        /* Setting by channel number */
+        if ((fwrq->m > USA_HOP_MOD) || (fwrq->e > 0))
+                err = -EOPNOTSUPP;
+        else
+                local->sparm.b5.a_hop_pattern = fwrq->m;
 
-      /* Set desired network name (ESSID) */
-    case SIOCSIWESSID:
-      /* Reject if card is already initialised */
-      if(local->card_status != CARD_AWAITING_PARAM)
-        {
-          err = -EBUSY;
-          break;
-        }
+        return err;
+}
+ 
+/*------------------------------------------------------------------*/
+/*
+ * Wireless Handler : get frequency
+ */
+static int ray_get_freq(struct net_device *dev,
+                        struct iw_request_info *info,
+                        struct iw_freq *fwrq,
+                        char *extra)
+{
+        ray_dev_t *local = (ray_dev_t *)dev->priv;
 
-        if (wrq->u.data.pointer)
-        {
-            char        card_essid[IW_ESSID_MAX_SIZE + 1];
-            
-            /* Check if we asked for `any' */
-            if(wrq->u.data.flags == 0)
-            {
+        fwrq->m = local->sparm.b5.a_hop_pattern;
+        fwrq->e = 0;
+        return 0;
+}
+
+/*------------------------------------------------------------------*/
+/*
+ * Wireless Handler : set ESSID
+ */
+static int ray_set_essid(struct net_device *dev,
+                         struct iw_request_info *info,
+                         struct iw_point *dwrq,
+                         char *extra)
+{
+        ray_dev_t *local = (ray_dev_t *)dev->priv;
+
+        /* Reject if card is already initialised */
+        if(local->card_status != CARD_AWAITING_PARAM)
+                return -EBUSY;
+
+        /* Check if we asked for `any' */
+        if(dwrq->flags == 0) {
                 /* Corey : can you do that ? */
-                err = -EOPNOTSUPP;
-            }
-            else
-            {
+                return -EOPNOTSUPP;
+        } else {
                 /* Check the size of the string */
-                if(wrq->u.data.length >
-                   IW_ESSID_MAX_SIZE + 1)
-                {
-                    err = -E2BIG;
-                    break;
-                }
-                if (copy_from_user(card_essid,
-                                   wrq->u.data.pointer,
-                                   wrq->u.data.length)) {
-                        err = -EFAULT;
-                        break;
+                if(dwrq->length > IW_ESSID_MAX_SIZE + 1) {
+                        return -E2BIG;
                 }
-                card_essid[IW_ESSID_MAX_SIZE] = '\0';
 
                 /* Set the ESSID in the card */
-                memcpy(local->sparm.b5.a_current_ess_id, card_essid,
-                       IW_ESSID_MAX_SIZE);
-            }
+                memset(local->sparm.b5.a_current_ess_id, 0, IW_ESSID_MAX_SIZE);
+                memcpy(local->sparm.b5.a_current_ess_id, extra, dwrq->length);
         }
-        break;
-
-      /* Get current Access Point (BSSID in our case) */
-    case SIOCGIWAP:
-      memcpy(wrq->u.ap_addr.sa_data, local->bss_id, ETH_ALEN);
-      wrq->u.ap_addr.sa_family = ARPHRD_ETHER;
-      break;
-
-      /* Get the current bit-rate */
-    case SIOCGIWRATE:
-      if(local->net_default_tx_rate == 3)
-        wrq->u.bitrate.value = 2000000;         /* Hum... */
-      else
-        wrq->u.bitrate.value = local->net_default_tx_rate * 500000;
-      wrq->u.bitrate.fixed = 0;         /* We are in auto mode */
-      break;
-
-      /* Set the desired bit-rate */
-    case SIOCSIWRATE:
-      /* Check if rate is in range */
-      if((wrq->u.bitrate.value != 1000000) &&
-         (wrq->u.bitrate.value != 2000000))
-        {
-          err = -EINVAL;
-          break;
-        }
-      /* Hack for 1.5 Mb/s instead of 2 Mb/s */
-      if((local->fw_ver == 0x55) &&             /* Please check */
-         (wrq->u.bitrate.value == 2000000))
-        local->net_default_tx_rate = 3;
-      else
-        local->net_default_tx_rate = wrq->u.bitrate.value/500000;
-      break;
-
-      /* Get the current RTS threshold */
-    case SIOCGIWRTS:
-      wrq->u.rts.value = (local->sparm.b5.a_rts_threshold[0] << 8)
-        + local->sparm.b5.a_rts_threshold[1];
-#if WIRELESS_EXT > 8
-      wrq->u.rts.disabled = (wrq->u.rts.value == 32767);
-#endif /* WIRELESS_EXT > 8 */
-      wrq->u.rts.fixed = 1;
-      break;
-
-      /* Set the desired RTS threshold */
-    case SIOCSIWRTS:
-    {
-        int rthr = wrq->u.rts.value;
 
-      /* Reject if card is already initialised */
-      if(local->card_status != CARD_AWAITING_PARAM)
-        {
-          err = -EBUSY;
-          break;
-        }
+        return -EINPROGRESS;            /* Call commit handler */
+}
 
-        /* if(wrq->u.rts.fixed == 0) we should complain */
-#if WIRELESS_EXT > 8
-        if(wrq->u.rts.disabled)
-            rthr = 32767;
+/*------------------------------------------------------------------*/
+/*
+ * Wireless Handler : get ESSID
+ */
+static int ray_get_essid(struct net_device *dev,
+                         struct iw_request_info *info,
+                         struct iw_point *dwrq,
+                         char *extra)
+{
+        ray_dev_t *local = (ray_dev_t *)dev->priv;
+
+        /* Get the essid that was set */
+        memcpy(extra, local->sparm.b5.a_current_ess_id, IW_ESSID_MAX_SIZE);
+        extra[IW_ESSID_MAX_SIZE] = '\0';
+
+        /* Push it out ! */
+        dwrq->length = strlen(extra) + 1;
+        dwrq->flags = 1; /* active */
+
+        return 0;
+}
+
+/*------------------------------------------------------------------*/
+/*
+ * Wireless Handler : get AP address
+ */
+static int ray_get_wap(struct net_device *dev,
+                        struct iw_request_info *info,
+                        struct sockaddr *awrq,
+                        char *extra)
+{
+        ray_dev_t *local = (ray_dev_t *)dev->priv;
+
+        memcpy(awrq->sa_data, local->bss_id, ETH_ALEN);
+        awrq->sa_family = ARPHRD_ETHER;
+
+        return 0;
+}
+
+/*------------------------------------------------------------------*/
+/*
+ * Wireless Handler : set Bit-Rate
+ */
+static int ray_set_rate(struct net_device *dev,
+                        struct iw_request_info *info,
+                        struct iw_param *vwrq,
+                        char *extra)
+{
+        ray_dev_t *local = (ray_dev_t *)dev->priv;
+
+        /* Reject if card is already initialised */
+        if(local->card_status != CARD_AWAITING_PARAM)
+                return -EBUSY;
+
+        /* Check if rate is in range */
+        if((vwrq->value != 1000000) && (vwrq->value != 2000000))
+                return -EINVAL;
+
+        /* Hack for 1.5 Mb/s instead of 2 Mb/s */
+        if((local->fw_ver == 0x55) &&           /* Please check */
+           (vwrq->value == 2000000))
+                local->net_default_tx_rate = 3;
         else
-#endif /* WIRELESS_EXT > 8 */
-            if((rthr < 0) || (rthr > 2347)) /* What's the max packet size ??? */
-            {
-                err = -EINVAL;
-                break;
-            }
+                local->net_default_tx_rate = vwrq->value/500000;
+
+        return 0;
+}
+
+/*------------------------------------------------------------------*/
+/*
+ * Wireless Handler : get Bit-Rate
+ */
+static int ray_get_rate(struct net_device *dev,
+                        struct iw_request_info *info,
+                        struct iw_param *vwrq,
+                        char *extra)
+{
+        ray_dev_t *local = (ray_dev_t *)dev->priv;
+
+        if(local->net_default_tx_rate == 3)
+                vwrq->value = 2000000;          /* Hum... */
+        else
+                vwrq->value = local->net_default_tx_rate * 500000;
+        vwrq->fixed = 0;                /* We are in auto mode */
+
+        return 0;
+}
+
+/*------------------------------------------------------------------*/
+/*
+ * Wireless Handler : set RTS threshold
+ */
+static int ray_set_rts(struct net_device *dev,
+                       struct iw_request_info *info,
+                       struct iw_param *vwrq,
+                       char *extra)
+{
+        ray_dev_t *local = (ray_dev_t *)dev->priv;
+        int rthr = vwrq->value;
+
+        /* Reject if card is already initialised */
+        if(local->card_status != CARD_AWAITING_PARAM)
+                return -EBUSY;
+
+        /* if(wrq->u.rts.fixed == 0) we should complain */
+        if(vwrq->disabled)
+                rthr = 32767;
+        else {
+                if((rthr < 0) || (rthr > 2347)) /* What's the max packet size ??? */
+                        return -EINVAL;
+        }
         local->sparm.b5.a_rts_threshold[0] = (rthr >> 8) & 0xFF;
         local->sparm.b5.a_rts_threshold[1] = rthr & 0xFF;
-    }
-    break;
 
-      /* Get the current fragmentation threshold */
-    case SIOCGIWFRAG:
-      wrq->u.frag.value = (local->sparm.b5.a_frag_threshold[0] << 8)
-        + local->sparm.b5.a_frag_threshold[1];
-#if WIRELESS_EXT > 8
-      wrq->u.frag.disabled = (wrq->u.frag.value == 32767);
-#endif /* WIRELESS_EXT > 8 */
-      wrq->u.frag.fixed = 1;
-      break;
+        return -EINPROGRESS;            /* Call commit handler */
+}
 
-      /* Set the desired fragmentation threshold */
-    case SIOCSIWFRAG:
-    {
-        int fthr = wrq->u.frag.value;
 
-      /* Reject if card is already initialised */
-      if(local->card_status != CARD_AWAITING_PARAM)
-        {
-          err = -EBUSY;
-          break;
-        }
+/*------------------------------------------------------------------*/
+/*
+ * Wireless Handler : get RTS threshold
+ */
+static int ray_get_rts(struct net_device *dev,
+                       struct iw_request_info *info,
+                       struct iw_param *vwrq,
+                       char *extra)
+{
+        ray_dev_t *local = (ray_dev_t *)dev->priv;
+
+        vwrq->value = (local->sparm.b5.a_rts_threshold[0] << 8)
+                + local->sparm.b5.a_rts_threshold[1];
+        vwrq->disabled = (vwrq->value == 32767);
+        vwrq->fixed = 1;
+
+        return 0;
+}
+
+/*------------------------------------------------------------------*/
+/*
+ * Wireless Handler : set Fragmentation threshold
+ */
+static int ray_set_frag(struct net_device *dev,
+                        struct iw_request_info *info,
+                        struct iw_param *vwrq,
+                        char *extra)
+{
+        ray_dev_t *local = (ray_dev_t *)dev->priv;
+        int fthr = vwrq->value;
+
+        /* Reject if card is already initialised */
+        if(local->card_status != CARD_AWAITING_PARAM)
+                return -EBUSY;
 
         /* if(wrq->u.frag.fixed == 0) should complain */
-#if WIRELESS_EXT > 8
-        if(wrq->u.frag.disabled)
-            fthr = 32767;
-        else
-#endif /* WIRELESS_EXT > 8 */
-            if((fthr < 256) || (fthr > 2347)) /* To check out ! */
-            {
-                err = -EINVAL;
-                break;
-            }
+        if(vwrq->disabled)
+                fthr = 32767;
+        else {
+                if((fthr < 256) || (fthr > 2347)) /* To check out ! */
+                        return -EINVAL;
+        }
         local->sparm.b5.a_frag_threshold[0] = (fthr >> 8) & 0xFF;
         local->sparm.b5.a_frag_threshold[1] = fthr & 0xFF;
-    }
-    break;
 
-#endif  /* WIRELESS_EXT > 7 */
-#if WIRELESS_EXT > 8
+        return -EINPROGRESS;            /* Call commit handler */
+}
 
-      /* Get the current mode of operation */
-    case SIOCGIWMODE:
-      if(local->sparm.b5.a_network_type)
-        wrq->u.mode = IW_MODE_INFRA;
-      else
-        wrq->u.mode = IW_MODE_ADHOC;
-      break;
+/*------------------------------------------------------------------*/
+/*
+ * Wireless Handler : get Fragmentation threshold
+ */
+static int ray_get_frag(struct net_device *dev,
+                        struct iw_request_info *info,
+                        struct iw_param *vwrq,
+                        char *extra)
+{
+        ray_dev_t *local = (ray_dev_t *)dev->priv;
 
-      /* Set the current mode of operation */
-    case SIOCSIWMODE:
-    {
+        vwrq->value = (local->sparm.b5.a_frag_threshold[0] << 8)
+                + local->sparm.b5.a_frag_threshold[1];
+        vwrq->disabled = (vwrq->value == 32767);
+        vwrq->fixed = 1;
+
+        return 0;
+}
+
+/*------------------------------------------------------------------*/
+/*
+ * Wireless Handler : set Mode of Operation
+ */
+static int ray_set_mode(struct net_device *dev,
+                        struct iw_request_info *info,
+                        __u32 *uwrq,
+                        char *extra)
+{
+        ray_dev_t *local = (ray_dev_t *)dev->priv;
+        int err = -EINPROGRESS;         /* Call commit handler */
         char card_mode = 1;
-        
-      /* Reject if card is already initialised */
-      if(local->card_status != CARD_AWAITING_PARAM)
-        {
-          err = -EBUSY;
-          break;
-        }
 
-        switch (wrq->u.mode)
+        /* Reject if card is already initialised */
+        if(local->card_status != CARD_AWAITING_PARAM)
+                return -EBUSY;
+
+        switch (*uwrq)
         {
         case IW_MODE_ADHOC:
-            card_mode = 0;
-            // Fall through
+                card_mode = 0;
+                // Fall through
         case IW_MODE_INFRA:
-            local->sparm.b5.a_network_type = card_mode;
-            break;
+                local->sparm.b5.a_network_type = card_mode;
+                break;
         default:
-            err = -EINVAL;
+                err = -EINVAL;
         }
-    }
-    break;
 
-#endif /* WIRELESS_EXT > 8 */
-#if WIRELESS_EXT > 7
-      /* ------------------ IWSPY SUPPORT ------------------ */
-      /* Define the range (variations) of above parameters */
-    case SIOCGIWRANGE:
-      /* Basic checking... */
-      if(wrq->u.data.pointer != (caddr_t) 0)
-        {
-          struct iw_range       range;
-          memset((char *) &range, 0, sizeof(struct iw_range));
-
-          /* Set the length (very important for backward compatibility) */
-          wrq->u.data.length = sizeof(struct iw_range);
-
-#if WIRELESS_EXT > 10
-          /* Set the Wireless Extension versions */
-          range.we_version_compiled = WIRELESS_EXT;
-          range.we_version_source = 9;
-#endif /* WIRELESS_EXT > 10 */
-
-          /* Set information in the range struct */
-          range.throughput = 1.1 * 1000 * 1000; /* Put the right number here */
-          range.num_channels = hop_pattern_length[(int)country]; 
-          range.num_frequency = 0;
-          range.max_qual.qual = 0;
-          range.max_qual.level = 255;   /* What's the correct value ? */
-          range.max_qual.noise = 255;   /* Idem */
-          range.num_bitrates = 2;
-          range.bitrate[0] = 1000000;   /* 1 Mb/s */
-          range.bitrate[1] = 2000000;   /* 2 Mb/s */
-
-          /* Copy structure to the user buffer */
-          if(copy_to_user(wrq->u.data.pointer, &range,
-                          sizeof(struct iw_range)))
-            err = -EFAULT;
-        }
-      break;
+        return err;
+}
 
-#ifdef WIRELESS_SPY
-      /* Set addresses to spy */
-    case SIOCSIWSPY:
-      /* Check the number of addresses */
-      if(wrq->u.data.length > IW_MAX_SPY)
-        {
-          err = -E2BIG;
-          break;
-        }
-      local->spy_number = wrq->u.data.length;
+/*------------------------------------------------------------------*/
+/*
+ * Wireless Handler : get Mode of Operation
+ */
+static int ray_get_mode(struct net_device *dev,
+                        struct iw_request_info *info,
+                        __u32 *uwrq,
+                        char *extra)
+{
+        ray_dev_t *local = (ray_dev_t *)dev->priv;
 
-      /* If there is some addresses to copy */
-      if(local->spy_number > 0)
-        {
-          int                   i;
-
-          /* Copy addresses to the driver */
-          if(copy_from_user(address, wrq->u.data.pointer,
-                            sizeof(struct sockaddr) * local->spy_number))
-            {
-              err = -EFAULT;
-              break;
-            }
-
-          /* Copy addresses to the lp structure */
-          for(i = 0; i < local->spy_number; i++)
-            memcpy(local->spy_address[i], address[i].sa_data, ETH_ALEN);
-
-          /* Reset structure... */
-          memset(local->spy_stat, 0x00, sizeof(iw_qual) * IW_MAX_SPY);
-
-#ifdef DEBUG_IOCTL_INFO
-          printk(KERN_DEBUG "SetSpy - Set of new addresses is :\n");
-          for(i = 0; i < local->spy_number; i++)
-            printk(KERN_DEBUG "%02X:%02X:%02X:%02X:%02X:%02X\n",
-                   local->spy_address[i][0],
-                   local->spy_address[i][1],
-                   local->spy_address[i][2],
-                   local->spy_address[i][3],
-                   local->spy_address[i][4],
-                   local->spy_address[i][5]);
-#endif  /* DEBUG_IOCTL_INFO */
-        }
-      break;
+        if(local->sparm.b5.a_network_type)
+                *uwrq = IW_MODE_INFRA;
+        else
+                *uwrq = IW_MODE_ADHOC;
 
-      /* Get the spy list and spy stats */
-    case SIOCGIWSPY:
-      /* Set the number of addresses */
-      wrq->u.data.length = local->spy_number;
+        return 0;
+}
 
-      /* If the user want to have the addresses back... */
-      if((local->spy_number > 0) && (wrq->u.data.pointer != (caddr_t) 0))
-        {
-          int                   i;
-
-          /* Copy addresses from the lp structure */
-          for(i = 0; i < local->spy_number; i++)
-            {
-              memcpy(address[i].sa_data, local->spy_address[i], ETH_ALEN);
-              address[i].sa_family = ARPHRD_ETHER;
-            }
-
-          /* Copy addresses to the user buffer */
-          if(copy_to_user(wrq->u.data.pointer, address,
-                       sizeof(struct sockaddr) * local->spy_number))
-            {
-              err = -EFAULT;
-              break;
-            }
-
-          /* Copy stats to the user buffer (just after) */
-          if(copy_to_user(wrq->u.data.pointer +
-                       (sizeof(struct sockaddr) * local->spy_number),
-                       local->spy_stat, sizeof(iw_qual) * local->spy_number))
-            {
-              err = -EFAULT;
-              break;
-            }
-
-          /* Reset updated flags */
-          for(i = 0; i < local->spy_number; i++)
-            local->spy_stat[i].updated = 0x0;
-        }       /* if(pointer != NULL) */
-
-      break;
-#endif  /* WIRELESS_SPY */
+/*------------------------------------------------------------------*/
+/*
+ * Wireless Handler : get range info
+ */
+static int ray_get_range(struct net_device *dev,
+                         struct iw_request_info *info,
+                         struct iw_point *dwrq,
+                         char *extra)
+{
+        struct iw_range *range = (struct iw_range *) extra;
+
+        memset((char *) range, 0, sizeof(struct iw_range));
+
+        /* Set the length (very important for backward compatibility) */
+        dwrq->length = sizeof(struct iw_range);
+
+        /* Set the Wireless Extension versions */
+        range->we_version_compiled = WIRELESS_EXT;
+        range->we_version_source = 9;
+
+        /* Set information in the range struct */
+        range->throughput = 1.1 * 1000 * 1000;  /* Put the right number here */
+        range->num_channels = hop_pattern_length[(int)country]; 
+        range->num_frequency = 0;
+        range->max_qual.qual = 0;
+        range->max_qual.level = 255;    /* What's the correct value ? */
+        range->max_qual.noise = 255;    /* Idem */
+        range->num_bitrates = 2;
+        range->bitrate[0] = 1000000;    /* 1 Mb/s */
+        range->bitrate[1] = 2000000;    /* 2 Mb/s */
+        return 0;
+}
 
-      /* ------------------ PRIVATE IOCTL ------------------ */
-#ifndef SIOCIWFIRSTPRIV
-#define SIOCIWFIRSTPRIV SIOCDEVPRIVATE
-#endif /* SIOCIWFIRSTPRIV */
-#define SIOCSIPFRAMING  SIOCIWFIRSTPRIV         /* Set framing mode */
-#define SIOCGIPFRAMING  SIOCIWFIRSTPRIV + 1     /* Get framing mode */
-#define SIOCGIPCOUNTRY  SIOCIWFIRSTPRIV + 3     /* Get country code */
-    case SIOCSIPFRAMING:
-      if(!capable(CAP_NET_ADMIN))       /* For private IOCTLs, we need to check permissions */
-        {
-          err = -EPERM;
-          break;
-        }
-      translate = *(wrq->u.name);       /* Set framing mode */
-      break;
-    case SIOCGIPFRAMING:
-      *(wrq->u.name) = translate;
-      break;
-    case SIOCGIPCOUNTRY:
-      *(wrq->u.name) = country;
-      break;
-    case SIOCGIWPRIV:
-      /* Export our "private" intercace */
-      if(wrq->u.data.pointer != (caddr_t) 0)
-        {
-          struct iw_priv_args   priv[] =
-          {     /* cmd,         set_args,       get_args,       name */
-            { SIOCSIPFRAMING, IW_PRIV_TYPE_BYTE | IW_PRIV_SIZE_FIXED | 1, 0, "set_framing" },
-            { SIOCGIPFRAMING, 0, IW_PRIV_TYPE_BYTE | IW_PRIV_SIZE_FIXED | 1, "get_framing" },
-            { SIOCGIPCOUNTRY, 0, IW_PRIV_TYPE_BYTE | IW_PRIV_SIZE_FIXED | 1, "get_country" },
-          };
-          /* Set the number of ioctl available */
-          wrq->u.data.length = 3;
-          /* Copy structure to the user buffer */
-          if(copy_to_user(wrq->u.data.pointer, (u_char *) priv,
-                       sizeof(priv)))
-            err = -EFAULT;
-        }
-      break;
-#endif  /* WIRELESS_EXT > 7 */
+/*------------------------------------------------------------------*/
+/*
+ * Wireless Private Handler : set framing mode
+ */
+static int ray_set_framing(struct net_device *dev,
+                           struct iw_request_info *info,
+                           union iwreq_data *wrqu,
+                           char *extra)
+{
+        translate = *(extra);   /* Set framing mode */
 
+        return 0;
+}
 
-        default:
-            DEBUG(0,"ray_dev_ioctl cmd = 0x%x\n", cmd);
-            err = -EOPNOTSUPP;
-    }
-    return err;
-} /* end ray_dev_ioctl */
-/*===========================================================================*/
-#if WIRELESS_EXT > 7    /* If wireless extension exist in the kernel */
+/*------------------------------------------------------------------*/
+/*
+ * Wireless Private Handler : get framing mode
+ */
+static int ray_get_framing(struct net_device *dev,
+                           struct iw_request_info *info,
+                           union iwreq_data *wrqu,
+                           char *extra)
+{
+        *(extra) = translate;
+
+        return 0;
+}
+
+/*------------------------------------------------------------------*/
+/*
+ * Wireless Private Handler : get country
+ */
+static int ray_get_country(struct net_device *dev,
+                           struct iw_request_info *info,
+                           union iwreq_data *wrqu,
+                           char *extra)
+{
+        *(extra) = country;
+
+        return 0;
+}
+
+/*------------------------------------------------------------------*/
+/*
+ * Commit handler : called after a bunch of SET operations
+ */
+static int ray_commit(struct net_device *dev,
+                      struct iw_request_info *info,     /* NULL */
+                      void *zwrq,                       /* NULL */
+                      char *extra)                      /* NULL */
+{
+        return 0;
+}
+
+/*------------------------------------------------------------------*/
+/*
+ * Stats handler : return Wireless Stats
+ */
 static iw_stats * ray_get_wireless_stats(struct net_device *    dev)
 {
   ray_dev_t *   local = (ray_dev_t *) dev->priv;
@@ -1642,13 +1625,13 @@ static iw_stats * ray_get_wireless_stats(struct net_device *	dev)
 
   local->wstats.status = local->card_status;
 #ifdef WIRELESS_SPY
-  if((local->spy_number > 0) && (local->sparm.b5.a_network_type == 0))
+  if((local->spy_data.spy_number > 0) && (local->sparm.b5.a_network_type == 0))
     {
       /* Get it from the first node in spy list */
-      local->wstats.qual.qual = local->spy_stat[0].qual;
-      local->wstats.qual.level = local->spy_stat[0].level;
-      local->wstats.qual.noise = local->spy_stat[0].noise;
-      local->wstats.qual.updated = local->spy_stat[0].updated;
+      local->wstats.qual.qual = local->spy_data.spy_stat[0].qual;
+      local->wstats.qual.level = local->spy_data.spy_stat[0].level;
+      local->wstats.qual.noise = local->spy_data.spy_stat[0].noise;
+      local->wstats.qual.updated = local->spy_data.spy_stat[0].updated;
     }
 #endif /* WIRELESS_SPY */
 
@@ -1659,7 +1642,65 @@ static iw_stats * ray_get_wireless_stats(struct net_device *	dev)
 
   return &local->wstats;
 } /* end ray_get_wireless_stats */
-#endif  /* WIRELESS_EXT > 7 */
+
+/*------------------------------------------------------------------*/
+/*
+ * Structures to export the Wireless Handlers
+ */
+
+static const iw_handler ray_handler[] = {
+        [SIOCSIWCOMMIT-SIOCIWFIRST] (iw_handler) ray_commit,
+        [SIOCGIWNAME  -SIOCIWFIRST] (iw_handler) ray_get_name,
+        [SIOCSIWFREQ  -SIOCIWFIRST] (iw_handler) ray_set_freq,
+        [SIOCGIWFREQ  -SIOCIWFIRST] (iw_handler) ray_get_freq,
+        [SIOCSIWMODE  -SIOCIWFIRST] (iw_handler) ray_set_mode,
+        [SIOCGIWMODE  -SIOCIWFIRST] (iw_handler) ray_get_mode,
+        [SIOCGIWRANGE -SIOCIWFIRST] (iw_handler) ray_get_range,
+#ifdef WIRELESS_SPY
+        [SIOCSIWSPY   -SIOCIWFIRST] (iw_handler) iw_handler_set_spy,
+        [SIOCGIWSPY   -SIOCIWFIRST] (iw_handler) iw_handler_get_spy,
+        [SIOCSIWTHRSPY-SIOCIWFIRST] (iw_handler) iw_handler_set_thrspy,
+        [SIOCGIWTHRSPY-SIOCIWFIRST] (iw_handler) iw_handler_get_thrspy,
+#endif  /* WIRELESS_SPY */
+        [SIOCGIWAP    -SIOCIWFIRST] (iw_handler) ray_get_wap,
+        [SIOCSIWESSID -SIOCIWFIRST] (iw_handler) ray_set_essid,
+        [SIOCGIWESSID -SIOCIWFIRST] (iw_handler) ray_get_essid,
+        [SIOCSIWRATE  -SIOCIWFIRST] (iw_handler) ray_set_rate,
+        [SIOCGIWRATE  -SIOCIWFIRST] (iw_handler) ray_get_rate,
+        [SIOCSIWRTS   -SIOCIWFIRST] (iw_handler) ray_set_rts,
+        [SIOCGIWRTS   -SIOCIWFIRST] (iw_handler) ray_get_rts,
+        [SIOCSIWFRAG  -SIOCIWFIRST] (iw_handler) ray_set_frag,
+        [SIOCGIWFRAG  -SIOCIWFIRST] (iw_handler) ray_get_frag,
+};
+
+#define SIOCSIPFRAMING  SIOCIWFIRSTPRIV         /* Set framing mode */
+#define SIOCGIPFRAMING  SIOCIWFIRSTPRIV + 1     /* Get framing mode */
+#define SIOCGIPCOUNTRY  SIOCIWFIRSTPRIV + 3     /* Get country code */
+
+static const iw_handler ray_private_handler[] = {
+        [0] (iw_handler) ray_set_framing,
+        [1] (iw_handler) ray_get_framing,
+        [3] (iw_handler) ray_get_country,
+};
+
+static const struct iw_priv_args        ray_private_args[] = {
+/* cmd,         set_args,       get_args,       name */
+{ SIOCSIPFRAMING, IW_PRIV_TYPE_BYTE | IW_PRIV_SIZE_FIXED | 1, 0, "set_framing" },
+{ SIOCGIPFRAMING, 0, IW_PRIV_TYPE_BYTE | IW_PRIV_SIZE_FIXED | 1, "get_framing" },
+{ SIOCGIPCOUNTRY, 0, IW_PRIV_TYPE_BYTE | IW_PRIV_SIZE_FIXED | 1, "get_country" },
+};
+
+static const struct iw_handler_def      ray_handler_def =
+{
+        .num_standard   = sizeof(ray_handler)/sizeof(iw_handler),
+        .num_private    = sizeof(ray_private_handler)/sizeof(iw_handler),
+        .num_private_args = sizeof(ray_private_args)/sizeof(struct iw_priv_args),
+        .standard       = ray_handler,
+        .private        = ray_private_handler,
+        .private_args   = ray_private_args,
+        .get_wireless_stats = ray_get_wireless_stats,
+};
+
 /*===========================================================================*/
 static int ray_open(struct net_device *dev)
 {
@@ -2392,20 +2433,15 @@ static void rx_data(struct net_device *dev, struct rcs __iomem *prcs, unsigned i
         /*local->wstats.qual.noise = none ? */
         local->wstats.qual.updated = 0x2;
       }
-    /* Now, for the addresses in the spy list */
+    /* Now, update the spy stuff */
     {
-      int       i;
-      /* Look all addresses */
-      for(i = 0; i < local->spy_number; i++)
-        /* If match */
-        if(!memcmp(linksrcaddr, local->spy_address[i], ETH_ALEN))
-          {
-            /* Update statistics */
-            /*local->spy_stat[i].qual = none ? */
-            local->spy_stat[i].level = siglev;
-            /*local->spy_stat[i].noise = none ? */
-            local->spy_stat[i].updated = 0x2;
-          }
+        struct iw_quality wstats;
+        wstats.level = siglev;
+        /* wstats.noise = none ? */
+        /* wstats.qual = none ? */
+        wstats.updated = 0x2;
+        /* Update spy records */
+        wireless_spy_update(dev, linksrcaddr, &wstats);
     }
 #endif  /* WIRELESS_SPY */
 } /* end rx_data */
diff --git a/drivers/net/wireless/ray_cs.h b/drivers/net/wireless/ray_cs.h
index c77afa14fa8..42660fe64bf 100644
--- a/drivers/net/wireless/ray_cs.h
+++ b/drivers/net/wireless/ray_cs.h
@@ -63,13 +63,10 @@ typedef struct ray_dev_t {
     UCHAR last_rsl;
     int beacon_rxed;
     struct beacon_rx last_bcn;
-#ifdef WIRELESS_EXT
     iw_stats    wstats;         /* Wireless specific stats */
-#endif
 #ifdef WIRELESS_SPY
-    int         spy_number;             /* Number of addresses to spy */
-    mac_addr    spy_address[IW_MAX_SPY + 1];    /* The addresses to spy */
-    iw_qual     spy_stat[IW_MAX_SPY + 1];       /* Statistics gathered */
+    struct iw_spy_data          spy_data;
+    struct iw_public_data       wireless_data;
 #endif  /* WIRELESS_SPY */
 
 } ray_dev_t;
diff --git a/drivers/net/wireless/spectrum_cs.c b/drivers/net/wireless/spectrum_cs.c
new file mode 100644
index 00000000000..39c6cdf7f3f
--- /dev/null
+++ b/drivers/net/wireless/spectrum_cs.c
@@ -0,0 +1,1120 @@
+/*
+ * Driver for 802.11b cards using RAM-loadable Symbol firmware, such as
+ * Symbol Wireless Networker LA4100, CompactFlash cards by Socket
+ * Communications and Intel PRO/Wireless 2011B.
+ *
+ * The driver implements Symbol firmware download.  The rest is handled
+ * in hermes.c and orinoco.c.
+ *
+ * Utilities for downloading the Symbol firmware are available at
+ * http://sourceforge.net/projects/orinoco/
+ *
+ * Copyright (C) 2002-2005 Pavel Roskin <proski@gnu.org>
+ * Portions based on orinoco_cs.c:
+ *      Copyright (C) David Gibson, Linuxcare Australia
+ * Portions based on Spectrum24tDnld.c from original spectrum24 driver:
+ *      Copyright (C) Symbol Technologies.
+ *
+ * See copyright notice in file orinoco.c.
+ */
+
+#define DRIVER_NAME "spectrum_cs"
+#define PFX DRIVER_NAME ": "
+
+#include <linux/config.h>
+#ifdef  __IN_PCMCIA_PACKAGE__
+#include <pcmcia/k_compat.h>
+#endif /* __IN_PCMCIA_PACKAGE__ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/sched.h>
+#include <linux/ptrace.h>
+#include <linux/slab.h>
+#include <linux/string.h>
+#include <linux/ioport.h>
+#include <linux/netdevice.h>
+#include <linux/if_arp.h>
+#include <linux/etherdevice.h>
+#include <linux/wireless.h>
+
+#include <pcmcia/cs_types.h>
+#include <pcmcia/cs.h>
+#include <pcmcia/cistpl.h>
+#include <pcmcia/cisreg.h>
+#include <pcmcia/ds.h>
+
+#include <asm/uaccess.h>
+#include <asm/io.h>
+#include <asm/system.h>
+
+#include "orinoco.h"
+
+/*
+ * If SPECTRUM_FW_INCLUDED is defined, the firmware is hardcoded into
+ * the driver.  Use get_symbol_fw script to generate spectrum_fw.h and
+ * copy it to the same directory as spectrum_cs.c.
+ *
+ * If SPECTRUM_FW_INCLUDED is not defined, the firmware is loaded at the
+ * runtime using hotplug.  Use the same get_symbol_fw script to generate
+ * files symbol_sp24t_prim_fw symbol_sp24t_sec_fw, copy them to the
+ * hotplug firmware directory (typically /usr/lib/hotplug/firmware) and
+ * make sure that you have hotplug installed and enabled in the kernel.
+ */
+/* #define SPECTRUM_FW_INCLUDED 1 */
+
+#ifdef SPECTRUM_FW_INCLUDED
+/* Header with the firmware */
+#include "spectrum_fw.h"
+#else   /* !SPECTRUM_FW_INCLUDED */
+#include <linux/firmware.h>
+static unsigned char *primsym;
+static unsigned char *secsym;
+static const char primary_fw_name[] = "symbol_sp24t_prim_fw";
+static const char secondary_fw_name[] = "symbol_sp24t_sec_fw";
+#endif  /* !SPECTRUM_FW_INCLUDED */
+
+/********************************************************************/
+/* Module stuff                                                     */
+/********************************************************************/
+
+MODULE_AUTHOR("Pavel Roskin <proski@gnu.org>");
+MODULE_DESCRIPTION("Driver for Symbol Spectrum24 Trilogy cards with firmware downloader");
+MODULE_LICENSE("Dual MPL/GPL");
+
+/* Module parameters */
+
+/* Some D-Link cards have buggy CIS. They do work at 5v properly, but
+ * don't have any CIS entry for it. This workaround it... */
+static int ignore_cis_vcc; /* = 0 */
+module_param(ignore_cis_vcc, int, 0);
+MODULE_PARM_DESC(ignore_cis_vcc, "Allow voltage mismatch between card and socket");
+
+/********************************************************************/
+/* Magic constants                                                  */
+/********************************************************************/
+
+/*
+ * The dev_info variable is the "key" that is used to match up this
+ * device driver with appropriate cards, through the card
+ * configuration database.
+ */
+static dev_info_t dev_info = DRIVER_NAME;
+
+/********************************************************************/
+/* Data structures                                                  */
+/********************************************************************/
+
+/* PCMCIA specific device information (goes in the card field of
+ * struct orinoco_private */
+struct orinoco_pccard {
+        dev_link_t link;
+        dev_node_t node;
+};
+
+/*
+ * A linked list of "instances" of the device.  Each actual PCMCIA
+ * card corresponds to one device instance, and is described by one
+ * dev_link_t structure (defined in ds.h).
+ */
+static dev_link_t *dev_list; /* = NULL */
+
+/********************************************************************/
+/* Function prototypes                                              */
+/********************************************************************/
+
+/* device methods */
+static int spectrum_cs_hard_reset(struct orinoco_private *priv);
+
+/* PCMCIA gumpf */
+static void spectrum_cs_config(dev_link_t * link);
+static void spectrum_cs_release(dev_link_t * link);
+static int spectrum_cs_event(event_t event, int priority,
+                            event_callback_args_t * args);
+
+static dev_link_t *spectrum_cs_attach(void);
+static void spectrum_cs_detach(dev_link_t *);
+
+/********************************************************************/
+/* Firmware downloader                                              */
+/********************************************************************/
+
+/* Position of PDA in the adapter memory */
+#define EEPROM_ADDR     0x3000
+#define EEPROM_LEN      0x200
+#define PDA_OFFSET      0x100
+
+#define PDA_ADDR        (EEPROM_ADDR + PDA_OFFSET)
+#define PDA_WORDS       ((EEPROM_LEN - PDA_OFFSET) / 2)
+
+/* Constants for the CISREG_CCSR register */
+#define HCR_RUN         0x07    /* run firmware after reset */
+#define HCR_IDLE        0x0E    /* don't run firmware after reset */
+#define HCR_MEM16       0x10    /* memory width bit, should be preserved */
+
+/*
+ * AUX port access.  To unlock the AUX port write the access keys to the
+ * PARAM0-2 registers, then write HERMES_AUX_ENABLE to the HERMES_CONTROL
+ * register.  Then read it and make sure it's HERMES_AUX_ENABLED.
+ */
+#define HERMES_AUX_ENABLE       0x8000  /* Enable auxiliary port access */
+#define HERMES_AUX_DISABLE      0x4000  /* Disable to auxiliary port access */
+#define HERMES_AUX_ENABLED      0xC000  /* Auxiliary port is open */
+
+#define HERMES_AUX_PW0  0xFE01
+#define HERMES_AUX_PW1  0xDC23
+#define HERMES_AUX_PW2  0xBA45
+
+/* End markers */
+#define PDI_END         0x00000000      /* End of PDA */
+#define BLOCK_END       0xFFFFFFFF      /* Last image block */
+#define TEXT_END        0x1A            /* End of text header */
+
+/*
+ * The following structures have little-endian fields denoted by
+ * the leading underscore.  Don't access them directly - use inline
+ * functions defined below.
+ */
+
+/*
+ * The binary image to be downloaded consists of series of data blocks.
+ * Each block has the following structure.
+ */
+struct dblock {
+        u32 _addr;              /* adapter address where to write the block */
+        u16 _len;               /* length of the data only, in bytes */
+        char data[0];           /* data to be written */
+} __attribute__ ((packed));
+
+/*
+ * Plug Data References are located in in the image after the last data
+ * block.  They refer to areas in the adapter memory where the plug data
+ * items with matching ID should be written.
+ */
+struct pdr {
+        u32 _id;                /* record ID */
+        u32 _addr;              /* adapter address where to write the data */
+        u32 _len;               /* expected length of the data, in bytes */
+        char next[0];           /* next PDR starts here */
+} __attribute__ ((packed));
+
+
+/*
+ * Plug Data Items are located in the EEPROM read from the adapter by
+ * primary firmware.  They refer to the device-specific data that should
+ * be plugged into the secondary firmware.
+ */
+struct pdi {
+        u16 _len;               /* length of ID and data, in words */
+        u16 _id;                /* record ID */
+        char data[0];           /* plug data */
+} __attribute__ ((packed));;
+
+
+/* Functions for access to little-endian data */
+static inline u32
+dblock_addr(const struct dblock *blk)
+{
+        return le32_to_cpu(blk->_addr);
+}
+
+static inline u32
+dblock_len(const struct dblock *blk)
+{
+        return le16_to_cpu(blk->_len);
+}
+
+static inline u32
+pdr_id(const struct pdr *pdr)
+{
+        return le32_to_cpu(pdr->_id);
+}
+
+static inline u32
+pdr_addr(const struct pdr *pdr)
+{
+        return le32_to_cpu(pdr->_addr);
+}
+
+static inline u32
+pdr_len(const struct pdr *pdr)
+{
+        return le32_to_cpu(pdr->_len);
+}
+
+static inline u32
+pdi_id(const struct pdi *pdi)
+{
+        return le16_to_cpu(pdi->_id);
+}
+
+/* Return length of the data only, in bytes */
+static inline u32
+pdi_len(const struct pdi *pdi)
+{
+        return 2 * (le16_to_cpu(pdi->_len) - 1);
+}
+
+
+/* Set address of the auxiliary port */
+static inline void
+spectrum_aux_setaddr(hermes_t *hw, u32 addr)
+{
+        hermes_write_reg(hw, HERMES_AUXPAGE, (u16) (addr >> 7));
+        hermes_write_reg(hw, HERMES_AUXOFFSET, (u16) (addr & 0x7F));
+}
+
+
+/* Open access to the auxiliary port */
+static int
+spectrum_aux_open(hermes_t *hw)
+{
+        int i;
+
+        /* Already open? */
+        if (hermes_read_reg(hw, HERMES_CONTROL) == HERMES_AUX_ENABLED)
+                return 0;
+
+        hermes_write_reg(hw, HERMES_PARAM0, HERMES_AUX_PW0);
+        hermes_write_reg(hw, HERMES_PARAM1, HERMES_AUX_PW1);
+        hermes_write_reg(hw, HERMES_PARAM2, HERMES_AUX_PW2);
+        hermes_write_reg(hw, HERMES_CONTROL, HERMES_AUX_ENABLE);
+
+        for (i = 0; i < 20; i++) {
+                udelay(10);
+                if (hermes_read_reg(hw, HERMES_CONTROL) ==
+                    HERMES_AUX_ENABLED)
+                        return 0;
+        }
+
+        return -EBUSY;
+}
+
+
+#define CS_CHECK(fn, ret) \
+  do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
+
+/*
+ * Reset the card using configuration registers COR and CCSR.
+ * If IDLE is 1, stop the firmware, so that it can be safely rewritten.
+ */
+static int
+spectrum_reset(dev_link_t *link, int idle)
+{
+        int last_ret, last_fn;
+        conf_reg_t reg;
+        u_int save_cor;
+
+        /* Doing it if hardware is gone is guaranteed crash */
+        if (!(link->state & DEV_CONFIG))
+                return -ENODEV;
+
+        /* Save original COR value */
+        reg.Function = 0;
+        reg.Action = CS_READ;
+        reg.Offset = CISREG_COR;
+        CS_CHECK(AccessConfigurationRegister,
+                 pcmcia_access_configuration_register(link->handle, &reg));
+        save_cor = reg.Value;
+
+        /* Soft-Reset card */
+        reg.Action = CS_WRITE;
+        reg.Offset = CISREG_COR;
+        reg.Value = (save_cor | COR_SOFT_RESET);
+        CS_CHECK(AccessConfigurationRegister,
+                 pcmcia_access_configuration_register(link->handle, &reg));
+        udelay(1000);
+
+        /* Read CCSR */
+        reg.Action = CS_READ;
+        reg.Offset = CISREG_CCSR;
+        CS_CHECK(AccessConfigurationRegister,
+                 pcmcia_access_configuration_register(link->handle, &reg));
+
+        /*
+         * Start or stop the firmware.  Memory width bit should be
+         * preserved from the value we've just read.
+         */
+        reg.Action = CS_WRITE;
+        reg.Offset = CISREG_CCSR;
+        reg.Value = (idle ? HCR_IDLE : HCR_RUN) | (reg.Value & HCR_MEM16);
+        CS_CHECK(AccessConfigurationRegister,
+                 pcmcia_access_configuration_register(link->handle, &reg));
+        udelay(1000);
+
+        /* Restore original COR configuration index */
+        reg.Action = CS_WRITE;
+        reg.Offset = CISREG_COR;
+        reg.Value = (save_cor & ~COR_SOFT_RESET);
+        CS_CHECK(AccessConfigurationRegister,
+                 pcmcia_access_configuration_register(link->handle, &reg));
+        udelay(1000);
+        return 0;
+
+      cs_failed:
+        cs_error(link->handle, last_fn, last_ret);
+        return -ENODEV;
+}
+
+
+/*
+ * Scan PDR for the record with the specified RECORD_ID.
+ * If it's not found, return NULL.
+ */
+static struct pdr *
+spectrum_find_pdr(struct pdr *first_pdr, u32 record_id)
+{
+        struct pdr *pdr = first_pdr;
+
+        while (pdr_id(pdr) != PDI_END) {
+                /*
+                 * PDR area is currently not terminated by PDI_END.
+                 * It's followed by CRC records, which have the type
+                 * field where PDR has length.  The type can be 0 or 1.
+                 */
+                if (pdr_len(pdr) < 2)
+                        return NULL;
+
+                /* If the record ID matches, we are done */
+                if (pdr_id(pdr) == record_id)
+                        return pdr;
+
+                pdr = (struct pdr *) pdr->next;
+        }
+        return NULL;
+}
+
+
+/* Process one Plug Data Item - find corresponding PDR and plug it */
+static int
+spectrum_plug_pdi(hermes_t *hw, struct pdr *first_pdr, struct pdi *pdi)
+{
+        struct pdr *pdr;
+
+        /* Find the PDI corresponding to this PDR */
+        pdr = spectrum_find_pdr(first_pdr, pdi_id(pdi));
+
+        /* No match is found, safe to ignore */
+        if (!pdr)
+                return 0;
+
+        /* Lengths of the data in PDI and PDR must match */
+        if (pdi_len(pdi) != pdr_len(pdr))
+                return -EINVAL;
+
+        /* do the actual plugging */
+        spectrum_aux_setaddr(hw, pdr_addr(pdr));
+        hermes_write_words(hw, HERMES_AUXDATA, pdi->data,
+                           pdi_len(pdi) / 2);
+
+        return 0;
+}
+
+
+/* Read PDA from the adapter */
+static int
+spectrum_read_pda(hermes_t *hw, u16 *pda, int pda_len)
+{
+        int ret;
+        int pda_size;
+
+        /* Issue command to read EEPROM */
+        ret = hermes_docmd_wait(hw, HERMES_CMD_READMIF, 0, NULL);
+        if (ret)
+                return ret;
+
+        /* Open auxiliary port */
+        ret = spectrum_aux_open(hw);
+        if (ret)
+                return ret;
+
+        /* read PDA from EEPROM */
+        spectrum_aux_setaddr(hw, PDA_ADDR);
+        hermes_read_words(hw, HERMES_AUXDATA, pda, pda_len / 2);
+
+        /* Check PDA length */
+        pda_size = le16_to_cpu(pda[0]);
+        if (pda_size > pda_len)
+                return -EINVAL;
+
+        return 0;
+}
+
+
+/* Parse PDA and write the records into the adapter */
+static int
+spectrum_apply_pda(hermes_t *hw, const struct dblock *first_block,
+                   u16 *pda)
+{
+        int ret;
+        struct pdi *pdi;
+        struct pdr *first_pdr;
+        const struct dblock *blk = first_block;
+
+        /* Skip all blocks to locate Plug Data References */
+        while (dblock_addr(blk) != BLOCK_END)
+                blk = (struct dblock *) &blk->data[dblock_len(blk)];
+
+        first_pdr = (struct pdr *) blk;
+
+        /* Go through every PDI and plug them into the adapter */
+        pdi = (struct pdi *) (pda + 2);
+        while (pdi_id(pdi) != PDI_END) {
+                ret = spectrum_plug_pdi(hw, first_pdr, pdi);
+                if (ret)
+                        return ret;
+
+                /* Increment to the next PDI */
+                pdi = (struct pdi *) &pdi->data[pdi_len(pdi)];
+        }
+        return 0;
+}
+
+
+/* Load firmware blocks into the adapter */
+static int
+spectrum_load_blocks(hermes_t *hw, const struct dblock *first_block)
+{
+        const struct dblock *blk;
+        u32 blkaddr;
+        u32 blklen;
+
+        blk = first_block;
+        blkaddr = dblock_addr(blk);
+        blklen = dblock_len(blk);
+
+        while (dblock_addr(blk) != BLOCK_END) {
+                spectrum_aux_setaddr(hw, blkaddr);
+                hermes_write_words(hw, HERMES_AUXDATA, blk->data,
+                                   blklen / 2);
+
+                blk = (struct dblock *) &blk->data[blklen];
+                blkaddr = dblock_addr(blk);
+                blklen = dblock_len(blk);
+        }
+        return 0;
+}
+
+
+/*
+ * Process a firmware image - stop the card, load the firmware, reset
+ * the card and make sure it responds.  For the secondary firmware take
+ * care of the PDA - read it and then write it on top of the firmware.
+ */
+static int
+spectrum_dl_image(hermes_t *hw, dev_link_t *link,
+                  const unsigned char *image)
+{
+        int ret;
+        const unsigned char *ptr;
+        const struct dblock *first_block;
+
+        /* Plug Data Area (PDA) */
+        u16 pda[PDA_WORDS];
+
+        /* Binary block begins after the 0x1A marker */
+        ptr = image;
+        while (*ptr++ != TEXT_END);
+        first_block = (const struct dblock *) ptr;
+
+        /* Read the PDA */
+        if (image != primsym) {
+                ret = spectrum_read_pda(hw, pda, sizeof(pda));
+                if (ret)
+                        return ret;
+        }
+
+        /* Stop the firmware, so that it can be safely rewritten */
+        ret = spectrum_reset(link, 1);
+        if (ret)
+                return ret;
+
+        /* Program the adapter with new firmware */
+        ret = spectrum_load_blocks(hw, first_block);
+        if (ret)
+                return ret;
+
+        /* Write the PDA to the adapter */
+        if (image != primsym) {
+                ret = spectrum_apply_pda(hw, first_block, pda);
+                if (ret)
+                        return ret;
+        }
+
+        /* Run the firmware */
+        ret = spectrum_reset(link, 0);
+        if (ret)
+                return ret;
+
+        /* Reset hermes chip and make sure it responds */
+        ret = hermes_init(hw);
+
+        /* hermes_reset() should return 0 with the secondary firmware */
+        if (image != primsym && ret != 0)
+                return -ENODEV;
+
+        /* And this should work with any firmware */
+        if (!hermes_present(hw))
+                return -ENODEV;
+
+        return 0;
+}
+
+
+/*
+ * Download the firmware into the card, this also does a PCMCIA soft
+ * reset on the card, to make sure it's in a sane state.
+ */
+static int
+spectrum_dl_firmware(hermes_t *hw, dev_link_t *link)
+{
+        int ret;
+        client_handle_t handle = link->handle;
+
+#ifndef SPECTRUM_FW_INCLUDED
+        const struct firmware *fw_entry;
+
+        if (request_firmware(&fw_entry, primary_fw_name,
+                             &handle_to_dev(handle)) == 0) {
+                primsym = fw_entry->data;
+        } else {
+                printk(KERN_ERR PFX "Cannot find firmware: %s\n",
+                       primary_fw_name);
+                return -ENOENT;
+        }
+
+        if (request_firmware(&fw_entry, secondary_fw_name,
+                             &handle_to_dev(handle)) == 0) {
+                secsym = fw_entry->data;
+        } else {
+                printk(KERN_ERR PFX "Cannot find firmware: %s\n",
+                       secondary_fw_name);
+                return -ENOENT;
+        }
+#endif
+
+        /* Load primary firmware */
+        ret = spectrum_dl_image(hw, link, primsym);
+        if (ret) {
+                printk(KERN_ERR PFX "Primary firmware download failed\n");
+                return ret;
+        }
+
+        /* Load secondary firmware */
+        ret = spectrum_dl_image(hw, link, secsym);
+
+        if (ret) {
+                printk(KERN_ERR PFX "Secondary firmware download failed\n");
+        }
+
+        return ret;
+}
+
+/********************************************************************/
+/* Device methods                                                   */
+/********************************************************************/
+
+static int
+spectrum_cs_hard_reset(struct orinoco_private *priv)
+{
+        struct orinoco_pccard *card = priv->card;
+        dev_link_t *link = &card->link;
+        int err;
+
+        if (!hermes_present(&priv->hw)) {
+                /* The firmware needs to be reloaded */
+                if (spectrum_dl_firmware(&priv->hw, &card->link) != 0) {
+                        printk(KERN_ERR PFX "Firmware download failed\n");
+                        err = -ENODEV;
+                }
+        } else {
+                /* Soft reset using COR and HCR */
+                spectrum_reset(link, 0);
+        }
+
+        return 0;
+}
+
+/********************************************************************/
+/* PCMCIA stuff                                                     */
+/********************************************************************/
+
+/*
+ * This creates an "instance" of the driver, allocating local data
+ * structures for one device.  The device is registered with Card
+ * Services.
+ * 
+ * The dev_link structure is initialized, but we don't actually
+ * configure the card at this point -- we wait until we receive a card
+ * insertion event.  */
+static dev_link_t *
+spectrum_cs_attach(void)
+{
+        struct net_device *dev;
+        struct orinoco_private *priv;
+        struct orinoco_pccard *card;
+        dev_link_t *link;
+        client_reg_t client_reg;
+        int ret;
+
+        dev = alloc_orinocodev(sizeof(*card), spectrum_cs_hard_reset);
+        if (! dev)
+                return NULL;
+        priv = netdev_priv(dev);
+        card = priv->card;
+
+        /* Link both structures together */
+        link = &card->link;
+        link->priv = dev;
+
+        /* Interrupt setup */
+        link->irq.Attributes = IRQ_TYPE_EXCLUSIVE | IRQ_HANDLE_PRESENT;
+        link->irq.IRQInfo1 = IRQ_LEVEL_ID;
+        link->irq.Handler = orinoco_interrupt;
+        link->irq.Instance = dev; 
+
+        /* General socket configuration defaults can go here.  In this
+         * client, we assume very little, and rely on the CIS for
+         * almost everything.  In most clients, many details (i.e.,
+         * number, sizes, and attributes of IO windows) are fixed by
+         * the nature of the device, and can be hard-wired here. */
+        link->conf.Attributes = 0;
+        link->conf.IntType = INT_MEMORY_AND_IO;
+
+        /* Register with Card Services */
+        /* FIXME: need a lock? */
+        link->next = dev_list;
+        dev_list = link;
+
+        client_reg.dev_info = &dev_info;
+        client_reg.Version = 0x0210; /* FIXME: what does this mean? */
+        client_reg.event_callback_args.client_data = link;
+
+        ret = pcmcia_register_client(&link->handle, &client_reg);
+        if (ret != CS_SUCCESS) {
+                cs_error(link->handle, RegisterClient, ret);
+                spectrum_cs_detach(link);
+                return NULL;
+        }
+
+        return link;
+}                               /* spectrum_cs_attach */
+
+/*
+ * This deletes a driver "instance".  The device is de-registered with
+ * Card Services.  If it has been released, all local data structures
+ * are freed.  Otherwise, the structures will be freed when the device
+ * is released.
+ */
+static void spectrum_cs_detach(dev_link_t *link)
+{
+        dev_link_t **linkp;
+        struct net_device *dev = link->priv;
+
+        /* Locate device structure */
+        for (linkp = &dev_list; *linkp; linkp = &(*linkp)->next)
+                if (*linkp == link)
+                        break;
+
+        BUG_ON(*linkp == NULL);
+
+        if (link->state & DEV_CONFIG)
+                spectrum_cs_release(link);
+
+        /* Break the link with Card Services */
+        if (link->handle)
+                pcmcia_deregister_client(link->handle);
+
+        /* Unlink device structure, and free it */
+        *linkp = link->next;
+        DEBUG(0, PFX "detach: link=%p link->dev=%p\n", link, link->dev);
+        if (link->dev) {
+                DEBUG(0, PFX "About to unregister net device %p\n",
+                      dev);
+                unregister_netdev(dev);
+        }
+        free_orinocodev(dev);
+}                               /* spectrum_cs_detach */
+
+/*
+ * spectrum_cs_config() is scheduled to run after a CARD_INSERTION
+ * event is received, to configure the PCMCIA socket, and to make the
+ * device available to the system.
+ */
+
+static void
+spectrum_cs_config(dev_link_t *link)
+{
+        struct net_device *dev = link->priv;
+        client_handle_t handle = link->handle;
+        struct orinoco_private *priv = netdev_priv(dev);
+        struct orinoco_pccard *card = priv->card;
+        hermes_t *hw = &priv->hw;
+        int last_fn, last_ret;
+        u_char buf[64];
+        config_info_t conf;
+        cisinfo_t info;
+        tuple_t tuple;
+        cisparse_t parse;
+        void __iomem *mem;
+
+        CS_CHECK(ValidateCIS, pcmcia_validate_cis(handle, &info));
+
+        /*
+         * This reads the card's CONFIG tuple to find its
+         * configuration registers.
+         */
+        tuple.DesiredTuple = CISTPL_CONFIG;
+        tuple.Attributes = 0;
+        tuple.TupleData = buf;
+        tuple.TupleDataMax = sizeof(buf);
+        tuple.TupleOffset = 0;
+        CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(handle, &tuple));
+        CS_CHECK(GetTupleData, pcmcia_get_tuple_data(handle, &tuple));
+        CS_CHECK(ParseTuple, pcmcia_parse_tuple(handle, &tuple, &parse));
+        link->conf.ConfigBase = parse.config.base;
+        link->conf.Present = parse.config.rmask[0];
+
+        /* Configure card */
+        link->state |= DEV_CONFIG;
+
+        /* Look up the current Vcc */
+        CS_CHECK(GetConfigurationInfo,
+                 pcmcia_get_configuration_info(handle, &conf));
+        link->conf.Vcc = conf.Vcc;
+
+        /*
+         * In this loop, we scan the CIS for configuration table
+         * entries, each of which describes a valid card
+         * configuration, including voltage, IO window, memory window,
+         * and interrupt settings.
+         *
+         * We make no assumptions about the card to be configured: we
+         * use just the information available in the CIS.  In an ideal
+         * world, this would work for any PCMCIA card, but it requires
+         * a complete and accurate CIS.  In practice, a driver usually
+         * "knows" most of these things without consulting the CIS,
+         * and most client drivers will only use the CIS to fill in
+         * implementation-defined details.
+         */
+        tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
+        CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(handle, &tuple));
+        while (1) {
+                cistpl_cftable_entry_t *cfg = &(parse.cftable_entry);
+                cistpl_cftable_entry_t dflt = { .index = 0 };
+
+                if ( (pcmcia_get_tuple_data(handle, &tuple) != 0)
+                    || (pcmcia_parse_tuple(handle, &tuple, &parse) != 0))
+                        goto next_entry;
+
+                if (cfg->flags & CISTPL_CFTABLE_DEFAULT)
+                        dflt = *cfg;
+                if (cfg->index == 0)
+                        goto next_entry;
+                link->conf.ConfigIndex = cfg->index;
+
+                /* Does this card need audio output? */
+                if (cfg->flags & CISTPL_CFTABLE_AUDIO) {
+                        link->conf.Attributes |= CONF_ENABLE_SPKR;
+                        link->conf.Status = CCSR_AUDIO_ENA;
+                }
+
+                /* Use power settings for Vcc and Vpp if present */
+                /* Note that the CIS values need to be rescaled */
+                if (cfg->vcc.present & (1 << CISTPL_POWER_VNOM)) {
+                        if (conf.Vcc != cfg->vcc.param[CISTPL_POWER_VNOM] / 10000) {
+                                DEBUG(2, "spectrum_cs_config: Vcc mismatch (conf.Vcc = %d, CIS = %d)\n",  conf.Vcc, cfg->vcc.param[CISTPL_POWER_VNOM] / 10000);
+                                if (!ignore_cis_vcc)
+                                        goto next_entry;
+                        }
+                } else if (dflt.vcc.present & (1 << CISTPL_POWER_VNOM)) {
+                        if (conf.Vcc != dflt.vcc.param[CISTPL_POWER_VNOM] / 10000) {
+                                DEBUG(2, "spectrum_cs_config: Vcc mismatch (conf.Vcc = %d, CIS = %d)\n",  conf.Vcc, dflt.vcc.param[CISTPL_POWER_VNOM] / 10000);
+                                if(!ignore_cis_vcc)
+                                        goto next_entry;
+                        }
+                }
+
+                if (cfg->vpp1.present & (1 << CISTPL_POWER_VNOM))
+                        link->conf.Vpp1 = link->conf.Vpp2 =
+                            cfg->vpp1.param[CISTPL_POWER_VNOM] / 10000;
+                else if (dflt.vpp1.present & (1 << CISTPL_POWER_VNOM))
+                        link->conf.Vpp1 = link->conf.Vpp2 =
+                            dflt.vpp1.param[CISTPL_POWER_VNOM] / 10000;
+                
+                /* Do we need to allocate an interrupt? */
+                link->conf.Attributes |= CONF_ENABLE_IRQ;
+
+                /* IO window settings */
+                link->io.NumPorts1 = link->io.NumPorts2 = 0;
+                if ((cfg->io.nwin > 0) || (dflt.io.nwin > 0)) {
+                        cistpl_io_t *io =
+                            (cfg->io.nwin) ? &cfg->io : &dflt.io;
+                        link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;
+                        if (!(io->flags & CISTPL_IO_8BIT))
+                                link->io.Attributes1 =
+                                    IO_DATA_PATH_WIDTH_16;
+                        if (!(io->flags & CISTPL_IO_16BIT))
+                                link->io.Attributes1 =
+                                    IO_DATA_PATH_WIDTH_8;
+                        link->io.IOAddrLines =
+                            io->flags & CISTPL_IO_LINES_MASK;
+                        link->io.BasePort1 = io->win[0].base;
+                        link->io.NumPorts1 = io->win[0].len;
+                        if (io->nwin > 1) {
+                                link->io.Attributes2 =
+                                    link->io.Attributes1;
+                                link->io.BasePort2 = io->win[1].base;
+                                link->io.NumPorts2 = io->win[1].len;
+                        }
+
+                        /* This reserves IO space but doesn't actually enable it */
+                        if (pcmcia_request_io(link->handle, &link->io) != 0)
+                                goto next_entry;
+                }
+
+
+                /* If we got this far, we're cool! */
+
+                break;
+                
+        next_entry:
+                if (link->io.NumPorts1)
+                        pcmcia_release_io(link->handle, &link->io);
+                last_ret = pcmcia_get_next_tuple(handle, &tuple);
+                if (last_ret  == CS_NO_MORE_ITEMS) {
+                        printk(KERN_ERR PFX "GetNextTuple(): No matching "
+                               "CIS configuration.  Maybe you need the "
+                               "ignore_cis_vcc=1 parameter.\n");
+                        goto cs_failed;
+                }
+        }
+
+        /*
+         * Allocate an interrupt line.  Note that this does not assign
+         * a handler to the interrupt, unless the 'Handler' member of
+         * the irq structure is initialized.
+         */
+        CS_CHECK(RequestIRQ, pcmcia_request_irq(link->handle, &link->irq));
+
+        /* We initialize the hermes structure before completing PCMCIA
+         * configuration just in case the interrupt handler gets
+         * called. */
+        mem = ioport_map(link->io.BasePort1, link->io.NumPorts1);
+        if (!mem)
+                goto cs_failed;
+
+        hermes_struct_init(hw, mem, HERMES_16BIT_REGSPACING);
+
+        /*
+         * This actually configures the PCMCIA socket -- setting up
+         * the I/O windows and the interrupt mapping, and putting the
+         * card and host interface into "Memory and IO" mode.
+         */
+        CS_CHECK(RequestConfiguration,
+                 pcmcia_request_configuration(link->handle, &link->conf));
+
+        /* Ok, we have the configuration, prepare to register the netdev */
+        dev->base_addr = link->io.BasePort1;
+        dev->irq = link->irq.AssignedIRQ;
+        SET_MODULE_OWNER(dev);
+        card->node.major = card->node.minor = 0;
+
+        /* Reset card and download firmware */
+        if (spectrum_cs_hard_reset(priv) != 0) {
+                goto failed;
+        }
+
+        SET_NETDEV_DEV(dev, &handle_to_dev(handle));
+        /* Tell the stack we exist */
+        if (register_netdev(dev) != 0) {
+                printk(KERN_ERR PFX "register_netdev() failed\n");
+                goto failed;
+        }
+
+        /* At this point, the dev_node_t structure(s) needs to be
+         * initialized and arranged in a linked list at link->dev. */
+        strcpy(card->node.dev_name, dev->name);
+        link->dev = &card->node; /* link->dev being non-NULL is also
+                                    used to indicate that the
+                                    net_device has been registered */
+        link->state &= ~DEV_CONFIG_PENDING;
+
+        /* Finally, report what we've done */
+        printk(KERN_DEBUG "%s: index 0x%02x: Vcc %d.%d",
+               dev->name, 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);
+        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");
+
+        return;
+
+ cs_failed:
+        cs_error(link->handle, last_fn, last_ret);
+
+ failed:
+        spectrum_cs_release(link);
+}                               /* spectrum_cs_config */
+
+/*
+ * After a card is removed, spectrum_cs_release() will unregister the
+ * device, and release the PCMCIA configuration.  If the device is
+ * still open, this will be postponed until it is closed.
+ */
+static void
+spectrum_cs_release(dev_link_t *link)
+{
+        struct net_device *dev = link->priv;
+        struct orinoco_private *priv = netdev_priv(dev);
+        unsigned long flags;
+
+        /* We're committed to taking the device away now, so mark the
+         * hardware as unavailable */
+        spin_lock_irqsave(&priv->lock, flags);
+        priv->hw_unavailable++;
+        spin_unlock_irqrestore(&priv->lock, flags);
+
+        /* Don't bother checking to see if these succeed or not */
+        pcmcia_release_configuration(link->handle);
+        if (link->io.NumPorts1)
+                pcmcia_release_io(link->handle, &link->io);
+        if (link->irq.AssignedIRQ)
+                pcmcia_release_irq(link->handle, &link->irq);
+        link->state &= ~DEV_CONFIG;
+        if (priv->hw.iobase)
+                ioport_unmap(priv->hw.iobase);
+}                               /* spectrum_cs_release */
+
+/*
+ * The card status event handler.  Mostly, this schedules other stuff
+ * to run after an event is received.
+ */
+static int
+spectrum_cs_event(event_t event, int priority,
+                       event_callback_args_t * args)
+{
+        dev_link_t *link = args->client_data;
+        struct net_device *dev = link->priv;
+        struct orinoco_private *priv = netdev_priv(dev);
+        int err = 0;
+        unsigned long flags;
+
+        switch (event) {
+        case CS_EVENT_CARD_REMOVAL:
+                link->state &= ~DEV_PRESENT;
+                if (link->state & DEV_CONFIG) {
+                        unsigned long flags;
+
+                        spin_lock_irqsave(&priv->lock, flags);
+                        netif_device_detach(dev);
+                        priv->hw_unavailable++;
+                        spin_unlock_irqrestore(&priv->lock, flags);
+                }
+                break;
+
+        case CS_EVENT_CARD_INSERTION:
+                link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
+                spectrum_cs_config(link);
+                break;
+
+        case CS_EVENT_PM_SUSPEND:
+                link->state |= DEV_SUSPEND;
+                /* Fall through... */
+        case CS_EVENT_RESET_PHYSICAL:
+                /* Mark the device as stopped, to block IO until later */
+                if (link->state & DEV_CONFIG) {
+                        /* This is probably racy, but I can't think of
+                           a better way, short of rewriting the PCMCIA
+                           layer to not suck :-( */
+                        spin_lock_irqsave(&priv->lock, flags);
+
+                        err = __orinoco_down(dev);
+                        if (err)
+                                printk(KERN_WARNING "%s: %s: Error %d downing interface\n",
+                                       dev->name,
+                                       event == CS_EVENT_PM_SUSPEND ? "SUSPEND" : "RESET_PHYSICAL",
+                                       err);
+
+                        netif_device_detach(dev);
+                        priv->hw_unavailable++;
+
+                        spin_unlock_irqrestore(&priv->lock, flags);
+
+                        pcmcia_release_configuration(link->handle);
+                }
+                break;
+
+        case CS_EVENT_PM_RESUME:
+                link->state &= ~DEV_SUSPEND;
+                /* Fall through... */
+        case CS_EVENT_CARD_RESET:
+                if (link->state & DEV_CONFIG) {
+                        /* FIXME: should we double check that this is
+                         * the same card as we had before */
+                        pcmcia_request_configuration(link->handle, &link->conf);
+                        netif_device_attach(dev);
+                        priv->hw_unavailable--;
+                        schedule_work(&priv->reset_work);
+                }
+                break;
+        }
+
+        return err;
+}                               /* spectrum_cs_event */
+
+/********************************************************************/
+/* Module initialization                                            */
+/********************************************************************/
+
+/* Can't be declared "const" or the whole __initdata section will
+ * become const */
+static char version[] __initdata = DRIVER_NAME " " DRIVER_VERSION
+        " (Pavel Roskin <proski@gnu.org>,"
+        " David Gibson <hermes@gibson.dropbear.id.au>, et al)";
+
+static struct pcmcia_device_id spectrum_cs_ids[] = {
+        PCMCIA_DEVICE_MANF_CARD(0x026c, 0x0001), /* Symbol Spectrum24 LA4100 */
+        PCMCIA_DEVICE_MANF_CARD(0x0104, 0x0001), /* Socket Communications CF */
+        PCMCIA_DEVICE_MANF_CARD(0x0089, 0x0001), /* Intel PRO/Wireless 2011B */
+        PCMCIA_DEVICE_NULL,
+};
+MODULE_DEVICE_TABLE(pcmcia, spectrum_cs_ids);
+
+static struct pcmcia_driver orinoco_driver = {
+        .owner          = THIS_MODULE,
+        .drv            = {
+                .name   = DRIVER_NAME,
+        },
+        .attach         = spectrum_cs_attach,
+        .event          = spectrum_cs_event,
+        .detach         = spectrum_cs_detach,
+        .id_table       = spectrum_cs_ids,
+};
+
+static int __init
+init_spectrum_cs(void)
+{
+        printk(KERN_DEBUG "%s\n", version);
+
+        return pcmcia_register_driver(&orinoco_driver);
+}
+
+static void __exit
+exit_spectrum_cs(void)
+{
+        pcmcia_unregister_driver(&orinoco_driver);
+        BUG_ON(dev_list != NULL);
+}
+
+module_init(init_spectrum_cs);
+module_exit(exit_spectrum_cs);
diff --git a/drivers/net/wireless/wl3501.h b/drivers/net/wireless/wl3501.h
index b5719437e98..7fcbe589c3f 100644
--- a/drivers/net/wireless/wl3501.h
+++ b/drivers/net/wireless/wl3501.h
@@ -609,6 +609,7 @@ struct wl3501_card {
         struct net_device_stats         stats;
         struct iw_statistics            wstats;
         struct iw_spy_data              spy_data;
+        struct iw_public_data           wireless_data;
         struct dev_node_t               node;
 };
 #endif
diff --git a/drivers/net/wireless/wl3501_cs.c b/drivers/net/wireless/wl3501_cs.c
index 7cc5edbf6ed..3f8c27f0871 100644
--- a/drivers/net/wireless/wl3501_cs.c
+++ b/drivers/net/wireless/wl3501_cs.c
@@ -1944,7 +1944,7 @@ static const iw_handler	wl3501_handler[] = {
 static const struct iw_handler_def wl3501_handler_def = {
         .num_standard   = sizeof(wl3501_handler) / sizeof(iw_handler),
         .standard       = (iw_handler *)wl3501_handler,
-        .spy_offset     = offsetof(struct wl3501_card, spy_data),
+        .get_wireless_stats = wl3501_get_wireless_stats,
 };
 
 /**
@@ -1961,6 +1961,7 @@ static dev_link_t *wl3501_attach(void)
         client_reg_t client_reg;
         dev_link_t *link;
         struct net_device *dev;
+        struct wl3501_card *this;
         int ret;
 
         /* Initialize the dev_link_t structure */
@@ -1995,7 +1996,9 @@ static dev_link_t *wl3501_attach(void)
         dev->tx_timeout         = wl3501_tx_timeout;
         dev->watchdog_timeo     = 5 * HZ;
         dev->get_stats          = wl3501_get_stats;
-        dev->get_wireless_stats = wl3501_get_wireless_stats;
+        this = dev->priv;
+        this->wireless_data.spy_data = &this->spy_data;
+        dev->wireless_data      = &this->wireless_data;
         dev->wireless_handlers  = (struct iw_handler_def *)&wl3501_handler_def;
         SET_ETHTOOL_OPS(dev, &ops);
         netif_stop_queue(dev);
diff --git a/drivers/parport/parport_pc.c b/drivers/parport/parport_pc.c
index 4598c6a9212..97f723179f6 100644
--- a/drivers/parport/parport_pc.c
+++ b/drivers/parport/parport_pc.c
@@ -2739,6 +2739,7 @@ enum parport_pc_pci_cards {
         syba_2p_epp,
         syba_1p_ecp,
         titan_010l,
+        titan_1284p1,
         titan_1284p2,
         avlab_1p,
         avlab_2p,
@@ -2811,6 +2812,7 @@ static struct parport_pc_pci {
         /* syba_2p_epp AP138B */        { 2, { { 0, 0x078 }, { 0, 0x178 }, } },
         /* syba_1p_ecp W83787 */        { 1, { { 0, 0x078 }, } },
         /* titan_010l */                { 1, { { 3, -1 }, } },
+        /* titan_1284p1 */              { 1, { { 0, 1 }, } },
         /* titan_1284p2 */              { 2, { { 0, 1 }, { 2, 3 }, } },
         /* avlab_1p             */      { 1, { { 0, 1}, } },
         /* avlab_2p             */      { 2, { { 0, 1}, { 2, 3 },} },
@@ -2884,6 +2886,7 @@ static struct pci_device_id parport_pc_pci_tbl[] = {
           PCI_ANY_ID, PCI_ANY_ID, 0, 0, syba_1p_ecp },
         { PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_010L,
           PCI_ANY_ID, PCI_ANY_ID, 0, 0, titan_010l },
+        { 0x9710, 0x9805, 0x1000, 0x0010, 0, 0, titan_1284p1 },
         { 0x9710, 0x9815, 0x1000, 0x0020, 0, 0, titan_1284p2 },
         /* PCI_VENDOR_ID_AVLAB/Intek21 has another bunch of cards ...*/
         { 0x14db, 0x2120, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1p}, /* AFAVLAB_TK9902 */
diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
index 2b85aa39f95..532f73bb222 100644
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
@@ -91,6 +91,7 @@ static void set_msi_affinity(unsigned int vector, cpumask_t cpu_mask)
 {
         struct msi_desc *entry;
         struct msg_address address;
+        unsigned int irq = vector;
 
         entry = (struct msi_desc *)msi_desc[vector];
         if (!entry || !entry->dev)
@@ -112,6 +113,7 @@ static void set_msi_affinity(unsigned int vector, cpumask_t cpu_mask)
                 entry->msi_attrib.current_cpu = cpu_mask_to_apicid(cpu_mask);
                 pci_write_config_dword(entry->dev, msi_lower_address_reg(pos),
                         address.lo_address.value);
+                set_native_irq_info(irq, cpu_mask);
                 break;
         }
         case PCI_CAP_ID_MSIX:
@@ -125,22 +127,13 @@ static void set_msi_affinity(unsigned int vector, cpumask_t cpu_mask)
                         MSI_TARGET_CPU_SHIFT);
                 entry->msi_attrib.current_cpu = cpu_mask_to_apicid(cpu_mask);
                 writel(address.lo_address.value, entry->mask_base + offset);
+                set_native_irq_info(irq, cpu_mask);
                 break;
         }
         default:
                 break;
         }
 }
-
-#ifdef CONFIG_IRQBALANCE
-static inline void move_msi(int vector)
-{
-        if (!cpus_empty(pending_irq_balance_cpumask[vector])) {
-                set_msi_affinity(vector, pending_irq_balance_cpumask[vector]);
-                cpus_clear(pending_irq_balance_cpumask[vector]);
-        }
-}
-#endif /* CONFIG_IRQBALANCE */
 #endif /* CONFIG_SMP */
 
 static void mask_MSI_irq(unsigned int vector)
@@ -191,13 +184,13 @@ static void shutdown_msi_irq(unsigned int vector)
 
 static void end_msi_irq_wo_maskbit(unsigned int vector)
 {
-        move_msi(vector);
+        move_native_irq(vector);
         ack_APIC_irq();
 }
 
 static void end_msi_irq_w_maskbit(unsigned int vector)
 {
-        move_msi(vector);
+        move_native_irq(vector);
         unmask_MSI_irq(vector);
         ack_APIC_irq();
 }
diff --git a/drivers/pci/msi.h b/drivers/pci/msi.h
index 390f1851c0f..402136a5c9e 100644
--- a/drivers/pci/msi.h
+++ b/drivers/pci/msi.h
@@ -19,7 +19,6 @@
 #define NR_HP_RESERVED_VECTORS  20
 
 extern int vector_irq[NR_VECTORS];
-extern cpumask_t pending_irq_balance_cpumask[NR_IRQS];
 extern void (*interrupt[NR_IRQS])(void);
 extern int pci_vector_resources(int last, int nr_released);
 
@@ -29,10 +28,6 @@ extern int pci_vector_resources(int last, int nr_released);
 #define set_msi_irq_affinity    NULL
 #endif
 
-#ifndef CONFIG_IRQBALANCE
-static inline void move_msi(int vector) {}
-#endif
-
 /*
  * MSI-X Address Register
  */
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 1b34fc56067..c62d2f04339 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -333,13 +333,17 @@ pci_power_t pci_choose_state(struct pci_dev *dev, pm_message_t state)
         if (platform_pci_choose_state) {
                 ret = platform_pci_choose_state(dev, state);
                 if (ret >= 0)
-                        state = ret;
+                        state.event = ret;
         }
-        switch (state) {
-        case 0: return PCI_D0;
-        case 3: return PCI_D3hot;
+
+        switch (state.event) {
+        case PM_EVENT_ON:
+                return PCI_D0;
+        case PM_EVENT_FREEZE:
+        case PM_EVENT_SUSPEND:
+                return PCI_D3hot;
         default:
-                printk("They asked me for state %d\n", state);
+                printk("They asked me for state %d\n", state.event);
                 BUG();
         }
         return PCI_D0;
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index bb36bb69803..140354a2aa7 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -422,6 +422,25 @@ static void __devinit quirk_via_ioapic(struct pci_dev *dev)
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA,      PCI_DEVICE_ID_VIA_82C686,       quirk_via_ioapic );
 
 /*
+ * VIA 8237: Some BIOSs don't set the 'Bypass APIC De-Assert Message' Bit.
+ * This leads to doubled level interrupt rates.
+ * Set this bit to get rid of cycle wastage.
+ * Otherwise uncritical.
+ */
+static void __devinit quirk_via_vt8237_bypass_apic_deassert(struct pci_dev *dev)
+{
+        u8 misc_control2;
+#define BYPASS_APIC_DEASSERT 8
+
+        pci_read_config_byte(dev, 0x5B, &misc_control2);
+        if (!(misc_control2 & BYPASS_APIC_DEASSERT)) {
+                printk(KERN_INFO "PCI: Bypassing VIA 8237 APIC De-Assert Message\n");
+                pci_write_config_byte(dev, 0x5B, misc_control2|BYPASS_APIC_DEASSERT);
+        }
+}
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA,      PCI_DEVICE_ID_VIA_8237,         quirk_via_vt8237_bypass_apic_deassert);
+
+/*
  * The AMD io apic can hang the box when an apic irq is masked.
  * We check all revs >= B0 (yet not in the pre production!) as the bug
  * is currently marked NoFix
diff --git a/drivers/pcmcia/pxa2xx_base.c b/drivers/pcmcia/pxa2xx_base.c
index 3e23cd461fb..325c992f7d8 100644
--- a/drivers/pcmcia/pxa2xx_base.c
+++ b/drivers/pcmcia/pxa2xx_base.c
@@ -246,7 +246,7 @@ static void __exit pxa2xx_pcmcia_exit(void)
         driver_unregister(&pxa2xx_pcmcia_driver);
 }
 
-module_init(pxa2xx_pcmcia_init);
+fs_initcall(pxa2xx_pcmcia_init);
 module_exit(pxa2xx_pcmcia_exit);
 
 MODULE_AUTHOR("Stefan Eletzhofer <stefan.eletzhofer@inquant.de> and Ian Molton <spyro@f2s.com>");
diff --git a/drivers/pcmcia/pxa2xx_mainstone.c b/drivers/pcmcia/pxa2xx_mainstone.c
index 5309734e168..bbe69b07ce5 100644
--- a/drivers/pcmcia/pxa2xx_mainstone.c
+++ b/drivers/pcmcia/pxa2xx_mainstone.c
@@ -196,7 +196,7 @@ static void __exit mst_pcmcia_exit(void)
         platform_device_unregister(mst_pcmcia_device);
 }
 
-module_init(mst_pcmcia_init);
+fs_initcall(mst_pcmcia_init);
 module_exit(mst_pcmcia_exit);
 
 MODULE_LICENSE("GPL");
diff --git a/drivers/pcmcia/pxa2xx_sharpsl.c b/drivers/pcmcia/pxa2xx_sharpsl.c
index 42efe218867..a1178a600e3 100644
--- a/drivers/pcmcia/pxa2xx_sharpsl.c
+++ b/drivers/pcmcia/pxa2xx_sharpsl.c
@@ -20,27 +20,18 @@
 
 #include <asm/hardware.h>
 #include <asm/irq.h>
-
 #include <asm/hardware/scoop.h>
-#include <asm/arch/corgi.h>
 #include <asm/arch/pxa-regs.h>
 
 #include "soc_common.h"
 
 #define NO_KEEP_VS 0x0001
 
-static unsigned char keep_vs;
-static unsigned char keep_rd;
-
-static struct pcmcia_irqs irqs[] = {
-        { 0, CORGI_IRQ_GPIO_CF_CD, "PCMCIA0 CD"},
-};
-
-static void sharpsl_pcmcia_init_reset(void)
+static void sharpsl_pcmcia_init_reset(struct scoop_pcmcia_dev *scoopdev)
 {
-        reset_scoop(&corgiscoop_device.dev);
-        keep_vs = NO_KEEP_VS;
-        keep_rd = 0;
+        reset_scoop(scoopdev->dev);
+        scoopdev->keep_vs = NO_KEEP_VS;
+        scoopdev->keep_rd = 0;
 }
 
 static int sharpsl_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
@@ -71,29 +62,35 @@ static int sharpsl_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
         pxa_gpio_mode(GPIO57_nIOIS16_MD);
 
         /* Register interrupts */
-        ret = soc_pcmcia_request_irqs(skt, irqs, ARRAY_SIZE(irqs));
-
-        if (ret) {
-                printk(KERN_ERR "Request for Compact Flash IRQ failed\n");
-                return ret;
+        if (scoop_devs[skt->nr].cd_irq >= 0) {
+                struct pcmcia_irqs cd_irq;
+
+                cd_irq.sock = skt->nr;
+                cd_irq.irq  = scoop_devs[skt->nr].cd_irq;
+                cd_irq.str  = scoop_devs[skt->nr].cd_irq_str;
+                ret = soc_pcmcia_request_irqs(skt, &cd_irq, 1);
+
+                if (ret) {
+                        printk(KERN_ERR "Request for Compact Flash IRQ failed\n");
+                        return ret;
+                }
         }
 
-        /* Enable interrupt */
-        write_scoop_reg(&corgiscoop_device.dev, SCOOP_IMR, 0x00C0);
-        write_scoop_reg(&corgiscoop_device.dev, SCOOP_MCR, 0x0101);
-        keep_vs = NO_KEEP_VS;
-
-        skt->irq = CORGI_IRQ_GPIO_CF_IRQ;
+        skt->irq = scoop_devs[skt->nr].irq;
 
         return 0;
 }
 
 static void sharpsl_pcmcia_hw_shutdown(struct soc_pcmcia_socket *skt)
 {
-        soc_pcmcia_free_irqs(skt, irqs, ARRAY_SIZE(irqs));
+        if (scoop_devs[skt->nr].cd_irq >= 0) {
+                struct pcmcia_irqs cd_irq;
 
-        /* CF_BUS_OFF */
-        sharpsl_pcmcia_init_reset();
+                cd_irq.sock = skt->nr;
+                cd_irq.irq  = scoop_devs[skt->nr].cd_irq;
+                cd_irq.str  = scoop_devs[skt->nr].cd_irq_str;
+                soc_pcmcia_free_irqs(skt, &cd_irq, 1);
+        }
 }
 
 
@@ -101,31 +98,32 @@ static void sharpsl_pcmcia_socket_state(struct soc_pcmcia_socket *skt,
                                     struct pcmcia_state *state)
 {
         unsigned short cpr, csr;
+        struct device *scoop = scoop_devs[skt->nr].dev;
 
-        cpr = read_scoop_reg(&corgiscoop_device.dev, SCOOP_CPR);
+        cpr = read_scoop_reg(scoop_devs[skt->nr].dev, SCOOP_CPR);
 
-        write_scoop_reg(&corgiscoop_device.dev, SCOOP_IRM, 0x00FF);
-        write_scoop_reg(&corgiscoop_device.dev, SCOOP_ISR, 0x0000);
-        write_scoop_reg(&corgiscoop_device.dev, SCOOP_IRM, 0x0000);
-        csr = read_scoop_reg(&corgiscoop_device.dev, SCOOP_CSR);
+        write_scoop_reg(scoop, SCOOP_IRM, 0x00FF);
+        write_scoop_reg(scoop, SCOOP_ISR, 0x0000);
+        write_scoop_reg(scoop, SCOOP_IRM, 0x0000);
+        csr = read_scoop_reg(scoop, SCOOP_CSR);
         if (csr & 0x0004) {
                 /* card eject */
-                write_scoop_reg(&corgiscoop_device.dev, SCOOP_CDR, 0x0000);
-                keep_vs = NO_KEEP_VS;
+                write_scoop_reg(scoop, SCOOP_CDR, 0x0000);
+                scoop_devs[skt->nr].keep_vs = NO_KEEP_VS;
         }
-        else if (!(keep_vs & NO_KEEP_VS)) {
+        else if (!(scoop_devs[skt->nr].keep_vs & NO_KEEP_VS)) {
                 /* keep vs1,vs2 */
-                write_scoop_reg(&corgiscoop_device.dev, SCOOP_CDR, 0x0000);
-                csr |= keep_vs;
+                write_scoop_reg(scoop, SCOOP_CDR, 0x0000);
+                csr |= scoop_devs[skt->nr].keep_vs;
         }
         else if (cpr & 0x0003) {
                 /* power on */
-                write_scoop_reg(&corgiscoop_device.dev, SCOOP_CDR, 0x0000);
-                keep_vs = (csr & 0x00C0);
+                write_scoop_reg(scoop, SCOOP_CDR, 0x0000);
+                scoop_devs[skt->nr].keep_vs = (csr & 0x00C0);
         }
         else {
                 /* card detect */
-                write_scoop_reg(&corgiscoop_device.dev, SCOOP_CDR, 0x0002);
+                write_scoop_reg(scoop, SCOOP_CDR, 0x0002);
         }
 
         state->detect = (csr & 0x0004) ? 0 : 1;
@@ -147,6 +145,7 @@ static int sharpsl_pcmcia_configure_socket(struct soc_pcmcia_socket *skt,
                                        const socket_state_t *state)
 {
         unsigned long flags;
+        struct device *scoop = scoop_devs[skt->nr].dev;
 
         unsigned short cpr, ncpr, ccr, nccr, mcr, nmcr, imr, nimr;
 
@@ -166,10 +165,10 @@ static int sharpsl_pcmcia_configure_socket(struct soc_pcmcia_socket *skt,
 
         local_irq_save(flags);
 
-        nmcr = (mcr = read_scoop_reg(&corgiscoop_device.dev, SCOOP_MCR)) & ~0x0010;
-        ncpr = (cpr = read_scoop_reg(&corgiscoop_device.dev, SCOOP_CPR)) & ~0x0083;
-        nccr = (ccr = read_scoop_reg(&corgiscoop_device.dev, SCOOP_CCR)) & ~0x0080;
-        nimr = (imr = read_scoop_reg(&corgiscoop_device.dev, SCOOP_IMR)) & ~0x003E;
+        nmcr = (mcr = read_scoop_reg(scoop, SCOOP_MCR)) & ~0x0010;
+        ncpr = (cpr = read_scoop_reg(scoop, SCOOP_CPR)) & ~0x0083;
+        nccr = (ccr = read_scoop_reg(scoop, SCOOP_CCR)) & ~0x0080;
+        nimr = (imr = read_scoop_reg(scoop, SCOOP_IMR)) & ~0x003E;
 
         ncpr |= (state->Vcc == 33) ? 0x0001 :
                                 (state->Vcc == 50) ? 0x0002 : 0;
@@ -184,22 +183,22 @@ static int sharpsl_pcmcia_configure_socket(struct soc_pcmcia_socket *skt,
                         ((skt->status&SS_WRPROT) ? 0x0008 : 0);
 
         if (!(ncpr & 0x0003)) {
-                keep_rd = 0;
-        } else if (!keep_rd) {
+                scoop_devs[skt->nr].keep_rd = 0;
+        } else if (!scoop_devs[skt->nr].keep_rd) {
                 if (nccr & 0x0080)
-                        keep_rd = 1;
+                        scoop_devs[skt->nr].keep_rd = 1;
                 else
                         nccr |= 0x0080;
         }
 
         if (mcr != nmcr)
-                write_scoop_reg(&corgiscoop_device.dev, SCOOP_MCR, nmcr);
+                write_scoop_reg(scoop, SCOOP_MCR, nmcr);
         if (cpr != ncpr)
-                write_scoop_reg(&corgiscoop_device.dev, SCOOP_CPR, ncpr);
+                write_scoop_reg(scoop, SCOOP_CPR, ncpr);
         if (ccr != nccr)
-                write_scoop_reg(&corgiscoop_device.dev, SCOOP_CCR, nccr);
+                write_scoop_reg(scoop, SCOOP_CCR, nccr);
         if (imr != nimr)
-                write_scoop_reg(&corgiscoop_device.dev, SCOOP_IMR, nimr);
+                write_scoop_reg(scoop, SCOOP_IMR, nimr);
 
         local_irq_restore(flags);
 
@@ -208,10 +207,18 @@ static int sharpsl_pcmcia_configure_socket(struct soc_pcmcia_socket *skt,
 
 static void sharpsl_pcmcia_socket_init(struct soc_pcmcia_socket *skt)
 {
+        sharpsl_pcmcia_init_reset(&scoop_devs[skt->nr]);
+
+        /* Enable interrupt */
+        write_scoop_reg(scoop_devs[skt->nr].dev, SCOOP_IMR, 0x00C0);
+        write_scoop_reg(scoop_devs[skt->nr].dev, SCOOP_MCR, 0x0101);
+        scoop_devs[skt->nr].keep_vs = NO_KEEP_VS;
 }
 
 static void sharpsl_pcmcia_socket_suspend(struct soc_pcmcia_socket *skt)
 {
+        /* CF_BUS_OFF */
+        sharpsl_pcmcia_init_reset(&scoop_devs[skt->nr]);
 }
 
 static struct pcmcia_low_level sharpsl_pcmcia_ops = {
@@ -223,7 +230,7 @@ static struct pcmcia_low_level sharpsl_pcmcia_ops = {
         .socket_init            = sharpsl_pcmcia_socket_init,
         .socket_suspend         = sharpsl_pcmcia_socket_suspend,
         .first                          = 0,
-        .nr                                     = 1,
+        .nr                                     = 0,
 };
 
 static struct platform_device *sharpsl_pcmcia_device;
@@ -232,12 +239,15 @@ static int __init sharpsl_pcmcia_init(void)
 {
         int ret;
 
+        sharpsl_pcmcia_ops.nr=scoop_num;
         sharpsl_pcmcia_device = kmalloc(sizeof(*sharpsl_pcmcia_device), GFP_KERNEL);
         if (!sharpsl_pcmcia_device)
                 return -ENOMEM;
+
         memset(sharpsl_pcmcia_device, 0, sizeof(*sharpsl_pcmcia_device));
         sharpsl_pcmcia_device->name = "pxa2xx-pcmcia";
         sharpsl_pcmcia_device->dev.platform_data = &sharpsl_pcmcia_ops;
+        sharpsl_pcmcia_device->dev.parent=scoop_devs[0].dev;
 
         ret = platform_device_register(sharpsl_pcmcia_device);
         if (ret)
@@ -257,7 +267,7 @@ static void __exit sharpsl_pcmcia_exit(void)
         platform_device_unregister(sharpsl_pcmcia_device);
 }
 
-module_init(sharpsl_pcmcia_init);
+fs_initcall(sharpsl_pcmcia_init);
 module_exit(sharpsl_pcmcia_exit);
 
 MODULE_DESCRIPTION("Sharp SL Series PCMCIA Support");
diff --git a/drivers/pcmcia/sa1100_generic.c b/drivers/pcmcia/sa1100_generic.c
index e98bb3d80e7..d4ed508b38b 100644
--- a/drivers/pcmcia/sa1100_generic.c
+++ b/drivers/pcmcia/sa1100_generic.c
@@ -126,5 +126,5 @@ MODULE_AUTHOR("John Dorsey <john+@cs.cmu.edu>");
 MODULE_DESCRIPTION("Linux PCMCIA Card Services: SA-11x0 Socket Controller");
 MODULE_LICENSE("Dual MPL/GPL");
 
-module_init(sa11x0_pcmcia_init);
+fs_initcall(sa11x0_pcmcia_init);
 module_exit(sa11x0_pcmcia_exit);
diff --git a/drivers/pcmcia/sa1111_generic.c b/drivers/pcmcia/sa1111_generic.c
index b441f43a6a5..bb90a1448a5 100644
--- a/drivers/pcmcia/sa1111_generic.c
+++ b/drivers/pcmcia/sa1111_generic.c
@@ -189,7 +189,7 @@ static void __exit sa1111_drv_pcmcia_exit(void)
         sa1111_driver_unregister(&pcmcia_driver);
 }
 
-module_init(sa1111_drv_pcmcia_init);
+fs_initcall(sa1111_drv_pcmcia_init);
 module_exit(sa1111_drv_pcmcia_exit);
 
 MODULE_DESCRIPTION("SA1111 PCMCIA card socket driver");
diff --git a/drivers/pcmcia/sa11xx_base.c b/drivers/pcmcia/sa11xx_base.c
index db04ffb6f68..59c5d968e9f 100644
--- a/drivers/pcmcia/sa11xx_base.c
+++ b/drivers/pcmcia/sa11xx_base.c
@@ -189,7 +189,7 @@ static int __init sa11xx_pcmcia_init(void)
 {
         return 0;
 }
-module_init(sa11xx_pcmcia_init);
+fs_initcall(sa11xx_pcmcia_init);
 
 static void __exit sa11xx_pcmcia_exit(void) {}
 
diff --git a/drivers/pcmcia/topic.h b/drivers/pcmcia/topic.h
index be420bb2911..edccfa5bb40 100644
--- a/drivers/pcmcia/topic.h
+++ b/drivers/pcmcia/topic.h
@@ -101,6 +101,8 @@
 #define  TOPIC97_AVS_AUDIO_CONTROL      0x02
 #define  TOPIC97_AVS_VIDEO_CONTROL      0x01
 
+#define TOPIC_EXCA_IF_CONTROL           0x3e    /* 8 bit */
+#define TOPIC_EXCA_IFC_33V_ENA          0x01
 
 static void topic97_zoom_video(struct pcmcia_socket *sock, int onoff)
 {
@@ -137,4 +139,19 @@ static int topic97_override(struct yenta_socket *socket)
         return 0;
 }
 
+
+static int topic95_override(struct yenta_socket *socket)
+{
+        u8 fctrl;
+
+        /* enable 3.3V support for 16bit cards */
+        fctrl = exca_readb(socket, TOPIC_EXCA_IF_CONTROL);
+        exca_writeb(socket, TOPIC_EXCA_IF_CONTROL, fctrl | TOPIC_EXCA_IFC_33V_ENA);
+
+        /* tell yenta to use exca registers to power 16bit cards */
+        socket->flags |= YENTA_16BIT_POWER_EXCA | YENTA_16BIT_POWER_DF;
+
+        return 0;
+}
+
 #endif /* _LINUX_TOPIC_H */
diff --git a/drivers/pcmcia/yenta_socket.c b/drivers/pcmcia/yenta_socket.c
index 62fd705203f..0347a29f297 100644
--- a/drivers/pcmcia/yenta_socket.c
+++ b/drivers/pcmcia/yenta_socket.c
@@ -184,22 +184,52 @@ static int yenta_get_status(struct pcmcia_socket *sock, unsigned int *value)
         return 0;
 }
 
-static int yenta_Vcc_power(u32 control)
+static void yenta_get_power(struct yenta_socket *socket, socket_state_t *state)
 {
-        switch (control & CB_SC_VCC_MASK) {
-        case CB_SC_VCC_5V: return 50;
-        case CB_SC_VCC_3V: return 33;
-        default: return 0;
-        }
-}
+        if (!(cb_readl(socket, CB_SOCKET_STATE) & CB_CBCARD) &&
+            (socket->flags & YENTA_16BIT_POWER_EXCA)) {
+                u8 reg, vcc, vpp;
+
+                reg = exca_readb(socket, I365_POWER);
+                vcc = reg & I365_VCC_MASK;
+                vpp = reg & I365_VPP1_MASK;
+                state->Vcc = state->Vpp = 0;
+
+                if (socket->flags & YENTA_16BIT_POWER_DF) {
+                        if (vcc == I365_VCC_3V)
+                                state->Vcc = 33;
+                        if (vcc == I365_VCC_5V)
+                                state->Vcc = 50;
+                        if (vpp == I365_VPP1_5V)
+                                state->Vpp = state->Vcc;
+                        if (vpp == I365_VPP1_12V)
+                                state->Vpp = 120;
+                } else {
+                        if (reg & I365_VCC_5V) {
+                                state->Vcc = 50;
+                                if (vpp == I365_VPP1_5V)
+                                        state->Vpp = 50;
+                                if (vpp == I365_VPP1_12V)
+                                        state->Vpp = 120;
+                        }
+                }
+        } else {
+                u32 control;
 
-static int yenta_Vpp_power(u32 control)
-{
-        switch (control & CB_SC_VPP_MASK) {
-        case CB_SC_VPP_12V: return 120;
-        case CB_SC_VPP_5V: return 50;
-        case CB_SC_VPP_3V: return 33;
-        default: return 0;
+                control = cb_readl(socket, CB_SOCKET_CONTROL);
+
+                switch (control & CB_SC_VCC_MASK) {
+                case CB_SC_VCC_5V: state->Vcc = 50; break;
+                case CB_SC_VCC_3V: state->Vcc = 33; break;
+                default: state->Vcc = 0;
+                }
+
+                switch (control & CB_SC_VPP_MASK) {
+                case CB_SC_VPP_12V: state->Vpp = 120; break;
+                case CB_SC_VPP_5V: state->Vpp = 50; break;
+                case CB_SC_VPP_3V: state->Vpp = 33; break;
+                default: state->Vpp = 0;
+                }
         }
 }
 
@@ -211,8 +241,7 @@ static int yenta_get_socket(struct pcmcia_socket *sock, socket_state_t *state)
 
         control = cb_readl(socket, CB_SOCKET_CONTROL);
 
-        state->Vcc = yenta_Vcc_power(control);
-        state->Vpp = yenta_Vpp_power(control);
+        yenta_get_power(socket, state);
         state->io_irq = socket->io_irq;
 
         if (cb_readl(socket, CB_SOCKET_STATE) & CB_CBCARD) {
@@ -246,19 +275,54 @@ static int yenta_get_socket(struct pcmcia_socket *sock, socket_state_t *state)
 
 static void yenta_set_power(struct yenta_socket *socket, socket_state_t *state)
 {
-        u32 reg = 0;    /* CB_SC_STPCLK? */
-        switch (state->Vcc) {
-        case 33: reg = CB_SC_VCC_3V; break;
-        case 50: reg = CB_SC_VCC_5V; break;
-        default: reg = 0; break;
-        }
-        switch (state->Vpp) {
-        case 33:  reg |= CB_SC_VPP_3V; break;
-        case 50:  reg |= CB_SC_VPP_5V; break;
-        case 120: reg |= CB_SC_VPP_12V; break;
+        /* some birdges require to use the ExCA registers to power 16bit cards */
+        if (!(cb_readl(socket, CB_SOCKET_STATE) & CB_CBCARD) &&
+            (socket->flags & YENTA_16BIT_POWER_EXCA)) {
+                u8 reg, old;
+                reg = old = exca_readb(socket, I365_POWER);
+                reg &= ~(I365_VCC_MASK | I365_VPP1_MASK | I365_VPP2_MASK);
+
+                /* i82365SL-DF style */
+                if (socket->flags & YENTA_16BIT_POWER_DF) {
+                        switch (state->Vcc) {
+                        case 33: reg |= I365_VCC_3V; break;
+                        case 50: reg |= I365_VCC_5V; break;
+                        default: reg = 0; break;
+                        }
+                        switch (state->Vpp) {
+                        case 33:
+                        case 50: reg |= I365_VPP1_5V; break;
+                        case 120: reg |= I365_VPP1_12V; break;
+                        }
+                } else {
+                        /* i82365SL-B style */
+                        switch (state->Vcc) {
+                        case 50: reg |= I365_VCC_5V; break;
+                        default: reg = 0; break;
+                        }
+                        switch (state->Vpp) {
+                        case 50: reg |= I365_VPP1_5V | I365_VPP2_5V; break;
+                        case 120: reg |= I365_VPP1_12V | I365_VPP2_12V; break;
+                        }
+                }
+
+                if (reg != old)
+                        exca_writeb(socket, I365_POWER, reg);
+        } else {
+                u32 reg = 0;    /* CB_SC_STPCLK? */
+                switch (state->Vcc) {
+                case 33: reg = CB_SC_VCC_3V; break;
+                case 50: reg = CB_SC_VCC_5V; break;
+                default: reg = 0; break;
+                }
+                switch (state->Vpp) {
+                case 33:  reg |= CB_SC_VPP_3V; break;
+                case 50:  reg |= CB_SC_VPP_5V; break;
+                case 120: reg |= CB_SC_VPP_12V; break;
+                }
+                if (reg != cb_readl(socket, CB_SOCKET_CONTROL))
+                        cb_writel(socket, CB_SOCKET_CONTROL, reg);
         }
-        if (reg != cb_readl(socket, CB_SOCKET_CONTROL))
-                cb_writel(socket, CB_SOCKET_CONTROL, reg);
 }
 
 static int yenta_set_socket(struct pcmcia_socket *sock, socket_state_t *state)
@@ -751,6 +815,7 @@ enum {
         CARDBUS_TYPE_TI12XX,
         CARDBUS_TYPE_TI1250,
         CARDBUS_TYPE_RICOH,
+        CARDBUS_TYPE_TOPIC95,
         CARDBUS_TYPE_TOPIC97,
         CARDBUS_TYPE_O2MICRO,
 };
@@ -789,6 +854,9 @@ static struct cardbus_type cardbus_type[] = {
                 .save_state     = ricoh_save_state,
                 .restore_state  = ricoh_restore_state,
         },
+        [CARDBUS_TYPE_TOPIC95]  = {
+                .override       = topic95_override,
+        },
         [CARDBUS_TYPE_TOPIC97]  = {
                 .override       = topic97_override,
         },
@@ -1196,6 +1264,7 @@ static struct pci_device_id yenta_table [] = {
         CB_ID(PCI_VENDOR_ID_RICOH, PCI_DEVICE_ID_RICOH_RL5C476, RICOH),
         CB_ID(PCI_VENDOR_ID_RICOH, PCI_DEVICE_ID_RICOH_RL5C478, RICOH),
 
+        CB_ID(PCI_VENDOR_ID_TOSHIBA, PCI_DEVICE_ID_TOSHIBA_TOPIC95, TOPIC95),
         CB_ID(PCI_VENDOR_ID_TOSHIBA, PCI_DEVICE_ID_TOSHIBA_TOPIC97, TOPIC97),
         CB_ID(PCI_VENDOR_ID_TOSHIBA, PCI_DEVICE_ID_TOSHIBA_TOPIC100, TOPIC97),
 
diff --git a/drivers/pcmcia/yenta_socket.h b/drivers/pcmcia/yenta_socket.h
index 4e637eef207..4e75e9e258c 100644
--- a/drivers/pcmcia/yenta_socket.h
+++ b/drivers/pcmcia/yenta_socket.h
@@ -95,6 +95,12 @@
  */
 #define CB_MEM_PAGE(map)        (0x40 + (map))
 
+
+/* control how 16bit cards are powered */
+#define YENTA_16BIT_POWER_EXCA  0x00000001
+#define YENTA_16BIT_POWER_DF    0x00000002
+
+
 struct yenta_socket;
 
 struct cardbus_type {
@@ -113,6 +119,8 @@ struct yenta_socket {
         struct pcmcia_socket socket;
         struct cardbus_type *type;
 
+        u32 flags;
+
         /* for PCI interrupt probing */
         unsigned int probe_status;
 
diff --git a/drivers/pnp/card.c b/drivers/pnp/card.c
index 6e5229e92fb..e95ed67d4f0 100644
--- a/drivers/pnp/card.c
+++ b/drivers/pnp/card.c
@@ -8,13 +8,6 @@
 #include <linux/config.h>
 #include <linux/module.h>
 #include <linux/slab.h>
-
-#ifdef CONFIG_PNP_DEBUG
-        #define DEBUG
-#else
-        #undef DEBUG
-#endif
-
 #include <linux/pnp.h>
 #include "base.h"
 
diff --git a/drivers/pnp/driver.c b/drivers/pnp/driver.c
index 1d037c2a82a..33da25f3213 100644
--- a/drivers/pnp/driver.c
+++ b/drivers/pnp/driver.c
@@ -11,13 +11,6 @@
 #include <linux/module.h>
 #include <linux/ctype.h>
 #include <linux/slab.h>
-
-#ifdef CONFIG_PNP_DEBUG
-        #define DEBUG
-#else
-        #undef DEBUG
-#endif
-
 #include <linux/pnp.h>
 #include "base.h"
 
diff --git a/drivers/pnp/isapnp/core.c b/drivers/pnp/isapnp/core.c
index 82c5edd5b9e..beedd86800f 100644
--- a/drivers/pnp/isapnp/core.c
+++ b/drivers/pnp/isapnp/core.c
@@ -142,17 +142,6 @@ static void isapnp_write_word(unsigned char idx, unsigned short val)
         isapnp_write_byte(idx+1, val);
 }
 
-static void *isapnp_alloc(long size)
-{
-        void *result;
-
-        result = kmalloc(size, GFP_KERNEL);
-        if (!result)
-                return NULL;
-        memset(result, 0, size);
-        return result;
-}
-
 static void isapnp_key(void)
 {
         unsigned char code = 0x6a, msb;
@@ -406,7 +395,7 @@ static void isapnp_parse_id(struct pnp_dev * dev, unsigned short vendor, unsigne
         struct pnp_id * id;
         if (!dev)
                 return;
-        id = isapnp_alloc(sizeof(struct pnp_id));
+        id = kcalloc(1, sizeof(struct pnp_id), GFP_KERNEL);
         if (!id)
                 return;
         sprintf(id->id, "%c%c%c%x%x%x%x",
@@ -430,7 +419,7 @@ static struct pnp_dev * __init isapnp_parse_device(struct pnp_card *card, int si
         struct pnp_dev *dev;
 
         isapnp_peek(tmp, size);
-        dev = isapnp_alloc(sizeof(struct pnp_dev));
+        dev = kcalloc(1, sizeof(struct pnp_dev), GFP_KERNEL);
         if (!dev)
                 return NULL;
         dev->number = number;
@@ -461,7 +450,7 @@ static void __init isapnp_parse_irq_resource(struct pnp_option *option,
         unsigned long bits;
 
         isapnp_peek(tmp, size);
-        irq = isapnp_alloc(sizeof(struct pnp_irq));
+        irq = kcalloc(1, sizeof(struct pnp_irq), GFP_KERNEL);
         if (!irq)
                 return;
         bits = (tmp[1] << 8) | tmp[0];
@@ -485,7 +474,7 @@ static void __init isapnp_parse_dma_resource(struct pnp_option *option,
         struct pnp_dma *dma;
 
         isapnp_peek(tmp, size);
-        dma = isapnp_alloc(sizeof(struct pnp_dma));
+        dma = kcalloc(1, sizeof(struct pnp_dma), GFP_KERNEL);
         if (!dma)
                 return;
         dma->map = tmp[0];
@@ -505,7 +494,7 @@ static void __init isapnp_parse_port_resource(struct pnp_option *option,
         struct pnp_port *port;
 
         isapnp_peek(tmp, size);
-        port = isapnp_alloc(sizeof(struct pnp_port));
+        port = kcalloc(1, sizeof(struct pnp_port), GFP_KERNEL);
         if (!port)
                 return;
         port->min = (tmp[2] << 8) | tmp[1];
@@ -528,7 +517,7 @@ static void __init isapnp_parse_fixed_port_resource(struct pnp_option *option,
         struct pnp_port *port;
 
         isapnp_peek(tmp, size);
-        port = isapnp_alloc(sizeof(struct pnp_port));
+        port = kcalloc(1, sizeof(struct pnp_port), GFP_KERNEL);
         if (!port)
                 return;
         port->min = port->max = (tmp[1] << 8) | tmp[0];
@@ -550,7 +539,7 @@ static void __init isapnp_parse_mem_resource(struct pnp_option *option,
         struct pnp_mem *mem;
 
         isapnp_peek(tmp, size);
-        mem = isapnp_alloc(sizeof(struct pnp_mem));
+        mem = kcalloc(1, sizeof(struct pnp_mem), GFP_KERNEL);
         if (!mem)
                 return;
         mem->min = ((tmp[2] << 8) | tmp[1]) << 8;
@@ -573,7 +562,7 @@ static void __init isapnp_parse_mem32_resource(struct pnp_option *option,
         struct pnp_mem *mem;
 
         isapnp_peek(tmp, size);
-        mem = isapnp_alloc(sizeof(struct pnp_mem));
+        mem = kcalloc(1, sizeof(struct pnp_mem), GFP_KERNEL);
         if (!mem)
                 return;
         mem->min = (tmp[4] << 24) | (tmp[3] << 16) | (tmp[2] << 8) | tmp[1];
@@ -595,7 +584,7 @@ static void __init isapnp_parse_fixed_mem32_resource(struct pnp_option *option,
         struct pnp_mem *mem;
 
         isapnp_peek(tmp, size);
-        mem = isapnp_alloc(sizeof(struct pnp_mem));
+        mem = kcalloc(1, sizeof(struct pnp_mem), GFP_KERNEL);
         if (!mem)
                 return;
         mem->min = mem->max = (tmp[4] << 24) | (tmp[3] << 16) | (tmp[2] << 8) | tmp[1];
@@ -838,7 +827,7 @@ static unsigned char __init isapnp_checksum(unsigned char *data)
 
 static void isapnp_parse_card_id(struct pnp_card * card, unsigned short vendor, unsigned short device)
 {
-        struct pnp_id * id = isapnp_alloc(sizeof(struct pnp_id));
+        struct pnp_id * id = kcalloc(1, sizeof(struct pnp_id), GFP_KERNEL);
         if (!id)
                 return;
         sprintf(id->id, "%c%c%c%x%x%x%x",
@@ -874,7 +863,7 @@ static int __init isapnp_build_device_list(void)
                         header[4], header[5], header[6], header[7], header[8]);
                 printk(KERN_DEBUG "checksum = 0x%x\n", checksum);
 #endif
-                if ((card = isapnp_alloc(sizeof(struct pnp_card))) == NULL)
+                if ((card = kcalloc(1, sizeof(struct pnp_card), GFP_KERNEL)) == NULL)
                         continue;
 
                 card->number = csn;
diff --git a/drivers/pnp/manager.c b/drivers/pnp/manager.c
index 6c510c19ad7..94442ffd4ae 100644
--- a/drivers/pnp/manager.c
+++ b/drivers/pnp/manager.c
@@ -11,13 +11,6 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
-
-#ifdef CONFIG_PNP_DEBUG
-        #define DEBUG
-#else
-        #undef DEBUG
-#endif
-
 #include <linux/pnp.h>
 #include "base.h"
 
diff --git a/drivers/pnp/pnpacpi/core.c b/drivers/pnp/pnpacpi/core.c
index 8655dd2e5b8..1a8915e7416 100644
--- a/drivers/pnp/pnpacpi/core.c
+++ b/drivers/pnp/pnpacpi/core.c
@@ -19,6 +19,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
  
+#include <linux/config.h>
 #include <linux/acpi.h>
 #include <linux/pnp.h>
 #include <acpi/acpi_bus.h>
@@ -41,14 +42,6 @@ static inline int is_exclusive_device(struct acpi_device *dev)
         return (!acpi_match_ids(dev, excluded_id_list));
 }
 
-void *pnpacpi_kmalloc(size_t size, int f)
-{
-        void *p = kmalloc(size, f);
-        if (p)
-                memset(p, 0, size);
-        return p;
-}
-
 /*
  * Compatible Device IDs
  */
@@ -143,7 +136,7 @@ static int __init pnpacpi_add_device(struct acpi_device *device)
                 return 0;
 
         pnp_dbg("ACPI device : hid %s", acpi_device_hid(device));
-        dev =  pnpacpi_kmalloc(sizeof(struct pnp_dev), GFP_KERNEL);
+        dev =  kcalloc(1, sizeof(struct pnp_dev), GFP_KERNEL);
         if (!dev) {
                 pnp_err("Out of memory");
                 return -ENOMEM;
@@ -173,7 +166,7 @@ static int __init pnpacpi_add_device(struct acpi_device *device)
         dev->number = num;
         
         /* set the initial values for the PnP device */
-        dev_id = pnpacpi_kmalloc(sizeof(struct pnp_id), GFP_KERNEL);
+        dev_id = kcalloc(1, sizeof(struct pnp_id), GFP_KERNEL);
         if (!dev_id)
                 goto err;
         pnpidacpi_to_pnpid(acpi_device_hid(device), dev_id->id);
@@ -205,8 +198,7 @@ static int __init pnpacpi_add_device(struct acpi_device *device)
                 for (i = 0; i < cid_list->count; i++) {
                         if (!ispnpidacpi(cid_list->id[i].value))
                                 continue;
-                        dev_id = pnpacpi_kmalloc(sizeof(struct pnp_id), 
-                                GFP_KERNEL);
+                        dev_id = kcalloc(1, sizeof(struct pnp_id), GFP_KERNEL);
                         if (!dev_id)
                                 continue;
 
diff --git a/drivers/pnp/pnpacpi/pnpacpi.h b/drivers/pnp/pnpacpi/pnpacpi.h
index 76f907e09ee..f28e2ed66fa 100644
--- a/drivers/pnp/pnpacpi/pnpacpi.h
+++ b/drivers/pnp/pnpacpi/pnpacpi.h
@@ -5,7 +5,6 @@
 #include <linux/acpi.h>
 #include <linux/pnp.h>
 
-void *pnpacpi_kmalloc(size_t size, int f);
 acpi_status pnpacpi_parse_allocated_resource(acpi_handle, struct pnp_resource_table*);
 acpi_status pnpacpi_parse_resource_option_data(acpi_handle, struct pnp_dev*);
 int pnpacpi_encode_resources(struct pnp_resource_table *, struct acpi_buffer *);
diff --git a/drivers/pnp/pnpacpi/rsparser.c b/drivers/pnp/pnpacpi/rsparser.c
index 6db549c9480..416d30debe6 100644
--- a/drivers/pnp/pnpacpi/rsparser.c
+++ b/drivers/pnp/pnpacpi/rsparser.c
@@ -255,7 +255,7 @@ static void pnpacpi_parse_dma_option(struct pnp_option *option, struct acpi_reso
 
         if (p->number_of_channels == 0)
                 return;
-        dma = pnpacpi_kmalloc(sizeof(struct pnp_dma), GFP_KERNEL);
+        dma = kcalloc(1, sizeof(struct pnp_dma), GFP_KERNEL);
         if (!dma)
                 return;
 
@@ -311,7 +311,7 @@ static void pnpacpi_parse_irq_option(struct pnp_option *option,
         
         if (p->number_of_interrupts == 0)
                 return;
-        irq = pnpacpi_kmalloc(sizeof(struct pnp_irq), GFP_KERNEL);
+        irq = kcalloc(1, sizeof(struct pnp_irq), GFP_KERNEL);
         if (!irq)
                 return;
 
@@ -332,7 +332,7 @@ static void pnpacpi_parse_ext_irq_option(struct pnp_option *option,
 
         if (p->number_of_interrupts == 0)
                 return;
-        irq = pnpacpi_kmalloc(sizeof(struct pnp_irq), GFP_KERNEL);
+        irq = kcalloc(1, sizeof(struct pnp_irq), GFP_KERNEL);
         if (!irq)
                 return;
 
@@ -353,7 +353,7 @@ pnpacpi_parse_port_option(struct pnp_option *option,
 
         if (io->range_length == 0)
                 return;
-        port = pnpacpi_kmalloc(sizeof(struct pnp_port), GFP_KERNEL);
+        port = kcalloc(1, sizeof(struct pnp_port), GFP_KERNEL);
         if (!port)
                 return;
         port->min = io->min_base_address;
@@ -374,7 +374,7 @@ pnpacpi_parse_fixed_port_option(struct pnp_option *option,
 
         if (io->range_length == 0)
                 return;
-        port = pnpacpi_kmalloc(sizeof(struct pnp_port), GFP_KERNEL);
+        port = kcalloc(1, sizeof(struct pnp_port), GFP_KERNEL);
         if (!port)
                 return;
         port->min = port->max = io->base_address;
@@ -393,7 +393,7 @@ pnpacpi_parse_mem24_option(struct pnp_option *option,
 
         if (p->range_length == 0)
                 return;
-        mem = pnpacpi_kmalloc(sizeof(struct pnp_mem), GFP_KERNEL);
+        mem = kcalloc(1, sizeof(struct pnp_mem), GFP_KERNEL);
         if (!mem)
                 return;
         mem->min = p->min_base_address;
@@ -416,7 +416,7 @@ pnpacpi_parse_mem32_option(struct pnp_option *option,
 
         if (p->range_length == 0)
                 return;
-        mem = pnpacpi_kmalloc(sizeof(struct pnp_mem), GFP_KERNEL);
+        mem = kcalloc(1, sizeof(struct pnp_mem), GFP_KERNEL);
         if (!mem)
                 return;
         mem->min = p->min_base_address;
@@ -439,7 +439,7 @@ pnpacpi_parse_fixed_mem32_option(struct pnp_option *option,
 
         if (p->range_length == 0)
                 return;
-        mem = pnpacpi_kmalloc(sizeof(struct pnp_mem), GFP_KERNEL);
+        mem = kcalloc(1, sizeof(struct pnp_mem), GFP_KERNEL);
         if (!mem)
                 return;
         mem->min = mem->max = p->range_base_address;
@@ -623,7 +623,7 @@ int pnpacpi_build_resource_template(acpi_handle handle,
         if (!res_cnt)
                 return -EINVAL;
         buffer->length = sizeof(struct acpi_resource) * (res_cnt + 1) + 1;
-        buffer->pointer = pnpacpi_kmalloc(buffer->length - 1, GFP_KERNEL);
+        buffer->pointer = kcalloc(1, buffer->length - 1, GFP_KERNEL);
         if (!buffer->pointer)
                 return -ENOMEM;
         pnp_dbg("Res cnt %d", res_cnt);
diff --git a/drivers/pnp/pnpbios/core.c b/drivers/pnp/pnpbios/core.c
index 778a324028f..f49674f0794 100644
--- a/drivers/pnp/pnpbios/core.c
+++ b/drivers/pnp/pnpbios/core.c
@@ -86,16 +86,6 @@ int pnp_bios_present(void)
 
 struct pnp_dev_node_info node_info;
 
-void *pnpbios_kmalloc(size_t size, int f)
-{
-        void *p = kmalloc( size, f );
-        if ( p == NULL )
-                printk(KERN_ERR "PnPBIOS: kmalloc() failed\n");
-        else
-                memset(p, 0, size);
-        return p;
-}
-
 /*
  *
  * DOCKING FUNCTIONS
@@ -121,10 +111,10 @@ static int pnp_dock_event(int dock, struct pnp_docking_station_info *info)
         if (!current->fs->root) {
                 return -EAGAIN;
         }
-        if (!(envp = (char **) pnpbios_kmalloc (20 * sizeof (char *), GFP_KERNEL))) {
+        if (!(envp = (char **) kcalloc (20, sizeof (char *), GFP_KERNEL))) {
                 return -ENOMEM;
         }
-        if (!(buf = pnpbios_kmalloc (256, GFP_KERNEL))) {
+        if (!(buf = kcalloc (1, 256, GFP_KERNEL))) {
                 kfree (envp);
                 return -ENOMEM;
         }
@@ -231,7 +221,7 @@ static int pnpbios_get_resources(struct pnp_dev * dev, struct pnp_resource_table
         if(!pnpbios_is_dynamic(dev))
                 return -EPERM;
 
-        node = pnpbios_kmalloc(node_info.max_node_size, GFP_KERNEL);
+        node = kcalloc(1, node_info.max_node_size, GFP_KERNEL);
         if (!node)
                 return -1;
         if (pnp_bios_get_dev_node(&nodenum, (char )PNPMODE_DYNAMIC, node)) {
@@ -254,7 +244,7 @@ static int pnpbios_set_resources(struct pnp_dev * dev, struct pnp_resource_table
         if (!pnpbios_is_dynamic(dev))
                 return -EPERM;
 
-        node = pnpbios_kmalloc(node_info.max_node_size, GFP_KERNEL);
+        node = kcalloc(1, node_info.max_node_size, GFP_KERNEL);
         if (!node)
                 return -1;
         if (pnp_bios_get_dev_node(&nodenum, (char )PNPMODE_DYNAMIC, node)) {
@@ -305,7 +295,7 @@ static int pnpbios_disable_resources(struct pnp_dev *dev)
         if(dev->flags & PNPBIOS_NO_DISABLE || !pnpbios_is_dynamic(dev))
                 return -EPERM;
 
-        node = pnpbios_kmalloc(node_info.max_node_size, GFP_KERNEL);
+        node = kcalloc(1, node_info.max_node_size, GFP_KERNEL);
         if (!node)
                 return -ENOMEM;
 
@@ -347,7 +337,7 @@ static int insert_device(struct pnp_dev *dev, struct pnp_bios_node * node)
         }
 
         /* set the initial values for the PnP device */
-        dev_id = pnpbios_kmalloc(sizeof(struct pnp_id), GFP_KERNEL);
+        dev_id = kcalloc(1, sizeof(struct pnp_id), GFP_KERNEL);
         if (!dev_id)
                 return -1;
         pnpid32_to_pnpid(node->eisa_id,id);
@@ -385,7 +375,7 @@ static void __init build_devlist(void)
         struct pnp_bios_node *node;
         struct pnp_dev *dev;
 
-        node = pnpbios_kmalloc(node_info.max_node_size, GFP_KERNEL);
+        node = kcalloc(1, node_info.max_node_size, GFP_KERNEL);
         if (!node)
                 return;
 
@@ -402,7 +392,7 @@ static void __init build_devlist(void)
                                 break;
                 }
                 nodes_got++;
-                dev =  pnpbios_kmalloc(sizeof (struct pnp_dev), GFP_KERNEL);
+                dev =  kcalloc(1, sizeof (struct pnp_dev), GFP_KERNEL);
                 if (!dev)
                         break;
                 if(insert_device(dev,node)<0)
diff --git a/drivers/pnp/pnpbios/pnpbios.h b/drivers/pnp/pnpbios/pnpbios.h
index 01896e705ed..d8cb2fd1f12 100644
--- a/drivers/pnp/pnpbios/pnpbios.h
+++ b/drivers/pnp/pnpbios/pnpbios.h
@@ -26,7 +26,6 @@ union pnp_bios_install_struct {
 
 extern int pnp_bios_present(void);
 extern int  pnpbios_dont_use_current_config;
-extern void *pnpbios_kmalloc(size_t size, int f);
 
 extern int pnpbios_parse_data_stream(struct pnp_dev *dev, struct pnp_bios_node * node);
 extern int pnpbios_read_resources_from_node(struct pnp_resource_table *res, struct pnp_bios_node * node);
diff --git a/drivers/pnp/pnpbios/proc.c b/drivers/pnp/pnpbios/proc.c
index 6bb8e1973fd..5a3dfc97f5e 100644
--- a/drivers/pnp/pnpbios/proc.c
+++ b/drivers/pnp/pnpbios/proc.c
@@ -87,7 +87,7 @@ static int proc_read_escd(char *buf, char **start, off_t pos,
                 return -EFBIG;
         }
 
-        tmpbuf = pnpbios_kmalloc(escd.escd_size, GFP_KERNEL);
+        tmpbuf = kcalloc(1, escd.escd_size, GFP_KERNEL);
         if (!tmpbuf) return -ENOMEM;
 
         if (pnp_bios_read_escd(tmpbuf, escd.nv_storage_base)) {
@@ -133,7 +133,7 @@ static int proc_read_devices(char *buf, char **start, off_t pos,
         if (pos >= 0xff)
                 return 0;
 
-        node = pnpbios_kmalloc(node_info.max_node_size, GFP_KERNEL);
+        node = kcalloc(1, node_info.max_node_size, GFP_KERNEL);
         if (!node) return -ENOMEM;
 
         for (nodenum=pos; nodenum<0xff; ) {
@@ -168,7 +168,7 @@ static int proc_read_node(char *buf, char **start, off_t pos,
         u8 nodenum = (long)data;
         int len;
 
-        node = pnpbios_kmalloc(node_info.max_node_size, GFP_KERNEL);
+        node = kcalloc(1, node_info.max_node_size, GFP_KERNEL);
         if (!node) return -ENOMEM;
         if (pnp_bios_get_dev_node(&nodenum, boot, node)) {
                 kfree(node);
@@ -188,7 +188,7 @@ static int proc_write_node(struct file *file, const char __user *buf,
         u8 nodenum = (long)data;
         int ret = count;
 
-        node = pnpbios_kmalloc(node_info.max_node_size, GFP_KERNEL);
+        node = kcalloc(1, node_info.max_node_size, GFP_KERNEL);
         if (!node)
                 return -ENOMEM;
         if (pnp_bios_get_dev_node(&nodenum, boot, node)) {
diff --git a/drivers/pnp/pnpbios/rsparser.c b/drivers/pnp/pnpbios/rsparser.c
index e305bb132c2..b0ca65b6864 100644
--- a/drivers/pnp/pnpbios/rsparser.c
+++ b/drivers/pnp/pnpbios/rsparser.c
@@ -247,7 +247,7 @@ static void
 pnpbios_parse_mem_option(unsigned char *p, int size, struct pnp_option *option)
 {
         struct pnp_mem * mem;
-        mem = pnpbios_kmalloc(sizeof(struct pnp_mem), GFP_KERNEL);
+        mem = kcalloc(1, sizeof(struct pnp_mem), GFP_KERNEL);
         if (!mem)
                 return;
         mem->min = ((p[5] << 8) | p[4]) << 8;
@@ -263,7 +263,7 @@ static void
 pnpbios_parse_mem32_option(unsigned char *p, int size, struct pnp_option *option)
 {
         struct pnp_mem * mem;
-        mem = pnpbios_kmalloc(sizeof(struct pnp_mem), GFP_KERNEL);
+        mem = kcalloc(1, sizeof(struct pnp_mem), GFP_KERNEL);
         if (!mem)
                 return;
         mem->min = (p[7] << 24) | (p[6] << 16) | (p[5] << 8) | p[4];
@@ -279,7 +279,7 @@ static void
 pnpbios_parse_fixed_mem32_option(unsigned char *p, int size, struct pnp_option *option)
 {
         struct pnp_mem * mem;
-        mem = pnpbios_kmalloc(sizeof(struct pnp_mem), GFP_KERNEL);
+        mem = kcalloc(1, sizeof(struct pnp_mem), GFP_KERNEL);
         if (!mem)
                 return;
         mem->min = mem->max = (p[7] << 24) | (p[6] << 16) | (p[5] << 8) | p[4];
@@ -296,7 +296,7 @@ pnpbios_parse_irq_option(unsigned char *p, int size, struct pnp_option *option)
         struct pnp_irq * irq;
         unsigned long bits;
 
-        irq = pnpbios_kmalloc(sizeof(struct pnp_irq), GFP_KERNEL);
+        irq = kcalloc(1, sizeof(struct pnp_irq), GFP_KERNEL);
         if (!irq)
                 return;
         bits = (p[2] << 8) | p[1];
@@ -313,7 +313,7 @@ static void
 pnpbios_parse_dma_option(unsigned char *p, int size, struct pnp_option *option)
 {
         struct pnp_dma * dma;
-        dma = pnpbios_kmalloc(sizeof(struct pnp_dma), GFP_KERNEL);
+        dma = kcalloc(1, sizeof(struct pnp_dma), GFP_KERNEL);
         if (!dma)
                 return;
         dma->map = p[1];
@@ -326,7 +326,7 @@ static void
 pnpbios_parse_port_option(unsigned char *p, int size, struct pnp_option *option)
 {
         struct pnp_port * port;
-        port = pnpbios_kmalloc(sizeof(struct pnp_port), GFP_KERNEL);
+        port = kcalloc(1, sizeof(struct pnp_port), GFP_KERNEL);
         if (!port)
                 return;
         port->min = (p[3] << 8) | p[2];
@@ -342,7 +342,7 @@ static void
 pnpbios_parse_fixed_port_option(unsigned char *p, int size, struct pnp_option *option)
 {
         struct pnp_port * port;
-        port = pnpbios_kmalloc(sizeof(struct pnp_port), GFP_KERNEL);
+        port = kcalloc(1, sizeof(struct pnp_port), GFP_KERNEL);
         if (!port)
                 return;
         port->min = port->max = (p[2] << 8) | p[1];
@@ -530,7 +530,7 @@ pnpbios_parse_compatible_ids(unsigned char *p, unsigned char *end, struct pnp_de
                 case SMALL_TAG_COMPATDEVID: /* compatible ID */
                         if (len != 4)
                                 goto len_err;
-                        dev_id =  pnpbios_kmalloc(sizeof (struct pnp_id), GFP_KERNEL);
+                        dev_id =  kcalloc(1, sizeof (struct pnp_id), GFP_KERNEL);
                         if (!dev_id)
                                 return NULL;
                         memset(dev_id, 0, sizeof(struct pnp_id));
diff --git a/drivers/pnp/quirks.c b/drivers/pnp/quirks.c
index 596a02d7e03..8936b0cb2ec 100644
--- a/drivers/pnp/quirks.c
+++ b/drivers/pnp/quirks.c
@@ -16,13 +16,6 @@
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/slab.h>
-
-#ifdef CONFIG_PNP_DEBUG
-        #define DEBUG
-#else
-        #undef DEBUG
-#endif
-
 #include <linux/pnp.h>
 #include "base.h"
 
diff --git a/drivers/pnp/support.c b/drivers/pnp/support.c
index b952aec4918..61fe998944b 100644
--- a/drivers/pnp/support.c
+++ b/drivers/pnp/support.c
@@ -8,13 +8,6 @@
 #include <linux/config.h>
 #include <linux/module.h>
 #include <linux/ctype.h>
-
-#ifdef CONFIG_PNP_DEBUG
-        #define DEBUG
-#else
-        #undef DEBUG
-#endif
-
 #include <linux/pnp.h>
 #include "base.h"
 
diff --git a/drivers/s390/block/Kconfig b/drivers/s390/block/Kconfig
index dc1c89dbdb8..6e7d7b06421 100644
--- a/drivers/s390/block/Kconfig
+++ b/drivers/s390/block/Kconfig
@@ -49,7 +49,7 @@ config DASD_FBA
 
 config DASD_DIAG
         tristate "Support for DIAG access to Disks"
-        depends on DASD && ARCH_S390X = 'n'
+        depends on DASD && ( ARCH_S390X = 'n' || EXPERIMENTAL)
         help
           Select this option if you want to use Diagnose250 command to access
           Disks under VM.  If you are not running under VM or unsure what it is,
diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c
index d5f53980749..8fc891a9d47 100644
--- a/drivers/s390/block/dasd.c
+++ b/drivers/s390/block/dasd.c
@@ -7,7 +7,7 @@
  * Bugreports.to..: <Linux390@de.ibm.com>
  * (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 1999-2001
  *
- * $Revision: 1.165 $
+ * $Revision: 1.167 $
  */
 
 #include <linux/config.h>
@@ -1131,17 +1131,13 @@ __dasd_process_blk_queue(struct dasd_device * device)
         request_queue_t *queue;
         struct request *req;
         struct dasd_ccw_req *cqr;
-        int nr_queued, feature_ro;
+        int nr_queued;
 
         queue = device->request_queue;
         /* No queue ? Then there is nothing to do. */
         if (queue == NULL)
                 return;
 
-        feature_ro = dasd_get_feature(device->cdev, DASD_FEATURE_READONLY);
-        if (feature_ro < 0)     /* no devmap */
-                return;
-
         /*
          * We requeue request from the block device queue to the ccw
          * queue only in two states. In state DASD_STATE_READY the
@@ -1162,7 +1158,8 @@ __dasd_process_blk_queue(struct dasd_device * device)
                 nr_queued < DASD_CHANQ_MAX_SIZE) {
                 req = elv_next_request(queue);
 
-                if (feature_ro && rq_data_dir(req) == WRITE) {
+                if (device->features & DASD_FEATURE_READONLY &&
+                    rq_data_dir(req) == WRITE) {
                         DBF_DEV_EVENT(DBF_ERR, device,
                                       "Rejecting write request %p",
                                       req);
@@ -1814,17 +1811,13 @@ dasd_generic_set_online (struct ccw_device *cdev,
 
 {
         struct dasd_device *device;
-        int feature_diag, rc;
+        int rc;
 
         device = dasd_create_device(cdev);
         if (IS_ERR(device))
                 return PTR_ERR(device);
 
-        feature_diag = dasd_get_feature(cdev, DASD_FEATURE_USEDIAG);
-        if (feature_diag < 0)
-                return feature_diag;
-
-        if (feature_diag) {
+        if (device->features & DASD_FEATURE_USEDIAG) {
                 if (!dasd_diag_discipline_pointer) {
                         printk (KERN_WARNING
                                 "dasd_generic couldn't online device %s "
diff --git a/drivers/s390/block/dasd_devmap.c b/drivers/s390/block/dasd_devmap.c
index d948566bb24..bda896d9d78 100644
--- a/drivers/s390/block/dasd_devmap.c
+++ b/drivers/s390/block/dasd_devmap.c
@@ -11,7 +11,7 @@
  * functions may not be called from interrupt context. In particular
  * dasd_get_device is a no-no from interrupt context.
  *
- * $Revision: 1.40 $
+ * $Revision: 1.43 $
  */
 
 #include <linux/config.h>
@@ -513,6 +513,7 @@ dasd_create_device(struct ccw_device *cdev)
         if (!devmap->device) {
                 devmap->device = device;
                 device->devindex = devmap->devindex;
+                device->features = devmap->features;
                 get_device(&cdev->dev);
                 device->cdev = cdev;
                 rc = 0;
@@ -643,6 +644,8 @@ dasd_ro_store(struct device *dev, struct device_attribute *attr, const char *buf
                 devmap->features |= DASD_FEATURE_READONLY;
         else
                 devmap->features &= ~DASD_FEATURE_READONLY;
+        if (devmap->device)
+                devmap->device->features = devmap->features;
         if (devmap->device && devmap->device->gdp)
                 set_disk_ro(devmap->device->gdp, ro_flag);
         spin_unlock(&dasd_devmap_lock);
@@ -758,7 +761,8 @@ dasd_set_feature(struct ccw_device *cdev, int feature, int flag)
                 devmap->features |= feature;
         else
                 devmap->features &= ~feature;
-
+        if (devmap->device)
+                devmap->device->features = devmap->features;
         spin_unlock(&dasd_devmap_lock);
         return 0;
 }
diff --git a/drivers/s390/block/dasd_diag.c b/drivers/s390/block/dasd_diag.c
index 127699830fa..7478423b53b 100644
--- a/drivers/s390/block/dasd_diag.c
+++ b/drivers/s390/block/dasd_diag.c
@@ -6,17 +6,18 @@
  * Bugreports.to..: <Linux390@de.ibm.com>
  * (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 1999,2000
  *
- * $Revision: 1.42 $
+ * $Revision: 1.49 $
  */
 
 #include <linux/config.h>
 #include <linux/stddef.h>
 #include <linux/kernel.h>
 #include <linux/slab.h>
-#include <linux/hdreg.h>        /* HDIO_GETGEO                      */
+#include <linux/hdreg.h>
 #include <linux/bio.h>
 #include <linux/module.h>
 #include <linux/init.h>
+#include <linux/jiffies.h>
 
 #include <asm/dasd.h>
 #include <asm/debug.h>
@@ -28,58 +29,89 @@
 #include "dasd_int.h"
 #include "dasd_diag.h"
 
-#ifdef PRINTK_HEADER
-#undef PRINTK_HEADER
-#endif                          /* PRINTK_HEADER */
 #define PRINTK_HEADER "dasd(diag):"
 
 MODULE_LICENSE("GPL");
 
+/* The maximum number of blocks per request (max_blocks) is dependent on the
+ * amount of storage that is available in the static I/O buffer for each
+ * device. Currently each device gets 2 pages. We want to fit two requests
+ * into the available memory so that we can immediately start the next if one
+ * finishes. */
+#define DIAG_MAX_BLOCKS (((2 * PAGE_SIZE - sizeof(struct dasd_ccw_req) - \
+                           sizeof(struct dasd_diag_req)) / \
+                           sizeof(struct dasd_diag_bio)) / 2)
+#define DIAG_MAX_RETRIES        32
+#define DIAG_TIMEOUT            50 * HZ
+
 struct dasd_discipline dasd_diag_discipline;
 
 struct dasd_diag_private {
         struct dasd_diag_characteristics rdc_data;
         struct dasd_diag_rw_io iob;
         struct dasd_diag_init_io iib;
-        unsigned int pt_block;
+        blocknum_t pt_block;
 };
 
 struct dasd_diag_req {
-        int block_count;
+        unsigned int block_count;
         struct dasd_diag_bio bio[0];
 };
 
+static const u8 DASD_DIAG_CMS1[] = { 0xc3, 0xd4, 0xe2, 0xf1 };/* EBCDIC CMS1 */
+
+/* Perform DIAG250 call with block I/O parameter list iob (input and output)
+ * and function code cmd.
+ * In case of an exception return 3. Otherwise return result of bitwise OR of
+ * resulting condition code and DIAG return code. */
 static __inline__ int
 dia250(void *iob, int cmd)
 {
+        typedef struct {
+                char _[max(sizeof (struct dasd_diag_init_io),
+                           sizeof (struct dasd_diag_rw_io))];
+        } addr_type;
         int rc;
 
-        __asm__ __volatile__("    lhi   %0,3\n"
-                             "    lr    0,%2\n"
-                             "    diag  0,%1,0x250\n"
-                             "0:  ipm   %0\n"
-                             "    srl   %0,28\n"
-                             "    or    %0,1\n"
-                             "1:\n"
-#ifndef CONFIG_ARCH_S390X
-                             ".section __ex_table,\"a\"\n"
-                             "    .align 4\n"
-                             "    .long 0b,1b\n"
-                             ".previous\n"
+        __asm__ __volatile__(
+#ifdef CONFIG_ARCH_S390X
+                "       lghi    %0,3\n"
+                "       lgr     0,%3\n"
+                "       diag    0,%2,0x250\n"
+                "0:     ipm     %0\n"
+                "       srl     %0,28\n"
+                "       or      %0,1\n"
+                "1:\n"
+                ".section __ex_table,\"a\"\n"
+                "       .align 8\n"
+                "       .quad  0b,1b\n"
+                ".previous\n"
 #else
-                             ".section __ex_table,\"a\"\n"
-                             "    .align 8\n"
-                             "    .quad  0b,1b\n"
-                             ".previous\n"
+                "       lhi     %0,3\n"
+                "       lr      0,%3\n"
+                "       diag    0,%2,0x250\n"
+                "0:     ipm     %0\n"
+                "       srl     %0,28\n"
+                "       or      %0,1\n"
+                "1:\n"
+                ".section __ex_table,\"a\"\n"
+                "       .align 4\n"
+                "       .long 0b,1b\n"
+                ".previous\n"
 #endif
-                             : "=&d" (rc)
-                             : "d" (cmd), "d" ((void *) __pa(iob))
-                             : "0", "1", "cc");
+                : "=&d" (rc), "=m" (*(addr_type *) iob)
+                : "d" (cmd), "d" (iob), "m" (*(addr_type *) iob)
+                : "0", "1", "cc");
         return rc;
 }
 
+/* Initialize block I/O to DIAG device using the specified blocksize and
+ * block offset. On success, return zero and set end_block to contain the
+ * number of blocks on the device minus the specified offset. Return non-zero
+ * otherwise. */
 static __inline__ int
-mdsk_init_io(struct dasd_device * device, int blocksize, int offset, int size)
+mdsk_init_io(struct dasd_device *device, unsigned int blocksize,
+             blocknum_t offset, blocknum_t *end_block)
 {
         struct dasd_diag_private *private;
         struct dasd_diag_init_io *iib;
@@ -92,14 +124,18 @@ mdsk_init_io(struct dasd_device * device, int blocksize, int offset, int size)
         iib->dev_nr = _ccw_device_get_device_number(device->cdev);
         iib->block_size = blocksize;
         iib->offset = offset;
-        iib->start_block = 0;
-        iib->end_block = size;
+        iib->flaga = DASD_DIAG_FLAGA_DEFAULT;
 
         rc = dia250(iib, INIT_BIO);
 
-        return rc & 3;
+        if ((rc & 3) == 0 && end_block)
+                *end_block = iib->end_block;
+
+        return rc;
 }
 
+/* Remove block I/O environment for device. Return zero on success, non-zero
+ * otherwise. */
 static __inline__ int
 mdsk_term_io(struct dasd_device * device)
 {
@@ -112,9 +148,25 @@ mdsk_term_io(struct dasd_device * device)
         memset(iib, 0, sizeof (struct dasd_diag_init_io));
         iib->dev_nr = _ccw_device_get_device_number(device->cdev);
         rc = dia250(iib, TERM_BIO);
-        return rc & 3;
+        return rc;
+}
+
+/* Error recovery for failed DIAG requests - try to reestablish the DIAG
+ * environment. */
+static void
+dasd_diag_erp(struct dasd_device *device)
+{
+        int rc;
+
+        mdsk_term_io(device);
+        rc = mdsk_init_io(device, device->bp_block, 0, NULL);
+        if (rc)
+                DEV_MESSAGE(KERN_WARNING, device, "DIAG ERP unsuccessful, "
+                            "rc=%d", rc);
 }
 
+/* Start a given request at the device. Return zero on success, non-zero
+ * otherwise. */
 static int
 dasd_start_diag(struct dasd_ccw_req * cqr)
 {
@@ -124,32 +176,66 @@ dasd_start_diag(struct dasd_ccw_req * cqr)
         int rc;
 
         device = cqr->device;
+        if (cqr->retries < 0) {
+                DEV_MESSAGE(KERN_WARNING, device, "DIAG start_IO: request %p "
+                            "- no retry left)", cqr);
+                cqr->status = DASD_CQR_FAILED;
+                return -EIO;
+        }
         private = (struct dasd_diag_private *) device->private;
         dreq = (struct dasd_diag_req *) cqr->data;
 
         private->iob.dev_nr = _ccw_device_get_device_number(device->cdev);
         private->iob.key = 0;
-        private->iob.flags = 2; /* do asynchronous io */
+        private->iob.flags = DASD_DIAG_RWFLAG_ASYNC;
         private->iob.block_count = dreq->block_count;
-        private->iob.interrupt_params = (u32)(addr_t) cqr;
+        private->iob.interrupt_params = (addr_t) cqr;
         private->iob.bio_list = __pa(dreq->bio);
+        private->iob.flaga = DASD_DIAG_FLAGA_DEFAULT;
 
         cqr->startclk = get_clock();
+        cqr->starttime = jiffies;
+        cqr->retries--;
 
         rc = dia250(&private->iob, RW_BIO);
-        if (rc > 8) {
-                DEV_MESSAGE(KERN_WARNING, device, "dia250 returned CC %d", rc);
-                cqr->status = DASD_CQR_ERROR;
-        } else if (rc == 0) {
+        switch (rc) {
+        case 0: /* Synchronous I/O finished successfully */
+                cqr->stopclk = get_clock();
                 cqr->status = DASD_CQR_DONE;
-                dasd_schedule_bh(device);
-        } else {
+                /* Indicate to calling function that only a dasd_schedule_bh()
+                   and no timer is needed */
+                rc = -EACCES;
+                break;
+        case 8: /* Asynchronous I/O was started */
                 cqr->status = DASD_CQR_IN_IO;
                 rc = 0;
+                break;
+        default: /* Error condition */
+                cqr->status = DASD_CQR_QUEUED;
+                DEV_MESSAGE(KERN_WARNING, device, "dia250 returned rc=%d", rc);
+                dasd_diag_erp(device);
+                rc = -EIO;
+                break;
         }
         return rc;
 }
 
+/* Terminate given request at the device. */
+static int
+dasd_diag_term_IO(struct dasd_ccw_req * cqr)
+{
+        struct dasd_device *device;
+
+        device = cqr->device;
+        mdsk_term_io(device);
+        mdsk_init_io(device, device->bp_block, 0, NULL);
+        cqr->status = DASD_CQR_CLEAR;
+        cqr->stopclk = get_clock();
+        dasd_schedule_bh(device);
+        return 0;
+}
+
+/* Handle external interruption. */
 static void
 dasd_ext_handler(struct pt_regs *regs, __u16 code)
 {
@@ -157,25 +243,27 @@ dasd_ext_handler(struct pt_regs *regs, __u16 code)
         struct dasd_device *device;
         unsigned long long expires;
         unsigned long flags;
-        char status;
-        int ip;
-
-        /*
-         * Get the external interruption subcode. VM stores
-         * this in the 'cpu address' field associated with
-         * the external interrupt. For diag 250 the subcode
-         * needs to be 3.
-         */
-        if ((S390_lowcore.cpu_addr & 0xff00) != 0x0300)
-                return;
-        status = *((char *) &S390_lowcore.ext_params + 5);
-        ip = S390_lowcore.ext_params;
+        u8 int_code, status;
+        addr_t ip;
+        int rc;
 
+        int_code = *((u8 *) DASD_DIAG_LC_INT_CODE);
+        status = *((u8 *) DASD_DIAG_LC_INT_STATUS);
+        switch (int_code) {
+        case DASD_DIAG_CODE_31BIT:
+                ip = (addr_t) *((u32 *) DASD_DIAG_LC_INT_PARM_31BIT);
+                break;
+        case DASD_DIAG_CODE_64BIT:
+                ip = (addr_t) *((u64 *) DASD_DIAG_LC_INT_PARM_64BIT);
+                break;
+        default:
+                return;
+        }
         if (!ip) {              /* no intparm: unsolicited interrupt */
                 MESSAGE(KERN_DEBUG, "%s", "caught unsolicited interrupt");
                 return;
         }
-        cqr = (struct dasd_ccw_req *)(addr_t) ip;
+        cqr = (struct dasd_ccw_req *) ip;
         device = (struct dasd_device *) cqr->device;
         if (strncmp(device->discipline->ebcname, (char *) &cqr->magic, 4)) {
                 DEV_MESSAGE(KERN_WARNING, device,
@@ -188,6 +276,15 @@ dasd_ext_handler(struct pt_regs *regs, __u16 code)
         /* get irq lock to modify request queue */
         spin_lock_irqsave(get_ccwdev_lock(device->cdev), flags);
 
+        /* Check for a pending clear operation */
+        if (cqr->status == DASD_CQR_CLEAR) {
+                cqr->status = DASD_CQR_QUEUED;
+                dasd_clear_timer(device);
+                dasd_schedule_bh(device);
+                spin_unlock_irqrestore(get_ccwdev_lock(device->cdev), flags);
+                return;
+        }
+
         cqr->stopclk = get_clock();
 
         expires = 0;
@@ -198,16 +295,22 @@ dasd_ext_handler(struct pt_regs *regs, __u16 code)
                         next = list_entry(device->ccw_queue.next,
                                           struct dasd_ccw_req, list);
                         if (next->status == DASD_CQR_QUEUED) {
-                                if (dasd_start_diag(next) == 0)
+                                rc = dasd_start_diag(next);
+                                if (rc == 0)
                                         expires = next->expires;
-                                else
+                                else if (rc != -EACCES)
                                         DEV_MESSAGE(KERN_WARNING, device, "%s",
                                                     "Interrupt fastpath "
                                                     "failed!");
                         }
                 }
-        } else 
-                cqr->status = DASD_CQR_FAILED;
+        } else {
+                cqr->status = DASD_CQR_QUEUED;
+                DEV_MESSAGE(KERN_WARNING, device, "interrupt status for "
+                            "request %p was %d (%d retries left)", cqr, status,
+                            cqr->retries);
+                dasd_diag_erp(device);
+        }
 
         if (expires != 0)
                 dasd_set_timer(device, expires);
@@ -218,14 +321,17 @@ dasd_ext_handler(struct pt_regs *regs, __u16 code)
         spin_unlock_irqrestore(get_ccwdev_lock(device->cdev), flags);
 }
 
+/* Check whether device can be controlled by DIAG discipline. Return zero on
+ * success, non-zero otherwise. */
 static int
 dasd_diag_check_device(struct dasd_device *device)
 {
         struct dasd_diag_private *private;
         struct dasd_diag_characteristics *rdc_data;
         struct dasd_diag_bio bio;
-        long *label;
-        int sb, bsize;
+        struct dasd_diag_cms_label *label;
+        blocknum_t end_block;
+        unsigned int sb, bsize;
         int rc;
 
         private = (struct dasd_diag_private *) device->private;
@@ -244,8 +350,11 @@ dasd_diag_check_device(struct dasd_device *device)
         rdc_data->rdc_len = sizeof (struct dasd_diag_characteristics);
 
         rc = diag210((struct diag210 *) rdc_data);
-        if (rc)
+        if (rc) {
+                DEV_MESSAGE(KERN_WARNING, device, "failed to retrieve device "
+                            "information (rc=%d)", rc);
                 return -ENOTSUPP;
+        }
 
         /* Figure out position of label block */
         switch (private->rdc_data.vdev_class) {
@@ -256,6 +365,8 @@ dasd_diag_check_device(struct dasd_device *device)
                 private->pt_block = 2;
                 break;
         default:
+                DEV_MESSAGE(KERN_WARNING, device, "unsupported device class "
+                            "(class=%d)", private->rdc_data.vdev_class);
                 return -ENOTSUPP;
         }
 
@@ -269,15 +380,17 @@ dasd_diag_check_device(struct dasd_device *device)
         mdsk_term_io(device);
 
         /* figure out blocksize of device */
-        label = (long *) get_zeroed_page(GFP_KERNEL);
+        label = (struct dasd_diag_cms_label *) get_zeroed_page(GFP_KERNEL);
         if (label == NULL)  {
                 DEV_MESSAGE(KERN_WARNING, device, "%s",
                             "No memory to allocate initialization request");
                 return -ENOMEM;
         }
+        rc = 0;
+        end_block = 0;
         /* try all sizes - needed for ECKD devices */
         for (bsize = 512; bsize <= PAGE_SIZE; bsize <<= 1) {
-                mdsk_init_io(device, bsize, 0, 64);
+                mdsk_init_io(device, bsize, 0, &end_block);
                 memset(&bio, 0, sizeof (struct dasd_diag_bio));
                 bio.type = MDSK_READ_REQ;
                 bio.block_number = private->pt_block + 1;
@@ -289,37 +402,45 @@ dasd_diag_check_device(struct dasd_device *device)
                 private->iob.block_count = 1;
                 private->iob.interrupt_params = 0;
                 private->iob.bio_list = __pa(&bio);
-                if (dia250(&private->iob, RW_BIO) == 0)
+                private->iob.flaga = DASD_DIAG_FLAGA_DEFAULT;
+                rc = dia250(&private->iob, RW_BIO);
+                if (rc == 0 || rc == 3)
                         break;
                 mdsk_term_io(device);
         }
-        if (bsize <= PAGE_SIZE && label[0] == 0xc3d4e2f1) {
-                /* get formatted blocksize from label block */
-                bsize = (int) label[3];
-                device->blocks = label[7];
+        if (rc == 3) {
+                DEV_MESSAGE(KERN_WARNING, device, "%s", "DIAG call failed");
+                rc = -EOPNOTSUPP;
+        } else if (rc != 0) {
+                DEV_MESSAGE(KERN_WARNING, device, "device access failed "
+                            "(rc=%d)", rc);
+                rc = -EIO;
+        } else {
+                if (memcmp(label->label_id, DASD_DIAG_CMS1,
+                          sizeof(DASD_DIAG_CMS1)) == 0) {
+                        /* get formatted blocksize from label block */
+                        bsize = (unsigned int) label->block_size;
+                        device->blocks = (unsigned long) label->block_count;
+                } else
+                        device->blocks = end_block;
                 device->bp_block = bsize;
                 device->s2b_shift = 0;  /* bits to shift 512 to get a block */
                 for (sb = 512; sb < bsize; sb = sb << 1)
                         device->s2b_shift++;
                 
                 DEV_MESSAGE(KERN_INFO, device,
-                            "capacity (%dkB blks): %ldkB",
-                            (device->bp_block >> 10),
-                            (device->blocks << device->s2b_shift) >> 1);
+                            "(%ld B/blk): %ldkB",
+                            (unsigned long) device->bp_block,
+                            (unsigned long) (device->blocks <<
+                                device->s2b_shift) >> 1);
                 rc = 0;
-        } else {
-                if (bsize > PAGE_SIZE)
-                        DEV_MESSAGE(KERN_WARNING, device, "%s",
-                                    "DIAG access failed");
-                else
-                        DEV_MESSAGE(KERN_WARNING, device, "%s",
-                                    "volume is not CMS formatted");
-                rc = -EMEDIUMTYPE;
         }
         free_page((long) label);
         return rc;
 }
 
+/* Fill in virtual disk geometry for device. Return zero on success, non-zero
+ * otherwise. */
 static int
 dasd_diag_fill_geometry(struct dasd_device *device, struct hd_geometry *geo)
 {
@@ -349,6 +470,8 @@ dasd_diag_erp_postaction(struct dasd_ccw_req * cqr)
         return dasd_default_erp_postaction;
 }
 
+/* Create DASD request from block device request. Return pointer to new
+ * request on success, ERR_PTR otherwise. */
 static struct dasd_ccw_req *
 dasd_diag_build_cp(struct dasd_device * device, struct request *req)
 {
@@ -358,9 +481,9 @@ dasd_diag_build_cp(struct dasd_device * device, struct request *req)
         struct bio *bio;
         struct bio_vec *bv;
         char *dst;
-        int count, datasize;
+        unsigned int count, datasize;
         sector_t recid, first_rec, last_rec;
-        unsigned blksize, off;
+        unsigned int blksize, off;
         unsigned char rw_cmd;
         int i;
 
@@ -413,13 +536,16 @@ dasd_diag_build_cp(struct dasd_device * device, struct request *req)
                         }
                 }
         }
+        cqr->retries = DIAG_MAX_RETRIES;
         cqr->buildclk = get_clock();
         cqr->device = device;
-        cqr->expires = 50 * HZ; /* 50 seconds */
+        cqr->expires = DIAG_TIMEOUT;
         cqr->status = DASD_CQR_FILLED;
         return cqr;
 }
 
+/* Release DASD request. Return non-zero if request was successful, zero
+ * otherwise. */
 static int
 dasd_diag_free_cp(struct dasd_ccw_req *cqr, struct request *req)
 {
@@ -430,6 +556,7 @@ dasd_diag_free_cp(struct dasd_ccw_req *cqr, struct request *req)
         return status;
 }
 
+/* Fill in IOCTL data for device. */
 static int
 dasd_diag_fill_info(struct dasd_device * device,
                     struct dasd_information2_t * info)
@@ -437,7 +564,7 @@ dasd_diag_fill_info(struct dasd_device * device,
         struct dasd_diag_private *private;
 
         private = (struct dasd_diag_private *) device->private;
-        info->label_block = private->pt_block;
+        info->label_block = (unsigned int) private->pt_block;
         info->FBA_layout = 1;
         info->format = DASD_FORMAT_LDL;
         info->characteristics_size = sizeof (struct dasd_diag_characteristics);
@@ -456,26 +583,15 @@ dasd_diag_dump_sense(struct dasd_device *device, struct dasd_ccw_req * req,
                     "dump sense not available for DIAG data");
 }
 
-/*
- * max_blocks is dependent on the amount of storage that is available
- * in the static io buffer for each device. Currently each device has
- * 8192 bytes (=2 pages). dasd diag is only relevant for 31 bit.
- * The struct dasd_ccw_req has 96 bytes, the struct dasd_diag_req has
- * 8 bytes and the struct dasd_diag_bio for each block has 16 bytes. 
- * That makes:
- * (8192 - 96 - 8) / 16 = 505.5 blocks at maximum.
- * We want to fit two into the available memory so that we can immediately
- * start the next request if one finishes off. That makes 252.75 blocks
- * for one request. Give a little safety and the result is 240.
- */
 struct dasd_discipline dasd_diag_discipline = {
         .owner = THIS_MODULE,
         .name = "DIAG",
         .ebcname = "DIAG",
-        .max_blocks = 240,
+        .max_blocks = DIAG_MAX_BLOCKS,
         .check_device = dasd_diag_check_device,
         .fill_geometry = dasd_diag_fill_geometry,
         .start_IO = dasd_start_diag,
+        .term_IO = dasd_diag_term_IO,
         .examine_error = dasd_diag_examine_error,
         .erp_action = dasd_diag_erp_action,
         .erp_postaction = dasd_diag_erp_postaction,
@@ -493,7 +609,7 @@ dasd_diag_init(void)
                             "Machine is not VM: %s "
                             "discipline not initializing",
                             dasd_diag_discipline.name);
-                return -EINVAL;
+                return -ENODEV;
         }
         ASCEBC(dasd_diag_discipline.ebcname, 4);
 
@@ -506,13 +622,6 @@ dasd_diag_init(void)
 static void __exit
 dasd_diag_cleanup(void)
 {
-        if (!MACHINE_IS_VM) {
-                MESSAGE_LOG(KERN_INFO,
-                            "Machine is not VM: %s "
-                            "discipline not cleaned",
-                            dasd_diag_discipline.name);
-                return;
-        }
         unregister_external_interrupt(0x2603, dasd_ext_handler);
         ctl_clear_bit(0, 9);
         dasd_diag_discipline_pointer = NULL;
@@ -520,22 +629,3 @@ dasd_diag_cleanup(void)
 
 module_init(dasd_diag_init);
 module_exit(dasd_diag_cleanup);
-
-/*
- * Overrides for Emacs so that we follow Linus's tabbing style.
- * Emacs will notice this stuff at the end of the file and automatically
- * adjust the settings for this buffer only.  This must remain at the end
- * of the file.
- * ---------------------------------------------------------------------------
- * Local variables:
- * c-indent-level: 4 
- * c-brace-imaginary-offset: 0
- * c-brace-offset: -4
- * c-argdecl-indent: 4
- * c-label-offset: -4
- * c-continued-statement-offset: 4
- * c-continued-brace-offset: 0
- * indent-tabs-mode: 1
- * tab-width: 8
- * End:
- */
diff --git a/drivers/s390/block/dasd_diag.h b/drivers/s390/block/dasd_diag.h
index a0c38e30397..b26eb28df4b 100644
--- a/drivers/s390/block/dasd_diag.h
+++ b/drivers/s390/block/dasd_diag.h
@@ -6,7 +6,7 @@
  * Bugreports.to..: <Linux390@de.ibm.com>
  * (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 1999,2000
  *
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
  */
 
 #define MDSK_WRITE_REQ 0x01
@@ -19,6 +19,18 @@
 #define DEV_CLASS_FBA   0x01
 #define DEV_CLASS_ECKD  0x04
 
+#define DASD_DIAG_LC_INT_CODE           132
+#define DASD_DIAG_LC_INT_STATUS         133
+#define DASD_DIAG_LC_INT_PARM_31BIT     128
+#define DASD_DIAG_LC_INT_PARM_64BIT     4536
+#define DASD_DIAG_CODE_31BIT            0x03
+#define DASD_DIAG_CODE_64BIT            0x07
+
+#define DASD_DIAG_RWFLAG_ASYNC          0x02
+#define DASD_DIAG_RWFLAG_NOCACHE        0x01
+
+#define DASD_DIAG_FLAGA_FORMAT_64BIT    0x80
+
 struct dasd_diag_characteristics {
         u16 dev_nr;
         u16 rdc_len;
@@ -32,35 +44,106 @@ struct dasd_diag_characteristics {
         u8 rdev_features;
 } __attribute__ ((packed, aligned(4)));
 
+struct dasd_diag_cms_label {
+        u8 label_id[4];
+        u8 vol_id[6];
+        u16 version_id;
+        u32 block_size;
+        u32 origin_ptr;
+        u32 usable_count;
+        u32 formatted_count;
+        u32 block_count;
+        u32 used_count;
+        u32 fst_size;
+        u32 fst_count;
+        u8 format_date[6];
+        u8 reserved1[2];
+        u32 disk_offset;
+        u32 map_block;
+        u32 hblk_disp;
+        u32 user_disp;
+        u8 reserved2[4];
+        u8 segment_name[8];
+} __attribute__ ((packed));
+
+#ifdef CONFIG_ARCH_S390X
+#define DASD_DIAG_FLAGA_DEFAULT         DASD_DIAG_FLAGA_FORMAT_64BIT
+
+typedef u64 blocknum_t;
+typedef s64 sblocknum_t;
+
+struct dasd_diag_bio {
+        u8 type;
+        u8 status;
+        u8 spare1[2];
+        u32 alet;
+        blocknum_t block_number;
+        u64 buffer;
+} __attribute__ ((packed, aligned(8)));
+
+struct dasd_diag_init_io {
+        u16 dev_nr;
+        u8 flaga;
+        u8 spare1[21];
+        u32 block_size;
+        u8 spare2[4];
+        blocknum_t offset;
+        sblocknum_t start_block;
+        blocknum_t end_block;
+        u8  spare3[8];
+} __attribute__ ((packed, aligned(8)));
+
+struct dasd_diag_rw_io {
+        u16 dev_nr;
+        u8  flaga;
+        u8  spare1[21];
+        u8  key;
+        u8  flags;
+        u8  spare2[2];
+        u32 block_count;
+        u32 alet;
+        u8  spare3[4];
+        u64 interrupt_params;
+        u64 bio_list;
+        u8  spare4[8];
+} __attribute__ ((packed, aligned(8)));
+#else /* CONFIG_ARCH_S390X */
+#define DASD_DIAG_FLAGA_DEFAULT         0x0
+
+typedef u32 blocknum_t;
+typedef s32 sblocknum_t;
+
 struct dasd_diag_bio {
         u8 type;
         u8 status;
         u16 spare1;
-        u32 block_number;
+        blocknum_t block_number;
         u32 alet;
         u32 buffer;
 } __attribute__ ((packed, aligned(8)));
 
 struct dasd_diag_init_io {
         u16 dev_nr;
-        u16 spare1[11];
+        u8 flaga;
+        u8 spare1[21];
         u32 block_size;
-        u32 offset;
-        u32 start_block;
-        u32 end_block;
-        u32 spare2[6];
+        blocknum_t offset;
+        sblocknum_t start_block;
+        blocknum_t end_block;
+        u8 spare2[24];
 } __attribute__ ((packed, aligned(8)));
 
 struct dasd_diag_rw_io {
         u16 dev_nr;
-        u16 spare1[11];
+        u8 flaga;
+        u8 spare1[21];
         u8 key;
         u8 flags;
-        u16 spare2;
+        u8 spare2[2];
         u32 block_count;
         u32 alet;
         u32 bio_list;
         u32 interrupt_params;
-        u32 spare3[5];
+        u8 spare3[20];
 } __attribute__ ((packed, aligned(8)));
-
+#endif /* CONFIG_ARCH_S390X */
diff --git a/drivers/s390/block/dasd_genhd.c b/drivers/s390/block/dasd_genhd.c
index 96c49349701..a601c9a3354 100644
--- a/drivers/s390/block/dasd_genhd.c
+++ b/drivers/s390/block/dasd_genhd.c
@@ -9,7 +9,7 @@
  *
  * gendisk related functions for the dasd driver.
  *
- * $Revision: 1.50 $
+ * $Revision: 1.51 $
  */
 
 #include <linux/config.h>
@@ -31,16 +31,12 @@ int
 dasd_gendisk_alloc(struct dasd_device *device)
 {
         struct gendisk *gdp;
-        int len, feature_ro;
+        int len;
 
         /* Make sure the minor for this device exists. */
         if (device->devindex >= DASD_PER_MAJOR)
                 return -EBUSY;
 
-        feature_ro = dasd_get_feature(device->cdev, DASD_FEATURE_READONLY);
-        if (feature_ro < 0)
-                return feature_ro;
-
         gdp = alloc_disk(1 << DASD_PARTN_BITS);
         if (!gdp)
                 return -ENOMEM;
@@ -75,7 +71,7 @@ dasd_gendisk_alloc(struct dasd_device *device)
 
         sprintf(gdp->devfs_name, "dasd/%s", device->cdev->dev.bus_id);
 
-        if (feature_ro)
+        if (device->features & DASD_FEATURE_READONLY)
                 set_disk_ro(gdp, 1);
         gdp->private_data = device;
         gdp->queue = device->request_queue;
diff --git a/drivers/s390/block/dasd_int.h b/drivers/s390/block/dasd_int.h
index a9f38b23598..9fab04f3056 100644
--- a/drivers/s390/block/dasd_int.h
+++ b/drivers/s390/block/dasd_int.h
@@ -6,7 +6,7 @@
  * Bugreports.to..: <Linux390@de.ibm.com>
  * (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 1999,2000
  *
- * $Revision: 1.64 $
+ * $Revision: 1.65 $
  */
 
 #ifndef DASD_INT_H
@@ -286,6 +286,7 @@ struct dasd_device {
         unsigned int bp_block;          /* bytes per block */
         unsigned int s2b_shift;         /* log2 (bp_block/512) */
         unsigned long flags;            /* per device flags */
+        unsigned short features;        /* copy of devmap-features (read-only!) */
 
         /* Device discipline stuff. */
         struct dasd_discipline *discipline;
diff --git a/drivers/s390/block/dasd_ioctl.c b/drivers/s390/block/dasd_ioctl.c
index 980c555aa53..789595b3fa0 100644
--- a/drivers/s390/block/dasd_ioctl.c
+++ b/drivers/s390/block/dasd_ioctl.c
@@ -7,7 +7,7 @@
  * Bugreports.to..: <Linux390@de.ibm.com>
  * (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 1999-2001
  *
- * $Revision: 1.45 $
+ * $Revision: 1.47 $
  *
  * i/o controls for the dasd driver.
  */
@@ -296,7 +296,6 @@ dasd_ioctl_format(struct block_device *bdev, int no, long args)
 {
         struct dasd_device *device;
         struct format_data_t fdata;
-        int feature_ro;
 
         if (!capable(CAP_SYS_ADMIN))
                 return -EACCES;
@@ -308,10 +307,7 @@ dasd_ioctl_format(struct block_device *bdev, int no, long args)
         if (device == NULL)
                 return -ENODEV;
 
-        feature_ro = dasd_get_feature(device->cdev, DASD_FEATURE_READONLY);
-        if (feature_ro < 0)
-                return feature_ro;
-        if (feature_ro)
+        if (device->features & DASD_FEATURE_READONLY)
                 return -EROFS;
         if (copy_from_user(&fdata, (void __user *) args,
                            sizeof (struct format_data_t)))
@@ -384,7 +380,7 @@ dasd_ioctl_information(struct block_device *bdev, int no, long args)
         struct dasd_device *device;
         struct dasd_information2_t *dasd_info;
         unsigned long flags;
-        int rc, feature_ro;
+        int rc;
         struct ccw_device *cdev;
 
         device = bdev->bd_disk->private_data;
@@ -394,10 +390,6 @@ dasd_ioctl_information(struct block_device *bdev, int no, long args)
         if (!device->discipline->fill_info)
                 return -EINVAL;
 
-        feature_ro = dasd_get_feature(device->cdev, DASD_FEATURE_READONLY);
-        if (feature_ro < 0)
-                return feature_ro;
-
         dasd_info = kmalloc(sizeof(struct dasd_information2_t), GFP_KERNEL);
         if (dasd_info == NULL)
                 return -ENOMEM;
@@ -427,7 +419,8 @@ dasd_ioctl_information(struct block_device *bdev, int no, long args)
             (dasd_check_blocksize(device->bp_block)))
                 dasd_info->format = DASD_FORMAT_NONE;
 
-        dasd_info->features |= feature_ro;
+        dasd_info->features |=
+                ((device->features & DASD_FEATURE_READONLY) != 0);
 
         if (device->discipline)
                 memcpy(dasd_info->type, device->discipline->name, 4);
diff --git a/drivers/s390/block/dasd_proc.c b/drivers/s390/block/dasd_proc.c
index 43c34f8c5e6..fff9020d488 100644
--- a/drivers/s390/block/dasd_proc.c
+++ b/drivers/s390/block/dasd_proc.c
@@ -9,7 +9,7 @@
  *
  * /proc interface for the dasd driver.
  *
- * $Revision: 1.32 $
+ * $Revision: 1.33 $
  */
 
 #include <linux/config.h>
@@ -55,7 +55,6 @@ dasd_devices_show(struct seq_file *m, void *v)
 {
         struct dasd_device *device;
         char *substr;
-        int feature;
 
         device = dasd_device_from_devindex((unsigned long) v - 1);
         if (IS_ERR(device))
@@ -79,10 +78,7 @@ dasd_devices_show(struct seq_file *m, void *v)
         else
                 seq_printf(m, " is ????????");
         /* Print devices features. */
-        feature = dasd_get_feature(device->cdev, DASD_FEATURE_READONLY);
-        if (feature < 0)
-                return 0;
-        substr = feature ? "(ro)" : " ";
+        substr = (device->features & DASD_FEATURE_READONLY) ? "(ro)" : " ";
         seq_printf(m, "%4s: ", substr);
         /* Print device status information. */
         switch ((device != NULL) ? device->state : -1) {
diff --git a/drivers/s390/char/raw3270.c b/drivers/s390/char/raw3270.c
index d5eefeaba50..328d9cbc56a 100644
--- a/drivers/s390/char/raw3270.c
+++ b/drivers/s390/char/raw3270.c
@@ -632,12 +632,9 @@ __raw3270_size_device(struct raw3270 *rp)
         raw3270_init_request.ccw.cda = (__u32) __pa(raw3270_init_data);
 
         rc = raw3270_start_init(rp, &raw3270_init_view, &raw3270_init_request);
-        if (rc) {
+        if (rc)
                 /* Check error cases: -ERESTARTSYS, -EIO and -EOPNOTSUPP */
-                if (rc == -EOPNOTSUPP && MACHINE_IS_VM)
-                        return __raw3270_size_device_vm(rp);
                 return rc;
-        }
 
         /* Wait for attention interrupt. */
 #ifdef CONFIG_TN3270_CONSOLE
@@ -695,7 +692,10 @@ raw3270_size_device(struct raw3270 *rp)
         down(&raw3270_init_sem);
         rp->view = &raw3270_init_view;
         raw3270_init_view.dev = rp;
-        rc = __raw3270_size_device(rp);
+        if (MACHINE_IS_VM)
+                rc = __raw3270_size_device_vm(rp);
+        else
+                rc = __raw3270_size_device(rp);
         raw3270_init_view.dev = 0;
         rp->view = 0;
         up(&raw3270_init_sem);
@@ -710,6 +710,12 @@ raw3270_size_device(struct raw3270 *rp)
                         rp->model = 4;
                 if (rp->rows == 27 && rp->cols == 132)
                         rp->model = 5;
+        } else {
+                /* Couldn't detect size. Use default model 2. */
+                rp->model = 2;
+                rp->rows = 24;
+                rp->cols = 80;
+                return 0;
         }
         return rc;
 }
diff --git a/drivers/s390/cio/cio.c b/drivers/s390/cio/cio.c
index ea813bdce1d..185bc73c3ec 100644
--- a/drivers/s390/cio/cio.c
+++ b/drivers/s390/cio/cio.c
@@ -1,7 +1,7 @@
 /*
  *  drivers/s390/cio/cio.c
  *   S/390 common I/O routines -- low level i/o calls
- *   $Revision: 1.134 $
+ *   $Revision: 1.135 $
  *
  *    Copyright (C) 1999-2002 IBM Deutschland Entwicklung GmbH,
  *                            IBM Corporation
@@ -815,8 +815,9 @@ __clear_subchannel_easy(unsigned int schid)
                 struct tpi_info ti;
 
                 if (tpi(&ti)) {
-                        tsch(schid, (struct irb *)__LC_IRB);
-                        return 0;
+                        tsch(ti.irq, (struct irb *)__LC_IRB);
+                        if (ti.irq == schid)
+                                return 0;
                 }
                 udelay(100);
         }
diff --git a/drivers/s390/cio/device_fsm.c b/drivers/s390/cio/device_fsm.c
index ee7a05e0c3b..fbe4202a3f6 100644
--- a/drivers/s390/cio/device_fsm.c
+++ b/drivers/s390/cio/device_fsm.c
@@ -13,7 +13,7 @@
 #include <linux/init.h>
 
 #include <asm/ccwdev.h>
-#include <asm/qdio.h>
+#include <asm/cio.h>
 
 #include "cio.h"
 #include "cio_debug.h"
@@ -21,7 +21,6 @@
 #include "device.h"
 #include "chsc.h"
 #include "ioasm.h"
-#include "qdio.h"
 
 int
 device_is_online(struct subchannel *sch)
diff --git a/drivers/s390/cio/device_ops.c b/drivers/s390/cio/device_ops.c
index 02d01a0de16..ad3fe5aeb66 100644
--- a/drivers/s390/cio/device_ops.c
+++ b/drivers/s390/cio/device_ops.c
@@ -1,7 +1,7 @@
 /*
  *  drivers/s390/cio/device_ops.c
  *
- *   $Revision: 1.56 $
+ *   $Revision: 1.57 $
  *
  *    Copyright (C) 2002 IBM Deutschland Entwicklung GmbH,
  *                       IBM Corporation
@@ -19,14 +19,12 @@
 
 #include <asm/ccwdev.h>
 #include <asm/idals.h>
-#include <asm/qdio.h>
 
 #include "cio.h"
 #include "cio_debug.h"
 #include "css.h"
 #include "chsc.h"
 #include "device.h"
-#include "qdio.h"
 
 int
 ccw_device_set_options(struct ccw_device *cdev, unsigned long flags)
diff --git a/drivers/s390/cio/ioasm.h b/drivers/s390/cio/ioasm.h
index c874607d9a8..45480a2bc4c 100644
--- a/drivers/s390/cio/ioasm.h
+++ b/drivers/s390/cio/ioasm.h
@@ -21,7 +21,7 @@ struct tpi_info {
  * Some S390 specific IO instructions as inline
  */
 
-extern __inline__ int stsch(int irq, volatile struct schib *addr)
+static inline int stsch(int irq, volatile struct schib *addr)
 {
         int ccode;
 
@@ -36,7 +36,7 @@ extern __inline__ int stsch(int irq, volatile struct schib *addr)
         return ccode;
 }
 
-extern __inline__ int msch(int irq, volatile struct schib *addr)
+static inline int msch(int irq, volatile struct schib *addr)
 {
         int ccode;
 
@@ -51,7 +51,7 @@ extern __inline__ int msch(int irq, volatile struct schib *addr)
         return ccode;
 }
 
-extern __inline__ int msch_err(int irq, volatile struct schib *addr)
+static inline int msch_err(int irq, volatile struct schib *addr)
 {
         int ccode;
 
@@ -79,7 +79,7 @@ extern __inline__ int msch_err(int irq, volatile struct schib *addr)
         return ccode;
 }
 
-extern __inline__ int tsch(int irq, volatile struct irb *addr)
+static inline int tsch(int irq, volatile struct irb *addr)
 {
         int ccode;
 
@@ -94,7 +94,7 @@ extern __inline__ int tsch(int irq, volatile struct irb *addr)
         return ccode;
 }
 
-extern __inline__ int tpi( volatile struct tpi_info *addr)
+static inline int tpi( volatile struct tpi_info *addr)
 {
         int ccode;
 
@@ -108,7 +108,7 @@ extern __inline__ int tpi( volatile struct tpi_info *addr)
         return ccode;
 }
 
-extern __inline__ int ssch(int irq, volatile struct orb *addr)
+static inline int ssch(int irq, volatile struct orb *addr)
 {
         int ccode;
 
@@ -123,7 +123,7 @@ extern __inline__ int ssch(int irq, volatile struct orb *addr)
         return ccode;
 }
 
-extern __inline__ int rsch(int irq)
+static inline int rsch(int irq)
 {
         int ccode;
 
@@ -138,7 +138,7 @@ extern __inline__ int rsch(int irq)
         return ccode;
 }
 
-extern __inline__ int csch(int irq)
+static inline int csch(int irq)
 {
         int ccode;
 
@@ -153,7 +153,7 @@ extern __inline__ int csch(int irq)
         return ccode;
 }
 
-extern __inline__ int hsch(int irq)
+static inline int hsch(int irq)
 {
         int ccode;
 
@@ -168,7 +168,7 @@ extern __inline__ int hsch(int irq)
         return ccode;
 }
 
-extern __inline__ int xsch(int irq)
+static inline int xsch(int irq)
 {
         int ccode;
 
@@ -183,7 +183,7 @@ extern __inline__ int xsch(int irq)
         return ccode;
 }
 
-extern __inline__ int chsc(void *chsc_area)
+static inline int chsc(void *chsc_area)
 {
         int cc;
 
@@ -198,7 +198,7 @@ extern __inline__ int chsc(void *chsc_area)
         return cc;
 }
 
-extern __inline__ int iac( void)
+static inline int iac( void)
 {
         int ccode;
 
@@ -210,7 +210,7 @@ extern __inline__ int iac( void)
         return ccode;
 }
 
-extern __inline__ int rchp(int chpid)
+static inline int rchp(int chpid)
 {
         int ccode;
 
diff --git a/drivers/s390/crypto/z90common.h b/drivers/s390/crypto/z90common.h
index bcabac7a7c4..e319e78b5ea 100644
--- a/drivers/s390/crypto/z90common.h
+++ b/drivers/s390/crypto/z90common.h
@@ -27,7 +27,7 @@
 #ifndef _Z90COMMON_H_
 #define _Z90COMMON_H_
 
-#define VERSION_Z90COMMON_H "$Revision: 1.16 $"
+#define VERSION_Z90COMMON_H "$Revision: 1.17 $"
 
 
 #define RESPBUFFSIZE 256
@@ -164,5 +164,4 @@ struct CPRBX {
 #define UMIN(a,b) ((a) < (b) ? (a) : (b))
 #define IS_EVEN(x) ((x) == (2 * ((x) / 2)))
 
-
 #endif
diff --git a/drivers/s390/crypto/z90hardware.c b/drivers/s390/crypto/z90hardware.c
index beb6a5e0da2..c215e088973 100644
--- a/drivers/s390/crypto/z90hardware.c
+++ b/drivers/s390/crypto/z90hardware.c
@@ -32,7 +32,7 @@
 #include "z90crypt.h"
 #include "z90common.h"
 
-#define VERSION_Z90HARDWARE_C "$Revision: 1.33 $"
+#define VERSION_Z90HARDWARE_C "$Revision: 1.34 $"
 
 char z90hardware_version[] __initdata =
         "z90hardware.o (" VERSION_Z90HARDWARE_C "/"
@@ -283,48 +283,6 @@ struct type6_msg {
         struct CPRB      CPRB;
 };
 
-union request_msg {
-        union  type4_msg t4msg;
-        struct type6_msg t6msg;
-};
-
-struct request_msg_ext {
-        int               q_nr;
-        unsigned char     *psmid;
-        union request_msg reqMsg;
-};
-
-struct type82_hdr {
-        unsigned char reserved1;
-        unsigned char type;
-        unsigned char reserved2[2];
-        unsigned char reply_code;
-        unsigned char reserved3[3];
-};
-
-#define TYPE82_RSP_CODE 0x82
-
-#define REPLY_ERROR_MACHINE_FAILURE  0x10
-#define REPLY_ERROR_PREEMPT_FAILURE  0x12
-#define REPLY_ERROR_CHECKPT_FAILURE  0x14
-#define REPLY_ERROR_MESSAGE_TYPE     0x20
-#define REPLY_ERROR_INVALID_COMM_CD  0x21
-#define REPLY_ERROR_INVALID_MSG_LEN  0x23
-#define REPLY_ERROR_RESERVD_FIELD    0x24
-#define REPLY_ERROR_FORMAT_FIELD     0x29
-#define REPLY_ERROR_INVALID_COMMAND  0x30
-#define REPLY_ERROR_MALFORMED_MSG    0x40
-#define REPLY_ERROR_RESERVED_FIELDO  0x50
-#define REPLY_ERROR_WORD_ALIGNMENT   0x60
-#define REPLY_ERROR_MESSAGE_LENGTH   0x80
-#define REPLY_ERROR_OPERAND_INVALID  0x82
-#define REPLY_ERROR_OPERAND_SIZE     0x84
-#define REPLY_ERROR_EVEN_MOD_IN_OPND 0x85
-#define REPLY_ERROR_RESERVED_FIELD   0x88
-#define REPLY_ERROR_TRANSPORT_FAIL   0x90
-#define REPLY_ERROR_PACKET_TRUNCATED 0xA0
-#define REPLY_ERROR_ZERO_BUFFER_LEN  0xB0
-
 struct type86_hdr {
         unsigned char reserved1;
         unsigned char type;
@@ -338,7 +296,7 @@ struct type86_hdr {
 #define TYPE86_FMT2     0x02
 
 struct type86_fmt2_msg {
-        struct type86_hdr hdr;
+        struct type86_hdr header;
         unsigned char     reserved[4];
         unsigned char     apfs[4];
         unsigned int      count1;
@@ -538,6 +496,8 @@ static struct function_and_rules_block static_pke_function_and_rulesX = {
         {'M','R','P',' ',' ',' ',' ',' '}
 };
 
+static unsigned char static_PKE_function_code[2] = {0x50, 0x4B};
+
 struct T6_keyBlock_hdrX {
         unsigned short blen;
         unsigned short ulen;
@@ -688,9 +648,38 @@ static struct cca_public_sec static_cca_pub_sec = {
 #define RESPONSE_CPRB_SIZE  0x000006B8
 #define RESPONSE_CPRBX_SIZE 0x00000724
 
-#define CALLER_HEADER 12
+struct error_hdr {
+        unsigned char reserved1;
+        unsigned char type;
+        unsigned char reserved2[2];
+        unsigned char reply_code;
+        unsigned char reserved3[3];
+};
 
-static unsigned char static_PKE_function_code[2] = {0x50, 0x4B};
+#define TYPE82_RSP_CODE 0x82
+
+#define REP82_ERROR_MACHINE_FAILURE  0x10
+#define REP82_ERROR_PREEMPT_FAILURE  0x12
+#define REP82_ERROR_CHECKPT_FAILURE  0x14
+#define REP82_ERROR_MESSAGE_TYPE     0x20
+#define REP82_ERROR_INVALID_COMM_CD  0x21
+#define REP82_ERROR_INVALID_MSG_LEN  0x23
+#define REP82_ERROR_RESERVD_FIELD    0x24
+#define REP82_ERROR_FORMAT_FIELD     0x29
+#define REP82_ERROR_INVALID_COMMAND  0x30
+#define REP82_ERROR_MALFORMED_MSG    0x40
+#define REP82_ERROR_RESERVED_FIELDO  0x50
+#define REP82_ERROR_WORD_ALIGNMENT   0x60
+#define REP82_ERROR_MESSAGE_LENGTH   0x80
+#define REP82_ERROR_OPERAND_INVALID  0x82
+#define REP82_ERROR_OPERAND_SIZE     0x84
+#define REP82_ERROR_EVEN_MOD_IN_OPND 0x85
+#define REP82_ERROR_RESERVED_FIELD   0x88
+#define REP82_ERROR_TRANSPORT_FAIL   0x90
+#define REP82_ERROR_PACKET_TRUNCATED 0xA0
+#define REP82_ERROR_ZERO_BUFFER_LEN  0xB0
+
+#define CALLER_HEADER 12
 
 static inline int
 testq(int q_nr, int *q_depth, int *dev_type, struct ap_status_word *stat)
@@ -1212,9 +1201,9 @@ send_to_AP(int dev_nr, int cdx, int msg_len, unsigned char *msg_ext)
         struct ap_status_word stat_word;
         enum devstat stat;
         int ccode;
+        u32 *q_nr_p = (u32 *)msg_ext;
 
-        ((struct request_msg_ext *) msg_ext)->q_nr =
-                (dev_nr << SKIP_BITL) + cdx;
+        *q_nr_p = (dev_nr << SKIP_BITL) + cdx;
         PDEBUG("msg_len passed to sen: %d\n", msg_len);
         PDEBUG("q number passed to sen: %02x%02x%02x%02x\n",
                msg_ext[0], msg_ext[1], msg_ext[2], msg_ext[3]);
@@ -2104,7 +2093,7 @@ convert_response(unsigned char *response, unsigned char *buffer,
                  int *respbufflen_p, unsigned char *resp_buff)
 {
         struct ica_rsa_modexpo *icaMsg_p = (struct ica_rsa_modexpo *) buffer;
-        struct type82_hdr *t82h_p = (struct type82_hdr *) response;
+        struct error_hdr *errh_p = (struct error_hdr *) response;
         struct type84_hdr *t84h_p = (struct type84_hdr *) response;
         struct type86_fmt2_msg *t86m_p =  (struct type86_fmt2_msg *) response;
         int reply_code, service_rc, service_rs, src_l;
@@ -2117,12 +2106,13 @@ convert_response(unsigned char *response, unsigned char *buffer,
         service_rc = 0;
         service_rs = 0;
         src_l = 0;
-        switch (t82h_p->type) {
+        switch (errh_p->type) {
         case TYPE82_RSP_CODE:
-                reply_code = t82h_p->reply_code;
-                src_p = (unsigned char *)t82h_p;
-                PRINTK("Hardware error: Type 82 Message Header: "
+                reply_code = errh_p->reply_code;
+                src_p = (unsigned char *)errh_p;
+                PRINTK("Hardware error: Type %02X Message Header: "
                        "%02x%02x%02x%02x%02x%02x%02x%02x\n",
+                       errh_p->type,
                        src_p[0], src_p[1], src_p[2], src_p[3],
                        src_p[4], src_p[5], src_p[6], src_p[7]);
                 break;
@@ -2131,7 +2121,7 @@ convert_response(unsigned char *response, unsigned char *buffer,
                 src_p = response + (int)t84h_p->len - src_l;
                 break;
         case TYPE86_RSP_CODE:
-                reply_code = t86m_p->hdr.reply_code;
+                reply_code = t86m_p->header.reply_code;
                 if (reply_code != 0)
                         break;
                 cprb_p = (struct CPRB *)
@@ -2143,6 +2133,9 @@ convert_response(unsigned char *response, unsigned char *buffer,
                                 le2toI(cprb_p->ccp_rscode, &service_rs);
                                 if ((service_rc == 8) && (service_rs == 66))
                                         PDEBUG("Bad block format on PCICC\n");
+                                else if ((service_rc == 8) && (service_rs == 65))
+                                        PDEBUG("Probably an even modulus on "
+                                               "PCICC\n");
                                 else if ((service_rc == 8) && (service_rs == 770)) {
                                         PDEBUG("Invalid key length on PCICC\n");
                                         unset_ext_bitlens();
@@ -2155,7 +2148,7 @@ convert_response(unsigned char *response, unsigned char *buffer,
                                         return REC_USE_PCICA;
                                 }
                                 else
-                                        PRINTK("service rc/rs: %d/%d\n",
+                                        PRINTK("service rc/rs (PCICC): %d/%d\n",
                                                service_rc, service_rs);
                                 return REC_OPERAND_INV;
                         }
@@ -2169,7 +2162,10 @@ convert_response(unsigned char *response, unsigned char *buffer,
                         if (service_rc != 0) {
                                 service_rs = (int) cprbx_p->ccp_rscode;
                                 if ((service_rc == 8) && (service_rs == 66))
-                                        PDEBUG("Bad block format on PCXICC\n");
+                                        PDEBUG("Bad block format on PCIXCC\n");
+                                else if ((service_rc == 8) && (service_rs == 65))
+                                        PDEBUG("Probably an even modulus on "
+                                               "PCIXCC\n");
                                 else if ((service_rc == 8) && (service_rs == 770)) {
                                         PDEBUG("Invalid key length on PCIXCC\n");
                                         unset_ext_bitlens();
@@ -2182,7 +2178,7 @@ convert_response(unsigned char *response, unsigned char *buffer,
                                         return REC_USE_PCICA;
                                 }
                                 else
-                                        PRINTK("service rc/rs: %d/%d\n",
+                                        PRINTK("service rc/rs (PCIXCC): %d/%d\n",
                                                service_rc, service_rs);
                                 return REC_OPERAND_INV;
                         }
@@ -2195,20 +2191,25 @@ convert_response(unsigned char *response, unsigned char *buffer,
                 }
                 break;
         default:
+                src_p = (unsigned char *)errh_p;
+                PRINTK("Unrecognized Message Header: "
+                       "%02x%02x%02x%02x%02x%02x%02x%02x\n",
+                       src_p[0], src_p[1], src_p[2], src_p[3],
+                       src_p[4], src_p[5], src_p[6], src_p[7]);
                 return REC_BAD_MESSAGE;
         }
 
         if (reply_code)
                 switch (reply_code) {
-                case REPLY_ERROR_OPERAND_INVALID:
+                case REP82_ERROR_OPERAND_INVALID:
                         return REC_OPERAND_INV;
-                case REPLY_ERROR_OPERAND_SIZE:
+                case REP82_ERROR_OPERAND_SIZE:
                         return REC_OPERAND_SIZE;
-                case REPLY_ERROR_EVEN_MOD_IN_OPND:
+                case REP82_ERROR_EVEN_MOD_IN_OPND:
                         return REC_EVEN_MOD;
-                case REPLY_ERROR_MESSAGE_TYPE:
+                case REP82_ERROR_MESSAGE_TYPE:
                         return WRONG_DEVICE_TYPE;
-                case REPLY_ERROR_TRANSPORT_FAIL:
+                case REP82_ERROR_TRANSPORT_FAIL:
                         PRINTKW("Transport failed (APFS = %02X%02X%02X%02X)\n",
                                 t86m_p->apfs[0], t86m_p->apfs[1],
                                 t86m_p->apfs[2], t86m_p->apfs[3]);
@@ -2229,7 +2230,7 @@ convert_response(unsigned char *response, unsigned char *buffer,
         PDEBUG("Length returned = %d\n", src_l);
         tgt_p = resp_buff + icaMsg_p->outputdatalength - src_l;
         memcpy(tgt_p, src_p, src_l);
-        if ((t82h_p->type == TYPE86_RSP_CODE) && (resp_buff < tgt_p)) {
+        if ((errh_p->type == TYPE86_RSP_CODE) && (resp_buff < tgt_p)) {
                 memset(resp_buff, 0, icaMsg_p->outputdatalength - src_l);
                 if (pad_msg(resp_buff, icaMsg_p->outputdatalength, src_l))
                         return REC_INVALID_PAD;
diff --git a/drivers/s390/crypto/z90main.c b/drivers/s390/crypto/z90main.c
index 9ec29bb41b2..6aeef3bacc3 100644
--- a/drivers/s390/crypto/z90main.c
+++ b/drivers/s390/crypto/z90main.c
@@ -31,6 +31,7 @@
 #include <linux/init.h>
 #include <linux/interrupt.h>   // for tasklets
 #include <linux/ioctl32.h>
+#include <linux/miscdevice.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/kobject_uevent.h>
@@ -39,19 +40,8 @@
 #include <linux/version.h>
 #include "z90crypt.h"
 #include "z90common.h"
-#ifndef Z90CRYPT_USE_HOTPLUG
-#include <linux/miscdevice.h>
-#endif
-
-#define VERSION_CODE(vers, rel, seq) (((vers)<<16) | ((rel)<<8) | (seq))
-#if LINUX_VERSION_CODE < VERSION_CODE(2,4,0) /* version < 2.4 */
-#  error "This kernel is too old: not supported"
-#endif
-#if LINUX_VERSION_CODE > VERSION_CODE(2,7,0) /* version > 2.6 */
-#  error "This kernel is too recent: not supported by this file"
-#endif
 
-#define VERSION_Z90MAIN_C "$Revision: 1.57 $"
+#define VERSION_Z90MAIN_C "$Revision: 1.62 $"
 
 static char z90main_version[] __initdata =
         "z90main.o (" VERSION_Z90MAIN_C "/"
@@ -63,21 +53,12 @@ extern char z90hardware_version[];
  * Defaults that may be modified.
  */
 
-#ifndef Z90CRYPT_USE_HOTPLUG
 /**
  * You can specify a different minor at compile time.
  */
 #ifndef Z90CRYPT_MINOR
 #define Z90CRYPT_MINOR  MISC_DYNAMIC_MINOR
 #endif
-#else
-/**
- * You can specify a different major at compile time.
- */
-#ifndef Z90CRYPT_MAJOR
-#define Z90CRYPT_MAJOR  0
-#endif
-#endif
 
 /**
  * You can specify a different domain at compile time or on the insmod
@@ -97,7 +78,7 @@ extern char z90hardware_version[];
  * older than CLEANUPTIME seconds in the past.
  */
 #ifndef CLEANUPTIME
-#define CLEANUPTIME 20
+#define CLEANUPTIME 15
 #endif
 
 /**
@@ -298,6 +279,10 @@ struct z90crypt {
  * it contains the request; at READ, the response. The function
  * send_to_crypto_device converts the request to device-dependent
  * form and use the caller's OPEN-allocated buffer for the response.
+ *
+ * For the contents of caller_dev_dep_req and caller_dev_dep_req_p
+ * because that points to it, see the discussion in z90hardware.c.
+ * Search for "extended request message block".
  */
 struct caller {
         int              caller_buf_l;           // length of original request
@@ -398,24 +383,9 @@ static int z90crypt_status_write(struct file *, const char __user *,
                                  unsigned long, void *);
 
 /**
- * Hotplug support
- */
-
-#ifdef Z90CRYPT_USE_HOTPLUG
-#define Z90CRYPT_HOTPLUG_ADD     1
-#define Z90CRYPT_HOTPLUG_REMOVE  2
-
-static void z90crypt_hotplug_event(int, int, int);
-#endif
-
-/**
  * Storage allocated at initialization and used throughout the life of
  * this insmod
  */
-#ifdef Z90CRYPT_USE_HOTPLUG
-static int z90crypt_major = Z90CRYPT_MAJOR;
-#endif
-
 static int domain = DOMAIN_INDEX;
 static struct z90crypt z90crypt;
 static int quiesce_z90crypt;
@@ -444,14 +414,12 @@ static struct file_operations z90crypt_fops = {
         .release        = z90crypt_release
 };
 
-#ifndef Z90CRYPT_USE_HOTPLUG
 static struct miscdevice z90crypt_misc_device = {
         .minor      = Z90CRYPT_MINOR,
         .name       = DEV_NAME,
         .fops       = &z90crypt_fops,
         .devfs_name = DEV_NAME
 };
-#endif
 
 /**
  * Documentation values.
@@ -603,7 +571,6 @@ z90crypt_init_module(void)
                 return -EINVAL;
         }
 
-#ifndef Z90CRYPT_USE_HOTPLUG
         /* Register as misc device with given minor (or get a dynamic one). */
         result = misc_register(&z90crypt_misc_device);
         if (result < 0) {
@@ -611,18 +578,6 @@ z90crypt_init_module(void)
                         z90crypt_misc_device.minor, result);
                 return result;
         }
-#else
-        /* Register the major (or get a dynamic one). */
-        result = register_chrdev(z90crypt_major, REG_NAME, &z90crypt_fops);
-        if (result < 0) {
-                PRINTKW("register_chrdev (major %d) failed with %d.\n",
-                        z90crypt_major, result);
-                return result;
-        }
-
-        if (z90crypt_major == 0)
-                z90crypt_major = result;
-#endif
 
         PDEBUG("Registered " DEV_NAME " with result %d\n", result);
 
@@ -645,11 +600,6 @@ z90crypt_init_module(void)
         } else
                 PRINTK("No devices at startup\n");
 
-#ifdef Z90CRYPT_USE_HOTPLUG
-        /* generate hotplug event for device node generation */
-        z90crypt_hotplug_event(z90crypt_major, 0, Z90CRYPT_HOTPLUG_ADD);
-#endif
-
         /* Initialize globals. */
         spin_lock_init(&queuespinlock);
 
@@ -701,17 +651,10 @@ z90crypt_init_module(void)
         return 0; // success
 
 init_module_cleanup:
-#ifndef Z90CRYPT_USE_HOTPLUG
         if ((nresult = misc_deregister(&z90crypt_misc_device)))
                 PRINTK("misc_deregister failed with %d.\n", nresult);
         else
                 PDEBUG("misc_deregister successful.\n");
-#else
-        if ((nresult = unregister_chrdev(z90crypt_major, REG_NAME)))
-                PRINTK("unregister_chrdev failed with %d.\n", nresult);
-        else
-                PDEBUG("unregister_chrdev successful.\n");
-#endif
 
         return result; // failure
 }
@@ -728,19 +671,10 @@ z90crypt_cleanup_module(void)
 
         remove_proc_entry("driver/z90crypt", 0);
 
-#ifndef Z90CRYPT_USE_HOTPLUG
         if ((nresult = misc_deregister(&z90crypt_misc_device)))
                 PRINTK("misc_deregister failed with %d.\n", nresult);
         else
                 PDEBUG("misc_deregister successful.\n");
-#else
-        z90crypt_hotplug_event(z90crypt_major, 0, Z90CRYPT_HOTPLUG_REMOVE);
-
-        if ((nresult = unregister_chrdev(z90crypt_major, REG_NAME)))
-                PRINTK("unregister_chrdev failed with %d.\n", nresult);
-        else
-                PDEBUG("unregister_chrdev successful.\n");
-#endif
 
         /* Remove the tasks */
         tasklet_kill(&reader_tasklet);
@@ -748,6 +682,9 @@ z90crypt_cleanup_module(void)
         del_timer(&config_timer);
         del_timer(&cleanup_timer);
 
+        if (z90_device_work)
+                destroy_workqueue(z90_device_work);
+
         destroy_z90crypt();
 
         PRINTKN("Unloaded.\n");
@@ -766,8 +703,6 @@ z90crypt_cleanup_module(void)
  *     z90crypt_status_write
  *       disable_card
  *       enable_card
- *       scan_char
- *       scan_string
  *
  * Helper functions:
  *     z90crypt_rsa
@@ -1057,9 +992,10 @@ remove_device(struct device *device_p)
  * The MCL must be applied and the newer bitlengths enabled for these to work.
  *
  * Card Type    Old limit    New limit
+ * PCICA          ??-2048     same (the lower limit is less than 128 bit...)
  * PCICC         512-1024     512-2048
- * PCIXCC_MCL2   512-2048     no change (applying this MCL == card is MCL3+)
- * PCIXCC_MCL3   512-2048     128-2048
+ * PCIXCC_MCL2   512-2048     ----- (applying any GA LIC will make an MCL3 card)
+ * PCIXCC_MCL3   -----        128-2048
  * CEX2C         512-2048     128-2048
  *
  * ext_bitlens (extended bitlengths) is a global, since you should not apply an
@@ -1104,7 +1040,7 @@ select_device_type(int *dev_type_p, int bytelength)
         if (PCICA_avail || PCIXCC_MCL3_avail || CEX2C_avail) {
                 /**
                  * bitlength is a factor, PCICA is the most capable, even with
-                 * the new MCL.
+                 * the new MCL for PCIXCC.
                  */
                 if ((bytelength < PCIXCC_MIN_MOD_SIZE) ||
                     (!ext_bitlens && (bytelength < OLD_PCIXCC_MIN_MOD_SIZE))) {
@@ -2144,73 +2080,15 @@ enable_card(int card_index)
         z90crypt.hdware_info->type_mask[devp->dev_type].user_disabled_count--;
 }
 
-static inline int
-scan_char(unsigned char *bf, unsigned int len,
-          unsigned int *offs, unsigned int *p_eof, unsigned char c)
-{
-        unsigned int i, found;
-
-        found = 0;
-        for (i = 0; i < len; i++) {
-                if (bf[i] == c) {
-                        found = 1;
-                        break;
-                }
-                if (bf[i] == '\0') {
-                        *p_eof = 1;
-                        break;
-                }
-                if (bf[i] == '\n') {
-                        break;
-                }
-        }
-        *offs = i+1;
-        return found;
-}
-
-static inline int
-scan_string(unsigned char *bf, unsigned int len,
-            unsigned int *offs, unsigned int *p_eof, unsigned char *s)
-{
-        unsigned int temp_len, temp_offs, found, eof;
-
-        temp_len = temp_offs = found = eof = 0;
-        while (!eof && !found) {
-                found = scan_char(bf+temp_len, len-temp_len,
-                                  &temp_offs, &eof, *s);
-
-                temp_len += temp_offs;
-                if (eof) {
-                        found = 0;
-                        break;
-                }
-
-                if (found) {
-                        if (len >= temp_offs+strlen(s)) {
-                                found = !strncmp(bf+temp_len-1, s, strlen(s));
-                                if (found) {
-                                        *offs = temp_len+strlen(s)-1;
-                                        break;
-                                }
-                        } else {
-                                found = 0;
-                                *p_eof = 1;
-                                break;
-                        }
-                }
-        }
-        return found;
-}
-
 static int
 z90crypt_status_write(struct file *file, const char __user *buffer,
                       unsigned long count, void *data)
 {
-        int i, j, len, offs, found, eof;
-        unsigned char *lbuf;
+        int j, eol;
+        unsigned char *lbuf, *ptr;
         unsigned int local_count;
 
-#define LBUFSIZE 600
+#define LBUFSIZE 1200
         lbuf = kmalloc(LBUFSIZE, GFP_KERNEL);
         if (!lbuf) {
                 PRINTK("kmalloc failed!\n");
@@ -2227,49 +2105,46 @@ z90crypt_status_write(struct file *file, const char __user *buffer,
                 return -EFAULT;
         }
 
-        lbuf[local_count-1] = '\0';
+        lbuf[local_count] = '\0';
 
-        len = 0;
-        eof = 0;
-        found = 0;
-        while (!eof) {
-                found = scan_string(lbuf+len, local_count-len, &offs, &eof,
-                                    "Online devices");
-                len += offs;
-                if (found == 1)
-                        break;
+        ptr = strstr(lbuf, "Online devices");
+        if (ptr == 0) {
+                PRINTK("Unable to parse data (missing \"Online devices\")\n");
+                kfree(lbuf);
+                return count;
         }
 
-        if (eof) {
+        ptr = strstr(ptr, "\n");
+        if (ptr == 0) {
+                PRINTK("Unable to parse data (missing newline after \"Online devices\")\n");
                 kfree(lbuf);
                 return count;
         }
+        ptr++;
 
-        if (found)
-                found = scan_char(lbuf+len, local_count-len, &offs, &eof, '\n');
-
-        if (!found || eof) {
+        if (strstr(ptr, "Waiting work element counts") == NULL) {
+                PRINTK("Unable to parse data (missing \"Waiting work element counts\")\n");
                 kfree(lbuf);
                 return count;
         }
 
-        len += offs;
         j = 0;
-        for (i = 0; i < 80; i++) {
-                switch (*(lbuf+len+i)) {
+        eol = 0;
+        while ((j < 64) && (*ptr != '\0')) {
+                switch (*ptr) {
                 case '\t':
                 case ' ':
                         break;
                 case '\n':
                 default:
-                        eof = 1;
+                        eol = 1;
                         break;
-                case '0':
-                case '1':
-                case '2':
-                case '3':
-                case '4':
-                case '5':
+                case '0':       // no device
+                case '1':       // PCICA
+                case '2':       // PCICC
+                case '3':       // PCIXCC_MCL2
+                case '4':       // PCIXCC_MCL3
+                case '5':       // CEX2C
                         j++;
                         break;
                 case 'd':
@@ -2283,8 +2158,9 @@ z90crypt_status_write(struct file *file, const char __user *buffer,
                         j++;
                         break;
                 }
-                if (eof)
+                if (eol)
                         break;
+                ptr++;
         }
 
         kfree(lbuf);
@@ -3479,45 +3355,5 @@ probe_PCIXCC_type(struct device *devPtr)
         return rv;
 }
 
-#ifdef Z90CRYPT_USE_HOTPLUG
-static void
-z90crypt_hotplug_event(int dev_major, int dev_minor, int action)
-{
-#ifdef CONFIG_HOTPLUG
-        char *argv[3];
-        char *envp[6];
-        char  major[20];
-        char  minor[20];
-
-        sprintf(major, "MAJOR=%d", dev_major);
-        sprintf(minor, "MINOR=%d", dev_minor);
-
-        argv[0] = hotplug_path;
-        argv[1] = "z90crypt";
-        argv[2] = 0;
-
-        envp[0] = "HOME=/";
-        envp[1] = "PATH=/sbin:/bin:/usr/sbin:/usr/bin";
-
-        switch (action) {
-        case Z90CRYPT_HOTPLUG_ADD:
-                envp[2] = "ACTION=add";
-                break;
-        case Z90CRYPT_HOTPLUG_REMOVE:
-                envp[2] = "ACTION=remove";
-                break;
-        default:
-                BUG();
-                break;
-        }
-        envp[3] = major;
-        envp[4] = minor;
-        envp[5] = 0;
-
-        call_usermodehelper(argv[0], argv, envp, 0);
-#endif
-}
-#endif
-
 module_init(z90crypt_init_module);
 module_exit(z90crypt_cleanup_module);
diff --git a/drivers/s390/net/claw.c b/drivers/s390/net/claw.c
index 24c0af49c25..3092473991a 100644
--- a/drivers/s390/net/claw.c
+++ b/drivers/s390/net/claw.c
@@ -2,9 +2,9 @@
  *  drivers/s390/net/claw.c
  *    ESCON CLAW network driver
  *
- *    $Revision: 1.35 $ $Date: 2005/03/24 12:25:38 $
+ *    $Revision: 1.38 $ $Date: 2005/08/29 09:47:04 $
  *
- *  Linux fo zSeries version
+ *  Linux for zSeries version
  *    Copyright (C) 2002,2005 IBM Corporation
  *  Author(s) Original code written by:
  *              Kazuo Iimura (iimura@jp.ibm.com)
@@ -431,12 +431,12 @@ claw_pack_skb(struct claw_privbk *privptr)
         if (!skb_queue_empty(&p_ch->collect_queue)) {
         /* some data */
                 held_skb = skb_dequeue(&p_ch->collect_queue);
-                if (p_env->packing != DO_PACKED)
-                        return held_skb;
                 if (held_skb)
-                        atomic_dec(&held_skb->users);
+                        dev_kfree_skb_any(held_skb);
                 else
                         return NULL;
+                if (p_env->packing != DO_PACKED)
+                        return held_skb;
                 /* get a new SKB we will pack at least one */
                 new_skb = dev_alloc_skb(p_env->write_size);
                 if (new_skb == NULL) {
@@ -455,7 +455,7 @@ claw_pack_skb(struct claw_privbk *privptr)
                                 privptr->stats.tx_packets++;
                                 so_far += held_skb->len;
                                 pkt_cnt++;
-                                dev_kfree_skb_irq(held_skb);
+                                dev_kfree_skb_any(held_skb);
                                 held_skb = skb_dequeue(&p_ch->collect_queue);
                                 if (held_skb)
                                         atomic_dec(&held_skb->users);
@@ -1092,7 +1092,7 @@ claw_release(struct net_device *dev)
                 }
         }
         if (privptr->pk_skb != NULL) {
-                dev_kfree_skb(privptr->pk_skb);
+                dev_kfree_skb_any(privptr->pk_skb);
                 privptr->pk_skb = NULL;
         }
         if(privptr->buffs_alloc != 1) {
@@ -2016,7 +2016,7 @@ claw_hw_tx(struct sk_buff *skb, struct net_device *dev, long linkid)
         p_buf=(struct ccwbk*)privptr->p_end_ccw;
         dumpit((char *)p_buf, sizeof(struct endccw));
 #endif
-        dev_kfree_skb(skb);
+        dev_kfree_skb_any(skb);
         if (linkid==0) {
                 lock=LOCK_NO;
         }
@@ -4061,7 +4061,7 @@ claw_purge_skb_queue(struct sk_buff_head *q)
 
         while ((skb = skb_dequeue(q))) {
                 atomic_dec(&skb->users);
-                dev_kfree_skb_irq(skb);
+                dev_kfree_skb_any(skb);
         }
 }
 
@@ -4410,7 +4410,7 @@ claw_init(void)
 #else
                 "compiled into kernel "
 #endif
-                " $Revision: 1.35 $ $Date: 2005/03/24 12:25:38 $ \n");
+                " $Revision: 1.38 $ $Date: 2005/08/29 09:47:04 $ \n");
 
 
 #ifdef FUNCTRACE
diff --git a/drivers/s390/s390mach.c b/drivers/s390/s390mach.c
index 5bb255e02ac..4191fd9d4d1 100644
--- a/drivers/s390/s390mach.c
+++ b/drivers/s390/s390mach.c
@@ -240,7 +240,7 @@ s390_revalidate_registers(struct mci *mci)
                          * Floating point control register can't be restored.
                          * Task will be terminated.
                          */
-                        asm volatile ("lfpc 0(%0)" : : "a" (&zero));
+                        asm volatile ("lfpc 0(%0)" : : "a" (&zero), "m" (zero));
                         kill_task = 1;
 
                 }
diff --git a/drivers/sbus/char/Kconfig b/drivers/sbus/char/Kconfig
index a41778a490d..3a8152906bf 100644
--- a/drivers/sbus/char/Kconfig
+++ b/drivers/sbus/char/Kconfig
@@ -69,11 +69,40 @@ config SUN_JSFLASH
           If you say Y here, you will be able to boot from your JavaStation's
           Flash memory.
 
-# XXX Why don't we do "source drivers/char/Config.in" somewhere?
-# no shit
-config RTC
-        tristate "PC-style Real Time Clock Support"
-        depends on PCI && EXPERIMENTAL && SPARC32
+config BBC_I2C
+        tristate "UltraSPARC-III bootbus i2c controller driver"
+        depends on PCI && SPARC64
+        help
+          The BBC devices on the UltraSPARC III have two I2C controllers.  The
+          first I2C controller connects mainly to configuration PROMs (NVRAM,
+          CPU configuration, DIMM types, etc.).  The second I2C controller
+          connects to environmental control devices such as fans and
+          temperature sensors.  The second controller also connects to the
+          smartcard reader, if present.  Say Y to enable support for these.
+
+config ENVCTRL
+        tristate "SUNW, envctrl support"
+        depends on PCI && SPARC64
+        help
+          Kernel support for temperature and fan monitoring on Sun SME
+          machines.
+
+          To compile this driver as a module, choose M here: the
+          module will be called envctrl.
+
+config DISPLAY7SEG
+        tristate "7-Segment Display support"
+        depends on PCI && SPARC64
+        ---help---
+          This is the driver for the 7-segment display and LED present on
+          Sun Microsystems CompactPCI models CP1400 and CP1500.
+
+          To compile this driver as a module, choose M here: the
+          module will be called display7seg.
+
+          If you do not have a CompactPCI model CP1400 or CP1500, or
+          another UltraSPARC-IIi-cEngine boardset with a 7-segment display,
+          you should say N to this option.
 
 endmenu
 
diff --git a/drivers/scsi/3w-xxxx.c b/drivers/scsi/3w-xxxx.c
index 973c51fb0fe..ae9e0203e9d 100644
--- a/drivers/scsi/3w-xxxx.c
+++ b/drivers/scsi/3w-xxxx.c
@@ -1499,22 +1499,43 @@ static int tw_scsiop_inquiry(TW_Device_Extension *tw_dev, int request_id)
         return 0;
 } /* End tw_scsiop_inquiry() */
 
+static void tw_transfer_internal(TW_Device_Extension *tw_dev, int request_id,
+                                 void *data, unsigned int len)
+{
+        struct scsi_cmnd *cmd = tw_dev->srb[request_id];
+        void *buf;
+        unsigned int transfer_len;
+
+        if (cmd->use_sg) {
+                struct scatterlist *sg =
+                        (struct scatterlist *)cmd->request_buffer;
+                buf = kmap_atomic(sg->page, KM_IRQ0) + sg->offset;
+                transfer_len = min(sg->length, len);
+        } else {
+                buf = cmd->request_buffer;
+                transfer_len = min(cmd->request_bufflen, len);
+        }
+
+        memcpy(buf, data, transfer_len);
+        
+        if (cmd->use_sg) {
+                struct scatterlist *sg;
+
+                sg = (struct scatterlist *)cmd->request_buffer;
+                kunmap_atomic(buf - sg->offset, KM_IRQ0);
+        }
+}
+
 /* This function is called by the isr to complete an inquiry command */
 static int tw_scsiop_inquiry_complete(TW_Device_Extension *tw_dev, int request_id)
 {
         unsigned char *is_unit_present;
-        unsigned char *request_buffer;
+        unsigned char request_buffer[36];
         TW_Param *param;
 
         dprintk(KERN_NOTICE "3w-xxxx: tw_scsiop_inquiry_complete()\n");
 
-        /* Fill request buffer */
-        if (tw_dev->srb[request_id]->request_buffer == NULL) {
-                printk(KERN_WARNING "3w-xxxx: tw_scsiop_inquiry_complete(): Request buffer NULL.\n");
-                return 1;
-        }
-        request_buffer = tw_dev->srb[request_id]->request_buffer;
-        memset(request_buffer, 0, tw_dev->srb[request_id]->request_bufflen);
+        memset(request_buffer, 0, sizeof(request_buffer));
         request_buffer[0] = TYPE_DISK; /* Peripheral device type */
         request_buffer[1] = 0;         /* Device type modifier */
         request_buffer[2] = 0;         /* No ansi/iso compliance */
@@ -1522,6 +1543,8 @@ static int tw_scsiop_inquiry_complete(TW_Device_Extension *tw_dev, int request_i
         memcpy(&request_buffer[8], "3ware   ", 8);       /* Vendor ID */
         sprintf(&request_buffer[16], "Logical Disk %-2d ", tw_dev->srb[request_id]->device->id);
         memcpy(&request_buffer[32], TW_DRIVER_VERSION, 3);
+        tw_transfer_internal(tw_dev, request_id, request_buffer,
+                             sizeof(request_buffer));
 
         param = (TW_Param *)tw_dev->alignment_virtual_address[request_id];
         if (param == NULL) {
@@ -1612,7 +1635,7 @@ static int tw_scsiop_mode_sense_complete(TW_Device_Extension *tw_dev, int reques
 {
         TW_Param *param;
         unsigned char *flags;
-        unsigned char *request_buffer;
+        unsigned char request_buffer[8];
 
         dprintk(KERN_NOTICE "3w-xxxx: tw_scsiop_mode_sense_complete()\n");
 
@@ -1622,8 +1645,7 @@ static int tw_scsiop_mode_sense_complete(TW_Device_Extension *tw_dev, int reques
                 return 1;
         }
         flags = (char *)&(param->data[0]);
-        request_buffer = tw_dev->srb[request_id]->buffer;
-        memset(request_buffer, 0, tw_dev->srb[request_id]->request_bufflen);
+        memset(request_buffer, 0, sizeof(request_buffer));
 
         request_buffer[0] = 0xf;        /* mode data length */
         request_buffer[1] = 0;          /* default medium type */
@@ -1635,6 +1657,8 @@ static int tw_scsiop_mode_sense_complete(TW_Device_Extension *tw_dev, int reques
                 request_buffer[6] = 0x4;        /* WCE on */
         else
                 request_buffer[6] = 0x0;        /* WCE off */
+        tw_transfer_internal(tw_dev, request_id, request_buffer,
+                             sizeof(request_buffer));
 
         return 0;
 } /* End tw_scsiop_mode_sense_complete() */
@@ -1701,17 +1725,12 @@ static int tw_scsiop_read_capacity_complete(TW_Device_Extension *tw_dev, int req
 {
         unsigned char *param_data;
         u32 capacity;
-        char *buff;
+        char buff[8];
         TW_Param *param;
 
         dprintk(KERN_NOTICE "3w-xxxx: tw_scsiop_read_capacity_complete()\n");
 
-        buff = tw_dev->srb[request_id]->request_buffer;
-        if (buff == NULL) {
-                printk(KERN_WARNING "3w-xxxx: tw_scsiop_read_capacity_complete(): Request buffer NULL.\n");
-                return 1;
-        }
-        memset(buff, 0, tw_dev->srb[request_id]->request_bufflen);
+        memset(buff, 0, sizeof(buff));
         param = (TW_Param *)tw_dev->alignment_virtual_address[request_id];
         if (param == NULL) {
                 printk(KERN_WARNING "3w-xxxx: tw_scsiop_read_capacity_complete(): Bad alignment virtual address.\n");
@@ -1739,6 +1758,8 @@ static int tw_scsiop_read_capacity_complete(TW_Device_Extension *tw_dev, int req
         buff[6] = (TW_BLOCK_SIZE >> 8) & 0xff;
         buff[7] = TW_BLOCK_SIZE & 0xff;
 
+        tw_transfer_internal(tw_dev, request_id, buff, sizeof(buff));
+
         return 0;
 } /* End tw_scsiop_read_capacity_complete() */
 
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index 12c208fb18c..2d21265e650 100644
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -1,5 +1,11 @@
 menu "SCSI device support"
 
+config RAID_ATTRS
+        tristate "RAID Transport Class"
+        default n
+        ---help---
+          Provides RAID
+
 config SCSI
         tristate "SCSI device support"
         ---help---
@@ -250,7 +256,7 @@ config SCSI_DECNCR
 
 config SCSI_DECSII
         tristate "DEC SII Scsi Driver"
-        depends on MACH_DECSTATION && SCSI && MIPS32
+        depends on MACH_DECSTATION && SCSI && 32BIT
 
 config BLK_DEV_3W_XXXX_RAID
         tristate "3ware 5/6/7/8xxx ATA-RAID support"
@@ -459,6 +465,15 @@ config SCSI_ATA_PIIX
 
           If unsure, say N.
 
+config SCSI_SATA_MV
+        tristate "Marvell SATA support"
+        depends on SCSI_SATA && PCI && EXPERIMENTAL
+        help
+          This option enables support for the Marvell Serial ATA family.
+          Currently supports 88SX[56]0[48][01] chips.
+
+          If unsure, say N.
+
 config SCSI_SATA_NV
         tristate "NVIDIA SATA support"
         depends on SCSI_SATA && PCI && EXPERIMENTAL
diff --git a/drivers/scsi/Makefile b/drivers/scsi/Makefile
index 3746fb9fa2f..4b4fd94c267 100644
--- a/drivers/scsi/Makefile
+++ b/drivers/scsi/Makefile
@@ -22,6 +22,8 @@ subdir-$(CONFIG_PCMCIA)		+= pcmcia
 
 obj-$(CONFIG_SCSI)              += scsi_mod.o
 
+obj-$(CONFIG_RAID_ATTRS)        += raid_class.o
+
 # --- NOTE ORDERING HERE ---
 # For kernel non-modular link, transport attributes need to
 # be initialised before drivers
@@ -132,6 +134,7 @@ obj-$(CONFIG_SCSI_SATA_SIS)	+= libata.o sata_sis.o
 obj-$(CONFIG_SCSI_SATA_SX4)     += libata.o sata_sx4.o
 obj-$(CONFIG_SCSI_SATA_NV)      += libata.o sata_nv.o
 obj-$(CONFIG_SCSI_SATA_ULI)     += libata.o sata_uli.o
+obj-$(CONFIG_SCSI_SATA_MV)      += libata.o sata_mv.o
 
 obj-$(CONFIG_ARM)               += arm/
 
diff --git a/drivers/scsi/NCR5380.c b/drivers/scsi/NCR5380.c
index f8ec6fe7d85..d40ba0bd68a 100644
--- a/drivers/scsi/NCR5380.c
+++ b/drivers/scsi/NCR5380.c
@@ -88,6 +88,13 @@
  */
 #include <scsi/scsi_dbg.h>
 
+#ifndef NDEBUG
+#define NDEBUG 0
+#endif
+#ifndef NDEBUG
+#define NDEBUG_ABORT 0
+#endif
+
 #if (NDEBUG & NDEBUG_LISTS)
 #define LIST(x,y) {printk("LINE:%d   Adding %p to %p\n", __LINE__, (void*)(x), (void*)(y)); if ((x)==(y)) udelay(5); }
 #define REMOVE(w,x,y,z) {printk("LINE:%d   Removing: %p->%p  %p->%p \n", __LINE__, (void*)(w), (void*)(x), (void*)(y), (void*)(z)); if ((x)==(y)) udelay(5); }
@@ -359,7 +366,7 @@ static struct {
         {PHASE_UNKNOWN, "UNKNOWN"}
 };
 
-#ifdef NDEBUG
+#if NDEBUG
 static struct {
         unsigned char mask;
         const char *name;
diff --git a/drivers/scsi/NCR53c406a.c b/drivers/scsi/NCR53c406a.c
index 79ae73b2368..e1f2246ee7c 100644
--- a/drivers/scsi/NCR53c406a.c
+++ b/drivers/scsi/NCR53c406a.c
@@ -62,7 +62,7 @@
 
 #define SYNC_MODE 0             /* Synchronous transfer mode */
 
-#if DEBUG
+#ifdef DEBUG
 #undef NCR53C406A_DEBUG
 #define NCR53C406A_DEBUG 1
 #endif
diff --git a/drivers/scsi/aacraid/aachba.c b/drivers/scsi/aacraid/aachba.c
index ccdf440021f..a8e3dfcd0dc 100644
--- a/drivers/scsi/aacraid/aachba.c
+++ b/drivers/scsi/aacraid/aachba.c
@@ -133,6 +133,7 @@ struct inquiry_data {
  
 static unsigned long aac_build_sg(struct scsi_cmnd* scsicmd, struct sgmap* sgmap);
 static unsigned long aac_build_sg64(struct scsi_cmnd* scsicmd, struct sgmap64* psg);
+static unsigned long aac_build_sgraw(struct scsi_cmnd* scsicmd, struct sgmapraw* psg);
 static int aac_send_srb_fib(struct scsi_cmnd* scsicmd);
 #ifdef AAC_DETAILED_STATUS_INFO
 static char *aac_get_status_string(u32 status);
@@ -348,6 +349,27 @@ static void aac_io_done(struct scsi_cmnd * scsicmd)
         spin_unlock_irqrestore(host->host_lock, cpu_flags);
 }
 
+static void aac_internal_transfer(struct scsi_cmnd *scsicmd, void *data, unsigned int offset, unsigned int len)
+{
+        void *buf;
+        unsigned int transfer_len;
+        struct scatterlist *sg = scsicmd->request_buffer;
+
+        if (scsicmd->use_sg) {
+                buf = kmap_atomic(sg->page, KM_IRQ0) + sg->offset;
+                transfer_len = min(sg->length, len + offset);
+        } else {
+                buf = scsicmd->request_buffer;
+                transfer_len = min(scsicmd->request_bufflen, len + offset);
+        }
+
+        memcpy(buf + offset, data, transfer_len - offset);
+
+        if (scsicmd->use_sg) 
+                kunmap_atomic(buf - sg->offset, KM_IRQ0);
+
+}
+
 static void get_container_name_callback(void *context, struct fib * fibptr)
 {
         struct aac_get_name_resp * get_name_reply;
@@ -363,18 +385,22 @@ static void get_container_name_callback(void *context, struct fib * fibptr)
         /* Failure is irrelevant, using default value instead */
         if ((le32_to_cpu(get_name_reply->status) == CT_OK)
          && (get_name_reply->data[0] != '\0')) {
-                int    count;
-                char * dp;
-                char * sp = get_name_reply->data;
+                char *sp = get_name_reply->data;
                 sp[sizeof(((struct aac_get_name_resp *)NULL)->data)-1] = '\0';
                 while (*sp == ' ')
                         ++sp;
-                count = sizeof(((struct inquiry_data *)NULL)->inqd_pid);
-                dp = ((struct inquiry_data *)scsicmd->request_buffer)->inqd_pid;
-                if (*sp) do {
-                        *dp++ = (*sp) ? *sp++ : ' ';
-                } while (--count > 0);
+                if (*sp) {
+                        char d[sizeof(((struct inquiry_data *)NULL)->inqd_pid)];
+                        int count = sizeof(d);
+                        char *dp = d;
+                        do {
+                                *dp++ = (*sp) ? *sp++ : ' ';
+                        } while (--count > 0);
+                        aac_internal_transfer(scsicmd, d, 
+                          offsetof(struct inquiry_data, inqd_pid), sizeof(d));
+                }
         }
+
         scsicmd->result = DID_OK << 16 | COMMAND_COMPLETE << 8 | SAM_STAT_GOOD;
 
         fib_complete(fibptr);
@@ -777,34 +803,36 @@ int aac_get_adapter_info(struct aac_dev* dev)
         /* 
          * 57 scatter gather elements 
          */
-        dev->scsi_host_ptr->sg_tablesize = (dev->max_fib_size -
-                sizeof(struct aac_fibhdr) -
-                sizeof(struct aac_write) + sizeof(struct sgmap)) /
-                        sizeof(struct sgmap);
-        if (dev->dac_support) {
-                /* 
-                 * 38 scatter gather elements 
-                 */
-                dev->scsi_host_ptr->sg_tablesize =
-                        (dev->max_fib_size -
+        if (!(dev->raw_io_interface)) {
+                dev->scsi_host_ptr->sg_tablesize = (dev->max_fib_size -
                         sizeof(struct aac_fibhdr) -
-                        sizeof(struct aac_write64) +
-                        sizeof(struct sgmap64)) /
-                                sizeof(struct sgmap64);
-        }
-        dev->scsi_host_ptr->max_sectors = AAC_MAX_32BIT_SGBCOUNT;
-        if(!(dev->adapter_info.options & AAC_OPT_NEW_COMM)) {
-                /*
-                 * Worst case size that could cause sg overflow when
-                 * we break up SG elements that are larger than 64KB.
-                 * Would be nice if we could tell the SCSI layer what
-                 * the maximum SG element size can be. Worst case is
-                 * (sg_tablesize-1) 4KB elements with one 64KB
-                 * element.
-                 *      32bit -> 468 or 238KB   64bit -> 424 or 212KB
-                 */
-                dev->scsi_host_ptr->max_sectors =
-                  (dev->scsi_host_ptr->sg_tablesize * 8) + 112;
+                        sizeof(struct aac_write) + sizeof(struct sgmap)) /
+                                sizeof(struct sgmap);
+                if (dev->dac_support) {
+                        /* 
+                         * 38 scatter gather elements 
+                         */
+                        dev->scsi_host_ptr->sg_tablesize =
+                                (dev->max_fib_size -
+                                sizeof(struct aac_fibhdr) -
+                                sizeof(struct aac_write64) +
+                                sizeof(struct sgmap64)) /
+                                        sizeof(struct sgmap64);
+                }
+                dev->scsi_host_ptr->max_sectors = AAC_MAX_32BIT_SGBCOUNT;
+                if(!(dev->adapter_info.options & AAC_OPT_NEW_COMM)) {
+                        /*
+                         * Worst case size that could cause sg overflow when
+                         * we break up SG elements that are larger than 64KB.
+                         * Would be nice if we could tell the SCSI layer what
+                         * the maximum SG element size can be. Worst case is
+                         * (sg_tablesize-1) 4KB elements with one 64KB
+                         * element.
+                         *      32bit -> 468 or 238KB   64bit -> 424 or 212KB
+                         */
+                        dev->scsi_host_ptr->max_sectors =
+                          (dev->scsi_host_ptr->sg_tablesize * 8) + 112;
+                }
         }
 
         fib_complete(fibptr);
@@ -814,12 +842,11 @@ int aac_get_adapter_info(struct aac_dev* dev)
 }
 
 
-static void read_callback(void *context, struct fib * fibptr)
+static void io_callback(void *context, struct fib * fibptr)
 {
         struct aac_dev *dev;
         struct aac_read_reply *readreply;
         struct scsi_cmnd *scsicmd;
-        u32 lba;
         u32 cid;
 
         scsicmd = (struct scsi_cmnd *) context;
@@ -827,8 +854,7 @@ static void read_callback(void *context, struct fib * fibptr)
         dev = (struct aac_dev *)scsicmd->device->host->hostdata;
         cid = ID_LUN_TO_CONTAINER(scsicmd->device->id, scsicmd->device->lun);
 
-        lba = ((scsicmd->cmnd[1] & 0x1F) << 16) | (scsicmd->cmnd[2] << 8) | scsicmd->cmnd[3];
-        dprintk((KERN_DEBUG "read_callback[cpu %d]: lba = %u, t = %ld.\n", smp_processor_id(), lba, jiffies));
+        dprintk((KERN_DEBUG "io_callback[cpu %d]: lba = %u, t = %ld.\n", smp_processor_id(), ((scsicmd->cmnd[1] & 0x1F) << 16) | (scsicmd->cmnd[2] << 8) | scsicmd->cmnd[3], jiffies));
 
         if (fibptr == NULL)
                 BUG();
@@ -847,7 +873,7 @@ static void read_callback(void *context, struct fib * fibptr)
                 scsicmd->result = DID_OK << 16 | COMMAND_COMPLETE << 8 | SAM_STAT_GOOD;
         else {
 #ifdef AAC_DETAILED_STATUS_INFO
-                printk(KERN_WARNING "read_callback: io failed, status = %d\n",
+                printk(KERN_WARNING "io_callback: io failed, status = %d\n",
                   le32_to_cpu(readreply->status));
 #endif
                 scsicmd->result = DID_OK << 16 | COMMAND_COMPLETE << 8 | SAM_STAT_CHECK_CONDITION;
@@ -867,53 +893,6 @@ static void read_callback(void *context, struct fib * fibptr)
         aac_io_done(scsicmd);
 }
 
-static void write_callback(void *context, struct fib * fibptr)
-{
-        struct aac_dev *dev;
-        struct aac_write_reply *writereply;
-        struct scsi_cmnd *scsicmd;
-        u32 lba;
-        u32 cid;
-
-        scsicmd = (struct scsi_cmnd *) context;
-        dev = (struct aac_dev *)scsicmd->device->host->hostdata;
-        cid = ID_LUN_TO_CONTAINER(scsicmd->device->id, scsicmd->device->lun);
-
-        lba = ((scsicmd->cmnd[1] & 0x1F) << 16) | (scsicmd->cmnd[2] << 8) | scsicmd->cmnd[3];
-        dprintk((KERN_DEBUG "write_callback[cpu %d]: lba = %u, t = %ld.\n", smp_processor_id(), lba, jiffies));
-        if (fibptr == NULL)
-                BUG();
-
-        if(scsicmd->use_sg)
-                pci_unmap_sg(dev->pdev, 
-                        (struct scatterlist *)scsicmd->buffer,
-                        scsicmd->use_sg,
-                        scsicmd->sc_data_direction);
-        else if(scsicmd->request_bufflen)
-                pci_unmap_single(dev->pdev, scsicmd->SCp.dma_handle,
-                                 scsicmd->request_bufflen,
-                                 scsicmd->sc_data_direction);
-
-        writereply = (struct aac_write_reply *) fib_data(fibptr);
-        if (le32_to_cpu(writereply->status) == ST_OK)
-                scsicmd->result = DID_OK << 16 | COMMAND_COMPLETE << 8 | SAM_STAT_GOOD;
-        else {
-                printk(KERN_WARNING "write_callback: write failed, status = %d\n", writereply->status);
-                scsicmd->result = DID_OK << 16 | COMMAND_COMPLETE << 8 | SAM_STAT_CHECK_CONDITION;
-                set_sense((u8 *) &dev->fsa_dev[cid].sense_data,
-                                    HARDWARE_ERROR,
-                                    SENCODE_INTERNAL_TARGET_FAILURE,
-                                    ASENCODE_INTERNAL_TARGET_FAILURE, 0, 0,
-                                    0, 0);
-                memcpy(scsicmd->sense_buffer, &dev->fsa_dev[cid].sense_data, 
-                                sizeof(struct sense_data));
-        }
-
-        fib_complete(fibptr);
-        fib_free(fibptr);
-        aac_io_done(scsicmd);
-}
-
 static int aac_read(struct scsi_cmnd * scsicmd, int cid)
 {
         u32 lba;
@@ -954,7 +933,32 @@ static int aac_read(struct scsi_cmnd * scsicmd, int cid)
 
         fib_init(cmd_fibcontext);
 
-        if (dev->dac_support == 1) {
+        if (dev->raw_io_interface) {
+                struct aac_raw_io *readcmd;
+                readcmd = (struct aac_raw_io *) fib_data(cmd_fibcontext);
+                readcmd->block[0] = cpu_to_le32(lba);
+                readcmd->block[1] = 0;
+                readcmd->count = cpu_to_le32(count<<9);
+                readcmd->cid = cpu_to_le16(cid);
+                readcmd->flags = cpu_to_le16(1);
+                readcmd->bpTotal = 0;
+                readcmd->bpComplete = 0;
+                
+                aac_build_sgraw(scsicmd, &readcmd->sg);
+                fibsize = sizeof(struct aac_raw_io) + ((le32_to_cpu(readcmd->sg.count) - 1) * sizeof (struct sgentryraw));
+                if (fibsize > (dev->max_fib_size - sizeof(struct aac_fibhdr)))
+                        BUG();
+                /*
+                 *      Now send the Fib to the adapter
+                 */
+                status = fib_send(ContainerRawIo,
+                          cmd_fibcontext, 
+                          fibsize, 
+                          FsaNormal, 
+                          0, 1, 
+                          (fib_callback) io_callback, 
+                          (void *) scsicmd);
+        } else if (dev->dac_support == 1) {
                 struct aac_read64 *readcmd;
                 readcmd = (struct aac_read64 *) fib_data(cmd_fibcontext);
                 readcmd->command = cpu_to_le32(VM_CtHostRead64);
@@ -968,7 +972,7 @@ static int aac_read(struct scsi_cmnd * scsicmd, int cid)
                 fibsize = sizeof(struct aac_read64) + 
                         ((le32_to_cpu(readcmd->sg.count) - 1) * 
                          sizeof (struct sgentry64));
-                BUG_ON (fibsize > (sizeof(struct hw_fib) - 
+                BUG_ON (fibsize > (dev->max_fib_size - 
                                         sizeof(struct aac_fibhdr)));
                 /*
                  *      Now send the Fib to the adapter
@@ -978,7 +982,7 @@ static int aac_read(struct scsi_cmnd * scsicmd, int cid)
                           fibsize, 
                           FsaNormal, 
                           0, 1, 
-                          (fib_callback) read_callback, 
+                          (fib_callback) io_callback, 
                           (void *) scsicmd);
         } else {
                 struct aac_read *readcmd;
@@ -1002,7 +1006,7 @@ static int aac_read(struct scsi_cmnd * scsicmd, int cid)
                           fibsize, 
                           FsaNormal, 
                           0, 1, 
-                          (fib_callback) read_callback, 
+                          (fib_callback) io_callback, 
                           (void *) scsicmd);
         }
 
@@ -1061,7 +1065,32 @@ static int aac_write(struct scsi_cmnd * scsicmd, int cid)
         }
         fib_init(cmd_fibcontext);
 
-        if(dev->dac_support == 1) {
+        if (dev->raw_io_interface) {
+                struct aac_raw_io *writecmd;
+                writecmd = (struct aac_raw_io *) fib_data(cmd_fibcontext);
+                writecmd->block[0] = cpu_to_le32(lba);
+                writecmd->block[1] = 0;
+                writecmd->count = cpu_to_le32(count<<9);
+                writecmd->cid = cpu_to_le16(cid);
+                writecmd->flags = 0; 
+                writecmd->bpTotal = 0;
+                writecmd->bpComplete = 0;
+                
+                aac_build_sgraw(scsicmd, &writecmd->sg);
+                fibsize = sizeof(struct aac_raw_io) + ((le32_to_cpu(writecmd->sg.count) - 1) * sizeof (struct sgentryraw));
+                if (fibsize > (dev->max_fib_size - sizeof(struct aac_fibhdr)))
+                        BUG();
+                /*
+                 *      Now send the Fib to the adapter
+                 */
+                status = fib_send(ContainerRawIo,
+                          cmd_fibcontext, 
+                          fibsize, 
+                          FsaNormal, 
+                          0, 1, 
+                          (fib_callback) io_callback, 
+                          (void *) scsicmd);
+        } else if (dev->dac_support == 1) {
                 struct aac_write64 *writecmd;
                 writecmd = (struct aac_write64 *) fib_data(cmd_fibcontext);
                 writecmd->command = cpu_to_le32(VM_CtHostWrite64);
@@ -1085,7 +1114,7 @@ static int aac_write(struct scsi_cmnd * scsicmd, int cid)
                           fibsize, 
                           FsaNormal, 
                           0, 1, 
-                          (fib_callback) write_callback, 
+                          (fib_callback) io_callback, 
                           (void *) scsicmd);
         } else {
                 struct aac_write *writecmd;
@@ -1111,7 +1140,7 @@ static int aac_write(struct scsi_cmnd * scsicmd, int cid)
                           fibsize, 
                           FsaNormal, 
                           0, 1, 
-                          (fib_callback) write_callback, 
+                          (fib_callback) io_callback, 
                           (void *) scsicmd);
         }
 
@@ -1340,44 +1369,45 @@ int aac_scsi_cmd(struct scsi_cmnd * scsicmd)
         switch (scsicmd->cmnd[0]) {
         case INQUIRY:
         {
-                struct inquiry_data *inq_data_ptr;
+                struct inquiry_data inq_data;
 
                 dprintk((KERN_DEBUG "INQUIRY command, ID: %d.\n", scsicmd->device->id));
-                inq_data_ptr = (struct inquiry_data *)scsicmd->request_buffer;
-                memset(inq_data_ptr, 0, sizeof (struct inquiry_data));
+                memset(&inq_data, 0, sizeof (struct inquiry_data));
 
-                inq_data_ptr->inqd_ver = 2;     /* claim compliance to SCSI-2 */
-                inq_data_ptr->inqd_dtq = 0x80;  /* set RMB bit to one indicating that the medium is removable */
-                inq_data_ptr->inqd_rdf = 2;     /* A response data format value of two indicates that the data shall be in the format specified in SCSI-2 */
-                inq_data_ptr->inqd_len = 31;
+                inq_data.inqd_ver = 2;  /* claim compliance to SCSI-2 */
+                inq_data.inqd_dtq = 0x80;       /* set RMB bit to one indicating that the medium is removable */
+                inq_data.inqd_rdf = 2;  /* A response data format value of two indicates that the data shall be in the format specified in SCSI-2 */
+                inq_data.inqd_len = 31;
                 /*Format for "pad2" is  RelAdr | WBus32 | WBus16 |  Sync  | Linked |Reserved| CmdQue | SftRe */
-                inq_data_ptr->inqd_pad2= 0x32 ;  /*WBus16|Sync|CmdQue */
+                inq_data.inqd_pad2= 0x32 ;       /*WBus16|Sync|CmdQue */
                 /*
                  *      Set the Vendor, Product, and Revision Level
                  *      see: <vendor>.c i.e. aac.c
                  */
                 if (scsicmd->device->id == host->this_id) {
-                        setinqstr(cardtype, (void *) (inq_data_ptr->inqd_vid), (sizeof(container_types)/sizeof(char *)));
-                        inq_data_ptr->inqd_pdt = INQD_PDT_PROC; /* Processor device */
+                        setinqstr(cardtype, (void *) (inq_data.inqd_vid), (sizeof(container_types)/sizeof(char *)));
+                        inq_data.inqd_pdt = INQD_PDT_PROC;      /* Processor device */
+                        aac_internal_transfer(scsicmd, &inq_data, 0, sizeof(inq_data));
                         scsicmd->result = DID_OK << 16 | COMMAND_COMPLETE << 8 | SAM_STAT_GOOD;
                         scsicmd->scsi_done(scsicmd);
                         return 0;
                 }
-                setinqstr(cardtype, (void *) (inq_data_ptr->inqd_vid), fsa_dev_ptr[cid].type);
-                inq_data_ptr->inqd_pdt = INQD_PDT_DA;   /* Direct/random access device */
+                setinqstr(cardtype, (void *) (inq_data.inqd_vid), fsa_dev_ptr[cid].type);
+                inq_data.inqd_pdt = INQD_PDT_DA;        /* Direct/random access device */
+                aac_internal_transfer(scsicmd, &inq_data, 0, sizeof(inq_data));
                 return aac_get_container_name(scsicmd, cid);
         }
         case READ_CAPACITY:
         {
                 u32 capacity;
-                char *cp;
+                char cp[8];
 
                 dprintk((KERN_DEBUG "READ CAPACITY command.\n"));
                 if (fsa_dev_ptr[cid].size <= 0x100000000LL)
                         capacity = fsa_dev_ptr[cid].size - 1;
                 else
                         capacity = (u32)-1;
-                cp = scsicmd->request_buffer;
+
                 cp[0] = (capacity >> 24) & 0xff;
                 cp[1] = (capacity >> 16) & 0xff;
                 cp[2] = (capacity >> 8) & 0xff;
@@ -1386,6 +1416,7 @@ int aac_scsi_cmd(struct scsi_cmnd * scsicmd)
                 cp[5] = 0;
                 cp[6] = 2;
                 cp[7] = 0;
+                aac_internal_transfer(scsicmd, cp, 0, sizeof(cp));
 
                 scsicmd->result = DID_OK << 16 | COMMAND_COMPLETE << 8 | SAM_STAT_GOOD;
                 scsicmd->scsi_done(scsicmd);
@@ -1395,15 +1426,15 @@ int aac_scsi_cmd(struct scsi_cmnd * scsicmd)
 
         case MODE_SENSE:
         {
-                char *mode_buf;
+                char mode_buf[4];
 
                 dprintk((KERN_DEBUG "MODE SENSE command.\n"));
-                mode_buf = scsicmd->request_buffer;
                 mode_buf[0] = 3;        /* Mode data length */
                 mode_buf[1] = 0;        /* Medium type - default */
                 mode_buf[2] = 0;        /* Device-specific param, bit 8: 0/1 = write enabled/protected */
                 mode_buf[3] = 0;        /* Block descriptor length */
 
+                aac_internal_transfer(scsicmd, mode_buf, 0, sizeof(mode_buf));
                 scsicmd->result = DID_OK << 16 | COMMAND_COMPLETE << 8 | SAM_STAT_GOOD;
                 scsicmd->scsi_done(scsicmd);
 
@@ -1411,10 +1442,9 @@ int aac_scsi_cmd(struct scsi_cmnd * scsicmd)
         }
         case MODE_SENSE_10:
         {
-                char *mode_buf;
+                char mode_buf[8];
 
                 dprintk((KERN_DEBUG "MODE SENSE 10 byte command.\n"));
-                mode_buf = scsicmd->request_buffer;
                 mode_buf[0] = 0;        /* Mode data length (MSB) */
                 mode_buf[1] = 6;        /* Mode data length (LSB) */
                 mode_buf[2] = 0;        /* Medium type - default */
@@ -1423,6 +1453,7 @@ int aac_scsi_cmd(struct scsi_cmnd * scsicmd)
                 mode_buf[5] = 0;        /* reserved */
                 mode_buf[6] = 0;        /* Block descriptor length (MSB) */
                 mode_buf[7] = 0;        /* Block descriptor length (LSB) */
+                aac_internal_transfer(scsicmd, mode_buf, 0, sizeof(mode_buf));
 
                 scsicmd->result = DID_OK << 16 | COMMAND_COMPLETE << 8 | SAM_STAT_GOOD;
                 scsicmd->scsi_done(scsicmd);
@@ -1894,7 +1925,7 @@ static int aac_send_srb_fib(struct scsi_cmnd* scsicmd)
         srbcmd->id   = cpu_to_le32(scsicmd->device->id);
         srbcmd->lun      = cpu_to_le32(scsicmd->device->lun);
         srbcmd->flags    = cpu_to_le32(flag);
-        timeout = (scsicmd->timeout-jiffies)/HZ;
+        timeout = scsicmd->timeout_per_command/HZ;
         if(timeout == 0){
                 timeout = 1;
         }
@@ -2077,6 +2108,76 @@ static unsigned long aac_build_sg64(struct scsi_cmnd* scsicmd, struct sgmap64* p
         return byte_count;
 }
 
+static unsigned long aac_build_sgraw(struct scsi_cmnd* scsicmd, struct sgmapraw* psg)
+{
+        struct Scsi_Host *host = scsicmd->device->host;
+        struct aac_dev *dev = (struct aac_dev *)host->hostdata;
+        unsigned long byte_count = 0;
+
+        // Get rid of old data
+        psg->count = 0;
+        psg->sg[0].next = 0;
+        psg->sg[0].prev = 0;
+        psg->sg[0].addr[0] = 0;
+        psg->sg[0].addr[1] = 0;
+        psg->sg[0].count = 0;
+        psg->sg[0].flags = 0;
+        if (scsicmd->use_sg) {
+                struct scatterlist *sg;
+                int i;
+                int sg_count;
+                sg = (struct scatterlist *) scsicmd->request_buffer;
+
+                sg_count = pci_map_sg(dev->pdev, sg, scsicmd->use_sg,
+                        scsicmd->sc_data_direction);
+
+                for (i = 0; i < sg_count; i++) {
+                        int count = sg_dma_len(sg);
+                        u64 addr = sg_dma_address(sg);
+                        psg->sg[i].next = 0;
+                        psg->sg[i].prev = 0;
+                        psg->sg[i].addr[1] = cpu_to_le32((u32)(addr>>32));
+                        psg->sg[i].addr[0] = cpu_to_le32((u32)(addr & 0xffffffff));
+                        psg->sg[i].count = cpu_to_le32(count);
+                        psg->sg[i].flags = 0;
+                        byte_count += count;
+                        sg++;
+                }
+                psg->count = cpu_to_le32(sg_count);
+                /* hba wants the size to be exact */
+                if(byte_count > scsicmd->request_bufflen){
+                        u32 temp = le32_to_cpu(psg->sg[i-1].count) - 
+                                (byte_count - scsicmd->request_bufflen);
+                        psg->sg[i-1].count = cpu_to_le32(temp);
+                        byte_count = scsicmd->request_bufflen;
+                }
+                /* Check for command underflow */
+                if(scsicmd->underflow && (byte_count < scsicmd->underflow)){
+                        printk(KERN_WARNING"aacraid: cmd len %08lX cmd underflow %08X\n",
+                                        byte_count, scsicmd->underflow);
+                }
+        }
+        else if(scsicmd->request_bufflen) {
+                int count;
+                u64 addr;
+                scsicmd->SCp.dma_handle = pci_map_single(dev->pdev,
+                                scsicmd->request_buffer,
+                                scsicmd->request_bufflen,
+                                scsicmd->sc_data_direction);
+                addr = scsicmd->SCp.dma_handle;
+                count = scsicmd->request_bufflen;
+                psg->count = cpu_to_le32(1);
+                psg->sg[0].next = 0;
+                psg->sg[0].prev = 0;
+                psg->sg[0].addr[1] = cpu_to_le32((u32)(addr>>32));
+                psg->sg[0].addr[0] = cpu_to_le32((u32)(addr & 0xffffffff));
+                psg->sg[0].count = cpu_to_le32(count);
+                psg->sg[0].flags = 0;
+                byte_count = scsicmd->request_bufflen;
+        }
+        return byte_count;
+}
+
 #ifdef AAC_DETAILED_STATUS_INFO
 
 struct aac_srb_status_info {
diff --git a/drivers/scsi/aacraid/aacraid.h b/drivers/scsi/aacraid/aacraid.h
index 4ab07861b45..e40528185d4 100644
--- a/drivers/scsi/aacraid/aacraid.h
+++ b/drivers/scsi/aacraid/aacraid.h
@@ -110,6 +110,22 @@ struct user_sgentry64 {
         u32     count;  /* Length. */
 };
 
+struct sgentryraw {
+        __le32          next;   /* reserved for F/W use */
+        __le32          prev;   /* reserved for F/W use */
+        __le32          addr[2];
+        __le32          count;
+        __le32          flags;  /* reserved for F/W use */
+};
+
+struct user_sgentryraw {
+        u32             next;   /* reserved for F/W use */
+        u32             prev;   /* reserved for F/W use */
+        u32             addr[2];
+        u32             count;
+        u32             flags;  /* reserved for F/W use */
+};
+
 /*
  *      SGMAP
  *
@@ -137,6 +153,16 @@ struct user_sgmap64 {
         struct user_sgentry64 sg[1];
 };
 
+struct sgmapraw {
+        __le32            count;
+        struct sgentryraw sg[1];
+};
+
+struct user_sgmapraw {
+        u32               count;
+        struct user_sgentryraw sg[1];
+};
+
 struct creation_info
 {
         u8              buildnum;               /* e.g., 588 */
@@ -351,6 +377,7 @@ struct hw_fib {
  */
 #define         ContainerCommand                500
 #define         ContainerCommand64              501
+#define         ContainerRawIo                  502
 /*
  *      Cluster Commands
  */
@@ -456,6 +483,7 @@ struct adapter_ops
 {
         void (*adapter_interrupt)(struct aac_dev *dev);
         void (*adapter_notify)(struct aac_dev *dev, u32 event);
+        void (*adapter_disable_int)(struct aac_dev *dev);
         int  (*adapter_sync_cmd)(struct aac_dev *dev, u32 command, u32 p1, u32 p2, u32 p3, u32 p4, u32 p5, u32 p6, u32 *status, u32 *r1, u32 *r2, u32 *r3, u32 *r4);
         int  (*adapter_check_health)(struct aac_dev *dev);
 };
@@ -981,6 +1009,9 @@ struct aac_dev
         u8                      nondasd_support; 
         u8                      dac_support;
         u8                      raid_scsi_mode;
+        /* macro side-effects BEWARE */
+#       define                  raw_io_interface \
+          init->InitStructRevision==cpu_to_le32(ADAPTER_INIT_STRUCT_REVISION_4)
         u8                      printf_enabled;
 };
 
@@ -990,6 +1021,9 @@ struct aac_dev
 #define aac_adapter_notify(dev, event) \
         (dev)->a_ops.adapter_notify(dev, event)
 
+#define aac_adapter_disable_int(dev) \
+        (dev)->a_ops.adapter_disable_int(dev)
+
 #define aac_adapter_sync_cmd(dev, command, p1, p2, p3, p4, p5, p6, status, r1, r2, r3, r4) \
         (dev)->a_ops.adapter_sync_cmd(dev, command, p1, p2, p3, p4, p5, p6, status, r1, r2, r3, r4)
 
@@ -1156,6 +1190,17 @@ struct aac_write_reply
         __le32          committed;
 };
 
+struct aac_raw_io
+{
+        __le32          block[2];
+        __le32          count;
+        __le16          cid;
+        __le16          flags;          /* 00 W, 01 R */
+        __le16          bpTotal;        /* reserved for F/W use */
+        __le16          bpComplete;     /* reserved for F/W use */
+        struct sgmapraw sg;
+};
+
 #define CT_FLUSH_CACHE 129
 struct aac_synchronize {
         __le32          command;        /* VM_ContainerConfig */
@@ -1196,7 +1241,7 @@ struct aac_srb
 };
 
 /*
- * This and assocated data structs are used by the 
+ * This and associated data structs are used by the
  * ioctl caller and are in cpu order.
  */
 struct user_aac_srb
@@ -1508,11 +1553,12 @@ struct fib_ioctl
 
 struct revision
 {
-        u32 compat;
-        u32 version;
-        u32 build;
+        __le32 compat;
+        __le32 version;
+        __le32 build;
 };
         
+
 /*
  *      Ugly - non Linux like ioctl coding for back compat.
  */
@@ -1733,3 +1779,4 @@ int aac_get_adapter_info(struct aac_dev* dev);
 int aac_send_shutdown(struct aac_dev *dev);
 extern int numacb;
 extern int acbsize;
+extern char aac_driver_version[];
diff --git a/drivers/scsi/aacraid/commctrl.c b/drivers/scsi/aacraid/commctrl.c
index 85387099aab..71f1cad9b5f 100644
--- a/drivers/scsi/aacraid/commctrl.c
+++ b/drivers/scsi/aacraid/commctrl.c
@@ -287,7 +287,6 @@ return_fib:
                 kfree(fib->hw_fib);
                 kfree(fib);
                 status = 0;
-                fibctx->jiffies = jiffies/HZ;
         } else {
                 spin_unlock_irqrestore(&dev->fib_lock, flags);
                 if (f.wait) {
@@ -302,6 +301,7 @@ return_fib:
                         status = -EAGAIN;
                 }       
         }
+        fibctx->jiffies = jiffies/HZ;
         return status;
 }
 
@@ -405,10 +405,20 @@ static int close_getadapter_fib(struct aac_dev * dev, void __user *arg)
 static int check_revision(struct aac_dev *dev, void __user *arg)
 {
         struct revision response;
-
-        response.compat = 1;
-        response.version = le32_to_cpu(dev->adapter_info.kernelrev);
-        response.build = le32_to_cpu(dev->adapter_info.kernelbuild);
+        char *driver_version = aac_driver_version;
+        u32 version;
+
+        response.compat = cpu_to_le32(1);
+        version = (simple_strtol(driver_version, 
+                                &driver_version, 10) << 24) | 0x00000400;
+        version += simple_strtol(driver_version + 1, &driver_version, 10) << 16;
+        version += simple_strtol(driver_version + 1, NULL, 10);
+        response.version = cpu_to_le32(version);
+#       if (defined(AAC_DRIVER_BUILD))
+                response.build = cpu_to_le32(AAC_DRIVER_BUILD);
+#       else
+                response.build = cpu_to_le32(9999);
+#       endif
 
         if (copy_to_user(arg, &response, sizeof(response)))
                 return -EFAULT;
diff --git a/drivers/scsi/aacraid/comminit.c b/drivers/scsi/aacraid/comminit.c
index 43557bf661f..75abd045328 100644
--- a/drivers/scsi/aacraid/comminit.c
+++ b/drivers/scsi/aacraid/comminit.c
@@ -44,7 +44,9 @@
 
 #include "aacraid.h"
 
-struct aac_common aac_config;
+struct aac_common aac_config = {
+        .irq_mod = 1
+};
 
 static int aac_alloc_comm(struct aac_dev *dev, void **commaddr, unsigned long commsize, unsigned long commalign)
 {
diff --git a/drivers/scsi/aacraid/commsup.c b/drivers/scsi/aacraid/commsup.c
index 5322865942e..a1d303f0348 100644
--- a/drivers/scsi/aacraid/commsup.c
+++ b/drivers/scsi/aacraid/commsup.c
@@ -254,6 +254,7 @@ static void fib_dealloc(struct fib * fibptr)
 static int aac_get_entry (struct aac_dev * dev, u32 qid, struct aac_entry **entry, u32 * index, unsigned long *nonotify)
 {
         struct aac_queue * q;
+        unsigned long idx;
 
         /*
          *      All of the queues wrap when they reach the end, so we check
@@ -263,10 +264,23 @@ static int aac_get_entry (struct aac_dev * dev, u32 qid, struct aac_entry **entr
          */
 
         q = &dev->queues->queue[qid];
-        
-        *index = le32_to_cpu(*(q->headers.producer));
-        if ((*index - 2) == le32_to_cpu(*(q->headers.consumer)))
+
+        idx = *index = le32_to_cpu(*(q->headers.producer));
+        /* Interrupt Moderation, only interrupt for first two entries */
+        if (idx != le32_to_cpu(*(q->headers.consumer))) {
+                if (--idx == 0) {
+                        if (qid == AdapHighCmdQueue)
+                                idx = ADAP_HIGH_CMD_ENTRIES;
+                        else if (qid == AdapNormCmdQueue)
+                                idx = ADAP_NORM_CMD_ENTRIES;
+                        else if (qid == AdapHighRespQueue) 
+                                idx = ADAP_HIGH_RESP_ENTRIES;
+                        else if (qid == AdapNormRespQueue) 
+                                idx = ADAP_NORM_RESP_ENTRIES;
+                }
+                if (idx != le32_to_cpu(*(q->headers.consumer)))
                         *nonotify = 1; 
+        }
 
         if (qid == AdapHighCmdQueue) {
                 if (*index >= ADAP_HIGH_CMD_ENTRIES)
diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c
index 562da90480a..4ff29d7f582 100644
--- a/drivers/scsi/aacraid/linit.c
+++ b/drivers/scsi/aacraid/linit.c
@@ -27,8 +27,11 @@
  * Abstract: Linux Driver entry module for Adaptec RAID Array Controller
  */
 
-#define AAC_DRIVER_VERSION              "1.1.2-lk2"
-#define AAC_DRIVER_BUILD_DATE           __DATE__
+#define AAC_DRIVER_VERSION              "1.1-4"
+#ifndef AAC_DRIVER_BRANCH
+#define AAC_DRIVER_BRANCH               ""
+#endif
+#define AAC_DRIVER_BUILD_DATE           __DATE__ " " __TIME__
 #define AAC_DRIVERNAME                  "aacraid"
 
 #include <linux/compat.h>
@@ -58,16 +61,24 @@
 
 #include "aacraid.h"
 
+#ifdef AAC_DRIVER_BUILD
+#define _str(x) #x
+#define str(x) _str(x)
+#define AAC_DRIVER_FULL_VERSION AAC_DRIVER_VERSION "[" str(AAC_DRIVER_BUILD) "]" AAC_DRIVER_BRANCH
+#else
+#define AAC_DRIVER_FULL_VERSION AAC_DRIVER_VERSION AAC_DRIVER_BRANCH " " AAC_DRIVER_BUILD_DATE
+#endif
 
 MODULE_AUTHOR("Red Hat Inc and Adaptec");
 MODULE_DESCRIPTION("Dell PERC2, 2/Si, 3/Si, 3/Di, "
                    "Adaptec Advanced Raid Products, "
                    "and HP NetRAID-4M SCSI driver");
 MODULE_LICENSE("GPL");
-MODULE_VERSION(AAC_DRIVER_VERSION);
+MODULE_VERSION(AAC_DRIVER_FULL_VERSION);
 
 static LIST_HEAD(aac_devices);
 static int aac_cfg_major = -1;
+char aac_driver_version[] = AAC_DRIVER_FULL_VERSION;
 
 /*
  * Because of the way Linux names scsi devices, the order in this table has
@@ -109,36 +120,39 @@ static struct pci_device_id aac_pci_tbl[] = {
         { 0x9005, 0x0286, 0x9005, 0x02a3, 0, 0, 29 }, /* ICP5085AU (Hurricane) */
         { 0x9005, 0x0285, 0x9005, 0x02a4, 0, 0, 30 }, /* ICP9085LI (Marauder-X) */
         { 0x9005, 0x0285, 0x9005, 0x02a5, 0, 0, 31 }, /* ICP5085BR (Marauder-E) */
-        { 0x9005, 0x0287, 0x9005, 0x0800, 0, 0, 32 }, /* Themisto Jupiter Platform */
-        { 0x9005, 0x0200, 0x9005, 0x0200, 0, 0, 32 }, /* Themisto Jupiter Platform */
-        { 0x9005, 0x0286, 0x9005, 0x0800, 0, 0, 33 }, /* Callisto Jupiter Platform */
-        { 0x9005, 0x0285, 0x9005, 0x028e, 0, 0, 34 }, /* ASR-2020SA SATA PCI-X ZCR (Skyhawk) */
-        { 0x9005, 0x0285, 0x9005, 0x028f, 0, 0, 35 }, /* ASR-2025SA SATA SO-DIMM PCI-X ZCR (Terminator) */
-        { 0x9005, 0x0285, 0x9005, 0x0290, 0, 0, 36 }, /* AAR-2410SA PCI SATA 4ch (Jaguar II) */
-        { 0x9005, 0x0285, 0x1028, 0x0291, 0, 0, 37 }, /* CERC SATA RAID 2 PCI SATA 6ch (DellCorsair) */
-        { 0x9005, 0x0285, 0x9005, 0x0292, 0, 0, 38 }, /* AAR-2810SA PCI SATA 8ch (Corsair-8) */
-        { 0x9005, 0x0285, 0x9005, 0x0293, 0, 0, 39 }, /* AAR-21610SA PCI SATA 16ch (Corsair-16) */
-        { 0x9005, 0x0285, 0x9005, 0x0294, 0, 0, 40 }, /* ESD SO-DIMM PCI-X SATA ZCR (Prowler) */
-        { 0x9005, 0x0285, 0x103C, 0x3227, 0, 0, 41 }, /* AAR-2610SA PCI SATA 6ch */
-        { 0x9005, 0x0285, 0x9005, 0x0296, 0, 0, 42 }, /* ASR-2240S (SabreExpress) */
-        { 0x9005, 0x0285, 0x9005, 0x0297, 0, 0, 43 }, /* ASR-4005SAS */
-        { 0x9005, 0x0285, 0x1014, 0x02F2, 0, 0, 44 }, /* IBM 8i (AvonPark) */
-        { 0x9005, 0x0285, 0x1014, 0x0312, 0, 0, 44 }, /* IBM 8i (AvonPark Lite) */
-        { 0x9005, 0x0285, 0x9005, 0x0298, 0, 0, 45 }, /* ASR-4000SAS (BlackBird) */
-        { 0x9005, 0x0285, 0x9005, 0x0299, 0, 0, 46 }, /* ASR-4800SAS (Marauder-X) */
-        { 0x9005, 0x0285, 0x9005, 0x029a, 0, 0, 47 }, /* ASR-4805SAS (Marauder-E) */
-        { 0x9005, 0x0286, 0x9005, 0x02a2, 0, 0, 48 }, /* ASR-4810SAS (Hurricane */
-
-        { 0x9005, 0x0285, 0x1028, 0x0287, 0, 0, 49 }, /* Perc 320/DC*/
-        { 0x1011, 0x0046, 0x9005, 0x0365, 0, 0, 50 }, /* Adaptec 5400S (Mustang)*/
-        { 0x1011, 0x0046, 0x9005, 0x0364, 0, 0, 51 }, /* Adaptec 5400S (Mustang)*/
-        { 0x1011, 0x0046, 0x9005, 0x1364, 0, 0, 52 }, /* Dell PERC2/QC */
-        { 0x1011, 0x0046, 0x103c, 0x10c2, 0, 0, 53 }, /* HP NetRAID-4M */
-
-        { 0x9005, 0x0285, 0x1028, PCI_ANY_ID, 0, 0, 54 }, /* Dell Catchall */
-        { 0x9005, 0x0285, 0x17aa, PCI_ANY_ID, 0, 0, 55 }, /* Legend Catchall */
-        { 0x9005, 0x0285, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 56 }, /* Adaptec Catch All */
-        { 0x9005, 0x0286, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 57 }, /* Adaptec Rocket Catch All */
+        { 0x9005, 0x0286, 0x9005, 0x02a6, 0, 0, 32 }, /* ICP9067MA (Intruder-6) */
+        { 0x9005, 0x0287, 0x9005, 0x0800, 0, 0, 33 }, /* Themisto Jupiter Platform */
+        { 0x9005, 0x0200, 0x9005, 0x0200, 0, 0, 33 }, /* Themisto Jupiter Platform */
+        { 0x9005, 0x0286, 0x9005, 0x0800, 0, 0, 34 }, /* Callisto Jupiter Platform */
+        { 0x9005, 0x0285, 0x9005, 0x028e, 0, 0, 35 }, /* ASR-2020SA SATA PCI-X ZCR (Skyhawk) */
+        { 0x9005, 0x0285, 0x9005, 0x028f, 0, 0, 36 }, /* ASR-2025SA SATA SO-DIMM PCI-X ZCR (Terminator) */
+        { 0x9005, 0x0285, 0x9005, 0x0290, 0, 0, 37 }, /* AAR-2410SA PCI SATA 4ch (Jaguar II) */
+        { 0x9005, 0x0285, 0x1028, 0x0291, 0, 0, 38 }, /* CERC SATA RAID 2 PCI SATA 6ch (DellCorsair) */
+        { 0x9005, 0x0285, 0x9005, 0x0292, 0, 0, 39 }, /* AAR-2810SA PCI SATA 8ch (Corsair-8) */
+        { 0x9005, 0x0285, 0x9005, 0x0293, 0, 0, 40 }, /* AAR-21610SA PCI SATA 16ch (Corsair-16) */
+        { 0x9005, 0x0285, 0x9005, 0x0294, 0, 0, 41 }, /* ESD SO-DIMM PCI-X SATA ZCR (Prowler) */
+        { 0x9005, 0x0285, 0x103C, 0x3227, 0, 0, 42 }, /* AAR-2610SA PCI SATA 6ch */
+        { 0x9005, 0x0285, 0x9005, 0x0296, 0, 0, 43 }, /* ASR-2240S (SabreExpress) */
+        { 0x9005, 0x0285, 0x9005, 0x0297, 0, 0, 44 }, /* ASR-4005SAS */
+        { 0x9005, 0x0285, 0x1014, 0x02F2, 0, 0, 45 }, /* IBM 8i (AvonPark) */
+        { 0x9005, 0x0285, 0x1014, 0x0312, 0, 0, 45 }, /* IBM 8i (AvonPark Lite) */
+        { 0x9005, 0x0286, 0x1014, 0x9580, 0, 0, 46 }, /* IBM 8k/8k-l8 (Aurora) */
+        { 0x9005, 0x0286, 0x1014, 0x9540, 0, 0, 47 }, /* IBM 8k/8k-l4 (Aurora Lite) */
+        { 0x9005, 0x0285, 0x9005, 0x0298, 0, 0, 48 }, /* ASR-4000SAS (BlackBird) */
+        { 0x9005, 0x0285, 0x9005, 0x0299, 0, 0, 49 }, /* ASR-4800SAS (Marauder-X) */
+        { 0x9005, 0x0285, 0x9005, 0x029a, 0, 0, 50 }, /* ASR-4805SAS (Marauder-E) */
+        { 0x9005, 0x0286, 0x9005, 0x02a2, 0, 0, 51 }, /* ASR-4810SAS (Hurricane */
+
+        { 0x9005, 0x0285, 0x1028, 0x0287, 0, 0, 52 }, /* Perc 320/DC*/
+        { 0x1011, 0x0046, 0x9005, 0x0365, 0, 0, 53 }, /* Adaptec 5400S (Mustang)*/
+        { 0x1011, 0x0046, 0x9005, 0x0364, 0, 0, 54 }, /* Adaptec 5400S (Mustang)*/
+        { 0x1011, 0x0046, 0x9005, 0x1364, 0, 0, 55 }, /* Dell PERC2/QC */
+        { 0x1011, 0x0046, 0x103c, 0x10c2, 0, 0, 56 }, /* HP NetRAID-4M */
+
+        { 0x9005, 0x0285, 0x1028, PCI_ANY_ID, 0, 0, 57 }, /* Dell Catchall */
+        { 0x9005, 0x0285, 0x17aa, PCI_ANY_ID, 0, 0, 58 }, /* Legend Catchall */
+        { 0x9005, 0x0285, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 59 }, /* Adaptec Catch All */
+        { 0x9005, 0x0286, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 60 }, /* Adaptec Rocket Catch All */
         { 0,}
 };
 MODULE_DEVICE_TABLE(pci, aac_pci_tbl);
@@ -180,8 +194,9 @@ static struct aac_driver_ident aac_drivers[] = {
         { aac_rkt_init, "aacraid",  "ICP     ", "ICP9047MA       ", 1 }, /* ICP9047MA (Lancer) */
         { aac_rkt_init, "aacraid",  "ICP     ", "ICP9087MA       ", 1 }, /* ICP9087MA (Lancer) */
         { aac_rkt_init, "aacraid",  "ICP     ", "ICP5085AU       ", 1 }, /* ICP5085AU (Hurricane) */
-        { aac_rkt_init, "aacraid",  "ICP     ", "ICP9085LI       ", 1 }, /* ICP9085LI (Marauder-X) */
-        { aac_rkt_init, "aacraid",  "ICP     ", "ICP5085BR       ", 1 }, /* ICP5085BR (Marauder-E) */
+        { aac_rx_init, "aacraid",  "ICP     ", "ICP9085LI       ", 1 }, /* ICP9085LI (Marauder-X) */
+        { aac_rx_init, "aacraid",  "ICP     ", "ICP5085BR       ", 1 }, /* ICP5085BR (Marauder-E) */
+        { aac_rkt_init, "aacraid",  "ICP     ", "ICP9067MA       ", 1 }, /* ICP9067MA (Intruder-6) */
         { NULL        , "aacraid",  "ADAPTEC ", "Themisto        ", 0, AAC_QUIRK_SLAVE }, /* Jupiter Platform */
         { aac_rkt_init, "aacraid",  "ADAPTEC ", "Callisto        ", 2, AAC_QUIRK_MASTER }, /* Jupiter Platform */
         { aac_rx_init, "aacraid",  "ADAPTEC ", "ASR-2020SA       ", 1 }, /* ASR-2020SA SATA PCI-X ZCR (Skyhawk) */
@@ -195,10 +210,12 @@ static struct aac_driver_ident aac_drivers[] = {
         { aac_rx_init, "aacraid",  "ADAPTEC ", "ASR-2240S       ", 1 }, /* ASR-2240S (SabreExpress) */
         { aac_rx_init, "aacraid",  "ADAPTEC ", "ASR-4005SAS     ", 1 }, /* ASR-4005SAS */
         { aac_rx_init, "ServeRAID","IBM     ", "ServeRAID 8i    ", 1 }, /* IBM 8i (AvonPark) */
+        { aac_rkt_init, "ServeRAID","IBM     ", "ServeRAID 8k-l8 ", 1 }, /* IBM 8k/8k-l8 (Aurora) */
+        { aac_rkt_init, "ServeRAID","IBM     ", "ServeRAID 8k-l4 ", 1 }, /* IBM 8k/8k-l4 (Aurora Lite) */
         { aac_rx_init, "aacraid",  "ADAPTEC ", "ASR-4000SAS     ", 1 }, /* ASR-4000SAS (BlackBird & AvonPark) */
         { aac_rx_init, "aacraid",  "ADAPTEC ", "ASR-4800SAS     ", 1 }, /* ASR-4800SAS (Marauder-X) */
         { aac_rx_init, "aacraid",  "ADAPTEC ", "ASR-4805SAS     ", 1 }, /* ASR-4805SAS (Marauder-E) */
-        { aac_rx_init, "aacraid",  "ADAPTEC ", "ASR-4810SAS     ", 1 }, /* ASR-4810SAS (Hurricane) */
+        { aac_rkt_init, "aacraid",  "ADAPTEC ", "ASR-4810SAS     ", 1 }, /* ASR-4810SAS (Hurricane) */
 
         { aac_rx_init, "percraid", "DELL    ", "PERC 320/DC     ", 2, AAC_QUIRK_31BIT | AAC_QUIRK_34SG }, /* Perc 320/DC*/
         { aac_sa_init, "aacraid",  "ADAPTEC ", "Adaptec 5400S   ", 4, AAC_QUIRK_34SG }, /* Adaptec 5400S (Mustang)*/
@@ -839,11 +856,12 @@ static int __devinit aac_probe_one(struct pci_dev *pdev,
 
         return 0;
 
-out_deinit:
+ out_deinit:
         kill_proc(aac->thread_pid, SIGKILL, 0);
         wait_for_completion(&aac->aif_completion);
 
         aac_send_shutdown(aac);
+        aac_adapter_disable_int(aac);
         fib_map_free(aac);
         pci_free_consistent(aac->pdev, aac->comm_size, aac->comm_addr, aac->comm_phys);
         kfree(aac->queues);
@@ -860,6 +878,13 @@ out_deinit:
         return error;
 }
 
+static void aac_shutdown(struct pci_dev *dev)
+{
+        struct Scsi_Host *shost = pci_get_drvdata(dev);
+        struct aac_dev *aac = (struct aac_dev *)shost->hostdata;
+        aac_send_shutdown(aac);
+}
+
 static void __devexit aac_remove_one(struct pci_dev *pdev)
 {
         struct Scsi_Host *shost = pci_get_drvdata(pdev);
@@ -871,6 +896,7 @@ static void __devexit aac_remove_one(struct pci_dev *pdev)
         wait_for_completion(&aac->aif_completion);
 
         aac_send_shutdown(aac);
+        aac_adapter_disable_int(aac);
         fib_map_free(aac);
         pci_free_consistent(aac->pdev, aac->comm_size, aac->comm_addr,
                         aac->comm_phys);
@@ -891,14 +917,15 @@ static struct pci_driver aac_pci_driver = {
         .id_table       = aac_pci_tbl,
         .probe          = aac_probe_one,
         .remove         = __devexit_p(aac_remove_one),
+        .shutdown       = aac_shutdown,
 };
 
 static int __init aac_init(void)
 {
         int error;
         
-        printk(KERN_INFO "Red Hat/Adaptec aacraid driver (%s %s)\n",
-                        AAC_DRIVER_VERSION, AAC_DRIVER_BUILD_DATE);
+        printk(KERN_INFO "Adaptec %s driver (%s)\n",
+          AAC_DRIVERNAME, aac_driver_version);
 
         error = pci_module_init(&aac_pci_driver);
         if (error)
@@ -909,6 +936,7 @@ static int __init aac_init(void)
                 printk(KERN_WARNING
                        "aacraid: unable to register \"aac\" device.\n");
         }
+
         return 0;
 }
 
diff --git a/drivers/scsi/aacraid/rkt.c b/drivers/scsi/aacraid/rkt.c
index 7d68b782513..557287a0b80 100644
--- a/drivers/scsi/aacraid/rkt.c
+++ b/drivers/scsi/aacraid/rkt.c
@@ -88,6 +88,16 @@ static irqreturn_t aac_rkt_intr(int irq, void *dev_id, struct pt_regs *regs)
 }
 
 /**
+ *      aac_rkt_disable_interrupt       -       Disable interrupts
+ *      @dev: Adapter
+ */
+
+static void aac_rkt_disable_interrupt(struct aac_dev *dev)
+{
+        rkt_writeb(dev, MUnit.OIMR, dev->OIMR = 0xff);
+}
+
+/**
  *      rkt_sync_cmd    -       send a command and wait
  *      @dev: Adapter
  *      @command: Command to execute
@@ -412,10 +422,19 @@ int aac_rkt_init(struct aac_dev *dev)
          *      Fill in the function dispatch table.
          */
         dev->a_ops.adapter_interrupt = aac_rkt_interrupt_adapter;
+        dev->a_ops.adapter_disable_int = aac_rkt_disable_interrupt;
         dev->a_ops.adapter_notify = aac_rkt_notify_adapter;
         dev->a_ops.adapter_sync_cmd = rkt_sync_cmd;
         dev->a_ops.adapter_check_health = aac_rkt_check_health;
 
+        /*
+         *      First clear out all interrupts.  Then enable the one's that we
+         *      can handle.
+         */
+        rkt_writeb(dev, MUnit.OIMR, 0xff);
+        rkt_writel(dev, MUnit.ODR, 0xffffffff);
+        rkt_writeb(dev, MUnit.OIMR, dev->OIMR = 0xfb);
+
         if (aac_init_adapter(dev) == NULL)
                 goto error_irq;
         /*
@@ -438,6 +457,7 @@ error_kfree:
         kfree(dev->queues);
 
 error_irq:
+        rkt_writeb(dev, MUnit.OIMR, dev->OIMR = 0xff);
         free_irq(dev->scsi_host_ptr->irq, (void *)dev);
 
 error_iounmap:
diff --git a/drivers/scsi/aacraid/rx.c b/drivers/scsi/aacraid/rx.c
index 1ff25f49fad..a8459faf87c 100644
--- a/drivers/scsi/aacraid/rx.c
+++ b/drivers/scsi/aacraid/rx.c
@@ -88,6 +88,16 @@ static irqreturn_t aac_rx_intr(int irq, void *dev_id, struct pt_regs *regs)
 }
 
 /**
+ *      aac_rx_disable_interrupt        -       Disable interrupts
+ *      @dev: Adapter
+ */
+
+static void aac_rx_disable_interrupt(struct aac_dev *dev)
+{
+        rx_writeb(dev, MUnit.OIMR, dev->OIMR = 0xff);
+}
+
+/**
  *      rx_sync_cmd     -       send a command and wait
  *      @dev: Adapter
  *      @command: Command to execute
@@ -412,10 +422,19 @@ int aac_rx_init(struct aac_dev *dev)
          *      Fill in the function dispatch table.
          */
         dev->a_ops.adapter_interrupt = aac_rx_interrupt_adapter;
+        dev->a_ops.adapter_disable_int = aac_rx_disable_interrupt;
         dev->a_ops.adapter_notify = aac_rx_notify_adapter;
         dev->a_ops.adapter_sync_cmd = rx_sync_cmd;
         dev->a_ops.adapter_check_health = aac_rx_check_health;
 
+        /*
+         *      First clear out all interrupts.  Then enable the one's that we
+         *      can handle.
+         */
+        rx_writeb(dev, MUnit.OIMR, 0xff);
+        rx_writel(dev, MUnit.ODR, 0xffffffff);
+        rx_writeb(dev, MUnit.OIMR, dev->OIMR = 0xfb);
+
         if (aac_init_adapter(dev) == NULL)
                 goto error_irq;
         /*
@@ -438,6 +457,7 @@ error_kfree:
         kfree(dev->queues);
 
 error_irq:
+        rx_writeb(dev, MUnit.OIMR, dev->OIMR = 0xff);
         free_irq(dev->scsi_host_ptr->irq, (void *)dev);
 
 error_iounmap:
diff --git a/drivers/scsi/aacraid/sa.c b/drivers/scsi/aacraid/sa.c
index 0680249ab86..3900abc5850 100644
--- a/drivers/scsi/aacraid/sa.c
+++ b/drivers/scsi/aacraid/sa.c
@@ -82,6 +82,16 @@ static irqreturn_t aac_sa_intr(int irq, void *dev_id, struct pt_regs *regs)
 }
 
 /**
+ *      aac_sa_disable_interrupt        -       disable interrupt
+ *      @dev: Which adapter to enable.
+ */
+
+static void aac_sa_disable_interrupt (struct aac_dev *dev)
+{
+        sa_writew(dev, SaDbCSR.PRISETIRQMASK, 0xffff);
+}
+
+/**
  *      aac_sa_notify_adapter           -       handle adapter notification
  *      @dev:   Adapter that notification is for
  *      @event: Event to notidy
@@ -214,9 +224,8 @@ static int sa_sync_cmd(struct aac_dev *dev, u32 command,
  
 static void aac_sa_interrupt_adapter (struct aac_dev *dev)
 {
-        u32 ret;
         sa_sync_cmd(dev, BREAKPOINT_REQUEST, 0, 0, 0, 0, 0, 0,
-                        &ret, NULL, NULL, NULL, NULL);
+                        NULL, NULL, NULL, NULL, NULL);
 }
 
 /**
@@ -352,10 +361,18 @@ int aac_sa_init(struct aac_dev *dev)
          */
 
         dev->a_ops.adapter_interrupt = aac_sa_interrupt_adapter;
+        dev->a_ops.adapter_disable_int = aac_sa_disable_interrupt;
         dev->a_ops.adapter_notify = aac_sa_notify_adapter;
         dev->a_ops.adapter_sync_cmd = sa_sync_cmd;
         dev->a_ops.adapter_check_health = aac_sa_check_health;
 
+        /*
+         *      First clear out all interrupts.  Then enable the one's that 
+         *      we can handle.
+         */
+        sa_writew(dev, SaDbCSR.PRISETIRQMASK, 0xffff);
+        sa_writew(dev, SaDbCSR.PRICLEARIRQMASK, (PrintfReady | DOORBELL_1 | 
+                                DOORBELL_2 | DOORBELL_3 | DOORBELL_4));
 
         if(aac_init_adapter(dev) == NULL)
                 goto error_irq;
@@ -381,6 +398,7 @@ error_kfree:
         kfree(dev->queues);
 
 error_irq:
+        sa_writew(dev, SaDbCSR.PRISETIRQMASK, 0xffff);
         free_irq(dev->scsi_host_ptr->irq, (void *)dev);
 
 error_iounmap:
diff --git a/drivers/scsi/advansys.c b/drivers/scsi/advansys.c
index 0fb93363eb2..37ec5411e32 100644
--- a/drivers/scsi/advansys.c
+++ b/drivers/scsi/advansys.c
@@ -9200,8 +9200,8 @@ asc_prt_scsi_cmnd(struct scsi_cmnd *s)
         (unsigned) s->serial_number, s->retries, s->allowed);
 
     printk(
-" timeout_per_command %d, timeout_total %d, timeout %d\n",
-        s->timeout_per_command, s->timeout_total, s->timeout);
+" timeout_per_command %d\n",
+        s->timeout_per_command);
 
     printk(
 " scsi_done 0x%lx, done 0x%lx, host_scribble 0x%lx, result 0x%x\n",
diff --git a/drivers/scsi/ahci.c b/drivers/scsi/ahci.c
index 179c95c878a..320df6cd3de 100644
--- a/drivers/scsi/ahci.c
+++ b/drivers/scsi/ahci.c
@@ -189,7 +189,6 @@ static void ahci_irq_clear(struct ata_port *ap);
 static void ahci_eng_timeout(struct ata_port *ap);
 static int ahci_port_start(struct ata_port *ap);
 static void ahci_port_stop(struct ata_port *ap);
-static void ahci_host_stop(struct ata_host_set *host_set);
 static void ahci_tf_read(struct ata_port *ap, struct ata_taskfile *tf);
 static void ahci_qc_prep(struct ata_queued_cmd *qc);
 static u8 ahci_check_status(struct ata_port *ap);
@@ -242,7 +241,6 @@ static struct ata_port_operations ahci_ops = {
 
         .port_start             = ahci_port_start,
         .port_stop              = ahci_port_stop,
-        .host_stop              = ahci_host_stop,
 };
 
 static struct ata_port_info ahci_port_info[] = {
@@ -252,7 +250,7 @@ static struct ata_port_info ahci_port_info[] = {
                 .host_flags     = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
                                   ATA_FLAG_SATA_RESET | ATA_FLAG_MMIO |
                                   ATA_FLAG_PIO_DMA,
-                .pio_mask       = 0x03, /* pio3-4 */
+                .pio_mask       = 0x1f, /* pio0-4 */
                 .udma_mask      = 0x7f, /* udma0-6 ; FIXME */
                 .port_ops       = &ahci_ops,
         },
@@ -296,17 +294,9 @@ static inline unsigned long ahci_port_base_ul (unsigned long base, unsigned int
         return base + 0x100 + (port * 0x80);
 }
 
-static inline void *ahci_port_base (void *base, unsigned int port)
+static inline void __iomem *ahci_port_base (void __iomem *base, unsigned int port)
 {
-        return (void *) ahci_port_base_ul((unsigned long)base, port);
-}
-
-static void ahci_host_stop(struct ata_host_set *host_set)
-{
-        struct ahci_host_priv *hpriv = host_set->private_data;
-        kfree(hpriv);
-
-        ata_host_stop(host_set);
+        return (void __iomem *) ahci_port_base_ul((unsigned long)base, port);
 }
 
 static int ahci_port_start(struct ata_port *ap)
@@ -314,8 +304,9 @@ static int ahci_port_start(struct ata_port *ap)
         struct device *dev = ap->host_set->dev;
         struct ahci_host_priv *hpriv = ap->host_set->private_data;
         struct ahci_port_priv *pp;
-        void *mem, *mmio = ap->host_set->mmio_base;
-        void *port_mmio = ahci_port_base(mmio, ap->port_no);
+        void __iomem *mmio = ap->host_set->mmio_base;
+        void __iomem *port_mmio = ahci_port_base(mmio, ap->port_no);
+        void *mem;
         dma_addr_t mem_dma;
 
         pp = kmalloc(sizeof(*pp), GFP_KERNEL);
@@ -383,8 +374,8 @@ static void ahci_port_stop(struct ata_port *ap)
 {
         struct device *dev = ap->host_set->dev;
         struct ahci_port_priv *pp = ap->private_data;
-        void *mmio = ap->host_set->mmio_base;
-        void *port_mmio = ahci_port_base(mmio, ap->port_no);
+        void __iomem *mmio = ap->host_set->mmio_base;
+        void __iomem *port_mmio = ahci_port_base(mmio, ap->port_no);
         u32 tmp;
 
         tmp = readl(port_mmio + PORT_CMD);
@@ -546,8 +537,8 @@ static void ahci_qc_prep(struct ata_queued_cmd *qc)
 
 static void ahci_intr_error(struct ata_port *ap, u32 irq_stat)
 {
-        void *mmio = ap->host_set->mmio_base;
-        void *port_mmio = ahci_port_base(mmio, ap->port_no);
+        void __iomem *mmio = ap->host_set->mmio_base;
+        void __iomem *port_mmio = ahci_port_base(mmio, ap->port_no);
         u32 tmp;
         int work;
 
@@ -595,8 +586,8 @@ static void ahci_intr_error(struct ata_port *ap, u32 irq_stat)
 static void ahci_eng_timeout(struct ata_port *ap)
 {
         struct ata_host_set *host_set = ap->host_set;
-        void *mmio = host_set->mmio_base;
-        void *port_mmio = ahci_port_base(mmio, ap->port_no);
+        void __iomem *mmio = host_set->mmio_base;
+        void __iomem *port_mmio = ahci_port_base(mmio, ap->port_no);
         struct ata_queued_cmd *qc;
         unsigned long flags;
 
@@ -626,8 +617,8 @@ static void ahci_eng_timeout(struct ata_port *ap)
 
 static inline int ahci_host_intr(struct ata_port *ap, struct ata_queued_cmd *qc)
 {
-        void *mmio = ap->host_set->mmio_base;
-        void *port_mmio = ahci_port_base(mmio, ap->port_no);
+        void __iomem *mmio = ap->host_set->mmio_base;
+        void __iomem *port_mmio = ahci_port_base(mmio, ap->port_no);
         u32 status, serr, ci;
 
         serr = readl(port_mmio + PORT_SCR_ERR);
@@ -663,7 +654,7 @@ static irqreturn_t ahci_interrupt (int irq, void *dev_instance, struct pt_regs *
         struct ata_host_set *host_set = dev_instance;
         struct ahci_host_priv *hpriv;
         unsigned int i, handled = 0;
-        void *mmio;
+        void __iomem *mmio;
         u32 irq_stat, irq_ack = 0;
 
         VPRINTK("ENTER\n");
@@ -709,7 +700,7 @@ static irqreturn_t ahci_interrupt (int irq, void *dev_instance, struct pt_regs *
 static int ahci_qc_issue(struct ata_queued_cmd *qc)
 {
         struct ata_port *ap = qc->ap;
-        void *port_mmio = (void *) ap->ioaddr.cmd_addr;
+        void __iomem *port_mmio = (void __iomem *) ap->ioaddr.cmd_addr;
 
         writel(1, port_mmio + PORT_CMD_ISSUE);
         readl(port_mmio + PORT_CMD_ISSUE);      /* flush */
@@ -894,7 +885,7 @@ static void ahci_print_info(struct ata_probe_ent *probe_ent)
 {
         struct ahci_host_priv *hpriv = probe_ent->private_data;
         struct pci_dev *pdev = to_pci_dev(probe_ent->dev);
-        void *mmio = probe_ent->mmio_base;
+        void __iomem *mmio = probe_ent->mmio_base;
         u32 vers, cap, impl, speed;
         const char *speed_s;
         u16 cc;
@@ -967,7 +958,7 @@ static int ahci_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
         struct ata_probe_ent *probe_ent = NULL;
         struct ahci_host_priv *hpriv;
         unsigned long base;
-        void *mmio_base;
+        void __iomem *mmio_base;
         unsigned int board_idx = (unsigned int) ent->driver_data;
         int have_msi, pci_dev_busy = 0;
         int rc;
@@ -1004,8 +995,7 @@ static int ahci_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
         probe_ent->dev = pci_dev_to_dev(pdev);
         INIT_LIST_HEAD(&probe_ent->node);
 
-        mmio_base = ioremap(pci_resource_start(pdev, AHCI_PCI_BAR),
-                            pci_resource_len(pdev, AHCI_PCI_BAR));
+        mmio_base = pci_iomap(pdev, AHCI_PCI_BAR, 0);
         if (mmio_base == NULL) {
                 rc = -ENOMEM;
                 goto err_out_free_ent;
@@ -1049,7 +1039,7 @@ static int ahci_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
 err_out_hpriv:
         kfree(hpriv);
 err_out_iounmap:
-        iounmap(mmio_base);
+        pci_iounmap(pdev, mmio_base);
 err_out_free_ent:
         kfree(probe_ent);
 err_out_msi:
@@ -1089,7 +1079,8 @@ static void ahci_remove_one (struct pci_dev *pdev)
                 scsi_host_put(ap->host);
         }
 
-        host_set->ops->host_stop(host_set);
+        kfree(hpriv);
+        pci_iounmap(pdev, host_set->mmio_base);
         kfree(host_set);
 
         if (have_msi)
@@ -1106,7 +1097,6 @@ static int __init ahci_init(void)
         return pci_module_init(&ahci_pci_driver);
 }
 
-
 static void __exit ahci_exit(void)
 {
         pci_unregister_driver(&ahci_pci_driver);
diff --git a/drivers/scsi/aic7xxx/Kconfig.aic79xx b/drivers/scsi/aic7xxx/Kconfig.aic79xx
index c2523a30a7f..69ed77fcb71 100644
--- a/drivers/scsi/aic7xxx/Kconfig.aic79xx
+++ b/drivers/scsi/aic7xxx/Kconfig.aic79xx
@@ -5,6 +5,7 @@
 config SCSI_AIC79XX
         tristate "Adaptec AIC79xx U320 support"
         depends on PCI && SCSI
+        select SCSI_SPI_ATTRS
         help
         This driver supports all of Adaptec's Ultra 320 PCI-X
         based SCSI controllers.
diff --git a/drivers/scsi/aic7xxx/aic7770.c b/drivers/scsi/aic7xxx/aic7770.c
index 00f3bd1e181..527efd36f5c 100644
--- a/drivers/scsi/aic7xxx/aic7770.c
+++ b/drivers/scsi/aic7xxx/aic7770.c
@@ -126,7 +126,6 @@ aic7770_find_device(uint32_t id)
 int
 aic7770_config(struct ahc_softc *ahc, struct aic7770_identity *entry, u_int io)
 {
-        u_long  l;
         int     error;
         int     have_seeprom;
         u_int   hostconf;
diff --git a/drivers/scsi/aic7xxx/aic79xx.h b/drivers/scsi/aic7xxx/aic79xx.h
index fd4b2f3eb0c..653fb0b42ae 100644
--- a/drivers/scsi/aic7xxx/aic79xx.h
+++ b/drivers/scsi/aic7xxx/aic79xx.h
@@ -1247,9 +1247,6 @@ struct ahd_softc {
         uint16_t                  user_tagenable;/* Tagged Queuing allowed */
 };
 
-TAILQ_HEAD(ahd_softc_tailq, ahd_softc);
-extern struct ahd_softc_tailq ahd_tailq;
-
 /*************************** IO Cell Configuration ****************************/
 #define AHD_PRECOMP_SLEW_INDEX                                          \
     (AHD_ANNEXCOL_PRECOMP_SLEW - AHD_ANNEXCOL_PER_DEV0)
@@ -1374,8 +1371,6 @@ void			 ahd_enable_coalescing(struct ahd_softc *ahd,
 void                     ahd_pause_and_flushwork(struct ahd_softc *ahd);
 int                      ahd_suspend(struct ahd_softc *ahd); 
 int                      ahd_resume(struct ahd_softc *ahd);
-void                     ahd_softc_insert(struct ahd_softc *);
-struct ahd_softc        *ahd_find_softc(struct ahd_softc *ahd);
 void                     ahd_set_unit(struct ahd_softc *, int);
 void                     ahd_set_name(struct ahd_softc *, char *);
 struct scb              *ahd_get_scb(struct ahd_softc *ahd, u_int col_idx);
@@ -1524,7 +1519,6 @@ void			ahd_print_scb(struct scb *scb);
 void                    ahd_print_devinfo(struct ahd_softc *ahd,
                                           struct ahd_devinfo *devinfo);
 void                    ahd_dump_sglist(struct scb *scb);
-void                    ahd_dump_all_cards_state(void);
 void                    ahd_dump_card_state(struct ahd_softc *ahd);
 int                     ahd_print_register(ahd_reg_parse_entry_t *table,
                                            u_int num_entries,
diff --git a/drivers/scsi/aic7xxx/aic79xx_core.c b/drivers/scsi/aic7xxx/aic79xx_core.c
index 137fb1a37dd..4e8f00df978 100644
--- a/drivers/scsi/aic7xxx/aic79xx_core.c
+++ b/drivers/scsi/aic7xxx/aic79xx_core.c
@@ -52,8 +52,6 @@
 #include <dev/aic7xxx/aicasm/aicasm_insformat.h>
 #endif
 
-/******************************** Globals *************************************/
-struct ahd_softc_tailq ahd_tailq = TAILQ_HEAD_INITIALIZER(ahd_tailq);
 
 /***************************** Lookup Tables **********************************/
 char *ahd_chip_names[] =
@@ -5180,74 +5178,6 @@ ahd_softc_init(struct ahd_softc *ahd)
 }
 
 void
-ahd_softc_insert(struct ahd_softc *ahd)
-{
-        struct ahd_softc *list_ahd;
-
-#if AHD_PCI_CONFIG > 0
-        /*
-         * Second Function PCI devices need to inherit some
-         * settings from function 0.
-         */
-        if ((ahd->features & AHD_MULTI_FUNC) != 0) {
-                TAILQ_FOREACH(list_ahd, &ahd_tailq, links) {
-                        ahd_dev_softc_t list_pci;
-                        ahd_dev_softc_t pci;
-
-                        list_pci = list_ahd->dev_softc;
-                        pci = ahd->dev_softc;
-                        if (ahd_get_pci_slot(list_pci) == ahd_get_pci_slot(pci)
-                         && ahd_get_pci_bus(list_pci) == ahd_get_pci_bus(pci)) {
-                                struct ahd_softc *master;
-                                struct ahd_softc *slave;
-
-                                if (ahd_get_pci_function(list_pci) == 0) {
-                                        master = list_ahd;
-                                        slave = ahd;
-                                } else {
-                                        master = ahd;
-                                        slave = list_ahd;
-                                }
-                                slave->flags &= ~AHD_BIOS_ENABLED; 
-                                slave->flags |=
-                                    master->flags & AHD_BIOS_ENABLED;
-                                break;
-                        }
-                }
-        }
-#endif
-
-        /*
-         * Insertion sort into our list of softcs.
-         */
-        list_ahd = TAILQ_FIRST(&ahd_tailq);
-        while (list_ahd != NULL
-            && ahd_softc_comp(ahd, list_ahd) <= 0)
-                list_ahd = TAILQ_NEXT(list_ahd, links);
-        if (list_ahd != NULL)
-                TAILQ_INSERT_BEFORE(list_ahd, ahd, links);
-        else
-                TAILQ_INSERT_TAIL(&ahd_tailq, ahd, links);
-        ahd->init_level++;
-}
-
-/*
- * Verify that the passed in softc pointer is for a
- * controller that is still configured.
- */
-struct ahd_softc *
-ahd_find_softc(struct ahd_softc *ahd)
-{
-        struct ahd_softc *list_ahd;
-
-        TAILQ_FOREACH(list_ahd, &ahd_tailq, links) {
-                if (list_ahd == ahd)
-                        return (ahd);
-        }
-        return (NULL);
-}
-
-void
 ahd_set_unit(struct ahd_softc *ahd, int unit)
 {
         ahd->unit = unit;
@@ -7902,18 +7832,10 @@ ahd_reset_channel(struct ahd_softc *ahd, char channel, int initiate_reset)
 static void
 ahd_reset_poll(void *arg)
 {
-        struct  ahd_softc *ahd;
+        struct  ahd_softc *ahd = arg;
         u_int   scsiseq1;
-        u_long  l;
         u_long  s;
         
-        ahd_list_lock(&l);
-        ahd = ahd_find_softc((struct ahd_softc *)arg);
-        if (ahd == NULL) {
-                printf("ahd_reset_poll: Instance %p no longer exists\n", arg);
-                ahd_list_unlock(&l);
-                return;
-        }
         ahd_lock(ahd, &s);
         ahd_pause(ahd);
         ahd_update_modes(ahd);
@@ -7924,7 +7846,6 @@ ahd_reset_poll(void *arg)
                                 ahd_reset_poll, ahd);
                 ahd_unpause(ahd);
                 ahd_unlock(ahd, &s);
-                ahd_list_unlock(&l);
                 return;
         }
 
@@ -7936,25 +7857,16 @@ ahd_reset_poll(void *arg)
         ahd->flags &= ~AHD_RESET_POLL_ACTIVE;
         ahd_unlock(ahd, &s);
         ahd_release_simq(ahd);
-        ahd_list_unlock(&l);
 }
 
 /**************************** Statistics Processing ***************************/
 static void
 ahd_stat_timer(void *arg)
 {
-        struct  ahd_softc *ahd;
-        u_long  l;
+        struct  ahd_softc *ahd = arg;
         u_long  s;
         int     enint_coal;
         
-        ahd_list_lock(&l);
-        ahd = ahd_find_softc((struct ahd_softc *)arg);
-        if (ahd == NULL) {
-                printf("ahd_stat_timer: Instance %p no longer exists\n", arg);
-                ahd_list_unlock(&l);
-                return;
-        }
         ahd_lock(ahd, &s);
 
         enint_coal = ahd->hs_mailbox & ENINT_COALESCE;
@@ -7981,7 +7893,6 @@ ahd_stat_timer(void *arg)
         ahd_timer_reset(&ahd->stat_timer, AHD_STAT_UPDATE_US,
                         ahd_stat_timer, ahd);
         ahd_unlock(ahd, &s);
-        ahd_list_unlock(&l);
 }
 
 /****************************** Status Processing *****************************/
@@ -8745,16 +8656,6 @@ sized:
         return (last_probe);
 }
 
-void
-ahd_dump_all_cards_state(void)
-{
-        struct ahd_softc *list_ahd;
-
-        TAILQ_FOREACH(list_ahd, &ahd_tailq, links) {
-                ahd_dump_card_state(list_ahd);
-        }
-}
-
 int
 ahd_print_register(ahd_reg_parse_entry_t *table, u_int num_entries,
                    const char *name, u_int address, u_int value,
@@ -9039,7 +8940,6 @@ ahd_dump_card_state(struct ahd_softc *ahd)
                 ahd_outb(ahd, STACK, (ahd->saved_stack[i] >> 8) & 0xFF);
         }
         printf("\n<<<<<<<<<<<<<<<<< Dump Card State Ends >>>>>>>>>>>>>>>>>>\n");
-        ahd_platform_dump_card_state(ahd);
         ahd_restore_modes(ahd, saved_modes);
         if (paused == 0)
                 ahd_unpause(ahd);
diff --git a/drivers/scsi/aic7xxx/aic79xx_osm.c b/drivers/scsi/aic7xxx/aic79xx_osm.c
index 329cb233133..6b6d4e28779 100644
--- a/drivers/scsi/aic7xxx/aic79xx_osm.c
+++ b/drivers/scsi/aic7xxx/aic79xx_osm.c
@@ -46,32 +46,14 @@
 #include "aic79xx_inline.h"
 #include <scsi/scsicam.h>
 
-/*
- * Include aiclib.c as part of our
- * "module dependencies are hard" work around.
- */
-#include "aiclib.c"
+static struct scsi_transport_template *ahd_linux_transport_template = NULL;
 
 #include <linux/init.h>         /* __setup */
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-#include "sd.h"                 /* For geometry detection */
-#endif
-
 #include <linux/mm.h>           /* For fetching system memory size */
+#include <linux/blkdev.h>               /* For block_size() */
 #include <linux/delay.h>        /* For ssleep/msleep */
 
 /*
- * Lock protecting manipulation of the ahd softc list.
- */
-spinlock_t ahd_list_spinlock;
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-/* For dynamic sglist size calculation. */
-u_int ahd_linux_nseg;
-#endif
-
-/*
  * Bucket size for counting good commands in between bad ones.
  */
 #define AHD_LINUX_ERR_THRESH    1000
@@ -188,71 +170,6 @@ static adapter_tag_info_t aic79xx_tag_info[] =
 };
 
 /*
- * By default, read streaming is disabled.  In theory,
- * read streaming should enhance performance, but early
- * U320 drive firmware actually performs slower with
- * read streaming enabled.
- */
-#ifdef CONFIG_AIC79XX_ENABLE_RD_STRM
-#define AIC79XX_CONFIGED_RD_STRM 0xFFFF
-#else
-#define AIC79XX_CONFIGED_RD_STRM 0
-#endif
-
-static uint16_t aic79xx_rd_strm_info[] =
-{
-        AIC79XX_CONFIGED_RD_STRM,
-        AIC79XX_CONFIGED_RD_STRM,
-        AIC79XX_CONFIGED_RD_STRM,
-        AIC79XX_CONFIGED_RD_STRM,
-        AIC79XX_CONFIGED_RD_STRM,
-        AIC79XX_CONFIGED_RD_STRM,
-        AIC79XX_CONFIGED_RD_STRM,
-        AIC79XX_CONFIGED_RD_STRM,
-        AIC79XX_CONFIGED_RD_STRM,
-        AIC79XX_CONFIGED_RD_STRM,
-        AIC79XX_CONFIGED_RD_STRM,
-        AIC79XX_CONFIGED_RD_STRM,
-        AIC79XX_CONFIGED_RD_STRM,
-        AIC79XX_CONFIGED_RD_STRM,
-        AIC79XX_CONFIGED_RD_STRM,
-        AIC79XX_CONFIGED_RD_STRM
-};
-
-/*
- * DV option:
- *
- * positive value = DV Enabled
- * zero           = DV Disabled
- * negative value = DV Default for adapter type/seeprom
- */
-#ifdef CONFIG_AIC79XX_DV_SETTING
-#define AIC79XX_CONFIGED_DV CONFIG_AIC79XX_DV_SETTING
-#else
-#define AIC79XX_CONFIGED_DV -1
-#endif
-
-static int8_t aic79xx_dv_settings[] =
-{
-        AIC79XX_CONFIGED_DV,
-        AIC79XX_CONFIGED_DV,
-        AIC79XX_CONFIGED_DV,
-        AIC79XX_CONFIGED_DV,
-        AIC79XX_CONFIGED_DV,
-        AIC79XX_CONFIGED_DV,
-        AIC79XX_CONFIGED_DV,
-        AIC79XX_CONFIGED_DV,
-        AIC79XX_CONFIGED_DV,
-        AIC79XX_CONFIGED_DV,
-        AIC79XX_CONFIGED_DV,
-        AIC79XX_CONFIGED_DV,
-        AIC79XX_CONFIGED_DV,
-        AIC79XX_CONFIGED_DV,
-        AIC79XX_CONFIGED_DV,
-        AIC79XX_CONFIGED_DV
-};
-
-/*
  * The I/O cell on the chip is very configurable in respect to its analog
  * characteristics.  Set the defaults here; they can be overriden with
  * the proper insmod parameters.
@@ -375,13 +292,6 @@ static uint32_t aic79xx_pci_parity = ~0;
 uint32_t aic79xx_allow_memio = ~0;
 
 /*
- * aic79xx_detect() has been run, so register all device arrivals
- * immediately with the system rather than deferring to the sorted
- * attachment performed by aic79xx_detect().
- */
-int aic79xx_detect_complete;
-
-/*
  * So that we can set how long each device is given as a selection timeout.
  * The table of values goes like this:
  *   0 - 256ms
@@ -412,7 +322,7 @@ MODULE_AUTHOR("Maintainer: Justin T. Gibbs <gibbs@scsiguy.com>");
 MODULE_DESCRIPTION("Adaptec Aic790X U320 SCSI Host Bus Adapter driver");
 MODULE_LICENSE("Dual BSD/GPL");
 MODULE_VERSION(AIC79XX_DRIVER_VERSION);
-module_param(aic79xx, charp, 0);
+module_param(aic79xx, charp, 0444);
 MODULE_PARM_DESC(aic79xx,
 "period delimited, options string.\n"
 "       verbose                 Enable verbose/diagnostic logging\n"
@@ -427,8 +337,6 @@ MODULE_PARM_DESC(aic79xx,
 "       reverse_scan            Sort PCI devices highest Bus/Slot to lowest\n"
 "       tag_info:<tag_str>      Set per-target tag depth\n"
 "       global_tag_depth:<int>  Global tag depth for all targets on all buses\n"
-"       rd_strm:<rd_strm_masks> Set per-target read streaming setting.\n"
-"       dv:<dv_settings>        Set per-controller Domain Validation Setting.\n"
 "       slewrate:<slewrate_list>Set the signal slew rate (0-15).\n"
 "       precomp:<pcomp_list>    Set the signal precompensation (0-7).\n"
 "       amplitude:<int>         Set the signal amplitude (0-7).\n"
@@ -441,249 +349,35 @@ MODULE_PARM_DESC(aic79xx,
 "               Shorten the selection timeout to 128ms\n"
 "\n"
 "       options aic79xx 'aic79xx=verbose.tag_info:{{}.{}.{..10}}.seltime:1'\n"
-"\n"
-"       Sample /etc/modprobe.conf line:\n"
-"               Change Read Streaming for Controller's 2 and 3\n"
-"\n"
-"       options aic79xx 'aic79xx=rd_strm:{..0xFFF0.0xC0F0}'");
+"\n");
 
 static void ahd_linux_handle_scsi_status(struct ahd_softc *,
-                                         struct ahd_linux_device *,
+                                         struct scsi_device *,
                                          struct scb *);
 static void ahd_linux_queue_cmd_complete(struct ahd_softc *ahd,
-                                         Scsi_Cmnd *cmd);
-static void ahd_linux_filter_inquiry(struct ahd_softc *ahd,
-                                     struct ahd_devinfo *devinfo);
-static void ahd_linux_dev_timed_unfreeze(u_long arg);
+                                         struct scsi_cmnd *cmd);
 static void ahd_linux_sem_timeout(u_long arg);
+static int  ahd_linux_queue_recovery_cmd(struct scsi_cmnd *cmd, scb_flag flag);
 static void ahd_linux_initialize_scsi_bus(struct ahd_softc *ahd);
-static void ahd_linux_size_nseg(void);
-static void ahd_linux_thread_run_complete_queue(struct ahd_softc *ahd);
-static void ahd_linux_start_dv(struct ahd_softc *ahd);
-static void ahd_linux_dv_timeout(struct scsi_cmnd *cmd);
-static int  ahd_linux_dv_thread(void *data);
-static void ahd_linux_kill_dv_thread(struct ahd_softc *ahd);
-static void ahd_linux_dv_target(struct ahd_softc *ahd, u_int target);
-static void ahd_linux_dv_transition(struct ahd_softc *ahd,
-                                    struct scsi_cmnd *cmd,
-                                    struct ahd_devinfo *devinfo,
-                                    struct ahd_linux_target *targ);
-static void ahd_linux_dv_fill_cmd(struct ahd_softc *ahd,
-                                  struct scsi_cmnd *cmd,
-                                  struct ahd_devinfo *devinfo);
-static void ahd_linux_dv_inq(struct ahd_softc *ahd,
-                             struct scsi_cmnd *cmd,
-                             struct ahd_devinfo *devinfo,
-                             struct ahd_linux_target *targ,
-                             u_int request_length);
-static void ahd_linux_dv_tur(struct ahd_softc *ahd,
-                             struct scsi_cmnd *cmd,
-                             struct ahd_devinfo *devinfo);
-static void ahd_linux_dv_rebd(struct ahd_softc *ahd,
-                              struct scsi_cmnd *cmd,
-                              struct ahd_devinfo *devinfo,
-                              struct ahd_linux_target *targ);
-static void ahd_linux_dv_web(struct ahd_softc *ahd,
-                             struct scsi_cmnd *cmd,
-                             struct ahd_devinfo *devinfo,
-                             struct ahd_linux_target *targ);
-static void ahd_linux_dv_reb(struct ahd_softc *ahd,
-                             struct scsi_cmnd *cmd,
-                             struct ahd_devinfo *devinfo,
-                             struct ahd_linux_target *targ);
-static void ahd_linux_dv_su(struct ahd_softc *ahd,
-                            struct scsi_cmnd *cmd,
-                            struct ahd_devinfo *devinfo,
-                            struct ahd_linux_target *targ);
-static int ahd_linux_fallback(struct ahd_softc *ahd,
-                              struct ahd_devinfo *devinfo);
-static __inline int ahd_linux_dv_fallback(struct ahd_softc *ahd,
-                                          struct ahd_devinfo *devinfo);
-static void ahd_linux_dv_complete(Scsi_Cmnd *cmd);
-static void ahd_linux_generate_dv_pattern(struct ahd_linux_target *targ);
 static u_int ahd_linux_user_tagdepth(struct ahd_softc *ahd,
                                      struct ahd_devinfo *devinfo);
-static u_int ahd_linux_user_dv_setting(struct ahd_softc *ahd);
-static void ahd_linux_setup_user_rd_strm_settings(struct ahd_softc *ahd);
-static void ahd_linux_device_queue_depth(struct ahd_softc *ahd,
-                                         struct ahd_linux_device *dev);
-static struct ahd_linux_target* ahd_linux_alloc_target(struct ahd_softc*,
-                                                       u_int, u_int);
-static void                     ahd_linux_free_target(struct ahd_softc*,
-                                                      struct ahd_linux_target*);
-static struct ahd_linux_device* ahd_linux_alloc_device(struct ahd_softc*,
-                                                       struct ahd_linux_target*,
-                                                       u_int);
-static void                     ahd_linux_free_device(struct ahd_softc*,
-                                                      struct ahd_linux_device*);
-static void ahd_linux_run_device_queue(struct ahd_softc*,
-                                       struct ahd_linux_device*);
+static void ahd_linux_device_queue_depth(struct scsi_device *);
+static int ahd_linux_run_command(struct ahd_softc*,
+                                 struct ahd_linux_device *,
+                                 struct scsi_cmnd *);
 static void ahd_linux_setup_tag_info_global(char *p);
-static aic_option_callback_t ahd_linux_setup_tag_info;
-static aic_option_callback_t ahd_linux_setup_rd_strm_info;
-static aic_option_callback_t ahd_linux_setup_dv;
-static aic_option_callback_t ahd_linux_setup_iocell_info;
-static int ahd_linux_next_unit(void);
-static void ahd_runq_tasklet(unsigned long data);
-static int aic79xx_setup(char *c);
-
-/****************************** Inlines ***************************************/
-static __inline void ahd_schedule_completeq(struct ahd_softc *ahd);
-static __inline void ahd_schedule_runq(struct ahd_softc *ahd);
-static __inline void ahd_setup_runq_tasklet(struct ahd_softc *ahd);
-static __inline void ahd_teardown_runq_tasklet(struct ahd_softc *ahd);
-static __inline struct ahd_linux_device*
-                     ahd_linux_get_device(struct ahd_softc *ahd, u_int channel,
-                                          u_int target, u_int lun, int alloc);
-static struct ahd_cmd *ahd_linux_run_complete_queue(struct ahd_softc *ahd);
-static __inline void ahd_linux_check_device_queue(struct ahd_softc *ahd,
-                                                  struct ahd_linux_device *dev);
-static __inline struct ahd_linux_device *
-                     ahd_linux_next_device_to_run(struct ahd_softc *ahd);
-static __inline void ahd_linux_run_device_queues(struct ahd_softc *ahd);
-static __inline void ahd_linux_unmap_scb(struct ahd_softc*, struct scb*);
-
-static __inline void
-ahd_schedule_completeq(struct ahd_softc *ahd)
-{
-        if ((ahd->platform_data->flags & AHD_RUN_CMPLT_Q_TIMER) == 0) {
-                ahd->platform_data->flags |= AHD_RUN_CMPLT_Q_TIMER;
-                ahd->platform_data->completeq_timer.expires = jiffies;
-                add_timer(&ahd->platform_data->completeq_timer);
-        }
-}
-
-/*
- * Must be called with our lock held.
- */
-static __inline void
-ahd_schedule_runq(struct ahd_softc *ahd)
-{
-        tasklet_schedule(&ahd->platform_data->runq_tasklet);
-}
-
-static __inline
-void ahd_setup_runq_tasklet(struct ahd_softc *ahd)
-{
-        tasklet_init(&ahd->platform_data->runq_tasklet, ahd_runq_tasklet,
-                     (unsigned long)ahd);
-}
+static int  aic79xx_setup(char *c);
 
-static __inline void
-ahd_teardown_runq_tasklet(struct ahd_softc *ahd)
-{
-        tasklet_kill(&ahd->platform_data->runq_tasklet);
-}
+static int ahd_linux_unit;
 
-static __inline struct ahd_linux_device*
-ahd_linux_get_device(struct ahd_softc *ahd, u_int channel, u_int target,
-                     u_int lun, int alloc)
-{
-        struct ahd_linux_target *targ;
-        struct ahd_linux_device *dev;
-        u_int target_offset;
 
-        target_offset = target;
-        if (channel != 0)
-                target_offset += 8;
-        targ = ahd->platform_data->targets[target_offset];
-        if (targ == NULL) {
-                if (alloc != 0) {
-                        targ = ahd_linux_alloc_target(ahd, channel, target);
-                        if (targ == NULL)
-                                return (NULL);
-                } else
-                        return (NULL);
-        }
-        dev = targ->devices[lun];
-        if (dev == NULL && alloc != 0)
-                dev = ahd_linux_alloc_device(ahd, targ, lun);
-        return (dev);
-}
-
-#define AHD_LINUX_MAX_RETURNED_ERRORS 4
-static struct ahd_cmd *
-ahd_linux_run_complete_queue(struct ahd_softc *ahd)
-{       
-        struct  ahd_cmd *acmd;
-        u_long  done_flags;
-        int     with_errors;
-
-        with_errors = 0;
-        ahd_done_lock(ahd, &done_flags);
-        while ((acmd = TAILQ_FIRST(&ahd->platform_data->completeq)) != NULL) {
-                Scsi_Cmnd *cmd;
-
-                if (with_errors > AHD_LINUX_MAX_RETURNED_ERRORS) {
-                        /*
-                         * Linux uses stack recursion to requeue
-                         * commands that need to be retried.  Avoid
-                         * blowing out the stack by "spoon feeding"
-                         * commands that completed with error back
-                         * the operating system in case they are going
-                         * to be retried. "ick"
-                         */
-                        ahd_schedule_completeq(ahd);
-                        break;
-                }
-                TAILQ_REMOVE(&ahd->platform_data->completeq,
-                             acmd, acmd_links.tqe);
-                cmd = &acmd_scsi_cmd(acmd);
-                cmd->host_scribble = NULL;
-                if (ahd_cmd_get_transaction_status(cmd) != DID_OK
-                 || (cmd->result & 0xFF) != SCSI_STATUS_OK)
-                        with_errors++;
-
-                cmd->scsi_done(cmd);
-        }
-        ahd_done_unlock(ahd, &done_flags);
-        return (acmd);
-}
-
-static __inline void
-ahd_linux_check_device_queue(struct ahd_softc *ahd,
-                             struct ahd_linux_device *dev)
-{
-        if ((dev->flags & AHD_DEV_FREEZE_TIL_EMPTY) != 0
-         && dev->active == 0) {
-                dev->flags &= ~AHD_DEV_FREEZE_TIL_EMPTY;
-                dev->qfrozen--;
-        }
-
-        if (TAILQ_FIRST(&dev->busyq) == NULL
-         || dev->openings == 0 || dev->qfrozen != 0)
-                return;
-
-        ahd_linux_run_device_queue(ahd, dev);
-}
-
-static __inline struct ahd_linux_device *
-ahd_linux_next_device_to_run(struct ahd_softc *ahd)
-{
-        
-        if ((ahd->flags & AHD_RESOURCE_SHORTAGE) != 0
-         || (ahd->platform_data->qfrozen != 0
-          && AHD_DV_SIMQ_FROZEN(ahd) == 0))
-                return (NULL);
-        return (TAILQ_FIRST(&ahd->platform_data->device_runq));
-}
-
-static __inline void
-ahd_linux_run_device_queues(struct ahd_softc *ahd)
-{
-        struct ahd_linux_device *dev;
-
-        while ((dev = ahd_linux_next_device_to_run(ahd)) != NULL) {
-                TAILQ_REMOVE(&ahd->platform_data->device_runq, dev, links);
-                dev->flags &= ~AHD_DEV_ON_RUN_LIST;
-                ahd_linux_check_device_queue(ahd, dev);
-        }
-}
+/****************************** Inlines ***************************************/
+static __inline void ahd_linux_unmap_scb(struct ahd_softc*, struct scb*);
 
 static __inline void
 ahd_linux_unmap_scb(struct ahd_softc *ahd, struct scb *scb)
 {
-        Scsi_Cmnd *cmd;
+        struct scsi_cmnd *cmd;
         int direction;
 
         cmd = scb->io_ctx;
@@ -705,197 +399,6 @@ ahd_linux_unmap_scb(struct ahd_softc *ahd, struct scb *scb)
 #define BUILD_SCSIID(ahd, cmd)                                          \
         ((((cmd)->device->id << TID_SHIFT) & TID) | (ahd)->our_id)
 
-/************************  Host template entry points *************************/
-static int         ahd_linux_detect(Scsi_Host_Template *);
-static const char *ahd_linux_info(struct Scsi_Host *);
-static int         ahd_linux_queue(Scsi_Cmnd *, void (*)(Scsi_Cmnd *));
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
-static int         ahd_linux_slave_alloc(Scsi_Device *);
-static int         ahd_linux_slave_configure(Scsi_Device *);
-static void        ahd_linux_slave_destroy(Scsi_Device *);
-#if defined(__i386__)
-static int         ahd_linux_biosparam(struct scsi_device*,
-                                       struct block_device*, sector_t, int[]);
-#endif
-#else
-static int         ahd_linux_release(struct Scsi_Host *);
-static void        ahd_linux_select_queue_depth(struct Scsi_Host *host,
-                                                Scsi_Device *scsi_devs);
-#if defined(__i386__)
-static int         ahd_linux_biosparam(Disk *, kdev_t, int[]);
-#endif
-#endif
-static int         ahd_linux_bus_reset(Scsi_Cmnd *);
-static int         ahd_linux_dev_reset(Scsi_Cmnd *);
-static int         ahd_linux_abort(Scsi_Cmnd *);
-
-/*
- * Calculate a safe value for AHD_NSEG (as expressed through ahd_linux_nseg).
- *
- * In pre-2.5.X...
- * The midlayer allocates an S/G array dynamically when a command is issued
- * using SCSI malloc.  This array, which is in an OS dependent format that
- * must later be copied to our private S/G list, is sized to house just the
- * number of segments needed for the current transfer.  Since the code that
- * sizes the SCSI malloc pool does not take into consideration fragmentation
- * of the pool, executing transactions numbering just a fraction of our
- * concurrent transaction limit with SG list lengths aproaching AHC_NSEG will
- * quickly depleat the SCSI malloc pool of usable space.  Unfortunately, the
- * mid-layer does not properly handle this scsi malloc failures for the S/G
- * array and the result can be a lockup of the I/O subsystem.  We try to size
- * our S/G list so that it satisfies our drivers allocation requirements in
- * addition to avoiding fragmentation of the SCSI malloc pool.
- */
-static void
-ahd_linux_size_nseg(void)
-{
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-        u_int cur_size;
-        u_int best_size;
-
-        /*
-         * The SCSI allocator rounds to the nearest 512 bytes
-         * an cannot allocate across a page boundary.  Our algorithm
-         * is to start at 1K of scsi malloc space per-command and
-         * loop through all factors of the PAGE_SIZE and pick the best.
-         */
-        best_size = 0;
-        for (cur_size = 1024; cur_size <= PAGE_SIZE; cur_size *= 2) {
-                u_int nseg;
-
-                nseg = cur_size / sizeof(struct scatterlist);
-                if (nseg < AHD_LINUX_MIN_NSEG)
-                        continue;
-
-                if (best_size == 0) {
-                        best_size = cur_size;
-                        ahd_linux_nseg = nseg;
-                } else {
-                        u_int best_rem;
-                        u_int cur_rem;
-
-                        /*
-                         * Compare the traits of the current "best_size"
-                         * with the current size to determine if the
-                         * current size is a better size.
-                         */
-                        best_rem = best_size % sizeof(struct scatterlist);
-                        cur_rem = cur_size % sizeof(struct scatterlist);
-                        if (cur_rem < best_rem) {
-                                best_size = cur_size;
-                                ahd_linux_nseg = nseg;
-                        }
-                }
-        }
-#endif
-}
-
-/*
- * Try to detect an Adaptec 79XX controller.
- */
-static int
-ahd_linux_detect(Scsi_Host_Template *template)
-{
-        struct  ahd_softc *ahd;
-        int     found;
-        int     error = 0;
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-        /*
-         * It is a bug that the upper layer takes
-         * this lock just prior to calling us.
-         */
-        spin_unlock_irq(&io_request_lock);
-#endif
-
-        /*
-         * Sanity checking of Linux SCSI data structures so
-         * that some of our hacks^H^H^H^H^Hassumptions aren't
-         * violated.
-         */
-        if (offsetof(struct ahd_cmd_internal, end)
-          > offsetof(struct scsi_cmnd, host_scribble)) {
-                printf("ahd_linux_detect: SCSI data structures changed.\n");
-                printf("ahd_linux_detect: Unable to attach\n");
-                return (0);
-        }
-        /*
-         * Determine an appropriate size for our Scatter Gatther lists.
-         */
-        ahd_linux_size_nseg();
-#ifdef MODULE
-        /*
-         * If we've been passed any parameters, process them now.
-         */
-        if (aic79xx)
-                aic79xx_setup(aic79xx);
-#endif
-
-        template->proc_name = "aic79xx";
-
-        /*
-         * Initialize our softc list lock prior to
-         * probing for any adapters.
-         */
-        ahd_list_lockinit();
-
-#ifdef CONFIG_PCI
-        error = ahd_linux_pci_init();
-        if (error)
-                return error;
-#endif
-
-        /*
-         * Register with the SCSI layer all
-         * controllers we've found.
-         */
-        found = 0;
-        TAILQ_FOREACH(ahd, &ahd_tailq, links) {
-
-                if (ahd_linux_register_host(ahd, template) == 0)
-                        found++;
-        }
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-        spin_lock_irq(&io_request_lock);
-#endif
-        aic79xx_detect_complete++;
-        return 0;
-}
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-/*
- * Free the passed in Scsi_Host memory structures prior to unloading the
- * module.
- */
-static int
-ahd_linux_release(struct Scsi_Host * host)
-{
-        struct ahd_softc *ahd;
-        u_long l;
-
-        ahd_list_lock(&l);
-        if (host != NULL) {
-
-                /*
-                 * We should be able to just perform
-                 * the free directly, but check our
-                 * list for extra sanity.
-                 */
-                ahd = ahd_find_softc(*(struct ahd_softc **)host->hostdata);
-                if (ahd != NULL) {
-                        u_long s;
-
-                        ahd_lock(ahd, &s);
-                        ahd_intr_enable(ahd, FALSE);
-                        ahd_unlock(ahd, &s);
-                        ahd_free(ahd);
-                }
-        }
-        ahd_list_unlock(&l);
-        return (0);
-}
-#endif
-
 /*
  * Return a string describing the driver.
  */
@@ -928,220 +431,177 @@ ahd_linux_info(struct Scsi_Host *host)
  * Queue an SCB to the controller.
  */
 static int
-ahd_linux_queue(Scsi_Cmnd * cmd, void (*scsi_done) (Scsi_Cmnd *))
+ahd_linux_queue(struct scsi_cmnd * cmd, void (*scsi_done) (struct scsi_cmnd *))
 {
         struct   ahd_softc *ahd;
-        struct   ahd_linux_device *dev;
-        u_long   flags;
+        struct   ahd_linux_device *dev = scsi_transport_device_data(cmd->device);
 
         ahd = *(struct ahd_softc **)cmd->device->host->hostdata;
 
         /*
-         * Save the callback on completion function.
-         */
-        cmd->scsi_done = scsi_done;
-
-        ahd_midlayer_entrypoint_lock(ahd, &flags);
-
-        /*
          * 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
-         && AHD_DV_CMD(cmd) == 0) {
-
-                ahd_cmd_set_transaction_status(cmd, CAM_REQUEUE_REQ);
-                ahd_linux_queue_cmd_complete(ahd, cmd);
-                ahd_schedule_completeq(ahd);
-                ahd_midlayer_entrypoint_unlock(ahd, &flags);
-                return (0);
-        }
-        dev = ahd_linux_get_device(ahd, cmd->device->channel,
-                                   cmd->device->id, cmd->device->lun,
-                                   /*alloc*/TRUE);
-        if (dev == NULL) {
-                ahd_cmd_set_transaction_status(cmd, CAM_RESRC_UNAVAIL);
-                ahd_linux_queue_cmd_complete(ahd, cmd);
-                ahd_schedule_completeq(ahd);
-                ahd_midlayer_entrypoint_unlock(ahd, &flags);
-                printf("%s: aic79xx_linux_queue - Unable to allocate device!\n",
-                       ahd_name(ahd));
-                return (0);
+        if (ahd->platform_data->qfrozen != 0) {
+                printf("%s: queue frozen\n", ahd_name(ahd));
+
+                return SCSI_MLQUEUE_HOST_BUSY;
         }
-        if (cmd->cmd_len > MAX_CDB_LEN)
-                return (-EINVAL);
+
+        /*
+         * Save the callback on completion function.
+         */
+        cmd->scsi_done = scsi_done;
+
         cmd->result = CAM_REQ_INPROG << 16;
-        TAILQ_INSERT_TAIL(&dev->busyq, (struct ahd_cmd *)cmd, acmd_links.tqe);
-        if ((dev->flags & AHD_DEV_ON_RUN_LIST) == 0) {
-                TAILQ_INSERT_TAIL(&ahd->platform_data->device_runq, dev, links);
-                dev->flags |= AHD_DEV_ON_RUN_LIST;
-                ahd_linux_run_device_queues(ahd);
-        }
-        ahd_midlayer_entrypoint_unlock(ahd, &flags);
-        return (0);
+
+        return ahd_linux_run_command(ahd, dev, cmd);
+}
+
+static inline struct scsi_target **
+ahd_linux_target_in_softc(struct scsi_target *starget)
+{
+        struct  ahd_softc *ahd =
+                *((struct ahd_softc **)dev_to_shost(&starget->dev)->hostdata);
+        unsigned int target_offset;
+
+        target_offset = starget->id;
+        if (starget->channel != 0)
+                target_offset += 8;
+
+        return &ahd->platform_data->starget[target_offset];
 }
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
 static int
-ahd_linux_slave_alloc(Scsi_Device *device)
+ahd_linux_target_alloc(struct scsi_target *starget)
 {
-        struct  ahd_softc *ahd;
+        struct  ahd_softc *ahd =
+                *((struct ahd_softc **)dev_to_shost(&starget->dev)->hostdata);
+        unsigned long flags;
+        struct scsi_target **ahd_targp = ahd_linux_target_in_softc(starget);
+        struct ahd_linux_target *targ = scsi_transport_target_data(starget);
+        struct ahd_devinfo devinfo;
+        struct ahd_initiator_tinfo *tinfo;
+        struct ahd_tmode_tstate *tstate;
+        char channel = starget->channel + 'A';
 
-        ahd = *((struct ahd_softc **)device->host->hostdata);
-        if (bootverbose)
-                printf("%s: Slave Alloc %d\n", ahd_name(ahd), device->id);
-        return (0);
+        ahd_lock(ahd, &flags);
+
+        BUG_ON(*ahd_targp != NULL);
+
+        *ahd_targp = starget;
+        memset(targ, 0, sizeof(*targ));
+
+        tinfo = ahd_fetch_transinfo(ahd, channel, ahd->our_id,
+                                    starget->id, &tstate);
+        ahd_compile_devinfo(&devinfo, ahd->our_id, starget->id,
+                            CAM_LUN_WILDCARD, channel,
+                            ROLE_INITIATOR);
+        spi_min_period(starget) = AHD_SYNCRATE_MAX; /* We can do U320 */
+        if ((ahd->bugs & AHD_PACED_NEGTABLE_BUG) != 0)
+                spi_max_offset(starget) = MAX_OFFSET_PACED_BUG;
+        else
+                spi_max_offset(starget) = MAX_OFFSET_PACED;
+        spi_max_width(starget) = ahd->features & AHD_WIDE;
+
+        ahd_set_syncrate(ahd, &devinfo, 0, 0, 0,
+                         AHD_TRANS_GOAL, /*paused*/FALSE);
+        ahd_set_width(ahd, &devinfo, MSG_EXT_WDTR_BUS_8_BIT,
+                      AHD_TRANS_GOAL, /*paused*/FALSE);
+        ahd_unlock(ahd, &flags);
+
+        return 0;
+}
+
+static void
+ahd_linux_target_destroy(struct scsi_target *starget)
+{
+        struct scsi_target **ahd_targp = ahd_linux_target_in_softc(starget);
+
+        *ahd_targp = NULL;
 }
 
 static int
-ahd_linux_slave_configure(Scsi_Device *device)
+ahd_linux_slave_alloc(struct scsi_device *sdev)
 {
-        struct  ahd_softc *ahd;
-        struct  ahd_linux_device *dev;
-        u_long  flags;
+        struct  ahd_softc *ahd =
+                *((struct ahd_softc **)sdev->host->hostdata);
+        struct scsi_target *starget = sdev->sdev_target;
+        struct ahd_linux_target *targ = scsi_transport_target_data(starget);
+        struct ahd_linux_device *dev;
 
-        ahd = *((struct ahd_softc **)device->host->hostdata);
         if (bootverbose)
-                printf("%s: Slave Configure %d\n", ahd_name(ahd), device->id);
-        ahd_midlayer_entrypoint_lock(ahd, &flags);
+                printf("%s: Slave Alloc %d\n", ahd_name(ahd), sdev->id);
+
+        BUG_ON(targ->sdev[sdev->lun] != NULL);
+
+        dev = scsi_transport_device_data(sdev);
+        memset(dev, 0, sizeof(*dev));
+
         /*
-         * Since Linux has attached to the device, configure
-         * it so we don't free and allocate the device
-         * structure on every command.
+         * We start out life using untagged
+         * transactions of which we allow one.
          */
-        dev = ahd_linux_get_device(ahd, device->channel,
-                                   device->id, device->lun,
-                                   /*alloc*/TRUE);
-        if (dev != NULL) {
-                dev->flags &= ~AHD_DEV_UNCONFIGURED;
-                dev->flags |= AHD_DEV_SLAVE_CONFIGURED;
-                dev->scsi_device = device;
-                ahd_linux_device_queue_depth(ahd, dev);
-        }
-        ahd_midlayer_entrypoint_unlock(ahd, &flags);
+        dev->openings = 1;
+
+        /*
+         * Set maxtags to 0.  This will be changed if we
+         * later determine that we are dealing with
+         * a tagged queuing capable device.
+         */
+        dev->maxtags = 0;
+        
+        targ->sdev[sdev->lun] = sdev;
+
         return (0);
 }
 
-static void
-ahd_linux_slave_destroy(Scsi_Device *device)
+static int
+ahd_linux_slave_configure(struct scsi_device *sdev)
 {
         struct  ahd_softc *ahd;
-        struct  ahd_linux_device *dev;
-        u_long  flags;
 
-        ahd = *((struct ahd_softc **)device->host->hostdata);
+        ahd = *((struct ahd_softc **)sdev->host->hostdata);
         if (bootverbose)
-                printf("%s: Slave Destroy %d\n", ahd_name(ahd), device->id);
-        ahd_midlayer_entrypoint_lock(ahd, &flags);
-        dev = ahd_linux_get_device(ahd, device->channel,
-                                   device->id, device->lun,
-                                           /*alloc*/FALSE);
+                printf("%s: Slave Configure %d\n", ahd_name(ahd), sdev->id);
 
-        /*
-         * Filter out "silly" deletions of real devices by only
-         * deleting devices that have had slave_configure()
-         * called on them.  All other devices that have not
-         * been configured will automatically be deleted by
-         * the refcounting process.
-         */
-        if (dev != NULL
-         && (dev->flags & AHD_DEV_SLAVE_CONFIGURED) != 0) {
-                dev->flags |= AHD_DEV_UNCONFIGURED;
-                if (TAILQ_EMPTY(&dev->busyq)
-                 && dev->active == 0
-                 && (dev->flags & AHD_DEV_TIMER_ACTIVE) == 0)
-                        ahd_linux_free_device(ahd, dev);
-        }
-        ahd_midlayer_entrypoint_unlock(ahd, &flags);
+        ahd_linux_device_queue_depth(sdev);
+
+        /* Initial Domain Validation */
+        if (!spi_initial_dv(sdev->sdev_target))
+                spi_dv_device(sdev);
+
+        return 0;
 }
-#else
-/*
- * Sets the queue depth for each SCSI device hanging
- * off the input host adapter.
- */
+
 static void
-ahd_linux_select_queue_depth(struct Scsi_Host * host,
-                             Scsi_Device * scsi_devs)
+ahd_linux_slave_destroy(struct scsi_device *sdev)
 {
-        Scsi_Device *device;
-        Scsi_Device *ldev;
         struct  ahd_softc *ahd;
-        u_long  flags;
+        struct  ahd_linux_device *dev = scsi_transport_device_data(sdev);
+        struct  ahd_linux_target *targ = scsi_transport_target_data(sdev->sdev_target);
 
-        ahd = *((struct ahd_softc **)host->hostdata);
-        ahd_lock(ahd, &flags);
-        for (device = scsi_devs; device != NULL; device = device->next) {
+        ahd = *((struct ahd_softc **)sdev->host->hostdata);
+        if (bootverbose)
+                printf("%s: Slave Destroy %d\n", ahd_name(ahd), sdev->id);
 
-                /*
-                 * Watch out for duplicate devices.  This works around
-                 * some quirks in how the SCSI scanning code does its
-                 * device management.
-                 */
-                for (ldev = scsi_devs; ldev != device; ldev = ldev->next) {
-                        if (ldev->host == device->host
-                         && ldev->channel == device->channel
-                         && ldev->id == device->id
-                         && ldev->lun == device->lun)
-                                break;
-                }
-                /* Skip duplicate. */
-                if (ldev != device)
-                        continue;
+        BUG_ON(dev->active);
 
-                if (device->host == host) {
-                        struct   ahd_linux_device *dev;
+        targ->sdev[sdev->lun] = NULL;
 
-                        /*
-                         * Since Linux has attached to the device, configure
-                         * it so we don't free and allocate the device
-                         * structure on every command.
-                         */
-                        dev = ahd_linux_get_device(ahd, device->channel,
-                                                   device->id, device->lun,
-                                                   /*alloc*/TRUE);
-                        if (dev != NULL) {
-                                dev->flags &= ~AHD_DEV_UNCONFIGURED;
-                                dev->scsi_device = device;
-                                ahd_linux_device_queue_depth(ahd, dev);
-                                device->queue_depth = dev->openings
-                                                    + dev->active;
-                                if ((dev->flags & (AHD_DEV_Q_BASIC
-                                                | AHD_DEV_Q_TAGGED)) == 0) {
-                                        /*
-                                         * We allow the OS to queue 2 untagged
-                                         * transactions to us at any time even
-                                         * though we can only execute them
-                                         * serially on the controller/device.
-                                         * This should remove some latency.
-                                         */
-                                        device->queue_depth = 2;
-                                }
-                        }
-                }
-        }
-        ahd_unlock(ahd, &flags);
 }
-#endif
 
 #if defined(__i386__)
 /*
  * Return the disk geometry for the given SCSI device.
  */
 static int
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
 ahd_linux_biosparam(struct scsi_device *sdev, struct block_device *bdev,
                     sector_t capacity, int geom[])
 {
         uint8_t *bh;
-#else
-ahd_linux_biosparam(Disk *disk, kdev_t dev, int geom[])
-{
-        struct  scsi_device *sdev = disk->device;
-        u_long  capacity = disk->capacity;
-        struct  buffer_head *bh;
-#endif
         int      heads;
         int      sectors;
         int      cylinders;
@@ -1151,22 +611,11 @@ ahd_linux_biosparam(Disk *disk, kdev_t dev, int geom[])
 
         ahd = *((struct ahd_softc **)sdev->host->hostdata);
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
         bh = scsi_bios_ptable(bdev);
-#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,17)
-        bh = bread(MKDEV(MAJOR(dev), MINOR(dev) & ~0xf), 0, block_size(dev));
-#else
-        bh = bread(MKDEV(MAJOR(dev), MINOR(dev) & ~0xf), 0, 1024);
-#endif
-
         if (bh) {
                 ret = scsi_partsize(bh, capacity,
                                     &geom[2], &geom[0], &geom[1]);
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
                 kfree(bh);
-#else
-                brelse(bh);
-#endif
                 if (ret != -1)
                         return (ret);
         }
@@ -1194,392 +643,35 @@ ahd_linux_biosparam(Disk *disk, kdev_t dev, int geom[])
  * Abort the current SCSI command(s).
  */
 static int
-ahd_linux_abort(Scsi_Cmnd *cmd)
+ahd_linux_abort(struct scsi_cmnd *cmd)
 {
-        struct ahd_softc *ahd;
-        struct ahd_cmd *acmd;
-        struct ahd_cmd *list_acmd;
-        struct ahd_linux_device *dev;
-        struct scb *pending_scb;
-        u_long s;
-        u_int  saved_scbptr;
-        u_int  active_scbptr;
-        u_int  last_phase;
-        u_int  cdb_byte;
-        int    retval;
-        int    was_paused;
-        int    paused;
-        int    wait;
-        int    disconnected;
-        ahd_mode_state saved_modes;
-
-        pending_scb = NULL;
-        paused = FALSE;
-        wait = FALSE;
-        ahd = *(struct ahd_softc **)cmd->device->host->hostdata;
-        acmd = (struct ahd_cmd *)cmd;
-
-        printf("%s:%d:%d:%d: Attempting to abort cmd %p:",
-               ahd_name(ahd), cmd->device->channel, cmd->device->id,
-               cmd->device->lun, cmd);
-        for (cdb_byte = 0; cdb_byte < cmd->cmd_len; cdb_byte++)
-                printf(" 0x%x", cmd->cmnd[cdb_byte]);
-        printf("\n");
-
-        /*
-         * In all versions of Linux, we have to work around
-         * a major flaw in how the mid-layer is locked down
-         * if we are to sleep successfully in our error handler
-         * while allowing our interrupt handler to run.  Since
-         * the midlayer acquires either the io_request_lock or
-         * our lock prior to calling us, we must use the
-         * spin_unlock_irq() method for unlocking our lock.
-         * This will force interrupts to be enabled on the
-         * current CPU.  Since the EH thread should not have
-         * been running with CPU interrupts disabled other than
-         * by acquiring either the io_request_lock or our own
-         * lock, this *should* be safe.
-         */
-        ahd_midlayer_entrypoint_lock(ahd, &s);
-
-        /*
-         * First determine if we currently own this command.
-         * Start by searching the device queue.  If not found
-         * there, check the pending_scb list.  If not found
-         * at all, and the system wanted us to just abort the
-         * command, return success.
-         */
-        dev = ahd_linux_get_device(ahd, cmd->device->channel,
-                                   cmd->device->id, cmd->device->lun,
-                                   /*alloc*/FALSE);
-
-        if (dev == NULL) {
-                /*
-                 * No target device for this command exists,
-                 * so we must not still own the command.
-                 */
-                printf("%s:%d:%d:%d: Is not an active device\n",
-                       ahd_name(ahd), cmd->device->channel, cmd->device->id,
-                       cmd->device->lun);
-                retval = SUCCESS;
-                goto no_cmd;
-        }
-
-        TAILQ_FOREACH(list_acmd, &dev->busyq, acmd_links.tqe) {
-                if (list_acmd == acmd)
-                        break;
-        }
-
-        if (list_acmd != NULL) {
-                printf("%s:%d:%d:%d: Command found on device queue\n",
-                       ahd_name(ahd), cmd->device->channel, cmd->device->id,
-                       cmd->device->lun);
-                TAILQ_REMOVE(&dev->busyq, list_acmd, acmd_links.tqe);
-                cmd->result = DID_ABORT << 16;
-                ahd_linux_queue_cmd_complete(ahd, cmd);
-                retval = SUCCESS;
-                goto done;
-        }
+        int error;
 
-        /*
-         * See if we can find a matching cmd in the pending list.
-         */
-        LIST_FOREACH(pending_scb, &ahd->pending_scbs, pending_links) {
-                if (pending_scb->io_ctx == cmd)
-                        break;
-        }
-
-        if (pending_scb == NULL) {
-                printf("%s:%d:%d:%d: Command not found\n",
-                       ahd_name(ahd), cmd->device->channel, cmd->device->id,
-                       cmd->device->lun);
-                goto no_cmd;
-        }
-
-        if ((pending_scb->flags & SCB_RECOVERY_SCB) != 0) {
-                /*
-                 * We can't queue two recovery actions using the same SCB
-                 */
-                retval = FAILED;
-                goto  done;
-        }
-
-        /*
-         * Ensure that the card doesn't do anything
-         * behind our back.  Also make sure that we
-         * didn't "just" miss an interrupt that would
-         * affect this cmd.
-         */
-        was_paused = ahd_is_paused(ahd);
-        ahd_pause_and_flushwork(ahd);
-        paused = TRUE;
-
-        if ((pending_scb->flags & SCB_ACTIVE) == 0) {
-                printf("%s:%d:%d:%d: Command already completed\n",
-                       ahd_name(ahd), cmd->device->channel, cmd->device->id,
-                       cmd->device->lun);
-                goto no_cmd;
-        }
-
-        printf("%s: At time of recovery, card was %spaused\n",
-               ahd_name(ahd), was_paused ? "" : "not ");
-        ahd_dump_card_state(ahd);
-
-        disconnected = TRUE;
-        if (ahd_search_qinfifo(ahd, cmd->device->id, cmd->device->channel + 'A',
-                               cmd->device->lun, SCB_GET_TAG(pending_scb),
-                               ROLE_INITIATOR, CAM_REQ_ABORTED,
-                               SEARCH_COMPLETE) > 0) {
-                printf("%s:%d:%d:%d: Cmd aborted from QINFIFO\n",
-                       ahd_name(ahd), cmd->device->channel, cmd->device->id,
-                                cmd->device->lun);
-                retval = SUCCESS;
-                goto done;
-        }
-
-        saved_modes = ahd_save_modes(ahd);
-        ahd_set_modes(ahd, AHD_MODE_SCSI, AHD_MODE_SCSI);
-        last_phase = ahd_inb(ahd, LASTPHASE);
-        saved_scbptr = ahd_get_scbptr(ahd);
-        active_scbptr = saved_scbptr;
-        if (disconnected && (ahd_inb(ahd, SEQ_FLAGS) & NOT_IDENTIFIED) == 0) {
-                struct scb *bus_scb;
-
-                bus_scb = ahd_lookup_scb(ahd, active_scbptr);
-                if (bus_scb == pending_scb)
-                        disconnected = FALSE;
-        }
-
-        /*
-         * At this point, pending_scb is the scb associated with the
-         * passed in command.  That command is currently active on the
-         * bus or is in the disconnected state.
-         */
-        if (last_phase != P_BUSFREE
-         && SCB_GET_TAG(pending_scb) == active_scbptr) {
-
-                /*
-                 * We're active on the bus, so assert ATN
-                 * and hope that the target responds.
-                 */
-                pending_scb = ahd_lookup_scb(ahd, active_scbptr);
-                pending_scb->flags |= SCB_RECOVERY_SCB|SCB_ABORT;
-                ahd_outb(ahd, MSG_OUT, HOST_MSG);
-                ahd_outb(ahd, SCSISIGO, last_phase|ATNO);
-                printf("%s:%d:%d:%d: Device is active, asserting ATN\n",
-                       ahd_name(ahd), cmd->device->channel,
-                       cmd->device->id, cmd->device->lun);
-                wait = TRUE;
-        } else if (disconnected) {
-
-                /*
-                 * Actually re-queue this SCB in an attempt
-                 * to select the device before it reconnects.
-                 */
-                pending_scb->flags |= SCB_RECOVERY_SCB|SCB_ABORT;
-                ahd_set_scbptr(ahd, SCB_GET_TAG(pending_scb));
-                pending_scb->hscb->cdb_len = 0;
-                pending_scb->hscb->task_attribute = 0;
-                pending_scb->hscb->task_management = SIU_TASKMGMT_ABORT_TASK;
-
-                if ((pending_scb->flags & SCB_PACKETIZED) != 0) {
-                        /*
-                         * Mark the SCB has having an outstanding
-                         * task management function.  Should the command
-                         * complete normally before the task management
-                         * function can be sent, the host will be notified
-                         * to abort our requeued SCB.
-                         */
-                        ahd_outb(ahd, SCB_TASK_MANAGEMENT,
-                                 pending_scb->hscb->task_management);
-                } else {
-                        /*
-                         * If non-packetized, set the MK_MESSAGE control
-                         * bit indicating that we desire to send a message.
-                         * We also set the disconnected flag since there is
-                         * no guarantee that our SCB control byte matches
-                         * the version on the card.  We don't want the
-                         * sequencer to abort the command thinking an
-                         * unsolicited reselection occurred.
-                         */
-                        pending_scb->hscb->control |= MK_MESSAGE|DISCONNECTED;
-
-                        /*
-                         * The sequencer will never re-reference the
-                         * in-core SCB.  To make sure we are notified
-                         * during reslection, set the MK_MESSAGE flag in
-                         * the card's copy of the SCB.
-                         */
-                        ahd_outb(ahd, SCB_CONTROL,
-                                 ahd_inb(ahd, SCB_CONTROL)|MK_MESSAGE);
-                }
-
-                /*
-                 * Clear out any entries in the QINFIFO first
-                 * so we are the next SCB for this target
-                 * to run.
-                 */
-                ahd_search_qinfifo(ahd, cmd->device->id,
-                                   cmd->device->channel + 'A', cmd->device->lun,
-                                   SCB_LIST_NULL, ROLE_INITIATOR,
-                                   CAM_REQUEUE_REQ, SEARCH_COMPLETE);
-                ahd_qinfifo_requeue_tail(ahd, pending_scb);
-                ahd_set_scbptr(ahd, saved_scbptr);
-                ahd_print_path(ahd, pending_scb);
-                printf("Device is disconnected, re-queuing SCB\n");
-                wait = TRUE;
-        } else {
-                printf("%s:%d:%d:%d: Unable to deliver message\n",
-                       ahd_name(ahd), cmd->device->channel,
-                       cmd->device->id, cmd->device->lun);
-                retval = FAILED;
-                goto done;
-        }
-
-no_cmd:
-        /*
-         * Our assumption is that if we don't have the command, no
-         * recovery action was required, so we return success.  Again,
-         * the semantics of the mid-layer recovery engine are not
-         * well defined, so this may change in time.
-         */
-        retval = SUCCESS;
-done:
-        if (paused)
-                ahd_unpause(ahd);
-        if (wait) {
-                struct timer_list timer;
-                int ret;
-
-                pending_scb->platform_data->flags |= AHD_SCB_UP_EH_SEM;
-                spin_unlock_irq(&ahd->platform_data->spin_lock);
-                init_timer(&timer);
-                timer.data = (u_long)pending_scb;
-                timer.expires = jiffies + (5 * HZ);
-                timer.function = ahd_linux_sem_timeout;
-                add_timer(&timer);
-                printf("Recovery code sleeping\n");
-                down(&ahd->platform_data->eh_sem);
-                printf("Recovery code awake\n");
-                ret = del_timer_sync(&timer);
-                if (ret == 0) {
-                        printf("Timer Expired\n");
-                        retval = FAILED;
-                }
-                spin_lock_irq(&ahd->platform_data->spin_lock);
-        }
-        ahd_schedule_runq(ahd);
-        ahd_linux_run_complete_queue(ahd);
-        ahd_midlayer_entrypoint_unlock(ahd, &s);
-        return (retval);
-}
-
-
-static void
-ahd_linux_dev_reset_complete(Scsi_Cmnd *cmd)
-{
-        free(cmd, M_DEVBUF);
+        error = ahd_linux_queue_recovery_cmd(cmd, SCB_ABORT);
+        if (error != 0)
+                printf("aic79xx_abort returns 0x%x\n", error);
+        return error;
 }
 
 /*
  * Attempt to send a target reset message to the device that timed out.
  */
 static int
-ahd_linux_dev_reset(Scsi_Cmnd *cmd)
+ahd_linux_dev_reset(struct scsi_cmnd *cmd)
 {
-        struct  ahd_softc *ahd;
-        struct  scsi_cmnd *recovery_cmd;
-        struct  ahd_linux_device *dev;
-        struct  ahd_initiator_tinfo *tinfo;
-        struct  ahd_tmode_tstate *tstate;
-        struct  scb *scb;
-        struct  hardware_scb *hscb;
-        u_long  s;
-        struct  timer_list timer;
-        int     retval;
-
-        ahd = *(struct ahd_softc **)cmd->device->host->hostdata;
-        recovery_cmd = malloc(sizeof(struct scsi_cmnd), M_DEVBUF, M_WAITOK);
-        if (!recovery_cmd)
-                return (FAILED);
-        memset(recovery_cmd, 0, sizeof(struct scsi_cmnd));
-        recovery_cmd->device = cmd->device;
-        recovery_cmd->scsi_done = ahd_linux_dev_reset_complete;
-#ifdef AHD_DEBUG
-        if ((ahd_debug & AHD_SHOW_RECOVERY) != 0)
-                printf("%s:%d:%d:%d: Device reset called for cmd %p\n",
-                       ahd_name(ahd), cmd->device->channel, cmd->device->id,
-                       cmd->device->lun, cmd);
-#endif
-        ahd_lock(ahd, &s);
-
-        dev = ahd_linux_get_device(ahd, cmd->device->channel, cmd->device->id,
-                                   cmd->device->lun, /*alloc*/FALSE);
-        if (dev == NULL) {
-                ahd_unlock(ahd, &s);
-                kfree(recovery_cmd);
-                return (FAILED);
-        }
-        if ((scb = ahd_get_scb(ahd, AHD_NEVER_COL_IDX)) == NULL) {
-                ahd_unlock(ahd, &s);
-                kfree(recovery_cmd);
-                return (FAILED);
-        }
-        tinfo = ahd_fetch_transinfo(ahd, 'A', ahd->our_id,
-                                    cmd->device->id, &tstate);
-        recovery_cmd->result = CAM_REQ_INPROG << 16;
-        recovery_cmd->host_scribble = (char *)scb;
-        scb->io_ctx = recovery_cmd;
-        scb->platform_data->dev = dev;
-        scb->sg_count = 0;
-        ahd_set_residual(scb, 0);
-        ahd_set_sense_residual(scb, 0);
-        hscb = scb->hscb;
-        hscb->control = 0;
-        hscb->scsiid = BUILD_SCSIID(ahd, cmd);
-        hscb->lun = cmd->device->lun;
-        hscb->cdb_len = 0;
-        hscb->task_management = SIU_TASKMGMT_LUN_RESET;
-        scb->flags |= SCB_DEVICE_RESET|SCB_RECOVERY_SCB|SCB_ACTIVE;
-        if ((tinfo->curr.ppr_options & MSG_EXT_PPR_IU_REQ) != 0) {
-                scb->flags |= SCB_PACKETIZED;
-        } else {
-                hscb->control |= MK_MESSAGE;
-        }
-        dev->openings--;
-        dev->active++;
-        dev->commands_issued++;
-        LIST_INSERT_HEAD(&ahd->pending_scbs, scb, pending_links);
-        ahd_queue_scb(ahd, scb);
+        int error;
 
-        scb->platform_data->flags |= AHD_SCB_UP_EH_SEM;
-        ahd_unlock(ahd, &s);
-        init_timer(&timer);
-        timer.data = (u_long)scb;
-        timer.expires = jiffies + (5 * HZ);
-        timer.function = ahd_linux_sem_timeout;
-        add_timer(&timer);
-        printf("Recovery code sleeping\n");
-        down(&ahd->platform_data->eh_sem);
-        printf("Recovery code awake\n");
-        retval = SUCCESS;
-        if (del_timer_sync(&timer) == 0) {
-                printf("Timer Expired\n");
-                retval = FAILED;
-        }
-        ahd_lock(ahd, &s);
-        ahd_schedule_runq(ahd);
-        ahd_linux_run_complete_queue(ahd);
-        ahd_unlock(ahd, &s);
-        printf("%s: Device reset returning 0x%x\n", ahd_name(ahd), retval);
-        return (retval);
+        error = ahd_linux_queue_recovery_cmd(cmd, SCB_DEVICE_RESET);
+        if (error != 0)
+                printf("aic79xx_dev_reset returns 0x%x\n", error);
+        return error;
 }
 
 /*
  * Reset the SCSI bus.
  */
 static int
-ahd_linux_bus_reset(Scsi_Cmnd *cmd)
+ahd_linux_bus_reset(struct scsi_cmnd *cmd)
 {
         struct ahd_softc *ahd;
         u_long s;
@@ -1594,7 +686,6 @@ ahd_linux_bus_reset(Scsi_Cmnd *cmd)
         ahd_lock(ahd, &s);
         found = ahd_reset_channel(ahd, cmd->device->channel + 'A',
                                   /*initiate reset*/TRUE);
-        ahd_linux_run_complete_queue(ahd);
         ahd_unlock(ahd, &s);
 
         if (bootverbose)
@@ -1604,9 +695,10 @@ ahd_linux_bus_reset(Scsi_Cmnd *cmd)
         return (SUCCESS);
 }
 
-Scsi_Host_Template aic79xx_driver_template = {
+struct scsi_host_template aic79xx_driver_template = {
         .module                 = THIS_MODULE,
         .name                   = "aic79xx",
+        .proc_name              = "aic79xx",
         .proc_info              = ahd_linux_proc_info,
         .info                   = ahd_linux_info,
         .queuecommand           = ahd_linux_queue,
@@ -1623,37 +715,10 @@ Scsi_Host_Template aic79xx_driver_template = {
         .slave_alloc            = ahd_linux_slave_alloc,
         .slave_configure        = ahd_linux_slave_configure,
         .slave_destroy          = ahd_linux_slave_destroy,
+        .target_alloc           = ahd_linux_target_alloc,
+        .target_destroy         = ahd_linux_target_destroy,
 };
 
-/**************************** Tasklet Handler *********************************/
-
-/*
- * In 2.4.X and above, this routine is called from a tasklet,
- * so we must re-acquire our lock prior to executing this code.
- * In all prior kernels, ahd_schedule_runq() calls this routine
- * directly and ahd_schedule_runq() is called with our lock held.
- */
-static void
-ahd_runq_tasklet(unsigned long data)
-{
-        struct ahd_softc* ahd;
-        struct ahd_linux_device *dev;
-        u_long flags;
-
-        ahd = (struct ahd_softc *)data;
-        ahd_lock(ahd, &flags);
-        while ((dev = ahd_linux_next_device_to_run(ahd)) != NULL) {
-        
-                TAILQ_REMOVE(&ahd->platform_data->device_runq, dev, links);
-                dev->flags &= ~AHD_DEV_ON_RUN_LIST;
-                ahd_linux_check_device_queue(ahd, dev);
-                /* Yeild to our interrupt handler */
-                ahd_unlock(ahd, &flags);
-                ahd_lock(ahd, &flags);
-        }
-        ahd_unlock(ahd, &flags);
-}
-
 /******************************** Bus DMA *************************************/
 int
 ahd_dma_tag_create(struct ahd_softc *ahd, bus_dma_tag_t parent,
@@ -1693,36 +758,10 @@ int
 ahd_dmamem_alloc(struct ahd_softc *ahd, bus_dma_tag_t dmat, void** vaddr,
                  int flags, bus_dmamap_t *mapp)
 {
-        bus_dmamap_t map;
-
-        map = malloc(sizeof(*map), M_DEVBUF, M_NOWAIT);
-        if (map == NULL)
-                return (ENOMEM);
-        /*
-         * Although we can dma data above 4GB, our
-         * "consistent" memory is below 4GB for
-         * space efficiency reasons (only need a 4byte
-         * address).  For this reason, we have to reset
-         * our dma mask when doing allocations.
-         */
-        if (ahd->dev_softc != NULL)
-                if (pci_set_dma_mask(ahd->dev_softc, 0xFFFFFFFF)) {
-                        printk(KERN_WARNING "aic79xx: No suitable DMA available.\n");
-                        kfree(map);
-                        return (ENODEV);
-                }
         *vaddr = pci_alloc_consistent(ahd->dev_softc,
-                                      dmat->maxsize, &map->bus_addr);
-        if (ahd->dev_softc != NULL)
-                if (pci_set_dma_mask(ahd->dev_softc,
-                                     ahd->platform_data->hw_dma_mask)) {
-                        printk(KERN_WARNING "aic79xx: No suitable DMA available.\n");
-                        kfree(map);
-                        return (ENODEV);
-                }
+                                      dmat->maxsize, mapp);
         if (*vaddr == NULL)
                 return (ENOMEM);
-        *mapp = map;
         return(0);
 }
 
@@ -1731,7 +770,7 @@ ahd_dmamem_free(struct ahd_softc *ahd, bus_dma_tag_t dmat,
                 void* vaddr, bus_dmamap_t map)
 {
         pci_free_consistent(ahd->dev_softc, dmat->maxsize,
-                            vaddr, map->bus_addr);
+                            vaddr, map);
 }
 
 int
@@ -1745,7 +784,7 @@ ahd_dmamap_load(struct ahd_softc *ahd, bus_dma_tag_t dmat, bus_dmamap_t map,
          */
         bus_dma_segment_t stack_sg;
 
-        stack_sg.ds_addr = map->bus_addr;
+        stack_sg.ds_addr = map;
         stack_sg.ds_len = dmat->maxsize;
         cb(cb_arg, &stack_sg, /*nseg*/1, /*error*/0);
         return (0);
@@ -1754,11 +793,6 @@ ahd_dmamap_load(struct ahd_softc *ahd, bus_dma_tag_t dmat, bus_dmamap_t map,
 void
 ahd_dmamap_destroy(struct ahd_softc *ahd, bus_dma_tag_t dmat, bus_dmamap_t map)
 {
-        /*
-         * The map may is NULL in our < 2.3.X implementation.
-         */
-        if (map != NULL)
-                free(map, M_DEVBUF);
 }
 
 int
@@ -1823,41 +857,6 @@ ahd_softc_comp(struct ahd_softc *lahd, struct ahd_softc *rahd)
 }
 
 static void
-ahd_linux_setup_tag_info(u_long arg, int instance, int targ, int32_t value)
-{
-
-        if ((instance >= 0) && (targ >= 0)
-         && (instance < NUM_ELEMENTS(aic79xx_tag_info))
-         && (targ < AHD_NUM_TARGETS)) {
-                aic79xx_tag_info[instance].tag_commands[targ] = value & 0x1FF;
-                if (bootverbose)
-                        printf("tag_info[%d:%d] = %d\n", instance, targ, value);
-        }
-}
-
-static void
-ahd_linux_setup_rd_strm_info(u_long arg, int instance, int targ, int32_t value)
-{
-        if ((instance >= 0)
-         && (instance < NUM_ELEMENTS(aic79xx_rd_strm_info))) {
-                aic79xx_rd_strm_info[instance] = value & 0xFFFF;
-                if (bootverbose)
-                        printf("rd_strm[%d] = 0x%x\n", instance, value);
-        }
-}
-
-static void
-ahd_linux_setup_dv(u_long arg, int instance, int targ, int32_t value)
-{
-        if ((instance >= 0)
-         && (instance < NUM_ELEMENTS(aic79xx_dv_settings))) {
-                aic79xx_dv_settings[instance] = value;
-                if (bootverbose)
-                        printf("dv[%d] = %d\n", instance, value);
-        }
-}
-
-static void
 ahd_linux_setup_iocell_info(u_long index, int instance, int targ, int32_t value)
 {
 
@@ -1887,6 +886,99 @@ ahd_linux_setup_tag_info_global(char *p)
         }
 }
 
+static void
+ahd_linux_setup_tag_info(u_long arg, int instance, int targ, int32_t value)
+{
+
+        if ((instance >= 0) && (targ >= 0)
+         && (instance < NUM_ELEMENTS(aic79xx_tag_info))
+         && (targ < AHD_NUM_TARGETS)) {
+                aic79xx_tag_info[instance].tag_commands[targ] = value & 0x1FF;
+                if (bootverbose)
+                        printf("tag_info[%d:%d] = %d\n", instance, targ, value);
+        }
+}
+
+static char *
+ahd_parse_brace_option(char *opt_name, char *opt_arg, char *end, int depth,
+                       void (*callback)(u_long, int, int, int32_t),
+                       u_long callback_arg)
+{
+        char    *tok_end;
+        char    *tok_end2;
+        int      i;
+        int      instance;
+        int      targ;
+        int      done;
+        char     tok_list[] = {'.', ',', '{', '}', '\0'};
+
+        /* All options use a ':' name/arg separator */
+        if (*opt_arg != ':')
+                return (opt_arg);
+        opt_arg++;
+        instance = -1;
+        targ = -1;
+        done = FALSE;
+        /*
+         * Restore separator that may be in
+         * the middle of our option argument.
+         */
+        tok_end = strchr(opt_arg, '\0');
+        if (tok_end < end)
+                *tok_end = ',';
+        while (!done) {
+                switch (*opt_arg) {
+                case '{':
+                        if (instance == -1) {
+                                instance = 0;
+                        } else {
+                                if (depth > 1) {
+                                        if (targ == -1)
+                                                targ = 0;
+                                } else {
+                                        printf("Malformed Option %s\n",
+                                               opt_name);
+                                        done = TRUE;
+                                }
+                        }
+                        opt_arg++;
+                        break;
+                case '}':
+                        if (targ != -1)
+                                targ = -1;
+                        else if (instance != -1)
+                                instance = -1;
+                        opt_arg++;
+                        break;
+                case ',':
+                case '.':
+                        if (instance == -1)
+                                done = TRUE;
+                        else if (targ >= 0)
+                                targ++;
+                        else if (instance >= 0)
+                                instance++;
+                        opt_arg++;
+                        break;
+                case '\0':
+                        done = TRUE;
+                        break;
+                default:
+                        tok_end = end;
+                        for (i = 0; tok_list[i]; i++) {
+                                tok_end2 = strchr(opt_arg, tok_list[i]);
+                                if ((tok_end2) && (tok_end2 < tok_end))
+                                        tok_end = tok_end2;
+                        }
+                        callback(callback_arg, instance, targ,
+                                 simple_strtol(opt_arg, NULL, 0));
+                        opt_arg = tok_end;
+                        break;
+                }
+        }
+        return (opt_arg);
+}
+
 /*
  * Handle Linux boot parameters. This routine allows for assigning a value
  * to a parameter with a ':' between the parameter and the value.
@@ -1916,8 +1008,6 @@ aic79xx_setup(char *s)
                 { "seltime", &aic79xx_seltime },
                 { "tag_info", NULL },
                 { "global_tag_depth", NULL},
-                { "rd_strm", NULL },
-                { "dv", NULL },
                 { "slewrate", NULL },
                 { "precomp", NULL },
                 { "amplitude", NULL },
@@ -1946,24 +1036,18 @@ aic79xx_setup(char *s)
                 if (strncmp(p, "global_tag_depth", n) == 0) {
                         ahd_linux_setup_tag_info_global(p + n);
                 } else if (strncmp(p, "tag_info", n) == 0) {
-                        s = aic_parse_brace_option("tag_info", p + n, end,
+                        s = ahd_parse_brace_option("tag_info", p + n, end,
                             2, ahd_linux_setup_tag_info, 0);
-                } else if (strncmp(p, "rd_strm", n) == 0) {
-                        s = aic_parse_brace_option("rd_strm", p + n, end,
-                            1, ahd_linux_setup_rd_strm_info, 0);
-                } else if (strncmp(p, "dv", n) == 0) {
-                        s = aic_parse_brace_option("dv", p + n, end, 1,
-                            ahd_linux_setup_dv, 0);
                 } else if (strncmp(p, "slewrate", n) == 0) {
-                        s = aic_parse_brace_option("slewrate",
+                        s = ahd_parse_brace_option("slewrate",
                             p + n, end, 1, ahd_linux_setup_iocell_info,
                             AIC79XX_SLEWRATE_INDEX);
                 } else if (strncmp(p, "precomp", n) == 0) {
-                        s = aic_parse_brace_option("precomp",
+                        s = ahd_parse_brace_option("precomp",
                             p + n, end, 1, ahd_linux_setup_iocell_info,
                             AIC79XX_PRECOMP_INDEX);
                 } else if (strncmp(p, "amplitude", n) == 0) {
-                        s = aic_parse_brace_option("amplitude",
+                        s = ahd_parse_brace_option("amplitude",
                             p + n, end, 1, ahd_linux_setup_iocell_info,
                             AIC79XX_AMPLITUDE_INDEX);
                 } else if (p[n] == ':') {
@@ -1982,13 +1066,12 @@ __setup("aic79xx=", aic79xx_setup);
 uint32_t aic79xx_verbose;
 
 int
-ahd_linux_register_host(struct ahd_softc *ahd, Scsi_Host_Template *template)
+ahd_linux_register_host(struct ahd_softc *ahd, struct scsi_host_template *template)
 {
         char    buf[80];
         struct  Scsi_Host *host;
         char    *new_name;
         u_long  s;
-        u_long  target;
 
         template->name = ahd->description;
         host = scsi_host_alloc(template, sizeof(struct ahd_softc *));
@@ -1997,11 +1080,7 @@ ahd_linux_register_host(struct ahd_softc *ahd, Scsi_Host_Template *template)
 
         *((struct ahd_softc **)host->hostdata) = ahd;
         ahd_lock(ahd, &s);
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
         scsi_assign_lock(host, &ahd->platform_data->spin_lock);
-#elif AHD_SCSI_HAS_HOST_LOCK != 0
-        host->lock = &ahd->platform_data->spin_lock;
-#endif
         ahd->platform_data->host = host;
         host->can_queue = AHD_MAX_QUEUE;
         host->cmd_per_lun = 2;
@@ -2012,7 +1091,7 @@ ahd_linux_register_host(struct ahd_softc *ahd, Scsi_Host_Template *template)
         host->max_lun = AHD_NUM_LUNS;
         host->max_channel = 0;
         host->sg_tablesize = AHD_NSEG;
-        ahd_set_unit(ahd, ahd_linux_next_unit());
+        ahd_set_unit(ahd, ahd_linux_unit++);
         sprintf(buf, "scsi%d", host->host_no);
         new_name = malloc(strlen(buf) + 1, M_DEVBUF, M_NOWAIT);
         if (new_name != NULL) {
@@ -2020,54 +1099,14 @@ ahd_linux_register_host(struct ahd_softc *ahd, Scsi_Host_Template *template)
                 ahd_set_name(ahd, new_name);
         }
         host->unique_id = ahd->unit;
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-        scsi_set_pci_device(host, ahd->dev_softc);
-#endif
-        ahd_linux_setup_user_rd_strm_settings(ahd);
         ahd_linux_initialize_scsi_bus(ahd);
-        ahd_unlock(ahd, &s);
-        ahd->platform_data->dv_pid = kernel_thread(ahd_linux_dv_thread, ahd, 0);
-        ahd_lock(ahd, &s);
-        if (ahd->platform_data->dv_pid < 0) {
-                printf("%s: Failed to create DV thread, error= %d\n",
-                       ahd_name(ahd), ahd->platform_data->dv_pid);
-                return (-ahd->platform_data->dv_pid);
-        }
-        /*
-         * Initially allocate *all* of our linux target objects
-         * so that the DV thread will scan them all in parallel
-         * just after driver initialization.  Any device that
-         * does not exist will have its target object destroyed
-         * by the selection timeout handler.  In the case of a
-         * device that appears after the initial DV scan, async
-         * negotiation will occur for the first command, and DV
-         * will comence should that first command be successful.
-         */
-        for (target = 0; target < host->max_id; target++) {
-
-                /*
-                 * Skip our own ID.  Some Compaq/HP storage devices
-                 * have enclosure management devices that respond to
-                 * single bit selection (i.e. selecting ourselves).
-                 * It is expected that either an external application
-                 * or a modified kernel will be used to probe this
-                 * ID if it is appropriate.  To accommodate these
-                 * installations, ahc_linux_alloc_target() will allocate
-                 * for our ID if asked to do so.
-                 */
-                if (target == ahd->our_id) 
-                        continue;
-
-                ahd_linux_alloc_target(ahd, 0, target);
-        }
         ahd_intr_enable(ahd, TRUE);
-        ahd_linux_start_dv(ahd);
         ahd_unlock(ahd, &s);
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
+        host->transportt = ahd_linux_transport_template;
+
         scsi_add_host(host, &ahd->dev_softc->dev); /* XXX handle failure */
         scsi_scan_host(host);
-#endif
         return (0);
 }
 
@@ -2081,29 +1120,6 @@ ahd_linux_get_memsize(void)
 }
 
 /*
- * Find the smallest available unit number to use
- * for a new device.  We don't just use a static
- * count to handle the "repeated hot-(un)plug"
- * scenario.
- */
-static int
-ahd_linux_next_unit(void)
-{
-        struct ahd_softc *ahd;
-        int unit;
-
-        unit = 0;
-retry:
-        TAILQ_FOREACH(ahd, &ahd_tailq, links) {
-                if (ahd->unit == unit) {
-                        unit++;
-                        goto retry;
-                }
-        }
-        return (unit);
-}
-
-/*
  * Place the SCSI bus into a known state by either resetting it,
  * or forcing transfer negotiations on the next command to any
  * target.
@@ -2162,20 +1178,9 @@ ahd_platform_alloc(struct ahd_softc *ahd, void *platform_arg)
         if (ahd->platform_data == NULL)
                 return (ENOMEM);
         memset(ahd->platform_data, 0, sizeof(struct ahd_platform_data));
-        TAILQ_INIT(&ahd->platform_data->completeq);
-        TAILQ_INIT(&ahd->platform_data->device_runq);
         ahd->platform_data->irq = AHD_LINUX_NOIRQ;
-        ahd->platform_data->hw_dma_mask = 0xFFFFFFFF;
         ahd_lockinit(ahd);
-        ahd_done_lockinit(ahd);
-        init_timer(&ahd->platform_data->completeq_timer);
-        ahd->platform_data->completeq_timer.data = (u_long)ahd;
-        ahd->platform_data->completeq_timer.function =
-            (ahd_linux_callback_t *)ahd_linux_thread_run_complete_queue;
         init_MUTEX_LOCKED(&ahd->platform_data->eh_sem);
-        init_MUTEX_LOCKED(&ahd->platform_data->dv_sem);
-        init_MUTEX_LOCKED(&ahd->platform_data->dv_cmd_sem);
-        ahd_setup_runq_tasklet(ahd);
         ahd->seltime = (aic79xx_seltime & 0x3) << 4;
         return (0);
 }
@@ -2183,39 +1188,27 @@ ahd_platform_alloc(struct ahd_softc *ahd, void *platform_arg)
 void
 ahd_platform_free(struct ahd_softc *ahd)
 {
-        struct ahd_linux_target *targ;
-        struct ahd_linux_device *dev;
+        struct scsi_target *starget;
         int i, j;
 
         if (ahd->platform_data != NULL) {
-                del_timer_sync(&ahd->platform_data->completeq_timer);
-                ahd_linux_kill_dv_thread(ahd);
-                ahd_teardown_runq_tasklet(ahd);
                 if (ahd->platform_data->host != NULL) {
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
                         scsi_remove_host(ahd->platform_data->host);
-#endif
                         scsi_host_put(ahd->platform_data->host);
                 }
 
                 /* destroy all of the device and target objects */
                 for (i = 0; i < AHD_NUM_TARGETS; i++) {
-                        targ = ahd->platform_data->targets[i];
-                        if (targ != NULL) {
-                                /* Keep target around through the loop. */
-                                targ->refcount++;
+                        starget = ahd->platform_data->starget[i];
+                        if (starget != NULL) {
                                 for (j = 0; j < AHD_NUM_LUNS; j++) {
-
-                                        if (targ->devices[j] == NULL)
+                                        struct ahd_linux_target *targ =
+                                                scsi_transport_target_data(starget);
+                                        if (targ->sdev[j] == NULL)
                                                 continue;
-                                        dev = targ->devices[j];
-                                        ahd_linux_free_device(ahd, dev);
+                                        targ->sdev[j] = NULL;
                                 }
-                                /*
-                                 * Forcibly free the target now that
-                                 * all devices are gone.
-                                 */
-                                ahd_linux_free_target(ahd, targ);
+                                ahd->platform_data->starget[i] = NULL;
                         }
                 }
 
@@ -2233,16 +1226,6 @@ ahd_platform_free(struct ahd_softc *ahd)
                         release_mem_region(ahd->platform_data->mem_busaddr,
                                            0x1000);
                 }
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-                /*
-                 * In 2.4 we detach from the scsi midlayer before the PCI
-                 * layer invokes our remove callback.  No per-instance
-                 * detach is provided, so we must reach inside the PCI
-                 * subsystem's internals and detach our driver manually.
-                 */
-                if (ahd->dev_softc != NULL)
-                        ahd->dev_softc->driver = NULL;
-#endif
                 free(ahd->platform_data, M_DEVBUF);
         }
 }
@@ -2280,13 +1263,22 @@ void
 ahd_platform_set_tags(struct ahd_softc *ahd, struct ahd_devinfo *devinfo,
                       ahd_queue_alg alg)
 {
+        struct scsi_target *starget;
+        struct ahd_linux_target *targ;
         struct ahd_linux_device *dev;
+        struct scsi_device *sdev;
         int was_queuing;
         int now_queuing;
 
-        dev = ahd_linux_get_device(ahd, devinfo->channel - 'A',
-                                   devinfo->target,
-                                   devinfo->lun, /*alloc*/FALSE);
+        starget = ahd->platform_data->starget[devinfo->target];
+        targ = scsi_transport_target_data(starget);
+        BUG_ON(targ == NULL);
+        sdev = targ->sdev[devinfo->lun];
+        if (sdev == NULL)
+                return;
+
+        dev = scsi_transport_device_data(sdev);
+
         if (dev == NULL)
                 return;
         was_queuing = dev->flags & (AHD_DEV_Q_BASIC|AHD_DEV_Q_TAGGED);
@@ -2339,1434 +1331,37 @@ ahd_platform_set_tags(struct ahd_softc *ahd, struct ahd_devinfo *devinfo,
                 dev->maxtags = 0;
                 dev->openings =  1 - dev->active;
         }
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
-        if (dev->scsi_device != NULL) {
-                switch ((dev->flags & (AHD_DEV_Q_BASIC|AHD_DEV_Q_TAGGED))) {
-                case AHD_DEV_Q_BASIC:
-                        scsi_adjust_queue_depth(dev->scsi_device,
-                                                MSG_SIMPLE_TASK,
-                                                dev->openings + dev->active);
-                        break;
-                case AHD_DEV_Q_TAGGED:
-                        scsi_adjust_queue_depth(dev->scsi_device,
-                                                MSG_ORDERED_TASK,
-                                                dev->openings + dev->active);
-                        break;
-                default:
-                        /*
-                         * We allow the OS to queue 2 untagged transactions to
-                         * us at any time even though we can only execute them
-                         * serially on the controller/device.  This should
-                         * remove some latency.
-                         */
-                        scsi_adjust_queue_depth(dev->scsi_device,
-                                                /*NON-TAGGED*/0,
-                                                /*queue depth*/2);
-                        break;
-                }
-        }
-#endif
-}
-
-int
-ahd_platform_abort_scbs(struct ahd_softc *ahd, int target, char channel,
-                        int lun, u_int tag, role_t role, uint32_t status)
-{
-        int targ;
-        int maxtarg;
-        int maxlun;
-        int clun;
-        int count;
-
-        if (tag != SCB_LIST_NULL)
-                return (0);
-
-        targ = 0;
-        if (target != CAM_TARGET_WILDCARD) {
-                targ = target;
-                maxtarg = targ + 1;
-        } else {
-                maxtarg = (ahd->features & AHD_WIDE) ? 16 : 8;
-        }
-        clun = 0;
-        if (lun != CAM_LUN_WILDCARD) {
-                clun = lun;
-                maxlun = clun + 1;
-        } else {
-                maxlun = AHD_NUM_LUNS;
-        }
-
-        count = 0;
-        for (; targ < maxtarg; targ++) {
-
-                for (; clun < maxlun; clun++) {
-                        struct ahd_linux_device *dev;
-                        struct ahd_busyq *busyq;
-                        struct ahd_cmd *acmd;
-
-                        dev = ahd_linux_get_device(ahd, /*chan*/0, targ,
-                                                   clun, /*alloc*/FALSE);
-                        if (dev == NULL)
-                                continue;
-
-                        busyq = &dev->busyq;
-                        while ((acmd = TAILQ_FIRST(busyq)) != NULL) {
-                                Scsi_Cmnd *cmd;
-
-                                cmd = &acmd_scsi_cmd(acmd);
-                                TAILQ_REMOVE(busyq, acmd,
-                                             acmd_links.tqe);
-                                count++;
-                                cmd->result = status << 16;
-                                ahd_linux_queue_cmd_complete(ahd, cmd);
-                        }
-                }
-        }
-
-        return (count);
-}
-
-static void
-ahd_linux_thread_run_complete_queue(struct ahd_softc *ahd)
-{
-        u_long flags;
-
-        ahd_lock(ahd, &flags);
-        del_timer(&ahd->platform_data->completeq_timer);
-        ahd->platform_data->flags &= ~AHD_RUN_CMPLT_Q_TIMER;
-        ahd_linux_run_complete_queue(ahd);
-        ahd_unlock(ahd, &flags);
-}
-
-static void
-ahd_linux_start_dv(struct ahd_softc *ahd)
-{
-
-        /*
-         * Freeze the simq and signal ahd_linux_queue to not let any
-         * more commands through
-         */
-        if ((ahd->platform_data->flags & AHD_DV_ACTIVE) == 0) {
-#ifdef AHD_DEBUG
-                if (ahd_debug & AHD_SHOW_DV)
-                        printf("%s: Starting DV\n", ahd_name(ahd));
-#endif
-
-                ahd->platform_data->flags |= AHD_DV_ACTIVE;
-                ahd_freeze_simq(ahd);
-
-                /* Wake up the DV kthread */
-                up(&ahd->platform_data->dv_sem);
-        }
-}
-
-static int
-ahd_linux_dv_thread(void *data)
-{
-        struct  ahd_softc *ahd;
-        int     target;
-        u_long  s;
-
-        ahd = (struct ahd_softc *)data;
-
-#ifdef AHD_DEBUG
-        if (ahd_debug & AHD_SHOW_DV)
-                printf("In DV Thread\n");
-#endif
-
-        /*
-         * Complete thread creation.
-         */
-        lock_kernel();
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,60)
-        /*
-         * Don't care about any signals.
-         */
-        siginitsetinv(&current->blocked, 0);
-
-        daemonize();
-        sprintf(current->comm, "ahd_dv_%d", ahd->unit);
-#else
-        daemonize("ahd_dv_%d", ahd->unit);
-        current->flags |= PF_NOFREEZE;
-#endif
-        unlock_kernel();
-
-        while (1) {
-                /*
-                 * Use down_interruptible() rather than down() to
-                 * avoid inclusion in the load average.
-                 */
-                down_interruptible(&ahd->platform_data->dv_sem);
-
-                /* Check to see if we've been signaled to exit */
-                ahd_lock(ahd, &s);
-                if ((ahd->platform_data->flags & AHD_DV_SHUTDOWN) != 0) {
-                        ahd_unlock(ahd, &s);
-                        break;
-                }
-                ahd_unlock(ahd, &s);
-
-#ifdef AHD_DEBUG
-                if (ahd_debug & AHD_SHOW_DV)
-                        printf("%s: Beginning Domain Validation\n",
-                               ahd_name(ahd));
-#endif
-
-                /*
-                 * Wait for any pending commands to drain before proceeding.
-                 */
-                ahd_lock(ahd, &s);
-                while (LIST_FIRST(&ahd->pending_scbs) != NULL) {
-                        ahd->platform_data->flags |= AHD_DV_WAIT_SIMQ_EMPTY;
-                        ahd_unlock(ahd, &s);
-                        down_interruptible(&ahd->platform_data->dv_sem);
-                        ahd_lock(ahd, &s);
-                }
-
-                /*
-                 * Wait for the SIMQ to be released so that DV is the
-                 * only reason the queue is frozen.
-                 */
-                while (AHD_DV_SIMQ_FROZEN(ahd) == 0) {
-                        ahd->platform_data->flags |= AHD_DV_WAIT_SIMQ_RELEASE;
-                        ahd_unlock(ahd, &s);
-                        down_interruptible(&ahd->platform_data->dv_sem);
-                        ahd_lock(ahd, &s);
-                }
-                ahd_unlock(ahd, &s);
-
-                for (target = 0; target < AHD_NUM_TARGETS; target++)
-                        ahd_linux_dv_target(ahd, target);
-
-                ahd_lock(ahd, &s);
-                ahd->platform_data->flags &= ~AHD_DV_ACTIVE;
-                ahd_unlock(ahd, &s);
-
-                /*
-                 * Release the SIMQ so that normal commands are
-                 * allowed to continue on the bus.
-                 */
-                ahd_release_simq(ahd);
-        }
-        up(&ahd->platform_data->eh_sem);
-        return (0);
-}
-
-static void
-ahd_linux_kill_dv_thread(struct ahd_softc *ahd)
-{
-        u_long s;
-
-        ahd_lock(ahd, &s);
-        if (ahd->platform_data->dv_pid != 0) {
-                ahd->platform_data->flags |= AHD_DV_SHUTDOWN;
-                ahd_unlock(ahd, &s);
-                up(&ahd->platform_data->dv_sem);
-
-                /*
-                 * Use the eh_sem as an indicator that the
-                 * dv thread is exiting.  Note that the dv
-                 * thread must still return after performing
-                 * the up on our semaphore before it has
-                 * completely exited this module.  Unfortunately,
-                 * there seems to be no easy way to wait for the
-                 * exit of a thread for which you are not the
-                 * parent (dv threads are parented by init).
-                 * Cross your fingers...
-                 */
-                down(&ahd->platform_data->eh_sem);
-
-                /*
-                 * Mark the dv thread as already dead.  This
-                 * avoids attempting to kill it a second time.
-                 * This is necessary because we must kill the
-                 * DV thread before calling ahd_free() in the
-                 * module shutdown case to avoid bogus locking
-                 * in the SCSI mid-layer, but we ahd_free() is
-                 * called without killing the DV thread in the
-                 * instance detach case, so ahd_platform_free()
-                 * calls us again to verify that the DV thread
-                 * is dead.
-                 */
-                ahd->platform_data->dv_pid = 0;
-        } else {
-                ahd_unlock(ahd, &s);
-        }
-}
-
-#define AHD_LINUX_DV_INQ_SHORT_LEN      36
-#define AHD_LINUX_DV_INQ_LEN            256
-#define AHD_LINUX_DV_TIMEOUT            (HZ / 4)
-
-#define AHD_SET_DV_STATE(ahd, targ, newstate) \
-        ahd_set_dv_state(ahd, targ, newstate, __LINE__)
-
-static __inline void
-ahd_set_dv_state(struct ahd_softc *ahd, struct ahd_linux_target *targ,
-                 ahd_dv_state newstate, u_int line)
-{
-        ahd_dv_state oldstate;
-
-        oldstate = targ->dv_state;
-#ifdef AHD_DEBUG
-        if (ahd_debug & AHD_SHOW_DV)
-                printf("%s:%d: Going from state %d to state %d\n",
-                       ahd_name(ahd), line, oldstate, newstate);
-#endif
-
-        if (oldstate == newstate)
-                targ->dv_state_retry++;
-        else
-                targ->dv_state_retry = 0;
-        targ->dv_state = newstate;
-}
-
-static void
-ahd_linux_dv_target(struct ahd_softc *ahd, u_int target_offset)
-{
-        struct   ahd_devinfo devinfo;
-        struct   ahd_linux_target *targ;
-        struct   scsi_cmnd *cmd;
-        struct   scsi_device *scsi_dev;
-        struct   scsi_sense_data *sense;
-        uint8_t *buffer;
-        u_long   s;
-        u_int    timeout;
-        int      echo_size;
-
-        sense = NULL;
-        buffer = NULL;
-        echo_size = 0;
-        ahd_lock(ahd, &s);
-        targ = ahd->platform_data->targets[target_offset];
-        if (targ == NULL || (targ->flags & AHD_DV_REQUIRED) == 0) {
-                ahd_unlock(ahd, &s);
-                return;
-        }
-        ahd_compile_devinfo(&devinfo, ahd->our_id, targ->target, /*lun*/0,
-                            targ->channel + 'A', ROLE_INITIATOR);
-#ifdef AHD_DEBUG
-        if (ahd_debug & AHD_SHOW_DV) {
-                ahd_print_devinfo(ahd, &devinfo);
-                printf("Performing DV\n");
-        }
-#endif
-
-        ahd_unlock(ahd, &s);
-
-        cmd = malloc(sizeof(struct scsi_cmnd), M_DEVBUF, M_WAITOK);
-        scsi_dev = malloc(sizeof(struct scsi_device), M_DEVBUF, M_WAITOK);
-        scsi_dev->host = ahd->platform_data->host;
-        scsi_dev->id = devinfo.target;
-        scsi_dev->lun = devinfo.lun;
-        scsi_dev->channel = devinfo.channel - 'A';
-        ahd->platform_data->dv_scsi_dev = scsi_dev;
-
-        AHD_SET_DV_STATE(ahd, targ, AHD_DV_STATE_INQ_SHORT_ASYNC);
-
-        while (targ->dv_state != AHD_DV_STATE_EXIT) {
-                timeout = AHD_LINUX_DV_TIMEOUT;
-                switch (targ->dv_state) {
-                case AHD_DV_STATE_INQ_SHORT_ASYNC:
-                case AHD_DV_STATE_INQ_ASYNC:
-                case AHD_DV_STATE_INQ_ASYNC_VERIFY:
-                        /*
-                         * Set things to async narrow to reduce the
-                         * chance that the INQ will fail.
-                         */
-                        ahd_lock(ahd, &s);
-                        ahd_set_syncrate(ahd, &devinfo, 0, 0, 0,
-                                         AHD_TRANS_GOAL, /*paused*/FALSE);
-                        ahd_set_width(ahd, &devinfo, MSG_EXT_WDTR_BUS_8_BIT,
-                                      AHD_TRANS_GOAL, /*paused*/FALSE);
-                        ahd_unlock(ahd, &s);
-                        timeout = 10 * HZ;
-                        targ->flags &= ~AHD_INQ_VALID;
-                        /* FALLTHROUGH */
-                case AHD_DV_STATE_INQ_VERIFY:
-                {
-                        u_int inq_len;
-
-                        if (targ->dv_state == AHD_DV_STATE_INQ_SHORT_ASYNC)
-                                inq_len = AHD_LINUX_DV_INQ_SHORT_LEN;
-                        else
-                                inq_len = targ->inq_data->additional_length + 5;
-                        ahd_linux_dv_inq(ahd, cmd, &devinfo, targ, inq_len);
-                        break;
-                }
-                case AHD_DV_STATE_TUR:
-                case AHD_DV_STATE_BUSY:
-                        timeout = 5 * HZ;
-                        ahd_linux_dv_tur(ahd, cmd, &devinfo);
-                        break;
-                case AHD_DV_STATE_REBD:
-                        ahd_linux_dv_rebd(ahd, cmd, &devinfo, targ);
-                        break;
-                case AHD_DV_STATE_WEB:
-                        ahd_linux_dv_web(ahd, cmd, &devinfo, targ);
-                        break;
-
-                case AHD_DV_STATE_REB:
-                        ahd_linux_dv_reb(ahd, cmd, &devinfo, targ);
-                        break;
-
-                case AHD_DV_STATE_SU:
-                        ahd_linux_dv_su(ahd, cmd, &devinfo, targ);
-                        timeout = 50 * HZ;
-                        break;
-
-                default:
-                        ahd_print_devinfo(ahd, &devinfo);
-                        printf("Unknown DV state %d\n", targ->dv_state);
-                        goto out;
-                }
-
-                /* Queue the command and wait for it to complete */
-                /* Abuse eh_timeout in the scsi_cmnd struct for our purposes */
-                init_timer(&cmd->eh_timeout);
-#ifdef AHD_DEBUG
-                if ((ahd_debug & AHD_SHOW_MESSAGES) != 0)
-                        /*
-                         * All of the printfs during negotiation
-                         * really slow down the negotiation.
-                         * Add a bit of time just to be safe.
-                         */
-                        timeout += HZ;
-#endif
-                scsi_add_timer(cmd, timeout, ahd_linux_dv_timeout);
-                /*
-                 * In 2.5.X, it is assumed that all calls from the
-                 * "midlayer" (which we are emulating) will have the
-                 * ahd host lock held.  For other kernels, the
-                 * io_request_lock must be held.
-                 */
-#if AHD_SCSI_HAS_HOST_LOCK != 0
-                ahd_lock(ahd, &s);
-#else
-                spin_lock_irqsave(&io_request_lock, s);
-#endif
-                ahd_linux_queue(cmd, ahd_linux_dv_complete);
-#if AHD_SCSI_HAS_HOST_LOCK != 0
-                ahd_unlock(ahd, &s);
-#else
-                spin_unlock_irqrestore(&io_request_lock, s);
-#endif
-                down_interruptible(&ahd->platform_data->dv_cmd_sem);
-                /*
-                 * Wait for the SIMQ to be released so that DV is the
-                 * only reason the queue is frozen.
-                 */
-                ahd_lock(ahd, &s);
-                while (AHD_DV_SIMQ_FROZEN(ahd) == 0) {
-                        ahd->platform_data->flags |= AHD_DV_WAIT_SIMQ_RELEASE;
-                        ahd_unlock(ahd, &s);
-                        down_interruptible(&ahd->platform_data->dv_sem);
-                        ahd_lock(ahd, &s);
-                }
-                ahd_unlock(ahd, &s);
-
-                ahd_linux_dv_transition(ahd, cmd, &devinfo, targ);
-        }
-
-out:
-        if ((targ->flags & AHD_INQ_VALID) != 0
-         && ahd_linux_get_device(ahd, devinfo.channel - 'A',
-                                 devinfo.target, devinfo.lun,
-                                 /*alloc*/FALSE) == NULL) {
-                /*
-                 * The DV state machine failed to configure this device.  
-                 * This is normal if DV is disabled.  Since we have inquiry
-                 * data, filter it and use the "optimistic" negotiation
-                 * parameters found in the inquiry string.
-                 */
-                ahd_linux_filter_inquiry(ahd, &devinfo);
-                if ((targ->flags & (AHD_BASIC_DV|AHD_ENHANCED_DV)) != 0) {
-                        ahd_print_devinfo(ahd, &devinfo);
-                        printf("DV failed to configure device.  "
-                               "Please file a bug report against "
-                               "this driver.\n");
-                }
-        }
-
-        if (cmd != NULL)
-                free(cmd, M_DEVBUF);
-
-        if (ahd->platform_data->dv_scsi_dev != NULL) {
-                free(ahd->platform_data->dv_scsi_dev, M_DEVBUF);
-                ahd->platform_data->dv_scsi_dev = NULL;
-        }
-
-        ahd_lock(ahd, &s);
-        if (targ->dv_buffer != NULL) {
-                free(targ->dv_buffer, M_DEVBUF);
-                targ->dv_buffer = NULL;
-        }
-        if (targ->dv_buffer1 != NULL) {
-                free(targ->dv_buffer1, M_DEVBUF);
-                targ->dv_buffer1 = NULL;
-        }
-        targ->flags &= ~AHD_DV_REQUIRED;
-        if (targ->refcount == 0)
-                ahd_linux_free_target(ahd, targ);
-        ahd_unlock(ahd, &s);
-}
-
-static __inline int
-ahd_linux_dv_fallback(struct ahd_softc *ahd, struct ahd_devinfo *devinfo)
-{
-        u_long s;
-        int retval;
-
-        ahd_lock(ahd, &s);
-        retval = ahd_linux_fallback(ahd, devinfo);
-        ahd_unlock(ahd, &s);
-
-        return (retval);
-}
-
-static void
-ahd_linux_dv_transition(struct ahd_softc *ahd, struct scsi_cmnd *cmd,
-                        struct ahd_devinfo *devinfo,
-                        struct ahd_linux_target *targ)
-{
-        u_int32_t status;
-
-        status = aic_error_action(cmd, targ->inq_data,
-                                  ahd_cmd_get_transaction_status(cmd),
-                                  ahd_cmd_get_scsi_status(cmd));
-
-        
-#ifdef AHD_DEBUG
-        if (ahd_debug & AHD_SHOW_DV) {
-                ahd_print_devinfo(ahd, devinfo);
-                printf("Entering ahd_linux_dv_transition, state= %d, "
-                       "status= 0x%x, cmd->result= 0x%x\n", targ->dv_state,
-                       status, cmd->result);
-        }
-#endif
 
-        switch (targ->dv_state) {
-        case AHD_DV_STATE_INQ_SHORT_ASYNC:
-        case AHD_DV_STATE_INQ_ASYNC:
-                switch (status & SS_MASK) {
-                case SS_NOP:
-                {
-                        AHD_SET_DV_STATE(ahd, targ, targ->dv_state+1);
-                        break;
-                }
-                case SS_INQ_REFRESH:
-                        AHD_SET_DV_STATE(ahd, targ,
-                                         AHD_DV_STATE_INQ_SHORT_ASYNC);
-                        break;
-                case SS_TUR:
-                case SS_RETRY:
-                        AHD_SET_DV_STATE(ahd, targ, targ->dv_state);
-                        if (ahd_cmd_get_transaction_status(cmd)
-                         == CAM_REQUEUE_REQ)
-                                targ->dv_state_retry--;
-                        if ((status & SS_ERRMASK) == EBUSY)
-                                AHD_SET_DV_STATE(ahd, targ, AHD_DV_STATE_BUSY);
-                        if (targ->dv_state_retry < 10)
-                                break;
-                        /* FALLTHROUGH */
-                default:
-                        AHD_SET_DV_STATE(ahd, targ, AHD_DV_STATE_EXIT);
-#ifdef AHD_DEBUG
-                        if (ahd_debug & AHD_SHOW_DV) {
-                                ahd_print_devinfo(ahd, devinfo);
-                                printf("Failed DV inquiry, skipping\n");
-                        }
-#endif
-                        break;
-                }
+        switch ((dev->flags & (AHD_DEV_Q_BASIC|AHD_DEV_Q_TAGGED))) {
+        case AHD_DEV_Q_BASIC:
+                scsi_adjust_queue_depth(sdev,
+                                        MSG_SIMPLE_TASK,
+                                        dev->openings + dev->active);
                 break;
-        case AHD_DV_STATE_INQ_ASYNC_VERIFY:
-                switch (status & SS_MASK) {
-                case SS_NOP:
-                {
-                        u_int xportflags;
-                        u_int spi3data;
-
-                        if (memcmp(targ->inq_data, targ->dv_buffer,
-                                   AHD_LINUX_DV_INQ_LEN) != 0) {
-                                /*
-                                 * Inquiry data must have changed.
-                                 * Try from the top again.
-                                 */
-                                AHD_SET_DV_STATE(ahd, targ,
-                                                 AHD_DV_STATE_INQ_SHORT_ASYNC);
-                                break;
-                        }
-
-                        AHD_SET_DV_STATE(ahd, targ, targ->dv_state+1);
-                        targ->flags |= AHD_INQ_VALID;
-                        if (ahd_linux_user_dv_setting(ahd) == 0)
-                                break;
-
-                        xportflags = targ->inq_data->flags;
-                        if ((xportflags & (SID_Sync|SID_WBus16)) == 0)
-                                break;
-
-                        spi3data = targ->inq_data->spi3data;
-                        switch (spi3data & SID_SPI_CLOCK_DT_ST) {
-                        default:
-                        case SID_SPI_CLOCK_ST:
-                                /* Assume only basic DV is supported. */
-                                targ->flags |= AHD_BASIC_DV;
-                                break;
-                        case SID_SPI_CLOCK_DT:
-                        case SID_SPI_CLOCK_DT_ST:
-                                targ->flags |= AHD_ENHANCED_DV;
-                                break;
-                        }
-                        break;
-                }
-                case SS_INQ_REFRESH:
-                        AHD_SET_DV_STATE(ahd, targ,
-                                         AHD_DV_STATE_INQ_SHORT_ASYNC);
-                        break;
-                case SS_TUR:
-                case SS_RETRY:
-                        AHD_SET_DV_STATE(ahd, targ, targ->dv_state);
-                        if (ahd_cmd_get_transaction_status(cmd)
-                         == CAM_REQUEUE_REQ)
-                                targ->dv_state_retry--;
-
-                        if ((status & SS_ERRMASK) == EBUSY)
-                                AHD_SET_DV_STATE(ahd, targ, AHD_DV_STATE_BUSY);
-                        if (targ->dv_state_retry < 10)
-                                break;
-                        /* FALLTHROUGH */
-                default:
-                        AHD_SET_DV_STATE(ahd, targ, AHD_DV_STATE_EXIT);
-#ifdef AHD_DEBUG
-                        if (ahd_debug & AHD_SHOW_DV) {
-                                ahd_print_devinfo(ahd, devinfo);
-                                printf("Failed DV inquiry, skipping\n");
-                        }
-#endif
-                        break;
-                }
+        case AHD_DEV_Q_TAGGED:
+                scsi_adjust_queue_depth(sdev,
+                                        MSG_ORDERED_TASK,
+                                        dev->openings + dev->active);
                 break;
-        case AHD_DV_STATE_INQ_VERIFY:
-                switch (status & SS_MASK) {
-                case SS_NOP:
-                {
-
-                        if (memcmp(targ->inq_data, targ->dv_buffer,
-                                   AHD_LINUX_DV_INQ_LEN) == 0) {
-                                AHD_SET_DV_STATE(ahd, targ, AHD_DV_STATE_EXIT);
-                                break;
-                        }
-
-#ifdef AHD_DEBUG
-                        if (ahd_debug & AHD_SHOW_DV) {
-                                int i;
-
-                                ahd_print_devinfo(ahd, devinfo);
-                                printf("Inquiry buffer mismatch:");
-                                for (i = 0; i < AHD_LINUX_DV_INQ_LEN; i++) {
-                                        if ((i & 0xF) == 0)
-                                                printf("\n        ");
-                                        printf("0x%x:0x0%x ",
-                                               ((uint8_t *)targ->inq_data)[i], 
-                                               targ->dv_buffer[i]);
-                                }
-                                printf("\n");
-                        }
-#endif
-
-                        if (ahd_linux_dv_fallback(ahd, devinfo) != 0) {
-                                AHD_SET_DV_STATE(ahd, targ, AHD_DV_STATE_EXIT);
-                                break;
-                        }
-                        /*
-                         * Do not count "falling back"
-                         * against our retries.
-                         */
-                        targ->dv_state_retry = 0;
-                        AHD_SET_DV_STATE(ahd, targ, targ->dv_state);
-                        break;
-                }
-                case SS_INQ_REFRESH:
-                        AHD_SET_DV_STATE(ahd, targ,
-                                         AHD_DV_STATE_INQ_SHORT_ASYNC);
-                        break;
-                case SS_TUR:
-                case SS_RETRY:
-                        AHD_SET_DV_STATE(ahd, targ, targ->dv_state);
-                        if (ahd_cmd_get_transaction_status(cmd)
-                         == CAM_REQUEUE_REQ) {
-                                targ->dv_state_retry--;
-                        } else if ((status & SSQ_FALLBACK) != 0) {
-                                if (ahd_linux_dv_fallback(ahd, devinfo) != 0) {
-                                        AHD_SET_DV_STATE(ahd, targ,
-                                                         AHD_DV_STATE_EXIT);
-                                        break;
-                                }
-                                /*
-                                 * Do not count "falling back"
-                                 * against our retries.
-                                 */
-                                targ->dv_state_retry = 0;
-                        } else if ((status & SS_ERRMASK) == EBUSY)
-                                AHD_SET_DV_STATE(ahd, targ, AHD_DV_STATE_BUSY);
-                        if (targ->dv_state_retry < 10)
-                                break;
-                        /* FALLTHROUGH */
-                default:
-                        AHD_SET_DV_STATE(ahd, targ, AHD_DV_STATE_EXIT);
-#ifdef AHD_DEBUG
-                        if (ahd_debug & AHD_SHOW_DV) {
-                                ahd_print_devinfo(ahd, devinfo);
-                                printf("Failed DV inquiry, skipping\n");
-                        }
-#endif
-                        break;
-                }
-                break;
-
-        case AHD_DV_STATE_TUR:
-                switch (status & SS_MASK) {
-                case SS_NOP:
-                        if ((targ->flags & AHD_BASIC_DV) != 0) {
-                                ahd_linux_filter_inquiry(ahd, devinfo);
-                                AHD_SET_DV_STATE(ahd, targ,
-                                                 AHD_DV_STATE_INQ_VERIFY);
-                        } else if ((targ->flags & AHD_ENHANCED_DV) != 0) {
-                                AHD_SET_DV_STATE(ahd, targ, AHD_DV_STATE_REBD);
-                        } else {
-                                AHD_SET_DV_STATE(ahd, targ, AHD_DV_STATE_EXIT);
-                        }
-                        break;
-                case SS_RETRY:
-                case SS_TUR:
-                        if ((status & SS_ERRMASK) == EBUSY) {
-                                AHD_SET_DV_STATE(ahd, targ, AHD_DV_STATE_BUSY);
-                                break;
-                        }
-                        AHD_SET_DV_STATE(ahd, targ, targ->dv_state);
-                        if (ahd_cmd_get_transaction_status(cmd)
-                         == CAM_REQUEUE_REQ) {
-                                targ->dv_state_retry--;
-                        } else if ((status & SSQ_FALLBACK) != 0) {
-                                if (ahd_linux_dv_fallback(ahd, devinfo) != 0) {
-                                        AHD_SET_DV_STATE(ahd, targ,
-                                                         AHD_DV_STATE_EXIT);
-                                        break;
-                                }
-                                /*
-                                 * Do not count "falling back"
-                                 * against our retries.
-                                 */
-                                targ->dv_state_retry = 0;
-                        }
-                        if (targ->dv_state_retry >= 10) {
-#ifdef AHD_DEBUG
-                                if (ahd_debug & AHD_SHOW_DV) {
-                                        ahd_print_devinfo(ahd, devinfo);
-                                        printf("DV TUR reties exhausted\n");
-                                }
-#endif
-                                AHD_SET_DV_STATE(ahd, targ, AHD_DV_STATE_EXIT);
-                                break;
-                        }
-                        if (status & SSQ_DELAY)
-                                ssleep(1);
-
-                        break;
-                case SS_START:
-                        AHD_SET_DV_STATE(ahd, targ, AHD_DV_STATE_SU);
-                        break;
-                case SS_INQ_REFRESH:
-                        AHD_SET_DV_STATE(ahd, targ,
-                                         AHD_DV_STATE_INQ_SHORT_ASYNC);
-                        break;
-                default:
-                        AHD_SET_DV_STATE(ahd, targ, AHD_DV_STATE_EXIT);
-                        break;
-                }
-                break;
-
-        case AHD_DV_STATE_REBD:
-                switch (status & SS_MASK) {
-                case SS_NOP:
-                {
-                        uint32_t echo_size;
-
-                        AHD_SET_DV_STATE(ahd, targ, AHD_DV_STATE_WEB);
-                        echo_size = scsi_3btoul(&targ->dv_buffer[1]);
-                        echo_size &= 0x1FFF;
-#ifdef AHD_DEBUG
-                        if (ahd_debug & AHD_SHOW_DV) {
-                                ahd_print_devinfo(ahd, devinfo);
-                                printf("Echo buffer size= %d\n", echo_size);
-                        }
-#endif
-                        if (echo_size == 0) {
-                                AHD_SET_DV_STATE(ahd, targ, AHD_DV_STATE_EXIT);
-                                break;
-                        }
-
-                        /* Generate the buffer pattern */
-                        targ->dv_echo_size = echo_size;
-                        ahd_linux_generate_dv_pattern(targ);
-                        /*
-                         * Setup initial negotiation values.
-                         */
-                        ahd_linux_filter_inquiry(ahd, devinfo);
-                        break;
-                }
-                case SS_INQ_REFRESH:
-                        AHD_SET_DV_STATE(ahd, targ,
-                                         AHD_DV_STATE_INQ_SHORT_ASYNC);
-                        break;
-                case SS_RETRY:
-                        AHD_SET_DV_STATE(ahd, targ, targ->dv_state);
-                        if (ahd_cmd_get_transaction_status(cmd)
-                         == CAM_REQUEUE_REQ)
-                                targ->dv_state_retry--;
-                        if (targ->dv_state_retry <= 10)
-                                break;
-#ifdef AHD_DEBUG
-                        if (ahd_debug & AHD_SHOW_DV) {
-                                ahd_print_devinfo(ahd, devinfo);
-                                printf("DV REBD reties exhausted\n");
-                        }
-#endif
-                        /* FALLTHROUGH */
-                case SS_FATAL:
-                default:
-                        /*
-                         * Setup initial negotiation values
-                         * and try level 1 DV.
-                         */
-                        ahd_linux_filter_inquiry(ahd, devinfo);
-                        AHD_SET_DV_STATE(ahd, targ, AHD_DV_STATE_INQ_VERIFY);
-                        targ->dv_echo_size = 0;
-                        break;
-                }
-                break;
-
-        case AHD_DV_STATE_WEB:
-                switch (status & SS_MASK) {
-                case SS_NOP:
-                        AHD_SET_DV_STATE(ahd, targ, AHD_DV_STATE_REB);
-                        break;
-                case SS_INQ_REFRESH:
-                        AHD_SET_DV_STATE(ahd, targ,
-                                         AHD_DV_STATE_INQ_SHORT_ASYNC);
-                        break;
-                case SS_RETRY:
-                        AHD_SET_DV_STATE(ahd, targ, targ->dv_state);
-                        if (ahd_cmd_get_transaction_status(cmd)
-                         == CAM_REQUEUE_REQ) {
-                                targ->dv_state_retry--;
-                        } else if ((status & SSQ_FALLBACK) != 0) {
-                                if (ahd_linux_dv_fallback(ahd, devinfo) != 0) {
-                                        AHD_SET_DV_STATE(ahd, targ,
-                                                         AHD_DV_STATE_EXIT);
-                                        break;
-                                }
-                                /*
-                                 * Do not count "falling back"
-                                 * against our retries.
-                                 */
-                                targ->dv_state_retry = 0;
-                        }
-                        if (targ->dv_state_retry <= 10)
-                                break;
-                        /* FALLTHROUGH */
-#ifdef AHD_DEBUG
-                        if (ahd_debug & AHD_SHOW_DV) {
-                                ahd_print_devinfo(ahd, devinfo);
-                                printf("DV WEB reties exhausted\n");
-                        }
-#endif
-                default:
-                        AHD_SET_DV_STATE(ahd, targ, AHD_DV_STATE_EXIT);
-                        break;
-                }
-                break;
-
-        case AHD_DV_STATE_REB:
-                switch (status & SS_MASK) {
-                case SS_NOP:
-                        if (memcmp(targ->dv_buffer, targ->dv_buffer1,
-                                   targ->dv_echo_size) != 0) {
-                                if (ahd_linux_dv_fallback(ahd, devinfo) != 0)
-                                        AHD_SET_DV_STATE(ahd, targ,
-                                                         AHD_DV_STATE_EXIT);
-                                else
-                                        AHD_SET_DV_STATE(ahd, targ,
-                                                         AHD_DV_STATE_WEB);
-                                break;
-                        }
-                        
-                        if (targ->dv_buffer != NULL) {
-                                free(targ->dv_buffer, M_DEVBUF);
-                                targ->dv_buffer = NULL;
-                        }
-                        if (targ->dv_buffer1 != NULL) {
-                                free(targ->dv_buffer1, M_DEVBUF);
-                                targ->dv_buffer1 = NULL;
-                        }
-                        AHD_SET_DV_STATE(ahd, targ, AHD_DV_STATE_EXIT);
-                        break;
-                case SS_INQ_REFRESH:
-                        AHD_SET_DV_STATE(ahd, targ,
-                                         AHD_DV_STATE_INQ_SHORT_ASYNC);
-                        break;
-                case SS_RETRY:
-                        AHD_SET_DV_STATE(ahd, targ, targ->dv_state);
-                        if (ahd_cmd_get_transaction_status(cmd)
-                         == CAM_REQUEUE_REQ) {
-                                targ->dv_state_retry--;
-                        } else if ((status & SSQ_FALLBACK) != 0) {
-                                if (ahd_linux_dv_fallback(ahd, devinfo) != 0) {
-                                        AHD_SET_DV_STATE(ahd, targ,
-                                                         AHD_DV_STATE_EXIT);
-                                        break;
-                                }
-                                AHD_SET_DV_STATE(ahd, targ, AHD_DV_STATE_WEB);
-                        }
-                        if (targ->dv_state_retry <= 10) {
-                                if ((status & (SSQ_DELAY_RANDOM|SSQ_DELAY))!= 0)
-                                        msleep(ahd->our_id*1000/10);
-                                break;
-                        }
-#ifdef AHD_DEBUG
-                        if (ahd_debug & AHD_SHOW_DV) {
-                                ahd_print_devinfo(ahd, devinfo);
-                                printf("DV REB reties exhausted\n");
-                        }
-#endif
-                        /* FALLTHROUGH */
-                default:
-                        AHD_SET_DV_STATE(ahd, targ, AHD_DV_STATE_EXIT);
-                        break;
-                }
-                break;
-
-        case AHD_DV_STATE_SU:
-                switch (status & SS_MASK) {
-                case SS_NOP:
-                case SS_INQ_REFRESH:
-                        AHD_SET_DV_STATE(ahd, targ,
-                                         AHD_DV_STATE_INQ_SHORT_ASYNC);
-                        break;
-                default:
-                        AHD_SET_DV_STATE(ahd, targ, AHD_DV_STATE_EXIT);
-                        break;
-                }
-                break;
-
-        case AHD_DV_STATE_BUSY:
-                switch (status & SS_MASK) {
-                case SS_NOP:
-                case SS_INQ_REFRESH:
-                        AHD_SET_DV_STATE(ahd, targ,
-                                         AHD_DV_STATE_INQ_SHORT_ASYNC);
-                        break;
-                case SS_TUR:
-                case SS_RETRY:
-                        AHD_SET_DV_STATE(ahd, targ, targ->dv_state);
-                        if (ahd_cmd_get_transaction_status(cmd)
-                         == CAM_REQUEUE_REQ) {
-                                targ->dv_state_retry--;
-                        } else if (targ->dv_state_retry < 60) {
-                                if ((status & SSQ_DELAY) != 0)
-                                        ssleep(1);
-                        } else {
-#ifdef AHD_DEBUG
-                                if (ahd_debug & AHD_SHOW_DV) {
-                                        ahd_print_devinfo(ahd, devinfo);
-                                        printf("DV BUSY reties exhausted\n");
-                                }
-#endif
-                                AHD_SET_DV_STATE(ahd, targ, AHD_DV_STATE_EXIT);
-                        }
-                        break;
-                default:
-                        AHD_SET_DV_STATE(ahd, targ, AHD_DV_STATE_EXIT);
-                        break;
-                }
-                break;
-
         default:
-                printf("%s: Invalid DV completion state %d\n", ahd_name(ahd),
-                       targ->dv_state);
-                AHD_SET_DV_STATE(ahd, targ, AHD_DV_STATE_EXIT);
-                break;
-        }
-}
-
-static void
-ahd_linux_dv_fill_cmd(struct ahd_softc *ahd, struct scsi_cmnd *cmd,
-                      struct ahd_devinfo *devinfo)
-{
-        memset(cmd, 0, sizeof(struct scsi_cmnd));
-        cmd->device = ahd->platform_data->dv_scsi_dev;
-        cmd->scsi_done = ahd_linux_dv_complete;
-}
-
-/*
- * Synthesize an inquiry command.  On the return trip, it'll be
- * sniffed and the device transfer settings set for us.
- */
-static void
-ahd_linux_dv_inq(struct ahd_softc *ahd, struct scsi_cmnd *cmd,
-                 struct ahd_devinfo *devinfo, struct ahd_linux_target *targ,
-                 u_int request_length)
-{
-
-#ifdef AHD_DEBUG
-        if (ahd_debug & AHD_SHOW_DV) {
-                ahd_print_devinfo(ahd, devinfo);
-                printf("Sending INQ\n");
-        }
-#endif
-        if (targ->inq_data == NULL)
-                targ->inq_data = malloc(AHD_LINUX_DV_INQ_LEN,
-                                        M_DEVBUF, M_WAITOK);
-        if (targ->dv_state > AHD_DV_STATE_INQ_ASYNC) {
-                if (targ->dv_buffer != NULL)
-                        free(targ->dv_buffer, M_DEVBUF);
-                targ->dv_buffer = malloc(AHD_LINUX_DV_INQ_LEN,
-                                         M_DEVBUF, M_WAITOK);
-        }
-
-        ahd_linux_dv_fill_cmd(ahd, cmd, devinfo);
-        cmd->sc_data_direction = DMA_FROM_DEVICE;
-        cmd->cmd_len = 6;
-        cmd->cmnd[0] = INQUIRY;
-        cmd->cmnd[4] = request_length;
-        cmd->request_bufflen = request_length;
-        if (targ->dv_state > AHD_DV_STATE_INQ_ASYNC)
-                cmd->request_buffer = targ->dv_buffer;
-        else
-                cmd->request_buffer = targ->inq_data;
-        memset(cmd->request_buffer, 0, AHD_LINUX_DV_INQ_LEN);
-}
-
-static void
-ahd_linux_dv_tur(struct ahd_softc *ahd, struct scsi_cmnd *cmd,
-                 struct ahd_devinfo *devinfo)
-{
-
-#ifdef AHD_DEBUG
-        if (ahd_debug & AHD_SHOW_DV) {
-                ahd_print_devinfo(ahd, devinfo);
-                printf("Sending TUR\n");
-        }
-#endif
-        /* Do a TUR to clear out any non-fatal transitional state */
-        ahd_linux_dv_fill_cmd(ahd, cmd, devinfo);
-        cmd->sc_data_direction = DMA_NONE;
-        cmd->cmd_len = 6;
-        cmd->cmnd[0] = TEST_UNIT_READY;
-}
-
-#define AHD_REBD_LEN 4
-
-static void
-ahd_linux_dv_rebd(struct ahd_softc *ahd, struct scsi_cmnd *cmd,
-                 struct ahd_devinfo *devinfo, struct ahd_linux_target *targ)
-{
-
-#ifdef AHD_DEBUG
-        if (ahd_debug & AHD_SHOW_DV) {
-                ahd_print_devinfo(ahd, devinfo);
-                printf("Sending REBD\n");
-        }
-#endif
-        if (targ->dv_buffer != NULL)
-                free(targ->dv_buffer, M_DEVBUF);
-        targ->dv_buffer = malloc(AHD_REBD_LEN, M_DEVBUF, M_WAITOK);
-        ahd_linux_dv_fill_cmd(ahd, cmd, devinfo);
-        cmd->sc_data_direction = DMA_FROM_DEVICE;
-        cmd->cmd_len = 10;
-        cmd->cmnd[0] = READ_BUFFER;
-        cmd->cmnd[1] = 0x0b;
-        scsi_ulto3b(AHD_REBD_LEN, &cmd->cmnd[6]);
-        cmd->request_bufflen = AHD_REBD_LEN;
-        cmd->underflow = cmd->request_bufflen;
-        cmd->request_buffer = targ->dv_buffer;
-}
-
-static void
-ahd_linux_dv_web(struct ahd_softc *ahd, struct scsi_cmnd *cmd,
-                 struct ahd_devinfo *devinfo, struct ahd_linux_target *targ)
-{
-
-#ifdef AHD_DEBUG
-        if (ahd_debug & AHD_SHOW_DV) {
-                ahd_print_devinfo(ahd, devinfo);
-                printf("Sending WEB\n");
-        }
-#endif
-        ahd_linux_dv_fill_cmd(ahd, cmd, devinfo);
-        cmd->sc_data_direction = DMA_TO_DEVICE;
-        cmd->cmd_len = 10;
-        cmd->cmnd[0] = WRITE_BUFFER;
-        cmd->cmnd[1] = 0x0a;
-        scsi_ulto3b(targ->dv_echo_size, &cmd->cmnd[6]);
-        cmd->request_bufflen = targ->dv_echo_size;
-        cmd->underflow = cmd->request_bufflen;
-        cmd->request_buffer = targ->dv_buffer;
-}
-
-static void
-ahd_linux_dv_reb(struct ahd_softc *ahd, struct scsi_cmnd *cmd,
-                 struct ahd_devinfo *devinfo, struct ahd_linux_target *targ)
-{
-
-#ifdef AHD_DEBUG
-        if (ahd_debug & AHD_SHOW_DV) {
-                ahd_print_devinfo(ahd, devinfo);
-                printf("Sending REB\n");
-        }
-#endif
-        ahd_linux_dv_fill_cmd(ahd, cmd, devinfo);
-        cmd->sc_data_direction = DMA_FROM_DEVICE;
-        cmd->cmd_len = 10;
-        cmd->cmnd[0] = READ_BUFFER;
-        cmd->cmnd[1] = 0x0a;
-        scsi_ulto3b(targ->dv_echo_size, &cmd->cmnd[6]);
-        cmd->request_bufflen = targ->dv_echo_size;
-        cmd->underflow = cmd->request_bufflen;
-        cmd->request_buffer = targ->dv_buffer1;
-}
-
-static void
-ahd_linux_dv_su(struct ahd_softc *ahd, struct scsi_cmnd *cmd,
-                struct ahd_devinfo *devinfo,
-                struct ahd_linux_target *targ)
-{
-        u_int le;
-
-        le = SID_IS_REMOVABLE(targ->inq_data) ? SSS_LOEJ : 0;
-
-#ifdef AHD_DEBUG
-        if (ahd_debug & AHD_SHOW_DV) {
-                ahd_print_devinfo(ahd, devinfo);
-                printf("Sending SU\n");
-        }
-#endif
-        ahd_linux_dv_fill_cmd(ahd, cmd, devinfo);
-        cmd->sc_data_direction = DMA_NONE;
-        cmd->cmd_len = 6;
-        cmd->cmnd[0] = START_STOP_UNIT;
-        cmd->cmnd[4] = le | SSS_START;
-}
-
-static int
-ahd_linux_fallback(struct ahd_softc *ahd, struct ahd_devinfo *devinfo)
-{
-        struct  ahd_linux_target *targ;
-        struct  ahd_initiator_tinfo *tinfo;
-        struct  ahd_transinfo *goal;
-        struct  ahd_tmode_tstate *tstate;
-        u_int   width;
-        u_int   period;
-        u_int   offset;
-        u_int   ppr_options;
-        u_int   cur_speed;
-        u_int   wide_speed;
-        u_int   narrow_speed;
-        u_int   fallback_speed;
-
-#ifdef AHD_DEBUG
-        if (ahd_debug & AHD_SHOW_DV) {
-                ahd_print_devinfo(ahd, devinfo);
-                printf("Trying to fallback\n");
-        }
-#endif
-        targ = ahd->platform_data->targets[devinfo->target_offset];
-        tinfo = ahd_fetch_transinfo(ahd, devinfo->channel,
-                                    devinfo->our_scsiid,
-                                    devinfo->target, &tstate);
-        goal = &tinfo->goal;
-        width = goal->width;
-        period = goal->period;
-        offset = goal->offset;
-        ppr_options = goal->ppr_options;
-        if (offset == 0)
-                period = AHD_ASYNC_XFER_PERIOD;
-        if (targ->dv_next_narrow_period == 0)
-                targ->dv_next_narrow_period = MAX(period, AHD_SYNCRATE_ULTRA2);
-        if (targ->dv_next_wide_period == 0)
-                targ->dv_next_wide_period = period;
-        if (targ->dv_max_width == 0)
-                targ->dv_max_width = width;
-        if (targ->dv_max_ppr_options == 0)
-                targ->dv_max_ppr_options = ppr_options;
-        if (targ->dv_last_ppr_options == 0)
-                targ->dv_last_ppr_options = ppr_options;
-
-        cur_speed = aic_calc_speed(width, period, offset, AHD_SYNCRATE_MIN);
-        wide_speed = aic_calc_speed(MSG_EXT_WDTR_BUS_16_BIT,
-                                          targ->dv_next_wide_period,
-                                          MAX_OFFSET, AHD_SYNCRATE_MIN);
-        narrow_speed = aic_calc_speed(MSG_EXT_WDTR_BUS_8_BIT,
-                                            targ->dv_next_narrow_period,
-                                            MAX_OFFSET, AHD_SYNCRATE_MIN);
-        fallback_speed = aic_calc_speed(width, period+1, offset,
-                                              AHD_SYNCRATE_MIN);
-#ifdef AHD_DEBUG
-        if (ahd_debug & AHD_SHOW_DV) {
-                printf("cur_speed= %d, wide_speed= %d, narrow_speed= %d, "
-                       "fallback_speed= %d\n", cur_speed, wide_speed,
-                       narrow_speed, fallback_speed);
-        }
-#endif
-
-        if (cur_speed > 160000) {
-                /*
-                 * Paced/DT/IU_REQ only transfer speeds.  All we
-                 * can do is fallback in terms of syncrate.
-                 */
-                period++;
-        } else if (cur_speed > 80000) {
-                if ((ppr_options & MSG_EXT_PPR_IU_REQ) != 0) {
-                        /*
-                         * Try without IU_REQ as it may be confusing
-                         * an expander.
-                         */
-                        ppr_options &= ~MSG_EXT_PPR_IU_REQ;
-                } else {
-                        /*
-                         * Paced/DT only transfer speeds.  All we
-                         * can do is fallback in terms of syncrate.
-                         */
-                        period++;
-                        ppr_options = targ->dv_max_ppr_options;
-                }
-        } else if (cur_speed > 3300) {
-
                 /*
-                 * In this range we the following
-                 * options ordered from highest to
-                 * lowest desireability:
-                 *
-                 * o Wide/DT
-                 * o Wide/non-DT
-                 * o Narrow at a potentally higher sync rate.
-                 *
-                 * All modes are tested with and without IU_REQ
-                 * set since using IUs may confuse an expander.
+                 * We allow the OS to queue 2 untagged transactions to
+                 * us at any time even though we can only execute them
+                 * serially on the controller/device.  This should
+                 * remove some latency.
                  */
-                if ((ppr_options & MSG_EXT_PPR_IU_REQ) != 0) {
-
-                        ppr_options &= ~MSG_EXT_PPR_IU_REQ;
-                } else if ((ppr_options & MSG_EXT_PPR_DT_REQ) != 0) {
-                        /*
-                         * Try going non-DT.
-                         */
-                        ppr_options = targ->dv_max_ppr_options;
-                        ppr_options &= ~MSG_EXT_PPR_DT_REQ;
-                } else if (targ->dv_last_ppr_options != 0) {
-                        /*
-                         * Try without QAS or any other PPR options.
-                         * We may need a non-PPR message to work with
-                         * an expander.  We look at the "last PPR options"
-                         * so we will perform this fallback even if the
-                         * target responded to our PPR negotiation with
-                         * no option bits set.
-                         */
-                        ppr_options = 0;
-                } else if (width == MSG_EXT_WDTR_BUS_16_BIT) {
-                        /*
-                         * If the next narrow speed is greater than
-                         * the next wide speed, fallback to narrow.
-                         * Otherwise fallback to the next DT/Wide setting.
-                         * The narrow async speed will always be smaller
-                         * than the wide async speed, so handle this case
-                         * specifically.
-                         */
-                        ppr_options = targ->dv_max_ppr_options;
-                        if (narrow_speed > fallback_speed
-                         || period >= AHD_ASYNC_XFER_PERIOD) {
-                                targ->dv_next_wide_period = period+1;
-                                width = MSG_EXT_WDTR_BUS_8_BIT;
-                                period = targ->dv_next_narrow_period;
-                        } else {
-                                period++;
-                        }
-                } else if ((ahd->features & AHD_WIDE) != 0
-                        && targ->dv_max_width != 0
-                        && wide_speed >= fallback_speed
-                        && (targ->dv_next_wide_period <= AHD_ASYNC_XFER_PERIOD
-                         || period >= AHD_ASYNC_XFER_PERIOD)) {
-
-                        /*
-                         * We are narrow.  Try falling back
-                         * to the next wide speed with 
-                         * all supported ppr options set.
-                         */
-                        targ->dv_next_narrow_period = period+1;
-                        width = MSG_EXT_WDTR_BUS_16_BIT;
-                        period = targ->dv_next_wide_period;
-                        ppr_options = targ->dv_max_ppr_options;
-                } else {
-                        /* Only narrow fallback is allowed. */
-                        period++;
-                        ppr_options = targ->dv_max_ppr_options;
-                }
-        } else {
-                return (-1);
-        }
-        offset = MAX_OFFSET;
-        ahd_find_syncrate(ahd, &period, &ppr_options, AHD_SYNCRATE_PACED);
-        ahd_set_width(ahd, devinfo, width, AHD_TRANS_GOAL, FALSE);
-        if (period == 0) {
-                period = 0;
-                offset = 0;
-                ppr_options = 0;
-                if (width == MSG_EXT_WDTR_BUS_8_BIT)
-                        targ->dv_next_narrow_period = AHD_ASYNC_XFER_PERIOD;
-                else
-                        targ->dv_next_wide_period = AHD_ASYNC_XFER_PERIOD;
-        }
-        ahd_set_syncrate(ahd, devinfo, period, offset,
-                         ppr_options, AHD_TRANS_GOAL, FALSE);
-        targ->dv_last_ppr_options = ppr_options;
-        return (0);
-}
-
-static void
-ahd_linux_dv_timeout(struct scsi_cmnd *cmd)
-{
-        struct  ahd_softc *ahd;
-        struct  scb *scb;
-        u_long  flags;
-
-        ahd = *((struct ahd_softc **)cmd->device->host->hostdata);
-        ahd_lock(ahd, &flags);
-
-#ifdef AHD_DEBUG
-        if (ahd_debug & AHD_SHOW_DV) {
-                printf("%s: Timeout while doing DV command %x.\n",
-                       ahd_name(ahd), cmd->cmnd[0]);
-                ahd_dump_card_state(ahd);
-        }
-#endif
-        
-        /*
-         * Guard against "done race".  No action is
-         * required if we just completed.
-         */
-        if ((scb = (struct scb *)cmd->host_scribble) == NULL) {
-                ahd_unlock(ahd, &flags);
-                return;
+                scsi_adjust_queue_depth(sdev,
+                                        /*NON-TAGGED*/0,
+                                        /*queue depth*/2);
+                break;
         }
-
-        /*
-         * Command has not completed.  Mark this
-         * SCB as having failing status prior to
-         * resetting the bus, so we get the correct
-         * error code.
-         */
-        if ((scb->flags & SCB_SENSE) != 0)
-                ahd_set_transaction_status(scb, CAM_AUTOSENSE_FAIL);
-        else
-                ahd_set_transaction_status(scb, CAM_CMD_TIMEOUT);
-        ahd_reset_channel(ahd, cmd->device->channel + 'A', /*initiate*/TRUE);
-
-        /*
-         * Add a minimal bus settle delay for devices that are slow to
-         * respond after bus resets.
-         */
-        ahd_freeze_simq(ahd);
-        init_timer(&ahd->platform_data->reset_timer);
-        ahd->platform_data->reset_timer.data = (u_long)ahd;
-        ahd->platform_data->reset_timer.expires = jiffies + HZ / 2;
-        ahd->platform_data->reset_timer.function =
-            (ahd_linux_callback_t *)ahd_release_simq;
-        add_timer(&ahd->platform_data->reset_timer);
-        if (ahd_linux_next_device_to_run(ahd) != NULL)
-                ahd_schedule_runq(ahd);
-        ahd_linux_run_complete_queue(ahd);
-        ahd_unlock(ahd, &flags);
-}
-
-static void
-ahd_linux_dv_complete(struct scsi_cmnd *cmd)
-{
-        struct ahd_softc *ahd;
-
-        ahd = *((struct ahd_softc **)cmd->device->host->hostdata);
-
-        /* Delete the DV timer before it goes off! */
-        scsi_delete_timer(cmd);
-
-#ifdef AHD_DEBUG
-        if (ahd_debug & AHD_SHOW_DV)
-                printf("%s:%c:%d: Command completed, status= 0x%x\n",
-                       ahd_name(ahd), cmd->device->channel, cmd->device->id,
-                       cmd->result);
-#endif
-
-        /* Wake up the state machine */
-        up(&ahd->platform_data->dv_cmd_sem);
 }
 
-static void
-ahd_linux_generate_dv_pattern(struct ahd_linux_target *targ)
+int
+ahd_platform_abort_scbs(struct ahd_softc *ahd, int target, char channel,
+                        int lun, u_int tag, role_t role, uint32_t status)
 {
-        uint16_t b;
-        u_int    i;
-        u_int    j;
-
-        if (targ->dv_buffer != NULL)
-                free(targ->dv_buffer, M_DEVBUF);
-        targ->dv_buffer = malloc(targ->dv_echo_size, M_DEVBUF, M_WAITOK);
-        if (targ->dv_buffer1 != NULL)
-                free(targ->dv_buffer1, M_DEVBUF);
-        targ->dv_buffer1 = malloc(targ->dv_echo_size, M_DEVBUF, M_WAITOK);
-
-        i = 0;
-
-        b = 0x0001;
-        for (j = 0 ; i < targ->dv_echo_size; j++) {
-                if (j < 32) {
-                        /*
-                         * 32bytes of sequential numbers.
-                         */
-                        targ->dv_buffer[i++] = j & 0xff;
-                } else if (j < 48) {
-                        /*
-                         * 32bytes of repeating 0x0000, 0xffff.
-                         */
-                        targ->dv_buffer[i++] = (j & 0x02) ? 0xff : 0x00;
-                } else if (j < 64) {
-                        /*
-                         * 32bytes of repeating 0x5555, 0xaaaa.
-                         */
-                        targ->dv_buffer[i++] = (j & 0x02) ? 0xaa : 0x55;
-                } else {
-                        /*
-                         * Remaining buffer is filled with a repeating
-                         * patter of:
-                         *
-                         *       0xffff
-                         *      ~0x0001 << shifted once in each loop.
-                         */
-                        if (j & 0x02) {
-                                if (j & 0x01) {
-                                        targ->dv_buffer[i++] = ~(b >> 8) & 0xff;
-                                        b <<= 1;
-                                        if (b == 0x0000)
-                                                b = 0x0001;
-                                } else {
-                                        targ->dv_buffer[i++] = (~b & 0xff);
-                                }
-                        } else {
-                                targ->dv_buffer[i++] = 0xff;
-                        }
-                }
-        }
+        return 0;
 }
 
 static u_int
@@ -3800,100 +1395,23 @@ ahd_linux_user_tagdepth(struct ahd_softc *ahd, struct ahd_devinfo *devinfo)
         return (tags);
 }
 
-static u_int
-ahd_linux_user_dv_setting(struct ahd_softc *ahd)
-{
-        static int warned_user;
-        int dv;
-
-        if (ahd->unit >= NUM_ELEMENTS(aic79xx_dv_settings)) {
-
-                if (warned_user == 0) {
-                        printf(KERN_WARNING
-"aic79xx: WARNING: Insufficient dv settings instances\n"
-"aic79xx: for installed controllers. Using defaults\n"
-"aic79xx: Please update the aic79xx_dv_settings array in"
-"aic79xx: the aic79xx_osm.c source file.\n");
-                        warned_user++;
-                }
-                dv = -1;
-        } else {
-
-                dv = aic79xx_dv_settings[ahd->unit];
-        }
-
-        if (dv < 0) {
-                /*
-                 * Apply the default.
-                 */
-                dv = 1;
-                if (ahd->seep_config != 0)
-                        dv = (ahd->seep_config->bios_control & CFENABLEDV);
-        }
-        return (dv);
-}
-
-static void
-ahd_linux_setup_user_rd_strm_settings(struct ahd_softc *ahd)
-{
-        static  int warned_user;
-        u_int   rd_strm_mask;
-        u_int   target_id;
-
-        /*
-         * If we have specific read streaming info for this controller,
-         * apply it.  Otherwise use the defaults.
-         */
-         if (ahd->unit >= NUM_ELEMENTS(aic79xx_rd_strm_info)) {
-
-                if (warned_user == 0) {
-
-                        printf(KERN_WARNING
-"aic79xx: WARNING: Insufficient rd_strm instances\n"
-"aic79xx: for installed controllers. Using defaults\n"
-"aic79xx: Please update the aic79xx_rd_strm_info array\n"
-"aic79xx: in the aic79xx_osm.c source file.\n");
-                        warned_user++;
-                }
-                rd_strm_mask = AIC79XX_CONFIGED_RD_STRM;
-        } else {
-
-                rd_strm_mask = aic79xx_rd_strm_info[ahd->unit];
-        }
-        for (target_id = 0; target_id < 16; target_id++) {
-                struct ahd_devinfo devinfo;
-                struct ahd_initiator_tinfo *tinfo;
-                struct ahd_tmode_tstate *tstate;
-
-                tinfo = ahd_fetch_transinfo(ahd, 'A', ahd->our_id,
-                                            target_id, &tstate);
-                ahd_compile_devinfo(&devinfo, ahd->our_id, target_id,
-                                    CAM_LUN_WILDCARD, 'A', ROLE_INITIATOR);
-                tinfo->user.ppr_options &= ~MSG_EXT_PPR_RD_STRM;
-                if ((rd_strm_mask & devinfo.target_mask) != 0)
-                        tinfo->user.ppr_options |= MSG_EXT_PPR_RD_STRM;
-        }
-}
-
 /*
  * Determines the queue depth for a given device.
  */
 static void
-ahd_linux_device_queue_depth(struct ahd_softc *ahd,
-                             struct ahd_linux_device *dev)
+ahd_linux_device_queue_depth(struct scsi_device *sdev)
 {
         struct  ahd_devinfo devinfo;
         u_int   tags;
+        struct ahd_softc *ahd = *((struct ahd_softc **)sdev->host->hostdata);
 
         ahd_compile_devinfo(&devinfo,
                             ahd->our_id,
-                            dev->target->target, dev->lun,
-                            dev->target->channel == 0 ? 'A' : 'B',
+                            sdev->sdev_target->id, sdev->lun,
+                            sdev->sdev_target->channel == 0 ? 'A' : 'B',
                             ROLE_INITIATOR);
         tags = ahd_linux_user_tagdepth(ahd, &devinfo);
-        if (tags != 0
-         && dev->scsi_device != NULL
-         && dev->scsi_device->tagged_supported != 0) {
+        if (tags != 0 && sdev->tagged_supported != 0) {
 
                 ahd_set_tags(ahd, &devinfo, AHD_QUEUE_TAGGED);
                 ahd_print_devinfo(ahd, &devinfo);
@@ -3903,11 +1421,10 @@ ahd_linux_device_queue_depth(struct ahd_softc *ahd,
         }
 }
 
-static void
-ahd_linux_run_device_queue(struct ahd_softc *ahd, struct ahd_linux_device *dev)
+static int
+ahd_linux_run_command(struct ahd_softc *ahd, struct ahd_linux_device *dev,
+                      struct scsi_cmnd *cmd)
 {
-        struct   ahd_cmd *acmd;
-        struct   scsi_cmnd *cmd;
         struct   scb *scb;
         struct   hardware_scb *hscb;
         struct   ahd_initiator_tinfo *tinfo;
@@ -3915,157 +1432,122 @@ ahd_linux_run_device_queue(struct ahd_softc *ahd, struct ahd_linux_device *dev)
         u_int    col_idx;
         uint16_t mask;
 
-        if ((dev->flags & AHD_DEV_ON_RUN_LIST) != 0)
-                panic("running device on run list");
-
-        while ((acmd = TAILQ_FIRST(&dev->busyq)) != NULL
-            && dev->openings > 0 && dev->qfrozen == 0) {
-
-                /*
-                 * Schedule us to run later.  The only reason we are not
-                 * running is because the whole controller Q is frozen.
-                 */
-                if (ahd->platform_data->qfrozen != 0
-                 && AHD_DV_SIMQ_FROZEN(ahd) == 0) {
-
-                        TAILQ_INSERT_TAIL(&ahd->platform_data->device_runq,
-                                          dev, links);
-                        dev->flags |= AHD_DEV_ON_RUN_LIST;
-                        return;
-                }
-
-                cmd = &acmd_scsi_cmd(acmd);
+        /*
+         * Get an scb to use.
+         */
+        tinfo = ahd_fetch_transinfo(ahd, 'A', ahd->our_id,
+                                    cmd->device->id, &tstate);
+        if ((dev->flags & (AHD_DEV_Q_TAGGED|AHD_DEV_Q_BASIC)) == 0
+         || (tinfo->curr.ppr_options & MSG_EXT_PPR_IU_REQ) != 0) {
+                col_idx = AHD_NEVER_COL_IDX;
+        } else {
+                col_idx = AHD_BUILD_COL_IDX(cmd->device->id,
+                                            cmd->device->lun);
+        }
+        if ((scb = ahd_get_scb(ahd, col_idx)) == NULL) {
+                ahd->flags |= AHD_RESOURCE_SHORTAGE;
+                return SCSI_MLQUEUE_HOST_BUSY;
+        }
 
-                /*
-                 * Get an scb to use.
-                 */
-                tinfo = ahd_fetch_transinfo(ahd, 'A', ahd->our_id,
-                                            cmd->device->id, &tstate);
-                if ((dev->flags & (AHD_DEV_Q_TAGGED|AHD_DEV_Q_BASIC)) == 0
-                 || (tinfo->curr.ppr_options & MSG_EXT_PPR_IU_REQ) != 0) {
-                        col_idx = AHD_NEVER_COL_IDX;
-                } else {
-                        col_idx = AHD_BUILD_COL_IDX(cmd->device->id,
-                                                    cmd->device->lun);
-                }
-                if ((scb = ahd_get_scb(ahd, col_idx)) == NULL) {
-                        TAILQ_INSERT_TAIL(&ahd->platform_data->device_runq,
-                                         dev, links);
-                        dev->flags |= AHD_DEV_ON_RUN_LIST;
-                        ahd->flags |= AHD_RESOURCE_SHORTAGE;
-                        return;
-                }
-                TAILQ_REMOVE(&dev->busyq, acmd, acmd_links.tqe);
-                scb->io_ctx = cmd;
-                scb->platform_data->dev = dev;
-                hscb = scb->hscb;
-                cmd->host_scribble = (char *)scb;
+        scb->io_ctx = cmd;
+        scb->platform_data->dev = dev;
+        hscb = scb->hscb;
+        cmd->host_scribble = (char *)scb;
 
-                /*
-                 * Fill out basics of the HSCB.
-                 */
-                hscb->control = 0;
-                hscb->scsiid = BUILD_SCSIID(ahd, cmd);
-                hscb->lun = cmd->device->lun;
-                scb->hscb->task_management = 0;
-                mask = SCB_GET_TARGET_MASK(ahd, scb);
+        /*
+         * Fill out basics of the HSCB.
+         */
+        hscb->control = 0;
+        hscb->scsiid = BUILD_SCSIID(ahd, cmd);
+        hscb->lun = cmd->device->lun;
+        scb->hscb->task_management = 0;
+        mask = SCB_GET_TARGET_MASK(ahd, scb);
 
-                if ((ahd->user_discenable & mask) != 0)
-                        hscb->control |= DISCENB;
+        if ((ahd->user_discenable & mask) != 0)
+                hscb->control |= DISCENB;
 
-                if (AHD_DV_CMD(cmd) != 0)
-                        scb->flags |= SCB_SILENT;
+        if ((tinfo->curr.ppr_options & MSG_EXT_PPR_IU_REQ) != 0)
+                scb->flags |= SCB_PACKETIZED;
 
-                if ((tinfo->curr.ppr_options & MSG_EXT_PPR_IU_REQ) != 0)
-                        scb->flags |= SCB_PACKETIZED;
+        if ((tstate->auto_negotiate & mask) != 0) {
+                scb->flags |= SCB_AUTO_NEGOTIATE;
+                scb->hscb->control |= MK_MESSAGE;
+        }
 
-                if ((tstate->auto_negotiate & mask) != 0) {
-                        scb->flags |= SCB_AUTO_NEGOTIATE;
-                        scb->hscb->control |= MK_MESSAGE;
-                }
+        if ((dev->flags & (AHD_DEV_Q_TAGGED|AHD_DEV_Q_BASIC)) != 0) {
+                int     msg_bytes;
+                uint8_t tag_msgs[2];
 
-                if ((dev->flags & (AHD_DEV_Q_TAGGED|AHD_DEV_Q_BASIC)) != 0) {
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
-                        int     msg_bytes;
-                        uint8_t tag_msgs[2];
-
-                        msg_bytes = scsi_populate_tag_msg(cmd, tag_msgs);
-                        if (msg_bytes && tag_msgs[0] != MSG_SIMPLE_TASK) {
-                                hscb->control |= tag_msgs[0];
-                                if (tag_msgs[0] == MSG_ORDERED_TASK)
-                                        dev->commands_since_idle_or_otag = 0;
-                        } else
-#endif
-                        if (dev->commands_since_idle_or_otag == AHD_OTAG_THRESH
-                         && (dev->flags & AHD_DEV_Q_TAGGED) != 0) {
-                                hscb->control |= MSG_ORDERED_TASK;
+                msg_bytes = scsi_populate_tag_msg(cmd, tag_msgs);
+                if (msg_bytes && tag_msgs[0] != MSG_SIMPLE_TASK) {
+                        hscb->control |= tag_msgs[0];
+                        if (tag_msgs[0] == MSG_ORDERED_TASK)
                                 dev->commands_since_idle_or_otag = 0;
-                        } else {
-                                hscb->control |= MSG_SIMPLE_TASK;
-                        }
+                } else
+                if (dev->commands_since_idle_or_otag == AHD_OTAG_THRESH
+                 && (dev->flags & AHD_DEV_Q_TAGGED) != 0) {
+                        hscb->control |= MSG_ORDERED_TASK;
+                        dev->commands_since_idle_or_otag = 0;
+                } else {
+                        hscb->control |= MSG_SIMPLE_TASK;
                 }
+        }
 
-                hscb->cdb_len = cmd->cmd_len;
-                memcpy(hscb->shared_data.idata.cdb, cmd->cmnd, hscb->cdb_len);
-
-                scb->sg_count = 0;
-                ahd_set_residual(scb, 0);
-                ahd_set_sense_residual(scb, 0);
-                if (cmd->use_sg != 0) {
-                        void    *sg;
-                        struct   scatterlist *cur_seg;
-                        u_int    nseg;
-                        int      dir;
-
-                        cur_seg = (struct scatterlist *)cmd->request_buffer;
-                        dir = cmd->sc_data_direction;
-                        nseg = pci_map_sg(ahd->dev_softc, cur_seg,
-                                          cmd->use_sg, dir);
-                        scb->platform_data->xfer_len = 0;
-                        for (sg = scb->sg_list; nseg > 0; nseg--, cur_seg++) {
-                                dma_addr_t addr;
-                                bus_size_t len;
-
-                                addr = sg_dma_address(cur_seg);
-                                len = sg_dma_len(cur_seg);
-                                scb->platform_data->xfer_len += len;
-                                sg = ahd_sg_setup(ahd, scb, sg, addr, len,
-                                                  /*last*/nseg == 1);
-                        }
-                } else if (cmd->request_bufflen != 0) {
-                        void *sg;
+        hscb->cdb_len = cmd->cmd_len;
+        memcpy(hscb->shared_data.idata.cdb, cmd->cmnd, hscb->cdb_len);
+
+        scb->platform_data->xfer_len = 0;
+        ahd_set_residual(scb, 0);
+        ahd_set_sense_residual(scb, 0);
+        scb->sg_count = 0;
+        if (cmd->use_sg != 0) {
+                void    *sg;
+                struct   scatterlist *cur_seg;
+                u_int    nseg;
+                int      dir;
+
+                cur_seg = (struct scatterlist *)cmd->request_buffer;
+                dir = cmd->sc_data_direction;
+                nseg = pci_map_sg(ahd->dev_softc, cur_seg,
+                                  cmd->use_sg, dir);
+                scb->platform_data->xfer_len = 0;
+                for (sg = scb->sg_list; nseg > 0; nseg--, cur_seg++) {
                         dma_addr_t addr;
-                        int dir;
-
-                        sg = scb->sg_list;
-                        dir = cmd->sc_data_direction;
-                        addr = pci_map_single(ahd->dev_softc,
-                                              cmd->request_buffer,
-                                              cmd->request_bufflen, dir);
-                        scb->platform_data->xfer_len = cmd->request_bufflen;
-                        scb->platform_data->buf_busaddr = addr;
-                        sg = ahd_sg_setup(ahd, scb, sg, addr,
-                                          cmd->request_bufflen, /*last*/TRUE);
-                }
+                        bus_size_t len;
 
-                LIST_INSERT_HEAD(&ahd->pending_scbs, scb, pending_links);
-                dev->openings--;
-                dev->active++;
-                dev->commands_issued++;
-
-                /* Update the error counting bucket and dump if needed */
-                if (dev->target->cmds_since_error) {
-                        dev->target->cmds_since_error++;
-                        if (dev->target->cmds_since_error >
-                            AHD_LINUX_ERR_THRESH)
-                                dev->target->cmds_since_error = 0;
+                        addr = sg_dma_address(cur_seg);
+                        len = sg_dma_len(cur_seg);
+                        scb->platform_data->xfer_len += len;
+                        sg = ahd_sg_setup(ahd, scb, sg, addr, len,
+                                          /*last*/nseg == 1);
                 }
+        } else if (cmd->request_bufflen != 0) {
+                void *sg;
+                dma_addr_t addr;
+                int dir;
 
-                if ((dev->flags & AHD_DEV_PERIODIC_OTAG) != 0)
-                        dev->commands_since_idle_or_otag++;
-                scb->flags |= SCB_ACTIVE;
-                ahd_queue_scb(ahd, scb);
+                sg = scb->sg_list;
+                dir = cmd->sc_data_direction;
+                addr = pci_map_single(ahd->dev_softc,
+                                      cmd->request_buffer,
+                                      cmd->request_bufflen, dir);
+                scb->platform_data->xfer_len = cmd->request_bufflen;
+                scb->platform_data->buf_busaddr = addr;
+                sg = ahd_sg_setup(ahd, scb, sg, addr,
+                                  cmd->request_bufflen, /*last*/TRUE);
         }
+
+        LIST_INSERT_HEAD(&ahd->pending_scbs, scb, pending_links);
+        dev->openings--;
+        dev->active++;
+        dev->commands_issued++;
+
+        if ((dev->flags & AHD_DEV_PERIODIC_OTAG) != 0)
+                dev->commands_since_idle_or_otag++;
+        scb->flags |= SCB_ACTIVE;
+        ahd_queue_scb(ahd, scb);
+
+        return 0;
 }
 
 /*
@@ -4081,9 +1563,6 @@ ahd_linux_isr(int irq, void *dev_id, struct pt_regs * regs)
         ahd = (struct ahd_softc *) dev_id;
         ahd_lock(ahd, &flags); 
         ours = ahd_intr(ahd);
-        if (ahd_linux_next_device_to_run(ahd) != NULL)
-                ahd_schedule_runq(ahd);
-        ahd_linux_run_complete_queue(ahd);
         ahd_unlock(ahd, &flags);
         return IRQ_RETVAL(ours);
 }
@@ -4092,111 +1571,6 @@ void
 ahd_platform_flushwork(struct ahd_softc *ahd)
 {
 
-        while (ahd_linux_run_complete_queue(ahd) != NULL)
-                ;
-}
-
-static struct ahd_linux_target*
-ahd_linux_alloc_target(struct ahd_softc *ahd, u_int channel, u_int target)
-{
-        struct ahd_linux_target *targ;
-
-        targ = malloc(sizeof(*targ), M_DEVBUF, M_NOWAIT);
-        if (targ == NULL)
-                return (NULL);
-        memset(targ, 0, sizeof(*targ));
-        targ->channel = channel;
-        targ->target = target;
-        targ->ahd = ahd;
-        targ->flags = AHD_DV_REQUIRED;
-        ahd->platform_data->targets[target] = targ;
-        return (targ);
-}
-
-static void
-ahd_linux_free_target(struct ahd_softc *ahd, struct ahd_linux_target *targ)
-{
-        struct ahd_devinfo devinfo;
-        struct ahd_initiator_tinfo *tinfo;
-        struct ahd_tmode_tstate *tstate;
-        u_int our_id;
-        u_int target_offset;
-        char channel;
-
-        /*
-         * Force a negotiation to async/narrow on any
-         * future command to this device unless a bus
-         * reset occurs between now and that command.
-         */
-        channel = 'A' + targ->channel;
-        our_id = ahd->our_id;
-        target_offset = targ->target;
-        tinfo = ahd_fetch_transinfo(ahd, channel, our_id,
-                                    targ->target, &tstate);
-        ahd_compile_devinfo(&devinfo, our_id, targ->target, CAM_LUN_WILDCARD,
-                            channel, ROLE_INITIATOR);
-        ahd_set_syncrate(ahd, &devinfo, 0, 0, 0,
-                         AHD_TRANS_GOAL, /*paused*/FALSE);
-        ahd_set_width(ahd, &devinfo, MSG_EXT_WDTR_BUS_8_BIT,
-                      AHD_TRANS_GOAL, /*paused*/FALSE);
-        ahd_update_neg_request(ahd, &devinfo, tstate, tinfo, AHD_NEG_ALWAYS);
-        ahd->platform_data->targets[target_offset] = NULL;
-        if (targ->inq_data != NULL)
-                free(targ->inq_data, M_DEVBUF);
-        if (targ->dv_buffer != NULL)
-                free(targ->dv_buffer, M_DEVBUF);
-        if (targ->dv_buffer1 != NULL)
-                free(targ->dv_buffer1, M_DEVBUF);
-        free(targ, M_DEVBUF);
-}
-
-static struct ahd_linux_device*
-ahd_linux_alloc_device(struct ahd_softc *ahd,
-                 struct ahd_linux_target *targ, u_int lun)
-{
-        struct ahd_linux_device *dev;
-
-        dev = malloc(sizeof(*dev), M_DEVBUG, M_NOWAIT);
-        if (dev == NULL)
-                return (NULL);
-        memset(dev, 0, sizeof(*dev));
-        init_timer(&dev->timer);
-        TAILQ_INIT(&dev->busyq);
-        dev->flags = AHD_DEV_UNCONFIGURED;
-        dev->lun = lun;
-        dev->target = targ;
-
-        /*
-         * We start out life using untagged
-         * transactions of which we allow one.
-         */
-        dev->openings = 1;
-
-        /*
-         * Set maxtags to 0.  This will be changed if we
-         * later determine that we are dealing with
-         * a tagged queuing capable device.
-         */
-        dev->maxtags = 0;
-        
-        targ->refcount++;
-        targ->devices[lun] = dev;
-        return (dev);
-}
-
-static void
-ahd_linux_free_device(struct ahd_softc *ahd, struct ahd_linux_device *dev)
-{
-        struct ahd_linux_target *targ;
-
-        del_timer(&dev->timer);
-        targ = dev->target;
-        targ->devices[dev->lun] = NULL;
-        free(dev, M_DEVBUF);
-        targ->refcount--;
-        if (targ->refcount == 0
-         && (targ->flags & AHD_DV_REQUIRED) == 0)
-                ahd_linux_free_target(ahd, targ);
 }
 
 void
@@ -4207,10 +1581,14 @@ ahd_send_async(struct ahd_softc *ahd, char channel,
         case AC_TRANSFER_NEG:
         {
                 char    buf[80];
+                struct  scsi_target *starget;
                 struct  ahd_linux_target *targ;
                 struct  info_str info;
                 struct  ahd_initiator_tinfo *tinfo;
                 struct  ahd_tmode_tstate *tstate;
+                unsigned int target_ppr_options;
+
+                BUG_ON(target == CAM_TARGET_WILDCARD);
 
                 info.buffer = buf;
                 info.length = sizeof(buf);
@@ -4234,58 +1612,47 @@ ahd_send_async(struct ahd_softc *ahd, char channel,
                  * Don't bother reporting results that
                  * are identical to those last reported.
                  */
-                targ = ahd->platform_data->targets[target];
-                if (targ == NULL)
+                starget = ahd->platform_data->starget[target];
+                if (starget == NULL)
                         break;
-                if (tinfo->curr.period == targ->last_tinfo.period
-                 && tinfo->curr.width == targ->last_tinfo.width
-                 && tinfo->curr.offset == targ->last_tinfo.offset
-                 && tinfo->curr.ppr_options == targ->last_tinfo.ppr_options)
+                targ = scsi_transport_target_data(starget);
+
+                target_ppr_options =
+                        (spi_dt(starget) ? MSG_EXT_PPR_DT_REQ : 0)
+                        + (spi_qas(starget) ? MSG_EXT_PPR_QAS_REQ : 0)
+                        + (spi_iu(starget) ?  MSG_EXT_PPR_IU_REQ : 0)
+                        + (spi_rd_strm(starget) ? MSG_EXT_PPR_RD_STRM : 0)
+                        + (spi_pcomp_en(starget) ? MSG_EXT_PPR_PCOMP_EN : 0)
+                        + (spi_rti(starget) ? MSG_EXT_PPR_RTI : 0)
+                        + (spi_wr_flow(starget) ? MSG_EXT_PPR_WR_FLOW : 0)
+                        + (spi_hold_mcs(starget) ? MSG_EXT_PPR_HOLD_MCS : 0);
+
+                if (tinfo->curr.period == spi_period(starget)
+                    && tinfo->curr.width == spi_width(starget)
+                    && tinfo->curr.offset == spi_offset(starget)
+                 && tinfo->curr.ppr_options == target_ppr_options)
                         if (bootverbose == 0)
                                 break;
 
-                targ->last_tinfo.period = tinfo->curr.period;
-                targ->last_tinfo.width = tinfo->curr.width;
-                targ->last_tinfo.offset = tinfo->curr.offset;
-                targ->last_tinfo.ppr_options = tinfo->curr.ppr_options;
-
-                printf("(%s:%c:", ahd_name(ahd), channel);
-                if (target == CAM_TARGET_WILDCARD)
-                        printf("*): ");
-                else
-                        printf("%d): ", target);
-                ahd_format_transinfo(&info, &tinfo->curr);
-                if (info.pos < info.length)
-                        *info.buffer = '\0';
-                else
-                        buf[info.length - 1] = '\0';
-                printf("%s", buf);
+                spi_period(starget) = tinfo->curr.period;
+                spi_width(starget) = tinfo->curr.width;
+                spi_offset(starget) = tinfo->curr.offset;
+                spi_dt(starget) = tinfo->curr.ppr_options & MSG_EXT_PPR_DT_REQ ? 1 : 0;
+                spi_qas(starget) = tinfo->curr.ppr_options & MSG_EXT_PPR_QAS_REQ ? 1 : 0;
+                spi_iu(starget) = tinfo->curr.ppr_options & MSG_EXT_PPR_IU_REQ ? 1 : 0;
+                spi_rd_strm(starget) = tinfo->curr.ppr_options & MSG_EXT_PPR_RD_STRM ? 1 : 0;
+                spi_pcomp_en(starget) =  tinfo->curr.ppr_options & MSG_EXT_PPR_PCOMP_EN ? 1 : 0;
+                spi_rti(starget) =  tinfo->curr.ppr_options &  MSG_EXT_PPR_RTI ? 1 : 0;
+                spi_wr_flow(starget) = tinfo->curr.ppr_options & MSG_EXT_PPR_WR_FLOW ? 1 : 0;
+                spi_hold_mcs(starget) = tinfo->curr.ppr_options & MSG_EXT_PPR_HOLD_MCS ? 1 : 0;
+                spi_display_xfer_agreement(starget);
                 break;
         }
         case AC_SENT_BDR:
         {
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
                 WARN_ON(lun != CAM_LUN_WILDCARD);
                 scsi_report_device_reset(ahd->platform_data->host,
                                          channel - 'A', target);
-#else
-                Scsi_Device *scsi_dev;
-
-                /*
-                 * Find the SCSI device associated with this
-                 * request and indicate that a UA is expected.
-                 */
-                for (scsi_dev = ahd->platform_data->host->host_queue;
-                     scsi_dev != NULL; scsi_dev = scsi_dev->next) {
-                        if (channel - 'A' == scsi_dev->channel
-                         && target == scsi_dev->id
-                         && (lun == CAM_LUN_WILDCARD
-                          || lun == scsi_dev->lun)) {
-                                scsi_dev->was_reset = 1;
-                                scsi_dev->expecting_cc_ua = 1;
-                        }
-                }
-#endif
                 break;
         }
         case AC_BUS_RESET:
@@ -4305,7 +1672,7 @@ ahd_send_async(struct ahd_softc *ahd, char channel,
 void
 ahd_done(struct ahd_softc *ahd, struct scb *scb)
 {
-        Scsi_Cmnd *cmd;
+        struct scsi_cmnd *cmd;
         struct    ahd_linux_device *dev;
 
         if ((scb->flags & SCB_ACTIVE) == 0) {
@@ -4373,19 +1740,8 @@ ahd_done(struct ahd_softc *ahd, struct scb *scb)
                         ahd_set_transaction_status(scb, CAM_REQ_CMP);
                 }
         } else if (ahd_get_transaction_status(scb) == CAM_SCSI_STATUS_ERROR) {
-                ahd_linux_handle_scsi_status(ahd, dev, scb);
-        } else if (ahd_get_transaction_status(scb) == CAM_SEL_TIMEOUT) {
-                dev->flags |= AHD_DEV_UNCONFIGURED;
-                if (AHD_DV_CMD(cmd) == FALSE)
-                        dev->target->flags &= ~AHD_DV_REQUIRED;
+                ahd_linux_handle_scsi_status(ahd, cmd->device, scb);
         }
-        /*
-         * Start DV for devices that require it assuming the first command
-         * sent does not result in a selection timeout.
-         */
-        if (ahd_get_transaction_status(scb) != CAM_SEL_TIMEOUT
-         && (dev->target->flags & AHD_DV_REQUIRED) != 0)
-                ahd_linux_start_dv(ahd);
 
         if (dev->openings == 1
          && ahd_get_transaction_status(scb) == CAM_REQ_CMP
@@ -4406,47 +1762,32 @@ ahd_done(struct ahd_softc *ahd, struct scb *scb)
         if (dev->active == 0)
                 dev->commands_since_idle_or_otag = 0;
 
-        if (TAILQ_EMPTY(&dev->busyq)) {
-                if ((dev->flags & AHD_DEV_UNCONFIGURED) != 0
-                 && dev->active == 0
-                 && (dev->flags & AHD_DEV_TIMER_ACTIVE) == 0)
-                        ahd_linux_free_device(ahd, dev);
-        } else if ((dev->flags & AHD_DEV_ON_RUN_LIST) == 0) {
-                TAILQ_INSERT_TAIL(&ahd->platform_data->device_runq, dev, links);
-                dev->flags |= AHD_DEV_ON_RUN_LIST;
-        }
-
         if ((scb->flags & SCB_RECOVERY_SCB) != 0) {
                 printf("Recovery SCB completes\n");
                 if (ahd_get_transaction_status(scb) == CAM_BDR_SENT
                  || ahd_get_transaction_status(scb) == CAM_REQ_ABORTED)
                         ahd_set_transaction_status(scb, CAM_CMD_TIMEOUT);
-                if ((scb->platform_data->flags & AHD_SCB_UP_EH_SEM) != 0) {
-                        scb->platform_data->flags &= ~AHD_SCB_UP_EH_SEM;
+                if ((ahd->platform_data->flags & AHD_SCB_UP_EH_SEM) != 0) {
+                        ahd->platform_data->flags &= ~AHD_SCB_UP_EH_SEM;
                         up(&ahd->platform_data->eh_sem);
                 }
         }
 
         ahd_free_scb(ahd, scb);
         ahd_linux_queue_cmd_complete(ahd, cmd);
-
-        if ((ahd->platform_data->flags & AHD_DV_WAIT_SIMQ_EMPTY) != 0
-         && LIST_FIRST(&ahd->pending_scbs) == NULL) {
-                ahd->platform_data->flags &= ~AHD_DV_WAIT_SIMQ_EMPTY;
-                up(&ahd->platform_data->dv_sem);
-        }
 }
 
 static void
 ahd_linux_handle_scsi_status(struct ahd_softc *ahd,
-                             struct ahd_linux_device *dev, struct scb *scb)
+                             struct scsi_device *sdev, struct scb *scb)
 {
         struct  ahd_devinfo devinfo;
+        struct ahd_linux_device *dev = scsi_transport_device_data(sdev);
 
         ahd_compile_devinfo(&devinfo,
                             ahd->our_id,
-                            dev->target->target, dev->lun,
-                            dev->target->channel == 0 ? 'A' : 'B',
+                            sdev->sdev_target->id, sdev->lun,
+                            sdev->sdev_target->channel == 0 ? 'A' : 'B',
                             ROLE_INITIATOR);
         
         /*
@@ -4465,7 +1806,7 @@ ahd_linux_handle_scsi_status(struct ahd_softc *ahd,
         case SCSI_STATUS_CHECK_COND:
         case SCSI_STATUS_CMD_TERMINATED:
         {
-                Scsi_Cmnd *cmd;
+                struct scsi_cmnd *cmd;
 
                 /*
                  * Copy sense information to the OS's cmd
@@ -4518,7 +1859,6 @@ ahd_linux_handle_scsi_status(struct ahd_softc *ahd,
                 break;
         }
         case SCSI_STATUS_QUEUE_FULL:
-        {
                 /*
                  * By the time the core driver has returned this
                  * command, all other commands that were queued
@@ -4579,98 +1919,23 @@ ahd_linux_handle_scsi_status(struct ahd_softc *ahd,
                              (dev->flags & AHD_DEV_Q_BASIC)
                            ? AHD_QUEUE_BASIC : AHD_QUEUE_TAGGED);
                 ahd_set_scsi_status(scb, SCSI_STATUS_BUSY);
-                /* FALLTHROUGH */
-        }
-        case SCSI_STATUS_BUSY:
-                /*
-                 * Set a short timer to defer sending commands for
-                 * a bit since Linux will not delay in this case.
-                 */
-                if ((dev->flags & AHD_DEV_TIMER_ACTIVE) != 0) {
-                        printf("%s:%c:%d: Device Timer still active during "
-                               "busy processing\n", ahd_name(ahd),
-                                dev->target->channel, dev->target->target);
-                        break;
-                }
-                dev->flags |= AHD_DEV_TIMER_ACTIVE;
-                dev->qfrozen++;
-                init_timer(&dev->timer);
-                dev->timer.data = (u_long)dev;
-                dev->timer.expires = jiffies + (HZ/2);
-                dev->timer.function = ahd_linux_dev_timed_unfreeze;
-                add_timer(&dev->timer);
-                break;
         }
 }
 
 static void
-ahd_linux_queue_cmd_complete(struct ahd_softc *ahd, Scsi_Cmnd *cmd)
+ahd_linux_queue_cmd_complete(struct ahd_softc *ahd, struct scsi_cmnd *cmd)
 {
         /*
-         * Typically, the complete queue has very few entries
-         * queued to it before the queue is emptied by
-         * ahd_linux_run_complete_queue, so sorting the entries
-         * by generation number should be inexpensive.
-         * We perform the sort so that commands that complete
-         * with an error are retuned in the order origionally
-         * queued to the controller so that any subsequent retries
-         * are performed in order.  The underlying ahd routines do
-         * not guarantee the order that aborted commands will be
-         * returned to us.
-         */
-        struct ahd_completeq *completeq;
-        struct ahd_cmd *list_cmd;
-        struct ahd_cmd *acmd;
-
-        /*
          * Map CAM error codes into Linux Error codes.  We
          * avoid the conversion so that the DV code has the
          * full error information available when making
          * state change decisions.
          */
-        if (AHD_DV_CMD(cmd) == FALSE) {
+        {
                 uint32_t status;
                 u_int new_status;
 
                 status = ahd_cmd_get_transaction_status(cmd);
-                if (status != CAM_REQ_CMP) {
-                        struct ahd_linux_device *dev;
-                        struct ahd_devinfo devinfo;
-                        cam_status cam_status;
-                        uint32_t action;
-                        u_int scsi_status;
-
-                        dev = ahd_linux_get_device(ahd, cmd->device->channel,
-                                                   cmd->device->id,
-                                                   cmd->device->lun,
-                                                   /*alloc*/FALSE);
-
-                        if (dev == NULL)
-                                goto no_fallback;
-
-                        ahd_compile_devinfo(&devinfo,
-                                            ahd->our_id,
-                                            dev->target->target, dev->lun,
-                                            dev->target->channel == 0 ? 'A':'B',
-                                            ROLE_INITIATOR);
-
-                        scsi_status = ahd_cmd_get_scsi_status(cmd);
-                        cam_status = ahd_cmd_get_transaction_status(cmd);
-                        action = aic_error_action(cmd, dev->target->inq_data,
-                                                  cam_status, scsi_status);
-                        if ((action & SSQ_FALLBACK) != 0) {
-
-                                /* Update stats */
-                                dev->target->errors_detected++;
-                                if (dev->target->cmds_since_error == 0)
-                                        dev->target->cmds_since_error++;
-                                else {
-                                        dev->target->cmds_since_error = 0;
-                                        ahd_linux_fallback(ahd, &devinfo);
-                                }
-                        }
-                }
-no_fallback:
                 switch (status) {
                 case CAM_REQ_INPROG:
                 case CAM_REQ_CMP:
@@ -4715,26 +1980,7 @@ no_fallback:
                         new_status = DID_ERROR;
                         break;
                 case CAM_REQUEUE_REQ:
-                        /*
-                         * If we want the request requeued, make sure there
-                         * are sufficent retries.  In the old scsi error code,
-                         * we used to be able to specify a result code that
-                         * bypassed the retry count.  Now we must use this
-                         * hack.  We also "fake" a check condition with
-                         * a sense code of ABORTED COMMAND.  This seems to
-                         * evoke a retry even if this command is being sent
-                         * via the eh thread.  Ick!  Ick!  Ick!
-                         */
-                        if (cmd->retries > 0)
-                                cmd->retries--;
-                        new_status = DID_OK;
-                        ahd_cmd_set_scsi_status(cmd, SCSI_STATUS_CHECK_COND);
-                        cmd->result |= (DRIVER_SENSE << 24);
-                        memset(cmd->sense_buffer, 0,
-                               sizeof(cmd->sense_buffer));
-                        cmd->sense_buffer[0] = SSD_ERRCODE_VALID
-                                             | SSD_CURRENT_ERROR;
-                        cmd->sense_buffer[2] = SSD_KEY_ABORTED_COMMAND;
+                        new_status = DID_REQUEUE;
                         break;
                 default:
                         /* We should never get here */
@@ -4745,116 +1991,23 @@ no_fallback:
                 ahd_cmd_set_transaction_status(cmd, new_status);
         }
 
-        completeq = &ahd->platform_data->completeq;
-        list_cmd = TAILQ_FIRST(completeq);
-        acmd = (struct ahd_cmd *)cmd;
-        while (list_cmd != NULL
-            && acmd_scsi_cmd(list_cmd).serial_number
-             < acmd_scsi_cmd(acmd).serial_number)
-                list_cmd = TAILQ_NEXT(list_cmd, acmd_links.tqe);
-        if (list_cmd != NULL)
-                TAILQ_INSERT_BEFORE(list_cmd, acmd, acmd_links.tqe);
-        else
-                TAILQ_INSERT_TAIL(completeq, acmd, acmd_links.tqe);
+        cmd->scsi_done(cmd);
 }
 
 static void
-ahd_linux_filter_inquiry(struct ahd_softc *ahd, struct ahd_devinfo *devinfo)
+ahd_linux_sem_timeout(u_long arg)
 {
-        struct  scsi_inquiry_data *sid;
-        struct  ahd_initiator_tinfo *tinfo;
-        struct  ahd_transinfo *user;
-        struct  ahd_transinfo *goal;
-        struct  ahd_transinfo *curr;
-        struct  ahd_tmode_tstate *tstate;
-        struct  ahd_linux_device *dev;
-        u_int   width;
-        u_int   period;
-        u_int   offset;
-        u_int   ppr_options;
-        u_int   trans_version;
-        u_int   prot_version;
-
-        /*
-         * Determine if this lun actually exists.  If so,
-         * hold on to its corresponding device structure.
-         * If not, make sure we release the device and
-         * don't bother processing the rest of this inquiry
-         * command.
-         */
-        dev = ahd_linux_get_device(ahd, devinfo->channel - 'A',
-                                   devinfo->target, devinfo->lun,
-                                   /*alloc*/TRUE);
-
-        sid = (struct scsi_inquiry_data *)dev->target->inq_data;
-        if (SID_QUAL(sid) == SID_QUAL_LU_CONNECTED) {
-
-                dev->flags &= ~AHD_DEV_UNCONFIGURED;
-        } else {
-                dev->flags |= AHD_DEV_UNCONFIGURED;
-                return;
-        }
+        struct  ahd_softc *ahd;
+        u_long  s;
 
-        /*
-         * Update our notion of this device's transfer
-         * negotiation capabilities.
-         */
-        tinfo = ahd_fetch_transinfo(ahd, devinfo->channel,
-                                    devinfo->our_scsiid,
-                                    devinfo->target, &tstate);
-        user = &tinfo->user;
-        goal = &tinfo->goal;
-        curr = &tinfo->curr;
-        width = user->width;
-        period = user->period;
-        offset = user->offset;
-        ppr_options = user->ppr_options;
-        trans_version = user->transport_version;
-        prot_version = MIN(user->protocol_version, SID_ANSI_REV(sid));
+        ahd = (struct ahd_softc *)arg;
 
-        /*
-         * Only attempt SPI3/4 once we've verified that
-         * the device claims to support SPI3/4 features.
-         */
-        if (prot_version < SCSI_REV_2)
-                trans_version = SID_ANSI_REV(sid);
-        else
-                trans_version = SCSI_REV_2;
-
-        if ((sid->flags & SID_WBus16) == 0)
-                width = MSG_EXT_WDTR_BUS_8_BIT;
-        if ((sid->flags & SID_Sync) == 0) {
-                period = 0;
-                offset = 0;
-                ppr_options = 0;
-        }
-        if ((sid->spi3data & SID_SPI_QAS) == 0)
-                ppr_options &= ~MSG_EXT_PPR_QAS_REQ;
-        if ((sid->spi3data & SID_SPI_CLOCK_DT) == 0)
-                ppr_options &= MSG_EXT_PPR_QAS_REQ;
-        if ((sid->spi3data & SID_SPI_IUS) == 0)
-                ppr_options &= (MSG_EXT_PPR_DT_REQ
-                              | MSG_EXT_PPR_QAS_REQ);
-
-        if (prot_version > SCSI_REV_2
-         && ppr_options != 0)
-                trans_version = user->transport_version;
-
-        ahd_validate_width(ahd, /*tinfo limit*/NULL, &width, ROLE_UNKNOWN);
-        ahd_find_syncrate(ahd, &period, &ppr_options, AHD_SYNCRATE_MAX);
-        ahd_validate_offset(ahd, /*tinfo limit*/NULL, period,
-                            &offset, width, ROLE_UNKNOWN);
-        if (offset == 0 || period == 0) {
-                period = 0;
-                offset = 0;
-                ppr_options = 0;
+        ahd_lock(ahd, &s);
+        if ((ahd->platform_data->flags & AHD_SCB_UP_EH_SEM) != 0) {
+                ahd->platform_data->flags &= ~AHD_SCB_UP_EH_SEM;
+                up(&ahd->platform_data->eh_sem);
         }
-        /* Apply our filtered user settings. */
-        curr->transport_version = trans_version;
-        curr->protocol_version = prot_version;
-        ahd_set_width(ahd, devinfo, width, AHD_TRANS_GOAL, /*paused*/FALSE);
-        ahd_set_syncrate(ahd, devinfo, period, offset, ppr_options,
-                         AHD_TRANS_GOAL, /*paused*/FALSE);
+        ahd_unlock(ahd, &s);
 }
 
 void
@@ -4882,12 +2035,6 @@ ahd_release_simq(struct ahd_softc *ahd)
         if (ahd->platform_data->qfrozen == 0) {
                 unblock_reqs = 1;
         }
-        if (AHD_DV_SIMQ_FROZEN(ahd)
-         && ((ahd->platform_data->flags & AHD_DV_WAIT_SIMQ_RELEASE) != 0)) {
-                ahd->platform_data->flags &= ~AHD_DV_WAIT_SIMQ_RELEASE;
-                up(&ahd->platform_data->dv_sem);
-        }
-        ahd_schedule_runq(ahd);
         ahd_unlock(ahd, &s);
         /*
          * There is still a race here.  The mid-layer
@@ -4899,118 +2046,743 @@ ahd_release_simq(struct ahd_softc *ahd)
                 scsi_unblock_requests(ahd->platform_data->host);
 }
 
-static void
-ahd_linux_sem_timeout(u_long arg)
+static int
+ahd_linux_queue_recovery_cmd(struct scsi_cmnd *cmd, scb_flag flag)
 {
-        struct  scb *scb;
-        struct  ahd_softc *ahd;
-        u_long  s;
+        struct ahd_softc *ahd;
+        struct ahd_linux_device *dev;
+        struct scb *pending_scb;
+        u_int  saved_scbptr;
+        u_int  active_scbptr;
+        u_int  last_phase;
+        u_int  saved_scsiid;
+        u_int  cdb_byte;
+        int    retval;
+        int    was_paused;
+        int    paused;
+        int    wait;
+        int    disconnected;
+        ahd_mode_state saved_modes;
 
-        scb = (struct scb *)arg;
-        ahd = scb->ahd_softc;
-        ahd_lock(ahd, &s);
-        if ((scb->platform_data->flags & AHD_SCB_UP_EH_SEM) != 0) {
-                scb->platform_data->flags &= ~AHD_SCB_UP_EH_SEM;
-                up(&ahd->platform_data->eh_sem);
+        pending_scb = NULL;
+        paused = FALSE;
+        wait = FALSE;
+        ahd = *(struct ahd_softc **)cmd->device->host->hostdata;
+
+        printf("%s:%d:%d:%d: Attempting to queue a%s message:",
+               ahd_name(ahd), cmd->device->channel,
+               cmd->device->id, cmd->device->lun,
+               flag == SCB_ABORT ? "n ABORT" : " TARGET RESET");
+
+        printf("CDB:");
+        for (cdb_byte = 0; cdb_byte < cmd->cmd_len; cdb_byte++)
+                printf(" 0x%x", cmd->cmnd[cdb_byte]);
+        printf("\n");
+
+        spin_lock_irq(&ahd->platform_data->spin_lock);
+
+        /*
+         * First determine if we currently own this command.
+         * Start by searching the device queue.  If not found
+         * there, check the pending_scb list.  If not found
+         * at all, and the system wanted us to just abort the
+         * command, return success.
+         */
+        dev = scsi_transport_device_data(cmd->device);
+
+        if (dev == NULL) {
+                /*
+                 * No target device for this command exists,
+                 * so we must not still own the command.
+                 */
+                printf("%s:%d:%d:%d: Is not an active device\n",
+                       ahd_name(ahd), cmd->device->channel, cmd->device->id,
+                       cmd->device->lun);
+                retval = SUCCESS;
+                goto no_cmd;
         }
-        ahd_unlock(ahd, &s);
+
+        /*
+         * See if we can find a matching cmd in the pending list.
+         */
+        LIST_FOREACH(pending_scb, &ahd->pending_scbs, pending_links) {
+                if (pending_scb->io_ctx == cmd)
+                        break;
+        }
+
+        if (pending_scb == NULL && flag == SCB_DEVICE_RESET) {
+
+                /* Any SCB for this device will do for a target reset */
+                LIST_FOREACH(pending_scb, &ahd->pending_scbs, pending_links) {
+                        if (ahd_match_scb(ahd, pending_scb, cmd->device->id,
+                                          cmd->device->channel + 'A',
+                                          CAM_LUN_WILDCARD,
+                                          SCB_LIST_NULL, ROLE_INITIATOR) == 0)
+                                break;
+                }
+        }
+
+        if (pending_scb == NULL) {
+                printf("%s:%d:%d:%d: Command not found\n",
+                       ahd_name(ahd), cmd->device->channel, cmd->device->id,
+                       cmd->device->lun);
+                goto no_cmd;
+        }
+
+        if ((pending_scb->flags & SCB_RECOVERY_SCB) != 0) {
+                /*
+                 * We can't queue two recovery actions using the same SCB
+                 */
+                retval = FAILED;
+                goto  done;
+        }
+
+        /*
+         * Ensure that the card doesn't do anything
+         * behind our back.  Also make sure that we
+         * didn't "just" miss an interrupt that would
+         * affect this cmd.
+         */
+        was_paused = ahd_is_paused(ahd);
+        ahd_pause_and_flushwork(ahd);
+        paused = TRUE;
+
+        if ((pending_scb->flags & SCB_ACTIVE) == 0) {
+                printf("%s:%d:%d:%d: Command already completed\n",
+                       ahd_name(ahd), cmd->device->channel, cmd->device->id,
+                       cmd->device->lun);
+                goto no_cmd;
+        }
+
+        printf("%s: At time of recovery, card was %spaused\n",
+               ahd_name(ahd), was_paused ? "" : "not ");
+        ahd_dump_card_state(ahd);
+
+        disconnected = TRUE;
+        if (flag == SCB_ABORT) {
+                if (ahd_search_qinfifo(ahd, cmd->device->id, 
+                                       cmd->device->channel + 'A',
+                                       cmd->device->lun, 
+                                       pending_scb->hscb->tag,
+                                       ROLE_INITIATOR, CAM_REQ_ABORTED,
+                                       SEARCH_COMPLETE) > 0) {
+                        printf("%s:%d:%d:%d: Cmd aborted from QINFIFO\n",
+                               ahd_name(ahd), cmd->device->channel, 
+                               cmd->device->id, cmd->device->lun);
+                        retval = SUCCESS;
+                        goto done;
+                }
+        } else if (ahd_search_qinfifo(ahd, cmd->device->id,
+                                      cmd->device->channel + 'A',
+                                      cmd->device->lun, pending_scb->hscb->tag,
+                                      ROLE_INITIATOR, /*status*/0,
+                                      SEARCH_COUNT) > 0) {
+                disconnected = FALSE;
+        }
+
+        saved_modes = ahd_save_modes(ahd);
+        ahd_set_modes(ahd, AHD_MODE_SCSI, AHD_MODE_SCSI);
+        last_phase = ahd_inb(ahd, LASTPHASE);
+        saved_scbptr = ahd_get_scbptr(ahd);
+        active_scbptr = saved_scbptr;
+        if (disconnected && (ahd_inb(ahd, SEQ_FLAGS) & NOT_IDENTIFIED) == 0) {
+                struct scb *bus_scb;
+
+                bus_scb = ahd_lookup_scb(ahd, active_scbptr);
+                if (bus_scb == pending_scb)
+                        disconnected = FALSE;
+                else if (flag != SCB_ABORT
+                         && ahd_inb(ahd, SAVED_SCSIID) == pending_scb->hscb->scsiid
+                         && ahd_inb(ahd, SAVED_LUN) == SCB_GET_LUN(pending_scb))
+                        disconnected = FALSE;
+        }
+
+        /*
+         * At this point, pending_scb is the scb associated with the
+         * passed in command.  That command is currently active on the
+         * bus or is in the disconnected state.
+         */
+        saved_scsiid = ahd_inb(ahd, SAVED_SCSIID);
+        if (last_phase != P_BUSFREE
+         && (SCB_GET_TAG(pending_scb) == active_scbptr
+             || (flag == SCB_DEVICE_RESET
+                 && SCSIID_TARGET(ahd, saved_scsiid) == cmd->device->id))) {
+
+                /*
+                 * We're active on the bus, so assert ATN
+                 * and hope that the target responds.
+                 */
+                pending_scb = ahd_lookup_scb(ahd, active_scbptr);
+                pending_scb->flags |= SCB_RECOVERY_SCB|flag;
+                ahd_outb(ahd, MSG_OUT, HOST_MSG);
+                ahd_outb(ahd, SCSISIGO, last_phase|ATNO);
+                printf("%s:%d:%d:%d: Device is active, asserting ATN\n",
+                       ahd_name(ahd), cmd->device->channel,
+                       cmd->device->id, cmd->device->lun);
+                wait = TRUE;
+        } else if (disconnected) {
+
+                /*
+                 * Actually re-queue this SCB in an attempt
+                 * to select the device before it reconnects.
+                 */
+                pending_scb->flags |= SCB_RECOVERY_SCB|SCB_ABORT;
+                ahd_set_scbptr(ahd, SCB_GET_TAG(pending_scb));
+                pending_scb->hscb->cdb_len = 0;
+                pending_scb->hscb->task_attribute = 0;
+                pending_scb->hscb->task_management = SIU_TASKMGMT_ABORT_TASK;
+
+                if ((pending_scb->flags & SCB_PACKETIZED) != 0) {
+                        /*
+                         * Mark the SCB has having an outstanding
+                         * task management function.  Should the command
+                         * complete normally before the task management
+                         * function can be sent, the host will be notified
+                         * to abort our requeued SCB.
+                         */
+                        ahd_outb(ahd, SCB_TASK_MANAGEMENT,
+                                 pending_scb->hscb->task_management);
+                } else {
+                        /*
+                         * If non-packetized, set the MK_MESSAGE control
+                         * bit indicating that we desire to send a message.
+                         * We also set the disconnected flag since there is
+                         * no guarantee that our SCB control byte matches
+                         * the version on the card.  We don't want the
+                         * sequencer to abort the command thinking an
+                         * unsolicited reselection occurred.
+                         */
+                        pending_scb->hscb->control |= MK_MESSAGE|DISCONNECTED;
+
+                        /*
+                         * The sequencer will never re-reference the
+                         * in-core SCB.  To make sure we are notified
+                         * during reslection, set the MK_MESSAGE flag in
+                         * the card's copy of the SCB.
+                         */
+                        ahd_outb(ahd, SCB_CONTROL,
+                                 ahd_inb(ahd, SCB_CONTROL)|MK_MESSAGE);
+                }
+
+                /*
+                 * Clear out any entries in the QINFIFO first
+                 * so we are the next SCB for this target
+                 * to run.
+                 */
+                ahd_search_qinfifo(ahd, cmd->device->id,
+                                   cmd->device->channel + 'A', cmd->device->lun,
+                                   SCB_LIST_NULL, ROLE_INITIATOR,
+                                   CAM_REQUEUE_REQ, SEARCH_COMPLETE);
+                ahd_qinfifo_requeue_tail(ahd, pending_scb);
+                ahd_set_scbptr(ahd, saved_scbptr);
+                ahd_print_path(ahd, pending_scb);
+                printf("Device is disconnected, re-queuing SCB\n");
+                wait = TRUE;
+        } else {
+                printf("%s:%d:%d:%d: Unable to deliver message\n",
+                       ahd_name(ahd), cmd->device->channel,
+                       cmd->device->id, cmd->device->lun);
+                retval = FAILED;
+                goto done;
+        }
+
+no_cmd:
+        /*
+         * Our assumption is that if we don't have the command, no
+         * recovery action was required, so we return success.  Again,
+         * the semantics of the mid-layer recovery engine are not
+         * well defined, so this may change in time.
+         */
+        retval = SUCCESS;
+done:
+        if (paused)
+                ahd_unpause(ahd);
+        if (wait) {
+                struct timer_list timer;
+                int ret;
+
+                ahd->platform_data->flags |= AHD_SCB_UP_EH_SEM;
+                spin_unlock_irq(&ahd->platform_data->spin_lock);
+                init_timer(&timer);
+                timer.data = (u_long)ahd;
+                timer.expires = jiffies + (5 * HZ);
+                timer.function = ahd_linux_sem_timeout;
+                add_timer(&timer);
+                printf("Recovery code sleeping\n");
+                down(&ahd->platform_data->eh_sem);
+                printf("Recovery code awake\n");
+                ret = del_timer_sync(&timer);
+                if (ret == 0) {
+                        printf("Timer Expired\n");
+                        retval = FAILED;
+                }
+                spin_lock_irq(&ahd->platform_data->spin_lock);
+        }
+        spin_unlock_irq(&ahd->platform_data->spin_lock);
+        return (retval);
 }
 
-static void
-ahd_linux_dev_timed_unfreeze(u_long arg)
+static void ahd_linux_set_width(struct scsi_target *starget, int width)
 {
-        struct ahd_linux_device *dev;
-        struct ahd_softc *ahd;
-        u_long s;
+        struct Scsi_Host *shost = dev_to_shost(starget->dev.parent);
+        struct ahd_softc *ahd = *((struct ahd_softc **)shost->hostdata);
+        struct ahd_devinfo devinfo;
+        unsigned long flags;
 
-        dev = (struct ahd_linux_device *)arg;
-        ahd = dev->target->ahd;
-        ahd_lock(ahd, &s);
-        dev->flags &= ~AHD_DEV_TIMER_ACTIVE;
-        if (dev->qfrozen > 0)
-                dev->qfrozen--;
-        if (dev->qfrozen == 0
-         && (dev->flags & AHD_DEV_ON_RUN_LIST) == 0)
-                ahd_linux_run_device_queue(ahd, dev);
-        if ((dev->flags & AHD_DEV_UNCONFIGURED) != 0
-         && dev->active == 0)
-                ahd_linux_free_device(ahd, dev);
-        ahd_unlock(ahd, &s);
+        ahd_compile_devinfo(&devinfo, shost->this_id, starget->id, 0,
+                            starget->channel + 'A', ROLE_INITIATOR);
+        ahd_lock(ahd, &flags);
+        ahd_set_width(ahd, &devinfo, width, AHD_TRANS_GOAL, FALSE);
+        ahd_unlock(ahd, &flags);
 }
 
-void
-ahd_platform_dump_card_state(struct ahd_softc *ahd)
+static void ahd_linux_set_period(struct scsi_target *starget, int period)
 {
-        struct ahd_linux_device *dev;
-        int target;
-        int maxtarget;
-        int lun;
-        int i;
-
-        maxtarget = (ahd->features & AHD_WIDE) ? 15 : 7;
-        for (target = 0; target <=maxtarget; target++) {
-
-                for (lun = 0; lun < AHD_NUM_LUNS; lun++) {
-                        struct ahd_cmd *acmd;
-
-                        dev = ahd_linux_get_device(ahd, 0, target,
-                                                   lun, /*alloc*/FALSE);
-                        if (dev == NULL)
-                                continue;
-
-                        printf("DevQ(%d:%d:%d): ", 0, target, lun);
-                        i = 0;
-                        TAILQ_FOREACH(acmd, &dev->busyq, acmd_links.tqe) {
-                                if (i++ > AHD_SCB_MAX)
-                                        break;
-                        }
-                        printf("%d waiting\n", i);
-                }
+        struct Scsi_Host *shost = dev_to_shost(starget->dev.parent);
+        struct ahd_softc *ahd = *((struct ahd_softc **)shost->hostdata);
+        struct ahd_tmode_tstate *tstate;
+        struct ahd_initiator_tinfo *tinfo 
+                = ahd_fetch_transinfo(ahd,
+                                      starget->channel + 'A',
+                                      shost->this_id, starget->id, &tstate);
+        struct ahd_devinfo devinfo;
+        unsigned int ppr_options = tinfo->goal.ppr_options;
+        unsigned int dt;
+        unsigned long flags;
+        unsigned long offset = tinfo->goal.offset;
+
+#ifdef AHD_DEBUG
+        if ((ahd_debug & AHD_SHOW_DV) != 0)
+                printf("%s: set period to %d\n", ahd_name(ahd), period);
+#endif
+        if (offset == 0)
+                offset = MAX_OFFSET;
+
+        if (period < 8)
+                period = 8;
+        if (period < 10) {
+                ppr_options |= MSG_EXT_PPR_DT_REQ;
+                if (period == 8)
+                        ppr_options |= MSG_EXT_PPR_IU_REQ;
         }
+
+        dt = ppr_options & MSG_EXT_PPR_DT_REQ;
+
+        ahd_compile_devinfo(&devinfo, shost->this_id, starget->id, 0,
+                            starget->channel + 'A', ROLE_INITIATOR);
+
+        /* all PPR requests apart from QAS require wide transfers */
+        if (ppr_options & ~MSG_EXT_PPR_QAS_REQ) {
+                if (spi_width(starget) == 0)
+                        ppr_options &= MSG_EXT_PPR_QAS_REQ;
+        }
+
+        ahd_find_syncrate(ahd, &period, &ppr_options,
+                          dt ? AHD_SYNCRATE_MAX : AHD_SYNCRATE_ULTRA2);
+
+        ahd_lock(ahd, &flags);
+        ahd_set_syncrate(ahd, &devinfo, period, offset,
+                         ppr_options, AHD_TRANS_GOAL, FALSE);
+        ahd_unlock(ahd, &flags);
 }
 
-static int __init
-ahd_linux_init(void)
+static void ahd_linux_set_offset(struct scsi_target *starget, int offset)
 {
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
-        return ahd_linux_detect(&aic79xx_driver_template);
-#else
-        scsi_register_module(MODULE_SCSI_HA, &aic79xx_driver_template);
-        if (aic79xx_driver_template.present == 0) {
-                scsi_unregister_module(MODULE_SCSI_HA,
-                                       &aic79xx_driver_template);
-                return (-ENODEV);
+        struct Scsi_Host *shost = dev_to_shost(starget->dev.parent);
+        struct ahd_softc *ahd = *((struct ahd_softc **)shost->hostdata);
+        struct ahd_tmode_tstate *tstate;
+        struct ahd_initiator_tinfo *tinfo 
+                = ahd_fetch_transinfo(ahd,
+                                      starget->channel + 'A',
+                                      shost->this_id, starget->id, &tstate);
+        struct ahd_devinfo devinfo;
+        unsigned int ppr_options = 0;
+        unsigned int period = 0;
+        unsigned int dt = ppr_options & MSG_EXT_PPR_DT_REQ;
+        unsigned long flags;
+
+#ifdef AHD_DEBUG
+        if ((ahd_debug & AHD_SHOW_DV) != 0)
+                printf("%s: set offset to %d\n", ahd_name(ahd), offset);
+#endif
+
+        ahd_compile_devinfo(&devinfo, shost->this_id, starget->id, 0,
+                            starget->channel + 'A', ROLE_INITIATOR);
+        if (offset != 0) {
+                period = tinfo->goal.period;
+                ppr_options = tinfo->goal.ppr_options;
+                ahd_find_syncrate(ahd, &period, &ppr_options, 
+                                  dt ? AHD_SYNCRATE_MAX : AHD_SYNCRATE_ULTRA2);
         }
 
-        return (0);
+        ahd_lock(ahd, &flags);
+        ahd_set_syncrate(ahd, &devinfo, period, offset, ppr_options,
+                         AHD_TRANS_GOAL, FALSE);
+        ahd_unlock(ahd, &flags);
+}
+
+static void ahd_linux_set_dt(struct scsi_target *starget, int dt)
+{
+        struct Scsi_Host *shost = dev_to_shost(starget->dev.parent);
+        struct ahd_softc *ahd = *((struct ahd_softc **)shost->hostdata);
+        struct ahd_tmode_tstate *tstate;
+        struct ahd_initiator_tinfo *tinfo 
+                = ahd_fetch_transinfo(ahd,
+                                      starget->channel + 'A',
+                                      shost->this_id, starget->id, &tstate);
+        struct ahd_devinfo devinfo;
+        unsigned int ppr_options = tinfo->goal.ppr_options
+                & ~MSG_EXT_PPR_DT_REQ;
+        unsigned int period = tinfo->goal.period;
+        unsigned int width = tinfo->goal.width;
+        unsigned long flags;
+
+#ifdef AHD_DEBUG
+        if ((ahd_debug & AHD_SHOW_DV) != 0)
+                printf("%s: %s DT\n", ahd_name(ahd), 
+                       dt ? "enabling" : "disabling");
+#endif
+        if (dt) {
+                ppr_options |= MSG_EXT_PPR_DT_REQ;
+                if (!width)
+                        ahd_linux_set_width(starget, 1);
+        } else {
+                if (period <= 9)
+                        period = 10; /* If resetting DT, period must be >= 25ns */
+                /* IU is invalid without DT set */
+                ppr_options &= ~MSG_EXT_PPR_IU_REQ;
+        }
+        ahd_compile_devinfo(&devinfo, shost->this_id, starget->id, 0,
+                            starget->channel + 'A', ROLE_INITIATOR);
+        ahd_find_syncrate(ahd, &period, &ppr_options,
+                          dt ? AHD_SYNCRATE_MAX : AHD_SYNCRATE_ULTRA2);
+
+        ahd_lock(ahd, &flags);
+        ahd_set_syncrate(ahd, &devinfo, period, tinfo->goal.offset,
+                         ppr_options, AHD_TRANS_GOAL, FALSE);
+        ahd_unlock(ahd, &flags);
+}
+
+static void ahd_linux_set_qas(struct scsi_target *starget, int qas)
+{
+        struct Scsi_Host *shost = dev_to_shost(starget->dev.parent);
+        struct ahd_softc *ahd = *((struct ahd_softc **)shost->hostdata);
+        struct ahd_tmode_tstate *tstate;
+        struct ahd_initiator_tinfo *tinfo 
+                = ahd_fetch_transinfo(ahd,
+                                      starget->channel + 'A',
+                                      shost->this_id, starget->id, &tstate);
+        struct ahd_devinfo devinfo;
+        unsigned int ppr_options = tinfo->goal.ppr_options
+                & ~MSG_EXT_PPR_QAS_REQ;
+        unsigned int period = tinfo->goal.period;
+        unsigned int dt;
+        unsigned long flags;
+
+#ifdef AHD_DEBUG
+        if ((ahd_debug & AHD_SHOW_DV) != 0)
+                printf("%s: %s QAS\n", ahd_name(ahd), 
+                       qas ? "enabling" : "disabling");
+#endif
+
+        if (qas) {
+                ppr_options |= MSG_EXT_PPR_QAS_REQ; 
+        }
+
+        dt = ppr_options & MSG_EXT_PPR_DT_REQ;
+
+        ahd_compile_devinfo(&devinfo, shost->this_id, starget->id, 0,
+                            starget->channel + 'A', ROLE_INITIATOR);
+        ahd_find_syncrate(ahd, &period, &ppr_options,
+                          dt ? AHD_SYNCRATE_MAX : AHD_SYNCRATE_ULTRA2);
+
+        ahd_lock(ahd, &flags);
+        ahd_set_syncrate(ahd, &devinfo, period, tinfo->goal.offset,
+                         ppr_options, AHD_TRANS_GOAL, FALSE);
+        ahd_unlock(ahd, &flags);
+}
+
+static void ahd_linux_set_iu(struct scsi_target *starget, int iu)
+{
+        struct Scsi_Host *shost = dev_to_shost(starget->dev.parent);
+        struct ahd_softc *ahd = *((struct ahd_softc **)shost->hostdata);
+        struct ahd_tmode_tstate *tstate;
+        struct ahd_initiator_tinfo *tinfo 
+                = ahd_fetch_transinfo(ahd,
+                                      starget->channel + 'A',
+                                      shost->this_id, starget->id, &tstate);
+        struct ahd_devinfo devinfo;
+        unsigned int ppr_options = tinfo->goal.ppr_options
+                & ~MSG_EXT_PPR_IU_REQ;
+        unsigned int period = tinfo->goal.period;
+        unsigned int dt;
+        unsigned long flags;
+
+#ifdef AHD_DEBUG
+        if ((ahd_debug & AHD_SHOW_DV) != 0)
+                printf("%s: %s IU\n", ahd_name(ahd),
+                       iu ? "enabling" : "disabling");
 #endif
+
+        if (iu) {
+                ppr_options |= MSG_EXT_PPR_IU_REQ;
+                ppr_options |= MSG_EXT_PPR_DT_REQ; /* IU requires DT */
+        }
+
+        dt = ppr_options & MSG_EXT_PPR_DT_REQ;
+
+        ahd_compile_devinfo(&devinfo, shost->this_id, starget->id, 0,
+                            starget->channel + 'A', ROLE_INITIATOR);
+        ahd_find_syncrate(ahd, &period, &ppr_options,
+                          dt ? AHD_SYNCRATE_MAX : AHD_SYNCRATE_ULTRA2);
+
+        ahd_lock(ahd, &flags);
+        ahd_set_syncrate(ahd, &devinfo, period, tinfo->goal.offset,
+                         ppr_options, AHD_TRANS_GOAL, FALSE);
+        ahd_unlock(ahd, &flags);
 }
 
-static void __exit
-ahd_linux_exit(void)
+static void ahd_linux_set_rd_strm(struct scsi_target *starget, int rdstrm)
 {
-        struct ahd_softc *ahd;
+        struct Scsi_Host *shost = dev_to_shost(starget->dev.parent);
+        struct ahd_softc *ahd = *((struct ahd_softc **)shost->hostdata);
+        struct ahd_tmode_tstate *tstate;
+        struct ahd_initiator_tinfo *tinfo 
+                = ahd_fetch_transinfo(ahd,
+                                      starget->channel + 'A',
+                                      shost->this_id, starget->id, &tstate);
+        struct ahd_devinfo devinfo;
+        unsigned int ppr_options = tinfo->goal.ppr_options
+                & ~MSG_EXT_PPR_RD_STRM;
+        unsigned int period = tinfo->goal.period;
+        unsigned int dt = ppr_options & MSG_EXT_PPR_DT_REQ;
+        unsigned long flags;
 
-        /*
-         * Shutdown DV threads before going into the SCSI mid-layer.
-         * This avoids situations where the mid-layer locks the entire
-         * kernel so that waiting for our DV threads to exit leads
-         * to deadlock.
-         */
-        TAILQ_FOREACH(ahd, &ahd_tailq, links) {
+#ifdef AHD_DEBUG
+        if ((ahd_debug & AHD_SHOW_DV) != 0)
+                printf("%s: %s Read Streaming\n", ahd_name(ahd), 
+                       rdstrm  ? "enabling" : "disabling");
+#endif
+
+        if (rdstrm)
+                ppr_options |= MSG_EXT_PPR_RD_STRM;
+
+        ahd_compile_devinfo(&devinfo, shost->this_id, starget->id, 0,
+                            starget->channel + 'A', ROLE_INITIATOR);
+        ahd_find_syncrate(ahd, &period, &ppr_options,
+                          dt ? AHD_SYNCRATE_MAX : AHD_SYNCRATE_ULTRA2);
 
-                ahd_linux_kill_dv_thread(ahd);
+        ahd_lock(ahd, &flags);
+        ahd_set_syncrate(ahd, &devinfo, period, tinfo->goal.offset,
+                         ppr_options, AHD_TRANS_GOAL, FALSE);
+        ahd_unlock(ahd, &flags);
+}
+
+static void ahd_linux_set_wr_flow(struct scsi_target *starget, int wrflow)
+{
+        struct Scsi_Host *shost = dev_to_shost(starget->dev.parent);
+        struct ahd_softc *ahd = *((struct ahd_softc **)shost->hostdata);
+        struct ahd_tmode_tstate *tstate;
+        struct ahd_initiator_tinfo *tinfo 
+                = ahd_fetch_transinfo(ahd,
+                                      starget->channel + 'A',
+                                      shost->this_id, starget->id, &tstate);
+        struct ahd_devinfo devinfo;
+        unsigned int ppr_options = tinfo->goal.ppr_options
+                & ~MSG_EXT_PPR_WR_FLOW;
+        unsigned int period = tinfo->goal.period;
+        unsigned int dt = ppr_options & MSG_EXT_PPR_DT_REQ;
+        unsigned long flags;
+
+#ifdef AHD_DEBUG
+        if ((ahd_debug & AHD_SHOW_DV) != 0)
+                printf("%s: %s Write Flow Control\n", ahd_name(ahd),
+                       wrflow ? "enabling" : "disabling");
+#endif
+
+        if (wrflow)
+                ppr_options |= MSG_EXT_PPR_WR_FLOW;
+
+        ahd_compile_devinfo(&devinfo, shost->this_id, starget->id, 0,
+                            starget->channel + 'A', ROLE_INITIATOR);
+        ahd_find_syncrate(ahd, &period, &ppr_options,
+                          dt ? AHD_SYNCRATE_MAX : AHD_SYNCRATE_ULTRA2);
+
+        ahd_lock(ahd, &flags);
+        ahd_set_syncrate(ahd, &devinfo, period, tinfo->goal.offset,
+                         ppr_options, AHD_TRANS_GOAL, FALSE);
+        ahd_unlock(ahd, &flags);
+}
+
+static void ahd_linux_set_rti(struct scsi_target *starget, int rti)
+{
+        struct Scsi_Host *shost = dev_to_shost(starget->dev.parent);
+        struct ahd_softc *ahd = *((struct ahd_softc **)shost->hostdata);
+        struct ahd_tmode_tstate *tstate;
+        struct ahd_initiator_tinfo *tinfo 
+                = ahd_fetch_transinfo(ahd,
+                                      starget->channel + 'A',
+                                      shost->this_id, starget->id, &tstate);
+        struct ahd_devinfo devinfo;
+        unsigned int ppr_options = tinfo->goal.ppr_options
+                & ~MSG_EXT_PPR_RTI;
+        unsigned int period = tinfo->goal.period;
+        unsigned int dt = ppr_options & MSG_EXT_PPR_DT_REQ;
+        unsigned long flags;
+
+        if ((ahd->features & AHD_RTI) == 0) {
+#ifdef AHD_DEBUG
+                if ((ahd_debug & AHD_SHOW_DV) != 0)
+                        printf("%s: RTI not available\n", ahd_name(ahd));
+#endif
+                return;
         }
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+#ifdef AHD_DEBUG
+        if ((ahd_debug & AHD_SHOW_DV) != 0)
+                printf("%s: %s RTI\n", ahd_name(ahd),
+                       rti ? "enabling" : "disabling");
+#endif
+
+        if (rti)
+                ppr_options |= MSG_EXT_PPR_RTI;
+
+        ahd_compile_devinfo(&devinfo, shost->this_id, starget->id, 0,
+                            starget->channel + 'A', ROLE_INITIATOR);
+        ahd_find_syncrate(ahd, &period, &ppr_options,
+                          dt ? AHD_SYNCRATE_MAX : AHD_SYNCRATE_ULTRA2);
+
+        ahd_lock(ahd, &flags);
+        ahd_set_syncrate(ahd, &devinfo, period, tinfo->goal.offset,
+                         ppr_options, AHD_TRANS_GOAL, FALSE);
+        ahd_unlock(ahd, &flags);
+}
+
+static void ahd_linux_set_pcomp_en(struct scsi_target *starget, int pcomp)
+{
+        struct Scsi_Host *shost = dev_to_shost(starget->dev.parent);
+        struct ahd_softc *ahd = *((struct ahd_softc **)shost->hostdata);
+        struct ahd_tmode_tstate *tstate;
+        struct ahd_initiator_tinfo *tinfo 
+                = ahd_fetch_transinfo(ahd,
+                                      starget->channel + 'A',
+                                      shost->this_id, starget->id, &tstate);
+        struct ahd_devinfo devinfo;
+        unsigned int ppr_options = tinfo->goal.ppr_options
+                & ~MSG_EXT_PPR_PCOMP_EN;
+        unsigned int period = tinfo->goal.period;
+        unsigned int dt = ppr_options & MSG_EXT_PPR_DT_REQ;
+        unsigned long flags;
+
+#ifdef AHD_DEBUG
+        if ((ahd_debug & AHD_SHOW_DV) != 0)
+                printf("%s: %s Precompensation\n", ahd_name(ahd), 
+                       pcomp ? "Enable" : "Disable");
+#endif
+
+        if (pcomp)
+                ppr_options |= MSG_EXT_PPR_PCOMP_EN;
+
+        ahd_compile_devinfo(&devinfo, shost->this_id, starget->id, 0,
+                            starget->channel + 'A', ROLE_INITIATOR);
+        ahd_find_syncrate(ahd, &period, &ppr_options,
+                          dt ? AHD_SYNCRATE_MAX : AHD_SYNCRATE_ULTRA2);
+
+        ahd_lock(ahd, &flags);
+        ahd_set_syncrate(ahd, &devinfo, period, tinfo->goal.offset,
+                         ppr_options, AHD_TRANS_GOAL, FALSE);
+        ahd_unlock(ahd, &flags);
+}
+
+static void ahd_linux_set_hold_mcs(struct scsi_target *starget, int hold)
+{
+        struct Scsi_Host *shost = dev_to_shost(starget->dev.parent);
+        struct ahd_softc *ahd = *((struct ahd_softc **)shost->hostdata);
+        struct ahd_tmode_tstate *tstate;
+        struct ahd_initiator_tinfo *tinfo 
+                = ahd_fetch_transinfo(ahd,
+                                      starget->channel + 'A',
+                                      shost->this_id, starget->id, &tstate);
+        struct ahd_devinfo devinfo;
+        unsigned int ppr_options = tinfo->goal.ppr_options
+                & ~MSG_EXT_PPR_HOLD_MCS;
+        unsigned int period = tinfo->goal.period;
+        unsigned int dt = ppr_options & MSG_EXT_PPR_DT_REQ;
+        unsigned long flags;
+
+        if (hold)
+                ppr_options |= MSG_EXT_PPR_HOLD_MCS;
+
+        ahd_compile_devinfo(&devinfo, shost->this_id, starget->id, 0,
+                            starget->channel + 'A', ROLE_INITIATOR);
+        ahd_find_syncrate(ahd, &period, &ppr_options,
+                          dt ? AHD_SYNCRATE_MAX : AHD_SYNCRATE_ULTRA2);
+
+        ahd_lock(ahd, &flags);
+        ahd_set_syncrate(ahd, &devinfo, period, tinfo->goal.offset,
+                         ppr_options, AHD_TRANS_GOAL, FALSE);
+        ahd_unlock(ahd, &flags);
+}
+
+
+
+static struct spi_function_template ahd_linux_transport_functions = {
+        .set_offset     = ahd_linux_set_offset,
+        .show_offset    = 1,
+        .set_period     = ahd_linux_set_period,
+        .show_period    = 1,
+        .set_width      = ahd_linux_set_width,
+        .show_width     = 1,
+        .set_dt         = ahd_linux_set_dt,
+        .show_dt        = 1,
+        .set_iu         = ahd_linux_set_iu,
+        .show_iu        = 1,
+        .set_qas        = ahd_linux_set_qas,
+        .show_qas       = 1,
+        .set_rd_strm    = ahd_linux_set_rd_strm,
+        .show_rd_strm   = 1,
+        .set_wr_flow    = ahd_linux_set_wr_flow,
+        .show_wr_flow   = 1,
+        .set_rti        = ahd_linux_set_rti,
+        .show_rti       = 1,
+        .set_pcomp_en   = ahd_linux_set_pcomp_en,
+        .show_pcomp_en  = 1,
+        .set_hold_mcs   = ahd_linux_set_hold_mcs,
+        .show_hold_mcs  = 1,
+};
+
+static int __init
+ahd_linux_init(void)
+{
+        int     error = 0;
+
         /*
-         * In 2.4 we have to unregister from the PCI core _after_
-         * unregistering from the scsi midlayer to avoid dangling
-         * references.
+         * If we've been passed any parameters, process them now.
          */
-        scsi_unregister_module(MODULE_SCSI_HA, &aic79xx_driver_template);
-#endif
+        if (aic79xx)
+                aic79xx_setup(aic79xx);
+
+        ahd_linux_transport_template =
+                spi_attach_transport(&ahd_linux_transport_functions);
+        if (!ahd_linux_transport_template)
+                return -ENODEV;
+
+        scsi_transport_reserve_target(ahd_linux_transport_template,
+                                      sizeof(struct ahd_linux_target));
+        scsi_transport_reserve_device(ahd_linux_transport_template,
+                                      sizeof(struct ahd_linux_device));
+
+        error = ahd_linux_pci_init();
+        if (error)
+                spi_release_transport(ahd_linux_transport_template);
+        return error;
+}
+
+static void __exit
+ahd_linux_exit(void)
+{
         ahd_linux_pci_exit();
+        spi_release_transport(ahd_linux_transport_template);
 }
 
 module_init(ahd_linux_init);
diff --git a/drivers/scsi/aic7xxx/aic79xx_osm.h b/drivers/scsi/aic7xxx/aic79xx_osm.h
index 7823e52e99a..052c6619acc 100644
--- a/drivers/scsi/aic7xxx/aic79xx_osm.h
+++ b/drivers/scsi/aic7xxx/aic79xx_osm.h
@@ -42,6 +42,7 @@
 #ifndef _AIC79XX_LINUX_H_
 #define _AIC79XX_LINUX_H_
 
+#include <linux/config.h>
 #include <linux/types.h>
 #include <linux/blkdev.h>
 #include <linux/delay.h>
@@ -49,18 +50,23 @@
 #include <linux/pci.h>
 #include <linux/smp_lock.h>
 #include <linux/version.h>
+#include <linux/interrupt.h>
 #include <linux/module.h>
+#include <linux/slab.h>
 #include <asm/byteorder.h>
 #include <asm/io.h>
 
-#include <linux/interrupt.h> /* For tasklet support. */
-#include <linux/config.h>
-#include <linux/slab.h>
+#include <scsi/scsi.h>
+#include <scsi/scsi_cmnd.h>
+#include <scsi/scsi_eh.h>
+#include <scsi/scsi_device.h>
+#include <scsi/scsi_host.h>
+#include <scsi/scsi_tcq.h>
+#include <scsi/scsi_transport.h>
+#include <scsi/scsi_transport_spi.h>
 
 /* Core SCSI definitions */
 #define AIC_LIB_PREFIX ahd
-#include "scsi.h"
-#include <scsi/scsi_host.h>
 
 /* Name space conflict with BSD queue macros */
 #ifdef LIST_HEAD
@@ -95,7 +101,7 @@
 /************************* Forward Declarations *******************************/
 struct ahd_softc;
 typedef struct pci_dev *ahd_dev_softc_t;
-typedef Scsi_Cmnd      *ahd_io_ctx_t;
+typedef struct scsi_cmnd      *ahd_io_ctx_t;
 
 /******************************* Byte Order ***********************************/
 #define ahd_htobe16(x)  cpu_to_be16(x)
@@ -114,8 +120,7 @@ typedef Scsi_Cmnd      *ahd_io_ctx_t;
 
 /************************* Configuration Data *********************************/
 extern uint32_t aic79xx_allow_memio;
-extern int aic79xx_detect_complete;
-extern Scsi_Host_Template aic79xx_driver_template;
+extern struct scsi_host_template aic79xx_driver_template;
 
 /***************************** Bus Space/DMA **********************************/
 
@@ -145,11 +150,7 @@ struct ahd_linux_dma_tag
 };
 typedef struct ahd_linux_dma_tag* bus_dma_tag_t;
 
-struct ahd_linux_dmamap
-{
-        dma_addr_t      bus_addr;
-};
-typedef struct ahd_linux_dmamap* bus_dmamap_t;
+typedef dma_addr_t bus_dmamap_t;
 
 typedef int bus_dma_filter_t(void*, dma_addr_t);
 typedef void bus_dmamap_callback_t(void *, bus_dma_segment_t *, int, int);
@@ -226,12 +227,12 @@ typedef struct timer_list ahd_timer_t;
 #define ahd_timer_init init_timer
 #define ahd_timer_stop del_timer_sync
 typedef void ahd_linux_callback_t (u_long);  
-static __inline void ahd_timer_reset(ahd_timer_t *timer, u_int usec,
+static __inline void ahd_timer_reset(ahd_timer_t *timer, int usec,
                                      ahd_callback_t *func, void *arg);
 static __inline void ahd_scb_timer_reset(struct scb *scb, u_int usec);
 
 static __inline void
-ahd_timer_reset(ahd_timer_t *timer, u_int usec, ahd_callback_t *func, void *arg)
+ahd_timer_reset(ahd_timer_t *timer, int usec, ahd_callback_t *func, void *arg)
 {
         struct ahd_softc *ahd;
 
@@ -252,43 +253,8 @@ ahd_scb_timer_reset(struct scb *scb, u_int usec)
 /***************************** SMP support ************************************/
 #include <linux/spinlock.h>
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0) || defined(SCSI_HAS_HOST_LOCK))
-#define AHD_SCSI_HAS_HOST_LOCK 1
-#else
-#define AHD_SCSI_HAS_HOST_LOCK 0
-#endif
-
 #define AIC79XX_DRIVER_VERSION "1.3.11"
 
-/**************************** Front End Queues ********************************/
-/*
- * Data structure used to cast the Linux struct scsi_cmnd to something
- * that allows us to use the queue macros.  The linux structure has
- * plenty of space to hold the links fields as required by the queue
- * macros, but the queue macors require them to have the correct type.
- */
-struct ahd_cmd_internal {
-        /* Area owned by the Linux scsi layer. */
-        uint8_t private[offsetof(struct scsi_cmnd, SCp.Status)];
-        union {
-                STAILQ_ENTRY(ahd_cmd)   ste;
-                LIST_ENTRY(ahd_cmd)     le;
-                TAILQ_ENTRY(ahd_cmd)    tqe;
-        } links;
-        uint32_t                        end;
-};
-
-struct ahd_cmd {
-        union {
-                struct ahd_cmd_internal icmd;
-                struct scsi_cmnd        scsi_cmd;
-        } un;
-};
-
-#define acmd_icmd(cmd) ((cmd)->un.icmd)
-#define acmd_scsi_cmd(cmd) ((cmd)->un.scsi_cmd)
-#define acmd_links un.icmd.links
-
 /*************************** Device Data Structures ***************************/
 /*
  * A per probed device structure used to deal with some error recovery
@@ -297,22 +263,17 @@ struct ahd_cmd {
  * after a successfully completed inquiry command to the target when
  * that inquiry data indicates a lun is present.
  */
-TAILQ_HEAD(ahd_busyq, ahd_cmd);
+
 typedef enum {
-        AHD_DEV_UNCONFIGURED     = 0x01,
         AHD_DEV_FREEZE_TIL_EMPTY = 0x02, /* Freeze queue until active == 0 */
-        AHD_DEV_TIMER_ACTIVE     = 0x04, /* Our timer is active */
-        AHD_DEV_ON_RUN_LIST      = 0x08, /* Queued to be run later */
         AHD_DEV_Q_BASIC          = 0x10, /* Allow basic device queuing */
         AHD_DEV_Q_TAGGED         = 0x20, /* Allow full SCSI2 command queueing */
         AHD_DEV_PERIODIC_OTAG    = 0x40, /* Send OTAG to prevent starvation */
-        AHD_DEV_SLAVE_CONFIGURED = 0x80  /* slave_configure() has been called */
 } ahd_linux_dev_flags;
 
 struct ahd_linux_target;
 struct ahd_linux_device {
         TAILQ_ENTRY(ahd_linux_device) links;
-        struct                  ahd_busyq busyq;
 
         /*
          * The number of transactions currently
@@ -388,62 +349,12 @@ struct ahd_linux_device {
          */
         u_int                   commands_since_idle_or_otag;
 #define AHD_OTAG_THRESH 500
-
-        int                     lun;
-        Scsi_Device            *scsi_device;
-        struct                  ahd_linux_target *target;
 };
 
-typedef enum {
-        AHD_DV_REQUIRED          = 0x01,
-        AHD_INQ_VALID            = 0x02,
-        AHD_BASIC_DV             = 0x04,
-        AHD_ENHANCED_DV          = 0x08
-} ahd_linux_targ_flags;
-
-/* DV States */
-typedef enum {
-        AHD_DV_STATE_EXIT = 0,
-        AHD_DV_STATE_INQ_SHORT_ASYNC,
-        AHD_DV_STATE_INQ_ASYNC,
-        AHD_DV_STATE_INQ_ASYNC_VERIFY,
-        AHD_DV_STATE_TUR,
-        AHD_DV_STATE_REBD,
-        AHD_DV_STATE_INQ_VERIFY,
-        AHD_DV_STATE_WEB,
-        AHD_DV_STATE_REB,
-        AHD_DV_STATE_SU,
-        AHD_DV_STATE_BUSY
-} ahd_dv_state;
-
 struct ahd_linux_target {
-        struct ahd_linux_device  *devices[AHD_NUM_LUNS];
-        int                       channel;
-        int                       target;
-        int                       refcount;
+        struct scsi_device       *sdev[AHD_NUM_LUNS];
         struct ahd_transinfo      last_tinfo;
         struct ahd_softc         *ahd;
-        ahd_linux_targ_flags      flags;
-        struct scsi_inquiry_data *inq_data;
-        /*
-         * The next "fallback" period to use for narrow/wide transfers.
-         */
-        uint8_t                   dv_next_narrow_period;
-        uint8_t                   dv_next_wide_period;
-        uint8_t                   dv_max_width;
-        uint8_t                   dv_max_ppr_options;
-        uint8_t                   dv_last_ppr_options;
-        u_int                     dv_echo_size;
-        ahd_dv_state              dv_state;
-        u_int                     dv_state_retry;
-        uint8_t                  *dv_buffer;
-        uint8_t                  *dv_buffer1;
-
-        /*
-         * Cumulative counter of errors.
-         */
-        u_long                  errors_detected;
-        u_long                  cmds_since_error;
 };
 
 /********************* Definitions Required by the Core ***********************/
@@ -453,32 +364,16 @@ struct ahd_linux_target {
  * manner and are allocated below 4GB, the number of S/G segments is
  * unrestricted.
  */
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-/*
- * We dynamically adjust the number of segments in pre-2.5 kernels to
- * avoid fragmentation issues in the SCSI mid-layer's private memory
- * allocator.  See aic79xx_osm.c ahd_linux_size_nseg() for details.
- */
-extern u_int ahd_linux_nseg;
-#define AHD_NSEG ahd_linux_nseg
-#define AHD_LINUX_MIN_NSEG 64
-#else
 #define AHD_NSEG 128
-#endif
 
 /*
  * Per-SCB OSM storage.
  */
-typedef enum {
-        AHD_SCB_UP_EH_SEM = 0x1
-} ahd_linux_scb_flags;
-
 struct scb_platform_data {
         struct ahd_linux_device *dev;
         dma_addr_t               buf_busaddr;
         uint32_t                 xfer_len;
         uint32_t                 sense_resid;   /* Auto-Sense residual */
-        ahd_linux_scb_flags      flags;
 };
 
 /*
@@ -487,44 +382,23 @@ struct scb_platform_data {
  * alignment restrictions of the various platforms supported by
  * this driver.
  */
-typedef enum {
-        AHD_DV_WAIT_SIMQ_EMPTY   = 0x01,
-        AHD_DV_WAIT_SIMQ_RELEASE = 0x02,
-        AHD_DV_ACTIVE            = 0x04,
-        AHD_DV_SHUTDOWN          = 0x08,
-        AHD_RUN_CMPLT_Q_TIMER    = 0x10
-} ahd_linux_softc_flags;
-
-TAILQ_HEAD(ahd_completeq, ahd_cmd);
-
 struct ahd_platform_data {
         /*
          * Fields accessed from interrupt context.
          */
-        struct ahd_linux_target *targets[AHD_NUM_TARGETS]; 
-        TAILQ_HEAD(, ahd_linux_device) device_runq;
-        struct ahd_completeq     completeq;
+        struct scsi_target *starget[AHD_NUM_TARGETS]; 
 
         spinlock_t               spin_lock;
-        struct tasklet_struct    runq_tasklet;
         u_int                    qfrozen;
-        pid_t                    dv_pid;
-        struct timer_list        completeq_timer;
         struct timer_list        reset_timer;
-        struct timer_list        stats_timer;
         struct semaphore         eh_sem;
-        struct semaphore         dv_sem;
-        struct semaphore         dv_cmd_sem;    /* XXX This needs to be in
-                                                 * the target struct
-                                                 */
-        struct scsi_device      *dv_scsi_dev;
         struct Scsi_Host        *host;          /* pointer to scsi host */
 #define AHD_LINUX_NOIRQ ((uint32_t)~0)
         uint32_t                 irq;           /* IRQ for this adapter */
         uint32_t                 bios_address;
         uint32_t                 mem_busaddr;   /* Mem Base Addr */
-        uint64_t                 hw_dma_mask;
-        ahd_linux_softc_flags    flags;
+#define AHD_SCB_UP_EH_SEM 0x1
+        uint32_t                 flags;
 };
 
 /************************** OS Utility Wrappers *******************************/
@@ -641,7 +515,7 @@ ahd_insb(struct ahd_softc * ahd, long port, uint8_t *array, int count)
 
 /**************************** Initialization **********************************/
 int             ahd_linux_register_host(struct ahd_softc *,
-                                        Scsi_Host_Template *);
+                                        struct scsi_host_template *);
 
 uint64_t        ahd_linux_get_memsize(void);
 
@@ -657,28 +531,6 @@ void	ahd_format_transinfo(struct info_str *info,
                              struct ahd_transinfo *tinfo);
 
 /******************************** Locking *************************************/
-/* Lock protecting internal data structures */
-static __inline void ahd_lockinit(struct ahd_softc *);
-static __inline void ahd_lock(struct ahd_softc *, unsigned long *flags);
-static __inline void ahd_unlock(struct ahd_softc *, unsigned long *flags);
-
-/* Lock acquisition and release of the above lock in midlayer entry points. */
-static __inline void ahd_midlayer_entrypoint_lock(struct ahd_softc *,
-                                                  unsigned long *flags);
-static __inline void ahd_midlayer_entrypoint_unlock(struct ahd_softc *,
-                                                    unsigned long *flags);
-
-/* Lock held during command compeletion to the upper layer */
-static __inline void ahd_done_lockinit(struct ahd_softc *);
-static __inline void ahd_done_lock(struct ahd_softc *, unsigned long *flags);
-static __inline void ahd_done_unlock(struct ahd_softc *, unsigned long *flags);
-
-/* Lock held during ahd_list manipulation and ahd softc frees */
-extern spinlock_t ahd_list_spinlock;
-static __inline void ahd_list_lockinit(void);
-static __inline void ahd_list_lock(unsigned long *flags);
-static __inline void ahd_list_unlock(unsigned long *flags);
-
 static __inline void
 ahd_lockinit(struct ahd_softc *ahd)
 {
@@ -697,75 +549,6 @@ ahd_unlock(struct ahd_softc *ahd, unsigned long *flags)
         spin_unlock_irqrestore(&ahd->platform_data->spin_lock, *flags);
 }
 
-static __inline void
-ahd_midlayer_entrypoint_lock(struct ahd_softc *ahd, unsigned long *flags)
-{
-        /*
-         * In 2.5.X and some 2.4.X versions, the midlayer takes our
-         * lock just before calling us, so we avoid locking again.
-         * For other kernel versions, the io_request_lock is taken
-         * just before our entry point is called.  In this case, we
-         * trade the io_request_lock for our per-softc lock.
-         */
-#if AHD_SCSI_HAS_HOST_LOCK == 0
-        spin_unlock(&io_request_lock);
-        spin_lock(&ahd->platform_data->spin_lock);
-#endif
-}
-
-static __inline void
-ahd_midlayer_entrypoint_unlock(struct ahd_softc *ahd, unsigned long *flags)
-{
-#if AHD_SCSI_HAS_HOST_LOCK == 0
-        spin_unlock(&ahd->platform_data->spin_lock);
-        spin_lock(&io_request_lock);
-#endif
-}
-
-static __inline void
-ahd_done_lockinit(struct ahd_softc *ahd)
-{
-        /*
-         * In 2.5.X, our own lock is held during completions.
-         * In previous versions, the io_request_lock is used.
-         * In either case, we can't initialize this lock again.
-         */
-}
-
-static __inline void
-ahd_done_lock(struct ahd_softc *ahd, unsigned long *flags)
-{
-#if AHD_SCSI_HAS_HOST_LOCK == 0
-        spin_lock(&io_request_lock);
-#endif
-}
-
-static __inline void
-ahd_done_unlock(struct ahd_softc *ahd, unsigned long *flags)
-{
-#if AHD_SCSI_HAS_HOST_LOCK == 0
-        spin_unlock(&io_request_lock);
-#endif
-}
-
-static __inline void
-ahd_list_lockinit(void)
-{
-        spin_lock_init(&ahd_list_spinlock);
-}
-
-static __inline void
-ahd_list_lock(unsigned long *flags)
-{
-        spin_lock_irqsave(&ahd_list_spinlock, *flags);
-}
-
-static __inline void
-ahd_list_unlock(unsigned long *flags)
-{
-        spin_unlock_irqrestore(&ahd_list_spinlock, *flags);
-}
-
 /******************************* PCI Definitions ******************************/
 /*
  * PCIM_xxx: mask to locate subfield in register
@@ -925,27 +708,17 @@ ahd_flush_device_writes(struct ahd_softc *ahd)
 }
 
 /**************************** Proc FS Support *********************************/
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-int     ahd_linux_proc_info(char *, char **, off_t, int, int, int);
-#else
 int     ahd_linux_proc_info(struct Scsi_Host *, char *, char **,
                             off_t, int, int);
-#endif
-
-/*************************** Domain Validation ********************************/
-#define AHD_DV_CMD(cmd) ((cmd)->scsi_done == ahd_linux_dv_complete)
-#define AHD_DV_SIMQ_FROZEN(ahd)                                 \
-        ((((ahd)->platform_data->flags & AHD_DV_ACTIVE) != 0)   \
-         && (ahd)->platform_data->qfrozen == 1)
 
 /*********************** Transaction Access Wrappers **************************/
-static __inline void ahd_cmd_set_transaction_status(Scsi_Cmnd *, uint32_t);
+static __inline void ahd_cmd_set_transaction_status(struct scsi_cmnd *, uint32_t);
 static __inline void ahd_set_transaction_status(struct scb *, uint32_t);
-static __inline void ahd_cmd_set_scsi_status(Scsi_Cmnd *, uint32_t);
+static __inline void ahd_cmd_set_scsi_status(struct scsi_cmnd *, uint32_t);
 static __inline void ahd_set_scsi_status(struct scb *, uint32_t);
-static __inline uint32_t ahd_cmd_get_transaction_status(Scsi_Cmnd *cmd);
+static __inline uint32_t ahd_cmd_get_transaction_status(struct scsi_cmnd *cmd);
 static __inline uint32_t ahd_get_transaction_status(struct scb *);
-static __inline uint32_t ahd_cmd_get_scsi_status(Scsi_Cmnd *cmd);
+static __inline uint32_t ahd_cmd_get_scsi_status(struct scsi_cmnd *cmd);
 static __inline uint32_t ahd_get_scsi_status(struct scb *);
 static __inline void ahd_set_transaction_tag(struct scb *, int, u_int);
 static __inline u_long ahd_get_transfer_length(struct scb *);
@@ -964,7 +737,7 @@ static __inline void ahd_platform_scb_free(struct ahd_softc *ahd,
 static __inline void ahd_freeze_scb(struct scb *scb);
 
 static __inline
-void ahd_cmd_set_transaction_status(Scsi_Cmnd *cmd, uint32_t status)
+void ahd_cmd_set_transaction_status(struct scsi_cmnd *cmd, uint32_t status)
 {
         cmd->result &= ~(CAM_STATUS_MASK << 16);
         cmd->result |= status << 16;
@@ -977,7 +750,7 @@ void ahd_set_transaction_status(struct scb *scb, uint32_t status)
 }
 
 static __inline
-void ahd_cmd_set_scsi_status(Scsi_Cmnd *cmd, uint32_t status)
+void ahd_cmd_set_scsi_status(struct scsi_cmnd *cmd, uint32_t status)
 {
         cmd->result &= ~0xFFFF;
         cmd->result |= status;
@@ -990,7 +763,7 @@ void ahd_set_scsi_status(struct scb *scb, uint32_t status)
 }
 
 static __inline
-uint32_t ahd_cmd_get_transaction_status(Scsi_Cmnd *cmd)
+uint32_t ahd_cmd_get_transaction_status(struct scsi_cmnd *cmd)
 {
         return ((cmd->result >> 16) & CAM_STATUS_MASK);
 }
@@ -1002,7 +775,7 @@ uint32_t ahd_get_transaction_status(struct scb *scb)
 }
 
 static __inline
-uint32_t ahd_cmd_get_scsi_status(Scsi_Cmnd *cmd)
+uint32_t ahd_cmd_get_scsi_status(struct scsi_cmnd *cmd)
 {
         return (cmd->result & 0xFFFF);
 }
@@ -1117,7 +890,6 @@ void	ahd_done(struct ahd_softc*, struct scb*);
 void    ahd_send_async(struct ahd_softc *, char channel,
                        u_int target, u_int lun, ac_code, void *);
 void    ahd_print_path(struct ahd_softc *, struct scb *);
-void    ahd_platform_dump_card_state(struct ahd_softc *ahd);
 
 #ifdef CONFIG_PCI
 #define AHD_PCI_CONFIG 1
diff --git a/drivers/scsi/aic7xxx/aic79xx_osm_pci.c b/drivers/scsi/aic7xxx/aic79xx_osm_pci.c
index 91daf0c7fb1..390b53852d4 100644
--- a/drivers/scsi/aic7xxx/aic79xx_osm_pci.c
+++ b/drivers/scsi/aic7xxx/aic79xx_osm_pci.c
@@ -92,27 +92,31 @@ struct pci_driver aic79xx_pci_driver = {
 static void
 ahd_linux_pci_dev_remove(struct pci_dev *pdev)
 {
-        struct ahd_softc *ahd;
-        u_long l;
+        struct ahd_softc *ahd = pci_get_drvdata(pdev);
+        u_long s;
 
-        /*
-         * We should be able to just perform
-         * the free directly, but check our
-         * list for extra sanity.
-         */
-        ahd_list_lock(&l);
-        ahd = ahd_find_softc((struct ahd_softc *)pci_get_drvdata(pdev));
-        if (ahd != NULL) {
-                u_long s;
-
-                TAILQ_REMOVE(&ahd_tailq, ahd, links);
-                ahd_list_unlock(&l);
-                ahd_lock(ahd, &s);
-                ahd_intr_enable(ahd, FALSE);
-                ahd_unlock(ahd, &s);
-                ahd_free(ahd);
-        } else
-                ahd_list_unlock(&l);
+        ahd_lock(ahd, &s);
+        ahd_intr_enable(ahd, FALSE);
+        ahd_unlock(ahd, &s);
+        ahd_free(ahd);
+}
+
+static void
+ahd_linux_pci_inherit_flags(struct ahd_softc *ahd)
+{
+        struct pci_dev *pdev = ahd->dev_softc, *master_pdev;
+        unsigned int master_devfn = PCI_DEVFN(PCI_SLOT(pdev->devfn), 0);
+
+        master_pdev = pci_get_slot(pdev->bus, master_devfn);
+        if (master_pdev) {
+                struct ahd_softc *master = pci_get_drvdata(master_pdev);
+                if (master) {
+                        ahd->flags &= ~AHD_BIOS_ENABLED;
+                        ahd->flags |= master->flags & AHD_BIOS_ENABLED;
+                } else
+                        printk(KERN_ERR "aic79xx: no multichannel peer found!\n");
+                pci_dev_put(master_pdev);
+        }
 }
 
 static int
@@ -125,22 +129,6 @@ ahd_linux_pci_dev_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         char            *name;
         int              error;
 
-        /*
-         * Some BIOSen report the same device multiple times.
-         */
-        TAILQ_FOREACH(ahd, &ahd_tailq, links) {
-                struct pci_dev *probed_pdev;
-
-                probed_pdev = ahd->dev_softc;
-                if (probed_pdev->bus->number == pdev->bus->number
-                 && probed_pdev->devfn == pdev->devfn)
-                        break;
-        }
-        if (ahd != NULL) {
-                /* Skip duplicate. */
-                return (-ENODEV);
-        }
-
         pci = pdev;
         entry = ahd_find_pci_device(pci);
         if (entry == NULL)
@@ -177,15 +165,12 @@ ahd_linux_pci_dev_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                 if (memsize >= 0x8000000000ULL
                  && pci_set_dma_mask(pdev, DMA_64BIT_MASK) == 0) {
                         ahd->flags |= AHD_64BIT_ADDRESSING;
-                        ahd->platform_data->hw_dma_mask = DMA_64BIT_MASK;
                 } else if (memsize > 0x80000000
                         && pci_set_dma_mask(pdev, mask_39bit) == 0) {
                         ahd->flags |= AHD_39BIT_ADDRESSING;
-                        ahd->platform_data->hw_dma_mask = mask_39bit;
                 }
         } else {
                 pci_set_dma_mask(pdev, DMA_32BIT_MASK);
-                ahd->platform_data->hw_dma_mask = DMA_32BIT_MASK;
         }
         ahd->dev_softc = pci;
         error = ahd_pci_config(ahd, entry);
@@ -193,16 +178,17 @@ ahd_linux_pci_dev_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                 ahd_free(ahd);
                 return (-error);
         }
+
+        /*
+         * Second Function PCI devices need to inherit some
+         * * settings from function 0.
+         */
+        if ((ahd->features & AHD_MULTI_FUNC) && PCI_FUNC(pdev->devfn) != 0)
+                ahd_linux_pci_inherit_flags(ahd);
+
         pci_set_drvdata(pdev, ahd);
-        if (aic79xx_detect_complete) {
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
-                ahd_linux_register_host(ahd, &aic79xx_driver_template);
-#else
-                printf("aic79xx: ignoring PCI device found after "
-                       "initialization\n");
-                return (-ENODEV);
-#endif
-        }
+
+        ahd_linux_register_host(ahd, &aic79xx_driver_template);
         return (0);
 }
 
diff --git a/drivers/scsi/aic7xxx/aic79xx_pci.c b/drivers/scsi/aic7xxx/aic79xx_pci.c
index 703f6e44889..2131db60018 100644
--- a/drivers/scsi/aic7xxx/aic79xx_pci.c
+++ b/drivers/scsi/aic7xxx/aic79xx_pci.c
@@ -283,7 +283,6 @@ int
 ahd_pci_config(struct ahd_softc *ahd, struct ahd_pci_identity *entry)
 {
         struct scb_data *shared_scb_data;
-        u_long           l;
         u_int            command;
         uint32_t         devconfig;
         uint16_t         subvendor; 
@@ -373,16 +372,9 @@ ahd_pci_config(struct ahd_softc *ahd, struct ahd_pci_identity *entry)
          * Allow interrupts now that we are completely setup.
          */
         error = ahd_pci_map_int(ahd);
-        if (error != 0)
-                return (error);
-
-        ahd_list_lock(&l);
-        /*
-         * Link this softc in with all other ahd instances.
-         */
-        ahd_softc_insert(ahd);
-        ahd_list_unlock(&l);
-        return (0);
+        if (!error)
+                ahd->init_level++;
+        return error;
 }
 
 /*
diff --git a/drivers/scsi/aic7xxx/aic79xx_proc.c b/drivers/scsi/aic7xxx/aic79xx_proc.c
index e01cd6175e3..39a27840fce 100644
--- a/drivers/scsi/aic7xxx/aic79xx_proc.c
+++ b/drivers/scsi/aic7xxx/aic79xx_proc.c
@@ -49,10 +49,53 @@ static void	ahd_dump_target_state(struct ahd_softc *ahd,
                                       u_int our_id, char channel,
                                       u_int target_id, u_int target_offset);
 static void     ahd_dump_device_state(struct info_str *info,
-                                      struct ahd_linux_device *dev);
+                                      struct scsi_device *sdev);
 static int      ahd_proc_write_seeprom(struct ahd_softc *ahd,
                                        char *buffer, int length);
 
+/*
+ * Table of syncrates that don't follow the "divisible by 4"
+ * rule. This table will be expanded in future SCSI specs.
+ */
+static struct {
+        u_int period_factor;
+        u_int period;   /* in 100ths of ns */
+} scsi_syncrates[] = {
+        { 0x08, 625 },  /* FAST-160 */
+        { 0x09, 1250 }, /* FAST-80 */
+        { 0x0a, 2500 }, /* FAST-40 40MHz */
+        { 0x0b, 3030 }, /* FAST-40 33MHz */
+        { 0x0c, 5000 }  /* FAST-20 */
+};
+
+/*
+ * Return the frequency in kHz corresponding to the given
+ * sync period factor.
+ */
+static u_int
+ahd_calc_syncsrate(u_int period_factor)
+{
+        int i;
+        int num_syncrates;
+
+        num_syncrates = sizeof(scsi_syncrates) / sizeof(scsi_syncrates[0]);
+        /* See if the period is in the "exception" table */
+        for (i = 0; i < num_syncrates; i++) {
+
+                if (period_factor == scsi_syncrates[i].period_factor) {
+                        /* Period in kHz */
+                        return (100000000 / scsi_syncrates[i].period);
+                }
+        }
+
+        /*
+         * Wasn't in the table, so use the standard
+         * 4 times conversion.
+         */
+        return (10000000 / (period_factor * 4 * 10));
+}
+
+
 static void
 copy_mem_info(struct info_str *info, char *data, int len)
 {
@@ -109,7 +152,7 @@ ahd_format_transinfo(struct info_str *info, struct ahd_transinfo *tinfo)
         speed = 3300;
         freq = 0;
         if (tinfo->offset != 0) {
-                freq = aic_calc_syncsrate(tinfo->period);
+                freq = ahd_calc_syncsrate(tinfo->period);
                 speed = freq;
         }
         speed *= (0x01 << tinfo->width);
@@ -167,6 +210,7 @@ ahd_dump_target_state(struct ahd_softc *ahd, struct info_str *info,
                       u_int target_offset)
 {
         struct  ahd_linux_target *targ;
+        struct  scsi_target *starget;
         struct  ahd_initiator_tinfo *tinfo;
         struct  ahd_tmode_tstate *tstate;
         int     lun;
@@ -176,20 +220,20 @@ ahd_dump_target_state(struct ahd_softc *ahd, struct info_str *info,
         copy_info(info, "Target %d Negotiation Settings\n", target_id);
         copy_info(info, "\tUser: ");
         ahd_format_transinfo(info, &tinfo->user);
-        targ = ahd->platform_data->targets[target_offset];
-        if (targ == NULL)
+        starget = ahd->platform_data->starget[target_offset];
+        if (starget == NULL)
                 return;
+        targ = scsi_transport_target_data(starget);
 
         copy_info(info, "\tGoal: ");
         ahd_format_transinfo(info, &tinfo->goal);
         copy_info(info, "\tCurr: ");
         ahd_format_transinfo(info, &tinfo->curr);
-        copy_info(info, "\tTransmission Errors %ld\n", targ->errors_detected);
 
         for (lun = 0; lun < AHD_NUM_LUNS; lun++) {
-                struct ahd_linux_device *dev;
+                struct scsi_device *dev;
 
-                dev = targ->devices[lun];
+                dev = targ->sdev[lun];
 
                 if (dev == NULL)
                         continue;
@@ -199,10 +243,13 @@ ahd_dump_target_state(struct ahd_softc *ahd, struct info_str *info,
 }
 
 static void
-ahd_dump_device_state(struct info_str *info, struct ahd_linux_device *dev)
+ahd_dump_device_state(struct info_str *info, struct scsi_device *sdev)
 {
+        struct ahd_linux_device *dev = scsi_transport_device_data(sdev);
+
         copy_info(info, "\tChannel %c Target %d Lun %d Settings\n",
-                  dev->target->channel + 'A', dev->target->target, dev->lun);
+                  sdev->sdev_target->channel + 'A',
+                  sdev->sdev_target->id, sdev->lun);
 
         copy_info(info, "\t\tCommands Queued %ld\n", dev->commands_issued);
         copy_info(info, "\t\tCommands Active %d\n", dev->active);
@@ -278,36 +325,16 @@ done:
  * Return information to handle /proc support for the driver.
  */
 int
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-ahd_linux_proc_info(char *buffer, char **start, off_t offset,
-                    int length, int hostno, int inout)
-#else
 ahd_linux_proc_info(struct Scsi_Host *shost, char *buffer, char **start,
                     off_t offset, int length, int inout)
-#endif
 {
-        struct  ahd_softc *ahd;
+        struct  ahd_softc *ahd = *(struct ahd_softc **)shost->hostdata;
         struct  info_str info;
         char    ahd_info[256];
-        u_long  l;
         u_int   max_targ;
         u_int   i;
         int     retval;
 
-        retval = -EINVAL;
-        ahd_list_lock(&l);
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-        TAILQ_FOREACH(ahd, &ahd_tailq, links) {
-                if (ahd->platform_data->host->host_no == hostno)
-                        break;
-        }
-#else
-        ahd = ahd_find_softc(*(struct ahd_softc **)shost->hostdata);
-#endif
-
-        if (ahd == NULL)
-                goto done;
-
          /* Has data been written to the file? */ 
         if (inout == TRUE) {
                 retval = ahd_proc_write_seeprom(ahd, buffer, length);
@@ -357,6 +384,5 @@ ahd_linux_proc_info(struct Scsi_Host *shost, char *buffer, char **start,
         }
         retval = info.pos > info.offset ? info.pos - info.offset : 0;
 done:
-        ahd_list_unlock(&l);
         return (retval);
 }
diff --git a/drivers/scsi/aic7xxx/aic7xxx.h b/drivers/scsi/aic7xxx/aic7xxx.h
index 088cbc23743..91d294c6334 100644
--- a/drivers/scsi/aic7xxx/aic7xxx.h
+++ b/drivers/scsi/aic7xxx/aic7xxx.h
@@ -37,7 +37,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGES.
  *
- * $Id: //depot/aic7xxx/aic7xxx/aic7xxx.h#79 $
+ * $Id: //depot/aic7xxx/aic7xxx/aic7xxx.h#85 $
  *
  * $FreeBSD$
  */
@@ -243,7 +243,7 @@ typedef enum {
          */
         AHC_AIC7850_FE  = AHC_SPIOCAP|AHC_AUTOPAUSE|AHC_TARGETMODE|AHC_ULTRA,
         AHC_AIC7860_FE  = AHC_AIC7850_FE,
-        AHC_AIC7870_FE  = AHC_TARGETMODE,
+        AHC_AIC7870_FE  = AHC_TARGETMODE|AHC_AUTOPAUSE,
         AHC_AIC7880_FE  = AHC_AIC7870_FE|AHC_ULTRA,
         /*
          * Although we have space for both the initiator and
diff --git a/drivers/scsi/aic7xxx/aic7xxx.reg b/drivers/scsi/aic7xxx/aic7xxx.reg
index 810ec700d9f..e196d83b93c 100644
--- a/drivers/scsi/aic7xxx/aic7xxx.reg
+++ b/drivers/scsi/aic7xxx/aic7xxx.reg
@@ -39,7 +39,7 @@
  *
  * $FreeBSD$
  */
-VERSION = "$Id: //depot/aic7xxx/aic7xxx/aic7xxx.reg#39 $"
+VERSION = "$Id: //depot/aic7xxx/aic7xxx/aic7xxx.reg#40 $"
 
 /*
  * This file is processed by the aic7xxx_asm utility for use in assembling
@@ -1306,7 +1306,6 @@ scratch_ram {
          */
         MWI_RESIDUAL {
                 size            1
-                alias   TARG_IMMEDIATE_SCB
         }
         /*
          * SCBID of the next SCB to be started by the controller.
@@ -1461,6 +1460,7 @@ scratch_ram {
          */
         LAST_MSG {
                 size            1
+                alias   TARG_IMMEDIATE_SCB
         }
 
         /*
diff --git a/drivers/scsi/aic7xxx/aic7xxx.seq b/drivers/scsi/aic7xxx/aic7xxx.seq
index d84b741fbab..15196390e28 100644
--- a/drivers/scsi/aic7xxx/aic7xxx.seq
+++ b/drivers/scsi/aic7xxx/aic7xxx.seq
@@ -40,7 +40,7 @@
  * $FreeBSD$
  */
 
-VERSION = "$Id: //depot/aic7xxx/aic7xxx/aic7xxx.seq#56 $"
+VERSION = "$Id: //depot/aic7xxx/aic7xxx/aic7xxx.seq#58 $"
 PATCH_ARG_LIST = "struct ahc_softc *ahc"
 PREFIX = "ahc_"
 
@@ -679,6 +679,7 @@ await_busfree:
                 clr     SCSIBUSL;       /* Prevent bit leakage durint SELTO */
         }
         and     SXFRCTL0, ~SPIOEN;
+        mvi     SEQ_FLAGS, NOT_IDENTIFIED|NO_CDB_SENT;
         test    SSTAT1,REQINIT|BUSFREE  jz .;
         test    SSTAT1, BUSFREE jnz poll_for_work;
         mvi     MISSED_BUSFREE call set_seqint;
@@ -1097,7 +1098,7 @@ ultra2_dmahalt:
                 test    SCB_RESIDUAL_DATACNT[3], SG_LAST_SEG jz dma_mid_sg;
                 if ((ahc->flags & AHC_TARGETROLE) != 0) {
                         test    SSTAT0, TARGET jz dma_last_sg;
-                        if ((ahc->flags & AHC_TMODE_WIDEODD_BUG) != 0) {
+                        if ((ahc->bugs & AHC_TMODE_WIDEODD_BUG) != 0) {
                                 test    DMAPARAMS, DIRECTION jz dma_mid_sg;
                         }
                 }
diff --git a/drivers/scsi/aic7xxx/aic7xxx_93cx6.c b/drivers/scsi/aic7xxx/aic7xxx_93cx6.c
index 468d612a44f..3cb07e114e8 100644
--- a/drivers/scsi/aic7xxx/aic7xxx_93cx6.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_93cx6.c
@@ -28,9 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: //depot/aic7xxx/aic7xxx/aic7xxx_93cx6.c#17 $
- *
- * $FreeBSD$
+ * $Id: //depot/aic7xxx/aic7xxx/aic7xxx_93cx6.c#19 $
  */
 
 /*
@@ -64,7 +62,6 @@
  *   is preceded by an initial zero (leading 0, followed by 16-bits, MSB
  *   first).  The clock cycling from low to high initiates the next data
  *   bit to be sent from the chip.
- *
  */
 
 #ifdef __linux__
@@ -81,14 +78,22 @@
  * Right now, we only have to read the SEEPROM.  But we make it easier to
  * add other 93Cx6 functions.
  */
-static struct seeprom_cmd {
+struct seeprom_cmd {
         uint8_t len;
-        uint8_t bits[9];
-} seeprom_read = {3, {1, 1, 0}};
+        uint8_t bits[11];
+};
 
+/* Short opcodes for the c46 */
 static struct seeprom_cmd seeprom_ewen = {9, {1, 0, 0, 1, 1, 0, 0, 0, 0}};
 static struct seeprom_cmd seeprom_ewds = {9, {1, 0, 0, 0, 0, 0, 0, 0, 0}};
+
+/* Long opcodes for the C56/C66 */
+static struct seeprom_cmd seeprom_long_ewen = {11, {1, 0, 0, 1, 1, 0, 0, 0, 0}};
+static struct seeprom_cmd seeprom_long_ewds = {11, {1, 0, 0, 0, 0, 0, 0, 0, 0}};
+
+/* Common opcodes */
 static struct seeprom_cmd seeprom_write = {3, {1, 0, 1}};
+static struct seeprom_cmd seeprom_read  = {3, {1, 1, 0}};
 
 /*
  * Wait for the SEERDY to go high; about 800 ns.
@@ -222,12 +227,25 @@ int
 ahc_write_seeprom(struct seeprom_descriptor *sd, uint16_t *buf,
                   u_int start_addr, u_int count)
 {
+        struct seeprom_cmd *ewen, *ewds;
         uint16_t v;
         uint8_t temp;
         int i, k;
 
         /* Place the chip into write-enable mode */
-        send_seeprom_cmd(sd, &seeprom_ewen);
+        if (sd->sd_chip == C46) {
+                ewen = &seeprom_ewen;
+                ewds = &seeprom_ewds;
+        } else if (sd->sd_chip == C56_66) {
+                ewen = &seeprom_long_ewen;
+                ewds = &seeprom_long_ewds;
+        } else {
+                printf("ahc_write_seeprom: unsupported seeprom type %d\n",
+                       sd->sd_chip);
+                return (0);
+        }
+
+        send_seeprom_cmd(sd, ewen);
         reset_seeprom(sd);
 
         /* Write all requested data out to the seeprom. */
@@ -277,7 +295,7 @@ ahc_write_seeprom(struct seeprom_descriptor *sd, uint16_t *buf,
         }
 
         /* Put the chip back into write-protect mode */
-        send_seeprom_cmd(sd, &seeprom_ewds);
+        send_seeprom_cmd(sd, ewds);
         reset_seeprom(sd);
 
         return (1);
diff --git a/drivers/scsi/aic7xxx/aic7xxx_core.c b/drivers/scsi/aic7xxx/aic7xxx_core.c
index 7bc01e41bcc..58ac46103eb 100644
--- a/drivers/scsi/aic7xxx/aic7xxx_core.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_core.c
@@ -37,9 +37,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGES.
  *
- * $Id: //depot/aic7xxx/aic7xxx/aic7xxx.c#134 $
- *
- * $FreeBSD$
+ * $Id: //depot/aic7xxx/aic7xxx/aic7xxx.c#155 $
  */
 
 #ifdef __linux__
@@ -287,10 +285,19 @@ ahc_restart(struct ahc_softc *ahc)
                 ahc_outb(ahc, SEQ_FLAGS2,
                          ahc_inb(ahc, SEQ_FLAGS2) & ~SCB_DMA);
         }
+
+        /*
+         * Clear any pending sequencer interrupt.  It is no
+         * longer relevant since we're resetting the Program
+         * Counter.
+         */
+        ahc_outb(ahc, CLRINT, CLRSEQINT);
+
         ahc_outb(ahc, MWI_RESIDUAL, 0);
         ahc_outb(ahc, SEQCTL, ahc->seqctl);
         ahc_outb(ahc, SEQADDR0, 0);
         ahc_outb(ahc, SEQADDR1, 0);
+
         ahc_unpause(ahc);
 }
 
@@ -1174,19 +1181,20 @@ ahc_handle_scsiint(struct ahc_softc *ahc, u_int intstat)
                                        scb_index);
                         }
 #endif
-                        /*
-                         * Force a renegotiation with this target just in
-                         * case the cable was pulled and will later be
-                         * re-attached.  The target may forget its negotiation
-                         * settings with us should it attempt to reselect
-                         * during the interruption.  The target will not issue
-                         * a unit attention in this case, so we must always
-                         * renegotiate.
-                         */
                         ahc_scb_devinfo(ahc, &devinfo, scb);
-                        ahc_force_renegotiation(ahc, &devinfo);
                         ahc_set_transaction_status(scb, CAM_SEL_TIMEOUT);
                         ahc_freeze_devq(ahc, scb);
+
+                        /*
+                         * Cancel any pending transactions on the device
+                         * now that it seems to be missing.  This will
+                         * also revert us to async/narrow transfers until
+                         * we can renegotiate with the device.
+                         */
+                        ahc_handle_devreset(ahc, &devinfo,
+                                            CAM_SEL_TIMEOUT,
+                                            "Selection Timeout",
+                                            /*verbose_level*/1);
                 }
                 ahc_outb(ahc, CLRINT, CLRSCSIINT);
                 ahc_restart(ahc);
@@ -3763,8 +3771,9 @@ ahc_handle_devreset(struct ahc_softc *ahc, struct ahc_devinfo *devinfo,
                          /*period*/0, /*offset*/0, /*ppr_options*/0,
                          AHC_TRANS_CUR, /*paused*/TRUE);
         
-        ahc_send_async(ahc, devinfo->channel, devinfo->target,
-                       CAM_LUN_WILDCARD, AC_SENT_BDR, NULL);
+        if (status != CAM_SEL_TIMEOUT)
+                ahc_send_async(ahc, devinfo->channel, devinfo->target,
+                               CAM_LUN_WILDCARD, AC_SENT_BDR, NULL);
 
         if (message != NULL
          && (verbose_level <= bootverbose))
@@ -4003,14 +4012,6 @@ ahc_reset(struct ahc_softc *ahc, int reinit)
          * to disturb the integrity of the bus.
          */
         ahc_pause(ahc);
-        if ((ahc_inb(ahc, HCNTRL) & CHIPRST) != 0) {
-                /*
-                 * The chip has not been initialized since
-                 * PCI/EISA/VLB bus reset.  Don't trust
-                 * "left over BIOS data".
-                 */
-                ahc->flags |= AHC_NO_BIOS_INIT;
-        }
         sxfrctl1_b = 0;
         if ((ahc->chip & AHC_CHIPID_MASK) == AHC_AIC7770) {
                 u_int sblkctl;
@@ -5036,14 +5037,23 @@ ahc_pause_and_flushwork(struct ahc_softc *ahc)
         ahc->flags |= AHC_ALL_INTERRUPTS;
         paused = FALSE;
         do {
-                if (paused)
+                if (paused) {
                         ahc_unpause(ahc);
+                        /*
+                         * Give the sequencer some time to service
+                         * any active selections.
+                         */
+                        ahc_delay(500);
+                }
                 ahc_intr(ahc);
                 ahc_pause(ahc);
                 paused = TRUE;
                 ahc_outb(ahc, SCSISEQ, ahc_inb(ahc, SCSISEQ) & ~ENSELO);
-                ahc_clear_critical_section(ahc);
                 intstat = ahc_inb(ahc, INTSTAT);
+                if ((intstat & INT_PEND) == 0) {
+                        ahc_clear_critical_section(ahc);
+                        intstat = ahc_inb(ahc, INTSTAT);
+                }
         } while (--maxloops
               && (intstat != 0xFF || (ahc->features & AHC_REMOVABLE) == 0)
               && ((intstat & INT_PEND) != 0
diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm.c b/drivers/scsi/aic7xxx/aic7xxx_osm.c
index 687f19e9cf0..c932b3b9449 100644
--- a/drivers/scsi/aic7xxx/aic7xxx_osm.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_osm.c
@@ -125,12 +125,6 @@
 
 static struct scsi_transport_template *ahc_linux_transport_template = NULL;
 
-/*
- * Include aiclib.c as part of our
- * "module dependencies are hard" work around.
- */
-#include "aiclib.c"
-
 #include <linux/init.h>         /* __setup */
 #include <linux/mm.h>           /* For fetching system memory size */
 #include <linux/blkdev.h>               /* For block_size() */
@@ -391,7 +385,6 @@ static int ahc_linux_run_command(struct ahc_softc*,
                                  struct ahc_linux_device *,
                                  struct scsi_cmnd *);
 static void ahc_linux_setup_tag_info_global(char *p);
-static aic_option_callback_t ahc_linux_setup_tag_info;
 static int  aic7xxx_setup(char *s);
 
 static int ahc_linux_unit;
@@ -635,6 +628,8 @@ ahc_linux_slave_alloc(struct scsi_device *sdev)
         
         targ->sdev[sdev->lun] = sdev;
 
+        spi_period(starget) = 0;
+
         return 0;
 }
 
@@ -918,6 +913,86 @@ ahc_linux_setup_tag_info(u_long arg, int instance, int targ, int32_t value)
         }
 }
 
+static char *
+ahc_parse_brace_option(char *opt_name, char *opt_arg, char *end, int depth,
+                       void (*callback)(u_long, int, int, int32_t),
+                       u_long callback_arg)
+{
+        char    *tok_end;
+        char    *tok_end2;
+        int      i;
+        int      instance;
+        int      targ;
+        int      done;
+        char     tok_list[] = {'.', ',', '{', '}', '\0'};
+
+        /* All options use a ':' name/arg separator */
+        if (*opt_arg != ':')
+                return (opt_arg);
+        opt_arg++;
+        instance = -1;
+        targ = -1;
+        done = FALSE;
+        /*
+         * Restore separator that may be in
+         * the middle of our option argument.
+         */
+        tok_end = strchr(opt_arg, '\0');
+        if (tok_end < end)
+                *tok_end = ',';
+        while (!done) {
+                switch (*opt_arg) {
+                case '{':
+                        if (instance == -1) {
+                                instance = 0;
+                        } else {
+                                if (depth > 1) {
+                                        if (targ == -1)
+                                                targ = 0;
+                                } else {
+                                        printf("Malformed Option %s\n",
+                                               opt_name);
+                                        done = TRUE;
+                                }
+                        }
+                        opt_arg++;
+                        break;
+                case '}':
+                        if (targ != -1)
+                                targ = -1;
+                        else if (instance != -1)
+                                instance = -1;
+                        opt_arg++;
+                        break;
+                case ',':
+                case '.':
+                        if (instance == -1)
+                                done = TRUE;
+                        else if (targ >= 0)
+                                targ++;
+                        else if (instance >= 0)
+                                instance++;
+                        opt_arg++;
+                        break;
+                case '\0':
+                        done = TRUE;
+                        break;
+                default:
+                        tok_end = end;
+                        for (i = 0; tok_list[i]; i++) {
+                                tok_end2 = strchr(opt_arg, tok_list[i]);
+                                if ((tok_end2) && (tok_end2 < tok_end))
+                                        tok_end = tok_end2;
+                        }
+                        callback(callback_arg, instance, targ,
+                                 simple_strtol(opt_arg, NULL, 0));
+                        opt_arg = tok_end;
+                        break;
+                }
+        }
+        return (opt_arg);
+}
+
 /*
  * Handle Linux boot parameters. This routine allows for assigning a value
  * to a parameter with a ':' between the parameter and the value.
@@ -972,7 +1047,7 @@ aic7xxx_setup(char *s)
                 if (strncmp(p, "global_tag_depth", n) == 0) {
                         ahc_linux_setup_tag_info_global(p + n);
                 } else if (strncmp(p, "tag_info", n) == 0) {
-                        s = aic_parse_brace_option("tag_info", p + n, end,
+                        s = ahc_parse_brace_option("tag_info", p + n, end,
                             2, ahc_linux_setup_tag_info, 0);
                 } else if (p[n] == ':') {
                         *(options[i].flag) = simple_strtoul(p + n + 1, NULL, 0);
@@ -1612,9 +1687,9 @@ ahc_send_async(struct ahc_softc *ahc, char channel,
                 if (channel == 'B')
                         target_offset += 8;
                 starget = ahc->platform_data->starget[target_offset];
-                targ = scsi_transport_target_data(starget);
-                if (targ == NULL)
+                if (starget == NULL)
                         break;
+                targ = scsi_transport_target_data(starget);
 
                 target_ppr_options =
                         (spi_dt(starget) ? MSG_EXT_PPR_DT_REQ : 0)
@@ -2329,8 +2404,6 @@ ahc_platform_dump_card_state(struct ahc_softc *ahc)
 {
 }
 
-static void ahc_linux_exit(void);
-
 static void ahc_linux_set_width(struct scsi_target *starget, int width)
 {
         struct Scsi_Host *shost = dev_to_shost(starget->dev.parent);
diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm.h b/drivers/scsi/aic7xxx/aic7xxx_osm.h
index 0e47ac21754..c5299626924 100644
--- a/drivers/scsi/aic7xxx/aic7xxx_osm.h
+++ b/drivers/scsi/aic7xxx/aic7xxx_osm.h
@@ -265,7 +265,7 @@ ahc_scb_timer_reset(struct scb *scb, u_int usec)
 /***************************** SMP support ************************************/
 #include <linux/spinlock.h>
 
-#define AIC7XXX_DRIVER_VERSION "6.2.36"
+#define AIC7XXX_DRIVER_VERSION "7.0"
 
 /*************************** Device Data Structures ***************************/
 /*
diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c b/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c
index 9d318ce2c99..0d44a6907dd 100644
--- a/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c
@@ -149,6 +149,27 @@ ahc_linux_pci_dev_remove(struct pci_dev *pdev)
         ahc_free(ahc);
 }
 
+static void
+ahc_linux_pci_inherit_flags(struct ahc_softc *ahc)
+{
+        struct pci_dev *pdev = ahc->dev_softc, *master_pdev;
+        unsigned int master_devfn = PCI_DEVFN(PCI_SLOT(pdev->devfn), 0);
+
+        master_pdev = pci_get_slot(pdev->bus, master_devfn);
+        if (master_pdev) {
+                struct ahc_softc *master = pci_get_drvdata(master_pdev);
+                if (master) {
+                        ahc->flags &= ~AHC_BIOS_ENABLED; 
+                        ahc->flags |= master->flags & AHC_BIOS_ENABLED;
+
+                        ahc->flags &= ~AHC_PRIMARY_CHANNEL; 
+                        ahc->flags |= master->flags & AHC_PRIMARY_CHANNEL;
+                } else
+                        printk(KERN_ERR "aic7xxx: no multichannel peer found!\n");
+                pci_dev_put(master_pdev);
+        } 
+}
+
 static int
 ahc_linux_pci_dev_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 {
@@ -203,6 +224,14 @@ ahc_linux_pci_dev_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                 ahc_free(ahc);
                 return (-error);
         }
+
+        /*
+         * Second Function PCI devices need to inherit some
+         * settings from function 0.
+         */
+        if ((ahc->features & AHC_MULTI_FUNC) && PCI_FUNC(pdev->devfn) != 0)
+                ahc_linux_pci_inherit_flags(ahc);
+
         pci_set_drvdata(pdev, ahc);
         ahc_linux_register_host(ahc, &aic7xxx_driver_template);
         return (0);
diff --git a/drivers/scsi/aic7xxx/aic7xxx_proc.c b/drivers/scsi/aic7xxx/aic7xxx_proc.c
index 3802c91f0b0..04a3506cf34 100644
--- a/drivers/scsi/aic7xxx/aic7xxx_proc.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_proc.c
@@ -54,6 +54,49 @@ static void	ahc_dump_device_state(struct info_str *info,
 static int      ahc_proc_write_seeprom(struct ahc_softc *ahc,
                                        char *buffer, int length);
 
+/*
+ * Table of syncrates that don't follow the "divisible by 4"
+ * rule. This table will be expanded in future SCSI specs.
+ */
+static struct {
+        u_int period_factor;
+        u_int period;   /* in 100ths of ns */
+} scsi_syncrates[] = {
+        { 0x08, 625 },  /* FAST-160 */
+        { 0x09, 1250 }, /* FAST-80 */
+        { 0x0a, 2500 }, /* FAST-40 40MHz */
+        { 0x0b, 3030 }, /* FAST-40 33MHz */
+        { 0x0c, 5000 }  /* FAST-20 */
+};
+
+/*
+ * Return the frequency in kHz corresponding to the given
+ * sync period factor.
+ */
+static u_int
+ahc_calc_syncsrate(u_int period_factor)
+{
+        int i;
+        int num_syncrates;
+
+        num_syncrates = sizeof(scsi_syncrates) / sizeof(scsi_syncrates[0]);
+        /* See if the period is in the "exception" table */
+        for (i = 0; i < num_syncrates; i++) {
+
+                if (period_factor == scsi_syncrates[i].period_factor) {
+                        /* Period in kHz */
+                        return (100000000 / scsi_syncrates[i].period);
+                }
+        }
+
+        /*
+         * Wasn't in the table, so use the standard
+         * 4 times conversion.
+         */
+        return (10000000 / (period_factor * 4 * 10));
+}
+
+
 static void
 copy_mem_info(struct info_str *info, char *data, int len)
 {
@@ -106,7 +149,7 @@ ahc_format_transinfo(struct info_str *info, struct ahc_transinfo *tinfo)
         speed = 3300;
         freq = 0;
         if (tinfo->offset != 0) {
-                freq = aic_calc_syncsrate(tinfo->period);
+                freq = ahc_calc_syncsrate(tinfo->period);
                 speed = freq;
         }
         speed *= (0x01 << tinfo->width);
diff --git a/drivers/scsi/aic7xxx/aic7xxx_reg.h_shipped b/drivers/scsi/aic7xxx/aic7xxx_reg.h_shipped
index 7c1390ed117..2ce1febca20 100644
--- a/drivers/scsi/aic7xxx/aic7xxx_reg.h_shipped
+++ b/drivers/scsi/aic7xxx/aic7xxx_reg.h_shipped
@@ -2,8 +2,8 @@
  * DO NOT EDIT - This file is automatically generated
  *               from the following source files:
  *
- * $Id: //depot/aic7xxx/aic7xxx/aic7xxx.seq#56 $
- * $Id: //depot/aic7xxx/aic7xxx/aic7xxx.reg#39 $
+ * $Id: //depot/aic7xxx/aic7xxx/aic7xxx.seq#58 $
+ * $Id: //depot/aic7xxx/aic7xxx/aic7xxx.reg#40 $
  */
 typedef int (ahc_reg_print_t)(u_int, u_int *, u_int);
 typedef struct ahc_reg_parse_entry {
@@ -1298,7 +1298,6 @@ ahc_reg_print_t ahc_sg_cache_pre_print;
 #define CMDSIZE_TABLE_TAIL              0x34
 
 #define MWI_RESIDUAL                    0x38
-#define TARG_IMMEDIATE_SCB              0x38
 
 #define NEXT_QUEUED_SCB                 0x39
 
@@ -1380,6 +1379,7 @@ ahc_reg_print_t ahc_sg_cache_pre_print;
 #define RETURN_2                        0x52
 
 #define LAST_MSG                        0x53
+#define TARG_IMMEDIATE_SCB              0x53
 
 #define SCSISEQ_TEMPLATE                0x54
 #define         ENSELO                  0x40
diff --git a/drivers/scsi/aic7xxx/aic7xxx_reg_print.c_shipped b/drivers/scsi/aic7xxx/aic7xxx_reg_print.c_shipped
index 9c713775d44..88bfd767c51 100644
--- a/drivers/scsi/aic7xxx/aic7xxx_reg_print.c_shipped
+++ b/drivers/scsi/aic7xxx/aic7xxx_reg_print.c_shipped
@@ -2,8 +2,8 @@
  * DO NOT EDIT - This file is automatically generated
  *               from the following source files:
  *
- * $Id: //depot/aic7xxx/aic7xxx/aic7xxx.seq#56 $
- * $Id: //depot/aic7xxx/aic7xxx/aic7xxx.reg#39 $
+ * $Id: //depot/aic7xxx/aic7xxx/aic7xxx.seq#58 $
+ * $Id: //depot/aic7xxx/aic7xxx/aic7xxx.reg#40 $
  */
 
 #include "aic7xxx_osm.h"
diff --git a/drivers/scsi/aic7xxx/aic7xxx_seq.h_shipped b/drivers/scsi/aic7xxx/aic7xxx_seq.h_shipped
index cf411368a87..4cee08521e7 100644
--- a/drivers/scsi/aic7xxx/aic7xxx_seq.h_shipped
+++ b/drivers/scsi/aic7xxx/aic7xxx_seq.h_shipped
@@ -2,13 +2,13 @@
  * DO NOT EDIT - This file is automatically generated
  *               from the following source files:
  *
- * $Id: //depot/aic7xxx/aic7xxx/aic7xxx.seq#56 $
- * $Id: //depot/aic7xxx/aic7xxx/aic7xxx.reg#39 $
+ * $Id: //depot/aic7xxx/aic7xxx/aic7xxx.seq#58 $
+ * $Id: //depot/aic7xxx/aic7xxx/aic7xxx.reg#40 $
  */
 static uint8_t seqprog[] = {
         0xb2, 0x00, 0x00, 0x08,
         0xf7, 0x11, 0x22, 0x08,
-        0x00, 0x65, 0xec, 0x59,
+        0x00, 0x65, 0xee, 0x59,
         0xf7, 0x01, 0x02, 0x08,
         0xff, 0x6a, 0x24, 0x08,
         0x40, 0x00, 0x40, 0x68,
@@ -21,15 +21,15 @@ static uint8_t seqprog[] = {
         0x01, 0x4d, 0xc8, 0x30,
         0x00, 0x4c, 0x12, 0x70,
         0x01, 0x39, 0xa2, 0x30,
-        0x00, 0x6a, 0xc0, 0x5e,
+        0x00, 0x6a, 0xc2, 0x5e,
         0x01, 0x51, 0x20, 0x31,
         0x01, 0x57, 0xae, 0x00,
         0x0d, 0x6a, 0x76, 0x00,
-        0x00, 0x51, 0x12, 0x5e,
+        0x00, 0x51, 0x14, 0x5e,
         0x01, 0x51, 0xc8, 0x30,
         0x00, 0x39, 0xc8, 0x60,
         0x00, 0xbb, 0x30, 0x70,
-        0xc1, 0x6a, 0xd8, 0x5e,
+        0xc1, 0x6a, 0xda, 0x5e,
         0x01, 0xbf, 0x72, 0x30,
         0x01, 0x40, 0x7e, 0x31,
         0x01, 0x90, 0x80, 0x30,
@@ -49,10 +49,10 @@ static uint8_t seqprog[] = {
         0x08, 0x6a, 0x78, 0x00,
         0x01, 0x50, 0xc8, 0x30,
         0xe0, 0x6a, 0xcc, 0x00,
-        0x48, 0x6a, 0xfc, 0x5d,
+        0x48, 0x6a, 0xfe, 0x5d,
         0x01, 0x6a, 0xdc, 0x01,
         0x88, 0x6a, 0xcc, 0x00,
-        0x48, 0x6a, 0xfc, 0x5d,
+        0x48, 0x6a, 0xfe, 0x5d,
         0x01, 0x6a, 0x26, 0x01,
         0xf0, 0x19, 0x7a, 0x08,
         0x0f, 0x18, 0xc8, 0x08,
@@ -93,7 +93,7 @@ static uint8_t seqprog[] = {
         0x00, 0x65, 0x20, 0x41,
         0x02, 0x57, 0xae, 0x00,
         0x00, 0x65, 0x9e, 0x40,
-        0x61, 0x6a, 0xd8, 0x5e,
+        0x61, 0x6a, 0xda, 0x5e,
         0x08, 0x51, 0x20, 0x71,
         0x02, 0x0b, 0xb2, 0x78,
         0x00, 0x65, 0xae, 0x40,
@@ -106,7 +106,7 @@ static uint8_t seqprog[] = {
         0x80, 0x3d, 0x7a, 0x00,
         0x20, 0x6a, 0x16, 0x00,
         0x00, 0x65, 0xcc, 0x41,
-        0x00, 0x65, 0xb2, 0x5e,
+        0x00, 0x65, 0xb4, 0x5e,
         0x00, 0x65, 0x12, 0x40,
         0x20, 0x11, 0xd2, 0x68,
         0x20, 0x6a, 0x18, 0x00,
@@ -140,27 +140,27 @@ static uint8_t seqprog[] = {
         0x80, 0x0b, 0xc4, 0x79,
         0x12, 0x01, 0x02, 0x00,
         0x01, 0xab, 0xac, 0x30,
-        0xe4, 0x6a, 0x6e, 0x5d,
+        0xe4, 0x6a, 0x70, 0x5d,
         0x40, 0x6a, 0x16, 0x00,
-        0x80, 0x3e, 0x84, 0x5d,
+        0x80, 0x3e, 0x86, 0x5d,
         0x20, 0xb8, 0x18, 0x79,
-        0x20, 0x6a, 0x84, 0x5d,
-        0x00, 0xab, 0x84, 0x5d,
+        0x20, 0x6a, 0x86, 0x5d,
+        0x00, 0xab, 0x86, 0x5d,
         0x01, 0xa9, 0x78, 0x30,
         0x10, 0xb8, 0x20, 0x79,
-        0xe4, 0x6a, 0x6e, 0x5d,
+        0xe4, 0x6a, 0x70, 0x5d,
         0x00, 0x65, 0xae, 0x40,
         0x10, 0x03, 0x3c, 0x69,
         0x08, 0x3c, 0x5a, 0x69,
         0x04, 0x3c, 0x92, 0x69,
         0x02, 0x3c, 0x98, 0x69,
         0x01, 0x3c, 0x44, 0x79,
-        0xff, 0x6a, 0x70, 0x00,
+        0xff, 0x6a, 0xa6, 0x00,
         0x00, 0x65, 0xa4, 0x59,
-        0x00, 0x6a, 0xc0, 0x5e,
-        0xff, 0x38, 0x30, 0x71,
+        0x00, 0x6a, 0xc2, 0x5e,
+        0xff, 0x53, 0x30, 0x71,
         0x0d, 0x6a, 0x76, 0x00,
-        0x00, 0x38, 0x12, 0x5e,
+        0x00, 0x53, 0x14, 0x5e,
         0x00, 0x65, 0xea, 0x58,
         0x12, 0x01, 0x02, 0x00,
         0x00, 0x65, 0x18, 0x41,
@@ -168,10 +168,10 @@ static uint8_t seqprog[] = {
         0x00, 0x65, 0xf2, 0x58,
         0xfd, 0x57, 0xae, 0x08,
         0x00, 0x65, 0xae, 0x40,
-        0xe4, 0x6a, 0x6e, 0x5d,
+        0xe4, 0x6a, 0x70, 0x5d,
         0x20, 0x3c, 0x4a, 0x79,
-        0x02, 0x6a, 0x84, 0x5d,
-        0x04, 0x6a, 0x84, 0x5d,
+        0x02, 0x6a, 0x86, 0x5d,
+        0x04, 0x6a, 0x86, 0x5d,
         0x01, 0x03, 0x4c, 0x69,
         0xf7, 0x11, 0x22, 0x08,
         0xff, 0x6a, 0x24, 0x08,
@@ -182,13 +182,13 @@ static uint8_t seqprog[] = {
         0x80, 0x86, 0xc8, 0x08,
         0x01, 0x4f, 0xc8, 0x30,
         0x00, 0x50, 0x6c, 0x61,
-        0xc4, 0x6a, 0x6e, 0x5d,
+        0xc4, 0x6a, 0x70, 0x5d,
         0x40, 0x3c, 0x68, 0x79,
-        0x28, 0x6a, 0x84, 0x5d,
+        0x28, 0x6a, 0x86, 0x5d,
         0x00, 0x65, 0x4c, 0x41,
-        0x08, 0x6a, 0x84, 0x5d,
+        0x08, 0x6a, 0x86, 0x5d,
         0x00, 0x65, 0x4c, 0x41,
-        0x84, 0x6a, 0x6e, 0x5d,
+        0x84, 0x6a, 0x70, 0x5d,
         0x00, 0x65, 0xf2, 0x58,
         0x01, 0x66, 0xc8, 0x30,
         0x01, 0x64, 0xd8, 0x31,
@@ -208,16 +208,16 @@ static uint8_t seqprog[] = {
         0xf7, 0x3c, 0x78, 0x08,
         0x00, 0x65, 0x20, 0x41,
         0x40, 0xaa, 0x7e, 0x10,
-        0x04, 0xaa, 0x6e, 0x5d,
-        0x00, 0x65, 0x56, 0x42,
-        0xc4, 0x6a, 0x6e, 0x5d,
+        0x04, 0xaa, 0x70, 0x5d,
+        0x00, 0x65, 0x58, 0x42,
+        0xc4, 0x6a, 0x70, 0x5d,
         0xc0, 0x6a, 0x7e, 0x00,
-        0x00, 0xa8, 0x84, 0x5d,
+        0x00, 0xa8, 0x86, 0x5d,
         0xe4, 0x6a, 0x06, 0x00,
-        0x00, 0x6a, 0x84, 0x5d,
+        0x00, 0x6a, 0x86, 0x5d,
         0x00, 0x65, 0x4c, 0x41,
         0x10, 0x3c, 0xa8, 0x69,
-        0x00, 0xbb, 0x8a, 0x44,
+        0x00, 0xbb, 0x8c, 0x44,
         0x18, 0x6a, 0xda, 0x01,
         0x01, 0x69, 0xd8, 0x31,
         0x1c, 0x6a, 0xd0, 0x01,
@@ -227,31 +227,32 @@ static uint8_t seqprog[] = {
         0x01, 0x93, 0x26, 0x01,
         0x03, 0x6a, 0x2a, 0x01,
         0x01, 0x69, 0x32, 0x31,
-        0x1c, 0x6a, 0xe0, 0x5d,
+        0x1c, 0x6a, 0xe2, 0x5d,
         0x0a, 0x93, 0x26, 0x01,
-        0x00, 0x65, 0xa8, 0x5e,
+        0x00, 0x65, 0xaa, 0x5e,
         0x01, 0x50, 0xa0, 0x18,
         0x02, 0x6a, 0x22, 0x05,
         0x1a, 0x01, 0x02, 0x00,
         0x80, 0x6a, 0x74, 0x00,
         0x40, 0x6a, 0x78, 0x00,
         0x40, 0x6a, 0x16, 0x00,
-        0x00, 0x65, 0xd8, 0x5d,
+        0x00, 0x65, 0xda, 0x5d,
         0x01, 0x3f, 0xc8, 0x30,
-        0xbf, 0x64, 0x56, 0x7a,
-        0x80, 0x64, 0x9e, 0x73,
-        0xa0, 0x64, 0x00, 0x74,
-        0xc0, 0x64, 0xf4, 0x73,
-        0xe0, 0x64, 0x30, 0x74,
-        0x01, 0x6a, 0xd8, 0x5e,
+        0xbf, 0x64, 0x58, 0x7a,
+        0x80, 0x64, 0xa0, 0x73,
+        0xa0, 0x64, 0x02, 0x74,
+        0xc0, 0x64, 0xf6, 0x73,
+        0xe0, 0x64, 0x32, 0x74,
+        0x01, 0x6a, 0xda, 0x5e,
         0x00, 0x65, 0xcc, 0x41,
         0xf7, 0x11, 0x22, 0x08,
         0x01, 0x06, 0xd4, 0x30,
         0xff, 0x6a, 0x24, 0x08,
         0xf7, 0x01, 0x02, 0x08,
-        0x09, 0x0c, 0xe6, 0x79,
+        0xc0, 0x6a, 0x78, 0x00,
+        0x09, 0x0c, 0xe8, 0x79,
         0x08, 0x0c, 0x04, 0x68,
-        0xb1, 0x6a, 0xd8, 0x5e,
+        0xb1, 0x6a, 0xda, 0x5e,
         0xff, 0x6a, 0x26, 0x09,
         0x12, 0x01, 0x02, 0x00,
         0x02, 0x6a, 0x08, 0x30,
@@ -264,29 +265,29 @@ static uint8_t seqprog[] = {
         0x00, 0xa5, 0x4a, 0x21,
         0x00, 0xa6, 0x4c, 0x21,
         0x00, 0xa7, 0x4e, 0x25,
-        0x08, 0xeb, 0xdc, 0x7e,
-        0x80, 0xeb, 0x06, 0x7a,
+        0x08, 0xeb, 0xde, 0x7e,
+        0x80, 0xeb, 0x08, 0x7a,
         0xff, 0x6a, 0xd6, 0x09,
-        0x08, 0xeb, 0x0a, 0x6a,
+        0x08, 0xeb, 0x0c, 0x6a,
         0xff, 0x6a, 0xd4, 0x0c,
-        0x80, 0xa3, 0xdc, 0x6e,
-        0x88, 0xeb, 0x20, 0x72,
-        0x08, 0xeb, 0xdc, 0x6e,
-        0x04, 0xea, 0x24, 0xe2,
-        0x08, 0xee, 0xdc, 0x6e,
+        0x80, 0xa3, 0xde, 0x6e,
+        0x88, 0xeb, 0x22, 0x72,
+        0x08, 0xeb, 0xde, 0x6e,
+        0x04, 0xea, 0x26, 0xe2,
+        0x08, 0xee, 0xde, 0x6e,
         0x04, 0x6a, 0xd0, 0x81,
         0x05, 0xa4, 0xc0, 0x89,
         0x03, 0xa5, 0xc2, 0x31,
         0x09, 0x6a, 0xd6, 0x05,
-        0x00, 0x65, 0x08, 0x5a,
+        0x00, 0x65, 0x0a, 0x5a,
         0x06, 0xa4, 0xd4, 0x89,
-        0x80, 0x94, 0xdc, 0x7e,
+        0x80, 0x94, 0xde, 0x7e,
         0x07, 0xe9, 0x10, 0x31,
         0x01, 0xe9, 0x46, 0x31,
-        0x00, 0xa3, 0xba, 0x5e,
-        0x00, 0x65, 0xfa, 0x59,
+        0x00, 0xa3, 0xbc, 0x5e,
+        0x00, 0x65, 0xfc, 0x59,
         0x01, 0xa4, 0xca, 0x30,
-        0x80, 0xa3, 0x34, 0x7a,
+        0x80, 0xa3, 0x36, 0x7a,
         0x02, 0x65, 0xca, 0x00,
         0x01, 0x65, 0xf8, 0x31,
         0x80, 0x93, 0x26, 0x01,
@@ -294,162 +295,162 @@ static uint8_t seqprog[] = {
         0x01, 0x8c, 0xc8, 0x30,
         0x00, 0x88, 0xc8, 0x18,
         0x02, 0x64, 0xc8, 0x88,
-        0xff, 0x64, 0xdc, 0x7e,
-        0xff, 0x8d, 0x4a, 0x6a,
-        0xff, 0x8e, 0x4a, 0x6a,
+        0xff, 0x64, 0xde, 0x7e,
+        0xff, 0x8d, 0x4c, 0x6a,
+        0xff, 0x8e, 0x4c, 0x6a,
         0x03, 0x8c, 0xd4, 0x98,
-        0x00, 0x65, 0xdc, 0x56,
+        0x00, 0x65, 0xde, 0x56,
         0x01, 0x64, 0x70, 0x30,
         0xff, 0x64, 0xc8, 0x10,
         0x01, 0x64, 0xc8, 0x18,
         0x00, 0x8c, 0x18, 0x19,
         0xff, 0x8d, 0x1a, 0x21,
         0xff, 0x8e, 0x1c, 0x25,
-        0xc0, 0x3c, 0x5a, 0x7a,
-        0x21, 0x6a, 0xd8, 0x5e,
+        0xc0, 0x3c, 0x5c, 0x7a,
+        0x21, 0x6a, 0xda, 0x5e,
         0xa8, 0x6a, 0x76, 0x00,
         0x79, 0x6a, 0x76, 0x00,
-        0x40, 0x3f, 0x62, 0x6a,
+        0x40, 0x3f, 0x64, 0x6a,
         0x04, 0x3b, 0x76, 0x00,
         0x04, 0x6a, 0xd4, 0x81,
-        0x20, 0x3c, 0x6a, 0x7a,
-        0x51, 0x6a, 0xd8, 0x5e,
-        0x00, 0x65, 0x82, 0x42,
+        0x20, 0x3c, 0x6c, 0x7a,
+        0x51, 0x6a, 0xda, 0x5e,
+        0x00, 0x65, 0x84, 0x42,
         0x20, 0x3c, 0x78, 0x00,
-        0x00, 0xb3, 0xba, 0x5e,
+        0x00, 0xb3, 0xbc, 0x5e,
         0x07, 0xac, 0x10, 0x31,
         0x05, 0xb3, 0x46, 0x31,
         0x88, 0x6a, 0xcc, 0x00,
-        0xac, 0x6a, 0xee, 0x5d,
+        0xac, 0x6a, 0xf0, 0x5d,
         0xa3, 0x6a, 0xcc, 0x00,
-        0xb3, 0x6a, 0xf2, 0x5d,
-        0x00, 0x65, 0x3a, 0x5a,
+        0xb3, 0x6a, 0xf4, 0x5d,
+        0x00, 0x65, 0x3c, 0x5a,
         0xfd, 0xa4, 0x48, 0x09,
         0x03, 0x8c, 0x10, 0x30,
-        0x00, 0x65, 0xe6, 0x5d,
-        0x01, 0xa4, 0x94, 0x7a,
+        0x00, 0x65, 0xe8, 0x5d,
+        0x01, 0xa4, 0x96, 0x7a,
         0x04, 0x3b, 0x76, 0x08,
         0x01, 0x3b, 0x26, 0x31,
         0x80, 0x02, 0x04, 0x00,
-        0x10, 0x0c, 0x8a, 0x7a,
-        0x03, 0x9e, 0x8c, 0x6a,
+        0x10, 0x0c, 0x8c, 0x7a,
+        0x03, 0x9e, 0x8e, 0x6a,
         0x7f, 0x02, 0x04, 0x08,
-        0x91, 0x6a, 0xd8, 0x5e,
+        0x91, 0x6a, 0xda, 0x5e,
         0x00, 0x65, 0xcc, 0x41,
         0x01, 0xa4, 0xca, 0x30,
-        0x80, 0xa3, 0x9a, 0x7a,
+        0x80, 0xa3, 0x9c, 0x7a,
         0x02, 0x65, 0xca, 0x00,
         0x01, 0x65, 0xf8, 0x31,
         0x01, 0x3b, 0x26, 0x31,
-        0x00, 0x65, 0x0e, 0x5a,
-        0x01, 0xfc, 0xa8, 0x6a,
-        0x80, 0x0b, 0x9e, 0x6a,
-        0x10, 0x0c, 0x9e, 0x7a,
-        0x20, 0x93, 0x9e, 0x6a,
+        0x00, 0x65, 0x10, 0x5a,
+        0x01, 0xfc, 0xaa, 0x6a,
+        0x80, 0x0b, 0xa0, 0x6a,
+        0x10, 0x0c, 0xa0, 0x7a,
+        0x20, 0x93, 0xa0, 0x6a,
         0x02, 0x93, 0x26, 0x01,
-        0x02, 0xfc, 0xb2, 0x7a,
-        0x40, 0x0d, 0xc6, 0x6a,
+        0x02, 0xfc, 0xb4, 0x7a,
+        0x40, 0x0d, 0xc8, 0x6a,
         0x01, 0xa4, 0x48, 0x01,
-        0x00, 0x65, 0xc6, 0x42,
-        0x40, 0x0d, 0xb8, 0x6a,
-        0x00, 0x65, 0x0e, 0x5a,
-        0x00, 0x65, 0xaa, 0x42,
-        0x80, 0xfc, 0xc2, 0x7a,
-        0x80, 0xa4, 0xc2, 0x6a,
+        0x00, 0x65, 0xc8, 0x42,
+        0x40, 0x0d, 0xba, 0x6a,
+        0x00, 0x65, 0x10, 0x5a,
+        0x00, 0x65, 0xac, 0x42,
+        0x80, 0xfc, 0xc4, 0x7a,
+        0x80, 0xa4, 0xc4, 0x6a,
         0xff, 0xa5, 0x4a, 0x19,
         0xff, 0xa6, 0x4c, 0x21,
         0xff, 0xa7, 0x4e, 0x21,
         0xf8, 0xfc, 0x48, 0x09,
         0x7f, 0xa3, 0x46, 0x09,
-        0x04, 0x3b, 0xe2, 0x6a,
+        0x04, 0x3b, 0xe4, 0x6a,
         0x02, 0x93, 0x26, 0x01,
-        0x01, 0x94, 0xc8, 0x7a,
-        0x01, 0x94, 0xc8, 0x7a,
-        0x01, 0x94, 0xc8, 0x7a,
-        0x01, 0x94, 0xc8, 0x7a,
-        0x01, 0x94, 0xc8, 0x7a,
-        0x01, 0xa4, 0xe0, 0x7a,
-        0x01, 0xfc, 0xd6, 0x7a,
-        0x01, 0x94, 0xe2, 0x6a,
-        0x01, 0x94, 0xe2, 0x6a,
-        0x01, 0x94, 0xe2, 0x6a,
-        0x00, 0x65, 0x82, 0x42,
-        0x01, 0x94, 0xe0, 0x7a,
-        0x10, 0x94, 0xe2, 0x6a,
+        0x01, 0x94, 0xca, 0x7a,
+        0x01, 0x94, 0xca, 0x7a,
+        0x01, 0x94, 0xca, 0x7a,
+        0x01, 0x94, 0xca, 0x7a,
+        0x01, 0x94, 0xca, 0x7a,
+        0x01, 0xa4, 0xe2, 0x7a,
+        0x01, 0xfc, 0xd8, 0x7a,
+        0x01, 0x94, 0xe4, 0x6a,
+        0x01, 0x94, 0xe4, 0x6a,
+        0x01, 0x94, 0xe4, 0x6a,
+        0x00, 0x65, 0x84, 0x42,
+        0x01, 0x94, 0xe2, 0x7a,
+        0x10, 0x94, 0xe4, 0x6a,
         0xd7, 0x93, 0x26, 0x09,
-        0x28, 0x93, 0xe6, 0x6a,
+        0x28, 0x93, 0xe8, 0x6a,
         0x01, 0x85, 0x0a, 0x01,
-        0x02, 0xfc, 0xee, 0x6a,
+        0x02, 0xfc, 0xf0, 0x6a,
         0x01, 0x14, 0x46, 0x31,
         0xff, 0x6a, 0x10, 0x09,
         0xfe, 0x85, 0x0a, 0x09,
-        0xff, 0x38, 0xfc, 0x6a,
-        0x80, 0xa3, 0xfc, 0x7a,
-        0x80, 0x0b, 0xfa, 0x7a,
-        0x04, 0x3b, 0xfc, 0x7a,
+        0xff, 0x38, 0xfe, 0x6a,
+        0x80, 0xa3, 0xfe, 0x7a,
+        0x80, 0x0b, 0xfc, 0x7a,
+        0x04, 0x3b, 0xfe, 0x7a,
         0xbf, 0x3b, 0x76, 0x08,
         0x01, 0x3b, 0x26, 0x31,
-        0x00, 0x65, 0x0e, 0x5a,
-        0x01, 0x0b, 0x0a, 0x6b,
-        0x10, 0x0c, 0xfe, 0x7a,
-        0x04, 0x93, 0x08, 0x6b,
-        0x01, 0x94, 0x06, 0x7b,
-        0x10, 0x94, 0x08, 0x6b,
+        0x00, 0x65, 0x10, 0x5a,
+        0x01, 0x0b, 0x0c, 0x6b,
+        0x10, 0x0c, 0x00, 0x7b,
+        0x04, 0x93, 0x0a, 0x6b,
+        0x01, 0x94, 0x08, 0x7b,
+        0x10, 0x94, 0x0a, 0x6b,
         0xc7, 0x93, 0x26, 0x09,
         0x01, 0x99, 0xd4, 0x30,
-        0x38, 0x93, 0x0c, 0x6b,
-        0xff, 0x08, 0x5a, 0x6b,
-        0xff, 0x09, 0x5a, 0x6b,
-        0xff, 0x0a, 0x5a, 0x6b,
-        0xff, 0x38, 0x28, 0x7b,
+        0x38, 0x93, 0x0e, 0x6b,
+        0xff, 0x08, 0x5c, 0x6b,
+        0xff, 0x09, 0x5c, 0x6b,
+        0xff, 0x0a, 0x5c, 0x6b,
+        0xff, 0x38, 0x2a, 0x7b,
         0x04, 0x14, 0x10, 0x31,
         0x01, 0x38, 0x18, 0x31,
         0x02, 0x6a, 0x1a, 0x31,
         0x88, 0x6a, 0xcc, 0x00,
-        0x14, 0x6a, 0xf4, 0x5d,
-        0x00, 0x38, 0xe0, 0x5d,
+        0x14, 0x6a, 0xf6, 0x5d,
+        0x00, 0x38, 0xe2, 0x5d,
         0xff, 0x6a, 0x70, 0x08,
-        0x00, 0x65, 0x54, 0x43,
-        0x80, 0xa3, 0x2e, 0x7b,
+        0x00, 0x65, 0x56, 0x43,
+        0x80, 0xa3, 0x30, 0x7b,
         0x01, 0xa4, 0x48, 0x01,
-        0x00, 0x65, 0x5a, 0x43,
-        0x08, 0xeb, 0x34, 0x7b,
-        0x00, 0x65, 0x0e, 0x5a,
-        0x08, 0xeb, 0x30, 0x6b,
+        0x00, 0x65, 0x5c, 0x43,
+        0x08, 0xeb, 0x36, 0x7b,
+        0x00, 0x65, 0x10, 0x5a,
+        0x08, 0xeb, 0x32, 0x6b,
         0x07, 0xe9, 0x10, 0x31,
         0x01, 0xe9, 0xca, 0x30,
         0x01, 0x65, 0x46, 0x31,
-        0x00, 0x6a, 0xba, 0x5e,
+        0x00, 0x6a, 0xbc, 0x5e,
         0x88, 0x6a, 0xcc, 0x00,
-        0xa4, 0x6a, 0xf4, 0x5d,
-        0x08, 0x6a, 0xe0, 0x5d,
+        0xa4, 0x6a, 0xf6, 0x5d,
+        0x08, 0x6a, 0xe2, 0x5d,
         0x0d, 0x93, 0x26, 0x01,
-        0x00, 0x65, 0xa8, 0x5e,
+        0x00, 0x65, 0xaa, 0x5e,
         0x88, 0x6a, 0xcc, 0x00,
-        0x00, 0x65, 0x8a, 0x5e,
+        0x00, 0x65, 0x8c, 0x5e,
         0x01, 0x99, 0x46, 0x31,
-        0x00, 0xa3, 0xba, 0x5e,
+        0x00, 0xa3, 0xbc, 0x5e,
         0x01, 0x88, 0x10, 0x31,
-        0x00, 0x65, 0x3a, 0x5a,
-        0x00, 0x65, 0xfa, 0x59,
+        0x00, 0x65, 0x3c, 0x5a,
+        0x00, 0x65, 0xfc, 0x59,
         0x03, 0x8c, 0x10, 0x30,
-        0x00, 0x65, 0xe6, 0x5d,
-        0x80, 0x0b, 0x82, 0x6a,
-        0x80, 0x0b, 0x62, 0x6b,
-        0x01, 0x0c, 0x5c, 0x7b,
-        0x10, 0x0c, 0x82, 0x7a,
-        0x03, 0x9e, 0x82, 0x6a,
-        0x00, 0x65, 0x04, 0x5a,
-        0x00, 0x6a, 0xba, 0x5e,
-        0x01, 0xa4, 0x82, 0x6b,
-        0xff, 0x38, 0x78, 0x7b,
+        0x00, 0x65, 0xe8, 0x5d,
+        0x80, 0x0b, 0x84, 0x6a,
+        0x80, 0x0b, 0x64, 0x6b,
+        0x01, 0x0c, 0x5e, 0x7b,
+        0x10, 0x0c, 0x84, 0x7a,
+        0x03, 0x9e, 0x84, 0x6a,
+        0x00, 0x65, 0x06, 0x5a,
+        0x00, 0x6a, 0xbc, 0x5e,
+        0x01, 0xa4, 0x84, 0x6b,
+        0xff, 0x38, 0x7a, 0x7b,
         0x01, 0x38, 0xc8, 0x30,
         0x00, 0x08, 0x40, 0x19,
         0xff, 0x6a, 0xc8, 0x08,
         0x00, 0x09, 0x42, 0x21,
         0x00, 0x0a, 0x44, 0x21,
         0xff, 0x6a, 0x70, 0x08,
-        0x00, 0x65, 0x7a, 0x43,
+        0x00, 0x65, 0x7c, 0x43,
         0x03, 0x08, 0x40, 0x31,
         0x03, 0x08, 0x40, 0x31,
         0x01, 0x08, 0x40, 0x31,
@@ -461,16 +462,16 @@ static uint8_t seqprog[] = {
         0x04, 0x3c, 0xcc, 0x79,
         0xfb, 0x3c, 0x78, 0x08,
         0x04, 0x93, 0x20, 0x79,
-        0x01, 0x0c, 0x8e, 0x6b,
+        0x01, 0x0c, 0x90, 0x6b,
         0x80, 0xba, 0x20, 0x79,
         0x80, 0x04, 0x20, 0x79,
-        0xe4, 0x6a, 0x6e, 0x5d,
-        0x23, 0x6a, 0x84, 0x5d,
-        0x01, 0x6a, 0x84, 0x5d,
+        0xe4, 0x6a, 0x70, 0x5d,
+        0x23, 0x6a, 0x86, 0x5d,
+        0x01, 0x6a, 0x86, 0x5d,
         0x00, 0x65, 0x20, 0x41,
         0x00, 0x65, 0xcc, 0x41,
-        0x80, 0x3c, 0xa2, 0x7b,
-        0x21, 0x6a, 0xd8, 0x5e,
+        0x80, 0x3c, 0xa4, 0x7b,
+        0x21, 0x6a, 0xda, 0x5e,
         0x01, 0xbc, 0x18, 0x31,
         0x02, 0x6a, 0x1a, 0x31,
         0x02, 0x6a, 0xf8, 0x01,
@@ -480,16 +481,16 @@ static uint8_t seqprog[] = {
         0xff, 0x6a, 0x12, 0x08,
         0xff, 0x6a, 0x14, 0x08,
         0xf3, 0xbc, 0xd4, 0x18,
-        0xa0, 0x6a, 0xc8, 0x53,
+        0xa0, 0x6a, 0xca, 0x53,
         0x04, 0xa0, 0x10, 0x31,
         0xac, 0x6a, 0x26, 0x01,
         0x04, 0xa0, 0x10, 0x31,
         0x03, 0x08, 0x18, 0x31,
         0x88, 0x6a, 0xcc, 0x00,
-        0xa0, 0x6a, 0xf4, 0x5d,
-        0x00, 0xbc, 0xe0, 0x5d,
+        0xa0, 0x6a, 0xf6, 0x5d,
+        0x00, 0xbc, 0xe2, 0x5d,
         0x3d, 0x6a, 0x26, 0x01,
-        0x00, 0x65, 0xe0, 0x43,
+        0x00, 0x65, 0xe2, 0x43,
         0xff, 0x6a, 0x10, 0x09,
         0xa4, 0x6a, 0x26, 0x01,
         0x0c, 0xa0, 0x32, 0x31,
@@ -499,128 +500,128 @@ static uint8_t seqprog[] = {
         0x36, 0x6a, 0x26, 0x01,
         0x02, 0x93, 0x26, 0x01,
         0x35, 0x6a, 0x26, 0x01,
-        0x00, 0x65, 0x9c, 0x5e,
-        0x00, 0x65, 0x9c, 0x5e,
+        0x00, 0x65, 0x9e, 0x5e,
+        0x00, 0x65, 0x9e, 0x5e,
         0x02, 0x93, 0x26, 0x01,
         0xbf, 0x3c, 0x78, 0x08,
-        0x04, 0x0b, 0xe6, 0x6b,
-        0x10, 0x0c, 0xe2, 0x7b,
-        0x01, 0x03, 0xe6, 0x6b,
-        0x20, 0x93, 0xe8, 0x6b,
-        0x04, 0x0b, 0xee, 0x6b,
+        0x04, 0x0b, 0xe8, 0x6b,
+        0x10, 0x0c, 0xe4, 0x7b,
+        0x01, 0x03, 0xe8, 0x6b,
+        0x20, 0x93, 0xea, 0x6b,
+        0x04, 0x0b, 0xf0, 0x6b,
         0x40, 0x3c, 0x78, 0x00,
         0xc7, 0x93, 0x26, 0x09,
-        0x38, 0x93, 0xf0, 0x6b,
+        0x38, 0x93, 0xf2, 0x6b,
         0x00, 0x65, 0xcc, 0x41,
-        0x80, 0x3c, 0x56, 0x6c,
+        0x80, 0x3c, 0x58, 0x6c,
         0x01, 0x06, 0x50, 0x31,
         0x80, 0xb8, 0x70, 0x01,
         0x00, 0x65, 0xcc, 0x41,
         0x10, 0x3f, 0x06, 0x00,
         0x10, 0x6a, 0x06, 0x00,
         0x01, 0x3a, 0xca, 0x30,
-        0x80, 0x65, 0x1c, 0x64,
-        0x10, 0xb8, 0x40, 0x6c,
+        0x80, 0x65, 0x1e, 0x64,
+        0x10, 0xb8, 0x42, 0x6c,
         0xc0, 0x3e, 0xca, 0x00,
-        0x40, 0xb8, 0x0c, 0x6c,
+        0x40, 0xb8, 0x0e, 0x6c,
         0xbf, 0x65, 0xca, 0x08,
-        0x20, 0xb8, 0x20, 0x7c,
+        0x20, 0xb8, 0x22, 0x7c,
         0x01, 0x65, 0x0c, 0x30,
-        0x00, 0x65, 0xd8, 0x5d,
-        0xa0, 0x3f, 0x28, 0x64,
+        0x00, 0x65, 0xda, 0x5d,
+        0xa0, 0x3f, 0x2a, 0x64,
         0x23, 0xb8, 0x0c, 0x08,
-        0x00, 0x65, 0xd8, 0x5d,
-        0xa0, 0x3f, 0x28, 0x64,
-        0x00, 0xbb, 0x20, 0x44,
-        0xff, 0x65, 0x20, 0x64,
-        0x00, 0x65, 0x40, 0x44,
+        0x00, 0x65, 0xda, 0x5d,
+        0xa0, 0x3f, 0x2a, 0x64,
+        0x00, 0xbb, 0x22, 0x44,
+        0xff, 0x65, 0x22, 0x64,
+        0x00, 0x65, 0x42, 0x44,
         0x40, 0x6a, 0x18, 0x00,
         0x01, 0x65, 0x0c, 0x30,
-        0x00, 0x65, 0xd8, 0x5d,
-        0xa0, 0x3f, 0xfc, 0x73,
+        0x00, 0x65, 0xda, 0x5d,
+        0xa0, 0x3f, 0xfe, 0x73,
         0x40, 0x6a, 0x18, 0x00,
         0x01, 0x3a, 0xa6, 0x30,
         0x08, 0x6a, 0x74, 0x00,
         0x00, 0x65, 0xcc, 0x41,
-        0x64, 0x6a, 0x68, 0x5d,
-        0x80, 0x64, 0xd8, 0x6c,
-        0x04, 0x64, 0x9a, 0x74,
-        0x02, 0x64, 0xaa, 0x74,
-        0x00, 0x6a, 0x60, 0x74,
-        0x03, 0x64, 0xc8, 0x74,
-        0x23, 0x64, 0x48, 0x74,
-        0x08, 0x64, 0x5c, 0x74,
-        0x61, 0x6a, 0xd8, 0x5e,
-        0x00, 0x65, 0xd8, 0x5d,
+        0x64, 0x6a, 0x6a, 0x5d,
+        0x80, 0x64, 0xda, 0x6c,
+        0x04, 0x64, 0x9c, 0x74,
+        0x02, 0x64, 0xac, 0x74,
+        0x00, 0x6a, 0x62, 0x74,
+        0x03, 0x64, 0xca, 0x74,
+        0x23, 0x64, 0x4a, 0x74,
+        0x08, 0x64, 0x5e, 0x74,
+        0x61, 0x6a, 0xda, 0x5e,
+        0x00, 0x65, 0xda, 0x5d,
         0x08, 0x51, 0xce, 0x71,
-        0x00, 0x65, 0x40, 0x44,
-        0x80, 0x04, 0x5a, 0x7c,
-        0x51, 0x6a, 0x5e, 0x5d,
-        0x01, 0x51, 0x5a, 0x64,
-        0x01, 0xa4, 0x52, 0x7c,
-        0x80, 0xba, 0x5c, 0x6c,
-        0x41, 0x6a, 0xd8, 0x5e,
-        0x00, 0x65, 0x5c, 0x44,
-        0x21, 0x6a, 0xd8, 0x5e,
-        0x00, 0x65, 0x5c, 0x44,
-        0x07, 0x6a, 0x54, 0x5d,
+        0x00, 0x65, 0x42, 0x44,
+        0x80, 0x04, 0x5c, 0x7c,
+        0x51, 0x6a, 0x60, 0x5d,
+        0x01, 0x51, 0x5c, 0x64,
+        0x01, 0xa4, 0x54, 0x7c,
+        0x80, 0xba, 0x5e, 0x6c,
+        0x41, 0x6a, 0xda, 0x5e,
+        0x00, 0x65, 0x5e, 0x44,
+        0x21, 0x6a, 0xda, 0x5e,
+        0x00, 0x65, 0x5e, 0x44,
+        0x07, 0x6a, 0x56, 0x5d,
         0x01, 0x06, 0xd4, 0x30,
         0x00, 0x65, 0xcc, 0x41,
-        0x80, 0xb8, 0x56, 0x7c,
-        0xc0, 0x3c, 0x6a, 0x7c,
-        0x80, 0x3c, 0x56, 0x6c,
-        0xff, 0xa8, 0x6a, 0x6c,
-        0x40, 0x3c, 0x56, 0x6c,
-        0x10, 0xb8, 0x6e, 0x7c,
-        0xa1, 0x6a, 0xd8, 0x5e,
-        0x01, 0xb4, 0x74, 0x6c,
-        0x02, 0xb4, 0x76, 0x6c,
-        0x01, 0xa4, 0x76, 0x7c,
-        0xff, 0xa8, 0x86, 0x7c,
+        0x80, 0xb8, 0x58, 0x7c,
+        0xc0, 0x3c, 0x6c, 0x7c,
+        0x80, 0x3c, 0x58, 0x6c,
+        0xff, 0xa8, 0x6c, 0x6c,
+        0x40, 0x3c, 0x58, 0x6c,
+        0x10, 0xb8, 0x70, 0x7c,
+        0xa1, 0x6a, 0xda, 0x5e,
+        0x01, 0xb4, 0x76, 0x6c,
+        0x02, 0xb4, 0x78, 0x6c,
+        0x01, 0xa4, 0x78, 0x7c,
+        0xff, 0xa8, 0x88, 0x7c,
         0x04, 0xb4, 0x68, 0x01,
         0x01, 0x6a, 0x76, 0x00,
-        0x00, 0xbb, 0x12, 0x5e,
-        0xff, 0xa8, 0x86, 0x7c,
-        0x71, 0x6a, 0xd8, 0x5e,
-        0x40, 0x51, 0x86, 0x64,
-        0x00, 0x65, 0xb2, 0x5e,
+        0x00, 0xbb, 0x14, 0x5e,
+        0xff, 0xa8, 0x88, 0x7c,
+        0x71, 0x6a, 0xda, 0x5e,
+        0x40, 0x51, 0x88, 0x64,
+        0x00, 0x65, 0xb4, 0x5e,
         0x00, 0x65, 0xde, 0x41,
-        0x00, 0xbb, 0x8a, 0x5c,
+        0x00, 0xbb, 0x8c, 0x5c,
         0x00, 0x65, 0xde, 0x41,
-        0x00, 0x65, 0xb2, 0x5e,
+        0x00, 0x65, 0xb4, 0x5e,
         0x01, 0x65, 0xa2, 0x30,
         0x01, 0xf8, 0xc8, 0x30,
         0x01, 0x4e, 0xc8, 0x30,
-        0x00, 0x6a, 0xb6, 0xdd,
-        0x00, 0x51, 0xc8, 0x5d,
+        0x00, 0x6a, 0xb8, 0xdd,
+        0x00, 0x51, 0xca, 0x5d,
         0x01, 0x4e, 0x9c, 0x18,
         0x02, 0x6a, 0x22, 0x05,
-        0xc0, 0x3c, 0x56, 0x6c,
+        0xc0, 0x3c, 0x58, 0x6c,
         0x04, 0xb8, 0x70, 0x01,
-        0x00, 0x65, 0xd4, 0x5e,
+        0x00, 0x65, 0xd6, 0x5e,
         0x20, 0xb8, 0xde, 0x69,
         0x01, 0xbb, 0xa2, 0x30,
         0x3f, 0xba, 0x7c, 0x08,
-        0x00, 0xb9, 0xce, 0x5c,
+        0x00, 0xb9, 0xd0, 0x5c,
         0x00, 0x65, 0xde, 0x41,
         0x01, 0x06, 0xd4, 0x30,
         0x20, 0x3c, 0xcc, 0x79,
-        0x20, 0x3c, 0x5c, 0x7c,
-        0x01, 0xa4, 0xb8, 0x7c,
+        0x20, 0x3c, 0x5e, 0x7c,
+        0x01, 0xa4, 0xba, 0x7c,
         0x01, 0xb4, 0x68, 0x01,
         0x00, 0x65, 0xcc, 0x41,
-        0x00, 0x65, 0x5c, 0x44,
+        0x00, 0x65, 0x5e, 0x44,
         0x04, 0x14, 0x58, 0x31,
         0x01, 0x06, 0xd4, 0x30,
         0x08, 0xa0, 0x60, 0x31,
         0xac, 0x6a, 0xcc, 0x00,
-        0x14, 0x6a, 0xf4, 0x5d,
+        0x14, 0x6a, 0xf6, 0x5d,
         0x01, 0x06, 0xd4, 0x30,
-        0xa0, 0x6a, 0xec, 0x5d,
+        0xa0, 0x6a, 0xee, 0x5d,
         0x00, 0x65, 0xcc, 0x41,
         0xdf, 0x3c, 0x78, 0x08,
         0x12, 0x01, 0x02, 0x00,
-        0x00, 0x65, 0x5c, 0x44,
+        0x00, 0x65, 0x5e, 0x44,
         0x4c, 0x65, 0xcc, 0x28,
         0x01, 0x3e, 0x20, 0x31,
         0xd0, 0x66, 0xcc, 0x18,
@@ -631,102 +632,102 @@ static uint8_t seqprog[] = {
         0xd0, 0x65, 0xca, 0x18,
         0x01, 0x3e, 0x20, 0x31,
         0x30, 0x65, 0xd4, 0x18,
-        0x00, 0x65, 0xe6, 0x4c,
+        0x00, 0x65, 0xe8, 0x4c,
         0xe1, 0x6a, 0x22, 0x01,
         0xff, 0x6a, 0xd4, 0x08,
         0x20, 0x65, 0xd4, 0x18,
-        0x00, 0x65, 0xee, 0x54,
+        0x00, 0x65, 0xf0, 0x54,
         0xe1, 0x6a, 0x22, 0x01,
         0xff, 0x6a, 0xd4, 0x08,
         0x20, 0x65, 0xca, 0x18,
         0xe0, 0x65, 0xd4, 0x18,
-        0x00, 0x65, 0xf8, 0x4c,
+        0x00, 0x65, 0xfa, 0x4c,
         0xe1, 0x6a, 0x22, 0x01,
         0xff, 0x6a, 0xd4, 0x08,
         0xd0, 0x65, 0xd4, 0x18,
-        0x00, 0x65, 0x00, 0x55,
+        0x00, 0x65, 0x02, 0x55,
         0xe1, 0x6a, 0x22, 0x01,
         0xff, 0x6a, 0xd4, 0x08,
         0x01, 0x6c, 0xa2, 0x30,
-        0xff, 0x51, 0x12, 0x75,
-        0x00, 0x51, 0x8e, 0x5d,
+        0xff, 0x51, 0x14, 0x75,
+        0x00, 0x51, 0x90, 0x5d,
         0x01, 0x51, 0x20, 0x31,
-        0x00, 0x65, 0x34, 0x45,
+        0x00, 0x65, 0x36, 0x45,
         0x3f, 0xba, 0xc8, 0x08,
-        0x00, 0x3e, 0x34, 0x75,
-        0x00, 0x65, 0xb0, 0x5e,
+        0x00, 0x3e, 0x36, 0x75,
+        0x00, 0x65, 0xb2, 0x5e,
         0x80, 0x3c, 0x78, 0x00,
         0x01, 0x06, 0xd4, 0x30,
-        0x00, 0x65, 0xd8, 0x5d,
+        0x00, 0x65, 0xda, 0x5d,
         0x01, 0x3c, 0x78, 0x00,
-        0xe0, 0x3f, 0x50, 0x65,
+        0xe0, 0x3f, 0x52, 0x65,
         0x02, 0x3c, 0x78, 0x00,
-        0x20, 0x12, 0x50, 0x65,
-        0x51, 0x6a, 0x5e, 0x5d,
-        0x00, 0x51, 0x8e, 0x5d,
-        0x51, 0x6a, 0x5e, 0x5d,
+        0x20, 0x12, 0x52, 0x65,
+        0x51, 0x6a, 0x60, 0x5d,
+        0x00, 0x51, 0x90, 0x5d,
+        0x51, 0x6a, 0x60, 0x5d,
         0x01, 0x51, 0x20, 0x31,
         0x04, 0x3c, 0x78, 0x00,
         0x01, 0xb9, 0xc8, 0x30,
-        0x00, 0x3d, 0x4e, 0x65,
+        0x00, 0x3d, 0x50, 0x65,
         0x08, 0x3c, 0x78, 0x00,
         0x3f, 0xba, 0xc8, 0x08,
-        0x00, 0x3e, 0x4e, 0x65,
+        0x00, 0x3e, 0x50, 0x65,
         0x10, 0x3c, 0x78, 0x00,
-        0x04, 0xb8, 0x4e, 0x7d,
+        0x04, 0xb8, 0x50, 0x7d,
         0xfb, 0xb8, 0x70, 0x09,
-        0x20, 0xb8, 0x44, 0x6d,
+        0x20, 0xb8, 0x46, 0x6d,
         0x01, 0x90, 0xc8, 0x30,
         0xff, 0x6a, 0xa2, 0x00,
-        0x00, 0x3d, 0xce, 0x5c,
+        0x00, 0x3d, 0xd0, 0x5c,
         0x01, 0x64, 0x20, 0x31,
         0xff, 0x6a, 0x78, 0x08,
         0x00, 0x65, 0xea, 0x58,
-        0x10, 0xb8, 0x5c, 0x7c,
-        0xff, 0x6a, 0x54, 0x5d,
-        0x00, 0x65, 0x5c, 0x44,
-        0x00, 0x65, 0xb0, 0x5e,
-        0x31, 0x6a, 0xd8, 0x5e,
-        0x00, 0x65, 0x5c, 0x44,
+        0x10, 0xb8, 0x5e, 0x7c,
+        0xff, 0x6a, 0x56, 0x5d,
+        0x00, 0x65, 0x5e, 0x44,
+        0x00, 0x65, 0xb2, 0x5e,
+        0x31, 0x6a, 0xda, 0x5e,
+        0x00, 0x65, 0x5e, 0x44,
         0x10, 0x3f, 0x06, 0x00,
         0x10, 0x6a, 0x06, 0x00,
         0x01, 0x65, 0x74, 0x34,
-        0x81, 0x6a, 0xd8, 0x5e,
-        0x00, 0x65, 0x60, 0x45,
+        0x81, 0x6a, 0xda, 0x5e,
+        0x00, 0x65, 0x62, 0x45,
         0x01, 0x06, 0xd4, 0x30,
-        0x01, 0x0c, 0x60, 0x7d,
-        0x04, 0x0c, 0x5a, 0x6d,
+        0x01, 0x0c, 0x62, 0x7d,
+        0x04, 0x0c, 0x5c, 0x6d,
         0xe0, 0x03, 0x7e, 0x08,
         0xe0, 0x3f, 0xcc, 0x61,
         0x01, 0x65, 0xcc, 0x30,
         0x01, 0x12, 0xda, 0x34,
         0x01, 0x06, 0xd4, 0x34,
-        0x01, 0x03, 0x6e, 0x6d,
+        0x01, 0x03, 0x70, 0x6d,
         0x40, 0x03, 0xcc, 0x08,
         0x01, 0x65, 0x06, 0x30,
         0x40, 0x65, 0xc8, 0x08,
-        0x00, 0x66, 0x7c, 0x75,
-        0x40, 0x65, 0x7c, 0x7d,
-        0x00, 0x65, 0x7c, 0x5d,
+        0x00, 0x66, 0x7e, 0x75,
+        0x40, 0x65, 0x7e, 0x7d,
+        0x00, 0x65, 0x7e, 0x5d,
         0xff, 0x6a, 0xd4, 0x08,
         0xff, 0x6a, 0xd4, 0x08,
         0xff, 0x6a, 0xd4, 0x08,
         0xff, 0x6a, 0xd4, 0x0c,
         0x08, 0x01, 0x02, 0x00,
-        0x02, 0x0b, 0x86, 0x7d,
+        0x02, 0x0b, 0x88, 0x7d,
         0x01, 0x65, 0x0c, 0x30,
-        0x02, 0x0b, 0x8a, 0x7d,
+        0x02, 0x0b, 0x8c, 0x7d,
         0xf7, 0x01, 0x02, 0x0c,
         0x01, 0x65, 0xc8, 0x30,
-        0xff, 0x41, 0xae, 0x75,
+        0xff, 0x41, 0xb0, 0x75,
         0x01, 0x41, 0x20, 0x31,
         0xff, 0x6a, 0xa4, 0x00,
-        0x00, 0x65, 0x9e, 0x45,
-        0xff, 0xbf, 0xae, 0x75,
+        0x00, 0x65, 0xa0, 0x45,
+        0xff, 0xbf, 0xb0, 0x75,
         0x01, 0x90, 0xa4, 0x30,
         0x01, 0xbf, 0x20, 0x31,
-        0x00, 0xbb, 0x98, 0x65,
-        0xff, 0x52, 0xac, 0x75,
+        0x00, 0xbb, 0x9a, 0x65,
+        0xff, 0x52, 0xae, 0x75,
         0x01, 0xbf, 0xcc, 0x30,
         0x01, 0x90, 0xca, 0x30,
         0x01, 0x52, 0x20, 0x31,
@@ -734,28 +735,28 @@ static uint8_t seqprog[] = {
         0x01, 0x65, 0x20, 0x35,
         0x01, 0xbf, 0x82, 0x34,
         0x01, 0x64, 0xa2, 0x30,
-        0x00, 0x6a, 0xc0, 0x5e,
+        0x00, 0x6a, 0xc2, 0x5e,
         0x0d, 0x6a, 0x76, 0x00,
-        0x00, 0x51, 0x12, 0x46,
+        0x00, 0x51, 0x14, 0x46,
         0x01, 0x65, 0xa4, 0x30,
         0xe0, 0x6a, 0xcc, 0x00,
-        0x48, 0x6a, 0x06, 0x5e,
+        0x48, 0x6a, 0x08, 0x5e,
         0x01, 0x6a, 0xd0, 0x01,
         0x01, 0x6a, 0xdc, 0x05,
         0x88, 0x6a, 0xcc, 0x00,
-        0x48, 0x6a, 0x06, 0x5e,
-        0x01, 0x6a, 0xe0, 0x5d,
+        0x48, 0x6a, 0x08, 0x5e,
+        0x01, 0x6a, 0xe2, 0x5d,
         0x01, 0x6a, 0x26, 0x05,
         0x01, 0x65, 0xd8, 0x31,
         0x09, 0xee, 0xdc, 0x01,
-        0x80, 0xee, 0xcc, 0x7d,
+        0x80, 0xee, 0xce, 0x7d,
         0xff, 0x6a, 0xdc, 0x0d,
         0x01, 0x65, 0x32, 0x31,
         0x0a, 0x93, 0x26, 0x01,
-        0x00, 0x65, 0xa8, 0x46,
-        0x81, 0x6a, 0xd8, 0x5e,
-        0x01, 0x0c, 0xd8, 0x7d,
-        0x04, 0x0c, 0xd6, 0x6d,
+        0x00, 0x65, 0xaa, 0x46,
+        0x81, 0x6a, 0xda, 0x5e,
+        0x01, 0x0c, 0xda, 0x7d,
+        0x04, 0x0c, 0xd8, 0x6d,
         0xe0, 0x03, 0x06, 0x08,
         0xe0, 0x03, 0x7e, 0x0c,
         0x01, 0x65, 0x18, 0x31,
@@ -774,7 +775,7 @@ static uint8_t seqprog[] = {
         0x01, 0x6c, 0xda, 0x34,
         0x3d, 0x64, 0xa4, 0x28,
         0x55, 0x64, 0xc8, 0x28,
-        0x00, 0x65, 0x06, 0x46,
+        0x00, 0x65, 0x08, 0x46,
         0x2e, 0x64, 0xa4, 0x28,
         0x66, 0x64, 0xc8, 0x28,
         0x00, 0x6c, 0xda, 0x18,
@@ -785,63 +786,63 @@ static uint8_t seqprog[] = {
         0x00, 0x6c, 0xda, 0x24,
         0x01, 0x65, 0xc8, 0x30,
         0xe0, 0x6a, 0xcc, 0x00,
-        0x44, 0x6a, 0x02, 0x5e,
+        0x44, 0x6a, 0x04, 0x5e,
         0x01, 0x90, 0xe2, 0x31,
-        0x04, 0x3b, 0x26, 0x7e,
+        0x04, 0x3b, 0x28, 0x7e,
         0x30, 0x6a, 0xd0, 0x01,
         0x20, 0x6a, 0xd0, 0x01,
         0x1d, 0x6a, 0xdc, 0x01,
-        0xdc, 0xee, 0x22, 0x66,
-        0x00, 0x65, 0x3e, 0x46,
+        0xdc, 0xee, 0x24, 0x66,
+        0x00, 0x65, 0x40, 0x46,
         0x20, 0x6a, 0xd0, 0x01,
         0x01, 0x6a, 0xdc, 0x01,
         0x20, 0xa0, 0xd8, 0x31,
         0x09, 0xee, 0xdc, 0x01,
-        0x80, 0xee, 0x2e, 0x7e,
+        0x80, 0xee, 0x30, 0x7e,
         0x11, 0x6a, 0xdc, 0x01,
-        0x50, 0xee, 0x32, 0x66,
+        0x50, 0xee, 0x34, 0x66,
         0x20, 0x6a, 0xd0, 0x01,
         0x09, 0x6a, 0xdc, 0x01,
-        0x88, 0xee, 0x38, 0x66,
+        0x88, 0xee, 0x3a, 0x66,
         0x19, 0x6a, 0xdc, 0x01,
-        0xd8, 0xee, 0x3c, 0x66,
+        0xd8, 0xee, 0x3e, 0x66,
         0xff, 0x6a, 0xdc, 0x09,
-        0x18, 0xee, 0x40, 0x6e,
+        0x18, 0xee, 0x42, 0x6e,
         0xff, 0x6a, 0xd4, 0x0c,
         0x88, 0x6a, 0xcc, 0x00,
-        0x44, 0x6a, 0x02, 0x5e,
-        0x20, 0x6a, 0xe0, 0x5d,
+        0x44, 0x6a, 0x04, 0x5e,
+        0x20, 0x6a, 0xe2, 0x5d,
         0x01, 0x3b, 0x26, 0x31,
-        0x04, 0x3b, 0x5a, 0x6e,
+        0x04, 0x3b, 0x5c, 0x6e,
         0xa0, 0x6a, 0xca, 0x00,
         0x20, 0x65, 0xc8, 0x18,
-        0x00, 0x65, 0x98, 0x5e,
-        0x00, 0x65, 0x52, 0x66,
+        0x00, 0x65, 0x9a, 0x5e,
+        0x00, 0x65, 0x54, 0x66,
         0x0a, 0x93, 0x26, 0x01,
-        0x00, 0x65, 0xa8, 0x46,
+        0x00, 0x65, 0xaa, 0x46,
         0xa0, 0x6a, 0xcc, 0x00,
         0xff, 0x6a, 0xc8, 0x08,
-        0x20, 0x94, 0x5e, 0x6e,
-        0x10, 0x94, 0x60, 0x6e,
-        0x08, 0x94, 0x7a, 0x6e,
-        0x08, 0x94, 0x7a, 0x6e,
-        0x08, 0x94, 0x7a, 0x6e,
+        0x20, 0x94, 0x60, 0x6e,
+        0x10, 0x94, 0x62, 0x6e,
+        0x08, 0x94, 0x7c, 0x6e,
+        0x08, 0x94, 0x7c, 0x6e,
+        0x08, 0x94, 0x7c, 0x6e,
         0xff, 0x8c, 0xc8, 0x10,
         0xc1, 0x64, 0xc8, 0x18,
         0xf8, 0x64, 0xc8, 0x08,
         0x01, 0x99, 0xda, 0x30,
-        0x00, 0x66, 0x6e, 0x66,
-        0xc0, 0x66, 0xaa, 0x76,
+        0x00, 0x66, 0x70, 0x66,
+        0xc0, 0x66, 0xac, 0x76,
         0x60, 0x66, 0xc8, 0x18,
         0x3d, 0x64, 0xc8, 0x28,
-        0x00, 0x65, 0x5e, 0x46,
+        0x00, 0x65, 0x60, 0x46,
         0xf7, 0x93, 0x26, 0x09,
-        0x08, 0x93, 0x7c, 0x6e,
+        0x08, 0x93, 0x7e, 0x6e,
         0x00, 0x62, 0xc4, 0x18,
-        0x00, 0x65, 0xa8, 0x5e,
-        0x00, 0x65, 0x88, 0x5e,
-        0x00, 0x65, 0x88, 0x5e,
-        0x00, 0x65, 0x88, 0x5e,
+        0x00, 0x65, 0xaa, 0x5e,
+        0x00, 0x65, 0x8a, 0x5e,
+        0x00, 0x65, 0x8a, 0x5e,
+        0x00, 0x65, 0x8a, 0x5e,
         0x01, 0x99, 0xda, 0x30,
         0x01, 0x99, 0xda, 0x30,
         0x01, 0x99, 0xda, 0x30,
@@ -858,11 +859,11 @@ static uint8_t seqprog[] = {
         0x01, 0x6c, 0x32, 0x31,
         0x01, 0x6c, 0x32, 0x31,
         0x01, 0x6c, 0x32, 0x35,
-        0x08, 0x94, 0xa8, 0x7e,
+        0x08, 0x94, 0xaa, 0x7e,
         0xf7, 0x93, 0x26, 0x09,
-        0x08, 0x93, 0xac, 0x6e,
+        0x08, 0x93, 0xae, 0x6e,
         0xff, 0x6a, 0xd4, 0x0c,
-        0x04, 0xb8, 0xd4, 0x6e,
+        0x04, 0xb8, 0xd6, 0x6e,
         0x01, 0x42, 0x7e, 0x31,
         0xff, 0x6a, 0x76, 0x01,
         0x01, 0x90, 0x84, 0x34,
@@ -870,14 +871,14 @@ static uint8_t seqprog[] = {
         0x01, 0x85, 0x0a, 0x01,
         0x7f, 0x65, 0x10, 0x09,
         0xfe, 0x85, 0x0a, 0x0d,
-        0xff, 0x42, 0xd0, 0x66,
-        0xff, 0x41, 0xc8, 0x66,
-        0xd1, 0x6a, 0xd8, 0x5e,
+        0xff, 0x42, 0xd2, 0x66,
+        0xff, 0x41, 0xca, 0x66,
+        0xd1, 0x6a, 0xda, 0x5e,
         0xff, 0x6a, 0xca, 0x04,
         0x01, 0x41, 0x20, 0x31,
         0x01, 0xbf, 0x82, 0x30,
         0x01, 0x6a, 0x76, 0x00,
-        0x00, 0xbb, 0x12, 0x46,
+        0x00, 0xbb, 0x14, 0x46,
         0x01, 0x42, 0x20, 0x31,
         0x01, 0xbf, 0x84, 0x34,
         0x01, 0x41, 0x7e, 0x31,
@@ -941,7 +942,7 @@ static ahc_patch_func_t ahc_patch17_func;
 static int
 ahc_patch17_func(struct ahc_softc *ahc)
 {
-        return ((ahc->flags & AHC_TMODE_WIDEODD_BUG) != 0);
+        return ((ahc->bugs & AHC_TMODE_WIDEODD_BUG) != 0);
 }
 
 static ahc_patch_func_t ahc_patch16_func;
@@ -1142,152 +1143,152 @@ static struct patch {
         { ahc_patch0_func, 196, 1, 1 },
         { ahc_patch9_func, 212, 6, 2 },
         { ahc_patch0_func, 218, 6, 1 },
-        { ahc_patch8_func, 226, 20, 2 },
+        { ahc_patch8_func, 226, 21, 2 },
         { ahc_patch1_func, 241, 1, 1 },
-        { ahc_patch1_func, 248, 1, 2 },
-        { ahc_patch0_func, 249, 2, 2 },
-        { ahc_patch11_func, 250, 1, 1 },
-        { ahc_patch9_func, 258, 27, 3 },
-        { ahc_patch1_func, 274, 10, 2 },
-        { ahc_patch13_func, 277, 1, 1 },
-        { ahc_patch14_func, 285, 14, 1 },
-        { ahc_patch1_func, 301, 1, 2 },
-        { ahc_patch0_func, 302, 1, 1 },
-        { ahc_patch9_func, 305, 1, 1 },
-        { ahc_patch13_func, 310, 1, 1 },
-        { ahc_patch9_func, 311, 2, 2 },
-        { ahc_patch0_func, 313, 4, 1 },
-        { ahc_patch14_func, 317, 1, 1 },
-        { ahc_patch15_func, 319, 2, 3 },
-        { ahc_patch9_func, 319, 1, 2 },
-        { ahc_patch0_func, 320, 1, 1 },
-        { ahc_patch6_func, 325, 1, 2 },
-        { ahc_patch0_func, 326, 1, 1 },
-        { ahc_patch1_func, 330, 47, 11 },
-        { ahc_patch6_func, 337, 2, 4 },
-        { ahc_patch7_func, 337, 1, 1 },
-        { ahc_patch8_func, 338, 1, 1 },
-        { ahc_patch0_func, 339, 1, 1 },
-        { ahc_patch16_func, 340, 1, 1 },
-        { ahc_patch6_func, 356, 6, 3 },
-        { ahc_patch16_func, 356, 5, 1 },
-        { ahc_patch0_func, 362, 7, 1 },
-        { ahc_patch13_func, 372, 5, 1 },
-        { ahc_patch0_func, 377, 52, 17 },
-        { ahc_patch14_func, 377, 1, 1 },
-        { ahc_patch7_func, 379, 2, 2 },
-        { ahc_patch17_func, 380, 1, 1 },
-        { ahc_patch9_func, 383, 1, 1 },
-        { ahc_patch18_func, 390, 1, 1 },
-        { ahc_patch14_func, 395, 9, 3 },
-        { ahc_patch9_func, 396, 3, 2 },
-        { ahc_patch0_func, 399, 3, 1 },
-        { ahc_patch9_func, 407, 6, 2 },
-        { ahc_patch0_func, 413, 9, 2 },
-        { ahc_patch13_func, 413, 1, 1 },
-        { ahc_patch13_func, 422, 2, 1 },
-        { ahc_patch14_func, 424, 1, 1 },
-        { ahc_patch9_func, 426, 1, 2 },
-        { ahc_patch0_func, 427, 1, 1 },
-        { ahc_patch7_func, 428, 1, 1 },
+        { ahc_patch1_func, 249, 1, 2 },
+        { ahc_patch0_func, 250, 2, 2 },
+        { ahc_patch11_func, 251, 1, 1 },
+        { ahc_patch9_func, 259, 27, 3 },
+        { ahc_patch1_func, 275, 10, 2 },
+        { ahc_patch13_func, 278, 1, 1 },
+        { ahc_patch14_func, 286, 14, 1 },
+        { ahc_patch1_func, 302, 1, 2 },
+        { ahc_patch0_func, 303, 1, 1 },
+        { ahc_patch9_func, 306, 1, 1 },
+        { ahc_patch13_func, 311, 1, 1 },
+        { ahc_patch9_func, 312, 2, 2 },
+        { ahc_patch0_func, 314, 4, 1 },
+        { ahc_patch14_func, 318, 1, 1 },
+        { ahc_patch15_func, 320, 2, 3 },
+        { ahc_patch9_func, 320, 1, 2 },
+        { ahc_patch0_func, 321, 1, 1 },
+        { ahc_patch6_func, 326, 1, 2 },
+        { ahc_patch0_func, 327, 1, 1 },
+        { ahc_patch1_func, 331, 47, 11 },
+        { ahc_patch6_func, 338, 2, 4 },
+        { ahc_patch7_func, 338, 1, 1 },
+        { ahc_patch8_func, 339, 1, 1 },
+        { ahc_patch0_func, 340, 1, 1 },
+        { ahc_patch16_func, 341, 1, 1 },
+        { ahc_patch6_func, 357, 6, 3 },
+        { ahc_patch16_func, 357, 5, 1 },
+        { ahc_patch0_func, 363, 7, 1 },
+        { ahc_patch13_func, 373, 5, 1 },
+        { ahc_patch0_func, 378, 52, 17 },
+        { ahc_patch14_func, 378, 1, 1 },
+        { ahc_patch7_func, 380, 2, 2 },
+        { ahc_patch17_func, 381, 1, 1 },
+        { ahc_patch9_func, 384, 1, 1 },
+        { ahc_patch18_func, 391, 1, 1 },
+        { ahc_patch14_func, 396, 9, 3 },
+        { ahc_patch9_func, 397, 3, 2 },
+        { ahc_patch0_func, 400, 3, 1 },
+        { ahc_patch9_func, 408, 6, 2 },
+        { ahc_patch0_func, 414, 9, 2 },
+        { ahc_patch13_func, 414, 1, 1 },
+        { ahc_patch13_func, 423, 2, 1 },
+        { ahc_patch14_func, 425, 1, 1 },
+        { ahc_patch9_func, 427, 1, 2 },
+        { ahc_patch0_func, 428, 1, 1 },
         { ahc_patch7_func, 429, 1, 1 },
-        { ahc_patch8_func, 430, 3, 3 },
-        { ahc_patch6_func, 431, 1, 2 },
-        { ahc_patch0_func, 432, 1, 1 },
-        { ahc_patch9_func, 433, 1, 1 },
-        { ahc_patch15_func, 434, 1, 2 },
-        { ahc_patch13_func, 434, 1, 1 },
-        { ahc_patch14_func, 436, 9, 4 },
-        { ahc_patch9_func, 436, 1, 1 },
-        { ahc_patch9_func, 443, 2, 1 },
-        { ahc_patch0_func, 445, 4, 3 },
-        { ahc_patch9_func, 445, 1, 2 },
-        { ahc_patch0_func, 446, 3, 1 },
-        { ahc_patch1_func, 450, 2, 1 },
-        { ahc_patch7_func, 452, 10, 2 },
-        { ahc_patch0_func, 462, 1, 1 },
-        { ahc_patch8_func, 463, 118, 22 },
-        { ahc_patch1_func, 465, 3, 2 },
-        { ahc_patch0_func, 468, 5, 3 },
-        { ahc_patch9_func, 468, 2, 2 },
-        { ahc_patch0_func, 470, 3, 1 },
-        { ahc_patch1_func, 475, 2, 2 },
-        { ahc_patch0_func, 477, 6, 3 },
-        { ahc_patch9_func, 477, 2, 2 },
-        { ahc_patch0_func, 479, 3, 1 },
-        { ahc_patch1_func, 485, 2, 2 },
-        { ahc_patch0_func, 487, 9, 7 },
-        { ahc_patch9_func, 487, 5, 6 },
-        { ahc_patch19_func, 487, 1, 2 },
-        { ahc_patch0_func, 488, 1, 1 },
-        { ahc_patch19_func, 490, 1, 2 },
-        { ahc_patch0_func, 491, 1, 1 },
-        { ahc_patch0_func, 492, 4, 1 },
-        { ahc_patch6_func, 497, 3, 2 },
-        { ahc_patch0_func, 500, 1, 1 },
-        { ahc_patch6_func, 510, 1, 2 },
-        { ahc_patch0_func, 511, 1, 1 },
-        { ahc_patch20_func, 548, 7, 1 },
-        { ahc_patch3_func, 583, 1, 2 },
-        { ahc_patch0_func, 584, 1, 1 },
-        { ahc_patch21_func, 587, 1, 1 },
-        { ahc_patch8_func, 589, 106, 33 },
-        { ahc_patch4_func, 591, 1, 1 },
-        { ahc_patch1_func, 597, 2, 2 },
-        { ahc_patch0_func, 599, 1, 1 },
-        { ahc_patch1_func, 602, 1, 2 },
-        { ahc_patch0_func, 603, 1, 1 },
-        { ahc_patch9_func, 604, 3, 3 },
-        { ahc_patch15_func, 605, 1, 1 },
-        { ahc_patch0_func, 607, 4, 1 },
-        { ahc_patch19_func, 616, 2, 2 },
-        { ahc_patch0_func, 618, 1, 1 },
-        { ahc_patch19_func, 622, 10, 3 },
-        { ahc_patch5_func, 624, 8, 1 },
-        { ahc_patch0_func, 632, 9, 2 },
-        { ahc_patch5_func, 633, 8, 1 },
-        { ahc_patch4_func, 643, 1, 2 },
-        { ahc_patch0_func, 644, 1, 1 },
-        { ahc_patch19_func, 645, 1, 2 },
-        { ahc_patch0_func, 646, 3, 2 },
-        { ahc_patch4_func, 648, 1, 1 },
-        { ahc_patch5_func, 649, 1, 1 },
-        { ahc_patch5_func, 652, 1, 1 },
-        { ahc_patch5_func, 654, 1, 1 },
-        { ahc_patch4_func, 656, 2, 2 },
-        { ahc_patch0_func, 658, 2, 1 },
-        { ahc_patch5_func, 660, 1, 1 },
-        { ahc_patch5_func, 663, 1, 1 },
-        { ahc_patch5_func, 666, 1, 1 },
-        { ahc_patch19_func, 670, 1, 1 },
-        { ahc_patch19_func, 673, 1, 1 },
-        { ahc_patch4_func, 679, 1, 1 },
-        { ahc_patch6_func, 682, 1, 2 },
-        { ahc_patch0_func, 683, 1, 1 },
-        { ahc_patch7_func, 695, 16, 1 },
-        { ahc_patch4_func, 711, 20, 1 },
-        { ahc_patch9_func, 732, 4, 2 },
-        { ahc_patch0_func, 736, 4, 1 },
-        { ahc_patch9_func, 740, 4, 2 },
-        { ahc_patch0_func, 744, 3, 1 },
-        { ahc_patch6_func, 750, 1, 1 },
-        { ahc_patch22_func, 752, 14, 1 },
-        { ahc_patch7_func, 766, 3, 1 },
-        { ahc_patch9_func, 778, 24, 8 },
-        { ahc_patch19_func, 782, 1, 2 },
-        { ahc_patch0_func, 783, 1, 1 },
-        { ahc_patch15_func, 788, 4, 2 },
-        { ahc_patch0_func, 792, 7, 3 },
-        { ahc_patch23_func, 792, 5, 2 },
-        { ahc_patch0_func, 797, 2, 1 },
-        { ahc_patch0_func, 802, 42, 3 },
-        { ahc_patch18_func, 814, 18, 2 },
-        { ahc_patch0_func, 832, 1, 1 },
-        { ahc_patch4_func, 856, 1, 1 },
-        { ahc_patch4_func, 857, 3, 2 },
-        { ahc_patch0_func, 860, 1, 1 },
-        { ahc_patch13_func, 861, 3, 1 },
-        { ahc_patch4_func, 864, 12, 1 }
+        { ahc_patch7_func, 430, 1, 1 },
+        { ahc_patch8_func, 431, 3, 3 },
+        { ahc_patch6_func, 432, 1, 2 },
+        { ahc_patch0_func, 433, 1, 1 },
+        { ahc_patch9_func, 434, 1, 1 },
+        { ahc_patch15_func, 435, 1, 2 },
+        { ahc_patch13_func, 435, 1, 1 },
+        { ahc_patch14_func, 437, 9, 4 },
+        { ahc_patch9_func, 437, 1, 1 },
+        { ahc_patch9_func, 444, 2, 1 },
+        { ahc_patch0_func, 446, 4, 3 },
+        { ahc_patch9_func, 446, 1, 2 },
+        { ahc_patch0_func, 447, 3, 1 },
+        { ahc_patch1_func, 451, 2, 1 },
+        { ahc_patch7_func, 453, 10, 2 },
+        { ahc_patch0_func, 463, 1, 1 },
+        { ahc_patch8_func, 464, 118, 22 },
+        { ahc_patch1_func, 466, 3, 2 },
+        { ahc_patch0_func, 469, 5, 3 },
+        { ahc_patch9_func, 469, 2, 2 },
+        { ahc_patch0_func, 471, 3, 1 },
+        { ahc_patch1_func, 476, 2, 2 },
+        { ahc_patch0_func, 478, 6, 3 },
+        { ahc_patch9_func, 478, 2, 2 },
+        { ahc_patch0_func, 480, 3, 1 },
+        { ahc_patch1_func, 486, 2, 2 },
+        { ahc_patch0_func, 488, 9, 7 },
+        { ahc_patch9_func, 488, 5, 6 },
+        { ahc_patch19_func, 488, 1, 2 },
+        { ahc_patch0_func, 489, 1, 1 },
+        { ahc_patch19_func, 491, 1, 2 },
+        { ahc_patch0_func, 492, 1, 1 },
+        { ahc_patch0_func, 493, 4, 1 },
+        { ahc_patch6_func, 498, 3, 2 },
+        { ahc_patch0_func, 501, 1, 1 },
+        { ahc_patch6_func, 511, 1, 2 },
+        { ahc_patch0_func, 512, 1, 1 },
+        { ahc_patch20_func, 549, 7, 1 },
+        { ahc_patch3_func, 584, 1, 2 },
+        { ahc_patch0_func, 585, 1, 1 },
+        { ahc_patch21_func, 588, 1, 1 },
+        { ahc_patch8_func, 590, 106, 33 },
+        { ahc_patch4_func, 592, 1, 1 },
+        { ahc_patch1_func, 598, 2, 2 },
+        { ahc_patch0_func, 600, 1, 1 },
+        { ahc_patch1_func, 603, 1, 2 },
+        { ahc_patch0_func, 604, 1, 1 },
+        { ahc_patch9_func, 605, 3, 3 },
+        { ahc_patch15_func, 606, 1, 1 },
+        { ahc_patch0_func, 608, 4, 1 },
+        { ahc_patch19_func, 617, 2, 2 },
+        { ahc_patch0_func, 619, 1, 1 },
+        { ahc_patch19_func, 623, 10, 3 },
+        { ahc_patch5_func, 625, 8, 1 },
+        { ahc_patch0_func, 633, 9, 2 },
+        { ahc_patch5_func, 634, 8, 1 },
+        { ahc_patch4_func, 644, 1, 2 },
+        { ahc_patch0_func, 645, 1, 1 },
+        { ahc_patch19_func, 646, 1, 2 },
+        { ahc_patch0_func, 647, 3, 2 },
+        { ahc_patch4_func, 649, 1, 1 },
+        { ahc_patch5_func, 650, 1, 1 },
+        { ahc_patch5_func, 653, 1, 1 },
+        { ahc_patch5_func, 655, 1, 1 },
+        { ahc_patch4_func, 657, 2, 2 },
+        { ahc_patch0_func, 659, 2, 1 },
+        { ahc_patch5_func, 661, 1, 1 },
+        { ahc_patch5_func, 664, 1, 1 },
+        { ahc_patch5_func, 667, 1, 1 },
+        { ahc_patch19_func, 671, 1, 1 },
+        { ahc_patch19_func, 674, 1, 1 },
+        { ahc_patch4_func, 680, 1, 1 },
+        { ahc_patch6_func, 683, 1, 2 },
+        { ahc_patch0_func, 684, 1, 1 },
+        { ahc_patch7_func, 696, 16, 1 },
+        { ahc_patch4_func, 712, 20, 1 },
+        { ahc_patch9_func, 733, 4, 2 },
+        { ahc_patch0_func, 737, 4, 1 },
+        { ahc_patch9_func, 741, 4, 2 },
+        { ahc_patch0_func, 745, 3, 1 },
+        { ahc_patch6_func, 751, 1, 1 },
+        { ahc_patch22_func, 753, 14, 1 },
+        { ahc_patch7_func, 767, 3, 1 },
+        { ahc_patch9_func, 779, 24, 8 },
+        { ahc_patch19_func, 783, 1, 2 },
+        { ahc_patch0_func, 784, 1, 1 },
+        { ahc_patch15_func, 789, 4, 2 },
+        { ahc_patch0_func, 793, 7, 3 },
+        { ahc_patch23_func, 793, 5, 2 },
+        { ahc_patch0_func, 798, 2, 1 },
+        { ahc_patch0_func, 803, 42, 3 },
+        { ahc_patch18_func, 815, 18, 2 },
+        { ahc_patch0_func, 833, 1, 1 },
+        { ahc_patch4_func, 857, 1, 1 },
+        { ahc_patch4_func, 858, 3, 2 },
+        { ahc_patch0_func, 861, 1, 1 },
+        { ahc_patch13_func, 862, 3, 1 },
+        { ahc_patch4_func, 865, 12, 1 }
 };
 
 static struct cs {
@@ -1296,11 +1297,11 @@ static struct cs {
 } critical_sections[] = {
         { 11, 18 },
         { 21, 30 },
-        { 711, 727 },
-        { 857, 860 },
-        { 864, 870 },
-        { 872, 874 },
-        { 874, 876 }
+        { 712, 728 },
+        { 858, 861 },
+        { 865, 871 },
+        { 873, 875 },
+        { 875, 877 }
 };
 
 static const int num_critical_sections = sizeof(critical_sections)
diff --git a/drivers/scsi/aic7xxx/aiclib.c b/drivers/scsi/aic7xxx/aiclib.c
index 7c5a6db0e67..828ae3d9a51 100644
--- a/drivers/scsi/aic7xxx/aiclib.c
+++ b/drivers/scsi/aic7xxx/aiclib.c
@@ -30,1382 +30,5 @@
  * $Id$
  */
 
-#include <linux/blkdev.h>
-#include <linux/delay.h>
-#include <linux/version.h>
-
-/* Core SCSI definitions */
-#include <scsi/scsi_host.h>
 #include "aiclib.h"
-#include "cam.h"
-
-#ifndef FALSE
-#define FALSE   0
-#endif /* FALSE */
-#ifndef TRUE
-#define TRUE    1
-#endif /* TRUE */
-#ifndef ERESTART
-#define ERESTART        -1              /* restart syscall */
-#endif
-#ifndef EJUSTRETURN
-#define EJUSTRETURN     -2              /* don't modify regs, just return */
-#endif
-
-static int      ascentrycomp(const void *key, const void *member);
-static int      senseentrycomp(const void *key, const void *member);
-static void     fetchtableentries(int sense_key, int asc, int ascq,
-                                  struct scsi_inquiry_data *,
-                                  const struct sense_key_table_entry **,
-                                  const struct asc_table_entry **);
-static void *   scsibsearch(const void *key, const void *base, size_t nmemb,
-                            size_t size,
-                            int (*compar)(const void *, const void *));
-typedef int (cam_quirkmatch_t)(caddr_t, caddr_t);
-static int      cam_strmatch(const u_int8_t *str, const u_int8_t *pattern,
-                             int str_len);
-static caddr_t  cam_quirkmatch(caddr_t target, caddr_t quirk_table,
-                               int num_entries, int entry_size,
-                               cam_quirkmatch_t *comp_func);
-
-#define SCSI_NO_SENSE_STRINGS 1
-#if !defined(SCSI_NO_SENSE_STRINGS)
-#define SST(asc, ascq, action, desc) \
-        asc, ascq, action, desc
-#else 
-static const char empty_string[] = "";
-
-#define SST(asc, ascq, action, desc) \
-        asc, ascq, action, empty_string
-#endif 
-
-static const struct sense_key_table_entry sense_key_table[] = 
-{
-        { SSD_KEY_NO_SENSE, SS_NOP, "NO SENSE" },
-        { SSD_KEY_RECOVERED_ERROR, SS_NOP|SSQ_PRINT_SENSE, "RECOVERED ERROR" },
-        {
-          SSD_KEY_NOT_READY, SS_TUR|SSQ_MANY|SSQ_DECREMENT_COUNT|EBUSY,
-          "NOT READY"
-        },
-        { SSD_KEY_MEDIUM_ERROR, SS_RDEF, "MEDIUM ERROR" },
-        { SSD_KEY_HARDWARE_ERROR, SS_RDEF, "HARDWARE FAILURE" },
-        { SSD_KEY_ILLEGAL_REQUEST, SS_FATAL|EINVAL, "ILLEGAL REQUEST" },
-        { SSD_KEY_UNIT_ATTENTION, SS_FATAL|ENXIO, "UNIT ATTENTION" },
-        { SSD_KEY_DATA_PROTECT, SS_FATAL|EACCES, "DATA PROTECT" },
-        { SSD_KEY_BLANK_CHECK, SS_FATAL|ENOSPC, "BLANK CHECK" },
-        { SSD_KEY_Vendor_Specific, SS_FATAL|EIO, "Vendor Specific" },
-        { SSD_KEY_COPY_ABORTED, SS_FATAL|EIO, "COPY ABORTED" },
-        { SSD_KEY_ABORTED_COMMAND, SS_RDEF, "ABORTED COMMAND" },
-        { SSD_KEY_EQUAL, SS_NOP, "EQUAL" },
-        { SSD_KEY_VOLUME_OVERFLOW, SS_FATAL|EIO, "VOLUME OVERFLOW" },
-        { SSD_KEY_MISCOMPARE, SS_NOP, "MISCOMPARE" },
-        { SSD_KEY_RESERVED, SS_FATAL|EIO, "RESERVED" }
-};
-
-static const int sense_key_table_size =
-    sizeof(sense_key_table)/sizeof(sense_key_table[0]);
-
-static struct asc_table_entry quantum_fireball_entries[] = {
-        {SST(0x04, 0x0b, SS_START|SSQ_DECREMENT_COUNT|ENXIO, 
-             "Logical unit not ready, initializing cmd. required")}
-};
-
-static struct asc_table_entry sony_mo_entries[] = {
-        {SST(0x04, 0x00, SS_START|SSQ_DECREMENT_COUNT|ENXIO,
-             "Logical unit not ready, cause not reportable")}
-};
-
-static struct scsi_sense_quirk_entry sense_quirk_table[] = {
-        {
-                /*
-                 * The Quantum Fireball ST and SE like to return 0x04 0x0b when
-                 * they really should return 0x04 0x02.  0x04,0x0b isn't
-                 * defined in any SCSI spec, and it isn't mentioned in the
-                 * hardware manual for these drives.
-                 */
-                {T_DIRECT, SIP_MEDIA_FIXED, "QUANTUM", "FIREBALL S*", "*"},
-                /*num_sense_keys*/0,
-                sizeof(quantum_fireball_entries)/sizeof(struct asc_table_entry),
-                /*sense key entries*/NULL,
-                quantum_fireball_entries
-        },
-        {
-                /*
-                 * This Sony MO drive likes to return 0x04, 0x00 when it
-                 * isn't spun up.
-                 */
-                {T_DIRECT, SIP_MEDIA_REMOVABLE, "SONY", "SMO-*", "*"},
-                /*num_sense_keys*/0,
-                sizeof(sony_mo_entries)/sizeof(struct asc_table_entry),
-                /*sense key entries*/NULL,
-                sony_mo_entries
-        }
-};
-
-static const int sense_quirk_table_size =
-    sizeof(sense_quirk_table)/sizeof(sense_quirk_table[0]);
-
-static struct asc_table_entry asc_table[] = {
-/*
- * From File: ASC-NUM.TXT
- * SCSI ASC/ASCQ Assignments
- * Numeric Sorted Listing
- * as of  5/12/97
- *
- * D - DIRECT ACCESS DEVICE (SBC)                     device column key
- * .T - SEQUENTIAL ACCESS DEVICE (SSC)               -------------------
- * . L - PRINTER DEVICE (SSC)                           blank = reserved
- * .  P - PROCESSOR DEVICE (SPC)                     not blank = allowed
- * .  .W - WRITE ONCE READ MULTIPLE DEVICE (SBC)
- * .  . R - CD DEVICE (MMC)
- * .  .  S - SCANNER DEVICE (SGC)
- * .  .  .O - OPTICAL MEMORY DEVICE (SBC)
- * .  .  . M - MEDIA CHANGER DEVICE (SMC)
- * .  .  .  C - COMMUNICATION DEVICE (SSC)
- * .  .  .  .A - STORAGE ARRAY DEVICE (SCC)
- * .  .  .  . E - ENCLOSURE SERVICES DEVICE (SES)
- * DTLPWRSOMCAE        ASC   ASCQ  Action  Description
- * ------------        ----  ----  ------  -----------------------------------*/
-/* DTLPWRSOMCAE */{SST(0x00, 0x00, SS_NOP,
-                        "No additional sense information") },
-/*  T    S      */{SST(0x00, 0x01, SS_RDEF,
-                        "Filemark detected") },
-/*  T    S      */{SST(0x00, 0x02, SS_RDEF,
-                        "End-of-partition/medium detected") },
-/*  T           */{SST(0x00, 0x03, SS_RDEF,
-                        "Setmark detected") },
-/*  T    S      */{SST(0x00, 0x04, SS_RDEF,
-                        "Beginning-of-partition/medium detected") },
-/*  T    S      */{SST(0x00, 0x05, SS_RDEF,
-                        "End-of-data detected") },
-/* DTLPWRSOMCAE */{SST(0x00, 0x06, SS_RDEF,
-                        "I/O process terminated") },
-/*      R       */{SST(0x00, 0x11, SS_FATAL|EBUSY,
-                        "Audio play operation in progress") },
-/*      R       */{SST(0x00, 0x12, SS_NOP,
-                        "Audio play operation paused") },
-/*      R       */{SST(0x00, 0x13, SS_NOP,
-                        "Audio play operation successfully completed") },
-/*      R       */{SST(0x00, 0x14, SS_RDEF,
-                        "Audio play operation stopped due to error") },
-/*      R       */{SST(0x00, 0x15, SS_NOP,
-                        "No current audio status to return") },
-/* DTLPWRSOMCAE */{SST(0x00, 0x16, SS_FATAL|EBUSY,
-                        "Operation in progress") },
-/* DTL WRSOM AE */{SST(0x00, 0x17, SS_RDEF,
-                        "Cleaning requested") },
-/* D   W  O     */{SST(0x01, 0x00, SS_RDEF,
-                        "No index/sector signal") },
-/* D   WR OM    */{SST(0x02, 0x00, SS_RDEF,
-                        "No seek complete") },
-/* DTL W SO     */{SST(0x03, 0x00, SS_RDEF,
-                        "Peripheral device write fault") },
-/*  T           */{SST(0x03, 0x01, SS_RDEF,
-                        "No write current") },
-/*  T           */{SST(0x03, 0x02, SS_RDEF,
-                        "Excessive write errors") },
-/* DTLPWRSOMCAE */{SST(0x04, 0x00,
-                        SS_TUR|SSQ_DELAY|SSQ_MANY|SSQ_DECREMENT_COUNT|EIO,
-                        "Logical unit not ready, cause not reportable") },
-/* DTLPWRSOMCAE */{SST(0x04, 0x01,
-                        SS_TUR|SSQ_DELAY|SSQ_MANY|SSQ_DECREMENT_COUNT|EBUSY,
-                        "Logical unit is in process of becoming ready") },
-/* DTLPWRSOMCAE */{SST(0x04, 0x02, SS_START|SSQ_DECREMENT_COUNT|ENXIO,
-                        "Logical unit not ready, initializing cmd. required") },
-/* DTLPWRSOMCAE */{SST(0x04, 0x03, SS_FATAL|ENXIO,
-                        "Logical unit not ready, manual intervention required")},
-/* DTL    O     */{SST(0x04, 0x04, SS_FATAL|EBUSY,
-                        "Logical unit not ready, format in progress") },
-/* DT  W  OMCA  */{SST(0x04, 0x05, SS_FATAL|EBUSY,
-                        "Logical unit not ready, rebuild in progress") },
-/* DT  W  OMCA  */{SST(0x04, 0x06, SS_FATAL|EBUSY,
-                        "Logical unit not ready, recalculation in progress") },
-/* DTLPWRSOMCAE */{SST(0x04, 0x07, SS_FATAL|EBUSY,
-                        "Logical unit not ready, operation in progress") },
-/*      R       */{SST(0x04, 0x08, SS_FATAL|EBUSY,
-                        "Logical unit not ready, long write in progress") },
-/* DTL WRSOMCAE */{SST(0x05, 0x00, SS_RDEF,
-                        "Logical unit does not respond to selection") },
-/* D   WR OM    */{SST(0x06, 0x00, SS_RDEF,
-                        "No reference position found") },
-/* DTL WRSOM    */{SST(0x07, 0x00, SS_RDEF,
-                        "Multiple peripheral devices selected") },
-/* DTL WRSOMCAE */{SST(0x08, 0x00, SS_RDEF,
-                        "Logical unit communication failure") },
-/* DTL WRSOMCAE */{SST(0x08, 0x01, SS_RDEF,
-                        "Logical unit communication time-out") },
-/* DTL WRSOMCAE */{SST(0x08, 0x02, SS_RDEF,
-                        "Logical unit communication parity error") },
-/* DT   R OM    */{SST(0x08, 0x03, SS_RDEF,
-                        "Logical unit communication crc error (ultra-dma/32)")},
-/* DT  WR O     */{SST(0x09, 0x00, SS_RDEF,
-                        "Track following error") },
-/*     WR O     */{SST(0x09, 0x01, SS_RDEF,
-                        "Tracking servo failure") },
-/*     WR O     */{SST(0x09, 0x02, SS_RDEF,
-                        "Focus servo failure") },
-/*     WR O     */{SST(0x09, 0x03, SS_RDEF,
-                        "Spindle servo failure") },
-/* DT  WR O     */{SST(0x09, 0x04, SS_RDEF,
-                        "Head select fault") },
-/* DTLPWRSOMCAE */{SST(0x0A, 0x00, SS_FATAL|ENOSPC,
-                        "Error log overflow") },
-/* DTLPWRSOMCAE */{SST(0x0B, 0x00, SS_RDEF,
-                        "Warning") },
-/* DTLPWRSOMCAE */{SST(0x0B, 0x01, SS_RDEF,
-                        "Specified temperature exceeded") },
-/* DTLPWRSOMCAE */{SST(0x0B, 0x02, SS_RDEF,
-                        "Enclosure degraded") },
-/*  T   RS      */{SST(0x0C, 0x00, SS_RDEF,
-                        "Write error") },
-/* D   W  O     */{SST(0x0C, 0x01, SS_NOP|SSQ_PRINT_SENSE,
-                        "Write error - recovered with auto reallocation") },
-/* D   W  O     */{SST(0x0C, 0x02, SS_RDEF,
-                        "Write error - auto reallocation failed") },
-/* D   W  O     */{SST(0x0C, 0x03, SS_RDEF,
-                        "Write error - recommend reassignment") },
-/* DT  W  O     */{SST(0x0C, 0x04, SS_RDEF,
-                        "Compression check miscompare error") },
-/* DT  W  O     */{SST(0x0C, 0x05, SS_RDEF,
-                        "Data expansion occurred during compression") },
-/* DT  W  O     */{SST(0x0C, 0x06, SS_RDEF,
-                        "Block not compressible") },
-/*      R       */{SST(0x0C, 0x07, SS_RDEF,
-                        "Write error - recovery needed") },
-/*      R       */{SST(0x0C, 0x08, SS_RDEF,
-                        "Write error - recovery failed") },
-/*      R       */{SST(0x0C, 0x09, SS_RDEF,
-                        "Write error - loss of streaming") },
-/*      R       */{SST(0x0C, 0x0A, SS_RDEF,
-                        "Write error - padding blocks added") },
-/* D   W  O     */{SST(0x10, 0x00, SS_RDEF,
-                        "ID CRC or ECC error") },
-/* DT  WRSO     */{SST(0x11, 0x00, SS_RDEF,
-                        "Unrecovered read error") },
-/* DT  W SO     */{SST(0x11, 0x01, SS_RDEF,
-                        "Read retries exhausted") },
-/* DT  W SO     */{SST(0x11, 0x02, SS_RDEF,
-                        "Error too long to correct") },
-/* DT  W SO     */{SST(0x11, 0x03, SS_RDEF,
-                        "Multiple read errors") },
-/* D   W  O     */{SST(0x11, 0x04, SS_RDEF,
-                        "Unrecovered read error - auto reallocate failed") },
-/*     WR O     */{SST(0x11, 0x05, SS_RDEF,
-                        "L-EC uncorrectable error") },
-/*     WR O     */{SST(0x11, 0x06, SS_RDEF,
-                        "CIRC unrecovered error") },
-/*     W  O     */{SST(0x11, 0x07, SS_RDEF,
-                        "Data re-synchronization error") },
-/*  T           */{SST(0x11, 0x08, SS_RDEF,
-                        "Incomplete block read") },
-/*  T           */{SST(0x11, 0x09, SS_RDEF,
-                        "No gap found") },
-/* DT     O     */{SST(0x11, 0x0A, SS_RDEF,
-                        "Miscorrected error") },
-/* D   W  O     */{SST(0x11, 0x0B, SS_RDEF,
-                        "Unrecovered read error - recommend reassignment") },
-/* D   W  O     */{SST(0x11, 0x0C, SS_RDEF,
-                        "Unrecovered read error - recommend rewrite the data")},
-/* DT  WR O     */{SST(0x11, 0x0D, SS_RDEF,
-                        "De-compression CRC error") },
-/* DT  WR O     */{SST(0x11, 0x0E, SS_RDEF,
-                        "Cannot decompress using declared algorithm") },
-/*      R       */{SST(0x11, 0x0F, SS_RDEF,
-                        "Error reading UPC/EAN number") },
-/*      R       */{SST(0x11, 0x10, SS_RDEF,
-                        "Error reading ISRC number") },
-/*      R       */{SST(0x11, 0x11, SS_RDEF,
-                        "Read error - loss of streaming") },
-/* D   W  O     */{SST(0x12, 0x00, SS_RDEF,
-                        "Address mark not found for id field") },
-/* D   W  O     */{SST(0x13, 0x00, SS_RDEF,
-                        "Address mark not found for data field") },
-/* DTL WRSO     */{SST(0x14, 0x00, SS_RDEF,
-                        "Recorded entity not found") },
-/* DT  WR O     */{SST(0x14, 0x01, SS_RDEF,
-                        "Record not found") },
-/*  T           */{SST(0x14, 0x02, SS_RDEF,
-                        "Filemark or setmark not found") },
-/*  T           */{SST(0x14, 0x03, SS_RDEF,
-                        "End-of-data not found") },
-/*  T           */{SST(0x14, 0x04, SS_RDEF,
-                        "Block sequence error") },
-/* DT  W  O     */{SST(0x14, 0x05, SS_RDEF,
-                        "Record not found - recommend reassignment") },
-/* DT  W  O     */{SST(0x14, 0x06, SS_RDEF,
-                        "Record not found - data auto-reallocated") },
-/* DTL WRSOM    */{SST(0x15, 0x00, SS_RDEF,
-                        "Random positioning error") },
-/* DTL WRSOM    */{SST(0x15, 0x01, SS_RDEF,
-                        "Mechanical positioning error") },
-/* DT  WR O     */{SST(0x15, 0x02, SS_RDEF,
-                        "Positioning error detected by read of medium") },
-/* D   W  O     */{SST(0x16, 0x00, SS_RDEF,
-                        "Data synchronization mark error") },
-/* D   W  O     */{SST(0x16, 0x01, SS_RDEF,
-                        "Data sync error - data rewritten") },
-/* D   W  O     */{SST(0x16, 0x02, SS_RDEF,
-                        "Data sync error - recommend rewrite") },
-/* D   W  O     */{SST(0x16, 0x03, SS_NOP|SSQ_PRINT_SENSE,
-                        "Data sync error - data auto-reallocated") },
-/* D   W  O     */{SST(0x16, 0x04, SS_RDEF,
-                        "Data sync error - recommend reassignment") },
-/* DT  WRSO     */{SST(0x17, 0x00, SS_NOP|SSQ_PRINT_SENSE,
-                        "Recovered data with no error correction applied") },
-/* DT  WRSO     */{SST(0x17, 0x01, SS_NOP|SSQ_PRINT_SENSE,
-                        "Recovered data with retries") },
-/* DT  WR O     */{SST(0x17, 0x02, SS_NOP|SSQ_PRINT_SENSE,
-                        "Recovered data with positive head offset") },
-/* DT  WR O     */{SST(0x17, 0x03, SS_NOP|SSQ_PRINT_SENSE,
-                        "Recovered data with negative head offset") },
-/*     WR O     */{SST(0x17, 0x04, SS_NOP|SSQ_PRINT_SENSE,
-                        "Recovered data with retries and/or CIRC applied") },
-/* D   WR O     */{SST(0x17, 0x05, SS_NOP|SSQ_PRINT_SENSE,
-                        "Recovered data using previous sector id") },
-/* D   W  O     */{SST(0x17, 0x06, SS_NOP|SSQ_PRINT_SENSE,
-                        "Recovered data without ECC - data auto-reallocated") },
-/* D   W  O     */{SST(0x17, 0x07, SS_NOP|SSQ_PRINT_SENSE,
-                        "Recovered data without ECC - recommend reassignment")},
-/* D   W  O     */{SST(0x17, 0x08, SS_NOP|SSQ_PRINT_SENSE,
-                        "Recovered data without ECC - recommend rewrite") },
-/* D   W  O     */{SST(0x17, 0x09, SS_NOP|SSQ_PRINT_SENSE,
-                        "Recovered data without ECC - data rewritten") },
-/* D   W  O     */{SST(0x18, 0x00, SS_NOP|SSQ_PRINT_SENSE,
-                        "Recovered data with error correction applied") },
-/* D   WR O     */{SST(0x18, 0x01, SS_NOP|SSQ_PRINT_SENSE,
-                        "Recovered data with error corr. & retries applied") },
-/* D   WR O     */{SST(0x18, 0x02, SS_NOP|SSQ_PRINT_SENSE,
-                        "Recovered data - data auto-reallocated") },
-/*      R       */{SST(0x18, 0x03, SS_NOP|SSQ_PRINT_SENSE,
-                        "Recovered data with CIRC") },
-/*      R       */{SST(0x18, 0x04, SS_NOP|SSQ_PRINT_SENSE,
-                        "Recovered data with L-EC") },
-/* D   WR O     */{SST(0x18, 0x05, SS_NOP|SSQ_PRINT_SENSE,
-                        "Recovered data - recommend reassignment") },
-/* D   WR O     */{SST(0x18, 0x06, SS_NOP|SSQ_PRINT_SENSE,
-                        "Recovered data - recommend rewrite") },
-/* D   W  O     */{SST(0x18, 0x07, SS_NOP|SSQ_PRINT_SENSE,
-                        "Recovered data with ECC - data rewritten") },
-/* D      O     */{SST(0x19, 0x00, SS_RDEF,
-                        "Defect list error") },
-/* D      O     */{SST(0x19, 0x01, SS_RDEF,
-                        "Defect list not available") },
-/* D      O     */{SST(0x19, 0x02, SS_RDEF,
-                        "Defect list error in primary list") },
-/* D      O     */{SST(0x19, 0x03, SS_RDEF,
-                        "Defect list error in grown list") },
-/* DTLPWRSOMCAE */{SST(0x1A, 0x00, SS_RDEF,
-                        "Parameter list length error") },
-/* DTLPWRSOMCAE */{SST(0x1B, 0x00, SS_RDEF,
-                        "Synchronous data transfer error") },
-/* D      O     */{SST(0x1C, 0x00, SS_RDEF,
-                        "Defect list not found") },
-/* D      O     */{SST(0x1C, 0x01, SS_RDEF,
-                        "Primary defect list not found") },
-/* D      O     */{SST(0x1C, 0x02, SS_RDEF,
-                        "Grown defect list not found") },
-/* D   W  O     */{SST(0x1D, 0x00, SS_FATAL,
-                        "Miscompare during verify operation" )},
-/* D   W  O     */{SST(0x1E, 0x00, SS_NOP|SSQ_PRINT_SENSE,
-                        "Recovered id with ecc correction") },
-/* D      O     */{SST(0x1F, 0x00, SS_RDEF,
-                        "Partial defect list transfer") },
-/* DTLPWRSOMCAE */{SST(0x20, 0x00, SS_FATAL|EINVAL,
-                        "Invalid command operation code") },
-/* DT  WR OM    */{SST(0x21, 0x00, SS_FATAL|EINVAL,
-                        "Logical block address out of range" )},
-/* DT  WR OM    */{SST(0x21, 0x01, SS_FATAL|EINVAL,
-                        "Invalid element address") },
-/* D            */{SST(0x22, 0x00, SS_FATAL|EINVAL,
-                        "Illegal function") }, /* Deprecated. Use 20 00, 24 00, or 26 00 instead */
-/* DTLPWRSOMCAE */{SST(0x24, 0x00, SS_FATAL|EINVAL,
-                        "Invalid field in CDB") },
-/* DTLPWRSOMCAE */{SST(0x25, 0x00, SS_FATAL|ENXIO,
-                        "Logical unit not supported") },
-/* DTLPWRSOMCAE */{SST(0x26, 0x00, SS_FATAL|EINVAL,
-                        "Invalid field in parameter list") },
-/* DTLPWRSOMCAE */{SST(0x26, 0x01, SS_FATAL|EINVAL,
-                        "Parameter not supported") },
-/* DTLPWRSOMCAE */{SST(0x26, 0x02, SS_FATAL|EINVAL,
-                        "Parameter value invalid") },
-/* DTLPWRSOMCAE */{SST(0x26, 0x03, SS_FATAL|EINVAL,
-                        "Threshold parameters not supported") },
-/* DTLPWRSOMCAE */{SST(0x26, 0x04, SS_FATAL|EINVAL,
-                        "Invalid release of active persistent reservation") },
-/* DT  W  O     */{SST(0x27, 0x00, SS_FATAL|EACCES,
-                        "Write protected") },
-/* DT  W  O     */{SST(0x27, 0x01, SS_FATAL|EACCES,
-                        "Hardware write protected") },
-/* DT  W  O     */{SST(0x27, 0x02, SS_FATAL|EACCES,
-                        "Logical unit software write protected") },
-/*  T           */{SST(0x27, 0x03, SS_FATAL|EACCES,
-                        "Associated write protect") },
-/*  T           */{SST(0x27, 0x04, SS_FATAL|EACCES,
-                        "Persistent write protect") },
-/*  T           */{SST(0x27, 0x05, SS_FATAL|EACCES,
-                        "Permanent write protect") },
-/* DTLPWRSOMCAE */{SST(0x28, 0x00, SS_RDEF,
-                        "Not ready to ready change, medium may have changed") },
-/* DTLPWRSOMCAE */{SST(0x28, 0x01, SS_FATAL|ENXIO,
-                        "Import or export element accessed") },
-/*
- * XXX JGibbs - All of these should use the same errno, but I don't think
- * ENXIO is the correct choice.  Should we borrow from the networking
- * errnos?  ECONNRESET anyone?
- */
-/* DTLPWRSOMCAE */{SST(0x29, 0x00, SS_RDEF,
-                        "Power on, reset, or bus device reset occurred") },
-/* DTLPWRSOMCAE */{SST(0x29, 0x01, SS_RDEF,
-                        "Power on occurred") },
-/* DTLPWRSOMCAE */{SST(0x29, 0x02, SS_RDEF,
-                        "Scsi bus reset occurred") },
-/* DTLPWRSOMCAE */{SST(0x29, 0x03, SS_RDEF,
-                        "Bus device reset function occurred") },
-/* DTLPWRSOMCAE */{SST(0x29, 0x04, SS_RDEF,
-                        "Device internal reset") },
-/* DTLPWRSOMCAE */{SST(0x29, 0x05, SS_RDEF,
-                        "Transceiver mode changed to single-ended") },
-/* DTLPWRSOMCAE */{SST(0x29, 0x06, SS_RDEF,
-                        "Transceiver mode changed to LVD") },
-/* DTL WRSOMCAE */{SST(0x2A, 0x00, SS_RDEF,
-                        "Parameters changed") },
-/* DTL WRSOMCAE */{SST(0x2A, 0x01, SS_RDEF,
-                        "Mode parameters changed") },
-/* DTL WRSOMCAE */{SST(0x2A, 0x02, SS_RDEF,
-                        "Log parameters changed") },
-/* DTLPWRSOMCAE */{SST(0x2A, 0x03, SS_RDEF,
-                        "Reservations preempted") },
-/* DTLPWRSO C   */{SST(0x2B, 0x00, SS_RDEF,
-                        "Copy cannot execute since host cannot disconnect") },
-/* DTLPWRSOMCAE */{SST(0x2C, 0x00, SS_RDEF,
-                        "Command sequence error") },
-/*       S      */{SST(0x2C, 0x01, SS_RDEF,
-                        "Too many windows specified") },
-/*       S      */{SST(0x2C, 0x02, SS_RDEF,
-                        "Invalid combination of windows specified") },
-/*      R       */{SST(0x2C, 0x03, SS_RDEF,
-                        "Current program area is not empty") },
-/*      R       */{SST(0x2C, 0x04, SS_RDEF,
-                        "Current program area is empty") },
-/*  T           */{SST(0x2D, 0x00, SS_RDEF,
-                        "Overwrite error on update in place") },
-/* DTLPWRSOMCAE */{SST(0x2F, 0x00, SS_RDEF,
-                        "Commands cleared by another initiator") },
-/* DT  WR OM    */{SST(0x30, 0x00, SS_RDEF,
-                        "Incompatible medium installed") },
-/* DT  WR O     */{SST(0x30, 0x01, SS_RDEF,
-                        "Cannot read medium - unknown format") },
-/* DT  WR O     */{SST(0x30, 0x02, SS_RDEF,
-                        "Cannot read medium - incompatible format") },
-/* DT           */{SST(0x30, 0x03, SS_RDEF,
-                        "Cleaning cartridge installed") },
-/* DT  WR O     */{SST(0x30, 0x04, SS_RDEF,
-                        "Cannot write medium - unknown format") },
-/* DT  WR O     */{SST(0x30, 0x05, SS_RDEF,
-                        "Cannot write medium - incompatible format") },
-/* DT  W  O     */{SST(0x30, 0x06, SS_RDEF,
-                        "Cannot format medium - incompatible medium") },
-/* DTL WRSOM AE */{SST(0x30, 0x07, SS_RDEF,
-                        "Cleaning failure") },
-/*      R       */{SST(0x30, 0x08, SS_RDEF,
-                        "Cannot write - application code mismatch") },
-/*      R       */{SST(0x30, 0x09, SS_RDEF,
-                        "Current session not fixated for append") },
-/* DT  WR O     */{SST(0x31, 0x00, SS_RDEF,
-                        "Medium format corrupted") },
-/* D L  R O     */{SST(0x31, 0x01, SS_RDEF,
-                        "Format command failed") },
-/* D   W  O     */{SST(0x32, 0x00, SS_RDEF,
-                        "No defect spare location available") },
-/* D   W  O     */{SST(0x32, 0x01, SS_RDEF,
-                        "Defect list update failure") },
-/*  T           */{SST(0x33, 0x00, SS_RDEF,
-                        "Tape length error") },
-/* DTLPWRSOMCAE */{SST(0x34, 0x00, SS_RDEF,
-                        "Enclosure failure") },
-/* DTLPWRSOMCAE */{SST(0x35, 0x00, SS_RDEF,
-                        "Enclosure services failure") },
-/* DTLPWRSOMCAE */{SST(0x35, 0x01, SS_RDEF,
-                        "Unsupported enclosure function") },
-/* DTLPWRSOMCAE */{SST(0x35, 0x02, SS_RDEF,
-                        "Enclosure services unavailable") },
-/* DTLPWRSOMCAE */{SST(0x35, 0x03, SS_RDEF,
-                        "Enclosure services transfer failure") },
-/* DTLPWRSOMCAE */{SST(0x35, 0x04, SS_RDEF,
-                        "Enclosure services transfer refused") },
-/*   L          */{SST(0x36, 0x00, SS_RDEF,
-                        "Ribbon, ink, or toner failure") },
-/* DTL WRSOMCAE */{SST(0x37, 0x00, SS_RDEF,
-                        "Rounded parameter") },
-/* DTL WRSOMCAE */{SST(0x39, 0x00, SS_RDEF,
-                        "Saving parameters not supported") },
-/* DTL WRSOM    */{SST(0x3A, 0x00, SS_NOP,
-                        "Medium not present") },
-/* DT  WR OM    */{SST(0x3A, 0x01, SS_NOP,
-                        "Medium not present - tray closed") },
-/* DT  WR OM    */{SST(0x3A, 0x01, SS_NOP,
-                        "Medium not present - tray open") },
-/* DT  WR OM    */{SST(0x3A, 0x03, SS_NOP,
-                        "Medium not present - Loadable") },
-/* DT  WR OM    */{SST(0x3A, 0x04, SS_NOP,
-                        "Medium not present - medium auxiliary "
-                        "memory accessible") },
-/* DT  WR OM    */{SST(0x3A, 0xFF, SS_NOP, NULL) },/* Range 0x05->0xFF */
-/*  TL          */{SST(0x3B, 0x00, SS_RDEF,
-                        "Sequential positioning error") },
-/*  T           */{SST(0x3B, 0x01, SS_RDEF,
-                        "Tape position error at beginning-of-medium") },
-/*  T           */{SST(0x3B, 0x02, SS_RDEF,
-                        "Tape position error at end-of-medium") },
-/*   L          */{SST(0x3B, 0x03, SS_RDEF,
-                        "Tape or electronic vertical forms unit not ready") },
-/*   L          */{SST(0x3B, 0x04, SS_RDEF,
-                        "Slew failure") },
-/*   L          */{SST(0x3B, 0x05, SS_RDEF,
-                        "Paper jam") },
-/*   L          */{SST(0x3B, 0x06, SS_RDEF,
-                        "Failed to sense top-of-form") },
-/*   L          */{SST(0x3B, 0x07, SS_RDEF,
-                        "Failed to sense bottom-of-form") },
-/*  T           */{SST(0x3B, 0x08, SS_RDEF,
-                        "Reposition error") },
-/*       S      */{SST(0x3B, 0x09, SS_RDEF,
-                        "Read past end of medium") },
-/*       S      */{SST(0x3B, 0x0A, SS_RDEF,
-                        "Read past beginning of medium") },
-/*       S      */{SST(0x3B, 0x0B, SS_RDEF,
-                        "Position past end of medium") },
-/*  T    S      */{SST(0x3B, 0x0C, SS_RDEF,
-                        "Position past beginning of medium") },
-/* DT  WR OM    */{SST(0x3B, 0x0D, SS_FATAL|ENOSPC,
-                        "Medium destination element full") },
-/* DT  WR OM    */{SST(0x3B, 0x0E, SS_RDEF,
-                        "Medium source element empty") },
-/*      R       */{SST(0x3B, 0x0F, SS_RDEF,
-                        "End of medium reached") },
-/* DT  WR OM    */{SST(0x3B, 0x11, SS_RDEF,
-                        "Medium magazine not accessible") },
-/* DT  WR OM    */{SST(0x3B, 0x12, SS_RDEF,
-                        "Medium magazine removed") },
-/* DT  WR OM    */{SST(0x3B, 0x13, SS_RDEF,
-                        "Medium magazine inserted") },
-/* DT  WR OM    */{SST(0x3B, 0x14, SS_RDEF,
-                        "Medium magazine locked") },
-/* DT  WR OM    */{SST(0x3B, 0x15, SS_RDEF,
-                        "Medium magazine unlocked") },
-/* DTLPWRSOMCAE */{SST(0x3D, 0x00, SS_RDEF,
-                        "Invalid bits in identify message") },
-/* DTLPWRSOMCAE */{SST(0x3E, 0x00, SS_RDEF,
-                        "Logical unit has not self-configured yet") },
-/* DTLPWRSOMCAE */{SST(0x3E, 0x01, SS_RDEF,
-                        "Logical unit failure") },
-/* DTLPWRSOMCAE */{SST(0x3E, 0x02, SS_RDEF,
-                        "Timeout on logical unit") },
-/* DTLPWRSOMCAE */{SST(0x3F, 0x00, SS_RDEF,
-                        "Target operating conditions have changed") },
-/* DTLPWRSOMCAE */{SST(0x3F, 0x01, SS_RDEF,
-                        "Microcode has been changed") },
-/* DTLPWRSOMC   */{SST(0x3F, 0x02, SS_RDEF,
-                        "Changed operating definition") },
-/* DTLPWRSOMCAE */{SST(0x3F, 0x03, SS_INQ_REFRESH|SSQ_DECREMENT_COUNT,
-                        "Inquiry data has changed") },
-/* DT  WR OMCAE */{SST(0x3F, 0x04, SS_RDEF,
-                        "Component device attached") },
-/* DT  WR OMCAE */{SST(0x3F, 0x05, SS_RDEF,
-                        "Device identifier changed") },
-/* DT  WR OMCAE */{SST(0x3F, 0x06, SS_RDEF,
-                        "Redundancy group created or modified") },
-/* DT  WR OMCAE */{SST(0x3F, 0x07, SS_RDEF,
-                        "Redundancy group deleted") },
-/* DT  WR OMCAE */{SST(0x3F, 0x08, SS_RDEF,
-                        "Spare created or modified") },
-/* DT  WR OMCAE */{SST(0x3F, 0x09, SS_RDEF,
-                        "Spare deleted") },
-/* DT  WR OMCAE */{SST(0x3F, 0x0A, SS_RDEF,
-                        "Volume set created or modified") },
-/* DT  WR OMCAE */{SST(0x3F, 0x0B, SS_RDEF,
-                        "Volume set deleted") },
-/* DT  WR OMCAE */{SST(0x3F, 0x0C, SS_RDEF,
-                        "Volume set deassigned") },
-/* DT  WR OMCAE */{SST(0x3F, 0x0D, SS_RDEF,
-                        "Volume set reassigned") },
-/* DTLPWRSOMCAE */{SST(0x3F, 0x0E, SS_RDEF,
-                        "Reported luns data has changed") },
-/* DTLPWRSOMCAE */{SST(0x3F, 0x0F, SS_RETRY|SSQ_DECREMENT_COUNT
-                                 | SSQ_DELAY_RANDOM|EBUSY,
-                        "Echo buffer overwritten") },
-/* DT  WR OM   B*/{SST(0x3F, 0x0F, SS_RDEF, "Medium Loadable") },
-/* DT  WR OM   B*/{SST(0x3F, 0x0F, SS_RDEF,
-                        "Medium auxiliary memory accessible") },
-/* D            */{SST(0x40, 0x00, SS_RDEF,
-                        "Ram failure") }, /* deprecated - use 40 NN instead */
-/* DTLPWRSOMCAE */{SST(0x40, 0x80, SS_RDEF,
-                        "Diagnostic failure: ASCQ = Component ID") },
-/* DTLPWRSOMCAE */{SST(0x40, 0xFF, SS_RDEF|SSQ_RANGE,
-                        NULL) },/* Range 0x80->0xFF */
-/* D            */{SST(0x41, 0x00, SS_RDEF,
-                        "Data path failure") }, /* deprecated - use 40 NN instead */
-/* D            */{SST(0x42, 0x00, SS_RDEF,
-                        "Power-on or self-test failure") }, /* deprecated - use 40 NN instead */
-/* DTLPWRSOMCAE */{SST(0x43, 0x00, SS_RDEF,
-                        "Message error") },
-/* DTLPWRSOMCAE */{SST(0x44, 0x00, SS_RDEF,
-                        "Internal target failure") },
-/* DTLPWRSOMCAE */{SST(0x45, 0x00, SS_RDEF,
-                        "Select or reselect failure") },
-/* DTLPWRSOMC   */{SST(0x46, 0x00, SS_RDEF,
-                        "Unsuccessful soft reset") },
-/* DTLPWRSOMCAE */{SST(0x47, 0x00, SS_RDEF|SSQ_FALLBACK,
-                        "SCSI parity error") },
-/* DTLPWRSOMCAE */{SST(0x47, 0x01, SS_RDEF|SSQ_FALLBACK,
-                        "Data Phase CRC error detected") },
-/* DTLPWRSOMCAE */{SST(0x47, 0x02, SS_RDEF|SSQ_FALLBACK,
-                        "SCSI parity error detected during ST data phase") },
-/* DTLPWRSOMCAE */{SST(0x47, 0x03, SS_RDEF|SSQ_FALLBACK,
-                        "Information Unit iuCRC error") },
-/* DTLPWRSOMCAE */{SST(0x47, 0x04, SS_RDEF|SSQ_FALLBACK,
-                        "Asynchronous information protection error detected") },
-/* DTLPWRSOMCAE */{SST(0x47, 0x05, SS_RDEF|SSQ_FALLBACK,
-                        "Protocol server CRC error") },
-/* DTLPWRSOMCAE */{SST(0x48, 0x00, SS_RDEF|SSQ_FALLBACK,
-                        "Initiator detected error message received") },
-/* DTLPWRSOMCAE */{SST(0x49, 0x00, SS_RDEF,
-                        "Invalid message error") },
-/* DTLPWRSOMCAE */{SST(0x4A, 0x00, SS_RDEF,
-                        "Command phase error") },
-/* DTLPWRSOMCAE */{SST(0x4B, 0x00, SS_RDEF,
-                        "Data phase error") },
-/* DTLPWRSOMCAE */{SST(0x4C, 0x00, SS_RDEF,
-                        "Logical unit failed self-configuration") },
-/* DTLPWRSOMCAE */{SST(0x4D, 0x00, SS_RDEF,
-                        "Tagged overlapped commands: ASCQ = Queue tag ID") },
-/* DTLPWRSOMCAE */{SST(0x4D, 0xFF, SS_RDEF|SSQ_RANGE,
-                        NULL)}, /* Range 0x00->0xFF */
-/* DTLPWRSOMCAE */{SST(0x4E, 0x00, SS_RDEF,
-                        "Overlapped commands attempted") },
-/*  T           */{SST(0x50, 0x00, SS_RDEF,
-                        "Write append error") },
-/*  T           */{SST(0x50, 0x01, SS_RDEF,
-                        "Write append position error") },
-/*  T           */{SST(0x50, 0x02, SS_RDEF,
-                        "Position error related to timing") },
-/*  T     O     */{SST(0x51, 0x00, SS_RDEF,
-                        "Erase failure") },
-/*  T           */{SST(0x52, 0x00, SS_RDEF,
-                        "Cartridge fault") },
-/* DTL WRSOM    */{SST(0x53, 0x00, SS_RDEF,
-                        "Media load or eject failed") },
-/*  T           */{SST(0x53, 0x01, SS_RDEF,
-                        "Unload tape failure") },
-/* DT  WR OM    */{SST(0x53, 0x02, SS_RDEF,
-                        "Medium removal prevented") },
-/*    P         */{SST(0x54, 0x00, SS_RDEF,
-                        "Scsi to host system interface failure") },
-/*    P         */{SST(0x55, 0x00, SS_RDEF,
-                        "System resource failure") },
-/* D      O     */{SST(0x55, 0x01, SS_FATAL|ENOSPC,
-                        "System buffer full") },
-/*      R       */{SST(0x57, 0x00, SS_RDEF,
-                        "Unable to recover table-of-contents") },
-/*        O     */{SST(0x58, 0x00, SS_RDEF,
-                        "Generation does not exist") },
-/*        O     */{SST(0x59, 0x00, SS_RDEF,
-                        "Updated block read") },
-/* DTLPWRSOM    */{SST(0x5A, 0x00, SS_RDEF,
-                        "Operator request or state change input") },
-/* DT  WR OM    */{SST(0x5A, 0x01, SS_RDEF,
-                        "Operator medium removal request") },
-/* DT  W  O     */{SST(0x5A, 0x02, SS_RDEF,
-                        "Operator selected write protect") },
-/* DT  W  O     */{SST(0x5A, 0x03, SS_RDEF,
-                        "Operator selected write permit") },
-/* DTLPWRSOM    */{SST(0x5B, 0x00, SS_RDEF,
-                        "Log exception") },
-/* DTLPWRSOM    */{SST(0x5B, 0x01, SS_RDEF,
-                        "Threshold condition met") },
-/* DTLPWRSOM    */{SST(0x5B, 0x02, SS_RDEF,
-                        "Log counter at maximum") },
-/* DTLPWRSOM    */{SST(0x5B, 0x03, SS_RDEF,
-                        "Log list codes exhausted") },
-/* D      O     */{SST(0x5C, 0x00, SS_RDEF,
-                        "RPL status change") },
-/* D      O     */{SST(0x5C, 0x01, SS_NOP|SSQ_PRINT_SENSE,
-                        "Spindles synchronized") },
-/* D      O     */{SST(0x5C, 0x02, SS_RDEF,
-                        "Spindles not synchronized") },
-/* DTLPWRSOMCAE */{SST(0x5D, 0x00, SS_RDEF,
-                        "Failure prediction threshold exceeded") },
-/* DTLPWRSOMCAE */{SST(0x5D, 0xFF, SS_RDEF,
-                        "Failure prediction threshold exceeded (false)") },
-/* DTLPWRSO CA  */{SST(0x5E, 0x00, SS_RDEF,
-                        "Low power condition on") },
-/* DTLPWRSO CA  */{SST(0x5E, 0x01, SS_RDEF,
-                        "Idle condition activated by timer") },
-/* DTLPWRSO CA  */{SST(0x5E, 0x02, SS_RDEF,
-                        "Standby condition activated by timer") },
-/* DTLPWRSO CA  */{SST(0x5E, 0x03, SS_RDEF,
-                        "Idle condition activated by command") },
-/* DTLPWRSO CA  */{SST(0x5E, 0x04, SS_RDEF,
-                        "Standby condition activated by command") },
-/*       S      */{SST(0x60, 0x00, SS_RDEF,
-                        "Lamp failure") },
-/*       S      */{SST(0x61, 0x00, SS_RDEF,
-                        "Video acquisition error") },
-/*       S      */{SST(0x61, 0x01, SS_RDEF,
-                        "Unable to acquire video") },
-/*       S      */{SST(0x61, 0x02, SS_RDEF,
-                        "Out of focus") },
-/*       S      */{SST(0x62, 0x00, SS_RDEF,
-                        "Scan head positioning error") },
-/*      R       */{SST(0x63, 0x00, SS_RDEF,
-                        "End of user area encountered on this track") },
-/*      R       */{SST(0x63, 0x01, SS_FATAL|ENOSPC,
-                        "Packet does not fit in available space") },
-/*      R       */{SST(0x64, 0x00, SS_RDEF,
-                        "Illegal mode for this track") },
-/*      R       */{SST(0x64, 0x01, SS_RDEF,
-                        "Invalid packet size") },
-/* DTLPWRSOMCAE */{SST(0x65, 0x00, SS_RDEF,
-                        "Voltage fault") },
-/*       S      */{SST(0x66, 0x00, SS_RDEF,
-                        "Automatic document feeder cover up") },
-/*       S      */{SST(0x66, 0x01, SS_RDEF,
-                        "Automatic document feeder lift up") },
-/*       S      */{SST(0x66, 0x02, SS_RDEF,
-                        "Document jam in automatic document feeder") },
-/*       S      */{SST(0x66, 0x03, SS_RDEF,
-                        "Document miss feed automatic in document feeder") },
-/*           A  */{SST(0x67, 0x00, SS_RDEF,
-                        "Configuration failure") },
-/*           A  */{SST(0x67, 0x01, SS_RDEF,
-                        "Configuration of incapable logical units failed") },
-/*           A  */{SST(0x67, 0x02, SS_RDEF,
-                        "Add logical unit failed") },
-/*           A  */{SST(0x67, 0x03, SS_RDEF,
-                        "Modification of logical unit failed") },
-/*           A  */{SST(0x67, 0x04, SS_RDEF,
-                        "Exchange of logical unit failed") },
-/*           A  */{SST(0x67, 0x05, SS_RDEF,
-                        "Remove of logical unit failed") },
-/*           A  */{SST(0x67, 0x06, SS_RDEF,
-                        "Attachment of logical unit failed") },
-/*           A  */{SST(0x67, 0x07, SS_RDEF,
-                        "Creation of logical unit failed") },
-/*           A  */{SST(0x68, 0x00, SS_RDEF,
-                        "Logical unit not configured") },
-/*           A  */{SST(0x69, 0x00, SS_RDEF,
-                        "Data loss on logical unit") },
-/*           A  */{SST(0x69, 0x01, SS_RDEF,
-                        "Multiple logical unit failures") },
-/*           A  */{SST(0x69, 0x02, SS_RDEF,
-                        "Parity/data mismatch") },
-/*           A  */{SST(0x6A, 0x00, SS_RDEF,
-                        "Informational, refer to log") },
-/*           A  */{SST(0x6B, 0x00, SS_RDEF,
-                        "State change has occurred") },
-/*           A  */{SST(0x6B, 0x01, SS_RDEF,
-                        "Redundancy level got better") },
-/*           A  */{SST(0x6B, 0x02, SS_RDEF,
-                        "Redundancy level got worse") },
-/*           A  */{SST(0x6C, 0x00, SS_RDEF,
-                        "Rebuild failure occurred") },
-/*           A  */{SST(0x6D, 0x00, SS_RDEF,
-                        "Recalculate failure occurred") },
-/*           A  */{SST(0x6E, 0x00, SS_RDEF,
-                        "Command to logical unit failed") },
-/*  T           */{SST(0x70, 0x00, SS_RDEF,
-                        "Decompression exception short: ASCQ = Algorithm ID") },
-/*  T           */{SST(0x70, 0xFF, SS_RDEF|SSQ_RANGE,
-                        NULL) }, /* Range 0x00 -> 0xFF */
-/*  T           */{SST(0x71, 0x00, SS_RDEF,
-                        "Decompression exception long: ASCQ = Algorithm ID") },
-/*  T           */{SST(0x71, 0xFF, SS_RDEF|SSQ_RANGE,
-                        NULL) }, /* Range 0x00 -> 0xFF */       
-/*      R       */{SST(0x72, 0x00, SS_RDEF,
-                        "Session fixation error") },
-/*      R       */{SST(0x72, 0x01, SS_RDEF,
-                        "Session fixation error writing lead-in") },
-/*      R       */{SST(0x72, 0x02, SS_RDEF,
-                        "Session fixation error writing lead-out") },
-/*      R       */{SST(0x72, 0x03, SS_RDEF,
-                        "Session fixation error - incomplete track in session") },
-/*      R       */{SST(0x72, 0x04, SS_RDEF,
-                        "Empty or partially written reserved track") },
-/*      R       */{SST(0x73, 0x00, SS_RDEF,
-                        "CD control error") },
-/*      R       */{SST(0x73, 0x01, SS_RDEF,
-                        "Power calibration area almost full") },
-/*      R       */{SST(0x73, 0x02, SS_FATAL|ENOSPC,
-                        "Power calibration area is full") },
-/*      R       */{SST(0x73, 0x03, SS_RDEF,
-                        "Power calibration area error") },
-/*      R       */{SST(0x73, 0x04, SS_RDEF,
-                        "Program memory area update failure") },
-/*      R       */{SST(0x73, 0x05, SS_RDEF,
-                        "program memory area is full") }
-};
-
-static const int asc_table_size = sizeof(asc_table)/sizeof(asc_table[0]);
-
-struct asc_key
-{
-        int asc;
-        int ascq;
-};
-
-static int
-ascentrycomp(const void *key, const void *member)
-{
-        int asc;
-        int ascq;
-        const struct asc_table_entry *table_entry;
-
-        asc = ((const struct asc_key *)key)->asc;
-        ascq = ((const struct asc_key *)key)->ascq;
-        table_entry = (const struct asc_table_entry *)member;
-
-        if (asc >= table_entry->asc) {
-
-                if (asc > table_entry->asc)
-                        return (1);
-
-                if (ascq <= table_entry->ascq) {
-                        /* Check for ranges */
-                        if (ascq == table_entry->ascq
-                         || ((table_entry->action & SSQ_RANGE) != 0
-                           && ascq >= (table_entry - 1)->ascq))
-                                return (0);
-                        return (-1);
-                }
-                return (1);
-        }
-        return (-1);
-}
-
-static int
-senseentrycomp(const void *key, const void *member)
-{
-        int sense_key;
-        const struct sense_key_table_entry *table_entry;
-
-        sense_key = *((const int *)key);
-        table_entry = (const struct sense_key_table_entry *)member;
-
-        if (sense_key >= table_entry->sense_key) {
-                if (sense_key == table_entry->sense_key)
-                        return (0);
-                return (1);
-        }
-        return (-1);
-}
-
-static void
-fetchtableentries(int sense_key, int asc, int ascq,
-                  struct scsi_inquiry_data *inq_data,
-                  const struct sense_key_table_entry **sense_entry,
-                  const struct asc_table_entry **asc_entry)
-{
-        void *match;
-        const struct asc_table_entry *asc_tables[2];
-        const struct sense_key_table_entry *sense_tables[2];
-        struct asc_key asc_ascq;
-        size_t asc_tables_size[2];
-        size_t sense_tables_size[2];
-        int num_asc_tables;
-        int num_sense_tables;
-        int i;
-
-        /* Default to failure */
-        *sense_entry = NULL;
-        *asc_entry = NULL;
-        match = NULL;
-        if (inq_data != NULL)
-                match = cam_quirkmatch((void *)inq_data,
-                                       (void *)sense_quirk_table,
-                                       sense_quirk_table_size,
-                                       sizeof(*sense_quirk_table),
-                                       aic_inquiry_match);
-
-        if (match != NULL) {
-                struct scsi_sense_quirk_entry *quirk;
-
-                quirk = (struct scsi_sense_quirk_entry *)match;
-                asc_tables[0] = quirk->asc_info;
-                asc_tables_size[0] = quirk->num_ascs;
-                asc_tables[1] = asc_table;
-                asc_tables_size[1] = asc_table_size;
-                num_asc_tables = 2;
-                sense_tables[0] = quirk->sense_key_info;
-                sense_tables_size[0] = quirk->num_sense_keys;
-                sense_tables[1] = sense_key_table;
-                sense_tables_size[1] = sense_key_table_size;
-                num_sense_tables = 2;
-        } else {
-                asc_tables[0] = asc_table;
-                asc_tables_size[0] = asc_table_size;
-                num_asc_tables = 1;
-                sense_tables[0] = sense_key_table;
-                sense_tables_size[0] = sense_key_table_size;
-                num_sense_tables = 1;
-        }
-
-        asc_ascq.asc = asc;
-        asc_ascq.ascq = ascq;
-        for (i = 0; i < num_asc_tables; i++) {
-                void *found_entry;
-
-                found_entry = scsibsearch(&asc_ascq, asc_tables[i],
-                                          asc_tables_size[i],
-                                          sizeof(**asc_tables),
-                                          ascentrycomp);
-
-                if (found_entry) {
-                        *asc_entry = (struct asc_table_entry *)found_entry;
-                        break;
-                }
-        }
-
-        for (i = 0; i < num_sense_tables; i++) {
-                void *found_entry;
-
-                found_entry = scsibsearch(&sense_key, sense_tables[i],
-                                          sense_tables_size[i],
-                                          sizeof(**sense_tables),
-                                          senseentrycomp);
-
-                if (found_entry) {
-                        *sense_entry =
-                            (struct sense_key_table_entry *)found_entry;
-                        break;
-                }
-        }
-}
-
-static void *
-scsibsearch(const void *key, const void *base, size_t nmemb, size_t size,
-                 int (*compar)(const void *, const void *))
-{
-        const void *entry;
-        u_int l;
-        u_int u;
-        u_int m;
-
-        l = -1;
-        u = nmemb;
-        while (l + 1 != u) {
-                m = (l + u) / 2;
-                entry = base + m * size;
-                if (compar(key, entry) > 0)
-                        l = m;
-                else
-                        u = m;
-        }
-
-        entry = base + u * size;
-        if (u == nmemb
-         || compar(key, entry) != 0)
-                return (NULL);
-
-        return ((void *)entry);
-}
-
-/*
- * Compare string with pattern, returning 0 on match.
- * Short pattern matches trailing blanks in name,
- * wildcard '*' in pattern matches rest of name,
- * wildcard '?' matches a single non-space character.
- */
-static int
-cam_strmatch(const uint8_t *str, const uint8_t *pattern, int str_len)
-{
-
-        while (*pattern != '\0'&& str_len > 0) {  
-
-                if (*pattern == '*') {
-                        return (0);
-                }
-                if ((*pattern != *str)
-                 && (*pattern != '?' || *str == ' ')) {
-                        return (1);
-                }
-                pattern++;
-                str++;
-                str_len--;
-        }
-        while (str_len > 0 && *str++ == ' ')
-                str_len--;
-
-        return (str_len);
-}
-
-static caddr_t
-cam_quirkmatch(caddr_t target, caddr_t quirk_table, int num_entries,
-               int entry_size, cam_quirkmatch_t *comp_func)
-{
-        for (; num_entries > 0; num_entries--, quirk_table += entry_size) {
-                if ((*comp_func)(target, quirk_table) == 0)
-                        return (quirk_table);
-        }
-        return (NULL);
-}
-
-void
-aic_sense_desc(int sense_key, int asc, int ascq,
-               struct scsi_inquiry_data *inq_data,
-               const char **sense_key_desc, const char **asc_desc)
-{
-        const struct asc_table_entry *asc_entry;
-        const struct sense_key_table_entry *sense_entry;
-
-        fetchtableentries(sense_key, asc, ascq,
-                          inq_data,
-                          &sense_entry,
-                          &asc_entry);
-
-        *sense_key_desc = sense_entry->desc;
-
-        if (asc_entry != NULL)
-                *asc_desc = asc_entry->desc;
-        else if (asc >= 0x80 && asc <= 0xff)
-                *asc_desc = "Vendor Specific ASC";
-        else if (ascq >= 0x80 && ascq <= 0xff)
-                *asc_desc = "Vendor Specific ASCQ";
-        else
-                *asc_desc = "Reserved ASC/ASCQ pair";
-}
-
-/*
- * Given sense and device type information, return the appropriate action.
- * If we do not understand the specific error as identified by the ASC/ASCQ
- * pair, fall back on the more generic actions derived from the sense key.
- */
-aic_sense_action
-aic_sense_error_action(struct scsi_sense_data *sense_data,
-                       struct scsi_inquiry_data *inq_data, uint32_t sense_flags)
-{
-        const struct asc_table_entry *asc_entry;
-        const struct sense_key_table_entry *sense_entry;
-        int error_code, sense_key, asc, ascq;
-        aic_sense_action action;
-
-        scsi_extract_sense(sense_data, &error_code, &sense_key, &asc, &ascq);
-
-        if (error_code == SSD_DEFERRED_ERROR) {
-                /*
-                 * XXX dufault@FreeBSD.org
-                 * This error doesn't relate to the command associated
-                 * with this request sense.  A deferred error is an error
-                 * for a command that has already returned GOOD status
-                 * (see SCSI2 8.2.14.2).
-                 *
-                 * By my reading of that section, it looks like the current
-                 * command has been cancelled, we should now clean things up
-                 * (hopefully recovering any lost data) and then retry the
-                 * current command.  There are two easy choices, both wrong:
-                 *
-                 * 1. Drop through (like we had been doing), thus treating
-                 *    this as if the error were for the current command and
-                 *    return and stop the current command.
-                 * 
-                 * 2. Issue a retry (like I made it do) thus hopefully
-                 *    recovering the current transfer, and ignoring the
-                 *    fact that we've dropped a command.
-                 *
-                 * These should probably be handled in a device specific
-                 * sense handler or punted back up to a user mode daemon
-                 */
-                action = SS_RETRY|SSQ_DECREMENT_COUNT|SSQ_PRINT_SENSE;
-        } else {
-                fetchtableentries(sense_key, asc, ascq,
-                                  inq_data,
-                                  &sense_entry,
-                                  &asc_entry);
-
-                /*
-                 * Override the 'No additional Sense' entry (0,0)
-                 * with the error action of the sense key.
-                 */
-                if (asc_entry != NULL
-                 && (asc != 0 || ascq != 0))
-                        action = asc_entry->action;
-                else
-                        action = sense_entry->action;
-
-                if (sense_key == SSD_KEY_RECOVERED_ERROR) {
-                        /*
-                         * The action succeeded but the device wants
-                         * the user to know that some recovery action
-                         * was required.
-                         */
-                        action &= ~(SS_MASK|SSQ_MASK|SS_ERRMASK);
-                        action |= SS_NOP|SSQ_PRINT_SENSE;
-                } else if (sense_key == SSD_KEY_ILLEGAL_REQUEST) {
-                        if ((sense_flags & SF_QUIET_IR) != 0)
-                                action &= ~SSQ_PRINT_SENSE;
-                } else if (sense_key == SSD_KEY_UNIT_ATTENTION) {
-                        if ((sense_flags & SF_RETRY_UA) != 0
-                         && (action & SS_MASK) == SS_FAIL) {
-                                action &= ~(SS_MASK|SSQ_MASK);
-                                action |= SS_RETRY|SSQ_DECREMENT_COUNT|
-                                          SSQ_PRINT_SENSE;
-                        }
-                }
-        }
-
-        if ((sense_flags & SF_PRINT_ALWAYS) != 0)
-                action |= SSQ_PRINT_SENSE;
-        else if ((sense_flags & SF_NO_PRINT) != 0)
-                action &= ~SSQ_PRINT_SENSE;
-
-        return (action);
-}
-
-/*      
- * Try make as good a match as possible with
- * available sub drivers
- */
-int
-aic_inquiry_match(caddr_t inqbuffer, caddr_t table_entry)
-{
-        struct scsi_inquiry_pattern *entry;
-        struct scsi_inquiry_data *inq;
- 
-        entry = (struct scsi_inquiry_pattern *)table_entry;
-        inq = (struct scsi_inquiry_data *)inqbuffer;
-
-        if (((SID_TYPE(inq) == entry->type)
-          || (entry->type == T_ANY))
-         && (SID_IS_REMOVABLE(inq) ? entry->media_type & SIP_MEDIA_REMOVABLE
-                                   : entry->media_type & SIP_MEDIA_FIXED)
-         && (cam_strmatch(inq->vendor, entry->vendor, sizeof(inq->vendor)) == 0)
-         && (cam_strmatch(inq->product, entry->product,
-                          sizeof(inq->product)) == 0)
-         && (cam_strmatch(inq->revision, entry->revision,
-                          sizeof(inq->revision)) == 0)) {
-                return (0);
-        }
-        return (-1);
-}
-
-/*
- * Table of syncrates that don't follow the "divisible by 4"
- * rule. This table will be expanded in future SCSI specs.
- */
-static struct {
-        u_int period_factor;
-        u_int period;   /* in 100ths of ns */
-} scsi_syncrates[] = {
-        { 0x08, 625 },  /* FAST-160 */
-        { 0x09, 1250 }, /* FAST-80 */
-        { 0x0a, 2500 }, /* FAST-40 40MHz */
-        { 0x0b, 3030 }, /* FAST-40 33MHz */
-        { 0x0c, 5000 }  /* FAST-20 */
-};
-
-/*
- * Return the frequency in kHz corresponding to the given
- * sync period factor.
- */
-u_int
-aic_calc_syncsrate(u_int period_factor)
-{
-        int i;
-        int num_syncrates;
-
-        num_syncrates = sizeof(scsi_syncrates) / sizeof(scsi_syncrates[0]);
-        /* See if the period is in the "exception" table */
-        for (i = 0; i < num_syncrates; i++) {
-
-                if (period_factor == scsi_syncrates[i].period_factor) {
-                        /* Period in kHz */
-                        return (100000000 / scsi_syncrates[i].period);
-                }
-        }
-
-        /*
-         * Wasn't in the table, so use the standard
-         * 4 times conversion.
-         */
-        return (10000000 / (period_factor * 4 * 10));
-}
-
-/*
- * Return speed in KB/s.
- */
-u_int
-aic_calc_speed(u_int width, u_int period, u_int offset, u_int min_rate)
-{
-        u_int freq;
-
-        if (offset != 0 && period < min_rate)
-                freq  = aic_calc_syncsrate(period);
-        else
-                /* Roughly 3.3MB/s for async */
-                freq  = 3300;
-        freq <<= width;
-        return (freq);
-}
-
-uint32_t
-aic_error_action(struct scsi_cmnd *cmd, struct scsi_inquiry_data *inq_data,
-                 cam_status status, u_int scsi_status)
-{
-        aic_sense_action  err_action;
-        int               sense;
-
-        sense  = (cmd->result >> 24) == DRIVER_SENSE;
-
-        switch (status) {
-        case CAM_REQ_CMP:
-                err_action = SS_NOP;
-                break;
-        case CAM_AUTOSENSE_FAIL:
-        case CAM_SCSI_STATUS_ERROR:
-
-                switch (scsi_status) {
-                case SCSI_STATUS_OK:
-                case SCSI_STATUS_COND_MET:
-                case SCSI_STATUS_INTERMED:
-                case SCSI_STATUS_INTERMED_COND_MET:
-                        err_action = SS_NOP;
-                        break;
-                case SCSI_STATUS_CMD_TERMINATED:
-                case SCSI_STATUS_CHECK_COND:
-                        if (sense != 0) {
-                                struct scsi_sense_data *sense;
-
-                                sense = (struct scsi_sense_data *)
-                                    &cmd->sense_buffer;
-                                err_action =
-                                    aic_sense_error_action(sense, inq_data, 0);
-
-                        } else {
-                                err_action = SS_RETRY|SSQ_FALLBACK
-                                           | SSQ_DECREMENT_COUNT|EIO;
-                        }
-                        break;
-                case SCSI_STATUS_QUEUE_FULL:
-                case SCSI_STATUS_BUSY:
-                        err_action = SS_RETRY|SSQ_DELAY|SSQ_MANY
-                                   | SSQ_DECREMENT_COUNT|EBUSY;
-                        break;
-                case SCSI_STATUS_RESERV_CONFLICT:
-                default:
-                        err_action = SS_FAIL|EBUSY;
-                        break;
-                }
-                break;
-        case CAM_CMD_TIMEOUT:
-        case CAM_REQ_CMP_ERR:
-        case CAM_UNEXP_BUSFREE:
-        case CAM_UNCOR_PARITY:
-        case CAM_DATA_RUN_ERR:
-                err_action = SS_RETRY|SSQ_FALLBACK|EIO;
-                break;
-        case CAM_UA_ABORT:
-        case CAM_UA_TERMIO:
-        case CAM_MSG_REJECT_REC:
-        case CAM_SEL_TIMEOUT:
-                err_action = SS_FAIL|EIO;
-                break;
-        case CAM_REQ_INVALID:
-        case CAM_PATH_INVALID:
-        case CAM_DEV_NOT_THERE:
-        case CAM_NO_HBA:
-        case CAM_PROVIDE_FAIL:
-        case CAM_REQ_TOO_BIG:           
-        case CAM_RESRC_UNAVAIL:
-        case CAM_BUSY:
-        default:
-                /* panic??  These should never occur in our application. */
-                err_action = SS_FAIL|EIO;
-                break;
-        case CAM_SCSI_BUS_RESET:
-        case CAM_BDR_SENT:              
-        case CAM_REQUEUE_REQ:
-                /* Unconditional requeue */
-                err_action = SS_RETRY;
-                break;
-        }
-
-        return (err_action);
-}
-
-char *
-aic_parse_brace_option(char *opt_name, char *opt_arg, char *end, int depth,
-                       aic_option_callback_t *callback, u_long callback_arg)
-{
-        char    *tok_end;
-        char    *tok_end2;
-        int      i;
-        int      instance;
-        int      targ;
-        int      done;
-        char     tok_list[] = {'.', ',', '{', '}', '\0'};
 
-        /* All options use a ':' name/arg separator */
-        if (*opt_arg != ':')
-                return (opt_arg);
-        opt_arg++;
-        instance = -1;
-        targ = -1;
-        done = FALSE;
-        /*
-         * Restore separator that may be in
-         * the middle of our option argument.
-         */
-        tok_end = strchr(opt_arg, '\0');
-        if (tok_end < end)
-                *tok_end = ',';
-        while (!done) {
-                switch (*opt_arg) {
-                case '{':
-                        if (instance == -1) {
-                                instance = 0;
-                        } else {
-                                if (depth > 1) {
-                                        if (targ == -1)
-                                                targ = 0;
-                                } else {
-                                        printf("Malformed Option %s\n",
-                                               opt_name);
-                                        done = TRUE;
-                                }
-                        }
-                        opt_arg++;
-                        break;
-                case '}':
-                        if (targ != -1)
-                                targ = -1;
-                        else if (instance != -1)
-                                instance = -1;
-                        opt_arg++;
-                        break;
-                case ',':
-                case '.':
-                        if (instance == -1)
-                                done = TRUE;
-                        else if (targ >= 0)
-                                targ++;
-                        else if (instance >= 0)
-                                instance++;
-                        opt_arg++;
-                        break;
-                case '\0':
-                        done = TRUE;
-                        break;
-                default:
-                        tok_end = end;
-                        for (i = 0; tok_list[i]; i++) {
-                                tok_end2 = strchr(opt_arg, tok_list[i]);
-                                if ((tok_end2) && (tok_end2 < tok_end))
-                                        tok_end = tok_end2;
-                        }
-                        callback(callback_arg, instance, targ,
-                                 simple_strtol(opt_arg, NULL, 0));
-                        opt_arg = tok_end;
-                        break;
-                }
-        }
-        return (opt_arg);
-}
diff --git a/drivers/scsi/aic7xxx/aiclib.h b/drivers/scsi/aic7xxx/aiclib.h
index bfe6f954d3c..3bfbf0fe1ec 100644
--- a/drivers/scsi/aic7xxx/aiclib.h
+++ b/drivers/scsi/aic7xxx/aiclib.h
@@ -57,121 +57,6 @@
 #ifndef _AICLIB_H
 #define _AICLIB_H
 
-/*
- * Linux Interrupt Support.
- */
-#ifndef IRQ_RETVAL
-typedef void irqreturn_t;
-#define IRQ_RETVAL(x)
-#endif
-
-/*
- * SCSI command format
- */
-
-/*
- * Define dome bits that are in ALL (or a lot of) scsi commands
- */
-#define SCSI_CTL_LINK           0x01
-#define SCSI_CTL_FLAG           0x02
-#define SCSI_CTL_VENDOR         0xC0
-#define SCSI_CMD_LUN            0xA0    /* these two should not be needed */
-#define SCSI_CMD_LUN_SHIFT      5       /* LUN in the cmd is no longer SCSI */
-
-#define SCSI_MAX_CDBLEN         16      /* 
-                                         * 16 byte commands are in the 
-                                         * SCSI-3 spec 
-                                         */
-/* 6byte CDBs special case 0 length to be 256 */
-#define SCSI_CDB6_LEN(len)      ((len) == 0 ? 256 : len)
-
-/*
- * This type defines actions to be taken when a particular sense code is
- * received.  Right now, these flags are only defined to take up 16 bits,
- * but can be expanded in the future if necessary.
- */
-typedef enum {
-        SS_NOP          = 0x000000, /* Do nothing */
-        SS_RETRY        = 0x010000, /* Retry the command */
-        SS_FAIL         = 0x020000, /* Bail out */
-        SS_START        = 0x030000, /* Send a Start Unit command to the device,
-                                     * then retry the original command.
-                                     */
-        SS_TUR          = 0x040000, /* Send a Test Unit Ready command to the
-                                     * device, then retry the original command.
-                                     */
-        SS_REQSENSE     = 0x050000, /* Send a RequestSense command to the
-                                     * device, then retry the original command.
-                                     */
-        SS_INQ_REFRESH  = 0x060000,
-        SS_MASK         = 0xff0000
-} aic_sense_action;
-
-typedef enum {
-        SSQ_NONE                = 0x0000,
-        SSQ_DECREMENT_COUNT     = 0x0100,  /* Decrement the retry count */
-        SSQ_MANY                = 0x0200,  /* send lots of recovery commands */
-        SSQ_RANGE               = 0x0400,  /*
-                                            * This table entry represents the
-                                            * end of a range of ASCQs that
-                                            * have identical error actions
-                                            * and text.
-                                            */
-        SSQ_PRINT_SENSE         = 0x0800,
-        SSQ_DELAY               = 0x1000,  /* Delay before retry. */
-        SSQ_DELAY_RANDOM        = 0x2000,  /* Randomized delay before retry. */
-        SSQ_FALLBACK            = 0x4000,  /* Do a speed fallback to recover */
-        SSQ_MASK                = 0xff00
-} aic_sense_action_qualifier;
-
-/* Mask for error status values */
-#define SS_ERRMASK      0xff
-
-/* The default, retyable, error action */
-#define SS_RDEF         SS_RETRY|SSQ_DECREMENT_COUNT|SSQ_PRINT_SENSE|EIO
-
-/* The retyable, error action, with table specified error code */
-#define SS_RET          SS_RETRY|SSQ_DECREMENT_COUNT|SSQ_PRINT_SENSE
-
-/* Fatal error action, with table specified error code */
-#define SS_FATAL        SS_FAIL|SSQ_PRINT_SENSE
-
-struct scsi_generic
-{
-        uint8_t opcode;
-        uint8_t bytes[11];
-};
-
-struct scsi_request_sense
-{
-        uint8_t opcode;
-        uint8_t byte2;
-        uint8_t unused[2];
-        uint8_t length;
-        uint8_t control;
-};
-
-struct scsi_test_unit_ready
-{
-        uint8_t opcode;
-        uint8_t byte2;
-        uint8_t unused[3];
-        uint8_t control;
-};
-
-struct scsi_send_diag
-{
-        uint8_t opcode;
-        uint8_t byte2;
-#define SSD_UOL         0x01
-#define SSD_DOL         0x02
-#define SSD_SELFTEST    0x04
-#define SSD_PF          0x10
-        uint8_t unused[1];
-        uint8_t paramlen[2];
-        uint8_t control;
-};
-
 struct scsi_sense
 {
         uint8_t opcode;
@@ -181,537 +66,12 @@ struct scsi_sense
         uint8_t control;
 };
 
-struct scsi_inquiry
-{
-        uint8_t opcode;
-        uint8_t byte2;
-#define SI_EVPD 0x01
-        uint8_t page_code;
-        uint8_t reserved;
-        uint8_t length;
-        uint8_t control;
-};
-
-struct scsi_mode_sense_6
-{
-        uint8_t opcode;
-        uint8_t byte2;
-#define SMS_DBD                         0x08
-        uint8_t page;
-#define SMS_PAGE_CODE                   0x3F
-#define SMS_VENDOR_SPECIFIC_PAGE        0x00
-#define SMS_DISCONNECT_RECONNECT_PAGE   0x02
-#define SMS_PERIPHERAL_DEVICE_PAGE      0x09
-#define SMS_CONTROL_MODE_PAGE           0x0A
-#define SMS_ALL_PAGES_PAGE              0x3F
-#define SMS_PAGE_CTRL_MASK              0xC0
-#define SMS_PAGE_CTRL_CURRENT           0x00
-#define SMS_PAGE_CTRL_CHANGEABLE        0x40
-#define SMS_PAGE_CTRL_DEFAULT           0x80
-#define SMS_PAGE_CTRL_SAVED             0xC0
-        uint8_t unused;
-        uint8_t length;
-        uint8_t control;
-};
-
-struct scsi_mode_sense_10
-{
-        uint8_t opcode;
-        uint8_t byte2;          /* same bits as small version */
-        uint8_t page;           /* same bits as small version */
-        uint8_t unused[4];
-        uint8_t length[2];
-        uint8_t control;
-};
-
-struct scsi_mode_select_6
-{
-        uint8_t opcode;
-        uint8_t byte2;
-#define SMS_SP  0x01
-#define SMS_PF  0x10
-        uint8_t unused[2];
-        uint8_t length;
-        uint8_t control;
-};
-
-struct scsi_mode_select_10
-{
-        uint8_t opcode;
-        uint8_t byte2;          /* same bits as small version */
-        uint8_t unused[5];
-        uint8_t length[2];
-        uint8_t control;
-};
-
-/*
- * When sending a mode select to a tape drive, the medium type must be 0.
- */
-struct scsi_mode_hdr_6
-{
-        uint8_t datalen;
-        uint8_t medium_type;
-        uint8_t dev_specific;
-        uint8_t block_descr_len;
-};
-
-struct scsi_mode_hdr_10
-{
-        uint8_t datalen[2];
-        uint8_t medium_type;
-        uint8_t dev_specific;
-        uint8_t reserved[2];
-        uint8_t block_descr_len[2];
-};
-
-struct scsi_mode_block_descr
-{
-        uint8_t density_code;
-        uint8_t num_blocks[3];
-        uint8_t reserved;
-        uint8_t block_len[3];
-};
-
-struct scsi_log_sense
-{
-        uint8_t opcode;
-        uint8_t byte2;
-#define SLS_SP                          0x01
-#define SLS_PPC                         0x02
-        uint8_t page;
-#define SLS_PAGE_CODE                   0x3F
-#define SLS_ALL_PAGES_PAGE              0x00
-#define SLS_OVERRUN_PAGE                0x01
-#define SLS_ERROR_WRITE_PAGE            0x02
-#define SLS_ERROR_READ_PAGE             0x03
-#define SLS_ERROR_READREVERSE_PAGE      0x04
-#define SLS_ERROR_VERIFY_PAGE           0x05
-#define SLS_ERROR_NONMEDIUM_PAGE        0x06
-#define SLS_ERROR_LASTN_PAGE            0x07
-#define SLS_PAGE_CTRL_MASK              0xC0
-#define SLS_PAGE_CTRL_THRESHOLD         0x00
-#define SLS_PAGE_CTRL_CUMULATIVE        0x40
-#define SLS_PAGE_CTRL_THRESH_DEFAULT    0x80
-#define SLS_PAGE_CTRL_CUMUL_DEFAULT     0xC0
-        uint8_t reserved[2];
-        uint8_t paramptr[2];
-        uint8_t length[2];
-        uint8_t control;
-};
-
-struct scsi_log_select
-{
-        uint8_t opcode;
-        uint8_t byte2;
-/*      SLS_SP                          0x01 */
-#define SLS_PCR                         0x02
-        uint8_t page;
-/*      SLS_PAGE_CTRL_MASK              0xC0 */
-/*      SLS_PAGE_CTRL_THRESHOLD         0x00 */
-/*      SLS_PAGE_CTRL_CUMULATIVE        0x40 */
-/*      SLS_PAGE_CTRL_THRESH_DEFAULT    0x80 */
-/*      SLS_PAGE_CTRL_CUMUL_DEFAULT     0xC0 */
-        uint8_t reserved[4];
-        uint8_t length[2];
-        uint8_t control;
-};
-
-struct scsi_log_header
-{
-        uint8_t page;
-        uint8_t reserved;
-        uint8_t datalen[2];
-};
-
-struct scsi_log_param_header {
-        uint8_t param_code[2];
-        uint8_t param_control;
-#define SLP_LP                          0x01
-#define SLP_LBIN                        0x02
-#define SLP_TMC_MASK                    0x0C
-#define SLP_TMC_ALWAYS                  0x00
-#define SLP_TMC_EQUAL                   0x04
-#define SLP_TMC_NOTEQUAL                0x08
-#define SLP_TMC_GREATER                 0x0C
-#define SLP_ETC                         0x10
-#define SLP_TSD                         0x20
-#define SLP_DS                          0x40
-#define SLP_DU                          0x80
-        uint8_t param_len;
-};
-
-struct scsi_control_page {
-        uint8_t page_code;
-        uint8_t page_length;
-        uint8_t rlec;
-#define SCB_RLEC                        0x01    /*Report Log Exception Cond*/
-        uint8_t queue_flags;
-#define SCP_QUEUE_ALG_MASK              0xF0
-#define SCP_QUEUE_ALG_RESTRICTED        0x00
-#define SCP_QUEUE_ALG_UNRESTRICTED      0x10
-#define SCP_QUEUE_ERR                   0x02    /*Queued I/O aborted for CACs*/
-#define SCP_QUEUE_DQUE                  0x01    /*Queued I/O disabled*/
-        uint8_t eca_and_aen;
-#define SCP_EECA                        0x80    /*Enable Extended CA*/
-#define SCP_RAENP                       0x04    /*Ready AEN Permission*/
-#define SCP_UAAENP                      0x02    /*UA AEN Permission*/
-#define SCP_EAENP                       0x01    /*Error AEN Permission*/
-        uint8_t reserved;
-        uint8_t aen_holdoff_period[2];
-};
-
-struct scsi_reserve
-{
-        uint8_t opcode;
-        uint8_t byte2;
-        uint8_t unused[2];
-        uint8_t length;
-        uint8_t control;
-};
-
-struct scsi_release
-{
-        uint8_t opcode;
-        uint8_t byte2;
-        uint8_t unused[2];
-        uint8_t length;
-        uint8_t control;
-};
-
-struct scsi_prevent
-{
-        uint8_t opcode;
-        uint8_t byte2;
-        uint8_t unused[2];
-        uint8_t how;
-        uint8_t control;
-};
-#define PR_PREVENT 0x01
-#define PR_ALLOW   0x00
-
-struct scsi_sync_cache
-{
-        uint8_t opcode;
-        uint8_t byte2;
-        uint8_t begin_lba[4];
-        uint8_t reserved;
-        uint8_t lb_count[2];
-        uint8_t control;        
-};
-
-
-struct scsi_changedef
-{
-        uint8_t opcode;
-        uint8_t byte2;
-        uint8_t unused1;
-        uint8_t how;
-        uint8_t unused[4];
-        uint8_t datalen;
-        uint8_t control;
-};
-
-struct scsi_read_buffer
-{
-        uint8_t opcode;
-        uint8_t byte2;
-#define RWB_MODE                0x07
-#define RWB_MODE_HDR_DATA       0x00
-#define RWB_MODE_DATA           0x02
-#define RWB_MODE_DOWNLOAD       0x04
-#define RWB_MODE_DOWNLOAD_SAVE  0x05
-        uint8_t buffer_id;
-        uint8_t offset[3];
-        uint8_t length[3];
-        uint8_t control;
-};
-
-struct scsi_write_buffer
-{
-        uint8_t opcode;
-        uint8_t byte2;
-        uint8_t buffer_id;
-        uint8_t offset[3];
-        uint8_t length[3];
-        uint8_t control;
-};
-
-struct scsi_rw_6
-{
-        uint8_t opcode;
-        uint8_t addr[3];
-/* only 5 bits are valid in the MSB address byte */
-#define SRW_TOPADDR     0x1F
-        uint8_t length;
-        uint8_t control;
-};
-
-struct scsi_rw_10
-{
-        uint8_t opcode;
-#define SRW10_RELADDR   0x01
-#define SRW10_FUA       0x08
-#define SRW10_DPO       0x10
-        uint8_t byte2;
-        uint8_t addr[4];
-        uint8_t reserved;
-        uint8_t length[2];
-        uint8_t control;
-};
-
-struct scsi_rw_12
-{
-        uint8_t opcode;
-#define SRW12_RELADDR   0x01
-#define SRW12_FUA       0x08
-#define SRW12_DPO       0x10
-        uint8_t byte2;
-        uint8_t addr[4];
-        uint8_t length[4];
-        uint8_t reserved;
-        uint8_t control;
-};
-
-struct scsi_start_stop_unit
-{
-        uint8_t opcode;
-        uint8_t byte2;
-#define SSS_IMMED               0x01
-        uint8_t reserved[2];
-        uint8_t how;
-#define SSS_START               0x01
-#define SSS_LOEJ                0x02
-        uint8_t control;
-};
-
-#define SC_SCSI_1 0x01
-#define SC_SCSI_2 0x03
-
-/*
- * Opcodes
- */
-
-#define TEST_UNIT_READY         0x00
-#define REQUEST_SENSE           0x03
-#define READ_6                  0x08
-#define WRITE_6                 0x0a
-#define INQUIRY                 0x12
-#define MODE_SELECT_6           0x15
-#define MODE_SENSE_6            0x1a
-#define START_STOP_UNIT         0x1b
-#define START_STOP              0x1b
-#define RESERVE                 0x16
-#define RELEASE                 0x17
-#define RECEIVE_DIAGNOSTIC      0x1c
-#define SEND_DIAGNOSTIC         0x1d
-#define PREVENT_ALLOW           0x1e
-#define READ_CAPACITY           0x25
-#define READ_10                 0x28
-#define WRITE_10                0x2a
-#define POSITION_TO_ELEMENT     0x2b
-#define SYNCHRONIZE_CACHE       0x35
-#define WRITE_BUFFER            0x3b
-#define READ_BUFFER             0x3c
-#define CHANGE_DEFINITION       0x40
-#define LOG_SELECT              0x4c
-#define LOG_SENSE               0x4d
-#ifdef XXXCAM
-#define MODE_SENSE_10           0x5A
-#endif
-#define MODE_SELECT_10          0x55
-#define MOVE_MEDIUM             0xa5
-#define READ_12                 0xa8
-#define WRITE_12                0xaa
-#define READ_ELEMENT_STATUS     0xb8
-
-
-/*
- * Device Types
- */
-#define T_DIRECT        0x00
-#define T_SEQUENTIAL    0x01
-#define T_PRINTER       0x02
-#define T_PROCESSOR     0x03
-#define T_WORM          0x04
-#define T_CDROM         0x05
-#define T_SCANNER       0x06
-#define T_OPTICAL       0x07
-#define T_CHANGER       0x08
-#define T_COMM          0x09
-#define T_ASC0          0x0a
-#define T_ASC1          0x0b
-#define T_STORARRAY     0x0c
-#define T_ENCLOSURE     0x0d
-#define T_RBC           0x0e
-#define T_OCRW          0x0f
-#define T_NODEVICE      0x1F
-#define T_ANY           0xFF    /* Used in Quirk table matches */
-
-#define T_REMOV         1
-#define T_FIXED         0
-
-/*
- * This length is the initial inquiry length used by the probe code, as    
- * well as the legnth necessary for aic_print_inquiry() to function 
- * correctly.  If either use requires a different length in the future, 
- * the two values should be de-coupled.
- */
-#define SHORT_INQUIRY_LENGTH    36
-
-struct scsi_inquiry_data
-{
-        uint8_t device;
-#define SID_TYPE(inq_data) ((inq_data)->device & 0x1f)
-#define SID_QUAL(inq_data) (((inq_data)->device & 0xE0) >> 5)
-#define SID_QUAL_LU_CONNECTED   0x00    /*
-                                         * The specified peripheral device
-                                         * type is currently connected to
-                                         * logical unit.  If the target cannot
-                                         * determine whether or not a physical
-                                         * device is currently connected, it
-                                         * shall also use this peripheral
-                                         * qualifier when returning the INQUIRY
-                                         * data.  This peripheral qualifier
-                                         * does not mean that the device is
-                                         * ready for access by the initiator.
-                                         */
-#define SID_QUAL_LU_OFFLINE     0x01    /*
-                                         * The target is capable of supporting
-                                         * the specified peripheral device type
-                                         * on this logical unit; however, the
-                                         * physical device is not currently
-                                         * connected to this logical unit.
-                                         */
-#define SID_QUAL_RSVD           0x02
-#define SID_QUAL_BAD_LU         0x03    /*
-                                         * The target is not capable of
-                                         * supporting a physical device on
-                                         * this logical unit. For this
-                                         * peripheral qualifier the peripheral
-                                         * device type shall be set to 1Fh to
-                                         * provide compatibility with previous
-                                         * versions of SCSI. All other
-                                         * peripheral device type values are
-                                         * reserved for this peripheral
-                                         * qualifier.
-                                         */
-#define SID_QUAL_IS_VENDOR_UNIQUE(inq_data) ((SID_QUAL(inq_data) & 0x08) != 0)
-        uint8_t dev_qual2;
-#define SID_QUAL2       0x7F
-#define SID_IS_REMOVABLE(inq_data) (((inq_data)->dev_qual2 & 0x80) != 0)
-        uint8_t version;
-#define SID_ANSI_REV(inq_data) ((inq_data)->version & 0x07)
 #define         SCSI_REV_0              0
 #define         SCSI_REV_CCS            1
 #define         SCSI_REV_2              2
 #define         SCSI_REV_SPC            3
 #define         SCSI_REV_SPC2           4
 
-#define SID_ECMA        0x38
-#define SID_ISO         0xC0
-        uint8_t response_format;
-#define SID_AENC        0x80
-#define SID_TrmIOP      0x40
-        uint8_t additional_length;
-        uint8_t reserved[2];
-        uint8_t flags;
-#define SID_SftRe       0x01
-#define SID_CmdQue      0x02
-#define SID_Linked      0x08
-#define SID_Sync        0x10
-#define SID_WBus16      0x20
-#define SID_WBus32      0x40
-#define SID_RelAdr      0x80
-#define SID_VENDOR_SIZE   8
-        char     vendor[SID_VENDOR_SIZE];
-#define SID_PRODUCT_SIZE  16
-        char     product[SID_PRODUCT_SIZE];
-#define SID_REVISION_SIZE 4
-        char     revision[SID_REVISION_SIZE];
-        /*
-         * The following fields were taken from SCSI Primary Commands - 2
-         * (SPC-2) Revision 14, Dated 11 November 1999
-         */
-#define SID_VENDOR_SPECIFIC_0_SIZE      20
-        uint8_t vendor_specific0[SID_VENDOR_SPECIFIC_0_SIZE];
-        /*
-         * An extension of SCSI Parallel Specific Values
-         */
-#define SID_SPI_IUS             0x01
-#define SID_SPI_QAS             0x02
-#define SID_SPI_CLOCK_ST        0x00
-#define SID_SPI_CLOCK_DT        0x04
-#define SID_SPI_CLOCK_DT_ST     0x0C
-#define SID_SPI_MASK            0x0F
-        uint8_t spi3data;
-        uint8_t reserved2;
-        /*
-         * Version Descriptors, stored 2 byte values.
-         */
-        uint8_t version1[2];
-        uint8_t version2[2];
-        uint8_t version3[2];
-        uint8_t version4[2];
-        uint8_t version5[2];
-        uint8_t version6[2];
-        uint8_t version7[2];
-        uint8_t version8[2];
-
-        uint8_t reserved3[22];
-
-#define SID_VENDOR_SPECIFIC_1_SIZE      160
-        uint8_t vendor_specific1[SID_VENDOR_SPECIFIC_1_SIZE];
-};
-
-struct scsi_vpd_unit_serial_number
-{
-        uint8_t device;
-        uint8_t page_code;
-#define SVPD_UNIT_SERIAL_NUMBER 0x80
-        uint8_t reserved;
-        uint8_t length; /* serial number length */
-#define SVPD_SERIAL_NUM_SIZE 251
-        uint8_t serial_num[SVPD_SERIAL_NUM_SIZE];
-};
-
-struct scsi_read_capacity
-{
-        uint8_t opcode;
-        uint8_t byte2;
-        uint8_t addr[4];
-        uint8_t unused[3];
-        uint8_t control;
-};
-
-struct scsi_read_capacity_data
-{
-        uint8_t addr[4];
-        uint8_t length[4];
-};
-
-struct scsi_report_luns
-{
-        uint8_t opcode;
-        uint8_t byte2;
-        uint8_t unused[3];
-        uint8_t addr[4];
-        uint8_t control;
-};
-
-struct scsi_report_luns_data {
-        uint8_t length[4];      /* length of LUN inventory, in bytes */
-        uint8_t reserved[4];    /* unused */
-        /*
-         * LUN inventory- we only support the type zero form for now.
-         */
-        struct {
-                uint8_t lundata[8];
-        } luns[1];
-};
-#define RPL_LUNDATA_ATYP_MASK   0xc0    /* MBZ for type 0 lun */
-#define RPL_LUNDATA_T0LUN       1       /* @ lundata[1] */
-
-
 struct scsi_sense_data
 {
         uint8_t error_code;
@@ -757,41 +117,6 @@ struct scsi_sense_data
 #define SSD_FULL_SIZE sizeof(struct scsi_sense_data)
 };
 
-struct scsi_mode_header_6
-{
-        uint8_t data_length;    /* Sense data length */
-        uint8_t medium_type;
-        uint8_t dev_spec;
-        uint8_t blk_desc_len;
-};
-
-struct scsi_mode_header_10
-{
-        uint8_t data_length[2];/* Sense data length */
-        uint8_t medium_type;
-        uint8_t dev_spec;
-        uint8_t unused[2];
-        uint8_t blk_desc_len[2];
-};
-
-struct scsi_mode_page_header
-{
-        uint8_t page_code;
-        uint8_t page_length;
-};
-
-struct scsi_mode_blk_desc
-{
-        uint8_t density;
-        uint8_t nblocks[3];
-        uint8_t reserved;
-        uint8_t blklen[3];
-};
-
-#define SCSI_DEFAULT_DENSITY    0x00    /* use 'default' density */
-#define SCSI_SAME_DENSITY       0x7f    /* use 'same' density- >= SCSI-2 only */
-
-
 /*
  * Status Byte
  */
@@ -807,76 +132,7 @@ struct scsi_mode_blk_desc
 #define SCSI_STATUS_ACA_ACTIVE          0x30
 #define SCSI_STATUS_TASK_ABORTED        0x40
 
-struct scsi_inquiry_pattern {
-        uint8_t   type;
-        uint8_t   media_type;
-#define SIP_MEDIA_REMOVABLE     0x01
-#define SIP_MEDIA_FIXED         0x02
-        const char *vendor;
-        const char *product;
-        const char *revision;
-}; 
-
-struct scsi_static_inquiry_pattern {
-        uint8_t   type;
-        uint8_t   media_type;
-        char       vendor[SID_VENDOR_SIZE+1];
-        char       product[SID_PRODUCT_SIZE+1];
-        char       revision[SID_REVISION_SIZE+1];
-};
-
-struct scsi_sense_quirk_entry {
-        struct scsi_inquiry_pattern     inq_pat;
-        int                             num_sense_keys;
-        int                             num_ascs;
-        struct sense_key_table_entry    *sense_key_info;
-        struct asc_table_entry          *asc_info;
-};
-
-struct sense_key_table_entry {
-        uint8_t    sense_key;
-        uint32_t   action;
-        const char *desc;
-};
-
-struct asc_table_entry {
-        uint8_t    asc;
-        uint8_t    ascq;
-        uint32_t   action;
-        const char *desc;
-};
-
-struct op_table_entry {
-        uint8_t    opcode;
-        uint16_t   opmask;
-        const char  *desc;
-};
-
-struct scsi_op_quirk_entry {
-        struct scsi_inquiry_pattern     inq_pat;
-        int                             num_ops;
-        struct op_table_entry           *op_table;
-};
-
-typedef enum {
-        SSS_FLAG_NONE           = 0x00,
-        SSS_FLAG_PRINT_COMMAND  = 0x01
-} scsi_sense_string_flags;
-
-extern const char *scsi_sense_key_text[];
-
 /************************* Large Disk Handling ********************************/
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-static __inline int aic_sector_div(u_long capacity, int heads, int sectors);
-
-static __inline int
-aic_sector_div(u_long capacity, int heads, int sectors)
-{
-        return (capacity / (heads * sectors));
-}
-#else
-static __inline int aic_sector_div(sector_t capacity, int heads, int sectors);
-
 static __inline int
 aic_sector_div(sector_t capacity, int heads, int sectors)
 {
@@ -884,152 +140,6 @@ aic_sector_div(sector_t capacity, int heads, int sectors)
         sector_div(capacity, (heads * sectors));
         return (int)capacity;
 }
-#endif
-
-/**************************** Module Library Hack *****************************/
-/*
- * What we'd like to do is have a single "scsi library" module that both the
- * aic7xxx and aic79xx drivers could load and depend on.  A cursory examination
- * of implementing module dependencies in Linux (handling the install and
- * initrd cases) does not look promissing.  For now, we just duplicate this
- * code in both drivers using a simple symbol renaming scheme that hides this
- * hack from the drivers.
- */
-#define AIC_LIB_ENTRY_CONCAT(x, prefix) prefix ## x
-#define AIC_LIB_ENTRY_EXPAND(x, prefix) AIC_LIB_ENTRY_CONCAT(x, prefix)
-#define AIC_LIB_ENTRY(x)                AIC_LIB_ENTRY_EXPAND(x, AIC_LIB_PREFIX)
-
-#define aic_sense_desc                  AIC_LIB_ENTRY(_sense_desc)
-#define aic_sense_error_action          AIC_LIB_ENTRY(_sense_error_action)
-#define aic_error_action                AIC_LIB_ENTRY(_error_action)
-#define aic_op_desc                     AIC_LIB_ENTRY(_op_desc)
-#define aic_cdb_string                  AIC_LIB_ENTRY(_cdb_string)
-#define aic_print_inquiry               AIC_LIB_ENTRY(_print_inquiry)
-#define aic_calc_syncsrate              AIC_LIB_ENTRY(_calc_syncrate)
-#define aic_calc_syncparam              AIC_LIB_ENTRY(_calc_syncparam)
-#define aic_calc_speed                  AIC_LIB_ENTRY(_calc_speed)
-#define aic_inquiry_match               AIC_LIB_ENTRY(_inquiry_match)
-#define aic_static_inquiry_match        AIC_LIB_ENTRY(_static_inquiry_match)
-#define aic_parse_brace_option          AIC_LIB_ENTRY(_parse_brace_option)
-
-/******************************************************************************/
-
-void                    aic_sense_desc(int /*sense_key*/, int /*asc*/,
-                                       int /*ascq*/, struct scsi_inquiry_data*,
-                                       const char** /*sense_key_desc*/,
-                                       const char** /*asc_desc*/);
-aic_sense_action        aic_sense_error_action(struct scsi_sense_data*,
-                                               struct scsi_inquiry_data*,
-                                               uint32_t /*sense_flags*/);
-uint32_t                aic_error_action(struct scsi_cmnd *,
-                                         struct scsi_inquiry_data *,
-                                         cam_status, u_int);
-
-#define SF_RETRY_UA     0x01
-#define SF_NO_PRINT     0x02
-#define SF_QUIET_IR     0x04    /* Be quiet about Illegal Request reponses */
-#define SF_PRINT_ALWAYS 0x08
-
-
-const char *    aic_op_desc(uint16_t /*opcode*/, struct scsi_inquiry_data*);
-char *          aic_cdb_string(uint8_t* /*cdb_ptr*/, char* /*cdb_string*/,
-                               size_t /*len*/);
-void            aic_print_inquiry(struct scsi_inquiry_data*);
-
-u_int           aic_calc_syncsrate(u_int /*period_factor*/);
-u_int           aic_calc_syncparam(u_int /*period*/);
-u_int           aic_calc_speed(u_int width, u_int period, u_int offset,
-                               u_int min_rate);
-        
-int             aic_inquiry_match(caddr_t /*inqbuffer*/,
-                                  caddr_t /*table_entry*/);
-int             aic_static_inquiry_match(caddr_t /*inqbuffer*/,
-                                         caddr_t /*table_entry*/);
-
-typedef void aic_option_callback_t(u_long, int, int, int32_t);
-char *          aic_parse_brace_option(char *opt_name, char *opt_arg,
-                                       char *end, int depth,
-                                       aic_option_callback_t *, u_long);
-
-static __inline void     scsi_extract_sense(struct scsi_sense_data *sense,
-                                            int *error_code, int *sense_key,
-                                            int *asc, int *ascq);
-static __inline void     scsi_ulto2b(uint32_t val, uint8_t *bytes);
-static __inline void     scsi_ulto3b(uint32_t val, uint8_t *bytes);
-static __inline void     scsi_ulto4b(uint32_t val, uint8_t *bytes);
-static __inline uint32_t scsi_2btoul(uint8_t *bytes);
-static __inline uint32_t scsi_3btoul(uint8_t *bytes);
-static __inline int32_t  scsi_3btol(uint8_t *bytes);
-static __inline uint32_t scsi_4btoul(uint8_t *bytes);
-
-static __inline void scsi_extract_sense(struct scsi_sense_data *sense,
-                                       int *error_code, int *sense_key,
-                                       int *asc, int *ascq)
-{
-        *error_code = sense->error_code & SSD_ERRCODE;
-        *sense_key = sense->flags & SSD_KEY;
-        *asc = (sense->extra_len >= 5) ? sense->add_sense_code : 0;
-        *ascq = (sense->extra_len >= 6) ? sense->add_sense_code_qual : 0;
-}
-
-static __inline void
-scsi_ulto2b(uint32_t val, uint8_t *bytes)
-{
-
-        bytes[0] = (val >> 8) & 0xff;
-        bytes[1] = val & 0xff;
-}
-
-static __inline void
-scsi_ulto3b(uint32_t val, uint8_t *bytes)
-{
-
-        bytes[0] = (val >> 16) & 0xff;
-        bytes[1] = (val >> 8) & 0xff;
-        bytes[2] = val & 0xff;
-}
-
-static __inline void
-scsi_ulto4b(uint32_t val, uint8_t *bytes)
-{
-
-        bytes[0] = (val >> 24) & 0xff;
-        bytes[1] = (val >> 16) & 0xff;
-        bytes[2] = (val >> 8) & 0xff;
-        bytes[3] = val & 0xff;
-}
-
-static __inline uint32_t
-scsi_2btoul(uint8_t *bytes)
-{
-        uint32_t rv;
-
-        rv = (bytes[0] << 8) |
-             bytes[1];
-        return (rv);
-}
-
-static __inline uint32_t
-scsi_3btoul(uint8_t *bytes)
-{
-        uint32_t rv;
-
-        rv = (bytes[0] << 16) |
-             (bytes[1] << 8) |
-             bytes[2];
-        return (rv);
-}
-
-static __inline int32_t 
-scsi_3btol(uint8_t *bytes)
-{
-        uint32_t rc = scsi_3btoul(bytes);
- 
-        if (rc & 0x00800000)
-                rc |= 0xff000000;
-
-        return (int32_t) rc;
-}
 
 static __inline uint32_t
 scsi_4btoul(uint8_t *bytes)
diff --git a/drivers/scsi/ata_piix.c b/drivers/scsi/ata_piix.c
index fb28c126184..deec0cef88d 100644
--- a/drivers/scsi/ata_piix.c
+++ b/drivers/scsi/ata_piix.c
@@ -583,8 +583,7 @@ static void pci_enable_intx(struct pci_dev *pdev)
 #define AHCI_ENABLE (1 << 31)
 static int piix_disable_ahci(struct pci_dev *pdev)
 {
-        void *mmio;
-        unsigned long addr;
+        void __iomem *mmio;
         u32 tmp;
         int rc = 0;
 
@@ -592,11 +591,11 @@ static int piix_disable_ahci(struct pci_dev *pdev)
          * works because this device is usually set up by BIOS.
          */
 
-        addr = pci_resource_start(pdev, AHCI_PCI_BAR);
-        if (!addr || !pci_resource_len(pdev, AHCI_PCI_BAR))
+        if (!pci_resource_start(pdev, AHCI_PCI_BAR) ||
+            !pci_resource_len(pdev, AHCI_PCI_BAR))
                 return 0;
 
-        mmio = ioremap(addr, 64);
+        mmio = pci_iomap(pdev, AHCI_PCI_BAR, 64);
         if (!mmio)
                 return -ENOMEM;
 
@@ -610,7 +609,7 @@ static int piix_disable_ahci(struct pci_dev *pdev)
                         rc = -EIO;
         }
 
-        iounmap(mmio);
+        pci_iounmap(pdev, mmio);
         return rc;
 }
 
diff --git a/drivers/scsi/ch.c b/drivers/scsi/ch.c
index 3900e28ac7d..bd0e1b6be1e 100644
--- a/drivers/scsi/ch.c
+++ b/drivers/scsi/ch.c
@@ -20,7 +20,6 @@
 #include <linux/interrupt.h>
 #include <linux/blkdev.h>
 #include <linux/completion.h>
-#include <linux/devfs_fs_kernel.h>
 #include <linux/ioctl32.h>
 #include <linux/compat.h>
 #include <linux/chio.h>                 /* here are all the ioctls */
@@ -31,7 +30,7 @@
 #include <scsi/scsi_ioctl.h>
 #include <scsi/scsi_host.h>
 #include <scsi/scsi_device.h>
-#include <scsi/scsi_request.h>
+#include <scsi/scsi_eh.h>
 #include <scsi/scsi_dbg.h>
 
 #define CH_DT_MAX       16
@@ -181,17 +180,17 @@ static struct {
 
 /* ------------------------------------------------------------------- */
 
-static int ch_find_errno(unsigned char *sense_buffer)
+static int ch_find_errno(struct scsi_sense_hdr *sshdr)
 {
         int i,errno = 0;
 
         /* Check to see if additional sense information is available */
-        if (sense_buffer[7]  > 5 &&
-            sense_buffer[12] != 0) {
+        if (scsi_sense_valid(sshdr) &&
+            sshdr->asc != 0) {
                 for (i = 0; err[i].errno != 0; i++) {
-                        if (err[i].sense == sense_buffer[ 2] &&
-                            err[i].asc   == sense_buffer[12] &&
-                            err[i].ascq  == sense_buffer[13]) {
+                        if (err[i].sense == sshdr->sense_key &&
+                            err[i].asc   == sshdr->asc &&
+                            err[i].ascq  == sshdr->ascq) {
                                 errno = -err[i].errno;
                                 break;
                         }
@@ -207,13 +206,9 @@ ch_do_scsi(scsi_changer *ch, unsigned char *cmd,
            void *buffer, unsigned buflength,
            enum dma_data_direction direction)
 {
-        int errno, retries = 0, timeout;
-        struct scsi_request *sr;
+        int errno, retries = 0, timeout, result;
+        struct scsi_sense_hdr sshdr;
         
-        sr = scsi_allocate_request(ch->device, GFP_KERNEL);
-        if (NULL == sr)
-                return -ENOMEM;
-
         timeout = (cmd[0] == INITIALIZE_ELEMENT_STATUS)
                 ? timeout_init : timeout_move;
 
@@ -224,16 +219,17 @@ ch_do_scsi(scsi_changer *ch, unsigned char *cmd,
                 __scsi_print_command(cmd);
         }
 
-        scsi_wait_req(sr, cmd, buffer, buflength,
-                      timeout * HZ, MAX_RETRIES);
+        result = scsi_execute_req(ch->device, cmd, direction, buffer,
+                                  buflength, &sshdr, timeout * HZ,
+                                  MAX_RETRIES);
 
-        dprintk("result: 0x%x\n",sr->sr_result);
-        if (driver_byte(sr->sr_result) & DRIVER_SENSE) {
+        dprintk("result: 0x%x\n",result);
+        if (driver_byte(result) & DRIVER_SENSE) {
                 if (debug)
-                        scsi_print_req_sense(ch->name, sr);
-                errno = ch_find_errno(sr->sr_sense_buffer);
+                        scsi_print_sense_hdr(ch->name, &sshdr);
+                errno = ch_find_errno(&sshdr);
 
-                switch(sr->sr_sense_buffer[2] & 0xf) {
+                switch(sshdr.sense_key) {
                 case UNIT_ATTENTION:
                         ch->unit_attention = 1;
                         if (retries++ < 3)
@@ -241,7 +237,6 @@ ch_do_scsi(scsi_changer *ch, unsigned char *cmd,
                         break;
                 }
         }
-        scsi_release_request(sr);
         return errno;
 }
 
@@ -940,8 +935,6 @@ static int ch_probe(struct device *dev)
         if (init)
                 ch_init_elem(ch);
 
-        devfs_mk_cdev(MKDEV(SCSI_CHANGER_MAJOR,ch->minor),
-                      S_IFCHR | S_IRUGO | S_IWUGO, ch->name);
         class_device_create(ch_sysfs_class,
                             MKDEV(SCSI_CHANGER_MAJOR,ch->minor),
                             dev, "s%s", ch->name);
@@ -974,7 +967,6 @@ static int ch_remove(struct device *dev)
 
         class_device_destroy(ch_sysfs_class,
                              MKDEV(SCSI_CHANGER_MAJOR,ch->minor));
-        devfs_remove(ch->name);
         kfree(ch->dt);
         kfree(ch);
         ch_devcount--;
diff --git a/drivers/scsi/constants.c b/drivers/scsi/constants.c
index ec161733a82..f6be2c1c394 100644
--- a/drivers/scsi/constants.c
+++ b/drivers/scsi/constants.c
@@ -17,6 +17,7 @@
 #include <scsi/scsi_host.h>
 #include <scsi/scsi_request.h>
 #include <scsi/scsi_eh.h>
+#include <scsi/scsi_dbg.h>
 
 
 
@@ -1155,6 +1156,31 @@ scsi_show_extd_sense(unsigned char asc, unsigned char ascq)
         }
 }
 
+void
+scsi_print_sense_hdr(const char *name, struct scsi_sense_hdr *sshdr)
+{
+        const char *sense_txt;
+        /* An example of deferred is when an earlier write to disk cache
+         * succeeded, but now the disk discovers that it cannot write the
+         * data to the magnetic media.
+         */
+        const char *error = scsi_sense_is_deferred(sshdr) ? 
+                "<<DEFERRED>>" : "Current";
+        printk(KERN_INFO "%s: %s", name, error);
+        if (sshdr->response_code >= 0x72)
+                printk(" [descriptor]");
+
+        sense_txt = scsi_sense_key_string(sshdr->sense_key);
+        if (sense_txt)
+                printk(": sense key: %s\n", sense_txt);
+        else
+                printk(": sense key=0x%x\n", sshdr->sense_key);
+        printk(KERN_INFO "    ");
+        scsi_show_extd_sense(sshdr->asc, sshdr->ascq);
+        printk("\n");
+}
+EXPORT_SYMBOL(scsi_print_sense_hdr);
+
 /* Print sense information */
 void
 __scsi_print_sense(const char *name, const unsigned char *sense_buffer,
@@ -1162,8 +1188,6 @@ __scsi_print_sense(const char *name, const unsigned char *sense_buffer,
 {
         int k, num, res;
         unsigned int info;
-        const char *error;
-        const char *sense_txt;
         struct scsi_sense_hdr ssh;
     
         res = scsi_normalize_sense(sense_buffer, sense_len, &ssh);
@@ -1181,26 +1205,7 @@ __scsi_print_sense(const char *name, const unsigned char *sense_buffer,
                 printk("\n");
                 return;
         }
-
-        /* An example of deferred is when an earlier write to disk cache
-         * succeeded, but now the disk discovers that it cannot write the
-         * data to the magnetic media.
-         */
-        error = scsi_sense_is_deferred(&ssh) ? 
-                        "<<DEFERRED>>" : "Current";
-        printk(KERN_INFO "%s: %s", name, error);
-        if (ssh.response_code >= 0x72)
-                printk(" [descriptor]");
-
-        sense_txt = scsi_sense_key_string(ssh.sense_key);
-        if (sense_txt)
-                printk(": sense key: %s\n", sense_txt);
-        else
-                printk(": sense key=0x%x\n", ssh.sense_key);
-        printk(KERN_INFO "    ");
-        scsi_show_extd_sense(ssh.asc, ssh.ascq);
-        printk("\n");
-
+        scsi_print_sense_hdr(name, &ssh);
         if (ssh.response_code < 0x72) {
                 /* only decode extras for "fixed" format now */
                 char buff[80];
diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
index 5feb886c339..85503fad789 100644
--- a/drivers/scsi/hosts.c
+++ b/drivers/scsi/hosts.c
@@ -24,6 +24,7 @@
 #include <linux/module.h>
 #include <linux/blkdev.h>
 #include <linux/kernel.h>
+#include <linux/kthread.h>
 #include <linux/string.h>
 #include <linux/mm.h>
 #include <linux/init.h>
@@ -52,21 +53,80 @@ static struct class shost_class = {
 };
 
 /**
- * scsi_host_cancel - cancel outstanding IO to this host
- * @shost:      pointer to struct Scsi_Host
- * recovery:    recovery requested to run.
+ *      scsi_host_set_state - Take the given host through the host
+ *              state model.
+ *      @shost: scsi host to change the state of.
+ *      @state: state to change to.
+ *
+ *      Returns zero if unsuccessful or an error if the requested
+ *      transition is illegal.
  **/
-static void scsi_host_cancel(struct Scsi_Host *shost, int recovery)
+int scsi_host_set_state(struct Scsi_Host *shost, enum scsi_host_state state)
 {
-        struct scsi_device *sdev;
+        enum scsi_host_state oldstate = shost->shost_state;
+
+        if (state == oldstate)
+                return 0;
+
+        switch (state) {
+        case SHOST_CREATED:
+                /* There are no legal states that come back to
+                 * created.  This is the manually initialised start
+                 * state */
+                goto illegal;
+
+        case SHOST_RUNNING:
+                switch (oldstate) {
+                case SHOST_CREATED:
+                case SHOST_RECOVERY:
+                        break;
+                default:
+                        goto illegal;
+                }
+                break;
+
+        case SHOST_RECOVERY:
+                switch (oldstate) {
+                case SHOST_RUNNING:
+                        break;
+                default:
+                        goto illegal;
+                }
+                break;
+
+        case SHOST_CANCEL:
+                switch (oldstate) {
+                case SHOST_CREATED:
+                case SHOST_RUNNING:
+                        break;
+                default:
+                        goto illegal;
+                }
+                break;
+
+        case SHOST_DEL:
+                switch (oldstate) {
+                case SHOST_CANCEL:
+                        break;
+                default:
+                        goto illegal;
+                }
+                break;
 
-        set_bit(SHOST_CANCEL, &shost->shost_state);
-        shost_for_each_device(sdev, shost) {
-                scsi_device_cancel(sdev, recovery);
         }
-        wait_event(shost->host_wait, (!test_bit(SHOST_RECOVERY,
-                                                &shost->shost_state)));
+        shost->shost_state = state;
+        return 0;
+
+ illegal:
+        SCSI_LOG_ERROR_RECOVERY(1,
+                                dev_printk(KERN_ERR, &shost->shost_gendev,
+                                           "Illegal host state transition"
+                                           "%s->%s\n",
+                                           scsi_host_state_name(oldstate),
+                                           scsi_host_state_name(state)));
+        return -EINVAL;
 }
+EXPORT_SYMBOL(scsi_host_set_state);
 
 /**
  * scsi_remove_host - remove a scsi host
@@ -74,11 +134,13 @@ static void scsi_host_cancel(struct Scsi_Host *shost, int recovery)
  **/
 void scsi_remove_host(struct Scsi_Host *shost)
 {
+        down(&shost->scan_mutex);
+        scsi_host_set_state(shost, SHOST_CANCEL);
+        up(&shost->scan_mutex);
         scsi_forget_host(shost);
-        scsi_host_cancel(shost, 0);
         scsi_proc_host_rm(shost);
 
-        set_bit(SHOST_DEL, &shost->shost_state);
+        scsi_host_set_state(shost, SHOST_DEL);
 
         transport_unregister_device(&shost->shost_gendev);
         class_device_unregister(&shost->shost_classdev);
@@ -115,7 +177,7 @@ int scsi_add_host(struct Scsi_Host *shost, struct device *dev)
         if (error)
                 goto out;
 
-        set_bit(SHOST_ADD, &shost->shost_state);
+        scsi_host_set_state(shost, SHOST_RUNNING);
         get_device(shost->shost_gendev.parent);
 
         error = class_device_add(&shost->shost_classdev);
@@ -164,15 +226,8 @@ static void scsi_host_dev_release(struct device *dev)
         struct Scsi_Host *shost = dev_to_shost(dev);
         struct device *parent = dev->parent;
 
-        if (shost->ehandler) {
-                DECLARE_COMPLETION(sem);
-                shost->eh_notify = &sem;
-                shost->eh_kill = 1;
-                up(shost->eh_wait);
-                wait_for_completion(&sem);
-                shost->eh_notify = NULL;
-        }
-
+        if (shost->ehandler)
+                kthread_stop(shost->ehandler);
         if (shost->work_q)
                 destroy_workqueue(shost->work_q);
 
@@ -202,7 +257,6 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize)
 {
         struct Scsi_Host *shost;
         int gfp_mask = GFP_KERNEL, rval;
-        DECLARE_COMPLETION(complete);
 
         if (sht->unchecked_isa_dma && privsize)
                 gfp_mask |= __GFP_DMA;
@@ -226,6 +280,7 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize)
 
         spin_lock_init(&shost->default_lock);
         scsi_assign_lock(shost, &shost->default_lock);
+        shost->shost_state = SHOST_CREATED;
         INIT_LIST_HEAD(&shost->__devices);
         INIT_LIST_HEAD(&shost->__targets);
         INIT_LIST_HEAD(&shost->eh_cmd_q);
@@ -307,12 +362,12 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize)
         snprintf(shost->shost_classdev.class_id, BUS_ID_SIZE, "host%d",
                   shost->host_no);
 
-        shost->eh_notify = &complete;
-        rval = kernel_thread(scsi_error_handler, shost, 0);
-        if (rval < 0)
+        shost->ehandler = kthread_run(scsi_error_handler, shost,
+                        "scsi_eh_%d", shost->host_no);
+        if (IS_ERR(shost->ehandler)) {
+                rval = PTR_ERR(shost->ehandler);
                 goto fail_destroy_freelist;
-        wait_for_completion(&complete);
-        shost->eh_notify = NULL;
+        }
 
         scsi_proc_hostdir_add(shost->hostt);
         return shost;
@@ -382,7 +437,7 @@ EXPORT_SYMBOL(scsi_host_lookup);
  **/
 struct Scsi_Host *scsi_host_get(struct Scsi_Host *shost)
 {
-        if (test_bit(SHOST_DEL, &shost->shost_state) ||
+        if ((shost->shost_state == SHOST_DEL) ||
                 !get_device(&shost->shost_gendev))
                 return NULL;
         return shost;
diff --git a/drivers/scsi/ibmvscsi/ibmvscsi.c b/drivers/scsi/ibmvscsi/ibmvscsi.c
index 2cb3c8340ca..5b14934ba86 100644
--- a/drivers/scsi/ibmvscsi/ibmvscsi.c
+++ b/drivers/scsi/ibmvscsi/ibmvscsi.c
@@ -87,7 +87,7 @@ static int max_channel = 3;
 static int init_timeout = 5;
 static int max_requests = 50;
 
-#define IBMVSCSI_VERSION "1.5.6"
+#define IBMVSCSI_VERSION "1.5.7"
 
 MODULE_DESCRIPTION("IBM Virtual SCSI");
 MODULE_AUTHOR("Dave Boutcher");
@@ -145,6 +145,8 @@ static int initialize_event_pool(struct event_pool *pool,
                         sizeof(*evt->xfer_iu) * i;
                 evt->xfer_iu = pool->iu_storage + i;
                 evt->hostdata = hostdata;
+                evt->ext_list = NULL;
+                evt->ext_list_token = 0;
         }
 
         return 0;
@@ -161,9 +163,16 @@ static void release_event_pool(struct event_pool *pool,
                                struct ibmvscsi_host_data *hostdata)
 {
         int i, in_use = 0;
-        for (i = 0; i < pool->size; ++i)
+        for (i = 0; i < pool->size; ++i) {
                 if (atomic_read(&pool->events[i].free) != 1)
                         ++in_use;
+                if (pool->events[i].ext_list) {
+                        dma_free_coherent(hostdata->dev,
+                                  SG_ALL * sizeof(struct memory_descriptor),
+                                  pool->events[i].ext_list,
+                                  pool->events[i].ext_list_token);
+                }
+        }
         if (in_use)
                 printk(KERN_WARNING
                        "ibmvscsi: releasing event pool with %d "
@@ -286,24 +295,41 @@ static void set_srp_direction(struct scsi_cmnd *cmd,
         } else {
                 if (cmd->sc_data_direction == DMA_TO_DEVICE) {
                         srp_cmd->data_out_format = SRP_INDIRECT_BUFFER;
-                        srp_cmd->data_out_count = numbuf;
+                        srp_cmd->data_out_count =
+                                numbuf < MAX_INDIRECT_BUFS ?
+                                        numbuf: MAX_INDIRECT_BUFS;
                 } else {
                         srp_cmd->data_in_format = SRP_INDIRECT_BUFFER;
-                        srp_cmd->data_in_count = numbuf;
+                        srp_cmd->data_in_count =
+                                numbuf < MAX_INDIRECT_BUFS ?
+                                        numbuf: MAX_INDIRECT_BUFS;
                 }
         }
 }
 
+static void unmap_sg_list(int num_entries, 
+                struct device *dev,
+                struct memory_descriptor *md)
+{ 
+        int i;
+
+        for (i = 0; i < num_entries; ++i) {
+                dma_unmap_single(dev,
+                        md[i].virtual_address,
+                        md[i].length, DMA_BIDIRECTIONAL);
+        }
+}
+
 /**
  * unmap_cmd_data: - Unmap data pointed in srp_cmd based on the format
  * @cmd:        srp_cmd whose additional_data member will be unmapped
  * @dev:        device for which the memory is mapped
  *
 */
-static void unmap_cmd_data(struct srp_cmd *cmd, struct device *dev)
+static void unmap_cmd_data(struct srp_cmd *cmd,
+                           struct srp_event_struct *evt_struct,
+                           struct device *dev)
 {
-        int i;
-
         if ((cmd->data_out_format == SRP_NO_BUFFER) &&
             (cmd->data_in_format == SRP_NO_BUFFER))
                 return;
@@ -318,15 +344,34 @@ static void unmap_cmd_data(struct srp_cmd *cmd, struct device *dev)
                         (struct indirect_descriptor *)cmd->additional_data;
                 int num_mapped = indirect->head.length / 
                         sizeof(indirect->list[0]);
-                for (i = 0; i < num_mapped; ++i) {
-                        struct memory_descriptor *data = &indirect->list[i];
-                        dma_unmap_single(dev,
-                                         data->virtual_address,
-                                         data->length, DMA_BIDIRECTIONAL);
+
+                if (num_mapped <= MAX_INDIRECT_BUFS) {
+                        unmap_sg_list(num_mapped, dev, &indirect->list[0]);
+                        return;
                 }
+
+                unmap_sg_list(num_mapped, dev, evt_struct->ext_list);
         }
 }
 
+static int map_sg_list(int num_entries, 
+                       struct scatterlist *sg,
+                       struct memory_descriptor *md)
+{
+        int i;
+        u64 total_length = 0;
+
+        for (i = 0; i < num_entries; ++i) {
+                struct memory_descriptor *descr = md + i;
+                struct scatterlist *sg_entry = &sg[i];
+                descr->virtual_address = sg_dma_address(sg_entry);
+                descr->length = sg_dma_len(sg_entry);
+                descr->memory_handle = 0;
+                total_length += sg_dma_len(sg_entry);
+        }
+        return total_length;
+}
+
 /**
  * map_sg_data: - Maps dma for a scatterlist and initializes decriptor fields
  * @cmd:        Scsi_Cmnd with the scatterlist
@@ -337,10 +382,11 @@ static void unmap_cmd_data(struct srp_cmd *cmd, struct device *dev)
  * Returns 1 on success.
 */
 static int map_sg_data(struct scsi_cmnd *cmd,
+                       struct srp_event_struct *evt_struct,
                        struct srp_cmd *srp_cmd, struct device *dev)
 {
 
-        int i, sg_mapped;
+        int sg_mapped;
         u64 total_length = 0;
         struct scatterlist *sg = cmd->request_buffer;
         struct memory_descriptor *data =
@@ -363,27 +409,46 @@ static int map_sg_data(struct scsi_cmnd *cmd,
                 return 1;
         }
 
-        if (sg_mapped > MAX_INDIRECT_BUFS) {
+        if (sg_mapped > SG_ALL) {
                 printk(KERN_ERR
                        "ibmvscsi: More than %d mapped sg entries, got %d\n",
-                       MAX_INDIRECT_BUFS, sg_mapped);
+                       SG_ALL, sg_mapped);
                 return 0;
         }
 
         indirect->head.virtual_address = 0;
         indirect->head.length = sg_mapped * sizeof(indirect->list[0]);
         indirect->head.memory_handle = 0;
-        for (i = 0; i < sg_mapped; ++i) {
-                struct memory_descriptor *descr = &indirect->list[i];
-                struct scatterlist *sg_entry = &sg[i];
-                descr->virtual_address = sg_dma_address(sg_entry);
-                descr->length = sg_dma_len(sg_entry);
-                descr->memory_handle = 0;
-                total_length += sg_dma_len(sg_entry);
+
+        if (sg_mapped <= MAX_INDIRECT_BUFS) {
+                total_length = map_sg_list(sg_mapped, sg, &indirect->list[0]);
+                indirect->total_length = total_length;
+                return 1;
         }
-        indirect->total_length = total_length;
 
-        return 1;
+        /* get indirect table */
+        if (!evt_struct->ext_list) {
+                evt_struct->ext_list =(struct memory_descriptor*)
+                        dma_alloc_coherent(dev, 
+                                SG_ALL * sizeof(struct memory_descriptor),
+                                &evt_struct->ext_list_token, 0);
+                if (!evt_struct->ext_list) {
+                    printk(KERN_ERR
+                        "ibmvscsi: Can't allocate memory for indirect table\n");
+                        return 0;
+                        
+                }
+        }
+
+        total_length = map_sg_list(sg_mapped, sg, evt_struct->ext_list);        
+
+        indirect->total_length = total_length;
+        indirect->head.virtual_address = evt_struct->ext_list_token;
+        indirect->head.length = sg_mapped * sizeof(indirect->list[0]);
+        memcpy(indirect->list, evt_struct->ext_list,
+                MAX_INDIRECT_BUFS * sizeof(struct memory_descriptor));
+        
+        return 1;
 }
 
 /**
@@ -428,6 +493,7 @@ static int map_single_data(struct scsi_cmnd *cmd,
  * Returns 1 on success.
 */
 static int map_data_for_srp_cmd(struct scsi_cmnd *cmd,
+                                struct srp_event_struct *evt_struct,
                                 struct srp_cmd *srp_cmd, struct device *dev)
 {
         switch (cmd->sc_data_direction) {
@@ -450,7 +516,7 @@ static int map_data_for_srp_cmd(struct scsi_cmnd *cmd,
         if (!cmd->request_buffer)
                 return 1;
         if (cmd->use_sg)
-                return map_sg_data(cmd, srp_cmd, dev);
+                return map_sg_data(cmd, evt_struct, srp_cmd, dev);
         return map_single_data(cmd, srp_cmd, dev);
 }
 
@@ -486,6 +552,7 @@ static int ibmvscsi_send_srp_event(struct srp_event_struct *evt_struct,
                 printk(KERN_WARNING 
                        "ibmvscsi: Warning, request_limit exceeded\n");
                 unmap_cmd_data(&evt_struct->iu.srp.cmd,
+                               evt_struct,
                                hostdata->dev);
                 free_event_struct(&hostdata->pool, evt_struct);
                 return SCSI_MLQUEUE_HOST_BUSY;
@@ -513,7 +580,7 @@ static int ibmvscsi_send_srp_event(struct srp_event_struct *evt_struct,
         return 0;
 
  send_error:
-        unmap_cmd_data(&evt_struct->iu.srp.cmd, hostdata->dev);
+        unmap_cmd_data(&evt_struct->iu.srp.cmd, evt_struct, hostdata->dev);
 
         if ((cmnd = evt_struct->cmnd) != NULL) {
                 cmnd->result = DID_ERROR << 16;
@@ -551,6 +618,7 @@ static void handle_cmd_rsp(struct srp_event_struct *evt_struct)
                                rsp->sense_and_response_data,
                                rsp->sense_data_list_length);
                 unmap_cmd_data(&evt_struct->iu.srp.cmd, 
+                               evt_struct, 
                                evt_struct->hostdata->dev);
 
                 if (rsp->doover)
@@ -583,6 +651,7 @@ static int ibmvscsi_queuecommand(struct scsi_cmnd *cmnd,
 {
         struct srp_cmd *srp_cmd;
         struct srp_event_struct *evt_struct;
+        struct indirect_descriptor *indirect;
         struct ibmvscsi_host_data *hostdata =
                 (struct ibmvscsi_host_data *)&cmnd->device->host->hostdata;
         u16 lun = lun_from_dev(cmnd->device);
@@ -591,14 +660,6 @@ static int ibmvscsi_queuecommand(struct scsi_cmnd *cmnd,
         if (!evt_struct)
                 return SCSI_MLQUEUE_HOST_BUSY;
 
-        init_event_struct(evt_struct,
-                          handle_cmd_rsp,
-                          VIOSRP_SRP_FORMAT,
-                          cmnd->timeout);
-
-        evt_struct->cmnd = cmnd;
-        evt_struct->cmnd_done = done;
-
         /* Set up the actual SRP IU */
         srp_cmd = &evt_struct->iu.srp.cmd;
         memset(srp_cmd, 0x00, sizeof(*srp_cmd));
@@ -606,17 +667,25 @@ static int ibmvscsi_queuecommand(struct scsi_cmnd *cmnd,
         memcpy(srp_cmd->cdb, cmnd->cmnd, sizeof(cmnd->cmnd));
         srp_cmd->lun = ((u64) lun) << 48;
 
-        if (!map_data_for_srp_cmd(cmnd, srp_cmd, hostdata->dev)) {
+        if (!map_data_for_srp_cmd(cmnd, evt_struct, srp_cmd, hostdata->dev)) {
                 printk(KERN_ERR "ibmvscsi: couldn't convert cmd to srp_cmd\n");
                 free_event_struct(&hostdata->pool, evt_struct);
                 return SCSI_MLQUEUE_HOST_BUSY;
         }
 
+        init_event_struct(evt_struct,
+                          handle_cmd_rsp,
+                          VIOSRP_SRP_FORMAT,
+                          cmnd->timeout_per_command/HZ);
+
+        evt_struct->cmnd = cmnd;
+        evt_struct->cmnd_done = done;
+
         /* Fix up dma address of the buffer itself */
-        if ((srp_cmd->data_out_format == SRP_INDIRECT_BUFFER) ||
-            (srp_cmd->data_in_format == SRP_INDIRECT_BUFFER)) {
-                struct indirect_descriptor *indirect =
-                    (struct indirect_descriptor *)srp_cmd->additional_data;
+        indirect = (struct indirect_descriptor *)srp_cmd->additional_data;
+        if (((srp_cmd->data_out_format == SRP_INDIRECT_BUFFER) ||
+            (srp_cmd->data_in_format == SRP_INDIRECT_BUFFER)) &&
+            (indirect->head.virtual_address == 0)) {
                 indirect->head.virtual_address = evt_struct->crq.IU_data_ptr +
                     offsetof(struct srp_cmd, additional_data) +
                     offsetof(struct indirect_descriptor, list);
@@ -826,11 +895,13 @@ static int ibmvscsi_eh_abort_handler(struct scsi_cmnd *cmd)
         struct srp_event_struct *tmp_evt, *found_evt;
         union viosrp_iu srp_rsp;
         int rsp_rc;
+        unsigned long flags;
         u16 lun = lun_from_dev(cmd->device);
 
         /* First, find this command in our sent list so we can figure
          * out the correct tag
          */
+        spin_lock_irqsave(hostdata->host->host_lock, flags);
         found_evt = NULL;
         list_for_each_entry(tmp_evt, &hostdata->sent, list) {
                 if (tmp_evt->cmnd == cmd) {
@@ -839,11 +910,14 @@ static int ibmvscsi_eh_abort_handler(struct scsi_cmnd *cmd)
                 }
         }
 
-        if (!found_evt) 
+        if (!found_evt) {
+                spin_unlock_irqrestore(hostdata->host->host_lock, flags);
                 return FAILED;
+        }
 
         evt = get_event_struct(&hostdata->pool);
         if (evt == NULL) {
+                spin_unlock_irqrestore(hostdata->host->host_lock, flags);
                 printk(KERN_ERR "ibmvscsi: failed to allocate abort event\n");
                 return FAILED;
         }
@@ -867,7 +941,9 @@ static int ibmvscsi_eh_abort_handler(struct scsi_cmnd *cmd)
 
         evt->sync_srp = &srp_rsp;
         init_completion(&evt->comp);
-        if (ibmvscsi_send_srp_event(evt, hostdata) != 0) {
+        rsp_rc = ibmvscsi_send_srp_event(evt, hostdata);
+        spin_unlock_irqrestore(hostdata->host->host_lock, flags);
+        if (rsp_rc != 0) {
                 printk(KERN_ERR "ibmvscsi: failed to send abort() event\n");
                 return FAILED;
         }
@@ -901,6 +977,7 @@ static int ibmvscsi_eh_abort_handler(struct scsi_cmnd *cmd)
          * The event is no longer in our list.  Make sure it didn't
          * complete while we were aborting
          */
+        spin_lock_irqsave(hostdata->host->host_lock, flags);
         found_evt = NULL;
         list_for_each_entry(tmp_evt, &hostdata->sent, list) {
                 if (tmp_evt->cmnd == cmd) {
@@ -910,6 +987,7 @@ static int ibmvscsi_eh_abort_handler(struct scsi_cmnd *cmd)
         }
 
         if (found_evt == NULL) {
+                spin_unlock_irqrestore(hostdata->host->host_lock, flags);
                 printk(KERN_INFO
                        "ibmvscsi: aborted task tag 0x%lx completed\n",
                        tsk_mgmt->managed_task_tag);
@@ -922,8 +1000,10 @@ static int ibmvscsi_eh_abort_handler(struct scsi_cmnd *cmd)
 
         cmd->result = (DID_ABORT << 16);
         list_del(&found_evt->list);
-        unmap_cmd_data(&found_evt->iu.srp.cmd, found_evt->hostdata->dev);
+        unmap_cmd_data(&found_evt->iu.srp.cmd, found_evt,
+                       found_evt->hostdata->dev);
         free_event_struct(&found_evt->hostdata->pool, found_evt);
+        spin_unlock_irqrestore(hostdata->host->host_lock, flags);
         atomic_inc(&hostdata->request_limit);
         return SUCCESS;
 }
@@ -943,10 +1023,13 @@ static int ibmvscsi_eh_device_reset_handler(struct scsi_cmnd *cmd)
         struct srp_event_struct *tmp_evt, *pos;
         union viosrp_iu srp_rsp;
         int rsp_rc;
+        unsigned long flags;
         u16 lun = lun_from_dev(cmd->device);
 
+        spin_lock_irqsave(hostdata->host->host_lock, flags);
         evt = get_event_struct(&hostdata->pool);
         if (evt == NULL) {
+                spin_unlock_irqrestore(hostdata->host->host_lock, flags);
                 printk(KERN_ERR "ibmvscsi: failed to allocate reset event\n");
                 return FAILED;
         }
@@ -969,7 +1052,9 @@ static int ibmvscsi_eh_device_reset_handler(struct scsi_cmnd *cmd)
 
         evt->sync_srp = &srp_rsp;
         init_completion(&evt->comp);
-        if (ibmvscsi_send_srp_event(evt, hostdata) != 0) {
+        rsp_rc = ibmvscsi_send_srp_event(evt, hostdata);
+        spin_unlock_irqrestore(hostdata->host->host_lock, flags);
+        if (rsp_rc != 0) {
                 printk(KERN_ERR "ibmvscsi: failed to send reset event\n");
                 return FAILED;
         }
@@ -1002,12 +1087,14 @@ static int ibmvscsi_eh_device_reset_handler(struct scsi_cmnd *cmd)
         /* We need to find all commands for this LUN that have not yet been
          * responded to, and fail them with DID_RESET
          */
+        spin_lock_irqsave(hostdata->host->host_lock, flags);
         list_for_each_entry_safe(tmp_evt, pos, &hostdata->sent, list) {
                 if ((tmp_evt->cmnd) && (tmp_evt->cmnd->device == cmd->device)) {
                         if (tmp_evt->cmnd)
                                 tmp_evt->cmnd->result = (DID_RESET << 16);
                         list_del(&tmp_evt->list);
-                        unmap_cmd_data(&tmp_evt->iu.srp.cmd, tmp_evt->hostdata->dev);
+                        unmap_cmd_data(&tmp_evt->iu.srp.cmd, tmp_evt,
+                                       tmp_evt->hostdata->dev);
                         free_event_struct(&tmp_evt->hostdata->pool,
                                                    tmp_evt);
                         atomic_inc(&hostdata->request_limit);
@@ -1017,6 +1104,7 @@ static int ibmvscsi_eh_device_reset_handler(struct scsi_cmnd *cmd)
                                 tmp_evt->done(tmp_evt);
                 }
         }
+        spin_unlock_irqrestore(hostdata->host->host_lock, flags);
         return SUCCESS;
 }
 
@@ -1035,6 +1123,7 @@ static void purge_requests(struct ibmvscsi_host_data *hostdata)
                 if (tmp_evt->cmnd) {
                         tmp_evt->cmnd->result = (DID_ERROR << 16);
                         unmap_cmd_data(&tmp_evt->iu.srp.cmd, 
+                                       tmp_evt, 
                                        tmp_evt->hostdata->dev);
                         if (tmp_evt->cmnd_done)
                                 tmp_evt->cmnd_done(tmp_evt->cmnd);
@@ -1339,7 +1428,7 @@ static struct scsi_host_template driver_template = {
         .cmd_per_lun = 16,
         .can_queue = 1,         /* Updated after SRP_LOGIN */
         .this_id = -1,
-        .sg_tablesize = MAX_INDIRECT_BUFS,
+        .sg_tablesize = SG_ALL,
         .use_clustering = ENABLE_CLUSTERING,
         .shost_attrs = ibmvscsi_attrs,
 };
diff --git a/drivers/scsi/ibmvscsi/ibmvscsi.h b/drivers/scsi/ibmvscsi/ibmvscsi.h
index 1030b703c30..8bec0438dc8 100644
--- a/drivers/scsi/ibmvscsi/ibmvscsi.h
+++ b/drivers/scsi/ibmvscsi/ibmvscsi.h
@@ -68,6 +68,8 @@ struct srp_event_struct {
         void (*cmnd_done) (struct scsi_cmnd *);
         struct completion comp;
         union viosrp_iu *sync_srp;
+        struct memory_descriptor *ext_list;
+        dma_addr_t ext_list_token;
 };
 
 /* a pool of event structs for use */
diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c
index dee4b12b034..5cc53cd9323 100644
--- a/drivers/scsi/libata-core.c
+++ b/drivers/scsi/libata-core.c
@@ -75,6 +75,10 @@ static void __ata_qc_complete(struct ata_queued_cmd *qc);
 static unsigned int ata_unique_id = 1;
 static struct workqueue_struct *ata_wq;
 
+int atapi_enabled = 0;
+module_param(atapi_enabled, int, 0444);
+MODULE_PARM_DESC(atapi_enabled, "Enable discovery of ATAPI devices (0=off, 1=on)");
+
 MODULE_AUTHOR("Jeff Garzik");
 MODULE_DESCRIPTION("Library module for ATA devices");
 MODULE_LICENSE("GPL");
@@ -2527,7 +2531,7 @@ void swap_buf_le16(u16 *buf, unsigned int buf_words)
  *      @ap: port to read/write
  *      @buf: data buffer
  *      @buflen: buffer length
- *      @do_write: read/write
+ *      @write_data: read/write
  *
  *      Transfer data from/to the device data register by MMIO.
  *
@@ -2573,7 +2577,7 @@ static void ata_mmio_data_xfer(struct ata_port *ap, unsigned char *buf,
  *      @ap: port to read/write
  *      @buf: data buffer
  *      @buflen: buffer length
- *      @do_write: read/write
+ *      @write_data: read/write
  *
  *      Transfer data from/to the device data register by PIO.
  *
@@ -4200,6 +4204,15 @@ ata_probe_ent_alloc(struct device *dev, struct ata_port_info *port)
 
 
 
+#ifdef CONFIG_PCI
+
+void ata_pci_host_stop (struct ata_host_set *host_set)
+{
+        struct pci_dev *pdev = to_pci_dev(host_set->dev);
+
+        pci_iounmap(pdev, host_set->mmio_base);
+}
+
 /**
  *      ata_pci_init_native_mode - Initialize native-mode driver
  *      @pdev:  pci device to be initialized
@@ -4212,7 +4225,6 @@ ata_probe_ent_alloc(struct device *dev, struct ata_port_info *port)
  *      ata_probe_ent structure should then be freed with kfree().
  */
 
-#ifdef CONFIG_PCI
 struct ata_probe_ent *
 ata_pci_init_native_mode(struct pci_dev *pdev, struct ata_port_info **port)
 {
@@ -4595,6 +4607,7 @@ EXPORT_SYMBOL_GPL(ata_scsi_simulate);
 
 #ifdef CONFIG_PCI
 EXPORT_SYMBOL_GPL(pci_test_config_bits);
+EXPORT_SYMBOL_GPL(ata_pci_host_stop);
 EXPORT_SYMBOL_GPL(ata_pci_init_native_mode);
 EXPORT_SYMBOL_GPL(ata_pci_init_one);
 EXPORT_SYMBOL_GPL(ata_pci_remove_one);
diff --git a/drivers/scsi/libata-scsi.c b/drivers/scsi/libata-scsi.c
index 346eb36b1e3..104fd9a63e7 100644
--- a/drivers/scsi/libata-scsi.c
+++ b/drivers/scsi/libata-scsi.c
@@ -1470,10 +1470,10 @@ ata_scsi_find_dev(struct ata_port *ap, struct scsi_device *scsidev)
         if (unlikely(!ata_dev_present(dev)))
                 return NULL;
 
-#ifndef ATA_ENABLE_ATAPI
-        if (unlikely(dev->class == ATA_DEV_ATAPI))
-                return NULL;
-#endif
+        if (!atapi_enabled) {
+                if (unlikely(dev->class == ATA_DEV_ATAPI))
+                        return NULL;
+        }
 
         return dev;
 }
diff --git a/drivers/scsi/libata.h b/drivers/scsi/libata.h
index 809c634afbc..d608b3a0f6f 100644
--- a/drivers/scsi/libata.h
+++ b/drivers/scsi/libata.h
@@ -38,6 +38,7 @@ struct ata_scsi_args {
 };
 
 /* libata-core.c */
+extern int atapi_enabled;
 extern struct ata_queued_cmd *ata_qc_new_init(struct ata_port *ap,
                                       struct ata_device *dev);
 extern void ata_qc_free(struct ata_queued_cmd *qc);
diff --git a/drivers/scsi/lpfc/lpfc.h b/drivers/scsi/lpfc/lpfc.h
index 3bb82aae432..adb95674823 100644
--- a/drivers/scsi/lpfc/lpfc.h
+++ b/drivers/scsi/lpfc/lpfc.h
@@ -342,9 +342,6 @@ struct lpfc_hba {
 #define VPD_MASK            0xf         /* mask for any vpd data */
 
         struct timer_list els_tmofunc;
-
-        void *link_stats;
-
         /*
          * stat  counters
          */
@@ -370,6 +367,8 @@ struct lpfc_hba {
         struct list_head freebufList;
         struct list_head ctrspbuflist;
         struct list_head rnidrspbuflist;
+
+        struct fc_host_statistics link_stats;
 };
 
 
diff --git a/drivers/scsi/lpfc/lpfc_attr.c b/drivers/scsi/lpfc/lpfc_attr.c
index 3cea9288301..0e089a42c03 100644
--- a/drivers/scsi/lpfc/lpfc_attr.c
+++ b/drivers/scsi/lpfc/lpfc_attr.c
@@ -23,6 +23,7 @@
 #include <linux/pci.h>
 #include <linux/interrupt.h>
 
+#include <scsi/scsi.h>
 #include <scsi/scsi_device.h>
 #include <scsi/scsi_host.h>
 #include <scsi/scsi_tcq.h>
@@ -988,8 +989,7 @@ lpfc_get_stats(struct Scsi_Host *shost)
 {
         struct lpfc_hba *phba = (struct lpfc_hba *)shost->hostdata[0];
         struct lpfc_sli *psli = &phba->sli;
-        struct fc_host_statistics *hs =
-                        (struct fc_host_statistics *)phba->link_stats;
+        struct fc_host_statistics *hs = &phba->link_stats;
         LPFC_MBOXQ_t *pmboxq;
         MAILBOX_t *pmb;
         int rc=0;
@@ -1020,6 +1020,8 @@ lpfc_get_stats(struct Scsi_Host *shost)
                 return NULL;
         }
 
+        memset(hs, 0, sizeof (struct fc_host_statistics));
+
         hs->tx_frames = pmb->un.varRdStatus.xmitFrameCnt;
         hs->tx_words = (pmb->un.varRdStatus.xmitByteCnt * 256);
         hs->rx_frames = pmb->un.varRdStatus.rcvFrameCnt;
diff --git a/drivers/scsi/lpfc/lpfc_ct.c b/drivers/scsi/lpfc/lpfc_ct.c
index 78adee4699a..1280f0e5463 100644
--- a/drivers/scsi/lpfc/lpfc_ct.c
+++ b/drivers/scsi/lpfc/lpfc_ct.c
@@ -27,8 +27,10 @@
 #include <linux/interrupt.h>
 #include <linux/utsname.h>
 
+#include <scsi/scsi.h>
 #include <scsi/scsi_device.h>
 #include <scsi/scsi_host.h>
+#include <scsi/scsi_transport_fc.h>
 
 #include "lpfc_hw.h"
 #include "lpfc_sli.h"
diff --git a/drivers/scsi/lpfc/lpfc_els.c b/drivers/scsi/lpfc/lpfc_els.c
index 2b1c9572dae..63caf7fe972 100644
--- a/drivers/scsi/lpfc/lpfc_els.c
+++ b/drivers/scsi/lpfc/lpfc_els.c
@@ -23,6 +23,7 @@
 #include <linux/pci.h>
 #include <linux/interrupt.h>
 
+#include <scsi/scsi.h>
 #include <scsi/scsi_device.h>
 #include <scsi/scsi_host.h>
 #include <scsi/scsi_transport_fc.h>
diff --git a/drivers/scsi/lpfc/lpfc_hbadisc.c b/drivers/scsi/lpfc/lpfc_hbadisc.c
index 233901e9dfd..0a8269d6b13 100644
--- a/drivers/scsi/lpfc/lpfc_hbadisc.c
+++ b/drivers/scsi/lpfc/lpfc_hbadisc.c
@@ -24,6 +24,7 @@
 #include <linux/kthread.h>
 #include <linux/interrupt.h>
 
+#include <scsi/scsi.h>
 #include <scsi/scsi_device.h>
 #include <scsi/scsi_host.h>
 #include <scsi/scsi_transport_fc.h>
@@ -1135,6 +1136,8 @@ lpfc_nlp_list(struct lpfc_hba * phba, struct lpfc_nodelist * nlp, int list)
         switch(list) {
         case NLP_NO_LIST: /* No list, just remove it */
                 lpfc_nlp_remove(phba, nlp);
+                /* as node removed - stop further transport calls */
+                rport_del = none;
                 break;
         case NLP_UNUSED_LIST:
                 spin_lock_irq(phba->host->host_lock);
diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
index 34d416d2b00..6f3cb59bf9e 100644
--- a/drivers/scsi/lpfc/lpfc_init.c
+++ b/drivers/scsi/lpfc/lpfc_init.c
@@ -28,6 +28,7 @@
 #include <linux/pci.h>
 #include <linux/spinlock.h>
 
+#include <scsi/scsi.h>
 #include <scsi/scsi_device.h>
 #include <scsi/scsi_host.h>
 #include <scsi/scsi_transport_fc.h>
@@ -1339,14 +1340,12 @@ lpfc_pci_probe_one(struct pci_dev *pdev, const struct pci_device_id *pid)
         if (pci_request_regions(pdev, LPFC_DRIVER_NAME))
                 goto out_disable_device;
 
-        host = scsi_host_alloc(&lpfc_template,
-                        sizeof (struct lpfc_hba) + sizeof (unsigned long));
+        host = scsi_host_alloc(&lpfc_template, sizeof (struct lpfc_hba));
         if (!host)
                 goto out_release_regions;
 
         phba = (struct lpfc_hba*)host->hostdata;
         memset(phba, 0, sizeof (struct lpfc_hba));
-        phba->link_stats = (void *)&phba[1];
         phba->host = host;
 
         phba->fc_flag |= FC_LOADING;
diff --git a/drivers/scsi/lpfc/lpfc_mbox.c b/drivers/scsi/lpfc/lpfc_mbox.c
index c27cf94795d..73eb89f9159 100644
--- a/drivers/scsi/lpfc/lpfc_mbox.c
+++ b/drivers/scsi/lpfc/lpfc_mbox.c
@@ -23,6 +23,11 @@
 #include <linux/pci.h>
 #include <linux/interrupt.h>
 
+#include <scsi/scsi_device.h>
+#include <scsi/scsi_transport_fc.h>
+
+#include <scsi/scsi.h>
+
 #include "lpfc_hw.h"
 #include "lpfc_sli.h"
 #include "lpfc_disc.h"
diff --git a/drivers/scsi/lpfc/lpfc_mem.c b/drivers/scsi/lpfc/lpfc_mem.c
index a5cfb6421fa..0aba13ceaac 100644
--- a/drivers/scsi/lpfc/lpfc_mem.c
+++ b/drivers/scsi/lpfc/lpfc_mem.c
@@ -23,6 +23,11 @@
 #include <linux/pci.h>
 #include <linux/interrupt.h>
 
+#include <scsi/scsi_device.h>
+#include <scsi/scsi_transport_fc.h>
+
+#include <scsi/scsi.h>
+
 #include "lpfc_hw.h"
 #include "lpfc_sli.h"
 #include "lpfc_disc.h"
diff --git a/drivers/scsi/lpfc/lpfc_nportdisc.c b/drivers/scsi/lpfc/lpfc_nportdisc.c
index 45dc0210fc4..9b35eaac781 100644
--- a/drivers/scsi/lpfc/lpfc_nportdisc.c
+++ b/drivers/scsi/lpfc/lpfc_nportdisc.c
@@ -23,6 +23,7 @@
 #include <linux/pci.h>
 #include <linux/interrupt.h>
 
+#include <scsi/scsi.h>
 #include <scsi/scsi_device.h>
 #include <scsi/scsi_host.h>
 #include <scsi/scsi_transport_fc.h>
diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c
index 17e4974d444..b5ad1871d34 100644
--- a/drivers/scsi/lpfc/lpfc_scsi.c
+++ b/drivers/scsi/lpfc/lpfc_scsi.c
@@ -40,11 +40,6 @@
 #define LPFC_RESET_WAIT  2
 #define LPFC_ABORT_WAIT  2
 
-static inline void lpfc_put_lun(struct fcp_cmnd *fcmd, unsigned int lun)
-{
-        fcmd->fcpLunLsl = 0;
-        fcmd->fcpLunMsl = swab16((uint16_t)lun);
-}
 
 /*
  * This routine allocates a scsi buffer, which contains all the necessary
@@ -238,6 +233,8 @@ lpfc_scsi_prep_dma_buf(struct lpfc_hba * phba, struct lpfc_scsi_buf * lpfc_cmd)
                 bpl->tus.f.bdeSize = scsi_cmnd->request_bufflen;
                 if (datadir == DMA_TO_DEVICE)
                         bpl->tus.f.bdeFlags = 0;
+                else
+                        bpl->tus.f.bdeFlags = BUFF_USE_RCV;
                 bpl->tus.w = le32_to_cpu(bpl->tus.w);
                 num_bde = 1;
                 bpl++;
@@ -245,8 +242,11 @@ lpfc_scsi_prep_dma_buf(struct lpfc_hba * phba, struct lpfc_scsi_buf * lpfc_cmd)
 
         /*
          * Finish initializing those IOCB fields that are dependent on the
-         * scsi_cmnd request_buffer
+         * scsi_cmnd request_buffer.  Note that the bdeSize is explicitly
+         * reinitialized since all iocb memory resources are used many times
+         * for transmit, receive, and continuation bpl's.
          */
+        iocb_cmd->un.fcpi64.bdl.bdeSize = (2 * sizeof (struct ulp_bde64));
         iocb_cmd->un.fcpi64.bdl.bdeSize +=
                 (num_bde * sizeof (struct ulp_bde64));
         iocb_cmd->ulpBdeCount = 1;
@@ -445,8 +445,11 @@ lpfc_scsi_prep_cmnd(struct lpfc_hba * phba, struct lpfc_scsi_buf * lpfc_cmd,
         int datadir = scsi_cmnd->sc_data_direction;
 
         lpfc_cmd->fcp_rsp->rspSnsLen = 0;
+        /* clear task management bits */
+        lpfc_cmd->fcp_cmnd->fcpCntl2 = 0;
 
-        lpfc_put_lun(lpfc_cmd->fcp_cmnd, lpfc_cmd->pCmd->device->lun);
+        int_to_scsilun(lpfc_cmd->pCmd->device->lun,
+                        &lpfc_cmd->fcp_cmnd->fcp_lun);
 
         memcpy(&fcp_cmnd->fcpCdb[0], scsi_cmnd->cmnd, 16);
 
@@ -545,7 +548,8 @@ lpfc_scsi_prep_task_mgmt_cmd(struct lpfc_hba *phba,
         piocb = &piocbq->iocb;
 
         fcp_cmnd = lpfc_cmd->fcp_cmnd;
-        lpfc_put_lun(lpfc_cmd->fcp_cmnd, lpfc_cmd->pCmd->device->lun);
+        int_to_scsilun(lpfc_cmd->pCmd->device->lun,
+                        &lpfc_cmd->fcp_cmnd->fcp_lun);
         fcp_cmnd->fcpCntl2 = task_mgmt_cmd;
 
         piocb->ulpCommand = CMD_FCP_ICMND64_CR;
@@ -746,6 +750,10 @@ lpfc_queuecommand(struct scsi_cmnd *cmnd, void (*done) (struct scsi_cmnd *))
                         cmnd->result = ScsiResult(DID_NO_CONNECT, 0);
                         goto out_fail_command;
                 }
+                else if (ndlp->nlp_state == NLP_STE_NPR_NODE) {
+                        cmnd->result = ScsiResult(DID_BUS_BUSY, 0);
+                        goto out_fail_command;
+                }
                 /*
                  * The device is most likely recovered and the driver
                  * needs a bit more time to finish.  Ask the midlayer
diff --git a/drivers/scsi/lpfc/lpfc_scsi.h b/drivers/scsi/lpfc/lpfc_scsi.h
index 0fd9ba14e1b..acd64c49e84 100644
--- a/drivers/scsi/lpfc/lpfc_scsi.h
+++ b/drivers/scsi/lpfc/lpfc_scsi.h
@@ -78,18 +78,7 @@ struct fcp_rsp {
 };
 
 struct fcp_cmnd {
-        uint32_t fcpLunMsl;     /* most  significant lun word (32 bits) */
-        uint32_t fcpLunLsl;     /* least significant lun word (32 bits) */
-        /* # of bits to shift lun id to end up in right
-         * payload word, little endian = 8, big = 16.
-         */
-#ifdef __BIG_ENDIAN
-#define FC_LUN_SHIFT         16
-#define FC_ADDR_MODE_SHIFT   24
-#else   /*  __LITTLE_ENDIAN */
-#define FC_LUN_SHIFT         8
-#define FC_ADDR_MODE_SHIFT   0
-#endif
+        struct scsi_lun  fcp_lun;
 
         uint8_t fcpCntl0;       /* FCP_CNTL byte 0 (reserved) */
         uint8_t fcpCntl1;       /* FCP_CNTL byte 1 task codes */
diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c
index 1775508ed27..e74e224fd77 100644
--- a/drivers/scsi/lpfc/lpfc_sli.c
+++ b/drivers/scsi/lpfc/lpfc_sli.c
@@ -24,9 +24,11 @@
 #include <linux/interrupt.h>
 #include <linux/delay.h>
 
+#include <scsi/scsi.h>
 #include <scsi/scsi_cmnd.h>
 #include <scsi/scsi_device.h>
 #include <scsi/scsi_host.h>
+#include <scsi/scsi_transport_fc.h>
 
 #include "lpfc_hw.h"
 #include "lpfc_sli.h"
diff --git a/drivers/scsi/lpfc/lpfc_version.h b/drivers/scsi/lpfc/lpfc_version.h
index 47dea48ee0e..7e6747b06f9 100644
--- a/drivers/scsi/lpfc/lpfc_version.h
+++ b/drivers/scsi/lpfc/lpfc_version.h
@@ -18,7 +18,7 @@
  * included with this package.                                     *
  *******************************************************************/
 
-#define LPFC_DRIVER_VERSION "8.0.29"
+#define LPFC_DRIVER_VERSION "8.0.30"
 
 #define LPFC_DRIVER_NAME "lpfc"
 
diff --git a/drivers/scsi/mesh.c b/drivers/scsi/mesh.c
index ff1933298da..a4857db4f9b 100644
--- a/drivers/scsi/mesh.c
+++ b/drivers/scsi/mesh.c
@@ -1766,7 +1766,7 @@ static int mesh_suspend(struct macio_dev *mdev, pm_message_t state)
         struct mesh_state *ms = (struct mesh_state *)macio_get_drvdata(mdev);
         unsigned long flags;
 
-        if (state == mdev->ofdev.dev.power.power_state || state < 2)
+        if (state.event == mdev->ofdev.dev.power.power_state.event || state.event < 2)
                 return 0;
 
         scsi_block_requests(ms->host);
@@ -1791,7 +1791,7 @@ static int mesh_resume(struct macio_dev *mdev)
         struct mesh_state *ms = (struct mesh_state *)macio_get_drvdata(mdev);
         unsigned long flags;
 
-        if (mdev->ofdev.dev.power.power_state == 0)
+        if (mdev->ofdev.dev.power.power_state.event == PM_EVENT_ON)
                 return 0;
 
         set_mesh_power(ms, 1);
@@ -1802,7 +1802,7 @@ static int mesh_resume(struct macio_dev *mdev)
         enable_irq(ms->meshintr);
         scsi_unblock_requests(ms->host);
 
-        mdev->ofdev.dev.power.power_state = 0;
+        mdev->ofdev.dev.power.power_state.event = PM_EVENT_ON;
 
         return 0;
 }
diff --git a/drivers/scsi/qla1280.c b/drivers/scsi/qla1280.c
index b993652bfa2..637fb6565d2 100644
--- a/drivers/scsi/qla1280.c
+++ b/drivers/scsi/qla1280.c
@@ -996,7 +996,6 @@ qla1280_error_action(struct scsi_cmnd *cmd, enum action action)
                 break;
 
         case ABORT_DEVICE:
-                ha->flags.in_reset = 1;
                 if (qla1280_verbose)
                         printk(KERN_INFO
                                "scsi(%ld:%d:%d:%d): Queueing abort device "
@@ -1010,7 +1009,6 @@ qla1280_error_action(struct scsi_cmnd *cmd, enum action action)
                         printk(KERN_INFO
                                "scsi(%ld:%d:%d:%d): Queueing device reset "
                                "command.\n", ha->host_no, bus, target, lun);
-                ha->flags.in_reset = 1;
                 if (qla1280_device_reset(ha, bus, target) == 0)
                         result = SUCCESS;
                 break;
@@ -1019,7 +1017,6 @@ qla1280_error_action(struct scsi_cmnd *cmd, enum action action)
                 if (qla1280_verbose)
                         printk(KERN_INFO "qla1280(%ld:%d): Issuing BUS "
                                "DEVICE RESET\n", ha->host_no, bus);
-                ha->flags.in_reset = 1;
                 if (qla1280_bus_reset(ha, bus == 0))
                         result = SUCCESS;
 
@@ -1047,7 +1044,6 @@ qla1280_error_action(struct scsi_cmnd *cmd, enum action action)
 
         if (!list_empty(&ha->done_q))
                 qla1280_done(ha);
-        ha->flags.in_reset = 0;
 
         /* If we didn't manage to issue the action, or we have no
          * command to wait for, exit here */
@@ -1269,6 +1265,22 @@ qla1280_biosparam_old(Disk * disk, kdev_t dev, int geom[])
         return qla1280_biosparam(disk->device, NULL, disk->capacity, geom);
 }
 #endif
+ 
+/* disable risc and host interrupts */
+static inline void
+qla1280_disable_intrs(struct scsi_qla_host *ha)
+{
+        WRT_REG_WORD(&ha->iobase->ictrl, 0);
+        RD_REG_WORD(&ha->iobase->ictrl);        /* PCI Posted Write flush */
+}
+
+/* enable risc and host interrupts */
+static inline void
+qla1280_enable_intrs(struct scsi_qla_host *ha)
+{
+        WRT_REG_WORD(&ha->iobase->ictrl, (ISP_EN_INT | ISP_EN_RISC));
+        RD_REG_WORD(&ha->iobase->ictrl);        /* PCI Posted Write flush */
+}
 
 /**************************************************************************
  * qla1280_intr_handler
@@ -1290,7 +1302,7 @@ qla1280_intr_handler(int irq, void *dev_id, struct pt_regs *regs)
         ha->isr_count++;
         reg = ha->iobase;
 
-        WRT_REG_WORD(&reg->ictrl, 0);   /* disable our interrupt. */
+        qla1280_disable_intrs(ha);
 
         data = qla1280_debounce_register(&reg->istatus);
         /* Check for pending interrupts. */
@@ -1303,8 +1315,7 @@ qla1280_intr_handler(int irq, void *dev_id, struct pt_regs *regs)
 
         spin_unlock(HOST_LOCK);
 
-        /* enable our interrupt. */
-        WRT_REG_WORD(&reg->ictrl, (ISP_EN_INT | ISP_EN_RISC));
+        qla1280_enable_intrs(ha);
 
         LEAVE_INTR("qla1280_intr_handler");
         return IRQ_RETVAL(handled);
@@ -1317,7 +1328,7 @@ qla1280_set_target_parameters(struct scsi_qla_host *ha, int bus, int target)
         uint8_t mr;
         uint16_t mb[MAILBOX_REGISTER_COUNT];
         struct nvram *nv;
-        int status;
+        int status, lun;
 
         nv = &ha->nvram;
 
@@ -1325,24 +1336,38 @@ qla1280_set_target_parameters(struct scsi_qla_host *ha, int bus, int target)
 
         /* Set Target Parameters. */
         mb[0] = MBC_SET_TARGET_PARAMETERS;
-        mb[1] = (uint16_t) (bus ? target | BIT_7 : target);
-        mb[1] <<= 8;
-
-        mb[2] = (nv->bus[bus].target[target].parameter.c << 8);
+        mb[1] = (uint16_t)((bus ? target | BIT_7 : target) << 8);
+        mb[2] = nv->bus[bus].target[target].parameter.renegotiate_on_error << 8;
+        mb[2] |= nv->bus[bus].target[target].parameter.stop_queue_on_check << 9;
+        mb[2] |= nv->bus[bus].target[target].parameter.auto_request_sense << 10;
+        mb[2] |= nv->bus[bus].target[target].parameter.tag_queuing << 11;
+        mb[2] |= nv->bus[bus].target[target].parameter.enable_sync << 12;
+        mb[2] |= nv->bus[bus].target[target].parameter.enable_wide << 13;
+        mb[2] |= nv->bus[bus].target[target].parameter.parity_checking << 14;
+        mb[2] |= nv->bus[bus].target[target].parameter.disconnect_allowed << 15;
 
         if (IS_ISP1x160(ha)) {
                 mb[2] |= nv->bus[bus].target[target].ppr_1x160.flags.enable_ppr << 5;
-                mb[3] = (nv->bus[bus].target[target].flags.flags1x160.sync_offset << 8) |
-                         nv->bus[bus].target[target].sync_period;
+                mb[3] = (nv->bus[bus].target[target].flags.flags1x160.sync_offset << 8);
                 mb[6] = (nv->bus[bus].target[target].ppr_1x160.flags.ppr_options << 8) |
                          nv->bus[bus].target[target].ppr_1x160.flags.ppr_bus_width;
                 mr |= BIT_6;
         } else {
-                mb[3] = (nv->bus[bus].target[target].flags.flags1x80.sync_offset << 8) |
-                         nv->bus[bus].target[target].sync_period;
+                mb[3] = (nv->bus[bus].target[target].flags.flags1x80.sync_offset << 8);
         }
+        mb[3] |= nv->bus[bus].target[target].sync_period;
 
-        status = qla1280_mailbox_command(ha, mr, &mb[0]);
+        status = qla1280_mailbox_command(ha, mr, mb);
+
+        /* Set Device Queue Parameters. */
+        for (lun = 0; lun < MAX_LUNS; lun++) {
+                mb[0] = MBC_SET_DEVICE_QUEUE;
+                mb[1] = (uint16_t)((bus ? target | BIT_7 : target) << 8);
+                mb[1] |= lun;
+                mb[2] = nv->bus[bus].max_queue_depth;
+                mb[3] = nv->bus[bus].target[target].execution_throttle;
+                status |= qla1280_mailbox_command(ha, 0x0f, mb);
+        }
 
         if (status)
                 printk(KERN_WARNING "scsi(%ld:%i:%i): "
@@ -1389,19 +1414,19 @@ qla1280_slave_configure(struct scsi_device *device)
         }
 
 #if LINUX_VERSION_CODE > 0x020500
-        nv->bus[bus].target[target].parameter.f.enable_sync = device->sdtr;
-        nv->bus[bus].target[target].parameter.f.enable_wide = device->wdtr;
+        nv->bus[bus].target[target].parameter.enable_sync = device->sdtr;
+        nv->bus[bus].target[target].parameter.enable_wide = device->wdtr;
         nv->bus[bus].target[target].ppr_1x160.flags.enable_ppr = device->ppr;
 #endif
 
         if (driver_setup.no_sync ||
             (driver_setup.sync_mask &&
              (~driver_setup.sync_mask & (1 << target))))
-                nv->bus[bus].target[target].parameter.f.enable_sync = 0;
+                nv->bus[bus].target[target].parameter.enable_sync = 0;
         if (driver_setup.no_wide ||
             (driver_setup.wide_mask &&
              (~driver_setup.wide_mask & (1 << target))))
-                nv->bus[bus].target[target].parameter.f.enable_wide = 0;
+                nv->bus[bus].target[target].parameter.enable_wide = 0;
         if (IS_ISP1x160(ha)) {
                 if (driver_setup.no_ppr ||
                     (driver_setup.ppr_mask &&
@@ -1410,7 +1435,7 @@ qla1280_slave_configure(struct scsi_device *device)
         }
 
         spin_lock_irqsave(HOST_LOCK, flags);
-        if (nv->bus[bus].target[target].parameter.f.enable_sync)
+        if (nv->bus[bus].target[target].parameter.enable_sync)
                 status = qla1280_set_target_parameters(ha, bus, target);
         qla1280_get_target_parameters(ha, device);
         spin_unlock_irqrestore(HOST_LOCK, flags);
@@ -1448,7 +1473,6 @@ qla1280_select_queue_depth(struct Scsi_Host *host, struct scsi_device *sdev_q)
  *
  * Input:
  *      ha           = adapter block pointer.
- *      done_q       = done queue.
  */
 static void
 qla1280_done(struct scsi_qla_host *ha)
@@ -1522,7 +1546,7 @@ qla1280_return_status(struct response * sts, struct scsi_cmnd *cp)
         int host_status = DID_ERROR;
         uint16_t comp_status = le16_to_cpu(sts->comp_status);
         uint16_t state_flags = le16_to_cpu(sts->state_flags);
-        uint16_t residual_length = le16_to_cpu(sts->residual_length);
+        uint16_t residual_length = le32_to_cpu(sts->residual_length);
         uint16_t scsi_status = le16_to_cpu(sts->scsi_status);
 #if DEBUG_QLA1280_INTR
         static char *reason[] = {
@@ -1582,7 +1606,7 @@ qla1280_return_status(struct response * sts, struct scsi_cmnd *cp)
 
         case CS_DATA_OVERRUN:
                 dprintk(2, "Data overrun 0x%x\n", residual_length);
-                dprintk(2, "qla1280_isr: response packet data\n");
+                dprintk(2, "qla1280_return_status: response packet data\n");
                 qla1280_dump_buffer(2, (char *)sts, RESPONSE_ENTRY_SIZE);
                 host_status = DID_ERROR;
                 break;
@@ -1617,40 +1641,6 @@ qla1280_return_status(struct response * sts, struct scsi_cmnd *cp)
 /*                QLogic ISP1280 Hardware Support Functions.                */
 /****************************************************************************/
 
- /*
-  * qla2100_enable_intrs
-  * qla2100_disable_intrs
-  *
-  * Input:
-  *      ha = adapter block pointer.
-  *
-  * Returns:
-  *      None
-  */
-static inline void
-qla1280_enable_intrs(struct scsi_qla_host *ha)
-{
-        struct device_reg __iomem *reg;
-
-        reg = ha->iobase;
-        /* enable risc and host interrupts */
-        WRT_REG_WORD(&reg->ictrl, (ISP_EN_INT | ISP_EN_RISC));
-        RD_REG_WORD(&reg->ictrl);       /* PCI Posted Write flush */
-        ha->flags.ints_enabled = 1;
-}
-
-static inline void
-qla1280_disable_intrs(struct scsi_qla_host *ha)
-{
-        struct device_reg __iomem *reg;
-
-        reg = ha->iobase;
-        /* disable risc and host interrupts */
-        WRT_REG_WORD(&reg->ictrl, 0);
-        RD_REG_WORD(&reg->ictrl);       /* PCI Posted Write flush */
-        ha->flags.ints_enabled = 0;
-}
-
 /*
  * qla1280_initialize_adapter
  *      Initialize board.
@@ -1679,7 +1669,6 @@ qla1280_initialize_adapter(struct scsi_qla_host *ha)
         ha->flags.reset_active = 0;
         ha->flags.abort_isp_active = 0;
 
-        ha->flags.ints_enabled = 0;
 #if defined(CONFIG_IA64_GENERIC) || defined(CONFIG_IA64_SGI_SN2)
         if (ia64_platform_is("sn2")) {
                 printk(KERN_INFO "scsi(%li): Enabling SN2 PCI DMA "
@@ -1758,69 +1747,6 @@ qla1280_initialize_adapter(struct scsi_qla_host *ha)
         return status;
 }
 
-
-/*
- * ISP Firmware Test
- *      Checks if present version of RISC firmware is older than
- *      driver firmware.
- *
- * Input:
- *      ha = adapter block pointer.
- *
- * Returns:
- *      0 = firmware does not need to be loaded.
- */
-static int
-qla1280_isp_firmware(struct scsi_qla_host *ha)
-{
-        struct nvram *nv = (struct nvram *) ha->response_ring;
-        int status = 0;         /* dg 2/27 always loads RISC */
-        uint16_t mb[MAILBOX_REGISTER_COUNT];
-
-        ENTER("qla1280_isp_firmware");
-
-        dprintk(1, "scsi(%li): Determining if RISC is loaded\n", ha->host_no);
-
-        /* Bad NVRAM data, load RISC code. */
-        if (!ha->nvram_valid) {
-                ha->flags.disable_risc_code_load = 0;
-        } else
-                ha->flags.disable_risc_code_load =
-                        nv->cntr_flags_1.disable_loading_risc_code;
-
-        if (ha->flags.disable_risc_code_load) {
-                dprintk(3, "qla1280_isp_firmware: Telling RISC to verify "
-                        "checksum of loaded BIOS code.\n");
-
-                /* Verify checksum of loaded RISC code. */
-                mb[0] = MBC_VERIFY_CHECKSUM;
-                /* mb[1] = ql12_risc_code_addr01; */
-                mb[1] = *ql1280_board_tbl[ha->devnum].fwstart;
-
-                if (!(status =
-                      qla1280_mailbox_command(ha, BIT_1 | BIT_0, &mb[0]))) {
-                        /* Start firmware execution. */
-                        dprintk(3, "qla1280_isp_firmware: Startng F/W "
-                                "execution.\n");
-
-                        mb[0] = MBC_EXECUTE_FIRMWARE;
-                        /* mb[1] = ql12_risc_code_addr01; */
-                        mb[1] = *ql1280_board_tbl[ha->devnum].fwstart;
-                        qla1280_mailbox_command(ha, BIT_1 | BIT_0, &mb[0]);
-                } else
-                        printk(KERN_INFO "qla1280: RISC checksum failed.\n");
-        } else {
-                dprintk(1, "qla1280: NVRAM configured to load RISC load.\n");
-                status = 1;
-        }
-
-        if (status)
-                dprintk(2, "qla1280_isp_firmware: **** Load RISC code ****\n");
-
-        LEAVE("qla1280_isp_firmware");
-        return status;
-}
-
 /*
  * Chip diagnostics
  *      Test chip for proper operation.
@@ -2006,7 +1932,7 @@ qla1280_load_firmware_dma(struct scsi_qla_host *ha)
                         "%d,%d(0x%x)\n",
                         risc_code_address, cnt, num, risc_address);
                 for(i = 0; i < cnt; i++)
-                        ((uint16_t *)ha->request_ring)[i] =
+                        ((__le16 *)ha->request_ring)[i] =
                                 cpu_to_le16(risc_code_address[i]);
 
                 mb[0] = MBC_LOAD_RAM;
@@ -2085,7 +2011,7 @@ qla1280_start_firmware(struct scsi_qla_host *ha)
         mb[1] = *ql1280_board_tbl[ha->devnum].fwstart;
         err = qla1280_mailbox_command(ha, BIT_1 | BIT_0, mb);
         if (err) {
-                printk(KERN_ERR "scsi(%li): Failed checksum\n", ha->host_no);
+                printk(KERN_ERR "scsi(%li): RISC checksum failed.\n", ha->host_no);
                 return err;
         }
 
@@ -2105,14 +2031,7 @@ qla1280_start_firmware(struct scsi_qla_host *ha)
 static int
 qla1280_load_firmware(struct scsi_qla_host *ha)
 {
-        int err = -ENODEV;
-
-        /* If firmware needs to be loaded */
-        if (!qla1280_isp_firmware(ha)) {
-                printk(KERN_ERR "scsi(%li): isp_firmware() failed!\n",
-                                ha->host_no);
-                goto out;
-        }
+        int err;
 
         err = qla1280_chip_diag(ha);
         if (err)
@@ -2246,17 +2165,17 @@ qla1280_set_target_defaults(struct scsi_qla_host *ha, int bus, int target)
 {
         struct nvram *nv = &ha->nvram;
 
-        nv->bus[bus].target[target].parameter.f.renegotiate_on_error = 1;
-        nv->bus[bus].target[target].parameter.f.auto_request_sense = 1;
-        nv->bus[bus].target[target].parameter.f.tag_queuing = 1;
-        nv->bus[bus].target[target].parameter.f.enable_sync = 1;
+        nv->bus[bus].target[target].parameter.renegotiate_on_error = 1;
+        nv->bus[bus].target[target].parameter.auto_request_sense = 1;
+        nv->bus[bus].target[target].parameter.tag_queuing = 1;
+        nv->bus[bus].target[target].parameter.enable_sync = 1;
 #if 1   /* Some SCSI Processors do not seem to like this */
-        nv->bus[bus].target[target].parameter.f.enable_wide = 1;
+        nv->bus[bus].target[target].parameter.enable_wide = 1;
 #endif
-        nv->bus[bus].target[target].parameter.f.parity_checking = 1;
-        nv->bus[bus].target[target].parameter.f.disconnect_allowed = 1;
         nv->bus[bus].target[target].execution_throttle =
                 nv->bus[bus].max_queue_depth - 1;
+        nv->bus[bus].target[target].parameter.parity_checking = 1;
+        nv->bus[bus].target[target].parameter.disconnect_allowed = 1;
 
         if (IS_ISP1x160(ha)) {
                 nv->bus[bus].target[target].flags.flags1x160.device_enable = 1;
@@ -2284,9 +2203,9 @@ qla1280_set_defaults(struct scsi_qla_host *ha)
         /* nv->cntr_flags_1.disable_loading_risc_code = 1; */
         nv->firmware_feature.f.enable_fast_posting = 1;
         nv->firmware_feature.f.disable_synchronous_backoff = 1;
-        nv->termination.f.scsi_bus_0_control = 3;
-        nv->termination.f.scsi_bus_1_control = 3;
-        nv->termination.f.auto_term_support = 1;
+        nv->termination.scsi_bus_0_control = 3;
+        nv->termination.scsi_bus_1_control = 3;
+        nv->termination.auto_term_support = 1;
 
         /*
          * Set default FIFO magic - What appropriate values would be here
@@ -2296,7 +2215,12 @@ qla1280_set_defaults(struct scsi_qla_host *ha)
          * header file provided by QLogic seems to be bogus or incomplete
          * at best.
          */
-        nv->isp_config.c = ISP_CFG1_BENAB|ISP_CFG1_F128;
+        nv->isp_config.burst_enable = 1;
+        if (IS_ISP1040(ha))
+                nv->isp_config.fifo_threshold |= 3;
+        else
+                nv->isp_config.fifo_threshold |= 4;
+
         if (IS_ISP1x160(ha))
                 nv->isp_parameter = 0x01; /* fast memory enable */
 
@@ -2327,66 +2251,53 @@ qla1280_config_target(struct scsi_qla_host *ha, int bus, int target)
         struct nvram *nv = &ha->nvram;
         uint16_t mb[MAILBOX_REGISTER_COUNT];
         int status, lun;
+        uint16_t flag;
 
         /* Set Target Parameters. */
         mb[0] = MBC_SET_TARGET_PARAMETERS;
-        mb[1] = (uint16_t) (bus ? target | BIT_7 : target);
-        mb[1] <<= 8;
-
-        /*
-         * Do not enable wide, sync, and ppr for the initial
-         * INQUIRY run. We enable this later if we determine
-         * the target actually supports it.
-         */
-        nv->bus[bus].target[target].parameter.f.
-                auto_request_sense = 1;
-        nv->bus[bus].target[target].parameter.f.
-                stop_queue_on_check = 0;
-
-        if (IS_ISP1x160(ha))
-                nv->bus[bus].target[target].ppr_1x160.
-                        flags.enable_ppr = 0;
+        mb[1] = (uint16_t)((bus ? target | BIT_7 : target) << 8);
 
         /*
-         * No sync, wide, etc. while probing
+         * Do not enable sync and ppr for the initial INQUIRY run. We
+         * enable this later if we determine the target actually
+         * supports it.
          */
-        mb[2] = (nv->bus[bus].target[target].parameter.c << 8) &
-                ~(TP_SYNC /*| TP_WIDE | TP_PPR*/);
+        mb[2] = (TP_RENEGOTIATE | TP_AUTO_REQUEST_SENSE | TP_TAGGED_QUEUE
+                 | TP_WIDE | TP_PARITY | TP_DISCONNECT);
 
         if (IS_ISP1x160(ha))
                 mb[3] = nv->bus[bus].target[target].flags.flags1x160.sync_offset << 8;
         else
                 mb[3] = nv->bus[bus].target[target].flags.flags1x80.sync_offset << 8;
         mb[3] |= nv->bus[bus].target[target].sync_period;
-
-        status = qla1280_mailbox_command(ha, BIT_3 | BIT_2 | BIT_1 | BIT_0, &mb[0]);
+        status = qla1280_mailbox_command(ha, 0x0f, mb);
 
         /* Save Tag queuing enable flag. */
-        mb[0] = BIT_0 << target;
-        if (nv->bus[bus].target[target].parameter.f.tag_queuing)
-                ha->bus_settings[bus].qtag_enables |= mb[0];
+        flag = (BIT_0 << target) & mb[0];
+        if (nv->bus[bus].target[target].parameter.tag_queuing)
+                ha->bus_settings[bus].qtag_enables |= flag;
 
         /* Save Device enable flag. */
         if (IS_ISP1x160(ha)) {
                 if (nv->bus[bus].target[target].flags.flags1x160.device_enable)
-                        ha->bus_settings[bus].device_enables |= mb[0];
+                        ha->bus_settings[bus].device_enables |= flag;
                 ha->bus_settings[bus].lun_disables |= 0;
         } else {
                 if (nv->bus[bus].target[target].flags.flags1x80.device_enable)
-                        ha->bus_settings[bus].device_enables |= mb[0];
+                        ha->bus_settings[bus].device_enables |= flag;
                 /* Save LUN disable flag. */
                 if (nv->bus[bus].target[target].flags.flags1x80.lun_disable)
-                        ha->bus_settings[bus].lun_disables |= mb[0];
+                        ha->bus_settings[bus].lun_disables |= flag;
         }
 
         /* Set Device Queue Parameters. */
         for (lun = 0; lun < MAX_LUNS; lun++) {
                 mb[0] = MBC_SET_DEVICE_QUEUE;
-                mb[1] = (uint16_t)(bus ? target | BIT_7 : target);
-                mb[1] = mb[1] << 8 | lun;
+                mb[1] = (uint16_t)((bus ? target | BIT_7 : target) << 8);
+                mb[1] |= lun;
                 mb[2] = nv->bus[bus].max_queue_depth;
                 mb[3] = nv->bus[bus].target[target].execution_throttle;
-                status |= qla1280_mailbox_command(ha, 0x0f, &mb[0]);
+                status |= qla1280_mailbox_command(ha, 0x0f, mb);
         }
 
         return status;
@@ -2431,7 +2342,6 @@ qla1280_nvram_config(struct scsi_qla_host *ha)
         struct nvram *nv = &ha->nvram;
         int bus, target, status = 0;
         uint16_t mb[MAILBOX_REGISTER_COUNT];
-        uint16_t mask;
 
         ENTER("qla1280_nvram_config");
 
@@ -2439,7 +2349,7 @@ qla1280_nvram_config(struct scsi_qla_host *ha)
                 /* Always force AUTO sense for LINUX SCSI */
                 for (bus = 0; bus < MAX_BUSES; bus++)
                         for (target = 0; target < MAX_TARGETS; target++) {
-                                nv->bus[bus].target[target].parameter.f.
+                                nv->bus[bus].target[target].parameter.
                                         auto_request_sense = 1;
                         }
         } else {
@@ -2457,31 +2367,40 @@ qla1280_nvram_config(struct scsi_qla_host *ha)
 
                 hwrev = RD_REG_WORD(&reg->cfg_0) & ISP_CFG0_HWMSK;
 
-                cfg1 = RD_REG_WORD(&reg->cfg_1);
+                cfg1 = RD_REG_WORD(&reg->cfg_1) & ~(BIT_4 | BIT_5 | BIT_6);
                 cdma_conf = RD_REG_WORD(&reg->cdma_cfg);
                 ddma_conf = RD_REG_WORD(&reg->ddma_cfg);
 
                 /* Busted fifo, says mjacob. */
-                if (hwrev == ISP_CFG0_1040A)
-                        WRT_REG_WORD(&reg->cfg_1, cfg1 | ISP_CFG1_F64);
-                else
-                        WRT_REG_WORD(&reg->cfg_1, cfg1 | ISP_CFG1_F64 | ISP_CFG1_BENAB);
+                if (hwrev != ISP_CFG0_1040A)
+                        cfg1 |= nv->isp_config.fifo_threshold << 4;
+
+                cfg1 |= nv->isp_config.burst_enable << 2;
+                WRT_REG_WORD(&reg->cfg_1, cfg1);
 
                 WRT_REG_WORD(&reg->cdma_cfg, cdma_conf | CDMA_CONF_BENAB);
                 WRT_REG_WORD(&reg->ddma_cfg, cdma_conf | DDMA_CONF_BENAB);
         } else {
+                uint16_t cfg1, term;
+
                 /* Set ISP hardware DMA burst */
-                mb[0] = nv->isp_config.c;
+                cfg1 = nv->isp_config.fifo_threshold << 4;
+                cfg1 |= nv->isp_config.burst_enable << 2;
                 /* Enable DMA arbitration on dual channel controllers */
                 if (ha->ports > 1)
-                        mb[0] |= BIT_13;
-                WRT_REG_WORD(&reg->cfg_1, mb[0]);
+                        cfg1 |= BIT_13;
+                WRT_REG_WORD(&reg->cfg_1, cfg1);
 
                 /* Set SCSI termination. */
-                WRT_REG_WORD(&reg->gpio_enable, (BIT_3 + BIT_2 + BIT_1 + BIT_0));
-                mb[0] = nv->termination.c & (BIT_3 + BIT_2 + BIT_1 + BIT_0);
-                WRT_REG_WORD(&reg->gpio_data, mb[0]);
+                WRT_REG_WORD(&reg->gpio_enable,
+                             BIT_7 | BIT_3 | BIT_2 | BIT_1 | BIT_0);
+                term = nv->termination.scsi_bus_1_control;
+                term |= nv->termination.scsi_bus_0_control << 2;
+                term |= nv->termination.auto_term_support << 7;
+                RD_REG_WORD(&reg->id_l);        /* Flush PCI write */
+                WRT_REG_WORD(&reg->gpio_data, term);
         }
+        RD_REG_WORD(&reg->id_l);        /* Flush PCI write */
 
         /* ISP parameter word. */
         mb[0] = MBC_SET_SYSTEM_PARAMETER;
@@ -2497,16 +2416,17 @@ qla1280_nvram_config(struct scsi_qla_host *ha)
 
         /* Firmware feature word. */
         mb[0] = MBC_SET_FIRMWARE_FEATURES;
-        mask = BIT_5 | BIT_1 | BIT_0;
-        mb[1] = le16_to_cpu(nv->firmware_feature.w) & (mask);
+        mb[1] = nv->firmware_feature.f.enable_fast_posting;
+        mb[1] |= nv->firmware_feature.f.report_lvd_bus_transition << 1;
+        mb[1] |= nv->firmware_feature.f.disable_synchronous_backoff << 5;
 #if defined(CONFIG_IA64_GENERIC) || defined (CONFIG_IA64_SGI_SN2)
         if (ia64_platform_is("sn2")) {
                 printk(KERN_INFO "scsi(%li): Enabling SN2 PCI DMA "
                        "workaround\n", ha->host_no);
-                mb[1] |= BIT_9;
+                mb[1] |= nv->firmware_feature.f.unused_9 << 9; /* XXX */
         }
 #endif
-        status |= qla1280_mailbox_command(ha, mask, &mb[0]);
+        status |= qla1280_mailbox_command(ha, BIT_1 | BIT_0, mb);
 
         /* Retry count and delay. */
         mb[0] = MBC_SET_RETRY_COUNT;
@@ -2535,27 +2455,27 @@ qla1280_nvram_config(struct scsi_qla_host *ha)
                 mb[2] |= BIT_5;
         if (nv->bus[1].config_2.data_line_active_negation)
                 mb[2] |= BIT_4;
-        status |= qla1280_mailbox_command(ha, BIT_2 | BIT_1 | BIT_0, &mb[0]);
+        status |= qla1280_mailbox_command(ha, BIT_2 | BIT_1 | BIT_0, mb);
 
         mb[0] = MBC_SET_DATA_OVERRUN_RECOVERY;
         mb[1] = 2;      /* Reset SCSI bus and return all outstanding IO */
-        status |= qla1280_mailbox_command(ha, BIT_1 | BIT_0, &mb[0]);
+        status |= qla1280_mailbox_command(ha, BIT_1 | BIT_0, mb);
 
         /* thingy */
         mb[0] = MBC_SET_PCI_CONTROL;
-        mb[1] = 2;      /* Data DMA Channel Burst Enable */
-        mb[2] = 2;      /* Command DMA Channel Burst Enable */
-        status |= qla1280_mailbox_command(ha, BIT_2 | BIT_1 | BIT_0, &mb[0]);
+        mb[1] = BIT_1;  /* Data DMA Channel Burst Enable */
+        mb[2] = BIT_1;  /* Command DMA Channel Burst Enable */
+        status |= qla1280_mailbox_command(ha, BIT_2 | BIT_1 | BIT_0, mb);
 
         mb[0] = MBC_SET_TAG_AGE_LIMIT;
         mb[1] = 8;
-        status |= qla1280_mailbox_command(ha, BIT_1 | BIT_0, &mb[0]);
+        status |= qla1280_mailbox_command(ha, BIT_1 | BIT_0, mb);
 
         /* Selection timeout. */
         mb[0] = MBC_SET_SELECTION_TIMEOUT;
         mb[1] = nv->bus[0].selection_timeout;
         mb[2] = nv->bus[1].selection_timeout;
-        status |= qla1280_mailbox_command(ha, BIT_2 | BIT_1 | BIT_0, &mb[0]);
+        status |= qla1280_mailbox_command(ha, BIT_2 | BIT_1 | BIT_0, mb);
 
         for (bus = 0; bus < ha->ports; bus++)
                 status |= qla1280_config_bus(ha, bus);
@@ -3066,7 +2986,7 @@ qla1280_64bit_start_scsi(struct scsi_qla_host *ha, struct srb * sp)
         struct scsi_cmnd *cmd = sp->cmd;
         cmd_a64_entry_t *pkt;
         struct scatterlist *sg = NULL;
-        u32 *dword_ptr;
+        __le32 *dword_ptr;
         dma_addr_t dma_handle;
         int status = 0;
         int cnt;
@@ -3104,10 +3024,13 @@ qla1280_64bit_start_scsi(struct scsi_qla_host *ha, struct srb * sp)
                                 REQUEST_ENTRY_CNT - (ha->req_ring_index - cnt);
         }
 
+        dprintk(3, "Number of free entries=(%d) seg_cnt=0x%x\n",
+                ha->req_q_cnt, seg_cnt);
+
         /* If room for request in request ring. */
         if ((req_cnt + 2) >= ha->req_q_cnt) {
                 status = 1;
-                dprintk(2, "qla1280_64bit_start_scsi: in-ptr=0x%x  req_q_cnt="
+                dprintk(2, "qla1280_start_scsi: in-ptr=0x%x  req_q_cnt="
                         "0x%xreq_cnt=0x%x", ha->req_ring_index, ha->req_q_cnt,
                         req_cnt);
                 goto out;
@@ -3119,7 +3042,7 @@ qla1280_64bit_start_scsi(struct scsi_qla_host *ha, struct srb * sp)
 
         if (cnt >= MAX_OUTSTANDING_COMMANDS) {
                 status = 1;
-                dprintk(2, "qla1280_64bit_start_scsi: NO ROOM IN "
+                dprintk(2, "qla1280_start_scsi: NO ROOM IN "
                         "OUTSTANDING ARRAY, req_q_cnt=0x%x", ha->req_q_cnt);
                 goto out;
         }
@@ -3128,7 +3051,7 @@ qla1280_64bit_start_scsi(struct scsi_qla_host *ha, struct srb * sp)
         ha->req_q_cnt -= req_cnt;
         CMD_HANDLE(sp->cmd) = (unsigned char *)(unsigned long)(cnt + 1);
 
-        dprintk(2, "64bit_start: cmd=%p sp=%p CDB=%xm, handle %lx\n", cmd, sp,
+        dprintk(2, "start: cmd=%p sp=%p CDB=%xm, handle %lx\n", cmd, sp,
                 cmd->cmnd[0], (long)CMD_HANDLE(sp->cmd));
         dprintk(2, "             bus %i, target %i, lun %i\n",
                 SCSI_BUS_32(cmd), SCSI_TCN_32(cmd), SCSI_LUN_32(cmd));
@@ -3350,7 +3273,7 @@ qla1280_32bit_start_scsi(struct scsi_qla_host *ha, struct srb * sp)
         struct scsi_cmnd *cmd = sp->cmd;
         struct cmd_entry *pkt;
         struct scatterlist *sg = NULL;
-        uint32_t *dword_ptr;
+        __le32 *dword_ptr;
         int status = 0;
         int cnt;
         int req_cnt;
@@ -3993,21 +3916,21 @@ qla1280_get_target_options(struct scsi_cmnd *cmd, struct scsi_qla_host *ha)
         result = cmd->request_buffer;
         n = &ha->nvram;
 
-        n->bus[bus].target[target].parameter.f.enable_wide = 0;
-        n->bus[bus].target[target].parameter.f.enable_sync = 0;
+        n->bus[bus].target[target].parameter.enable_wide = 0;
+        n->bus[bus].target[target].parameter.enable_sync = 0;
         n->bus[bus].target[target].ppr_1x160.flags.enable_ppr = 0;
 
         if (result[7] & 0x60)
-                n->bus[bus].target[target].parameter.f.enable_wide = 1;
+                n->bus[bus].target[target].parameter.enable_wide = 1;
         if (result[7] & 0x10)
-                n->bus[bus].target[target].parameter.f.enable_sync = 1;
+                n->bus[bus].target[target].parameter.enable_sync = 1;
         if ((result[2] >= 3) && (result[4] + 5 > 56) &&
             (result[56] & 0x4))
                 n->bus[bus].target[target].ppr_1x160.flags.enable_ppr = 1;
 
         dprintk(2, "get_target_options(): wide %i, sync %i, ppr %i\n",
-                n->bus[bus].target[target].parameter.f.enable_wide,
-                n->bus[bus].target[target].parameter.f.enable_sync,
+                n->bus[bus].target[target].parameter.enable_wide,
+                n->bus[bus].target[target].parameter.enable_sync,
                 n->bus[bus].target[target].ppr_1x160.flags.enable_ppr);
 }
 #endif
@@ -4071,7 +3994,7 @@ qla1280_status_entry(struct scsi_qla_host *ha, struct response *pkt,
                 /* Save ISP completion status */
                 CMD_RESULT(cmd) = qla1280_return_status(pkt, cmd);
 
-                if (scsi_status & SS_CHECK_CONDITION) {
+                if (scsi_status & SAM_STAT_CHECK_CONDITION) {
                         if (comp_status != CS_ARS_FAILED) {
                                 uint16_t req_sense_length =
                                         le16_to_cpu(pkt->req_sense_length);
@@ -4650,7 +4573,7 @@ qla1280_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
         if (pci_set_dma_mask(ha->pdev, (dma_addr_t) ~ 0ULL)) {
                 if (pci_set_dma_mask(ha->pdev, 0xffffffff)) {
                         printk(KERN_WARNING "scsi(%li): Unable to set a "
-                               " suitable DMA mask - aboring\n", ha->host_no);
+                               "suitable DMA mask - aborting\n", ha->host_no);
                         error = -ENODEV;
                         goto error_free_irq;
                 }
@@ -4660,14 +4583,14 @@ qla1280_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
 #else
         if (pci_set_dma_mask(ha->pdev, 0xffffffff)) {
                 printk(KERN_WARNING "scsi(%li): Unable to set a "
-                       " suitable DMA mask - aboring\n", ha->host_no);
+                       "suitable DMA mask - aborting\n", ha->host_no);
                 error = -ENODEV;
                 goto error_free_irq;
         }
 #endif
 
         ha->request_ring = pci_alloc_consistent(ha->pdev,
-                        ((REQUEST_ENTRY_CNT + 1) * (sizeof(request_t))),
+                        ((REQUEST_ENTRY_CNT + 1) * sizeof(request_t)),
                         &ha->request_dma);
         if (!ha->request_ring) {
                 printk(KERN_INFO "qla1280: Failed to get request memory\n");
@@ -4675,7 +4598,7 @@ qla1280_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
         }
 
         ha->response_ring = pci_alloc_consistent(ha->pdev,
-                        ((RESPONSE_ENTRY_CNT + 1) * (sizeof(struct response))),
+                        ((RESPONSE_ENTRY_CNT + 1) * sizeof(struct response)),
                         &ha->response_dma);
         if (!ha->response_ring) {
                 printk(KERN_INFO "qla1280: Failed to get response memory\n");
@@ -4758,7 +4681,7 @@ qla1280_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
 
 #if LINUX_VERSION_CODE >= 0x020600
  error_disable_adapter:
-        WRT_REG_WORD(&ha->iobase->ictrl, 0);
+        qla1280_disable_intrs(ha);
 #endif
  error_free_irq:
         free_irq(pdev->irq, ha);
@@ -4770,11 +4693,11 @@ qla1280_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
 #endif
  error_free_response_ring:
         pci_free_consistent(ha->pdev,
-                        ((RESPONSE_ENTRY_CNT + 1) * (sizeof(struct response))),
+                        ((RESPONSE_ENTRY_CNT + 1) * sizeof(struct response)),
                         ha->response_ring, ha->response_dma);
  error_free_request_ring:
         pci_free_consistent(ha->pdev,
-                        ((REQUEST_ENTRY_CNT + 1) * (sizeof(request_t))),
+                        ((REQUEST_ENTRY_CNT + 1) * sizeof(request_t)),
                         ha->request_ring, ha->request_dma);
  error_put_host:
         scsi_host_put(host);
@@ -4795,7 +4718,7 @@ qla1280_remove_one(struct pci_dev *pdev)
         scsi_remove_host(host);
 #endif
 
-        WRT_REG_WORD(&ha->iobase->ictrl, 0);
+        qla1280_disable_intrs(ha);
 
         free_irq(pdev->irq, ha);
 
diff --git a/drivers/scsi/qla1280.h b/drivers/scsi/qla1280.h
index d245ae07518..59915fb7030 100644
--- a/drivers/scsi/qla1280.h
+++ b/drivers/scsi/qla1280.h
@@ -94,9 +94,6 @@
 #define REQUEST_ENTRY_CNT               256 /* Number of request entries. */
 #define RESPONSE_ENTRY_CNT              16  /* Number of response entries. */
 
-/* Number of segments 1 - 65535 */
-#define SG_SEGMENTS                     32  /* Cmd entry + 6 continuations */
-
 /*
  * SCSI Request Block structure  (sp)  that is placed
  * on cmd->SCp location of every I/O
@@ -378,29 +375,23 @@ struct nvram {
         uint16_t unused_12;     /* 12, 13 */
         uint16_t unused_14;     /* 14, 15 */
 
-        union {
-                uint8_t c;
-                struct {
-                        uint8_t reserved:2;
-                        uint8_t burst_enable:1;
-                        uint8_t reserved_1:1;
-                        uint8_t fifo_threshold:4;
-                } f;
+        struct {
+                uint8_t reserved:2;
+                uint8_t burst_enable:1;
+                uint8_t reserved_1:1;
+                uint8_t fifo_threshold:4;
         } isp_config;           /* 16 */
 
         /* Termination
          * 0 = Disable, 1 = high only, 3 = Auto term
          */
-        union {
-                uint8_t c;
-                struct {
-                        uint8_t scsi_bus_1_control:2;
-                        uint8_t scsi_bus_0_control:2;
-                        uint8_t unused_0:1;
-                        uint8_t unused_1:1;
-                        uint8_t unused_2:1;
-                        uint8_t auto_term_support:1;
-                } f;
+        struct {
+                uint8_t scsi_bus_1_control:2;
+                uint8_t scsi_bus_0_control:2;
+                uint8_t unused_0:1;
+                uint8_t unused_1:1;
+                uint8_t unused_2:1;
+                uint8_t auto_term_support:1;
         } termination;          /* 17 */
 
         uint16_t isp_parameter; /* 18, 19 */
@@ -460,18 +451,15 @@ struct nvram {
                 uint16_t unused_38;     /* 38, 39 */
 
                 struct {
-                        union {
-                                uint8_t c;
-                                struct {
-                                        uint8_t renegotiate_on_error:1;
-                                        uint8_t stop_queue_on_check:1;
-                                        uint8_t auto_request_sense:1;
-                                        uint8_t tag_queuing:1;
-                                        uint8_t enable_sync:1;
-                                        uint8_t enable_wide:1;
-                                        uint8_t parity_checking:1;
-                                        uint8_t disconnect_allowed:1;
-                                } f;
+                        struct {
+                                uint8_t renegotiate_on_error:1;
+                                uint8_t stop_queue_on_check:1;
+                                uint8_t auto_request_sense:1;
+                                uint8_t tag_queuing:1;
+                                uint8_t enable_sync:1;
+                                uint8_t enable_wide:1;
+                                uint8_t parity_checking:1;
+                                uint8_t disconnect_allowed:1;
                         } parameter;    /* 40 */
 
                         uint8_t execution_throttle;     /* 41 */
@@ -528,23 +516,23 @@ struct cmd_entry {
         uint8_t entry_count;            /* Entry count. */
         uint8_t sys_define;             /* System defined. */
         uint8_t entry_status;           /* Entry Status. */
-        uint32_t handle;                /* System handle. */
+        __le32 handle;                  /* System handle. */
         uint8_t lun;                    /* SCSI LUN */
         uint8_t target;                 /* SCSI ID */
-        uint16_t cdb_len;               /* SCSI command length. */
-        uint16_t control_flags;         /* Control flags. */
-        uint16_t reserved;
-        uint16_t timeout;               /* Command timeout. */
-        uint16_t dseg_count;            /* Data segment count. */
+        __le16 cdb_len;                 /* SCSI command length. */
+        __le16 control_flags;           /* Control flags. */
+        __le16 reserved;
+        __le16 timeout;                 /* Command timeout. */
+        __le16 dseg_count;              /* Data segment count. */
         uint8_t scsi_cdb[MAX_CMDSZ];    /* SCSI command words. */
-        uint32_t dseg_0_address;        /* Data segment 0 address. */
-        uint32_t dseg_0_length;         /* Data segment 0 length. */
-        uint32_t dseg_1_address;        /* Data segment 1 address. */
-        uint32_t dseg_1_length;         /* Data segment 1 length. */
-        uint32_t dseg_2_address;        /* Data segment 2 address. */
-        uint32_t dseg_2_length;         /* Data segment 2 length. */
-        uint32_t dseg_3_address;        /* Data segment 3 address. */
-        uint32_t dseg_3_length;         /* Data segment 3 length. */
+        __le32 dseg_0_address;          /* Data segment 0 address. */
+        __le32 dseg_0_length;           /* Data segment 0 length. */
+        __le32 dseg_1_address;          /* Data segment 1 address. */
+        __le32 dseg_1_length;           /* Data segment 1 length. */
+        __le32 dseg_2_address;          /* Data segment 2 address. */
+        __le32 dseg_2_length;           /* Data segment 2 length. */
+        __le32 dseg_3_address;          /* Data segment 3 address. */
+        __le32 dseg_3_length;           /* Data segment 3 length. */
 };
 
 /*
@@ -556,21 +544,21 @@ struct cont_entry {
         uint8_t entry_count;            /* Entry count. */
         uint8_t sys_define;             /* System defined. */
         uint8_t entry_status;           /* Entry Status. */
-        uint32_t reserved;              /* Reserved */
-        uint32_t dseg_0_address;        /* Data segment 0 address. */
-        uint32_t dseg_0_length;         /* Data segment 0 length. */
-        uint32_t dseg_1_address;        /* Data segment 1 address. */
-        uint32_t dseg_1_length;         /* Data segment 1 length. */
-        uint32_t dseg_2_address;        /* Data segment 2 address. */
-        uint32_t dseg_2_length;         /* Data segment 2 length. */
-        uint32_t dseg_3_address;        /* Data segment 3 address. */
-        uint32_t dseg_3_length;         /* Data segment 3 length. */
-        uint32_t dseg_4_address;        /* Data segment 4 address. */
-        uint32_t dseg_4_length;         /* Data segment 4 length. */
-        uint32_t dseg_5_address;        /* Data segment 5 address. */
-        uint32_t dseg_5_length;         /* Data segment 5 length. */
-        uint32_t dseg_6_address;        /* Data segment 6 address. */
-        uint32_t dseg_6_length;         /* Data segment 6 length. */
+        __le32 reserved;                /* Reserved */
+        __le32 dseg_0_address;          /* Data segment 0 address. */
+        __le32 dseg_0_length;           /* Data segment 0 length. */
+        __le32 dseg_1_address;          /* Data segment 1 address. */
+        __le32 dseg_1_length;           /* Data segment 1 length. */
+        __le32 dseg_2_address;          /* Data segment 2 address. */
+        __le32 dseg_2_length;           /* Data segment 2 length. */
+        __le32 dseg_3_address;          /* Data segment 3 address. */
+        __le32 dseg_3_length;           /* Data segment 3 length. */
+        __le32 dseg_4_address;          /* Data segment 4 address. */
+        __le32 dseg_4_length;           /* Data segment 4 length. */
+        __le32 dseg_5_address;          /* Data segment 5 address. */
+        __le32 dseg_5_length;           /* Data segment 5 length. */
+        __le32 dseg_6_address;          /* Data segment 6 address. */
+        __le32 dseg_6_length;           /* Data segment 6 length. */
 };
 
 /*
@@ -586,22 +574,22 @@ struct response {
 #define RF_FULL         BIT_1   /* Full */
 #define RF_BAD_HEADER   BIT_2   /* Bad header. */
 #define RF_BAD_PAYLOAD  BIT_3   /* Bad payload. */
-        uint32_t handle;        /* System handle. */
-        uint16_t scsi_status;   /* SCSI status. */
-        uint16_t comp_status;   /* Completion status. */
-        uint16_t state_flags;   /* State flags. */
-#define SF_TRANSFER_CMPL BIT_14 /* Transfer Complete. */
-#define SF_GOT_SENSE    BIT_13  /* Got Sense */
-#define SF_GOT_STATUS    BIT_12 /* Got Status */
-#define SF_TRANSFERRED_DATA BIT_11      /* Transferred data */
-#define SF_SENT_CDB   BIT_10    /* Send CDB */
-#define SF_GOT_TARGET  BIT_9    /*  */
-#define SF_GOT_BUS     BIT_8    /*  */
-        uint16_t status_flags;  /* Status flags. */
-        uint16_t time;          /* Time. */
-        uint16_t req_sense_length;      /* Request sense data length. */
-        uint32_t residual_length;       /* Residual transfer length. */
-        uint16_t reserved[4];
+        __le32 handle;          /* System handle. */
+        __le16 scsi_status;     /* SCSI status. */
+        __le16 comp_status;     /* Completion status. */
+        __le16 state_flags;     /* State flags. */
+#define SF_TRANSFER_CMPL        BIT_14  /* Transfer Complete. */
+#define SF_GOT_SENSE            BIT_13  /* Got Sense */
+#define SF_GOT_STATUS           BIT_12  /* Got Status */
+#define SF_TRANSFERRED_DATA     BIT_11  /* Transferred data */
+#define SF_SENT_CDB             BIT_10  /* Send CDB */
+#define SF_GOT_TARGET           BIT_9   /*  */
+#define SF_GOT_BUS              BIT_8   /*  */
+        __le16 status_flags;    /* Status flags. */
+        __le16 time;            /* Time. */
+        __le16 req_sense_length;/* Request sense data length. */
+        __le32 residual_length; /* Residual transfer length. */
+        __le16 reserved[4];
         uint8_t req_sense_data[32];     /* Request sense data. */
 };
 
@@ -614,7 +602,7 @@ struct mrk_entry {
         uint8_t entry_count;    /* Entry count. */
         uint8_t sys_define;     /* System defined. */
         uint8_t entry_status;   /* Entry Status. */
-        uint32_t reserved;
+        __le32 reserved;
         uint8_t lun;            /* SCSI LUN */
         uint8_t target;         /* SCSI ID */
         uint8_t modifier;       /* Modifier (7-0). */
@@ -638,11 +626,11 @@ struct ecmd_entry {
         uint32_t handle;        /* System handle. */
         uint8_t lun;            /* SCSI LUN */
         uint8_t target;         /* SCSI ID */
-        uint16_t cdb_len;       /* SCSI command length. */
-        uint16_t control_flags; /* Control flags. */
-        uint16_t reserved;
-        uint16_t timeout;       /* Command timeout. */
-        uint16_t dseg_count;    /* Data segment count. */
+        __le16 cdb_len;         /* SCSI command length. */
+        __le16 control_flags;   /* Control flags. */
+        __le16 reserved;
+        __le16 timeout;         /* Command timeout. */
+        __le16 dseg_count;      /* Data segment count. */
         uint8_t scsi_cdb[88];   /* SCSI command words. */
 };
 
@@ -655,20 +643,20 @@ typedef struct {
         uint8_t entry_count;    /* Entry count. */
         uint8_t sys_define;     /* System defined. */
         uint8_t entry_status;   /* Entry Status. */
-        uint32_t handle;        /* System handle. */
+        __le32 handle;  /* System handle. */
         uint8_t lun;            /* SCSI LUN */
         uint8_t target;         /* SCSI ID */
-        uint16_t cdb_len;       /* SCSI command length. */
-        uint16_t control_flags; /* Control flags. */
-        uint16_t reserved;
-        uint16_t timeout;       /* Command timeout. */
-        uint16_t dseg_count;    /* Data segment count. */
+        __le16 cdb_len; /* SCSI command length. */
+        __le16 control_flags;   /* Control flags. */
+        __le16 reserved;
+        __le16 timeout; /* Command timeout. */
+        __le16 dseg_count;      /* Data segment count. */
         uint8_t scsi_cdb[MAX_CMDSZ];    /* SCSI command words. */
-        uint32_t reserved_1[2]; /* unused */
-        uint32_t dseg_0_address[2];     /* Data segment 0 address. */
-        uint32_t dseg_0_length; /* Data segment 0 length. */
-        uint32_t dseg_1_address[2];     /* Data segment 1 address. */
-        uint32_t dseg_1_length; /* Data segment 1 length. */
+        __le32 reserved_1[2];   /* unused */
+        __le32 dseg_0_address[2];       /* Data segment 0 address. */
+        __le32 dseg_0_length;   /* Data segment 0 length. */
+        __le32 dseg_1_address[2];       /* Data segment 1 address. */
+        __le32 dseg_1_length;   /* Data segment 1 length. */
 } cmd_a64_entry_t, request_t;
 
 /*
@@ -680,16 +668,16 @@ struct cont_a64_entry {
         uint8_t entry_count;    /* Entry count. */
         uint8_t sys_define;     /* System defined. */
         uint8_t entry_status;   /* Entry Status. */
-        uint32_t dseg_0_address[2];     /* Data segment 0 address. */
-        uint32_t dseg_0_length; /* Data segment 0 length. */
-        uint32_t dseg_1_address[2];     /* Data segment 1 address. */
-        uint32_t dseg_1_length; /* Data segment 1 length. */
-        uint32_t dseg_2_address[2];     /* Data segment 2 address. */
-        uint32_t dseg_2_length; /* Data segment 2 length. */
-        uint32_t dseg_3_address[2];     /* Data segment 3 address. */
-        uint32_t dseg_3_length; /* Data segment 3 length. */
-        uint32_t dseg_4_address[2];     /* Data segment 4 address. */
-        uint32_t dseg_4_length; /* Data segment 4 length. */
+        __le32 dseg_0_address[2];       /* Data segment 0 address. */
+        __le32 dseg_0_length;           /* Data segment 0 length. */
+        __le32 dseg_1_address[2];       /* Data segment 1 address. */
+        __le32 dseg_1_length;           /* Data segment 1 length. */
+        __le32 dseg_2_address[2];       /* Data segment 2 address. */
+        __le32 dseg_2_length;           /* Data segment 2 length. */
+        __le32 dseg_3_address[2];       /* Data segment 3 address. */
+        __le32 dseg_3_length;           /* Data segment 3 length. */
+        __le32 dseg_4_address[2];       /* Data segment 4 address. */
+        __le32 dseg_4_length;           /* Data segment 4 length. */
 };
 
 /*
@@ -701,10 +689,10 @@ struct elun_entry {
         uint8_t entry_count;    /* Entry count. */
         uint8_t reserved_1;
         uint8_t entry_status;   /* Entry Status not used. */
-        uint32_t reserved_2;
-        uint16_t lun;           /* Bit 15 is bus number. */
-        uint16_t reserved_4;
-        uint32_t option_flags;
+        __le32 reserved_2;
+        __le16 lun;             /* Bit 15 is bus number. */
+        __le16 reserved_4;
+        __le32 option_flags;
         uint8_t status;
         uint8_t reserved_5;
         uint8_t command_count;  /* Number of ATIOs allocated. */
@@ -714,8 +702,8 @@ struct elun_entry {
         /* commands (2-26). */
         uint8_t group_7_length; /* SCSI CDB length for group 7 */
         /* commands (2-26). */
-        uint16_t timeout;       /* 0 = 30 seconds, 0xFFFF = disable */
-        uint16_t reserved_6[20];
+        __le16 timeout;         /* 0 = 30 seconds, 0xFFFF = disable */
+        __le16 reserved_6[20];
 };
 
 /*
@@ -729,20 +717,20 @@ struct modify_lun_entry {
         uint8_t entry_count;    /* Entry count. */
         uint8_t reserved_1;
         uint8_t entry_status;   /* Entry Status. */
-        uint32_t reserved_2;
+        __le32 reserved_2;
         uint8_t lun;            /* SCSI LUN */
         uint8_t reserved_3;
         uint8_t operators;
         uint8_t reserved_4;
-        uint32_t option_flags;
+        __le32 option_flags;
         uint8_t status;
         uint8_t reserved_5;
         uint8_t command_count;  /* Number of ATIOs allocated. */
         uint8_t immed_notify_count;     /* Number of Immediate Notify */
         /* entries allocated. */
-        uint16_t reserved_6;
-        uint16_t timeout;       /* 0 = 30 seconds, 0xFFFF = disable */
-        uint16_t reserved_7[20];
+        __le16 reserved_6;
+        __le16 timeout;         /* 0 = 30 seconds, 0xFFFF = disable */
+        __le16 reserved_7[20];
 };
 
 /*
@@ -754,20 +742,20 @@ struct notify_entry {
         uint8_t entry_count;    /* Entry count. */
         uint8_t reserved_1;
         uint8_t entry_status;   /* Entry Status. */
-        uint32_t reserved_2;
+        __le32 reserved_2;
         uint8_t lun;
         uint8_t initiator_id;
         uint8_t reserved_3;
         uint8_t target_id;
-        uint32_t option_flags;
+        __le32 option_flags;
         uint8_t status;
         uint8_t reserved_4;
         uint8_t tag_value;      /* Received queue tag message value */
         uint8_t tag_type;       /* Received queue tag message type */
         /* entries allocated. */
-        uint16_t seq_id;
+        __le16 seq_id;
         uint8_t scsi_msg[8];    /* SCSI message not handled by ISP */
-        uint16_t reserved_5[8];
+        __le16 reserved_5[8];
         uint8_t sense_data[18];
 };
 
@@ -780,16 +768,16 @@ struct nack_entry {
         uint8_t entry_count;    /* Entry count. */
         uint8_t reserved_1;
         uint8_t entry_status;   /* Entry Status. */
-        uint32_t reserved_2;
+        __le32 reserved_2;
         uint8_t lun;
         uint8_t initiator_id;
         uint8_t reserved_3;
         uint8_t target_id;
-        uint32_t option_flags;
+        __le32 option_flags;
         uint8_t status;
         uint8_t event;
-        uint16_t seq_id;
-        uint16_t reserved_4[22];
+        __le16 seq_id;
+        __le16 reserved_4[22];
 };
 
 /*
@@ -801,12 +789,12 @@ struct atio_entry {
         uint8_t entry_count;    /* Entry count. */
         uint8_t reserved_1;
         uint8_t entry_status;   /* Entry Status. */
-        uint32_t reserved_2;
+        __le32 reserved_2;
         uint8_t lun;
         uint8_t initiator_id;
         uint8_t cdb_len;
         uint8_t target_id;
-        uint32_t option_flags;
+        __le32 option_flags;
         uint8_t status;
         uint8_t scsi_status;
         uint8_t tag_value;      /* Received queue tag message value */
@@ -824,28 +812,28 @@ struct ctio_entry {
         uint8_t entry_count;    /* Entry count. */
         uint8_t reserved_1;
         uint8_t entry_status;   /* Entry Status. */
-        uint32_t reserved_2;
+        __le32 reserved_2;
         uint8_t lun;            /* SCSI LUN */
         uint8_t initiator_id;
         uint8_t reserved_3;
         uint8_t target_id;
-        uint32_t option_flags;
+        __le32 option_flags;
         uint8_t status;
         uint8_t scsi_status;
         uint8_t tag_value;      /* Received queue tag message value */
         uint8_t tag_type;       /* Received queue tag message type */
-        uint32_t transfer_length;
-        uint32_t residual;
-        uint16_t timeout;       /* 0 = 30 seconds, 0xFFFF = disable */
-        uint16_t dseg_count;    /* Data segment count. */
-        uint32_t dseg_0_address;        /* Data segment 0 address. */
-        uint32_t dseg_0_length; /* Data segment 0 length. */
-        uint32_t dseg_1_address;        /* Data segment 1 address. */
-        uint32_t dseg_1_length; /* Data segment 1 length. */
-        uint32_t dseg_2_address;        /* Data segment 2 address. */
-        uint32_t dseg_2_length; /* Data segment 2 length. */
-        uint32_t dseg_3_address;        /* Data segment 3 address. */
-        uint32_t dseg_3_length; /* Data segment 3 length. */
+        __le32 transfer_length;
+        __le32 residual;
+        __le16 timeout;         /* 0 = 30 seconds, 0xFFFF = disable */
+        __le16 dseg_count;      /* Data segment count. */
+        __le32 dseg_0_address;  /* Data segment 0 address. */
+        __le32 dseg_0_length;   /* Data segment 0 length. */
+        __le32 dseg_1_address;  /* Data segment 1 address. */
+        __le32 dseg_1_length;   /* Data segment 1 length. */
+        __le32 dseg_2_address;  /* Data segment 2 address. */
+        __le32 dseg_2_length;   /* Data segment 2 length. */
+        __le32 dseg_3_address;  /* Data segment 3 address. */
+        __le32 dseg_3_length;   /* Data segment 3 length. */
 };
 
 /*
@@ -857,24 +845,24 @@ struct ctio_ret_entry {
         uint8_t entry_count;    /* Entry count. */
         uint8_t reserved_1;
         uint8_t entry_status;   /* Entry Status. */
-        uint32_t reserved_2;
+        __le32 reserved_2;
         uint8_t lun;            /* SCSI LUN */
         uint8_t initiator_id;
         uint8_t reserved_3;
         uint8_t target_id;
-        uint32_t option_flags;
+        __le32 option_flags;
         uint8_t status;
         uint8_t scsi_status;
         uint8_t tag_value;      /* Received queue tag message value */
         uint8_t tag_type;       /* Received queue tag message type */
-        uint32_t transfer_length;
-        uint32_t residual;
-        uint16_t timeout;       /* 0 = 30 seconds, 0xFFFF = disable */
-        uint16_t dseg_count;    /* Data segment count. */
-        uint32_t dseg_0_address;        /* Data segment 0 address. */
-        uint32_t dseg_0_length; /* Data segment 0 length. */
-        uint32_t dseg_1_address;        /* Data segment 1 address. */
-        uint16_t dseg_1_length; /* Data segment 1 length. */
+        __le32 transfer_length;
+        __le32 residual;
+        __le16 timeout;         /* 0 = 30 seconds, 0xFFFF = disable */
+        __le16 dseg_count;      /* Data segment count. */
+        __le32 dseg_0_address;  /* Data segment 0 address. */
+        __le32 dseg_0_length;   /* Data segment 0 length. */
+        __le32 dseg_1_address;  /* Data segment 1 address. */
+        __le16 dseg_1_length;   /* Data segment 1 length. */
         uint8_t sense_data[18];
 };
 
@@ -887,25 +875,25 @@ struct ctio_a64_entry {
         uint8_t entry_count;    /* Entry count. */
         uint8_t reserved_1;
         uint8_t entry_status;   /* Entry Status. */
-        uint32_t reserved_2;
+        __le32 reserved_2;
         uint8_t lun;            /* SCSI LUN */
         uint8_t initiator_id;
         uint8_t reserved_3;
         uint8_t target_id;
-        uint32_t option_flags;
+        __le32 option_flags;
         uint8_t status;
         uint8_t scsi_status;
         uint8_t tag_value;      /* Received queue tag message value */
         uint8_t tag_type;       /* Received queue tag message type */
-        uint32_t transfer_length;
-        uint32_t residual;
-        uint16_t timeout;       /* 0 = 30 seconds, 0xFFFF = disable */
-        uint16_t dseg_count;    /* Data segment count. */
-        uint32_t reserved_4[2];
-        uint32_t dseg_0_address[2];     /* Data segment 0 address. */
-        uint32_t dseg_0_length; /* Data segment 0 length. */
-        uint32_t dseg_1_address[2];     /* Data segment 1 address. */
-        uint32_t dseg_1_length; /* Data segment 1 length. */
+        __le32 transfer_length;
+        __le32 residual;
+        __le16 timeout;         /* 0 = 30 seconds, 0xFFFF = disable */
+        __le16 dseg_count;      /* Data segment count. */
+        __le32 reserved_4[2];
+        __le32 dseg_0_address[2];/* Data segment 0 address. */
+        __le32 dseg_0_length;   /* Data segment 0 length. */
+        __le32 dseg_1_address[2];/* Data segment 1 address. */
+        __le32 dseg_1_length;   /* Data segment 1 length. */
 };
 
 /*
@@ -917,21 +905,21 @@ struct ctio_a64_ret_entry {
         uint8_t entry_count;    /* Entry count. */
         uint8_t reserved_1;
         uint8_t entry_status;   /* Entry Status. */
-        uint32_t reserved_2;
+        __le32 reserved_2;
         uint8_t lun;            /* SCSI LUN */
         uint8_t initiator_id;
         uint8_t reserved_3;
         uint8_t target_id;
-        uint32_t option_flags;
+        __le32 option_flags;
         uint8_t status;
         uint8_t scsi_status;
         uint8_t tag_value;      /* Received queue tag message value */
         uint8_t tag_type;       /* Received queue tag message type */
-        uint32_t transfer_length;
-        uint32_t residual;
-        uint16_t timeout;       /* 0 = 30 seconds, 0xFFFF = disable */
-        uint16_t dseg_count;    /* Data segment count. */
-        uint16_t reserved_4[7];
+        __le32 transfer_length;
+        __le32 residual;
+        __le16 timeout;         /* 0 = 30 seconds, 0xFFFF = disable */
+        __le16 dseg_count;      /* Data segment count. */
+        __le16 reserved_4[7];
         uint8_t sense_data[18];
 };
 
@@ -979,14 +967,6 @@ struct ctio_a64_ret_entry {
 #define CS_RETRY            0x82        /* Driver defined */
 
 /*
- * ISP status entry - SCSI status byte bit definitions.
- */
-#define SS_CHECK_CONDITION  BIT_1
-#define SS_CONDITION_MET    BIT_2
-#define SS_BUSY_CONDITION   BIT_3
-#define SS_RESERVE_CONFLICT (BIT_4 | BIT_3)
-
-/*
  * ISP target entries - Option flags bit definitions.
  */
 #define OF_ENABLE_TAG       BIT_1       /* Tagged queue action enable */
@@ -1082,10 +1062,6 @@ struct scsi_qla_host {
                 uint32_t reset_active:1;                /* 3 */
                 uint32_t abort_isp_active:1;            /* 4 */
                 uint32_t disable_risc_code_load:1;      /* 5 */
-                uint32_t enable_64bit_addressing:1;     /* 6 */
-                uint32_t in_reset:1;                    /* 7 */
-                uint32_t ints_enabled:1;
-                uint32_t ignore_nvram:1;
 #ifdef __ia64__
                 uint32_t use_pci_vchannel:1;
 #endif
diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c
index 659a5d63467..fe0fce71adc 100644
--- a/drivers/scsi/qla2xxx/qla_attr.c
+++ b/drivers/scsi/qla2xxx/qla_attr.c
@@ -211,6 +211,138 @@ qla2x00_free_sysfs_attr(scsi_qla_host_t *ha)
         sysfs_remove_bin_file(&host->shost_gendev.kobj, &sysfs_nvram_attr);
 }
 
+/* Scsi_Host attributes. */
+
+static ssize_t
+qla2x00_drvr_version_show(struct class_device *cdev, char *buf)
+{
+        return snprintf(buf, PAGE_SIZE, "%s\n", qla2x00_version_str);
+}
+
+static ssize_t
+qla2x00_fw_version_show(struct class_device *cdev, char *buf)
+{
+        scsi_qla_host_t *ha = to_qla_host(class_to_shost(cdev));
+        char fw_str[30];
+
+        return snprintf(buf, PAGE_SIZE, "%s\n",
+            ha->isp_ops.fw_version_str(ha, fw_str));
+}
+
+static ssize_t
+qla2x00_serial_num_show(struct class_device *cdev, char *buf)
+{
+        scsi_qla_host_t *ha = to_qla_host(class_to_shost(cdev));
+        uint32_t sn;
+
+        sn = ((ha->serial0 & 0x1f) << 16) | (ha->serial2 << 8) | ha->serial1;
+        return snprintf(buf, PAGE_SIZE, "%c%05d\n", 'A' + sn / 100000,
+            sn % 100000);
+}
+
+static ssize_t
+qla2x00_isp_name_show(struct class_device *cdev, char *buf)
+{
+        scsi_qla_host_t *ha = to_qla_host(class_to_shost(cdev));
+        return snprintf(buf, PAGE_SIZE, "%s\n", ha->brd_info->isp_name);
+}
+
+static ssize_t
+qla2x00_isp_id_show(struct class_device *cdev, char *buf)
+{
+        scsi_qla_host_t *ha = to_qla_host(class_to_shost(cdev));
+        return snprintf(buf, PAGE_SIZE, "%04x %04x %04x %04x\n",
+            ha->product_id[0], ha->product_id[1], ha->product_id[2],
+            ha->product_id[3]);
+}
+
+static ssize_t
+qla2x00_model_name_show(struct class_device *cdev, char *buf)
+{
+        scsi_qla_host_t *ha = to_qla_host(class_to_shost(cdev));
+        return snprintf(buf, PAGE_SIZE, "%s\n", ha->model_number);
+}
+
+static ssize_t
+qla2x00_model_desc_show(struct class_device *cdev, char *buf)
+{
+        scsi_qla_host_t *ha = to_qla_host(class_to_shost(cdev));
+        return snprintf(buf, PAGE_SIZE, "%s\n",
+            ha->model_desc ? ha->model_desc: "");
+}
+
+static ssize_t
+qla2x00_pci_info_show(struct class_device *cdev, char *buf)
+{
+        scsi_qla_host_t *ha = to_qla_host(class_to_shost(cdev));
+        char pci_info[30];
+
+        return snprintf(buf, PAGE_SIZE, "%s\n",
+            ha->isp_ops.pci_info_str(ha, pci_info));
+}
+
+static ssize_t
+qla2x00_state_show(struct class_device *cdev, char *buf)
+{
+        scsi_qla_host_t *ha = to_qla_host(class_to_shost(cdev));
+        int len = 0;
+
+        if (atomic_read(&ha->loop_state) == LOOP_DOWN ||
+            atomic_read(&ha->loop_state) == LOOP_DEAD)
+                len = snprintf(buf, PAGE_SIZE, "Link Down\n");
+        else if (atomic_read(&ha->loop_state) != LOOP_READY ||
+            test_bit(ABORT_ISP_ACTIVE, &ha->dpc_flags) ||
+            test_bit(ISP_ABORT_NEEDED, &ha->dpc_flags))
+                len = snprintf(buf, PAGE_SIZE, "Unknown Link State\n");
+        else {
+                len = snprintf(buf, PAGE_SIZE, "Link Up - ");
+
+                switch (ha->current_topology) {
+                case ISP_CFG_NL:
+                        len += snprintf(buf + len, PAGE_SIZE-len, "Loop\n");
+                        break;
+                case ISP_CFG_FL:
+                        len += snprintf(buf + len, PAGE_SIZE-len, "FL_Port\n");
+                        break;
+                case ISP_CFG_N:
+                        len += snprintf(buf + len, PAGE_SIZE-len,
+                            "N_Port to N_Port\n");
+                        break;
+                case ISP_CFG_F:
+                        len += snprintf(buf + len, PAGE_SIZE-len, "F_Port\n");
+                        break;
+                default:
+                        len += snprintf(buf + len, PAGE_SIZE-len, "Loop\n");
+                        break;
+                }
+        }
+        return len;
+}
+
+static CLASS_DEVICE_ATTR(driver_version, S_IRUGO, qla2x00_drvr_version_show,
+        NULL);
+static CLASS_DEVICE_ATTR(fw_version, S_IRUGO, qla2x00_fw_version_show, NULL);
+static CLASS_DEVICE_ATTR(serial_num, S_IRUGO, qla2x00_serial_num_show, NULL);
+static CLASS_DEVICE_ATTR(isp_name, S_IRUGO, qla2x00_isp_name_show, NULL);
+static CLASS_DEVICE_ATTR(isp_id, S_IRUGO, qla2x00_isp_id_show, NULL);
+static CLASS_DEVICE_ATTR(model_name, S_IRUGO, qla2x00_model_name_show, NULL);
+static CLASS_DEVICE_ATTR(model_desc, S_IRUGO, qla2x00_model_desc_show, NULL);
+static CLASS_DEVICE_ATTR(pci_info, S_IRUGO, qla2x00_pci_info_show, NULL);
+static CLASS_DEVICE_ATTR(state, S_IRUGO, qla2x00_state_show, NULL);
+
+struct class_device_attribute *qla2x00_host_attrs[] = {
+        &class_device_attr_driver_version,
+        &class_device_attr_fw_version,
+        &class_device_attr_serial_num,
+        &class_device_attr_isp_name,
+        &class_device_attr_isp_id,
+        &class_device_attr_model_name,
+        &class_device_attr_model_desc,
+        &class_device_attr_pci_info,
+        &class_device_attr_state,
+        NULL,
+};
+
 /* Host attributes. */
 
 static void
@@ -304,10 +436,13 @@ struct fc_function_template qla2xxx_transport_functions = {
 
         .show_host_node_name = 1,
         .show_host_port_name = 1,
+        .show_host_supported_classes = 1,
+
         .get_host_port_id = qla2x00_get_host_port_id,
         .show_host_port_id = 1,
 
         .dd_fcrport_size = sizeof(struct fc_port *),
+        .show_rport_supported_classes = 1,
 
         .get_starget_node_name = qla2x00_get_starget_node_name,
         .show_starget_node_name = 1,
@@ -329,4 +464,5 @@ qla2x00_init_host_attr(scsi_qla_host_t *ha)
             be64_to_cpu(*(uint64_t *)ha->init_cb->node_name);
         fc_host_port_name(ha->host) =
             be64_to_cpu(*(uint64_t *)ha->init_cb->port_name);
+        fc_host_supported_classes(ha->host) = FC_COS_CLASS3;
 }
diff --git a/drivers/scsi/qla2xxx/qla_dbg.h b/drivers/scsi/qla2xxx/qla_dbg.h
index b8d90e97e01..9684e7a91fa 100644
--- a/drivers/scsi/qla2xxx/qla_dbg.h
+++ b/drivers/scsi/qla2xxx/qla_dbg.h
@@ -81,6 +81,7 @@
 #define DEBUG2_3_11(x)  do {x;} while (0);
 #define DEBUG2_9_10(x)    do {x;} while (0);
 #define DEBUG2_11(x)    do {x;} while (0);
+#define DEBUG2_13(x)    do {x;} while (0);
 #else
 #define DEBUG2(x)       do {} while (0);
 #endif
@@ -169,8 +170,14 @@
 
 #if defined(QL_DEBUG_LEVEL_13)
 #define DEBUG13(x)      do {x;} while (0)
+#if !defined(DEBUG2_13)
+#define DEBUG2_13(x)    do {x;} while(0)
+#endif
 #else
 #define DEBUG13(x)      do {} while (0)
+#if !defined(QL_DEBUG_LEVEL_2)
+#define DEBUG2_13(x)    do {} while(0)
+#endif
 #endif
 
 #if defined(QL_DEBUG_LEVEL_14)
diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h
index 1c6d366f4fa..b455c31405e 100644
--- a/drivers/scsi/qla2xxx/qla_def.h
+++ b/drivers/scsi/qla2xxx/qla_def.h
@@ -214,6 +214,7 @@
  * valid range of an N-PORT id is 0 through 0x7ef.
  */
 #define NPH_LAST_HANDLE         0x7ef
+#define NPH_MGMT_SERVER         0x7fa           /*  FFFFFA */
 #define NPH_SNS                 0x7fc           /*  FFFFFC */
 #define NPH_FABRIC_CONTROLLER   0x7fd           /*  FFFFFD */
 #define NPH_F_PORT              0x7fe           /*  FFFFFE */
@@ -630,6 +631,7 @@ typedef struct {
 #define MBC_WRITE_RAM_WORD_EXTENDED     0xd     /* Write RAM word extended */
 #define MBC_READ_RAM_EXTENDED           0xf     /* Read RAM extended. */
 #define MBC_IOCB_COMMAND                0x12    /* Execute IOCB command. */
+#define MBC_STOP_FIRMWARE               0x14    /* Stop firmware. */
 #define MBC_ABORT_COMMAND               0x15    /* Abort IOCB command. */
 #define MBC_ABORT_DEVICE                0x16    /* Abort device (ID/LUN). */
 #define MBC_ABORT_TARGET                0x17    /* Abort target (ID). */
@@ -913,7 +915,7 @@ typedef struct {
          * MSB BIT 1 =
          * MSB BIT 2 =
          * MSB BIT 3 =
-         * MSB BIT 4 =
+         * MSB BIT 4 = LED mode
          * MSB BIT 5 = enable 50 ohm termination
          * MSB BIT 6 = Data Rate (2300 only)
          * MSB BIT 7 = Data Rate (2300 only)
@@ -1035,7 +1037,7 @@ typedef struct {
          * MSB BIT 1 =
          * MSB BIT 2 =
          * MSB BIT 3 =
-         * MSB BIT 4 =
+         * MSB BIT 4 = LED mode
          * MSB BIT 5 = enable 50 ohm termination
          * MSB BIT 6 = Data Rate (2300 only)
          * MSB BIT 7 = Data Rate (2300 only)
@@ -1131,10 +1133,7 @@ typedef struct {
 
         uint8_t link_down_timeout;
 
-        uint8_t adapter_id_0[4];
-        uint8_t adapter_id_1[4];
-        uint8_t adapter_id_2[4];
-        uint8_t adapter_id_3[4];
+        uint8_t adapter_id[16];
 
         uint8_t alt1_boot_node_name[WWN_SIZE];
         uint16_t alt1_boot_lun_number;
@@ -1673,6 +1672,7 @@ typedef struct fc_port {
         uint8_t cur_path;               /* current path id */
 
         struct fc_rport *rport;
+        u32 supported_classes;
 } fc_port_t;
 
 /*
@@ -1727,6 +1727,8 @@ typedef struct fc_port {
 
 #define CT_REJECT_RESPONSE      0x8001
 #define CT_ACCEPT_RESPONSE      0x8002
+#define CT_REASON_CANNOT_PERFORM        0x09
+#define CT_EXPL_ALREADY_REGISTERED      0x10
 
 #define NS_N_PORT_TYPE  0x01
 #define NS_NL_PORT_TYPE 0x02
@@ -1768,6 +1770,100 @@ typedef struct fc_port {
 #define RSNN_NN_REQ_SIZE (16 + 8 + 1 + 255)
 #define RSNN_NN_RSP_SIZE 16
 
+/*
+ * HBA attribute types.
+ */
+#define FDMI_HBA_ATTR_COUNT                     9
+#define FDMI_HBA_NODE_NAME                      1
+#define FDMI_HBA_MANUFACTURER                   2
+#define FDMI_HBA_SERIAL_NUMBER                  3
+#define FDMI_HBA_MODEL                          4
+#define FDMI_HBA_MODEL_DESCRIPTION              5
+#define FDMI_HBA_HARDWARE_VERSION               6
+#define FDMI_HBA_DRIVER_VERSION                 7
+#define FDMI_HBA_OPTION_ROM_VERSION             8
+#define FDMI_HBA_FIRMWARE_VERSION               9
+#define FDMI_HBA_OS_NAME_AND_VERSION            0xa
+#define FDMI_HBA_MAXIMUM_CT_PAYLOAD_LENGTH      0xb
+
+struct ct_fdmi_hba_attr {
+        uint16_t type;
+        uint16_t len;
+        union {
+                uint8_t node_name[WWN_SIZE];
+                uint8_t manufacturer[32];
+                uint8_t serial_num[8];
+                uint8_t model[16];
+                uint8_t model_desc[80];
+                uint8_t hw_version[16];
+                uint8_t driver_version[32];
+                uint8_t orom_version[16];
+                uint8_t fw_version[16];
+                uint8_t os_version[128];
+                uint8_t max_ct_len[4];
+        } a;
+};
+
+struct ct_fdmi_hba_attributes {
+        uint32_t count;
+        struct ct_fdmi_hba_attr entry[FDMI_HBA_ATTR_COUNT];
+};
+
+/*
+ * Port attribute types.
+ */
+#define FDMI_PORT_ATTR_COUNT            5
+#define FDMI_PORT_FC4_TYPES             1
+#define FDMI_PORT_SUPPORT_SPEED         2
+#define FDMI_PORT_CURRENT_SPEED         3
+#define FDMI_PORT_MAX_FRAME_SIZE        4
+#define FDMI_PORT_OS_DEVICE_NAME        5
+#define FDMI_PORT_HOST_NAME             6
+
+struct ct_fdmi_port_attr {
+        uint16_t type;
+        uint16_t len;
+        union {
+                uint8_t fc4_types[32];
+                uint32_t sup_speed;
+                uint32_t cur_speed;
+                uint32_t max_frame_size;
+                uint8_t os_dev_name[32];
+                uint8_t host_name[32];
+        } a;
+};
+
+/*
+ * Port Attribute Block.
+ */
+struct ct_fdmi_port_attributes {
+        uint32_t count;
+        struct ct_fdmi_port_attr entry[FDMI_PORT_ATTR_COUNT];
+};
+
+/* FDMI definitions. */
+#define GRHL_CMD        0x100
+#define GHAT_CMD        0x101
+#define GRPL_CMD        0x102
+#define GPAT_CMD        0x110
+
+#define RHBA_CMD        0x200
+#define RHBA_RSP_SIZE   16
+
+#define RHAT_CMD        0x201
+#define RPRT_CMD        0x210
+
+#define RPA_CMD         0x211
+#define RPA_RSP_SIZE    16
+
+#define DHBA_CMD        0x300
+#define DHBA_REQ_SIZE   (16 + 8)
+#define DHBA_RSP_SIZE   16
+
+#define DHAT_CMD        0x301
+#define DPRT_CMD        0x310
+#define DPA_CMD         0x311
+
 /* CT command header -- request/response common fields */
 struct ct_cmd_hdr {
         uint8_t revision;
@@ -1825,6 +1921,43 @@ struct ct_sns_req {
                         uint8_t name_len;
                         uint8_t sym_node_name[255];
                 } rsnn_nn;
+
+                struct {
+                        uint8_t hba_indentifier[8];
+                } ghat;
+
+                struct {
+                        uint8_t hba_identifier[8];
+                        uint32_t entry_count;
+                        uint8_t port_name[8];
+                        struct ct_fdmi_hba_attributes attrs;
+                } rhba;
+
+                struct {
+                        uint8_t hba_identifier[8];
+                        struct ct_fdmi_hba_attributes attrs;
+                } rhat;
+
+                struct {
+                        uint8_t port_name[8];
+                        struct ct_fdmi_port_attributes attrs;
+                } rpa;
+
+                struct {
+                        uint8_t port_name[8];
+                } dhba;
+
+                struct {
+                        uint8_t port_name[8];
+                } dhat;
+
+                struct {
+                        uint8_t port_name[8];
+                } dprt;
+
+                struct {
+                        uint8_t port_name[8];
+                } dpa;
         } req;
 };
 
@@ -1882,6 +2015,12 @@ struct ct_sns_rsp {
                 struct {
                         uint8_t fc4_types[32];
                 } gft_id;
+
+                struct {
+                        uint32_t entry_count;
+                        uint8_t port_name[8];
+                        struct ct_fdmi_hba_attributes attrs;
+                } ghat;
         } rsp;
 };
 
@@ -2032,6 +2171,8 @@ struct isp_operations {
         uint16_t (*calc_req_entries) (uint16_t);
         void (*build_iocbs) (srb_t *, cmd_entry_t *, uint16_t);
         void * (*prep_ms_iocb) (struct scsi_qla_host *, uint32_t, uint32_t);
+        void * (*prep_ms_fdmi_iocb) (struct scsi_qla_host *, uint32_t,
+            uint32_t);
 
         uint8_t * (*read_nvram) (struct scsi_qla_host *, uint8_t *,
                 uint32_t, uint32_t);
@@ -2111,6 +2252,7 @@ typedef struct scsi_qla_host {
 #define IOCTL_ERROR_RECOVERY    23
 #define LOOP_RESET_NEEDED       24
 #define BEACON_BLINK_NEEDED     25
+#define REGISTER_FDMI_NEEDED    26
 
         uint32_t        device_flags;
 #define DFLG_LOCAL_DEVICES              BIT_0
@@ -2204,6 +2346,7 @@ typedef struct scsi_qla_host {
         int             port_down_retry_count;
         uint8_t         mbx_count;
         uint16_t        last_loop_id;
+        uint16_t        mgmt_svr_loop_id;
 
         uint32_t        login_retry_count;
 
@@ -2318,6 +2461,7 @@ typedef struct scsi_qla_host {
         uint8_t         model_number[16+1];
 #define BINZERO         "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
         char            *model_desc;
+        uint8_t         adapter_id[16+1];
 
         uint8_t         *node_name;
         uint8_t         *port_name;
@@ -2377,6 +2521,7 @@ typedef struct scsi_qla_host {
 #define QLA_SUSPENDED                   0x106
 #define QLA_BUSY                        0x107
 #define QLA_RSCNS_HANDLED               0x108
+#define QLA_ALREADY_REGISTERED          0x109
 
 /*
 * Stat info for all adpaters
diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h
index 665c203e067..1ed32e7b547 100644
--- a/drivers/scsi/qla2xxx/qla_gbl.h
+++ b/drivers/scsi/qla2xxx/qla_gbl.h
@@ -79,6 +79,7 @@ extern int ql2xplogiabsentdevice;
 extern int ql2xenablezio;
 extern int ql2xintrdelaytimer;
 extern int ql2xloginretrycount;
+extern int ql2xfdmienable;
 
 extern void qla2x00_sp_compl(scsi_qla_host_t *, srb_t *);
 
@@ -147,9 +148,6 @@ qla2x00_abort_target(fc_port_t *);
 #endif
 
 extern int
-qla2x00_target_reset(scsi_qla_host_t *, struct fc_port *);
-
-extern int
 qla2x00_get_adapter_id(scsi_qla_host_t *, uint16_t *, uint8_t *, uint8_t *,
     uint8_t *, uint16_t *);
 
@@ -215,6 +213,9 @@ qla2x00_get_serdes_params(scsi_qla_host_t *, uint16_t *, uint16_t *,
 extern int
 qla2x00_set_serdes_params(scsi_qla_host_t *, uint16_t, uint16_t, uint16_t);
 
+extern int
+qla2x00_stop_firmware(scsi_qla_host_t *);
+
 /*
  * Global Function Prototypes in qla_isr.c source file.
  */
@@ -269,6 +270,9 @@ extern int qla2x00_rft_id(scsi_qla_host_t *);
 extern int qla2x00_rff_id(scsi_qla_host_t *);
 extern int qla2x00_rnn_id(scsi_qla_host_t *);
 extern int qla2x00_rsnn_nn(scsi_qla_host_t *);
+extern void *qla2x00_prep_ms_fdmi_iocb(scsi_qla_host_t *, uint32_t, uint32_t);
+extern void *qla24xx_prep_ms_fdmi_iocb(scsi_qla_host_t *, uint32_t, uint32_t);
+extern int qla2x00_fdmi_register(scsi_qla_host_t *);
 
 /*
  * Global Function Prototypes in qla_rscn.c source file.
@@ -289,6 +293,8 @@ extern void qla2x00_cancel_io_descriptors(scsi_qla_host_t *);
 /*
  * Global Function Prototypes in qla_attr.c source file.
  */
+struct class_device_attribute;
+extern struct class_device_attribute *qla2x00_host_attrs[];
 struct fc_function_template;
 extern struct fc_function_template qla2xxx_transport_functions;
 extern void qla2x00_alloc_sysfs_attr(scsi_qla_host_t *);
diff --git a/drivers/scsi/qla2xxx/qla_gs.c b/drivers/scsi/qla2xxx/qla_gs.c
index 31ce4f62da1..e7b138c2e33 100644
--- a/drivers/scsi/qla2xxx/qla_gs.c
+++ b/drivers/scsi/qla2xxx/qla_gs.c
@@ -1099,3 +1099,567 @@ qla2x00_sns_rnn_id(scsi_qla_host_t *ha)
 
         return (rval);
 }
+
+/**
+ * qla2x00_mgmt_svr_login() - Login to fabric Managment Service.
+ * @ha: HA context
+ *
+ * Returns 0 on success.
+ */
+static int
+qla2x00_mgmt_svr_login(scsi_qla_host_t *ha)
+{
+        int ret;
+        uint16_t mb[MAILBOX_REGISTER_COUNT];
+
+        ret = QLA_SUCCESS;
+        if (ha->flags.management_server_logged_in)
+                return ret;
+
+        ha->isp_ops.fabric_login(ha, ha->mgmt_svr_loop_id, 0xff, 0xff, 0xfa,
+            mb, BIT_1);
+        if (mb[0] != MBS_COMMAND_COMPLETE) {
+                DEBUG2_13(printk("%s(%ld): Failed MANAGEMENT_SERVER login: "
+                    "loop_id=%x mb[0]=%x mb[1]=%x mb[2]=%x mb[6]=%x mb[7]=%x\n",
+                    __func__, ha->host_no, ha->mgmt_svr_loop_id, mb[0], mb[1],
+                    mb[2], mb[6], mb[7]));
+                ret = QLA_FUNCTION_FAILED;
+        } else
+                ha->flags.management_server_logged_in = 1;
+
+        return ret;
+}
+
+/**
+ * qla2x00_prep_ms_fdmi_iocb() - Prepare common MS IOCB fields for FDMI query.
+ * @ha: HA context
+ * @req_size: request size in bytes
+ * @rsp_size: response size in bytes
+ *
+ * Returns a pointer to the @ha's ms_iocb.
+ */
+void *
+qla2x00_prep_ms_fdmi_iocb(scsi_qla_host_t *ha, uint32_t req_size,
+    uint32_t rsp_size)
+{
+        ms_iocb_entry_t *ms_pkt;
+
+        ms_pkt = ha->ms_iocb;
+        memset(ms_pkt, 0, sizeof(ms_iocb_entry_t));
+
+        ms_pkt->entry_type = MS_IOCB_TYPE;
+        ms_pkt->entry_count = 1;
+        SET_TARGET_ID(ha, ms_pkt->loop_id, ha->mgmt_svr_loop_id);
+        ms_pkt->control_flags = __constant_cpu_to_le16(CF_READ | CF_HEAD_TAG);
+        ms_pkt->timeout = __constant_cpu_to_le16(59);
+        ms_pkt->cmd_dsd_count = __constant_cpu_to_le16(1);
+        ms_pkt->total_dsd_count = __constant_cpu_to_le16(2);
+        ms_pkt->rsp_bytecount = cpu_to_le32(rsp_size);
+        ms_pkt->req_bytecount = cpu_to_le32(req_size);
+
+        ms_pkt->dseg_req_address[0] = cpu_to_le32(LSD(ha->ct_sns_dma));
+        ms_pkt->dseg_req_address[1] = cpu_to_le32(MSD(ha->ct_sns_dma));
+        ms_pkt->dseg_req_length = ms_pkt->req_bytecount;
+
+        ms_pkt->dseg_rsp_address[0] = cpu_to_le32(LSD(ha->ct_sns_dma));
+        ms_pkt->dseg_rsp_address[1] = cpu_to_le32(MSD(ha->ct_sns_dma));
+        ms_pkt->dseg_rsp_length = ms_pkt->rsp_bytecount;
+
+        return ms_pkt;
+}
+
+/**
+ * qla24xx_prep_ms_fdmi_iocb() - Prepare common MS IOCB fields for FDMI query.
+ * @ha: HA context
+ * @req_size: request size in bytes
+ * @rsp_size: response size in bytes
+ *
+ * Returns a pointer to the @ha's ms_iocb.
+ */
+void *
+qla24xx_prep_ms_fdmi_iocb(scsi_qla_host_t *ha, uint32_t req_size,
+    uint32_t rsp_size)
+{
+        struct ct_entry_24xx *ct_pkt;
+
+        ct_pkt = (struct ct_entry_24xx *)ha->ms_iocb;
+        memset(ct_pkt, 0, sizeof(struct ct_entry_24xx));
+
+        ct_pkt->entry_type = CT_IOCB_TYPE;
+        ct_pkt->entry_count = 1;
+        ct_pkt->nport_handle = cpu_to_le16(ha->mgmt_svr_loop_id);
+        ct_pkt->timeout = __constant_cpu_to_le16(59);
+        ct_pkt->cmd_dsd_count = __constant_cpu_to_le16(1);
+        ct_pkt->rsp_dsd_count = __constant_cpu_to_le16(1);
+        ct_pkt->rsp_byte_count = cpu_to_le32(rsp_size);
+        ct_pkt->cmd_byte_count = cpu_to_le32(req_size);
+
+        ct_pkt->dseg_0_address[0] = cpu_to_le32(LSD(ha->ct_sns_dma));
+        ct_pkt->dseg_0_address[1] = cpu_to_le32(MSD(ha->ct_sns_dma));
+        ct_pkt->dseg_0_len = ct_pkt->cmd_byte_count;
+
+        ct_pkt->dseg_1_address[0] = cpu_to_le32(LSD(ha->ct_sns_dma));
+        ct_pkt->dseg_1_address[1] = cpu_to_le32(MSD(ha->ct_sns_dma));
+        ct_pkt->dseg_1_len = ct_pkt->rsp_byte_count;
+
+        return ct_pkt;
+}
+
+static inline ms_iocb_entry_t *
+qla2x00_update_ms_fdmi_iocb(scsi_qla_host_t *ha, uint32_t req_size)
+{
+        ms_iocb_entry_t *ms_pkt = ha->ms_iocb;
+        struct ct_entry_24xx *ct_pkt = (struct ct_entry_24xx *)ha->ms_iocb;
+
+        if (IS_QLA24XX(ha) || IS_QLA25XX(ha)) {
+                ct_pkt->cmd_byte_count = cpu_to_le32(req_size);
+                ct_pkt->dseg_0_len = ct_pkt->cmd_byte_count;
+        } else {
+                ms_pkt->req_bytecount = cpu_to_le32(req_size);
+                ms_pkt->dseg_req_length = ms_pkt->req_bytecount;
+        }
+
+        return ms_pkt;
+}
+
+/**
+ * qla2x00_prep_ct_req() - Prepare common CT request fields for SNS query.
+ * @ct_req: CT request buffer
+ * @cmd: GS command
+ * @rsp_size: response size in bytes
+ *
+ * Returns a pointer to the intitialized @ct_req.
+ */
+static inline struct ct_sns_req *
+qla2x00_prep_ct_fdmi_req(struct ct_sns_req *ct_req, uint16_t cmd,
+    uint16_t rsp_size)
+{
+        memset(ct_req, 0, sizeof(struct ct_sns_pkt));
+
+        ct_req->header.revision = 0x01;
+        ct_req->header.gs_type = 0xFA;
+        ct_req->header.gs_subtype = 0x10;
+        ct_req->command = cpu_to_be16(cmd);
+        ct_req->max_rsp_size = cpu_to_be16((rsp_size - 16) / 4);
+
+        return ct_req;
+}
+
+/**
+ * qla2x00_fdmi_rhba() -
+ * @ha: HA context
+ *
+ * Returns 0 on success.
+ */
+static int
+qla2x00_fdmi_rhba(scsi_qla_host_t *ha)
+{
+        int rval, alen;
+        uint32_t size, sn;
+
+        ms_iocb_entry_t *ms_pkt;
+        struct ct_sns_req *ct_req;
+        struct ct_sns_rsp *ct_rsp;
+        uint8_t *entries;
+        struct ct_fdmi_hba_attr *eiter;
+
+        /* Issue RHBA */
+        /* Prepare common MS IOCB */
+        /*   Request size adjusted after CT preparation */
+        ms_pkt = ha->isp_ops.prep_ms_fdmi_iocb(ha, 0, RHBA_RSP_SIZE);
+
+        /* Prepare CT request */
+        ct_req = qla2x00_prep_ct_fdmi_req(&ha->ct_sns->p.req, RHBA_CMD,
+            RHBA_RSP_SIZE);
+        ct_rsp = &ha->ct_sns->p.rsp;
+
+        /* Prepare FDMI command arguments -- attribute block, attributes. */
+        memcpy(ct_req->req.rhba.hba_identifier, ha->port_name, WWN_SIZE);
+        ct_req->req.rhba.entry_count = __constant_cpu_to_be32(1);
+        memcpy(ct_req->req.rhba.port_name, ha->port_name, WWN_SIZE);
+        size = 2 * WWN_SIZE + 4 + 4;
+
+        /* Attributes */
+        ct_req->req.rhba.attrs.count =
+            __constant_cpu_to_be32(FDMI_HBA_ATTR_COUNT);
+        entries = ct_req->req.rhba.hba_identifier;
+
+        /* Nodename. */
+        eiter = (struct ct_fdmi_hba_attr *) (entries + size);
+        eiter->type = __constant_cpu_to_be16(FDMI_HBA_NODE_NAME);
+        eiter->len = __constant_cpu_to_be16(4 + WWN_SIZE);
+        memcpy(eiter->a.node_name, ha->node_name, WWN_SIZE);
+        size += 4 + WWN_SIZE;
+
+        DEBUG13(printk("%s(%ld): NODENAME=%02x%02x%02x%02x%02x%02x%02x%02x.\n",
+            __func__, ha->host_no,
+            eiter->a.node_name[0], eiter->a.node_name[1], eiter->a.node_name[2],
+            eiter->a.node_name[3], eiter->a.node_name[4], eiter->a.node_name[5],
+            eiter->a.node_name[6], eiter->a.node_name[7]));
+
+        /* Manufacturer. */
+        eiter = (struct ct_fdmi_hba_attr *) (entries + size);
+        eiter->type = __constant_cpu_to_be16(FDMI_HBA_MANUFACTURER);
+        strcpy(eiter->a.manufacturer, "QLogic Corporation");
+        alen = strlen(eiter->a.manufacturer);
+        alen += (alen & 3) ? (4 - (alen & 3)) : 4;
+        eiter->len = cpu_to_be16(4 + alen);
+        size += 4 + alen;
+
+        DEBUG13(printk("%s(%ld): MANUFACTURER=%s.\n", __func__, ha->host_no,
+            eiter->a.manufacturer));
+
+        /* Serial number. */
+        eiter = (struct ct_fdmi_hba_attr *) (entries + size);
+        eiter->type = __constant_cpu_to_be16(FDMI_HBA_SERIAL_NUMBER);
+        sn = ((ha->serial0 & 0x1f) << 16) | (ha->serial2 << 8) | ha->serial1;
+        sprintf(eiter->a.serial_num, "%c%05d", 'A' + sn / 100000, sn % 100000);
+        alen = strlen(eiter->a.serial_num);
+        alen += (alen & 3) ? (4 - (alen & 3)) : 4;
+        eiter->len = cpu_to_be16(4 + alen);
+        size += 4 + alen;
+
+        DEBUG13(printk("%s(%ld): SERIALNO=%s.\n", __func__, ha->host_no,
+            eiter->a.serial_num));
+
+        /* Model name. */
+        eiter = (struct ct_fdmi_hba_attr *) (entries + size);
+        eiter->type = __constant_cpu_to_be16(FDMI_HBA_MODEL);
+        strcpy(eiter->a.model, ha->model_number);
+        alen = strlen(eiter->a.model);
+        alen += (alen & 3) ? (4 - (alen & 3)) : 4;
+        eiter->len = cpu_to_be16(4 + alen);
+        size += 4 + alen;
+
+        DEBUG13(printk("%s(%ld): MODEL_NAME=%s.\n", __func__, ha->host_no,
+            eiter->a.model));
+
+        /* Model description. */
+        eiter = (struct ct_fdmi_hba_attr *) (entries + size);
+        eiter->type = __constant_cpu_to_be16(FDMI_HBA_MODEL_DESCRIPTION);
+        if (ha->model_desc)
+                strncpy(eiter->a.model_desc, ha->model_desc, 80);
+        alen = strlen(eiter->a.model_desc);
+        alen += (alen & 3) ? (4 - (alen & 3)) : 4;
+        eiter->len = cpu_to_be16(4 + alen);
+        size += 4 + alen;
+
+        DEBUG13(printk("%s(%ld): MODEL_DESC=%s.\n", __func__, ha->host_no,
+            eiter->a.model_desc));
+
+        /* Hardware version. */
+        eiter = (struct ct_fdmi_hba_attr *) (entries + size);
+        eiter->type = __constant_cpu_to_be16(FDMI_HBA_HARDWARE_VERSION);
+        strcpy(eiter->a.hw_version, ha->adapter_id);
+        alen = strlen(eiter->a.hw_version);
+        alen += (alen & 3) ? (4 - (alen & 3)) : 4;
+        eiter->len = cpu_to_be16(4 + alen);
+        size += 4 + alen;
+
+        DEBUG13(printk("%s(%ld): HARDWAREVER=%s.\n", __func__, ha->host_no,
+            eiter->a.hw_version));
+
+        /* Driver version. */
+        eiter = (struct ct_fdmi_hba_attr *) (entries + size);
+        eiter->type = __constant_cpu_to_be16(FDMI_HBA_DRIVER_VERSION);
+        strcpy(eiter->a.driver_version, qla2x00_version_str);
+        alen = strlen(eiter->a.driver_version);
+        alen += (alen & 3) ? (4 - (alen & 3)) : 4;
+        eiter->len = cpu_to_be16(4 + alen);
+        size += 4 + alen;
+
+        DEBUG13(printk("%s(%ld): DRIVERVER=%s.\n", __func__, ha->host_no,
+            eiter->a.driver_version));
+
+        /* Option ROM version. */
+        eiter = (struct ct_fdmi_hba_attr *) (entries + size);
+        eiter->type = __constant_cpu_to_be16(FDMI_HBA_OPTION_ROM_VERSION);
+        strcpy(eiter->a.orom_version, "0.00");
+        alen = strlen(eiter->a.orom_version);
+        alen += (alen & 3) ? (4 - (alen & 3)) : 4;
+        eiter->len = cpu_to_be16(4 + alen);
+        size += 4 + alen;
+
+        DEBUG13(printk("%s(%ld): OPTROMVER=%s.\n", __func__, ha->host_no,
+            eiter->a.orom_version));
+
+        /* Firmware version */
+        eiter = (struct ct_fdmi_hba_attr *) (entries + size);
+        eiter->type = __constant_cpu_to_be16(FDMI_HBA_FIRMWARE_VERSION);
+        ha->isp_ops.fw_version_str(ha, eiter->a.fw_version);
+        alen = strlen(eiter->a.fw_version);
+        alen += (alen & 3) ? (4 - (alen & 3)) : 4;
+        eiter->len = cpu_to_be16(4 + alen);
+        size += 4 + alen;
+
+        DEBUG13(printk("%s(%ld): FIRMWAREVER=%s.\n", __func__, ha->host_no,
+            eiter->a.fw_version));
+
+        /* Update MS request size. */
+        qla2x00_update_ms_fdmi_iocb(ha, size + 16);
+
+        DEBUG13(printk("%s(%ld): RHBA identifier="
+            "%02x%02x%02x%02x%02x%02x%02x%02x size=%d.\n", __func__,
+            ha->host_no, ct_req->req.rhba.hba_identifier[0],
+            ct_req->req.rhba.hba_identifier[1],
+            ct_req->req.rhba.hba_identifier[2],
+            ct_req->req.rhba.hba_identifier[3],
+            ct_req->req.rhba.hba_identifier[4],
+            ct_req->req.rhba.hba_identifier[5],
+            ct_req->req.rhba.hba_identifier[6],
+            ct_req->req.rhba.hba_identifier[7], size));
+        DEBUG13(qla2x00_dump_buffer(entries, size));
+
+        /* Execute MS IOCB */
+        rval = qla2x00_issue_iocb(ha, ha->ms_iocb, ha->ms_iocb_dma,
+            sizeof(ms_iocb_entry_t));
+        if (rval != QLA_SUCCESS) {
+                /*EMPTY*/
+                DEBUG2_3(printk("scsi(%ld): RHBA issue IOCB failed (%d).\n",
+                    ha->host_no, rval));
+        } else if (qla2x00_chk_ms_status(ha, ms_pkt, ct_rsp, "RHBA") !=
+            QLA_SUCCESS) {
+                rval = QLA_FUNCTION_FAILED;
+                if (ct_rsp->header.reason_code == CT_REASON_CANNOT_PERFORM &&
+                    ct_rsp->header.explanation_code ==
+                    CT_EXPL_ALREADY_REGISTERED) {
+                        DEBUG2_13(printk("%s(%ld): HBA already registered.\n",
+                            __func__, ha->host_no));
+                        rval = QLA_ALREADY_REGISTERED;
+                }
+        } else {
+                DEBUG2(printk("scsi(%ld): RHBA exiting normally.\n",
+                    ha->host_no));
+        }
+
+        return rval;
+}
+
+/**
+ * qla2x00_fdmi_dhba() -
+ * @ha: HA context
+ *
+ * Returns 0 on success.
+ */
+static int
+qla2x00_fdmi_dhba(scsi_qla_host_t *ha)
+{
+        int rval;
+
+        ms_iocb_entry_t *ms_pkt;
+        struct ct_sns_req *ct_req;
+        struct ct_sns_rsp *ct_rsp;
+
+        /* Issue RPA */
+        /* Prepare common MS IOCB */
+        ms_pkt = ha->isp_ops.prep_ms_fdmi_iocb(ha, DHBA_REQ_SIZE,
+            DHBA_RSP_SIZE);
+
+        /* Prepare CT request */
+        ct_req = qla2x00_prep_ct_fdmi_req(&ha->ct_sns->p.req, DHBA_CMD,
+            DHBA_RSP_SIZE);
+        ct_rsp = &ha->ct_sns->p.rsp;
+
+        /* Prepare FDMI command arguments -- portname. */
+        memcpy(ct_req->req.dhba.port_name, ha->port_name, WWN_SIZE);
+
+        DEBUG13(printk("%s(%ld): DHBA portname="
+            "%02x%02x%02x%02x%02x%02x%02x%02x.\n", __func__, ha->host_no,
+            ct_req->req.dhba.port_name[0], ct_req->req.dhba.port_name[1],
+            ct_req->req.dhba.port_name[2], ct_req->req.dhba.port_name[3],
+            ct_req->req.dhba.port_name[4], ct_req->req.dhba.port_name[5],
+            ct_req->req.dhba.port_name[6], ct_req->req.dhba.port_name[7]));
+
+        /* Execute MS IOCB */
+        rval = qla2x00_issue_iocb(ha, ha->ms_iocb, ha->ms_iocb_dma,
+            sizeof(ms_iocb_entry_t));
+        if (rval != QLA_SUCCESS) {
+                /*EMPTY*/
+                DEBUG2_3(printk("scsi(%ld): DHBA issue IOCB failed (%d).\n",
+                    ha->host_no, rval));
+        } else if (qla2x00_chk_ms_status(ha, ms_pkt, ct_rsp, "DHBA") !=
+            QLA_SUCCESS) {
+                rval = QLA_FUNCTION_FAILED;
+        } else {
+                DEBUG2(printk("scsi(%ld): DHBA exiting normally.\n",
+                    ha->host_no));
+        }
+
+        return rval;
+}
+
+/**
+ * qla2x00_fdmi_rpa() -
+ * @ha: HA context
+ *
+ * Returns 0 on success.
+ */
+static int
+qla2x00_fdmi_rpa(scsi_qla_host_t *ha)
+{
+        int rval, alen;
+        uint32_t size, max_frame_size;
+
+        ms_iocb_entry_t *ms_pkt;
+        struct ct_sns_req *ct_req;
+        struct ct_sns_rsp *ct_rsp;
+        uint8_t *entries;
+        struct ct_fdmi_port_attr *eiter;
+        struct init_cb_24xx *icb24 = (struct init_cb_24xx *)ha->init_cb;
+
+        /* Issue RPA */
+        /* Prepare common MS IOCB */
+        /*   Request size adjusted after CT preparation */
+        ms_pkt = ha->isp_ops.prep_ms_fdmi_iocb(ha, 0, RPA_RSP_SIZE);
+
+        /* Prepare CT request */
+        ct_req = qla2x00_prep_ct_fdmi_req(&ha->ct_sns->p.req, RPA_CMD,
+            RPA_RSP_SIZE);
+        ct_rsp = &ha->ct_sns->p.rsp;
+
+        /* Prepare FDMI command arguments -- attribute block, attributes. */
+        memcpy(ct_req->req.rpa.port_name, ha->port_name, WWN_SIZE);
+        size = WWN_SIZE + 4;
+
+        /* Attributes */
+        ct_req->req.rpa.attrs.count =
+            __constant_cpu_to_be32(FDMI_PORT_ATTR_COUNT);
+        entries = ct_req->req.rpa.port_name;
+
+        /* FC4 types. */
+        eiter = (struct ct_fdmi_port_attr *) (entries + size);
+        eiter->type = __constant_cpu_to_be16(FDMI_PORT_FC4_TYPES);
+        eiter->len = __constant_cpu_to_be16(4 + 32);
+        eiter->a.fc4_types[2] = 0x01;
+        size += 4 + 32;
+
+        DEBUG13(printk("%s(%ld): FC4_TYPES=%02x %02x.\n", __func__, ha->host_no,
+            eiter->a.fc4_types[2], eiter->a.fc4_types[1]));
+
+        /* Supported speed. */
+        eiter = (struct ct_fdmi_port_attr *) (entries + size);
+        eiter->type = __constant_cpu_to_be16(FDMI_PORT_SUPPORT_SPEED);
+        eiter->len = __constant_cpu_to_be16(4 + 4);
+        if (IS_QLA25XX(ha))
+                eiter->a.sup_speed = __constant_cpu_to_be32(4);
+        else if (IS_QLA24XX(ha))
+                eiter->a.sup_speed = __constant_cpu_to_be32(8);
+        else if (IS_QLA23XX(ha))
+                eiter->a.sup_speed = __constant_cpu_to_be32(2);
+        else
+                eiter->a.sup_speed = __constant_cpu_to_be32(1);
+        size += 4 + 4;
+
+        DEBUG13(printk("%s(%ld): SUPPORTED_SPEED=%x.\n", __func__, ha->host_no,
+            eiter->a.sup_speed));
+
+        /* Current speed. */
+        eiter = (struct ct_fdmi_port_attr *) (entries + size);
+        eiter->type = __constant_cpu_to_be16(FDMI_PORT_CURRENT_SPEED);
+        eiter->len = __constant_cpu_to_be16(4 + 4);
+        switch (ha->link_data_rate) {
+        case 0:
+                eiter->a.cur_speed = __constant_cpu_to_be32(1);
+                break;
+        case 1:
+                eiter->a.cur_speed = __constant_cpu_to_be32(2);
+                break;
+        case 3:
+                eiter->a.cur_speed = __constant_cpu_to_be32(8);
+                break;
+        case 4:
+                eiter->a.cur_speed = __constant_cpu_to_be32(4);
+                break;
+        }
+        size += 4 + 4;
+
+        DEBUG13(printk("%s(%ld): CURRENT_SPEED=%x.\n", __func__, ha->host_no,
+            eiter->a.cur_speed));
+
+        /* Max frame size. */
+        eiter = (struct ct_fdmi_port_attr *) (entries + size);
+        eiter->type = __constant_cpu_to_be16(FDMI_PORT_MAX_FRAME_SIZE);
+        eiter->len = __constant_cpu_to_be16(4 + 4);
+        max_frame_size = IS_QLA24XX(ha) || IS_QLA25XX(ha) ?
+                (uint32_t) icb24->frame_payload_size:
+                (uint32_t) ha->init_cb->frame_payload_size;
+        eiter->a.max_frame_size = cpu_to_be32(max_frame_size);
+        size += 4 + 4;
+
+        DEBUG13(printk("%s(%ld): MAX_FRAME_SIZE=%x.\n", __func__, ha->host_no,
+            eiter->a.max_frame_size));
+
+        /* OS device name. */
+        eiter = (struct ct_fdmi_port_attr *) (entries + size);
+        eiter->type = __constant_cpu_to_be16(FDMI_PORT_OS_DEVICE_NAME);
+        sprintf(eiter->a.os_dev_name, "/proc/scsi/qla2xxx/%ld", ha->host_no);
+        alen = strlen(eiter->a.os_dev_name);
+        alen += (alen & 3) ? (4 - (alen & 3)) : 4;
+        eiter->len = cpu_to_be16(4 + alen);
+        size += 4 + alen;
+
+        DEBUG13(printk("%s(%ld): OS_DEVICE_NAME=%s.\n", __func__, ha->host_no,
+            eiter->a.os_dev_name));
+
+        /* Update MS request size. */
+        qla2x00_update_ms_fdmi_iocb(ha, size + 16);
+
+        DEBUG13(printk("%s(%ld): RPA portname="
+            "%02x%02x%02x%02x%02x%02x%02x%02x size=%d.\n", __func__,
+            ha->host_no, ct_req->req.rpa.port_name[0],
+            ct_req->req.rpa.port_name[1], ct_req->req.rpa.port_name[2],
+            ct_req->req.rpa.port_name[3], ct_req->req.rpa.port_name[4],
+            ct_req->req.rpa.port_name[5], ct_req->req.rpa.port_name[6],
+            ct_req->req.rpa.port_name[7], size));
+        DEBUG13(qla2x00_dump_buffer(entries, size));
+
+        /* Execute MS IOCB */
+        rval = qla2x00_issue_iocb(ha, ha->ms_iocb, ha->ms_iocb_dma,
+            sizeof(ms_iocb_entry_t));
+        if (rval != QLA_SUCCESS) {
+                /*EMPTY*/
+                DEBUG2_3(printk("scsi(%ld): RPA issue IOCB failed (%d).\n",
+                    ha->host_no, rval));
+        } else if (qla2x00_chk_ms_status(ha, ms_pkt, ct_rsp, "RPA") !=
+            QLA_SUCCESS) {
+                rval = QLA_FUNCTION_FAILED;
+        } else {
+                DEBUG2(printk("scsi(%ld): RPA exiting normally.\n",
+                    ha->host_no));
+        }
+
+        return rval;
+}
+
+/**
+ * qla2x00_fdmi_register() -
+ * @ha: HA context
+ *
+ * Returns 0 on success.
+ */
+int
+qla2x00_fdmi_register(scsi_qla_host_t *ha)
+{
+        int rval;
+
+        rval = qla2x00_mgmt_svr_login(ha);
+        if (rval)
+                return rval;
+
+        rval = qla2x00_fdmi_rhba(ha);
+        if (rval) {
+                if (rval != QLA_ALREADY_REGISTERED)
+                        return rval;
+
+                rval = qla2x00_fdmi_dhba(ha);
+                if (rval)
+                        return rval;
+
+                rval = qla2x00_fdmi_rhba(ha);
+                if (rval)
+                        return rval;
+        }
+        rval = qla2x00_fdmi_rpa(ha);
+
+        return rval;
+}
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index a6d2559217c..c619583e646 100644
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -88,6 +88,7 @@ qla2x00_initialize_adapter(scsi_qla_host_t *ha)
         ha->mbx_flags = 0;
         ha->isp_abort_cnt = 0;
         ha->beacon_blink_led = 0;
+        set_bit(REGISTER_FDMI_NEEDED, &ha->dpc_flags);
 
         qla_printk(KERN_INFO, ha, "Configuring PCI space...\n");
         rval = ha->isp_ops.pci_config(ha);
@@ -1563,7 +1564,7 @@ qla2x00_nvram_config(scsi_qla_host_t *ha)
         ha->flags.enable_lip_reset = ((nv->host_p[1] & BIT_1) ? 1 : 0);
         ha->flags.enable_lip_full_login = ((nv->host_p[1] & BIT_2) ? 1 : 0);
         ha->flags.enable_target_reset = ((nv->host_p[1] & BIT_3) ? 1 : 0);
-        ha->flags.enable_led_scheme = ((nv->efi_parameters & BIT_3) ? 1 : 0);
+        ha->flags.enable_led_scheme = (nv->special_options[1] & BIT_4) ? 1 : 0;
 
         ha->operating_mode =
             (icb->add_firmware_options[0] & (BIT_6 | BIT_5 | BIT_4)) >> 4;
@@ -1697,6 +1698,7 @@ qla2x00_alloc_fcport(scsi_qla_host_t *ha, int flags)
         fcport->iodesc_idx_sent = IODESC_INVALID_INDEX;
         atomic_set(&fcport->state, FCS_UNCONFIGURED);
         fcport->flags = FCF_RLC_SUPPORT;
+        fcport->supported_classes = FC_COS_UNSPECIFIED;
 
         return (fcport);
 }
@@ -1898,7 +1900,8 @@ qla2x00_configure_local_loop(scsi_qla_host_t *ha)
                         continue;
 
                 /* Bypass if not same domain and area of adapter. */
-                if (area != ha->d_id.b.area || domain != ha->d_id.b.domain)
+                if (area && domain &&
+                    (area != ha->d_id.b.area || domain != ha->d_id.b.domain))
                         continue;
 
                 /* Bypass invalid local loop ID. */
@@ -2075,6 +2078,7 @@ qla2x00_reg_remote_port(scsi_qla_host_t *ha, fc_port_t *fcport)
                 return;
         }
         rport->dd_data = fcport;
+        rport->supported_classes = fcport->supported_classes;
 
         rport_ids.roles = FC_RPORT_ROLE_UNKNOWN;
         if (fcport->port_type == FCT_INITIATOR)
@@ -2130,6 +2134,11 @@ qla2x00_configure_fabric(scsi_qla_host_t *ha)
                 return (QLA_SUCCESS);
         }
         do {
+                /* FDMI support. */
+                if (ql2xfdmienable &&
+                    test_and_clear_bit(REGISTER_FDMI_NEEDED, &ha->dpc_flags))
+                        qla2x00_fdmi_register(ha);
+
                 /* Ensure we are logged into the SNS. */
                 if (IS_QLA24XX(ha) || IS_QLA25XX(ha))
                         loop_id = NPH_SNS;
@@ -2392,6 +2401,12 @@ qla2x00_find_all_fabric_devs(scsi_qla_host_t *ha, struct list_head *new_fcports)
                 if (new_fcport->d_id.b24 == ha->d_id.b24)
                         continue;
 
+                /* Bypass if same domain and area of adapter. */
+                if (((new_fcport->d_id.b24 & 0xffff00) ==
+                    (ha->d_id.b24 & 0xffff00)) && ha->current_topology ==
+                        ISP_CFG_FL)
+                            continue;
+
                 /* Bypass reserved domain fields. */
                 if ((new_fcport->d_id.b.domain & 0xf0) == 0xf0)
                         continue;
@@ -2794,6 +2809,11 @@ qla2x00_fabric_login(scsi_qla_host_t *ha, fc_port_t *fcport,
                                 }
                         }
 
+                        if (mb[10] & BIT_0)
+                                fcport->supported_classes |= FC_COS_CLASS2;
+                        if (mb[10] & BIT_1)
+                                fcport->supported_classes |= FC_COS_CLASS3;
+
                         rval = QLA_SUCCESS;
                         break;
                 } else if (mb[0] == MBS_LOOP_ID_USED) {
diff --git a/drivers/scsi/qla2xxx/qla_iocb.c b/drivers/scsi/qla2xxx/qla_iocb.c
index ebdc3c54d15..37f82e2cd7f 100644
--- a/drivers/scsi/qla2xxx/qla_iocb.c
+++ b/drivers/scsi/qla2xxx/qla_iocb.c
@@ -810,12 +810,8 @@ qla24xx_start_scsi(srb_t *sp)
                         ha->req_q_cnt = ha->request_q_length -
                                 (ha->req_ring_index - cnt);
         }
-        if (ha->req_q_cnt < (req_cnt + 2)) {
-                if  (cmd->use_sg)
-                        pci_unmap_sg(ha->pdev, sg, cmd->use_sg,
-                                        cmd->sc_data_direction);
+        if (ha->req_q_cnt < (req_cnt + 2))
                 goto queuing_error;
-        }
 
         /* Build command packet. */
         ha->current_outstanding_cmd = handle;
diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c
index f910de6dd43..c255bb0268a 100644
--- a/drivers/scsi/qla2xxx/qla_isr.c
+++ b/drivers/scsi/qla2xxx/qla_isr.c
@@ -451,6 +451,8 @@ qla2x00_async_event(scsi_qla_host_t *ha, uint16_t *mb)
 
                 ha->flags.management_server_logged_in = 0;
                 ha->link_data_rate = 0;
+                if (ql2xfdmienable)
+                        set_bit(REGISTER_FDMI_NEEDED, &ha->dpc_flags);
 
                 /* Update AEN queue. */
                 qla2x00_enqueue_aen(ha, MBA_LOOP_DOWN, NULL);
diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c
index 409ea0ac403..13e1c904707 100644
--- a/drivers/scsi/qla2xxx/qla_mbx.c
+++ b/drivers/scsi/qla2xxx/qla_mbx.c
@@ -19,6 +19,7 @@
 #include "qla_def.h"
 
 #include <linux/delay.h>
+#include <scsi/scsi_transport_fc.h>
 
 static void
 qla2x00_mbx_sem_timeout(unsigned long data)
@@ -251,7 +252,7 @@ qla2x00_mailbox_command(scsi_qla_host_t *ha, mbx_cmd_t *mcp)
                         mb0 = RD_REG_WORD(&reg->isp24.mailbox0);
                         ictrl = RD_REG_DWORD(&reg->isp24.ictrl);
                 } else {
-                        mb0 = RD_MAILBOX_REG(ha, reg->isp, 0);
+                        mb0 = RD_MAILBOX_REG(ha, &reg->isp, 0);
                         ictrl = RD_REG_WORD(&reg->isp.ictrl);
                 }
                 printk("%s(%ld): **** MB Command Timeout for cmd %x ****\n",
@@ -983,58 +984,6 @@ qla2x00_abort_target(fc_port_t *fcport)
 #endif
 
 /*
- * qla2x00_target_reset
- *      Issue target reset mailbox command.
- *
- * Input:
- *      ha = adapter block pointer.
- *      TARGET_QUEUE_LOCK must be released.
- *      ADAPTER_STATE_LOCK must be released.
- *
- * Returns:
- *      qla2x00 local function return status code.
- *
- * Context:
- *      Kernel context.
- */
-int
-qla2x00_target_reset(scsi_qla_host_t *ha, struct fc_port *fcport)
-{
-        int rval;
-        mbx_cmd_t mc;
-        mbx_cmd_t *mcp = &mc;
-
-        DEBUG11(printk("qla2x00_target_reset(%ld): entered.\n", ha->host_no);)
-
-        if (atomic_read(&fcport->state) != FCS_ONLINE)
-                return 0;
-
-        mcp->mb[0] = MBC_TARGET_RESET;
-        if (HAS_EXTENDED_IDS(ha))
-                mcp->mb[1] = fcport->loop_id;
-        else
-                mcp->mb[1] = fcport->loop_id << 8;
-        mcp->mb[2] = ha->loop_reset_delay;
-        mcp->out_mb = MBX_2|MBX_1|MBX_0;
-        mcp->in_mb = MBX_0;
-        mcp->tov = 30;
-        mcp->flags = 0;
-        rval = qla2x00_mailbox_command(ha, mcp);
-
-        if (rval != QLA_SUCCESS) {
-                /*EMPTY*/
-                DEBUG2_3_11(printk("qla2x00_target_reset(%ld): failed=%x.\n",
-                    ha->host_no, rval);)
-        } else {
-                /*EMPTY*/
-                DEBUG11(printk("qla2x00_target_reset(%ld): done.\n",
-                    ha->host_no);)
-        }
-
-        return rval;
-}
-
-/*
  * qla2x00_get_adapter_id
  *      Get adapter ID and topology.
  *
@@ -1326,6 +1275,10 @@ qla2x00_get_port_database(scsi_qla_host_t *ha, fc_port_t *fcport, uint8_t opt)
                         fcport->port_type = FCT_INITIATOR;
                 else
                         fcport->port_type = FCT_TARGET;
+
+                /* Passback COS information. */
+                fcport->supported_classes = (pd->options & BIT_4) ?
+                    FC_COS_CLASS2: FC_COS_CLASS3;
         }
 
 gpd_error_out:
@@ -1661,6 +1614,13 @@ qla24xx_login_fabric(scsi_qla_host_t *ha, uint16_t loop_id, uint8_t domain,
                                 mb[1] |= BIT_1;
                 } else
                         mb[1] = BIT_0;
+
+                /* Passback COS information. */
+                mb[10] = 0;
+                if (lg->io_parameter[7] || lg->io_parameter[8])
+                        mb[10] |= BIT_0;        /* Class 2. */
+                if (lg->io_parameter[9] || lg->io_parameter[10])
+                        mb[10] |= BIT_1;        /* Class 3. */
         }
 
         dma_pool_free(ha->s_dma_pool, lg, lg_dma);
@@ -1723,6 +1683,8 @@ qla2x00_login_fabric(scsi_qla_host_t *ha, uint16_t loop_id, uint8_t domain,
                 mb[2] = mcp->mb[2];
                 mb[6] = mcp->mb[6];
                 mb[7] = mcp->mb[7];
+                /* COS retrieved from Get-Port-Database mailbox command. */
+                mb[10] = 0;
         }
 
         if (rval != QLA_SUCCESS) {
@@ -2465,3 +2427,32 @@ qla2x00_set_serdes_params(scsi_qla_host_t *ha, uint16_t sw_em_1g,
 
         return rval;
 }
+
+int
+qla2x00_stop_firmware(scsi_qla_host_t *ha)
+{
+        int rval;
+        mbx_cmd_t mc;
+        mbx_cmd_t *mcp = &mc;
+
+        if (!IS_QLA24XX(ha) && !IS_QLA25XX(ha))
+                return QLA_FUNCTION_FAILED;
+
+        DEBUG11(printk("%s(%ld): entered.\n", __func__, ha->host_no));
+
+        mcp->mb[0] = MBC_STOP_FIRMWARE;
+        mcp->out_mb = MBX_0;
+        mcp->in_mb = MBX_0;
+        mcp->tov = 5;
+        mcp->flags = 0;
+        rval = qla2x00_mailbox_command(ha, mcp);
+
+        if (rval != QLA_SUCCESS) {
+                DEBUG2_3_11(printk("%s(%ld): failed=%x.\n", __func__,
+                    ha->host_no, rval));
+        } else {
+                DEBUG11(printk("%s(%ld): done.\n", __func__, ha->host_no));
+        }
+
+        return rval;
+}
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index 9000659bfbc..8982978c42f 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -79,7 +79,7 @@ module_param(ql2xloginretrycount, int, S_IRUGO|S_IRUSR);
 MODULE_PARM_DESC(ql2xloginretrycount,
                 "Specify an alternate value for the NVRAM login retry count.");
 
-int ql2xfwloadbin;
+int ql2xfwloadbin=1;
 module_param(ql2xfwloadbin, int, S_IRUGO|S_IRUSR);
 MODULE_PARM_DESC(ql2xfwloadbin,
                 "Load ISP2xxx firmware image via hotplug.");
@@ -88,6 +88,12 @@ static void qla2x00_free_device(scsi_qla_host_t *);
 
 static void qla2x00_config_dma_addressing(scsi_qla_host_t *ha);
 
+int ql2xfdmienable;
+module_param(ql2xfdmienable, int, S_IRUGO|S_IRUSR);
+MODULE_PARM_DESC(ql2xfdmienable,
+                "Enables FDMI registratons "
+                "Default is 0 - no FDMI. 1 - perfom FDMI.");
+
 /*
  * SCSI host template entry points
  */
@@ -105,6 +111,9 @@ static int qla2xxx_eh_host_reset(struct scsi_cmnd *);
 static int qla2x00_loop_reset(scsi_qla_host_t *ha);
 static int qla2x00_device_reset(scsi_qla_host_t *, fc_port_t *);
 
+static int qla2x00_change_queue_depth(struct scsi_device *, int);
+static int qla2x00_change_queue_type(struct scsi_device *, int);
+
 static struct scsi_host_template qla2x00_driver_template = {
         .module                 = THIS_MODULE,
         .name                   = "qla2xxx",
@@ -119,6 +128,8 @@ static struct scsi_host_template qla2x00_driver_template = {
 
         .slave_alloc            = qla2xxx_slave_alloc,
         .slave_destroy          = qla2xxx_slave_destroy,
+        .change_queue_depth     = qla2x00_change_queue_depth,
+        .change_queue_type      = qla2x00_change_queue_type,
         .this_id                = -1,
         .cmd_per_lun            = 3,
         .use_clustering         = ENABLE_CLUSTERING,
@@ -129,6 +140,7 @@ static struct scsi_host_template qla2x00_driver_template = {
          * which equates to 0x800000 sectors.
          */
         .max_sectors            = 0xFFFF,
+        .shost_attrs            = qla2x00_host_attrs,
 };
 
 static struct scsi_host_template qla24xx_driver_template = {
@@ -145,12 +157,15 @@ static struct scsi_host_template qla24xx_driver_template = {
 
         .slave_alloc            = qla2xxx_slave_alloc,
         .slave_destroy          = qla2xxx_slave_destroy,
+        .change_queue_depth     = qla2x00_change_queue_depth,
+        .change_queue_type      = qla2x00_change_queue_type,
         .this_id                = -1,
         .cmd_per_lun            = 3,
         .use_clustering         = ENABLE_CLUSTERING,
         .sg_tablesize           = SG_ALL,
 
         .max_sectors            = 0xFFFF,
+        .shost_attrs            = qla2x00_host_attrs,
 };
 
 static struct scsi_transport_template *qla2xxx_transport_template = NULL;
@@ -487,14 +502,13 @@ qc24_fail_command:
 static int
 qla2x00_eh_wait_on_command(scsi_qla_host_t *ha, struct scsi_cmnd *cmd)
 {
-#define ABORT_POLLING_PERIOD    HZ
-#define ABORT_WAIT_ITER         ((10 * HZ) / (ABORT_POLLING_PERIOD))
+#define ABORT_POLLING_PERIOD    1000
+#define ABORT_WAIT_ITER         ((10 * 1000) / (ABORT_POLLING_PERIOD))
         unsigned long wait_iter = ABORT_WAIT_ITER;
         int ret = QLA_SUCCESS;
 
         while (CMD_SP(cmd)) {
-                set_current_state(TASK_UNINTERRUPTIBLE);
-                schedule_timeout(ABORT_POLLING_PERIOD);
+                msleep(ABORT_POLLING_PERIOD);
 
                 if (--wait_iter)
                         break;
@@ -1016,7 +1030,7 @@ qla2x00_loop_reset(scsi_qla_host_t *ha)
                         if (fcport->port_type != FCT_TARGET)
                                 continue;
 
-                        status = qla2x00_target_reset(ha, fcport);
+                        status = qla2x00_device_reset(ha, fcport);
                         if (status != QLA_SUCCESS)
                                 break;
                 }
@@ -1103,6 +1117,28 @@ qla2xxx_slave_destroy(struct scsi_device *sdev)
         sdev->hostdata = NULL;
 }
 
+static int
+qla2x00_change_queue_depth(struct scsi_device *sdev, int qdepth)
+{
+        scsi_adjust_queue_depth(sdev, scsi_get_tag_type(sdev), qdepth);
+        return sdev->queue_depth;
+}
+
+static int
+qla2x00_change_queue_type(struct scsi_device *sdev, int tag_type)
+{
+        if (sdev->tagged_supported) {
+                scsi_set_tag_type(sdev, tag_type);
+                if (tag_type)
+                        scsi_activate_tcq(sdev, sdev->queue_depth);
+                else
+                        scsi_deactivate_tcq(sdev, sdev->queue_depth);
+        } else
+                tag_type = 0;
+
+        return tag_type;
+}
+
 /**
  * qla2x00_config_dma_addressing() - Configure OS DMA addressing method.
  * @ha: HA context
@@ -1113,36 +1149,23 @@ qla2xxx_slave_destroy(struct scsi_device *sdev)
 static void
 qla2x00_config_dma_addressing(scsi_qla_host_t *ha)
 {
-        /* Assume 32bit DMA address */
+        /* Assume a 32bit DMA mask. */
         ha->flags.enable_64bit_addressing = 0;
 
-        /*
-         * Given the two variants pci_set_dma_mask(), allow the compiler to
-         * assist in setting the proper dma mask.
-         */
-        if (sizeof(dma_addr_t) > 4) {
-                if (pci_set_dma_mask(ha->pdev, DMA_64BIT_MASK) == 0) {
+        if (!dma_set_mask(&ha->pdev->dev, DMA_64BIT_MASK)) {
+                /* Any upper-dword bits set? */
+                if (MSD(dma_get_required_mask(&ha->pdev->dev)) &&
+                    !pci_set_consistent_dma_mask(ha->pdev, DMA_64BIT_MASK)) {
+                        /* Ok, a 64bit DMA mask is applicable. */
                         ha->flags.enable_64bit_addressing = 1;
                         ha->isp_ops.calc_req_entries = qla2x00_calc_iocbs_64;
                         ha->isp_ops.build_iocbs = qla2x00_build_scsi_iocbs_64;
-
-                        if (pci_set_consistent_dma_mask(ha->pdev,
-                            DMA_64BIT_MASK)) {
-                                qla_printk(KERN_DEBUG, ha,
-                                    "Failed to set 64 bit PCI consistent mask; "
-                                    "using 32 bit.\n");
-                                pci_set_consistent_dma_mask(ha->pdev,
-                                    DMA_32BIT_MASK);
-                        }
-                } else {
-                        qla_printk(KERN_DEBUG, ha,
-                            "Failed to set 64 bit PCI DMA mask, falling back "
-                            "to 32 bit MASK.\n");
-                        pci_set_dma_mask(ha->pdev, DMA_32BIT_MASK);
+                        return;
                 }
-        } else {
-                pci_set_dma_mask(ha->pdev, DMA_32BIT_MASK);
         }
+
+        dma_set_mask(&ha->pdev->dev, DMA_32BIT_MASK);
+        pci_set_consistent_dma_mask(ha->pdev, DMA_32BIT_MASK);
 }
 
 static int
@@ -1316,6 +1339,7 @@ int qla2x00_probe_one(struct pci_dev *pdev, struct qla_board_info *brd_info)
         ha->prev_topology = 0;
         ha->ports = MAX_BUSES;
         ha->init_cb_size = sizeof(init_cb_t);
+        ha->mgmt_svr_loop_id = MANAGEMENT_SERVER;
 
         /* Assign ISP specific operations. */
         ha->isp_ops.pci_config          = qla2100_pci_config;
@@ -1338,6 +1362,7 @@ int qla2x00_probe_one(struct pci_dev *pdev, struct qla_board_info *brd_info)
         ha->isp_ops.calc_req_entries    = qla2x00_calc_iocbs_32;
         ha->isp_ops.build_iocbs         = qla2x00_build_scsi_iocbs_32;
         ha->isp_ops.prep_ms_iocb        = qla2x00_prep_ms_iocb;
+        ha->isp_ops.prep_ms_fdmi_iocb   = qla2x00_prep_ms_fdmi_iocb;
         ha->isp_ops.read_nvram          = qla2x00_read_nvram_data;
         ha->isp_ops.write_nvram         = qla2x00_write_nvram_data;
         ha->isp_ops.fw_dump             = qla2100_fw_dump;
@@ -1375,6 +1400,7 @@ int qla2x00_probe_one(struct pci_dev *pdev, struct qla_board_info *brd_info)
                 ha->response_q_length = RESPONSE_ENTRY_CNT_2300;
                 ha->last_loop_id = SNS_LAST_LOOP_ID_2300;
                 ha->init_cb_size = sizeof(struct init_cb_24xx);
+                ha->mgmt_svr_loop_id = 10;
                 ha->isp_ops.pci_config = qla24xx_pci_config;
                 ha->isp_ops.reset_chip = qla24xx_reset_chip;
                 ha->isp_ops.chip_diag = qla24xx_chip_diag;
@@ -1395,6 +1421,7 @@ int qla2x00_probe_one(struct pci_dev *pdev, struct qla_board_info *brd_info)
                 ha->isp_ops.fabric_login = qla24xx_login_fabric;
                 ha->isp_ops.fabric_logout = qla24xx_fabric_logout;
                 ha->isp_ops.prep_ms_iocb = qla24xx_prep_ms_iocb;
+                ha->isp_ops.prep_ms_fdmi_iocb = qla24xx_prep_ms_fdmi_iocb;
                 ha->isp_ops.read_nvram = qla24xx_read_nvram_data;
                 ha->isp_ops.write_nvram = qla24xx_write_nvram_data;
                 ha->isp_ops.fw_dump = qla24xx_fw_dump;
@@ -1558,8 +1585,6 @@ int qla2x00_probe_one(struct pci_dev *pdev, struct qla_board_info *brd_info)
         return 0;
 
 probe_failed:
-        fc_remove_host(ha->host);
-
         qla2x00_free_device(ha);
 
         scsi_host_put(host);
@@ -1601,10 +1626,6 @@ qla2x00_free_device(scsi_qla_host_t *ha)
         if (!IS_QLA2100(ha) && !IS_QLA2200(ha))
                 qla2x00_cancel_io_descriptors(ha);
 
-        /* turn-off interrupts on the card */
-        if (ha->interrupts_on)
-                ha->isp_ops.disable_intrs(ha);
-
         /* Disable timer */
         if (ha->timer_active)
                 qla2x00_stop_timer(ha);
@@ -1624,8 +1645,14 @@ qla2x00_free_device(scsi_qla_host_t *ha)
                 }
         }
 
-        qla2x00_mem_free(ha);
+        /* Stop currently executing firmware. */
+        qla2x00_stop_firmware(ha);
+
+        /* turn-off interrupts on the card */
+        if (ha->interrupts_on)
+                ha->isp_ops.disable_intrs(ha);
 
+        qla2x00_mem_free(ha);
 
         ha->flags.online = 0;
 
@@ -1934,7 +1961,7 @@ qla2x00_mem_free(scsi_qla_host_t *ha)
 {
         struct list_head        *fcpl, *fcptemp;
         fc_port_t       *fcport;
-        unsigned long   wtime;/* max wait time if mbx cmd is busy. */
+        unsigned int    wtime;/* max wait time if mbx cmd is busy. */
 
         if (ha == NULL) {
                 /* error */
@@ -1943,11 +1970,9 @@ qla2x00_mem_free(scsi_qla_host_t *ha)
         }
 
         /* Make sure all other threads are stopped. */
-        wtime = 60 * HZ;
-        while (ha->dpc_wait && wtime) {
-                set_current_state(TASK_INTERRUPTIBLE);
-                wtime = schedule_timeout(wtime);
-        }
+        wtime = 60 * 1000;
+        while (ha->dpc_wait && wtime)
+                wtime = msleep_interruptible(wtime);
 
         /* free ioctl memory */
         qla2x00_free_ioctl_mem(ha);
@@ -2478,15 +2503,15 @@ qla2x00_timer(scsi_qla_host_t *ha)
 int
 qla2x00_down_timeout(struct semaphore *sema, unsigned long timeout)
 {
-        const unsigned int step = HZ/10;
+        const unsigned int step = 100; /* msecs */
+        unsigned int iterations = jiffies_to_msecs(timeout)/100;
 
         do {
                 if (!down_trylock(sema))
                         return 0;
-                set_current_state(TASK_INTERRUPTIBLE);
-                if (schedule_timeout(step))
+                if (msleep_interruptible(step))
                         break;
-        } while ((timeout -= step) > 0);
+        } while (--iterations >= 0);
 
         return -ETIMEDOUT;
 }
diff --git a/drivers/scsi/qla2xxx/qla_sup.c b/drivers/scsi/qla2xxx/qla_sup.c
index d7f5c608009..c14abf743b7 100644
--- a/drivers/scsi/qla2xxx/qla_sup.c
+++ b/drivers/scsi/qla2xxx/qla_sup.c
@@ -468,21 +468,12 @@ qla24xx_read_flash_data(scsi_qla_host_t *ha, uint32_t *dwptr, uint32_t faddr,
     uint32_t dwords)
 {
         uint32_t i;
-        struct device_reg_24xx __iomem *reg = &ha->iobase->isp24;
-
-        /* Pause RISC. */
-        WRT_REG_DWORD(&reg->hccr, HCCRX_SET_RISC_PAUSE);
-        RD_REG_DWORD(&reg->hccr);               /* PCI Posting. */
 
         /* Dword reads to flash. */
         for (i = 0; i < dwords; i++, faddr++)
                 dwptr[i] = cpu_to_le32(qla24xx_read_flash_dword(ha,
                     flash_data_to_access_addr(faddr)));
 
-        /* Release RISC pause. */
-        WRT_REG_DWORD(&reg->hccr, HCCRX_REL_RISC_PAUSE);
-        RD_REG_DWORD(&reg->hccr);               /* PCI Posting. */
-
         return dwptr;
 }
 
@@ -532,10 +523,6 @@ qla24xx_write_flash_data(scsi_qla_host_t *ha, uint32_t *dwptr, uint32_t faddr,
 
         ret = QLA_SUCCESS;
 
-        /* Pause RISC. */
-        WRT_REG_DWORD(&reg->hccr, HCCRX_SET_RISC_PAUSE);
-        RD_REG_DWORD(&reg->hccr);               /* PCI Posting. */
-
         qla24xx_get_flash_manufacturer(ha, &man_id, &flash_id);
         DEBUG9(printk("%s(%ld): Flash man_id=%d flash_id=%d\n", __func__,
             ha->host_no, man_id, flash_id));
@@ -599,10 +586,6 @@ qla24xx_write_flash_data(scsi_qla_host_t *ha, uint32_t *dwptr, uint32_t faddr,
             RD_REG_DWORD(&reg->ctrl_status) & ~CSRX_FLASH_ENABLE);
         RD_REG_DWORD(&reg->ctrl_status);        /* PCI Posting. */
 
-        /* Release RISC pause. */
-        WRT_REG_DWORD(&reg->hccr, HCCRX_REL_RISC_PAUSE);
-        RD_REG_DWORD(&reg->hccr);               /* PCI Posting. */
-
         return ret;
 }
 
@@ -630,11 +613,6 @@ qla24xx_read_nvram_data(scsi_qla_host_t *ha, uint8_t *buf, uint32_t naddr,
 {
         uint32_t i;
         uint32_t *dwptr;
-        struct device_reg_24xx __iomem *reg = &ha->iobase->isp24;
-
-        /* Pause RISC. */
-        WRT_REG_DWORD(&reg->hccr, HCCRX_SET_RISC_PAUSE);
-        RD_REG_DWORD(&reg->hccr);       /* PCI Posting. */
 
         /* Dword reads to flash. */
         dwptr = (uint32_t *)buf;
@@ -642,10 +620,6 @@ qla24xx_read_nvram_data(scsi_qla_host_t *ha, uint8_t *buf, uint32_t naddr,
                 dwptr[i] = cpu_to_le32(qla24xx_read_flash_dword(ha,
                     nvram_data_to_access_addr(naddr)));
 
-        /* Release RISC pause. */
-        WRT_REG_DWORD(&reg->hccr, HCCRX_REL_RISC_PAUSE);
-        RD_REG_DWORD(&reg->hccr);       /* PCI Posting. */
-
         return buf;
 }
 
@@ -690,10 +664,6 @@ qla24xx_write_nvram_data(scsi_qla_host_t *ha, uint8_t *buf, uint32_t naddr,
 
         ret = QLA_SUCCESS;
 
-        /* Pause RISC. */
-        WRT_REG_DWORD(&reg->hccr, HCCRX_SET_RISC_PAUSE);
-        RD_REG_DWORD(&reg->hccr);               /* PCI Posting. */
-
         /* Enable flash write. */
         WRT_REG_DWORD(&reg->ctrl_status,
             RD_REG_DWORD(&reg->ctrl_status) | CSRX_FLASH_ENABLE);
@@ -728,9 +698,5 @@ qla24xx_write_nvram_data(scsi_qla_host_t *ha, uint8_t *buf, uint32_t naddr,
             RD_REG_DWORD(&reg->ctrl_status) & ~CSRX_FLASH_ENABLE);
         RD_REG_DWORD(&reg->ctrl_status);        /* PCI Posting. */
 
-        /* Release RISC pause. */
-        WRT_REG_DWORD(&reg->hccr, HCCRX_REL_RISC_PAUSE);
-        RD_REG_DWORD(&reg->hccr);               /* PCI Posting. */
-
         return ret;
 }
diff --git a/drivers/scsi/qla2xxx/qla_version.h b/drivers/scsi/qla2xxx/qla_version.h
index e3cd3618bc5..eae7d6edd53 100644
--- a/drivers/scsi/qla2xxx/qla_version.h
+++ b/drivers/scsi/qla2xxx/qla_version.h
@@ -19,9 +19,9 @@
 /*
  * Driver version
  */
-#define QLA2XXX_VERSION      "8.01.00b5-k"
+#define QLA2XXX_VERSION      "8.01.00-k"
 
 #define QLA_DRIVER_MAJOR_VER    8
 #define QLA_DRIVER_MINOR_VER    1
 #define QLA_DRIVER_PATCH_VER    0
-#define QLA_DRIVER_BETA_VER     5
+#define QLA_DRIVER_BETA_VER     0
diff --git a/drivers/scsi/raid_class.c b/drivers/scsi/raid_class.c
new file mode 100644
index 00000000000..f1ea5027865
--- /dev/null
+++ b/drivers/scsi/raid_class.c
@@ -0,0 +1,250 @@
+/*
+ * RAID Attributes
+ */
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/list.h>
+#include <linux/raid_class.h>
+#include <scsi/scsi_device.h>
+#include <scsi/scsi_host.h>
+
+#define RAID_NUM_ATTRS  3
+
+struct raid_internal {
+        struct raid_template r;
+        struct raid_function_template *f;
+        /* The actual attributes */
+        struct class_device_attribute private_attrs[RAID_NUM_ATTRS];
+        /* The array of null terminated pointers to attributes 
+         * needed by scsi_sysfs.c */
+        struct class_device_attribute *attrs[RAID_NUM_ATTRS + 1];
+};
+
+struct raid_component {
+        struct list_head node;
+        struct device *dev;
+        int num;
+};
+
+#define to_raid_internal(tmpl)  container_of(tmpl, struct raid_internal, r)
+
+#define tc_to_raid_internal(tcont) ({                                   \
+        struct raid_template *r =                                       \
+                container_of(tcont, struct raid_template, raid_attrs);  \
+        to_raid_internal(r);                                            \
+})
+
+#define ac_to_raid_internal(acont) ({                                   \
+        struct transport_container *tc =                                \
+                container_of(acont, struct transport_container, ac);    \
+        tc_to_raid_internal(tc);                                        \
+})
+
+#define class_device_to_raid_internal(cdev) ({                          \
+        struct attribute_container *ac =                                \
+                attribute_container_classdev_to_container(cdev);        \
+        ac_to_raid_internal(ac);                                        \
+})
+        
+
+static int raid_match(struct attribute_container *cont, struct device *dev)
+{
+        /* We have to look for every subsystem that could house
+         * emulated RAID devices, so start with SCSI */
+        struct raid_internal *i = ac_to_raid_internal(cont);
+
+        if (scsi_is_sdev_device(dev)) {
+                struct scsi_device *sdev = to_scsi_device(dev);
+
+                if (i->f->cookie != sdev->host->hostt)
+                        return 0;
+
+                return i->f->is_raid(dev);
+        }
+        /* FIXME: look at other subsystems too */
+        return 0;
+}
+
+static int raid_setup(struct transport_container *tc, struct device *dev,
+                       struct class_device *cdev)
+{
+        struct raid_data *rd;
+
+        BUG_ON(class_get_devdata(cdev));
+
+        rd = kmalloc(sizeof(*rd), GFP_KERNEL);
+        if (!rd)
+                return -ENOMEM;
+
+        memset(rd, 0, sizeof(*rd));
+        INIT_LIST_HEAD(&rd->component_list);
+        class_set_devdata(cdev, rd);
+                
+        return 0;
+}
+
+static int raid_remove(struct transport_container *tc, struct device *dev,
+                       struct class_device *cdev)
+{
+        struct raid_data *rd = class_get_devdata(cdev);
+        struct raid_component *rc, *next;
+        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);
+        }
+        kfree(class_get_devdata(cdev));
+        return 0;
+}
+
+static DECLARE_TRANSPORT_CLASS(raid_class,
+                               "raid_devices",
+                               raid_setup,
+                               raid_remove,
+                               NULL);
+
+static struct {
+        enum raid_state value;
+        char            *name;
+} raid_states[] = {
+        { RAID_ACTIVE, "active" },
+        { RAID_DEGRADED, "degraded" },
+        { RAID_RESYNCING, "resyncing" },
+        { RAID_OFFLINE, "offline" },
+};
+
+static const char *raid_state_name(enum raid_state state)
+{
+        int i;
+        char *name = NULL;
+
+        for (i = 0; i < sizeof(raid_states)/sizeof(raid_states[0]); i++) {
+                if (raid_states[i].value == state) {
+                        name = raid_states[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)   \
+{                                                                       \
+        struct raid_data *rd = class_get_devdata(cdev);                 \
+        code                                                            \
+        return snprintf(buf, 20, #fmt "\n", var);                       \
+}
+
+#define raid_attr_ro_states(attr, states, code)                         \
+raid_attr_show_internal(attr, %s, name,                                 \
+        const char *name;                                               \
+        code                                                            \
+        name = raid_##states##_name(rd->attr);                          \
+)                                                                       \
+static CLASS_DEVICE_ATTR(attr, S_IRUGO, raid_show_##attr, NULL)
+
+
+#define raid_attr_ro_internal(attr, code)                               \
+raid_attr_show_internal(attr, %d, rd->attr, code)                       \
+static CLASS_DEVICE_ATTR(attr, S_IRUGO, raid_show_##attr, NULL)
+
+#define ATTR_CODE(attr)                                                 \
+        struct raid_internal *i = class_device_to_raid_internal(cdev);  \
+        if (i->f->get_##attr)                                           \
+                i->f->get_##attr(cdev->dev);
+
+#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))
+
+raid_attr_ro(level);
+raid_attr_ro_fn(resync);
+raid_attr_ro_state(state);
+
+void raid_component_add(struct raid_template *r,struct device *raid_dev,
+                        struct device *component_dev)
+{
+        struct class_device *cdev =
+                attribute_container_find_class_device(&r->raid_attrs.ac,
+                                                      raid_dev);
+        struct raid_component *rc;
+        struct raid_data *rd = class_get_devdata(cdev);
+        char buf[40];
+
+        rc = kmalloc(sizeof(*rc), GFP_KERNEL);
+        if (!rc)
+                return;
+
+        INIT_LIST_HEAD(&rc->node);
+        rc->dev = component_dev;
+        rc->num = rd->component_count++;
+
+        snprintf(buf, sizeof(buf), "component-%d", rc->num);
+        list_add_tail(&rc->node, &rd->component_list);
+        sysfs_create_link(&cdev->kobj, &component_dev->kobj, buf);
+}
+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),
+                                          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;
+        i->r.raid_attrs.ac.match = raid_match;
+        i->r.raid_attrs.ac.attrs = &i->attrs[0];
+
+        attribute_container_register(&i->r.raid_attrs.ac);
+
+        i->attrs[count++] = &class_device_attr_level;
+        i->attrs[count++] = &class_device_attr_resync;
+        i->attrs[count++] = &class_device_attr_state;
+
+        i->attrs[count] = NULL;
+        BUG_ON(count > RAID_NUM_ATTRS);
+
+        return &i->r;
+}
+EXPORT_SYMBOL(raid_class_attach);
+
+void
+raid_class_release(struct raid_template *r)
+{
+        struct raid_internal *i = to_raid_internal(r);
+
+        attribute_container_unregister(&i->r.raid_attrs.ac);
+
+        kfree(i);
+}
+EXPORT_SYMBOL(raid_class_release);
+
+static __init int raid_init(void)
+{
+        return transport_class_register(&raid_class);
+}
+
+static __exit void raid_exit(void)
+{
+        transport_class_unregister(&raid_class);
+}
+
+MODULE_AUTHOR("James Bottomley");
+MODULE_DESCRIPTION("RAID device class");
+MODULE_LICENSE("GPL");
+
+module_init(raid_init);
+module_exit(raid_exit);
+
diff --git a/drivers/scsi/sata_mv.c b/drivers/scsi/sata_mv.c
new file mode 100644
index 00000000000..f97e3afa97d
--- /dev/null
+++ b/drivers/scsi/sata_mv.c
@@ -0,0 +1,843 @@
+/*
+ * sata_mv.c - Marvell SATA support
+ *
+ * Copyright 2005: EMC Corporation, all rights reserved. 
+ *
+ * Please ALWAYS copy linux-ide@vger.kernel.org on emails.
+ *
+ * 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; version 2 of the License.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/pci.h>
+#include <linux/init.h>
+#include <linux/blkdev.h>
+#include <linux/delay.h>
+#include <linux/interrupt.h>
+#include <linux/sched.h>
+#include <linux/dma-mapping.h>
+#include "scsi.h"
+#include <scsi/scsi_host.h>
+#include <linux/libata.h>
+#include <asm/io.h>
+
+#define DRV_NAME        "sata_mv"
+#define DRV_VERSION     "0.12"
+
+enum {
+        /* BAR's are enumerated in terms of pci_resource_start() terms */
+        MV_PRIMARY_BAR          = 0,    /* offset 0x10: memory space */
+        MV_IO_BAR               = 2,    /* offset 0x18: IO space */
+        MV_MISC_BAR             = 3,    /* offset 0x1c: FLASH, NVRAM, SRAM */
+
+        MV_MAJOR_REG_AREA_SZ    = 0x10000,      /* 64KB */
+        MV_MINOR_REG_AREA_SZ    = 0x2000,       /* 8KB */
+
+        MV_PCI_REG_BASE         = 0,
+        MV_IRQ_COAL_REG_BASE    = 0x18000,      /* 6xxx part only */
+        MV_SATAHC0_REG_BASE     = 0x20000,
+
+        MV_PCI_REG_SZ           = MV_MAJOR_REG_AREA_SZ,
+        MV_SATAHC_REG_SZ        = MV_MAJOR_REG_AREA_SZ,
+        MV_SATAHC_ARBTR_REG_SZ  = MV_MINOR_REG_AREA_SZ,         /* arbiter */
+        MV_PORT_REG_SZ          = MV_MINOR_REG_AREA_SZ,
+
+        MV_Q_CT                 = 32,
+        MV_CRQB_SZ              = 32,
+        MV_CRPB_SZ              = 8,
+
+        MV_DMA_BOUNDARY         = 0xffffffffU,
+        SATAHC_MASK             = (~(MV_SATAHC_REG_SZ - 1)),
+
+        MV_PORTS_PER_HC         = 4,
+        /* == (port / MV_PORTS_PER_HC) to determine HC from 0-7 port */
+        MV_PORT_HC_SHIFT        = 2,
+        /* == (port % MV_PORTS_PER_HC) to determine port from 0-7 port */
+        MV_PORT_MASK            = 3,
+
+        /* Host Flags */
+        MV_FLAG_DUAL_HC         = (1 << 30),  /* two SATA Host Controllers */
+        MV_FLAG_IRQ_COALESCE    = (1 << 29),  /* IRQ coalescing capability */
+        MV_FLAG_BDMA            = (1 << 28),  /* Basic DMA */
+
+        chip_504x               = 0,
+        chip_508x               = 1,
+        chip_604x               = 2,
+        chip_608x               = 3,
+
+        /* PCI interface registers */
+
+        PCI_MAIN_CMD_STS_OFS    = 0xd30,
+        STOP_PCI_MASTER         = (1 << 2),
+        PCI_MASTER_EMPTY        = (1 << 3),
+        GLOB_SFT_RST            = (1 << 4),
+
+        PCI_IRQ_CAUSE_OFS       = 0x1d58,
+        PCI_IRQ_MASK_OFS        = 0x1d5c,
+        PCI_UNMASK_ALL_IRQS     = 0x7fffff,     /* bits 22-0 */
+
+        HC_MAIN_IRQ_CAUSE_OFS   = 0x1d60,
+        HC_MAIN_IRQ_MASK_OFS    = 0x1d64,
+        PORT0_ERR               = (1 << 0),     /* shift by port # */
+        PORT0_DONE              = (1 << 1),     /* shift by port # */
+        HC0_IRQ_PEND            = 0x1ff,        /* bits 0-8 = HC0's ports */
+        HC_SHIFT                = 9,            /* bits 9-17 = HC1's ports */
+        PCI_ERR                 = (1 << 18),
+        TRAN_LO_DONE            = (1 << 19),    /* 6xxx: IRQ coalescing */
+        TRAN_HI_DONE            = (1 << 20),    /* 6xxx: IRQ coalescing */
+        PORTS_0_7_COAL_DONE     = (1 << 21),    /* 6xxx: IRQ coalescing */
+        GPIO_INT                = (1 << 22),
+        SELF_INT                = (1 << 23),
+        TWSI_INT                = (1 << 24),
+        HC_MAIN_RSVD            = (0x7f << 25), /* bits 31-25 */
+        HC_MAIN_MASKED_IRQS     = (TRAN_LO_DONE | TRAN_HI_DONE | 
+                                   PORTS_0_7_COAL_DONE | GPIO_INT | TWSI_INT |
+                                   HC_MAIN_RSVD),
+
+        /* SATAHC registers */
+        HC_CFG_OFS              = 0,
+
+        HC_IRQ_CAUSE_OFS        = 0x14,
+        CRBP_DMA_DONE           = (1 << 0),     /* shift by port # */
+        HC_IRQ_COAL             = (1 << 4),     /* IRQ coalescing */
+        DEV_IRQ                 = (1 << 8),     /* shift by port # */
+
+        /* Shadow block registers */
+        SHD_PIO_DATA_OFS        = 0x100,
+        SHD_FEA_ERR_OFS         = 0x104,
+        SHD_SECT_CNT_OFS        = 0x108,
+        SHD_LBA_L_OFS           = 0x10C,
+        SHD_LBA_M_OFS           = 0x110,
+        SHD_LBA_H_OFS           = 0x114,
+        SHD_DEV_HD_OFS          = 0x118,
+        SHD_CMD_STA_OFS         = 0x11C,
+        SHD_CTL_AST_OFS         = 0x120,
+
+        /* SATA registers */
+        SATA_STATUS_OFS         = 0x300,  /* ctrl, err regs follow status */
+        SATA_ACTIVE_OFS         = 0x350,
+
+        /* Port registers */
+        EDMA_CFG_OFS            = 0,
+
+        EDMA_ERR_IRQ_CAUSE_OFS  = 0x8,
+        EDMA_ERR_IRQ_MASK_OFS   = 0xc,
+        EDMA_ERR_D_PAR          = (1 << 0),
+        EDMA_ERR_PRD_PAR        = (1 << 1),
+        EDMA_ERR_DEV            = (1 << 2),
+        EDMA_ERR_DEV_DCON       = (1 << 3),
+        EDMA_ERR_DEV_CON        = (1 << 4),
+        EDMA_ERR_SERR           = (1 << 5),
+        EDMA_ERR_SELF_DIS       = (1 << 7),
+        EDMA_ERR_BIST_ASYNC     = (1 << 8),
+        EDMA_ERR_CRBQ_PAR       = (1 << 9),
+        EDMA_ERR_CRPB_PAR       = (1 << 10),
+        EDMA_ERR_INTRL_PAR      = (1 << 11),
+        EDMA_ERR_IORDY          = (1 << 12),
+        EDMA_ERR_LNK_CTRL_RX    = (0xf << 13),
+        EDMA_ERR_LNK_CTRL_RX_2  = (1 << 15),
+        EDMA_ERR_LNK_DATA_RX    = (0xf << 17),
+        EDMA_ERR_LNK_CTRL_TX    = (0x1f << 21),
+        EDMA_ERR_LNK_DATA_TX    = (0x1f << 26),
+        EDMA_ERR_TRANS_PROTO    = (1 << 31),
+        EDMA_ERR_FATAL          = (EDMA_ERR_D_PAR | EDMA_ERR_PRD_PAR | 
+                                   EDMA_ERR_DEV_DCON | EDMA_ERR_CRBQ_PAR |
+                                   EDMA_ERR_CRPB_PAR | EDMA_ERR_INTRL_PAR |
+                                   EDMA_ERR_IORDY | EDMA_ERR_LNK_CTRL_RX_2 | 
+                                   EDMA_ERR_LNK_DATA_RX |
+                                   EDMA_ERR_LNK_DATA_TX | 
+                                   EDMA_ERR_TRANS_PROTO),
+
+        EDMA_CMD_OFS            = 0x28,
+        EDMA_EN                 = (1 << 0),
+        EDMA_DS                 = (1 << 1),
+        ATA_RST                 = (1 << 2),
+
+        /* BDMA is 6xxx part only */
+        BDMA_CMD_OFS            = 0x224,
+        BDMA_START              = (1 << 0),
+
+        MV_UNDEF                = 0,
+};
+
+struct mv_port_priv {
+
+};
+
+struct mv_host_priv {
+
+};
+
+static void mv_irq_clear(struct ata_port *ap);
+static u32 mv_scr_read(struct ata_port *ap, unsigned int sc_reg_in);
+static void mv_scr_write(struct ata_port *ap, unsigned int sc_reg_in, u32 val);
+static void mv_phy_reset(struct ata_port *ap);
+static int mv_master_reset(void __iomem *mmio_base);
+static irqreturn_t mv_interrupt(int irq, void *dev_instance,
+                                struct pt_regs *regs);
+static int mv_init_one(struct pci_dev *pdev, const struct pci_device_id *ent);
+
+static Scsi_Host_Template mv_sht = {
+        .module                 = THIS_MODULE,
+        .name                   = DRV_NAME,
+        .ioctl                  = ata_scsi_ioctl,
+        .queuecommand           = ata_scsi_queuecmd,
+        .eh_strategy_handler    = ata_scsi_error,
+        .can_queue              = ATA_DEF_QUEUE,
+        .this_id                = ATA_SHT_THIS_ID,
+        .sg_tablesize           = MV_UNDEF,
+        .max_sectors            = ATA_MAX_SECTORS,
+        .cmd_per_lun            = ATA_SHT_CMD_PER_LUN,
+        .emulated               = ATA_SHT_EMULATED,
+        .use_clustering         = MV_UNDEF,
+        .proc_name              = DRV_NAME,
+        .dma_boundary           = MV_DMA_BOUNDARY,
+        .slave_configure        = ata_scsi_slave_config,
+        .bios_param             = ata_std_bios_param,
+        .ordered_flush          = 1,
+};
+
+static struct ata_port_operations mv_ops = {
+        .port_disable           = ata_port_disable,
+
+        .tf_load                = ata_tf_load,
+        .tf_read                = ata_tf_read,
+        .check_status           = ata_check_status,
+        .exec_command           = ata_exec_command,
+        .dev_select             = ata_std_dev_select,
+
+        .phy_reset              = mv_phy_reset,
+
+        .qc_prep                = ata_qc_prep,
+        .qc_issue               = ata_qc_issue_prot,
+
+        .eng_timeout            = ata_eng_timeout,
+
+        .irq_handler            = mv_interrupt,
+        .irq_clear              = mv_irq_clear,
+
+        .scr_read               = mv_scr_read,
+        .scr_write              = mv_scr_write,
+
+        .port_start             = ata_port_start,
+        .port_stop              = ata_port_stop,
+        .host_stop              = ata_host_stop,
+};
+
+static struct ata_port_info mv_port_info[] = {
+        {  /* chip_504x */
+                .sht            = &mv_sht,
+                .host_flags     = (ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
+                                   ATA_FLAG_SATA_RESET | ATA_FLAG_MMIO),
+                .pio_mask       = 0x1f, /* pio4-0 */
+                .udma_mask      = 0,    /* 0x7f (udma6-0 disabled for now) */
+                .port_ops       = &mv_ops,
+        },
+        {  /* chip_508x */
+                .sht            = &mv_sht,
+                .host_flags     = (ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
+                                   ATA_FLAG_SATA_RESET | ATA_FLAG_MMIO | 
+                                   MV_FLAG_DUAL_HC),
+                .pio_mask       = 0x1f, /* pio4-0 */
+                .udma_mask      = 0,    /* 0x7f (udma6-0 disabled for now) */
+                .port_ops       = &mv_ops,
+        },
+        {  /* chip_604x */
+                .sht            = &mv_sht,
+                .host_flags     = (ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
+                                   ATA_FLAG_SATA_RESET | ATA_FLAG_MMIO | 
+                                   MV_FLAG_IRQ_COALESCE | MV_FLAG_BDMA),
+                .pio_mask       = 0x1f, /* pio4-0 */
+                .udma_mask      = 0,    /* 0x7f (udma6-0 disabled for now) */
+                .port_ops       = &mv_ops,
+        },
+        {  /* chip_608x */
+                .sht            = &mv_sht,
+                .host_flags     = (ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
+                                   ATA_FLAG_SATA_RESET | ATA_FLAG_MMIO |
+                                   MV_FLAG_IRQ_COALESCE | MV_FLAG_DUAL_HC |
+                                   MV_FLAG_BDMA),
+                .pio_mask       = 0x1f, /* pio4-0 */
+                .udma_mask      = 0,    /* 0x7f (udma6-0 disabled for now) */
+                .port_ops       = &mv_ops,
+        },
+};
+
+static 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},
+        {PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x5081), 0, 0, chip_508x},
+
+        {PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x6040), 0, 0, chip_604x},
+        {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},
+        {}                      /* terminate list */
+};
+
+static struct pci_driver mv_pci_driver = {
+        .name                   = DRV_NAME,
+        .id_table               = mv_pci_tbl,
+        .probe                  = mv_init_one,
+        .remove                 = ata_pci_remove_one,
+};
+
+/*
+ * Functions
+ */
+
+static inline void writelfl(unsigned long data, void __iomem *addr)
+{
+        writel(data, addr);
+        (void) readl(addr);     /* flush to avoid PCI posted write */
+}
+
+static inline void __iomem *mv_port_addr_to_hc_base(void __iomem *port_mmio)
+{
+        return ((void __iomem *)((unsigned long)port_mmio & 
+                                 (unsigned long)SATAHC_MASK));
+}
+
+static inline void __iomem *mv_hc_base(void __iomem *base, unsigned int hc)
+{
+        return (base + MV_SATAHC0_REG_BASE + (hc * MV_SATAHC_REG_SZ));
+}
+
+static inline void __iomem *mv_port_base(void __iomem *base, unsigned int port)
+{
+        return (mv_hc_base(base, port >> MV_PORT_HC_SHIFT) +
+                MV_SATAHC_ARBTR_REG_SZ + 
+                ((port & MV_PORT_MASK) * MV_PORT_REG_SZ));
+}
+
+static inline void __iomem *mv_ap_base(struct ata_port *ap)
+{
+        return mv_port_base(ap->host_set->mmio_base, ap->port_no);
+}
+
+static inline int mv_get_hc_count(unsigned long flags)
+{
+        return ((flags & MV_FLAG_DUAL_HC) ? 2 : 1);
+}
+
+static inline int mv_is_edma_active(struct ata_port *ap)
+{
+        void __iomem *port_mmio = mv_ap_base(ap);
+        return (EDMA_EN & readl(port_mmio + EDMA_CMD_OFS));
+}
+
+static inline int mv_port_bdma_capable(struct ata_port *ap)
+{
+        return (ap->flags & MV_FLAG_BDMA);
+}
+
+static void mv_irq_clear(struct ata_port *ap)
+{
+}
+
+static unsigned int mv_scr_offset(unsigned int sc_reg_in)
+{
+        unsigned int ofs;
+
+        switch (sc_reg_in) {
+        case SCR_STATUS:
+        case SCR_CONTROL:
+        case SCR_ERROR:
+                ofs = SATA_STATUS_OFS + (sc_reg_in * sizeof(u32));
+                break;
+        case SCR_ACTIVE:
+                ofs = SATA_ACTIVE_OFS;   /* active is not with the others */
+                break;
+        default:
+                ofs = 0xffffffffU;
+                break;
+        }
+        return ofs;
+}
+
+static u32 mv_scr_read(struct ata_port *ap, unsigned int sc_reg_in)
+{
+        unsigned int ofs = mv_scr_offset(sc_reg_in);
+
+        if (0xffffffffU != ofs) {
+                return readl(mv_ap_base(ap) + ofs);
+        } else {
+                return (u32) ofs;
+        }
+}
+
+static void mv_scr_write(struct ata_port *ap, unsigned int sc_reg_in, u32 val)
+{
+        unsigned int ofs = mv_scr_offset(sc_reg_in);
+
+        if (0xffffffffU != ofs) {
+                writelfl(val, mv_ap_base(ap) + ofs);
+        }
+}
+
+static int mv_master_reset(void __iomem *mmio_base)
+{
+        void __iomem *reg = mmio_base + PCI_MAIN_CMD_STS_OFS;
+        int i, rc = 0;
+        u32 t;
+
+        VPRINTK("ENTER\n");
+
+        /* Following procedure defined in PCI "main command and status
+         * register" table.
+         */
+        t = readl(reg);
+        writel(t | STOP_PCI_MASTER, reg);
+
+        for (i = 0; i < 100; i++) {
+                msleep(10);
+                t = readl(reg);
+                if (PCI_MASTER_EMPTY & t) {
+                        break;
+                }
+        }
+        if (!(PCI_MASTER_EMPTY & t)) {
+                printk(KERN_ERR DRV_NAME "PCI master won't flush\n");
+                rc = 1;         /* broken HW? */
+                goto done;
+        }
+
+        /* set reset */
+        i = 5;
+        do {
+                writel(t | GLOB_SFT_RST, reg);
+                t = readl(reg);
+                udelay(1);
+        } while (!(GLOB_SFT_RST & t) && (i-- > 0));
+
+        if (!(GLOB_SFT_RST & t)) {
+                printk(KERN_ERR DRV_NAME "can't set global reset\n");
+                rc = 1;         /* broken HW? */
+                goto done;
+        }
+
+        /* clear reset */
+        i = 5;
+        do {
+                writel(t & ~GLOB_SFT_RST, reg);
+                t = readl(reg);
+                udelay(1);
+        } while ((GLOB_SFT_RST & t) && (i-- > 0));
+
+        if (GLOB_SFT_RST & t) {
+                printk(KERN_ERR DRV_NAME "can't clear global reset\n");
+                rc = 1;         /* broken HW? */
+        }
+
+ done:
+        VPRINTK("EXIT, rc = %i\n", rc);
+        return rc;
+}
+
+static void mv_err_intr(struct ata_port *ap)
+{
+        void __iomem *port_mmio;
+        u32 edma_err_cause, serr = 0;
+
+        /* bug here b/c we got an err int on a port we don't know about,
+         * so there's no way to clear it
+         */
+        BUG_ON(NULL == ap);
+        port_mmio = mv_ap_base(ap);
+
+        edma_err_cause = readl(port_mmio + EDMA_ERR_IRQ_CAUSE_OFS);
+
+        if (EDMA_ERR_SERR & edma_err_cause) {
+                serr = scr_read(ap, SCR_ERROR);
+                scr_write_flush(ap, SCR_ERROR, serr);
+        }
+        DPRINTK("port %u error; EDMA err cause: 0x%08x SERR: 0x%08x\n", 
+                ap->port_no, edma_err_cause, serr);
+
+        /* Clear EDMA now that SERR cleanup done */
+        writelfl(0, port_mmio + EDMA_ERR_IRQ_CAUSE_OFS);
+
+        /* check for fatal here and recover if needed */
+        if (EDMA_ERR_FATAL & edma_err_cause) {
+                mv_phy_reset(ap);
+        }
+}
+
+/* Handle any outstanding interrupts in a single SATAHC 
+ */
+static void mv_host_intr(struct ata_host_set *host_set, u32 relevant,
+                         unsigned int hc)
+{
+        void __iomem *mmio = host_set->mmio_base;
+        void __iomem *hc_mmio = mv_hc_base(mmio, hc);
+        struct ata_port *ap;
+        struct ata_queued_cmd *qc;
+        u32 hc_irq_cause;
+        int shift, port, port0, hard_port;
+        u8 ata_status;
+
+        if (hc == 0) {
+                port0 = 0;
+        } else {
+                port0 = MV_PORTS_PER_HC;
+        }
+
+        /* we'll need the HC success int register in most cases */
+        hc_irq_cause = readl(hc_mmio + HC_IRQ_CAUSE_OFS);
+        if (hc_irq_cause) {
+                writelfl(0, hc_mmio + HC_IRQ_CAUSE_OFS);
+        }
+
+        VPRINTK("ENTER, hc%u relevant=0x%08x HC IRQ cause=0x%08x\n",
+                hc,relevant,hc_irq_cause);
+
+        for (port = port0; port < port0 + MV_PORTS_PER_HC; port++) {
+                ap = host_set->ports[port];
+                hard_port = port & MV_PORT_MASK;        /* range 0-3 */
+                ata_status = 0xffU;
+
+                if (((CRBP_DMA_DONE | DEV_IRQ) << hard_port) & hc_irq_cause) {
+                        BUG_ON(NULL == ap);
+                        /* rcv'd new resp, basic DMA complete, or ATA IRQ */
+                        /* This is needed to clear the ATA INTRQ.
+                         * FIXME: don't read the status reg in EDMA mode!
+                         */
+                        ata_status = readb((void __iomem *)
+                                           ap->ioaddr.status_addr);
+                }
+
+                shift = port * 2;
+                if (port >= MV_PORTS_PER_HC) {
+                        shift++;        /* skip bit 8 in the HC Main IRQ reg */
+                }
+                if ((PORT0_ERR << shift) & relevant) {
+                        mv_err_intr(ap);
+                        /* FIXME: smart to OR in ATA_ERR? */
+                        ata_status = readb((void __iomem *)
+                                           ap->ioaddr.status_addr) | ATA_ERR;
+                }
+                
+                if (ap) {
+                        qc = ata_qc_from_tag(ap, ap->active_tag);
+                        if (NULL != qc) {
+                                VPRINTK("port %u IRQ found for qc, "
+                                        "ata_status 0x%x\n", port,ata_status);
+                                BUG_ON(0xffU == ata_status);
+                                /* mark qc status appropriately */
+                                ata_qc_complete(qc, ata_status);
+                        }
+                }
+        }
+        VPRINTK("EXIT\n");
+}
+
+static irqreturn_t mv_interrupt(int irq, void *dev_instance,
+                                struct pt_regs *regs)
+{
+        struct ata_host_set *host_set = dev_instance;
+        unsigned int hc, handled = 0, n_hcs;
+        void __iomem *mmio;
+        u32 irq_stat;
+
+        mmio = host_set->mmio_base;
+        irq_stat = readl(mmio + HC_MAIN_IRQ_CAUSE_OFS);
+        n_hcs = mv_get_hc_count(host_set->ports[0]->flags);
+
+        /* check the cases where we either have nothing pending or have read
+         * a bogus register value which can indicate HW removal or PCI fault
+         */
+        if (!irq_stat || (0xffffffffU == irq_stat)) {
+                return IRQ_NONE;
+        }
+
+        spin_lock(&host_set->lock);
+
+        for (hc = 0; hc < n_hcs; hc++) {
+                u32 relevant = irq_stat & (HC0_IRQ_PEND << (hc * HC_SHIFT));
+                if (relevant) {
+                        mv_host_intr(host_set, relevant, hc);
+                        handled = 1;
+                }
+        }
+        if (PCI_ERR & irq_stat) {
+                /* FIXME: these are all masked by default, but still need
+                 * to recover from them properly.
+                 */
+        }
+
+        spin_unlock(&host_set->lock);
+
+        return IRQ_RETVAL(handled);
+}
+
+static void mv_phy_reset(struct ata_port *ap)
+{
+        void __iomem *port_mmio = mv_ap_base(ap);
+        struct ata_taskfile tf;
+        struct ata_device *dev = &ap->device[0];
+        u32 edma = 0, bdma;
+
+        VPRINTK("ENTER, port %u, mmio 0x%p\n", ap->port_no, port_mmio);
+
+        edma = readl(port_mmio + EDMA_CMD_OFS);
+        if (EDMA_EN & edma) {
+                /* disable EDMA if active */
+                edma &= ~EDMA_EN;
+                writelfl(edma | EDMA_DS, port_mmio + EDMA_CMD_OFS);
+                udelay(1);
+        } else if (mv_port_bdma_capable(ap) &&
+                   (bdma = readl(port_mmio + BDMA_CMD_OFS)) & BDMA_START) {
+                /* disable BDMA if active */
+                writelfl(bdma & ~BDMA_START, port_mmio + BDMA_CMD_OFS);
+        }
+
+        writelfl(edma | ATA_RST, port_mmio + EDMA_CMD_OFS);
+        udelay(25);             /* allow reset propagation */
+
+        /* Spec never mentions clearing the bit.  Marvell's driver does
+         * clear the bit, however.
+         */
+        writelfl(edma & ~ATA_RST, port_mmio + EDMA_CMD_OFS);
+
+        VPRINTK("Done.  Now calling __sata_phy_reset()\n");
+
+        /* proceed to init communications via the scr_control reg */
+        __sata_phy_reset(ap);
+
+        if (ap->flags & ATA_FLAG_PORT_DISABLED) {
+                VPRINTK("Port disabled pre-sig.  Exiting.\n");
+                return;
+        }
+
+        tf.lbah = readb((void __iomem *) ap->ioaddr.lbah_addr);
+        tf.lbam = readb((void __iomem *) ap->ioaddr.lbam_addr);
+        tf.lbal = readb((void __iomem *) ap->ioaddr.lbal_addr);
+        tf.nsect = readb((void __iomem *) ap->ioaddr.nsect_addr);
+
+        dev->class = ata_dev_classify(&tf);
+        if (!ata_dev_present(dev)) {
+                VPRINTK("Port disabled post-sig: No device present.\n");
+                ata_port_disable(ap);
+        }
+        VPRINTK("EXIT\n");
+}
+
+static void mv_port_init(struct ata_ioports *port, unsigned long base)
+{
+        /* PIO related setup */
+        port->data_addr = base + SHD_PIO_DATA_OFS;
+        port->error_addr = port->feature_addr = base + SHD_FEA_ERR_OFS;
+        port->nsect_addr = base + SHD_SECT_CNT_OFS;
+        port->lbal_addr = base + SHD_LBA_L_OFS;
+        port->lbam_addr = base + SHD_LBA_M_OFS;
+        port->lbah_addr = base + SHD_LBA_H_OFS;
+        port->device_addr = base + SHD_DEV_HD_OFS;
+        port->status_addr = port->command_addr = base + SHD_CMD_STA_OFS;
+        port->altstatus_addr = port->ctl_addr = base + SHD_CTL_AST_OFS;
+        /* unused */
+        port->cmd_addr = port->bmdma_addr = port->scr_addr = 0;
+
+        /* unmask all EDMA error interrupts */
+        writel(~0, (void __iomem *)base + EDMA_ERR_IRQ_MASK_OFS);
+
+        VPRINTK("EDMA cfg=0x%08x EDMA IRQ err cause/mask=0x%08x/0x%08x\n", 
+                readl((void __iomem *)base + EDMA_CFG_OFS),
+                readl((void __iomem *)base + EDMA_ERR_IRQ_CAUSE_OFS),
+                readl((void __iomem *)base + EDMA_ERR_IRQ_MASK_OFS));
+}
+
+static int mv_host_init(struct ata_probe_ent *probe_ent)
+{
+        int rc = 0, n_hc, port, hc;
+        void __iomem *mmio = probe_ent->mmio_base;
+        void __iomem *port_mmio;
+
+        if (mv_master_reset(probe_ent->mmio_base)) {
+                rc = 1;
+                goto done;
+        }
+
+        n_hc = mv_get_hc_count(probe_ent->host_flags);
+        probe_ent->n_ports = MV_PORTS_PER_HC * n_hc;
+
+        for (port = 0; port < probe_ent->n_ports; port++) {
+                port_mmio = mv_port_base(mmio, port);
+                mv_port_init(&probe_ent->port[port], (unsigned long)port_mmio);
+        }
+
+        for (hc = 0; hc < n_hc; hc++) {
+                VPRINTK("HC%i: HC config=0x%08x HC IRQ cause=0x%08x\n", hc,
+                        readl(mv_hc_base(mmio, hc) + HC_CFG_OFS),
+                        readl(mv_hc_base(mmio, hc) + HC_IRQ_CAUSE_OFS));
+        }
+
+        writel(~HC_MAIN_MASKED_IRQS, mmio + HC_MAIN_IRQ_MASK_OFS);
+        writel(PCI_UNMASK_ALL_IRQS, mmio + PCI_IRQ_MASK_OFS);
+
+        VPRINTK("HC MAIN IRQ cause/mask=0x%08x/0x%08x "
+                "PCI int cause/mask=0x%08x/0x%08x\n", 
+                readl(mmio + HC_MAIN_IRQ_CAUSE_OFS),
+                readl(mmio + HC_MAIN_IRQ_MASK_OFS),
+                readl(mmio + PCI_IRQ_CAUSE_OFS),
+                readl(mmio + PCI_IRQ_MASK_OFS));
+
+ done:
+        return rc;
+}
+
+/* move to PCI layer, integrate w/ MSI stuff */
+static void pci_intx(struct pci_dev *pdev, int enable)
+{
+        u16 pci_command, new;
+
+        pci_read_config_word(pdev, PCI_COMMAND, &pci_command);
+
+        if (enable)
+                new = pci_command & ~PCI_COMMAND_INTX_DISABLE;
+        else
+                new = pci_command | PCI_COMMAND_INTX_DISABLE;
+
+        if (new != pci_command)
+                pci_write_config_word(pdev, PCI_COMMAND, pci_command);
+}
+
+static int mv_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
+{
+        static int printed_version = 0;
+        struct ata_probe_ent *probe_ent = NULL;
+        struct mv_host_priv *hpriv;
+        unsigned int board_idx = (unsigned int)ent->driver_data;
+        void __iomem *mmio_base;
+        int pci_dev_busy = 0;
+        int rc;
+
+        if (!printed_version++) {
+                printk(KERN_DEBUG DRV_NAME " version " DRV_VERSION "\n");
+        }
+
+        VPRINTK("ENTER for PCI Bus:Slot.Func=%u:%u.%u\n", pdev->bus->number,
+                PCI_SLOT(pdev->devfn), PCI_FUNC(pdev->devfn));
+
+        rc = pci_enable_device(pdev);
+        if (rc) {
+                return rc;
+        }
+
+        rc = pci_request_regions(pdev, DRV_NAME);
+        if (rc) {
+                pci_dev_busy = 1;
+                goto err_out;
+        }
+
+        pci_intx(pdev, 1);
+
+        probe_ent = kmalloc(sizeof(*probe_ent), GFP_KERNEL);
+        if (probe_ent == NULL) {
+                rc = -ENOMEM;
+                goto err_out_regions;
+        }
+
+        memset(probe_ent, 0, sizeof(*probe_ent));
+        probe_ent->dev = pci_dev_to_dev(pdev);
+        INIT_LIST_HEAD(&probe_ent->node);
+
+        mmio_base = ioremap_nocache(pci_resource_start(pdev, MV_PRIMARY_BAR),
+                                    pci_resource_len(pdev, MV_PRIMARY_BAR));
+        if (mmio_base == NULL) {
+                rc = -ENOMEM;
+                goto err_out_free_ent;
+        }
+
+        hpriv = kmalloc(sizeof(*hpriv), GFP_KERNEL);
+        if (!hpriv) {
+                rc = -ENOMEM;
+                goto err_out_iounmap;
+        }
+        memset(hpriv, 0, sizeof(*hpriv));
+
+        probe_ent->sht = mv_port_info[board_idx].sht;
+        probe_ent->host_flags = mv_port_info[board_idx].host_flags;
+        probe_ent->pio_mask = mv_port_info[board_idx].pio_mask;
+        probe_ent->udma_mask = mv_port_info[board_idx].udma_mask;
+        probe_ent->port_ops = mv_port_info[board_idx].port_ops;
+
+        probe_ent->irq = pdev->irq;
+        probe_ent->irq_flags = SA_SHIRQ;
+        probe_ent->mmio_base = mmio_base;
+        probe_ent->private_data = hpriv;
+
+        /* initialize adapter */
+        rc = mv_host_init(probe_ent);
+        if (rc) {
+                goto err_out_hpriv;
+        }
+/*      mv_print_info(probe_ent); */
+
+        {
+                int b, w;
+                u32 dw[4];      /* hold a line of 16b */
+                VPRINTK("PCI config space:\n");
+                for (b = 0; b < 0x40; ) {
+                        for (w = 0; w < 4; w++) {
+                                (void) pci_read_config_dword(pdev,b,&dw[w]);
+                                b += sizeof(*dw);
+                        }
+                        VPRINTK("%08x %08x %08x %08x\n",
+                                dw[0],dw[1],dw[2],dw[3]);
+                }
+        }
+
+        /* FIXME: check ata_device_add return value */
+        ata_device_add(probe_ent);
+        kfree(probe_ent);
+
+        return 0;
+
+ err_out_hpriv:
+        kfree(hpriv);
+ err_out_iounmap:
+        iounmap(mmio_base);
+ err_out_free_ent:
+        kfree(probe_ent);
+ err_out_regions:
+        pci_release_regions(pdev);
+ err_out:
+        if (!pci_dev_busy) {
+                pci_disable_device(pdev);
+        }
+
+        return rc;
+}
+
+static int __init mv_init(void)
+{
+        return pci_module_init(&mv_pci_driver);
+}
+
+static void __exit mv_exit(void)
+{
+        pci_unregister_driver(&mv_pci_driver);
+}
+
+MODULE_AUTHOR("Brett Russ");
+MODULE_DESCRIPTION("SCSI low-level driver for Marvell SATA controllers");
+MODULE_LICENSE("GPL");
+MODULE_DEVICE_TABLE(pci, mv_pci_tbl);
+MODULE_VERSION(DRV_VERSION);
+
+module_init(mv_init);
+module_exit(mv_exit);
diff --git a/drivers/scsi/sata_nv.c b/drivers/scsi/sata_nv.c
index 03d9bc6e69d..a1d62dee3be 100644
--- a/drivers/scsi/sata_nv.c
+++ b/drivers/scsi/sata_nv.c
@@ -351,6 +351,7 @@ static void nv_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val)
 static void nv_host_stop (struct ata_host_set *host_set)
 {
         struct nv_host *host = host_set->private_data;
+        struct pci_dev *pdev = to_pci_dev(host_set->dev);
 
         // Disable hotplug event interrupts.
         if (host->host_desc->disable_hotplug)
@@ -358,7 +359,8 @@ static void nv_host_stop (struct ata_host_set *host_set)
 
         kfree(host);
 
-        ata_host_stop(host_set);
+        if (host_set->mmio_base)
+                pci_iounmap(pdev, host_set->mmio_base);
 }
 
 static int nv_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
@@ -420,8 +422,7 @@ static int nv_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
         if (host->host_flags & NV_HOST_FLAGS_SCR_MMIO) {
                 unsigned long base;
 
-                probe_ent->mmio_base = ioremap(pci_resource_start(pdev, 5),
-                                pci_resource_len(pdev, 5));
+                probe_ent->mmio_base = pci_iomap(pdev, 5, 0);
                 if (probe_ent->mmio_base == NULL) {
                         rc = -EIO;
                         goto err_out_free_host;
@@ -457,7 +458,7 @@ static int nv_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
 
 err_out_iounmap:
         if (host->host_flags & NV_HOST_FLAGS_SCR_MMIO)
-                iounmap(probe_ent->mmio_base);
+                pci_iounmap(pdev, probe_ent->mmio_base);
 err_out_free_host:
         kfree(host);
 err_out_free_ent:
diff --git a/drivers/scsi/sata_promise.c b/drivers/scsi/sata_promise.c
index 7c4f6ecc1cc..538ad727bd2 100644
--- a/drivers/scsi/sata_promise.c
+++ b/drivers/scsi/sata_promise.c
@@ -92,6 +92,7 @@ static void pdc_exec_command_mmio(struct ata_port *ap, struct ata_taskfile *tf);
 static void pdc_irq_clear(struct ata_port *ap);
 static int pdc_qc_issue_prot(struct ata_queued_cmd *qc);
 
+
 static Scsi_Host_Template pdc_ata_sht = {
         .module                 = THIS_MODULE,
         .name                   = DRV_NAME,
@@ -132,7 +133,7 @@ static struct ata_port_operations pdc_sata_ops = {
         .scr_write              = pdc_sata_scr_write,
         .port_start             = pdc_port_start,
         .port_stop              = pdc_port_stop,
-        .host_stop              = ata_host_stop,
+        .host_stop              = ata_pci_host_stop,
 };
 
 static struct ata_port_operations pdc_pata_ops = {
@@ -153,7 +154,7 @@ static struct ata_port_operations pdc_pata_ops = {
 
         .port_start             = pdc_port_start,
         .port_stop              = pdc_port_stop,
-        .host_stop              = ata_host_stop,
+        .host_stop              = ata_pci_host_stop,
 };
 
 static struct ata_port_info pdc_port_info[] = {
@@ -282,7 +283,7 @@ static void pdc_port_stop(struct ata_port *ap)
 
 static void pdc_reset_port(struct ata_port *ap)
 {
-        void *mmio = (void *) ap->ioaddr.cmd_addr + PDC_CTLSTAT;
+        void __iomem *mmio = (void __iomem *) ap->ioaddr.cmd_addr + PDC_CTLSTAT;
         unsigned int i;
         u32 tmp;
 
@@ -418,7 +419,7 @@ static inline unsigned int pdc_host_intr( struct ata_port *ap,
         u8 status;
         unsigned int handled = 0, have_err = 0;
         u32 tmp;
-        void *mmio = (void *) ap->ioaddr.cmd_addr + PDC_GLOBAL_CTL;
+        void __iomem *mmio = (void __iomem *) ap->ioaddr.cmd_addr + PDC_GLOBAL_CTL;
 
         tmp = readl(mmio);
         if (tmp & PDC_ERR_MASK) {
@@ -447,7 +448,7 @@ static inline unsigned int pdc_host_intr( struct ata_port *ap,
 static void pdc_irq_clear(struct ata_port *ap)
 {
         struct ata_host_set *host_set = ap->host_set;
-        void *mmio = host_set->mmio_base;
+        void __iomem *mmio = host_set->mmio_base;
 
         readl(mmio + PDC_INT_SEQMASK);
 }
@@ -459,7 +460,7 @@ static irqreturn_t pdc_interrupt (int irq, void *dev_instance, struct pt_regs *r
         u32 mask = 0;
         unsigned int i, tmp;
         unsigned int handled = 0;
-        void *mmio_base;
+        void __iomem *mmio_base;
 
         VPRINTK("ENTER\n");
 
@@ -581,7 +582,7 @@ static void pdc_ata_setup_port(struct ata_ioports *port, unsigned long base)
 
 static void pdc_host_init(unsigned int chip_id, struct ata_probe_ent *pe)
 {
-        void *mmio = pe->mmio_base;
+        void __iomem *mmio = pe->mmio_base;
         u32 tmp;
 
         /*
@@ -624,7 +625,7 @@ static int pdc_ata_init_one (struct pci_dev *pdev, const struct pci_device_id *e
         static int printed_version;
         struct ata_probe_ent *probe_ent = NULL;
         unsigned long base;
-        void *mmio_base;
+        void __iomem *mmio_base;
         unsigned int board_idx = (unsigned int) ent->driver_data;
         int pci_dev_busy = 0;
         int rc;
@@ -663,8 +664,7 @@ static int pdc_ata_init_one (struct pci_dev *pdev, const struct pci_device_id *e
         probe_ent->dev = pci_dev_to_dev(pdev);
         INIT_LIST_HEAD(&probe_ent->node);
 
-        mmio_base = ioremap(pci_resource_start(pdev, 3),
-                            pci_resource_len(pdev, 3));
+        mmio_base = pci_iomap(pdev, 3, 0);
         if (mmio_base == NULL) {
                 rc = -ENOMEM;
                 goto err_out_free_ent;
diff --git a/drivers/scsi/sata_qstor.c b/drivers/scsi/sata_qstor.c
index 9c99ab433bd..ffcdeb68641 100644
--- a/drivers/scsi/sata_qstor.c
+++ b/drivers/scsi/sata_qstor.c
@@ -494,7 +494,7 @@ static int qs_port_start(struct ata_port *ap)
         if (rc)
                 return rc;
         qs_enter_reg_mode(ap);
-        pp = kcalloc(1, sizeof(*pp), GFP_KERNEL);
+        pp = kzalloc(sizeof(*pp), GFP_KERNEL);
         if (!pp) {
                 rc = -ENOMEM;
                 goto err_out;
@@ -538,11 +538,12 @@ static void qs_port_stop(struct ata_port *ap)
 static void qs_host_stop(struct ata_host_set *host_set)
 {
         void __iomem *mmio_base = host_set->mmio_base;
+        struct pci_dev *pdev = to_pci_dev(host_set->dev);
 
         writeb(0, mmio_base + QS_HCT_CTRL); /* disable host interrupts */
         writeb(QS_CNFG3_GSRST, mmio_base + QS_HCF_CNFG3); /* global reset */
 
-        ata_host_stop(host_set);
+        pci_iounmap(pdev, mmio_base);
 }
 
 static void qs_host_init(unsigned int chip_id, struct ata_probe_ent *pe)
@@ -646,8 +647,7 @@ static int qs_ata_init_one(struct pci_dev *pdev,
                 goto err_out_regions;
         }
 
-        mmio_base = ioremap(pci_resource_start(pdev, 4),
-                            pci_resource_len(pdev, 4));
+        mmio_base = pci_iomap(pdev, 4, 0);
         if (mmio_base == NULL) {
                 rc = -ENOMEM;
                 goto err_out_regions;
@@ -697,7 +697,7 @@ static int qs_ata_init_one(struct pci_dev *pdev,
         return 0;
 
 err_out_iounmap:
-        iounmap(mmio_base);
+        pci_iounmap(pdev, mmio_base);
 err_out_regions:
         pci_release_regions(pdev);
 err_out:
diff --git a/drivers/scsi/sata_sil.c b/drivers/scsi/sata_sil.c
index 71d49548f0a..ba98a175ee3 100644
--- a/drivers/scsi/sata_sil.c
+++ b/drivers/scsi/sata_sil.c
@@ -86,6 +86,7 @@ static u32 sil_scr_read (struct ata_port *ap, unsigned int sc_reg);
 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[] = {
         { 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 },
@@ -172,7 +173,7 @@ static struct ata_port_operations sil_ops = {
         .scr_write              = sil_scr_write,
         .port_start             = ata_port_start,
         .port_stop              = ata_port_stop,
-        .host_stop              = ata_host_stop,
+        .host_stop              = ata_pci_host_stop,
 };
 
 static struct ata_port_info sil_port_info[] = {
@@ -231,6 +232,7 @@ MODULE_LICENSE("GPL");
 MODULE_DEVICE_TABLE(pci, sil_pci_tbl);
 MODULE_VERSION(DRV_VERSION);
 
+
 static unsigned char sil_get_device_cache_line(struct pci_dev *pdev)
 {
         u8 cache_line = 0;
@@ -242,7 +244,8 @@ static void sil_post_set_mode (struct ata_port *ap)
 {
         struct ata_host_set *host_set = ap->host_set;
         struct ata_device *dev;
-        void *addr = host_set->mmio_base + sil_port[ap->port_no].xfer_mode;
+        void __iomem *addr =
+                host_set->mmio_base + sil_port[ap->port_no].xfer_mode;
         u32 tmp, dev_mode[2];
         unsigned int i;
 
@@ -375,7 +378,7 @@ static int sil_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
         static int printed_version;
         struct ata_probe_ent *probe_ent = NULL;
         unsigned long base;
-        void *mmio_base;
+        void __iomem *mmio_base;
         int rc;
         unsigned int i;
         int pci_dev_busy = 0;
@@ -425,8 +428,7 @@ static int sil_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
         probe_ent->irq_flags = SA_SHIRQ;
         probe_ent->host_flags = sil_port_info[ent->driver_data].host_flags;
 
-        mmio_base = ioremap(pci_resource_start(pdev, 5),
-                            pci_resource_len(pdev, 5));
+        mmio_base = pci_iomap(pdev, 5, 0);
         if (mmio_base == NULL) {
                 rc = -ENOMEM;
                 goto err_out_free_ent;
diff --git a/drivers/scsi/sata_svw.c b/drivers/scsi/sata_svw.c
index 19d3bb3b0fb..d89d968beda 100644
--- a/drivers/scsi/sata_svw.c
+++ b/drivers/scsi/sata_svw.c
@@ -318,7 +318,7 @@ static struct ata_port_operations k2_sata_ops = {
         .scr_write              = k2_sata_scr_write,
         .port_start             = ata_port_start,
         .port_stop              = ata_port_stop,
-        .host_stop              = ata_host_stop,
+        .host_stop              = ata_pci_host_stop,
 };
 
 static void k2_sata_setup_port(struct ata_ioports *port, unsigned long base)
@@ -346,7 +346,7 @@ static int k2_sata_init_one (struct pci_dev *pdev, const struct pci_device_id *e
         static int printed_version;
         struct ata_probe_ent *probe_ent = NULL;
         unsigned long base;
-        void *mmio_base;
+        void __iomem *mmio_base;
         int pci_dev_busy = 0;
         int rc;
         int i;
@@ -392,8 +392,7 @@ static int k2_sata_init_one (struct pci_dev *pdev, const struct pci_device_id *e
         probe_ent->dev = pci_dev_to_dev(pdev);
         INIT_LIST_HEAD(&probe_ent->node);
 
-        mmio_base = ioremap(pci_resource_start(pdev, 5),
-                            pci_resource_len(pdev, 5));
+        mmio_base = pci_iomap(pdev, 5, 0);
         if (mmio_base == NULL) {
                 rc = -ENOMEM;
                 goto err_out_free_ent;
diff --git a/drivers/scsi/sata_sx4.c b/drivers/scsi/sata_sx4.c
index c72fcc46f0f..540a8519117 100644
--- a/drivers/scsi/sata_sx4.c
+++ b/drivers/scsi/sata_sx4.c
@@ -245,13 +245,14 @@ static struct pci_driver pdc_sata_pci_driver = {
 
 static void pdc20621_host_stop(struct ata_host_set *host_set)
 {
+        struct pci_dev *pdev = to_pci_dev(host_set->dev);
         struct pdc_host_priv *hpriv = host_set->private_data;
         void *dimm_mmio = hpriv->dimm_mmio;
 
-        iounmap(dimm_mmio);
+        pci_iounmap(pdev, dimm_mmio);
         kfree(hpriv);
 
-        ata_host_stop(host_set);
+        pci_iounmap(pdev, host_set->mmio_base);
 }
 
 static int pdc_port_start(struct ata_port *ap)
@@ -451,9 +452,9 @@ static void pdc20621_dma_prep(struct ata_queued_cmd *qc)
         struct scatterlist *sg = qc->sg;
         struct ata_port *ap = qc->ap;
         struct pdc_port_priv *pp = ap->private_data;
-        void *mmio = ap->host_set->mmio_base;
+        void __iomem *mmio = ap->host_set->mmio_base;
         struct pdc_host_priv *hpriv = ap->host_set->private_data;
-        void *dimm_mmio = hpriv->dimm_mmio;
+        void __iomem *dimm_mmio = hpriv->dimm_mmio;
         unsigned int portno = ap->port_no;
         unsigned int i, last, idx, total_len = 0, sgt_len;
         u32 *buf = (u32 *) &pp->dimm_buf[PDC_DIMM_HEADER_SZ];
@@ -513,9 +514,9 @@ static void pdc20621_nodata_prep(struct ata_queued_cmd *qc)
 {
         struct ata_port *ap = qc->ap;
         struct pdc_port_priv *pp = ap->private_data;
-        void *mmio = ap->host_set->mmio_base;
+        void __iomem *mmio = ap->host_set->mmio_base;
         struct pdc_host_priv *hpriv = ap->host_set->private_data;
-        void *dimm_mmio = hpriv->dimm_mmio;
+        void __iomem *dimm_mmio = hpriv->dimm_mmio;
         unsigned int portno = ap->port_no;
         unsigned int i;
 
@@ -565,7 +566,7 @@ static void __pdc20621_push_hdma(struct ata_queued_cmd *qc,
 {
         struct ata_port *ap = qc->ap;
         struct ata_host_set *host_set = ap->host_set;
-        void *mmio = host_set->mmio_base;
+        void __iomem *mmio = host_set->mmio_base;
 
         /* hard-code chip #0 */
         mmio += PDC_CHIP0_OFS;
@@ -639,7 +640,7 @@ static void pdc20621_packet_start(struct ata_queued_cmd *qc)
         struct ata_port *ap = qc->ap;
         struct ata_host_set *host_set = ap->host_set;
         unsigned int port_no = ap->port_no;
-        void *mmio = host_set->mmio_base;
+        void __iomem *mmio = host_set->mmio_base;
         unsigned int rw = (qc->tf.flags & ATA_TFLAG_WRITE);
         u8 seq = (u8) (port_no + 1);
         unsigned int port_ofs;
@@ -699,7 +700,7 @@ static int pdc20621_qc_issue_prot(struct ata_queued_cmd *qc)
 static inline unsigned int pdc20621_host_intr( struct ata_port *ap,
                                           struct ata_queued_cmd *qc,
                                           unsigned int doing_hdma,
-                                          void *mmio)
+                                          void __iomem *mmio)
 {
         unsigned int port_no = ap->port_no;
         unsigned int port_ofs =
@@ -778,7 +779,7 @@ static inline unsigned int pdc20621_host_intr( struct ata_port *ap,
 static void pdc20621_irq_clear(struct ata_port *ap)
 {
         struct ata_host_set *host_set = ap->host_set;
-        void *mmio = host_set->mmio_base;
+        void __iomem *mmio = host_set->mmio_base;
 
         mmio += PDC_CHIP0_OFS;
 
@@ -792,7 +793,7 @@ static irqreturn_t pdc20621_interrupt (int irq, void *dev_instance, struct pt_re
         u32 mask = 0;
         unsigned int i, tmp, port_no;
         unsigned int handled = 0;
-        void *mmio_base;
+        void __iomem *mmio_base;
 
         VPRINTK("ENTER\n");
 
@@ -940,9 +941,9 @@ static void pdc20621_get_from_dimm(struct ata_probe_ent *pe, void *psource,
         u16 idx;
         u8 page_mask;
         long dist;
-        void *mmio = pe->mmio_base;
+        void __iomem *mmio = pe->mmio_base;
         struct pdc_host_priv *hpriv = pe->private_data;
-        void *dimm_mmio = hpriv->dimm_mmio;
+        void __iomem *dimm_mmio = hpriv->dimm_mmio;
 
         /* hard-code chip #0 */
         mmio += PDC_CHIP0_OFS;
@@ -996,9 +997,9 @@ static void pdc20621_put_to_dimm(struct ata_probe_ent *pe, void *psource,
         u16 idx;
         u8 page_mask;
         long dist;
-        void *mmio = pe->mmio_base;
+        void __iomem *mmio = pe->mmio_base;
         struct pdc_host_priv *hpriv = pe->private_data;
-        void *dimm_mmio = hpriv->dimm_mmio;
+        void __iomem *dimm_mmio = hpriv->dimm_mmio;
 
         /* hard-code chip #0 */
         mmio += PDC_CHIP0_OFS;
@@ -1044,7 +1045,7 @@ static void pdc20621_put_to_dimm(struct ata_probe_ent *pe, void *psource,
 static unsigned int pdc20621_i2c_read(struct ata_probe_ent *pe, u32 device,
                                       u32 subaddr, u32 *pdata)
 {
-        void *mmio = pe->mmio_base;
+        void __iomem *mmio = pe->mmio_base;
         u32 i2creg  = 0;
         u32 status;
         u32 count =0;
@@ -1103,7 +1104,7 @@ static int pdc20621_prog_dimm0(struct ata_probe_ent *pe)
         u32 data = 0;
         int size, i;
         u8 bdimmsize;
-        void *mmio = pe->mmio_base;
+        void __iomem *mmio = pe->mmio_base;
         static const struct {
                 unsigned int reg;
                 unsigned int ofs;
@@ -1166,7 +1167,7 @@ static unsigned int pdc20621_prog_dimm_global(struct ata_probe_ent *pe)
 {
         u32 data, spd0;
         int error, i;
-        void *mmio = pe->mmio_base;
+        void __iomem *mmio = pe->mmio_base;
 
         /* hard-code chip #0 */
         mmio += PDC_CHIP0_OFS;
@@ -1220,7 +1221,7 @@ static unsigned int pdc20621_dimm_init(struct ata_probe_ent *pe)
         u32 ticks=0;
         u32 clock=0;
         u32 fparam=0;
-        void *mmio = pe->mmio_base;
+        void __iomem *mmio = pe->mmio_base;
 
         /* hard-code chip #0 */
         mmio += PDC_CHIP0_OFS;
@@ -1344,7 +1345,7 @@ static unsigned int pdc20621_dimm_init(struct ata_probe_ent *pe)
 static void pdc_20621_init(struct ata_probe_ent *pe)
 {
         u32 tmp;
-        void *mmio = pe->mmio_base;
+        void __iomem *mmio = pe->mmio_base;
 
         /* hard-code chip #0 */
         mmio += PDC_CHIP0_OFS;
@@ -1377,7 +1378,8 @@ static int pdc_sata_init_one (struct pci_dev *pdev, const struct pci_device_id *
         static int printed_version;
         struct ata_probe_ent *probe_ent = NULL;
         unsigned long base;
-        void *mmio_base, *dimm_mmio = NULL;
+        void __iomem *mmio_base;
+        void __iomem *dimm_mmio = NULL;
         struct pdc_host_priv *hpriv = NULL;
         unsigned int board_idx = (unsigned int) ent->driver_data;
         int pci_dev_busy = 0;
@@ -1417,8 +1419,7 @@ static int pdc_sata_init_one (struct pci_dev *pdev, const struct pci_device_id *
         probe_ent->dev = pci_dev_to_dev(pdev);
         INIT_LIST_HEAD(&probe_ent->node);
 
-        mmio_base = ioremap(pci_resource_start(pdev, 3),
-                            pci_resource_len(pdev, 3));
+        mmio_base = pci_iomap(pdev, 3, 0);
         if (mmio_base == NULL) {
                 rc = -ENOMEM;
                 goto err_out_free_ent;
@@ -1432,8 +1433,7 @@ static int pdc_sata_init_one (struct pci_dev *pdev, const struct pci_device_id *
         }
         memset(hpriv, 0, sizeof(*hpriv));
 
-        dimm_mmio = ioremap(pci_resource_start(pdev, 4),
-                            pci_resource_len(pdev, 4));
+        dimm_mmio = pci_iomap(pdev, 4, 0);
         if (!dimm_mmio) {
                 kfree(hpriv);
                 rc = -ENOMEM;
@@ -1480,9 +1480,9 @@ static int pdc_sata_init_one (struct pci_dev *pdev, const struct pci_device_id *
 
 err_out_iounmap_dimm:           /* only get to this label if 20621 */
         kfree(hpriv);
-        iounmap(dimm_mmio);
+        pci_iounmap(pdev, dimm_mmio);
 err_out_iounmap:
-        iounmap(mmio_base);
+        pci_iounmap(pdev, mmio_base);
 err_out_free_ent:
         kfree(probe_ent);
 err_out_regions:
diff --git a/drivers/scsi/sata_uli.c b/drivers/scsi/sata_uli.c
index 1566886815f..42e13ed8eb5 100644
--- a/drivers/scsi/sata_uli.c
+++ b/drivers/scsi/sata_uli.c
@@ -125,8 +125,8 @@ static struct ata_port_info uli_port_info = {
         .sht            = &uli_sht,
         .host_flags     = ATA_FLAG_SATA | ATA_FLAG_SATA_RESET |
                           ATA_FLAG_NO_LEGACY,
-        .pio_mask       = 0x03,         //support pio mode 4 (FIXME)
-        .udma_mask      = 0x7f,         //support udma mode 6
+        .pio_mask       = 0x1f,         /* pio0-4 */
+        .udma_mask      = 0x7f,         /* udma0-6 */
         .port_ops       = &uli_ops,
 };
 
diff --git a/drivers/scsi/sata_vsc.c b/drivers/scsi/sata_vsc.c
index 3985f344da4..cf94e0158a8 100644
--- a/drivers/scsi/sata_vsc.c
+++ b/drivers/scsi/sata_vsc.c
@@ -252,7 +252,7 @@ static struct ata_port_operations vsc_sata_ops = {
         .scr_write              = vsc_sata_scr_write,
         .port_start             = ata_port_start,
         .port_stop              = ata_port_stop,
-        .host_stop              = ata_host_stop,
+        .host_stop              = ata_pci_host_stop,
 };
 
 static void __devinit vsc_sata_setup_port(struct ata_ioports *port, unsigned long base)
@@ -326,8 +326,7 @@ static int __devinit vsc_sata_init_one (struct pci_dev *pdev, const struct pci_d
         probe_ent->dev = pci_dev_to_dev(pdev);
         INIT_LIST_HEAD(&probe_ent->node);
 
-        mmio_base = ioremap(pci_resource_start(pdev, 0),
-                            pci_resource_len(pdev, 0));
+        mmio_base = pci_iomap(pdev, 0, 0);
         if (mmio_base == NULL) {
                 rc = -ENOMEM;
                 goto err_out_free_ent;
diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
index d14523d7e44..a780546eda9 100644
--- a/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
@@ -268,6 +268,7 @@ struct scsi_cmnd *scsi_get_command(struct scsi_device *dev, int gfp_mask)
         } else
                 put_device(&dev->sdev_gendev);
 
+        cmd->jiffies_at_alloc = jiffies;
         return cmd;
 }                               
 EXPORT_SYMBOL(scsi_get_command);
@@ -627,7 +628,7 @@ int scsi_dispatch_cmd(struct scsi_cmnd *cmd)
         spin_lock_irqsave(host->host_lock, flags);
         scsi_cmd_get_serial(host, cmd); 
 
-        if (unlikely(test_bit(SHOST_CANCEL, &host->shost_state))) {
+        if (unlikely(host->shost_state == SHOST_DEL)) {
                 cmd->result = (DID_NO_CONNECT << 16);
                 scsi_done(cmd);
         } else {
@@ -798,9 +799,23 @@ static void scsi_softirq(struct softirq_action *h)
         while (!list_empty(&local_q)) {
                 struct scsi_cmnd *cmd = list_entry(local_q.next,
                                                    struct scsi_cmnd, eh_entry);
+                /* The longest time any command should be outstanding is the
+                 * per command timeout multiplied by the number of retries.
+                 *
+                 * For a typical command, this is 2.5 minutes */
+                unsigned long wait_for 
+                        = cmd->allowed * cmd->timeout_per_command;
                 list_del_init(&cmd->eh_entry);
 
                 disposition = scsi_decide_disposition(cmd);
+                if (disposition != SUCCESS &&
+                    time_before(cmd->jiffies_at_alloc + wait_for, jiffies)) {
+                        dev_printk(KERN_ERR, &cmd->device->sdev_gendev, 
+                                   "timing out command, waited %lus\n",
+                                   wait_for/HZ);
+                        disposition = SUCCESS;
+                }
+                        
                 scsi_log_completion(cmd, disposition);
                 switch (disposition) {
                 case SUCCESS:
diff --git a/drivers/scsi/scsi_devinfo.c b/drivers/scsi/scsi_devinfo.c
index 6121dc1bfad..07b554affcf 100644
--- a/drivers/scsi/scsi_devinfo.c
+++ b/drivers/scsi/scsi_devinfo.c
@@ -114,6 +114,7 @@ static struct {
         {"YAMAHA", "CDR102", "1.00", BLIST_NOLUN},      /* locks up */
         {"YAMAHA", "CRW8424S", "1.0", BLIST_NOLUN},     /* locks up */
         {"YAMAHA", "CRW6416S", "1.0c", BLIST_NOLUN},    /* locks up */
+        {"", "Scanner", "1.80", BLIST_NOLUN},   /* responds to all lun */
 
         /*
          * Other types of devices that have special flags.
@@ -135,7 +136,7 @@ static struct {
         {"COMPAQ", "MSA1000 VOLUME", NULL, BLIST_SPARSELUN | BLIST_NOSTARTONADD},
         {"COMPAQ", "HSV110", NULL, BLIST_REPORTLUN2 | BLIST_NOSTARTONADD},
         {"DDN", "SAN DataDirector", "*", BLIST_SPARSELUN},
-        {"DEC", "HSG80", NULL, BLIST_SPARSELUN | BLIST_NOSTARTONADD},
+        {"DEC", "HSG80", NULL, BLIST_REPORTLUN2 | BLIST_NOSTARTONADD},
         {"DELL", "PV660F", NULL, BLIST_SPARSELUN},
         {"DELL", "PV660F   PSEUDO", NULL, BLIST_SPARSELUN},
         {"DELL", "PSEUDO DEVICE .", NULL, BLIST_SPARSELUN},     /* Dell PV 530F */
@@ -191,6 +192,7 @@ static struct {
         {"SGI", "RAID5", "*", BLIST_SPARSELUN},
         {"SGI", "TP9100", "*", BLIST_REPORTLUN2},
         {"SGI", "Universal Xport", "*", BLIST_NO_ULD_ATTACH},
+        {"IBM", "Universal Xport", "*", BLIST_NO_ULD_ATTACH},
         {"SMSC", "USB 2 HS-CF", NULL, BLIST_SPARSELUN | BLIST_INQUIRY_36},
         {"SONY", "CD-ROM CDU-8001", NULL, BLIST_BORKEN},
         {"SONY", "TSL", NULL, BLIST_FORCELUN},          /* DDS3 & DDS4 autoloaders */
diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
index 0fc8b48f052..895c9452be4 100644
--- a/drivers/scsi/scsi_error.c
+++ b/drivers/scsi/scsi_error.c
@@ -20,6 +20,7 @@
 #include <linux/string.h>
 #include <linux/slab.h>
 #include <linux/kernel.h>
+#include <linux/kthread.h>
 #include <linux/interrupt.h>
 #include <linux/blkdev.h>
 #include <linux/delay.h>
@@ -75,7 +76,7 @@ int scsi_eh_scmd_add(struct scsi_cmnd *scmd, int eh_flag)
 
         scmd->eh_eflags |= eh_flag;
         list_add_tail(&scmd->eh_entry, &shost->eh_cmd_q);
-        set_bit(SHOST_RECOVERY, &shost->shost_state);
+        scsi_host_set_state(shost, SHOST_RECOVERY);
         shost->host_failed++;
         scsi_eh_wakeup(shost);
         spin_unlock_irqrestore(shost->host_lock, flags);
@@ -115,7 +116,6 @@ void scsi_add_timer(struct scsi_cmnd *scmd, int timeout,
 
         add_timer(&scmd->eh_timeout);
 }
-EXPORT_SYMBOL(scsi_add_timer);
 
 /**
  * scsi_delete_timer - Delete/cancel timer for a given function.
@@ -143,7 +143,6 @@ int scsi_delete_timer(struct scsi_cmnd *scmd)
 
         return rtn;
 }
-EXPORT_SYMBOL(scsi_delete_timer);
 
 /**
  * scsi_times_out - Timeout function for normal scsi commands.
@@ -197,7 +196,8 @@ int scsi_block_when_processing_errors(struct scsi_device *sdev)
 {
         int online;
 
-        wait_event(sdev->host->host_wait, (!test_bit(SHOST_RECOVERY, &sdev->host->shost_state)));
+        wait_event(sdev->host->host_wait, (sdev->host->shost_state !=
+                                           SHOST_RECOVERY));
 
         online = scsi_device_online(sdev);
 
@@ -775,9 +775,11 @@ retry_tur:
                 __FUNCTION__, scmd, rtn));
         if (rtn == SUCCESS)
                 return 0;
-        else if (rtn == NEEDS_RETRY)
+        else if (rtn == NEEDS_RETRY) {
                 if (retry_cnt--)
                         goto retry_tur;
+                return 0;
+        }
         return 1;
 }
 
@@ -1458,7 +1460,7 @@ static void scsi_restart_operations(struct Scsi_Host *shost)
         SCSI_LOG_ERROR_RECOVERY(3, printk("%s: waking up host to restart\n",
                                           __FUNCTION__));
 
-        clear_bit(SHOST_RECOVERY, &shost->shost_state);
+        scsi_host_set_state(shost, SHOST_RUNNING);
 
         wake_up(&shost->host_wait);
 
@@ -1582,16 +1584,8 @@ int scsi_error_handler(void *data)
         int rtn;
         DECLARE_MUTEX_LOCKED(sem);
 
-        /*
-         *    Flush resources
-         */
-
-        daemonize("scsi_eh_%d", shost->host_no);
-
         current->flags |= PF_NOFREEZE;
-
         shost->eh_wait = &sem;
-        shost->ehandler = current;
 
         /*
          * Wake up the thread that created us.
@@ -1599,8 +1593,6 @@ int scsi_error_handler(void *data)
         SCSI_LOG_ERROR_RECOVERY(3, printk("Wake up parent of"
                                           " scsi_eh_%d\n",shost->host_no));
 
-        complete(shost->eh_notify);
-
         while (1) {
                 /*
                  * If we get a signal, it means we are supposed to go
@@ -1621,7 +1613,7 @@ int scsi_error_handler(void *data)
                  * semaphores isn't unreasonable.
                  */
                 down_interruptible(&sem);
-                if (shost->eh_kill)
+                if (kthread_should_stop())
                         break;
 
                 SCSI_LOG_ERROR_RECOVERY(1, printk("Error handler"
@@ -1660,22 +1652,6 @@ int scsi_error_handler(void *data)
          * Make sure that nobody tries to wake us up again.
          */
         shost->eh_wait = NULL;
-
-        /*
-         * Knock this down too.  From this point on, the host is flying
-         * without a pilot.  If this is because the module is being unloaded,
-         * that's fine.  If the user sent a signal to this thing, we are
-         * potentially in real danger.
-         */
-        shost->eh_active = 0;
-        shost->ehandler = NULL;
-
-        /*
-         * If anyone is waiting for us to exit (i.e. someone trying to unload
-         * a driver), then wake up that process to let them know we are on
-         * the way out the door.
-         */
-        complete_and_exit(shost->eh_notify, 0);
         return 0;
 }
 
@@ -1846,12 +1822,16 @@ EXPORT_SYMBOL(scsi_reset_provider);
 int scsi_normalize_sense(const u8 *sense_buffer, int sb_len,
                          struct scsi_sense_hdr *sshdr)
 {
-        if (!sense_buffer || !sb_len || (sense_buffer[0] & 0x70) != 0x70)
+        if (!sense_buffer || !sb_len)
                 return 0;
 
         memset(sshdr, 0, sizeof(struct scsi_sense_hdr));
 
         sshdr->response_code = (sense_buffer[0] & 0x7f);
+
+        if (!scsi_sense_valid(sshdr))
+                return 0;
+
         if (sshdr->response_code >= 0x72) {
                 /*
                  * descriptor format
diff --git a/drivers/scsi/scsi_ioctl.c b/drivers/scsi/scsi_ioctl.c
index 7a6b530115a..b7fddac8134 100644
--- a/drivers/scsi/scsi_ioctl.c
+++ b/drivers/scsi/scsi_ioctl.c
@@ -30,20 +30,20 @@
 
 #define MAX_BUF PAGE_SIZE
 
-/*
- * If we are told to probe a host, we will return 0 if  the host is not
- * present, 1 if the host is present, and will return an identifying
- * string at *arg, if arg is non null, filling to the length stored at
- * (int *) arg
+/**
+ * ioctl_probe  --  return host identification
+ * @host:       host to identify
+ * @buffer:     userspace buffer for identification
+ *
+ * Return an identifying string at @buffer, if @buffer is non-NULL, filling
+ * to the length stored at * (int *) @buffer.
  */
-
 static int ioctl_probe(struct Scsi_Host *host, void __user *buffer)
 {
         unsigned int len, slen;
         const char *string;
-        int temp = host->hostt->present;
 
-        if (temp && buffer) {
+        if (buffer) {
                 if (get_user(len, (unsigned int __user *) buffer))
                         return -EFAULT;
 
@@ -59,7 +59,7 @@ static int ioctl_probe(struct Scsi_Host *host, void __user *buffer)
                                 return -EFAULT;
                 }
         }
-        return temp;
+        return 1;
 }
 
 /*
@@ -88,25 +88,18 @@ static int ioctl_probe(struct Scsi_Host *host, void __user *buffer)
 static int ioctl_internal_command(struct scsi_device *sdev, char *cmd,
                                   int timeout, int retries)
 {
-        struct scsi_request *sreq;
         int result;
         struct scsi_sense_hdr sshdr;
 
         SCSI_LOG_IOCTL(1, printk("Trying ioctl with scsi command %d\n", *cmd));
 
-        sreq = scsi_allocate_request(sdev, GFP_KERNEL);
-        if (!sreq) {
-                printk(KERN_WARNING "SCSI internal ioctl failed, no memory\n");
-                return -ENOMEM;
-        }
-
-        sreq->sr_data_direction = DMA_NONE;
-        scsi_wait_req(sreq, cmd, NULL, 0, timeout, retries);
+        result = scsi_execute_req(sdev, cmd, DMA_NONE, NULL, 0,
+                                  &sshdr, timeout, retries);
 
-        SCSI_LOG_IOCTL(2, printk("Ioctl returned  0x%x\n", sreq->sr_result));
+        SCSI_LOG_IOCTL(2, printk("Ioctl returned  0x%x\n", result));
 
-        if ((driver_byte(sreq->sr_result) & DRIVER_SENSE) &&
-            (scsi_request_normalize_sense(sreq, &sshdr))) {
+        if ((driver_byte(result) & DRIVER_SENSE) &&
+            (scsi_sense_valid(&sshdr))) {
                 switch (sshdr.sense_key) {
                 case ILLEGAL_REQUEST:
                         if (cmd[0] == ALLOW_MEDIUM_REMOVAL)
@@ -125,7 +118,7 @@ static int ioctl_internal_command(struct scsi_device *sdev, char *cmd,
                 case UNIT_ATTENTION:
                         if (sdev->removable) {
                                 sdev->changed = 1;
-                                sreq->sr_result = 0;    /* This is no longer considered an error */
+                                result = 0;     /* This is no longer considered an error */
                                 break;
                         }
                 default:        /* Fall through for non-removable media */
@@ -135,15 +128,13 @@ static int ioctl_internal_command(struct scsi_device *sdev, char *cmd,
                                sdev->channel,
                                sdev->id,
                                sdev->lun,
-                               sreq->sr_result);
-                        scsi_print_req_sense("   ", sreq);
+                               result);
+                        scsi_print_sense_hdr("   ", &sshdr);
                         break;
                 }
         }
 
-        result = sreq->sr_result;
         SCSI_LOG_IOCTL(2, printk("IOCTL Releasing command\n"));
-        scsi_release_request(sreq);
         return result;
 }
 
@@ -208,8 +199,8 @@ int scsi_ioctl_send_command(struct scsi_device *sdev,
 {
         char *buf;
         unsigned char cmd[MAX_COMMAND_SIZE];
+        unsigned char sense[SCSI_SENSE_BUFFERSIZE];
         char __user *cmd_in;
-        struct scsi_request *sreq;
         unsigned char opcode;
         unsigned int inlen, outlen, cmdlen;
         unsigned int needed, buf_needed;
@@ -321,31 +312,23 @@ int scsi_ioctl_send_command(struct scsi_device *sdev,
                 break;
         }
 
-        sreq = scsi_allocate_request(sdev, GFP_KERNEL);
-        if (!sreq) {
-                result = -EINTR;
-                goto error;
-        }
-
-        sreq->sr_data_direction = data_direction;
-        scsi_wait_req(sreq, cmd, buf, needed, timeout, retries);
+        result = scsi_execute(sdev, cmd, data_direction, buf, needed,
+                              sense, timeout, retries, 0);
 
         /* 
          * If there was an error condition, pass the info back to the user. 
          */
-        result = sreq->sr_result;
         if (result) {
-                int sb_len = sizeof(sreq->sr_sense_buffer);
+                int sb_len = sizeof(*sense);
 
                 sb_len = (sb_len > OMAX_SB_LEN) ? OMAX_SB_LEN : sb_len;
-                if (copy_to_user(cmd_in, sreq->sr_sense_buffer, sb_len))
+                if (copy_to_user(cmd_in, sense, sb_len))
                         result = -EFAULT;
         } else {
                 if (copy_to_user(cmd_in, buf, outlen))
                         result = -EFAULT;
         }       
 
-        scsi_release_request(sreq);
 error:
         kfree(buf);
         return result;
@@ -475,8 +458,7 @@ int scsi_nonblockable_ioctl(struct scsi_device *sdev, int cmd,
          * error processing, as long as the device was opened
          * non-blocking */
         if (filp && filp->f_flags & O_NONBLOCK) {
-                if (test_bit(SHOST_RECOVERY,
-                             &sdev->host->shost_state))
+                if (sdev->host->shost_state == SHOST_RECOVERY)
                         return -ENODEV;
         } else if (!scsi_block_when_processing_errors(sdev))
                 return -ENODEV;
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index 7a91ca3d32a..77f2d444f7e 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -232,23 +232,6 @@ void scsi_do_req(struct scsi_request *sreq, const void *cmnd,
 }
 EXPORT_SYMBOL(scsi_do_req);
 
-static void scsi_wait_done(struct scsi_cmnd *cmd)
-{
-        struct request *req = cmd->request;
-        struct request_queue *q = cmd->device->request_queue;
-        unsigned long flags;
-
-        req->rq_status = RQ_SCSI_DONE;  /* Busy, but indicate request done */
-
-        spin_lock_irqsave(q->queue_lock, flags);
-        if (blk_rq_tagged(req))
-                blk_queue_end_tag(q, req);
-        spin_unlock_irqrestore(q->queue_lock, flags);
-
-        if (req->waiting)
-                complete(req->waiting);
-}
-
 /* 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. */
@@ -263,21 +246,114 @@ void scsi_wait_req(struct scsi_request *sreq, const void *cmnd, void *buffer,
                    unsigned bufflen, int timeout, int retries)
 {
         DECLARE_COMPLETION(wait);
-        
-        sreq->sr_request->waiting = &wait;
-        sreq->sr_request->rq_status = RQ_SCSI_BUSY;
-        sreq->sr_request->end_io = scsi_wait_req_end_io;
-        scsi_do_req(sreq, cmnd, buffer, bufflen, scsi_wait_done,
-                        timeout, retries);
+        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;
-        if (sreq->sr_request->rq_status != RQ_SCSI_DONE)
+        sreq->sr_result = req->errors;
+        if (req->errors)
                 sreq->sr_result |= (DRIVER_ERROR << 24);
 
-        __scsi_release_request(sreq);
+        blk_put_request(req);
 }
+
 EXPORT_SYMBOL(scsi_wait_req);
 
+/**
+ * scsi_execute - insert request and wait for the result
+ * @sdev:       scsi device
+ * @cmd:        scsi command
+ * @data_direction: data direction
+ * @buffer:     data buffer
+ * @bufflen:    len of buffer
+ * @sense:      optional sense buffer
+ * @timeout:    request timeout in seconds
+ * @retries:    number of times to retry request
+ * @flags:      or into request flags;
+ *
+ * returns the req->errors value which is the the scsi_cmnd result
+ * field.
+ **/
+int scsi_execute(struct scsi_device *sdev, const unsigned char *cmd,
+                 int data_direction, void *buffer, unsigned bufflen,
+                 unsigned char *sense, int timeout, int retries, int flags)
+{
+        struct request *req;
+        int write = (data_direction == DMA_TO_DEVICE);
+        int ret = DRIVER_ERROR << 24;
+
+        req = blk_get_request(sdev->request_queue, write, __GFP_WAIT);
+
+        if (bufflen &&  blk_rq_map_kern(sdev->request_queue, req,
+                                        buffer, bufflen, __GFP_WAIT))
+                goto out;
+
+        req->cmd_len = COMMAND_SIZE(cmd[0]);
+        memcpy(req->cmd, cmd, req->cmd_len);
+        req->sense = sense;
+        req->sense_len = 0;
+        req->timeout = timeout;
+        req->flags |= flags | REQ_BLOCK_PC | REQ_SPECIAL | REQ_QUIET;
+
+        /*
+         * head injection *required* here otherwise quiesce won't work
+         */
+        blk_execute_rq(req->q, NULL, req, 1);
+
+        ret = req->errors;
+ out:
+        blk_put_request(req);
+
+        return ret;
+}
+EXPORT_SYMBOL(scsi_execute);
+
+
+int scsi_execute_req(struct scsi_device *sdev, const unsigned char *cmd,
+                     int data_direction, void *buffer, unsigned bufflen,
+                     struct scsi_sense_hdr *sshdr, int timeout, int retries)
+{
+        char *sense = NULL;
+        int result;
+        
+        if (sshdr) {
+                sense = kmalloc(SCSI_SENSE_BUFFERSIZE, GFP_KERNEL);
+                if (!sense)
+                        return DRIVER_ERROR << 24;
+                memset(sense, 0, SCSI_SENSE_BUFFERSIZE);
+        }
+        result = scsi_execute(sdev, cmd, data_direction, buffer, bufflen,
+                                  sense, timeout, retries, 0);
+        if (sshdr)
+                scsi_normalize_sense(sense, SCSI_SENSE_BUFFERSIZE, sshdr);
+
+        kfree(sense);
+        return result;
+}
+EXPORT_SYMBOL(scsi_execute_req);
+
 /*
  * Function:    scsi_init_cmd_errh()
  *
@@ -348,7 +424,7 @@ void scsi_device_unbusy(struct scsi_device *sdev)
 
         spin_lock_irqsave(shost->host_lock, flags);
         shost->host_busy--;
-        if (unlikely(test_bit(SHOST_RECOVERY, &shost->shost_state) &&
+        if (unlikely((shost->shost_state == SHOST_RECOVERY) &&
                      shost->host_failed))
                 scsi_eh_wakeup(shost);
         spin_unlock(shost->host_lock);
@@ -851,17 +927,20 @@ void scsi_io_completion(struct scsi_cmnd *cmd, unsigned int good_bytes,
                                 scsi_requeue_command(q, cmd);
                                 return;
                         }
-                        printk(KERN_INFO "Device %s not ready.\n",
-                               req->rq_disk ? req->rq_disk->disk_name : "");
+                        if (!(req->flags & REQ_QUIET))
+                                dev_printk(KERN_INFO,
+                                           &cmd->device->sdev_gendev,
+                                           "Device not ready.\n");
                         cmd = scsi_end_request(cmd, 0, this_count, 1);
                         return;
                 case VOLUME_OVERFLOW:
-                        printk(KERN_INFO "Volume overflow <%d %d %d %d> CDB: ",
-                               cmd->device->host->host_no,
-                               (int)cmd->device->channel,
-                               (int)cmd->device->id, (int)cmd->device->lun);
-                        __scsi_print_command(cmd->data_cmnd);
-                        scsi_print_sense("", cmd);
+                        if (!(req->flags & REQ_QUIET)) {
+                                dev_printk(KERN_INFO,
+                                           &cmd->device->sdev_gendev,
+                                           "Volume overflow, CDB: ");
+                                __scsi_print_command(cmd->data_cmnd);
+                                scsi_print_sense("", cmd);
+                        }
                         cmd = scsi_end_request(cmd, 0, block_bytes, 1);
                         return;
                 default:
@@ -878,14 +957,13 @@ void scsi_io_completion(struct scsi_cmnd *cmd, unsigned int good_bytes,
                 return;
         }
         if (result) {
-                printk(KERN_INFO "SCSI error : <%d %d %d %d> return code "
-                       "= 0x%x\n", cmd->device->host->host_no,
-                       cmd->device->channel,
-                       cmd->device->id,
-                       cmd->device->lun, result);
-
-                if (driver_byte(result) & DRIVER_SENSE)
-                        scsi_print_sense("", cmd);
+                if (!(req->flags & REQ_QUIET)) {
+                        dev_printk(KERN_INFO, &cmd->device->sdev_gendev,
+                                   "SCSI error: return code = 0x%x\n", result);
+
+                        if (driver_byte(result) & DRIVER_SENSE)
+                                scsi_print_sense("", cmd);
+                }
                 /*
                  * Mark a single buffer as not uptodate.  Queue the remainder.
                  * We sometimes get this cruft in the event that a medium error
@@ -1020,6 +1098,12 @@ static int scsi_issue_flush_fn(request_queue_t *q, struct gendisk *disk,
         return -EOPNOTSUPP;
 }
 
+static void scsi_generic_done(struct scsi_cmnd *cmd)
+{
+        BUG_ON(!blk_pc_request(cmd->request));
+        scsi_io_completion(cmd, cmd->result == 0 ? cmd->bufflen : 0, 0);
+}
+
 static int scsi_prep_fn(struct request_queue *q, struct request *req)
 {
         struct scsi_device *sdev = q->queuedata;
@@ -1061,7 +1145,7 @@ static int scsi_prep_fn(struct request_queue *q, struct request *req)
          * these two cases differently.  We differentiate by looking
          * at request->cmd, as this tells us the real story.
          */
-        if (req->flags & REQ_SPECIAL) {
+        if (req->flags & REQ_SPECIAL && req->special) {
                 struct scsi_request *sreq = req->special;
 
                 if (sreq->sr_magic == SCSI_REQ_MAGIC) {
@@ -1073,7 +1157,7 @@ static int scsi_prep_fn(struct request_queue *q, struct request *req)
                         cmd = req->special;
         } else if (req->flags & (REQ_CMD | REQ_BLOCK_PC)) {
 
-                if(unlikely(specials_only)) {
+                if(unlikely(specials_only) && !(req->flags & REQ_SPECIAL)) {
                         if(specials_only == SDEV_QUIESCE ||
                                         specials_only == SDEV_BLOCK)
                                 return BLKPREP_DEFER;
@@ -1142,11 +1226,26 @@ static int scsi_prep_fn(struct request_queue *q, struct request *req)
                 /*
                  * Initialize the actual SCSI command for this request.
                  */
-                drv = *(struct scsi_driver **)req->rq_disk->private_data;
-                if (unlikely(!drv->init_command(cmd))) {
-                        scsi_release_buffers(cmd);
-                        scsi_put_command(cmd);
-                        return BLKPREP_KILL;
+                if (req->rq_disk) {
+                        drv = *(struct scsi_driver **)req->rq_disk->private_data;
+                        if (unlikely(!drv->init_command(cmd))) {
+                                scsi_release_buffers(cmd);
+                                scsi_put_command(cmd);
+                                return BLKPREP_KILL;
+                        }
+                } else {
+                        memcpy(cmd->cmnd, req->cmd, sizeof(cmd->cmnd));
+                        if (rq_data_dir(req) == WRITE)
+                                cmd->sc_data_direction = DMA_TO_DEVICE;
+                        else if (req->data_len)
+                                cmd->sc_data_direction = DMA_FROM_DEVICE;
+                        else
+                                cmd->sc_data_direction = DMA_NONE;
+                        
+                        cmd->transfersize = req->data_len;
+                        cmd->allowed = 3;
+                        cmd->timeout_per_command = req->timeout;
+                        cmd->done = scsi_generic_done;
                 }
         }
 
@@ -1207,7 +1306,7 @@ static inline int scsi_host_queue_ready(struct request_queue *q,
                                    struct Scsi_Host *shost,
                                    struct scsi_device *sdev)
 {
-        if (test_bit(SHOST_RECOVERY, &shost->shost_state))
+        if (shost->shost_state == SHOST_RECOVERY)
                 return 0;
         if (shost->host_busy == 0 && shost->host_blocked) {
                 /*
@@ -1539,9 +1638,9 @@ void scsi_exit_queue(void)
         }
 }
 /**
- *      __scsi_mode_sense - issue a mode sense, falling back from 10 to 
+ *      scsi_mode_sense - issue a mode sense, falling back from 10 to 
  *              six bytes if necessary.
- *      @sreq:  SCSI request to fill in with the MODE_SENSE
+ *      @sdev:  SCSI device to be queried
  *      @dbd:   set if mode sense will allow block descriptors to be returned
  *      @modepage: mode page being requested
  *      @buffer: request buffer (may not be smaller than eight bytes)
@@ -1549,26 +1648,34 @@ void scsi_exit_queue(void)
  *      @timeout: command timeout
  *      @retries: number of retries before failing
  *      @data: returns a structure abstracting the mode header data
+ *      @sense: place to put sense data (or NULL if no sense to be collected).
+ *              must be SCSI_SENSE_BUFFERSIZE big.
  *
  *      Returns zero if unsuccessful, or the header offset (either 4
  *      or 8 depending on whether a six or ten byte command was
  *      issued) if successful.
  **/
 int
-__scsi_mode_sense(struct scsi_request *sreq, int dbd, int modepage,
+scsi_mode_sense(struct scsi_device *sdev, int dbd, int modepage,
                   unsigned char *buffer, int len, int timeout, int retries,
-                  struct scsi_mode_data *data) {
+                  struct scsi_mode_data *data, struct scsi_sense_hdr *sshdr) {
         unsigned char cmd[12];
         int use_10_for_ms;
         int header_length;
+        int result;
+        struct scsi_sense_hdr my_sshdr;
 
         memset(data, 0, sizeof(*data));
         memset(&cmd[0], 0, 12);
         cmd[1] = dbd & 0x18;    /* allows DBD and LLBA bits */
         cmd[2] = modepage;
 
+        /* caller might not be interested in sense, but we need it */
+        if (!sshdr)
+                sshdr = &my_sshdr;
+
  retry:
-        use_10_for_ms = sreq->sr_device->use_10_for_ms;
+        use_10_for_ms = sdev->use_10_for_ms;
 
         if (use_10_for_ms) {
                 if (len < 8)
@@ -1586,36 +1693,31 @@ __scsi_mode_sense(struct scsi_request *sreq, int dbd, int modepage,
                 header_length = 4;
         }
 
-        sreq->sr_cmd_len = 0;
-        memset(sreq->sr_sense_buffer, 0, sizeof(sreq->sr_sense_buffer));
-        sreq->sr_data_direction = DMA_FROM_DEVICE;
-
         memset(buffer, 0, len);
 
-        scsi_wait_req(sreq, cmd, buffer, len, timeout, retries);
+        result = scsi_execute_req(sdev, cmd, DMA_FROM_DEVICE, buffer, len,
+                                  sshdr, timeout, retries);
 
         /* This code looks awful: what it's doing is making sure an
          * ILLEGAL REQUEST sense return identifies the actual command
          * byte as the problem.  MODE_SENSE commands can return
          * ILLEGAL REQUEST if the code page isn't supported */
 
-        if (use_10_for_ms && !scsi_status_is_good(sreq->sr_result) &&
-            (driver_byte(sreq->sr_result) & DRIVER_SENSE)) {
-                struct scsi_sense_hdr sshdr;
-
-                if (scsi_request_normalize_sense(sreq, &sshdr)) {
-                        if ((sshdr.sense_key == ILLEGAL_REQUEST) &&
-                            (sshdr.asc == 0x20) && (sshdr.ascq == 0)) {
+        if (use_10_for_ms && !scsi_status_is_good(result) &&
+            (driver_byte(result) & DRIVER_SENSE)) {
+                if (scsi_sense_valid(sshdr)) {
+                        if ((sshdr->sense_key == ILLEGAL_REQUEST) &&
+                            (sshdr->asc == 0x20) && (sshdr->ascq == 0)) {
                                 /* 
                                  * Invalid command operation code
                                  */
-                                sreq->sr_device->use_10_for_ms = 0;
+                                sdev->use_10_for_ms = 0;
                                 goto retry;
                         }
                 }
         }
 
-        if(scsi_status_is_good(sreq->sr_result)) {
+        if(scsi_status_is_good(result)) {
                 data->header_length = header_length;
                 if(use_10_for_ms) {
                         data->length = buffer[0]*256 + buffer[1] + 2;
@@ -1632,73 +1734,31 @@ __scsi_mode_sense(struct scsi_request *sreq, int dbd, int modepage,
                 }
         }
 
-        return sreq->sr_result;
-}
-EXPORT_SYMBOL(__scsi_mode_sense);
-
-/**
- *      scsi_mode_sense - issue a mode sense, falling back from 10 to 
- *              six bytes if necessary.
- *      @sdev:  scsi device to send command to.
- *      @dbd:   set if mode sense will disable block descriptors in the return
- *      @modepage: mode page being requested
- *      @buffer: request buffer (may not be smaller than eight bytes)
- *      @len:   length of request buffer.
- *      @timeout: command timeout
- *      @retries: number of retries before failing
- *
- *      Returns zero if unsuccessful, or the header offset (either 4
- *      or 8 depending on whether a six or ten byte command was
- *      issued) if successful.
- **/
-int
-scsi_mode_sense(struct scsi_device *sdev, int dbd, int modepage,
-                unsigned char *buffer, int len, int timeout, int retries,
-                struct scsi_mode_data *data)
-{
-        struct scsi_request *sreq = scsi_allocate_request(sdev, GFP_KERNEL);
-        int ret;
-
-        if (!sreq)
-                return -1;
-
-        ret = __scsi_mode_sense(sreq, dbd, modepage, buffer, len,
-                                timeout, retries, data);
-
-        scsi_release_request(sreq);
-
-        return ret;
+        return result;
 }
 EXPORT_SYMBOL(scsi_mode_sense);
 
 int
 scsi_test_unit_ready(struct scsi_device *sdev, int timeout, int retries)
 {
-        struct scsi_request *sreq;
         char cmd[] = {
                 TEST_UNIT_READY, 0, 0, 0, 0, 0,
         };
+        struct scsi_sense_hdr sshdr;
         int result;
         
-        sreq = scsi_allocate_request(sdev, GFP_KERNEL);
-        if (!sreq)
-                return -ENOMEM;
-
-        sreq->sr_data_direction = DMA_NONE;
-        scsi_wait_req(sreq, cmd, NULL, 0, timeout, retries);
+        result = scsi_execute_req(sdev, cmd, DMA_NONE, NULL, 0, &sshdr,
+                                  timeout, retries);
 
-        if ((driver_byte(sreq->sr_result) & DRIVER_SENSE) && sdev->removable) {
-                struct scsi_sense_hdr sshdr;
+        if ((driver_byte(result) & DRIVER_SENSE) && sdev->removable) {
 
-                if ((scsi_request_normalize_sense(sreq, &sshdr)) &&
+                if ((scsi_sense_valid(&sshdr)) &&
                     ((sshdr.sense_key == UNIT_ATTENTION) ||
                      (sshdr.sense_key == NOT_READY))) {
                         sdev->changed = 1;
-                        sreq->sr_result = 0;
+                        result = 0;
                 }
         }
-        result = sreq->sr_result;
-        scsi_release_request(sreq);
         return result;
 }
 EXPORT_SYMBOL(scsi_test_unit_ready);
diff --git a/drivers/scsi/scsi_priv.h b/drivers/scsi/scsi_priv.h
index d30d7f4e63e..ee6de1768e5 100644
--- a/drivers/scsi/scsi_priv.h
+++ b/drivers/scsi/scsi_priv.h
@@ -63,6 +63,9 @@ extern int __init scsi_init_devinfo(void);
 extern void scsi_exit_devinfo(void);
 
 /* scsi_error.c */
+extern void scsi_add_timer(struct scsi_cmnd *, int,
+                void (*)(struct scsi_cmnd *));
+extern int scsi_delete_timer(struct scsi_cmnd *);
 extern void scsi_times_out(struct scsi_cmnd *cmd);
 extern int scsi_error_handler(void *host);
 extern int scsi_decide_disposition(struct scsi_cmnd *cmd);
diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
index 48edd67982a..19c9a232a75 100644
--- a/drivers/scsi/scsi_scan.c
+++ b/drivers/scsi/scsi_scan.c
@@ -111,15 +111,14 @@ MODULE_PARM_DESC(inq_timeout,
 
 /**
  * scsi_unlock_floptical - unlock device via a special MODE SENSE command
- * @sreq:       used to send the command
+ * @sdev:       scsi device to send command to
  * @result:     area to store the result of the MODE SENSE
  *
  * Description:
- *     Send a vendor specific MODE SENSE (not a MODE SELECT) command using
- *     @sreq to unlock a device, storing the (unused) results into result.
+ *     Send a vendor specific MODE SENSE (not a MODE SELECT) command.
  *     Called for BLIST_KEY devices.
  **/
-static void scsi_unlock_floptical(struct scsi_request *sreq,
+static void scsi_unlock_floptical(struct scsi_device *sdev,
                                   unsigned char *result)
 {
         unsigned char scsi_cmd[MAX_COMMAND_SIZE];
@@ -129,11 +128,10 @@ static void scsi_unlock_floptical(struct scsi_request *sreq,
         scsi_cmd[1] = 0;
         scsi_cmd[2] = 0x2e;
         scsi_cmd[3] = 0;
-        scsi_cmd[4] = 0x2a;     /* size */
+        scsi_cmd[4] = 0x2a;     /* size */
         scsi_cmd[5] = 0;
-        sreq->sr_cmd_len = 0;
-        sreq->sr_data_direction = DMA_FROM_DEVICE;
-        scsi_wait_req(sreq, scsi_cmd, result, 0x2a /* size */, SCSI_TIMEOUT, 3);
+        scsi_execute_req(sdev, scsi_cmd, DMA_FROM_DEVICE, result, 0x2a, NULL,
+                         SCSI_TIMEOUT, 3);
 }
 
 /**
@@ -433,26 +431,25 @@ void scsi_target_reap(struct scsi_target *starget)
 
 /**
  * scsi_probe_lun - probe a single LUN using a SCSI INQUIRY
- * @sreq:       used to send the INQUIRY
+ * @sdev:       scsi_device to probe
  * @inq_result: area to store the INQUIRY result
+ * @result_len: len of inq_result
  * @bflags:     store any bflags found here
  *
  * Description:
- *     Probe the lun associated with @sreq using a standard SCSI INQUIRY;
+ *     Probe the lun associated with @req using a standard SCSI INQUIRY;
  *
- *     If the INQUIRY is successful, sreq->sr_result is zero and: the
+ *     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 at @sreq->sr_device (sdev);
- *     any flags value is stored in *@bflags.
+ *     are copied to the Scsi_Device any flags value is stored in *@bflags.
  **/
-static void scsi_probe_lun(struct scsi_request *sreq, char *inq_result,
-                           int *bflags)
+static int scsi_probe_lun(struct scsi_device *sdev, char *inq_result,
+                          int result_len, int *bflags)
 {
-        struct scsi_device *sdev = sreq->sr_device;     /* a bit ugly */
         unsigned char scsi_cmd[MAX_COMMAND_SIZE];
         int first_inquiry_len, try_inquiry_len, next_inquiry_len;
         int response_len = 0;
-        int pass, count;
+        int pass, count, result;
         struct scsi_sense_hdr sshdr;
 
         *bflags = 0;
@@ -475,28 +472,26 @@ static void scsi_probe_lun(struct scsi_request *sreq, char *inq_result,
                 memset(scsi_cmd, 0, 6);
                 scsi_cmd[0] = INQUIRY;
                 scsi_cmd[4] = (unsigned char) try_inquiry_len;
-                sreq->sr_cmd_len = 0;
-                sreq->sr_data_direction = DMA_FROM_DEVICE;
 
                 memset(inq_result, 0, try_inquiry_len);
-                scsi_wait_req(sreq, (void *) scsi_cmd, (void *) inq_result,
-                                try_inquiry_len,
-                                HZ/2 + HZ*scsi_inq_timeout, 3);
+
+                result = scsi_execute_req(sdev,  scsi_cmd, DMA_FROM_DEVICE,
+                                          inq_result, try_inquiry_len, &sshdr,
+                                          HZ / 2 + HZ * scsi_inq_timeout, 3);
 
                 SCSI_LOG_SCAN_BUS(3, printk(KERN_INFO "scsi scan: INQUIRY %s "
                                 "with code 0x%x\n",
-                                sreq->sr_result ? "failed" : "successful",
-                                sreq->sr_result));
+                                result ? "failed" : "successful", result));
 
-                if (sreq->sr_result) {
+                if (result) {
                         /*
                          * not-ready to ready transition [asc/ascq=0x28/0x0]
                          * or power-on, reset [asc/ascq=0x29/0x0], continue.
                          * INQUIRY should not yield UNIT_ATTENTION
                          * but many buggy devices do so anyway. 
                          */
-                        if ((driver_byte(sreq->sr_result) & DRIVER_SENSE) &&
-                            scsi_request_normalize_sense(sreq, &sshdr)) {
+                        if ((driver_byte(result) & DRIVER_SENSE) &&
+                            scsi_sense_valid(&sshdr)) {
                                 if ((sshdr.sense_key == UNIT_ATTENTION) &&
                                     ((sshdr.asc == 0x28) ||
                                      (sshdr.asc == 0x29)) &&
@@ -507,7 +502,7 @@ static void scsi_probe_lun(struct scsi_request *sreq, char *inq_result,
                 break;
         }
 
-        if (sreq->sr_result == 0) {
+        if (result == 0) {
                 response_len = (unsigned char) inq_result[4] + 5;
                 if (response_len > 255)
                         response_len = first_inquiry_len;       /* sanity */
@@ -556,8 +551,8 @@ static void scsi_probe_lun(struct scsi_request *sreq, char *inq_result,
 
         /* If the last transfer attempt got an error, assume the
          * peripheral doesn't exist or is dead. */
-        if (sreq->sr_result)
-                return;
+        if (result)
+                return -EIO;
 
         /* Don't report any more data than the device says is valid */
         sdev->inquiry_len = min(try_inquiry_len, response_len);
@@ -593,7 +588,7 @@ static void scsi_probe_lun(struct scsi_request *sreq, char *inq_result,
             (sdev->scsi_level == 1 && (inq_result[3] & 0x0f) == 1))
                 sdev->scsi_level++;
 
-        return;
+        return 0;
 }
 
 /**
@@ -800,9 +795,8 @@ static int scsi_probe_and_add_lun(struct scsi_target *starget,
                                   void *hostdata)
 {
         struct scsi_device *sdev;
-        struct scsi_request *sreq;
         unsigned char *result;
-        int bflags, res = SCSI_SCAN_NO_RESPONSE;
+        int bflags, res = SCSI_SCAN_NO_RESPONSE, result_len = 256;
         struct Scsi_Host *shost = dev_to_shost(starget->dev.parent);
 
         /*
@@ -831,16 +825,13 @@ static int scsi_probe_and_add_lun(struct scsi_target *starget,
         sdev = scsi_alloc_sdev(starget, lun, hostdata);
         if (!sdev)
                 goto out;
-        sreq = scsi_allocate_request(sdev, GFP_ATOMIC);
-        if (!sreq)
-                goto out_free_sdev;
-        result = kmalloc(256, GFP_ATOMIC |
+
+        result = kmalloc(result_len, GFP_ATOMIC |
                         ((shost->unchecked_isa_dma) ? __GFP_DMA : 0));
         if (!result)
-                goto out_free_sreq;
+                goto out_free_sdev;
 
-        scsi_probe_lun(sreq, result, &bflags);
-        if (sreq->sr_result)
+        if (scsi_probe_lun(sdev, result, result_len, &bflags))
                 goto out_free_result;
 
         /*
@@ -868,7 +859,7 @@ static int scsi_probe_and_add_lun(struct scsi_target *starget,
         if (res == SCSI_SCAN_LUN_PRESENT) {
                 if (bflags & BLIST_KEY) {
                         sdev->lockable = 0;
-                        scsi_unlock_floptical(sreq, result);
+                        scsi_unlock_floptical(sdev, result);
                 }
                 if (bflagsp)
                         *bflagsp = bflags;
@@ -876,8 +867,6 @@ static int scsi_probe_and_add_lun(struct scsi_target *starget,
 
  out_free_result:
         kfree(result);
- out_free_sreq:
-        scsi_release_request(sreq);
  out_free_sdev:
         if (res == SCSI_SCAN_LUN_PRESENT) {
                 if (sdevp) {
@@ -1070,8 +1059,8 @@ static int scsi_report_lun_scan(struct scsi_device *sdev, int bflags,
         unsigned int lun;
         unsigned int num_luns;
         unsigned int retries;
+        int result;
         struct scsi_lun *lunp, *lun_data;
-        struct scsi_request *sreq;
         u8 *data;
         struct scsi_sense_hdr sshdr;
         struct scsi_target *starget = scsi_target(sdev);
@@ -1089,10 +1078,6 @@ static int scsi_report_lun_scan(struct scsi_device *sdev, int bflags,
         if (bflags & BLIST_NOLUN)
                 return 0;
 
-        sreq = scsi_allocate_request(sdev, GFP_ATOMIC);
-        if (!sreq)
-                goto out;
-
         sprintf(devname, "host %d channel %d id %d",
                 sdev->host->host_no, sdev->channel, sdev->id);
 
@@ -1110,7 +1095,7 @@ static int scsi_report_lun_scan(struct scsi_device *sdev, int bflags,
         lun_data = kmalloc(length, GFP_ATOMIC |
                            (sdev->host->unchecked_isa_dma ? __GFP_DMA : 0));
         if (!lun_data)
-                goto out_release_request;
+                goto out;
 
         scsi_cmd[0] = REPORT_LUNS;
 
@@ -1129,8 +1114,6 @@ static int scsi_report_lun_scan(struct scsi_device *sdev, int bflags,
 
         scsi_cmd[10] = 0;       /* reserved */
         scsi_cmd[11] = 0;       /* control */
-        sreq->sr_cmd_len = 0;
-        sreq->sr_data_direction = DMA_FROM_DEVICE;
 
         /*
          * We can get a UNIT ATTENTION, for example a power on/reset, so
@@ -1146,29 +1129,29 @@ static int scsi_report_lun_scan(struct scsi_device *sdev, int bflags,
                 SCSI_LOG_SCAN_BUS(3, printk (KERN_INFO "scsi scan: Sending"
                                 " REPORT LUNS to %s (try %d)\n", devname,
                                 retries));
-                scsi_wait_req(sreq, scsi_cmd, lun_data, length,
-                                SCSI_TIMEOUT + 4*HZ, 3);
+
+                result = scsi_execute_req(sdev, scsi_cmd, DMA_FROM_DEVICE,
+                                          lun_data, length, &sshdr,
+                                          SCSI_TIMEOUT + 4 * HZ, 3);
+
                 SCSI_LOG_SCAN_BUS(3, printk (KERN_INFO "scsi scan: REPORT LUNS"
-                                " %s (try %d) result 0x%x\n", sreq->sr_result
-                                ?  "failed" : "successful", retries,
-                                sreq->sr_result));
-                if (sreq->sr_result == 0)
+                                " %s (try %d) result 0x%x\n", result
+                                ?  "failed" : "successful", retries, result));
+                if (result == 0)
                         break;
-                else if (scsi_request_normalize_sense(sreq, &sshdr)) {
+                else if (scsi_sense_valid(&sshdr)) {
                         if (sshdr.sense_key != UNIT_ATTENTION)
                                 break;
                 }
         }
 
-        if (sreq->sr_result) {
+        if (result) {
                 /*
                  * The device probably does not support a REPORT LUN command
                  */
                 kfree(lun_data);
-                scsi_release_request(sreq);
                 return 1;
         }
-        scsi_release_request(sreq);
 
         /*
          * Get the length from the first four bytes of lun_data.
@@ -1242,8 +1225,6 @@ static int scsi_report_lun_scan(struct scsi_device *sdev, int bflags,
         kfree(lun_data);
         return 0;
 
- out_release_request:
-        scsi_release_request(sreq);
  out:
         /*
          * We are out of memory, don't try scanning any further.
@@ -1265,9 +1246,12 @@ struct scsi_device *__scsi_add_device(struct Scsi_Host *shost, uint channel,
 
         get_device(&starget->dev);
         down(&shost->scan_mutex);
-        res = scsi_probe_and_add_lun(starget, lun, NULL, &sdev, 1, hostdata);
-        if (res != SCSI_SCAN_LUN_PRESENT)
-                sdev = ERR_PTR(-ENODEV);
+        if (scsi_host_scan_allowed(shost)) {
+                res = scsi_probe_and_add_lun(starget, lun, NULL, &sdev, 1,
+                                             hostdata);
+                if (res != SCSI_SCAN_LUN_PRESENT)
+                        sdev = ERR_PTR(-ENODEV);
+        }
         up(&shost->scan_mutex);
         scsi_target_reap(starget);
         put_device(&starget->dev);
@@ -1417,11 +1401,15 @@ int scsi_scan_host_selected(struct Scsi_Host *shost, unsigned int channel,
                 return -EINVAL;
 
         down(&shost->scan_mutex);
-        if (channel == SCAN_WILD_CARD) 
-                for (channel = 0; channel <= shost->max_channel; channel++)
+        if (scsi_host_scan_allowed(shost)) {
+                if (channel == SCAN_WILD_CARD)
+                        for (channel = 0; channel <= shost->max_channel;
+                             channel++)
+                                scsi_scan_channel(shost, channel, id, lun,
+                                                  rescan);
+                else
                         scsi_scan_channel(shost, channel, id, lun, rescan);
-        else
-                scsi_scan_channel(shost, channel, id, lun, rescan);
+        }
         up(&shost->scan_mutex);
 
         return 0;
diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
index beed7fbe1cb..dae59d1da07 100644
--- a/drivers/scsi/scsi_sysfs.c
+++ b/drivers/scsi/scsi_sysfs.c
@@ -48,6 +48,30 @@ const char *scsi_device_state_name(enum scsi_device_state state)
         return name;
 }
 
+static struct {
+        enum scsi_host_state    value;
+        char                    *name;
+} shost_states[] = {
+        { SHOST_CREATED, "created" },
+        { SHOST_RUNNING, "running" },
+        { SHOST_CANCEL, "cancel" },
+        { SHOST_DEL, "deleted" },
+        { SHOST_RECOVERY, "recovery" },
+};
+const char *scsi_host_state_name(enum scsi_host_state state)
+{
+        int i;
+        char *name = NULL;
+
+        for (i = 0; i < sizeof(shost_states)/sizeof(shost_states[0]); i++) {
+                if (shost_states[i].value == state) {
+                        name = shost_states[i].name;
+                        break;
+                }
+        }
+        return name;
+}
+
 static int check_set(unsigned int *val, char *src)
 {
         char *last;
@@ -124,6 +148,43 @@ static ssize_t store_scan(struct class_device *class_dev, const char *buf,
 };
 static CLASS_DEVICE_ATTR(scan, S_IWUSR, NULL, store_scan);
 
+static ssize_t
+store_shost_state(struct class_device *class_dev, const char *buf, size_t count)
+{
+        int i;
+        struct Scsi_Host *shost = class_to_shost(class_dev);
+        enum scsi_host_state state = 0;
+
+        for (i = 0; i < sizeof(shost_states)/sizeof(shost_states[0]); i++) {
+                const int len = strlen(shost_states[i].name);
+                if (strncmp(shost_states[i].name, buf, len) == 0 &&
+                   buf[len] == '\n') {
+                        state = shost_states[i].value;
+                        break;
+                }
+        }
+        if (!state)
+                return -EINVAL;
+
+        if (scsi_host_set_state(shost, state))
+                return -EINVAL;
+        return count;
+}
+
+static ssize_t
+show_shost_state(struct class_device *class_dev, char *buf)
+{
+        struct Scsi_Host *shost = class_to_shost(class_dev);
+        const char *name = scsi_host_state_name(shost->shost_state);
+
+        if (!name)
+                return -EINVAL;
+
+        return snprintf(buf, 20, "%s\n", name);
+}
+
+static CLASS_DEVICE_ATTR(state, S_IRUGO | S_IWUSR, show_shost_state, store_shost_state);
+
 shost_rd_attr(unique_id, "%u\n");
 shost_rd_attr(host_busy, "%hu\n");
 shost_rd_attr(cmd_per_lun, "%hd\n");
@@ -139,6 +200,7 @@ static struct class_device_attribute *scsi_sysfs_shost_attrs[] = {
         &class_device_attr_unchecked_isa_dma,
         &class_device_attr_proc_name,
         &class_device_attr_scan,
+        &class_device_attr_state,
         NULL
 };
 
diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
index e6412fce423..2cab556b6e8 100644
--- a/drivers/scsi/scsi_transport_fc.c
+++ b/drivers/scsi/scsi_transport_fc.c
@@ -252,7 +252,8 @@ struct fc_internal {
 
 #define to_fc_internal(tmpl)    container_of(tmpl, struct fc_internal, t)
 
-static int fc_target_setup(struct device *dev)
+static int fc_target_setup(struct transport_container *tc, struct device *dev,
+                           struct class_device *cdev)
 {
         struct scsi_target *starget = to_scsi_target(dev);
         struct fc_rport *rport = starget_to_rport(starget);
@@ -281,7 +282,8 @@ static DECLARE_TRANSPORT_CLASS(fc_transport_class,
                                NULL,
                                NULL);
 
-static int fc_host_setup(struct device *dev)
+static int fc_host_setup(struct transport_container *tc, struct device *dev,
+                         struct class_device *cdev)
 {
         struct Scsi_Host *shost = dev_to_shost(dev);
 
diff --git a/drivers/scsi/scsi_transport_spi.c b/drivers/scsi/scsi_transport_spi.c
index 7670919a087..ef577c8c218 100644
--- a/drivers/scsi/scsi_transport_spi.c
+++ b/drivers/scsi/scsi_transport_spi.c
@@ -28,14 +28,14 @@
 #include "scsi_priv.h"
 #include <scsi/scsi_device.h>
 #include <scsi/scsi_host.h>
-#include <scsi/scsi_request.h>
+#include <scsi/scsi_cmnd.h>
 #include <scsi/scsi_eh.h>
 #include <scsi/scsi_transport.h>
 #include <scsi/scsi_transport_spi.h>
 
 #define SPI_PRINTK(x, l, f, a...)       dev_printk(l, &(x)->dev, f , ##a)
 
-#define SPI_NUM_ATTRS 13        /* increase this if you add attributes */
+#define SPI_NUM_ATTRS 14        /* increase this if you add attributes */
 #define SPI_OTHER_ATTRS 1       /* Increase this if you add "always
                                  * on" attributes */
 #define SPI_HOST_ATTRS  1
@@ -106,27 +106,31 @@ static int sprint_frac(char *dest, int value, int denom)
         return result;
 }
 
-/* Modification of scsi_wait_req that will clear UNIT ATTENTION conditions
- * resulting from (likely) bus and device resets */
-static void spi_wait_req(struct scsi_request *sreq, const void *cmd,
-                         void *buffer, unsigned bufflen)
+static int spi_execute(struct scsi_device *sdev, const void *cmd,
+                       enum dma_data_direction dir,
+                       void *buffer, unsigned bufflen,
+                       struct scsi_sense_hdr *sshdr)
 {
-        int i;
+        int i, result;
+        unsigned char sense[SCSI_SENSE_BUFFERSIZE];
 
         for(i = 0; i < DV_RETRIES; i++) {
-                sreq->sr_request->flags |= REQ_FAILFAST;
-
-                scsi_wait_req(sreq, cmd, buffer, bufflen,
-                              DV_TIMEOUT, /* retries */ 1);
-                if (sreq->sr_result & DRIVER_SENSE) {
-                        struct scsi_sense_hdr sshdr;
-
-                        if (scsi_request_normalize_sense(sreq, &sshdr)
-                            && sshdr.sense_key == UNIT_ATTENTION)
+                result = scsi_execute(sdev, cmd, dir, buffer, bufflen,
+                                      sense, DV_TIMEOUT, /* retries */ 1,
+                                      REQ_FAILFAST);
+                if (result & DRIVER_SENSE) {
+                        struct scsi_sense_hdr sshdr_tmp;
+                        if (!sshdr)
+                                sshdr = &sshdr_tmp;
+
+                        if (scsi_normalize_sense(sense, sizeof(*sense),
+                                                 sshdr)
+                            && sshdr->sense_key == UNIT_ATTENTION)
                                 continue;
                 }
                 break;
         }
+        return result;
 }
 
 static struct {
@@ -162,7 +166,8 @@ static inline enum spi_signal_type spi_signal_to_value(const char *name)
         return SPI_SIGNAL_UNKNOWN;
 }
 
-static int spi_host_setup(struct device *dev)
+static int spi_host_setup(struct transport_container *tc, struct device *dev,
+                          struct class_device *cdev)
 {
         struct Scsi_Host *shost = dev_to_shost(dev);
 
@@ -196,7 +201,9 @@ static int spi_host_match(struct attribute_container *cont,
         return &i->t.host_attrs.ac == cont;
 }
 
-static int spi_device_configure(struct device *dev)
+static int spi_device_configure(struct transport_container *tc,
+                                struct device *dev,
+                                struct class_device *cdev)
 {
         struct scsi_device *sdev = to_scsi_device(dev);
         struct scsi_target *starget = sdev->sdev_target;
@@ -214,7 +221,9 @@ static int spi_device_configure(struct device *dev)
         return 0;
 }
 
-static int spi_setup_transport_attrs(struct device *dev)
+static int spi_setup_transport_attrs(struct transport_container *tc,
+                                     struct device *dev,
+                                     struct class_device *cdev)
 {
         struct scsi_target *starget = to_scsi_target(dev);
 
@@ -231,6 +240,7 @@ static int spi_setup_transport_attrs(struct device *dev)
         spi_rd_strm(starget) = 0;
         spi_rti(starget) = 0;
         spi_pcomp_en(starget) = 0;
+        spi_hold_mcs(starget) = 0;
         spi_dv_pending(starget) = 0;
         spi_initial_dv(starget) = 0;
         init_MUTEX(&spi_dv_sem(starget));
@@ -347,6 +357,7 @@ spi_transport_rd_attr(wr_flow, "%d\n");
 spi_transport_rd_attr(rd_strm, "%d\n");
 spi_transport_rd_attr(rti, "%d\n");
 spi_transport_rd_attr(pcomp_en, "%d\n");
+spi_transport_rd_attr(hold_mcs, "%d\n");
 
 /* we only care about the first child device so we return 1 */
 static int child_iter(struct device *dev, void *data)
@@ -539,13 +550,13 @@ enum spi_compare_returns {
 /* This is for read/write Domain Validation:  If the device supports
  * an echo buffer, we do read/write tests to it */
 static enum spi_compare_returns
-spi_dv_device_echo_buffer(struct scsi_request *sreq, u8 *buffer,
+spi_dv_device_echo_buffer(struct scsi_device *sdev, u8 *buffer,
                           u8 *ptr, const int retries)
 {
-        struct scsi_device *sdev = sreq->sr_device;
         int len = ptr - buffer;
-        int j, k, r;
+        int j, k, r, result;
         unsigned int pattern = 0x0000ffff;
+        struct scsi_sense_hdr sshdr;
 
         const char spi_write_buffer[] = {
                 WRITE_BUFFER, 0x0a, 0, 0, 0, 0, 0, len >> 8, len & 0xff, 0
@@ -590,14 +601,12 @@ spi_dv_device_echo_buffer(struct scsi_request *sreq, u8 *buffer,
         }
 
         for (r = 0; r < retries; r++) {
-                sreq->sr_cmd_len = 0;   /* wait_req to fill in */
-                sreq->sr_data_direction = DMA_TO_DEVICE;
-                spi_wait_req(sreq, spi_write_buffer, buffer, len);
-                if(sreq->sr_result || !scsi_device_online(sdev)) {
-                        struct scsi_sense_hdr sshdr;
+                result = spi_execute(sdev, spi_write_buffer, DMA_TO_DEVICE,
+                                     buffer, len, &sshdr);
+                if(result || !scsi_device_online(sdev)) {
 
                         scsi_device_set_state(sdev, SDEV_QUIESCE);
-                        if (scsi_request_normalize_sense(sreq, &sshdr)
+                        if (scsi_sense_valid(&sshdr)
                             && sshdr.sense_key == ILLEGAL_REQUEST
                             /* INVALID FIELD IN CDB */
                             && sshdr.asc == 0x24 && sshdr.ascq == 0x00)
@@ -609,14 +618,13 @@ spi_dv_device_echo_buffer(struct scsi_request *sreq, u8 *buffer,
                                 return SPI_COMPARE_SKIP_TEST;
 
 
-                        SPI_PRINTK(sdev->sdev_target, KERN_ERR, "Write Buffer failure %x\n", sreq->sr_result);
+                        SPI_PRINTK(sdev->sdev_target, KERN_ERR, "Write Buffer failure %x\n", result);
                         return SPI_COMPARE_FAILURE;
                 }
 
                 memset(ptr, 0, len);
-                sreq->sr_cmd_len = 0;   /* wait_req to fill in */
-                sreq->sr_data_direction = DMA_FROM_DEVICE;
-                spi_wait_req(sreq, spi_read_buffer, ptr, len);
+                spi_execute(sdev, spi_read_buffer, DMA_FROM_DEVICE,
+                            ptr, len, NULL);
                 scsi_device_set_state(sdev, SDEV_QUIESCE);
 
                 if (memcmp(buffer, ptr, len) != 0)
@@ -628,25 +636,22 @@ spi_dv_device_echo_buffer(struct scsi_request *sreq, u8 *buffer,
 /* This is for the simplest form of Domain Validation: a read test
  * on the inquiry data from the device */
 static enum spi_compare_returns
-spi_dv_device_compare_inquiry(struct scsi_request *sreq, u8 *buffer,
+spi_dv_device_compare_inquiry(struct scsi_device *sdev, u8 *buffer,
                               u8 *ptr, const int retries)
 {
-        int r;
-        const int len = sreq->sr_device->inquiry_len;
-        struct scsi_device *sdev = sreq->sr_device;
+        int r, result;
+        const int len = sdev->inquiry_len;
         const char spi_inquiry[] = {
                 INQUIRY, 0, 0, 0, len, 0
         };
 
         for (r = 0; r < retries; r++) {
-                sreq->sr_cmd_len = 0;   /* wait_req to fill in */
-                sreq->sr_data_direction = DMA_FROM_DEVICE;
-
                 memset(ptr, 0, len);
 
-                spi_wait_req(sreq, spi_inquiry, ptr, len);
+                result = spi_execute(sdev, spi_inquiry, DMA_FROM_DEVICE,
+                                     ptr, len, NULL);
                 
-                if(sreq->sr_result || !scsi_device_online(sdev)) {
+                if(result || !scsi_device_online(sdev)) {
                         scsi_device_set_state(sdev, SDEV_QUIESCE);
                         return SPI_COMPARE_FAILURE;
                 }
@@ -667,12 +672,11 @@ spi_dv_device_compare_inquiry(struct scsi_request *sreq, u8 *buffer,
 }
 
 static enum spi_compare_returns
-spi_dv_retrain(struct scsi_request *sreq, u8 *buffer, u8 *ptr,
+spi_dv_retrain(struct scsi_device *sdev, u8 *buffer, u8 *ptr,
                enum spi_compare_returns 
-               (*compare_fn)(struct scsi_request *, u8 *, u8 *, int))
+               (*compare_fn)(struct scsi_device *, u8 *, u8 *, int))
 {
-        struct spi_internal *i = to_spi_internal(sreq->sr_host->transportt);
-        struct scsi_device *sdev = sreq->sr_device;
+        struct spi_internal *i = to_spi_internal(sdev->host->transportt);
         struct scsi_target *starget = sdev->sdev_target;
         int period = 0, prevperiod = 0; 
         enum spi_compare_returns retval;
@@ -680,7 +684,7 @@ spi_dv_retrain(struct scsi_request *sreq, u8 *buffer, u8 *ptr,
 
         for (;;) {
                 int newperiod;
-                retval = compare_fn(sreq, buffer, ptr, DV_LOOPS);
+                retval = compare_fn(sdev, buffer, ptr, DV_LOOPS);
 
                 if (retval == SPI_COMPARE_SUCCESS
                     || retval == SPI_COMPARE_SKIP_TEST)
@@ -726,9 +730,9 @@ spi_dv_retrain(struct scsi_request *sreq, u8 *buffer, u8 *ptr,
 }
 
 static int
-spi_dv_device_get_echo_buffer(struct scsi_request *sreq, u8 *buffer)
+spi_dv_device_get_echo_buffer(struct scsi_device *sdev, u8 *buffer)
 {
-        int l;
+        int l, result;
 
         /* first off do a test unit ready.  This can error out 
          * because of reservations or some other reason.  If it
@@ -744,18 +748,16 @@ spi_dv_device_get_echo_buffer(struct scsi_request *sreq, u8 *buffer)
         };
 
         
-        sreq->sr_cmd_len = 0;
-        sreq->sr_data_direction = DMA_NONE;
-
         /* We send a set of three TURs to clear any outstanding 
          * unit attention conditions if they exist (Otherwise the
          * buffer tests won't be happy).  If the TUR still fails
          * (reservation conflict, device not ready, etc) just
          * skip the write tests */
         for (l = 0; ; l++) {
-                spi_wait_req(sreq, spi_test_unit_ready, NULL, 0);
+                result = spi_execute(sdev, spi_test_unit_ready, DMA_NONE, 
+                                     NULL, 0, NULL);
 
-                if(sreq->sr_result) {
+                if(result) {
                         if(l >= 3)
                                 return 0;
                 } else {
@@ -764,12 +766,10 @@ spi_dv_device_get_echo_buffer(struct scsi_request *sreq, u8 *buffer)
                 }
         }
 
-        sreq->sr_cmd_len = 0;
-        sreq->sr_data_direction = DMA_FROM_DEVICE;
-
-        spi_wait_req(sreq, spi_read_buffer_descriptor, buffer, 4);
+        result = spi_execute(sdev, spi_read_buffer_descriptor, 
+                             DMA_FROM_DEVICE, buffer, 4, NULL);
 
-        if (sreq->sr_result)
+        if (result)
                 /* Device has no echo buffer */
                 return 0;
 
@@ -777,17 +777,16 @@ spi_dv_device_get_echo_buffer(struct scsi_request *sreq, u8 *buffer)
 }
 
 static void
-spi_dv_device_internal(struct scsi_request *sreq, u8 *buffer)
+spi_dv_device_internal(struct scsi_device *sdev, u8 *buffer)
 {
-        struct spi_internal *i = to_spi_internal(sreq->sr_host->transportt);
-        struct scsi_device *sdev = sreq->sr_device;
+        struct spi_internal *i = to_spi_internal(sdev->host->transportt);
         struct scsi_target *starget = sdev->sdev_target;
         int len = sdev->inquiry_len;
         /* first set us up for narrow async */
         DV_SET(offset, 0);
         DV_SET(width, 0);
         
-        if (spi_dv_device_compare_inquiry(sreq, buffer, buffer, DV_LOOPS)
+        if (spi_dv_device_compare_inquiry(sdev, buffer, buffer, DV_LOOPS)
             != SPI_COMPARE_SUCCESS) {
                 SPI_PRINTK(starget, KERN_ERR, "Domain Validation Initial Inquiry Failed\n");
                 /* FIXME: should probably offline the device here? */
@@ -799,7 +798,7 @@ spi_dv_device_internal(struct scsi_request *sreq, u8 *buffer)
             scsi_device_wide(sdev)) {
                 i->f->set_width(starget, 1);
 
-                if (spi_dv_device_compare_inquiry(sreq, buffer,
+                if (spi_dv_device_compare_inquiry(sdev, buffer,
                                                    buffer + len,
                                                    DV_LOOPS)
                     != SPI_COMPARE_SUCCESS) {
@@ -820,7 +819,7 @@ spi_dv_device_internal(struct scsi_request *sreq, u8 *buffer)
 
         len = 0;
         if (scsi_device_dt(sdev))
-                len = spi_dv_device_get_echo_buffer(sreq, buffer);
+                len = spi_dv_device_get_echo_buffer(sdev, buffer);
 
  retry:
 
@@ -846,7 +845,7 @@ spi_dv_device_internal(struct scsi_request *sreq, u8 *buffer)
 
         if (len == 0) {
                 SPI_PRINTK(starget, KERN_INFO, "Domain Validation skipping write tests\n");
-                spi_dv_retrain(sreq, buffer, buffer + len,
+                spi_dv_retrain(sdev, buffer, buffer + len,
                                spi_dv_device_compare_inquiry);
                 return;
         }
@@ -856,7 +855,7 @@ spi_dv_device_internal(struct scsi_request *sreq, u8 *buffer)
                 len = SPI_MAX_ECHO_BUFFER_SIZE;
         }
 
-        if (spi_dv_retrain(sreq, buffer, buffer + len,
+        if (spi_dv_retrain(sdev, buffer, buffer + len,
                            spi_dv_device_echo_buffer)
             == SPI_COMPARE_SKIP_TEST) {
                 /* OK, the stupid drive can't do a write echo buffer
@@ -879,16 +878,12 @@ spi_dv_device_internal(struct scsi_request *sreq, u8 *buffer)
 void
 spi_dv_device(struct scsi_device *sdev)
 {
-        struct scsi_request *sreq = scsi_allocate_request(sdev, GFP_KERNEL);
         struct scsi_target *starget = sdev->sdev_target;
         u8 *buffer;
         const int len = SPI_MAX_ECHO_BUFFER_SIZE*2;
 
-        if (unlikely(!sreq))
-                return;
-
         if (unlikely(scsi_device_get(sdev)))
-                goto out_free_req;
+                return;
 
         buffer = kmalloc(len, GFP_KERNEL);
 
@@ -909,7 +904,7 @@ spi_dv_device(struct scsi_device *sdev)
 
         SPI_PRINTK(starget, KERN_INFO, "Beginning Domain Validation\n");
 
-        spi_dv_device_internal(sreq, buffer);
+        spi_dv_device_internal(sdev, buffer);
 
         SPI_PRINTK(starget, KERN_INFO, "Ending Domain Validation\n");
 
@@ -924,8 +919,6 @@ spi_dv_device(struct scsi_device *sdev)
         kfree(buffer);
  out_put:
         scsi_device_put(sdev);
- out_free_req:
-        scsi_release_request(sreq);
 }
 EXPORT_SYMBOL(spi_dv_device);
 
@@ -1028,10 +1021,17 @@ void spi_display_xfer_agreement(struct scsi_target *starget)
                 sprint_frac(tmp, picosec, 1000);
 
                 dev_info(&starget->dev,
-                        "%s %sSCSI %d.%d MB/s %s%s%s (%s ns, offset %d)\n",
-                        scsi, tp->width ? "WIDE " : "", kb100/10, kb100 % 10,
-                        tp->dt ? "DT" : "ST", tp->iu ? " IU" : "",
-                        tp->qas  ? " QAS" : "", tmp, tp->offset);
+                         "%s %sSCSI %d.%d MB/s %s%s%s%s%s%s%s%s (%s ns, offset %d)\n",
+                         scsi, tp->width ? "WIDE " : "", kb100/10, kb100 % 10,
+                         tp->dt ? "DT" : "ST",
+                         tp->iu ? " IU" : "",
+                         tp->qas  ? " QAS" : "",
+                         tp->rd_strm ? " RDSTRM" : "",
+                         tp->rti ? " RTI" : "",
+                         tp->wr_flow ? " WRFLOW" : "",
+                         tp->pcomp_en ? " PCOMP" : "",
+                         tp->hold_mcs ? " HMCS" : "",
+                         tmp, tp->offset);
         } else {
                 dev_info(&starget->dev, "%sasynchronous.\n",
                                 tp->width ? "wide " : "");
@@ -1073,6 +1073,7 @@ static int spi_device_match(struct attribute_container *cont,
 {
         struct scsi_device *sdev;
         struct Scsi_Host *shost;
+        struct spi_internal *i;
 
         if (!scsi_is_sdev_device(dev))
                 return 0;
@@ -1085,6 +1086,9 @@ static int spi_device_match(struct attribute_container *cont,
         /* Note: this class has no device attributes, so it has
          * no per-HBA allocation and thus we don't need to distinguish
          * the attribute containers for the device */
+        i = to_spi_internal(shost->transportt);
+        if (i->f->deny_binding && i->f->deny_binding(sdev->sdev_target))
+                return 0;
         return 1;
 }
 
@@ -1092,6 +1096,7 @@ static int spi_target_match(struct attribute_container *cont,
                             struct device *dev)
 {
         struct Scsi_Host *shost;
+        struct scsi_target *starget;
         struct spi_internal *i;
 
         if (!scsi_is_target_device(dev))
@@ -1103,7 +1108,11 @@ static int spi_target_match(struct attribute_container *cont,
                 return 0;
 
         i = to_spi_internal(shost->transportt);
-        
+        starget = to_scsi_target(dev);
+
+        if (i->f->deny_binding && i->f->deny_binding(starget))
+                return 0;
+
         return &i->t.target_attrs.ac == cont;
 }
 
@@ -1154,6 +1163,7 @@ spi_attach_transport(struct spi_function_template *ft)
         SETUP_ATTRIBUTE(rd_strm);
         SETUP_ATTRIBUTE(rti);
         SETUP_ATTRIBUTE(pcomp_en);
+        SETUP_ATTRIBUTE(hold_mcs);
 
         /* if you add an attribute but forget to increase SPI_NUM_ATTRS
          * this bug will trigger */
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 0410e1bf109..de564b38605 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -59,7 +59,6 @@
 #include <scsi/scsi_eh.h>
 #include <scsi/scsi_host.h>
 #include <scsi/scsi_ioctl.h>
-#include <scsi/scsi_request.h>
 #include <scsi/scsicam.h>
 
 #include "scsi_logging.h"
@@ -125,7 +124,7 @@ static int sd_issue_flush(struct device *, sector_t *);
 static void sd_end_flush(request_queue_t *, struct request *);
 static int sd_prepare_flush(request_queue_t *, struct request *);
 static void sd_read_capacity(struct scsi_disk *sdkp, char *diskname,
-                 struct scsi_request *SRpnt, unsigned char *buffer);
+                             unsigned char *buffer);
 
 static struct scsi_driver sd_template = {
         .owner                  = THIS_MODULE,
@@ -682,19 +681,13 @@ not_present:
 
 static int sd_sync_cache(struct scsi_device *sdp)
 {
-        struct scsi_request *sreq;
         int retries, res;
+        struct scsi_sense_hdr sshdr;
 
         if (!scsi_device_online(sdp))
                 return -ENODEV;
 
-        sreq = scsi_allocate_request(sdp, GFP_KERNEL);
-        if (!sreq) {
-                printk("FAILED\n  No memory for request\n");
-                return -ENOMEM;
-        }
 
-        sreq->sr_data_direction = DMA_NONE;
         for (retries = 3; retries > 0; --retries) {
                 unsigned char cmd[10] = { 0 };
 
@@ -703,22 +696,20 @@ static int sd_sync_cache(struct scsi_device *sdp)
                  * Leave the rest of the command zero to indicate
                  * flush everything.
                  */
-                scsi_wait_req(sreq, cmd, NULL, 0, SD_TIMEOUT, SD_MAX_RETRIES);
-                if (sreq->sr_result == 0)
+                res = scsi_execute_req(sdp, cmd, DMA_NONE, NULL, 0, &sshdr,
+                                       SD_TIMEOUT, SD_MAX_RETRIES);
+                if (res == 0)
                         break;
         }
 
-        res = sreq->sr_result;
-        if (res) {
-                printk(KERN_WARNING "FAILED\n  status = %x, message = %02x, "
+        if (res) {              printk(KERN_WARNING "FAILED\n  status = %x, message = %02x, "
                                     "host = %d, driver = %02x\n  ",
                                     status_byte(res), msg_byte(res),
                                     host_byte(res), driver_byte(res));
                         if (driver_byte(res) & DRIVER_SENSE)
-                                scsi_print_req_sense("sd", sreq);
+                                scsi_print_sense_hdr("sd", &sshdr);
         }
 
-        scsi_release_request(sreq);
         return res;
 }
 
@@ -957,22 +948,19 @@ static void sd_rw_intr(struct scsi_cmnd * SCpnt)
         scsi_io_completion(SCpnt, good_bytes, block_sectors << 9);
 }
 
-static int media_not_present(struct scsi_disk *sdkp, struct scsi_request *srp)
+static int media_not_present(struct scsi_disk *sdkp,
+                             struct scsi_sense_hdr *sshdr)
 {
-        struct scsi_sense_hdr sshdr;
 
-        if (!srp->sr_result)
-                return 0;
-        if (!(driver_byte(srp->sr_result) & DRIVER_SENSE))
+        if (!scsi_sense_valid(sshdr))
                 return 0;
         /* not invoked for commands that could return deferred errors */
-        if (scsi_request_normalize_sense(srp, &sshdr)) {
-                if (sshdr.sense_key != NOT_READY &&
-                    sshdr.sense_key != UNIT_ATTENTION)
-                        return 0;
-                if (sshdr.asc != 0x3A) /* medium not present */
-                        return 0;
-        }
+        if (sshdr->sense_key != NOT_READY &&
+            sshdr->sense_key != UNIT_ATTENTION)
+                return 0;
+        if (sshdr->asc != 0x3A) /* medium not present */
+                return 0;
+
         set_media_not_present(sdkp);
         return 1;
 }
@@ -981,10 +969,10 @@ static int media_not_present(struct scsi_disk *sdkp, struct scsi_request *srp)
  * spinup disk - called only in sd_revalidate_disk()
  */
 static void
-sd_spinup_disk(struct scsi_disk *sdkp, char *diskname,
-               struct scsi_request *SRpnt, unsigned char *buffer) {
+sd_spinup_disk(struct scsi_disk *sdkp, char *diskname)
+{
         unsigned char cmd[10];
-        unsigned long spintime_value = 0;
+        unsigned long spintime_expire = 0;
         int retries, spintime;
         unsigned int the_result;
         struct scsi_sense_hdr sshdr;
@@ -1001,18 +989,13 @@ sd_spinup_disk(struct scsi_disk *sdkp, char *diskname,
                         cmd[0] = TEST_UNIT_READY;
                         memset((void *) &cmd[1], 0, 9);
 
-                        SRpnt->sr_cmd_len = 0;
-                        memset(SRpnt->sr_sense_buffer, 0,
-                               SCSI_SENSE_BUFFERSIZE);
-                        SRpnt->sr_data_direction = DMA_NONE;
+                        the_result = scsi_execute_req(sdkp->device, cmd,
+                                                      DMA_NONE, NULL, 0,
+                                                      &sshdr, SD_TIMEOUT,
+                                                      SD_MAX_RETRIES);
 
-                        scsi_wait_req (SRpnt, (void *) cmd, (void *) buffer,
-                                       0/*512*/, SD_TIMEOUT, SD_MAX_RETRIES);
-
-                        the_result = SRpnt->sr_result;
                         if (the_result)
-                                sense_valid = scsi_request_normalize_sense(
-                                                        SRpnt, &sshdr);
+                                sense_valid = scsi_sense_valid(&sshdr);
                         retries++;
                 } while (retries < 3 && 
                          (!scsi_status_is_good(the_result) ||
@@ -1024,7 +1007,7 @@ sd_spinup_disk(struct scsi_disk *sdkp, char *diskname,
                  * any media in it, don't bother with any of the rest of
                  * this crap.
                  */
-                if (media_not_present(sdkp, SRpnt))
+                if (media_not_present(sdkp, &sshdr))
                         return;
 
                 if ((driver_byte(the_result) & DRIVER_SENSE) == 0) {
@@ -1063,33 +1046,42 @@ sd_spinup_disk(struct scsi_disk *sdkp, char *diskname,
                                 cmd[1] = 1;     /* Return immediately */
                                 memset((void *) &cmd[2], 0, 8);
                                 cmd[4] = 1;     /* Start spin cycle */
-                                SRpnt->sr_cmd_len = 0;
-                                memset(SRpnt->sr_sense_buffer, 0,
-                                        SCSI_SENSE_BUFFERSIZE);
-
-                                SRpnt->sr_data_direction = DMA_NONE;
-                                scsi_wait_req(SRpnt, (void *)cmd, 
-                                              (void *) buffer, 0/*512*/, 
-                                              SD_TIMEOUT, SD_MAX_RETRIES);
-                                spintime_value = jiffies;
+                                scsi_execute_req(sdkp->device, cmd, DMA_NONE,
+                                                 NULL, 0, &sshdr,
+                                                 SD_TIMEOUT, SD_MAX_RETRIES);
+                                spintime_expire = jiffies + 100 * HZ;
+                                spintime = 1;
                         }
-                        spintime = 1;
                         /* Wait 1 second for next try */
                         msleep(1000);
                         printk(".");
+
+                /*
+                 * Wait for USB flash devices with slow firmware.
+                 * Yes, this sense key/ASC combination shouldn't
+                 * occur here.  It's characteristic of these devices.
+                 */
+                } else if (sense_valid &&
+                                sshdr.sense_key == UNIT_ATTENTION &&
+                                sshdr.asc == 0x28) {
+                        if (!spintime) {
+                                spintime_expire = jiffies + 5 * HZ;
+                                spintime = 1;
+                        }
+                        /* Wait 1 second for next try */
+                        msleep(1000);
                 } else {
                         /* we don't understand the sense code, so it's
                          * probably pointless to loop */
                         if(!spintime) {
                                 printk(KERN_NOTICE "%s: Unit Not Ready, "
                                         "sense:\n", diskname);
-                                scsi_print_req_sense("", SRpnt);
+                                scsi_print_sense_hdr("", &sshdr);
                         }
                         break;
                 }
                                 
-        } while (spintime &&
-                 time_after(spintime_value + 100 * HZ, jiffies));
+        } while (spintime && time_before_eq(jiffies, spintime_expire));
 
         if (spintime) {
                 if (scsi_status_is_good(the_result))
@@ -1104,14 +1096,15 @@ sd_spinup_disk(struct scsi_disk *sdkp, char *diskname,
  */
 static void
 sd_read_capacity(struct scsi_disk *sdkp, char *diskname,
-                 struct scsi_request *SRpnt, unsigned char *buffer) {
+                 unsigned char *buffer)
+{
         unsigned char cmd[16];
-        struct scsi_device *sdp = sdkp->device;
         int the_result, retries;
         int sector_size = 0;
         int longrc = 0;
         struct scsi_sense_hdr sshdr;
         int sense_valid = 0;
+        struct scsi_device *sdp = sdkp->device;
 
 repeat:
         retries = 3;
@@ -1128,20 +1121,15 @@ repeat:
                         memset((void *) buffer, 0, 8);
                 }
                 
-                SRpnt->sr_cmd_len = 0;
-                memset(SRpnt->sr_sense_buffer, 0, SCSI_SENSE_BUFFERSIZE);
-                SRpnt->sr_data_direction = DMA_FROM_DEVICE;
-
-                scsi_wait_req(SRpnt, (void *) cmd, (void *) buffer,
-                              longrc ? 12 : 8, SD_TIMEOUT, SD_MAX_RETRIES);
+                the_result = scsi_execute_req(sdp, cmd, DMA_FROM_DEVICE,
+                                              buffer, longrc ? 12 : 8, &sshdr,
+                                              SD_TIMEOUT, SD_MAX_RETRIES);
 
-                if (media_not_present(sdkp, SRpnt))
+                if (media_not_present(sdkp, &sshdr))
                         return;
 
-                the_result = SRpnt->sr_result;
                 if (the_result)
-                        sense_valid = scsi_request_normalize_sense(SRpnt,
-                                                                   &sshdr);
+                        sense_valid = scsi_sense_valid(&sshdr);
                 retries--;
 
         } while (the_result && retries);
@@ -1156,7 +1144,7 @@ repeat:
                        driver_byte(the_result));
 
                 if (driver_byte(the_result) & DRIVER_SENSE)
-                        scsi_print_req_sense("sd", SRpnt);
+                        scsi_print_sense_hdr("sd", &sshdr);
                 else
                         printk("%s : sense not available. \n", diskname);
 
@@ -1296,11 +1284,13 @@ got_data:
 
 /* called with buffer of length 512 */
 static inline int
-sd_do_mode_sense(struct scsi_request *SRpnt, int dbd, int modepage,
-                 unsigned char *buffer, int len, struct scsi_mode_data *data)
+sd_do_mode_sense(struct scsi_device *sdp, int dbd, int modepage,
+                 unsigned char *buffer, int len, struct scsi_mode_data *data,
+                 struct scsi_sense_hdr *sshdr)
 {
-        return __scsi_mode_sense(SRpnt, dbd, modepage, buffer, len,
-                                 SD_TIMEOUT, SD_MAX_RETRIES, data);
+        return scsi_mode_sense(sdp, dbd, modepage, buffer, len,
+                               SD_TIMEOUT, SD_MAX_RETRIES, data,
+                               sshdr);
 }
 
 /*
@@ -1309,25 +1299,27 @@ sd_do_mode_sense(struct scsi_request *SRpnt, int dbd, int modepage,
  */
 static void
 sd_read_write_protect_flag(struct scsi_disk *sdkp, char *diskname,
-                   struct scsi_request *SRpnt, unsigned char *buffer) {
+                           unsigned char *buffer)
+{
         int res;
+        struct scsi_device *sdp = sdkp->device;
         struct scsi_mode_data data;
 
         set_disk_ro(sdkp->disk, 0);
-        if (sdkp->device->skip_ms_page_3f) {
+        if (sdp->skip_ms_page_3f) {
                 printk(KERN_NOTICE "%s: assuming Write Enabled\n", diskname);
                 return;
         }
 
-        if (sdkp->device->use_192_bytes_for_3f) {
-                res = sd_do_mode_sense(SRpnt, 0, 0x3F, buffer, 192, &data);
+        if (sdp->use_192_bytes_for_3f) {
+                res = sd_do_mode_sense(sdp, 0, 0x3F, buffer, 192, &data, NULL);
         } else {
                 /*
                  * First attempt: ask for all pages (0x3F), but only 4 bytes.
                  * We have to start carefully: some devices hang if we ask
                  * for more than is available.
                  */
-                res = sd_do_mode_sense(SRpnt, 0, 0x3F, buffer, 4, &data);
+                res = sd_do_mode_sense(sdp, 0, 0x3F, buffer, 4, &data, NULL);
 
                 /*
                  * Second attempt: ask for page 0 When only page 0 is
@@ -1336,14 +1328,14 @@ sd_read_write_protect_flag(struct scsi_disk *sdkp, char *diskname,
                  * CDB.
                  */
                 if (!scsi_status_is_good(res))
-                        res = sd_do_mode_sense(SRpnt, 0, 0, buffer, 4, &data);
+                        res = sd_do_mode_sense(sdp, 0, 0, buffer, 4, &data, NULL);
 
                 /*
                  * Third attempt: ask 255 bytes, as we did earlier.
                  */
                 if (!scsi_status_is_good(res))
-                        res = sd_do_mode_sense(SRpnt, 0, 0x3F, buffer, 255,
-                                               &data);
+                        res = sd_do_mode_sense(sdp, 0, 0x3F, buffer, 255,
+                                               &data, NULL);
         }
 
         if (!scsi_status_is_good(res)) {
@@ -1365,19 +1357,20 @@ sd_read_write_protect_flag(struct scsi_disk *sdkp, char *diskname,
  */
 static void
 sd_read_cache_type(struct scsi_disk *sdkp, char *diskname,
-                   struct scsi_request *SRpnt, unsigned char *buffer)
+                   unsigned char *buffer)
 {
         int len = 0, res;
+        struct scsi_device *sdp = sdkp->device;
 
         int dbd;
         int modepage;
         struct scsi_mode_data data;
         struct scsi_sense_hdr sshdr;
 
-        if (sdkp->device->skip_ms_page_8)
+        if (sdp->skip_ms_page_8)
                 goto defaults;
 
-        if (sdkp->device->type == TYPE_RBC) {
+        if (sdp->type == TYPE_RBC) {
                 modepage = 6;
                 dbd = 8;
         } else {
@@ -1386,7 +1379,7 @@ sd_read_cache_type(struct scsi_disk *sdkp, char *diskname,
         }
 
         /* cautiously ask */
-        res = sd_do_mode_sense(SRpnt, dbd, modepage, buffer, 4, &data);
+        res = sd_do_mode_sense(sdp, dbd, modepage, buffer, 4, &data, &sshdr);
 
         if (!scsi_status_is_good(res))
                 goto bad_sense;
@@ -1407,7 +1400,7 @@ sd_read_cache_type(struct scsi_disk *sdkp, char *diskname,
         len += data.header_length + data.block_descriptor_length;
 
         /* Get the data */
-        res = sd_do_mode_sense(SRpnt, dbd, modepage, buffer, len, &data);
+        res = sd_do_mode_sense(sdp, dbd, modepage, buffer, len, &data, &sshdr);
 
         if (scsi_status_is_good(res)) {
                 const char *types[] = {
@@ -1439,7 +1432,7 @@ sd_read_cache_type(struct scsi_disk *sdkp, char *diskname,
         }
 
 bad_sense:
-        if (scsi_request_normalize_sense(SRpnt, &sshdr) &&
+        if (scsi_sense_valid(&sshdr) &&
             sshdr.sense_key == ILLEGAL_REQUEST &&
             sshdr.asc == 0x24 && sshdr.ascq == 0x0)
                 printk(KERN_NOTICE "%s: cache data unavailable\n",
@@ -1464,7 +1457,6 @@ static int sd_revalidate_disk(struct gendisk *disk)
 {
         struct scsi_disk *sdkp = scsi_disk(disk);
         struct scsi_device *sdp = sdkp->device;
-        struct scsi_request *sreq;
         unsigned char *buffer;
 
         SCSI_LOG_HLQUEUE(3, printk("sd_revalidate_disk: disk=%s\n", disk->disk_name));
@@ -1476,18 +1468,11 @@ static int sd_revalidate_disk(struct gendisk *disk)
         if (!scsi_device_online(sdp))
                 goto out;
 
-        sreq = scsi_allocate_request(sdp, GFP_KERNEL);
-        if (!sreq) {
-                printk(KERN_WARNING "(sd_revalidate_disk:) Request allocation "
-                       "failure.\n");
-                goto out;
-        }
-
         buffer = kmalloc(512, GFP_KERNEL | __GFP_DMA);
         if (!buffer) {
                 printk(KERN_WARNING "(sd_revalidate_disk:) Memory allocation "
                        "failure.\n");
-                goto out_release_request;
+                goto out;
         }
 
         /* defaults, until the device tells us otherwise */
@@ -1498,25 +1483,23 @@ static int sd_revalidate_disk(struct gendisk *disk)
         sdkp->WCE = 0;
         sdkp->RCD = 0;
 
-        sd_spinup_disk(sdkp, disk->disk_name, sreq, buffer);
+        sd_spinup_disk(sdkp, disk->disk_name);
 
         /*
          * Without media there is no reason to ask; moreover, some devices
          * react badly if we do.
          */
         if (sdkp->media_present) {
-                sd_read_capacity(sdkp, disk->disk_name, sreq, buffer);
+                sd_read_capacity(sdkp, disk->disk_name, buffer);
                 if (sdp->removable)
                         sd_read_write_protect_flag(sdkp, disk->disk_name,
-                                        sreq, buffer);
-                sd_read_cache_type(sdkp, disk->disk_name, sreq, buffer);
+                                                   buffer);
+                sd_read_cache_type(sdkp, disk->disk_name, buffer);
         }
                 
         set_capacity(disk, sdkp->capacity);
         kfree(buffer);
 
- out_release_request: 
-        scsi_release_request(sreq);
  out:
         return 0;
 }
diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
index e822ca0e97c..b1b69d738d0 100644
--- a/drivers/scsi/sg.c
+++ b/drivers/scsi/sg.c
@@ -61,7 +61,7 @@ static int sg_version_num = 30533;	/* 2 digits for each component */
 
 #ifdef CONFIG_SCSI_PROC_FS
 #include <linux/proc_fs.h>
-static char *sg_version_date = "20050328";
+static char *sg_version_date = "20050901";
 
 static int sg_proc_init(void);
 static void sg_proc_cleanup(void);
@@ -1027,8 +1027,7 @@ sg_ioctl(struct inode *inode, struct file *filp,
                 if (sdp->detached)
                         return -ENODEV;
                 if (filp->f_flags & O_NONBLOCK) {
-                        if (test_bit(SHOST_RECOVERY,
-                                     &sdp->device->host->shost_state))
+                        if (sdp->device->host->shost_state == SHOST_RECOVERY)
                                 return -EBUSY;
                 } else if (!scsi_block_when_processing_errors(sdp->device))
                         return -EBUSY;
@@ -1795,12 +1794,12 @@ st_map_user_pages(struct scatterlist *sgl, const unsigned int max_pages,
                   unsigned long uaddr, size_t count, int rw,
                   unsigned long max_pfn)
 {
+        unsigned long end = (uaddr + count + PAGE_SIZE - 1) >> PAGE_SHIFT;
+        unsigned long start = uaddr >> PAGE_SHIFT;
+        const int nr_pages = end - start;
         int res, i, j;
-        unsigned int nr_pages;
         struct page **pages;
 
-        nr_pages = ((uaddr & ~PAGE_MASK) + count + ~PAGE_MASK) >> PAGE_SHIFT;
-
         /* User attempted Overflow! */
         if ((uaddr + count) < uaddr)
                 return -EINVAL;
diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c
index 2f259f24952..ce63fc8312d 100644
--- a/drivers/scsi/sr.c
+++ b/drivers/scsi/sr.c
@@ -50,10 +50,10 @@
 #include <scsi/scsi_dbg.h>
 #include <scsi/scsi_device.h>
 #include <scsi/scsi_driver.h>
+#include <scsi/scsi_cmnd.h>
 #include <scsi/scsi_eh.h>
 #include <scsi/scsi_host.h>
 #include <scsi/scsi_ioctl.h>    /* For the door lock/unlock commands */
-#include <scsi/scsi_request.h>
 
 #include "scsi_logging.h"
 #include "sr.h"
@@ -199,15 +199,7 @@ int sr_media_change(struct cdrom_device_info *cdi, int slot)
                 /* check multisession offset etc */
                 sr_cd_check(cdi);
 
-                /* 
-                 * If the disk changed, the capacity will now be different,
-                 * so we force a re-read of this information 
-                 * Force 2048 for the sector size so that filesystems won't
-                 * be trying to use something that is too small if the disc
-                 * has changed.
-                 */
-                cd->needs_sector_size = 1;
-                cd->device->sector_size = 2048;
+                get_sectorsize(cd);
         }
         return retval;
 }
@@ -538,13 +530,6 @@ static int sr_open(struct cdrom_device_info *cdi, int purpose)
         if (!scsi_block_when_processing_errors(sdev))
                 goto error_out;
 
-        /*
-         * If this device did not have media in the drive at boot time, then
-         * we would have been unable to get the sector size.  Check to see if
-         * this is the case, and try again.
-         */
-        if (cd->needs_sector_size)
-                get_sectorsize(cd);
         return 0;
 
 error_out:
@@ -604,7 +589,6 @@ static int sr_probe(struct device *dev)
         cd->driver = &sr_template;
         cd->disk = disk;
         cd->capacity = 0x1fffff;
-        cd->needs_sector_size = 1;
         cd->device->changed = 1;        /* force recheck CD type */
         cd->use = 1;
         cd->readcd_known = 0;
@@ -658,43 +642,30 @@ static void get_sectorsize(struct scsi_cd *cd)
         unsigned char *buffer;
         int the_result, retries = 3;
         int sector_size;
-        struct scsi_request *SRpnt = NULL;
         request_queue_t *queue;
 
         buffer = kmalloc(512, GFP_KERNEL | GFP_DMA);
         if (!buffer)
                 goto Enomem;
-        SRpnt = scsi_allocate_request(cd->device, GFP_KERNEL);
-        if (!SRpnt)
-                goto Enomem;
 
         do {
                 cmd[0] = READ_CAPACITY;
                 memset((void *) &cmd[1], 0, 9);
-                /* Mark as really busy */
-                SRpnt->sr_request->rq_status = RQ_SCSI_BUSY;
-                SRpnt->sr_cmd_len = 0;
-
                 memset(buffer, 0, 8);
 
                 /* Do the command and wait.. */
-                SRpnt->sr_data_direction = DMA_FROM_DEVICE;
-                scsi_wait_req(SRpnt, (void *) cmd, (void *) buffer,
-                              8, SR_TIMEOUT, MAX_RETRIES);
+                the_result = scsi_execute_req(cd->device, cmd, DMA_FROM_DEVICE,
+                                              buffer, 8, NULL, SR_TIMEOUT,
+                                              MAX_RETRIES);
 
-                the_result = SRpnt->sr_result;
                 retries--;
 
         } while (the_result && retries);
 
 
-        scsi_release_request(SRpnt);
-        SRpnt = NULL;
-
         if (the_result) {
                 cd->capacity = 0x1fffff;
                 sector_size = 2048;     /* A guess, just in case */
-                cd->needs_sector_size = 1;
         } else {
 #if 0
                 if (cdrom_get_last_written(&cd->cdi,
@@ -727,7 +698,6 @@ static void get_sectorsize(struct scsi_cd *cd)
                         printk("%s: unsupported sector size %d.\n",
                                cd->cdi.name, sector_size);
                         cd->capacity = 0;
-                        cd->needs_sector_size = 1;
                 }
 
                 cd->device->sector_size = sector_size;
@@ -736,7 +706,6 @@ static void get_sectorsize(struct scsi_cd *cd)
                  * Add this so that we have the ability to correctly gauge
                  * what the device is capable of.
                  */
-                cd->needs_sector_size = 0;
                 set_capacity(cd->disk, cd->capacity);
         }
 
@@ -748,10 +717,7 @@ out:
 
 Enomem:
         cd->capacity = 0x1fffff;
-        sector_size = 2048;     /* A guess, just in case */
-        cd->needs_sector_size = 1;
-        if (SRpnt)
-                scsi_release_request(SRpnt);
+        cd->device->sector_size = 2048; /* A guess, just in case */
         goto out;
 }
 
@@ -759,8 +725,8 @@ static void get_capabilities(struct scsi_cd *cd)
 {
         unsigned char *buffer;
         struct scsi_mode_data data;
-        struct scsi_request *SRpnt;
         unsigned char cmd[MAX_COMMAND_SIZE];
+        struct scsi_sense_hdr sshdr;
         unsigned int the_result;
         int retries, rc, n;
 
@@ -776,19 +742,11 @@ static void get_capabilities(struct scsi_cd *cd)
                 ""
         };
 
-        /* allocate a request for the TEST_UNIT_READY */
-        SRpnt = scsi_allocate_request(cd->device, GFP_KERNEL);
-        if (!SRpnt) {
-                printk(KERN_WARNING "(get_capabilities:) Request allocation "
-                       "failure.\n");
-                return;
-        }
 
         /* allocate transfer buffer */
         buffer = kmalloc(512, GFP_KERNEL | GFP_DMA);
         if (!buffer) {
                 printk(KERN_ERR "sr: out of memory.\n");
-                scsi_release_request(SRpnt);
                 return;
         }
 
@@ -800,24 +758,19 @@ static void get_capabilities(struct scsi_cd *cd)
                 memset((void *)cmd, 0, MAX_COMMAND_SIZE);
                 cmd[0] = TEST_UNIT_READY;
 
-                SRpnt->sr_cmd_len = 0;
-                SRpnt->sr_sense_buffer[0] = 0;
-                SRpnt->sr_sense_buffer[2] = 0;
-                SRpnt->sr_data_direction = DMA_NONE;
-
-                scsi_wait_req (SRpnt, (void *) cmd, buffer,
-                               0, SR_TIMEOUT, MAX_RETRIES);
+                the_result = scsi_execute_req (cd->device, cmd, DMA_NONE, NULL,
+                                               0, &sshdr, SR_TIMEOUT,
+                                               MAX_RETRIES);
 
-                the_result = SRpnt->sr_result;
                 retries++;
         } while (retries < 5 && 
                  (!scsi_status_is_good(the_result) ||
-                  ((driver_byte(the_result) & DRIVER_SENSE) &&
-                   SRpnt->sr_sense_buffer[2] == UNIT_ATTENTION)));
+                  (scsi_sense_valid(&sshdr) &&
+                   sshdr.sense_key == UNIT_ATTENTION)));
 
         /* ask for mode page 0x2a */
         rc = scsi_mode_sense(cd->device, 0, 0x2a, buffer, 128,
-                             SR_TIMEOUT, 3, &data);
+                             SR_TIMEOUT, 3, &data, NULL);
 
         if (!scsi_status_is_good(rc)) {
                 /* failed, drive doesn't have capabilities mode page */
@@ -825,7 +778,6 @@ static void get_capabilities(struct scsi_cd *cd)
                 cd->cdi.mask |= (CDC_CD_R | CDC_CD_RW | CDC_DVD_R |
                                          CDC_DVD | CDC_DVD_RAM |
                                          CDC_SELECT_DISC | CDC_SELECT_SPEED);
-                scsi_release_request(SRpnt);
                 kfree(buffer);
                 printk("%s: scsi-1 drive\n", cd->cdi.name);
                 return;
@@ -885,7 +837,6 @@ static void get_capabilities(struct scsi_cd *cd)
                 cd->device->writeable = 1;
         }
 
-        scsi_release_request(SRpnt);
         kfree(buffer);
 }
 
diff --git a/drivers/scsi/sr.h b/drivers/scsi/sr.h
index 0b317800720..d2bcd99c272 100644
--- a/drivers/scsi/sr.h
+++ b/drivers/scsi/sr.h
@@ -33,7 +33,6 @@ typedef struct scsi_cd {
         struct scsi_device *device;
         unsigned int vendor;    /* vendor code, see sr_vendor.c         */
         unsigned long ms_offset;        /* for reading multisession-CD's        */
-        unsigned needs_sector_size:1;   /* needs to get sector size */
         unsigned use:1;         /* is this device still supportable     */
         unsigned xa_flag:1;     /* CD has XA sectors ? */
         unsigned readcd_known:1;        /* drive supports READ_CD (0xbe) */
diff --git a/drivers/scsi/sr_ioctl.c b/drivers/scsi/sr_ioctl.c
index 82d68fdb154..6e45ac3c43c 100644
--- a/drivers/scsi/sr_ioctl.c
+++ b/drivers/scsi/sr_ioctl.c
@@ -17,7 +17,7 @@
 #include <scsi/scsi_eh.h>
 #include <scsi/scsi_host.h>
 #include <scsi/scsi_ioctl.h>
-#include <scsi/scsi_request.h>
+#include <scsi/scsi_cmnd.h>
 
 #include "sr.h"
 
@@ -84,41 +84,37 @@ static int sr_fake_playtrkind(struct cdrom_device_info *cdi, struct cdrom_ti *ti
 
 int sr_do_ioctl(Scsi_CD *cd, struct packet_command *cgc)
 {
-        struct scsi_request *SRpnt;
         struct scsi_device *SDev;
-        struct request *req;
+        struct scsi_sense_hdr sshdr;
         int result, err = 0, retries = 0;
+        struct request_sense *sense = cgc->sense;
 
         SDev = cd->device;
-        SRpnt = scsi_allocate_request(SDev, GFP_KERNEL);
-        if (!SRpnt) {
-                printk(KERN_ERR "Unable to allocate SCSI request in sr_do_ioctl");
-                err = -ENOMEM;
-                goto out;
-        }
-        SRpnt->sr_data_direction = cgc->data_direction;
+
+        if (!sense) {
+                sense = kmalloc(sizeof(*sense), GFP_KERNEL);
+                if (!sense) {
+                        err = -ENOMEM;
+                        goto out;
+                }
+        }
 
       retry:
         if (!scsi_block_when_processing_errors(SDev)) {
                 err = -ENODEV;
-                goto out_free;
+                goto out;
         }
 
-        scsi_wait_req(SRpnt, cgc->cmd, cgc->buffer, cgc->buflen,
-                      cgc->timeout, IOCTL_RETRIES);
-
-        req = SRpnt->sr_request;
-        if (SRpnt->sr_buffer && req->buffer && SRpnt->sr_buffer != req->buffer) {
-                memcpy(req->buffer, SRpnt->sr_buffer, SRpnt->sr_bufflen);
-                kfree(SRpnt->sr_buffer);
-                SRpnt->sr_buffer = req->buffer;
-        }
+        memset(sense, 0, sizeof(*sense));
+        result = scsi_execute(SDev, cgc->cmd, cgc->data_direction,
+                              cgc->buffer, cgc->buflen, (char *)sense,
+                              cgc->timeout, IOCTL_RETRIES, 0);
 
-        result = SRpnt->sr_result;
+        scsi_normalize_sense((char *)sense, sizeof(*sense), &sshdr);
 
         /* Minimal error checking.  Ignore cases we know about, and report the rest. */
         if (driver_byte(result) != 0) {
-                switch (SRpnt->sr_sense_buffer[2] & 0xf) {
+                switch (sshdr.sense_key) {
                 case UNIT_ATTENTION:
                         SDev->changed = 1;
                         if (!cgc->quiet)
@@ -128,8 +124,8 @@ int sr_do_ioctl(Scsi_CD *cd, struct packet_command *cgc)
                         err = -ENOMEDIUM;
                         break;
                 case NOT_READY: /* This happens if there is no disc in drive */
-                        if (SRpnt->sr_sense_buffer[12] == 0x04 &&
-                            SRpnt->sr_sense_buffer[13] == 0x01) {
+                        if (sshdr.asc == 0x04 &&
+                            sshdr.ascq == 0x01) {
                                 /* sense: Logical unit is in process of becoming ready */
                                 if (!cgc->quiet)
                                         printk(KERN_INFO "%s: CDROM not ready yet.\n", cd->cdi.name);
@@ -146,37 +142,33 @@ int sr_do_ioctl(Scsi_CD *cd, struct packet_command *cgc)
                         if (!cgc->quiet)
                                 printk(KERN_INFO "%s: CDROM not ready.  Make sure there is a disc in the drive.\n", cd->cdi.name);
 #ifdef DEBUG
-                        scsi_print_req_sense("sr", SRpnt);
+                        scsi_print_sense_hdr("sr", &sshdr);
 #endif
                         err = -ENOMEDIUM;
                         break;
                 case ILLEGAL_REQUEST:
                         err = -EIO;
-                        if (SRpnt->sr_sense_buffer[12] == 0x20 &&
-                            SRpnt->sr_sense_buffer[13] == 0x00)
+                        if (sshdr.asc == 0x20 &&
+                            sshdr.ascq == 0x00)
                                 /* sense: Invalid command operation code */
                                 err = -EDRIVE_CANT_DO_THIS;
 #ifdef DEBUG
                         __scsi_print_command(cgc->cmd);
-                        scsi_print_req_sense("sr", SRpnt);
+                        scsi_print_sense_hdr("sr", &sshdr);
 #endif
                         break;
                 default:
                         printk(KERN_ERR "%s: CDROM (ioctl) error, command: ", cd->cdi.name);
                         __scsi_print_command(cgc->cmd);
-                        scsi_print_req_sense("sr", SRpnt);
+                        scsi_print_sense_hdr("sr", &sshdr);
                         err = -EIO;
                 }
         }
 
-        if (cgc->sense)
-                memcpy(cgc->sense, SRpnt->sr_sense_buffer, sizeof(*cgc->sense));
-
         /* Wake up a process waiting for device */
-      out_free:
-        scsi_release_request(SRpnt);
-        SRpnt = NULL;
       out:
+        if (!cgc->sense)
+                kfree(sense);
         cgc->stat = err;
         return err;
 }
diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c
index 0a7839db575..a93308ae973 100644
--- a/drivers/scsi/st.c
+++ b/drivers/scsi/st.c
@@ -17,7 +17,7 @@
    Last modified: 18-JAN-1998 Richard Gooch <rgooch@atnf.csiro.au> Devfs support
  */
 
-static char *verstr = "20050501";
+static char *verstr = "20050830";
 
 #include <linux/module.h>
 
@@ -219,6 +219,12 @@ static int switch_partition(struct scsi_tape *);
 
 static int st_int_ioctl(struct scsi_tape *, unsigned int, unsigned long);
 
+static void scsi_tape_release(struct kref *);
+
+#define to_scsi_tape(obj) container_of(obj, struct scsi_tape, kref)
+
+static DECLARE_MUTEX(st_ref_sem);
+
 
 #include "osst_detect.h"
 #ifndef SIGS_FROM_OSST
@@ -230,6 +236,46 @@ static int st_int_ioctl(struct scsi_tape *, unsigned int, unsigned long);
         {"OnStream", "FW-", "", "osst"}
 #endif
 
+static struct scsi_tape *scsi_tape_get(int dev)
+{
+        struct scsi_tape *STp = NULL;
+
+        down(&st_ref_sem);
+        write_lock(&st_dev_arr_lock);
+
+        if (dev < st_dev_max && scsi_tapes != NULL)
+                STp = scsi_tapes[dev];
+        if (!STp) goto out;
+
+        kref_get(&STp->kref);
+
+        if (!STp->device)
+                goto out_put;
+
+        if (scsi_device_get(STp->device))
+                goto out_put;
+
+        goto out;
+
+out_put:
+        kref_put(&STp->kref, scsi_tape_release);
+        STp = NULL;
+out:
+        write_unlock(&st_dev_arr_lock);
+        up(&st_ref_sem);
+        return STp;
+}
+
+static void scsi_tape_put(struct scsi_tape *STp)
+{
+        struct scsi_device *sdev = STp->device;
+
+        down(&st_ref_sem);
+        kref_put(&STp->kref, scsi_tape_release);
+        scsi_device_put(sdev);
+        up(&st_ref_sem);
+}
+
 struct st_reject_data {
         char *vendor;
         char *model;
@@ -311,7 +357,7 @@ static int st_chk_result(struct scsi_tape *STp, struct scsi_request * SRpnt)
                 return 0;
 
         cmdstatp = &STp->buffer->cmdstat;
-        st_analyze_sense(STp->buffer->last_SRpnt, cmdstatp);
+        st_analyze_sense(SRpnt, cmdstatp);
 
         if (cmdstatp->have_sense)
                 scode = STp->buffer->cmdstat.sense_hdr.sense_key;
@@ -399,10 +445,10 @@ static void st_sleep_done(struct scsi_cmnd * SCpnt)
 
         (STp->buffer)->cmdstat.midlevel_result = SCpnt->result;
         SCpnt->request->rq_status = RQ_SCSI_DONE;
-        (STp->buffer)->last_SRpnt = SCpnt->sc_request;
         DEB( STp->write_pending = 0; )
 
-        complete(SCpnt->request->waiting);
+        if (SCpnt->request->waiting)
+                complete(SCpnt->request->waiting);
 }
 
 /* Do the scsi command. Waits until command performed if do_wait is true.
@@ -412,8 +458,20 @@ static struct scsi_request *
 st_do_scsi(struct scsi_request * SRpnt, struct scsi_tape * STp, unsigned char *cmd,
            int bytes, int direction, int timeout, int retries, int do_wait)
 {
+        struct completion *waiting;
         unsigned char *bp;
 
+        /* if async, make sure there's no command outstanding */
+        if (!do_wait && ((STp->buffer)->last_SRpnt)) {
+                printk(KERN_ERR "%s: Async command already active.\n",
+                       tape_name(STp));
+                if (signal_pending(current))
+                        (STp->buffer)->syscall_result = (-EINTR);
+                else
+                        (STp->buffer)->syscall_result = (-EBUSY);
+                return NULL;
+        }
+
         if (SRpnt == NULL) {
                 SRpnt = scsi_allocate_request(STp->device, GFP_ATOMIC);
                 if (SRpnt == NULL) {
@@ -427,7 +485,13 @@ st_do_scsi(struct scsi_request * SRpnt, struct scsi_tape * STp, unsigned char *c
                 }
         }
 
-        init_completion(&STp->wait);
+        /* If async IO, set last_SRpnt. This ptr tells write_behind_check
+           which IO is outstanding. It's nulled out when the IO completes. */
+        if (!do_wait)
+                (STp->buffer)->last_SRpnt = SRpnt;
+
+        waiting = &STp->wait;
+        init_completion(waiting);
         SRpnt->sr_use_sg = STp->buffer->do_dio || (bytes > (STp->buffer)->frp[0].length);
         if (SRpnt->sr_use_sg) {
                 if (!STp->buffer->do_dio)
@@ -438,17 +502,20 @@ st_do_scsi(struct scsi_request * SRpnt, struct scsi_tape * STp, unsigned char *c
                 bp = (STp->buffer)->b_data;
         SRpnt->sr_data_direction = direction;
         SRpnt->sr_cmd_len = 0;
-        SRpnt->sr_request->waiting = &(STp->wait);
+        SRpnt->sr_request->waiting = waiting;
         SRpnt->sr_request->rq_status = RQ_SCSI_BUSY;
         SRpnt->sr_request->rq_disk = STp->disk;
+        SRpnt->sr_request->end_io = blk_end_sync_rq;
         STp->buffer->cmdstat.have_sense = 0;
 
         scsi_do_req(SRpnt, (void *) cmd, bp, bytes,
                     st_sleep_done, timeout, retries);
 
         if (do_wait) {
-                wait_for_completion(SRpnt->sr_request->waiting);
+                wait_for_completion(waiting);
                 SRpnt->sr_request->waiting = NULL;
+                if (SRpnt->sr_request->rq_status != RQ_SCSI_DONE)
+                        SRpnt->sr_result |= (DRIVER_ERROR << 24);
                 (STp->buffer)->syscall_result = st_chk_result(STp, SRpnt);
         }
         return SRpnt;
@@ -465,6 +532,7 @@ static int write_behind_check(struct scsi_tape * STp)
         struct st_buffer *STbuffer;
         struct st_partstat *STps;
         struct st_cmdstatus *cmdstatp;
+        struct scsi_request *SRpnt;
 
         STbuffer = STp->buffer;
         if (!STbuffer->writing)
@@ -478,10 +546,14 @@ static int write_behind_check(struct scsi_tape * STp)
         ) /* end DEB */
 
         wait_for_completion(&(STp->wait));
-        (STp->buffer)->last_SRpnt->sr_request->waiting = NULL;
+        SRpnt = STbuffer->last_SRpnt;
+        STbuffer->last_SRpnt = NULL;
+        SRpnt->sr_request->waiting = NULL;
+        if (SRpnt->sr_request->rq_status != RQ_SCSI_DONE)
+                SRpnt->sr_result |= (DRIVER_ERROR << 24);
 
-        (STp->buffer)->syscall_result = st_chk_result(STp, (STp->buffer)->last_SRpnt);
-        scsi_release_request((STp->buffer)->last_SRpnt);
+        (STp->buffer)->syscall_result = st_chk_result(STp, SRpnt);
+        scsi_release_request(SRpnt);
 
         STbuffer->buffer_bytes -= STbuffer->writing;
         STps = &(STp->ps[STp->partition]);
@@ -1055,25 +1127,20 @@ static int st_open(struct inode *inode, struct file *filp)
          */
         filp->f_mode &= ~(FMODE_PREAD | FMODE_PWRITE);
 
+        if (!(STp = scsi_tape_get(dev)))
+                return -ENXIO;
+
         write_lock(&st_dev_arr_lock);
-        if (dev >= st_dev_max || scsi_tapes == NULL ||
-            ((STp = scsi_tapes[dev]) == NULL)) {
-                write_unlock(&st_dev_arr_lock);
-                return (-ENXIO);
-        }
         filp->private_data = STp;
         name = tape_name(STp);
 
         if (STp->in_use) {
                 write_unlock(&st_dev_arr_lock);
+                scsi_tape_put(STp);
                 DEB( printk(ST_DEB_MSG "%s: Device already in use.\n", name); )
                 return (-EBUSY);
         }
 
-        if(scsi_device_get(STp->device)) {
-                write_unlock(&st_dev_arr_lock);
-                return (-ENXIO);
-        }
         STp->in_use = 1;
         write_unlock(&st_dev_arr_lock);
         STp->rew_at_close = STp->autorew_dev = (iminor(inode) & 0x80) == 0;
@@ -1118,7 +1185,7 @@ static int st_open(struct inode *inode, struct file *filp)
  err_out:
         normalize_buffer(STp->buffer);
         STp->in_use = 0;
-        scsi_device_put(STp->device);
+        scsi_tape_put(STp);
         return retval;
 
 }
@@ -1250,7 +1317,7 @@ static int st_release(struct inode *inode, struct file *filp)
         write_lock(&st_dev_arr_lock);
         STp->in_use = 0;
         write_unlock(&st_dev_arr_lock);
-        scsi_device_put(STp->device);
+        scsi_tape_put(STp);
 
         return result;
 }
@@ -3887,6 +3954,7 @@ static int st_probe(struct device *dev)
                 goto out_put_disk;
         }
         memset(tpnt, 0, sizeof(struct scsi_tape));
+        kref_init(&tpnt->kref);
         tpnt->disk = disk;
         sprintf(disk->disk_name, "st%d", i);
         disk->private_data = &tpnt->driver;
@@ -3902,6 +3970,7 @@ static int st_probe(struct device *dev)
                 tpnt->tape_type = MT_ISSCSI2;
 
         tpnt->buffer = buffer;
+        tpnt->buffer->last_SRpnt = NULL;
 
         tpnt->inited = 0;
         tpnt->dirty = 0;
@@ -4076,15 +4145,10 @@ static int st_remove(struct device *dev)
                                         tpnt->modes[mode].cdevs[j] = NULL;
                                 }
                         }
-                        tpnt->device = NULL;
 
-                        if (tpnt->buffer) {
-                                tpnt->buffer->orig_frp_segs = 0;
-                                normalize_buffer(tpnt->buffer);
-                                kfree(tpnt->buffer);
-                        }
-                        put_disk(tpnt->disk);
-                        kfree(tpnt);
+                        down(&st_ref_sem);
+                        kref_put(&tpnt->kref, scsi_tape_release);
+                        up(&st_ref_sem);
                         return 0;
                 }
         }
@@ -4093,6 +4157,34 @@ static int st_remove(struct device *dev)
         return 0;
 }
 
+/**
+ *      scsi_tape_release - Called to free the Scsi_Tape structure
+ *      @kref: pointer to embedded kref
+ *
+ *      st_ref_sem must be held entering this routine.  Because it is
+ *      called on last put, you should always use the scsi_tape_get()
+ *      scsi_tape_put() helpers which manipulate the semaphore directly
+ *      and never do a direct kref_put().
+ **/
+static void scsi_tape_release(struct kref *kref)
+{
+        struct scsi_tape *tpnt = to_scsi_tape(kref);
+        struct gendisk *disk = tpnt->disk;
+
+        tpnt->device = NULL;
+
+        if (tpnt->buffer) {
+                tpnt->buffer->orig_frp_segs = 0;
+                normalize_buffer(tpnt->buffer);
+                kfree(tpnt->buffer);
+        }
+
+        disk->private_data = NULL;
+        put_disk(disk);
+        kfree(tpnt);
+        return;
+}
+
 static void st_intr(struct scsi_cmnd *SCpnt)
 {
         scsi_io_completion(SCpnt, (SCpnt->result ? 0: SCpnt->bufflen), 1);
@@ -4348,12 +4440,12 @@ static int st_map_user_pages(struct scatterlist *sgl, const unsigned int max_pag
 static int sgl_map_user_pages(struct scatterlist *sgl, const unsigned int max_pages, 
                               unsigned long uaddr, size_t count, int rw)
 {
+        unsigned long end = (uaddr + count + PAGE_SIZE - 1) >> PAGE_SHIFT;
+        unsigned long start = uaddr >> PAGE_SHIFT;
+        const int nr_pages = end - start;
         int res, i, j;
-        unsigned int nr_pages;
         struct page **pages;
 
-        nr_pages = ((uaddr & ~PAGE_MASK) + count + ~PAGE_MASK) >> PAGE_SHIFT;
-
         /* User attempted Overflow! */
         if ((uaddr + count) < uaddr)
                 return -EINVAL;
diff --git a/drivers/scsi/st.h b/drivers/scsi/st.h
index 061da111398..790acac160b 100644
--- a/drivers/scsi/st.h
+++ b/drivers/scsi/st.h
@@ -3,7 +3,7 @@
 #define _ST_H
 
 #include <linux/completion.h>
-
+#include <linux/kref.h>
 
 /* Descriptor for analyzed sense data */
 struct st_cmdstatus {
@@ -156,6 +156,7 @@ struct scsi_tape {
         unsigned char last_sense[16];
 #endif
         struct gendisk *disk;
+        struct kref     kref;
 };
 
 /* Bit masks for use_pf */
diff --git a/drivers/serial/68328serial.c b/drivers/serial/68328serial.c
index 9097f2f7b12..2efb317153c 100644
--- a/drivers/serial/68328serial.c
+++ b/drivers/serial/68328serial.c
@@ -40,7 +40,6 @@
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/system.h>
-#include <asm/segment.h>
 #include <asm/delay.h>
 #include <asm/uaccess.h>
 
diff --git a/drivers/serial/68360serial.c b/drivers/serial/68360serial.c
index b116122e569..170c9d2a749 100644
--- a/drivers/serial/68360serial.c
+++ b/drivers/serial/68360serial.c
@@ -2474,8 +2474,7 @@ static struct tty_operations rs_360_ops = {
         .tiocmset = rs_360_tiocmset,
 };
 
-/* int __init rs_360_init(void) */
-int rs_360_init(void)
+static int __init rs_360_init(void)
 {
         struct serial_state * state;
         ser_info_t      *info;
@@ -2827,10 +2826,7 @@ int rs_360_init(void)
 
         return 0;
 }
-
-
-
-
+module_init(rs_360_init);
 
 /* This must always be called before the rs_360_init() function, otherwise
  * it blows away the port control information.
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index db8f39c3009..b745a1b9e83 100644
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -308,7 +308,7 @@ config SERIAL_S3C2410_CONSOLE
 
 config SERIAL_DZ
         bool "DECstation DZ serial driver"
-        depends on MACH_DECSTATION && MIPS32
+        depends on MACH_DECSTATION && 32BIT
         select SERIAL_CORE
         help
           DZ11-family serial controllers for VAXstations, including the
diff --git a/drivers/serial/cpm_uart/cpm_uart_core.c b/drivers/serial/cpm_uart/cpm_uart_core.c
index 282b32351d8..25825f2aba2 100644
--- a/drivers/serial/cpm_uart/cpm_uart_core.c
+++ b/drivers/serial/cpm_uart/cpm_uart_core.c
@@ -403,10 +403,8 @@ static int cpm_uart_startup(struct uart_port *port)
 
 inline void cpm_uart_wait_until_send(struct uart_cpm_port *pinfo)
 {
-        unsigned long target_jiffies = jiffies + pinfo->wait_closing;
-
-        while (!time_after(jiffies, target_jiffies))
-                schedule();
+        set_current_state(TASK_UNINTERRUPTIBLE);
+        schedule_timeout(pinfo->wait_closing);
 }
 
 /*
@@ -425,9 +423,12 @@ static void cpm_uart_shutdown(struct uart_port *port)
         /* If the port is not the console, disable Rx and Tx. */
         if (!(pinfo->flags & FLAG_CONSOLE)) {
                 /* Wait for all the BDs marked sent */
-                while(!cpm_uart_tx_empty(port))
+                while(!cpm_uart_tx_empty(port)) {
+                        set_current_state(TASK_UNINTERRUPTIBLE);
                         schedule_timeout(2);
-                if(pinfo->wait_closing)
+                }
+
+                if (pinfo->wait_closing)
                         cpm_uart_wait_until_send(pinfo);
 
                 /* Stop uarts */
diff --git a/drivers/serial/cpm_uart/cpm_uart_cpm2.c b/drivers/serial/cpm_uart/cpm_uart_cpm2.c
index c4c8f4b44f5..15ad58d9488 100644
--- a/drivers/serial/cpm_uart/cpm_uart_cpm2.c
+++ b/drivers/serial/cpm_uart/cpm_uart_cpm2.c
@@ -142,6 +142,14 @@ void scc2_lineif(struct uart_cpm_port *pinfo)
          * be supported in a sane fashion.
          */
 #ifndef CONFIG_STX_GP3
+#ifdef CONFIG_MPC8560_ADS
+        volatile iop_cpm2_t *io = &cpm2_immr->im_ioport;
+        io->iop_ppard |= 0x00000018;
+        io->iop_psord &= ~0x00000008;   /* Rx */
+        io->iop_psord &= ~0x00000010;   /* Tx */
+        io->iop_pdird &= ~0x00000008;   /* Rx */
+        io->iop_pdird |= 0x00000010;    /* Tx */
+#else
         volatile iop_cpm2_t *io = &cpm2_immr->im_ioport;
         io->iop_pparb |= 0x008b0000;
         io->iop_pdirb |= 0x00880000;
@@ -149,6 +157,7 @@ void scc2_lineif(struct uart_cpm_port *pinfo)
         io->iop_pdirb &= ~0x00030000;
         io->iop_psorb &= ~0x00030000;
 #endif
+#endif
         cpm2_immr->im_cpmux.cmx_scr &= 0xff00ffff;
         cpm2_immr->im_cpmux.cmx_scr |= 0x00090000;
         pinfo->brg = 2;
@@ -257,6 +266,7 @@ int cpm_uart_init_portdesc(void)
         cpm_uart_ports[UART_SMC1].smcp = (smc_t *) & cpm2_immr->im_smc[0];
         cpm_uart_ports[UART_SMC1].smcup =
             (smc_uart_t *) & cpm2_immr->im_dprambase[PROFF_SMC1];
+        *(u16 *)(&cpm2_immr->im_dprambase[PROFF_SMC1_BASE]) = PROFF_SMC1;
         cpm_uart_ports[UART_SMC1].port.mapbase =
             (unsigned long)&cpm2_immr->im_smc[0];
         cpm_uart_ports[UART_SMC1].smcp->smc_smcm |= (SMCM_RX | SMCM_TX);
@@ -269,6 +279,7 @@ int cpm_uart_init_portdesc(void)
         cpm_uart_ports[UART_SMC2].smcp = (smc_t *) & cpm2_immr->im_smc[1];
         cpm_uart_ports[UART_SMC2].smcup =
             (smc_uart_t *) & cpm2_immr->im_dprambase[PROFF_SMC2];
+        *(u16 *)(&cpm2_immr->im_dprambase[PROFF_SMC2_BASE]) = PROFF_SMC2;
         cpm_uart_ports[UART_SMC2].port.mapbase =
             (unsigned long)&cpm2_immr->im_smc[1];
         cpm_uart_ports[UART_SMC2].smcp->smc_smcm |= (SMCM_RX | SMCM_TX);
diff --git a/drivers/serial/crisv10.c b/drivers/serial/crisv10.c
index 23b8871e74c..40d3e7139cf 100644
--- a/drivers/serial/crisv10.c
+++ b/drivers/serial/crisv10.c
@@ -446,7 +446,6 @@ static char *serial_version = "$Revision: 1.25 $";
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/system.h>
-#include <asm/segment.h>
 #include <asm/bitops.h>
 #include <linux/delay.h>
 
@@ -5041,17 +5040,3 @@ rs_init(void)
 /* this makes sure that rs_init is called during kernel boot */
 
 module_init(rs_init);
-
-/*
- * register_serial and unregister_serial allows for serial ports to be
- * configured at run-time, to support PCMCIA modems.
- */
-int
-register_serial(struct serial_struct *req)
-{
-        return -1;
-}
-
-void unregister_serial(int line)
-{
-}
diff --git a/drivers/serial/icom.c b/drivers/serial/icom.c
index 79f8df4d66b..eb31125c6a3 100644
--- a/drivers/serial/icom.c
+++ b/drivers/serial/icom.c
@@ -56,7 +56,6 @@
 #include <linux/bitops.h>
 
 #include <asm/system.h>
-#include <asm/segment.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/uaccess.h>
diff --git a/drivers/serial/mcfserial.c b/drivers/serial/mcfserial.c
index 8c40167778d..43b03c55f45 100644
--- a/drivers/serial/mcfserial.c
+++ b/drivers/serial/mcfserial.c
@@ -40,7 +40,6 @@
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/system.h>
-#include <asm/segment.h>
 #include <asm/semaphore.h>
 #include <asm/delay.h>
 #include <asm/coldfire.h>
diff --git a/drivers/serial/pmac_zilog.c b/drivers/serial/pmac_zilog.c
index 5bfde99e245..5ddd8ab1f10 100644
--- a/drivers/serial/pmac_zilog.c
+++ b/drivers/serial/pmac_zilog.c
@@ -1600,7 +1600,7 @@ static int pmz_suspend(struct macio_dev *mdev, pm_message_t pm_state)
                 return 0;
         }
 
-        if (pm_state == mdev->ofdev.dev.power.power_state || pm_state < 2)
+        if (pm_state.event == mdev->ofdev.dev.power.power_state.event)
                 return 0;
 
         pmz_debug("suspend, switching to state %d\n", pm_state);
@@ -1660,7 +1660,7 @@ static int pmz_resume(struct macio_dev *mdev)
         if (uap == NULL)
                 return 0;
 
-        if (mdev->ofdev.dev.power.power_state == 0)
+        if (mdev->ofdev.dev.power.power_state.event == PM_EVENT_ON)
                 return 0;
         
         pmz_debug("resume, switching to state 0\n");
@@ -1713,7 +1713,7 @@ static int pmz_resume(struct macio_dev *mdev)
 
         pmz_debug("resume, switching complete\n");
 
-        mdev->ofdev.dev.power.power_state = 0;
+        mdev->ofdev.dev.power.power_state.event = PM_EVENT_ON;
 
         return 0;
 }
diff --git a/drivers/serial/serial_core.c b/drivers/serial/serial_core.c
index dea156a62d0..2d8622eef70 100644
--- a/drivers/serial/serial_core.c
+++ b/drivers/serial/serial_core.c
@@ -1947,21 +1947,29 @@ int uart_resume_port(struct uart_driver *drv, struct uart_port *port)
 static inline void
 uart_report_port(struct uart_driver *drv, struct uart_port *port)
 {
-        printk("%s%d", drv->dev_name, port->line);
-        printk(" at ");
+        char address[64];
+
         switch (port->iotype) {
         case UPIO_PORT:
-                printk("I/O 0x%x", port->iobase);
+                snprintf(address, sizeof(address),
+                         "I/O 0x%x", port->iobase);
                 break;
         case UPIO_HUB6:
-                printk("I/O 0x%x offset 0x%x", port->iobase, port->hub6);
+                snprintf(address, sizeof(address),
+                         "I/O 0x%x offset 0x%x", port->iobase, port->hub6);
                 break;
         case UPIO_MEM:
         case UPIO_MEM32:
-                printk("MMIO 0x%lx", port->mapbase);
+                snprintf(address, sizeof(address),
+                         "MMIO 0x%lx", port->mapbase);
+                break;
+        default:
+                strlcpy(address, "*unknown*", sizeof(address));
                 break;
         }
-        printk(" (irq = %d) is a %s\n", port->irq, uart_type(port));
+
+        printk(KERN_INFO "%s%d at %s (irq = %d) is a %s\n",
+               drv->dev_name, port->line, address, port->irq, uart_type(port));
 }
 
 static void
diff --git a/drivers/serial/serial_lh7a40x.c b/drivers/serial/serial_lh7a40x.c
index 32f808d157a..8302376800c 100644
--- a/drivers/serial/serial_lh7a40x.c
+++ b/drivers/serial/serial_lh7a40x.c
@@ -207,7 +207,7 @@ static void lh7a40xuart_tx_chars (struct uart_port* port)
                 return;
         }
         if (uart_circ_empty (xmit) || uart_tx_stopped (port)) {
-                lh7a40xuart_stop_tx (port, 0);
+                lh7a40xuart_stop_tx (port);
                 return;
         }
 
@@ -229,7 +229,7 @@ static void lh7a40xuart_tx_chars (struct uart_port* port)
                 uart_write_wakeup (port);
 
         if (uart_circ_empty (xmit))
-                lh7a40xuart_stop_tx (port, 0);
+                lh7a40xuart_stop_tx (port);
 }
 
 static void lh7a40xuart_modem_status (struct uart_port* port)
diff --git a/drivers/serial/sunsu.c b/drivers/serial/sunsu.c
index 0cc879eb1c0..5959e6755a8 100644
--- a/drivers/serial/sunsu.c
+++ b/drivers/serial/sunsu.c
@@ -269,7 +269,10 @@ static void sunsu_stop_tx(struct uart_port *port)
 
         __stop_tx(up);
 
-        if (up->port.type == PORT_16C950 && tty_stop /*FIXME*/) {
+        /*
+         * We really want to stop the transmitter from sending.
+         */
+        if (up->port.type == PORT_16C950) {
                 up->acr |= UART_ACR_TXDIS;
                 serial_icr_write(up, UART_ACR, up->acr);
         }
@@ -283,10 +286,11 @@ static void sunsu_start_tx(struct uart_port *port)
                 up->ier |= UART_IER_THRI;
                 serial_out(up, UART_IER, up->ier);
         }
+
         /*
-         * We only do this from uart_start
+         * Re-enable the transmitter if we disabled it.
          */
-        if (tty_start && up->port.type == PORT_16C950 /*FIXME*/) {
+        if (up->port.type == PORT_16C950 && up->acr & UART_ACR_TXDIS) {
                 up->acr &= ~UART_ACR_TXDIS;
                 serial_icr_write(up, UART_ACR, up->acr);
         }
diff --git a/drivers/usb/atm/usbatm.c b/drivers/usb/atm/usbatm.c
index bb1db195985..c466739428b 100644
--- a/drivers/usb/atm/usbatm.c
+++ b/drivers/usb/atm/usbatm.c
@@ -960,7 +960,7 @@ int usbatm_usb_probe(struct usb_interface *intf, const struct usb_device_id *id,
                         intf->altsetting->desc.bInterfaceNumber);
 
         /* instance init */
-        instance = kcalloc(1, sizeof(*instance) + sizeof(struct urb *) * (num_rcv_urbs + num_snd_urbs), GFP_KERNEL);
+        instance = kzalloc(sizeof(*instance) + sizeof(struct urb *) * (num_rcv_urbs + num_snd_urbs), GFP_KERNEL);
         if (!instance) {
                 dev_dbg(dev, "%s: no memory for instance data!\n", __func__);
                 return -ENOMEM;
diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
index 79422a3b07b..12ecdb03ee5 100644
--- a/drivers/usb/core/hcd.c
+++ b/drivers/usb/core/hcd.c
@@ -782,7 +782,7 @@ static int usb_register_bus(struct usb_bus *bus)
                 return -E2BIG;
         }
 
-        bus->class_dev = class_device_create(usb_host_class, MKDEV(0,0), bus->controller, "usb%d", busnum);
+        bus->class_dev = class_device_create(usb_host_class, MKDEV(0,0), bus->controller, "usb_host%d", busnum);
         if (IS_ERR(bus->class_dev)) {
                 clear_bit(busnum, busmap.busmap);
                 up(&usb_bus_list_lock);
@@ -1669,7 +1669,7 @@ struct usb_hcd *usb_create_hcd (const struct hc_driver *driver,
 {
         struct usb_hcd *hcd;
 
-        hcd = kcalloc(1, sizeof(*hcd) + driver->hcd_priv_size, GFP_KERNEL);
+        hcd = kzalloc(sizeof(*hcd) + driver->hcd_priv_size, GFP_KERNEL);
         if (!hcd) {
                 dev_dbg (dev, "hcd alloc failed\n");
                 return NULL;
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index c3e46d24a37..c9412daff68 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -1570,7 +1570,7 @@ static int __usb_suspend_device (struct usb_device *udev, int port1,
                         struct usb_driver       *driver;
 
                         intf = udev->actconfig->interface[i];
-                        if (state <= intf->dev.power.power_state)
+                        if (state.event <= intf->dev.power.power_state.event)
                                 continue;
                         if (!intf->dev.driver)
                                 continue;
@@ -1578,11 +1578,11 @@ static int __usb_suspend_device (struct usb_device *udev, int port1,
 
                         if (driver->suspend) {
                                 status = driver->suspend(intf, state);
-                                if (intf->dev.power.power_state != state
+                                if (intf->dev.power.power_state.event != state.event
                                                 || status)
                                         dev_err(&intf->dev,
                                                 "suspend %d fail, code %d\n",
-                                                state, status);
+                                                state.event, status);
                         }
 
                         /* only drivers with suspend() can ever resume();
@@ -1595,7 +1595,7 @@ static int __usb_suspend_device (struct usb_device *udev, int port1,
                          * since we know every driver's probe/disconnect works
                          * even for drivers that can't suspend.
                          */
-                        if (!driver->suspend || state > PM_SUSPEND_MEM) {
+                        if (!driver->suspend || state.event > PM_EVENT_FREEZE) {
 #if 1
                                 dev_warn(&intf->dev, "resume is unsafe!\n");
 #else
@@ -1616,7 +1616,7 @@ static int __usb_suspend_device (struct usb_device *udev, int port1,
          * policies (when HNP doesn't apply) once we have mechanisms to
          * turn power back on!  (Likely not before 2.7...)
          */
-        if (state > PM_SUSPEND_MEM) {
+        if (state.event > PM_EVENT_FREEZE) {
                 dev_warn(&udev->dev, "no poweroff yet, suspending instead\n");
         }
 
@@ -1733,7 +1733,7 @@ static int finish_port_resume(struct usb_device *udev)
                         struct usb_driver       *driver;
 
                         intf = udev->actconfig->interface[i];
-                        if (intf->dev.power.power_state == PMSG_ON)
+                        if (intf->dev.power.power_state.event == PM_EVENT_ON)
                                 continue;
                         if (!intf->dev.driver) {
                                 /* FIXME maybe force to alt 0 */
@@ -1747,11 +1747,11 @@ static int finish_port_resume(struct usb_device *udev)
 
                         /* can we do better than just logging errors? */
                         status = driver->resume(intf);
-                        if (intf->dev.power.power_state != PMSG_ON
+                        if (intf->dev.power.power_state.event != PM_EVENT_ON
                                         || status)
                                 dev_dbg(&intf->dev,
                                         "resume fail, state %d code %d\n",
-                                        intf->dev.power.power_state, status);
+                                        intf->dev.power.power_state.event, status);
                 }
                 status = 0;
 
@@ -1934,7 +1934,7 @@ static int hub_resume(struct usb_interface *intf)
         unsigned                port1;
         int                     status;
 
-        if (intf->dev.power.power_state == PM_SUSPEND_ON)
+        if (intf->dev.power.power_state.event == PM_EVENT_ON)
                 return 0;
 
         for (port1 = 1; port1 <= hdev->maxchild; port1++) {
diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c
index 99c85d2f92d..2cddd8a0043 100644
--- a/drivers/usb/core/usb.c
+++ b/drivers/usb/core/usb.c
@@ -1400,7 +1400,7 @@ static int usb_generic_suspend(struct device *dev, pm_message_t message)
         driver = to_usb_driver(dev->driver);
 
         /* there's only one USB suspend state */
-        if (intf->dev.power.power_state)
+        if (intf->dev.power.power_state.event)
                 return 0;
 
         if (driver->suspend)
diff --git a/drivers/usb/host/ehci-dbg.c b/drivers/usb/host/ehci-dbg.c
index b01efb6b36f..65ac9fef3a7 100644
--- a/drivers/usb/host/ehci-dbg.c
+++ b/drivers/usb/host/ehci-dbg.c
@@ -641,7 +641,7 @@ show_registers (struct class_device *class_dev, char *buf)
 
         spin_lock_irqsave (&ehci->lock, flags);
 
-        if (bus->controller->power.power_state) {
+        if (bus->controller->power.power_state.event) {
                 size = scnprintf (next, size,
                         "bus %s, device %s (driver " DRIVER_VERSION ")\n"
                         "%s\n"
diff --git a/drivers/usb/host/ehci-sched.c b/drivers/usb/host/ehci-sched.c
index b56f25864ed..4c972b57c7c 100644
--- a/drivers/usb/host/ehci-sched.c
+++ b/drivers/usb/host/ehci-sched.c
@@ -638,7 +638,7 @@ iso_stream_alloc (unsigned mem_flags)
 {
         struct ehci_iso_stream *stream;
 
-        stream = kcalloc(1, sizeof *stream, mem_flags);
+        stream = kzalloc(sizeof *stream, mem_flags);
         if (likely (stream != NULL)) {
                 INIT_LIST_HEAD(&stream->td_list);
                 INIT_LIST_HEAD(&stream->free_list);
diff --git a/drivers/usb/host/isp116x-hcd.c b/drivers/usb/host/isp116x-hcd.c
index 76cb496c583..75128c37180 100644
--- a/drivers/usb/host/isp116x-hcd.c
+++ b/drivers/usb/host/isp116x-hcd.c
@@ -717,7 +717,7 @@ static int isp116x_urb_enqueue(struct usb_hcd *hcd,
         }
         /* avoid all allocations within spinlocks: request or endpoint */
         if (!hep->hcpriv) {
-                ep = kcalloc(1, sizeof *ep, mem_flags);
+                ep = kzalloc(sizeof *ep, mem_flags);
                 if (!ep)
                         return -ENOMEM;
         }
diff --git a/drivers/usb/host/ohci-dbg.c b/drivers/usb/host/ohci-dbg.c
index c58408c95c3..447f488f5d9 100644
--- a/drivers/usb/host/ohci-dbg.c
+++ b/drivers/usb/host/ohci-dbg.c
@@ -631,7 +631,7 @@ show_registers (struct class_device *class_dev, char *buf)
                 hcd->product_desc,
                 hcd_name);
 
-        if (bus->controller->power.power_state) {
+        if (bus->controller->power.power_state.event) {
                 size -= scnprintf (next, size,
                         "SUSPENDED (no register access)\n");
                 goto done;
diff --git a/drivers/usb/host/sl811-hcd.c b/drivers/usb/host/sl811-hcd.c
index 7a890a65f55..d2a1fd40dfc 100644
--- a/drivers/usb/host/sl811-hcd.c
+++ b/drivers/usb/host/sl811-hcd.c
@@ -835,7 +835,7 @@ static int sl811h_urb_enqueue(
 
         /* avoid all allocations within spinlocks */
         if (!hep->hcpriv)
-                ep = kcalloc(1, sizeof *ep, mem_flags);
+                ep = kzalloc(sizeof *ep, mem_flags);
 
         spin_lock_irqsave(&sl811->lock, flags);
 
@@ -1781,9 +1781,9 @@ sl811h_suspend(struct device *dev, pm_message_t state, u32 phase)
         if (phase != SUSPEND_POWER_DOWN)
                 return retval;
 
-        if (state <= PM_SUSPEND_MEM)
+        if (state.event == PM_EVENT_FREEZE)
                 retval = sl811h_hub_suspend(hcd);
-        else
+        else if (state.event == PM_EVENT_SUSPEND)
                 port_power(sl811, 0);
         if (retval == 0)
                 dev->power.power_state = state;
@@ -1802,7 +1802,7 @@ sl811h_resume(struct device *dev, u32 phase)
         /* 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 > PM_SUSPEND_MEM
+        if (dev->power.power_state.event == PM_EVENT_SUSPEND
                         || !hcd->can_wakeup) {
                 sl811->port1 = 0;
                 port_power(sl811, 1);
diff --git a/drivers/usb/input/acecad.c b/drivers/usb/input/acecad.c
index 13532f3e3ef..74f8760d7c0 100644
--- a/drivers/usb/input/acecad.c
+++ b/drivers/usb/input/acecad.c
@@ -152,7 +152,7 @@ static int usb_acecad_probe(struct usb_interface *intf, const struct usb_device_
         pipe = usb_rcvintpipe(dev, endpoint->bEndpointAddress);
         maxp = usb_maxpacket(dev, pipe, usb_pipeout(pipe));
 
-        acecad = kcalloc(1, sizeof(struct usb_acecad), GFP_KERNEL);
+        acecad = kzalloc(sizeof(struct usb_acecad), GFP_KERNEL);
         if (!acecad)
                 return -ENOMEM;
 
diff --git a/drivers/usb/input/itmtouch.c b/drivers/usb/input/itmtouch.c
index 0dc439f1082..becb87efb86 100644
--- a/drivers/usb/input/itmtouch.c
+++ b/drivers/usb/input/itmtouch.c
@@ -166,7 +166,7 @@ static int itmtouch_probe(struct usb_interface *intf, const struct usb_device_id
         interface = intf->cur_altsetting;
         endpoint = &interface->endpoint[0].desc;
 
-        if (!(itmtouch = kcalloc(1, sizeof(struct itmtouch_dev), GFP_KERNEL))) {
+        if (!(itmtouch = kzalloc(sizeof(struct itmtouch_dev), GFP_KERNEL))) {
                 err("%s - Out of memory.", __FUNCTION__);
                 return -ENOMEM;
         }
diff --git a/drivers/usb/input/pid.c b/drivers/usb/input/pid.c
index 25696386347..acc71ec560e 100644
--- a/drivers/usb/input/pid.c
+++ b/drivers/usb/input/pid.c
@@ -263,7 +263,7 @@ int hid_pid_init(struct hid_device *hid)
         struct hid_ff_pid *private;
         struct hid_input *hidinput = list_entry(&hid->inputs, struct hid_input, list);
 
-        private = hid->ff_private = kcalloc(1, sizeof(struct hid_ff_pid), GFP_KERNEL);
+        private = hid->ff_private = kzalloc(sizeof(struct hid_ff_pid), GFP_KERNEL);
         if (!private)
                 return -ENOMEM;
 
diff --git a/drivers/usb/media/w9968cf.c b/drivers/usb/media/w9968cf.c
index ca9f3a30634..f36c0b6c6e3 100644
--- a/drivers/usb/media/w9968cf.c
+++ b/drivers/usb/media/w9968cf.c
@@ -1523,7 +1523,6 @@ static u32 w9968cf_i2c_func(struct i2c_adapter* adap)
 static int w9968cf_i2c_attach_inform(struct i2c_client* client)
 {
         struct w9968cf_device* cam = i2c_get_adapdata(client->adapter);
-        const char* clientname = i2c_clientname(client);
         int id = client->driver->id, err = 0;
 
         if (id == I2C_DRIVERID_OVCAMCHIP) {
@@ -1535,12 +1534,12 @@ static int w9968cf_i2c_attach_inform(struct i2c_client* client)
                 }
         } else {
                 DBG(4, "Rejected client [%s] with driver [%s]", 
-                    clientname, client->driver->name)
+                    client->name, client->driver->name)
                 return -EINVAL;
         }
 
         DBG(5, "I2C attach client [%s] with driver [%s]",
-            clientname, client->driver->name)
+            client->name, client->driver->name)
 
         return 0;
 }
@@ -1549,12 +1548,11 @@ static int w9968cf_i2c_attach_inform(struct i2c_client* client)
 static int w9968cf_i2c_detach_inform(struct i2c_client* client)
 {
         struct w9968cf_device* cam = i2c_get_adapdata(client->adapter);
-        const char* clientname = i2c_clientname(client);
 
         if (cam->sensor_client == client)
                 cam->sensor_client = NULL;
 
-        DBG(5, "I2C detach client [%s]", clientname)
+        DBG(5, "I2C detach client [%s]", client->name)
 
         return 0;
 }
@@ -1573,15 +1571,13 @@ static int w9968cf_i2c_init(struct w9968cf_device* cam)
         int err = 0;
 
         static struct i2c_algorithm algo = {
-                .name =          "W996[87]CF algorithm",
-                .id =            I2C_ALGO_SMBUS,
                 .smbus_xfer =    w9968cf_i2c_smbus_xfer,
                 .algo_control =  w9968cf_i2c_control,
                 .functionality = w9968cf_i2c_func,
         };
 
         static struct i2c_adapter adap = {
-                .id =                I2C_ALGO_SMBUS | I2C_HW_SMBUS_W9968CF,
+                .id =                I2C_HW_SMBUS_W9968CF,
                 .class =             I2C_CLASS_CAM_DIGITAL,
                 .owner =             THIS_MODULE,
                 .client_register =   w9968cf_i2c_attach_inform,
diff --git a/drivers/usb/misc/usbtest.c b/drivers/usb/misc/usbtest.c
index cda7249a90b..fd7fb98e4b2 100644
--- a/drivers/usb/misc/usbtest.c
+++ b/drivers/usb/misc/usbtest.c
@@ -1533,7 +1533,7 @@ usbtest_ioctl (struct usb_interface *intf, unsigned int code, void *buf)
         if (down_interruptible (&dev->sem))
                 return -ERESTARTSYS;
 
-        if (intf->dev.power.power_state != PMSG_ON) {
+        if (intf->dev.power.power_state.event != PM_EVENT_ON) {
                 up (&dev->sem);
                 return -EHOSTUNREACH;
         }
diff --git a/drivers/video/aty/aty128fb.c b/drivers/video/aty/aty128fb.c
index 7bc1d44d881..b0eba3ac642 100644
--- a/drivers/video/aty/aty128fb.c
+++ b/drivers/video/aty/aty128fb.c
@@ -2323,17 +2323,16 @@ static int aty128_pci_suspend(struct pci_dev *pdev, pm_message_t state)
          * can properly take care of D3 ? Also, with swsusp, we
          * know we'll be rebooted, ...
          */
-#ifdef CONFIG_PPC_PMAC
+#ifndef CONFIG_PPC_PMAC
         /* HACK ALERT ! Once I find a proper way to say to each driver
          * individually what will happen with it's PCI slot, I'll change
          * that. On laptops, the AGP slot is just unclocked, so D2 is
          * expected, while on desktops, the card is powered off
          */
-        if (state >= 3)
-                state = 2;
+        return 0;
 #endif /* CONFIG_PPC_PMAC */
          
-        if (state != 2 || state == pdev->dev.power.power_state)
+        if (state.event == pdev->dev.power.power_state.event)
                 return 0;
 
         printk(KERN_DEBUG "aty128fb: suspending...\n");
@@ -2367,7 +2366,7 @@ static int aty128_pci_suspend(struct pci_dev *pdev, pm_message_t state)
          * used dummy fb ops, 2.5 need proper support for this at the
          * fbdev level
          */
-        if (state == 2)
+        if (state.event != PM_EVENT_ON)
                 aty128_set_suspend(par, 1);
 
         release_console_sem();
@@ -2382,12 +2381,11 @@ static int aty128_do_resume(struct pci_dev *pdev)
         struct fb_info *info = pci_get_drvdata(pdev);
         struct aty128fb_par *par = info->par;
 
-        if (pdev->dev.power.power_state == 0)
+        if (pdev->dev.power.power_state.event == PM_EVENT_ON)
                 return 0;
 
         /* Wakeup chip */
-        if (pdev->dev.power.power_state == 2)
-                aty128_set_suspend(par, 0);
+        aty128_set_suspend(par, 0);
         par->asleep = 0;
 
         /* Restore display & engine */
diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c
index 8c42538dc8c..3e10bd837d9 100644
--- a/drivers/video/aty/atyfb_base.c
+++ b/drivers/video/aty/atyfb_base.c
@@ -2022,17 +2022,16 @@ static int atyfb_pci_suspend(struct pci_dev *pdev, pm_message_t state)
         struct fb_info *info = pci_get_drvdata(pdev);
         struct atyfb_par *par = (struct atyfb_par *) info->par;
 
-#ifdef CONFIG_PPC_PMAC
+#ifndef CONFIG_PPC_PMAC
         /* HACK ALERT ! Once I find a proper way to say to each driver
          * individually what will happen with it's PCI slot, I'll change
          * that. On laptops, the AGP slot is just unclocked, so D2 is
          * expected, while on desktops, the card is powered off
          */
-        if (state >= 3)
-                state = 2;
+        return 0;
 #endif /* CONFIG_PPC_PMAC */
 
-        if (state != 2 || state == pdev->dev.power.power_state)
+        if (state.event == pdev->dev.power.power_state.event)
                 return 0;
 
         acquire_console_sem();
@@ -2071,12 +2070,12 @@ static int atyfb_pci_resume(struct pci_dev *pdev)
         struct fb_info *info = pci_get_drvdata(pdev);
         struct atyfb_par *par = (struct atyfb_par *) info->par;
 
-        if (pdev->dev.power.power_state == 0)
+        if (pdev->dev.power.power_state.event == PM_EVENT_ON)
                 return 0;
 
         acquire_console_sem();
 
-        if (pdev->dev.power.power_state == 2)
+        if (pdev->dev.power.power_state.event == 2)
                 aty_power_mgmt(0, par);
         par->asleep = 0;
 
diff --git a/drivers/video/aty/radeon_i2c.c b/drivers/video/aty/radeon_i2c.c
index 762244164c8..a9d0414e465 100644
--- a/drivers/video/aty/radeon_i2c.c
+++ b/drivers/video/aty/radeon_i2c.c
@@ -75,7 +75,7 @@ static int radeon_setup_i2c_bus(struct radeon_i2c_chan *chan, const char *name)
 
         strcpy(chan->adapter.name, name);
         chan->adapter.owner             = THIS_MODULE;
-        chan->adapter.id                = I2C_ALGO_ATI;
+        chan->adapter.id                = I2C_HW_B_RADEON;
         chan->adapter.algo_data         = &chan->algo;
         chan->adapter.dev.parent        = &chan->rinfo->pdev->dev;
         chan->algo.setsda               = radeon_gpio_setsda;
diff --git a/drivers/video/aty/radeon_pm.c b/drivers/video/aty/radeon_pm.c
index 98352af3932..59a1b6f8506 100644
--- a/drivers/video/aty/radeon_pm.c
+++ b/drivers/video/aty/radeon_pm.c
@@ -2526,18 +2526,18 @@ int radeonfb_pci_suspend(struct pci_dev *pdev, pm_message_t state)
         struct radeonfb_info *rinfo = info->par;
         int i;
 
-        if (state == pdev->dev.power.power_state)
+        if (state.event == pdev->dev.power.power_state.event)
                 return 0;
 
         printk(KERN_DEBUG "radeonfb (%s): suspending to state: %d...\n",
-               pci_name(pdev), state);
+               pci_name(pdev), state.event);
 
         /* For suspend-to-disk, we cheat here. We don't suspend anything and
          * let fbcon continue drawing until we are all set. That shouldn't
          * really cause any problem at this point, provided that the wakeup
          * code knows that any state in memory may not match the HW
          */
-        if (state != PM_SUSPEND_MEM)
+        if (state.event == PM_EVENT_FREEZE)
                 goto done;
 
         acquire_console_sem();
@@ -2616,7 +2616,7 @@ int radeonfb_pci_resume(struct pci_dev *pdev)
         struct radeonfb_info *rinfo = info->par;
         int rc = 0;
 
-        if (pdev->dev.power.power_state == 0)
+        if (pdev->dev.power.power_state.event == PM_EVENT_ON)
                 return 0;
 
         if (rinfo->no_schedule) {
@@ -2626,7 +2626,7 @@ int radeonfb_pci_resume(struct pci_dev *pdev)
                 acquire_console_sem();
 
         printk(KERN_DEBUG "radeonfb (%s): resuming from state: %d...\n",
-               pci_name(pdev), pdev->dev.power.power_state);
+               pci_name(pdev), pdev->dev.power.power_state.event);
 
 
         if (pci_enable_device(pdev)) {
@@ -2637,7 +2637,7 @@ int radeonfb_pci_resume(struct pci_dev *pdev)
         }
         pci_set_master(pdev);
 
-        if (pdev->dev.power.power_state == PM_SUSPEND_MEM) {
+        if (pdev->dev.power.power_state.event == PM_EVENT_SUSPEND) {
                 /* Wakeup chip. Check from config space if we were powered off
                  * (todo: additionally, check CLK_PIN_CNTL too)
                  */
diff --git a/drivers/video/backlight/Makefile b/drivers/video/backlight/Makefile
index 9aae884475b..4af321fae39 100644
--- a/drivers/video/backlight/Makefile
+++ b/drivers/video/backlight/Makefile
@@ -3,3 +3,4 @@
 obj-$(CONFIG_LCD_CLASS_DEVICE)     += lcd.o
 obj-$(CONFIG_BACKLIGHT_CLASS_DEVICE) += backlight.o
 obj-$(CONFIG_BACKLIGHT_CORGI)   += corgi_bl.o
+obj-$(CONFIG_SHARP_LOCOMO)      += locomolcd.o
diff --git a/drivers/video/backlight/locomolcd.c b/drivers/video/backlight/locomolcd.c
new file mode 100644
index 00000000000..ada6e75eb04
--- /dev/null
+++ b/drivers/video/backlight/locomolcd.c
@@ -0,0 +1,157 @@
+/*
+ * Backlight control code for Sharp Zaurus SL-5500
+ *
+ * Copyright 2005 John Lenz <lenz@cs.wisc.edu>
+ * Maintainer: Pavel Machek <pavel@suse.cz> (unless John wants to :-)
+ * GPL v2
+ *
+ * This driver assumes single CPU. That's okay, because collie is
+ * slightly old hardware, and noone is going to retrofit second CPU to
+ * old PDA.
+ */
+
+/* LCD power functions */
+#include <linux/config.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/delay.h>
+#include <linux/device.h>
+#include <linux/interrupt.h>
+
+#include <asm/hardware/locomo.h>
+#include <asm/irq.h>
+
+#ifdef CONFIG_SA1100_COLLIE
+#include <asm/arch/collie.h>
+#else
+#include <asm/arch/poodle.h>
+#endif
+
+extern void (*sa1100fb_lcd_power)(int on);
+
+static struct locomo_dev *locomolcd_dev;
+
+static void locomolcd_on(int comadj)
+{
+        locomo_gpio_set_dir(locomolcd_dev, LOCOMO_GPIO_LCD_VSHA_ON, 0);
+        locomo_gpio_write(locomolcd_dev, LOCOMO_GPIO_LCD_VSHA_ON, 1);
+        mdelay(2);
+
+        locomo_gpio_set_dir(locomolcd_dev, LOCOMO_GPIO_LCD_VSHD_ON, 0);
+        locomo_gpio_write(locomolcd_dev, LOCOMO_GPIO_LCD_VSHD_ON, 1);
+        mdelay(2);
+
+        locomo_m62332_senddata(locomolcd_dev, comadj, 0);
+        mdelay(5);
+
+        locomo_gpio_set_dir(locomolcd_dev, LOCOMO_GPIO_LCD_VEE_ON, 0);
+        locomo_gpio_write(locomolcd_dev, LOCOMO_GPIO_LCD_VEE_ON, 1);
+        mdelay(10);
+
+        /* TFTCRST | CPSOUT=0 | CPSEN */
+        locomo_writel(0x01, locomolcd_dev->mapbase + LOCOMO_TC);
+
+        /* Set CPSD */
+        locomo_writel(6, locomolcd_dev->mapbase + LOCOMO_CPSD);
+
+        /* TFTCRST | CPSOUT=0 | CPSEN */
+        locomo_writel((0x04 | 0x01), locomolcd_dev->mapbase + LOCOMO_TC);
+        mdelay(10);
+
+        locomo_gpio_set_dir(locomolcd_dev, LOCOMO_GPIO_LCD_MOD, 0);
+        locomo_gpio_write(locomolcd_dev, LOCOMO_GPIO_LCD_MOD, 1);
+}
+
+static void locomolcd_off(int comadj)
+{
+        /* TFTCRST=1 | CPSOUT=1 | CPSEN = 0 */
+        locomo_writel(0x06, locomolcd_dev->mapbase + LOCOMO_TC);
+        mdelay(1);
+
+        locomo_gpio_write(locomolcd_dev, LOCOMO_GPIO_LCD_VSHA_ON, 0);
+        mdelay(110);
+
+        locomo_gpio_write(locomolcd_dev, LOCOMO_GPIO_LCD_VEE_ON, 0);
+        mdelay(700);
+
+        /* TFTCRST=0 | CPSOUT=0 | CPSEN = 0 */
+        locomo_writel(0, locomolcd_dev->mapbase + LOCOMO_TC);
+        locomo_gpio_write(locomolcd_dev, LOCOMO_GPIO_LCD_MOD, 0);
+        locomo_gpio_write(locomolcd_dev, LOCOMO_GPIO_LCD_VSHD_ON, 0);
+}
+
+void locomolcd_power(int on)
+{
+        int comadj = 118;
+        unsigned long flags;
+
+        local_irq_save(flags);
+
+        if (!locomolcd_dev) {
+                local_irq_restore(flags);
+                return;
+        }
+
+        /* read comadj */
+#ifdef CONFIG_MACH_POODLE
+        comadj = 118;
+#else
+        comadj = 128;
+#endif
+
+        if (on)
+                locomolcd_on(comadj);
+        else
+                locomolcd_off(comadj);
+
+        local_irq_restore(flags);
+}
+EXPORT_SYMBOL(locomolcd_power);
+
+static int poodle_lcd_probe(struct locomo_dev *dev)
+{
+        unsigned long flags;
+
+        local_irq_save(flags);
+        locomolcd_dev = dev;
+
+        /* the poodle_lcd_power function is called for the first time
+         * from fs_initcall, which is before locomo is activated.
+         * We need to recall poodle_lcd_power here*/
+#ifdef CONFIG_MACH_POODLE
+        locomolcd_power(1);
+#endif
+        local_irq_restore(flags);
+        return 0;
+}
+
+static int poodle_lcd_remove(struct locomo_dev *dev)
+{
+        unsigned long flags;
+        local_irq_save(flags);
+        locomolcd_dev = NULL;
+        local_irq_restore(flags);
+        return 0;
+}
+
+static struct locomo_driver poodle_lcd_driver = {
+        .drv = {
+                .name = "locomo-backlight",
+        },
+        .devid  = LOCOMO_DEVID_BACKLIGHT,
+        .probe  = poodle_lcd_probe,
+        .remove = poodle_lcd_remove,
+};
+
+static int __init poodle_lcd_init(void)
+{
+        int ret = locomo_driver_register(&poodle_lcd_driver);
+        if (ret) return ret;
+
+#ifdef CONFIG_SA1100_COLLIE
+        sa1100fb_lcd_power = locomolcd_power;
+#endif
+        return 0;
+}
+device_initcall(poodle_lcd_init);
+
diff --git a/drivers/video/chipsfb.c b/drivers/video/chipsfb.c
index e75a965ec76..4131243cfdf 100644
--- a/drivers/video/chipsfb.c
+++ b/drivers/video/chipsfb.c
@@ -462,9 +462,9 @@ static int chipsfb_pci_suspend(struct pci_dev *pdev, pm_message_t state)
 {
         struct fb_info *p = pci_get_drvdata(pdev);
 
-        if (state == pdev->dev.power.power_state)
+        if (state.event == pdev->dev.power.power_state.event)
                 return 0;
-        if (state != PM_SUSPEND_MEM)
+        if (state.event != PM_SUSPEND_MEM)
                 goto done;
 
         acquire_console_sem();
diff --git a/drivers/video/i810/i810_main.c b/drivers/video/i810/i810_main.c
index 7513fb9b19c..6db183462b9 100644
--- a/drivers/video/i810/i810_main.c
+++ b/drivers/video/i810/i810_main.c
@@ -1506,12 +1506,12 @@ static int i810fb_suspend(struct pci_dev *dev, pm_message_t state)
         struct i810fb_par *par = (struct i810fb_par *) info->par;
         int blank = 0, prev_state = par->cur_state;
 
-        if (state == prev_state)
+        if (state.event == prev_state)
                 return 0;
 
-        par->cur_state = state;
+        par->cur_state = state.event;
 
-        switch (state) {
+        switch (state.event) {
         case 1:
                 blank = VESA_VSYNC_SUSPEND;
                 break;
diff --git a/drivers/video/matrox/matroxfb_maven.c b/drivers/video/matrox/matroxfb_maven.c
index 67f85344f0c..ad60bbb16cd 100644
--- a/drivers/video/matrox/matroxfb_maven.c
+++ b/drivers/video/matrox/matroxfb_maven.c
@@ -1271,7 +1271,7 @@ ERROR0:;
 }
 
 static int maven_attach_adapter(struct i2c_adapter* adapter) {
-        if (adapter->id == (I2C_ALGO_BIT | I2C_HW_B_G400))
+        if (adapter->id == I2C_HW_B_G400)
                 return i2c_probe(adapter, &addr_data, &maven_detect_client);
         return 0;
 }
diff --git a/drivers/video/nvidia/nv_i2c.c b/drivers/video/nvidia/nv_i2c.c
index 3757c1407c1..1a91bffdda2 100644
--- a/drivers/video/nvidia/nv_i2c.c
+++ b/drivers/video/nvidia/nv_i2c.c
@@ -90,14 +90,13 @@ static int nvidia_gpio_getsda(void *data)
         return val;
 }
 
-#define I2C_ALGO_NVIDIA   0x0e0000
 static int nvidia_setup_i2c_bus(struct nvidia_i2c_chan *chan, const char *name)
 {
         int rc;
 
         strcpy(chan->adapter.name, name);
         chan->adapter.owner = THIS_MODULE;
-        chan->adapter.id = I2C_ALGO_NVIDIA;
+        chan->adapter.id = I2C_HW_B_NVIDIA;
         chan->adapter.algo_data = &chan->algo;
         chan->adapter.dev.parent = &chan->par->pci_dev->dev;
         chan->algo.setsda = nvidia_gpio_setsda;
diff --git a/drivers/video/pmag-aa-fb.c b/drivers/video/pmag-aa-fb.c
index 3e00ad7f2e3..28d1fe5fe34 100644
--- a/drivers/video/pmag-aa-fb.c
+++ b/drivers/video/pmag-aa-fb.c
@@ -413,7 +413,7 @@ static struct fb_ops aafb_ops = {
 
 static int __init init_one(int slot)
 {
-        unsigned long base_addr = get_tc_base_addr(slot);
+        unsigned long base_addr = CKSEG1ADDR(get_tc_base_addr(slot));
         struct aafb_info *ip = &my_fb_info[slot];
 
         memset(ip, 0, sizeof(struct aafb_info));
diff --git a/drivers/video/pmag-ba-fb.c b/drivers/video/pmag-ba-fb.c
index f8095588e99..c98f1c8d7dc 100644
--- a/drivers/video/pmag-ba-fb.c
+++ b/drivers/video/pmag-ba-fb.c
@@ -1,57 +1,55 @@
 /*
- *      linux/drivers/video/pmag-ba-fb.c
+ *      linux/drivers/video/pmag-ba-fb.c
  *
- *      PMAG-BA TurboChannel framebuffer card support ... derived from:
+ *      PMAG-BA TURBOchannel Color Frame Buffer (CFB) card support,
+ *      derived from:
  *      "HP300 Topcat framebuffer support (derived from macfb of all things)
  *      Phil Blundell <philb@gnu.org> 1998", the original code can be
- *      found in the file hpfb.c in the same directory.
+ *      found in the file hpfb.c in the same directory.
  *
  *      Based on digital document:
  *      "PMAG-BA TURBOchannel Color Frame Buffer
  *       Functional Specification", Revision 1.2, August 27, 1990
  *
- *      DECstation related code Copyright (C) 1999, 2000, 2001 by
- *      Michael Engel <engel@unix-ag.org>, 
- *      Karsten Merker <merker@linuxtag.org> and
+ *      DECstation related code Copyright (C) 1999, 2000, 2001 by
+ *      Michael Engel <engel@unix-ag.org>,
+ *      Karsten Merker <merker@linuxtag.org> and
  *      Harald Koerfgen.
- *      This file is subject to the terms and conditions of the GNU General
- *      Public License.  See the file COPYING in the main directory of this
- *      archive for more details.
+ *      Copyright (c) 2005  Maciej W. Rozycki
  *
+ *      This file is subject to the terms and conditions of the GNU General
+ *      Public License.  See the file COPYING in the main directory of this
+ *      archive for more details.
  */
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/sched.h>
+
+#include <linux/compiler.h>
 #include <linux/errno.h>
-#include <linux/string.h>
-#include <linux/timer.h>
-#include <linux/mm.h>
-#include <linux/tty.h>
-#include <linux/slab.h>
-#include <linux/delay.h>
-#include <linux/init.h>
 #include <linux/fb.h>
-#include <asm/bootinfo.h>
-#include <asm/dec/machtype.h>
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/types.h>
+
+#include <asm/bug.h>
+#include <asm/io.h>
+#include <asm/system.h>
+
 #include <asm/dec/tc.h>
+
 #include <video/pmag-ba-fb.h>
 
-struct pmag_ba_ramdac_regs {
-        unsigned char addr_low;
-        unsigned char pad0[3];
-        unsigned char addr_hi;
-        unsigned char pad1[3];
-        unsigned char data;
-        unsigned char pad2[3];
-        unsigned char cmap;
+
+struct pmagbafb_par {
+        struct fb_info *next;
+        volatile void __iomem *mmio;
+        volatile u32 __iomem *dac;
+        int slot;
 };
 
-/*
- * Max 3 TURBOchannel slots -> max 3 PMAG-BA :)
- */
-static struct fb_info pmagba_fb_info[3];
 
-static struct fb_var_screeninfo pmagbafb_defined = {
+static struct fb_info *root_pmagbafb_dev;
+
+static struct fb_var_screeninfo pmagbafb_defined __initdata = {
         .xres           = 1024,
         .yres           = 864,
         .xres_virtual   = 1024,
@@ -61,58 +59,71 @@ static struct fb_var_screeninfo pmagbafb_defined = {
         .green.length   = 8,
         .blue.length    = 8,
         .activate       = FB_ACTIVATE_NOW,
-        .height         = 274,
-        .width          = 195,
-        .accel          = FB_ACCEL_NONE,
+        .height         = -1,
+        .width          = -1,
+        .accel_flags    = FB_ACCEL_NONE,
+        .pixclock       = 14452,
+        .left_margin    = 116,
+        .right_margin   = 12,
+        .upper_margin   = 34,
+        .lower_margin   = 12,
+        .hsync_len      = 128,
+        .vsync_len      = 3,
+        .sync           = FB_SYNC_ON_GREEN,
         .vmode          = FB_VMODE_NONINTERLACED,
 };
 
-static struct fb_fix_screeninfo pmagbafb_fix = {
+static struct fb_fix_screeninfo pmagbafb_fix __initdata = {
         .id             = "PMAG-BA",
-        .smem_len       = (1024 * 864),
+        .smem_len       = (1024 * 1024),
         .type           = FB_TYPE_PACKED_PIXELS,
         .visual         = FB_VISUAL_PSEUDOCOLOR,
         .line_length    = 1024,
+        .mmio_len       = PMAG_BA_SIZE - PMAG_BA_BT459,
 };
 
-/*
- * Turn hardware cursor off
- */
-void pmagbafb_erase_cursor(struct pmag_ba_ramdac_regs *bt459_regs)
+
+static inline void dac_write(struct pmagbafb_par *par, unsigned int reg, u8 v)
 {
-        bt459_regs->addr_low = 0;
-        bt459_regs->addr_hi = 3;
-        bt459_regs->data = 0;
+        writeb(v, par->dac + reg / 4);
 }
 
+static inline u8 dac_read(struct pmagbafb_par *par, unsigned int reg)
+{
+        return readb(par->dac + reg / 4);
+}
+
+
 /*
- * Set the palette. 
+ * Set the palette.
  */
-static int pmagbafb_setcolreg(unsigned regno, unsigned red, unsigned green,
-                              unsigned blue, unsigned transp,
-                              struct fb_info *info)
+static int pmagbafb_setcolreg(unsigned int regno, unsigned int red,
+                              unsigned int green, unsigned int blue,
+                              unsigned int transp, struct fb_info *info)
 {
-        struct pmag_ba_ramdac_regs *bt459_regs = (struct pmag_ba_ramdac_regs *) info->par;
+        struct pmagbafb_par *par = info->par;
 
-        if (regno >= info->cmap.len)
-                return 1;
+        BUG_ON(regno >= info->cmap.len);
 
         red   >>= 8;    /* The cmap fields are 16 bits    */
-        green >>= 8;    /* wide, but the harware colormap */
+        green >>= 8;    /* wide, but the hardware colormap */
         blue  >>= 8;    /* registers are only 8 bits wide */
 
-        bt459_regs->addr_low = (__u8) regno;
-        bt459_regs->addr_hi = 0;
-        bt459_regs->cmap = red;
-        bt459_regs->cmap = green;
-        bt459_regs->cmap = blue;
+        mb();
+        dac_write(par, BT459_ADDR_LO, regno);
+        dac_write(par, BT459_ADDR_HI, 0x00);
+        wmb();
+        dac_write(par, BT459_CMAP, red);
+        wmb();
+        dac_write(par, BT459_CMAP, green);
+        wmb();
+        dac_write(par, BT459_CMAP, blue);
+
         return 0;
 }
 
 static struct fb_ops pmagbafb_ops = {
         .owner          = THIS_MODULE,
-        .fb_get_fix     = gen_get_fix,
-        .fb_get_var     = gen_get_var,
         .fb_setcolreg   = pmagbafb_setcolreg,
         .fb_fillrect    = cfb_fillrect,
         .fb_copyarea    = cfb_copyarea,
@@ -120,63 +131,133 @@ static struct fb_ops pmagbafb_ops = {
         .fb_cursor      = soft_cursor,
 };
 
-int __init pmagbafb_init_one(int slot)
+
+/*
+ * Turn the hardware cursor off.
+ */
+static void __init pmagbafb_erase_cursor(struct fb_info *info)
+{
+        struct pmagbafb_par *par = info->par;
+
+        mb();
+        dac_write(par, BT459_ADDR_LO, 0x00);
+        dac_write(par, BT459_ADDR_HI, 0x03);
+        wmb();
+        dac_write(par, BT459_DATA, 0x00);
+}
+
+
+static int __init pmagbafb_init_one(int slot)
 {
-        unsigned long base_addr = get_tc_base_addr(slot);
-        struct fb_info *info = &pmagba_fb_info[slot]; 
-        struct display *disp = &pmagba_disp[slot];
-
-        printk("PMAG-BA framebuffer in slot %d\n", slot);
-        /*
-         * Framebuffer display memory base address and friends
-         */
-        pmagbafb_fix.smem_start = base_addr + PMAG_BA_ONBOARD_FBMEM_OFFSET;
-        info->par = (base_addr + PMAG_BA_BT459_OFFSET);
-
-        /*
-         * Configure the Bt459 RAM DAC
-         */
-        pmagbafb_erase_cursor((struct pmag_ba_ramdac_regs *) info->par);
-
-        /*
-         *      Let there be consoles..
-         */
+        struct fb_info *info;
+        struct pmagbafb_par *par;
+        unsigned long base_addr;
+
+        info = framebuffer_alloc(sizeof(struct pmagbafb_par), NULL);
+        if (!info)
+                return -ENOMEM;
+
+        par = info->par;
+        par->slot = slot;
+        claim_tc_card(par->slot);
+
+        base_addr = get_tc_base_addr(par->slot);
+
+        par->next = root_pmagbafb_dev;
+        root_pmagbafb_dev = info;
+
+        if (fb_alloc_cmap(&info->cmap, 256, 0) < 0)
+                goto err_alloc;
+
         info->fbops = &pmagbafb_ops;
+        info->fix = pmagbafb_fix;
         info->var = pmagbafb_defined;
-        info->fix = pmagbafb_fix; 
-        info->screen_base = pmagbafb_fix.smem_start;
         info->flags = FBINFO_DEFAULT;
 
-        fb_alloc_cmap(&fb_info.cmap, 256, 0);
+        /* MMIO mapping setup.  */
+        info->fix.mmio_start = base_addr;
+        par->mmio = ioremap_nocache(info->fix.mmio_start, info->fix.mmio_len);
+        if (!par->mmio)
+                goto err_cmap;
+        par->dac = par->mmio + PMAG_BA_BT459;
+
+        /* Frame buffer mapping setup.  */
+        info->fix.smem_start = base_addr + PMAG_BA_FBMEM;
+        info->screen_base = ioremap_nocache(info->fix.smem_start,
+                                            info->fix.smem_len);
+        if (!info->screen_base)
+                goto err_mmio_map;
+        info->screen_size = info->fix.smem_len;
+
+        pmagbafb_erase_cursor(info);
 
         if (register_framebuffer(info) < 0)
-                return 1;
+                goto err_smem_map;
+
+        pr_info("fb%d: %s frame buffer device in slot %d\n",
+                info->node, info->fix.id, par->slot);
+
         return 0;
+
+
+err_smem_map:
+        iounmap(info->screen_base);
+
+err_mmio_map:
+        iounmap(par->mmio);
+
+err_cmap:
+        fb_dealloc_cmap(&info->cmap);
+
+err_alloc:
+        root_pmagbafb_dev = par->next;
+        release_tc_card(par->slot);
+        framebuffer_release(info);
+        return -ENXIO;
 }
 
-/* 
- * Initialise the framebuffer
- */
+static void __exit pmagbafb_exit_one(void)
+{
+        struct fb_info *info = root_pmagbafb_dev;
+        struct pmagbafb_par *par = info->par;
 
-int __init pmagbafb_init(void)
+        unregister_framebuffer(info);
+        iounmap(info->screen_base);
+        iounmap(par->mmio);
+        fb_dealloc_cmap(&info->cmap);
+        root_pmagbafb_dev = par->next;
+        release_tc_card(par->slot);
+        framebuffer_release(info);
+}
+
+
+/*
+ * Initialise the framebuffer.
+ */
+static int __init pmagbafb_init(void)
 {
-        int sid;
-        int found = 0;
+        int count = 0;
+        int slot;
 
         if (fb_get_options("pmagbafb", NULL))
-                return -ENODEV;
-
-        if (TURBOCHANNEL) {
-                while ((sid = search_tc_card("PMAG-BA")) >= 0) {
-                        found = 1;
-                        claim_tc_card(sid);
-                        pmagbafb_init_one(sid);
-                }
-                return found ? 0 : -ENODEV;
-        } else {
-                return -ENODEV;
+                return -ENXIO;
+
+        while ((slot = search_tc_card("PMAG-BA")) >= 0) {
+                if (pmagbafb_init_one(slot) < 0)
+                        break;
+                count++;
         }
+        return (count > 0) ? 0 : -ENXIO;
 }
 
+static void __exit pmagbafb_exit(void)
+{
+        while (root_pmagbafb_dev)
+                pmagbafb_exit_one();
+}
+
+
 module_init(pmagbafb_init);
+module_exit(pmagbafb_exit);
+
 MODULE_LICENSE("GPL");
diff --git a/drivers/video/pmagb-b-fb.c b/drivers/video/pmagb-b-fb.c
index d14eaee91cf..a483b13e117 100644
--- a/drivers/video/pmagb-b-fb.c
+++ b/drivers/video/pmagb-b-fb.c
@@ -1,114 +1,128 @@
 /*
- *      linux/drivers/video/pmagb-b-fb.c
+ *      linux/drivers/video/pmagb-b-fb.c
  *
- *      PMAGB-B TurboChannel framebuffer card support ... derived from:
+ *      PMAGB-B TURBOchannel Smart Frame Buffer (SFB) card support,
+ *      derived from:
  *      "HP300 Topcat framebuffer support (derived from macfb of all things)
  *      Phil Blundell <philb@gnu.org> 1998", the original code can be
- *      found in the file hpfb.c in the same directory.
+ *      found in the file hpfb.c in the same directory.
  *
- *      DECstation related code Copyright (C) 1999, 2000, 2001 by
- *      Michael Engel <engel@unix-ag.org>,
- *      Karsten Merker <merker@linuxtag.org> and 
+ *      DECstation related code Copyright (C) 1999, 2000, 2001 by
+ *      Michael Engel <engel@unix-ag.org>,
+ *      Karsten Merker <merker@linuxtag.org> and
  *      Harald Koerfgen.
- *      This file is subject to the terms and conditions of the GNU General
- *      Public License.  See the file COPYING in the main directory of this
- *      archive for more details.
+ *      Copyright (c) 2005  Maciej W. Rozycki
  *
+ *      This file is subject to the terms and conditions of the GNU General
+ *      Public License.  See the file COPYING in the main directory of this
+ *      archive for more details.
  */
 
-/*
- *      We currently only support the PMAGB-B in high resolution mode
- *      as I know of no way to detect low resolution mode set via jumper.
- *      KM, 2001/01/07
- */
-
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/sched.h>
-#include <linux/errno.h>
-#include <linux/string.h>
-#include <linux/timer.h>
-#include <linux/mm.h>
-#include <linux/tty.h>
-#include <linux/slab.h>
+#include <linux/compiler.h>
 #include <linux/delay.h>
-#include <linux/init.h>
+#include <linux/errno.h>
 #include <linux/fb.h>
-#include <asm/bootinfo.h>
-#include <asm/dec/machtype.h>
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/types.h>
+
+#include <asm/bug.h>
+#include <asm/io.h>
+#include <asm/system.h>
+
 #include <asm/dec/tc.h>
+
 #include <video/pmagb-b-fb.h>
 
-struct pmagb_b_ramdac_regs {
-        unsigned char addr_low;
-        unsigned char pad0[3];
-        unsigned char addr_hi;
-        unsigned char pad1[3];
-        unsigned char data;
-        unsigned char pad2[3];
-        unsigned char cmap;
+
+struct pmagbbfb_par {
+        struct fb_info *next;
+        volatile void __iomem *mmio;
+        volatile void __iomem *smem;
+        volatile u32 __iomem *sfb;
+        volatile u32 __iomem *dac;
+        unsigned int osc0;
+        unsigned int osc1;
+        int slot;
 };
 
-/*
- * Max 3 TURBOchannel slots -> max 3 PMAGB-B :)
- */
-static struct fb_info pmagbb_fb_info[3];
 
-static struct fb_var_screeninfo pmagbbfb_defined = {
-        .xres           = 1280,
-        .yres           = 1024,
-        .xres_virtual   = 1280,
-        .yres_virtual   = 1024,
+static struct fb_info *root_pmagbbfb_dev;
+
+static struct fb_var_screeninfo pmagbbfb_defined __initdata = {
         .bits_per_pixel = 8,
         .red.length     = 8,
         .green.length   = 8,
         .blue.length    = 8,
         .activate       = FB_ACTIVATE_NOW,
-        .height         = 274,
-        .width          = 195,
+        .height         = -1,
+        .width          = -1,
         .accel_flags    = FB_ACCEL_NONE,
+        .sync           = FB_SYNC_ON_GREEN,
         .vmode          = FB_VMODE_NONINTERLACED,
 };
 
-static struct fb_fix_screeninfo pmagbafb_fix = {
+static struct fb_fix_screeninfo pmagbbfb_fix __initdata = {
         .id             = "PMAGB-BA",
-        .smem_len       = (1280 * 1024),
+        .smem_len       = (2048 * 1024),
         .type           = FB_TYPE_PACKED_PIXELS,
         .visual         = FB_VISUAL_PSEUDOCOLOR,
-        .line_length    = 1280,
+        .mmio_len       = PMAGB_B_FBMEM,
+};
+
+
+static inline void sfb_write(struct pmagbbfb_par *par, unsigned int reg, u32 v)
+{
+        writel(v, par->sfb + reg / 4);
 }
 
-/*
- * Turn hardware cursor off
- */
-void pmagbbfb_erase_cursor(struct pmagb_b_ramdac_regs *bt459_regs)
+static inline u32 sfb_read(struct pmagbbfb_par *par, unsigned int reg)
+{
+        return readl(par->sfb + reg / 4);
+}
+
+static inline void dac_write(struct pmagbbfb_par *par, unsigned int reg, u8 v)
 {
-        bt459_regs->addr_low = 0;
-        bt459_regs->addr_hi = 3;
-        bt459_regs->data = 0;
+        writeb(v, par->dac + reg / 4);
 }
 
+static inline u8 dac_read(struct pmagbbfb_par *par, unsigned int reg)
+{
+        return readb(par->dac + reg / 4);
+}
+
+static inline void gp0_write(struct pmagbbfb_par *par, u32 v)
+{
+        writel(v, par->mmio + PMAGB_B_GP0);
+}
+
+
 /*
- * Set the palette. 
+ * Set the palette.
  */
-static int pmagbbfb_setcolreg(unsigned regno, unsigned red, unsigned green,
-                              unsigned blue, unsigned transp,
-                              struct fb_info *info)
+static int pmagbbfb_setcolreg(unsigned int regno, unsigned int red,
+                              unsigned int green, unsigned int blue,
+                              unsigned int transp, struct fb_info *info)
 {
-        struct pmagb_b_ramdac_regs *bt459_regs = (struct pmagb_b_ramdac_regs *) info->par;
-        
-        if (regno >= info->cmap.len)
-                return 1;
+        struct pmagbbfb_par *par = info->par;
+
+        BUG_ON(regno >= info->cmap.len);
 
         red   >>= 8;    /* The cmap fields are 16 bits    */
-        green >>= 8;    /* wide, but the harware colormap */
+        green >>= 8;    /* wide, but the hardware colormap */
         blue  >>= 8;    /* registers are only 8 bits wide */
 
-        bt459_regs->addr_low = (__u8) regno;
-        bt459_regs->addr_hi = 0;
-        bt459_regs->cmap = red;
-        bt459_regs->cmap = green;
-        bt459_regs->cmap = blue;
+        mb();
+        dac_write(par, BT459_ADDR_LO, regno);
+        dac_write(par, BT459_ADDR_HI, 0x00);
+        wmb();
+        dac_write(par, BT459_CMAP, red);
+        wmb();
+        dac_write(par, BT459_CMAP, green);
+        wmb();
+        dac_write(par, BT459_CMAP, blue);
+
         return 0;
 }
 
@@ -121,62 +135,247 @@ static struct fb_ops pmagbbfb_ops = {
         .fb_cursor      = soft_cursor,
 };
 
-int __init pmagbbfb_init_one(int slot)
+
+/*
+ * Turn the hardware cursor off.
+ */
+static void __init pmagbbfb_erase_cursor(struct fb_info *info)
+{
+        struct pmagbbfb_par *par = info->par;
+
+        mb();
+        dac_write(par, BT459_ADDR_LO, 0x00);
+        dac_write(par, BT459_ADDR_HI, 0x03);
+        wmb();
+        dac_write(par, BT459_DATA, 0x00);
+}
+
+/*
+ * Set up screen parameters.
+ */
+static void __init pmagbbfb_screen_setup(struct fb_info *info)
+{
+        struct pmagbbfb_par *par = info->par;
+
+        info->var.xres = ((sfb_read(par, SFB_REG_VID_HOR) >>
+                           SFB_VID_HOR_PIX_SHIFT) & SFB_VID_HOR_PIX_MASK) * 4;
+        info->var.xres_virtual = info->var.xres;
+        info->var.yres = (sfb_read(par, SFB_REG_VID_VER) >>
+                          SFB_VID_VER_SL_SHIFT) & SFB_VID_VER_SL_MASK;
+        info->var.yres_virtual = info->var.yres;
+        info->var.left_margin = ((sfb_read(par, SFB_REG_VID_HOR) >>
+                                  SFB_VID_HOR_BP_SHIFT) &
+                                 SFB_VID_HOR_BP_MASK) * 4;
+        info->var.right_margin = ((sfb_read(par, SFB_REG_VID_HOR) >>
+                                   SFB_VID_HOR_FP_SHIFT) &
+                                  SFB_VID_HOR_FP_MASK) * 4;
+        info->var.upper_margin = (sfb_read(par, SFB_REG_VID_VER) >>
+                                  SFB_VID_VER_BP_SHIFT) & SFB_VID_VER_BP_MASK;
+        info->var.lower_margin = (sfb_read(par, SFB_REG_VID_VER) >>
+                                  SFB_VID_VER_FP_SHIFT) & SFB_VID_VER_FP_MASK;
+        info->var.hsync_len = ((sfb_read(par, SFB_REG_VID_HOR) >>
+                                SFB_VID_HOR_SYN_SHIFT) &
+                               SFB_VID_HOR_SYN_MASK) * 4;
+        info->var.vsync_len = (sfb_read(par, SFB_REG_VID_VER) >>
+                               SFB_VID_VER_SYN_SHIFT) & SFB_VID_VER_SYN_MASK;
+
+        info->fix.line_length = info->var.xres;
+};
+
+/*
+ * Determine oscillator configuration.
+ */
+static void __init pmagbbfb_osc_setup(struct fb_info *info)
 {
-        unsigned long base_addr = get_tc_base_addr(slot);
-        struct fb_info *info = &pmagbb_fb_info[slot];
-
-        printk("PMAGB-BA framebuffer in slot %d\n", slot);
-        /*
-         * Framebuffer display memory base address and friends
-         */
-        pmagbbfb_fix.smem_start = base_addr + PMAGB_B_ONBOARD_FBMEM_OFFSET;
-        info->par = (base_addr + PMAGB_B_BT459_OFFSET); 
-        
-        /*
-         * Configure the Bt459 RAM DAC
-         */
-        pmagbbfb_erase_cursor((struct pmagb_b_ramdac_regs *) info->par);
-
-        /*
-         *      Let there be consoles..
-         */
+        static unsigned int pmagbbfb_freqs[] __initdata = {
+                130808, 119843, 104000, 92980, 74367, 72800,
+                69197, 66000, 65000, 50350, 36000, 32000, 25175
+        };
+        struct pmagbbfb_par *par = info->par;
+        u32 count0 = 8, count1 = 8, counttc = 16 * 256 + 8;
+        u32 freq0, freq1, freqtc = get_tc_speed() / 250;
+        int i, j;
+
+        gp0_write(par, 0);                              /* select Osc0 */
+        for (j = 0; j < 16; j++) {
+                mb();
+                sfb_write(par, SFB_REG_TCCLK_COUNT, 0);
+                mb();
+                for (i = 0; i < 100; i++) {     /* nominally max. 20.5us */
+                        if (sfb_read(par, SFB_REG_TCCLK_COUNT) == 0)
+                                break;
+                        udelay(1);
+                }
+                count0 += sfb_read(par, SFB_REG_VIDCLK_COUNT);
+        }
+
+        gp0_write(par, 1);                              /* select Osc1 */
+        for (j = 0; j < 16; j++) {
+                mb();
+                sfb_write(par, SFB_REG_TCCLK_COUNT, 0);
+
+                for (i = 0; i < 100; i++) {     /* nominally max. 20.5us */
+                        if (sfb_read(par, SFB_REG_TCCLK_COUNT) == 0)
+                                break;
+                        udelay(1);
+                }
+                count1 += sfb_read(par, SFB_REG_VIDCLK_COUNT);
+        }
+
+        freq0 = (freqtc * count0 + counttc / 2) / counttc;
+        par->osc0 = freq0;
+        if (freq0 >= pmagbbfb_freqs[0] - (pmagbbfb_freqs[0] + 32) / 64 &&
+            freq0 <= pmagbbfb_freqs[0] + (pmagbbfb_freqs[0] + 32) / 64)
+                par->osc0 = pmagbbfb_freqs[0];
+
+        freq1 = (par->osc0 * count1 + count0 / 2) / count0;
+        par->osc1 = freq1;
+        for (i = 0; i < sizeof(pmagbbfb_freqs) / sizeof(*pmagbbfb_freqs); i++)
+                if (freq1 >= pmagbbfb_freqs[i] -
+                             (pmagbbfb_freqs[i] + 128) / 256 &&
+                    freq1 <= pmagbbfb_freqs[i] +
+                             (pmagbbfb_freqs[i] + 128) / 256) {
+                        par->osc1 = pmagbbfb_freqs[i];
+                        break;
+                }
+
+        if (par->osc0 - par->osc1 <= (par->osc0 + par->osc1 + 256) / 512 ||
+            par->osc1 - par->osc0 <= (par->osc0 + par->osc1 + 256) / 512)
+                par->osc1 = 0;
+
+        gp0_write(par, par->osc1 != 0);                 /* reselect OscX */
+
+        info->var.pixclock = par->osc1 ?
+                             (1000000000 + par->osc1 / 2) / par->osc1 :
+                             (1000000000 + par->osc0 / 2) / par->osc0;
+};
+
+
+static int __init pmagbbfb_init_one(int slot)
+{
+        char freq0[12], freq1[12];
+        struct fb_info *info;
+        struct pmagbbfb_par *par;
+        unsigned long base_addr;
+        u32 vid_base;
+
+        info = framebuffer_alloc(sizeof(struct pmagbbfb_par), NULL);
+        if (!info)
+                return -ENOMEM;
+
+        par = info->par;
+        par->slot = slot;
+        claim_tc_card(par->slot);
+
+        base_addr = get_tc_base_addr(par->slot);
+
+        par->next = root_pmagbbfb_dev;
+        root_pmagbbfb_dev = info;
+
+        if (fb_alloc_cmap(&info->cmap, 256, 0) < 0)
+                goto err_alloc;
+
         info->fbops = &pmagbbfb_ops;
-        info->var = pmagbbfb_defined;
         info->fix = pmagbbfb_fix;
-        info->screen_base = pmagbbfb_fix.smem_start; 
+        info->var = pmagbbfb_defined;
         info->flags = FBINFO_DEFAULT;
 
-        fb_alloc_cmap(&fb_info.cmap, 256, 0);
+        /* MMIO mapping setup.  */
+        info->fix.mmio_start = base_addr;
+        par->mmio = ioremap_nocache(info->fix.mmio_start, info->fix.mmio_len);
+        if (!par->mmio)
+                goto err_cmap;
+        par->sfb = par->mmio + PMAGB_B_SFB;
+        par->dac = par->mmio + PMAGB_B_BT459;
+
+        /* Frame buffer mapping setup.  */
+        info->fix.smem_start = base_addr + PMAGB_B_FBMEM;
+        par->smem = ioremap_nocache(info->fix.smem_start, info->fix.smem_len);
+        if (!par->smem)
+                goto err_mmio_map;
+        vid_base = sfb_read(par, SFB_REG_VID_BASE);
+        info->screen_base = (void __iomem *)par->smem + vid_base * 0x1000;
+        info->screen_size = info->fix.smem_len - 2 * vid_base * 0x1000;
+
+        pmagbbfb_erase_cursor(info);
+        pmagbbfb_screen_setup(info);
+        pmagbbfb_osc_setup(info);
 
         if (register_framebuffer(info) < 0)
-                return 1;
+                goto err_smem_map;
+
+        snprintf(freq0, sizeof(freq0), "%u.%03uMHz",
+                 par->osc0 / 1000, par->osc0 % 1000);
+        snprintf(freq1, sizeof(freq1), "%u.%03uMHz",
+                 par->osc1 / 1000, par->osc1 % 1000);
+
+        pr_info("fb%d: %s frame buffer device in slot %d\n",
+                info->node, info->fix.id, par->slot);
+        pr_info("fb%d: Osc0: %s, Osc1: %s, Osc%u selected\n",
+                info->node, freq0, par->osc1 ? freq1 : "disabled",
+                par->osc1 != 0);
+
         return 0;
+
+
+err_smem_map:
+        iounmap(par->smem);
+
+err_mmio_map:
+        iounmap(par->mmio);
+
+err_cmap:
+        fb_dealloc_cmap(&info->cmap);
+
+err_alloc:
+        root_pmagbbfb_dev = par->next;
+        release_tc_card(par->slot);
+        framebuffer_release(info);
+        return -ENXIO;
 }
 
-/* 
- * Initialise the framebuffer
- */
+static void __exit pmagbbfb_exit_one(void)
+{
+        struct fb_info *info = root_pmagbbfb_dev;
+        struct pmagbbfb_par *par = info->par;
+
+        unregister_framebuffer(info);
+        iounmap(par->smem);
+        iounmap(par->mmio);
+        fb_dealloc_cmap(&info->cmap);
+        root_pmagbbfb_dev = par->next;
+        release_tc_card(par->slot);
+        framebuffer_release(info);
+}
 
-int __init pmagbbfb_init(void)
+
+/*
+ * Initialise the framebuffer.
+ */
+static int __init pmagbbfb_init(void)
 {
-        int sid;
-        int found = 0;
+        int count = 0;
+        int slot;
 
         if (fb_get_options("pmagbbfb", NULL))
-                return -ENODEV;
+                return -ENXIO;
 
-        if (TURBOCHANNEL) {
-                while ((sid = search_tc_card("PMAGB-BA")) >= 0) {
-                        found = 1;
-                        claim_tc_card(sid);
-                        pmagbbfb_init_one(sid);
-                }
-                return found ? 0 : -ENODEV;
-        } else {
-                return -ENODEV;
+        while ((slot = search_tc_card("PMAGB-BA")) >= 0) {
+                if (pmagbbfb_init_one(slot) < 0)
+                        break;
+                count++;
         }
+        return (count > 0) ? 0 : -ENXIO;
+}
+
+static void __exit pmagbbfb_exit(void)
+{
+        while (root_pmagbbfb_dev)
+                pmagbbfb_exit_one();
 }
 
+
 module_init(pmagbbfb_init);
+module_exit(pmagbbfb_exit);
+
 MODULE_LICENSE("GPL");
diff --git a/drivers/video/q40fb.c b/drivers/video/q40fb.c
index 71b69da0c40..162012bb926 100644
--- a/drivers/video/q40fb.c
+++ b/drivers/video/q40fb.c
@@ -21,7 +21,6 @@
 
 #include <asm/uaccess.h>
 #include <asm/setup.h>
-#include <asm/segment.h>
 #include <asm/system.h>
 #include <asm/q40_master.h>
 #include <linux/fb.h>
diff --git a/drivers/video/riva/rivafb-i2c.c b/drivers/video/riva/rivafb-i2c.c
index da1334dfd51..77151d8e076 100644
--- a/drivers/video/riva/rivafb-i2c.c
+++ b/drivers/video/riva/rivafb-i2c.c
@@ -92,14 +92,13 @@ static int riva_gpio_getsda(void* data)
         return val;
 }
 
-#define I2C_ALGO_RIVA   0x0e0000
 static int riva_setup_i2c_bus(struct riva_i2c_chan *chan, const char *name)
 {
         int rc;
 
         strcpy(chan->adapter.name, name);
         chan->adapter.owner             = THIS_MODULE;
-        chan->adapter.id                = I2C_ALGO_RIVA;
+        chan->adapter.id                = I2C_HW_B_RIVA;
         chan->adapter.algo_data         = &chan->algo;
         chan->adapter.dev.parent        = &chan->par->pdev->dev;
         chan->algo.setsda               = riva_gpio_setsda;
diff --git a/drivers/video/s1d13xxxfb.c b/drivers/video/s1d13xxxfb.c
index 3848be2b9d2..fa98d91c42e 100644
--- a/drivers/video/s1d13xxxfb.c
+++ b/drivers/video/s1d13xxxfb.c
@@ -655,7 +655,7 @@ bail:
 }
 
 #ifdef CONFIG_PM
-static int s1d13xxxfb_suspend(struct device *dev, u32 state, u32 level)
+static int s1d13xxxfb_suspend(struct device *dev, pm_message_t state, u32 level)
 {
         struct fb_info *info = dev_get_drvdata(dev);
         struct s1d13xxxfb_par *s1dfb = info->par;
diff --git a/drivers/video/savage/savagefb-i2c.c b/drivers/video/savage/savagefb-i2c.c
index 024a0cecff1..847698b5cfe 100644
--- a/drivers/video/savage/savagefb-i2c.c
+++ b/drivers/video/savage/savagefb-i2c.c
@@ -137,7 +137,6 @@ static int prosavage_gpio_getsda(void* data)
         return (0 != (GET_CR_DATA(chan->ioaddr) & PROSAVAGE_I2C_SDA_IN));
 }
 
-#define I2C_ALGO_SAVAGE   0x0f0000
 static int savage_setup_i2c_bus(struct savagefb_i2c_chan *chan,
                                 const char *name)
 {
@@ -147,7 +146,7 @@ static int savage_setup_i2c_bus(struct savagefb_i2c_chan *chan,
         if (add_bus && chan->par) {
                 strcpy(chan->adapter.name, name);
                 chan->adapter.owner             = THIS_MODULE;
-                chan->adapter.id                = I2C_ALGO_SAVAGE;
+                chan->adapter.id                = I2C_HW_B_SAVAGE;
                 chan->adapter.algo_data         = &chan->algo;
                 chan->adapter.dev.parent        = &chan->par->pcidev->dev;
                 chan->algo.udelay               = 40;
diff --git a/drivers/video/savage/savagefb_driver.c b/drivers/video/savage/savagefb_driver.c
index f4633d1891f..117ad42f120 100644
--- a/drivers/video/savage/savagefb_driver.c
+++ b/drivers/video/savage/savagefb_driver.c
@@ -2110,7 +2110,6 @@ static int savagefb_suspend (struct pci_dev* dev, pm_message_t state)
         struct savagefb_par *par = (struct savagefb_par *)info->par;
 
         DBG("savagefb_suspend");
-        printk(KERN_DEBUG "state: %u\n", state);
 
         acquire_console_sem();
         fb_set_suspend(info, pci_choose_state(dev, state));
diff --git a/drivers/video/w100fb.c b/drivers/video/w100fb.c
index adcda697ea6..0030c071da8 100644
--- a/drivers/video/w100fb.c
+++ b/drivers/video/w100fb.c
@@ -5,9 +5,15 @@
  *
  * Copyright (C) 2002, ATI Corp.
  * Copyright (C) 2004-2005 Richard Purdie
+ * Copyright (c) 2005 Ian Molton
  *
  * Rewritten for 2.6 by Richard Purdie <rpurdie@rpsys.net>
  *
+ * Generic platform support by Ian Molton <spyro@f2s.com>
+ * and Richard Purdie <rpurdie@rpsys.net>
+ *
+ * w32xx support by Ian Molton
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
@@ -21,7 +27,7 @@
 #include <linux/mm.h>
 #include <linux/device.h>
 #include <linux/string.h>
-#include <linux/proc_fs.h>
+#include <linux/vmalloc.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>
 #include <video/w100fb.h>
@@ -30,114 +36,78 @@
 /*
  * Prototypes
  */
-static void w100fb_save_buffer(void);
-static void w100fb_clear_buffer(void);
-static void w100fb_restore_buffer(void);
-static void w100fb_clear_screen(u32 mode, long int offset);
-static void w100_resume(void);
 static void w100_suspend(u32 mode);
-static void w100_init_qvga_rotation(u16 deg);
-static void w100_init_vga_rotation(u16 deg);
 static void w100_vsync(void);
-static void w100_init_sharp_lcd(u32 mode);
-static void w100_pwm_setup(void);
-static void w100_InitExtMem(u32 mode);
-static void w100_hw_init(void);
-static u16 w100_set_fastsysclk(u16 Freq);
-
-static void lcdtg_hw_init(u32 mode);
-static void lcdtg_lcd_change(u32 mode);
-static void lcdtg_resume(void);
-static void lcdtg_suspend(void);
-
-
-/* Register offsets & lengths */
-#define REMAPPED_FB_LEN   0x15ffff
-
-#define BITS_PER_PIXEL    16
+static void w100_hw_init(struct w100fb_par*);
+static void w100_pwm_setup(struct w100fb_par*);
+static void w100_init_clocks(struct w100fb_par*);
+static void w100_setup_memory(struct w100fb_par*);
+static void w100_init_lcd(struct w100fb_par*);
+static void w100_set_dispregs(struct w100fb_par*);
+static void w100_update_enable(void);
+static void w100_update_disable(void);
+static void calc_hsync(struct w100fb_par *par);
+struct w100_pll_info *w100_get_xtal_table(unsigned int freq);
 
 /* Pseudo palette size */
 #define MAX_PALETTES      16
 
-/* for resolution change */
-#define LCD_MODE_INIT (-1)
-#define LCD_MODE_480    0
-#define LCD_MODE_320    1
-#define LCD_MODE_240    2
-#define LCD_MODE_640    3
-
-#define LCD_SHARP_QVGA 0
-#define LCD_SHARP_VGA  1
-
-#define LCD_MODE_PORTRAIT       0
-#define LCD_MODE_LANDSCAPE      1
-
 #define W100_SUSPEND_EXTMEM 0
 #define W100_SUSPEND_ALL    1
 
-/* General frame buffer data structures */
-struct w100fb_par {
-        u32 xres;
-        u32 yres;
-        int fastsysclk_mode;
-        int lcdMode;
-        int rotation_flag;
-        int blanking_flag;
-        int comadj;
-        int phadadj;
-};
-
-static struct w100fb_par *current_par;
+#define BITS_PER_PIXEL    16
 
 /* Remapped addresses for base cfg, memmapped regs and the frame buffer itself */
 static void *remapped_base;
 static void *remapped_regs;
 static void *remapped_fbuf;
 
-/* External Function */
-static void(*w100fb_ssp_send)(u8 adrs, u8 data);
+#define REMAPPED_FB_LEN   0x15ffff
+
+/* This is the offset in the w100's address space we map the current
+   framebuffer memory to. We use the position of external memory as
+   we can remap internal memory to there if external isn't present. */
+#define W100_FB_BASE MEM_EXT_BASE_VALUE
+
 
 /*
  * Sysfs functions
  */
-
-static ssize_t rotation_show(struct device *dev, struct device_attribute *attr, char *buf)
+static ssize_t flip_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct fb_info *info = dev_get_drvdata(dev);
         struct w100fb_par *par=info->par;
 
-        return sprintf(buf, "%d\n",par->rotation_flag);
+        return sprintf(buf, "%d\n",par->flip);
 }
 
-static ssize_t rotation_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
+static ssize_t flip_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
-        unsigned int rotate;
+        unsigned int flip;
         struct fb_info *info = dev_get_drvdata(dev);
         struct w100fb_par *par=info->par;
 
-        rotate = simple_strtoul(buf, NULL, 10);
+        flip = simple_strtoul(buf, NULL, 10);
+
+        if (flip > 0)
+                par->flip = 1;
+        else
+                par->flip = 0;
 
-        if (rotate > 0) par->rotation_flag = 1;
-        else par->rotation_flag = 0;
+        w100_update_disable();
+        w100_set_dispregs(par);
+        w100_update_enable();
 
-        if (par->lcdMode == LCD_MODE_320)
-                w100_init_qvga_rotation(par->rotation_flag ? 270 : 90);
-        else if (par->lcdMode == LCD_MODE_240)
-                w100_init_qvga_rotation(par->rotation_flag ? 180 : 0);
-        else if (par->lcdMode == LCD_MODE_640)
-                w100_init_vga_rotation(par->rotation_flag ? 270 : 90);
-        else if (par->lcdMode == LCD_MODE_480)
-                w100_init_vga_rotation(par->rotation_flag ? 180 : 0);
+        calc_hsync(par);
 
         return count;
 }
 
-static DEVICE_ATTR(rotation, 0644, rotation_show, rotation_store);
+static DEVICE_ATTR(flip, 0644, flip_show, flip_store);
 
 static ssize_t w100fb_reg_read(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
-        unsigned long param;
-        unsigned long regs;
+        unsigned long regs, param;
         regs = simple_strtoul(buf, NULL, 16);
         param = readl(remapped_regs + regs);
         printk("Read Register 0x%08lX: 0x%08lX\n", regs, param);
@@ -148,8 +118,7 @@ static DEVICE_ATTR(reg_read, 0200, NULL, w100fb_reg_read);
 
 static ssize_t w100fb_reg_write(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
-        unsigned long regs;
-        unsigned long param;
+        unsigned long regs, param;
         sscanf(buf, "%lx %lx", &regs, &param);
 
         if (regs <= 0x2000) {
@@ -163,54 +132,56 @@ static ssize_t w100fb_reg_write(struct device *dev, struct device_attribute *att
 static DEVICE_ATTR(reg_write, 0200, NULL, w100fb_reg_write);
 
 
-static ssize_t fastsysclk_show(struct device *dev, struct device_attribute *attr, char *buf)
+static ssize_t fastpllclk_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct fb_info *info = dev_get_drvdata(dev);
         struct w100fb_par *par=info->par;
 
-        return sprintf(buf, "%d\n",par->fastsysclk_mode);
+        return sprintf(buf, "%d\n",par->fastpll_mode);
 }
 
-static ssize_t fastsysclk_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
+static ssize_t fastpllclk_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
-        int param;
         struct fb_info *info = dev_get_drvdata(dev);
         struct w100fb_par *par=info->par;
 
-        param = simple_strtoul(buf, NULL, 10);
-
-        if (param == 75) {
-                printk("Set fastsysclk %d\n", param);
-                par->fastsysclk_mode = param;
-                w100_set_fastsysclk(par->fastsysclk_mode);
-        } else if (param == 100) {
-                printk("Set fastsysclk %d\n", param);
-                par->fastsysclk_mode = param;
-                w100_set_fastsysclk(par->fastsysclk_mode);
+        if (simple_strtoul(buf, NULL, 10) > 0) {
+                par->fastpll_mode=1;
+                printk("w100fb: Using fast system clock (if possible)\n");
+        } else {
+                par->fastpll_mode=0;
+                printk("w100fb: Using normal system clock\n");
         }
+
+        w100_init_clocks(par);
+        calc_hsync(par);
+
         return count;
 }
 
-static DEVICE_ATTR(fastsysclk, 0644, fastsysclk_show, fastsysclk_store);
+static DEVICE_ATTR(fastpllclk, 0644, fastpllclk_show, fastpllclk_store);
 
 /*
- * The touchscreen on this device needs certain information
- * from the video driver to function correctly. We export it here.
+ * Some touchscreens need hsync information from the video driver to
+ * function correctly. We export it here.
  */
-int w100fb_get_xres(void) {
-        return current_par->xres;
-}
+unsigned long w100fb_get_hsynclen(struct device *dev)
+{
+        struct fb_info *info = dev_get_drvdata(dev);
+        struct w100fb_par *par=info->par;
 
-int w100fb_get_blanking(void) {
-        return current_par->blanking_flag;
+        /* If display is blanked/suspended, hsync isn't active */
+        if (par->blanked)
+                return 0;
+        else
+                return par->hsync_len;
 }
+EXPORT_SYMBOL(w100fb_get_hsynclen);
 
-int w100fb_get_fastsysclk(void) {
-        return current_par->fastsysclk_mode;
+static void w100fb_clear_screen(struct w100fb_par *par)
+{
+        memset_io(remapped_fbuf + (W100_FB_BASE-MEM_WINDOW_BASE), 0, (par->xres * par->yres * BITS_PER_PIXEL/8));
 }
-EXPORT_SYMBOL(w100fb_get_xres);
-EXPORT_SYMBOL(w100fb_get_blanking);
-EXPORT_SYMBOL(w100fb_get_fastsysclk);
 
 
 /*
@@ -234,7 +205,6 @@ static int w100fb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
          * according to the RGB bitfield information.
          */
         if (regno < MAX_PALETTES) {
-
                 u32 *pal = info->pseudo_palette;
 
                 val = (red & 0xf800) | ((green & 0xfc00) >> 5) | ((blue & 0xf800) >> 11);
@@ -250,115 +220,90 @@ static int w100fb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
  */
 static int w100fb_blank(int blank_mode, struct fb_info *info)
 {
-        struct w100fb_par *par;
-        par=info->par;
+        struct w100fb_par *par = info->par;
+        struct w100_tg_info *tg = par->mach->tg;
 
         switch(blank_mode) {
 
-        case FB_BLANK_NORMAL: /* Normal blanking */
-        case FB_BLANK_VSYNC_SUSPEND: /* VESA blank (vsync off) */
-        case FB_BLANK_HSYNC_SUSPEND: /* VESA blank (hsync off) */
-        case FB_BLANK_POWERDOWN: /* Poweroff */
-                if (par->blanking_flag == 0) {
-                        w100fb_save_buffer();
-                        lcdtg_suspend();
-                        par->blanking_flag = 1;
+        case FB_BLANK_NORMAL:         /* Normal blanking */
+        case FB_BLANK_VSYNC_SUSPEND:  /* VESA blank (vsync off) */
+        case FB_BLANK_HSYNC_SUSPEND:  /* VESA blank (hsync off) */
+        case FB_BLANK_POWERDOWN:      /* Poweroff */
+                if (par->blanked == 0) {
+                        if(tg && tg->suspend)
+                                tg->suspend(par);
+                        par->blanked = 1;
                 }
                 break;
 
         case FB_BLANK_UNBLANK: /* Unblanking */
-                if (par->blanking_flag != 0) {
-                        w100fb_restore_buffer();
-                        lcdtg_resume();
-                        par->blanking_flag = 0;
+                if (par->blanked != 0) {
+                        if(tg && tg->resume)
+                                tg->resume(par);
+                        par->blanked = 0;
                 }
                 break;
         }
         return 0;
 }
 
+
 /*
  *  Change the resolution by calling the appropriate hardware functions
  */
-static void w100fb_changeres(int rotate_mode, u32 mode)
+static void w100fb_activate_var(struct w100fb_par *par)
 {
-        u16 rotation=0;
-
-        switch(rotate_mode) {
-        case LCD_MODE_LANDSCAPE:
-                rotation=(current_par->rotation_flag ? 270 : 90);
-                break;
-        case LCD_MODE_PORTRAIT:
-                rotation=(current_par->rotation_flag ? 180 : 0);
-                break;
-        }
+        struct w100_tg_info *tg = par->mach->tg;
 
-        w100_pwm_setup();
-        switch(mode) {
-        case LCD_SHARP_QVGA:
-                w100_vsync();
-                w100_suspend(W100_SUSPEND_EXTMEM);
-                w100_init_sharp_lcd(LCD_SHARP_QVGA);
-                w100_init_qvga_rotation(rotation);
-                w100_InitExtMem(LCD_SHARP_QVGA);
-                w100fb_clear_screen(LCD_SHARP_QVGA, 0);
-                lcdtg_lcd_change(LCD_SHARP_QVGA);
-                break;
-        case LCD_SHARP_VGA:
-                w100fb_clear_screen(LCD_SHARP_QVGA, 0);
-                writel(0xBFFFA000, remapped_regs + mmMC_EXT_MEM_LOCATION);
-                w100_InitExtMem(LCD_SHARP_VGA);
-                w100fb_clear_screen(LCD_SHARP_VGA, 0x200000);
-                w100_vsync();
-                w100_init_sharp_lcd(LCD_SHARP_VGA);
-                if (rotation != 0)
-                        w100_init_vga_rotation(rotation);
-                lcdtg_lcd_change(LCD_SHARP_VGA);
-                break;
-        }
+        w100_pwm_setup(par);
+        w100_setup_memory(par);
+        w100_init_clocks(par);
+        w100fb_clear_screen(par);
+        w100_vsync();
+
+        w100_update_disable();
+        w100_init_lcd(par);
+        w100_set_dispregs(par);
+        w100_update_enable();
+
+        calc_hsync(par);
+
+        if (!par->blanked && tg && tg->change)
+                tg->change(par);
 }
 
-/*
- * Set up the display for the fb subsystem
+
+/* Select the smallest mode that allows the desired resolution to be
+ * displayed. If desired, the x and y parameters can be rounded up to
+ * match the selected mode.
  */
-static void w100fb_activate_var(struct fb_info *info)
+static struct w100_mode *w100fb_get_mode(struct w100fb_par *par, unsigned int *x, unsigned int *y, int saveval)
 {
-        u32 temp32;
-        struct w100fb_par *par=info->par;
-        struct fb_var_screeninfo *var = &info->var;
+        struct w100_mode *mode = NULL;
+        struct w100_mode *modelist = par->mach->modelist;
+        unsigned int best_x = 0xffffffff, best_y = 0xffffffff;
+        unsigned int i;
+
+        for (i = 0 ; i < par->mach->num_modes ; i++) {
+                if (modelist[i].xres >= *x && modelist[i].yres >= *y &&
+                                modelist[i].xres < best_x && modelist[i].yres < best_y) {
+                        best_x = modelist[i].xres;
+                        best_y = modelist[i].yres;
+                        mode = &modelist[i];
+                } else if(modelist[i].xres >= *y && modelist[i].yres >= *x &&
+                        modelist[i].xres < best_y && modelist[i].yres < best_x) {
+                        best_x = modelist[i].yres;
+                        best_y = modelist[i].xres;
+                        mode = &modelist[i];
+                }
+        }
 
-        /* Set the hardware to 565 */
-        temp32 = readl(remapped_regs + mmDISP_DEBUG2);
-        temp32 &= 0xff7fffff;
-        temp32 |= 0x00800000;
-        writel(temp32, remapped_regs + mmDISP_DEBUG2);
+        if (mode && saveval) {
+                *x = best_x;
+                *y = best_y;
+        }
 
-        if (par->lcdMode == LCD_MODE_INIT) {
-                w100_init_sharp_lcd(LCD_SHARP_VGA);
-                w100_init_vga_rotation(par->rotation_flag ? 270 : 90);
-                par->lcdMode = LCD_MODE_640;
-                lcdtg_hw_init(LCD_SHARP_VGA);
-        } else if (var->xres == 320 && var->yres == 240) {
-                if (par->lcdMode != LCD_MODE_320) {
-                        w100fb_changeres(LCD_MODE_LANDSCAPE, LCD_SHARP_QVGA);
-                        par->lcdMode = LCD_MODE_320;
-                }
-        } else if (var->xres == 240 && var->yres == 320) {
-                if (par->lcdMode != LCD_MODE_240) {
-                        w100fb_changeres(LCD_MODE_PORTRAIT, LCD_SHARP_QVGA);
-                        par->lcdMode = LCD_MODE_240;
-                }
-        } else if (var->xres == 640 && var->yres == 480) {
-                if (par->lcdMode != LCD_MODE_640) {
-                        w100fb_changeres(LCD_MODE_LANDSCAPE, LCD_SHARP_VGA);
-                        par->lcdMode = LCD_MODE_640;
-                }
-        } else if (var->xres == 480 && var->yres == 640) {
-                if (par->lcdMode != LCD_MODE_480) {
-                        w100fb_changeres(LCD_MODE_PORTRAIT, LCD_SHARP_VGA);
-                        par->lcdMode = LCD_MODE_480;
-                }
-        } else printk(KERN_ERR "W100FB: Resolution error!\n");
+        return mode;
 }
 
 
@@ -366,31 +311,19 @@ static void w100fb_activate_var(struct fb_info *info)
  *  w100fb_check_var():
  *  Get the video params out of 'var'. If a value doesn't fit, round it up,
  *  if it's too big, return -EINVAL.
- *
  */
 static int w100fb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
 {
-        if (var->xres < var->yres) { /* Portrait mode */
-                if ((var->xres > 480) || (var->yres > 640)) {
-                        return -EINVAL;
-                } else if ((var->xres > 240) || (var->yres > 320)) {
-                        var->xres = 480;
-                        var->yres = 640;
-                } else {
-                        var->xres = 240;
-                        var->yres = 320;
-                }
-        } else { /* Landscape mode */
-                if ((var->xres > 640) || (var->yres > 480)) {
-                        return -EINVAL;
-                } else if ((var->xres > 320) || (var->yres > 240)) {
-                        var->xres = 640;
-                        var->yres = 480;
-                } else {
-                        var->xres = 320;
-                        var->yres = 240;
-                }
-        }
+        struct w100fb_par *par=info->par;
+
+        if(!w100fb_get_mode(par, &var->xres, &var->yres, 1))
+                return -EINVAL;
+
+        if (par->mach->mem && ((var->xres*var->yres*BITS_PER_PIXEL/8) > (par->mach->mem->size+1)))
+                return -EINVAL;
+
+        if (!par->mach->mem && ((var->xres*var->yres*BITS_PER_PIXEL/8) > (MEM_INT_SIZE+1)))
+                return -EINVAL;
 
         var->xres_virtual = max(var->xres_virtual, var->xres);
         var->yres_virtual = max(var->yres_virtual, var->yres);
@@ -409,13 +342,11 @@ static int w100fb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
         var->transp.offset = var->transp.length = 0;
 
         var->nonstd = 0;
-
         var->height = -1;
         var->width = -1;
         var->vmode = FB_VMODE_NONINTERLACED;
-
         var->sync = 0;
-        var->pixclock = 0x04;   /* 171521; */
+        var->pixclock = 0x04;  /* 171521; */
 
         return 0;
 }
@@ -430,274 +361,286 @@ static int w100fb_set_par(struct fb_info *info)
 {
         struct w100fb_par *par=info->par;
 
-        par->xres = info->var.xres;
-        par->yres = info->var.yres;
-
-        info->fix.visual = FB_VISUAL_TRUECOLOR;
-
-        info->fix.ypanstep = 0;
-        info->fix.ywrapstep = 0;
+        if (par->xres != info->var.xres || par->yres != info->var.yres) {
+                par->xres = info->var.xres;
+                par->yres = info->var.yres;
+                par->mode = w100fb_get_mode(par, &par->xres, &par->yres, 0);
 
-        if (par->blanking_flag)
-                w100fb_clear_buffer();
+                info->fix.visual = FB_VISUAL_TRUECOLOR;
+                info->fix.ypanstep = 0;
+                info->fix.ywrapstep = 0;
+                info->fix.line_length = par->xres * BITS_PER_PIXEL / 8;
 
-        w100fb_activate_var(info);
+                if ((par->xres*par->yres*BITS_PER_PIXEL/8) > (MEM_INT_SIZE+1)) {
+                        par->extmem_active = 1;
+                        info->fix.smem_len = par->mach->mem->size+1;
+                } else {
+                        par->extmem_active = 0;
+                        info->fix.smem_len = MEM_INT_SIZE+1;
+                }
 
-        if (par->lcdMode == LCD_MODE_480) {
-                info->fix.line_length = (480 * BITS_PER_PIXEL) / 8;
-                info->fix.smem_len = 0x200000;
-        } else if (par->lcdMode == LCD_MODE_320) {
-                info->fix.line_length = (320 * BITS_PER_PIXEL) / 8;
-                info->fix.smem_len = 0x60000;
-        } else if (par->lcdMode == LCD_MODE_240) {
-                info->fix.line_length = (240 * BITS_PER_PIXEL) / 8;
-                info->fix.smem_len = 0x60000;
-        } else if (par->lcdMode == LCD_MODE_INIT || par->lcdMode == LCD_MODE_640) {
-                info->fix.line_length = (640 * BITS_PER_PIXEL) / 8;
-                info->fix.smem_len = 0x200000;
+                w100fb_activate_var(par);
         }
-
         return 0;
 }
 
 
 /*
- *      Frame buffer operations
+ *  Frame buffer operations
  */
 static struct fb_ops w100fb_ops = {
-        .owner = THIS_MODULE,
+        .owner        = THIS_MODULE,
         .fb_check_var = w100fb_check_var,
-        .fb_set_par = w100fb_set_par,
+        .fb_set_par   = w100fb_set_par,
         .fb_setcolreg = w100fb_setcolreg,
-        .fb_blank = w100fb_blank,
-        .fb_fillrect = cfb_fillrect,
-        .fb_copyarea = cfb_copyarea,
+        .fb_blank     = w100fb_blank,
+        .fb_fillrect  = cfb_fillrect,
+        .fb_copyarea  = cfb_copyarea,
         .fb_imageblit = cfb_imageblit,
-        .fb_cursor = soft_cursor,
+        .fb_cursor    = soft_cursor,
 };
 
-
-static void w100fb_clear_screen(u32 mode, long int offset)
+#ifdef CONFIG_PM
+static void w100fb_save_vidmem(struct w100fb_par *par)
 {
-        int i, numPix = 0;
-
-        if (mode == LCD_SHARP_VGA)
-                numPix = 640 * 480;
-        else if (mode == LCD_SHARP_QVGA)
-                numPix = 320 * 240;
+        int memsize;
 
-        for (i = 0; i < numPix; i++)
-                writew(0xffff, remapped_fbuf + offset + (2*i));
-}
-
-
-/* Need to split up the buffers to stay within the limits of kmalloc */
-#define W100_BUF_NUM    6
-static uint32_t *gSaveImagePtr[W100_BUF_NUM] = { NULL };
-
-static void w100fb_save_buffer(void)
-{
-        int i, j, bufsize;
-
-        bufsize=(current_par->xres * current_par->yres * BITS_PER_PIXEL / 8) / W100_BUF_NUM;
-        for (i = 0; i < W100_BUF_NUM; i++) {
-                if (gSaveImagePtr[i] == NULL)
-                        gSaveImagePtr[i] = kmalloc(bufsize, GFP_KERNEL);
-                if (gSaveImagePtr[i] == NULL) {
-                        w100fb_clear_buffer();
-                        printk(KERN_WARNING "can't alloc pre-off image buffer %d\n", i);
-                        break;
-                }
-                for (j = 0; j < bufsize/4; j++)
-                        *(gSaveImagePtr[i] + j) = readl(remapped_fbuf + (bufsize*i) + j*4);
+        if (par->extmem_active) {
+                memsize=par->mach->mem->size;
+                par->saved_extmem = vmalloc(memsize);
+                if (par->saved_extmem)
+                        memcpy_fromio(par->saved_extmem, remapped_fbuf + (W100_FB_BASE-MEM_WINDOW_BASE), memsize);
         }
+        memsize=MEM_INT_SIZE;
+        par->saved_intmem = vmalloc(memsize);
+        if (par->saved_intmem && par->extmem_active)
+                memcpy_fromio(par->saved_intmem, remapped_fbuf + (W100_FB_BASE-MEM_INT_BASE_VALUE), memsize);
+        else if (par->saved_intmem)
+                memcpy_fromio(par->saved_intmem, remapped_fbuf + (W100_FB_BASE-MEM_WINDOW_BASE), memsize);
 }
 
-
-static void w100fb_restore_buffer(void)
+static void w100fb_restore_vidmem(struct w100fb_par *par)
 {
-        int i, j, bufsize;
+        int memsize;
 
-        bufsize=(current_par->xres * current_par->yres * BITS_PER_PIXEL / 8) / W100_BUF_NUM;
-        for (i = 0; i < W100_BUF_NUM; i++) {
-                if (gSaveImagePtr[i] == NULL) {
-                        printk(KERN_WARNING "can't find pre-off image buffer %d\n", i);
-                        w100fb_clear_buffer();
-                        break;
-                }
-                for (j = 0; j < (bufsize/4); j++)
-                        writel(*(gSaveImagePtr[i] + j),remapped_fbuf + (bufsize*i) + (j*4));
-                kfree(gSaveImagePtr[i]);
-                gSaveImagePtr[i] = NULL;
+        if (par->extmem_active && par->saved_extmem) {
+                memsize=par->mach->mem->size;
+                memcpy_toio(remapped_fbuf + (W100_FB_BASE-MEM_WINDOW_BASE), par->saved_extmem, memsize);
+                vfree(par->saved_extmem);
         }
-}
-
-
-static void w100fb_clear_buffer(void)
-{
-        int i;
-        for (i = 0; i < W100_BUF_NUM; i++) {
-                kfree(gSaveImagePtr[i]);
-                gSaveImagePtr[i] = NULL;
+        if (par->saved_intmem) {
+                memsize=MEM_INT_SIZE;
+                if (par->extmem_active)
+                        memcpy_toio(remapped_fbuf + (W100_FB_BASE-MEM_INT_BASE_VALUE), par->saved_intmem, memsize);
+                else
+                        memcpy_toio(remapped_fbuf + (W100_FB_BASE-MEM_WINDOW_BASE), par->saved_intmem, memsize);
+                vfree(par->saved_intmem);
         }
 }
 
-
-#ifdef CONFIG_PM
-static int w100fb_suspend(struct device *dev, pm_message_t state, u32 level)
+static int w100fb_suspend(struct device *dev, pm_message_t state, uint32_t level)
 {
         if (level == SUSPEND_POWER_DOWN) {
                 struct fb_info *info = dev_get_drvdata(dev);
                 struct w100fb_par *par=info->par;
+                struct w100_tg_info *tg = par->mach->tg;
 
-                w100fb_save_buffer();
-                lcdtg_suspend();
+                w100fb_save_vidmem(par);
+                if(tg && tg->suspend)
+                        tg->suspend(par);
                 w100_suspend(W100_SUSPEND_ALL);
-                par->blanking_flag = 1;
+                par->blanked = 1;
         }
         return 0;
 }
 
-static int w100fb_resume(struct device *dev, u32 level)
+static int w100fb_resume(struct device *dev, uint32_t level)
 {
         if (level == RESUME_POWER_ON) {
                 struct fb_info *info = dev_get_drvdata(dev);
                 struct w100fb_par *par=info->par;
-
-                w100_resume();
-                w100fb_restore_buffer();
-                lcdtg_resume();
-                par->blanking_flag = 0;
+                struct w100_tg_info *tg = par->mach->tg;
+
+                w100_hw_init(par);
+                w100fb_activate_var(par);
+                w100fb_restore_vidmem(par);
+                if(tg && tg->resume)
+                        tg->resume(par);
+                par->blanked = 0;
         }
         return 0;
 }
 #else
-#define w100fb_suspend  NULL
-#define w100fb_resume   NULL
+#define w100fb_suspend  NULL
+#define w100fb_resume   NULL
 #endif
 
 
 int __init w100fb_probe(struct device *dev)
 {
+        int err = -EIO;
         struct w100fb_mach_info *inf;
-        struct fb_info *info;
+        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;
 
         if (!mem)
                 return -EINVAL;
 
-        /* remap the areas we're going to use */
+        /* Remap the chip base address */
         remapped_base = ioremap_nocache(mem->start+W100_CFG_BASE, W100_CFG_LEN);
         if (remapped_base == NULL)
-                return -EIO;
+                goto out;
 
+        /* Map the register space */
         remapped_regs = ioremap_nocache(mem->start+W100_REG_BASE, W100_REG_LEN);
-        if (remapped_regs == NULL) {
-                iounmap(remapped_base);
-                return -EIO;
+        if (remapped_regs == NULL)
+                goto out;
+
+        /* Identify the chip */
+        printk("Found ");
+        chip_id = readl(remapped_regs + mmCHIP_ID);
+        switch(chip_id) {
+                case CHIP_ID_W100:  printk("w100");  break;
+                case CHIP_ID_W3200: printk("w3200"); break;
+                case CHIP_ID_W3220: printk("w3220"); break;
+                default:
+                        printk("Unknown imageon chip ID\n");
+                        err = -ENODEV;
+                        goto out;
         }
+        printk(" at 0x%08lx.\n", mem->start+W100_CFG_BASE);
 
-        remapped_fbuf = ioremap_nocache(mem->start+MEM_EXT_BASE_VALUE, REMAPPED_FB_LEN);
-        if (remapped_fbuf == NULL) {
-                iounmap(remapped_base);
-                iounmap(remapped_regs);
-                return -EIO;
-        }
+        /* Remap the framebuffer */
+        remapped_fbuf = ioremap_nocache(mem->start+MEM_WINDOW_BASE, MEM_WINDOW_SIZE);
+        if (remapped_fbuf == NULL)
+                goto out;
 
         info=framebuffer_alloc(sizeof(struct w100fb_par), dev);
         if (!info) {
-                iounmap(remapped_base);
-                iounmap(remapped_regs);
-                iounmap(remapped_fbuf);
-                return -ENOMEM;
+                err = -ENOMEM;
+                goto out;
         }
 
-        info->device=dev;
         par = info->par;
-        current_par=info->par;
         dev_set_drvdata(dev, info);
 
         inf = dev->platform_data;
-        par->phadadj = inf->phadadj;
-        par->comadj = inf->comadj;
-        par->fastsysclk_mode = 75;
-        par->lcdMode = LCD_MODE_INIT;
-        par->rotation_flag=0;
-        par->blanking_flag=0;
-        w100fb_ssp_send = inf->w100fb_ssp_send;
-
-        w100_hw_init();
-        w100_pwm_setup();
+        par->chip_id = chip_id;
+        par->mach = inf;
+        par->fastpll_mode = 0;
+        par->blanked = 0;
+
+        par->pll_table=w100_get_xtal_table(inf->xtal_freq);
+        if (!par->pll_table) {
+                printk(KERN_ERR "No matching Xtal definition found\n");
+                err = -EINVAL;
+                goto out;
+        }
 
         info->pseudo_palette = kmalloc(sizeof (u32) * MAX_PALETTES, GFP_KERNEL);
         if (!info->pseudo_palette) {
-                iounmap(remapped_base);
-                iounmap(remapped_regs);
-                iounmap(remapped_fbuf);
-                return -ENOMEM;
+                err = -ENOMEM;
+                goto out;
         }
 
         info->fbops = &w100fb_ops;
         info->flags = FBINFO_DEFAULT;
         info->node = -1;
-        info->screen_base = remapped_fbuf;
+        info->screen_base = remapped_fbuf + (W100_FB_BASE-MEM_WINDOW_BASE);
         info->screen_size = REMAPPED_FB_LEN;
 
-        info->var.xres = 640;
+        strcpy(info->fix.id, "w100fb");
+        info->fix.type = FB_TYPE_PACKED_PIXELS;
+        info->fix.type_aux = 0;
+        info->fix.accel = FB_ACCEL_NONE;
+        info->fix.smem_start = mem->start+W100_FB_BASE;
+        info->fix.mmio_start = mem->start+W100_REG_BASE;
+        info->fix.mmio_len = W100_REG_LEN;
+
+        if (fb_alloc_cmap(&info->cmap, 256, 0) < 0) {
+                err = -ENOMEM;
+                goto out;
+        }
+
+        par->mode = &inf->modelist[0];
+        if(inf->init_mode & INIT_MODE_ROTATED) {
+                info->var.xres = par->mode->yres;
+                info->var.yres = par->mode->xres;
+        }
+        else {
+                info->var.xres = par->mode->xres;
+                info->var.yres = par->mode->yres;
+        }
+
+        if(inf->init_mode &= INIT_MODE_FLIPPED)
+                par->flip = 1;
+        else
+                par->flip = 0;
+
         info->var.xres_virtual = info->var.xres;
-        info->var.yres = 480;
         info->var.yres_virtual = info->var.yres;
-        info->var.pixclock = 0x04;      /* 171521; */
+        info->var.pixclock = 0x04;  /* 171521; */
         info->var.sync = 0;
         info->var.grayscale = 0;
         info->var.xoffset = info->var.yoffset = 0;
         info->var.accel_flags = 0;
         info->var.activate = FB_ACTIVATE_NOW;
 
-        strcpy(info->fix.id, "w100fb");
-        info->fix.type = FB_TYPE_PACKED_PIXELS;
-        info->fix.type_aux = 0;
-        info->fix.accel = FB_ACCEL_NONE;
-        info->fix.smem_start = mem->start+MEM_EXT_BASE_VALUE;
-        info->fix.mmio_start = mem->start+W100_REG_BASE;
-        info->fix.mmio_len = W100_REG_LEN;
+        w100_hw_init(par);
+
+        if (w100fb_check_var(&info->var, info) < 0) {
+                err = -EINVAL;
+                goto out;
+        }
 
-        w100fb_check_var(&info->var, info);
         w100fb_set_par(info);
 
         if (register_framebuffer(info) < 0) {
-                kfree(info->pseudo_palette);
-                iounmap(remapped_base);
-                iounmap(remapped_regs);
-                iounmap(remapped_fbuf);
-                return -EINVAL;
+                err = -EINVAL;
+                goto out;
         }
 
-        device_create_file(dev, &dev_attr_fastsysclk);
+        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_rotation);
+        device_create_file(dev, &dev_attr_flip);
 
         printk(KERN_INFO "fb%d: %s frame buffer device\n", info->node, info->fix.id);
         return 0;
+out:
+        fb_dealloc_cmap(&info->cmap);
+        kfree(info->pseudo_palette);
+        if (remapped_fbuf != NULL)
+                iounmap(remapped_fbuf);
+        if (remapped_regs != NULL)
+                iounmap(remapped_regs);
+        if (remapped_base != NULL)
+                iounmap(remapped_base);
+        if (info)
+                framebuffer_release(info);
+        return err;
 }
 
 
 static int w100fb_remove(struct device *dev)
 {
         struct fb_info *info = dev_get_drvdata(dev);
+        struct w100fb_par *par=info->par;
 
-        device_remove_file(dev, &dev_attr_fastsysclk);
+        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_rotation);
+        device_remove_file(dev, &dev_attr_flip);
 
         unregister_framebuffer(info);
 
-        w100fb_clear_buffer();
+        vfree(par->saved_intmem);
+        vfree(par->saved_extmem);
         kfree(info->pseudo_palette);
+        fb_dealloc_cmap(&info->cmap);
 
         iounmap(remapped_base);
         iounmap(remapped_regs);
@@ -721,10 +664,54 @@ static void w100_soft_reset(void)
         udelay(100);
 }
 
+static void w100_update_disable(void)
+{
+        union disp_db_buf_cntl_wr_u disp_db_buf_wr_cntl;
+
+        /* Prevent display updates */
+        disp_db_buf_wr_cntl.f.db_buf_cntl = 0x1e;
+        disp_db_buf_wr_cntl.f.update_db_buf = 0;
+        disp_db_buf_wr_cntl.f.en_db_buf = 0;
+        writel((u32) (disp_db_buf_wr_cntl.val), remapped_regs + mmDISP_DB_BUF_CNTL);
+}
+
+static void w100_update_enable(void)
+{
+        union disp_db_buf_cntl_wr_u disp_db_buf_wr_cntl;
+
+        /* Enable display updates */
+        disp_db_buf_wr_cntl.f.db_buf_cntl = 0x1e;
+        disp_db_buf_wr_cntl.f.update_db_buf = 1;
+        disp_db_buf_wr_cntl.f.en_db_buf = 1;
+        writel((u32) (disp_db_buf_wr_cntl.val), remapped_regs + mmDISP_DB_BUF_CNTL);
+}
+
+unsigned long w100fb_gpio_read(int port)
+{
+        unsigned long value;
+
+        if (port==W100_GPIO_PORT_A)
+                value = readl(remapped_regs + mmGPIO_DATA);
+        else
+                value = readl(remapped_regs + mmGPIO_DATA2);
+
+        return value;
+}
+
+void w100fb_gpio_write(int port, unsigned long value)
+{
+        if (port==W100_GPIO_PORT_A)
+                value = writel(value, remapped_regs + mmGPIO_DATA);
+        else
+                value = writel(value, remapped_regs + mmGPIO_DATA2);
+}
+EXPORT_SYMBOL(w100fb_gpio_read);
+EXPORT_SYMBOL(w100fb_gpio_write);
+
 /*
  * Initialization of critical w100 hardware
  */
-static void w100_hw_init(void)
+static void w100_hw_init(struct w100fb_par *par)
 {
         u32 temp32;
         union cif_cntl_u cif_cntl;
@@ -735,8 +722,8 @@ static void w100_hw_init(void)
         union cpu_defaults_u cpu_default;
         union cif_write_dbg_u cif_write_dbg;
         union wrap_start_dir_u wrap_start_dir;
-        union mc_ext_mem_location_u mc_ext_mem_loc;
         union cif_io_u cif_io;
+        struct w100_gpio_regs *gpio = par->mach->gpio;
 
         w100_soft_reset();
 
@@ -791,19 +778,6 @@ static void w100_hw_init(void)
         cfgreg_base.f.cfgreg_base = W100_CFG_BASE;
         writel((u32) (cfgreg_base.val), remapped_regs + mmCFGREG_BASE);
 
-        /* This location is relative to internal w100 addresses */
-        writel(0x15FF1000, remapped_regs + mmMC_FB_LOCATION);
-
-        mc_ext_mem_loc.val = defMC_EXT_MEM_LOCATION;
-        mc_ext_mem_loc.f.mc_ext_mem_start = MEM_EXT_BASE_VALUE >> 8;
-        mc_ext_mem_loc.f.mc_ext_mem_top = MEM_EXT_TOP_VALUE >> 8;
-        writel((u32) (mc_ext_mem_loc.val), remapped_regs + mmMC_EXT_MEM_LOCATION);
-
-        if ((current_par->lcdMode == LCD_MODE_240) || (current_par->lcdMode == LCD_MODE_320))
-                w100_InitExtMem(LCD_SHARP_QVGA);
-        else
-                w100_InitExtMem(LCD_SHARP_VGA);
-
         wrap_start_dir.val = defWRAP_START_DIR;
         wrap_start_dir.f.start_addr = WRAP_BUF_BASE_VALUE >> 1;
         writel((u32) (wrap_start_dir.val), remapped_regs + mmWRAP_START_DIR);
@@ -813,21 +787,24 @@ static void w100_hw_init(void)
         writel((u32) (wrap_top_dir.val), remapped_regs + mmWRAP_TOP_DIR);
 
         writel((u32) 0x2440, remapped_regs + mmRBBM_CNTL);
-}
 
+        /* Set the hardware to 565 colour */
+        temp32 = readl(remapped_regs + mmDISP_DEBUG2);
+        temp32 &= 0xff7fffff;
+        temp32 |= 0x00800000;
+        writel(temp32, remapped_regs + mmDISP_DEBUG2);
 
-/*
- * Types
- */
+        /* Initialise the GPIO lines */
+        if (gpio) {
+                writel(gpio->init_data1, remapped_regs + mmGPIO_DATA);
+                writel(gpio->init_data2, remapped_regs + mmGPIO_DATA2);
+                writel(gpio->gpio_dir1,  remapped_regs + mmGPIO_CNTL1);
+                writel(gpio->gpio_oe1,   remapped_regs + mmGPIO_CNTL2);
+                writel(gpio->gpio_dir2,  remapped_regs + mmGPIO_CNTL3);
+                writel(gpio->gpio_oe2,   remapped_regs + mmGPIO_CNTL4);
+        }
+}
 
-struct pll_parm {
-        u16 freq;               /* desired Fout for PLL */
-        u8 M;
-        u8 N_int;
-        u8 N_fac;
-        u8 tfgoal;
-        u8 lock_time;
-};
 
 struct power_state {
         union clk_pin_cntl_u clk_pin_cntl;
@@ -835,317 +812,275 @@ struct power_state {
         union pll_cntl_u pll_cntl;
         union sclk_cntl_u sclk_cntl;
         union pclk_cntl_u pclk_cntl;
-        union clk_test_cntl_u clk_test_cntl;
         union pwrmgt_cntl_u pwrmgt_cntl;
-        u32 freq;               /* Fout for PLL calibration */
-        u8 tf100;               /* for pll calibration */
-        u8 tf80;                /* for pll calibration */
-        u8 tf20;                /* for pll calibration */
-        u8 M;                   /* for pll calibration */
-        u8 N_int;               /* for pll calibration */
-        u8 N_fac;               /* for pll calibration */
-        u8 lock_time;   /* for pll calibration */
-        u8 tfgoal;              /* for pll calibration */
-        u8 auto_mode;   /* hardware auto switch? */
-        u8 pwm_mode;            /* 0 fast, 1 normal/slow */
-        u16 fast_sclk;  /* fast clk freq */
-        u16 norm_sclk;  /* slow clk freq */
+        int auto_mode;  /* system clock auto changing? */
 };
 
 
-/*
- * Global state variables
- */
-
 static struct power_state w100_pwr_state;
 
-/* This table is specific for 12.5MHz ref crystal.  */
-static struct pll_parm gPLLTable[] = {
-    /*freq     M   N_int    N_fac  tfgoal  lock_time */
-    { 50,      0,   1,       0,     0xE0,        56}, /*  50.00 MHz */
-    { 75,      0,   5,       0,     0xDE,            37}, /*  75.00 MHz */
-    {100,      0,   7,       0,     0xE0,        28}, /* 100.00 MHz */
-    {125,      0,   9,       0,     0xE0,        22}, /* 125.00 MHz */
-    {150,      0,   11,      0,     0xE0,        17}, /* 150.00 MHz */
-    {  0,      0,   0,       0,        0,         0}  /* Terminator */
+/* The PLL Fout is determined by (XtalFreq/(M+1)) * ((N_int+1) + (N_fac/8)) */
+
+/* 12.5MHz Crystal PLL Table */
+static struct w100_pll_info xtal_12500000[] = {
+        /*freq     M   N_int    N_fac  tfgoal  lock_time */
+        { 50,      0,   1,       0,     0xe0,        56},  /*  50.00 MHz */
+        { 75,      0,   5,       0,     0xde,        37},  /*  75.00 MHz */
+        {100,      0,   7,       0,     0xe0,        28},  /* 100.00 MHz */
+        {125,      0,   9,       0,     0xe0,        22},  /* 125.00 MHz */
+        {150,      0,   11,      0,     0xe0,        17},  /* 150.00 MHz */
+        {  0,      0,   0,       0,        0,         0},  /* Terminator */
 };
 
+/* 14.318MHz Crystal PLL Table */
+static struct w100_pll_info xtal_14318000[] = {
+        /*freq     M   N_int    N_fac  tfgoal  lock_time */
+        { 40,      4,   13,      0,     0xe0,        80}, /* tfgoal guessed */
+        { 50,      1,   6,       0,     0xe0,        64}, /*  50.05 MHz */
+        { 57,      2,   11,      0,     0xe0,        53}, /* tfgoal guessed */
+        { 75,      0,   4,       3,     0xe0,        43}, /*  75.08 MHz */
+        {100,      0,   6,       0,     0xe0,        32}, /* 100.10 MHz */
+        {  0,      0,   0,       0,        0,         0},
+};
 
-static u8 w100_pll_get_testcount(u8 testclk_sel)
+/* 16MHz Crystal PLL Table */
+static struct w100_pll_info xtal_16000000[] = {
+        /*freq     M   N_int    N_fac  tfgoal  lock_time */
+        { 72,      1,   8,       0,     0xe0,        48}, /* tfgoal guessed */
+        { 95,      1,   10,      7,     0xe0,        38}, /* tfgoal guessed */
+        { 96,      1,   11,      0,     0xe0,        36}, /* tfgoal guessed */
+        {  0,      0,   0,       0,        0,         0},
+};
+
+static struct pll_entries {
+        int xtal_freq;
+        struct w100_pll_info *pll_table;
+} w100_pll_tables[] = {
+        { 12500000, &xtal_12500000[0] },
+        { 14318000, &xtal_14318000[0] },
+        { 16000000, &xtal_16000000[0] },
+        { 0 },
+};
+
+struct w100_pll_info *w100_get_xtal_table(unsigned int freq)
 {
+        struct pll_entries *pll_entry = w100_pll_tables;
+
+        do {
+                if (freq == pll_entry->xtal_freq)
+                        return pll_entry->pll_table;
+                pll_entry++;
+        } while (pll_entry->xtal_freq);
+        return 0;
+}
+
+
+static unsigned int w100_get_testcount(unsigned int testclk_sel)
+{
+        union clk_test_cntl_u clk_test_cntl;
+
         udelay(5);
 
-        w100_pwr_state.clk_test_cntl.f.start_check_freq = 0x0;
-        w100_pwr_state.clk_test_cntl.f.testclk_sel = testclk_sel;
-        w100_pwr_state.clk_test_cntl.f.tstcount_rst = 0x1;      /*reset test count */
-        writel((u32) (w100_pwr_state.clk_test_cntl.val), remapped_regs + mmCLK_TEST_CNTL);
-        w100_pwr_state.clk_test_cntl.f.tstcount_rst = 0x0;
-        writel((u32) (w100_pwr_state.clk_test_cntl.val), remapped_regs + mmCLK_TEST_CNTL);
+        /* Select the test clock source and reset */
+        clk_test_cntl.f.start_check_freq = 0x0;
+        clk_test_cntl.f.testclk_sel = testclk_sel;
+        clk_test_cntl.f.tstcount_rst = 0x1; /* set reset */
+        writel((u32) (clk_test_cntl.val), remapped_regs + mmCLK_TEST_CNTL);
 
-        w100_pwr_state.clk_test_cntl.f.start_check_freq = 0x1;
-        writel((u32) (w100_pwr_state.clk_test_cntl.val), remapped_regs + mmCLK_TEST_CNTL);
+        clk_test_cntl.f.tstcount_rst = 0x0; /* clear reset */
+        writel((u32) (clk_test_cntl.val), remapped_regs + mmCLK_TEST_CNTL);
 
+        /* Run clock test */
+        clk_test_cntl.f.start_check_freq = 0x1;
+        writel((u32) (clk_test_cntl.val), remapped_regs + mmCLK_TEST_CNTL);
+
+        /* Give the test time to complete */
         udelay(20);
 
-        w100_pwr_state.clk_test_cntl.val = readl(remapped_regs + mmCLK_TEST_CNTL);
-        w100_pwr_state.clk_test_cntl.f.start_check_freq = 0x0;
-        writel((u32) (w100_pwr_state.clk_test_cntl.val), remapped_regs + mmCLK_TEST_CNTL);
+        /* Return the result */
+        clk_test_cntl.val = readl(remapped_regs + mmCLK_TEST_CNTL);
+        clk_test_cntl.f.start_check_freq = 0x0;
+        writel((u32) (clk_test_cntl.val), remapped_regs + mmCLK_TEST_CNTL);
 
-        return w100_pwr_state.clk_test_cntl.f.test_count;
+        return clk_test_cntl.f.test_count;
 }
 
 
-static u8 w100_pll_adjust(void)
+static int w100_pll_adjust(struct w100_pll_info *pll)
 {
+        unsigned int tf80;
+        unsigned int tf20;
+
+        /* Initial Settings */
+        w100_pwr_state.pll_cntl.f.pll_pwdn = 0x0;     /* power down */
+        w100_pwr_state.pll_cntl.f.pll_reset = 0x0;    /* not reset */
+        w100_pwr_state.pll_cntl.f.pll_tcpoff = 0x1;   /* Hi-Z */
+        w100_pwr_state.pll_cntl.f.pll_pvg = 0x0;      /* VCO gain = 0 */
+        w100_pwr_state.pll_cntl.f.pll_vcofr = 0x0;    /* VCO frequency range control = off */
+        w100_pwr_state.pll_cntl.f.pll_ioffset = 0x0;  /* current offset inside VCO = 0 */
+        w100_pwr_state.pll_cntl.f.pll_ring_off = 0x0;
+
+        /* Wai Ming 80 percent of VDD 1.3V gives 1.04V, minimum operating voltage is 1.08V
+         * therefore, commented out the following lines
+         * tf80 meant tf100
+         */
         do {
-                /* Wai Ming 80 percent of VDD 1.3V gives 1.04V, minimum operating voltage is 1.08V
-                 * therefore, commented out the following lines
-                 * tf80 meant tf100
-                 * set VCO input = 0.8 * VDD
-                 */
+                /* set VCO input = 0.8 * VDD */
                 w100_pwr_state.pll_cntl.f.pll_dactal = 0xd;
                 writel((u32) (w100_pwr_state.pll_cntl.val), remapped_regs + mmPLL_CNTL);
 
-                w100_pwr_state.tf80 = w100_pll_get_testcount(0x1);      /* PLLCLK */
-                if (w100_pwr_state.tf80 >= (w100_pwr_state.tfgoal)) {
+                tf80 = w100_get_testcount(TESTCLK_SRC_PLL);
+                if (tf80 >= (pll->tfgoal)) {
                         /* set VCO input = 0.2 * VDD */
                         w100_pwr_state.pll_cntl.f.pll_dactal = 0x7;
                         writel((u32) (w100_pwr_state.pll_cntl.val), remapped_regs + mmPLL_CNTL);
 
-                        w100_pwr_state.tf20 = w100_pll_get_testcount(0x1);      /* PLLCLK */
-                        if (w100_pwr_state.tf20 <= (w100_pwr_state.tfgoal))
-                                return 1; // Success
+                        tf20 = w100_get_testcount(TESTCLK_SRC_PLL);
+                        if (tf20 <= (pll->tfgoal))
+                                return 1;  /* Success */
 
                         if ((w100_pwr_state.pll_cntl.f.pll_vcofr == 0x0) &&
-                            ((w100_pwr_state.pll_cntl.f.pll_pvg == 0x7) ||
-                             (w100_pwr_state.pll_cntl.f.pll_ioffset == 0x0))) {
+                                ((w100_pwr_state.pll_cntl.f.pll_pvg == 0x7) ||
+                                (w100_pwr_state.pll_cntl.f.pll_ioffset == 0x0))) {
                                 /* slow VCO config */
                                 w100_pwr_state.pll_cntl.f.pll_vcofr = 0x1;
                                 w100_pwr_state.pll_cntl.f.pll_pvg = 0x0;
                                 w100_pwr_state.pll_cntl.f.pll_ioffset = 0x0;
-                                writel((u32) (w100_pwr_state.pll_cntl.val),
-                                        remapped_regs + mmPLL_CNTL);
                                 continue;
                         }
                 }
                 if ((w100_pwr_state.pll_cntl.f.pll_ioffset) < 0x3) {
                         w100_pwr_state.pll_cntl.f.pll_ioffset += 0x1;
-                        writel((u32) (w100_pwr_state.pll_cntl.val), remapped_regs + mmPLL_CNTL);
-                        continue;
-                }
-                if ((w100_pwr_state.pll_cntl.f.pll_pvg) < 0x7) {
+                } else if ((w100_pwr_state.pll_cntl.f.pll_pvg) < 0x7) {
                         w100_pwr_state.pll_cntl.f.pll_ioffset = 0x0;
                         w100_pwr_state.pll_cntl.f.pll_pvg += 0x1;
-                        writel((u32) (w100_pwr_state.pll_cntl.val), remapped_regs + mmPLL_CNTL);
-                        continue;
+                } else {
+                        return 0;  /* Error */
                 }
-                return 0; // error
         } while(1);
 }
 
 
 /*
  * w100_pll_calibration
- *                freq = target frequency of the PLL
- *                (note: crystal = 14.3MHz)
  */
-static u8 w100_pll_calibration(u32 freq)
+static int w100_pll_calibration(struct w100_pll_info *pll)
 {
-        u8 status;
-
-        /* initial setting */
-        w100_pwr_state.pll_cntl.f.pll_pwdn = 0x0;               /* power down */
-        w100_pwr_state.pll_cntl.f.pll_reset = 0x0;              /* not reset */
-        w100_pwr_state.pll_cntl.f.pll_tcpoff = 0x1;     /* Hi-Z */
-        w100_pwr_state.pll_cntl.f.pll_pvg = 0x0;                /* VCO gain = 0 */
-        w100_pwr_state.pll_cntl.f.pll_vcofr = 0x0;              /* VCO frequency range control = off */
-        w100_pwr_state.pll_cntl.f.pll_ioffset = 0x0;    /* current offset inside VCO = 0 */
-        w100_pwr_state.pll_cntl.f.pll_ring_off = 0x0;
-        writel((u32) (w100_pwr_state.pll_cntl.val), remapped_regs + mmPLL_CNTL);
+        int status;
 
-        /* check for (tf80 >= tfgoal) && (tf20 =< tfgoal) */
-        if ((w100_pwr_state.tf80 < w100_pwr_state.tfgoal) || (w100_pwr_state.tf20 > w100_pwr_state.tfgoal)) {
-                status=w100_pll_adjust();
-        }
-        /* PLL Reset And Lock */
+        status = w100_pll_adjust(pll);
 
+        /* PLL Reset And Lock */
         /* set VCO input = 0.5 * VDD */
         w100_pwr_state.pll_cntl.f.pll_dactal = 0xa;
         writel((u32) (w100_pwr_state.pll_cntl.val), remapped_regs + mmPLL_CNTL);
 
-        /* reset time */
-        udelay(1);
+        udelay(1);  /* reset time */
 
         /* enable charge pump */
-        w100_pwr_state.pll_cntl.f.pll_tcpoff = 0x0;     /* normal */
+        w100_pwr_state.pll_cntl.f.pll_tcpoff = 0x0;  /* normal */
         writel((u32) (w100_pwr_state.pll_cntl.val), remapped_regs + mmPLL_CNTL);
 
-        /* set VCO input = Hi-Z */
-        /* disable DAC */
+        /* set VCO input = Hi-Z, disable DAC */
         w100_pwr_state.pll_cntl.f.pll_dactal = 0x0;
         writel((u32) (w100_pwr_state.pll_cntl.val), remapped_regs + mmPLL_CNTL);
 
-        /* lock time */
-        udelay(400);    /* delay 400 us */
+        udelay(400);  /* lock time */
 
         /* PLL locked */
 
-        w100_pwr_state.sclk_cntl.f.sclk_src_sel = 0x1;  /* PLL clock */
-        writel((u32) (w100_pwr_state.sclk_cntl.val), remapped_regs + mmSCLK_CNTL);
-
-        w100_pwr_state.tf100 = w100_pll_get_testcount(0x1);     /* PLLCLK */
-
         return status;
 }
 
 
-static u8 w100_pll_set_clk(void)
+static int w100_pll_set_clk(struct w100_pll_info *pll)
 {
-        u8 status;
+        int status;
 
-        if (w100_pwr_state.auto_mode == 1)      /* auto mode */
+        if (w100_pwr_state.auto_mode == 1)  /* auto mode */
         {
-                w100_pwr_state.pwrmgt_cntl.f.pwm_fast_noml_hw_en = 0x0; /* disable fast to normal */
-                w100_pwr_state.pwrmgt_cntl.f.pwm_noml_fast_hw_en = 0x0; /* disable normal to fast */
+                w100_pwr_state.pwrmgt_cntl.f.pwm_fast_noml_hw_en = 0x0;  /* disable fast to normal */
+                w100_pwr_state.pwrmgt_cntl.f.pwm_noml_fast_hw_en = 0x0;  /* disable normal to fast */
                 writel((u32) (w100_pwr_state.pwrmgt_cntl.val), remapped_regs + mmPWRMGT_CNTL);
         }
 
-        w100_pwr_state.sclk_cntl.f.sclk_src_sel = 0x0;  /* crystal clock */
+        /* Set system clock source to XTAL whilst adjusting the PLL! */
+        w100_pwr_state.sclk_cntl.f.sclk_src_sel = CLK_SRC_XTAL;
         writel((u32) (w100_pwr_state.sclk_cntl.val), remapped_regs + mmSCLK_CNTL);
 
-        w100_pwr_state.pll_ref_fb_div.f.pll_ref_div = w100_pwr_state.M;
-        w100_pwr_state.pll_ref_fb_div.f.pll_fb_div_int = w100_pwr_state.N_int;
-        w100_pwr_state.pll_ref_fb_div.f.pll_fb_div_frac = w100_pwr_state.N_fac;
-        w100_pwr_state.pll_ref_fb_div.f.pll_lock_time = w100_pwr_state.lock_time;
+        w100_pwr_state.pll_ref_fb_div.f.pll_ref_div = pll->M;
+        w100_pwr_state.pll_ref_fb_div.f.pll_fb_div_int = pll->N_int;
+        w100_pwr_state.pll_ref_fb_div.f.pll_fb_div_frac = pll->N_fac;
+        w100_pwr_state.pll_ref_fb_div.f.pll_lock_time = pll->lock_time;
         writel((u32) (w100_pwr_state.pll_ref_fb_div.val), remapped_regs + mmPLL_REF_FB_DIV);
 
         w100_pwr_state.pwrmgt_cntl.f.pwm_mode_req = 0;
         writel((u32) (w100_pwr_state.pwrmgt_cntl.val), remapped_regs + mmPWRMGT_CNTL);
 
-        status = w100_pll_calibration (w100_pwr_state.freq);
+        status = w100_pll_calibration(pll);
 
-        if (w100_pwr_state.auto_mode == 1)      /* auto mode */
+        if (w100_pwr_state.auto_mode == 1)  /* auto mode */
         {
-                w100_pwr_state.pwrmgt_cntl.f.pwm_fast_noml_hw_en = 0x1; /* reenable fast to normal */
-                w100_pwr_state.pwrmgt_cntl.f.pwm_noml_fast_hw_en = 0x1; /* reenable normal to fast  */
+                w100_pwr_state.pwrmgt_cntl.f.pwm_fast_noml_hw_en = 0x1;  /* reenable fast to normal */
+                w100_pwr_state.pwrmgt_cntl.f.pwm_noml_fast_hw_en = 0x1;  /* reenable normal to fast  */
                 writel((u32) (w100_pwr_state.pwrmgt_cntl.val), remapped_regs + mmPWRMGT_CNTL);
         }
         return status;
 }
 
-
-/* assume reference crystal clk is 12.5MHz,
- * and that doubling is not enabled.
- *
- * Freq = 12 == 12.5MHz.
- */
-static u16 w100_set_slowsysclk(u16 freq)
-{
-        if (w100_pwr_state.norm_sclk == freq)
-                return freq;
-
-        if (w100_pwr_state.auto_mode == 1)      /* auto mode */
-                return 0;
-
-        if (freq == 12) {
-                w100_pwr_state.norm_sclk = freq;
-                w100_pwr_state.sclk_cntl.f.sclk_post_div_slow = 0x0;    /* Pslow = 1 */
-                w100_pwr_state.sclk_cntl.f.sclk_src_sel = 0x0;  /* crystal src */
-
-                writel((u32) (w100_pwr_state.sclk_cntl.val), remapped_regs + mmSCLK_CNTL);
-
-                w100_pwr_state.clk_pin_cntl.f.xtalin_pm_en = 0x1;
-                writel((u32) (w100_pwr_state.clk_pin_cntl.val), remapped_regs + mmCLK_PIN_CNTL);
-
-                w100_pwr_state.pwrmgt_cntl.f.pwm_enable = 0x1;
-                w100_pwr_state.pwrmgt_cntl.f.pwm_mode_req = 0x1;
-                writel((u32) (w100_pwr_state.pwrmgt_cntl.val), remapped_regs + mmPWRMGT_CNTL);
-                w100_pwr_state.pwm_mode = 1;    /* normal mode */
-                return freq;
-        } else
-                return 0;
-}
-
-
-static u16 w100_set_fastsysclk(u16 freq)
+/* freq = target frequency of the PLL */
+static int w100_set_pll_freq(struct w100fb_par *par, unsigned int freq)
 {
-        u16 pll_freq;
-        int i;
-
-        while(1) {
-                pll_freq = (u16) (freq * (w100_pwr_state.sclk_cntl.f.sclk_post_div_fast + 1));
-                i = 0;
-                do {
-                        if (pll_freq == gPLLTable[i].freq) {
-                                w100_pwr_state.freq = gPLLTable[i].freq * 1000000;
-                                w100_pwr_state.M = gPLLTable[i].M;
-                                w100_pwr_state.N_int = gPLLTable[i].N_int;
-                                w100_pwr_state.N_fac = gPLLTable[i].N_fac;
-                                w100_pwr_state.tfgoal = gPLLTable[i].tfgoal;
-                                w100_pwr_state.lock_time = gPLLTable[i].lock_time;
-                                w100_pwr_state.tf20 = 0xff;     /* set highest */
-                                w100_pwr_state.tf80 = 0x00;     /* set lowest */
-
-                                w100_pll_set_clk();
-                                w100_pwr_state.pwm_mode = 0;    /* fast mode */
-                                w100_pwr_state.fast_sclk = freq;
-                                return freq;
-                        }
-                        i++;
-                } while(gPLLTable[i].freq);
+        struct w100_pll_info *pll = par->pll_table;
 
-                if (w100_pwr_state.auto_mode == 1)
-                        break;
-
-                if (w100_pwr_state.sclk_cntl.f.sclk_post_div_fast == 0)
-                        break;
-
-                w100_pwr_state.sclk_cntl.f.sclk_post_div_fast -= 1;
-                writel((u32) (w100_pwr_state.sclk_cntl.val), remapped_regs + mmSCLK_CNTL);
-        }
+        do {
+                if (freq == pll->freq) {
+                        return w100_pll_set_clk(pll);
+                }
+                pll++;
+        } while(pll->freq);
         return 0;
 }
 
-
 /* Set up an initial state.  Some values/fields set
    here will be overwritten. */
-static void w100_pwm_setup(void)
+static void w100_pwm_setup(struct w100fb_par *par)
 {
         w100_pwr_state.clk_pin_cntl.f.osc_en = 0x1;
         w100_pwr_state.clk_pin_cntl.f.osc_gain = 0x1f;
         w100_pwr_state.clk_pin_cntl.f.dont_use_xtalin = 0x0;
         w100_pwr_state.clk_pin_cntl.f.xtalin_pm_en = 0x0;
-        w100_pwr_state.clk_pin_cntl.f.xtalin_dbl_en = 0x0;      /* no freq doubling */
+        w100_pwr_state.clk_pin_cntl.f.xtalin_dbl_en = par->mach->xtal_dbl ? 1 : 0;
         w100_pwr_state.clk_pin_cntl.f.cg_debug = 0x0;
         writel((u32) (w100_pwr_state.clk_pin_cntl.val), remapped_regs + mmCLK_PIN_CNTL);
 
-        w100_pwr_state.sclk_cntl.f.sclk_src_sel = 0x0;  /* Crystal Clk */
-        w100_pwr_state.sclk_cntl.f.sclk_post_div_fast = 0x0;    /* Pfast = 1 */
+        w100_pwr_state.sclk_cntl.f.sclk_src_sel = CLK_SRC_XTAL;
+        w100_pwr_state.sclk_cntl.f.sclk_post_div_fast = 0x0;  /* Pfast = 1 */
         w100_pwr_state.sclk_cntl.f.sclk_clkon_hys = 0x3;
-        w100_pwr_state.sclk_cntl.f.sclk_post_div_slow = 0x0;    /* Pslow = 1 */
+        w100_pwr_state.sclk_cntl.f.sclk_post_div_slow = 0x0;  /* Pslow = 1 */
         w100_pwr_state.sclk_cntl.f.disp_cg_ok2switch_en = 0x0;
-        w100_pwr_state.sclk_cntl.f.sclk_force_reg = 0x0;        /* Dynamic */
-        w100_pwr_state.sclk_cntl.f.sclk_force_disp = 0x0;       /* Dynamic */
-        w100_pwr_state.sclk_cntl.f.sclk_force_mc = 0x0; /* Dynamic */
-        w100_pwr_state.sclk_cntl.f.sclk_force_extmc = 0x0;      /* Dynamic */
-        w100_pwr_state.sclk_cntl.f.sclk_force_cp = 0x0; /* Dynamic */
-        w100_pwr_state.sclk_cntl.f.sclk_force_e2 = 0x0; /* Dynamic */
-        w100_pwr_state.sclk_cntl.f.sclk_force_e3 = 0x0; /* Dynamic */
-        w100_pwr_state.sclk_cntl.f.sclk_force_idct = 0x0;       /* Dynamic */
-        w100_pwr_state.sclk_cntl.f.sclk_force_bist = 0x0;       /* Dynamic */
+        w100_pwr_state.sclk_cntl.f.sclk_force_reg = 0x0;    /* Dynamic */
+        w100_pwr_state.sclk_cntl.f.sclk_force_disp = 0x0;   /* Dynamic */
+        w100_pwr_state.sclk_cntl.f.sclk_force_mc = 0x0;     /* Dynamic */
+        w100_pwr_state.sclk_cntl.f.sclk_force_extmc = 0x0;  /* Dynamic */
+        w100_pwr_state.sclk_cntl.f.sclk_force_cp = 0x0;     /* Dynamic */
+        w100_pwr_state.sclk_cntl.f.sclk_force_e2 = 0x0;     /* Dynamic */
+        w100_pwr_state.sclk_cntl.f.sclk_force_e3 = 0x0;     /* Dynamic */
+        w100_pwr_state.sclk_cntl.f.sclk_force_idct = 0x0;   /* Dynamic */
+        w100_pwr_state.sclk_cntl.f.sclk_force_bist = 0x0;   /* Dynamic */
         w100_pwr_state.sclk_cntl.f.busy_extend_cp = 0x0;
         w100_pwr_state.sclk_cntl.f.busy_extend_e2 = 0x0;
         w100_pwr_state.sclk_cntl.f.busy_extend_e3 = 0x0;
         w100_pwr_state.sclk_cntl.f.busy_extend_idct = 0x0;
         writel((u32) (w100_pwr_state.sclk_cntl.val), remapped_regs + mmSCLK_CNTL);
 
-        w100_pwr_state.pclk_cntl.f.pclk_src_sel = 0x0;  /* Crystal Clk */
-        w100_pwr_state.pclk_cntl.f.pclk_post_div = 0x1; /* P = 2 */
-        w100_pwr_state.pclk_cntl.f.pclk_force_disp = 0x0;       /* Dynamic */
+        w100_pwr_state.pclk_cntl.f.pclk_src_sel = CLK_SRC_XTAL;
+        w100_pwr_state.pclk_cntl.f.pclk_post_div = 0x1;    /* P = 2 */
+        w100_pwr_state.pclk_cntl.f.pclk_force_disp = 0x0;  /* Dynamic */
         writel((u32) (w100_pwr_state.pclk_cntl.val), remapped_regs + mmPCLK_CNTL);
 
-        w100_pwr_state.pll_ref_fb_div.f.pll_ref_div = 0x0;      /* M = 1 */
-        w100_pwr_state.pll_ref_fb_div.f.pll_fb_div_int = 0x0;   /* N = 1.0 */
+        w100_pwr_state.pll_ref_fb_div.f.pll_ref_div = 0x0;     /* M = 1 */
+        w100_pwr_state.pll_ref_fb_div.f.pll_fb_div_int = 0x0;  /* N = 1.0 */
         w100_pwr_state.pll_ref_fb_div.f.pll_fb_div_frac = 0x0;
         w100_pwr_state.pll_ref_fb_div.f.pll_reset_time = 0x5;
         w100_pwr_state.pll_ref_fb_div.f.pll_lock_time = 0xff;
@@ -1154,7 +1089,7 @@ static void w100_pwm_setup(void)
         w100_pwr_state.pll_cntl.f.pll_pwdn = 0x1;
         w100_pwr_state.pll_cntl.f.pll_reset = 0x1;
         w100_pwr_state.pll_cntl.f.pll_pm_en = 0x0;
-        w100_pwr_state.pll_cntl.f.pll_mode = 0x0;       /* uses VCO clock */
+        w100_pwr_state.pll_cntl.f.pll_mode = 0x0;  /* uses VCO clock */
         w100_pwr_state.pll_cntl.f.pll_refclk_sel = 0x0;
         w100_pwr_state.pll_cntl.f.pll_fbclk_sel = 0x0;
         w100_pwr_state.pll_cntl.f.pll_tcpoff = 0x0;
@@ -1164,220 +1099,275 @@ static void w100_pwm_setup(void)
         w100_pwr_state.pll_cntl.f.pll_ioffset = 0x0;
         w100_pwr_state.pll_cntl.f.pll_pecc_mode = 0x0;
         w100_pwr_state.pll_cntl.f.pll_pecc_scon = 0x0;
-        w100_pwr_state.pll_cntl.f.pll_dactal = 0x0;     /* Hi-Z */
+        w100_pwr_state.pll_cntl.f.pll_dactal = 0x0;  /* Hi-Z */
         w100_pwr_state.pll_cntl.f.pll_cp_clip = 0x3;
         w100_pwr_state.pll_cntl.f.pll_conf = 0x2;
         w100_pwr_state.pll_cntl.f.pll_mbctrl = 0x2;
         w100_pwr_state.pll_cntl.f.pll_ring_off = 0x0;
         writel((u32) (w100_pwr_state.pll_cntl.val), remapped_regs + mmPLL_CNTL);
 
-        w100_pwr_state.clk_test_cntl.f.testclk_sel = 0x1;       /* PLLCLK (for testing) */
-        w100_pwr_state.clk_test_cntl.f.start_check_freq = 0x0;
-        w100_pwr_state.clk_test_cntl.f.tstcount_rst = 0x0;
-        writel((u32) (w100_pwr_state.clk_test_cntl.val), remapped_regs + mmCLK_TEST_CNTL);
-
         w100_pwr_state.pwrmgt_cntl.f.pwm_enable = 0x0;
-        w100_pwr_state.pwrmgt_cntl.f.pwm_mode_req = 0x1;        /* normal mode (0, 1, 3) */
+        w100_pwr_state.pwrmgt_cntl.f.pwm_mode_req = 0x1;  /* normal mode (0, 1, 3) */
         w100_pwr_state.pwrmgt_cntl.f.pwm_wakeup_cond = 0x0;
         w100_pwr_state.pwrmgt_cntl.f.pwm_fast_noml_hw_en = 0x0;
         w100_pwr_state.pwrmgt_cntl.f.pwm_noml_fast_hw_en = 0x0;
-        w100_pwr_state.pwrmgt_cntl.f.pwm_fast_noml_cond = 0x1;  /* PM4,ENG */
-        w100_pwr_state.pwrmgt_cntl.f.pwm_noml_fast_cond = 0x1;  /* PM4,ENG */
+        w100_pwr_state.pwrmgt_cntl.f.pwm_fast_noml_cond = 0x1;  /* PM4,ENG */
+        w100_pwr_state.pwrmgt_cntl.f.pwm_noml_fast_cond = 0x1;  /* PM4,ENG */
         w100_pwr_state.pwrmgt_cntl.f.pwm_idle_timer = 0xFF;
         w100_pwr_state.pwrmgt_cntl.f.pwm_busy_timer = 0xFF;
         writel((u32) (w100_pwr_state.pwrmgt_cntl.val), remapped_regs + mmPWRMGT_CNTL);
 
-        w100_pwr_state.auto_mode = 0;   /* manual mode */
-        w100_pwr_state.pwm_mode = 1;    /* normal mode (0, 1, 2) */
-        w100_pwr_state.freq = 50000000; /* 50 MHz */
-        w100_pwr_state.M = 3;   /* M = 4 */
-        w100_pwr_state.N_int = 6;       /* N = 7.0 */
-        w100_pwr_state.N_fac = 0;
-        w100_pwr_state.tfgoal = 0xE0;
-        w100_pwr_state.lock_time = 56;
-        w100_pwr_state.tf20 = 0xff;     /* set highest */
-        w100_pwr_state.tf80 = 0x00;     /* set lowest */
-        w100_pwr_state.tf100 = 0x00;    /* set lowest */
-        w100_pwr_state.fast_sclk = 50;  /* 50.0 MHz */
-        w100_pwr_state.norm_sclk = 12;  /* 12.5 MHz */
+        w100_pwr_state.auto_mode = 0;  /* manual mode */
 }
 
 
-static void w100_init_sharp_lcd(u32 mode)
+/*
+ * Setup the w100 clocks for the specified mode
+ */
+static void w100_init_clocks(struct w100fb_par *par)
 {
-        u32 temp32;
-        union disp_db_buf_cntl_wr_u disp_db_buf_wr_cntl;
+        struct w100_mode *mode = par->mode;
 
-        /* Prevent display updates */
-        disp_db_buf_wr_cntl.f.db_buf_cntl = 0x1e;
-        disp_db_buf_wr_cntl.f.update_db_buf = 0;
-        disp_db_buf_wr_cntl.f.en_db_buf = 0;
-        writel((u32) (disp_db_buf_wr_cntl.val), remapped_regs + mmDISP_DB_BUF_CNTL);
+        if (mode->pixclk_src == CLK_SRC_PLL || mode->sysclk_src == CLK_SRC_PLL)
+                w100_set_pll_freq(par, (par->fastpll_mode && mode->fast_pll_freq) ? mode->fast_pll_freq : mode->pll_freq);
 
-        switch(mode) {
-        case LCD_SHARP_QVGA:
-                w100_set_slowsysclk(12);        /* use crystal -- 12.5MHz */
-                /* not use PLL */
-
-                writel(0x7FFF8000, remapped_regs + mmMC_EXT_MEM_LOCATION);
-                writel(0x85FF8000, remapped_regs + mmMC_FB_LOCATION);
-                writel(0x00000003, remapped_regs + mmLCD_FORMAT);
-                writel(0x00CF1C06, remapped_regs + mmGRAPHIC_CTRL);
-                writel(0x01410145, remapped_regs + mmCRTC_TOTAL);
-                writel(0x01170027, remapped_regs + mmACTIVE_H_DISP);
-                writel(0x01410001, remapped_regs + mmACTIVE_V_DISP);
-                writel(0x01170027, remapped_regs + mmGRAPHIC_H_DISP);
-                writel(0x01410001, remapped_regs + mmGRAPHIC_V_DISP);
-                writel(0x81170027, remapped_regs + mmCRTC_SS);
-                writel(0xA0140000, remapped_regs + mmCRTC_LS);
-                writel(0x00400008, remapped_regs + mmCRTC_REV);
-                writel(0xA0000000, remapped_regs + mmCRTC_DCLK);
-                writel(0xC0140014, remapped_regs + mmCRTC_GS);
-                writel(0x00010141, remapped_regs + mmCRTC_VPOS_GS);
-                writel(0x8015010F, remapped_regs + mmCRTC_GCLK);
-                writel(0x80100110, remapped_regs + mmCRTC_GOE);
-                writel(0x00000000, remapped_regs + mmCRTC_FRAME);
-                writel(0x00000000, remapped_regs + mmCRTC_FRAME_VPOS);
-                writel(0x01CC0000, remapped_regs + mmLCDD_CNTL1);
-                writel(0x0003FFFF, remapped_regs + mmLCDD_CNTL2);
-                writel(0x00FFFF0D, remapped_regs + mmGENLCD_CNTL1);
-                writel(0x003F3003, remapped_regs + mmGENLCD_CNTL2);
-                writel(0x00000000, remapped_regs + mmCRTC_DEFAULT_COUNT);
-                writel(0x0000FF00, remapped_regs + mmLCD_BACKGROUND_COLOR);
-                writel(0x000102aa, remapped_regs + mmGENLCD_CNTL3);
-                writel(0x00800000, remapped_regs + mmGRAPHIC_OFFSET);
-                writel(0x000001e0, remapped_regs + mmGRAPHIC_PITCH);
-                writel(0x000000bf, remapped_regs + mmGPIO_DATA);
-                writel(0x03c0feff, remapped_regs + mmGPIO_CNTL2);
-                writel(0x00000000, remapped_regs + mmGPIO_CNTL1);
-                writel(0x41060010, remapped_regs + mmCRTC_PS1_ACTIVE);
-                break;
-        case LCD_SHARP_VGA:
-                w100_set_slowsysclk(12);        /* use crystal -- 12.5MHz */
-                w100_set_fastsysclk(current_par->fastsysclk_mode);      /* use PLL -- 75.0MHz */
-                w100_pwr_state.pclk_cntl.f.pclk_src_sel = 0x1;
-                w100_pwr_state.pclk_cntl.f.pclk_post_div = 0x2;
-                writel((u32) (w100_pwr_state.pclk_cntl.val), remapped_regs + mmPCLK_CNTL);
-                writel(0x15FF1000, remapped_regs + mmMC_FB_LOCATION);
-                writel(0x9FFF8000, remapped_regs + mmMC_EXT_MEM_LOCATION);
-                writel(0x00000003, remapped_regs + mmLCD_FORMAT);
-                writel(0x00DE1D66, remapped_regs + mmGRAPHIC_CTRL);
-
-                writel(0x0283028B, remapped_regs + mmCRTC_TOTAL);
-                writel(0x02360056, remapped_regs + mmACTIVE_H_DISP);
-                writel(0x02830003, remapped_regs + mmACTIVE_V_DISP);
-                writel(0x02360056, remapped_regs + mmGRAPHIC_H_DISP);
-                writel(0x02830003, remapped_regs + mmGRAPHIC_V_DISP);
-                writel(0x82360056, remapped_regs + mmCRTC_SS);
-                writel(0xA0280000, remapped_regs + mmCRTC_LS);
-                writel(0x00400008, remapped_regs + mmCRTC_REV);
-                writel(0xA0000000, remapped_regs + mmCRTC_DCLK);
-                writel(0x80280028, remapped_regs + mmCRTC_GS);
-                writel(0x02830002, remapped_regs + mmCRTC_VPOS_GS);
-                writel(0x8015010F, remapped_regs + mmCRTC_GCLK);
-                writel(0x80100110, remapped_regs + mmCRTC_GOE);
-                writel(0x00000000, remapped_regs + mmCRTC_FRAME);
-                writel(0x00000000, remapped_regs + mmCRTC_FRAME_VPOS);
-                writel(0x01CC0000, remapped_regs + mmLCDD_CNTL1);
-                writel(0x0003FFFF, remapped_regs + mmLCDD_CNTL2);
-                writel(0x00FFFF0D, remapped_regs + mmGENLCD_CNTL1);
-                writel(0x003F3003, remapped_regs + mmGENLCD_CNTL2);
-                writel(0x00000000, remapped_regs + mmCRTC_DEFAULT_COUNT);
-                writel(0x0000FF00, remapped_regs + mmLCD_BACKGROUND_COLOR);
-                writel(0x000102aa, remapped_regs + mmGENLCD_CNTL3);
-                writel(0x00800000, remapped_regs + mmGRAPHIC_OFFSET);
-                writel(0x000003C0, remapped_regs + mmGRAPHIC_PITCH);
-                writel(0x000000bf, remapped_regs + mmGPIO_DATA);
-                writel(0x03c0feff, remapped_regs + mmGPIO_CNTL2);
-                writel(0x00000000, remapped_regs + mmGPIO_CNTL1);
-                writel(0x41060010, remapped_regs + mmCRTC_PS1_ACTIVE);
-                break;
-        default:
-                break;
-        }
+        w100_pwr_state.sclk_cntl.f.sclk_src_sel = mode->sysclk_src;
+        w100_pwr_state.sclk_cntl.f.sclk_post_div_fast = mode->sysclk_divider;
+        w100_pwr_state.sclk_cntl.f.sclk_post_div_slow = mode->sysclk_divider;
+        writel((u32) (w100_pwr_state.sclk_cntl.val), remapped_regs + mmSCLK_CNTL);
+}
+
+static void w100_init_lcd(struct w100fb_par *par)
+{
+        u32 temp32;
+        struct w100_mode *mode = par->mode;
+        struct w100_gen_regs *regs = par->mach->regs;
+        union active_h_disp_u active_h_disp;
+        union active_v_disp_u active_v_disp;
+        union graphic_h_disp_u graphic_h_disp;
+        union graphic_v_disp_u graphic_v_disp;
+        union crtc_total_u crtc_total;
+
+        /* w3200 doesnt like undefined bits being set so zero register values first */
+
+        active_h_disp.val = 0;
+        active_h_disp.f.active_h_start=mode->left_margin;
+        active_h_disp.f.active_h_end=mode->left_margin + mode->xres;
+        writel(active_h_disp.val, remapped_regs + mmACTIVE_H_DISP);
+
+        active_v_disp.val = 0;
+        active_v_disp.f.active_v_start=mode->upper_margin;
+        active_v_disp.f.active_v_end=mode->upper_margin + mode->yres;
+        writel(active_v_disp.val, remapped_regs + mmACTIVE_V_DISP);
+
+        graphic_h_disp.val = 0;
+        graphic_h_disp.f.graphic_h_start=mode->left_margin;
+        graphic_h_disp.f.graphic_h_end=mode->left_margin + mode->xres;
+        writel(graphic_h_disp.val, remapped_regs + mmGRAPHIC_H_DISP);
+
+        graphic_v_disp.val = 0;
+        graphic_v_disp.f.graphic_v_start=mode->upper_margin;
+        graphic_v_disp.f.graphic_v_end=mode->upper_margin + mode->yres;
+        writel(graphic_v_disp.val, remapped_regs + mmGRAPHIC_V_DISP);
+
+        crtc_total.val = 0;
+        crtc_total.f.crtc_h_total=mode->left_margin  + mode->xres + mode->right_margin;
+        crtc_total.f.crtc_v_total=mode->upper_margin + mode->yres + mode->lower_margin;
+        writel(crtc_total.val, remapped_regs + mmCRTC_TOTAL);
+
+        writel(mode->crtc_ss, remapped_regs + mmCRTC_SS);
+        writel(mode->crtc_ls, remapped_regs + mmCRTC_LS);
+        writel(mode->crtc_gs, remapped_regs + mmCRTC_GS);
+        writel(mode->crtc_vpos_gs, remapped_regs + mmCRTC_VPOS_GS);
+        writel(mode->crtc_rev, remapped_regs + mmCRTC_REV);
+        writel(mode->crtc_dclk, remapped_regs + mmCRTC_DCLK);
+        writel(mode->crtc_gclk, remapped_regs + mmCRTC_GCLK);
+        writel(mode->crtc_goe, remapped_regs + mmCRTC_GOE);
+        writel(mode->crtc_ps1_active, remapped_regs + mmCRTC_PS1_ACTIVE);
+
+        writel(regs->lcd_format, remapped_regs + mmLCD_FORMAT);
+        writel(regs->lcdd_cntl1, remapped_regs + mmLCDD_CNTL1);
+        writel(regs->lcdd_cntl2, remapped_regs + mmLCDD_CNTL2);
+        writel(regs->genlcd_cntl1, remapped_regs + mmGENLCD_CNTL1);
+        writel(regs->genlcd_cntl2, remapped_regs + mmGENLCD_CNTL2);
+        writel(regs->genlcd_cntl3, remapped_regs + mmGENLCD_CNTL3);
+
+        writel(0x00000000, remapped_regs + mmCRTC_FRAME);
+        writel(0x00000000, remapped_regs + mmCRTC_FRAME_VPOS);
+        writel(0x00000000, remapped_regs + mmCRTC_DEFAULT_COUNT);
+        writel(0x0000FF00, remapped_regs + mmLCD_BACKGROUND_COLOR);
 
         /* Hack for overlay in ext memory */
         temp32 = readl(remapped_regs + mmDISP_DEBUG2);
         temp32 |= 0xc0000000;
         writel(temp32, remapped_regs + mmDISP_DEBUG2);
-
-        /* Re-enable display updates */
-        disp_db_buf_wr_cntl.f.db_buf_cntl = 0x1e;
-        disp_db_buf_wr_cntl.f.update_db_buf = 1;
-        disp_db_buf_wr_cntl.f.en_db_buf = 1;
-        writel((u32) (disp_db_buf_wr_cntl.val), remapped_regs + mmDISP_DB_BUF_CNTL);
 }
 
 
-static void w100_set_vga_rotation_regs(u16 divider, unsigned long ctrl, unsigned long offset, unsigned long pitch)
+static void w100_setup_memory(struct w100fb_par *par)
 {
-        w100_pwr_state.pclk_cntl.f.pclk_src_sel = 0x1;
-        w100_pwr_state.pclk_cntl.f.pclk_post_div = divider;
-        writel((u32) (w100_pwr_state.pclk_cntl.val), remapped_regs + mmPCLK_CNTL);
+        union mc_ext_mem_location_u extmem_location;
+        union mc_fb_location_u intmem_location;
+        struct w100_mem_info *mem = par->mach->mem;
+        struct w100_bm_mem_info *bm_mem = par->mach->bm_mem;
 
-        writel(ctrl, remapped_regs + mmGRAPHIC_CTRL);
-        writel(offset, remapped_regs + mmGRAPHIC_OFFSET);
-        writel(pitch, remapped_regs + mmGRAPHIC_PITCH);
+        if (!par->extmem_active) {
+                w100_suspend(W100_SUSPEND_EXTMEM);
 
-        /* Re-enable display updates */
-        writel(0x0000007b, remapped_regs + mmDISP_DB_BUF_CNTL);
-}
+                /* Map Internal Memory at FB Base */
+                intmem_location.f.mc_fb_start = W100_FB_BASE >> 8;
+                intmem_location.f.mc_fb_top = (W100_FB_BASE+MEM_INT_SIZE) >> 8;
+                writel((u32) (intmem_location.val), remapped_regs + mmMC_FB_LOCATION);
 
+                /* Unmap External Memory - value is *probably* irrelevant but may have meaning
+                   to acceleration libraries */
+                extmem_location.f.mc_ext_mem_start = MEM_EXT_BASE_VALUE >> 8;
+                extmem_location.f.mc_ext_mem_top = (MEM_EXT_BASE_VALUE-1) >> 8;
+                writel((u32) (extmem_location.val), remapped_regs + mmMC_EXT_MEM_LOCATION);
+        } else {
+                /* Map Internal Memory to its default location */
+                intmem_location.f.mc_fb_start = MEM_INT_BASE_VALUE >> 8;
+                intmem_location.f.mc_fb_top = (MEM_INT_BASE_VALUE+MEM_INT_SIZE) >> 8;
+                writel((u32) (intmem_location.val), remapped_regs + mmMC_FB_LOCATION);
 
-static void w100_init_vga_rotation(u16 deg)
-{
-        switch(deg) {
-        case 0:
-                w100_set_vga_rotation_regs(0x02, 0x00DE1D66, 0x00800000, 0x000003c0);
-                break;
-        case 90:
-                w100_set_vga_rotation_regs(0x06, 0x00DE1D0e, 0x00895b00, 0x00000500);
-                break;
-        case 180:
-                w100_set_vga_rotation_regs(0x02, 0x00DE1D7e, 0x00895ffc, 0x000003c0);
-                break;
-        case 270:
-                w100_set_vga_rotation_regs(0x06, 0x00DE1D16, 0x008004fc, 0x00000500);
-                break;
-        default:
-                /* not-support */
-                break;
+                /* Map External Memory at FB Base */
+                extmem_location.f.mc_ext_mem_start = W100_FB_BASE >> 8;
+                extmem_location.f.mc_ext_mem_top = (W100_FB_BASE+par->mach->mem->size) >> 8;
+                writel((u32) (extmem_location.val), remapped_regs + mmMC_EXT_MEM_LOCATION);
+
+                writel(0x00007800, remapped_regs + mmMC_BIST_CTRL);
+                writel(mem->ext_cntl, remapped_regs + mmMEM_EXT_CNTL);
+                writel(0x00200021, remapped_regs + mmMEM_SDRAM_MODE_REG);
+                udelay(100);
+                writel(0x80200021, remapped_regs + mmMEM_SDRAM_MODE_REG);
+                udelay(100);
+                writel(mem->sdram_mode_reg, remapped_regs + mmMEM_SDRAM_MODE_REG);
+                udelay(100);
+                writel(mem->ext_timing_cntl, remapped_regs + mmMEM_EXT_TIMING_CNTL);
+                writel(mem->io_cntl, remapped_regs + mmMEM_IO_CNTL);
+                if (bm_mem) {
+                        writel(bm_mem->ext_mem_bw, remapped_regs + mmBM_EXT_MEM_BANDWIDTH);
+                        writel(bm_mem->offset, remapped_regs + mmBM_OFFSET);
+                        writel(bm_mem->ext_timing_ctl, remapped_regs + mmBM_MEM_EXT_TIMING_CNTL);
+                        writel(bm_mem->ext_cntl, remapped_regs + mmBM_MEM_EXT_CNTL);
+                        writel(bm_mem->mode_reg, remapped_regs + mmBM_MEM_MODE_REG);
+                        writel(bm_mem->io_cntl, remapped_regs + mmBM_MEM_IO_CNTL);
+                        writel(bm_mem->config, remapped_regs + mmBM_CONFIG);
+                }
         }
 }
 
-
-static void w100_set_qvga_rotation_regs(unsigned long ctrl, unsigned long offset, unsigned long pitch)
+static void w100_set_dispregs(struct w100fb_par *par)
 {
-        writel(ctrl, remapped_regs + mmGRAPHIC_CTRL);
-        writel(offset, remapped_regs + mmGRAPHIC_OFFSET);
-        writel(pitch, remapped_regs + mmGRAPHIC_PITCH);
+        unsigned long rot=0, divider, offset=0;
+        union graphic_ctrl_u graphic_ctrl;
+
+        /* See if the mode has been rotated */
+        if (par->xres == par->mode->xres) {
+                if (par->flip) {
+                        rot=3; /* 180 degree */
+                        offset=(par->xres * par->yres) - 1;
+                } /* else 0 degree */
+                divider = par->mode->pixclk_divider;
+        } else {
+                if (par->flip) {
+                        rot=2; /* 270 degree */
+                        offset=par->xres - 1;
+                } else {
+                        rot=1; /* 90 degree */
+                        offset=par->xres * (par->yres - 1);
+                }
+                divider = par->mode->pixclk_divider_rotated;
+        }
 
-        /* Re-enable display updates */
-        writel(0x0000007b, remapped_regs + mmDISP_DB_BUF_CNTL);
+        graphic_ctrl.val = 0; /* w32xx doesn't like undefined bits */
+        switch (par->chip_id) {
+                case CHIP_ID_W100:
+                        graphic_ctrl.f_w100.color_depth=6;
+                        graphic_ctrl.f_w100.en_crtc=1;
+                        graphic_ctrl.f_w100.en_graphic_req=1;
+                        graphic_ctrl.f_w100.en_graphic_crtc=1;
+                        graphic_ctrl.f_w100.lcd_pclk_on=1;
+                        graphic_ctrl.f_w100.lcd_sclk_on=1;
+                        graphic_ctrl.f_w100.low_power_on=0;
+                        graphic_ctrl.f_w100.req_freq=0;
+                        graphic_ctrl.f_w100.portrait_mode=rot;
+
+                        /* Zaurus needs this */
+                        switch(par->xres) {
+                                case 240:
+                                case 320:
+                                default:
+                                        graphic_ctrl.f_w100.total_req_graphic=0xa0;
+                                        break;
+                                case 480:
+                                case 640:
+                                        switch(rot) {
+                                                case 0:  /* 0 */
+                                                case 3:  /* 180 */
+                                                        graphic_ctrl.f_w100.low_power_on=1;
+                                                        graphic_ctrl.f_w100.req_freq=5;
+                                                break;
+                                                case 1:  /* 90 */
+                                                case 2:  /* 270 */
+                                                        graphic_ctrl.f_w100.req_freq=4;
+                                                        break;
+                                                default:
+                                                        break;
+                                        }
+                                        graphic_ctrl.f_w100.total_req_graphic=0xf0;
+                                        break;
+                        }
+                        break;
+                case CHIP_ID_W3200:
+                case CHIP_ID_W3220:
+                        graphic_ctrl.f_w32xx.color_depth=6;
+                        graphic_ctrl.f_w32xx.en_crtc=1;
+                        graphic_ctrl.f_w32xx.en_graphic_req=1;
+                        graphic_ctrl.f_w32xx.en_graphic_crtc=1;
+                        graphic_ctrl.f_w32xx.lcd_pclk_on=1;
+                        graphic_ctrl.f_w32xx.lcd_sclk_on=1;
+                        graphic_ctrl.f_w32xx.low_power_on=0;
+                        graphic_ctrl.f_w32xx.req_freq=0;
+                        graphic_ctrl.f_w32xx.total_req_graphic=par->mode->xres >> 1; /* panel xres, not mode */
+                        graphic_ctrl.f_w32xx.portrait_mode=rot;
+                        break;
+        }
+
+        /* Set the pixel clock source and divider */
+        w100_pwr_state.pclk_cntl.f.pclk_src_sel = par->mode->pixclk_src;
+        w100_pwr_state.pclk_cntl.f.pclk_post_div = divider;
+        writel((u32) (w100_pwr_state.pclk_cntl.val), remapped_regs + mmPCLK_CNTL);
+
+        writel(graphic_ctrl.val, remapped_regs + mmGRAPHIC_CTRL);
+        writel(W100_FB_BASE + ((offset * BITS_PER_PIXEL/8)&~0x03UL), remapped_regs + mmGRAPHIC_OFFSET);
+        writel((par->xres*BITS_PER_PIXEL/8), remapped_regs + mmGRAPHIC_PITCH);
 }
 
 
-static void w100_init_qvga_rotation(u16 deg)
+/*
+ * Work out how long the sync pulse lasts
+ * Value is 1/(time in seconds)
+ */
+static void calc_hsync(struct w100fb_par *par)
 {
-        switch(deg) {
-        case 0:
-                w100_set_qvga_rotation_regs(0x00d41c06, 0x00800000, 0x000001e0);
-                break;
-        case 90:
-                w100_set_qvga_rotation_regs(0x00d41c0E, 0x00825580, 0x00000280);
-                break;
-        case 180:
-                w100_set_qvga_rotation_regs(0x00d41c1e, 0x008257fc, 0x000001e0);
-                break;
-        case 270:
-                w100_set_qvga_rotation_regs(0x00d41c16, 0x0080027c, 0x00000280);
-                break;
-        default:
-                /* not-support */
-                break;
-        }
-}
+        unsigned long hsync;
+        struct w100_mode *mode = par->mode;
+        union crtc_ss_u crtc_ss;
+
+        if (mode->pixclk_src == CLK_SRC_XTAL)
+                hsync=par->mach->xtal_freq;
+        else
+                hsync=((par->fastpll_mode && mode->fast_pll_freq) ? mode->fast_pll_freq : mode->pll_freq)*100000;
 
+        hsync /= (w100_pwr_state.pclk_cntl.f.pclk_post_div + 1);
+
+        crtc_ss.val = readl(remapped_regs + mmCRTC_SS);
+        if (crtc_ss.val)
+                par->hsync_len = hsync / (crtc_ss.f.ss_end-crtc_ss.f.ss_start);
+        else
+                par->hsync_len = 0;
+}
 
 static void w100_suspend(u32 mode)
 {
@@ -1387,30 +1377,28 @@ static void w100_suspend(u32 mode)
         writel(0x00FF0000, remapped_regs + mmMC_PERF_MON_CNTL);
 
         val = readl(remapped_regs + mmMEM_EXT_TIMING_CNTL);
-        val &= ~(0x00100000);   /* bit20=0 */
-        val |= 0xFF000000;      /* bit31:24=0xff */
+        val &= ~(0x00100000);  /* bit20=0 */
+        val |= 0xFF000000;     /* bit31:24=0xff */
         writel(val, remapped_regs + mmMEM_EXT_TIMING_CNTL);
 
         val = readl(remapped_regs + mmMEM_EXT_CNTL);
-        val &= ~(0x00040000);   /* bit18=0 */
-        val |= 0x00080000;      /* bit19=1 */
+        val &= ~(0x00040000);  /* bit18=0 */
+        val |= 0x00080000;     /* bit19=1 */
         writel(val, remapped_regs + mmMEM_EXT_CNTL);
 
-        udelay(1);              /* wait 1us */
+        udelay(1);  /* wait 1us */
 
         if (mode == W100_SUSPEND_EXTMEM) {
-
                 /* CKE: Tri-State */
                 val = readl(remapped_regs + mmMEM_EXT_CNTL);
-                val |= 0x40000000;      /* bit30=1 */
+                val |= 0x40000000;  /* bit30=1 */
                 writel(val, remapped_regs + mmMEM_EXT_CNTL);
 
                 /* CLK: Stop */
                 val = readl(remapped_regs + mmMEM_EXT_CNTL);
-                val &= ~(0x00000001);   /* bit0=0 */
+                val &= ~(0x00000001);  /* bit0=0 */
                 writel(val, remapped_regs + mmMEM_EXT_CNTL);
         } else {
-
                 writel(0x00000000, remapped_regs + mmSCLK_CNTL);
                 writel(0x000000BF, remapped_regs + mmCLK_PIN_CNTL);
                 writel(0x00000015, remapped_regs + mmPWRMGT_CNTL);
@@ -1418,43 +1406,16 @@ static void w100_suspend(u32 mode)
                 udelay(5);
 
                 val = readl(remapped_regs + mmPLL_CNTL);
-                val |= 0x00000004;      /* bit2=1 */
+                val |= 0x00000004;  /* bit2=1 */
                 writel(val, remapped_regs + mmPLL_CNTL);
                 writel(0x0000001d, remapped_regs + mmPWRMGT_CNTL);
         }
 }
 
-
-static void w100_resume(void)
-{
-        u32 temp32;
-
-        w100_hw_init();
-        w100_pwm_setup();
-
-        temp32 = readl(remapped_regs + mmDISP_DEBUG2);
-        temp32 &= 0xff7fffff;
-        temp32 |= 0x00800000;
-        writel(temp32, remapped_regs + mmDISP_DEBUG2);
-
-        if (current_par->lcdMode == LCD_MODE_480 || current_par->lcdMode == LCD_MODE_640) {
-                w100_init_sharp_lcd(LCD_SHARP_VGA);
-                if (current_par->lcdMode == LCD_MODE_640) {
-                        w100_init_vga_rotation(current_par->rotation_flag ? 270 : 90);
-                }
-        } else {
-                w100_init_sharp_lcd(LCD_SHARP_QVGA);
-                if (current_par->lcdMode == LCD_MODE_320) {
-                        w100_init_qvga_rotation(current_par->rotation_flag ? 270 : 90);
-                }
-        }
-}
-
-
 static void w100_vsync(void)
 {
         u32 tmp;
-        int timeout = 30000; /* VSync timeout = 30[ms] > 16.8[ms] */
+        int timeout = 30000;  /* VSync timeout = 30[ms] > 16.8[ms] */
 
         tmp = readl(remapped_regs + mmACTIVE_V_DISP);
 
@@ -1490,363 +1451,6 @@ static void w100_vsync(void)
         writel(0x00000002, remapped_regs + mmGEN_INT_STATUS);
 }
 
-
-static void w100_InitExtMem(u32 mode)
-{
-        switch(mode) {
-        case LCD_SHARP_QVGA:
-                /* QVGA doesn't use external memory
-                   nothing to do, really. */
-                break;
-        case LCD_SHARP_VGA:
-                writel(0x00007800, remapped_regs + mmMC_BIST_CTRL);
-                writel(0x00040003, remapped_regs + mmMEM_EXT_CNTL);
-                writel(0x00200021, remapped_regs + mmMEM_SDRAM_MODE_REG);
-                udelay(100);
-                writel(0x80200021, remapped_regs + mmMEM_SDRAM_MODE_REG);
-                udelay(100);
-                writel(0x00650021, remapped_regs + mmMEM_SDRAM_MODE_REG);
-                udelay(100);
-                writel(0x10002a4a, remapped_regs + mmMEM_EXT_TIMING_CNTL);
-                writel(0x7ff87012, remapped_regs + mmMEM_IO_CNTL);
-                break;
-        default:
-                break;
-        }
-}
-
-
-#define RESCTL_ADRS     0x00
-#define PHACTRL_ADRS    0x01
-#define DUTYCTRL_ADRS   0x02
-#define POWERREG0_ADRS  0x03
-#define POWERREG1_ADRS  0x04
-#define GPOR3_ADRS              0x05
-#define PICTRL_ADRS     0x06
-#define POLCTRL_ADRS    0x07
-
-#define RESCTL_QVGA     0x01
-#define RESCTL_VGA      0x00
-
-#define POWER1_VW_ON    0x01    /* VW Supply FET ON */
-#define POWER1_GVSS_ON  0x02    /* GVSS(-8V) Power Supply ON */
-#define POWER1_VDD_ON   0x04    /* VDD(8V),SVSS(-4V) Power Supply ON */
-
-#define POWER1_VW_OFF   0x00    /* VW Supply FET OFF */
-#define POWER1_GVSS_OFF 0x00    /* GVSS(-8V) Power Supply OFF */
-#define POWER1_VDD_OFF  0x00    /* VDD(8V),SVSS(-4V) Power Supply OFF */
-
-#define POWER0_COM_DCLK 0x01    /* COM Voltage DC Bias DAC Serial Data Clock */
-#define POWER0_COM_DOUT 0x02    /* COM Voltage DC Bias DAC Serial Data Out */
-#define POWER0_DAC_ON   0x04    /* DAC Power Supply ON */
-#define POWER0_COM_ON   0x08    /* COM Powewr Supply ON */
-#define POWER0_VCC5_ON  0x10    /* VCC5 Power Supply ON */
-
-#define POWER0_DAC_OFF  0x00    /* DAC Power Supply OFF */
-#define POWER0_COM_OFF  0x00    /* COM Powewr Supply OFF */
-#define POWER0_VCC5_OFF 0x00    /* VCC5 Power Supply OFF */
-
-#define PICTRL_INIT_STATE       0x01
-#define PICTRL_INIOFF           0x02
-#define PICTRL_POWER_DOWN       0x04
-#define PICTRL_COM_SIGNAL_OFF   0x08
-#define PICTRL_DAC_SIGNAL_OFF   0x10
-
-#define PICTRL_POWER_ACTIVE     (0)
-
-#define POLCTRL_SYNC_POL_FALL   0x01
-#define POLCTRL_EN_POL_FALL     0x02
-#define POLCTRL_DATA_POL_FALL   0x04
-#define POLCTRL_SYNC_ACT_H      0x08
-#define POLCTRL_EN_ACT_L        0x10
-
-#define POLCTRL_SYNC_POL_RISE   0x00
-#define POLCTRL_EN_POL_RISE     0x00
-#define POLCTRL_DATA_POL_RISE   0x00
-#define POLCTRL_SYNC_ACT_L      0x00
-#define POLCTRL_EN_ACT_H        0x00
-
-#define PHACTRL_PHASE_MANUAL    0x01
-
-#define PHAD_QVGA_DEFAULT_VAL (9)
-#define COMADJ_DEFAULT        (125)
-
-static void lcdtg_ssp_send(u8 adrs, u8 data)
-{
-        w100fb_ssp_send(adrs,data);
-}
-
-/*
- * This is only a psuedo I2C interface. We can't use the standard kernel
- * routines as the interface is write only. We just assume the data is acked...
- */
-static void lcdtg_ssp_i2c_send(u8 data)
-{
-        lcdtg_ssp_send(POWERREG0_ADRS, data);
-        udelay(10);
-}
-
-static void lcdtg_i2c_send_bit(u8 data)
-{
-        lcdtg_ssp_i2c_send(data);
-        lcdtg_ssp_i2c_send(data | POWER0_COM_DCLK);
-        lcdtg_ssp_i2c_send(data);
-}
-
-static void lcdtg_i2c_send_start(u8 base)
-{
-        lcdtg_ssp_i2c_send(base | POWER0_COM_DCLK | POWER0_COM_DOUT);
-        lcdtg_ssp_i2c_send(base | POWER0_COM_DCLK);
-        lcdtg_ssp_i2c_send(base);
-}
-
-static void lcdtg_i2c_send_stop(u8 base)
-{
-        lcdtg_ssp_i2c_send(base);
-        lcdtg_ssp_i2c_send(base | POWER0_COM_DCLK);
-        lcdtg_ssp_i2c_send(base | POWER0_COM_DCLK | POWER0_COM_DOUT);
-}
-
-static void lcdtg_i2c_send_byte(u8 base, u8 data)
-{
-        int i;
-        for (i = 0; i < 8; i++) {
-                if (data & 0x80)
-                        lcdtg_i2c_send_bit(base | POWER0_COM_DOUT);
-                else
-                        lcdtg_i2c_send_bit(base);
-                data <<= 1;
-        }
-}
-
-static void lcdtg_i2c_wait_ack(u8 base)
-{
-        lcdtg_i2c_send_bit(base);
-}
-
-static void lcdtg_set_common_voltage(u8 base_data, u8 data)
-{
-        /* Set Common Voltage to M62332FP via I2C */
-        lcdtg_i2c_send_start(base_data);
-        lcdtg_i2c_send_byte(base_data, 0x9c);
-        lcdtg_i2c_wait_ack(base_data);
-        lcdtg_i2c_send_byte(base_data, 0x00);
-        lcdtg_i2c_wait_ack(base_data);
-        lcdtg_i2c_send_byte(base_data, data);
-        lcdtg_i2c_wait_ack(base_data);
-        lcdtg_i2c_send_stop(base_data);
-}
-
-static struct lcdtg_register_setting {
-        u8 adrs;
-        u8 data;
-        u32 wait;
-} lcdtg_power_on_table[] = {
-
-    /* Initialize Internal Logic & Port */
-    { PICTRL_ADRS,
-      PICTRL_POWER_DOWN | PICTRL_INIOFF | PICTRL_INIT_STATE |
-      PICTRL_COM_SIGNAL_OFF | PICTRL_DAC_SIGNAL_OFF,
-      0 },
-
-    { POWERREG0_ADRS,
-      POWER0_COM_DCLK | POWER0_COM_DOUT | POWER0_DAC_OFF | POWER0_COM_OFF |
-      POWER0_VCC5_OFF,
-      0 },
-
-    { POWERREG1_ADRS,
-      POWER1_VW_OFF | POWER1_GVSS_OFF | POWER1_VDD_OFF,
-      0 },
-
-    /* VDD(+8V),SVSS(-4V) ON */
-    { POWERREG1_ADRS,
-      POWER1_VW_OFF | POWER1_GVSS_OFF | POWER1_VDD_ON /* VDD ON */,
-      3000 },
-
-    /* DAC ON */
-    { POWERREG0_ADRS,
-      POWER0_COM_DCLK | POWER0_COM_DOUT | POWER0_DAC_ON /* DAC ON */ |
-      POWER0_COM_OFF | POWER0_VCC5_OFF,
-      0 },
-
-    /* INIB = H, INI = L  */
-    { PICTRL_ADRS,
-      /* PICTL[0] = H , PICTL[1] = PICTL[2] = PICTL[4] = L */
-      PICTRL_INIT_STATE | PICTRL_COM_SIGNAL_OFF,
-      0 },
-
-    /* Set Common Voltage */
-    { 0xfe, 0, 0 },
-
-    /* VCC5 ON */
-    { POWERREG0_ADRS,
-      POWER0_COM_DCLK | POWER0_COM_DOUT | POWER0_DAC_ON /* DAC ON */ |
-      POWER0_COM_OFF | POWER0_VCC5_ON /* VCC5 ON */,
-      0 },
-
-    /* GVSS(-8V) ON */
-    { POWERREG1_ADRS,
-      POWER1_VW_OFF | POWER1_GVSS_ON /* GVSS ON */ |
-      POWER1_VDD_ON /* VDD ON */,
-      2000 },
-
-    /* COM SIGNAL ON (PICTL[3] = L) */
-    { PICTRL_ADRS,
-      PICTRL_INIT_STATE,
-      0 },
-
-    /* COM ON */
-    { POWERREG0_ADRS,
-      POWER0_COM_DCLK | POWER0_COM_DOUT | POWER0_DAC_ON /* DAC ON */ |
-      POWER0_COM_ON /* COM ON */ | POWER0_VCC5_ON /* VCC5_ON */,
-      0 },
-
-    /* VW ON */
-    { POWERREG1_ADRS,
-      POWER1_VW_ON /* VW ON */ | POWER1_GVSS_ON /* GVSS ON */ |
-      POWER1_VDD_ON /* VDD ON */,
-      0 /* Wait 100ms */ },
-
-    /* Signals output enable */
-    { PICTRL_ADRS,
-      0 /* Signals output enable */,
-      0 },
-
-    { PHACTRL_ADRS,
-      PHACTRL_PHASE_MANUAL,
-      0 },
-
-    /* Initialize for Input Signals from ATI */
-    { POLCTRL_ADRS,
-      POLCTRL_SYNC_POL_RISE | POLCTRL_EN_POL_RISE | POLCTRL_DATA_POL_RISE |
-      POLCTRL_SYNC_ACT_L | POLCTRL_EN_ACT_H,
-      1000 /*100000*/ /* Wait 100ms */ },
-
-    /* end mark */
-    { 0xff, 0, 0 }
-};
-
-static void lcdtg_resume(void)
-{
-        if (current_par->lcdMode == LCD_MODE_480 || current_par->lcdMode == LCD_MODE_640) {
-                lcdtg_hw_init(LCD_SHARP_VGA);
-        } else {
-                lcdtg_hw_init(LCD_SHARP_QVGA);
-        }
-}
-
-static void lcdtg_suspend(void)
-{
-        int i;
-
-        for (i = 0; i < (current_par->xres * current_par->yres); i++) {
-                writew(0xffff, remapped_fbuf + (2*i));
-        }
-
-        /* 60Hz x 2 frame = 16.7msec x 2 = 33.4 msec */
-        mdelay(34);
-
-        /* (1)VW OFF */
-        lcdtg_ssp_send(POWERREG1_ADRS, POWER1_VW_OFF | POWER1_GVSS_ON | POWER1_VDD_ON);
-
-        /* (2)COM OFF */
-        lcdtg_ssp_send(PICTRL_ADRS, PICTRL_COM_SIGNAL_OFF);
-        lcdtg_ssp_send(POWERREG0_ADRS, POWER0_DAC_ON | POWER0_COM_OFF | POWER0_VCC5_ON);
-
-        /* (3)Set Common Voltage Bias 0V */
-        lcdtg_set_common_voltage(POWER0_DAC_ON | POWER0_COM_OFF | POWER0_VCC5_ON, 0);
-
-        /* (4)GVSS OFF */
-        lcdtg_ssp_send(POWERREG1_ADRS, POWER1_VW_OFF | POWER1_GVSS_OFF | POWER1_VDD_ON);
-
-        /* (5)VCC5 OFF */
-        lcdtg_ssp_send(POWERREG0_ADRS, POWER0_DAC_ON | POWER0_COM_OFF | POWER0_VCC5_OFF);
-
-        /* (6)Set PDWN, INIOFF, DACOFF */
-        lcdtg_ssp_send(PICTRL_ADRS, PICTRL_INIOFF | PICTRL_DAC_SIGNAL_OFF |
-                        PICTRL_POWER_DOWN | PICTRL_COM_SIGNAL_OFF);
-
-        /* (7)DAC OFF */
-        lcdtg_ssp_send(POWERREG0_ADRS, POWER0_DAC_OFF | POWER0_COM_OFF | POWER0_VCC5_OFF);
-
-        /* (8)VDD OFF */
-        lcdtg_ssp_send(POWERREG1_ADRS, POWER1_VW_OFF | POWER1_GVSS_OFF | POWER1_VDD_OFF);
-
-}
-
-static void lcdtg_set_phadadj(u32 mode)
-{
-        int adj;
-
-        if (mode == LCD_SHARP_VGA) {
-                /* Setting for VGA */
-                adj = current_par->phadadj;
-                if (adj < 0) {
-                        adj = PHACTRL_PHASE_MANUAL;
-                } else {
-                        adj = ((adj & 0x0f) << 1) | PHACTRL_PHASE_MANUAL;
-                }
-        } else {
-                /* Setting for QVGA */
-                adj = (PHAD_QVGA_DEFAULT_VAL << 1) | PHACTRL_PHASE_MANUAL;
-        }
-        lcdtg_ssp_send(PHACTRL_ADRS, adj);
-}
-
-static void lcdtg_hw_init(u32 mode)
-{
-        int i;
-        int comadj;
-
-        i = 0;
-        while(lcdtg_power_on_table[i].adrs != 0xff) {
-                if (lcdtg_power_on_table[i].adrs == 0xfe) {
-                        /* Set Common Voltage */
-                        comadj = current_par->comadj;
-                        if (comadj < 0) {
-                                comadj = COMADJ_DEFAULT;
-                        }
-                        lcdtg_set_common_voltage((POWER0_DAC_ON | POWER0_COM_OFF | POWER0_VCC5_OFF), comadj);
-                } else if (lcdtg_power_on_table[i].adrs == PHACTRL_ADRS) {
-                        /* Set Phase Adjuct */
-                        lcdtg_set_phadadj(mode);
-                } else {
-                        /* Other */
-                        lcdtg_ssp_send(lcdtg_power_on_table[i].adrs, lcdtg_power_on_table[i].data);
-                }
-                if (lcdtg_power_on_table[i].wait != 0)
-                        udelay(lcdtg_power_on_table[i].wait);
-                i++;
-        }
-
-        switch(mode) {
-        case LCD_SHARP_QVGA:
-                /* Set Lcd Resolution (QVGA) */
-                lcdtg_ssp_send(RESCTL_ADRS, RESCTL_QVGA);
-                break;
-        case LCD_SHARP_VGA:
-                /* Set Lcd Resolution (VGA) */
-                lcdtg_ssp_send(RESCTL_ADRS, RESCTL_VGA);
-                break;
-        default:
-                break;
-        }
-}
-
-static void lcdtg_lcd_change(u32 mode)
-{
-        /* Set Phase Adjuct */
-        lcdtg_set_phadadj(mode);
-
-        if (mode == LCD_SHARP_VGA)
-                /* Set Lcd Resolution (VGA) */
-                lcdtg_ssp_send(RESCTL_ADRS, RESCTL_VGA);
-        else if (mode == LCD_SHARP_QVGA)
-                /* Set Lcd Resolution (QVGA) */
-                lcdtg_ssp_send(RESCTL_ADRS, RESCTL_QVGA);
-}
-
-
 static struct device_driver w100fb_driver = {
         .name           = "w100fb",
         .bus            = &platform_bus_type,
@@ -1870,4 +1474,4 @@ module_init(w100fb_init);
 module_exit(w100fb_cleanup);
 
 MODULE_DESCRIPTION("ATI Imageon w100 framebuffer driver");
-MODULE_LICENSE("GPLv2");
+MODULE_LICENSE("GPL");
diff --git a/drivers/video/w100fb.h b/drivers/video/w100fb.h
index 41624f96123..7a58a1e3e42 100644
--- a/drivers/video/w100fb.h
+++ b/drivers/video/w100fb.h
@@ -5,9 +5,12 @@
  *
  * Copyright (C) 2002, ATI Corp.
  * Copyright (C) 2004-2005 Richard Purdie
+ * Copyright (c) 2005 Ian Molton <spyro@f2s.com>
  *
  * Modified to work with 2.6 by Richard Purdie <rpurdie@rpsys.net>
  *
+ * w32xx support by Ian Molton
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
@@ -19,7 +22,7 @@
 
 /* Block CIF Start: */
 #define mmCHIP_ID           0x0000
-#define mmREVISION_ID           0x0004
+#define mmREVISION_ID       0x0004
 #define mmWRAP_BUF_A        0x0008
 #define mmWRAP_BUF_B        0x000C
 #define mmWRAP_TOP_DIR      0x0010
@@ -88,7 +91,7 @@
 #define mmDISP_DEBUG        0x04D4
 #define mmDISP_DB_BUF_CNTL  0x04D8
 #define mmDISP_CRC_SIG      0x04DC
-#define mmCRTC_DEFAULT_COUNT    0x04E0
+#define mmCRTC_DEFAULT_COUNT    0x04E0
 #define mmLCD_BACKGROUND_COLOR  0x04E4
 #define mmCRTC_PS2          0x04E8
 #define mmCRTC_PS2_VPOS     0x04EC
@@ -119,17 +122,17 @@
 /* Block DISPLAY End: */
 
 /* Block GFX Start: */
-#define mmBRUSH_OFFSET      0x108C
-#define mmBRUSH_Y_X         0x1074
-#define mmDEFAULT_PITCH_OFFSET          0x10A0
-#define mmDEFAULT_SC_BOTTOM_RIGHT       0x10A8
-#define mmDEFAULT2_SC_BOTTOM_RIGHT      0x10AC
-#define mmGLOBAL_ALPHA      0x1210
-#define mmFILTER_COEF       0x1214
-#define mmMVC_CNTL_START    0x11E0
-#define mmE2_ARITHMETIC_CNTL    0x1220
-#define mmENG_CNTL          0x13E8
-#define mmENG_PERF_CNT      0x13F0
+#define mmBRUSH_OFFSET        0x108C
+#define mmBRUSH_Y_X           0x1074
+#define mmDEFAULT_PITCH_OFFSET      0x10A0
+#define mmDEFAULT_SC_BOTTOM_RIGHT   0x10A8
+#define mmDEFAULT2_SC_BOTTOM_RIGHT  0x10AC
+#define mmGLOBAL_ALPHA        0x1210
+#define mmFILTER_COEF         0x1214
+#define mmMVC_CNTL_START      0x11E0
+#define mmE2_ARITHMETIC_CNTL  0x1220
+#define mmENG_CNTL            0x13E8
+#define mmENG_PERF_CNT        0x13F0
 /* Block GFX End: */
 
 /* Block IDCT Start: */
@@ -141,22 +144,38 @@
 /* Block IDCT End: */
 
 /* Block MC Start: */
-#define mmMEM_CNTL          0x0180
-#define mmMEM_ARB           0x0184
-#define mmMC_FB_LOCATION    0x0188
-#define mmMEM_EXT_CNTL      0x018C
-#define mmMC_EXT_MEM_LOCATION   0x0190
-#define mmMEM_EXT_TIMING_CNTL   0x0194
-#define mmMEM_SDRAM_MODE_REG    0x0198
-#define mmMEM_IO_CNTL       0x019C
-#define mmMC_DEBUG          0x01A0
-#define mmMC_BIST_CTRL      0x01A4
-#define mmMC_BIST_COLLAR_READ   0x01A8
-#define mmTC_MISMATCH       0x01AC
-#define mmMC_PERF_MON_CNTL  0x01B0
-#define mmMC_PERF_COUNTERS  0x01B4
+#define mmMEM_CNTL             0x0180
+#define mmMEM_ARB              0x0184
+#define mmMC_FB_LOCATION       0x0188
+#define mmMEM_EXT_CNTL         0x018C
+#define mmMC_EXT_MEM_LOCATION  0x0190
+#define mmMEM_EXT_TIMING_CNTL  0x0194
+#define mmMEM_SDRAM_MODE_REG   0x0198
+#define mmMEM_IO_CNTL          0x019C
+#define mmMC_DEBUG             0x01A0
+#define mmMC_BIST_CTRL         0x01A4
+#define mmMC_BIST_COLLAR_READ  0x01A8
+#define mmTC_MISMATCH          0x01AC
+#define mmMC_PERF_MON_CNTL     0x01B0
+#define mmMC_PERF_COUNTERS     0x01B4
 /* Block MC End: */
 
+/* Block BM Start: */
+#define mmBM_EXT_MEM_BANDWIDTH    0x0A00
+#define mmBM_OFFSET               0x0A04
+#define mmBM_MEM_EXT_TIMING_CNTL  0x0A08
+#define mmBM_MEM_EXT_CNTL         0x0A0C
+#define mmBM_MEM_MODE_REG         0x0A10
+#define mmBM_MEM_IO_CNTL          0x0A18
+#define mmBM_CONFIG               0x0A1C
+#define mmBM_STATUS               0x0A20
+#define mmBM_DEBUG                0x0A24
+#define mmBM_PERF_MON_CNTL        0x0A28
+#define mmBM_PERF_COUNTERS        0x0A2C
+#define mmBM_PERF2_MON_CNTL       0x0A30
+#define mmBM_PERF2_COUNTERS       0x0A34
+/* Block BM End: */
+
 /* Block RBBM Start: */
 #define mmWAIT_UNTIL        0x1400
 #define mmISYNC_CNTL        0x1404
@@ -176,439 +195,575 @@
 /* Block CG End: */
 
 /* default value definitions */
-#define defWRAP_TOP_DIR     0x00000000
-#define defWRAP_START_DIR       0x00000000
-#define defCFGREG_BASE      0x00000000
-#define defCIF_IO           0x000C0902
-#define defINTF_CNTL        0x00000011
-#define defCPU_DEFAULTS     0x00000006
-#define defHW_INT           0x00000000
-#define defMC_EXT_MEM_LOCATION            0x07ff0000
-#define defTC_MISMATCH      0x00000000
+#define defWRAP_TOP_DIR        0x00000000
+#define defWRAP_START_DIR      0x00000000
+#define defCFGREG_BASE         0x00000000
+#define defCIF_IO              0x000C0902
+#define defINTF_CNTL           0x00000011
+#define defCPU_DEFAULTS        0x00000006
+#define defHW_INT              0x00000000
+#define defMC_EXT_MEM_LOCATION 0x07ff0000
+#define defTC_MISMATCH         0x00000000
 
 #define W100_CFG_BASE          0x0
 #define W100_CFG_LEN           0x10
 #define W100_REG_BASE          0x10000
 #define W100_REG_LEN           0x2000
 #define MEM_INT_BASE_VALUE     0x100000
-#define MEM_INT_TOP_VALUE_W100 0x15ffff
 #define MEM_EXT_BASE_VALUE     0x800000
-#define MEM_EXT_TOP_VALUE      0x9fffff
+#define MEM_INT_SIZE           0x05ffff
+#define MEM_WINDOW_BASE        0x100000
+#define MEM_WINDOW_SIZE        0xf00000
+
 #define WRAP_BUF_BASE_VALUE    0x80000
 #define WRAP_BUF_TOP_VALUE     0xbffff
 
+#define CHIP_ID_W100           0x57411002
+#define CHIP_ID_W3200          0x56441002
+#define CHIP_ID_W3220          0x57441002
 
-/* data structure definitions */
+/* Register structure definitions */
 
 struct wrap_top_dir_t {
-     unsigned long top_addr         : 23;
-     unsigned long                              : 9;
+        unsigned long top_addr  : 23;
+        unsigned long           : 9;
 } __attribute__((packed));
 
 union wrap_top_dir_u {
-     unsigned long val : 32;
-     struct wrap_top_dir_t f;
+        unsigned long val : 32;
+        struct wrap_top_dir_t f;
 } __attribute__((packed));
 
 struct wrap_start_dir_t {
-     unsigned long start_addr       : 23;
-     unsigned long                              : 9;
+        unsigned long start_addr : 23;
+        unsigned long            : 9;
 } __attribute__((packed));
 
 union wrap_start_dir_u {
-     unsigned long val : 32;
-     struct wrap_start_dir_t f;
+        unsigned long val : 32;
+        struct wrap_start_dir_t f;
 } __attribute__((packed));
 
 struct cif_cntl_t {
-     unsigned long swap_reg                     : 2;
-     unsigned long swap_fbuf_1                  : 2;
-     unsigned long swap_fbuf_2                  : 2;
-     unsigned long swap_fbuf_3                  : 2;
-     unsigned long pmi_int_disable              : 1;
-     unsigned long pmi_schmen_disable       : 1;
-     unsigned long intb_oe                      : 1;
-     unsigned long en_wait_to_compensate_dq_prop_dly : 1;
-     unsigned long compensate_wait_rd_size  : 2;
-     unsigned long wait_asserted_timeout_val      : 2;
-     unsigned long wait_masked_val              : 2;
-     unsigned long en_wait_timeout              : 1;
-     unsigned long en_one_clk_setup_before_wait   : 1;
-     unsigned long interrupt_active_high    : 1;
-     unsigned long en_overwrite_straps      : 1;
-     unsigned long strap_wait_active_hi     : 1;
-     unsigned long lat_busy_count               : 2;
-     unsigned long lat_rd_pm4_sclk_busy     : 1;
-     unsigned long dis_system_bits              : 1;
-     unsigned long dis_mr                       : 1;
-     unsigned long cif_spare_1                  : 4;
+        unsigned long swap_reg                 : 2;
+        unsigned long swap_fbuf_1              : 2;
+        unsigned long swap_fbuf_2              : 2;
+        unsigned long swap_fbuf_3              : 2;
+        unsigned long pmi_int_disable          : 1;
+        unsigned long pmi_schmen_disable       : 1;
+        unsigned long intb_oe                  : 1;
+        unsigned long en_wait_to_compensate_dq_prop_dly  : 1;
+        unsigned long compensate_wait_rd_size  : 2;
+        unsigned long wait_asserted_timeout_val  : 2;
+        unsigned long wait_masked_val          : 2;
+        unsigned long en_wait_timeout          : 1;
+        unsigned long en_one_clk_setup_before_wait  : 1;
+        unsigned long interrupt_active_high    : 1;
+        unsigned long en_overwrite_straps      : 1;
+        unsigned long strap_wait_active_hi     : 1;
+        unsigned long lat_busy_count           : 2;
+        unsigned long lat_rd_pm4_sclk_busy     : 1;
+        unsigned long dis_system_bits          : 1;
+        unsigned long dis_mr                   : 1;
+        unsigned long cif_spare_1              : 4;
 } __attribute__((packed));
 
 union cif_cntl_u {
-     unsigned long val : 32;
-     struct cif_cntl_t f;
+        unsigned long val : 32;
+        struct cif_cntl_t f;
 } __attribute__((packed));
 
 struct cfgreg_base_t {
-     unsigned long cfgreg_base      : 24;
-     unsigned long                              : 8;
+        unsigned long cfgreg_base  : 24;
+        unsigned long              : 8;
 } __attribute__((packed));
 
 union cfgreg_base_u {
-     unsigned long val : 32;
-     struct cfgreg_base_t f;
+        unsigned long val : 32;
+        struct cfgreg_base_t f;
 } __attribute__((packed));
 
 struct cif_io_t {
-     unsigned long dq_srp           : 1;
-     unsigned long dq_srn           : 1;
-     unsigned long dq_sp            : 4;
-     unsigned long dq_sn            : 4;
-     unsigned long waitb_srp        : 1;
-     unsigned long waitb_srn        : 1;
-     unsigned long waitb_sp         : 4;
-     unsigned long waitb_sn         : 4;
-     unsigned long intb_srp         : 1;
-     unsigned long intb_srn         : 1;
-     unsigned long intb_sp          : 4;
-     unsigned long intb_sn          : 4;
-     unsigned long                              : 2;
+        unsigned long dq_srp     : 1;
+        unsigned long dq_srn     : 1;
+        unsigned long dq_sp      : 4;
+        unsigned long dq_sn      : 4;
+        unsigned long waitb_srp  : 1;
+        unsigned long waitb_srn  : 1;
+        unsigned long waitb_sp   : 4;
+        unsigned long waitb_sn   : 4;
+        unsigned long intb_srp   : 1;
+        unsigned long intb_srn   : 1;
+        unsigned long intb_sp    : 4;
+        unsigned long intb_sn    : 4;
+        unsigned long            : 2;
 } __attribute__((packed));
 
 union cif_io_u {
-     unsigned long val : 32;
-     struct cif_io_t f;
+        unsigned long val : 32;
+        struct cif_io_t f;
 } __attribute__((packed));
 
 struct cif_read_dbg_t {
-     unsigned long unpacker_pre_fetch_trig_gen  : 2;
-     unsigned long dly_second_rd_fetch_trig     : 1;
-     unsigned long rst_rd_burst_id                      : 1;
-     unsigned long dis_rd_burst_id                      : 1;
-     unsigned long en_block_rd_when_packer_is_not_emp : 1;
-     unsigned long dis_pre_fetch_cntl_sm        : 1;
-     unsigned long rbbm_chrncy_dis                      : 1;
-     unsigned long rbbm_rd_after_wr_lat         : 2;
-     unsigned long dis_be_during_rd                     : 1;
-     unsigned long one_clk_invalidate_pulse     : 1;
-     unsigned long dis_chnl_priority                    : 1;
-     unsigned long rst_read_path_a_pls          : 1;
-     unsigned long rst_read_path_b_pls          : 1;
-     unsigned long dis_reg_rd_fetch_trig        : 1;
-     unsigned long dis_rd_fetch_trig_from_ind_addr : 1;
-     unsigned long dis_rd_same_byte_to_trig_fetch : 1;
-     unsigned long dis_dir_wrap                         : 1;
-     unsigned long dis_ring_buf_to_force_dec    : 1;
-     unsigned long dis_addr_comp_in_16bit       : 1;
-     unsigned long clr_w                                : 1;
-     unsigned long err_rd_tag_is_3                      : 1;
-     unsigned long err_load_when_ful_a          : 1;
-     unsigned long err_load_when_ful_b          : 1;
-     unsigned long                                                      : 7;
+        unsigned long unpacker_pre_fetch_trig_gen  : 2;
+        unsigned long dly_second_rd_fetch_trig     : 1;
+        unsigned long rst_rd_burst_id              : 1;
+        unsigned long dis_rd_burst_id              : 1;
+        unsigned long en_block_rd_when_packer_is_not_emp : 1;
+        unsigned long dis_pre_fetch_cntl_sm        : 1;
+        unsigned long rbbm_chrncy_dis              : 1;
+        unsigned long rbbm_rd_after_wr_lat         : 2;
+        unsigned long dis_be_during_rd             : 1;
+        unsigned long one_clk_invalidate_pulse     : 1;
+        unsigned long dis_chnl_priority            : 1;
+        unsigned long rst_read_path_a_pls          : 1;
+        unsigned long rst_read_path_b_pls          : 1;
+        unsigned long dis_reg_rd_fetch_trig        : 1;
+        unsigned long dis_rd_fetch_trig_from_ind_addr : 1;
+        unsigned long dis_rd_same_byte_to_trig_fetch : 1;
+        unsigned long dis_dir_wrap                 : 1;
+        unsigned long dis_ring_buf_to_force_dec    : 1;
+        unsigned long dis_addr_comp_in_16bit       : 1;
+        unsigned long clr_w                        : 1;
+        unsigned long err_rd_tag_is_3              : 1;
+        unsigned long err_load_when_ful_a          : 1;
+        unsigned long err_load_when_ful_b          : 1;
+        unsigned long                              : 7;
 } __attribute__((packed));
 
 union cif_read_dbg_u {
-     unsigned long val : 32;
-     struct cif_read_dbg_t f;
+        unsigned long val : 32;
+        struct cif_read_dbg_t f;
 } __attribute__((packed));
 
 struct cif_write_dbg_t {
-     unsigned long packer_timeout_count           : 2;
-     unsigned long en_upper_load_cond             : 1;
-     unsigned long en_chnl_change_cond            : 1;
-     unsigned long dis_addr_comp_cond             : 1;
-     unsigned long dis_load_same_byte_addr_cond   : 1;
-     unsigned long dis_timeout_cond                       : 1;
-     unsigned long dis_timeout_during_rbbm        : 1;
-     unsigned long dis_packer_ful_during_rbbm_timeout : 1;
-     unsigned long en_dword_split_to_rbbm         : 1;
-     unsigned long en_dummy_val                           : 1;
-     unsigned long dummy_val_sel                          : 1;
-     unsigned long mask_pm4_wrptr_dec             : 1;
-     unsigned long dis_mc_clean_cond                      : 1;
-     unsigned long err_two_reqi_during_ful        : 1;
-     unsigned long err_reqi_during_idle_clk       : 1;
-     unsigned long err_global                             : 1;
-     unsigned long en_wr_buf_dbg_load             : 1;
-     unsigned long en_wr_buf_dbg_path             : 1;
-     unsigned long sel_wr_buf_byte                        : 3;
-     unsigned long dis_rd_flush_wr                        : 1;
-     unsigned long dis_packer_ful_cond            : 1;
-     unsigned long dis_invalidate_by_ops_chnl     : 1;
-     unsigned long en_halt_when_reqi_err          : 1;
-     unsigned long cif_spare_2                            : 5;
-     unsigned long                                                        : 1;
+        unsigned long packer_timeout_count          : 2;
+        unsigned long en_upper_load_cond            : 1;
+        unsigned long en_chnl_change_cond           : 1;
+        unsigned long dis_addr_comp_cond            : 1;
+        unsigned long dis_load_same_byte_addr_cond  : 1;
+        unsigned long dis_timeout_cond              : 1;
+        unsigned long dis_timeout_during_rbbm       : 1;
+        unsigned long dis_packer_ful_during_rbbm_timeout : 1;
+        unsigned long en_dword_split_to_rbbm        : 1;
+        unsigned long en_dummy_val                  : 1;
+        unsigned long dummy_val_sel                 : 1;
+        unsigned long mask_pm4_wrptr_dec            : 1;
+        unsigned long dis_mc_clean_cond             : 1;
+        unsigned long err_two_reqi_during_ful       : 1;
+        unsigned long err_reqi_during_idle_clk      : 1;
+        unsigned long err_global                    : 1;
+        unsigned long en_wr_buf_dbg_load            : 1;
+        unsigned long en_wr_buf_dbg_path            : 1;
+        unsigned long sel_wr_buf_byte               : 3;
+        unsigned long dis_rd_flush_wr               : 1;
+        unsigned long dis_packer_ful_cond           : 1;
+        unsigned long dis_invalidate_by_ops_chnl    : 1;
+        unsigned long en_halt_when_reqi_err         : 1;
+        unsigned long cif_spare_2                   : 5;
+        unsigned long                               : 1;
 } __attribute__((packed));
 
 union cif_write_dbg_u {
-     unsigned long val : 32;
-     struct cif_write_dbg_t f;
+        unsigned long val : 32;
+        struct cif_write_dbg_t f;
 } __attribute__((packed));
 
 
 struct intf_cntl_t {
-     unsigned char ad_inc_a            : 1;
-     unsigned char ring_buf_a          : 1;
-     unsigned char rd_fetch_trigger_a  : 1;
-     unsigned char rd_data_rdy_a       : 1;
-     unsigned char ad_inc_b            : 1;
-     unsigned char ring_buf_b          : 1;
-     unsigned char rd_fetch_trigger_b  : 1;
-     unsigned char rd_data_rdy_b       : 1;
+        unsigned char ad_inc_a            : 1;
+        unsigned char ring_buf_a          : 1;
+        unsigned char rd_fetch_trigger_a  : 1;
+        unsigned char rd_data_rdy_a       : 1;
+        unsigned char ad_inc_b            : 1;
+        unsigned char ring_buf_b          : 1;
+        unsigned char rd_fetch_trigger_b  : 1;
+        unsigned char rd_data_rdy_b       : 1;
 } __attribute__((packed));
 
 union intf_cntl_u {
-     unsigned char val : 8;
-     struct intf_cntl_t f;
+        unsigned char val : 8;
+        struct intf_cntl_t f;
 } __attribute__((packed));
 
 struct cpu_defaults_t {
-     unsigned char unpack_rd_data   : 1;
-     unsigned char access_ind_addr_a: 1;
-     unsigned char access_ind_addr_b: 1;
-     unsigned char access_scratch_reg             : 1;
-     unsigned char pack_wr_data     : 1;
-     unsigned char transition_size  : 1;
-     unsigned char en_read_buf_mode : 1;
-     unsigned char rd_fetch_scratch : 1;
+        unsigned char unpack_rd_data     : 1;
+        unsigned char access_ind_addr_a  : 1;
+        unsigned char access_ind_addr_b  : 1;
+        unsigned char access_scratch_reg : 1;
+        unsigned char pack_wr_data       : 1;
+        unsigned char transition_size    : 1;
+        unsigned char en_read_buf_mode   : 1;
+        unsigned char rd_fetch_scratch   : 1;
 } __attribute__((packed));
 
 union cpu_defaults_u {
-     unsigned char val : 8;
-     struct cpu_defaults_t f;
+        unsigned char val : 8;
+        struct cpu_defaults_t f;
+} __attribute__((packed));
+
+struct crtc_total_t {
+        unsigned long crtc_h_total : 10;
+        unsigned long              : 6;
+        unsigned long crtc_v_total : 10;
+        unsigned long              : 6;
+} __attribute__((packed));
+
+union crtc_total_u {
+        unsigned long val : 32;
+        struct crtc_total_t f;
+} __attribute__((packed));
+
+struct crtc_ss_t {
+        unsigned long ss_start    : 10;
+        unsigned long             : 6;
+        unsigned long ss_end      : 10;
+        unsigned long             : 2;
+        unsigned long ss_align    : 1;
+        unsigned long ss_pol      : 1;
+        unsigned long ss_run_mode : 1;
+        unsigned long ss_en       : 1;
+} __attribute__((packed));
+
+union crtc_ss_u {
+        unsigned long val : 32;
+        struct crtc_ss_t f;
+} __attribute__((packed));
+
+struct active_h_disp_t {
+        unsigned long active_h_start  : 10;
+        unsigned long                 : 6;
+        unsigned long active_h_end    : 10;
+        unsigned long                 : 6;
+} __attribute__((packed));
+
+union active_h_disp_u {
+        unsigned long val : 32;
+        struct active_h_disp_t f;
+} __attribute__((packed));
+
+struct active_v_disp_t {
+        unsigned long active_v_start  : 10;
+        unsigned long                 : 6;
+        unsigned long active_v_end    : 10;
+        unsigned long                 : 6;
+} __attribute__((packed));
+
+union active_v_disp_u {
+        unsigned long val : 32;
+        struct active_v_disp_t f;
+} __attribute__((packed));
+
+struct graphic_h_disp_t {
+        unsigned long graphic_h_start : 10;
+        unsigned long                 : 6;
+        unsigned long graphic_h_end   : 10;
+        unsigned long                 : 6;
+} __attribute__((packed));
+
+union graphic_h_disp_u {
+        unsigned long val : 32;
+        struct graphic_h_disp_t f;
+} __attribute__((packed));
+
+struct graphic_v_disp_t {
+        unsigned long graphic_v_start : 10;
+        unsigned long                 : 6;
+        unsigned long graphic_v_end   : 10;
+        unsigned long                 : 6;
+} __attribute__((packed));
+
+union graphic_v_disp_u{
+        unsigned long val : 32;
+        struct graphic_v_disp_t f;
+} __attribute__((packed));
+
+struct graphic_ctrl_t_w100 {
+        unsigned long color_depth       : 3;
+        unsigned long portrait_mode     : 2;
+        unsigned long low_power_on      : 1;
+        unsigned long req_freq          : 4;
+        unsigned long en_crtc           : 1;
+        unsigned long en_graphic_req    : 1;
+        unsigned long en_graphic_crtc   : 1;
+        unsigned long total_req_graphic : 9;
+        unsigned long lcd_pclk_on       : 1;
+        unsigned long lcd_sclk_on       : 1;
+        unsigned long pclk_running      : 1;
+        unsigned long sclk_running      : 1;
+        unsigned long                   : 6;
+} __attribute__((packed));
+
+struct graphic_ctrl_t_w32xx {
+        unsigned long color_depth       : 3;
+        unsigned long portrait_mode     : 2;
+        unsigned long low_power_on      : 1;
+        unsigned long req_freq          : 4;
+        unsigned long en_crtc           : 1;
+        unsigned long en_graphic_req    : 1;
+        unsigned long en_graphic_crtc   : 1;
+        unsigned long total_req_graphic : 10;
+        unsigned long lcd_pclk_on       : 1;
+        unsigned long lcd_sclk_on       : 1;
+        unsigned long pclk_running      : 1;
+        unsigned long sclk_running      : 1;
+        unsigned long                   : 5;
+} __attribute__((packed));
+
+union graphic_ctrl_u {
+        unsigned long val : 32;
+        struct graphic_ctrl_t_w100 f_w100;
+        struct graphic_ctrl_t_w32xx f_w32xx;
 } __attribute__((packed));
 
 struct video_ctrl_t {
-     unsigned long video_mode       : 1;
-     unsigned long keyer_en         : 1;
-     unsigned long en_video_req     : 1;
-     unsigned long en_graphic_req_video           : 1;
-     unsigned long en_video_crtc    : 1;
-     unsigned long video_hor_exp    : 2;
-     unsigned long video_ver_exp    : 2;
-     unsigned long uv_combine       : 1;
-     unsigned long total_req_video  : 9;
-     unsigned long video_ch_sel     : 1;
-     unsigned long video_portrait   : 2;
-     unsigned long yuv2rgb_en       : 1;
-     unsigned long yuv2rgb_option   : 1;
-     unsigned long video_inv_hor    : 1;
-     unsigned long video_inv_ver    : 1;
-     unsigned long gamma_sel        : 2;
-     unsigned long dis_limit        : 1;
-     unsigned long en_uv_hblend     : 1;
-     unsigned long rgb_gamma_sel    : 2;
+        unsigned long video_mode       : 1;
+        unsigned long keyer_en         : 1;
+        unsigned long en_video_req     : 1;
+        unsigned long en_graphic_req_video  : 1;
+        unsigned long en_video_crtc    : 1;
+        unsigned long video_hor_exp    : 2;
+        unsigned long video_ver_exp    : 2;
+        unsigned long uv_combine       : 1;
+        unsigned long total_req_video  : 9;
+        unsigned long video_ch_sel     : 1;
+        unsigned long video_portrait   : 2;
+        unsigned long yuv2rgb_en       : 1;
+        unsigned long yuv2rgb_option   : 1;
+        unsigned long video_inv_hor    : 1;
+        unsigned long video_inv_ver    : 1;
+        unsigned long gamma_sel        : 2;
+        unsigned long dis_limit        : 1;
+        unsigned long en_uv_hblend     : 1;
+        unsigned long rgb_gamma_sel    : 2;
 } __attribute__((packed));
 
 union video_ctrl_u {
-     unsigned long val : 32;
-     struct video_ctrl_t f;
+        unsigned long val : 32;
+        struct video_ctrl_t f;
 } __attribute__((packed));
 
 struct disp_db_buf_cntl_rd_t {
-     unsigned long en_db_buf            : 1;
-     unsigned long update_db_buf_done   : 1;
-     unsigned long db_buf_cntl          : 6;
-     unsigned long                                      : 24;
+        unsigned long en_db_buf           : 1;
+        unsigned long update_db_buf_done  : 1;
+        unsigned long db_buf_cntl         : 6;
+        unsigned long                     : 24;
 } __attribute__((packed));
 
 union disp_db_buf_cntl_rd_u {
-     unsigned long val : 32;
-     struct disp_db_buf_cntl_rd_t f;
+        unsigned long val : 32;
+        struct disp_db_buf_cntl_rd_t f;
 } __attribute__((packed));
 
 struct disp_db_buf_cntl_wr_t {
-     unsigned long en_db_buf        : 1;
-     unsigned long update_db_buf    : 1;
-     unsigned long db_buf_cntl      : 6;
-     unsigned long    : 24;
+        unsigned long en_db_buf      : 1;
+        unsigned long update_db_buf  : 1;
+        unsigned long db_buf_cntl    : 6;
+        unsigned long                : 24;
 } __attribute__((packed));
 
 union disp_db_buf_cntl_wr_u {
-     unsigned long val : 32;
-     struct disp_db_buf_cntl_wr_t f;
+        unsigned long val : 32;
+        struct disp_db_buf_cntl_wr_t f;
 } __attribute__((packed));
 
 struct gamma_value1_t {
-     unsigned long gamma1           : 8;
-     unsigned long gamma2           : 8;
-     unsigned long gamma3           : 8;
-     unsigned long gamma4           : 8;
+        unsigned long gamma1   : 8;
+        unsigned long gamma2   : 8;
+        unsigned long gamma3   : 8;
+        unsigned long gamma4   : 8;
 } __attribute__((packed));
 
 union gamma_value1_u {
-     unsigned long val : 32;
-     struct gamma_value1_t f;
+        unsigned long val : 32;
+        struct gamma_value1_t f;
 } __attribute__((packed));
 
 struct gamma_value2_t {
-     unsigned long gamma5           : 8;
-     unsigned long gamma6           : 8;
-     unsigned long gamma7           : 8;
-     unsigned long gamma8           : 8;
+        unsigned long gamma5   : 8;
+        unsigned long gamma6   : 8;
+        unsigned long gamma7   : 8;
+        unsigned long gamma8   : 8;
 } __attribute__((packed));
 
 union gamma_value2_u {
-     unsigned long val : 32;
-     struct gamma_value2_t f;
+        unsigned long val : 32;
+        struct gamma_value2_t f;
 } __attribute__((packed));
 
 struct gamma_slope_t {
-     unsigned long slope1           : 3;
-     unsigned long slope2           : 3;
-     unsigned long slope3           : 3;
-     unsigned long slope4           : 3;
-     unsigned long slope5           : 3;
-     unsigned long slope6           : 3;
-     unsigned long slope7           : 3;
-     unsigned long slope8           : 3;
-     unsigned long                              : 8;
+        unsigned long slope1   : 3;
+        unsigned long slope2   : 3;
+        unsigned long slope3   : 3;
+        unsigned long slope4   : 3;
+        unsigned long slope5   : 3;
+        unsigned long slope6   : 3;
+        unsigned long slope7   : 3;
+        unsigned long slope8   : 3;
+        unsigned long          : 8;
 } __attribute__((packed));
 
 union gamma_slope_u {
-     unsigned long val : 32;
-     struct gamma_slope_t f;
+        unsigned long val : 32;
+        struct gamma_slope_t f;
 } __attribute__((packed));
 
 struct mc_ext_mem_location_t {
-     unsigned long mc_ext_mem_start : 16;
-     unsigned long mc_ext_mem_top   : 16;
+        unsigned long mc_ext_mem_start : 16;
+        unsigned long mc_ext_mem_top   : 16;
 } __attribute__((packed));
 
 union mc_ext_mem_location_u {
-     unsigned long val : 32;
-     struct mc_ext_mem_location_t f;
+        unsigned long val : 32;
+        struct mc_ext_mem_location_t f;
+} __attribute__((packed));
+
+struct mc_fb_location_t {
+        unsigned long mc_fb_start      : 16;
+        unsigned long mc_fb_top        : 16;
+} __attribute__((packed));
+
+union mc_fb_location_u {
+        unsigned long val : 32;
+        struct mc_fb_location_t f;
 } __attribute__((packed));
 
 struct clk_pin_cntl_t {
-     unsigned long osc_en           : 1;
-     unsigned long osc_gain         : 5;
-     unsigned long dont_use_xtalin  : 1;
-     unsigned long xtalin_pm_en     : 1;
-     unsigned long xtalin_dbl_en    : 1;
-     unsigned long                              : 7;
-     unsigned long cg_debug         : 16;
+        unsigned long osc_en           : 1;
+        unsigned long osc_gain         : 5;
+        unsigned long dont_use_xtalin  : 1;
+        unsigned long xtalin_pm_en     : 1;
+        unsigned long xtalin_dbl_en    : 1;
+        unsigned long                  : 7;
+        unsigned long cg_debug         : 16;
 } __attribute__((packed));
 
 union clk_pin_cntl_u {
-     unsigned long val : 32;
-     struct clk_pin_cntl_t f;
+        unsigned long val : 32;
+        struct clk_pin_cntl_t f;
 } __attribute__((packed));
 
 struct pll_ref_fb_div_t {
-     unsigned long pll_ref_div      : 4;
-     unsigned long                              : 4;
-     unsigned long pll_fb_div_int   : 6;
-     unsigned long                              : 2;
-     unsigned long pll_fb_div_frac  : 3;
-     unsigned long                              : 1;
-     unsigned long pll_reset_time   : 4;
-     unsigned long pll_lock_time    : 8;
+        unsigned long pll_ref_div      : 4;
+        unsigned long                  : 4;
+        unsigned long pll_fb_div_int   : 6;
+        unsigned long                  : 2;
+        unsigned long pll_fb_div_frac  : 3;
+        unsigned long                  : 1;
+        unsigned long pll_reset_time   : 4;
+        unsigned long pll_lock_time    : 8;
 } __attribute__((packed));
 
 union pll_ref_fb_div_u {
-     unsigned long val : 32;
-     struct pll_ref_fb_div_t f;
+        unsigned long val : 32;
+        struct pll_ref_fb_div_t f;
 } __attribute__((packed));
 
 struct pll_cntl_t {
-     unsigned long pll_pwdn         : 1;
-     unsigned long pll_reset        : 1;
-     unsigned long pll_pm_en        : 1;
-     unsigned long pll_mode         : 1;
-     unsigned long pll_refclk_sel   : 1;
-     unsigned long pll_fbclk_sel    : 1;
-     unsigned long pll_tcpoff       : 1;
-     unsigned long pll_pcp          : 3;
-     unsigned long pll_pvg          : 3;
-     unsigned long pll_vcofr        : 1;
-     unsigned long pll_ioffset      : 2;
-     unsigned long pll_pecc_mode    : 2;
-     unsigned long pll_pecc_scon    : 2;
-     unsigned long pll_dactal       : 4;
-     unsigned long pll_cp_clip      : 2;
-     unsigned long pll_conf         : 3;
-     unsigned long pll_mbctrl       : 2;
-     unsigned long pll_ring_off     : 1;
+        unsigned long pll_pwdn        : 1;
+        unsigned long pll_reset       : 1;
+        unsigned long pll_pm_en       : 1;
+        unsigned long pll_mode        : 1;
+        unsigned long pll_refclk_sel  : 1;
+        unsigned long pll_fbclk_sel   : 1;
+        unsigned long pll_tcpoff      : 1;
+        unsigned long pll_pcp         : 3;
+        unsigned long pll_pvg         : 3;
+        unsigned long pll_vcofr       : 1;
+        unsigned long pll_ioffset     : 2;
+        unsigned long pll_pecc_mode   : 2;
+        unsigned long pll_pecc_scon   : 2;
+        unsigned long pll_dactal      : 4;
+        unsigned long pll_cp_clip     : 2;
+        unsigned long pll_conf        : 3;
+        unsigned long pll_mbctrl      : 2;
+        unsigned long pll_ring_off    : 1;
 } __attribute__((packed));
 
 union pll_cntl_u {
-     unsigned long val : 32;
-     struct pll_cntl_t f;
+        unsigned long val : 32;
+        struct pll_cntl_t f;
 } __attribute__((packed));
 
 struct sclk_cntl_t {
-     unsigned long sclk_src_sel         : 2;
-     unsigned long                                      : 2;
-     unsigned long sclk_post_div_fast   : 4;
-     unsigned long sclk_clkon_hys       : 3;
-     unsigned long sclk_post_div_slow   : 4;
-     unsigned long disp_cg_ok2switch_en : 1;
-     unsigned long sclk_force_reg       : 1;
-     unsigned long sclk_force_disp      : 1;
-     unsigned long sclk_force_mc        : 1;
-     unsigned long sclk_force_extmc     : 1;
-     unsigned long sclk_force_cp        : 1;
-     unsigned long sclk_force_e2        : 1;
-     unsigned long sclk_force_e3        : 1;
-     unsigned long sclk_force_idct      : 1;
-     unsigned long sclk_force_bist      : 1;
-     unsigned long busy_extend_cp       : 1;
-     unsigned long busy_extend_e2       : 1;
-     unsigned long busy_extend_e3       : 1;
-     unsigned long busy_extend_idct     : 1;
-     unsigned long                                      : 3;
+        unsigned long sclk_src_sel         : 2;
+        unsigned long                      : 2;
+        unsigned long sclk_post_div_fast   : 4;
+        unsigned long sclk_clkon_hys       : 3;
+        unsigned long sclk_post_div_slow   : 4;
+        unsigned long disp_cg_ok2switch_en : 1;
+        unsigned long sclk_force_reg       : 1;
+        unsigned long sclk_force_disp      : 1;
+        unsigned long sclk_force_mc        : 1;
+        unsigned long sclk_force_extmc     : 1;
+        unsigned long sclk_force_cp        : 1;
+        unsigned long sclk_force_e2        : 1;
+        unsigned long sclk_force_e3        : 1;
+        unsigned long sclk_force_idct      : 1;
+        unsigned long sclk_force_bist      : 1;
+        unsigned long busy_extend_cp       : 1;
+        unsigned long busy_extend_e2       : 1;
+        unsigned long busy_extend_e3       : 1;
+        unsigned long busy_extend_idct     : 1;
+        unsigned long                      : 3;
 } __attribute__((packed));
 
 union sclk_cntl_u {
-     unsigned long val : 32;
-     struct sclk_cntl_t f;
+        unsigned long val : 32;
+        struct sclk_cntl_t f;
 } __attribute__((packed));
 
 struct pclk_cntl_t {
-     unsigned long pclk_src_sel     : 2;
-     unsigned long                              : 2;
-     unsigned long pclk_post_div    : 4;
-     unsigned long                              : 8;
-     unsigned long pclk_force_disp  : 1;
-     unsigned long                              : 15;
+        unsigned long pclk_src_sel     : 2;
+        unsigned long                  : 2;
+        unsigned long pclk_post_div    : 4;
+        unsigned long                  : 8;
+        unsigned long pclk_force_disp  : 1;
+        unsigned long                  : 15;
 } __attribute__((packed));
 
 union pclk_cntl_u {
-     unsigned long val : 32;
-     struct pclk_cntl_t f;
+        unsigned long val : 32;
+        struct pclk_cntl_t f;
 } __attribute__((packed));
 
+
+#define TESTCLK_SRC_PLL   0x01
+#define TESTCLK_SRC_SCLK  0x02
+#define TESTCLK_SRC_PCLK  0x03
+/* 4 and 5 seem to by XTAL/M */
+#define TESTCLK_SRC_XTAL  0x06
+
 struct clk_test_cntl_t {
-     unsigned long testclk_sel      : 4;
-     unsigned long                              : 3;
-     unsigned long start_check_freq : 1;
-     unsigned long tstcount_rst     : 1;
-     unsigned long                              : 15;
-     unsigned long test_count       : 8;
+        unsigned long testclk_sel      : 4;
+        unsigned long                  : 3;
+        unsigned long start_check_freq : 1;
+        unsigned long tstcount_rst     : 1;
+        unsigned long                  : 15;
+        unsigned long test_count       : 8;
 } __attribute__((packed));
 
 union clk_test_cntl_u {
-     unsigned long val : 32;
-     struct clk_test_cntl_t f;
+        unsigned long val : 32;
+        struct clk_test_cntl_t f;
 } __attribute__((packed));
 
 struct pwrmgt_cntl_t {
-     unsigned long pwm_enable           : 1;
-     unsigned long                                      : 1;
-     unsigned long pwm_mode_req         : 2;
-     unsigned long pwm_wakeup_cond      : 2;
-     unsigned long pwm_fast_noml_hw_en  : 1;
-     unsigned long pwm_noml_fast_hw_en  : 1;
-     unsigned long pwm_fast_noml_cond   : 4;
-     unsigned long pwm_noml_fast_cond   : 4;
-     unsigned long pwm_idle_timer       : 8;
-     unsigned long pwm_busy_timer       : 8;
+        unsigned long pwm_enable           : 1;
+        unsigned long                      : 1;
+        unsigned long pwm_mode_req         : 2;
+        unsigned long pwm_wakeup_cond      : 2;
+        unsigned long pwm_fast_noml_hw_en  : 1;
+        unsigned long pwm_noml_fast_hw_en  : 1;
+        unsigned long pwm_fast_noml_cond   : 4;
+        unsigned long pwm_noml_fast_cond   : 4;
+        unsigned long pwm_idle_timer       : 8;
+        unsigned long pwm_busy_timer       : 8;
 } __attribute__((packed));
 
 union pwrmgt_cntl_u {
-     unsigned long val : 32;
-     struct pwrmgt_cntl_t f;
+        unsigned long val : 32;
+        struct pwrmgt_cntl_t f;
 } __attribute__((packed));
 
 #endif