329 files changed, 4993 insertions, 3469 deletions

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 087a7028ae84..b9f923ef173d 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -50,7 +50,6 @@ config ACPI_SLEEP
 config ACPI_PROCFS
         bool "Deprecated /proc/acpi files"
         depends on PROC_FS
-        default y
         ---help---
           For backwards compatibility, this option allows
           deprecated /proc/acpi/ files to exist, even when
@@ -61,7 +60,6 @@ config ACPI_PROCFS
           /proc/acpi/info (/sys/modules/acpi/parameters/acpica_version)
           /proc/acpi/dsdt (/sys/firmware/acpi/tables/DSDT)
           /proc/acpi/fadt (/sys/firmware/acpi/tables/FACP)
-          /proc/acpi/battery (/sys/class/power_supply)
           /proc/acpi/debug_layer (/sys/module/acpi/parameters/debug_layer)
           /proc/acpi/debug_level (/sys/module/acpi/parameters/debug_level)
 
@@ -69,7 +67,21 @@ config ACPI_PROCFS
           and functions which do not yet exist in /sys.
 
           Say N to delete /proc/acpi/ files that have moved to /sys/
-
+config ACPI_PROCFS_POWER
+        bool "Deprecated power /proc/acpi folders"
+        depends on PROC_FS
+        default y
+        ---help---
+          For backwards compatibility, this option allows
+          deprecated power /proc/acpi/ folders to exist, even when
+          they have been replaced by functions in /sys.
+          The deprecated folders (and their replacements) include:
+          /proc/acpi/battery/* (/sys/class/power_supply/*)
+          /proc/acpi/ac_adapter/* (sys/class/power_supply/*)
+          This option has no effect on /proc/acpi/ folders
+          and functions, which do not yet exist in /sys
+
+          Say N to delete power /proc/acpi/ folders that have moved to /sys/
 config ACPI_PROC_EVENT
         bool "Deprecated /proc/acpi/event support"
         depends on PROC_FS
diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile
index 54e3ab0e5fc0..456446f90077 100644
--- a/drivers/acpi/Makefile
+++ b/drivers/acpi/Makefile
@@ -58,6 +58,6 @@ obj-$(CONFIG_ACPI_NUMA)		+= numa.o
 obj-$(CONFIG_ACPI_ASUS)         += asus_acpi.o
 obj-$(CONFIG_ACPI_TOSHIBA)      += toshiba_acpi.o
 obj-$(CONFIG_ACPI_HOTPLUG_MEMORY)       += acpi_memhotplug.o
-obj-y                           += cm_sbs.o
+obj-$(CONFIG_ACPI_PROCFS_POWER) += cm_sbs.o
 obj-$(CONFIG_ACPI_SBS)          += sbs.o
 obj-$(CONFIG_ACPI_SBS)          += sbshc.o
diff --git a/drivers/acpi/ac.c b/drivers/acpi/ac.c
index 30238f6ff232..76ed4f52bebd 100644
--- a/drivers/acpi/ac.c
+++ b/drivers/acpi/ac.c
@@ -27,7 +27,7 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/types.h>
-#ifdef CONFIG_ACPI_PROCFS
+#ifdef CONFIG_ACPI_PROCFS_POWER
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
 #endif
@@ -51,7 +51,7 @@ MODULE_AUTHOR("Paul Diefenbaugh");
 MODULE_DESCRIPTION("ACPI AC Adapter Driver");
 MODULE_LICENSE("GPL");
 
-#ifdef CONFIG_ACPI_PROCFS
+#ifdef CONFIG_ACPI_PROCFS_POWER
 extern struct proc_dir_entry *acpi_lock_ac_dir(void);
 extern void *acpi_unlock_ac_dir(struct proc_dir_entry *acpi_ac_dir);
 static int acpi_ac_open_fs(struct inode *inode, struct file *file);
@@ -86,7 +86,7 @@ struct acpi_ac {
 
 #define to_acpi_ac(x) container_of(x, struct acpi_ac, charger);
 
-#ifdef CONFIG_ACPI_PROCFS
+#ifdef CONFIG_ACPI_PROCFS_POWER
 static const struct file_operations acpi_ac_fops = {
         .open = acpi_ac_open_fs,
         .read = seq_read,
@@ -136,7 +136,7 @@ static int acpi_ac_get_state(struct acpi_ac *ac)
         return 0;
 }
 
-#ifdef CONFIG_ACPI_PROCFS
+#ifdef CONFIG_ACPI_PROCFS_POWER
 /* --------------------------------------------------------------------------
                               FS Interface (/proc)
    -------------------------------------------------------------------------- */
@@ -275,7 +275,7 @@ static int acpi_ac_add(struct acpi_device *device)
         if (result)
                 goto end;
 
-#ifdef CONFIG_ACPI_PROCFS
+#ifdef CONFIG_ACPI_PROCFS_POWER
         result = acpi_ac_add_fs(device);
 #endif
         if (result)
@@ -300,7 +300,7 @@ static int acpi_ac_add(struct acpi_device *device)
 
       end:
         if (result) {
-#ifdef CONFIG_ACPI_PROCFS
+#ifdef CONFIG_ACPI_PROCFS_POWER
                 acpi_ac_remove_fs(device);
 #endif
                 kfree(ac);
@@ -339,7 +339,7 @@ static int acpi_ac_remove(struct acpi_device *device, int type)
                                             ACPI_ALL_NOTIFY, acpi_ac_notify);
         if (ac->charger.dev)
                 power_supply_unregister(&ac->charger);
-#ifdef CONFIG_ACPI_PROCFS
+#ifdef CONFIG_ACPI_PROCFS_POWER
         acpi_ac_remove_fs(device);
 #endif
 
@@ -355,7 +355,7 @@ static int __init acpi_ac_init(void)
         if (acpi_disabled)
                 return -ENODEV;
 
-#ifdef CONFIG_ACPI_PROCFS
+#ifdef CONFIG_ACPI_PROCFS_POWER
         acpi_ac_dir = acpi_lock_ac_dir();
         if (!acpi_ac_dir)
                 return -ENODEV;
@@ -363,7 +363,7 @@ static int __init acpi_ac_init(void)
 
         result = acpi_bus_register_driver(&acpi_ac_driver);
         if (result < 0) {
-#ifdef CONFIG_ACPI_PROCFS
+#ifdef CONFIG_ACPI_PROCFS_POWER
                 acpi_unlock_ac_dir(acpi_ac_dir);
 #endif
                 return -ENODEV;
@@ -377,7 +377,7 @@ static void __exit acpi_ac_exit(void)
 
         acpi_bus_unregister_driver(&acpi_ac_driver);
 
-#ifdef CONFIG_ACPI_PROCFS
+#ifdef CONFIG_ACPI_PROCFS_POWER
         acpi_unlock_ac_dir(acpi_ac_dir);
 #endif
 
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index 192c244f6190..8f7505d304b5 100644
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -31,7 +31,7 @@
 #include <linux/types.h>
 #include <linux/jiffies.h>
 
-#ifdef CONFIG_ACPI_PROCFS
+#ifdef CONFIG_ACPI_PROCFS_POWER
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
 #include <asm/uaccess.h>
@@ -63,7 +63,7 @@ static unsigned int cache_time = 1000;
 module_param(cache_time, uint, 0644);
 MODULE_PARM_DESC(cache_time, "cache time in milliseconds");
 
-#ifdef CONFIG_ACPI_PROCFS
+#ifdef CONFIG_ACPI_PROCFS_POWER
 extern struct proc_dir_entry *acpi_lock_battery_dir(void);
 extern void *acpi_unlock_battery_dir(struct proc_dir_entry *acpi_battery_dir);
 
@@ -125,7 +125,7 @@ static int acpi_battery_technology(struct acpi_battery *battery)
                 return POWER_SUPPLY_TECHNOLOGY_NiMH;
         if (!strcasecmp("LION", battery->type))
                 return POWER_SUPPLY_TECHNOLOGY_LION;
-        if (!strcasecmp("LI-ION", battery->type))
+        if (!strncasecmp("LI-ION", battery->type, 6))
                 return POWER_SUPPLY_TECHNOLOGY_LION;
         if (!strcasecmp("LiP", battery->type))
                 return POWER_SUPPLY_TECHNOLOGY_LIPO;
@@ -153,6 +153,8 @@ static int acpi_battery_get_property(struct power_supply *psy,
                         val->intval = POWER_SUPPLY_STATUS_CHARGING;
                 else if (battery->state == 0)
                         val->intval = POWER_SUPPLY_STATUS_FULL;
+                else
+                        val->intval = POWER_SUPPLY_STATUS_UNKNOWN;
                 break;
         case POWER_SUPPLY_PROP_PRESENT:
                 val->intval = acpi_battery_present(battery);
@@ -221,7 +223,7 @@ static enum power_supply_property energy_battery_props[] = {
         POWER_SUPPLY_PROP_MANUFACTURER,
 };
 
-#ifdef CONFIG_ACPI_PROCFS
+#ifdef CONFIG_ACPI_PROCFS_POWER
 inline char *acpi_battery_units(struct acpi_battery *battery)
 {
         return (battery->power_unit)?"mA":"mW";
@@ -479,7 +481,7 @@ static int acpi_battery_update(struct acpi_battery *battery)
                               FS Interface (/proc)
    -------------------------------------------------------------------------- */
 
-#ifdef CONFIG_ACPI_PROCFS
+#ifdef CONFIG_ACPI_PROCFS_POWER
 static struct proc_dir_entry *acpi_battery_dir;
 
 static int acpi_battery_print_info(struct seq_file *seq, int result)
@@ -786,7 +788,7 @@ static int acpi_battery_add(struct acpi_device *device)
         acpi_driver_data(device) = battery;
         mutex_init(&battery->lock);
         acpi_battery_update(battery);
-#ifdef CONFIG_ACPI_PROCFS
+#ifdef CONFIG_ACPI_PROCFS_POWER
         result = acpi_battery_add_fs(device);
         if (result)
                 goto end;
@@ -804,7 +806,7 @@ static int acpi_battery_add(struct acpi_device *device)
                device->status.battery_present ? "present" : "absent");
       end:
         if (result) {
-#ifdef CONFIG_ACPI_PROCFS
+#ifdef CONFIG_ACPI_PROCFS_POWER
                 acpi_battery_remove_fs(device);
 #endif
                 kfree(battery);
@@ -823,7 +825,7 @@ static int acpi_battery_remove(struct acpi_device *device, int type)
         status = acpi_remove_notify_handler(device->handle,
                                             ACPI_ALL_NOTIFY,
                                             acpi_battery_notify);
-#ifdef CONFIG_ACPI_PROCFS
+#ifdef CONFIG_ACPI_PROCFS_POWER
         acpi_battery_remove_fs(device);
 #endif
         sysfs_remove_battery(battery);
@@ -859,13 +861,13 @@ static int __init acpi_battery_init(void)
 {
         if (acpi_disabled)
                 return -ENODEV;
-#ifdef CONFIG_ACPI_PROCFS
+#ifdef CONFIG_ACPI_PROCFS_POWER
         acpi_battery_dir = acpi_lock_battery_dir();
         if (!acpi_battery_dir)
                 return -ENODEV;
 #endif
         if (acpi_bus_register_driver(&acpi_battery_driver) < 0) {
-#ifdef CONFIG_ACPI_PROCFS
+#ifdef CONFIG_ACPI_PROCFS_POWER
                 acpi_unlock_battery_dir(acpi_battery_dir);
 #endif
                 return -ENODEV;
@@ -876,7 +878,7 @@ static int __init acpi_battery_init(void)
 static void __exit acpi_battery_exit(void)
 {
         acpi_bus_unregister_driver(&acpi_battery_driver);
-#ifdef CONFIG_ACPI_PROCFS
+#ifdef CONFIG_ACPI_PROCFS_POWER
         acpi_unlock_battery_dir(acpi_battery_dir);
 #endif
 }
diff --git a/drivers/acpi/dispatcher/dsobject.c b/drivers/acpi/dispatcher/dsobject.c
index a474ca2334d5..954ac8ce958a 100644
--- a/drivers/acpi/dispatcher/dsobject.c
+++ b/drivers/acpi/dispatcher/dsobject.c
@@ -137,6 +137,71 @@ acpi_ds_build_internal_object(struct acpi_walk_state *walk_state,
                                 return_ACPI_STATUS(status);
                         }
                 }
+
+                /* Special object resolution for elements of a package */
+
+                if ((op->common.parent->common.aml_opcode == AML_PACKAGE_OP) ||
+                    (op->common.parent->common.aml_opcode ==
+                     AML_VAR_PACKAGE_OP)) {
+                        /*
+                         * Attempt to resolve the node to a value before we insert it into
+                         * the package. If this is a reference to a common data type,
+                         * resolve it immediately. According to the ACPI spec, package
+                         * elements can only be "data objects" or method references.
+                         * Attempt to resolve to an Integer, Buffer, String or Package.
+                         * If cannot, return the named reference (for things like Devices,
+                         * Methods, etc.) Buffer Fields and Fields will resolve to simple
+                         * objects (int/buf/str/pkg).
+                         *
+                         * NOTE: References to things like Devices, Methods, Mutexes, etc.
+                         * will remain as named references. This behavior is not described
+                         * in the ACPI spec, but it appears to be an oversight.
+                         */
+                        obj_desc = (union acpi_operand_object *)op->common.node;
+
+                        status =
+                            acpi_ex_resolve_node_to_value(ACPI_CAST_INDIRECT_PTR
+                                                          (struct
+                                                           acpi_namespace_node,
+                                                           &obj_desc),
+                                                          walk_state);
+                        if (ACPI_FAILURE(status)) {
+                                return_ACPI_STATUS(status);
+                        }
+
+                        switch (op->common.node->type) {
+                                /*
+                                 * For these types, we need the actual node, not the subobject.
+                                 * However, the subobject got an extra reference count above.
+                                 */
+                        case ACPI_TYPE_MUTEX:
+                        case ACPI_TYPE_METHOD:
+                        case ACPI_TYPE_POWER:
+                        case ACPI_TYPE_PROCESSOR:
+                        case ACPI_TYPE_EVENT:
+                        case ACPI_TYPE_REGION:
+                        case ACPI_TYPE_DEVICE:
+                        case ACPI_TYPE_THERMAL:
+
+                                obj_desc =
+                                    (union acpi_operand_object *)op->common.
+                                    node;
+                                break;
+
+                        default:
+                                break;
+                        }
+
+                        /*
+                         * If above resolved to an operand object, we are done. Otherwise,
+                         * we have a NS node, we must create the package entry as a named
+                         * reference.
+                         */
+                        if (ACPI_GET_DESCRIPTOR_TYPE(obj_desc) !=
+                            ACPI_DESC_TYPE_NAMED) {
+                                goto exit;
+                        }
+                }
         }
 
         /* Create and init a new internal ACPI object */
@@ -156,6 +221,7 @@ acpi_ds_build_internal_object(struct acpi_walk_state *walk_state,
                 return_ACPI_STATUS(status);
         }
 
+      exit:
         *obj_desc_ptr = obj_desc;
         return_ACPI_STATUS(AE_OK);
 }
@@ -356,12 +422,25 @@ acpi_ds_build_internal_package_obj(struct acpi_walk_state *walk_state,
         arg = arg->common.next;
         for (i = 0; arg && (i < element_count); i++) {
                 if (arg->common.aml_opcode == AML_INT_RETURN_VALUE_OP) {
-
-                        /* This package element is already built, just get it */
-
-                        obj_desc->package.elements[i] =
-                            ACPI_CAST_PTR(union acpi_operand_object,
-                                          arg->common.node);
+                        if (arg->common.node->type == ACPI_TYPE_METHOD) {
+                                /*
+                                 * A method reference "looks" to the parser to be a method
+                                 * invocation, so we special case it here
+                                 */
+                                arg->common.aml_opcode = AML_INT_NAMEPATH_OP;
+                                status =
+                                    acpi_ds_build_internal_object(walk_state,
+                                                                  arg,
+                                                                  &obj_desc->
+                                                                  package.
+                                                                  elements[i]);
+                        } else {
+                                /* This package element is already built, just get it */
+
+                                obj_desc->package.elements[i] =
+                                    ACPI_CAST_PTR(union acpi_operand_object,
+                                                  arg->common.node);
+                        }
                 } else {
                         status = acpi_ds_build_internal_object(walk_state, arg,
                                                                &obj_desc->
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index 06b78e5e33a1..d411017f8c06 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -47,6 +47,9 @@
 #undef PREFIX
 #define PREFIX                          "ACPI: EC: "
 
+/* Uncomment next line to get verbose print outs*/
+/* #define DEBUG */
+
 /* EC status register */
 #define ACPI_EC_FLAG_OBF        0x01    /* Output buffer full */
 #define ACPI_EC_FLAG_IBF        0x02    /* Input buffer full */
@@ -75,7 +78,10 @@ enum {
         EC_FLAGS_WAIT_GPE = 0,          /* Don't check status until GPE arrives */
         EC_FLAGS_QUERY_PENDING,         /* Query is pending */
         EC_FLAGS_GPE_MODE,              /* Expect GPE to be sent for status change */
-        EC_FLAGS_ONLY_IBF_GPE,          /* Expect GPE only for IBF = 0 event */
+        EC_FLAGS_NO_ADDRESS_GPE,        /* Expect GPE only for non-address event */
+        EC_FLAGS_ADDRESS,               /* Address is being written */
+        EC_FLAGS_NO_WDATA_GPE,          /* Don't expect WDATA GPE event */
+        EC_FLAGS_WDATA,                 /* Data is being written */
 };
 
 static int acpi_ec_remove(struct acpi_device *device, int type);
@@ -131,21 +137,27 @@ static struct acpi_ec {
 
 static inline u8 acpi_ec_read_status(struct acpi_ec *ec)
 {
-        return inb(ec->command_addr);
+        u8 x = inb(ec->command_addr);
+        pr_debug(PREFIX "---> status = 0x%2x\n", x);
+        return x;
 }
 
 static inline u8 acpi_ec_read_data(struct acpi_ec *ec)
 {
+        u8 x = inb(ec->data_addr);
+        pr_debug(PREFIX "---> data = 0x%2x\n", x);
         return inb(ec->data_addr);
 }
 
 static inline void acpi_ec_write_cmd(struct acpi_ec *ec, u8 command)
 {
+        pr_debug(PREFIX "<--- command = 0x%2x\n", command);
         outb(command, ec->command_addr);
 }
 
 static inline void acpi_ec_write_data(struct acpi_ec *ec, u8 data)
 {
+        pr_debug(PREFIX "<--- data = 0x%2x\n", data);
         outb(data, ec->data_addr);
 }
 
@@ -166,38 +178,54 @@ static inline int acpi_ec_check_status(struct acpi_ec *ec, enum ec_event event)
 
 static int acpi_ec_wait(struct acpi_ec *ec, enum ec_event event, int force_poll)
 {
+        int ret = 0;
+        if (unlikely(test_bit(EC_FLAGS_ADDRESS, &ec->flags) &&
+                     test_bit(EC_FLAGS_NO_ADDRESS_GPE, &ec->flags)))
+                force_poll = 1;
+        if (unlikely(test_bit(EC_FLAGS_WDATA, &ec->flags) &&
+                     test_bit(EC_FLAGS_NO_WDATA_GPE, &ec->flags)))
+                force_poll = 1;
         if (likely(test_bit(EC_FLAGS_GPE_MODE, &ec->flags)) &&
             likely(!force_poll)) {
                 if (wait_event_timeout(ec->wait, acpi_ec_check_status(ec, event),
                                        msecs_to_jiffies(ACPI_EC_DELAY)))
-                        return 0;
+                        goto end;
                 clear_bit(EC_FLAGS_WAIT_GPE, &ec->flags);
                 if (acpi_ec_check_status(ec, event)) {
-                        if (event == ACPI_EC_EVENT_OBF_1) {
-                                /* miss OBF = 1 GPE, don't expect it anymore */
-                                printk(KERN_INFO PREFIX "missing OBF_1 confirmation,"
-                                        "switching to degraded mode.\n");
-                                set_bit(EC_FLAGS_ONLY_IBF_GPE, &ec->flags);
+                        if (test_bit(EC_FLAGS_ADDRESS, &ec->flags)) {
+                                /* miss address GPE, don't expect it anymore */
+                                pr_info(PREFIX "missing address confirmation, "
+                                        "don't expect it any longer.\n");
+                                set_bit(EC_FLAGS_NO_ADDRESS_GPE, &ec->flags);
+                        } else if (test_bit(EC_FLAGS_WDATA, &ec->flags)) {
+                                /* miss write data GPE, don't expect it */
+                                pr_info(PREFIX "missing write data confirmation, "
+                                        "don't expect it any longer.\n");
+                                set_bit(EC_FLAGS_NO_WDATA_GPE, &ec->flags);
                         } else {
                                 /* missing GPEs, switch back to poll mode */
-                                printk(KERN_INFO PREFIX "missing IBF_1 confirmations,"
-                                        "switch off interrupt mode.\n");
+                                if (printk_ratelimit())
+                                        pr_info(PREFIX "missing confirmations, "
+                                                "switch off interrupt mode.\n");
                                 clear_bit(EC_FLAGS_GPE_MODE, &ec->flags);
                         }
-                        return 0;
+                        goto end;
                 }
         } else {
                 unsigned long delay = jiffies + msecs_to_jiffies(ACPI_EC_DELAY);
                 clear_bit(EC_FLAGS_WAIT_GPE, &ec->flags);
                 while (time_before(jiffies, delay)) {
                         if (acpi_ec_check_status(ec, event))
-                                return 0;
+                                goto end;
                 }
         }
-        printk(KERN_ERR PREFIX "acpi_ec_wait timeout,"
+        pr_err(PREFIX "acpi_ec_wait timeout,"
                                " status = %d, expect_event = %d\n",
                                acpi_ec_read_status(ec), event);
-        return -ETIME;
+        ret = -ETIME;
+      end:
+        clear_bit(EC_FLAGS_ADDRESS, &ec->flags);
+        return ret;
 }
 
 static int acpi_ec_transaction_unlocked(struct acpi_ec *ec, u8 command,
@@ -208,22 +236,26 @@ static int acpi_ec_transaction_unlocked(struct acpi_ec *ec, u8 command,
         int result = 0;
         set_bit(EC_FLAGS_WAIT_GPE, &ec->flags);
         acpi_ec_write_cmd(ec, command);
-
+        pr_debug(PREFIX "transaction start\n");
         for (; wdata_len > 0; --wdata_len) {
                 result = acpi_ec_wait(ec, ACPI_EC_EVENT_IBF_0, force_poll);
                 if (result) {
-                        printk(KERN_ERR PREFIX
+                        pr_err(PREFIX
                                "write_cmd timeout, command = %d\n", command);
                         goto end;
                 }
+                /* mark the address byte written to EC */
+                if (rdata_len + wdata_len > 1)
+                        set_bit(EC_FLAGS_ADDRESS, &ec->flags);
                 set_bit(EC_FLAGS_WAIT_GPE, &ec->flags);
                 acpi_ec_write_data(ec, *(wdata++));
         }
 
         if (!rdata_len) {
+                set_bit(EC_FLAGS_WDATA, &ec->flags);
                 result = acpi_ec_wait(ec, ACPI_EC_EVENT_IBF_0, force_poll);
                 if (result) {
-                        printk(KERN_ERR PREFIX
+                        pr_err(PREFIX
                                "finish-write timeout, command = %d\n", command);
                         goto end;
                 }
@@ -231,12 +263,9 @@ static int acpi_ec_transaction_unlocked(struct acpi_ec *ec, u8 command,
                 clear_bit(EC_FLAGS_QUERY_PENDING, &ec->flags);
 
         for (; rdata_len > 0; --rdata_len) {
-                if (test_bit(EC_FLAGS_ONLY_IBF_GPE, &ec->flags))
-                        force_poll = 1;
                 result = acpi_ec_wait(ec, ACPI_EC_EVENT_OBF_1, force_poll);
                 if (result) {
-                        printk(KERN_ERR PREFIX "read timeout, command = %d\n",
-                               command);
+                        pr_err(PREFIX "read timeout, command = %d\n", command);
                         goto end;
                 }
                 /* Don't expect GPE after last read */
@@ -245,6 +274,7 @@ static int acpi_ec_transaction_unlocked(struct acpi_ec *ec, u8 command,
                 *(rdata++) = acpi_ec_read_data(ec);
         }
       end:
+        pr_debug(PREFIX "transaction end\n");
         return result;
 }
 
@@ -273,8 +303,8 @@ static int acpi_ec_transaction(struct acpi_ec *ec, u8 command,
 
         status = acpi_ec_wait(ec, ACPI_EC_EVENT_IBF_0, 0);
         if (status) {
-                printk(KERN_ERR PREFIX
-                       "input buffer is not empty, aborting transaction\n");
+                pr_err(PREFIX "input buffer is not empty, "
+                                "aborting transaction\n");
                 goto end;
         }
 
@@ -488,6 +518,7 @@ static u32 acpi_ec_gpe_handler(void *data)
         acpi_status status = AE_OK;
         struct acpi_ec *ec = data;
 
+        pr_debug(PREFIX "~~~> interrupt\n");
         clear_bit(EC_FLAGS_WAIT_GPE, &ec->flags);
         if (test_bit(EC_FLAGS_GPE_MODE, &ec->flags))
                 wake_up(&ec->wait);
@@ -498,8 +529,9 @@ static u32 acpi_ec_gpe_handler(void *data)
                                 acpi_ec_gpe_query, ec);
         } else if (unlikely(!test_bit(EC_FLAGS_GPE_MODE, &ec->flags))) {
                 /* this is non-query, must be confirmation */
-                printk(KERN_INFO PREFIX "non-query interrupt received,"
-                        " switching to interrupt mode\n");
+                if (printk_ratelimit())
+                        pr_info(PREFIX "non-query interrupt received,"
+                                " switching to interrupt mode\n");
                 set_bit(EC_FLAGS_GPE_MODE, &ec->flags);
         }
 
@@ -701,10 +733,10 @@ static void ec_remove_handlers(struct acpi_ec *ec)
 {
         if (ACPI_FAILURE(acpi_remove_address_space_handler(ec->handle,
                                 ACPI_ADR_SPACE_EC, &acpi_ec_space_handler)))
-                printk(KERN_ERR PREFIX "failed to remove space handler\n");
+                pr_err(PREFIX "failed to remove space handler\n");
         if (ACPI_FAILURE(acpi_remove_gpe_handler(NULL, ec->gpe,
                                 &acpi_ec_gpe_handler)))
-                printk(KERN_ERR PREFIX "failed to remove gpe handler\n");
+                pr_err(PREFIX "failed to remove gpe handler\n");
         ec->handlers_installed = 0;
 }
 
@@ -747,9 +779,9 @@ static int acpi_ec_add(struct acpi_device *device)
                 first_ec = ec;
         acpi_driver_data(device) = ec;
         acpi_ec_add_fs(device);
-        printk(KERN_INFO PREFIX "GPE = 0x%lx, I/O: command/status = 0x%lx, data = 0x%lx\n",
+        pr_info(PREFIX "GPE = 0x%lx, I/O: command/status = 0x%lx, data = 0x%lx\n",
                           ec->gpe, ec->command_addr, ec->data_addr);
-        printk(KERN_INFO PREFIX "driver started in %s mode\n",
+        pr_info(PREFIX "driver started in %s mode\n",
                 (test_bit(EC_FLAGS_GPE_MODE, &ec->flags))?"interrupt":"poll");
         return 0;
 }
@@ -875,18 +907,26 @@ int __init acpi_ec_ecdt_probe(void)
         status = acpi_get_table(ACPI_SIG_ECDT, 1,
                                 (struct acpi_table_header **)&ecdt_ptr);
         if (ACPI_SUCCESS(status)) {
-                printk(KERN_INFO PREFIX "EC description table is found, configuring boot EC\n");
+                pr_info(PREFIX "EC description table is found, configuring boot EC\n");
                 boot_ec->command_addr = ecdt_ptr->control.address;
                 boot_ec->data_addr = ecdt_ptr->data.address;
                 boot_ec->gpe = ecdt_ptr->gpe;
                 boot_ec->handle = ACPI_ROOT_OBJECT;
         } else {
+                /* This workaround is needed only on some broken machines,
+                 * which require early EC, but fail to provide ECDT */
+                acpi_handle x;
                 printk(KERN_DEBUG PREFIX "Look up EC in DSDT\n");
                 status = acpi_get_devices(ec_device_ids[0].id, ec_parse_device,
                                                 boot_ec, NULL);
                 /* Check that acpi_get_devices actually find something */
                 if (ACPI_FAILURE(status) || !boot_ec->handle)
                         goto error;
+                /* We really need to limit this workaround, the only ASUS,
+                 * which needs it, has fake EC._INI method, so use it as flag.
+                 */
+                if (ACPI_FAILURE(acpi_get_handle(boot_ec->handle, "_INI", &x)))
+                        goto error;
         }
 
         ret = ec_install_handlers(boot_ec);
diff --git a/drivers/acpi/numa.c b/drivers/acpi/numa.c
index ab04d848b19d..0822d9fc1cb4 100644
--- a/drivers/acpi/numa.c
+++ b/drivers/acpi/numa.c
@@ -38,9 +38,9 @@ ACPI_MODULE_NAME("numa");
 static nodemask_t nodes_found_map = NODE_MASK_NONE;
 
 /* maps to convert between proximity domain and logical node ID */
-static int __cpuinitdata pxm_to_node_map[MAX_PXM_DOMAINS]
+static int pxm_to_node_map[MAX_PXM_DOMAINS]
                                 = { [0 ... MAX_PXM_DOMAINS - 1] = NID_INVAL };
-static int __cpuinitdata node_to_pxm_map[MAX_NUMNODES]
+static int node_to_pxm_map[MAX_NUMNODES]
                                 = { [0 ... MAX_NUMNODES - 1] = PXM_INVAL };
 
 int pxm_to_node(int pxm)
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index aabc6ca4a81c..e3a673a00845 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -387,17 +387,14 @@ acpi_status acpi_os_read_port(acpi_io_address port, u32 * value, u32 width)
         if (!value)
                 value = &dummy;
 
-        switch (width) {
-        case 8:
+        *value = 0;
+        if (width <= 8) {
                 *(u8 *) value = inb(port);
-                break;
-        case 16:
+        } else if (width <= 16) {
                 *(u16 *) value = inw(port);
-                break;
-        case 32:
+        } else if (width <= 32) {
                 *(u32 *) value = inl(port);
-                break;
-        default:
+        } else {
                 BUG();
         }
 
@@ -408,17 +405,13 @@ EXPORT_SYMBOL(acpi_os_read_port);
 
 acpi_status acpi_os_write_port(acpi_io_address port, u32 value, u32 width)
 {
-        switch (width) {
-        case 8:
+        if (width <= 8) {
                 outb(value, port);
-                break;
-        case 16:
+        } else if (width <= 16) {
                 outw(value, port);
-                break;
-        case 32:
+        } else if (width <= 32) {
                 outl(value, port);
-                break;
-        default:
+        } else {
                 BUG();
         }
 
diff --git a/drivers/acpi/pci_bind.c b/drivers/acpi/pci_bind.c
index 028969370bbf..388300de005d 100644
--- a/drivers/acpi/pci_bind.c
+++ b/drivers/acpi/pci_bind.c
@@ -294,9 +294,6 @@ int acpi_pci_unbind(struct acpi_device *device)
             acpi_get_data(device->handle, acpi_pci_data_handler,
                           (void **)&data);
         if (ACPI_FAILURE(status)) {
-                ACPI_EXCEPTION((AE_INFO, status,
-                                "Unable to get data from device %s",
-                                acpi_device_bid(device)));
                 result = -ENODEV;
                 goto end;
         }
diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c
index 235a51e328c3..e48ee4f8749f 100644
--- a/drivers/acpi/processor_core.c
+++ b/drivers/acpi/processor_core.c
@@ -494,7 +494,7 @@ static int get_cpu_id(acpi_handle handle, u32 acpi_id)
         if (apic_id == -1)
                 return apic_id;
 
-        for (i = 0; i < NR_CPUS; ++i) {
+        for_each_possible_cpu(i) {
                 if (cpu_physical_id(i) == apic_id)
                         return i;
         }
@@ -612,12 +612,6 @@ static int acpi_processor_get_info(struct acpi_processor *pr, unsigned has_uid)
                 request_region(pr->throttling.address, 6, "ACPI CPU throttle");
         }
 
-#ifdef CONFIG_CPU_FREQ
-        acpi_processor_ppc_has_changed(pr);
-#endif
-        acpi_processor_get_throttling_info(pr);
-        acpi_processor_get_limit_info(pr);
-
         return 0;
 }
 
@@ -638,7 +632,7 @@ static int __cpuinit acpi_processor_start(struct acpi_device *device)
                 return 0;
         }
 
-        BUG_ON((pr->id >= NR_CPUS) || (pr->id < 0));
+        BUG_ON((pr->id >= nr_cpu_ids) || (pr->id < 0));
 
         /*
          * Buggy BIOS check
@@ -647,7 +641,7 @@ static int __cpuinit acpi_processor_start(struct acpi_device *device)
          */
         if (processor_device_array[pr->id] != NULL &&
             processor_device_array[pr->id] != device) {
-                printk(KERN_WARNING "BIOS reported wrong ACPI id"
+                printk(KERN_WARNING "BIOS reported wrong ACPI id "
                         "for the processor\n");
                 return -ENODEV;
         }
@@ -665,6 +659,12 @@ static int __cpuinit acpi_processor_start(struct acpi_device *device)
         /* _PDC call should be done before doing anything else (if reqd.). */
         arch_acpi_processor_init_pdc(pr);
         acpi_processor_set_pdc(pr);
+#ifdef CONFIG_CPU_FREQ
+        acpi_processor_ppc_has_changed(pr);
+#endif
+        acpi_processor_get_throttling_info(pr);
+        acpi_processor_get_limit_info(pr);
+
 
         acpi_processor_power_init(pr, device);
 
@@ -684,7 +684,7 @@ static void acpi_processor_notify(acpi_handle handle, u32 event, void *data)
 {
         struct acpi_processor *pr = data;
         struct acpi_device *device = NULL;
-
+        int saved;
 
         if (!pr)
                 return;
@@ -694,7 +694,10 @@ static void acpi_processor_notify(acpi_handle handle, u32 event, void *data)
 
         switch (event) {
         case ACPI_PROCESSOR_NOTIFY_PERFORMANCE:
+                saved = pr->performance_platform_limit;
                 acpi_processor_ppc_has_changed(pr);
+                if (saved == pr->performance_platform_limit)
+                        break;
                 acpi_bus_generate_proc_event(device, event,
                                         pr->performance_platform_limit);
                 acpi_bus_generate_netlink_event(device->pnp.device_class,
@@ -771,7 +774,7 @@ static int acpi_processor_remove(struct acpi_device *device, int type)
 
         pr = acpi_driver_data(device);
 
-        if (pr->id >= NR_CPUS) {
+        if (pr->id >= nr_cpu_ids) {
                 kfree(pr);
                 return 0;
         }
@@ -842,7 +845,7 @@ int acpi_processor_device_add(acpi_handle handle, struct acpi_device **device)
         if (!pr)
                 return -ENODEV;
 
-        if ((pr->id >= 0) && (pr->id < NR_CPUS)) {
+        if ((pr->id >= 0) && (pr->id < nr_cpu_ids)) {
                 kobject_uevent(&(*device)->dev.kobj, KOBJ_ONLINE);
         }
         return 0;
@@ -880,13 +883,13 @@ acpi_processor_hotplug_notify(acpi_handle handle, u32 event, void *data)
                         break;
                 }
 
-                if (pr->id >= 0 && (pr->id < NR_CPUS)) {
+                if (pr->id >= 0 && (pr->id < nr_cpu_ids)) {
                         kobject_uevent(&device->dev.kobj, KOBJ_OFFLINE);
                         break;
                 }
 
                 result = acpi_processor_start(device);
-                if ((!result) && ((pr->id >= 0) && (pr->id < NR_CPUS))) {
+                if ((!result) && ((pr->id >= 0) && (pr->id < nr_cpu_ids))) {
                         kobject_uevent(&device->dev.kobj, KOBJ_ONLINE);
                 } else {
                         printk(KERN_ERR PREFIX "Device [%s] failed to start\n",
@@ -909,7 +912,7 @@ acpi_processor_hotplug_notify(acpi_handle handle, u32 event, void *data)
                         return;
                 }
 
-                if ((pr->id < NR_CPUS) && (cpu_present(pr->id)))
+                if ((pr->id < nr_cpu_ids) && (cpu_present(pr->id)))
                         kobject_uevent(&device->dev.kobj, KOBJ_OFFLINE);
                 break;
         default:
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index f996d0e37689..2fe34cc73c13 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -197,6 +197,19 @@ static inline u32 ticks_elapsed_in_us(u32 t1, u32 t2)
                 return PM_TIMER_TICKS_TO_US((0xFFFFFFFF - t1) + t2);
 }
 
+static void acpi_safe_halt(void)
+{
+        current_thread_info()->status &= ~TS_POLLING;
+        /*
+         * TS_POLLING-cleared state must be visible before we
+         * test NEED_RESCHED:
+         */
+        smp_mb();
+        if (!need_resched())
+                safe_halt();
+        current_thread_info()->status |= TS_POLLING;
+}
+
 #ifndef CONFIG_CPU_IDLE
 
 static void
@@ -239,19 +252,6 @@ acpi_processor_power_activate(struct acpi_processor *pr,
         return;
 }
 
-static void acpi_safe_halt(void)
-{
-        current_thread_info()->status &= ~TS_POLLING;
-        /*
-         * TS_POLLING-cleared state must be visible before we
-         * test NEED_RESCHED:
-         */
-        smp_mb();
-        if (!need_resched())
-                safe_halt();
-        current_thread_info()->status |= TS_POLLING;
-}
-
 static atomic_t c3_cpu_count;
 
 /* Common C-state entry for C2, C3, .. */
@@ -531,6 +531,11 @@ static void acpi_processor_idle(void)
 
         case ACPI_STATE_C3:
                 /*
+                 * Must be done before busmaster disable as we might
+                 * need to access HPET !
+                 */
+                acpi_state_timer_broadcast(pr, cx, 1);
+                /*
                  * disable bus master
                  * bm_check implies we need ARB_DIS
                  * !bm_check implies we need cache flush
@@ -557,7 +562,6 @@ static void acpi_processor_idle(void)
                 /* Get start time (ticks) */
                 t1 = inl(acpi_gbl_FADT.xpm_timer_block.address);
                 /* Invoke C3 */
-                acpi_state_timer_broadcast(pr, cx, 1);
                 /* Tell the scheduler that we are going deep-idle: */
                 sched_clock_idle_sleep_event();
                 acpi_cstate_enter(cx);
@@ -1373,15 +1377,7 @@ static int acpi_idle_enter_c1(struct cpuidle_device *dev,
         if (pr->flags.bm_check)
                 acpi_idle_update_bm_rld(pr, cx);
 
-        current_thread_info()->status &= ~TS_POLLING;
-        /*
-         * TS_POLLING-cleared state must be visible before we test
-         * NEED_RESCHED:
-         */
-        smp_mb();
-        if (!need_resched())
-                safe_halt();
-        current_thread_info()->status |= TS_POLLING;
+        acpi_safe_halt();
 
         cx->usage++;
 
@@ -1399,6 +1395,8 @@ static int acpi_idle_enter_simple(struct cpuidle_device *dev,
         struct acpi_processor *pr;
         struct acpi_processor_cx *cx = cpuidle_get_statedata(state);
         u32 t1, t2;
+        int sleep_ticks = 0;
+
         pr = processors[smp_processor_id()];
 
         if (unlikely(!pr))
@@ -1407,9 +1405,6 @@ static int acpi_idle_enter_simple(struct cpuidle_device *dev,
         if (acpi_idle_suspend)
                 return(acpi_idle_enter_c1(dev, state));
 
-        if (pr->flags.bm_check)
-                acpi_idle_update_bm_rld(pr, cx);
-
         local_irq_disable();
         current_thread_info()->status &= ~TS_POLLING;
         /*
@@ -1424,11 +1419,21 @@ static int acpi_idle_enter_simple(struct cpuidle_device *dev,
                 return 0;
         }
 
+        /*
+         * Must be done before busmaster disable as we might need to
+         * access HPET !
+         */
+        acpi_state_timer_broadcast(pr, cx, 1);
+
+        if (pr->flags.bm_check)
+                acpi_idle_update_bm_rld(pr, cx);
+
         if (cx->type == ACPI_STATE_C3)
                 ACPI_FLUSH_CPU_CACHE();
 
         t1 = inl(acpi_gbl_FADT.xpm_timer_block.address);
-        acpi_state_timer_broadcast(pr, cx, 1);
+        /* Tell the scheduler that we are going deep-idle: */
+        sched_clock_idle_sleep_event();
         acpi_idle_do_entry(cx);
         t2 = inl(acpi_gbl_FADT.xpm_timer_block.address);
 
@@ -1436,6 +1441,10 @@ static int acpi_idle_enter_simple(struct cpuidle_device *dev,
         /* TSC could halt in idle, so notify users */
         mark_tsc_unstable("TSC halts in idle");;
 #endif
+        sleep_ticks = ticks_elapsed(t1, t2);
+
+        /* Tell the scheduler how much we idled: */
+        sched_clock_idle_wakeup_event(sleep_ticks*PM_TIMER_TICK_NS);
 
         local_irq_enable();
         current_thread_info()->status |= TS_POLLING;
@@ -1443,7 +1452,7 @@ static int acpi_idle_enter_simple(struct cpuidle_device *dev,
         cx->usage++;
 
         acpi_state_timer_broadcast(pr, cx, 0);
-        cx->time += ticks_elapsed(t1, t2);
+        cx->time += sleep_ticks;
         return ticks_elapsed_in_us(t1, t2);
 }
 
@@ -1463,6 +1472,8 @@ static int acpi_idle_enter_bm(struct cpuidle_device *dev,
         struct acpi_processor *pr;
         struct acpi_processor_cx *cx = cpuidle_get_statedata(state);
         u32 t1, t2;
+        int sleep_ticks = 0;
+
         pr = processors[smp_processor_id()];
 
         if (unlikely(!pr))
@@ -1471,6 +1482,15 @@ static int acpi_idle_enter_bm(struct cpuidle_device *dev,
         if (acpi_idle_suspend)
                 return(acpi_idle_enter_c1(dev, state));
 
+        if (acpi_idle_bm_check()) {
+                if (dev->safe_state) {
+                        return dev->safe_state->enter(dev, dev->safe_state);
+                } else {
+                        acpi_safe_halt();
+                        return 0;
+                }
+        }
+
         local_irq_disable();
         current_thread_info()->status &= ~TS_POLLING;
         /*
@@ -1485,38 +1505,45 @@ static int acpi_idle_enter_bm(struct cpuidle_device *dev,
                 return 0;
         }
 
+        /* Tell the scheduler that we are going deep-idle: */
+        sched_clock_idle_sleep_event();
         /*
          * Must be done before busmaster disable as we might need to
          * access HPET !
          */
         acpi_state_timer_broadcast(pr, cx, 1);
 
-        if (acpi_idle_bm_check()) {
-                cx = pr->power.bm_state;
-
-                acpi_idle_update_bm_rld(pr, cx);
-
-                t1 = inl(acpi_gbl_FADT.xpm_timer_block.address);
-                acpi_idle_do_entry(cx);
-                t2 = inl(acpi_gbl_FADT.xpm_timer_block.address);
-        } else {
-                acpi_idle_update_bm_rld(pr, cx);
+        acpi_idle_update_bm_rld(pr, cx);
 
+        /*
+         * disable bus master
+         * bm_check implies we need ARB_DIS
+         * !bm_check implies we need cache flush
+         * bm_control implies whether we can do ARB_DIS
+         *
+         * That leaves a case where bm_check is set and bm_control is
+         * not set. In that case we cannot do much, we enter C3
+         * without doing anything.
+         */
+        if (pr->flags.bm_check && pr->flags.bm_control) {
                 spin_lock(&c3_lock);
                 c3_cpu_count++;
                 /* Disable bus master arbitration when all CPUs are in C3 */
                 if (c3_cpu_count == num_online_cpus())
                         acpi_set_register(ACPI_BITREG_ARB_DISABLE, 1);
                 spin_unlock(&c3_lock);
+        } else if (!pr->flags.bm_check) {
+                ACPI_FLUSH_CPU_CACHE();
+        }
 
-                t1 = inl(acpi_gbl_FADT.xpm_timer_block.address);
-                acpi_idle_do_entry(cx);
-                t2 = inl(acpi_gbl_FADT.xpm_timer_block.address);
+        t1 = inl(acpi_gbl_FADT.xpm_timer_block.address);
+        acpi_idle_do_entry(cx);
+        t2 = inl(acpi_gbl_FADT.xpm_timer_block.address);
 
+        /* Re-enable bus master arbitration */
+        if (pr->flags.bm_check && pr->flags.bm_control) {
                 spin_lock(&c3_lock);
-                /* Re-enable bus master arbitration */
-                if (c3_cpu_count == num_online_cpus())
-                        acpi_set_register(ACPI_BITREG_ARB_DISABLE, 0);
+                acpi_set_register(ACPI_BITREG_ARB_DISABLE, 0);
                 c3_cpu_count--;
                 spin_unlock(&c3_lock);
         }
@@ -1525,6 +1552,9 @@ static int acpi_idle_enter_bm(struct cpuidle_device *dev,
         /* TSC could halt in idle, so notify users */
         mark_tsc_unstable("TSC halts in idle");
 #endif
+        sleep_ticks = ticks_elapsed(t1, t2);
+        /* Tell the scheduler how much we idled: */
+        sched_clock_idle_wakeup_event(sleep_ticks*PM_TIMER_TICK_NS);
 
         local_irq_enable();
         current_thread_info()->status |= TS_POLLING;
@@ -1532,7 +1562,7 @@ static int acpi_idle_enter_bm(struct cpuidle_device *dev,
         cx->usage++;
 
         acpi_state_timer_broadcast(pr, cx, 0);
-        cx->time += ticks_elapsed(t1, t2);
+        cx->time += sleep_ticks;
         return ticks_elapsed_in_us(t1, t2);
 }
 
@@ -1584,12 +1614,14 @@ static int acpi_processor_setup_cpuidle(struct acpi_processor *pr)
                         case ACPI_STATE_C1:
                         state->flags |= CPUIDLE_FLAG_SHALLOW;
                         state->enter = acpi_idle_enter_c1;
+                        dev->safe_state = state;
                         break;
 
                         case ACPI_STATE_C2:
                         state->flags |= CPUIDLE_FLAG_BALANCED;
                         state->flags |= CPUIDLE_FLAG_TIME_VALID;
                         state->enter = acpi_idle_enter_simple;
+                        dev->safe_state = state;
                         break;
 
                         case ACPI_STATE_C3:
@@ -1610,14 +1642,6 @@ static int acpi_processor_setup_cpuidle(struct acpi_processor *pr)
         if (!count)
                 return -EINVAL;
 
-        /* find the deepest state that can handle active BM */
-        if (pr->flags.bm_check) {
-                for (i = 1; i < ACPI_PROCESSOR_MAX_POWER && i <= max_cstate; i++)
-                        if (pr->power.states[i].type == ACPI_STATE_C3)
-                                break;
-                pr->power.bm_state = &pr->power.states[i-1];
-        }
-
         return 0;
 }
 
@@ -1658,6 +1682,7 @@ int __cpuinit acpi_processor_power_init(struct acpi_processor *pr,
 
         if (!first_run) {
                 dmi_check_system(processor_power_dmi_table);
+                max_cstate = acpi_processor_cstate_check(max_cstate);
                 if (max_cstate < ACPI_C_STATES_MAX)
                         printk(KERN_NOTICE
                                "ACPI: processor limited to max C-state %d\n",
diff --git a/drivers/acpi/processor_throttling.c b/drivers/acpi/processor_throttling.c
index 0b8204e7082a..6742d7bc4777 100644
--- a/drivers/acpi/processor_throttling.c
+++ b/drivers/acpi/processor_throttling.c
@@ -29,6 +29,7 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>
+#include <linux/sched.h>
 #include <linux/cpufreq.h>
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
@@ -70,7 +71,55 @@ static int acpi_processor_get_platform_limit(struct acpi_processor *pr)
 
 int acpi_processor_tstate_has_changed(struct acpi_processor *pr)
 {
-        return acpi_processor_get_platform_limit(pr);
+        int result = 0;
+        int throttling_limit;
+        int current_state;
+        struct acpi_processor_limit *limit;
+        int target_state;
+
+        result = acpi_processor_get_platform_limit(pr);
+        if (result) {
+                /* Throttling Limit is unsupported */
+                return result;
+        }
+
+        throttling_limit = pr->throttling_platform_limit;
+        if (throttling_limit >= pr->throttling.state_count) {
+                /* Uncorrect Throttling Limit */
+                return -EINVAL;
+        }
+
+        current_state = pr->throttling.state;
+        if (current_state > throttling_limit) {
+                /*
+                 * The current state can meet the requirement of
+                 * _TPC limit. But it is reasonable that OSPM changes
+                 * t-states from high to low for better performance.
+                 * Of course the limit condition of thermal
+                 * and user should be considered.
+                 */
+                limit = &pr->limit;
+                target_state = throttling_limit;
+                if (limit->thermal.tx > target_state)
+                        target_state = limit->thermal.tx;
+                if (limit->user.tx > target_state)
+                        target_state = limit->user.tx;
+        } else if (current_state == throttling_limit) {
+                /*
+                 * Unnecessary to change the throttling state
+                 */
+                return 0;
+        } else {
+                /*
+                 * If the current state is lower than the limit of _TPC, it
+                 * will be forced to switch to the throttling state defined
+                 * by throttling_platfor_limit.
+                 * Because the previous state meets with the limit condition
+                 * of thermal and user, it is unnecessary to check it again.
+                 */
+                target_state = throttling_limit;
+        }
+        return acpi_processor_set_throttling(pr, target_state);
 }
 
 /*
@@ -83,6 +132,7 @@ static int acpi_processor_get_throttling_control(struct acpi_processor *pr)
         struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
         union acpi_object *ptc = NULL;
         union acpi_object obj = { 0 };
+        struct acpi_processor_throttling *throttling;
 
         status = acpi_evaluate_object(pr->handle, "_PTC", NULL, &buffer);
         if (ACPI_FAILURE(status)) {
@@ -134,6 +184,22 @@ static int acpi_processor_get_throttling_control(struct acpi_processor *pr)
         memcpy(&pr->throttling.status_register, obj.buffer.pointer,
                sizeof(struct acpi_ptc_register));
 
+        throttling = &pr->throttling;
+
+        if ((throttling->control_register.bit_width +
+                throttling->control_register.bit_offset) > 32) {
+                printk(KERN_ERR PREFIX "Invalid _PTC control register\n");
+                result = -EFAULT;
+                goto end;
+        }
+
+        if ((throttling->status_register.bit_width +
+                throttling->status_register.bit_offset) > 32) {
+                printk(KERN_ERR PREFIX "Invalid _PTC status register\n");
+                result = -EFAULT;
+                goto end;
+        }
+
       end:
         kfree(buffer.pointer);
 
@@ -328,44 +394,132 @@ static int acpi_processor_get_throttling_fadt(struct acpi_processor *pr)
         return 0;
 }
 
-static int acpi_read_throttling_status(struct acpi_processor_throttling
-                                       *throttling)
+#ifdef CONFIG_X86
+static int acpi_throttling_rdmsr(struct acpi_processor *pr,
+                                        acpi_integer * value)
+{
+        struct cpuinfo_x86 *c;
+        u64 msr_high, msr_low;
+        unsigned int cpu;
+        u64 msr = 0;
+        int ret = -1;
+
+        cpu = pr->id;
+        c = &cpu_data(cpu);
+
+        if ((c->x86_vendor != X86_VENDOR_INTEL) ||
+                !cpu_has(c, X86_FEATURE_ACPI)) {
+                printk(KERN_ERR PREFIX
+                        "HARDWARE addr space,NOT supported yet\n");
+        } else {
+                msr_low = 0;
+                msr_high = 0;
+                rdmsr_safe(MSR_IA32_THERM_CONTROL,
+                        (u32 *)&msr_low , (u32 *) &msr_high);
+                msr = (msr_high << 32) | msr_low;
+                *value = (acpi_integer) msr;
+                ret = 0;
+        }
+        return ret;
+}
+
+static int acpi_throttling_wrmsr(struct acpi_processor *pr, acpi_integer value)
 {
-        int value = -1;
+        struct cpuinfo_x86 *c;
+        unsigned int cpu;
+        int ret = -1;
+        u64 msr;
+
+        cpu = pr->id;
+        c = &cpu_data(cpu);
+
+        if ((c->x86_vendor != X86_VENDOR_INTEL) ||
+                !cpu_has(c, X86_FEATURE_ACPI)) {
+                printk(KERN_ERR PREFIX
+                        "HARDWARE addr space,NOT supported yet\n");
+        } else {
+                msr = value;
+                wrmsr_safe(MSR_IA32_THERM_CONTROL,
+                        msr & 0xffffffff, msr >> 32);
+                ret = 0;
+        }
+        return ret;
+}
+#else
+static int acpi_throttling_rdmsr(struct acpi_processor *pr,
+                                acpi_integer * value)
+{
+        printk(KERN_ERR PREFIX
+                "HARDWARE addr space,NOT supported yet\n");
+        return -1;
+}
+
+static int acpi_throttling_wrmsr(struct acpi_processor *pr, acpi_integer value)
+{
+        printk(KERN_ERR PREFIX
+                "HARDWARE addr space,NOT supported yet\n");
+        return -1;
+}
+#endif
+
+static int acpi_read_throttling_status(struct acpi_processor *pr,
+                                        acpi_integer *value)
+{
+        u32 bit_width, bit_offset;
+        u64 ptc_value;
+        u64 ptc_mask;
+        struct acpi_processor_throttling *throttling;
+        int ret = -1;
+
+        throttling = &pr->throttling;
         switch (throttling->status_register.space_id) {
         case ACPI_ADR_SPACE_SYSTEM_IO:
+                ptc_value = 0;
+                bit_width = throttling->status_register.bit_width;
+                bit_offset = throttling->status_register.bit_offset;
+
                 acpi_os_read_port((acpi_io_address) throttling->status_register.
-                                  address, &value,
-                                  (u32) throttling->status_register.bit_width *
-                                  8);
+                                  address, (u32 *) &ptc_value,
+                                  (u32) (bit_width + bit_offset));
+                ptc_mask = (1 << bit_width) - 1;
+                *value = (acpi_integer) ((ptc_value >> bit_offset) & ptc_mask);
+                ret = 0;
                 break;
         case ACPI_ADR_SPACE_FIXED_HARDWARE:
-                printk(KERN_ERR PREFIX
-                       "HARDWARE addr space,NOT supported yet\n");
+                ret = acpi_throttling_rdmsr(pr, value);
                 break;
         default:
                 printk(KERN_ERR PREFIX "Unknown addr space %d\n",
                        (u32) (throttling->status_register.space_id));
         }
-        return value;
+        return ret;
 }
 
-static int acpi_write_throttling_state(struct acpi_processor_throttling
-                                       *throttling, int value)
+static int acpi_write_throttling_state(struct acpi_processor *pr,
+                                acpi_integer value)
 {
+        u32 bit_width, bit_offset;
+        u64 ptc_value;
+        u64 ptc_mask;
+        struct acpi_processor_throttling *throttling;
         int ret = -1;
 
+        throttling = &pr->throttling;
         switch (throttling->control_register.space_id) {
         case ACPI_ADR_SPACE_SYSTEM_IO:
+                bit_width = throttling->control_register.bit_width;
+                bit_offset = throttling->control_register.bit_offset;
+                ptc_mask = (1 << bit_width) - 1;
+                ptc_value = value & ptc_mask;
+
                 acpi_os_write_port((acpi_io_address) throttling->
-                                   control_register.address, value,
-                                   (u32) throttling->control_register.
-                                   bit_width * 8);
+                                        control_register.address,
+                                        (u32) (ptc_value << bit_offset),
+                                        (u32) (bit_width + bit_offset));
                 ret = 0;
                 break;
         case ACPI_ADR_SPACE_FIXED_HARDWARE:
-                printk(KERN_ERR PREFIX
-                       "HARDWARE addr space,NOT supported yet\n");
+                ret = acpi_throttling_wrmsr(pr, value);
                 break;
         default:
                 printk(KERN_ERR PREFIX "Unknown addr space %d\n",
@@ -374,7 +528,8 @@ static int acpi_write_throttling_state(struct acpi_processor_throttling
         return ret;
 }
 
-static int acpi_get_throttling_state(struct acpi_processor *pr, int value)
+static int acpi_get_throttling_state(struct acpi_processor *pr,
+                                acpi_integer value)
 {
         int i;
 
@@ -390,22 +545,26 @@ static int acpi_get_throttling_state(struct acpi_processor *pr, int value)
         return i;
 }
 
-static int acpi_get_throttling_value(struct acpi_processor *pr, int state)
+static int acpi_get_throttling_value(struct acpi_processor *pr,
+                        int state, acpi_integer *value)
 {
-        int value = -1;
+        int ret = -1;
+
         if (state >= 0 && state <= pr->throttling.state_count) {
                 struct acpi_processor_tx_tss *tx =
                     (struct acpi_processor_tx_tss *)&(pr->throttling.
                                                       states_tss[state]);
-                value = tx->control;
+                *value = tx->control;
+                ret = 0;
         }
-        return value;
+        return ret;
 }
 
 static int acpi_processor_get_throttling_ptc(struct acpi_processor *pr)
 {
         int state = 0;
-        u32 value = 0;
+        int ret;
+        acpi_integer value;
 
         if (!pr)
                 return -EINVAL;
@@ -414,20 +573,66 @@ static int acpi_processor_get_throttling_ptc(struct acpi_processor *pr)
                 return -ENODEV;
 
         pr->throttling.state = 0;
-        local_irq_disable();
-        value = acpi_read_throttling_status(&pr->throttling);
-        if (value >= 0) {
+
+        value = 0;
+        ret = acpi_read_throttling_status(pr, &value);
+        if (ret >= 0) {
                 state = acpi_get_throttling_state(pr, value);
                 pr->throttling.state = state;
         }
-        local_irq_enable();
 
         return 0;
 }
 
 static int acpi_processor_get_throttling(struct acpi_processor *pr)
 {
-        return pr->throttling.acpi_processor_get_throttling(pr);
+        cpumask_t saved_mask;
+        int ret;
+
+        /*
+         * Migrate task to the cpu pointed by pr.
+         */
+        saved_mask = current->cpus_allowed;
+        set_cpus_allowed(current, cpumask_of_cpu(pr->id));
+        ret = pr->throttling.acpi_processor_get_throttling(pr);
+        /* restore the previous state */
+        set_cpus_allowed(current, saved_mask);
+
+        return ret;
+}
+
+static int acpi_processor_get_fadt_info(struct acpi_processor *pr)
+{
+        int i, step;
+
+        if (!pr->throttling.address) {
+                ACPI_DEBUG_PRINT((ACPI_DB_INFO, "No throttling register\n"));
+                return -EINVAL;
+        } else if (!pr->throttling.duty_width) {
+                ACPI_DEBUG_PRINT((ACPI_DB_INFO, "No throttling states\n"));
+                return -EINVAL;
+        }
+        /* TBD: Support duty_cycle values that span bit 4. */
+        else if ((pr->throttling.duty_offset + pr->throttling.duty_width) > 4) {
+                printk(KERN_WARNING PREFIX "duty_cycle spans bit 4\n");
+                return -EINVAL;
+        }
+
+        pr->throttling.state_count = 1 << acpi_gbl_FADT.duty_width;
+
+        /*
+         * Compute state values. Note that throttling displays a linear power
+         * performance relationship (at 50% performance the CPU will consume
+         * 50% power).  Values are in 1/10th of a percent to preserve accuracy.
+         */
+
+        step = (1000 / pr->throttling.state_count);
+
+        for (i = 0; i < pr->throttling.state_count; i++) {
+                pr->throttling.states[i].performance = 1000 - step * i;
+                pr->throttling.states[i].power = 1000 - step * i;
+        }
+        return 0;
 }
 
 static int acpi_processor_set_throttling_fadt(struct acpi_processor *pr,
@@ -506,7 +711,8 @@ static int acpi_processor_set_throttling_fadt(struct acpi_processor *pr,
 static int acpi_processor_set_throttling_ptc(struct acpi_processor *pr,
                                              int state)
 {
-        u32 value = 0;
+        int ret;
+        acpi_integer value;
 
         if (!pr)
                 return -EINVAL;
@@ -523,28 +729,34 @@ static int acpi_processor_set_throttling_ptc(struct acpi_processor *pr,
         if (state < pr->throttling_platform_limit)
                 return -EPERM;
 
-        local_irq_disable();
-
-        value = acpi_get_throttling_value(pr, state);
-        if (value >= 0) {
-                acpi_write_throttling_state(&pr->throttling, value);
+        value = 0;
+        ret = acpi_get_throttling_value(pr, state, &value);
+        if (ret >= 0) {
+                acpi_write_throttling_state(pr, value);
                 pr->throttling.state = state;
         }
-        local_irq_enable();
 
         return 0;
 }
 
 int acpi_processor_set_throttling(struct acpi_processor *pr, int state)
 {
-        return pr->throttling.acpi_processor_set_throttling(pr, state);
+        cpumask_t saved_mask;
+        int ret;
+        /*
+         * Migrate task to the cpu pointed by pr.
+         */
+        saved_mask = current->cpus_allowed;
+        set_cpus_allowed(current, cpumask_of_cpu(pr->id));
+        ret = pr->throttling.acpi_processor_set_throttling(pr, state);
+        /* restore the previous state */
+        set_cpus_allowed(current, saved_mask);
+        return ret;
 }
 
 int acpi_processor_get_throttling_info(struct acpi_processor *pr)
 {
         int result = 0;
-        int step = 0;
-        int i = 0;
 
         ACPI_DEBUG_PRINT((ACPI_DB_INFO,
                           "pblk_address[0x%08x] duty_offset[%d] duty_width[%d]\n",
@@ -563,6 +775,8 @@ int acpi_processor_get_throttling_info(struct acpi_processor *pr)
                 acpi_processor_get_throttling_states(pr) ||
                 acpi_processor_get_platform_limit(pr))
         {
+                if (acpi_processor_get_fadt_info(pr))
+                        return 0;
                 pr->throttling.acpi_processor_get_throttling =
                     &acpi_processor_get_throttling_fadt;
                 pr->throttling.acpi_processor_set_throttling =
@@ -576,19 +790,6 @@ int acpi_processor_get_throttling_info(struct acpi_processor *pr)
 
         acpi_processor_get_tsd(pr);
 
-        if (!pr->throttling.address) {
-                ACPI_DEBUG_PRINT((ACPI_DB_INFO, "No throttling register\n"));
-                return 0;
-        } else if (!pr->throttling.duty_width) {
-                ACPI_DEBUG_PRINT((ACPI_DB_INFO, "No throttling states\n"));
-                return 0;
-        }
-        /* TBD: Support duty_cycle values that span bit 4. */
-        else if ((pr->throttling.duty_offset + pr->throttling.duty_width) > 4) {
-                printk(KERN_WARNING PREFIX "duty_cycle spans bit 4\n");
-                return 0;
-        }
-
         /*
          * PIIX4 Errata: We don't support throttling on the original PIIX4.
          * This shouldn't be an issue as few (if any) mobile systems ever
@@ -600,21 +801,6 @@ int acpi_processor_get_throttling_info(struct acpi_processor *pr)
                 return 0;
         }
 
-        pr->throttling.state_count = 1 << acpi_gbl_FADT.duty_width;
-
-        /*
-         * Compute state values. Note that throttling displays a linear power/
-         * performance relationship (at 50% performance the CPU will consume
-         * 50% power).  Values are in 1/10th of a percent to preserve accuracy.
-         */
-
-        step = (1000 / pr->throttling.state_count);
-
-        for (i = 0; i < pr->throttling.state_count; i++) {
-                pr->throttling.states[i].performance = step * i;
-                pr->throttling.states[i].power = step * i;
-        }
-
         ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Found %d throttling states\n",
                           pr->throttling.state_count));
 
diff --git a/drivers/acpi/sbs.c b/drivers/acpi/sbs.c
index 90fd09c65f95..22cb95b349e4 100644
--- a/drivers/acpi/sbs.c
+++ b/drivers/acpi/sbs.c
@@ -29,7 +29,7 @@
 #include <linux/moduleparam.h>
 #include <linux/kernel.h>
 
-#ifdef CONFIG_ACPI_PROCFS
+#ifdef CONFIG_ACPI_PROCFS_POWER
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
 #include <asm/uaccess.h>
@@ -54,12 +54,6 @@
 #define ACPI_BATTERY_DIR_NAME           "BAT%i"
 #define ACPI_AC_DIR_NAME                "AC0"
 
-enum acpi_sbs_device_addr {
-        ACPI_SBS_CHARGER = 0x9,
-        ACPI_SBS_MANAGER = 0xa,
-        ACPI_SBS_BATTERY = 0xb,
-};
-
 #define ACPI_SBS_NOTIFY_STATUS          0x80
 #define ACPI_SBS_NOTIFY_INFO            0x81
 
@@ -88,7 +82,7 @@ MODULE_DEVICE_TABLE(acpi, sbs_device_ids);
 struct acpi_battery {
         struct power_supply bat;
         struct acpi_sbs *sbs;
-#ifdef CONFIG_ACPI_PROCFS
+#ifdef CONFIG_ACPI_PROCFS_POWER
         struct proc_dir_entry *proc_entry;
 #endif
         unsigned long update_time;
@@ -113,6 +107,7 @@ struct acpi_battery {
         u16 spec;
         u8 id;
         u8 present:1;
+        u8 have_sysfs_alarm:1;
 };
 
 #define to_acpi_battery(x) container_of(x, struct acpi_battery, bat);
@@ -122,7 +117,7 @@ struct acpi_sbs {
         struct acpi_device *device;
         struct acpi_smb_hc *hc;
         struct mutex lock;
-#ifdef CONFIG_ACPI_PROCFS
+#ifdef CONFIG_ACPI_PROCFS_POWER
         struct proc_dir_entry *charger_entry;
 #endif
         struct acpi_battery battery[MAX_SBS_BAT];
@@ -468,7 +463,7 @@ static struct device_attribute alarm_attr = {
                               FS Interface (/proc/acpi)
    -------------------------------------------------------------------------- */
 
-#ifdef CONFIG_ACPI_PROCFS
+#ifdef CONFIG_ACPI_PROCFS_POWER
 /* Generic Routines */
 static int
 acpi_sbs_add_fs(struct proc_dir_entry **dir,
@@ -538,7 +533,7 @@ static struct proc_dir_entry *acpi_battery_dir = NULL;
 
 static inline char *acpi_battery_units(struct acpi_battery *battery)
 {
-        return acpi_battery_mode(battery) ? " mWh" : " mAh";
+        return acpi_battery_mode(battery) ? " mW" : " mA";
 }
 
 
@@ -555,10 +550,10 @@ static int acpi_battery_read_info(struct seq_file *seq, void *offset)
         if (!battery->present)
                 goto end;
 
-        seq_printf(seq, "design capacity:         %i%s\n",
+        seq_printf(seq, "design capacity:         %i%sh\n",
                    battery->design_capacity * acpi_battery_scale(battery),
                    acpi_battery_units(battery));
-        seq_printf(seq, "last full capacity:      %i%s\n",
+        seq_printf(seq, "last full capacity:      %i%sh\n",
                    battery->full_charge_capacity * acpi_battery_scale(battery),
                    acpi_battery_units(battery));
         seq_printf(seq, "battery technology:      rechargeable\n");
@@ -589,7 +584,7 @@ static int acpi_battery_read_state(struct seq_file *seq, void *offset)
 {
         struct acpi_battery *battery = seq->private;
         struct acpi_sbs *sbs = battery->sbs;
-        int result = 0;
+        int rate;
 
         mutex_lock(&sbs->lock);
         seq_printf(seq, "present:                 %s\n",
@@ -603,9 +598,12 @@ static int acpi_battery_read_state(struct seq_file *seq, void *offset)
         seq_printf(seq, "charging state:          %s\n",
                    (battery->current_now < 0) ? "discharging" :
                    ((battery->current_now > 0) ? "charging" : "charged"));
-        seq_printf(seq, "present rate:            %d mA\n",
-                   abs(battery->current_now) * acpi_battery_ipscale(battery));
-        seq_printf(seq, "remaining capacity:      %i%s\n",
+        rate = abs(battery->current_now) * acpi_battery_ipscale(battery);
+        rate *= (acpi_battery_mode(battery))?(battery->voltage_now *
+                        acpi_battery_vscale(battery)/1000):1;
+        seq_printf(seq, "present rate:            %d%s\n", rate,
+                   acpi_battery_units(battery));
+        seq_printf(seq, "remaining capacity:      %i%sh\n",
                    battery->capacity_now * acpi_battery_scale(battery),
                    acpi_battery_units(battery));
         seq_printf(seq, "present voltage:         %i mV\n",
@@ -613,7 +611,7 @@ static int acpi_battery_read_state(struct seq_file *seq, void *offset)
 
       end:
         mutex_unlock(&sbs->lock);
-        return result;
+        return 0;
 }
 
 static int acpi_battery_state_open_fs(struct inode *inode, struct file *file)
@@ -637,7 +635,7 @@ static int acpi_battery_read_alarm(struct seq_file *seq, void *offset)
         acpi_battery_get_alarm(battery);
         seq_printf(seq, "alarm:                   ");
         if (battery->alarm_capacity)
-                seq_printf(seq, "%i%s\n",
+                seq_printf(seq, "%i%sh\n",
                            battery->alarm_capacity *
                            acpi_battery_scale(battery),
                            acpi_battery_units(battery));
@@ -789,7 +787,7 @@ static int acpi_battery_add(struct acpi_sbs *sbs, int id)
                 return result;
 
         sprintf(battery->name, ACPI_BATTERY_DIR_NAME, id);
-#ifdef CONFIG_ACPI_PROCFS
+#ifdef CONFIG_ACPI_PROCFS_POWER
         acpi_sbs_add_fs(&battery->proc_entry, acpi_battery_dir,
                         battery->name, &acpi_battery_info_fops,
                         &acpi_battery_state_fops, &acpi_battery_alarm_fops,
@@ -808,7 +806,13 @@ static int acpi_battery_add(struct acpi_sbs *sbs, int id)
         }
         battery->bat.get_property = acpi_sbs_battery_get_property;
         result = power_supply_register(&sbs->device->dev, &battery->bat);
-        device_create_file(battery->bat.dev, &alarm_attr);
+        if (result)
+                goto end;
+        result = device_create_file(battery->bat.dev, &alarm_attr);
+        if (result)
+                goto end;
+        battery->have_sysfs_alarm = 1;
+      end:
         printk(KERN_INFO PREFIX "%s [%s]: Battery Slot [%s] (battery %s)\n",
                ACPI_SBS_DEVICE_NAME, acpi_device_bid(sbs->device),
                battery->name, sbs->battery->present ? "present" : "absent");
@@ -817,14 +821,16 @@ static int acpi_battery_add(struct acpi_sbs *sbs, int id)
 
 static void acpi_battery_remove(struct acpi_sbs *sbs, int id)
 {
-        if (sbs->battery[id].bat.dev)
-                device_remove_file(sbs->battery[id].bat.dev, &alarm_attr);
-                power_supply_unregister(&sbs->battery[id].bat);
-#ifdef CONFIG_ACPI_PROCFS
-        if (sbs->battery[id].proc_entry) {
-                acpi_sbs_remove_fs(&(sbs->battery[id].proc_entry),
-                                   acpi_battery_dir);
+        struct acpi_battery *battery = &sbs->battery[id];
+
+        if (battery->bat.dev) {
+                if (battery->have_sysfs_alarm)
+                        device_remove_file(battery->bat.dev, &alarm_attr);
+                power_supply_unregister(&battery->bat);
         }
+#ifdef CONFIG_ACPI_PROCFS_POWER
+        if (battery->proc_entry)
+                acpi_sbs_remove_fs(&battery->proc_entry, acpi_battery_dir);
 #endif
 }
 
@@ -835,7 +841,7 @@ static int acpi_charger_add(struct acpi_sbs *sbs)
         result = acpi_ac_get_present(sbs);
         if (result)
                 goto end;
-#ifdef CONFIG_ACPI_PROCFS
+#ifdef CONFIG_ACPI_PROCFS_POWER
         result = acpi_sbs_add_fs(&sbs->charger_entry, acpi_ac_dir,
                                  ACPI_AC_DIR_NAME, NULL,
                                  &acpi_ac_state_fops, NULL, sbs);
@@ -859,7 +865,7 @@ static void acpi_charger_remove(struct acpi_sbs *sbs)
 {
         if (sbs->charger.dev)
                 power_supply_unregister(&sbs->charger);
-#ifdef CONFIG_ACPI_PROCFS
+#ifdef CONFIG_ACPI_PROCFS_POWER
         if (sbs->charger_entry)
                 acpi_sbs_remove_fs(&sbs->charger_entry, acpi_ac_dir);
 #endif
@@ -965,7 +971,7 @@ static int acpi_sbs_remove(struct acpi_device *device, int type)
 
 static void acpi_sbs_rmdirs(void)
 {
-#ifdef CONFIG_ACPI_PROCFS
+#ifdef CONFIG_ACPI_PROCFS_POWER
         if (acpi_ac_dir) {
                 acpi_unlock_ac_dir(acpi_ac_dir);
                 acpi_ac_dir = NULL;
@@ -1004,7 +1010,7 @@ static int __init acpi_sbs_init(void)
 
         if (acpi_disabled)
                 return -ENODEV;
-#ifdef CONFIG_ACPI_PROCFS
+#ifdef CONFIG_ACPI_PROCFS_POWER
         acpi_ac_dir = acpi_lock_ac_dir();
         if (!acpi_ac_dir)
                 return -ENODEV;
diff --git a/drivers/acpi/sbshc.c b/drivers/acpi/sbshc.c
index 046d7c3ed356..fd40b6a1d639 100644
--- a/drivers/acpi/sbshc.c
+++ b/drivers/acpi/sbshc.c
@@ -202,10 +202,9 @@ int acpi_smbus_unregister_callback(struct acpi_smb_hc *hc)
 
 EXPORT_SYMBOL_GPL(acpi_smbus_unregister_callback);
 
-static void acpi_smbus_callback(void *context)
+static inline void acpi_smbus_callback(void *context)
 {
         struct acpi_smb_hc *hc = context;
-
         if (hc->callback)
                 hc->callback(hc->context);
 }
@@ -214,6 +213,7 @@ static int smbus_alarm(void *context)
 {
         struct acpi_smb_hc *hc = context;
         union acpi_smb_status status;
+        u8 address;
         if (smb_hc_read(hc, ACPI_SMB_STATUS, &status.raw))
                 return 0;
         /* Check if it is only a completion notify */
@@ -222,9 +222,18 @@ static int smbus_alarm(void *context)
         if (!status.fields.alarm)
                 return 0;
         mutex_lock(&hc->lock);
+        smb_hc_read(hc, ACPI_SMB_ALARM_ADDRESS, &address);
+        status.fields.alarm = 0;
         smb_hc_write(hc, ACPI_SMB_STATUS, status.raw);
-        if (hc->callback)
-                acpi_os_execute(OSL_GPE_HANDLER, acpi_smbus_callback, hc);
+        /* We are only interested in events coming from known devices */
+        switch (address >> 1) {
+                case ACPI_SBS_CHARGER:
+                case ACPI_SBS_MANAGER:
+                case ACPI_SBS_BATTERY:
+                        acpi_os_execute(OSL_GPE_HANDLER,
+                                        acpi_smbus_callback, hc);
+                default:;
+        }
         mutex_unlock(&hc->lock);
         return 0;
 }
diff --git a/drivers/acpi/sbshc.h b/drivers/acpi/sbshc.h
index 3bda3491a97b..a57b0762dd7f 100644
--- a/drivers/acpi/sbshc.h
+++ b/drivers/acpi/sbshc.h
@@ -16,6 +16,12 @@ enum acpi_smb_protocol {
 
 static const u8 SMBUS_PEC = 0x80;
 
+enum acpi_sbs_device_addr {
+        ACPI_SBS_CHARGER = 0x9,
+        ACPI_SBS_MANAGER = 0xa,
+        ACPI_SBS_BATTERY = 0xb,
+};
+
 typedef void (*smbus_alarm_callback)(void *context);
 
 extern int acpi_smbus_read(struct acpi_smb_hc *hc, u8 protocol, u8 address,
diff --git a/drivers/acpi/tables/tbutils.c b/drivers/acpi/tables/tbutils.c
index 5f1d85f2ffe4..010f19652f80 100644
--- a/drivers/acpi/tables/tbutils.c
+++ b/drivers/acpi/tables/tbutils.c
@@ -449,7 +449,7 @@ acpi_tb_parse_root_table(acpi_physical_address rsdp_address, u8 flags)
                         /* XSDT has NULL entry, RSDT is used */
                         address = rsdt_address;
                         table_entry_size = sizeof(u32);
-                        ACPI_WARNING((AE_INFO, "BIOS XSDT has NULL entry,"
+                        ACPI_WARNING((AE_INFO, "BIOS XSDT has NULL entry, "
                                         "using RSDT"));
                 }
         }
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index bac956b30c57..bd77e81e81c1 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -29,6 +29,7 @@
 #include <linux/init.h>
 #include <linux/types.h>
 #include <linux/list.h>
+#include <linux/mutex.h>
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
 #include <linux/input.h>
@@ -135,8 +136,8 @@ struct acpi_video_bus {
         u8 attached_count;
         struct acpi_video_bus_cap cap;
         struct acpi_video_bus_flags flags;
-        struct semaphore sem;
         struct list_head video_device_list;
+        struct mutex device_list_lock;  /* protects video_device_list */
         struct proc_dir_entry *dir;
         struct input_dev *input;
         char phys[32];  /* for input device */
@@ -576,7 +577,7 @@ static void acpi_video_device_find_cap(struct acpi_video_device *device)
         struct acpi_video_device_brightness *br = NULL;
 
 
-        memset(&device->cap, 0, 4);
+        memset(&device->cap, 0, sizeof(device->cap));
 
         if (ACPI_SUCCESS(acpi_get_handle(device->dev->handle, "_ADR", &h_dummy1))) {
                 device->cap._ADR = 1;
@@ -696,7 +697,7 @@ static void acpi_video_bus_find_cap(struct acpi_video_bus *video)
 {
         acpi_handle h_dummy1;
 
-        memset(&video->cap, 0, 4);
+        memset(&video->cap, 0, sizeof(video->cap));
         if (ACPI_SUCCESS(acpi_get_handle(video->device->handle, "_DOS", &h_dummy1))) {
                 video->cap._DOS = 1;
         }
@@ -896,7 +897,7 @@ acpi_video_device_write_brightness(struct file *file,
 {
         struct seq_file *m = file->private_data;
         struct acpi_video_device *dev = m->private;
-        char str[4] = { 0 };
+        char str[5] = { 0 };
         unsigned int level = 0;
         int i;
 
@@ -1436,9 +1437,9 @@ acpi_video_bus_get_one_device(struct acpi_device *device,
                         return -ENODEV;
                 }
 
-                down(&video->sem);
+                mutex_lock(&video->device_list_lock);
                 list_add_tail(&data->entry, &video->video_device_list);
-                up(&video->sem);
+                mutex_unlock(&video->device_list_lock);
 
                 acpi_video_device_add_fs(device);
 
@@ -1462,12 +1463,14 @@ acpi_video_bus_get_one_device(struct acpi_device *device,
 
 static void acpi_video_device_rebind(struct acpi_video_bus *video)
 {
-        struct list_head *node, *next;
-        list_for_each_safe(node, next, &video->video_device_list) {
-                struct acpi_video_device *dev =
-                    container_of(node, struct acpi_video_device, entry);
+        struct acpi_video_device *dev;
+
+        mutex_lock(&video->device_list_lock);
+
+        list_for_each_entry(dev, &video->video_device_list, entry)
                 acpi_video_device_bind(video, dev);
-        }
+
+        mutex_unlock(&video->device_list_lock);
 }
 
 /*
@@ -1592,30 +1595,33 @@ static int acpi_video_device_enumerate(struct acpi_video_bus *video)
 
 static int acpi_video_switch_output(struct acpi_video_bus *video, int event)
 {
-        struct list_head *node, *next;
+        struct list_head *node;
         struct acpi_video_device *dev = NULL;
         struct acpi_video_device *dev_next = NULL;
         struct acpi_video_device *dev_prev = NULL;
         unsigned long state;
         int status = 0;
 
+        mutex_lock(&video->device_list_lock);
 
-        list_for_each_safe(node, next, &video->video_device_list) {
+        list_for_each(node, &video->video_device_list) {
                 dev = container_of(node, struct acpi_video_device, entry);
                 status = acpi_video_device_get_state(dev, &state);
                 if (state & 0x2) {
-                        dev_next =
-                            container_of(node->next, struct acpi_video_device,
-                                         entry);
-                        dev_prev =
-                            container_of(node->prev, struct acpi_video_device,
-                                         entry);
+                        dev_next = container_of(node->next,
+                                        struct acpi_video_device, entry);
+                        dev_prev = container_of(node->prev,
+                                        struct acpi_video_device, entry);
                         goto out;
                 }
         }
+
         dev_next = container_of(node->next, struct acpi_video_device, entry);
         dev_prev = container_of(node->prev, struct acpi_video_device, entry);
-      out:
+
+ out:
+        mutex_unlock(&video->device_list_lock);
+
         switch (event) {
         case ACPI_VIDEO_NOTIFY_CYCLE:
         case ACPI_VIDEO_NOTIFY_NEXT_OUTPUT:
@@ -1691,24 +1697,17 @@ acpi_video_bus_get_devices(struct acpi_video_bus *video,
                            struct acpi_device *device)
 {
         int status = 0;
-        struct list_head *node, *next;
-
+        struct acpi_device *dev;
 
         acpi_video_device_enumerate(video);
 
-        list_for_each_safe(node, next, &device->children) {
-                struct acpi_device *dev =
-                    list_entry(node, struct acpi_device, node);
-
-                if (!dev)
-                        continue;
+        list_for_each_entry(dev, &device->children, node) {
 
                 status = acpi_video_bus_get_one_device(dev, video);
                 if (ACPI_FAILURE(status)) {
                         ACPI_EXCEPTION((AE_INFO, status, "Cant attach device"));
                         continue;
                 }
-
         }
         return status;
 }
@@ -1724,9 +1723,6 @@ static int acpi_video_bus_put_one_device(struct acpi_video_device *device)
 
         video = device->video;
 
-        down(&video->sem);
-        list_del(&device->entry);
-        up(&video->sem);
         acpi_video_device_remove_fs(device->dev);
 
         status = acpi_remove_notify_handler(device->dev->handle,
@@ -1734,32 +1730,34 @@ static int acpi_video_bus_put_one_device(struct acpi_video_device *device)
                                             acpi_video_device_notify);
         backlight_device_unregister(device->backlight);
         video_output_unregister(device->output_dev);
+
         return 0;
 }
 
 static int acpi_video_bus_put_devices(struct acpi_video_bus *video)
 {
         int status;
-        struct list_head *node, *next;
+        struct acpi_video_device *dev, *next;
 
+        mutex_lock(&video->device_list_lock);
 
-        list_for_each_safe(node, next, &video->video_device_list) {
-                struct acpi_video_device *data =
-                    list_entry(node, struct acpi_video_device, entry);
-                if (!data)
-                        continue;
+        list_for_each_entry_safe(dev, next, &video->video_device_list, entry) {
 
-                status = acpi_video_bus_put_one_device(data);
+                status = acpi_video_bus_put_one_device(dev);
                 if (ACPI_FAILURE(status))
                         printk(KERN_WARNING PREFIX
                                "hhuuhhuu bug in acpi video driver.\n");
 
-                if (data->brightness)
-                        kfree(data->brightness->levels);
-                kfree(data->brightness);
-                kfree(data);
+                if (dev->brightness) {
+                        kfree(dev->brightness->levels);
+                        kfree(dev->brightness);
+                }
+                list_del(&dev->entry);
+                kfree(dev);
         }
 
+        mutex_unlock(&video->device_list_lock);
+
         return 0;
 }
 
@@ -1782,9 +1780,6 @@ static void acpi_video_bus_notify(acpi_handle handle, u32 event, void *data)
         struct input_dev *input;
         int keycode;
 
-
-        printk("video bus notify\n");
-
         if (!video)
                 return;
 
@@ -1897,14 +1892,10 @@ static void acpi_video_device_notify(acpi_handle handle, u32 event, void *data)
 static int instance;
 static int acpi_video_bus_add(struct acpi_device *device)
 {
-        int result = 0;
-        acpi_status status = 0;
-        struct acpi_video_bus *video = NULL;
+        acpi_status status;
+        struct acpi_video_bus *video;
         struct input_dev *input;
-
-
-        if (!device)
-                return -EINVAL;
+        int error;
 
         video = kzalloc(sizeof(struct acpi_video_bus), GFP_KERNEL);
         if (!video)
@@ -1923,15 +1914,15 @@ static int acpi_video_bus_add(struct acpi_device *device)
         acpi_driver_data(device) = video;
 
         acpi_video_bus_find_cap(video);
-        result = acpi_video_bus_check(video);
-        if (result)
-                goto end;
+        error = acpi_video_bus_check(video);
+        if (error)
+                goto err_free_video;
 
-        result = acpi_video_bus_add_fs(device);
-        if (result)
-                goto end;
+        error = acpi_video_bus_add_fs(device);
+        if (error)
+                goto err_free_video;
 
-        init_MUTEX(&video->sem);
+        mutex_init(&video->device_list_lock);
         INIT_LIST_HEAD(&video->video_device_list);
 
         acpi_video_bus_get_devices(video, device);
@@ -1943,16 +1934,15 @@ static int acpi_video_bus_add(struct acpi_device *device)
         if (ACPI_FAILURE(status)) {
                 ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
                                   "Error installing notify handler\n"));
-                acpi_video_bus_stop_devices(video);
-                acpi_video_bus_put_devices(video);
-                kfree(video->attached_array);
-                acpi_video_bus_remove_fs(device);
-                result = -ENODEV;
-                goto end;
+                error = -ENODEV;
+                goto err_stop_video;
         }
 
-
         video->input = input = input_allocate_device();
+        if (!input) {
+                error = -ENOMEM;
+                goto err_uninstall_notify;
+        }
 
         snprintf(video->phys, sizeof(video->phys),
                 "%s/video/input0", acpi_device_hid(video->device));
@@ -1961,6 +1951,7 @@ static int acpi_video_bus_add(struct acpi_device *device)
         input->phys = video->phys;
         input->id.bustype = BUS_HOST;
         input->id.product = 0x06;
+        input->dev.parent = &device->dev;
         input->evbit[0] = BIT(EV_KEY);
         set_bit(KEY_SWITCHVIDEOMODE, input->keybit);
         set_bit(KEY_VIDEO_NEXT, input->keybit);
@@ -1971,18 +1962,10 @@ static int acpi_video_bus_add(struct acpi_device *device)
         set_bit(KEY_BRIGHTNESS_ZERO, input->keybit);
         set_bit(KEY_DISPLAY_OFF, input->keybit);
         set_bit(KEY_UNKNOWN, input->keybit);
-        result = input_register_device(input);
-        if (result) {
-                acpi_remove_notify_handler(video->device->handle,
-                                                ACPI_DEVICE_NOTIFY,
-                                                acpi_video_bus_notify);
-                acpi_video_bus_stop_devices(video);
-                acpi_video_bus_put_devices(video);
-                kfree(video->attached_array);
-                acpi_video_bus_remove_fs(device);
-                goto end;
-        }
 
+        error = input_register_device(input);
+        if (error)
+                goto err_free_input_dev;
 
         printk(KERN_INFO PREFIX "%s [%s] (multi-head: %s  rom: %s  post: %s)\n",
                ACPI_VIDEO_DEVICE_NAME, acpi_device_bid(device),
@@ -1990,11 +1973,23 @@ static int acpi_video_bus_add(struct acpi_device *device)
                video->flags.rom ? "yes" : "no",
                video->flags.post ? "yes" : "no");
 
-      end:
-        if (result)
-                kfree(video);
+        return 0;
+
+ err_free_input_dev:
+        input_free_device(input);
+ err_uninstall_notify:
+        acpi_remove_notify_handler(device->handle, ACPI_DEVICE_NOTIFY,
+                                   acpi_video_bus_notify);
+ err_stop_video:
+        acpi_video_bus_stop_devices(video);
+        acpi_video_bus_put_devices(video);
+        kfree(video->attached_array);
+        acpi_video_bus_remove_fs(device);
+ err_free_video:
+        kfree(video);
+        acpi_driver_data(device) = NULL;
 
-        return result;
+        return error;
 }
 
 static int acpi_video_bus_remove(struct acpi_device *device, int type)
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index ed9b407e42d4..54f38c21dd95 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -193,6 +193,8 @@ enum {
                                           ATA_FLAG_ACPI_SATA | ATA_FLAG_AN |
                                           ATA_FLAG_IPM,
         AHCI_LFLAG_COMMON               = ATA_LFLAG_SKIP_D2H_BSY,
+
+        ICH_MAP                         = 0x90, /* ICH MAP register */
 };
 
 struct ahci_cmd_hdr {
@@ -536,6 +538,10 @@ static const struct pci_device_id ahci_pci_tbl[] = {
         { PCI_VDEVICE(NVIDIA, 0x0ad9), board_ahci },            /* MCP77 */
         { PCI_VDEVICE(NVIDIA, 0x0ada), board_ahci },            /* MCP77 */
         { PCI_VDEVICE(NVIDIA, 0x0adb), board_ahci },            /* MCP77 */
+        { PCI_VDEVICE(NVIDIA, 0x0ab4), board_ahci },            /* MCP79 */
+        { PCI_VDEVICE(NVIDIA, 0x0ab5), board_ahci },            /* MCP79 */
+        { PCI_VDEVICE(NVIDIA, 0x0ab6), board_ahci },            /* MCP79 */
+        { PCI_VDEVICE(NVIDIA, 0x0ab7), board_ahci },            /* MCP79 */
         { PCI_VDEVICE(NVIDIA, 0x0ab8), board_ahci },            /* MCP79 */
         { PCI_VDEVICE(NVIDIA, 0x0ab9), board_ahci },            /* MCP79 */
         { PCI_VDEVICE(NVIDIA, 0x0aba), board_ahci },            /* MCP79 */
@@ -1267,9 +1273,9 @@ static int ahci_do_softreset(struct ata_link *link, unsigned int *class,
 
         /* prepare for SRST (AHCI-1.1 10.4.1) */
         rc = ahci_kick_engine(ap, 1);
-        if (rc)
+        if (rc && rc != -EOPNOTSUPP)
                 ata_link_printk(link, KERN_WARNING,
-                                "failed to reset engine (errno=%d)", rc);
+                                "failed to reset engine (errno=%d)\n", rc);
 
         ata_tf_init(link->device, &tf);
 
@@ -1634,7 +1640,7 @@ static void ahci_port_intr(struct ata_port *ap)
         struct ahci_host_priv *hpriv = ap->host->private_data;
         int resetting = !!(ap->pflags & ATA_PFLAG_RESETTING);
         u32 status, qc_active;
-        int rc, known_irq = 0;
+        int rc;
 
         status = readl(port_mmio + PORT_IRQ_STAT);
         writel(status, port_mmio + PORT_IRQ_STAT);
@@ -1692,80 +1698,12 @@ static void ahci_port_intr(struct ata_port *ap)
 
         rc = ata_qc_complete_multiple(ap, qc_active, NULL);
 
-        /* If resetting, spurious or invalid completions are expected,
-         * return unconditionally.
-         */
-        if (resetting)
-                return;
-
-        if (rc > 0)
-                return;
-        if (rc < 0) {
+        /* while resetting, invalid completions are expected */
+        if (unlikely(rc < 0 && !resetting)) {
                 ehi->err_mask |= AC_ERR_HSM;
                 ehi->action |= ATA_EH_SOFTRESET;
                 ata_port_freeze(ap);
-                return;
         }
-
-        /* hmmm... a spurious interrupt */
-
-        /* if !NCQ, ignore.  No modern ATA device has broken HSM
-         * implementation for non-NCQ commands.
-         */
-        if (!ap->link.sactive)
-                return;
-
-        if (status & PORT_IRQ_D2H_REG_FIS) {
-                if (!pp->ncq_saw_d2h)
-                        ata_port_printk(ap, KERN_INFO,
-                                "D2H reg with I during NCQ, "
-                                "this message won't be printed again\n");
-                pp->ncq_saw_d2h = 1;
-                known_irq = 1;
-        }
-
-        if (status & PORT_IRQ_DMAS_FIS) {
-                if (!pp->ncq_saw_dmas)
-                        ata_port_printk(ap, KERN_INFO,
-                                "DMAS FIS during NCQ, "
-                                "this message won't be printed again\n");
-                pp->ncq_saw_dmas = 1;
-                known_irq = 1;
-        }
-
-        if (status & PORT_IRQ_SDB_FIS) {
-                const __le32 *f = pp->rx_fis + RX_FIS_SDB;
-
-                if (le32_to_cpu(f[1])) {
-                        /* SDB FIS containing spurious completions
-                         * might be dangerous, whine and fail commands
-                         * with HSM violation.  EH will turn off NCQ
-                         * after several such failures.
-                         */
-                        ata_ehi_push_desc(ehi,
-                                "spurious completions during NCQ "
-                                "issue=0x%x SAct=0x%x FIS=%08x:%08x",
-                                readl(port_mmio + PORT_CMD_ISSUE),
-                                readl(port_mmio + PORT_SCR_ACT),
-                                le32_to_cpu(f[0]), le32_to_cpu(f[1]));
-                        ehi->err_mask |= AC_ERR_HSM;
-                        ehi->action |= ATA_EH_SOFTRESET;
-                        ata_port_freeze(ap);
-                } else {
-                        if (!pp->ncq_saw_sdb)
-                                ata_port_printk(ap, KERN_INFO,
-                                        "spurious SDB FIS %08x:%08x during NCQ, "
-                                        "this message won't be printed again\n",
-                                        le32_to_cpu(f[0]), le32_to_cpu(f[1]));
-                        pp->ncq_saw_sdb = 1;
-                }
-                known_irq = 1;
-        }
-
-        if (!known_irq)
-                ata_port_printk(ap, KERN_INFO, "spurious interrupt "
-                                "(irq_stat 0x%x active_tag 0x%x sactive 0x%x)\n",
-                                status, ap->link.active_tag, ap->link.sactive);
 }
 
 static void ahci_irq_clear(struct ata_port *ap)
@@ -2269,6 +2207,22 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
         if (rc)
                 return rc;
 
+        if (pdev->vendor == PCI_VENDOR_ID_INTEL &&
+            (pdev->device == 0x2652 || pdev->device == 0x2653)) {
+                u8 map;
+
+                /* ICH6s share the same PCI ID for both piix and ahci
+                 * modes.  Enabling ahci mode while MAP indicates
+                 * combined mode is a bad idea.  Yield to ata_piix.
+                 */
+                pci_read_config_byte(pdev, ICH_MAP, &map);
+                if (map & 0x3) {
+                        dev_printk(KERN_INFO, &pdev->dev, "controller is in "
+                                   "combined mode, can't enable AHCI mode\n");
+                        return -ENODEV;
+                }
+        }
+
         hpriv = devm_kzalloc(dev, sizeof(*hpriv), GFP_KERNEL);
         if (!hpriv)
                 return -ENOMEM;
diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c
index 328ce8a08426..bb62a588f489 100644
--- a/drivers/ata/ata_piix.c
+++ b/drivers/ata/ata_piix.c
@@ -119,18 +119,19 @@ enum {
         PIIX_80C_SEC            = (1 << 7) | (1 << 6),
 
         /* controller IDs */
-        piix_pata_33            = 0,    /* PIIX4 at 33Mhz */
-        ich_pata_33             = 1,    /* ICH up to UDMA 33 only */
-        ich_pata_66             = 2,    /* ICH up to 66 Mhz */
-        ich_pata_100            = 3,    /* ICH up to UDMA 100 */
-        ich5_sata               = 5,
-        ich6_sata               = 6,
-        ich6_sata_ahci          = 7,
-        ich6m_sata_ahci         = 8,
-        ich8_sata_ahci          = 9,
-        piix_pata_mwdma         = 10,   /* PIIX3 MWDMA only */
-        tolapai_sata_ahci       = 11,
-        ich9_2port_sata         = 12,
+        piix_pata_mwdma         = 0,    /* PIIX3 MWDMA only */
+        piix_pata_33,                   /* PIIX4 at 33Mhz */
+        ich_pata_33,                    /* ICH up to UDMA 33 only */
+        ich_pata_66,                    /* ICH up to 66 Mhz */
+        ich_pata_100,                   /* ICH up to UDMA 100 */
+        ich5_sata,
+        ich6_sata,
+        ich6_sata_ahci,
+        ich6m_sata_ahci,
+        ich8_sata_ahci,
+        ich8_2port_sata,
+        ich8m_apple_sata_ahci,          /* locks up on second port enable */
+        tolapai_sata_ahci,
 
         /* constants for mapping table */
         P0                      = 0,  /* port 0 */
@@ -239,19 +240,21 @@ static const struct pci_device_id piix_pci_tbl[] = {
         /* SATA Controller 1 IDE (ICH8) */
         { 0x8086, 0x2820, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_ahci },
         /* SATA Controller 2 IDE (ICH8) */
-        { 0x8086, 0x2825, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich9_2port_sata },
+        { 0x8086, 0x2825, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
         /* Mobile SATA Controller IDE (ICH8M) */
         { 0x8086, 0x2828, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_ahci },
+        /* Mobile SATA Controller IDE (ICH8M), Apple */
+        { 0x8086, 0x2828, 0x106b, 0x00a0, 0, 0, ich8m_apple_sata_ahci },
         /* SATA Controller IDE (ICH9) */
         { 0x8086, 0x2920, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_ahci },
         /* SATA Controller IDE (ICH9) */
-        { 0x8086, 0x2921, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich9_2port_sata },
+        { 0x8086, 0x2921, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
         /* SATA Controller IDE (ICH9) */
-        { 0x8086, 0x2926, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich9_2port_sata },
+        { 0x8086, 0x2926, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
         /* SATA Controller IDE (ICH9M) */
-        { 0x8086, 0x2928, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich9_2port_sata },
+        { 0x8086, 0x2928, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
         /* SATA Controller IDE (ICH9M) */
-        { 0x8086, 0x292d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich9_2port_sata },
+        { 0x8086, 0x292d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
         /* SATA Controller IDE (ICH9M) */
         { 0x8086, 0x292e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_ahci },
         /* SATA Controller IDE (Tolapai) */
@@ -427,7 +430,7 @@ static const struct piix_map_db ich6m_map_db = {
 
 static const struct piix_map_db ich8_map_db = {
         .mask = 0x3,
-        .port_enable = 0x3,
+        .port_enable = 0xf,
         .map = {
                 /* PM   PS   SM   SS       MAP */
                 {  P0,  P2,  P1,  P3 }, /* 00b (hardwired when in AHCI) */
@@ -437,7 +440,7 @@ static const struct piix_map_db ich8_map_db = {
         },
 };
 
-static const struct piix_map_db tolapai_map_db = {
+static const struct piix_map_db ich8_2port_map_db = {
         .mask = 0x3,
         .port_enable = 0x3,
         .map = {
@@ -449,7 +452,19 @@ static const struct piix_map_db tolapai_map_db = {
         },
 };
 
-static const struct piix_map_db ich9_2port_map_db = {
+static const struct piix_map_db ich8m_apple_map_db = {
+        .mask = 0x3,
+        .port_enable = 0x1,
+        .map = {
+                /* PM   PS   SM   SS       MAP */
+                {  P0,  NA,  NA,  NA }, /* 00b */
+                {  RV,  RV,  RV,  RV },
+                {  P0,  P2, IDE, IDE }, /* 10b */
+                {  RV,  RV,  RV,  RV },
+        },
+};
+
+static const struct piix_map_db tolapai_map_db = {
         .mask = 0x3,
         .port_enable = 0x3,
         .map = {
@@ -467,11 +482,21 @@ static const struct piix_map_db *piix_map_db_table[] = {
         [ich6_sata_ahci]        = &ich6_map_db,
         [ich6m_sata_ahci]       = &ich6m_map_db,
         [ich8_sata_ahci]        = &ich8_map_db,
+        [ich8_2port_sata]       = &ich8_2port_map_db,
+        [ich8m_apple_sata_ahci] = &ich8m_apple_map_db,
         [tolapai_sata_ahci]     = &tolapai_map_db,
-        [ich9_2port_sata]       = &ich9_2port_map_db,
 };
 
 static struct ata_port_info piix_port_info[] = {
+        [piix_pata_mwdma] =     /* PIIX3 MWDMA only */
+        {
+                .sht            = &piix_sht,
+                .flags          = PIIX_PATA_FLAGS,
+                .pio_mask       = 0x1f, /* pio0-4 */
+                .mwdma_mask     = 0x06, /* mwdma1-2 ?? CHECK 0 should be ok but slow */
+                .port_ops       = &piix_pata_ops,
+        },
+
         [piix_pata_33] =        /* PIIX4 at 33MHz */
         {
                 .sht            = &piix_sht,
@@ -565,13 +590,15 @@ static struct ata_port_info piix_port_info[] = {
                 .port_ops       = &piix_sata_ops,
         },
 
-        [piix_pata_mwdma] =     /* PIIX3 MWDMA only */
+        [ich8_2port_sata] =
         {
                 .sht            = &piix_sht,
-                .flags          = PIIX_PATA_FLAGS,
+                .flags          = PIIX_SATA_FLAGS | PIIX_FLAG_SCR |
+                                  PIIX_FLAG_AHCI,
                 .pio_mask       = 0x1f, /* pio0-4 */
-                .mwdma_mask     = 0x06, /* mwdma1-2 ?? CHECK 0 should be ok but slow */
-                .port_ops       = &piix_pata_ops,
+                .mwdma_mask     = 0x07, /* mwdma0-2 */
+                .udma_mask      = ATA_UDMA6,
+                .port_ops       = &piix_sata_ops,
         },
 
         [tolapai_sata_ahci] =
@@ -585,7 +612,7 @@ static struct ata_port_info piix_port_info[] = {
                 .port_ops       = &piix_sata_ops,
         },
 
-        [ich9_2port_sata] =
+        [ich8m_apple_sata_ahci] =
         {
                 .sht            = &piix_sht,
                 .flags          = PIIX_SATA_FLAGS | PIIX_FLAG_SCR |
@@ -595,6 +622,7 @@ static struct ata_port_info piix_port_info[] = {
                 .udma_mask      = ATA_UDMA6,
                 .port_ops       = &piix_sata_ops,
         },
+
 };
 
 static struct pci_bits piix_enable_bits[] = {
@@ -939,6 +967,20 @@ static int piix_broken_suspend(void)
                         },
                 },
                 {
+                        .ident = "TECRA M3",
+                        .matches = {
+                                DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
+                                DMI_MATCH(DMI_PRODUCT_NAME, "Tecra M3"),
+                        },
+                },
+                {
+                        .ident = "TECRA M4",
+                        .matches = {
+                                DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
+                                DMI_MATCH(DMI_PRODUCT_NAME, "Tecra M4"),
+                        },
+                },
+                {
                         .ident = "TECRA M5",
                         .matches = {
                                 DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
@@ -953,6 +995,20 @@ static int piix_broken_suspend(void)
                         },
                 },
                 {
+                        .ident = "TECRA A8",
+                        .matches = {
+                                DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
+                                DMI_MATCH(DMI_PRODUCT_NAME, "TECRA A8"),
+                        },
+                },
+                {
+                        .ident = "Satellite R25",
+                        .matches = {
+                                DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
+                                DMI_MATCH(DMI_PRODUCT_NAME, "Satellite R25"),
+                        },
+                },
+                {
                         .ident = "Satellite U200",
                         .matches = {
                                 DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
@@ -960,6 +1016,13 @@ static int piix_broken_suspend(void)
                         },
                 },
                 {
+                        .ident = "Satellite U200",
+                        .matches = {
+                                DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
+                                DMI_MATCH(DMI_PRODUCT_NAME, "SATELLITE U200"),
+                        },
+                },
+                {
                         .ident = "Satellite Pro U200",
                         .matches = {
                                 DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
@@ -974,6 +1037,13 @@ static int piix_broken_suspend(void)
                         },
                 },
                 {
+                        .ident = "SATELLITE U205",
+                        .matches = {
+                                DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
+                                DMI_MATCH(DMI_PRODUCT_NAME, "SATELLITE U205"),
+                        },
+                },
+                {
                         .ident = "Portege M500",
                         .matches = {
                                 DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
@@ -1086,12 +1156,12 @@ static int piix_disable_ahci(struct pci_dev *pdev)
         if (!mmio)
                 return -ENOMEM;
 
-        tmp = readl(mmio + AHCI_GLOBAL_CTL);
+        tmp = ioread32(mmio + AHCI_GLOBAL_CTL);
         if (tmp & AHCI_ENABLE) {
                 tmp &= ~AHCI_ENABLE;
-                writel(tmp, mmio + AHCI_GLOBAL_CTL);
+                iowrite32(tmp, mmio + AHCI_GLOBAL_CTL);
 
-                tmp = readl(mmio + AHCI_GLOBAL_CTL);
+                tmp = ioread32(mmio + AHCI_GLOBAL_CTL);
                 if (tmp & AHCI_ENABLE)
                         rc = -EIO;
         }
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 81898036dbca..e4dea8623a71 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -30,6 +30,14 @@
  *  Hardware documentation available from http://www.t13.org/ and
  *  http://www.sata-io.org/
  *
+ *  Standards documents from:
+ *      http://www.t13.org (ATA standards, PCI DMA IDE spec)
+ *      http://www.t10.org (SCSI MMC - for ATAPI MMC)
+ *      http://www.sata-io.org (SATA)
+ *      http://www.compactflash.org (CF)
+ *      http://www.qic.org (QIC157 - Tape and DSC)
+ *      http://www.ce-ata.org (CE-ATA: not supported)
+ *
  */
 
 #include <linux/kernel.h>
@@ -2307,8 +2315,10 @@ int ata_dev_configure(struct ata_device *dev)
         }
 
         if ((dev->class == ATA_DEV_ATAPI) &&
-            (atapi_command_packet_set(id) == TYPE_TAPE))
+            (atapi_command_packet_set(id) == TYPE_TAPE)) {
                 dev->max_sectors = ATA_MAX_SECTORS_TAPE;
+                dev->horkage |= ATA_HORKAGE_STUCK_ERR;
+        }
 
         if (dev->horkage & ATA_HORKAGE_MAX_SEC_128)
                 dev->max_sectors = min_t(unsigned int, ATA_MAX_SECTORS_128,
@@ -2581,81 +2591,6 @@ void sata_print_link_status(struct ata_link *link)
 }
 
 /**
- *      __sata_phy_reset - Wake/reset a low-level SATA PHY
- *      @ap: SATA port associated with target SATA PHY.
- *
- *      This function issues commands to standard SATA Sxxx
- *      PHY registers, to wake up the phy (and device), and
- *      clear any reset condition.
- *
- *      LOCKING:
- *      PCI/etc. bus probe sem.
- *
- */
-void __sata_phy_reset(struct ata_port *ap)
-{
-        struct ata_link *link = &ap->link;
-        unsigned long timeout = jiffies + (HZ * 5);
-        u32 sstatus;
-
-        if (ap->flags & ATA_FLAG_SATA_RESET) {
-                /* issue phy wake/reset */
-                sata_scr_write_flush(link, SCR_CONTROL, 0x301);
-                /* Couldn't find anything in SATA I/II specs, but
-                 * AHCI-1.1 10.4.2 says at least 1 ms. */
-                mdelay(1);
-        }
-        /* phy wake/clear reset */
-        sata_scr_write_flush(link, SCR_CONTROL, 0x300);
-
-        /* wait for phy to become ready, if necessary */
-        do {
-                msleep(200);
-                sata_scr_read(link, SCR_STATUS, &sstatus);
-                if ((sstatus & 0xf) != 1)
-                        break;
-        } while (time_before(jiffies, timeout));
-
-        /* print link status */
-        sata_print_link_status(link);
-
-        /* TODO: phy layer with polling, timeouts, etc. */
-        if (!ata_link_offline(link))
-                ata_port_probe(ap);
-        else
-                ata_port_disable(ap);
-
-        if (ap->flags & ATA_FLAG_DISABLED)
-                return;
-
-        if (ata_busy_sleep(ap, ATA_TMOUT_BOOT_QUICK, ATA_TMOUT_BOOT)) {
-                ata_port_disable(ap);
-                return;
-        }
-
-        ap->cbl = ATA_CBL_SATA;
-}
-
-/**
- *      sata_phy_reset - Reset SATA bus.
- *      @ap: SATA port associated with target SATA PHY.
- *
- *      This function resets the SATA bus, and then probes
- *      the bus for devices.
- *
- *      LOCKING:
- *      PCI/etc. bus probe sem.
- *
- */
-void sata_phy_reset(struct ata_port *ap)
-{
-        __sata_phy_reset(ap);
-        if (ap->flags & ATA_FLAG_DISABLED)
-                return;
-        ata_bus_reset(ap);
-}
-
-/**
  *      ata_dev_pair            -       return other device on cable
  *      @adev: device
  *
@@ -4205,6 +4140,7 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = {
         /* Devices where NCQ should be avoided */
         /* NCQ is slow */
         { "WDC WD740ADFD-00",   NULL,           ATA_HORKAGE_NONCQ },
+        { "WDC WD740ADFD-00NLR1", NULL,         ATA_HORKAGE_NONCQ, },
         /* http://thread.gmane.org/gmane.linux.ide/14907 */
         { "FUJITSU MHT2060BH",  NULL,           ATA_HORKAGE_NONCQ },
         /* NCQ is broken */
@@ -4219,23 +4155,6 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = {
         { "HTS541060G9SA00",    "MB3OC60D",     ATA_HORKAGE_NONCQ, },
         { "HTS541080G9SA00",    "MB4OC60D",     ATA_HORKAGE_NONCQ, },
         { "HTS541010G9SA00",    "MBZOC60D",     ATA_HORKAGE_NONCQ, },
-        /* Drives which do spurious command completion */
-        { "HTS541680J9SA00",    "SB2IC7EP",     ATA_HORKAGE_NONCQ, },
-        { "HTS541612J9SA00",    "SBDIC7JP",     ATA_HORKAGE_NONCQ, },
-        { "HDT722516DLA380",    "V43OA96A",     ATA_HORKAGE_NONCQ, },
-        { "Hitachi HTS541616J9SA00", "SB4OC70P", ATA_HORKAGE_NONCQ, },
-        { "Hitachi HTS542525K9SA00", "BBFOC31P", ATA_HORKAGE_NONCQ, },
-        { "WDC WD740ADFD-00NLR1", NULL,         ATA_HORKAGE_NONCQ, },
-        { "WDC WD3200AAJS-00RYA0", "12.01B01",  ATA_HORKAGE_NONCQ, },
-        { "FUJITSU MHV2080BH",  "00840028",     ATA_HORKAGE_NONCQ, },
-        { "ST9120822AS",        "3.CLF",        ATA_HORKAGE_NONCQ, },
-        { "ST9160821AS",        "3.CLF",        ATA_HORKAGE_NONCQ, },
-        { "ST9160821AS",        "3.ALD",        ATA_HORKAGE_NONCQ, },
-        { "ST9160821AS",        "3.CCD",        ATA_HORKAGE_NONCQ, },
-        { "ST3160812AS",        "3.ADJ",        ATA_HORKAGE_NONCQ, },
-        { "ST980813AS",         "3.ADB",        ATA_HORKAGE_NONCQ, },
-        { "SAMSUNG HD401LJ",    "ZZ100-15",     ATA_HORKAGE_NONCQ, },
-        { "Maxtor 7V300F0",     "VA111900",     ATA_HORKAGE_NONCQ, },
 
         /* devices which puke on READ_NATIVE_MAX */
         { "HDS724040KLSA80",    "KFAOA20N",     ATA_HORKAGE_BROKEN_HPA, },
@@ -4250,6 +4169,9 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = {
         /* Devices which get the IVB wrong */
         { "QUANTUM FIREBALLlct10 05", "A03.0900", ATA_HORKAGE_IVB, },
         { "TSSTcorp CDDVDW SH-S202J", "SB00",     ATA_HORKAGE_IVB, },
+        { "TSSTcorp CDDVDW SH-S202J", "SB01",     ATA_HORKAGE_IVB, },
+        { "TSSTcorp CDDVDW SH-S202N", "SB00",     ATA_HORKAGE_IVB, },
+        { "TSSTcorp CDDVDW SH-S202N", "SB01",     ATA_HORKAGE_IVB, },
 
         /* End Marker */
         { }
@@ -5490,11 +5412,19 @@ fsm_start:
                  * let the EH abort the command or reset the device.
                  */
                 if (unlikely(status & (ATA_ERR | ATA_DF))) {
-                        ata_port_printk(ap, KERN_WARNING, "DRQ=1 with device "
-                                        "error, dev_stat 0x%X\n", status);
-                        qc->err_mask |= AC_ERR_HSM;
-                        ap->hsm_task_state = HSM_ST_ERR;
-                        goto fsm_start;
+                        /* Some ATAPI tape drives forget to clear the ERR bit
+                         * when doing the next command (mostly request sense).
+                         * We ignore ERR here to workaround and proceed sending
+                         * the CDB.
+                         */
+                        if (!(qc->dev->horkage & ATA_HORKAGE_STUCK_ERR)) {
+                                ata_port_printk(ap, KERN_WARNING,
+                                                "DRQ=1 with device error, "
+                                                "dev_stat 0x%X\n", status);
+                                qc->err_mask |= AC_ERR_HSM;
+                                ap->hsm_task_state = HSM_ST_ERR;
+                                goto fsm_start;
+                        }
                 }
 
                 /* Send the CDB (atapi) or the first data block (ata pio out).
@@ -7021,12 +6951,11 @@ int ata_host_start(struct ata_host *host)
                 if (ap->ops->port_start) {
                         rc = ap->ops->port_start(ap);
                         if (rc) {
-                                ata_port_printk(ap, KERN_ERR, "failed to "
-                                                "start port (errno=%d)\n", rc);
+                                if (rc != -ENODEV)
+                                        dev_printk(KERN_ERR, host->dev, "failed to start port %d (errno=%d)\n", i, rc);
                                 goto err_out;
                         }
                 }
-
                 ata_eh_freeze_port(ap);
         }
 
@@ -7653,8 +7582,6 @@ EXPORT_SYMBOL_GPL(ata_dev_disable);
 EXPORT_SYMBOL_GPL(sata_set_spd);
 EXPORT_SYMBOL_GPL(sata_link_debounce);
 EXPORT_SYMBOL_GPL(sata_link_resume);
-EXPORT_SYMBOL_GPL(sata_phy_reset);
-EXPORT_SYMBOL_GPL(__sata_phy_reset);
 EXPORT_SYMBOL_GPL(ata_bus_reset);
 EXPORT_SYMBOL_GPL(ata_std_prereset);
 EXPORT_SYMBOL_GPL(ata_std_softreset);
@@ -7725,7 +7652,6 @@ EXPORT_SYMBOL_GPL(ata_port_desc);
 #ifdef CONFIG_PCI
 EXPORT_SYMBOL_GPL(ata_port_pbar_desc);
 #endif /* CONFIG_PCI */
-EXPORT_SYMBOL_GPL(ata_eng_timeout);
 EXPORT_SYMBOL_GPL(ata_port_schedule_eh);
 EXPORT_SYMBOL_GPL(ata_link_abort);
 EXPORT_SYMBOL_GPL(ata_port_abort);
diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c
index ed8813b222a0..e6605f038647 100644
--- a/drivers/ata/libata-eh.c
+++ b/drivers/ata/libata-eh.c
@@ -559,101 +559,6 @@ void ata_port_wait_eh(struct ata_port *ap)
         }
 }
 
-/**
- *      ata_qc_timeout - Handle timeout of queued command
- *      @qc: Command that timed out
- *
- *      Some part of the kernel (currently, only the SCSI layer)
- *      has noticed that the active command on port @ap has not
- *      completed after a specified length of time.  Handle this
- *      condition by disabling DMA (if necessary) and completing
- *      transactions, with error if necessary.
- *
- *      This also handles the case of the "lost interrupt", where
- *      for some reason (possibly hardware bug, possibly driver bug)
- *      an interrupt was not delivered to the driver, even though the
- *      transaction completed successfully.
- *
- *      TODO: kill this function once old EH is gone.
- *
- *      LOCKING:
- *      Inherited from SCSI layer (none, can sleep)
- */
-static void ata_qc_timeout(struct ata_queued_cmd *qc)
-{
-        struct ata_port *ap = qc->ap;
-        u8 host_stat = 0, drv_stat;
-        unsigned long flags;
-
-        DPRINTK("ENTER\n");
-
-        ap->hsm_task_state = HSM_ST_IDLE;
-
-        spin_lock_irqsave(ap->lock, flags);
-
-        switch (qc->tf.protocol) {
-
-        case ATA_PROT_DMA:
-        case ATA_PROT_ATAPI_DMA:
-                host_stat = ap->ops->bmdma_status(ap);
-
-                /* before we do anything else, clear DMA-Start bit */
-                ap->ops->bmdma_stop(qc);
-
-                /* fall through */
-
-        default:
-                ata_altstatus(ap);
-                drv_stat = ata_chk_status(ap);
-
-                /* ack bmdma irq events */
-                ap->ops->irq_clear(ap);
-
-                ata_dev_printk(qc->dev, KERN_ERR, "command 0x%x timeout, "
-                               "stat 0x%x host_stat 0x%x\n",
-                               qc->tf.command, drv_stat, host_stat);
-
-                /* complete taskfile transaction */
-                qc->err_mask |= AC_ERR_TIMEOUT;
-                break;
-        }
-
-        spin_unlock_irqrestore(ap->lock, flags);
-
-        ata_eh_qc_complete(qc);
-
-        DPRINTK("EXIT\n");
-}
-
-/**
- *      ata_eng_timeout - Handle timeout of queued command
- *      @ap: Port on which timed-out command is active
- *
- *      Some part of the kernel (currently, only the SCSI layer)
- *      has noticed that the active command on port @ap has not
- *      completed after a specified length of time.  Handle this
- *      condition by disabling DMA (if necessary) and completing
- *      transactions, with error if necessary.
- *
- *      This also handles the case of the "lost interrupt", where
- *      for some reason (possibly hardware bug, possibly driver bug)
- *      an interrupt was not delivered to the driver, even though the
- *      transaction completed successfully.
- *
- *      TODO: kill this function once old EH is gone.
- *
- *      LOCKING:
- *      Inherited from SCSI layer (none, can sleep)
- */
-void ata_eng_timeout(struct ata_port *ap)
-{
-        DPRINTK("ENTER\n");
-
-        ata_qc_timeout(ata_qc_from_tag(ap, ap->link.active_tag));
-
-        DPRINTK("EXIT\n");
-}
-
 static int ata_eh_nr_in_flight(struct ata_port *ap)
 {
         unsigned int tag;
@@ -1945,30 +1850,54 @@ static void ata_eh_link_report(struct ata_link *link)
                   ehc->i.serror & SERR_DEV_XCHG ? "DevExch " : "");
 
         for (tag = 0; tag < ATA_MAX_QUEUE; tag++) {
-                static const char *dma_str[] = {
-                        [DMA_BIDIRECTIONAL]     = "bidi",
-                        [DMA_TO_DEVICE]         = "out",
-                        [DMA_FROM_DEVICE]       = "in",
-                        [DMA_NONE]              = "",
-                };
                 struct ata_queued_cmd *qc = __ata_qc_from_tag(ap, tag);
                 struct ata_taskfile *cmd = &qc->tf, *res = &qc->result_tf;
+                const u8 *cdb = qc->cdb;
+                char data_buf[20] = "";
+                char cdb_buf[70] = "";
 
                 if (!(qc->flags & ATA_QCFLAG_FAILED) ||
                     qc->dev->link != link || !qc->err_mask)
                         continue;
 
+                if (qc->dma_dir != DMA_NONE) {
+                        static const char *dma_str[] = {
+                                [DMA_BIDIRECTIONAL]     = "bidi",
+                                [DMA_TO_DEVICE]         = "out",
+                                [DMA_FROM_DEVICE]       = "in",
+                        };
+                        static const char *prot_str[] = {
+                                [ATA_PROT_PIO]          = "pio",
+                                [ATA_PROT_DMA]          = "dma",
+                                [ATA_PROT_NCQ]          = "ncq",
+                                [ATA_PROT_ATAPI]        = "pio",
+                                [ATA_PROT_ATAPI_DMA]    = "dma",
+                        };
+
+                        snprintf(data_buf, sizeof(data_buf), " %s %u %s",
+                                 prot_str[qc->tf.protocol], qc->nbytes,
+                                 dma_str[qc->dma_dir]);
+                }
+
+                if (is_atapi_taskfile(&qc->tf))
+                        snprintf(cdb_buf, sizeof(cdb_buf),
+                                 "cdb %02x %02x %02x %02x %02x %02x %02x %02x  "
+                                 "%02x %02x %02x %02x %02x %02x %02x %02x\n         ",
+                                 cdb[0], cdb[1], cdb[2], cdb[3],
+                                 cdb[4], cdb[5], cdb[6], cdb[7],
+                                 cdb[8], cdb[9], cdb[10], cdb[11],
+                                 cdb[12], cdb[13], cdb[14], cdb[15]);
+
                 ata_dev_printk(qc->dev, KERN_ERR,
                         "cmd %02x/%02x:%02x:%02x:%02x:%02x/%02x:%02x:%02x:%02x:%02x/%02x "
-                        "tag %d cdb 0x%x data %u %s\n         "
+                        "tag %d%s\n         %s"
                         "res %02x/%02x:%02x:%02x:%02x:%02x/%02x:%02x:%02x:%02x:%02x/%02x "
                         "Emask 0x%x (%s)%s\n",
                         cmd->command, cmd->feature, cmd->nsect,
                         cmd->lbal, cmd->lbam, cmd->lbah,
                         cmd->hob_feature, cmd->hob_nsect,
                         cmd->hob_lbal, cmd->hob_lbam, cmd->hob_lbah,
-                        cmd->device, qc->tag, qc->cdb[0], qc->nbytes,
-                        dma_str[qc->dma_dir],
+                        cmd->device, qc->tag, data_buf, cdb_buf,
                         res->command, res->feature, res->nsect,
                         res->lbal, res->lbam, res->lbah,
                         res->hob_feature, res->hob_nsect,
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index 94144ed50a6b..a883bb03d4c7 100644
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -2485,11 +2485,40 @@ static unsigned int atapi_xlat(struct ata_queued_cmd *qc)
         if (!using_pio && ata_check_atapi_dma(qc))
                 using_pio = 1;
 
-        /* Some controller variants snoop this value for Packet transfers
-           to do state machine and FIFO management. Thus we want to set it
-           properly, and for DMA where it is effectively meaningless */
+        /* Some controller variants snoop this value for Packet
+         * transfers to do state machine and FIFO management.  Thus we
+         * want to set it properly, and for DMA where it is
+         * effectively meaningless.
+         */
         nbytes = min(qc->nbytes, (unsigned int)63 * 1024);
 
+        /* Most ATAPI devices which honor transfer chunk size don't
+         * behave according to the spec when odd chunk size which
+         * matches the transfer length is specified.  If the number of
+         * bytes to transfer is 2n+1.  According to the spec, what
+         * should happen is to indicate that 2n+1 is going to be
+         * transferred and transfer 2n+2 bytes where the last byte is
+         * padding.
+         *
+         * In practice, this doesn't happen.  ATAPI devices first
+         * indicate and transfer 2n bytes and then indicate and
+         * transfer 2 bytes where the last byte is padding.
+         *
+         * This inconsistency confuses several controllers which
+         * perform PIO using DMA such as Intel AHCIs and sil3124/32.
+         * These controllers use actual number of transferred bytes to
+         * update DMA poitner and transfer of 4n+2 bytes make those
+         * controller push DMA pointer by 4n+4 bytes because SATA data
+         * FISes are aligned to 4 bytes.  This causes data corruption
+         * and buffer overrun.
+         *
+         * Always setting nbytes to even number solves this problem
+         * because then ATAPI devices don't have to split data at 2n
+         * boundaries.
+         */
+        if (nbytes & 0x1)
+                nbytes++;
+
         qc->tf.lbam = (nbytes & 0xFF);
         qc->tf.lbah = (nbytes >> 8);
 
@@ -2869,7 +2898,8 @@ static inline int __ata_scsi_queuecmd(struct scsi_cmnd *scmd,
                 xlat_func = NULL;
                 if (likely((scsi_op != ATA_16) || !atapi_passthru16)) {
                         /* relay SCSI command to ATAPI device */
-                        if (unlikely(scmd->cmd_len > dev->cdb_len))
+                        int len = COMMAND_SIZE(scsi_op);
+                        if (unlikely(len > scmd->cmd_len || len > dev->cdb_len))
                                 goto bad_cdb_len;
 
                         xlat_func = atapi_xlat;
diff --git a/drivers/ata/pata_ali.c b/drivers/ata/pata_ali.c
index 364534e7aff4..8caf9afc8b90 100644
--- a/drivers/ata/pata_ali.c
+++ b/drivers/ata/pata_ali.c
@@ -63,6 +63,9 @@ static int ali_cable_override(struct pci_dev *pdev)
         /* Fujitsu P2000 */
         if (pdev->subsystem_vendor == 0x10CF && pdev->subsystem_device == 0x10AF)
                 return 1;
+        /* Mitac 8317 (Winbook-A) and relatives */
+        if (pdev->subsystem_vendor == 0x1071  && pdev->subsystem_device == 0x8317)
+                return 1;
         /* Systems by DMI */
         if (dmi_check_system(cable_dmi_table))
                 return 1;
@@ -282,6 +285,21 @@ static void ali_lock_sectors(struct ata_device *adev)
         adev->max_sectors = 255;
 }
 
+/**
+ *      ali_check_atapi_dma     -       DMA check for most ALi controllers
+ *      @adev: Device
+ *
+ *      Called to decide whether commands should be sent by DMA or PIO
+ */
+
+static int ali_check_atapi_dma(struct ata_queued_cmd *qc)
+{
+        /* If its not a media command, its not worth it */
+        if (qc->nbytes < 2048)
+                return -EOPNOTSUPP;
+        return 0;
+}
+
 static struct scsi_host_template ali_sht = {
         .module                 = THIS_MODULE,
         .name                   = DRV_NAME,
@@ -378,6 +396,7 @@ static struct ata_port_operations ali_c2_port_ops = {
         .mode_filter    = ata_pci_default_filter,
         .tf_load        = ata_tf_load,
         .tf_read        = ata_tf_read,
+        .check_atapi_dma = ali_check_atapi_dma,
         .check_status   = ata_check_status,
         .exec_command   = ata_exec_command,
         .dev_select     = ata_std_dev_select,
@@ -415,6 +434,7 @@ static struct ata_port_operations ali_c5_port_ops = {
         .mode_filter    = ata_pci_default_filter,
         .tf_load        = ata_tf_load,
         .tf_read        = ata_tf_read,
+        .check_atapi_dma = ali_check_atapi_dma,
         .check_status   = ata_check_status,
         .exec_command   = ata_exec_command,
         .dev_select     = ata_std_dev_select,
diff --git a/drivers/ata/pata_amd.c b/drivers/ata/pata_amd.c
index c5779ad4abca..3cc27b514654 100644
--- a/drivers/ata/pata_amd.c
+++ b/drivers/ata/pata_amd.c
@@ -25,7 +25,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME "pata_amd"
-#define DRV_VERSION "0.3.9"
+#define DRV_VERSION "0.3.10"
 
 /**
  *      timing_setup            -       shared timing computation and load
@@ -115,7 +115,8 @@ static void timing_setup(struct ata_port *ap, struct ata_device *adev, int offse
         }
 
         /* UDMA timing */
-        pci_write_config_byte(pdev, offset + 0x10 + (3 - dn), t);
+        if (at.udma)
+                pci_write_config_byte(pdev, offset + 0x10 + (3 - dn), t);
 }
 
 /**
diff --git a/drivers/ata/pata_at32.c b/drivers/ata/pata_at32.c
index bb250a48e27c..67e574de31e8 100644
--- a/drivers/ata/pata_at32.c
+++ b/drivers/ata/pata_at32.c
@@ -28,7 +28,7 @@
 #include <asm/arch/smc.h>
 
 #define DRV_NAME "pata_at32"
-#define DRV_VERSION "0.0.2"
+#define DRV_VERSION "0.0.3"
 
 /*
  * CompactFlash controller memory layout relative to the base address:
@@ -64,6 +64,8 @@
  *      Mode 2  | 8.3   | 240 ns         | 0x07
  *      Mode 3  | 11.1  | 180 ns         | 0x0f
  *      Mode 4  | 16.7  | 120 ns         | 0x1f
+ *
+ * Alter PIO_MASK below according to table to set maximal PIO mode.
  */
 #define PIO_MASK (0x1f)
 
@@ -85,36 +87,40 @@ struct at32_ide_info {
  */
 static int pata_at32_setup_timing(struct device *dev,
                                   struct at32_ide_info *info,
-                                  const struct ata_timing *timing)
+                                  const struct ata_timing *ata)
 {
-        /* These two values are found through testing */
-        const int min_recover = 25;
-        const int ncs_hold    = 15;
-
         struct smc_config *smc = &info->smc;
+        struct smc_timing timing;
 
         int active;
         int recover;
 
+        memset(&timing, 0, sizeof(struct smc_timing));
+
         /* Total cycle time */
-        smc->read_cycle = timing->cyc8b;
+        timing.read_cycle  = ata->cyc8b;
 
         /* DIOR <= CFIOR timings */
-        smc->nrd_setup = timing->setup;
-        smc->nrd_pulse = timing->act8b;
+        timing.nrd_setup   = ata->setup;
+        timing.nrd_pulse   = ata->act8b;
+        timing.nrd_recover = ata->rec8b;
+
+        /* Convert nanosecond timing to clock cycles */
+        smc_set_timing(smc, &timing);
 
-        /* Compute recover, extend total cycle if needed */
-        active  = smc->nrd_setup + smc->nrd_pulse;
+        /* Add one extra cycle setup due to signal ring */
+        smc->nrd_setup = smc->nrd_setup + 1;
+
+        active  = smc->nrd_setup + smc->nrd_pulse;
         recover = smc->read_cycle - active;
 
-        if (recover < min_recover) {
-                smc->read_cycle = active + min_recover;
-                recover = min_recover;
-        }
+        /* Need at least two cycles recovery */
+        if (recover < 2)
+          smc->read_cycle = active + 2;
 
         /* (CS0, CS1, DIR, OE) <= (CFCE1, CFCE2, CFRNW, NCSX) timings */
-        smc->ncs_read_setup  = 0;
-        smc->ncs_read_pulse  = active + ncs_hold;
+        smc->ncs_read_setup = 1;
+        smc->ncs_read_pulse = smc->read_cycle - 2;
 
         /* Write timings same as read timings */
         smc->write_cycle = smc->read_cycle;
@@ -123,11 +129,13 @@ static int pata_at32_setup_timing(struct device *dev,
         smc->ncs_write_setup = smc->ncs_read_setup;
         smc->ncs_write_pulse = smc->ncs_read_pulse;
 
-        /* Do some debugging output */
-        dev_dbg(dev, "SMC: C=%d S=%d P=%d R=%d NCSS=%d NCSP=%d NCSR=%d\n",
+        /* Do some debugging output of ATA and SMC timings */
+        dev_dbg(dev, "ATA: C=%d S=%d P=%d R=%d\n",
+                ata->cyc8b, ata->setup, ata->act8b, ata->rec8b);
+
+        dev_dbg(dev, "SMC: C=%d S=%d P=%d NS=%d NP=%d\n",
                 smc->read_cycle, smc->nrd_setup, smc->nrd_pulse,
-                recover, smc->ncs_read_setup, smc->ncs_read_pulse,
-                smc->read_cycle - smc->ncs_read_pulse);
+                smc->ncs_read_setup, smc->ncs_read_pulse);
 
         /* Finally, configure the SMC */
         return smc_set_configuration(info->cs, smc);
@@ -182,7 +190,6 @@ static struct scsi_host_template at32_sht = {
 };
 
 static struct ata_port_operations at32_port_ops = {
-        .port_disable           = ata_port_disable,
         .set_piomode            = pata_at32_set_piomode,
         .tf_load                = ata_tf_load,
         .tf_read                = ata_tf_read,
@@ -203,7 +210,6 @@ static struct ata_port_operations at32_port_ops = {
 
         .irq_clear              = pata_at32_irq_clear,
         .irq_on                 = ata_irq_on,
-        .irq_ack                = ata_irq_ack,
 
         .port_start             = ata_sff_port_start,
 };
@@ -223,8 +229,7 @@ static int __init pata_at32_init_one(struct device *dev,
         /* Setup ATA bindings */
         ap->ops      = &at32_port_ops;
         ap->pio_mask = PIO_MASK;
-        ap->flags    = ATA_FLAG_MMIO | ATA_FLAG_SLAVE_POSS
-                | ATA_FLAG_PIO_POLLING;
+        ap->flags   |= ATA_FLAG_MMIO | ATA_FLAG_SLAVE_POSS;
 
         /*
          * Since all 8-bit taskfile transfers has to go on the lower
@@ -357,12 +362,12 @@ static int __init pata_at32_probe(struct platform_device *pdev)
         info->smc.tdf_mode       = 0; /* TDF optimization disabled */
         info->smc.tdf_cycles     = 0; /* No TDF wait cycles */
 
-        /* Setup ATA timing */
+        /* Setup SMC to ATA timing */
         ret = pata_at32_setup_timing(dev, info, &initial_timing);
         if (ret)
                 goto err_setup_timing;
 
-        /* Setup ATA addresses */
+        /* Map ATA address space */
         ret = -ENOMEM;
         info->ide_addr = devm_ioremap(dev, info->res_ide.start, 16);
         info->alt_addr = devm_ioremap(dev, info->res_alt.start, 16);
@@ -373,7 +378,7 @@ static int __init pata_at32_probe(struct platform_device *pdev)
         pata_at32_debug_bus(dev, info);
 #endif
 
-        /* Register ATA device */
+        /* Setup and register ATA device */
         ret = pata_at32_init_one(dev, info);
         if (ret)
                 goto err_ata_device;
diff --git a/drivers/ata/pata_bf54x.c b/drivers/ata/pata_bf54x.c
index b5e38426b815..088a41f4e656 100644
--- a/drivers/ata/pata_bf54x.c
+++ b/drivers/ata/pata_bf54x.c
@@ -1145,13 +1145,13 @@ static unsigned char bfin_bmdma_status(struct ata_port *ap)
         unsigned short int_status = ATAPI_GET_INT_STATUS(base);
 
         if (ATAPI_GET_STATUS(base) & (MULTI_XFER_ON|ULTRA_XFER_ON)) {
-                host_stat = ATA_DMA_ACTIVE;
+                host_stat |= ATA_DMA_ACTIVE;
         }
         if (int_status & (MULTI_DONE_INT|UDMAIN_DONE_INT|UDMAOUT_DONE_INT)) {
-                host_stat = ATA_DMA_INTR;
+                host_stat |= ATA_DMA_INTR;
         }
         if (int_status & (MULTI_TERM_INT|UDMAIN_TERM_INT|UDMAOUT_TERM_INT)) {
-                host_stat = ATA_DMA_ERR;
+                host_stat |= ATA_DMA_ERR;
         }
 
         return host_stat;
@@ -1489,6 +1489,8 @@ static int __devinit bfin_atapi_probe(struct platform_device *pdev)
         int board_idx = 0;
         struct resource *res;
         struct ata_host *host;
+        unsigned int fsclk = get_sclk();
+        int udma_mode = 5;
         const struct ata_port_info *ppi[] =
                 { &bfin_port_info[board_idx], NULL };
 
@@ -1507,6 +1509,11 @@ static int __devinit bfin_atapi_probe(struct platform_device *pdev)
         if (res == NULL)
                 return -EINVAL;
 
+        while (bfin_port_info[board_idx].udma_mask>0 && udma_fsclk[udma_mode] > fsclk) {
+                udma_mode--;
+                bfin_port_info[board_idx].udma_mask >>= 1;
+        }
+
         /*
          * Now that that's out of the way, wire up the port..
          */
diff --git a/drivers/ata/pata_hpt37x.c b/drivers/ata/pata_hpt37x.c
index 3816b8605e0d..46dc70e0dee7 100644
--- a/drivers/ata/pata_hpt37x.c
+++ b/drivers/ata/pata_hpt37x.c
@@ -329,7 +329,7 @@ static int hpt37x_pre_reset(struct ata_link *link, unsigned long deadline)
         /* Restore state */
         pci_write_config_byte(pdev, 0x5B, scr2);
 
-        if (ata66 & (1 << ap->port_no))
+        if (ata66 & (2 >> ap->port_no))
                 ap->cbl = ATA_CBL_PATA40;
         else
                 ap->cbl = ATA_CBL_PATA80;
diff --git a/drivers/ata/pata_isapnp.c b/drivers/ata/pata_isapnp.c
index 88ab0e1d353f..4320e7986321 100644
--- a/drivers/ata/pata_isapnp.c
+++ b/drivers/ata/pata_isapnp.c
@@ -75,13 +75,16 @@ static int isapnp_init_one(struct pnp_dev *idev, const struct pnp_device_id *dev
         struct ata_host *host;
         struct ata_port *ap;
         void __iomem *cmd_addr, *ctl_addr;
+        int irq = 0;
+        irq_handler_t handler = NULL;
 
         if (pnp_port_valid(idev, 0) == 0)
                 return -ENODEV;
 
-        /* FIXME: Should selected polled PIO here not fail */
-        if (pnp_irq_valid(idev, 0) == 0)
-                return -ENODEV;
+        if (pnp_irq_valid(idev, 0)) {
+                irq = pnp_irq(idev, 0);
+                handler = ata_interrupt;
+        }
 
         /* allocate host */
         host = ata_host_alloc(&idev->dev, 1);
@@ -115,7 +118,7 @@ static int isapnp_init_one(struct pnp_dev *idev, const struct pnp_device_id *dev
                       (unsigned long long)pnp_port_start(idev, 1));
 
         /* activate */
-        return ata_host_activate(host, pnp_irq(idev, 0), ata_interrupt, 0,
+        return ata_host_activate(host, irq, handler, 0,
                                  &isapnp_sht);
 }
 
diff --git a/drivers/ata/pata_jmicron.c b/drivers/ata/pata_jmicron.c
index 225a7223a726..5b8174d94067 100644
--- a/drivers/ata/pata_jmicron.c
+++ b/drivers/ata/pata_jmicron.c
@@ -80,11 +80,10 @@ static int jmicron_pre_reset(struct ata_link *link, unsigned long deadline)
          *      actually do our cable checking etc. Thankfully we don't need
          *      to do the plumbing for other cases.
          */
-        switch (port_map[port])
-        {
+        switch (port_map[port]) {
         case PORT_PATA0:
-                if (control & (1 << 5))
-                        return 0;
+                if ((control & (1 << 5)) == 0)
+                        return -ENOENT;
                 if (control & (1 << 3)) /* 40/80 pin primary */
                         ap->cbl = ATA_CBL_PATA40;
                 else
@@ -93,7 +92,7 @@ static int jmicron_pre_reset(struct ata_link *link, unsigned long deadline)
         case PORT_PATA1:
                 /* Bit 21 is set if the port is enabled */
                 if ((control5 & (1 << 21)) == 0)
-                        return 0;
+                        return -ENOENT;
                 if (control5 & (1 << 19))       /* 40/80 pin secondary */
                         ap->cbl = ATA_CBL_PATA40;
                 else
diff --git a/drivers/ata/pata_sil680.c b/drivers/ata/pata_sil680.c
index 5c1e9cb59ecb..503245a1eafa 100644
--- a/drivers/ata/pata_sil680.c
+++ b/drivers/ata/pata_sil680.c
@@ -33,7 +33,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME "pata_sil680"
-#define DRV_VERSION "0.4.7"
+#define DRV_VERSION "0.4.8"
 
 #define SIL680_MMIO_BAR         5
 
@@ -94,34 +94,6 @@ static int sil680_cable_detect(struct ata_port *ap) {
 }
 
 /**
- *      sil680_bus_reset        -       reset the SIL680 bus
- *      @link: ATA link to reset
- *      @deadline: deadline jiffies for the operation
- *
- *      Perform the SIL680 housekeeping when doing an ATA bus reset
- */
-
-static int sil680_bus_reset(struct ata_link *link, unsigned int *classes,
-                            unsigned long deadline)
-{
-        struct ata_port *ap = link->ap;
-        struct pci_dev *pdev = to_pci_dev(ap->host->dev);
-        unsigned long addr = sil680_selreg(ap, 0);
-        u8 reset;
-
-        pci_read_config_byte(pdev, addr, &reset);
-        pci_write_config_byte(pdev, addr, reset | 0x03);
-        udelay(25);
-        pci_write_config_byte(pdev, addr, reset);
-        return ata_std_softreset(link, classes, deadline);
-}
-
-static void sil680_error_handler(struct ata_port *ap)
-{
-        ata_bmdma_drive_eh(ap, ata_std_prereset, sil680_bus_reset, NULL, ata_std_postreset);
-}
-
-/**
  *      sil680_set_piomode      -       set initial PIO mode data
  *      @ap: ATA interface
  *      @adev: ATA device
@@ -249,7 +221,7 @@ static struct ata_port_operations sil680_port_ops = {
 
         .freeze         = ata_bmdma_freeze,
         .thaw           = ata_bmdma_thaw,
-        .error_handler  = sil680_error_handler,
+        .error_handler  = ata_bmdma_error_handler,
         .post_internal_cmd = ata_bmdma_post_internal_cmd,
         .cable_detect   = sil680_cable_detect,
 
diff --git a/drivers/ata/pata_sis.c b/drivers/ata/pata_sis.c
index 3b5be77e861c..87546d9f1ca0 100644
--- a/drivers/ata/pata_sis.c
+++ b/drivers/ata/pata_sis.c
@@ -55,6 +55,7 @@ static const struct sis_laptop sis_laptop[] = {
         /* devid, subvendor, subdev */
         { 0x5513, 0x1043, 0x1107 },     /* ASUS A6K */
         { 0x5513, 0x1734, 0x105F },     /* FSC Amilo A1630 */
+        { 0x5513, 0x1071, 0x8640 },     /* EasyNote K5305 */
         /* end marker */
         { 0, }
 };
diff --git a/drivers/ata/pata_via.c b/drivers/ata/pata_via.c
index a4175fbdd170..453d72bf2598 100644
--- a/drivers/ata/pata_via.c
+++ b/drivers/ata/pata_via.c
@@ -63,7 +63,7 @@
 #include <linux/dmi.h>
 
 #define DRV_NAME "pata_via"
-#define DRV_VERSION "0.3.2"
+#define DRV_VERSION "0.3.3"
 
 /*
  *      The following comes directly from Vojtech Pavlik's ide/pci/via82cxxx
@@ -296,7 +296,7 @@ static void via_do_set_mode(struct ata_port *ap, struct ata_device *adev, int mo
         }
 
         /* Set UDMA unless device is not UDMA capable */
-        if (udma_type) {
+        if (udma_type && t.udma) {
                 u8 cable80_status;
 
                 /* Get 80-wire cable detection bit */
diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
index a43f64d2775b..fe0105d35bae 100644
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
@@ -164,10 +164,14 @@ enum {
         MV_PCI_ERR_ATTRIBUTE    = 0x1d48,
         MV_PCI_ERR_COMMAND      = 0x1d50,
 
-        PCI_IRQ_CAUSE_OFS               = 0x1d58,
-        PCI_IRQ_MASK_OFS                = 0x1d5c,
+        PCI_IRQ_CAUSE_OFS       = 0x1d58,
+        PCI_IRQ_MASK_OFS        = 0x1d5c,
         PCI_UNMASK_ALL_IRQS     = 0x7fffff,     /* bits 22-0 */
 
+        PCIE_IRQ_CAUSE_OFS      = 0x1900,
+        PCIE_IRQ_MASK_OFS       = 0x1910,
+        PCIE_UNMASK_ALL_IRQS    = 0x70a,        /* assorted bits */
+
         HC_MAIN_IRQ_CAUSE_OFS   = 0x1d60,
         HC_MAIN_IRQ_MASK_OFS    = 0x1d64,
         PORT0_ERR               = (1 << 0),     /* shift by port # */
@@ -303,6 +307,7 @@ enum {
         MV_HP_GEN_I             = (1 << 6),     /* Generation I: 50xx */
         MV_HP_GEN_II            = (1 << 7),     /* Generation II: 60xx */
         MV_HP_GEN_IIE           = (1 << 8),     /* Generation IIE: 6042/7042 */
+        MV_HP_PCIE              = (1 << 9),     /* PCIe bus/regs: 7042 */
 
         /* Port private flags (pp_flags) */
         MV_PP_FLAG_EDMA_EN      = (1 << 0),     /* is EDMA engine enabled? */
@@ -388,7 +393,15 @@ struct mv_port_signal {
         u32                     pre;
 };
 
-struct mv_host_priv;
+struct mv_host_priv {
+        u32                     hp_flags;
+        struct mv_port_signal   signal[8];
+        const struct mv_hw_ops  *ops;
+        u32                     irq_cause_ofs;
+        u32                     irq_mask_ofs;
+        u32                     unmask_all_irqs;
+};
+
 struct mv_hw_ops {
         void (*phy_errata)(struct mv_host_priv *hpriv, void __iomem *mmio,
                            unsigned int port);
@@ -401,12 +414,6 @@ struct mv_hw_ops {
         void (*reset_bus)(struct pci_dev *pdev, void __iomem *mmio);
 };
 
-struct mv_host_priv {
-        u32                     hp_flags;
-        struct mv_port_signal   signal[8];
-        const struct mv_hw_ops  *ops;
-};
-
 static void mv_irq_clear(struct ata_port *ap);
 static int mv_scr_read(struct ata_port *ap, unsigned int sc_reg_in, u32 *val);
 static int mv_scr_write(struct ata_port *ap, unsigned int sc_reg_in, u32 val);
@@ -631,11 +638,13 @@ static const struct pci_device_id mv_pci_tbl[] = {
         /* Adaptec 1430SA */
         { PCI_VDEVICE(ADAPTEC2, 0x0243), chip_7042 },
 
-        { PCI_VDEVICE(TTI, 0x2310), chip_7042 },
-
-        /* add Marvell 7042 support */
+        /* Marvell 7042 support */
         { PCI_VDEVICE(MARVELL, 0x7042), chip_7042 },
 
+        /* Highpoint RocketRAID PCIe series */
+        { PCI_VDEVICE(TTI, 0x2300), chip_7042 },
+        { PCI_VDEVICE(TTI, 0x2310), chip_7042 },
+
         { }                     /* terminate list */
 };
 
@@ -1648,13 +1657,14 @@ static void mv_host_intr(struct ata_host *host, u32 relevant, unsigned int hc)
 
 static void mv_pci_error(struct ata_host *host, void __iomem *mmio)
 {
+        struct mv_host_priv *hpriv = host->private_data;
         struct ata_port *ap;
         struct ata_queued_cmd *qc;
         struct ata_eh_info *ehi;
         unsigned int i, err_mask, printed = 0;
         u32 err_cause;
 
-        err_cause = readl(mmio + PCI_IRQ_CAUSE_OFS);
+        err_cause = readl(mmio + hpriv->irq_cause_ofs);
 
         dev_printk(KERN_ERR, host->dev, "PCI ERROR; PCI IRQ cause=0x%08x\n",
                    err_cause);
@@ -1662,7 +1672,7 @@ static void mv_pci_error(struct ata_host *host, void __iomem *mmio)
         DPRINTK("All regs @ PCI error\n");
         mv_dump_all_regs(mmio, -1, to_pci_dev(host->dev));
 
-        writelfl(0, mmio + PCI_IRQ_CAUSE_OFS);
+        writelfl(0, mmio + hpriv->irq_cause_ofs);
 
         for (i = 0; i < host->n_ports; i++) {
                 ap = host->ports[i];
@@ -1926,6 +1936,8 @@ static int mv5_reset_hc(struct mv_host_priv *hpriv, void __iomem *mmio,
 #define ZERO(reg) writel(0, mmio + (reg))
 static void mv_reset_pci_bus(struct pci_dev *pdev, void __iomem *mmio)
 {
+        struct ata_host     *host = dev_get_drvdata(&pdev->dev);
+        struct mv_host_priv *hpriv = host->private_data;
         u32 tmp;
 
         tmp = readl(mmio + MV_PCI_MODE);
@@ -1937,8 +1949,8 @@ static void mv_reset_pci_bus(struct pci_dev *pdev, void __iomem *mmio)
         writel(0x000100ff, mmio + MV_PCI_XBAR_TMOUT);
         ZERO(HC_MAIN_IRQ_MASK_OFS);
         ZERO(MV_PCI_SERR_MASK);
-        ZERO(PCI_IRQ_CAUSE_OFS);
-        ZERO(PCI_IRQ_MASK_OFS);
+        ZERO(hpriv->irq_cause_ofs);
+        ZERO(hpriv->irq_mask_ofs);
         ZERO(MV_PCI_ERR_LOW_ADDRESS);
         ZERO(MV_PCI_ERR_HIGH_ADDRESS);
         ZERO(MV_PCI_ERR_ATTRIBUTE);
@@ -2170,7 +2182,7 @@ static void mv_phy_reset(struct ata_port *ap, unsigned int *class,
                 mv_scr_read(ap, SCR_ERROR, &serror);
                 mv_scr_read(ap, SCR_CONTROL, &scontrol);
                 DPRINTK("S-regs after ATA_RST: SStat 0x%08x SErr 0x%08x "
-                        "SCtrl 0x%08x\n", status, serror, scontrol);
+                        "SCtrl 0x%08x\n", sstatus, serror, scontrol);
         }
 #endif
 
@@ -2490,6 +2502,16 @@ static int mv_chip_id(struct ata_host *host, unsigned int board_idx)
                 break;
 
         case chip_7042:
+                hp_flags |= MV_HP_PCIE;
+                if (pdev->vendor == PCI_VENDOR_ID_TTI &&
+                    (pdev->device == 0x2300 || pdev->device == 0x2310))
+                {
+                        printk(KERN_WARNING "sata_mv: Highpoint RocketRAID BIOS"
+                                " will CORRUPT DATA on attached drives when"
+                                " configured as \"Legacy\".  BEWARE!\n");
+                        printk(KERN_WARNING "sata_mv: Use BIOS \"JBOD\" volumes"
+                                " instead for safety.\n");
+                }
         case chip_6042:
                 hpriv->ops = &mv6xxx_ops;
                 hp_flags |= MV_HP_GEN_IIE;
@@ -2516,6 +2538,15 @@ static int mv_chip_id(struct ata_host *host, unsigned int board_idx)
         }
 
         hpriv->hp_flags = hp_flags;
+        if (hp_flags & MV_HP_PCIE) {
+                hpriv->irq_cause_ofs    = PCIE_IRQ_CAUSE_OFS;
+                hpriv->irq_mask_ofs     = PCIE_IRQ_MASK_OFS;
+                hpriv->unmask_all_irqs  = PCIE_UNMASK_ALL_IRQS;
+        } else {
+                hpriv->irq_cause_ofs    = PCI_IRQ_CAUSE_OFS;
+                hpriv->irq_mask_ofs     = PCI_IRQ_MASK_OFS;
+                hpriv->unmask_all_irqs  = PCI_UNMASK_ALL_IRQS;
+        }
 
         return 0;
 }
@@ -2595,10 +2626,10 @@ static int mv_init_host(struct ata_host *host, unsigned int board_idx)
         }
 
         /* Clear any currently outstanding host interrupt conditions */
-        writelfl(0, mmio + PCI_IRQ_CAUSE_OFS);
+        writelfl(0, mmio + hpriv->irq_cause_ofs);
 
         /* and unmask interrupt generation for host regs */
-        writelfl(PCI_UNMASK_ALL_IRQS, mmio + PCI_IRQ_MASK_OFS);
+        writelfl(hpriv->unmask_all_irqs, mmio + hpriv->irq_mask_ofs);
 
         if (IS_GEN_I(hpriv))
                 writelfl(~HC_MAIN_MASKED_IRQS_5, mmio + HC_MAIN_IRQ_MASK_OFS);
@@ -2609,8 +2640,8 @@ static int mv_init_host(struct ata_host *host, unsigned int board_idx)
                 "PCI int cause/mask=0x%08x/0x%08x\n",
                 readl(mmio + HC_MAIN_IRQ_CAUSE_OFS),
                 readl(mmio + HC_MAIN_IRQ_MASK_OFS),
-                readl(mmio + PCI_IRQ_CAUSE_OFS),
-                readl(mmio + PCI_IRQ_MASK_OFS));
+                readl(mmio + hpriv->irq_cause_ofs),
+                readl(mmio + hpriv->irq_mask_ofs));
 
 done:
         return rc;
diff --git a/drivers/ata/sata_nv.c b/drivers/ata/sata_nv.c
index 44f9e5d9e362..ed5dc7cb50cd 100644
--- a/drivers/ata/sata_nv.c
+++ b/drivers/ata/sata_nv.c
@@ -791,11 +791,13 @@ static int nv_adma_check_atapi_dma(struct ata_queued_cmd *qc)
 
 static void nv_adma_tf_read(struct ata_port *ap, struct ata_taskfile *tf)
 {
-        /* Since commands where a result TF is requested are not
-           executed in ADMA mode, the only time this function will be called
-           in ADMA mode will be if a command fails. In this case we
-           don't care about going into register mode with ADMA commands
-           pending, as the commands will all shortly be aborted anyway. */
+        /* Other than when internal or pass-through commands are executed,
+           the only time this function will be called in ADMA mode will be
+           if a command fails. In the failure case we don't care about going
+           into register mode with ADMA commands pending, as the commands will
+           all shortly be aborted anyway. We assume that NCQ commands are not
+           issued via passthrough, which is the only way that switching into
+           ADMA mode could abort outstanding commands. */
         nv_adma_register_mode(ap);
 
         ata_tf_read(ap, tf);
@@ -1359,11 +1361,9 @@ static int nv_adma_use_reg_mode(struct ata_queued_cmd *qc)
         struct nv_adma_port_priv *pp = qc->ap->private_data;
 
         /* ADMA engine can only be used for non-ATAPI DMA commands,
-           or interrupt-driven no-data commands, where a result taskfile
-           is not required. */
+           or interrupt-driven no-data commands. */
         if ((pp->flags & NV_ADMA_ATAPI_SETUP_COMPLETE) ||
-           (qc->tf.flags & ATA_TFLAG_POLLING) ||
-           (qc->flags & ATA_QCFLAG_RESULT_TF))
+           (qc->tf.flags & ATA_TFLAG_POLLING))
                 return 1;
 
         if ((qc->flags & ATA_QCFLAG_DMAMAP) ||
@@ -1381,6 +1381,8 @@ static void nv_adma_qc_prep(struct ata_queued_cmd *qc)
                        NV_CPB_CTL_IEN;
 
         if (nv_adma_use_reg_mode(qc)) {
+                BUG_ON(!(pp->flags & NV_ADMA_ATAPI_SETUP_COMPLETE) &&
+                        (qc->flags & ATA_QCFLAG_DMAMAP));
                 nv_adma_register_mode(qc->ap);
                 ata_qc_prep(qc);
                 return;
@@ -1425,9 +1427,21 @@ static unsigned int nv_adma_qc_issue(struct ata_queued_cmd *qc)
 
         VPRINTK("ENTER\n");
 
+        /* We can't handle result taskfile with NCQ commands, since
+           retrieving the taskfile switches us out of ADMA mode and would abort
+           existing commands. */
+        if (unlikely(qc->tf.protocol == ATA_PROT_NCQ &&
+                     (qc->flags & ATA_QCFLAG_RESULT_TF))) {
+                ata_dev_printk(qc->dev, KERN_ERR,
+                        "NCQ w/ RESULT_TF not allowed\n");
+                return AC_ERR_SYSTEM;
+        }
+
         if (nv_adma_use_reg_mode(qc)) {
                 /* use ATA register mode */
                 VPRINTK("using ATA register mode: 0x%lx\n", qc->flags);
+                BUG_ON(!(pp->flags & NV_ADMA_ATAPI_SETUP_COMPLETE) &&
+                        (qc->flags & ATA_QCFLAG_DMAMAP));
                 nv_adma_register_mode(qc->ap);
                 return ata_qc_issue_prot(qc);
         } else
diff --git a/drivers/ata/sata_sil24.c b/drivers/ata/sata_sil24.c
index 187dcb02c681..96fd5260446d 100644
--- a/drivers/ata/sata_sil24.c
+++ b/drivers/ata/sata_sil24.c
@@ -63,6 +63,21 @@ enum {
         SIL24_HOST_BAR          = 0,
         SIL24_PORT_BAR          = 2,
 
+        /* sil24 fetches in chunks of 64bytes.  The first block
+         * contains the PRB and two SGEs.  From the second block, it's
+         * consisted of four SGEs and called SGT.  Calculate the
+         * number of SGTs that fit into one page.
+         */
+        SIL24_PRB_SZ            = sizeof(struct sil24_prb)
+                                  + 2 * sizeof(struct sil24_sge),
+        SIL24_MAX_SGT           = (PAGE_SIZE - SIL24_PRB_SZ)
+                                  / (4 * sizeof(struct sil24_sge)),
+
+        /* This will give us one unused SGEs for ATA.  This extra SGE
+         * will be used to store CDB for ATAPI devices.
+         */
+        SIL24_MAX_SGE           = 4 * SIL24_MAX_SGT + 1,
+
         /*
          * Global controller registers (128 bytes @ BAR0)
          */
@@ -247,13 +262,13 @@ enum {
 
 struct sil24_ata_block {
         struct sil24_prb prb;
-        struct sil24_sge sge[LIBATA_MAX_PRD];
+        struct sil24_sge sge[SIL24_MAX_SGE];
 };
 
 struct sil24_atapi_block {
         struct sil24_prb prb;
         u8 cdb[16];
-        struct sil24_sge sge[LIBATA_MAX_PRD - 1];
+        struct sil24_sge sge[SIL24_MAX_SGE];
 };
 
 union sil24_cmd_block {
@@ -378,7 +393,7 @@ static struct scsi_host_template sil24_sht = {
         .change_queue_depth     = ata_scsi_change_queue_depth,
         .can_queue              = SIL24_MAX_CMDS,
         .this_id                = ATA_SHT_THIS_ID,
-        .sg_tablesize           = LIBATA_MAX_PRD,
+        .sg_tablesize           = SIL24_MAX_SGE,
         .cmd_per_lun            = ATA_SHT_CMD_PER_LUN,
         .emulated               = ATA_SHT_EMULATED,
         .use_clustering         = ATA_SHT_USE_CLUSTERING,
@@ -1284,6 +1299,7 @@ static void sil24_init_controller(struct ata_host *host)
 
 static int sil24_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 {
+        extern int __MARKER__sil24_cmd_block_is_sized_wrongly;
         static int printed_version;
         struct ata_port_info pi = sil24_port_info[ent->driver_data];
         const struct ata_port_info *ppi[] = { &pi, NULL };
@@ -1292,6 +1308,10 @@ static int sil24_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
         int i, rc;
         u32 tmp;
 
+        /* cause link error if sil24_cmd_block is sized wrongly */
+        if (sizeof(union sil24_cmd_block) != PAGE_SIZE)
+                __MARKER__sil24_cmd_block_is_sized_wrongly = 1;
+
         if (!printed_version++)
                 dev_printk(KERN_DEBUG, &pdev->dev, "version " DRV_VERSION "\n");
 
diff --git a/drivers/atm/fore200e.c b/drivers/atm/fore200e.c
index 8b12925fe7a4..f97e050338f0 100644
--- a/drivers/atm/fore200e.c
+++ b/drivers/atm/fore200e.c
@@ -2689,7 +2689,7 @@ fore200e_init(struct fore200e* fore200e)
     return 0;
 }
 
-
+#ifdef CONFIG_ATM_FORE200E_PCA
 static int __devinit
 fore200e_pca_detect(struct pci_dev *pci_dev, const struct pci_device_id *pci_ent)
 {
@@ -2756,7 +2756,6 @@ static void __devexit fore200e_pca_remove_one(struct pci_dev *pci_dev)
 }
 
 
-#ifdef CONFIG_ATM_FORE200E_PCA
 static struct pci_device_id fore200e_pca_tbl[] = {
     { PCI_VENDOR_ID_FORE, PCI_DEVICE_ID_FORE_PCA200E, PCI_ANY_ID, PCI_ANY_ID,
       0, 0, (unsigned long) &fore200e_bus[0] },
diff --git a/drivers/atm/he.c b/drivers/atm/he.c
index d33aba6864c2..3b64a99772ea 100644
--- a/drivers/atm/he.c
+++ b/drivers/atm/he.c
@@ -394,6 +394,11 @@ he_init_one(struct pci_dev *pci_dev, const struct pci_device_id *pci_ent)
         he_dev->atm_dev->dev_data = he_dev;
         atm_dev->dev_data = he_dev;
         he_dev->number = atm_dev->number;
+#ifdef USE_TASKLET
+        tasklet_init(&he_dev->tasklet, he_tasklet, (unsigned long) he_dev);
+#endif
+        spin_lock_init(&he_dev->global_lock);
+
         if (he_start(atm_dev)) {
                 he_stop(he_dev);
                 err = -ENODEV;
@@ -1173,11 +1178,6 @@ he_start(struct atm_dev *dev)
         if ((err = he_init_irq(he_dev)) != 0)
                 return err;
 
-#ifdef USE_TASKLET
-        tasklet_init(&he_dev->tasklet, he_tasklet, (unsigned long) he_dev);
-#endif
-        spin_lock_init(&he_dev->global_lock);
-
         /* 4.11 enable pci bus controller state machines */
         host_cntl |= (OUTFF_ENB | CMDFF_ENB |
                                 QUICK_RD_RETRY | QUICK_WR_RETRY | PERR_INT_ENB);
diff --git a/drivers/base/core.c b/drivers/base/core.c
index 3f4d6aa13990..2683eac30c68 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -770,9 +770,10 @@ int device_add(struct device *dev)
         error = device_add_attrs(dev);
         if (error)
                 goto AttrsError;
-        error = device_pm_add(dev);
+        error = dpm_sysfs_add(dev);
         if (error)
                 goto PMError;
+        device_pm_add(dev);
         error = bus_add_device(dev);
         if (error)
                 goto BusError;
@@ -797,6 +798,7 @@ int device_add(struct device *dev)
         return error;
  BusError:
         device_pm_remove(dev);
+        dpm_sysfs_remove(dev);
  PMError:
         if (dev->bus)
                 blocking_notifier_call_chain(&dev->bus->bus_notifier,
diff --git a/drivers/base/power/Makefile b/drivers/base/power/Makefile
index a803733c839e..44504e6618fb 100644
--- a/drivers/base/power/Makefile
+++ b/drivers/base/power/Makefile
@@ -1,5 +1,6 @@
 obj-y                   := shutdown.o
-obj-$(CONFIG_PM_SLEEP)  += main.o sysfs.o
+obj-$(CONFIG_PM)        += sysfs.o
+obj-$(CONFIG_PM_SLEEP)  += main.o
 obj-$(CONFIG_PM_TRACE)  += trace.o
 
 ifeq ($(CONFIG_DEBUG_DRIVER),y)
diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
index 0ab4ab21f564..691ffb64cc37 100644
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@ -38,20 +38,14 @@ static DEFINE_MUTEX(dpm_list_mtx);
 int (*platform_enable_wakeup)(struct device *dev, int is_on);
 
 
-int device_pm_add(struct device *dev)
+void device_pm_add(struct device *dev)
 {
-        int error;
-
         pr_debug("PM: Adding info for %s:%s\n",
                  dev->bus ? dev->bus->name : "No Bus",
                  kobject_name(&dev->kobj));
         mutex_lock(&dpm_list_mtx);
         list_add_tail(&dev->power.entry, &dpm_active);
-        error = dpm_sysfs_add(dev);
-        if (error)
-                list_del(&dev->power.entry);
         mutex_unlock(&dpm_list_mtx);
-        return error;
 }
 
 void device_pm_remove(struct device *dev)
diff --git a/drivers/base/power/power.h b/drivers/base/power/power.h
index 5c4efd493fa5..379da4e958e0 100644
--- a/drivers/base/power/power.h
+++ b/drivers/base/power/power.h
@@ -13,14 +13,29 @@ extern void device_shutdown(void);
 
 extern struct list_head dpm_active;     /* The active device list */
 
-static inline struct device * to_device(struct list_head * entry)
+static inline struct device *to_device(struct list_head *entry)
 {
         return container_of(entry, struct device, power.entry);
 }
 
-extern int device_pm_add(struct device *);
+extern void device_pm_add(struct device *);
 extern void device_pm_remove(struct device *);
 
+#else /* CONFIG_PM_SLEEP */
+
+
+static inline void device_pm_add(struct device *dev)
+{
+}
+
+static inline void device_pm_remove(struct device *dev)
+{
+}
+
+#endif
+
+#ifdef CONFIG_PM
+
 /*
  * sysfs.c
  */
@@ -28,16 +43,15 @@ extern void device_pm_remove(struct device *);
 extern int dpm_sysfs_add(struct device *);
 extern void dpm_sysfs_remove(struct device *);
 
-#else /* CONFIG_PM_SLEEP */
-
+#else /* CONFIG_PM */
 
-static inline int device_pm_add(struct device * dev)
+static inline int dpm_sysfs_add(struct device *dev)
 {
         return 0;
 }
-static inline void device_pm_remove(struct device * dev)
-{
 
+static inline void dpm_sysfs_remove(struct device *dev)
+{
 }
 
 #endif
diff --git a/drivers/block/aoe/aoeblk.c b/drivers/block/aoe/aoeblk.c
index b1d00ef6659c..ad00b3d94711 100644
--- a/drivers/block/aoe/aoeblk.c
+++ b/drivers/block/aoe/aoeblk.c
@@ -6,6 +6,7 @@
 
 #include <linux/hdreg.h>
 #include <linux/blkdev.h>
+#include <linux/backing-dev.h>
 #include <linux/fs.h>
 #include <linux/ioctl.h>
 #include <linux/genhd.h>
@@ -210,25 +211,20 @@ aoeblk_gdalloc(void *vp)
         if (gd == NULL) {
                 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);
-                return;
+                goto err;
         }
 
         d->bufpool = mempool_create_slab_pool(MIN_BUFS, buf_pool_cache);
         if (d->bufpool == NULL) {
                 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;
-                spin_unlock_irqrestore(&d->lock, flags);
-                return;
+                goto err_disk;
         }
 
-        spin_lock_irqsave(&d->lock, flags);
         blk_queue_make_request(&d->blkq, aoeblk_make_request);
+        if (bdi_init(&d->blkq.backing_dev_info))
+                goto err_mempool;
+        spin_lock_irqsave(&d->lock, flags);
         gd->major = AOE_MAJOR;
         gd->first_minor = d->sysminor * AOE_PARTITIONS;
         gd->fops = &aoe_bdops;
@@ -246,6 +242,16 @@ aoeblk_gdalloc(void *vp)
 
         add_disk(gd);
         aoedisk_add_sysfs(d);
+        return;
+
+err_mempool:
+        mempool_destroy(d->bufpool);
+err_disk:
+        put_disk(gd);
+err:
+        spin_lock_irqsave(&d->lock, flags);
+        d->flags &= ~DEVFL_GDALLOC;
+        spin_unlock_irqrestore(&d->lock, flags);
 }
 
 void
diff --git a/drivers/block/umem.c b/drivers/block/umem.c
index 99806f9ee4ce..5f5095afb06b 100644
--- a/drivers/block/umem.c
+++ b/drivers/block/umem.c
@@ -484,7 +484,8 @@ static void process_page(unsigned long data)
                 page->idx++;
                 if (page->idx >= bio->bi_vcnt) {
                         page->bio = bio->bi_next;
-                        page->idx = page->bio->bi_idx;
+                        if (page->bio)
+                                page->idx = page->bio->bi_idx;
                 }
 
                 pci_unmap_page(card->dev, desc->data_dma_handle,
diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c
index 3cf7129d83e6..924ddd8bccd2 100644
--- a/drivers/block/virtio_blk.c
+++ b/drivers/block/virtio_blk.c
@@ -223,7 +223,7 @@ static int virtblk_probe(struct virtio_device *vdev)
         err = virtio_config_val(vdev, VIRTIO_CONFIG_BLK_F_CAPACITY, &cap);
         if (err) {
                 dev_err(&vdev->dev, "Bad/missing capacity in config\n");
-                goto out_put_disk;
+                goto out_cleanup_queue;
         }
 
         /* If capacity is too big, truncate with warning. */
@@ -239,7 +239,7 @@ static int virtblk_probe(struct virtio_device *vdev)
                 blk_queue_max_segment_size(vblk->disk->queue, v);
         else if (err != -ENOENT) {
                 dev_err(&vdev->dev, "Bad SIZE_MAX in config\n");
-                goto out_put_disk;
+                goto out_cleanup_queue;
         }
 
         err = virtio_config_val(vdev, VIRTIO_CONFIG_BLK_F_SEG_MAX, &v);
@@ -247,12 +247,14 @@ static int virtblk_probe(struct virtio_device *vdev)
                 blk_queue_max_hw_segments(vblk->disk->queue, v);
         else if (err != -ENOENT) {
                 dev_err(&vdev->dev, "Bad SEG_MAX in config\n");
-                goto out_put_disk;
+                goto out_cleanup_queue;
         }
 
         add_disk(vblk->disk);
         return 0;
 
+out_cleanup_queue:
+        blk_cleanup_queue(vblk->disk->queue);
 out_put_disk:
         put_disk(vblk->disk);
 out_unregister_blkdev:
@@ -277,6 +279,8 @@ static void virtblk_remove(struct virtio_device *vdev)
         put_disk(vblk->disk);
         unregister_blkdev(major, "virtblk");
         mempool_destroy(vblk->pool);
+        /* There should be nothing in the queue now, so no need to shutdown */
+        vdev->config->del_vq(vblk->vq);
         kfree(vblk);
 }
 
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index bf18d757b876..a509b8d79781 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -457,7 +457,7 @@ config LEGACY_PTYS
 config LEGACY_PTY_COUNT
         int "Maximum number of legacy PTY in use"
         depends on LEGACY_PTYS
-        range 1 256
+        range 0 256
         default "256"
         ---help---
           The maximum number of legacy PTYs that can be used at any one time.
diff --git a/drivers/char/apm-emulation.c b/drivers/char/apm-emulation.c
index c99e43b837f5..17d54315e146 100644
--- a/drivers/char/apm-emulation.c
+++ b/drivers/char/apm-emulation.c
@@ -295,7 +295,6 @@ static int
 apm_ioctl(struct inode * inode, struct file *filp, u_int cmd, u_long arg)
 {
         struct apm_user *as = filp->private_data;
-        unsigned long flags;
         int err = -EINVAL;
 
         if (!as->suser || !as->writer)
@@ -331,10 +330,16 @@ apm_ioctl(struct inode * inode, struct file *filp, u_int cmd, u_long arg)
                          * Wait for the suspend/resume to complete.  If there
                          * are pending acknowledges, we wait here for them.
                          */
-                        flags = current->flags;
+                        freezer_do_not_count();
 
                         wait_event(apm_suspend_waitqueue,
                                    as->suspend_state == SUSPEND_DONE);
+
+                        /*
+                         * Since we are waiting until the suspend is done, the
+                         * try_to_freeze() in freezer_count() will not trigger
+                         */
+                        freezer_count();
                 } else {
                         as->suspend_state = SUSPEND_WAIT;
                         mutex_unlock(&state_lock);
@@ -362,14 +367,10 @@ apm_ioctl(struct inode * inode, struct file *filp, u_int cmd, u_long arg)
                          * Wait for the suspend/resume to complete.  If there
                          * are pending acknowledges, we wait here for them.
                          */
-                        flags = current->flags;
-
-                        wait_event_interruptible(apm_suspend_waitqueue,
+                        wait_event_freezable(apm_suspend_waitqueue,
                                          as->suspend_state == SUSPEND_DONE);
                 }
 
-                current->flags = flags;
-
                 mutex_lock(&state_lock);
                 err = as->suspend_result;
                 as->suspend_state = SUSPEND_NONE;
diff --git a/drivers/char/cs5535_gpio.c b/drivers/char/cs5535_gpio.c
index fe6d2407baed..c2d23cae9515 100644
--- a/drivers/char/cs5535_gpio.c
+++ b/drivers/char/cs5535_gpio.c
@@ -104,6 +104,11 @@ static ssize_t cs5535_gpio_write(struct file *file, const char __user *data,
                 for (j = 0; j < ARRAY_SIZE(rm); j++) {
                         if (c == rm[j].on) {
                                 outl(m1, base + rm[j].wr_offset);
+                                /* If enabling output, turn off AUX 1 and AUX 2 */
+                                if (c == 'O') {
+                                        outl(m0, base + 0x10);
+                                        outl(m0, base + 0x14);
+                                }
                                 break;
                         } else if (c == rm[j].off) {
                                 outl(m0, base + rm[j].wr_offset);
diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c
index 877e53dcb996..921c6d2bc8fc 100644
--- a/drivers/char/sonypi.c
+++ b/drivers/char/sonypi.c
@@ -1163,7 +1163,7 @@ static struct acpi_driver sonypi_acpi_driver = {
 };
 #endif
 
-static int __devinit sonypi_create_input_devices(void)
+static int __devinit sonypi_create_input_devices(struct platform_device *pdev)
 {
         struct input_dev *jog_dev;
         struct input_dev *key_dev;
@@ -1177,6 +1177,7 @@ static int __devinit sonypi_create_input_devices(void)
         jog_dev->name = "Sony Vaio Jogdial";
         jog_dev->id.bustype = BUS_ISA;
         jog_dev->id.vendor = PCI_VENDOR_ID_SONY;
+        jog_dev->dev.parent = &pdev->dev;
 
         jog_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_REL);
         jog_dev->keybit[BIT_WORD(BTN_MOUSE)] = BIT_MASK(BTN_MIDDLE);
@@ -1191,6 +1192,7 @@ static int __devinit sonypi_create_input_devices(void)
         key_dev->name = "Sony Vaio Keys";
         key_dev->id.bustype = BUS_ISA;
         key_dev->id.vendor = PCI_VENDOR_ID_SONY;
+        key_dev->dev.parent = &pdev->dev;
 
         /* Initialize the Input Drivers: special keys */
         key_dev->evbit[0] = BIT_MASK(EV_KEY);
@@ -1385,7 +1387,7 @@ static int __devinit sonypi_probe(struct platform_device *dev)
 
         if (useinput) {
 
-                error = sonypi_create_input_devices();
+                error = sonypi_create_input_devices(dev);
                 if (error) {
                         printk(KERN_ERR
                                 "sonypi: failed to create input devices\n");
@@ -1432,7 +1434,7 @@ static int __devexit sonypi_remove(struct platform_device *dev)
 {
         sonypi_disable();
 
-        synchronize_sched();  /* Allow sonypi interrupt to complete. */
+        synchronize_irq(sonypi_device.irq);
         flush_scheduled_work();
 
         if (useinput) {
diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c
index fd771a4d6d18..81503d94fecc 100644
--- a/drivers/char/tpm/tpm_tis.c
+++ b/drivers/char/tpm/tpm_tis.c
@@ -450,6 +450,11 @@ static int tpm_tis_init(struct device *dev, resource_size_t start,
                 goto out_err;
         }
 
+        if (request_locality(chip, 0) != 0) {
+                rc = -ENODEV;
+                goto out_err;
+        }
+
         vendor = ioread32(chip->vendor.iobase + TPM_DID_VID(0));
 
         /* Default timeouts */
@@ -487,11 +492,6 @@ static int tpm_tis_init(struct device *dev, resource_size_t start,
         if (intfcaps & TPM_INTF_DATA_AVAIL_INT)
                 dev_dbg(dev, "\tData Avail Int Support\n");
 
-        if (request_locality(chip, 0) != 0) {
-                rc = -ENODEV;
-                goto out_err;
-        }
-
         /* INTERRUPT Setup */
         init_waitqueue_head(&chip->vendor.read_queue);
         init_waitqueue_head(&chip->vendor.int_queue);
diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
index 5fd6688a444a..ddd3a259cea1 100644
--- a/drivers/crypto/Kconfig
+++ b/drivers/crypto/Kconfig
@@ -12,7 +12,7 @@ if CRYPTO_HW
 
 config CRYPTO_DEV_PADLOCK
         tristate "Support for VIA PadLock ACE"
-        depends on X86_32
+        depends on X86_32 && !UML
         select CRYPTO_ALGAPI
         help
           Some VIA processors come with an integrated crypto engine
diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
index 6a7d25fc2470..c46b7c219ee9 100644
--- a/drivers/dma/Kconfig
+++ b/drivers/dma/Kconfig
@@ -3,11 +3,13 @@
 #
 
 menuconfig DMADEVICES
-        bool "DMA Offload Engine support"
+        bool "DMA Engine support"
         depends on (PCI && X86) || ARCH_IOP32X || ARCH_IOP33X || ARCH_IOP13XX
         help
-          Intel(R) offload engines enable offloading memory copies in the
-          network stack and RAID operations in the MD driver.
+          DMA engines can do asynchronous data transfers without
+          involving the host CPU.  Currently, this framework can be
+          used to offload memory copies in the network stack and
+          RAID operations in the MD driver.
 
 if DMADEVICES
 
diff --git a/drivers/firewire/fw-ohci.c b/drivers/firewire/fw-ohci.c
index c9b9081831da..436a855a4c60 100644
--- a/drivers/firewire/fw-ohci.c
+++ b/drivers/firewire/fw-ohci.c
@@ -437,6 +437,21 @@ static void ar_context_run(struct ar_context *ctx)
         flush_writes(ctx->ohci);
 }
 
+static struct descriptor *
+find_branch_descriptor(struct descriptor *d, int z)
+{
+        int b, key;
+
+        b   = (le16_to_cpu(d->control) & DESCRIPTOR_BRANCH_ALWAYS) >> 2;
+        key = (le16_to_cpu(d->control) & DESCRIPTOR_KEY_IMMEDIATE) >> 8;
+
+        /* figure out which descriptor the branch address goes in */
+        if (z == 2 && (b == 3 || key == 2))
+                return d;
+        else
+                return d + z - 1;
+}
+
 static void context_tasklet(unsigned long data)
 {
         struct context *ctx = (struct context *) data;
@@ -455,7 +470,7 @@ static void context_tasklet(unsigned long data)
                 address = le32_to_cpu(last->branch_address);
                 z = address & 0xf;
                 d = ctx->buffer + (address - ctx->buffer_bus) / sizeof(*d);
-                last = (z == 2) ? d : d + z - 1;
+                last = find_branch_descriptor(d, z);
 
                 if (!ctx->callback(ctx, d, last))
                         break;
@@ -566,7 +581,7 @@ static void context_append(struct context *ctx,
 
         ctx->head_descriptor = d + z + extra;
         ctx->prev_descriptor->branch_address = cpu_to_le32(d_bus | z);
-        ctx->prev_descriptor = z == 2 ? d : d + z - 1;
+        ctx->prev_descriptor = find_branch_descriptor(d, z);
 
         dma_sync_single_for_device(ctx->ohci->card.device, ctx->buffer_bus,
                                    ctx->buffer_size, DMA_TO_DEVICE);
@@ -655,7 +670,7 @@ at_context_queue_packet(struct context *ctx, struct fw_packet *packet)
         driver_data = (struct driver_data *) &d[3];
         driver_data->packet = packet;
         packet->driver_data = driver_data;
-        
+
         if (packet->payload_length > 0) {
                 payload_bus =
                         dma_map_single(ohci->card.device, packet->payload,
@@ -903,7 +918,7 @@ at_context_transmit(struct context *ctx, struct fw_packet *packet)
 
         if (retval < 0)
                 packet->callback(packet, &ctx->ohci->card, packet->ack);
-        
+
 }
 
 static void bus_reset_tasklet(unsigned long data)
@@ -1431,6 +1446,57 @@ static int handle_ir_dualbuffer_packet(struct context *context,
         return 1;
 }
 
+static int handle_ir_packet_per_buffer(struct context *context,
+                                       struct descriptor *d,
+                                       struct descriptor *last)
+{
+        struct iso_context *ctx =
+                container_of(context, struct iso_context, context);
+        struct descriptor *pd = d + 1;
+        __le32 *ir_header;
+        size_t header_length;
+        void *p, *end;
+        int i, z;
+
+        if (pd->res_count == pd->req_count)
+                /* Descriptor(s) not done yet, stop iteration */
+                return 0;
+
+        header_length = le16_to_cpu(d->req_count);
+
+        i   = ctx->header_length;
+        z   = le32_to_cpu(pd->branch_address) & 0xf;
+        p   = d + z;
+        end = p + header_length;
+
+        while (p < end && i + ctx->base.header_size <= PAGE_SIZE) {
+                /*
+                 * The iso header is byteswapped to little endian by
+                 * the controller, but the remaining header quadlets
+                 * are big endian.  We want to present all the headers
+                 * as big endian, so we have to swap the first quadlet.
+                 */
+                *(u32 *) (ctx->header + i) = __swab32(*(u32 *) (p + 4));
+                memcpy(ctx->header + i + 4, p + 8, ctx->base.header_size - 4);
+                i += ctx->base.header_size;
+                p += ctx->base.header_size + 4;
+        }
+
+        ctx->header_length = i;
+
+        if (le16_to_cpu(pd->control) & DESCRIPTOR_IRQ_ALWAYS) {
+                ir_header = (__le32 *) (d + z);
+                ctx->base.callback(&ctx->base,
+                                   le32_to_cpu(ir_header[0]) & 0xffff,
+                                   ctx->header_length, ctx->header,
+                                   ctx->base.callback_data);
+                ctx->header_length = 0;
+        }
+
+
+        return 1;
+}
+
 static int handle_it_packet(struct context *context,
                             struct descriptor *d,
                             struct descriptor *last)
@@ -1466,14 +1532,12 @@ ohci_allocate_iso_context(struct fw_card *card, int type, size_t header_size)
         } else {
                 mask = &ohci->ir_context_mask;
                 list = ohci->ir_context_list;
-                callback = handle_ir_dualbuffer_packet;
+                if (ohci->version >= OHCI_VERSION_1_1)
+                        callback = handle_ir_dualbuffer_packet;
+                else
+                        callback = handle_ir_packet_per_buffer;
         }
 
-        /* FIXME: We need a fallback for pre 1.1 OHCI. */
-        if (callback == handle_ir_dualbuffer_packet &&
-            ohci->version < OHCI_VERSION_1_1)
-                return ERR_PTR(-ENOSYS);
-
         spin_lock_irqsave(&ohci->lock, flags);
         index = ffs(*mask) - 1;
         if (index >= 0)
@@ -1532,7 +1596,9 @@ static int ohci_start_iso(struct fw_iso_context *base,
                 context_run(&ctx->context, match);
         } else {
                 index = ctx - ohci->ir_context_list;
-                control = IR_CONTEXT_DUAL_BUFFER_MODE | IR_CONTEXT_ISOCH_HEADER;
+                control = IR_CONTEXT_ISOCH_HEADER;
+                if (ohci->version >= OHCI_VERSION_1_1)
+                        control |= IR_CONTEXT_DUAL_BUFFER_MODE;
                 match = (tags << 28) | (sync << 8) | ctx->base.channel;
                 if (cycle >= 0) {
                         match |= (cycle & 0x07fff) << 12;
@@ -1738,7 +1804,6 @@ ohci_queue_iso_receive_dualbuffer(struct fw_iso_context *base,
         offset   = payload & ~PAGE_MASK;
         rest     = p->payload_length;
 
-        /* FIXME: OHCI 1.0 doesn't support dual buffer receive */
         /* FIXME: make packet-per-buffer/dual-buffer a context option */
         while (rest > 0) {
                 d = context_get_descriptors(&ctx->context,
@@ -1777,6 +1842,81 @@ ohci_queue_iso_receive_dualbuffer(struct fw_iso_context *base,
 }
 
 static int
+ohci_queue_iso_receive_packet_per_buffer(struct fw_iso_context *base,
+                                         struct fw_iso_packet *packet,
+                                         struct fw_iso_buffer *buffer,
+                                         unsigned long payload)
+{
+        struct iso_context *ctx = container_of(base, struct iso_context, base);
+        struct descriptor *d = NULL, *pd = NULL;
+        struct fw_iso_packet *p;
+        dma_addr_t d_bus, page_bus;
+        u32 z, header_z, rest;
+        int i, page, offset, packet_count, header_size;
+
+        if (packet->skip) {
+                d = context_get_descriptors(&ctx->context, 1, &d_bus);
+                if (d == NULL)
+                        return -ENOMEM;
+
+                d->control = cpu_to_le16(DESCRIPTOR_STATUS |
+                                         DESCRIPTOR_INPUT_LAST |
+                                         DESCRIPTOR_BRANCH_ALWAYS |
+                                         DESCRIPTOR_WAIT);
+                context_append(&ctx->context, d, 1, 0);
+        }
+
+        /* one descriptor for header, one for payload */
+        /* FIXME: handle cases where we need multiple desc. for payload */
+        z = 2;
+        p = packet;
+
+        /*
+         * The OHCI controller puts the status word in the
+         * buffer too, so we need 4 extra bytes per packet.
+         */
+        packet_count = p->header_length / ctx->base.header_size;
+        header_size  = packet_count * (ctx->base.header_size + 4);
+
+        /* Get header size in number of descriptors. */
+        header_z = DIV_ROUND_UP(header_size, sizeof(*d));
+        page     = payload >> PAGE_SHIFT;
+        offset   = payload & ~PAGE_MASK;
+        rest     = p->payload_length;
+
+        for (i = 0; i < packet_count; i++) {
+                /* d points to the header descriptor */
+                d = context_get_descriptors(&ctx->context,
+                                            z + header_z, &d_bus);
+                if (d == NULL)
+                        return -ENOMEM;
+
+                d->control      = cpu_to_le16(DESCRIPTOR_INPUT_MORE);
+                d->req_count    = cpu_to_le16(header_size);
+                d->res_count    = d->req_count;
+                d->data_address = cpu_to_le32(d_bus + (z * sizeof(*d)));
+
+                /* pd points to the payload descriptor */
+                pd = d + 1;
+                pd->control = cpu_to_le16(DESCRIPTOR_STATUS |
+                                          DESCRIPTOR_INPUT_LAST |
+                                          DESCRIPTOR_BRANCH_ALWAYS);
+                if (p->interrupt)
+                        pd->control |= cpu_to_le16(DESCRIPTOR_IRQ_ALWAYS);
+
+                pd->req_count = cpu_to_le16(rest);
+                pd->res_count = pd->req_count;
+
+                page_bus = page_private(buffer->pages[page]);
+                pd->data_address = cpu_to_le32(page_bus + offset);
+
+                context_append(&ctx->context, d, z, header_z);
+        }
+
+        return 0;
+}
+
+static int
 ohci_queue_iso(struct fw_iso_context *base,
                struct fw_iso_packet *packet,
                struct fw_iso_buffer *buffer,
@@ -1790,8 +1930,9 @@ ohci_queue_iso(struct fw_iso_context *base,
                 return ohci_queue_iso_receive_dualbuffer(base, packet,
                                                          buffer, payload);
         else
-                /* FIXME: Implement fallback for OHCI 1.0 controllers. */
-                return -ENOSYS;
+                return ohci_queue_iso_receive_packet_per_buffer(base, packet,
+                                                                buffer,
+                                                                payload);
 }
 
 static const struct fw_card_driver ohci_driver = {
@@ -1911,12 +2052,6 @@ pci_probe(struct pci_dev *dev, const struct pci_device_id *ent)
         ohci->version = reg_read(ohci, OHCI1394_Version) & 0x00ff00ff;
         fw_notify("Added fw-ohci device %s, OHCI version %x.%x\n",
                   dev->dev.bus_id, ohci->version >> 16, ohci->version & 0xff);
-        if (ohci->version < OHCI_VERSION_1_1) {
-                fw_notify("    Isochronous I/O is not yet implemented for "
-                          "OHCI 1.0 chips.\n");
-                fw_notify("    Cameras, audio devices etc. won't work on "
-                          "this controller with this driver version.\n");
-        }
         return 0;
 
  fail_self_id:
diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c
index 5c82ec7f8bbd..3ee60d26e3a2 100644
--- a/drivers/hwmon/coretemp.c
+++ b/drivers/hwmon/coretemp.c
@@ -337,11 +337,10 @@ static int coretemp_cpu_callback(struct notifier_block *nfb,
 
         switch (action) {
         case CPU_ONLINE:
-        case CPU_ONLINE_FROZEN:
+        case CPU_DOWN_FAILED:
                 coretemp_device_add(cpu);
                 break;
-        case CPU_DEAD:
-        case CPU_DEAD_FROZEN:
+        case CPU_DOWN_PREPARE:
                 coretemp_device_remove(cpu);
                 break;
         }
diff --git a/drivers/i2c/busses/i2c-davinci.c b/drivers/i2c/busses/i2c-davinci.c
index bd7aaff35240..67679882ebef 100644
--- a/drivers/i2c/busses/i2c-davinci.c
+++ b/drivers/i2c/busses/i2c-davinci.c
@@ -404,7 +404,7 @@ static irqreturn_t i2c_davinci_isr(int this_irq, void *dev_id)
                                                       DAVINCI_I2C_STR_REG,
                                                       w);
                         } else
-                                dev_err(dev->dev, "RDR IRQ while no"
+                                dev_err(dev->dev, "RDR IRQ while no "
                                         "data requested\n");
                         break;
 
@@ -423,7 +423,7 @@ static irqreturn_t i2c_davinci_isr(int this_irq, void *dev_id)
                                                       DAVINCI_I2C_IMR_REG,
                                                       w);
                         } else
-                                dev_err(dev->dev, "TDR IRQ while no data to"
+                                dev_err(dev->dev, "TDR IRQ while no data to "
                                         "send\n");
                         break;
 
diff --git a/drivers/i2c/busses/i2c-gpio.c b/drivers/i2c/busses/i2c-gpio.c
index 44e1cd21bb01..3ca19fc234fb 100644
--- a/drivers/i2c/busses/i2c-gpio.c
+++ b/drivers/i2c/busses/i2c-gpio.c
@@ -140,6 +140,7 @@ static int __init i2c_gpio_probe(struct platform_device *pdev)
         adap->owner = THIS_MODULE;
         snprintf(adap->name, sizeof(adap->name), "i2c-gpio%d", pdev->id);
         adap->algo_data = bit_data;
+        adap->class = I2C_CLASS_HWMON;
         adap->dev.parent = &pdev->dev;
 
         /*
diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index 89a30028ddb6..cb55cf2ba1e9 100644
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -203,7 +203,7 @@ static int omap_i2c_init(struct omap_i2c_dev *dev)
                 while (!(omap_i2c_read_reg(dev, OMAP_I2C_SYSS_REG) &
                          OMAP_I2C_SYSS_RDONE)) {
                         if (time_after(jiffies, timeout)) {
-                                dev_warn(dev->dev, "timeout waiting"
+                                dev_warn(dev->dev, "timeout waiting "
                                                 "for controller reset\n");
                                 return -ETIMEDOUT;
                         }
@@ -483,7 +483,7 @@ omap_i2c_isr(int this_irq, void *dev_id)
                                         dev->buf_len--;
                                 }
                         } else
-                                dev_err(dev->dev, "RRDY IRQ while no data"
+                                dev_err(dev->dev, "RRDY IRQ while no data "
                                                 "requested\n");
                         omap_i2c_ack_stat(dev, OMAP_I2C_STAT_RRDY);
                         continue;
@@ -498,7 +498,7 @@ omap_i2c_isr(int this_irq, void *dev_id)
                                         dev->buf_len--;
                                 }
                         } else
-                                dev_err(dev->dev, "XRDY IRQ while no"
+                                dev_err(dev->dev, "XRDY IRQ while no "
                                         "data to send\n");
                         omap_i2c_write_reg(dev, OMAP_I2C_DATA_REG, w);
                         omap_i2c_ack_stat(dev, OMAP_I2C_STAT_XRDY);
diff --git a/drivers/i2c/chips/isp1301_omap.c b/drivers/i2c/chips/isp1301_omap.c
index fe04e46991aa..b767603a07ba 100644
--- a/drivers/i2c/chips/isp1301_omap.c
+++ b/drivers/i2c/chips/isp1301_omap.c
@@ -26,7 +26,7 @@
 #include <linux/interrupt.h>
 #include <linux/platform_device.h>
 #include <linux/usb/ch9.h>
-#include <linux/usb_gadget.h>
+#include <linux/usb/gadget.h>
 #include <linux/usb.h>
 #include <linux/usb/otg.h>
 #include <linux/i2c.h>
diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig
index e445fe6e4ba9..45b22282f149 100644
--- a/drivers/ide/Kconfig
+++ b/drivers/ide/Kconfig
@@ -313,7 +313,6 @@ comment "IDE chipset support/bugfixes"
 
 config IDE_GENERIC
         tristate "generic/default IDE chipset support"
-        default H8300
         help
           If unsure, say N.
 
@@ -484,6 +483,7 @@ config WDC_ALI15X3
 
 config BLK_DEV_AMD74XX
         tristate "AMD and nVidia IDE support"
+        depends on !ARM
         select BLK_DEV_IDEDMA_PCI
         help
           This driver adds explicit support for AMD-7xx and AMD-8111 chips
@@ -883,6 +883,49 @@ config BLK_DEV_IDE_BAST
           Say Y here if you want to support the onboard IDE channels on the
           Simtec BAST or the Thorcom VR1000
 
+config ETRAX_IDE
+        bool "ETRAX IDE support"
+        depends on CRIS && BROKEN
+        select BLK_DEV_IDEDMA
+        select IDE_GENERIC
+        help
+          Enables the ETRAX IDE driver.
+
+          You can't use parallel ports or SCSI ports at the same time.
+
+config ETRAX_IDE_DELAY
+        int "Delay for drives to regain consciousness"
+        depends on ETRAX_IDE && ETRAX_ARCH_V10
+        default 15
+        help
+          Number of seconds to wait for IDE drives to spin up after an IDE
+          reset.
+
+choice
+        prompt "IDE reset pin"
+        depends on ETRAX_IDE && ETRAX_ARCH_V10
+        default ETRAX_IDE_PB7_RESET
+
+config ETRAX_IDE_PB7_RESET
+        bool "Port_PB_Bit_7"
+        help
+          IDE reset on pin 7 on port B
+
+config ETRAX_IDE_G27_RESET
+        bool "Port_G_Bit_27"
+        help
+          IDE reset on pin 27 on port G
+
+endchoice
+
+config IDE_H8300
+        bool "H8300 IDE support"
+        depends on H8300
+        select IDE_GENERIC
+        default y
+        help
+          Enables the H8300 IDE driver.
+
 config BLK_DEV_GAYLE
         bool "Amiga Gayle IDE interface support"
         depends on AMIGA
@@ -963,7 +1006,7 @@ config BLK_DEV_Q40IDE
 
 config BLK_DEV_MPC8xx_IDE
         bool "MPC8xx IDE support"
-        depends on 8xx && IDE=y && BLK_DEV_IDE=y && !PPC_MERGE
+        depends on 8xx && (LWMON || IVMS8 || IVML24 || TQM8xxL) && IDE=y && BLK_DEV_IDE=y && !PPC_MERGE
         select IDE_GENERIC
         help
           This option provides support for IDE on Motorola MPC8xx Systems.
diff --git a/drivers/ide/Makefile b/drivers/ide/Makefile
index 75dc6969e0a7..b181fc672057 100644
--- a/drivers/ide/Makefile
+++ b/drivers/ide/Makefile
@@ -39,7 +39,7 @@ ide-core-$(CONFIG_BLK_DEV_MPC8xx_IDE)	+= ppc/mpc8xx.o
 ide-core-$(CONFIG_BLK_DEV_IDE_PMAC)     += ppc/pmac.o
 
 # built-in only drivers from h8300/
-ide-core-$(CONFIG_H8300)                += h8300/ide-h8300.o
+ide-core-$(CONFIG_IDE_H8300)            += h8300/ide-h8300.o
 
 obj-$(CONFIG_BLK_DEV_IDE)               += ide-core.o
 obj-$(CONFIG_IDE_GENERIC)               += ide-generic.o
diff --git a/drivers/ide/cris/ide-cris.c b/drivers/ide/cris/ide-cris.c
index 7f5bc2ee6c7e..476e0d65ed43 100644
--- a/drivers/ide/cris/ide-cris.c
+++ b/drivers/ide/cris/ide-cris.c
@@ -773,15 +773,16 @@ init_e100_ide (void)
         /* the IDE control register is at ATA address 6, with CS1 active instead of CS0 */
         ide_offsets[IDE_CONTROL_OFFSET] = cris_ide_reg_addr(6, 1, 0);
 
-        /* first fill in some stuff in the ide_hwifs fields */
+        for (h = 0; h < 4; h++) {
+                ide_hwif_t *hwif = NULL;
 
-        for(h = 0; h < MAX_HWIFS; h++) {
-                ide_hwif_t *hwif = &ide_hwifs[h];
                 ide_setup_ports(&hw, cris_ide_base_address(h),
                                 ide_offsets,
                                 0, 0, cris_ide_ack_intr,
                                 ide_default_irq(0));
                 ide_register_hw(&hw, NULL, 1, &hwif);
+                if (hwif == NULL)
+                        continue;
                 hwif->mmio = 1;
                 hwif->chipset = ide_etrax100;
                 hwif->set_pio_mode = &cris_set_pio_mode;
diff --git a/drivers/ide/ide-dma.c b/drivers/ide/ide-dma.c
index e3add70b9cd8..0d795a1678c7 100644
--- a/drivers/ide/ide-dma.c
+++ b/drivers/ide/ide-dma.c
@@ -130,6 +130,7 @@ static const struct drive_list_entry drive_blacklist [] = {
         { "_NEC DV5800A",               NULL            },
         { "SAMSUNG CD-ROM SN-124",      "N001" },
         { "Seagate STT20000A",          NULL  },
+        { "CD-ROM CDR_U200",            "1.09" },
         { NULL                  ,       NULL            }
 
 };
diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c
index e17a9ee120ea..5c3256180ae5 100644
--- a/drivers/ide/ide-iops.c
+++ b/drivers/ide/ide-iops.c
@@ -303,9 +303,6 @@ void default_hwif_transport(ide_hwif_t *hwif)
         hwif->atapi_output_bytes        = atapi_output_bytes;
 }
 
-/*
- * Beginning of Taskfile OPCODE Library and feature sets.
- */
 void ide_fix_driveid (struct hd_driveid *id)
 {
 #ifndef __LITTLE_ENDIAN
@@ -592,6 +589,9 @@ EXPORT_SYMBOL_GPL(ide_in_drive_list);
 static const struct drive_list_entry ivb_list[] = {
         { "QUANTUM FIREBALLlct10 05"    , "A03.0900"    },
         { "TSSTcorp CDDVDW SH-S202J"    , "SB00"        },
+        { "TSSTcorp CDDVDW SH-S202J"    , "SB01"        },
+        { "TSSTcorp CDDVDW SH-S202N"    , "SB00"        },
+        { "TSSTcorp CDDVDW SH-S202N"    , "SB01"        },
         { NULL                          , NULL          }
 };
 
@@ -756,7 +756,7 @@ int ide_driveid_update(ide_drive_t *drive)
 int ide_config_drive_speed(ide_drive_t *drive, u8 speed)
 {
         ide_hwif_t *hwif = drive->hwif;
-        int error;
+        int error = 0;
         u8 stat;
 
 //      while (HWGROUP(drive)->busy)
@@ -767,6 +767,10 @@ int ide_config_drive_speed(ide_drive_t *drive, u8 speed)
                 hwif->dma_host_off(drive);
 #endif
 
+        /* Skip setting PIO flow-control modes on pre-EIDE drives */
+        if ((speed & 0xf8) == XFER_PIO_0 && !(drive->id->capability & 0x08))
+                goto skip;
+
         /*
          * Don't use ide_wait_cmd here - it will
          * attempt to set_geometry and recalibrate,
@@ -814,6 +818,7 @@ int ide_config_drive_speed(ide_drive_t *drive, u8 speed)
         drive->id->dma_mword &= ~0x0F00;
         drive->id->dma_1word &= ~0x0F00;
 
+ skip:
 #ifdef CONFIG_BLK_DEV_IDEDMA
         if (speed >= XFER_SW_DMA_0)
                 hwif->dma_host_on(drive);
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index 56fb0b843429..ee848c705995 100644
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -644,7 +644,7 @@ static void hwif_register (ide_hwif_t *hwif)
 
 static int wait_hwif_ready(ide_hwif_t *hwif)
 {
-        int rc;
+        int unit, rc;
 
         printk(KERN_DEBUG "Probing IDE interface %s...\n", hwif->name);
 
@@ -661,20 +661,26 @@ static int wait_hwif_ready(ide_hwif_t *hwif)
                 return rc;
 
         /* Now make sure both master & slave are ready */
-        SELECT_DRIVE(&hwif->drives[0]);
-        hwif->OUTB(8, hwif->io_ports[IDE_CONTROL_OFFSET]);
-        mdelay(2);
-        rc = ide_wait_not_busy(hwif, 35000);
-        if (rc)
-                return rc;
-        SELECT_DRIVE(&hwif->drives[1]);
-        hwif->OUTB(8, hwif->io_ports[IDE_CONTROL_OFFSET]);
-        mdelay(2);
-        rc = ide_wait_not_busy(hwif, 35000);
+        for (unit = 0; unit < MAX_DRIVES; unit++) {
+                ide_drive_t *drive = &hwif->drives[unit];
 
+                /* Ignore disks that we will not probe for later. */
+                if (!drive->noprobe || drive->present) {
+                        SELECT_DRIVE(drive);
+                        hwif->OUTB(8, hwif->io_ports[IDE_CONTROL_OFFSET]);
+                        mdelay(2);
+                        rc = ide_wait_not_busy(hwif, 35000);
+                        if (rc)
+                                goto out;
+                } else
+                        printk(KERN_DEBUG "%s: ide_wait_not_busy() skipped\n",
+                                          drive->name);
+        }
+out:
         /* Exit function with master reselected (let's be sane) */
-        SELECT_DRIVE(&hwif->drives[0]);
-        
+        if (unit)
+                SELECT_DRIVE(&hwif->drives[0]);
+
         return rc;
 }
 
diff --git a/drivers/ide/legacy/ali14xx.c b/drivers/ide/legacy/ali14xx.c
index 10311ecc674a..38c3a6d63f30 100644
--- a/drivers/ide/legacy/ali14xx.c
+++ b/drivers/ide/legacy/ali14xx.c
@@ -53,12 +53,13 @@
 
 /* port addresses for auto-detection */
 #define ALI_NUM_PORTS 4
-static int ports[ALI_NUM_PORTS] __initdata = {0x074, 0x0f4, 0x034, 0x0e4};
+static const int ports[ALI_NUM_PORTS] __initdata =
+        { 0x074, 0x0f4, 0x034, 0x0e4 };
 
 /* register initialization data */
 typedef struct { u8 reg, data; } RegInitializer;
 
-static RegInitializer initData[] __initdata = {
+static const RegInitializer initData[] __initdata = {
         {0x01, 0x0f}, {0x02, 0x00}, {0x03, 0x00}, {0x04, 0x00},
         {0x05, 0x00}, {0x06, 0x00}, {0x07, 0x2b}, {0x0a, 0x0f},
         {0x25, 0x00}, {0x26, 0x00}, {0x27, 0x00}, {0x28, 0x00},
@@ -177,7 +178,7 @@ static int __init findPort (void)
  * Initialize controller registers with default values.
  */
 static int __init initRegisters (void) {
-        RegInitializer *p;
+        const RegInitializer *p;
         u8 t;
         unsigned long flags;
 
diff --git a/drivers/ide/legacy/macide.c b/drivers/ide/legacy/macide.c
index e87cd2f16430..5c6aa77c2370 100644
--- a/drivers/ide/legacy/macide.c
+++ b/drivers/ide/legacy/macide.c
@@ -81,7 +81,7 @@ int macide_ack_intr(ide_hwif_t* hwif)
  * Probe for a Macintosh IDE interface
  */
 
-void macide_init(void)
+void __init macide_init(void)
 {
         hw_regs_t hw;
         ide_hwif_t *hwif;
diff --git a/drivers/ide/legacy/q40ide.c b/drivers/ide/legacy/q40ide.c
index a73db1bd482d..6ea46a6723e2 100644
--- a/drivers/ide/legacy/q40ide.c
+++ b/drivers/ide/legacy/q40ide.c
@@ -111,7 +111,7 @@ static const char *q40_ide_names[Q40IDE_NUM_HWIFS]={
  *  Probe for Q40 IDE interfaces
  */
 
-void q40ide_init(void)
+void __init q40ide_init(void)
 {
     int i;
     ide_hwif_t *hwif;
diff --git a/drivers/ide/pci/aec62xx.c b/drivers/ide/pci/aec62xx.c
index 19ec421f7b9f..44268504ae43 100644
--- a/drivers/ide/pci/aec62xx.c
+++ b/drivers/ide/pci/aec62xx.c
@@ -260,6 +260,11 @@ static int __devinit aec62xx_init_one(struct pci_dev *dev, const struct pci_devi
 {
         struct ide_port_info d;
         u8 idx = id->driver_data;
+        int err;
+
+        err = pci_enable_device(dev);
+        if (err)
+                return err;
 
         d = aec62xx_chipsets[idx];
 
@@ -272,7 +277,11 @@ static int __devinit aec62xx_init_one(struct pci_dev *dev, const struct pci_devi
                 }
         }
 
-        return ide_setup_pci_device(dev, &d);
+        err = ide_setup_pci_device(dev, &d);
+        if (err)
+                pci_disable_device(dev);
+
+        return err;
 }
 
 static const struct pci_device_id aec62xx_pci_tbl[] = {
diff --git a/drivers/ide/pci/alim15x3.c b/drivers/ide/pci/alim15x3.c
index a607dd31a64c..ce293936af4b 100644
--- a/drivers/ide/pci/alim15x3.c
+++ b/drivers/ide/pci/alim15x3.c
@@ -603,6 +603,11 @@ static int ali_cable_override(struct pci_dev *pdev)
             pdev->subsystem_device == 0x10AF)
                 return 1;
 
+        /* Mitac 8317 (Winbook-A) and relatives */
+        if (pdev->subsystem_vendor == 0x1071 &&
+            pdev->subsystem_device == 0x8317)
+                return 1;
+
         /* Systems by DMI */
         if (dmi_check_system(cable_dmi_table))
                 return 1;
diff --git a/drivers/ide/pci/piix.c b/drivers/ide/pci/piix.c
index 63625a0be712..27781d294cea 100644
--- a/drivers/ide/pci/piix.c
+++ b/drivers/ide/pci/piix.c
@@ -306,6 +306,7 @@ static const struct ich_laptop ich_laptop[] = {
         { 0x27DF, 0x0005, 0x0280 },     /* ICH7 on Acer 5602WLMi */
         { 0x27DF, 0x1025, 0x0110 },     /* ICH7 on Acer 3682WLMi */
         { 0x27DF, 0x1043, 0x1267 },     /* ICH7 on Asus W5F */
+        { 0x27DF, 0x103C, 0x30A1 },     /* ICH7 on HP Compaq nc2400 */
         { 0x24CA, 0x1025, 0x0061 },     /* ICH4 on Acer Aspire 2023WLMi */
         /* end marker */
         { 0, }
diff --git a/drivers/ide/pci/siimage.c b/drivers/ide/pci/siimage.c
index 6d99441c605b..5709c252543b 100644
--- a/drivers/ide/pci/siimage.c
+++ b/drivers/ide/pci/siimage.c
@@ -1,5 +1,5 @@
 /*
- * linux/drivers/ide/pci/siimage.c              Version 1.18    Oct 18 2007
+ * linux/drivers/ide/pci/siimage.c              Version 1.19    Nov 16 2007
  *
  * Copyright (C) 2001-2002      Andre Hedrick <andre@linux-ide.org>
  * Copyright (C) 2003           Red Hat <alan@redhat.com>
@@ -460,48 +460,6 @@ static void sil_sata_pre_reset(ide_drive_t *drive)
 }
 
 /**
- *      siimage_reset   -       reset a device on an siimage controller
- *      @drive: drive to reset
- *
- *      Perform a controller level reset fo the device. For
- *      SATA we must also check the PHY.
- */
- 
-static void siimage_reset (ide_drive_t *drive)
-{
-        ide_hwif_t *hwif        = HWIF(drive);
-        u8 reset                = 0;
-        unsigned long addr      = siimage_selreg(hwif, 0);
-
-        if (hwif->mmio) {
-                reset = hwif->INB(addr);
-                hwif->OUTB((reset|0x03), addr);
-                /* FIXME:posting */
-                udelay(25);
-                hwif->OUTB(reset, addr);
-                (void) hwif->INB(addr);
-        } else {
-                pci_read_config_byte(hwif->pci_dev, addr, &reset);
-                pci_write_config_byte(hwif->pci_dev, addr, reset|0x03);
-                udelay(25);
-                pci_write_config_byte(hwif->pci_dev, addr, reset);
-                pci_read_config_byte(hwif->pci_dev, addr, &reset);
-        }
-
-        if (SATA_STATUS_REG) {
-                /* SATA_STATUS_REG is valid only when in MMIO mode */
-                u32 sata_stat = readl((void __iomem *)SATA_STATUS_REG);
-                printk(KERN_WARNING "%s: reset phy, status=0x%08x, %s\n",
-                        hwif->name, sata_stat, __FUNCTION__);
-                if (!(sata_stat)) {
-                        printk(KERN_WARNING "%s: reset phy dead, status=0x%08x\n",
-                                hwif->name, sata_stat);
-                        drive->failures++;
-                }
-        }
-}
-
-/**
  *      proc_reports_siimage            -       add siimage controller to proc
  *      @dev: PCI device
  *      @clocking: SCSC value
@@ -857,7 +815,6 @@ static void __devinit init_hwif_siimage(ide_hwif_t *hwif)
 {
         u8 sata = is_sata(hwif);
 
-        hwif->resetproc = &siimage_reset;
         hwif->set_pio_mode = &sil_set_pio_mode;
         hwif->set_dma_mode = &sil_set_dma_mode;
 
diff --git a/drivers/ide/pci/sis5513.c b/drivers/ide/pci/sis5513.c
index f6e2ab3dd166..d90b42917775 100644
--- a/drivers/ide/pci/sis5513.c
+++ b/drivers/ide/pci/sis5513.c
@@ -526,6 +526,7 @@ static const struct sis_laptop sis_laptop[] = {
         /* devid, subvendor, subdev */
         { 0x5513, 0x1043, 0x1107 },     /* ASUS A6K */
         { 0x5513, 0x1734, 0x105f },     /* FSC Amilo A1630 */
+        { 0x5513, 0x1071, 0x8640 },     /* EasyNote K5305 */
         /* end marker */
         { 0, }
 };
diff --git a/drivers/ide/pci/trm290.c b/drivers/ide/pci/trm290.c
index 5011ba22e36c..0895e753a35d 100644
--- a/drivers/ide/pci/trm290.c
+++ b/drivers/ide/pci/trm290.c
@@ -240,9 +240,6 @@ static int trm290_ide_dma_test_irq (ide_drive_t *drive)
         return (status == 0x00ff);
 }
 
-/*
- * Invoked from ide-dma.c at boot time.
- */
 static void __devinit init_hwif_trm290(ide_hwif_t *hwif)
 {
         unsigned int cfgbase = 0;
diff --git a/drivers/ide/ppc/pmac.c b/drivers/ide/ppc/pmac.c
index 5afdfef7264c..7f7a59885777 100644
--- a/drivers/ide/ppc/pmac.c
+++ b/drivers/ide/ppc/pmac.c
@@ -1513,7 +1513,7 @@ pmac_ide_build_dmatable(ide_drive_t *drive, struct request *rq)
 
                 if (pmif->broken_dma && cur_addr & (L1_CACHE_BYTES - 1)) {
                         if (pmif->broken_dma_warn == 0) {
-                                printk(KERN_WARNING "%s: DMA on non aligned address,"
+                                printk(KERN_WARNING "%s: DMA on non aligned address, "
                                        "switching to PIO on Ohare chipset\n", drive->name);
                                 pmif->broken_dma_warn = 1;
                         }
diff --git a/drivers/infiniband/hw/ehca/ehca_av.c b/drivers/infiniband/hw/ehca/ehca_av.c
index 453eb995c1d4..f7782c882ab4 100644
--- a/drivers/infiniband/hw/ehca/ehca_av.c
+++ b/drivers/infiniband/hw/ehca/ehca_av.c
@@ -76,8 +76,12 @@ int ehca_calc_ipd(struct ehca_shca *shca, int port,
 
         link = ib_width_enum_to_int(pa.active_width) * pa.active_speed;
 
-        /* IPD = round((link / path) - 1) */
-        *ipd = ((link + (path >> 1)) / path) - 1;
+        if (path >= link)
+                /* no need to throttle if path faster than link */
+                *ipd = 0;
+        else
+                /* IPD = round((link / path) - 1) */
+                *ipd = ((link + (path >> 1)) / path) - 1;
 
         return 0;
 }
diff --git a/drivers/infiniband/hw/ehca/ehca_classes.h b/drivers/infiniband/hw/ehca/ehca_classes.h
index 87f12d4312a7..74d2b72a11d8 100644
--- a/drivers/infiniband/hw/ehca/ehca_classes.h
+++ b/drivers/infiniband/hw/ehca/ehca_classes.h
@@ -322,6 +322,7 @@ extern int ehca_static_rate;
 extern int ehca_port_act_time;
 extern int ehca_use_hp_mr;
 extern int ehca_scaling_code;
+extern int ehca_lock_hcalls;
 
 struct ipzu_queue_resp {
         u32 qe_size;      /* queue entry size */
diff --git a/drivers/infiniband/hw/ehca/ehca_main.c b/drivers/infiniband/hw/ehca/ehca_main.c
index 90d4334179bf..6a56d86a2951 100644
--- a/drivers/infiniband/hw/ehca/ehca_main.c
+++ b/drivers/infiniband/hw/ehca/ehca_main.c
@@ -43,13 +43,14 @@
 #ifdef CONFIG_PPC_64K_PAGES
 #include <linux/slab.h>
 #endif
+
 #include "ehca_classes.h"
 #include "ehca_iverbs.h"
 #include "ehca_mrmw.h"
 #include "ehca_tools.h"
 #include "hcp_if.h"
 
-#define HCAD_VERSION "0024"
+#define HCAD_VERSION "0025"
 
 MODULE_LICENSE("Dual BSD/GPL");
 MODULE_AUTHOR("Christoph Raisch <raisch@de.ibm.com>");
@@ -66,6 +67,7 @@ int ehca_poll_all_eqs  = 1;
 int ehca_static_rate   = -1;
 int ehca_scaling_code  = 0;
 int ehca_mr_largepage  = 1;
+int ehca_lock_hcalls   = -1;
 
 module_param_named(open_aqp1,     ehca_open_aqp1,     int, S_IRUGO);
 module_param_named(debug_level,   ehca_debug_level,   int, S_IRUGO);
@@ -77,6 +79,7 @@ module_param_named(poll_all_eqs,  ehca_poll_all_eqs,  int, S_IRUGO);
 module_param_named(static_rate,   ehca_static_rate,   int, S_IRUGO);
 module_param_named(scaling_code,  ehca_scaling_code,  int, S_IRUGO);
 module_param_named(mr_largepage,  ehca_mr_largepage,  int, S_IRUGO);
+module_param_named(lock_hcalls,   ehca_lock_hcalls,   bool, S_IRUGO);
 
 MODULE_PARM_DESC(open_aqp1,
                  "AQP1 on startup (0: no (default), 1: yes)");
@@ -102,6 +105,9 @@ MODULE_PARM_DESC(scaling_code,
 MODULE_PARM_DESC(mr_largepage,
                  "use large page for MR (0: use PAGE_SIZE (default), "
                  "1: use large page depending on MR size");
+MODULE_PARM_DESC(lock_hcalls,
+                 "serialize all hCalls made by the driver "
+                 "(default: autodetect)");
 
 DEFINE_RWLOCK(ehca_qp_idr_lock);
 DEFINE_RWLOCK(ehca_cq_idr_lock);
@@ -258,6 +264,7 @@ static struct cap_descr {
         { HCA_CAP_UD_LL_QP, "HCA_CAP_UD_LL_QP" },
         { HCA_CAP_RESIZE_MR, "HCA_CAP_RESIZE_MR" },
         { HCA_CAP_MINI_QP, "HCA_CAP_MINI_QP" },
+        { HCA_CAP_H_ALLOC_RES_SYNC, "HCA_CAP_H_ALLOC_RES_SYNC" },
 };
 
 static int ehca_sense_attributes(struct ehca_shca *shca)
@@ -333,6 +340,12 @@ static int ehca_sense_attributes(struct ehca_shca *shca)
                 if (EHCA_BMASK_GET(hca_cap_descr[i].mask, shca->hca_cap))
                         ehca_gen_dbg("   %s", hca_cap_descr[i].descr);
 
+        /* Autodetect hCall locking -- the "H_ALLOC_RESOURCE synced" flag is
+         * a firmware property, so it's valid across all adapters
+         */
+        if (ehca_lock_hcalls == -1)
+                ehca_lock_hcalls = !(shca->hca_cap & HCA_CAP_H_ALLOC_RES_SYNC);
+
         /* translate supported MR page sizes; always support 4K */
         shca->hca_cap_mr_pgsize = EHCA_PAGESIZE;
         if (ehca_mr_largepage) { /* support extra sizes only if enabled */
diff --git a/drivers/infiniband/hw/ehca/ehca_qp.c b/drivers/infiniband/hw/ehca/ehca_qp.c
index 2e3e6547cb78..eff5fb55604b 100644
--- a/drivers/infiniband/hw/ehca/ehca_qp.c
+++ b/drivers/infiniband/hw/ehca/ehca_qp.c
@@ -838,7 +838,7 @@ struct ib_srq *ehca_create_srq(struct ib_pd *pd,
 
         /* copy back return values */
         srq_init_attr->attr.max_wr = qp_init_attr.cap.max_recv_wr;
-        srq_init_attr->attr.max_sge = qp_init_attr.cap.max_recv_sge;
+        srq_init_attr->attr.max_sge = 3;
 
         /* drive SRQ into RTR state */
         mqpcb = ehca_alloc_fw_ctrlblock(GFP_KERNEL);
@@ -1203,7 +1203,7 @@ static int internal_modify_qp(struct ib_qp *ibqp,
                 mqpcb->service_level = attr->ah_attr.sl;
                 update_mask |= EHCA_BMASK_SET(MQPCB_MASK_SERVICE_LEVEL, 1);
 
-                if (ehca_calc_ipd(shca, my_qp->init_attr.port_num,
+                if (ehca_calc_ipd(shca, mqpcb->prim_phys_port,
                                   attr->ah_attr.static_rate,
                                   &mqpcb->max_static_rate)) {
                         ret = -EINVAL;
@@ -1302,7 +1302,7 @@ static int internal_modify_qp(struct ib_qp *ibqp,
                 mqpcb->source_path_bits_al = attr->alt_ah_attr.src_path_bits;
                 mqpcb->service_level_al = attr->alt_ah_attr.sl;
 
-                if (ehca_calc_ipd(shca, my_qp->init_attr.port_num,
+                if (ehca_calc_ipd(shca, mqpcb->alt_phys_port,
                                   attr->alt_ah_attr.static_rate,
                                   &mqpcb->max_static_rate_al)) {
                         ret = -EINVAL;
@@ -1750,7 +1750,7 @@ int ehca_query_srq(struct ib_srq *srq, struct ib_srq_attr *srq_attr)
         }
 
         srq_attr->max_wr = qpcb->max_nr_outst_recv_wr - 1;
-        srq_attr->max_sge = qpcb->actual_nr_sges_in_rq_wqe;
+        srq_attr->max_sge = 3;
         srq_attr->srq_limit = EHCA_BMASK_GET(
                 MQPCB_CURR_SRQ_LIMIT, qpcb->curr_srq_limit);
 
diff --git a/drivers/infiniband/hw/ehca/hcp_if.c b/drivers/infiniband/hw/ehca/hcp_if.c
index c16a21374bb5..7029aa653751 100644
--- a/drivers/infiniband/hw/ehca/hcp_if.c
+++ b/drivers/infiniband/hw/ehca/hcp_if.c
@@ -120,26 +120,21 @@ static long ehca_plpar_hcall_norets(unsigned long opcode,
                                     unsigned long arg7)
 {
         long ret;
-        int i, sleep_msecs, do_lock;
-        unsigned long flags;
+        int i, sleep_msecs;
+        unsigned long flags = 0;
 
         ehca_gen_dbg("opcode=%lx " HCALL7_REGS_FORMAT,
                      opcode, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
 
-        /* lock H_FREE_RESOURCE(MR) against itself and H_ALLOC_RESOURCE(MR) */
-        if ((opcode == H_FREE_RESOURCE) && (arg7 == 5)) {
-                arg7 = 0; /* better not upset firmware */
-                do_lock = 1;
-        }
-
         for (i = 0; i < 5; i++) {
-                if (do_lock)
+                /* serialize hCalls to work around firmware issue */
+                if (ehca_lock_hcalls)
                         spin_lock_irqsave(&hcall_lock, flags);
 
                 ret = plpar_hcall_norets(opcode, arg1, arg2, arg3, arg4,
                                          arg5, arg6, arg7);
 
-                if (do_lock)
+                if (ehca_lock_hcalls)
                         spin_unlock_irqrestore(&hcall_lock, flags);
 
                 if (H_IS_LONG_BUSY(ret)) {
@@ -174,24 +169,22 @@ static long ehca_plpar_hcall9(unsigned long opcode,
                               unsigned long arg9)
 {
         long ret;
-        int i, sleep_msecs, do_lock;
+        int i, sleep_msecs;
         unsigned long flags = 0;
 
         ehca_gen_dbg("INPUT -- opcode=%lx " HCALL9_REGS_FORMAT, opcode,
                      arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
 
-        /* lock H_ALLOC_RESOURCE(MR) against itself and H_FREE_RESOURCE(MR) */
-        do_lock = ((opcode == H_ALLOC_RESOURCE) && (arg2 == 5));
-
         for (i = 0; i < 5; i++) {
-                if (do_lock)
+                /* serialize hCalls to work around firmware issue */
+                if (ehca_lock_hcalls)
                         spin_lock_irqsave(&hcall_lock, flags);
 
                 ret = plpar_hcall9(opcode, outs,
                                    arg1, arg2, arg3, arg4, arg5,
                                    arg6, arg7, arg8, arg9);
 
-                if (do_lock)
+                if (ehca_lock_hcalls)
                         spin_unlock_irqrestore(&hcall_lock, flags);
 
                 if (H_IS_LONG_BUSY(ret)) {
@@ -821,7 +814,7 @@ u64 hipz_h_free_resource_mr(const struct ipz_adapter_handle adapter_handle,
         return ehca_plpar_hcall_norets(H_FREE_RESOURCE,
                                        adapter_handle.handle,    /* r4 */
                                        mr->ipz_mr_handle.handle, /* r5 */
-                                       0, 0, 0, 0, 5);
+                                       0, 0, 0, 0, 0);
 }
 
 u64 hipz_h_reregister_pmr(const struct ipz_adapter_handle adapter_handle,
diff --git a/drivers/infiniband/hw/ehca/hipz_hw.h b/drivers/infiniband/hw/ehca/hipz_hw.h
index 485b8400359e..bf996c7acc42 100644
--- a/drivers/infiniband/hw/ehca/hipz_hw.h
+++ b/drivers/infiniband/hw/ehca/hipz_hw.h
@@ -378,6 +378,7 @@ struct hipz_query_hca {
 #define HCA_CAP_UD_LL_QP              EHCA_BMASK_IBM(16, 16)
 #define HCA_CAP_RESIZE_MR             EHCA_BMASK_IBM(17, 17)
 #define HCA_CAP_MINI_QP               EHCA_BMASK_IBM(18, 18)
+#define HCA_CAP_H_ALLOC_RES_SYNC      EHCA_BMASK_IBM(19, 19)
 
 /* query port response block */
 struct hipz_query_port {
diff --git a/drivers/infiniband/hw/ipath/ipath_cq.c b/drivers/infiniband/hw/ipath/ipath_cq.c
index 08d8ae148cd0..d1380c7a1703 100644
--- a/drivers/infiniband/hw/ipath/ipath_cq.c
+++ b/drivers/infiniband/hw/ipath/ipath_cq.c
@@ -395,12 +395,9 @@ int ipath_resize_cq(struct ib_cq *ibcq, int cqe, struct ib_udata *udata)
                 goto bail;
         }
 
-        /*
-         * Return the address of the WC as the offset to mmap.
-         * See ipath_mmap() for details.
-         */
+        /* Check that we can write the offset to mmap. */
         if (udata && udata->outlen >= sizeof(__u64)) {
-                __u64 offset = (__u64) wc;
+                __u64 offset = 0;
 
                 ret = ib_copy_to_udata(udata, &offset, sizeof(offset));
                 if (ret)
@@ -450,6 +447,18 @@ int ipath_resize_cq(struct ib_cq *ibcq, int cqe, struct ib_udata *udata)
                 struct ipath_mmap_info *ip = cq->ip;
 
                 ipath_update_mmap_info(dev, ip, sz, wc);
+
+                /*
+                 * Return the offset to mmap.
+                 * See ipath_mmap() for details.
+                 */
+                if (udata && udata->outlen >= sizeof(__u64)) {
+                        ret = ib_copy_to_udata(udata, &ip->offset,
+                                               sizeof(ip->offset));
+                        if (ret)
+                                goto bail;
+                }
+
                 spin_lock_irq(&dev->pending_lock);
                 if (list_empty(&ip->pending_mmaps))
                         list_add(&ip->pending_mmaps, &dev->pending_mmaps);
diff --git a/drivers/infiniband/hw/ipath/ipath_qp.c b/drivers/infiniband/hw/ipath/ipath_qp.c
index 6a41fdbc8e57..b997ff88401b 100644
--- a/drivers/infiniband/hw/ipath/ipath_qp.c
+++ b/drivers/infiniband/hw/ipath/ipath_qp.c
@@ -835,7 +835,8 @@ struct ib_qp *ipath_create_qp(struct ib_pd *ibpd,
                                       init_attr->qp_type);
                 if (err) {
                         ret = ERR_PTR(err);
-                        goto bail_rwq;
+                        vfree(qp->r_rq.wq);
+                        goto bail_qp;
                 }
                 qp->ip = NULL;
                 ipath_reset_qp(qp);
@@ -863,7 +864,7 @@ struct ib_qp *ipath_create_qp(struct ib_pd *ibpd,
                                                sizeof(offset));
                         if (err) {
                                 ret = ERR_PTR(err);
-                                goto bail_rwq;
+                                goto bail_ip;
                         }
                 } else {
                         u32 s = sizeof(struct ipath_rwq) +
@@ -875,7 +876,7 @@ struct ib_qp *ipath_create_qp(struct ib_pd *ibpd,
                                                    qp->r_rq.wq);
                         if (!qp->ip) {
                                 ret = ERR_PTR(-ENOMEM);
-                                goto bail_rwq;
+                                goto bail_ip;
                         }
 
                         err = ib_copy_to_udata(udata, &(qp->ip->offset),
@@ -907,9 +908,11 @@ struct ib_qp *ipath_create_qp(struct ib_pd *ibpd,
         goto bail;
 
 bail_ip:
-        kfree(qp->ip);
-bail_rwq:
-        vfree(qp->r_rq.wq);
+        if (qp->ip)
+                kref_put(&qp->ip->ref, ipath_release_mmap_info);
+        else
+                vfree(qp->r_rq.wq);
+        ipath_free_qp(&dev->qp_table, qp);
 bail_qp:
         kfree(qp);
 bail_swq:
diff --git a/drivers/infiniband/hw/ipath/ipath_srq.c b/drivers/infiniband/hw/ipath/ipath_srq.c
index 40c36ec19016..2fef36f4b675 100644
--- a/drivers/infiniband/hw/ipath/ipath_srq.c
+++ b/drivers/infiniband/hw/ipath/ipath_srq.c
@@ -59,7 +59,7 @@ int ipath_post_srq_receive(struct ib_srq *ibsrq, struct ib_recv_wr *wr,
 
                 if ((unsigned) wr->num_sge > srq->rq.max_sge) {
                         *bad_wr = wr;
-                        ret = -ENOMEM;
+                        ret = -EINVAL;
                         goto bail;
                 }
 
@@ -211,11 +211,11 @@ int ipath_modify_srq(struct ib_srq *ibsrq, struct ib_srq_attr *attr,
                      struct ib_udata *udata)
 {
         struct ipath_srq *srq = to_isrq(ibsrq);
+        struct ipath_rwq *wq;
         int ret = 0;
 
         if (attr_mask & IB_SRQ_MAX_WR) {
                 struct ipath_rwq *owq;
-                struct ipath_rwq *wq;
                 struct ipath_rwqe *p;
                 u32 sz, size, n, head, tail;
 
@@ -236,27 +236,20 @@ int ipath_modify_srq(struct ib_srq *ibsrq, struct ib_srq_attr *attr,
                         goto bail;
                 }
 
-                /*
-                 * Return the address of the RWQ as the offset to mmap.
-                 * See ipath_mmap() for details.
-                 */
+                /* Check that we can write the offset to mmap. */
                 if (udata && udata->inlen >= sizeof(__u64)) {
                         __u64 offset_addr;
-                        __u64 offset = (__u64) wq;
+                        __u64 offset = 0;
 
                         ret = ib_copy_from_udata(&offset_addr, udata,
                                                  sizeof(offset_addr));
-                        if (ret) {
-                                vfree(wq);
-                                goto bail;
-                        }
+                        if (ret)
+                                goto bail_free;
                         udata->outbuf = (void __user *) offset_addr;
                         ret = ib_copy_to_udata(udata, &offset,
                                                sizeof(offset));
-                        if (ret) {
-                                vfree(wq);
-                                goto bail;
-                        }
+                        if (ret)
+                                goto bail_free;
                 }
 
                 spin_lock_irq(&srq->rq.lock);
@@ -277,10 +270,8 @@ int ipath_modify_srq(struct ib_srq *ibsrq, struct ib_srq_attr *attr,
                 else
                         n -= tail;
                 if (size <= n) {
-                        spin_unlock_irq(&srq->rq.lock);
-                        vfree(wq);
                         ret = -EINVAL;
-                        goto bail;
+                        goto bail_unlock;
                 }
                 n = 0;
                 p = wq->wq;
@@ -314,6 +305,18 @@ int ipath_modify_srq(struct ib_srq *ibsrq, struct ib_srq_attr *attr,
                         u32 s = sizeof(struct ipath_rwq) + size * sz;
 
                         ipath_update_mmap_info(dev, ip, s, wq);
+
+                        /*
+                         * Return the offset to mmap.
+                         * See ipath_mmap() for details.
+                         */
+                        if (udata && udata->inlen >= sizeof(__u64)) {
+                                ret = ib_copy_to_udata(udata, &ip->offset,
+                                                       sizeof(ip->offset));
+                                if (ret)
+                                        goto bail;
+                        }
+
                         spin_lock_irq(&dev->pending_lock);
                         if (list_empty(&ip->pending_mmaps))
                                 list_add(&ip->pending_mmaps,
@@ -328,7 +331,12 @@ int ipath_modify_srq(struct ib_srq *ibsrq, struct ib_srq_attr *attr,
                         srq->limit = attr->srq_limit;
                 spin_unlock_irq(&srq->rq.lock);
         }
+        goto bail;
 
+bail_unlock:
+        spin_unlock_irq(&srq->rq.lock);
+bail_free:
+        vfree(wq);
 bail:
         return ret;
 }
diff --git a/drivers/infiniband/hw/ipath/ipath_verbs.c b/drivers/infiniband/hw/ipath/ipath_verbs.c
index 74f77e7c2c1b..c4c998446c7b 100644
--- a/drivers/infiniband/hw/ipath/ipath_verbs.c
+++ b/drivers/infiniband/hw/ipath/ipath_verbs.c
@@ -302,8 +302,10 @@ static int ipath_post_one_send(struct ipath_qp *qp, struct ib_send_wr *wr)
         next = qp->s_head + 1;
         if (next >= qp->s_size)
                 next = 0;
-        if (next == qp->s_last)
-                goto bail_inval;
+        if (next == qp->s_last) {
+                ret = -ENOMEM;
+                goto bail;
+        }
 
         wqe = get_swqe_ptr(qp, qp->s_head);
         wqe->wr = *wr;
@@ -404,7 +406,7 @@ static int ipath_post_receive(struct ib_qp *ibqp, struct ib_recv_wr *wr,
 
                 if ((unsigned) wr->num_sge > qp->r_rq.max_sge) {
                         *bad_wr = wr;
-                        ret = -ENOMEM;
+                        ret = -EINVAL;
                         goto bail;
                 }
 
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c
index a03a65ebcf0c..c9f6077b615e 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_main.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c
@@ -460,6 +460,9 @@ static struct ipoib_path *path_rec_create(struct net_device *dev, void *gid)
         struct ipoib_dev_priv *priv = netdev_priv(dev);
         struct ipoib_path *path;
 
+        if (!priv->broadcast)
+                return NULL;
+
         path = kzalloc(sizeof *path, GFP_ATOMIC);
         if (!path)
                 return NULL;
diff --git a/drivers/infiniband/ulp/iser/iser_memory.c b/drivers/infiniband/ulp/iser/iser_memory.c
index d68798061795..4a17743a639f 100644
--- a/drivers/infiniband/ulp/iser/iser_memory.c
+++ b/drivers/infiniband/ulp/iser/iser_memory.c
@@ -310,13 +310,15 @@ static unsigned int iser_data_buf_aligned_len(struct iser_data_buf *data,
                 if (i + 1 < data->dma_nents) {
                         next_addr = ib_sg_dma_address(ibdev, sg_next(sg));
                         /* are i, i+1 fragments of the same page? */
-                        if (end_addr == next_addr)
+                        if (end_addr == next_addr) {
+                                cnt++;
                                 continue;
-                        else if (!IS_4K_ALIGNED(end_addr)) {
+                        } else if (!IS_4K_ALIGNED(end_addr)) {
                                 ret_len = cnt + 1;
                                 break;
                         }
                 }
+                cnt++;
         }
         if (i == data->dma_nents)
                 ret_len = cnt;  /* loop ended */
diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig
index 2316a018fae6..dfa6592c10f6 100644
--- a/drivers/input/keyboard/Kconfig
+++ b/drivers/input/keyboard/Kconfig
@@ -286,7 +286,7 @@ config KEYBOARD_MAPLE
 
 config KEYBOARD_BFIN
         tristate "Blackfin BF54x keypad support"
-        depends on BF54x
+        depends on (BF54x && !BF544)
         help
           Say Y here if you want to use the BF54x keypad.
 
diff --git a/drivers/input/keyboard/gpio_keys.c b/drivers/input/keyboard/gpio_keys.c
index 3eddf52a0bba..6a9ca4bdcb74 100644
--- a/drivers/input/keyboard/gpio_keys.c
+++ b/drivers/input/keyboard/gpio_keys.c
@@ -75,16 +75,32 @@ static int __devinit gpio_keys_probe(struct platform_device *pdev)
 
         for (i = 0; i < pdata->nbuttons; i++) {
                 struct gpio_keys_button *button = &pdata->buttons[i];
-                int irq = gpio_to_irq(button->gpio);
+                int irq;
                 unsigned int type = button->type ?: EV_KEY;
 
+                error = gpio_request(button->gpio, button->desc ?: "gpio_keys");
+                if (error < 0) {
+                        pr_err("gpio-keys: failed to request GPIO %d,"
+                                " error %d\n", button->gpio, error);
+                        goto fail;
+                }
+
+                error = gpio_direction_input(button->gpio);
+                if (error < 0) {
+                        pr_err("gpio-keys: failed to configure input"
+                                " direction for GPIO %d, error %d\n",
+                                button->gpio, error);
+                        gpio_free(button->gpio);
+                        goto fail;
+                }
+
+                irq = gpio_to_irq(button->gpio);
                 if (irq < 0) {
                         error = irq;
-                        printk(KERN_ERR
-                                "gpio-keys: "
-                                "Unable to get irq number for GPIO %d,"
-                                "error %d\n",
+                        pr_err("gpio-keys: Unable to get irq number"
+                                " for GPIO %d, error %d\n",
                                 button->gpio, error);
+                        gpio_free(button->gpio);
                         goto fail;
                 }
 
@@ -94,9 +110,9 @@ static int __devinit gpio_keys_probe(struct platform_device *pdev)
                                     button->desc ? button->desc : "gpio_keys",
                                     pdev);
                 if (error) {
-                        printk(KERN_ERR
-                                "gpio-keys: Unable to claim irq %d; error %d\n",
+                        pr_err("gpio-keys: Unable to claim irq %d; error %d\n",
                                 irq, error);
+                        gpio_free(button->gpio);
                         goto fail;
                 }
 
@@ -108,8 +124,7 @@ static int __devinit gpio_keys_probe(struct platform_device *pdev)
 
         error = input_register_device(input);
         if (error) {
-                printk(KERN_ERR
-                        "gpio-keys: Unable to register input device, "
+                pr_err("gpio-keys: Unable to register input device, "
                         "error: %d\n", error);
                 goto fail;
         }
@@ -119,8 +134,10 @@ static int __devinit gpio_keys_probe(struct platform_device *pdev)
         return 0;
 
  fail:
-        while (--i >= 0)
+        while (--i >= 0) {
                 free_irq(gpio_to_irq(pdata->buttons[i].gpio), pdev);
+                gpio_free(pdata->buttons[i].gpio);
+        }
 
         platform_set_drvdata(pdev, NULL);
         input_free_device(input);
@@ -139,6 +156,7 @@ static int __devexit gpio_keys_remove(struct platform_device *pdev)
         for (i = 0; i < pdata->nbuttons; i++) {
                 int irq = gpio_to_irq(pdata->buttons[i].gpio);
                 free_irq(irq, pdev);
+                gpio_free(pdata->buttons[i].gpio);
         }
 
         input_unregister_device(input);
diff --git a/drivers/input/serio/Kconfig b/drivers/input/serio/Kconfig
index 5ce632ca6815..b88569e21d60 100644
--- a/drivers/input/serio/Kconfig
+++ b/drivers/input/serio/Kconfig
@@ -21,7 +21,7 @@ if SERIO
 config SERIO_I8042
         tristate "i8042 PC Keyboard controller" if EMBEDDED || !X86
         default y
-        depends on !PARISC && (!ARM || ARCH_SHARK || FOOTBRIDGE_HOST) && !M68K && !BFIN
+        depends on !PARISC && (!ARM || ARCH_SHARK || FOOTBRIDGE_HOST) && !M68K && !BLACKFIN
         ---help---
           i8042 is the chip over which the standard AT keyboard and PS/2
           mouse are connected to the computer. If you use these devices,
diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h
index f8fe42148093..c5e68dcd88ac 100644
--- a/drivers/input/serio/i8042-x86ia64io.h
+++ b/drivers/input/serio/i8042-x86ia64io.h
@@ -110,6 +110,14 @@ static struct dmi_system_id __initdata i8042_dmi_noloop_table[] = {
                         DMI_MATCH(DMI_PRODUCT_VERSION, "5a"),
                 },
         },
+        {
+                .ident = "Microsoft Virtual Machine",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "Virtual Machine"),
+                        DMI_MATCH(DMI_PRODUCT_VERSION, "VS2005R2"),
+                },
+        },
         { }
 };
 
diff --git a/drivers/input/touchscreen/ads7846.c b/drivers/input/touchscreen/ads7846.c
index f59aecf5ec15..fd9c5d51870a 100644
--- a/drivers/input/touchscreen/ads7846.c
+++ b/drivers/input/touchscreen/ads7846.c
@@ -267,13 +267,12 @@ static int ads7846_read12_ser(struct device *dev, unsigned command)
         ts->irq_disabled = 0;
         enable_irq(spi->irq);
 
-        if (req->msg.status)
-                status = req->msg.status;
-
-        /* on-wire is a must-ignore bit, a BE12 value, then padding */
-        sample = be16_to_cpu(req->sample);
-        sample = sample >> 3;
-        sample &= 0x0fff;
+        if (status == 0) {
+                /* on-wire is a must-ignore bit, a BE12 value, then padding */
+                sample = be16_to_cpu(req->sample);
+                sample = sample >> 3;
+                sample &= 0x0fff;
+        }
 
         kfree(req);
         return status ? status : sample;
diff --git a/drivers/isdn/hisax/hfcscard.c b/drivers/isdn/hisax/hfcscard.c
index 57670dc5034d..909d6709ec16 100644
--- a/drivers/isdn/hisax/hfcscard.c
+++ b/drivers/isdn/hisax/hfcscard.c
@@ -118,8 +118,7 @@ hfcs_card_msg(struct IsdnCardState *cs, int mt, void *arg)
                         return(0);
                 case CARD_INIT:
                         delay = (75*HZ)/100 +1;
-                        cs->hw.hfcD.timer.expires = jiffies + delay;
-                        add_timer(&cs->hw.hfcD.timer);
+                        mod_timer(&cs->hw.hfcD.timer, jiffies + delay);
                         spin_lock_irqsave(&cs->lock, flags);
                         reset_hfcs(cs);
                         init2bds0(cs);
diff --git a/drivers/isdn/i4l/isdn_common.c b/drivers/isdn/i4l/isdn_common.c
index c6df2925ebd0..d6952959d72a 100644
--- a/drivers/isdn/i4l/isdn_common.c
+++ b/drivers/isdn/i4l/isdn_common.c
@@ -1515,6 +1515,7 @@ isdn_ioctl(struct inode *inode, struct file *file, uint cmd, ulong arg)
                                         if (copy_from_user(&iocts, argp,
                                              sizeof(isdn_ioctl_struct)))
                                                 return -EFAULT;
+                                        iocts.drvid[sizeof(iocts.drvid)-1] = 0;
                                         if (strlen(iocts.drvid)) {
                                                 if ((p = strchr(iocts.drvid, ',')))
                                                         *p = 0;
@@ -1599,6 +1600,7 @@ isdn_ioctl(struct inode *inode, struct file *file, uint cmd, ulong arg)
                                         if (copy_from_user(&iocts, argp,
                                              sizeof(isdn_ioctl_struct)))
                                                 return -EFAULT;
+                                        iocts.drvid[sizeof(iocts.drvid)-1] = 0;
                                         if (strlen(iocts.drvid)) {
                                                 drvidx = -1;
                                                 for (i = 0; i < ISDN_MAX_DRIVERS; i++)
@@ -1643,7 +1645,7 @@ isdn_ioctl(struct inode *inode, struct file *file, uint cmd, ulong arg)
                                         } else {
                                                 p = (char __user *) iocts.arg;
                                                 for (i = 0; i < 10; i++) {
-                                                        sprintf(bname, "%s%s",
+                                                        snprintf(bname, sizeof(bname), "%s%s",
                                                                 strlen(dev->drv[drvidx]->msn2eaz[i]) ?
                                                                 dev->drv[drvidx]->msn2eaz[i] : "_",
                                                                 (i < 9) ? "," : "\0");
@@ -1673,6 +1675,7 @@ isdn_ioctl(struct inode *inode, struct file *file, uint cmd, ulong arg)
                                         char *p;
                                         if (copy_from_user(&iocts, argp, sizeof(isdn_ioctl_struct)))
                                                 return -EFAULT;
+                                        iocts.drvid[sizeof(iocts.drvid)-1] = 0;
                                         if (strlen(iocts.drvid)) {
                                                 if ((p = strchr(iocts.drvid, ',')))
                                                         *p = 0;
diff --git a/drivers/isdn/i4l/isdn_net.c b/drivers/isdn/i4l/isdn_net.c
index b39d1f5b378e..ced83c202cac 100644
--- a/drivers/isdn/i4l/isdn_net.c
+++ b/drivers/isdn/i4l/isdn_net.c
@@ -2104,7 +2104,7 @@ isdn_net_find_icall(int di, int ch, int idx, setup_parm *setup)
         u_long flags;
         isdn_net_dev *p;
         isdn_net_phone *n;
-        char nr[32];
+        char nr[ISDN_MSNLEN];
         char *my_eaz;
 
         /* Search name in netdev-chain */
@@ -2113,7 +2113,7 @@ isdn_net_find_icall(int di, int ch, int idx, setup_parm *setup)
                 nr[1] = '\0';
                 printk(KERN_INFO "isdn_net: Incoming call without OAD, assuming '0'\n");
         } else
-                strcpy(nr, setup->phone);
+                strlcpy(nr, setup->phone, ISDN_MSNLEN);
         si1 = (int) setup->si1;
         si2 = (int) setup->si2;
         if (!setup->eazmsn[0]) {
@@ -2789,7 +2789,7 @@ isdn_net_setcfg(isdn_net_ioctl_cfg * cfg)
                                 chidx = -1;
                         }
                 }
-                strcpy(lp->msn, cfg->eaz);
+                strlcpy(lp->msn, cfg->eaz, sizeof(lp->msn));
                 lp->pre_device = drvidx;
                 lp->pre_channel = chidx;
                 lp->onhtime = cfg->onhtime;
@@ -2936,7 +2936,7 @@ isdn_net_addphone(isdn_net_ioctl_phone * phone)
         if (p) {
                 if (!(n = kmalloc(sizeof(isdn_net_phone), GFP_KERNEL)))
                         return -ENOMEM;
-                strcpy(n->num, phone->phone);
+                strlcpy(n->num, phone->phone, sizeof(n->num));
                 n->next = p->local->phone[phone->outgoing & 1];
                 p->local->phone[phone->outgoing & 1] = n;
                 return 0;
diff --git a/drivers/kvm/kvm_main.c b/drivers/kvm/kvm_main.c
index 07ae280e8fe5..47c10b8f89b3 100644
--- a/drivers/kvm/kvm_main.c
+++ b/drivers/kvm/kvm_main.c
@@ -1188,8 +1188,7 @@ int emulate_invlpg(struct kvm_vcpu *vcpu, gva_t address)
 
 int emulate_clts(struct kvm_vcpu *vcpu)
 {
-        vcpu->cr0 &= ~X86_CR0_TS;
-        kvm_x86_ops->set_cr0(vcpu, vcpu->cr0);
+        kvm_x86_ops->set_cr0(vcpu, vcpu->cr0 & ~X86_CR0_TS);
         return X86EMUL_CONTINUE;
 }
 
diff --git a/drivers/kvm/svm.c b/drivers/kvm/svm.c
index 7a6eead63a6b..4e04e49a2f1c 100644
--- a/drivers/kvm/svm.c
+++ b/drivers/kvm/svm.c
@@ -663,6 +663,7 @@ static void svm_vcpu_put(struct kvm_vcpu *vcpu)
                 wrmsrl(host_save_user_msrs[i], svm->host_user_msrs[i]);
 
         rdtscll(vcpu->host_tsc);
+        kvm_put_guest_fpu(vcpu);
 }
 
 static void svm_vcpu_decache(struct kvm_vcpu *vcpu)
diff --git a/drivers/kvm/x86_emulate.c b/drivers/kvm/x86_emulate.c
index 33b181451557..bd46de6bf891 100644
--- a/drivers/kvm/x86_emulate.c
+++ b/drivers/kvm/x86_emulate.c
@@ -448,8 +448,7 @@ struct operand {
 
 #define JMP_REL(rel)                                                    \
         do {                                                            \
-                _eip += (int)(rel);                                     \
-                _eip = ((op_bytes == 2) ? (uint16_t)_eip : (uint32_t)_eip); \
+                register_address_increment(_eip, rel);                  \
         } while (0)
 
 /*
@@ -1147,7 +1146,7 @@ done_prefixes:
                         }
                         register_address_increment(_regs[VCPU_REGS_RSP],
                                                    -dst.bytes);
-                        if ((rc = ops->write_std(
+                        if ((rc = ops->write_emulated(
                                      register_address(ctxt->ss_base,
                                                       _regs[VCPU_REGS_RSP]),
                                      &dst.val, dst.bytes, ctxt->vcpu)) != 0)
@@ -1359,6 +1358,7 @@ special_insn:
                 }
                 src.val = (unsigned long) _eip;
                 JMP_REL(rel);
+                op_bytes = ad_bytes;
                 goto push;
         }
         case 0xe9: /* jmp rel */
diff --git a/drivers/leds/led-class.c b/drivers/leds/led-class.c
index 4211293ce862..ba8b04b03b9f 100644
--- a/drivers/leds/led-class.c
+++ b/drivers/leds/led-class.c
@@ -111,7 +111,7 @@ int led_classdev_register(struct device *parent, struct led_classdev *led_cdev)
         write_unlock(&leds_list_lock);
 
 #ifdef CONFIG_LEDS_TRIGGERS
-        rwlock_init(&led_cdev->trigger_lock);
+        init_rwsem(&led_cdev->trigger_lock);
 
         rc = device_create_file(led_cdev->dev, &dev_attr_trigger);
         if (rc)
@@ -147,10 +147,10 @@ void led_classdev_unregister(struct led_classdev *led_cdev)
         device_remove_file(led_cdev->dev, &dev_attr_brightness);
 #ifdef CONFIG_LEDS_TRIGGERS
         device_remove_file(led_cdev->dev, &dev_attr_trigger);
-        write_lock(&led_cdev->trigger_lock);
+        down_write(&led_cdev->trigger_lock);
         if (led_cdev->trigger)
                 led_trigger_set(led_cdev, NULL);
-        write_unlock(&led_cdev->trigger_lock);
+        up_write(&led_cdev->trigger_lock);
 #endif
 
         device_unregister(led_cdev->dev);
diff --git a/drivers/leds/led-triggers.c b/drivers/leds/led-triggers.c
index 575368c2b100..0bdb786210b1 100644
--- a/drivers/leds/led-triggers.c
+++ b/drivers/leds/led-triggers.c
@@ -19,13 +19,14 @@
 #include <linux/device.h>
 #include <linux/sysdev.h>
 #include <linux/timer.h>
+#include <linux/rwsem.h>
 #include <linux/leds.h>
 #include "leds.h"
 
 /*
  * Nests outside led_cdev->trigger_lock
  */
-static DEFINE_RWLOCK(triggers_list_lock);
+static DECLARE_RWSEM(triggers_list_lock);
 static LIST_HEAD(trigger_list);
 
 ssize_t led_trigger_store(struct device *dev, struct device_attribute *attr,
@@ -44,24 +45,24 @@ ssize_t led_trigger_store(struct device *dev, struct device_attribute *attr,
                 trigger_name[len - 1] = '\0';
 
         if (!strcmp(trigger_name, "none")) {
-                write_lock(&led_cdev->trigger_lock);
+                down_write(&led_cdev->trigger_lock);
                 led_trigger_set(led_cdev, NULL);
-                write_unlock(&led_cdev->trigger_lock);
+                up_write(&led_cdev->trigger_lock);
                 return count;
         }
 
-        read_lock(&triggers_list_lock);
+        down_read(&triggers_list_lock);
         list_for_each_entry(trig, &trigger_list, next_trig) {
                 if (!strcmp(trigger_name, trig->name)) {
-                        write_lock(&led_cdev->trigger_lock);
+                        down_write(&led_cdev->trigger_lock);
                         led_trigger_set(led_cdev, trig);
-                        write_unlock(&led_cdev->trigger_lock);
+                        up_write(&led_cdev->trigger_lock);
 
-                        read_unlock(&triggers_list_lock);
+                        up_read(&triggers_list_lock);
                         return count;
                 }
         }
-        read_unlock(&triggers_list_lock);
+        up_read(&triggers_list_lock);
 
         return -EINVAL;
 }
@@ -74,8 +75,8 @@ ssize_t led_trigger_show(struct device *dev, struct device_attribute *attr,
         struct led_trigger *trig;
         int len = 0;
 
-        read_lock(&triggers_list_lock);
-        read_lock(&led_cdev->trigger_lock);
+        down_read(&triggers_list_lock);
+        down_read(&led_cdev->trigger_lock);
 
         if (!led_cdev->trigger)
                 len += sprintf(buf+len, "[none] ");
@@ -89,8 +90,8 @@ ssize_t led_trigger_show(struct device *dev, struct device_attribute *attr,
                 else
                         len += sprintf(buf+len, "%s ", trig->name);
         }
-        read_unlock(&led_cdev->trigger_lock);
-        read_unlock(&triggers_list_lock);
+        up_read(&led_cdev->trigger_lock);
+        up_read(&triggers_list_lock);
 
         len += sprintf(len+buf, "\n");
         return len;
@@ -145,14 +146,14 @@ void led_trigger_set_default(struct led_classdev *led_cdev)
         if (!led_cdev->default_trigger)
                 return;
 
-        read_lock(&triggers_list_lock);
-        write_lock(&led_cdev->trigger_lock);
+        down_read(&triggers_list_lock);
+        down_write(&led_cdev->trigger_lock);
         list_for_each_entry(trig, &trigger_list, next_trig) {
                 if (!strcmp(led_cdev->default_trigger, trig->name))
                         led_trigger_set(led_cdev, trig);
         }
-        write_unlock(&led_cdev->trigger_lock);
-        read_unlock(&triggers_list_lock);
+        up_write(&led_cdev->trigger_lock);
+        up_read(&triggers_list_lock);
 }
 
 int led_trigger_register(struct led_trigger *trigger)
@@ -163,18 +164,18 @@ int led_trigger_register(struct led_trigger *trigger)
         INIT_LIST_HEAD(&trigger->led_cdevs);
 
         /* Add to the list of led triggers */
-        write_lock(&triggers_list_lock);
+        down_write(&triggers_list_lock);
         list_add_tail(&trigger->next_trig, &trigger_list);
-        write_unlock(&triggers_list_lock);
+        up_write(&triggers_list_lock);
 
         /* Register with any LEDs that have this as a default trigger */
         read_lock(&leds_list_lock);
         list_for_each_entry(led_cdev, &leds_list, node) {
-                write_lock(&led_cdev->trigger_lock);
+                down_write(&led_cdev->trigger_lock);
                 if (!led_cdev->trigger && led_cdev->default_trigger &&
                             !strcmp(led_cdev->default_trigger, trigger->name))
                         led_trigger_set(led_cdev, trigger);
-                write_unlock(&led_cdev->trigger_lock);
+                up_write(&led_cdev->trigger_lock);
         }
         read_unlock(&leds_list_lock);
 
@@ -206,17 +207,17 @@ void led_trigger_unregister(struct led_trigger *trigger)
         struct led_classdev *led_cdev;
 
         /* Remove from the list of led triggers */
-        write_lock(&triggers_list_lock);
+        down_write(&triggers_list_lock);
         list_del(&trigger->next_trig);
-        write_unlock(&triggers_list_lock);
+        up_write(&triggers_list_lock);
 
         /* Remove anyone actively using this trigger */
         read_lock(&leds_list_lock);
         list_for_each_entry(led_cdev, &leds_list, node) {
-                write_lock(&led_cdev->trigger_lock);
+                down_write(&led_cdev->trigger_lock);
                 if (led_cdev->trigger == trigger)
                         led_trigger_set(led_cdev, NULL);
-                write_unlock(&led_cdev->trigger_lock);
+                up_write(&led_cdev->trigger_lock);
         }
         read_unlock(&leds_list_lock);
 }
diff --git a/drivers/lguest/lguest_device.c b/drivers/lguest/lguest_device.c
index 66f38722253a..e2eec38c83c2 100644
--- a/drivers/lguest/lguest_device.c
+++ b/drivers/lguest/lguest_device.c
@@ -247,6 +247,8 @@ static void lg_del_vq(struct virtqueue *vq)
 {
         struct lguest_vq_info *lvq = vq->priv;
 
+        /* Release the interrupt */
+        free_irq(lvq->config.irq, vq);
         /* Tell virtio_ring.c to free the virtqueue. */
         vring_del_virtqueue(vq);
         /* Unmap the pages containing the ring. */
diff --git a/drivers/media/common/saa7146_video.c b/drivers/media/common/saa7146_video.c
index f245a3b2ef47..ae36d101006b 100644
--- a/drivers/media/common/saa7146_video.c
+++ b/drivers/media/common/saa7146_video.c
@@ -1205,13 +1205,10 @@ int saa7146_video_do_ioctl(struct inode *inode, struct file *file, unsigned int
                 DEB_D(("VIDIOCGMBUF \n"));
 
                 q = &fh->video_q;
-                mutex_lock(&q->lock);
                 err = videobuf_mmap_setup(q,gbuffers,gbufsize,
                                           V4L2_MEMORY_MMAP);
-                if (err < 0) {
-                        mutex_unlock(&q->lock);
+                if (err < 0)
                         return err;
-                }
 
                 gbuffers = err;
                 memset(mbuf,0,sizeof(*mbuf));
@@ -1219,7 +1216,6 @@ int saa7146_video_do_ioctl(struct inode *inode, struct file *file, unsigned int
                 mbuf->size   = gbuffers * gbufsize;
                 for (i = 0; i < gbuffers; i++)
                         mbuf->offsets[i] = i * gbufsize;
-                mutex_unlock(&q->lock);
                 return 0;
         }
 #endif
@@ -1440,10 +1436,7 @@ static void video_close(struct saa7146_dev *dev, struct file *file)
                 err = saa7146_stop_preview(fh);
         }
 
-        // release all capture buffers
-        mutex_lock(&q->lock);
-        videobuf_read_stop(q);
-        mutex_unlock(&q->lock);
+        videobuf_stop(q);
 
         /* hmm, why is this function declared void? */
         /* return err */
diff --git a/drivers/media/dvb/dvb-usb/Makefile b/drivers/media/dvb/dvb-usb/Makefile
index 73ac0a93fdeb..60a910052c16 100644
--- a/drivers/media/dvb/dvb-usb/Makefile
+++ b/drivers/media/dvb/dvb-usb/Makefile
@@ -62,3 +62,6 @@ dvb-usb-af9005-remote-objs = af9005-remote.o
 obj-$(CONFIG_DVB_USB_AF9005_REMOTE) += dvb-usb-af9005-remote.o
 
 EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends/
+# due to tuner-xc3028
+EXTRA_CFLAGS += -Idrivers/media/video
+
diff --git a/drivers/media/dvb/dvb-usb/dibusb-common.c b/drivers/media/dvb/dvb-usb/dibusb-common.c
index 9a184da01c47..8ee6cd4da9e7 100644
--- a/drivers/media/dvb/dvb-usb/dibusb-common.c
+++ b/drivers/media/dvb/dvb-usb/dibusb-common.c
@@ -223,6 +223,9 @@ static struct dibx000_agc_config dib3000p_panasonic_agc_config = {
         .agc2_slope2 = 0x1e,
 };
 
+#if defined(CONFIG_DVB_DIB3000MC) ||                                    \
+        (defined(CONFIG_DVB_DIB3000MC_MODULE) && defined(MODULE))
+
 static struct dib3000mc_config mod3000p_dib3000p_config = {
         &dib3000p_panasonic_agc_config,
 
@@ -305,6 +308,7 @@ int dibusb_dib3000mc_tuner_attach(struct dvb_usb_adapter *adap)
         return 0;
 }
 EXPORT_SYMBOL(dibusb_dib3000mc_tuner_attach);
+#endif
 
 /*
  * common remote control stuff
diff --git a/drivers/media/dvb/frontends/tda10086.c b/drivers/media/dvb/frontends/tda10086.c
index 9a8ddc537f8f..9d26ace65151 100644
--- a/drivers/media/dvb/frontends/tda10086.c
+++ b/drivers/media/dvb/frontends/tda10086.c
@@ -158,7 +158,7 @@ static int tda10086_init(struct dvb_frontend* fe)
         tda10086_write_byte(state, 0x3d, 0x80);
 
         // setup SEC
-        tda10086_write_byte(state, 0x36, 0x00); // all SEC off
+        tda10086_write_byte(state, 0x36, 0x80); // all SEC off, no 22k tone
         tda10086_write_byte(state, 0x34, (((1<<19) * (22000/1000)) / (SACLK/1000)));      // } tone frequency
         tda10086_write_byte(state, 0x35, (((1<<19) * (22000/1000)) / (SACLK/1000)) >> 8); // }
 
@@ -183,13 +183,13 @@ static int tda10086_set_tone (struct dvb_frontend* fe, fe_sec_tone_mode_t tone)
 
         dprintk ("%s\n", __FUNCTION__);
 
-        switch(tone) {
+        switch (tone) {
         case SEC_TONE_OFF:
-                tda10086_write_byte(state, 0x36, 0x00);
+                tda10086_write_byte(state, 0x36, 0x80);
                 break;
 
         case SEC_TONE_ON:
-                tda10086_write_byte(state, 0x36, 0x01);
+                tda10086_write_byte(state, 0x36, 0x81);
                 break;
         }
 
@@ -212,7 +212,7 @@ static int tda10086_send_master_cmd (struct dvb_frontend* fe,
         for(i=0; i< cmd->msg_len; i++) {
                 tda10086_write_byte(state, 0x48+i, cmd->msg[i]);
         }
-        tda10086_write_byte(state, 0x36, 0x08 | ((cmd->msg_len - 1) << 4));
+        tda10086_write_byte(state, 0x36, 0x88 | ((cmd->msg_len - 1) << 4));
 
         tda10086_diseqc_wait(state);
 
@@ -230,11 +230,11 @@ static int tda10086_send_burst (struct dvb_frontend* fe, fe_sec_mini_cmd_t minic
 
         switch(minicmd) {
         case SEC_MINI_A:
-                tda10086_write_byte(state, 0x36, 0x04);
+                tda10086_write_byte(state, 0x36, 0x84);
                 break;
 
         case SEC_MINI_B:
-                tda10086_write_byte(state, 0x36, 0x06);
+                tda10086_write_byte(state, 0x36, 0x86);
                 break;
         }
 
diff --git a/drivers/media/dvb/frontends/zl10353.c b/drivers/media/dvb/frontends/zl10353.c
index a97a7fd2c891..0106df4c55e8 100644
--- a/drivers/media/dvb/frontends/zl10353.c
+++ b/drivers/media/dvb/frontends/zl10353.c
@@ -122,7 +122,7 @@ static void zl10353_calc_nominal_rate(struct dvb_frontend *fe,
                                       enum fe_bandwidth bandwidth,
                                       u16 *nominal_rate)
 {
-        u32 adc_clock = 22528; /* 20.480 MHz on the board(!?) */
+        u32 adc_clock = 45056; /* 45.056 MHz */
         u8 bw;
         struct zl10353_state *state = fe->demodulator_priv;
 
@@ -142,7 +142,7 @@ static void zl10353_calc_nominal_rate(struct dvb_frontend *fe,
                 break;
         }
 
-        *nominal_rate = (64 * bw * (1<<16) / (7 * 8) * 4000 / adc_clock + 2) / 4;
+        *nominal_rate = (bw * (1 << 23) / 7 * 125 + adc_clock / 2) / adc_clock;
 
         dprintk("%s: bw %d, adc_clock %d => 0x%x\n",
                 __FUNCTION__, bw, adc_clock, *nominal_rate);
diff --git a/drivers/media/dvb/frontends/zl10353.h b/drivers/media/dvb/frontends/zl10353.h
index cb274dc12b82..1c3d494a6da9 100644
--- a/drivers/media/dvb/frontends/zl10353.h
+++ b/drivers/media/dvb/frontends/zl10353.h
@@ -30,7 +30,7 @@ struct zl10353_config
         u8 demod_address;
 
         /* frequencies in kHz */
-        int adc_clock;  // default: 22528
+        int adc_clock;  /* default: 45056 */
 
         /* set if no pll is connected to the secondary i2c bus */
         int no_tuner;
diff --git a/drivers/media/video/bt8xx/bttv-cards.c b/drivers/media/video/bt8xx/bttv-cards.c
index 3abd9fa54d2c..585d1ef95afd 100644
--- a/drivers/media/video/bt8xx/bttv-cards.c
+++ b/drivers/media/video/bt8xx/bttv-cards.c
@@ -5080,7 +5080,7 @@ static void PXC200_muxsel(struct bttv *btv, unsigned int input)
 /* ----------------------------------------------------------------------- */
 /* motherboard chipset specific stuff                                      */
 
-void __devinit bttv_check_chipset(void)
+void __init bttv_check_chipset(void)
 {
         int pcipci_fail = 0;
         struct pci_dev *dev = NULL;
diff --git a/drivers/media/video/bt8xx/bttv-driver.c b/drivers/media/video/bt8xx/bttv-driver.c
index a88b56e6ca05..c02d92deacd2 100644
--- a/drivers/media/video/bt8xx/bttv-driver.c
+++ b/drivers/media/video/bt8xx/bttv-driver.c
@@ -3827,10 +3827,7 @@ static int bttv_release(struct inode *inode, struct file *file)
 
         /* stop vbi capture */
         if (check_btres(fh, RESOURCE_VBI)) {
-                if (fh->vbi.streaming)
-                        videobuf_streamoff(&fh->vbi);
-                if (fh->vbi.reading)
-                        videobuf_read_stop(&fh->vbi);
+                videobuf_stop(&fh->vbi);
                 free_btres(btv,fh,RESOURCE_VBI);
         }
 
@@ -4988,7 +4985,7 @@ static struct pci_driver bttv_pci_driver = {
 #endif
 };
 
-static int bttv_init_module(void)
+static int __init bttv_init_module(void)
 {
         int ret;
 
@@ -5021,7 +5018,7 @@ static int bttv_init_module(void)
         return pci_register_driver(&bttv_pci_driver);
 }
 
-static void bttv_cleanup_module(void)
+static void __exit bttv_cleanup_module(void)
 {
         pci_unregister_driver(&bttv_pci_driver);
         bus_unregister(&bttv_sub_bus_type);
diff --git a/drivers/media/video/cx88/cx88-blackbird.c b/drivers/media/video/cx88/cx88-blackbird.c
index f33f0b47142c..f802b5653569 100644
--- a/drivers/media/video/cx88/cx88-blackbird.c
+++ b/drivers/media/video/cx88/cx88-blackbird.c
@@ -1085,10 +1085,7 @@ static int mpeg_release(struct inode *inode, struct file *file)
 
         cx8802_cancel_buffers(fh->dev);
         /* stop mpeg capture */
-        if (fh->mpegq.streaming)
-                videobuf_streamoff(&fh->mpegq);
-        if (fh->mpegq.reading)
-                videobuf_read_stop(&fh->mpegq);
+        videobuf_stop(&fh->mpegq);
 
         videobuf_mmap_free(&fh->mpegq);
         file->private_data = NULL;
diff --git a/drivers/media/video/cx88/cx88-video.c b/drivers/media/video/cx88/cx88-video.c
index 5ee05f8f3fad..c84dafbdb991 100644
--- a/drivers/media/video/cx88/cx88-video.c
+++ b/drivers/media/video/cx88/cx88-video.c
@@ -851,10 +851,7 @@ static int video_release(struct inode *inode, struct file *file)
 
         /* stop vbi capture */
         if (res_check(fh, RESOURCE_VBI)) {
-                if (fh->vbiq.streaming)
-                        videobuf_streamoff(&fh->vbiq);
-                if (fh->vbiq.reading)
-                        videobuf_read_stop(&fh->vbiq);
+                videobuf_stop(&fh->vbiq);
                 res_free(dev,fh,RESOURCE_VBI);
         }
 
diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c
index 2529c298b862..0906bc5766cc 100644
--- a/drivers/media/video/em28xx/em28xx-video.c
+++ b/drivers/media/video/em28xx/em28xx-video.c
@@ -144,7 +144,8 @@ static int em28xx_config(struct em28xx *dev)
 {
 
         /* Sets I2C speed to 100 KHz */
-        em28xx_write_regs_req(dev, 0x00, 0x06, "\x40", 1);
+        if (!dev->is_em2800)
+                em28xx_write_regs_req(dev, 0x00, 0x06, "\x40", 1);
 
         /* enable vbi capturing */
 
@@ -570,7 +571,9 @@ static void em28xx_vm_close(struct vm_area_struct *vma)
 {
         /* NOTE: buffers are not freed here */
         struct em28xx_frame_t *f = vma->vm_private_data;
-        f->vma_use_count--;
+
+        if (f->vma_use_count)
+                f->vma_use_count--;
 }
 
 static struct vm_operations_struct em28xx_vm_ops = {
diff --git a/drivers/media/video/ivtv/ivtv-i2c.c b/drivers/media/video/ivtv/ivtv-i2c.c
index 623eea2652ca..77b27dc750b1 100644
--- a/drivers/media/video/ivtv/ivtv-i2c.c
+++ b/drivers/media/video/ivtv/ivtv-i2c.c
@@ -706,7 +706,7 @@ void ivtv_call_i2c_clients(struct ivtv *itv, unsigned int cmd, void *arg)
 }
 
 /* init + register i2c algo-bit adapter */
-int __devinit init_ivtv_i2c(struct ivtv *itv)
+int init_ivtv_i2c(struct ivtv *itv)
 {
         IVTV_DEBUG_I2C("i2c init\n");
 
diff --git a/drivers/media/video/ivtv/ivtv-i2c.h b/drivers/media/video/ivtv/ivtv-i2c.h
index de6a07442298..987042c09b64 100644
--- a/drivers/media/video/ivtv/ivtv-i2c.h
+++ b/drivers/media/video/ivtv/ivtv-i2c.h
@@ -35,7 +35,7 @@ int ivtv_call_i2c_client(struct ivtv *itv, int addr, unsigned int cmd, void *arg
 void ivtv_call_i2c_clients(struct ivtv *itv, unsigned int cmd, void *arg);
 
 /* init + register i2c algo-bit adapter */
-int __devinit init_ivtv_i2c(struct ivtv *itv);
+int init_ivtv_i2c(struct ivtv *itv);
 void exit_ivtv_i2c(struct ivtv *itv);
 
 #endif
diff --git a/drivers/media/video/ivtv/ivtv-streams.c b/drivers/media/video/ivtv/ivtv-streams.c
index aa03e61ef310..74fb0e021979 100644
--- a/drivers/media/video/ivtv/ivtv-streams.c
+++ b/drivers/media/video/ivtv/ivtv-streams.c
@@ -76,7 +76,7 @@ static struct {
         int minor_offset;
         int dma, pio;
         enum v4l2_buf_type buf_type;
-        struct file_operations *fops;
+        const struct file_operations *fops;
 } ivtv_stream_info[] = {
         {       /* IVTV_ENC_STREAM_TYPE_MPG */
                 "encoder MPG",
diff --git a/drivers/media/video/saa5246a.c b/drivers/media/video/saa5246a.c
index ad0232935df6..996b49491f5a 100644
--- a/drivers/media/video/saa5246a.c
+++ b/drivers/media/video/saa5246a.c
@@ -187,12 +187,14 @@ static int i2c_senddata(struct saa5246a_device *t, ...)
 {
         unsigned char buf[64];
         int v;
-        int ct=0;
+        int ct = 0;
         va_list argp;
-        va_start(argp,t);
+        va_start(argp, t);
 
-        while((v=va_arg(argp,int))!=-1)
-                buf[ct++]=v;
+        while ((v = va_arg(argp, int)) != -1)
+                buf[ct++] = v;
+
+        va_end(argp);
         return i2c_sendbuf(t, buf[0], ct-1, buf+1);
 }
 
diff --git a/drivers/media/video/saa5249.c b/drivers/media/video/saa5249.c
index 94bb59a32b17..f55d6e85f20f 100644
--- a/drivers/media/video/saa5249.c
+++ b/drivers/media/video/saa5249.c
@@ -282,12 +282,14 @@ static int i2c_senddata(struct saa5249_device *t, ...)
 {
         unsigned char buf[64];
         int v;
-        int ct=0;
+        int ct = 0;
         va_list argp;
         va_start(argp,t);
 
-        while((v=va_arg(argp,int))!=-1)
-                buf[ct++]=v;
+        while ((v = va_arg(argp, int)) != -1)
+                buf[ct++] = v;
+
+        va_end(argp);
         return i2c_sendbuf(t, buf[0], ct-1, buf+1);
 }
 
diff --git a/drivers/media/video/saa7134/saa7134-alsa.c b/drivers/media/video/saa7134/saa7134-alsa.c
index b9c5cf7dc849..4878f3067787 100644
--- a/drivers/media/video/saa7134/saa7134-alsa.c
+++ b/drivers/media/video/saa7134/saa7134-alsa.c
@@ -222,7 +222,8 @@ static irqreturn_t saa7134_alsa_irq(int irq, void *dev_id)
 
                 if (report & SAA7134_IRQ_REPORT_DONE_RA3) {
                         handled = 1;
-                        saa_writel(SAA7134_IRQ_REPORT,report);
+                        saa_writel(SAA7134_IRQ_REPORT,
+                                   SAA7134_IRQ_REPORT_DONE_RA3);
                         saa7134_irq_alsa_done(dev, status);
                 } else {
                         goto out;
@@ -457,7 +458,7 @@ static struct snd_pcm_hardware snd_card_saa7134_capture =
         .buffer_bytes_max =     (256*1024),
         .period_bytes_min =     64,
         .period_bytes_max =     (256*1024),
-        .periods_min =          2,
+        .periods_min =          4,
         .periods_max =          1024,
 };
 
@@ -491,7 +492,7 @@ static int snd_card_saa7134_hw_params(struct snd_pcm_substream * substream,
 
         snd_assert(period_size >= 0x100 && period_size <= 0x10000,
                    return -EINVAL);
-        snd_assert(periods >= 2, return -EINVAL);
+        snd_assert(periods >= 4, return -EINVAL);
         snd_assert(period_size * periods <= 1024 * 1024, return -EINVAL);
 
         dev = saa7134->dev;
@@ -647,7 +648,14 @@ static int snd_card_saa7134_capture_open(struct snd_pcm_substream * substream)
                 saa7134_tvaudio_setmute(dev);
         }
 
-        if ((err = snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS)) < 0)
+        err = snd_pcm_hw_constraint_integer(runtime,
+                                                SNDRV_PCM_HW_PARAM_PERIODS);
+        if (err < 0)
+                return err;
+
+        err = snd_pcm_hw_constraint_step(runtime, 0,
+                                                SNDRV_PCM_HW_PARAM_PERIODS, 2);
+        if (err < 0)
                 return err;
 
         return 0;
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index 4f3dad9ae6d6..c6eb1e37a46e 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -334,7 +334,7 @@ struct saa7134_board saa7134_boards[] = {
                         .tv   = 1,
                 },{
                         .name = name_comp1,
-                        .vmux = 2,
+                        .vmux = 0,
                         .amux = LINE1,
                 },{
                         .name = name_comp2,
diff --git a/drivers/media/video/saa7134/saa7134-core.c b/drivers/media/video/saa7134/saa7134-core.c
index a499eea379e6..4fd187ac9d70 100644
--- a/drivers/media/video/saa7134/saa7134-core.c
+++ b/drivers/media/video/saa7134/saa7134-core.c
@@ -569,21 +569,22 @@ static irqreturn_t saa7134_irq(int irq, void *dev_id)
         for (loop = 0; loop < 10; loop++) {
                 report = saa_readl(SAA7134_IRQ_REPORT);
                 status = saa_readl(SAA7134_IRQ_STATUS);
-                if (0 == report) {
-                        if (irq_debug > 1)
-                                printk(KERN_DEBUG "%s/irq: no (more) work\n",
-                                       dev->name);
-                        goto out;
-                }
-
-                /* If dmasound support is active and we get a sound report, exit
-                   and let the saa7134-alsa/oss module deal with it */
 
+                /* If dmasound support is active and we get a sound report,
+                 * mask out the report and let the saa7134-alsa module deal
+                 * with it */
                 if ((report & SAA7134_IRQ_REPORT_DONE_RA3) &&
                         (dev->dmasound.priv_data != NULL) )
                 {
                         if (irq_debug > 1)
-                                printk(KERN_DEBUG "%s/irq: ignoring interrupt for DMA sound\n",
+                                printk(KERN_DEBUG "%s/irq: preserving DMA sound interrupt\n",
+                                       dev->name);
+                        report &= ~SAA7134_IRQ_REPORT_DONE_RA3;
+                }
+
+                if (0 == report) {
+                        if (irq_debug > 1)
+                                printk(KERN_DEBUG "%s/irq: no (more) work\n",
                                        dev->name);
                         goto out;
                 }
diff --git a/drivers/media/video/saa7134/saa7134-dvb.c b/drivers/media/video/saa7134/saa7134-dvb.c
index 38d87332cc5d..e1ab099ec4c6 100644
--- a/drivers/media/video/saa7134/saa7134-dvb.c
+++ b/drivers/media/video/saa7134/saa7134-dvb.c
@@ -662,6 +662,7 @@ static struct tda1004x_config hauppauge_hvr_1110_config = {
         .if_freq       = TDA10046_FREQ_045,
         .i2c_gate      = 0x4b,
         .tuner_address = 0x61,
+        .tuner_config  = 1,
         .request_firmware = philips_tda1004x_request_firmware
 };
 
diff --git a/drivers/media/video/saa7134/saa7134-empress.c b/drivers/media/video/saa7134/saa7134-empress.c
index 75d0c5bf46d2..9322f44865b8 100644
--- a/drivers/media/video/saa7134/saa7134-empress.c
+++ b/drivers/media/video/saa7134/saa7134-empress.c
@@ -110,11 +110,8 @@ static int ts_release(struct inode *inode, struct file *file)
 {
         struct saa7134_dev *dev = file->private_data;
 
-        if (dev->empress_tsq.streaming)
-                videobuf_streamoff(&dev->empress_tsq);
         mutex_lock(&dev->empress_tsq.lock);
-        if (dev->empress_tsq.reading)
-                videobuf_read_stop(&dev->empress_tsq);
+        videobuf_stop(&dev->empress_tsq);
         videobuf_mmap_free(&dev->empress_tsq);
         dev->empress_users--;
 
diff --git a/drivers/media/video/saa7134/saa7134-video.c b/drivers/media/video/saa7134/saa7134-video.c
index 3b9ffb4b648a..6396d9b5c063 100644
--- a/drivers/media/video/saa7134/saa7134-video.c
+++ b/drivers/media/video/saa7134/saa7134-video.c
@@ -1445,10 +1445,7 @@ static int video_release(struct inode *inode, struct file *file)
 
         /* stop vbi capture */
         if (res_check(fh, RESOURCE_VBI)) {
-                if (fh->vbi.streaming)
-                        videobuf_streamoff(&fh->vbi);
-                if (fh->vbi.reading)
-                        videobuf_read_stop(&fh->vbi);
+                videobuf_stop(&fh->vbi);
                 res_free(dev,fh,RESOURCE_VBI);
         }
 
diff --git a/drivers/media/video/tvp5150.c b/drivers/media/video/tvp5150.c
index 25d0aef88ef5..445eba4174d7 100644
--- a/drivers/media/video/tvp5150.c
+++ b/drivers/media/video/tvp5150.c
@@ -290,6 +290,7 @@ static inline void tvp5150_selmux(struct i2c_client *c)
         int opmode=0;
         struct tvp5150 *decoder = i2c_get_clientdata(c);
         int input = 0;
+        unsigned char val;
 
         if ((decoder->route.output & TVP5150_BLACK_SCREEN) || !decoder->enable)
                 input = 8;
@@ -315,6 +316,16 @@ static inline void tvp5150_selmux(struct i2c_client *c)
 
         tvp5150_write(c, TVP5150_OP_MODE_CTL, opmode);
         tvp5150_write(c, TVP5150_VD_IN_SRC_SEL_1, input);
+
+        /* Svideo should enable YCrCb output and disable GPCL output
+         * For Composite and TV, it should be the reverse
+         */
+        val = tvp5150_read(c, TVP5150_MISC_CTL);
+        if (decoder->route.input == TVP5150_SVIDEO)
+                val = (val & ~0x40) | 0x10;
+        else
+                val = (val & ~0x10) | 0x40;
+        tvp5150_write(c, TVP5150_MISC_CTL, val);
 };
 
 struct i2c_reg_value {
diff --git a/drivers/media/video/videobuf-core.c b/drivers/media/video/videobuf-core.c
index 89a44f16f0ba..81f77d2b4bd3 100644
--- a/drivers/media/video/videobuf-core.c
+++ b/drivers/media/video/videobuf-core.c
@@ -141,6 +141,7 @@ void videobuf_queue_core_init(struct videobuf_queue* q,
         INIT_LIST_HEAD(&q->stream);
 }
 
+/* Locking: Only usage in bttv unsafe find way to remove */
 int videobuf_queue_is_busy(struct videobuf_queue *q)
 {
         int i;
@@ -178,6 +179,7 @@ int videobuf_queue_is_busy(struct videobuf_queue *q)
         return 0;
 }
 
+/* Locking: Caller holds q->lock */
 void videobuf_queue_cancel(struct videobuf_queue *q)
 {
         unsigned long flags=0;
@@ -208,6 +210,7 @@ void videobuf_queue_cancel(struct videobuf_queue *q)
 
 /* --------------------------------------------------------------------- */
 
+/* Locking: Caller holds q->lock */
 enum v4l2_field videobuf_next_field(struct videobuf_queue *q)
 {
         enum v4l2_field field = q->field;
@@ -226,6 +229,7 @@ enum v4l2_field videobuf_next_field(struct videobuf_queue *q)
         return field;
 }
 
+/* Locking: Caller holds q->lock */
 static void videobuf_status(struct videobuf_queue *q, struct v4l2_buffer *b,
                             struct videobuf_buffer *vb, enum v4l2_buf_type type)
 {
@@ -281,20 +285,108 @@ static void videobuf_status(struct videobuf_queue *q, struct v4l2_buffer *b,
         b->sequence  = vb->field_count >> 1;
 }
 
+/* Locking: Caller holds q->lock */
+static int __videobuf_mmap_free(struct videobuf_queue *q)
+{
+        int i;
+        int rc;
+
+        if (!q)
+                return 0;
+
+        MAGIC_CHECK(q->int_ops->magic,MAGIC_QTYPE_OPS);
+
+        rc  = CALL(q,mmap_free,q);
+        if (rc<0)
+                return rc;
+
+        for (i = 0; i < VIDEO_MAX_FRAME; i++) {
+                if (NULL == q->bufs[i])
+                        continue;
+                q->ops->buf_release(q,q->bufs[i]);
+                kfree(q->bufs[i]);
+                q->bufs[i] = NULL;
+        }
+
+        return rc;
+}
+
+int videobuf_mmap_free(struct videobuf_queue *q)
+{
+        int ret;
+        mutex_lock(&q->lock);
+        ret = __videobuf_mmap_free(q);
+        mutex_unlock(&q->lock);
+        return ret;
+}
+
+/* Locking: Caller holds q->lock */
+static int __videobuf_mmap_setup(struct videobuf_queue *q,
+                        unsigned int bcount, unsigned int bsize,
+                        enum v4l2_memory memory)
+{
+        unsigned int i;
+        int err;
+
+        MAGIC_CHECK(q->int_ops->magic,MAGIC_QTYPE_OPS);
+
+        err = __videobuf_mmap_free(q);
+        if (0 != err)
+                return err;
+
+        /* Allocate and initialize buffers */
+        for (i = 0; i < bcount; i++) {
+                q->bufs[i] = videobuf_alloc(q);
+
+                if (q->bufs[i] == NULL)
+                        break;
+
+                q->bufs[i]->i      = i;
+                q->bufs[i]->input  = UNSET;
+                q->bufs[i]->memory = memory;
+                q->bufs[i]->bsize  = bsize;
+                switch (memory) {
+                case V4L2_MEMORY_MMAP:
+                        q->bufs[i]->boff  = bsize * i;
+                        break;
+                case V4L2_MEMORY_USERPTR:
+                case V4L2_MEMORY_OVERLAY:
+                        /* nothing */
+                        break;
+                }
+        }
+
+        if (!i)
+                return -ENOMEM;
+
+        dprintk(1,"mmap setup: %d buffers, %d bytes each\n",
+                i, bsize);
+
+        return i;
+}
+
+int videobuf_mmap_setup(struct videobuf_queue *q,
+                        unsigned int bcount, unsigned int bsize,
+                        enum v4l2_memory memory)
+{
+        int ret;
+        mutex_lock(&q->lock);
+        ret = __videobuf_mmap_setup(q, bcount, bsize, memory);
+        mutex_unlock(&q->lock);
+        return ret;
+}
+
 int videobuf_reqbufs(struct videobuf_queue *q,
                  struct v4l2_requestbuffers *req)
 {
         unsigned int size,count;
         int retval;
 
-        if (req->type != q->type) {
-                dprintk(1,"reqbufs: queue type invalid\n");
-                return -EINVAL;
-        }
         if (req->count < 1) {
                 dprintk(1,"reqbufs: count invalid (%d)\n",req->count);
                 return -EINVAL;
         }
+
         if (req->memory != V4L2_MEMORY_MMAP     &&
             req->memory != V4L2_MEMORY_USERPTR  &&
             req->memory != V4L2_MEMORY_OVERLAY) {
@@ -303,6 +395,12 @@ int videobuf_reqbufs(struct videobuf_queue *q,
         }
 
         mutex_lock(&q->lock);
+        if (req->type != q->type) {
+                dprintk(1,"reqbufs: queue type invalid\n");
+                retval = -EINVAL;
+                goto done;
+        }
+
         if (q->streaming) {
                 dprintk(1,"reqbufs: streaming already exists\n");
                 retval = -EBUSY;
@@ -323,7 +421,7 @@ int videobuf_reqbufs(struct videobuf_queue *q,
         dprintk(1,"reqbufs: bufs=%d, size=0x%x [%d pages total]\n",
                 count, size, (count*size)>>PAGE_SHIFT);
 
-        retval = videobuf_mmap_setup(q,count,size,req->memory);
+        retval = __videobuf_mmap_setup(q,count,size,req->memory);
         if (retval < 0) {
                 dprintk(1,"reqbufs: mmap setup returned %d\n",retval);
                 goto done;
@@ -338,20 +436,28 @@ int videobuf_reqbufs(struct videobuf_queue *q,
 
 int videobuf_querybuf(struct videobuf_queue *q, struct v4l2_buffer *b)
 {
+        int ret = -EINVAL;
+
+        mutex_lock(&q->lock);
         if (unlikely(b->type != q->type)) {
                 dprintk(1,"querybuf: Wrong type.\n");
-                return -EINVAL;
+                goto done;
         }
         if (unlikely(b->index < 0 || b->index >= VIDEO_MAX_FRAME)) {
                 dprintk(1,"querybuf: index out of range.\n");
-                return -EINVAL;
+                goto done;
         }
         if (unlikely(NULL == q->bufs[b->index])) {
                 dprintk(1,"querybuf: buffer is null.\n");
-                return -EINVAL;
+                goto done;
         }
+
         videobuf_status(q,b,q->bufs[b->index],q->type);
-        return 0;
+
+        ret = 0;
+done:
+        mutex_unlock(&q->lock);
+        return ret;
 }
 
 int videobuf_qbuf(struct videobuf_queue *q,
@@ -541,22 +647,30 @@ int videobuf_streamon(struct videobuf_queue *q)
         return retval;
 }
 
-int videobuf_streamoff(struct videobuf_queue *q)
+/* Locking: Caller holds q->lock */
+static int __videobuf_streamoff(struct videobuf_queue *q)
 {
-        int retval = -EINVAL;
-
-        mutex_lock(&q->lock);
         if (!q->streaming)
-                goto done;
+                return -EINVAL;
+
         videobuf_queue_cancel(q);
         q->streaming = 0;
-        retval = 0;
 
- done:
+        return 0;
+}
+
+int videobuf_streamoff(struct videobuf_queue *q)
+{
+        int retval;
+
+        mutex_lock(&q->lock);
+        retval = __videobuf_streamoff(q);
         mutex_unlock(&q->lock);
+
         return retval;
 }
 
+/* Locking: Caller holds q->lock */
 static ssize_t videobuf_read_zerocopy(struct videobuf_queue *q,
                                       char __user *data,
                                       size_t count, loff_t *ppos)
@@ -691,7 +805,8 @@ ssize_t videobuf_read_one(struct videobuf_queue *q,
         return retval;
 }
 
-int videobuf_read_start(struct videobuf_queue *q)
+/* Locking: Caller holds q->lock */
+int __videobuf_read_start(struct videobuf_queue *q)
 {
         enum v4l2_field field;
         unsigned long flags=0;
@@ -705,7 +820,7 @@ int videobuf_read_start(struct videobuf_queue *q)
                 count = VIDEO_MAX_FRAME;
         size = PAGE_ALIGN(size);
 
-        err = videobuf_mmap_setup(q, count, size, V4L2_MEMORY_USERPTR);
+        err = __videobuf_mmap_setup(q, count, size, V4L2_MEMORY_USERPTR);
         if (err < 0)
                 return err;
 
@@ -728,12 +843,13 @@ int videobuf_read_start(struct videobuf_queue *q)
         return 0;
 }
 
-void videobuf_read_stop(struct videobuf_queue *q)
+static void __videobuf_read_stop(struct videobuf_queue *q)
 {
         int i;
 
+
         videobuf_queue_cancel(q);
-        videobuf_mmap_free(q);
+        __videobuf_mmap_free(q);
         INIT_LIST_HEAD(&q->stream);
         for (i = 0; i < VIDEO_MAX_FRAME; i++) {
                 if (NULL == q->bufs[i])
@@ -743,8 +859,41 @@ void videobuf_read_stop(struct videobuf_queue *q)
         }
         q->read_buf = NULL;
         q->reading  = 0;
+        
 }
 
+int videobuf_read_start(struct videobuf_queue *q)
+{
+        int rc;
+
+        mutex_lock(&q->lock);
+        rc = __videobuf_read_start(q);
+        mutex_unlock(&q->lock);
+
+        return rc;
+}
+
+void videobuf_read_stop(struct videobuf_queue *q)
+{
+        mutex_lock(&q->lock);
+        __videobuf_read_stop(q);
+        mutex_unlock(&q->lock);
+}
+
+void videobuf_stop(struct videobuf_queue *q)
+{
+        mutex_lock(&q->lock);
+
+        if (q->streaming)
+                __videobuf_streamoff(q);
+
+        if (q->reading)
+                __videobuf_read_stop(q);
+
+        mutex_unlock(&q->lock);
+}
+
+
 ssize_t videobuf_read_stream(struct videobuf_queue *q,
                              char __user *data, size_t count, loff_t *ppos,
                              int vbihack, int nonblocking)
@@ -858,75 +1007,6 @@ unsigned int videobuf_poll_stream(struct file *file,
         return rc;
 }
 
-int videobuf_mmap_setup(struct videobuf_queue *q,
-                        unsigned int bcount, unsigned int bsize,
-                        enum v4l2_memory memory)
-{
-        unsigned int i;
-        int err;
-
-        MAGIC_CHECK(q->int_ops->magic,MAGIC_QTYPE_OPS);
-
-        err = videobuf_mmap_free(q);
-        if (0 != err)
-                return err;
-
-        /* Allocate and initialize buffers */
-        for (i = 0; i < bcount; i++) {
-                q->bufs[i] = videobuf_alloc(q);
-
-                if (q->bufs[i] == NULL)
-                        break;
-
-                q->bufs[i]->i      = i;
-                q->bufs[i]->input  = UNSET;
-                q->bufs[i]->memory = memory;
-                q->bufs[i]->bsize  = bsize;
-                switch (memory) {
-                case V4L2_MEMORY_MMAP:
-                        q->bufs[i]->boff  = bsize * i;
-                        break;
-                case V4L2_MEMORY_USERPTR:
-                case V4L2_MEMORY_OVERLAY:
-                        /* nothing */
-                        break;
-                }
-        }
-
-        if (!i)
-                return -ENOMEM;
-
-        dprintk(1,"mmap setup: %d buffers, %d bytes each\n",
-                i, bsize);
-
-        return i;
-}
-
-int videobuf_mmap_free(struct videobuf_queue *q)
-{
-        int i;
-        int rc;
-
-        if (!q)
-                return 0;
-
-        MAGIC_CHECK(q->int_ops->magic,MAGIC_QTYPE_OPS);
-
-        rc  = CALL(q,mmap_free,q);
-        if (rc<0)
-                return rc;
-
-        for (i = 0; i < VIDEO_MAX_FRAME; i++) {
-                if (NULL == q->bufs[i])
-                        continue;
-                q->ops->buf_release(q,q->bufs[i]);
-                kfree(q->bufs[i]);
-                q->bufs[i] = NULL;
-        }
-
-        return rc;
-}
-
 int videobuf_mmap_mapper(struct videobuf_queue *q,
                          struct vm_area_struct *vma)
 {
@@ -991,6 +1071,7 @@ EXPORT_SYMBOL_GPL(videobuf_streamoff);
 
 EXPORT_SYMBOL_GPL(videobuf_read_start);
 EXPORT_SYMBOL_GPL(videobuf_read_stop);
+EXPORT_SYMBOL_GPL(videobuf_stop);
 EXPORT_SYMBOL_GPL(videobuf_read_stream);
 EXPORT_SYMBOL_GPL(videobuf_read_one);
 EXPORT_SYMBOL_GPL(videobuf_poll_stream);
diff --git a/drivers/media/video/videobuf-vmalloc.c b/drivers/media/video/videobuf-vmalloc.c
index cd74341c984f..e01259438bb2 100644
--- a/drivers/media/video/videobuf-vmalloc.c
+++ b/drivers/media/video/videobuf-vmalloc.c
@@ -51,7 +51,7 @@ videobuf_vm_open(struct vm_area_struct *vma)
 {
         struct videobuf_mapping *map = vma->vm_private_data;
 
-        dprintk(2,"vm_open %p [count=%d,vma=%08lx-%08lx]\n",map,
+        dprintk(2,"vm_open %p [count=%u,vma=%08lx-%08lx]\n",map,
                 map->count,vma->vm_start,vma->vm_end);
 
         map->count++;
@@ -64,7 +64,7 @@ videobuf_vm_close(struct vm_area_struct *vma)
         struct videobuf_queue *q = map->q;
         int i;
 
-        dprintk(2,"vm_close %p [count=%d,vma=%08lx-%08lx]\n",map,
+        dprintk(2,"vm_close %p [count=%u,vma=%08lx-%08lx]\n",map,
                 map->count,vma->vm_start,vma->vm_end);
 
         map->count--;
@@ -221,7 +221,7 @@ static int __videobuf_mmap_mapper(struct videobuf_queue *q,
         }
 
         /* create mapping + update buffer list */
-        map = q->bufs[first]->map = kmalloc(sizeof(struct videobuf_mapping),GFP_KERNEL);
+        map = q->bufs[first]->map = kzalloc(sizeof(struct videobuf_mapping),GFP_KERNEL);
         if (NULL == map)
                 return -ENOMEM;
 
diff --git a/drivers/media/video/vivi.c b/drivers/media/video/vivi.c
index ee73dc75131c..9b54ff9d2e36 100644
--- a/drivers/media/video/vivi.c
+++ b/drivers/media/video/vivi.c
@@ -1076,6 +1076,7 @@ static int vivi_release(struct inode *inode, struct file *file)
         int minor = iminor(inode);
 
         vivi_stop_thread(vidq);
+        videobuf_stop(&fh->vb_vidq);
         videobuf_mmap_free(&fh->vb_vidq);
 
         kfree (fh);
diff --git a/drivers/mfd/sm501.c b/drivers/mfd/sm501.c
index 8135e4c3bf47..afd82966f9a0 100644
--- a/drivers/mfd/sm501.c
+++ b/drivers/mfd/sm501.c
@@ -156,7 +156,7 @@ static void sm501_dump_clk(struct sm501_devdata *sm)
 
         dev_dbg(sm->dev, "PM0[%c]: "
                  "P2 %ld.%ld MHz (%ld), V2 %ld.%ld (%ld), "
-x                "M %ld.%ld (%ld), MX1 %ld.%ld (%ld)\n",
+                 "M %ld.%ld (%ld), MX1 %ld.%ld (%ld)\n",
                  (pmc & 3 ) == 0 ? '*' : '-',
                  fmt_freq(decode_div(pll2, pm0, 24, 1<<29, 31, px_div)),
                  fmt_freq(decode_div(pll2, pm0, 16, 1<<20, 15, misc_div)),
diff --git a/drivers/misc/sony-laptop.c b/drivers/misc/sony-laptop.c
index bb13858f60a1..b0f68031b49d 100644
--- a/drivers/misc/sony-laptop.c
+++ b/drivers/misc/sony-laptop.c
@@ -338,7 +338,7 @@ static void sony_laptop_report_input_event(u8 event)
                 dprintk("unknown input event %.2x\n", event);
 }
 
-static int sony_laptop_setup_input(void)
+static int sony_laptop_setup_input(struct acpi_device *acpi_device)
 {
         struct input_dev *jog_dev;
         struct input_dev *key_dev;
@@ -379,6 +379,7 @@ static int sony_laptop_setup_input(void)
         key_dev->name = "Sony Vaio Keys";
         key_dev->id.bustype = BUS_ISA;
         key_dev->id.vendor = PCI_VENDOR_ID_SONY;
+        key_dev->dev.parent = &acpi_device->dev;
 
         /* Initialize the Input Drivers: special keys */
         set_bit(EV_KEY, key_dev->evbit);
@@ -410,6 +411,7 @@ static int sony_laptop_setup_input(void)
         jog_dev->name = "Sony Vaio Jogdial";
         jog_dev->id.bustype = BUS_ISA;
         jog_dev->id.vendor = PCI_VENDOR_ID_SONY;
+        key_dev->dev.parent = &acpi_device->dev;
 
         jog_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_REL);
         jog_dev->keybit[BIT_WORD(BTN_MOUSE)] = BIT_MASK(BTN_MIDDLE);
@@ -1006,7 +1008,7 @@ static int sony_nc_add(struct acpi_device *device)
         }
 
         /* setup input devices and helper fifo */
-        result = sony_laptop_setup_input();
+        result = sony_laptop_setup_input(device);
         if (result) {
                 printk(KERN_ERR DRV_PFX
                                 "Unabe to create input devices.\n");
@@ -1034,7 +1036,7 @@ static int sony_nc_add(struct acpi_device *device)
                         sony_backlight_device->props.brightness =
                             sony_backlight_get_brightness
                             (sony_backlight_device);
-                        sony_backlight_device->props.max_brightness = 
+                        sony_backlight_device->props.max_brightness =
                             SONY_MAX_BRIGHTNESS - 1;
                 }
 
@@ -2453,7 +2455,7 @@ static int sony_pic_add(struct acpi_device *device)
         }
 
         /* setup input devices and helper fifo */
-        result = sony_laptop_setup_input();
+        result = sony_laptop_setup_input(device);
         if (result) {
                 printk(KERN_ERR DRV_PFX
                                 "Unabe to create input devices.\n");
diff --git a/drivers/misc/thinkpad_acpi.c b/drivers/misc/thinkpad_acpi.c
index e953276664a0..cf56647a6ca4 100644
--- a/drivers/misc/thinkpad_acpi.c
+++ b/drivers/misc/thinkpad_acpi.c
@@ -21,7 +21,7 @@
  *  02110-1301, USA.
  */
 
-#define IBM_VERSION "0.16"
+#define IBM_VERSION "0.17"
 #define TPACPI_SYSFS_VERSION 0x020000
 
 /*
@@ -964,15 +964,15 @@ static int __init hotkey_init(struct ibm_init_struct *iibm)
                 KEY_UNKNOWN,    /* 0x0C: FN+BACKSPACE */
                 KEY_UNKNOWN,    /* 0x0D: FN+INSERT */
                 KEY_UNKNOWN,    /* 0x0E: FN+DELETE */
-                KEY_BRIGHTNESSUP,       /* 0x0F: FN+HOME (brightness up) */
+                KEY_RESERVED,   /* 0x0F: FN+HOME (brightness up) */
                 /* Scan codes 0x10 to 0x1F: Extended ACPI HKEY hot keys */
-                KEY_BRIGHTNESSDOWN,     /* 0x10: FN+END (brightness down) */
+                KEY_RESERVED,   /* 0x10: FN+END (brightness down) */
                 KEY_RESERVED,   /* 0x11: FN+PGUP (thinklight toggle) */
                 KEY_UNKNOWN,    /* 0x12: FN+PGDOWN */
                 KEY_ZOOM,       /* 0x13: FN+SPACE (zoom) */
-                KEY_VOLUMEUP,   /* 0x14: VOLUME UP */
-                KEY_VOLUMEDOWN, /* 0x15: VOLUME DOWN */
-                KEY_MUTE,       /* 0x16: MUTE */
+                KEY_RESERVED,   /* 0x14: VOLUME UP */
+                KEY_RESERVED,   /* 0x15: VOLUME DOWN */
+                KEY_RESERVED,   /* 0x16: MUTE */
                 KEY_VENDOR,     /* 0x17: Thinkpad/AccessIBM/Lenovo */
                 /* (assignments unknown, please report if found) */
                 KEY_UNKNOWN, KEY_UNKNOWN, KEY_UNKNOWN, KEY_UNKNOWN,
@@ -987,15 +987,15 @@ static int __init hotkey_init(struct ibm_init_struct *iibm)
                 KEY_UNKNOWN,    /* 0x0C: FN+BACKSPACE */
                 KEY_UNKNOWN,    /* 0x0D: FN+INSERT */
                 KEY_UNKNOWN,    /* 0x0E: FN+DELETE */
-                KEY_BRIGHTNESSUP,       /* 0x0F: FN+HOME (brightness up) */
+                KEY_RESERVED,   /* 0x0F: FN+HOME (brightness up) */
                 /* Scan codes 0x10 to 0x1F: Extended ACPI HKEY hot keys */
-                KEY_BRIGHTNESSDOWN,     /* 0x10: FN+END (brightness down) */
+                KEY_RESERVED,   /* 0x10: FN+END (brightness down) */
                 KEY_RESERVED,   /* 0x11: FN+PGUP (thinklight toggle) */
                 KEY_UNKNOWN,    /* 0x12: FN+PGDOWN */
                 KEY_ZOOM,       /* 0x13: FN+SPACE (zoom) */
-                KEY_VOLUMEUP,   /* 0x14: VOLUME UP */
-                KEY_VOLUMEDOWN, /* 0x15: VOLUME DOWN */
-                KEY_MUTE,       /* 0x16: MUTE */
+                KEY_RESERVED,   /* 0x14: VOLUME UP */
+                KEY_RESERVED,   /* 0x15: VOLUME DOWN */
+                KEY_RESERVED,   /* 0x16: MUTE */
                 KEY_VENDOR,     /* 0x17: Thinkpad/AccessIBM/Lenovo */
                 /* (assignments unknown, please report if found) */
                 KEY_UNKNOWN, KEY_UNKNOWN, KEY_UNKNOWN, KEY_UNKNOWN,
@@ -1342,9 +1342,8 @@ static int hotkey_read(char *p)
                 return len;
         }
 
-        res = mutex_lock_interruptible(&hotkey_mutex);
-        if (res < 0)
-                return res;
+        if (mutex_lock_interruptible(&hotkey_mutex))
+                return -ERESTARTSYS;
         res = hotkey_get(&status, &mask);
         mutex_unlock(&hotkey_mutex);
         if (res)
@@ -1373,9 +1372,8 @@ static int hotkey_write(char *buf)
         if (!tp_features.hotkey)
                 return -ENODEV;
 
-        res = mutex_lock_interruptible(&hotkey_mutex);
-        if (res < 0)
-                return res;
+        if (mutex_lock_interruptible(&hotkey_mutex))
+                return -ERESTARTSYS;
 
         res = hotkey_get(&status, &mask);
         if (res)
@@ -3114,6 +3112,99 @@ static struct backlight_ops ibm_backlight_data = {
 
 static struct mutex brightness_mutex;
 
+static int __init tpacpi_query_bcll_levels(acpi_handle handle)
+{
+        struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
+        union acpi_object *obj;
+        int rc;
+
+        if (ACPI_SUCCESS(acpi_evaluate_object(handle, NULL, NULL, &buffer))) {
+                obj = (union acpi_object *)buffer.pointer;
+                if (!obj || (obj->type != ACPI_TYPE_PACKAGE)) {
+                        printk(IBM_ERR "Unknown BCLL data, "
+                               "please report this to %s\n", IBM_MAIL);
+                        rc = 0;
+                } else {
+                        rc = obj->package.count;
+                }
+        } else {
+                return 0;
+        }
+
+        kfree(buffer.pointer);
+        return rc;
+}
+
+static acpi_status __init brightness_find_bcll(acpi_handle handle, u32 lvl,
+                                        void *context, void **rv)
+{
+        char name[ACPI_PATH_SEGMENT_LENGTH];
+        struct acpi_buffer buffer = { sizeof(name), &name };
+
+        if (ACPI_SUCCESS(acpi_get_name(handle, ACPI_SINGLE_NAME, &buffer)) &&
+            !strncmp("BCLL", name, sizeof(name) - 1)) {
+                if (tpacpi_query_bcll_levels(handle) == 16) {
+                        *rv = handle;
+                        return AE_CTRL_TERMINATE;
+                } else {
+                        return AE_OK;
+                }
+        } else {
+                return AE_OK;
+        }
+}
+
+static int __init brightness_check_levels(void)
+{
+        int status;
+        void *found_node = NULL;
+
+        if (!vid_handle) {
+                IBM_ACPIHANDLE_INIT(vid);
+        }
+        if (!vid_handle)
+                return 0;
+
+        /* Search for a BCLL package with 16 levels */
+        status = acpi_walk_namespace(ACPI_TYPE_PACKAGE, vid_handle, 3,
+                                        brightness_find_bcll, NULL, &found_node);
+
+        return (ACPI_SUCCESS(status) && found_node != NULL);
+}
+
+static acpi_status __init brightness_find_bcl(acpi_handle handle, u32 lvl,
+                                        void *context, void **rv)
+{
+        char name[ACPI_PATH_SEGMENT_LENGTH];
+        struct acpi_buffer buffer = { sizeof(name), &name };
+
+        if (ACPI_SUCCESS(acpi_get_name(handle, ACPI_SINGLE_NAME, &buffer)) &&
+            !strncmp("_BCL", name, sizeof(name) - 1)) {
+                *rv = handle;
+                return AE_CTRL_TERMINATE;
+        } else {
+                return AE_OK;
+        }
+}
+
+static int __init brightness_check_std_acpi_support(void)
+{
+        int status;
+        void *found_node = NULL;
+
+        if (!vid_handle) {
+                IBM_ACPIHANDLE_INIT(vid);
+        }
+        if (!vid_handle)
+                return 0;
+
+        /* Search for a _BCL method, but don't execute it */
+        status = acpi_walk_namespace(ACPI_TYPE_METHOD, vid_handle, 3,
+                                     brightness_find_bcl, NULL, &found_node);
+
+        return (ACPI_SUCCESS(status) && found_node != NULL);
+}
+
 static int __init brightness_init(struct ibm_init_struct *iibm)
 {
         int b;
@@ -3122,6 +3213,18 @@ static int __init brightness_init(struct ibm_init_struct *iibm)
 
         mutex_init(&brightness_mutex);
 
+        if (!brightness_enable) {
+                dbg_printk(TPACPI_DBG_INIT,
+                           "brightness support disabled by module parameter\n");
+                return 1;
+        } else if (brightness_enable > 1) {
+                if (brightness_check_std_acpi_support()) {
+                        printk(IBM_NOTICE
+                               "standard ACPI backlight interface available, not loading native one...\n");
+                        return 1;
+                }
+        }
+
         if (!brightness_mode) {
                 if (thinkpad_id.vendor == PCI_VENDOR_ID_LENOVO)
                         brightness_mode = 2;
@@ -3135,10 +3238,17 @@ static int __init brightness_init(struct ibm_init_struct *iibm)
         if (brightness_mode > 3)
                 return -EINVAL;
 
+        tp_features.bright_16levels =
+                        thinkpad_id.vendor == PCI_VENDOR_ID_LENOVO &&
+                        brightness_check_levels();
+
         b = brightness_get(NULL);
         if (b < 0)
                 return 1;
 
+        if (tp_features.bright_16levels)
+                printk(IBM_INFO "detected a 16-level brightness capable ThinkPad\n");
+
         ibm_backlight_device = backlight_device_register(
                                         TPACPI_BACKLIGHT_DEV_NAME, NULL, NULL,
                                         &ibm_backlight_data);
@@ -3148,7 +3258,8 @@ static int __init brightness_init(struct ibm_init_struct *iibm)
         }
         vdbg_printk(TPACPI_DBG_INIT, "brightness is supported\n");
 
-        ibm_backlight_device->props.max_brightness = 7;
+        ibm_backlight_device->props.max_brightness =
+                                (tp_features.bright_16levels)? 15 : 7;
         ibm_backlight_device->props.brightness = b;
         backlight_update_status(ibm_backlight_device);
 
@@ -3167,6 +3278,8 @@ static void brightness_exit(void)
 
 static int brightness_update_status(struct backlight_device *bd)
 {
+        /* it is the backlight class's job (caller) to handle
+         * EINTR and other errors properly */
         return brightness_set(
                 (bd->props.fb_blank == FB_BLANK_UNBLANK &&
                  bd->props.power == FB_BLANK_UNBLANK) ?
@@ -3184,13 +3297,14 @@ static int brightness_get(struct backlight_device *bd)
         if (brightness_mode & 1) {
                 if (!acpi_ec_read(brightness_offset, &lec))
                         return -EIO;
-                lec &= 7;
+                lec &= (tp_features.bright_16levels)? 0x0f : 0x07;
                 level = lec;
         };
         if (brightness_mode & 2) {
                 lcmos = (nvram_read_byte(TP_NVRAM_ADDR_BRIGHTNESS)
                          & TP_NVRAM_MASK_LEVEL_BRIGHTNESS)
                         >> TP_NVRAM_POS_LEVEL_BRIGHTNESS;
+                lcmos &= (tp_features.bright_16levels)? 0x0f : 0x07;
                 level = lcmos;
         }
 
@@ -3206,12 +3320,13 @@ static int brightness_get(struct backlight_device *bd)
         return level;
 }
 
+/* May return EINTR which can always be mapped to ERESTARTSYS */
 static int brightness_set(int value)
 {
         int cmos_cmd, inc, i, res;
         int current_value;
 
-        if (value > 7)
+        if (value > ((tp_features.bright_16levels)? 15 : 7))
                 return -EINVAL;
 
         res = mutex_lock_interruptible(&brightness_mutex);
@@ -3227,7 +3342,7 @@ static int brightness_set(int value)
         cmos_cmd = value > current_value ?
                         TP_CMOS_BRIGHTNESS_UP :
                         TP_CMOS_BRIGHTNESS_DOWN;
-        inc = value > current_value ? 1 : -1;
+        inc = (value > current_value)? 1 : -1;
 
         res = 0;
         for (i = current_value; i != value; i += inc) {
@@ -3256,10 +3371,11 @@ static int brightness_read(char *p)
         if ((level = brightness_get(NULL)) < 0) {
                 len += sprintf(p + len, "level:\t\tunreadable\n");
         } else {
-                len += sprintf(p + len, "level:\t\t%d\n", level & 0x7);
+                len += sprintf(p + len, "level:\t\t%d\n", level);
                 len += sprintf(p + len, "commands:\tup, down\n");
                 len += sprintf(p + len, "commands:\tlevel <level>"
-                               " (<level> is 0-7)\n");
+                               " (<level> is 0-%d)\n",
+                               (tp_features.bright_16levels) ? 15 : 7);
         }
 
         return len;
@@ -3268,28 +3384,34 @@ static int brightness_read(char *p)
 static int brightness_write(char *buf)
 {
         int level;
-        int new_level;
+        int rc;
         char *cmd;
+        int max_level = (tp_features.bright_16levels) ? 15 : 7;
 
-        while ((cmd = next_cmd(&buf))) {
-                if ((level = brightness_get(NULL)) < 0)
-                        return level;
-                level &= 7;
+        level = brightness_get(NULL);
+        if (level < 0)
+                return level;
 
+        while ((cmd = next_cmd(&buf))) {
                 if (strlencmp(cmd, "up") == 0) {
-                        new_level = level == 7 ? 7 : level + 1;
+                        if (level < max_level)
+                                level++;
                 } else if (strlencmp(cmd, "down") == 0) {
-                        new_level = level == 0 ? 0 : level - 1;
-                } else if (sscanf(cmd, "level %d", &new_level) == 1 &&
-                           new_level >= 0 && new_level <= 7) {
-                        /* new_level set */
+                        if (level > 0)
+                                level--;
+                } else if (sscanf(cmd, "level %d", &level) == 1 &&
+                           level >= 0 && level <= max_level) {
+                        /* new level set */
                 } else
                         return -EINVAL;
-
-                brightness_set(new_level);
         }
 
-        return 0;
+        /*
+         * Now we know what the final level should be, so we try to set it.
+         * Doing it this way makes the syscall restartable in case of EINTR
+         */
+        rc = brightness_set(level);
+        return (rc == -EINTR)? ERESTARTSYS : rc;
 }
 
 static struct ibm_struct brightness_driver_data = {
@@ -3652,9 +3774,8 @@ static ssize_t fan_pwm1_store(struct device *dev,
         /* scale down from 0-255 to 0-7 */
         newlevel = (s >> 5) & 0x07;
 
-        rc = mutex_lock_interruptible(&fan_mutex);
-        if (rc < 0)
-                return rc;
+        if (mutex_lock_interruptible(&fan_mutex))
+                return -ERESTARTSYS;
 
         rc = fan_get_status(&status);
         if (!rc && (status &
@@ -3904,9 +4025,8 @@ static int fan_get_status_safe(u8 *status)
         int rc;
         u8 s;
 
-        rc = mutex_lock_interruptible(&fan_mutex);
-        if (rc < 0)
-                return rc;
+        if (mutex_lock_interruptible(&fan_mutex))
+                return -ERESTARTSYS;
         rc = fan_get_status(&s);
         if (!rc)
                 fan_update_desired_level(s);
@@ -4040,9 +4160,8 @@ static int fan_set_level_safe(int level)
         if (!fan_control_allowed)
                 return -EPERM;
 
-        rc = mutex_lock_interruptible(&fan_mutex);
-        if (rc < 0)
-                return rc;
+        if (mutex_lock_interruptible(&fan_mutex))
+                return -ERESTARTSYS;
 
         if (level == TPACPI_FAN_LAST_LEVEL)
                 level = fan_control_desired_level;
@@ -4063,9 +4182,8 @@ static int fan_set_enable(void)
         if (!fan_control_allowed)
                 return -EPERM;
 
-        rc = mutex_lock_interruptible(&fan_mutex);
-        if (rc < 0)
-                return rc;
+        if (mutex_lock_interruptible(&fan_mutex))
+                return -ERESTARTSYS;
 
         switch (fan_control_access_mode) {
         case TPACPI_FAN_WR_ACPI_FANS:
@@ -4119,9 +4237,8 @@ static int fan_set_disable(void)
         if (!fan_control_allowed)
                 return -EPERM;
 
-        rc = mutex_lock_interruptible(&fan_mutex);
-        if (rc < 0)
-                return rc;
+        if (mutex_lock_interruptible(&fan_mutex))
+                return -ERESTARTSYS;
 
         rc = 0;
         switch (fan_control_access_mode) {
@@ -4158,9 +4275,8 @@ static int fan_set_speed(int speed)
         if (!fan_control_allowed)
                 return -EPERM;
 
-        rc = mutex_lock_interruptible(&fan_mutex);
-        if (rc < 0)
-                return rc;
+        if (mutex_lock_interruptible(&fan_mutex))
+                return -ERESTARTSYS;
 
         rc = 0;
         switch (fan_control_access_mode) {
@@ -4701,9 +4817,15 @@ static int __init set_ibm_param(const char *val, struct kernel_param *kp)
         unsigned int i;
         struct ibm_struct *ibm;
 
+        if (!kp || !kp->name || !val)
+                return -EINVAL;
+
         for (i = 0; i < ARRAY_SIZE(ibms_init); i++) {
                 ibm = ibms_init[i].data;
-                BUG_ON(ibm == NULL);
+                WARN_ON(ibm == NULL);
+
+                if (!ibm || !ibm->name)
+                        continue;
 
                 if (strcmp(ibm->name, kp->name) == 0 && ibm->write) {
                         if (strlen(val) > sizeof(ibms_init[i].param) - 2)
@@ -4732,6 +4854,9 @@ module_param_named(fan_control, fan_control_allowed, bool, 0);
 static int brightness_mode;
 module_param_named(brightness_mode, brightness_mode, int, 0);
 
+static unsigned int brightness_enable = 2; /* 2 = auto, 0 = no, 1 = yes */
+module_param(brightness_enable, uint, 0);
+
 static unsigned int hotkey_report_mode;
 module_param(hotkey_report_mode, uint, 0);
 
diff --git a/drivers/misc/thinkpad_acpi.h b/drivers/misc/thinkpad_acpi.h
index 3abcc8120634..8fba2bbe345e 100644
--- a/drivers/misc/thinkpad_acpi.h
+++ b/drivers/misc/thinkpad_acpi.h
@@ -84,7 +84,7 @@
 
 /* ThinkPad CMOS NVRAM constants */
 #define TP_NVRAM_ADDR_BRIGHTNESS       0x5e
-#define TP_NVRAM_MASK_LEVEL_BRIGHTNESS 0x07
+#define TP_NVRAM_MASK_LEVEL_BRIGHTNESS 0x0f
 #define TP_NVRAM_POS_LEVEL_BRIGHTNESS 0
 
 #define onoff(status,bit) ((status) & (1 << (bit)) ? "on" : "off")
@@ -246,6 +246,7 @@ static struct {
         u32 hotkey_wlsw:1;
         u32 light:1;
         u32 light_status:1;
+        u32 bright_16levels:1;
         u32 wan:1;
         u32 fan_ctrl_status_undef:1;
         u32 input_device_registered:1;
@@ -338,6 +339,7 @@ static int bluetooth_write(char *buf);
 static struct backlight_device *ibm_backlight_device;
 static int brightness_offset = 0x31;
 static int brightness_mode;
+static unsigned int brightness_enable;  /* 0 = no, 1 = yes, 2 = auto */
 
 static int brightness_init(struct ibm_init_struct *iibm);
 static void brightness_exit(void);
diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
index e38d5a3b2a89..aeb32a93f6a0 100644
--- a/drivers/mmc/card/block.c
+++ b/drivers/mmc/card/block.c
@@ -44,6 +44,9 @@
  * max 8 partitions per card
  */
 #define MMC_SHIFT       3
+#define MMC_NUM_MINORS  (256 >> MMC_SHIFT)
+
+static unsigned long dev_use[MMC_NUM_MINORS/(8*sizeof(unsigned long))];
 
 /*
  * There is one mmc_blk_data per slot.
@@ -80,6 +83,9 @@ static void mmc_blk_put(struct mmc_blk_data *md)
         mutex_lock(&open_lock);
         md->usage--;
         if (md->usage == 0) {
+                int devidx = md->disk->first_minor >> MMC_SHIFT;
+                __clear_bit(devidx, dev_use);
+
                 put_disk(md->disk);
                 kfree(md);
         }
@@ -321,7 +327,13 @@ static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req)
                                                req->rq_disk->disk_name, err);
                                         goto cmd_err;
                                 }
-                        } while (!(cmd.resp[0] & R1_READY_FOR_DATA));
+                                /*
+                                 * Some cards mishandle the status bits,
+                                 * so make sure to check both the busy
+                                 * indication and the card state.
+                                 */
+                        } while (!(cmd.resp[0] & R1_READY_FOR_DATA) ||
+                                (R1_CURRENT_STATE(cmd.resp[0]) == 7));
 
 #if 0
                         if (cmd.resp[0] & ~0x00000900)
@@ -400,9 +412,6 @@ static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req)
         return 0;
 }
 
-#define MMC_NUM_MINORS  (256 >> MMC_SHIFT)
-
-static unsigned long dev_use[MMC_NUM_MINORS/(8*sizeof(unsigned long))];
 
 static inline int mmc_blk_readonly(struct mmc_card *card)
 {
@@ -568,17 +577,12 @@ static void mmc_blk_remove(struct mmc_card *card)
         struct mmc_blk_data *md = mmc_get_drvdata(card);
 
         if (md) {
-                int devidx;
-
                 /* Stop new requests from getting into the queue */
                 del_gendisk(md->disk);
 
                 /* Then flush out any already in there */
                 mmc_cleanup_queue(&md->queue);
 
-                devidx = md->disk->first_minor >> MMC_SHIFT;
-                __clear_bit(devidx, dev_use);
-
                 mmc_blk_put(md);
         }
         mmc_set_drvdata(card, NULL);
diff --git a/drivers/mmc/card/queue.c b/drivers/mmc/card/queue.c
index 1b9c9b6da5b7..30cd13b13ac3 100644
--- a/drivers/mmc/card/queue.c
+++ b/drivers/mmc/card/queue.c
@@ -180,12 +180,13 @@ int mmc_init_queue(struct mmc_queue *mq, struct mmc_card *card, spinlock_t *lock
                 blk_queue_max_hw_segments(mq->queue, host->max_hw_segs);
                 blk_queue_max_segment_size(mq->queue, host->max_seg_size);
 
-                mq->sg = kzalloc(sizeof(struct scatterlist) *
+                mq->sg = kmalloc(sizeof(struct scatterlist) *
                         host->max_phys_segs, GFP_KERNEL);
                 if (!mq->sg) {
                         ret = -ENOMEM;
                         goto cleanup_queue;
                 }
+                sg_init_table(mq->sg, host->max_phys_segs);
         }
 
         init_MUTEX(&mq->thread_sem);
diff --git a/drivers/mmc/card/sdio_uart.c b/drivers/mmc/card/sdio_uart.c
index d552de683110..eeea84c309e6 100644
--- a/drivers/mmc/card/sdio_uart.c
+++ b/drivers/mmc/card/sdio_uart.c
@@ -386,7 +386,7 @@ static void sdio_uart_stop_rx(struct sdio_uart_port *port)
         sdio_out(port, UART_IER, port->ier);
 }
 
-static void sdio_uart_receive_chars(struct sdio_uart_port *port, int *status)
+static void sdio_uart_receive_chars(struct sdio_uart_port *port, unsigned int *status)
 {
         struct tty_struct *tty = port->tty;
         unsigned int ch, flag;
diff --git a/drivers/mmc/host/mmc_spi.c b/drivers/mmc/host/mmc_spi.c
index a6469218f194..365024b83d3d 100644
--- a/drivers/mmc/host/mmc_spi.c
+++ b/drivers/mmc/host/mmc_spi.c
@@ -176,8 +176,6 @@ mmc_spi_readbytes(struct mmc_spi_host *host, unsigned len)
                                 DMA_FROM_DEVICE);
 
         status = spi_sync(host->spi, &host->readback);
-        if (status == 0)
-                status = host->readback.status;
 
         if (host->dma_dev)
                 dma_sync_single_for_cpu(host->dma_dev,
@@ -480,8 +478,6 @@ mmc_spi_command_send(struct mmc_spi_host *host,
                                 DMA_BIDIRECTIONAL);
         }
         status = spi_sync(host->spi, &host->m);
-        if (status == 0)
-                status = host->m.status;
 
         if (host->dma_dev)
                 dma_sync_single_for_cpu(host->dma_dev,
@@ -624,8 +620,6 @@ mmc_spi_writeblock(struct mmc_spi_host *host, struct spi_transfer *t)
                                 DMA_BIDIRECTIONAL);
 
         status = spi_sync(spi, &host->m);
-        if (status == 0)
-                status = host->m.status;
 
         if (status != 0) {
                 dev_dbg(&spi->dev, "write error (%d)\n", status);
@@ -726,8 +720,6 @@ mmc_spi_readblock(struct mmc_spi_host *host, struct spi_transfer *t)
                 }
 
                 status = spi_sync(spi, &host->m);
-                if (status == 0)
-                        status = host->m.status;
 
                 if (host->dma_dev) {
                         dma_sync_single_for_cpu(host->dma_dev,
@@ -905,8 +897,6 @@ mmc_spi_data_do(struct mmc_spi_host *host, struct mmc_command *cmd,
                                         DMA_BIDIRECTIONAL);
 
                 tmp = spi_sync(spi, &host->m);
-                if (tmp == 0)
-                        tmp = host->m.status;
 
                 if (host->dma_dev)
                         dma_sync_single_for_cpu(host->dma_dev,
diff --git a/drivers/mmc/host/tifm_sd.c b/drivers/mmc/host/tifm_sd.c
index c11a3d256051..20d5c7bd940a 100644
--- a/drivers/mmc/host/tifm_sd.c
+++ b/drivers/mmc/host/tifm_sd.c
@@ -16,7 +16,6 @@
 #include <linux/mmc/host.h>
 #include <linux/highmem.h>
 #include <linux/scatterlist.h>
-#include <linux/log2.h>
 #include <asm/io.h>
 
 #define DRIVER_NAME "tifm_sd"
@@ -638,17 +637,15 @@ static void tifm_sd_request(struct mmc_host *mmc, struct mmc_request *mrq)
                 goto err_out;
         }
 
-        if (mrq->data && !is_power_of_2(mrq->data->blksz)) {
-                printk(KERN_ERR "%s: Unsupported block size (%d bytes)\n",
-                        sock->dev.bus_id, mrq->data->blksz);
-                mrq->cmd->error = -EINVAL;
-                goto err_out;
-        }
-
         host->cmd_flags = 0;
         host->block_pos = 0;
         host->sg_pos = 0;
 
+        if (mrq->data && !is_power_of_2(mrq->data->blksz))
+                host->no_dma = 1;
+        else
+                host->no_dma = no_dma ? 1 : 0;
+
         if (r_data) {
                 tifm_sd_set_data_timeout(host, r_data);
 
@@ -676,7 +673,7 @@ static void tifm_sd_request(struct mmc_host *mmc, struct mmc_request *mrq)
                                             : PCI_DMA_FROMDEVICE)) {
                                 printk(KERN_ERR "%s : scatterlist map failed\n",
                                        sock->dev.bus_id);
-                                spin_unlock_irqrestore(&sock->lock, flags);
+                                mrq->cmd->error = -ENOMEM;
                                 goto err_out;
                         }
                         host->sg_len = tifm_map_sg(sock, r_data->sg,
@@ -692,7 +689,7 @@ static void tifm_sd_request(struct mmc_host *mmc, struct mmc_request *mrq)
                                               r_data->flags & MMC_DATA_WRITE
                                               ? PCI_DMA_TODEVICE
                                               : PCI_DMA_FROMDEVICE);
-                                spin_unlock_irqrestore(&sock->lock, flags);
+                                mrq->cmd->error = -ENOMEM;
                                 goto err_out;
                         }
 
@@ -966,7 +963,6 @@ static int tifm_sd_probe(struct tifm_dev *sock)
                 return -ENOMEM;
 
         host = mmc_priv(mmc);
-        host->no_dma = no_dma;
         tifm_set_drvdata(sock, mmc);
         host->dev = sock;
         host->timeout_jiffies = msecs_to_jiffies(1000);
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index e8d69b0adf90..d9107e542dfa 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -888,7 +888,7 @@ config SMC91X
         tristate "SMC 91C9x/91C1xxx support"
         select CRC32
         select MII
-        depends on ARM || REDWOOD_5 || REDWOOD_6 || M32R || SUPERH || SOC_AU1X00 || BFIN
+        depends on ARM || REDWOOD_5 || REDWOOD_6 || M32R || SUPERH || SOC_AU1X00 || BLACKFIN
         help
           This is a driver for SMC's 91x series of Ethernet chipsets,
           including the SMC91C94 and the SMC91C111. Say Y if you want it
@@ -926,7 +926,7 @@ config SMC911X
         tristate "SMSC LAN911[5678] support"
         select CRC32
         select MII
-        depends on ARCH_PXA || SUPERH
+        depends on ARCH_PXA || SH_MAGIC_PANEL_R2
         help
           This is a driver for SMSC's LAN911x series of Ethernet chipsets
           including the new LAN9115, LAN9116, LAN9117, and LAN9118.
diff --git a/drivers/net/amd8111e.c b/drivers/net/amd8111e.c
index eebf5bb2b03a..e7fdd81919bd 100644
--- a/drivers/net/amd8111e.c
+++ b/drivers/net/amd8111e.c
@@ -1340,7 +1340,9 @@ static int amd8111e_close(struct net_device * dev)
         struct amd8111e_priv *lp = netdev_priv(dev);
         netif_stop_queue(dev);
 
+#ifdef CONFIG_AMD8111E_NAPI
         napi_disable(&lp->napi);
+#endif
 
         spin_lock_irq(&lp->lock);
 
@@ -1372,7 +1374,9 @@ static int amd8111e_open(struct net_device * dev )
                                          dev->name, dev))
                 return -EAGAIN;
 
+#ifdef CONFIG_AMD8111E_NAPI
         napi_enable(&lp->napi);
+#endif
 
         spin_lock_irq(&lp->lock);
 
@@ -1380,7 +1384,9 @@ static int amd8111e_open(struct net_device * dev )
 
         if(amd8111e_restart(dev)){
                 spin_unlock_irq(&lp->lock);
+#ifdef CONFIG_AMD8111E_NAPI
                 napi_disable(&lp->napi);
+#endif
                 if (dev->irq)
                         free_irq(dev->irq, dev);
                 return -ENOMEM;
diff --git a/drivers/net/bfin_mac.c b/drivers/net/bfin_mac.c
index 084acfd6fc5f..eb971755a3ff 100644
--- a/drivers/net/bfin_mac.c
+++ b/drivers/net/bfin_mac.c
@@ -676,7 +676,7 @@ static void bf537mac_rx(struct net_device *dev)
         skb->protocol = eth_type_trans(skb, dev);
 #if defined(BFIN_MAC_CSUM_OFFLOAD)
         skb->csum = current_rx_ptr->status.ip_payload_csum;
-        skb->ip_summed = CHECKSUM_PARTIAL;
+        skb->ip_summed = CHECKSUM_COMPLETE;
 #endif
 
         netif_rx(skb);
@@ -924,7 +924,7 @@ static int __init bf537mac_probe(struct net_device *dev)
         if (!is_valid_ether_addr(dev->dev_addr)) {
                 /* Grab the MAC from the board somehow - this is done in the
                    arch/blackfin/mach-bf537/boards/eth_mac.c */
-                get_bf537_ether_addr(dev->dev_addr);
+                bfin_get_ether_addr(dev->dev_addr);
         }
 
         /* If still not valid, get a random one */
diff --git a/drivers/net/bfin_mac.h b/drivers/net/bfin_mac.h
index 3a107ad75381..5970ea7142cd 100644
--- a/drivers/net/bfin_mac.h
+++ b/drivers/net/bfin_mac.h
@@ -92,4 +92,4 @@ struct bf537mac_local {
         struct mii_bus mii_bus;
 };
 
-extern void get_bf537_ether_addr(char *addr);
+extern void bfin_get_ether_addr(char *addr);
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index da767d3d5af5..4e7b46e44874 100644
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -56,8 +56,8 @@
 
 #define DRV_MODULE_NAME         "bnx2"
 #define PFX DRV_MODULE_NAME     ": "
-#define DRV_MODULE_VERSION      "1.6.8"
-#define DRV_MODULE_RELDATE      "October 17, 2007"
+#define DRV_MODULE_VERSION      "1.6.9"
+#define DRV_MODULE_RELDATE      "December 8, 2007"
 
 #define RUN_AT(x) (jiffies + (x))
 
@@ -2387,18 +2387,24 @@ bnx2_reuse_rx_skb(struct bnx2 *bp, struct sk_buff *skb,
         prod_bd->rx_bd_haddr_lo = cons_bd->rx_bd_haddr_lo;
 }
 
+static inline u16
+bnx2_get_hw_rx_cons(struct bnx2 *bp)
+{
+        u16 cons = bp->status_blk->status_rx_quick_consumer_index0;
+
+        if (unlikely((cons & MAX_RX_DESC_CNT) == MAX_RX_DESC_CNT))
+                cons++;
+        return cons;
+}
+
 static int
 bnx2_rx_int(struct bnx2 *bp, int budget)
 {
-        struct status_block *sblk = bp->status_blk;
         u16 hw_cons, sw_cons, sw_ring_cons, sw_prod, sw_ring_prod;
         struct l2_fhdr *rx_hdr;
         int rx_pkt = 0;
 
-        hw_cons = bp->hw_rx_cons = sblk->status_rx_quick_consumer_index0;
-        if ((hw_cons & MAX_RX_DESC_CNT) == MAX_RX_DESC_CNT) {
-                hw_cons++;
-        }
+        hw_cons = bnx2_get_hw_rx_cons(bp);
         sw_cons = bp->rx_cons;
         sw_prod = bp->rx_prod;
 
@@ -2515,10 +2521,7 @@ next_rx:
 
                 /* Refresh hw_cons to see if there is new work */
                 if (sw_cons == hw_cons) {
-                        hw_cons = bp->hw_rx_cons =
-                                sblk->status_rx_quick_consumer_index0;
-                        if ((hw_cons & MAX_RX_DESC_CNT) == MAX_RX_DESC_CNT)
-                                hw_cons++;
+                        hw_cons = bnx2_get_hw_rx_cons(bp);
                         rmb();
                 }
         }
@@ -2622,7 +2625,7 @@ bnx2_has_work(struct bnx2 *bp)
 {
         struct status_block *sblk = bp->status_blk;
 
-        if ((sblk->status_rx_quick_consumer_index0 != bp->hw_rx_cons) ||
+        if ((bnx2_get_hw_rx_cons(bp) != bp->rx_cons) ||
             (sblk->status_tx_quick_consumer_index0 != bp->hw_tx_cons))
                 return 1;
 
@@ -2655,7 +2658,7 @@ static int bnx2_poll_work(struct bnx2 *bp, int work_done, int budget)
         if (sblk->status_tx_quick_consumer_index0 != bp->hw_tx_cons)
                 bnx2_tx_int(bp);
 
-        if (sblk->status_rx_quick_consumer_index0 != bp->hw_rx_cons)
+        if (bnx2_get_hw_rx_cons(bp) != bp->rx_cons)
                 work_done += bnx2_rx_int(bp, budget - work_done);
 
         return work_done;
@@ -4177,7 +4180,6 @@ bnx2_init_rx_ring(struct bnx2 *bp)
 
         ring_prod = prod = bp->rx_prod = 0;
         bp->rx_cons = 0;
-        bp->hw_rx_cons = 0;
         bp->rx_prod_bseq = 0;
 
         for (i = 0; i < bp->rx_max_ring; i++) {
@@ -6685,8 +6687,9 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev)
         } else if (CHIP_NUM(bp) == CHIP_NUM_5706 ||
                    CHIP_NUM(bp) == CHIP_NUM_5708)
                 bp->phy_flags |= PHY_CRC_FIX_FLAG;
-        else if (CHIP_ID(bp) == CHIP_ID_5709_A0 ||
-                 CHIP_ID(bp) == CHIP_ID_5709_A1)
+        else if (CHIP_NUM(bp) == CHIP_NUM_5709 &&
+                 (CHIP_REV(bp) == CHIP_REV_Ax ||
+                  CHIP_REV(bp) == CHIP_REV_Bx))
                 bp->phy_flags |= PHY_DIS_EARLY_DAC_FLAG;
 
         if ((CHIP_ID(bp) == CHIP_ID_5708_A0) ||
diff --git a/drivers/net/bnx2.h b/drivers/net/bnx2.h
index 1dce0d1a2581..30ba366608b0 100644
--- a/drivers/net/bnx2.h
+++ b/drivers/net/bnx2.h
@@ -6513,7 +6513,6 @@ struct bnx2 {
         u32                     rx_prod_bseq;
         u16                     rx_prod;
         u16                     rx_cons;
-        u16                     hw_rx_cons;
 
         u32                     rx_csum;
 
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 423298c84a1d..b0b26036266b 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -74,6 +74,7 @@
 #include <linux/ethtool.h>
 #include <linux/if_vlan.h>
 #include <linux/if_bonding.h>
+#include <linux/jiffies.h>
 #include <net/route.h>
 #include <net/net_namespace.h>
 #include "bonding.h"
@@ -174,6 +175,7 @@ struct bond_parm_tbl bond_mode_tbl[] = {
 struct bond_parm_tbl xmit_hashtype_tbl[] = {
 {       "layer2",               BOND_XMIT_POLICY_LAYER2},
 {       "layer3+4",             BOND_XMIT_POLICY_LAYER34},
+{       "layer2+3",             BOND_XMIT_POLICY_LAYER23},
 {       NULL,                   -1},
 };
 
@@ -2722,8 +2724,8 @@ void bond_loadbalance_arp_mon(struct work_struct *work)
          */
         bond_for_each_slave(bond, slave, i) {
                 if (slave->link != BOND_LINK_UP) {
-                        if (((jiffies - slave->dev->trans_start) <= delta_in_ticks) &&
-                            ((jiffies - slave->dev->last_rx) <= delta_in_ticks)) {
+                        if (time_before_eq(jiffies, slave->dev->trans_start + delta_in_ticks) &&
+                            time_before_eq(jiffies, slave->dev->last_rx + delta_in_ticks)) {
 
                                 slave->link  = BOND_LINK_UP;
                                 slave->state = BOND_STATE_ACTIVE;
@@ -2754,8 +2756,8 @@ void bond_loadbalance_arp_mon(struct work_struct *work)
                          * when the source ip is 0, so don't take the link down
                          * if we don't know our ip yet
                          */
-                        if (((jiffies - slave->dev->trans_start) >= (2*delta_in_ticks)) ||
-                            (((jiffies - slave->dev->last_rx) >= (2*delta_in_ticks)) &&
+                        if (time_after_eq(jiffies, slave->dev->trans_start + 2*delta_in_ticks) ||
+                            (time_after_eq(jiffies, slave->dev->last_rx + 2*delta_in_ticks) &&
                              bond_has_ip(bond))) {
 
                                 slave->link  = BOND_LINK_DOWN;
@@ -2848,8 +2850,8 @@ void bond_activebackup_arp_mon(struct work_struct *work)
          */
         bond_for_each_slave(bond, slave, i) {
                 if (slave->link != BOND_LINK_UP) {
-                        if ((jiffies - slave_last_rx(bond, slave)) <=
-                             delta_in_ticks) {
+                        if (time_before_eq(jiffies,
+                            slave_last_rx(bond, slave) + delta_in_ticks)) {
 
                                 slave->link = BOND_LINK_UP;
 
@@ -2858,7 +2860,7 @@ void bond_activebackup_arp_mon(struct work_struct *work)
                                 write_lock_bh(&bond->curr_slave_lock);
 
                                 if ((!bond->curr_active_slave) &&
-                                    ((jiffies - slave->dev->trans_start) <= delta_in_ticks)) {
+                                    time_before_eq(jiffies, slave->dev->trans_start + delta_in_ticks)) {
                                         bond_change_active_slave(bond, slave);
                                         bond->current_arp_slave = NULL;
                                 } else if (bond->curr_active_slave != slave) {
@@ -2897,7 +2899,7 @@ void bond_activebackup_arp_mon(struct work_struct *work)
 
                         if ((slave != bond->curr_active_slave) &&
                             (!bond->current_arp_slave) &&
-                            (((jiffies - slave_last_rx(bond, slave)) >= 3*delta_in_ticks) &&
+                            (time_after_eq(jiffies, slave_last_rx(bond, slave) + 3*delta_in_ticks) &&
                              bond_has_ip(bond))) {
                                 /* a backup slave has gone down; three times
                                  * the delta allows the current slave to be
@@ -2943,10 +2945,10 @@ void bond_activebackup_arp_mon(struct work_struct *work)
                  * before being taken out. if a primary is being used, check
                  * if it is up and needs to take over as the curr_active_slave
                  */
-                if ((((jiffies - slave->dev->trans_start) >= (2*delta_in_ticks)) ||
-            (((jiffies - slave_last_rx(bond, slave)) >= (2*delta_in_ticks)) &&
-             bond_has_ip(bond))) &&
-                    ((jiffies - slave->jiffies) >= 2*delta_in_ticks)) {
+                if ((time_after_eq(jiffies, slave->dev->trans_start + 2*delta_in_ticks) ||
+                        (time_after_eq(jiffies, slave_last_rx(bond, slave) + 2*delta_in_ticks) &&
+                         bond_has_ip(bond))) &&
+                        time_after_eq(jiffies, slave->jiffies + 2*delta_in_ticks)) {
 
                         slave->link  = BOND_LINK_DOWN;
 
@@ -3604,6 +3606,24 @@ void bond_unregister_arp(struct bonding *bond)
 /*---------------------------- Hashing Policies -----------------------------*/
 
 /*
+ * Hash for the output device based upon layer 2 and layer 3 data. If
+ * the packet is not IP mimic bond_xmit_hash_policy_l2()
+ */
+static int bond_xmit_hash_policy_l23(struct sk_buff *skb,
+                                     struct net_device *bond_dev, int count)
+{
+        struct ethhdr *data = (struct ethhdr *)skb->data;
+        struct iphdr *iph = ip_hdr(skb);
+
+        if (skb->protocol == __constant_htons(ETH_P_IP)) {
+                return ((ntohl(iph->saddr ^ iph->daddr) & 0xffff) ^
+                        (data->h_dest[5] ^ bond_dev->dev_addr[5])) % count;
+        }
+
+        return (data->h_dest[5] ^ bond_dev->dev_addr[5]) % count;
+}
+
+/*
  * Hash for the output device based upon layer 3 and layer 4 data. If
  * the packet is a frag or not TCP or UDP, just use layer 3 data.  If it is
  * altogether not IP, mimic bond_xmit_hash_policy_l2()
@@ -4305,6 +4325,22 @@ out:
 
 /*------------------------- Device initialization ---------------------------*/
 
+static void bond_set_xmit_hash_policy(struct bonding *bond)
+{
+        switch (bond->params.xmit_policy) {
+        case BOND_XMIT_POLICY_LAYER23:
+                bond->xmit_hash_policy = bond_xmit_hash_policy_l23;
+                break;
+        case BOND_XMIT_POLICY_LAYER34:
+                bond->xmit_hash_policy = bond_xmit_hash_policy_l34;
+                break;
+        case BOND_XMIT_POLICY_LAYER2:
+        default:
+                bond->xmit_hash_policy = bond_xmit_hash_policy_l2;
+                break;
+        }
+}
+
 /*
  * set bond mode specific net device operations
  */
@@ -4321,10 +4357,7 @@ void bond_set_mode_ops(struct bonding *bond, int mode)
                 break;
         case BOND_MODE_XOR:
                 bond_dev->hard_start_xmit = bond_xmit_xor;
-                if (bond->params.xmit_policy == BOND_XMIT_POLICY_LAYER34)
-                        bond->xmit_hash_policy = bond_xmit_hash_policy_l34;
-                else
-                        bond->xmit_hash_policy = bond_xmit_hash_policy_l2;
+                bond_set_xmit_hash_policy(bond);
                 break;
         case BOND_MODE_BROADCAST:
                 bond_dev->hard_start_xmit = bond_xmit_broadcast;
@@ -4332,10 +4365,7 @@ void bond_set_mode_ops(struct bonding *bond, int mode)
         case BOND_MODE_8023AD:
                 bond_set_master_3ad_flags(bond);
                 bond_dev->hard_start_xmit = bond_3ad_xmit_xor;
-                if (bond->params.xmit_policy == BOND_XMIT_POLICY_LAYER34)
-                        bond->xmit_hash_policy = bond_xmit_hash_policy_l34;
-                else
-                        bond->xmit_hash_policy = bond_xmit_hash_policy_l2;
+                bond_set_xmit_hash_policy(bond);
                 break;
         case BOND_MODE_ALB:
                 bond_set_master_alb_flags(bond);
@@ -4462,6 +4492,27 @@ static void bond_deinit(struct net_device *bond_dev)
 #endif
 }
 
+static void bond_work_cancel_all(struct bonding *bond)
+{
+        write_lock_bh(&bond->lock);
+        bond->kill_timers = 1;
+        write_unlock_bh(&bond->lock);
+
+        if (bond->params.miimon && delayed_work_pending(&bond->mii_work))
+                cancel_delayed_work(&bond->mii_work);
+
+        if (bond->params.arp_interval && delayed_work_pending(&bond->arp_work))
+                cancel_delayed_work(&bond->arp_work);
+
+        if (bond->params.mode == BOND_MODE_ALB &&
+            delayed_work_pending(&bond->alb_work))
+                cancel_delayed_work(&bond->alb_work);
+
+        if (bond->params.mode == BOND_MODE_8023AD &&
+            delayed_work_pending(&bond->ad_work))
+                cancel_delayed_work(&bond->ad_work);
+}
+
 /* Unregister and free all bond devices.
  * Caller must hold rtnl_lock.
  */
@@ -4472,6 +4523,7 @@ static void bond_free_all(void)
         list_for_each_entry_safe(bond, nxt, &bond_dev_list, bond_list) {
                 struct net_device *bond_dev = bond->dev;
 
+                bond_work_cancel_all(bond);
                 bond_mc_list_destroy(bond);
                 /* Release the bonded slaves */
                 bond_release_all(bond_dev);
@@ -4497,8 +4549,7 @@ int bond_parse_parm(char *mode_arg, struct bond_parm_tbl *tbl)
         for (i = 0; tbl[i].modename; i++) {
                 if ((isdigit(*mode_arg) &&
                      tbl[i].mode == simple_strtol(mode_arg, NULL, 0)) ||
-                    (strncmp(mode_arg, tbl[i].modename,
-                             strlen(tbl[i].modename)) == 0)) {
+                    (strcmp(mode_arg, tbl[i].modename) == 0)) {
                         return tbl[i].mode;
                 }
         }
@@ -4873,27 +4924,6 @@ out_rtnl:
         return res;
 }
 
-static void bond_work_cancel_all(struct bonding *bond)
-{
-        write_lock_bh(&bond->lock);
-        bond->kill_timers = 1;
-        write_unlock_bh(&bond->lock);
-
-        if (bond->params.miimon && delayed_work_pending(&bond->mii_work))
-                cancel_delayed_work(&bond->mii_work);
-
-        if (bond->params.arp_interval && delayed_work_pending(&bond->arp_work))
-                cancel_delayed_work(&bond->arp_work);
-
-        if (bond->params.mode == BOND_MODE_ALB &&
-            delayed_work_pending(&bond->alb_work))
-                cancel_delayed_work(&bond->alb_work);
-
-        if (bond->params.mode == BOND_MODE_8023AD &&
-            delayed_work_pending(&bond->ad_work))
-                cancel_delayed_work(&bond->ad_work);
-}
-
 static int __init bonding_init(void)
 {
         int i;
diff --git a/drivers/net/bonding/bond_sysfs.c b/drivers/net/bonding/bond_sysfs.c
index b29330d8e309..11b76b352415 100644
--- a/drivers/net/bonding/bond_sysfs.c
+++ b/drivers/net/bonding/bond_sysfs.c
@@ -74,7 +74,7 @@ struct rw_semaphore bonding_rwsem;
  * "show" function for the bond_masters attribute.
  * The class parameter is ignored.
  */
-static ssize_t bonding_show_bonds(struct class *cls, char *buffer)
+static ssize_t bonding_show_bonds(struct class *cls, char *buf)
 {
         int res = 0;
         struct bonding *bond;
@@ -86,14 +86,13 @@ static ssize_t bonding_show_bonds(struct class *cls, char *buffer)
                         /* not enough space for another interface name */
                         if ((PAGE_SIZE - res) > 10)
                                 res = PAGE_SIZE - 10;
-                        res += sprintf(buffer + res, "++more++");
+                        res += sprintf(buf + res, "++more++ ");
                         break;
                 }
-                res += sprintf(buffer + res, "%s ",
-                               bond->dev->name);
+                res += sprintf(buf + res, "%s ", bond->dev->name);
         }
-        res += sprintf(buffer + res, "\n");
-        res++;
+        if (res)
+                buf[res-1] = '\n'; /* eat the leftover space */
         up_read(&(bonding_rwsem));
         return res;
 }
@@ -235,14 +234,14 @@ static ssize_t bonding_show_slaves(struct device *d,
                         /* not enough space for another interface name */
                         if ((PAGE_SIZE - res) > 10)
                                 res = PAGE_SIZE - 10;
-                        res += sprintf(buf + res, "++more++");
+                        res += sprintf(buf + res, "++more++ ");
                         break;
                 }
                 res += sprintf(buf + res, "%s ", slave->dev->name);
         }
         read_unlock(&bond->lock);
-        res += sprintf(buf + res, "\n");
-        res++;
+        if (res)
+                buf[res-1] = '\n'; /* eat the leftover space */
         return res;
 }
 
@@ -406,7 +405,7 @@ static ssize_t bonding_show_mode(struct device *d,
 
         return sprintf(buf, "%s %d\n",
                         bond_mode_tbl[bond->params.mode].modename,
-                        bond->params.mode) + 1;
+                        bond->params.mode);
 }
 
 static ssize_t bonding_store_mode(struct device *d,
@@ -457,20 +456,11 @@ static ssize_t bonding_show_xmit_hash(struct device *d,
                                       struct device_attribute *attr,
                                       char *buf)
 {
-        int count;
         struct bonding *bond = to_bond(d);
 
-        if ((bond->params.mode != BOND_MODE_XOR) &&
-            (bond->params.mode != BOND_MODE_8023AD)) {
-                // Not Applicable
-                count = sprintf(buf, "NA\n") + 1;
-        } else {
-                count = sprintf(buf, "%s %d\n",
-                        xmit_hashtype_tbl[bond->params.xmit_policy].modename,
-                        bond->params.xmit_policy) + 1;
-        }
-
-        return count;
+        return sprintf(buf, "%s %d\n",
+                       xmit_hashtype_tbl[bond->params.xmit_policy].modename,
+                       bond->params.xmit_policy);
 }
 
 static ssize_t bonding_store_xmit_hash(struct device *d,
@@ -488,15 +478,6 @@ static ssize_t bonding_store_xmit_hash(struct device *d,
                 goto out;
         }
 
-        if ((bond->params.mode != BOND_MODE_XOR) &&
-            (bond->params.mode != BOND_MODE_8023AD)) {
-                printk(KERN_ERR DRV_NAME
-                       "%s: Transmit hash policy is irrelevant in this mode.\n",
-                       bond->dev->name);
-                ret = -EPERM;
-                goto out;
-        }
-
         new_value = bond_parse_parm((char *)buf, xmit_hashtype_tbl);
         if (new_value < 0)  {
                 printk(KERN_ERR DRV_NAME
@@ -527,7 +508,7 @@ static ssize_t bonding_show_arp_validate(struct device *d,
 
         return sprintf(buf, "%s %d\n",
                        arp_validate_tbl[bond->params.arp_validate].modename,
-                       bond->params.arp_validate) + 1;
+                       bond->params.arp_validate);
 }
 
 static ssize_t bonding_store_arp_validate(struct device *d,
@@ -627,7 +608,7 @@ static ssize_t bonding_show_arp_interval(struct device *d,
 {
         struct bonding *bond = to_bond(d);
 
-        return sprintf(buf, "%d\n", bond->params.arp_interval) + 1;
+        return sprintf(buf, "%d\n", bond->params.arp_interval);
 }
 
 static ssize_t bonding_store_arp_interval(struct device *d,
@@ -712,9 +693,7 @@ static ssize_t bonding_show_arp_targets(struct device *d,
                                NIPQUAD(bond->params.arp_targets[i]));
         }
         if (res)
-                res--;  /* eat the leftover space */
-        res += sprintf(buf + res, "\n");
-        res++;
+                buf[res-1] = '\n'; /* eat the leftover space */
         return res;
 }
 
@@ -815,7 +794,7 @@ static ssize_t bonding_show_downdelay(struct device *d,
 {
         struct bonding *bond = to_bond(d);
 
-        return sprintf(buf, "%d\n", bond->params.downdelay * bond->params.miimon) + 1;
+        return sprintf(buf, "%d\n", bond->params.downdelay * bond->params.miimon);
 }
 
 static ssize_t bonding_store_downdelay(struct device *d,
@@ -872,7 +851,7 @@ static ssize_t bonding_show_updelay(struct device *d,
 {
         struct bonding *bond = to_bond(d);
 
-        return sprintf(buf, "%d\n", bond->params.updelay * bond->params.miimon) + 1;
+        return sprintf(buf, "%d\n", bond->params.updelay * bond->params.miimon);
 
 }
 
@@ -936,7 +915,7 @@ static ssize_t bonding_show_lacp(struct device *d,
 
         return sprintf(buf, "%s %d\n",
                 bond_lacp_tbl[bond->params.lacp_fast].modename,
-                bond->params.lacp_fast) + 1;
+                bond->params.lacp_fast);
 }
 
 static ssize_t bonding_store_lacp(struct device *d,
@@ -992,7 +971,7 @@ static ssize_t bonding_show_miimon(struct device *d,
 {
         struct bonding *bond = to_bond(d);
 
-        return sprintf(buf, "%d\n", bond->params.miimon) + 1;
+        return sprintf(buf, "%d\n", bond->params.miimon);
 }
 
 static ssize_t bonding_store_miimon(struct device *d,
@@ -1083,9 +1062,7 @@ static ssize_t bonding_show_primary(struct device *d,
         struct bonding *bond = to_bond(d);
 
         if (bond->primary_slave)
-                count = sprintf(buf, "%s\n", bond->primary_slave->dev->name) + 1;
-        else
-                count = sprintf(buf, "\n") + 1;
+                count = sprintf(buf, "%s\n", bond->primary_slave->dev->name);
 
         return count;
 }
@@ -1149,7 +1126,7 @@ static ssize_t bonding_show_carrier(struct device *d,
 {
         struct bonding *bond = to_bond(d);
 
-        return sprintf(buf, "%d\n", bond->params.use_carrier) + 1;
+        return sprintf(buf, "%d\n", bond->params.use_carrier);
 }
 
 static ssize_t bonding_store_carrier(struct device *d,
@@ -1191,16 +1168,14 @@ static ssize_t bonding_show_active_slave(struct device *d,
 {
         struct slave *curr;
         struct bonding *bond = to_bond(d);
-        int count;
+        int count = 0;
 
         read_lock(&bond->curr_slave_lock);
         curr = bond->curr_active_slave;
         read_unlock(&bond->curr_slave_lock);
 
         if (USES_PRIMARY(bond->params.mode) && curr)
-                count = sprintf(buf, "%s\n", curr->dev->name) + 1;
-        else
-                count = sprintf(buf, "\n") + 1;
+                count = sprintf(buf, "%s\n", curr->dev->name);
         return count;
 }
 
@@ -1295,7 +1270,7 @@ static ssize_t bonding_show_mii_status(struct device *d,
         curr = bond->curr_active_slave;
         read_unlock(&bond->curr_slave_lock);
 
-        return sprintf(buf, "%s\n", (curr) ? "up" : "down") + 1;
+        return sprintf(buf, "%s\n", (curr) ? "up" : "down");
 }
 static DEVICE_ATTR(mii_status, S_IRUGO, bonding_show_mii_status, NULL);
 
@@ -1312,10 +1287,8 @@ static ssize_t bonding_show_ad_aggregator(struct device *d,
 
         if (bond->params.mode == BOND_MODE_8023AD) {
                 struct ad_info ad_info;
-                count = sprintf(buf, "%d\n", (bond_3ad_get_active_agg_info(bond, &ad_info)) ?  0 : ad_info.aggregator_id) + 1;
+                count = sprintf(buf, "%d\n", (bond_3ad_get_active_agg_info(bond, &ad_info)) ?  0 : ad_info.aggregator_id);
         }
-        else
-                count = sprintf(buf, "\n") + 1;
 
         return count;
 }
@@ -1334,10 +1307,8 @@ static ssize_t bonding_show_ad_num_ports(struct device *d,
 
         if (bond->params.mode == BOND_MODE_8023AD) {
                 struct ad_info ad_info;
-                count = sprintf(buf, "%d\n", (bond_3ad_get_active_agg_info(bond, &ad_info)) ?  0: ad_info.ports) + 1;
+                count = sprintf(buf, "%d\n", (bond_3ad_get_active_agg_info(bond, &ad_info)) ?  0: ad_info.ports);
         }
-        else
-                count = sprintf(buf, "\n") + 1;
 
         return count;
 }
@@ -1356,10 +1327,8 @@ static ssize_t bonding_show_ad_actor_key(struct device *d,
 
         if (bond->params.mode == BOND_MODE_8023AD) {
                 struct ad_info ad_info;
-                count = sprintf(buf, "%d\n", (bond_3ad_get_active_agg_info(bond, &ad_info)) ?  0 : ad_info.actor_key) + 1;
+                count = sprintf(buf, "%d\n", (bond_3ad_get_active_agg_info(bond, &ad_info)) ?  0 : ad_info.actor_key);
         }
-        else
-                count = sprintf(buf, "\n") + 1;
 
         return count;
 }
@@ -1378,10 +1347,8 @@ static ssize_t bonding_show_ad_partner_key(struct device *d,
 
         if (bond->params.mode == BOND_MODE_8023AD) {
                 struct ad_info ad_info;
-                count = sprintf(buf, "%d\n", (bond_3ad_get_active_agg_info(bond, &ad_info)) ?  0 : ad_info.partner_key) + 1;
+                count = sprintf(buf, "%d\n", (bond_3ad_get_active_agg_info(bond, &ad_info)) ?  0 : ad_info.partner_key);
         }
-        else
-                count = sprintf(buf, "\n") + 1;
 
         return count;
 }
@@ -1403,12 +1370,9 @@ static ssize_t bonding_show_ad_partner_mac(struct device *d,
                 struct ad_info ad_info;
                 if (!bond_3ad_get_active_agg_info(bond, &ad_info)) {
                         count = sprintf(buf,"%s\n",
-                                        print_mac(mac, ad_info.partner_system))
-                                + 1;
+                                        print_mac(mac, ad_info.partner_system));
                 }
         }
-        else
-                count = sprintf(buf, "\n") + 1;
 
         return count;
 }
diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h
index 61c1b4536d34..e1e4734e23ce 100644
--- a/drivers/net/bonding/bonding.h
+++ b/drivers/net/bonding/bonding.h
@@ -22,8 +22,8 @@
 #include "bond_3ad.h"
 #include "bond_alb.h"
 
-#define DRV_VERSION     "3.2.1"
-#define DRV_RELDATE     "October 15, 2007"
+#define DRV_VERSION     "3.2.3"
+#define DRV_RELDATE     "December 6, 2007"
 #define DRV_NAME        "bonding"
 #define DRV_DESCRIPTION "Ethernet Channel Bonding Driver"
 
diff --git a/drivers/net/chelsio/cxgb2.c b/drivers/net/chelsio/cxgb2.c
index 2dbf8dc116c6..c5975047c89b 100644
--- a/drivers/net/chelsio/cxgb2.c
+++ b/drivers/net/chelsio/cxgb2.c
@@ -374,7 +374,9 @@ static char stats_strings[][ETH_GSTRING_LEN] = {
         "TxInternalMACXmitError",
         "TxFramesWithExcessiveDeferral",
         "TxFCSErrors",
-
+        "TxJumboFramesOk",
+        "TxJumboOctetsOk",
+        
         "RxOctetsOK",
         "RxOctetsBad",
         "RxUnicastFramesOK",
@@ -392,16 +394,17 @@ static char stats_strings[][ETH_GSTRING_LEN] = {
         "RxInRangeLengthErrors",
         "RxOutOfRangeLengthField",
         "RxFrameTooLongErrors",
+        "RxJumboFramesOk",
+        "RxJumboOctetsOk",
 
         /* Port stats */
-        "RxPackets",
         "RxCsumGood",
-        "TxPackets",
         "TxCsumOffload",
         "TxTso",
         "RxVlan",
         "TxVlan",
-
+        "TxNeedHeadroom", 
+        
         /* Interrupt stats */
         "rx drops",
         "pure_rsps",
@@ -463,23 +466,56 @@ static void get_stats(struct net_device *dev, struct ethtool_stats *stats,
         const struct cmac_statistics *s;
         const struct sge_intr_counts *t;
         struct sge_port_stats ss;
-        unsigned int len;
 
         s = mac->ops->statistics_update(mac, MAC_STATS_UPDATE_FULL);
-
-        len = sizeof(u64)*(&s->TxFCSErrors + 1 - &s->TxOctetsOK);
-        memcpy(data, &s->TxOctetsOK, len);
-        data += len;
-
-        len = sizeof(u64)*(&s->RxFrameTooLongErrors + 1 - &s->RxOctetsOK);
-        memcpy(data, &s->RxOctetsOK, len);
-        data += len;
-
+        t = t1_sge_get_intr_counts(adapter->sge);
         t1_sge_get_port_stats(adapter->sge, dev->if_port, &ss);
-        memcpy(data, &ss, sizeof(ss));
-        data += sizeof(ss);
 
-        t = t1_sge_get_intr_counts(adapter->sge);
+        *data++ = s->TxOctetsOK;
+        *data++ = s->TxOctetsBad;
+        *data++ = s->TxUnicastFramesOK;
+        *data++ = s->TxMulticastFramesOK;
+        *data++ = s->TxBroadcastFramesOK;
+        *data++ = s->TxPauseFrames;
+        *data++ = s->TxFramesWithDeferredXmissions;
+        *data++ = s->TxLateCollisions;
+        *data++ = s->TxTotalCollisions;
+        *data++ = s->TxFramesAbortedDueToXSCollisions;
+        *data++ = s->TxUnderrun;
+        *data++ = s->TxLengthErrors;
+        *data++ = s->TxInternalMACXmitError;
+        *data++ = s->TxFramesWithExcessiveDeferral;
+        *data++ = s->TxFCSErrors;
+        *data++ = s->TxJumboFramesOK;
+        *data++ = s->TxJumboOctetsOK;
+
+        *data++ = s->RxOctetsOK;
+        *data++ = s->RxOctetsBad;
+        *data++ = s->RxUnicastFramesOK;
+        *data++ = s->RxMulticastFramesOK;
+        *data++ = s->RxBroadcastFramesOK;
+        *data++ = s->RxPauseFrames;
+        *data++ = s->RxFCSErrors;
+        *data++ = s->RxAlignErrors;
+        *data++ = s->RxSymbolErrors;
+        *data++ = s->RxDataErrors;
+        *data++ = s->RxSequenceErrors;
+        *data++ = s->RxRuntErrors;
+        *data++ = s->RxJabberErrors;
+        *data++ = s->RxInternalMACRcvError;
+        *data++ = s->RxInRangeLengthErrors;
+        *data++ = s->RxOutOfRangeLengthField;
+        *data++ = s->RxFrameTooLongErrors;
+        *data++ = s->RxJumboFramesOK;
+        *data++ = s->RxJumboOctetsOK;
+
+        *data++ = ss.rx_cso_good;
+        *data++ = ss.tx_cso;
+        *data++ = ss.tx_tso;
+        *data++ = ss.vlan_xtract;
+        *data++ = ss.vlan_insert;
+        *data++ = ss.tx_need_hdrroom;
+        
         *data++ = t->rx_drops;
         *data++ = t->pure_rsps;
         *data++ = t->unhandled_irqs;
diff --git a/drivers/net/chelsio/pm3393.c b/drivers/net/chelsio/pm3393.c
index 678778a8d133..2117c4fbb107 100644
--- a/drivers/net/chelsio/pm3393.c
+++ b/drivers/net/chelsio/pm3393.c
@@ -45,7 +45,7 @@
 
 #include <linux/crc32.h>
 
-#define OFFSET(REG_ADDR)    (REG_ADDR << 2)
+#define OFFSET(REG_ADDR)    ((REG_ADDR) << 2)
 
 /* Max frame size PM3393 can handle. Includes Ethernet header and CRC. */
 #define MAX_FRAME_SIZE  9600
@@ -428,69 +428,26 @@ static int pm3393_set_speed_duplex_fc(struct cmac *cmac, int speed, int duplex,
         return 0;
 }
 
-static void pm3393_rmon_update(struct adapter *adapter, u32 offs, u64 *val,
-                               int over)
-{
-        u32 val0, val1, val2;
-
-        t1_tpi_read(adapter, offs, &val0);
-        t1_tpi_read(adapter, offs + 4, &val1);
-        t1_tpi_read(adapter, offs + 8, &val2);
-
-        *val &= ~0ull << 40;
-        *val |= val0 & 0xffff;
-        *val |= (val1 & 0xffff) << 16;
-        *val |= (u64)(val2 & 0xff) << 32;
-
-        if (over)
-                *val += 1ull << 40;
+#define RMON_UPDATE(mac, name, stat_name) \
+{ \
+        t1_tpi_read((mac)->adapter, OFFSET(name), &val0);     \
+        t1_tpi_read((mac)->adapter, OFFSET((name)+1), &val1); \
+        t1_tpi_read((mac)->adapter, OFFSET((name)+2), &val2); \
+        (mac)->stats.stat_name = (u64)(val0 & 0xffff) | \
+                                 ((u64)(val1 & 0xffff) << 16) | \
+                                 ((u64)(val2 & 0xff) << 32) | \
+                                 ((mac)->stats.stat_name & \
+                                        0xffffff0000000000ULL); \
+        if (ro & \
+            (1ULL << ((name - SUNI1x10GEXP_REG_MSTAT_COUNTER_0_LOW) >> 2))) \
+                (mac)->stats.stat_name += 1ULL << 40; \
 }
 
 static const struct cmac_statistics *pm3393_update_statistics(struct cmac *mac,
                                                               int flag)
 {
-        static struct {
-                unsigned int reg;
-                unsigned int offset;
-        } hw_stats [] = {
-
-#define HW_STAT(name, stat_name) \
-        { name, (&((struct cmac_statistics *)NULL)->stat_name) - (u64 *)NULL }
-
-                /* Rx stats */
-                HW_STAT(RxOctetsReceivedOK, RxOctetsOK),
-                HW_STAT(RxUnicastFramesReceivedOK, RxUnicastFramesOK),
-                HW_STAT(RxMulticastFramesReceivedOK, RxMulticastFramesOK),
-                HW_STAT(RxBroadcastFramesReceivedOK, RxBroadcastFramesOK),
-                HW_STAT(RxPAUSEMACCtrlFramesReceived, RxPauseFrames),
-                HW_STAT(RxFrameCheckSequenceErrors, RxFCSErrors),
-                HW_STAT(RxFramesLostDueToInternalMACErrors,
-                                RxInternalMACRcvError),
-                HW_STAT(RxSymbolErrors, RxSymbolErrors),
-                HW_STAT(RxInRangeLengthErrors, RxInRangeLengthErrors),
-                HW_STAT(RxFramesTooLongErrors , RxFrameTooLongErrors),
-                HW_STAT(RxJabbers, RxJabberErrors),
-                HW_STAT(RxFragments, RxRuntErrors),
-                HW_STAT(RxUndersizedFrames, RxRuntErrors),
-                HW_STAT(RxJumboFramesReceivedOK, RxJumboFramesOK),
-                HW_STAT(RxJumboOctetsReceivedOK, RxJumboOctetsOK),
-
-                /* Tx stats */
-                HW_STAT(TxOctetsTransmittedOK, TxOctetsOK),
-                HW_STAT(TxFramesLostDueToInternalMACTransmissionError,
-                                TxInternalMACXmitError),
-                HW_STAT(TxTransmitSystemError, TxFCSErrors),
-                HW_STAT(TxUnicastFramesTransmittedOK, TxUnicastFramesOK),
-                HW_STAT(TxMulticastFramesTransmittedOK, TxMulticastFramesOK),
-                HW_STAT(TxBroadcastFramesTransmittedOK, TxBroadcastFramesOK),
-                HW_STAT(TxPAUSEMACCtrlFramesTransmitted, TxPauseFrames),
-                HW_STAT(TxJumboFramesReceivedOK, TxJumboFramesOK),
-                HW_STAT(TxJumboOctetsReceivedOK, TxJumboOctetsOK)
-        }, *p = hw_stats;
-        u64 ro;
-        u32 val0, val1, val2, val3;
-        u64 *stats = (u64 *) &mac->stats;
-        unsigned int i;
+        u64     ro;
+        u32     val0, val1, val2, val3;
 
         /* Snap the counters */
         pmwrite(mac, SUNI1x10GEXP_REG_MSTAT_CONTROL,
@@ -504,14 +461,35 @@ static const struct cmac_statistics *pm3393_update_statistics(struct cmac *mac,
         ro = ((u64)val0 & 0xffff) | (((u64)val1 & 0xffff) << 16) |
                 (((u64)val2 & 0xffff) << 32) | (((u64)val3 & 0xffff) << 48);
 
-        for (i = 0; i < ARRAY_SIZE(hw_stats); i++) {
-                unsigned reg = p->reg - SUNI1x10GEXP_REG_MSTAT_COUNTER_0_LOW;
-
-                pm3393_rmon_update((mac)->adapter, OFFSET(p->reg),
-                                   stats + p->offset, ro & (reg >> 2));
-        }
-
-
+        /* Rx stats */
+        RMON_UPDATE(mac, RxOctetsReceivedOK, RxOctetsOK);
+        RMON_UPDATE(mac, RxUnicastFramesReceivedOK, RxUnicastFramesOK);
+        RMON_UPDATE(mac, RxMulticastFramesReceivedOK, RxMulticastFramesOK);
+        RMON_UPDATE(mac, RxBroadcastFramesReceivedOK, RxBroadcastFramesOK);
+        RMON_UPDATE(mac, RxPAUSEMACCtrlFramesReceived, RxPauseFrames);
+        RMON_UPDATE(mac, RxFrameCheckSequenceErrors, RxFCSErrors);
+        RMON_UPDATE(mac, RxFramesLostDueToInternalMACErrors,
+                                RxInternalMACRcvError);
+        RMON_UPDATE(mac, RxSymbolErrors, RxSymbolErrors);
+        RMON_UPDATE(mac, RxInRangeLengthErrors, RxInRangeLengthErrors);
+        RMON_UPDATE(mac, RxFramesTooLongErrors , RxFrameTooLongErrors);
+        RMON_UPDATE(mac, RxJabbers, RxJabberErrors);
+        RMON_UPDATE(mac, RxFragments, RxRuntErrors);
+        RMON_UPDATE(mac, RxUndersizedFrames, RxRuntErrors);
+        RMON_UPDATE(mac, RxJumboFramesReceivedOK, RxJumboFramesOK);
+        RMON_UPDATE(mac, RxJumboOctetsReceivedOK, RxJumboOctetsOK);
+
+        /* Tx stats */
+        RMON_UPDATE(mac, TxOctetsTransmittedOK, TxOctetsOK);
+        RMON_UPDATE(mac, TxFramesLostDueToInternalMACTransmissionError,
+                                TxInternalMACXmitError);
+        RMON_UPDATE(mac, TxTransmitSystemError, TxFCSErrors);
+        RMON_UPDATE(mac, TxUnicastFramesTransmittedOK, TxUnicastFramesOK);
+        RMON_UPDATE(mac, TxMulticastFramesTransmittedOK, TxMulticastFramesOK);
+        RMON_UPDATE(mac, TxBroadcastFramesTransmittedOK, TxBroadcastFramesOK);
+        RMON_UPDATE(mac, TxPAUSEMACCtrlFramesTransmitted, TxPauseFrames);
+        RMON_UPDATE(mac, TxJumboFramesReceivedOK, TxJumboFramesOK);
+        RMON_UPDATE(mac, TxJumboOctetsReceivedOK, TxJumboOctetsOK);
 
         return &mac->stats;
 }
diff --git a/drivers/net/chelsio/sge.c b/drivers/net/chelsio/sge.c
index 443666292a5c..b301c0428ae0 100644
--- a/drivers/net/chelsio/sge.c
+++ b/drivers/net/chelsio/sge.c
@@ -986,11 +986,10 @@ void t1_sge_get_port_stats(const struct sge *sge, int port,
         for_each_possible_cpu(cpu) {
                 struct sge_port_stats *st = per_cpu_ptr(sge->port_stats[port], cpu);
 
-                ss->rx_packets += st->rx_packets;
                 ss->rx_cso_good += st->rx_cso_good;
-                ss->tx_packets += st->tx_packets;
                 ss->tx_cso += st->tx_cso;
                 ss->tx_tso += st->tx_tso;
+                ss->tx_need_hdrroom += st->tx_need_hdrroom;
                 ss->vlan_xtract += st->vlan_xtract;
                 ss->vlan_insert += st->vlan_insert;
         }
@@ -1380,7 +1379,6 @@ static void sge_rx(struct sge *sge, struct freelQ *fl, unsigned int len)
         __skb_pull(skb, sizeof(*p));
 
         st = per_cpu_ptr(sge->port_stats[p->iff], smp_processor_id());
-        st->rx_packets++;
 
         skb->protocol = eth_type_trans(skb, adapter->port[p->iff].dev);
         skb->dev->last_rx = jiffies;
@@ -1624,11 +1622,9 @@ int t1_poll(struct napi_struct *napi, int budget)
 {
         struct adapter *adapter = container_of(napi, struct adapter, napi);
         struct net_device *dev = adapter->port[0].dev;
-        int work_done;
-
-        work_done = process_responses(adapter, budget);
+        int work_done = process_responses(adapter, budget);
 
-        if (likely(!responses_pending(adapter))) {
+        if (likely(work_done < budget)) {
                 netif_rx_complete(dev, napi);
                 writel(adapter->sge->respQ.cidx,
                        adapter->regs + A_SG_SLEEPING);
@@ -1848,7 +1844,8 @@ int t1_start_xmit(struct sk_buff *skb, struct net_device *dev)
 {
         struct adapter *adapter = dev->priv;
         struct sge *sge = adapter->sge;
-        struct sge_port_stats *st = per_cpu_ptr(sge->port_stats[dev->if_port], smp_processor_id());
+        struct sge_port_stats *st = per_cpu_ptr(sge->port_stats[dev->if_port],
+                                                smp_processor_id());
         struct cpl_tx_pkt *cpl;
         struct sk_buff *orig_skb = skb;
         int ret;
@@ -1856,6 +1853,18 @@ int t1_start_xmit(struct sk_buff *skb, struct net_device *dev)
         if (skb->protocol == htons(ETH_P_CPL5))
                 goto send;
 
+        /*
+         * We are using a non-standard hard_header_len.
+         * Allocate more header room in the rare cases it is not big enough.
+         */
+        if (unlikely(skb_headroom(skb) < dev->hard_header_len - ETH_HLEN)) {
+                skb = skb_realloc_headroom(skb, sizeof(struct cpl_tx_pkt_lso));
+                ++st->tx_need_hdrroom;
+                dev_kfree_skb_any(orig_skb);
+                if (!skb)
+                        return NETDEV_TX_OK;
+        }
+
         if (skb_shinfo(skb)->gso_size) {
                 int eth_type;
                 struct cpl_tx_pkt_lso *hdr;
@@ -1889,24 +1898,6 @@ int t1_start_xmit(struct sk_buff *skb, struct net_device *dev)
                         return NETDEV_TX_OK;
                 }
 
-                /*
-                 * We are using a non-standard hard_header_len and some kernel
-                 * components, such as pktgen, do not handle it right.
-                 * Complain when this happens but try to fix things up.
-                 */
-                if (unlikely(skb_headroom(skb) < dev->hard_header_len - ETH_HLEN)) {
-                        pr_debug("%s: headroom %d header_len %d\n", dev->name,
-                                 skb_headroom(skb), dev->hard_header_len);
-
-                        if (net_ratelimit())
-                                printk(KERN_ERR "%s: inadequate headroom in "
-                                       "Tx packet\n", dev->name);
-                        skb = skb_realloc_headroom(skb, sizeof(*cpl));
-                        dev_kfree_skb_any(orig_skb);
-                        if (!skb)
-                                return NETDEV_TX_OK;
-                }
-
                 if (!(adapter->flags & UDP_CSUM_CAPABLE) &&
                     skb->ip_summed == CHECKSUM_PARTIAL &&
                     ip_hdr(skb)->protocol == IPPROTO_UDP) {
@@ -1952,7 +1943,6 @@ int t1_start_xmit(struct sk_buff *skb, struct net_device *dev)
                 cpl->vlan_valid = 0;
 
 send:
-        st->tx_packets++;
         dev->trans_start = jiffies;
         ret = t1_sge_tx(skb, adapter, 0, dev);
 
diff --git a/drivers/net/chelsio/sge.h b/drivers/net/chelsio/sge.h
index 713d9c55f24d..cced9dff91c5 100644
--- a/drivers/net/chelsio/sge.h
+++ b/drivers/net/chelsio/sge.h
@@ -57,13 +57,12 @@ struct sge_intr_counts {
 };
 
 struct sge_port_stats {
-        u64 rx_packets;      /* # of Ethernet packets received */
         u64 rx_cso_good;     /* # of successful RX csum offloads */
-        u64 tx_packets;      /* # of TX packets */
         u64 tx_cso;          /* # of TX checksum offloads */
         u64 tx_tso;          /* # of TSO requests */
         u64 vlan_xtract;     /* # of VLAN tag extractions */
         u64 vlan_insert;     /* # of VLAN tag insertions */
+        u64 tx_need_hdrroom; /* # of TX skbs in need of more header room */
 };
 
 struct sk_buff;
diff --git a/drivers/net/cxgb3/regs.h b/drivers/net/cxgb3/regs.h
index 5e1bc0dec5f1..6e12bf4bc6cf 100644
--- a/drivers/net/cxgb3/regs.h
+++ b/drivers/net/cxgb3/regs.h
@@ -1937,6 +1937,10 @@
 
 #define A_XGM_RXFIFO_CFG 0x884
 
+#define S_RXFIFO_EMPTY    31
+#define V_RXFIFO_EMPTY(x) ((x) << S_RXFIFO_EMPTY)
+#define F_RXFIFO_EMPTY    V_RXFIFO_EMPTY(1U)
+
 #define S_RXFIFOPAUSEHWM    17
 #define M_RXFIFOPAUSEHWM    0xfff
 
@@ -1961,6 +1965,10 @@
 
 #define A_XGM_TXFIFO_CFG 0x888
 
+#define S_UNDERUNFIX    22
+#define V_UNDERUNFIX(x) ((x) << S_UNDERUNFIX)
+#define F_UNDERUNFIX    V_UNDERUNFIX(1U)
+
 #define S_TXIPG    13
 #define M_TXIPG    0xff
 #define V_TXIPG(x) ((x) << S_TXIPG)
@@ -2034,10 +2042,27 @@
 #define V_XAUIIMP(x) ((x) << S_XAUIIMP)
 
 #define A_XGM_RX_MAX_PKT_SIZE 0x8a8
-#define A_XGM_RX_MAX_PKT_SIZE_ERR_CNT 0x9a4
+
+#define S_RXMAXFRAMERSIZE    17
+#define M_RXMAXFRAMERSIZE    0x3fff
+#define V_RXMAXFRAMERSIZE(x) ((x) << S_RXMAXFRAMERSIZE)
+#define G_RXMAXFRAMERSIZE(x) (((x) >> S_RXMAXFRAMERSIZE) & M_RXMAXFRAMERSIZE)
+
+#define S_RXENFRAMER    14
+#define V_RXENFRAMER(x) ((x) << S_RXENFRAMER)
+#define F_RXENFRAMER    V_RXENFRAMER(1U)
+
+#define S_RXMAXPKTSIZE    0
+#define M_RXMAXPKTSIZE    0x3fff
+#define V_RXMAXPKTSIZE(x) ((x) << S_RXMAXPKTSIZE)
+#define G_RXMAXPKTSIZE(x) (((x) >> S_RXMAXPKTSIZE) & M_RXMAXPKTSIZE)
 
 #define A_XGM_RESET_CTRL 0x8ac
 
+#define S_XGMAC_STOP_EN    4
+#define V_XGMAC_STOP_EN(x) ((x) << S_XGMAC_STOP_EN)
+#define F_XGMAC_STOP_EN    V_XGMAC_STOP_EN(1U)
+
 #define S_XG2G_RESET_    3
 #define V_XG2G_RESET_(x) ((x) << S_XG2G_RESET_)
 #define F_XG2G_RESET_    V_XG2G_RESET_(1U)
diff --git a/drivers/net/cxgb3/t3_hw.c b/drivers/net/cxgb3/t3_hw.c
index d4ee00d32219..522834c42ae7 100644
--- a/drivers/net/cxgb3/t3_hw.c
+++ b/drivers/net/cxgb3/t3_hw.c
@@ -447,8 +447,8 @@ static const struct adapter_info t3_adap_info[] = {
          &mi1_mdio_ops, "Chelsio T302"},
         {1, 0, 0, 0,
          F_GPIO1_OEN | F_GPIO6_OEN | F_GPIO7_OEN | F_GPIO10_OEN |
-         F_GPIO1_OUT_VAL | F_GPIO6_OUT_VAL | F_GPIO10_OUT_VAL, 0,
-         SUPPORTED_10000baseT_Full | SUPPORTED_AUI,
+         F_GPIO11_OEN | F_GPIO1_OUT_VAL | F_GPIO6_OUT_VAL | F_GPIO10_OUT_VAL,
+         0, SUPPORTED_10000baseT_Full | SUPPORTED_AUI,
          &mi1_mdio_ext_ops, "Chelsio T310"},
         {2, 0, 0, 0,
          F_GPIO1_OEN | F_GPIO2_OEN | F_GPIO4_OEN | F_GPIO5_OEN | F_GPIO6_OEN |
@@ -2613,7 +2613,7 @@ static void __devinit init_mtus(unsigned short mtus[])
          * it can accomodate max size TCP/IP headers when SACK and timestamps
          * are enabled and still have at least 8 bytes of payload.
          */
-        mtus[1] = 88;
+        mtus[0] = 88;
         mtus[1] = 88;
         mtus[2] = 256;
         mtus[3] = 512;
diff --git a/drivers/net/cxgb3/xgmac.c b/drivers/net/cxgb3/xgmac.c
index eeb766aeced9..efcf09a709cf 100644
--- a/drivers/net/cxgb3/xgmac.c
+++ b/drivers/net/cxgb3/xgmac.c
@@ -106,6 +106,7 @@ int t3_mac_reset(struct cmac *mac)
         t3_set_reg_field(adap, A_XGM_RXFIFO_CFG + oft,
                          F_RXSTRFRWRD | F_DISERRFRAMES,
                          uses_xaui(adap) ? 0 : F_RXSTRFRWRD);
+        t3_set_reg_field(adap, A_XGM_TXFIFO_CFG + oft, 0, F_UNDERUNFIX);
 
         if (uses_xaui(adap)) {
                 if (adap->params.rev == 0) {
@@ -124,7 +125,11 @@ int t3_mac_reset(struct cmac *mac)
                         xaui_serdes_reset(mac);
         }
 
-        val = F_MAC_RESET_;
+        t3_set_reg_field(adap, A_XGM_RX_MAX_PKT_SIZE + oft,
+                         V_RXMAXFRAMERSIZE(M_RXMAXFRAMERSIZE),
+                         V_RXMAXFRAMERSIZE(MAX_FRAME_SIZE) | F_RXENFRAMER);
+        val = F_MAC_RESET_ | F_XGMAC_STOP_EN;
+
         if (is_10G(adap))
                 val |= F_PCS_RESET_;
         else if (uses_xaui(adap))
@@ -313,8 +318,9 @@ static int rx_fifo_hwm(int mtu)
 
 int t3_mac_set_mtu(struct cmac *mac, unsigned int mtu)
 {
-        int hwm, lwm;
-        unsigned int thres, v;
+        int hwm, lwm, divisor;
+        int ipg;
+        unsigned int thres, v, reg;
         struct adapter *adap = mac->adapter;
 
         /*
@@ -335,27 +341,32 @@ int t3_mac_set_mtu(struct cmac *mac, unsigned int mtu)
         hwm = min(hwm, MAC_RXFIFO_SIZE - 8192);
         lwm = min(3 * (int)mtu, MAC_RXFIFO_SIZE / 4);
 
-        if (adap->params.rev == T3_REV_B2 &&
+        if (adap->params.rev >= T3_REV_B2 &&
             (t3_read_reg(adap, A_XGM_RX_CTRL + mac->offset) & F_RXEN)) {
                 disable_exact_filters(mac);
                 v = t3_read_reg(adap, A_XGM_RX_CFG + mac->offset);
                 t3_set_reg_field(adap, A_XGM_RX_CFG + mac->offset,
                                  F_ENHASHMCAST | F_COPYALLFRAMES, F_DISBCAST);
 
-                /* drain rx FIFO */
-                if (t3_wait_op_done(adap,
-                                    A_XGM_RX_MAX_PKT_SIZE_ERR_CNT +
-                                    mac->offset,
-                                    1 << 31, 1, 20, 5)) {
+                reg = adap->params.rev == T3_REV_B2 ?
+                        A_XGM_RX_MAX_PKT_SIZE_ERR_CNT : A_XGM_RXFIFO_CFG;
+
+                /* drain RX FIFO */
+                if (t3_wait_op_done(adap, reg + mac->offset,
+                                    F_RXFIFO_EMPTY, 1, 20, 5)) {
                         t3_write_reg(adap, A_XGM_RX_CFG + mac->offset, v);
                         enable_exact_filters(mac);
                         return -EIO;
                 }
-                t3_write_reg(adap, A_XGM_RX_MAX_PKT_SIZE + mac->offset, mtu);
+                t3_set_reg_field(adap, A_XGM_RX_MAX_PKT_SIZE + mac->offset,
+                                 V_RXMAXPKTSIZE(M_RXMAXPKTSIZE),
+                                 V_RXMAXPKTSIZE(mtu));
                 t3_write_reg(adap, A_XGM_RX_CFG + mac->offset, v);
                 enable_exact_filters(mac);
         } else
-                t3_write_reg(adap, A_XGM_RX_MAX_PKT_SIZE + mac->offset, mtu);
+                t3_set_reg_field(adap, A_XGM_RX_MAX_PKT_SIZE + mac->offset,
+                                 V_RXMAXPKTSIZE(M_RXMAXPKTSIZE),
+                                 V_RXMAXPKTSIZE(mtu));
 
         /*
          * Adjust the PAUSE frame watermarks.  We always set the LWM, and the
@@ -379,13 +390,16 @@ int t3_mac_set_mtu(struct cmac *mac, unsigned int mtu)
                 thres /= 10;
         thres = mtu > thres ? (mtu - thres + 7) / 8 : 0;
         thres = max(thres, 8U); /* need at least 8 */
+        ipg = (adap->params.rev == T3_REV_C) ? 0 : 1;
         t3_set_reg_field(adap, A_XGM_TXFIFO_CFG + mac->offset,
                          V_TXFIFOTHRESH(M_TXFIFOTHRESH) | V_TXIPG(M_TXIPG),
-                         V_TXFIFOTHRESH(thres) | V_TXIPG(1));
+                         V_TXFIFOTHRESH(thres) | V_TXIPG(ipg));
 
-        if (adap->params.rev > 0)
+        if (adap->params.rev > 0) {
+                divisor = (adap->params.rev == T3_REV_C) ? 64 : 8;
                 t3_write_reg(adap, A_XGM_PAUSE_TIMER + mac->offset,
-                             (hwm - lwm) * 4 / 8);
+                             (hwm - lwm) * 4 / divisor);
+        }
         t3_write_reg(adap, A_XGM_TX_PAUSE_QUANTA + mac->offset,
                      MAC_RXFIFO_SIZE * 4 * 8 / 512);
         return 0;
@@ -522,7 +536,7 @@ int t3b2_mac_watchdog_task(struct cmac *mac)
                 goto rxcheck;
         }
 
-        if ((tx_tcnt != mac->tx_tcnt) && (mac->tx_xcnt == 0))  {
+        if ((tx_tcnt != mac->tx_tcnt) && (mac->tx_xcnt == 0)) {
                 if (mac->toggle_cnt > 4) {
                         status = 2;
                         goto out;
diff --git a/drivers/net/e100.c b/drivers/net/e100.c
index 3dbaec680b46..e1c8a0d023ea 100644
--- a/drivers/net/e100.c
+++ b/drivers/net/e100.c
@@ -2214,13 +2214,11 @@ static void e100_get_drvinfo(struct net_device *netdev,
         strcpy(info->bus_info, pci_name(nic->pdev));
 }
 
+#define E100_PHY_REGS 0x1C
 static int e100_get_regs_len(struct net_device *netdev)
 {
         struct nic *nic = netdev_priv(netdev);
-#define E100_PHY_REGS           0x1C
-#define E100_REGS_LEN           1 + E100_PHY_REGS + \
-        sizeof(nic->mem->dump_buf) / sizeof(u32)
-        return E100_REGS_LEN * sizeof(u32);
+        return 1 + E100_PHY_REGS + sizeof(nic->mem->dump_buf);
 }
 
 static void e100_get_regs(struct net_device *netdev,
diff --git a/drivers/net/e1000/e1000_ethtool.c b/drivers/net/e1000/e1000_ethtool.c
index 667f18bcc172..b83ccce8a9b7 100644
--- a/drivers/net/e1000/e1000_ethtool.c
+++ b/drivers/net/e1000/e1000_ethtool.c
@@ -1923,7 +1923,7 @@ e1000_get_strings(struct net_device *netdev, uint32_t stringset, uint8_t *data)
         switch (stringset) {
         case ETH_SS_TEST:
                 memcpy(data, *e1000_gstrings_test,
-                        E1000_TEST_LEN*ETH_GSTRING_LEN);
+                        sizeof(e1000_gstrings_test));
                 break;
         case ETH_SS_STATS:
                 for (i = 0; i < E1000_GLOBAL_STATS_LEN; i++) {
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index cf39473ef90a..4f37506ad374 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -3942,7 +3942,7 @@ e1000_clean(struct napi_struct *napi, int budget)
                           &work_done, budget);
 
         /* If no Tx and not enough Rx work done, exit the polling mode */
-        if ((!tx_cleaned && (work_done < budget)) ||
+        if ((!tx_cleaned && (work_done == 0)) ||
            !netif_running(poll_dev)) {
 quit_polling:
                 if (likely(adapter->itr_setting & 3))
diff --git a/drivers/net/e1000e/ethtool.c b/drivers/net/e1000e/ethtool.c
index 6a39784e7ee2..87f9da1b6b4e 100644
--- a/drivers/net/e1000e/ethtool.c
+++ b/drivers/net/e1000e/ethtool.c
@@ -1739,7 +1739,7 @@ static void e1000_get_strings(struct net_device *netdev, u32 stringset,
         switch (stringset) {
         case ETH_SS_TEST:
                 memcpy(data, *e1000_gstrings_test,
-                        E1000_TEST_LEN*ETH_GSTRING_LEN);
+                        sizeof(e1000_gstrings_test));
                 break;
         case ETH_SS_STATS:
                 for (i = 0; i < E1000_GLOBAL_STATS_LEN; i++) {
diff --git a/drivers/net/ehea/ehea.h b/drivers/net/ehea/ehea.h
index f78e5bf7cb33..5f82a4647eee 100644
--- a/drivers/net/ehea/ehea.h
+++ b/drivers/net/ehea/ehea.h
@@ -40,7 +40,7 @@
 #include <asm/io.h>
 
 #define DRV_NAME        "ehea"
-#define DRV_VERSION     "EHEA_0080"
+#define DRV_VERSION     "EHEA_0083"
 
 /* eHEA capability flags */
 #define DLPAR_PORT_ADD_REM 1
diff --git a/drivers/net/ehea/ehea_main.c b/drivers/net/ehea/ehea_main.c
index f0319f1e8e05..869e1604b16e 100644
--- a/drivers/net/ehea/ehea_main.c
+++ b/drivers/net/ehea/ehea_main.c
@@ -136,7 +136,7 @@ static struct net_device_stats *ehea_get_stats(struct net_device *dev)
         struct ehea_port *port = netdev_priv(dev);
         struct net_device_stats *stats = &port->stats;
         struct hcp_ehea_port_cb2 *cb2;
-        u64 hret, rx_packets;
+        u64 hret, rx_packets, tx_packets;
         int i;
 
         memset(stats, 0, sizeof(*stats));
@@ -162,7 +162,11 @@ static struct net_device_stats *ehea_get_stats(struct net_device *dev)
         for (i = 0; i < port->num_def_qps; i++)
                 rx_packets += port->port_res[i].rx_packets;
 
-        stats->tx_packets = cb2->txucp + cb2->txmcp + cb2->txbcp;
+        tx_packets = 0;
+        for (i = 0; i < port->num_def_qps + port->num_add_tx_qps; i++)
+                tx_packets += port->port_res[i].tx_packets;
+
+        stats->tx_packets = tx_packets;
         stats->multicast = cb2->rxmcp;
         stats->rx_errors = cb2->rxuerr;
         stats->rx_bytes = cb2->rxo;
@@ -406,11 +410,6 @@ static int ehea_treat_poll_error(struct ehea_port_res *pr, int rq,
         if (cqe->status & EHEA_CQE_STAT_ERR_CRC)
                 pr->p_stats.err_frame_crc++;
 
-        if (netif_msg_rx_err(pr->port)) {
-                ehea_error("CQE Error for QP %d", pr->qp->init_attr.qp_nr);
-                ehea_dump(cqe, sizeof(*cqe), "CQE");
-        }
-
         if (rq == 2) {
                 *processed_rq2 += 1;
                 skb = get_skb_by_index(pr->rq2_skba.arr, pr->rq2_skba.len, cqe);
@@ -422,7 +421,11 @@ static int ehea_treat_poll_error(struct ehea_port_res *pr, int rq,
         }
 
         if (cqe->status & EHEA_CQE_STAT_FAT_ERR_MASK) {
-                ehea_error("Critical receive error. Resetting port.");
+                if (netif_msg_rx_err(pr->port)) {
+                        ehea_error("Critical receive error for QP %d. "
+                                   "Resetting port.", pr->qp->init_attr.qp_nr);
+                        ehea_dump(cqe, sizeof(*cqe), "CQE");
+                }
                 schedule_work(&pr->port->reset_task);
                 return 1;
         }
@@ -2000,6 +2003,7 @@ static int ehea_start_xmit(struct sk_buff *skb, struct net_device *dev)
         }
 
         ehea_post_swqe(pr->qp, swqe);
+        pr->tx_packets++;
 
         if (unlikely(atomic_read(&pr->swqe_avail) <= 1)) {
                 spin_lock_irqsave(&pr->netif_queue, flags);
diff --git a/drivers/net/ehea/ehea_qmr.h b/drivers/net/ehea/ehea_qmr.h
index 562de0ebdd85..bc62d389c166 100644
--- a/drivers/net/ehea/ehea_qmr.h
+++ b/drivers/net/ehea/ehea_qmr.h
@@ -145,8 +145,8 @@ struct ehea_rwqe {
 #define EHEA_CQE_VLAN_TAG_XTRACT   0x0400
 
 #define EHEA_CQE_TYPE_RQ           0x60
-#define EHEA_CQE_STAT_ERR_MASK     0x720F
-#define EHEA_CQE_STAT_FAT_ERR_MASK 0x1F
+#define EHEA_CQE_STAT_ERR_MASK     0x700F
+#define EHEA_CQE_STAT_FAT_ERR_MASK 0xF
 #define EHEA_CQE_STAT_ERR_TCP      0x4000
 #define EHEA_CQE_STAT_ERR_IP       0x2000
 #define EHEA_CQE_STAT_ERR_CRC      0x1000
diff --git a/drivers/net/fec_mpc52xx.c b/drivers/net/fec_mpc52xx.c
index a8a0ee220da6..79f7eade4773 100644
--- a/drivers/net/fec_mpc52xx.c
+++ b/drivers/net/fec_mpc52xx.c
@@ -422,7 +422,7 @@ static irqreturn_t mpc52xx_fec_rx_interrupt(int irq, void *dev_id)
 
                 rskb = bcom_retrieve_buffer(priv->rx_dmatsk, &status,
                                 (struct bcom_bd **)&bd);
-                dma_unmap_single(&dev->dev, bd->skb_pa, skb->len, DMA_FROM_DEVICE);
+                dma_unmap_single(&dev->dev, bd->skb_pa, rskb->len, DMA_FROM_DEVICE);
 
                 /* Test for errors in received frame */
                 if (status & BCOM_FEC_RX_BD_ERRORS) {
@@ -467,7 +467,7 @@ static irqreturn_t mpc52xx_fec_rx_interrupt(int irq, void *dev_id)
                         bcom_prepare_next_buffer(priv->rx_dmatsk);
 
                 bd->status = FEC_RX_BUFFER_SIZE;
-                bd->skb_pa = dma_map_single(&dev->dev, rskb->data,
+                bd->skb_pa = dma_map_single(&dev->dev, skb->data,
                                 FEC_RX_BUFFER_SIZE, DMA_FROM_DEVICE);
 
                 bcom_submit_next_buffer(priv->rx_dmatsk, skb);
@@ -971,6 +971,8 @@ mpc52xx_fec_probe(struct of_device *op, const struct of_device_id *match)
 
         mpc52xx_fec_reset_stats(ndev);
 
+        SET_NETDEV_DEV(ndev, &op->dev);
+
         /* Register the new network device */
         rv = register_netdev(ndev);
         if (rv < 0)
diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c
index 92ce2e38f0d5..a96583cceb5e 100644
--- a/drivers/net/forcedeth.c
+++ b/drivers/net/forcedeth.c
@@ -5286,19 +5286,15 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i
                 if (readl(base + NvRegTransmitterControl) & NVREG_XMITCTL_SYNC_PHY_INIT) {
                         np->mac_in_use = readl(base + NvRegTransmitterControl) & NVREG_XMITCTL_MGMT_ST;
                         dprintk(KERN_INFO "%s: mgmt unit is running. mac in use %x.\n", pci_name(pci_dev), np->mac_in_use);
-                        for (i = 0; i < 5000; i++) {
-                                msleep(1);
-                                if (nv_mgmt_acquire_sema(dev)) {
-                                        /* management unit setup the phy already? */
-                                        if ((readl(base + NvRegTransmitterControl) & NVREG_XMITCTL_SYNC_MASK) ==
-                                            NVREG_XMITCTL_SYNC_PHY_INIT) {
-                                                /* phy is inited by mgmt unit */
-                                                phyinitialized = 1;
-                                                dprintk(KERN_INFO "%s: Phy already initialized by mgmt unit.\n", pci_name(pci_dev));
-                                        } else {
-                                                /* we need to init the phy */
-                                        }
-                                        break;
+                        if (nv_mgmt_acquire_sema(dev)) {
+                                /* management unit setup the phy already? */
+                                if ((readl(base + NvRegTransmitterControl) & NVREG_XMITCTL_SYNC_MASK) ==
+                                    NVREG_XMITCTL_SYNC_PHY_INIT) {
+                                        /* phy is inited by mgmt unit */
+                                        phyinitialized = 1;
+                                        dprintk(KERN_INFO "%s: Phy already initialized by mgmt unit.\n", pci_name(pci_dev));
+                                } else {
+                                        /* we need to init the phy */
                                 }
                         }
                 }
@@ -5613,6 +5609,22 @@ static struct pci_device_id pci_tbl[] = {
                 PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_35),
                 .driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_MSI|DEV_HAS_POWER_CNTRL|DEV_HAS_PAUSEFRAME_TX|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT,
         },
+        {       /* MCP79 Ethernet Controller */
+                PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_36),
+                .driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_MSI|DEV_HAS_POWER_CNTRL|DEV_HAS_PAUSEFRAME_TX|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT,
+        },
+        {       /* MCP79 Ethernet Controller */
+                PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_37),
+                .driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_MSI|DEV_HAS_POWER_CNTRL|DEV_HAS_PAUSEFRAME_TX|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT,
+        },
+        {       /* MCP79 Ethernet Controller */
+                PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_38),
+                .driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_MSI|DEV_HAS_POWER_CNTRL|DEV_HAS_PAUSEFRAME_TX|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT,
+        },
+        {       /* MCP79 Ethernet Controller */
+                PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_39),
+                .driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_MSI|DEV_HAS_POWER_CNTRL|DEV_HAS_PAUSEFRAME_TX|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT,
+        },
         {0,},
 };
 
diff --git a/drivers/net/fs_enet/mac-scc.c b/drivers/net/fs_enet/mac-scc.c
index 03134f47a4eb..48f2f3005935 100644
--- a/drivers/net/fs_enet/mac-scc.c
+++ b/drivers/net/fs_enet/mac-scc.c
@@ -158,7 +158,7 @@ static int setup_data(struct net_device *dev)
 {
         struct fs_enet_private *fep = netdev_priv(dev);
 
-#ifdef CONFIG_PPC_CPM_NEW_BINDING
+#ifndef CONFIG_PPC_CPM_NEW_BINDING
         struct fs_platform_info *fpi = fep->fpi;
 
         fep->scc.idx = fs_get_scc_index(fpi->fs_no);
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c
index 38268d7335a8..0431e9ed0fac 100644
--- a/drivers/net/gianfar.c
+++ b/drivers/net/gianfar.c
@@ -696,7 +696,7 @@ int startup_gfar(struct net_device *dev)
 {
         struct txbd8 *txbdp;
         struct rxbd8 *rxbdp;
-        dma_addr_t addr;
+        dma_addr_t addr = 0;
         unsigned long vaddr;
         int i;
         struct gfar_private *priv = netdev_priv(dev);
diff --git a/drivers/net/ibm_newemac/core.c b/drivers/net/ibm_newemac/core.c
index 0de3aa2a2e44..cb06280dced5 100644
--- a/drivers/net/ibm_newemac/core.c
+++ b/drivers/net/ibm_newemac/core.c
@@ -3,6 +3,11 @@
  *
  * Driver for PowerPC 4xx on-chip ethernet controller.
  *
+ * Copyright 2007 Benjamin Herrenschmidt, IBM Corp.
+ *                <benh@kernel.crashing.org>
+ *
+ * Based on the arch/ppc version of the driver:
+ *
  * Copyright (c) 2004, 2005 Zultys Technologies.
  * Eugene Surovegin <eugene.surovegin@zultys.com> or <ebs@ebshome.net>
  *
@@ -402,7 +407,7 @@ static u32 __emac_calc_base_mr1(struct emac_instance *dev, int tx_size, int rx_s
 static u32 __emac4_calc_base_mr1(struct emac_instance *dev, int tx_size, int rx_size)
 {
         u32 ret = EMAC_MR1_VLE | EMAC_MR1_IST | EMAC4_MR1_TR |
-                EMAC4_MR1_OBCI(dev->opb_bus_freq);
+                EMAC4_MR1_OBCI(dev->opb_bus_freq / 1000000);
 
         DBG2(dev, "__emac4_calc_base_mr1" NL);
 
@@ -464,26 +469,34 @@ static int emac_configure(struct emac_instance *dev)
 {
         struct emac_regs __iomem *p = dev->emacp;
         struct net_device *ndev = dev->ndev;
-        int tx_size, rx_size;
+        int tx_size, rx_size, link = netif_carrier_ok(dev->ndev);
         u32 r, mr1 = 0;
 
         DBG(dev, "configure" NL);
 
-        if (emac_reset(dev) < 0)
+        if (!link) {
+                out_be32(&p->mr1, in_be32(&p->mr1)
+                         | EMAC_MR1_FDE | EMAC_MR1_ILE);
+                udelay(100);
+        } else if (emac_reset(dev) < 0)
                 return -ETIMEDOUT;
 
         if (emac_has_feature(dev, EMAC_FTR_HAS_TAH))
                 tah_reset(dev->tah_dev);
 
-        DBG(dev, " duplex = %d, pause = %d, asym_pause = %d\n",
-            dev->phy.duplex, dev->phy.pause, dev->phy.asym_pause);
+        DBG(dev, " link = %d duplex = %d, pause = %d, asym_pause = %d\n",
+            link, dev->phy.duplex, dev->phy.pause, dev->phy.asym_pause);
 
         /* Default fifo sizes */
         tx_size = dev->tx_fifo_size;
         rx_size = dev->rx_fifo_size;
 
+        /* No link, force loopback */
+        if (!link)
+                mr1 = EMAC_MR1_FDE | EMAC_MR1_ILE;
+
         /* Check for full duplex */
-        if (dev->phy.duplex == DUPLEX_FULL)
+        else if (dev->phy.duplex == DUPLEX_FULL)
                 mr1 |= EMAC_MR1_FDE | EMAC_MR1_MWSW_001;
 
         /* Adjust fifo sizes, mr1 and timeouts based on link speed */
@@ -642,9 +655,11 @@ static void emac_reset_work(struct work_struct *work)
         DBG(dev, "reset_work" NL);
 
         mutex_lock(&dev->link_lock);
-        emac_netif_stop(dev);
-        emac_full_tx_reset(dev);
-        emac_netif_start(dev);
+        if (dev->opened) {
+                emac_netif_stop(dev);
+                emac_full_tx_reset(dev);
+                emac_netif_start(dev);
+        }
         mutex_unlock(&dev->link_lock);
 }
 
@@ -701,7 +716,7 @@ static int __emac_mdio_read(struct emac_instance *dev, u8 id, u8 reg)
                 r = EMAC_STACR_BASE(dev->opb_bus_freq);
         if (emac_has_feature(dev, EMAC_FTR_STACR_OC_INVERT))
                 r |= EMAC_STACR_OC;
-        if (emac_has_feature(dev, EMAC_FTR_HAS_AXON_STACR))
+        if (emac_has_feature(dev, EMAC_FTR_HAS_NEW_STACR))
                 r |= EMACX_STACR_STAC_READ;
         else
                 r |= EMAC_STACR_STAC_READ;
@@ -773,7 +788,7 @@ static void __emac_mdio_write(struct emac_instance *dev, u8 id, u8 reg,
                 r = EMAC_STACR_BASE(dev->opb_bus_freq);
         if (emac_has_feature(dev, EMAC_FTR_STACR_OC_INVERT))
                 r |= EMAC_STACR_OC;
-        if (emac_has_feature(dev, EMAC_FTR_HAS_AXON_STACR))
+        if (emac_has_feature(dev, EMAC_FTR_HAS_NEW_STACR))
                 r |= EMACX_STACR_STAC_WRITE;
         else
                 r |= EMAC_STACR_STAC_WRITE;
@@ -1063,10 +1078,9 @@ static int emac_open(struct net_device *ndev)
         dev->rx_sg_skb = NULL;
 
         mutex_lock(&dev->link_lock);
+        dev->opened = 1;
 
-        /* XXX Start PHY polling now. Shouldn't wr do like sungem instead and
-         * always poll the PHY even when the iface is down ? That would allow
-         * things like laptop-net to work. --BenH
+        /* Start PHY polling now.
          */
         if (dev->phy.address >= 0) {
                 int link_poll_interval;
@@ -1145,9 +1159,11 @@ static void emac_link_timer(struct work_struct *work)
         int link_poll_interval;
 
         mutex_lock(&dev->link_lock);
-
         DBG2(dev, "link timer" NL);
 
+        if (!dev->opened)
+                goto bail;
+
         if (dev->phy.def->ops->poll_link(&dev->phy)) {
                 if (!netif_carrier_ok(dev->ndev)) {
                         /* Get new link parameters */
@@ -1162,21 +1178,22 @@ static void emac_link_timer(struct work_struct *work)
                 link_poll_interval = PHY_POLL_LINK_ON;
         } else {
                 if (netif_carrier_ok(dev->ndev)) {
-                        emac_reinitialize(dev);
                         netif_carrier_off(dev->ndev);
                         netif_tx_disable(dev->ndev);
+                        emac_reinitialize(dev);
                         emac_print_link_status(dev);
                 }
                 link_poll_interval = PHY_POLL_LINK_OFF;
         }
         schedule_delayed_work(&dev->link_work, link_poll_interval);
-
+ bail:
         mutex_unlock(&dev->link_lock);
 }
 
 static void emac_force_link_update(struct emac_instance *dev)
 {
         netif_carrier_off(dev->ndev);
+        smp_rmb();
         if (dev->link_polling) {
                 cancel_rearming_delayed_work(&dev->link_work);
                 if (dev->link_polling)
@@ -1191,11 +1208,14 @@ static int emac_close(struct net_device *ndev)
 
         DBG(dev, "close" NL);
 
-        if (dev->phy.address >= 0)
+        if (dev->phy.address >= 0) {
+                dev->link_polling = 0;
                 cancel_rearming_delayed_work(&dev->link_work);
-
+        }
+        mutex_lock(&dev->link_lock);
         emac_netif_stop(dev);
-        flush_scheduled_work();
+        dev->opened = 0;
+        mutex_unlock(&dev->link_lock);
 
         emac_rx_disable(dev);
         emac_tx_disable(dev);
@@ -2427,7 +2447,7 @@ static int __devinit emac_init_config(struct emac_instance *dev)
         if (emac_read_uint_prop(np, "tah-device", &dev->tah_ph, 0))
                 dev->tah_ph = 0;
         if (emac_read_uint_prop(np, "tah-channel", &dev->tah_port, 0))
-                dev->tah_ph = 0;
+                dev->tah_port = 0;
         if (emac_read_uint_prop(np, "mdio-device", &dev->mdio_ph, 0))
                 dev->mdio_ph = 0;
         if (emac_read_uint_prop(np, "zmii-device", &dev->zmii_ph, 0))
@@ -2465,16 +2485,19 @@ static int __devinit emac_init_config(struct emac_instance *dev)
         /* Check EMAC version */
         if (of_device_is_compatible(np, "ibm,emac4"))
                 dev->features |= EMAC_FTR_EMAC4;
-        if (of_device_is_compatible(np, "ibm,emac-axon")
-            || of_device_is_compatible(np, "ibm,emac-440epx"))
-                dev->features |= EMAC_FTR_HAS_AXON_STACR
-                        | EMAC_FTR_STACR_OC_INVERT;
-        if (of_device_is_compatible(np, "ibm,emac-440spe"))
+
+        /* Fixup some feature bits based on the device tree */
+        if (of_get_property(np, "has-inverted-stacr-oc", NULL))
                 dev->features |= EMAC_FTR_STACR_OC_INVERT;
+        if (of_get_property(np, "has-new-stacr-staopc", NULL))
+                dev->features |= EMAC_FTR_HAS_NEW_STACR;
 
-        /* Fixup some feature bits based on the device tree and verify
-         * we have support for them compiled in
-         */
+        /* CAB lacks the appropriate properties */
+        if (of_device_is_compatible(np, "ibm,emac-axon"))
+                dev->features |= EMAC_FTR_HAS_NEW_STACR |
+                        EMAC_FTR_STACR_OC_INVERT;
+
+        /* Enable TAH/ZMII/RGMII features as found */
         if (dev->tah_ph != 0) {
 #ifdef CONFIG_IBM_NEW_EMAC_TAH
                 dev->features |= EMAC_FTR_HAS_TAH;
@@ -2532,6 +2555,10 @@ static int __devinit emac_probe(struct of_device *ofdev,
         struct device_node **blist = NULL;
         int err, i;
 
+        /* Skip unused/unwired EMACS */
+        if (of_get_property(np, "unused", NULL))
+                return -ENODEV;
+
         /* Find ourselves in the bootlist if we are there */
         for (i = 0; i < EMAC_BOOT_LIST_SIZE; i++)
                 if (emac_boot_list[i] == np)
@@ -2756,6 +2783,8 @@ static int __devexit emac_remove(struct of_device *ofdev)
 
         unregister_netdev(dev->ndev);
 
+        flush_scheduled_work();
+
         if (emac_has_feature(dev, EMAC_FTR_HAS_TAH))
                 tah_detach(dev->tah_dev, dev->tah_port);
         if (emac_has_feature(dev, EMAC_FTR_HAS_RGMII))
diff --git a/drivers/net/ibm_newemac/core.h b/drivers/net/ibm_newemac/core.h
index 4011803117ca..4e74d8287c65 100644
--- a/drivers/net/ibm_newemac/core.h
+++ b/drivers/net/ibm_newemac/core.h
@@ -3,6 +3,11 @@
  *
  * Driver for PowerPC 4xx on-chip ethernet controller.
  *
+ * Copyright 2007 Benjamin Herrenschmidt, IBM Corp.
+ *                <benh@kernel.crashing.org>
+ *
+ * Based on the arch/ppc version of the driver:
+ *
  * Copyright (c) 2004, 2005 Zultys Technologies.
  * Eugene Surovegin <eugene.surovegin@zultys.com> or <ebs@ebshome.net>
  *
@@ -258,6 +263,7 @@ struct emac_instance {
         int                             stop_timeout;   /* in us */
         int                             no_mcast;
         int                             mcast_pending;
+        int                             opened;
         struct work_struct              reset_work;
         spinlock_t                      lock;
 };
@@ -292,9 +298,9 @@ struct emac_instance {
  */
 #define EMAC_FTR_HAS_RGMII              0x00000020
 /*
- * Set if we have axon-type STACR
+ * Set if we have new type STACR with STAOPC
  */
-#define EMAC_FTR_HAS_AXON_STACR         0x00000040
+#define EMAC_FTR_HAS_NEW_STACR          0x00000040
 
 
 /* Right now, we don't quite handle the always/possible masks on the
@@ -306,7 +312,7 @@ enum {
 
         EMAC_FTRS_POSSIBLE      =
 #ifdef CONFIG_IBM_NEW_EMAC_EMAC4
-            EMAC_FTR_EMAC4      | EMAC_FTR_HAS_AXON_STACR       |
+            EMAC_FTR_EMAC4      | EMAC_FTR_HAS_NEW_STACR        |
             EMAC_FTR_STACR_OC_INVERT    |
 #endif
 #ifdef CONFIG_IBM_NEW_EMAC_TAH
diff --git a/drivers/net/ibm_newemac/debug.c b/drivers/net/ibm_newemac/debug.c
index 170524ee0f19..a2fc660ca5d4 100644
--- a/drivers/net/ibm_newemac/debug.c
+++ b/drivers/net/ibm_newemac/debug.c
@@ -3,6 +3,11 @@
  *
  * Driver for PowerPC 4xx on-chip ethernet controller, debug print routines.
  *
+ * Copyright 2007 Benjamin Herrenschmidt, IBM Corp.
+ *                <benh@kernel.crashing.org>
+ *
+ * Based on the arch/ppc version of the driver:
+ *
  * Copyright (c) 2004, 2005 Zultys Technologies
  * Eugene Surovegin <eugene.surovegin@zultys.com> or <ebs@ebshome.net>
  *
diff --git a/drivers/net/ibm_newemac/debug.h b/drivers/net/ibm_newemac/debug.h
index 1dd2dcbc157f..b631842ec8d0 100644
--- a/drivers/net/ibm_newemac/debug.h
+++ b/drivers/net/ibm_newemac/debug.h
@@ -3,6 +3,11 @@
  *
  * Driver for PowerPC 4xx on-chip ethernet controller, debug print routines.
  *
+ * Copyright 2007 Benjamin Herrenschmidt, IBM Corp.
+ *                <benh@kernel.crashing.org>
+ *
+ * Based on the arch/ppc version of the driver:
+ *
  * Copyright (c) 2004, 2005 Zultys Technologies
  * Eugene Surovegin <eugene.surovegin@zultys.com> or <ebs@ebshome.net>
  *
diff --git a/drivers/net/ibm_newemac/emac.h b/drivers/net/ibm_newemac/emac.h
index bef92efeeadc..91cb096ab405 100644
--- a/drivers/net/ibm_newemac/emac.h
+++ b/drivers/net/ibm_newemac/emac.h
@@ -3,6 +3,11 @@
  *
  * Register definitions for PowerPC 4xx on-chip ethernet contoller
  *
+ * Copyright 2007 Benjamin Herrenschmidt, IBM Corp.
+ *                <benh@kernel.crashing.org>
+ *
+ * Based on the arch/ppc version of the driver:
+ *
  * Copyright (c) 2004, 2005 Zultys Technologies.
  * Eugene Surovegin <eugene.surovegin@zultys.com> or <ebs@ebshome.net>
  *
diff --git a/drivers/net/ibm_newemac/mal.c b/drivers/net/ibm_newemac/mal.c
index 9a88f71db004..6869f08c9dcb 100644
--- a/drivers/net/ibm_newemac/mal.c
+++ b/drivers/net/ibm_newemac/mal.c
@@ -3,6 +3,11 @@
  *
  * Memory Access Layer (MAL) support
  *
+ * Copyright 2007 Benjamin Herrenschmidt, IBM Corp.
+ *                <benh@kernel.crashing.org>
+ *
+ * Based on the arch/ppc version of the driver:
+ *
  * Copyright (c) 2004, 2005 Zultys Technologies.
  * Eugene Surovegin <eugene.surovegin@zultys.com> or <ebs@ebshome.net>
  *
diff --git a/drivers/net/ibm_newemac/mal.h b/drivers/net/ibm_newemac/mal.h
index 784edb8ea822..eaa7262dc079 100644
--- a/drivers/net/ibm_newemac/mal.h
+++ b/drivers/net/ibm_newemac/mal.h
@@ -3,6 +3,11 @@
  *
  * Memory Access Layer (MAL) support
  *
+ * Copyright 2007 Benjamin Herrenschmidt, IBM Corp.
+ *                <benh@kernel.crashing.org>
+ *
+ * Based on the arch/ppc version of the driver:
+ *
  * Copyright (c) 2004, 2005 Zultys Technologies.
  * Eugene Surovegin <eugene.surovegin@zultys.com> or <ebs@ebshome.net>
  *
diff --git a/drivers/net/ibm_newemac/phy.c b/drivers/net/ibm_newemac/phy.c
index aa1f0ddf1e3e..37bfeea8788a 100644
--- a/drivers/net/ibm_newemac/phy.c
+++ b/drivers/net/ibm_newemac/phy.c
@@ -8,6 +8,11 @@
  * This file should be shared with other drivers or eventually
  * merged as the "low level" part of miilib
  *
+ * Copyright 2007 Benjamin Herrenschmidt, IBM Corp.
+ *                <benh@kernel.crashing.org>
+ *
+ * Based on the arch/ppc version of the driver:
+ *
  * (c) 2003, Benjamin Herrenscmidt (benh@kernel.crashing.org)
  * (c) 2004-2005, Eugene Surovegin <ebs@ebshome.net>
  *
@@ -306,8 +311,84 @@ static struct mii_phy_def cis8201_phy_def = {
         .ops            = &cis8201_phy_ops
 };
 
+static struct mii_phy_def bcm5248_phy_def = {
+
+        .phy_id         = 0x0143bc00,
+        .phy_id_mask    = 0x0ffffff0,
+        .name           = "BCM5248 10/100 SMII Ethernet",
+        .ops            = &generic_phy_ops
+};
+
+static int m88e1111_init(struct mii_phy *phy)
+{
+        pr_debug("%s: Marvell 88E1111 Ethernet\n", __FUNCTION__);
+        phy_write(phy, 0x14, 0x0ce3);
+        phy_write(phy, 0x18, 0x4101);
+        phy_write(phy, 0x09, 0x0e00);
+        phy_write(phy, 0x04, 0x01e1);
+        phy_write(phy, 0x00, 0x9140);
+        phy_write(phy, 0x00, 0x1140);
+
+        return  0;
+}
+
+static int et1011c_init(struct mii_phy *phy)
+{
+        u16 reg_short;
+
+        reg_short = (u16)(phy_read(phy, 0x16));
+        reg_short &= ~(0x7);
+        reg_short |= 0x6;       /* RGMII Trace Delay*/
+        phy_write(phy, 0x16, reg_short);
+
+        reg_short = (u16)(phy_read(phy, 0x17));
+        reg_short &= ~(0x40);
+        phy_write(phy, 0x17, reg_short);
+
+        phy_write(phy, 0x1c, 0x74f0);
+        return 0;
+}
+
+static struct mii_phy_ops et1011c_phy_ops = {
+        .init           = et1011c_init,
+        .setup_aneg     = genmii_setup_aneg,
+        .setup_forced   = genmii_setup_forced,
+        .poll_link      = genmii_poll_link,
+        .read_link      = genmii_read_link
+};
+
+static struct mii_phy_def et1011c_phy_def = {
+        .phy_id         = 0x0282f000,
+        .phy_id_mask    = 0x0fffff00,
+        .name           = "ET1011C Gigabit Ethernet",
+        .ops            = &et1011c_phy_ops
+};
+
+
+
+
+
+static struct mii_phy_ops m88e1111_phy_ops = {
+        .init           = m88e1111_init,
+        .setup_aneg     = genmii_setup_aneg,
+        .setup_forced   = genmii_setup_forced,
+        .poll_link      = genmii_poll_link,
+        .read_link      = genmii_read_link
+};
+
+static struct mii_phy_def m88e1111_phy_def = {
+
+        .phy_id         = 0x01410CC0,
+        .phy_id_mask    = 0x0ffffff0,
+        .name           = "Marvell 88E1111 Ethernet",
+        .ops            = &m88e1111_phy_ops,
+};
+
 static struct mii_phy_def *mii_phy_table[] = {
+        &et1011c_phy_def,
         &cis8201_phy_def,
+        &bcm5248_phy_def,
+        &m88e1111_phy_def,
         &genmii_phy_def,
         NULL
 };
diff --git a/drivers/net/ibm_newemac/phy.h b/drivers/net/ibm_newemac/phy.h
index 6feca26afedb..1b65c81f6557 100644
--- a/drivers/net/ibm_newemac/phy.h
+++ b/drivers/net/ibm_newemac/phy.h
@@ -3,6 +3,11 @@
  *
  * Driver for PowerPC 4xx on-chip ethernet controller, PHY support
  *
+ * Copyright 2007 Benjamin Herrenschmidt, IBM Corp.
+ *                <benh@kernel.crashing.org>
+ *
+ * Based on the arch/ppc version of the driver:
+ *
  * Benjamin Herrenschmidt <benh@kernel.crashing.org>
  * February 2003
  *
diff --git a/drivers/net/ibm_newemac/rgmii.c b/drivers/net/ibm_newemac/rgmii.c
index de416951a435..9bc1132fa788 100644
--- a/drivers/net/ibm_newemac/rgmii.c
+++ b/drivers/net/ibm_newemac/rgmii.c
@@ -3,6 +3,11 @@
  *
  * Driver for PowerPC 4xx on-chip ethernet controller, RGMII bridge support.
  *
+ * Copyright 2007 Benjamin Herrenschmidt, IBM Corp.
+ *                <benh@kernel.crashing.org>
+ *
+ * Based on the arch/ppc version of the driver:
+ *
  * Copyright (c) 2004, 2005 Zultys Technologies.
  * Eugene Surovegin <eugene.surovegin@zultys.com> or <ebs@ebshome.net>
  *
@@ -140,7 +145,7 @@ void rgmii_get_mdio(struct of_device *ofdev, int input)
 
         RGMII_DBG2(dev, "get_mdio(%d)" NL, input);
 
-        if (dev->type != RGMII_AXON)
+        if (!(dev->flags & EMAC_RGMII_FLAG_HAS_MDIO))
                 return;
 
         mutex_lock(&dev->lock);
@@ -161,7 +166,7 @@ void rgmii_put_mdio(struct of_device *ofdev, int input)
 
         RGMII_DBG2(dev, "put_mdio(%d)" NL, input);
 
-        if (dev->type != RGMII_AXON)
+        if (!(dev->flags & EMAC_RGMII_FLAG_HAS_MDIO))
                 return;
 
         fer = in_be32(&p->fer);
@@ -250,11 +255,13 @@ static int __devinit rgmii_probe(struct of_device *ofdev,
                 goto err_free;
         }
 
-        /* Check for RGMII type */
+        /* Check for RGMII flags */
+        if (of_get_property(ofdev->node, "has-mdio", NULL))
+                dev->flags |= EMAC_RGMII_FLAG_HAS_MDIO;
+
+        /* CAB lacks the right properties, fix this up */
         if (of_device_is_compatible(ofdev->node, "ibm,rgmii-axon"))
-                dev->type = RGMII_AXON;
-        else
-                dev->type = RGMII_STANDARD;
+                dev->flags |= EMAC_RGMII_FLAG_HAS_MDIO;
 
         DBG2(dev, " Boot FER = 0x%08x, SSR = 0x%08x\n",
              in_be32(&dev->base->fer), in_be32(&dev->base->ssr));
@@ -263,9 +270,9 @@ static int __devinit rgmii_probe(struct of_device *ofdev,
         out_be32(&dev->base->fer, 0);
 
         printk(KERN_INFO
-               "RGMII %s %s initialized\n",
-               dev->type == RGMII_STANDARD ? "standard" : "axon",
-               ofdev->node->full_name);
+               "RGMII %s initialized with%s MDIO support\n",
+               ofdev->node->full_name,
+               (dev->flags & EMAC_RGMII_FLAG_HAS_MDIO) ? "" : "out");
 
         wmb();
         dev_set_drvdata(&ofdev->dev, dev);
diff --git a/drivers/net/ibm_newemac/rgmii.h b/drivers/net/ibm_newemac/rgmii.h
index 57806833121e..c4a4b358a270 100644
--- a/drivers/net/ibm_newemac/rgmii.h
+++ b/drivers/net/ibm_newemac/rgmii.h
@@ -3,6 +3,11 @@
  *
  * Driver for PowerPC 4xx on-chip ethernet controller, RGMII bridge support.
  *
+ * Copyright 2007 Benjamin Herrenschmidt, IBM Corp.
+ *                <benh@kernel.crashing.org>
+ *
+ * Based on the arch/ppc version of the driver:
+ *
  * Based on ocp_zmii.h/ibm_emac_zmii.h
  * Armin Kuster akuster@mvista.com
  *
@@ -35,8 +40,9 @@ struct rgmii_regs {
 struct rgmii_instance {
         struct rgmii_regs __iomem       *base;
 
-        /* Type of RGMII bridge */
-        int                             type;
+        /* RGMII bridge flags */
+        int                             flags;
+#define EMAC_RGMII_FLAG_HAS_MDIO        0x00000001
 
         /* Only one EMAC whacks us at a time */
         struct mutex                    lock;
diff --git a/drivers/net/ibm_newemac/tah.c b/drivers/net/ibm_newemac/tah.c
index f161fb100e8e..96417adec326 100644
--- a/drivers/net/ibm_newemac/tah.c
+++ b/drivers/net/ibm_newemac/tah.c
@@ -3,6 +3,11 @@
  *
  * Driver for PowerPC 4xx on-chip ethernet controller, TAH support.
  *
+ * Copyright 2007 Benjamin Herrenschmidt, IBM Corp.
+ *                <benh@kernel.crashing.org>
+ *
+ * Based on the arch/ppc version of the driver:
+ *
  * Copyright 2004 MontaVista Software, Inc.
  * Matt Porter <mporter@kernel.crashing.org>
  *
@@ -116,13 +121,14 @@ static int __devinit tah_probe(struct of_device *ofdev,
                 goto err_free;
         }
 
+        dev_set_drvdata(&ofdev->dev, dev);
+
         /* Initialize TAH and enable IPv4 checksum verification, no TSO yet */
         tah_reset(ofdev);
 
         printk(KERN_INFO
                "TAH %s initialized\n", ofdev->node->full_name);
         wmb();
-        dev_set_drvdata(&ofdev->dev, dev);
 
         return 0;
 
diff --git a/drivers/net/ibm_newemac/tah.h b/drivers/net/ibm_newemac/tah.h
index bc41853b6e26..a068b5658dad 100644
--- a/drivers/net/ibm_newemac/tah.h
+++ b/drivers/net/ibm_newemac/tah.h
@@ -3,6 +3,11 @@
  *
  * Driver for PowerPC 4xx on-chip ethernet controller, TAH support.
  *
+ * Copyright 2007 Benjamin Herrenschmidt, IBM Corp.
+ *                <benh@kernel.crashing.org>
+ *
+ * Based on the arch/ppc version of the driver:
+ *
  * Copyright 2004 MontaVista Software, Inc.
  * Matt Porter <mporter@kernel.crashing.org>
  *
diff --git a/drivers/net/ibm_newemac/zmii.c b/drivers/net/ibm_newemac/zmii.c
index 2219ec2740e0..2ea472aeab06 100644
--- a/drivers/net/ibm_newemac/zmii.c
+++ b/drivers/net/ibm_newemac/zmii.c
@@ -3,6 +3,11 @@
  *
  * Driver for PowerPC 4xx on-chip ethernet controller, ZMII bridge support.
  *
+ * Copyright 2007 Benjamin Herrenschmidt, IBM Corp.
+ *                <benh@kernel.crashing.org>
+ *
+ * Based on the arch/ppc version of the driver:
+ *
  * Copyright (c) 2004, 2005 Zultys Technologies.
  * Eugene Surovegin <eugene.surovegin@zultys.com> or <ebs@ebshome.net>
  *
@@ -83,12 +88,14 @@ int __devinit zmii_attach(struct of_device *ofdev, int input, int *mode)
 
         ZMII_DBG(dev, "init(%d, %d)" NL, input, *mode);
 
-        if (!zmii_valid_mode(*mode))
+        if (!zmii_valid_mode(*mode)) {
                 /* Probably an EMAC connected to RGMII,
                  * but it still may need ZMII for MDIO so
                  * we don't fail here.
                  */
+                dev->users++;
                 return 0;
+        }
 
         mutex_lock(&dev->lock);
 
diff --git a/drivers/net/ibm_newemac/zmii.h b/drivers/net/ibm_newemac/zmii.h
index 82a9968b1f74..6c9beba0c4b6 100644
--- a/drivers/net/ibm_newemac/zmii.h
+++ b/drivers/net/ibm_newemac/zmii.h
@@ -3,6 +3,11 @@
  *
  * Driver for PowerPC 4xx on-chip ethernet controller, ZMII bridge support.
  *
+ * Copyright 2007 Benjamin Herrenschmidt, IBM Corp.
+ *                <benh@kernel.crashing.org>
+ *
+ * Based on the arch/ppc version of the driver:
+ *
  * Copyright (c) 2004, 2005 Zultys Technologies.
  * Eugene Surovegin <eugene.surovegin@zultys.com> or <ebs@ebshome.net>
  *
diff --git a/drivers/net/irda/irda-usb.c b/drivers/net/irda/irda-usb.c
index c6355c00fd7a..9081234ab458 100644
--- a/drivers/net/irda/irda-usb.c
+++ b/drivers/net/irda/irda-usb.c
@@ -1168,6 +1168,7 @@ static int stir421x_patch_device(struct irda_usb_cb *self)
 static int irda_usb_net_open(struct net_device *netdev)
 {
         struct irda_usb_cb *self;
+        unsigned long flags;
         char    hwname[16];
         int i;
         
@@ -1177,13 +1178,16 @@ static int irda_usb_net_open(struct net_device *netdev)
         self = (struct irda_usb_cb *) netdev->priv;
         IRDA_ASSERT(self != NULL, return -1;);
 
+        spin_lock_irqsave(&self->lock, flags);
         /* Can only open the device if it's there */
         if(!self->present) {
+                spin_unlock_irqrestore(&self->lock, flags);
                 IRDA_WARNING("%s(), device not present!\n", __FUNCTION__);
                 return -1;
         }
 
         if(self->needspatch) {
+                spin_unlock_irqrestore(&self->lock, flags);
                 IRDA_WARNING("%s(), device needs patch\n", __FUNCTION__) ;
                 return -EIO ;
         }
@@ -1198,6 +1202,7 @@ static int irda_usb_net_open(struct net_device *netdev)
         /* To do *before* submitting Rx urbs and starting net Tx queue
          * Jean II */
         self->netopen = 1;
+        spin_unlock_irqrestore(&self->lock, flags);
 
         /* 
          * Now that everything should be initialized properly,
diff --git a/drivers/net/irda/mcs7780.c b/drivers/net/irda/mcs7780.c
index 0b769192d4ce..93916cf33f29 100644
--- a/drivers/net/irda/mcs7780.c
+++ b/drivers/net/irda/mcs7780.c
@@ -677,6 +677,8 @@ static int mcs_net_close(struct net_device *netdev)
         /* Stop transmit processing */
         netif_stop_queue(netdev);
 
+        kfree_skb(mcs->rx_buff.skb);
+
         /* kill and free the receive and transmit URBs */
         usb_kill_urb(mcs->rx_urb);
         usb_free_urb(mcs->rx_urb);
diff --git a/drivers/net/irda/stir4200.c b/drivers/net/irda/stir4200.c
index 042bc2f0417d..e59c485bc497 100644
--- a/drivers/net/irda/stir4200.c
+++ b/drivers/net/irda/stir4200.c
@@ -142,9 +142,6 @@ enum StirCtrl2Mask {
 };
 
 enum StirFifoCtlMask {
-        FIFOCTL_EOF = 0x80,
-        FIFOCTL_UNDER = 0x40,
-        FIFOCTL_OVER = 0x20,
         FIFOCTL_DIR = 0x10,
         FIFOCTL_CLR = 0x08,
         FIFOCTL_EMPTY = 0x04,
@@ -594,9 +591,10 @@ static int fifo_txwait(struct stir_cb *stir, int space)
 {
         int err;
         unsigned long count, status;
+        unsigned long prev_count = 0x1fff;
 
         /* Read FIFO status and count */
-        for(;;) {
+        for (;; prev_count = count) {
                 err = read_reg(stir, REG_FIFOCTL, stir->fifo_status, 
                                    FIFO_REGS_SIZE);
                 if (unlikely(err != FIFO_REGS_SIZE)) {
@@ -629,6 +627,10 @@ static int fifo_txwait(struct stir_cb *stir, int space)
                 if (space >= 0 && STIR_FIFO_SIZE - 4 > space + count)
                         return 0;
 
+                /* queue confused */
+                if (prev_count < count)
+                        break;
+
                 /* estimate transfer time for remaining chars */
                 msleep((count * 8000) / stir->speed);
         }
diff --git a/drivers/net/lib82596.c b/drivers/net/lib82596.c
index 9a855e512147..b59f442bbf36 100644
--- a/drivers/net/lib82596.c
+++ b/drivers/net/lib82596.c
@@ -176,8 +176,8 @@ struct i596_reg {
 struct i596_tbd {
         unsigned short size;
         unsigned short pad;
-        dma_addr_t     next;
-        dma_addr_t     data;
+        u32            next;
+        u32            data;
         u32 cache_pad[5];               /* Total 32 bytes... */
 };
 
@@ -195,12 +195,12 @@ struct i596_cmd {
         struct i596_cmd *v_next;        /* Address from CPUs viewpoint */
         unsigned short status;
         unsigned short command;
-        dma_addr_t     b_next;  /* Address from i596 viewpoint */
+        u32            b_next;  /* Address from i596 viewpoint */
 };
 
 struct tx_cmd {
         struct i596_cmd cmd;
-        dma_addr_t     tbd;
+        u32            tbd;
         unsigned short size;
         unsigned short pad;
         struct sk_buff *skb;            /* So we can free it after tx */
@@ -237,8 +237,8 @@ struct cf_cmd {
 struct i596_rfd {
         unsigned short stat;
         unsigned short cmd;
-        dma_addr_t     b_next;  /* Address from i596 viewpoint */
-        dma_addr_t     rbd;
+        u32            b_next;  /* Address from i596 viewpoint */
+        u32            rbd;
         unsigned short count;
         unsigned short size;
         struct i596_rfd *v_next;        /* Address from CPUs viewpoint */
@@ -249,18 +249,18 @@ struct i596_rfd {
 };
 
 struct i596_rbd {
-    /* hardware data */
-    unsigned short count;
-    unsigned short zero1;
-    dma_addr_t     b_next;
-    dma_addr_t     b_data;              /* Address from i596 viewpoint */
-    unsigned short size;
-    unsigned short zero2;
-    /* driver data */
-    struct sk_buff *skb;
-    struct i596_rbd *v_next;
-    dma_addr_t     b_addr;              /* This rbd addr from i596 view */
-    unsigned char *v_data;              /* Address from CPUs viewpoint */
+        /* hardware data */
+        unsigned short count;
+        unsigned short zero1;
+        u32            b_next;
+        u32            b_data;          /* Address from i596 viewpoint */
+        unsigned short size;
+        unsigned short zero2;
+        /* driver data */
+        struct sk_buff *skb;
+        struct i596_rbd *v_next;
+        u32            b_addr;          /* This rbd addr from i596 view */
+        unsigned char *v_data;          /* Address from CPUs viewpoint */
                                         /* Total 32 bytes... */
 #ifdef __LP64__
     u32 cache_pad[4];
@@ -275,8 +275,8 @@ struct i596_rbd {
 struct i596_scb {
         unsigned short status;
         unsigned short command;
-        dma_addr_t    cmd;
-        dma_addr_t    rfd;
+        u32           cmd;
+        u32           rfd;
         u32           crc_err;
         u32           align_err;
         u32           resource_err;
@@ -288,14 +288,14 @@ struct i596_scb {
 };
 
 struct i596_iscp {
-        u32           stat;
-        dma_addr_t    scb;
+        u32 stat;
+        u32 scb;
 };
 
 struct i596_scp {
-        u32           sysbus;
-        u32           pad;
-        dma_addr_t    iscp;
+        u32 sysbus;
+        u32 pad;
+        u32 iscp;
 };
 
 struct i596_dma {
diff --git a/drivers/net/mlx4/qp.c b/drivers/net/mlx4/qp.c
index 42b47639c81c..fa24e6597591 100644
--- a/drivers/net/mlx4/qp.c
+++ b/drivers/net/mlx4/qp.c
@@ -113,7 +113,7 @@ int mlx4_qp_modify(struct mlx4_dev *dev, struct mlx4_mtt *mtt,
         struct mlx4_cmd_mailbox *mailbox;
         int ret = 0;
 
-        if (cur_state >= MLX4_QP_NUM_STATE || cur_state >= MLX4_QP_NUM_STATE ||
+        if (cur_state >= MLX4_QP_NUM_STATE || new_state >= MLX4_QP_NUM_STATE ||
             !op[cur_state][new_state])
                 return -EINVAL;
 
diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c
index 0f306ddb5630..8def8657251f 100644
--- a/drivers/net/myri10ge/myri10ge.c
+++ b/drivers/net/myri10ge/myri10ge.c
@@ -1979,6 +1979,7 @@ static int myri10ge_open(struct net_device *dev)
         lro_mgr->lro_arr = mgp->rx_done.lro_desc;
         lro_mgr->get_frag_header = myri10ge_get_frag_header;
         lro_mgr->max_aggr = myri10ge_lro_max_pkts;
+        lro_mgr->frag_align_pad = 2;
         if (lro_mgr->max_aggr > MAX_SKB_FRAGS)
                 lro_mgr->max_aggr = MAX_SKB_FRAGS;
 
diff --git a/drivers/net/niu.c b/drivers/net/niu.c
index 112ab079ce7d..abfc61c3a38c 100644
--- a/drivers/net/niu.c
+++ b/drivers/net/niu.c
@@ -1045,6 +1045,7 @@ static int niu_serdes_init(struct niu *np)
 }
 
 static void niu_init_xif(struct niu *);
+static void niu_handle_led(struct niu *, int status);
 
 static int niu_link_status_common(struct niu *np, int link_up)
 {
@@ -1066,11 +1067,15 @@ static int niu_link_status_common(struct niu *np, int link_up)
 
                 spin_lock_irqsave(&np->lock, flags);
                 niu_init_xif(np);
+                niu_handle_led(np, 1);
                 spin_unlock_irqrestore(&np->lock, flags);
 
                 netif_carrier_on(dev);
         } else if (netif_carrier_ok(dev) && !link_up) {
                 niuwarn(LINK, "%s: Link is down\n", dev->name);
+                spin_lock_irqsave(&np->lock, flags);
+                niu_handle_led(np, 0);
+                spin_unlock_irqrestore(&np->lock, flags);
                 netif_carrier_off(dev);
         }
 
@@ -3915,16 +3920,14 @@ static int niu_init_ipp(struct niu *np)
         return 0;
 }
 
-static void niu_init_xif_xmac(struct niu *np)
+static void niu_handle_led(struct niu *np, int status)
 {
-        struct niu_link_config *lp = &np->link_config;
         u64 val;
-
         val = nr64_mac(XMAC_CONFIG);
 
         if ((np->flags & NIU_FLAGS_10G) != 0 &&
             (np->flags & NIU_FLAGS_FIBER) != 0) {
-                if (netif_carrier_ok(np->dev)) {
+                if (status) {
                         val |= XMAC_CONFIG_LED_POLARITY;
                         val &= ~XMAC_CONFIG_FORCE_LED_ON;
                 } else {
@@ -3933,6 +3936,15 @@ static void niu_init_xif_xmac(struct niu *np)
                 }
         }
 
+        nw64_mac(XMAC_CONFIG, val);
+}
+
+static void niu_init_xif_xmac(struct niu *np)
+{
+        struct niu_link_config *lp = &np->link_config;
+        u64 val;
+
+        val = nr64_mac(XMAC_CONFIG);
         val &= ~XMAC_CONFIG_SEL_POR_CLK_SRC;
 
         val |= XMAC_CONFIG_TX_OUTPUT_EN;
@@ -4776,6 +4788,8 @@ static int niu_close(struct net_device *dev)
 
         niu_free_channels(np);
 
+        niu_handle_led(np, 0);
+
         return 0;
 }
 
diff --git a/drivers/net/pasemi_mac.c b/drivers/net/pasemi_mac.c
index 09b4fde8d924..816a59e801b2 100644
--- a/drivers/net/pasemi_mac.c
+++ b/drivers/net/pasemi_mac.c
@@ -586,7 +586,7 @@ static int pasemi_mac_clean_rx(struct pasemi_mac *mac, int limit)
                         /* CRC error flagged */
                         mac->netdev->stats.rx_errors++;
                         mac->netdev->stats.rx_crc_errors++;
-                        dev_kfree_skb_irq(skb);
+                        /* No need to free skb, it'll be reused */
                         goto next;
                 }
 
@@ -1362,7 +1362,7 @@ pasemi_mac_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 
         netif_napi_add(dev, &mac->napi, pasemi_mac_poll, 64);
 
-        dev->features = NETIF_F_HW_CSUM | NETIF_F_LLTX | NETIF_F_SG;
+        dev->features = NETIF_F_IP_CSUM | NETIF_F_LLTX | NETIF_F_SG;
 
         /* These should come out of the device tree eventually */
         mac->dma_txch = index;
diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c
index 035fd41fb61f..f0574073a2a3 100644
--- a/drivers/net/phy/marvell.c
+++ b/drivers/net/phy/marvell.c
@@ -143,21 +143,29 @@ static int m88e1111_config_init(struct phy_device *phydev)
         int err;
 
         if ((phydev->interface == PHY_INTERFACE_MODE_RGMII) ||
-            (phydev->interface == PHY_INTERFACE_MODE_RGMII_ID)) {
+            (phydev->interface == PHY_INTERFACE_MODE_RGMII_ID) ||
+            (phydev->interface == PHY_INTERFACE_MODE_RGMII_RXID) ||
+            (phydev->interface == PHY_INTERFACE_MODE_RGMII_TXID)) {
                 int temp;
 
-                if (phydev->interface == PHY_INTERFACE_MODE_RGMII_ID) {
-                        temp = phy_read(phydev, MII_M1111_PHY_EXT_CR);
-                        if (temp < 0)
-                                return temp;
+                temp = phy_read(phydev, MII_M1111_PHY_EXT_CR);
+                if (temp < 0)
+                        return temp;
 
+                if (phydev->interface == PHY_INTERFACE_MODE_RGMII_ID) {
                         temp |= (MII_M1111_RX_DELAY | MII_M1111_TX_DELAY);
-
-                        err = phy_write(phydev, MII_M1111_PHY_EXT_CR, temp);
-                        if (err < 0)
-                                return err;
+                } else if (phydev->interface == PHY_INTERFACE_MODE_RGMII_RXID) {
+                        temp &= ~MII_M1111_TX_DELAY;
+                        temp |= MII_M1111_RX_DELAY;
+                } else if (phydev->interface == PHY_INTERFACE_MODE_RGMII_TXID) {
+                        temp &= ~MII_M1111_RX_DELAY;
+                        temp |= MII_M1111_TX_DELAY;
                 }
 
+                err = phy_write(phydev, MII_M1111_PHY_EXT_CR, temp);
+                if (err < 0)
+                        return err;
+
                 temp = phy_read(phydev, MII_M1111_PHY_EXT_SR);
                 if (temp < 0)
                         return temp;
diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c
index fc2f0e695a13..c30196d0ad16 100644
--- a/drivers/net/phy/mdio_bus.c
+++ b/drivers/net/phy/mdio_bus.c
@@ -91,9 +91,12 @@ int mdiobus_register(struct mii_bus *bus)
 
                         err = device_register(&phydev->dev);
 
-                        if (err)
+                        if (err) {
                                 printk(KERN_ERR "phy %d failed to register\n",
                                                 i);
+                                phy_device_free(phydev);
+                                phydev = NULL;
+                        }
                 }
 
                 bus->phy_map[i] = phydev;
@@ -110,10 +113,8 @@ void mdiobus_unregister(struct mii_bus *bus)
         int i;
 
         for (i = 0; i < PHY_MAX_ADDR; i++) {
-                if (bus->phy_map[i]) {
+                if (bus->phy_map[i])
                         device_unregister(&bus->phy_map[i]->dev);
-                        kfree(bus->phy_map[i]);
-                }
         }
 }
 EXPORT_SYMBOL(mdiobus_unregister);
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 9bc11773705b..7c9e6e349503 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -406,6 +406,9 @@ int phy_mii_ioctl(struct phy_device *phydev,
                                 && phydev->drv->config_init)
                         phydev->drv->config_init(phydev);
                 break;
+
+        default:
+                return -ENOTTY;
         }
 
         return 0;
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index f6e484812a98..5b9e1751e1b4 100644
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -44,6 +44,16 @@ static struct phy_driver genphy_driver;
 extern int mdio_bus_init(void);
 extern void mdio_bus_exit(void);
 
+void phy_device_free(struct phy_device *phydev)
+{
+        kfree(phydev);
+}
+
+static void phy_device_release(struct device *dev)
+{
+        phy_device_free(to_phy_device(dev));
+}
+
 struct phy_device* phy_device_create(struct mii_bus *bus, int addr, int phy_id)
 {
         struct phy_device *dev;
@@ -54,6 +64,8 @@ struct phy_device* phy_device_create(struct mii_bus *bus, int addr, int phy_id)
         if (NULL == dev)
                 return (struct phy_device*) PTR_ERR((void*)-ENOMEM);
 
+        dev->dev.release = phy_device_release;
+
         dev->speed = 0;
         dev->duplex = -1;
         dev->pause = dev->asym_pause = 0;
diff --git a/drivers/net/plip.c b/drivers/net/plip.c
index 5071fcd8a0bd..57c98669984d 100644
--- a/drivers/net/plip.c
+++ b/drivers/net/plip.c
@@ -663,7 +663,7 @@ plip_receive_packet(struct net_device *dev, struct net_local *nl,
         case PLIP_PK_DONE:
                 /* Inform the upper layer for the arrival of a packet. */
                 rcv->skb->protocol=plip_type_trans(rcv->skb, dev);
-                netif_rx(rcv->skb);
+                netif_rx_ni(rcv->skb);
                 dev->last_rx = jiffies;
                 dev->stats.rx_bytes += rcv->length.h;
                 dev->stats.rx_packets++;
@@ -1269,7 +1269,7 @@ static void plip_attach (struct parport *port)
 
                 nl = netdev_priv(dev);
                 nl->dev = dev;
-                nl->pardev = parport_register_device(port, name, plip_preempt,
+                nl->pardev = parport_register_device(port, dev->name, plip_preempt,
                                                  plip_wakeup, plip_interrupt,
                                                  0, dev);
 
diff --git a/drivers/net/s2io-regs.h b/drivers/net/s2io-regs.h
index 01f08d726ace..f25264f2638e 100644
--- a/drivers/net/s2io-regs.h
+++ b/drivers/net/s2io-regs.h
@@ -66,6 +66,7 @@ struct XENA_dev_config {
 #define ADAPTER_STATUS_RC_PRC_QUIESCENT    vBIT(0xFF,16,8)
 #define ADAPTER_STATUS_MC_DRAM_READY       s2BIT(24)
 #define ADAPTER_STATUS_MC_QUEUES_READY     s2BIT(25)
+#define ADAPTER_STATUS_RIC_RUNNING         s2BIT(26)
 #define ADAPTER_STATUS_M_PLL_LOCK          s2BIT(30)
 #define ADAPTER_STATUS_P_PLL_LOCK          s2BIT(31)
 
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index 632666706247..121cb100f93a 100644
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
@@ -84,7 +84,7 @@
 #include "s2io.h"
 #include "s2io-regs.h"
 
-#define DRV_VERSION "2.0.26.6"
+#define DRV_VERSION "2.0.26.10"
 
 /* S2io Driver name & version. */
 static char s2io_driver_name[] = "Neterion";
@@ -1081,7 +1081,7 @@ static int init_nic(struct s2io_nic *nic)
         /* to set the swapper controle on the card */
         if(s2io_set_swapper(nic)) {
                 DBG_PRINT(ERR_DBG,"ERROR: Setting Swapper failed\n");
-                return -1;
+                return -EIO;
         }
 
         /*
@@ -1100,6 +1100,20 @@ static int init_nic(struct s2io_nic *nic)
         msleep(500);
         val64 = readq(&bar0->sw_reset);
 
+        /* Ensure that it's safe to access registers by checking
+         * RIC_RUNNING bit is reset. Check is valid only for XframeII.
+         */
+        if (nic->device_type == XFRAME_II_DEVICE) {
+                for (i = 0; i < 50; i++) {
+                        val64 = readq(&bar0->adapter_status);
+                        if (!(val64 & ADAPTER_STATUS_RIC_RUNNING))
+                                break;
+                        msleep(10);
+                }
+                if (i == 50)
+                        return -ENODEV;
+        }
+
         /*  Enable Receiving broadcasts */
         add = &bar0->mac_cfg;
         val64 = readq(&bar0->mac_cfg);
@@ -1503,7 +1517,7 @@ static int init_nic(struct s2io_nic *nic)
                         DBG_PRINT(ERR_DBG, "%s: failed rts ds steering",
                                 dev->name);
                         DBG_PRINT(ERR_DBG, "set on codepoint %d\n", i);
-                        return FAILURE;
+                        return -ENODEV;
                 }
         }
 
@@ -1570,7 +1584,7 @@ static int init_nic(struct s2io_nic *nic)
                 if (time > 10) {
                         DBG_PRINT(ERR_DBG, "%s: TTI init Failed\n",
                                   dev->name);
-                        return -1;
+                        return -ENODEV;
                 }
                 msleep(50);
                 time++;
@@ -1623,7 +1637,7 @@ static int init_nic(struct s2io_nic *nic)
                         if (time > 10) {
                                 DBG_PRINT(ERR_DBG, "%s: RTI init Failed\n",
                                           dev->name);
-                                return -1;
+                                return -ENODEV;
                         }
                         time++;
                         msleep(50);
@@ -3914,6 +3928,12 @@ static int s2io_close(struct net_device *dev)
 {
         struct s2io_nic *sp = dev->priv;
 
+        /* Return if the device is already closed               *
+        *  Can happen when s2io_card_up failed in change_mtu    *
+        */
+        if (!is_s2io_card_up(sp))
+                return 0;
+
         netif_stop_queue(dev);
         napi_disable(&sp->napi);
         /* Reset card, kill tasklet and free Tx and Rx buffers. */
@@ -6355,6 +6375,7 @@ static int s2io_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
 static int s2io_change_mtu(struct net_device *dev, int new_mtu)
 {
         struct s2io_nic *sp = dev->priv;
+        int ret = 0;
 
         if ((new_mtu < MIN_MTU) || (new_mtu > S2IO_JUMBO_SIZE)) {
                 DBG_PRINT(ERR_DBG, "%s: MTU size is invalid.\n",
@@ -6366,9 +6387,11 @@ static int s2io_change_mtu(struct net_device *dev, int new_mtu)
         if (netif_running(dev)) {
                 s2io_card_down(sp);
                 netif_stop_queue(dev);
-                if (s2io_card_up(sp)) {
+                ret = s2io_card_up(sp);
+                if (ret) {
                         DBG_PRINT(ERR_DBG, "%s: Device bring up failed\n",
                                   __FUNCTION__);
+                        return ret;
                 }
                 if (netif_queue_stopped(dev))
                         netif_wake_queue(dev);
@@ -6379,7 +6402,7 @@ static int s2io_change_mtu(struct net_device *dev, int new_mtu)
                 writeq(vBIT(val64, 2, 14), &bar0->rmac_max_pyld_len);
         }
 
-        return 0;
+        return ret;
 }
 
 /**
@@ -6777,6 +6800,9 @@ static void do_s2io_card_down(struct s2io_nic * sp, int do_io)
         unsigned long flags;
         register u64 val64 = 0;
 
+        if (!is_s2io_card_up(sp))
+                return;
+
         del_timer_sync(&sp->alarm_timer);
         /* If s2io_set_link task is executing, wait till it completes. */
         while (test_and_set_bit(__S2IO_STATE_LINK_TASK, &(sp->state))) {
@@ -6850,11 +6876,13 @@ static int s2io_card_up(struct s2io_nic * sp)
         u16 interruptible;
 
         /* Initialize the H/W I/O registers */
-        if (init_nic(sp) != 0) {
+        ret = init_nic(sp);
+        if (ret != 0) {
                 DBG_PRINT(ERR_DBG, "%s: H/W initialization failed\n",
                           dev->name);
-                s2io_reset(sp);
-                return -ENODEV;
+                if (ret != -EIO)
+                        s2io_reset(sp);
+                return ret;
         }
 
         /*
diff --git a/drivers/net/skge.c b/drivers/net/skge.c
index 6d62250fba07..186eb8ebfda6 100644
--- a/drivers/net/skge.c
+++ b/drivers/net/skge.c
@@ -44,7 +44,7 @@
 #include "skge.h"
 
 #define DRV_NAME                "skge"
-#define DRV_VERSION             "1.12"
+#define DRV_VERSION             "1.13"
 #define PFX                     DRV_NAME " "
 
 #define DEFAULT_TX_RING_SIZE    128
@@ -1095,16 +1095,9 @@ static void xm_link_down(struct skge_hw *hw, int port)
 {
         struct net_device *dev = hw->dev[port];
         struct skge_port *skge = netdev_priv(dev);
-        u16 cmd = xm_read16(hw, port, XM_MMU_CMD);
 
         xm_write16(hw, port, XM_IMSK, XM_IMSK_DISABLE);
 
-        cmd &= ~(XM_MMU_ENA_RX | XM_MMU_ENA_TX);
-        xm_write16(hw, port, XM_MMU_CMD, cmd);
-
-        /* dummy read to ensure writing */
-        xm_read16(hw, port, XM_MMU_CMD);
-
         if (netif_carrier_ok(dev))
                 skge_link_down(skge);
 }
@@ -1194,6 +1187,7 @@ static void genesis_init(struct skge_hw *hw)
 static void genesis_reset(struct skge_hw *hw, int port)
 {
         const u8 zero[8]  = { 0 };
+        u32 reg;
 
         skge_write8(hw, SK_REG(port, GMAC_IRQ_MSK), 0);
 
@@ -1209,6 +1203,11 @@ static void genesis_reset(struct skge_hw *hw, int port)
                 xm_write16(hw, port, PHY_BCOM_INT_MASK, 0xffff);
 
         xm_outhash(hw, port, XM_HSM, zero);
+
+        /* Flush TX and RX fifo */
+        reg = xm_read32(hw, port, XM_MODE);
+        xm_write32(hw, port, XM_MODE, reg | XM_MD_FTF);
+        xm_write32(hw, port, XM_MODE, reg | XM_MD_FRF);
 }
 
 
@@ -1634,15 +1633,14 @@ static void genesis_mac_init(struct skge_hw *hw, int port)
         }
         xm_write16(hw, port, XM_RX_CMD, r);
 
-
         /* We want short frames padded to 60 bytes. */
         xm_write16(hw, port, XM_TX_CMD, XM_TX_AUTO_PAD);
 
-        /*
-         * Bump up the transmit threshold. This helps hold off transmit
-         * underruns when we're blasting traffic from both ports at once.
-         */
-        xm_write16(hw, port, XM_TX_THR, 512);
+        /* Increase threshold for jumbo frames on dual port */
+        if (hw->ports > 1 && jumbo)
+                xm_write16(hw, port, XM_TX_THR, 1020);
+        else
+                xm_write16(hw, port, XM_TX_THR, 512);
 
         /*
          * Enable the reception of all error frames. This is is
@@ -1713,7 +1711,13 @@ static void genesis_stop(struct skge_port *skge)
 {
         struct skge_hw *hw = skge->hw;
         int port = skge->port;
-        u32 reg;
+        unsigned retries = 1000;
+        u16 cmd;
+
+        /* Disable Tx and Rx */
+        cmd = xm_read16(hw, port, XM_MMU_CMD);
+        cmd &= ~(XM_MMU_ENA_RX | XM_MMU_ENA_TX);
+        xm_write16(hw, port, XM_MMU_CMD, cmd);
 
         genesis_reset(hw, port);
 
@@ -1721,20 +1725,17 @@ static void genesis_stop(struct skge_port *skge)
         skge_write16(hw, B3_PA_CTRL,
                      port == 0 ? PA_CLR_TO_TX1 : PA_CLR_TO_TX2);
 
-        /*
-         * If the transfer sticks at the MAC the STOP command will not
-         * terminate if we don't flush the XMAC's transmit FIFO !
-         */
-        xm_write32(hw, port, XM_MODE,
-                        xm_read32(hw, port, XM_MODE)|XM_MD_FTF);
-
-
         /* Reset the MAC */
-        skge_write16(hw, SK_REG(port, TX_MFF_CTRL1), MFF_SET_MAC_RST);
+        skge_write16(hw, SK_REG(port, TX_MFF_CTRL1), MFF_CLR_MAC_RST);
+        do {
+                skge_write16(hw, SK_REG(port, TX_MFF_CTRL1), MFF_SET_MAC_RST);
+                if (!(skge_read16(hw, SK_REG(port, TX_MFF_CTRL1)) & MFF_SET_MAC_RST))
+                        break;
+        } while (--retries > 0);
 
         /* For external PHYs there must be special handling */
         if (hw->phy_type != SK_PHY_XMAC) {
-                reg = skge_read32(hw, B2_GP_IO);
+                u32 reg = skge_read32(hw, B2_GP_IO);
                 if (port == 0) {
                         reg |= GP_DIR_0;
                         reg &= ~GP_IO_0;
@@ -1801,11 +1802,6 @@ static void genesis_mac_intr(struct skge_hw *hw, int port)
                 xm_write32(hw, port, XM_MODE, XM_MD_FTF);
                 ++dev->stats.tx_fifo_errors;
         }
-
-        if (status & XM_IS_RXF_OV) {
-                xm_write32(hw, port, XM_MODE, XM_MD_FRF);
-                ++dev->stats.rx_fifo_errors;
-        }
 }
 
 static void genesis_link_up(struct skge_port *skge)
@@ -1862,9 +1858,9 @@ static void genesis_link_up(struct skge_port *skge)
 
         xm_write32(hw, port, XM_MODE, mode);
 
-        /* Turn on detection of Tx underrun, Rx overrun */
+        /* Turn on detection of Tx underrun */
         msk = xm_read16(hw, port, XM_IMSK);
-        msk &= ~(XM_IS_RXF_OV | XM_IS_TXF_UR);
+        msk &= ~XM_IS_TXF_UR;
         xm_write16(hw, port, XM_IMSK, msk);
 
         xm_read16(hw, port, XM_ISRC);
@@ -2194,9 +2190,12 @@ static void yukon_mac_init(struct skge_hw *hw, int port)
                          TX_JAM_IPG_VAL(TX_JAM_IPG_DEF) |
                          TX_IPG_JAM_DATA(TX_IPG_JAM_DEF));
 
-        /* serial mode register */
-        reg = GM_SMOD_VLAN_ENA | IPG_DATA_VAL(IPG_DATA_DEF);
-        if (hw->dev[port]->mtu > 1500)
+        /* configure the Serial Mode Register */
+        reg = DATA_BLIND_VAL(DATA_BLIND_DEF)
+                | GM_SMOD_VLAN_ENA
+                | IPG_DATA_VAL(IPG_DATA_DEF);
+
+        if (hw->dev[port]->mtu > ETH_DATA_LEN)
                 reg |= GM_SMOD_JUMBO_ENA;
 
         gma_write16(hw, port, GM_SERIAL_MODE, reg);
@@ -2619,8 +2618,8 @@ static int skge_up(struct net_device *dev)
                 yukon_mac_init(hw, port);
         spin_unlock_bh(&hw->phy_lock);
 
-        /* Configure RAMbuffers */
-        chunk = hw->ram_size / ((hw->ports + 1)*2);
+        /* Configure RAMbuffers - equally between ports and tx/rx */
+        chunk = (hw->ram_size  - hw->ram_offset) / (hw->ports * 2);
         ram_addr = hw->ram_offset + 2 * chunk * port;
 
         skge_ramset(hw, rxqaddr[port], ram_addr, chunk);
@@ -2897,11 +2896,7 @@ static void skge_tx_timeout(struct net_device *dev)
 
 static int skge_change_mtu(struct net_device *dev, int new_mtu)
 {
-        struct skge_port *skge = netdev_priv(dev);
-        struct skge_hw *hw = skge->hw;
-        int port = skge->port;
         int err;
-        u16 ctl, reg;
 
         if (new_mtu < ETH_ZLEN || new_mtu > ETH_JUMBO_MTU)
                 return -EINVAL;
@@ -2911,40 +2906,13 @@ static int skge_change_mtu(struct net_device *dev, int new_mtu)
                 return 0;
         }
 
-        skge_write32(hw, B0_IMSK, 0);
-        dev->trans_start = jiffies;     /* prevent tx timeout */
-        netif_stop_queue(dev);
-        napi_disable(&skge->napi);
-
-        ctl = gma_read16(hw, port, GM_GP_CTRL);
-        gma_write16(hw, port, GM_GP_CTRL, ctl & ~GM_GPCR_RX_ENA);
-
-        skge_rx_clean(skge);
-        skge_rx_stop(hw, port);
+        skge_down(dev);
 
         dev->mtu = new_mtu;
 
-        reg = GM_SMOD_VLAN_ENA | IPG_DATA_VAL(IPG_DATA_DEF);
-        if (new_mtu > 1500)
-                reg |= GM_SMOD_JUMBO_ENA;
-        gma_write16(hw, port, GM_SERIAL_MODE, reg);
-
-        skge_write8(hw, RB_ADDR(rxqaddr[port], RB_CTRL), RB_ENA_OP_MD);
-
-        err = skge_rx_fill(dev);
-        wmb();
-        if (!err)
-                skge_write8(hw, Q_ADDR(rxqaddr[port], Q_CSR), CSR_START | CSR_IRQ_CL_F);
-        skge_write32(hw, B0_IMSK, hw->intr_mask);
-
+        err = skge_up(dev);
         if (err)
                 dev_close(dev);
-        else {
-                gma_write16(hw, port, GM_GP_CTRL, ctl);
-
-                napi_enable(&skge->napi);
-                netif_wake_queue(dev);
-        }
 
         return err;
 }
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index a2070db725c9..6197afb3ed83 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -31,7 +31,6 @@
 #include <linux/etherdevice.h>
 #include <linux/ethtool.h>
 #include <linux/pci.h>
-#include <linux/aer.h>
 #include <linux/ip.h>
 #include <net/ip.h>
 #include <linux/tcp.h>
@@ -240,22 +239,21 @@ static void sky2_power_on(struct sky2_hw *hw)
                 sky2_write8(hw, B2_Y2_CLK_GATE, 0);
 
         if (hw->flags & SKY2_HW_ADV_POWER_CTL) {
-                struct pci_dev *pdev = hw->pdev;
                 u32 reg;
 
-                pci_write_config_dword(pdev, PCI_DEV_REG3, 0);
+                sky2_pci_write32(hw, PCI_DEV_REG3, 0);
 
-                pci_read_config_dword(pdev, PCI_DEV_REG4, &reg);
+                reg = sky2_pci_read32(hw, PCI_DEV_REG4);
                 /* set all bits to 0 except bits 15..12 and 8 */
                 reg &= P_ASPM_CONTROL_MSK;
-                pci_write_config_dword(pdev, PCI_DEV_REG4, reg);
+                sky2_pci_write32(hw, PCI_DEV_REG4, reg);
 
-                pci_read_config_dword(pdev, PCI_DEV_REG5, &reg);
+                reg = sky2_pci_read32(hw, PCI_DEV_REG5);
                 /* set all bits to 0 except bits 28 & 27 */
                 reg &= P_CTL_TIM_VMAIN_AV_MSK;
-                pci_write_config_dword(pdev, PCI_DEV_REG5, reg);
+                sky2_pci_write32(hw, PCI_DEV_REG5, reg);
 
-                pci_write_config_dword(pdev, PCI_CFG_REG_1, 0);
+                sky2_pci_write32(hw, PCI_CFG_REG_1, 0);
 
                 /* Enable workaround for dev 4.107 on Yukon-Ultra & Extreme */
                 reg = sky2_read32(hw, B2_GP_IO);
@@ -619,12 +617,11 @@ static void sky2_phy_init(struct sky2_hw *hw, unsigned port)
 
 static void sky2_phy_power(struct sky2_hw *hw, unsigned port, int onoff)
 {
-        struct pci_dev *pdev = hw->pdev;
         u32 reg1;
         static const u32 phy_power[] = { PCI_Y2_PHY1_POWD, PCI_Y2_PHY2_POWD };
         static const u32 coma_mode[] = { PCI_Y2_PHY1_COMA, PCI_Y2_PHY2_COMA };
 
-        pci_read_config_dword(pdev, PCI_DEV_REG1, &reg1);
+        reg1 = sky2_pci_read32(hw, PCI_DEV_REG1);
         /* Turn on/off phy power saving */
         if (onoff)
                 reg1 &= ~phy_power[port];
@@ -634,8 +631,8 @@ static void sky2_phy_power(struct sky2_hw *hw, unsigned port, int onoff)
         if (onoff && hw->chip_id == CHIP_ID_YUKON_XL && hw->chip_rev > 1)
                 reg1 |= coma_mode[port];
 
-        pci_write_config_dword(pdev, PCI_DEV_REG1, reg1);
-        pci_read_config_dword(pdev, PCI_DEV_REG1, &reg1);
+        sky2_pci_write32(hw, PCI_DEV_REG1, reg1);
+        reg1 = sky2_pci_read32(hw, PCI_DEV_REG1);
 
         udelay(100);
 }
@@ -704,9 +701,9 @@ static void sky2_wol_init(struct sky2_port *sky2)
         sky2_write16(hw, WOL_REGS(port, WOL_CTRL_STAT), ctrl);
 
         /* Turn on legacy PCI-Express PME mode */
-        pci_read_config_dword(hw->pdev, PCI_DEV_REG1, &reg1);
+        reg1 = sky2_pci_read32(hw, PCI_DEV_REG1);
         reg1 |= PCI_Y2_PME_LEGACY;
-        pci_write_config_dword(hw->pdev, PCI_DEV_REG1, reg1);
+        sky2_pci_write32(hw, PCI_DEV_REG1, reg1);
 
         /* block receiver */
         sky2_write8(hw, SK_REG(port, RX_GMF_CTRL_T), GMF_RST_SET);
@@ -848,6 +845,13 @@ static void sky2_mac_init(struct sky2_hw *hw, unsigned port)
                 sky2_set_tx_stfwd(hw, port);
         }
 
+        if (hw->chip_id == CHIP_ID_YUKON_FE_P &&
+            hw->chip_rev == CHIP_REV_YU_FE2_A0) {
+                /* disable dynamic watermark */
+                reg = sky2_read16(hw, SK_REG(port, TX_GMF_EA));
+                reg &= ~TX_DYN_WM_ENA;
+                sky2_write16(hw, SK_REG(port, TX_GMF_EA), reg);
+        }
 }
 
 /* Assign Ram Buffer allocation to queue */
@@ -1320,15 +1324,12 @@ static int sky2_up(struct net_device *dev)
          */
         if (otherdev && netif_running(otherdev) &&
             (cap = pci_find_capability(hw->pdev, PCI_CAP_ID_PCIX))) {
-                struct sky2_port *osky2 = netdev_priv(otherdev);
                 u16 cmd;
 
-                pci_read_config_word(hw->pdev, cap + PCI_X_CMD, &cmd);
+                cmd = sky2_pci_read16(hw, cap + PCI_X_CMD);
                 cmd &= ~PCI_X_CMD_MAX_SPLIT;
-                pci_write_config_word(hw->pdev, cap + PCI_X_CMD, cmd);
+                sky2_pci_write16(hw, cap + PCI_X_CMD, cmd);
 
-                sky2->rx_csum = 0;
-                osky2->rx_csum = 0;
         }
 
         if (netif_msg_ifup(sky2))
@@ -2426,37 +2427,26 @@ static void sky2_hw_intr(struct sky2_hw *hw)
         if (status & (Y2_IS_MST_ERR | Y2_IS_IRQ_STAT)) {
                 u16 pci_err;
 
-                pci_read_config_word(pdev, PCI_STATUS, &pci_err);
+                pci_err = sky2_pci_read16(hw, PCI_STATUS);
                 if (net_ratelimit())
                         dev_err(&pdev->dev, "PCI hardware error (0x%x)\n",
                                 pci_err);
 
-                pci_write_config_word(pdev, PCI_STATUS,
+                sky2_pci_write16(hw, PCI_STATUS,
                                       pci_err | PCI_STATUS_ERROR_BITS);
         }
 
         if (status & Y2_IS_PCI_EXP) {
                 /* PCI-Express uncorrectable Error occurred */
-                int aer = pci_find_aer_capability(hw->pdev);
                 u32 err;
 
-                if (aer) {
-                        pci_read_config_dword(pdev, aer + PCI_ERR_UNCOR_STATUS,
-                                              &err);
-                        pci_cleanup_aer_uncorrect_error_status(pdev);
-                } else {
-                        /* Either AER not configured, or not working
-                         * because of bad MMCONFIG, so just do recover
-                         * manually.
-                         */
-                        err = sky2_read32(hw, Y2_CFG_AER + PCI_ERR_UNCOR_STATUS);
-                        sky2_write32(hw, Y2_CFG_AER + PCI_ERR_UNCOR_STATUS,
-                                     0xfffffffful);
-                }
-
+                err = sky2_read32(hw, Y2_CFG_AER + PCI_ERR_UNCOR_STATUS);
+                sky2_write32(hw, Y2_CFG_AER + PCI_ERR_UNCOR_STATUS,
+                             0xfffffffful);
                 if (net_ratelimit())
                         dev_err(&pdev->dev, "PCI Express error (0x%x)\n", err);
 
+                sky2_read32(hw, Y2_CFG_AER + PCI_ERR_UNCOR_STATUS);
         }
 
         if (status & Y2_HWE_L1_MASK)
@@ -2703,13 +2693,10 @@ static inline u32 sky2_clk2us(const struct sky2_hw *hw, u32 clk)
 
 static int __devinit sky2_init(struct sky2_hw *hw)
 {
-        int rc;
         u8 t8;
 
         /* Enable all clocks and check for bad PCI access */
-        rc = pci_write_config_dword(hw->pdev, PCI_DEV_REG3, 0);
-        if (rc)
-                return rc;
+        sky2_pci_write32(hw, PCI_DEV_REG3, 0);
 
         sky2_write8(hw, B0_CTST, CS_RST_CLR);
 
@@ -2806,32 +2793,21 @@ static void sky2_reset(struct sky2_hw *hw)
         sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_ON);
 
         /* clear PCI errors, if any */
-        pci_read_config_word(pdev, PCI_STATUS, &status);
+        status = sky2_pci_read16(hw, PCI_STATUS);
         status |= PCI_STATUS_ERROR_BITS;
-        pci_write_config_word(pdev, PCI_STATUS, status);
+        sky2_pci_write16(hw, PCI_STATUS, status);
 
         sky2_write8(hw, B0_CTST, CS_MRST_CLR);
 
         cap = pci_find_capability(pdev, PCI_CAP_ID_EXP);
         if (cap) {
-                if (pci_find_aer_capability(pdev)) {
-                        /* Check for advanced error reporting */
-                        pci_cleanup_aer_uncorrect_error_status(pdev);
-                        pci_cleanup_aer_correct_error_status(pdev);
-                } else {
-                        dev_warn(&pdev->dev,
-                                "PCI Express Advanced Error Reporting"
-                                " not configured or MMCONFIG problem?\n");
-
-                        sky2_write32(hw, Y2_CFG_AER + PCI_ERR_UNCOR_STATUS,
-                                     0xfffffffful);
-                }
+                sky2_write32(hw, Y2_CFG_AER + PCI_ERR_UNCOR_STATUS,
+                             0xfffffffful);
 
                 /* If error bit is stuck on ignore it */
                 if (sky2_read32(hw, B0_HWE_ISRC) & Y2_IS_PCI_EXP)
                         dev_info(&pdev->dev, "ignoring stuck error report bit\n");
-
-                else if (pci_enable_pcie_error_reporting(pdev))
+                else
                         hwe_mask |= Y2_IS_PCI_EXP;
         }
 
@@ -2930,16 +2906,14 @@ static void sky2_restart(struct work_struct *work)
         int i, err;
 
         rtnl_lock();
-        sky2_write32(hw, B0_IMSK, 0);
-        sky2_read32(hw, B0_IMSK);
-        napi_disable(&hw->napi);
-
         for (i = 0; i < hw->ports; i++) {
                 dev = hw->dev[i];
                 if (netif_running(dev))
                         sky2_down(dev);
         }
 
+        napi_disable(&hw->napi);
+        sky2_write32(hw, B0_IMSK, 0);
         sky2_reset(hw);
         sky2_write32(hw, B0_IMSK, Y2_IS_BASE);
         napi_enable(&hw->napi);
@@ -3672,32 +3646,33 @@ static int sky2_set_tso(struct net_device *dev, u32 data)
 static int sky2_get_eeprom_len(struct net_device *dev)
 {
         struct sky2_port *sky2 = netdev_priv(dev);
+        struct sky2_hw *hw = sky2->hw;
         u16 reg2;
 
-        pci_read_config_word(sky2->hw->pdev, PCI_DEV_REG2, &reg2);
+        reg2 = sky2_pci_read16(hw, PCI_DEV_REG2);
         return 1 << ( ((reg2 & PCI_VPD_ROM_SZ) >> 14) + 8);
 }
 
-static u32 sky2_vpd_read(struct pci_dev *pdev, int cap, u16 offset)
+static u32 sky2_vpd_read(struct sky2_hw *hw, int cap, u16 offset)
 {
         u32 val;
 
-        pci_write_config_word(pdev, cap + PCI_VPD_ADDR, offset);
+        sky2_pci_write16(hw, cap + PCI_VPD_ADDR, offset);
 
         do {
-                pci_read_config_word(pdev, cap + PCI_VPD_ADDR, &offset);
+                offset = sky2_pci_read16(hw, cap + PCI_VPD_ADDR);
         } while (!(offset & PCI_VPD_ADDR_F));
 
-        pci_read_config_dword(pdev, cap + PCI_VPD_DATA, &val);
+        val = sky2_pci_read32(hw, cap + PCI_VPD_DATA);
         return val;
 }
 
-static void sky2_vpd_write(struct pci_dev *pdev, int cap, u16 offset, u32 val)
+static void sky2_vpd_write(struct sky2_hw *hw, int cap, u16 offset, u32 val)
 {
-        pci_write_config_word(pdev, cap + PCI_VPD_DATA, val);
-        pci_write_config_dword(pdev, cap + PCI_VPD_ADDR, offset | PCI_VPD_ADDR_F);
+        sky2_pci_write16(hw, cap + PCI_VPD_DATA, val);
+        sky2_pci_write32(hw, cap + PCI_VPD_ADDR, offset | PCI_VPD_ADDR_F);
         do {
-                pci_read_config_word(pdev, cap + PCI_VPD_ADDR, &offset);
+                offset = sky2_pci_read16(hw, cap + PCI_VPD_ADDR);
         } while (offset & PCI_VPD_ADDR_F);
 }
 
@@ -3715,7 +3690,7 @@ static int sky2_get_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom
         eeprom->magic = SKY2_EEPROM_MAGIC;
 
         while (length > 0) {
-                u32 val = sky2_vpd_read(sky2->hw->pdev, cap, offset);
+                u32 val = sky2_vpd_read(sky2->hw, cap, offset);
                 int n = min_t(int, length, sizeof(val));
 
                 memcpy(data, &val, n);
@@ -3745,10 +3720,10 @@ static int sky2_set_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom
                 int n = min_t(int, length, sizeof(val));
 
                 if (n < sizeof(val))
-                        val = sky2_vpd_read(sky2->hw->pdev, cap, offset);
+                        val = sky2_vpd_read(sky2->hw, cap, offset);
                 memcpy(&val, data, n);
 
-                sky2_vpd_write(sky2->hw->pdev, cap, offset, val);
+                sky2_vpd_write(sky2->hw, cap, offset, val);
 
                 length -= n;
                 data += n;
@@ -4013,7 +3988,7 @@ static __devinit struct net_device *sky2_init_netdev(struct sky2_hw *hw,
         sky2->duplex = -1;
         sky2->speed = -1;
         sky2->advertising = sky2_supported_modes(hw);
-        sky2->rx_csum = 1;
+        sky2->rx_csum = (hw->chip_id != CHIP_ID_YUKON_XL);
         sky2->wol = wol;
 
         spin_lock_init(&sky2->phy_lock);
@@ -4184,9 +4159,9 @@ static int __devinit sky2_probe(struct pci_dev *pdev,
          */
         {
                 u32 reg;
-                pci_read_config_dword(pdev,PCI_DEV_REG2, &reg);
+                reg = sky2_pci_read32(hw, PCI_DEV_REG2);
                 reg &= ~PCI_REV_DESC;
-                pci_write_config_dword(pdev, PCI_DEV_REG2, reg);
+                sky2_pci_write32(hw, PCI_DEV_REG2, reg);
         }
 #endif
 
@@ -4377,7 +4352,7 @@ static int sky2_resume(struct pci_dev *pdev)
         if (hw->chip_id == CHIP_ID_YUKON_EX ||
             hw->chip_id == CHIP_ID_YUKON_EC_U ||
             hw->chip_id == CHIP_ID_YUKON_FE_P)
-                pci_write_config_dword(pdev, PCI_DEV_REG3, 0);
+                sky2_pci_write32(hw, PCI_DEV_REG3, 0);
 
         sky2_reset(hw);
         sky2_write32(hw, B0_IMSK, Y2_IS_BASE);
diff --git a/drivers/net/sky2.h b/drivers/net/sky2.h
index 69525fd7908d..bc646a47edd2 100644
--- a/drivers/net/sky2.h
+++ b/drivers/net/sky2.h
@@ -2128,4 +2128,25 @@ static inline void gma_set_addr(struct sky2_hw *hw, unsigned port, unsigned reg,
         gma_write16(hw, port, reg+4,(u16) addr[2] | ((u16) addr[3] << 8));
         gma_write16(hw, port, reg+8,(u16) addr[4] | ((u16) addr[5] << 8));
 }
+
+/* PCI config space access */
+static inline u32 sky2_pci_read32(const struct sky2_hw *hw, unsigned reg)
+{
+        return sky2_read32(hw, Y2_CFG_SPC + reg);
+}
+
+static inline u16 sky2_pci_read16(const struct sky2_hw *hw, unsigned reg)
+{
+        return sky2_read16(hw, Y2_CFG_SPC + reg);
+}
+
+static inline void sky2_pci_write32(struct sky2_hw *hw, unsigned reg, u32 val)
+{
+        sky2_write32(hw, Y2_CFG_SPC + reg, val);
+}
+
+static inline void sky2_pci_write16(struct sky2_hw *hw, unsigned reg, u16 val)
+{
+        sky2_write16(hw, Y2_CFG_SPC + reg, val);
+}
 #endif
diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c
index dd18af0ce676..76cc1d3adf71 100644
--- a/drivers/net/smc911x.c
+++ b/drivers/net/smc911x.c
@@ -428,7 +428,6 @@ static inline void smc911x_drop_pkt(struct net_device *dev)
  */
 static inline void       smc911x_rcv(struct net_device *dev)
 {
-        struct smc911x_local *lp = netdev_priv(dev);
         unsigned long ioaddr = dev->base_addr;
         unsigned int pkt_len, status;
         struct sk_buff *skb;
@@ -473,6 +472,7 @@ static inline void	 smc911x_rcv(struct net_device *dev)
                 skb_put(skb,pkt_len-4);
 #ifdef SMC_USE_DMA
                 {
+                struct smc911x_local *lp = netdev_priv(dev);
                 unsigned int fifo;
                 /* Lower the FIFO threshold if possible */
                 fifo = SMC_GET_FIFO_INT();
@@ -1299,9 +1299,9 @@ smc911x_rx_dma_irq(int dma, void *data)
         PRINT_PKT(skb->data, skb->len);
         dev->last_rx = jiffies;
         skb->protocol = eth_type_trans(skb, dev);
-        netif_rx(skb);
         dev->stats.rx_packets++;
         dev->stats.rx_bytes += skb->len;
+        netif_rx(skb);
 
         spin_lock_irqsave(&lp->lock, flags);
         pkts = (SMC_GET_RX_FIFO_INF() & RX_FIFO_INF_RXSUSED_) >> 16;
@@ -1379,13 +1379,6 @@ static void smc911x_set_multicast_list(struct net_device *dev)
         unsigned int multicast_table[2];
         unsigned int mcr, update_multicast = 0;
         unsigned long flags;
-        /* table for flipping the order of 5 bits */
-        static const unsigned char invert5[] =
-                {0x00, 0x10, 0x08, 0x18, 0x04, 0x14, 0x0C, 0x1C,
-                 0x02, 0x12, 0x0A, 0x1A, 0x06, 0x16, 0x0E, 0x1E,
-                 0x01, 0x11, 0x09, 0x19, 0x05, 0x15, 0x0D, 0x1D,
-                 0x03, 0x13, 0x0B, 0x1B, 0x07, 0x17, 0x0F, 0x1F};
-
 
         DBG(SMC_DEBUG_FUNC, "%s: --> %s\n", dev->name, __FUNCTION__);
 
@@ -1432,7 +1425,7 @@ static void smc911x_set_multicast_list(struct net_device *dev)
 
                 cur_addr = dev->mc_list;
                 for (i = 0; i < dev->mc_count; i++, cur_addr = cur_addr->next) {
-                        int position;
+                        u32 position;
 
                         /* do we have a pointer here? */
                         if (!cur_addr)
@@ -1442,12 +1435,10 @@ static void smc911x_set_multicast_list(struct net_device *dev)
                         if (!(*cur_addr->dmi_addr & 1))
                                  continue;
 
-                        /* only use the low order bits */
-                        position = crc32_le(~0, cur_addr->dmi_addr, 6) & 0x3f;
+                        /* upper 6 bits are used as hash index */
+                        position = ether_crc(ETH_ALEN, cur_addr->dmi_addr)>>26;
 
-                        /* do some messy swapping to put the bit in the right spot */
-                        multicast_table[invert5[position&0x1F]&0x1] |=
-                                (1<<invert5[(position>>1)&0x1F]);
+                        multicast_table[position>>5] |= 1 << (position&0x1f);
                 }
 
                 /* be sure I get rid of flags I might have set */
diff --git a/drivers/net/smc911x.h b/drivers/net/smc911x.h
index 16a0edc078fd..d04e4fa35206 100644
--- a/drivers/net/smc911x.h
+++ b/drivers/net/smc911x.h
@@ -37,7 +37,7 @@
   #define SMC_USE_16BIT         0
   #define SMC_USE_32BIT         1
   #define SMC_IRQ_SENSE         IRQF_TRIGGER_FALLING
-#elif CONFIG_SH_MAGIC_PANEL_R2
+#elif defined(CONFIG_SH_MAGIC_PANEL_R2)
   #define SMC_USE_SH_DMA        0
   #define SMC_USE_16BIT         0
   #define SMC_USE_32BIT         1
diff --git a/drivers/net/smc91x.h b/drivers/net/smc91x.h
index db34e1eb67e9..07b7f7120e37 100644
--- a/drivers/net/smc91x.h
+++ b/drivers/net/smc91x.h
@@ -55,7 +55,7 @@
 #define SMC_insw(a, r, p, l)    readsw((a) + (r), p, l)
 #define SMC_outsw(a, r, p, l)   writesw((a) + (r), p, l)
 
-#elif defined(CONFIG_BFIN)
+#elif defined(CONFIG_BLACKFIN)
 
 #define SMC_IRQ_FLAGS           IRQF_TRIGGER_HIGH
 #define RPC_LSA_DEFAULT         RPC_LED_100_10
diff --git a/drivers/net/sungem.c b/drivers/net/sungem.c
index f6fedcc32de1..68872142530b 100644
--- a/drivers/net/sungem.c
+++ b/drivers/net/sungem.c
@@ -2281,14 +2281,12 @@ static void gem_reset_task(struct work_struct *work)
 
         mutex_lock(&gp->pm_mutex);
 
-        napi_disable(&gp->napi);
+        if (gp->opened)
+                napi_disable(&gp->napi);
 
         spin_lock_irq(&gp->lock);
         spin_lock(&gp->tx_lock);
 
-        if (gp->running == 0)
-                goto not_running;
-
         if (gp->running) {
                 netif_stop_queue(gp->dev);
 
@@ -2298,13 +2296,14 @@ static void gem_reset_task(struct work_struct *work)
                         gem_set_link_modes(gp);
                 netif_wake_queue(gp->dev);
         }
- not_running:
+
         gp->reset_task_pending = 0;
 
         spin_unlock(&gp->tx_lock);
         spin_unlock_irq(&gp->lock);
 
-        napi_enable(&gp->napi);
+        if (gp->opened)
+                napi_enable(&gp->napi);
 
         mutex_unlock(&gp->pm_mutex);
 }
diff --git a/drivers/net/tulip/dmfe.c b/drivers/net/tulip/dmfe.c
index ca90566d5bcd..b4891caeae5a 100644
--- a/drivers/net/tulip/dmfe.c
+++ b/drivers/net/tulip/dmfe.c
@@ -2118,8 +2118,8 @@ static int dmfe_suspend(struct pci_dev *pci_dev, pm_message_t state)
         pci_enable_wake(pci_dev, PCI_D3cold, 1);
 
         /* Power down device*/
-        pci_set_power_state(pci_dev, pci_choose_state (pci_dev,state));
         pci_save_state(pci_dev);
+        pci_set_power_state(pci_dev, pci_choose_state (pci_dev, state));
 
         return 0;
 }
@@ -2129,8 +2129,8 @@ static int dmfe_resume(struct pci_dev *pci_dev)
         struct net_device *dev = pci_get_drvdata(pci_dev);
         u32 tmp;
 
-        pci_restore_state(pci_dev);
         pci_set_power_state(pci_dev, PCI_D0);
+        pci_restore_state(pci_dev);
 
         /* Re-initilize DM910X board */
         dmfe_init_dm910x(dev);
diff --git a/drivers/net/ucc_geth.c b/drivers/net/ucc_geth.c
index a3ff270593f1..7f689907ac28 100644
--- a/drivers/net/ucc_geth.c
+++ b/drivers/net/ucc_geth.c
@@ -1460,6 +1460,8 @@ static int adjust_enet_interface(struct ucc_geth_private *ugeth)
         if ((ugeth->phy_interface == PHY_INTERFACE_MODE_RMII) ||
             (ugeth->phy_interface == PHY_INTERFACE_MODE_RGMII) ||
             (ugeth->phy_interface == PHY_INTERFACE_MODE_RGMII_ID) ||
+            (ugeth->phy_interface == PHY_INTERFACE_MODE_RGMII_RXID) ||
+            (ugeth->phy_interface == PHY_INTERFACE_MODE_RGMII_TXID) ||
             (ugeth->phy_interface == PHY_INTERFACE_MODE_RTBI)) {
                 upsmr |= UPSMR_RPM;
                 switch (ugeth->max_speed) {
@@ -1557,6 +1559,8 @@ static void adjust_link(struct net_device *dev)
                                 if ((ugeth->phy_interface == PHY_INTERFACE_MODE_RMII) ||
                                     (ugeth->phy_interface == PHY_INTERFACE_MODE_RGMII) ||
                                     (ugeth->phy_interface == PHY_INTERFACE_MODE_RGMII_ID) ||
+                                    (ugeth->phy_interface == PHY_INTERFACE_MODE_RGMII_RXID) ||
+                                    (ugeth->phy_interface == PHY_INTERFACE_MODE_RGMII_TXID) ||
                                     (ugeth->phy_interface == PHY_INTERFACE_MODE_RTBI)) {
                                         if (phydev->speed == SPEED_10)
                                                 upsmr |= UPSMR_R10M;
@@ -3795,6 +3799,10 @@ static phy_interface_t to_phy_interface(const char *phy_connection_type)
                 return PHY_INTERFACE_MODE_RGMII;
         if (strcasecmp(phy_connection_type, "rgmii-id") == 0)
                 return PHY_INTERFACE_MODE_RGMII_ID;
+        if (strcasecmp(phy_connection_type, "rgmii-txid") == 0)
+                return PHY_INTERFACE_MODE_RGMII_TXID;
+        if (strcasecmp(phy_connection_type, "rgmii-rxid") == 0)
+                return PHY_INTERFACE_MODE_RGMII_RXID;
         if (strcasecmp(phy_connection_type, "rtbi") == 0)
                 return PHY_INTERFACE_MODE_RTBI;
 
@@ -3889,6 +3897,8 @@ static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *ma
                 case PHY_INTERFACE_MODE_GMII:
                 case PHY_INTERFACE_MODE_RGMII:
                 case PHY_INTERFACE_MODE_RGMII_ID:
+                case PHY_INTERFACE_MODE_RGMII_RXID:
+                case PHY_INTERFACE_MODE_RGMII_TXID:
                 case PHY_INTERFACE_MODE_TBI:
                 case PHY_INTERFACE_MODE_RTBI:
                         max_speed = SPEED_1000;
diff --git a/drivers/net/usb/dm9601.c b/drivers/net/usb/dm9601.c
index 2c685734b7a4..1ffdd106f4c4 100644
--- a/drivers/net/usb/dm9601.c
+++ b/drivers/net/usb/dm9601.c
@@ -94,7 +94,7 @@ static void dm_write_async_callback(struct urb *urb)
         struct usb_ctrlrequest *req = (struct usb_ctrlrequest *)urb->context;
 
         if (urb->status < 0)
-                printk(KERN_DEBUG "dm_write_async_callback() failed with %d",
+                printk(KERN_DEBUG "dm_write_async_callback() failed with %d\n",
                        urb->status);
 
         kfree(req);
diff --git a/drivers/net/via-velocity.c b/drivers/net/via-velocity.c
index 450e29d7a9f3..35cd65d6b9ed 100644
--- a/drivers/net/via-velocity.c
+++ b/drivers/net/via-velocity.c
@@ -1242,6 +1242,9 @@ static int velocity_rx_refill(struct velocity_info *vptr)
 static int velocity_init_rd_ring(struct velocity_info *vptr)
 {
         int ret;
+        int mtu = vptr->dev->mtu;
+
+        vptr->rx_buf_sz = (mtu <= ETH_DATA_LEN) ? PKT_BUF_SZ : mtu + 32;
 
         vptr->rd_info = kcalloc(vptr->options.numrx,
                                 sizeof(struct velocity_rd_info), GFP_KERNEL);
@@ -1898,8 +1901,6 @@ static int velocity_open(struct net_device *dev)
         struct velocity_info *vptr = netdev_priv(dev);
         int ret;
 
-        vptr->rx_buf_sz = (dev->mtu <= 1504 ? PKT_BUF_SZ : dev->mtu + 32);
-
         ret = velocity_init_rings(vptr);
         if (ret < 0)
                 goto out;
@@ -1978,12 +1979,6 @@ static int velocity_change_mtu(struct net_device *dev, int new_mtu)
                 velocity_free_rd_ring(vptr);
 
                 dev->mtu = new_mtu;
-                if (new_mtu > 8192)
-                        vptr->rx_buf_sz = 9 * 1024;
-                else if (new_mtu > 4096)
-                        vptr->rx_buf_sz = 8192;
-                else
-                        vptr->rx_buf_sz = 4 * 1024;
 
                 ret = velocity_init_rd_ring(vptr);
                 if (ret < 0)
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index a75be57fb209..5413dbf3d4ac 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -198,8 +198,8 @@ again:
         if (vi->num < vi->max / 2)
                 try_fill_recv(vi);
 
-        /* All done? */
-        if (!skb) {
+        /* Out of packets? */
+        if (received < budget) {
                 netif_rx_complete(vi->dev, napi);
                 if (unlikely(!vi->rvq->vq_ops->restart(vi->rvq))
                     && netif_rx_reschedule(vi->dev, napi))
@@ -404,8 +404,12 @@ free:
 
 static void virtnet_remove(struct virtio_device *vdev)
 {
-        unregister_netdev(vdev->priv);
-        free_netdev(vdev->priv);
+        struct virtnet_info *vi = vdev->priv;
+
+        vdev->config->del_vq(vi->svq);
+        vdev->config->del_vq(vi->rvq);
+        unregister_netdev(vi->dev);
+        free_netdev(vi->dev);
 }
 
 static struct virtio_device_id id_table[] = {
diff --git a/drivers/net/wan/syncppp.c b/drivers/net/wan/syncppp.c
index 232ecba5340f..61e24b7a45a3 100644
--- a/drivers/net/wan/syncppp.c
+++ b/drivers/net/wan/syncppp.c
@@ -107,24 +107,24 @@
 struct ppp_header {
         u8 address;
         u8 control;
-        u16 protocol;
+        __be16 protocol;
 };
 #define PPP_HEADER_LEN          sizeof (struct ppp_header)
 
 struct lcp_header {
         u8 type;
         u8 ident;
-        u16 len;
+        __be16 len;
 };
 #define LCP_HEADER_LEN          sizeof (struct lcp_header)
 
 struct cisco_packet {
-        u32 type;
-        u32 par1;
-        u32 par2;
-        u16 rel;
-        u16 time0;
-        u16 time1;
+        __be32 type;
+        __be32 par1;
+        __be32 par2;
+        __be16 rel;
+        __be16 time0;
+        __be16 time1;
 };
 #define CISCO_PACKET_LEN 18
 #define CISCO_BIG_PACKET_LEN 20
@@ -139,7 +139,7 @@ static struct sk_buff_head tx_queue;
 static void sppp_keepalive (unsigned long dummy);
 static void sppp_cp_send (struct sppp *sp, u16 proto, u8 type,
         u8 ident, u16 len, void *data);
-static void sppp_cisco_send (struct sppp *sp, int type, long par1, long par2);
+static void sppp_cisco_send (struct sppp *sp, int type, u32 par1, u32 par2);
 static void sppp_lcp_input (struct sppp *sp, struct sk_buff *m);
 static void sppp_cisco_input (struct sppp *sp, struct sk_buff *m);
 static void sppp_ipcp_input (struct sppp *sp, struct sk_buff *m);
@@ -447,7 +447,7 @@ static void sppp_keepalive (unsigned long dummy)
                         sppp_cisco_send (sp, CISCO_KEEPALIVE_REQ, ++sp->pp_seq,
                                 sp->pp_rseq);
                 else if (sp->lcp.state == LCP_STATE_OPENED) {
-                        long nmagic = htonl (sp->lcp.magic);
+                        __be32 nmagic = htonl (sp->lcp.magic);
                         sp->lcp.echoid = ++sp->pp_seq;
                         sppp_cp_send (sp, PPP_LCP, LCP_ECHO_REQ,
                                 sp->lcp.echoid, 4, &nmagic);
@@ -667,7 +667,7 @@ badreq:
                                         dev->name, len);
                         break;
                 }
-                if (ntohl (*(long*)(h+1)) == sp->lcp.magic) {
+                if (ntohl (*(__be32*)(h+1)) == sp->lcp.magic) {
                         /* Line loopback mode detected. */
                         printk (KERN_WARNING "%s: loopback\n", dev->name);
                         if_down (dev);
@@ -680,7 +680,7 @@ badreq:
                         sppp_lcp_open (sp);
                         break;
                 }
-                *(long*)(h+1) = htonl (sp->lcp.magic);
+                *(__be32 *)(h+1) = htonl (sp->lcp.magic);
                 sppp_cp_send (sp, PPP_LCP, LCP_ECHO_REPLY, h->ident, len-4, h+1);
                 break;
         case LCP_ECHO_REPLY:
@@ -692,7 +692,7 @@ badreq:
                                         dev->name, len);
                         break;
                 }
-                if (ntohl (*(long*)(h+1)) != sp->lcp.magic)
+                if (ntohl(*(__be32 *)(h+1)) != sp->lcp.magic)
                 sp->pp_alivecnt = 0;
                 break;
         }
@@ -765,7 +765,7 @@ static void sppp_cisco_input (struct sppp *sp, struct sk_buff *skb)
                 {
                 struct in_device *in_dev;
                 struct in_ifaddr *ifa;
-                __be32 addr = 0, mask = ~0; /* FIXME: is the mask correct? */
+                __be32 addr = 0, mask = htonl(~0U); /* FIXME: is the mask correct? */
 #ifdef CONFIG_INET
                 rcu_read_lock();
                 if ((in_dev = __in_dev_get_rcu(dev)) != NULL)
@@ -782,8 +782,7 @@ static void sppp_cisco_input (struct sppp *sp, struct sk_buff *skb)
                 }
                 rcu_read_unlock();
 #endif          
-                /* I hope both addr and mask are in the net order */
-                sppp_cisco_send (sp, CISCO_ADDR_REPLY, addr, mask);
+                sppp_cisco_send (sp, CISCO_ADDR_REPLY, ntohl(addr), ntohl(mask));
                 break;
                 }
         }
@@ -844,7 +843,7 @@ static void sppp_cp_send (struct sppp *sp, u16 proto, u8 type,
  * Send Cisco keepalive packet.
  */
 
-static void sppp_cisco_send (struct sppp *sp, int type, long par1, long par2)
+static void sppp_cisco_send (struct sppp *sp, int type, u32 par1, u32 par2)
 {
         struct ppp_header *h;
         struct cisco_packet *ch;
@@ -868,7 +867,7 @@ static void sppp_cisco_send (struct sppp *sp, int type, long par1, long par2)
         ch->type = htonl (type);
         ch->par1 = htonl (par1);
         ch->par2 = htonl (par2);
-        ch->rel = -1;
+        ch->rel = htons(0xffff);
         ch->time0 = htons ((u16) (t >> 16));
         ch->time1 = htons ((u16) t);
 
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index 2b17c1dc46f1..b45eecc53c4a 100644
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -1566,7 +1566,7 @@ static void b43_release_firmware(struct b43_wldev *dev)
 static void b43_print_fw_helptext(struct b43_wl *wl)
 {
         b43err(wl, "You must go to "
-               "http://linuxwireless.org/en/users/Drivers/bcm43xx#devicefirmware "
+               "http://linuxwireless.org/en/users/Drivers/b43#devicefirmware "
                "and download the correct firmware (version 4).\n");
 }
 
diff --git a/drivers/net/wireless/b43/phy.c b/drivers/net/wireless/b43/phy.c
index 3d4ed647c311..7ff091e69f05 100644
--- a/drivers/net/wireless/b43/phy.c
+++ b/drivers/net/wireless/b43/phy.c
@@ -2214,7 +2214,7 @@ int b43_phy_init_tssi2dbm_table(struct b43_wldev *dev)
                 }
                 dyn_tssi2dbm = kmalloc(64, GFP_KERNEL);
                 if (dyn_tssi2dbm == NULL) {
-                        b43err(dev->wl, "Could not allocate memory"
+                        b43err(dev->wl, "Could not allocate memory "
                                "for tssi2dbm table\n");
                         return -ENOMEM;
                 }
diff --git a/drivers/net/wireless/b43legacy/dma.c b/drivers/net/wireless/b43legacy/dma.c
index 8cb3dc4c4745..83161d9af813 100644
--- a/drivers/net/wireless/b43legacy/dma.c
+++ b/drivers/net/wireless/b43legacy/dma.c
@@ -996,7 +996,7 @@ int b43legacy_dma_init(struct b43legacy_wldev *dev)
 
         err = ssb_dma_set_mask(dev->dev, dmamask);
         if (err) {
-#ifdef BCM43XX_PIO
+#ifdef CONFIG_B43LEGACY_PIO
                 b43legacywarn(dev->wl, "DMA for this device not supported. "
                         "Falling back to PIO\n");
                 dev->__using_pio = 1;
diff --git a/drivers/net/wireless/b43legacy/main.c b/drivers/net/wireless/b43legacy/main.c
index 3bde1e9ab428..32d5e1785bda 100644
--- a/drivers/net/wireless/b43legacy/main.c
+++ b/drivers/net/wireless/b43legacy/main.c
@@ -1419,7 +1419,7 @@ static void b43legacy_release_firmware(struct b43legacy_wldev *dev)
 static void b43legacy_print_fw_helptext(struct b43legacy_wl *wl)
 {
         b43legacyerr(wl, "You must go to http://linuxwireless.org/en/users/"
-                     "Drivers/bcm43xx#devicefirmware "
+                     "Drivers/b43#devicefirmware "
                      "and download the correct firmware (version 3).\n");
 }
 
diff --git a/drivers/net/wireless/b43legacy/phy.c b/drivers/net/wireless/b43legacy/phy.c
index 22a4b3d0186d..491e518e4aeb 100644
--- a/drivers/net/wireless/b43legacy/phy.c
+++ b/drivers/net/wireless/b43legacy/phy.c
@@ -2020,7 +2020,7 @@ int b43legacy_phy_init_tssi2dbm_table(struct b43legacy_wldev *dev)
                         phy->idle_tssi = 62;
                 dyn_tssi2dbm = kmalloc(64, GFP_KERNEL);
                 if (dyn_tssi2dbm == NULL) {
-                        b43legacyerr(dev->wl, "Could not allocate memory"
+                        b43legacyerr(dev->wl, "Could not allocate memory "
                                "for tssi2dbm table\n");
                         return -ENOMEM;
                 }
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_phy.c b/drivers/net/wireless/bcm43xx/bcm43xx_phy.c
index b37f1e348700..af3de3343650 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx_phy.c
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_phy.c
@@ -2149,7 +2149,7 @@ int bcm43xx_phy_init_tssi2dbm_table(struct bcm43xx_private *bcm)
                 }
                 dyn_tssi2dbm = kmalloc(64, GFP_KERNEL);
                 if (dyn_tssi2dbm == NULL) {
-                        printk(KERN_ERR PFX "Could not allocate memory"
+                        printk(KERN_ERR PFX "Could not allocate memory "
                                             "for tssi2dbm table\n");
                         return -ENOMEM;
                 }
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
index 465da4f67ce7..4bdf237f6adc 100644
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -2915,6 +2915,10 @@ static void iwl_set_rate(struct iwl_priv *priv)
         int i;
 
         hw = iwl_get_hw_mode(priv, priv->phymode);
+        if (!hw) {
+                IWL_ERROR("Failed to set rate: unable to get hw mode\n");
+                return;
+        }
 
         priv->active_rate = 0;
         priv->active_rate_basic = 0;
@@ -6936,13 +6940,10 @@ static int iwl_mac_add_interface(struct ieee80211_hw *hw,
         DECLARE_MAC_BUF(mac);
 
         IWL_DEBUG_MAC80211("enter: id %d, type %d\n", conf->if_id, conf->type);
-        if (conf->mac_addr)
-                IWL_DEBUG_MAC80211("enter: MAC %s\n",
-                                   print_mac(mac, conf->mac_addr));
 
         if (priv->interface_id) {
                 IWL_DEBUG_MAC80211("leave - interface_id != 0\n");
-                return 0;
+                return -EOPNOTSUPP;
         }
 
         spin_lock_irqsave(&priv->lock, flags);
@@ -6951,6 +6952,12 @@ static int iwl_mac_add_interface(struct ieee80211_hw *hw,
         spin_unlock_irqrestore(&priv->lock, flags);
 
         mutex_lock(&priv->mutex);
+
+        if (conf->mac_addr) {
+                IWL_DEBUG_MAC80211("Set: %s\n", print_mac(mac, conf->mac_addr));
+                memcpy(priv->mac_addr, conf->mac_addr, ETH_ALEN);
+        }
+
         iwl_set_mode(priv, conf->type);
 
         IWL_DEBUG_MAC80211("leave\n");
@@ -8270,6 +8277,7 @@ static void iwl_cancel_deferred_work(struct iwl_priv *priv)
 {
         iwl_hw_cancel_deferred_work(priv);
 
+        cancel_delayed_work_sync(&priv->init_alive_start);
         cancel_delayed_work(&priv->scan_check);
         cancel_delayed_work(&priv->alive_start);
         cancel_delayed_work(&priv->post_associate);
diff --git a/drivers/net/wireless/iwlwifi/iwl4965-base.c b/drivers/net/wireless/iwlwifi/iwl4965-base.c
index 9918780f5e86..8f85564ec6fa 100644
--- a/drivers/net/wireless/iwlwifi/iwl4965-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl4965-base.c
@@ -3003,6 +3003,10 @@ static void iwl_set_rate(struct iwl_priv *priv)
         int i;
 
         hw = iwl_get_hw_mode(priv, priv->phymode);
+        if (!hw) {
+                IWL_ERROR("Failed to set rate: unable to get hw mode\n");
+                return;
+        }
 
         priv->active_rate = 0;
         priv->active_rate_basic = 0;
@@ -7326,9 +7330,6 @@ static int iwl_mac_add_interface(struct ieee80211_hw *hw,
         DECLARE_MAC_BUF(mac);
 
         IWL_DEBUG_MAC80211("enter: id %d, type %d\n", conf->if_id, conf->type);
-        if (conf->mac_addr)
-                IWL_DEBUG_MAC80211("enter: MAC %s\n",
-                                   print_mac(mac, conf->mac_addr));
 
         if (priv->interface_id) {
                 IWL_DEBUG_MAC80211("leave - interface_id != 0\n");
@@ -7341,6 +7342,11 @@ static int iwl_mac_add_interface(struct ieee80211_hw *hw,
         spin_unlock_irqrestore(&priv->lock, flags);
 
         mutex_lock(&priv->mutex);
+
+        if (conf->mac_addr) {
+                IWL_DEBUG_MAC80211("Set %s\n", print_mac(mac, conf->mac_addr));
+                memcpy(priv->mac_addr, conf->mac_addr, ETH_ALEN);
+        }
         iwl_set_mode(priv, conf->type);
 
         IWL_DEBUG_MAC80211("leave\n");
@@ -8864,6 +8870,7 @@ static void iwl_cancel_deferred_work(struct iwl_priv *priv)
 {
         iwl_hw_cancel_deferred_work(priv);
 
+        cancel_delayed_work_sync(&priv->init_alive_start);
         cancel_delayed_work(&priv->scan_check);
         cancel_delayed_work(&priv->alive_start);
         cancel_delayed_work(&priv->post_associate);
diff --git a/drivers/net/wireless/libertas/if_cs.c b/drivers/net/wireless/libertas/if_cs.c
index ec89dabc412c..ba4fc2b3bf0a 100644
--- a/drivers/net/wireless/libertas/if_cs.c
+++ b/drivers/net/wireless/libertas/if_cs.c
@@ -170,7 +170,8 @@ static int if_cs_poll_while_fw_download(struct if_cs_card *card, uint addr, u8 r
 #define IF_CS_H_IC_TX_OVER              0x0001
 #define IF_CS_H_IC_RX_OVER              0x0002
 #define IF_CS_H_IC_DNLD_OVER            0x0004
-#define IF_CS_H_IC_HOST_EVENT           0x0008
+#define IF_CS_H_IC_POWER_DOWN           0x0008
+#define IF_CS_H_IC_HOST_EVENT           0x0010
 #define IF_CS_H_IC_MASK                 0x001f
 
 #define IF_CS_H_INT_MASK                0x00000004
diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c
index 5ead08312e1e..1823b48a8ba7 100644
--- a/drivers/net/wireless/libertas/main.c
+++ b/drivers/net/wireless/libertas/main.c
@@ -1165,8 +1165,6 @@ wlan_private *libertas_add_card(void *card, struct device *dmdev)
 #ifdef  WIRELESS_EXT
         dev->wireless_handlers = (struct iw_handler_def *)&libertas_handler_def;
 #endif
-#define NETIF_F_DYNALLOC 16
-        dev->features |= NETIF_F_DYNALLOC;
         dev->flags |= IFF_BROADCAST | IFF_MULTICAST;
         dev->set_multicast_list = libertas_set_multicast_list;
 
@@ -1348,8 +1346,6 @@ int libertas_add_mesh(wlan_private *priv, struct device *dev)
 #ifdef  WIRELESS_EXT
         mesh_dev->wireless_handlers = (struct iw_handler_def *)&mesh_handler_def;
 #endif
-#define NETIF_F_DYNALLOC 16
-
         /* Register virtual mesh interface */
         ret = register_netdev(mesh_dev);
         if (ret) {
diff --git a/drivers/net/wireless/libertas/wext.c b/drivers/net/wireless/libertas/wext.c
index c6f5aa3cb465..395b7882d4d6 100644
--- a/drivers/net/wireless/libertas/wext.c
+++ b/drivers/net/wireless/libertas/wext.c
@@ -1528,7 +1528,7 @@ static int wlan_set_encodeext(struct net_device *dev,
                         && (ext->key_len != KEY_LEN_WPA_TKIP))
                     || ((alg == IW_ENCODE_ALG_CCMP)
                         && (ext->key_len != KEY_LEN_WPA_AES))) {
-                                lbs_deb_wext("invalid size %d for key of alg"
+                                lbs_deb_wext("invalid size %d for key of alg "
                                        "type %d\n",
                                        ext->key_len,
                                        alg);
diff --git a/drivers/net/wireless/netwave_cs.c b/drivers/net/wireless/netwave_cs.c
index 2402cb8dd328..d2fa079fbc4c 100644
--- a/drivers/net/wireless/netwave_cs.c
+++ b/drivers/net/wireless/netwave_cs.c
@@ -806,7 +806,7 @@ static int netwave_pcmcia_config(struct pcmcia_device *link) {
     for (i = 0; i < 6; i++) 
         dev->dev_addr[i] = readb(ramBase + NETWAVE_EREG_PA + i);
 
-    printk(KERN_INFO "%s: Netwave: port %#3lx, irq %d, mem %lx"
+    printk(KERN_INFO "%s: Netwave: port %#3lx, irq %d, mem %lx, "
            "id %c%c, hw_addr %s\n",
            dev->name, dev->base_addr, dev->irq,
            (u_long) ramBase,
diff --git a/drivers/net/wireless/p54usb.c b/drivers/net/wireless/p54usb.c
index 755482a5a938..60d286eb0b8b 100644
--- a/drivers/net/wireless/p54usb.c
+++ b/drivers/net/wireless/p54usb.c
@@ -308,7 +308,7 @@ static int p54u_read_eeprom(struct ieee80211_hw *dev)
 
         buf = kmalloc(0x2020, GFP_KERNEL);
         if (!buf) {
-                printk(KERN_ERR "prism54usb: cannot allocate memory for"
+                printk(KERN_ERR "prism54usb: cannot allocate memory for "
                        "eeprom readback!\n");
                 return -ENOMEM;
         }
diff --git a/drivers/net/wireless/rt2x00/rt2500usb.c b/drivers/net/wireless/rt2x00/rt2500usb.c
index 277a020b35e9..50775f9234cc 100644
--- a/drivers/net/wireless/rt2x00/rt2500usb.c
+++ b/drivers/net/wireless/rt2x00/rt2500usb.c
@@ -1032,7 +1032,7 @@ static void rt2500usb_write_tx_desc(struct rt2x00_dev *rt2x00dev,
 }
 
 static int rt2500usb_get_tx_data_len(struct rt2x00_dev *rt2x00dev,
-                                     int maxpacket, struct sk_buff *skb)
+                                     struct sk_buff *skb)
 {
         int length;
 
@@ -1041,7 +1041,7 @@ static int rt2500usb_get_tx_data_len(struct rt2x00_dev *rt2x00dev,
          * but it must _not_ be a multiple of the USB packet size.
          */
         length = roundup(skb->len, 2);
-        length += (2 * !(length % maxpacket));
+        length += (2 * !(length % rt2x00dev->usb_maxpacket));
 
         return length;
 }
@@ -1643,7 +1643,6 @@ static int rt2500usb_beacon_update(struct ieee80211_hw *hw,
         struct data_entry *beacon;
         struct data_entry *guardian;
         int pipe = usb_sndbulkpipe(usb_dev, 1);
-        int max_packet = usb_maxpacket(usb_dev, pipe, 1);
         int length;
 
         /*
@@ -1672,7 +1671,7 @@ static int rt2500usb_beacon_update(struct ieee80211_hw *hw,
                                                          ring->desc_size),
                                 skb->len - ring->desc_size, control);
 
-        length = rt2500usb_get_tx_data_len(rt2x00dev, max_packet, skb);
+        length = rt2500usb_get_tx_data_len(rt2x00dev, skb);
 
         usb_fill_bulk_urb(beacon->priv, usb_dev, pipe,
                           skb->data, length, rt2500usb_beacondone, beacon);
diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
index d1ad5251a77a..c8f16f161c28 100644
--- a/drivers/net/wireless/rt2x00/rt2x00.h
+++ b/drivers/net/wireless/rt2x00/rt2x00.h
@@ -418,7 +418,7 @@ struct rt2x00lib_ops {
         int (*write_tx_data) (struct rt2x00_dev *rt2x00dev,
                               struct data_ring *ring, struct sk_buff *skb,
                               struct ieee80211_tx_control *control);
-        int (*get_tx_data_len) (struct rt2x00_dev *rt2x00dev, int maxpacket,
+        int (*get_tx_data_len) (struct rt2x00_dev *rt2x00dev,
                                 struct sk_buff *skb);
         void (*kick_tx_queue) (struct rt2x00_dev *rt2x00dev,
                                unsigned int queue);
@@ -599,6 +599,11 @@ struct rt2x00_dev {
         u32 *rf;
 
         /*
+         * USB Max frame size (for rt2500usb & rt73usb).
+         */
+        u16 usb_maxpacket;
+
+        /*
          * Current TX power value.
          */
         u16 tx_power;
diff --git a/drivers/net/wireless/rt2x00/rt2x00usb.c b/drivers/net/wireless/rt2x00/rt2x00usb.c
index 73cc726c4046..1f5675dd329f 100644
--- a/drivers/net/wireless/rt2x00/rt2x00usb.c
+++ b/drivers/net/wireless/rt2x00/rt2x00usb.c
@@ -159,7 +159,6 @@ int rt2x00usb_write_tx_data(struct rt2x00_dev *rt2x00dev,
             interface_to_usbdev(rt2x00dev_usb(rt2x00dev));
         struct data_entry *entry = rt2x00_get_data_entry(ring);
         int pipe = usb_sndbulkpipe(usb_dev, 1);
-        int max_packet = usb_maxpacket(usb_dev, pipe, 1);
         u32 length;
 
         if (rt2x00_ring_full(ring)) {
@@ -194,8 +193,7 @@ int rt2x00usb_write_tx_data(struct rt2x00_dev *rt2x00dev,
          * length of the data to usb_fill_bulk_urb. Pass the skb
          * to the driver to determine what the length should be.
          */
-        length = rt2x00dev->ops->lib->get_tx_data_len(rt2x00dev,
-                                                      max_packet, skb);
+        length = rt2x00dev->ops->lib->get_tx_data_len(rt2x00dev, skb);
 
         /*
          * Initialize URB and send the frame to the device.
@@ -490,6 +488,11 @@ int rt2x00usb_probe(struct usb_interface *usb_intf,
         rt2x00dev->ops = ops;
         rt2x00dev->hw = hw;
 
+        rt2x00dev->usb_maxpacket =
+            usb_maxpacket(usb_dev, usb_sndbulkpipe(usb_dev, 1), 1);
+        if (!rt2x00dev->usb_maxpacket)
+                rt2x00dev->usb_maxpacket = 1;
+
         retval = rt2x00usb_alloc_reg(rt2x00dev);
         if (retval)
                 goto exit_free_device;
diff --git a/drivers/net/wireless/rt2x00/rt73usb.c b/drivers/net/wireless/rt2x00/rt73usb.c
index dc640bf6b5eb..c0671c2e6e73 100644
--- a/drivers/net/wireless/rt2x00/rt73usb.c
+++ b/drivers/net/wireless/rt2x00/rt73usb.c
@@ -1251,7 +1251,7 @@ static void rt73usb_write_tx_desc(struct rt2x00_dev *rt2x00dev,
 }
 
 static int rt73usb_get_tx_data_len(struct rt2x00_dev *rt2x00dev,
-                                   int maxpacket, struct sk_buff *skb)
+                                   struct sk_buff *skb)
 {
         int length;
 
@@ -1260,7 +1260,7 @@ static int rt73usb_get_tx_data_len(struct rt2x00_dev *rt2x00dev,
          * but it must _not_ be a multiple of the USB packet size.
          */
         length = roundup(skb->len, 4);
-        length += (4 * !(length % maxpacket));
+        length += (4 * !(length % rt2x00dev->usb_maxpacket));
 
         return length;
 }
diff --git a/drivers/parisc/lba_pci.c b/drivers/parisc/lba_pci.c
index 5eace9e66e14..66ce61048361 100644
--- a/drivers/parisc/lba_pci.c
+++ b/drivers/parisc/lba_pci.c
@@ -768,9 +768,13 @@ lba_fixup_bus(struct pci_bus *bus)
                                 DBG("lba_fixup_bus() WTF? 0x%lx [%lx/%lx] XXX",
                                         res->flags, res->start, res->end);
                         }
-                        if ((i != PCI_ROM_RESOURCE) ||
-                            (res->flags & IORESOURCE_ROM_ENABLE))
-                                pci_claim_resource(dev, i);
+
+                        /*
+                        ** FIXME: this will result in whinging for devices
+                        ** that share expansion ROMs (think quad tulip), but
+                        ** isn't harmful.
+                        */
+                        pci_claim_resource(dev, i);
                 }
 
 #ifdef FBB_SUPPORT
diff --git a/drivers/pci/hotplug/acpiphp.h b/drivers/pci/hotplug/acpiphp.h
index f6cc0c5b5657..1ef417cca2db 100644
--- a/drivers/pci/hotplug/acpiphp.h
+++ b/drivers/pci/hotplug/acpiphp.h
@@ -66,7 +66,7 @@ struct slot {
         char name[SLOT_NAME_SIZE];
 };
 
-/**
+/*
  * struct acpiphp_bridge - PCI bridge information
  *
  * for each bridge device in ACPI namespace
@@ -97,7 +97,7 @@ struct acpiphp_bridge {
 };
 
 
-/**
+/*
  * struct acpiphp_slot - PCI slot information
  *
  * PCI slot information for each *physical* PCI slot
@@ -118,7 +118,7 @@ struct acpiphp_slot {
 };
 
 
-/**
+/*
  * struct acpiphp_func - PCI function information
  *
  * PCI function information for each object in ACPI namespace
@@ -137,7 +137,7 @@ struct acpiphp_func {
         u32             flags;          /* see below */
 };
 
-/**
+/*
  * struct acpiphp_attention_info - device specific attention registration
  *
  * ACPI has no generic method of setting/getting attention status
diff --git a/drivers/pci/hotplug/acpiphp_core.c b/drivers/pci/hotplug/acpiphp_core.c
index a0ca63adad5a..c8c263875c21 100644
--- a/drivers/pci/hotplug/acpiphp_core.c
+++ b/drivers/pci/hotplug/acpiphp_core.c
@@ -91,10 +91,10 @@ static struct hotplug_slot_ops acpi_hotplug_slot_ops = {
  * acpiphp_register_attention - set attention LED callback
  * @info: must be completely filled with LED callbacks
  *
- * Description: this is used to register a hardware specific ACPI
+ * Description: This is used to register a hardware specific ACPI
  * driver that manipulates the attention LED.  All the fields in
  * info must be set.
- **/
+ */
 int acpiphp_register_attention(struct acpiphp_attention_info *info)
 {
         int retval = -EINVAL;
@@ -112,10 +112,10 @@ int acpiphp_register_attention(struct acpiphp_attention_info *info)
  * acpiphp_unregister_attention - unset attention LED callback
  * @info: must match the pointer used to register
  *
- * Description: this is used to un-register a hardware specific acpi
+ * Description: This is used to un-register a hardware specific acpi
  * driver that manipulates the attention LED.  The pointer to the 
  * info struct must be the same as the one used to set it.
- **/
+ */
 int acpiphp_unregister_attention(struct acpiphp_attention_info *info)
 {
         int retval = -EINVAL;
@@ -133,7 +133,6 @@ int acpiphp_unregister_attention(struct acpiphp_attention_info *info)
  * @hotplug_slot: slot to enable
  *
  * Actual tasks are done in acpiphp_enable_slot()
- *
  */
 static int enable_slot(struct hotplug_slot *hotplug_slot)
 {
@@ -151,7 +150,6 @@ static int enable_slot(struct hotplug_slot *hotplug_slot)
  * @hotplug_slot: slot to disable
  *
  * Actual tasks are done in acpiphp_disable_slot()
- *
  */
 static int disable_slot(struct hotplug_slot *hotplug_slot)
 {
@@ -168,15 +166,15 @@ static int disable_slot(struct hotplug_slot *hotplug_slot)
 }
 
 
- /**
-  * set_attention_status - set attention LED
+/**
+ * set_attention_status - set attention LED
  * @hotplug_slot: slot to set attention LED on
  * @status: value to set attention LED to (0 or 1)
  *
  * attention status LED, so we use a callback that
  * was registered with us.  This allows hardware specific
  * ACPI implementations to blink the light for us.
- **/
+ */
  static int set_attention_status(struct hotplug_slot *hotplug_slot, u8 status)
  {
         int retval = -ENODEV;
@@ -199,7 +197,6 @@ static int disable_slot(struct hotplug_slot *hotplug_slot)
  *
  * Some platforms may not implement _STA method properly.
  * In that case, the value returned may not be reliable.
- *
  */
 static int get_power_status(struct hotplug_slot *hotplug_slot, u8 *value)
 {
@@ -213,7 +210,7 @@ static int get_power_status(struct hotplug_slot *hotplug_slot, u8 *value)
 }
 
 
- /**
+/**
  * get_attention_status - get attention LED status
  * @hotplug_slot: slot to get status from
  * @value: returns with value of attention LED
@@ -221,8 +218,8 @@ static int get_power_status(struct hotplug_slot *hotplug_slot, u8 *value)
  * ACPI doesn't have known method to determine the state
  * of the attention status LED, so we use a callback that
  * was registered with us.  This allows hardware specific
- * ACPI implementations to determine its state
- **/
+ * ACPI implementations to determine its state.
+ */
 static int get_attention_status(struct hotplug_slot *hotplug_slot, u8 *value)
 {
         int retval = -EINVAL;
@@ -244,8 +241,7 @@ static int get_attention_status(struct hotplug_slot *hotplug_slot, u8 *value)
  * @value: pointer to store status
  *
  * ACPI doesn't provide any formal means to access latch status.
- * Instead, we fake latch status from _STA
- *
+ * Instead, we fake latch status from _STA.
  */
 static int get_latch_status(struct hotplug_slot *hotplug_slot, u8 *value)
 {
@@ -265,8 +261,7 @@ static int get_latch_status(struct hotplug_slot *hotplug_slot, u8 *value)
  * @value: pointer to store status
  *
  * ACPI doesn't provide any formal means to access adapter status.
- * Instead, we fake adapter status from _STA
- *
+ * Instead, we fake adapter status from _STA.
  */
 static int get_adapter_status(struct hotplug_slot *hotplug_slot, u8 *value)
 {
diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c
index 1e125b56c9a9..ff1b1c71291a 100644
--- a/drivers/pci/hotplug/acpiphp_glue.c
+++ b/drivers/pci/hotplug/acpiphp_glue.c
@@ -82,7 +82,6 @@ static void handle_hotplug_event_func(acpi_handle handle, u32 type, void *contex
  *  2. has _PS0 method
  *  3. has _PS3 method
  *  4. ..
- *
  */
 static int is_ejectable(acpi_handle handle)
 {
@@ -986,10 +985,8 @@ static int power_off_slot(struct acpiphp_slot *slot)
 
 
 /**
- * acpiphp_max_busnr - return the highest reserved bus number under
- * the given bus.
+ * acpiphp_max_busnr - return the highest reserved bus number under the given bus.
  * @bus: bus to start search with
- *
  */
 static unsigned char acpiphp_max_busnr(struct pci_bus *bus)
 {
@@ -1018,7 +1015,6 @@ static unsigned char acpiphp_max_busnr(struct pci_bus *bus)
 /**
  * acpiphp_bus_add - add a new bus to acpi subsystem
  * @func: acpiphp_func of the bridge
- *
  */
 static int acpiphp_bus_add(struct acpiphp_func *func)
 {
@@ -1063,7 +1059,6 @@ acpiphp_bus_add_out:
 /**
  * acpiphp_bus_trim - trim a bus from acpi subsystem
  * @handle: handle to acpi namespace
- *
  */
 static int acpiphp_bus_trim(acpi_handle handle)
 {
@@ -1089,7 +1084,6 @@ static int acpiphp_bus_trim(acpi_handle handle)
  *
  * This function should be called per *physical slot*,
  * not per each slot object in ACPI namespace.
- *
  */
 static int enable_device(struct acpiphp_slot *slot)
 {
@@ -1185,6 +1179,7 @@ static void disable_bridges(struct pci_bus *bus)
 
 /**
  * disable_device - disable a slot
+ * @slot: ACPI PHP slot
  */
 static int disable_device(struct acpiphp_slot *slot)
 {
@@ -1240,14 +1235,15 @@ static int disable_device(struct acpiphp_slot *slot)
 
 /**
  * get_slot_status - get ACPI slot status
+ * @slot: ACPI PHP slot
  *
- * if a slot has _STA for each function and if any one of them
- * returned non-zero status, return it
+ * If a slot has _STA for each function and if any one of them
+ * returned non-zero status, return it.
  *
- * if a slot doesn't have _STA and if any one of its functions'
- * configuration space is configured, return 0x0f as a _STA
+ * If a slot doesn't have _STA and if any one of its functions'
+ * configuration space is configured, return 0x0f as a _STA.
  *
- * otherwise return 0
+ * Otherwise return 0.
  */
 static unsigned int get_slot_status(struct acpiphp_slot *slot)
 {
@@ -1281,6 +1277,7 @@ static unsigned int get_slot_status(struct acpiphp_slot *slot)
 
 /**
  * acpiphp_eject_slot - physically eject the slot
+ * @slot: ACPI PHP slot
  */
 int acpiphp_eject_slot(struct acpiphp_slot *slot)
 {
@@ -1314,6 +1311,7 @@ int acpiphp_eject_slot(struct acpiphp_slot *slot)
 
 /**
  * acpiphp_check_bridge - re-enumerate devices
+ * @bridge: where to begin re-enumeration
  *
  * Iterate over all slots under this bridge and make sure that if a
  * card is present they are enabled, and if not they are disabled.
@@ -1538,13 +1536,11 @@ check_sub_bridges(acpi_handle handle, u32 lvl, void *context, void **rv)
 
 /**
  * handle_hotplug_event_bridge - handle ACPI event on bridges
- *
  * @handle: Notify()'ed acpi_handle
  * @type: Notify code
  * @context: pointer to acpiphp_bridge structure
  *
- * handles ACPI event notification on {host,p2p} bridges
- *
+ * Handles ACPI event notification on {host,p2p} bridges.
  */
 static void handle_hotplug_event_bridge(acpi_handle handle, u32 type, void *context)
 {
@@ -1634,13 +1630,11 @@ static void handle_hotplug_event_bridge(acpi_handle handle, u32 type, void *cont
 
 /**
  * handle_hotplug_event_func - handle ACPI event on functions (i.e. slots)
- *
  * @handle: Notify()'ed acpi_handle
  * @type: Notify code
  * @context: pointer to acpiphp_func structure
  *
- * handles ACPI event notification on slots
- *
+ * Handles ACPI event notification on slots.
  */
 static void handle_hotplug_event_func(acpi_handle handle, u32 type, void *context)
 {
@@ -1705,7 +1699,6 @@ static struct acpi_pci_driver acpi_pci_hp_driver = {
 
 /**
  * acpiphp_glue_init - initializes all PCI hotplug - ACPI glue data structures
- *
  */
 int __init acpiphp_glue_init(void)
 {
@@ -1726,7 +1719,7 @@ int __init acpiphp_glue_init(void)
 /**
  * acpiphp_glue_exit - terminates all PCI hotplug - ACPI glue data structures
  *
- * This function frees all data allocated in acpiphp_glue_init()
+ * This function frees all data allocated in acpiphp_glue_init().
  */
 void  acpiphp_glue_exit(void)
 {
@@ -1760,7 +1753,6 @@ int __init acpiphp_get_num_slots(void)
  * acpiphp_for_each_slot - call function for each slot
  * @fn: callback function
  * @data: context to be passed to callback function
- *
  */
 static int acpiphp_for_each_slot(acpiphp_callback fn, void *data)
 {
@@ -1786,6 +1778,7 @@ static int acpiphp_for_each_slot(acpiphp_callback fn, void *data)
 
 /**
  * acpiphp_enable_slot - power on slot
+ * @slot: ACPI PHP slot
  */
 int acpiphp_enable_slot(struct acpiphp_slot *slot)
 {
@@ -1815,6 +1808,7 @@ int acpiphp_enable_slot(struct acpiphp_slot *slot)
 
 /**
  * acpiphp_disable_slot - power off slot
+ * @slot: ACPI PHP slot
  */
 int acpiphp_disable_slot(struct acpiphp_slot *slot)
 {
diff --git a/drivers/pci/hotplug/acpiphp_ibm.c b/drivers/pci/hotplug/acpiphp_ibm.c
index 56829f82be4a..47d26b65e99a 100644
--- a/drivers/pci/hotplug/acpiphp_ibm.c
+++ b/drivers/pci/hotplug/acpiphp_ibm.c
@@ -134,11 +134,11 @@ static struct acpiphp_attention_info ibm_attention_info =
  * ibm_slot_from_id - workaround for bad ibm hardware
  * @id: the slot number that linux refers to the slot by
  *
- * Description: this method returns the aCPI slot descriptor
+ * Description: This method returns the aCPI slot descriptor
  * corresponding to the Linux slot number.  This descriptor
  * has info about the aPCI slot id and attention status.
  * This descriptor must be freed using kfree when done.
- **/
+ */
 static union apci_descriptor *ibm_slot_from_id(int id)
 {
         int ind = 0, size;
@@ -173,9 +173,9 @@ ibm_slot_done:
  * @slot: the hotplug_slot to work with
  * @status: what to set the LED to (0 or 1)
  *
- * Description: this method is registered with the acpiphp module as a
- * callback to do the device specific task of setting the LED status
- **/
+ * Description: This method is registered with the acpiphp module as a
+ * callback to do the device specific task of setting the LED status.
+ */
 static int ibm_set_attention_status(struct hotplug_slot *slot, u8 status)
 {
         union acpi_object args[2]; 
@@ -213,13 +213,13 @@ static int ibm_set_attention_status(struct hotplug_slot *slot, u8 status)
  * @slot: the hotplug_slot to work with
  * @status: returns what the LED is set to (0 or 1)
  *
- * Description: this method is registered with the acpiphp module as a
- * callback to do the device specific task of getting the LED status
+ * Description: This method is registered with the acpiphp module as a
+ * callback to do the device specific task of getting the LED status.
  * 
  * Because there is no direct method of getting the LED status directly
  * from an ACPI call, we read the aPCI table and parse out our
  * slot descriptor to read the status from that.
- **/
+ */
 static int ibm_get_attention_status(struct hotplug_slot *slot, u8 *status)
 {
         union apci_descriptor *ibm_slot;
@@ -245,8 +245,8 @@ static int ibm_get_attention_status(struct hotplug_slot *slot, u8 *status)
  * @event: the event info (device specific)
  * @context: passed context (our notification struct)
  *
- * Description: this method is registered as a callback with the ACPI
- * subsystem it is called when this device has an event to notify the OS of
+ * Description: This method is registered as a callback with the ACPI
+ * subsystem it is called when this device has an event to notify the OS of.
  *
  * The events actually come from the device as two events that get
  * synthesized into one event with data by this function.  The event
@@ -256,7 +256,7 @@ static int ibm_get_attention_status(struct hotplug_slot *slot, u8 *status)
  * From section 5.6.2.2 of the ACPI 2.0 spec, I understand that the OSPM will
  * only re-enable the interrupt that causes this event AFTER this method
  * has returned, thereby enforcing serial access for the notification struct.
- **/
+ */
 static void ibm_handle_events(acpi_handle handle, u32 event, void *context)
 {
         u8 detail = event & 0x0f;
@@ -279,16 +279,16 @@ static void ibm_handle_events(acpi_handle handle, u32 event, void *context)
  * ibm_get_table_from_acpi - reads the APLS buffer from ACPI
  * @bufp: address to pointer to allocate for the table
  *
- * Description: this method reads the APLS buffer in from ACPI and
+ * Description: This method reads the APLS buffer in from ACPI and
  * stores the "stripped" table into a single buffer
- * it allocates and passes the address back in bufp
+ * it allocates and passes the address back in bufp.
  *
  * If NULL is passed in as buffer, this method only calculates
  * the size of the table and returns that without filling
- * in the buffer
+ * in the buffer.
  *
- * returns < 0 on error or the size of the table on success
- **/
+ * Returns < 0 on error or the size of the table on success.
+ */
 static int ibm_get_table_from_acpi(char **bufp)
 {
         union acpi_object *package;
@@ -349,17 +349,18 @@ read_table_done:
 /**
  * ibm_read_apci_table - callback for the sysfs apci_table file
  * @kobj: the kobject this binary attribute is a part of
+ * @bin_attr: struct bin_attribute for this file
  * @buffer: the kernel space buffer to fill
  * @pos: the offset into the file
  * @size: the number of bytes requested
  *
- * Description: gets registered with sysfs as the reader callback
- * to be executed when /sys/bus/pci/slots/apci_table gets read
+ * Description: Gets registered with sysfs as the reader callback
+ * to be executed when /sys/bus/pci/slots/apci_table gets read.
  *
  * Since we don't get notified on open and close for this file,
  * things get really tricky here...
- * our solution is to only allow reading the table in all at once
- **/
+ * our solution is to only allow reading the table in all at once.
+ */
 static ssize_t ibm_read_apci_table(struct kobject *kobj,
                                    struct bin_attribute *bin_attr,
                                    char *buffer, loff_t pos, size_t size)
@@ -385,10 +386,10 @@ static ssize_t ibm_read_apci_table(struct kobject *kobj,
  * @context: a pointer to our handle to fill when we find the device
  * @rv: a return value to fill if desired
  *
- * Description: used as a callback when calling acpi_walk_namespace
+ * Description: Used as a callback when calling acpi_walk_namespace
  * to find our device.  When this method returns non-zero
- * acpi_walk_namespace quits its search and returns our value
- **/
+ * acpi_walk_namespace quits its search and returns our value.
+ */
 static acpi_status __init ibm_find_acpi_device(acpi_handle handle,
                 u32 lvl, void *context, void **rv)
 {
diff --git a/drivers/pci/hotplug/cpqphp_core.c b/drivers/pci/hotplug/cpqphp_core.c
index a96b739b2d35..74178875b949 100644
--- a/drivers/pci/hotplug/cpqphp_core.c
+++ b/drivers/pci/hotplug/cpqphp_core.c
@@ -117,12 +117,10 @@ static inline int is_slot66mhz(struct slot *slot)
 
 /**
  * detect_SMBIOS_pointer - find the System Management BIOS Table in mem region.
- *
  * @begin: begin pointer for region to be scanned.
  * @end: end pointer for region to be scanned.
  *
- * Returns pointer to the head of the SMBIOS tables (or NULL)
- *
+ * Returns pointer to the head of the SMBIOS tables (or %NULL).
  */
 static void __iomem * detect_SMBIOS_pointer(void __iomem *begin, void __iomem *end)
 {
@@ -157,9 +155,9 @@ static void __iomem * detect_SMBIOS_pointer(void __iomem *begin, void __iomem *e
 
 /**
  * init_SERR - Initializes the per slot SERR generation.
+ * @ctrl: controller to use
  *
  * For unexpected switch opens
- *
  */
 static int init_SERR(struct controller * ctrl)
 {
@@ -224,14 +222,15 @@ static int pci_print_IRQ_route (void)
 
 /**
  * get_subsequent_smbios_entry: get the next entry from bios table.
- *
- * Gets the first entry if previous == NULL
- * Otherwise, returns the next entry
- * Uses global SMBIOS Table pointer
- *
+ * @smbios_start: where to start in the SMBIOS table
+ * @smbios_table: location of the SMBIOS table
  * @curr: %NULL or pointer to previously returned structure
  *
- * returns a pointer to an SMBIOS structure or NULL if none found
+ * Gets the first entry if previous == NULL;
+ * otherwise, returns the next entry.
+ * Uses global SMBIOS Table pointer.
+ *
+ * Returns a pointer to an SMBIOS structure or NULL if none found.
  */
 static void __iomem *get_subsequent_smbios_entry(void __iomem *smbios_start,
                                                 void __iomem *smbios_table,
@@ -272,17 +271,18 @@ static void __iomem *get_subsequent_smbios_entry(void __iomem *smbios_start,
 
 
 /**
- * get_SMBIOS_entry
- *
- * @type:SMBIOS structure type to be returned
+ * get_SMBIOS_entry - return the requested SMBIOS entry or %NULL
+ * @smbios_start: where to start in the SMBIOS table
+ * @smbios_table: location of the SMBIOS table
+ * @type: SMBIOS structure type to be returned
  * @previous: %NULL or pointer to previously returned structure
  *
- * Gets the first entry of the specified type if previous == NULL
+ * Gets the first entry of the specified type if previous == %NULL;
  * Otherwise, returns the next entry of the given type.
- * Uses global SMBIOS Table pointer
- * Uses get_subsequent_smbios_entry
+ * Uses global SMBIOS Table pointer.
+ * Uses get_subsequent_smbios_entry.
  *
- * returns a pointer to an SMBIOS structure or %NULL if none found
+ * Returns a pointer to an SMBIOS structure or %NULL if none found.
  */
 static void __iomem *get_SMBIOS_entry(void __iomem *smbios_start,
                                         void __iomem *smbios_table,
@@ -581,7 +581,9 @@ get_slot_mapping(struct pci_bus *bus, u8 bus_num, u8 dev_num, u8 *slot)
 
 /**
  * cpqhp_set_attention_status - Turns the Amber LED for a slot on or off
- *
+ * @ctrl: struct controller to use
+ * @func: PCI device/function info
+ * @status: LED control flag: 1 = LED on, 0 = LED off
  */
 static int
 cpqhp_set_attention_status(struct controller *ctrl, struct pci_func *func,
@@ -621,7 +623,8 @@ cpqhp_set_attention_status(struct controller *ctrl, struct pci_func *func,
 
 /**
  * set_attention_status - Turns the Amber LED for a slot on or off
- *
+ * @hotplug_slot: slot to change LED on
+ * @status: LED control flag
  */
 static int set_attention_status (struct hotplug_slot *hotplug_slot, u8 status)
 {
diff --git a/drivers/pci/hotplug/cpqphp_ctrl.c b/drivers/pci/hotplug/cpqphp_ctrl.c
index 856d57b4d604..4018420c6f95 100644
--- a/drivers/pci/hotplug/cpqphp_ctrl.c
+++ b/drivers/pci/hotplug/cpqphp_ctrl.c
@@ -123,7 +123,7 @@ static u8 handle_switch_change(u8 change, struct controller * ctrl)
 }
 
 /**
- * cpqhp_find_slot: find the struct slot of given device
+ * cpqhp_find_slot - find the struct slot of given device
  * @ctrl: scan lots of this controller
  * @device: the device id to find
  */
@@ -305,9 +305,8 @@ static u8 handle_power_fault(u8 change, struct controller * ctrl)
 
 
 /**
- * sort_by_size: sort nodes on the list by their length, smallest first.
+ * sort_by_size - sort nodes on the list by their length, smallest first.
  * @head: list to sort
- *
  */
 static int sort_by_size(struct pci_resource **head)
 {
@@ -354,9 +353,8 @@ static int sort_by_size(struct pci_resource **head)
 
 
 /**
- * sort_by_max_size: sort nodes on the list by their length, largest first.
+ * sort_by_max_size - sort nodes on the list by their length, largest first.
  * @head: list to sort
- *
  */
 static int sort_by_max_size(struct pci_resource **head)
 {
@@ -403,8 +401,10 @@ static int sort_by_max_size(struct pci_resource **head)
 
 
 /**
- * do_pre_bridge_resource_split: find node of resources that are unused
- *
+ * do_pre_bridge_resource_split - find node of resources that are unused
+ * @head: new list head
+ * @orig_head: original list head
+ * @alignment: max node size (?)
  */
 static struct pci_resource *do_pre_bridge_resource_split(struct pci_resource **head,
                                 struct pci_resource **orig_head, u32 alignment)
@@ -477,8 +477,9 @@ static struct pci_resource *do_pre_bridge_resource_split(struct pci_resource **h
 
 
 /**
- * do_bridge_resource_split: find one node of resources that aren't in use
- *
+ * do_bridge_resource_split - find one node of resources that aren't in use
+ * @head: list head
+ * @alignment: max node size (?)
  */
 static struct pci_resource *do_bridge_resource_split(struct pci_resource **head, u32 alignment)
 {
@@ -525,14 +526,13 @@ error:
 
 
 /**
- * get_io_resource: find first node of given size not in ISA aliasing window.
+ * get_io_resource - find first node of given size not in ISA aliasing window.
  * @head: list to search
  * @size: size of node to find, must be a power of two.
  *
- * Description: this function sorts the resource list by size and then returns
+ * Description: This function sorts the resource list by size and then returns
  * returns the first node of "size" length that is not in the ISA aliasing
  * window.  If it finds a node larger than "size" it will split it up.
- *
  */
 static struct pci_resource *get_io_resource(struct pci_resource **head, u32 size)
 {
@@ -620,7 +620,7 @@ static struct pci_resource *get_io_resource(struct pci_resource **head, u32 size
 
 
 /**
- * get_max_resource: get largest node which has at least the given size.
+ * get_max_resource - get largest node which has at least the given size.
  * @head: the list to search the node in
  * @size: the minimum size of the node to find
  *
@@ -712,7 +712,7 @@ static struct pci_resource *get_max_resource(struct pci_resource **head, u32 siz
 
 
 /**
- * get_resource: find resource of given size and split up larger ones.
+ * get_resource - find resource of given size and split up larger ones.
  * @head: the list to search for resources
  * @size: the size limit to use
  *
@@ -804,14 +804,14 @@ static struct pci_resource *get_resource(struct pci_resource **head, u32 size)
 
 
 /**
- * cpqhp_resource_sort_and_combine: sort nodes by base addresses and clean up.
+ * cpqhp_resource_sort_and_combine - sort nodes by base addresses and clean up
  * @head: the list to sort and clean up
  *
  * Description: Sorts all of the nodes in the list in ascending order by
  * their base addresses.  Also does garbage collection by
  * combining adjacent nodes.
  *
- * returns 0 if success
+ * Returns %0 if success.
  */
 int cpqhp_resource_sort_and_combine(struct pci_resource **head)
 {
@@ -951,9 +951,9 @@ irqreturn_t cpqhp_ctrl_intr(int IRQ, void *data)
 
 /**
  * cpqhp_slot_create - Creates a node and adds it to the proper bus.
- * @busnumber - bus where new node is to be located
+ * @busnumber: bus where new node is to be located
  *
- * Returns pointer to the new node or NULL if unsuccessful
+ * Returns pointer to the new node or %NULL if unsuccessful.
  */
 struct pci_func *cpqhp_slot_create(u8 busnumber)
 {
@@ -986,7 +986,7 @@ struct pci_func *cpqhp_slot_create(u8 busnumber)
  * slot_remove - Removes a node from the linked list of slots.
  * @old_slot: slot to remove
  *
- * Returns 0 if successful, !0 otherwise.
+ * Returns %0 if successful, !0 otherwise.
  */
 static int slot_remove(struct pci_func * old_slot)
 {
@@ -1026,7 +1026,7 @@ static int slot_remove(struct pci_func * old_slot)
  * bridge_slot_remove - Removes a node from the linked list of slots.
  * @bridge: bridge to remove
  *
- * Returns 0 if successful, !0 otherwise.
+ * Returns %0 if successful, !0 otherwise.
  */
 static int bridge_slot_remove(struct pci_func *bridge)
 {
@@ -1071,7 +1071,7 @@ out:
  * cpqhp_slot_find - Looks for a node by bus, and device, multiple functions accessed
  * @bus: bus to find
  * @device: device to find
- * @index: is 0 for first function found, 1 for the second...
+ * @index: is %0 for first function found, %1 for the second...
  *
  * Returns pointer to the node if successful, %NULL otherwise.
  */
@@ -1115,16 +1115,13 @@ static int is_bridge(struct pci_func * func)
 
 
 /**
- * set_controller_speed - set the frequency and/or mode of a specific
- * controller segment.
- *
+ * set_controller_speed - set the frequency and/or mode of a specific controller segment.
  * @ctrl: controller to change frequency/mode for.
  * @adapter_speed: the speed of the adapter we want to match.
  * @hp_slot: the slot number where the adapter is installed.
  *
- * Returns 0 if we successfully change frequency and/or mode to match the
+ * Returns %0 if we successfully change frequency and/or mode to match the
  * adapter speed.
- * 
  */
 static u8 set_controller_speed(struct controller *ctrl, u8 adapter_speed, u8 hp_slot)
 {
@@ -1253,13 +1250,14 @@ static u8 set_controller_speed(struct controller *ctrl, u8 adapter_speed, u8 hp_
 
 /**
  * board_replaced - Called after a board has been replaced in the system.
+ * @func: PCI device/function information
+ * @ctrl: hotplug controller
  *
- * This is only used if we don't have resources for hot add
- * Turns power on for the board
- * Checks to see if board is the same
- * If board is same, reconfigures it
+ * This is only used if we don't have resources for hot add.
+ * Turns power on for the board.
+ * Checks to see if board is the same.
+ * If board is same, reconfigures it.
  * If board isn't same, turns it back off.
- *
  */
 static u32 board_replaced(struct pci_func *func, struct controller *ctrl)
 {
@@ -1403,10 +1401,11 @@ static u32 board_replaced(struct pci_func *func, struct controller *ctrl)
 
 /**
  * board_added - Called after a board has been added to the system.
+ * @func: PCI device/function info
+ * @ctrl: hotplug controller
  *
- * Turns power on for the board
- * Configures board
- *
+ * Turns power on for the board.
+ * Configures board.
  */
 static u32 board_added(struct pci_func *func, struct controller *ctrl)
 {
@@ -1607,8 +1606,10 @@ static u32 board_added(struct pci_func *func, struct controller *ctrl)
 
 
 /**
- * remove_board - Turns off slot and LED's
- *
+ * remove_board - Turns off slot and LEDs
+ * @func: PCI device/function info
+ * @replace_flag: whether replacing or adding a new device
+ * @ctrl: target controller
  */
 static u32 remove_board(struct pci_func * func, u32 replace_flag, struct controller * ctrl)
 {
@@ -1902,11 +1903,11 @@ static void interrupt_event_handler(struct controller *ctrl)
 
 
 /**
- * cpqhp_pushbutton_thread
+ * cpqhp_pushbutton_thread - handle pushbutton events
+ * @slot: target slot (struct)
  *
- * Scheduled procedure to handle blocking stuff for the pushbuttons
+ * Scheduled procedure to handle blocking stuff for the pushbuttons.
  * Handles all pending events and exits.
- *
  */
 void cpqhp_pushbutton_thread(unsigned long slot)
 {
@@ -2137,9 +2138,10 @@ int cpqhp_process_SS(struct controller *ctrl, struct pci_func *func)
 }
 
 /**
- * switch_leds: switch the leds, go from one site to the other.
+ * switch_leds - switch the leds, go from one site to the other.
  * @ctrl: controller to use
  * @num_of_slots: number of slots to use
+ * @work_LED: LED control value
  * @direction: 1 to start from the left side, 0 to start right.
  */
 static void switch_leds(struct controller *ctrl, const int num_of_slots,
@@ -2165,11 +2167,11 @@ static void switch_leds(struct controller *ctrl, const int num_of_slots,
 }
 
 /**
- * hardware_test - runs hardware tests
+ * cpqhp_hardware_test - runs hardware tests
+ * @ctrl: target controller
+ * @test_num: the number written to the "test" file in sysfs.
  *
  * For hot plug ctrl folks to play with.
- * test_num is the number written to the "test" file in sysfs
- *
  */
 int cpqhp_hardware_test(struct controller *ctrl, int test_num)
 {
@@ -2249,14 +2251,12 @@ int cpqhp_hardware_test(struct controller *ctrl, int test_num)
 
 /**
  * configure_new_device - Configures the PCI header information of one board.
- *
  * @ctrl: pointer to controller structure
  * @func: pointer to function structure
  * @behind_bridge: 1 if this is a recursive call, 0 if not
  * @resources: pointer to set of resource lists
  *
- * Returns 0 if success
- *
+ * Returns 0 if success.
  */
 static u32 configure_new_device(struct controller * ctrl, struct pci_func * func,
                                  u8 behind_bridge, struct resource_lists * resources)
@@ -2346,15 +2346,13 @@ static u32 configure_new_device(struct controller * ctrl, struct pci_func * func
 
 /**
  * configure_new_function - Configures the PCI header information of one device
- *
  * @ctrl: pointer to controller structure
  * @func: pointer to function structure
  * @behind_bridge: 1 if this is a recursive call, 0 if not
  * @resources: pointer to set of resource lists
  *
  * Calls itself recursively for bridged devices.
- * Returns 0 if success
- *
+ * Returns 0 if success.
  */
 static int configure_new_function(struct controller *ctrl, struct pci_func *func,
                                    u8 behind_bridge,
diff --git a/drivers/pci/hotplug/fakephp.c b/drivers/pci/hotplug/fakephp.c
index 027f6865d7e3..d7a293e3faf5 100644
--- a/drivers/pci/hotplug/fakephp.c
+++ b/drivers/pci/hotplug/fakephp.c
@@ -165,11 +165,11 @@ static void remove_slot(struct dummy_slot *dslot)
 }
 
 /**
- * Rescan slot.
- * Tries hard not to re-enable already existing devices
- * also handles scanning of subfunctions
+ * pci_rescan_slot - Rescan slot
+ * @temp: Device template. Should be set: bus and devfn.
  *
- * @param temp   Device template. Should be set: bus and devfn.
+ * Tries hard not to re-enable already existing devices;
+ * also handles scanning of subfunctions.
  */
 static void pci_rescan_slot(struct pci_dev *temp)
 {
@@ -229,10 +229,10 @@ static void pci_rescan_slot(struct pci_dev *temp)
 
 
 /**
- * Rescan PCI bus.
- * call pci_rescan_slot for each possible function of the bus
+ * pci_rescan_bus - Rescan PCI bus
+ * @bus: the PCI bus to rescan
  *
- * @param bus
+ * Call pci_rescan_slot for each possible function of the bus.
  */
 static void pci_rescan_bus(const struct pci_bus *bus)
 {
diff --git a/drivers/pci/hotplug/pciehp_ctrl.c b/drivers/pci/hotplug/pciehp_ctrl.c
index c8cb49c5a752..f1e0966cee95 100644
--- a/drivers/pci/hotplug/pciehp_ctrl.c
+++ b/drivers/pci/hotplug/pciehp_ctrl.c
@@ -208,10 +208,10 @@ static void set_slot_off(struct controller *ctrl, struct slot * pslot)
 
 /**
  * board_added - Called after a board has been added to the system.
+ * @p_slot: &slot where board is added
  *
- * Turns power on for the board
- * Configures board
- *
+ * Turns power on for the board.
+ * Configures board.
  */
 static int board_added(struct slot *p_slot)
 {
@@ -276,8 +276,8 @@ err_exit:
 }
 
 /**
- * remove_board - Turns off slot and LED's
- *
+ * remove_board - Turns off slot and LEDs
+ * @p_slot: slot where board is being removed
  */
 static int remove_board(struct slot *p_slot)
 {
@@ -319,11 +319,11 @@ struct power_work_info {
 };
 
 /**
- * pciehp_pushbutton_thread
+ * pciehp_power_thread - handle pushbutton events
+ * @work: &struct work_struct describing work to be done
  *
- * Scheduled procedure to handle blocking stuff for the pushbuttons
+ * Scheduled procedure to handle blocking stuff for the pushbuttons.
  * Handles all pending events and exits.
- *
  */
 static void pciehp_power_thread(struct work_struct *work)
 {
diff --git a/drivers/pci/hotplug/rpadlpar_core.c b/drivers/pci/hotplug/rpadlpar_core.c
index deb6b5e35feb..b169b0e2647f 100644
--- a/drivers/pci/hotplug/rpadlpar_core.c
+++ b/drivers/pci/hotplug/rpadlpar_core.c
@@ -100,6 +100,7 @@ static struct device_node *find_dlpar_node(char *drc_name, int *node_type)
 
 /**
  * find_php_slot - return hotplug slot structure for device node
+ * @dn: target &device_node
  *
  * This routine will return the hotplug slot structure
  * for a given device node. Note that built-in PCI slots
@@ -293,9 +294,8 @@ static int dlpar_add_vio_slot(char *drc_name, struct device_node *dn)
  * dlpar_add_slot - DLPAR add an I/O Slot
  * @drc_name: drc-name of newly added slot
  *
- * Make the hotplug module and the kernel aware
- * of a newly added I/O Slot.
- * Return Codes -
+ * Make the hotplug module and the kernel aware of a newly added I/O Slot.
+ * Return Codes:
  * 0                    Success
  * -ENODEV              Not a valid drc_name
  * -EINVAL              Slot already added
@@ -339,9 +339,9 @@ exit:
 /**
  * dlpar_remove_vio_slot - DLPAR remove a virtual I/O Slot
  * @drc_name: drc-name of newly added slot
+ * @dn: &device_node
  *
- * Remove the kernel and hotplug representations
- * of an I/O Slot.
+ * Remove the kernel and hotplug representations of an I/O Slot.
  * Return Codes:
  * 0                    Success
  * -EINVAL              Vio dev doesn't exist
@@ -359,11 +359,11 @@ static int dlpar_remove_vio_slot(char *drc_name, struct device_node *dn)
 }
 
 /**
- * dlpar_remove_slot - DLPAR remove a PCI I/O Slot
+ * dlpar_remove_pci_slot - DLPAR remove a PCI I/O Slot
  * @drc_name: drc-name of newly added slot
+ * @dn: &device_node
  *
- * Remove the kernel and hotplug representations
- * of a PCI I/O Slot.
+ * Remove the kernel and hotplug representations of a PCI I/O Slot.
  * Return Codes:
  * 0                    Success
  * -ENODEV              Not a valid drc_name
@@ -405,8 +405,7 @@ int dlpar_remove_pci_slot(char *drc_name, struct device_node *dn)
  * dlpar_remove_slot - DLPAR remove an I/O Slot
  * @drc_name: drc-name of newly added slot
  *
- * Remove the kernel and hotplug representations
- * of an I/O Slot.
+ * Remove the kernel and hotplug representations of an I/O Slot.
  * Return Codes:
  * 0                    Success
  * -ENODEV              Not a valid drc_name
diff --git a/drivers/pci/hotplug/rpaphp_core.c b/drivers/pci/hotplug/rpaphp_core.c
index 458c08ef2654..58f1a9927709 100644
--- a/drivers/pci/hotplug/rpaphp_core.c
+++ b/drivers/pci/hotplug/rpaphp_core.c
@@ -54,10 +54,12 @@ module_param(debug, bool, 0644);
 
 /**
  * set_attention_status - set attention LED
+ * @hotplug_slot: target &hotplug_slot
+ * @value: LED control value
+ *
  * echo 0 > attention -- set LED OFF
  * echo 1 > attention -- set LED ON
  * echo 2 > attention -- set LED ID(identify, light is blinking)
- *
  */
 static int set_attention_status(struct hotplug_slot *hotplug_slot, u8 value)
 {
@@ -99,6 +101,8 @@ static int get_power_status(struct hotplug_slot *hotplug_slot, u8 * value)
 
 /**
  * get_attention_status - get attention LED status
+ * @hotplug_slot: slot to get status
+ * @value: pointer to store status
  */
 static int get_attention_status(struct hotplug_slot *hotplug_slot, u8 * value)
 {
@@ -254,6 +258,11 @@ static int is_php_type(char *drc_type)
 
 /**
  * is_php_dn() - return 1 if this is a hotpluggable pci slot, else 0
+ * @dn: target &device_node
+ * @indexes: passed to get_children_props()
+ * @names: passed to get_children_props()
+ * @types: returned from get_children_props()
+ * @power_domains:
  *
  * This routine will return true only if the device node is
  * a hotpluggable slot. This routine will return false
@@ -279,7 +288,7 @@ static int is_php_dn(struct device_node *dn, const int **indexes,
 
 /**
  * rpaphp_add_slot -- declare a hotplug slot to the hotplug subsystem.
- * @dn device node of slot
+ * @dn: device node of slot
  *
  * This subroutine will register a hotplugable slot with the
  * PCI hotplug infrastructure. This routine is typicaly called
@@ -291,7 +300,7 @@ static int is_php_dn(struct device_node *dn, const int **indexes,
  * routine will just return without doing anything, since embedded
  * slots cannot be hotplugged.
  *
- * To remove a slot, it suffices to call rpaphp_deregister_slot()
+ * To remove a slot, it suffices to call rpaphp_deregister_slot().
  */
 int rpaphp_add_slot(struct device_node *dn)
 {
diff --git a/drivers/pci/hotplug/rpaphp_pci.c b/drivers/pci/hotplug/rpaphp_pci.c
index 54ca8650d511..0de84533cd80 100644
--- a/drivers/pci/hotplug/rpaphp_pci.c
+++ b/drivers/pci/hotplug/rpaphp_pci.c
@@ -79,6 +79,7 @@ static void set_slot_name(struct slot *slot)
 
 /**
  * rpaphp_enable_slot - record slot state, config pci device
+ * @slot: target &slot
  *
  * Initialize values in the slot, and the hotplug_slot info
  * structures to indicate if there is a pci card plugged into
diff --git a/drivers/pci/hotplug/shpchp_ctrl.c b/drivers/pci/hotplug/shpchp_ctrl.c
index d2fc35598cdd..eb5cac6f08ae 100644
--- a/drivers/pci/hotplug/shpchp_ctrl.c
+++ b/drivers/pci/hotplug/shpchp_ctrl.c
@@ -231,10 +231,10 @@ static int fix_bus_speed(struct controller *ctrl, struct slot *pslot,
 
 /**
  * board_added - Called after a board has been added to the system.
+ * @p_slot: target &slot
  *
- * Turns power on for the board
- * Configures board
- *
+ * Turns power on for the board.
+ * Configures board.
  */
 static int board_added(struct slot *p_slot)
 {
@@ -350,8 +350,8 @@ err_exit:
 
 
 /**
- * remove_board - Turns off slot and LED's
- *
+ * remove_board - Turns off slot and LEDs
+ * @p_slot: target &slot
  */
 static int remove_board(struct slot *p_slot)
 {
@@ -397,11 +397,11 @@ struct pushbutton_work_info {
 };
 
 /**
- * shpchp_pushbutton_thread
+ * shpchp_pushbutton_thread - handle pushbutton events
+ * @work: &struct work_struct to be handled
  *
- * Scheduled procedure to handle blocking stuff for the pushbuttons
+ * Scheduled procedure to handle blocking stuff for the pushbuttons.
  * Handles all pending events and exits.
- *
  */
 static void shpchp_pushbutton_thread(struct work_struct *work)
 {
diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
index 1b7b2812bf2d..7d1877341aad 100644
--- a/drivers/pci/pci-sysfs.c
+++ b/drivers/pci/pci-sysfs.c
@@ -702,8 +702,10 @@ static int __init pci_sysfs_init(void)
         sysfs_initialized = 1;
         for_each_pci_dev(pdev) {
                 retval = pci_create_sysfs_dev_files(pdev);
-                if (retval)
+                if (retval) {
+                        pci_dev_put(pdev);
                         return retval;
+                }
         }
 
         return 0;
diff --git a/drivers/pci/pcie/aer/aerdrv_core.c b/drivers/pci/pcie/aer/aerdrv_core.c
index 92a8469b21ba..3c0d8d138f5a 100644
--- a/drivers/pci/pcie/aer/aerdrv_core.c
+++ b/drivers/pci/pcie/aer/aerdrv_core.c
@@ -168,11 +168,11 @@ static int find_device_iter(struct device *device, void *data)
 
 /**
  * find_source_device - search through device hierarchy for source device
- * @p_dev: pointer to Root Port pci_dev data structure
+ * @parent: pointer to Root Port pci_dev data structure
  * @id: device ID of agent who sends an error message to this Root Port
  *
  * Invoked when error is detected at the Root Port.
- **/
+ */
 static struct device* find_source_device(struct pci_dev *parent, u16 id)
 {
         struct pci_dev *dev = parent;
@@ -286,14 +286,15 @@ static void report_resume(struct pci_dev *dev, void *data)
 
 /**
  * broadcast_error_message - handle message broadcast to downstream drivers
- * @device: pointer to from where in a hierarchy message is broadcasted down
- * @api: callback to be broadcasted
+ * @dev: pointer to from where in a hierarchy message is broadcasted down
  * @state: error state
+ * @error_mesg: message to print
+ * @cb: callback to be broadcasted
  *
  * Invoked during error recovery process. Once being invoked, the content
  * of error severity will be broadcasted to all downstream drivers in a
  * hierarchy in question.
- **/
+ */
 static pci_ers_result_t broadcast_error_message(struct pci_dev *dev,
         enum pci_channel_state state,
         char *error_mesg,
@@ -428,7 +429,7 @@ static pci_ers_result_t reset_link(struct pcie_device *aerdev,
  * Invoked when an error is nonfatal/fatal. Once being invoked, broadcast
  * error detected message to all downstream drivers within a hierarchy in
  * question and return the returned code.
- **/
+ */
 static pci_ers_result_t do_recovery(struct pcie_device *aerdev,
                 struct pci_dev *dev,
                 int severity)
@@ -488,7 +489,7 @@ static pci_ers_result_t do_recovery(struct pcie_device *aerdev,
  * @info: comprehensive error information
  *
  * Invoked when an error being detected by Root Port.
- **/
+ */
 static void handle_error_source(struct pcie_device * aerdev,
         struct pci_dev *dev,
         struct aer_err_info info)
@@ -521,7 +522,7 @@ static void handle_error_source(struct pcie_device * aerdev,
  * @rpc: pointer to a Root Port data structure
  *
  * Invoked when PCIE bus loads AER service driver.
- **/
+ */
 void aer_enable_rootport(struct aer_rpc *rpc)
 {
         struct pci_dev *pdev = rpc->rpd->port;
@@ -569,7 +570,7 @@ void aer_enable_rootport(struct aer_rpc *rpc)
  * @rpc: pointer to a Root Port data structure
  *
  * Invoked when PCIE bus unloads AER service driver.
- **/
+ */
 static void disable_root_aer(struct aer_rpc *rpc)
 {
         struct pci_dev *pdev = rpc->rpd->port;
@@ -590,7 +591,7 @@ static void disable_root_aer(struct aer_rpc *rpc)
  * @rpc: pointer to the root port which holds an error
  *
  * Invoked by DPC handler to consume an error.
- **/
+ */
 static struct aer_err_source* get_e_source(struct aer_rpc *rpc)
 {
         struct aer_err_source *e_source;
@@ -655,7 +656,7 @@ static int get_device_error_info(struct pci_dev *dev, struct aer_err_info *info)
  * aer_isr_one_error - consume an error detected by root port
  * @p_device: pointer to error root port service device
  * @e_src: pointer to an error source
- **/
+ */
 static void aer_isr_one_error(struct pcie_device *p_device,
                 struct aer_err_source *e_src)
 {
@@ -706,7 +707,7 @@ static void aer_isr_one_error(struct pcie_device *p_device,
  * @work: definition of this work item
  *
  * Invoked, as DPC, when root port records new detected error
- **/
+ */
 void aer_isr(struct work_struct *work)
 {
         struct aer_rpc *rpc = container_of(work, struct aer_rpc, dpc_handler);
@@ -729,7 +730,7 @@ void aer_isr(struct work_struct *work)
  * @rpc: pointer to a root port device being deleted
  *
  * Invoked when AER service unloaded on a specific Root Port
- **/
+ */
 void aer_delete_rootport(struct aer_rpc *rpc)
 {
         /* Disable root port AER itself */
@@ -743,7 +744,7 @@ void aer_delete_rootport(struct aer_rpc *rpc)
  * @dev: pointer to AER pcie device
  *
  * Invoked when AER service driver is loaded.
- **/
+ */
 int aer_init(struct pcie_device *dev)
 {
         if (aer_osc_setup(dev) && !forceload)
diff --git a/drivers/pci/pcie/portdrv_pci.c b/drivers/pci/pcie/portdrv_pci.c
index df383645e366..26057f98f72e 100644
--- a/drivers/pci/pcie/portdrv_pci.c
+++ b/drivers/pci/pcie/portdrv_pci.c
@@ -217,7 +217,7 @@ static int slot_reset_iter(struct device *device, void *data)
 
 static pci_ers_result_t pcie_portdrv_slot_reset(struct pci_dev *dev)
 {
-        pci_ers_result_t status;
+        pci_ers_result_t status = PCI_ERS_RESULT_NONE;
         int retval;
 
         /* If fatal, restore cfg space for possible link reset at upstream */
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 463a5a9d583d..c2f8a78c894c 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -743,46 +743,22 @@ static int pci_setup_device(struct pci_dev * dev)
                  */
                 if (class == PCI_CLASS_STORAGE_IDE) {
                         u8 progif;
-                        struct pci_bus_region region;
-
                         pci_read_config_byte(dev, PCI_CLASS_PROG, &progif);
                         if ((progif & 1) == 0) {
-                                struct resource resource = {
-                                        .start = 0x1F0,
-                                        .end = 0x1F7,
-                                        .flags = LEGACY_IO_RESOURCE,
-                                };
-
-                                pcibios_resource_to_bus(dev, &region, &resource);
-                                dev->resource[0].start = region.start;
-                                dev->resource[0].end = region.end;
-                                dev->resource[0].flags = resource.flags;
-                                resource.start = 0x3F6;
-                                resource.end = 0x3F6;
-                                resource.flags = LEGACY_IO_RESOURCE;
-                                pcibios_resource_to_bus(dev, &region, &resource);
-                                dev->resource[1].start = region.start;
-                                dev->resource[1].end = region.end;
-                                dev->resource[1].flags = resource.flags;
+                                dev->resource[0].start = 0x1F0;
+                                dev->resource[0].end = 0x1F7;
+                                dev->resource[0].flags = LEGACY_IO_RESOURCE;
+                                dev->resource[1].start = 0x3F6;
+                                dev->resource[1].end = 0x3F6;
+                                dev->resource[1].flags = LEGACY_IO_RESOURCE;
                         }
                         if ((progif & 4) == 0) {
-                                struct resource resource = {
-                                        .start = 0x170,
-                                        .end = 0x177,
-                                        .flags = LEGACY_IO_RESOURCE,
-                                };
-
-                                pcibios_resource_to_bus(dev, &region, &resource);
-                                dev->resource[2].start = region.start;
-                                dev->resource[2].end = region.end;
-                                dev->resource[2].flags = resource.flags;
-                                resource.start = 0x376;
-                                resource.end = 0x376;
-                                resource.flags = LEGACY_IO_RESOURCE;
-                                pcibios_resource_to_bus(dev, &region, &resource);
-                                dev->resource[3].start = region.start;
-                                dev->resource[3].end = region.end;
-                                dev->resource[3].flags = resource.flags;
+                                dev->resource[2].start = 0x170;
+                                dev->resource[2].end = 0x177;
+                                dev->resource[2].flags = LEGACY_IO_RESOURCE;
+                                dev->resource[3].start = 0x376;
+                                dev->resource[3].end = 0x376;
+                                dev->resource[3].flags = LEGACY_IO_RESOURCE;
                         }
                 }
                 break;
diff --git a/drivers/pcmcia/cs.c b/drivers/pcmcia/cs.c
index a0aca46ce877..56230dbd347a 100644
--- a/drivers/pcmcia/cs.c
+++ b/drivers/pcmcia/cs.c
@@ -89,7 +89,7 @@ DECLARE_RWSEM(pcmcia_socket_list_rwsem);
 EXPORT_SYMBOL(pcmcia_socket_list_rwsem);
 
 
-/**
+/*
  * Low-level PCMCIA socket drivers need to register with the PCCard
  * core using pcmcia_register_socket.
  *
@@ -174,6 +174,7 @@ static int pccardd(void *__skt);
 
 /**
  * pcmcia_register_socket - add a new pcmcia socket device
+ * @socket: the &socket to register
  */
 int pcmcia_register_socket(struct pcmcia_socket *socket)
 {
@@ -268,6 +269,7 @@ EXPORT_SYMBOL(pcmcia_register_socket);
 
 /**
  * pcmcia_unregister_socket - remove a pcmcia socket device
+ * @socket: the &socket to unregister
  */
 void pcmcia_unregister_socket(struct pcmcia_socket *socket)
 {
@@ -311,7 +313,7 @@ struct pcmcia_socket * pcmcia_get_socket_by_nr(unsigned int nr)
 }
 EXPORT_SYMBOL(pcmcia_get_socket_by_nr);
 
-/**
+/*
  * The central event handler.  Send_event() sends an event to the
  * 16-bit subsystem, which then calls the relevant device drivers.
  * Parse_events() interprets the event bits from
@@ -380,7 +382,7 @@ static int socket_reset(struct pcmcia_socket *skt)
         return CS_GENERAL_FAILURE;
 }
 
-/**
+/*
  * socket_setup() and socket_shutdown() are called by the main event handler
  * when card insertion and removal events are received.
  * socket_setup() turns on socket power and resets the socket, in two stages.
diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c
index 7bf78c127898..5cf89a91da1e 100644
--- a/drivers/pcmcia/ds.c
+++ b/drivers/pcmcia/ds.c
@@ -320,6 +320,7 @@ pcmcia_create_newid_file(struct pcmcia_driver *drv)
 
 /**
  * pcmcia_register_driver - register a PCMCIA driver with the bus core
+ * @driver: the &driver being registered
  *
  * Registers a PCMCIA driver with the PCMCIA bus core.
  */
@@ -354,6 +355,7 @@ EXPORT_SYMBOL(pcmcia_register_driver);
 
 /**
  * pcmcia_unregister_driver - unregister a PCMCIA driver with the bus core
+ * @driver: the &driver being unregistered
  */
 void pcmcia_unregister_driver(struct pcmcia_driver *driver)
 {
@@ -840,8 +842,8 @@ static void pcmcia_bus_rescan(struct pcmcia_socket *skt, int new_cis)
 
 /**
  * pcmcia_load_firmware - load CIS from userspace if device-provided is broken
- * @dev - the pcmcia device which needs a CIS override
- * @filename - requested filename in /lib/firmware/
+ * @dev: the pcmcia device which needs a CIS override
+ * @filename: requested filename in /lib/firmware/
  *
  * This uses the in-kernel firmware loading mechanism to use a "fake CIS" if
  * the one provided by the card is broken. The firmware files reside in
diff --git a/drivers/pcmcia/ti113x.h b/drivers/pcmcia/ti113x.h
index 62e9ebf967f9..d29657bf1b40 100644
--- a/drivers/pcmcia/ti113x.h
+++ b/drivers/pcmcia/ti113x.h
@@ -874,7 +874,7 @@ static int ti1250_override(struct yenta_socket *socket)
  */
 
 #ifdef CONFIG_YENTA_ENE_TUNE
-/**
+/*
  * set/clear various test bits:
  * Defaults to clear the bit.
  * - mask (u8) defines what bits to change
diff --git a/drivers/pcmcia/yenta_socket.c b/drivers/pcmcia/yenta_socket.c
index 20853a03202d..0ab1fb65cdc3 100644
--- a/drivers/pcmcia/yenta_socket.c
+++ b/drivers/pcmcia/yenta_socket.c
@@ -48,7 +48,7 @@ MODULE_PARM_DESC(pwr_irqs_off, "Force IRQs off during power-on of slot. Use only
 #define to_cycles(ns)   ((ns)/120)
 #define to_ns(cycles)   ((cycles)*120)
 
-/**
+/*
  * yenta PCI irq probing.
  * currently only used in the TI/EnE initialization code
  */
@@ -888,7 +888,7 @@ static unsigned int yenta_probe_irq(struct yenta_socket *socket, u32 isa_irq_mas
 }
 
 
-/**
+/*
  * yenta PCI irq probing.
  * currently only used in the TI/EnE initialization code
  */
@@ -1012,7 +1012,7 @@ static void yenta_config_init(struct yenta_socket *socket)
  * invisible during PCI scans because of a misconfigured subordinate number
  * of the parent brige - some BIOSes seem to be too lazy to set it right.
  * Does the fixup carefully by checking how far it can go without conflicts.
- * See http://bugzilla.kernel.org/show_bug.cgi?id=2944 for more information.
+ * See http\://bugzilla.kernel.org/show_bug.cgi?id=2944 for more information.
  */
 static void yenta_fixup_parent_bridge(struct pci_bus *cardbus_bridge)
 {
diff --git a/drivers/pnp/pnpacpi/rsparser.c b/drivers/pnp/pnpacpi/rsparser.c
index cd0a204d96d1..3c5eb374adf8 100644
--- a/drivers/pnp/pnpacpi/rsparser.c
+++ b/drivers/pnp/pnpacpi/rsparser.c
@@ -75,6 +75,7 @@ static void pnpacpi_parse_allocated_irqresource(struct pnp_resource_table *res,
 {
         int i = 0;
         int irq;
+        int p, t;
 
         if (!valid_IRQ(gsi))
                 return;
@@ -82,18 +83,27 @@ static void pnpacpi_parse_allocated_irqresource(struct pnp_resource_table *res,
         while (!(res->irq_resource[i].flags & IORESOURCE_UNSET) &&
                i < PNP_MAX_IRQ)
                 i++;
-        if (i >= PNP_MAX_IRQ)
+        if (i >= PNP_MAX_IRQ) {
+                printk(KERN_ERR "pnpacpi: exceeded the max number of IRQ "
+                                "resources: %d \n", PNP_MAX_IRQ);
                 return;
-
-#ifdef CONFIG_X86
-        if (gsi < 16 && (triggering != ACPI_EDGE_SENSITIVE ||
-                                polarity != ACPI_ACTIVE_HIGH)) {
-                pnp_warn("BIOS BUG: legacy PNP IRQ %d should be edge trigger, "
-                                "active high", gsi);
-                triggering = ACPI_EDGE_SENSITIVE;
-                polarity = ACPI_ACTIVE_HIGH;
         }
-#endif
+        /*
+         * in IO-APIC mode, use overrided attribute. Two reasons:
+         * 1. BIOS bug in DSDT
+         * 2. BIOS uses IO-APIC mode Interrupt Source Override
+         */
+        if (!acpi_get_override_irq(gsi, &t, &p)) {
+                t = t ? ACPI_LEVEL_SENSITIVE : ACPI_EDGE_SENSITIVE;
+                p = p ? ACPI_ACTIVE_LOW : ACPI_ACTIVE_HIGH;
+
+                if (triggering != t || polarity != p) {
+                        pnp_warn("IRQ %d override to %s, %s",
+                                gsi, t ? "edge":"level", p ? "low":"high");
+                        triggering = t;
+                        polarity = p;
+                }
+        }
 
         res->irq_resource[i].flags = IORESOURCE_IRQ;    // Also clears _UNSET flag
         res->irq_resource[i].flags |= irq_flags(triggering, polarity);
@@ -173,6 +183,9 @@ static void pnpacpi_parse_allocated_dmaresource(struct pnp_resource_table *res,
                 }
                 res->dma_resource[i].start = dma;
                 res->dma_resource[i].end = dma;
+        } else {
+                printk(KERN_ERR "pnpacpi: exceeded the max number of DMA "
+                                "resources: %d \n", PNP_MAX_DMA);
         }
 }
 
@@ -194,6 +207,9 @@ static void pnpacpi_parse_allocated_ioresource(struct pnp_resource_table *res,
                 }
                 res->port_resource[i].start = io;
                 res->port_resource[i].end = io + len - 1;
+        } else {
+                printk(KERN_ERR "pnpacpi: exceeded the max number of IO "
+                                "resources: %d \n", PNP_MAX_PORT);
         }
 }
 
@@ -217,6 +233,9 @@ static void pnpacpi_parse_allocated_memresource(struct pnp_resource_table *res,
 
                 res->mem_resource[i].start = mem;
                 res->mem_resource[i].end = mem + len - 1;
+        } else {
+                printk(KERN_ERR "pnpacpi: exceeded the max number of mem "
+                                "resources: %d\n", PNP_MAX_MEM);
         }
 }
 
diff --git a/drivers/pnp/resource.c b/drivers/pnp/resource.c
index 41d73a5e9312..e50ebcffb962 100644
--- a/drivers/pnp/resource.c
+++ b/drivers/pnp/resource.c
@@ -367,8 +367,10 @@ int pnp_check_irq(struct pnp_dev *dev, int idx)
         {
                 struct pci_dev *pci = NULL;
                 for_each_pci_dev(pci) {
-                        if (pci->irq == *irq)
+                        if (pci->irq == *irq) {
+                                pci_dev_put(pci);
                                 return 0;
+                        }
                 }
         }
 #endif
diff --git a/drivers/ps3/Makefile b/drivers/ps3/Makefile
index 746031de2195..1f5a2d33bf5b 100644
--- a/drivers/ps3/Makefile
+++ b/drivers/ps3/Makefile
@@ -1,6 +1,6 @@
-obj-$(CONFIG_PS3_VUART) += vuart.o
+obj-$(CONFIG_PS3_VUART) += ps3-vuart.o
 obj-$(CONFIG_PS3_PS3AV) += ps3av_mod.o
 ps3av_mod-objs          += ps3av.o ps3av_cmd.o
 obj-$(CONFIG_PPC_PS3) += sys-manager-core.o
-obj-$(CONFIG_PS3_SYS_MANAGER) += sys-manager.o
+obj-$(CONFIG_PS3_SYS_MANAGER) += ps3-sys-manager.o
 obj-$(CONFIG_PS3_STORAGE) += ps3stor_lib.o
diff --git a/drivers/ps3/sys-manager.c b/drivers/ps3/ps3-sys-manager.c
index 8461b08ab9fb..8461b08ab9fb 100644
--- a/drivers/ps3/sys-manager.c
+++ b/drivers/ps3/ps3-sys-manager.c
diff --git a/drivers/ps3/vuart.c b/drivers/ps3/ps3-vuart.c
index 9dea585ef806..9dea585ef806 100644
--- a/drivers/ps3/vuart.c
+++ b/drivers/ps3/ps3-vuart.c
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index e5cdc0294aaa..1e6715ec51ef 100644
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -447,7 +447,7 @@ config RTC_DRV_AT91RM9200
 
 config RTC_DRV_BFIN
         tristate "Blackfin On-Chip RTC"
-        depends on BFIN
+        depends on BLACKFIN
         help
           If you say yes here you will get support for the
           Blackfin On-Chip Real Time Clock.
diff --git a/drivers/rtc/interface.c b/drivers/rtc/interface.c
index de0da545c7a1..f1e00ff54ce8 100644
--- a/drivers/rtc/interface.c
+++ b/drivers/rtc/interface.c
@@ -293,7 +293,7 @@ int rtc_irq_register(struct rtc_device *rtc, struct rtc_task *task)
                 return -EINVAL;
 
         /* Cannot register while the char dev is in use */
-        if (!(mutex_trylock(&rtc->char_lock)))
+        if (test_and_set_bit_lock(RTC_DEV_BUSY, &rtc->flags))
                 return -EBUSY;
 
         spin_lock_irq(&rtc->irq_task_lock);
@@ -303,7 +303,7 @@ int rtc_irq_register(struct rtc_device *rtc, struct rtc_task *task)
         }
         spin_unlock_irq(&rtc->irq_task_lock);
 
-        mutex_unlock(&rtc->char_lock);
+        clear_bit_unlock(RTC_DEV_BUSY, &rtc->flags);
 
         return retval;
 }
diff --git a/drivers/rtc/rtc-dev.c b/drivers/rtc/rtc-dev.c
index 814583bd2fe7..025c60a17a4a 100644
--- a/drivers/rtc/rtc-dev.c
+++ b/drivers/rtc/rtc-dev.c
@@ -26,10 +26,7 @@ static int rtc_dev_open(struct inode *inode, struct file *file)
                                         struct rtc_device, char_dev);
         const struct rtc_class_ops *ops = rtc->ops;
 
-        /* We keep the lock as long as the device is in use
-         * and return immediately if busy
-         */
-        if (!(mutex_trylock(&rtc->char_lock)))
+        if (test_and_set_bit_lock(RTC_DEV_BUSY, &rtc->flags))
                 return -EBUSY;
 
         file->private_data = rtc;
@@ -43,8 +40,8 @@ static int rtc_dev_open(struct inode *inode, struct file *file)
                 return 0;
         }
 
-        /* something has gone wrong, release the lock */
-        mutex_unlock(&rtc->char_lock);
+        /* something has gone wrong */
+        clear_bit_unlock(RTC_DEV_BUSY, &rtc->flags);
         return err;
 }
 
@@ -405,7 +402,7 @@ static int rtc_dev_release(struct inode *inode, struct file *file)
         if (rtc->ops->release)
                 rtc->ops->release(rtc->dev.parent);
 
-        mutex_unlock(&rtc->char_lock);
+        clear_bit_unlock(RTC_DEV_BUSY, &rtc->flags);
         return 0;
 }
 
@@ -440,7 +437,6 @@ void rtc_dev_prepare(struct rtc_device *rtc)
 
         rtc->dev.devt = MKDEV(MAJOR(rtc_devt), rtc->id);
 
-        mutex_init(&rtc->char_lock);
 #ifdef CONFIG_RTC_INTF_DEV_UIE_EMUL
         INIT_WORK(&rtc->uie_task, rtc_uie_task);
         setup_timer(&rtc->uie_timer, rtc_uie_timer, (unsigned long)rtc);
diff --git a/drivers/rtc/rtc-max6902.c b/drivers/rtc/rtc-max6902.c
index 3e183cfee10f..1f956dc5d56e 100644
--- a/drivers/rtc/rtc-max6902.c
+++ b/drivers/rtc/rtc-max6902.c
@@ -89,13 +89,9 @@ static int max6902_get_reg(struct device *dev, unsigned char address,
 
         /* do the i/o */
         status = spi_sync(spi, &message);
-        if (status == 0)
-                status = message.status;
-        else
-                return status;
-
-        *data = chip->rx_buf[1];
 
+        if (status == 0)
+                *data = chip->rx_buf[1];
         return status;
 }
 
@@ -125,9 +121,7 @@ static int max6902_get_datetime(struct device *dev, struct rtc_time *dt)
 
         /* do the i/o */
         status = spi_sync(spi, &message);
-        if (status == 0)
-                status = message.status;
-        else
+        if (status)
                 return status;
 
         /* The chip sends data in this order:
diff --git a/drivers/s390/block/dcssblk.c b/drivers/s390/block/dcssblk.c
index 5e083d1f57e7..15a5789b7734 100644
--- a/drivers/s390/block/dcssblk.c
+++ b/drivers/s390/block/dcssblk.c
@@ -472,11 +472,11 @@ dcssblk_add_store(struct device *dev, struct device_attribute *attr, const char
         if (rc)
                 goto unregister_dev;
 
-        add_disk(dev_info->gd);
-
         blk_queue_make_request(dev_info->dcssblk_queue, dcssblk_make_request);
         blk_queue_hardsect_size(dev_info->dcssblk_queue, 4096);
 
+        add_disk(dev_info->gd);
+
         switch (dev_info->segment_type) {
                 case SEG_TYPE_SR:
                 case SEG_TYPE_ER:
diff --git a/drivers/s390/cio/css.c b/drivers/s390/cio/css.c
index 838f7ac0dc32..c3df2cd009a4 100644
--- a/drivers/s390/cio/css.c
+++ b/drivers/s390/cio/css.c
@@ -451,6 +451,7 @@ static int reprobe_subchannel(struct subchannel_id schid, void *data)
                 break;
         case -ENXIO:
         case -ENOMEM:
+        case -EIO:
                 /* These should abort looping */
                 break;
         default:
@@ -483,7 +484,7 @@ static DECLARE_WORK(css_reprobe_work, reprobe_all);
 void css_schedule_reprobe(void)
 {
         need_reprobe = 1;
-        queue_work(ccw_device_work, &css_reprobe_work);
+        queue_work(slow_path_wq, &css_reprobe_work);
 }
 
 EXPORT_SYMBOL_GPL(css_schedule_reprobe);
diff --git a/drivers/s390/cio/device_fsm.c b/drivers/s390/cio/device_fsm.c
index 8867443b8060..bfad421cda66 100644
--- a/drivers/s390/cio/device_fsm.c
+++ b/drivers/s390/cio/device_fsm.c
@@ -1034,7 +1034,7 @@ device_trigger_reprobe(struct subchannel *sch)
         if (sch->schib.pmcw.dev != cdev->private->dev_id.devno) {
                 PREPARE_WORK(&cdev->private->kick_work,
                              ccw_device_move_to_orphanage);
-                queue_work(ccw_device_work, &cdev->private->kick_work);
+                queue_work(slow_path_wq, &cdev->private->kick_work);
         } else
                 ccw_device_start_id(cdev, 0);
 }
diff --git a/drivers/s390/cio/device_id.c b/drivers/s390/cio/device_id.c
index f232832f2b22..156f3f9786b5 100644
--- a/drivers/s390/cio/device_id.c
+++ b/drivers/s390/cio/device_id.c
@@ -118,14 +118,6 @@ __ccw_device_sense_id_start(struct ccw_device *cdev)
         sch = to_subchannel(cdev->dev.parent);
         /* Setup sense channel program. */
         ccw = cdev->private->iccws;
-        if (sch->schib.pmcw.pim != 0x80) {
-                /* more than one path installed. */
-                ccw->cmd_code = CCW_CMD_SUSPEND_RECONN;
-                ccw->cda = 0;
-                ccw->count = 0;
-                ccw->flags = CCW_FLAG_SLI | CCW_FLAG_CC;
-                ccw++;
-        }
         ccw->cmd_code = CCW_CMD_SENSE_ID;
         ccw->cda = (__u32) __pa (&cdev->private->senseid);
         ccw->count = sizeof (struct senseid);
diff --git a/drivers/s390/net/ctcmain.c b/drivers/s390/net/ctcmain.c
index 6bf3ebbe985a..77a503139e32 100644
--- a/drivers/s390/net/ctcmain.c
+++ b/drivers/s390/net/ctcmain.c
@@ -478,14 +478,14 @@ ctc_unpack_skb(struct channel *ch, struct sk_buff *pskb)
                 skb->dev = pskb->dev;
                 skb->protocol = pskb->protocol;
                 pskb->ip_summed = CHECKSUM_UNNECESSARY;
-                netif_rx_ni(skb);
                 /**
-                 * Successful rx; reset logflags
+                 * reset logflags
                  */
                 ch->logflags = 0;
-                dev->last_rx = jiffies;
                 privptr->stats.rx_packets++;
                 privptr->stats.rx_bytes += skb->len;
+                netif_rx_ni(skb);
+                dev->last_rx = jiffies;
                 if (len > 0) {
                         skb_pull(pskb, header->length);
                         if (skb_tailroom(pskb) < LL_HEADER_LENGTH) {
@@ -2782,35 +2782,14 @@ ctc_probe_device(struct ccwgroup_device *cgdev)
 }
 
 /**
- * Initialize everything of the net device except the name and the
- * channel structs.
+ * Device setup function called by alloc_netdev().
+ *
+ * @param dev  Device to be setup.
  */
-static struct net_device *
-ctc_init_netdevice(struct net_device * dev, int alloc_device,
-                   struct ctc_priv *privptr)
+void ctc_init_netdevice(struct net_device * dev)
 {
-        if (!privptr)
-                return NULL;
-
         DBF_TEXT(setup, 3, __FUNCTION__);
 
-        if (alloc_device) {
-                dev = kzalloc(sizeof(struct net_device), GFP_KERNEL);
-                if (!dev)
-                        return NULL;
-        }
-
-        dev->priv = privptr;
-        privptr->fsm = init_fsm("ctcdev", dev_state_names,
-                                dev_event_names, CTC_NR_DEV_STATES, CTC_NR_DEV_EVENTS,
-                                dev_fsm, DEV_FSM_LEN, GFP_KERNEL);
-        if (privptr->fsm == NULL) {
-                if (alloc_device)
-                        kfree(dev);
-                return NULL;
-        }
-        fsm_newstate(privptr->fsm, DEV_STATE_STOPPED);
-        fsm_settimer(privptr->fsm, &privptr->restart_timer);
         if (dev->mtu == 0)
                 dev->mtu = CTC_BUFSIZE_DEFAULT - LL_HEADER_LENGTH - 2;
         dev->hard_start_xmit = ctc_tx;
@@ -2823,7 +2802,6 @@ ctc_init_netdevice(struct net_device * dev, int alloc_device,
         dev->type = ARPHRD_SLIP;
         dev->tx_queue_len = 100;
         dev->flags = IFF_POINTOPOINT | IFF_NOARP;
-        return dev;
 }
 
 
@@ -2879,14 +2857,22 @@ ctc_new_device(struct ccwgroup_device *cgdev)
                         "ccw_device_set_online (cdev[1]) failed with ret = %d\n", ret);
         }
 
-        dev = ctc_init_netdevice(NULL, 1, privptr);
-
+        dev = alloc_netdev(0, "ctc%d", ctc_init_netdevice);
         if (!dev) {
                 ctc_pr_warn("ctc_init_netdevice failed\n");
                 goto out;
         }
+        dev->priv = privptr;
 
-        strlcpy(dev->name, "ctc%d", IFNAMSIZ);
+        privptr->fsm = init_fsm("ctcdev", dev_state_names,
+                        dev_event_names, CTC_NR_DEV_STATES, CTC_NR_DEV_EVENTS,
+                        dev_fsm, DEV_FSM_LEN, GFP_KERNEL);
+        if (privptr->fsm == NULL) {
+                free_netdev(dev);
+                goto out;
+        }
+        fsm_newstate(privptr->fsm, DEV_STATE_STOPPED);
+        fsm_settimer(privptr->fsm, &privptr->restart_timer);
 
         for (direction = READ; direction <= WRITE; direction++) {
                 privptr->channel[direction] =
diff --git a/drivers/s390/net/netiucv.c b/drivers/s390/net/netiucv.c
index 4d18d6419ddc..c7ea9381db9f 100644
--- a/drivers/s390/net/netiucv.c
+++ b/drivers/s390/net/netiucv.c
@@ -639,14 +639,14 @@ static void netiucv_unpack_skb(struct iucv_connection *conn,
                 skb->dev = pskb->dev;
                 skb->protocol = pskb->protocol;
                 pskb->ip_summed = CHECKSUM_UNNECESSARY;
+                privptr->stats.rx_packets++;
+                privptr->stats.rx_bytes += skb->len;
                 /*
                  * Since receiving is always initiated from a tasklet (in iucv.c),
                  * we must use netif_rx_ni() instead of netif_rx()
                  */
                 netif_rx_ni(skb);
                 dev->last_rx = jiffies;
-                privptr->stats.rx_packets++;
-                privptr->stats.rx_bytes += skb->len;
                 skb_pull(pskb, header->next);
                 skb_put(pskb, NETIUCV_HDRLEN);
         }
diff --git a/drivers/s390/scsi/zfcp_erp.c b/drivers/s390/scsi/zfcp_erp.c
index 5552b755c08a..07fa824d179f 100644
--- a/drivers/s390/scsi/zfcp_erp.c
+++ b/drivers/s390/scsi/zfcp_erp.c
@@ -977,7 +977,9 @@ static void zfcp_erp_action_dismiss(struct zfcp_erp_action *erp_action)
         debug_text_event(adapter->erp_dbf, 2, "a_adis");
         debug_event(adapter->erp_dbf, 2, &erp_action->action, sizeof (int));
 
-        zfcp_erp_async_handler_nolock(erp_action, ZFCP_STATUS_ERP_DISMISSED);
+        erp_action->status |= ZFCP_STATUS_ERP_DISMISSED;
+        if (zfcp_erp_action_exists(erp_action) == ZFCP_ERP_ACTION_RUNNING)
+                zfcp_erp_action_ready(erp_action);
 }
 
 int
@@ -1063,7 +1065,7 @@ zfcp_erp_thread(void *data)
                                  &adapter->status)) {
 
                 write_lock_irqsave(&adapter->erp_lock, flags);
-                next = adapter->erp_ready_head.prev;
+                next = adapter->erp_ready_head.next;
                 write_unlock_irqrestore(&adapter->erp_lock, flags);
 
                 if (next != &adapter->erp_ready_head) {
@@ -1153,15 +1155,13 @@ zfcp_erp_strategy(struct zfcp_erp_action *erp_action)
 
         /*
          * check for dismissed status again to avoid follow-up actions,
-         * failing of targets and so on for dismissed actions
+         * failing of targets and so on for dismissed actions,
+         * we go through down() here because there has been an up()
          */
-        retval = zfcp_erp_strategy_check_action(erp_action, retval);
+        if (erp_action->status & ZFCP_STATUS_ERP_DISMISSED)
+                retval = ZFCP_ERP_CONTINUES;
 
         switch (retval) {
-        case ZFCP_ERP_DISMISSED:
-                /* leave since this action has ridden to its ancestors */
-                debug_text_event(adapter->erp_dbf, 6, "a_st_dis2");
-                goto unlock;
         case ZFCP_ERP_NOMEM:
                 /* no memory to continue immediately, let it sleep */
                 if (!(erp_action->status & ZFCP_STATUS_ERP_LOWMEM)) {
@@ -3089,7 +3089,7 @@ zfcp_erp_action_enqueue(int action,
         ++adapter->erp_total_count;
 
         /* finally put it into 'ready' queue and kick erp thread */
-        list_add(&erp_action->list, &adapter->erp_ready_head);
+        list_add_tail(&erp_action->list, &adapter->erp_ready_head);
         up(&adapter->erp_ready_sem);
         retval = 0;
  out:
diff --git a/drivers/scsi/aacraid/commsup.c b/drivers/scsi/aacraid/commsup.c
index 240a0bb8986f..abce48ccc85b 100644
--- a/drivers/scsi/aacraid/commsup.c
+++ b/drivers/scsi/aacraid/commsup.c
@@ -1339,10 +1339,10 @@ int aac_check_health(struct aac_dev * aac)
                         aif = (struct aac_aifcmd *)hw_fib->data;
                         aif->command = cpu_to_le32(AifCmdEventNotify);
                         aif->seqnum = cpu_to_le32(0xFFFFFFFF);
-                        aif->data[0] = cpu_to_le32(AifEnExpEvent);
-                        aif->data[1] = cpu_to_le32(AifExeFirmwarePanic);
-                        aif->data[2] = cpu_to_le32(AifHighPriority);
-                        aif->data[3] = cpu_to_le32(BlinkLED);
+                        aif->data[0] = AifEnExpEvent;
+                        aif->data[1] = AifExeFirmwarePanic;
+                        aif->data[2] = AifHighPriority;
+                        aif->data[3] = BlinkLED;
 
                         /*
                          * Put the FIB onto the
diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c
index 038980be763d..9dd331bc29b0 100644
--- a/drivers/scsi/aacraid/linit.c
+++ b/drivers/scsi/aacraid/linit.c
@@ -636,7 +636,7 @@ static int aac_cfg_open(struct inode *inode, struct file *file)
 static int aac_cfg_ioctl(struct inode *inode,  struct file *file,
                 unsigned int cmd, unsigned long arg)
 {
-        if (!capable(CAP_SYS_ADMIN))
+        if (!capable(CAP_SYS_RAWIO))
                 return -EPERM;
         return aac_do_ioctl(file->private_data, cmd, (void __user *)arg);
 }
@@ -691,7 +691,7 @@ static int aac_compat_ioctl(struct scsi_device *sdev, int cmd, void __user *arg)
 
 static long aac_compat_cfg_ioctl(struct file *file, unsigned cmd, unsigned long arg)
 {
-        if (!capable(CAP_SYS_ADMIN))
+        if (!capable(CAP_SYS_RAWIO))
                 return -EPERM;
         return aac_compat_do_ioctl((struct aac_dev *)file->private_data, cmd, arg);
 }
@@ -950,7 +950,8 @@ static struct scsi_host_template aac_driver_template = {
 
 static void __aac_shutdown(struct aac_dev * aac)
 {
-        kthread_stop(aac->thread);
+        if (aac->aif_thread)
+                kthread_stop(aac->thread);
         aac_send_shutdown(aac);
         aac_adapter_disable_int(aac);
         free_irq(aac->pdev->irq, aac);
diff --git a/drivers/scsi/atari_scsi.c b/drivers/scsi/atari_scsi.c
index 6f8403b82ba1..f5732d8f67fe 100644
--- a/drivers/scsi/atari_scsi.c
+++ b/drivers/scsi/atari_scsi.c
@@ -393,7 +393,7 @@ static irqreturn_t scsi_tt_intr(int irq, void *dummy)
 
 #endif /* REAL_DMA */
 
-        NCR5380_intr(0, 0);
+        NCR5380_intr(irq, dummy);
 
 #if 0
         /* To be sure the int is not masked */
@@ -458,7 +458,7 @@ static irqreturn_t scsi_falcon_intr(int irq, void *dummy)
 
 #endif /* REAL_DMA */
 
-        NCR5380_intr(0, 0);
+        NCR5380_intr(irq, dummy);
         return IRQ_HANDLED;
 }
 
@@ -684,7 +684,7 @@ int atari_scsi_detect(struct scsi_host_template *host)
                  * interrupt after having cleared the pending flag for the DMA
                  * interrupt. */
                 if (request_irq(IRQ_TT_MFP_SCSI, scsi_tt_intr, IRQ_TYPE_SLOW,
-                                 "SCSI NCR5380", scsi_tt_intr)) {
+                                 "SCSI NCR5380", instance)) {
                         printk(KERN_ERR "atari_scsi_detect: cannot allocate irq %d, aborting",IRQ_TT_MFP_SCSI);
                         scsi_unregister(atari_scsi_host);
                         atari_stram_free(atari_dma_buffer);
@@ -701,7 +701,7 @@ int atari_scsi_detect(struct scsi_host_template *host)
                                          IRQ_TYPE_PRIO, "Hades DMA emulator",
                                          hades_dma_emulator)) {
                                 printk(KERN_ERR "atari_scsi_detect: cannot allocate irq %d, aborting (MACH_IS_HADES)",IRQ_AUTO_2);
-                                free_irq(IRQ_TT_MFP_SCSI, scsi_tt_intr);
+                                free_irq(IRQ_TT_MFP_SCSI, instance);
                                 scsi_unregister(atari_scsi_host);
                                 atari_stram_free(atari_dma_buffer);
                                 atari_dma_buffer = 0;
@@ -761,7 +761,7 @@ int atari_scsi_detect(struct scsi_host_template *host)
 int atari_scsi_release(struct Scsi_Host *sh)
 {
         if (IS_A_TT())
-                free_irq(IRQ_TT_MFP_SCSI, scsi_tt_intr);
+                free_irq(IRQ_TT_MFP_SCSI, sh);
         if (atari_dma_buffer)
                 atari_stram_free(atari_dma_buffer);
         return 1;
diff --git a/drivers/scsi/dpt_i2o.c b/drivers/scsi/dpt_i2o.c
index 8258506ba7d7..70f48a1a6d58 100644
--- a/drivers/scsi/dpt_i2o.c
+++ b/drivers/scsi/dpt_i2o.c
@@ -173,20 +173,20 @@ static struct pci_device_id dptids[] = {
 };
 MODULE_DEVICE_TABLE(pci,dptids);
 
-static void adpt_exit(void);
-
-static int adpt_detect(void)
+static int adpt_detect(struct scsi_host_template* sht)
 {
         struct pci_dev *pDev = NULL;
         adpt_hba* pHba;
 
+        adpt_init();
+
         PINFO("Detecting Adaptec I2O RAID controllers...\n");
 
         /* search for all Adatpec I2O RAID cards */
         while ((pDev = pci_get_device( PCI_DPT_VENDOR_ID, PCI_ANY_ID, pDev))) {
                 if(pDev->device == PCI_DPT_DEVICE_ID ||
                    pDev->device == PCI_DPT_RAPTOR_DEVICE_ID){
-                        if(adpt_install_hba(pDev) ){
+                        if(adpt_install_hba(sht, pDev) ){
                                 PERROR("Could not Init an I2O RAID device\n");
                                 PERROR("Will not try to detect others.\n");
                                 return hba_count-1;
@@ -248,33 +248,34 @@ rebuild_sys_tab:
         }
 
         for (pHba = hba_chain; pHba; pHba = pHba->next) {
-                if (adpt_scsi_register(pHba) < 0) {
+                if( adpt_scsi_register(pHba,sht) < 0){
                         adpt_i2o_delete_hba(pHba);
                         continue;
                 }
                 pHba->initialized = TRUE;
                 pHba->state &= ~DPTI_STATE_RESET;
-                scsi_scan_host(pHba->host);
         }
 
         // Register our control device node
         // nodes will need to be created in /dev to access this
         // the nodes can not be created from within the driver
         if (hba_count && register_chrdev(DPTI_I2O_MAJOR, DPT_DRIVER, &adpt_fops)) {
-                adpt_exit();
+                adpt_i2o_sys_shutdown();
                 return 0;
         }
         return hba_count;
 }
 
 
-static int adpt_release(adpt_hba *pHba)
+/*
+ * scsi_unregister will be called AFTER we return.
+ */
+static int adpt_release(struct Scsi_Host *host)
 {
-        struct Scsi_Host *shost = pHba->host;
-        scsi_remove_host(shost);
+        adpt_hba* pHba = (adpt_hba*) host->hostdata[0];
 //      adpt_i2o_quiesce_hba(pHba);
         adpt_i2o_delete_hba(pHba);
-        scsi_host_put(shost);
+        scsi_unregister(host);
         return 0;
 }
 
@@ -881,7 +882,7 @@ static int adpt_reboot_event(struct notifier_block *n, ulong code, void *p)
 #endif
 
 
-static int adpt_install_hba(struct pci_dev* pDev)
+static int adpt_install_hba(struct scsi_host_template* sht, struct pci_dev* pDev)
 {
 
         adpt_hba* pHba = NULL;
@@ -1028,6 +1029,8 @@ static void adpt_i2o_delete_hba(adpt_hba* pHba)
 
 
         mutex_lock(&adpt_configuration_lock);
+        // scsi_unregister calls our adpt_release which
+        // does a quiese
         if(pHba->host){
                 free_irq(pHba->host->irq, pHba);
         }
@@ -1079,6 +1082,17 @@ static void adpt_i2o_delete_hba(adpt_hba* pHba)
 }
 
 
+static int adpt_init(void)
+{
+        printk("Loading Adaptec I2O RAID: Version " DPT_I2O_VERSION "\n");
+#ifdef REBOOT_NOTIFIER
+        register_reboot_notifier(&adpt_reboot_notifier);
+#endif
+
+        return 0;
+}
+
+
 static struct adpt_device* adpt_find_device(adpt_hba* pHba, u32 chan, u32 id, u32 lun)
 {
         struct adpt_device* d;
@@ -2164,6 +2178,37 @@ static s32 adpt_scsi_to_i2o(adpt_hba* pHba, struct scsi_cmnd* cmd, struct adpt_d
 }
 
 
+static s32 adpt_scsi_register(adpt_hba* pHba,struct scsi_host_template * sht)
+{
+        struct Scsi_Host *host = NULL;
+
+        host = scsi_register(sht, sizeof(adpt_hba*));
+        if (host == NULL) {
+                printk ("%s: scsi_register returned NULL\n",pHba->name);
+                return -1;
+        }
+        host->hostdata[0] = (unsigned long)pHba;
+        pHba->host = host;
+
+        host->irq = pHba->pDev->irq;
+        /* no IO ports, so don't have to set host->io_port and
+         * host->n_io_port
+         */
+        host->io_port = 0;
+        host->n_io_port = 0;
+                                /* see comments in scsi_host.h */
+        host->max_id = 16;
+        host->max_lun = 256;
+        host->max_channel = pHba->top_scsi_channel + 1;
+        host->cmd_per_lun = 1;
+        host->unique_id = (uint) pHba;
+        host->sg_tablesize = pHba->sg_tablesize;
+        host->can_queue = pHba->post_fifo_size;
+
+        return 0;
+}
+
+
 static s32 adpt_i2o_to_scsi(void __iomem *reply, struct scsi_cmnd* cmd)
 {
         adpt_hba* pHba;
@@ -3279,10 +3324,12 @@ static static void adpt_delay(int millisec)
 
 #endif
 
-static struct scsi_host_template adpt_template = {
+static struct scsi_host_template driver_template = {
         .name                   = "dpt_i2o",
         .proc_name              = "dpt_i2o",
         .proc_info              = adpt_proc_info,
+        .detect                 = adpt_detect,
+        .release                = adpt_release,
         .info                   = adpt_info,
         .queuecommand           = adpt_queue,
         .eh_abort_handler       = adpt_abort,
@@ -3297,62 +3344,5 @@ static struct scsi_host_template adpt_template = {
         .use_clustering         = ENABLE_CLUSTERING,
         .use_sg_chaining        = ENABLE_SG_CHAINING,
 };
-
-static s32 adpt_scsi_register(adpt_hba* pHba)
-{
-        struct Scsi_Host *host;
-
-        host = scsi_host_alloc(&adpt_template, sizeof(adpt_hba*));
-        if (host == NULL) {
-                printk ("%s: scsi_host_alloc returned NULL\n",pHba->name);
-                return -1;
-        }
-        host->hostdata[0] = (unsigned long)pHba;
-        pHba->host = host;
-
-        host->irq = pHba->pDev->irq;
-        /* no IO ports, so don't have to set host->io_port and
-         * host->n_io_port
-         */
-        host->io_port = 0;
-        host->n_io_port = 0;
-                                /* see comments in scsi_host.h */
-        host->max_id = 16;
-        host->max_lun = 256;
-        host->max_channel = pHba->top_scsi_channel + 1;
-        host->cmd_per_lun = 1;
-        host->unique_id = (uint) pHba;
-        host->sg_tablesize = pHba->sg_tablesize;
-        host->can_queue = pHba->post_fifo_size;
-
-        if (scsi_add_host(host, &pHba->pDev->dev)) {
-                scsi_host_put(host);
-                return -1;
-        }
-
-        return 0;
-}
-
-static int __init adpt_init(void)
-{
-        int count;
-
-        printk("Loading Adaptec I2O RAID: Version " DPT_I2O_VERSION "\n");
-#ifdef REBOOT_NOTIFIER
-        register_reboot_notifier(&adpt_reboot_notifier);
-#endif
-
-        count = adpt_detect();
-
-        return count > 0 ? 0 : -ENODEV;
-}
-
-static void adpt_exit(void)
-{
-        while (hba_chain)
-                adpt_release(hba_chain);
-}
-
-module_init(adpt_init);
-module_exit(adpt_exit);
+#include "scsi_module.c"
 MODULE_LICENSE("GPL");
diff --git a/drivers/scsi/dpti.h b/drivers/scsi/dpti.h
index 0892f6c70319..fd79068c5869 100644
--- a/drivers/scsi/dpti.h
+++ b/drivers/scsi/dpti.h
@@ -28,9 +28,11 @@
  * SCSI interface function Prototypes
  */
 
+static int adpt_detect(struct scsi_host_template * sht);
 static int adpt_queue(struct scsi_cmnd * cmd, void (*cmdcomplete) (struct scsi_cmnd *));
 static int adpt_abort(struct scsi_cmnd * cmd);
 static int adpt_reset(struct scsi_cmnd* cmd);
+static int adpt_release(struct Scsi_Host *host);
 static int adpt_slave_configure(struct scsi_device *);
 
 static const char *adpt_info(struct Scsi_Host *pSHost);
@@ -47,6 +49,8 @@ static int adpt_device_reset(struct scsi_cmnd* cmd);
 
 #define DPT_DRIVER_NAME "Adaptec I2O RAID"
 
+#ifndef HOSTS_C
+
 #include "dpt/sys_info.h"
 #include <linux/wait.h>
 #include "dpt/dpti_i2o.h"
@@ -285,7 +289,7 @@ static s32 adpt_i2o_init_outbound_q(adpt_hba* pHba);
 static s32 adpt_i2o_hrt_get(adpt_hba* pHba);
 static s32 adpt_scsi_to_i2o(adpt_hba* pHba, struct scsi_cmnd* cmd, struct adpt_device* dptdevice);
 static s32 adpt_i2o_to_scsi(void __iomem *reply, struct scsi_cmnd* cmd);
-static s32 adpt_scsi_register(adpt_hba* pHba);
+static s32 adpt_scsi_register(adpt_hba* pHba,struct scsi_host_template * sht);
 static s32 adpt_hba_reset(adpt_hba* pHba);
 static s32 adpt_i2o_reset_hba(adpt_hba* pHba);
 static s32 adpt_rescan(adpt_hba* pHba);
@@ -295,7 +299,7 @@ static void adpt_i2o_delete_hba(adpt_hba* pHba);
 static void adpt_inquiry(adpt_hba* pHba);
 static void adpt_fail_posted_scbs(adpt_hba* pHba);
 static struct adpt_device* adpt_find_device(adpt_hba* pHba, u32 chan, u32 id, u32 lun);
-static int adpt_install_hba(struct pci_dev* pDev) ;
+static int adpt_install_hba(struct scsi_host_template* sht, struct pci_dev* pDev) ;
 static int adpt_i2o_online_hba(adpt_hba* pHba);
 static void adpt_i2o_post_wait_complete(u32, int);
 static int adpt_i2o_systab_send(adpt_hba* pHba);
@@ -339,4 +343,5 @@ static void adpt_i386_info(sysInfo_S* si);
 #define FW_DEBUG_BLED_OFFSET       8
 
 #define FW_DEBUG_FLAGS_NO_HEADERS_B    0x01
+#endif                          /* !HOSTS_C */
 #endif                          /* _DPT_H */
diff --git a/drivers/scsi/dtc.c b/drivers/scsi/dtc.c
index 2596165096d3..c2677ba29c74 100644
--- a/drivers/scsi/dtc.c
+++ b/drivers/scsi/dtc.c
@@ -277,7 +277,8 @@ found:
                 /* With interrupts enabled, it will sometimes hang when doing heavy
                  * reads. So better not enable them until I finger it out. */
                 if (instance->irq != SCSI_IRQ_NONE)
-                        if (request_irq(instance->irq, dtc_intr, IRQF_DISABLED, "dtc", instance)) {
+                        if (request_irq(instance->irq, dtc_intr, IRQF_DISABLED,
+                                        "dtc", instance)) {
                                 printk(KERN_ERR "scsi%d : IRQ%d not free, interrupts disabled\n", instance->host_no, instance->irq);
                                 instance->irq = SCSI_IRQ_NONE;
                         }
@@ -459,7 +460,7 @@ static int dtc_release(struct Scsi_Host *shost)
         NCR5380_local_declare();
         NCR5380_setup(shost);
         if (shost->irq)
-                free_irq(shost->irq, NULL);
+                free_irq(shost->irq, shost);
         NCR5380_exit(shost);
         if (shost->io_port && shost->n_io_port)
                 release_region(shost->io_port, shost->n_io_port);
diff --git a/drivers/scsi/esp_scsi.c b/drivers/scsi/esp_scsi.c
index 4ed3a5297066..bfdee5968892 100644
--- a/drivers/scsi/esp_scsi.c
+++ b/drivers/scsi/esp_scsi.c
@@ -2026,8 +2026,8 @@ static void esp_reset_cleanup(struct esp *esp)
                 tp->flags |= ESP_TGT_CHECK_NEGO;
 
                 if (tp->starget)
-                        starget_for_each_device(tp->starget, NULL,
-                                                esp_clear_hold);
+                        __starget_for_each_device(tp->starget, NULL,
+                                                  esp_clear_hold);
         }
         esp->flags &= ~ESP_FLAG_RESETTING;
 }
diff --git a/drivers/scsi/g_NCR5380.c b/drivers/scsi/g_NCR5380.c
index 607336f56d55..75585a52c88b 100644
--- a/drivers/scsi/g_NCR5380.c
+++ b/drivers/scsi/g_NCR5380.c
@@ -460,7 +460,8 @@ int __init generic_NCR5380_detect(struct scsi_host_template * tpnt)
                         instance->irq = NCR5380_probe_irq(instance, 0xffff);
 
                 if (instance->irq != SCSI_IRQ_NONE)
-                        if (request_irq(instance->irq, generic_NCR5380_intr, IRQF_DISABLED, "NCR5380", instance)) {
+                        if (request_irq(instance->irq, generic_NCR5380_intr,
+                                        IRQF_DISABLED, "NCR5380", instance)) {
                                 printk(KERN_WARNING "scsi%d : IRQ%d not free, interrupts disabled\n", instance->host_no, instance->irq);
                                 instance->irq = SCSI_IRQ_NONE;
                         }
@@ -513,7 +514,7 @@ int generic_NCR5380_release_resources(struct Scsi_Host *instance)
         NCR5380_setup(instance);
         
         if (instance->irq != SCSI_IRQ_NONE)
-                free_irq(instance->irq, NULL);
+                free_irq(instance->irq, instance);
         NCR5380_exit(instance);
 
 #ifndef CONFIG_SCSI_G_NCR5380_MEM
diff --git a/drivers/scsi/ide-scsi.c b/drivers/scsi/ide-scsi.c
index 8d0244c2e7d4..7a835a35f21d 100644
--- a/drivers/scsi/ide-scsi.c
+++ b/drivers/scsi/ide-scsi.c
@@ -242,16 +242,6 @@ static void idescsi_output_buffers (ide_drive_t *drive, idescsi_pc_t *pc, unsign
         }
 }
 
-static void hexdump(u8 *x, int len)
-{
-        int i;
-
-        printk("[ ");
-        for (i = 0; i < len; i++)
-                printk("%x ", x[i]);
-        printk("]\n");
-}
-
 static int idescsi_check_condition(ide_drive_t *drive, struct request *failed_command)
 {
         idescsi_scsi_t *scsi = drive_to_idescsi(drive);
@@ -282,7 +272,8 @@ static int idescsi_check_condition(ide_drive_t *drive, struct request *failed_co
         pc->scsi_cmd = ((idescsi_pc_t *) failed_command->special)->scsi_cmd;
         if (test_bit(IDESCSI_LOG_CMD, &scsi->log)) {
                 printk ("ide-scsi: %s: queue cmd = ", drive->name);
-                hexdump(pc->c, 6);
+                print_hex_dump(KERN_CONT, "", DUMP_PREFIX_NONE, 16, 1, pc->c,
+                               6, 0);
         }
         rq->rq_disk = scsi->disk;
         return ide_do_drive_cmd(drive, rq, ide_preempt);
@@ -337,7 +328,8 @@ static int idescsi_end_request (ide_drive_t *drive, int uptodate, int nrsecs)
                 idescsi_pc_t *opc = (idescsi_pc_t *) rq->buffer;
                 if (log) {
                         printk ("ide-scsi: %s: wrap up check %lu, rst = ", drive->name, opc->scsi_cmd->serial_number);
-                        hexdump(pc->buffer,16);
+                        print_hex_dump(KERN_CONT, "", DUMP_PREFIX_NONE, 16, 1,
+                                       pc->buffer, 16, 0);
                 }
                 memcpy((void *) opc->scsi_cmd->sense_buffer, pc->buffer, SCSI_SENSE_BUFFERSIZE);
                 kfree(pc->buffer);
@@ -816,10 +808,12 @@ static int idescsi_queue (struct scsi_cmnd *cmd,
 
         if (test_bit(IDESCSI_LOG_CMD, &scsi->log)) {
                 printk ("ide-scsi: %s: que %lu, cmd = ", drive->name, cmd->serial_number);
-                hexdump(cmd->cmnd, cmd->cmd_len);
+                print_hex_dump(KERN_CONT, "", DUMP_PREFIX_NONE, 16, 1,
+                               cmd->cmnd, cmd->cmd_len, 0);
                 if (memcmp(pc->c, cmd->cmnd, cmd->cmd_len)) {
                         printk ("ide-scsi: %s: que %lu, tsl = ", drive->name, cmd->serial_number);
-                        hexdump(pc->c, 12);
+                        print_hex_dump(KERN_CONT, "", DUMP_PREFIX_NONE, 16, 1,
+                                       pc->c, 12, 0);
                 }
         }
 
diff --git a/drivers/scsi/iscsi_tcp.c b/drivers/scsi/iscsi_tcp.c
index 4bcf916c21a7..57ce2251abc8 100644
--- a/drivers/scsi/iscsi_tcp.c
+++ b/drivers/scsi/iscsi_tcp.c
@@ -197,7 +197,7 @@ iscsi_tcp_cleanup_ctask(struct iscsi_conn *conn, struct iscsi_cmd_task *ctask)
         if (unlikely(!sc))
                 return;
 
-        tcp_ctask->xmstate = XMSTATE_IDLE;
+        tcp_ctask->xmstate = XMSTATE_VALUE_IDLE;
         tcp_ctask->r2t = NULL;
 }
 
@@ -409,7 +409,7 @@ iscsi_r2t_rsp(struct iscsi_conn *conn, struct iscsi_cmd_task *ctask)
 
         tcp_ctask->exp_datasn = r2tsn + 1;
         __kfifo_put(tcp_ctask->r2tqueue, (void*)&r2t, sizeof(void*));
-        tcp_ctask->xmstate |= XMSTATE_SOL_HDR_INIT;
+        set_bit(XMSTATE_BIT_SOL_HDR_INIT, &tcp_ctask->xmstate);
         list_move_tail(&ctask->running, &conn->xmitqueue);
 
         scsi_queue_work(session->host, &conn->xmitwork);
@@ -1254,7 +1254,7 @@ static void iscsi_set_padding(struct iscsi_tcp_cmd_task *tcp_ctask,
 
         tcp_ctask->pad_count = ISCSI_PAD_LEN - tcp_ctask->pad_count;
         debug_scsi("write padding %d bytes\n", tcp_ctask->pad_count);
-        tcp_ctask->xmstate |= XMSTATE_W_PAD;
+        set_bit(XMSTATE_BIT_W_PAD, &tcp_ctask->xmstate);
 }
 
 /**
@@ -1269,7 +1269,7 @@ iscsi_tcp_cmd_init(struct iscsi_cmd_task *ctask)
         struct iscsi_tcp_cmd_task *tcp_ctask = ctask->dd_data;
 
         BUG_ON(__kfifo_len(tcp_ctask->r2tqueue));
-        tcp_ctask->xmstate = XMSTATE_CMD_HDR_INIT;
+        tcp_ctask->xmstate = 1 << XMSTATE_BIT_CMD_HDR_INIT;
 }
 
 /**
@@ -1283,10 +1283,10 @@ iscsi_tcp_cmd_init(struct iscsi_cmd_task *ctask)
  *      xmit.
  *
  *      Management xmit state machine consists of these states:
- *              XMSTATE_IMM_HDR_INIT    - calculate digest of PDU Header
- *              XMSTATE_IMM_HDR         - PDU Header xmit in progress
- *              XMSTATE_IMM_DATA        - PDU Data xmit in progress
- *              XMSTATE_IDLE            - management PDU is done
+ *              XMSTATE_BIT_IMM_HDR_INIT - calculate digest of PDU Header
+ *              XMSTATE_BIT_IMM_HDR      - PDU Header xmit in progress
+ *              XMSTATE_BIT_IMM_DATA     - PDU Data xmit in progress
+ *              XMSTATE_VALUE_IDLE       - management PDU is done
  **/
 static int
 iscsi_tcp_mtask_xmit(struct iscsi_conn *conn, struct iscsi_mgmt_task *mtask)
@@ -1297,12 +1297,12 @@ iscsi_tcp_mtask_xmit(struct iscsi_conn *conn, struct iscsi_mgmt_task *mtask)
         debug_scsi("mtask deq [cid %d state %x itt 0x%x]\n",
                 conn->id, tcp_mtask->xmstate, mtask->itt);
 
-        if (tcp_mtask->xmstate & XMSTATE_IMM_HDR_INIT) {
+        if (test_bit(XMSTATE_BIT_IMM_HDR_INIT, &tcp_mtask->xmstate)) {
                 iscsi_buf_init_iov(&tcp_mtask->headbuf, (char*)mtask->hdr,
                                    sizeof(struct iscsi_hdr));
 
                 if (mtask->data_count) {
-                        tcp_mtask->xmstate |= XMSTATE_IMM_DATA;
+                        set_bit(XMSTATE_BIT_IMM_DATA, &tcp_mtask->xmstate);
                         iscsi_buf_init_iov(&tcp_mtask->sendbuf,
                                            (char*)mtask->data,
                                            mtask->data_count);
@@ -1315,21 +1315,20 @@ iscsi_tcp_mtask_xmit(struct iscsi_conn *conn, struct iscsi_mgmt_task *mtask)
                                         (u8*)tcp_mtask->hdrext);
 
                 tcp_mtask->sent = 0;
-                tcp_mtask->xmstate &= ~XMSTATE_IMM_HDR_INIT;
-                tcp_mtask->xmstate |= XMSTATE_IMM_HDR;
+                clear_bit(XMSTATE_BIT_IMM_HDR_INIT, &tcp_mtask->xmstate);
+                set_bit(XMSTATE_BIT_IMM_HDR, &tcp_mtask->xmstate);
         }
 
-        if (tcp_mtask->xmstate & XMSTATE_IMM_HDR) {
+        if (test_bit(XMSTATE_BIT_IMM_HDR, &tcp_mtask->xmstate)) {
                 rc = iscsi_sendhdr(conn, &tcp_mtask->headbuf,
                                    mtask->data_count);
                 if (rc)
                         return rc;
-                tcp_mtask->xmstate &= ~XMSTATE_IMM_HDR;
+                clear_bit(XMSTATE_BIT_IMM_HDR, &tcp_mtask->xmstate);
         }
 
-        if (tcp_mtask->xmstate & XMSTATE_IMM_DATA) {
+        if (test_and_clear_bit(XMSTATE_BIT_IMM_DATA, &tcp_mtask->xmstate)) {
                 BUG_ON(!mtask->data_count);
-                tcp_mtask->xmstate &= ~XMSTATE_IMM_DATA;
                 /* FIXME: implement.
                  * Virtual buffer could be spreaded across multiple pages...
                  */
@@ -1339,13 +1338,13 @@ iscsi_tcp_mtask_xmit(struct iscsi_conn *conn, struct iscsi_mgmt_task *mtask)
                         rc = iscsi_sendpage(conn, &tcp_mtask->sendbuf,
                                         &mtask->data_count, &tcp_mtask->sent);
                         if (rc) {
-                                tcp_mtask->xmstate |= XMSTATE_IMM_DATA;
+                                set_bit(XMSTATE_BIT_IMM_DATA, &tcp_mtask->xmstate);
                                 return rc;
                         }
                 } while (mtask->data_count);
         }
 
-        BUG_ON(tcp_mtask->xmstate != XMSTATE_IDLE);
+        BUG_ON(tcp_mtask->xmstate != XMSTATE_VALUE_IDLE);
         if (mtask->hdr->itt == RESERVED_ITT) {
                 struct iscsi_session *session = conn->session;
 
@@ -1365,7 +1364,7 @@ iscsi_send_cmd_hdr(struct iscsi_conn *conn, struct iscsi_cmd_task *ctask)
         struct iscsi_tcp_cmd_task *tcp_ctask = ctask->dd_data;
         int rc = 0;
 
-        if (tcp_ctask->xmstate & XMSTATE_CMD_HDR_INIT) {
+        if (test_bit(XMSTATE_BIT_CMD_HDR_INIT, &tcp_ctask->xmstate)) {
                 tcp_ctask->sent = 0;
                 tcp_ctask->sg_count = 0;
                 tcp_ctask->exp_datasn = 0;
@@ -1390,21 +1389,21 @@ iscsi_send_cmd_hdr(struct iscsi_conn *conn, struct iscsi_cmd_task *ctask)
                 if (conn->hdrdgst_en)
                         iscsi_hdr_digest(conn, &tcp_ctask->headbuf,
                                          (u8*)tcp_ctask->hdrext);
-                tcp_ctask->xmstate &= ~XMSTATE_CMD_HDR_INIT;
-                tcp_ctask->xmstate |= XMSTATE_CMD_HDR_XMIT;
+                clear_bit(XMSTATE_BIT_CMD_HDR_INIT, &tcp_ctask->xmstate);
+                set_bit(XMSTATE_BIT_CMD_HDR_XMIT, &tcp_ctask->xmstate);
         }
 
-        if (tcp_ctask->xmstate & XMSTATE_CMD_HDR_XMIT) {
+        if (test_bit(XMSTATE_BIT_CMD_HDR_XMIT, &tcp_ctask->xmstate)) {
                 rc = iscsi_sendhdr(conn, &tcp_ctask->headbuf, ctask->imm_count);
                 if (rc)
                         return rc;
-                tcp_ctask->xmstate &= ~XMSTATE_CMD_HDR_XMIT;
+                clear_bit(XMSTATE_BIT_CMD_HDR_XMIT, &tcp_ctask->xmstate);
 
                 if (sc->sc_data_direction != DMA_TO_DEVICE)
                         return 0;
 
                 if (ctask->imm_count) {
-                        tcp_ctask->xmstate |= XMSTATE_IMM_DATA;
+                        set_bit(XMSTATE_BIT_IMM_DATA, &tcp_ctask->xmstate);
                         iscsi_set_padding(tcp_ctask, ctask->imm_count);
 
                         if (ctask->conn->datadgst_en) {
@@ -1414,9 +1413,10 @@ iscsi_send_cmd_hdr(struct iscsi_conn *conn, struct iscsi_cmd_task *ctask)
                         }
                 }
 
-                if (ctask->unsol_count)
-                        tcp_ctask->xmstate |=
-                                        XMSTATE_UNS_HDR | XMSTATE_UNS_INIT;
+                if (ctask->unsol_count) {
+                        set_bit(XMSTATE_BIT_UNS_HDR, &tcp_ctask->xmstate);
+                        set_bit(XMSTATE_BIT_UNS_INIT, &tcp_ctask->xmstate);
+                }
         }
         return rc;
 }
@@ -1428,25 +1428,25 @@ iscsi_send_padding(struct iscsi_conn *conn, struct iscsi_cmd_task *ctask)
         struct iscsi_tcp_conn *tcp_conn = conn->dd_data;
         int sent = 0, rc;
 
-        if (tcp_ctask->xmstate & XMSTATE_W_PAD) {
+        if (test_bit(XMSTATE_BIT_W_PAD, &tcp_ctask->xmstate)) {
                 iscsi_buf_init_iov(&tcp_ctask->sendbuf, (char*)&tcp_ctask->pad,
                                    tcp_ctask->pad_count);
                 if (conn->datadgst_en)
                         crypto_hash_update(&tcp_conn->tx_hash,
                                            &tcp_ctask->sendbuf.sg,
                                            tcp_ctask->sendbuf.sg.length);
-        } else if (!(tcp_ctask->xmstate & XMSTATE_W_RESEND_PAD))
+        } else if (!test_bit(XMSTATE_BIT_W_RESEND_PAD, &tcp_ctask->xmstate))
                 return 0;
 
-        tcp_ctask->xmstate &= ~XMSTATE_W_PAD;
-        tcp_ctask->xmstate &= ~XMSTATE_W_RESEND_PAD;
+        clear_bit(XMSTATE_BIT_W_PAD, &tcp_ctask->xmstate);
+        clear_bit(XMSTATE_BIT_W_RESEND_PAD, &tcp_ctask->xmstate);
         debug_scsi("sending %d pad bytes for itt 0x%x\n",
                    tcp_ctask->pad_count, ctask->itt);
         rc = iscsi_sendpage(conn, &tcp_ctask->sendbuf, &tcp_ctask->pad_count,
                            &sent);
         if (rc) {
                 debug_scsi("padding send failed %d\n", rc);
-                tcp_ctask->xmstate |= XMSTATE_W_RESEND_PAD;
+                set_bit(XMSTATE_BIT_W_RESEND_PAD, &tcp_ctask->xmstate);
         }
         return rc;
 }
@@ -1465,11 +1465,11 @@ iscsi_send_digest(struct iscsi_conn *conn, struct iscsi_cmd_task *ctask,
         tcp_ctask = ctask->dd_data;
         tcp_conn = conn->dd_data;
 
-        if (!(tcp_ctask->xmstate & XMSTATE_W_RESEND_DATA_DIGEST)) {
+        if (!test_bit(XMSTATE_BIT_W_RESEND_DATA_DIGEST, &tcp_ctask->xmstate)) {
                 crypto_hash_final(&tcp_conn->tx_hash, (u8*)digest);
                 iscsi_buf_init_iov(buf, (char*)digest, 4);
         }
-        tcp_ctask->xmstate &= ~XMSTATE_W_RESEND_DATA_DIGEST;
+        clear_bit(XMSTATE_BIT_W_RESEND_DATA_DIGEST, &tcp_ctask->xmstate);
 
         rc = iscsi_sendpage(conn, buf, &tcp_ctask->digest_count, &sent);
         if (!rc)
@@ -1478,7 +1478,7 @@ iscsi_send_digest(struct iscsi_conn *conn, struct iscsi_cmd_task *ctask,
         else {
                 debug_scsi("sending digest 0x%x failed for itt 0x%x!\n",
                           *digest, ctask->itt);
-                tcp_ctask->xmstate |= XMSTATE_W_RESEND_DATA_DIGEST;
+                set_bit(XMSTATE_BIT_W_RESEND_DATA_DIGEST, &tcp_ctask->xmstate);
         }
         return rc;
 }
@@ -1526,8 +1526,8 @@ iscsi_send_unsol_hdr(struct iscsi_conn *conn, struct iscsi_cmd_task *ctask)
         struct iscsi_data_task *dtask;
         int rc;
 
-        tcp_ctask->xmstate |= XMSTATE_UNS_DATA;
-        if (tcp_ctask->xmstate & XMSTATE_UNS_INIT) {
+        set_bit(XMSTATE_BIT_UNS_DATA, &tcp_ctask->xmstate);
+        if (test_bit(XMSTATE_BIT_UNS_INIT, &tcp_ctask->xmstate)) {
                 dtask = &tcp_ctask->unsol_dtask;
 
                 iscsi_prep_unsolicit_data_pdu(ctask, &dtask->hdr);
@@ -1537,14 +1537,14 @@ iscsi_send_unsol_hdr(struct iscsi_conn *conn, struct iscsi_cmd_task *ctask)
                         iscsi_hdr_digest(conn, &tcp_ctask->headbuf,
                                         (u8*)dtask->hdrext);
 
-                tcp_ctask->xmstate &= ~XMSTATE_UNS_INIT;
+                clear_bit(XMSTATE_BIT_UNS_INIT, &tcp_ctask->xmstate);
                 iscsi_set_padding(tcp_ctask, ctask->data_count);
         }
 
         rc = iscsi_sendhdr(conn, &tcp_ctask->headbuf, ctask->data_count);
         if (rc) {
-                tcp_ctask->xmstate &= ~XMSTATE_UNS_DATA;
-                tcp_ctask->xmstate |= XMSTATE_UNS_HDR;
+                clear_bit(XMSTATE_BIT_UNS_DATA, &tcp_ctask->xmstate);
+                set_bit(XMSTATE_BIT_UNS_HDR, &tcp_ctask->xmstate);
                 return rc;
         }
 
@@ -1565,16 +1565,15 @@ iscsi_send_unsol_pdu(struct iscsi_conn *conn, struct iscsi_cmd_task *ctask)
         struct iscsi_tcp_cmd_task *tcp_ctask = ctask->dd_data;
         int rc;
 
-        if (tcp_ctask->xmstate & XMSTATE_UNS_HDR) {
+        if (test_and_clear_bit(XMSTATE_BIT_UNS_HDR, &tcp_ctask->xmstate)) {
                 BUG_ON(!ctask->unsol_count);
-                tcp_ctask->xmstate &= ~XMSTATE_UNS_HDR;
 send_hdr:
                 rc = iscsi_send_unsol_hdr(conn, ctask);
                 if (rc)
                         return rc;
         }
 
-        if (tcp_ctask->xmstate & XMSTATE_UNS_DATA) {
+        if (test_bit(XMSTATE_BIT_UNS_DATA, &tcp_ctask->xmstate)) {
                 struct iscsi_data_task *dtask = &tcp_ctask->unsol_dtask;
                 int start = tcp_ctask->sent;
 
@@ -1584,14 +1583,14 @@ send_hdr:
                 ctask->unsol_count -= tcp_ctask->sent - start;
                 if (rc)
                         return rc;
-                tcp_ctask->xmstate &= ~XMSTATE_UNS_DATA;
+                clear_bit(XMSTATE_BIT_UNS_DATA, &tcp_ctask->xmstate);
                 /*
                  * Done with the Data-Out. Next, check if we need
                  * to send another unsolicited Data-Out.
                  */
                 if (ctask->unsol_count) {
                         debug_scsi("sending more uns\n");
-                        tcp_ctask->xmstate |= XMSTATE_UNS_INIT;
+                        set_bit(XMSTATE_BIT_UNS_INIT, &tcp_ctask->xmstate);
                         goto send_hdr;
                 }
         }
@@ -1607,7 +1606,7 @@ static int iscsi_send_sol_pdu(struct iscsi_conn *conn,
         struct iscsi_data_task *dtask;
         int left, rc;
 
-        if (tcp_ctask->xmstate & XMSTATE_SOL_HDR_INIT) {
+        if (test_bit(XMSTATE_BIT_SOL_HDR_INIT, &tcp_ctask->xmstate)) {
                 if (!tcp_ctask->r2t) {
                         spin_lock_bh(&session->lock);
                         __kfifo_get(tcp_ctask->r2tqueue, (void*)&tcp_ctask->r2t,
@@ -1621,19 +1620,19 @@ send_hdr:
                 if (conn->hdrdgst_en)
                         iscsi_hdr_digest(conn, &r2t->headbuf,
                                         (u8*)dtask->hdrext);
-                tcp_ctask->xmstate &= ~XMSTATE_SOL_HDR_INIT;
-                tcp_ctask->xmstate |= XMSTATE_SOL_HDR;
+                clear_bit(XMSTATE_BIT_SOL_HDR_INIT, &tcp_ctask->xmstate);
+                set_bit(XMSTATE_BIT_SOL_HDR, &tcp_ctask->xmstate);
         }
 
-        if (tcp_ctask->xmstate & XMSTATE_SOL_HDR) {
+        if (test_bit(XMSTATE_BIT_SOL_HDR, &tcp_ctask->xmstate)) {
                 r2t = tcp_ctask->r2t;
                 dtask = &r2t->dtask;
 
                 rc = iscsi_sendhdr(conn, &r2t->headbuf, r2t->data_count);
                 if (rc)
                         return rc;
-                tcp_ctask->xmstate &= ~XMSTATE_SOL_HDR;
-                tcp_ctask->xmstate |= XMSTATE_SOL_DATA;
+                clear_bit(XMSTATE_BIT_SOL_HDR, &tcp_ctask->xmstate);
+                set_bit(XMSTATE_BIT_SOL_DATA, &tcp_ctask->xmstate);
 
                 if (conn->datadgst_en) {
                         iscsi_data_digest_init(conn->dd_data, tcp_ctask);
@@ -1646,7 +1645,7 @@ send_hdr:
                         r2t->sent);
         }
 
-        if (tcp_ctask->xmstate & XMSTATE_SOL_DATA) {
+        if (test_bit(XMSTATE_BIT_SOL_DATA, &tcp_ctask->xmstate)) {
                 r2t = tcp_ctask->r2t;
                 dtask = &r2t->dtask;
 
@@ -1655,7 +1654,7 @@ send_hdr:
                                      &dtask->digestbuf, &dtask->digest);
                 if (rc)
                         return rc;
-                tcp_ctask->xmstate &= ~XMSTATE_SOL_DATA;
+                clear_bit(XMSTATE_BIT_SOL_DATA, &tcp_ctask->xmstate);
 
                 /*
                  * Done with this Data-Out. Next, check if we have
@@ -1700,32 +1699,32 @@ send_hdr:
  *      xmit stages.
  *
  *iscsi_send_cmd_hdr()
- *      XMSTATE_CMD_HDR_INIT - prepare Header and Data buffers Calculate
- *                             Header Digest
- *      XMSTATE_CMD_HDR_XMIT - Transmit header in progress
+ *      XMSTATE_BIT_CMD_HDR_INIT - prepare Header and Data buffers Calculate
+ *                                 Header Digest
+ *      XMSTATE_BIT_CMD_HDR_XMIT - Transmit header in progress
  *
  *iscsi_send_padding
- *      XMSTATE_W_PAD        - Prepare and send pading
- *      XMSTATE_W_RESEND_PAD - retry send pading
+ *      XMSTATE_BIT_W_PAD        - Prepare and send pading
+ *      XMSTATE_BIT_W_RESEND_PAD - retry send pading
  *
  *iscsi_send_digest
- *      XMSTATE_W_RESEND_DATA_DIGEST - Finalize and send Data Digest
- *      XMSTATE_W_RESEND_DATA_DIGEST - retry sending digest
+ *      XMSTATE_BIT_W_RESEND_DATA_DIGEST - Finalize and send Data Digest
+ *      XMSTATE_BIT_W_RESEND_DATA_DIGEST - retry sending digest
  *
  *iscsi_send_unsol_hdr
- *      XMSTATE_UNS_INIT     - prepare un-solicit data header and digest
- *      XMSTATE_UNS_HDR      - send un-solicit header
+ *      XMSTATE_BIT_UNS_INIT     - prepare un-solicit data header and digest
+ *      XMSTATE_BIT_UNS_HDR      - send un-solicit header
  *
  *iscsi_send_unsol_pdu
- *      XMSTATE_UNS_DATA     - send un-solicit data in progress
+ *      XMSTATE_BIT_UNS_DATA     - send un-solicit data in progress
  *
  *iscsi_send_sol_pdu
- *      XMSTATE_SOL_HDR_INIT - solicit data header and digest initialize
- *      XMSTATE_SOL_HDR      - send solicit header
- *      XMSTATE_SOL_DATA     - send solicit data
+ *      XMSTATE_BIT_SOL_HDR_INIT - solicit data header and digest initialize
+ *      XMSTATE_BIT_SOL_HDR      - send solicit header
+ *      XMSTATE_BIT_SOL_DATA     - send solicit data
  *
  *iscsi_tcp_ctask_xmit
- *      XMSTATE_IMM_DATA     - xmit managment data (??)
+ *      XMSTATE_BIT_IMM_DATA     - xmit managment data (??)
  **/
 static int
 iscsi_tcp_ctask_xmit(struct iscsi_conn *conn, struct iscsi_cmd_task *ctask)
@@ -1742,13 +1741,13 @@ iscsi_tcp_ctask_xmit(struct iscsi_conn *conn, struct iscsi_cmd_task *ctask)
         if (ctask->sc->sc_data_direction != DMA_TO_DEVICE)
                 return 0;
 
-        if (tcp_ctask->xmstate & XMSTATE_IMM_DATA) {
+        if (test_bit(XMSTATE_BIT_IMM_DATA, &tcp_ctask->xmstate)) {
                 rc = iscsi_send_data(ctask, &tcp_ctask->sendbuf, &tcp_ctask->sg,
                                      &tcp_ctask->sent, &ctask->imm_count,
                                      &tcp_ctask->immbuf, &tcp_ctask->immdigest);
                 if (rc)
                         return rc;
-                tcp_ctask->xmstate &= ~XMSTATE_IMM_DATA;
+                clear_bit(XMSTATE_BIT_IMM_DATA, &tcp_ctask->xmstate);
         }
 
         rc = iscsi_send_unsol_pdu(conn, ctask);
@@ -1981,7 +1980,7 @@ static void
 iscsi_tcp_mgmt_init(struct iscsi_conn *conn, struct iscsi_mgmt_task *mtask)
 {
         struct iscsi_tcp_mgmt_task *tcp_mtask = mtask->dd_data;
-        tcp_mtask->xmstate = XMSTATE_IMM_HDR_INIT;
+        tcp_mtask->xmstate = 1 << XMSTATE_BIT_IMM_HDR_INIT;
 }
 
 static int
diff --git a/drivers/scsi/iscsi_tcp.h b/drivers/scsi/iscsi_tcp.h
index 7eba44df0a7f..68c36cc8997e 100644
--- a/drivers/scsi/iscsi_tcp.h
+++ b/drivers/scsi/iscsi_tcp.h
@@ -32,21 +32,21 @@
 #define IN_PROGRESS_PAD_RECV            0x4
 
 /* xmit state machine */
-#define XMSTATE_IDLE                    0x0
-#define XMSTATE_CMD_HDR_INIT            0x1
-#define XMSTATE_CMD_HDR_XMIT            0x2
-#define XMSTATE_IMM_HDR                 0x4
-#define XMSTATE_IMM_DATA                0x8
-#define XMSTATE_UNS_INIT                0x10
-#define XMSTATE_UNS_HDR                 0x20
-#define XMSTATE_UNS_DATA                0x40
-#define XMSTATE_SOL_HDR                 0x80
-#define XMSTATE_SOL_DATA                0x100
-#define XMSTATE_W_PAD                   0x200
-#define XMSTATE_W_RESEND_PAD            0x400
-#define XMSTATE_W_RESEND_DATA_DIGEST    0x800
-#define XMSTATE_IMM_HDR_INIT            0x1000
-#define XMSTATE_SOL_HDR_INIT            0x2000
+#define XMSTATE_VALUE_IDLE                      0
+#define XMSTATE_BIT_CMD_HDR_INIT                0
+#define XMSTATE_BIT_CMD_HDR_XMIT                1
+#define XMSTATE_BIT_IMM_HDR                     2
+#define XMSTATE_BIT_IMM_DATA                    3
+#define XMSTATE_BIT_UNS_INIT                    4
+#define XMSTATE_BIT_UNS_HDR                     5
+#define XMSTATE_BIT_UNS_DATA                    6
+#define XMSTATE_BIT_SOL_HDR                     7
+#define XMSTATE_BIT_SOL_DATA                    8
+#define XMSTATE_BIT_W_PAD                       9
+#define XMSTATE_BIT_W_RESEND_PAD                10
+#define XMSTATE_BIT_W_RESEND_DATA_DIGEST        11
+#define XMSTATE_BIT_IMM_HDR_INIT                12
+#define XMSTATE_BIT_SOL_HDR_INIT                13
 
 #define ISCSI_PAD_LEN                   4
 #define ISCSI_SG_TABLESIZE              SG_ALL
@@ -122,7 +122,7 @@ struct iscsi_data_task {
 struct iscsi_tcp_mgmt_task {
         struct iscsi_hdr        hdr;
         char                    hdrext[sizeof(__u32)]; /* Header-Digest */
-        int                     xmstate;        /* mgmt xmit progress */
+        unsigned long           xmstate;        /* mgmt xmit progress */
         struct iscsi_buf        headbuf;        /* header buffer */
         struct iscsi_buf        sendbuf;        /* in progress buffer */
         int                     sent;
@@ -150,7 +150,7 @@ struct iscsi_tcp_cmd_task {
         int                     pad_count;              /* padded bytes */
         struct iscsi_buf        headbuf;                /* header buf (xmit) */
         struct iscsi_buf        sendbuf;                /* in progress buffer*/
-        int                     xmstate;                /* xmit xtate machine */
+        unsigned long           xmstate;                /* xmit xtate machine */
         int                     sent;
         struct scatterlist      *sg;                    /* per-cmd SG list  */
         struct scatterlist      *bad_sg;                /* assert statement */
diff --git a/drivers/scsi/libiscsi.c b/drivers/scsi/libiscsi.c
index efceed451b46..8b57af5baaec 100644
--- a/drivers/scsi/libiscsi.c
+++ b/drivers/scsi/libiscsi.c
@@ -291,9 +291,6 @@ invalid_datalen:
                            min_t(uint16_t, senselen, SCSI_SENSE_BUFFERSIZE));
         }
 
-        if (sc->sc_data_direction == DMA_TO_DEVICE)
-                goto out;
-
         if (rhdr->flags & ISCSI_FLAG_CMD_UNDERFLOW) {
                 int res_count = be32_to_cpu(rhdr->residual_count);
 
diff --git a/drivers/scsi/mac_scsi.c b/drivers/scsi/mac_scsi.c
index abe2bda6ac37..3b09ab21d701 100644
--- a/drivers/scsi/mac_scsi.c
+++ b/drivers/scsi/mac_scsi.c
@@ -303,7 +303,7 @@ int macscsi_detect(struct scsi_host_template * tpnt)
 
     if (instance->irq != SCSI_IRQ_NONE)
         if (request_irq(instance->irq, NCR5380_intr, IRQ_FLG_SLOW, 
-                "ncr5380", instance)) {
+                        "ncr5380", instance)) {
             printk(KERN_WARNING "scsi%d: IRQ%d not free, interrupts disabled\n",
                    instance->host_no, instance->irq);
             instance->irq = SCSI_IRQ_NONE;
@@ -326,7 +326,7 @@ int macscsi_detect(struct scsi_host_template * tpnt)
 int macscsi_release (struct Scsi_Host *shpnt)
 {
         if (shpnt->irq != SCSI_IRQ_NONE)
-                free_irq (shpnt->irq, NCR5380_intr);
+                free_irq(shpnt->irq, shpnt);
         NCR5380_exit(shpnt);
 
         return 0;
diff --git a/drivers/scsi/pas16.c b/drivers/scsi/pas16.c
index ee5965659971..f2018b46f494 100644
--- a/drivers/scsi/pas16.c
+++ b/drivers/scsi/pas16.c
@@ -453,7 +453,8 @@ int __init pas16_detect(struct scsi_host_template * tpnt)
             instance->irq = NCR5380_probe_irq(instance, PAS16_IRQS);
 
         if (instance->irq != SCSI_IRQ_NONE) 
-            if (request_irq(instance->irq, pas16_intr, IRQF_DISABLED, "pas16", instance)) {
+            if (request_irq(instance->irq, pas16_intr, IRQF_DISABLED,
+                            "pas16", instance)) {
                 printk("scsi%d : IRQ%d not free, interrupts disabled\n", 
                     instance->host_no, instance->irq);
                 instance->irq = SCSI_IRQ_NONE;
@@ -604,7 +605,7 @@ static inline int NCR5380_pwrite (struct Scsi_Host *instance, unsigned char *src
 static int pas16_release(struct Scsi_Host *shost)
 {
         if (shost->irq)
-                free_irq(shost->irq, NULL);
+                free_irq(shost->irq, shost);
         NCR5380_exit(shost);
         if (shost->dma_channel != 0xff)
                 free_dma(shost->dma_channel);
diff --git a/drivers/scsi/qla1280.c b/drivers/scsi/qla1280.c
index 3aeb68bcb7ac..146d540f6281 100644
--- a/drivers/scsi/qla1280.c
+++ b/drivers/scsi/qla1280.c
@@ -1310,14 +1310,7 @@ qla1280_done(struct scsi_qla_host *ha)
                 }
 
                 /* Release memory used for this I/O */
-                if (cmd->use_sg) {
-                        pci_unmap_sg(ha->pdev, cmd->request_buffer,
-                                        cmd->use_sg, cmd->sc_data_direction);
-                } else if (cmd->request_bufflen) {
-                        pci_unmap_single(ha->pdev, sp->saved_dma_handle,
-                                        cmd->request_bufflen,
-                                        cmd->sc_data_direction);
-                }
+                scsi_dma_unmap(cmd);
 
                 /* Call the mid-level driver interrupt handler */
                 CMD_HANDLE(sp->cmd) = (unsigned char *)INVALID_HANDLE;
@@ -1406,14 +1399,14 @@ qla1280_return_status(struct response * sts, struct scsi_cmnd *cp)
                 break;
 
         case CS_DATA_UNDERRUN:
-                if ((cp->request_bufflen - residual_length) <
+                if ((scsi_bufflen(cp) - residual_length) <
                     cp->underflow) {
                         printk(KERN_WARNING
                                "scsi: Underflow detected - retrying "
                                "command.\n");
                         host_status = DID_ERROR;
                 } else {
-                        cp->resid = residual_length;
+                        scsi_set_resid(cp, residual_length);
                         host_status = DID_OK;
                 }
                 break;
@@ -2775,33 +2768,28 @@ qla1280_64bit_start_scsi(struct scsi_qla_host *ha, struct srb * sp)
         struct device_reg __iomem *reg = ha->iobase;
         struct scsi_cmnd *cmd = sp->cmd;
         cmd_a64_entry_t *pkt;
-        struct scatterlist *sg = NULL, *s;
         __le32 *dword_ptr;
         dma_addr_t dma_handle;
         int status = 0;
         int cnt;
         int req_cnt;
-        u16 seg_cnt;
+        int seg_cnt;
         u8 dir;
 
         ENTER("qla1280_64bit_start_scsi:");
 
         /* Calculate number of entries and segments required. */
         req_cnt = 1;
-        if (cmd->use_sg) {
-                sg = (struct scatterlist *) cmd->request_buffer;
-                seg_cnt = pci_map_sg(ha->pdev, sg, cmd->use_sg,
-                                     cmd->sc_data_direction);
-
+        seg_cnt = scsi_dma_map(cmd);
+        if (seg_cnt > 0) {
                 if (seg_cnt > 2) {
                         req_cnt += (seg_cnt - 2) / 5;
                         if ((seg_cnt - 2) % 5)
                                 req_cnt++;
                 }
-        } else if (cmd->request_bufflen) {      /* If data transfer. */
-                seg_cnt = 1;
-        } else {
-                seg_cnt = 0;
+        } else if (seg_cnt < 0) {
+                status = 1;
+                goto out;
         }
 
         if ((req_cnt + 2) >= ha->req_q_cnt) {
@@ -2889,124 +2877,104 @@ qla1280_64bit_start_scsi(struct scsi_qla_host *ha, struct srb * sp)
          * Load data segments.
          */
         if (seg_cnt) {  /* If data transfer. */
+                struct scatterlist *sg, *s;
                 int remseg = seg_cnt;
+
+                sg = scsi_sglist(cmd);
+
                 /* Setup packet address segment pointer. */
                 dword_ptr = (u32 *)&pkt->dseg_0_address;
 
-                if (cmd->use_sg) {      /* If scatter gather */
-                        /* Load command entry data segments. */
-                        for_each_sg(sg, s, seg_cnt, cnt) {
-                                if (cnt == 2)
+                /* Load command entry data segments. */
+                for_each_sg(sg, s, seg_cnt, cnt) {
+                        if (cnt == 2)
+                                break;
+
+                        dma_handle = sg_dma_address(s);
+#if defined(CONFIG_IA64_GENERIC) || defined(CONFIG_IA64_SGI_SN2)
+                        if (ha->flags.use_pci_vchannel)
+                                sn_pci_set_vchan(ha->pdev,
+                                                 (unsigned long *)&dma_handle,
+                                                 SCSI_BUS_32(cmd));
+#endif
+                        *dword_ptr++ =
+                                cpu_to_le32(pci_dma_lo32(dma_handle));
+                        *dword_ptr++ =
+                                cpu_to_le32(pci_dma_hi32(dma_handle));
+                        *dword_ptr++ = cpu_to_le32(sg_dma_len(s));
+                        dprintk(3, "S/G Segment phys_addr=%x %x, len=0x%x\n",
+                                cpu_to_le32(pci_dma_hi32(dma_handle)),
+                                cpu_to_le32(pci_dma_lo32(dma_handle)),
+                                cpu_to_le32(sg_dma_len(sg_next(s))));
+                        remseg--;
+                }
+                dprintk(5, "qla1280_64bit_start_scsi: Scatter/gather "
+                        "command packet data - b %i, t %i, l %i \n",
+                        SCSI_BUS_32(cmd), SCSI_TCN_32(cmd),
+                        SCSI_LUN_32(cmd));
+                qla1280_dump_buffer(5, (char *)pkt,
+                                    REQUEST_ENTRY_SIZE);
+
+                /*
+                 * Build continuation packets.
+                 */
+                dprintk(3, "S/G Building Continuation...seg_cnt=0x%x "
+                        "remains\n", seg_cnt);
+
+                while (remseg > 0) {
+                        /* Update sg start */
+                        sg = s;
+                        /* Adjust ring index. */
+                        ha->req_ring_index++;
+                        if (ha->req_ring_index == REQUEST_ENTRY_CNT) {
+                                ha->req_ring_index = 0;
+                                ha->request_ring_ptr =
+                                        ha->request_ring;
+                        } else
+                                ha->request_ring_ptr++;
+
+                        pkt = (cmd_a64_entry_t *)ha->request_ring_ptr;
+
+                        /* Zero out packet. */
+                        memset(pkt, 0, REQUEST_ENTRY_SIZE);
+
+                        /* Load packet defaults. */
+                        ((struct cont_a64_entry *) pkt)->entry_type =
+                                CONTINUE_A64_TYPE;
+                        ((struct cont_a64_entry *) pkt)->entry_count = 1;
+                        ((struct cont_a64_entry *) pkt)->sys_define =
+                                (uint8_t)ha->req_ring_index;
+                        /* Setup packet address segment pointer. */
+                        dword_ptr =
+                                (u32 *)&((struct cont_a64_entry *) pkt)->dseg_0_address;
+
+                        /* Load continuation entry data segments. */
+                        for_each_sg(sg, s, remseg, cnt) {
+                                if (cnt == 5)
                                         break;
                                 dma_handle = sg_dma_address(s);
 #if defined(CONFIG_IA64_GENERIC) || defined(CONFIG_IA64_SGI_SN2)
                                 if (ha->flags.use_pci_vchannel)
                                         sn_pci_set_vchan(ha->pdev,
-                                                        (unsigned long *)&dma_handle,
+                                                         (unsigned long *)&dma_handle,
                                                          SCSI_BUS_32(cmd));
 #endif
                                 *dword_ptr++ =
                                         cpu_to_le32(pci_dma_lo32(dma_handle));
                                 *dword_ptr++ =
                                         cpu_to_le32(pci_dma_hi32(dma_handle));
-                                *dword_ptr++ = cpu_to_le32(sg_dma_len(s));
-                                dprintk(3, "S/G Segment phys_addr=%x %x, len=0x%x\n",
+                                *dword_ptr++ =
+                                        cpu_to_le32(sg_dma_len(s));
+                                dprintk(3, "S/G Segment Cont. phys_addr=%x %x, len=0x%x\n",
                                         cpu_to_le32(pci_dma_hi32(dma_handle)),
                                         cpu_to_le32(pci_dma_lo32(dma_handle)),
-                                        cpu_to_le32(sg_dma_len(sg_next(s))));
-                                remseg--;
+                                        cpu_to_le32(sg_dma_len(s)));
                         }
-                        dprintk(5, "qla1280_64bit_start_scsi: Scatter/gather "
-                                "command packet data - b %i, t %i, l %i \n",
-                                SCSI_BUS_32(cmd), SCSI_TCN_32(cmd),
-                                SCSI_LUN_32(cmd));
-                        qla1280_dump_buffer(5, (char *)pkt,
-                                            REQUEST_ENTRY_SIZE);
-
-                        /*
-                         * Build continuation packets.
-                         */
-                        dprintk(3, "S/G Building Continuation...seg_cnt=0x%x "
-                                "remains\n", seg_cnt);
-
-                        while (remseg > 0) {
-                                /* Update sg start */
-                                sg = s;
-                                /* Adjust ring index. */
-                                ha->req_ring_index++;
-                                if (ha->req_ring_index == REQUEST_ENTRY_CNT) {
-                                        ha->req_ring_index = 0;
-                                        ha->request_ring_ptr =
-                                                ha->request_ring;
-                                } else
-                                                ha->request_ring_ptr++;
-
-                                pkt = (cmd_a64_entry_t *)ha->request_ring_ptr;
-
-                                /* Zero out packet. */
-                                memset(pkt, 0, REQUEST_ENTRY_SIZE);
-
-                                /* Load packet defaults. */
-                                ((struct cont_a64_entry *) pkt)->entry_type =
-                                        CONTINUE_A64_TYPE;
-                                ((struct cont_a64_entry *) pkt)->entry_count = 1;
-                                ((struct cont_a64_entry *) pkt)->sys_define =
-                                        (uint8_t)ha->req_ring_index;
-                                /* Setup packet address segment pointer. */
-                                dword_ptr =
-                                        (u32 *)&((struct cont_a64_entry *) pkt)->dseg_0_address;
-
-                                /* Load continuation entry data segments. */
-                                for_each_sg(sg, s, remseg, cnt) {
-                                        if (cnt == 5)
-                                                break;
-                                        dma_handle = sg_dma_address(s);
-#if defined(CONFIG_IA64_GENERIC) || defined(CONFIG_IA64_SGI_SN2)
-                                if (ha->flags.use_pci_vchannel)
-                                        sn_pci_set_vchan(ha->pdev, 
-                                                        (unsigned long *)&dma_handle,
-                                                         SCSI_BUS_32(cmd));
-#endif
-                                        *dword_ptr++ =
-                                                cpu_to_le32(pci_dma_lo32(dma_handle));
-                                        *dword_ptr++ =
-                                                cpu_to_le32(pci_dma_hi32(dma_handle));
-                                        *dword_ptr++ =
-                                                cpu_to_le32(sg_dma_len(s));
-                                        dprintk(3, "S/G Segment Cont. phys_addr=%x %x, len=0x%x\n",
-                                                cpu_to_le32(pci_dma_hi32(dma_handle)),
-                                                cpu_to_le32(pci_dma_lo32(dma_handle)),
-                                                cpu_to_le32(sg_dma_len(s)));
-                                }
-                                remseg -= cnt;
-                                dprintk(5, "qla1280_64bit_start_scsi: "
-                                        "continuation packet data - b %i, t "
-                                        "%i, l %i \n", SCSI_BUS_32(cmd),
-                                        SCSI_TCN_32(cmd), SCSI_LUN_32(cmd));
-                                qla1280_dump_buffer(5, (char *)pkt,
-                                                    REQUEST_ENTRY_SIZE);
-                        }
-                } else {        /* No scatter gather data transfer */
-                        dma_handle = pci_map_single(ha->pdev,
-                                        cmd->request_buffer,
-                                        cmd->request_bufflen,
-                                        cmd->sc_data_direction);
-
-                        sp->saved_dma_handle = dma_handle;
-#if defined(CONFIG_IA64_GENERIC) || defined(CONFIG_IA64_SGI_SN2)
-                        if (ha->flags.use_pci_vchannel)
-                                sn_pci_set_vchan(ha->pdev, 
-                                                (unsigned long *)&dma_handle,
-                                                 SCSI_BUS_32(cmd));
-#endif
-                        *dword_ptr++ = cpu_to_le32(pci_dma_lo32(dma_handle));
-                        *dword_ptr++ = cpu_to_le32(pci_dma_hi32(dma_handle));
-                        *dword_ptr = cpu_to_le32(cmd->request_bufflen);
-
-                        dprintk(5, "qla1280_64bit_start_scsi: No scatter/"
-                                "gather command packet data - b %i, t %i, "
-                                "l %i \n", SCSI_BUS_32(cmd), SCSI_TCN_32(cmd),
-                                SCSI_LUN_32(cmd));
+                        remseg -= cnt;
+                        dprintk(5, "qla1280_64bit_start_scsi: "
+                                "continuation packet data - b %i, t "
+                                "%i, l %i \n", SCSI_BUS_32(cmd),
+                                SCSI_TCN_32(cmd), SCSI_LUN_32(cmd));
                         qla1280_dump_buffer(5, (char *)pkt,
                                             REQUEST_ENTRY_SIZE);
                 }
@@ -3068,12 +3036,11 @@ qla1280_32bit_start_scsi(struct scsi_qla_host *ha, struct srb * sp)
         struct device_reg __iomem *reg = ha->iobase;
         struct scsi_cmnd *cmd = sp->cmd;
         struct cmd_entry *pkt;
-        struct scatterlist *sg = NULL, *s;
         __le32 *dword_ptr;
         int status = 0;
         int cnt;
         int req_cnt;
-        uint16_t seg_cnt;
+        int seg_cnt;
         dma_addr_t dma_handle;
         u8 dir;
 
@@ -3083,18 +3050,8 @@ qla1280_32bit_start_scsi(struct scsi_qla_host *ha, struct srb * sp)
                 cmd->cmnd[0]);
 
         /* Calculate number of entries and segments required. */
-        req_cnt = 1;
-        if (cmd->use_sg) {
-                /*
-                 * We must build an SG list in adapter format, as the kernel's
-                 * SG list cannot be used directly because of data field size
-                 * (__alpha__) differences and the kernel SG list uses virtual
-                 * addresses where we need physical addresses.
-                 */
-                sg = (struct scatterlist *) cmd->request_buffer;
-                seg_cnt = pci_map_sg(ha->pdev, sg, cmd->use_sg,
-                                     cmd->sc_data_direction);
-
+        seg_cnt = scsi_dma_map(cmd);
+        if (seg_cnt) {
                 /*
                  * if greater than four sg entries then we need to allocate
                  * continuation entries
@@ -3106,14 +3063,9 @@ qla1280_32bit_start_scsi(struct scsi_qla_host *ha, struct srb * sp)
                 }
                 dprintk(3, "S/G Transfer cmd=%p seg_cnt=0x%x, req_cnt=%x\n",
                         cmd, seg_cnt, req_cnt);
-        } else if (cmd->request_bufflen) {      /* If data transfer. */
-                dprintk(3, "No S/G transfer t=%x cmd=%p len=%x CDB=%x\n",
-                        SCSI_TCN_32(cmd), cmd, cmd->request_bufflen,
-                        cmd->cmnd[0]);
-                seg_cnt = 1;
-        } else {
-                /* dprintk(1, "No data transfer \n"); */
-                seg_cnt = 0;
+        } else if (seg_cnt < 0) {
+                status = 1;
+                goto out;
         }
 
         if ((req_cnt + 2) >= ha->req_q_cnt) {
@@ -3194,91 +3146,84 @@ qla1280_32bit_start_scsi(struct scsi_qla_host *ha, struct srb * sp)
          * Load data segments.
          */
         if (seg_cnt) {
+                struct scatterlist *sg, *s;
                 int remseg = seg_cnt;
+
+                sg = scsi_sglist(cmd);
+
                 /* Setup packet address segment pointer. */
                 dword_ptr = &pkt->dseg_0_address;
 
-                if (cmd->use_sg) {      /* If scatter gather */
-                        dprintk(3, "Building S/G data segments..\n");
-                        qla1280_dump_buffer(1, (char *)sg, 4 * 16);
+                dprintk(3, "Building S/G data segments..\n");
+                qla1280_dump_buffer(1, (char *)sg, 4 * 16);
+
+                /* Load command entry data segments. */
+                for_each_sg(sg, s, seg_cnt, cnt) {
+                        if (cnt == 4)
+                                break;
+                        *dword_ptr++ =
+                                cpu_to_le32(pci_dma_lo32(sg_dma_address(s)));
+                        *dword_ptr++ = cpu_to_le32(sg_dma_len(s));
+                        dprintk(3, "S/G Segment phys_addr=0x%lx, len=0x%x\n",
+                                (pci_dma_lo32(sg_dma_address(s))),
+                                (sg_dma_len(s)));
+                        remseg--;
+                }
+                /*
+                 * Build continuation packets.
+                 */
+                dprintk(3, "S/G Building Continuation"
+                        "...seg_cnt=0x%x remains\n", seg_cnt);
+                while (remseg > 0) {
+                        /* Continue from end point */
+                        sg = s;
+                        /* Adjust ring index. */
+                        ha->req_ring_index++;
+                        if (ha->req_ring_index == REQUEST_ENTRY_CNT) {
+                                ha->req_ring_index = 0;
+                                ha->request_ring_ptr =
+                                        ha->request_ring;
+                        } else
+                                ha->request_ring_ptr++;
+
+                        pkt = (struct cmd_entry *)ha->request_ring_ptr;
+
+                        /* Zero out packet. */
+                        memset(pkt, 0, REQUEST_ENTRY_SIZE);
+
+                        /* Load packet defaults. */
+                        ((struct cont_entry *) pkt)->
+                                entry_type = CONTINUE_TYPE;
+                        ((struct cont_entry *) pkt)->entry_count = 1;
 
-                        /* Load command entry data segments. */
-                        for_each_sg(sg, s, seg_cnt, cnt) {
-                                if (cnt == 4)
+                        ((struct cont_entry *) pkt)->sys_define =
+                                (uint8_t) ha->req_ring_index;
+
+                        /* Setup packet address segment pointer. */
+                        dword_ptr =
+                                &((struct cont_entry *) pkt)->dseg_0_address;
+
+                        /* Load continuation entry data segments. */
+                        for_each_sg(sg, s, remseg, cnt) {
+                                if (cnt == 7)
                                         break;
                                 *dword_ptr++ =
                                         cpu_to_le32(pci_dma_lo32(sg_dma_address(s)));
-                                *dword_ptr++ = cpu_to_le32(sg_dma_len(s));
-                                dprintk(3, "S/G Segment phys_addr=0x%lx, len=0x%x\n",
-                                        (pci_dma_lo32(sg_dma_address(s))),
-                                        (sg_dma_len(s)));
-                                remseg--;
-                        }
-                        /*
-                         * Build continuation packets.
-                         */
-                        dprintk(3, "S/G Building Continuation"
-                                "...seg_cnt=0x%x remains\n", seg_cnt);
-                        while (remseg > 0) {
-                                /* Continue from end point */
-                                sg = s;
-                                /* Adjust ring index. */
-                                ha->req_ring_index++;
-                                if (ha->req_ring_index == REQUEST_ENTRY_CNT) {
-                                        ha->req_ring_index = 0;
-                                        ha->request_ring_ptr =
-                                                ha->request_ring;
-                                } else
-                                        ha->request_ring_ptr++;
-
-                                pkt = (struct cmd_entry *)ha->request_ring_ptr;
-
-                                /* Zero out packet. */
-                                memset(pkt, 0, REQUEST_ENTRY_SIZE);
-
-                                /* Load packet defaults. */
-                                ((struct cont_entry *) pkt)->
-                                        entry_type = CONTINUE_TYPE;
-                                ((struct cont_entry *) pkt)->entry_count = 1;
-
-                                ((struct cont_entry *) pkt)->sys_define =
-                                        (uint8_t) ha->req_ring_index;
-
-                                /* Setup packet address segment pointer. */
-                                dword_ptr =
-                                        &((struct cont_entry *) pkt)->dseg_0_address;
-
-                                /* Load continuation entry data segments. */
-                                for_each_sg(sg, s, remseg, cnt) {
-                                        if (cnt == 7)
-                                                break;
-                                        *dword_ptr++ =
-                                                cpu_to_le32(pci_dma_lo32(sg_dma_address(s)));
-                                        *dword_ptr++ =
-                                                cpu_to_le32(sg_dma_len(s));
-                                        dprintk(1,
-                                                "S/G Segment Cont. phys_addr=0x%x, "
-                                                "len=0x%x\n",
-                                                cpu_to_le32(pci_dma_lo32(sg_dma_address(s))),
-                                                cpu_to_le32(sg_dma_len(s)));
-                                }
-                                remseg -= cnt;
-                                dprintk(5, "qla1280_32bit_start_scsi: "
-                                        "continuation packet data - "
-                                        "scsi(%i:%i:%i)\n", SCSI_BUS_32(cmd),
-                                        SCSI_TCN_32(cmd), SCSI_LUN_32(cmd));
-                                qla1280_dump_buffer(5, (char *)pkt,
-                                                    REQUEST_ENTRY_SIZE);
+                                *dword_ptr++ =
+                                        cpu_to_le32(sg_dma_len(s));
+                                dprintk(1,
+                                        "S/G Segment Cont. phys_addr=0x%x, "
+                                        "len=0x%x\n",
+                                        cpu_to_le32(pci_dma_lo32(sg_dma_address(s))),
+                                        cpu_to_le32(sg_dma_len(s)));
                         }
-                } else {        /* No S/G data transfer */
-                        dma_handle = pci_map_single(ha->pdev,
-                                        cmd->request_buffer,
-                                        cmd->request_bufflen,
-                                        cmd->sc_data_direction);
-                        sp->saved_dma_handle = dma_handle;
-
-                        *dword_ptr++ = cpu_to_le32(pci_dma_lo32(dma_handle));
-                        *dword_ptr = cpu_to_le32(cmd->request_bufflen);
+                        remseg -= cnt;
+                        dprintk(5, "qla1280_32bit_start_scsi: "
+                                "continuation packet data - "
+                                "scsi(%i:%i:%i)\n", SCSI_BUS_32(cmd),
+                                SCSI_TCN_32(cmd), SCSI_LUN_32(cmd));
+                        qla1280_dump_buffer(5, (char *)pkt,
+                                            REQUEST_ENTRY_SIZE);
                 }
         } else {        /* No data transfer at all */
                 dprintk(5, "qla1280_32bit_start_scsi: No data, command "
@@ -4086,9 +4031,9 @@ __qla1280_print_scsi_cmd(struct scsi_cmnd *cmd)
         for (i = 0; i < cmd->cmd_len; i++) {
                 printk("0x%02x ", cmd->cmnd[i]);
         }
-        printk("  seg_cnt =%d\n", cmd->use_sg);
+        printk("  seg_cnt =%d\n", scsi_sg_count(cmd));
         printk("  request buffer=0x%p, request buffer len=0x%x\n",
-               cmd->request_buffer, cmd->request_bufflen);
+               scsi_sglist(cmd), scsi_bufflen(cmd));
         /* if (cmd->use_sg)
            {
            sg = (struct scatterlist *) cmd->request_buffer;
diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
index 192948822455..0fb1709ce5e3 100644
--- a/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
@@ -896,11 +896,11 @@ EXPORT_SYMBOL(__scsi_iterate_devices);
  * starget_for_each_device  -  helper to walk all devices of a target
  * @starget:    target whose devices we want to iterate over.
  *
- * This traverses over each devices of @shost.  The devices have
+ * This traverses over each device of @starget.  The devices have
  * a reference that must be released by scsi_host_put when breaking
  * out of the loop.
  */
-void starget_for_each_device(struct scsi_target *starget, void * data,
+void starget_for_each_device(struct scsi_target *starget, void *data,
                      void (*fn)(struct scsi_device *, void *))
 {
         struct Scsi_Host *shost = dev_to_shost(starget->dev.parent);
@@ -915,6 +915,33 @@ void starget_for_each_device(struct scsi_target *starget, void * data,
 EXPORT_SYMBOL(starget_for_each_device);
 
 /**
+ * __starget_for_each_device  -  helper to walk all devices of a target
+ *                               (UNLOCKED)
+ * @starget:    target whose devices we want to iterate over.
+ *
+ * This traverses over each device of @starget.  It does _not_
+ * take a reference on the scsi_device, so the whole loop must be
+ * protected by shost->host_lock.
+ *
+ * Note:  The only reason why drivers would want to use this is because
+ * they need to access the device list in irq context.  Otherwise you
+ * really want to use starget_for_each_device instead.
+ **/
+void __starget_for_each_device(struct scsi_target *starget, void *data,
+                               void (*fn)(struct scsi_device *, void *))
+{
+        struct Scsi_Host *shost = dev_to_shost(starget->dev.parent);
+        struct scsi_device *sdev;
+
+        __shost_for_each_device(sdev, shost) {
+                if ((sdev->channel == starget->channel) &&
+                    (sdev->id == starget->id))
+                        fn(sdev, data);
+        }
+}
+EXPORT_SYMBOL(__starget_for_each_device);
+
+/**
  * __scsi_device_lookup_by_target - find a device given the target (UNLOCKED)
  * @starget:    SCSI target pointer
  * @lun:        SCSI Logical Unit Number
diff --git a/drivers/scsi/sun3_scsi.c b/drivers/scsi/sun3_scsi.c
index 5e46d842c6f9..e606cf0a2eb7 100644
--- a/drivers/scsi/sun3_scsi.c
+++ b/drivers/scsi/sun3_scsi.c
@@ -268,7 +268,7 @@ int sun3scsi_detect(struct scsi_host_template * tpnt)
         ((struct NCR5380_hostdata *)instance->hostdata)->ctrl = 0;
 
         if (request_irq(instance->irq, scsi_sun3_intr,
-                             0, "Sun3SCSI-5380", NULL)) {
+                             0, "Sun3SCSI-5380", instance)) {
 #ifndef REAL_DMA
                 printk("scsi%d: IRQ%d not free, interrupts disabled\n",
                        instance->host_no, instance->irq);
@@ -310,7 +310,7 @@ int sun3scsi_detect(struct scsi_host_template * tpnt)
 int sun3scsi_release (struct Scsi_Host *shpnt)
 {
         if (shpnt->irq != SCSI_IRQ_NONE)
-                free_irq (shpnt->irq, NULL);
+                free_irq(shpnt->irq, shpnt);
 
         iounmap((void *)sun3_scsi_regp);
 
diff --git a/drivers/scsi/sun3_scsi_vme.c b/drivers/scsi/sun3_scsi_vme.c
index 7cb4a31453e6..02d9727f017a 100644
--- a/drivers/scsi/sun3_scsi_vme.c
+++ b/drivers/scsi/sun3_scsi_vme.c
@@ -230,7 +230,7 @@ static int sun3scsi_detect(struct scsi_host_template * tpnt)
         ((struct NCR5380_hostdata *)instance->hostdata)->ctrl = 0;
 
         if (request_irq(instance->irq, scsi_sun3_intr,
-                             0, "Sun3SCSI-5380VME", NULL)) {
+                        0, "Sun3SCSI-5380VME", instance)) {
 #ifndef REAL_DMA
                 printk("scsi%d: IRQ%d not free, interrupts disabled\n",
                        instance->host_no, instance->irq);
@@ -279,7 +279,7 @@ static int sun3scsi_detect(struct scsi_host_template * tpnt)
 int sun3scsi_release (struct Scsi_Host *shpnt)
 {
         if (shpnt->irq != SCSI_IRQ_NONE)
-                free_irq (shpnt->irq, NULL);
+                free_irq(shpnt->irq, shpnt);
 
         iounmap((void *)sun3_scsi_regp);
 
diff --git a/drivers/scsi/t128.c b/drivers/scsi/t128.c
index 248d60b8d899..041eaaace2c3 100644
--- a/drivers/scsi/t128.c
+++ b/drivers/scsi/t128.c
@@ -259,7 +259,8 @@ found:
             instance->irq = NCR5380_probe_irq(instance, T128_IRQS);
 
         if (instance->irq != SCSI_IRQ_NONE) 
-            if (request_irq(instance->irq, t128_intr, IRQF_DISABLED, "t128", instance)) {
+            if (request_irq(instance->irq, t128_intr, IRQF_DISABLED, "t128",
+                            instance)) {
                 printk("scsi%d : IRQ%d not free, interrupts disabled\n", 
                     instance->host_no, instance->irq);
                 instance->irq = SCSI_IRQ_NONE;
@@ -295,7 +296,7 @@ static int t128_release(struct Scsi_Host *shost)
         NCR5380_local_declare();
         NCR5380_setup(shost);
         if (shost->irq)
-                free_irq(shost->irq, NULL);
+                free_irq(shost->irq, shost);
         NCR5380_exit(shost);
         if (shost->io_port && shost->n_io_port)
                 release_region(shost->io_port, shost->n_io_port);
diff --git a/drivers/scsi/zorro7xx.c b/drivers/scsi/zorro7xx.c
index ac67394c7373..64d40a2d4d4d 100644
--- a/drivers/scsi/zorro7xx.c
+++ b/drivers/scsi/zorro7xx.c
@@ -13,7 +13,10 @@
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/zorro.h>
+
+#include <asm/amigahw.h>
 #include <asm/amigaints.h>
+
 #include <scsi/scsi_host.h>
 #include <scsi/scsi_transport_spi.h>
 
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index ed438bc7e98d..d7e1996e2fec 100644
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -600,7 +600,7 @@ config SERIAL_SA1100_CONSOLE
 
 config SERIAL_BFIN
         tristate "Blackfin serial port support"
-        depends on BFIN
+        depends on BLACKFIN
         select SERIAL_CORE
         select SERIAL_BFIN_UART0 if (BF531 || BF532 || BF533 || BF561)
         help
diff --git a/drivers/serial/ip22zilog.c b/drivers/serial/ip22zilog.c
index f3257f708ef9..9c95bc0398ad 100644
--- a/drivers/serial/ip22zilog.c
+++ b/drivers/serial/ip22zilog.c
@@ -45,8 +45,6 @@
 
 #include "ip22zilog.h"
 
-void ip22_do_break(void);
-
 /*
  * On IP22 we need to delay after register accesses but we do not need to
  * flush writes.
@@ -81,12 +79,9 @@ struct uart_ip22zilog_port {
 #define IP22ZILOG_FLAG_REGS_HELD        0x00000040
 #define IP22ZILOG_FLAG_TX_STOPPED       0x00000080
 #define IP22ZILOG_FLAG_TX_ACTIVE        0x00000100
+#define IP22ZILOG_FLAG_RESET_DONE       0x00000200
 
-        unsigned int                    cflag;
-
-        /* L1-A keyboard break state.  */
-        int                             kbd_id;
-        int                             l1_down;
+        unsigned int                    tty_break;
 
         unsigned char                   parity_mask;
         unsigned char                   prev_status;
@@ -250,13 +245,26 @@ static void ip22zilog_maybe_update_regs(struct uart_ip22zilog_port *up,
         }
 }
 
-static void ip22zilog_receive_chars(struct uart_ip22zilog_port *up,
-                                   struct zilog_channel *channel)
+#define Rx_BRK 0x0100                   /* BREAK event software flag.  */
+#define Rx_SYS 0x0200                   /* SysRq event software flag.  */
+
+static struct tty_struct *ip22zilog_receive_chars(struct uart_ip22zilog_port *up,
+                                                  struct zilog_channel *channel)
 {
-        struct tty_struct *tty = up->port.info->tty;    /* XXX info==NULL? */
+        struct tty_struct *tty;
+        unsigned char ch, flag;
+        unsigned int r1;
+
+        tty = NULL;
+        if (up->port.info != NULL &&
+            up->port.info->tty != NULL)
+                tty = up->port.info->tty;
 
-        while (1) {
-                unsigned char ch, r1, flag;
+        for (;;) {
+                ch = readb(&channel->control);
+                ZSDELAY();
+                if (!(ch & Rx_CH_AV))
+                        break;
 
                 r1 = read_zsreg(channel, R1);
                 if (r1 & (PAR_ERR | Rx_OVR | CRC_ERR)) {
@@ -265,43 +273,26 @@ static void ip22zilog_receive_chars(struct uart_ip22zilog_port *up,
                         ZS_WSYNC(channel);
                 }
 
-                ch = readb(&channel->control);
-                ZSDELAY();
-
-                /* This funny hack depends upon BRK_ABRT not interfering
-                 * with the other bits we care about in R1.
-                 */
-                if (ch & BRK_ABRT)
-                        r1 |= BRK_ABRT;
-
                 ch = readb(&channel->data);
                 ZSDELAY();
 
                 ch &= up->parity_mask;
 
-                if (ZS_IS_CONS(up) && (r1 & BRK_ABRT)) {
-                        /* Wait for BREAK to deassert to avoid potentially
-                         * confusing the PROM.
-                         */
-                        while (1) {
-                                ch = readb(&channel->control);
-                                ZSDELAY();
-                                if (!(ch & BRK_ABRT))
-                                        break;
-                        }
-                        ip22_do_break();
-                        return;
-                }
+                /* Handle the null char got when BREAK is removed.  */
+                if (!ch)
+                        r1 |= up->tty_break;
 
                 /* A real serial line, record the character and status.  */
                 flag = TTY_NORMAL;
                 up->port.icount.rx++;
-                if (r1 & (BRK_ABRT | PAR_ERR | Rx_OVR | CRC_ERR)) {
-                        if (r1 & BRK_ABRT) {
-                                r1 &= ~(PAR_ERR | CRC_ERR);
+                if (r1 & (PAR_ERR | Rx_OVR | CRC_ERR | Rx_SYS | Rx_BRK)) {
+                        up->tty_break = 0;
+
+                        if (r1 & (Rx_SYS | Rx_BRK)) {
                                 up->port.icount.brk++;
-                                if (uart_handle_break(&up->port))
-                                        goto next_char;
+                                if (r1 & Rx_SYS)
+                                        continue;
+                                r1 &= ~(PAR_ERR | CRC_ERR);
                         }
                         else if (r1 & PAR_ERR)
                                 up->port.icount.parity++;
@@ -310,30 +301,21 @@ static void ip22zilog_receive_chars(struct uart_ip22zilog_port *up,
                         if (r1 & Rx_OVR)
                                 up->port.icount.overrun++;
                         r1 &= up->port.read_status_mask;
-                        if (r1 & BRK_ABRT)
+                        if (r1 & Rx_BRK)
                                 flag = TTY_BREAK;
                         else if (r1 & PAR_ERR)
                                 flag = TTY_PARITY;
                         else if (r1 & CRC_ERR)
                                 flag = TTY_FRAME;
                 }
-                if (uart_handle_sysrq_char(&up->port, ch))
-                        goto next_char;
 
-                if (up->port.ignore_status_mask == 0xff ||
-                    (r1 & up->port.ignore_status_mask) == 0)
-                        tty_insert_flip_char(tty, ch, flag);
+                if (uart_handle_sysrq_char(&up->port, ch))
+                        continue;
 
-                if (r1 & Rx_OVR)
-                        tty_insert_flip_char(tty, 0, TTY_OVERRUN);
-        next_char:
-                ch = readb(&channel->control);
-                ZSDELAY();
-                if (!(ch & Rx_CH_AV))
-                        break;
+                if (tty)
+                        uart_insert_char(&up->port, r1, Rx_OVR, ch, flag);
         }
-
-        tty_flip_buffer_push(tty);
+        return tty;
 }
 
 static void ip22zilog_status_handle(struct uart_ip22zilog_port *up,
@@ -348,6 +330,15 @@ static void ip22zilog_status_handle(struct uart_ip22zilog_port *up,
         ZSDELAY();
         ZS_WSYNC(channel);
 
+        if (up->curregs[R15] & BRKIE) {
+                if ((status & BRK_ABRT) && !(up->prev_status & BRK_ABRT)) {
+                        if (uart_handle_break(&up->port))
+                                up->tty_break = Rx_SYS;
+                        else
+                                up->tty_break = Rx_BRK;
+                }
+        }
+
         if (ZS_WANTS_MODEM_STATUS(up)) {
                 if (status & SYNC)
                         up->port.icount.dsr++;
@@ -356,10 +347,10 @@ static void ip22zilog_status_handle(struct uart_ip22zilog_port *up,
                  * But it does not tell us which bit has changed, we have to keep
                  * track of this ourselves.
                  */
-                if ((status & DCD) ^ up->prev_status)
+                if ((status ^ up->prev_status) ^ DCD)
                         uart_handle_dcd_change(&up->port,
                                                (status & DCD));
-                if ((status & CTS) ^ up->prev_status)
+                if ((status ^ up->prev_status) ^ CTS)
                         uart_handle_cts_change(&up->port,
                                                (status & CTS));
 
@@ -447,19 +438,21 @@ static irqreturn_t ip22zilog_interrupt(int irq, void *dev_id)
         while (up) {
                 struct zilog_channel *channel
                         = ZILOG_CHANNEL_FROM_PORT(&up->port);
+                struct tty_struct *tty;
                 unsigned char r3;
 
                 spin_lock(&up->port.lock);
                 r3 = read_zsreg(channel, R3);
 
                 /* Channel A */
+                tty = NULL;
                 if (r3 & (CHAEXT | CHATxIP | CHARxIP)) {
                         writeb(RES_H_IUS, &channel->control);
                         ZSDELAY();
                         ZS_WSYNC(channel);
 
                         if (r3 & CHARxIP)
-                                ip22zilog_receive_chars(up, channel);
+                                tty = ip22zilog_receive_chars(up, channel);
                         if (r3 & CHAEXT)
                                 ip22zilog_status_handle(up, channel);
                         if (r3 & CHATxIP)
@@ -467,18 +460,22 @@ static irqreturn_t ip22zilog_interrupt(int irq, void *dev_id)
                 }
                 spin_unlock(&up->port.lock);
 
+                if (tty)
+                        tty_flip_buffer_push(tty);
+
                 /* Channel B */
                 up = up->next;
                 channel = ZILOG_CHANNEL_FROM_PORT(&up->port);
 
                 spin_lock(&up->port.lock);
+                tty = NULL;
                 if (r3 & (CHBEXT | CHBTxIP | CHBRxIP)) {
                         writeb(RES_H_IUS, &channel->control);
                         ZSDELAY();
                         ZS_WSYNC(channel);
 
                         if (r3 & CHBRxIP)
-                                ip22zilog_receive_chars(up, channel);
+                                tty = ip22zilog_receive_chars(up, channel);
                         if (r3 & CHBEXT)
                                 ip22zilog_status_handle(up, channel);
                         if (r3 & CHBTxIP)
@@ -486,6 +483,9 @@ static irqreturn_t ip22zilog_interrupt(int irq, void *dev_id)
                 }
                 spin_unlock(&up->port.lock);
 
+                if (tty)
+                        tty_flip_buffer_push(tty);
+
                 up = up->next;
         }
 
@@ -681,11 +681,46 @@ static void ip22zilog_break_ctl(struct uart_port *port, int break_state)
         spin_unlock_irqrestore(&port->lock, flags);
 }
 
+static void __ip22zilog_reset(struct uart_ip22zilog_port *up)
+{
+        struct zilog_channel *channel;
+        int i;
+
+        if (up->flags & IP22ZILOG_FLAG_RESET_DONE)
+                return;
+
+        /* Let pending transmits finish.  */
+        channel = ZILOG_CHANNEL_FROM_PORT(&up->port);
+        for (i = 0; i < 1000; i++) {
+                unsigned char stat = read_zsreg(channel, R1);
+                if (stat & ALL_SNT)
+                        break;
+                udelay(100);
+        }
+
+        if (!ZS_IS_CHANNEL_A(up)) {
+                up++;
+                channel = ZILOG_CHANNEL_FROM_PORT(&up->port);
+        }
+        write_zsreg(channel, R9, FHWRES);
+        ZSDELAY_LONG();
+        (void) read_zsreg(channel, R0);
+
+        up->flags |= IP22ZILOG_FLAG_RESET_DONE;
+        up->next->flags |= IP22ZILOG_FLAG_RESET_DONE;
+}
+
 static void __ip22zilog_startup(struct uart_ip22zilog_port *up)
 {
         struct zilog_channel *channel;
 
         channel = ZILOG_CHANNEL_FROM_PORT(&up->port);
+
+        __ip22zilog_reset(up);
+
+        __load_zsregs(channel, up->curregs);
+        /* set master interrupt enable */
+        write_zsreg(channel, R9, up->curregs[R9]);
         up->prev_status = readb(&channel->control);
 
         /* Enable receiver and transmitter.  */
@@ -859,8 +894,6 @@ ip22zilog_set_termios(struct uart_port *port, struct ktermios *termios,
         else
                 up->flags &= ~IP22ZILOG_FLAG_MODEM_STATUS;
 
-        up->cflag = termios->c_cflag;
-
         ip22zilog_maybe_update_regs(up, ZILOG_CHANNEL_FROM_PORT(port));
         uart_update_timeout(port, termios->c_cflag, baud);
 
@@ -992,74 +1025,29 @@ ip22zilog_console_write(struct console *con, const char *s, unsigned int count)
         spin_unlock_irqrestore(&up->port.lock, flags);
 }
 
-void
-ip22serial_console_termios(struct console *con, char *options)
-{
-        int baud = 9600, bits = 8, cflag;
-        int parity = 'n';
-        int flow = 'n';
-
-        if (options)
-                uart_parse_options(options, &baud, &parity, &bits, &flow);
-
-        cflag = CREAD | HUPCL | CLOCAL;
-
-        switch (baud) {
-                case 150: cflag |= B150; break;
-                case 300: cflag |= B300; break;
-                case 600: cflag |= B600; break;
-                case 1200: cflag |= B1200; break;
-                case 2400: cflag |= B2400; break;
-                case 4800: cflag |= B4800; break;
-                case 9600: cflag |= B9600; break;
-                case 19200: cflag |= B19200; break;
-                case 38400: cflag |= B38400; break;
-                default: baud = 9600; cflag |= B9600; break;
-        }
-
-        con->cflag = cflag | CS8;                       /* 8N1 */
-
-        uart_update_timeout(&ip22zilog_port_table[con->index].port, cflag, baud);
-}
-
 static int __init ip22zilog_console_setup(struct console *con, char *options)
 {
         struct uart_ip22zilog_port *up = &ip22zilog_port_table[con->index];
         unsigned long flags;
-        int baud, brg;
-
-        printk("Console: ttyS%d (IP22-Zilog)\n", con->index);
+        int baud = 9600, bits = 8;
+        int parity = 'n';
+        int flow = 'n';
 
-        /* Get firmware console settings.  */
-        ip22serial_console_termios(con, options);
+        up->flags |= IP22ZILOG_FLAG_IS_CONS;
 
-        /* Firmware console speed is limited to 150-->38400 baud so
-         * this hackish cflag thing is OK.
-         */
-        switch (con->cflag & CBAUD) {
-        case B150: baud = 150; break;
-        case B300: baud = 300; break;
-        case B600: baud = 600; break;
-        case B1200: baud = 1200; break;
-        case B2400: baud = 2400; break;
-        case B4800: baud = 4800; break;
-        default: case B9600: baud = 9600; break;
-        case B19200: baud = 19200; break;
-        case B38400: baud = 38400; break;
-        };
-
-        brg = BPS_TO_BRG(baud, ZS_CLOCK / ZS_CLOCK_DIVISOR);
+        printk(KERN_INFO "Console: ttyS%d (IP22-Zilog)\n", con->index);
 
         spin_lock_irqsave(&up->port.lock, flags);
 
-        up->curregs[R15] = BRKIE;
-        ip22zilog_convert_to_zs(up, con->cflag, 0, brg);
+        up->curregs[R15] |= BRKIE;
 
         __ip22zilog_startup(up);
 
         spin_unlock_irqrestore(&up->port.lock, flags);
 
-        return 0;
+        if (options)
+                uart_parse_options(options, &baud, &parity, &bits, &flow);
+        return uart_set_options(&up->port, con, baud, parity, bits, flow);
 }
 
 static struct uart_driver ip22zilog_reg;
@@ -1140,25 +1128,10 @@ static void __init ip22zilog_prepare(void)
                 up[(chip * 2) + 1].port.line = (chip * 2) + 1;
                 up[(chip * 2) + 1].flags |= IP22ZILOG_FLAG_IS_CHANNEL_A;
         }
-}
-
-static void __init ip22zilog_init_hw(void)
-{
-        int i;
-
-        for (i = 0; i < NUM_CHANNELS; i++) {
-                struct uart_ip22zilog_port *up = &ip22zilog_port_table[i];
-                struct zilog_channel *channel = ZILOG_CHANNEL_FROM_PORT(&up->port);
-                unsigned long flags;
-                int baud, brg;
 
-                spin_lock_irqsave(&up->port.lock, flags);
-
-                if (ZS_IS_CHANNEL_A(up)) {
-                        write_zsreg(channel, R9, FHWRES);
-                        ZSDELAY_LONG();
-                        (void) read_zsreg(channel, R0);
-                }
+        for (channel = 0; channel < NUM_CHANNELS; channel++) {
+                struct uart_ip22zilog_port *up = &ip22zilog_port_table[channel];
+                int brg;
 
                 /* Normal serial TTY. */
                 up->parity_mask = 0xff;
@@ -1169,16 +1142,10 @@ static void __init ip22zilog_init_hw(void)
                 up->curregs[R9] = NV | MIE;
                 up->curregs[R10] = NRZ;
                 up->curregs[R11] = TCBR | RCBR;
-                baud = 9600;
-                brg = BPS_TO_BRG(baud, ZS_CLOCK / ZS_CLOCK_DIVISOR);
+                brg = BPS_TO_BRG(9600, ZS_CLOCK / ZS_CLOCK_DIVISOR);
                 up->curregs[R12] = (brg & 0xff);
                 up->curregs[R13] = (brg >> 8) & 0xff;
                 up->curregs[R14] = BRENAB;
-                __load_zsregs(channel, up->curregs);
-                /* set master interrupt enable */
-                write_zsreg(channel, R9, up->curregs[R9]);
-
-                spin_unlock_irqrestore(&up->port.lock, flags);
         }
 }
 
@@ -1195,8 +1162,6 @@ static int __init ip22zilog_ports_init(void)
                 panic("IP22-Zilog: Unable to register zs interrupt handler.\n");
         }
 
-        ip22zilog_init_hw();
-
         ret = uart_register_driver(&ip22zilog_reg);
         if (ret == 0) {
                 int i;
diff --git a/drivers/serial/pxa.c b/drivers/serial/pxa.c
index af3a011b2b24..352fcb8926a6 100644
--- a/drivers/serial/pxa.c
+++ b/drivers/serial/pxa.c
@@ -585,11 +585,11 @@ serial_pxa_type(struct uart_port *port)
         return up->name;
 }
 
-#ifdef CONFIG_SERIAL_PXA_CONSOLE
-
 static struct uart_pxa_port *serial_pxa_ports[4];
 static struct uart_driver serial_pxa_reg;
 
+#ifdef CONFIG_SERIAL_PXA_CONSOLE
+
 #define BOTH_EMPTY (UART_LSR_TEMT | UART_LSR_THRE)
 
 /*
diff --git a/drivers/serial/suncore.c b/drivers/serial/suncore.c
index 70a09a3d5af0..707c5b03bce9 100644
--- a/drivers/serial/suncore.c
+++ b/drivers/serial/suncore.c
@@ -23,11 +23,36 @@
 
 #include "suncore.h"
 
-int sunserial_current_minor = 64;
+static int sunserial_current_minor = 64;
 
-EXPORT_SYMBOL(sunserial_current_minor);
+int sunserial_register_minors(struct uart_driver *drv, int count)
+{
+        int err = 0;
+
+        drv->minor = sunserial_current_minor;
+        drv->nr += count;
+        /* Register the driver on the first call */
+        if (drv->nr == count)
+                err = uart_register_driver(drv);
+        if (err == 0) {
+                sunserial_current_minor += count;
+                drv->tty_driver->name_base = drv->minor - 64;
+        }
+        return err;
+}
+EXPORT_SYMBOL(sunserial_register_minors);
+
+void sunserial_unregister_minors(struct uart_driver *drv, int count)
+{
+        drv->nr -= count;
+        sunserial_current_minor -= count;
+
+        if (drv->nr == 0)
+                uart_unregister_driver(drv);
+}
+EXPORT_SYMBOL(sunserial_unregister_minors);
 
-int sunserial_console_match(struct console *con, struct device_node *dp,
+int __init sunserial_console_match(struct console *con, struct device_node *dp,
                             struct uart_driver *drv, int line)
 {
         int off;
@@ -133,8 +158,6 @@ sunserial_console_termios(struct console *con)
         con->cflag = cflag;
 }
 
-EXPORT_SYMBOL(sunserial_console_termios);
-
 /* Sun serial MOUSE auto baud rate detection.  */
 static struct mouse_baud_cflag {
         int baud;
diff --git a/drivers/serial/suncore.h b/drivers/serial/suncore.h
index 829d7d65d6db..042668aa602e 100644
--- a/drivers/serial/suncore.h
+++ b/drivers/serial/suncore.h
@@ -22,7 +22,8 @@
 extern unsigned int suncore_mouse_baud_cflag_next(unsigned int, int *);
 extern int suncore_mouse_baud_detection(unsigned char, int);
 
-extern int sunserial_current_minor;
+extern int sunserial_register_minors(struct uart_driver *, int);
+extern void sunserial_unregister_minors(struct uart_driver *, int);
 
 extern int sunserial_console_match(struct console *, struct device_node *,
                                    struct uart_driver *, int);
diff --git a/drivers/serial/sunhv.c b/drivers/serial/sunhv.c
index 8ff900b09811..be0fe152891b 100644
--- a/drivers/serial/sunhv.c
+++ b/drivers/serial/sunhv.c
@@ -562,16 +562,10 @@ static int __devinit hv_probe(struct of_device *op, const struct of_device_id *m
 
         port->dev = &op->dev;
 
-        sunhv_reg.minor = sunserial_current_minor;
-        sunhv_reg.nr = 1;
-
-        err = uart_register_driver(&sunhv_reg);
+        err = sunserial_register_minors(&sunhv_reg, 1);
         if (err)
                 goto out_free_con_read_page;
 
-        sunhv_reg.tty_driver->name_base = sunhv_reg.minor - 64;
-        sunserial_current_minor += 1;
-
         sunserial_console_match(&sunhv_console, op->node,
                                 &sunhv_reg, port->line);
 
@@ -591,8 +585,7 @@ out_remove_port:
         uart_remove_one_port(&sunhv_reg, port);
 
 out_unregister_driver:
-        sunserial_current_minor -= 1;
-        uart_unregister_driver(&sunhv_reg);
+        sunserial_unregister_minors(&sunhv_reg, 1);
 
 out_free_con_read_page:
         kfree(con_read_page);
@@ -614,8 +607,7 @@ static int __devexit hv_remove(struct of_device *dev)
 
         uart_remove_one_port(&sunhv_reg, port);
 
-        sunserial_current_minor -= 1;
-        uart_unregister_driver(&sunhv_reg);
+        sunserial_unregister_minors(&sunhv_reg, 1);
 
         kfree(port);
         sunhv_port = NULL;
diff --git a/drivers/serial/sunsab.c b/drivers/serial/sunsab.c
index ff610c23314b..543f93741e6f 100644
--- a/drivers/serial/sunsab.c
+++ b/drivers/serial/sunsab.c
@@ -832,7 +832,6 @@ static struct uart_driver sunsab_reg = {
 };
 
 static struct uart_sunsab_port *sunsab_ports;
-static int num_channels;
 
 #ifdef CONFIG_SERIAL_SUNSAB_CONSOLE
 
@@ -1102,8 +1101,8 @@ static int __init sunsab_init(void)
 {
         struct device_node *dp;
         int err;
+        int num_channels = 0;
 
-        num_channels = 0;
         for_each_node_by_name(dp, "se")
                 num_channels += 2;
         for_each_node_by_name(dp, "serial") {
@@ -1117,20 +1116,14 @@ static int __init sunsab_init(void)
                 if (!sunsab_ports)
                         return -ENOMEM;
 
-                sunsab_reg.minor = sunserial_current_minor;
-                sunsab_reg.nr = num_channels;
                 sunsab_reg.cons = SUNSAB_CONSOLE();
-
-                err = uart_register_driver(&sunsab_reg);
+                err = sunserial_register_minors(&sunsab_reg, num_channels);
                 if (err) {
                         kfree(sunsab_ports);
                         sunsab_ports = NULL;
 
                         return err;
                 }
-
-                sunsab_reg.tty_driver->name_base = sunsab_reg.minor - 64;
-                sunserial_current_minor += num_channels;
         }
 
         return of_register_driver(&sab_driver, &of_bus_type);
@@ -1139,9 +1132,8 @@ static int __init sunsab_init(void)
 static void __exit sunsab_exit(void)
 {
         of_unregister_driver(&sab_driver);
-        if (num_channels) {
-                sunserial_current_minor -= num_channels;
-                uart_unregister_driver(&sunsab_reg);
+        if (sunsab_reg.nr) {
+                sunserial_unregister_minors(&sunsab_reg, sunsab_reg.nr);
         }
 
         kfree(sunsab_ports);
diff --git a/drivers/serial/sunsu.c b/drivers/serial/sunsu.c
index e074943feff5..4e2302d43ab1 100644
--- a/drivers/serial/sunsu.c
+++ b/drivers/serial/sunsu.c
@@ -1528,14 +1528,12 @@ static struct of_platform_driver su_driver = {
         .remove         = __devexit_p(su_remove),
 };
 
-static int num_uart;
-
 static int __init sunsu_init(void)
 {
         struct device_node *dp;
         int err;
+        int num_uart = 0;
 
-        num_uart = 0;
         for_each_node_by_name(dp, "su") {
                 if (su_get_type(dp) == SU_PORT_PORT)
                         num_uart++;
@@ -1552,26 +1550,22 @@ static int __init sunsu_init(void)
         }
 
         if (num_uart) {
-                sunsu_reg.minor = sunserial_current_minor;
-                sunsu_reg.nr = num_uart;
-                err = uart_register_driver(&sunsu_reg);
+                err = sunserial_register_minors(&sunsu_reg, num_uart);
                 if (err)
                         return err;
-                sunsu_reg.tty_driver->name_base = sunsu_reg.minor - 64;
-                sunserial_current_minor += num_uart;
         }
 
         err = of_register_driver(&su_driver, &of_bus_type);
         if (err && num_uart)
-                uart_unregister_driver(&sunsu_reg);
+                sunserial_unregister_minors(&sunsu_reg, num_uart);
 
         return err;
 }
 
 static void __exit sunsu_exit(void)
 {
-        if (num_uart)
-                uart_unregister_driver(&sunsu_reg);
+        if (sunsu_reg.nr)
+                sunserial_unregister_minors(&sunsu_reg, sunsu_reg.nr);
 }
 
 module_init(sunsu_init);
diff --git a/drivers/serial/sunzilog.c b/drivers/serial/sunzilog.c
index 283bef0d24cb..cb2e40506379 100644
--- a/drivers/serial/sunzilog.c
+++ b/drivers/serial/sunzilog.c
@@ -63,10 +63,6 @@
         readb(&((__channel)->control))
 #endif
 
-static int num_sunzilog;
-#define NUM_SUNZILOG    num_sunzilog
-#define NUM_CHANNELS    (NUM_SUNZILOG * 2)
-
 #define ZS_CLOCK                4915200 /* Zilog input clock rate. */
 #define ZS_CLOCK_DIVISOR        16      /* Divisor this driver uses. */
 
@@ -1031,18 +1027,19 @@ static struct uart_driver sunzilog_reg = {
         .major          =       TTY_MAJOR,
 };
 
-static int __init sunzilog_alloc_tables(void)
+static int __init sunzilog_alloc_tables(int num_sunzilog)
 {
         struct uart_sunzilog_port *up;
         unsigned long size;
+        int num_channels = num_sunzilog * 2;
         int i;
 
-        size = NUM_CHANNELS * sizeof(struct uart_sunzilog_port);
+        size = num_channels * sizeof(struct uart_sunzilog_port);
         sunzilog_port_table = kzalloc(size, GFP_KERNEL);
         if (!sunzilog_port_table)
                 return -ENOMEM;
 
-        for (i = 0; i < NUM_CHANNELS; i++) {
+        for (i = 0; i < num_channels; i++) {
                 up = &sunzilog_port_table[i];
 
                 spin_lock_init(&up->port.lock);
@@ -1050,13 +1047,13 @@ static int __init sunzilog_alloc_tables(void)
                 if (i == 0)
                         sunzilog_irq_chain = up;
 
-                if (i < NUM_CHANNELS - 1)
+                if (i < num_channels - 1)
                         up->next = up + 1;
                 else
                         up->next = NULL;
         }
 
-        size = NUM_SUNZILOG * sizeof(struct zilog_layout __iomem *);
+        size = num_sunzilog * sizeof(struct zilog_layout __iomem *);
         sunzilog_chip_regs = kzalloc(size, GFP_KERNEL);
         if (!sunzilog_chip_regs) {
                 kfree(sunzilog_port_table);
@@ -1496,34 +1493,28 @@ static int __init sunzilog_init(void)
         struct device_node *dp;
         int err, uart_count;
         int num_keybms;
+        int num_sunzilog = 0;
 
-        NUM_SUNZILOG = 0;
         num_keybms = 0;
         for_each_node_by_name(dp, "zs") {
-                NUM_SUNZILOG++;
+                num_sunzilog++;
                 if (of_find_property(dp, "keyboard", NULL))
                         num_keybms++;
         }
 
         uart_count = 0;
-        if (NUM_SUNZILOG) {
+        if (num_sunzilog) {
                 int uart_count;
 
-                err = sunzilog_alloc_tables();
+                err = sunzilog_alloc_tables(num_sunzilog);
                 if (err)
                         goto out;
 
-                uart_count = (NUM_SUNZILOG * 2) - (2 * num_keybms);
+                uart_count = (num_sunzilog * 2) - (2 * num_keybms);
 
-                sunzilog_reg.nr = uart_count;
-                sunzilog_reg.minor = sunserial_current_minor;
-                err = uart_register_driver(&sunzilog_reg);
+                err = sunserial_register_minors(&sunzilog_reg, uart_count);
                 if (err)
                         goto out_free_tables;
-
-                sunzilog_reg.tty_driver->name_base = sunzilog_reg.minor - 64;
-
-                sunserial_current_minor += uart_count;
         }
 
         err = of_register_driver(&zs_driver, &of_bus_type);
@@ -1557,8 +1548,8 @@ out_unregister_driver:
         of_unregister_driver(&zs_driver);
 
 out_unregister_uart:
-        if (NUM_SUNZILOG) {
-                uart_unregister_driver(&sunzilog_reg);
+        if (num_sunzilog) {
+                sunserial_unregister_minors(&sunzilog_reg, num_sunzilog);
                 sunzilog_reg.cons = NULL;
         }
 
@@ -1590,8 +1581,8 @@ static void __exit sunzilog_exit(void)
                 zilog_irq = -1;
         }
 
-        if (NUM_SUNZILOG) {
-                uart_unregister_driver(&sunzilog_reg);
+        if (sunzilog_reg.nr) {
+                sunserial_unregister_minors(&sunzilog_reg, sunzilog_reg.nr);
                 sunzilog_free_tables();
         }
 }
diff --git a/drivers/serial/uartlite.c b/drivers/serial/uartlite.c
index a85f2d31a686..3f593247c41e 100644
--- a/drivers/serial/uartlite.c
+++ b/drivers/serial/uartlite.c
@@ -393,6 +393,7 @@ static inline void __init ulite_console_of_find_device(int id)
                         continue;
 
                 ulite_ports[id].mapbase = res.start;
+                of_node_put(np);
                 return;
         }
 }
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index a77ede598d34..abf05048c638 100644
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -61,7 +61,7 @@ config SPI_ATMEL
 
 config SPI_BFIN
         tristate "SPI controller driver for ADI Blackfin5xx"
-        depends on SPI_MASTER && BFIN
+        depends on SPI_MASTER && BLACKFIN
         help
           This is the SPI controller master driver for Blackfin 5xx processor.
 
diff --git a/drivers/spi/at25.c b/drivers/spi/at25.c
index e007833cca59..290dbe99647a 100644
--- a/drivers/spi/at25.c
+++ b/drivers/spi/at25.c
@@ -21,6 +21,13 @@
 #include <linux/spi/eeprom.h>
 
 
+/*
+ * NOTE: this is an *EEPROM* driver.  The vagaries of product naming
+ * mean that some AT25 products are EEPROMs, and others are FLASH.
+ * Handle FLASH chips with the drivers/mtd/devices/m25p80.c driver,
+ * not this one!
+ */
+
 struct at25_data {
         struct spi_device       *spi;
         struct mutex            lock;
diff --git a/drivers/spi/atmel_spi.c b/drivers/spi/atmel_spi.c
index 0d342dcdd302..ff10808183a3 100644
--- a/drivers/spi/atmel_spi.c
+++ b/drivers/spi/atmel_spi.c
@@ -195,8 +195,8 @@ static void atmel_spi_next_xfer(struct spi_master *master,
                 xfer, xfer->len, xfer->tx_buf, xfer->tx_dma,
                 xfer->rx_buf, xfer->rx_dma, spi_readl(as, IMR));
 
-        spi_writel(as, TCR, len);
         spi_writel(as, RCR, len);
+        spi_writel(as, TCR, len);
         spi_writel(as, PTCR, SPI_BIT(TXTEN) | SPI_BIT(RXTEN));
 }
 
@@ -497,7 +497,7 @@ static int atmel_spi_setup(struct spi_device *spi)
         /* chipselect must have been muxed as GPIO (e.g. in board setup) */
         npcs_pin = (unsigned int)spi->controller_data;
         if (!spi->controller_state) {
-                ret = gpio_request(npcs_pin, "spi_npcs");
+                ret = gpio_request(npcs_pin, spi->dev.bus_id);
                 if (ret)
                         return ret;
                 spi->controller_state = (void *)npcs_pin;
diff --git a/drivers/spi/pxa2xx_spi.c b/drivers/spi/pxa2xx_spi.c
index 5f3d808cbc29..1c2ab541d37d 100644
--- a/drivers/spi/pxa2xx_spi.c
+++ b/drivers/spi/pxa2xx_spi.c
@@ -39,7 +39,7 @@
 #include <asm/arch/pxa2xx_spi.h>
 
 MODULE_AUTHOR("Stephen Street");
-MODULE_DESCRIPTION("PXA2xx SSP SPI Contoller");
+MODULE_DESCRIPTION("PXA2xx SSP SPI Controller");
 MODULE_LICENSE("GPL");
 
 #define MAX_BUSES 3
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index b31f4431849b..93e9de46977a 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -541,10 +541,7 @@ static void spi_complete(void *arg)
  * Also, the caller is guaranteeing that the memory associated with the
  * message will not be freed before this call returns.
  *
- * The return value is a negative error code if the message could not be
- * submitted, else zero.  When the value is zero, then message->status is
- * also defined;  it's the completion code for the transfer, either zero
- * or a negative error code from the controller driver.
+ * It returns zero on success, else a negative error code.
  */
 int spi_sync(struct spi_device *spi, struct spi_message *message)
 {
@@ -554,8 +551,10 @@ int spi_sync(struct spi_device *spi, struct spi_message *message)
         message->complete = spi_complete;
         message->context = &done;
         status = spi_async(spi, message);
-        if (status == 0)
+        if (status == 0) {
                 wait_for_completion(&done);
+                status = message->status;
+        }
         message->context = NULL;
         return status;
 }
@@ -589,7 +588,7 @@ int spi_write_then_read(struct spi_device *spi,
                 const u8 *txbuf, unsigned n_tx,
                 u8 *rxbuf, unsigned n_rx)
 {
-        static DECLARE_MUTEX(lock);
+        static DEFINE_MUTEX(lock);
 
         int                     status;
         struct spi_message      message;
@@ -615,7 +614,7 @@ int spi_write_then_read(struct spi_device *spi,
         }
 
         /* ... unless someone else is using the pre-allocated buffer */
-        if (down_trylock(&lock)) {
+        if (!mutex_trylock(&lock)) {
                 local_buf = kmalloc(SPI_BUFSIZ, GFP_KERNEL);
                 if (!local_buf)
                         return -ENOMEM;
@@ -628,13 +627,11 @@ int spi_write_then_read(struct spi_device *spi,
 
         /* do the i/o */
         status = spi_sync(spi, &message);
-        if (status == 0) {
+        if (status == 0)
                 memcpy(rxbuf, x[1].rx_buf, n_rx);
-                status = message.status;
-        }
 
         if (x[0].tx_buf == buf)
-                up(&lock);
+                mutex_unlock(&lock);
         else
                 kfree(local_buf);
 
diff --git a/drivers/spi/spi_bfin5xx.c b/drivers/spi/spi_bfin5xx.c
index 2ef11bb70b2e..7ef39a6e8c06 100644
--- a/drivers/spi/spi_bfin5xx.c
+++ b/drivers/spi/spi_bfin5xx.c
@@ -1,17 +1,22 @@
 /*
- * File:         drivers/spi/bfin5xx_spi.c
- * Based on:     N/A
- * Author:       Luke Yang (Analog Devices Inc.)
+ * File:        drivers/spi/bfin5xx_spi.c
+ * Maintainer:
+ *              Bryan Wu <bryan.wu@analog.com>
+ * Original Author:
+ *              Luke Yang (Analog Devices Inc.)
  *
- * Created:      March. 10th 2006
- * Description:  SPI controller driver for Blackfin 5xx
- * Bugs:         Enter bugs at http://blackfin.uclinux.org/
+ * Created:     March. 10th 2006
+ * Description: SPI controller driver for Blackfin BF5xx
+ * Bugs:        Enter bugs at http://blackfin.uclinux.org/
  *
  * Modified:
  *      March 10, 2006  bfin5xx_spi.c Created. (Luke Yang)
  *      August 7, 2006  added full duplex mode (Axel Weiss & Luke Yang)
+ *      July  17, 2007  add support for BF54x SPI0 controller (Bryan Wu)
+ *      July  30, 2007  add platfrom_resource interface to support multi-port
+ *                      SPI controller (Bryan Wu)
  *
- * Copyright 2004-2006 Analog Devices Inc.
+ * Copyright 2004-2007 Analog Devices 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
@@ -31,50 +36,39 @@
 
 #include <linux/init.h>
 #include <linux/module.h>
+#include <linux/delay.h>
 #include <linux/device.h>
+#include <linux/io.h>
 #include <linux/ioport.h>
+#include <linux/irq.h>
 #include <linux/errno.h>
 #include <linux/interrupt.h>
 #include <linux/platform_device.h>
 #include <linux/dma-mapping.h>
 #include <linux/spi/spi.h>
 #include <linux/workqueue.h>
-#include <linux/delay.h>
 
-#include <asm/io.h>
-#include <asm/irq.h>
-#include <asm/delay.h>
 #include <asm/dma.h>
-
+#include <asm/portmux.h>
 #include <asm/bfin5xx_spi.h>
 
-MODULE_AUTHOR("Luke Yang");
-MODULE_DESCRIPTION("Blackfin 5xx SPI Contoller");
-MODULE_LICENSE("GPL");
+#define DRV_NAME        "bfin-spi"
+#define DRV_AUTHOR      "Bryan Wu, Luke Yang"
+#define DRV_DESC        "Blackfin BF5xx on-chip SPI Controller Driver"
+#define DRV_VERSION     "1.0"
 
-#define IS_DMA_ALIGNED(x) (((u32)(x)&0x07)==0)
+MODULE_AUTHOR(DRV_AUTHOR);
+MODULE_DESCRIPTION(DRV_DESC);
+MODULE_LICENSE("GPL");
 
-#define DEFINE_SPI_REG(reg, off) \
-static inline u16 read_##reg(void) \
-            { return *(volatile unsigned short*)(SPI0_REGBASE + off); } \
-static inline void write_##reg(u16 v) \
-            {*(volatile unsigned short*)(SPI0_REGBASE + off) = v;\
-             SSYNC();}
+#define IS_DMA_ALIGNED(x) (((u32)(x)&0x07) == 0)
 
-DEFINE_SPI_REG(CTRL, 0x00)
-DEFINE_SPI_REG(FLAG, 0x04)
-DEFINE_SPI_REG(STAT, 0x08)
-DEFINE_SPI_REG(TDBR, 0x0C)
-DEFINE_SPI_REG(RDBR, 0x10)
-DEFINE_SPI_REG(BAUD, 0x14)
-DEFINE_SPI_REG(SHAW, 0x18)
-#define START_STATE ((void*)0)
-#define RUNNING_STATE ((void*)1)
-#define DONE_STATE ((void*)2)
-#define ERROR_STATE ((void*)-1)
-#define QUEUE_RUNNING 0
-#define QUEUE_STOPPED 1
-int dma_requested;
+#define START_STATE     ((void *)0)
+#define RUNNING_STATE   ((void *)1)
+#define DONE_STATE      ((void *)2)
+#define ERROR_STATE     ((void *)-1)
+#define QUEUE_RUNNING   0
+#define QUEUE_STOPPED   1
 
 struct driver_data {
         /* Driver model hookup */
@@ -83,6 +77,12 @@ struct driver_data {
         /* SPI framework hookup */
         struct spi_master *master;
 
+        /* Regs base of SPI controller */
+        void __iomem *regs_base;
+
+        /* Pin request list */
+        u16 *pin_req;
+
         /* BFIN hookup */
         struct bfin5xx_spi_master *master_info;
 
@@ -107,12 +107,18 @@ struct driver_data {
         void *tx_end;
         void *rx;
         void *rx_end;
+
+        /* DMA stuffs */
+        int dma_channel;
         int dma_mapped;
+        int dma_requested;
         dma_addr_t rx_dma;
         dma_addr_t tx_dma;
+
         size_t rx_map_len;
         size_t tx_map_len;
         u8 n_bytes;
+        int cs_change;
         void (*write) (struct driver_data *);
         void (*read) (struct driver_data *);
         void (*duplex) (struct driver_data *);
@@ -129,28 +135,40 @@ struct chip_data {
         u8 enable_dma;
         u8 bits_per_word;       /* 8 or 16 */
         u8 cs_change_per_word;
-        u8 cs_chg_udelay;
+        u16 cs_chg_udelay;      /* Some devices require > 255usec delay */
         void (*write) (struct driver_data *);
         void (*read) (struct driver_data *);
         void (*duplex) (struct driver_data *);
 };
 
+#define DEFINE_SPI_REG(reg, off) \
+static inline u16 read_##reg(struct driver_data *drv_data) \
+        { return bfin_read16(drv_data->regs_base + off); } \
+static inline void write_##reg(struct driver_data *drv_data, u16 v) \
+        { bfin_write16(drv_data->regs_base + off, v); }
+
+DEFINE_SPI_REG(CTRL, 0x00)
+DEFINE_SPI_REG(FLAG, 0x04)
+DEFINE_SPI_REG(STAT, 0x08)
+DEFINE_SPI_REG(TDBR, 0x0C)
+DEFINE_SPI_REG(RDBR, 0x10)
+DEFINE_SPI_REG(BAUD, 0x14)
+DEFINE_SPI_REG(SHAW, 0x18)
+
 static void bfin_spi_enable(struct driver_data *drv_data)
 {
         u16 cr;
 
-        cr = read_CTRL();
-        write_CTRL(cr | BIT_CTL_ENABLE);
-        SSYNC();
+        cr = read_CTRL(drv_data);
+        write_CTRL(drv_data, (cr | BIT_CTL_ENABLE));
 }
 
 static void bfin_spi_disable(struct driver_data *drv_data)
 {
         u16 cr;
 
-        cr = read_CTRL();
-        write_CTRL(cr & (~BIT_CTL_ENABLE));
-        SSYNC();
+        cr = read_CTRL(drv_data);
+        write_CTRL(drv_data, (cr & (~BIT_CTL_ENABLE)));
 }
 
 /* Caculate the SPI_BAUD register value based on input HZ */
@@ -170,83 +188,71 @@ static int flush(struct driver_data *drv_data)
         unsigned long limit = loops_per_jiffy << 1;
 
         /* wait for stop and clear stat */
-        while (!(read_STAT() & BIT_STAT_SPIF) && limit--)
-                continue;
+        while (!(read_STAT(drv_data) & BIT_STAT_SPIF) && limit--)
+                cpu_relax();
 
-        write_STAT(BIT_STAT_CLR);
+        write_STAT(drv_data, BIT_STAT_CLR);
 
         return limit;
 }
 
+/* Chip select operation functions for cs_change flag */
+static void cs_active(struct driver_data *drv_data, struct chip_data *chip)
+{
+        u16 flag = read_FLAG(drv_data);
+
+        flag |= chip->flag;
+        flag &= ~(chip->flag << 8);
+
+        write_FLAG(drv_data, flag);
+}
+
+static void cs_deactive(struct driver_data *drv_data, struct chip_data *chip)
+{
+        u16 flag = read_FLAG(drv_data);
+
+        flag |= (chip->flag << 8);
+
+        write_FLAG(drv_data, flag);
+
+        /* Move delay here for consistency */
+        if (chip->cs_chg_udelay)
+                udelay(chip->cs_chg_udelay);
+}
+
+#define MAX_SPI_SSEL    7
+
 /* stop controller and re-config current chip*/
-static void restore_state(struct driver_data *drv_data)
+static int restore_state(struct driver_data *drv_data)
 {
         struct chip_data *chip = drv_data->cur_chip;
+        int ret = 0;
 
         /* Clear status and disable clock */
-        write_STAT(BIT_STAT_CLR);
+        write_STAT(drv_data, BIT_STAT_CLR);
         bfin_spi_disable(drv_data);
         dev_dbg(&drv_data->pdev->dev, "restoring spi ctl state\n");
 
-#if defined(CONFIG_BF534) || defined(CONFIG_BF536) || defined(CONFIG_BF537)
-        dev_dbg(&drv_data->pdev->dev, 
-                "chip select number is %d\n", chip->chip_select_num);
-        
-        switch (chip->chip_select_num) {
-        case 1:
-                bfin_write_PORTF_FER(bfin_read_PORTF_FER() | 0x3c00);
-                SSYNC();
-                break;
-
-        case 2:
-        case 3:
-                bfin_write_PORT_MUX(bfin_read_PORT_MUX() | PJSE_SPI);
-                SSYNC();
-                bfin_write_PORTF_FER(bfin_read_PORTF_FER() | 0x3800);
-                SSYNC();
-                break;
-
-        case 4:
-                bfin_write_PORT_MUX(bfin_read_PORT_MUX() | PFS4E_SPI);
-                SSYNC();
-                bfin_write_PORTF_FER(bfin_read_PORTF_FER() | 0x3840);
-                SSYNC();
-                break;
+        /* Load the registers */
+        write_CTRL(drv_data, chip->ctl_reg);
+        write_BAUD(drv_data, chip->baud);
 
-        case 5:
-                bfin_write_PORT_MUX(bfin_read_PORT_MUX() | PFS5E_SPI);
-                SSYNC();
-                bfin_write_PORTF_FER(bfin_read_PORTF_FER() | 0x3820);
-                SSYNC();
-                break;
+        bfin_spi_enable(drv_data);
+        cs_active(drv_data, chip);
 
-        case 6:
-                bfin_write_PORT_MUX(bfin_read_PORT_MUX() | PFS6E_SPI);
-                SSYNC();
-                bfin_write_PORTF_FER(bfin_read_PORTF_FER() | 0x3810);
-                SSYNC();
-                break;
+        if (ret)
+                dev_dbg(&drv_data->pdev->dev,
+                        ": request chip select number %d failed\n",
+                        chip->chip_select_num);
 
-        case 7:
-                bfin_write_PORT_MUX(bfin_read_PORT_MUX() | PJCE_SPI);
-                SSYNC();
-                bfin_write_PORTF_FER(bfin_read_PORTF_FER() | 0x3800);
-                SSYNC();
-                break;
-        }
-#endif
-
-        /* Load the registers */
-        write_CTRL(chip->ctl_reg);
-        write_BAUD(chip->baud);
-        write_FLAG(chip->flag);
+        return ret;
 }
 
 /* used to kick off transfer in rx mode */
-static unsigned short dummy_read(void)
+static unsigned short dummy_read(struct driver_data *drv_data)
 {
         unsigned short tmp;
-        tmp = read_RDBR();
+        tmp = read_RDBR(drv_data);
         return tmp;
 }
 
@@ -255,9 +261,9 @@ static void null_writer(struct driver_data *drv_data)
         u8 n_bytes = drv_data->n_bytes;
 
         while (drv_data->tx < drv_data->tx_end) {
-                write_TDBR(0);
-                while ((read_STAT() & BIT_STAT_TXS))
-                        continue;
+                write_TDBR(drv_data, 0);
+                while ((read_STAT(drv_data) & BIT_STAT_TXS))
+                        cpu_relax();
                 drv_data->tx += n_bytes;
         }
 }
@@ -265,75 +271,78 @@ static void null_writer(struct driver_data *drv_data)
 static void null_reader(struct driver_data *drv_data)
 {
         u8 n_bytes = drv_data->n_bytes;
-        dummy_read();
+        dummy_read(drv_data);
 
         while (drv_data->rx < drv_data->rx_end) {
-                while (!(read_STAT() & BIT_STAT_RXS))
-                        continue;
-                dummy_read();
+                while (!(read_STAT(drv_data) & BIT_STAT_RXS))
+                        cpu_relax();
+                dummy_read(drv_data);
                 drv_data->rx += n_bytes;
         }
 }
 
 static void u8_writer(struct driver_data *drv_data)
 {
-        dev_dbg(&drv_data->pdev->dev, 
-                "cr8-s is 0x%x\n", read_STAT());
+        dev_dbg(&drv_data->pdev->dev,
+                "cr8-s is 0x%x\n", read_STAT(drv_data));
+
+        /* poll for SPI completion before start */
+        while (!(read_STAT(drv_data) & BIT_STAT_SPIF))
+                cpu_relax();
+
         while (drv_data->tx < drv_data->tx_end) {
-                write_TDBR(*(u8 *) (drv_data->tx));
-                while (read_STAT() & BIT_STAT_TXS)
-                        continue;
+                write_TDBR(drv_data, (*(u8 *) (drv_data->tx)));
+                while (read_STAT(drv_data) & BIT_STAT_TXS)
+                        cpu_relax();
                 ++drv_data->tx;
         }
-
-        /* poll for SPI completion before returning */
-        while (!(read_STAT() & BIT_STAT_SPIF))
-                continue;
 }
 
 static void u8_cs_chg_writer(struct driver_data *drv_data)
 {
         struct chip_data *chip = drv_data->cur_chip;
 
+        /* poll for SPI completion before start */
+        while (!(read_STAT(drv_data) & BIT_STAT_SPIF))
+                cpu_relax();
+
         while (drv_data->tx < drv_data->tx_end) {
-                write_FLAG(chip->flag);
-                SSYNC();
-
-                write_TDBR(*(u8 *) (drv_data->tx));
-                while (read_STAT() & BIT_STAT_TXS)
-                        continue;
-                while (!(read_STAT() & BIT_STAT_SPIF))
-                        continue;
-                write_FLAG(0xFF00 | chip->flag);
-                SSYNC();
-                if (chip->cs_chg_udelay)
-                        udelay(chip->cs_chg_udelay);
+                cs_active(drv_data, chip);
+
+                write_TDBR(drv_data, (*(u8 *) (drv_data->tx)));
+                while (read_STAT(drv_data) & BIT_STAT_TXS)
+                        cpu_relax();
+
+                cs_deactive(drv_data, chip);
+
                 ++drv_data->tx;
         }
-        write_FLAG(0xFF00);
-        SSYNC();
 }
 
 static void u8_reader(struct driver_data *drv_data)
 {
-        dev_dbg(&drv_data->pdev->dev, 
-                "cr-8 is 0x%x\n", read_STAT());
+        dev_dbg(&drv_data->pdev->dev,
+                "cr-8 is 0x%x\n", read_STAT(drv_data));
+
+        /* poll for SPI completion before start */
+        while (!(read_STAT(drv_data) & BIT_STAT_SPIF))
+                cpu_relax();
 
         /* clear TDBR buffer before read(else it will be shifted out) */
-        write_TDBR(0xFFFF);
+        write_TDBR(drv_data, 0xFFFF);
 
-        dummy_read();
+        dummy_read(drv_data);
 
         while (drv_data->rx < drv_data->rx_end - 1) {
-                while (!(read_STAT() & BIT_STAT_RXS))
-                        continue;
-                *(u8 *) (drv_data->rx) = read_RDBR();
+                while (!(read_STAT(drv_data) & BIT_STAT_RXS))
+                        cpu_relax();
+                *(u8 *) (drv_data->rx) = read_RDBR(drv_data);
                 ++drv_data->rx;
         }
 
-        while (!(read_STAT() & BIT_STAT_RXS))
-                continue;
-        *(u8 *) (drv_data->rx) = read_SHAW();
+        while (!(read_STAT(drv_data) & BIT_STAT_RXS))
+                cpu_relax();
+        *(u8 *) (drv_data->rx) = read_SHAW(drv_data);
         ++drv_data->rx;
 }
 
@@ -341,36 +350,47 @@ static void u8_cs_chg_reader(struct driver_data *drv_data)
 {
         struct chip_data *chip = drv_data->cur_chip;
 
-        while (drv_data->rx < drv_data->rx_end) {
-                write_FLAG(chip->flag);
-                SSYNC();
-
-                read_RDBR();    /* kick off */
-                while (!(read_STAT() & BIT_STAT_RXS))
-                        continue;
-                while (!(read_STAT() & BIT_STAT_SPIF))
-                        continue;
-                *(u8 *) (drv_data->rx) = read_SHAW();
-                write_FLAG(0xFF00 | chip->flag);
-                SSYNC();
-                if (chip->cs_chg_udelay)
-                        udelay(chip->cs_chg_udelay);
+        /* poll for SPI completion before start */
+        while (!(read_STAT(drv_data) & BIT_STAT_SPIF))
+                cpu_relax();
+
+        /* clear TDBR buffer before read(else it will be shifted out) */
+        write_TDBR(drv_data, 0xFFFF);
+
+        cs_active(drv_data, chip);
+        dummy_read(drv_data);
+
+        while (drv_data->rx < drv_data->rx_end - 1) {
+                cs_deactive(drv_data, chip);
+
+                while (!(read_STAT(drv_data) & BIT_STAT_RXS))
+                        cpu_relax();
+                cs_active(drv_data, chip);
+                *(u8 *) (drv_data->rx) = read_RDBR(drv_data);
                 ++drv_data->rx;
         }
-        write_FLAG(0xFF00);
-        SSYNC();
+        cs_deactive(drv_data, chip);
+
+        while (!(read_STAT(drv_data) & BIT_STAT_RXS))
+                cpu_relax();
+        *(u8 *) (drv_data->rx) = read_SHAW(drv_data);
+        ++drv_data->rx;
 }
 
 static void u8_duplex(struct driver_data *drv_data)
 {
+        /* poll for SPI completion before start */
+        while (!(read_STAT(drv_data) & BIT_STAT_SPIF))
+                cpu_relax();
+
         /* in duplex mode, clk is triggered by writing of TDBR */
         while (drv_data->rx < drv_data->rx_end) {
-                write_TDBR(*(u8 *) (drv_data->tx));
-                while (!(read_STAT() & BIT_STAT_SPIF))
-                        continue;
-                while (!(read_STAT() & BIT_STAT_RXS))
-                        continue;
-                *(u8 *) (drv_data->rx) = read_RDBR();
+                write_TDBR(drv_data, (*(u8 *) (drv_data->tx)));
+                while (read_STAT(drv_data) & BIT_STAT_TXS)
+                        cpu_relax();
+                while (!(read_STAT(drv_data) & BIT_STAT_RXS))
+                        cpu_relax();
+                *(u8 *) (drv_data->rx) = read_RDBR(drv_data);
                 ++drv_data->rx;
                 ++drv_data->tx;
         }
@@ -380,83 +400,89 @@ static void u8_cs_chg_duplex(struct driver_data *drv_data)
 {
         struct chip_data *chip = drv_data->cur_chip;
 
+        /* poll for SPI completion before start */
+        while (!(read_STAT(drv_data) & BIT_STAT_SPIF))
+                cpu_relax();
+
         while (drv_data->rx < drv_data->rx_end) {
-                write_FLAG(chip->flag);
-                SSYNC();
-
-                write_TDBR(*(u8 *) (drv_data->tx));
-                while (!(read_STAT() & BIT_STAT_SPIF))
-                        continue;
-                while (!(read_STAT() & BIT_STAT_RXS))
-                        continue;
-                *(u8 *) (drv_data->rx) = read_RDBR();
-                write_FLAG(0xFF00 | chip->flag);
-                SSYNC();
-                if (chip->cs_chg_udelay)
-                        udelay(chip->cs_chg_udelay);
+                cs_active(drv_data, chip);
+
+                write_TDBR(drv_data, (*(u8 *) (drv_data->tx)));
+                while (read_STAT(drv_data) & BIT_STAT_TXS)
+                        cpu_relax();
+                while (!(read_STAT(drv_data) & BIT_STAT_RXS))
+                        cpu_relax();
+                *(u8 *) (drv_data->rx) = read_RDBR(drv_data);
+
+                cs_deactive(drv_data, chip);
+
                 ++drv_data->rx;
                 ++drv_data->tx;
         }
-        write_FLAG(0xFF00);
-        SSYNC();
 }
 
 static void u16_writer(struct driver_data *drv_data)
 {
-        dev_dbg(&drv_data->pdev->dev, 
-                "cr16 is 0x%x\n", read_STAT());
+        dev_dbg(&drv_data->pdev->dev,
+                "cr16 is 0x%x\n", read_STAT(drv_data));
+
+        /* poll for SPI completion before start */
+        while (!(read_STAT(drv_data) & BIT_STAT_SPIF))
+                cpu_relax();
 
         while (drv_data->tx < drv_data->tx_end) {
-                write_TDBR(*(u16 *) (drv_data->tx));
-                while ((read_STAT() & BIT_STAT_TXS))
-                        continue;
+                write_TDBR(drv_data, (*(u16 *) (drv_data->tx)));
+                while ((read_STAT(drv_data) & BIT_STAT_TXS))
+                        cpu_relax();
                 drv_data->tx += 2;
         }
-
-        /* poll for SPI completion before returning */
-        while (!(read_STAT() & BIT_STAT_SPIF))
-                continue;
 }
 
 static void u16_cs_chg_writer(struct driver_data *drv_data)
 {
         struct chip_data *chip = drv_data->cur_chip;
 
+        /* poll for SPI completion before start */
+        while (!(read_STAT(drv_data) & BIT_STAT_SPIF))
+                cpu_relax();
+
         while (drv_data->tx < drv_data->tx_end) {
-                write_FLAG(chip->flag);
-                SSYNC();
-
-                write_TDBR(*(u16 *) (drv_data->tx));
-                while ((read_STAT() & BIT_STAT_TXS))
-                        continue;
-                while (!(read_STAT() & BIT_STAT_SPIF))
-                        continue;
-                write_FLAG(0xFF00 | chip->flag);
-                SSYNC();
-                if (chip->cs_chg_udelay)
-                        udelay(chip->cs_chg_udelay);
+                cs_active(drv_data, chip);
+
+                write_TDBR(drv_data, (*(u16 *) (drv_data->tx)));
+                while ((read_STAT(drv_data) & BIT_STAT_TXS))
+                        cpu_relax();
+
+                cs_deactive(drv_data, chip);
+
                 drv_data->tx += 2;
         }
-        write_FLAG(0xFF00);
-        SSYNC();
 }
 
 static void u16_reader(struct driver_data *drv_data)
 {
         dev_dbg(&drv_data->pdev->dev,
-                "cr-16 is 0x%x\n", read_STAT());
-        dummy_read();
+                "cr-16 is 0x%x\n", read_STAT(drv_data));
+
+        /* poll for SPI completion before start */
+        while (!(read_STAT(drv_data) & BIT_STAT_SPIF))
+                cpu_relax();
+
+        /* clear TDBR buffer before read(else it will be shifted out) */
+        write_TDBR(drv_data, 0xFFFF);
+
+        dummy_read(drv_data);
 
         while (drv_data->rx < (drv_data->rx_end - 2)) {
-                while (!(read_STAT() & BIT_STAT_RXS))
-                        continue;
-                *(u16 *) (drv_data->rx) = read_RDBR();
+                while (!(read_STAT(drv_data) & BIT_STAT_RXS))
+                        cpu_relax();
+                *(u16 *) (drv_data->rx) = read_RDBR(drv_data);
                 drv_data->rx += 2;
         }
 
-        while (!(read_STAT() & BIT_STAT_RXS))
-                continue;
-        *(u16 *) (drv_data->rx) = read_SHAW();
+        while (!(read_STAT(drv_data) & BIT_STAT_RXS))
+                cpu_relax();
+        *(u16 *) (drv_data->rx) = read_SHAW(drv_data);
         drv_data->rx += 2;
 }
 
@@ -464,36 +490,47 @@ static void u16_cs_chg_reader(struct driver_data *drv_data)
 {
         struct chip_data *chip = drv_data->cur_chip;
 
-        while (drv_data->rx < drv_data->rx_end) {
-                write_FLAG(chip->flag);
-                SSYNC();
-
-                read_RDBR();    /* kick off */
-                while (!(read_STAT() & BIT_STAT_RXS))
-                        continue;
-                while (!(read_STAT() & BIT_STAT_SPIF))
-                        continue;
-                *(u16 *) (drv_data->rx) = read_SHAW();
-                write_FLAG(0xFF00 | chip->flag);
-                SSYNC();
-                if (chip->cs_chg_udelay)
-                        udelay(chip->cs_chg_udelay);
+        /* poll for SPI completion before start */
+        while (!(read_STAT(drv_data) & BIT_STAT_SPIF))
+                cpu_relax();
+
+        /* clear TDBR buffer before read(else it will be shifted out) */
+        write_TDBR(drv_data, 0xFFFF);
+
+        cs_active(drv_data, chip);
+        dummy_read(drv_data);
+
+        while (drv_data->rx < drv_data->rx_end - 2) {
+                cs_deactive(drv_data, chip);
+
+                while (!(read_STAT(drv_data) & BIT_STAT_RXS))
+                        cpu_relax();
+                cs_active(drv_data, chip);
+                *(u16 *) (drv_data->rx) = read_RDBR(drv_data);
                 drv_data->rx += 2;
         }
-        write_FLAG(0xFF00);
-        SSYNC();
+        cs_deactive(drv_data, chip);
+
+        while (!(read_STAT(drv_data) & BIT_STAT_RXS))
+                cpu_relax();
+        *(u16 *) (drv_data->rx) = read_SHAW(drv_data);
+        drv_data->rx += 2;
 }
 
 static void u16_duplex(struct driver_data *drv_data)
 {
+        /* poll for SPI completion before start */
+        while (!(read_STAT(drv_data) & BIT_STAT_SPIF))
+                cpu_relax();
+
         /* in duplex mode, clk is triggered by writing of TDBR */
         while (drv_data->tx < drv_data->tx_end) {
-                write_TDBR(*(u16 *) (drv_data->tx));
-                while (!(read_STAT() & BIT_STAT_SPIF))
-                        continue;
-                while (!(read_STAT() & BIT_STAT_RXS))
-                        continue;
-                *(u16 *) (drv_data->rx) = read_RDBR();
+                write_TDBR(drv_data, (*(u16 *) (drv_data->tx)));
+                while (read_STAT(drv_data) & BIT_STAT_TXS)
+                        cpu_relax();
+                while (!(read_STAT(drv_data) & BIT_STAT_RXS))
+                        cpu_relax();
+                *(u16 *) (drv_data->rx) = read_RDBR(drv_data);
                 drv_data->rx += 2;
                 drv_data->tx += 2;
         }
@@ -503,25 +540,25 @@ static void u16_cs_chg_duplex(struct driver_data *drv_data)
 {
         struct chip_data *chip = drv_data->cur_chip;
 
+        /* poll for SPI completion before start */
+        while (!(read_STAT(drv_data) & BIT_STAT_SPIF))
+                cpu_relax();
+
         while (drv_data->tx < drv_data->tx_end) {
-                write_FLAG(chip->flag);
-                SSYNC();
-
-                write_TDBR(*(u16 *) (drv_data->tx));
-                while (!(read_STAT() & BIT_STAT_SPIF))
-                        continue;
-                while (!(read_STAT() & BIT_STAT_RXS))
-                        continue;
-                *(u16 *) (drv_data->rx) = read_RDBR();
-                write_FLAG(0xFF00 | chip->flag);
-                SSYNC();
-                if (chip->cs_chg_udelay)
-                        udelay(chip->cs_chg_udelay);
+                cs_active(drv_data, chip);
+
+                write_TDBR(drv_data, (*(u16 *) (drv_data->tx)));
+                while (read_STAT(drv_data) & BIT_STAT_TXS)
+                        cpu_relax();
+                while (!(read_STAT(drv_data) & BIT_STAT_RXS))
+                        cpu_relax();
+                *(u16 *) (drv_data->rx) = read_RDBR(drv_data);
+
+                cs_deactive(drv_data, chip);
+
                 drv_data->rx += 2;
                 drv_data->tx += 2;
         }
-        write_FLAG(0xFF00);
-        SSYNC();
 }
 
 /* test if ther is more transfer to be done */
@@ -546,6 +583,7 @@ static void *next_transfer(struct driver_data *drv_data)
  */
 static void giveback(struct driver_data *drv_data)
 {
+        struct chip_data *chip = drv_data->cur_chip;
         struct spi_transfer *last_transfer;
         unsigned long flags;
         struct spi_message *msg;
@@ -565,10 +603,13 @@ static void giveback(struct driver_data *drv_data)
 
         /* disable chip select signal. And not stop spi in autobuffer mode */
         if (drv_data->tx_dma != 0xFFFF) {
-                write_FLAG(0xFF00);
+                cs_deactive(drv_data, chip);
                 bfin_spi_disable(drv_data);
         }
 
+        if (!drv_data->cs_change)
+                cs_deactive(drv_data, chip);
+
         if (msg->complete)
                 msg->complete(msg->context);
 }
@@ -576,14 +617,15 @@ static void giveback(struct driver_data *drv_data)
 static irqreturn_t dma_irq_handler(int irq, void *dev_id)
 {
         struct driver_data *drv_data = (struct driver_data *)dev_id;
+        struct chip_data *chip = drv_data->cur_chip;
         struct spi_message *msg = drv_data->cur_msg;
 
         dev_dbg(&drv_data->pdev->dev, "in dma_irq_handler\n");
-        clear_dma_irqstat(CH_SPI);
+        clear_dma_irqstat(drv_data->dma_channel);
 
         /* Wait for DMA to complete */
-        while (get_dma_curr_irqstat(CH_SPI) & DMA_RUN)
-                continue;
+        while (get_dma_curr_irqstat(drv_data->dma_channel) & DMA_RUN)
+                cpu_relax();
 
         /*
          * wait for the last transaction shifted out.  HRM states:
@@ -592,18 +634,19 @@ static irqreturn_t dma_irq_handler(int irq, void *dev_id)
          * register until it goes low for 2 successive reads
          */
         if (drv_data->tx != NULL) {
-                while ((bfin_read_SPI_STAT() & TXS) ||
-                       (bfin_read_SPI_STAT() & TXS))
-                        continue;
+                while ((read_STAT(drv_data) & TXS) ||
+                       (read_STAT(drv_data) & TXS))
+                        cpu_relax();
         }
 
-        while (!(bfin_read_SPI_STAT() & SPIF))
-                continue;
-
-        bfin_spi_disable(drv_data);
+        while (!(read_STAT(drv_data) & SPIF))
+                cpu_relax();
 
         msg->actual_length += drv_data->len_in_bytes;
 
+        if (drv_data->cs_change)
+                cs_deactive(drv_data, chip);
+
         /* Move to next transfer */
         msg->state = next_transfer(drv_data);
 
@@ -613,8 +656,8 @@ static irqreturn_t dma_irq_handler(int irq, void *dev_id)
         /* free the irq handler before next transfer */
         dev_dbg(&drv_data->pdev->dev,
                 "disable dma channel irq%d\n",
-                CH_SPI);
-        dma_disable_irq(CH_SPI);
+                drv_data->dma_channel);
+        dma_disable_irq(drv_data->dma_channel);
 
         return IRQ_HANDLED;
 }
@@ -690,31 +733,67 @@ static void pump_transfers(unsigned long data)
         drv_data->rx_dma = transfer->rx_dma;
         drv_data->tx_dma = transfer->tx_dma;
         drv_data->len_in_bytes = transfer->len;
+        drv_data->cs_change = transfer->cs_change;
+
+        /* Bits per word setup */
+        switch (transfer->bits_per_word) {
+        case 8:
+                drv_data->n_bytes = 1;
+                width = CFG_SPI_WORDSIZE8;
+                drv_data->read = chip->cs_change_per_word ?
+                        u8_cs_chg_reader : u8_reader;
+                drv_data->write = chip->cs_change_per_word ?
+                        u8_cs_chg_writer : u8_writer;
+                drv_data->duplex = chip->cs_change_per_word ?
+                        u8_cs_chg_duplex : u8_duplex;
+                break;
+
+        case 16:
+                drv_data->n_bytes = 2;
+                width = CFG_SPI_WORDSIZE16;
+                drv_data->read = chip->cs_change_per_word ?
+                        u16_cs_chg_reader : u16_reader;
+                drv_data->write = chip->cs_change_per_word ?
+                        u16_cs_chg_writer : u16_writer;
+                drv_data->duplex = chip->cs_change_per_word ?
+                        u16_cs_chg_duplex : u16_duplex;
+                break;
+
+        default:
+                /* No change, the same as default setting */
+                drv_data->n_bytes = chip->n_bytes;
+                width = chip->width;
+                drv_data->write = drv_data->tx ? chip->write : null_writer;
+                drv_data->read = drv_data->rx ? chip->read : null_reader;
+                drv_data->duplex = chip->duplex ? chip->duplex : null_writer;
+                break;
+        }
+        cr = (read_CTRL(drv_data) & (~BIT_CTL_TIMOD));
+        cr |= (width << 8);
+        write_CTRL(drv_data, cr);
 
-        width = chip->width;
         if (width == CFG_SPI_WORDSIZE16) {
                 drv_data->len = (transfer->len) >> 1;
         } else {
                 drv_data->len = transfer->len;
         }
-        drv_data->write = drv_data->tx ? chip->write : null_writer;
-        drv_data->read = drv_data->rx ? chip->read : null_reader;
-        drv_data->duplex = chip->duplex ? chip->duplex : null_writer;
-        dev_dbg(&drv_data->pdev->dev,
-                "transfer: drv_data->write is %p, chip->write is %p, null_wr is %p\n",
-                drv_data->write, chip->write, null_writer);
+        dev_dbg(&drv_data->pdev->dev, "transfer: ",
+                "drv_data->write is %p, chip->write is %p, null_wr is %p\n",
+                drv_data->write, chip->write, null_writer);
 
         /* speed and width has been set on per message */
         message->state = RUNNING_STATE;
         dma_config = 0;
 
-        /* restore spi status for each spi transfer */
-        if (transfer->speed_hz) {
-                write_BAUD(hz_to_spi_baud(transfer->speed_hz));
-        } else {
-                write_BAUD(chip->baud);
-        }
-        write_FLAG(chip->flag);
+        /* Speed setup (surely valid because already checked) */
+        if (transfer->speed_hz)
+                write_BAUD(drv_data, hz_to_spi_baud(transfer->speed_hz));
+        else
+                write_BAUD(drv_data, chip->baud);
+
+        write_STAT(drv_data, BIT_STAT_CLR);
+        cr = (read_CTRL(drv_data) & (~BIT_CTL_TIMOD));
+        cs_active(drv_data, chip);
 
         dev_dbg(&drv_data->pdev->dev,
                 "now pumping a transfer: width is %d, len is %d\n",
@@ -727,25 +806,25 @@ static void pump_transfers(unsigned long data)
          */
         if (drv_data->cur_chip->enable_dma && drv_data->len > 6) {
 
-                write_STAT(BIT_STAT_CLR);
-                disable_dma(CH_SPI);
-                clear_dma_irqstat(CH_SPI);
+                disable_dma(drv_data->dma_channel);
+                clear_dma_irqstat(drv_data->dma_channel);
                 bfin_spi_disable(drv_data);
 
                 /* config dma channel */
                 dev_dbg(&drv_data->pdev->dev, "doing dma transfer\n");
                 if (width == CFG_SPI_WORDSIZE16) {
-                        set_dma_x_count(CH_SPI, drv_data->len);
-                        set_dma_x_modify(CH_SPI, 2);
+                        set_dma_x_count(drv_data->dma_channel, drv_data->len);
+                        set_dma_x_modify(drv_data->dma_channel, 2);
                         dma_width = WDSIZE_16;
                 } else {
-                        set_dma_x_count(CH_SPI, drv_data->len);
-                        set_dma_x_modify(CH_SPI, 1);
+                        set_dma_x_count(drv_data->dma_channel, drv_data->len);
+                        set_dma_x_modify(drv_data->dma_channel, 1);
                         dma_width = WDSIZE_8;
                 }
 
-                /* set transfer width,direction. And enable spi */
-                cr = (read_CTRL() & (~BIT_CTL_TIMOD));
+                /* poll for SPI completion before start */
+                while (!(read_STAT(drv_data) & BIT_STAT_SPIF))
+                        cpu_relax();
 
                 /* dirty hack for autobuffer DMA mode */
                 if (drv_data->tx_dma == 0xFFFF) {
@@ -755,13 +834,18 @@ static void pump_transfers(unsigned long data)
                         /* no irq in autobuffer mode */
                         dma_config =
                             (DMAFLOW_AUTO | RESTART | dma_width | DI_EN);
-                        set_dma_config(CH_SPI, dma_config);
-                        set_dma_start_addr(CH_SPI, (unsigned long)drv_data->tx);
-                        enable_dma(CH_SPI);
-                        write_CTRL(cr | CFG_SPI_DMAWRITE | (width << 8) |
-                                   (CFG_SPI_ENABLE << 14));
-
-                        /* just return here, there can only be one transfer in this mode */
+                        set_dma_config(drv_data->dma_channel, dma_config);
+                        set_dma_start_addr(drv_data->dma_channel,
+                                        (unsigned long)drv_data->tx);
+                        enable_dma(drv_data->dma_channel);
+
+                        /* start SPI transfer */
+                        write_CTRL(drv_data,
+                                (cr | CFG_SPI_DMAWRITE | BIT_CTL_ENABLE));
+
+                        /* just return here, there can only be one transfer
+                         * in this mode
+                         */
                         message->status = 0;
                         giveback(drv_data);
                         return;
@@ -772,58 +856,51 @@ static void pump_transfers(unsigned long data)
                         /* set transfer mode, and enable SPI */
                         dev_dbg(&drv_data->pdev->dev, "doing DMA in.\n");
 
-                        /* disable SPI before write to TDBR */
-                        write_CTRL(cr & ~BIT_CTL_ENABLE);
-
                         /* clear tx reg soformer data is not shifted out */
-                        write_TDBR(0xFF);
+                        write_TDBR(drv_data, 0xFFFF);
 
-                        set_dma_x_count(CH_SPI, drv_data->len);
+                        set_dma_x_count(drv_data->dma_channel, drv_data->len);
 
                         /* start dma */
-                        dma_enable_irq(CH_SPI);
+                        dma_enable_irq(drv_data->dma_channel);
                         dma_config = (WNR | RESTART | dma_width | DI_EN);
-                        set_dma_config(CH_SPI, dma_config);
-                        set_dma_start_addr(CH_SPI, (unsigned long)drv_data->rx);
-                        enable_dma(CH_SPI);
+                        set_dma_config(drv_data->dma_channel, dma_config);
+                        set_dma_start_addr(drv_data->dma_channel,
+                                        (unsigned long)drv_data->rx);
+                        enable_dma(drv_data->dma_channel);
+
+                        /* start SPI transfer */
+                        write_CTRL(drv_data,
+                                (cr | CFG_SPI_DMAREAD | BIT_CTL_ENABLE));
 
-                        cr |=
-                            CFG_SPI_DMAREAD | (width << 8) | (CFG_SPI_ENABLE <<
-                                                              14);
-                        /* set transfer mode, and enable SPI */
-                        write_CTRL(cr);
                 } else if (drv_data->tx != NULL) {
                         dev_dbg(&drv_data->pdev->dev, "doing DMA out.\n");
 
                         /* start dma */
-                        dma_enable_irq(CH_SPI);
+                        dma_enable_irq(drv_data->dma_channel);
                         dma_config = (RESTART | dma_width | DI_EN);
-                        set_dma_config(CH_SPI, dma_config);
-                        set_dma_start_addr(CH_SPI, (unsigned long)drv_data->tx);
-                        enable_dma(CH_SPI);
-
-                        write_CTRL(cr | CFG_SPI_DMAWRITE | (width << 8) |
-                                   (CFG_SPI_ENABLE << 14));
-
+                        set_dma_config(drv_data->dma_channel, dma_config);
+                        set_dma_start_addr(drv_data->dma_channel,
+                                        (unsigned long)drv_data->tx);
+                        enable_dma(drv_data->dma_channel);
+
+                        /* start SPI transfer */
+                        write_CTRL(drv_data,
+                                (cr | CFG_SPI_DMAWRITE | BIT_CTL_ENABLE));
                 }
         } else {
                 /* IO mode write then read */
                 dev_dbg(&drv_data->pdev->dev, "doing IO transfer\n");
 
-                write_STAT(BIT_STAT_CLR);
-
                 if (drv_data->tx != NULL && drv_data->rx != NULL) {
                         /* full duplex mode */
                         BUG_ON((drv_data->tx_end - drv_data->tx) !=
                                (drv_data->rx_end - drv_data->rx));
-                        cr = (read_CTRL() & (~BIT_CTL_TIMOD));  
-                        cr |= CFG_SPI_WRITE | (width << 8) |
-                                (CFG_SPI_ENABLE << 14);
                         dev_dbg(&drv_data->pdev->dev,
                                 "IO duplex: cr is 0x%x\n", cr);
 
-                        write_CTRL(cr);
-                        SSYNC();
+                        /* set SPI transfer mode */
+                        write_CTRL(drv_data, (cr | CFG_SPI_WRITE));
 
                         drv_data->duplex(drv_data);
 
@@ -831,14 +908,11 @@ static void pump_transfers(unsigned long data)
                                 tranf_success = 0;
                 } else if (drv_data->tx != NULL) {
                         /* write only half duplex */
-                        cr = (read_CTRL() & (~BIT_CTL_TIMOD));
-                        cr |= CFG_SPI_WRITE | (width << 8) |
-                                (CFG_SPI_ENABLE << 14);
-                        dev_dbg(&drv_data->pdev->dev, 
+                        dev_dbg(&drv_data->pdev->dev,
                                 "IO write: cr is 0x%x\n", cr);
 
-                        write_CTRL(cr);
-                        SSYNC();
+                        /* set SPI transfer mode */
+                        write_CTRL(drv_data, (cr | CFG_SPI_WRITE));
 
                         drv_data->write(drv_data);
 
@@ -846,14 +920,11 @@ static void pump_transfers(unsigned long data)
                                 tranf_success = 0;
                 } else if (drv_data->rx != NULL) {
                         /* read only half duplex */
-                        cr = (read_CTRL() & (~BIT_CTL_TIMOD));
-                        cr |= CFG_SPI_READ | (width << 8) |
-                                (CFG_SPI_ENABLE << 14);
-                        dev_dbg(&drv_data->pdev->dev, 
+                        dev_dbg(&drv_data->pdev->dev,
                                 "IO read: cr is 0x%x\n", cr);
 
-                        write_CTRL(cr);
-                        SSYNC();
+                        /* set SPI transfer mode */
+                        write_CTRL(drv_data, (cr | CFG_SPI_READ));
 
                         drv_data->read(drv_data);
                         if (drv_data->rx != drv_data->rx_end)
@@ -861,7 +932,7 @@ static void pump_transfers(unsigned long data)
                 }
 
                 if (!tranf_success) {
-                        dev_dbg(&drv_data->pdev->dev, 
+                        dev_dbg(&drv_data->pdev->dev,
                                 "IO write error!\n");
                         message->state = ERROR_STATE;
                 } else {
@@ -881,9 +952,11 @@ static void pump_transfers(unsigned long data)
 /* pop a msg from queue and kick off real transfer */
 static void pump_messages(struct work_struct *work)
 {
-        struct driver_data *drv_data = container_of(work, struct driver_data, pump_messages);
+        struct driver_data *drv_data;
         unsigned long flags;
 
+        drv_data = container_of(work, struct driver_data, pump_messages);
+
         /* Lock queue and check for queue work */
         spin_lock_irqsave(&drv_data->lock, flags);
         if (list_empty(&drv_data->queue) || drv_data->run == QUEUE_STOPPED) {
@@ -902,6 +975,14 @@ static void pump_messages(struct work_struct *work)
         /* Extract head of queue */
         drv_data->cur_msg = list_entry(drv_data->queue.next,
                                        struct spi_message, queue);
+
+        /* Setup the SSP using the per chip configuration */
+        drv_data->cur_chip = spi_get_ctldata(drv_data->cur_msg->spi);
+        if (restore_state(drv_data)) {
+                spin_unlock_irqrestore(&drv_data->lock, flags);
+                return;
+        };
+
         list_del_init(&drv_data->cur_msg->queue);
 
         /* Initial message state */
@@ -909,15 +990,12 @@ static void pump_messages(struct work_struct *work)
         drv_data->cur_transfer = list_entry(drv_data->cur_msg->transfers.next,
                                             struct spi_transfer, transfer_list);
 
-        /* Setup the SSP using the per chip configuration */
-        drv_data->cur_chip = spi_get_ctldata(drv_data->cur_msg->spi);
-        restore_state(drv_data);
+        dev_dbg(&drv_data->pdev->dev, "got a message to pump, "
+                "state is set to: baud %d, flag 0x%x, ctl 0x%x\n",
+                drv_data->cur_chip->baud, drv_data->cur_chip->flag,
+                drv_data->cur_chip->ctl_reg);
+
         dev_dbg(&drv_data->pdev->dev,
-                "got a message to pump, state is set to: baud %d, flag 0x%x, ctl 0x%x\n",
-                drv_data->cur_chip->baud, drv_data->cur_chip->flag,
-                drv_data->cur_chip->ctl_reg);
-        
-        dev_dbg(&drv_data->pdev->dev, 
                 "the first transfer len is %d\n",
                 drv_data->cur_transfer->len);
 
@@ -959,6 +1037,22 @@ static int transfer(struct spi_device *spi, struct spi_message *msg)
         return 0;
 }
 
+#define MAX_SPI_SSEL    7
+
+static u16 ssel[3][MAX_SPI_SSEL] = {
+        {P_SPI0_SSEL1, P_SPI0_SSEL2, P_SPI0_SSEL3,
+        P_SPI0_SSEL4, P_SPI0_SSEL5,
+        P_SPI0_SSEL6, P_SPI0_SSEL7},
+
+        {P_SPI1_SSEL1, P_SPI1_SSEL2, P_SPI1_SSEL3,
+        P_SPI1_SSEL4, P_SPI1_SSEL5,
+        P_SPI1_SSEL6, P_SPI1_SSEL7},
+
+        {P_SPI2_SSEL1, P_SPI2_SSEL2, P_SPI2_SSEL3,
+        P_SPI2_SSEL4, P_SPI2_SSEL5,
+        P_SPI2_SSEL6, P_SPI2_SSEL7},
+};
+
 /* first setup for new devices */
 static int setup(struct spi_device *spi)
 {
@@ -993,6 +1087,18 @@ static int setup(struct spi_device *spi)
 
         /* chip_info isn't always needed */
         if (chip_info) {
+                /* Make sure people stop trying to set fields via ctl_reg
+                 * when they should actually be using common SPI framework.
+                 * Currently we let through: WOM EMISO PSSE GM SZ TIMOD.
+                 * Not sure if a user actually needs/uses any of these,
+                 * but let's assume (for now) they do.
+                 */
+                if (chip_info->ctl_reg & (SPE|MSTR|CPOL|CPHA|LSBF|SIZE)) {
+                        dev_err(&spi->dev, "do not set bits in ctl_reg "
+                                "that the SPI framework manages\n");
+                        return -EINVAL;
+                }
+
                 chip->enable_dma = chip_info->enable_dma != 0
                     && drv_data->master_info->enable_dma;
                 chip->ctl_reg = chip_info->ctl_reg;
@@ -1015,20 +1121,20 @@ static int setup(struct spi_device *spi)
          * if any one SPI chip is registered and wants DMA, request the
          * DMA channel for it
          */
-        if (chip->enable_dma && !dma_requested) {
+        if (chip->enable_dma && !drv_data->dma_requested) {
                 /* register dma irq handler */
-                if (request_dma(CH_SPI, "BF53x_SPI_DMA") < 0) {
+                if (request_dma(drv_data->dma_channel, "BF53x_SPI_DMA") < 0) {
                         dev_dbg(&spi->dev,
                                 "Unable to request BlackFin SPI DMA channel\n");
                         return -ENODEV;
                 }
-                if (set_dma_callback(CH_SPI, (void *)dma_irq_handler, drv_data)
-                    < 0) {
+                if (set_dma_callback(drv_data->dma_channel,
+                        (void *)dma_irq_handler, drv_data) < 0) {
                         dev_dbg(&spi->dev, "Unable to set dma callback\n");
                         return -EPERM;
                 }
-                dma_disable_irq(CH_SPI);
-                dma_requested = 1;
+                dma_disable_irq(drv_data->dma_channel);
+                drv_data->dma_requested = 1;
         }
 
         /*
@@ -1077,6 +1183,14 @@ static int setup(struct spi_device *spi)
 
         spi_set_ctldata(spi, chip);
 
+        dev_dbg(&spi->dev, "chip select number is %d\n", chip->chip_select_num);
+        if ((chip->chip_select_num > 0)
+                && (chip->chip_select_num <= spi->master->num_chipselect))
+                peripheral_request(ssel[spi->master->bus_num]
+                        [chip->chip_select_num-1], DRV_NAME);
+
+        cs_deactive(drv_data, chip);
+
         return 0;
 }
 
@@ -1088,6 +1202,11 @@ static void cleanup(struct spi_device *spi)
 {
         struct chip_data *chip = spi_get_ctldata(spi);
 
+        if ((chip->chip_select_num > 0)
+                && (chip->chip_select_num <= spi->master->num_chipselect))
+                peripheral_free(ssel[spi->master->bus_num]
+                                        [chip->chip_select_num-1]);
+
         kfree(chip);
 }
 
@@ -1183,6 +1302,7 @@ static int __init bfin5xx_spi_probe(struct platform_device *pdev)
         struct bfin5xx_spi_master *platform_info;
         struct spi_master *master;
         struct driver_data *drv_data = 0;
+        struct resource *res;
         int status = 0;
 
         platform_info = dev->platform_data;
@@ -1193,10 +1313,12 @@ static int __init bfin5xx_spi_probe(struct platform_device *pdev)
                 dev_err(&pdev->dev, "can not alloc spi_master\n");
                 return -ENOMEM;
         }
+
         drv_data = spi_master_get_devdata(master);
         drv_data->master = master;
         drv_data->master_info = platform_info;
         drv_data->pdev = pdev;
+        drv_data->pin_req = platform_info->pin_req;
 
         master->bus_num = pdev->id;
         master->num_chipselect = platform_info->num_chipselect;
@@ -1204,15 +1326,38 @@ static int __init bfin5xx_spi_probe(struct platform_device *pdev)
         master->setup = setup;
         master->transfer = transfer;
 
+        /* Find and map our resources */
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        if (res == NULL) {
+                dev_err(dev, "Cannot get IORESOURCE_MEM\n");
+                status = -ENOENT;
+                goto out_error_get_res;
+        }
+
+        drv_data->regs_base = ioremap(res->start, (res->end - res->start + 1));
+        if (drv_data->regs_base == NULL) {
+                dev_err(dev, "Cannot map IO\n");
+                status = -ENXIO;
+                goto out_error_ioremap;
+        }
+
+        drv_data->dma_channel = platform_get_irq(pdev, 0);
+        if (drv_data->dma_channel < 0) {
+                dev_err(dev, "No DMA channel specified\n");
+                status = -ENOENT;
+                goto out_error_no_dma_ch;
+        }
+
         /* Initial and start queue */
         status = init_queue(drv_data);
         if (status != 0) {
-                dev_err(&pdev->dev, "problem initializing queue\n");
+                dev_err(dev, "problem initializing queue\n");
                 goto out_error_queue_alloc;
         }
+
         status = start_queue(drv_data);
         if (status != 0) {
-                dev_err(&pdev->dev, "problem starting queue\n");
+                dev_err(dev, "problem starting queue\n");
                 goto out_error_queue_alloc;
         }
 
@@ -1220,15 +1365,30 @@ static int __init bfin5xx_spi_probe(struct platform_device *pdev)
         platform_set_drvdata(pdev, drv_data);
         status = spi_register_master(master);
         if (status != 0) {
-                dev_err(&pdev->dev, "problem registering spi master\n");
+                dev_err(dev, "problem registering spi master\n");
                 goto out_error_queue_alloc;
         }
-        dev_dbg(&pdev->dev, "controller probe successfully\n");
+
+        status = peripheral_request_list(drv_data->pin_req, DRV_NAME);
+        if (status != 0) {
+                dev_err(&pdev->dev, ": Requesting Peripherals failed\n");
+                goto out_error;
+        }
+
+        dev_info(dev, "%s, Version %s, regs_base@%p, dma channel@%d\n",
+                DRV_DESC, DRV_VERSION, drv_data->regs_base,
+                drv_data->dma_channel);
         return status;
 
-      out_error_queue_alloc:
+out_error_queue_alloc:
         destroy_queue(drv_data);
+out_error_no_dma_ch:
+        iounmap((void *) drv_data->regs_base);
+out_error_ioremap:
+out_error_get_res:
+out_error:
         spi_master_put(master);
+
         return status;
 }
 
@@ -1251,13 +1411,15 @@ static int __devexit bfin5xx_spi_remove(struct platform_device *pdev)
 
         /* Release DMA */
         if (drv_data->master_info->enable_dma) {
-                if (dma_channel_active(CH_SPI))
-                        free_dma(CH_SPI);
+                if (dma_channel_active(drv_data->dma_channel))
+                        free_dma(drv_data->dma_channel);
         }
 
         /* Disconnect from the SPI framework */
         spi_unregister_master(drv_data->master);
 
+        peripheral_free_list(drv_data->pin_req);
+
         /* Prevent double remove */
         platform_set_drvdata(pdev, NULL);
 
@@ -1305,7 +1467,7 @@ static int bfin5xx_spi_resume(struct platform_device *pdev)
 MODULE_ALIAS("bfin-spi-master");        /* for platform bus hotplug */
 static struct platform_driver bfin5xx_spi_driver = {
         .driver = {
-                .name   = "bfin-spi-master",
+                .name   = DRV_NAME,
                 .owner  = THIS_MODULE,
         },
         .suspend        = bfin5xx_spi_suspend,
diff --git a/drivers/spi/spi_imx.c b/drivers/spi/spi_imx.c
index 7686ba34430f..2cd8573fb09c 100644
--- a/drivers/spi/spi_imx.c
+++ b/drivers/spi/spi_imx.c
@@ -1758,5 +1758,5 @@ static void __exit spi_imx_exit(void)
 module_exit(spi_imx_exit);
 
 MODULE_AUTHOR("Andrea Paterniani, <a.paterniani@swapp-eng.it>");
-MODULE_DESCRIPTION("iMX SPI Contoller Driver");
+MODULE_DESCRIPTION("iMX SPI Controller Driver");
 MODULE_LICENSE("GPL");
diff --git a/drivers/spi/spi_s3c24xx_gpio.c b/drivers/spi/spi_s3c24xx_gpio.c
index 0fa25e2e80fe..109d82c1abc0 100644
--- a/drivers/spi/spi_s3c24xx_gpio.c
+++ b/drivers/spi/spi_s3c24xx_gpio.c
@@ -96,6 +96,7 @@ static void s3c2410_spigpio_chipselect(struct spi_device *dev, int value)
 
 static int s3c2410_spigpio_probe(struct platform_device *dev)
 {
+        struct s3c2410_spigpio_info *info;
         struct spi_master       *master;
         struct s3c2410_spigpio  *sp;
         int ret;
@@ -113,10 +114,11 @@ static int s3c2410_spigpio_probe(struct platform_device *dev)
         platform_set_drvdata(dev, sp);
 
         /* copy in the plkatform data */
-        sp->info = dev->dev.platform_data;
+        info = sp->info = dev->dev.platform_data;
 
         /* setup spi bitbang adaptor */
         sp->bitbang.master = spi_master_get(master);
+        sp->bitbang.master->bus_num = info->bus_num;
         sp->bitbang.chipselect = s3c2410_spigpio_chipselect;
 
         sp->bitbang.txrx_word[SPI_MODE_0] = s3c2410_spigpio_txrx_mode0;
@@ -124,13 +126,18 @@ static int s3c2410_spigpio_probe(struct platform_device *dev)
         sp->bitbang.txrx_word[SPI_MODE_2] = s3c2410_spigpio_txrx_mode2;
         sp->bitbang.txrx_word[SPI_MODE_3] = s3c2410_spigpio_txrx_mode3;
 
-        /* set state of spi pins */
-        s3c2410_gpio_setpin(sp->info->pin_clk, 0);
-        s3c2410_gpio_setpin(sp->info->pin_mosi, 0);
+        /* set state of spi pins, always assume that the clock is
+         * available, but do check the MOSI and MISO. */
+        s3c2410_gpio_setpin(info->pin_clk, 0);
+        s3c2410_gpio_cfgpin(info->pin_clk, S3C2410_GPIO_OUTPUT);
 
-        s3c2410_gpio_cfgpin(sp->info->pin_clk, S3C2410_GPIO_OUTPUT);
-        s3c2410_gpio_cfgpin(sp->info->pin_mosi, S3C2410_GPIO_OUTPUT);
-        s3c2410_gpio_cfgpin(sp->info->pin_miso, S3C2410_GPIO_INPUT);
+        if (info->pin_mosi < S3C2410_GPH10) {
+                s3c2410_gpio_setpin(info->pin_mosi, 0);
+                s3c2410_gpio_cfgpin(info->pin_mosi, S3C2410_GPIO_OUTPUT);
+        }
+
+        if (info->pin_miso != S3C2410_GPA0 && info->pin_miso < S3C2410_GPH10)
+                s3c2410_gpio_cfgpin(info->pin_miso, S3C2410_GPIO_INPUT);
 
         ret = spi_bitbang_start(&sp->bitbang);
         if (ret)
diff --git a/drivers/usb/README b/drivers/usb/README
index 3c8434128554..284f46b3e1cc 100644
--- a/drivers/usb/README
+++ b/drivers/usb/README
@@ -39,12 +39,12 @@ first subdirectory in the list below that it fits into.
 
 image/          - This is for still image drivers, like scanners or
                   digital cameras.
-input/          - This is for any driver that uses the input subsystem,
+../input/       - This is for any driver that uses the input subsystem,
                   like keyboard, mice, touchscreens, tablets, etc.
-media/          - This is for multimedia drivers, like video cameras,
+../media/       - This is for multimedia drivers, like video cameras,
                   radios, and any other drivers that talk to the v4l
                   subsystem.
-net/            - This is for network drivers.
+../net/         - This is for network drivers.
 serial/         - This is for USB to serial drivers.
 storage/        - This is for USB mass-storage drivers.
 class/          - This is for all USB device drivers that do not fit
diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c
index 8586817698ad..c51f8e9312e0 100644
--- a/drivers/usb/core/driver.c
+++ b/drivers/usb/core/driver.c
@@ -585,9 +585,6 @@ static int usb_uevent(struct device *dev, struct kobj_uevent_env *env)
 {
         struct usb_device *usb_dev;
 
-        if (!dev)
-                return -ENODEV;
-
         /* driver is often null here; dev_dbg() would oops */
         pr_debug ("usb %s: uevent\n", dev->bus_id);
 
@@ -631,14 +628,6 @@ static int usb_uevent(struct device *dev, struct kobj_uevent_env *env)
                            usb_dev->descriptor.bDeviceProtocol))
                 return -ENOMEM;
 
-        if (add_uevent_var(env, "BUSNUM=%03d",
-                           usb_dev->bus->busnum))
-                return -ENOMEM;
-
-        if (add_uevent_var(env, "DEVNUM=%03d",
-                           usb_dev->devnum))
-                return -ENOMEM;
-
         return 0;
 }
 
diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
index fea8256a18d6..d5ed3fa9e304 100644
--- a/drivers/usb/core/hcd.c
+++ b/drivers/usb/core/hcd.c
@@ -1311,8 +1311,8 @@ void usb_hcd_flush_endpoint(struct usb_device *udev,
         hcd = bus_to_hcd(udev->bus);
 
         /* No more submits can occur */
-rescan:
         spin_lock_irq(&hcd_urb_list_lock);
+rescan:
         list_for_each_entry (urb, &ep->urb_list, urb_list) {
                 int     is_in;
 
@@ -1345,6 +1345,7 @@ rescan:
                 usb_put_urb (urb);
 
                 /* list contents may have changed */
+                spin_lock(&hcd_urb_list_lock);
                 goto rescan;
         }
         spin_unlock_irq(&hcd_urb_list_lock);
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index 036c3dea855e..13b326a13377 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -335,7 +335,7 @@ static void kick_khubd(struct usb_hub *hub)
         to_usb_interface(hub->intfdev)->pm_usage_cnt = 1;
 
         spin_lock_irqsave(&hub_event_lock, flags);
-        if (!hub->disconnected & list_empty(&hub->event_list)) {
+        if (!hub->disconnected && list_empty(&hub->event_list)) {
                 list_add_tail(&hub->event_list, &hub_event_list);
                 wake_up(&khubd_wait);
         }
diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c
index 316a746e0080..fcd40ecbeecc 100644
--- a/drivers/usb/core/message.c
+++ b/drivers/usb/core/message.c
@@ -1172,7 +1172,6 @@ int usb_set_interface(struct usb_device *dev, int interface, int alternate)
         struct usb_host_interface *alt;
         int ret;
         int manual = 0;
-        int changed;
 
         if (dev->state == USB_STATE_SUSPENDED)
                 return -EHOSTUNREACH;
@@ -1212,8 +1211,7 @@ int usb_set_interface(struct usb_device *dev, int interface, int alternate)
          */
 
         /* prevent submissions using previous endpoint settings */
-        changed = (iface->cur_altsetting != alt);
-        if (changed && device_is_registered(&iface->dev))
+        if (iface->cur_altsetting != alt && device_is_registered(&iface->dev))
                 usb_remove_sysfs_intf_files(iface);
         usb_disable_interface(dev, iface);
 
@@ -1250,7 +1248,7 @@ int usb_set_interface(struct usb_device *dev, int interface, int alternate)
          * (Likewise, EP0 never "halts" on well designed devices.)
          */
         usb_enable_interface(dev, iface);
-        if (changed && device_is_registered(&iface->dev))
+        if (device_is_registered(&iface->dev))
                 usb_create_sysfs_intf_files(iface);
 
         return 0;
@@ -1348,34 +1346,10 @@ static int usb_if_uevent(struct device *dev, struct kobj_uevent_env *env)
         struct usb_interface *intf;
         struct usb_host_interface *alt;
 
-        if (!dev)
-                return -ENODEV;
-
-        /* driver is often null here; dev_dbg() would oops */
-        pr_debug ("usb %s: uevent\n", dev->bus_id);
-
         intf = to_usb_interface(dev);
         usb_dev = interface_to_usbdev(intf);
         alt = intf->cur_altsetting;
 
-#ifdef CONFIG_USB_DEVICEFS
-        if (add_uevent_var(env, "DEVICE=/proc/bus/usb/%03d/%03d",
-                           usb_dev->bus->busnum, usb_dev->devnum))
-                return -ENOMEM;
-#endif
-
-        if (add_uevent_var(env, "PRODUCT=%x/%x/%x",
-                           le16_to_cpu(usb_dev->descriptor.idVendor),
-                           le16_to_cpu(usb_dev->descriptor.idProduct),
-                           le16_to_cpu(usb_dev->descriptor.bcdDevice)))
-                return -ENOMEM;
-
-        if (add_uevent_var(env, "TYPE=%d/%d/%d",
-                           usb_dev->descriptor.bDeviceClass,
-                           usb_dev->descriptor.bDeviceSubClass,
-                           usb_dev->descriptor.bDeviceProtocol))
-                return -ENOMEM;
-
         if (add_uevent_var(env, "INTERFACE=%d/%d/%d",
                    alt->desc.bInterfaceClass,
                    alt->desc.bInterfaceSubClass,
@@ -1641,12 +1615,6 @@ free_interfaces:
                                 intf->dev.bus_id, ret);
                         continue;
                 }
-
-                /* The driver's probe method can call usb_set_interface(),
-                 * which would mean the interface's sysfs files are already
-                 * created.  Just in case, we'll remove them first.
-                 */
-                usb_remove_sysfs_intf_files(intf);
                 usb_create_sysfs_intf_files(intf);
         }
 
diff --git a/drivers/usb/core/sysfs.c b/drivers/usb/core/sysfs.c
index b04afd06e502..32bd130b1eed 100644
--- a/drivers/usb/core/sysfs.c
+++ b/drivers/usb/core/sysfs.c
@@ -735,6 +735,8 @@ int usb_create_sysfs_intf_files(struct usb_interface *intf)
         struct usb_host_interface *alt = intf->cur_altsetting;
         int retval;
 
+        if (intf->sysfs_files_created)
+                return 0;
         retval = sysfs_create_group(&dev->kobj, &intf_attr_grp);
         if (retval)
                 return retval;
@@ -746,6 +748,7 @@ int usb_create_sysfs_intf_files(struct usb_interface *intf)
         if (intf->intf_assoc)
                 retval = sysfs_create_group(&dev->kobj, &intf_assoc_attr_grp);
         usb_create_intf_ep_files(intf, udev);
+        intf->sysfs_files_created = 1;
         return 0;
 }
 
@@ -753,8 +756,11 @@ void usb_remove_sysfs_intf_files(struct usb_interface *intf)
 {
         struct device *dev = &intf->dev;
 
+        if (!intf->sysfs_files_created)
+                return;
         usb_remove_intf_ep_files(intf);
         device_remove_file(dev, &dev_attr_interface);
         sysfs_remove_group(&dev->kobj, &intf_attr_grp);
         sysfs_remove_group(&intf->dev.kobj, &intf_assoc_attr_grp);
+        intf->sysfs_files_created = 0;
 }
diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c
index c4a6f1095b8b..8f142370103d 100644
--- a/drivers/usb/core/usb.c
+++ b/drivers/usb/core/usb.c
@@ -192,9 +192,34 @@ static void usb_release_dev(struct device *dev)
         kfree(udev);
 }
 
+#ifdef  CONFIG_HOTPLUG
+static int usb_dev_uevent(struct device *dev, struct kobj_uevent_env *env)
+{
+        struct usb_device *usb_dev;
+
+        usb_dev = to_usb_device(dev);
+
+        if (add_uevent_var(env, "BUSNUM=%03d", usb_dev->bus->busnum))
+                return -ENOMEM;
+
+        if (add_uevent_var(env, "DEVNUM=%03d", usb_dev->devnum))
+                return -ENOMEM;
+
+        return 0;
+}
+
+#else
+
+static int usb_dev_uevent(struct device *dev, struct kobj_uevent_env *env)
+{
+        return -ENODEV;
+}
+#endif  /* CONFIG_HOTPLUG */
+
 struct device_type usb_device_type = {
         .name =         "usb_device",
         .release =      usb_release_dev,
+        .uevent =       usb_dev_uevent,
 };
 
 #ifdef  CONFIG_PM
diff --git a/drivers/usb/gadget/omap_udc.c b/drivers/usb/gadget/omap_udc.c
index 87c4f50dfb61..d377154658b5 100644
--- a/drivers/usb/gadget/omap_udc.c
+++ b/drivers/usb/gadget/omap_udc.c
@@ -1241,14 +1241,14 @@ static void pullup_enable(struct omap_udc *udc)
         udc->gadget.dev.parent->power.power_state = PMSG_ON;
         udc->gadget.dev.power.power_state = PMSG_ON;
         UDC_SYSCON1_REG |= UDC_PULLUP_EN;
-        if (!gadget_is_otg(udc->gadget) && !cpu_is_omap15xx())
+        if (!gadget_is_otg(&udc->gadget) && !cpu_is_omap15xx())
                 OTG_CTRL_REG |= OTG_BSESSVLD;
         UDC_IRQ_EN_REG = UDC_DS_CHG_IE;
 }
 
 static void pullup_disable(struct omap_udc *udc)
 {
-        if (!gadget_is_otg(udc->gadget) && !cpu_is_omap15xx())
+        if (!gadget_is_otg(&udc->gadget) && !cpu_is_omap15xx())
                 OTG_CTRL_REG &= ~OTG_BSESSVLD;
         UDC_IRQ_EN_REG = UDC_DS_CHG_IE;
         UDC_SYSCON1_REG &= ~UDC_PULLUP_EN;
@@ -1386,7 +1386,7 @@ static void update_otg(struct omap_udc *udc)
 {
         u16     devstat;
 
-        if (!gadget_is_otg(udc->gadget))
+        if (!gadget_is_otg(&udc->gadget))
                 return;
 
         if (OTG_CTRL_REG & OTG_ID)
diff --git a/drivers/usb/gadget/s3c2410_udc.c b/drivers/usb/gadget/s3c2410_udc.c
index e3e90f8a75e7..4ce050c3d13f 100644
--- a/drivers/usb/gadget/s3c2410_udc.c
+++ b/drivers/usb/gadget/s3c2410_udc.c
@@ -52,10 +52,10 @@
 #include <asm/arch/irqs.h>
 
 #include <asm/arch/hardware.h>
-#include <asm/arch/regs-clock.h>
 #include <asm/arch/regs-gpio.h>
-#include <asm/arch/regs-udc.h>
-#include <asm/arch/udc.h>
+
+#include <asm/plat-s3c24xx/regs-udc.h>
+#include <asm/plat-s3c24xx/udc.h>
 
 #include <asm/mach-types.h>
 
@@ -1511,7 +1511,11 @@ static irqreturn_t s3c2410_udc_vbus_irq(int irq, void *_dev)
         unsigned int            value;
 
         dprintk(DEBUG_NORMAL, "%s()\n", __func__);
+
+        /* some cpus cannot read from an line configured to IRQ! */
+        s3c2410_gpio_cfgpin(udc_info->vbus_pin, S3C2410_GPIO_INPUT);
         value = s3c2410_gpio_getpin(udc_info->vbus_pin);
+        s3c2410_gpio_cfgpin(udc_info->vbus_pin, S3C2410_GPIO_SFN2);
 
         if (udc_info->vbus_pin_inverted)
                 value = !value;
@@ -1872,9 +1876,9 @@ static int s3c2410_udc_probe(struct platform_device *pdev)
         if (udc_info && udc_info->vbus_pin > 0) {
                 irq = s3c2410_gpio_getirq(udc_info->vbus_pin);
                 retval = request_irq(irq, s3c2410_udc_vbus_irq,
-                                IRQF_DISABLED | IRQF_TRIGGER_RISING
-                                | IRQF_TRIGGER_FALLING,
-                                gadget_name, udc);
+                                     IRQF_DISABLED | IRQF_TRIGGER_RISING
+                                     | IRQF_TRIGGER_FALLING | IRQF_SHARED,
+                                     gadget_name, udc);
 
                 if (retval != 0) {
                         dev_err(dev, "can't get vbus irq %i, err %d\n",
diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index 177e78ed241b..49a91c5ee51b 100644
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -156,7 +156,7 @@ config USB_OHCI_HCD_PCI
 
 config USB_OHCI_HCD_SSB
         bool "OHCI support for Broadcom SSB OHCI core"
-        depends on USB_OHCI_HCD && (SSB = y || SSB = CONFIG_USB_OHCI_HCD) && EXPERIMENTAL
+        depends on USB_OHCI_HCD && (SSB = y || SSB = USB_OHCI_HCD) && EXPERIMENTAL
         default n
         ---help---
           Support for the Sonics Silicon Backplane (SSB) attached
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index c1514442883e..5f2d74ed5ad7 100644
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -575,12 +575,15 @@ static int ehci_run (struct usb_hcd *hcd)
          * from the companions to the EHCI controller.  If any of the
          * companions are in the middle of a port reset at the time, it
          * could cause trouble.  Write-locking ehci_cf_port_reset_rwsem
-         * guarantees that no resets are in progress.
+         * guarantees that no resets are in progress.  After we set CF,
+         * a short delay lets the hardware catch up; new resets shouldn't
+         * be started before the port switching actions could complete.
          */
         down_write(&ehci_cf_port_reset_rwsem);
         hcd->state = HC_STATE_RUNNING;
         ehci_writel(ehci, FLAG_CF, &ehci->regs->configured_flag);
         ehci_readl(ehci, &ehci->regs->command); /* unblock posted writes */
+        msleep(5);
         up_write(&ehci_cf_port_reset_rwsem);
 
         temp = HC_VERSION(ehci_readl(ehci, &ehci->caps->hc_capbase));
diff --git a/drivers/usb/image/microtek.c b/drivers/usb/image/microtek.c
index 91e999c9f680..bc207e3c21f5 100644
--- a/drivers/usb/image/microtek.c
+++ b/drivers/usb/image/microtek.c
@@ -819,7 +819,7 @@ static int mts_usb_probe(struct usb_interface *intf,
                 goto out_kfree2;
 
         new_desc->host->hostdata[0] = (unsigned long)new_desc;
-        if (scsi_add_host(new_desc->host, NULL)) {
+        if (scsi_add_host(new_desc->host, &dev->dev)) {
                 err_retval = -EIO;
                 goto out_host_put;
         }
diff --git a/drivers/usb/misc/adutux.c b/drivers/usb/misc/adutux.c
index c567aa7a41ea..5a2c44e4c1f7 100644
--- a/drivers/usb/misc/adutux.c
+++ b/drivers/usb/misc/adutux.c
@@ -79,12 +79,22 @@ MODULE_DEVICE_TABLE(usb, device_table);
 
 #define COMMAND_TIMEOUT (2*HZ)  /* 60 second timeout for a command */
 
+/*
+ * The locking scheme is a vanilla 3-lock:
+ *   adu_device.buflock: A spinlock, covers what IRQs touch.
+ *   adutux_mutex:       A Static lock to cover open_count. It would also cover
+ *                       any globals, but we don't have them in 2.6.
+ *   adu_device.mtx:     A mutex to hold across sleepers like copy_from_user.
+ *                       It covers all of adu_device, except the open_count
+ *                       and what .buflock covers.
+ */
+
 /* Structure to hold all of our device specific stuff */
 struct adu_device {
-        struct mutex            mtx; /* locks this structure */
+        struct mutex            mtx;
         struct usb_device*      udev; /* save off the usb device pointer */
         struct usb_interface*   interface;
-        unsigned char           minor; /* the starting minor number for this device */
+        unsigned int            minor; /* the starting minor number for this device */
         char                    serial_number[8];
 
         int                     open_count; /* number of times this port has been opened */
@@ -107,8 +117,11 @@ struct adu_device {
         char*                   interrupt_out_buffer;
         struct usb_endpoint_descriptor* interrupt_out_endpoint;
         struct urb*             interrupt_out_urb;
+        int                     out_urb_finished;
 };
 
+static DEFINE_MUTEX(adutux_mutex);
+
 static struct usb_driver adu_driver;
 
 static void adu_debug_data(int level, const char *function, int size,
@@ -132,27 +145,31 @@ static void adu_debug_data(int level, const char *function, int size,
  */
 static void adu_abort_transfers(struct adu_device *dev)
 {
-        dbg(2," %s : enter", __FUNCTION__);
+        unsigned long flags;
 
-        if (dev == NULL) {
-                dbg(1," %s : dev is null", __FUNCTION__);
-                goto exit;
-        }
+        dbg(2," %s : enter", __FUNCTION__);
 
         if (dev->udev == NULL) {
                 dbg(1," %s : udev is null", __FUNCTION__);
                 goto exit;
         }
 
-        dbg(2," %s : udev state %d", __FUNCTION__, dev->udev->state);
-        if (dev->udev->state == USB_STATE_NOTATTACHED) {
-                dbg(1," %s : udev is not attached", __FUNCTION__);
-                goto exit;
-        }
-
         /* shutdown transfer */
-        usb_unlink_urb(dev->interrupt_in_urb);
-        usb_unlink_urb(dev->interrupt_out_urb);
+
+        /* XXX Anchor these instead */
+        spin_lock_irqsave(&dev->buflock, flags);
+        if (!dev->read_urb_finished) {
+                spin_unlock_irqrestore(&dev->buflock, flags);
+                usb_kill_urb(dev->interrupt_in_urb);
+        } else
+                spin_unlock_irqrestore(&dev->buflock, flags);
+
+        spin_lock_irqsave(&dev->buflock, flags);
+        if (!dev->out_urb_finished) {
+                spin_unlock_irqrestore(&dev->buflock, flags);
+                usb_kill_urb(dev->interrupt_out_urb);
+        } else
+                spin_unlock_irqrestore(&dev->buflock, flags);
 
 exit:
         dbg(2," %s : leave", __FUNCTION__);
@@ -162,8 +179,6 @@ static void adu_delete(struct adu_device *dev)
 {
         dbg(2, "%s enter", __FUNCTION__);
 
-        adu_abort_transfers(dev);
-
         /* free data structures */
         usb_free_urb(dev->interrupt_in_urb);
         usb_free_urb(dev->interrupt_out_urb);
@@ -239,7 +254,10 @@ static void adu_interrupt_out_callback(struct urb *urb)
                 goto exit;
         }
 
-        wake_up_interruptible(&dev->write_wait);
+        spin_lock(&dev->buflock);
+        dev->out_urb_finished = 1;
+        wake_up(&dev->write_wait);
+        spin_unlock(&dev->buflock);
 exit:
 
         adu_debug_data(5, __FUNCTION__, urb->actual_length,
@@ -252,12 +270,17 @@ static int adu_open(struct inode *inode, struct file *file)
         struct adu_device *dev = NULL;
         struct usb_interface *interface;
         int subminor;
-        int retval = 0;
+        int retval;
 
         dbg(2,"%s : enter", __FUNCTION__);
 
         subminor = iminor(inode);
 
+        if ((retval = mutex_lock_interruptible(&adutux_mutex))) {
+                dbg(2, "%s : mutex lock failed", __FUNCTION__);
+                goto exit_no_lock;
+        }
+
         interface = usb_find_interface(&adu_driver, subminor);
         if (!interface) {
                 err("%s - error, can't find device for minor %d",
@@ -267,54 +290,54 @@ static int adu_open(struct inode *inode, struct file *file)
         }
 
         dev = usb_get_intfdata(interface);
-        if (!dev) {
+        if (!dev || !dev->udev) {
                 retval = -ENODEV;
                 goto exit_no_device;
         }
 
-        /* lock this device */
-        if ((retval = mutex_lock_interruptible(&dev->mtx))) {
-                dbg(2, "%s : mutex lock failed", __FUNCTION__);
+        /* check that nobody else is using the device */
+        if (dev->open_count) {
+                retval = -EBUSY;
                 goto exit_no_device;
         }
 
-        /* increment our usage count for the device */
         ++dev->open_count;
         dbg(2,"%s : open count %d", __FUNCTION__, dev->open_count);
 
         /* save device in the file's private structure */
         file->private_data = dev;
 
-        if (dev->open_count == 1) {
-                /* initialize in direction */
-                dev->read_buffer_length = 0;
+        /* initialize in direction */
+        dev->read_buffer_length = 0;
 
-                /* fixup first read by having urb waiting for it */
-                usb_fill_int_urb(dev->interrupt_in_urb,dev->udev,
-                                 usb_rcvintpipe(dev->udev,
-                                                dev->interrupt_in_endpoint->bEndpointAddress),
-                                 dev->interrupt_in_buffer,
-                                 le16_to_cpu(dev->interrupt_in_endpoint->wMaxPacketSize),
-                                 adu_interrupt_in_callback, dev,
-                                 dev->interrupt_in_endpoint->bInterval);
-                /* dev->interrupt_in_urb->transfer_flags |= URB_ASYNC_UNLINK; */
-                dev->read_urb_finished = 0;
-                retval = usb_submit_urb(dev->interrupt_in_urb, GFP_KERNEL);
-                if (retval)
-                        --dev->open_count;
-        }
-        mutex_unlock(&dev->mtx);
+        /* fixup first read by having urb waiting for it */
+        usb_fill_int_urb(dev->interrupt_in_urb,dev->udev,
+                         usb_rcvintpipe(dev->udev,
+                                        dev->interrupt_in_endpoint->bEndpointAddress),
+                         dev->interrupt_in_buffer,
+                         le16_to_cpu(dev->interrupt_in_endpoint->wMaxPacketSize),
+                         adu_interrupt_in_callback, dev,
+                         dev->interrupt_in_endpoint->bInterval);
+        dev->read_urb_finished = 0;
+        if (usb_submit_urb(dev->interrupt_in_urb, GFP_KERNEL))
+                dev->read_urb_finished = 1;
+        /* we ignore failure */
+        /* end of fixup for first read */
+
+        /* initialize out direction */
+        dev->out_urb_finished = 1;
+
+        retval = 0;
 
 exit_no_device:
+        mutex_unlock(&adutux_mutex);
+exit_no_lock:
         dbg(2,"%s : leave, return value %d ", __FUNCTION__, retval);
-
         return retval;
 }
 
-static int adu_release_internal(struct adu_device *dev)
+static void adu_release_internal(struct adu_device *dev)
 {
-        int retval = 0;
-
         dbg(2," %s : enter", __FUNCTION__);
 
         /* decrement our usage count for the device */
@@ -326,12 +349,11 @@ static int adu_release_internal(struct adu_device *dev)
         }
 
         dbg(2," %s : leave", __FUNCTION__);
-        return retval;
 }
 
 static int adu_release(struct inode *inode, struct file *file)
 {
-        struct adu_device *dev = NULL;
+        struct adu_device *dev;
         int retval = 0;
 
         dbg(2," %s : enter", __FUNCTION__);
@@ -343,15 +365,13 @@ static int adu_release(struct inode *inode, struct file *file)
         }
 
         dev = file->private_data;
-
         if (dev == NULL) {
                 dbg(1," %s : object is NULL", __FUNCTION__);
                 retval = -ENODEV;
                 goto exit;
         }
 
-        /* lock our device */
-        mutex_lock(&dev->mtx); /* not interruptible */
+        mutex_lock(&adutux_mutex); /* not interruptible */
 
         if (dev->open_count <= 0) {
                 dbg(1," %s : device not opened", __FUNCTION__);
@@ -359,19 +379,15 @@ static int adu_release(struct inode *inode, struct file *file)
                 goto exit;
         }
 
+        adu_release_internal(dev);
         if (dev->udev == NULL) {
                 /* the device was unplugged before the file was released */
-                mutex_unlock(&dev->mtx);
-                adu_delete(dev);
-                dev = NULL;
-        } else {
-                /* do the work */
-                retval = adu_release_internal(dev);
+                if (!dev->open_count)   /* ... and we're the last user */
+                        adu_delete(dev);
         }
 
 exit:
-        if (dev)
-                mutex_unlock(&dev->mtx);
+        mutex_unlock(&adutux_mutex);
         dbg(2," %s : leave, return value %d", __FUNCTION__, retval);
         return retval;
 }
@@ -393,12 +409,12 @@ static ssize_t adu_read(struct file *file, __user char *buffer, size_t count,
 
         dev = file->private_data;
         dbg(2," %s : dev=%p", __FUNCTION__, dev);
-        /* lock this object */
+
         if (mutex_lock_interruptible(&dev->mtx))
                 return -ERESTARTSYS;
 
         /* verify that the device wasn't unplugged */
-        if (dev->udev == NULL || dev->minor == 0) {
+        if (dev->udev == NULL) {
                 retval = -ENODEV;
                 err("No device or device unplugged %d", retval);
                 goto exit;
@@ -452,7 +468,7 @@ static ssize_t adu_read(struct file *file, __user char *buffer, size_t count,
                                 should_submit = 1;
                         } else {
                                 /* even the primary was empty - we may need to do IO */
-                                if (dev->interrupt_in_urb->status == -EINPROGRESS) {
+                                if (!dev->read_urb_finished) {
                                         /* somebody is doing IO */
                                         spin_unlock_irqrestore(&dev->buflock, flags);
                                         dbg(2," %s : submitted already", __FUNCTION__);
@@ -460,6 +476,7 @@ static ssize_t adu_read(struct file *file, __user char *buffer, size_t count,
                                         /* we must initiate input */
                                         dbg(2," %s : initiate input", __FUNCTION__);
                                         dev->read_urb_finished = 0;
+                                        spin_unlock_irqrestore(&dev->buflock, flags);
 
                                         usb_fill_int_urb(dev->interrupt_in_urb,dev->udev,
                                                          usb_rcvintpipe(dev->udev,
@@ -469,15 +486,12 @@ static ssize_t adu_read(struct file *file, __user char *buffer, size_t count,
                                                          adu_interrupt_in_callback,
                                                          dev,
                                                          dev->interrupt_in_endpoint->bInterval);
-                                        retval = usb_submit_urb(dev->interrupt_in_urb, GFP_ATOMIC);
-                                        if (!retval) {
-                                                spin_unlock_irqrestore(&dev->buflock, flags);
-                                                dbg(2," %s : submitted OK", __FUNCTION__);
-                                        } else {
+                                        retval = usb_submit_urb(dev->interrupt_in_urb, GFP_KERNEL);
+                                        if (retval) {
+                                                dev->read_urb_finished = 1;
                                                 if (retval == -ENOMEM) {
                                                         retval = bytes_read ? bytes_read : -ENOMEM;
                                                 }
-                                                spin_unlock_irqrestore(&dev->buflock, flags);
                                                 dbg(2," %s : submit failed", __FUNCTION__);
                                                 goto exit;
                                         }
@@ -486,10 +500,14 @@ static ssize_t adu_read(struct file *file, __user char *buffer, size_t count,
                                 /* we wait for I/O to complete */
                                 set_current_state(TASK_INTERRUPTIBLE);
                                 add_wait_queue(&dev->read_wait, &wait);
-                                if (!dev->read_urb_finished)
+                                spin_lock_irqsave(&dev->buflock, flags);
+                                if (!dev->read_urb_finished) {
+                                        spin_unlock_irqrestore(&dev->buflock, flags);
                                         timeout = schedule_timeout(COMMAND_TIMEOUT);
-                                else
+                                } else {
+                                        spin_unlock_irqrestore(&dev->buflock, flags);
                                         set_current_state(TASK_RUNNING);
+                                }
                                 remove_wait_queue(&dev->read_wait, &wait);
 
                                 if (timeout <= 0) {
@@ -509,19 +527,23 @@ static ssize_t adu_read(struct file *file, __user char *buffer, size_t count,
 
         retval = bytes_read;
         /* if the primary buffer is empty then use it */
-        if (should_submit && !dev->interrupt_in_urb->status==-EINPROGRESS) {
+        spin_lock_irqsave(&dev->buflock, flags);
+        if (should_submit && dev->read_urb_finished) {
+                dev->read_urb_finished = 0;
+                spin_unlock_irqrestore(&dev->buflock, flags);
                 usb_fill_int_urb(dev->interrupt_in_urb,dev->udev,
                                  usb_rcvintpipe(dev->udev,
                                                 dev->interrupt_in_endpoint->bEndpointAddress),
-                                                dev->interrupt_in_buffer,
-                                                le16_to_cpu(dev->interrupt_in_endpoint->wMaxPacketSize),
-                                                adu_interrupt_in_callback,
-                                                dev,
-                                                dev->interrupt_in_endpoint->bInterval);
-                /* dev->interrupt_in_urb->transfer_flags |= URB_ASYNC_UNLINK; */
-                dev->read_urb_finished = 0;
-                usb_submit_urb(dev->interrupt_in_urb, GFP_KERNEL);
+                                dev->interrupt_in_buffer,
+                                le16_to_cpu(dev->interrupt_in_endpoint->wMaxPacketSize),
+                                adu_interrupt_in_callback,
+                                dev,
+                                dev->interrupt_in_endpoint->bInterval);
+                if (usb_submit_urb(dev->interrupt_in_urb, GFP_KERNEL) != 0)
+                        dev->read_urb_finished = 1;
                 /* we ignore failure */
+        } else {
+                spin_unlock_irqrestore(&dev->buflock, flags);
         }
 
 exit:
@@ -535,24 +557,24 @@ exit:
 static ssize_t adu_write(struct file *file, const __user char *buffer,
                          size_t count, loff_t *ppos)
 {
+        DECLARE_WAITQUEUE(waita, current);
         struct adu_device *dev;
         size_t bytes_written = 0;
         size_t bytes_to_write;
         size_t buffer_size;
+        unsigned long flags;
         int retval;
-        int timeout = 0;
 
         dbg(2," %s : enter, count = %Zd", __FUNCTION__, count);
 
         dev = file->private_data;
 
-        /* lock this object */
         retval = mutex_lock_interruptible(&dev->mtx);
         if (retval)
                 goto exit_nolock;
 
         /* verify that the device wasn't unplugged */
-        if (dev->udev == NULL || dev->minor == 0) {
+        if (dev->udev == NULL) {
                 retval = -ENODEV;
                 err("No device or device unplugged %d", retval);
                 goto exit;
@@ -564,42 +586,37 @@ static ssize_t adu_write(struct file *file, const __user char *buffer,
                 goto exit;
         }
 
-
         while (count > 0) {
-                if (dev->interrupt_out_urb->status == -EINPROGRESS) {
-                        timeout = COMMAND_TIMEOUT;
+                add_wait_queue(&dev->write_wait, &waita);
+                set_current_state(TASK_INTERRUPTIBLE);
+                spin_lock_irqsave(&dev->buflock, flags);
+                if (!dev->out_urb_finished) {
+                        spin_unlock_irqrestore(&dev->buflock, flags);
 
-                        while (timeout > 0) {
-                                if (signal_pending(current)) {
+                        mutex_unlock(&dev->mtx);
+                        if (signal_pending(current)) {
                                 dbg(1," %s : interrupted", __FUNCTION__);
+                                set_current_state(TASK_RUNNING);
                                 retval = -EINTR;
-                                goto exit;
+                                goto exit_onqueue;
                         }
-                        mutex_unlock(&dev->mtx);
-                        timeout = interruptible_sleep_on_timeout(&dev->write_wait, timeout);
+                        if (schedule_timeout(COMMAND_TIMEOUT) == 0) {
+                                dbg(1, "%s - command timed out.", __FUNCTION__);
+                                retval = -ETIMEDOUT;
+                                goto exit_onqueue;
+                        }
+                        remove_wait_queue(&dev->write_wait, &waita);
                         retval = mutex_lock_interruptible(&dev->mtx);
                         if (retval) {
                                 retval = bytes_written ? bytes_written : retval;
                                 goto exit_nolock;
                         }
-                        if (timeout > 0) {
-                                break;
-                        }
-                        dbg(1," %s : interrupted timeout: %d", __FUNCTION__, timeout);
-                }
-
-
-                dbg(1," %s : final timeout: %d", __FUNCTION__, timeout);
-
-                if (timeout == 0) {
-                        dbg(1, "%s - command timed out.", __FUNCTION__);
-                        retval = -ETIMEDOUT;
-                        goto exit;
-                }
-
-                dbg(4," %s : in progress, count = %Zd", __FUNCTION__, count);
 
+                        dbg(4," %s : in progress, count = %Zd", __FUNCTION__, count);
                 } else {
+                        spin_unlock_irqrestore(&dev->buflock, flags);
+                        set_current_state(TASK_RUNNING);
+                        remove_wait_queue(&dev->write_wait, &waita);
                         dbg(4," %s : sending, count = %Zd", __FUNCTION__, count);
 
                         /* write the data into interrupt_out_buffer from userspace */
@@ -622,11 +639,12 @@ static ssize_t adu_write(struct file *file, const __user char *buffer,
                                 bytes_to_write,
                                 adu_interrupt_out_callback,
                                 dev,
-                                dev->interrupt_in_endpoint->bInterval);
-                        /* dev->interrupt_in_urb->transfer_flags |= URB_ASYNC_UNLINK; */
+                                dev->interrupt_out_endpoint->bInterval);
                         dev->interrupt_out_urb->actual_length = bytes_to_write;
+                        dev->out_urb_finished = 0;
                         retval = usb_submit_urb(dev->interrupt_out_urb, GFP_KERNEL);
                         if (retval < 0) {
+                                dev->out_urb_finished = 1;
                                 err("Couldn't submit interrupt_out_urb %d", retval);
                                 goto exit;
                         }
@@ -637,16 +655,17 @@ static ssize_t adu_write(struct file *file, const __user char *buffer,
                         bytes_written += bytes_to_write;
                 }
         }
-
-        retval = bytes_written;
+        mutex_unlock(&dev->mtx);
+        return bytes_written;
 
 exit:
-        /* unlock the device */
         mutex_unlock(&dev->mtx);
 exit_nolock:
-
         dbg(2," %s : leave, return value %d", __FUNCTION__, retval);
+        return retval;
 
+exit_onqueue:
+        remove_wait_queue(&dev->write_wait, &waita);
         return retval;
 }
 
@@ -831,25 +850,22 @@ static void adu_disconnect(struct usb_interface *interface)
         dbg(2," %s : enter", __FUNCTION__);
 
         dev = usb_get_intfdata(interface);
-        usb_set_intfdata(interface, NULL);
 
+        mutex_lock(&dev->mtx);  /* not interruptible */
+        dev->udev = NULL;       /* poison */
         minor = dev->minor;
-
-        /* give back our minor */
         usb_deregister_dev(interface, &adu_class);
-        dev->minor = 0;
+        mutex_unlock(&dev->mtx);
 
-        mutex_lock(&dev->mtx); /* not interruptible */
+        mutex_lock(&adutux_mutex);
+        usb_set_intfdata(interface, NULL);
 
         /* if the device is not opened, then we clean up right now */
         dbg(2," %s : open count %d", __FUNCTION__, dev->open_count);
-        if (!dev->open_count) {
-                mutex_unlock(&dev->mtx);
+        if (!dev->open_count)
                 adu_delete(dev);
-        } else {
-                dev->udev = NULL;
-                mutex_unlock(&dev->mtx);
-        }
+
+        mutex_unlock(&adutux_mutex);
 
         dev_info(&interface->dev, "ADU device adutux%d now disconnected\n",
                  (minor - ADU_MINOR_BASE));
diff --git a/drivers/usb/misc/usbled.c b/drivers/usb/misc/usbled.c
index 49c5c5c4c431..06cb71942dc7 100644
--- a/drivers/usb/misc/usbled.c
+++ b/drivers/usb/misc/usbled.c
@@ -144,12 +144,14 @@ static void led_disconnect(struct usb_interface *interface)
         struct usb_led *dev;
 
         dev = usb_get_intfdata (interface);
-        usb_set_intfdata (interface, NULL);
 
         device_remove_file(&interface->dev, &dev_attr_blue);
         device_remove_file(&interface->dev, &dev_attr_red);
         device_remove_file(&interface->dev, &dev_attr_green);
 
+        /* first remove the files, then set the pointer to NULL */
+        usb_set_intfdata (interface, NULL);
+
         usb_put_dev(dev->udev);
 
         kfree(dev);
diff --git a/drivers/usb/serial/generic.c b/drivers/usb/serial/generic.c
index 9eb4a65ee4d9..d41531139c55 100644
--- a/drivers/usb/serial/generic.c
+++ b/drivers/usb/serial/generic.c
@@ -327,6 +327,7 @@ void usb_serial_generic_read_bulk_callback (struct urb *urb)
         struct usb_serial_port *port = (struct usb_serial_port *)urb->context;
         unsigned char *data = urb->transfer_buffer;
         int status = urb->status;
+        unsigned long flags;
 
         dbg("%s - port %d", __FUNCTION__, port->number);
 
@@ -339,11 +340,11 @@ void usb_serial_generic_read_bulk_callback (struct urb *urb)
         usb_serial_debug_data(debug, &port->dev, __FUNCTION__, urb->actual_length, data);
 
         /* Throttle the device if requested by tty */
-        spin_lock(&port->lock);
+        spin_lock_irqsave(&port->lock, flags);
         if (!(port->throttled = port->throttle_req))
                 /* Handle data and continue reading from device */
                 flush_and_resubmit_read_urb(port);
-        spin_unlock(&port->lock);
+        spin_unlock_irqrestore(&port->lock, flags);
 }
 EXPORT_SYMBOL_GPL(usb_serial_generic_read_bulk_callback);
 
diff --git a/drivers/usb/serial/keyspan.c b/drivers/usb/serial/keyspan.c
index 1f7ab15df36d..feba9679ace8 100644
--- a/drivers/usb/serial/keyspan.c
+++ b/drivers/usb/serial/keyspan.c
@@ -1215,12 +1215,14 @@ static int keyspan_chars_in_buffer (struct usb_serial_port *port)
 
 static int keyspan_open (struct usb_serial_port *port, struct file *filp)
 {
-        struct keyspan_port_private     *p_priv;
-        struct keyspan_serial_private   *s_priv;
-        struct usb_serial               *serial = port->serial;
+        struct keyspan_port_private     *p_priv;
+        struct keyspan_serial_private   *s_priv;
+        struct usb_serial               *serial = port->serial;
         const struct keyspan_device_details     *d_details;
         int                             i, err;
+        int                             baud_rate, device_port;
         struct urb                      *urb;
+        unsigned int                    cflag;
 
         s_priv = usb_get_serial_data(serial);
         p_priv = usb_get_serial_port_data(port);
@@ -1263,6 +1265,30 @@ static int keyspan_open (struct usb_serial_port *port, struct file *filp)
                 /* usb_settoggle(urb->dev, usb_pipeendpoint(urb->pipe), usb_pipeout(urb->pipe), 0); */
         }
 
+        /* get the terminal config for the setup message now so we don't
+         * need to send 2 of them */
+
+        cflag = port->tty->termios->c_cflag;
+        device_port = port->number - port->serial->minor;
+
+        /* Baud rate calculation takes baud rate as an integer
+           so other rates can be generated if desired. */
+        baud_rate = tty_get_baud_rate(port->tty);
+        /* If no match or invalid, leave as default */
+        if (baud_rate >= 0
+            && d_details->calculate_baud_rate(baud_rate, d_details->baudclk,
+                                NULL, NULL, NULL, device_port) == KEYSPAN_BAUD_RATE_OK) {
+                p_priv->baud = baud_rate;
+        }
+
+        /* set CTS/RTS handshake etc. */
+        p_priv->cflag = cflag;
+        p_priv->flow_control = (cflag & CRTSCTS)? flow_cts: flow_none;
+
+        keyspan_send_setup(port, 1);
+        //mdelay(100);
+        //keyspan_set_termios(port, NULL);
+
         return (0);
 }
 
diff --git a/drivers/usb/serial/mos7840.c b/drivers/usb/serial/mos7840.c
index a5ced7e08cbf..c29c91271133 100644
--- a/drivers/usb/serial/mos7840.c
+++ b/drivers/usb/serial/mos7840.c
@@ -2711,7 +2711,7 @@ static int mos7840_startup(struct usb_serial *serial)
         status = mos7840_set_reg_sync(serial->port[0], ZLP_REG5, Data);
         if (status < 0) {
                 dbg("Writing ZLP_REG5 failed status-0x%x\n", status);
-                return -1;
+                goto error;
         } else
                 dbg("ZLP_REG5 Writing success status%d\n", status);
 
diff --git a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c
index 2cd3f1d4b687..cf8add91de05 100644
--- a/drivers/usb/serial/pl2303.c
+++ b/drivers/usb/serial/pl2303.c
@@ -86,6 +86,7 @@ static struct usb_device_id id_table [] = {
         { USB_DEVICE(ALCOR_VENDOR_ID, ALCOR_PRODUCT_ID) },
         { USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_ID) },
         { USB_DEVICE(WS002IN_VENDOR_ID, WS002IN_PRODUCT_ID) },
+        { USB_DEVICE(COREGA_VENDOR_ID, COREGA_PRODUCT_ID) },
         { }                                     /* Terminating entry */
 };
 
diff --git a/drivers/usb/serial/pl2303.h b/drivers/usb/serial/pl2303.h
index ed603e3decd6..d31f5d299989 100644
--- a/drivers/usb/serial/pl2303.h
+++ b/drivers/usb/serial/pl2303.h
@@ -104,3 +104,6 @@
 #define WS002IN_VENDOR_ID       0x11f6
 #define WS002IN_PRODUCT_ID      0x2001
 
+/* Corega CG-USBRS232R Serial Adapter */
+#define COREGA_VENDOR_ID        0x07aa
+#define COREGA_PRODUCT_ID       0x002a
diff --git a/drivers/usb/serial/sierra.c b/drivers/usb/serial/sierra.c
index 833f6e1e3721..605ebccdcd51 100644
--- a/drivers/usb/serial/sierra.c
+++ b/drivers/usb/serial/sierra.c
@@ -136,6 +136,8 @@ static struct usb_device_id id_table_3port [] = {
         { USB_DEVICE(0x0f30, 0x1b1d) }, /* Sierra Wireless MC5720 */
         { USB_DEVICE(0x1199, 0x0218) }, /* Sierra Wireless MC5720 */
         { USB_DEVICE(0x1199, 0x0020) }, /* Sierra Wireless MC5725 */
+        { USB_DEVICE(0x1199, 0x0220) }, /* Sierra Wireless MC5725 */
+        { USB_DEVICE(0x1199, 0x0220) }, /* Sierra Wireless MC5725 */
         { USB_DEVICE(0x1199, 0x0019) }, /* Sierra Wireless AirCard 595 */
         { USB_DEVICE(0x1199, 0x0021) }, /* Sierra Wireless AirCard 597E */
         { USB_DEVICE(0x1199, 0x0120) }, /* Sierra Wireless USB Dongle 595U*/
diff --git a/drivers/usb/storage/scsiglue.c b/drivers/usb/storage/scsiglue.c
index 1ba19eaa1970..836a34ae6ec6 100644
--- a/drivers/usb/storage/scsiglue.c
+++ b/drivers/usb/storage/scsiglue.c
@@ -177,6 +177,10 @@ static int slave_configure(struct scsi_device *sdev)
                  * is an occasional series of retries that will all fail. */
                 sdev->retry_hwerror = 1;
 
+                /* USB disks should allow restart.  Some drives spin down
+                 * automatically, requiring a START-STOP UNIT command. */
+                sdev->allow_restart = 1;
+
         } else {
 
                 /* Non-disk-type devices don't need to blacklist any pages
diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
index 22ab2380367d..2c27721bd259 100644
--- a/drivers/usb/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h
@@ -342,11 +342,11 @@ UNUSUAL_DEV(  0x04b0, 0x040d, 0x0100, 0x0100,
                 US_FL_FIX_CAPACITY),
 
 /* Reported by Graber and Mike Pagano <mpagano-kernel@mpagano.com> */
-UNUSUAL_DEV(  0x04b0, 0x040f, 0x0200, 0x0200,
-       "NIKON",
-       "NIKON DSC D200",
-       US_SC_DEVICE, US_PR_DEVICE, NULL,
-       US_FL_FIX_CAPACITY),
+UNUSUAL_DEV(  0x04b0, 0x040f, 0x0100, 0x0200,
+                "NIKON",
+                "NIKON DSC D200",
+                US_SC_DEVICE, US_PR_DEVICE, NULL,
+                US_FL_FIX_CAPACITY),
 
 /* Reported by Emil Larsson <emil@swip.net> */
 UNUSUAL_DEV(  0x04b0, 0x0411, 0x0100, 0x0101,
@@ -731,6 +731,13 @@ UNUSUAL_DEV(  0x0584, 0x0008, 0x0102, 0x0102,
                 US_SC_SCSI, US_PR_ALAUDA, init_alauda, 0 ),
 #endif
 
+/* Reported by RTE <raszilki@yandex.ru> */
+UNUSUAL_DEV(  0x058f, 0x6387, 0x0141, 0x0141,
+                "JetFlash",
+                "TS1GJF2A/120",
+                US_SC_DEVICE, US_PR_DEVICE, NULL,
+                US_FL_MAX_SECTORS_64 ),
+
 /* Fabrizio Fellini <fello@libero.it> */
 UNUSUAL_DEV(  0x0595, 0x4343, 0x0000, 0x2210,
                 "Fujifilm",
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 7d86e9eae915..5b3dbcfcda48 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -641,6 +641,17 @@ config FB_VESA
           You will get a boot time penguin logo at no additional cost. Please
           read <file:Documentation/fb/vesafb.txt>. If unsure, say Y.
 
+config FB_EFI
+        bool "EFI-based Framebuffer Support"
+        depends on (FB = y) && X86
+        select FB_CFB_FILLRECT
+        select FB_CFB_COPYAREA
+        select FB_CFB_IMAGEBLIT
+        help
+          This is the EFI frame buffer device driver. If the firmware on
+          your platform is UEFI2.0, select Y to add support for
+          Graphics Output Protocol for early console messages to appear.
+
 config FB_IMAC
         bool "Intel-based Macintosh Framebuffer Support"
         depends on (FB = y) && X86 && EFI
diff --git a/drivers/video/Makefile b/drivers/video/Makefile
index 59d6c45a910d..83e02b3429b6 100644
--- a/drivers/video/Makefile
+++ b/drivers/video/Makefile
@@ -118,6 +118,7 @@ obj-$(CONFIG_FB_OMAP)             += omap/
 obj-$(CONFIG_FB_UVESA)            += uvesafb.o
 obj-$(CONFIG_FB_VESA)             += vesafb.o
 obj-$(CONFIG_FB_IMAC)             += imacfb.o
+obj-$(CONFIG_FB_EFI)              += efifb.o
 obj-$(CONFIG_FB_VGA16)            += vga16fb.o
 obj-$(CONFIG_FB_OF)               += offb.o
 obj-$(CONFIG_FB_BF54X_LQ043)      += bf54x-lq043fb.o
diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c
index 235b618b4117..11a3a222dfc3 100644
--- a/drivers/video/atmel_lcdfb.c
+++ b/drivers/video/atmel_lcdfb.c
@@ -268,6 +268,10 @@ static int atmel_lcdfb_set_par(struct fb_info *info)
         /* Turn off the LCD controller and the DMA controller */
         lcdc_writel(sinfo, ATMEL_LCDC_PWRCON, sinfo->guard_time << ATMEL_LCDC_GUARDT_OFFSET);
 
+        /* Wait for the LCDC core to become idle */
+        while (lcdc_readl(sinfo, ATMEL_LCDC_PWRCON) & ATMEL_LCDC_BUSY)
+                msleep(10);
+
         lcdc_writel(sinfo, ATMEL_LCDC_DMACON, 0);
 
         if (info->var.bits_per_pixel == 1)
diff --git a/drivers/video/aty/radeon_base.c b/drivers/video/aty/radeon_base.c
index 1e32b3d13f2e..62867cb63fef 100644
--- a/drivers/video/aty/radeon_base.c
+++ b/drivers/video/aty/radeon_base.c
@@ -202,6 +202,7 @@ static struct pci_device_id radeonfb_pci_table[] = {
         CHIP_DEF(PCI_CHIP_RV380_3154,   RV380,  CHIP_HAS_CRTC2 | CHIP_IS_MOBILITY),
         CHIP_DEF(PCI_CHIP_RV370_5B60,   RV380,  CHIP_HAS_CRTC2),
         CHIP_DEF(PCI_CHIP_RV370_5B62,   RV380,  CHIP_HAS_CRTC2),
+        CHIP_DEF(PCI_CHIP_RV370_5B63,   RV380,  CHIP_HAS_CRTC2),
         CHIP_DEF(PCI_CHIP_RV370_5B64,   RV380,  CHIP_HAS_CRTC2),
         CHIP_DEF(PCI_CHIP_RV370_5B65,   RV380,  CHIP_HAS_CRTC2),
         CHIP_DEF(PCI_CHIP_RV370_5460,   RV380,  CHIP_HAS_CRTC2 | CHIP_IS_MOBILITY),
diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig
index 267422f66255..b87ed37ac0c1 100644
--- a/drivers/video/console/Kconfig
+++ b/drivers/video/console/Kconfig
@@ -6,7 +6,7 @@ menu "Console display driver support"
 
 config VGA_CONSOLE
         bool "VGA text console" if EMBEDDED || !X86
-        depends on !ARCH_ACORN && !ARCH_EBSA110 && !4xx && !8xx && !SPARC && !M68K && !PARISC && !FRV && !ARCH_VERSATILE && !SUPERH && !BFIN
+        depends on !ARCH_ACORN && !ARCH_EBSA110 && !4xx && !8xx && !SPARC && !M68K && !PARISC && !FRV && !ARCH_VERSATILE && !SUPERH && !BLACKFIN
         default y
         help
           Saying Y here will allow you to use Linux in text mode through a
diff --git a/drivers/video/efifb.c b/drivers/video/efifb.c
new file mode 100644
index 000000000000..bd779ae44b1e
--- /dev/null
+++ b/drivers/video/efifb.c
@@ -0,0 +1,232 @@
+/*
+ * Framebuffer driver for EFI/UEFI based system
+ *
+ * (c) 2006 Edgar Hucek <gimli@dark-green.com>
+ * Original efi driver written by Gerd Knorr <kraxel@goldbach.in-berlin.de>
+ *
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/errno.h>
+#include <linux/fb.h>
+#include <linux/platform_device.h>
+#include <linux/screen_info.h>
+
+#include <video/vga.h>
+
+static struct fb_var_screeninfo efifb_defined __initdata = {
+        .activate               = FB_ACTIVATE_NOW,
+        .height                 = -1,
+        .width                  = -1,
+        .right_margin           = 32,
+        .upper_margin           = 16,
+        .lower_margin           = 4,
+        .vsync_len              = 4,
+        .vmode                  = FB_VMODE_NONINTERLACED,
+};
+
+static struct fb_fix_screeninfo efifb_fix __initdata = {
+        .id                     = "EFI VGA",
+        .type                   = FB_TYPE_PACKED_PIXELS,
+        .accel                  = FB_ACCEL_NONE,
+        .visual                 = FB_VISUAL_TRUECOLOR,
+};
+
+static int efifb_setcolreg(unsigned regno, unsigned red, unsigned green,
+                           unsigned blue, unsigned transp,
+                           struct fb_info *info)
+{
+        /*
+         *  Set a single color register. The values supplied are
+         *  already rounded down to the hardware's capabilities
+         *  (according to the entries in the `var' structure). Return
+         *  != 0 for invalid regno.
+         */
+
+        if (regno >= info->cmap.len)
+                return 1;
+
+        if (regno < 16) {
+                red   >>= 8;
+                green >>= 8;
+                blue  >>= 8;
+                ((u32 *)(info->pseudo_palette))[regno] =
+                        (red   << info->var.red.offset)   |
+                        (green << info->var.green.offset) |
+                        (blue  << info->var.blue.offset);
+        }
+        return 0;
+}
+
+static struct fb_ops efifb_ops = {
+        .owner          = THIS_MODULE,
+        .fb_setcolreg   = efifb_setcolreg,
+        .fb_fillrect    = cfb_fillrect,
+        .fb_copyarea    = cfb_copyarea,
+        .fb_imageblit   = cfb_imageblit,
+};
+
+static int __init efifb_probe(struct platform_device *dev)
+{
+        struct fb_info *info;
+        int err;
+        unsigned int size_vmode;
+        unsigned int size_remap;
+        unsigned int size_total;
+
+        efifb_fix.smem_start = screen_info.lfb_base;
+        efifb_defined.bits_per_pixel = screen_info.lfb_depth;
+        efifb_defined.xres = screen_info.lfb_width;
+        efifb_defined.yres = screen_info.lfb_height;
+        efifb_fix.line_length = screen_info.lfb_linelength;
+
+        /*   size_vmode -- that is the amount of memory needed for the
+         *                 used video mode, i.e. the minimum amount of
+         *                 memory we need. */
+        size_vmode = efifb_defined.yres * efifb_fix.line_length;
+
+        /*   size_total -- all video memory we have. Used for
+         *                 entries, ressource allocation and bounds
+         *                 checking. */
+        size_total = screen_info.lfb_size;
+        if (size_total < size_vmode)
+                size_total = size_vmode;
+
+        /*   size_remap -- the amount of video memory we are going to
+         *                 use for efifb.  With modern cards it is no
+         *                 option to simply use size_total as that
+         *                 wastes plenty of kernel address space. */
+        size_remap  = size_vmode * 2;
+        if (size_remap < size_vmode)
+                size_remap = size_vmode;
+        if (size_remap > size_total)
+                size_remap = size_total;
+        efifb_fix.smem_len = size_remap;
+
+        if (!request_mem_region(efifb_fix.smem_start, size_total, "efifb"))
+                /* We cannot make this fatal. Sometimes this comes from magic
+                   spaces our resource handlers simply don't know about */
+                printk(KERN_WARNING
+                       "efifb: cannot reserve video memory at 0x%lx\n",
+                        efifb_fix.smem_start);
+
+        info = framebuffer_alloc(sizeof(u32) * 16, &dev->dev);
+        if (!info) {
+                err = -ENOMEM;
+                goto err_release_mem;
+        }
+        info->pseudo_palette = info->par;
+        info->par = NULL;
+
+        info->screen_base = ioremap(efifb_fix.smem_start, efifb_fix.smem_len);
+        if (!info->screen_base) {
+                printk(KERN_ERR "efifb: abort, cannot ioremap video memory "
+                                "0x%x @ 0x%lx\n",
+                        efifb_fix.smem_len, efifb_fix.smem_start);
+                err = -EIO;
+                goto err_unmap;
+        }
+
+        printk(KERN_INFO "efifb: framebuffer at 0x%lx, mapped to 0x%p, "
+               "using %dk, total %dk\n",
+               efifb_fix.smem_start, info->screen_base,
+               size_remap/1024, size_total/1024);
+        printk(KERN_INFO "efifb: mode is %dx%dx%d, linelength=%d, pages=%d\n",
+               efifb_defined.xres, efifb_defined.yres,
+               efifb_defined.bits_per_pixel, efifb_fix.line_length,
+               screen_info.pages);
+
+        efifb_defined.xres_virtual = efifb_defined.xres;
+        efifb_defined.yres_virtual = efifb_fix.smem_len /
+                                        efifb_fix.line_length;
+        printk(KERN_INFO "efifb: scrolling: redraw\n");
+        efifb_defined.yres_virtual = efifb_defined.yres;
+
+        /* some dummy values for timing to make fbset happy */
+        efifb_defined.pixclock     = 10000000 / efifb_defined.xres *
+                                        1000 / efifb_defined.yres;
+        efifb_defined.left_margin  = (efifb_defined.xres / 8) & 0xf8;
+        efifb_defined.hsync_len    = (efifb_defined.xres / 8) & 0xf8;
+
+        efifb_defined.red.offset    = screen_info.red_pos;
+        efifb_defined.red.length    = screen_info.red_size;
+        efifb_defined.green.offset  = screen_info.green_pos;
+        efifb_defined.green.length  = screen_info.green_size;
+        efifb_defined.blue.offset   = screen_info.blue_pos;
+        efifb_defined.blue.length   = screen_info.blue_size;
+        efifb_defined.transp.offset = screen_info.rsvd_pos;
+        efifb_defined.transp.length = screen_info.rsvd_size;
+
+        printk(KERN_INFO "efifb: %s: "
+               "size=%d:%d:%d:%d, shift=%d:%d:%d:%d\n",
+               "Truecolor",
+               screen_info.rsvd_size,
+               screen_info.red_size,
+               screen_info.green_size,
+               screen_info.blue_size,
+               screen_info.rsvd_pos,
+               screen_info.red_pos,
+               screen_info.green_pos,
+               screen_info.blue_pos);
+
+        efifb_fix.ypanstep  = 0;
+        efifb_fix.ywrapstep = 0;
+
+        info->fbops = &efifb_ops;
+        info->var = efifb_defined;
+        info->fix = efifb_fix;
+        info->flags = FBINFO_FLAG_DEFAULT;
+
+        if (fb_alloc_cmap(&info->cmap, 256, 0) < 0) {
+                err = -ENOMEM;
+                goto err_unmap;
+        }
+        if (register_framebuffer(info) < 0) {
+                err = -EINVAL;
+                goto err_fb_dealoc;
+        }
+        printk(KERN_INFO "fb%d: %s frame buffer device\n",
+               info->node, info->fix.id);
+        return 0;
+
+err_fb_dealoc:
+        fb_dealloc_cmap(&info->cmap);
+err_unmap:
+        iounmap(info->screen_base);
+        framebuffer_release(info);
+err_release_mem:
+        release_mem_region(efifb_fix.smem_start, size_total);
+        return err;
+}
+
+static struct platform_driver efifb_driver = {
+        .probe  = efifb_probe,
+        .driver = {
+                .name   = "efifb",
+        },
+};
+
+static struct platform_device efifb_device = {
+        .name   = "efifb",
+};
+
+static int __init efifb_init(void)
+{
+        int ret;
+
+        if (screen_info.orig_video_isVGA != VIDEO_TYPE_EFI)
+                return -ENODEV;
+
+        ret = platform_driver_register(&efifb_driver);
+
+        if (!ret) {
+                ret = platform_device_register(&efifb_device);
+                if (ret)
+                        platform_driver_unregister(&efifb_driver);
+        }
+        return ret;
+}
+module_init(efifb_init);
+
+MODULE_LICENSE("GPL");
diff --git a/drivers/video/fb_ddc.c b/drivers/video/fb_ddc.c
index f836137a0eda..a0df63289b5f 100644
--- a/drivers/video/fb_ddc.c
+++ b/drivers/video/fb_ddc.c
@@ -56,13 +56,12 @@ unsigned char *fb_ddc_read(struct i2c_adapter *adapter)
         int i, j;
 
         algo_data->setscl(algo_data->data, 1);
-        algo_data->setscl(algo_data->data, 0);
 
         for (i = 0; i < 3; i++) {
                 /* For some old monitors we need the
                  * following process to initialize/stop DDC
                  */
-                algo_data->setsda(algo_data->data, 0);
+                algo_data->setsda(algo_data->data, 1);
                 msleep(13);
 
                 algo_data->setscl(algo_data->data, 1);
@@ -97,14 +96,15 @@ unsigned char *fb_ddc_read(struct i2c_adapter *adapter)
                 algo_data->setsda(algo_data->data, 1);
                 msleep(15);
                 algo_data->setscl(algo_data->data, 0);
+                algo_data->setsda(algo_data->data, 0);
                 if (edid)
                         break;
         }
         /* Release the DDC lines when done or the Apple Cinema HD display
          * will switch off
          */
-        algo_data->setsda(algo_data->data, 0);
-        algo_data->setscl(algo_data->data, 0);
+        algo_data->setsda(algo_data->data, 1);
+        algo_data->setscl(algo_data->data, 1);
 
         return edid;
 }
diff --git a/drivers/video/imacfb.c b/drivers/video/imacfb.c
index 6455fd2a39f2..9366ef2bb5f7 100644
--- a/drivers/video/imacfb.c
+++ b/drivers/video/imacfb.c
@@ -234,10 +234,6 @@ static int __init imacfb_probe(struct platform_device *dev)
                 size_remap = size_total;
         imacfb_fix.smem_len = size_remap;
 
-#ifndef __i386__
-        screen_info.imacpm_seg = 0;
-#endif
-
         if (!request_mem_region(imacfb_fix.smem_start, size_total, "imacfb")) {
                 printk(KERN_WARNING
                        "imacfb: cannot reserve video memory at 0x%lx\n",
diff --git a/drivers/video/ps3fb.c b/drivers/video/ps3fb.c
index 75836aa83191..9c56c492a693 100644
--- a/drivers/video/ps3fb.c
+++ b/drivers/video/ps3fb.c
@@ -51,7 +51,6 @@
 #define L1GPU_DISPLAY_SYNC_HSYNC                1
 #define L1GPU_DISPLAY_SYNC_VSYNC                2
 
-#define DDR_SIZE                                (0)     /* used no ddr */
 #define GPU_CMD_BUF_SIZE                        (64 * 1024)
 #define GPU_IOIF                                (0x0d000000UL)
 #define GPU_ALIGN_UP(x)                         _ALIGN_UP((x), 64)
@@ -1060,6 +1059,7 @@ static int __devinit ps3fb_probe(struct ps3_system_bus_device *dev)
         u64 xdr_lpar;
         int status, res_index;
         struct task_struct *task;
+        unsigned long max_ps3fb_size;
 
         status = ps3_open_hv_device(dev);
         if (status) {
@@ -1085,8 +1085,15 @@ static int __devinit ps3fb_probe(struct ps3_system_bus_device *dev)
 
         ps3fb_set_sync(&dev->core);
 
+        max_ps3fb_size = _ALIGN_UP(GPU_IOIF, 256*1024*1024) - GPU_IOIF;
+        if (ps3fb_videomemory.size > max_ps3fb_size) {
+                dev_info(&dev->core, "Limiting ps3fb mem size to %lu bytes\n",
+                         max_ps3fb_size);
+                ps3fb_videomemory.size = max_ps3fb_size;
+        }
+
         /* get gpu context handle */
-        status = lv1_gpu_memory_allocate(DDR_SIZE, 0, 0, 0, 0,
+        status = lv1_gpu_memory_allocate(ps3fb_videomemory.size, 0, 0, 0, 0,
                                          &ps3fb.memory_handle, &ddr_lpar);
         if (status) {
                 dev_err(&dev->core, "%s: lv1_gpu_memory_allocate failed: %d\n",
diff --git a/drivers/virtio/virtio.c b/drivers/virtio/virtio.c
index 15d7787dea87..69d7ea02cd48 100644
--- a/drivers/virtio/virtio.c
+++ b/drivers/virtio/virtio.c
@@ -96,10 +96,23 @@ static int virtio_dev_probe(struct device *_d)
         return err;
 }
 
+static int virtio_dev_remove(struct device *_d)
+{
+        struct virtio_device *dev = container_of(_d,struct virtio_device,dev);
+        struct virtio_driver *drv = container_of(dev->dev.driver,
+                                                 struct virtio_driver, driver);
+
+        dev->config->set_status(dev, dev->config->get_status(dev)
+                                & ~VIRTIO_CONFIG_S_DRIVER);
+        drv->remove(dev);
+        return 0;
+}
+
 int register_virtio_driver(struct virtio_driver *driver)
 {
         driver->driver.bus = &virtio_bus;
         driver->driver.probe = virtio_dev_probe;
+        driver->driver.remove = virtio_dev_remove;
         return driver_register(&driver->driver);
 }
 EXPORT_SYMBOL_GPL(register_virtio_driver);
diff --git a/drivers/zorro/zorro-driver.c b/drivers/zorro/zorro-driver.c
index 067c07be928c..e6c4390d8bd6 100644
--- a/drivers/zorro/zorro-driver.c
+++ b/drivers/zorro/zorro-driver.c
@@ -60,6 +60,20 @@ static int zorro_device_probe(struct device *dev)
 }
 
 
+static int zorro_device_remove(struct device *dev)
+{
+        struct zorro_dev *z = to_zorro_dev(dev);
+        struct zorro_driver *drv = to_zorro_driver(dev->driver);
+
+        if (drv) {
+                if (drv->remove)
+                        drv->remove(z);
+                z->driver = NULL;
+        }
+        return 0;
+}
+
+
     /**
      *  zorro_register_driver - register a new Zorro driver
      *  @drv: the driver structure to register
@@ -128,6 +142,7 @@ struct bus_type zorro_bus_type = {
         .name   = "zorro",
         .match  = zorro_bus_match,
         .probe  = zorro_device_probe,
+        .remove = zorro_device_remove,
 };