211 files changed, 6062 insertions, 2234 deletions

diff --git a/drivers/Kconfig b/drivers/Kconfig
index 263e86ddc1a4..f39463418904 100644
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -14,6 +14,10 @@ source "drivers/pnp/Kconfig"
 
 source "drivers/block/Kconfig"
 
+# misc before ide - BLK_DEV_SGIIOC4 depends on SGI_IOC4
+
+source "drivers/misc/Kconfig"
+
 source "drivers/ide/Kconfig"
 
 source "drivers/scsi/Kconfig"
@@ -52,8 +56,6 @@ source "drivers/w1/Kconfig"
 
 source "drivers/hwmon/Kconfig"
 
-source "drivers/misc/Kconfig"
-
 source "drivers/mfd/Kconfig"
 
 source "drivers/media/Kconfig"
diff --git a/drivers/acpi/acpi_memhotplug.c b/drivers/acpi/acpi_memhotplug.c
index 98099de59b45..6bcd9e8e7bcb 100644
--- a/drivers/acpi/acpi_memhotplug.c
+++ b/drivers/acpi/acpi_memhotplug.c
@@ -85,6 +85,8 @@ struct acpi_memory_device {
         struct list_head res_list;
 };
 
+static int acpi_hotmem_initialized;
+
 static acpi_status
 acpi_memory_get_resource(struct acpi_resource *resource, void *context)
 {
@@ -414,7 +416,7 @@ static int acpi_memory_device_add(struct acpi_device *device)
         /* Set the device state */
         mem_device->state = MEMORY_POWER_ON_STATE;
 
-        printk(KERN_INFO "%s \n", acpi_device_name(device));
+        printk(KERN_DEBUG "%s \n", acpi_device_name(device));
 
         return result;
 }
@@ -438,6 +440,15 @@ static int acpi_memory_device_start (struct acpi_device *device)
         struct acpi_memory_device *mem_device;
         int result = 0;
 
+        /*
+         * Early boot code has recognized memory area by EFI/E820.
+         * If DSDT shows these memory devices on boot, hotplug is not necessary
+         * for them. So, it just returns until completion of this driver's
+         * start up.
+         */
+        if (!acpi_hotmem_initialized)
+                return 0;
+
         mem_device = acpi_driver_data(device);
 
         if (!acpi_memory_check_device(mem_device)) {
@@ -537,6 +548,7 @@ static int __init acpi_memory_device_init(void)
                 return -ENODEV;
         }
 
+        acpi_hotmem_initialized = 1;
         return 0;
 }
 
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index 526387dc3799..65b3f056ad89 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -962,7 +962,7 @@ static int acpi_processor_get_power_info(struct acpi_processor *pr)
 
         result = acpi_processor_get_power_info_cst(pr);
         if (result == -ENODEV)
-                acpi_processor_get_power_info_fadt(pr);
+                result = acpi_processor_get_power_info_fadt(pr);
 
         if (result)
                 return result;
@@ -1108,6 +1108,7 @@ static const struct file_operations acpi_processor_power_fops = {
         .release = single_release,
 };
 
+#ifdef CONFIG_SMP
 static void smp_callback(void *v)
 {
         /* we already woke the CPU up, nothing more to do */
@@ -1129,6 +1130,7 @@ static int acpi_processor_latency_notify(struct notifier_block *b,
 static struct notifier_block acpi_processor_latency_notifier = {
         .notifier_call = acpi_processor_latency_notify,
 };
+#endif
 
 int __cpuinit acpi_processor_power_init(struct acpi_processor *pr,
                               struct acpi_device *device)
@@ -1146,7 +1148,9 @@ int __cpuinit acpi_processor_power_init(struct acpi_processor *pr,
                                "ACPI: processor limited to max C-state %d\n",
                                max_cstate);
                 first_run++;
+#ifdef CONFIG_SMP
                 register_latency_notifier(&acpi_processor_latency_notifier);
+#endif
         }
 
         if (!pr)
@@ -1218,7 +1222,9 @@ int acpi_processor_power_exit(struct acpi_processor *pr,
                  * copies of pm_idle before proceeding.
                  */
                 cpu_idle_wait();
+#ifdef CONFIG_SMP
                 unregister_latency_notifier(&acpi_processor_latency_notifier);
+#endif
         }
 
         return 0;
diff --git a/drivers/base/bus.c b/drivers/base/bus.c
index 12173d16bea7..7d8a7ce73fb3 100644
--- a/drivers/base/bus.c
+++ b/drivers/base/bus.c
@@ -372,19 +372,30 @@ int bus_add_device(struct device * dev)
                 pr_debug("bus %s: add device %s\n", bus->name, dev->bus_id);
                 error = device_add_attrs(bus, dev);
                 if (error)
-                        goto out;
+                        goto out_put;
                 error = sysfs_create_link(&bus->devices.kobj,
                                                 &dev->kobj, dev->bus_id);
                 if (error)
-                        goto out;
+                        goto out_id;
                 error = sysfs_create_link(&dev->kobj,
                                 &dev->bus->subsys.kset.kobj, "subsystem");
                 if (error)
-                        goto out;
+                        goto out_subsys;
                 error = sysfs_create_link(&dev->kobj,
                                 &dev->bus->subsys.kset.kobj, "bus");
+                if (error)
+                        goto out_deprecated;
         }
-out:
+        return 0;
+
+out_deprecated:
+        sysfs_remove_link(&dev->kobj, "subsystem");
+out_subsys:
+        sysfs_remove_link(&bus->devices.kobj, dev->bus_id);
+out_id:
+        device_remove_attrs(bus, dev);
+out_put:
+        put_bus(dev->bus);
         return error;
 }
 
@@ -428,8 +439,10 @@ void bus_remove_device(struct device * dev)
                 sysfs_remove_link(&dev->kobj, "bus");
                 sysfs_remove_link(&dev->bus->devices.kobj, dev->bus_id);
                 device_remove_attrs(dev->bus, dev);
-                dev->is_registered = 0;
-                klist_del(&dev->knode_bus);
+                if (dev->is_registered) {
+                        dev->is_registered = 0;
+                        klist_del(&dev->knode_bus);
+                }
                 pr_debug("bus %s: remove device %s\n", dev->bus->name, dev->bus_id);
                 device_release_driver(dev);
                 put_bus(dev->bus);
@@ -505,34 +518,36 @@ int bus_add_driver(struct device_driver *drv)
         struct bus_type * bus = get_bus(drv->bus);
         int error = 0;
 
-        if (bus) {
-                pr_debug("bus %s: add driver %s\n", bus->name, drv->name);
-                error = kobject_set_name(&drv->kobj, "%s", drv->name);
-                if (error)
-                        goto out_put_bus;
-                drv->kobj.kset = &bus->drivers;
-                if ((error = kobject_register(&drv->kobj)))
-                        goto out_put_bus;
-
-                error = driver_attach(drv);
-                if (error)
-                        goto out_unregister;
-                klist_add_tail(&drv->knode_bus, &bus->klist_drivers);
-                module_add_driver(drv->owner, drv);
-
-                error = driver_add_attrs(bus, drv);
-                if (error) {
-                        /* How the hell do we get out of this pickle? Give up */
-                        printk(KERN_ERR "%s: driver_add_attrs(%s) failed\n",
-                                __FUNCTION__, drv->name);
-                }
-                error = add_bind_files(drv);
-                if (error) {
-                        /* Ditto */
-                        printk(KERN_ERR "%s: add_bind_files(%s) failed\n",
-                                __FUNCTION__, drv->name);
-                }
+        if (!bus)
+                return 0;
+
+        pr_debug("bus %s: add driver %s\n", bus->name, drv->name);
+        error = kobject_set_name(&drv->kobj, "%s", drv->name);
+        if (error)
+                goto out_put_bus;
+        drv->kobj.kset = &bus->drivers;
+        if ((error = kobject_register(&drv->kobj)))
+                goto out_put_bus;
+
+        error = driver_attach(drv);
+        if (error)
+                goto out_unregister;
+        klist_add_tail(&drv->knode_bus, &bus->klist_drivers);
+        module_add_driver(drv->owner, drv);
+
+        error = driver_add_attrs(bus, drv);
+        if (error) {
+                /* How the hell do we get out of this pickle? Give up */
+                printk(KERN_ERR "%s: driver_add_attrs(%s) failed\n",
+                        __FUNCTION__, drv->name);
         }
+        error = add_bind_files(drv);
+        if (error) {
+                /* Ditto */
+                printk(KERN_ERR "%s: add_bind_files(%s) failed\n",
+                        __FUNCTION__, drv->name);
+        }
+
         return error;
 out_unregister:
         kobject_unregister(&drv->kobj);
@@ -552,16 +567,17 @@ out_put_bus:
 
 void bus_remove_driver(struct device_driver * drv)
 {
-        if (drv->bus) {
-                remove_bind_files(drv);
-                driver_remove_attrs(drv->bus, drv);
-                klist_remove(&drv->knode_bus);
-                pr_debug("bus %s: remove driver %s\n", drv->bus->name, drv->name);
-                driver_detach(drv);
-                module_remove_driver(drv);
-                kobject_unregister(&drv->kobj);
-                put_bus(drv->bus);
-        }
+        if (!drv->bus)
+                return;
+
+        remove_bind_files(drv);
+        driver_remove_attrs(drv->bus, drv);
+        klist_remove(&drv->knode_bus);
+        pr_debug("bus %s: remove driver %s\n", drv->bus->name, drv->name);
+        driver_detach(drv);
+        module_remove_driver(drv);
+        kobject_unregister(&drv->kobj);
+        put_bus(drv->bus);
 }
 
 
@@ -732,11 +748,15 @@ int bus_register(struct bus_type * bus)
 
         klist_init(&bus->klist_devices, klist_devices_get, klist_devices_put);
         klist_init(&bus->klist_drivers, NULL, NULL);
-        bus_add_attrs(bus);
+        retval = bus_add_attrs(bus);
+        if (retval)
+                goto bus_attrs_fail;
 
         pr_debug("bus type '%s' registered\n", bus->name);
         return 0;
 
+bus_attrs_fail:
+        kset_unregister(&bus->drivers);
 bus_drivers_fail:
         kset_unregister(&bus->devices);
 bus_devices_fail:
diff --git a/drivers/base/class.c b/drivers/base/class.c
index b32b77ff2dcd..0ff267a248db 100644
--- a/drivers/base/class.c
+++ b/drivers/base/class.c
@@ -562,7 +562,10 @@ int class_device_add(struct class_device *class_dev)
                 goto out2;
 
         /* add the needed attributes to this device */
-        sysfs_create_link(&class_dev->kobj, &parent_class->subsys.kset.kobj, "subsystem");
+        error = sysfs_create_link(&class_dev->kobj,
+                                  &parent_class->subsys.kset.kobj, "subsystem");
+        if (error)
+                goto out3;
         class_dev->uevent_attr.attr.name = "uevent";
         class_dev->uevent_attr.attr.mode = S_IWUSR;
         class_dev->uevent_attr.attr.owner = parent_class->owner;
diff --git a/drivers/base/core.c b/drivers/base/core.c
index b224bb43ff63..68ad11af22b4 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -44,7 +44,7 @@ const char *dev_driver_string(struct device *dev)
         return dev->driver ? dev->driver->name :
                         (dev->bus ? dev->bus->name : "");
 }
-EXPORT_SYMBOL_GPL(dev_driver_string);
+EXPORT_SYMBOL(dev_driver_string);
 
 #define to_dev(obj) container_of(obj, struct device, kobj)
 #define to_dev_attr(_attr) container_of(_attr, struct device_attribute, attr)
@@ -433,14 +433,16 @@ int device_add(struct device *dev)
         if (dev->driver)
                 dev->uevent_attr.attr.owner = dev->driver->owner;
         dev->uevent_attr.store = store_uevent;
-        device_create_file(dev, &dev->uevent_attr);
+        error = device_create_file(dev, &dev->uevent_attr);
+        if (error)
+                goto attrError;
 
         if (MAJOR(dev->devt)) {
                 struct device_attribute *attr;
                 attr = kzalloc(sizeof(*attr), GFP_KERNEL);
                 if (!attr) {
                         error = -ENOMEM;
-                        goto PMError;
+                        goto ueventattrError;
                 }
                 attr->attr.name = "dev";
                 attr->attr.mode = S_IRUGO;
@@ -450,7 +452,7 @@ int device_add(struct device *dev)
                 error = device_create_file(dev, attr);
                 if (error) {
                         kfree(attr);
-                        goto attrError;
+                        goto ueventattrError;
                 }
 
                 dev->devt_attr = attr;
@@ -477,7 +479,8 @@ int device_add(struct device *dev)
         if ((error = bus_add_device(dev)))
                 goto BusError;
         kobject_uevent(&dev->kobj, KOBJ_ADD);
-        bus_attach_device(dev);
+        if ((error = bus_attach_device(dev)))
+                goto AttachError;
         if (parent)
                 klist_add_tail(&dev->knode_parent, &parent->klist_children);
 
@@ -496,6 +499,8 @@ int device_add(struct device *dev)
         kfree(class_name);
         put_device(dev);
         return error;
+ AttachError:
+        bus_remove_device(dev);
  BusError:
         device_pm_remove(dev);
  PMError:
@@ -507,6 +512,8 @@ int device_add(struct device *dev)
                 device_remove_file(dev, dev->devt_attr);
                 kfree(dev->devt_attr);
         }
+ ueventattrError:
+        device_remove_file(dev, &dev->uevent_attr);
  attrError:
         kobject_uevent(&dev->kobj, KOBJ_REMOVE);
         kobject_del(&dev->kobj);
@@ -805,8 +812,10 @@ int device_rename(struct device *dev, char *new_name)
 
         if (dev->class) {
                 old_symlink_name = kmalloc(BUS_ID_SIZE, GFP_KERNEL);
-                if (!old_symlink_name)
-                        return -ENOMEM;
+                if (!old_symlink_name) {
+                        error = -ENOMEM;
+                        goto out_free_old_class;
+                }
                 strlcpy(old_symlink_name, dev->bus_id, BUS_ID_SIZE);
         }
 
@@ -830,9 +839,10 @@ int device_rename(struct device *dev, char *new_name)
         }
         put_device(dev);
 
-        kfree(old_class_name);
         kfree(new_class_name);
         kfree(old_symlink_name);
+ out_free_old_class:
+        kfree(old_class_name);
 
         return error;
 }
diff --git a/drivers/base/dd.c b/drivers/base/dd.c
index b5f43c3e44fa..db01b95a47a5 100644
--- a/drivers/base/dd.c
+++ b/drivers/base/dd.c
@@ -171,6 +171,8 @@ int driver_probe_device(struct device_driver * drv, struct device * dev)
                  drv->bus->name, dev->bus_id, drv->name);
 
         data = kmalloc(sizeof(*data), GFP_KERNEL);
+        if (!data)
+                return -ENOMEM;
         data->drv = drv;
         data->dev = dev;
 
@@ -178,7 +180,7 @@ int driver_probe_device(struct device_driver * drv, struct device * dev)
                 probe_task = kthread_run(really_probe, data,
                                          "probe-%s", dev->bus_id);
                 if (IS_ERR(probe_task))
-                        ret = PTR_ERR(probe_task);
+                        ret = really_probe(data);
         } else
                 ret = really_probe(data);
 
diff --git a/drivers/base/dmapool.c b/drivers/base/dmapool.c
index 33c5cce1560b..b2efbd4cf710 100644
--- a/drivers/base/dmapool.c
+++ b/drivers/base/dmapool.c
@@ -141,11 +141,20 @@ dma_pool_create (const char *name, struct device *dev,
         init_waitqueue_head (&retval->waitq);
 
         if (dev) {
+                int ret;
+
                 down (&pools_lock);
                 if (list_empty (&dev->dma_pools))
-                        device_create_file (dev, &dev_attr_pools);
+                        ret = device_create_file (dev, &dev_attr_pools);
+                else
+                        ret = 0;
                 /* note:  not currently insisting "name" be unique */
-                list_add (&retval->pools, &dev->dma_pools);
+                if (!ret)
+                        list_add (&retval->pools, &dev->dma_pools);
+                else {
+                        kfree(retval);
+                        retval = NULL;
+                }
                 up (&pools_lock);
         } else
                 INIT_LIST_HEAD (&retval->pools);
diff --git a/drivers/base/topology.c b/drivers/base/topology.c
index 3ef9d514b916..28dccb730af9 100644
--- a/drivers/base/topology.c
+++ b/drivers/base/topology.c
@@ -97,8 +97,7 @@ static struct attribute_group topology_attr_group = {
 /* Add/Remove cpu_topology interface for CPU device */
 static int __cpuinit topology_add_dev(struct sys_device * sys_dev)
 {
-        sysfs_create_group(&sys_dev->kobj, &topology_attr_group);
-        return 0;
+        return sysfs_create_group(&sys_dev->kobj, &topology_attr_group);
 }
 
 static int __cpuinit topology_remove_dev(struct sys_device * sys_dev)
diff --git a/drivers/block/aoe/aoe.h b/drivers/block/aoe/aoe.h
index 6eebcb7be97e..6d111228cfac 100644
--- a/drivers/block/aoe/aoe.h
+++ b/drivers/block/aoe/aoe.h
@@ -1,5 +1,5 @@
-/* Copyright (c) 2004 Coraid, Inc.  See COPYING for GPL terms. */
-#define VERSION "22"
+/* Copyright (c) 2006 Coraid, Inc.  See COPYING for GPL terms. */
+#define VERSION "32"
 #define AOE_MAJOR 152
 #define DEVICE_NAME "aoe"
 
@@ -65,7 +65,7 @@ struct aoe_atahdr {
 struct aoe_cfghdr {
         __be16 bufcnt;
         __be16 fwver;
-        unsigned char res;
+        unsigned char scnt;
         unsigned char aoeccmd;
         unsigned char cslen[2];
 };
@@ -78,12 +78,14 @@ enum {
         DEVFL_GDALLOC = (1<<4), /* need to alloc gendisk */
         DEVFL_PAUSE = (1<<5),
         DEVFL_NEWSIZE = (1<<6), /* need to update dev size in block layer */
+        DEVFL_MAXBCNT = (1<<7), /* d->maxbcnt is not changeable */
+        DEVFL_KICKME = (1<<8),
 
         BUFFL_FAIL = 1,
 };
 
 enum {
-        MAXATADATA = 1024,
+        DEFAULTBCNT = 2 * 512,  /* 2 sectors */
         NPERSHELF = 16,         /* number of slots per shelf address */
         FREETAG = -1,
         MIN_BUFS = 8,
@@ -107,11 +109,9 @@ struct frame {
         ulong waited;
         struct buf *buf;
         char *bufaddr;
-        int writedatalen;
-        int ndata;
-
-        /* largest possible */
-        unsigned char data[sizeof(struct aoe_hdr) + sizeof(struct aoe_atahdr)];
+        ulong bcnt;
+        sector_t lba;
+        struct sk_buff *skb;
 };
 
 struct aoedev {
@@ -121,9 +121,12 @@ struct aoedev {
         ulong sysminor;
         ulong aoemajor;
         ulong aoeminor;
-        ulong nopen;            /* (bd_openers isn't available without sleeping) */
-        ulong rttavg;           /* round trip average of requests/responses */
+        u16 nopen;              /* (bd_openers isn't available without sleeping) */
+        u16 lasttag;            /* last tag sent */
+        u16 rttavg;             /* round trip average of requests/responses */
+        u16 mintimer;
         u16 fw_ver;             /* version of blade's firmware */
+        u16 maxbcnt;
         struct work_struct work;/* disk create work struct */
         struct gendisk *gd;
         request_queue_t blkq;
@@ -137,8 +140,8 @@ struct aoedev {
         mempool_t *bufpool;     /* for deadlock-free Buf allocation */
         struct list_head bufq;  /* queue of bios to work on */
         struct buf *inprocess;  /* the one we're currently working on */
-        ulong lasttag;          /* last tag sent */
-        ulong nframes;          /* number of frames below */
+        ushort lostjumbo;
+        ushort nframes;         /* number of frames below */
         struct frame *frames;
 };
 
@@ -157,6 +160,7 @@ void aoecmd_cfg(ushort aoemajor, unsigned char aoeminor);
 void aoecmd_ata_rsp(struct sk_buff *);
 void aoecmd_cfg_rsp(struct sk_buff *);
 void aoecmd_sleepwork(void *vp);
+struct sk_buff *new_skb(ulong);
 
 int aoedev_init(void);
 void aoedev_exit(void);
diff --git a/drivers/block/aoe/aoeblk.c b/drivers/block/aoe/aoeblk.c
index 393b86a3dbf8..d433f27e0ce2 100644
--- a/drivers/block/aoe/aoeblk.c
+++ b/drivers/block/aoe/aoeblk.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2004 Coraid, Inc.  See COPYING for GPL terms. */
+/* Copyright (c) 2006 Coraid, Inc.  See COPYING for GPL terms. */
 /*
  * aoeblk.c
  * block device routines
@@ -14,7 +14,6 @@
 
 static kmem_cache_t *buf_pool_cache;
 
-/* add attributes for our block devices in sysfs */
 static ssize_t aoedisk_show_state(struct gendisk * disk, char *page)
 {
         struct aoedev *d = disk->private_data;
@@ -64,21 +63,26 @@ static struct disk_attribute disk_attr_fwver = {
         .show = aoedisk_show_fwver
 };
 
-static void
+static struct attribute *aoe_attrs[] = {
+        &disk_attr_state.attr,
+        &disk_attr_mac.attr,
+        &disk_attr_netif.attr,
+        &disk_attr_fwver.attr,
+};
+
+static const struct attribute_group attr_group = {
+        .attrs = aoe_attrs,
+};
+
+static int
 aoedisk_add_sysfs(struct aoedev *d)
 {
-        sysfs_create_file(&d->gd->kobj, &disk_attr_state.attr);
-        sysfs_create_file(&d->gd->kobj, &disk_attr_mac.attr);
-        sysfs_create_file(&d->gd->kobj, &disk_attr_netif.attr);
-        sysfs_create_file(&d->gd->kobj, &disk_attr_fwver.attr);
+        return sysfs_create_group(&d->gd->kobj, &attr_group);
 }
 void
 aoedisk_rm_sysfs(struct aoedev *d)
 {
-        sysfs_remove_link(&d->gd->kobj, "state");
-        sysfs_remove_link(&d->gd->kobj, "mac");
-        sysfs_remove_link(&d->gd->kobj, "netif");
-        sysfs_remove_link(&d->gd->kobj, "firmware-version");
+        sysfs_remove_group(&d->gd->kobj, &attr_group);
 }
 
 static int
@@ -132,8 +136,7 @@ aoeblk_make_request(request_queue_t *q, struct bio *bio)
         d = bio->bi_bdev->bd_disk->private_data;
         buf = mempool_alloc(d->bufpool, GFP_NOIO);
         if (buf == NULL) {
-                printk(KERN_INFO "aoe: aoeblk_make_request: buf allocation "
-                        "failure\n");
+                printk(KERN_INFO "aoe: buf allocation failure\n");
                 bio_endio(bio, bio->bi_size, -ENOMEM);
                 return 0;
         }
@@ -143,14 +146,15 @@ aoeblk_make_request(request_queue_t *q, struct bio *bio)
         buf->bio = bio;
         buf->resid = bio->bi_size;
         buf->sector = bio->bi_sector;
-        buf->bv = buf->bio->bi_io_vec;
+        buf->bv = &bio->bi_io_vec[bio->bi_idx];
+        WARN_ON(buf->bv->bv_len == 0);
         buf->bv_resid = buf->bv->bv_len;
         buf->bufaddr = page_address(buf->bv->bv_page) + buf->bv->bv_offset;
 
         spin_lock_irqsave(&d->lock, flags);
 
         if ((d->flags & DEVFL_UP) == 0) {
-                printk(KERN_INFO "aoe: aoeblk_make_request: device %ld.%ld is not up\n",
+                printk(KERN_INFO "aoe: device %ld.%ld is not up\n",
                         d->aoemajor, d->aoeminor);
                 spin_unlock_irqrestore(&d->lock, flags);
                 mempool_free(buf, d->bufpool);
@@ -176,7 +180,7 @@ aoeblk_getgeo(struct block_device *bdev, struct hd_geometry *geo)
         struct aoedev *d = bdev->bd_disk->private_data;
 
         if ((d->flags & DEVFL_UP) == 0) {
-                printk(KERN_ERR "aoe: aoeblk_ioctl: disk not up\n");
+                printk(KERN_ERR "aoe: disk not up\n");
                 return -ENODEV;
         }
 
@@ -203,8 +207,8 @@ aoeblk_gdalloc(void *vp)
 
         gd = alloc_disk(AOE_PARTITIONS);
         if (gd == NULL) {
-                printk(KERN_ERR "aoe: aoeblk_gdalloc: cannot allocate disk "
-                        "structure for %ld.%ld\n", d->aoemajor, d->aoeminor);
+                printk(KERN_ERR "aoe: cannot allocate disk structure for %ld.%ld\n",
+                        d->aoemajor, d->aoeminor);
                 spin_lock_irqsave(&d->lock, flags);
                 d->flags &= ~DEVFL_GDALLOC;
                 spin_unlock_irqrestore(&d->lock, flags);
@@ -213,8 +217,8 @@ aoeblk_gdalloc(void *vp)
 
         d->bufpool = mempool_create_slab_pool(MIN_BUFS, buf_pool_cache);
         if (d->bufpool == NULL) {
-                printk(KERN_ERR "aoe: aoeblk_gdalloc: cannot allocate bufpool "
-                        "for %ld.%ld\n", d->aoemajor, d->aoeminor);
+                printk(KERN_ERR "aoe: cannot allocate bufpool for %ld.%ld\n",
+                        d->aoemajor, d->aoeminor);
                 put_disk(gd);
                 spin_lock_irqsave(&d->lock, flags);
                 d->flags &= ~DEVFL_GDALLOC;
diff --git a/drivers/block/aoe/aoechr.c b/drivers/block/aoe/aoechr.c
index 1bc1cf9603f1..e22b4c9520a9 100644
--- a/drivers/block/aoe/aoechr.c
+++ b/drivers/block/aoe/aoechr.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2004 Coraid, Inc.  See COPYING for GPL terms. */
+/* Copyright (c) 2006 Coraid, Inc.  See COPYING for GPL terms. */
 /*
  * aoechr.c
  * AoE character device driver
@@ -15,7 +15,6 @@ enum {
         MINOR_INTERFACES,
         MINOR_REVALIDATE,
         MSGSZ = 2048,
-        NARGS = 10,
         NMSG = 100,             /* message backlog to retain */
 };
 
@@ -56,9 +55,8 @@ static int
 interfaces(const char __user *str, size_t size)
 {
         if (set_aoe_iflist(str, size)) {
-                printk(KERN_CRIT
-                       "%s: could not set interface list: %s\n",
-                       __FUNCTION__, "too many interfaces");
+                printk(KERN_ERR
+                        "aoe: could not set interface list: too many interfaces\n");
                 return -EINVAL;
         }
         return 0;
@@ -81,8 +79,7 @@ revalidate(const char __user *str, size_t size)
         /* should be e%d.%d format */
         n = sscanf(buf, "e%d.%d", &major, &minor);
         if (n != 2) {
-                printk(KERN_ERR "aoe: %s: invalid device specification\n",
-                        __FUNCTION__);
+                printk(KERN_ERR "aoe: invalid device specification\n");
                 return -EINVAL;
         }
         d = aoedev_by_aoeaddr(major, minor);
@@ -90,6 +87,7 @@ revalidate(const char __user *str, size_t size)
                 return -EINVAL;
 
         spin_lock_irqsave(&d->lock, flags);
+        d->flags &= ~DEVFL_MAXBCNT;
         d->flags |= DEVFL_PAUSE;
         spin_unlock_irqrestore(&d->lock, flags);
         aoecmd_cfg(major, minor);
@@ -116,7 +114,7 @@ bail:		spin_unlock_irqrestore(&emsgs_lock, flags);
 
         mp = kmalloc(n, GFP_ATOMIC);
         if (mp == NULL) {
-                printk(KERN_CRIT "aoe: aoechr_error: allocation failure, len=%ld\n", n);
+                printk(KERN_ERR "aoe: allocation failure, len=%ld\n", n);
                 goto bail;
         }
 
@@ -141,7 +139,7 @@ aoechr_write(struct file *filp, const char __user *buf, size_t cnt, loff_t *offp
 
         switch ((unsigned long) filp->private_data) {
         default:
-                printk(KERN_INFO "aoe: aoechr_write: can't write to that file.\n");
+                printk(KERN_INFO "aoe: can't write to that file.\n");
                 break;
         case MINOR_DISCOVER:
                 ret = discover();
@@ -250,7 +248,7 @@ aoechr_init(void)
 
         n = register_chrdev(AOE_MAJOR, "aoechr", &aoe_fops);
         if (n < 0) { 
-                printk(KERN_ERR "aoe: aoechr_init: can't register char device\n");
+                printk(KERN_ERR "aoe: can't register char device\n");
                 return n;
         }
         sema_init(&emsgs_sema, 0);
diff --git a/drivers/block/aoe/aoecmd.c b/drivers/block/aoe/aoecmd.c
index 39da28d344fe..8a13b1af8bab 100644
--- a/drivers/block/aoe/aoecmd.c
+++ b/drivers/block/aoe/aoecmd.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2004 Coraid, Inc.  See COPYING for GPL terms. */
+/* Copyright (c) 2006 Coraid, Inc.  See COPYING for GPL terms. */
 /*
  * aoecmd.c
  * Filesystem request handling methods
@@ -15,17 +15,19 @@
 #define TIMERTICK (HZ / 10)
 #define MINTIMER (2 * TIMERTICK)
 #define MAXTIMER (HZ << 1)
-#define MAXWAIT (60 * 3)        /* After MAXWAIT seconds, give up and fail dev */
 
-static struct sk_buff *
-new_skb(struct net_device *if_dev, ulong len)
+static int aoe_deadsecs = 60 * 3;
+module_param(aoe_deadsecs, int, 0644);
+MODULE_PARM_DESC(aoe_deadsecs, "After aoe_deadsecs seconds, give up and fail dev.");
+
+struct sk_buff *
+new_skb(ulong len)
 {
         struct sk_buff *skb;
 
         skb = alloc_skb(len, GFP_ATOMIC);
         if (skb) {
                 skb->nh.raw = skb->mac.raw = skb->data;
-                skb->dev = if_dev;
                 skb->protocol = __constant_htons(ETH_P_AOE);
                 skb->priority = 0;
                 skb_put(skb, len);
@@ -40,29 +42,6 @@ new_skb(struct net_device *if_dev, ulong len)
         return skb;
 }
 
-static struct sk_buff *
-skb_prepare(struct aoedev *d, struct frame *f)
-{
-        struct sk_buff *skb;
-        char *p;
-
-        skb = new_skb(d->ifp, f->ndata + f->writedatalen);
-        if (!skb) {
-                printk(KERN_INFO "aoe: skb_prepare: failure to allocate skb\n");
-                return NULL;
-        }
-
-        p = skb->mac.raw;
-        memcpy(p, f->data, f->ndata);
-
-        if (f->writedatalen) {
-                p += sizeof(struct aoe_hdr) + sizeof(struct aoe_atahdr);
-                memcpy(p, f->bufaddr, f->writedatalen);
-        }
-
-        return skb;
-}
-
 static struct frame *
 getframe(struct aoedev *d, int tag)
 {
@@ -107,6 +86,17 @@ aoehdr_atainit(struct aoedev *d, struct aoe_hdr *h)
         return host_tag;
 }
 
+static inline void
+put_lba(struct aoe_atahdr *ah, sector_t lba)
+{
+        ah->lba0 = lba;
+        ah->lba1 = lba >>= 8;
+        ah->lba2 = lba >>= 8;
+        ah->lba3 = lba >>= 8;
+        ah->lba4 = lba >>= 8;
+        ah->lba5 = lba >>= 8;
+}
+
 static void
 aoecmd_ata_rw(struct aoedev *d, struct frame *f)
 {
@@ -125,29 +115,27 @@ aoecmd_ata_rw(struct aoedev *d, struct frame *f)
 
         sector = buf->sector;
         bcnt = buf->bv_resid;
-        if (bcnt > MAXATADATA)
-                bcnt = MAXATADATA;
+        if (bcnt > d->maxbcnt)
+                bcnt = d->maxbcnt;
 
         /* initialize the headers & frame */
-        h = (struct aoe_hdr *) f->data;
+        skb = f->skb;
+        h = (struct aoe_hdr *) skb->mac.raw;
         ah = (struct aoe_atahdr *) (h+1);
-        f->ndata = sizeof *h + sizeof *ah;
-        memset(h, 0, f->ndata);
+        skb->len = sizeof *h + sizeof *ah;
+        memset(h, 0, ETH_ZLEN);
         f->tag = aoehdr_atainit(d, h);
         f->waited = 0;
         f->buf = buf;
         f->bufaddr = buf->bufaddr;
+        f->bcnt = bcnt;
+        f->lba = sector;
 
         /* set up ata header */
         ah->scnt = bcnt >> 9;
-        ah->lba0 = sector;
-        ah->lba1 = sector >>= 8;
-        ah->lba2 = sector >>= 8;
-        ah->lba3 = sector >>= 8;
+        put_lba(ah, sector);
         if (d->flags & DEVFL_EXT) {
                 ah->aflags |= AOEAFL_EXT;
-                ah->lba4 = sector >>= 8;
-                ah->lba5 = sector >>= 8;
         } else {
                 extbit = 0;
                 ah->lba3 &= 0x0f;
@@ -155,11 +143,14 @@ aoecmd_ata_rw(struct aoedev *d, struct frame *f)
         }
 
         if (bio_data_dir(buf->bio) == WRITE) {
+                skb_fill_page_desc(skb, 0, virt_to_page(f->bufaddr),
+                        offset_in_page(f->bufaddr), bcnt);
                 ah->aflags |= AOEAFL_WRITE;
-                f->writedatalen = bcnt;
+                skb->len += bcnt;
+                skb->data_len = bcnt;
         } else {
+                skb->len = ETH_ZLEN;
                 writebit = 0;
-                f->writedatalen = 0;
         }
 
         ah->cmdstat = WIN_READ | writebit | extbit;
@@ -168,26 +159,27 @@ aoecmd_ata_rw(struct aoedev *d, struct frame *f)
         buf->nframesout += 1;
         buf->bufaddr += bcnt;
         buf->bv_resid -= bcnt;
-/* printk(KERN_INFO "aoe: bv_resid=%ld\n", buf->bv_resid); */
+/* printk(KERN_DEBUG "aoe: bv_resid=%ld\n", buf->bv_resid); */
         buf->resid -= bcnt;
         buf->sector += bcnt >> 9;
         if (buf->resid == 0) {
                 d->inprocess = NULL;
         } else if (buf->bv_resid == 0) {
                 buf->bv++;
+                WARN_ON(buf->bv->bv_len == 0);
                 buf->bv_resid = buf->bv->bv_len;
                 buf->bufaddr = page_address(buf->bv->bv_page) + buf->bv->bv_offset;
         }
 
-        skb = skb_prepare(d, f);
-        if (skb) {
-                skb->next = NULL;
-                if (d->sendq_hd)
-                        d->sendq_tl->next = skb;
-                else
-                        d->sendq_hd = skb;
-                d->sendq_tl = skb;
-        }
+        skb->dev = d->ifp;
+        skb = skb_clone(skb, GFP_ATOMIC);
+        if (skb == NULL)
+                return;
+        if (d->sendq_hd)
+                d->sendq_tl->next = skb;
+        else
+                d->sendq_hd = skb;
+        d->sendq_tl = skb;
 }
 
 /* some callers cannot sleep, and they can call this function,
@@ -209,11 +201,12 @@ aoecmd_cfg_pkts(ushort aoemajor, unsigned char aoeminor, struct sk_buff **tail)
                 if (!is_aoe_netif(ifp))
                         continue;
 
-                skb = new_skb(ifp, sizeof *h + sizeof *ch);
+                skb = new_skb(sizeof *h + sizeof *ch);
                 if (skb == NULL) {
-                        printk(KERN_INFO "aoe: aoecmd_cfg: skb alloc failure\n");
+                        printk(KERN_INFO "aoe: skb alloc failure\n");
                         continue;
                 }
+                skb->dev = ifp;
                 if (sl_tail == NULL)
                         sl_tail = skb;
                 h = (struct aoe_hdr *) skb->mac.raw;
@@ -237,6 +230,29 @@ aoecmd_cfg_pkts(ushort aoemajor, unsigned char aoeminor, struct sk_buff **tail)
         return sl;
 }
 
+static struct frame *
+freeframe(struct aoedev *d)
+{
+        struct frame *f, *e;
+        int n = 0;
+
+        f = d->frames;
+        e = f + d->nframes;
+        for (; f<e; f++) {
+                if (f->tag != FREETAG)
+                        continue;
+                if (atomic_read(&skb_shinfo(f->skb)->dataref) == 1) {
+                        skb_shinfo(f->skb)->nr_frags = f->skb->data_len = 0;
+                        return f;
+                }
+                n++;
+        }
+        if (n == d->nframes)    /* wait for network layer */
+                d->flags |= DEVFL_KICKME;
+
+        return NULL;
+}
+
 /* enters with d->lock held */
 void
 aoecmd_work(struct aoedev *d)
@@ -252,7 +268,7 @@ aoecmd_work(struct aoedev *d)
         }
 
 loop:
-        f = getframe(d, FREETAG);
+        f = freeframe(d);
         if (f == NULL)
                 return;
         if (d->inprocess == NULL) {
@@ -260,7 +276,7 @@ loop:
                         return;
                 buf = container_of(d->bufq.next, struct buf, bufs);
                 list_del(d->bufq.next);
-/*printk(KERN_INFO "aoecmd_work: bi_size=%ld\n", buf->bio->bi_size); */
+/*printk(KERN_DEBUG "aoe: bi_size=%ld\n", buf->bio->bi_size); */
                 d->inprocess = buf;
         }
         aoecmd_ata_rw(d, f);
@@ -272,6 +288,7 @@ rexmit(struct aoedev *d, struct frame *f)
 {
         struct sk_buff *skb;
         struct aoe_hdr *h;
+        struct aoe_atahdr *ah;
         char buf[128];
         u32 n;
 
@@ -283,21 +300,41 @@ rexmit(struct aoedev *d, struct frame *f)
                 d->aoemajor, d->aoeminor, f->tag, jiffies, n);
         aoechr_error(buf);
 
-        h = (struct aoe_hdr *) f->data;
+        skb = f->skb;
+        h = (struct aoe_hdr *) skb->mac.raw;
+        ah = (struct aoe_atahdr *) (h+1);
         f->tag = n;
         h->tag = cpu_to_be32(n);
         memcpy(h->dst, d->addr, sizeof h->dst);
         memcpy(h->src, d->ifp->dev_addr, sizeof h->src);
 
-        skb = skb_prepare(d, f);
-        if (skb) {
-                skb->next = NULL;
-                if (d->sendq_hd)
-                        d->sendq_tl->next = skb;
-                else
-                        d->sendq_hd = skb;
-                d->sendq_tl = skb;
+        n = DEFAULTBCNT / 512;
+        if (ah->scnt > n) {
+                ah->scnt = n;
+                if (ah->aflags & AOEAFL_WRITE) {
+                        skb_fill_page_desc(skb, 0, virt_to_page(f->bufaddr),
+                                offset_in_page(f->bufaddr), DEFAULTBCNT);
+                        skb->len = sizeof *h + sizeof *ah + DEFAULTBCNT;
+                        skb->data_len = DEFAULTBCNT;
+                }
+                if (++d->lostjumbo > (d->nframes << 1))
+                if (d->maxbcnt != DEFAULTBCNT) {
+                        printk(KERN_INFO "aoe: e%ld.%ld: too many lost jumbo on %s - using 1KB frames.\n",
+                                d->aoemajor, d->aoeminor, d->ifp->name);
+                        d->maxbcnt = DEFAULTBCNT;
+                        d->flags |= DEVFL_MAXBCNT;
+                }
         }
+
+        skb->dev = d->ifp;
+        skb = skb_clone(skb, GFP_ATOMIC);
+        if (skb == NULL)
+                return;
+        if (d->sendq_hd)
+                d->sendq_tl->next = skb;
+        else
+                d->sendq_hd = skb;
+        d->sendq_tl = skb;
 }
 
 static int
@@ -340,13 +377,17 @@ rexmit_timer(ulong vp)
                 if (f->tag != FREETAG && tsince(f->tag) >= timeout) {
                         n = f->waited += timeout;
                         n /= HZ;
-                        if (n > MAXWAIT) { /* waited too long.  device failure. */
+                        if (n > aoe_deadsecs) { /* waited too long for response */
                                 aoedev_downdev(d);
                                 break;
                         }
                         rexmit(d, f);
                 }
         }
+        if (d->flags & DEVFL_KICKME) {
+                d->flags &= ~DEVFL_KICKME;
+                aoecmd_work(d);
+        }
 
         sl = d->sendq_hd;
         d->sendq_hd = d->sendq_tl = NULL;
@@ -431,8 +472,8 @@ ataid_complete(struct aoedev *d, unsigned char *id)
         }
 
         if (d->ssize != ssize)
-                printk(KERN_INFO "aoe: %012llx e%lu.%lu v%04x has %llu "
-                        "sectors\n", (unsigned long long)mac_addr(d->addr),
+                printk(KERN_INFO "aoe: %012llx e%lu.%lu v%04x has %llu sectors\n",
+                        (unsigned long long)mac_addr(d->addr),
                         d->aoemajor, d->aoeminor,
                         d->fw_ver, (long long)ssize);
         d->ssize = ssize;
@@ -442,11 +483,9 @@ ataid_complete(struct aoedev *d, unsigned char *id)
                 d->flags |= DEVFL_NEWSIZE;
         } else {
                 if (d->flags & DEVFL_GDALLOC) {
-                        printk(KERN_INFO "aoe: %s: %s e%lu.%lu, %s\n",
-                               __FUNCTION__,
-                               "can't schedule work for",
+                        printk(KERN_ERR "aoe: can't schedule work for e%lu.%lu, %s\n",
                                d->aoemajor, d->aoeminor,
-                               "it's already on! (This really shouldn't happen).\n");
+                               "it's already on!  This shouldn't happen.\n");
                         return;
                 }
                 d->flags |= DEVFL_GDALLOC;
@@ -460,8 +499,15 @@ calc_rttavg(struct aoedev *d, int rtt)
         register long n;
 
         n = rtt;
-        if (n < MINTIMER)
-                n = MINTIMER;
+        if (n < 0) {
+                n = -rtt;
+                if (n < MINTIMER)
+                        n = MINTIMER;
+                else if (n > MAXTIMER)
+                        n = MAXTIMER;
+                d->mintimer += (n - d->mintimer) >> 1;
+        } else if (n < d->mintimer)
+                n = d->mintimer;
         else if (n > MAXTIMER)
                 n = MAXTIMER;
 
@@ -474,7 +520,7 @@ void
 aoecmd_ata_rsp(struct sk_buff *skb)
 {
         struct aoedev *d;
-        struct aoe_hdr *hin;
+        struct aoe_hdr *hin, *hout;
         struct aoe_atahdr *ahin, *ahout;
         struct frame *f;
         struct buf *buf;
@@ -497,8 +543,10 @@ aoecmd_ata_rsp(struct sk_buff *skb)
 
         spin_lock_irqsave(&d->lock, flags);
 
-        f = getframe(d, be32_to_cpu(hin->tag));
+        n = be32_to_cpu(hin->tag);
+        f = getframe(d, n);
         if (f == NULL) {
+                calc_rttavg(d, -tsince(n));
                 spin_unlock_irqrestore(&d->lock, flags);
                 snprintf(ebuf, sizeof ebuf,
                         "%15s e%d.%d    tag=%08x@%08lx\n",
@@ -514,26 +562,27 @@ aoecmd_ata_rsp(struct sk_buff *skb)
         calc_rttavg(d, tsince(f->tag));
 
         ahin = (struct aoe_atahdr *) (hin+1);
-        ahout = (struct aoe_atahdr *) (f->data + sizeof(struct aoe_hdr));
+        hout = (struct aoe_hdr *) f->skb->mac.raw;
+        ahout = (struct aoe_atahdr *) (hout+1);
         buf = f->buf;
 
         if (ahout->cmdstat == WIN_IDENTIFY)
                 d->flags &= ~DEVFL_PAUSE;
         if (ahin->cmdstat & 0xa9) {     /* these bits cleared on success */
-                printk(KERN_CRIT "aoe: aoecmd_ata_rsp: ata error cmd=%2.2Xh "
-                        "stat=%2.2Xh from e%ld.%ld\n", 
+                printk(KERN_ERR
+                        "aoe: ata error cmd=%2.2Xh stat=%2.2Xh from e%ld.%ld\n",
                         ahout->cmdstat, ahin->cmdstat,
                         d->aoemajor, d->aoeminor);
                 if (buf)
                         buf->flags |= BUFFL_FAIL;
         } else {
+                n = ahout->scnt << 9;
                 switch (ahout->cmdstat) {
                 case WIN_READ:
                 case WIN_READ_EXT:
-                        n = ahout->scnt << 9;
                         if (skb->len - sizeof *hin - sizeof *ahin < n) {
-                                printk(KERN_CRIT "aoe: aoecmd_ata_rsp: runt "
-                                        "ata data size in read.  skb->len=%d\n",
+                                printk(KERN_ERR
+                                        "aoe: runt data size in read.  skb->len=%d\n",
                                         skb->len);
                                 /* fail frame f?  just returning will rexmit. */
                                 spin_unlock_irqrestore(&d->lock, flags);
@@ -542,22 +591,49 @@ aoecmd_ata_rsp(struct sk_buff *skb)
                         memcpy(f->bufaddr, ahin+1, n);
                 case WIN_WRITE:
                 case WIN_WRITE_EXT:
+                        if (f->bcnt -= n) {
+                                skb = f->skb;
+                                f->bufaddr += n;
+                                put_lba(ahout, f->lba += ahout->scnt);
+                                n = f->bcnt;
+                                if (n > DEFAULTBCNT)
+                                        n = DEFAULTBCNT;
+                                ahout->scnt = n >> 9;
+                                if (ahout->aflags & AOEAFL_WRITE) {
+                                        skb_fill_page_desc(skb, 0,
+                                                virt_to_page(f->bufaddr),
+                                                offset_in_page(f->bufaddr), n);
+                                        skb->len = sizeof *hout + sizeof *ahout + n;
+                                        skb->data_len = n;
+                                }
+                                f->tag = newtag(d);
+                                hout->tag = cpu_to_be32(f->tag);
+                                skb->dev = d->ifp;
+                                skb = skb_clone(skb, GFP_ATOMIC);
+                                spin_unlock_irqrestore(&d->lock, flags);
+                                if (skb)
+                                        aoenet_xmit(skb);
+                                return;
+                        }
+                        if (n > DEFAULTBCNT)
+                                d->lostjumbo = 0;
                         break;
                 case WIN_IDENTIFY:
                         if (skb->len - sizeof *hin - sizeof *ahin < 512) {
-                                printk(KERN_INFO "aoe: aoecmd_ata_rsp: runt data size "
-                                        "in ataid.  skb->len=%d\n", skb->len);
+                                printk(KERN_INFO
+                                        "aoe: runt data size in ataid.  skb->len=%d\n",
+                                        skb->len);
                                 spin_unlock_irqrestore(&d->lock, flags);
                                 return;
                         }
                         ataid_complete(d, (char *) (ahin+1));
                         break;
                 default:
-                        printk(KERN_INFO "aoe: aoecmd_ata_rsp: unrecognized "
-                               "outbound ata command %2.2Xh for %d.%d\n", 
-                               ahout->cmdstat,
-                               be16_to_cpu(hin->major),
-                               hin->minor);
+                        printk(KERN_INFO
+                                "aoe: unrecognized ata command %2.2Xh for %d.%d\n",
+                                ahout->cmdstat,
+                                be16_to_cpu(hin->major),
+                                hin->minor);
                 }
         }
 
@@ -612,33 +688,32 @@ aoecmd_ata_id(struct aoedev *d)
         struct frame *f;
         struct sk_buff *skb;
 
-        f = getframe(d, FREETAG);
+        f = freeframe(d);
         if (f == NULL) {
-                printk(KERN_CRIT "aoe: aoecmd_ata_id: can't get a frame.  "
-                        "This shouldn't happen.\n");
+                printk(KERN_ERR "aoe: can't get a frame. This shouldn't happen.\n");
                 return NULL;
         }
 
         /* initialize the headers & frame */
-        h = (struct aoe_hdr *) f->data;
+        skb = f->skb;
+        h = (struct aoe_hdr *) skb->mac.raw;
         ah = (struct aoe_atahdr *) (h+1);
-        f->ndata = sizeof *h + sizeof *ah;
-        memset(h, 0, f->ndata);
+        skb->len = ETH_ZLEN;
+        memset(h, 0, ETH_ZLEN);
         f->tag = aoehdr_atainit(d, h);
         f->waited = 0;
-        f->writedatalen = 0;
 
         /* set up ata header */
         ah->scnt = 1;
         ah->cmdstat = WIN_IDENTIFY;
         ah->lba3 = 0xa0;
 
-        skb = skb_prepare(d, f);
+        skb->dev = d->ifp;
 
         d->rttavg = MAXTIMER;
         d->timer.function = rexmit_timer;
 
-        return skb;
+        return skb_clone(skb, GFP_ATOMIC);
 }
  
 void
@@ -648,9 +723,9 @@ aoecmd_cfg_rsp(struct sk_buff *skb)
         struct aoe_hdr *h;
         struct aoe_cfghdr *ch;
         ulong flags, sysminor, aoemajor;
-        u16 bufcnt;
         struct sk_buff *sl;
         enum { MAXFRAMES = 16 };
+        u16 n;
 
         h = (struct aoe_hdr *) skb->mac.raw;
         ch = (struct aoe_cfghdr *) (h+1);
@@ -661,26 +736,25 @@ aoecmd_cfg_rsp(struct sk_buff *skb)
          */
         aoemajor = be16_to_cpu(h->major);
         if (aoemajor == 0xfff) {
-                printk(KERN_CRIT "aoe: aoecmd_cfg_rsp: Warning: shelf "
-                        "address is all ones.  Check shelf dip switches\n");
+                printk(KERN_ERR "aoe: Warning: shelf address is all ones.  "
+                        "Check shelf dip switches.\n");
                 return;
         }
 
         sysminor = SYSMINOR(aoemajor, h->minor);
         if (sysminor * AOE_PARTITIONS + AOE_PARTITIONS > MINORMASK) {
-                printk(KERN_INFO
-                        "aoe: e%ld.%d: minor number too large\n", 
+                printk(KERN_INFO "aoe: e%ld.%d: minor number too large\n",
                         aoemajor, (int) h->minor);
                 return;
         }
 
-        bufcnt = be16_to_cpu(ch->bufcnt);
-        if (bufcnt > MAXFRAMES) /* keep it reasonable */
-                bufcnt = MAXFRAMES;
+        n = be16_to_cpu(ch->bufcnt);
+        if (n > MAXFRAMES)      /* keep it reasonable */
+                n = MAXFRAMES;
 
-        d = aoedev_by_sysminor_m(sysminor, bufcnt);
+        d = aoedev_by_sysminor_m(sysminor, n);
         if (d == NULL) {
-                printk(KERN_INFO "aoe: aoecmd_cfg_rsp: device sysminor_m failure\n");
+                printk(KERN_INFO "aoe: device sysminor_m failure\n");
                 return;
         }
 
@@ -689,6 +763,20 @@ aoecmd_cfg_rsp(struct sk_buff *skb)
         /* permit device to migrate mac and network interface */
         d->ifp = skb->dev;
         memcpy(d->addr, h->src, sizeof d->addr);
+        if (!(d->flags & DEVFL_MAXBCNT)) {
+                n = d->ifp->mtu;
+                n -= sizeof (struct aoe_hdr) + sizeof (struct aoe_atahdr);
+                n /= 512;
+                if (n > ch->scnt)
+                        n = ch->scnt;
+                n = n ? n * 512 : DEFAULTBCNT;
+                if (n != d->maxbcnt) {
+                        printk(KERN_INFO
+                                "aoe: e%ld.%ld: setting %d byte data frames on %s\n",
+                                d->aoemajor, d->aoeminor, n, d->ifp->name);
+                        d->maxbcnt = n;
+                }
+        }
 
         /* don't change users' perspective */
         if (d->nopen && !(d->flags & DEVFL_PAUSE)) {
@@ -696,6 +784,7 @@ aoecmd_cfg_rsp(struct sk_buff *skb)
                 return;
         }
         d->flags |= DEVFL_PAUSE;        /* force pause */
+        d->mintimer = MINTIMER;
         d->fw_ver = be16_to_cpu(ch->fwver);
 
         /* check for already outstanding ataid */
diff --git a/drivers/block/aoe/aoedev.c b/drivers/block/aoe/aoedev.c
index ed4258a62df5..6125921bbec4 100644
--- a/drivers/block/aoe/aoedev.c
+++ b/drivers/block/aoe/aoedev.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2004 Coraid, Inc.  See COPYING for GPL terms. */
+/* Copyright (c) 2006 Coraid, Inc.  See COPYING for GPL terms. */
 /*
  * aoedev.c
  * AoE device utility functions; maintains device list.
@@ -20,11 +20,8 @@ aoedev_isbusy(struct aoedev *d)
         f = d->frames;
         e = f + d->nframes;
         do {
-                if (f->tag != FREETAG) {
-                        printk(KERN_DEBUG "aoe: %ld.%ld isbusy\n",
-                                d->aoemajor, d->aoeminor);
+                if (f->tag != FREETAG)
                         return 1;
-                }
         } while (++f < e);
 
         return 0;
@@ -66,22 +63,32 @@ aoedev_newdev(ulong nframes)
         struct frame *f, *e;
 
         d = kzalloc(sizeof *d, GFP_ATOMIC);
-        if (d == NULL)
-                return NULL;
         f = kcalloc(nframes, sizeof *f, GFP_ATOMIC);
-        if (f == NULL) {
-                kfree(d);
+        switch (!d || !f) {
+        case 0:
+                d->nframes = nframes;
+                d->frames = f;
+                e = f + nframes;
+                for (; f<e; f++) {
+                        f->tag = FREETAG;
+                        f->skb = new_skb(ETH_ZLEN);
+                        if (!f->skb)
+                                break;
+                }
+                if (f == e)
+                        break;
+                while (f > d->frames) {
+                        f--;
+                        dev_kfree_skb(f->skb);
+                }
+        default:
+                if (f)
+                        kfree(f);
+                if (d)
+                        kfree(d);
                 return NULL;
         }
-
         INIT_WORK(&d->work, aoecmd_sleepwork, d);
-
-        d->nframes = nframes;
-        d->frames = f;
-        e = f + nframes;
-        for (; f<e; f++)
-                f->tag = FREETAG;
-
         spin_lock_init(&d->lock);
         init_timer(&d->timer);
         d->timer.data = (ulong) d;
@@ -114,6 +121,7 @@ aoedev_downdev(struct aoedev *d)
                         mempool_free(buf, d->bufpool);
                         bio_endio(bio, bio->bi_size, -EIO);
                 }
+                skb_shinfo(f->skb)->nr_frags = f->skb->data_len = 0;
         }
         d->inprocess = NULL;
 
@@ -148,7 +156,7 @@ aoedev_by_sysminor_m(ulong sysminor, ulong bufcnt)
                 d = aoedev_newdev(bufcnt);
                 if (d == NULL) {
                         spin_unlock_irqrestore(&devlist_lock, flags);
-                        printk(KERN_INFO "aoe: aoedev_set: aoedev_newdev failure.\n");
+                        printk(KERN_INFO "aoe: aoedev_newdev failure.\n");
                         return NULL;
                 }
                 d->sysminor = sysminor;
@@ -163,11 +171,19 @@ aoedev_by_sysminor_m(ulong sysminor, ulong bufcnt)
 static void
 aoedev_freedev(struct aoedev *d)
 {
+        struct frame *f, *e;
+
         if (d->gd) {
                 aoedisk_rm_sysfs(d);
                 del_gendisk(d->gd);
                 put_disk(d->gd);
         }
+        f = d->frames;
+        e = f + d->nframes;
+        for (; f<e; f++) {
+                skb_shinfo(f->skb)->nr_frags = 0;
+                dev_kfree_skb(f->skb);
+        }
         kfree(d->frames);
         if (d->bufpool)
                 mempool_destroy(d->bufpool);
diff --git a/drivers/block/aoe/aoemain.c b/drivers/block/aoe/aoemain.c
index de08491ebe66..a04b7d613299 100644
--- a/drivers/block/aoe/aoemain.c
+++ b/drivers/block/aoe/aoemain.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2004 Coraid, Inc.  See COPYING for GPL terms. */
+/* Copyright (c) 2006 Coraid, Inc.  See COPYING for GPL terms. */
 /*
  * aoemain.c
  * Module initialization routines, discover timer
@@ -84,13 +84,11 @@ aoe_init(void)
                 goto net_fail;
         ret = register_blkdev(AOE_MAJOR, DEVICE_NAME);
         if (ret < 0) {
-                printk(KERN_ERR "aoe: aoeblk_init: can't register major\n");
+                printk(KERN_ERR "aoe: can't register major\n");
                 goto blkreg_fail;
         }
 
-        printk(KERN_INFO
-               "aoe: aoe_init: AoE v%s initialised.\n",
-               VERSION);
+        printk(KERN_INFO "aoe: AoE v%s initialised.\n", VERSION);
         discover_timer(TINIT);
         return 0;
 
@@ -103,7 +101,7 @@ aoe_init(void)
  chr_fail:
         aoedev_exit();
         
-        printk(KERN_INFO "aoe: aoe_init: initialisation failure.\n");
+        printk(KERN_INFO "aoe: initialisation failure.\n");
         return ret;
 }
 
diff --git a/drivers/block/aoe/aoenet.c b/drivers/block/aoe/aoenet.c
index c1434ed11880..9626e0f5da9d 100644
--- a/drivers/block/aoe/aoenet.c
+++ b/drivers/block/aoe/aoenet.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2004 Coraid, Inc.  See COPYING for GPL terms. */
+/* Copyright (c) 2006 Coraid, Inc.  See COPYING for GPL terms. */
 /*
  * aoenet.c
  * Ethernet portion of AoE driver
@@ -74,7 +74,7 @@ set_aoe_iflist(const char __user *user_str, size_t size)
                 return -EINVAL;
 
         if (copy_from_user(aoe_iflist, user_str, size)) {
-                printk(KERN_INFO "aoe: %s: copy from user failed\n", __FUNCTION__);
+                printk(KERN_INFO "aoe: copy from user failed\n");
                 return -EFAULT;
         }
         aoe_iflist[size] = 0x00;
@@ -132,8 +132,7 @@ aoenet_rcv(struct sk_buff *skb, struct net_device *ifp, struct packet_type *pt,
                 if (n > NECODES)
                         n = 0;
                 if (net_ratelimit())
-                        printk(KERN_ERR "aoe: aoenet_rcv: error packet from %d.%d; "
-                               "ecode=%d '%s'\n",
+                        printk(KERN_ERR "aoe: error packet from %d.%d; ecode=%d '%s'\n",
                                be16_to_cpu(h->major), h->minor, 
                                h->err, aoe_errlist[n]);
                 goto exit;
@@ -147,7 +146,7 @@ aoenet_rcv(struct sk_buff *skb, struct net_device *ifp, struct packet_type *pt,
                 aoecmd_cfg_rsp(skb);
                 break;
         default:
-                printk(KERN_INFO "aoe: aoenet_rcv: unknown cmd %d\n", h->cmd);
+                printk(KERN_INFO "aoe: unknown cmd %d\n", h->cmd);
         }
 exit:
         dev_kfree_skb(skb);
diff --git a/drivers/block/rd.c b/drivers/block/rd.c
index a3f64bfe6b58..485aa87e9bcd 100644
--- a/drivers/block/rd.c
+++ b/drivers/block/rd.c
@@ -432,6 +432,12 @@ static int __init rd_init(void)
                 rd_disks[i] = alloc_disk(1);
                 if (!rd_disks[i])
                         goto out;
+
+                rd_queue[i] = blk_alloc_queue(GFP_KERNEL);
+                if (!rd_queue[i]) {
+                        put_disk(rd_disks[i]);
+                        goto out;
+                }
         }
 
         if (register_blkdev(RAMDISK_MAJOR, "ramdisk")) {
@@ -442,10 +448,6 @@ static int __init rd_init(void)
         for (i = 0; i < CONFIG_BLK_DEV_RAM_COUNT; i++) {
                 struct gendisk *disk = rd_disks[i];
 
-                rd_queue[i] = blk_alloc_queue(GFP_KERNEL);
-                if (!rd_queue[i])
-                        goto out_queue;
-
                 blk_queue_make_request(rd_queue[i], &rd_make_request);
                 blk_queue_hardsect_size(rd_queue[i], rd_blocksize);
 
@@ -466,8 +468,6 @@ static int __init rd_init(void)
                 CONFIG_BLK_DEV_RAM_COUNT, rd_size, rd_blocksize);
 
         return 0;
-out_queue:
-        unregister_blkdev(RAMDISK_MAJOR, "ramdisk");
 out:
         while (i--) {
                 put_disk(rd_disks[i]);
diff --git a/drivers/bluetooth/bcm203x.c b/drivers/bluetooth/bcm203x.c
index 67cdda43f229..516751754aa9 100644
--- a/drivers/bluetooth/bcm203x.c
+++ b/drivers/bluetooth/bcm203x.c
@@ -29,7 +29,6 @@
 #include <linux/slab.h>
 #include <linux/types.h>
 #include <linux/errno.h>
-#include <linux/timer.h>
 
 #include <linux/device.h>
 #include <linux/firmware.h>
@@ -43,7 +42,7 @@
 #define BT_DBG(D...)
 #endif
 
-#define VERSION "1.0"
+#define VERSION "1.1"
 
 static int ignore = 0;
 
@@ -72,7 +71,7 @@ struct bcm203x_data {
 
         unsigned long           state;
 
-        struct timer_list       timer;
+        struct work_struct      work;
 
         struct urb              *urb;
         unsigned char           *buffer;
@@ -105,7 +104,7 @@ static void bcm203x_complete(struct urb *urb)
 
                 data->state = BCM203X_SELECT_MEMORY;
 
-                mod_timer(&data->timer, jiffies + (HZ / 10));
+                schedule_work(&data->work);
                 break;
 
         case BCM203X_SELECT_MEMORY:
@@ -158,9 +157,9 @@ static void bcm203x_complete(struct urb *urb)
         }
 }
 
-static void bcm203x_timer(unsigned long user_data)
+static void bcm203x_work(void *user_data)
 {
-        struct bcm203x_data *data = (struct bcm203x_data *) user_data;
+        struct bcm203x_data *data = user_data;
 
         if (usb_submit_urb(data->urb, GFP_ATOMIC) < 0)
                 BT_ERR("Can't submit URB");
@@ -247,13 +246,11 @@ static int bcm203x_probe(struct usb_interface *intf, const struct usb_device_id
 
         release_firmware(firmware);
 
-        init_timer(&data->timer);
-        data->timer.function = bcm203x_timer;
-        data->timer.data = (unsigned long) data;
+        INIT_WORK(&data->work, bcm203x_work, (void *) data);
 
         usb_set_intfdata(intf, data);
 
-        mod_timer(&data->timer, jiffies + HZ);
+        schedule_work(&data->work);
 
         return 0;
 }
diff --git a/drivers/bluetooth/dtl1_cs.c b/drivers/bluetooth/dtl1_cs.c
index e7c800f4c3ad..07eafbc5dc3a 100644
--- a/drivers/bluetooth/dtl1_cs.c
+++ b/drivers/bluetooth/dtl1_cs.c
@@ -711,6 +711,7 @@ static void dtl1_release(struct pcmcia_device *link)
 
 static struct pcmcia_device_id dtl1_ids[] = {
         PCMCIA_DEVICE_PROD_ID12("Nokia Mobile Phones", "DTL-1", 0xe1bfdd64, 0xe168480d),
+        PCMCIA_DEVICE_PROD_ID12("Nokia Mobile Phones", "DTL-4", 0xe1bfdd64, 0x9102bc82),
         PCMCIA_DEVICE_PROD_ID12("Socket", "CF", 0xb38bcc2e, 0x44ebf863),
         PCMCIA_DEVICE_PROD_ID12("Socket", "CF+ Personal Network Card", 0xb38bcc2e, 0xe732bae3),
         PCMCIA_DEVICE_NULL
diff --git a/drivers/bluetooth/hci_usb.c b/drivers/bluetooth/hci_usb.c
index 7565642a007a..fdea58ae16b2 100644
--- a/drivers/bluetooth/hci_usb.c
+++ b/drivers/bluetooth/hci_usb.c
@@ -118,6 +118,9 @@ static struct usb_device_id blacklist_ids[] = {
         /* IBM/Lenovo ThinkPad with Broadcom chip */
         { USB_DEVICE(0x0a5c, 0x201e), .driver_info = HCI_WRONG_SCO_MTU },
 
+        /* ANYCOM Bluetooth USB-200 and USB-250 */
+        { USB_DEVICE(0x0a5c, 0x2111), .driver_info = HCI_RESET },
+
         /* Microsoft Wireless Transceiver for Bluetooth 2.0 */
         { USB_DEVICE(0x045e, 0x009c), .driver_info = HCI_RESET },
 
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 0e6f35fcc2eb..39a9f8cc6412 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -1046,7 +1046,7 @@ source "drivers/char/tpm/Kconfig"
 
 config TELCLOCK
         tristate "Telecom clock driver for MPBL0010 ATCA SBC"
-        depends on EXPERIMENTAL
+        depends on EXPERIMENTAL && X86
         default n
         help
           The telecom clock device is specific to the MPBL0010 ATCA computer and
diff --git a/drivers/char/epca.c b/drivers/char/epca.c
index c3f95583a120..706733c0b36a 100644
--- a/drivers/char/epca.c
+++ b/drivers/char/epca.c
@@ -1157,6 +1157,7 @@ static int __init pc_init(void)
         int crd;
         struct board_info *bd;
         unsigned char board_id = 0;
+        int err = -ENOMEM;
 
         int pci_boards_found, pci_count;
 
@@ -1164,13 +1165,11 @@ static int __init pc_init(void)
 
         pc_driver = alloc_tty_driver(MAX_ALLOC);
         if (!pc_driver)
-                return -ENOMEM;
+                goto out1;
 
         pc_info = alloc_tty_driver(MAX_ALLOC);
-        if (!pc_info) {
-                put_tty_driver(pc_driver);
-                return -ENOMEM;
-        }
+        if (!pc_info)
+                goto out2;
 
         /* -----------------------------------------------------------------------
                 If epca_setup has not been ran by LILO set num_cards to defaults; copy
@@ -1370,11 +1369,17 @@ static int __init pc_init(void)
 
         } /* End for each card */
 
-        if (tty_register_driver(pc_driver))
-                panic("Couldn't register Digi PC/ driver");
+        err = tty_register_driver(pc_driver);
+        if (err) {
+                printk(KERN_ERR "Couldn't register Digi PC/ driver");
+                goto out3;
+        }
 
-        if (tty_register_driver(pc_info))
-                panic("Couldn't register Digi PC/ info ");
+        err = tty_register_driver(pc_info);
+        if (err) {
+                printk(KERN_ERR "Couldn't register Digi PC/ info ");
+                goto out4;
+        }
 
         /* -------------------------------------------------------------------
            Start up the poller to check for events on all enabled boards
@@ -1385,6 +1390,15 @@ static int __init pc_init(void)
         mod_timer(&epca_timer, jiffies + HZ/25);
         return 0;
 
+out4:
+        tty_unregister_driver(pc_driver);
+out3:
+        put_tty_driver(pc_info);
+out2:
+        put_tty_driver(pc_driver);
+out1:
+        return err;
+
 } /* End pc_init */
 
 /* ------------------ Begin post_fep_init  ---------------------- */
diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
index 24825bdca8f4..e5cfb1fa47d1 100644
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
@@ -1789,7 +1789,7 @@ static int __devinit ipmi_pci_probe(struct pci_dev *pdev,
 
         info = kzalloc(sizeof(*info), GFP_KERNEL);
         if (!info)
-                return ENOMEM;
+                return -ENOMEM;
 
         info->addr_source = "PCI";
 
@@ -1810,7 +1810,7 @@ static int __devinit ipmi_pci_probe(struct pci_dev *pdev,
                 kfree(info);
                 printk(KERN_INFO "ipmi_si: %s: Unknown IPMI type: %d\n",
                        pci_name(pdev), class_type);
-                return ENOMEM;
+                return -ENOMEM;
         }
 
         rv = pci_enable_device(pdev);
diff --git a/drivers/char/random.c b/drivers/char/random.c
index 07f47a0208a7..eb6b13f4211a 100644
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@ -645,6 +645,7 @@ void add_input_randomness(unsigned int type, unsigned int code,
         add_timer_randomness(&input_timer_state,
                              (type << 4) ^ code ^ (code >> 4) ^ value);
 }
+EXPORT_SYMBOL_GPL(add_input_randomness);
 
 void add_interrupt_randomness(int irq)
 {
diff --git a/drivers/char/rio/rioctrl.c b/drivers/char/rio/rioctrl.c
index 052e8120a471..7ce77619707c 100644
--- a/drivers/char/rio/rioctrl.c
+++ b/drivers/char/rio/rioctrl.c
@@ -662,7 +662,7 @@ int riocontrol(struct rio_info *p, dev_t dev, int cmd, unsigned long arg, int su
                         p->RIOError.Error = COPYIN_FAILED;
                         return -EFAULT;
                 }
-                if (portStats.port >= RIO_PORTS) {
+                if (portStats.port < 0 || portStats.port >= RIO_PORTS) {
                         p->RIOError.Error = PORT_NUMBER_OUT_OF_RANGE;
                         return -ENXIO;
                 }
@@ -702,7 +702,7 @@ int riocontrol(struct rio_info *p, dev_t dev, int cmd, unsigned long arg, int su
                         p->RIOError.Error = COPYIN_FAILED;
                         return -EFAULT;
                 }
-                if (portStats.port >= RIO_PORTS) {
+                if (portStats.port < 0 || portStats.port >= RIO_PORTS) {
                         p->RIOError.Error = PORT_NUMBER_OUT_OF_RANGE;
                         return -ENXIO;
                 }
diff --git a/drivers/char/specialix.c b/drivers/char/specialix.c
index d0b88d0e87fd..7e1bd9562c2a 100644
--- a/drivers/char/specialix.c
+++ b/drivers/char/specialix.c
@@ -183,11 +183,6 @@ static int sx_poll = HZ;
 
 static struct tty_driver *specialix_driver;
 
-static unsigned long baud_table[] =  {
-        0, 50, 75, 110, 134, 150, 200, 300, 600, 1200, 1800, 2400, 4800,
-        9600, 19200, 38400, 57600, 115200, 0,
-};
-
 static struct specialix_board sx_board[SX_NBOARD] =  {
         { 0, SX_IOBASE1,  9, },
         { 0, SX_IOBASE2, 11, },
@@ -1090,9 +1085,9 @@ static void sx_change_speed(struct specialix_board *bp, struct specialix_port *p
 
         if (baud == 38400) {
                 if ((port->flags & ASYNC_SPD_MASK) == ASYNC_SPD_HI)
-                        baud ++;
+                        baud = 57600;
                 if ((port->flags & ASYNC_SPD_MASK) == ASYNC_SPD_VHI)
-                        baud += 2;
+                        baud = 115200;
         }
 
         if (!baud) {
@@ -1150,11 +1145,9 @@ static void sx_change_speed(struct specialix_board *bp, struct specialix_port *p
         sx_out(bp, CD186x_RBPRL, tmp & 0xff);
         sx_out(bp, CD186x_TBPRL, tmp & 0xff);
         spin_unlock_irqrestore(&bp->lock, flags);
-        if (port->custom_divisor) {
+        if (port->custom_divisor)
                 baud = (SX_OSCFREQ + port->custom_divisor/2) / port->custom_divisor;
-                baud = ( baud + 5 ) / 10;
-        } else
-                baud = (baud_table[baud] + 5) / 10;   /* Estimated CPS */
+        baud = (baud + 5) / 10;         /* Estimated CPS */
 
         /* Two timer ticks seems enough to wakeup something like SLIP driver */
         tmp = ((baud + HZ/2) / HZ) * 2 - CD186x_NFIFO;
diff --git a/drivers/char/sx.c b/drivers/char/sx.c
index 5fec626598cd..cc10af08cb05 100644
--- a/drivers/char/sx.c
+++ b/drivers/char/sx.c
@@ -2602,7 +2602,7 @@ static void __exit sx_exit (void)
                 }
         }
         if (misc_deregister(&sx_fw_device) < 0) {
-                printk (KERN_INFO "sx: couldn't deregister firmware loader devic\n");
+                printk (KERN_INFO "sx: couldn't deregister firmware loader device\n");
         }
         sx_dprintk (SX_DEBUG_CLEANUP, "Cleaning up drivers (%d)\n", sx_initialized);
         if (sx_initialized)
diff --git a/drivers/char/synclink.c b/drivers/char/synclink.c
index f2864cc64240..06784adcc35c 100644
--- a/drivers/char/synclink.c
+++ b/drivers/char/synclink.c
@@ -133,8 +133,8 @@ static MGSL_PARAMS default_params = {
 };
 
 #define SHARED_MEM_ADDRESS_SIZE 0x40000
-#define BUFFERLISTSIZE (PAGE_SIZE)
-#define DMABUFFERSIZE (PAGE_SIZE)
+#define BUFFERLISTSIZE 4096
+#define DMABUFFERSIZE 4096
 #define MAXRXFRAMES 7
 
 typedef struct _DMABUFFERENTRY
diff --git a/drivers/char/watchdog/alim7101_wdt.c b/drivers/char/watchdog/alim7101_wdt.c
index 5948863b592b..bf25d0a55a99 100644
--- a/drivers/char/watchdog/alim7101_wdt.c
+++ b/drivers/char/watchdog/alim7101_wdt.c
@@ -77,7 +77,8 @@ static struct pci_dev *alim7101_pmu;
 
 static int nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, int, 0);
-MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)");
+MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
+                 __stringify(CONFIG_WATCHDOG_NOWAYOUT) ")");
 
 /*
  *      Whack the dog
@@ -415,6 +416,16 @@ err_out:
 module_init(alim7101_wdt_init);
 module_exit(alim7101_wdt_unload);
 
+static struct pci_device_id alim7101_pci_tbl[] __devinitdata = {
+        { PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M1533,
+          PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+        { PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M7101,
+          PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+        { }
+};
+
+MODULE_DEVICE_TABLE(pci, alim7101_pci_tbl);
+
 MODULE_AUTHOR("Steve Hill");
 MODULE_DESCRIPTION("ALi M7101 PMU Computer Watchdog Timer driver");
 MODULE_LICENSE("GPL");
diff --git a/drivers/firmware/dcdbas.c b/drivers/firmware/dcdbas.c
index 8bcb58cd4ac0..1865b56fb141 100644
--- a/drivers/firmware/dcdbas.c
+++ b/drivers/firmware/dcdbas.c
@@ -8,7 +8,7 @@
  *
  *  See Documentation/dcdbas.txt for more information.
  *
- *  Copyright (C) 1995-2005 Dell Inc.
+ *  Copyright (C) 1995-2006 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
@@ -40,7 +40,7 @@
 #include "dcdbas.h"
 
 #define DRIVER_NAME             "dcdbas"
-#define DRIVER_VERSION          "5.6.0-2"
+#define DRIVER_VERSION          "5.6.0-3.2"
 #define DRIVER_DESCRIPTION      "Dell Systems Management Base Driver"
 
 static struct platform_device *dcdbas_pdev;
@@ -175,6 +175,9 @@ static ssize_t smi_data_write(struct kobject *kobj, char *buf, loff_t pos,
 {
         ssize_t ret;
 
+        if ((pos + count) > MAX_SMI_DATA_BUF_SIZE)
+                return -EINVAL;
+
         mutex_lock(&smi_data_lock);
 
         ret = smi_data_buf_realloc(pos + count);
diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index 9b88b25b6edb..e76d91906c99 100644
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -95,11 +95,13 @@ config SENSORS_ADM9240
           will be called adm9240.
 
 config SENSORS_K8TEMP
-        tristate "AMD K8 processor sensor"
+        tristate "AMD Athlon64/FX or Opteron temperature sensor"
         depends on HWMON && X86 && PCI && EXPERIMENTAL
         help
           If you say yes here you get support for the temperature
-          sensor(s) inside your AMD K8 CPU.
+          sensor(s) inside your CPU. Supported is whole AMD K8
+          microarchitecture. Please note that you will need at least
+          lm-sensors 2.10.1 for proper userspace support.
 
           This driver can also be built as a module.  If so, the module
           will be called k8temp.
@@ -369,8 +371,8 @@ config SENSORS_SMSC47M1
         help
           If you say yes here you get support for the integrated fan
           monitoring and control capabilities of the SMSC LPC47B27x,
-          LPC47M10x, LPC47M13x, LPC47M14x, LPC47M15x, LPC47M192 and
-          LPC47M997 chips.
+          LPC47M10x, LPC47M112, LPC47M13x, LPC47M14x, LPC47M15x,
+          LPC47M192 and LPC47M997 chips.
 
           The temperature and voltage sensor features of the LPC47M192
           and LPC47M997 are supported by another driver, select also
diff --git a/drivers/hwmon/adm9240.c b/drivers/hwmon/adm9240.c
index 377961c4a41e..aad594adf0c7 100644
--- a/drivers/hwmon/adm9240.c
+++ b/drivers/hwmon/adm9240.c
@@ -5,7 +5,7 @@
  * Copyright (C) 1999   Frodo Looijaard <frodol@dds.nl>
  *                      Philip Edelbrock <phil@netroedge.com>
  * Copyright (C) 2003   Michiel Rook <michiel@grendelproject.nl>
- * Copyright (C) 2005   Grant Coady <gcoady@gmail.com> with valuable
+ * Copyright (C) 2005   Grant Coady <gcoady.lk@gmail.com> with valuable
  *                              guidance from Jean Delvare
  *
  * Driver supports      Analog Devices          ADM9240
@@ -774,7 +774,7 @@ static void __exit sensors_adm9240_exit(void)
 }
 
 MODULE_AUTHOR("Michiel Rook <michiel@grendelproject.nl>, "
-                "Grant Coady <gcoady@gmail.com> and others");
+                "Grant Coady <gcoady.lk@gmail.com> and others");
 MODULE_DESCRIPTION("ADM9240/DS1780/LM81 driver");
 MODULE_LICENSE("GPL");
 
diff --git a/drivers/hwmon/lm78.c b/drivers/hwmon/lm78.c
index ac1b746df6d0..73bc2ffc598d 100644
--- a/drivers/hwmon/lm78.c
+++ b/drivers/hwmon/lm78.c
@@ -815,18 +815,18 @@ static int __init sm_lm78_init(void)
         if (res)
                 return res;
 
-        res = i2c_isa_add_driver(&lm78_isa_driver);
-        if (res) {
-                i2c_del_driver(&lm78_driver);
-                return res;
-        }
+        /* Don't exit if this one fails, we still want the I2C variants
+           to work! */
+        if (i2c_isa_add_driver(&lm78_isa_driver))
+                isa_address = 0;
 
         return 0;
 }
 
 static void __exit sm_lm78_exit(void)
 {
-        i2c_isa_del_driver(&lm78_isa_driver);
+        if (isa_address)
+                i2c_isa_del_driver(&lm78_isa_driver);
         i2c_del_driver(&lm78_driver);
 }
 
diff --git a/drivers/hwmon/smsc47m1.c b/drivers/hwmon/smsc47m1.c
index 47132fd26b1b..beb881c4b2e8 100644
--- a/drivers/hwmon/smsc47m1.c
+++ b/drivers/hwmon/smsc47m1.c
@@ -2,8 +2,8 @@
     smsc47m1.c - Part of lm_sensors, Linux kernel modules
                  for hardware monitoring
 
-    Supports the SMSC LPC47B27x, LPC47M10x, LPC47M13x, LPC47M14x,
-    LPC47M15x, LPC47M192 and LPC47M997 Super-I/O chips.
+    Supports the SMSC LPC47B27x, LPC47M10x, LPC47M112, LPC47M13x,
+    LPC47M14x, LPC47M15x, LPC47M192 and LPC47M997 Super-I/O chips.
 
     Copyright (C) 2002 Mark D. Studebaker <mdsxyz123@yahoo.com>
     Copyright (C) 2004 Jean Delvare <khali@linux-fr.org>
@@ -380,8 +380,8 @@ static int __init smsc47m1_find(unsigned short *addr)
         val = superio_inb(SUPERIO_REG_DEVID);
 
         /*
-         * SMSC LPC47M10x/LPC47M13x (device id 0x59), LPC47M14x (device id
-         * 0x5F) and LPC47B27x (device id 0x51) have fan control.
+         * SMSC LPC47M10x/LPC47M112/LPC47M13x (device id 0x59), LPC47M14x
+         * (device id 0x5F) and LPC47B27x (device id 0x51) have fan control.
          * The LPC47M15x and LPC47M192 chips "with hardware monitoring block"
          * can do much more besides (device id 0x60).
          * The LPC47M997 is undocumented, but seems to be compatible with
@@ -390,7 +390,8 @@ static int __init smsc47m1_find(unsigned short *addr)
         if (val == 0x51)
                 printk(KERN_INFO "smsc47m1: Found SMSC LPC47B27x\n");
         else if (val == 0x59)
-                printk(KERN_INFO "smsc47m1: Found SMSC LPC47M10x/LPC47M13x\n");
+                printk(KERN_INFO "smsc47m1: Found SMSC "
+                       "LPC47M10x/LPC47M112/LPC47M13x\n");
         else if (val == 0x5F)
                 printk(KERN_INFO "smsc47m1: Found SMSC LPC47M14x\n");
         else if (val == 0x60)
diff --git a/drivers/hwmon/w83627ehf.c b/drivers/hwmon/w83627ehf.c
index 833faa275ffa..2257806d0102 100644
--- a/drivers/hwmon/w83627ehf.c
+++ b/drivers/hwmon/w83627ehf.c
@@ -354,6 +354,8 @@ static void w83627ehf_write_fan_div(struct i2c_client *client, int nr)
         case 0:
                 reg = (w83627ehf_read_value(client, W83627EHF_REG_FANDIV1) & 0xcf)
                     | ((data->fan_div[0] & 0x03) << 4);
+                /* fan5 input control bit is write only, compute the value */
+                reg |= (data->has_fan & (1 << 4)) ? 1 : 0;
                 w83627ehf_write_value(client, W83627EHF_REG_FANDIV1, reg);
                 reg = (w83627ehf_read_value(client, W83627EHF_REG_VBAT) & 0xdf)
                     | ((data->fan_div[0] & 0x04) << 3);
@@ -362,6 +364,8 @@ static void w83627ehf_write_fan_div(struct i2c_client *client, int nr)
         case 1:
                 reg = (w83627ehf_read_value(client, W83627EHF_REG_FANDIV1) & 0x3f)
                     | ((data->fan_div[1] & 0x03) << 6);
+                /* fan5 input control bit is write only, compute the value */
+                reg |= (data->has_fan & (1 << 4)) ? 1 : 0;
                 w83627ehf_write_value(client, W83627EHF_REG_FANDIV1, reg);
                 reg = (w83627ehf_read_value(client, W83627EHF_REG_VBAT) & 0xbf)
                     | ((data->fan_div[1] & 0x04) << 4);
@@ -1216,13 +1220,16 @@ static int w83627ehf_detect(struct i2c_adapter *adapter)
         superio_exit();
 
         /* It looks like fan4 and fan5 pins can be alternatively used
-           as fan on/off switches */
+           as fan on/off switches, but fan5 control is write only :/
+           We assume that if the serial interface is disabled, designers
+           connected fan5 as input unless they are emitting log 1, which
+           is not the default. */
 
         data->has_fan = 0x07; /* fan1, fan2 and fan3 */
         i = w83627ehf_read_value(client, W83627EHF_REG_FANDIV1);
         if ((i & (1 << 2)) && (!fan4pin))
                 data->has_fan |= (1 << 3);
-        if ((i & (1 << 0)) && (!fan5pin))
+        if (!(i & (1 << 1)) && (!fan5pin))
                 data->has_fan |= (1 << 4);
 
         /* Register sysfs hooks */
diff --git a/drivers/hwmon/w83781d.c b/drivers/hwmon/w83781d.c
index a4584ec69842..1232171c3aad 100644
--- a/drivers/hwmon/w83781d.c
+++ b/drivers/hwmon/w83781d.c
@@ -1099,7 +1099,8 @@ w83781d_detect(struct i2c_adapter *adapter, int address, int kind)
            bank. */
         if (kind < 0) {
                 if (w83781d_read_value(client, W83781D_REG_CONFIG) & 0x80) {
-                        dev_dbg(dev, "Detection failed at step 3\n");
+                        dev_dbg(&adapter->dev, "Detection of w83781d chip "
+                                "failed at step 3\n");
                         err = -ENODEV;
                         goto ERROR2;
                 }
@@ -1109,7 +1110,8 @@ w83781d_detect(struct i2c_adapter *adapter, int address, int kind)
                 if ((!(val1 & 0x07)) &&
                     (((!(val1 & 0x80)) && (val2 != 0xa3) && (val2 != 0xc3))
                      || ((val1 & 0x80) && (val2 != 0x5c) && (val2 != 0x12)))) {
-                        dev_dbg(dev, "Detection failed at step 4\n");
+                        dev_dbg(&adapter->dev, "Detection of w83781d chip "
+                                "failed at step 4\n");
                         err = -ENODEV;
                         goto ERROR2;
                 }
@@ -1119,7 +1121,8 @@ w83781d_detect(struct i2c_adapter *adapter, int address, int kind)
                                   ((val1 & 0x80) && (val2 == 0x5c)))) {
                         if (w83781d_read_value
                             (client, W83781D_REG_I2C_ADDR) != address) {
-                                dev_dbg(dev, "Detection failed at step 5\n");
+                                dev_dbg(&adapter->dev, "Detection of w83781d "
+                                        "chip failed at step 5\n");
                                 err = -ENODEV;
                                 goto ERROR2;
                         }
@@ -1141,8 +1144,8 @@ w83781d_detect(struct i2c_adapter *adapter, int address, int kind)
                 else if (val2 == 0x12)
                         vendid = asus;
                 else {
-                        dev_dbg(dev, "Chip was made by neither "
-                                "Winbond nor Asus?\n");
+                        dev_dbg(&adapter->dev, "w83781d chip vendor is "
+                                "neither Winbond nor Asus\n");
                         err = -ENODEV;
                         goto ERROR2;
                 }
@@ -1161,10 +1164,9 @@ w83781d_detect(struct i2c_adapter *adapter, int address, int kind)
                         kind = as99127f;
                 else {
                         if (kind == 0)
-                                dev_warn(dev, "Ignoring 'force' "
+                                dev_warn(&adapter->dev, "Ignoring 'force' "
                                          "parameter for unknown chip at "
-                                         "adapter %d, address 0x%02x\n",
-                                         i2c_adapter_id(adapter), address);
+                                         "address 0x%02x\n", address);
                         err = -EINVAL;
                         goto ERROR2;
                 }
@@ -1685,11 +1687,10 @@ sensors_w83781d_init(void)
         if (res)
                 return res;
 
-        res = i2c_isa_add_driver(&w83781d_isa_driver);
-        if (res) {
-                i2c_del_driver(&w83781d_driver);
-                return res;
-        }
+        /* Don't exit if this one fails, we still want the I2C variants
+           to work! */
+        if (i2c_isa_add_driver(&w83781d_isa_driver))
+                isa_address = 0;
 
         return 0;
 }
@@ -1697,7 +1698,8 @@ sensors_w83781d_init(void)
 static void __exit
 sensors_w83781d_exit(void)
 {
-        i2c_isa_del_driver(&w83781d_isa_driver);
+        if (isa_address)
+                i2c_isa_del_driver(&w83781d_isa_driver);
         i2c_del_driver(&w83781d_driver);
 }
 
diff --git a/drivers/hwmon/w83791d.c b/drivers/hwmon/w83791d.c
index 371ed4f69a97..9e5f885368b4 100644
--- a/drivers/hwmon/w83791d.c
+++ b/drivers/hwmon/w83791d.c
@@ -746,6 +746,52 @@ static ssize_t store_vrm_reg(struct device *dev,
 
 static DEVICE_ATTR(vrm, S_IRUGO | S_IWUSR, show_vrm_reg, store_vrm_reg);
 
+#define IN_UNIT_ATTRS(X) \
+        &sda_in_input[X].dev_attr.attr, \
+        &sda_in_min[X].dev_attr.attr,   \
+        &sda_in_max[X].dev_attr.attr
+
+#define FAN_UNIT_ATTRS(X) \
+        &sda_fan_input[X].dev_attr.attr,        \
+        &sda_fan_min[X].dev_attr.attr,          \
+        &sda_fan_div[X].dev_attr.attr
+
+#define TEMP_UNIT_ATTRS(X) \
+        &sda_temp_input[X].dev_attr.attr,       \
+        &sda_temp_max[X].dev_attr.attr,         \
+        &sda_temp_max_hyst[X].dev_attr.attr
+
+static struct attribute *w83791d_attributes[] = {
+        IN_UNIT_ATTRS(0),
+        IN_UNIT_ATTRS(1),
+        IN_UNIT_ATTRS(2),
+        IN_UNIT_ATTRS(3),
+        IN_UNIT_ATTRS(4),
+        IN_UNIT_ATTRS(5),
+        IN_UNIT_ATTRS(6),
+        IN_UNIT_ATTRS(7),
+        IN_UNIT_ATTRS(8),
+        IN_UNIT_ATTRS(9),
+        FAN_UNIT_ATTRS(0),
+        FAN_UNIT_ATTRS(1),
+        FAN_UNIT_ATTRS(2),
+        FAN_UNIT_ATTRS(3),
+        FAN_UNIT_ATTRS(4),
+        TEMP_UNIT_ATTRS(0),
+        TEMP_UNIT_ATTRS(1),
+        TEMP_UNIT_ATTRS(2),
+        &dev_attr_alarms.attr,
+        &sda_beep_ctrl[0].dev_attr.attr,
+        &sda_beep_ctrl[1].dev_attr.attr,
+        &dev_attr_cpu0_vid.attr,
+        &dev_attr_vrm.attr,
+        NULL
+};
+
+static const struct attribute_group w83791d_group = {
+        .attrs = w83791d_attributes,
+};
+
 /* This function is called when:
      * w83791d_driver is inserted (when this module is loaded), for each
        available adapter
@@ -967,41 +1013,20 @@ static int w83791d_detect(struct i2c_adapter *adapter, int address, int kind)
         }
 
         /* Register sysfs hooks */
+        if ((err = sysfs_create_group(&client->dev.kobj, &w83791d_group)))
+                goto error3;
+
+        /* Everything is ready, now register the working device */
         data->class_dev = hwmon_device_register(dev);
         if (IS_ERR(data->class_dev)) {
                 err = PTR_ERR(data->class_dev);
-                goto error3;
+                goto error4;
         }
 
-        for (i = 0; i < NUMBER_OF_VIN; i++) {
-                device_create_file(dev, &sda_in_input[i].dev_attr);
-                device_create_file(dev, &sda_in_min[i].dev_attr);
-                device_create_file(dev, &sda_in_max[i].dev_attr);
-        }
-
-        for (i = 0; i < NUMBER_OF_FANIN; i++) {
-                device_create_file(dev, &sda_fan_input[i].dev_attr);
-                device_create_file(dev, &sda_fan_div[i].dev_attr);
-                device_create_file(dev, &sda_fan_min[i].dev_attr);
-        }
-
-        for (i = 0; i < NUMBER_OF_TEMPIN; i++) {
-                device_create_file(dev, &sda_temp_input[i].dev_attr);
-                device_create_file(dev, &sda_temp_max[i].dev_attr);
-                device_create_file(dev, &sda_temp_max_hyst[i].dev_attr);
-        }
-
-        device_create_file(dev, &dev_attr_alarms);
-
-        for (i = 0; i < ARRAY_SIZE(sda_beep_ctrl); i++) {
-                device_create_file(dev, &sda_beep_ctrl[i].dev_attr);
-        }
-
-        device_create_file(dev, &dev_attr_cpu0_vid);
-        device_create_file(dev, &dev_attr_vrm);
-
         return 0;
 
+error4:
+        sysfs_remove_group(&client->dev.kobj, &w83791d_group);
 error3:
         if (data->lm75[0] != NULL) {
                 i2c_detach_client(data->lm75[0]);
@@ -1025,8 +1050,10 @@ static int w83791d_detach_client(struct i2c_client *client)
         int err;
 
         /* main client */
-        if (data)
+        if (data) {
                 hwmon_device_unregister(data->class_dev);
+                sysfs_remove_group(&client->dev.kobj, &w83791d_group);
+        }
 
         if ((err = i2c_detach_client(client)))
                 return err;
diff --git a/drivers/i2c/busses/i2c-isa.c b/drivers/i2c/busses/i2c-isa.c
index 4380653748a4..8ed59a2dff53 100644
--- a/drivers/i2c/busses/i2c-isa.c
+++ b/drivers/i2c/busses/i2c-isa.c
@@ -91,7 +91,7 @@ int i2c_isa_add_driver(struct i2c_driver *driver)
         /* Now look for clients */
         res = driver->attach_adapter(&isa_adapter);
         if (res) {
-                dev_err(&isa_adapter.dev,
+                dev_dbg(&isa_adapter.dev,
                         "Driver %s failed to attach adapter, unregistering\n",
                         driver->driver.name);
                 driver_unregister(&driver->driver);
diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c
index 1d0470c1f957..30175c7688e8 100644
--- a/drivers/ide/ide-taskfile.c
+++ b/drivers/ide/ide-taskfile.c
@@ -524,8 +524,8 @@ int ide_taskfile_ioctl (ide_drive_t *drive, unsigned int cmd, unsigned long arg)
         task_ioreg_t *hobsptr   = args.hobRegister;
         int err                 = 0;
         int tasksize            = sizeof(struct ide_task_request_s);
-        int taskin              = 0;
-        int taskout             = 0;
+        unsigned int taskin     = 0;
+        unsigned int taskout    = 0;
         u8 io_32bit             = drive->io_32bit;
         char __user *buf = (char __user *)arg;
 
@@ -538,8 +538,13 @@ int ide_taskfile_ioctl (ide_drive_t *drive, unsigned int cmd, unsigned long arg)
                 return -EFAULT;
         }
 
-        taskout = (int) req_task->out_size;
-        taskin  = (int) req_task->in_size;
+        taskout = req_task->out_size;
+        taskin  = req_task->in_size;
+        
+        if (taskin > 65536 || taskout > 65536) {
+                err = -EINVAL;
+                goto abort;
+        }
 
         if (taskout) {
                 int outtotal = tasksize;
diff --git a/drivers/ide/pci/sgiioc4.c b/drivers/ide/pci/sgiioc4.c
index f3fe287fbd89..244f7eb7006d 100644
--- a/drivers/ide/pci/sgiioc4.c
+++ b/drivers/ide/pci/sgiioc4.c
@@ -774,7 +774,7 @@ ioc4_ide_exit(void)
         ioc4_unregister_submodule(&ioc4_ide_submodule);
 }
 
-module_init(ioc4_ide_init);
+late_initcall(ioc4_ide_init); /* Call only after IDE init is done */
 module_exit(ioc4_ide_exit);
 
 MODULE_AUTHOR("Aniket Malatpure/Jeremy Higdon");
diff --git a/drivers/infiniband/hw/amso1100/c2.c b/drivers/infiniband/hw/amso1100/c2.c
index dc1ebeac35c7..9e7bd94b958a 100644
--- a/drivers/infiniband/hw/amso1100/c2.c
+++ b/drivers/infiniband/hw/amso1100/c2.c
@@ -1243,7 +1243,7 @@ static struct pci_driver c2_pci_driver = {
 
 static int __init c2_init_module(void)
 {
-        return pci_module_init(&c2_pci_driver);
+        return pci_register_driver(&c2_pci_driver);
 }
 
 static void __exit c2_exit_module(void)
diff --git a/drivers/infiniband/hw/amso1100/c2_rnic.c b/drivers/infiniband/hw/amso1100/c2_rnic.c
index e37c5688c214..30409e179606 100644
--- a/drivers/infiniband/hw/amso1100/c2_rnic.c
+++ b/drivers/infiniband/hw/amso1100/c2_rnic.c
@@ -150,8 +150,8 @@ static int c2_rnic_query(struct c2_dev *c2dev, struct ib_device_attr *props)
             (struct c2wr_rnic_query_rep *) (unsigned long) (vq_req->reply_msg);
         if (!reply)
                 err = -ENOMEM;
-
-        err = c2_errno(reply);
+        else
+                err = c2_errno(reply);
         if (err)
                 goto bail2;
 
diff --git a/drivers/infiniband/hw/ipath/ipath_diag.c b/drivers/infiniband/hw/ipath/ipath_diag.c
index 29958b6e0214..28c087b824c2 100644
--- a/drivers/infiniband/hw/ipath/ipath_diag.c
+++ b/drivers/infiniband/hw/ipath/ipath_diag.c
@@ -67,19 +67,54 @@ static struct file_operations diag_file_ops = {
         .release = ipath_diag_release
 };
 
+static ssize_t ipath_diagpkt_write(struct file *fp,
+                                   const char __user *data,
+                                   size_t count, loff_t *off);
+
+static struct file_operations diagpkt_file_ops = {
+        .owner = THIS_MODULE,
+        .write = ipath_diagpkt_write,
+};
+
+static atomic_t diagpkt_count = ATOMIC_INIT(0);
+static struct cdev *diagpkt_cdev;
+static struct class_device *diagpkt_class_dev;
+
 int ipath_diag_add(struct ipath_devdata *dd)
 {
         char name[16];
+        int ret = 0;
+
+        if (atomic_inc_return(&diagpkt_count) == 1) {
+                ret = ipath_cdev_init(IPATH_DIAGPKT_MINOR,
+                                      "ipath_diagpkt", &diagpkt_file_ops,
+                                      &diagpkt_cdev, &diagpkt_class_dev);
+
+                if (ret) {
+                        ipath_dev_err(dd, "Couldn't create ipath_diagpkt "
+                                      "device: %d", ret);
+                        goto done;
+                }
+        }
 
         snprintf(name, sizeof(name), "ipath_diag%d", dd->ipath_unit);
 
-        return ipath_cdev_init(IPATH_DIAG_MINOR_BASE + dd->ipath_unit, name,
-                               &diag_file_ops, &dd->diag_cdev,
-                               &dd->diag_class_dev);
+        ret = ipath_cdev_init(IPATH_DIAG_MINOR_BASE + dd->ipath_unit, name,
+                              &diag_file_ops, &dd->diag_cdev,
+                              &dd->diag_class_dev);
+        if (ret)
+                ipath_dev_err(dd, "Couldn't create %s device: %d",
+                              name, ret);
+
+done:
+        return ret;
 }
 
 void ipath_diag_remove(struct ipath_devdata *dd)
 {
+        if (atomic_dec_and_test(&diagpkt_count))
+                ipath_cdev_cleanup(&diagpkt_cdev, &diagpkt_class_dev);
+
         ipath_cdev_cleanup(&dd->diag_cdev, &dd->diag_class_dev);
 }
 
@@ -275,30 +310,6 @@ bail:
         return ret;
 }
 
-static ssize_t ipath_diagpkt_write(struct file *fp,
-                                   const char __user *data,
-                                   size_t count, loff_t *off);
-
-static struct file_operations diagpkt_file_ops = {
-        .owner = THIS_MODULE,
-        .write = ipath_diagpkt_write,
-};
-
-static struct cdev *diagpkt_cdev;
-static struct class_device *diagpkt_class_dev;
-
-int __init ipath_diagpkt_add(void)
-{
-        return ipath_cdev_init(IPATH_DIAGPKT_MINOR,
-                               "ipath_diagpkt", &diagpkt_file_ops,
-                               &diagpkt_cdev, &diagpkt_class_dev);
-}
-
-void __exit ipath_diagpkt_remove(void)
-{
-        ipath_cdev_cleanup(&diagpkt_cdev, &diagpkt_class_dev);
-}
-
 /**
  * ipath_diagpkt_write - write an IB packet
  * @fp: the diag data device file pointer
diff --git a/drivers/infiniband/hw/ipath/ipath_driver.c b/drivers/infiniband/hw/ipath/ipath_driver.c
index 12cefa658f3b..b4ffaa7bcbb7 100644
--- a/drivers/infiniband/hw/ipath/ipath_driver.c
+++ b/drivers/infiniband/hw/ipath/ipath_driver.c
@@ -2005,18 +2005,8 @@ static int __init infinipath_init(void)
                 goto bail_group;
         }
 
-        ret = ipath_diagpkt_add();
-        if (ret < 0) {
-                printk(KERN_ERR IPATH_DRV_NAME ": Unable to create "
-                       "diag data device: error %d\n", -ret);
-                goto bail_ipathfs;
-        }
-
         goto bail;
 
-bail_ipathfs:
-        ipath_exit_ipathfs();
-
 bail_group:
         ipath_driver_remove_group(&ipath_driver.driver);
 
diff --git a/drivers/infiniband/hw/ipath/ipath_kernel.h b/drivers/infiniband/hw/ipath/ipath_kernel.h
index 7c436697d0e4..06d5020a2f60 100644
--- a/drivers/infiniband/hw/ipath/ipath_kernel.h
+++ b/drivers/infiniband/hw/ipath/ipath_kernel.h
@@ -869,9 +869,6 @@ int ipath_device_create_group(struct device *, struct ipath_devdata *);
 void ipath_device_remove_group(struct device *, struct ipath_devdata *);
 int ipath_expose_reset(struct device *);
 
-int ipath_diagpkt_add(void);
-void ipath_diagpkt_remove(void);
-
 int ipath_init_ipathfs(void);
 void ipath_exit_ipathfs(void);
 int ipathfs_add_device(struct ipath_devdata *);
diff --git a/drivers/infiniband/hw/mthca/mthca_cq.c b/drivers/infiniband/hw/mthca/mthca_cq.c
index e393681ba7d4..149b36901239 100644
--- a/drivers/infiniband/hw/mthca/mthca_cq.c
+++ b/drivers/infiniband/hw/mthca/mthca_cq.c
@@ -39,6 +39,8 @@
 #include <linux/init.h>
 #include <linux/hardirq.h>
 
+#include <asm/io.h>
+
 #include <rdma/ib_pack.h>
 
 #include "mthca_dev.h"
@@ -210,6 +212,11 @@ static inline void update_cons_index(struct mthca_dev *dev, struct mthca_cq *cq,
                 mthca_write64(doorbell,
                               dev->kar + MTHCA_CQ_DOORBELL,
                               MTHCA_GET_DOORBELL_LOCK(&dev->doorbell_lock));
+                /*
+                 * Make sure doorbells don't leak out of CQ spinlock
+                 * and reach the HCA out of order:
+                 */
+                mmiowb();
         }
 }
 
diff --git a/drivers/infiniband/hw/mthca/mthca_qp.c b/drivers/infiniband/hw/mthca/mthca_qp.c
index 5e5c58b9920b..6a7822e0fc19 100644
--- a/drivers/infiniband/hw/mthca/mthca_qp.c
+++ b/drivers/infiniband/hw/mthca/mthca_qp.c
@@ -39,6 +39,8 @@
 #include <linux/string.h>
 #include <linux/slab.h>
 
+#include <asm/io.h>
+
 #include <rdma/ib_verbs.h>
 #include <rdma/ib_cache.h>
 #include <rdma/ib_pack.h>
@@ -1732,6 +1734,11 @@ out:
                 mthca_write64(doorbell,
                               dev->kar + MTHCA_SEND_DOORBELL,
                               MTHCA_GET_DOORBELL_LOCK(&dev->doorbell_lock));
+                /*
+                 * Make sure doorbells don't leak out of SQ spinlock
+                 * and reach the HCA out of order:
+                 */
+                mmiowb();
         }
 
         qp->sq.next_ind = ind;
@@ -1851,6 +1858,12 @@ out:
         qp->rq.next_ind = ind;
         qp->rq.head    += nreq;
 
+        /*
+         * Make sure doorbells don't leak out of RQ spinlock and reach
+         * the HCA out of order:
+         */
+        mmiowb();
+
         spin_unlock_irqrestore(&qp->rq.lock, flags);
         return err;
 }
@@ -2112,6 +2125,12 @@ out:
                               MTHCA_GET_DOORBELL_LOCK(&dev->doorbell_lock));
         }
 
+        /*
+         * Make sure doorbells don't leak out of SQ spinlock and reach
+         * the HCA out of order:
+         */
+        mmiowb();
+
         spin_unlock_irqrestore(&qp->sq.lock, flags);
         return err;
 }
diff --git a/drivers/infiniband/hw/mthca/mthca_srq.c b/drivers/infiniband/hw/mthca/mthca_srq.c
index 92a72f521528..f5d7677d1079 100644
--- a/drivers/infiniband/hw/mthca/mthca_srq.c
+++ b/drivers/infiniband/hw/mthca/mthca_srq.c
@@ -35,6 +35,8 @@
 #include <linux/slab.h>
 #include <linux/string.h>
 
+#include <asm/io.h>
+
 #include "mthca_dev.h"
 #include "mthca_cmd.h"
 #include "mthca_memfree.h"
@@ -595,6 +597,12 @@ int mthca_tavor_post_srq_recv(struct ib_srq *ibsrq, struct ib_recv_wr *wr,
                               MTHCA_GET_DOORBELL_LOCK(&dev->doorbell_lock));
         }
 
+        /*
+         * Make sure doorbells don't leak out of SRQ spinlock and
+         * reach the HCA out of order:
+         */
+        mmiowb();
+
         spin_unlock_irqrestore(&srq->lock, flags);
         return err;
 }
diff --git a/drivers/input/gameport/fm801-gp.c b/drivers/input/gameport/fm801-gp.c
index 90de5afe03c2..1dec00e20dbc 100644
--- a/drivers/input/gameport/fm801-gp.c
+++ b/drivers/input/gameport/fm801-gp.c
@@ -82,17 +82,19 @@ static int __devinit fm801_gp_probe(struct pci_dev *pci, const struct pci_device
 {
         struct fm801_gp *gp;
         struct gameport *port;
+        int error;
 
         gp = kzalloc(sizeof(struct fm801_gp), GFP_KERNEL);
         port = gameport_allocate_port();
         if (!gp || !port) {
                 printk(KERN_ERR "fm801-gp: Memory allocation failed\n");
-                kfree(gp);
-                gameport_free_port(port);
-                return -ENOMEM;
+                error = -ENOMEM;
+                goto err_out_free;
         }
 
-        pci_enable_device(pci);
+        error = pci_enable_device(pci);
+        if (error)
+                goto err_out_free;
 
         port->open = fm801_gp_open;
 #ifdef HAVE_COOKED
@@ -108,9 +110,8 @@ static int __devinit fm801_gp_probe(struct pci_dev *pci, const struct pci_device
         if (!gp->res_port) {
                 printk(KERN_DEBUG "fm801-gp: unable to grab region 0x%x-0x%x\n",
                         port->io, port->io + 0x0f);
-                gameport_free_port(port);
-                kfree(gp);
-                return -EBUSY;
+                error = -EBUSY;
+                goto err_out_disable_dev;
         }
 
         pci_set_drvdata(pci, gp);
@@ -119,6 +120,13 @@ static int __devinit fm801_gp_probe(struct pci_dev *pci, const struct pci_device
         gameport_register_port(port);
 
         return 0;
+
+ err_out_disable_dev:
+        pci_disable_device(pci);
+ err_out_free:
+        gameport_free_port(port);
+        kfree(gp);
+        return error;
 }
 
 static void __devexit fm801_gp_remove(struct pci_dev *pci)
diff --git a/drivers/input/gameport/gameport.c b/drivers/input/gameport/gameport.c
index 3f47ae55c6f3..a0af97efe6ac 100644
--- a/drivers/input/gameport/gameport.c
+++ b/drivers/input/gameport/gameport.c
@@ -191,6 +191,8 @@ static void gameport_run_poll_handler(unsigned long d)
 
 static void gameport_bind_driver(struct gameport *gameport, struct gameport_driver *drv)
 {
+        int error;
+
         down_write(&gameport_bus.subsys.rwsem);
 
         gameport->dev.driver = &drv->driver;
@@ -198,8 +200,20 @@ static void gameport_bind_driver(struct gameport *gameport, struct gameport_driv
                 gameport->dev.driver = NULL;
                 goto out;
         }
-        device_bind_driver(&gameport->dev);
-out:
+
+        error = device_bind_driver(&gameport->dev);
+        if (error) {
+                printk(KERN_WARNING
+                        "gameport: device_bind_driver() failed "
+                        "for %s (%s) and %s, error: %d\n",
+                        gameport->phys, gameport->name,
+                        drv->description, error);
+                drv->disconnect(gameport);
+                gameport->dev.driver = NULL;
+                goto out;
+        }
+
+ out:
         up_write(&gameport_bus.subsys.rwsem);
 }
 
diff --git a/drivers/input/keyboard/atkbd.c b/drivers/input/keyboard/atkbd.c
index b6ef9eaad1dc..cbb93669d1ce 100644
--- a/drivers/input/keyboard/atkbd.c
+++ b/drivers/input/keyboard/atkbd.c
@@ -221,6 +221,7 @@ struct atkbd {
         unsigned long xl_bit;
         unsigned int last;
         unsigned long time;
+        unsigned long err_count;
 
         struct work_struct event_work;
         struct mutex event_mutex;
@@ -234,11 +235,13 @@ static ssize_t atkbd_attr_set_helper(struct device *dev, const char *buf, size_t
 #define ATKBD_DEFINE_ATTR(_name)                                                \
 static ssize_t atkbd_show_##_name(struct atkbd *, char *);                      \
 static ssize_t atkbd_set_##_name(struct atkbd *, const char *, size_t);         \
-static ssize_t atkbd_do_show_##_name(struct device *d, struct device_attribute *attr, char *b)                  \
+static ssize_t atkbd_do_show_##_name(struct device *d,                          \
+                                struct device_attribute *attr, char *b)         \
 {                                                                               \
         return atkbd_attr_show_helper(d, b, atkbd_show_##_name);                \
 }                                                                               \
-static ssize_t atkbd_do_set_##_name(struct device *d, struct device_attribute *attr, const char *b, size_t s)   \
+static ssize_t atkbd_do_set_##_name(struct device *d,                           \
+                        struct device_attribute *attr, const char *b, size_t s) \
 {                                                                               \
         return atkbd_attr_set_helper(d, b, s, atkbd_set_##_name);               \
 }                                                                               \
@@ -251,6 +254,32 @@ ATKBD_DEFINE_ATTR(set);
 ATKBD_DEFINE_ATTR(softrepeat);
 ATKBD_DEFINE_ATTR(softraw);
 
+#define ATKBD_DEFINE_RO_ATTR(_name)                                             \
+static ssize_t atkbd_show_##_name(struct atkbd *, char *);                      \
+static ssize_t atkbd_do_show_##_name(struct device *d,                          \
+                                struct device_attribute *attr, char *b)         \
+{                                                                               \
+        return atkbd_attr_show_helper(d, b, atkbd_show_##_name);                \
+}                                                                               \
+static struct device_attribute atkbd_attr_##_name =                             \
+        __ATTR(_name, S_IRUGO, atkbd_do_show_##_name, NULL);
+
+ATKBD_DEFINE_RO_ATTR(err_count);
+
+static struct attribute *atkbd_attributes[] = {
+        &atkbd_attr_extra.attr,
+        &atkbd_attr_scroll.attr,
+        &atkbd_attr_set.attr,
+        &atkbd_attr_softrepeat.attr,
+        &atkbd_attr_softraw.attr,
+        &atkbd_attr_err_count.attr,
+        NULL
+};
+
+static struct attribute_group atkbd_attribute_group = {
+        .attrs  = atkbd_attributes,
+};
+
 static const unsigned int xl_table[] = {
         ATKBD_RET_BAT, ATKBD_RET_ERR, ATKBD_RET_ACK,
         ATKBD_RET_NAK, ATKBD_RET_HANJA, ATKBD_RET_HANGEUL,
@@ -396,7 +425,10 @@ static irqreturn_t atkbd_interrupt(struct serio *serio, unsigned char data,
                         add_release_event = 1;
                         break;
                 case ATKBD_RET_ERR:
+                        atkbd->err_count++;
+#ifdef ATKBD_DEBUG
                         printk(KERN_DEBUG "atkbd.c: Keyboard on %s reports too many keys pressed.\n", serio->phys);
+#endif
                         goto out;
         }
 
@@ -786,12 +818,7 @@ static void atkbd_disconnect(struct serio *serio)
         synchronize_sched();  /* Allow atkbd_interrupt()s to complete. */
         flush_scheduled_work();
 
-        device_remove_file(&serio->dev, &atkbd_attr_extra);
-        device_remove_file(&serio->dev, &atkbd_attr_scroll);
-        device_remove_file(&serio->dev, &atkbd_attr_set);
-        device_remove_file(&serio->dev, &atkbd_attr_softrepeat);
-        device_remove_file(&serio->dev, &atkbd_attr_softraw);
-
+        sysfs_remove_group(&serio->dev.kobj, &atkbd_attribute_group);
         input_unregister_device(atkbd->dev);
         serio_close(serio);
         serio_set_drvdata(serio, NULL);
@@ -961,11 +988,7 @@ static int atkbd_connect(struct serio *serio, struct serio_driver *drv)
         atkbd_set_keycode_table(atkbd);
         atkbd_set_device_attrs(atkbd);
 
-        device_create_file(&serio->dev, &atkbd_attr_extra);
-        device_create_file(&serio->dev, &atkbd_attr_scroll);
-        device_create_file(&serio->dev, &atkbd_attr_set);
-        device_create_file(&serio->dev, &atkbd_attr_softrepeat);
-        device_create_file(&serio->dev, &atkbd_attr_softraw);
+        sysfs_create_group(&serio->dev.kobj, &atkbd_attribute_group);
 
         atkbd_enable(atkbd);
 
@@ -1259,6 +1282,11 @@ static ssize_t atkbd_set_softraw(struct atkbd *atkbd, const char *buf, size_t co
         return count;
 }
 
+static ssize_t atkbd_show_err_count(struct atkbd *atkbd, char *buf)
+{
+        return sprintf(buf, "%lu\n", atkbd->err_count);
+}
+
 
 static int __init atkbd_init(void)
 {
diff --git a/drivers/input/keyboard/corgikbd.c b/drivers/input/keyboard/corgikbd.c
index cb70970625b5..befdd6006b50 100644
--- a/drivers/input/keyboard/corgikbd.c
+++ b/drivers/input/keyboard/corgikbd.c
@@ -207,7 +207,7 @@ static irqreturn_t corgikbd_interrupt(int irq, void *dev_id)
 static void corgikbd_timer_callback(unsigned long data)
 {
         struct corgikbd *corgikbd_data = (struct corgikbd *) data;
-        corgikbd_scankeyboard(corgikbd_data, NULL);
+        corgikbd_scankeyboard(corgikbd_data);
 }
 
 /*
diff --git a/drivers/input/keyboard/locomokbd.c b/drivers/input/keyboard/locomokbd.c
index fd33c9cc3272..5788dbc317bb 100644
--- a/drivers/input/keyboard/locomokbd.c
+++ b/drivers/input/keyboard/locomokbd.c
@@ -186,7 +186,7 @@ static irqreturn_t locomokbd_interrupt(int irq, void *dev_id)
 static void locomokbd_timer_callback(unsigned long data)
 {
         struct locomokbd *locomokbd = (struct locomokbd *) data;
-        locomokbd_scankeyboard(locomokbd, NULL);
+        locomokbd_scankeyboard(locomokbd);
 }
 
 static int locomokbd_probe(struct locomo_dev *dev)
diff --git a/drivers/input/keyboard/spitzkbd.c b/drivers/input/keyboard/spitzkbd.c
index 8b18c009e3e0..28b2748e82d0 100644
--- a/drivers/input/keyboard/spitzkbd.c
+++ b/drivers/input/keyboard/spitzkbd.c
@@ -257,7 +257,7 @@ static void spitzkbd_timer_callback(unsigned long data)
 {
         struct spitzkbd *spitzkbd_data = (struct spitzkbd *) data;
 
-        spitzkbd_scankeyboard(spitzkbd_data, NULL);
+        spitzkbd_scankeyboard(spitzkbd_data);
 }
 
 /*
diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c
index 09b06e605b50..7e3141f37e32 100644
--- a/drivers/input/serio/i8042.c
+++ b/drivers/input/serio/i8042.c
@@ -106,6 +106,7 @@ static unsigned char i8042_ctr;
 static unsigned char i8042_mux_present;
 static unsigned char i8042_kbd_irq_registered;
 static unsigned char i8042_aux_irq_registered;
+static unsigned char i8042_suppress_kbd_ack;
 static struct platform_device *i8042_platform_device;
 
 static irqreturn_t i8042_interrupt(int irq, void *dev_id);
@@ -316,7 +317,7 @@ static irqreturn_t i8042_interrupt(int irq, void *dev_id)
         unsigned char str, data;
         unsigned int dfl;
         unsigned int port_no;
-        int ret;
+        int ret = 1;
 
         spin_lock_irqsave(&i8042_lock, flags);
         str = i8042_read_status();
@@ -378,10 +379,16 @@ static irqreturn_t i8042_interrupt(int irq, void *dev_id)
             dfl & SERIO_PARITY ? ", bad parity" : "",
             dfl & SERIO_TIMEOUT ? ", timeout" : "");
 
+        if (unlikely(i8042_suppress_kbd_ack))
+                if (port_no == I8042_KBD_PORT_NO &&
+                    (data == 0xfa || data == 0xfe)) {
+                        i8042_suppress_kbd_ack = 0;
+                        goto out;
+                }
+
         if (likely(port->exists))
                 serio_interrupt(port->serio, data, dfl);
 
-        ret = 1;
  out:
         return IRQ_RETVAL(ret);
 }
@@ -842,11 +849,13 @@ static long i8042_panic_blink(long count)
         led ^= 0x01 | 0x04;
         while (i8042_read_status() & I8042_STR_IBF)
                 DELAY;
+        i8042_suppress_kbd_ack = 1;
         i8042_write_data(0xed); /* set leds */
         DELAY;
         while (i8042_read_status() & I8042_STR_IBF)
                 DELAY;
         DELAY;
+        i8042_suppress_kbd_ack = 1;
         i8042_write_data(led);
         DELAY;
         last_blink = count;
diff --git a/drivers/input/serio/libps2.c b/drivers/input/serio/libps2.c
index dcb16b5cbec0..e5b1b60757bb 100644
--- a/drivers/input/serio/libps2.c
+++ b/drivers/input/serio/libps2.c
@@ -189,7 +189,7 @@ int ps2_command(struct ps2dev *ps2dev, unsigned char *param, int command)
                 return -1;
         }
 
-        mutex_lock_nested(&ps2dev->cmd_mutex, SINGLE_DEPTH_NESTING);
+        mutex_lock(&ps2dev->cmd_mutex);
 
         serio_pause_rx(ps2dev->serio);
         ps2dev->flags = command == PS2_CMD_GETID ? PS2_FLAG_WAITID : 0;
@@ -296,6 +296,7 @@ EXPORT_SYMBOL(ps2_schedule_command);
 void ps2_init(struct ps2dev *ps2dev, struct serio *serio)
 {
         mutex_init(&ps2dev->cmd_mutex);
+        lockdep_set_subclass(&ps2dev->cmd_mutex, serio->depth);
         init_waitqueue_head(&ps2dev->wait);
         ps2dev->serio = serio;
 }
diff --git a/drivers/input/serio/serio.c b/drivers/input/serio/serio.c
index 960fae3c3cea..211943f85cb6 100644
--- a/drivers/input/serio/serio.c
+++ b/drivers/input/serio/serio.c
@@ -118,6 +118,8 @@ static int serio_match_port(const struct serio_device_id *ids, struct serio *ser
 
 static void serio_bind_driver(struct serio *serio, struct serio_driver *drv)
 {
+        int error;
+
         down_write(&serio_bus.subsys.rwsem);
 
         if (serio_match_port(drv->id_table, serio)) {
@@ -126,9 +128,19 @@ static void serio_bind_driver(struct serio *serio, struct serio_driver *drv)
                         serio->dev.driver = NULL;
                         goto out;
                 }
-                device_bind_driver(&serio->dev);
+                error = device_bind_driver(&serio->dev);
+                if (error) {
+                        printk(KERN_WARNING
+                                "serio: device_bind_driver() failed "
+                                "for %s (%s) and %s, error: %d\n",
+                                serio->phys, serio->name,
+                                drv->description, error);
+                        serio_disconnect_driver(serio);
+                        serio->dev.driver = NULL;
+                        goto out;
+                }
         }
-out:
+ out:
         up_write(&serio_bus.subsys.rwsem);
 }
 
@@ -538,8 +550,12 @@ static void serio_init_port(struct serio *serio)
                  "serio%ld", (long)atomic_inc_return(&serio_no) - 1);
         serio->dev.bus = &serio_bus;
         serio->dev.release = serio_release_port;
-        if (serio->parent)
+        if (serio->parent) {
                 serio->dev.parent = &serio->parent->dev;
+                serio->depth = serio->parent->depth + 1;
+        } else
+                serio->depth = 0;
+        lockdep_set_subclass(&serio->lock, serio->depth);
 }
 
 /*
diff --git a/drivers/input/touchscreen/corgi_ts.c b/drivers/input/touchscreen/corgi_ts.c
index ca79b2246195..66121f6a89ad 100644
--- a/drivers/input/touchscreen/corgi_ts.c
+++ b/drivers/input/touchscreen/corgi_ts.c
@@ -219,7 +219,7 @@ static void ts_interrupt_main(struct corgi_ts *corgi_ts, int isTimer)
 static void corgi_ts_timer(unsigned long data)
 {
         struct corgi_ts *corgits_data = (struct corgi_ts *) data;
-        ts_interrupt_main(corgits_data, 1, NULL);
+        ts_interrupt_main(corgits_data, 1);
 }
 
 static irqreturn_t ts_interrupt(int irq, void *dev_id)
@@ -237,7 +237,7 @@ static int corgits_suspend(struct platform_device *dev, pm_message_t state)
         if (corgi_ts->pendown) {
                 del_timer_sync(&corgi_ts->timer);
                 corgi_ts->tc.pressure = 0;
-                new_data(corgi_ts, NULL);
+                new_data(corgi_ts);
                 corgi_ts->pendown = 0;
         }
         corgi_ts->power_mode = PWR_MODE_SUSPEND;
diff --git a/drivers/isdn/capi/capidrv.c b/drivers/isdn/capi/capidrv.c
index d10c8b82e6aa..b6f9476c0501 100644
--- a/drivers/isdn/capi/capidrv.c
+++ b/drivers/isdn/capi/capidrv.c
@@ -1907,7 +1907,8 @@ static int if_readstat(u8 __user *buf, int len, int id, int channel)
         }
 
         for (p=buf, count=0; count < len; p++, count++) {
-                put_user(*card->q931_read++, p);
+                if (put_user(*card->q931_read++, p))
+                        return -EFAULT;
                 if (card->q931_read > card->q931_end)
                         card->q931_read = card->q931_buf;
         }
diff --git a/drivers/isdn/hisax/config.c b/drivers/isdn/hisax/config.c
index e4823ab2b127..785b08554fca 100644
--- a/drivers/isdn/hisax/config.c
+++ b/drivers/isdn/hisax/config.c
@@ -631,7 +631,8 @@ static int HiSax_readstatus(u_char __user *buf, int len, int id, int channel)
                 count = cs->status_end - cs->status_read + 1;
                 if (count >= len)
                         count = len;
-                copy_to_user(p, cs->status_read, count);
+                if (copy_to_user(p, cs->status_read, count))
+                        return -EFAULT;
                 cs->status_read += count;
                 if (cs->status_read > cs->status_end)
                         cs->status_read = cs->status_buf;
@@ -642,7 +643,8 @@ static int HiSax_readstatus(u_char __user *buf, int len, int id, int channel)
                                 cnt = HISAX_STATUS_BUFSIZE;
                         else
                                 cnt = count;
-                        copy_to_user(p, cs->status_read, cnt);
+                        if (copy_to_user(p, cs->status_read, cnt))
+                                return -EFAULT;
                         p += cnt;
                         cs->status_read += cnt % HISAX_STATUS_BUFSIZE;
                         count -= cnt;
diff --git a/drivers/isdn/hisax/diva.c b/drivers/isdn/hisax/diva.c
index 7e95f04f13da..3dacfff93f5f 100644
--- a/drivers/isdn/hisax/diva.c
+++ b/drivers/isdn/hisax/diva.c
@@ -716,8 +716,10 @@ release_io_diva(struct IsdnCardState *cs)
 
                 *cfg = 0; /* disable INT0/1 */ 
                 *cfg = 2; /* reset pending INT0 */
-                iounmap((void *)cs->hw.diva.cfg_reg);
-                iounmap((void *)cs->hw.diva.pci_cfg);
+                if (cs->hw.diva.cfg_reg)
+                        iounmap((void *)cs->hw.diva.cfg_reg);
+                if (cs->hw.diva.pci_cfg)
+                        iounmap((void *)cs->hw.diva.pci_cfg);
                 return;
         } else if (cs->subtyp != DIVA_IPAC_ISA) {
                 del_timer(&cs->hw.diva.tl);
@@ -734,6 +736,23 @@ release_io_diva(struct IsdnCardState *cs)
 }
 
 static void
+iounmap_diva(struct IsdnCardState *cs)
+{
+        if ((cs->subtyp == DIVA_IPAC_PCI) || (cs->subtyp == DIVA_IPACX_PCI)) {
+                if (cs->hw.diva.cfg_reg) {
+                        iounmap((void *)cs->hw.diva.cfg_reg);
+                        cs->hw.diva.cfg_reg = 0;
+                }
+                if (cs->hw.diva.pci_cfg) {
+                        iounmap((void *)cs->hw.diva.pci_cfg);
+                        cs->hw.diva.pci_cfg = 0;
+                }
+        }
+
+        return;
+}
+
+static void
 reset_diva(struct IsdnCardState *cs)
 {
         if (cs->subtyp == DIVA_IPAC_ISA) {
@@ -1069,11 +1088,13 @@ setup_diva(struct IsdnCard *card)
 
                 if (!cs->irq) {
                         printk(KERN_WARNING "Diva: No IRQ for PCI card found\n");
+                        iounmap_diva(cs);
                         return(0);
                 }
 
                 if (!cs->hw.diva.cfg_reg) {
                         printk(KERN_WARNING "Diva: No IO-Adr for PCI card found\n");
+                        iounmap_diva(cs);
                         return(0);
                 }
                 cs->irq_flags |= IRQF_SHARED;
@@ -1123,6 +1144,7 @@ ready:
                                CardType[card->typ],
                                cs->hw.diva.cfg_reg,
                                cs->hw.diva.cfg_reg + bytecnt);
+                        iounmap_diva(cs);
                         return (0);
                 }
         }
diff --git a/drivers/isdn/hysdn/boardergo.c b/drivers/isdn/hysdn/boardergo.c
index 160f22fa5941..82e42a80dc4b 100644
--- a/drivers/isdn/hysdn/boardergo.c
+++ b/drivers/isdn/hysdn/boardergo.c
@@ -45,11 +45,10 @@ ergo_interrupt(int intno, void *dev_id)
         if (!card->irq_enabled)
                 return IRQ_NONE;                /* other device interrupting or irq switched off */
 
-        save_flags(flags);
-        cli();                  /* no further irqs allowed */
+        spin_lock_irqsave(&card->hysdn_lock, flags); /* no further irqs allowed */
 
         if (!(bytein(card->iobase + PCI9050_INTR_REG) & PCI9050_INTR_REG_STAT1)) {
-                restore_flags(flags);   /* restore old state */
+                spin_unlock_irqrestore(&card->hysdn_lock, flags);       /* restore old state */
                 return IRQ_NONE;                /* no interrupt requested by E1 */
         }
         /* clear any pending ints on the board */
@@ -61,7 +60,7 @@ ergo_interrupt(int intno, void *dev_id)
         /* start kernel task immediately after leaving all interrupts */
         if (!card->hw_lock)
                 schedule_work(&card->irq_queue);
-        restore_flags(flags);
+        spin_unlock_irqrestore(&card->hysdn_lock, flags);
         return IRQ_HANDLED;
 }                               /* ergo_interrupt */
 
@@ -83,10 +82,9 @@ ergo_irq_bh(hysdn_card * card)
 
         dpr = card->dpram;      /* point to DPRAM */
 
-        save_flags(flags);
-        cli();
+        spin_lock_irqsave(&card->hysdn_lock, flags);
         if (card->hw_lock) {
-                restore_flags(flags);   /* hardware currently unavailable */
+                spin_unlock_irqrestore(&card->hysdn_lock, flags);       /* hardware currently unavailable */
                 return;
         }
         card->hw_lock = 1;      /* we now lock the hardware */
@@ -120,7 +118,7 @@ ergo_irq_bh(hysdn_card * card)
                         card->hw_lock = 0;      /* free hardware again */
         } while (again);        /* until nothing more to do */
 
-        restore_flags(flags);
+        spin_unlock_irqrestore(&card->hysdn_lock, flags);
 }                               /* ergo_irq_bh */
 
 
@@ -137,8 +135,7 @@ ergo_stopcard(hysdn_card * card)
 #ifdef CONFIG_HYSDN_CAPI
         hycapi_capi_stop(card);
 #endif /* CONFIG_HYSDN_CAPI */
-        save_flags(flags);
-        cli();
+        spin_lock_irqsave(&card->hysdn_lock, flags);
         val = bytein(card->iobase + PCI9050_INTR_REG);  /* get actual value */
         val &= ~(PCI9050_INTR_REG_ENPCI | PCI9050_INTR_REG_EN1);        /* mask irq */
         byteout(card->iobase + PCI9050_INTR_REG, val);
@@ -147,7 +144,7 @@ ergo_stopcard(hysdn_card * card)
         card->state = CARD_STATE_UNUSED;
         card->err_log_state = ERRLOG_STATE_OFF;         /* currently no log active */
 
-        restore_flags(flags);
+        spin_unlock_irqrestore(&card->hysdn_lock, flags);
 }                               /* ergo_stopcard */
 
 /**************************************************************************/
@@ -162,12 +159,11 @@ ergo_set_errlog_state(hysdn_card * card, int on)
                 card->err_log_state = ERRLOG_STATE_OFF;         /* must be off */
                 return;
         }
-        save_flags(flags);
-        cli();
+        spin_lock_irqsave(&card->hysdn_lock, flags);
 
         if (((card->err_log_state == ERRLOG_STATE_OFF) && !on) ||
             ((card->err_log_state == ERRLOG_STATE_ON) && on)) {
-                restore_flags(flags);
+                spin_unlock_irqrestore(&card->hysdn_lock, flags);
                 return;         /* nothing to do */
         }
         if (on)
@@ -175,7 +171,7 @@ ergo_set_errlog_state(hysdn_card * card, int on)
         else
                 card->err_log_state = ERRLOG_STATE_STOP;        /* request stop */
 
-        restore_flags(flags);
+        spin_unlock_irqrestore(&card->hysdn_lock, flags);
         schedule_work(&card->irq_queue);
 }                               /* ergo_set_errlog_state */
 
@@ -356,8 +352,7 @@ ergo_waitpofready(struct HYSDN_CARD *card)
 
                         if (card->debug_flags & LOG_POF_RECORD)
                                 hysdn_addlog(card, "ERGO: pof boot success");
-                        save_flags(flags);
-                        cli();
+                        spin_lock_irqsave(&card->hysdn_lock, flags);
 
                         card->state = CARD_STATE_RUN;   /* now card is running */
                         /* enable the cards interrupt */
@@ -370,7 +365,7 @@ ergo_waitpofready(struct HYSDN_CARD *card)
                         dpr->ToHyInt = 1;
                         dpr->ToPcInt = 1;       /* interrupt to E1 for all cards */
 
-                        restore_flags(flags);
+                        spin_unlock_irqrestore(&card->hysdn_lock, flags);
                         if ((hynet_enable & (1 << card->myid)) 
                             && (i = hysdn_net_create(card))) 
                         {
@@ -408,7 +403,7 @@ ergo_releasehardware(hysdn_card * card)
         free_irq(card->irq, card);      /* release interrupt */
         release_region(card->iobase + PCI9050_INTR_REG, 1);     /* release all io ports */
         release_region(card->iobase + PCI9050_USER_IO, 1);
-        vfree(card->dpram);
+        iounmap(card->dpram);
         card->dpram = NULL;     /* release shared mem */
 }                               /* ergo_releasehardware */
 
@@ -448,6 +443,7 @@ ergo_inithardware(hysdn_card * card)
         card->waitpofready = ergo_waitpofready;
         card->set_errlog_state = ergo_set_errlog_state;
         INIT_WORK(&card->irq_queue, (void *) (void *) ergo_irq_bh, card);
+        card->hysdn_lock = SPIN_LOCK_UNLOCKED;
 
         return (0);
 }                               /* ergo_inithardware */
diff --git a/drivers/isdn/hysdn/hysdn_defs.h b/drivers/isdn/hysdn/hysdn_defs.h
index 461e831592dd..729df4089385 100644
--- a/drivers/isdn/hysdn/hysdn_defs.h
+++ b/drivers/isdn/hysdn/hysdn_defs.h
@@ -188,6 +188,8 @@ typedef struct HYSDN_CARD {
         /* init and deinit stopcard for booting, too */
         void (*stopcard) (struct HYSDN_CARD *);
         void (*releasehardware) (struct HYSDN_CARD *);
+
+        spinlock_t hysdn_lock;
 #ifdef CONFIG_HYSDN_CAPI
         struct hycapictrl_info {
                 char cardname[32];
diff --git a/drivers/isdn/hysdn/hysdn_proclog.c b/drivers/isdn/hysdn/hysdn_proclog.c
index c4301e8338ef..fcd49920b220 100644
--- a/drivers/isdn/hysdn/hysdn_proclog.c
+++ b/drivers/isdn/hysdn/hysdn_proclog.c
@@ -116,8 +116,7 @@ put_log_buffer(hysdn_card * card, char *cp)
         strcpy(ib->log_start, cp);      /* set output string */
         ib->next = NULL;
         ib->proc_ctrl = pd;     /* point to own control structure */
-        save_flags(flags);
-        cli();
+        spin_lock_irqsave(&card->hysdn_lock, flags);
         ib->usage_cnt = pd->if_used;
         if (!pd->log_head)
                 pd->log_head = ib;      /* new head */
@@ -125,7 +124,7 @@ put_log_buffer(hysdn_card * card, char *cp)
                 pd->log_tail->next = ib;        /* follows existing messages */
         pd->log_tail = ib;      /* new tail */
         i = pd->del_lock++;     /* get lock state */
-        restore_flags(flags);
+        spin_unlock_irqrestore(&card->hysdn_lock, flags);
 
         /* delete old entrys */
         if (!i)
@@ -270,14 +269,13 @@ hysdn_log_open(struct inode *ino, struct file *filep)
         } else if ((filep->f_mode & (FMODE_READ | FMODE_WRITE)) == FMODE_READ) {
 
                 /* read access -> log/debug read */
-                save_flags(flags);
-                cli();
+                spin_lock_irqsave(&card->hysdn_lock, flags);
                 pd->if_used++;
                 if (pd->log_head)
                         filep->private_data = &pd->log_tail->next;
                 else
                         filep->private_data = &pd->log_head;
-                restore_flags(flags);
+                spin_unlock_irqrestore(&card->hysdn_lock, flags);
         } else {                /* simultaneous read/write access forbidden ! */
                 unlock_kernel();
                 return (-EPERM);        /* no permission this time */
@@ -301,7 +299,7 @@ hysdn_log_close(struct inode *ino, struct file *filep)
         hysdn_card *card;
         int retval = 0;
         unsigned long flags;
-
+        spinlock_t hysdn_lock = SPIN_LOCK_UNLOCKED;
 
         lock_kernel();
         if ((filep->f_mode & (FMODE_READ | FMODE_WRITE)) == FMODE_WRITE) {
@@ -311,8 +309,7 @@ hysdn_log_close(struct inode *ino, struct file *filep)
                 /* read access -> log/debug read, mark one further file as closed */
 
                 pd = NULL;
-                save_flags(flags);
-                cli();
+                spin_lock_irqsave(&hysdn_lock, flags);
                 inf = *((struct log_data **) filep->private_data);      /* get first log entry */
                 if (inf)
                         pd = (struct procdata *) inf->proc_ctrl;        /* still entries there */
@@ -335,7 +332,7 @@ hysdn_log_close(struct inode *ino, struct file *filep)
                         inf->usage_cnt--;       /* decrement usage count for buffers */
                         inf = inf->next;
                 }
-                restore_flags(flags);
+                spin_unlock_irqrestore(&hysdn_lock, flags);
 
                 if (pd)
                         if (pd->if_used <= 0)   /* delete buffers if last file closed */
diff --git a/drivers/isdn/hysdn/hysdn_sched.c b/drivers/isdn/hysdn/hysdn_sched.c
index 1c0d54ac12ab..1fadf0133e9b 100644
--- a/drivers/isdn/hysdn/hysdn_sched.c
+++ b/drivers/isdn/hysdn/hysdn_sched.c
@@ -155,8 +155,7 @@ hysdn_tx_cfgline(hysdn_card *card, unsigned char *line, unsigned short chan)
         if (card->debug_flags & LOG_SCHED_ASYN)
                 hysdn_addlog(card, "async tx-cfg chan=%d len=%d", chan, strlen(line) + 1);
 
-        save_flags(flags);
-        cli();
+        spin_lock_irqsave(&card->hysdn_lock, flags);
         while (card->async_busy) {
                 sti();
 
@@ -165,7 +164,7 @@ hysdn_tx_cfgline(hysdn_card *card, unsigned char *line, unsigned short chan)
 
                 msleep_interruptible(20);               /* Timeout 20ms */
                 if (!--cnt) {
-                        restore_flags(flags);
+                        spin_unlock_irqrestore(&card->hysdn_lock, flags);
                         return (-ERR_ASYNC_TIME);       /* timed out */
                 }
                 cli();
@@ -194,13 +193,13 @@ hysdn_tx_cfgline(hysdn_card *card, unsigned char *line, unsigned short chan)
 
                 msleep_interruptible(20);               /* Timeout 20ms */
                 if (!--cnt) {
-                        restore_flags(flags);
+                        spin_unlock_irqrestore(&card->hysdn_lock, flags);
                         return (-ERR_ASYNC_TIME);       /* timed out */
                 }
                 cli();
         }                       /* wait for buffer to become free again */
 
-        restore_flags(flags);
+        spin_unlock_irqrestore(&card->hysdn_lock, flags);
 
         if (card->debug_flags & LOG_SCHED_ASYN)
                 hysdn_addlog(card, "async tx-cfg data send");
diff --git a/drivers/isdn/i4l/isdn_common.c b/drivers/isdn/i4l/isdn_common.c
index c3d79eef9e32..69aee2602aa6 100644
--- a/drivers/isdn/i4l/isdn_common.c
+++ b/drivers/isdn/i4l/isdn_common.c
@@ -1134,9 +1134,12 @@ isdn_read(struct file *file, char __user *buf, size_t count, loff_t * off)
                 if (dev->drv[drvidx]->interface->readstat) {
                         if (count > dev->drv[drvidx]->stavail)
                                 count = dev->drv[drvidx]->stavail;
-                        len = dev->drv[drvidx]->interface->
-                                readstat(buf, count, drvidx,
-                                         isdn_minor2chan(minor));
+                        len = dev->drv[drvidx]->interface->readstat(buf, count,
+                                                drvidx, isdn_minor2chan(minor));
+                        if (len < 0) {
+                                retval = len;
+                                goto out;
+                        }
                 } else {
                         len = 0;
                 }
diff --git a/drivers/isdn/icn/icn.c b/drivers/isdn/icn/icn.c
index 6649f8bc9951..730bbd07ebc7 100644
--- a/drivers/isdn/icn/icn.c
+++ b/drivers/isdn/icn/icn.c
@@ -1010,7 +1010,8 @@ icn_readstatus(u_char __user *buf, int len, icn_card * card)
         for (p = buf, count = 0; count < len; p++, count++) {
                 if (card->msg_buf_read == card->msg_buf_write)
                         return count;
-                put_user(*card->msg_buf_read++, p);
+                if (put_user(*card->msg_buf_read++, p))
+                        return -EFAULT;
                 if (card->msg_buf_read > card->msg_buf_end)
                         card->msg_buf_read = card->msg_buf;
         }
diff --git a/drivers/isdn/isdnloop/isdnloop.c b/drivers/isdn/isdnloop/isdnloop.c
index fabbd461603e..c3ae2edaf6fa 100644
--- a/drivers/isdn/isdnloop/isdnloop.c
+++ b/drivers/isdn/isdnloop/isdnloop.c
@@ -100,12 +100,11 @@ isdnloop_pollbchan(unsigned long data)
                 isdnloop_bchan_send(card, 1);
         if (card->flags & (ISDNLOOP_FLAGS_B1ACTIVE | ISDNLOOP_FLAGS_B2ACTIVE)) {
                 /* schedule b-channel polling again */
-                save_flags(flags);
-                cli();
+                spin_lock_irqsave(&card->isdnloop_lock, flags);
                 card->rb_timer.expires = jiffies + ISDNLOOP_TIMER_BCREAD;
                 add_timer(&card->rb_timer);
                 card->flags |= ISDNLOOP_FLAGS_RBTIMER;
-                restore_flags(flags);
+                spin_unlock_irqrestore(&card->isdnloop_lock, flags);
         } else
                 card->flags &= ~ISDNLOOP_FLAGS_RBTIMER;
 }
@@ -281,8 +280,7 @@ isdnloop_putmsg(isdnloop_card * card, unsigned char c)
 {
         ulong flags;
 
-        save_flags(flags);
-        cli();
+        spin_lock_irqsave(&card->isdnloop_lock, flags);
         *card->msg_buf_write++ = (c == 0xff) ? '\n' : c;
         if (card->msg_buf_write == card->msg_buf_read) {
                 if (++card->msg_buf_read > card->msg_buf_end)
@@ -290,7 +288,7 @@ isdnloop_putmsg(isdnloop_card * card, unsigned char c)
         }
         if (card->msg_buf_write > card->msg_buf_end)
                 card->msg_buf_write = card->msg_buf;
-        restore_flags(flags);
+        spin_unlock_irqrestore(&card->isdnloop_lock, flags);
 }
 
 /*
@@ -372,21 +370,19 @@ isdnloop_polldchan(unsigned long data)
                 if (!(card->flags & ISDNLOOP_FLAGS_RBTIMER)) {
                         /* schedule b-channel polling */
                         card->flags |= ISDNLOOP_FLAGS_RBTIMER;
-                        save_flags(flags);
-                        cli();
+                        spin_lock_irqsave(&card->isdnloop_lock, flags);
                         del_timer(&card->rb_timer);
                         card->rb_timer.function = isdnloop_pollbchan;
                         card->rb_timer.data = (unsigned long) card;
                         card->rb_timer.expires = jiffies + ISDNLOOP_TIMER_BCREAD;
                         add_timer(&card->rb_timer);
-                        restore_flags(flags);
+                        spin_unlock_irqrestore(&card->isdnloop_lock, flags);
                 }
         /* schedule again */
-        save_flags(flags);
-        cli();
+        spin_lock_irqsave(&card->isdnloop_lock, flags);
         card->st_timer.expires = jiffies + ISDNLOOP_TIMER_DCREAD;
         add_timer(&card->st_timer);
-        restore_flags(flags);
+        spin_unlock_irqrestore(&card->isdnloop_lock, flags);
 }
 
 /*
@@ -416,8 +412,7 @@ isdnloop_sendbuf(int channel, struct sk_buff *skb, isdnloop_card * card)
                         return 0;
                 if (card->sndcount[channel] > ISDNLOOP_MAX_SQUEUE)
                         return 0;
-                save_flags(flags);
-                cli();
+                spin_lock_irqsave(&card->isdnloop_lock, flags);
                 nskb = dev_alloc_skb(skb->len);
                 if (nskb) {
                         memcpy(skb_put(nskb, len), skb->data, len);
@@ -426,7 +421,7 @@ isdnloop_sendbuf(int channel, struct sk_buff *skb, isdnloop_card * card)
                 } else
                         len = 0;
                 card->sndcount[channel] += len;
-                restore_flags(flags);
+                spin_unlock_irqrestore(&card->isdnloop_lock, flags);
         }
         return len;
 }
@@ -451,7 +446,8 @@ isdnloop_readstatus(u_char __user *buf, int len, isdnloop_card * card)
         for (p = buf, count = 0; count < len; p++, count++) {
                 if (card->msg_buf_read == card->msg_buf_write)
                         return count;
-                put_user(*card->msg_buf_read++, p);
+                if (put_user(*card->msg_buf_read++, p))
+                        return -EFAULT;
                 if (card->msg_buf_read > card->msg_buf_end)
                         card->msg_buf_read = card->msg_buf;
         }
@@ -576,8 +572,7 @@ isdnloop_atimeout(isdnloop_card * card, int ch)
         unsigned long flags;
         char buf[60];
 
-        save_flags(flags);
-        cli();
+        spin_lock_irqsave(&card->isdnloop_lock, flags);
         if (card->rcard) {
                 isdnloop_fake(card->rcard[ch], "DDIS_I", card->rch[ch] + 1);
                 card->rcard[ch]->rcard[card->rch[ch]] = NULL;
@@ -587,7 +582,7 @@ isdnloop_atimeout(isdnloop_card * card, int ch)
         /* No user responding */
         sprintf(buf, "CAU%s", isdnloop_unicause(card, 1, 3));
         isdnloop_fake(card, buf, ch + 1);
-        restore_flags(flags);
+        spin_unlock_irqrestore(&card->isdnloop_lock, flags);
 }
 
 /*
@@ -622,8 +617,7 @@ isdnloop_start_ctimer(isdnloop_card * card, int ch)
 {
         unsigned long flags;
 
-        save_flags(flags);
-        cli();
+        spin_lock_irqsave(&card->isdnloop_lock, flags);
         init_timer(&card->c_timer[ch]);
         card->c_timer[ch].expires = jiffies + ISDNLOOP_TIMER_ALERTWAIT;
         if (ch)
@@ -632,7 +626,7 @@ isdnloop_start_ctimer(isdnloop_card * card, int ch)
                 card->c_timer[ch].function = isdnloop_atimeout0;
         card->c_timer[ch].data = (unsigned long) card;
         add_timer(&card->c_timer[ch]);
-        restore_flags(flags);
+        spin_unlock_irqrestore(&card->isdnloop_lock, flags);
 }
 
 /*
@@ -647,10 +641,9 @@ isdnloop_kill_ctimer(isdnloop_card * card, int ch)
 {
         unsigned long flags;
 
-        save_flags(flags);
-        cli();
+        spin_lock_irqsave(&card->isdnloop_lock, flags);
         del_timer(&card->c_timer[ch]);
-        restore_flags(flags);
+        spin_unlock_irqrestore(&card->isdnloop_lock, flags);
 }
 
 static u_char si2bit[] =
@@ -706,13 +699,12 @@ isdnloop_try_call(isdnloop_card * card, char *p, int lch, isdn_ctrl * cmd)
                                         }
                         }
                         if (num_match) {
-                                save_flags(flags);
-                                cli();
+                                spin_lock_irqsave(&card->isdnloop_lock, flags);
                                 /* channel idle? */
                                 if (!(cc->rcard[ch])) {
                                         /* Check SI */
                                         if (!(si2bit[cmd->parm.setup.si1] & cc->sil[ch])) {
-                                                restore_flags(flags);
+                                                spin_unlock_irqrestore(&card->isdnloop_lock, flags);
                                                 return 3;
                                         }
                                         /* ch is idle, si and number matches */
@@ -720,10 +712,10 @@ isdnloop_try_call(isdnloop_card * card, char *p, int lch, isdn_ctrl * cmd)
                                         cc->rch[ch] = lch;
                                         card->rcard[lch] = cc;
                                         card->rch[lch] = ch;
-                                        restore_flags(flags);
+                                        spin_unlock_irqrestore(&card->isdnloop_lock, flags);
                                         return 0;
                                 } else {
-                                        restore_flags(flags);
+                                        spin_unlock_irqrestore(&card->isdnloop_lock, flags);
                                         /* num matches, but busy */
                                         if (ch == 1)
                                                 return 1;
@@ -1027,8 +1019,7 @@ isdnloop_stopcard(isdnloop_card * card)
         unsigned long flags;
         isdn_ctrl cmd;
 
-        save_flags(flags);
-        cli();
+        spin_lock_irqsave(&card->isdnloop_lock, flags);
         if (card->flags & ISDNLOOP_FLAGS_RUNNING) {
                 card->flags &= ~ISDNLOOP_FLAGS_RUNNING;
                 del_timer(&card->st_timer);
@@ -1039,7 +1030,7 @@ isdnloop_stopcard(isdnloop_card * card)
                 cmd.driver = card->myid;
                 card->interface.statcallb(&cmd);
         }
-        restore_flags(flags);
+        spin_unlock_irqrestore(&card->isdnloop_lock, flags);
 }
 
 /*
@@ -1078,18 +1069,17 @@ isdnloop_start(isdnloop_card * card, isdnloop_sdef * sdefp)
                 return -EBUSY;
         if (copy_from_user((char *) &sdef, (char *) sdefp, sizeof(sdef)))
                 return -EFAULT;
-        save_flags(flags);
-        cli();
+        spin_lock_irqsave(&card->isdnloop_lock, flags);
         switch (sdef.ptype) {
                 case ISDN_PTYPE_EURO:
                         if (isdnloop_fake(card, "DRV1.23EC-Q.931-CAPI-CNS-BASIS-20.02.96",
                                           -1)) {
-                                restore_flags(flags);
+                                spin_unlock_irqrestore(&card->isdnloop_lock, flags);
                                 return -ENOMEM;
                         }
                         card->sil[0] = card->sil[1] = 4;
                         if (isdnloop_fake(card, "TEI OK", 0)) {
-                                restore_flags(flags);
+                                spin_unlock_irqrestore(&card->isdnloop_lock, flags);
                                 return -ENOMEM;
                         }
                         for (i = 0; i < 3; i++)
@@ -1098,12 +1088,12 @@ isdnloop_start(isdnloop_card * card, isdnloop_sdef * sdefp)
                 case ISDN_PTYPE_1TR6:
                         if (isdnloop_fake(card, "DRV1.04TC-1TR6-CAPI-CNS-BASIS-29.11.95",
                                           -1)) {
-                                restore_flags(flags);
+                                spin_unlock_irqrestore(&card->isdnloop_lock, flags);
                                 return -ENOMEM;
                         }
                         card->sil[0] = card->sil[1] = 4;
                         if (isdnloop_fake(card, "TEI OK", 0)) {
-                                restore_flags(flags);
+                                spin_unlock_irqrestore(&card->isdnloop_lock, flags);
                                 return -ENOMEM;
                         }
                         strcpy(card->s0num[0], sdef.num[0]);
@@ -1111,7 +1101,7 @@ isdnloop_start(isdnloop_card * card, isdnloop_sdef * sdefp)
                         card->s0num[2][0] = '\0';
                         break;
                 default:
-                        restore_flags(flags);
+                        spin_unlock_irqrestore(&card->isdnloop_lock, flags);
                         printk(KERN_WARNING "isdnloop: Illegal D-channel protocol %d\n",
                                sdef.ptype);
                         return -EINVAL;
@@ -1122,7 +1112,7 @@ isdnloop_start(isdnloop_card * card, isdnloop_sdef * sdefp)
         card->st_timer.data = (unsigned long) card;
         add_timer(&card->st_timer);
         card->flags |= ISDNLOOP_FLAGS_RUNNING;
-        restore_flags(flags);
+        spin_unlock_irqrestore(&card->isdnloop_lock, flags);
         return 0;
 }
 
@@ -1472,6 +1462,7 @@ isdnloop_initcard(char *id)
                 skb_queue_head_init(&card->bqueue[i]);
         }
         skb_queue_head_init(&card->dqueue);
+        card->isdnloop_lock = SPIN_LOCK_UNLOCKED;
         card->next = cards;
         cards = card;
         if (!register_isdn(&card->interface)) {
diff --git a/drivers/isdn/isdnloop/isdnloop.h b/drivers/isdn/isdnloop/isdnloop.h
index d699fe53e1c3..0d458a86f529 100644
--- a/drivers/isdn/isdnloop/isdnloop.h
+++ b/drivers/isdn/isdnloop/isdnloop.h
@@ -94,6 +94,7 @@ typedef struct isdnloop_card {
         struct sk_buff_head
          bqueue[ISDNLOOP_BCH];  /* B-Channel queues                 */
         struct sk_buff_head dqueue;     /* D-Channel queue                  */
+        spinlock_t isdnloop_lock;
 } isdnloop_card;
 
 /*
diff --git a/drivers/isdn/pcbit/drv.c b/drivers/isdn/pcbit/drv.c
index 94f21486bb24..6ead5e1508b7 100644
--- a/drivers/isdn/pcbit/drv.c
+++ b/drivers/isdn/pcbit/drv.c
@@ -725,23 +725,27 @@ static int pcbit_stat(u_char __user *buf, int len, int driver, int channel)
 
         if (stat_st < stat_end)
         {
-                copy_to_user(buf, statbuf + stat_st, len);
+                if (copy_to_user(buf, statbuf + stat_st, len))
+                        return -EFAULT;
                 stat_st += len;    
         }
         else
         {
                 if (len > STATBUF_LEN - stat_st)
                 {
-                        copy_to_user(buf, statbuf + stat_st, 
-                                       STATBUF_LEN - stat_st);
-                        copy_to_user(buf, statbuf, 
-                                       len - (STATBUF_LEN - stat_st));
+                        if (copy_to_user(buf, statbuf + stat_st,
+                                       STATBUF_LEN - stat_st))
+                                return -EFAULT;
+                        if (copy_to_user(buf, statbuf,
+                                       len - (STATBUF_LEN - stat_st)))
+                                return -EFAULT;
 
                         stat_st = len - (STATBUF_LEN - stat_st);
                 }
                 else
                 {
-                        copy_to_user(buf, statbuf + stat_st, len);
+                        if (copy_to_user(buf, statbuf + stat_st, len))
+                                return -EFAULT;
 
                         stat_st += len;
                         
diff --git a/drivers/leds/led-class.c b/drivers/leds/led-class.c
index aecbbe2e89a9..3c1711210e38 100644
--- a/drivers/leds/led-class.c
+++ b/drivers/leds/led-class.c
@@ -91,6 +91,8 @@ EXPORT_SYMBOL_GPL(led_classdev_resume);
  */
 int led_classdev_register(struct device *parent, struct led_classdev *led_cdev)
 {
+        int rc;
+
         led_cdev->class_dev = class_device_create(leds_class, NULL, 0,
                                                 parent, "%s", led_cdev->name);
         if (unlikely(IS_ERR(led_cdev->class_dev)))
@@ -99,8 +101,10 @@ int led_classdev_register(struct device *parent, struct led_classdev *led_cdev)
         class_set_devdata(led_cdev->class_dev, led_cdev);
 
         /* register the attributes */
-        class_device_create_file(led_cdev->class_dev,
-                                &class_device_attr_brightness);
+        rc = class_device_create_file(led_cdev->class_dev,
+                                      &class_device_attr_brightness);
+        if (rc)
+                goto err_out;
 
         /* add to the list of leds */
         write_lock(&leds_list_lock);
@@ -110,16 +114,28 @@ int led_classdev_register(struct device *parent, struct led_classdev *led_cdev)
 #ifdef CONFIG_LEDS_TRIGGERS
         rwlock_init(&led_cdev->trigger_lock);
 
-        led_trigger_set_default(led_cdev);
+        rc = class_device_create_file(led_cdev->class_dev,
+                                      &class_device_attr_trigger);
+        if (rc)
+                goto err_out_led_list;
 
-        class_device_create_file(led_cdev->class_dev,
-                                &class_device_attr_trigger);
+        led_trigger_set_default(led_cdev);
 #endif
 
         printk(KERN_INFO "Registered led device: %s\n",
                         led_cdev->class_dev->class_id);
 
         return 0;
+
+#ifdef CONFIG_LEDS_TRIGGERS
+err_out_led_list:
+        class_device_remove_file(led_cdev->class_dev,
+                                &class_device_attr_brightness);
+        list_del(&led_cdev->node);
+#endif
+err_out:
+        class_device_unregister(led_cdev->class_dev);
+        return rc;
 }
 EXPORT_SYMBOL_GPL(led_classdev_register);
 
diff --git a/drivers/leds/ledtrig-timer.c b/drivers/leds/ledtrig-timer.c
index 179c2876b541..29a8818a32ec 100644
--- a/drivers/leds/ledtrig-timer.c
+++ b/drivers/leds/ledtrig-timer.c
@@ -123,6 +123,7 @@ static CLASS_DEVICE_ATTR(delay_off, 0644, led_delay_off_show,
 static void timer_trig_activate(struct led_classdev *led_cdev)
 {
         struct timer_trig_data *timer_data;
+        int rc;
 
         timer_data = kzalloc(sizeof(struct timer_trig_data), GFP_KERNEL);
         if (!timer_data)
@@ -134,10 +135,21 @@ static void timer_trig_activate(struct led_classdev *led_cdev)
         timer_data->timer.function = led_timer_function;
         timer_data->timer.data = (unsigned long) led_cdev;
 
-        class_device_create_file(led_cdev->class_dev,
+        rc = class_device_create_file(led_cdev->class_dev,
                                 &class_device_attr_delay_on);
-        class_device_create_file(led_cdev->class_dev,
+        if (rc) goto err_out;
+        rc = class_device_create_file(led_cdev->class_dev,
                                 &class_device_attr_delay_off);
+        if (rc) goto err_out_delayon;
+
+        return;
+
+err_out_delayon:
+        class_device_remove_file(led_cdev->class_dev,
+                                &class_device_attr_delay_on);
+err_out:
+        led_cdev->trigger_data = NULL;
+        kfree(timer_data);
 }
 
 static void timer_trig_deactivate(struct led_classdev *led_cdev)
diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c
index 655d816760e5..a625576fdeeb 100644
--- a/drivers/md/dm-crypt.c
+++ b/drivers/md/dm-crypt.c
@@ -16,6 +16,7 @@
 #include <linux/slab.h>
 #include <linux/crypto.h>
 #include <linux/workqueue.h>
+#include <linux/backing-dev.h>
 #include <asm/atomic.h>
 #include <linux/scatterlist.h>
 #include <asm/page.h>
@@ -602,7 +603,7 @@ static void process_write(struct crypt_io *io)
 
                 /* out of memory -> run queues */
                 if (remaining)
-                        blk_congestion_wait(bio_data_dir(clone), HZ/100);
+                        congestion_wait(bio_data_dir(clone), HZ/100);
         }
 }
 
diff --git a/drivers/md/md.c b/drivers/md/md.c
index 57fa64f93e5f..f7f19088f3be 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -4912,6 +4912,7 @@ static unsigned int mdstat_poll(struct file *filp, poll_table *wait)
 }
 
 static struct file_operations md_seq_fops = {
+        .owner          = THIS_MODULE,
         .open           = md_seq_open,
         .read           = seq_read,
         .llseek         = seq_lseek,
diff --git a/drivers/message/i2o/bus-osm.c b/drivers/message/i2o/bus-osm.c
index ac06f10c54ec..d96c687aee93 100644
--- a/drivers/message/i2o/bus-osm.c
+++ b/drivers/message/i2o/bus-osm.c
@@ -80,18 +80,26 @@ static DEVICE_ATTR(scan, S_IWUSR, NULL, i2o_bus_store_scan);
  *      @dev: device to verify if it is a I2O Bus Adapter device
  *
  *      Because we want all Bus Adapters always return 0.
+ *      Except when we fail.  Then we are sad.
  *
- *      Returns 0.
+ *      Returns 0, except when we fail to excel.
  */
 static int i2o_bus_probe(struct device *dev)
 {
         struct i2o_device *i2o_dev = to_i2o_device(get_device(dev));
+        int rc;
 
-        device_create_file(dev, &dev_attr_scan);
+        rc = device_create_file(dev, &dev_attr_scan);
+        if (rc)
+                goto err_out;
 
         osm_info("device added (TID: %03x)\n", i2o_dev->lct_data.tid);
 
         return 0;
+
+err_out:
+        put_device(dev);
+        return rc;
 };
 
 /**
diff --git a/drivers/message/i2o/exec-osm.c b/drivers/message/i2o/exec-osm.c
index 7bd4d85d0b42..91f95d172ca5 100644
--- a/drivers/message/i2o/exec-osm.c
+++ b/drivers/message/i2o/exec-osm.c
@@ -325,13 +325,24 @@ static DEVICE_ATTR(product_id, S_IRUGO, i2o_exec_show_product_id, NULL);
 static int i2o_exec_probe(struct device *dev)
 {
         struct i2o_device *i2o_dev = to_i2o_device(dev);
+        int rc;
 
-        i2o_event_register(i2o_dev, &i2o_exec_driver, 0, 0xffffffff);
+        rc = i2o_event_register(i2o_dev, &i2o_exec_driver, 0, 0xffffffff);
+        if (rc) goto err_out;
 
-        device_create_file(dev, &dev_attr_vendor_id);
-        device_create_file(dev, &dev_attr_product_id);
+        rc = device_create_file(dev, &dev_attr_vendor_id);
+        if (rc) goto err_evtreg;
+        rc = device_create_file(dev, &dev_attr_product_id);
+        if (rc) goto err_vid;
 
         return 0;
+
+err_vid:
+        device_remove_file(dev, &dev_attr_vendor_id);
+err_evtreg:
+        i2o_event_register(to_i2o_device(dev), &i2o_exec_driver, 0, 0);
+err_out:
+        return rc;
 };
 
 /**
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index fa7acc2c5c6d..b6c045dc97b4 100644
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -28,6 +28,17 @@ config IBM_ASM
 
           If unsure, say N.
 
+config SGI_IOC4
+        tristate "SGI IOC4 Base IO support"
+        ---help---
+          This option enables basic support for the IOC4 chip on certain
+          SGI IO controller cards (IO9, IO10, and PCI-RT).  This option
+          does not enable any specific functions on such a card, but provides
+          necessary infrastructure for other drivers to utilize.
+
+          If you have an SGI Altix with an IOC4-based card say Y.
+          Otherwise say N.
+
 config TIFM_CORE
         tristate "TI Flash Media interface support (EXPERIMENTAL)"
         depends on EXPERIMENTAL
diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
index 9a91c1ee8497..c9e98ab021c5 100644
--- a/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
@@ -9,3 +9,4 @@ obj-$(CONFIG_MSI_LAPTOP)     += msi-laptop.o
 obj-$(CONFIG_LKDTM)             += lkdtm.o
 obj-$(CONFIG_TIFM_CORE)         += tifm_core.o
 obj-$(CONFIG_TIFM_7XX1)         += tifm_7xx1.o
+obj-$(CONFIG_SGI_IOC4)          += ioc4.o
diff --git a/drivers/sn/ioc4.c b/drivers/misc/ioc4.c
index 8562821e6498..1c3c14a3839c 100644
--- a/drivers/sn/ioc4.c
+++ b/drivers/misc/ioc4.c
@@ -3,7 +3,7 @@
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
  *
- * Copyright (C) 2005 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (C) 2005-2006 Silicon Graphics, Inc.  All Rights Reserved.
  */
 
 /* This file contains the master driver module for use by SGI IOC4 subdrivers.
@@ -29,12 +29,9 @@
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/ioc4.h>
-#include <linux/mmtimer.h>
-#include <linux/rtc.h>
+#include <linux/ktime.h>
 #include <linux/mutex.h>
-#include <asm/sn/addrs.h>
-#include <asm/sn/clksupport.h>
-#include <asm/sn/shub_mmr.h>
+#include <linux/time.h>
 
 /***************
  * Definitions *
@@ -43,7 +40,7 @@
 /* Tweakable values */
 
 /* PCI bus speed detection/calibration */
-#define IOC4_CALIBRATE_COUNT 63 /* Calibration cycle period */
+#define IOC4_CALIBRATE_COUNT 63         /* Calibration cycle period */
 #define IOC4_CALIBRATE_CYCLES 256       /* Average over this many cycles */
 #define IOC4_CALIBRATE_DISCARD 2        /* Discard first few cycles */
 #define IOC4_CALIBRATE_LOW_MHZ 25       /* Lower bound on bus speed sanity */
@@ -143,11 +140,11 @@ ioc4_unregister_submodule(struct ioc4_submodule *is)
 static void
 ioc4_clock_calibrate(struct ioc4_driver_data *idd)
 {
-        extern unsigned long sn_rtc_cycles_per_second;
         union ioc4_int_out int_out;
         union ioc4_gpcr gpcr;
         unsigned int state, last_state = 1;
-        uint64_t start = 0, end, period;
+        struct timespec start_ts, end_ts;
+        uint64_t start, end, period;
         unsigned int count = 0;
 
         /* Enable output */
@@ -175,30 +172,28 @@ ioc4_clock_calibrate(struct ioc4_driver_data *idd)
                 if (!last_state && state) {
                         count++;
                         if (count == IOC4_CALIBRATE_END) {
-                                end = rtc_time();
+                                ktime_get_ts(&end_ts);
                                 break;
                         } else if (count == IOC4_CALIBRATE_DISCARD)
-                                start = rtc_time();
+                                ktime_get_ts(&start_ts);
                 }
                 last_state = state;
         } while (1);
 
         /* Calculation rearranged to preserve intermediate precision.
          * Logically:
-         * 1. "end - start" gives us number of RTC cycles over all the
-         *    square wave cycles measured.
-         * 2. Divide by number of square wave cycles to get number of
-         *    RTC cycles per square wave cycle.
+         * 1. "end - start" gives us the measurement period over all
+         *    the square wave cycles.
+         * 2. Divide by number of square wave cycles to get the period
+         *    of a square wave cycle.
          * 3. Divide by 2*(int_out.fields.count+1), which is the formula
          *    by which the IOC4 generates the square wave, to get the
-         *    number of RTC cycles per IOC4 INT_OUT count.
-         * 4. Divide by sn_rtc_cycles_per_second to get seconds per
-         *    count.
-         * 5. Multiply by 1E9 to get nanoseconds per count.
+         *    period of an IOC4 INT_OUT count.
          */
-        period = ((end - start) * 1000000000) /
-            (IOC4_CALIBRATE_CYCLES * 2 * (IOC4_CALIBRATE_COUNT + 1)
-             * sn_rtc_cycles_per_second);
+        end = end_ts.tv_sec * NSEC_PER_SEC + end_ts.tv_nsec;
+        start = start_ts.tv_sec * NSEC_PER_SEC + start_ts.tv_nsec;
+        period = (end - start) /
+                (IOC4_CALIBRATE_CYCLES * 2 * (IOC4_CALIBRATE_COUNT + 1));
 
         /* Bounds check the result. */
         if (period > IOC4_CALIBRATE_LOW_LIMIT ||
@@ -210,10 +205,12 @@ ioc4_clock_calibrate(struct ioc4_driver_data *idd)
                        IOC4_CALIBRATE_DEFAULT / IOC4_EXTINT_COUNT_DIVISOR);
                 period = IOC4_CALIBRATE_DEFAULT;
         } else {
+                u64 ns = period;
+
+                do_div(ns, IOC4_EXTINT_COUNT_DIVISOR);
                 printk(KERN_DEBUG
-                       "IOC4 %s: PCI clock is %ld ns.\n",
-                       pci_name(idd->idd_pdev),
-                       period / IOC4_EXTINT_COUNT_DIVISOR);
+                       "IOC4 %s: PCI clock is %lld ns.\n",
+                       pci_name(idd->idd_pdev), ns);
         }
 
         /* Remember results.  We store the extint clock period rather
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index ab92cc794c64..e2ed24918a58 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -2288,7 +2288,7 @@ config UGETH_TX_ON_DEMOND
 
 config UGETH_HAS_GIGA
         bool
-        depends on UCC_GETH && MPC836x
+        depends on UCC_GETH && PPC_MPC836x
 
 config MV643XX_ETH
         tristate "MV-643XX Ethernet support"
diff --git a/drivers/net/e100.c b/drivers/net/e100.c
index 27d5d2f02533..a3a08a5dd185 100644
--- a/drivers/net/e100.c
+++ b/drivers/net/e100.c
@@ -2039,7 +2039,6 @@ static int e100_change_mtu(struct net_device *netdev, int new_mtu)
         return 0;
 }
 
-#ifdef CONFIG_PM
 static int e100_asf(struct nic *nic)
 {
         /* ASF can be enabled from eeprom */
@@ -2048,7 +2047,6 @@ static int e100_asf(struct nic *nic)
            !(nic->eeprom[eeprom_config_asf] & eeprom_gcl) &&
            ((nic->eeprom[eeprom_smbus_addr] & 0xFF) != 0xFE));
 }
-#endif
 
 static int e100_up(struct nic *nic)
 {
@@ -2715,34 +2713,32 @@ static void __devexit e100_remove(struct pci_dev *pdev)
         }
 }
 
+#ifdef CONFIG_PM
 static int e100_suspend(struct pci_dev *pdev, pm_message_t state)
 {
         struct net_device *netdev = pci_get_drvdata(pdev);
         struct nic *nic = netdev_priv(netdev);
 
-        if (netif_running(netdev))
-                e100_down(nic);
-        e100_hw_reset(nic);
-        netif_device_detach(netdev);
+        netif_poll_disable(nic->netdev);
+        del_timer_sync(&nic->watchdog);
+        netif_carrier_off(nic->netdev);
 
-#ifdef CONFIG_PM
         pci_save_state(pdev);
-        if (nic->flags & (wol_magic | e100_asf(nic)))
-#else
-        if (nic->flags & (wol_magic))
-#endif
-                pci_enable_wake(pdev, pci_choose_state(pdev, state), 1);
-        else
-                /* disable PME */
-                pci_enable_wake(pdev, 0, 0);
+
+        if ((nic->flags & wol_magic) | e100_asf(nic)) {
+                pci_enable_wake(pdev, PCI_D3hot, 1);
+                pci_enable_wake(pdev, PCI_D3cold, 1);
+        } else {
+                pci_enable_wake(pdev, PCI_D3hot, 0);
+                pci_enable_wake(pdev, PCI_D3cold, 0);
+        }
 
         pci_disable_device(pdev);
-        pci_set_power_state(pdev, pci_choose_state(pdev, state));
+        pci_set_power_state(pdev, PCI_D3hot);
 
         return 0;
 }
 
-#ifdef CONFIG_PM
 static int e100_resume(struct pci_dev *pdev)
 {
         struct net_device *netdev = pci_get_drvdata(pdev);
@@ -2764,7 +2760,23 @@ static int e100_resume(struct pci_dev *pdev)
 
 static void e100_shutdown(struct pci_dev *pdev)
 {
-        e100_suspend(pdev, PMSG_SUSPEND);
+        struct net_device *netdev = pci_get_drvdata(pdev);
+        struct nic *nic = netdev_priv(netdev);
+
+        netif_poll_disable(nic->netdev);
+        del_timer_sync(&nic->watchdog);
+        netif_carrier_off(nic->netdev);
+
+        if ((nic->flags & wol_magic) | e100_asf(nic)) {
+                pci_enable_wake(pdev, PCI_D3hot, 1);
+                pci_enable_wake(pdev, PCI_D3cold, 1);
+        } else {
+                pci_enable_wake(pdev, PCI_D3hot, 0);
+                pci_enable_wake(pdev, PCI_D3cold, 0);
+        }
+
+        pci_disable_device(pdev);
+        pci_set_power_state(pdev, PCI_D3hot);
 }
 
 /* ------------------ PCI Error Recovery infrastructure  -------------- */
@@ -2848,9 +2860,9 @@ static struct pci_driver e100_driver = {
         .id_table =     e100_id_table,
         .probe =        e100_probe,
         .remove =       __devexit_p(e100_remove),
+#ifdef CONFIG_PM
         /* Power Management hooks */
         .suspend =      e100_suspend,
-#ifdef CONFIG_PM
         .resume =       e100_resume,
 #endif
         .shutdown =     e100_shutdown,
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index ce0d35fe3947..fa849831d099 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -4914,10 +4914,6 @@ static pci_ers_result_t e1000_io_slot_reset(struct pci_dev *pdev)
         pci_enable_wake(pdev, PCI_D3hot, 0);
         pci_enable_wake(pdev, PCI_D3cold, 0);
 
-        /* Perform card reset only on one instance of the card */
-        if (PCI_FUNC (pdev->devfn) != 0)
-                return PCI_ERS_RESULT_RECOVERED;
-
         e1000_reset(adapter);
         E1000_WRITE_REG(&adapter->hw, WUS, ~0);
 
diff --git a/drivers/net/ioc3-eth.c b/drivers/net/ioc3-eth.c
index e963dbf816be..f56b00ee385e 100644
--- a/drivers/net/ioc3-eth.c
+++ b/drivers/net/ioc3-eth.c
@@ -1017,7 +1017,7 @@ static void ioc3_init(struct net_device *dev)
         struct ioc3_private *ip = netdev_priv(dev);
         struct ioc3 *ioc3 = ip->regs;
 
-        del_timer(&ip->ioc3_timer);             /* Kill if running      */
+        del_timer_sync(&ip->ioc3_timer);        /* Kill if running      */
 
         ioc3_w_emcr(EMCR_RST);                  /* Reset                */
         (void) ioc3_r_emcr();                   /* Flush WB             */
@@ -1081,7 +1081,7 @@ static int ioc3_close(struct net_device *dev)
 {
         struct ioc3_private *ip = netdev_priv(dev);
 
-        del_timer(&ip->ioc3_timer);
+        del_timer_sync(&ip->ioc3_timer);
 
         netif_stop_queue(dev);
 
diff --git a/drivers/net/loopback.c b/drivers/net/loopback.c
index 4178b4b1d2df..82c10dec1b5a 100644
--- a/drivers/net/loopback.c
+++ b/drivers/net/loopback.c
@@ -58,7 +58,11 @@
 #include <linux/tcp.h>
 #include <linux/percpu.h>
 
-static DEFINE_PER_CPU(struct net_device_stats, loopback_stats);
+struct pcpu_lstats {
+        unsigned long packets;
+        unsigned long bytes;
+};
+static DEFINE_PER_CPU(struct pcpu_lstats, pcpu_lstats);
 
 #define LOOPBACK_OVERHEAD (128 + MAX_HEADER + 16 + 16)
 
@@ -128,7 +132,7 @@ static void emulate_large_send_offload(struct sk_buff *skb)
  */
 static int loopback_xmit(struct sk_buff *skb, struct net_device *dev)
 {
-        struct net_device_stats *lb_stats;
+        struct pcpu_lstats *lb_stats;
 
         skb_orphan(skb);
 
@@ -149,16 +153,14 @@ static int loopback_xmit(struct sk_buff *skb, struct net_device *dev)
 #endif
         dev->last_rx = jiffies;
 
-        lb_stats = &per_cpu(loopback_stats, get_cpu());
-        lb_stats->rx_bytes += skb->len;
-        lb_stats->tx_bytes = lb_stats->rx_bytes;
-        lb_stats->rx_packets++;
-        lb_stats->tx_packets = lb_stats->rx_packets;
-        put_cpu();
+        /* it's OK to use __get_cpu_var() because BHs are off */
+        lb_stats = &__get_cpu_var(pcpu_lstats);
+        lb_stats->bytes += skb->len;
+        lb_stats->packets++;
 
         netif_rx(skb);
 
-        return(0);
+        return 0;
 }
 
 static struct net_device_stats loopback_stats;
@@ -166,20 +168,21 @@ static struct net_device_stats loopback_stats;
 static struct net_device_stats *get_stats(struct net_device *dev)
 {
         struct net_device_stats *stats = &loopback_stats;
+        unsigned long bytes = 0;
+        unsigned long packets = 0;
         int i;
 
-        memset(stats, 0, sizeof(struct net_device_stats));
-
         for_each_possible_cpu(i) {
-                struct net_device_stats *lb_stats;
+                const struct pcpu_lstats *lb_stats;
 
-                lb_stats = &per_cpu(loopback_stats, i);
-                stats->rx_bytes   += lb_stats->rx_bytes;
-                stats->tx_bytes   += lb_stats->tx_bytes;
-                stats->rx_packets += lb_stats->rx_packets;
-                stats->tx_packets += lb_stats->tx_packets;
+                lb_stats = &per_cpu(pcpu_lstats, i);
+                bytes   += lb_stats->bytes;
+                packets += lb_stats->packets;
         }
-
+        stats->rx_packets = packets;
+        stats->tx_packets = packets;
+        stats->rx_bytes = bytes;
+        stats->tx_bytes = bytes;
         return stats;
 }
 
diff --git a/drivers/net/myri_code.h b/drivers/net/myri_code.h
index e21ec9b2c706..ba7b8652c501 100644
--- a/drivers/net/myri_code.h
+++ b/drivers/net/myri_code.h
@@ -1,8 +1,8 @@
 /* This is the Myrinet MCP code for LANai4.x */
 /* Generated by  cat $MYRI_HOME/lib/lanai/mcp4.dat > myri_code4.h */
 
-static unsigned int lanai4_code_off = 0x0000; /* half-word offset */
-static unsigned char lanai4_code[76256] __initdata = {
+static unsigned int __devinitdata lanai4_code_off = 0x0000; /* half-word offset */
+static unsigned char __devinitdata lanai4_code[76256] = {
 0xF2,0x0E,
 0xFE,0x00, 0xC2,0x90, 0x00,0x00, 0x07,0x88, 0x00,0x08, 0xE0,0x01, 0x01,0x4C, 0x97,0x93,
 0xFF,0xFC, 0xE0,0x00, 0x00,0x14, 0x00,0x00, 0x00,0x01, 0x00,0x00, 0x00,0x00, 0x92,0x93,
@@ -4774,8 +4774,8 @@ static unsigned char lanai4_code[76256] __initdata = {
 
 /* This is the LANai data */
 
-static unsigned int lanai4_data_off = 0x94F0; /* half-word offset */
-static unsigned char lanai4_data[20472] __initdata;
+static unsigned int __devinitdata lanai4_data_off = 0x94F0; /* half-word offset */
+static unsigned char __devinitdata lanai4_data[20472];
 
 
 #ifdef SYMBOL_DEFINES_COMPILED
diff --git a/drivers/net/myri_sbus.c b/drivers/net/myri_sbus.c
index 466b484c9fa4..7747bfd99f91 100644
--- a/drivers/net/myri_sbus.c
+++ b/drivers/net/myri_sbus.c
@@ -168,7 +168,7 @@ static int myri_do_handshake(struct myri_eth *mp)
         return 0;
 }
 
-static int myri_load_lanai(struct myri_eth *mp)
+static int __devinit myri_load_lanai(struct myri_eth *mp)
 {
         struct net_device       *dev = mp->dev;
         struct myri_shmem __iomem *shmem = mp->shmem;
@@ -891,7 +891,7 @@ static void dump_eeprom(struct myri_eth *mp)
 }
 #endif
 
-static int __init myri_ether_init(struct sbus_dev *sdev)
+static int __devinit myri_ether_init(struct sbus_dev *sdev)
 {
         static int num;
         static unsigned version_printed;
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index f1c75751cab7..d132fe7d475e 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -214,6 +214,7 @@ static struct pci_device_id rtl8169_pci_tbl[] = {
         { PCI_DEVICE(PCI_VENDOR_ID_REALTEK,     0x8168), 0, 0, RTL_CFG_2 },
         { PCI_DEVICE(PCI_VENDOR_ID_REALTEK,     0x8169), 0, 0, RTL_CFG_0 },
         { PCI_DEVICE(PCI_VENDOR_ID_DLINK,       0x4300), 0, 0, RTL_CFG_0 },
+        { PCI_DEVICE(0x1259,                    0xc107), 0, 0, RTL_CFG_0 },
         { PCI_DEVICE(0x16ec,                    0x0116), 0, 0, RTL_CFG_0 },
         { PCI_VENDOR_ID_LINKSYS,                0x1032,
                 PCI_ANY_ID, 0x0024, 0, 0, RTL_CFG_0 },
@@ -2700,6 +2701,7 @@ static void rtl8169_down(struct net_device *dev)
         struct rtl8169_private *tp = netdev_priv(dev);
         void __iomem *ioaddr = tp->mmio_addr;
         unsigned int poll_locked = 0;
+        unsigned int intrmask;
 
         rtl8169_delete_timer(dev);
 
@@ -2738,8 +2740,11 @@ core_down:
          * 2) dev->change_mtu
          *    -> rtl8169_poll can not be issued again and re-enable the
          *       interruptions. Let's simply issue the IRQ down sequence again.
+         *
+         * No loop if hotpluged or major error (0xffff).
          */
-        if (RTL_R16(IntrMask))
+        intrmask = RTL_R16(IntrMask);
+        if (intrmask && (intrmask != 0xffff))
                 goto core_down;
 
         rtl8169_tx_clear(tp);
diff --git a/drivers/net/sb1250-mac.c b/drivers/net/sb1250-mac.c
index db2324939b69..1eae16b72b4b 100644
--- a/drivers/net/sb1250-mac.c
+++ b/drivers/net/sb1250-mac.c
@@ -2903,7 +2903,7 @@ sbmac_init_module(void)
 
                 dev = alloc_etherdev(sizeof(struct sbmac_softc));
                 if (!dev)
-                        return -ENOMEM; /* return ENOMEM */
+                        return -ENOMEM;
 
                 printk(KERN_DEBUG "sbmac: configuring MAC at %lx\n", port);
 
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index c10e7f5faa5f..95efdb5bbbe1 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -50,7 +50,7 @@
 #include "sky2.h"
 
 #define DRV_NAME                "sky2"
-#define DRV_VERSION             "1.9"
+#define DRV_VERSION             "1.10"
 #define PFX                     DRV_NAME " "
 
 /*
@@ -96,9 +96,9 @@ static int disable_msi = 0;
 module_param(disable_msi, int, 0);
 MODULE_PARM_DESC(disable_msi, "Disable Message Signaled Interrupt (MSI)");
 
-static int idle_timeout = 100;
+static int idle_timeout = 0;
 module_param(idle_timeout, int, 0);
-MODULE_PARM_DESC(idle_timeout, "Idle timeout workaround for lost interrupts (ms)");
+MODULE_PARM_DESC(idle_timeout, "Watchdog timer for lost interrupts (ms)");
 
 static const struct pci_device_id sky2_id_table[] = {
         { PCI_DEVICE(PCI_VENDOR_ID_SYSKONNECT, 0x9000) },
@@ -284,6 +284,31 @@ static void sky2_gmac_reset(struct sky2_hw *hw, unsigned port)
         gma_write16(hw, port, GM_RX_CTRL, reg);
 }
 
+/* flow control to advertise bits */
+static const u16 copper_fc_adv[] = {
+        [FC_NONE]       = 0,
+        [FC_TX]         = PHY_M_AN_ASP,
+        [FC_RX]         = PHY_M_AN_PC,
+        [FC_BOTH]       = PHY_M_AN_PC | PHY_M_AN_ASP,
+};
+
+/* flow control to advertise bits when using 1000BaseX */
+static const u16 fiber_fc_adv[] = {
+        [FC_BOTH] = PHY_M_P_BOTH_MD_X,
+        [FC_TX]   = PHY_M_P_ASYM_MD_X,
+        [FC_RX]   = PHY_M_P_SYM_MD_X,
+        [FC_NONE] = PHY_M_P_NO_PAUSE_X,
+};
+
+/* flow control to GMA disable bits */
+static const u16 gm_fc_disable[] = {
+        [FC_NONE] = GM_GPCR_FC_RX_DIS | GM_GPCR_FC_TX_DIS,
+        [FC_TX]   = GM_GPCR_FC_RX_DIS,
+        [FC_RX]   = GM_GPCR_FC_TX_DIS,
+        [FC_BOTH] = 0,
+};
+
+
 static void sky2_phy_init(struct sky2_hw *hw, unsigned port)
 {
         struct sky2_port *sky2 = netdev_priv(hw->dev[port]);
@@ -356,16 +381,7 @@ static void sky2_phy_init(struct sky2_hw *hw, unsigned port)
                 gm_phy_write(hw, port, PHY_MARV_EXT_ADR, pg);
         }
 
-        ctrl = gm_phy_read(hw, port, PHY_MARV_CTRL);
-        if (sky2->autoneg == AUTONEG_DISABLE)
-                ctrl &= ~PHY_CT_ANE;
-        else
-                ctrl |= PHY_CT_ANE;
-
-        ctrl |= PHY_CT_RESET;
-        gm_phy_write(hw, port, PHY_MARV_CTRL, ctrl);
-
-        ctrl = 0;
+        ctrl = PHY_CT_RESET;
         ct1000 = 0;
         adv = PHY_AN_CSMA;
         reg = 0;
@@ -384,20 +400,16 @@ static void sky2_phy_init(struct sky2_hw *hw, unsigned port)
                                 adv |= PHY_M_AN_10_FD;
                         if (sky2->advertising & ADVERTISED_10baseT_Half)
                                 adv |= PHY_M_AN_10_HD;
+
+                        adv |= copper_fc_adv[sky2->flow_mode];
                 } else {        /* special defines for FIBER (88E1040S only) */
                         if (sky2->advertising & ADVERTISED_1000baseT_Full)
                                 adv |= PHY_M_AN_1000X_AFD;
                         if (sky2->advertising & ADVERTISED_1000baseT_Half)
                                 adv |= PHY_M_AN_1000X_AHD;
-                }
 
-                /* Set Flow-control capabilities */
-                if (sky2->tx_pause && sky2->rx_pause)
-                        adv |= PHY_AN_PAUSE_CAP;        /* symmetric */
-                else if (sky2->rx_pause && !sky2->tx_pause)
-                        adv |= PHY_AN_PAUSE_ASYM | PHY_AN_PAUSE_CAP;
-                else if (!sky2->rx_pause && sky2->tx_pause)
-                        adv |= PHY_AN_PAUSE_ASYM;       /* local */
+                        adv |= fiber_fc_adv[sky2->flow_mode];
+                }
 
                 /* Restart Auto-negotiation */
                 ctrl |= PHY_CT_ANE | PHY_CT_RE_CFG;
@@ -422,25 +434,17 @@ static void sky2_phy_init(struct sky2_hw *hw, unsigned port)
                 if (sky2->duplex == DUPLEX_FULL) {
                         reg |= GM_GPCR_DUP_FULL;
                         ctrl |= PHY_CT_DUP_MD;
-                } else if (sky2->speed != SPEED_1000 && hw->chip_id != CHIP_ID_YUKON_EC_U) {
-                        /* Turn off flow control for 10/100mbps */
-                        sky2->rx_pause = 0;
-                        sky2->tx_pause = 0;
-                }
+                } else if (sky2->speed < SPEED_1000)
+                        sky2->flow_mode = FC_NONE;
 
-                if (!sky2->rx_pause)
-                        reg |= GM_GPCR_FC_RX_DIS;
 
-                if (!sky2->tx_pause)
-                        reg |= GM_GPCR_FC_TX_DIS;
+                reg |= gm_fc_disable[sky2->flow_mode];
 
                 /* Forward pause packets to GMAC? */
-                if (sky2->tx_pause || sky2->rx_pause)
+                if (sky2->flow_mode & FC_RX)
                         sky2_write8(hw, SK_REG(port, GMAC_CTRL), GMC_PAUSE_ON);
                 else
                         sky2_write8(hw, SK_REG(port, GMAC_CTRL), GMC_PAUSE_OFF);
-
-                ctrl |= PHY_CT_RESET;
         }
 
         gma_write16(hw, port, GM_GP_CTRL, reg);
@@ -695,16 +699,10 @@ static void sky2_mac_init(struct sky2_hw *hw, unsigned port)
 
 }
 
-/* Assign Ram Buffer allocation.
- * start and end are in units of 4k bytes
- * ram registers are in units of 64bit words
- */
-static void sky2_ramset(struct sky2_hw *hw, u16 q, u8 startk, u8 endk)
+/* Assign Ram Buffer allocation in units of 64bit (8 bytes) */
+static void sky2_ramset(struct sky2_hw *hw, u16 q, u32 start, u32 end)
 {
-        u32 start, end;
-
-        start = startk * 4096/8;
-        end = (endk * 4096/8) - 1;
+        pr_debug(PFX "q %d %#x %#x\n", q, start, end);
 
         sky2_write8(hw, RB_ADDR(q, RB_CTRL), RB_RST_CLR);
         sky2_write32(hw, RB_ADDR(q, RB_START), start);
@@ -713,7 +711,7 @@ static void sky2_ramset(struct sky2_hw *hw, u16 q, u8 startk, u8 endk)
         sky2_write32(hw, RB_ADDR(q, RB_RP), start);
 
         if (q == Q_R1 || q == Q_R2) {
-                u32 space = (endk - startk) * 4096/8;
+                u32 space = end - start + 1;
                 u32 tp = space - space/4;
 
                 /* On receive queue's set the thresholds
@@ -1195,19 +1193,16 @@ static int sky2_up(struct net_device *dev)
 
         sky2_mac_init(hw, port);
 
-        /* Determine available ram buffer space (in 4K blocks).
-         * Note: not sure about the FE setting below yet
-         */
-        if (hw->chip_id == CHIP_ID_YUKON_FE)
-                ramsize = 4;
-        else
-                ramsize = sky2_read8(hw, B2_E_0);
+        /* Determine available ram buffer space in qwords.  */
+        ramsize = sky2_read8(hw, B2_E_0) * 4096/8;
 
-        /* Give transmitter one third (rounded up) */
-        rxspace = ramsize - (ramsize + 2) / 3;
+        if (ramsize > 6*1024/8)
+                rxspace = ramsize - (ramsize + 2) / 3;
+        else
+                rxspace = ramsize / 2;
 
-        sky2_ramset(hw, rxqaddr[port], 0, rxspace);
-        sky2_ramset(hw, txqaddr[port], rxspace, ramsize);
+        sky2_ramset(hw, rxqaddr[port], 0, rxspace-1);
+        sky2_ramset(hw, txqaddr[port], rxspace, ramsize-1);
 
         /* Make sure SyncQ is disabled */
         sky2_write8(hw, RB_ADDR(port == 0 ? Q_XS1 : Q_XS2, RB_CTRL),
@@ -1499,6 +1494,11 @@ static int sky2_down(struct net_device *dev)
         /* Stop more packets from being queued */
         netif_stop_queue(dev);
 
+        /* Disable port IRQ */
+        imask = sky2_read32(hw, B0_IMSK);
+        imask &= ~portirq_msk[port];
+        sky2_write32(hw, B0_IMSK, imask);
+
         sky2_gmac_reset(hw, port);
 
         /* Stop transmitter */
@@ -1549,11 +1549,6 @@ static int sky2_down(struct net_device *dev)
         sky2_write8(hw, SK_REG(port, RX_GMF_CTRL_T), GMF_RST_SET);
         sky2_write8(hw, SK_REG(port, TX_GMF_CTRL_T), GMF_RST_SET);
 
-        /* Disable port IRQ */
-        imask = sky2_read32(hw, B0_IMSK);
-        imask &= ~portirq_msk[port];
-        sky2_write32(hw, B0_IMSK, imask);
-
         sky2_phy_power(hw, port, 0);
 
         /* turn off LED's */
@@ -1605,6 +1600,12 @@ static void sky2_link_up(struct sky2_port *sky2)
         struct sky2_hw *hw = sky2->hw;
         unsigned port = sky2->port;
         u16 reg;
+        static const char *fc_name[] = {
+                [FC_NONE]       = "none",
+                [FC_TX]         = "tx",
+                [FC_RX]         = "rx",
+                [FC_BOTH]       = "both",
+        };
 
         /* enable Rx/Tx */
         reg = gma_read16(hw, port, GM_GP_CTRL);
@@ -1648,8 +1649,7 @@ static void sky2_link_up(struct sky2_port *sky2)
                        "%s: Link is up at %d Mbps, %s duplex, flow control %s\n",
                        sky2->netdev->name, sky2->speed,
                        sky2->duplex == DUPLEX_FULL ? "full" : "half",
-                       (sky2->tx_pause && sky2->rx_pause) ? "both" :
-                       sky2->tx_pause ? "tx" : sky2->rx_pause ? "rx" : "none");
+                       fc_name[sky2->flow_status]);
 }
 
 static void sky2_link_down(struct sky2_port *sky2)
@@ -1664,7 +1664,7 @@ static void sky2_link_down(struct sky2_port *sky2)
         reg &= ~(GM_GPCR_RX_ENA | GM_GPCR_TX_ENA);
         gma_write16(hw, port, GM_GP_CTRL, reg);
 
-        if (sky2->rx_pause && !sky2->tx_pause) {
+        if (sky2->flow_status == FC_RX) {
                 /* restore Asymmetric Pause bit */
                 gm_phy_write(hw, port, PHY_MARV_AUNE_ADV,
                              gm_phy_read(hw, port, PHY_MARV_AUNE_ADV)
@@ -1683,6 +1683,14 @@ static void sky2_link_down(struct sky2_port *sky2)
         sky2_phy_init(hw, port);
 }
 
+static enum flow_control sky2_flow(int rx, int tx)
+{
+        if (rx)
+                return tx ? FC_BOTH : FC_RX;
+        else
+                return tx ? FC_TX : FC_NONE;
+}
+
 static int sky2_autoneg_done(struct sky2_port *sky2, u16 aux)
 {
         struct sky2_hw *hw = sky2->hw;
@@ -1703,39 +1711,20 @@ static int sky2_autoneg_done(struct sky2_port *sky2, u16 aux)
         }
 
         sky2->speed = sky2_phy_speed(hw, aux);
-        if (sky2->speed == SPEED_1000) {
-                u16 ctl2 = gm_phy_read(hw, port, PHY_MARV_1000T_CTRL);
-                u16 lpa2 = gm_phy_read(hw, port, PHY_MARV_1000T_STAT);
-                if (lpa2  & PHY_B_1000S_MSF) {
-                        printk(KERN_ERR PFX "%s: master/slave fault",
-                               sky2->netdev->name);
-                        return -1;
-                }
-
-                if ((ctl2 & PHY_M_1000C_AFD) && (lpa2 & PHY_B_1000S_LP_FD))
-                        sky2->duplex = DUPLEX_FULL;
-                else
-                        sky2->duplex = DUPLEX_HALF;
-        } else {
-                u16 adv = gm_phy_read(hw, port, PHY_MARV_AUNE_ADV);
-                if ((aux & adv) & PHY_AN_FULL)
-                        sky2->duplex = DUPLEX_FULL;
-                else
-                        sky2->duplex = DUPLEX_HALF;
-        }
+        sky2->duplex = (aux & PHY_M_PS_FULL_DUP) ? DUPLEX_FULL : DUPLEX_HALF;
 
         /* Pause bits are offset (9..8) */
         if (hw->chip_id == CHIP_ID_YUKON_XL || hw->chip_id == CHIP_ID_YUKON_EC_U)
                 aux >>= 6;
 
-        sky2->rx_pause = (aux & PHY_M_PS_RX_P_EN) != 0;
-        sky2->tx_pause = (aux & PHY_M_PS_TX_P_EN) != 0;
+        sky2->flow_status = sky2_flow(aux & PHY_M_PS_RX_P_EN,
+                                      aux & PHY_M_PS_TX_P_EN);
 
-        if (sky2->duplex == DUPLEX_HALF && sky2->speed != SPEED_1000
+        if (sky2->duplex == DUPLEX_HALF && sky2->speed < SPEED_1000
             && hw->chip_id != CHIP_ID_YUKON_EC_U)
-                sky2->rx_pause = sky2->tx_pause = 0;
+                sky2->flow_status = FC_NONE;
 
-        if (sky2->rx_pause || sky2->tx_pause)
+        if (aux & PHY_M_PS_RX_P_EN)
                 sky2_write8(hw, SK_REG(port, GMAC_CTRL), GMC_PAUSE_ON);
         else
                 sky2_write8(hw, SK_REG(port, GMAC_CTRL), GMC_PAUSE_OFF);
@@ -1750,13 +1739,13 @@ static void sky2_phy_intr(struct sky2_hw *hw, unsigned port)
         struct sky2_port *sky2 = netdev_priv(dev);
         u16 istatus, phystat;
 
+        if (!netif_running(dev))
+                return;
+
         spin_lock(&sky2->phy_lock);
         istatus = gm_phy_read(hw, port, PHY_MARV_INT_STAT);
         phystat = gm_phy_read(hw, port, PHY_MARV_PHY_STAT);
 
-        if (!netif_running(dev))
-                goto out;
-
         if (netif_msg_intr(sky2))
                 printk(KERN_INFO PFX "%s: phy interrupt status 0x%x 0x%x\n",
                        sky2->netdev->name, istatus, phystat);
@@ -2016,6 +2005,10 @@ oversize:
 
 error:
         ++sky2->net_stats.rx_errors;
+        if (status & GMR_FS_RX_FF_OV) {
+                sky2->net_stats.rx_fifo_errors++;
+                goto resubmit;
+        }
 
         if (netif_msg_rx_err(sky2) && net_ratelimit())
                 printk(KERN_INFO PFX "%s: rx error, status 0x%x length %d\n",
@@ -2027,8 +2020,6 @@ error:
                 sky2->net_stats.rx_frame_errors++;
         if (status & GMR_FS_CRC_ERR)
                 sky2->net_stats.rx_crc_errors++;
-        if (status & GMR_FS_RX_FF_OV)
-                sky2->net_stats.rx_fifo_errors++;
 
         goto resubmit;
 }
@@ -2748,7 +2739,7 @@ static int sky2_nway_reset(struct net_device *dev)
 {
         struct sky2_port *sky2 = netdev_priv(dev);
 
-        if (sky2->autoneg != AUTONEG_ENABLE)
+        if (!netif_running(dev) || sky2->autoneg != AUTONEG_ENABLE)
                 return -EINVAL;
 
         sky2_phy_reinit(sky2);
@@ -2850,6 +2841,14 @@ static int sky2_set_mac_address(struct net_device *dev, void *p)
         return 0;
 }
 
+static void inline sky2_add_filter(u8 filter[8], const u8 *addr)
+{
+        u32 bit;
+
+        bit = ether_crc(ETH_ALEN, addr) & 63;
+        filter[bit >> 3] |= 1 << (bit & 7);
+}
+
 static void sky2_set_multicast(struct net_device *dev)
 {
         struct sky2_port *sky2 = netdev_priv(dev);
@@ -2858,7 +2857,10 @@ static void sky2_set_multicast(struct net_device *dev)
         struct dev_mc_list *list = dev->mc_list;
         u16 reg;
         u8 filter[8];
+        int rx_pause;
+        static const u8 pause_mc_addr[ETH_ALEN] = { 0x1, 0x80, 0xc2, 0x0, 0x0, 0x1 };
 
+        rx_pause = (sky2->flow_status == FC_RX || sky2->flow_status == FC_BOTH);
         memset(filter, 0, sizeof(filter));
 
         reg = gma_read16(hw, port, GM_RX_CTRL);
@@ -2866,18 +2868,19 @@ static void sky2_set_multicast(struct net_device *dev)
 
         if (dev->flags & IFF_PROMISC)   /* promiscuous */
                 reg &= ~(GM_RXCR_UCF_ENA | GM_RXCR_MCF_ENA);
-        else if ((dev->flags & IFF_ALLMULTI) || dev->mc_count > 16)     /* all multicast */
+        else if (dev->flags & IFF_ALLMULTI)
                 memset(filter, 0xff, sizeof(filter));
-        else if (dev->mc_count == 0)    /* no multicast */
+        else if (dev->mc_count == 0 && !rx_pause)
                 reg &= ~GM_RXCR_MCF_ENA;
         else {
                 int i;
                 reg |= GM_RXCR_MCF_ENA;
 
-                for (i = 0; list && i < dev->mc_count; i++, list = list->next) {
-                        u32 bit = ether_crc(ETH_ALEN, list->dmi_addr) & 0x3f;
-                        filter[bit / 8] |= 1 << (bit % 8);
-                }
+                if (rx_pause)
+                        sky2_add_filter(filter, pause_mc_addr);
+
+                for (i = 0; list && i < dev->mc_count; i++, list = list->next)
+                        sky2_add_filter(filter, list->dmi_addr);
         }
 
         gma_write16(hw, port, GM_MC_ADDR_H1,
@@ -2990,8 +2993,20 @@ static void sky2_get_pauseparam(struct net_device *dev,
 {
         struct sky2_port *sky2 = netdev_priv(dev);
 
-        ecmd->tx_pause = sky2->tx_pause;
-        ecmd->rx_pause = sky2->rx_pause;
+        switch (sky2->flow_mode) {
+        case FC_NONE:
+                ecmd->tx_pause = ecmd->rx_pause = 0;
+                break;
+        case FC_TX:
+                ecmd->tx_pause = 1, ecmd->rx_pause = 0;
+                break;
+        case FC_RX:
+                ecmd->tx_pause = 0, ecmd->rx_pause = 1;
+                break;
+        case FC_BOTH:
+                ecmd->tx_pause = ecmd->rx_pause = 1;
+        }
+
         ecmd->autoneg = sky2->autoneg;
 }
 
@@ -3001,10 +3016,10 @@ static int sky2_set_pauseparam(struct net_device *dev,
         struct sky2_port *sky2 = netdev_priv(dev);
 
         sky2->autoneg = ecmd->autoneg;
-        sky2->tx_pause = ecmd->tx_pause != 0;
-        sky2->rx_pause = ecmd->rx_pause != 0;
+        sky2->flow_mode = sky2_flow(ecmd->rx_pause, ecmd->tx_pause);
 
-        sky2_phy_reinit(sky2);
+        if (netif_running(dev))
+                sky2_phy_reinit(sky2);
 
         return 0;
 }
@@ -3234,8 +3249,8 @@ static __devinit struct net_device *sky2_init_netdev(struct sky2_hw *hw,
 
         /* Auto speed and flow control */
         sky2->autoneg = AUTONEG_ENABLE;
-        sky2->tx_pause = 1;
-        sky2->rx_pause = 1;
+        sky2->flow_mode = FC_BOTH;
+
         sky2->duplex = -1;
         sky2->speed = -1;
         sky2->advertising = sky2_supported_modes(hw);
@@ -3326,9 +3341,8 @@ static int __devinit sky2_test_msi(struct sky2_hw *hw)
 
         if (!hw->msi_detected) {
                 /* MSI test failed, go back to INTx mode */
-                printk(KERN_WARNING PFX "%s: No interrupt was generated using MSI, "
-                       "switching to INTx mode. Please report this failure to "
-                       "the PCI maintainer and include system chipset information.\n",
+                printk(KERN_INFO PFX "%s: No interrupt generated using MSI, "
+                       "switching to INTx mode.\n",
                        pci_name(pdev));
 
                 err = -EOPNOTSUPP;
@@ -3336,6 +3350,7 @@ static int __devinit sky2_test_msi(struct sky2_hw *hw)
         }
 
         sky2_write32(hw, B0_IMSK, 0);
+        sky2_read32(hw, B0_IMSK);
 
         free_irq(pdev->irq, hw);
 
diff --git a/drivers/net/sky2.h b/drivers/net/sky2.h
index 43d2accf60e1..6d2a23f66c9a 100644
--- a/drivers/net/sky2.h
+++ b/drivers/net/sky2.h
@@ -1576,7 +1576,7 @@ enum {
 
         GMR_FS_ANY_ERR  = GMR_FS_RX_FF_OV | GMR_FS_CRC_ERR |
                           GMR_FS_FRAGMENT | GMR_FS_LONG_ERR |
-                          GMR_FS_MII_ERR | GMR_FS_BAD_FC |
+                          GMR_FS_MII_ERR | GMR_FS_GOOD_FC | GMR_FS_BAD_FC |
                           GMR_FS_UN_SIZE | GMR_FS_JABBER,
 };
 
@@ -1828,6 +1828,13 @@ struct rx_ring_info {
         dma_addr_t      frag_addr[ETH_JUMBO_MTU >> PAGE_SHIFT];
 };
 
+enum flow_control {
+        FC_NONE = 0,
+        FC_TX   = 1,
+        FC_RX   = 2,
+        FC_BOTH = 3,
+};
+
 struct sky2_port {
         struct sky2_hw       *hw;
         struct net_device    *netdev;
@@ -1860,13 +1867,13 @@ struct sky2_port {
 
         dma_addr_t           rx_le_map;
         dma_addr_t           tx_le_map;
-        u32                  advertising;       /* ADVERTISED_ bits */
+        u16                  advertising;       /* ADVERTISED_ bits */
         u16                  speed;     /* SPEED_1000, SPEED_100, ... */
         u8                   autoneg;   /* AUTONEG_ENABLE, AUTONEG_DISABLE */
         u8                   duplex;    /* DUPLEX_HALF, DUPLEX_FULL */
-        u8                   rx_pause;
-        u8                   tx_pause;
         u8                   rx_csum;
+        enum flow_control    flow_mode;
+        enum flow_control    flow_status;
 
         struct net_device_stats net_stats;
 
diff --git a/drivers/net/smc91x.h b/drivers/net/smc91x.h
index 0c9f1e7dab2e..a8640169fc77 100644
--- a/drivers/net/smc91x.h
+++ b/drivers/net/smc91x.h
@@ -416,6 +416,24 @@ static inline void LPD7_SMC_outsw (unsigned char* a, int r,
 
 #define SMC_IRQ_FLAGS           (0)
 
+#elif   defined(CONFIG_ARCH_VERSATILE)
+
+#define SMC_CAN_USE_8BIT        1
+#define SMC_CAN_USE_16BIT       1
+#define SMC_CAN_USE_32BIT       1
+#define SMC_NOWAIT              1
+
+#define SMC_inb(a, r)           readb((a) + (r))
+#define SMC_inw(a, r)           readw((a) + (r))
+#define SMC_inl(a, r)           readl((a) + (r))
+#define SMC_outb(v, a, r)       writeb(v, (a) + (r))
+#define SMC_outw(v, a, r)       writew(v, (a) + (r))
+#define SMC_outl(v, a, r)       writel(v, (a) + (r))
+#define SMC_insl(a, r, p, l)    readsl((a) + (r), p, l)
+#define SMC_outsl(a, r, p, l)   writesl((a) + (r), p, l)
+
+#define SMC_IRQ_FLAGS           (0)
+
 #else
 
 #define SMC_CAN_USE_8BIT        1
diff --git a/drivers/net/sunbmac.c b/drivers/net/sunbmac.c
index 6439b0cef1e4..18f88853e1e5 100644
--- a/drivers/net/sunbmac.c
+++ b/drivers/net/sunbmac.c
@@ -42,7 +42,7 @@
 #define DRV_RELDATE     "11/24/03"
 #define DRV_AUTHOR      "David S. Miller (davem@redhat.com)"
 
-static char version[] __initdata =
+static char version[] =
         DRV_NAME ".c:v" DRV_VERSION " " DRV_RELDATE " " DRV_AUTHOR "\n";
 
 MODULE_VERSION(DRV_VERSION);
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index 327836b1014e..8e398499c045 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -68,8 +68,8 @@
 
 #define DRV_MODULE_NAME         "tg3"
 #define PFX DRV_MODULE_NAME     ": "
-#define DRV_MODULE_VERSION      "3.66"
-#define DRV_MODULE_RELDATE      "September 23, 2006"
+#define DRV_MODULE_VERSION      "3.67"
+#define DRV_MODULE_RELDATE      "October 18, 2006"
 
 #define TG3_DEF_MAC_MODE        0
 #define TG3_DEF_RX_MODE         0
@@ -129,7 +129,7 @@
 #define RX_JUMBO_PKT_BUF_SZ     (9046 + tp->rx_offset + 64)
 
 /* minimum number of free TX descriptors required to wake up TX process */
-#define TG3_TX_WAKEUP_THRESH            (TG3_TX_RING_SIZE / 4)
+#define TG3_TX_WAKEUP_THRESH(tp)                ((tp)->tx_pending / 4)
 
 /* number of ETHTOOL_GSTATS u64's */
 #define TG3_NUM_STATS           (sizeof(struct tg3_ethtool_stats)/sizeof(u64))
@@ -3075,10 +3075,10 @@ static void tg3_tx(struct tg3 *tp)
         smp_mb();
 
         if (unlikely(netif_queue_stopped(tp->dev) &&
-                     (tg3_tx_avail(tp) > TG3_TX_WAKEUP_THRESH))) {
+                     (tg3_tx_avail(tp) > TG3_TX_WAKEUP_THRESH(tp)))) {
                 netif_tx_lock(tp->dev);
                 if (netif_queue_stopped(tp->dev) &&
-                    (tg3_tx_avail(tp) > TG3_TX_WAKEUP_THRESH))
+                    (tg3_tx_avail(tp) > TG3_TX_WAKEUP_THRESH(tp)))
                         netif_wake_queue(tp->dev);
                 netif_tx_unlock(tp->dev);
         }
@@ -3928,7 +3928,7 @@ static int tg3_start_xmit(struct sk_buff *skb, struct net_device *dev)
         tp->tx_prod = entry;
         if (unlikely(tg3_tx_avail(tp) <= (MAX_SKB_FRAGS + 1))) {
                 netif_stop_queue(dev);
-                if (tg3_tx_avail(tp) > TG3_TX_WAKEUP_THRESH)
+                if (tg3_tx_avail(tp) > TG3_TX_WAKEUP_THRESH(tp))
                         netif_wake_queue(tp->dev);
         }
 
@@ -4143,7 +4143,7 @@ static int tg3_start_xmit_dma_bug(struct sk_buff *skb, struct net_device *dev)
         tp->tx_prod = entry;
         if (unlikely(tg3_tx_avail(tp) <= (MAX_SKB_FRAGS + 1))) {
                 netif_stop_queue(dev);
-                if (tg3_tx_avail(tp) > TG3_TX_WAKEUP_THRESH)
+                if (tg3_tx_avail(tp) > TG3_TX_WAKEUP_THRESH(tp))
                         netif_wake_queue(tp->dev);
         }
 
@@ -8106,7 +8106,10 @@ static int tg3_set_ringparam(struct net_device *dev, struct ethtool_ringparam *e
 
         if ((ering->rx_pending > TG3_RX_RING_SIZE - 1) ||
             (ering->rx_jumbo_pending > TG3_RX_JUMBO_RING_SIZE - 1) ||
-            (ering->tx_pending > TG3_TX_RING_SIZE - 1))
+            (ering->tx_pending > TG3_TX_RING_SIZE - 1) ||
+            (ering->tx_pending <= MAX_SKB_FRAGS) ||
+            ((tp->tg3_flags2 & TG3_FLG2_HW_TSO_1_BUG) &&
+             (ering->tx_pending <= (MAX_SKB_FRAGS * 3))))
                 return -EINVAL;
 
         if (netif_running(dev)) {
diff --git a/drivers/net/ucc_geth.c b/drivers/net/ucc_geth.c
index 12cd7b561f35..b37888011067 100644
--- a/drivers/net/ucc_geth.c
+++ b/drivers/net/ucc_geth.c
@@ -2,14 +2,11 @@
  * Copyright (C) Freescale Semicondutor, Inc. 2006. All rights reserved.
  *
  * Author: Shlomi Gridish <gridish@freescale.com>
+ *         Li Yang <leoli@freescale.com>
  *
  * Description:
  * QE UCC Gigabit Ethernet Driver
  *
- * Changelog:
- * Jul 6, 2006 Li Yang <LeoLi@freescale.com>
- * - Rearrange code and style fixes
- *
  * 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
@@ -31,9 +28,9 @@
 #include <linux/dma-mapping.h>
 #include <linux/fsl_devices.h>
 #include <linux/ethtool.h>
-#include <linux/platform_device.h>
 #include <linux/mii.h>
 
+#include <asm/of_device.h>
 #include <asm/uaccess.h>
 #include <asm/irq.h>
 #include <asm/io.h>
@@ -70,7 +67,7 @@
 
 static DEFINE_SPINLOCK(ugeth_lock);
 
-static ucc_geth_info_t ugeth_primary_info = {
+static struct ucc_geth_info ugeth_primary_info = {
         .uf_info = {
                     .bd_mem_part = MEM_PART_SYSTEM,
                     .rtsm = UCC_FAST_SEND_IDLES_BETWEEN_FRAMES,
@@ -163,7 +160,7 @@ static ucc_geth_info_t ugeth_primary_info = {
         .riscRx = QE_RISC_ALLOCATION_RISC1_AND_RISC2,
 };
 
-static ucc_geth_info_t ugeth_info[8];
+static struct ucc_geth_info ugeth_info[8];
 
 #ifdef DEBUG
 static void mem_disp(u8 *addr, int size)
@@ -219,8 +216,8 @@ static struct list_head *dequeue(struct list_head *lh)
         }
 }
 
-static int get_interface_details(enet_interface_e enet_interface,
-                                 enet_speed_e *speed,
+static int get_interface_details(enum enet_interface enet_interface,
+                                 enum enet_speed *speed,
                                  int *r10m,
                                  int *rmm,
                                  int *rpm,
@@ -283,7 +280,7 @@ static int get_interface_details(enet_interface_e enet_interface,
         return 0;
 }
 
-static struct sk_buff *get_new_skb(ucc_geth_private_t *ugeth, u8 *bd)
+static struct sk_buff *get_new_skb(struct ucc_geth_private *ugeth, u8 *bd)
 {
         struct sk_buff *skb = NULL;
 
@@ -303,21 +300,19 @@ static struct sk_buff *get_new_skb(ucc_geth_private_t *ugeth, u8 *bd)
 
         skb->dev = ugeth->dev;
 
-        BD_BUFFER_SET(bd,
+        out_be32(&((struct qe_bd *)bd)->buf,
                       dma_map_single(NULL,
                                      skb->data,
                                      ugeth->ug_info->uf_info.max_rx_buf_length +
                                      UCC_GETH_RX_DATA_BUF_ALIGNMENT,
                                      DMA_FROM_DEVICE));
 
-        BD_STATUS_AND_LENGTH_SET(bd,
-                                 (R_E | R_I |
-                                  (BD_STATUS_AND_LENGTH(bd) & R_W)));
+        out_be32((u32 *)bd, (R_E | R_I | (in_be32((u32 *)bd) & R_W)));
 
         return skb;
 }
 
-static int rx_bd_buffer_set(ucc_geth_private_t *ugeth, u8 rxQ)
+static int rx_bd_buffer_set(struct ucc_geth_private *ugeth, u8 rxQ)
 {
         u8 *bd;
         u32 bd_status;
@@ -328,7 +323,7 @@ static int rx_bd_buffer_set(ucc_geth_private_t *ugeth, u8 rxQ)
         i = 0;
 
         do {
-                bd_status = BD_STATUS_AND_LENGTH(bd);
+                bd_status = in_be32((u32*)bd);
                 skb = get_new_skb(ugeth, bd);
 
                 if (!skb)       /* If can not allocate data buffer,
@@ -338,19 +333,19 @@ static int rx_bd_buffer_set(ucc_geth_private_t *ugeth, u8 rxQ)
                 ugeth->rx_skbuff[rxQ][i] = skb;
 
                 /* advance the BD pointer */
-                bd += UCC_GETH_SIZE_OF_BD;
+                bd += sizeof(struct qe_bd);
                 i++;
         } while (!(bd_status & R_W));
 
         return 0;
 }
 
-static int fill_init_enet_entries(ucc_geth_private_t *ugeth,
+static int fill_init_enet_entries(struct ucc_geth_private *ugeth,
                                   volatile u32 *p_start,
                                   u8 num_entries,
                                   u32 thread_size,
                                   u32 thread_alignment,
-                                  qe_risc_allocation_e risc,
+                                  enum qe_risc_allocation risc,
                                   int skip_page_for_first_entry)
 {
         u32 init_enet_offset;
@@ -383,10 +378,10 @@ static int fill_init_enet_entries(ucc_geth_private_t *ugeth,
         return 0;
 }
 
-static int return_init_enet_entries(ucc_geth_private_t *ugeth,
+static int return_init_enet_entries(struct ucc_geth_private *ugeth,
                                     volatile u32 *p_start,
                                     u8 num_entries,
-                                    qe_risc_allocation_e risc,
+                                    enum qe_risc_allocation risc,
                                     int skip_page_for_first_entry)
 {
         u32 init_enet_offset;
@@ -416,11 +411,11 @@ static int return_init_enet_entries(ucc_geth_private_t *ugeth,
 }
 
 #ifdef DEBUG
-static int dump_init_enet_entries(ucc_geth_private_t *ugeth,
+static int dump_init_enet_entries(struct ucc_geth_private *ugeth,
                                   volatile u32 *p_start,
                                   u8 num_entries,
                                   u32 thread_size,
-                                  qe_risc_allocation_e risc,
+                                  enum qe_risc_allocation risc,
                                   int skip_page_for_first_entry)
 {
         u32 init_enet_offset;
@@ -456,14 +451,14 @@ static int dump_init_enet_entries(ucc_geth_private_t *ugeth,
 #endif
 
 #ifdef CONFIG_UGETH_FILTERING
-static enet_addr_container_t *get_enet_addr_container(void)
+static struct enet_addr_container *get_enet_addr_container(void)
 {
-        enet_addr_container_t *enet_addr_cont;
+        struct enet_addr_container *enet_addr_cont;
 
         /* allocate memory */
-        enet_addr_cont = kmalloc(sizeof(enet_addr_container_t), GFP_KERNEL);
+        enet_addr_cont = kmalloc(sizeof(struct enet_addr_container), GFP_KERNEL);
         if (!enet_addr_cont) {
-                ugeth_err("%s: No memory for enet_addr_container_t object.",
+                ugeth_err("%s: No memory for enet_addr_container object.",
                           __FUNCTION__);
                 return NULL;
         }
@@ -472,45 +467,43 @@ static enet_addr_container_t *get_enet_addr_container(void)
 }
 #endif /* CONFIG_UGETH_FILTERING */
 
-static void put_enet_addr_container(enet_addr_container_t *enet_addr_cont)
+static void put_enet_addr_container(struct enet_addr_container *enet_addr_cont)
 {
         kfree(enet_addr_cont);
 }
 
+static int set_mac_addr(__be16 __iomem *reg, u8 *mac)
+{
+        out_be16(&reg[0], ((u16)mac[5] << 8) | mac[4]);
+        out_be16(&reg[1], ((u16)mac[3] << 8) | mac[2]);
+        out_be16(&reg[2], ((u16)mac[1] << 8) | mac[0]);
+}
+
 #ifdef CONFIG_UGETH_FILTERING
-static int hw_add_addr_in_paddr(ucc_geth_private_t *ugeth,
-                                enet_addr_t *p_enet_addr, u8 paddr_num)
+static int hw_add_addr_in_paddr(struct ucc_geth_private *ugeth,
+                                u8 *p_enet_addr, u8 paddr_num)
 {
-        ucc_geth_82xx_address_filtering_pram_t *p_82xx_addr_filt;
+        struct ucc_geth_82xx_address_filtering_pram *p_82xx_addr_filt;
 
         if (!(paddr_num < NUM_OF_PADDRS)) {
-                ugeth_warn("%s: Illagel paddr_num.", __FUNCTION__);
+                ugeth_warn("%s: Illegal paddr_num.", __FUNCTION__);
                 return -EINVAL;
         }
 
         p_82xx_addr_filt =
-            (ucc_geth_82xx_address_filtering_pram_t *) ugeth->p_rx_glbl_pram->
+            (struct ucc_geth_82xx_address_filtering_pram *) ugeth->p_rx_glbl_pram->
             addressfiltering;
 
         /* Ethernet frames are defined in Little Endian mode,    */
         /* therefore to insert the address we reverse the bytes. */
-        out_be16(&p_82xx_addr_filt->paddr[paddr_num].h,
-                 (u16) (((u16) (((u16) ((*p_enet_addr)[5])) << 8)) |
-                        (u16) (*p_enet_addr)[4]));
-        out_be16(&p_82xx_addr_filt->paddr[paddr_num].m,
-                 (u16) (((u16) (((u16) ((*p_enet_addr)[3])) << 8)) |
-                        (u16) (*p_enet_addr)[2]));
-        out_be16(&p_82xx_addr_filt->paddr[paddr_num].l,
-                 (u16) (((u16) (((u16) ((*p_enet_addr)[1])) << 8)) |
-                        (u16) (*p_enet_addr)[0]));
-
+        set_mac_addr(&p_82xx_addr_filt->paddr[paddr_num].h, p_enet_addr);
         return 0;
 }
 #endif /* CONFIG_UGETH_FILTERING */
 
-static int hw_clear_addr_in_paddr(ucc_geth_private_t *ugeth, u8 paddr_num)
+static int hw_clear_addr_in_paddr(struct ucc_geth_private *ugeth, u8 paddr_num)
 {
-        ucc_geth_82xx_address_filtering_pram_t *p_82xx_addr_filt;
+        struct ucc_geth_82xx_address_filtering_pram *p_82xx_addr_filt;
 
         if (!(paddr_num < NUM_OF_PADDRS)) {
                 ugeth_warn("%s: Illagel paddr_num.", __FUNCTION__);
@@ -518,7 +511,7 @@ static int hw_clear_addr_in_paddr(ucc_geth_private_t *ugeth, u8 paddr_num)
         }
 
         p_82xx_addr_filt =
-            (ucc_geth_82xx_address_filtering_pram_t *) ugeth->p_rx_glbl_pram->
+            (struct ucc_geth_82xx_address_filtering_pram *) ugeth->p_rx_glbl_pram->
             addressfiltering;
 
         /* Writing address ff.ff.ff.ff.ff.ff disables address
@@ -530,14 +523,14 @@ static int hw_clear_addr_in_paddr(ucc_geth_private_t *ugeth, u8 paddr_num)
         return 0;
 }
 
-static void hw_add_addr_in_hash(ucc_geth_private_t *ugeth,
-                                enet_addr_t *p_enet_addr)
+static void hw_add_addr_in_hash(struct ucc_geth_private *ugeth,
+                                u8 *p_enet_addr)
 {
-        ucc_geth_82xx_address_filtering_pram_t *p_82xx_addr_filt;
+        struct ucc_geth_82xx_address_filtering_pram *p_82xx_addr_filt;
         u32 cecr_subblock;
 
         p_82xx_addr_filt =
-            (ucc_geth_82xx_address_filtering_pram_t *) ugeth->p_rx_glbl_pram->
+            (struct ucc_geth_82xx_address_filtering_pram *) ugeth->p_rx_glbl_pram->
             addressfiltering;
 
         cecr_subblock =
@@ -546,25 +539,18 @@ static void hw_add_addr_in_hash(ucc_geth_private_t *ugeth,
         /* Ethernet frames are defined in Little Endian mode,
         therefor to insert */
         /* the address to the hash (Big Endian mode), we reverse the bytes.*/
-        out_be16(&p_82xx_addr_filt->taddr.h,
-                 (u16) (((u16) (((u16) ((*p_enet_addr)[5])) << 8)) |
-                        (u16) (*p_enet_addr)[4]));
-        out_be16(&p_82xx_addr_filt->taddr.m,
-                 (u16) (((u16) (((u16) ((*p_enet_addr)[3])) << 8)) |
-                        (u16) (*p_enet_addr)[2]));
-        out_be16(&p_82xx_addr_filt->taddr.l,
-                 (u16) (((u16) (((u16) ((*p_enet_addr)[1])) << 8)) |
-                        (u16) (*p_enet_addr)[0]));
+
+        set_mac_addr(&p_82xx_addr_filt->taddr.h, p_enet_addr);
 
         qe_issue_cmd(QE_SET_GROUP_ADDRESS, cecr_subblock,
-                     (u8) QE_CR_PROTOCOL_ETHERNET, 0);
+                     QE_CR_PROTOCOL_ETHERNET, 0);
 }
 
 #ifdef CONFIG_UGETH_MAGIC_PACKET
-static void magic_packet_detection_enable(ucc_geth_private_t *ugeth)
+static void magic_packet_detection_enable(struct ucc_geth_private *ugeth)
 {
-        ucc_fast_private_t *uccf;
-        ucc_geth_t *ug_regs;
+        struct ucc_fast_private *uccf;
+        struct ucc_geth *ug_regs;
         u32 maccfg2, uccm;
 
         uccf = ugeth->uccf;
@@ -581,10 +567,10 @@ static void magic_packet_detection_enable(ucc_geth_private_t *ugeth)
         out_be32(&ug_regs->maccfg2, maccfg2);
 }
 
-static void magic_packet_detection_disable(ucc_geth_private_t *ugeth)
+static void magic_packet_detection_disable(struct ucc_geth_private *ugeth)
 {
-        ucc_fast_private_t *uccf;
-        ucc_geth_t *ug_regs;
+        struct ucc_fast_private *uccf;
+        struct ucc_geth *ug_regs;
         u32 maccfg2, uccm;
 
         uccf = ugeth->uccf;
@@ -602,26 +588,26 @@ static void magic_packet_detection_disable(ucc_geth_private_t *ugeth)
 }
 #endif /* MAGIC_PACKET */
 
-static inline int compare_addr(enet_addr_t *addr1, enet_addr_t *addr2)
+static inline int compare_addr(u8 **addr1, u8 **addr2)
 {
         return memcmp(addr1, addr2, ENET_NUM_OCTETS_PER_ADDRESS);
 }
 
 #ifdef DEBUG
-static void get_statistics(ucc_geth_private_t *ugeth,
-                           ucc_geth_tx_firmware_statistics_t *
+static void get_statistics(struct ucc_geth_private *ugeth,
+                           struct ucc_geth_tx_firmware_statistics *
                            tx_firmware_statistics,
-                           ucc_geth_rx_firmware_statistics_t *
+                           struct ucc_geth_rx_firmware_statistics *
                            rx_firmware_statistics,
-                           ucc_geth_hardware_statistics_t *hardware_statistics)
+                           struct ucc_geth_hardware_statistics *hardware_statistics)
 {
-        ucc_fast_t *uf_regs;
-        ucc_geth_t *ug_regs;
-        ucc_geth_tx_firmware_statistics_pram_t *p_tx_fw_statistics_pram;
-        ucc_geth_rx_firmware_statistics_pram_t *p_rx_fw_statistics_pram;
+        struct ucc_fast *uf_regs;
+        struct ucc_geth *ug_regs;
+        struct ucc_geth_tx_firmware_statistics_pram *p_tx_fw_statistics_pram;
+        struct ucc_geth_rx_firmware_statistics_pram *p_rx_fw_statistics_pram;
 
         ug_regs = ugeth->ug_regs;
-        uf_regs = (ucc_fast_t *) ug_regs;
+        uf_regs = (struct ucc_fast *) ug_regs;
         p_tx_fw_statistics_pram = ugeth->p_tx_fw_statistics_pram;
         p_rx_fw_statistics_pram = ugeth->p_rx_fw_statistics_pram;
 
@@ -727,7 +713,7 @@ static void get_statistics(ucc_geth_private_t *ugeth,
         }
 }
 
-static void dump_bds(ucc_geth_private_t *ugeth)
+static void dump_bds(struct ucc_geth_private *ugeth)
 {
         int i;
         int length;
@@ -736,7 +722,7 @@ static void dump_bds(ucc_geth_private_t *ugeth)
                 if (ugeth->p_tx_bd_ring[i]) {
                         length =
                             (ugeth->ug_info->bdRingLenTx[i] *
-                             UCC_GETH_SIZE_OF_BD);
+                             sizeof(struct qe_bd));
                         ugeth_info("TX BDs[%d]", i);
                         mem_disp(ugeth->p_tx_bd_ring[i], length);
                 }
@@ -745,14 +731,14 @@ static void dump_bds(ucc_geth_private_t *ugeth)
                 if (ugeth->p_rx_bd_ring[i]) {
                         length =
                             (ugeth->ug_info->bdRingLenRx[i] *
-                             UCC_GETH_SIZE_OF_BD);
+                             sizeof(struct qe_bd));
                         ugeth_info("RX BDs[%d]", i);
                         mem_disp(ugeth->p_rx_bd_ring[i], length);
                 }
         }
 }
 
-static void dump_regs(ucc_geth_private_t *ugeth)
+static void dump_regs(struct ucc_geth_private *ugeth)
 {
         int i;
 
@@ -893,7 +879,7 @@ static void dump_regs(ucc_geth_private_t *ugeth)
                         ugeth_info("Base address: 0x%08x",
                                    (u32) & ugeth->p_thread_data_tx[i]);
                         mem_disp((u8 *) & ugeth->p_thread_data_tx[i],
-                                 sizeof(ucc_geth_thread_data_tx_t));
+                                 sizeof(struct ucc_geth_thread_data_tx));
                 }
         }
         if (ugeth->p_thread_data_rx) {
@@ -927,7 +913,7 @@ static void dump_regs(ucc_geth_private_t *ugeth)
                         ugeth_info("Base address: 0x%08x",
                                    (u32) & ugeth->p_thread_data_rx[i]);
                         mem_disp((u8 *) & ugeth->p_thread_data_rx[i],
-                                 sizeof(ucc_geth_thread_data_rx_t));
+                                 sizeof(struct ucc_geth_thread_data_rx));
                 }
         }
         if (ugeth->p_exf_glbl_param) {
@@ -1105,7 +1091,7 @@ static void dump_regs(ucc_geth_private_t *ugeth)
                         ugeth_info("Base address: 0x%08x",
                                    (u32) & ugeth->p_send_q_mem_reg->sqqd[i]);
                         mem_disp((u8 *) & ugeth->p_send_q_mem_reg->sqqd[i],
-                                 sizeof(ucc_geth_send_queue_qd_t));
+                                 sizeof(struct ucc_geth_send_queue_qd));
                 }
         }
         if (ugeth->p_scheduler) {
@@ -1187,7 +1173,7 @@ static void dump_regs(ucc_geth_private_t *ugeth)
                                  qe_muram_addr(in_be32
                                                (&ugeth->p_rx_bd_qs_tbl[i].
                                                 bdbaseptr)),
-                                 sizeof(ucc_geth_rx_prefetched_bds_t));
+                                 sizeof(struct ucc_geth_rx_prefetched_bds));
                 }
         }
         if (ugeth->p_init_enet_param_shadow) {
@@ -1198,7 +1184,7 @@ static void dump_regs(ucc_geth_private_t *ugeth)
                 mem_disp((u8 *) ugeth->p_init_enet_param_shadow,
                          sizeof(*ugeth->p_init_enet_param_shadow));
 
-                size = sizeof(ucc_geth_thread_rx_pram_t);
+                size = sizeof(struct ucc_geth_thread_rx_pram);
                 if (ugeth->ug_info->rxExtendedFiltering) {
                         size +=
                             THREAD_RX_PRAM_ADDITIONAL_FOR_EXTENDED_FILTERING;
@@ -1216,7 +1202,7 @@ static void dump_regs(ucc_geth_private_t *ugeth)
                                        &(ugeth->p_init_enet_param_shadow->
                                          txthread[0]),
                                        ENET_INIT_PARAM_MAX_ENTRIES_TX,
-                                       sizeof(ucc_geth_thread_tx_pram_t),
+                                       sizeof(struct ucc_geth_thread_tx_pram),
                                        ugeth->ug_info->riscTx, 0);
                 dump_init_enet_entries(ugeth,
                                        &(ugeth->p_init_enet_param_shadow->
@@ -1578,12 +1564,12 @@ static int init_min_frame_len(u16 min_frame_length,
         return 0;
 }
 
-static int adjust_enet_interface(ucc_geth_private_t *ugeth)
+static int adjust_enet_interface(struct ucc_geth_private *ugeth)
 {
-        ucc_geth_info_t *ug_info;
-        ucc_geth_t *ug_regs;
-        ucc_fast_t *uf_regs;
-        enet_speed_e speed;
+        struct ucc_geth_info *ug_info;
+        struct ucc_geth *ug_regs;
+        struct ucc_fast *uf_regs;
+        enum enet_speed speed;
         int ret_val, rpm = 0, tbi = 0, r10m = 0, rmm =
             0, limited_to_full_duplex = 0;
         u32 upsmr, maccfg2, utbipar, tbiBaseAddress;
@@ -1691,8 +1677,8 @@ static int adjust_enet_interface(ucc_geth_private_t *ugeth)
  */
 static void adjust_link(struct net_device *dev)
 {
-        ucc_geth_private_t *ugeth = netdev_priv(dev);
-        ucc_geth_t *ug_regs;
+        struct ucc_geth_private *ugeth = netdev_priv(dev);
+        struct ucc_geth *ug_regs;
         u32 tempval;
         struct ugeth_mii_info *mii_info = ugeth->mii_info;
 
@@ -1722,7 +1708,7 @@ static void adjust_link(struct net_device *dev)
                 if (mii_info->speed != ugeth->oldspeed) {
                         switch (mii_info->speed) {
                         case 1000:
-#ifdef CONFIG_MPC836x
+#ifdef CONFIG_PPC_MPC836x
 /* FIXME: This code is for 100Mbs BUG fixing,
 remove this when it is fixed!!! */
                                 if (ugeth->ug_info->enet_interface ==
@@ -1768,7 +1754,7 @@ remove this when it is fixed!!! */
                                 break;
                         case 100:
                         case 10:
-#ifdef CONFIG_MPC836x
+#ifdef CONFIG_PPC_MPC836x
 /* FIXME: This code is for 100Mbs BUG fixing,
 remove this lines when it will be fixed!!! */
                                 ugeth->ug_info->enet_interface = ENET_100_RGMII;
@@ -1827,9 +1813,9 @@ remove this lines when it will be fixed!!! */
  */
 static int init_phy(struct net_device *dev)
 {
-        ucc_geth_private_t *ugeth = netdev_priv(dev);
+        struct ucc_geth_private *ugeth = netdev_priv(dev);
         struct phy_info *curphy;
-        ucc_mii_mng_t *mii_regs;
+        struct ucc_mii_mng *mii_regs;
         struct ugeth_mii_info *mii_info;
         int err;
 
@@ -1914,17 +1900,17 @@ static int init_phy(struct net_device *dev)
 }
 
 #ifdef CONFIG_UGETH_TX_ON_DEMOND
-static int ugeth_transmit_on_demand(ucc_geth_private_t *ugeth)
+static int ugeth_transmit_on_demand(struct ucc_geth_private *ugeth)
 {
-        ucc_fast_transmit_on_demand(ugeth->uccf);
+        struct ucc_fastransmit_on_demand(ugeth->uccf);
 
         return 0;
 }
 #endif
 
-static int ugeth_graceful_stop_tx(ucc_geth_private_t *ugeth)
+static int ugeth_graceful_stop_tx(struct ucc_geth_private *ugeth)
 {
-        ucc_fast_private_t *uccf;
+        struct ucc_fast_private *uccf;
         u32 cecr_subblock;
         u32 temp;
 
@@ -1940,7 +1926,7 @@ static int ugeth_graceful_stop_tx(ucc_geth_private_t *ugeth)
         cecr_subblock =
             ucc_fast_get_qe_cr_subblock(ugeth->ug_info->uf_info.ucc_num);
         qe_issue_cmd(QE_GRACEFUL_STOP_TX, cecr_subblock,
-                     (u8) QE_CR_PROTOCOL_ETHERNET, 0);
+                     QE_CR_PROTOCOL_ETHERNET, 0);
 
         /* Wait for command to complete */
         do {
@@ -1952,9 +1938,9 @@ static int ugeth_graceful_stop_tx(ucc_geth_private_t *ugeth)
         return 0;
 }
 
-static int ugeth_graceful_stop_rx(ucc_geth_private_t * ugeth)
+static int ugeth_graceful_stop_rx(struct ucc_geth_private * ugeth)
 {
-        ucc_fast_private_t *uccf;
+        struct ucc_fast_private *uccf;
         u32 cecr_subblock;
         u8 temp;
 
@@ -1973,7 +1959,7 @@ static int ugeth_graceful_stop_rx(ucc_geth_private_t * ugeth)
                     ucc_fast_get_qe_cr_subblock(ugeth->ug_info->uf_info.
                                                 ucc_num);
                 qe_issue_cmd(QE_GRACEFUL_STOP_RX, cecr_subblock,
-                             (u8) QE_CR_PROTOCOL_ETHERNET, 0);
+                             QE_CR_PROTOCOL_ETHERNET, 0);
 
                 temp = ugeth->p_rx_glbl_pram->rxgstpack;
         } while (!(temp & GRACEFUL_STOP_ACKNOWLEDGE_RX));
@@ -1983,41 +1969,40 @@ static int ugeth_graceful_stop_rx(ucc_geth_private_t * ugeth)
         return 0;
 }
 
-static int ugeth_restart_tx(ucc_geth_private_t *ugeth)
+static int ugeth_restart_tx(struct ucc_geth_private *ugeth)
 {
-        ucc_fast_private_t *uccf;
+        struct ucc_fast_private *uccf;
         u32 cecr_subblock;
 
         uccf = ugeth->uccf;
 
         cecr_subblock =
             ucc_fast_get_qe_cr_subblock(ugeth->ug_info->uf_info.ucc_num);
-        qe_issue_cmd(QE_RESTART_TX, cecr_subblock, (u8) QE_CR_PROTOCOL_ETHERNET,
-                     0);
+        qe_issue_cmd(QE_RESTART_TX, cecr_subblock, QE_CR_PROTOCOL_ETHERNET, 0);
         uccf->stopped_tx = 0;
 
         return 0;
 }
 
-static int ugeth_restart_rx(ucc_geth_private_t *ugeth)
+static int ugeth_restart_rx(struct ucc_geth_private *ugeth)
 {
-        ucc_fast_private_t *uccf;
+        struct ucc_fast_private *uccf;
         u32 cecr_subblock;
 
         uccf = ugeth->uccf;
 
         cecr_subblock =
             ucc_fast_get_qe_cr_subblock(ugeth->ug_info->uf_info.ucc_num);
-        qe_issue_cmd(QE_RESTART_RX, cecr_subblock, (u8) QE_CR_PROTOCOL_ETHERNET,
+        qe_issue_cmd(QE_RESTART_RX, cecr_subblock, QE_CR_PROTOCOL_ETHERNET,
                      0);
         uccf->stopped_rx = 0;
 
         return 0;
 }
 
-static int ugeth_enable(ucc_geth_private_t *ugeth, comm_dir_e mode)
+static int ugeth_enable(struct ucc_geth_private *ugeth, enum comm_dir mode)
 {
-        ucc_fast_private_t *uccf;
+        struct ucc_fast_private *uccf;
         int enabled_tx, enabled_rx;
 
         uccf = ugeth->uccf;
@@ -2044,9 +2029,9 @@ static int ugeth_enable(ucc_geth_private_t *ugeth, comm_dir_e mode)
 
 }
 
-static int ugeth_disable(ucc_geth_private_t * ugeth, comm_dir_e mode)
+static int ugeth_disable(struct ucc_geth_private * ugeth, enum comm_dir mode)
 {
-        ucc_fast_private_t *uccf;
+        struct ucc_fast_private *uccf;
 
         uccf = ugeth->uccf;
 
@@ -2069,7 +2054,7 @@ static int ugeth_disable(ucc_geth_private_t * ugeth, comm_dir_e mode)
         return 0;
 }
 
-static void ugeth_dump_regs(ucc_geth_private_t *ugeth)
+static void ugeth_dump_regs(struct ucc_geth_private *ugeth)
 {
 #ifdef DEBUG
         ucc_fast_dump_regs(ugeth->uccf);
@@ -2079,9 +2064,9 @@ static void ugeth_dump_regs(ucc_geth_private_t *ugeth)
 }
 
 #ifdef CONFIG_UGETH_FILTERING
-static int ugeth_ext_filtering_serialize_tad(ucc_geth_tad_params_t *
+static int ugeth_ext_filtering_serialize_tad(struct ucc_geth_tad_params *
                                              p_UccGethTadParams,
-                                             qe_fltr_tad_t *qe_fltr_tad)
+                                             struct qe_fltr_tad *qe_fltr_tad)
 {
         u16 temp;
 
@@ -2119,11 +2104,11 @@ static int ugeth_ext_filtering_serialize_tad(ucc_geth_tad_params_t *
         return 0;
 }
 
-static enet_addr_container_t
-    *ugeth_82xx_filtering_get_match_addr_in_hash(ucc_geth_private_t *ugeth,
-                                                 enet_addr_t *p_enet_addr)
+static struct enet_addr_container_t
+    *ugeth_82xx_filtering_get_match_addr_in_hash(struct ucc_geth_private *ugeth,
+                                                 struct enet_addr *p_enet_addr)
 {
-        enet_addr_container_t *enet_addr_cont;
+        struct enet_addr_container *enet_addr_cont;
         struct list_head *p_lh;
         u16 i, num;
         int32_t j;
@@ -2144,7 +2129,7 @@ static enet_addr_container_t
 
         for (i = 0; i < num; i++) {
                 enet_addr_cont =
-                    (enet_addr_container_t *)
+                    (struct enet_addr_container *)
                     ENET_ADDR_CONT_ENTRY(dequeue(p_lh));
                 for (j = ENET_NUM_OCTETS_PER_ADDRESS - 1; j >= 0; j--) {
                         if ((*p_enet_addr)[j] != (enet_addr_cont->address)[j])
@@ -2157,11 +2142,11 @@ static enet_addr_container_t
         return NULL;
 }
 
-static int ugeth_82xx_filtering_add_addr_in_hash(ucc_geth_private_t *ugeth,
-                                                 enet_addr_t *p_enet_addr)
+static int ugeth_82xx_filtering_add_addr_in_hash(struct ucc_geth_private *ugeth,
+                                                 struct enet_addr *p_enet_addr)
 {
-        ucc_geth_enet_address_recognition_location_e location;
-        enet_addr_container_t *enet_addr_cont;
+        enum ucc_geth_enet_address_recognition_location location;
+        struct enet_addr_container *enet_addr_cont;
         struct list_head *p_lh;
         u8 i;
         u32 limit;
@@ -2196,18 +2181,17 @@ static int ugeth_82xx_filtering_add_addr_in_hash(ucc_geth_private_t *ugeth,
         enqueue(p_lh, &enet_addr_cont->node);   /* Put it back */
         ++(*p_counter);
 
-        hw_add_addr_in_hash(ugeth, &(enet_addr_cont->address));
-
+        hw_add_addr_in_hash(ugeth, enet_addr_cont->address);
         return 0;
 }
 
-static int ugeth_82xx_filtering_clear_addr_in_hash(ucc_geth_private_t *ugeth,
-                                                   enet_addr_t *p_enet_addr)
+static int ugeth_82xx_filtering_clear_addr_in_hash(struct ucc_geth_private *ugeth,
+                                                   struct enet_addr *p_enet_addr)
 {
-        ucc_geth_82xx_address_filtering_pram_t *p_82xx_addr_filt;
-        enet_addr_container_t *enet_addr_cont;
-        ucc_fast_private_t *uccf;
-        comm_dir_e comm_dir;
+        struct ucc_geth_82xx_address_filtering_pram *p_82xx_addr_filt;
+        struct enet_addr_container *enet_addr_cont;
+        struct ucc_fast_private *uccf;
+        enum comm_dir comm_dir;
         u16 i, num;
         struct list_head *p_lh;
         u32 *addr_h, *addr_l;
@@ -2216,7 +2200,7 @@ static int ugeth_82xx_filtering_clear_addr_in_hash(ucc_geth_private_t *ugeth,
         uccf = ugeth->uccf;
 
         p_82xx_addr_filt =
-            (ucc_geth_82xx_address_filtering_pram_t *) ugeth->p_rx_glbl_pram->
+            (struct ucc_geth_82xx_address_filtering_pram *) ugeth->p_rx_glbl_pram->
             addressfiltering;
 
         if (!
@@ -2256,9 +2240,9 @@ static int ugeth_82xx_filtering_clear_addr_in_hash(ucc_geth_private_t *ugeth,
         num = --(*p_counter);
         for (i = 0; i < num; i++) {
                 enet_addr_cont =
-                    (enet_addr_container_t *)
+                    (struct enet_addr_container *)
                     ENET_ADDR_CONT_ENTRY(dequeue(p_lh));
-                hw_add_addr_in_hash(ugeth, &(enet_addr_cont->address));
+                hw_add_addr_in_hash(ugeth, enet_addr_cont->address);
                 enqueue(p_lh, &enet_addr_cont->node);   /* Put it back */
         }
 
@@ -2269,14 +2253,14 @@ static int ugeth_82xx_filtering_clear_addr_in_hash(ucc_geth_private_t *ugeth,
 }
 #endif /* CONFIG_UGETH_FILTERING */
 
-static int ugeth_82xx_filtering_clear_all_addr_in_hash(ucc_geth_private_t *
+static int ugeth_82xx_filtering_clear_all_addr_in_hash(struct ucc_geth_private *
                                                        ugeth,
-                                                       enet_addr_type_e
+                                                       enum enet_addr_type
                                                        enet_addr_type)
 {
-        ucc_geth_82xx_address_filtering_pram_t *p_82xx_addr_filt;
-        ucc_fast_private_t *uccf;
-        comm_dir_e comm_dir;
+        struct ucc_geth_82xx_address_filtering_pram *p_82xx_addr_filt;
+        struct ucc_fast_private *uccf;
+        enum comm_dir comm_dir;
         struct list_head *p_lh;
         u16 i, num;
         u32 *addr_h, *addr_l;
@@ -2285,7 +2269,7 @@ static int ugeth_82xx_filtering_clear_all_addr_in_hash(ucc_geth_private_t *
         uccf = ugeth->uccf;
 
         p_82xx_addr_filt =
-            (ucc_geth_82xx_address_filtering_pram_t *) ugeth->p_rx_glbl_pram->
+            (struct ucc_geth_82xx_address_filtering_pram *) ugeth->p_rx_glbl_pram->
             addressfiltering;
 
         if (enet_addr_type == ENET_ADDR_TYPE_GROUP) {
@@ -2331,8 +2315,8 @@ static int ugeth_82xx_filtering_clear_all_addr_in_hash(ucc_geth_private_t *
 }
 
 #ifdef CONFIG_UGETH_FILTERING
-static int ugeth_82xx_filtering_add_addr_in_paddr(ucc_geth_private_t *ugeth,
-                                                  enet_addr_t *p_enet_addr,
+static int ugeth_82xx_filtering_add_addr_in_paddr(struct ucc_geth_private *ugeth,
+                                                  struct enet_addr *p_enet_addr,
                                                   u8 paddr_num)
 {
         int i;
@@ -2352,14 +2336,14 @@ static int ugeth_82xx_filtering_add_addr_in_paddr(ucc_geth_private_t *ugeth,
 }
 #endif /* CONFIG_UGETH_FILTERING */
 
-static int ugeth_82xx_filtering_clear_addr_in_paddr(ucc_geth_private_t *ugeth,
+static int ugeth_82xx_filtering_clear_addr_in_paddr(struct ucc_geth_private *ugeth,
                                                     u8 paddr_num)
 {
         ugeth->indAddrRegUsed[paddr_num] = 0; /* mark this paddr as not used */
         return hw_clear_addr_in_paddr(ugeth, paddr_num);/* clear in hardware */
 }
 
-static void ucc_geth_memclean(ucc_geth_private_t *ugeth)
+static void ucc_geth_memclean(struct ucc_geth_private *ugeth)
 {
         u16 i, j;
         u8 *bd;
@@ -2433,8 +2417,8 @@ static void ucc_geth_memclean(ucc_geth_private_t *ugeth)
                 for (j = 0; j < ugeth->ug_info->bdRingLenTx[i]; j++) {
                         if (ugeth->tx_skbuff[i][j]) {
                                 dma_unmap_single(NULL,
-                                                 BD_BUFFER_ARG(bd),
-                                                 (BD_STATUS_AND_LENGTH(bd) &
+                                                 ((qe_bd_t *)bd)->buf,
+                                                 (in_be32((u32 *)bd) &
                                                   BD_LENGTH_MASK),
                                                  DMA_TO_DEVICE);
                                 dev_kfree_skb_any(ugeth->tx_skbuff[i][j]);
@@ -2460,18 +2444,17 @@ static void ucc_geth_memclean(ucc_geth_private_t *ugeth)
                         bd = ugeth->p_rx_bd_ring[i];
                         for (j = 0; j < ugeth->ug_info->bdRingLenRx[i]; j++) {
                                 if (ugeth->rx_skbuff[i][j]) {
-                                        dma_unmap_single(NULL, BD_BUFFER(bd),
-                                                 ugeth->ug_info->
-                                                 uf_info.
-                                                 max_rx_buf_length +
-                                                 UCC_GETH_RX_DATA_BUF_ALIGNMENT,
-                                                 DMA_FROM_DEVICE);
-
-                                        dev_kfree_skb_any(ugeth->
-                                                          rx_skbuff[i][j]);
+                                        dma_unmap_single(NULL,
+                                                ((struct qe_bd *)bd)->buf,
+                                                ugeth->ug_info->
+                                                uf_info.max_rx_buf_length +
+                                                UCC_GETH_RX_DATA_BUF_ALIGNMENT,
+                                                DMA_FROM_DEVICE);
+                                        dev_kfree_skb_any(
+                                                ugeth->rx_skbuff[i][j]);
                                         ugeth->rx_skbuff[i][j] = NULL;
                                 }
-                                bd += UCC_GETH_SIZE_OF_BD;
+                                bd += sizeof(struct qe_bd);
                         }
 
                         kfree(ugeth->rx_skbuff[i]);
@@ -2496,11 +2479,11 @@ static void ucc_geth_memclean(ucc_geth_private_t *ugeth)
 
 static void ucc_geth_set_multi(struct net_device *dev)
 {
-        ucc_geth_private_t *ugeth;
+        struct ucc_geth_private *ugeth;
         struct dev_mc_list *dmi;
-        ucc_fast_t *uf_regs;
-        ucc_geth_82xx_address_filtering_pram_t *p_82xx_addr_filt;
-        enet_addr_t tempaddr;
+        struct ucc_fast *uf_regs;
+        struct ucc_geth_82xx_address_filtering_pram *p_82xx_addr_filt;
+        u8 tempaddr[6];
         u8 *mcptr, *tdptr;
         int i, j;
 
@@ -2517,7 +2500,7 @@ static void ucc_geth_set_multi(struct net_device *dev)
                 uf_regs->upsmr &= ~UPSMR_PRO;
 
                 p_82xx_addr_filt =
-                    (ucc_geth_82xx_address_filtering_pram_t *) ugeth->
+                    (struct ucc_geth_82xx_address_filtering_pram *) ugeth->
                     p_rx_glbl_pram->addressfiltering;
 
                 if (dev->flags & IFF_ALLMULTI) {
@@ -2546,23 +2529,22 @@ static void ucc_geth_set_multi(struct net_device *dev)
                                  * copy bytes MSB first from dmi_addr.
                                  */
                                 mcptr = (u8 *) dmi->dmi_addr + 5;
-                                tdptr = (u8 *) & tempaddr;
+                                tdptr = (u8 *) tempaddr;
                                 for (j = 0; j < 6; j++)
                                         *tdptr++ = *mcptr--;
 
                                 /* Ask CPM to run CRC and set bit in
                                  * filter mask.
                                  */
-                                hw_add_addr_in_hash(ugeth, &tempaddr);
-
+                                hw_add_addr_in_hash(ugeth, tempaddr);
                         }
                 }
         }
 }
 
-static void ucc_geth_stop(ucc_geth_private_t *ugeth)
+static void ucc_geth_stop(struct ucc_geth_private *ugeth)
 {
-        ucc_geth_t *ug_regs = ugeth->ug_regs;
+        struct ucc_geth *ug_regs = ugeth->ug_regs;
         u32 tempval;
 
         ugeth_vdbg("%s: IN", __FUNCTION__);
@@ -2605,15 +2587,15 @@ static void ucc_geth_stop(ucc_geth_private_t *ugeth)
         ucc_geth_memclean(ugeth);
 }
 
-static int ucc_geth_startup(ucc_geth_private_t *ugeth)
+static int ucc_geth_startup(struct ucc_geth_private *ugeth)
 {
-        ucc_geth_82xx_address_filtering_pram_t *p_82xx_addr_filt;
-        ucc_geth_init_pram_t *p_init_enet_pram;
-        ucc_fast_private_t *uccf;
-        ucc_geth_info_t *ug_info;
-        ucc_fast_info_t *uf_info;
-        ucc_fast_t *uf_regs;
-        ucc_geth_t *ug_regs;
+        struct ucc_geth_82xx_address_filtering_pram *p_82xx_addr_filt;
+        struct ucc_geth_init_pram *p_init_enet_pram;
+        struct ucc_fast_private *uccf;
+        struct ucc_geth_info *ug_info;
+        struct ucc_fast_info *uf_info;
+        struct ucc_fast *uf_regs;
+        struct ucc_geth *ug_regs;
         int ret_val = -EINVAL;
         u32 remoder = UCC_GETH_REMODER_INIT;
         u32 init_enet_pram_offset, cecr_subblock, command, maccfg1;
@@ -2788,7 +2770,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth)
                 UCC_GETH_VLAN_OPERATION_NON_TAGGED_NOP);
 
         uf_regs = uccf->uf_regs;
-        ug_regs = (ucc_geth_t *) (uccf->uf_regs);
+        ug_regs = (struct ucc_geth *) (uccf->uf_regs);
         ugeth->ug_regs = ug_regs;
 
         init_default_reg_vals(&uf_regs->upsmr,
@@ -2869,10 +2851,10 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth)
                 /* Allocate in multiple of
                    UCC_GETH_TX_BD_RING_SIZE_MEMORY_ALIGNMENT,
                    according to spec */
-                length = ((ug_info->bdRingLenTx[j] * UCC_GETH_SIZE_OF_BD)
+                length = ((ug_info->bdRingLenTx[j] * sizeof(struct qe_bd))
                           / UCC_GETH_TX_BD_RING_SIZE_MEMORY_ALIGNMENT)
                     * UCC_GETH_TX_BD_RING_SIZE_MEMORY_ALIGNMENT;
-                if ((ug_info->bdRingLenTx[j] * UCC_GETH_SIZE_OF_BD) %
+                if ((ug_info->bdRingLenTx[j] * sizeof(struct qe_bd)) %
                     UCC_GETH_TX_BD_RING_SIZE_MEMORY_ALIGNMENT)
                         length += UCC_GETH_TX_BD_RING_SIZE_MEMORY_ALIGNMENT;
                 if (uf_info->bd_mem_part == MEM_PART_SYSTEM) {
@@ -2904,13 +2886,13 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth)
                 }
                 /* Zero unused end of bd ring, according to spec */
                 memset(ugeth->p_tx_bd_ring[j] +
-                       ug_info->bdRingLenTx[j] * UCC_GETH_SIZE_OF_BD, 0,
-                       length - ug_info->bdRingLenTx[j] * UCC_GETH_SIZE_OF_BD);
+                       ug_info->bdRingLenTx[j] * sizeof(struct qe_bd), 0,
+                       length - ug_info->bdRingLenTx[j] * sizeof(struct qe_bd));
         }
 
         /* Allocate Rx bds */
         for (j = 0; j < ug_info->numQueuesRx; j++) {
-                length = ug_info->bdRingLenRx[j] * UCC_GETH_SIZE_OF_BD;
+                length = ug_info->bdRingLenRx[j] * sizeof(struct qe_bd);
                 if (uf_info->bd_mem_part == MEM_PART_SYSTEM) {
                         u32 align = 4;
                         if (UCC_GETH_RX_BD_RING_ALIGNMENT > 4)
@@ -2960,12 +2942,15 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth)
                 ugeth->skb_curtx[j] = ugeth->skb_dirtytx[j] = 0;
                 bd = ugeth->confBd[j] = ugeth->txBd[j] = ugeth->p_tx_bd_ring[j];
                 for (i = 0; i < ug_info->bdRingLenTx[j]; i++) {
-                        BD_BUFFER_CLEAR(bd);
-                        BD_STATUS_AND_LENGTH_SET(bd, 0);
-                        bd += UCC_GETH_SIZE_OF_BD;
+                        /* clear bd buffer */
+                        out_be32(&((struct qe_bd *)bd)->buf, 0);
+                        /* set bd status and length */
+                        out_be32((u32 *)bd, 0);
+                        bd += sizeof(struct qe_bd);
                 }
-                bd -= UCC_GETH_SIZE_OF_BD;
-                BD_STATUS_AND_LENGTH_SET(bd, T_W);/* for last BD set Wrap bit */
+                bd -= sizeof(struct qe_bd);
+                /* set bd status and length */
+                out_be32((u32 *)bd, T_W);       /* for last BD set Wrap bit */
         }
 
         /* Init Rx bds */
@@ -2989,12 +2974,15 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth)
                 ugeth->skb_currx[j] = 0;
                 bd = ugeth->rxBd[j] = ugeth->p_rx_bd_ring[j];
                 for (i = 0; i < ug_info->bdRingLenRx[j]; i++) {
-                        BD_STATUS_AND_LENGTH_SET(bd, R_I);
-                        BD_BUFFER_CLEAR(bd);
-                        bd += UCC_GETH_SIZE_OF_BD;
+                        /* set bd status and length */
+                        out_be32((u32 *)bd, R_I);
+                        /* clear bd buffer */
+                        out_be32(&((struct qe_bd *)bd)->buf, 0);
+                        bd += sizeof(struct qe_bd);
                 }
-                bd -= UCC_GETH_SIZE_OF_BD;
-                BD_STATUS_AND_LENGTH_SET(bd, R_W);/* for last BD set Wrap bit */
+                bd -= sizeof(struct qe_bd);
+                /* set bd status and length */
+                out_be32((u32 *)bd, R_W); /* for last BD set Wrap bit */
         }
 
         /*
@@ -3003,7 +2991,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth)
         /* Tx global PRAM */
         /* Allocate global tx parameter RAM page */
         ugeth->tx_glbl_pram_offset =
-            qe_muram_alloc(sizeof(ucc_geth_tx_global_pram_t),
+            qe_muram_alloc(sizeof(struct ucc_geth_tx_global_pram),
                            UCC_GETH_TX_GLOBAL_PRAM_ALIGNMENT);
         if (IS_MURAM_ERR(ugeth->tx_glbl_pram_offset)) {
                 ugeth_err
@@ -3013,10 +3001,10 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth)
                 return -ENOMEM;
         }
         ugeth->p_tx_glbl_pram =
-            (ucc_geth_tx_global_pram_t *) qe_muram_addr(ugeth->
+            (struct ucc_geth_tx_global_pram *) qe_muram_addr(ugeth->
                                                         tx_glbl_pram_offset);
         /* Zero out p_tx_glbl_pram */
-        memset(ugeth->p_tx_glbl_pram, 0, sizeof(ucc_geth_tx_global_pram_t));
+        memset(ugeth->p_tx_glbl_pram, 0, sizeof(struct ucc_geth_tx_global_pram));
 
         /* Fill global PRAM */
 
@@ -3024,7 +3012,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth)
         /* Size varies with number of Tx threads */
         ugeth->thread_dat_tx_offset =
             qe_muram_alloc(numThreadsTxNumerical *
-                           sizeof(ucc_geth_thread_data_tx_t) +
+                           sizeof(struct ucc_geth_thread_data_tx) +
                            32 * (numThreadsTxNumerical == 1),
                            UCC_GETH_THREAD_DATA_ALIGNMENT);
         if (IS_MURAM_ERR(ugeth->thread_dat_tx_offset)) {
@@ -3036,7 +3024,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth)
         }
 
         ugeth->p_thread_data_tx =
-            (ucc_geth_thread_data_tx_t *) qe_muram_addr(ugeth->
+            (struct ucc_geth_thread_data_tx *) qe_muram_addr(ugeth->
                                                         thread_dat_tx_offset);
         out_be32(&ugeth->p_tx_glbl_pram->tqptr, ugeth->thread_dat_tx_offset);
 
@@ -3053,7 +3041,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth)
         /* Size varies with number of Tx queues */
         ugeth->send_q_mem_reg_offset =
             qe_muram_alloc(ug_info->numQueuesTx *
-                           sizeof(ucc_geth_send_queue_qd_t),
+                           sizeof(struct ucc_geth_send_queue_qd),
                            UCC_GETH_SEND_QUEUE_QUEUE_DESCRIPTOR_ALIGNMENT);
         if (IS_MURAM_ERR(ugeth->send_q_mem_reg_offset)) {
                 ugeth_err
@@ -3064,7 +3052,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth)
         }
 
         ugeth->p_send_q_mem_reg =
-            (ucc_geth_send_queue_mem_region_t *) qe_muram_addr(ugeth->
+            (struct ucc_geth_send_queue_mem_region *) qe_muram_addr(ugeth->
                         send_q_mem_reg_offset);
         out_be32(&ugeth->p_tx_glbl_pram->sqptr, ugeth->send_q_mem_reg_offset);
 
@@ -3073,7 +3061,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth)
         for (i = 0; i < ug_info->numQueuesTx; i++) {
                 endOfRing =
                     ugeth->p_tx_bd_ring[i] + (ug_info->bdRingLenTx[i] -
-                                              1) * UCC_GETH_SIZE_OF_BD;
+                                              1) * sizeof(struct qe_bd);
                 if (ugeth->ug_info->uf_info.bd_mem_part == MEM_PART_SYSTEM) {
                         out_be32(&ugeth->p_send_q_mem_reg->sqqd[i].bd_ring_base,
                                  (u32) virt_to_phys(ugeth->p_tx_bd_ring[i]));
@@ -3096,7 +3084,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth)
         if (ug_info->numQueuesTx > 1) {
         /* scheduler exists only if more than 1 tx queue */
                 ugeth->scheduler_offset =
-                    qe_muram_alloc(sizeof(ucc_geth_scheduler_t),
+                    qe_muram_alloc(sizeof(struct ucc_geth_scheduler),
                                    UCC_GETH_SCHEDULER_ALIGNMENT);
                 if (IS_MURAM_ERR(ugeth->scheduler_offset)) {
                         ugeth_err
@@ -3107,12 +3095,12 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth)
                 }
 
                 ugeth->p_scheduler =
-                    (ucc_geth_scheduler_t *) qe_muram_addr(ugeth->
+                    (struct ucc_geth_scheduler *) qe_muram_addr(ugeth->
                                                            scheduler_offset);
                 out_be32(&ugeth->p_tx_glbl_pram->schedulerbasepointer,
                          ugeth->scheduler_offset);
                 /* Zero out p_scheduler */
-                memset(ugeth->p_scheduler, 0, sizeof(ucc_geth_scheduler_t));
+                memset(ugeth->p_scheduler, 0, sizeof(struct ucc_geth_scheduler));
 
                 /* Set values in scheduler */
                 out_be32(&ugeth->p_scheduler->mblinterval,
@@ -3144,7 +3132,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth)
             statisticsMode & UCC_GETH_STATISTICS_GATHERING_MODE_FIRMWARE_TX) {
                 ugeth->tx_fw_statistics_pram_offset =
                     qe_muram_alloc(sizeof
-                                   (ucc_geth_tx_firmware_statistics_pram_t),
+                                   (struct ucc_geth_tx_firmware_statistics_pram),
                                    UCC_GETH_TX_STATISTICS_ALIGNMENT);
                 if (IS_MURAM_ERR(ugeth->tx_fw_statistics_pram_offset)) {
                         ugeth_err
@@ -3154,11 +3142,11 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth)
                         return -ENOMEM;
                 }
                 ugeth->p_tx_fw_statistics_pram =
-                    (ucc_geth_tx_firmware_statistics_pram_t *)
+                    (struct ucc_geth_tx_firmware_statistics_pram *)
                     qe_muram_addr(ugeth->tx_fw_statistics_pram_offset);
                 /* Zero out p_tx_fw_statistics_pram */
                 memset(ugeth->p_tx_fw_statistics_pram,
-                       0, sizeof(ucc_geth_tx_firmware_statistics_pram_t));
+                       0, sizeof(struct ucc_geth_tx_firmware_statistics_pram));
         }
 
         /* temoder */
@@ -3183,7 +3171,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth)
         /* Rx global PRAM */
         /* Allocate global rx parameter RAM page */
         ugeth->rx_glbl_pram_offset =
-            qe_muram_alloc(sizeof(ucc_geth_rx_global_pram_t),
+            qe_muram_alloc(sizeof(struct ucc_geth_rx_global_pram),
                            UCC_GETH_RX_GLOBAL_PRAM_ALIGNMENT);
         if (IS_MURAM_ERR(ugeth->rx_glbl_pram_offset)) {
                 ugeth_err
@@ -3193,10 +3181,10 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth)
                 return -ENOMEM;
         }
         ugeth->p_rx_glbl_pram =
-            (ucc_geth_rx_global_pram_t *) qe_muram_addr(ugeth->
+            (struct ucc_geth_rx_global_pram *) qe_muram_addr(ugeth->
                                                         rx_glbl_pram_offset);
         /* Zero out p_rx_glbl_pram */
-        memset(ugeth->p_rx_glbl_pram, 0, sizeof(ucc_geth_rx_global_pram_t));
+        memset(ugeth->p_rx_glbl_pram, 0, sizeof(struct ucc_geth_rx_global_pram));
 
         /* Fill global PRAM */
 
@@ -3204,7 +3192,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth)
         /* Size varies with number of Rx threads */
         ugeth->thread_dat_rx_offset =
             qe_muram_alloc(numThreadsRxNumerical *
-                           sizeof(ucc_geth_thread_data_rx_t),
+                           sizeof(struct ucc_geth_thread_data_rx),
                            UCC_GETH_THREAD_DATA_ALIGNMENT);
         if (IS_MURAM_ERR(ugeth->thread_dat_rx_offset)) {
                 ugeth_err
@@ -3215,7 +3203,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth)
         }
 
         ugeth->p_thread_data_rx =
-            (ucc_geth_thread_data_rx_t *) qe_muram_addr(ugeth->
+            (struct ucc_geth_thread_data_rx *) qe_muram_addr(ugeth->
                                                         thread_dat_rx_offset);
         out_be32(&ugeth->p_rx_glbl_pram->rqptr, ugeth->thread_dat_rx_offset);
 
@@ -3227,7 +3215,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth)
             statisticsMode & UCC_GETH_STATISTICS_GATHERING_MODE_FIRMWARE_RX) {
                 ugeth->rx_fw_statistics_pram_offset =
                     qe_muram_alloc(sizeof
-                                   (ucc_geth_rx_firmware_statistics_pram_t),
+                                   (struct ucc_geth_rx_firmware_statistics_pram),
                                    UCC_GETH_RX_STATISTICS_ALIGNMENT);
                 if (IS_MURAM_ERR(ugeth->rx_fw_statistics_pram_offset)) {
                         ugeth_err
@@ -3237,11 +3225,11 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth)
                         return -ENOMEM;
                 }
                 ugeth->p_rx_fw_statistics_pram =
-                    (ucc_geth_rx_firmware_statistics_pram_t *)
+                    (struct ucc_geth_rx_firmware_statistics_pram *)
                     qe_muram_addr(ugeth->rx_fw_statistics_pram_offset);
                 /* Zero out p_rx_fw_statistics_pram */
                 memset(ugeth->p_rx_fw_statistics_pram, 0,
-                       sizeof(ucc_geth_rx_firmware_statistics_pram_t));
+                       sizeof(struct ucc_geth_rx_firmware_statistics_pram));
         }
 
         /* intCoalescingPtr */
@@ -3249,7 +3237,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth)
         /* Size varies with number of Rx queues */
         ugeth->rx_irq_coalescing_tbl_offset =
             qe_muram_alloc(ug_info->numQueuesRx *
-                           sizeof(ucc_geth_rx_interrupt_coalescing_entry_t),
+                           sizeof(struct ucc_geth_rx_interrupt_coalescing_entry),
                            UCC_GETH_RX_INTERRUPT_COALESCING_ALIGNMENT);
         if (IS_MURAM_ERR(ugeth->rx_irq_coalescing_tbl_offset)) {
                 ugeth_err
@@ -3260,7 +3248,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth)
         }
 
         ugeth->p_rx_irq_coalescing_tbl =
-            (ucc_geth_rx_interrupt_coalescing_table_t *)
+            (struct ucc_geth_rx_interrupt_coalescing_table *)
             qe_muram_addr(ugeth->rx_irq_coalescing_tbl_offset);
         out_be32(&ugeth->p_rx_glbl_pram->intcoalescingptr,
                  ugeth->rx_irq_coalescing_tbl_offset);
@@ -3300,7 +3288,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth)
                 l3qt = 0;
                 for (i = 0; i < 8; i++)
                         l3qt |= (ug_info->l3qt[j + i] << (28 - 4 * i));
-                out_be32(&ugeth->p_rx_glbl_pram->l3qt[j], l3qt);
+                out_be32(&ugeth->p_rx_glbl_pram->l3qt[j/8], l3qt);
         }
 
         /* vlantype */
@@ -3316,8 +3304,8 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth)
         /* Size varies with number of Rx queues */
         ugeth->rx_bd_qs_tbl_offset =
             qe_muram_alloc(ug_info->numQueuesRx *
-                           (sizeof(ucc_geth_rx_bd_queues_entry_t) +
-                            sizeof(ucc_geth_rx_prefetched_bds_t)),
+                           (sizeof(struct ucc_geth_rx_bd_queues_entry) +
+                            sizeof(struct ucc_geth_rx_prefetched_bds)),
                            UCC_GETH_RX_BD_QUEUES_ALIGNMENT);
         if (IS_MURAM_ERR(ugeth->rx_bd_qs_tbl_offset)) {
                 ugeth_err
@@ -3328,14 +3316,14 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth)
         }
 
         ugeth->p_rx_bd_qs_tbl =
-            (ucc_geth_rx_bd_queues_entry_t *) qe_muram_addr(ugeth->
+            (struct ucc_geth_rx_bd_queues_entry *) qe_muram_addr(ugeth->
                                     rx_bd_qs_tbl_offset);
         out_be32(&ugeth->p_rx_glbl_pram->rbdqptr, ugeth->rx_bd_qs_tbl_offset);
         /* Zero out p_rx_bd_qs_tbl */
         memset(ugeth->p_rx_bd_qs_tbl,
                0,
-               ug_info->numQueuesRx * (sizeof(ucc_geth_rx_bd_queues_entry_t) +
-                                       sizeof(ucc_geth_rx_prefetched_bds_t)));
+               ug_info->numQueuesRx * (sizeof(struct ucc_geth_rx_bd_queues_entry) +
+                                       sizeof(struct ucc_geth_rx_prefetched_bds)));
 
         /* Setup the table */
         /* Assume BD rings are already established */
@@ -3406,7 +3394,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth)
                 /* Allocate memory for extended filtering Mode Global
                 Parameters */
                 ugeth->exf_glbl_param_offset =
-                    qe_muram_alloc(sizeof(ucc_geth_exf_global_pram_t),
+                    qe_muram_alloc(sizeof(struct ucc_geth_exf_global_pram),
                 UCC_GETH_RX_EXTENDED_FILTERING_GLOBAL_PARAMETERS_ALIGNMENT);
                 if (IS_MURAM_ERR(ugeth->exf_glbl_param_offset)) {
                         ugeth_err
@@ -3417,7 +3405,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth)
                 }
 
                 ugeth->p_exf_glbl_param =
-                    (ucc_geth_exf_global_pram_t *) qe_muram_addr(ugeth->
+                    (struct ucc_geth_exf_global_pram *) qe_muram_addr(ugeth->
                                  exf_glbl_param_offset);
                 out_be32(&ugeth->p_rx_glbl_pram->exfGlobalParam,
                          ugeth->exf_glbl_param_offset);
@@ -3439,7 +3427,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth)
                         INIT_LIST_HEAD(&ugeth->ind_hash_q);
                 }
                 p_82xx_addr_filt =
-                    (ucc_geth_82xx_address_filtering_pram_t *) ugeth->
+                    (struct ucc_geth_82xx_address_filtering_pram *) ugeth->
                     p_rx_glbl_pram->addressfiltering;
 
                 ugeth_82xx_filtering_clear_all_addr_in_hash(ugeth,
@@ -3462,7 +3450,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth)
          * allocated resources can be released when the channel is freed.
          */
         if (!(ugeth->p_init_enet_param_shadow =
-             (ucc_geth_init_pram_t *) kmalloc(sizeof(ucc_geth_init_pram_t),
+             (struct ucc_geth_init_pram *) kmalloc(sizeof(struct ucc_geth_init_pram),
                                               GFP_KERNEL))) {
                 ugeth_err
                     ("%s: Can not allocate memory for"
@@ -3472,7 +3460,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth)
         }
         /* Zero out *p_init_enet_param_shadow */
         memset((char *)ugeth->p_init_enet_param_shadow,
-               0, sizeof(ucc_geth_init_pram_t));
+               0, sizeof(struct ucc_geth_init_pram));
 
         /* Fill shadow InitEnet command parameter structure */
 
@@ -3506,7 +3494,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth)
         }
         ugeth->p_init_enet_param_shadow->largestexternallookupkeysize =
             ug_info->largestexternallookupkeysize;
-        size = sizeof(ucc_geth_thread_rx_pram_t);
+        size = sizeof(struct ucc_geth_thread_rx_pram);
         if (ug_info->rxExtendedFiltering) {
                 size += THREAD_RX_PRAM_ADDITIONAL_FOR_EXTENDED_FILTERING;
                 if (ug_info->largestexternallookupkeysize ==
@@ -3537,7 +3525,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth)
              fill_init_enet_entries(ugeth,
                                     &(ugeth->p_init_enet_param_shadow->
                                       txthread[0]), numThreadsTxNumerical,
-                                    sizeof(ucc_geth_thread_tx_pram_t),
+                                    sizeof(struct ucc_geth_thread_tx_pram),
                                     UCC_GETH_THREAD_TX_PRAM_ALIGNMENT,
                                     ug_info->riscTx, 0)) != 0) {
                 ugeth_err("%s: Can not fill p_init_enet_param_shadow.",
@@ -3557,7 +3545,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth)
         }
 
         /* Allocate InitEnet command parameter structure */
-        init_enet_pram_offset = qe_muram_alloc(sizeof(ucc_geth_init_pram_t), 4);
+        init_enet_pram_offset = qe_muram_alloc(sizeof(struct ucc_geth_init_pram), 4);
         if (IS_MURAM_ERR(init_enet_pram_offset)) {
                 ugeth_err
                     ("%s: Can not allocate DPRAM memory for p_init_enet_pram.",
@@ -3566,7 +3554,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth)
                 return -ENOMEM;
         }
         p_init_enet_pram =
-            (ucc_geth_init_pram_t *) qe_muram_addr(init_enet_pram_offset);
+            (struct ucc_geth_init_pram *) qe_muram_addr(init_enet_pram_offset);
 
         /* Copy shadow InitEnet command parameter structure into PRAM */
         p_init_enet_pram->resinit1 = ugeth->p_init_enet_param_shadow->resinit1;
@@ -3591,7 +3579,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth)
         /* Issue QE command */
         cecr_subblock =
             ucc_fast_get_qe_cr_subblock(ugeth->ug_info->uf_info.ucc_num);
-        qe_issue_cmd(command, cecr_subblock, (u8) QE_CR_PROTOCOL_ETHERNET,
+        qe_issue_cmd(command, cecr_subblock, QE_CR_PROTOCOL_ETHERNET,
                      init_enet_pram_offset);
 
         /* Free InitEnet command parameter */
@@ -3603,7 +3591,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth)
 /* returns a net_device_stats structure pointer */
 static struct net_device_stats *ucc_geth_get_stats(struct net_device *dev)
 {
-        ucc_geth_private_t *ugeth = netdev_priv(dev);
+        struct ucc_geth_private *ugeth = netdev_priv(dev);
 
         return &(ugeth->stats);
 }
@@ -3614,7 +3602,7 @@ static struct net_device_stats *ucc_geth_get_stats(struct net_device *dev)
  * starting over will fix the problem. */
 static void ucc_geth_timeout(struct net_device *dev)
 {
-        ucc_geth_private_t *ugeth = netdev_priv(dev);
+        struct ucc_geth_private *ugeth = netdev_priv(dev);
 
         ugeth_vdbg("%s: IN", __FUNCTION__);
 
@@ -3634,7 +3622,7 @@ static void ucc_geth_timeout(struct net_device *dev)
 /* It is pointed to by the dev->hard_start_xmit function pointer */
 static int ucc_geth_start_xmit(struct sk_buff *skb, struct net_device *dev)
 {
-        ucc_geth_private_t *ugeth = netdev_priv(dev);
+        struct ucc_geth_private *ugeth = netdev_priv(dev);
         u8 *bd;                 /* BD pointer */
         u32 bd_status;
         u8 txQ = 0;
@@ -3647,7 +3635,7 @@ static int ucc_geth_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
         /* Start from the next BD that should be filled */
         bd = ugeth->txBd[txQ];
-        bd_status = BD_STATUS_AND_LENGTH(bd);
+        bd_status = in_be32((u32 *)bd);
         /* Save the skb pointer so we can free it later */
         ugeth->tx_skbuff[txQ][ugeth->skb_curtx[txQ]] = skb;
 
@@ -3657,20 +3645,21 @@ static int ucc_geth_start_xmit(struct sk_buff *skb, struct net_device *dev)
              1) & TX_RING_MOD_MASK(ugeth->ug_info->bdRingLenTx[txQ]);
 
         /* set up the buffer descriptor */
-        BD_BUFFER_SET(bd,
+        out_be32(&((struct qe_bd *)bd)->buf,
                       dma_map_single(NULL, skb->data, skb->len, DMA_TO_DEVICE));
 
-        //printk(KERN_DEBUG"skb->data is 0x%x\n",skb->data);
+        /* printk(KERN_DEBUG"skb->data is 0x%x\n",skb->data); */
 
         bd_status = (bd_status & T_W) | T_R | T_I | T_L | skb->len;
 
-        BD_STATUS_AND_LENGTH_SET(bd, bd_status);
+        /* set bd status and length */
+        out_be32((u32 *)bd, bd_status);
 
         dev->trans_start = jiffies;
 
         /* Move to next BD in the ring */
         if (!(bd_status & T_W))
-                ugeth->txBd[txQ] = bd + UCC_GETH_SIZE_OF_BD;
+                ugeth->txBd[txQ] = bd + sizeof(struct qe_bd);
         else
                 ugeth->txBd[txQ] = ugeth->p_tx_bd_ring[txQ];
 
@@ -3695,7 +3684,7 @@ static int ucc_geth_start_xmit(struct sk_buff *skb, struct net_device *dev)
         return 0;
 }
 
-static int ucc_geth_rx(ucc_geth_private_t *ugeth, u8 rxQ, int rx_work_limit)
+static int ucc_geth_rx(struct ucc_geth_private *ugeth, u8 rxQ, int rx_work_limit)
 {
         struct sk_buff *skb;
         u8 *bd;
@@ -3709,11 +3698,11 @@ static int ucc_geth_rx(ucc_geth_private_t *ugeth, u8 rxQ, int rx_work_limit)
         /* collect received buffers */
         bd = ugeth->rxBd[rxQ];
 
-        bd_status = BD_STATUS_AND_LENGTH(bd);
+        bd_status = in_be32((u32 *)bd);
 
         /* while there are received buffers and BD is full (~R_E) */
         while (!((bd_status & (R_E)) || (--rx_work_limit < 0))) {
-                bdBuffer = (u8 *) BD_BUFFER(bd);
+                bdBuffer = (u8 *) in_be32(&((struct qe_bd *)bd)->buf);
                 length = (u16) ((bd_status & BD_LENGTH_MASK) - 4);
                 skb = ugeth->rx_skbuff[rxQ][ugeth->skb_currx[rxQ]];
 
@@ -3768,9 +3757,9 @@ static int ucc_geth_rx(ucc_geth_private_t *ugeth, u8 rxQ, int rx_work_limit)
                 if (bd_status & R_W)
                         bd = ugeth->p_rx_bd_ring[rxQ];
                 else
-                        bd += UCC_GETH_SIZE_OF_BD;
+                        bd += sizeof(struct qe_bd);
 
-                bd_status = BD_STATUS_AND_LENGTH(bd);
+                bd_status = in_be32((u32 *)bd);
         }
 
         ugeth->rxBd[rxQ] = bd;
@@ -3781,12 +3770,12 @@ static int ucc_geth_rx(ucc_geth_private_t *ugeth, u8 rxQ, int rx_work_limit)
 static int ucc_geth_tx(struct net_device *dev, u8 txQ)
 {
         /* Start from the next BD that should be filled */
-        ucc_geth_private_t *ugeth = netdev_priv(dev);
+        struct ucc_geth_private *ugeth = netdev_priv(dev);
         u8 *bd;                 /* BD pointer */
         u32 bd_status;
 
         bd = ugeth->confBd[txQ];
-        bd_status = BD_STATUS_AND_LENGTH(bd);
+        bd_status = in_be32((u32 *)bd);
 
         /* Normal processing. */
         while ((bd_status & T_R) == 0) {
@@ -3813,7 +3802,7 @@ static int ucc_geth_tx(struct net_device *dev, u8 txQ)
 
                 /* Advance the confirmation BD pointer */
                 if (!(bd_status & T_W))
-                        ugeth->confBd[txQ] += UCC_GETH_SIZE_OF_BD;
+                        ugeth->confBd[txQ] += sizeof(struct qe_bd);
                 else
                         ugeth->confBd[txQ] = ugeth->p_tx_bd_ring[txQ];
         }
@@ -3823,7 +3812,7 @@ static int ucc_geth_tx(struct net_device *dev, u8 txQ)
 #ifdef CONFIG_UGETH_NAPI
 static int ucc_geth_poll(struct net_device *dev, int *budget)
 {
-        ucc_geth_private_t *ugeth = netdev_priv(dev);
+        struct ucc_geth_private *ugeth = netdev_priv(dev);
         int howmany;
         int rx_work_limit = *budget;
         u8 rxQ = 0;
@@ -3847,9 +3836,9 @@ static int ucc_geth_poll(struct net_device *dev, int *budget)
 static irqreturn_t ucc_geth_irq_handler(int irq, void *info)
 {
         struct net_device *dev = (struct net_device *)info;
-        ucc_geth_private_t *ugeth = netdev_priv(dev);
-        ucc_fast_private_t *uccf;
-        ucc_geth_info_t *ug_info;
+        struct ucc_geth_private *ugeth = netdev_priv(dev);
+        struct ucc_fast_private *uccf;
+        struct ucc_geth_info *ug_info;
         register u32 ucce = 0;
         register u32 bit_mask = UCCE_RXBF_SINGLE_MASK;
         register u32 tx_mask = UCCE_TXBF_SINGLE_MASK;
@@ -3912,7 +3901,7 @@ static irqreturn_t ucc_geth_irq_handler(int irq, void *info)
 static irqreturn_t phy_interrupt(int irq, void *dev_id)
 {
         struct net_device *dev = (struct net_device *)dev_id;
-        ucc_geth_private_t *ugeth = netdev_priv(dev);
+        struct ucc_geth_private *ugeth = netdev_priv(dev);
 
         ugeth_vdbg("%s: IN", __FUNCTION__);
 
@@ -3932,8 +3921,8 @@ static irqreturn_t phy_interrupt(int irq, void *dev_id)
 static void ugeth_phy_change(void *data)
 {
         struct net_device *dev = (struct net_device *)data;
-        ucc_geth_private_t *ugeth = netdev_priv(dev);
-        ucc_geth_t *ug_regs;
+        struct ucc_geth_private *ugeth = netdev_priv(dev);
+        struct ucc_geth *ug_regs;
         int result = 0;
 
         ugeth_vdbg("%s: IN", __FUNCTION__);
@@ -3963,7 +3952,7 @@ static void ugeth_phy_change(void *data)
 static void ugeth_phy_timer(unsigned long data)
 {
         struct net_device *dev = (struct net_device *)data;
-        ucc_geth_private_t *ugeth = netdev_priv(dev);
+        struct ucc_geth_private *ugeth = netdev_priv(dev);
 
         schedule_work(&ugeth->tq);
 
@@ -3979,7 +3968,7 @@ static void ugeth_phy_timer(unsigned long data)
 static void ugeth_phy_startup_timer(unsigned long data)
 {
         struct ugeth_mii_info *mii_info = (struct ugeth_mii_info *)data;
-        ucc_geth_private_t *ugeth = netdev_priv(mii_info->dev);
+        struct ucc_geth_private *ugeth = netdev_priv(mii_info->dev);
         static int secondary = UGETH_AN_TIMEOUT;
         int result;
 
@@ -4034,7 +4023,7 @@ static void ugeth_phy_startup_timer(unsigned long data)
 /* Returns 0 for success. */
 static int ucc_geth_open(struct net_device *dev)
 {
-        ucc_geth_private_t *ugeth = netdev_priv(dev);
+        struct ucc_geth_private *ugeth = netdev_priv(dev);
         int err;
 
         ugeth_vdbg("%s: IN", __FUNCTION__);
@@ -4111,7 +4100,7 @@ static int ucc_geth_open(struct net_device *dev)
 /* Stops the kernel queue, and halts the controller */
 static int ucc_geth_close(struct net_device *dev)
 {
-        ucc_geth_private_t *ugeth = netdev_priv(dev);
+        struct ucc_geth_private *ugeth = netdev_priv(dev);
 
         ugeth_vdbg("%s: IN", __FUNCTION__);
 
@@ -4130,30 +4119,53 @@ static int ucc_geth_close(struct net_device *dev)
 
 const struct ethtool_ops ucc_geth_ethtool_ops = { };
 
-static int ucc_geth_probe(struct device *device)
+static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *match)
 {
-        struct platform_device *pdev = to_platform_device(device);
-        struct ucc_geth_platform_data *ugeth_pdata;
+        struct device *device = &ofdev->dev;
+        struct device_node *np = ofdev->node;
         struct net_device *dev = NULL;
         struct ucc_geth_private *ugeth = NULL;
         struct ucc_geth_info *ug_info;
-        int err;
+        struct resource res;
+        struct device_node *phy;
+        int err, ucc_num, phy_interface;
         static int mii_mng_configured = 0;
+        const phandle *ph;
+        const unsigned int *prop;
 
         ugeth_vdbg("%s: IN", __FUNCTION__);
 
-        ugeth_pdata = (struct ucc_geth_platform_data *)pdev->dev.platform_data;
+        prop = get_property(np, "device-id", NULL);
+        ucc_num = *prop - 1;
+        if ((ucc_num < 0) || (ucc_num > 7))
+                return -ENODEV;
+
+        ug_info = &ugeth_info[ucc_num];
+        ug_info->uf_info.ucc_num = ucc_num;
+        prop = get_property(np, "rx-clock", NULL);
+        ug_info->uf_info.rx_clock = *prop;
+        prop = get_property(np, "tx-clock", NULL);
+        ug_info->uf_info.tx_clock = *prop;
+        err = of_address_to_resource(np, 0, &res);
+        if (err)
+                return -EINVAL;
+
+        ug_info->uf_info.regs = res.start;
+        ug_info->uf_info.irq = irq_of_parse_and_map(np, 0);
+
+        ph = get_property(np, "phy-handle", NULL);
+        phy = of_find_node_by_phandle(*ph);
 
-        ug_info = &ugeth_info[pdev->id];
-        ug_info->uf_info.ucc_num = pdev->id;
-        ug_info->uf_info.rx_clock = ugeth_pdata->rx_clock;
-        ug_info->uf_info.tx_clock = ugeth_pdata->tx_clock;
-        ug_info->uf_info.regs = ugeth_pdata->phy_reg_addr;
-        ug_info->uf_info.irq = platform_get_irq(pdev, 0);
-        ug_info->phy_address = ugeth_pdata->phy_id;
-        ug_info->enet_interface = ugeth_pdata->phy_interface;
-        ug_info->board_flags = ugeth_pdata->board_flags;
-        ug_info->phy_interrupt = ugeth_pdata->phy_interrupt;
+        if (phy == NULL)
+                return -ENODEV;
+
+        prop = get_property(phy, "reg", NULL);
+        ug_info->phy_address = *prop;
+        prop = get_property(phy, "interface", NULL);
+        ug_info->enet_interface = *prop;
+        ug_info->phy_interrupt = irq_of_parse_and_map(phy, 0);
+        ug_info->board_flags = (ug_info->phy_interrupt == NO_IRQ)?
+                        0:FSL_UGETH_BRD_HAS_PHY_INTR;
 
         printk(KERN_INFO "ucc_geth: UCC%1d at 0x%8x (irq = %d) \n",
                 ug_info->uf_info.ucc_num + 1, ug_info->uf_info.regs,
@@ -4161,12 +4173,44 @@ static int ucc_geth_probe(struct device *device)
 
         if (ug_info == NULL) {
                 ugeth_err("%s: [%d] Missing additional data!", __FUNCTION__,
-                          pdev->id);
+                          ucc_num);
                 return -ENODEV;
         }
 
+        /* FIXME: Work around for early chip rev.               */
+        /* There's a bug in initial chip rev(s) in the RGMII ac */
+        /* timing.                                              */
+        /* The following compensates by writing to the reserved */
+        /* QE Port Output Hold Registers (CPOH1?).              */
+        prop = get_property(phy, "interface", NULL);
+        phy_interface = *prop;
+        if ((phy_interface == ENET_1000_RGMII) ||
+                        (phy_interface == ENET_100_RGMII) ||
+                        (phy_interface == ENET_10_RGMII)) {
+                struct device_node *soc;
+                phys_addr_t immrbase = -1;
+                u32 *tmp_reg;
+                u32 tmp_val;
+
+                soc = of_find_node_by_type(NULL, "soc");
+                if (soc) {
+                        unsigned int size;
+                        const void *prop = get_property(soc, "reg", &size);
+                        immrbase = of_translate_address(soc, prop);
+                        of_node_put(soc);
+                };
+
+                tmp_reg = (u32 *) ioremap(immrbase + 0x14A8, 0x4);
+                tmp_val = in_be32(tmp_reg);
+                if (ucc_num == 1)
+                        out_be32(tmp_reg, tmp_val | 0x00003000);
+                else if (ucc_num == 2)
+                        out_be32(tmp_reg, tmp_val | 0x0c000000);
+                iounmap(tmp_reg);
+        }
+
         if (!mii_mng_configured) {
-                ucc_set_qe_mux_mii_mng(ug_info->uf_info.ucc_num);
+                ucc_set_qe_mux_mii_mng(ucc_num);
                 mii_mng_configured = 1;
         }
 
@@ -4213,13 +4257,14 @@ static int ucc_geth_probe(struct device *device)
 
         ugeth->ug_info = ug_info;
         ugeth->dev = dev;
-        memcpy(dev->dev_addr, ugeth_pdata->mac_addr, 6);
+        memcpy(dev->dev_addr, get_property(np, "mac-address", NULL), 6);
 
         return 0;
 }
 
-static int ucc_geth_remove(struct device *device)
+static int ucc_geth_remove(struct of_device* ofdev)
 {
+        struct device *device = &ofdev->dev;
         struct net_device *dev = dev_get_drvdata(device);
         struct ucc_geth_private *ugeth = netdev_priv(dev);
 
@@ -4230,28 +4275,38 @@ static int ucc_geth_remove(struct device *device)
         return 0;
 }
 
-/* Structure for a device driver */
-static struct device_driver ucc_geth_driver = {
-        .name = DRV_NAME,
-        .bus = &platform_bus_type,
-        .probe = ucc_geth_probe,
-        .remove = ucc_geth_remove,
+static struct of_device_id ucc_geth_match[] = {
+        {
+                .type = "network",
+                .compatible = "ucc_geth",
+        },
+        {},
+};
+
+MODULE_DEVICE_TABLE(of, ucc_geth_match);
+
+static struct of_platform_driver ucc_geth_driver = {
+        .name           = DRV_NAME,
+        .match_table    = ucc_geth_match,
+        .probe          = ucc_geth_probe,
+        .remove         = ucc_geth_remove,
 };
 
 static int __init ucc_geth_init(void)
 {
         int i;
+
         printk(KERN_INFO "ucc_geth: " DRV_DESC "\n");
         for (i = 0; i < 8; i++)
                 memcpy(&(ugeth_info[i]), &ugeth_primary_info,
                        sizeof(ugeth_primary_info));
 
-        return driver_register(&ucc_geth_driver);
+        return of_register_driver(&ucc_geth_driver);
 }
 
 static void __exit ucc_geth_exit(void)
 {
-        driver_unregister(&ucc_geth_driver);
+        of_unregister_driver(&ucc_geth_driver);
 }
 
 module_init(ucc_geth_init);
diff --git a/drivers/net/ucc_geth.h b/drivers/net/ucc_geth.h
index 005965f5dd9b..a66561253593 100644
--- a/drivers/net/ucc_geth.h
+++ b/drivers/net/ucc_geth.h
@@ -36,24 +36,24 @@
 #define ENET_INIT_PARAM_MAX_ENTRIES_RX  9
 #define ENET_INIT_PARAM_MAX_ENTRIES_TX  8
 
-typedef struct ucc_mii_mng {
+struct ucc_mii_mng {
         u32 miimcfg;            /* MII management configuration reg */
         u32 miimcom;            /* MII management command reg */
         u32 miimadd;            /* MII management address reg */
         u32 miimcon;            /* MII management control reg */
         u32 miimstat;           /* MII management status reg */
         u32 miimind;            /* MII management indication reg */
-} __attribute__ ((packed)) ucc_mii_mng_t;
+} __attribute__ ((packed));
 
-typedef struct ucc_geth {
-        ucc_fast_t uccf;
+struct ucc_geth {
+        struct ucc_fast uccf;
 
         u32 maccfg1;            /* mac configuration reg. 1 */
         u32 maccfg2;            /* mac configuration reg. 2 */
         u32 ipgifg;             /* interframe gap reg.  */
         u32 hafdup;             /* half-duplex reg.  */
         u8 res1[0x10];
-        ucc_mii_mng_t miimng;   /* MII management structure */
+        struct ucc_mii_mng miimng;      /* MII management structure */
         u32 ifctl;              /* interface control reg */
         u32 ifstat;             /* interface statux reg */
         u32 macstnaddr1;        /* mac station address part 1 reg */
@@ -111,7 +111,7 @@ typedef struct ucc_geth {
         u32 scar;               /* Statistics carry register */
         u32 scam;               /* Statistics caryy mask register */
         u8 res5[0x200 - 0x1c4];
-} __attribute__ ((packed)) ucc_geth_t;
+} __attribute__ ((packed));
 
 /* UCC GETH TEMODR Register */
 #define TEMODER_TX_RMON_STATISTICS_ENABLE       0x0100  /* enable Tx statistics
@@ -508,39 +508,39 @@ typedef struct ucc_geth {
 /* UCC GETH UDSR (Data Synchronization Register) */
 #define UDSR_MAGIC                              0x067E
 
-typedef struct ucc_geth_thread_data_tx {
+struct ucc_geth_thread_data_tx {
         u8 res0[104];
-} __attribute__ ((packed)) ucc_geth_thread_data_tx_t;
+} __attribute__ ((packed));
 
-typedef struct ucc_geth_thread_data_rx {
+struct ucc_geth_thread_data_rx {
         u8 res0[40];
-} __attribute__ ((packed)) ucc_geth_thread_data_rx_t;
+} __attribute__ ((packed));
 
 /* Send Queue Queue-Descriptor */
-typedef struct ucc_geth_send_queue_qd {
+struct ucc_geth_send_queue_qd {
         u32 bd_ring_base;       /* pointer to BD ring base address */
         u8 res0[0x8];
         u32 last_bd_completed_address;/* initialize to last entry in BD ring */
         u8 res1[0x30];
-} __attribute__ ((packed)) ucc_geth_send_queue_qd_t;
+} __attribute__ ((packed));
 
-typedef struct ucc_geth_send_queue_mem_region {
-        ucc_geth_send_queue_qd_t sqqd[NUM_TX_QUEUES];
-} __attribute__ ((packed)) ucc_geth_send_queue_mem_region_t;
+struct ucc_geth_send_queue_mem_region {
+        struct ucc_geth_send_queue_qd sqqd[NUM_TX_QUEUES];
+} __attribute__ ((packed));
 
-typedef struct ucc_geth_thread_tx_pram {
+struct ucc_geth_thread_tx_pram {
         u8 res0[64];
-} __attribute__ ((packed)) ucc_geth_thread_tx_pram_t;
+} __attribute__ ((packed));
 
-typedef struct ucc_geth_thread_rx_pram {
+struct ucc_geth_thread_rx_pram {
         u8 res0[128];
-} __attribute__ ((packed)) ucc_geth_thread_rx_pram_t;
+} __attribute__ ((packed));
 
 #define THREAD_RX_PRAM_ADDITIONAL_FOR_EXTENDED_FILTERING        64
 #define THREAD_RX_PRAM_ADDITIONAL_FOR_EXTENDED_FILTERING_8      64
 #define THREAD_RX_PRAM_ADDITIONAL_FOR_EXTENDED_FILTERING_16     96
 
-typedef struct ucc_geth_scheduler {
+struct ucc_geth_scheduler {
         u16 cpucount0;          /* CPU packet counter */
         u16 cpucount1;          /* CPU packet counter */
         u16 cecount0;           /* QE packet counter */
@@ -574,9 +574,9 @@ typedef struct ucc_geth_scheduler {
                                       /**< weight factor for queues   */
         u32 minw;               /* temporary variable handled by QE */
         u8 res1[0x70 - 0x64];
-} __attribute__ ((packed)) ucc_geth_scheduler_t;
+} __attribute__ ((packed));
 
-typedef struct ucc_geth_tx_firmware_statistics_pram {
+struct ucc_geth_tx_firmware_statistics_pram {
         u32 sicoltx;            /* single collision */
         u32 mulcoltx;           /* multiple collision */
         u32 latecoltxfr;        /* late collision */
@@ -596,9 +596,9 @@ typedef struct ucc_geth_tx_firmware_statistics_pram {
                                    and 1518 octets */
         u32 txpktsjumbo;        /* total packets (including bad) between 1024
                                    and MAXLength octets */
-} __attribute__ ((packed)) ucc_geth_tx_firmware_statistics_pram_t;
+} __attribute__ ((packed));
 
-typedef struct ucc_geth_rx_firmware_statistics_pram {
+struct ucc_geth_rx_firmware_statistics_pram {
         u32 frrxfcser;          /* frames with crc error */
         u32 fraligner;          /* frames with alignment error */
         u32 inrangelenrxer;     /* in range length error */
@@ -630,33 +630,33 @@ typedef struct ucc_geth_rx_firmware_statistics_pram {
                                    replaced */
         u32 insertvlan;         /* total frames that had their VLAN tag
                                    inserted */
-} __attribute__ ((packed)) ucc_geth_rx_firmware_statistics_pram_t;
+} __attribute__ ((packed));
 
-typedef struct ucc_geth_rx_interrupt_coalescing_entry {
+struct ucc_geth_rx_interrupt_coalescing_entry {
         u32 interruptcoalescingmaxvalue;        /* interrupt coalescing max
                                                    value */
         u32 interruptcoalescingcounter; /* interrupt coalescing counter,
                                            initialize to
                                            interruptcoalescingmaxvalue */
-} __attribute__ ((packed)) ucc_geth_rx_interrupt_coalescing_entry_t;
+} __attribute__ ((packed));
 
-typedef struct ucc_geth_rx_interrupt_coalescing_table {
-        ucc_geth_rx_interrupt_coalescing_entry_t coalescingentry[NUM_RX_QUEUES];
+struct ucc_geth_rx_interrupt_coalescing_table {
+        struct ucc_geth_rx_interrupt_coalescing_entry coalescingentry[NUM_RX_QUEUES];
                                        /**< interrupt coalescing entry */
-} __attribute__ ((packed)) ucc_geth_rx_interrupt_coalescing_table_t;
+} __attribute__ ((packed));
 
-typedef struct ucc_geth_rx_prefetched_bds {
-        qe_bd_t bd[NUM_BDS_IN_PREFETCHED_BDS];  /* prefetched bd */
-} __attribute__ ((packed)) ucc_geth_rx_prefetched_bds_t;
+struct ucc_geth_rx_prefetched_bds {
+        struct qe_bd bd[NUM_BDS_IN_PREFETCHED_BDS];     /* prefetched bd */
+} __attribute__ ((packed));
 
-typedef struct ucc_geth_rx_bd_queues_entry {
+struct ucc_geth_rx_bd_queues_entry {
         u32 bdbaseptr;          /* BD base pointer */
         u32 bdptr;              /* BD pointer */
         u32 externalbdbaseptr;  /* external BD base pointer */
         u32 externalbdptr;      /* external BD pointer */
-} __attribute__ ((packed)) ucc_geth_rx_bd_queues_entry_t;
+} __attribute__ ((packed));
 
-typedef struct ucc_geth_tx_global_pram {
+struct ucc_geth_tx_global_pram {
         u16 temoder;
         u8 res0[0x38 - 0x02];
         u32 sqptr;              /* a base pointer to send queue memory region */
@@ -670,15 +670,15 @@ typedef struct ucc_geth_tx_global_pram {
         u32 tqptr;              /* a base pointer to the Tx Queues Memory
                                    Region */
         u8 res2[0x80 - 0x74];
-} __attribute__ ((packed)) ucc_geth_tx_global_pram_t;
+} __attribute__ ((packed));
 
 /* structure representing Extended Filtering Global Parameters in PRAM */
-typedef struct ucc_geth_exf_global_pram {
+struct ucc_geth_exf_global_pram {
         u32 l2pcdptr;           /* individual address filter, high */
         u8 res0[0x10 - 0x04];
-} __attribute__ ((packed)) ucc_geth_exf_global_pram_t;
+} __attribute__ ((packed));
 
-typedef struct ucc_geth_rx_global_pram {
+struct ucc_geth_rx_global_pram {
         u32 remoder;            /* ethernet mode reg. */
         u32 rqptr;              /* base pointer to the Rx Queues Memory Region*/
         u32 res0[0x1];
@@ -710,12 +710,12 @@ typedef struct ucc_geth_rx_global_pram {
         u32 exfGlobalParam;     /* base address for extended filtering global
                                    parameters */
         u8 res6[0x100 - 0xC4];  /* Initialize to zero */
-} __attribute__ ((packed)) ucc_geth_rx_global_pram_t;
+} __attribute__ ((packed));
 
 #define GRACEFUL_STOP_ACKNOWLEDGE_RX            0x01
 
 /* structure representing InitEnet command */
-typedef struct ucc_geth_init_pram {
+struct ucc_geth_init_pram {
         u8 resinit1;
         u8 resinit2;
         u8 resinit3;
@@ -729,7 +729,7 @@ typedef struct ucc_geth_init_pram {
         u32 txglobal;           /* tx global */
         u32 txthread[ENET_INIT_PARAM_MAX_ENTRIES_TX];   /* tx threads */
         u8 res3[0x1];
-} __attribute__ ((packed)) ucc_geth_init_pram_t;
+} __attribute__ ((packed));
 
 #define ENET_INIT_PARAM_RGF_SHIFT               (32 - 4)
 #define ENET_INIT_PARAM_TGF_SHIFT               (32 - 8)
@@ -746,27 +746,27 @@ typedef struct ucc_geth_init_pram {
 #define ENET_INIT_PARAM_MAGIC_RES_INIT5         0x0400
 
 /* structure representing 82xx Address Filtering Enet Address in PRAM */
-typedef struct ucc_geth_82xx_enet_address {
+struct ucc_geth_82xx_enet_address {
         u8 res1[0x2];
         u16 h;                  /* address (MSB) */
         u16 m;                  /* address */
         u16 l;                  /* address (LSB) */
-} __attribute__ ((packed)) ucc_geth_82xx_enet_address_t;
+} __attribute__ ((packed));
 
 /* structure representing 82xx Address Filtering PRAM */
-typedef struct ucc_geth_82xx_address_filtering_pram {
+struct ucc_geth_82xx_address_filtering_pram {
         u32 iaddr_h;            /* individual address filter, high */
         u32 iaddr_l;            /* individual address filter, low */
         u32 gaddr_h;            /* group address filter, high */
         u32 gaddr_l;            /* group address filter, low */
-        ucc_geth_82xx_enet_address_t taddr;
-        ucc_geth_82xx_enet_address_t paddr[NUM_OF_PADDRS];
+        struct ucc_geth_82xx_enet_address taddr;
+        struct ucc_geth_82xx_enet_address paddr[NUM_OF_PADDRS];
         u8 res0[0x40 - 0x38];
-} __attribute__ ((packed)) ucc_geth_82xx_address_filtering_pram_t;
+} __attribute__ ((packed));
 
 /* GETH Tx firmware statistics structure, used when calling
    UCC_GETH_GetStatistics. */
-typedef struct ucc_geth_tx_firmware_statistics {
+struct ucc_geth_tx_firmware_statistics {
         u32 sicoltx;            /* single collision */
         u32 mulcoltx;           /* multiple collision */
         u32 latecoltxfr;        /* late collision */
@@ -786,11 +786,11 @@ typedef struct ucc_geth_tx_firmware_statistics {
                                    and 1518 octets */
         u32 txpktsjumbo;        /* total packets (including bad) between 1024
                                    and MAXLength octets */
-} __attribute__ ((packed)) ucc_geth_tx_firmware_statistics_t;
+} __attribute__ ((packed));
 
 /* GETH Rx firmware statistics structure, used when calling
    UCC_GETH_GetStatistics. */
-typedef struct ucc_geth_rx_firmware_statistics {
+struct ucc_geth_rx_firmware_statistics {
         u32 frrxfcser;          /* frames with crc error */
         u32 fraligner;          /* frames with alignment error */
         u32 inrangelenrxer;     /* in range length error */
@@ -822,11 +822,11 @@ typedef struct ucc_geth_rx_firmware_statistics {
                                    replaced */
         u32 insertvlan;         /* total frames that had their VLAN tag
                                    inserted */
-} __attribute__ ((packed)) ucc_geth_rx_firmware_statistics_t;
+} __attribute__ ((packed));
 
 /* GETH hardware statistics structure, used when calling
    UCC_GETH_GetStatistics. */
-typedef struct ucc_geth_hardware_statistics {
+struct ucc_geth_hardware_statistics {
         u32 tx64;               /* Total number of frames (including bad
                                    frames) transmitted that were exactly of the
                                    minimal length (64 for un tagged, 68 for
@@ -871,7 +871,7 @@ typedef struct ucc_geth_hardware_statistics {
         u32 rbca;               /* Total number of frames received succesfully
                                    that had destination address equal to the
                                    broadcast address */
-} __attribute__ ((packed)) ucc_geth_hardware_statistics_t;
+} __attribute__ ((packed));
 
 /* UCC GETH Tx errors returned via TxConf callback */
 #define TX_ERRORS_DEF      0x0200
@@ -1013,21 +1013,21 @@ typedef struct ucc_geth_hardware_statistics {
                                 (MIIMCFG_MANAGEMENT_CLOCK_DIVIDE_BY_112)
 
 /* Ethernet speed */
-typedef enum enet_speed {
+enum enet_speed {
         ENET_SPEED_10BT,        /* 10 Base T */
         ENET_SPEED_100BT,       /* 100 Base T */
         ENET_SPEED_1000BT       /* 1000 Base T */
-} enet_speed_e;
+};
 
 /* Ethernet Address Type. */
-typedef enum enet_addr_type {
+enum enet_addr_type {
         ENET_ADDR_TYPE_INDIVIDUAL,
         ENET_ADDR_TYPE_GROUP,
         ENET_ADDR_TYPE_BROADCAST
-} enet_addr_type_e;
+};
 
 /* TBI / MII Set Register */
-typedef enum enet_tbi_mii_reg {
+enum enet_tbi_mii_reg {
         ENET_TBI_MII_CR = 0x00, /* Control (CR ) */
         ENET_TBI_MII_SR = 0x01, /* Status (SR ) */
         ENET_TBI_MII_ANA = 0x04,        /* AN advertisement (ANA ) */
@@ -1040,10 +1040,10 @@ typedef enum enet_tbi_mii_reg {
         ENET_TBI_MII_EXST = 0x0F,       /* Extended status (EXST ) */
         ENET_TBI_MII_JD = 0x10, /* Jitter diagnostics (JD ) */
         ENET_TBI_MII_TBICON = 0x11      /* TBI control (TBICON ) */
-} enet_tbi_mii_reg_e;
+};
 
 /* UCC GETH 82xx Ethernet Address Recognition Location */
-typedef enum ucc_geth_enet_address_recognition_location {
+enum ucc_geth_enet_address_recognition_location {
         UCC_GETH_ENET_ADDRESS_RECOGNITION_LOCATION_STATION_ADDRESS,/* station
                                                                       address */
         UCC_GETH_ENET_ADDRESS_RECOGNITION_LOCATION_PADDR_FIRST, /* additional
@@ -1065,10 +1065,10 @@ typedef enum ucc_geth_enet_address_recognition_location {
         UCC_GETH_ENET_ADDRESS_RECOGNITION_LOCATION_GROUP_HASH,  /* group hash */
         UCC_GETH_ENET_ADDRESS_RECOGNITION_LOCATION_INDIVIDUAL_HASH /* individual
                                                                       hash */
-} ucc_geth_enet_address_recognition_location_e;
+};
 
 /* UCC GETH vlan operation tagged */
-typedef enum ucc_geth_vlan_operation_tagged {
+enum ucc_geth_vlan_operation_tagged {
         UCC_GETH_VLAN_OPERATION_TAGGED_NOP = 0x0,       /* Tagged - nop */
         UCC_GETH_VLAN_OPERATION_TAGGED_REPLACE_VID_PORTION_OF_Q_TAG
                 = 0x1,  /* Tagged - replace vid portion of q tag */
@@ -1076,18 +1076,18 @@ typedef enum ucc_geth_vlan_operation_tagged {
                 = 0x2,  /* Tagged - if vid0 replace vid with default value  */
         UCC_GETH_VLAN_OPERATION_TAGGED_EXTRACT_Q_TAG_FROM_FRAME
                 = 0x3   /* Tagged - extract q tag from frame */
-} ucc_geth_vlan_operation_tagged_e;
+};
 
 /* UCC GETH vlan operation non-tagged */
-typedef enum ucc_geth_vlan_operation_non_tagged {
+enum ucc_geth_vlan_operation_non_tagged {
         UCC_GETH_VLAN_OPERATION_NON_TAGGED_NOP = 0x0,   /* Non tagged - nop */
         UCC_GETH_VLAN_OPERATION_NON_TAGGED_Q_TAG_INSERT = 0x1   /* Non tagged -
                                                                    q tag insert
                                                                  */
-} ucc_geth_vlan_operation_non_tagged_e;
+};
 
 /* UCC GETH Rx Quality of Service Mode */
-typedef enum ucc_geth_qos_mode {
+enum ucc_geth_qos_mode {
         UCC_GETH_QOS_MODE_DEFAULT = 0x0,        /* default queue */
         UCC_GETH_QOS_MODE_QUEUE_NUM_FROM_L2_CRITERIA = 0x1,     /* queue
                                                                    determined
@@ -1097,11 +1097,11 @@ typedef enum ucc_geth_qos_mode {
                                                                    determined
                                                                    by L3
                                                                    criteria */
-} ucc_geth_qos_mode_e;
+};
 
 /* UCC GETH Statistics Gathering Mode - These are bit flags, 'or' them together
    for combined functionality */
-typedef enum ucc_geth_statistics_gathering_mode {
+enum ucc_geth_statistics_gathering_mode {
         UCC_GETH_STATISTICS_GATHERING_MODE_NONE = 0x00000000,   /* No
                                                                    statistics
                                                                    gathering */
@@ -1122,10 +1122,10 @@ typedef enum ucc_geth_statistics_gathering_mode {
                                                                       statistics
                                                                       gathering
                                                                     */
-} ucc_geth_statistics_gathering_mode_e;
+};
 
 /* UCC GETH Pad and CRC Mode - Note, Padding without CRC is not possible */
-typedef enum ucc_geth_maccfg2_pad_and_crc_mode {
+enum ucc_geth_maccfg2_pad_and_crc_mode {
         UCC_GETH_PAD_AND_CRC_MODE_NONE
                 = MACCFG2_PAD_AND_CRC_MODE_NONE,        /* Neither Padding
                                                            short frames
@@ -1135,61 +1135,59 @@ typedef enum ucc_geth_maccfg2_pad_and_crc_mode {
                                                            CRC only */
         UCC_GETH_PAD_AND_CRC_MODE_PAD_AND_CRC =
             MACCFG2_PAD_AND_CRC_MODE_PAD_AND_CRC
-} ucc_geth_maccfg2_pad_and_crc_mode_e;
+};
 
 /* UCC GETH upsmr Flow Control Mode */
-typedef enum ucc_geth_flow_control_mode {
+enum ucc_geth_flow_control_mode {
         UPSMR_AUTOMATIC_FLOW_CONTROL_MODE_NONE = 0x00000000,    /* No automatic
                                                                    flow control
                                                                  */
         UPSMR_AUTOMATIC_FLOW_CONTROL_MODE_PAUSE_WHEN_EMERGENCY
                 = 0x00004000    /* Send pause frame when RxFIFO reaches its
                                    emergency threshold */
-} ucc_geth_flow_control_mode_e;
+};
 
 /* UCC GETH number of threads */
-typedef enum ucc_geth_num_of_threads {
+enum ucc_geth_num_of_threads {
         UCC_GETH_NUM_OF_THREADS_1 = 0x1,        /* 1 */
         UCC_GETH_NUM_OF_THREADS_2 = 0x2,        /* 2 */
         UCC_GETH_NUM_OF_THREADS_4 = 0x0,        /* 4 */
         UCC_GETH_NUM_OF_THREADS_6 = 0x3,        /* 6 */
         UCC_GETH_NUM_OF_THREADS_8 = 0x4 /* 8 */
-} ucc_geth_num_of_threads_e;
+};
 
 /* UCC GETH number of station addresses */
-typedef enum ucc_geth_num_of_station_addresses {
+enum ucc_geth_num_of_station_addresses {
         UCC_GETH_NUM_OF_STATION_ADDRESSES_1,    /* 1 */
         UCC_GETH_NUM_OF_STATION_ADDRESSES_5     /* 5 */
-} ucc_geth_num_of_station_addresses_e;
-
-typedef u8 enet_addr_t[ENET_NUM_OCTETS_PER_ADDRESS];
+};
 
 /* UCC GETH 82xx Ethernet Address Container */
-typedef struct enet_addr_container {
-        enet_addr_t address;    /* ethernet address */
-        ucc_geth_enet_address_recognition_location_e location;  /* location in
+struct enet_addr_container {
+        u8 address[ENET_NUM_OCTETS_PER_ADDRESS];        /* ethernet address */
+        enum ucc_geth_enet_address_recognition_location location;       /* location in
                                                                    82xx address
                                                                    recognition
                                                                    hardware */
         struct list_head node;
-} enet_addr_container_t;
+};
 
-#define ENET_ADDR_CONT_ENTRY(ptr) list_entry(ptr, enet_addr_container_t, node)
+#define ENET_ADDR_CONT_ENTRY(ptr) list_entry(ptr, struct enet_addr_container, node)
 
 /* UCC GETH Termination Action Descriptor (TAD) structure. */
-typedef struct ucc_geth_tad_params {
+struct ucc_geth_tad_params {
         int rx_non_dynamic_extended_features_mode;
         int reject_frame;
-        ucc_geth_vlan_operation_tagged_e vtag_op;
-        ucc_geth_vlan_operation_non_tagged_e vnontag_op;
-        ucc_geth_qos_mode_e rqos;
+        enum ucc_geth_vlan_operation_tagged vtag_op;
+        enum ucc_geth_vlan_operation_non_tagged vnontag_op;
+        enum ucc_geth_qos_mode rqos;
         u8 vpri;
         u16 vid;
-} ucc_geth_tad_params_t;
+};
 
 /* GETH protocol initialization structure */
-typedef struct ucc_geth_info {
-        ucc_fast_info_t uf_info;
+struct ucc_geth_info {
+        struct ucc_fast_info uf_info;
         u8 numQueuesTx;
         u8 numQueuesRx;
         int ipCheckSumCheck;
@@ -1251,51 +1249,51 @@ typedef struct ucc_geth_info {
         u8 iphoffset[TX_IP_OFFSET_ENTRY_MAX];
         u16 bdRingLenTx[NUM_TX_QUEUES];
         u16 bdRingLenRx[NUM_RX_QUEUES];
-        enet_interface_e enet_interface;
-        ucc_geth_num_of_station_addresses_e numStationAddresses;
-         qe_fltr_largest_external_tbl_lookup_key_size_e
+        enum enet_interface enet_interface;
+        enum ucc_geth_num_of_station_addresses numStationAddresses;
+        enum qe_fltr_largest_external_tbl_lookup_key_size
             largestexternallookupkeysize;
-        ucc_geth_statistics_gathering_mode_e statisticsMode;
-        ucc_geth_vlan_operation_tagged_e vlanOperationTagged;
-        ucc_geth_vlan_operation_non_tagged_e vlanOperationNonTagged;
-        ucc_geth_qos_mode_e rxQoSMode;
-        ucc_geth_flow_control_mode_e aufc;
-        ucc_geth_maccfg2_pad_and_crc_mode_e padAndCrc;
-        ucc_geth_num_of_threads_e numThreadsTx;
-        ucc_geth_num_of_threads_e numThreadsRx;
-        qe_risc_allocation_e riscTx;
-        qe_risc_allocation_e riscRx;
-} ucc_geth_info_t;
+        enum ucc_geth_statistics_gathering_mode statisticsMode;
+        enum ucc_geth_vlan_operation_tagged vlanOperationTagged;
+        enum ucc_geth_vlan_operation_non_tagged vlanOperationNonTagged;
+        enum ucc_geth_qos_mode rxQoSMode;
+        enum ucc_geth_flow_control_mode aufc;
+        enum ucc_geth_maccfg2_pad_and_crc_mode padAndCrc;
+        enum ucc_geth_num_of_threads numThreadsTx;
+        enum ucc_geth_num_of_threads numThreadsRx;
+        enum qe_risc_allocation riscTx;
+        enum qe_risc_allocation riscRx;
+};
 
 /* structure representing UCC GETH */
-typedef struct ucc_geth_private {
-        ucc_geth_info_t *ug_info;
-        ucc_fast_private_t *uccf;
+struct ucc_geth_private {
+        struct ucc_geth_info *ug_info;
+        struct ucc_fast_private *uccf;
         struct net_device *dev;
         struct net_device_stats stats;  /* linux network statistics */
-        ucc_geth_t *ug_regs;
-        ucc_geth_init_pram_t *p_init_enet_param_shadow;
-        ucc_geth_exf_global_pram_t *p_exf_glbl_param;
+        struct ucc_geth *ug_regs;
+        struct ucc_geth_init_pram *p_init_enet_param_shadow;
+        struct ucc_geth_exf_global_pram *p_exf_glbl_param;
         u32 exf_glbl_param_offset;
-        ucc_geth_rx_global_pram_t *p_rx_glbl_pram;
+        struct ucc_geth_rx_global_pram *p_rx_glbl_pram;
         u32 rx_glbl_pram_offset;
-        ucc_geth_tx_global_pram_t *p_tx_glbl_pram;
+        struct ucc_geth_tx_global_pram *p_tx_glbl_pram;
         u32 tx_glbl_pram_offset;
-        ucc_geth_send_queue_mem_region_t *p_send_q_mem_reg;
+        struct ucc_geth_send_queue_mem_region *p_send_q_mem_reg;
         u32 send_q_mem_reg_offset;
-        ucc_geth_thread_data_tx_t *p_thread_data_tx;
+        struct ucc_geth_thread_data_tx *p_thread_data_tx;
         u32 thread_dat_tx_offset;
-        ucc_geth_thread_data_rx_t *p_thread_data_rx;
+        struct ucc_geth_thread_data_rx *p_thread_data_rx;
         u32 thread_dat_rx_offset;
-        ucc_geth_scheduler_t *p_scheduler;
+        struct ucc_geth_scheduler *p_scheduler;
         u32 scheduler_offset;
-        ucc_geth_tx_firmware_statistics_pram_t *p_tx_fw_statistics_pram;
+        struct ucc_geth_tx_firmware_statistics_pram *p_tx_fw_statistics_pram;
         u32 tx_fw_statistics_pram_offset;
-        ucc_geth_rx_firmware_statistics_pram_t *p_rx_fw_statistics_pram;
+        struct ucc_geth_rx_firmware_statistics_pram *p_rx_fw_statistics_pram;
         u32 rx_fw_statistics_pram_offset;
-        ucc_geth_rx_interrupt_coalescing_table_t *p_rx_irq_coalescing_tbl;
+        struct ucc_geth_rx_interrupt_coalescing_table *p_rx_irq_coalescing_tbl;
         u32 rx_irq_coalescing_tbl_offset;
-        ucc_geth_rx_bd_queues_entry_t *p_rx_bd_qs_tbl;
+        struct ucc_geth_rx_bd_queues_entry *p_rx_bd_qs_tbl;
         u32 rx_bd_qs_tbl_offset;
         u8 *p_tx_bd_ring[NUM_TX_QUEUES];
         u32 tx_bd_ring_offset[NUM_TX_QUEUES];
@@ -1308,7 +1306,7 @@ typedef struct ucc_geth_private {
         u16 cpucount[NUM_TX_QUEUES];
         volatile u16 *p_cpucount[NUM_TX_QUEUES];
         int indAddrRegUsed[NUM_OF_PADDRS];
-        enet_addr_t paddr[NUM_OF_PADDRS];
+        u8 paddr[NUM_OF_PADDRS][ENET_NUM_OCTETS_PER_ADDRESS];   /* ethernet address */
         u8 numGroupAddrInHash;
         u8 numIndAddrInHash;
         u8 numIndAddrInReg;
@@ -1334,6 +1332,6 @@ typedef struct ucc_geth_private {
         int oldspeed;
         int oldduplex;
         int oldlink;
-} ucc_geth_private_t;
+};
 
 #endif                          /* __UCC_GETH_H__ */
diff --git a/drivers/net/ucc_geth_phy.c b/drivers/net/ucc_geth_phy.c
index 67260eb3188a..5360ec05eaa3 100644
--- a/drivers/net/ucc_geth_phy.c
+++ b/drivers/net/ucc_geth_phy.c
@@ -42,7 +42,6 @@
 
 #include "ucc_geth.h"
 #include "ucc_geth_phy.h"
-#include <platforms/83xx/mpc8360e_pb.h>
 
 #define ugphy_printk(level, format, arg...)  \
         printk(level format "\n", ## arg)
@@ -72,16 +71,14 @@ static int genmii_read_status(struct ugeth_mii_info *mii_info);
 u16 phy_read(struct ugeth_mii_info *mii_info, u16 regnum);
 void phy_write(struct ugeth_mii_info *mii_info, u16 regnum, u16 val);
 
-static u8 *bcsr_regs = NULL;
-
 /* Write value to the PHY for this device to the register at regnum, */
 /* waiting until the write is done before it returns.  All PHY */
 /* configuration has to be done through the TSEC1 MIIM regs */
 void write_phy_reg(struct net_device *dev, int mii_id, int regnum, int value)
 {
-        ucc_geth_private_t *ugeth = netdev_priv(dev);
-        ucc_mii_mng_t *mii_regs;
-        enet_tbi_mii_reg_e mii_reg = (enet_tbi_mii_reg_e) regnum;
+        struct ucc_geth_private *ugeth = netdev_priv(dev);
+        struct ucc_mii_mng *mii_regs;
+        enum enet_tbi_mii_reg mii_reg = (enum enet_tbi_mii_reg) regnum;
         u32 tmp_reg;
 
         ugphy_vdbg("%s: IN", __FUNCTION__);
@@ -116,9 +113,9 @@ void write_phy_reg(struct net_device *dev, int mii_id, int regnum, int value)
 /* configuration has to be done through the TSEC1 MIIM regs */
 int read_phy_reg(struct net_device *dev, int mii_id, int regnum)
 {
-        ucc_geth_private_t *ugeth = netdev_priv(dev);
-        ucc_mii_mng_t *mii_regs;
-        enet_tbi_mii_reg_e mii_reg = (enet_tbi_mii_reg_e) regnum;
+        struct ucc_geth_private *ugeth = netdev_priv(dev);
+        struct ucc_mii_mng *mii_regs;
+        enum enet_tbi_mii_reg mii_reg = (enum enet_tbi_mii_reg) regnum;
         u32 tmp_reg;
         u16 value;
 
@@ -634,11 +631,6 @@ static void dm9161_close(struct ugeth_mii_info *mii_info)
 
 static int dm9161_ack_interrupt(struct ugeth_mii_info *mii_info)
 {
-/* FIXME: This lines are for BUG fixing in the mpc8325.
-Remove this from here when it's fixed */
-        if (bcsr_regs == NULL)
-                bcsr_regs = (u8 *) ioremap(BCSR_PHYS_ADDR, BCSR_SIZE);
-        bcsr_regs[14] |= 0x40;
         ugphy_vdbg("%s: IN", __FUNCTION__);
 
         /* Clear the interrupts by reading the reg */
@@ -650,12 +642,6 @@ Remove this from here when it's fixed */
 
 static int dm9161_config_intr(struct ugeth_mii_info *mii_info)
 {
-/* FIXME: This lines are for BUG fixing in the mpc8325.
-Remove this from here when it's fixed */
-        if (bcsr_regs == NULL) {
-                bcsr_regs = (u8 *) ioremap(BCSR_PHYS_ADDR, BCSR_SIZE);
-                bcsr_regs[14] &= ~0x40;
-        }
         ugphy_vdbg("%s: IN", __FUNCTION__);
 
         if (mii_info->interrupts == MII_INTERRUPT_ENABLED)
diff --git a/drivers/net/ucc_geth_phy.h b/drivers/net/ucc_geth_phy.h
index 2f98b8f1bb0a..f5740783670f 100644
--- a/drivers/net/ucc_geth_phy.h
+++ b/drivers/net/ucc_geth_phy.h
@@ -126,7 +126,7 @@ struct ugeth_mii_info {
         /* And management functions */
         struct phy_info *phyinfo;
 
-        ucc_mii_mng_t *mii_regs;
+        struct ucc_mii_mng *mii_regs;
 
         /* forced speed & duplex (no autoneg)
          * partner speed & duplex & pause (autoneg)
diff --git a/drivers/net/wan/pc300_drv.c b/drivers/net/wan/pc300_drv.c
index 5823e3bca178..36d1c3ff7078 100644
--- a/drivers/net/wan/pc300_drv.c
+++ b/drivers/net/wan/pc300_drv.c
@@ -2867,7 +2867,6 @@ static int ch_config(pc300dev_t * d)
         uclong clktype = chan->conf.phys_settings.clock_type;
         ucshort encoding = chan->conf.proto_settings.encoding;
         ucshort parity = chan->conf.proto_settings.parity;   
-        int tmc, br;
         ucchar md0, md2;
     
         /* Reset the channel */
@@ -2940,8 +2939,12 @@ static int ch_config(pc300dev_t * d)
                 case PC300_RSV:
                 case PC300_X21:
                         if (clktype == CLOCK_INT || clktype == CLOCK_TXINT) {
+                                int tmc, br;
+
                                 /* Calculate the clkrate parameters */
                                 tmc = clock_rate_calc(clkrate, card->hw.clock, &br);
+                                if (tmc < 0)
+                                        return -EIO;
                                 cpc_writeb(scabase + M_REG(TMCT, ch), tmc);
                                 cpc_writeb(scabase + M_REG(TXS, ch),
                                            (TXS_DTRXC | TXS_IBRG | br));
@@ -3097,14 +3100,16 @@ static int cpc_attach(struct net_device *dev, unsigned short encoding,
         return 0;
 }
 
-static void cpc_opench(pc300dev_t * d)
+static int cpc_opench(pc300dev_t * d)
 {
         pc300ch_t *chan = (pc300ch_t *) d->chan;
         pc300_t *card = (pc300_t *) chan->card;
-        int ch = chan->channel;
+        int ch = chan->channel, rc;
         void __iomem *scabase = card->hw.scabase;
 
-        ch_config(d);
+        rc = ch_config(d);
+        if (rc)
+                return rc;
 
         rx_config(d);
 
@@ -3113,6 +3118,8 @@ static void cpc_opench(pc300dev_t * d)
         /* Assert RTS and DTR */
         cpc_writeb(scabase + M_REG(CTL, ch),
                    cpc_readb(scabase + M_REG(CTL, ch)) & ~(CTL_RTS | CTL_DTR));
+
+        return 0;
 }
 
 static void cpc_closech(pc300dev_t * d)
@@ -3168,9 +3175,16 @@ int cpc_open(struct net_device *dev)
         }
 
         sprintf(ifr.ifr_name, "%s", dev->name);
-        cpc_opench(d);
+        result = cpc_opench(d);
+        if (result)
+                goto err_out;
+
         netif_start_queue(dev);
         return 0;
+
+err_out:
+        hdlc_close(dev);
+        return result;
 }
 
 static int cpc_close(struct net_device *dev)
diff --git a/drivers/pci/hotplug/acpi_pcihp.c b/drivers/pci/hotplug/acpi_pcihp.c
index 51cb9f817c22..270a33cc08f6 100644
--- a/drivers/pci/hotplug/acpi_pcihp.c
+++ b/drivers/pci/hotplug/acpi_pcihp.c
@@ -29,10 +29,10 @@
 #include <linux/kernel.h>
 #include <linux/types.h>
 #include <linux/pci.h>
+#include <linux/pci_hotplug.h>
 #include <acpi/acpi.h>
 #include <acpi/acpi_bus.h>
 #include <acpi/actypes.h>
-#include "pci_hotplug.h"
 
 #define MY_NAME "acpi_pcihp"
 
diff --git a/drivers/pci/hotplug/acpiphp.h b/drivers/pci/hotplug/acpiphp.h
index 7fff07e877c7..59c5b242d86d 100644
--- a/drivers/pci/hotplug/acpiphp.h
+++ b/drivers/pci/hotplug/acpiphp.h
@@ -38,7 +38,7 @@
 #include <linux/acpi.h>
 #include <linux/kobject.h>      /* for KOBJ_NAME_LEN */
 #include <linux/mutex.h>
-#include "pci_hotplug.h"
+#include <linux/pci_hotplug.h>
 
 #define dbg(format, arg...)                                     \
         do {                                                    \
diff --git a/drivers/pci/hotplug/acpiphp_core.c b/drivers/pci/hotplug/acpiphp_core.c
index e2fef60c2d06..c57d9d5ce84e 100644
--- a/drivers/pci/hotplug/acpiphp_core.c
+++ b/drivers/pci/hotplug/acpiphp_core.c
@@ -37,10 +37,10 @@
 
 #include <linux/kernel.h>
 #include <linux/pci.h>
+#include <linux/pci_hotplug.h>
 #include <linux/slab.h>
 #include <linux/smp.h>
 #include <linux/smp_lock.h>
-#include "pci_hotplug.h"
 #include "acpiphp.h"
 
 #define MY_NAME "acpiphp"
diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c
index 83e8e4412de5..c44311ac2fd3 100644
--- a/drivers/pci/hotplug/acpiphp_glue.c
+++ b/drivers/pci/hotplug/acpiphp_glue.c
@@ -45,11 +45,11 @@
 
 #include <linux/kernel.h>
 #include <linux/pci.h>
+#include <linux/pci_hotplug.h>
 #include <linux/smp_lock.h>
 #include <linux/mutex.h>
 
 #include "../pci.h"
-#include "pci_hotplug.h"
 #include "acpiphp.h"
 
 static LIST_HEAD(bridge_list);
diff --git a/drivers/pci/hotplug/acpiphp_ibm.c b/drivers/pci/hotplug/acpiphp_ibm.c
index d0a07d9ab30c..bd40aee10e16 100644
--- a/drivers/pci/hotplug/acpiphp_ibm.c
+++ b/drivers/pci/hotplug/acpiphp_ibm.c
@@ -35,7 +35,6 @@
 #include <linux/moduleparam.h>
 
 #include "acpiphp.h"
-#include "pci_hotplug.h"
 
 #define DRIVER_VERSION  "1.0.1"
 #define DRIVER_AUTHOR   "Irene Zubarev <zubarev@us.ibm.com>, Vernon Mauery <vernux@us.ibm.com>"
diff --git a/drivers/pci/hotplug/cpci_hotplug_core.c b/drivers/pci/hotplug/cpci_hotplug_core.c
index d06ab4045134..684551559d44 100644
--- a/drivers/pci/hotplug/cpci_hotplug_core.c
+++ b/drivers/pci/hotplug/cpci_hotplug_core.c
@@ -29,12 +29,12 @@
 #include <linux/kernel.h>
 #include <linux/slab.h>
 #include <linux/pci.h>
+#include <linux/pci_hotplug.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/smp_lock.h>
 #include <asm/atomic.h>
 #include <linux/delay.h>
-#include "pci_hotplug.h"
 #include "cpci_hotplug.h"
 
 #define DRIVER_AUTHOR   "Scott Murray <scottm@somanetworks.com>"
diff --git a/drivers/pci/hotplug/cpci_hotplug_pci.c b/drivers/pci/hotplug/cpci_hotplug_pci.c
index 4afcaffd031c..7b1beaad2752 100644
--- a/drivers/pci/hotplug/cpci_hotplug_pci.c
+++ b/drivers/pci/hotplug/cpci_hotplug_pci.c
@@ -26,9 +26,9 @@
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/pci.h>
+#include <linux/pci_hotplug.h>
 #include <linux/proc_fs.h>
 #include "../pci.h"
-#include "pci_hotplug.h"
 #include "cpci_hotplug.h"
 
 #define MY_NAME "cpci_hotplug"
diff --git a/drivers/pci/hotplug/cpcihp_generic.c b/drivers/pci/hotplug/cpcihp_generic.c
index e847f0d6c7fe..f3852a6b74ea 100644
--- a/drivers/pci/hotplug/cpcihp_generic.c
+++ b/drivers/pci/hotplug/cpcihp_generic.c
@@ -84,7 +84,7 @@ static int __init validate_parameters(void)
 
         if(!bridge) {
                 info("not configured, disabling.");
-                return 1;
+                return -EINVAL;
         }
         str = bridge;
         if(!*str)
@@ -147,7 +147,7 @@ static int __init cpcihp_generic_init(void)
 
         info(DRIVER_DESC " version: " DRIVER_VERSION);
         status = validate_parameters();
-        if(status != 0)
+        if (status)
                 return status;
 
         r = request_region(port, 1, "#ENUM hotswap signal register");
diff --git a/drivers/pci/hotplug/cpqphp.h b/drivers/pci/hotplug/cpqphp.h
index ea040c32f47d..298ad7f3f4f4 100644
--- a/drivers/pci/hotplug/cpqphp.h
+++ b/drivers/pci/hotplug/cpqphp.h
@@ -28,7 +28,6 @@
 #ifndef _CPQPHP_H
 #define _CPQPHP_H
 
-#include "pci_hotplug.h"
 #include <linux/interrupt.h>
 #include <asm/io.h>             /* for read? and write? functions */
 #include <linux/delay.h>        /* for delays */
diff --git a/drivers/pci/hotplug/cpqphp_core.c b/drivers/pci/hotplug/cpqphp_core.c
index 1fc259913b68..5617cfdadc5c 100644
--- a/drivers/pci/hotplug/cpqphp_core.c
+++ b/drivers/pci/hotplug/cpqphp_core.c
@@ -37,6 +37,7 @@
 #include <linux/slab.h>
 #include <linux/workqueue.h>
 #include <linux/pci.h>
+#include <linux/pci_hotplug.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
 
diff --git a/drivers/pci/hotplug/cpqphp_ctrl.c b/drivers/pci/hotplug/cpqphp_ctrl.c
index 3ec2ad7db49a..79ff6b4de3a6 100644
--- a/drivers/pci/hotplug/cpqphp_ctrl.c
+++ b/drivers/pci/hotplug/cpqphp_ctrl.c
@@ -36,6 +36,7 @@
 #include <linux/wait.h>
 #include <linux/smp_lock.h>
 #include <linux/pci.h>
+#include <linux/pci_hotplug.h>
 #include "cpqphp.h"
 
 static u32 configure_new_device(struct controller* ctrl, struct pci_func *func,
diff --git a/drivers/pci/hotplug/cpqphp_nvram.c b/drivers/pci/hotplug/cpqphp_nvram.c
index cf0878917537..298a6cfd8406 100644
--- a/drivers/pci/hotplug/cpqphp_nvram.c
+++ b/drivers/pci/hotplug/cpqphp_nvram.c
@@ -33,6 +33,7 @@
 #include <linux/slab.h>
 #include <linux/workqueue.h>
 #include <linux/pci.h>
+#include <linux/pci_hotplug.h>
 #include <linux/init.h>
 #include <asm/uaccess.h>
 #include "cpqphp.h"
diff --git a/drivers/pci/hotplug/cpqphp_pci.c b/drivers/pci/hotplug/cpqphp_pci.c
index 0d9688952f4a..fc7c74d72595 100644
--- a/drivers/pci/hotplug/cpqphp_pci.c
+++ b/drivers/pci/hotplug/cpqphp_pci.c
@@ -33,6 +33,7 @@
 #include <linux/workqueue.h>
 #include <linux/proc_fs.h>
 #include <linux/pci.h>
+#include <linux/pci_hotplug.h>
 #include "../pci.h"
 #include "cpqphp.h"
 #include "cpqphp_nvram.h"
diff --git a/drivers/pci/hotplug/cpqphp_sysfs.c b/drivers/pci/hotplug/cpqphp_sysfs.c
index 5bab666cd67e..634f74d919d3 100644
--- a/drivers/pci/hotplug/cpqphp_sysfs.c
+++ b/drivers/pci/hotplug/cpqphp_sysfs.c
@@ -32,6 +32,7 @@
 #include <linux/proc_fs.h>
 #include <linux/workqueue.h>
 #include <linux/pci.h>
+#include <linux/pci_hotplug.h>
 #include <linux/debugfs.h>
 #include "cpqphp.h"
 
diff --git a/drivers/pci/hotplug/fakephp.c b/drivers/pci/hotplug/fakephp.c
index 05a4f0f90186..e27907c91d92 100644
--- a/drivers/pci/hotplug/fakephp.c
+++ b/drivers/pci/hotplug/fakephp.c
@@ -35,10 +35,10 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/pci.h>
+#include <linux/pci_hotplug.h>
 #include <linux/init.h>
 #include <linux/string.h>
 #include <linux/slab.h>
-#include "pci_hotplug.h"
 #include "../pci.h"
 
 #if !defined(MODULE)
@@ -181,7 +181,9 @@ static void pci_rescan_slot(struct pci_dev *temp)
 
         if (!pci_read_config_byte(temp, PCI_HEADER_TYPE, &hdr_type)) {
                 temp->hdr_type = hdr_type & 0x7f;
-                if (!pci_find_slot(bus->number, temp->devfn)) {
+                if ((dev = pci_get_slot(bus, temp->devfn)) != NULL)
+                        pci_dev_put(dev);
+                else {
                         dev = pci_scan_single_device(bus, temp->devfn);
                         if (dev) {
                                 dbg("New device on %s function %x:%x\n",
@@ -205,7 +207,9 @@ static void pci_rescan_slot(struct pci_dev *temp)
                                 continue;
                         temp->hdr_type = hdr_type & 0x7f;
 
-                        if (!pci_find_slot(bus->number, temp->devfn)) {
+                        if ((dev = pci_get_slot(bus, temp->devfn)) != NULL)
+                                pci_dev_put(dev);
+                        else {
                                 dev = pci_scan_single_device(bus, temp->devfn);
                                 if (dev) {
                                         dbg("New device on %s function %x:%x\n",
@@ -305,7 +309,7 @@ static int disable_slot(struct hotplug_slot *slot)
         /* search for subfunctions and disable them first */
         if (!(dslot->dev->devfn & 7)) {
                 for (func = 1; func < 8; func++) {
-                        dev = pci_find_slot(dslot->dev->bus->number,
+                        dev = pci_get_slot(dslot->dev->bus,
                                         dslot->dev->devfn + func);
                         if (dev) {
                                 hslot = get_slot_from_dev(dev);
@@ -315,6 +319,7 @@ static int disable_slot(struct hotplug_slot *slot)
                                         err("Hotplug slot not found for subfunction of PCI device\n");
                                         return -ENODEV;
                                 }
+                                pci_dev_put(dev);
                         } else
                                 dbg("No device in slot found\n");
                 }
diff --git a/drivers/pci/hotplug/ibmphp.h b/drivers/pci/hotplug/ibmphp.h
index dba6d8ca9bda..612d96301509 100644
--- a/drivers/pci/hotplug/ibmphp.h
+++ b/drivers/pci/hotplug/ibmphp.h
@@ -30,7 +30,7 @@
  *
  */
 
-#include "pci_hotplug.h"
+#include <linux/pci_hotplug.h>
 
 extern int ibmphp_debug;
 
diff --git a/drivers/pci/hotplug/pci_hotplug.h b/drivers/pci/hotplug/pci_hotplug.h
deleted file mode 100644
index 772523dc3860..000000000000
--- a/drivers/pci/hotplug/pci_hotplug.h
+++ /dev/null
@@ -1,236 +0,0 @@
-/*
- * PCI HotPlug Core Functions
- *
- * Copyright (C) 1995,2001 Compaq Computer Corporation
- * Copyright (C) 2001 Greg Kroah-Hartman (greg@kroah.com)
- * Copyright (C) 2001 IBM Corp.
- *
- * 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 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, GOOD TITLE or
- * NON INFRINGEMENT.  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.
- *
- * Send feedback to <greg@kroah.com>
- *
- */
-#ifndef _PCI_HOTPLUG_H
-#define _PCI_HOTPLUG_H
-
-
-/* These values come from the PCI Hotplug Spec */
-enum pci_bus_speed {
-        PCI_SPEED_33MHz                 = 0x00,
-        PCI_SPEED_66MHz                 = 0x01,
-        PCI_SPEED_66MHz_PCIX            = 0x02,
-        PCI_SPEED_100MHz_PCIX           = 0x03,
-        PCI_SPEED_133MHz_PCIX           = 0x04,
-        PCI_SPEED_66MHz_PCIX_ECC        = 0x05,
-        PCI_SPEED_100MHz_PCIX_ECC       = 0x06,
-        PCI_SPEED_133MHz_PCIX_ECC       = 0x07,
-        PCI_SPEED_66MHz_PCIX_266        = 0x09,
-        PCI_SPEED_100MHz_PCIX_266       = 0x0a,
-        PCI_SPEED_133MHz_PCIX_266       = 0x0b,
-        PCI_SPEED_66MHz_PCIX_533        = 0x11,
-        PCI_SPEED_100MHz_PCIX_533       = 0x12,
-        PCI_SPEED_133MHz_PCIX_533       = 0x13,
-        PCI_SPEED_UNKNOWN               = 0xff,
-};
-
-/* These values come from the PCI Express Spec */
-enum pcie_link_width {
-        PCIE_LNK_WIDTH_RESRV    = 0x00,
-        PCIE_LNK_X1             = 0x01,
-        PCIE_LNK_X2             = 0x02,
-        PCIE_LNK_X4             = 0x04,
-        PCIE_LNK_X8             = 0x08,
-        PCIE_LNK_X12            = 0x0C,
-        PCIE_LNK_X16            = 0x10,
-        PCIE_LNK_X32            = 0x20,
-        PCIE_LNK_WIDTH_UNKNOWN  = 0xFF,
-};
-
-enum pcie_link_speed {
-        PCIE_2PT5GB             = 0x14,
-        PCIE_LNK_SPEED_UNKNOWN  = 0xFF,
-};
-
-struct hotplug_slot;
-struct hotplug_slot_attribute {
-        struct attribute attr;
-        ssize_t (*show)(struct hotplug_slot *, char *);
-        ssize_t (*store)(struct hotplug_slot *, const char *, size_t);
-};
-#define to_hotplug_attr(n) container_of(n, struct hotplug_slot_attribute, attr);
-
-/**
- * struct hotplug_slot_ops -the callbacks that the hotplug pci core can use
- * @owner: The module owner of this structure
- * @enable_slot: Called when the user wants to enable a specific pci slot
- * @disable_slot: Called when the user wants to disable a specific pci slot
- * @set_attention_status: Called to set the specific slot's attention LED to
- * the specified value
- * @hardware_test: Called to run a specified hardware test on the specified
- * slot.
- * @get_power_status: Called to get the current power status of a slot.
- *      If this field is NULL, the value passed in the struct hotplug_slot_info
- *      will be used when this value is requested by a user.
- * @get_attention_status: Called to get the current attention status of a slot.
- *      If this field is NULL, the value passed in the struct hotplug_slot_info
- *      will be used when this value is requested by a user.
- * @get_latch_status: Called to get the current latch status of a slot.
- *      If this field is NULL, the value passed in the struct hotplug_slot_info
- *      will be used when this value is requested by a user.
- * @get_adapter_status: Called to get see if an adapter is present in the slot or not.
- *      If this field is NULL, the value passed in the struct hotplug_slot_info
- *      will be used when this value is requested by a user.
- * @get_address: Called to get pci address of a slot.
- *      If this field is NULL, the value passed in the struct hotplug_slot_info
- *      will be used when this value is requested by a user.
- * @get_max_bus_speed: Called to get the max bus speed for a slot.
- *      If this field is NULL, the value passed in the struct hotplug_slot_info
- *      will be used when this value is requested by a user.
- * @get_cur_bus_speed: Called to get the current bus speed for a slot.
- *      If this field is NULL, the value passed in the struct hotplug_slot_info
- *      will be used when this value is requested by a user.
- *
- * The table of function pointers that is passed to the hotplug pci core by a
- * hotplug pci driver.  These functions are called by the hotplug pci core when
- * the user wants to do something to a specific slot (query it for information,
- * set an LED, enable / disable power, etc.)
- */
-struct hotplug_slot_ops {
-        struct module *owner;
-        int (*enable_slot)              (struct hotplug_slot *slot);
-        int (*disable_slot)             (struct hotplug_slot *slot);
-        int (*set_attention_status)     (struct hotplug_slot *slot, u8 value);
-        int (*hardware_test)            (struct hotplug_slot *slot, u32 value);
-        int (*get_power_status)         (struct hotplug_slot *slot, u8 *value);
-        int (*get_attention_status)     (struct hotplug_slot *slot, u8 *value);
-        int (*get_latch_status)         (struct hotplug_slot *slot, u8 *value);
-        int (*get_adapter_status)       (struct hotplug_slot *slot, u8 *value);
-        int (*get_address)              (struct hotplug_slot *slot, u32 *value);
-        int (*get_max_bus_speed)        (struct hotplug_slot *slot, enum pci_bus_speed *value);
-        int (*get_cur_bus_speed)        (struct hotplug_slot *slot, enum pci_bus_speed *value);
-};
-
-/**
- * struct hotplug_slot_info - used to notify the hotplug pci core of the state of the slot
- * @power: if power is enabled or not (1/0)
- * @attention_status: if the attention light is enabled or not (1/0)
- * @latch_status: if the latch (if any) is open or closed (1/0)
- * @adapter_present: if there is a pci board present in the slot or not (1/0)
- * @address: (domain << 16 | bus << 8 | dev)
- *
- * Used to notify the hotplug pci core of the status of a specific slot.
- */
-struct hotplug_slot_info {
-        u8      power_status;
-        u8      attention_status;
-        u8      latch_status;
-        u8      adapter_status;
-        u32     address;
-        enum pci_bus_speed      max_bus_speed;
-        enum pci_bus_speed      cur_bus_speed;
-};
-
-/**
- * struct hotplug_slot - used to register a physical slot with the hotplug pci core
- * @name: the name of the slot being registered.  This string must
- * be unique amoung slots registered on this system.
- * @ops: pointer to the &struct hotplug_slot_ops to be used for this slot
- * @info: pointer to the &struct hotplug_slot_info for the initial values for
- * this slot.
- * @release: called during pci_hp_deregister to free memory allocated in a
- * hotplug_slot structure.
- * @private: used by the hotplug pci controller driver to store whatever it
- * needs.
- */
-struct hotplug_slot {
-        char                            *name;
-        struct hotplug_slot_ops         *ops;
-        struct hotplug_slot_info        *info;
-        void (*release) (struct hotplug_slot *slot);
-        void                            *private;
-
-        /* Variables below this are for use only by the hotplug pci core. */
-        struct list_head                slot_list;
-        struct kobject                  kobj;
-};
-#define to_hotplug_slot(n) container_of(n, struct hotplug_slot, kobj)
-
-extern int pci_hp_register              (struct hotplug_slot *slot);
-extern int pci_hp_deregister            (struct hotplug_slot *slot);
-extern int __must_check pci_hp_change_slot_info (struct hotplug_slot *slot,
-                                                 struct hotplug_slot_info *info);
-extern struct subsystem pci_hotplug_slots_subsys;
-
-/* PCI Setting Record (Type 0) */
-struct hpp_type0 {
-        u32 revision;
-        u8  cache_line_size;
-        u8  latency_timer;
-        u8  enable_serr;
-        u8  enable_perr;
-};
-
-/* PCI-X Setting Record (Type 1) */
-struct hpp_type1 {
-        u32 revision;
-        u8  max_mem_read;
-        u8  avg_max_split;
-        u16 tot_max_split;
-};
-
-/* PCI Express Setting Record (Type 2) */
-struct hpp_type2 {
-        u32 revision;
-        u32 unc_err_mask_and;
-        u32 unc_err_mask_or;
-        u32 unc_err_sever_and;
-        u32 unc_err_sever_or;
-        u32 cor_err_mask_and;
-        u32 cor_err_mask_or;
-        u32 adv_err_cap_and;
-        u32 adv_err_cap_or;
-        u16 pci_exp_devctl_and;
-        u16 pci_exp_devctl_or;
-        u16 pci_exp_lnkctl_and;
-        u16 pci_exp_lnkctl_or;
-        u32 sec_unc_err_sever_and;
-        u32 sec_unc_err_sever_or;
-        u32 sec_unc_err_mask_and;
-        u32 sec_unc_err_mask_or;
-};
-
-struct hotplug_params {
-        struct hpp_type0 *t0;           /* Type0: NULL if not available */
-        struct hpp_type1 *t1;           /* Type1: NULL if not available */
-        struct hpp_type2 *t2;           /* Type2: NULL if not available */
-        struct hpp_type0 type0_data;
-        struct hpp_type1 type1_data;
-        struct hpp_type2 type2_data;
-};
-
-#ifdef CONFIG_ACPI
-#include <acpi/acpi.h>
-#include <acpi/acpi_bus.h>
-#include <acpi/actypes.h>
-extern acpi_status acpi_run_oshp(acpi_handle handle);
-extern acpi_status acpi_get_hp_params_from_firmware(struct pci_bus *bus,
-                                struct hotplug_params *hpp);
-int acpi_root_bridge(acpi_handle handle);
-#endif
-#endif
-
diff --git a/drivers/pci/hotplug/pci_hotplug_core.c b/drivers/pci/hotplug/pci_hotplug_core.c
index e2823ea9c4ed..f5d632e72323 100644
--- a/drivers/pci/hotplug/pci_hotplug_core.c
+++ b/drivers/pci/hotplug/pci_hotplug_core.c
@@ -21,9 +21,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * Send feedback to <greg@kroah.com>
- *
- * Filesystem portion based on work done by Pat Mochel on ddfs/driverfs
+ * Send feedback to <kristen.c.accardi@intel.com>
  *
  */
 
@@ -32,6 +30,8 @@
 #include <linux/kernel.h>
 #include <linux/types.h>
 #include <linux/list.h>
+#include <linux/kobject.h>
+#include <linux/sysfs.h>
 #include <linux/pagemap.h>
 #include <linux/slab.h>
 #include <linux/smp_lock.h>
@@ -39,11 +39,8 @@
 #include <linux/mount.h>
 #include <linux/namei.h>
 #include <linux/pci.h>
+#include <linux/pci_hotplug.h>
 #include <asm/uaccess.h>
-#include <linux/kobject.h>
-#include <linux/sysfs.h>
-#include "pci_hotplug.h"
-
 
 #define MY_NAME "pci_hotplug"
 
diff --git a/drivers/pci/hotplug/pciehp.h b/drivers/pci/hotplug/pciehp.h
index eaea9d36a1bb..4fb12fcda563 100644
--- a/drivers/pci/hotplug/pciehp.h
+++ b/drivers/pci/hotplug/pciehp.h
@@ -31,11 +31,11 @@
 
 #include <linux/types.h>
 #include <linux/pci.h>
+#include <linux/pci_hotplug.h>
 #include <linux/delay.h>
 #include <linux/sched.h>                /* signal_pending() */
 #include <linux/pcieport_if.h>
 #include <linux/mutex.h>
-#include "pci_hotplug.h"
 
 #define MY_NAME "pciehp"
 
@@ -92,6 +92,7 @@ struct php_ctlr_state_s {
 struct controller {
         struct controller *next;
         struct mutex crit_sect;         /* critical section mutex */
+        struct mutex ctrl_lock;         /* controller lock */
         struct php_ctlr_state_s *hpc_ctlr_handle; /* HPC controller handle */
         int num_slots;                  /* Number of slots on ctlr */
         int slot_num_inc;               /* 1 or -1 */
@@ -166,10 +167,10 @@ struct controller {
  * error Messages
  */
 #define msg_initialization_err  "Initialization failure, error=%d\n"
-#define msg_button_on           "PCI slot #%d - powering on due to button press.\n"
-#define msg_button_off          "PCI slot #%d - powering off due to button press.\n"
-#define msg_button_cancel       "PCI slot #%d - action canceled due to button press.\n"
-#define msg_button_ignore       "PCI slot #%d - button press ignored.  (action in progress...)\n"
+#define msg_button_on           "PCI slot #%s - powering on due to button press.\n"
+#define msg_button_off          "PCI slot #%s - powering off due to button press.\n"
+#define msg_button_cancel       "PCI slot #%s - action canceled due to button press.\n"
+#define msg_button_ignore       "PCI slot #%s - button press ignored.  (action in progress...)\n"
 
 /* controller functions */
 extern int      pciehp_event_start_thread       (void);
diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c
index c67b7c3f1ddf..f93e81e2d2c7 100644
--- a/drivers/pci/hotplug/pciehp_core.c
+++ b/drivers/pci/hotplug/pciehp_core.c
@@ -448,7 +448,7 @@ static int pciehp_probe(struct pcie_device *dev, const struct pcie_port_service_
         }
 
         /* Wait for exclusive access to hardware */
-        mutex_lock(&ctrl->crit_sect);
+        mutex_lock(&ctrl->ctrl_lock);
 
         t_slot->hpc_ops->get_adapter_status(t_slot, &value); /* Check if slot is occupied */
         
@@ -456,7 +456,7 @@ static int pciehp_probe(struct pcie_device *dev, const struct pcie_port_service_
                 rc = t_slot->hpc_ops->power_off_slot(t_slot); /* Power off slot if not occupied*/
                 if (rc) {
                         /* Done with exclusive hardware access */
-                        mutex_unlock(&ctrl->crit_sect);
+                        mutex_unlock(&ctrl->ctrl_lock);
                         goto err_out_free_ctrl_slot;
                 } else
                         /* Wait for the command to complete */
@@ -464,7 +464,7 @@ static int pciehp_probe(struct pcie_device *dev, const struct pcie_port_service_
         }
 
         /* Done with exclusive hardware access */
-        mutex_unlock(&ctrl->crit_sect);
+        mutex_unlock(&ctrl->ctrl_lock);
 
         return 0;
 
diff --git a/drivers/pci/hotplug/pciehp_ctrl.c b/drivers/pci/hotplug/pciehp_ctrl.c
index 41290a106bd8..372c63e35aa9 100644
--- a/drivers/pci/hotplug/pciehp_ctrl.c
+++ b/drivers/pci/hotplug/pciehp_ctrl.c
@@ -43,6 +43,11 @@ static int event_finished;
 static unsigned long pushbutton_pending;        /* = 0 */
 static unsigned long surprise_rm_pending;       /* = 0 */
 
+static inline char *slot_name(struct slot *p_slot)
+{
+        return p_slot->hotplug_slot->name;
+}
+
 u8 pciehp_handle_attention_button(u8 hp_slot, void *inst_id)
 {
         struct controller *ctrl = (struct controller *) inst_id;
@@ -68,7 +73,7 @@ u8 pciehp_handle_attention_button(u8 hp_slot, void *inst_id)
         /*
          *  Button pressed - See if need to TAKE ACTION!!!
          */
-        info("Button pressed on Slot(%d)\n", ctrl->first_slot + hp_slot);
+        info("Button pressed on Slot(%s)\n", slot_name(p_slot));
         taskInfo->event_type = INT_BUTTON_PRESS;
 
         if ((p_slot->state == BLINKINGON_STATE)
@@ -78,7 +83,7 @@ u8 pciehp_handle_attention_button(u8 hp_slot, void *inst_id)
                  * or hot-remove
                  */
                 taskInfo->event_type = INT_BUTTON_CANCEL;
-                info("Button cancel on Slot(%d)\n", ctrl->first_slot + hp_slot);
+                info("Button cancel on Slot(%s)\n", slot_name(p_slot));
         } else if ((p_slot->state == POWERON_STATE)
                    || (p_slot->state == POWEROFF_STATE)) {
                 /* Ignore if the slot is on power-on or power-off state; this 
@@ -86,7 +91,7 @@ u8 pciehp_handle_attention_button(u8 hp_slot, void *inst_id)
                  * hot-remove is undergoing
                  */
                 taskInfo->event_type = INT_BUTTON_IGNORE;
-                info("Button ignore on Slot(%d)\n", ctrl->first_slot + hp_slot);
+                info("Button ignore on Slot(%s)\n", slot_name(p_slot));
         }
 
         if (rc)
@@ -122,13 +127,13 @@ u8 pciehp_handle_switch_change(u8 hp_slot, void *inst_id)
                 /*
                  * Switch opened
                  */
-                info("Latch open on Slot(%d)\n", ctrl->first_slot + hp_slot);
+                info("Latch open on Slot(%s)\n", slot_name(p_slot));
                 taskInfo->event_type = INT_SWITCH_OPEN;
         } else {
                 /*
                  *  Switch closed
                  */
-                info("Latch close on Slot(%d)\n", ctrl->first_slot + hp_slot);
+                info("Latch close on Slot(%s)\n", slot_name(p_slot));
                 taskInfo->event_type = INT_SWITCH_CLOSE;
         }
 
@@ -166,13 +171,13 @@ u8 pciehp_handle_presence_change(u8 hp_slot, void *inst_id)
                 /*
                  * Card Present
                  */
-                info("Card present on Slot(%d)\n", ctrl->first_slot + hp_slot);
+                info("Card present on Slot(%s)\n", slot_name(p_slot));
                 taskInfo->event_type = INT_PRESENCE_ON;
         } else {
                 /*
                  * Not Present
                  */
-                info("Card not present on Slot(%d)\n", ctrl->first_slot + hp_slot);
+                info("Card not present on Slot(%s)\n", slot_name(p_slot));
                 taskInfo->event_type = INT_PRESENCE_OFF;
         }
 
@@ -206,13 +211,13 @@ u8 pciehp_handle_power_fault(u8 hp_slot, void *inst_id)
                 /*
                  * power fault Cleared
                  */
-                info("Power fault cleared on Slot(%d)\n", ctrl->first_slot + hp_slot);
+                info("Power fault cleared on Slot(%s)\n", slot_name(p_slot));
                 taskInfo->event_type = INT_POWER_FAULT_CLEAR;
         } else {
                 /*
                  *   power fault
                  */
-                info("Power fault on Slot(%d)\n", ctrl->first_slot + hp_slot);
+                info("Power fault on Slot(%s)\n", slot_name(p_slot));
                 taskInfo->event_type = INT_POWER_FAULT;
                 info("power fault bit %x set\n", hp_slot);
         }
@@ -229,13 +234,13 @@ u8 pciehp_handle_power_fault(u8 hp_slot, void *inst_id)
 static void set_slot_off(struct controller *ctrl, struct slot * pslot)
 {
         /* Wait for exclusive access to hardware */
-        mutex_lock(&ctrl->crit_sect);
+        mutex_lock(&ctrl->ctrl_lock);
 
         /* turn off slot, turn on Amber LED, turn off Green LED if supported*/
         if (POWER_CTRL(ctrl->ctrlcap)) {
                 if (pslot->hpc_ops->power_off_slot(pslot)) {   
                         err("%s: Issue of Slot Power Off command failed\n", __FUNCTION__);
-                        mutex_unlock(&ctrl->crit_sect);
+                        mutex_unlock(&ctrl->ctrl_lock);
                         return;
                 }
                 wait_for_ctrl_irq (ctrl);
@@ -249,14 +254,14 @@ static void set_slot_off(struct controller *ctrl, struct slot * pslot)
         if (ATTN_LED(ctrl->ctrlcap)) { 
                 if (pslot->hpc_ops->set_attention_status(pslot, 1)) {   
                         err("%s: Issue of Set Attention Led command failed\n", __FUNCTION__);
-                        mutex_unlock(&ctrl->crit_sect);
+                        mutex_unlock(&ctrl->ctrl_lock);
                         return;
                 }
                 wait_for_ctrl_irq (ctrl);
         }
 
         /* Done with exclusive hardware access */
-        mutex_unlock(&ctrl->crit_sect);
+        mutex_unlock(&ctrl->ctrl_lock);
 }
 
 /**
@@ -279,13 +284,13 @@ static int board_added(struct slot *p_slot)
                         ctrl->slot_device_offset, hp_slot);
 
         /* Wait for exclusive access to hardware */
-        mutex_lock(&ctrl->crit_sect);
+        mutex_lock(&ctrl->ctrl_lock);
 
         if (POWER_CTRL(ctrl->ctrlcap)) {
                 /* Power on slot */
                 rc = p_slot->hpc_ops->power_on_slot(p_slot);
                 if (rc) {
-                        mutex_unlock(&ctrl->crit_sect);
+                        mutex_unlock(&ctrl->ctrl_lock);
                         return -1;
                 }
 
@@ -301,7 +306,7 @@ static int board_added(struct slot *p_slot)
         }
 
         /* Done with exclusive hardware access */
-        mutex_unlock(&ctrl->crit_sect);
+        mutex_unlock(&ctrl->ctrl_lock);
 
         /* Wait for ~1 second */
         wait_for_ctrl_irq (ctrl);
@@ -335,7 +340,7 @@ static int board_added(struct slot *p_slot)
                 pci_fixup_device(pci_fixup_final, ctrl->pci_dev);
         if (PWR_LED(ctrl->ctrlcap)) {
                 /* Wait for exclusive access to hardware */
-                mutex_lock(&ctrl->crit_sect);
+                mutex_lock(&ctrl->ctrl_lock);
 
                 p_slot->hpc_ops->green_led_on(p_slot);
   
@@ -343,7 +348,7 @@ static int board_added(struct slot *p_slot)
                 wait_for_ctrl_irq (ctrl);
         
                 /* Done with exclusive hardware access */
-                mutex_unlock(&ctrl->crit_sect);
+                mutex_unlock(&ctrl->ctrl_lock);
         }
         return 0;
 
@@ -375,14 +380,14 @@ static int remove_board(struct slot *p_slot)
         dbg("In %s, hp_slot = %d\n", __FUNCTION__, hp_slot);
 
         /* Wait for exclusive access to hardware */
-        mutex_lock(&ctrl->crit_sect);
+        mutex_lock(&ctrl->ctrl_lock);
 
         if (POWER_CTRL(ctrl->ctrlcap)) {
                 /* power off slot */
                 rc = p_slot->hpc_ops->power_off_slot(p_slot);
                 if (rc) {
                         err("%s: Issue of Slot Disable command failed\n", __FUNCTION__);
-                        mutex_unlock(&ctrl->crit_sect);
+                        mutex_unlock(&ctrl->ctrl_lock);
                         return rc;
                 }
                 /* Wait for the command to complete */
@@ -398,7 +403,7 @@ static int remove_board(struct slot *p_slot)
         }
 
         /* Done with exclusive hardware access */
-        mutex_unlock(&ctrl->crit_sect);
+        mutex_unlock(&ctrl->ctrl_lock);
 
         return 0;
 }
@@ -445,7 +450,7 @@ static void pciehp_pushbutton_thread(unsigned long slot)
 
                 if (pciehp_enable_slot(p_slot) && PWR_LED(p_slot->ctrl->ctrlcap)) {
                         /* Wait for exclusive access to hardware */
-                        mutex_lock(&p_slot->ctrl->crit_sect);
+                        mutex_lock(&p_slot->ctrl->ctrl_lock);
 
                         p_slot->hpc_ops->green_led_off(p_slot);
 
@@ -453,7 +458,7 @@ static void pciehp_pushbutton_thread(unsigned long slot)
                         wait_for_ctrl_irq (p_slot->ctrl);
 
                         /* Done with exclusive hardware access */
-                        mutex_unlock(&p_slot->ctrl->crit_sect);
+                        mutex_unlock(&p_slot->ctrl->ctrl_lock);
                 }
                 p_slot->state = STATIC_STATE;
         }
@@ -495,7 +500,7 @@ static void pciehp_surprise_rm_thread(unsigned long slot)
 
                 if (pciehp_enable_slot(p_slot) && PWR_LED(p_slot->ctrl->ctrlcap)) {
                         /* Wait for exclusive access to hardware */
-                        mutex_lock(&p_slot->ctrl->crit_sect);
+                        mutex_lock(&p_slot->ctrl->ctrl_lock);
 
                         p_slot->hpc_ops->green_led_off(p_slot);
 
@@ -503,7 +508,7 @@ static void pciehp_surprise_rm_thread(unsigned long slot)
                         wait_for_ctrl_irq (p_slot->ctrl);
 
                         /* Done with exclusive hardware access */
-                        mutex_unlock(&p_slot->ctrl->crit_sect);
+                        mutex_unlock(&p_slot->ctrl->ctrl_lock);
                 }
                 p_slot->state = STATIC_STATE;
         }
@@ -616,7 +621,7 @@ static void interrupt_event_handler(struct controller *ctrl)
                                         switch (p_slot->state) {
                                         case BLINKINGOFF_STATE:
                                                 /* Wait for exclusive access to hardware */
-                                                mutex_lock(&ctrl->crit_sect);
+                                                mutex_lock(&ctrl->ctrl_lock);
                                                 
                                                 if (PWR_LED(ctrl->ctrlcap)) {
                                                         p_slot->hpc_ops->green_led_on(p_slot);
@@ -630,11 +635,11 @@ static void interrupt_event_handler(struct controller *ctrl)
                                                         wait_for_ctrl_irq (ctrl);
                                                 }
                                                 /* Done with exclusive hardware access */
-                                                mutex_unlock(&ctrl->crit_sect);
+                                                mutex_unlock(&ctrl->ctrl_lock);
                                                 break;
                                         case BLINKINGON_STATE:
                                                 /* Wait for exclusive access to hardware */
-                                                mutex_lock(&ctrl->crit_sect);
+                                                mutex_lock(&ctrl->ctrl_lock);
 
                                                 if (PWR_LED(ctrl->ctrlcap)) {
                                                         p_slot->hpc_ops->green_led_off(p_slot);
@@ -647,14 +652,14 @@ static void interrupt_event_handler(struct controller *ctrl)
                                                         wait_for_ctrl_irq (ctrl);
                                                 }
                                                 /* Done with exclusive hardware access */
-                                                mutex_unlock(&ctrl->crit_sect);
+                                                mutex_unlock(&ctrl->ctrl_lock);
 
                                                 break;
                                         default:
                                                 warn("Not a valid state\n");
                                                 return;
                                         }
-                                        info(msg_button_cancel, p_slot->number);
+                                        info(msg_button_cancel, slot_name(p_slot));
                                         p_slot->state = STATIC_STATE;
                                 }
                                 /* ***********Button Pressed (No action on 1st press...) */
@@ -667,16 +672,16 @@ static void interrupt_event_handler(struct controller *ctrl)
                                                         /* slot is on */
                                                         dbg("slot is on\n");
                                                         p_slot->state = BLINKINGOFF_STATE;
-                                                        info(msg_button_off, p_slot->number);
+                                                        info(msg_button_off, slot_name(p_slot));
                                                 } else {
                                                         /* slot is off */
                                                         dbg("slot is off\n");
                                                         p_slot->state = BLINKINGON_STATE;
-                                                        info(msg_button_on, p_slot->number);
+                                                        info(msg_button_on, slot_name(p_slot));
                                                 }
 
                                                 /* Wait for exclusive access to hardware */
-                                                mutex_lock(&ctrl->crit_sect);
+                                                mutex_lock(&ctrl->ctrl_lock);
 
                                                 /* blink green LED and turn off amber */
                                                 if (PWR_LED(ctrl->ctrlcap)) {
@@ -693,7 +698,7 @@ static void interrupt_event_handler(struct controller *ctrl)
                                                 }
 
                                                 /* Done with exclusive hardware access */
-                                                mutex_unlock(&ctrl->crit_sect);
+                                                mutex_unlock(&ctrl->ctrl_lock);
 
                                                 init_timer(&p_slot->task_event);
                                                 p_slot->task_event.expires = jiffies + 5 * HZ;   /* 5 second delay */
@@ -708,7 +713,7 @@ static void interrupt_event_handler(struct controller *ctrl)
                                         if (POWER_CTRL(ctrl->ctrlcap)) {
                                                 dbg("power fault\n");
                                                 /* Wait for exclusive access to hardware */
-                                                mutex_lock(&ctrl->crit_sect);
+                                                mutex_lock(&ctrl->ctrl_lock);
 
                                                 if (ATTN_LED(ctrl->ctrlcap)) {
                                                         p_slot->hpc_ops->set_attention_status(p_slot, 1);
@@ -721,7 +726,7 @@ static void interrupt_event_handler(struct controller *ctrl)
                                                 }
 
                                                 /* Done with exclusive hardware access */
-                                                mutex_unlock(&ctrl->crit_sect);
+                                                mutex_unlock(&ctrl->ctrl_lock);
                                         }
                                 }
                                 /***********SURPRISE REMOVAL********************/
@@ -760,14 +765,16 @@ int pciehp_enable_slot(struct slot *p_slot)
 
         rc = p_slot->hpc_ops->get_adapter_status(p_slot, &getstatus);
         if (rc || !getstatus) {
-                info("%s: no adapter on slot(%x)\n", __FUNCTION__, p_slot->number);
+                info("%s: no adapter on slot(%s)\n", __FUNCTION__,
+                     slot_name(p_slot));
                 mutex_unlock(&p_slot->ctrl->crit_sect);
                 return -ENODEV;
         }
         if (MRL_SENS(p_slot->ctrl->ctrlcap)) {  
                 rc = p_slot->hpc_ops->get_latch_status(p_slot, &getstatus);
                 if (rc || getstatus) {
-                        info("%s: latch open on slot(%x)\n", __FUNCTION__, p_slot->number);
+                        info("%s: latch open on slot(%s)\n", __FUNCTION__,
+                             slot_name(p_slot));
                         mutex_unlock(&p_slot->ctrl->crit_sect);
                         return -ENODEV;
                 }
@@ -776,12 +783,12 @@ int pciehp_enable_slot(struct slot *p_slot)
         if (POWER_CTRL(p_slot->ctrl->ctrlcap)) {        
                 rc = p_slot->hpc_ops->get_power_status(p_slot, &getstatus);
                 if (rc || getstatus) {
-                        info("%s: already enabled on slot(%x)\n", __FUNCTION__, p_slot->number);
+                        info("%s: already enabled on slot(%s)\n", __FUNCTION__,
+                             slot_name(p_slot));
                         mutex_unlock(&p_slot->ctrl->crit_sect);
                         return -EINVAL;
                 }
         }
-        mutex_unlock(&p_slot->ctrl->crit_sect);
 
         p_slot->hpc_ops->get_latch_status(p_slot, &getstatus);
 
@@ -790,9 +797,9 @@ int pciehp_enable_slot(struct slot *p_slot)
                 p_slot->hpc_ops->get_latch_status(p_slot, &getstatus);
         }
 
-        if (p_slot)
-                update_slot_info(p_slot);
+        update_slot_info(p_slot);
 
+        mutex_unlock(&p_slot->ctrl->crit_sect);
         return rc;
 }
 
@@ -811,7 +818,8 @@ int pciehp_disable_slot(struct slot *p_slot)
         if (!HP_SUPR_RM(p_slot->ctrl->ctrlcap)) {       
                 ret = p_slot->hpc_ops->get_adapter_status(p_slot, &getstatus);
                 if (ret || !getstatus) {
-                        info("%s: no adapter on slot(%x)\n", __FUNCTION__, p_slot->number);
+                        info("%s: no adapter on slot(%s)\n", __FUNCTION__,
+                             slot_name(p_slot));
                         mutex_unlock(&p_slot->ctrl->crit_sect);
                         return -ENODEV;
                 }
@@ -820,7 +828,8 @@ int pciehp_disable_slot(struct slot *p_slot)
         if (MRL_SENS(p_slot->ctrl->ctrlcap)) {  
                 ret = p_slot->hpc_ops->get_latch_status(p_slot, &getstatus);
                 if (ret || getstatus) {
-                        info("%s: latch open on slot(%x)\n", __FUNCTION__, p_slot->number);
+                        info("%s: latch open on slot(%s)\n", __FUNCTION__,
+                             slot_name(p_slot));
                         mutex_unlock(&p_slot->ctrl->crit_sect);
                         return -ENODEV;
                 }
@@ -829,16 +838,17 @@ int pciehp_disable_slot(struct slot *p_slot)
         if (POWER_CTRL(p_slot->ctrl->ctrlcap)) {        
                 ret = p_slot->hpc_ops->get_power_status(p_slot, &getstatus);
                 if (ret || !getstatus) {
-                        info("%s: already disabled slot(%x)\n", __FUNCTION__, p_slot->number);
+                        info("%s: already disabled slot(%s)\n", __FUNCTION__,
+                             slot_name(p_slot));
                         mutex_unlock(&p_slot->ctrl->crit_sect);
                         return -EINVAL;
                 }
         }
 
-        mutex_unlock(&p_slot->ctrl->crit_sect);
-
         ret = remove_board(p_slot);
         update_slot_info(p_slot);
+
+        mutex_unlock(&p_slot->ctrl->crit_sect);
         return ret;
 }
 
diff --git a/drivers/pci/hotplug/pciehp_hpc.c b/drivers/pci/hotplug/pciehp_hpc.c
index 703a64a39fe8..1c551c697c35 100644
--- a/drivers/pci/hotplug/pciehp_hpc.c
+++ b/drivers/pci/hotplug/pciehp_hpc.c
@@ -1402,6 +1402,8 @@ int pcie_init(struct controller * ctrl, struct pcie_device *dev)
                 pdev->subsystem_vendor, pdev->subsystem_device);
 
         mutex_init(&ctrl->crit_sect);
+        mutex_init(&ctrl->ctrl_lock);
+
         /* setup wait queue */
         init_waitqueue_head(&ctrl->queue);
 
diff --git a/drivers/pci/hotplug/pcihp_skeleton.c b/drivers/pci/hotplug/pcihp_skeleton.c
index 2b9e10e38613..50bcd3fe61da 100644
--- a/drivers/pci/hotplug/pcihp_skeleton.c
+++ b/drivers/pci/hotplug/pcihp_skeleton.c
@@ -33,8 +33,8 @@
 #include <linux/kernel.h>
 #include <linux/slab.h>
 #include <linux/pci.h>
+#include <linux/pci_hotplug.h>
 #include <linux/init.h>
-#include "pci_hotplug.h"
 
 #define SLOT_NAME_SIZE  10
 struct slot {
diff --git a/drivers/pci/hotplug/rpadlpar_sysfs.c b/drivers/pci/hotplug/rpadlpar_sysfs.c
index db69be85b458..6c5be3ff578c 100644
--- a/drivers/pci/hotplug/rpadlpar_sysfs.c
+++ b/drivers/pci/hotplug/rpadlpar_sysfs.c
@@ -14,7 +14,7 @@
  */
 #include <linux/kobject.h>
 #include <linux/string.h>
-#include "pci_hotplug.h"
+#include <linux/pci_hotplug.h>
 #include "rpadlpar.h"
 
 #define DLPAR_KOBJ_NAME       "control"
diff --git a/drivers/pci/hotplug/rpaphp.h b/drivers/pci/hotplug/rpaphp.h
index 310b6186c0e5..2e7accf0f734 100644
--- a/drivers/pci/hotplug/rpaphp.h
+++ b/drivers/pci/hotplug/rpaphp.h
@@ -28,7 +28,7 @@
 #define _PPC64PHP_H
 
 #include <linux/pci.h>
-#include "pci_hotplug.h"
+#include <linux/pci_hotplug.h>
 
 #define DR_INDICATOR 9002
 #define DR_ENTITY_SENSE 9003
diff --git a/drivers/pci/hotplug/rpaphp_core.c b/drivers/pci/hotplug/rpaphp_core.c
index 7288a3eccfb3..141486df235b 100644
--- a/drivers/pci/hotplug/rpaphp_core.c
+++ b/drivers/pci/hotplug/rpaphp_core.c
@@ -26,6 +26,7 @@
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/pci.h>
+#include <linux/pci_hotplug.h>
 #include <linux/slab.h>
 #include <linux/smp.h>
 #include <linux/smp_lock.h>
@@ -36,7 +37,6 @@
 #include "../pci.h"             /* for pci_add_new_bus */
                                 /* and pci_do_scan_bus */
 #include "rpaphp.h"
-#include "pci_hotplug.h"
 
 int debug;
 static struct semaphore rpaphp_sem;
diff --git a/drivers/pci/hotplug/sgi_hotplug.c b/drivers/pci/hotplug/sgi_hotplug.c
index f31d83c2c633..b62ad31a9739 100644
--- a/drivers/pci/hotplug/sgi_hotplug.c
+++ b/drivers/pci/hotplug/sgi_hotplug.c
@@ -13,6 +13,7 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/pci.h>
+#include <linux/pci_hotplug.h>
 #include <linux/proc_fs.h>
 #include <linux/types.h>
 #include <linux/mutex.h>
@@ -29,7 +30,6 @@
 #include <asm/sn/types.h>
 
 #include "../pci.h"
-#include "pci_hotplug.h"
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("SGI (prarit@sgi.com, dickie@sgi.com, habeck@sgi.com)");
diff --git a/drivers/pci/hotplug/shpchp.h b/drivers/pci/hotplug/shpchp.h
index c7103ac5cd06..ea2087c34149 100644
--- a/drivers/pci/hotplug/shpchp.h
+++ b/drivers/pci/hotplug/shpchp.h
@@ -31,12 +31,11 @@
 
 #include <linux/types.h>
 #include <linux/pci.h>
+#include <linux/pci_hotplug.h>
 #include <linux/delay.h>
 #include <linux/sched.h>        /* signal_pending(), struct timer_list */
 #include <linux/mutex.h>
 
-#include "pci_hotplug.h"
-
 #if !defined(MODULE)
         #define MY_NAME "shpchp"
 #else
@@ -103,7 +102,6 @@ struct controller {
         u32 cap_offset;
         unsigned long mmio_base;
         unsigned long mmio_size;
-        volatile int cmd_busy;
 };
 
 
diff --git a/drivers/pci/hotplug/shpchp_hpc.c b/drivers/pci/hotplug/shpchp_hpc.c
index 4d8aee119134..83a5226ba9ed 100644
--- a/drivers/pci/hotplug/shpchp_hpc.c
+++ b/drivers/pci/hotplug/shpchp_hpc.c
@@ -302,21 +302,51 @@ static void start_int_poll_timer(struct php_ctlr_state_s *php_ctlr, int sec)
         add_timer(&php_ctlr->int_poll_timer);
 }
 
+static inline int is_ctrl_busy(struct controller *ctrl)
+{
+        u16 cmd_status = shpc_readw(ctrl, CMD_STATUS);
+        return cmd_status & 0x1;
+}
+
+/*
+ * Returns 1 if SHPC finishes executing a command within 1 sec,
+ * otherwise returns 0.
+ */
+static inline int shpc_poll_ctrl_busy(struct controller *ctrl)
+{
+        int i;
+
+        if (!is_ctrl_busy(ctrl))
+                return 1;
+
+        /* Check every 0.1 sec for a total of 1 sec */
+        for (i = 0; i < 10; i++) {
+                msleep(100);
+                if (!is_ctrl_busy(ctrl))
+                        return 1;
+        }
+
+        return 0;
+}
+
 static inline int shpc_wait_cmd(struct controller *ctrl)
 {
         int retval = 0;
-        unsigned int timeout_msec = shpchp_poll_mode ? 2000 : 1000;
-        unsigned long timeout = msecs_to_jiffies(timeout_msec);
-        int rc = wait_event_interruptible_timeout(ctrl->queue,
-                                                  !ctrl->cmd_busy, timeout);
-        if (!rc) {
+        unsigned long timeout = msecs_to_jiffies(1000);
+        int rc;
+
+        if (shpchp_poll_mode)
+                rc = shpc_poll_ctrl_busy(ctrl);
+        else
+                rc = wait_event_interruptible_timeout(ctrl->queue,
+                                                !is_ctrl_busy(ctrl), timeout);
+        if (!rc && is_ctrl_busy(ctrl)) {
                 retval = -EIO;
-                err("Command not completed in %d msec\n", timeout_msec);
+                err("Command not completed in 1000 msec\n");
         } else if (rc < 0) {
                 retval = -EINTR;
                 info("Command was interrupted by a signal\n");
         }
-        ctrl->cmd_busy = 0;
 
         return retval;
 }
@@ -327,26 +357,15 @@ static int shpc_write_cmd(struct slot *slot, u8 t_slot, u8 cmd)
         u16 cmd_status;
         int retval = 0;
         u16 temp_word;
-        int i;
 
         DBG_ENTER_ROUTINE 
 
         mutex_lock(&slot->ctrl->cmd_lock);
 
-        for (i = 0; i < 10; i++) {
-                cmd_status = shpc_readw(ctrl, CMD_STATUS);
-                
-                if (!(cmd_status & 0x1))
-                        break;
-                /*  Check every 0.1 sec for a total of 1 sec*/
-                msleep(100);
-        }
-
-        cmd_status = shpc_readw(ctrl, CMD_STATUS);
-        
-        if (cmd_status & 0x1) { 
+        if (!shpc_poll_ctrl_busy(ctrl)) {
                 /* After 1 sec and and the controller is still busy */
-                err("%s : Controller is still busy after 1 sec.\n", __FUNCTION__);
+                err("%s : Controller is still busy after 1 sec.\n",
+                    __FUNCTION__);
                 retval = -EBUSY;
                 goto out;
         }
@@ -358,7 +377,6 @@ static int shpc_write_cmd(struct slot *slot, u8 t_slot, u8 cmd)
         /* To make sure the Controller Busy bit is 0 before we send out the
          * command. 
          */
-        slot->ctrl->cmd_busy = 1;
         shpc_writew(ctrl, CMD, temp_word);
 
         /*
@@ -908,7 +926,6 @@ static irqreturn_t shpc_isr(int irq, void *dev_id)
                 serr_int &= ~SERR_INTR_RSVDZ_MASK;
                 shpc_writel(ctrl, SERR_INTR_ENABLE, serr_int);
 
-                ctrl->cmd_busy = 0;
                 wake_up_interruptible(&ctrl->queue);
         }
 
@@ -1101,7 +1118,7 @@ int shpc_init(struct controller * ctrl, struct pci_dev * pdev)
 {
         struct php_ctlr_state_s *php_ctlr, *p;
         void *instance_id = ctrl;
-        int rc, num_slots = 0;
+        int rc = -1, num_slots = 0;
         u8 hp_slot;
         u32 shpc_base_offset;
         u32 tempdword, slot_reg, slot_config;
@@ -1167,11 +1184,15 @@ int shpc_init(struct controller * ctrl, struct pci_dev * pdev)
         info("HPC vendor_id %x device_id %x ss_vid %x ss_did %x\n", pdev->vendor, pdev->device, pdev->subsystem_vendor, 
                 pdev->subsystem_device);
         
-        if (pci_enable_device(pdev))
+        rc = pci_enable_device(pdev);
+        if (rc) {
+                err("%s: pci_enable_device failed\n", __FUNCTION__);
                 goto abort_free_ctlr;
+        }
 
         if (!request_mem_region(ctrl->mmio_base, ctrl->mmio_size, MY_NAME)) {
                 err("%s: cannot reserve MMIO region\n", __FUNCTION__);
+                rc = -1;
                 goto abort_free_ctlr;
         }
 
@@ -1180,6 +1201,7 @@ int shpc_init(struct controller * ctrl, struct pci_dev * pdev)
                 err("%s: cannot remap MMIO region %lx @ %lx\n", __FUNCTION__,
                     ctrl->mmio_size, ctrl->mmio_base);
                 release_mem_region(ctrl->mmio_base, ctrl->mmio_size);
+                rc = -1;
                 goto abort_free_ctlr;
         }
         dbg("%s: php_ctlr->creg %p\n", __FUNCTION__, php_ctlr->creg);
@@ -1282,8 +1304,10 @@ int shpc_init(struct controller * ctrl, struct pci_dev * pdev)
          */
         if (atomic_add_return(1, &shpchp_num_controllers) == 1) {
                 shpchp_wq = create_singlethread_workqueue("shpchpd");
-                if (!shpchp_wq)
-                        return -ENOMEM;
+                if (!shpchp_wq) {
+                        rc = -ENOMEM;
+                        goto abort_free_ctlr;
+                }
         }
 
         /*
@@ -1313,8 +1337,10 @@ int shpc_init(struct controller * ctrl, struct pci_dev * pdev)
 
         /* We end up here for the many possible ways to fail this API.  */
 abort_free_ctlr:
+        if (php_ctlr->creg)
+                iounmap(php_ctlr->creg);
         kfree(php_ctlr);
 abort:
         DBG_LEAVE_ROUTINE
-        return -1;
+        return rc;
 }
diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
index f9fdc54473c4..9fc9a34ef24a 100644
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
@@ -627,22 +627,24 @@ static int msix_capability_init(struct pci_dev *dev,
  * pci_msi_supported - check whether MSI may be enabled on device
  * @dev: pointer to the pci_dev data structure of MSI device function
  *
- * MSI must be globally enabled and supported by the device and its root
- * bus. But, the root bus is not easy to find since some architectures
- * have virtual busses on top of the PCI hierarchy (for instance the
- * hypertransport bus), while the actual bus where MSI must be supported
- * is below. So we test the MSI flag on all parent busses and assume
- * that no quirk will ever set the NO_MSI flag on a non-root bus.
+ * Look at global flags, the device itself, and its parent busses
+ * to return 0 if MSI are supported for the device.
  **/
 static
 int pci_msi_supported(struct pci_dev * dev)
 {
         struct pci_bus *bus;
 
+        /* MSI must be globally enabled and supported by the device */
         if (!pci_msi_enable || !dev || dev->no_msi)
                 return -EINVAL;
 
-        /* check MSI flags of all parent busses */
+        /* Any bridge which does NOT route MSI transactions from it's
+         * secondary bus to it's primary bus must set NO_MSI flag on
+         * the secondary pci_bus.
+         * We expect only arch-specific PCI host bus controller driver
+         * or quirks for specific PCI bridges to be setting NO_MSI.
+         */
         for (bus = dev->bus; bus; bus = bus->parent)
                 if (bus->bus_flags & PCI_BUS_FLAGS_NO_MSI)
                         return -EINVAL;
diff --git a/drivers/pci/pcie/portdrv.h b/drivers/pci/pcie/portdrv.h
index 67fcd176babd..3656e0349dd1 100644
--- a/drivers/pci/pcie/portdrv.h
+++ b/drivers/pci/pcie/portdrv.h
@@ -9,6 +9,8 @@
 #ifndef _PORTDRV_H_
 #define _PORTDRV_H_
 
+#include <linux/compiler.h>
+
 #if !defined(PCI_CAP_ID_PME)
 #define PCI_CAP_ID_PME                  1
 #endif
@@ -39,7 +41,7 @@ extern int pcie_port_device_suspend(struct pci_dev *dev, pm_message_t state);
 extern int pcie_port_device_resume(struct pci_dev *dev);
 #endif
 extern void pcie_port_device_remove(struct pci_dev *dev);
-extern int pcie_port_bus_register(void);
+extern int __must_check pcie_port_bus_register(void);
 extern void pcie_port_bus_unregister(void);
 
 #endif /* _PORTDRV_H_ */
diff --git a/drivers/pci/pcie/portdrv_core.c b/drivers/pci/pcie/portdrv_core.c
index bd6615b4d40e..b20a9b81dae2 100644
--- a/drivers/pci/pcie/portdrv_core.c
+++ b/drivers/pci/pcie/portdrv_core.c
@@ -6,7 +6,6 @@
  * Copyright (C) Tom Long Nguyen (tom.l.nguyen@intel.com)
  */
 
-#include <linux/compiler.h>
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/kernel.h>
@@ -401,7 +400,7 @@ void pcie_port_device_remove(struct pci_dev *dev)
                 pci_disable_msi(dev);
 }
 
-int __must_check pcie_port_bus_register(void)
+int pcie_port_bus_register(void)
 {
         return bus_register(&pcie_port_bus_type);
 }
diff --git a/drivers/pci/pcie/portdrv_pci.c b/drivers/pci/pcie/portdrv_pci.c
index 037690e08f5f..b4da7954611e 100644
--- a/drivers/pci/pcie/portdrv_pci.c
+++ b/drivers/pci/pcie/portdrv_pci.c
@@ -37,7 +37,6 @@ static int pcie_portdrv_save_config(struct pci_dev *dev)
         return pci_save_state(dev);
 }
 
-#ifdef CONFIG_PM
 static int pcie_portdrv_restore_config(struct pci_dev *dev)
 {
         int retval;
@@ -50,6 +49,7 @@ static int pcie_portdrv_restore_config(struct pci_dev *dev)
         return 0;
 }
 
+#ifdef CONFIG_PM
 static int pcie_portdrv_suspend(struct pci_dev *dev, pm_message_t state)
 {
         int ret = pcie_port_device_suspend(dev, state);
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index a3b0a5eb5054..e159d6604494 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -1067,3 +1067,95 @@ EXPORT_SYMBOL(pci_scan_bridge);
 EXPORT_SYMBOL(pci_scan_single_device);
 EXPORT_SYMBOL_GPL(pci_scan_child_bus);
 #endif
+
+static int __init pci_sort_bf_cmp(const struct pci_dev *a, const struct pci_dev *b)
+{
+        if      (pci_domain_nr(a->bus) < pci_domain_nr(b->bus)) return -1;
+        else if (pci_domain_nr(a->bus) > pci_domain_nr(b->bus)) return  1;
+
+        if      (a->bus->number < b->bus->number) return -1;
+        else if (a->bus->number > b->bus->number) return  1;
+
+        if      (a->devfn < b->devfn) return -1;
+        else if (a->devfn > b->devfn) return  1;
+
+        return 0;
+}
+
+/*
+ * Yes, this forcably breaks the klist abstraction temporarily.  It
+ * just wants to sort the klist, not change reference counts and
+ * take/drop locks rapidly in the process.  It does all this while
+ * holding the lock for the list, so objects can't otherwise be
+ * added/removed while we're swizzling.
+ */
+static void __init pci_insertion_sort_klist(struct pci_dev *a, struct list_head *list)
+{
+        struct list_head *pos;
+        struct klist_node *n;
+        struct device *dev;
+        struct pci_dev *b;
+
+        list_for_each(pos, list) {
+                n = container_of(pos, struct klist_node, n_node);
+                dev = container_of(n, struct device, knode_bus);
+                b = to_pci_dev(dev);
+                if (pci_sort_bf_cmp(a, b) <= 0) {
+                        list_move_tail(&a->dev.knode_bus.n_node, &b->dev.knode_bus.n_node);
+                        return;
+                }
+        }
+        list_move_tail(&a->dev.knode_bus.n_node, list);
+}
+
+static void __init pci_sort_breadthfirst_klist(void)
+{
+        LIST_HEAD(sorted_devices);
+        struct list_head *pos, *tmp;
+        struct klist_node *n;
+        struct device *dev;
+        struct pci_dev *pdev;
+
+        spin_lock(&pci_bus_type.klist_devices.k_lock);
+        list_for_each_safe(pos, tmp, &pci_bus_type.klist_devices.k_list) {
+                n = container_of(pos, struct klist_node, n_node);
+                dev = container_of(n, struct device, knode_bus);
+                pdev = to_pci_dev(dev);
+                pci_insertion_sort_klist(pdev, &sorted_devices);
+        }
+        list_splice(&sorted_devices, &pci_bus_type.klist_devices.k_list);
+        spin_unlock(&pci_bus_type.klist_devices.k_lock);
+}
+
+static void __init pci_insertion_sort_devices(struct pci_dev *a, struct list_head *list)
+{
+        struct pci_dev *b;
+
+        list_for_each_entry(b, list, global_list) {
+                if (pci_sort_bf_cmp(a, b) <= 0) {
+                        list_move_tail(&a->global_list, &b->global_list);
+                        return;
+                }
+        }
+        list_move_tail(&a->global_list, list);
+}
+
+static void __init pci_sort_breadthfirst_devices(void)
+{
+        LIST_HEAD(sorted_devices);
+        struct pci_dev *dev, *tmp;
+
+        down_write(&pci_bus_sem);
+        list_for_each_entry_safe(dev, tmp, &pci_devices, global_list) {
+                pci_insertion_sort_devices(dev, &sorted_devices);
+        }
+        list_splice(&sorted_devices, &pci_devices);
+        up_write(&pci_bus_sem);
+}
+
+void __init pci_sort_breadthfirst(void)
+{
+        pci_sort_breadthfirst_devices();
+        pci_sort_breadthfirst_klist();
+}
+
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index 23b599d6a9d5..e8a7f1b1b2bc 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -453,6 +453,12 @@ static void __devinit quirk_ich6_lpc_acpi(struct pci_dev *dev)
 }
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_ICH6_0, quirk_ich6_lpc_acpi );
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_ICH6_1, quirk_ich6_lpc_acpi );
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_ICH7_0, quirk_ich6_lpc_acpi );
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_ICH7_1, quirk_ich6_lpc_acpi );
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_ICH7_31, quirk_ich6_lpc_acpi );
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_ICH8_0, quirk_ich6_lpc_acpi );
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_ICH8_2, quirk_ich6_lpc_acpi );
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_ICH8_3, quirk_ich6_lpc_acpi );
 
 /*
  * VIA ACPI: One IO region pointed to by longword at
@@ -648,11 +654,43 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_VIA,	PCI_DEVICE_ID_VIA_82C686_4,	quirk_vi
  * Some of the on-chip devices are actually '586 devices' so they are
  * listed here.
  */
+
+static int via_irq_fixup_needed = -1;
+
+/*
+ * As some VIA hardware is available in PCI-card form, we need to restrict
+ * this quirk to VIA PCI hardware built onto VIA-based motherboards only.
+ * We try to locate a VIA southbridge before deciding whether the quirk
+ * should be applied.
+ */
+static const struct pci_device_id via_irq_fixup_tbl[] = {
+        {
+                .vendor         = PCI_VENDOR_ID_VIA,
+                .device         = PCI_ANY_ID,
+                .subvendor      = PCI_ANY_ID,
+                .subdevice      = PCI_ANY_ID,
+                .class          = PCI_CLASS_BRIDGE_ISA << 8,
+                .class_mask     = 0xffff00,
+        },
+        { 0, },
+};
+
 static void quirk_via_irq(struct pci_dev *dev)
 {
         u8 irq, new_irq;
 
-        new_irq = dev->irq & 0xf;
+        if (via_irq_fixup_needed == -1)
+                via_irq_fixup_needed = pci_dev_present(via_irq_fixup_tbl);
+
+        if (!via_irq_fixup_needed)
+                return;
+
+        new_irq = dev->irq;
+
+        /* Don't quirk interrupts outside the legacy IRQ range */
+        if (!new_irq || new_irq > 15)
+                return;
+
         pci_read_config_byte(dev, PCI_INTERRUPT_LINE, &irq);
         if (new_irq != irq) {
                 printk(KERN_INFO "PCI: VIA IRQ fixup for %s, from %d to %d\n",
@@ -661,14 +699,7 @@ static void quirk_via_irq(struct pci_dev *dev)
                 pci_write_config_byte(dev, PCI_INTERRUPT_LINE, new_irq);
         }
 }
-DECLARE_PCI_FIXUP_ENABLE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C586_0, quirk_via_irq);
-DECLARE_PCI_FIXUP_ENABLE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C586_1, quirk_via_irq);
-DECLARE_PCI_FIXUP_ENABLE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C586_2, quirk_via_irq);
-DECLARE_PCI_FIXUP_ENABLE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C586_3, quirk_via_irq);
-DECLARE_PCI_FIXUP_ENABLE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8235_USB_2, quirk_via_irq);
-DECLARE_PCI_FIXUP_ENABLE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C686, quirk_via_irq);
-DECLARE_PCI_FIXUP_ENABLE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C686_4, quirk_via_irq);
-DECLARE_PCI_FIXUP_ENABLE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C686_5, quirk_via_irq);
+DECLARE_PCI_FIXUP_ENABLE(PCI_VENDOR_ID_VIA, PCI_ANY_ID, quirk_via_irq);
 
 /*
  * VIA VT82C598 has its device ID settable and many BIOSes
@@ -1588,6 +1619,51 @@ static void __devinit fixup_rev1_53c810(struct pci_dev* dev)
 }
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NCR, PCI_DEVICE_ID_NCR_53C810, fixup_rev1_53c810);
 
+/*
+ * Fixup to mark boot BIOS video selected by BIOS before it changes
+ *
+ * From information provided by "Jon Smirl" <jonsmirl@gmail.com>
+ *
+ * The standard boot ROM sequence for an x86 machine uses the BIOS
+ * to select an initial video card for boot display. This boot video
+ * card will have it's BIOS copied to C0000 in system RAM.
+ * IORESOURCE_ROM_SHADOW is used to associate the boot video
+ * card with this copy. On laptops this copy has to be used since
+ * the main ROM may be compressed or combined with another image.
+ * See pci_map_rom() for use of this flag. IORESOURCE_ROM_SHADOW
+ * is marked here since the boot video device will be the only enabled
+ * video device at this point.
+ */
+
+static void __devinit fixup_video(struct pci_dev *pdev)
+{
+        struct pci_dev *bridge;
+        struct pci_bus *bus;
+        u16 config;
+
+        if ((pdev->class >> 8) != PCI_CLASS_DISPLAY_VGA)
+                return;
+
+        /* Is VGA routed to us? */
+        bus = pdev->bus;
+        while (bus) {
+                bridge = bus->self;
+                if (bridge) {
+                        pci_read_config_word(bridge, PCI_BRIDGE_CONTROL,
+                                                &config);
+                        if (!(config & PCI_BRIDGE_CTL_VGA))
+                                return;
+                }
+                bus = bus->parent;
+        }
+        pci_read_config_word(pdev, PCI_COMMAND, &config);
+        if (config & (PCI_COMMAND_IO | PCI_COMMAND_MEMORY)) {
+                pdev->resource[PCI_ROM_RESOURCE].flags |= IORESOURCE_ROM_SHADOW;
+                printk(KERN_DEBUG "Boot video device is %s\n", pci_name(pdev));
+        }
+}
+DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, fixup_video);
+
 
 static void pci_do_fixups(struct pci_dev *dev, struct pci_fixup *f, struct pci_fixup *end)
 {
@@ -1764,7 +1840,7 @@ static void __devinit quirk_nvidia_ck804_msi_ht_cap(struct pci_dev *dev)
         /* check HT MSI cap on this chipset and the root one.
          * a single one having MSI is enough to be sure that MSI are supported.
          */
-        pdev = pci_find_slot(dev->bus->number, 0);
+        pdev = pci_get_slot(dev->bus, 0);
         if (dev->subordinate && !msi_ht_cap_enabled(dev)
             && !msi_ht_cap_enabled(pdev)) {
                 printk(KERN_WARNING "PCI: MSI quirk detected. "
@@ -1772,6 +1848,7 @@ static void __devinit quirk_nvidia_ck804_msi_ht_cap(struct pci_dev *dev)
                        pci_name(dev));
                 dev->subordinate->bus_flags |= PCI_BUS_FLAGS_NO_MSI;
         }
+        pci_dev_put(pdev);
 }
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_CK804_PCIE,
                         quirk_nvidia_ck804_msi_ht_cap);
diff --git a/drivers/pci/rom.c b/drivers/pci/rom.c
index f5ee7ce16fa6..43e4a49f2cc4 100644
--- a/drivers/pci/rom.c
+++ b/drivers/pci/rom.c
@@ -71,7 +71,10 @@ void __iomem *pci_map_rom(struct pci_dev *pdev, size_t *size)
         void __iomem *image;
         int last_image;
 
-        /* IORESOURCE_ROM_SHADOW only set on x86 */
+        /*
+         * IORESOURCE_ROM_SHADOW set if the VGA enable bit of the Bridge Control
+         * register is set for embedded VGA.
+         */
         if (res->flags & IORESOURCE_ROM_SHADOW) {
                 /* primary video rom always starts here */
                 start = (loff_t)0xC0000;
diff --git a/drivers/pci/search.c b/drivers/pci/search.c
index d529462d1b53..2f13eba5d5ae 100644
--- a/drivers/pci/search.c
+++ b/drivers/pci/search.c
@@ -140,6 +140,31 @@ struct pci_dev * pci_get_slot(struct pci_bus *bus, unsigned int devfn)
 }
 
 /**
+ * pci_get_bus_and_slot - locate PCI device from a given PCI slot
+ * @bus: number of PCI bus on which desired PCI device resides
+ * @devfn: encodes number of PCI slot in which the desired PCI
+ * device resides and the logical device number within that slot
+ * in case of multi-function devices.
+ *
+ * Given a PCI bus and slot/function number, the desired PCI device
+ * is located in system global list of PCI devices.  If the device
+ * is found, a pointer to its data structure is returned.  If no
+ * device is found, %NULL is returned. The returned device has its
+ * reference count bumped by one.
+ */
+
+struct pci_dev * pci_get_bus_and_slot(unsigned int bus, unsigned int devfn)
+{
+        struct pci_dev *dev = NULL;
+
+        while ((dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) {
+                if (dev->bus->number == bus && dev->devfn == devfn)
+                        return dev;
+        }
+        return NULL;
+}
+
+/**
  * pci_find_subsys - begin or continue searching for a PCI device by vendor/subvendor/device/subdevice id
  * @vendor: PCI vendor id to match, or %PCI_ANY_ID to match all vendor ids
  * @device: PCI device id to match, or %PCI_ANY_ID to match all device ids
@@ -274,6 +299,45 @@ pci_get_device(unsigned int vendor, unsigned int device, struct pci_dev *from)
         return pci_get_subsys(vendor, device, PCI_ANY_ID, PCI_ANY_ID, from);
 }
 
+/**
+ * pci_get_device_reverse - begin or continue searching for a PCI device by vendor/device id
+ * @vendor: PCI vendor id to match, or %PCI_ANY_ID to match all vendor ids
+ * @device: PCI device id to match, or %PCI_ANY_ID to match all device ids
+ * @from: Previous PCI device found in search, or %NULL for new search.
+ *
+ * Iterates through the list of known PCI devices in the reverse order of
+ * pci_get_device.
+ * If a PCI device is found with a matching @vendor and @device, the reference
+ * count to the  device is incremented and a pointer to its device structure
+ * is returned Otherwise, %NULL is returned.  A new search is initiated by
+ * passing %NULL as the @from argument.  Otherwise if @from is not %NULL,
+ * searches continue from next device on the global list.  The reference
+ * count for @from is always decremented if it is not %NULL.
+ */
+struct pci_dev *
+pci_get_device_reverse(unsigned int vendor, unsigned int device, struct pci_dev *from)
+{
+        struct list_head *n;
+        struct pci_dev *dev;
+
+        WARN_ON(in_interrupt());
+        down_read(&pci_bus_sem);
+        n = from ? from->global_list.prev : pci_devices.prev;
+
+        while (n && (n != &pci_devices)) {
+                dev = pci_dev_g(n);
+                if ((vendor == PCI_ANY_ID || dev->vendor == vendor) &&
+                    (device == PCI_ANY_ID || dev->device == device))
+                        goto exit;
+                n = n->prev;
+        }
+        dev = NULL;
+exit:
+        dev = pci_dev_get(dev);
+        up_read(&pci_bus_sem);
+        pci_dev_put(from);
+        return dev;
+}
 
 /**
  * pci_find_device_reverse - begin or continue searching for a PCI device by vendor/device id
@@ -382,12 +446,16 @@ exit:
 }
 EXPORT_SYMBOL(pci_dev_present);
 
-EXPORT_SYMBOL(pci_find_bus);
-EXPORT_SYMBOL(pci_find_next_bus);
 EXPORT_SYMBOL(pci_find_device);
 EXPORT_SYMBOL(pci_find_device_reverse);
 EXPORT_SYMBOL(pci_find_slot);
+/* For boot time work */
+EXPORT_SYMBOL(pci_find_bus);
+EXPORT_SYMBOL(pci_find_next_bus);
+/* For everyone */
 EXPORT_SYMBOL(pci_get_device);
+EXPORT_SYMBOL(pci_get_device_reverse);
 EXPORT_SYMBOL(pci_get_subsys);
 EXPORT_SYMBOL(pci_get_slot);
+EXPORT_SYMBOL(pci_get_bus_and_slot);
 EXPORT_SYMBOL(pci_get_class);
diff --git a/drivers/pnp/pnpacpi/rsparser.c b/drivers/pnp/pnpacpi/rsparser.c
index dc79b0a0059f..379048fdf05d 100644
--- a/drivers/pnp/pnpacpi/rsparser.c
+++ b/drivers/pnp/pnpacpi/rsparser.c
@@ -776,21 +776,32 @@ static void pnpacpi_encode_dma(struct acpi_resource *resource,
         struct resource *p)
 {
         /* Note: pnp_assign_dma will copy pnp_dma->flags into p->flags */
-        if (p->flags & IORESOURCE_DMA_COMPATIBLE)
-                resource->data.dma.type = ACPI_COMPATIBILITY;
-        else if (p->flags & IORESOURCE_DMA_TYPEA)
-                resource->data.dma.type = ACPI_TYPE_A;
-        else if (p->flags & IORESOURCE_DMA_TYPEB)
-                resource->data.dma.type = ACPI_TYPE_B;
-        else if (p->flags & IORESOURCE_DMA_TYPEF)
-                resource->data.dma.type = ACPI_TYPE_F;
-        if (p->flags & IORESOURCE_DMA_8BIT)
-                resource->data.dma.transfer = ACPI_TRANSFER_8;
-        else if (p->flags & IORESOURCE_DMA_8AND16BIT)
-                resource->data.dma.transfer = ACPI_TRANSFER_8_16;
-        else if (p->flags & IORESOURCE_DMA_16BIT)
-                resource->data.dma.transfer = ACPI_TRANSFER_16;
-        resource->data.dma.bus_master = p->flags & IORESOURCE_DMA_MASTER;
+        switch (p->flags & IORESOURCE_DMA_SPEED_MASK) {
+                case IORESOURCE_DMA_TYPEA:
+                        resource->data.dma.type = ACPI_TYPE_A;
+                        break;
+                case IORESOURCE_DMA_TYPEB:
+                        resource->data.dma.type = ACPI_TYPE_B;
+                        break;
+                case IORESOURCE_DMA_TYPEF:
+                        resource->data.dma.type = ACPI_TYPE_F;
+                        break;
+                default:
+                        resource->data.dma.type = ACPI_COMPATIBILITY;
+        }
+
+        switch (p->flags & IORESOURCE_DMA_TYPE_MASK) {
+                case IORESOURCE_DMA_8BIT:
+                        resource->data.dma.transfer = ACPI_TRANSFER_8;
+                        break;
+                case IORESOURCE_DMA_8AND16BIT:
+                        resource->data.dma.transfer = ACPI_TRANSFER_8_16;
+                        break;
+                default:
+                        resource->data.dma.transfer = ACPI_TRANSFER_16;
+        }
+
+        resource->data.dma.bus_master = !!(p->flags & IORESOURCE_DMA_MASTER);
         resource->data.dma.channel_count = 1;
         resource->data.dma.channels[0] = p->start;
 }
diff --git a/drivers/rtc/rtc-max6902.c b/drivers/rtc/rtc-max6902.c
index 0b20dfacbf59..d94170728075 100644
--- a/drivers/rtc/rtc-max6902.c
+++ b/drivers/rtc/rtc-max6902.c
@@ -136,7 +136,7 @@ static int max6902_get_datetime(struct device *dev, struct rtc_time *dt)
         dt->tm_min      = BCD2BIN(chip->buf[2]);
         dt->tm_hour     = BCD2BIN(chip->buf[3]);
         dt->tm_mday     = BCD2BIN(chip->buf[4]);
-        dt->tm_mon      = BCD2BIN(chip->buf[5] - 1);
+        dt->tm_mon      = BCD2BIN(chip->buf[5]) - 1;
         dt->tm_wday     = BCD2BIN(chip->buf[6]);
         dt->tm_year = BCD2BIN(chip->buf[7]);
 
diff --git a/drivers/rtc/rtc-v3020.c b/drivers/rtc/rtc-v3020.c
index 09b714f1cdc3..3b58d3d5d38a 100644
--- a/drivers/rtc/rtc-v3020.c
+++ b/drivers/rtc/rtc-v3020.c
@@ -195,9 +195,9 @@ static int rtc_probe(struct platform_device *pdev)
          * are all disabled */
         v3020_set_reg(chip, V3020_STATUS_0, 0x0);
 
-        dev_info(&pdev->dev, "Chip available at physical address 0x%p,"
+        dev_info(&pdev->dev, "Chip available at physical address 0x%llx,"
                 "data connected to D%d\n",
-                (void*)pdev->resource[0].start,
+                (unsigned long long)pdev->resource[0].start,
                 chip->leftshift);
 
         platform_set_drvdata(pdev, chip);
diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c
index d0647d116eaa..79ffef6bfaf8 100644
--- a/drivers/s390/block/dasd.c
+++ b/drivers/s390/block/dasd.c
@@ -203,6 +203,7 @@ dasd_state_basic_to_known(struct dasd_device * device)
         rc = dasd_flush_ccw_queue(device, 1);
         if (rc)
                 return rc;
+        dasd_clear_timer(device);
 
         DBF_DEV_EVENT(DBF_EMERG, device, "%p debug area deleted", device);
         if (device->debug_area != NULL) {
diff --git a/drivers/s390/char/monwriter.c b/drivers/s390/char/monwriter.c
index abd02ed501cb..b9b0fc3f812b 100644
--- a/drivers/s390/char/monwriter.c
+++ b/drivers/s390/char/monwriter.c
@@ -73,12 +73,15 @@ static inline struct mon_buf *monwrite_find_hdr(struct mon_private *monpriv,
         struct mon_buf *entry, *next;
 
         list_for_each_entry_safe(entry, next, &monpriv->list, list)
-                if (entry->hdr.applid == monhdr->applid &&
+                if ((entry->hdr.mon_function == monhdr->mon_function ||
+                     monhdr->mon_function == MONWRITE_STOP_INTERVAL) &&
+                    entry->hdr.applid == monhdr->applid &&
                     entry->hdr.record_num == monhdr->record_num &&
                     entry->hdr.version == monhdr->version &&
                     entry->hdr.release == monhdr->release &&
                     entry->hdr.mod_level == monhdr->mod_level)
                         return entry;
+
         return NULL;
 }
 
@@ -92,7 +95,9 @@ static int monwrite_new_hdr(struct mon_private *monpriv)
             monhdr->mon_function > MONWRITE_START_CONFIG ||
             monhdr->hdrlen != sizeof(struct monwrite_hdr))
                 return -EINVAL;
-        monbuf = monwrite_find_hdr(monpriv, monhdr);
+        monbuf = NULL;
+        if (monhdr->mon_function != MONWRITE_GEN_EVENT)
+                monbuf = monwrite_find_hdr(monpriv, monhdr);
         if (monbuf) {
                 if (monhdr->mon_function == MONWRITE_STOP_INTERVAL) {
                         monhdr->datalen = monbuf->hdr.datalen;
@@ -104,7 +109,7 @@ static int monwrite_new_hdr(struct mon_private *monpriv)
                         kfree(monbuf);
                         monbuf = NULL;
                 }
-        } else {
+        } else if (monhdr->mon_function != MONWRITE_STOP_INTERVAL) {
                 if (mon_buf_count >= mon_max_bufs)
                         return -ENOSPC;
                 monbuf = kzalloc(sizeof(struct mon_buf), GFP_KERNEL);
@@ -118,7 +123,8 @@ static int monwrite_new_hdr(struct mon_private *monpriv)
                 }
                 monbuf->hdr = *monhdr;
                 list_add_tail(&monbuf->list, &monpriv->list);
-                mon_buf_count++;
+                if (monhdr->mon_function != MONWRITE_GEN_EVENT)
+                        mon_buf_count++;
         }
         monpriv->current_buf = monbuf;
         return 0;
diff --git a/drivers/s390/cio/device_fsm.c b/drivers/s390/cio/device_fsm.c
index fcaf28d7b4eb..de3d0857db9f 100644
--- a/drivers/s390/cio/device_fsm.c
+++ b/drivers/s390/cio/device_fsm.c
@@ -578,9 +578,13 @@ ccw_device_verify_done(struct ccw_device *cdev, int err)
                 }
                 break;
         case -ETIME:
+                /* Reset oper notify indication after verify error. */
+                cdev->private->flags.donotify = 0;
                 ccw_device_done(cdev, DEV_STATE_BOXED);
                 break;
         default:
+                /* Reset oper notify indication after verify error. */
+                cdev->private->flags.donotify = 0;
                 PREPARE_WORK(&cdev->private->kick_work,
                              ccw_device_nopath_notify, cdev);
                 queue_work(ccw_device_notify_work, &cdev->private->kick_work);
diff --git a/drivers/s390/cio/qdio.c b/drivers/s390/cio/qdio.c
index 0648ce5bb684..476aa1da5cbc 100644
--- a/drivers/s390/cio/qdio.c
+++ b/drivers/s390/cio/qdio.c
@@ -3529,7 +3529,7 @@ do_QDIO(struct ccw_device *cdev,unsigned int callflags,
 #ifdef CONFIG_QDIO_DEBUG
         char dbf_text[20];
 
-        sprintf(dbf_text,"doQD%04x",cdev->private->sch_no);
+        sprintf(dbf_text,"doQD%04x",cdev->private->schid.sch_no);
         QDIO_DBF_TEXT3(0,trace,dbf_text);
 #endif /* CONFIG_QDIO_DEBUG */
 
diff --git a/drivers/sbus/char/bbc_envctrl.c b/drivers/sbus/char/bbc_envctrl.c
index 0d3660c28f7d..a54e4140683a 100644
--- a/drivers/sbus/char/bbc_envctrl.c
+++ b/drivers/sbus/char/bbc_envctrl.c
@@ -5,8 +5,8 @@
  */
 
 #include <linux/kthread.h>
-#include <linux/syscalls.h>
 #include <linux/delay.h>
+#include <linux/kmod.h>
 #include <asm/oplib.h>
 #include <asm/ebus.h>
 
@@ -195,7 +195,7 @@ static void do_envctrl_shutdown(struct bbc_cpu_temperature *tp)
         printk(KERN_CRIT "kenvctrld: Shutting down the system now.\n");
 
         shutting_down = 1;
-        if (kernel_execve("/sbin/shutdown", argv, envp) < 0)
+        if (call_usermodehelper("/sbin/shutdown", argv, envp, 0) < 0)
                 printk(KERN_CRIT "envctrl: shutdown execution failed\n");
 }
 
diff --git a/drivers/sbus/char/envctrl.c b/drivers/sbus/char/envctrl.c
index 6b6a855f3795..fff4660cdf96 100644
--- a/drivers/sbus/char/envctrl.c
+++ b/drivers/sbus/char/envctrl.c
@@ -25,7 +25,7 @@
 #include <linux/delay.h>
 #include <linux/ioport.h>
 #include <linux/miscdevice.h>
-#include <linux/syscalls.h>
+#include <linux/kmod.h>
 
 #include <asm/ebus.h>
 #include <asm/uaccess.h>
@@ -976,7 +976,7 @@ static void envctrl_do_shutdown(void)
 
         inprog = 1;
         printk(KERN_CRIT "kenvctrld: WARNING: Shutting down the system now.\n");
-        ret = kernel_execve("/sbin/shutdown", argv, envp);
+        ret = call_usermodehelper("/sbin/shutdown", argv, envp, 0);
         if (ret < 0) {
                 printk(KERN_CRIT "kenvctrld: WARNING: system shutdown failed!\n"); 
                 inprog = 0;  /* unlikely to succeed, but we could try again */
diff --git a/drivers/scsi/BusLogic.c b/drivers/scsi/BusLogic.c
index 7c59bba98798..cdd033724786 100644
--- a/drivers/scsi/BusLogic.c
+++ b/drivers/scsi/BusLogic.c
@@ -3600,5 +3600,16 @@ static void __exit BusLogic_exit(void)
 
 __setup("BusLogic=", BusLogic_Setup);
 
+static struct pci_device_id BusLogic_pci_tbl[] __devinitdata = {
+        { PCI_VENDOR_ID_BUSLOGIC, PCI_DEVICE_ID_BUSLOGIC_MULTIMASTER,
+          PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+        { PCI_VENDOR_ID_BUSLOGIC, PCI_DEVICE_ID_BUSLOGIC_MULTIMASTER_NC,
+          PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+        { PCI_VENDOR_ID_BUSLOGIC, PCI_DEVICE_ID_BUSLOGIC_FLASHPOINT,
+          PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+        { }
+};
+MODULE_DEVICE_TABLE(pci, BusLogic_pci_tbl);
+
 module_init(BusLogic_init);
 module_exit(BusLogic_exit);
diff --git a/drivers/scsi/eata_pio.c b/drivers/scsi/eata_pio.c
index 811d8840707e..2dbb66d2f0a7 100644
--- a/drivers/scsi/eata_pio.c
+++ b/drivers/scsi/eata_pio.c
@@ -203,7 +203,7 @@ static irqreturn_t do_eata_pio_int_handler(int irq, void *dev_id)
         irqreturn_t ret;
 
         spin_lock_irqsave(dev->host_lock, flags);
-        ret = eata_pio_int_handler(irq, dev_id, regs);
+        ret = eata_pio_int_handler(irq, dev_id);
         spin_unlock_irqrestore(dev->host_lock, flags);
         return ret;
 }
diff --git a/drivers/scsi/fdomain.c b/drivers/scsi/fdomain.c
index 72794a7b6dcc..65e6e7b7ba07 100644
--- a/drivers/scsi/fdomain.c
+++ b/drivers/scsi/fdomain.c
@@ -1736,6 +1736,15 @@ struct scsi_host_template fdomain_driver_template = {
 };
 
 #ifndef PCMCIA
+
+static struct pci_device_id fdomain_pci_tbl[] __devinitdata = {
+        { PCI_VENDOR_ID_FD, PCI_DEVICE_ID_FD_36C70,
+          PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
+        { }
+};
+MODULE_DEVICE_TABLE(pci, fdomain_pci_tbl);
+
 #define driver_template fdomain_driver_template
 #include "scsi_module.c"
+
 #endif
diff --git a/drivers/scsi/initio.c b/drivers/scsi/initio.c
index 911f2ff4a1f2..afed293dd7b9 100644
--- a/drivers/scsi/initio.c
+++ b/drivers/scsi/initio.c
@@ -142,8 +142,6 @@
 #define i91u_MAXQUEUE           2
 #define i91u_REVID "Initio INI-9X00U/UW SCSI device driver; Revision: 1.04a"
 
-#define INI_VENDOR_ID   0x1101  /* Initio's PCI vendor ID       */
-#define DMX_VENDOR_ID   0x134a  /* Domex's PCI vendor ID        */
 #define I950_DEVICE_ID  0x9500  /* Initio's inic-950 product ID   */
 #define I940_DEVICE_ID  0x9400  /* Initio's inic-940 product ID   */
 #define I935_DEVICE_ID  0x9401  /* Initio's inic-935 product ID   */
@@ -171,13 +169,16 @@ static int setup_debug = 0;
 
 static void i91uSCBPost(BYTE * pHcb, BYTE * pScb);
 
-static const PCI_ID i91u_pci_devices[] = {
-        { INI_VENDOR_ID, I950_DEVICE_ID },
-        { INI_VENDOR_ID, I940_DEVICE_ID },
-        { INI_VENDOR_ID, I935_DEVICE_ID },
-        { INI_VENDOR_ID, I920_DEVICE_ID },
-        { DMX_VENDOR_ID, I920_DEVICE_ID },
+/* PCI Devices supported by this driver */
+static struct pci_device_id i91u_pci_devices[] __devinitdata = {
+        { PCI_VENDOR_ID_INIT,  I950_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+        { PCI_VENDOR_ID_INIT,  I940_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+        { PCI_VENDOR_ID_INIT,  I935_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+        { PCI_VENDOR_ID_INIT,  I920_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+        { PCI_VENDOR_ID_DOMEX, I920_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+        { }
 };
+MODULE_DEVICE_TABLE(pci, i91u_pci_devices);
 
 #define DEBUG_INTERRUPT 0
 #define DEBUG_QUEUE     0
@@ -2771,7 +2772,7 @@ static int tul_NewReturnNumberOfAdapters(void)
 
         for (i = 0; i < ARRAY_SIZE(i91u_pci_devices); i++)
         {
-                while ((pDev = pci_find_device(i91u_pci_devices[i].vendor_id, i91u_pci_devices[i].device_id, pDev)) != NULL) {
+                while ((pDev = pci_find_device(i91u_pci_devices[i].vendor, i91u_pci_devices[i].device, pDev)) != NULL) {
                         if (pci_enable_device(pDev))
                                 continue;
                         pci_read_config_dword(pDev, 0x44, (u32 *) & dRegValue);
diff --git a/drivers/scsi/megaraid/megaraid_mbox.c b/drivers/scsi/megaraid/megaraid_mbox.c
index c0edb662d863..7bac86dda88f 100644
--- a/drivers/scsi/megaraid/megaraid_mbox.c
+++ b/drivers/scsi/megaraid/megaraid_mbox.c
@@ -884,7 +884,7 @@ megaraid_init_mbox(adapter_t *adapter)
 
         if (((magic64 == HBA_SIGNATURE_64_BIT) &&
                 ((adapter->pdev->subsystem_device !=
-                PCI_SUBSYS_ID_MEGARAID_SATA_150_6) ||
+                PCI_SUBSYS_ID_MEGARAID_SATA_150_6) &&
                 (adapter->pdev->subsystem_device !=
                 PCI_SUBSYS_ID_MEGARAID_SATA_150_4))) ||
                 (adapter->pdev->vendor == PCI_VENDOR_ID_LSI_LOGIC &&
diff --git a/drivers/scsi/qlogicpti.c b/drivers/scsi/qlogicpti.c
index ed58bb489889..9b827ceec501 100644
--- a/drivers/scsi/qlogicpti.c
+++ b/drivers/scsi/qlogicpti.c
@@ -461,7 +461,7 @@ static int qlogicpti_reset_hardware(struct Scsi_Host *host)
 
 #define PTI_RESET_LIMIT 400
 
-static int __init qlogicpti_load_firmware(struct qlogicpti *qpti)
+static int __devinit qlogicpti_load_firmware(struct qlogicpti *qpti)
 {
         struct Scsi_Host *host = qpti->qhost;
         unsigned short csum = 0;
diff --git a/drivers/scsi/qlogicpti_asm.c b/drivers/scsi/qlogicpti_asm.c
index 1545b30681b4..19aa84f46018 100644
--- a/drivers/scsi/qlogicpti_asm.c
+++ b/drivers/scsi/qlogicpti_asm.c
@@ -1,5 +1,5 @@
 /* Version 1.31.00 ISP1000 Initiator RISC firmware */
-unsigned short sbus_risc_code01[] __initdata = {
+unsigned short sbus_risc_code01[] __devinitdata = {
         0x0078, 0x1030, 0x0000, 0x2419, 0x0000, 0x12ff, 0x2043, 0x4f50,
         0x5952, 0x4947, 0x4854, 0x2031, 0x3939, 0x312c, 0x3139, 0x3932,
         0x2c31, 0x3939, 0x332c, 0x3139, 0x3934, 0x2051, 0x4c4f, 0x4749,
@@ -1157,4 +1157,4 @@ unsigned short sbus_risc_code01[] __initdata = {
         0x003c, 0x0040, 0x3415, 0x2019, 0x2626, 0x7b22, 0x7b26, 0x007c,
         0x92a7
 };
-unsigned short sbus_risc_code_length01 = 0x2419;
+unsigned short __devinitdata sbus_risc_code_length01 = 0x2419;
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index b0d502622d94..0b71e7d18903 100644
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -767,37 +767,37 @@ config SERIAL_CPM_SCC1
         bool "Support for SCC1 serial port"
         depends on SERIAL_CPM=y
         help
-          Select the is option to use SCC1 as a serial port
+          Select this option to use SCC1 as a serial port
 
 config SERIAL_CPM_SCC2
         bool "Support for SCC2 serial port"
         depends on SERIAL_CPM=y
         help
-          Select the is option to use SCC2 as a serial port
+          Select this option to use SCC2 as a serial port
 
 config SERIAL_CPM_SCC3
         bool "Support for SCC3 serial port"
         depends on SERIAL_CPM=y
         help
-          Select the is option to use SCC3 as a serial port
+          Select this option to use SCC3 as a serial port
 
 config SERIAL_CPM_SCC4
         bool "Support for SCC4 serial port"
         depends on SERIAL_CPM=y
         help
-          Select the is option to use SCC4 as a serial port
+          Select this option to use SCC4 as a serial port
 
 config SERIAL_CPM_SMC1
         bool "Support for SMC1 serial port"
         depends on SERIAL_CPM=y
         help
-          Select the is option to use SMC1 as a serial port
+          Select this option to use SMC1 as a serial port
 
 config SERIAL_CPM_SMC2
         bool "Support for SMC2 serial port"
         depends on SERIAL_CPM=y
         help
-          Select the is option to use SMC2 as a serial port
+          Select this option to use SMC2 as a serial port
 
 config SERIAL_SGI_L1_CONSOLE
         bool "SGI Altix L1 serial console support"
diff --git a/drivers/serial/ioc4_serial.c b/drivers/serial/ioc4_serial.c
index 98ce88d80207..ff4fa25f9fd1 100644
--- a/drivers/serial/ioc4_serial.c
+++ b/drivers/serial/ioc4_serial.c
@@ -2935,7 +2935,7 @@ static void __devexit ioc4_serial_exit(void)
         uart_unregister_driver(&ioc4_uart_rs422);
 }
 
-module_init(ioc4_serial_init);
+late_initcall(ioc4_serial_init); /* Call only after tty init is done */
 module_exit(ioc4_serial_exit);
 
 MODULE_AUTHOR("Pat Gefre - Silicon Graphics Inc. (SGI) <pfg@sgi.com>");
diff --git a/drivers/sn/Kconfig b/drivers/sn/Kconfig
index a34731625877..c66ba9ad833d 100644
--- a/drivers/sn/Kconfig
+++ b/drivers/sn/Kconfig
@@ -5,19 +5,6 @@
 menu "SN Devices"
         depends on SGI_SN
 
-config SGI_IOC4
-        tristate "SGI IOC4 Base IO support"
-        depends on MMTIMER
-        default m
-        ---help---
-        This option enables basic support for the SGI IOC4-based Base IO
-        controller card.  This option does not enable any specific
-        functions on such a card, but provides necessary infrastructure
-        for other drivers to utilize.
-
-        If you have an SGI Altix with an IOC4-based
-        I/O controller say Y.  Otherwise say N.
-
 config SGI_IOC3
         tristate "SGI IOC3 Base IO support"
         default m
diff --git a/drivers/sn/Makefile b/drivers/sn/Makefile
index 2cda011597c0..693db8bb8d9c 100644
--- a/drivers/sn/Makefile
+++ b/drivers/sn/Makefile
@@ -3,5 +3,4 @@
 #
 #
 
-obj-$(CONFIG_SGI_IOC4) += ioc4.o
 obj-$(CONFIG_SGI_IOC3) += ioc3.o
diff --git a/drivers/telephony/ixj.c b/drivers/telephony/ixj.c
index f6b2948ab288..1b601b6cf2a2 100644
--- a/drivers/telephony/ixj.c
+++ b/drivers/telephony/ixj.c
@@ -284,6 +284,14 @@ static int samplerate = 100;
 
 module_param(ixjdebug, int, 0);
 
+static struct pci_device_id ixj_pci_tbl[] __devinitdata = {
+        { PCI_VENDOR_ID_QUICKNET, PCI_DEVICE_ID_QUICKNET_XJ,
+          PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+        { }
+};
+
+MODULE_DEVICE_TABLE(pci, ixj_pci_tbl);
+
 /************************************************************************
 *
 * ixjdebug meanings are now bit mapped instead of level based
@@ -7683,7 +7691,8 @@ static int __init ixj_probe_pci(int *cnt)
         IXJ *j = NULL;
 
         for (i = 0; i < IXJMAX - *cnt; i++) {
-                pci = pci_find_device(0x15E2, 0x0500, pci);
+                pci = pci_find_device(PCI_VENDOR_ID_QUICKNET,
+                                      PCI_DEVICE_ID_QUICKNET_XJ, pci);
                 if (!pci)
                         break;
 
diff --git a/drivers/usb/Makefile b/drivers/usb/Makefile
index 97d57cfc343b..825bf884537a 100644
--- a/drivers/usb/Makefile
+++ b/drivers/usb/Makefile
@@ -33,7 +33,6 @@ obj-$(CONFIG_USB_KBTAB)		+= input/
 obj-$(CONFIG_USB_MOUSE)         += input/
 obj-$(CONFIG_USB_MTOUCH)        += input/
 obj-$(CONFIG_USB_POWERMATE)     += input/
-obj-$(CONFIG_USB_TRANCEVIBRATOR)+= input/
 obj-$(CONFIG_USB_WACOM)         += input/
 obj-$(CONFIG_USB_XPAD)          += input/
 
@@ -66,6 +65,7 @@ obj-$(CONFIG_USB_PHIDGETSERVO)	+= misc/
 obj-$(CONFIG_USB_RIO500)        += misc/
 obj-$(CONFIG_USB_SISUSBVGA)     += misc/
 obj-$(CONFIG_USB_TEST)          += misc/
+obj-$(CONFIG_USB_TRANCEVIBRATOR)+= misc/
 obj-$(CONFIG_USB_USS720)        += misc/
 
 obj-$(CONFIG_USB_ATM)           += atm/
diff --git a/drivers/usb/atm/cxacru.c b/drivers/usb/atm/cxacru.c
index 3892a9e9aee3..e6565633ba0f 100644
--- a/drivers/usb/atm/cxacru.c
+++ b/drivers/usb/atm/cxacru.c
@@ -793,6 +793,9 @@ static const struct usb_device_id cxacru_usb_ids[] = {
         { /* V = Conexant                       P = ADSL modem                          */
                 USB_DEVICE(0x0572, 0xcb06),     .driver_info = (unsigned long) &cxacru_cb00
         },
+        { /* V = Conexant                       P = ADSL modem (ZTE ZXDSL 852)          */
+                USB_DEVICE(0x0572, 0xcb07),     .driver_info = (unsigned long) &cxacru_cb00
+        },
         { /* V = Olitec                         P = ADSL modem version 2                */
                 USB_DEVICE(0x08e3, 0x0100),     .driver_info = (unsigned long) &cxacru_cafe
         },
diff --git a/drivers/usb/atm/speedtch.c b/drivers/usb/atm/speedtch.c
index 7c7b507af29d..c870c804470f 100644
--- a/drivers/usb/atm/speedtch.c
+++ b/drivers/usb/atm/speedtch.c
@@ -55,7 +55,6 @@ static const char speedtch_driver_name[] = "speedtch";
 #define OFFSET_d        9               /* size 4 */
 #define OFFSET_e        13              /* size 1 */
 #define OFFSET_f        14              /* size 1 */
-#define TOTAL           15
 
 #define SIZE_7          1
 #define SIZE_b          8
@@ -79,6 +78,18 @@ static int dl_512_first = DEFAULT_DL_512_FIRST;
 static int enable_isoc = DEFAULT_ENABLE_ISOC;
 static int sw_buffering = DEFAULT_SW_BUFFERING;
 
+#define DEFAULT_B_MAX_DSL       8128
+#define DEFAULT_MODEM_MODE      11
+#define MODEM_OPTION_LENGTH     16
+static const unsigned char DEFAULT_MODEM_OPTION[MODEM_OPTION_LENGTH] = {
+        0x10, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+
+static unsigned int BMaxDSL = DEFAULT_B_MAX_DSL;
+static unsigned char ModemMode = DEFAULT_MODEM_MODE;
+static unsigned char ModemOption[MODEM_OPTION_LENGTH];
+static int num_ModemOption;
+
 module_param(altsetting, uint, S_IRUGO | S_IWUSR);
 MODULE_PARM_DESC(altsetting,
                 "Alternative setting for data interface (bulk_default: "
@@ -100,6 +111,17 @@ MODULE_PARM_DESC(sw_buffering,
                  "Enable software buffering (default: "
                  __MODULE_STRING(DEFAULT_SW_BUFFERING) ")");
 
+module_param(BMaxDSL, uint, S_IRUGO | S_IWUSR);
+MODULE_PARM_DESC(BMaxDSL,
+                "default: " __MODULE_STRING(DEFAULT_B_MAX_DSL));
+
+module_param(ModemMode, byte, S_IRUGO | S_IWUSR);
+MODULE_PARM_DESC(ModemMode,
+                "default: " __MODULE_STRING(DEFAULT_MODEM_MODE));
+
+module_param_array(ModemOption, byte, &num_ModemOption, S_IRUGO);
+MODULE_PARM_DESC(ModemOption, "default: 0x10,0x00,0x00,0x00,0x20");
+
 #define INTERFACE_DATA          1
 #define ENDPOINT_INT            0x81
 #define ENDPOINT_BULK_DATA      0x07
@@ -108,10 +130,17 @@ MODULE_PARM_DESC(sw_buffering,
 
 #define hex2int(c) ( (c >= '0') && (c <= '9') ? (c - '0') : ((c & 0xf) + 9) )
 
+struct speedtch_params {
+        unsigned int altsetting;
+        unsigned int BMaxDSL;
+        unsigned char ModemMode;
+        unsigned char ModemOption[MODEM_OPTION_LENGTH];
+};
+
 struct speedtch_instance_data {
         struct usbatm_data *usbatm;
 
-        unsigned int altsetting;
+        struct speedtch_params params; /* set in probe, constant afterwards */
 
         struct work_struct status_checker;
 
@@ -123,7 +152,7 @@ struct speedtch_instance_data {
         struct urb *int_urb;
         unsigned char int_data[16];
 
-        unsigned char scratch_buffer[TOTAL];
+        unsigned char scratch_buffer[16];
 };
 
 /***************
@@ -186,6 +215,34 @@ static void speedtch_test_sequence(struct speedtch_instance_data *instance)
                               0x01, 0x40, 0x04, 0x00, buf, 3, CTRL_TIMEOUT);
         if (ret < 0)
                 usb_warn(usbatm, "%s failed on URB150: %d\n", __func__, ret);
+
+        /* Extra initialisation in recent drivers - gives higher speeds */
+
+        /* URBext1 */
+        buf[0] = instance->params.ModemMode;
+        ret = usb_control_msg(usb_dev, usb_sndctrlpipe(usb_dev, 0),
+                              0x01, 0x40, 0x11, 0x00, buf, 1, CTRL_TIMEOUT);
+        if (ret < 0)
+                usb_warn(usbatm, "%s failed on URBext1: %d\n", __func__, ret);
+
+        /* URBext2 */
+        /* This seems to be the one which actually triggers the higher sync
+           rate -- it does require the new firmware too, although it works OK
+           with older firmware */
+        ret = usb_control_msg(usb_dev, usb_sndctrlpipe(usb_dev, 0),
+                              0x01, 0x40, 0x14, 0x00,
+                              instance->params.ModemOption,
+                              MODEM_OPTION_LENGTH, CTRL_TIMEOUT);
+        if (ret < 0)
+                usb_warn(usbatm, "%s failed on URBext2: %d\n", __func__, ret);
+
+        /* URBext3 */
+        buf[0] = instance->params.BMaxDSL & 0xff;
+        buf[1] = instance->params.BMaxDSL >> 8;
+        ret = usb_control_msg(usb_dev, usb_sndctrlpipe(usb_dev, 0),
+                              0x01, 0x40, 0x12, 0x00, buf, 2, CTRL_TIMEOUT);
+        if (ret < 0)
+                usb_warn(usbatm, "%s failed on URBext3: %d\n", __func__, ret);
 }
 
 static int speedtch_upload_firmware(struct speedtch_instance_data *instance,
@@ -285,8 +342,8 @@ static int speedtch_upload_firmware(struct speedtch_instance_data *instance,
            because we're in our own kernel thread anyway. */
         msleep_interruptible(1000);
 
-        if ((ret = usb_set_interface(usb_dev, INTERFACE_DATA, instance->altsetting)) < 0) {
-                usb_err(usbatm, "%s: setting interface to %d failed (%d)!\n", __func__, instance->altsetting, ret);
+        if ((ret = usb_set_interface(usb_dev, INTERFACE_DATA, instance->params.altsetting)) < 0) {
+                usb_err(usbatm, "%s: setting interface to %d failed (%d)!\n", __func__, instance->params.altsetting, ret);
                 goto out_free;
         }
 
@@ -372,7 +429,7 @@ static int speedtch_read_status(struct speedtch_instance_data *instance)
         unsigned char *buf = instance->scratch_buffer;
         int ret;
 
-        memset(buf, 0, TOTAL);
+        memset(buf, 0, 16);
 
         ret = usb_control_msg(usb_dev, usb_rcvctrlpipe(usb_dev, 0),
                               0x12, 0xc0, 0x07, 0x00, buf + OFFSET_7, SIZE_7,
@@ -746,17 +803,21 @@ static int speedtch_bind(struct usbatm_data *usbatm,
 
         instance->usbatm = usbatm;
 
-        /* altsetting and enable_isoc may change at any moment, so take a snapshot */
-        instance->altsetting = altsetting;
+        /* module parameters may change at any moment, so take a snapshot */
+        instance->params.altsetting = altsetting;
+        instance->params.BMaxDSL = BMaxDSL;
+        instance->params.ModemMode = ModemMode;
+        memcpy(instance->params.ModemOption, DEFAULT_MODEM_OPTION, MODEM_OPTION_LENGTH);
+        memcpy(instance->params.ModemOption, ModemOption, num_ModemOption);
         use_isoc = enable_isoc;
 
-        if (instance->altsetting)
-                if ((ret = usb_set_interface(usb_dev, INTERFACE_DATA, instance->altsetting)) < 0) {
-                        usb_err(usbatm, "%s: setting interface to %2d failed (%d)!\n", __func__, instance->altsetting, ret);
-                        instance->altsetting = 0; /* fall back to default */
+        if (instance->params.altsetting)
+                if ((ret = usb_set_interface(usb_dev, INTERFACE_DATA, instance->params.altsetting)) < 0) {
+                        usb_err(usbatm, "%s: setting interface to %2d failed (%d)!\n", __func__, instance->params.altsetting, ret);
+                        instance->params.altsetting = 0; /* fall back to default */
                 }
 
-        if (!instance->altsetting && use_isoc)
+        if (!instance->params.altsetting && use_isoc)
                 if ((ret = usb_set_interface(usb_dev, INTERFACE_DATA, DEFAULT_ISOC_ALTSETTING)) < 0) {
                         usb_dbg(usbatm, "%s: setting interface to %2d failed (%d)!\n", __func__, DEFAULT_ISOC_ALTSETTING, ret);
                         use_isoc = 0; /* fall back to bulk */
@@ -783,14 +844,14 @@ static int speedtch_bind(struct usbatm_data *usbatm,
                         usb_info(usbatm, "isochronous transfer not supported - using bulk\n");
         }
 
-        if (!use_isoc && !instance->altsetting)
+        if (!use_isoc && !instance->params.altsetting)
                 if ((ret = usb_set_interface(usb_dev, INTERFACE_DATA, DEFAULT_BULK_ALTSETTING)) < 0) {
                         usb_err(usbatm, "%s: setting interface to %2d failed (%d)!\n", __func__, DEFAULT_BULK_ALTSETTING, ret);
                         goto fail_free;
                 }
 
-        if (!instance->altsetting)
-                instance->altsetting = use_isoc ? DEFAULT_ISOC_ALTSETTING : DEFAULT_BULK_ALTSETTING;
+        if (!instance->params.altsetting)
+                instance->params.altsetting = use_isoc ? DEFAULT_ISOC_ALTSETTING : DEFAULT_BULK_ALTSETTING;
 
         usbatm->flags |= (use_isoc ? UDSL_USE_ISOC : 0);
 
diff --git a/drivers/usb/atm/ueagle-atm.c b/drivers/usb/atm/ueagle-atm.c
index f5434b1cbb1e..f6b9f7e1f716 100644
--- a/drivers/usb/atm/ueagle-atm.c
+++ b/drivers/usb/atm/ueagle-atm.c
@@ -68,7 +68,7 @@
 
 #include "usbatm.h"
 
-#define EAGLEUSBVERSION "ueagle 1.3"
+#define EAGLEUSBVERSION "ueagle 1.4"
 
 
 /*
@@ -80,14 +80,14 @@
                         dev_dbg(&(usb_dev)->dev, \
                                 "[ueagle-atm dbg] %s: " format, \
                                         __FUNCTION__, ##args); \
-       } while (0)
+        } while (0)
 
 #define uea_vdbg(usb_dev, format, args...)      \
         do { \
                 if (debug >= 2) \
                         dev_dbg(&(usb_dev)->dev, \
                                 "[ueagle-atm vdbg]  " format, ##args); \
-       } while (0)
+        } while (0)
 
 #define uea_enters(usb_dev) \
         uea_vdbg(usb_dev, "entering %s\n", __FUNCTION__)
@@ -218,8 +218,8 @@ enum {
 #define UEA_CHIP_VERSION(x) \
         ((x)->driver_info & 0xf)
 
-#define IS_ISDN(sc) \
-        (le16_to_cpu(sc->usb_dev->descriptor.bcdDevice) & 0x80)
+#define IS_ISDN(usb_dev) \
+        (le16_to_cpu((usb_dev)->descriptor.bcdDevice) & 0x80)
 
 #define INS_TO_USBDEV(ins) ins->usb_dev
 
@@ -625,12 +625,12 @@ static int request_dsp(struct uea_softc *sc)
         char *dsp_name;
 
         if (UEA_CHIP_VERSION(sc) == ADI930) {
-                if (IS_ISDN(sc))
+                if (IS_ISDN(sc->usb_dev))
                         dsp_name = FW_DIR "DSP9i.bin";
                 else
                         dsp_name = FW_DIR "DSP9p.bin";
         } else {
-                if (IS_ISDN(sc))
+                if (IS_ISDN(sc->usb_dev))
                         dsp_name = FW_DIR "DSPei.bin";
                 else
                         dsp_name = FW_DIR "DSPep.bin";
@@ -744,7 +744,7 @@ static inline void wake_up_cmv_ack(struct uea_softc *sc)
 
 static inline int wait_cmv_ack(struct uea_softc *sc)
 {
-        int ret = wait_event_timeout(sc->cmv_ack_wait,
+        int ret = wait_event_interruptible_timeout(sc->cmv_ack_wait,
                                                    sc->cmv_ack, ACK_TIMEOUT);
         sc->cmv_ack = 0;
 
@@ -885,7 +885,8 @@ static int uea_stat(struct uea_softc *sc)
                 break;
 
         case 3:         /* fail ... */
-                uea_info(INS_TO_USBDEV(sc), "modem synchronization failed\n");
+                uea_info(INS_TO_USBDEV(sc), "modem synchronization failed"
+                                " (may be try other cmv/dsp)\n");
                 return -EAGAIN;
 
         case 4 ... 6:   /* test state */
@@ -913,12 +914,6 @@ static int uea_stat(struct uea_softc *sc)
                         release_firmware(sc->dsp_firm);
                         sc->dsp_firm = NULL;
                 }
-
-                ret = uea_read_cmv(sc, SA_INFO, 10, &sc->stats.phy.firmid);
-                if (ret < 0)
-                        return ret;
-                uea_info(INS_TO_USBDEV(sc), "ATU-R firmware version : %x\n",
-                                sc->stats.phy.firmid);
         }
 
         /* always update it as atm layer could not be init when we switch to
@@ -1033,9 +1028,9 @@ static int request_cmvs(struct uea_softc *sc,
 
         if (cmv_file[sc->modem_index] == NULL) {
                 if (UEA_CHIP_VERSION(sc) == ADI930)
-                        file = (IS_ISDN(sc)) ? "CMV9i.bin" : "CMV9p.bin";
+                        file = (IS_ISDN(sc->usb_dev)) ? "CMV9i.bin" : "CMV9p.bin";
                 else
-                        file = (IS_ISDN(sc)) ? "CMVei.bin" : "CMVep.bin";
+                        file = (IS_ISDN(sc->usb_dev)) ? "CMVei.bin" : "CMVep.bin";
         } else
                 file = cmv_file[sc->modem_index];
 
@@ -1131,6 +1126,13 @@ static int uea_start_reset(struct uea_softc *sc)
         if (ret < 0)
                 return ret;
 
+        /* Dump firmware version */
+        ret = uea_read_cmv(sc, SA_INFO, 10, &sc->stats.phy.firmid);
+        if (ret < 0)
+                return ret;
+        uea_info(INS_TO_USBDEV(sc), "ATU-R firmware version : %x\n",
+                        sc->stats.phy.firmid);
+
         /* get options */
         ret = len = request_cmvs(sc, &cmvs, &cmvs_fw);
         if (ret < 0)
@@ -1147,6 +1149,8 @@ static int uea_start_reset(struct uea_softc *sc)
         /* Enter in R-ACT-REQ */
         ret = uea_write_cmv(sc, SA_CNTL, 0, 2);
         uea_vdbg(INS_TO_USBDEV(sc), "Entering in R-ACT-REQ state\n");
+        uea_info(INS_TO_USBDEV(sc), "Modem started, "
+                "waiting synchronization\n");
 out:
         release_firmware(cmvs_fw);
         sc->reset = 0;
@@ -1172,7 +1176,10 @@ static int uea_kthread(void *data)
                 if (!ret)
                         ret = uea_stat(sc);
                 if (ret != -EAGAIN)
-                        msleep(1000);
+                        msleep_interruptible(1000);
+                if (try_to_freeze())
+                        uea_err(INS_TO_USBDEV(sc), "suspend/resume not supported, "
+                                "please unplug/replug your modem\n");
         }
         uea_leaves(INS_TO_USBDEV(sc));
         return ret;
@@ -1566,6 +1573,7 @@ UEA_ATTR(uscorr, 0);
 UEA_ATTR(dscorr, 0);
 UEA_ATTR(usunc, 0);
 UEA_ATTR(dsunc, 0);
+UEA_ATTR(firmid, 0);
 
 /* Retrieve the device End System Identifier (MAC) */
 
@@ -1597,7 +1605,7 @@ static int uea_heavy(struct usbatm_data *usbatm, struct usb_interface *intf)
 {
         struct uea_softc *sc = usbatm->driver_data;
 
-        wait_event(sc->sync_q, IS_OPERATIONAL(sc));
+        wait_event_interruptible(sc->sync_q, IS_OPERATIONAL(sc));
 
         return 0;
 
@@ -1639,16 +1647,13 @@ static struct attribute *attrs[] = {
         &dev_attr_stat_dscorr.attr,
         &dev_attr_stat_usunc.attr,
         &dev_attr_stat_dsunc.attr,
+        &dev_attr_stat_firmid.attr,
+        NULL,
 };
 static struct attribute_group attr_grp = {
         .attrs = attrs,
 };
 
-static int create_fs_entries(struct usb_interface *intf)
-{
-        return sysfs_create_group(&intf->dev.kobj, &attr_grp);
-}
-
 static int uea_bind(struct usbatm_data *usbatm, struct usb_interface *intf,
                    const struct usb_device_id *id)
 {
@@ -1708,31 +1713,25 @@ static int uea_bind(struct usbatm_data *usbatm, struct usb_interface *intf,
                 }
         }
 
+        ret = sysfs_create_group(&intf->dev.kobj, &attr_grp);
+        if (ret < 0)
+                goto error;
+
         ret = uea_boot(sc);
-        if (ret < 0) {
-                kfree(sc);
-                return ret;
-        }
+        if (ret < 0)
+                goto error;
 
-        ret = create_fs_entries(intf);
-        if (ret) {
-                uea_stop(sc);
-                kfree(sc);
-                return ret;
-        }
         return 0;
-}
-
-static void destroy_fs_entries(struct usb_interface *intf)
-{
-        sysfs_remove_group(&intf->dev.kobj, &attr_grp);
+error:
+        kfree(sc);
+        return ret;
 }
 
 static void uea_unbind(struct usbatm_data *usbatm, struct usb_interface *intf)
 {
         struct uea_softc *sc = usbatm->driver_data;
 
-        destroy_fs_entries(intf);
+        sysfs_remove_group(&intf->dev.kobj, &attr_grp);
         uea_stop(sc);
         kfree(sc);
 }
@@ -1753,10 +1752,10 @@ static int uea_probe(struct usb_interface *intf, const struct usb_device_id *id)
         struct usb_device *usb = interface_to_usbdev(intf);
 
         uea_enters(usb);
-        uea_info(usb, "ADSL device founded vid (%#X) pid (%#X) : %s\n",
+        uea_info(usb, "ADSL device founded vid (%#X) pid (%#X) : %s %s\n",
                le16_to_cpu(usb->descriptor.idVendor),
                le16_to_cpu(usb->descriptor.idProduct),
-               chip_name[UEA_CHIP_VERSION(id)]);
+               chip_name[UEA_CHIP_VERSION(id)], IS_ISDN(usb)?"isdn":"pots");
 
         usb_reset_device(usb);
 
diff --git a/drivers/usb/atm/usbatm.c b/drivers/usb/atm/usbatm.c
index 309073f6433a..ec63b0ee0743 100644
--- a/drivers/usb/atm/usbatm.c
+++ b/drivers/usb/atm/usbatm.c
@@ -1001,6 +1001,7 @@ static int usbatm_do_heavy_init(void *arg)
 
         daemonize(instance->driver->driver_name);
         allow_signal(SIGTERM);
+        instance->thread_pid = current->pid;
 
         complete(&instance->thread_started);
 
@@ -1025,10 +1026,6 @@ static int usbatm_heavy_init(struct usbatm_data *instance)
                 return ret;
         }
 
-        mutex_lock(&instance->serialize);
-        instance->thread_pid = ret;
-        mutex_unlock(&instance->serialize);
-
         wait_for_completion(&instance->thread_started);
 
         return 0;
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index ec4d1d756725..9a9012fd284b 100644
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -325,7 +325,7 @@ static void acm_rx_tasklet(unsigned long _acm)
         struct acm_rb *buf;
         struct tty_struct *tty = acm->tty;
         struct acm_ru *rcv;
-        //unsigned long flags;
+        unsigned long flags;
         int i = 0;
         dbg("Entering acm_rx_tasklet");
 
@@ -333,15 +333,15 @@ static void acm_rx_tasklet(unsigned long _acm)
                 return;
 
 next_buffer:
-        spin_lock(&acm->read_lock);
+        spin_lock_irqsave(&acm->read_lock, flags);
         if (list_empty(&acm->filled_read_bufs)) {
-                spin_unlock(&acm->read_lock);
+                spin_unlock_irqrestore(&acm->read_lock, flags);
                 goto urbs;
         }
         buf = list_entry(acm->filled_read_bufs.next,
                          struct acm_rb, list);
         list_del(&buf->list);
-        spin_unlock(&acm->read_lock);
+        spin_unlock_irqrestore(&acm->read_lock, flags);
 
         dbg("acm_rx_tasklet: procesing buf 0x%p, size = %d", buf, buf->size);
 
@@ -356,29 +356,29 @@ next_buffer:
                 memmove(buf->base, buf->base + i, buf->size - i);
                 buf->size -= i;
                 spin_unlock(&acm->throttle_lock);
-                spin_lock(&acm->read_lock);
+                spin_lock_irqsave(&acm->read_lock, flags);
                 list_add(&buf->list, &acm->filled_read_bufs);
-                spin_unlock(&acm->read_lock);
+                spin_unlock_irqrestore(&acm->read_lock, flags);
                 return;
         }
         spin_unlock(&acm->throttle_lock);
 
-        spin_lock(&acm->read_lock);
+        spin_lock_irqsave(&acm->read_lock, flags);
         list_add(&buf->list, &acm->spare_read_bufs);
-        spin_unlock(&acm->read_lock);
+        spin_unlock_irqrestore(&acm->read_lock, flags);
         goto next_buffer;
 
 urbs:
         while (!list_empty(&acm->spare_read_bufs)) {
-                spin_lock(&acm->read_lock);
+                spin_lock_irqsave(&acm->read_lock, flags);
                 if (list_empty(&acm->spare_read_urbs)) {
-                        spin_unlock(&acm->read_lock);
+                        spin_unlock_irqrestore(&acm->read_lock, flags);
                         return;
                 }
                 rcv = list_entry(acm->spare_read_urbs.next,
                                  struct acm_ru, list);
                 list_del(&rcv->list);
-                spin_unlock(&acm->read_lock);
+                spin_unlock_irqrestore(&acm->read_lock, flags);
 
                 buf = list_entry(acm->spare_read_bufs.next,
                                  struct acm_rb, list);
@@ -400,9 +400,9 @@ urbs:
                    free-urbs-pool and resubmited ASAP */
                 if (usb_submit_urb(rcv->urb, GFP_ATOMIC) < 0) {
                         list_add(&buf->list, &acm->spare_read_bufs);
-                        spin_lock(&acm->read_lock);
+                        spin_lock_irqsave(&acm->read_lock, flags);
                         list_add(&rcv->list, &acm->spare_read_urbs);
-                        spin_unlock(&acm->read_lock);
+                        spin_unlock_irqrestore(&acm->read_lock, flags);
                         return;
                 }
         }
@@ -1083,6 +1083,9 @@ static struct usb_device_id acm_ids[] = {
         { USB_DEVICE(0x0482, 0x0203), /* KYOCERA AH-K3001V */
         .driver_info = NO_UNION_NORMAL, /* has no union descriptor */
         },
+        { USB_DEVICE(0x079b, 0x000f), /* BT On-Air USB MODEM */
+        .driver_info = NO_UNION_NORMAL, /* has no union descriptor */
+        },
         { USB_DEVICE(0x0ace, 0x1608), /* ZyDAS 56K USB MODEM */
         .driver_info = SINGLE_RX_URB, /* firmware bug */
         },
diff --git a/drivers/usb/class/usblp.c b/drivers/usb/class/usblp.c
index a161d70e1e42..809d465eb257 100644
--- a/drivers/usb/class/usblp.c
+++ b/drivers/usb/class/usblp.c
@@ -154,6 +154,7 @@ struct usblp {
         unsigned char           used;                   /* True if open */
         unsigned char           present;                /* True if not disconnected */
         unsigned char           bidir;                  /* interface is bidirectional */
+        unsigned char           sleeping;               /* interface is suspended */
         unsigned char           *device_id_string;      /* IEEE 1284 DEVICE ID string (ptr) */
                                                         /* first 2 bytes are (big-endian) length */
 };
@@ -183,6 +184,7 @@ static void usblp_dump(struct usblp *usblp) {
         dbg("quirks=%d", usblp->quirks);
         dbg("used=%d", usblp->used);
         dbg("bidir=%d", usblp->bidir);
+        dbg("sleeping=%d", usblp->sleeping);
         dbg("device_id_string=\"%s\"",
                 usblp->device_id_string ?
                         usblp->device_id_string + 2 :
@@ -338,6 +340,20 @@ static int usblp_check_status(struct usblp *usblp, int err)
         return newerr;
 }
 
+static int handle_bidir (struct usblp *usblp)
+{
+        if (usblp->bidir && usblp->used && !usblp->sleeping) {
+                usblp->readcount = 0;
+                usblp->readurb->dev = usblp->dev;
+                if (usb_submit_urb(usblp->readurb, GFP_KERNEL) < 0) {
+                        usblp->used = 0;
+                        return -EIO;
+                }
+        }
+
+        return 0;
+}
+
 /*
  * File op functions.
  */
@@ -390,14 +406,9 @@ static int usblp_open(struct inode *inode, struct file *file)
         usblp->writeurb->status = 0;
         usblp->readurb->status = 0;
 
-        if (usblp->bidir) {
-                usblp->readcount = 0;
-                usblp->readurb->dev = usblp->dev;
-                if (usb_submit_urb(usblp->readurb, GFP_KERNEL) < 0) {
-                        retval = -EIO;
-                        usblp->used = 0;
-                        file->private_data = NULL;
-                }
+        if (handle_bidir(usblp) < 0) {
+                file->private_data = NULL;
+                retval = -EIO;
         }
 out:
         mutex_unlock (&usblp_mutex);
@@ -460,6 +471,11 @@ static long usblp_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                 goto done;
         }
 
+        if (usblp->sleeping) {
+                retval = -ENODEV;
+                goto done;
+        }
+
         dbg("usblp_ioctl: cmd=0x%x (%c nr=%d len=%d dir=%d)", cmd, _IOC_TYPE(cmd),
                 _IOC_NR(cmd), _IOC_SIZE(cmd), _IOC_DIR(cmd) );
 
@@ -658,6 +674,11 @@ static ssize_t usblp_write(struct file *file, const char __user *buffer, size_t
                         return -ENODEV;
                 }
 
+                if (usblp->sleeping) {
+                        up (&usblp->sem);
+                        return writecount ? writecount : -ENODEV;
+                }
+
                 if (usblp->writeurb->status != 0) {
                         if (usblp->quirks & USBLP_QUIRK_BIDIR) {
                                 if (!usblp->wcomplete)
@@ -749,6 +770,11 @@ static ssize_t usblp_read(struct file *file, char __user *buffer, size_t count,
                 goto done;
         }
 
+        if (usblp->sleeping) {
+                count = -ENODEV;
+                goto done;
+        }
+
         if (usblp->readurb->status) {
                 err("usblp%d: error %d reading from printer",
                         usblp->minor, usblp->readurb->status);
@@ -1167,6 +1193,41 @@ static void usblp_disconnect(struct usb_interface *intf)
         mutex_unlock (&usblp_mutex);
 }
 
+static int usblp_suspend (struct usb_interface *intf, pm_message_t message)
+{
+        struct usblp *usblp = usb_get_intfdata (intf);
+
+        /* this races against normal access and open */
+        mutex_lock (&usblp_mutex);
+        down (&usblp->sem);
+        /* we take no more IO */
+        usblp->sleeping = 1;
+        /* we wait for anything printing */
+        wait_event (usblp->wait, usblp->wcomplete || !usblp->present);
+        usblp_unlink_urbs(usblp);
+        up (&usblp->sem);
+        mutex_unlock (&usblp_mutex);
+
+        return 0;
+}
+
+static int usblp_resume (struct usb_interface *intf)
+{
+        struct usblp *usblp = usb_get_intfdata (intf);
+        int r;
+
+        mutex_lock (&usblp_mutex);
+        down (&usblp->sem);
+
+        usblp->sleeping = 0;
+        r = handle_bidir (usblp);
+
+        up (&usblp->sem);
+        mutex_unlock (&usblp_mutex);
+
+        return r;
+}
+
 static struct usb_device_id usblp_ids [] = {
         { USB_DEVICE_INFO(7, 1, 1) },
         { USB_DEVICE_INFO(7, 1, 2) },
@@ -1183,6 +1244,8 @@ static struct usb_driver usblp_driver = {
         .name =         "usblp",
         .probe =        usblp_probe,
         .disconnect =   usblp_disconnect,
+        .suspend =      usblp_suspend,
+        .resume =       usblp_resume,
         .id_table =     usblp_ids,
 };
 
diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c
index 724822cac2b1..fed92be63b5e 100644
--- a/drivers/usb/core/devio.c
+++ b/drivers/usb/core/devio.c
@@ -1588,15 +1588,18 @@ const struct file_operations usbfs_device_file_operations = {
         .release =      usbdev_release,
 };
 
-static void usbdev_add(struct usb_device *dev)
+static int usbdev_add(struct usb_device *dev)
 {
         int minor = ((dev->bus->busnum-1) * 128) + (dev->devnum-1);
 
         dev->class_dev = class_device_create(usb_device_class, NULL,
                                 MKDEV(USB_DEVICE_MAJOR, minor), &dev->dev,
                                 "usbdev%d.%d", dev->bus->busnum, dev->devnum);
+        if (IS_ERR(dev->class_dev))
+                return PTR_ERR(dev->class_dev);
 
         dev->class_dev->class_data = dev;
+        return 0;
 }
 
 static void usbdev_remove(struct usb_device *dev)
@@ -1609,7 +1612,8 @@ static int usbdev_notify(struct notifier_block *self, unsigned long action,
 {
         switch (action) {
         case USB_DEVICE_ADD:
-                usbdev_add(dev);
+                if (usbdev_add(dev))
+                        return NOTIFY_BAD;
                 break;
         case USB_DEVICE_REMOVE:
                 usbdev_remove(dev);
diff --git a/drivers/usb/core/endpoint.c b/drivers/usb/core/endpoint.c
index 3ebb90149e93..3b2d137912be 100644
--- a/drivers/usb/core/endpoint.c
+++ b/drivers/usb/core/endpoint.c
@@ -223,7 +223,7 @@ int usb_create_ep_files(struct device *parent,
         ep_dev = kzalloc(sizeof(*ep_dev), GFP_KERNEL);
         if (!ep_dev) {
                 retval = -ENOMEM;
-                goto exit;
+                goto error_alloc;
         }
 
         /* fun calculation to determine the minor of this endpoint */
@@ -241,33 +241,31 @@ int usb_create_ep_files(struct device *parent,
 
         retval = device_register(&ep_dev->dev);
         if (retval)
-                goto error;
+                goto error_register;
         retval = sysfs_create_group(&ep_dev->dev.kobj, &ep_dev_attr_grp);
         if (retval)
                 goto error_group;
 
-        endpoint->ep_dev = ep_dev;
-
         /* create the symlink to the old-style "ep_XX" directory */
         sprintf(name, "ep_%02x", endpoint->desc.bEndpointAddress);
-        retval = sysfs_create_link(&parent->kobj,
-                                   &endpoint->ep_dev->dev.kobj, name);
+        retval = sysfs_create_link(&parent->kobj, &ep_dev->dev.kobj, name);
         if (retval)
                 goto error_link;
-exit:
+        endpoint->ep_dev = ep_dev;
         return retval;
 
 error_link:
         sysfs_remove_group(&ep_dev->dev.kobj, &ep_dev_attr_grp);
-
 error_group:
         device_unregister(&ep_dev->dev);
-        endpoint->ep_dev = NULL;
         destroy_endpoint_class();
         return retval;
-error:
+
+error_register:
         kfree(ep_dev);
+error_alloc:
         destroy_endpoint_class();
+exit:
         return retval;
 }
 
@@ -282,8 +280,6 @@ void usb_remove_ep_files(struct usb_host_endpoint *endpoint)
                 sysfs_remove_group(&endpoint->ep_dev->dev.kobj, &ep_dev_attr_grp);
                 device_unregister(&endpoint->ep_dev->dev);
                 endpoint->ep_dev = NULL;
+                destroy_endpoint_class();
         }
-        destroy_endpoint_class();
 }
-
-
diff --git a/drivers/usb/gadget/net2280.c b/drivers/usb/gadget/net2280.c
index d954daa8e9e0..3acc896a5d4c 100644
--- a/drivers/usb/gadget/net2280.c
+++ b/drivers/usb/gadget/net2280.c
@@ -1774,8 +1774,8 @@ static DEVICE_ATTR (queues, S_IRUGO, show_queues, NULL);
 
 #else
 
-#define device_create_file(a,b) do {} while (0)
-#define device_remove_file      device_create_file
+#define device_create_file(a,b) (0)
+#define device_remove_file(a,b) do { } while (0)
 
 #endif
 
@@ -2044,8 +2044,10 @@ int usb_gadget_register_driver (struct usb_gadget_driver *driver)
                 return retval;
         }
 
-        device_create_file (&dev->pdev->dev, &dev_attr_function);
-        device_create_file (&dev->pdev->dev, &dev_attr_queues);
+        retval = device_create_file (&dev->pdev->dev, &dev_attr_function);
+        if (retval) goto err_unbind;
+        retval = device_create_file (&dev->pdev->dev, &dev_attr_queues);
+        if (retval) goto err_func;
 
         /* ... then enable host detection and ep0; and we're ready
          * for set_configuration as well as eventual disconnect.
@@ -2060,6 +2062,14 @@ int usb_gadget_register_driver (struct usb_gadget_driver *driver)
 
         /* pci writes may still be posted */
         return 0;
+
+err_func:
+        device_remove_file (&dev->pdev->dev, &dev_attr_function);
+err_unbind:
+        driver->unbind (&dev->gadget);
+        dev->gadget.dev.driver = NULL;
+        dev->driver = NULL;
+        return retval;
 }
 EXPORT_SYMBOL (usb_gadget_register_driver);
 
@@ -2974,8 +2984,10 @@ static int net2280_probe (struct pci_dev *pdev, const struct pci_device_id *id)
                                 : "disabled");
         the_controller = dev;
 
-        device_register (&dev->gadget.dev);
-        device_create_file (&pdev->dev, &dev_attr_registers);
+        retval = device_register (&dev->gadget.dev);
+        if (retval) goto done;
+        retval = device_create_file (&pdev->dev, &dev_attr_registers);
+        if (retval) goto done;
 
         return 0;
 
diff --git a/drivers/usb/gadget/pxa2xx_udc.c b/drivers/usb/gadget/pxa2xx_udc.c
index f42c00ef0bca..671c24bc6d75 100644
--- a/drivers/usb/gadget/pxa2xx_udc.c
+++ b/drivers/usb/gadget/pxa2xx_udc.c
@@ -43,11 +43,11 @@
 #include <linux/mm.h>
 #include <linux/platform_device.h>
 #include <linux/dma-mapping.h>
+#include <linux/irq.h>
 
 #include <asm/byteorder.h>
 #include <asm/dma.h>
 #include <asm/io.h>
-#include <asm/irq.h>
 #include <asm/system.h>
 #include <asm/mach-types.h>
 #include <asm/unaligned.h>
diff --git a/drivers/usb/host/ehci-dbg.c b/drivers/usb/host/ehci-dbg.c
index 23b95b2bfe15..34b7a31cd85b 100644
--- a/drivers/usb/host/ehci-dbg.c
+++ b/drivers/usb/host/ehci-dbg.c
@@ -754,7 +754,9 @@ show_registers (struct class_device *class_dev, char *buf)
         }
 
         if (ehci->reclaim) {
-                temp = scnprintf (next, size, "reclaim qh %p\n", ehci->reclaim);
+                temp = scnprintf (next, size, "reclaim qh %p%s\n",
+                                ehci->reclaim,
+                                ehci->reclaim_ready ? " ready" : "");
                 size -= temp;
                 next += temp;
         }
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index aac6ec5dd7cf..9030994aba98 100644
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -111,7 +111,7 @@ static const char	hcd_name [] = "ehci_hcd";
 #define EHCI_TUNE_MULT_TT       1
 #define EHCI_TUNE_FLS           2       /* (small) 256 frame schedule */
 
-#define EHCI_IAA_MSECS          10              /* arbitrary */
+#define EHCI_IAA_JIFFIES        (HZ/100)        /* arbitrary; ~10 msec */
 #define EHCI_IO_JIFFIES         (HZ/10)         /* io watchdog > irq_thresh */
 #define EHCI_ASYNC_JIFFIES      (HZ/20)         /* async idle timeout */
 #define EHCI_SHRINK_JIFFIES     (HZ/200)        /* async qh unlink delay */
@@ -254,7 +254,6 @@ static void ehci_quiesce (struct ehci_hcd *ehci)
 
 /*-------------------------------------------------------------------------*/
 
-static void end_unlink_async (struct ehci_hcd *ehci);
 static void ehci_work(struct ehci_hcd *ehci);
 
 #include "ehci-hub.c"
@@ -264,37 +263,25 @@ static void ehci_work(struct ehci_hcd *ehci);
 
 /*-------------------------------------------------------------------------*/
 
-static void ehci_iaa_watchdog (unsigned long param)
+static void ehci_watchdog (unsigned long param)
 {
         struct ehci_hcd         *ehci = (struct ehci_hcd *) param;
         unsigned long           flags;
-        u32                     status;
 
         spin_lock_irqsave (&ehci->lock, flags);
-        WARN_ON(!ehci->reclaim);
 
-        /* lost IAA irqs wedge things badly; seen first with a vt8235 */
+        /* lost IAA irqs wedge things badly; seen with a vt8235 */
         if (ehci->reclaim) {
-                status = readl (&ehci->regs->status);
+                u32             status = readl (&ehci->regs->status);
                 if (status & STS_IAA) {
                         ehci_vdbg (ehci, "lost IAA\n");
                         COUNT (ehci->stats.lost_iaa);
                         writel (STS_IAA, &ehci->regs->status);
-                        end_unlink_async (ehci);
+                        ehci->reclaim_ready = 1;
                 }
         }
 
-        spin_unlock_irqrestore (&ehci->lock, flags);
-}
-
-static void ehci_watchdog (unsigned long param)
-{
-        struct ehci_hcd         *ehci = (struct ehci_hcd *) param;
-        unsigned long           flags;
-
-        spin_lock_irqsave (&ehci->lock, flags);
-
-        /* stop async processing after it's idled a bit */
+        /* stop async processing after it's idled a bit */
         if (test_bit (TIMER_ASYNC_OFF, &ehci->actions))
                 start_unlink_async (ehci, ehci->async);
 
@@ -345,6 +332,8 @@ static void ehci_port_power (struct ehci_hcd *ehci, int is_on)
 static void ehci_work (struct ehci_hcd *ehci)
 {
         timer_action_done (ehci, TIMER_IO_WATCHDOG);
+        if (ehci->reclaim_ready)
+                end_unlink_async (ehci);
 
         /* another CPU may drop ehci->lock during a schedule scan while
          * it reports urb completions.  this flag guards against bogus
@@ -379,7 +368,6 @@ static void ehci_stop (struct usb_hcd *hcd)
 
         /* no more interrupts ... */
         del_timer_sync (&ehci->watchdog);
-        del_timer_sync (&ehci->iaa_watchdog);
 
         spin_lock_irq(&ehci->lock);
         if (HC_IS_RUNNING (hcd->state))
@@ -426,10 +414,6 @@ static int ehci_init(struct usb_hcd *hcd)
         ehci->watchdog.function = ehci_watchdog;
         ehci->watchdog.data = (unsigned long) ehci;
 
-        init_timer(&ehci->iaa_watchdog);
-        ehci->iaa_watchdog.function = ehci_iaa_watchdog;
-        ehci->iaa_watchdog.data = (unsigned long) ehci;
-
         /*
          * hw default: 1K periodic list heads, one per frame.
          * periodic_size can shrink by USBCMD update if hcc_params allows.
@@ -446,6 +430,7 @@ static int ehci_init(struct usb_hcd *hcd)
                 ehci->i_thresh = 2 + HCC_ISOC_THRES(hcc_params);
 
         ehci->reclaim = NULL;
+        ehci->reclaim_ready = 0;
         ehci->next_uframe = -1;
 
         /*
@@ -619,7 +604,7 @@ static irqreturn_t ehci_irq (struct usb_hcd *hcd)
         /* complete the unlinking of some qh [4.15.2.3] */
         if (status & STS_IAA) {
                 COUNT (ehci->stats.reclaim);
-                end_unlink_async (ehci);
+                ehci->reclaim_ready = 1;
                 bh = 1;
         }
 
@@ -723,14 +708,10 @@ static int ehci_urb_enqueue (
 
 static void unlink_async (struct ehci_hcd *ehci, struct ehci_qh *qh)
 {
-        // BUG_ON(qh->qh_state != QH_STATE_LINKED);
-
-        /* failfast */
-        if (!HC_IS_RUNNING (ehci_to_hcd(ehci)->state))
-                end_unlink_async (ehci);
-
-        /* defer till later if busy */
-        else if (ehci->reclaim) {
+        /* if we need to use IAA and it's busy, defer */
+        if (qh->qh_state == QH_STATE_LINKED
+                        && ehci->reclaim
+                        && HC_IS_RUNNING (ehci_to_hcd(ehci)->state)) {
                 struct ehci_qh          *last;
 
                 for (last = ehci->reclaim;
@@ -740,8 +721,12 @@ static void unlink_async (struct ehci_hcd *ehci, struct ehci_qh *qh)
                 qh->qh_state = QH_STATE_UNLINK_WAIT;
                 last->reclaim = qh;
 
-        /* start IAA cycle */
-        } else
+        /* bypass IAA if the hc can't care */
+        } else if (!HC_IS_RUNNING (ehci_to_hcd(ehci)->state) && ehci->reclaim)
+                end_unlink_async (ehci);
+
+        /* something else might have unlinked the qh by now */
+        if (qh->qh_state == QH_STATE_LINKED)
                 start_unlink_async (ehci, qh);
 }
 
@@ -763,19 +748,7 @@ static int ehci_urb_dequeue (struct usb_hcd *hcd, struct urb *urb)
                 qh = (struct ehci_qh *) urb->hcpriv;
                 if (!qh)
                         break;
-                switch (qh->qh_state) {
-                case QH_STATE_LINKED:
-                case QH_STATE_COMPLETING:
-                        unlink_async (ehci, qh);
-                        break;
-                case QH_STATE_UNLINK:
-                case QH_STATE_UNLINK_WAIT:
-                        /* already started */
-                        break;
-                case QH_STATE_IDLE:
-                        WARN_ON(1);
-                        break;
-                }
+                unlink_async (ehci, qh);
                 break;
 
         case PIPE_INTERRUPT:
@@ -867,7 +840,6 @@ rescan:
                 unlink_async (ehci, qh);
                 /* FALL THROUGH */
         case QH_STATE_UNLINK:           /* wait for hw to finish? */
-        case QH_STATE_UNLINK_WAIT:
 idle_timeout:
                 spin_unlock_irqrestore (&ehci->lock, flags);
                 schedule_timeout_uninterruptible(1);
diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c
index 2012213c0a25..1b20722c102b 100644
--- a/drivers/usb/host/ehci-hub.c
+++ b/drivers/usb/host/ehci-hub.c
@@ -48,7 +48,7 @@ static int ehci_bus_suspend (struct usb_hcd *hcd)
         }
         ehci->command = readl (&ehci->regs->command);
         if (ehci->reclaim)
-                end_unlink_async (ehci);
+                ehci->reclaim_ready = 1;
         ehci_work(ehci);
 
         /* suspend any active/unsuspended ports, maybe allow wakeup */
diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c
index 35e3fab6fc4e..e51c1ed81ac4 100644
--- a/drivers/usb/host/ehci-pci.c
+++ b/drivers/usb/host/ehci-pci.c
@@ -303,7 +303,7 @@ restart:
         /* emptying the schedule aborts any urbs */
         spin_lock_irq(&ehci->lock);
         if (ehci->reclaim)
-                end_unlink_async (ehci);
+                ehci->reclaim_ready = 1;
         ehci_work(ehci);
         spin_unlock_irq(&ehci->lock);
 
diff --git a/drivers/usb/host/ehci-q.c b/drivers/usb/host/ehci-q.c
index 46327272f614..62e46dc60e86 100644
--- a/drivers/usb/host/ehci-q.c
+++ b/drivers/usb/host/ehci-q.c
@@ -967,7 +967,7 @@ static void end_unlink_async (struct ehci_hcd *ehci)
         struct ehci_qh          *qh = ehci->reclaim;
         struct ehci_qh          *next;
 
-        iaa_watchdog_done (ehci);
+        timer_action_done (ehci, TIMER_IAA_WATCHDOG);
 
         // qh->hw_next = cpu_to_le32 (qh->qh_dma);
         qh->qh_state = QH_STATE_IDLE;
@@ -977,6 +977,7 @@ static void end_unlink_async (struct ehci_hcd *ehci)
         /* other unlink(s) may be pending (in QH_STATE_UNLINK_WAIT) */
         next = qh->reclaim;
         ehci->reclaim = next;
+        ehci->reclaim_ready = 0;
         qh->reclaim = NULL;
 
         qh_completions (ehci, qh);
@@ -1051,10 +1052,11 @@ static void start_unlink_async (struct ehci_hcd *ehci, struct ehci_qh *qh)
                 return;
         }
 
+        ehci->reclaim_ready = 0;
         cmd |= CMD_IAAD;
         writel (cmd, &ehci->regs->command);
         (void) readl (&ehci->regs->command);
-        iaa_watchdog_start (ehci);
+        timer_action (ehci, TIMER_IAA_WATCHDOG);
 }
 
 /*-------------------------------------------------------------------------*/
diff --git a/drivers/usb/host/ehci.h b/drivers/usb/host/ehci.h
index 6aac39f50e07..bbc3082a73d7 100644
--- a/drivers/usb/host/ehci.h
+++ b/drivers/usb/host/ehci.h
@@ -58,6 +58,7 @@ struct ehci_hcd {			/* one per controller */
         /* async schedule support */
         struct ehci_qh          *async;
         struct ehci_qh          *reclaim;
+        unsigned                reclaim_ready : 1;
         unsigned                scanning : 1;
 
         /* periodic schedule support */
@@ -80,7 +81,6 @@ struct ehci_hcd {			/* one per controller */
         struct dma_pool         *itd_pool;      /* itd per iso urb */
         struct dma_pool         *sitd_pool;     /* sitd per split iso urb */
 
-        struct timer_list       iaa_watchdog;
         struct timer_list       watchdog;
         unsigned long           actions;
         unsigned                stamp;
@@ -114,21 +114,9 @@ static inline struct usb_hcd *ehci_to_hcd (struct ehci_hcd *ehci)
 }
 
 
-static inline void
-iaa_watchdog_start (struct ehci_hcd *ehci)
-{
-        WARN_ON(timer_pending(&ehci->iaa_watchdog));
-        mod_timer (&ehci->iaa_watchdog,
-                        jiffies + msecs_to_jiffies(EHCI_IAA_MSECS));
-}
-
-static inline void iaa_watchdog_done (struct ehci_hcd *ehci)
-{
-        del_timer (&ehci->iaa_watchdog);
-}
-
 enum ehci_timer_action {
         TIMER_IO_WATCHDOG,
+        TIMER_IAA_WATCHDOG,
         TIMER_ASYNC_SHRINK,
         TIMER_ASYNC_OFF,
 };
@@ -146,6 +134,9 @@ timer_action (struct ehci_hcd *ehci, enum ehci_timer_action action)
                 unsigned long t;
 
                 switch (action) {
+                case TIMER_IAA_WATCHDOG:
+                        t = EHCI_IAA_JIFFIES;
+                        break;
                 case TIMER_IO_WATCHDOG:
                         t = EHCI_IO_JIFFIES;
                         break;
@@ -162,7 +153,8 @@ timer_action (struct ehci_hcd *ehci, enum ehci_timer_action action)
                 // async queue SHRINK often precedes IAA.  while it's ready
                 // to go OFF neither can matter, and afterwards the IO
                 // watchdog stops unless there's still periodic traffic.
-                if (time_before_eq(t, ehci->watchdog.expires)
+                if (action != TIMER_IAA_WATCHDOG
+                                && t > ehci->watchdog.expires
                                 && timer_pending (&ehci->watchdog))
                         return;
                 mod_timer (&ehci->watchdog, t);
diff --git a/drivers/usb/host/ohci-pnx4008.c b/drivers/usb/host/ohci-pnx4008.c
index 82cb22f002e7..2dbb77414905 100644
--- a/drivers/usb/host/ohci-pnx4008.c
+++ b/drivers/usb/host/ohci-pnx4008.c
@@ -262,6 +262,7 @@ static const struct hc_driver ohci_pnx4008_hc_driver = {
          */
         .start = ohci_pnx4008_start,
         .stop = ohci_stop,
+        .shutdown = ohci_shutdown,
 
         /*
          * managing i/o requests and associated device resources
@@ -280,7 +281,11 @@ static const struct hc_driver ohci_pnx4008_hc_driver = {
          */
         .hub_status_data = ohci_hub_status_data,
         .hub_control = ohci_hub_control,
-
+        .hub_irq_enable = ohci_rhsc_enable,
+#ifdef  CONFIG_PM
+        .bus_suspend = ohci_bus_suspend,
+        .bus_resume = ohci_bus_resume,
+#endif
         .start_port_reset = ohci_start_port_reset,
 };
 
@@ -410,8 +415,6 @@ static int __devinit usb_hcd_pnx4008_probe(struct platform_device *pdev)
                 goto out4;
         }
 
-        hcd->self.hcpriv = (void *)hcd;
-
         pnx4008_start_hc();
         platform_set_drvdata(pdev, hcd);
         ohci = hcd_to_ohci(hcd);
diff --git a/drivers/usb/host/uhci-hcd.c b/drivers/usb/host/uhci-hcd.c
index 45ee6920a850..226bf3de8edd 100644
--- a/drivers/usb/host/uhci-hcd.c
+++ b/drivers/usb/host/uhci-hcd.c
@@ -40,6 +40,7 @@
 #include <linux/dma-mapping.h>
 #include <linux/usb.h>
 #include <linux/bitops.h>
+#include <linux/dmi.h>
 
 #include <asm/uaccess.h>
 #include <asm/io.h>
@@ -196,12 +197,42 @@ static int resume_detect_interrupts_are_broken(struct uhci_hcd *uhci)
         return 0;
 }
 
+static int remote_wakeup_is_broken(struct uhci_hcd *uhci)
+{
+        static struct dmi_system_id broken_wakeup_table[] = {
+                {
+                        .ident = "Asus A7V8X",
+                        .matches = {
+                                DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTeK"),
+                                DMI_MATCH(DMI_BOARD_NAME, "A7V8X"),
+                                DMI_MATCH(DMI_BOARD_VERSION, "REV 1.xx"),
+                        }
+                },
+                { }
+        };
+        int port;
+
+        /* One of Asus's motherboards has a bug which causes it to
+         * wake up immediately from suspend-to-RAM if any of the ports
+         * are connected.  In such cases we will not set EGSM.
+         */
+        if (dmi_check_system(broken_wakeup_table)) {
+                for (port = 0; port < uhci->rh_numports; ++port) {
+                        if (inw(uhci->io_addr + USBPORTSC1 + port * 2) &
+                                        USBPORTSC_CCS)
+                                return 1;
+                }
+        }
+
+        return 0;
+}
+
 static void suspend_rh(struct uhci_hcd *uhci, enum uhci_rh_state new_state)
 __releases(uhci->lock)
 __acquires(uhci->lock)
 {
         int auto_stop;
-        int int_enable;
+        int int_enable, egsm_enable;
 
         auto_stop = (new_state == UHCI_RH_AUTO_STOPPED);
         dev_dbg(&uhci_to_hcd(uhci)->self.root_hub->dev,
@@ -217,15 +248,18 @@ __acquires(uhci->lock)
         }
 
         /* Enable resume-detect interrupts if they work.
-         * Then enter Global Suspend mode, still configured.
+         * Then enter Global Suspend mode if _it_ works, still configured.
          */
+        egsm_enable = USBCMD_EGSM;
         uhci->working_RD = 1;
         int_enable = USBINTR_RESUME;
-        if (resume_detect_interrupts_are_broken(uhci)) {
+        if (remote_wakeup_is_broken(uhci))
+                egsm_enable = 0;
+        if (resume_detect_interrupts_are_broken(uhci) || !egsm_enable)
                 uhci->working_RD = int_enable = 0;
-        }
+
         outw(int_enable, uhci->io_addr + USBINTR);
-        outw(USBCMD_EGSM | USBCMD_CF, uhci->io_addr + USBCMD);
+        outw(egsm_enable | USBCMD_CF, uhci->io_addr + USBCMD);
         mb();
         udelay(5);
 
diff --git a/drivers/usb/input/Kconfig b/drivers/usb/input/Kconfig
index 21cd22640080..20db36448ab3 100644
--- a/drivers/usb/input/Kconfig
+++ b/drivers/usb/input/Kconfig
@@ -348,13 +348,3 @@ config USB_APPLETOUCH
 
           To compile this driver as a module, choose M here: the
           module will be called appletouch.
-
-config USB_TRANCEVIBRATOR
-        tristate "PlayStation 2 Trance Vibrator driver support"
-        depends on USB
-        help
-          Say Y here if you want to connect a PlayStation 2 Trance Vibrator
-          device to your computer's USB port.
-
-          To compile this driver as a module, choose M here: the
-          module will be called trancevibrator.
diff --git a/drivers/usb/input/Makefile b/drivers/usb/input/Makefile
index 295f459d1079..d946d5213b30 100644
--- a/drivers/usb/input/Makefile
+++ b/drivers/usb/input/Makefile
@@ -3,7 +3,7 @@
 #
 
 # Multipart objects.
-wacom-objs      := wacom_sys.o wacom_wac.o
+wacom-objs      := wacom_wac.o wacom_sys.o
 usbhid-objs     := hid-core.o
 
 # Optional parts of multipart objects.
@@ -48,7 +48,6 @@ obj-$(CONFIG_USB_ACECAD)	+= acecad.o
 obj-$(CONFIG_USB_YEALINK)       += yealink.o
 obj-$(CONFIG_USB_XPAD)          += xpad.o
 obj-$(CONFIG_USB_APPLETOUCH)    += appletouch.o
-obj-$(CONFIG_USB_TRANCEVIBRATOR)        += trancevibrator.o
 
 ifeq ($(CONFIG_USB_DEBUG),y)
 EXTRA_CFLAGS += -DDEBUG
diff --git a/drivers/usb/input/hid-core.c b/drivers/usb/input/hid-core.c
index a6738a83ff5b..45f44fe33bfe 100644
--- a/drivers/usb/input/hid-core.c
+++ b/drivers/usb/input/hid-core.c
@@ -750,21 +750,31 @@ static __inline__ __u32 s32ton(__s32 value, unsigned n)
 }
 
 /*
- * Extract/implement a data field from/to a report.
+ * Extract/implement a data field from/to a little endian report (bit array).
  */
 
 static __inline__ __u32 extract(__u8 *report, unsigned offset, unsigned n)
 {
-        report += (offset >> 5) << 2; offset &= 31;
-        return (le64_to_cpu(get_unaligned((__le64*)report)) >> offset) & ((1ULL << n) - 1);
+        u32 x;
+
+        report += offset >> 3;  /* adjust byte index */
+        offset &= 8 - 1;
+        x = get_unaligned((u32 *) report);
+        x = le32_to_cpu(x);
+        x = (x >> offset) & ((1 << n) - 1);
+        return x;
 }
 
 static __inline__ void implement(__u8 *report, unsigned offset, unsigned n, __u32 value)
 {
-        report += (offset >> 5) << 2; offset &= 31;
-        put_unaligned((get_unaligned((__le64*)report)
-                & cpu_to_le64(~((((__u64) 1 << n) - 1) << offset)))
-                | cpu_to_le64((__u64)value << offset), (__le64*)report);
+        u32 x;
+
+        report += offset >> 3;
+        offset &= 8 - 1;
+        x = get_unaligned((u32 *)report);
+        x &= cpu_to_le32(~((((__u32) 1 << n) - 1) << offset));
+        x |= cpu_to_le32(value << offset);
+        put_unaligned(x,(u32 *)report);
 }
 
 /*
@@ -1381,6 +1391,9 @@ void hid_close(struct hid_device *hid)
 
 #define USB_VENDOR_ID_PANJIT            0x134c
 
+#define USB_VENDOR_ID_TURBOX            0x062a
+#define USB_DEVICE_ID_TURBOX_KEYBOARD   0x0201
+
 /*
  * Initialize all reports
  */
@@ -1768,6 +1781,8 @@ static const struct hid_blacklist {
         { USB_VENDOR_ID_PANJIT, 0x0003, HID_QUIRK_IGNORE },
         { USB_VENDOR_ID_PANJIT, 0x0004, HID_QUIRK_IGNORE },
 
+        { USB_VENDOR_ID_TURBOX, USB_DEVICE_ID_TURBOX_KEYBOARD, HID_QUIRK_NOGET },
+        
         { 0, 0 }
 };
 
diff --git a/drivers/usb/input/usbtouchscreen.c b/drivers/usb/input/usbtouchscreen.c
index f26c1cd1129f..2902742895ad 100644
--- a/drivers/usb/input/usbtouchscreen.c
+++ b/drivers/usb/input/usbtouchscreen.c
@@ -256,10 +256,10 @@ static int itm_read_data(unsigned char *pkt, int *x, int *y, int *touch, int *pr
 {
         *x = ((pkt[0] & 0x1F) << 7) | (pkt[3] & 0x7F);
         *y = ((pkt[1] & 0x1F) << 7) | (pkt[4] & 0x7F);
-        *press = ((pkt[2] & 0x1F) << 7) | (pkt[5] & 0x7F);
+        *press = ((pkt[2] & 0x01) << 7) | (pkt[5] & 0x7F);
         *touch = ~pkt[7] & 0x20;
 
-        return 1;
+        return *touch;
 }
 #endif
 
diff --git a/drivers/usb/input/wacom.h b/drivers/usb/input/wacom.h
index 7b3840e378a8..1cf08f02c50e 100644
--- a/drivers/usb/input/wacom.h
+++ b/drivers/usb/input/wacom.h
@@ -63,6 +63,7 @@
  *      v1.46 (pc) - Split wacom.c into wacom_sys.c and wacom_wac.c,
  *                 - where wacom_sys.c deals with system specific code,
  *                 - and wacom_wac.c deals with Wacom specific code
+ *                 - Support Intuos3 4x6
  */
 
 /*
@@ -118,6 +119,7 @@ extern void wacom_input_sync(void *wcombo);
 extern void wacom_init_input_dev(struct input_dev *input_dev, struct wacom_wac *wacom_wac);
 extern void input_dev_g4(struct input_dev *input_dev, struct wacom_wac *wacom_wac);
 extern void input_dev_g(struct input_dev *input_dev, struct wacom_wac *wacom_wac);
+extern void input_dev_i3s(struct input_dev *input_dev, struct wacom_wac *wacom_wac);
 extern void input_dev_i3(struct input_dev *input_dev, struct wacom_wac *wacom_wac);
 extern void input_dev_i(struct input_dev *input_dev, struct wacom_wac *wacom_wac);
 extern void input_dev_pl(struct input_dev *input_dev, struct wacom_wac *wacom_wac);
diff --git a/drivers/usb/input/wacom_sys.c b/drivers/usb/input/wacom_sys.c
index d233c37bd533..3498b893b53b 100644
--- a/drivers/usb/input/wacom_sys.c
+++ b/drivers/usb/input/wacom_sys.c
@@ -110,7 +110,7 @@ __u16 wacom_be16_to_cpu(unsigned char *data)
 __u16 wacom_le16_to_cpu(unsigned char *data)
 {
         __u16 value;
-        value = be16_to_cpu(*(__be16 *) data);
+        value = le16_to_cpu(*(__le16 *) data);
         return value;
 }
 
@@ -143,7 +143,7 @@ void input_dev_g4(struct input_dev *input_dev, struct wacom_wac *wacom_wac)
         input_dev->evbit[0] |= BIT(EV_MSC);
         input_dev->mscbit[0] |= BIT(MSC_SERIAL);
         input_dev->keybit[LONG(BTN_DIGI)] |= BIT(BTN_TOOL_FINGER);
-        input_dev->keybit[LONG(BTN_LEFT)] |= BIT(BTN_0) | BIT(BTN_1) | BIT(BTN_2) | BIT(BTN_3) | BIT(BTN_4) | BIT(BTN_5) | BIT(BTN_6) | BIT(BTN_7);
+        input_dev->keybit[LONG(BTN_LEFT)] |= BIT(BTN_0) | BIT(BTN_4);
 }
 
 void input_dev_g(struct input_dev *input_dev, struct wacom_wac *wacom_wac)
@@ -155,11 +155,16 @@ void input_dev_g(struct input_dev *input_dev, struct wacom_wac *wacom_wac)
         input_set_abs_params(input_dev, ABS_DISTANCE, 0, wacom_wac->features->distance_max, 0, 0);
 }
 
-void input_dev_i3(struct input_dev *input_dev, struct wacom_wac *wacom_wac)
+void input_dev_i3s(struct input_dev *input_dev, struct wacom_wac *wacom_wac)
 {
         input_dev->keybit[LONG(BTN_DIGI)] |= BIT(BTN_TOOL_FINGER);
-        input_dev->keybit[LONG(BTN_LEFT)] |= BIT(BTN_0) | BIT(BTN_1) | BIT(BTN_2) | BIT(BTN_3) | BIT(BTN_4) | BIT(BTN_5) | BIT(BTN_6) | BIT(BTN_7);
+        input_dev->keybit[LONG(BTN_LEFT)] |= BIT(BTN_0) | BIT(BTN_1) | BIT(BTN_2) | BIT(BTN_3);
         input_set_abs_params(input_dev, ABS_RX, 0, 4097, 0, 0);
+}
+
+void input_dev_i3(struct input_dev *input_dev, struct wacom_wac *wacom_wac)
+{
+        input_dev->keybit[LONG(BTN_LEFT)] |= BIT(BTN_4) | BIT(BTN_5) | BIT(BTN_6) | BIT(BTN_7);
         input_set_abs_params(input_dev, ABS_RY, 0, 4097, 0, 0);
 }
 
@@ -218,8 +223,7 @@ static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *i
         strlcat(wacom->phys, "/input0", sizeof(wacom->phys));
 
         wacom_wac->features = get_wacom_feature(id);
-        if (wacom_wac->features->pktlen > 10)
-                BUG();
+        BUG_ON(wacom_wac->features->pktlen > 10);
 
         input_dev->name = wacom_wac->features->name;
         wacom->wacom_wac = wacom_wac;
@@ -244,7 +248,7 @@ static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *i
         usb_fill_int_urb(wacom->irq, dev,
                          usb_rcvintpipe(dev, endpoint->bEndpointAddress),
                          wacom_wac->data, wacom_wac->features->pktlen,
-                         wacom_wac->features->irq, wacom, endpoint->bInterval);
+                         wacom_sys_irq, wacom, endpoint->bInterval);
         wacom->irq->transfer_dma = wacom->data_dma;
         wacom->irq->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
 
@@ -278,8 +282,8 @@ static void wacom_disconnect(struct usb_interface *intf)
                 input_unregister_device(wacom->dev);
                 usb_free_urb(wacom->irq);
                 usb_buffer_free(interface_to_usbdev(intf), 10, wacom->wacom_wac->data, wacom->data_dma);
-                kfree(wacom);
                 kfree(wacom->wacom_wac);
+                kfree(wacom);
         }
 }
 
diff --git a/drivers/usb/input/wacom_wac.c b/drivers/usb/input/wacom_wac.c
index aa31d22d4f05..92726fe89379 100644
--- a/drivers/usb/input/wacom_wac.c
+++ b/drivers/usb/input/wacom_wac.c
@@ -191,9 +191,9 @@ static int wacom_graphire_irq(struct wacom_wac *wacom, void *wcombo)
                                 wacom_report_key(wcombo, BTN_LEFT, data[1] & 0x01);
                                 wacom_report_key(wcombo, BTN_RIGHT, data[1] & 0x02);
                                 if (wacom->features->type == WACOM_G4)
-                                        wacom_report_abs(wcombo, ABS_DISTANCE, data[6]);
+                                        wacom_report_abs(wcombo, ABS_DISTANCE, data[6] & 0x3f);
                                 else
-                                        wacom_report_abs(wcombo, ABS_DISTANCE, data[7]);
+                                        wacom_report_abs(wcombo, ABS_DISTANCE, data[7] & 0x3f);
                                 break;
                 }
         }
@@ -303,8 +303,9 @@ static int wacom_intuos_inout(struct wacom_wac *wacom, void *wcombo)
                                 wacom->tool[idx] = BTN_TOOL_PEN;
                 }
                 /* only large I3 support Lens Cursor */
-                if(!((wacom->tool[idx] == BTN_TOOL_LENS) &&
-                                (wacom->features->type == INTUOS3))) {
+                if(!((wacom->tool[idx] == BTN_TOOL_LENS)
+                                 && ((wacom->features->type == INTUOS3)
+                                 || (wacom->features->type == INTUOS3S)))) {
                         wacom_report_abs(wcombo, ABS_MISC, wacom->id[idx]); /* report tool id */
                         wacom_report_key(wcombo, wacom->tool[idx], 1);
                         wacom_input_event(wcombo, EV_MSC, MSC_SERIAL, wacom->serial[idx]);
@@ -315,10 +316,14 @@ static int wacom_intuos_inout(struct wacom_wac *wacom, void *wcombo)
 
         /* Exit report */
         if ((data[1] & 0xfe) == 0x80) {
-                wacom_report_key(wcombo, wacom->tool[idx], 0);
-                wacom_report_abs(wcombo, ABS_MISC, 0); /* reset tool id */
-                wacom_input_event(wcombo, EV_MSC, MSC_SERIAL, wacom->serial[idx]);
-                return 2;
+                if(!((wacom->tool[idx] == BTN_TOOL_LENS)
+                                 && ((wacom->features->type == INTUOS3)
+                                 || (wacom->features->type == INTUOS3S)))) {
+                        wacom_report_key(wcombo, wacom->tool[idx], 0);
+                        wacom_report_abs(wcombo, ABS_MISC, 0); /* reset tool id */
+                        wacom_input_event(wcombo, EV_MSC, MSC_SERIAL, wacom->serial[idx]);
+                        return 2;
+                }
         }
         return 0;
 }
@@ -382,7 +387,8 @@ static int wacom_intuos_irq(struct wacom_wac *wacom, void *wcombo)
                 wacom_report_abs(wcombo, ABS_RX, ((data[1] & 0x1f) << 8) | data[2]);
                 wacom_report_abs(wcombo, ABS_RY, ((data[3] & 0x1f) << 8) | data[4]);
 
-                if((data[5] & 0x0f) | (data[6] & 0x0f) | (data[1] & 0x1f) | data[2])
+                if((data[5] & 0x0f) | (data[6] & 0x0f) | (data[1] & 0x1f) |
+                        data[2] | (data[3] & 0x1f) | data[4])
                         wacom_report_key(wcombo, wacom->tool[1], 1);
                 else
                         wacom_report_key(wcombo, wacom->tool[1], 0);
@@ -432,7 +438,7 @@ static int wacom_intuos_irq(struct wacom_wac *wacom, void *wcombo)
                                         ((t - 1) / 2) : -t / 2);
                         }
 
-                } else if (!(data[1] & 0x10) && wacom->features->type < INTUOS3) {
+                } else if (!(data[1] & 0x10) && wacom->features->type < INTUOS3S) {
                         /* 4D mouse packet */
                         wacom_report_key(wcombo, BTN_LEFT,   data[8] & 0x01);
                         wacom_report_key(wcombo, BTN_MIDDLE, data[8] & 0x02);
@@ -452,12 +458,12 @@ static int wacom_intuos_irq(struct wacom_wac *wacom, void *wcombo)
                                                  - ((data[8] & 0x02) >> 1));
 
                         /* I3 2D mouse side buttons */
-                        if (wacom->features->type == INTUOS3) {
+                        if (wacom->features->type >= INTUOS3S && wacom->features->type <= INTUOS3L) {
                                 wacom_report_key(wcombo, BTN_SIDE,   data[8] & 0x40);
                                 wacom_report_key(wcombo, BTN_EXTRA,  data[8] & 0x20);
                         }
 
-                } else if (wacom->features->type < INTUOS3) {
+                } else if (wacom->features->type < INTUOS3S || wacom->features->type == INTUOS3L) {
                         /* Lens cursor packets */
                         wacom_report_key(wcombo, BTN_LEFT,   data[8] & 0x01);
                         wacom_report_key(wcombo, BTN_MIDDLE, data[8] & 0x02);
@@ -490,6 +496,7 @@ int wacom_wac_irq(struct wacom_wac *wacom_wac, void *wcombo)
                         return (wacom_ptu_irq(wacom_wac, wcombo));
                         break;
                 case INTUOS:
+                case INTUOS3S:
                 case INTUOS3:
                 case INTUOS3L:
                 case CINTIQ:
@@ -515,6 +522,8 @@ void wacom_init_input_dev(struct input_dev *input_dev, struct wacom_wac *wacom_w
                 case CINTIQ:
                         input_dev_i3(input_dev, wacom_wac);
                         /* fall through */
+                case INTUOS3S:
+                        input_dev_i3s(input_dev, wacom_wac);
                 case INTUOS:
                         input_dev_i(input_dev, wacom_wac);
                         break;
@@ -530,49 +539,50 @@ void wacom_init_input_dev(struct input_dev *input_dev, struct wacom_wac *wacom_w
 }
 
 static struct wacom_features wacom_features[] = {
-        { "Wacom Penpartner",    7,   5040,  3780,  255, 32, PENPARTNER,        wacom_sys_irq },
-        { "Wacom Graphire",      8,  10206,  7422,  511, 32, GRAPHIRE,  wacom_sys_irq },
-        { "Wacom Graphire2 4x5", 8,  10206,  7422,  511, 32, GRAPHIRE,  wacom_sys_irq },
-        { "Wacom Graphire2 5x7", 8,  13918, 10206,  511, 32, GRAPHIRE,  wacom_sys_irq },
-        { "Wacom Graphire3",     8,  10208,  7424,  511, 32, GRAPHIRE,  wacom_sys_irq },
-        { "Wacom Graphire3 6x8", 8,  16704, 12064,  511, 32, GRAPHIRE,  wacom_sys_irq },
-        { "Wacom Graphire4 4x5", 8,  10208,  7424,  511, 32, WACOM_G4,  wacom_sys_irq },
-        { "Wacom Graphire4 6x8", 8,  16704, 12064,  511, 32, WACOM_G4,  wacom_sys_irq },
-        { "Wacom Volito",        8,   5104,  3712,  511, 32, GRAPHIRE,  wacom_sys_irq },
-        { "Wacom PenStation2",   8,   3250,  2320,  255, 32, GRAPHIRE,  wacom_sys_irq },
-        { "Wacom Volito2 4x5",   8,   5104,  3712,  511, 32, GRAPHIRE,  wacom_sys_irq },
-        { "Wacom Volito2 2x3",   8,   3248,  2320,  511, 32, GRAPHIRE,  wacom_sys_irq },
-        { "Wacom PenPartner2",   8,   3250,  2320,  255, 32, GRAPHIRE,  wacom_sys_irq },
-        { "Wacom Intuos 4x5",   10,  12700, 10600, 1023, 15, INTUOS,    wacom_sys_irq},
-        { "Wacom Intuos 6x8",   10,  20320, 16240, 1023, 15, INTUOS,    wacom_sys_irq },
-        { "Wacom Intuos 9x12",  10,  30480, 24060, 1023, 15, INTUOS,    wacom_sys_irq },
-        { "Wacom Intuos 12x12", 10,  30480, 31680, 1023, 15, INTUOS,    wacom_sys_irq },
-        { "Wacom Intuos 12x18", 10,  45720, 31680, 1023, 15, INTUOS,    wacom_sys_irq},
-        { "Wacom PL400",         8,   5408,  4056,  255, 32, PL,        wacom_sys_irq },
-        { "Wacom PL500",         8,   6144,  4608,  255, 32, PL,        wacom_sys_irq },
-        { "Wacom PL600",         8,   6126,  4604,  255, 32, PL,        wacom_sys_irq },
-        { "Wacom PL600SX",       8,   6260,  5016,  255, 32, PL,        wacom_sys_irq },
-        { "Wacom PL550",         8,   6144,  4608,  511, 32, PL,        wacom_sys_irq },
-        { "Wacom PL800",         8,   7220,  5780,  511, 32, PL,        wacom_sys_irq },
-        { "Wacom PL700",         8,   6758,  5406,  511, 32, PL,        wacom_sys_irq },
-        { "Wacom PL510",         8,   6282,  4762,  511, 32, PL,        wacom_sys_irq },
-        { "Wacom DTU710",        8,  34080, 27660,  511, 32, PL,        wacom_sys_irq },
-        { "Wacom DTF521",        8,   6282,  4762,  511, 32, PL,        wacom_sys_irq },
-        { "Wacom DTF720",        8,   6858,  5506,  511, 32, PL,        wacom_sys_irq },
-        { "Wacom Cintiq Partner",8,  20480, 15360,  511, 32, PTU,       wacom_sys_irq },
-        { "Wacom Intuos2 4x5",   10, 12700, 10600, 1023, 15, INTUOS,    wacom_sys_irq },
-        { "Wacom Intuos2 6x8",   10, 20320, 16240, 1023, 15, INTUOS,    wacom_sys_irq },
-        { "Wacom Intuos2 9x12",  10, 30480, 24060, 1023, 15, INTUOS,    wacom_sys_irq },
-        { "Wacom Intuos2 12x12", 10, 30480, 31680, 1023, 15, INTUOS,    wacom_sys_irq },
-        { "Wacom Intuos2 12x18", 10, 45720, 31680, 1023, 15, INTUOS,    wacom_sys_irq },
-        { "Wacom Intuos3 4x5",   10, 25400, 20320, 1023, 15, INTUOS3,   wacom_sys_irq },
-        { "Wacom Intuos3 6x8",   10, 40640, 30480, 1023, 15, INTUOS3,   wacom_sys_irq },
-        { "Wacom Intuos3 9x12",  10, 60960, 45720, 1023, 15, INTUOS3,   wacom_sys_irq },
-        { "Wacom Intuos3 12x12", 10, 60960, 60960, 1023, 15, INTUOS3L,  wacom_sys_irq },
-        { "Wacom Intuos3 12x19", 10, 97536, 60960, 1023, 15, INTUOS3L,  wacom_sys_irq },
-        { "Wacom Intuos3 6x11",  10, 54204, 31750, 1023, 15, INTUOS3,   wacom_sys_irq },
-        { "Wacom Cintiq 21UX",   10, 87200, 65600, 1023, 15, CINTIQ,    wacom_sys_irq },
-        { "Wacom Intuos2 6x8",   10, 20320, 16240, 1023, 15, INTUOS,    wacom_sys_irq },
+        { "Wacom Penpartner",    7,   5040,  3780,  255,  0, PENPARTNER },
+        { "Wacom Graphire",      8,  10206,  7422,  511, 63, GRAPHIRE },
+        { "Wacom Graphire2 4x5", 8,  10206,  7422,  511, 63, GRAPHIRE },
+        { "Wacom Graphire2 5x7", 8,  13918, 10206,  511, 63, GRAPHIRE },
+        { "Wacom Graphire3",     8,  10208,  7424,  511, 63, GRAPHIRE },
+        { "Wacom Graphire3 6x8", 8,  16704, 12064,  511, 63, GRAPHIRE },
+        { "Wacom Graphire4 4x5", 8,  10208,  7424,  511, 63, WACOM_G4 },
+        { "Wacom Graphire4 6x8", 8,  16704, 12064,  511, 63, WACOM_G4 },
+        { "Wacom Volito",        8,   5104,  3712,  511,  0, GRAPHIRE },
+        { "Wacom PenStation2",   8,   3250,  2320,  255,  0, GRAPHIRE },
+        { "Wacom Volito2 4x5",   8,   5104,  3712,  511,  0, GRAPHIRE },
+        { "Wacom Volito2 2x3",   8,   3248,  2320,  511,  0, GRAPHIRE },
+        { "Wacom PenPartner2",   8,   3250,  2320,  255,  0, GRAPHIRE },
+        { "Wacom Intuos 4x5",   10,  12700, 10600, 1023, 63, INTUOS },
+        { "Wacom Intuos 6x8",   10,  20320, 16240, 1023, 63, INTUOS },
+        { "Wacom Intuos 9x12",  10,  30480, 24060, 1023, 63, INTUOS },
+        { "Wacom Intuos 12x12", 10,  30480, 31680, 1023, 63, INTUOS },
+        { "Wacom Intuos 12x18", 10,  45720, 31680, 1023, 63, INTUOS },
+        { "Wacom PL400",         8,   5408,  4056,  255,  0, PL },
+        { "Wacom PL500",         8,   6144,  4608,  255,  0, PL },
+        { "Wacom PL600",         8,   6126,  4604,  255,  0, PL },
+        { "Wacom PL600SX",       8,   6260,  5016,  255,  0, PL },
+        { "Wacom PL550",         8,   6144,  4608,  511,  0, PL },
+        { "Wacom PL800",         8,   7220,  5780,  511,  0, PL },
+        { "Wacom PL700",         8,   6758,  5406,  511,  0, PL },
+        { "Wacom PL510",         8,   6282,  4762,  511,  0, PL },
+        { "Wacom DTU710",        8,  34080, 27660,  511,  0, PL },
+        { "Wacom DTF521",        8,   6282,  4762,  511,  0, PL },
+        { "Wacom DTF720",        8,   6858,  5506,  511,  0, PL },
+        { "Wacom Cintiq Partner",8,  20480, 15360,  511,  0, PTU },
+        { "Wacom Intuos2 4x5",   10, 12700, 10600, 1023, 63, INTUOS },
+        { "Wacom Intuos2 6x8",   10, 20320, 16240, 1023, 63, INTUOS },
+        { "Wacom Intuos2 9x12",  10, 30480, 24060, 1023, 63, INTUOS },
+        { "Wacom Intuos2 12x12", 10, 30480, 31680, 1023, 63, INTUOS },
+        { "Wacom Intuos2 12x18", 10, 45720, 31680, 1023, 63, INTUOS },
+        { "Wacom Intuos3 4x5",   10, 25400, 20320, 1023, 63, INTUOS3S },
+        { "Wacom Intuos3 6x8",   10, 40640, 30480, 1023, 63, INTUOS3 },
+        { "Wacom Intuos3 9x12",  10, 60960, 45720, 1023, 63, INTUOS3 },
+        { "Wacom Intuos3 12x12", 10, 60960, 60960, 1023, 63, INTUOS3L },
+        { "Wacom Intuos3 12x19", 10, 97536, 60960, 1023, 63, INTUOS3L },
+        { "Wacom Intuos3 6x11",  10, 54204, 31750, 1023, 63, INTUOS3 },
+        { "Wacom Intuos3 4x6",   10, 31496, 19685, 1023, 15, INTUOS3S },
+        { "Wacom Cintiq 21UX",   10, 87200, 65600, 1023, 63, CINTIQ },
+        { "Wacom Intuos2 6x8",   10, 20320, 16240, 1023, 63, INTUOS },
         { }
 };
 
@@ -618,6 +628,7 @@ static struct usb_device_id wacom_ids[] = {
         { USB_DEVICE(USB_VENDOR_ID_WACOM, 0xB3) },
         { USB_DEVICE(USB_VENDOR_ID_WACOM, 0xB4) },
         { USB_DEVICE(USB_VENDOR_ID_WACOM, 0xB5) },
+        { USB_DEVICE(USB_VENDOR_ID_WACOM, 0xB7) },
         { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x3F) },
         { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x47) },
         { }
diff --git a/drivers/usb/input/wacom_wac.h b/drivers/usb/input/wacom_wac.h
index ceae7bf59d9f..a1d9ce007970 100644
--- a/drivers/usb/input/wacom_wac.h
+++ b/drivers/usb/input/wacom_wac.h
@@ -20,6 +20,7 @@ enum {
         PTU,
         PL,
         INTUOS,
+        INTUOS3S,
         INTUOS3,
         INTUOS3L,
         CINTIQ,
@@ -34,7 +35,6 @@ struct wacom_features {
         int pressure_max;
         int distance_max;
         int type;
-        usb_complete_t irq;
 };
 
 struct wacom_wac {
diff --git a/drivers/usb/input/xpad.c b/drivers/usb/input/xpad.c
index cebb6c463bfb..6a12a943b938 100644
--- a/drivers/usb/input/xpad.c
+++ b/drivers/usb/input/xpad.c
@@ -1,8 +1,9 @@
 /*
- * X-Box gamepad - v0.0.5
+ * X-Box gamepad - v0.0.6
  *
  * Copyright (c) 2002 Marko Friedemann <mfr@bmx-chemnitz.de>
- *
+ *               2005 Dominic Cerquetti <binary1230@yahoo.com>
+ *               2006 Adam Buchbinder <adam.buchbinder@gmail.com>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -30,9 +31,10 @@
  *  - Greg Kroah-Hartman - usb-skeleton driver
  *
  * TODO:
- *  - fine tune axes
+ *  - fine tune axes (especially trigger axes)
  *  - fix "analog" buttons (reported as digital now)
  *  - get rumble working
+ *  - need USB IDs for other dance pads
  *
  * History:
  *
@@ -57,25 +59,40 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/slab.h>
+#include <linux/stat.h>
 #include <linux/module.h>
+#include <linux/moduleparam.h>
 #include <linux/smp_lock.h>
 #include <linux/usb/input.h>
 
-#define DRIVER_VERSION "v0.0.5"
+#define DRIVER_VERSION "v0.0.6"
 #define DRIVER_AUTHOR "Marko Friedemann <mfr@bmx-chemnitz.de>"
 #define DRIVER_DESC "X-Box pad driver"
 
 #define XPAD_PKT_LEN 32
 
+/* xbox d-pads should map to buttons, as is required for DDR pads
+   but we map them to axes when possible to simplify things */
+#define MAP_DPAD_TO_BUTTONS    0
+#define MAP_DPAD_TO_AXES       1
+#define MAP_DPAD_UNKNOWN       -1
+
+static int dpad_to_buttons;
+module_param(dpad_to_buttons, bool, S_IRUGO);
+MODULE_PARM_DESC(dpad_to_buttons, "Map D-PAD to buttons rather than axes for unknown pads");
+
 static const struct xpad_device {
         u16 idVendor;
         u16 idProduct;
         char *name;
+        u8 dpad_mapping;
 } xpad_device[] = {
-        { 0x045e, 0x0202, "Microsoft X-Box pad (US)" },
-        { 0x045e, 0x0285, "Microsoft X-Box pad (Japan)" },
-        { 0x05fd, 0x107a, "InterAct 'PowerPad Pro' X-Box pad (Germany)" },
-        { 0x0000, 0x0000, "X-Box pad" }
+        { 0x045e, 0x0202, "Microsoft X-Box pad v1 (US)", MAP_DPAD_TO_AXES },
+        { 0x045e, 0x0289, "Microsoft X-Box pad v2 (US)", MAP_DPAD_TO_AXES },
+        { 0x045e, 0x0285, "Microsoft X-Box pad (Japan)", MAP_DPAD_TO_AXES },
+        { 0x05fd, 0x107a, "InterAct 'PowerPad Pro' X-Box pad (Germany)", MAP_DPAD_TO_AXES },
+        { 0x0c12, 0x8809, "RedOctane Xbox Dance Pad", MAP_DPAD_TO_BUTTONS },
+        { 0x0000, 0x0000, "Generic X-Box pad", MAP_DPAD_UNKNOWN }
 };
 
 static const signed short xpad_btn[] = {
@@ -84,11 +101,23 @@ static const signed short xpad_btn[] = {
         -1                                              /* terminating entry */
 };
 
+/* only used if MAP_DPAD_TO_BUTTONS */
+static const signed short xpad_btn_pad[] = {
+        BTN_LEFT, BTN_RIGHT,            /* d-pad left, right */
+        BTN_0, BTN_1,                   /* d-pad up, down (XXX names??) */
+        -1                              /* terminating entry */
+};
+
 static const signed short xpad_abs[] = {
         ABS_X, ABS_Y,           /* left stick */
         ABS_RX, ABS_RY,         /* right stick */
         ABS_Z, ABS_RZ,          /* triggers left/right */
-        ABS_HAT0X, ABS_HAT0Y,   /* digital pad */
+        -1                      /* terminating entry */
+};
+
+/* only used if MAP_DPAD_TO_AXES */
+static const signed short xpad_abs_pad[] = {
+        ABS_HAT0X, ABS_HAT0Y,   /* d-pad axes */
         -1                      /* terminating entry */
 };
 
@@ -100,14 +129,16 @@ static struct usb_device_id xpad_table [] = {
 MODULE_DEVICE_TABLE (usb, xpad_table);
 
 struct usb_xpad {
-        struct input_dev *dev;                  /* input device interface */
-        struct usb_device *udev;                /* usb device */
+        struct input_dev *dev;          /* input device interface */
+        struct usb_device *udev;        /* usb device */
 
-        struct urb *irq_in;                     /* urb for interrupt in report */
-        unsigned char *idata;                   /* input data */
+        struct urb *irq_in;             /* urb for interrupt in report */
+        unsigned char *idata;           /* input data */
         dma_addr_t idata_dma;
 
-        char phys[65];                          /* physical device path */
+        char phys[65];                  /* physical device path */
+
+        int dpad_mapping;               /* map d-pad to buttons or to axes */
 };
 
 /*
@@ -137,14 +168,21 @@ static void xpad_process_packet(struct usb_xpad *xpad, u16 cmd, unsigned char *d
         input_report_abs(dev, ABS_RZ, data[11]);
 
         /* digital pad */
-        input_report_abs(dev, ABS_HAT0X, !!(data[2] & 0x08) - !!(data[2] & 0x04));
-        input_report_abs(dev, ABS_HAT0Y, !!(data[2] & 0x02) - !!(data[2] & 0x01));
+        if (xpad->dpad_mapping == MAP_DPAD_TO_AXES) {
+                input_report_abs(dev, ABS_HAT0X, !!(data[2] & 0x08) - !!(data[2] & 0x04));
+                input_report_abs(dev, ABS_HAT0Y, !!(data[2] & 0x02) - !!(data[2] & 0x01));
+        } else /* xpad->dpad_mapping == MAP_DPAD_TO_BUTTONS */ {
+                input_report_key(dev, BTN_LEFT,  data[2] & 0x04);
+                input_report_key(dev, BTN_RIGHT, data[2] & 0x08);
+                input_report_key(dev, BTN_0,     data[2] & 0x01); // up
+                input_report_key(dev, BTN_1,     data[2] & 0x02); // down
+        }
 
         /* start/back buttons and stick press left/right */
-        input_report_key(dev, BTN_START, (data[2] & 0x10) >> 4);
-        input_report_key(dev, BTN_BACK, (data[2] & 0x20) >> 5);
-        input_report_key(dev, BTN_THUMBL, (data[2] & 0x40) >> 6);
-        input_report_key(dev, BTN_THUMBR, data[2] >> 7);
+        input_report_key(dev, BTN_START,  data[2] & 0x10);
+        input_report_key(dev, BTN_BACK,   data[2] & 0x20);
+        input_report_key(dev, BTN_THUMBL, data[2] & 0x40);
+        input_report_key(dev, BTN_THUMBR, data[2] & 0x80);
 
         /* "analog" buttons A, B, X, Y */
         input_report_key(dev, BTN_A, data[4]);
@@ -206,6 +244,28 @@ static void xpad_close (struct input_dev *dev)
         usb_kill_urb(xpad->irq_in);
 }
 
+static void xpad_set_up_abs(struct input_dev *input_dev, signed short abs)
+{
+        set_bit(abs, input_dev->absbit);
+
+        switch (abs) {
+        case ABS_X:
+        case ABS_Y:
+        case ABS_RX:
+        case ABS_RY:    /* the two sticks */
+                input_set_abs_params(input_dev, abs, -32768, 32767, 16, 128);
+                break;
+        case ABS_Z:
+        case ABS_RZ:    /* the triggers */
+                input_set_abs_params(input_dev, abs, 0, 255, 0, 0);
+                break;
+        case ABS_HAT0X:
+        case ABS_HAT0Y: /* the d-pad (only if MAP_DPAD_TO_AXES) */
+                input_set_abs_params(input_dev, abs, -1, 1, 0, 0);
+                break;
+        }
+}
+
 static int xpad_probe(struct usb_interface *intf, const struct usb_device_id *id)
 {
         struct usb_device *udev = interface_to_usbdev (intf);
@@ -235,6 +295,9 @@ static int xpad_probe(struct usb_interface *intf, const struct usb_device_id *id
                 goto fail2;
 
         xpad->udev = udev;
+        xpad->dpad_mapping = xpad_device[i].dpad_mapping;
+        if (xpad->dpad_mapping == MAP_DPAD_UNKNOWN)
+                xpad->dpad_mapping = dpad_to_buttons;
         xpad->dev = input_dev;
         usb_make_path(udev, xpad->phys, sizeof(xpad->phys));
         strlcat(xpad->phys, "/input0", sizeof(xpad->phys));
@@ -249,32 +312,19 @@ static int xpad_probe(struct usb_interface *intf, const struct usb_device_id *id
 
         input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
 
+        /* set up buttons */
         for (i = 0; xpad_btn[i] >= 0; i++)
                 set_bit(xpad_btn[i], input_dev->keybit);
+        if (xpad->dpad_mapping == MAP_DPAD_TO_BUTTONS)
+                for (i = 0; xpad_btn_pad[i] >= 0; i++)
+                        set_bit(xpad_btn_pad[i], input_dev->keybit);
 
-        for (i = 0; xpad_abs[i] >= 0; i++) {
-
-                signed short t = xpad_abs[i];
-
-                set_bit(t, input_dev->absbit);
-
-                switch (t) {
-                        case ABS_X:
-                        case ABS_Y:
-                        case ABS_RX:
-                        case ABS_RY:    /* the two sticks */
-                                input_set_abs_params(input_dev, t, -32768, 32767, 16, 128);
-                                break;
-                        case ABS_Z:
-                        case ABS_RZ:    /* the triggers */
-                                input_set_abs_params(input_dev, t, 0, 255, 0, 0);
-                                break;
-                        case ABS_HAT0X:
-                        case ABS_HAT0Y: /* the d-pad */
-                                input_set_abs_params(input_dev, t, -1, 1, 0, 0);
-                                break;
-                }
-        }
+        /* set up axes */
+        for (i = 0; xpad_abs[i] >= 0; i++)
+                xpad_set_up_abs(input_dev, xpad_abs[i]);
+        if (xpad->dpad_mapping == MAP_DPAD_TO_AXES)
+                for (i = 0; xpad_abs_pad[i] >= 0; i++)
+                    xpad_set_up_abs(input_dev, xpad_abs_pad[i]);
 
         ep_irq_in = &intf->cur_altsetting->endpoint[0].desc;
         usb_fill_int_urb(xpad->irq_in, udev,
@@ -305,7 +355,8 @@ static void xpad_disconnect(struct usb_interface *intf)
                 usb_kill_urb(xpad->irq_in);
                 input_unregister_device(xpad->dev);
                 usb_free_urb(xpad->irq_in);
-                usb_buffer_free(interface_to_usbdev(intf), XPAD_PKT_LEN, xpad->idata, xpad->idata_dma);
+                usb_buffer_free(interface_to_usbdev(intf), XPAD_PKT_LEN,
+                                xpad->idata, xpad->idata_dma);
                 kfree(xpad);
         }
 }
diff --git a/drivers/usb/misc/Kconfig b/drivers/usb/misc/Kconfig
index c29658f69e2a..a74bf8617e7f 100644
--- a/drivers/usb/misc/Kconfig
+++ b/drivers/usb/misc/Kconfig
@@ -223,6 +223,16 @@ config USB_LD
           To compile this driver as a module, choose M here: the
           module will be called ldusb.
 
+config USB_TRANCEVIBRATOR
+        tristate "PlayStation 2 Trance Vibrator driver support"
+        depends on USB
+        help
+          Say Y here if you want to connect a PlayStation 2 Trance Vibrator
+          device to your computer's USB port.
+
+          To compile this driver as a module, choose M here: the
+          module will be called trancevibrator.
+
 config USB_TEST
         tristate "USB testing driver (DEVELOPMENT)"
         depends on USB && USB_DEVICEFS && EXPERIMENTAL
diff --git a/drivers/usb/misc/Makefile b/drivers/usb/misc/Makefile
index 2be70fa259bf..11dc59540cda 100644
--- a/drivers/usb/misc/Makefile
+++ b/drivers/usb/misc/Makefile
@@ -21,6 +21,7 @@ obj-$(CONFIG_USB_PHIDGETMOTORCONTROL)	+= phidgetmotorcontrol.o
 obj-$(CONFIG_USB_PHIDGETSERVO)  += phidgetservo.o
 obj-$(CONFIG_USB_RIO500)        += rio500.o
 obj-$(CONFIG_USB_TEST)          += usbtest.o
+obj-$(CONFIG_USB_TRANCEVIBRATOR)        += trancevibrator.o
 obj-$(CONFIG_USB_USS720)        += uss720.o
 
 obj-$(CONFIG_USB_SISUSBVGA)     += sisusbvga/
diff --git a/drivers/usb/misc/adutux.c b/drivers/usb/misc/adutux.c
index aecd633fe9f6..af2934e016a7 100644
--- a/drivers/usb/misc/adutux.c
+++ b/drivers/usb/misc/adutux.c
@@ -370,7 +370,8 @@ static int adu_release(struct inode *inode, struct file *file)
         retval = adu_release_internal(dev);
 
 exit:
-        up(&dev->sem);
+        if (dev)
+                up(&dev->sem);
         dbg(2," %s : leave, return value %d", __FUNCTION__, retval);
         return retval;
 }
diff --git a/drivers/usb/misc/ftdi-elan.c b/drivers/usb/misc/ftdi-elan.c
index 0eb26a26115b..9b591b8b9369 100644
--- a/drivers/usb/misc/ftdi-elan.c
+++ b/drivers/usb/misc/ftdi-elan.c
@@ -513,8 +513,6 @@ static void ftdi_elan_respond_work(void *data)
                         ftdi->disconnected += 1;
                 } else if (retval == -ENODEV) {
                         ftdi->disconnected += 1;
-                } else if (retval == -ENODEV) {
-                        ftdi->disconnected += 1;
                 } else if (retval == -EILSEQ) {
                         ftdi->disconnected += 1;
                 } else {
@@ -1186,11 +1184,8 @@ static ssize_t ftdi_elan_write(struct file *file,
         int retval = 0;
         struct urb *urb;
         char *buf;
-        char data[30 *3 + 4];
-        char *d = data;
-        const char __user *s = user_buffer;
-        int m = (sizeof(data) - 1) / 3;
-        struct usb_ftdi *ftdi = (struct usb_ftdi *)file->private_data;
+        struct usb_ftdi *ftdi = file->private_data;
+
         if (ftdi->disconnected > 0) {
                 return -ENODEV;
         }
@@ -1220,27 +1215,18 @@ static ssize_t ftdi_elan_write(struct file *file,
         if (retval) {
                 dev_err(&ftdi->udev->dev, "failed submitting write urb, error %"
                         "d\n", retval);
-                goto error_4;
+                goto error_3;
         }
         usb_free_urb(urb);
-      exit:;
-        if (count > m) {
-                int I = m - 1;
-                while (I-- > 0) {
-                        d += sprintf(d, " %02X", 0x000000FF & *s++);
-                }
-                d += sprintf(d, " ..");
-        } else {
-                int I = count;
-                while (I-- > 0) {
-                        d += sprintf(d, " %02X", 0x000000FF & *s++);
-                }
-        }
+
+exit:
         return count;
-      error_4: error_3:usb_buffer_free(ftdi->udev, count, buf,
-              urb->transfer_dma);
-      error_2:usb_free_urb(urb);
-      error_1:return retval;
+error_3:
+        usb_buffer_free(ftdi->udev, count, buf, urb->transfer_dma);
+error_2:
+        usb_free_urb(urb);
+error_1:
+        return retval;
 }
 
 static struct file_operations ftdi_elan_fops = {
diff --git a/drivers/usb/input/trancevibrator.c b/drivers/usb/misc/trancevibrator.c
index 33cd91d11eca..33cd91d11eca 100644
--- a/drivers/usb/input/trancevibrator.c
+++ b/drivers/usb/misc/trancevibrator.c
diff --git a/drivers/usb/net/Kconfig b/drivers/usb/net/Kconfig
index 054059632a21..454a186b64ad 100644
--- a/drivers/usb/net/Kconfig
+++ b/drivers/usb/net/Kconfig
@@ -207,6 +207,14 @@ config USB_NET_PLUSB
           Choose this option if you're using a host-to-host cable
           with one of these chips.
 
+config USB_NET_MCS7830
+        tristate "MosChip MCS7830 based Ethernet adapters"
+        depends on USB_USBNET
+        help
+          Choose this option if you're using a 10/100 Ethernet USB2
+          adapter based on the MosChip 7830 controller. This includes
+          adapters marketed under the DeLOCK brand.
+
 config USB_NET_RNDIS_HOST
         tristate "Host for RNDIS devices (EXPERIMENTAL)"
         depends on USB_USBNET && EXPERIMENTAL
diff --git a/drivers/usb/net/Makefile b/drivers/usb/net/Makefile
index 160f19dbdf12..7b51964de171 100644
--- a/drivers/usb/net/Makefile
+++ b/drivers/usb/net/Makefile
@@ -14,6 +14,7 @@ obj-$(CONFIG_USB_NET_PLUSB)	+= plusb.o
 obj-$(CONFIG_USB_NET_RNDIS_HOST)        += rndis_host.o
 obj-$(CONFIG_USB_NET_CDC_SUBSET)        += cdc_subset.o
 obj-$(CONFIG_USB_NET_ZAURUS)    += zaurus.o
+obj-$(CONFIG_USB_NET_MCS7830)   += mcs7830.o
 obj-$(CONFIG_USB_USBNET)        += usbnet.o
 
 ifeq ($(CONFIG_USB_DEBUG),y)
diff --git a/drivers/usb/net/asix.c b/drivers/usb/net/asix.c
index c73dd224aa76..881841e600de 100644
--- a/drivers/usb/net/asix.c
+++ b/drivers/usb/net/asix.c
@@ -569,10 +569,12 @@ static int asix_mdio_read(struct net_device *netdev, int phy_id, int loc)
         struct usbnet *dev = netdev_priv(netdev);
         u16 res;
 
+        mutex_lock(&dev->phy_mutex);
         asix_set_sw_mii(dev);
         asix_read_cmd(dev, AX_CMD_READ_MII_REG, phy_id,
                                 (__u16)loc, 2, (u16 *)&res);
         asix_set_hw_mii(dev);
+        mutex_unlock(&dev->phy_mutex);
 
         devdbg(dev, "asix_mdio_read() phy_id=0x%02x, loc=0x%02x, returns=0x%04x", phy_id, loc, le16_to_cpu(res & 0xffff));
 
@@ -586,10 +588,12 @@ asix_mdio_write(struct net_device *netdev, int phy_id, int loc, int val)
         u16 res = cpu_to_le16(val);
 
         devdbg(dev, "asix_mdio_write() phy_id=0x%02x, loc=0x%02x, val=0x%04x", phy_id, loc, val);
+        mutex_lock(&dev->phy_mutex);
         asix_set_sw_mii(dev);
         asix_write_cmd(dev, AX_CMD_WRITE_MII_REG, phy_id,
                                 (__u16)loc, 2, (u16 *)&res);
         asix_set_hw_mii(dev);
+        mutex_unlock(&dev->phy_mutex);
 }
 
 /* Get the PHY Identifier from the PHYSID1 & PHYSID2 MII registers */
@@ -700,32 +704,6 @@ static void asix_get_drvinfo (struct net_device *net,
         info->eedump_len = data->eeprom_len;
 }
 
-static int asix_get_settings(struct net_device *net, struct ethtool_cmd *cmd)
-{
-        struct usbnet *dev = netdev_priv(net);
-
-        return mii_ethtool_gset(&dev->mii,cmd);
-}
-
-static int asix_set_settings(struct net_device *net, struct ethtool_cmd *cmd)
-{
-        struct usbnet *dev = netdev_priv(net);
-        int res = mii_ethtool_sset(&dev->mii,cmd);
-
-        /* link speed/duplex might have changed */
-        if (dev->driver_info->link_reset)
-                dev->driver_info->link_reset(dev);
-
-        return res;
-}
-
-static int asix_nway_reset(struct net_device *net)
-{
-        struct usbnet *dev = netdev_priv(net);
-
-        return mii_nway_restart(&dev->mii);
-}
-
 static u32 asix_get_link(struct net_device *net)
 {
         struct usbnet *dev = netdev_priv(net);
@@ -746,15 +724,15 @@ static int asix_ioctl (struct net_device *net, struct ifreq *rq, int cmd)
 static struct ethtool_ops ax88172_ethtool_ops = {
         .get_drvinfo            = asix_get_drvinfo,
         .get_link               = asix_get_link,
-        .nway_reset             = asix_nway_reset,
         .get_msglevel           = usbnet_get_msglevel,
         .set_msglevel           = usbnet_set_msglevel,
         .get_wol                = asix_get_wol,
         .set_wol                = asix_set_wol,
         .get_eeprom_len         = asix_get_eeprom_len,
         .get_eeprom             = asix_get_eeprom,
-        .get_settings           = asix_get_settings,
-        .set_settings           = asix_set_settings,
+        .get_settings           = usbnet_get_settings,
+        .set_settings           = usbnet_set_settings,
+        .nway_reset             = usbnet_nway_reset,
 };
 
 static void ax88172_set_multicast(struct net_device *net)
@@ -885,15 +863,15 @@ out1:
 static struct ethtool_ops ax88772_ethtool_ops = {
         .get_drvinfo            = asix_get_drvinfo,
         .get_link               = asix_get_link,
-        .nway_reset             = asix_nway_reset,
         .get_msglevel           = usbnet_get_msglevel,
         .set_msglevel           = usbnet_set_msglevel,
         .get_wol                = asix_get_wol,
         .set_wol                = asix_set_wol,
         .get_eeprom_len         = asix_get_eeprom_len,
         .get_eeprom             = asix_get_eeprom,
-        .get_settings           = asix_get_settings,
-        .set_settings           = asix_set_settings,
+        .get_settings           = usbnet_get_settings,
+        .set_settings           = usbnet_set_settings,
+        .nway_reset             = usbnet_nway_reset,
 };
 
 static int ax88772_link_reset(struct usbnet *dev)
@@ -1046,15 +1024,15 @@ out1:
 static struct ethtool_ops ax88178_ethtool_ops = {
         .get_drvinfo            = asix_get_drvinfo,
         .get_link               = asix_get_link,
-        .nway_reset             = asix_nway_reset,
         .get_msglevel           = usbnet_get_msglevel,
         .set_msglevel           = usbnet_set_msglevel,
         .get_wol                = asix_get_wol,
         .set_wol                = asix_set_wol,
         .get_eeprom_len         = asix_get_eeprom_len,
         .get_eeprom             = asix_get_eeprom,
-        .get_settings           = asix_get_settings,
-        .set_settings           = asix_set_settings,
+        .get_settings           = usbnet_get_settings,
+        .set_settings           = usbnet_set_settings,
+        .nway_reset             = usbnet_nway_reset,
 };
 
 static int marvell_phy_init(struct usbnet *dev)
diff --git a/drivers/usb/net/cdc_ether.c b/drivers/usb/net/cdc_ether.c
index 82ce0358d9a3..f6971b88349d 100644
--- a/drivers/usb/net/cdc_ether.c
+++ b/drivers/usb/net/cdc_ether.c
@@ -498,7 +498,7 @@ static struct usb_driver cdc_driver = {
 
 static int __init cdc_init(void)
 {
-        BUG_ON((sizeof(((struct usbnet *)0)->data)
+        BUILD_BUG_ON((sizeof(((struct usbnet *)0)->data)
                         < sizeof(struct cdc_state)));
 
         return usb_register(&cdc_driver);
diff --git a/drivers/usb/net/kaweth.c b/drivers/usb/net/kaweth.c
index 957d4ad316f9..7c906a43e497 100644
--- a/drivers/usb/net/kaweth.c
+++ b/drivers/usb/net/kaweth.c
@@ -65,16 +65,6 @@
 
 #undef DEBUG
 
-#ifdef DEBUG
-#define kaweth_dbg(format, arg...) printk(KERN_DEBUG __FILE__ ": " format "\n" ,##arg)
-#else
-#define kaweth_dbg(format, arg...) do {} while (0)
-#endif
-#define kaweth_err(format, arg...) printk(KERN_ERR __FILE__ ": " format "\n" ,##arg)
-#define kaweth_info(format, arg...) printk(KERN_INFO __FILE__ ": " format "\n" , ##arg)
-#define kaweth_warn(format, arg...) printk(KERN_WARNING __FILE__ ": " format "\n" , ##arg)
-
-
 #include "kawethfw.h"
 
 #define KAWETH_MTU                      1514
@@ -86,6 +76,9 @@
 
 #define KAWETH_STATUS_BROKEN            0x0000001
 #define KAWETH_STATUS_CLOSING           0x0000002
+#define KAWETH_STATUS_SUSPENDING        0x0000004
+
+#define KAWETH_STATUS_BLOCKED (KAWETH_STATUS_CLOSING | KAWETH_STATUS_SUSPENDING)
 
 #define KAWETH_PACKET_FILTER_PROMISCUOUS        0x01
 #define KAWETH_PACKET_FILTER_ALL_MULTICAST      0x02
@@ -112,6 +105,8 @@
 #define STATE_MASK                              0x40
 #define STATE_SHIFT                             5
 
+#define IS_BLOCKED(s) (s & KAWETH_STATUS_BLOCKED)
+
 
 MODULE_AUTHOR("Michael Zappe <zapman@interlan.net>, Stephane Alnet <stephane@u-picardie.fr>, Brad Hards <bhards@bigpond.net.au> and Oliver Neukum <oliver@neukum.org>");
 MODULE_DESCRIPTION("KL5USB101 USB Ethernet driver");
@@ -128,6 +123,8 @@ static int kaweth_internal_control_msg(struct usb_device *usb_dev,
                                        unsigned int pipe,
                                        struct usb_ctrlrequest *cmd, void *data,
                                        int len, int timeout);
+static int kaweth_suspend(struct usb_interface *intf, pm_message_t message);
+static int kaweth_resume(struct usb_interface *intf);
 
 /****************************************************************
  *     usb_device_id
@@ -179,6 +176,8 @@ static struct usb_driver kaweth_driver = {
         .name =         driver_name,
         .probe =        kaweth_probe,
         .disconnect =   kaweth_disconnect,
+        .suspend =      kaweth_suspend,
+        .resume =       kaweth_resume,
         .id_table =     usb_klsi_table,
 };
 
@@ -222,6 +221,7 @@ struct kaweth_device
         int suspend_lowmem_rx;
         int suspend_lowmem_ctrl;
         int linkstate;
+        int opened;
         struct work_struct lowmem_work;
 
         struct usb_device *dev;
@@ -265,17 +265,17 @@ static int kaweth_control(struct kaweth_device *kaweth,
 {
         struct usb_ctrlrequest *dr;
 
-        kaweth_dbg("kaweth_control()");
+        dbg("kaweth_control()");
 
         if(in_interrupt()) {
-                kaweth_dbg("in_interrupt()");
+                dbg("in_interrupt()");
                 return -EBUSY;
         }
 
         dr = kmalloc(sizeof(struct usb_ctrlrequest), GFP_ATOMIC);
 
         if (!dr) {
-                kaweth_dbg("kmalloc() failed");
+                dbg("kmalloc() failed");
                 return -ENOMEM;
         }
 
@@ -300,7 +300,7 @@ static int kaweth_read_configuration(struct kaweth_device *kaweth)
 {
         int retval;
 
-        kaweth_dbg("Reading kaweth configuration");
+        dbg("Reading kaweth configuration");
 
         retval = kaweth_control(kaweth,
                                 usb_rcvctrlpipe(kaweth->dev, 0),
@@ -322,7 +322,7 @@ static int kaweth_set_urb_size(struct kaweth_device *kaweth, __u16 urb_size)
 {
         int retval;
 
-        kaweth_dbg("Setting URB size to %d", (unsigned)urb_size);
+        dbg("Setting URB size to %d", (unsigned)urb_size);
 
         retval = kaweth_control(kaweth,
                                 usb_sndctrlpipe(kaweth->dev, 0),
@@ -344,7 +344,7 @@ static int kaweth_set_sofs_wait(struct kaweth_device *kaweth, __u16 sofs_wait)
 {
         int retval;
 
-        kaweth_dbg("Set SOFS wait to %d", (unsigned)sofs_wait);
+        dbg("Set SOFS wait to %d", (unsigned)sofs_wait);
 
         retval = kaweth_control(kaweth,
                                 usb_sndctrlpipe(kaweth->dev, 0),
@@ -367,7 +367,7 @@ static int kaweth_set_receive_filter(struct kaweth_device *kaweth,
 {
         int retval;
 
-        kaweth_dbg("Set receive filter to %d", (unsigned)receive_filter);
+        dbg("Set receive filter to %d", (unsigned)receive_filter);
 
         retval = kaweth_control(kaweth,
                                 usb_sndctrlpipe(kaweth->dev, 0),
@@ -392,7 +392,7 @@ static int kaweth_download_firmware(struct kaweth_device *kaweth,
                                     __u8 type)
 {
         if(data_len > KAWETH_FIRMWARE_BUF_SIZE) {
-                kaweth_err("Firmware too big: %d", data_len);
+                err("Firmware too big: %d", data_len);
                 return -ENOSPC;
         }
 
@@ -403,13 +403,13 @@ static int kaweth_download_firmware(struct kaweth_device *kaweth,
         kaweth->firmware_buf[4] = type;
         kaweth->firmware_buf[5] = interrupt;
 
-        kaweth_dbg("High: %i, Low:%i", kaweth->firmware_buf[3],
+        dbg("High: %i, Low:%i", kaweth->firmware_buf[3],
                    kaweth->firmware_buf[2]);
 
-        kaweth_dbg("Downloading firmware at %p to kaweth device at %p",
+        dbg("Downloading firmware at %p to kaweth device at %p",
             data,
             kaweth);
-        kaweth_dbg("Firmware length: %d", data_len);
+        dbg("Firmware length: %d", data_len);
 
         return kaweth_control(kaweth,
                               usb_sndctrlpipe(kaweth->dev, 0),
@@ -437,7 +437,7 @@ static int kaweth_trigger_firmware(struct kaweth_device *kaweth,
         kaweth->firmware_buf[6] = 0x00;
         kaweth->firmware_buf[7] = 0x00;
 
-        kaweth_dbg("Triggering firmware");
+        dbg("Triggering firmware");
 
         return kaweth_control(kaweth,
                               usb_sndctrlpipe(kaweth->dev, 0),
@@ -457,7 +457,7 @@ static int kaweth_reset(struct kaweth_device *kaweth)
 {
         int result;
 
-        kaweth_dbg("kaweth_reset(%p)", kaweth);
+        dbg("kaweth_reset(%p)", kaweth);
         result = kaweth_control(kaweth,
                                 usb_sndctrlpipe(kaweth->dev, 0),
                                 USB_REQ_SET_CONFIGURATION,
@@ -470,7 +470,7 @@ static int kaweth_reset(struct kaweth_device *kaweth)
 
         mdelay(10);
 
-        kaweth_dbg("kaweth_reset() returns %d.",result);
+        dbg("kaweth_reset() returns %d.",result);
 
         return result;
 }
@@ -534,7 +534,7 @@ static void kaweth_resubmit_tl(void *d)
 {
         struct kaweth_device *kaweth = (struct kaweth_device *)d;
 
-        if (kaweth->status | KAWETH_STATUS_CLOSING)
+        if (IS_BLOCKED(kaweth->status))
                 return;
 
         if (kaweth->suspend_lowmem_rx)
@@ -568,7 +568,7 @@ static int kaweth_resubmit_rx_urb(struct kaweth_device *kaweth,
                         kaweth->suspend_lowmem_rx = 1;
                         schedule_delayed_work(&kaweth->lowmem_work, HZ/4);
                 }
-                kaweth_err("resubmitting rx_urb %d failed", result);
+                err("resubmitting rx_urb %d failed", result);
         } else {
                 kaweth->suspend_lowmem_rx = 0;
         }
@@ -601,11 +601,15 @@ static void kaweth_usb_receive(struct urb *urb)
                 return;
         }
 
-        if (kaweth->status & KAWETH_STATUS_CLOSING)
+        spin_lock(&kaweth->device_lock);
+        if (IS_BLOCKED(kaweth->status)) {
+                spin_unlock(&kaweth->device_lock);
                 return;
+        }
+        spin_unlock(&kaweth->device_lock);
 
         if(urb->status && urb->status != -EREMOTEIO && count != 1) {
-                kaweth_err("%s RX status: %d count: %d packet_len: %d",
+                err("%s RX status: %d count: %d packet_len: %d",
                            net->name,
                            urb->status,
                            count,
@@ -616,9 +620,9 @@ static void kaweth_usb_receive(struct urb *urb)
 
         if(kaweth->net && (count > 2)) {
                 if(pkt_len > (count - 2)) {
-                        kaweth_err("Packet length too long for USB frame (pkt_len: %x, count: %x)",pkt_len, count);
-                        kaweth_err("Packet len & 2047: %x", pkt_len & 2047);
-                        kaweth_err("Count 2: %x", count2);
+                        err("Packet length too long for USB frame (pkt_len: %x, count: %x)",pkt_len, count);
+                        err("Packet len & 2047: %x", pkt_len & 2047);
+                        err("Count 2: %x", count2);
                         kaweth_resubmit_rx_urb(kaweth, GFP_ATOMIC);
                         return;
                 }
@@ -655,7 +659,7 @@ static int kaweth_open(struct net_device *net)
         struct kaweth_device *kaweth = netdev_priv(net);
         int res;
 
-        kaweth_dbg("Opening network device.");
+        dbg("Opening network device.");
 
         res = kaweth_resubmit_rx_urb(kaweth, GFP_KERNEL);
         if (res)
@@ -678,6 +682,7 @@ static int kaweth_open(struct net_device *net)
                 usb_kill_urb(kaweth->rx_urb);
                 return -EIO;
         }
+        kaweth->opened = 1;
 
         netif_start_queue(net);
 
@@ -688,14 +693,8 @@ static int kaweth_open(struct net_device *net)
 /****************************************************************
  *     kaweth_close
  ****************************************************************/
-static int kaweth_close(struct net_device *net)
+static void kaweth_kill_urbs(struct kaweth_device *kaweth)
 {
-        struct kaweth_device *kaweth = netdev_priv(net);
-
-        netif_stop_queue(net);
-
-        kaweth->status |= KAWETH_STATUS_CLOSING;
-
         usb_kill_urb(kaweth->irq_urb);
         usb_kill_urb(kaweth->rx_urb);
         usb_kill_urb(kaweth->tx_urb);
@@ -706,6 +705,21 @@ static int kaweth_close(struct net_device *net)
            we hit them again */
         usb_kill_urb(kaweth->irq_urb);
         usb_kill_urb(kaweth->rx_urb);
+}
+
+/****************************************************************
+ *     kaweth_close
+ ****************************************************************/
+static int kaweth_close(struct net_device *net)
+{
+        struct kaweth_device *kaweth = netdev_priv(net);
+
+        netif_stop_queue(net);
+        kaweth->opened = 0;
+
+        kaweth->status |= KAWETH_STATUS_CLOSING;
+
+        kaweth_kill_urbs(kaweth);
 
         kaweth->status &= ~KAWETH_STATUS_CLOSING;
 
@@ -732,7 +746,7 @@ static void kaweth_usb_transmit_complete(struct urb *urb)
 
         if (unlikely(urb->status != 0))
                 if (urb->status != -ENOENT)
-                        kaweth_dbg("%s: TX status %d.", kaweth->net->name, urb->status);
+                        dbg("%s: TX status %d.", kaweth->net->name, urb->status);
 
         netif_wake_queue(kaweth->net);
         dev_kfree_skb_irq(skb);
@@ -752,6 +766,9 @@ static int kaweth_start_xmit(struct sk_buff *skb, struct net_device *net)
 
         kaweth_async_set_rx_mode(kaweth);
         netif_stop_queue(net);
+        if (IS_BLOCKED(kaweth->status)) {
+                goto skip;
+        }
 
         /* We now decide whether we can put our special header into the sk_buff */
         if (skb_cloned(skb) || skb_headroom(skb) < 2) {
@@ -783,7 +800,8 @@ static int kaweth_start_xmit(struct sk_buff *skb, struct net_device *net)
 
         if((res = usb_submit_urb(kaweth->tx_urb, GFP_ATOMIC)))
         {
-                kaweth_warn("kaweth failed tx_urb %d", res);
+                warn("kaweth failed tx_urb %d", res);
+skip:
                 kaweth->stats.tx_errors++;
 
                 netif_start_queue(net);
@@ -812,7 +830,7 @@ static void kaweth_set_rx_mode(struct net_device *net)
                                      KAWETH_PACKET_FILTER_BROADCAST |
                                      KAWETH_PACKET_FILTER_MULTICAST;
 
-        kaweth_dbg("Setting Rx mode to %d", packet_filter_bitmap);
+        dbg("Setting Rx mode to %d", packet_filter_bitmap);
 
         netif_stop_queue(net);
 
@@ -850,10 +868,10 @@ static void kaweth_async_set_rx_mode(struct kaweth_device *kaweth)
                                 KAWETH_CONTROL_TIMEOUT);
 
         if(result < 0) {
-                kaweth_err("Failed to set Rx mode: %d", result);
+                err("Failed to set Rx mode: %d", result);
         }
         else {
-                kaweth_dbg("Set Rx mode to %d", packet_filter_bitmap);
+                dbg("Set Rx mode to %d", packet_filter_bitmap);
         }
         }
 }
@@ -874,7 +892,7 @@ static void kaweth_tx_timeout(struct net_device *net)
 {
         struct kaweth_device *kaweth = netdev_priv(net);
 
-        kaweth_warn("%s: Tx timed out. Resetting.", net->name);
+        warn("%s: Tx timed out. Resetting.", net->name);
         kaweth->stats.tx_errors++;
         net->trans_start = jiffies;
 
@@ -882,6 +900,42 @@ static void kaweth_tx_timeout(struct net_device *net)
 }
 
 /****************************************************************
+ *     kaweth_suspend
+ ****************************************************************/
+static int kaweth_suspend(struct usb_interface *intf, pm_message_t message)
+{
+        struct kaweth_device *kaweth = usb_get_intfdata(intf);
+        unsigned long flags;
+
+        spin_lock_irqsave(&kaweth->device_lock, flags);
+        kaweth->status |= KAWETH_STATUS_SUSPENDING;
+        spin_unlock_irqrestore(&kaweth->device_lock, flags);
+
+        kaweth_kill_urbs(kaweth);
+        return 0;
+}
+
+/****************************************************************
+ *     kaweth_resume
+ ****************************************************************/
+static int kaweth_resume(struct usb_interface *intf)
+{
+        struct kaweth_device *kaweth = usb_get_intfdata(intf);
+        unsigned long flags;
+
+        spin_lock_irqsave(&kaweth->device_lock, flags);
+        kaweth->status &= ~KAWETH_STATUS_SUSPENDING;
+        spin_unlock_irqrestore(&kaweth->device_lock, flags);
+
+        if (!kaweth->opened)
+                return 0;
+        kaweth_resubmit_rx_urb(kaweth, GFP_NOIO);
+        kaweth_resubmit_int_urb(kaweth, GFP_NOIO);
+
+        return 0;
+}
+
+/****************************************************************
  *     kaweth_probe
  ****************************************************************/
 static int kaweth_probe(
@@ -895,15 +949,15 @@ static int kaweth_probe(
         const eth_addr_t bcast_addr = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };
         int result = 0;
 
-        kaweth_dbg("Kawasaki Device Probe (Device number:%d): 0x%4.4x:0x%4.4x:0x%4.4x",
+        dbg("Kawasaki Device Probe (Device number:%d): 0x%4.4x:0x%4.4x:0x%4.4x",
                  dev->devnum,
                  le16_to_cpu(dev->descriptor.idVendor),
                  le16_to_cpu(dev->descriptor.idProduct),
                  le16_to_cpu(dev->descriptor.bcdDevice));
 
-        kaweth_dbg("Device at %p", dev);
+        dbg("Device at %p", dev);
 
-        kaweth_dbg("Descriptor length: %x type: %x",
+        dbg("Descriptor length: %x type: %x",
                  (int)dev->descriptor.bLength,
                  (int)dev->descriptor.bDescriptorType);
 
@@ -918,7 +972,7 @@ static int kaweth_probe(
         spin_lock_init(&kaweth->device_lock);
         init_waitqueue_head(&kaweth->term_wait);
 
-        kaweth_dbg("Resetting.");
+        dbg("Resetting.");
 
         kaweth_reset(kaweth);
 
@@ -928,17 +982,17 @@ static int kaweth_probe(
          */
 
         if (le16_to_cpu(dev->descriptor.bcdDevice) >> 8) {
-                kaweth_info("Firmware present in device.");
+                info("Firmware present in device.");
         } else {
                 /* Download the firmware */
-                kaweth_info("Downloading firmware...");
+                info("Downloading firmware...");
                 kaweth->firmware_buf = (__u8 *)__get_free_page(GFP_KERNEL);
                 if ((result = kaweth_download_firmware(kaweth,
                                                       kaweth_new_code,
                                                       len_kaweth_new_code,
                                                       100,
                                                       2)) < 0) {
-                        kaweth_err("Error downloading firmware (%d)", result);
+                        err("Error downloading firmware (%d)", result);
                         goto err_fw;
                 }
 
@@ -947,7 +1001,7 @@ static int kaweth_probe(
                                                       len_kaweth_new_code_fix,
                                                       100,
                                                       3)) < 0) {
-                        kaweth_err("Error downloading firmware fix (%d)", result);
+                        err("Error downloading firmware fix (%d)", result);
                         goto err_fw;
                 }
 
@@ -956,7 +1010,7 @@ static int kaweth_probe(
                                                       len_kaweth_trigger_code,
                                                       126,
                                                       2)) < 0) {
-                        kaweth_err("Error downloading trigger code (%d)", result);
+                        err("Error downloading trigger code (%d)", result);
                         goto err_fw;
 
                 }
@@ -966,18 +1020,18 @@ static int kaweth_probe(
                                                       len_kaweth_trigger_code_fix,
                                                       126,
                                                       3)) < 0) {
-                        kaweth_err("Error downloading trigger code fix (%d)", result);
+                        err("Error downloading trigger code fix (%d)", result);
                         goto err_fw;
                 }
 
 
                 if ((result = kaweth_trigger_firmware(kaweth, 126)) < 0) {
-                        kaweth_err("Error triggering firmware (%d)", result);
+                        err("Error triggering firmware (%d)", result);
                         goto err_fw;
                 }
 
                 /* Device will now disappear for a moment...  */
-                kaweth_info("Firmware loaded.  I'll be back...");
+                info("Firmware loaded.  I'll be back...");
 err_fw:
                 free_page((unsigned long)kaweth->firmware_buf);
                 free_netdev(netdev);
@@ -987,14 +1041,14 @@ err_fw:
         result = kaweth_read_configuration(kaweth);
 
         if(result < 0) {
-                kaweth_err("Error reading configuration (%d), no net device created", result);
+                err("Error reading configuration (%d), no net device created", result);
                 goto err_free_netdev;
         }
 
-        kaweth_info("Statistics collection: %x", kaweth->configuration.statistics_mask);
-        kaweth_info("Multicast filter limit: %x", kaweth->configuration.max_multicast_filters & ((1 << 15) - 1));
-        kaweth_info("MTU: %d", le16_to_cpu(kaweth->configuration.segment_size));
-        kaweth_info("Read MAC address %2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x",
+        info("Statistics collection: %x", kaweth->configuration.statistics_mask);
+        info("Multicast filter limit: %x", kaweth->configuration.max_multicast_filters & ((1 << 15) - 1));
+        info("MTU: %d", le16_to_cpu(kaweth->configuration.segment_size));
+        info("Read MAC address %2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x",
                  (int)kaweth->configuration.hw_addr[0],
                  (int)kaweth->configuration.hw_addr[1],
                  (int)kaweth->configuration.hw_addr[2],
@@ -1005,17 +1059,17 @@ err_fw:
         if(!memcmp(&kaweth->configuration.hw_addr,
                    &bcast_addr,
                    sizeof(bcast_addr))) {
-                kaweth_err("Firmware not functioning properly, no net device created");
+                err("Firmware not functioning properly, no net device created");
                 goto err_free_netdev;
         }
 
         if(kaweth_set_urb_size(kaweth, KAWETH_BUF_SIZE) < 0) {
-                kaweth_dbg("Error setting URB size");
+                dbg("Error setting URB size");
                 goto err_free_netdev;
         }
 
         if(kaweth_set_sofs_wait(kaweth, KAWETH_SOFS_TO_WAIT) < 0) {
-                kaweth_err("Error setting SOFS wait");
+                err("Error setting SOFS wait");
                 goto err_free_netdev;
         }
 
@@ -1025,11 +1079,11 @@ err_fw:
                                            KAWETH_PACKET_FILTER_MULTICAST);
 
         if(result < 0) {
-                kaweth_err("Error setting receive filter");
+                err("Error setting receive filter");
                 goto err_free_netdev;
         }
 
-        kaweth_dbg("Initializing net device.");
+        dbg("Initializing net device.");
 
         kaweth->tx_urb = usb_alloc_urb(0, GFP_KERNEL);
         if (!kaweth->tx_urb)
@@ -1086,13 +1140,13 @@ err_fw:
 
         SET_NETDEV_DEV(netdev, &intf->dev);
         if (register_netdev(netdev) != 0) {
-                kaweth_err("Error registering netdev.");
+                err("Error registering netdev.");
                 goto err_intfdata;
         }
 
-        kaweth_info("kaweth interface created at %s", kaweth->net->name);
+        info("kaweth interface created at %s", kaweth->net->name);
 
-        kaweth_dbg("Kaweth probe returning.");
+        dbg("Kaweth probe returning.");
 
         return 0;
 
@@ -1121,16 +1175,16 @@ static void kaweth_disconnect(struct usb_interface *intf)
         struct kaweth_device *kaweth = usb_get_intfdata(intf);
         struct net_device *netdev;
 
-        kaweth_info("Unregistering");
+        info("Unregistering");
 
         usb_set_intfdata(intf, NULL);
         if (!kaweth) {
-                kaweth_warn("unregistering non-existant device");
+                warn("unregistering non-existant device");
                 return;
         }
         netdev = kaweth->net;
 
-        kaweth_dbg("Unregistering net device");
+        dbg("Unregistering net device");
         unregister_netdev(netdev);
 
         usb_free_urb(kaweth->rx_urb);
@@ -1185,7 +1239,7 @@ static int usb_start_wait_urb(struct urb *urb, int timeout, int* actual_length)
 
         if (!wait_event_timeout(awd.wqh, awd.done, timeout)) {
                 // timeout
-                kaweth_warn("usb_control/bulk_msg: timeout");
+                warn("usb_control/bulk_msg: timeout");
                 usb_kill_urb(urb);  // remove urb safely
                 status = -ETIMEDOUT;
         }
@@ -1234,7 +1288,7 @@ static int kaweth_internal_control_msg(struct usb_device *usb_dev,
  ****************************************************************/
 static int __init kaweth_init(void)
 {
-        kaweth_dbg("Driver loading");
+        dbg("Driver loading");
         return usb_register(&kaweth_driver);
 }
 
diff --git a/drivers/usb/net/mcs7830.c b/drivers/usb/net/mcs7830.c
new file mode 100644
index 000000000000..6240b978fe3d
--- /dev/null
+++ b/drivers/usb/net/mcs7830.c
@@ -0,0 +1,534 @@
+/*
+ * MosChips MCS7830 based USB 2.0 Ethernet Devices
+ *
+ * based on usbnet.c, asix.c and the vendor provided mcs7830 driver
+ *
+ * Copyright (C) 2006 Arnd Bergmann <arnd@arndb.de>
+ * Copyright (C) 2003-2005 David Hollis <dhollis@davehollis.com>
+ * Copyright (C) 2005 Phil Chang <pchang23@sbcglobal.net>
+ * Copyright (c) 2002-2003 TiVo 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.
+ *
+ * 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/crc32.h>
+#include <linux/etherdevice.h>
+#include <linux/ethtool.h>
+#include <linux/init.h>
+#include <linux/mii.h>
+#include <linux/module.h>
+#include <linux/netdevice.h>
+#include <linux/usb.h>
+
+#include "usbnet.h"
+
+/* requests */
+#define MCS7830_RD_BMREQ        (USB_DIR_IN  | USB_TYPE_VENDOR | \
+                                 USB_RECIP_DEVICE)
+#define MCS7830_WR_BMREQ        (USB_DIR_OUT | USB_TYPE_VENDOR | \
+                                 USB_RECIP_DEVICE)
+#define MCS7830_RD_BREQ         0x0E
+#define MCS7830_WR_BREQ         0x0D
+
+#define MCS7830_CTRL_TIMEOUT    1000
+#define MCS7830_MAX_MCAST       64
+
+#define MCS7830_VENDOR_ID       0x9710
+#define MCS7830_PRODUCT_ID      0x7830
+
+#define MCS7830_MII_ADVERTISE   (ADVERTISE_PAUSE_CAP | ADVERTISE_100FULL | \
+                                 ADVERTISE_100HALF | ADVERTISE_10FULL | \
+                                 ADVERTISE_10HALF | ADVERTISE_CSMA)
+
+/* HIF_REG_XX coressponding index value */
+enum {
+        HIF_REG_MULTICAST_HASH                  = 0x00,
+        HIF_REG_PACKET_GAP1                     = 0x08,
+        HIF_REG_PACKET_GAP2                     = 0x09,
+        HIF_REG_PHY_DATA                        = 0x0a,
+        HIF_REG_PHY_CMD1                        = 0x0c,
+           HIF_REG_PHY_CMD1_READ                = 0x40,
+           HIF_REG_PHY_CMD1_WRITE               = 0x20,
+           HIF_REG_PHY_CMD1_PHYADDR             = 0x01,
+        HIF_REG_PHY_CMD2                        = 0x0d,
+           HIF_REG_PHY_CMD2_PEND_FLAG_BIT       = 0x80,
+           HIF_REG_PHY_CMD2_READY_FLAG_BIT      = 0x40,
+        HIF_REG_CONFIG                          = 0x0e,
+           HIF_REG_CONFIG_CFG                   = 0x80,
+           HIF_REG_CONFIG_SPEED100              = 0x40,
+           HIF_REG_CONFIG_FULLDUPLEX_ENABLE     = 0x20,
+           HIF_REG_CONFIG_RXENABLE              = 0x10,
+           HIF_REG_CONFIG_TXENABLE              = 0x08,
+           HIF_REG_CONFIG_SLEEPMODE             = 0x04,
+           HIF_REG_CONFIG_ALLMULTICAST          = 0x02,
+           HIF_REG_CONFIG_PROMISCIOUS           = 0x01,
+        HIF_REG_ETHERNET_ADDR                   = 0x0f,
+        HIF_REG_22                              = 0x15,
+        HIF_REG_PAUSE_THRESHOLD                 = 0x16,
+           HIF_REG_PAUSE_THRESHOLD_DEFAULT      = 0,
+};
+
+struct mcs7830_data {
+        u8 multi_filter[8];
+        u8 config;
+};
+
+static const char driver_name[] = "MOSCHIP usb-ethernet driver";
+
+static int mcs7830_get_reg(struct usbnet *dev, u16 index, u16 size, void *data)
+{
+        struct usb_device *xdev = dev->udev;
+        int ret;
+
+        ret = usb_control_msg(xdev, usb_rcvctrlpipe(xdev, 0), MCS7830_RD_BREQ,
+                              MCS7830_RD_BMREQ, 0x0000, index, data,
+                              size, msecs_to_jiffies(MCS7830_CTRL_TIMEOUT));
+        return ret;
+}
+
+static int mcs7830_set_reg(struct usbnet *dev, u16 index, u16 size, void *data)
+{
+        struct usb_device *xdev = dev->udev;
+        int ret;
+
+        ret = usb_control_msg(xdev, usb_sndctrlpipe(xdev, 0), MCS7830_WR_BREQ,
+                              MCS7830_WR_BMREQ, 0x0000, index, data,
+                              size, msecs_to_jiffies(MCS7830_CTRL_TIMEOUT));
+        return ret;
+}
+
+static void mcs7830_async_cmd_callback(struct urb *urb)
+{
+        struct usb_ctrlrequest *req = (struct usb_ctrlrequest *)urb->context;
+
+        if (urb->status < 0)
+                printk(KERN_DEBUG "mcs7830_async_cmd_callback() failed with %d",
+                        urb->status);
+
+        kfree(req);
+        usb_free_urb(urb);
+}
+
+static void mcs7830_set_reg_async(struct usbnet *dev, u16 index, u16 size, void *data)
+{
+        struct usb_ctrlrequest *req;
+        int ret;
+        struct urb *urb;
+
+        urb = usb_alloc_urb(0, GFP_ATOMIC);
+        if (!urb) {
+                dev_dbg(&dev->udev->dev, "Error allocating URB "
+                                "in write_cmd_async!");
+                return;
+        }
+
+        req = kmalloc(sizeof *req, GFP_ATOMIC);
+        if (!req) {
+                dev_err(&dev->udev->dev, "Failed to allocate memory for "
+                                "control request");
+                goto out;
+        }
+        req->bRequestType = MCS7830_WR_BMREQ;
+        req->bRequest = MCS7830_WR_BREQ;
+        req->wValue = 0;
+        req->wIndex = cpu_to_le16(index);
+        req->wLength = cpu_to_le16(size);
+
+        usb_fill_control_urb(urb, dev->udev,
+                             usb_sndctrlpipe(dev->udev, 0),
+                             (void *)req, data, size,
+                             mcs7830_async_cmd_callback, req);
+
+        ret = usb_submit_urb(urb, GFP_ATOMIC);
+        if (ret < 0) {
+                dev_err(&dev->udev->dev, "Error submitting the control "
+                                "message: ret=%d", ret);
+                goto out;
+        }
+        return;
+out:
+        kfree(req);
+        usb_free_urb(urb);
+}
+
+static int mcs7830_get_address(struct usbnet *dev)
+{
+        int ret;
+        ret = mcs7830_get_reg(dev, HIF_REG_ETHERNET_ADDR, ETH_ALEN,
+                                   dev->net->dev_addr);
+        if (ret < 0)
+                return ret;
+        return 0;
+}
+
+static int mcs7830_read_phy(struct usbnet *dev, u8 index)
+{
+        int ret;
+        int i;
+        __le16 val;
+
+        u8 cmd[2] = {
+                HIF_REG_PHY_CMD1_READ | HIF_REG_PHY_CMD1_PHYADDR,
+                HIF_REG_PHY_CMD2_PEND_FLAG_BIT | index,
+        };
+
+        mutex_lock(&dev->phy_mutex);
+        /* write the MII command */
+        ret = mcs7830_set_reg(dev, HIF_REG_PHY_CMD1, 2, cmd);
+        if (ret < 0)
+                goto out;
+
+        /* wait for the data to become valid, should be within < 1ms */
+        for (i = 0; i < 10; i++) {
+                ret = mcs7830_get_reg(dev, HIF_REG_PHY_CMD1, 2, cmd);
+                if ((ret < 0) || (cmd[1] & HIF_REG_PHY_CMD2_READY_FLAG_BIT))
+                        break;
+                ret = -EIO;
+                msleep(1);
+        }
+        if (ret < 0)
+                goto out;
+
+        /* read actual register contents */
+        ret = mcs7830_get_reg(dev, HIF_REG_PHY_DATA, 2, &val);
+        if (ret < 0)
+                goto out;
+        ret = le16_to_cpu(val);
+        dev_dbg(&dev->udev->dev, "read PHY reg %02x: %04x (%d tries)\n",
+                index, val, i);
+out:
+        mutex_unlock(&dev->phy_mutex);
+        return ret;
+}
+
+static int mcs7830_write_phy(struct usbnet *dev, u8 index, u16 val)
+{
+        int ret;
+        int i;
+        __le16 le_val;
+
+        u8 cmd[2] = {
+                HIF_REG_PHY_CMD1_WRITE | HIF_REG_PHY_CMD1_PHYADDR,
+                HIF_REG_PHY_CMD2_PEND_FLAG_BIT | (index & 0x1F),
+        };
+
+        mutex_lock(&dev->phy_mutex);
+
+        /* write the new register contents */
+        le_val = cpu_to_le16(val);
+        ret = mcs7830_set_reg(dev, HIF_REG_PHY_DATA, 2, &le_val);
+        if (ret < 0)
+                goto out;
+
+        /* write the MII command */
+        ret = mcs7830_set_reg(dev, HIF_REG_PHY_CMD1, 2, cmd);
+        if (ret < 0)
+                goto out;
+
+        /* wait for the command to be accepted by the PHY */
+        for (i = 0; i < 10; i++) {
+                ret = mcs7830_get_reg(dev, HIF_REG_PHY_CMD1, 2, cmd);
+                if ((ret < 0) || (cmd[1] & HIF_REG_PHY_CMD2_READY_FLAG_BIT))
+                        break;
+                ret = -EIO;
+                msleep(1);
+        }
+        if (ret < 0)
+                goto out;
+
+        ret = 0;
+        dev_dbg(&dev->udev->dev, "write PHY reg %02x: %04x (%d tries)\n",
+                index, val, i);
+out:
+        mutex_unlock(&dev->phy_mutex);
+        return ret;
+}
+
+/*
+ * This algorithm comes from the original mcs7830 version 1.4 driver,
+ * not sure if it is needed.
+ */
+static int mcs7830_set_autoneg(struct usbnet *dev, int ptrUserPhyMode)
+{
+        int ret;
+        /* Enable all media types */
+        ret = mcs7830_write_phy(dev, MII_ADVERTISE, MCS7830_MII_ADVERTISE);
+
+        /* First reset BMCR */
+        if (!ret)
+                ret = mcs7830_write_phy(dev, MII_BMCR, 0x0000);
+        /* Enable Auto Neg */
+        if (!ret)
+                ret = mcs7830_write_phy(dev, MII_BMCR, BMCR_ANENABLE);
+        /* Restart Auto Neg (Keep the Enable Auto Neg Bit Set) */
+        if (!ret)
+                ret = mcs7830_write_phy(dev, MII_BMCR,
+                                BMCR_ANENABLE | BMCR_ANRESTART  );
+        return ret < 0 ? : 0;
+}
+
+
+/*
+ * if we can read register 22, the chip revision is C or higher
+ */
+static int mcs7830_get_rev(struct usbnet *dev)
+{
+        u8 dummy[2];
+        int ret;
+        ret = mcs7830_get_reg(dev, HIF_REG_22, 2, dummy);
+        if (ret > 0)
+                return 2; /* Rev C or later */
+        return 1; /* earlier revision */
+}
+
+/*
+ * On rev. C we need to set the pause threshold
+ */
+static void mcs7830_rev_C_fixup(struct usbnet *dev)
+{
+        u8 pause_threshold = HIF_REG_PAUSE_THRESHOLD_DEFAULT;
+        int retry;
+
+        for (retry = 0; retry < 2; retry++) {
+                if (mcs7830_get_rev(dev) == 2) {
+                        dev_info(&dev->udev->dev, "applying rev.C fixup\n");
+                        mcs7830_set_reg(dev, HIF_REG_PAUSE_THRESHOLD,
+                                        1, &pause_threshold);
+                }
+                msleep(1);
+        }
+}
+
+static int mcs7830_init_dev(struct usbnet *dev)
+{
+        int ret;
+        int retry;
+
+        /* Read MAC address from EEPROM */
+        ret = -EINVAL;
+        for (retry = 0; retry < 5 && ret; retry++)
+                ret = mcs7830_get_address(dev);
+        if (ret) {
+                dev_warn(&dev->udev->dev, "Cannot read MAC address\n");
+                goto out;
+        }
+
+        /* Set up PHY */
+        ret = mcs7830_set_autoneg(dev, 0);
+        if (ret) {
+                dev_info(&dev->udev->dev, "Cannot set autoneg\n");
+                goto out;
+        }
+
+        mcs7830_rev_C_fixup(dev);
+        ret = 0;
+out:
+        return ret;
+}
+
+static int mcs7830_mdio_read(struct net_device *netdev, int phy_id,
+                             int location)
+{
+        struct usbnet *dev = netdev->priv;
+        return mcs7830_read_phy(dev, location);
+}
+
+static void mcs7830_mdio_write(struct net_device *netdev, int phy_id,
+                                int location, int val)
+{
+        struct usbnet *dev = netdev->priv;
+        mcs7830_write_phy(dev, location, val);
+}
+
+static int mcs7830_ioctl(struct net_device *net, struct ifreq *rq, int cmd)
+{
+        struct usbnet *dev = netdev_priv(net);
+        return generic_mii_ioctl(&dev->mii, if_mii(rq), cmd, NULL);
+}
+
+/* credits go to asix_set_multicast */
+static void mcs7830_set_multicast(struct net_device *net)
+{
+        struct usbnet *dev = netdev_priv(net);
+        struct mcs7830_data *data = (struct mcs7830_data *)&dev->data;
+
+        data->config = HIF_REG_CONFIG_TXENABLE;
+
+        /* this should not be needed, but it doesn't work otherwise */
+        data->config |= HIF_REG_CONFIG_ALLMULTICAST;
+
+        if (net->flags & IFF_PROMISC) {
+                data->config |= HIF_REG_CONFIG_PROMISCIOUS;
+        } else if (net->flags & IFF_ALLMULTI
+                   || net->mc_count > MCS7830_MAX_MCAST) {
+                data->config |= HIF_REG_CONFIG_ALLMULTICAST;
+        } else if (net->mc_count == 0) {
+                /* just broadcast and directed */
+        } else {
+                /* We use the 20 byte dev->data
+                 * for our 8 byte filter buffer
+                 * to avoid allocating memory that
+                 * is tricky to free later */
+                struct dev_mc_list *mc_list = net->mc_list;
+                u32 crc_bits;
+                int i;
+
+                memset(data->multi_filter, 0, sizeof data->multi_filter);
+
+                /* Build the multicast hash filter. */
+                for (i = 0; i < net->mc_count; i++) {
+                        crc_bits = ether_crc(ETH_ALEN, mc_list->dmi_addr) >> 26;
+                        data->multi_filter[crc_bits >> 3] |= 1 << (crc_bits & 7);
+                        mc_list = mc_list->next;
+                }
+
+                mcs7830_set_reg_async(dev, HIF_REG_MULTICAST_HASH,
+                                sizeof data->multi_filter,
+                                data->multi_filter);
+        }
+
+        mcs7830_set_reg_async(dev, HIF_REG_CONFIG, 1, &data->config);
+}
+
+static int mcs7830_get_regs_len(struct net_device *net)
+{
+        struct usbnet *dev = netdev_priv(net);
+
+        switch (mcs7830_get_rev(dev)) {
+        case 1:
+                return 21;
+        case 2:
+                return 32;
+        }
+        return 0;
+}
+
+static void mcs7830_get_drvinfo(struct net_device *net, struct ethtool_drvinfo *drvinfo)
+{
+        usbnet_get_drvinfo(net, drvinfo);
+        drvinfo->regdump_len = mcs7830_get_regs_len(net);
+}
+
+static void mcs7830_get_regs(struct net_device *net, struct ethtool_regs *regs, void *data)
+{
+        struct usbnet *dev = netdev_priv(net);
+
+        regs->version = mcs7830_get_rev(dev);
+        mcs7830_get_reg(dev, 0, regs->len, data);
+}
+
+static struct ethtool_ops mcs7830_ethtool_ops = {
+        .get_drvinfo            = mcs7830_get_drvinfo,
+        .get_regs_len           = mcs7830_get_regs_len,
+        .get_regs               = mcs7830_get_regs,
+
+        /* common usbnet calls */
+        .get_link               = usbnet_get_link,
+        .get_msglevel           = usbnet_get_msglevel,
+        .set_msglevel           = usbnet_set_msglevel,
+        .get_settings           = usbnet_get_settings,
+        .set_settings           = usbnet_set_settings,
+        .nway_reset             = usbnet_nway_reset,
+};
+
+static int mcs7830_bind(struct usbnet *dev, struct usb_interface *udev)
+{
+        struct net_device *net = dev->net;
+        int ret;
+
+        ret = mcs7830_init_dev(dev);
+        if (ret)
+                goto out;
+
+        net->do_ioctl = mcs7830_ioctl;
+        net->ethtool_ops = &mcs7830_ethtool_ops;
+        net->set_multicast_list = mcs7830_set_multicast;
+        mcs7830_set_multicast(net);
+
+        /* reserve space for the status byte on rx */
+        dev->rx_urb_size = ETH_FRAME_LEN + 1;
+
+        dev->mii.mdio_read = mcs7830_mdio_read;
+        dev->mii.mdio_write = mcs7830_mdio_write;
+        dev->mii.dev = net;
+        dev->mii.phy_id_mask = 0x3f;
+        dev->mii.reg_num_mask = 0x1f;
+        dev->mii.phy_id = *((u8 *) net->dev_addr + 1);
+
+        ret = usbnet_get_endpoints(dev, udev);
+out:
+        return ret;
+}
+
+/* The chip always appends a status bytes that we need to strip */
+static int mcs7830_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
+{
+        u8 status;
+
+        if (skb->len == 0) {
+                dev_err(&dev->udev->dev, "unexpected empty rx frame\n");
+                return 0;
+        }
+
+        skb_trim(skb, skb->len - 1);
+        status = skb->data[skb->len];
+
+        if (status != 0x20)
+                dev_dbg(&dev->udev->dev, "rx fixup status %x\n", status);
+
+        return skb->len > 0;
+}
+
+static const struct driver_info moschip_info = {
+        .description    = "MOSCHIP 7830 usb-NET adapter",
+        .bind           = mcs7830_bind,
+        .rx_fixup       = mcs7830_rx_fixup,
+        .flags          = FLAG_ETHER,
+        .in             = 1,
+        .out            = 2,
+};
+
+static const struct usb_device_id products[] = {
+        {
+                USB_DEVICE(MCS7830_VENDOR_ID, MCS7830_PRODUCT_ID),
+                .driver_info = (unsigned long) &moschip_info,
+        },
+        {},
+};
+MODULE_DEVICE_TABLE(usb, products);
+
+static struct usb_driver mcs7830_driver = {
+        .name = driver_name,
+        .id_table = products,
+        .probe = usbnet_probe,
+        .disconnect = usbnet_disconnect,
+        .suspend = usbnet_suspend,
+        .resume = usbnet_resume,
+};
+
+static int __init mcs7830_init(void)
+{
+        return usb_register(&mcs7830_driver);
+}
+module_init(mcs7830_init);
+
+static void __exit mcs7830_exit(void)
+{
+        usb_deregister(&mcs7830_driver);
+}
+module_exit(mcs7830_exit);
+
+MODULE_DESCRIPTION("USB to network adapter MCS7830)");
+MODULE_LICENSE("GPL");
diff --git a/drivers/usb/net/usbnet.c b/drivers/usb/net/usbnet.c
index 24bd3486ee63..cf3d20eb781c 100644
--- a/drivers/usb/net/usbnet.c
+++ b/drivers/usb/net/usbnet.c
@@ -669,6 +669,37 @@ done:
  * they'll probably want to use this base set.
  */
 
+int usbnet_get_settings (struct net_device *net, struct ethtool_cmd *cmd)
+{
+        struct usbnet *dev = netdev_priv(net);
+
+        if (!dev->mii.mdio_read)
+                return -EOPNOTSUPP;
+
+        return mii_ethtool_gset(&dev->mii, cmd);
+}
+EXPORT_SYMBOL_GPL(usbnet_get_settings);
+
+int usbnet_set_settings (struct net_device *net, struct ethtool_cmd *cmd)
+{
+        struct usbnet *dev = netdev_priv(net);
+        int retval;
+
+        if (!dev->mii.mdio_write)
+                return -EOPNOTSUPP;
+
+        retval = mii_ethtool_sset(&dev->mii, cmd);
+
+        /* link speed/duplex might have changed */
+        if (dev->driver_info->link_reset)
+                dev->driver_info->link_reset(dev);
+
+        return retval;
+
+}
+EXPORT_SYMBOL_GPL(usbnet_set_settings);
+
+
 void usbnet_get_drvinfo (struct net_device *net, struct ethtool_drvinfo *info)
 {
         struct usbnet *dev = netdev_priv(net);
@@ -682,7 +713,7 @@ void usbnet_get_drvinfo (struct net_device *net, struct ethtool_drvinfo *info)
 }
 EXPORT_SYMBOL_GPL(usbnet_get_drvinfo);
 
-static u32 usbnet_get_link (struct net_device *net)
+u32 usbnet_get_link (struct net_device *net)
 {
         struct usbnet *dev = netdev_priv(net);
 
@@ -690,9 +721,14 @@ static u32 usbnet_get_link (struct net_device *net)
         if (dev->driver_info->check_connect)
                 return dev->driver_info->check_connect (dev) == 0;
 
+        /* if the device has mii operations, use those */
+        if (dev->mii.mdio_read)
+                return mii_link_ok(&dev->mii);
+
         /* Otherwise, say we're up (to avoid breaking scripts) */
         return 1;
 }
+EXPORT_SYMBOL_GPL(usbnet_get_link);
 
 u32 usbnet_get_msglevel (struct net_device *net)
 {
@@ -710,10 +746,24 @@ void usbnet_set_msglevel (struct net_device *net, u32 level)
 }
 EXPORT_SYMBOL_GPL(usbnet_set_msglevel);
 
+int usbnet_nway_reset(struct net_device *net)
+{
+        struct usbnet *dev = netdev_priv(net);
+
+        if (!dev->mii.mdio_write)
+                return -EOPNOTSUPP;
+
+        return mii_nway_restart(&dev->mii);
+}
+EXPORT_SYMBOL_GPL(usbnet_nway_reset);
+
 /* drivers may override default ethtool_ops in their bind() routine */
 static struct ethtool_ops usbnet_ethtool_ops = {
+        .get_settings           = usbnet_get_settings,
+        .set_settings           = usbnet_set_settings,
         .get_drvinfo            = usbnet_get_drvinfo,
         .get_link               = usbnet_get_link,
+        .nway_reset             = usbnet_nway_reset,
         .get_msglevel           = usbnet_get_msglevel,
         .set_msglevel           = usbnet_set_msglevel,
 };
@@ -1094,6 +1144,7 @@ usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod)
         dev->delay.function = usbnet_bh;
         dev->delay.data = (unsigned long) dev;
         init_timer (&dev->delay);
+        mutex_init (&dev->phy_mutex);
 
         SET_MODULE_OWNER (net);
         dev->net = net;
@@ -1225,7 +1276,7 @@ EXPORT_SYMBOL_GPL(usbnet_resume);
 static int __init usbnet_init(void)
 {
         /* compiler should optimize this out */
-        BUG_ON (sizeof (((struct sk_buff *)0)->cb)
+        BUILD_BUG_ON (sizeof (((struct sk_buff *)0)->cb)
                         < sizeof (struct skb_data));
 
         random_ether_addr(node_id);
diff --git a/drivers/usb/net/usbnet.h b/drivers/usb/net/usbnet.h
index c0746f0454af..07c70abbe0ec 100644
--- a/drivers/usb/net/usbnet.h
+++ b/drivers/usb/net/usbnet.h
@@ -30,6 +30,7 @@ struct usbnet {
         struct usb_device       *udev;
         struct driver_info      *driver_info;
         wait_queue_head_t       *wait;
+        struct mutex            phy_mutex;
 
         /* i/o info: pipes etc */
         unsigned                in, out;
@@ -168,9 +169,13 @@ extern void usbnet_defer_kevent (struct usbnet *, int);
 extern void usbnet_skb_return (struct usbnet *, struct sk_buff *);
 extern void usbnet_unlink_rx_urbs(struct usbnet *);
 
+extern int usbnet_get_settings (struct net_device *net, struct ethtool_cmd *cmd);
+extern int usbnet_set_settings (struct net_device *net, struct ethtool_cmd *cmd);
+extern u32 usbnet_get_link (struct net_device *net);
 extern u32 usbnet_get_msglevel (struct net_device *);
 extern void usbnet_set_msglevel (struct net_device *, u32);
 extern void usbnet_get_drvinfo (struct net_device *, struct ethtool_drvinfo *);
+extern int usbnet_nway_reset(struct net_device *net);
 
 /* messaging support includes the interface name, so it must not be
  * used before it has one ... notably, in minidriver bind() calls.
diff --git a/drivers/usb/serial/Kconfig b/drivers/usb/serial/Kconfig
index 5076b9d97057..9a6ec1b5e3d5 100644
--- a/drivers/usb/serial/Kconfig
+++ b/drivers/usb/serial/Kconfig
@@ -422,6 +422,16 @@ config USB_SERIAL_MCT_U232
           To compile this driver as a module, choose M here: the
           module will be called mct_u232.
 
+config USB_SERIAL_MOS7720
+        tristate "USB Moschip 7720 Single Port Serial Driver"
+        depends on USB_SERIAL
+        ---help---
+          Say Y here if you want to use a USB Serial single port adapter from
+          Moschip Semiconductor Tech.
+
+          To compile this driver as a module, choose M here: the
+          module will be called mos7720.
+
 config USB_SERIAL_MOS7840
         tristate "USB Moschip 7840/7820 USB Serial Driver"
         depends on USB_SERIAL
@@ -527,8 +537,7 @@ config USB_SERIAL_OPTION
           The USB bus on these cards is not accessible externally.
 
           Supported devices include (some of?) those made by:
-          Option, Huawei, Audiovox, Sierra Wireless, Novatel Wireless, or
-          Anydata.
+          Option, Huawei, Audiovox, Novatel Wireless, or Anydata.
 
           To compile this driver as a module, choose M here: the
           module will be called option.
diff --git a/drivers/usb/serial/Makefile b/drivers/usb/serial/Makefile
index 8dce83340e31..a5047dc599bb 100644
--- a/drivers/usb/serial/Makefile
+++ b/drivers/usb/serial/Makefile
@@ -34,6 +34,7 @@ obj-$(CONFIG_USB_SERIAL_KEYSPAN_PDA)		+= keyspan_pda.o
 obj-$(CONFIG_USB_SERIAL_KLSI)                   += kl5kusb105.o
 obj-$(CONFIG_USB_SERIAL_KOBIL_SCT)              += kobil_sct.o
 obj-$(CONFIG_USB_SERIAL_MCT_U232)               += mct_u232.o
+obj-$(CONFIG_USB_SERIAL_MOS7720)                += mos7720.o
 obj-$(CONFIG_USB_SERIAL_MOS7840)                += mos7840.o
 obj-$(CONFIG_USB_SERIAL_NAVMAN)                 += navman.o
 obj-$(CONFIG_USB_SERIAL_OMNINET)                += omninet.o
diff --git a/drivers/usb/serial/airprime.c b/drivers/usb/serial/airprime.c
index 2c19f19b255c..7f5d546da39a 100644
--- a/drivers/usb/serial/airprime.c
+++ b/drivers/usb/serial/airprime.c
@@ -18,12 +18,8 @@
 
 static struct usb_device_id id_table [] = {
         { USB_DEVICE(0x0c88, 0x17da) }, /* Kyocera Wireless KPC650/Passport */
-        { USB_DEVICE(0x0f3d, 0x0112) }, /* AirPrime CDMA Wireless PC Card */
-        { USB_DEVICE(0x1199, 0x0017) }, /* Sierra Wireless EM5625 */
-        { USB_DEVICE(0x1199, 0x0018) }, /* Sierra Wireless MC5720 */
-        { USB_DEVICE(0x1199, 0x0112) }, /* Sierra Wireless Aircard 580 */
-        { USB_DEVICE(0x1199, 0x0218) }, /* Sierra Wireless MC5720 */
         { USB_DEVICE(0x1410, 0x1110) }, /* Novatel Wireless Merlin CDMA */
+        { USB_DEVICE(0x1410, 0x1100) }, /* ExpressCard34 Qualcomm 3G CDMA */
         { },
 };
 MODULE_DEVICE_TABLE(usb, id_table);
@@ -133,6 +129,7 @@ static int airprime_open(struct usb_serial_port *port, struct file *filp)
                 }
                 urb = usb_alloc_urb(0, GFP_KERNEL);
                 if (!urb) {
+                        kfree(buffer);
                         dev_err(&port->dev, "%s - no more urbs?\n",
                                 __FUNCTION__);
                         result = -ENOMEM;
diff --git a/drivers/usb/serial/cp2101.c b/drivers/usb/serial/cp2101.c
index 486c7411b9a7..bbf6532c26e5 100644
--- a/drivers/usb/serial/cp2101.c
+++ b/drivers/usb/serial/cp2101.c
@@ -65,6 +65,7 @@ static struct usb_device_id id_table [] = {
         { USB_DEVICE(0x10C4, 0x813D) }, /* Burnside Telecom Deskmobile */
         { USB_DEVICE(0x10C4, 0x815E) }, /* Helicomm IP-Link 1220-DVM */
         { USB_DEVICE(0x10C4, 0xEA60) }, /* Silicon Labs factory default */
+        { USB_DEVICE(0x10C4, 0xEA61) }, /* Silicon Labs factory default */
         { USB_DEVICE(0x16D6, 0x0001) }, /* Jablotron serial interface */
         { } /* Terminating Entry */
 };
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index d3dc1a15ec6c..bd76b4c11fcc 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -1,16 +1,16 @@
 /*
  * USB FTDI SIO driver
  *
- *      Copyright (C) 1999 - 2001
- *          Greg Kroah-Hartman (greg@kroah.com)
+ *      Copyright (C) 1999 - 2001
+ *          Greg Kroah-Hartman (greg@kroah.com)
  *          Bill Ryder (bryder@sgi.com)
  *      Copyright (C) 2002
  *          Kuba Ober (kuba@mareimbrium.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 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.
  *
  * See Documentation/usb/usb-serial.txt for more information on using this driver
  *
@@ -32,7 +32,7 @@
  *      Changed full name of USB-UIRT device to avoid "/" character.
  *      Added FTDI's alternate PID (0x6006) for FT232/245 devices.
  *      Added PID for "ELV USB Module UO100" from Stefan Frings.
- * 
+ *
  * (21/Oct/2003) Ian Abbott
  *      Renamed some VID/PID macros for Matrix Orbital and Perle Systems
  *      devices.  Removed Matrix Orbital and Perle Systems devices from the
@@ -69,7 +69,7 @@
  *      does not incure any measurable overhead.  This also relies on the fact
  *      that we have proper reference counting logic for urbs.  I nicked this
  *      from Greg KH's Visor driver.
- *      
+ *
  * (23/Jun/2003) Ian Abbott
  *      Reduced flip buffer pushes and corrected a data length test in
  *      ftdi_read_bulk_callback.
@@ -77,7 +77,7 @@
  *
  * (21/Jun/2003) Erik Nygren
  *      Added support for Home Electronics Tira-1 IR transceiver using FT232BM chip.
- *      See <http://www.home-electro.com/tira1.htm>.  Only operates properly 
+ *      See <http://www.home-electro.com/tira1.htm>.  Only operates properly
  *      at 100000 and RTS-CTS, so set custom divisor mode on startup.
  *      Also force the Tira-1 and USB-UIRT to only use their custom baud rates.
  *
@@ -137,17 +137,17 @@
  * (17/Feb/2003) Bill Ryder
  *      Added write urb buffer pool on a per device basis
  *      Added more checking for open file on callbacks (fixed OOPS)
- *      Added CrystalFontz 632 and 634 PIDs 
+ *      Added CrystalFontz 632 and 634 PIDs
  *         (thanx to CrystalFontz for the sample devices - they flushed out
  *           some driver bugs)
  *      Minor debugging message changes
  *      Added throttle, unthrottle and chars_in_buffer functions
  *      Fixed FTDI_SIO (the original device) bug
  *      Fixed some shutdown handling
- *      
- * 
- * 
- * 
+ *
+ *
+ *
+ *
  * (07/Jun/2002) Kuba Ober
  *      Changed FTDI_SIO_BASE_BAUD_TO_DIVISOR macro into ftdi_baud_to_divisor
  *      function. It was getting too complex.
@@ -158,7 +158,7 @@
  *
  * (25/Jul/2002) Bill Ryder inserted Dmitri's TIOCMIWAIT patch
  *      Not tested by me but it doesn't break anything I use.
- * 
+ *
  * (04/Jan/2002) Kuba Ober
  *      Implemented 38400 baudrate kludge, where it can be substituted with other
  *        values. That's the only way to set custom baudrates.
@@ -179,7 +179,7 @@
  *        (the previous version caused panics)
  *      Removed port iteration code since the device only has one I/O port and it
  *        was wrong anyway.
- * 
+ *
  * (31/May/2001) gkh
  *      Switched from using spinlock to a semaphore, which fixes lots of problems.
  *
@@ -188,16 +188,16 @@
  *      Cleaned up comments for 8U232
  *      Added parity, framing and overrun error handling
  *      Added receive break handling.
- * 
+ *
  * (04/08/2001) gb
  *      Identify version on module load.
- *       
+ *
  * (18/March/2001) Bill Ryder
  *      (Not released)
  *      Added send break handling. (requires kernel patch too)
  *      Fixed 8U232AM hardware RTS/CTS etc status reporting.
  *      Added flipbuf fix copied from generic device
- * 
+ *
  * (12/3/2000) Bill Ryder
  *      Added support for 8U232AM device.
  *      Moved PID and VIDs into header file only.
@@ -211,14 +211,14 @@
  *      Cleaned up comments. Removed multiple PID/VID definitions.
  *      Factorised cts/dtr code
  *      Made use of __FUNCTION__ in dbg's
- *      
+ *
  * (11/01/2000) Adam J. Richter
  *      usb_device_id table support
- * 
+ *
  * (10/05/2000) gkh
  *      Fixed bug with urb->dev not being set properly, now that the usb
  *      core needs it.
- * 
+ *
  * (09/11/2000) gkh
  *      Removed DEBUG #ifdefs with call to usb_serial_debug_data
  *
@@ -226,11 +226,11 @@
  *      Added module_init and module_exit functions to handle the fact that this
  *      driver is a loadable module now.
  *
- * (04/04/2000) Bill Ryder 
+ * (04/04/2000) Bill Ryder
  *      Fixed bugs in TCGET/TCSET ioctls (by removing them - they are
  *        handled elsewhere in the tty io driver chain).
  *
- * (03/30/2000) Bill Ryder 
+ * (03/30/2000) Bill Ryder
  *      Implemented lots of ioctls
  *      Fixed a race condition in write
  *      Changed some dbg's to errs
@@ -444,13 +444,13 @@ static struct usb_device_id id_table_combined [] = {
         /* { USB_DEVICE(FTDI_VID, FTDI_ELV_WS300PC_PID) }, */
         /* { USB_DEVICE(FTDI_VID, FTDI_ELV_FHZ1300PC_PID) }, */
         /* { USB_DEVICE(FTDI_VID, FTDI_ELV_WS500_PID) }, */
-        { USB_DEVICE(FTDI_VID, LINX_SDMUSBQSS_PID) },
-        { USB_DEVICE(FTDI_VID, LINX_MASTERDEVEL2_PID) },
-        { USB_DEVICE(FTDI_VID, LINX_FUTURE_0_PID) },
-        { USB_DEVICE(FTDI_VID, LINX_FUTURE_1_PID) },
-        { USB_DEVICE(FTDI_VID, LINX_FUTURE_2_PID) },
-        { USB_DEVICE(FTDI_VID, FTDI_CCSICDU20_0_PID) },
-        { USB_DEVICE(FTDI_VID, FTDI_CCSICDU40_1_PID) },
+        { USB_DEVICE(FTDI_VID, LINX_SDMUSBQSS_PID) },
+        { USB_DEVICE(FTDI_VID, LINX_MASTERDEVEL2_PID) },
+        { USB_DEVICE(FTDI_VID, LINX_FUTURE_0_PID) },
+        { USB_DEVICE(FTDI_VID, LINX_FUTURE_1_PID) },
+        { USB_DEVICE(FTDI_VID, LINX_FUTURE_2_PID) },
+        { USB_DEVICE(FTDI_VID, FTDI_CCSICDU20_0_PID) },
+        { USB_DEVICE(FTDI_VID, FTDI_CCSICDU40_1_PID) },
         { USB_DEVICE(FTDI_VID, INSIDE_ACCESSO) },
         { USB_DEVICE(INTREPID_VID, INTREPID_VALUECAN_PID) },
         { USB_DEVICE(INTREPID_VID, INTREPID_NEOVI_PID) },
@@ -522,7 +522,7 @@ static struct usb_driver ftdi_driver = {
         .probe =        usb_serial_probe,
         .disconnect =   usb_serial_disconnect,
         .id_table =     id_table_combined,
-        .no_dynamic_id =        1,
+        .no_dynamic_id =        1,
 };
 
 static const char *ftdi_chip_name[] = {
@@ -548,13 +548,13 @@ struct ftdi_private {
         int custom_divisor;     /* custom_divisor kludge, this is for baud_base (different from what goes to the chip!) */
         __u16 last_set_data_urb_value ;
                                 /* the last data state set - needed for doing a break */
-        int write_offset;       /* This is the offset in the usb data block to write the serial data - 
+        int write_offset;       /* This is the offset in the usb data block to write the serial data -
                                  * it is different between devices
                                  */
         int flags;              /* some ASYNC_xxxx flags are supported */
         unsigned long last_dtr_rts;     /* saved modem control outputs */
         wait_queue_head_t delta_msr_wait; /* Used for TIOCMIWAIT */
-        char prev_status, diff_status;        /* Used for TIOCMIWAIT */
+        char prev_status, diff_status;        /* Used for TIOCMIWAIT */
         __u8 rx_flags;          /* receive state flags (throttling) */
         spinlock_t rx_lock;     /* spinlock for receive state */
         struct work_struct rx_work;
@@ -721,7 +721,7 @@ static int update_mctrl(struct usb_serial_port *port, unsigned int set, unsigned
                 urb_value |= FTDI_SIO_SET_RTS_HIGH;
         rv = usb_control_msg(port->serial->dev,
                                usb_sndctrlpipe(port->serial->dev, 0),
-                               FTDI_SIO_SET_MODEM_CTRL_REQUEST, 
+                               FTDI_SIO_SET_MODEM_CTRL_REQUEST,
                                FTDI_SIO_SET_MODEM_CTRL_REQUEST_TYPE,
                                urb_value, priv->interface,
                                buf, 0, WDR_TIMEOUT);
@@ -768,7 +768,7 @@ static int change_speed(struct usb_serial_port *port)
         if (priv->interface) {  /* FT2232C */
                 urb_index = (__u16)((urb_index << 8) | priv->interface);
         }
-        
+
         rv = usb_control_msg(port->serial->dev,
                             usb_sndctrlpipe(port->serial->dev, 0),
                             FTDI_SIO_SET_BAUDRATE_REQUEST,
@@ -827,7 +827,7 @@ static __u32 get_ftdi_divisor(struct usb_serial_port * port)
 
         /* 3. Convert baudrate to device-specific divisor */
 
-        if (!baud) baud = 9600; 
+        if (!baud) baud = 9600;
         switch(priv->chip_type) {
         case SIO: /* SIO chip */
                 switch(baud) {
@@ -843,7 +843,7 @@ static __u32 get_ftdi_divisor(struct usb_serial_port * port)
                 case 115200: div_value = ftdi_sio_b115200; break;
                 } /* baud */
                 if (div_value == 0) {
-                        dbg("%s - Baudrate (%d) requested is not supported", __FUNCTION__,  baud);
+                        dbg("%s - Baudrate (%d) requested is not supported", __FUNCTION__,  baud);
                         div_value = ftdi_sio_b9600;
                         div_okay = 0;
                 }
@@ -925,7 +925,7 @@ static int set_serial_info(struct usb_serial_port * port, struct serial_struct _
         /* Make the changes - these are privileged changes! */
 
         priv->flags = ((priv->flags & ~ASYNC_FLAGS) |
-                       (new_serial.flags & ASYNC_FLAGS));       
+                       (new_serial.flags & ASYNC_FLAGS));
         priv->custom_divisor = new_serial.custom_divisor;
 
         port->tty->low_latency = (priv->flags & ASYNC_LOW_LATENCY) ? 1 : 0;
@@ -950,7 +950,7 @@ check_and_exit:
              (old_priv.custom_divisor != priv->custom_divisor))) {
                 change_speed(port);
         }
-        
+
         return (0);
 
 } /* set_serial_info */
@@ -1022,18 +1022,18 @@ static ssize_t show_latency_timer(struct device *dev, struct device_attribute *a
         struct usb_device *udev;
         unsigned short latency = 0;
         int rv = 0;
-        
+
         udev = to_usb_device(dev);
-        
+
         dbg("%s",__FUNCTION__);
-        
+
         rv = usb_control_msg(udev,
                              usb_rcvctrlpipe(udev, 0),
                              FTDI_SIO_GET_LATENCY_TIMER_REQUEST,
                              FTDI_SIO_GET_LATENCY_TIMER_REQUEST_TYPE,
-                             0, priv->interface, 
+                             0, priv->interface,
                              (char*) &latency, 1, WDR_TIMEOUT);
-        
+
         if (rv < 0) {
                 dev_err(dev, "Unable to read latency timer: %i", rv);
                 return -EIO;
@@ -1051,23 +1051,23 @@ static ssize_t store_latency_timer(struct device *dev, struct device_attribute *
         char buf[1];
         int v = simple_strtoul(valbuf, NULL, 10);
         int rv = 0;
-        
+
         udev = to_usb_device(dev);
-        
+
         dbg("%s: setting latency timer = %i", __FUNCTION__, v);
-        
+
         rv = usb_control_msg(udev,
                              usb_sndctrlpipe(udev, 0),
                              FTDI_SIO_SET_LATENCY_TIMER_REQUEST,
                              FTDI_SIO_SET_LATENCY_TIMER_REQUEST_TYPE,
-                             v, priv->interface, 
+                             v, priv->interface,
                              buf, 0, WDR_TIMEOUT);
-        
+
         if (rv < 0) {
                 dev_err(dev, "Unable to write latency timer: %i", rv);
                 return -EIO;
         }
-        
+
         return count;
 }
 
@@ -1082,23 +1082,23 @@ static ssize_t store_event_char(struct device *dev, struct device_attribute *att
         char buf[1];
         int v = simple_strtoul(valbuf, NULL, 10);
         int rv = 0;
-        
+
         udev = to_usb_device(dev);
-        
+
         dbg("%s: setting event char = %i", __FUNCTION__, v);
-        
+
         rv = usb_control_msg(udev,
                              usb_sndctrlpipe(udev, 0),
                              FTDI_SIO_SET_EVENT_CHAR_REQUEST,
                              FTDI_SIO_SET_EVENT_CHAR_REQUEST_TYPE,
-                             v, priv->interface, 
+                             v, priv->interface,
                              buf, 0, WDR_TIMEOUT);
-        
+
         if (rv < 0) {
                 dbg("Unable to write event character: %i", rv);
                 return -EIO;
         }
-        
+
         return count;
 }
 
@@ -1135,11 +1135,11 @@ static void remove_sysfs_attrs(struct usb_serial *serial)
         struct ftdi_private *priv;
         struct usb_device *udev;
 
-        dbg("%s",__FUNCTION__); 
+        dbg("%s",__FUNCTION__);
 
         priv = usb_get_serial_port_data(serial->port[0]);
         udev = serial->dev;
-        
+
         /* XXX see create_sysfs_attrs */
         if (priv->chip_type != SIO) {
                 device_remove_file(&udev->dev, &dev_attr_event_char);
@@ -1147,7 +1147,7 @@ static void remove_sysfs_attrs(struct usb_serial *serial)
                         device_remove_file(&udev->dev, &dev_attr_latency_timer);
                 }
         }
-        
+
 }
 
 /*
@@ -1258,7 +1258,7 @@ static void ftdi_HE_TIRA1_setup (struct usb_serial *serial)
 } /* ftdi_HE_TIRA1_setup */
 
 
-/* ftdi_shutdown is called from usbserial:usb_serial_disconnect 
+/* ftdi_shutdown is called from usbserial:usb_serial_disconnect
  *   it is called when the usb device is disconnected
  *
  *   usbserial:usb_serial_disconnect
@@ -1269,16 +1269,16 @@ static void ftdi_HE_TIRA1_setup (struct usb_serial *serial)
 
 static void ftdi_shutdown (struct usb_serial *serial)
 { /* ftdi_shutdown */
-        
+
         struct usb_serial_port *port = serial->port[0];
         struct ftdi_private *priv = usb_get_serial_port_data(port);
 
         dbg("%s", __FUNCTION__);
 
         remove_sysfs_attrs(serial);
-        
-        /* all open ports are closed at this point 
-         *    (by usbserial.c:__serial_close, which calls ftdi_close)  
+
+        /* all open ports are closed at this point
+         *    (by usbserial.c:__serial_close, which calls ftdi_close)
          */
 
         if (priv) {
@@ -1293,7 +1293,7 @@ static int  ftdi_open (struct usb_serial_port *port, struct file *filp)
         struct usb_device *dev = port->serial->dev;
         struct ftdi_private *priv = usb_get_serial_port_data(port);
         unsigned long flags;
-        
+
         int result = 0;
         char buf[1]; /* Needed for the usb_control_msg I think */
 
@@ -1312,8 +1312,8 @@ static int  ftdi_open (struct usb_serial_port *port, struct file *filp)
         /* No error checking for this (will get errors later anyway) */
         /* See ftdi_sio.h for description of what is reset */
         usb_control_msg(dev, usb_sndctrlpipe(dev, 0),
-                        FTDI_SIO_RESET_REQUEST, FTDI_SIO_RESET_REQUEST_TYPE, 
-                        FTDI_SIO_RESET_SIO, 
+                        FTDI_SIO_RESET_REQUEST, FTDI_SIO_RESET_REQUEST_TYPE,
+                        FTDI_SIO_RESET_SIO,
                         priv->interface, buf, 0, WDR_TIMEOUT);
 
         /* Termios defaults are set by usb_serial_init. We don't change
@@ -1350,12 +1350,12 @@ static int  ftdi_open (struct usb_serial_port *port, struct file *filp)
 
 
 
-/* 
+/*
  * usbserial:__serial_close  only calls ftdi_close if the point is open
  *
  *   This only gets called when it is the last close
- *   
- *   
+ *
+ *
  */
 
 static void ftdi_close (struct usb_serial_port *port, struct file *filp)
@@ -1368,14 +1368,14 @@ static void ftdi_close (struct usb_serial_port *port, struct file *filp)
 
         if (c_cflag & HUPCL){
                 /* Disable flow control */
-                if (usb_control_msg(port->serial->dev, 
+                if (usb_control_msg(port->serial->dev,
                                     usb_sndctrlpipe(port->serial->dev, 0),
                                     FTDI_SIO_SET_FLOW_CTRL_REQUEST,
                                     FTDI_SIO_SET_FLOW_CTRL_REQUEST_TYPE,
                                     0, priv->interface, buf, 0,
                                     WDR_TIMEOUT) < 0) {
                         err("error from flowcontrol urb");
-                }           
+                }
 
                 /* drop RTS and DTR */
                 clear_mctrl(port, TIOCM_DTR | TIOCM_RTS);
@@ -1384,14 +1384,14 @@ static void ftdi_close (struct usb_serial_port *port, struct file *filp)
         /* cancel any scheduled reading */
         cancel_delayed_work(&priv->rx_work);
         flush_scheduled_work();
-        
+
         /* shutdown our bulk read */
         if (port->read_urb)
                 usb_kill_urb(port->read_urb);
 } /* ftdi_close */
 
 
-  
+
 /* The SIO requires the first byte to have:
  *  B0 1
  *  B1 0
@@ -1423,7 +1423,7 @@ static int ftdi_write (struct usb_serial_port *port,
                 return 0;
         }
         spin_unlock_irqrestore(&priv->tx_lock, flags);
-        
+
         data_offset = priv->write_offset;
         dbg("data_offset set to %d",data_offset);
 
@@ -1462,7 +1462,7 @@ static int ftdi_write (struct usb_serial_port *port,
                                 user_pktsz = todo;
                         }
                         /* Write the control byte at the front of the packet*/
-                        *first_byte = 1 | ((user_pktsz) << 2); 
+                        *first_byte = 1 | ((user_pktsz) << 2);
                         /* Copy data for packet */
                         memcpy (first_byte + data_offset,
                                 current_position, user_pktsz);
@@ -1479,7 +1479,7 @@ static int ftdi_write (struct usb_serial_port *port,
         usb_serial_debug_data(debug, &port->dev, __FUNCTION__, transfer_size, buffer);
 
         /* fill the buffer and send it */
-        usb_fill_bulk_urb(urb, port->serial->dev, 
+        usb_fill_bulk_urb(urb, port->serial->dev,
                       usb_sndbulkpipe(port->serial->dev, port->bulk_out_endpointAddress),
                       buffer, transfer_size,
                       ftdi_write_bulk_callback, port);
@@ -1520,7 +1520,7 @@ static void ftdi_write_bulk_callback (struct urb *urb)
         kfree (urb->transfer_buffer);
 
         dbg("%s - port %d", __FUNCTION__, port->number);
-        
+
         if (urb->status) {
                 dbg("nonzero write bulk status received: %d", urb->status);
                 return;
@@ -1651,7 +1651,7 @@ static void ftdi_process_read (void *param)
         struct tty_struct *tty;
         struct ftdi_private *priv;
         char error_flag;
-        unsigned char *data;
+        unsigned char *data;
 
         int i;
         int result;
@@ -1759,7 +1759,7 @@ static void ftdi_process_read (void *param)
                 }
                 if (length > 0) {
                         for (i = 2; i < length+2; i++) {
-                                /* Note that the error flag is duplicated for 
+                                /* Note that the error flag is duplicated for
                                    every character received since we don't know
                                    which character it applied to */
                                 tty_insert_flip_char(tty, data[packet_offset+i], error_flag);
@@ -1773,7 +1773,7 @@ static void ftdi_process_read (void *param)
                    This doesn't work well since the application receives a never
                    ending stream of bad data - even though new data hasn't been sent.
                    Therefore I (bill) have taken this out.
-                   However - this might make sense for framing errors and so on 
+                   However - this might make sense for framing errors and so on
                    so I am leaving the code in for now.
                 */
                 else {
@@ -1827,7 +1827,7 @@ static void ftdi_process_read (void *param)
         /* if the port is closed stop trying to read */
         if (port->open_count > 0){
                 /* Continue trying to always read  */
-                usb_fill_bulk_urb(port->read_urb, port->serial->dev, 
+                usb_fill_bulk_urb(port->read_urb, port->serial->dev,
                               usb_rcvbulkpipe(port->serial->dev, port->bulk_in_endpointAddress),
                               port->read_urb->transfer_buffer, port->read_urb->transfer_buffer_length,
                               ftdi_read_bulk_callback, port);
@@ -1844,9 +1844,9 @@ static void ftdi_process_read (void *param)
 static void ftdi_break_ctl( struct usb_serial_port *port, int break_state )
 {
         struct ftdi_private *priv = usb_get_serial_port_data(port);
-        __u16 urb_value = 0; 
+        __u16 urb_value = 0;
         char buf[1];
-        
+
         /* break_state = -1 to turn on break, and 0 to turn off break */
         /* see drivers/char/tty_io.c to see it used */
         /* last_set_data_urb_value NEVER has the break bit set in it */
@@ -1854,20 +1854,20 @@ static void ftdi_break_ctl( struct usb_serial_port *port, int break_state )
         if (break_state) {
                 urb_value = priv->last_set_data_urb_value | FTDI_SIO_SET_BREAK;
         } else {
-                urb_value = priv->last_set_data_urb_value; 
+                urb_value = priv->last_set_data_urb_value;
         }
 
-        
+
         if (usb_control_msg(port->serial->dev, usb_sndctrlpipe(port->serial->dev, 0),
-                            FTDI_SIO_SET_DATA_REQUEST, 
+                            FTDI_SIO_SET_DATA_REQUEST,
                             FTDI_SIO_SET_DATA_REQUEST_TYPE,
                             urb_value , priv->interface,
                             buf, 0, WDR_TIMEOUT) < 0) {
                 err("%s FAILED to enable/disable break state (state was %d)", __FUNCTION__,break_state);
-        }          
+        }
 
         dbg("%s break state is %d - urb is %d", __FUNCTION__,break_state, urb_value);
-        
+
 }
 
 
@@ -1883,12 +1883,12 @@ static void ftdi_set_termios (struct usb_serial_port *port, struct termios *old_
         struct ftdi_private *priv = usb_get_serial_port_data(port);
         __u16 urb_value; /* will hold the new flags */
         char buf[1]; /* Perhaps I should dynamically alloc this? */
-        
+
         // Added for xon/xoff support
         unsigned int iflag = port->tty->termios->c_iflag;
         unsigned char vstop;
         unsigned char vstart;
-        
+
         dbg("%s", __FUNCTION__);
 
         /* Force baud rate if this device requires it, unless it is set to B0. */
@@ -1906,20 +1906,20 @@ static void ftdi_set_termios (struct usb_serial_port *port, struct termios *old_
 
         cflag = port->tty->termios->c_cflag;
 
-        /* FIXME -For this cut I don't care if the line is really changing or 
-           not  - so just do the change regardless  - should be able to 
+        /* FIXME -For this cut I don't care if the line is really changing or
+           not  - so just do the change regardless  - should be able to
            compare old_termios and tty->termios */
-        /* NOTE These routines can get interrupted by 
-           ftdi_sio_read_bulk_callback  - need to examine what this 
+        /* NOTE These routines can get interrupted by
+           ftdi_sio_read_bulk_callback  - need to examine what this
            means - don't see any problems yet */
-        
+
         /* Set number of data bits, parity, stop bits */
-        
+
         urb_value = 0;
         urb_value |= (cflag & CSTOPB ? FTDI_SIO_SET_DATA_STOP_BITS_2 :
                       FTDI_SIO_SET_DATA_STOP_BITS_1);
-        urb_value |= (cflag & PARENB ? 
-                      (cflag & PARODD ? FTDI_SIO_SET_DATA_PARITY_ODD : 
+        urb_value |= (cflag & PARENB ?
+                      (cflag & PARODD ? FTDI_SIO_SET_DATA_PARITY_ODD :
                        FTDI_SIO_SET_DATA_PARITY_EVEN) :
                       FTDI_SIO_SET_DATA_PARITY_NONE);
         if (cflag & CSIZE) {
@@ -1936,25 +1936,25 @@ static void ftdi_set_termios (struct usb_serial_port *port, struct termios *old_
         /* This is needed by the break command since it uses the same command - but is
          *  or'ed with this value  */
         priv->last_set_data_urb_value = urb_value;
-        
+
         if (usb_control_msg(dev, usb_sndctrlpipe(dev, 0),
-                            FTDI_SIO_SET_DATA_REQUEST, 
+                            FTDI_SIO_SET_DATA_REQUEST,
                             FTDI_SIO_SET_DATA_REQUEST_TYPE,
                             urb_value , priv->interface,
                             buf, 0, WDR_SHORT_TIMEOUT) < 0) {
                 err("%s FAILED to set databits/stopbits/parity", __FUNCTION__);
-        }          
+        }
 
         /* Now do the baudrate */
         if ((cflag & CBAUD) == B0 ) {
                 /* Disable flow control */
                 if (usb_control_msg(dev, usb_sndctrlpipe(dev, 0),
-                                    FTDI_SIO_SET_FLOW_CTRL_REQUEST, 
+                                    FTDI_SIO_SET_FLOW_CTRL_REQUEST,
                                     FTDI_SIO_SET_FLOW_CTRL_REQUEST_TYPE,
-                                    0, priv->interface, 
+                                    0, priv->interface,
                                     buf, 0, WDR_TIMEOUT) < 0) {
                         err("%s error from disable flowcontrol urb", __FUNCTION__);
-                }           
+                }
                 /* Drop RTS and DTR */
                 clear_mctrl(port, TIOCM_DTR | TIOCM_RTS);
         } else {
@@ -1972,16 +1972,16 @@ static void ftdi_set_termios (struct usb_serial_port *port, struct termios *old_
         /* Note device also supports DTR/CD (ugh) and Xon/Xoff in hardware */
         if (cflag & CRTSCTS) {
                 dbg("%s Setting to CRTSCTS flow control", __FUNCTION__);
-                if (usb_control_msg(dev, 
+                if (usb_control_msg(dev,
                                     usb_sndctrlpipe(dev, 0),
-                                    FTDI_SIO_SET_FLOW_CTRL_REQUEST, 
+                                    FTDI_SIO_SET_FLOW_CTRL_REQUEST,
                                     FTDI_SIO_SET_FLOW_CTRL_REQUEST_TYPE,
                                     0 , (FTDI_SIO_RTS_CTS_HS | priv->interface),
                                     buf, 0, WDR_TIMEOUT) < 0) {
                         err("urb failed to set to rts/cts flow control");
-                }               
-                
-        } else { 
+                }
+
+        } else {
                 /*
                  * Xon/Xoff code
                  *
@@ -2011,16 +2011,16 @@ static void ftdi_set_termios (struct usb_serial_port *port, struct termios *old_
                         /* else clause to only run if cfag ! CRTSCTS and iflag ! XOFF */
                         /* CHECKME Assuming XON/XOFF handled by tty stack - not by device */
                         dbg("%s Turning off hardware flow control", __FUNCTION__);
-                        if (usb_control_msg(dev, 
+                        if (usb_control_msg(dev,
                                             usb_sndctrlpipe(dev, 0),
-                                            FTDI_SIO_SET_FLOW_CTRL_REQUEST, 
+                                            FTDI_SIO_SET_FLOW_CTRL_REQUEST,
                                             FTDI_SIO_SET_FLOW_CTRL_REQUEST_TYPE,
-                                            0, priv->interface, 
+                                            0, priv->interface,
                                             buf, 0, WDR_TIMEOUT) < 0) {
                                 err("urb failed to clear flow control");
-                        }                               
+                        }
                 }
-                
+
         }
         return;
 } /* ftdi_termios */
@@ -2036,11 +2036,11 @@ static int ftdi_tiocmget (struct usb_serial_port *port, struct file *file)
         switch (priv->chip_type) {
         case SIO:
                 /* Request the status from the device */
-                if ((ret = usb_control_msg(port->serial->dev, 
+                if ((ret = usb_control_msg(port->serial->dev,
                                            usb_rcvctrlpipe(port->serial->dev, 0),
-                                           FTDI_SIO_GET_MODEM_STATUS_REQUEST, 
+                                           FTDI_SIO_GET_MODEM_STATUS_REQUEST,
                                            FTDI_SIO_GET_MODEM_STATUS_REQUEST_TYPE,
-                                           0, 0, 
+                                           0, 0,
                                            buf, 1, WDR_TIMEOUT)) < 0 ) {
                         err("%s Could not get modem status of device - err: %d", __FUNCTION__,
                             ret);
@@ -2052,11 +2052,11 @@ static int ftdi_tiocmget (struct usb_serial_port *port, struct file *file)
         case FT2232C:
                 /* the 8U232AM returns a two byte value (the sio is a 1 byte value) - in the same
                    format as the data returned from the in point */
-                if ((ret = usb_control_msg(port->serial->dev, 
+                if ((ret = usb_control_msg(port->serial->dev,
                                            usb_rcvctrlpipe(port->serial->dev, 0),
-                                           FTDI_SIO_GET_MODEM_STATUS_REQUEST, 
+                                           FTDI_SIO_GET_MODEM_STATUS_REQUEST,
                                            FTDI_SIO_GET_MODEM_STATUS_REQUEST_TYPE,
-                                           0, priv->interface, 
+                                           0, priv->interface,
                                            buf, 2, WDR_TIMEOUT)) < 0 ) {
                         err("%s Could not get modem status of device - err: %d", __FUNCTION__,
                             ret);
@@ -2067,12 +2067,12 @@ static int ftdi_tiocmget (struct usb_serial_port *port, struct file *file)
                 return -EFAULT;
                 break;
         }
-        
+
         return  (buf[0] & FTDI_SIO_DSR_MASK ? TIOCM_DSR : 0) |
                 (buf[0] & FTDI_SIO_CTS_MASK ? TIOCM_CTS : 0) |
                 (buf[0]  & FTDI_SIO_RI_MASK  ? TIOCM_RI  : 0) |
                 (buf[0]  & FTDI_SIO_RLSD_MASK ? TIOCM_CD  : 0) |
-                priv->last_dtr_rts;                     
+                priv->last_dtr_rts;
 }
 
 static int ftdi_tiocmset(struct usb_serial_port *port, struct file * file, unsigned int set, unsigned int clear)
@@ -2138,11 +2138,11 @@ static int ftdi_ioctl (struct usb_serial_port *port, struct file * file, unsigne
                 break;
         default:
                 break;
-                
+
         }
 
 
-        /* This is not necessarily an error - turns out the higher layers will do 
+        /* This is not necessarily an error - turns out the higher layers will do
          *  some ioctls itself (see comment above)
          */
         dbg("%s arg not supported - it was 0x%04x - check /usr/include/asm/ioctls.h", __FUNCTION__, cmd);
@@ -2199,7 +2199,7 @@ static int __init ftdi_init (void)
         if (retval)
                 goto failed_sio_register;
         retval = usb_register(&ftdi_driver);
-        if (retval) 
+        if (retval)
                 goto failed_usb_register;
 
         info(DRIVER_VERSION ":" DRIVER_DESC);
diff --git a/drivers/usb/serial/mos7720.c b/drivers/usb/serial/mos7720.c
new file mode 100644
index 000000000000..82cd15b894b0
--- /dev/null
+++ b/drivers/usb/serial/mos7720.c
@@ -0,0 +1,1683 @@
+/*
+ * mos7720.c
+ *   Controls the Moschip 7720 usb to dual port serial convertor
+ *
+ * Copyright 2006 Moschip Semiconductor Tech. Ltd.
+ *
+ * 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.
+ *
+ * Developed by:
+ *      VijayaKumar.G.N. <vijaykumar@aspirecom.net>
+ *      AjayKumar <ajay@aspirecom.net>
+ *      Gurudeva.N. <gurudev@aspirecom.net>
+ *
+ * Cleaned up from the original by:
+ *      Greg Kroah-Hartman <gregkh@suse.de>
+ *
+ * Originally based on drivers/usb/serial/io_edgeport.c which is:
+ *      Copyright (C) 2000 Inside Out Networks, All rights reserved.
+ *      Copyright (C) 2001-2002 Greg Kroah-Hartman <greg@kroah.com>
+ */
+#include <linux/kernel.h>
+#include <linux/errno.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <linux/tty.h>
+#include <linux/tty_driver.h>
+#include <linux/tty_flip.h>
+#include <linux/module.h>
+#include <linux/spinlock.h>
+#include <linux/serial.h>
+#include <linux/serial_reg.h>
+#include <linux/usb.h>
+#include <linux/usb/serial.h>
+#include <asm/uaccess.h>
+
+
+/*
+ * Version Information
+ */
+#define DRIVER_VERSION "1.0.0.4F"
+#define DRIVER_AUTHOR "Aspire Communications pvt Ltd."
+#define DRIVER_DESC "Moschip USB Serial Driver"
+
+/* default urb timeout */
+#define MOS_WDR_TIMEOUT (HZ * 5)
+
+#define MOS_PORT1       0x0200
+#define MOS_PORT2       0x0300
+#define MOS_VENREG      0x0000
+#define MOS_MAX_PORT    0x02
+#define MOS_WRITE       0x0E
+#define MOS_READ        0x0D
+
+/* Interrupt Rotinue Defines    */
+#define SERIAL_IIR_RLS  0x06
+#define SERIAL_IIR_RDA  0x04
+#define SERIAL_IIR_CTI  0x0c
+#define SERIAL_IIR_THR  0x02
+#define SERIAL_IIR_MS   0x00
+
+#define NUM_URBS                        16      /* URB Count */
+#define URB_TRANSFER_BUFFER_SIZE        32      /* URB Size */
+
+/* This structure holds all of the local port information */
+struct moschip_port
+{
+        __u8    shadowLCR;              /* last LCR value received */
+        __u8    shadowMCR;              /* last MCR value received */
+        __u8    shadowMSR;              /* last MSR value received */
+        char                    open;
+        struct async_icount     icount;
+        struct usb_serial_port  *port;  /* loop back to the owner */
+        struct urb              *write_urb_pool[NUM_URBS];
+};
+
+/* This structure holds all of the individual serial device information */
+struct moschip_serial
+{
+        int interrupt_started;
+};
+
+static int debug;
+
+#define USB_VENDOR_ID_MOSCHIP           0x9710
+#define MOSCHIP_DEVICE_ID_7720          0x7720
+#define MOSCHIP_DEVICE_ID_7715          0x7715
+
+static struct usb_device_id moschip_port_id_table [] = {
+        { USB_DEVICE(USB_VENDOR_ID_MOSCHIP,MOSCHIP_DEVICE_ID_7720) },
+        { } /* terminating entry */
+};
+MODULE_DEVICE_TABLE(usb, moschip_port_id_table);
+
+
+/*
+ * mos7720_interrupt_callback
+ *      this is the callback function for when we have received data on the
+ *      interrupt endpoint.
+ */
+static void mos7720_interrupt_callback(struct urb *urb)
+{
+        int result;
+        int length;
+        __u32 *data;
+        unsigned int status;
+        __u8 sp1;
+        __u8 sp2;
+        __u8 st;
+
+        dbg("%s"," : Entering\n");
+
+        if (!urb) {
+                dbg("%s","Invalid Pointer !!!!:\n");
+                return;
+        }
+
+        switch (urb->status) {
+        case 0:
+                /* success */
+                break;
+        case -ECONNRESET:
+        case -ENOENT:
+        case -ESHUTDOWN:
+                /* this urb is terminated, clean up */
+                dbg("%s - urb shutting down with status: %d", __FUNCTION__,
+                    urb->status);
+                return;
+        default:
+                dbg("%s - nonzero urb status received: %d", __FUNCTION__,
+                    urb->status);
+                goto exit;
+        }
+
+        length = urb->actual_length;
+        data = urb->transfer_buffer;
+
+        /* Moschip get 4 bytes
+         * Byte 1 IIR Port 1 (port.number is 0)
+         * Byte 2 IIR Port 2 (port.number is 1)
+         * Byte 3 --------------
+         * Byte 4 FIFO status for both */
+        if (length && length > 4) {
+                dbg("Wrong data !!!");
+                return;
+        }
+
+        status = *data;
+
+        sp1 = (status & 0xff000000)>>24;
+        sp2 = (status & 0x00ff0000)>>16;
+        st = status & 0x000000ff;
+
+        if ((sp1 & 0x01) || (sp2 & 0x01)) {
+                /* No Interrupt Pending in both the ports */
+                dbg("No Interrupt !!!");
+        } else {
+                switch (sp1 & 0x0f) {
+                case SERIAL_IIR_RLS:
+                        dbg("Serial Port 1: Receiver status error or address "
+                            "bit detected in 9-bit mode\n");
+                        break;
+                case SERIAL_IIR_CTI:
+                        dbg("Serial Port 1: Receiver time out");
+                        break;
+                case SERIAL_IIR_MS:
+                        dbg("Serial Port 1: Modem status change");
+                        break;
+                }
+
+                switch (sp2 & 0x0f) {
+                case SERIAL_IIR_RLS:
+                        dbg("Serial Port 2: Receiver status error or address "
+                            "bit detected in 9-bit mode");
+                        break;
+                case SERIAL_IIR_CTI:
+                        dbg("Serial Port 2: Receiver time out");
+                        break;
+                case SERIAL_IIR_MS:
+                        dbg("Serial Port 2: Modem status change");
+                        break;
+                }
+        }
+
+exit:
+        result = usb_submit_urb(urb, GFP_ATOMIC);
+        if (result)
+                dev_err(&urb->dev->dev,
+                        "%s - Error %d submitting control urb\n",
+                        __FUNCTION__, result);
+        return;
+}
+
+/*
+ * mos7720_bulk_in_callback
+ *      this is the callback function for when we have received data on the
+ *      bulk in endpoint.
+ */
+static void mos7720_bulk_in_callback(struct urb *urb)
+{
+        int status;
+        unsigned char *data ;
+        struct usb_serial_port *port;
+        struct moschip_port *mos7720_port;
+        struct tty_struct *tty;
+
+        if (urb->status) {
+                dbg("nonzero read bulk status received: %d",urb->status);
+                return;
+        }
+
+        mos7720_port = urb->context;
+        if (!mos7720_port) {
+                dbg("%s","NULL mos7720_port pointer \n");
+                return ;
+        }
+
+        port = mos7720_port->port;
+
+        dbg("Entering...%s", __FUNCTION__);
+
+        data = urb->transfer_buffer;
+
+        tty = port->tty;
+        if (tty && urb->actual_length) {
+                tty_buffer_request_room(tty, urb->actual_length);
+                tty_insert_flip_string(tty, data, urb->actual_length);
+                tty_flip_buffer_push(tty);
+        }
+
+        if (!port->read_urb) {
+                dbg("URB KILLED !!!");
+                return;
+        }
+
+        if (port->read_urb->status != -EINPROGRESS) {
+                port->read_urb->dev = port->serial->dev;
+
+                status = usb_submit_urb(port->read_urb, GFP_ATOMIC);
+                if (status)
+                        dbg("usb_submit_urb(read bulk) failed, status = %d",
+                            status);
+        }
+}
+
+/*
+ * mos7720_bulk_out_data_callback
+ *      this is the callback function for when we have finished sending serial
+ *      data on the bulk out endpoint.
+ */
+static void mos7720_bulk_out_data_callback(struct urb *urb)
+{
+        struct moschip_port *mos7720_port;
+        struct tty_struct *tty;
+
+        if (urb->status) {
+                dbg("nonzero write bulk status received:%d", urb->status);
+                return;
+        }
+
+        mos7720_port = urb->context;
+        if (!mos7720_port) {
+                dbg("NULL mos7720_port pointer");
+                return ;
+        }
+
+        dbg("Entering .........");
+
+        tty = mos7720_port->port->tty;
+
+        if (tty && mos7720_port->open) {
+                /* let the tty driver wakeup if it has a special *
+                 * write_wakeup function */
+                if ((tty->flags & (1 << TTY_DO_WRITE_WAKEUP)) &&
+                     tty->ldisc.write_wakeup)
+                        (tty->ldisc.write_wakeup)(tty);
+
+                /* tell the tty driver that something has changed */
+                wake_up_interruptible(&tty->write_wait);
+        }
+
+        /* schedule_work(&mos7720_port->port->work); */
+}
+
+/*
+ * send_mos_cmd
+ *      this function will be used for sending command to device
+ */
+static int send_mos_cmd(struct usb_serial *serial, __u8 request, __u16 value,
+                        __u16 index, void *data)
+{
+        int status;
+        unsigned int pipe;
+        u16 product = le16_to_cpu(serial->dev->descriptor.idProduct);
+        __u8 requesttype;
+        __u16 size = 0x0000;
+
+        if (value < MOS_MAX_PORT) {
+                if (product == MOSCHIP_DEVICE_ID_7715) {
+                        value = value*0x100+0x100;
+                } else {
+                        value = value*0x100+0x200;
+                }
+        } else {
+                value = 0x0000;
+                if ((product == MOSCHIP_DEVICE_ID_7715) &&
+                    (index != 0x08)) {
+                        dbg("serial->product== MOSCHIP_DEVICE_ID_7715");
+                        //index = 0x01 ;
+                }
+        }
+
+        if (request == MOS_WRITE) {
+                request = (__u8)MOS_WRITE;
+                requesttype = (__u8)0x40;
+                value  = value + (__u16)*((unsigned char *)data);
+                data = NULL;
+                pipe = usb_sndctrlpipe(serial->dev, 0);
+        } else {
+                request = (__u8)MOS_READ;
+                requesttype = (__u8)0xC0;
+                size = 0x01;
+                pipe = usb_rcvctrlpipe(serial->dev,0);
+        }
+
+        status = usb_control_msg(serial->dev, pipe, request, requesttype,
+                                 value, index, data, size, MOS_WDR_TIMEOUT);
+
+        if (status < 0)
+                dbg("Command Write failed Value %x index %x\n",value,index);
+
+        return status;
+}
+
+static int mos7720_open(struct usb_serial_port *port, struct file * filp)
+{
+        struct usb_serial *serial;
+        struct usb_serial_port *port0;
+        struct urb *urb;
+        struct moschip_serial *mos7720_serial;
+        struct moschip_port *mos7720_port;
+        int response;
+        int port_number;
+        char data;
+        int j;
+
+        serial = port->serial;
+
+        mos7720_port = usb_get_serial_port_data(port);
+        if (mos7720_port == NULL)
+                return -ENODEV;
+
+        port0 = serial->port[0];
+
+        mos7720_serial = usb_get_serial_data(serial);
+
+        if (mos7720_serial == NULL || port0 == NULL)
+                return -ENODEV;
+
+        usb_clear_halt(serial->dev, port->write_urb->pipe);
+        usb_clear_halt(serial->dev, port->read_urb->pipe);
+
+        /* Initialising the write urb pool */
+        for (j = 0; j < NUM_URBS; ++j) {
+                urb = usb_alloc_urb(0,SLAB_ATOMIC);
+                mos7720_port->write_urb_pool[j] = urb;
+
+                if (urb == NULL) {
+                        err("No more urbs???");
+                        continue;
+                }
+
+                urb->transfer_buffer = kmalloc(URB_TRANSFER_BUFFER_SIZE,
+                                               GFP_KERNEL);
+                if (!urb->transfer_buffer) {
+                        err("%s-out of memory for urb buffers.", __FUNCTION__);
+                        continue;
+                }
+        }
+
+         /* Initialize MCS7720 -- Write Init values to corresponding Registers
+          *
+          * Register Index
+          * 1 : IER
+          * 2 : FCR
+          * 3 : LCR
+          * 4 : MCR
+          *
+          * 0x08 : SP1/2 Control Reg
+          */
+        port_number = port->number - port->serial->minor;
+        send_mos_cmd(port->serial, MOS_READ, port_number, UART_LSR, &data);
+        dbg("SS::%p LSR:%x\n",mos7720_port, data);
+
+        dbg("Check:Sending Command ..........");
+
+        data = 0x02;
+        send_mos_cmd(serial, MOS_WRITE, MOS_MAX_PORT, 0x01, &data);
+        data = 0x02;
+        send_mos_cmd(serial, MOS_WRITE, MOS_MAX_PORT, 0x02, &data);
+
+        data = 0x00;
+        send_mos_cmd(serial, MOS_WRITE, port_number, 0x01, &data);
+        data = 0x00;
+        send_mos_cmd(serial, MOS_WRITE, port_number, 0x02, &data);
+
+        data = 0xCF;
+        send_mos_cmd(serial, MOS_WRITE, port_number, 0x02, &data);
+        data = 0x03;
+        mos7720_port->shadowLCR  = data;
+        send_mos_cmd(serial, MOS_WRITE, port_number, 0x03, &data);
+        data = 0x0b;
+        mos7720_port->shadowMCR  = data;
+        send_mos_cmd(serial, MOS_WRITE, port_number, 0x04, &data);
+        data = 0x0b;
+        send_mos_cmd(serial, MOS_WRITE, port_number, 0x04, &data);
+
+        data = 0x00;
+        send_mos_cmd(serial, MOS_READ, MOS_MAX_PORT, 0x08, &data);
+        data = 0x00;
+        send_mos_cmd(serial, MOS_WRITE, MOS_MAX_PORT, 0x08, &data);
+
+/*      data = 0x00;
+        send_mos_cmd(serial, MOS_READ, MOS_MAX_PORT, port_number + 1, &data);
+        data = 0x03;
+        send_mos_cmd(serial, MOS_WRITE, MOS_MAX_PORT, port_number + 1, &data);
+        data = 0x00;
+        send_mos_cmd(port->serial, MOS_WRITE, MOS_MAX_PORT, port_number + 1, &data);
+*/
+        data = 0x00;
+        send_mos_cmd(serial, MOS_READ, MOS_MAX_PORT, 0x08, &data);
+
+        data = data | (port->number - port->serial->minor + 1);
+        send_mos_cmd(serial, MOS_WRITE, MOS_MAX_PORT, 0x08, &data);
+
+        data = 0x83;
+        mos7720_port->shadowLCR  = data;
+        send_mos_cmd(serial, MOS_WRITE, port_number, 0x03, &data);
+        data = 0x0c;
+        send_mos_cmd(serial, MOS_WRITE, port_number, 0x00, &data);
+        data = 0x00;
+        send_mos_cmd(serial, MOS_WRITE, port_number, 0x01, &data);
+        data = 0x03;
+        mos7720_port->shadowLCR  = data;
+        send_mos_cmd(serial, MOS_WRITE, port_number, 0x03, &data);
+        data = 0x0c;
+        send_mos_cmd(serial, MOS_WRITE, port_number, 0x01, &data);
+        data = 0x0c;
+        send_mos_cmd(serial, MOS_WRITE, port_number, 0x01, &data);
+
+//Matrix
+
+        /* force low_latency on so that our tty_push actually forces *
+         * the data through,otherwise it is scheduled, and with      *
+         * high data rates (like with OHCI) data can get lost.       */
+
+        if (port->tty)
+                port->tty->low_latency = 1;
+
+        /* see if we've set up our endpoint info yet   *
+         * (can't set it up in mos7720_startup as the  *
+         * structures were not set up at that time.)   */
+        if (!mos7720_serial->interrupt_started) {
+                dbg("Interrupt buffer NULL !!!");
+
+                /* not set up yet, so do it now */
+                mos7720_serial->interrupt_started = 1;
+
+                dbg("To Submit URB !!!");
+
+                /* set up our interrupt urb */
+                usb_fill_int_urb(port0->interrupt_in_urb, serial->dev,
+                                 usb_rcvintpipe(serial->dev,
+                                                port->interrupt_in_endpointAddress),
+                                 port0->interrupt_in_buffer,
+                                 port0->interrupt_in_urb->transfer_buffer_length,
+                                 mos7720_interrupt_callback, mos7720_port,
+                                 port0->interrupt_in_urb->interval);
+
+                /* start interrupt read for this mos7720 this interrupt *
+                 * will continue as long as the mos7720 is connected    */
+                dbg("Submit URB over !!!");
+                response = usb_submit_urb(port0->interrupt_in_urb, GFP_KERNEL);
+                if (response)
+                        dev_err(&port->dev,
+                                "%s - Error %d submitting control urb",
+                                __FUNCTION__, response);
+        }
+
+        /* set up our bulk in urb */
+        usb_fill_bulk_urb(port->read_urb, serial->dev,
+                          usb_rcvbulkpipe(serial->dev,
+                                          port->bulk_in_endpointAddress),
+                          port->bulk_in_buffer,
+                          port->read_urb->transfer_buffer_length,
+                          mos7720_bulk_in_callback, mos7720_port);
+        response = usb_submit_urb(port->read_urb, GFP_KERNEL);
+        if (response)
+                dev_err(&port->dev,
+                        "%s - Error %d submitting read urb", __FUNCTION__, response);
+
+        /* initialize our icount structure */
+        memset(&(mos7720_port->icount), 0x00, sizeof(mos7720_port->icount));
+
+        /* initialize our port settings */
+        mos7720_port->shadowMCR = UART_MCR_OUT2; /* Must set to enable ints! */
+
+        /* send a open port command */
+        mos7720_port->open = 1;
+
+        return 0;
+}
+
+/*
+ * mos7720_chars_in_buffer
+ *      this function is called by the tty driver when it wants to know how many
+ *      bytes of data we currently have outstanding in the port (data that has
+ *      been written, but hasn't made it out the port yet)
+ *      If successful, we return the number of bytes left to be written in the
+ *      system,
+ *      Otherwise we return a negative error number.
+ */
+static int mos7720_chars_in_buffer(struct usb_serial_port *port)
+{
+        int i;
+        int chars = 0;
+        struct moschip_port *mos7720_port;
+
+        dbg("%s:entering ...........", __FUNCTION__);
+
+        mos7720_port = usb_get_serial_port_data(port);
+        if (mos7720_port == NULL) {
+                dbg("%s:leaving ...........", __FUNCTION__);
+                return -ENODEV;
+        }
+
+        for (i = 0; i < NUM_URBS; ++i) {
+                if (mos7720_port->write_urb_pool[i]->status == -EINPROGRESS)
+                        chars += URB_TRANSFER_BUFFER_SIZE;
+        }
+        dbg("%s - returns %d", __FUNCTION__, chars);
+        return chars;
+}
+
+static void mos7720_close(struct usb_serial_port *port, struct file *filp)
+{
+        struct usb_serial *serial;
+        struct moschip_port *mos7720_port;
+        char data;
+        int j;
+
+        dbg("mos7720_close:entering...");
+
+        serial = port->serial;
+
+        mos7720_port = usb_get_serial_port_data(port);
+        if (mos7720_port == NULL)
+                return;
+
+        for (j = 0; j < NUM_URBS; ++j)
+                usb_kill_urb(mos7720_port->write_urb_pool[j]);
+
+        /* Freeing Write URBs */
+        for (j = 0; j < NUM_URBS; ++j) {
+                if (mos7720_port->write_urb_pool[j]) {
+                        kfree(mos7720_port->write_urb_pool[j]->transfer_buffer);
+                        usb_free_urb(mos7720_port->write_urb_pool[j]);
+                }
+        }
+
+        /* While closing port, shutdown all bulk read, write  *
+         * and interrupt read if they exists                  */
+        if (serial->dev) {
+                dbg("Shutdown bulk write");
+                usb_kill_urb(port->write_urb);
+                dbg("Shutdown bulk read");
+                usb_kill_urb(port->read_urb);
+        }
+
+        data = 0x00;
+        send_mos_cmd(serial, MOS_WRITE, port->number - port->serial->minor,
+                     0x04, &data);
+
+        data = 0x00;
+        send_mos_cmd(serial, MOS_WRITE, port->number - port->serial->minor,
+                     0x01, &data);
+
+        mos7720_port->open = 0;
+
+        dbg("Leaving %s", __FUNCTION__);
+}
+
+static void mos7720_break(struct usb_serial_port *port, int break_state)
+{
+        unsigned char data;
+        struct usb_serial *serial;
+        struct moschip_port *mos7720_port;
+
+        dbg("Entering %s", __FUNCTION__);
+
+        serial = port->serial;
+
+        mos7720_port = usb_get_serial_port_data(port);
+        if (mos7720_port == NULL)
+                return;
+
+        if (break_state == -1)
+                data = mos7720_port->shadowLCR | UART_LCR_SBC;
+        else
+                data = mos7720_port->shadowLCR & ~UART_LCR_SBC;
+
+        mos7720_port->shadowLCR  = data;
+        send_mos_cmd(serial, MOS_WRITE, port->number - port->serial->minor,
+                     0x03, &data);
+
+        return;
+}
+
+/*
+ * mos7720_write_room
+ *      this function is called by the tty driver when it wants to know how many
+ *      bytes of data we can accept for a specific port.
+ *      If successful, we return the amount of room that we have for this port
+ *      Otherwise we return a negative error number.
+ */
+static int mos7720_write_room(struct usb_serial_port *port)
+{
+        struct moschip_port *mos7720_port;
+        int room = 0;
+        int i;
+
+        dbg("%s:entering ...........", __FUNCTION__);
+
+        mos7720_port = usb_get_serial_port_data(port);
+        if (mos7720_port == NULL) {
+                dbg("%s:leaving ...........", __FUNCTION__);
+                return -ENODEV;
+        }
+
+        for (i = 0; i < NUM_URBS; ++i) {
+                if (mos7720_port->write_urb_pool[i]->status != -EINPROGRESS)
+                        room += URB_TRANSFER_BUFFER_SIZE;
+        }
+
+        dbg("%s - returns %d", __FUNCTION__, room);
+        return room;
+}
+
+static int mos7720_write(struct usb_serial_port *port,
+                         const unsigned char *data, int count)
+{
+        int status;
+        int i;
+        int bytes_sent = 0;
+        int transfer_size;
+
+        struct moschip_port *mos7720_port;
+        struct usb_serial *serial;
+        struct urb    *urb;
+        const unsigned char *current_position = data;
+
+        dbg("%s:entering ...........", __FUNCTION__);
+
+        serial = port->serial;
+
+        mos7720_port = usb_get_serial_port_data(port);
+        if (mos7720_port == NULL) {
+                dbg("mos7720_port is NULL");
+                return -ENODEV;
+        }
+
+        /* try to find a free urb in the list */
+        urb = NULL;
+
+        for (i = 0; i < NUM_URBS; ++i) {
+                if (mos7720_port->write_urb_pool[i]->status != -EINPROGRESS) {
+                        urb = mos7720_port->write_urb_pool[i];
+                        dbg("URB:%d",i);
+                        break;
+                }
+        }
+
+        if (urb == NULL) {
+                dbg("%s - no more free urbs", __FUNCTION__);
+                goto exit;
+        }
+
+        if (urb->transfer_buffer == NULL) {
+                urb->transfer_buffer = kmalloc(URB_TRANSFER_BUFFER_SIZE,
+                                               GFP_KERNEL);
+                if (urb->transfer_buffer == NULL) {
+                        err("%s no more kernel memory...", __FUNCTION__);
+                        goto exit;
+                }
+        }
+        transfer_size = min (count, URB_TRANSFER_BUFFER_SIZE);
+
+        memcpy(urb->transfer_buffer, current_position, transfer_size);
+        usb_serial_debug_data(debug, &port->dev, __FUNCTION__, transfer_size,
+                              urb->transfer_buffer);
+
+        /* fill urb with data and submit  */
+        usb_fill_bulk_urb(urb, serial->dev,
+                          usb_sndbulkpipe(serial->dev,
+                                          port->bulk_out_endpointAddress),
+                          urb->transfer_buffer, transfer_size,
+                          mos7720_bulk_out_data_callback, mos7720_port);
+
+        /* send it down the pipe */
+        status = usb_submit_urb(urb,GFP_ATOMIC);
+        if (status) {
+                err("%s - usb_submit_urb(write bulk) failed with status = %d",
+                    __FUNCTION__, status);
+                bytes_sent = status;
+                goto exit;
+        }
+        bytes_sent = transfer_size;
+
+exit:
+        return bytes_sent;
+}
+
+static void mos7720_throttle(struct usb_serial_port *port)
+{
+        struct moschip_port *mos7720_port;
+        struct tty_struct *tty;
+        int status;
+
+        dbg("%s- port %d\n", __FUNCTION__, port->number);
+
+        mos7720_port = usb_get_serial_port_data(port);
+
+        if (mos7720_port == NULL)
+                return;
+
+        if (!mos7720_port->open) {
+                dbg("port not opened");
+                return;
+        }
+
+        dbg("%s: Entering ..........", __FUNCTION__);
+
+        tty = port->tty;
+        if (!tty) {
+                dbg("%s - no tty available", __FUNCTION__);
+                return;
+        }
+
+        /* if we are implementing XON/XOFF, send the stop character */
+        if (I_IXOFF(tty)) {
+                unsigned char stop_char = STOP_CHAR(tty);
+                status = mos7720_write(port, &stop_char, 1);
+                if (status <= 0)
+                        return;
+        }
+
+        /* if we are implementing RTS/CTS, toggle that line */
+        if (tty->termios->c_cflag & CRTSCTS) {
+                mos7720_port->shadowMCR &= ~UART_MCR_RTS;
+                status = send_mos_cmd(port->serial, MOS_WRITE,
+                                      port->number - port->serial->minor,
+                                      UART_MCR, &mos7720_port->shadowMCR);
+                if (status != 0)
+                        return;
+        }
+}
+
+static void mos7720_unthrottle(struct usb_serial_port *port)
+{
+        struct tty_struct *tty;
+        int status;
+        struct moschip_port *mos7720_port = usb_get_serial_port_data(port);
+
+        if (mos7720_port == NULL)
+                return;
+
+        if (!mos7720_port->open) {
+                dbg("%s - port not opened", __FUNCTION__);
+                return;
+        }
+
+        dbg("%s: Entering ..........", __FUNCTION__);
+
+        tty = port->tty;
+        if (!tty) {
+                dbg("%s - no tty available", __FUNCTION__);
+                return;
+        }
+
+        /* if we are implementing XON/XOFF, send the start character */
+        if (I_IXOFF(tty)) {
+                unsigned char start_char = START_CHAR(tty);
+                status = mos7720_write(port, &start_char, 1);
+                if (status <= 0)
+                        return;
+        }
+
+        /* if we are implementing RTS/CTS, toggle that line */
+        if (tty->termios->c_cflag & CRTSCTS) {
+                mos7720_port->shadowMCR |= UART_MCR_RTS;
+                status = send_mos_cmd(port->serial, MOS_WRITE,
+                                      port->number - port->serial->minor,
+                                      UART_MCR, &mos7720_port->shadowMCR);
+                if (status != 0)
+                        return;
+        }
+}
+
+static int set_higher_rates(struct moschip_port *mos7720_port,
+                            unsigned int baud)
+{
+        unsigned char data;
+        struct usb_serial_port *port;
+        struct usb_serial *serial;
+        int port_number;
+
+        if (mos7720_port == NULL)
+                return -EINVAL;
+
+        port = mos7720_port->port;
+        serial = port->serial;
+
+        /***********************************************
+         *      Init Sequence for higher rates
+         ***********************************************/
+        dbg("Sending Setting Commands ..........");
+        port_number = port->number - port->serial->minor;
+
+        data = 0x000;
+        send_mos_cmd(serial, MOS_WRITE, port_number, 0x01, &data);
+        data = 0x000;
+        send_mos_cmd(serial, MOS_WRITE, port_number, 0x02, &data);
+        data = 0x0CF;
+        send_mos_cmd(serial, MOS_WRITE, port->number, 0x02, &data);
+        data = 0x00b;
+        mos7720_port->shadowMCR  = data;
+        send_mos_cmd(serial, MOS_WRITE, port_number, 0x04, &data);
+        data = 0x00b;
+        send_mos_cmd(serial, MOS_WRITE, port_number, 0x04, &data);
+
+        data = 0x000;
+        send_mos_cmd(serial, MOS_READ, MOS_MAX_PORT, 0x08, &data);
+        data = 0x000;
+        send_mos_cmd(serial, MOS_WRITE, MOS_MAX_PORT, 0x08, &data);
+
+
+        /***********************************************
+         *              Set for higher rates           *
+         ***********************************************/
+
+        data = baud * 0x10;
+        send_mos_cmd(serial, MOS_WRITE, MOS_MAX_PORT, port_number + 1,&data);
+
+        data = 0x003;
+        send_mos_cmd(serial, MOS_READ, MOS_MAX_PORT, 0x08, &data);
+        data = 0x003;
+        send_mos_cmd(serial, MOS_WRITE, MOS_MAX_PORT, 0x08, &data);
+
+        data = 0x02b;
+        mos7720_port->shadowMCR  = data;
+        send_mos_cmd(serial, MOS_WRITE, port_number, 0x04, &data);
+        data = 0x02b;
+        send_mos_cmd(serial, MOS_WRITE, port_number, 0x04, &data);
+
+        /***********************************************
+         *              Set DLL/DLM
+         ***********************************************/
+
+        data = mos7720_port->shadowLCR | UART_LCR_DLAB;
+        mos7720_port->shadowLCR  = data;
+        send_mos_cmd(serial, MOS_WRITE, port_number, 0x03, &data);
+
+        data =  0x001; /* DLL */
+        send_mos_cmd(serial, MOS_WRITE, port_number, 0x00, &data);
+        data =  0x000; /* DLM */
+        send_mos_cmd(serial, MOS_WRITE, port_number, 0x01, &data);
+
+        data = mos7720_port->shadowLCR & ~UART_LCR_DLAB;
+        mos7720_port->shadowLCR  = data;
+        send_mos_cmd(serial, MOS_WRITE, port_number, 0x03, &data);
+
+        return 0;
+}
+
+/* baud rate information */
+struct divisor_table_entry
+{
+        __u32  baudrate;
+        __u16  divisor;
+};
+
+/* Define table of divisors for moschip 7720 hardware      *
+ * These assume a 3.6864MHz crystal, the standard /16, and *
+ * MCR.7 = 0.                                              */
+static struct divisor_table_entry divisor_table[] = {
+        {   50,         2304},
+        {   110,        1047},  /* 2094.545455 => 230450   => .0217 % over */
+        {   134,        857},   /* 1713.011152 => 230398.5 => .00065% under */
+        {   150,        768},
+        {   300,        384},
+        {   600,        192},
+        {   1200,       96},
+        {   1800,       64},
+        {   2400,       48},
+        {   4800,       24},
+        {   7200,       16},
+        {   9600,       12},
+        {   19200,      6},
+        {   38400,      3},
+        {   57600,      2},
+        {   115200,     1},
+};
+
+/*****************************************************************************
+ * calc_baud_rate_divisor
+ *      this function calculates the proper baud rate divisor for the specified
+ *      baud rate.
+ *****************************************************************************/
+static int calc_baud_rate_divisor(int baudrate, int *divisor)
+{
+        int i;
+        __u16 custom;
+        __u16 round1;
+        __u16 round;
+
+
+        dbg("%s - %d", __FUNCTION__, baudrate);
+
+        for (i = 0; i < ARRAY_SIZE(divisor_table); i++) {
+                if (divisor_table[i].baudrate == baudrate) {
+                        *divisor = divisor_table[i].divisor;
+                        return 0;
+                }
+        }
+
+        /* After trying for all the standard baud rates    *
+         * Try calculating the divisor for this baud rate  */
+        if (baudrate > 75 &&  baudrate < 230400) {
+                /* get the divisor */
+                custom = (__u16)(230400L  / baudrate);
+
+                /* Check for round off */
+                round1 = (__u16)(2304000L / baudrate);
+                round = (__u16)(round1 - (custom * 10));
+                if (round > 4)
+                        custom++;
+                *divisor = custom;
+
+                dbg("Baud %d = %d",baudrate, custom);
+                return 0;
+        }
+
+        dbg("Baud calculation Failed...");
+        return -EINVAL;
+}
+
+/*
+ * send_cmd_write_baud_rate
+ *      this function sends the proper command to change the baud rate of the
+ *      specified port.
+ */
+static int send_cmd_write_baud_rate(struct moschip_port *mos7720_port,
+                                    int baudrate)
+{
+        struct usb_serial_port *port;
+        struct usb_serial *serial;
+        int divisor;
+        int status;
+        unsigned char data;
+        unsigned char number;
+
+        if (mos7720_port == NULL)
+                return -1;
+
+        port = mos7720_port->port;
+        serial = port->serial;
+
+        dbg("%s: Entering ..........", __FUNCTION__);
+
+        number = port->number - port->serial->minor;
+        dbg("%s - port = %d, baud = %d", __FUNCTION__, port->number, baudrate);
+
+        /* Calculate the Divisor */
+        status = calc_baud_rate_divisor(baudrate, &divisor);
+        if (status) {
+                err("%s - bad baud rate", __FUNCTION__);
+                return status;
+        }
+
+        /* Enable access to divisor latch */
+        data = mos7720_port->shadowLCR | UART_LCR_DLAB;
+        mos7720_port->shadowLCR  = data;
+        send_mos_cmd(serial, MOS_WRITE, number, UART_LCR, &data);
+
+        /* Write the divisor */
+        data = ((unsigned char)(divisor & 0xff));
+        send_mos_cmd(serial, MOS_WRITE, number, 0x00, &data);
+
+        data = ((unsigned char)((divisor & 0xff00) >> 8));
+        send_mos_cmd(serial, MOS_WRITE, number, 0x01, &data);
+
+        /* Disable access to divisor latch */
+        data = mos7720_port->shadowLCR & ~UART_LCR_DLAB;
+        mos7720_port->shadowLCR = data;
+        send_mos_cmd(serial, MOS_WRITE, number, 0x03, &data);
+
+        return status;
+}
+
+/*
+ * change_port_settings
+ *      This routine is called to set the UART on the device to match
+ *      the specified new settings.
+ */
+static void change_port_settings(struct moschip_port *mos7720_port,
+                                 struct termios *old_termios)
+{
+        struct usb_serial_port *port;
+        struct usb_serial *serial;
+        struct tty_struct *tty;
+        int baud;
+        unsigned cflag;
+        unsigned iflag;
+        __u8 mask = 0xff;
+        __u8 lData;
+        __u8 lParity;
+        __u8 lStop;
+        int status;
+        int port_number;
+        char data;
+
+        if (mos7720_port == NULL)
+                return ;
+
+        port = mos7720_port->port;
+        serial = port->serial;
+        port_number = port->number - port->serial->minor;
+
+        dbg("%s - port %d", __FUNCTION__, port->number);
+
+        if (!mos7720_port->open) {
+                dbg("%s - port not opened", __FUNCTION__);
+                return;
+        }
+
+        tty = mos7720_port->port->tty;
+
+        if ((!tty) || (!tty->termios)) {
+                dbg("%s - no tty structures", __FUNCTION__);
+                return;
+        }
+
+        dbg("%s: Entering ..........", __FUNCTION__);
+
+        lData = UART_LCR_WLEN8;
+        lStop = 0x00;   /* 1 stop bit */
+        lParity = 0x00; /* No parity */
+
+        cflag = tty->termios->c_cflag;
+        iflag = tty->termios->c_iflag;
+
+        /* Change the number of bits */
+        switch (cflag & CSIZE) {
+        case CS5:
+                lData = UART_LCR_WLEN5;
+                mask = 0x1f;
+                break;
+
+        case CS6:
+                lData = UART_LCR_WLEN6;
+                mask = 0x3f;
+                break;
+
+        case CS7:
+                lData = UART_LCR_WLEN7;
+                mask = 0x7f;
+                break;
+        default:
+        case CS8:
+                lData = UART_LCR_WLEN8;
+                break;
+        }
+
+        /* Change the Parity bit */
+        if (cflag & PARENB) {
+                if (cflag & PARODD) {
+                        lParity = UART_LCR_PARITY;
+                        dbg("%s - parity = odd", __FUNCTION__);
+                } else {
+                        lParity = (UART_LCR_EPAR | UART_LCR_PARITY);
+                        dbg("%s - parity = even", __FUNCTION__);
+                }
+
+        } else {
+                dbg("%s - parity = none", __FUNCTION__);
+        }
+
+        if (cflag & CMSPAR)
+                lParity = lParity | 0x20;
+
+        /* Change the Stop bit */
+        if (cflag & CSTOPB) {
+                lStop = UART_LCR_STOP;
+                dbg("%s - stop bits = 2", __FUNCTION__);
+        } else {
+                lStop = 0x00;
+                dbg("%s - stop bits = 1", __FUNCTION__);
+        }
+
+#define LCR_BITS_MASK           0x03    /* Mask for bits/char field */
+#define LCR_STOP_MASK           0x04    /* Mask for stop bits field */
+#define LCR_PAR_MASK            0x38    /* Mask for parity field */
+
+        /* Update the LCR with the correct value */
+        mos7720_port->shadowLCR &= ~(LCR_BITS_MASK | LCR_STOP_MASK | LCR_PAR_MASK);
+        mos7720_port->shadowLCR |= (lData | lParity | lStop);
+
+
+        /* Disable Interrupts */
+        data = 0x00;
+        send_mos_cmd(serial,MOS_WRITE,port->number - port->serial->minor, UART_IER, &data);
+
+        data = 0x00;
+        send_mos_cmd(serial, MOS_WRITE, port_number, UART_FCR, &data);
+
+        data = 0xcf;
+        send_mos_cmd(serial, MOS_WRITE, port_number, UART_FCR, &data);
+
+        /* Send the updated LCR value to the mos7720 */
+        data = mos7720_port->shadowLCR;
+        send_mos_cmd(serial, MOS_WRITE, port_number, UART_LCR, &data);
+
+        data = 0x00b;
+        mos7720_port->shadowMCR = data;
+        send_mos_cmd(serial, MOS_WRITE, port_number, 0x04, &data);
+        data = 0x00b;
+        send_mos_cmd(serial, MOS_WRITE, port_number, 0x04, &data);
+
+        /* set up the MCR register and send it to the mos7720 */
+        mos7720_port->shadowMCR = UART_MCR_OUT2;
+        if (cflag & CBAUD)
+                mos7720_port->shadowMCR |= (UART_MCR_DTR | UART_MCR_RTS);
+
+        if (cflag & CRTSCTS) {
+                mos7720_port->shadowMCR |= (UART_MCR_XONANY);
+
+                /* To set hardware flow control to the specified *
+                 * serial port, in SP1/2_CONTROL_REG             */
+                if (port->number) {
+                        data = 0x001;
+                        send_mos_cmd(serial, MOS_WRITE, MOS_MAX_PORT,
+                                     0x08, &data);
+                } else {
+                        data = 0x002;
+                        send_mos_cmd(serial, MOS_WRITE, MOS_MAX_PORT,
+                                     0x08, &data);
+                }
+        } else {
+                mos7720_port->shadowMCR &= ~(UART_MCR_XONANY);
+        }
+
+        data = mos7720_port->shadowMCR;
+        send_mos_cmd(serial, MOS_WRITE, port_number, UART_MCR, &data);
+
+        /* Determine divisor based on baud rate */
+        baud = tty_get_baud_rate(tty);
+        if (!baud) {
+                /* pick a default, any default... */
+                dbg("Picked default baud...");
+                baud = 9600;
+        }
+
+        if (baud >= 230400) {
+                set_higher_rates(mos7720_port, baud);
+                /* Enable Interrupts */
+                data = 0x0c;
+                send_mos_cmd(serial, MOS_WRITE, port_number, UART_IER, &data);
+                return;
+        }
+
+        dbg("%s - baud rate = %d", __FUNCTION__, baud);
+        status = send_cmd_write_baud_rate(mos7720_port, baud);
+
+        /* Enable Interrupts */
+        data = 0x0c;
+        send_mos_cmd(serial, MOS_WRITE, port_number, UART_IER, &data);
+
+        if (port->read_urb->status != -EINPROGRESS) {
+                port->read_urb->dev = serial->dev;
+
+                status = usb_submit_urb(port->read_urb, GFP_ATOMIC);
+                if (status)
+                        dbg("usb_submit_urb(read bulk) failed, status = %d",
+                            status);
+        }
+        return;
+}
+
+/*
+ * mos7720_set_termios
+ *      this function is called by the tty driver when it wants to change the
+ *      termios structure.
+ */
+static void mos7720_set_termios(struct usb_serial_port *port,
+                                struct termios *old_termios)
+{
+        int status;
+        unsigned int cflag;
+        struct usb_serial *serial;
+        struct moschip_port *mos7720_port;
+        struct tty_struct *tty;
+
+        serial = port->serial;
+
+        mos7720_port = usb_get_serial_port_data(port);
+
+        if (mos7720_port == NULL)
+                return;
+
+        tty = port->tty;
+
+        if (!port->tty || !port->tty->termios) {
+                dbg("%s - no tty or termios", __FUNCTION__);
+                return;
+        }
+
+        if (!mos7720_port->open) {
+                dbg("%s - port not opened", __FUNCTION__);
+                return;
+        }
+
+        dbg("%s\n","setting termios - ASPIRE");
+
+        cflag = tty->termios->c_cflag;
+
+        if (!cflag) {
+                printk("%s %s\n",__FUNCTION__,"cflag is NULL");
+                return;
+        }
+
+        /* check that they really want us to change something */
+        if (old_termios) {
+                if ((cflag == old_termios->c_cflag) &&
+                    (RELEVANT_IFLAG(tty->termios->c_iflag) ==
+                     RELEVANT_IFLAG(old_termios->c_iflag))) {
+                        dbg("Nothing to change");
+                        return;
+                }
+        }
+
+        dbg("%s - clfag %08x iflag %08x", __FUNCTION__,
+            tty->termios->c_cflag,
+            RELEVANT_IFLAG(tty->termios->c_iflag));
+
+        if (old_termios)
+                dbg("%s - old clfag %08x old iflag %08x", __FUNCTION__,
+                    old_termios->c_cflag,
+                    RELEVANT_IFLAG(old_termios->c_iflag));
+
+        dbg("%s - port %d", __FUNCTION__, port->number);
+
+        /* change the port settings to the new ones specified */
+        change_port_settings(mos7720_port, old_termios);
+
+        if(!port->read_urb) {
+                dbg("%s","URB KILLED !!!!!\n");
+                return;
+        }
+
+        if(port->read_urb->status != -EINPROGRESS) {
+                port->read_urb->dev = serial->dev;
+                status = usb_submit_urb(port->read_urb, GFP_ATOMIC);
+                if (status)
+                        dbg("usb_submit_urb(read bulk) failed, status = %d",
+                            status);
+        }
+        return;
+}
+
+/*
+ * get_lsr_info - get line status register info
+ *
+ * Purpose: Let user call ioctl() to get info when the UART physically
+ *          is emptied.  On bus types like RS485, the transmitter must
+ *          release the bus after transmitting. This must be done when
+ *          the transmit shift register is empty, not be done when the
+ *          transmit holding register is empty.  This functionality
+ *          allows an RS485 driver to be written in user space.
+ */
+static int get_lsr_info(struct moschip_port *mos7720_port,
+                        unsigned int __user *value)
+{
+        int count;
+        unsigned int result = 0;
+
+        count = mos7720_chars_in_buffer(mos7720_port->port);
+        if (count == 0) {
+                dbg("%s -- Empty", __FUNCTION__);
+                result = TIOCSER_TEMT;
+        }
+
+        if (copy_to_user(value, &result, sizeof(int)))
+                return -EFAULT;
+        return 0;
+}
+
+/*
+ * get_number_bytes_avail - get number of bytes available
+ *
+ * Purpose: Let user call ioctl to get the count of number of bytes available.
+ */
+static int get_number_bytes_avail(struct moschip_port *mos7720_port,
+                                  unsigned int __user *value)
+{
+        unsigned int result = 0;
+        struct tty_struct *tty = mos7720_port->port->tty;
+
+        if (!tty)
+                return -ENOIOCTLCMD;
+
+        result = tty->read_cnt;
+
+        dbg("%s(%d) = %d", __FUNCTION__,  mos7720_port->port->number, result);
+        if (copy_to_user(value, &result, sizeof(int)))
+                return -EFAULT;
+
+        return -ENOIOCTLCMD;
+}
+
+static int set_modem_info(struct moschip_port *mos7720_port, unsigned int cmd,
+                          unsigned int __user *value)
+{
+        unsigned int mcr ;
+        unsigned int arg;
+        unsigned char data;
+
+        struct usb_serial_port *port;
+
+        if (mos7720_port == NULL)
+                return -1;
+
+        port = (struct usb_serial_port*)mos7720_port->port;
+        mcr = mos7720_port->shadowMCR;
+
+        if (copy_from_user(&arg, value, sizeof(int)))
+                return -EFAULT;
+
+        switch (cmd) {
+        case TIOCMBIS:
+                if (arg & TIOCM_RTS)
+                        mcr |= UART_MCR_RTS;
+                if (arg & TIOCM_DTR)
+                        mcr |= UART_MCR_RTS;
+                if (arg & TIOCM_LOOP)
+                        mcr |= UART_MCR_LOOP;
+                break;
+
+        case TIOCMBIC:
+                if (arg & TIOCM_RTS)
+                        mcr &= ~UART_MCR_RTS;
+                if (arg & TIOCM_DTR)
+                        mcr &= ~UART_MCR_RTS;
+                if (arg & TIOCM_LOOP)
+                        mcr &= ~UART_MCR_LOOP;
+                break;
+
+        case TIOCMSET:
+                /* turn off the RTS and DTR and LOOPBACK
+                 * and then only turn on what was asked to */
+                mcr &=  ~(UART_MCR_RTS | UART_MCR_DTR | UART_MCR_LOOP);
+                mcr |= ((arg & TIOCM_RTS) ? UART_MCR_RTS : 0);
+                mcr |= ((arg & TIOCM_DTR) ? UART_MCR_DTR : 0);
+                mcr |= ((arg & TIOCM_LOOP) ? UART_MCR_LOOP : 0);
+                break;
+        }
+
+        mos7720_port->shadowMCR = mcr;
+
+        data = mos7720_port->shadowMCR;
+        send_mos_cmd(port->serial, MOS_WRITE,
+                     port->number - port->serial->minor, UART_MCR, &data);
+
+        return 0;
+}
+
+static int get_modem_info(struct moschip_port *mos7720_port,
+                          unsigned int __user *value)
+{
+        unsigned int result = 0;
+        unsigned int msr = mos7720_port->shadowMSR;
+        unsigned int mcr = mos7720_port->shadowMCR;
+
+        result = ((mcr & UART_MCR_DTR)  ? TIOCM_DTR: 0)   /* 0x002 */
+                  | ((mcr & UART_MCR_RTS)       ? TIOCM_RTS: 0)   /* 0x004 */
+                  | ((msr & UART_MSR_CTS)       ? TIOCM_CTS: 0)   /* 0x020 */
+                  | ((msr & UART_MSR_DCD)       ? TIOCM_CAR: 0)   /* 0x040 */
+                  | ((msr & UART_MSR_RI)        ? TIOCM_RI:  0)   /* 0x080 */
+                  | ((msr & UART_MSR_DSR)       ? TIOCM_DSR: 0);  /* 0x100 */
+
+
+        dbg("%s -- %x", __FUNCTION__, result);
+
+        if (copy_to_user(value, &result, sizeof(int)))
+                return -EFAULT;
+        return 0;
+}
+
+static int get_serial_info(struct moschip_port *mos7720_port,
+                           struct serial_struct __user *retinfo)
+{
+        struct serial_struct tmp;
+
+        if (!retinfo)
+                return -EFAULT;
+
+        memset(&tmp, 0, sizeof(tmp));
+
+        tmp.type                = PORT_16550A;
+        tmp.line                = mos7720_port->port->serial->minor;
+        tmp.port                = mos7720_port->port->number;
+        tmp.irq                 = 0;
+        tmp.flags               = ASYNC_SKIP_TEST | ASYNC_AUTO_IRQ;
+        tmp.xmit_fifo_size      = NUM_URBS * URB_TRANSFER_BUFFER_SIZE;
+        tmp.baud_base           = 9600;
+        tmp.close_delay         = 5*HZ;
+        tmp.closing_wait        = 30*HZ;
+
+        if (copy_to_user(retinfo, &tmp, sizeof(*retinfo)))
+                return -EFAULT;
+        return 0;
+}
+
+static int mos7720_ioctl(struct usb_serial_port *port, struct file *file,
+                         unsigned int cmd, unsigned long arg)
+{
+        struct moschip_port *mos7720_port;
+        struct async_icount cnow;
+        struct async_icount cprev;
+        struct serial_icounter_struct icount;
+
+        mos7720_port = usb_get_serial_port_data(port);
+        if (mos7720_port == NULL)
+                return -ENODEV;
+
+        dbg("%s - port %d, cmd = 0x%x", __FUNCTION__, port->number, cmd);
+
+        switch (cmd) {
+        case TIOCINQ:
+                /* return number of bytes available */
+                dbg("%s (%d) TIOCINQ", __FUNCTION__,  port->number);
+                return get_number_bytes_avail(mos7720_port,
+                                              (unsigned int __user *)arg);
+                break;
+
+        case TIOCSERGETLSR:
+                dbg("%s (%d) TIOCSERGETLSR", __FUNCTION__,  port->number);
+                return get_lsr_info(mos7720_port, (unsigned int __user *)arg);
+                return 0;
+
+        case TIOCMBIS:
+        case TIOCMBIC:
+        case TIOCMSET:
+                dbg("%s (%d) TIOCMSET/TIOCMBIC/TIOCMSET", __FUNCTION__,
+                    port->number);
+                return set_modem_info(mos7720_port, cmd,
+                                      (unsigned int __user *)arg);
+
+        case TIOCMGET:
+                dbg("%s (%d) TIOCMGET", __FUNCTION__,  port->number);
+                return get_modem_info(mos7720_port,
+                                      (unsigned int __user *)arg);
+
+        case TIOCGSERIAL:
+                dbg("%s (%d) TIOCGSERIAL", __FUNCTION__,  port->number);
+                return get_serial_info(mos7720_port,
+                                       (struct serial_struct __user *)arg);
+
+        case TIOCSSERIAL:
+                dbg("%s (%d) TIOCSSERIAL", __FUNCTION__,  port->number);
+                break;
+
+        case TIOCMIWAIT:
+                dbg("%s (%d) TIOCMIWAIT", __FUNCTION__,  port->number);
+                cprev = mos7720_port->icount;
+                while (1) {
+                        if (signal_pending(current))
+                                return -ERESTARTSYS;
+                        cnow = mos7720_port->icount;
+                        if (cnow.rng == cprev.rng && cnow.dsr == cprev.dsr &&
+                            cnow.dcd == cprev.dcd && cnow.cts == cprev.cts)
+                                return -EIO; /* no change => error */
+                        if (((arg & TIOCM_RNG) && (cnow.rng != cprev.rng)) ||
+                            ((arg & TIOCM_DSR) && (cnow.dsr != cprev.dsr)) ||
+                            ((arg & TIOCM_CD)  && (cnow.dcd != cprev.dcd)) ||
+                            ((arg & TIOCM_CTS) && (cnow.cts != cprev.cts)) ) {
+                                return 0;
+                        }
+                        cprev = cnow;
+                }
+                /* NOTREACHED */
+                break;
+
+        case TIOCGICOUNT:
+                cnow = mos7720_port->icount;
+                icount.cts = cnow.cts;
+                icount.dsr = cnow.dsr;
+                icount.rng = cnow.rng;
+                icount.dcd = cnow.dcd;
+                icount.rx = cnow.rx;
+                icount.tx = cnow.tx;
+                icount.frame = cnow.frame;
+                icount.overrun = cnow.overrun;
+                icount.parity = cnow.parity;
+                icount.brk = cnow.brk;
+                icount.buf_overrun = cnow.buf_overrun;
+
+                dbg("%s (%d) TIOCGICOUNT RX=%d, TX=%d", __FUNCTION__,
+                    port->number, icount.rx, icount.tx );
+                if (copy_to_user((void __user *)arg, &icount, sizeof(icount)))
+                        return -EFAULT;
+                return 0;
+        }
+
+        return -ENOIOCTLCMD;
+}
+
+static int mos7720_startup(struct usb_serial *serial)
+{
+        struct moschip_serial *mos7720_serial;
+        struct moschip_port *mos7720_port;
+        struct usb_device *dev;
+        int i;
+        char data;
+
+        dbg("%s: Entering ..........", __FUNCTION__);
+
+        if (!serial) {
+                dbg("Invalid Handler");
+                return -ENODEV;
+        }
+
+        dev = serial->dev;
+
+        /* create our private serial structure */
+        mos7720_serial = kzalloc(sizeof(struct moschip_serial), GFP_KERNEL);
+        if (mos7720_serial == NULL) {
+                err("%s - Out of memory", __FUNCTION__);
+                return -ENOMEM;
+        }
+
+        usb_set_serial_data(serial, mos7720_serial);
+
+        /* we set up the pointers to the endpoints in the mos7720_open *
+         * function, as the structures aren't created yet.             */
+
+        /* set up port private structures */
+        for (i = 0; i < serial->num_ports; ++i) {
+                mos7720_port = kzalloc(sizeof(struct moschip_port), GFP_KERNEL);
+                if (mos7720_port == NULL) {
+                        err("%s - Out of memory", __FUNCTION__);
+                        usb_set_serial_data(serial, NULL);
+                        kfree(mos7720_serial);
+                        return -ENOMEM;
+                }
+
+                /* Initialize all port interrupt end point to port 0 int
+                 * endpoint.  Our device has only one interrupt endpoint
+                 * comman to all ports */
+                serial->port[i]->interrupt_in_endpointAddress = serial->port[0]->interrupt_in_endpointAddress;
+
+                mos7720_port->port = serial->port[i];
+                usb_set_serial_port_data(serial->port[i], mos7720_port);
+
+                dbg("port number is %d", serial->port[i]->number);
+                dbg("serial number is %d", serial->minor);
+        }
+
+
+        /* setting configuration feature to one */
+        usb_control_msg(serial->dev, usb_sndctrlpipe(serial->dev, 0),
+                        (__u8)0x03, 0x00,0x01,0x00, NULL, 0x00, 5*HZ);
+
+        send_mos_cmd(serial,MOS_READ,0x00, UART_LSR, &data);  // LSR For Port 1
+        dbg("LSR:%x",data);
+
+        send_mos_cmd(serial,MOS_READ,0x01, UART_LSR, &data);  // LSR For Port 2
+        dbg("LSR:%x",data);
+
+        return 0;
+}
+
+static void mos7720_shutdown(struct usb_serial *serial)
+{
+        int i;
+
+        /* free private structure allocated for serial port */
+        for (i=0; i < serial->num_ports; ++i) {
+                kfree(usb_get_serial_port_data(serial->port[i]));
+                usb_set_serial_port_data(serial->port[i], NULL);
+        }
+
+        /* free private structure allocated for serial device */
+        kfree(usb_get_serial_data(serial));
+        usb_set_serial_data(serial, NULL);
+}
+
+static struct usb_serial_driver moschip7720_2port_driver = {
+        .driver = {
+                .owner =        THIS_MODULE,
+                .name =         "moschip7720",
+        },
+        .description            = "Moschip 2 port adapter",
+        .id_table               = moschip_port_id_table,
+        .num_interrupt_in       = 1,
+        .num_bulk_in            = 2,
+        .num_bulk_out           = 2,
+        .num_ports              = 2,
+        .open                   = mos7720_open,
+        .close                  = mos7720_close,
+        .throttle               = mos7720_throttle,
+        .unthrottle             = mos7720_unthrottle,
+        .attach                 = mos7720_startup,
+        .shutdown               = mos7720_shutdown,
+        .ioctl                  = mos7720_ioctl,
+        .set_termios            = mos7720_set_termios,
+        .write                  = mos7720_write,
+        .write_room             = mos7720_write_room,
+        .chars_in_buffer        = mos7720_chars_in_buffer,
+        .break_ctl              = mos7720_break,
+        .read_bulk_callback     = mos7720_bulk_in_callback,
+};
+
+static struct usb_driver usb_driver = {
+        .name =         "moschip7720",
+        .probe =        usb_serial_probe,
+        .disconnect =   usb_serial_disconnect,
+        .id_table =     moschip_port_id_table,
+};
+
+static int __init moschip7720_init(void)
+{
+        int retval;
+
+        dbg("%s: Entering ..........", __FUNCTION__);
+
+        /* Register with the usb serial */
+        retval = usb_serial_register(&moschip7720_2port_driver);
+        if (retval)
+                goto failed_port_device_register;
+
+        info(DRIVER_DESC " " DRIVER_VERSION);
+
+        /* Register with the usb */
+        retval = usb_register(&usb_driver);
+        if (retval)
+                goto failed_usb_register;
+
+        return 0;
+
+failed_usb_register:
+        usb_serial_deregister(&moschip7720_2port_driver);
+
+failed_port_device_register:
+        return retval;
+}
+
+static void __exit moschip7720_exit(void)
+{
+        usb_deregister(&usb_driver);
+        usb_serial_deregister(&moschip7720_2port_driver);
+}
+
+module_init(moschip7720_init);
+module_exit(moschip7720_exit);
+
+/* Module information */
+MODULE_AUTHOR( DRIVER_AUTHOR );
+MODULE_DESCRIPTION( DRIVER_DESC );
+MODULE_LICENSE("GPL");
+
+module_param(debug, bool, S_IRUGO | S_IWUSR);
+MODULE_PARM_DESC(debug, "Debug enabled or not");
diff --git a/drivers/usb/serial/mos7840.c b/drivers/usb/serial/mos7840.c
index 021be39fe16e..5b71962d0351 100644
--- a/drivers/usb/serial/mos7840.c
+++ b/drivers/usb/serial/mos7840.c
@@ -2413,11 +2413,12 @@ static int mos7840_ioctl(struct usb_serial_port *port, struct file *file,
         }
 
         mos7840_port = mos7840_get_port_private(port);
-        tty = mos7840_port->port->tty;
 
         if (mos7840_port == NULL)
                 return -1;
 
+        tty = mos7840_port->port->tty;
+
         dbg("%s - port %d, cmd = 0x%x", __FUNCTION__, port->number, cmd);
 
         switch (cmd) {
diff --git a/drivers/usb/serial/sierra.c b/drivers/usb/serial/sierra.c
index d29638daa987..ea16572d19f8 100644
--- a/drivers/usb/serial/sierra.c
+++ b/drivers/usb/serial/sierra.c
@@ -1,21 +1,35 @@
 /*
- * Sierra Wireless CDMA Wireless Serial USB driver
- *
- * Current Copy modified by: Kevin Lloyd <linux@sierrawireless.com>
- * Original Copyright (C) 2005-2006 Greg Kroah-Hartman <gregkh@suse.de>
- *
- *      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.
- */
+  USB Driver for Sierra Wireless
+
+  Copyright (C) 2006  Kevin Lloyd <linux@sierrawireless.com>
+
+  IMPORTANT DISCLAIMER: This driver is not commercially supported by
+  Sierra Wireless. Use at your own risk.
+
+  This driver is free software; you can redistribute it and/or modify
+  it under the terms of Version 2 of the GNU General Public License as
+  published by the Free Software Foundation.
+
+  Portions based on the option driver by Matthias Urlichs <smurf@smurf.noris.de>
+  Whom based his on the Keyspan driver by Hugh Blemings <hugh@blemings.org>
+
+  History:
+*/
+
+#define DRIVER_VERSION "v.1.0.5"
+#define DRIVER_AUTHOR "Kevin Lloyd <linux@sierrawireless.com>"
+#define DRIVER_DESC "USB Driver for Sierra Wireless USB modems"
 
 #include <linux/kernel.h>
-#include <linux/init.h>
+#include <linux/jiffies.h>
+#include <linux/errno.h>
 #include <linux/tty.h>
+#include <linux/tty_flip.h>
 #include <linux/module.h>
 #include <linux/usb.h>
 #include <linux/usb/serial.h>
 
+
 static struct usb_device_id id_table [] = {
         { USB_DEVICE(0x1199, 0x0018) }, /* Sierra Wireless MC5720 */
         { USB_DEVICE(0x1199, 0x0020) }, /* Sierra Wireless MC5725 */
@@ -23,53 +37,674 @@ static struct usb_device_id id_table [] = {
         { USB_DEVICE(0x1199, 0x0019) }, /* Sierra Wireless AirCard 595 */
         { USB_DEVICE(0x1199, 0x6802) }, /* Sierra Wireless MC8755 */
         { USB_DEVICE(0x1199, 0x6803) }, /* Sierra Wireless MC8765 */
+        { USB_DEVICE(0x1199, 0x6804) }, /* Sierra Wireless MC8755 for Europe */
         { USB_DEVICE(0x1199, 0x6812) }, /* Sierra Wireless MC8775 */
         { USB_DEVICE(0x1199, 0x6820) }, /* Sierra Wireless AirCard 875 */
-        /* Following devices are supported in the airprime.c driver */
-        /* { USB_DEVICE(0x1199, 0x0112) }, */   /* Sierra Wireless AirCard 580 */
-        /* { USB_DEVICE(0x0F3D, 0x0112) }, */   /* AirPrime/Sierra PC 5220 */
+
+        { USB_DEVICE(0x1199, 0x0112) }, /* Sierra Wireless AirCard 580 */
+        { USB_DEVICE(0x0F3D, 0x0112) }, /* AirPrime/Sierra PC 5220 */
         { }
 };
 MODULE_DEVICE_TABLE(usb, id_table);
 
+static struct usb_device_id id_table_1port [] = {
+        { USB_DEVICE(0x1199, 0x0112) }, /* Sierra Wireless AirCard 580 */
+        { USB_DEVICE(0x0F3D, 0x0112) }, /* AirPrime/Sierra PC 5220 */
+        { }
+};
+
+static struct usb_device_id id_table_3port [] = {
+        { USB_DEVICE(0x1199, 0x0018) }, /* Sierra Wireless MC5720 */
+        { USB_DEVICE(0x1199, 0x0020) }, /* Sierra Wireless MC5725 */
+        { USB_DEVICE(0x1199, 0x0017) }, /* Sierra Wireless EM5625 */
+        { USB_DEVICE(0x1199, 0x0019) }, /* Sierra Wireless AirCard 595 */
+        { USB_DEVICE(0x1199, 0x6802) }, /* Sierra Wireless MC8755 */
+        { USB_DEVICE(0x1199, 0x6803) }, /* Sierra Wireless MC8765 */
+        { USB_DEVICE(0x1199, 0x6812) }, /* Sierra Wireless MC8775 */
+        { USB_DEVICE(0x1199, 0x6820) }, /* Sierra Wireless AirCard 875 */
+        { }
+};
+
 static struct usb_driver sierra_driver = {
-        .name =         "sierra_wireless",
-        .probe =        usb_serial_probe,
-        .disconnect =   usb_serial_disconnect,
-        .id_table =     id_table,
+        .name       = "sierra",
+        .probe      = usb_serial_probe,
+        .disconnect = usb_serial_disconnect,
+        .id_table   = id_table,
+        .no_dynamic_id =        1,
+};
+
+
+static int debug;
+
+/* per port private data */
+#define N_IN_URB        4
+#define N_OUT_URB       1
+#define IN_BUFLEN       4096
+#define OUT_BUFLEN      128
+
+struct sierra_port_private {
+        /* Input endpoints and buffer for this port */
+        struct urb *in_urbs[N_IN_URB];
+        char in_buffer[N_IN_URB][IN_BUFLEN];
+        /* Output endpoints and buffer for this port */
+        struct urb *out_urbs[N_OUT_URB];
+        char out_buffer[N_OUT_URB][OUT_BUFLEN];
+
+        /* Settings for the port */
+        int rts_state;  /* Handshaking pins (outputs) */
+        int dtr_state;
+        int cts_state;  /* Handshaking pins (inputs) */
+        int dsr_state;
+        int dcd_state;
+        int ri_state;
+
+        unsigned long tx_start_time[N_OUT_URB];
+};
+
+static int sierra_send_setup(struct usb_serial_port *port)
+{
+        struct usb_serial *serial = port->serial;
+        struct sierra_port_private *portdata;
+
+        dbg("%s", __FUNCTION__);
+
+        portdata = usb_get_serial_port_data(port);
+
+        if (port->tty) {
+                int val = 0;
+                if (portdata->dtr_state)
+                        val |= 0x01;
+                if (portdata->rts_state)
+                        val |= 0x02;
+
+                return usb_control_msg(serial->dev,
+                                usb_rcvctrlpipe(serial->dev, 0),
+                                0x22,0x21,val,0,NULL,0,USB_CTRL_SET_TIMEOUT);
+        }
+
+        return 0;
+}
+
+static void sierra_rx_throttle(struct usb_serial_port *port)
+{
+        dbg("%s", __FUNCTION__);
+}
+
+static void sierra_rx_unthrottle(struct usb_serial_port *port)
+{
+        dbg("%s", __FUNCTION__);
+}
+
+static void sierra_break_ctl(struct usb_serial_port *port, int break_state)
+{
+        /* Unfortunately, I don't know how to send a break */
+        dbg("%s", __FUNCTION__);
+}
+
+static void sierra_set_termios(struct usb_serial_port *port,
+                        struct termios *old_termios)
+{
+        dbg("%s", __FUNCTION__);
+
+        sierra_send_setup(port);
+}
+
+static int sierra_tiocmget(struct usb_serial_port *port, struct file *file)
+{
+        unsigned int value;
+        struct sierra_port_private *portdata;
+
+        portdata = usb_get_serial_port_data(port);
+
+        value = ((portdata->rts_state) ? TIOCM_RTS : 0) |
+                ((portdata->dtr_state) ? TIOCM_DTR : 0) |
+                ((portdata->cts_state) ? TIOCM_CTS : 0) |
+                ((portdata->dsr_state) ? TIOCM_DSR : 0) |
+                ((portdata->dcd_state) ? TIOCM_CAR : 0) |
+                ((portdata->ri_state) ? TIOCM_RNG : 0);
+
+        return value;
+}
+
+static int sierra_tiocmset(struct usb_serial_port *port, struct file *file,
+                        unsigned int set, unsigned int clear)
+{
+        struct sierra_port_private *portdata;
+
+        portdata = usb_get_serial_port_data(port);
+
+        if (set & TIOCM_RTS)
+                portdata->rts_state = 1;
+        if (set & TIOCM_DTR)
+                portdata->dtr_state = 1;
+
+        if (clear & TIOCM_RTS)
+                portdata->rts_state = 0;
+        if (clear & TIOCM_DTR)
+                portdata->dtr_state = 0;
+        return sierra_send_setup(port);
+}
+
+static int sierra_ioctl(struct usb_serial_port *port, struct file *file,
+                        unsigned int cmd, unsigned long arg)
+{
+        return -ENOIOCTLCMD;
+}
+
+/* Write */
+static int sierra_write(struct usb_serial_port *port,
+                        const unsigned char *buf, int count)
+{
+        struct sierra_port_private *portdata;
+        int i;
+        int left, todo;
+        struct urb *this_urb = NULL; /* spurious */
+        int err;
+
+        portdata = usb_get_serial_port_data(port);
+
+        dbg("%s: write (%d chars)", __FUNCTION__, count);
+
+        i = 0;
+        left = count;
+        for (i=0; left > 0 && i < N_OUT_URB; i++) {
+                todo = left;
+                if (todo > OUT_BUFLEN)
+                        todo = OUT_BUFLEN;
+
+                this_urb = portdata->out_urbs[i];
+                if (this_urb->status == -EINPROGRESS) {
+                        if (time_before(jiffies,
+                                        portdata->tx_start_time[i] + 10 * HZ))
+                                continue;
+                        usb_unlink_urb(this_urb);
+                        continue;
+                }
+                if (this_urb->status != 0)
+                        dbg("usb_write %p failed (err=%d)",
+                                this_urb, this_urb->status);
+
+                dbg("%s: endpoint %d buf %d", __FUNCTION__,
+                        usb_pipeendpoint(this_urb->pipe), i);
+
+                /* send the data */
+                memcpy (this_urb->transfer_buffer, buf, todo);
+                this_urb->transfer_buffer_length = todo;
+
+                this_urb->dev = port->serial->dev;
+                err = usb_submit_urb(this_urb, GFP_ATOMIC);
+                if (err) {
+                        dbg("usb_submit_urb %p (write bulk) failed "
+                                "(%d, has %d)", this_urb,
+                                err, this_urb->status);
+                        continue;
+                }
+                portdata->tx_start_time[i] = jiffies;
+                buf += todo;
+                left -= todo;
+        }
+
+        count -= left;
+        dbg("%s: wrote (did %d)", __FUNCTION__, count);
+        return count;
+}
+
+static void sierra_indat_callback(struct urb *urb)
+{
+        int err;
+        int endpoint;
+        struct usb_serial_port *port;
+        struct tty_struct *tty;
+        unsigned char *data = urb->transfer_buffer;
+
+        dbg("%s: %p", __FUNCTION__, urb);
+
+        endpoint = usb_pipeendpoint(urb->pipe);
+        port = (struct usb_serial_port *) urb->context;
+
+        if (urb->status) {
+                dbg("%s: nonzero status: %d on endpoint %02x.",
+                    __FUNCTION__, urb->status, endpoint);
+        } else {
+                tty = port->tty;
+                if (urb->actual_length) {
+                        tty_buffer_request_room(tty, urb->actual_length);
+                        tty_insert_flip_string(tty, data, urb->actual_length);
+                        tty_flip_buffer_push(tty);
+                } else {
+                        dbg("%s: empty read urb received", __FUNCTION__);
+                }
+
+                /* Resubmit urb so we continue receiving */
+                if (port->open_count && urb->status != -ESHUTDOWN) {
+                        err = usb_submit_urb(urb, GFP_ATOMIC);
+                        if (err)
+                                printk(KERN_ERR "%s: resubmit read urb failed. "
+                                        "(%d)", __FUNCTION__, err);
+                }
+        }
+        return;
+}
+
+static void sierra_outdat_callback(struct urb *urb)
+{
+        struct usb_serial_port *port;
+
+        dbg("%s", __FUNCTION__);
+
+        port = (struct usb_serial_port *) urb->context;
+
+        usb_serial_port_softint(port);
+}
+
+static void sierra_instat_callback(struct urb *urb)
+{
+        int err;
+        struct usb_serial_port *port = (struct usb_serial_port *) urb->context;
+        struct sierra_port_private *portdata = usb_get_serial_port_data(port);
+        struct usb_serial *serial = port->serial;
+
+        dbg("%s", __FUNCTION__);
+        dbg("%s: urb %p port %p has data %p", __FUNCTION__,urb,port,portdata);
+
+        if (urb->status == 0) {
+                struct usb_ctrlrequest *req_pkt =
+                                (struct usb_ctrlrequest *)urb->transfer_buffer;
+
+                if (!req_pkt) {
+                        dbg("%s: NULL req_pkt\n", __FUNCTION__);
+                        return;
+                }
+                if ((req_pkt->bRequestType == 0xA1) &&
+                                (req_pkt->bRequest == 0x20)) {
+                        int old_dcd_state;
+                        unsigned char signals = *((unsigned char *)
+                                        urb->transfer_buffer +
+                                        sizeof(struct usb_ctrlrequest));
+
+                        dbg("%s: signal x%x", __FUNCTION__, signals);
+
+                        old_dcd_state = portdata->dcd_state;
+                        portdata->cts_state = 1;
+                        portdata->dcd_state = ((signals & 0x01) ? 1 : 0);
+                        portdata->dsr_state = ((signals & 0x02) ? 1 : 0);
+                        portdata->ri_state = ((signals & 0x08) ? 1 : 0);
+
+                        if (port->tty && !C_CLOCAL(port->tty) &&
+                                        old_dcd_state && !portdata->dcd_state)
+                                tty_hangup(port->tty);
+                } else {
+                        dbg("%s: type %x req %x", __FUNCTION__,
+                                req_pkt->bRequestType,req_pkt->bRequest);
+                }
+        } else
+                dbg("%s: error %d", __FUNCTION__, urb->status);
+
+        /* Resubmit urb so we continue receiving IRQ data */
+        if (urb->status != -ESHUTDOWN) {
+                urb->dev = serial->dev;
+                err = usb_submit_urb(urb, GFP_ATOMIC);
+                if (err)
+                        dbg("%s: resubmit intr urb failed. (%d)",
+                                __FUNCTION__, err);
+        }
+}
+
+static int sierra_write_room(struct usb_serial_port *port)
+{
+        struct sierra_port_private *portdata;
+        int i;
+        int data_len = 0;
+        struct urb *this_urb;
+
+        portdata = usb_get_serial_port_data(port);
+
+        for (i=0; i < N_OUT_URB; i++) {
+                this_urb = portdata->out_urbs[i];
+                if (this_urb && this_urb->status != -EINPROGRESS)
+                        data_len += OUT_BUFLEN;
+        }
+
+        dbg("%s: %d", __FUNCTION__, data_len);
+        return data_len;
+}
+
+static int sierra_chars_in_buffer(struct usb_serial_port *port)
+{
+        struct sierra_port_private *portdata;
+        int i;
+        int data_len = 0;
+        struct urb *this_urb;
+
+        portdata = usb_get_serial_port_data(port);
+
+        for (i=0; i < N_OUT_URB; i++) {
+                this_urb = portdata->out_urbs[i];
+                if (this_urb && this_urb->status == -EINPROGRESS)
+                        data_len += this_urb->transfer_buffer_length;
+        }
+        dbg("%s: %d", __FUNCTION__, data_len);
+        return data_len;
+}
+
+static int sierra_open(struct usb_serial_port *port, struct file *filp)
+{
+        struct sierra_port_private *portdata;
+        struct usb_serial *serial = port->serial;
+        int i, err;
+        struct urb *urb;
+
+        portdata = usb_get_serial_port_data(port);
+
+        dbg("%s", __FUNCTION__);
+
+        /* Set some sane defaults */
+        portdata->rts_state = 1;
+        portdata->dtr_state = 1;
+
+        /* Reset low level data toggle and start reading from endpoints */
+        for (i = 0; i < N_IN_URB; i++) {
+                urb = portdata->in_urbs[i];
+                if (! urb)
+                        continue;
+                if (urb->dev != serial->dev) {
+                        dbg("%s: dev %p != %p", __FUNCTION__,
+                                urb->dev, serial->dev);
+                        continue;
+                }
+
+                /*
+                 * make sure endpoint data toggle is synchronized with the
+                 * device
+                 */
+                usb_clear_halt(urb->dev, urb->pipe);
+
+                err = usb_submit_urb(urb, GFP_KERNEL);
+                if (err) {
+                        dbg("%s: submit urb %d failed (%d) %d",
+                                __FUNCTION__, i, err,
+                                urb->transfer_buffer_length);
+                }
+        }
+
+        /* Reset low level data toggle on out endpoints */
+        for (i = 0; i < N_OUT_URB; i++) {
+                urb = portdata->out_urbs[i];
+                if (! urb)
+                        continue;
+                urb->dev = serial->dev;
+                /* usb_settoggle(urb->dev, usb_pipeendpoint(urb->pipe),
+                                usb_pipeout(urb->pipe), 0); */
+        }
+
+        port->tty->low_latency = 1;
+
+        sierra_send_setup(port);
+
+        return (0);
+}
+
+static inline void stop_urb(struct urb *urb)
+{
+        if (urb && urb->status == -EINPROGRESS)
+                usb_kill_urb(urb);
+}
+
+static void sierra_close(struct usb_serial_port *port, struct file *filp)
+{
+        int i;
+        struct usb_serial *serial = port->serial;
+        struct sierra_port_private *portdata;
+
+        dbg("%s", __FUNCTION__);
+        portdata = usb_get_serial_port_data(port);
+
+        portdata->rts_state = 0;
+        portdata->dtr_state = 0;
+
+        if (serial->dev) {
+                sierra_send_setup(port);
+
+                /* Stop reading/writing urbs */
+                for (i = 0; i < N_IN_URB; i++)
+                        stop_urb(portdata->in_urbs[i]);
+                for (i = 0; i < N_OUT_URB; i++)
+                        stop_urb(portdata->out_urbs[i]);
+        }
+        port->tty = NULL;
+}
+
+/* Helper functions used by sierra_setup_urbs */
+static struct urb *sierra_setup_urb(struct usb_serial *serial, int endpoint,
+                                    int dir, void *ctx, char *buf, int len,
+                                    usb_complete_t callback)
+{
+        struct urb *urb;
+
+        if (endpoint == -1)
+                return NULL;            /* endpoint not needed */
+
+        urb = usb_alloc_urb(0, GFP_KERNEL);             /* No ISO */
+        if (urb == NULL) {
+                dbg("%s: alloc for endpoint %d failed.", __FUNCTION__, endpoint);
+                return NULL;
+        }
+
+                /* Fill URB using supplied data. */
+        usb_fill_bulk_urb(urb, serial->dev,
+                      usb_sndbulkpipe(serial->dev, endpoint) | dir,
+                      buf, len, callback, ctx);
+
+        return urb;
+}
+
+/* Setup urbs */
+static void sierra_setup_urbs(struct usb_serial *serial)
+{
+        int i,j;
+        struct usb_serial_port *port;
+        struct sierra_port_private *portdata;
+
+        dbg("%s", __FUNCTION__);
+
+        for (i = 0; i < serial->num_ports; i++) {
+                port = serial->port[i];
+                portdata = usb_get_serial_port_data(port);
+
+        /* Do indat endpoints first */
+                for (j = 0; j < N_IN_URB; ++j) {
+                        portdata->in_urbs[j] = sierra_setup_urb (serial,
+                        port->bulk_in_endpointAddress, USB_DIR_IN, port,
+                        portdata->in_buffer[j], IN_BUFLEN, sierra_indat_callback);
+                }
+
+                /* outdat endpoints */
+                for (j = 0; j < N_OUT_URB; ++j) {
+                        portdata->out_urbs[j] = sierra_setup_urb (serial,
+                        port->bulk_out_endpointAddress, USB_DIR_OUT, port,
+                        portdata->out_buffer[j], OUT_BUFLEN, sierra_outdat_callback);
+                }
+        }
+}
+
+static int sierra_startup(struct usb_serial *serial)
+{
+        int i, err;
+        struct usb_serial_port *port;
+        struct sierra_port_private *portdata;
+
+        dbg("%s", __FUNCTION__);
+
+        /* Now setup per port private data */
+        for (i = 0; i < serial->num_ports; i++) {
+                port = serial->port[i];
+                portdata = kzalloc(sizeof(*portdata), GFP_KERNEL);
+                if (!portdata) {
+                        dbg("%s: kmalloc for sierra_port_private (%d) failed!.",
+                                        __FUNCTION__, i);
+                        return (1);
+                }
+
+                usb_set_serial_port_data(port, portdata);
+
+                if (! port->interrupt_in_urb)
+                        continue;
+                err = usb_submit_urb(port->interrupt_in_urb, GFP_KERNEL);
+                if (err)
+                        dbg("%s: submit irq_in urb failed %d",
+                                __FUNCTION__, err);
+        }
+
+        sierra_setup_urbs(serial);
+
+        return (0);
+}
+
+static void sierra_shutdown(struct usb_serial *serial)
+{
+        int i, j;
+        struct usb_serial_port *port;
+        struct sierra_port_private *portdata;
+
+        dbg("%s", __FUNCTION__);
+
+        /* Stop reading/writing urbs */
+        for (i = 0; i < serial->num_ports; ++i) {
+                port = serial->port[i];
+                portdata = usb_get_serial_port_data(port);
+                for (j = 0; j < N_IN_URB; j++)
+                        stop_urb(portdata->in_urbs[j]);
+                for (j = 0; j < N_OUT_URB; j++)
+                        stop_urb(portdata->out_urbs[j]);
+        }
+
+        /* Now free them */
+        for (i = 0; i < serial->num_ports; ++i) {
+                port = serial->port[i];
+                portdata = usb_get_serial_port_data(port);
+
+                for (j = 0; j < N_IN_URB; j++) {
+                        if (portdata->in_urbs[j]) {
+                                usb_free_urb(portdata->in_urbs[j]);
+                                portdata->in_urbs[j] = NULL;
+                        }
+                }
+                for (j = 0; j < N_OUT_URB; j++) {
+                        if (portdata->out_urbs[j]) {
+                                usb_free_urb(portdata->out_urbs[j]);
+                                portdata->out_urbs[j] = NULL;
+                        }
+                }
+        }
+
+        /* Now free per port private data */
+        for (i = 0; i < serial->num_ports; i++) {
+                port = serial->port[i];
+                kfree(usb_get_serial_port_data(port));
+        }
+}
+
+static struct usb_serial_driver sierra_1port_device = {
+        .driver = {
+                .owner =        THIS_MODULE,
+                .name =         "sierra1",
+        },
+        .description       = "Sierra USB modem (1 port)",
+        .id_table          = id_table_1port,
+        .num_interrupt_in  = NUM_DONT_CARE,
+        .num_bulk_in       = 1,
+        .num_bulk_out      = 1,
+        .num_ports         = 1,
+        .open              = sierra_open,
+        .close             = sierra_close,
+        .write             = sierra_write,
+        .write_room        = sierra_write_room,
+        .chars_in_buffer   = sierra_chars_in_buffer,
+        .throttle          = sierra_rx_throttle,
+        .unthrottle        = sierra_rx_unthrottle,
+        .ioctl             = sierra_ioctl,
+        .set_termios       = sierra_set_termios,
+        .break_ctl         = sierra_break_ctl,
+        .tiocmget          = sierra_tiocmget,
+        .tiocmset          = sierra_tiocmset,
+        .attach            = sierra_startup,
+        .shutdown          = sierra_shutdown,
+        .read_int_callback = sierra_instat_callback,
 };
 
-static struct usb_serial_driver sierra_device = {
+static struct usb_serial_driver sierra_3port_device = {
         .driver = {
-        .owner =                THIS_MODULE,
-        .name =                 "Sierra_Wireless",
+                .owner =        THIS_MODULE,
+                .name =         "sierra3",
         },
-        .id_table =             id_table,
-        .num_interrupt_in =     NUM_DONT_CARE,
-        .num_bulk_in =          NUM_DONT_CARE,
-        .num_bulk_out =         NUM_DONT_CARE,
-        .num_ports =            3,
+        .description       = "Sierra USB modem (3 port)",
+        .id_table          = id_table_3port,
+        .num_interrupt_in  = NUM_DONT_CARE,
+        .num_bulk_in       = 3,
+        .num_bulk_out      = 3,
+        .num_ports         = 3,
+        .open              = sierra_open,
+        .close             = sierra_close,
+        .write             = sierra_write,
+        .write_room        = sierra_write_room,
+        .chars_in_buffer   = sierra_chars_in_buffer,
+        .throttle          = sierra_rx_throttle,
+        .unthrottle        = sierra_rx_unthrottle,
+        .ioctl             = sierra_ioctl,
+        .set_termios       = sierra_set_termios,
+        .break_ctl         = sierra_break_ctl,
+        .tiocmget          = sierra_tiocmget,
+        .tiocmset          = sierra_tiocmset,
+        .attach            = sierra_startup,
+        .shutdown          = sierra_shutdown,
+        .read_int_callback = sierra_instat_callback,
 };
 
+/* Functions used by new usb-serial code. */
 static int __init sierra_init(void)
 {
         int retval;
-
-        retval = usb_serial_register(&sierra_device);
+        retval = usb_serial_register(&sierra_1port_device);
+        if (retval)
+                goto failed_1port_device_register;
+        retval = usb_serial_register(&sierra_3port_device);
         if (retval)
-                return retval;
+                goto failed_3port_device_register;
+
+
         retval = usb_register(&sierra_driver);
         if (retval)
-                usb_serial_deregister(&sierra_device);
+                goto failed_driver_register;
+
+        info(DRIVER_DESC ": " DRIVER_VERSION);
+
+        return 0;
+
+failed_driver_register:
+        usb_serial_deregister(&sierra_3port_device);
+failed_3port_device_register:
+        usb_serial_deregister(&sierra_1port_device);
+failed_1port_device_register:
         return retval;
 }
 
 static void __exit sierra_exit(void)
 {
-        usb_deregister(&sierra_driver);
-        usb_serial_deregister(&sierra_device);
+        usb_deregister (&sierra_driver);
+        usb_serial_deregister(&sierra_1port_device);
+        usb_serial_deregister(&sierra_3port_device);
 }
 
 module_init(sierra_init);
 module_exit(sierra_exit);
+
+MODULE_AUTHOR(DRIVER_AUTHOR);
+MODULE_DESCRIPTION(DRIVER_DESC);
+MODULE_VERSION(DRIVER_VERSION);
 MODULE_LICENSE("GPL");
+
+#ifdef CONFIG_USB_DEBUG
+module_param(debug, bool, S_IRUGO | S_IWUSR);
+MODULE_PARM_DESC(debug, "Debug messages");
+#endif
+
diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
index c9a8d50106d1..37ed8e0f2dc8 100644
--- a/drivers/usb/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h
@@ -55,7 +55,8 @@ UNUSUAL_DEV(  0x03eb, 0x2002, 0x0100, 0x0100,
                 US_SC_DEVICE, US_PR_DEVICE, NULL,
                 US_FL_IGNORE_RESIDUE),
 
-UNUSUAL_DEV(  0x03ee, 0x6901, 0x0000, 0x0100,
+/* modified by Tobias Lorenz <tobias.lorenz@gmx.net> */
+UNUSUAL_DEV(  0x03ee, 0x6901, 0x0000, 0x0200,
                 "Mitsumi",
                 "USB FDD",
                 US_SC_DEVICE, US_PR_DEVICE, NULL,
@@ -182,6 +183,20 @@ UNUSUAL_DEV(  0x0421, 0x044e, 0x0100, 0x0100,
                 US_SC_DEVICE, US_PR_DEVICE, NULL,
                 US_FL_IGNORE_RESIDUE | US_FL_FIX_CAPACITY ),
 
+/* Reported by Bardur Arantsson <bardur@scientician.net> */
+UNUSUAL_DEV(  0x0421, 0x047c, 0x0370, 0x0370,
+                "Nokia",
+                "6131",
+                US_SC_DEVICE, US_PR_DEVICE, NULL,
+                US_FL_MAX_SECTORS_64 ),
+
+/* Reported by Alex Corcoles <alex@corcoles.net> */
+UNUSUAL_DEV(  0x0421, 0x0495, 0x0370, 0x0370,
+                "Nokia",
+                "6234",
+                US_SC_DEVICE, US_PR_DEVICE, NULL,
+                US_FL_MAX_SECTORS_64 ),
+
 /* Reported by Olaf Hering <olh@suse.de> from novell bug #105878 */
 UNUSUAL_DEV(  0x0424, 0x0fdc, 0x0210, 0x0210,
                 "SMSC",
@@ -1291,6 +1306,13 @@ UNUSUAL_DEV(  0x0fce, 0xe030, 0x0000, 0x0000,
                 US_SC_DEVICE, US_PR_DEVICE, NULL,
                 US_FL_FIX_CAPACITY ),
 
+/* Reported by Jan Mate <mate@fiit.stuba.sk> */
+UNUSUAL_DEV(  0x0fce, 0xe030, 0x0000, 0x0000,
+                "Sony Ericsson",
+                "P990i",
+                US_SC_DEVICE, US_PR_DEVICE, NULL,
+                US_FL_FIX_CAPACITY ),
+
 /* Reported by Kevin Cernekee <kpc-usbdev@gelato.uiuc.edu>
  * Tested on hardware version 1.10.
  * Entry is needed only for the initializer function override.
diff --git a/drivers/video/controlfb.c b/drivers/video/controlfb.c
index 8cc6c0e2d27a..04c6d928189b 100644
--- a/drivers/video/controlfb.c
+++ b/drivers/video/controlfb.c
@@ -415,13 +415,15 @@ static int __init init_control(struct fb_info_control *p)
         full = p->total_vram == 0x400000;
 
         /* Try to pick a video mode out of NVRAM if we have one. */
+#ifdef CONFIG_NVRAM
         if (default_cmode == CMODE_NVRAM){
                 cmode = nvram_read_byte(NV_CMODE);
                 if(cmode < CMODE_8 || cmode > CMODE_32)
                         cmode = CMODE_8;
         } else
+#endif
                 cmode=default_cmode;
-
+#ifdef CONFIG_NVRAM
         if (default_vmode == VMODE_NVRAM) {
                 vmode = nvram_read_byte(NV_VMODE);
                 if (vmode < 1 || vmode > VMODE_MAX ||
@@ -432,7 +434,9 @@ static int __init init_control(struct fb_info_control *p)
                         if (control_mac_modes[vmode - 1].m[full] < cmode)
                                 vmode = VMODE_640_480_60;
                 }
-        } else {
+        } else
+#endif
+        {
                 vmode=default_vmode;
                 if (control_mac_modes[vmode - 1].m[full] < cmode) {
                         if (cmode > CMODE_8)
diff --git a/drivers/video/igafb.c b/drivers/video/igafb.c
index 67f384f86758..e6df492c22a5 100644
--- a/drivers/video/igafb.c
+++ b/drivers/video/igafb.c
@@ -573,3 +573,10 @@ int __init igafb_setup(char *options)
 
 module_init(igafb_init);
 MODULE_LICENSE("GPL");
+static struct pci_device_id igafb_pci_tbl[] __devinitdata = {
+        { PCI_VENDOR_ID_INTERG, PCI_DEVICE_ID_INTERG_1682,
+          PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+        { }
+};
+
+MODULE_DEVICE_TABLE(pci, igafb_pci_tbl);
diff --git a/drivers/video/platinumfb.c b/drivers/video/platinumfb.c
index 983be3ec2345..fdb33cd21a27 100644
--- a/drivers/video/platinumfb.c
+++ b/drivers/video/platinumfb.c
@@ -339,11 +339,12 @@ static int __devinit platinum_init_fb(struct fb_info *info)
 
         sense = read_platinum_sense(pinfo);
         printk(KERN_INFO "platinumfb: Monitor sense value = 0x%x, ", sense);
-
         if (default_vmode == VMODE_NVRAM) {
+#ifdef CONFIG_NVRAM
                 default_vmode = nvram_read_byte(NV_VMODE);
                 if (default_vmode <= 0 || default_vmode > VMODE_MAX ||
                     !platinum_reg_init[default_vmode-1])
+#endif
                         default_vmode = VMODE_CHOOSE;
         }
         if (default_vmode == VMODE_CHOOSE) {
@@ -351,8 +352,10 @@ static int __devinit platinum_init_fb(struct fb_info *info)
         }
         if (default_vmode <= 0 || default_vmode > VMODE_MAX)
                 default_vmode = VMODE_640_480_60;
+#ifdef CONFIG_NVRAM
         if (default_cmode == CMODE_NVRAM)
                 default_cmode = nvram_read_byte(NV_CMODE);
+#endif
         if (default_cmode < CMODE_8 || default_cmode > CMODE_32)
                 default_cmode = CMODE_8;
         /*
diff --git a/drivers/video/valkyriefb.c b/drivers/video/valkyriefb.c
index 47f27924a7d7..06fc19a61192 100644
--- a/drivers/video/valkyriefb.c
+++ b/drivers/video/valkyriefb.c
@@ -284,7 +284,7 @@ static void __init valkyrie_choose_mode(struct fb_info_valkyrie *p)
         printk(KERN_INFO "Monitor sense value = 0x%x\n", p->sense);
 
         /* Try to pick a video mode out of NVRAM if we have one. */
-#ifndef CONFIG_MAC
+#if !defined(CONFIG_MAC) && defined(CONFIG_NVRAM)
         if (default_vmode == VMODE_NVRAM) {
                 default_vmode = nvram_read_byte(NV_VMODE);
                 if (default_vmode <= 0
@@ -297,7 +297,7 @@ static void __init valkyrie_choose_mode(struct fb_info_valkyrie *p)
                 default_vmode = mac_map_monitor_sense(p->sense);
         if (!valkyrie_reg_init[default_vmode - 1])
                 default_vmode = VMODE_640_480_67;
-#ifndef CONFIG_MAC
+#if !defined(CONFIG_MAC) && defined(CONFIG_NVRAM)
         if (default_cmode == CMODE_NVRAM)
                 default_cmode = nvram_read_byte(NV_CMODE);
 #endif
diff --git a/drivers/w1/Kconfig b/drivers/w1/Kconfig
index 27c9d05d03ef..c287a9ae4fdd 100644
--- a/drivers/w1/Kconfig
+++ b/drivers/w1/Kconfig
@@ -2,7 +2,6 @@ menu "Dallas's 1-wire bus"
 
 config W1
         tristate "Dallas's 1-wire support"
-        depends on CONNECTOR
         ---help---
           Dallas' 1-wire bus is useful to connect slow 1-pin devices
           such as iButtons and thermal sensors.