Merge branch 'master' into upstream-fixes

author: Jeff Garzik <jeff@garzik.org> 2007-12-01 16:18:56 -0500
committer: Jeff Garzik <jeff@garzik.org> 2007-12-01 16:18:56 -0500
commit: c99da91e7a12724127475a85cc7a38214b3504e2 (patch)
tree: de0eb3fe32ce58804457963fd133a53bb8fba5b8 /drivers
parent: a31e23e15cbb9734c5883a4a7f58d8712d303e0b (diff)
parent: 92d499d991ec4f5cbd00d6f33967eab9d3ee8d6c (diff)
152 files changed, 2151 insertions, 1445 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..7d6be23eff89 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);
@@ -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/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) {
+                        if (test_bit(EC_FLAGS_ADDRESS, &ec->flags)) {
-                                /* miss OBF = 1 GPE, don't expect it anymore */
+                                /* miss address GPE, don't expect it anymore */
-                                printk(KERN_INFO PREFIX "missing OBF_1 confirmation,"
+                                pr_info(PREFIX "missing address confirmation, "
-                                        "switching to degraded mode.\n");
+                                        "don't expect it any longer.\n");
-                                set_bit(EC_FLAGS_ONLY_IBF_GPE, &ec->flags);
+                                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,"
+                                if (printk_ratelimit())
-                                        "switch off interrupt mode.\n");
+                                        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",
+                        pr_err(PREFIX "read timeout, command = %d\n", command);
-                               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
+                pr_err(PREFIX "input buffer is not empty, "
-                       "input buffer is not empty, aborting transaction\n");
+                                "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,"
+                if (printk_ratelimit())
-                        " switching to interrupt mode\n");
+                        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/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) {
+        *value = 0;
-        case 8:
+        if (width <= 8) {
                *(u8 *) value = inb(port);
-                break;
+        } else if (width <= 16) {
-        case 16:
                *(u16 *) value = inw(port);
-                break;
+        } else if (width <= 32) {
-        case 32:
                *(u32 *) value = inl(port);
-                break;
+        } else {
-        default:
                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) {
+        if (width <= 8) {
-        case 8:
                outb(value, port);
-                break;
+        } else if (width <= 16) {
-        case 16:
                outw(value, port);
-                break;
+        } else if (width <= 32) {
-        case 32:
                outl(value, port);
-                break;
+        } else {
-        default:
                BUG();
        }
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..b1fbee3f7fe1 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, .. */
@@ -1373,15 +1373,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;
+        acpi_safe_halt();
-        /*
-         * 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;
        cx->usage++;
@@ -1399,6 +1391,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))
@@ -1428,6 +1422,8 @@ static int acpi_idle_enter_simple(struct cpuidle_device *dev,
                ACPI_FLUSH_CPU_CACHE();
        t1 = inl(acpi_gbl_FADT.xpm_timer_block.address);
+        /* Tell the scheduler that we are going deep-idle: */
+        sched_clock_idle_sleep_event();
        acpi_state_timer_broadcast(pr, cx, 1);
        acpi_idle_do_entry(cx);
        t2 = inl(acpi_gbl_FADT.xpm_timer_block.address);
@@ -1436,6 +1432,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 +1443,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 +1463,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 +1473,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 +1496,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()) {
+        acpi_idle_update_bm_rld(pr, cx);
-                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);
+        /*
+         * 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);
+        t1 = inl(acpi_gbl_FADT.xpm_timer_block.address);
-                acpi_idle_do_entry(cx);
+        acpi_idle_do_entry(cx);
-                t2 = inl(acpi_gbl_FADT.xpm_timer_block.address);
+        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 */
+                acpi_set_register(ACPI_BITREG_ARB_DISABLE, 0);
-                if (c3_cpu_count == num_online_cpus())
-                        acpi_set_register(ACPI_BITREG_ARB_DISABLE, 0);
                c3_cpu_count--;
                spin_unlock(&c3_lock);
        }
@@ -1525,6 +1543,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 +1553,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 +1605,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 +1633,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 +1673,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..c26c61fb36c3 100644
--- a/drivers/acpi/processor_throttling.c
+++ b/drivers/acpi/processor_throttling.c
@@ -70,7 +70,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 +131,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 +183,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 +393,132 @@ static int acpi_processor_get_throttling_fadt(struct acpi_processor *pr)
        return 0;
 }
-static int acpi_read_throttling_status(struct acpi_processor_throttling
+#ifdef CONFIG_X86
-                                       *throttling)
+static int acpi_throttling_rdmsr(struct acpi_processor *pr,
+                                        acpi_integer * value)
 {
-        int value = -1;
+        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_on_cpu(cpu, 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)
+{
+        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_on_cpu(cpu, 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,
+                                  address, (u32 *) &ptc_value,
-                                  (u32) throttling->status_register.bit_width *
+                                  (u32) (bit_width + bit_offset));
-                                  8);
+                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
+                ret = acpi_throttling_rdmsr(pr, value);
-                       "HARDWARE addr space,NOT supported yet\n");
                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
+static int acpi_write_throttling_state(struct acpi_processor *pr,
-                                       *throttling, int value)
+                                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,
+                                        control_register.address,
-                                   (u32) throttling->control_register.
+                                        (u32) (ptc_value << bit_offset),
-                                   bit_width * 8);
+                                        (u32) (bit_width + bit_offset));
                ret = 0;
                break;
        case ACPI_ADR_SPACE_FIXED_HARDWARE:
-                printk(KERN_ERR PREFIX
+                ret = acpi_throttling_wrmsr(pr, value);
-                       "HARDWARE addr space,NOT supported yet\n");
                break;
        default:
                printk(KERN_ERR PREFIX "Unknown addr space %d\n",
@@ -374,7 +527,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 +544,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;
@@ -415,8 +573,9 @@ static int acpi_processor_get_throttling_ptc(struct acpi_processor *pr)
        pr->throttling.state = 0;
        local_irq_disable();
-        value = acpi_read_throttling_status(&pr->throttling);
+        value = 0;
-        if (value >= 0) {
+        ret = acpi_read_throttling_status(pr, &value);
+        if (ret >= 0) {
                state = acpi_get_throttling_state(pr, value);
                pr->throttling.state = state;
        }
@@ -430,6 +589,40 @@ static int acpi_processor_get_throttling(struct acpi_processor *pr)
        return pr->throttling.acpi_processor_get_throttling(pr);
 }
+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,
                                              int state)
 {
@@ -506,7 +699,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;
@@ -524,10 +718,10 @@ static int acpi_processor_set_throttling_ptc(struct acpi_processor *pr,
                return -EPERM;
        local_irq_disable();
+        value = 0;
-        value = acpi_get_throttling_value(pr, state);
+        ret = acpi_get_throttling_value(pr, state, &value);
-        if (value >= 0) {
+        if (ret >= 0) {
-                acpi_write_throttling_state(&pr->throttling, value);
+                acpi_write_throttling_state(pr, value);
                pr->throttling.state = state;
        }
        local_irq_enable();
@@ -543,8 +737,6 @@ int acpi_processor_set_throttling(struct acpi_processor *pr, int state)
 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 +755,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 +770,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 +781,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..6045cdbe176b 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>
@@ -88,7 +88,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 +113,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 +123,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 +469,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,
@@ -789,7 +790,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 +809,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 +824,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)
+        struct acpi_battery *battery = &sbs->battery[id];
-                device_remove_file(sbs->battery[id].bat.dev, &alarm_attr);
-                power_supply_unregister(&sbs->battery[id].bat);
+        if (battery->bat.dev) {
-#ifdef CONFIG_ACPI_PROCFS
+                if (battery->have_sysfs_alarm)
-        if (sbs->battery[id].proc_entry) {
+                        device_remove_file(battery->bat.dev, &alarm_attr);
-                acpi_sbs_remove_fs(&(sbs->battery[id].proc_entry),
+                power_supply_unregister(&battery->bat);
-                                   acpi_battery_dir);
        }
+#ifdef CONFIG_ACPI_PROCFS_POWER
+        if (battery->proc_entry)
+                acpi_sbs_remove_fs(&battery->proc_entry, acpi_battery_dir);
 #endif
 }
@@ -835,7 +844,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 +868,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 +974,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 +1013,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/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..44a0d9ba9bd6 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 */
@@ -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;
+        struct acpi_video_device *dev;
-        list_for_each_safe(node, next, &video->video_device_list) {
-                struct acpi_video_device *dev =
+        mutex_lock(&video->device_list_lock);
-                    container_of(node, struct acpi_video_device, entry);
+        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 =
+                        dev_next = container_of(node->next,
-                            container_of(node->next, struct acpi_video_device,
+                                        struct acpi_video_device, entry);
-                                         entry);
+                        dev_prev = container_of(node->prev,
-                        dev_prev =
+                                        struct acpi_video_device, entry);
-                            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) {
+        list_for_each_entry(dev, &device->children, node) {
-                struct acpi_device *dev =
-                    list_entry(node, struct acpi_device, node);
-                if (!dev)
-                        continue;
                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) {
+        list_for_each_entry_safe(dev, next, &video->video_device_list, entry) {
-                struct acpi_video_device *data =
-                    list_entry(node, struct acpi_video_device, entry);
-                if (!data)
-                        continue;
-                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)
+                if (dev->brightness) {
-                        kfree(data->brightness->levels);
+                        kfree(dev->brightness->levels);
-                kfree(data->brightness);
+                        kfree(dev->brightness);
-                kfree(data);
+                }
+                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;
-        acpi_status status = 0;
+        struct acpi_video_bus *video;
-        struct acpi_video_bus *video = NULL;
        struct input_dev *input;
+        int error;
-        if (!device)
-                return -EINVAL;
        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);
+        error = acpi_video_bus_check(video);
-        if (result)
+        if (error)
-                goto end;
+                goto err_free_video;
-        result = acpi_video_bus_add_fs(device);
+        error = acpi_video_bus_add_fs(device);
-        if (result)
+        if (error)
-                goto end;
+                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);
+                error = -ENODEV;
-                acpi_video_bus_put_devices(video);
+                goto err_stop_video;
-                kfree(video->attached_array);
-                acpi_video_bus_remove_fs(device);
-                result = -ENODEV;
-                goto end;
        }
        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:
+        return 0;
-        if (result)
-                kfree(video);
+ 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/ata_piix.c b/drivers/ata/ata_piix.c
index 328ce8a08426..483269db2c7d 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 */
+        piix_pata_mwdma         = 0,    /* PIIX3 MWDMA only */
-        ich_pata_33             = 1,    /* ICH up to UDMA 33 only */
+        piix_pata_33,                   /* PIIX4 at 33Mhz */
-        ich_pata_66             = 2,    /* ICH up to 66 Mhz */
+        ich_pata_33,                    /* ICH up to UDMA 33 only */
-        ich_pata_100            = 3,    /* ICH up to UDMA 100 */
+        ich_pata_66,                    /* ICH up to 66 Mhz */
-        ich5_sata               = 5,
+        ich_pata_100,                   /* ICH up to UDMA 100 */
-        ich6_sata               = 6,
+        ich5_sata,
-        ich6_sata_ahci          = 7,
+        ich6_sata,
-        ich6m_sata_ahci         = 8,
+        ich6_sata_ahci,
-        ich8_sata_ahci          = 9,
+        ich6m_sata_ahci,
-        piix_pata_mwdma         = 10,   /* PIIX3 MWDMA only */
+        ich8_sata_ahci,
-        tolapai_sata_ahci       = 11,
+        ich8_2port_sata,
-        ich9_2port_sata         = 12,
+        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 */
+                .mwdma_mask     = 0x07, /* mwdma0-2 */
-                .port_ops       = &piix_pata_ops,
+                .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[] = {
@@ -974,6 +1002,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 +1121,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..33f06277b3be 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
 *
@@ -5490,11 +5425,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 "
+                        /* Some ATAPI tape drives forget to clear the ERR bit
-                                        "error, dev_stat 0x%X\n", status);
+                         * when doing the next command (mostly request sense).
-                        qc->err_mask |= AC_ERR_HSM;
+                         * We ignore ERR here to workaround and proceed sending
-                        ap->hsm_task_state = HSM_ST_ERR;
+                         * the CDB.
-                        goto fsm_start;
+                         */
+                        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).
@@ -7653,8 +7596,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 +7666,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..0dac69db1fdf 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;
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
+        /* Some controller variants snoop this value for Packet
-           to do state machine and FIFO management. Thus we want to set it
+         * transfers to do state machine and FIFO management.  Thus we
-           properly, and for DMA where it is effectively meaningless */
+         * 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_bf54x.c b/drivers/ata/pata_bf54x.c
index b5e38426b815..81db405a5445 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;
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)) {
-        if (pnp_irq_valid(idev, 0) == 0)
+                irq = pnp_irq(idev, 0);
-                return -ENODEV;
+                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))
+                if ((control & (1 << 5)) == 0)
-                        return 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/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/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/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/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/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
+          DMA engines can do asynchronous data transfers without
-          network stack and RAID operations in the MD driver.
+          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/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]);
+        for (unit = 0; unit < MAX_DRIVES; unit++) {
-        hwif->OUTB(8, hwif->io_ports[IDE_CONTROL_OFFSET]);
+                ide_drive_t *drive = &hwif->drives[unit];
-        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);
+                /* 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) */
+        if (path >= link)
-        *ipd = ((link + (path >> 1)) / path) - 1;
+                /* 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_qp.c b/drivers/infiniband/hw/ehca/ehca_qp.c
index 2e3e6547cb78..dd126681fed0 100644
--- a/drivers/infiniband/hw/ehca/ehca_qp.c
+++ b/drivers/infiniband/hw/ehca/ehca_qp.c
@@ -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;
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;
        }
-        /*
+        /* Check that we can write the offset to mmap. */
-         * Return the address of the WC as the offset to mmap.
-         * See ipath_mmap() for details.
-         */
        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);
+        if (qp->ip)
-bail_rwq:
+                kref_put(&qp->ip->ref, ipath_release_mmap_info);
-        vfree(qp->r_rq.wq);
+        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;
                }
-                /*
+                /* Check that we can write the offset to mmap. */
-                 * Return the address of the RWQ as the offset to mmap.
-                 * See ipath_mmap() for details.
-                 */
                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) {
+                        if (ret)
-                                vfree(wq);
+                                goto bail_free;
-                                goto bail;
-                        }
                        udata->outbuf = (void __user *) offset_addr;
                        ret = ib_copy_to_udata(udata, &offset,
                                               sizeof(offset));
-                        if (ret) {
+                        if (ret)
-                                vfree(wq);
+                                goto bail_free;
-                                goto bail;
-                        }
                }
                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)
+        if (next == qp->s_last) {
-                goto bail_inval;
+                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
+                        pr_err("gpio-keys: Unable to get irq number"
-                                "gpio-keys: "
+                                " for GPIO %d, error %d\n",
-                                "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
+                        pr_err("gpio-keys: Unable to claim irq %d; error %d\n",
-                                "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
+                pr_err("gpio-keys: Unable to register input device, "
-                        "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/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;
+                        mod_timer(&cs->hw.hfcD.timer, jiffies + delay);
-                        add_timer(&cs->hw.hfcD.timer);
                        spin_lock_irqsave(&cs->lock, flags);
                        reset_hfcs(cs);
                        init2bds0(cs);
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 & ~X86_CR0_TS);
-        kvm_x86_ops->set_cr0(vcpu, vcpu->cr0);
        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);                                     \
+                register_address_increment(_eip, rel);                  \
-                _eip = ((op_bytes == 2) ? (uint16_t)_eip : (uint32_t)_eip); \
        } 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/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/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..ab23a3221585 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_RESERVED,   /* 0x14: VOLUME UP */
-                KEY_VOLUMEDOWN, /* 0x15: VOLUME DOWN */
+                KEY_RESERVED,   /* 0x15: VOLUME DOWN */
-                KEY_MUTE,       /* 0x16: MUTE */
+                KEY_RESERVED,   /* 0x16: MUTE */
                KEY_VENDOR,     /* 0x17: Thinkpad/AccessIBM/Lenovo */
                /* (assignments unknown, please report if found) */
                KEY_UNKNOWN, KEY_UNKNOWN, KEY_UNKNOWN, KEY_UNKNOWN,
@@ -993,9 +993,9 @@ static int __init hotkey_init(struct ibm_init_struct *iibm)
                KEY_RESERVED,   /* 0x11: FN+PGUP (thinklight toggle) */
                KEY_UNKNOWN,    /* 0x12: FN+PGDOWN */
                KEY_ZOOM,       /* 0x13: FN+SPACE (zoom) */
-                KEY_VOLUMEUP,   /* 0x14: VOLUME UP */
+                KEY_RESERVED,   /* 0x14: VOLUME UP */
-                KEY_VOLUMEDOWN, /* 0x15: VOLUME DOWN */
+                KEY_RESERVED,   /* 0x15: VOLUME DOWN */
-                KEY_MUTE,       /* 0x16: MUTE */
+                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 (mutex_lock_interruptible(&hotkey_mutex))
-        if (res < 0)
+                return -ERESTARTSYS;
-                return res;
        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 (mutex_lock_interruptible(&hotkey_mutex))
-        if (res < 0)
+                return -ERESTARTSYS;
-                return res;
        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))) {
+        level = brightness_get(NULL);
-                if ((level = brightness_get(NULL)) < 0)
+        if (level < 0)
-                        return level;
+                return level;
-                level &= 7;
+        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;
+                        if (level > 0)
-                } else if (sscanf(cmd, "level %d", &new_level) == 1 &&
+                                level--;
-                           new_level >= 0 && new_level <= 7) {
+                } else if (sscanf(cmd, "level %d", &level) == 1 &&
-                        /* new_level set */
+                           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 (mutex_lock_interruptible(&fan_mutex))
-        if (rc < 0)
+                return -ERESTARTSYS;
-                return rc;
        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 (mutex_lock_interruptible(&fan_mutex))
-        if (rc < 0)
+                return -ERESTARTSYS;
-                return rc;
        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 (mutex_lock_interruptible(&fan_mutex))
-        if (rc < 0)
+                return -ERESTARTSYS;
-                return rc;
        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 (mutex_lock_interruptible(&fan_mutex))
-        if (rc < 0)
+                return -ERESTARTSYS;
-                return rc;
        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 (mutex_lock_interruptible(&fan_mutex))
-        if (rc < 0)
+                return -ERESTARTSYS;
-                return rc;
        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 (mutex_lock_interruptible(&fan_mutex))
-        if (rc < 0)
+                return -ERESTARTSYS;
-                return rc;
        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/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/bfin_mac.c b/drivers/net/bfin_mac.c
index f0f851693897..eb971755a3ff 100644
--- a/drivers/net/bfin_mac.c
+++ b/drivers/net/bfin_mac.c
@@ -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/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/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/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? */
+        /* Out of packets? */
-        if (!skb) {
+        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);
+        struct virtnet_info *vi = vdev->priv;
-        free_netdev(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/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,
+        length = rt2x00dev->ops->lib->get_tx_data_len(rt2x00dev, skb);
-                                                      max_packet, 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/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
+ * acpiphp_max_busnr - return the highest reserved bus number under the given bus.
- * 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
+ * If a slot has _STA for each function and if any one of them
- * returned non-zero status, return it
+ * returned non-zero status, return it.
 *
- * if a slot doesn't have _STA and if any one of its functions'
+ * If a slot doesn't have _STA and if any one of its functions'
- * configuration space is configured, return 0x0f as a _STA
+ * 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
+ * Description: This method is registered with the acpiphp module as a
- * callback to do the device specific task of setting the LED status
+ * 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
+ * Description: This method is registered with the acpiphp module as a
- * callback to do the device specific task of getting the LED status
+ * 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
+ * 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
+ * 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
+ * Description: Gets registered with sysfs as the reader callback
- * to be executed when /sys/bus/pci/slots/apci_table gets read
+ * 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.
- *
+ * @smbios_start: where to start in the SMBIOS table
- * Gets the first entry if previous == NULL
+ * @smbios_table: location of the SMBIOS table
- * Otherwise, returns the next entry
- * Uses global SMBIOS Table pointer
- *
 * @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
+ * get_SMBIOS_entry - return the requested SMBIOS entry or %NULL
- *
+ * @smbios_start: where to start in the SMBIOS table
- * @type:SMBIOS structure type to be returned
+ * @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 global SMBIOS Table pointer.
- * Uses get_subsequent_smbios_entry
+ * 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
+ * set_controller_speed - set the frequency and/or mode of a specific controller segment.
- * 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
+ * This is only used if we don't have resources for hot add.
- * Turns power on for the board
+ * Turns power on for the board.
- * Checks to see if board is the same
+ * Checks to see if board is the same.
- * If board is same, reconfigures it
+ * 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
+ * Turns power on for the board.
- * Configures 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.
+ * pci_rescan_slot - Rescan slot
- * Tries hard not to re-enable already existing devices
+ * @temp: Device template. Should be set: bus and devfn.
- * also handles scanning of subfunctions
 *
- * @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.
+ * pci_rescan_bus - Rescan PCI bus
- * call pci_rescan_slot for each possible function of the 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
+ * Turns power on for the board.
- * Configures 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
+ * Make the hotplug module and the kernel aware of a newly added I/O Slot.
- * of a newly added I/O Slot.
+ * Return Codes:
- * 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
+ * Remove the kernel and hotplug representations of an I/O Slot.
- * 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
+ * Remove the kernel and hotplug representations of a PCI I/O Slot.
- * 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
+ * Remove the kernel and hotplug representations of an I/O Slot.
- * 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
+ * Turns power on for the board.
- * Configures 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
+ * @dev: pointer to from where in a hierarchy message is broadcasted down
- * @api: callback to be broadcasted
 * @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/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..a4f56e95cf96 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(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(RTC_DEV_BUSY, &rtc->flags);
        return retval;
 }
diff --git a/drivers/rtc/rtc-dev.c b/drivers/rtc/rtc-dev.c
index 814583bd2fe7..ae1bf177d625 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
+        if (test_and_set_bit(RTC_DEV_BUSY, &rtc->flags))
-         * and return immediately if busy
-         */
-        if (!(mutex_trylock(&rtc->char_lock)))
                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 */
+        /* something has gone wrong */
-        mutex_unlock(&rtc->char_lock);
+        clear_bit(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(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/s390/cio/css.c b/drivers/s390/cio/css.c
index 838f7ac0dc32..6db31089d2d7 100644
--- a/drivers/s390/cio/css.c
+++ b/drivers/s390/cio/css.c
@@ -483,7 +483,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..2f6bf462425e 100644
--- a/drivers/s390/cio/device_id.c
+++ b/drivers/s390/cio/device_id.c
@@ -113,19 +113,10 @@ __ccw_device_sense_id_start(struct ccw_device *cdev)
 {
        struct subchannel *sch;
        struct ccw1 *ccw;
-        int ret;
        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);
@@ -133,25 +124,9 @@ __ccw_device_sense_id_start(struct ccw_device *cdev)
        /* Reset device status. */
        memset(&cdev->private->irb, 0, sizeof(struct irb));
+        cdev->private->flags.intretry = 0;
-        /* Try on every path. */
+        return cio_start(sch, ccw, LPM_ANYPATH);
-        ret = -ENODEV;
-        while (cdev->private->imask != 0) {
-                if ((sch->opm & cdev->private->imask) != 0 &&
-                    cdev->private->iretry > 0) {
-                        cdev->private->iretry--;
-                        /* Reset internal retry indication. */
-                        cdev->private->flags.intretry = 0;
-                        ret = cio_start (sch, cdev->private->iccws,
-                                         cdev->private->imask);
-                        /* ret is 0, -EBUSY, -EACCES or -ENODEV */
-                        if (ret != -EACCES)
-                                return ret;
-                }
-                cdev->private->imask >>= 1;
-                cdev->private->iretry = 5;
-        }
-        return ret;
 }
 void
@@ -161,8 +136,7 @@ ccw_device_sense_id_start(struct ccw_device *cdev)
        memset (&cdev->private->senseid, 0, sizeof (struct senseid));
        cdev->private->senseid.cu_type = 0xFFFF;
-        cdev->private->imask = 0x80;
+        cdev->private->iretry = 3;
-        cdev->private->iretry = 5;
        ret = __ccw_device_sense_id_start(cdev);
        if (ret && ret != -EBUSY)
                ccw_device_sense_id_done(cdev, ret);
@@ -278,14 +252,13 @@ ccw_device_sense_id_irq(struct ccw_device *cdev, enum dev_event dev_event)
                ccw_device_sense_id_done(cdev, ret);
                break;
        case -EACCES:           /* channel is not operational. */
-                sch->lpm &= ~cdev->private->imask;
-                cdev->private->imask >>= 1;
-                cdev->private->iretry = 5;
-                /* fall through. */
        case -EAGAIN:           /* try again. */
-                ret = __ccw_device_sense_id_start(cdev);
+                cdev->private->iretry--;
-                if (ret == 0 || ret == -EBUSY)
+                if (cdev->private->iretry > 0) {
-                        break;
+                        ret = __ccw_device_sense_id_start(cdev);
+                        if (ret == 0 || ret == -EBUSY)
+                                break;
+                }
                /* fall through. */
        default:                /* Sense ID failed. Try asking VM. */
                if (MACHINE_IS_VM) {
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/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;
+        unsigned int                    tty_break;
-        /* L1-A keyboard break state.  */
-        int                             kbd_id;
-        int                             l1_down;
        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,
+#define Rx_BRK 0x0100                   /* BREAK event software flag.  */
-                                   struct zilog_channel *channel)
+#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) {
+        for (;;) {
-                unsigned char ch, r1, flag;
+                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)) {
+                /* Handle the null char got when BREAK is removed.  */
-                        /* Wait for BREAK to deassert to avoid potentially
+                if (!ch)
-                         * confusing the PROM.
+                        r1 |= up->tty_break;
-                         */
-                        while (1) {
-                                ch = readb(&channel->control);
-                                ZSDELAY();
-                                if (!(ch & BRK_ABRT))
-                                        break;
-                        }
-                        ip22_do_break();
-                        return;
-                }
                /* 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 & (PAR_ERR | Rx_OVR | CRC_ERR | Rx_SYS | Rx_BRK)) {
-                        if (r1 & BRK_ABRT) {
+                        up->tty_break = 0;
-                                r1 &= ~(PAR_ERR | CRC_ERR);
+                        if (r1 & (Rx_SYS | Rx_BRK)) {
                                up->port.icount.brk++;
-                                if (uart_handle_break(&up->port))
+                                if (r1 & Rx_SYS)
-                                        goto next_char;
+                                        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 ||
+                if (uart_handle_sysrq_char(&up->port, ch))
-                    (r1 & up->port.ignore_status_mask) == 0)
+                        continue;
-                        tty_insert_flip_char(tty, ch, flag);
-                if (r1 & Rx_OVR)
+                if (tty)
-                        tty_insert_flip_char(tty, 0, TTY_OVERRUN);
+                        uart_insert_char(&up->port, r1, Rx_OVR, ch, flag);
-        next_char:
-                ch = readb(&channel->control);
-                ZSDELAY();
-                if (!(ch & Rx_CH_AV))
-                        break;
        }
+        return tty;
-        tty_flip_buffer_push(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;
+        int baud = 9600, bits = 8;
+        int parity = 'n';
-        printk("Console: ttyS%d (IP22-Zilog)\n", con->index);
+        int flow = 'n';
-        /* Get firmware console settings.  */
+        up->flags |= IP22ZILOG_FLAG_IS_CONS;
-        ip22serial_console_termios(con, options);
-        /* Firmware console speed is limited to 150-->38400 baud so
+        printk(KERN_INFO "Console: ttyS%d (IP22-Zilog)\n", con->index);
-         * 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);
        spin_lock_irqsave(&up->port.lock, flags);
-        up->curregs[R15] = BRKIE;
+        up->curregs[R15] |= BRKIE;
-        ip22zilog_convert_to_zs(up, con->cflag, 0, brg);
        __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);
+        for (channel = 0; channel < NUM_CHANNELS; channel++) {
+                struct uart_ip22zilog_port *up = &ip22zilog_port_table[channel];
-                if (ZS_IS_CHANNEL_A(up)) {
+                int brg;
-                        write_zsreg(channel, R9, FHWRES);
-                        ZSDELAY_LONG();
-                        (void) read_zsreg(channel, R0);
-                }
                /* 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(9600, ZS_CLOCK / ZS_CLOCK_DIVISOR);
-                brg = BPS_TO_BRG(baud, 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/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/atmel_spi.c b/drivers/spi/atmel_spi.c
index 0d342dcdd302..ff6a14bf1280 100644
--- a/drivers/spi/atmel_spi.c
+++ b/drivers/spi/atmel_spi.c
@@ -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/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 */
+        /* set state of spi pins, always assume that the clock is
-        s3c2410_gpio_setpin(sp->info->pin_clk, 0);
+         * available, but do check the MOSI and MISO. */
-        s3c2410_gpio_setpin(sp->info->pin_mosi, 0);
+        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);
+        if (info->pin_mosi < S3C2410_GPH10) {
-        s3c2410_gpio_cfgpin(sp->info->pin_mosi, S3C2410_GPIO_OUTPUT);
+                s3c2410_gpio_setpin(info->pin_mosi, 0);
-        s3c2410_gpio_cfgpin(sp->info->pin_miso, S3C2410_GPIO_INPUT);
+                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 (iface->cur_altsetting != alt && device_is_registered(&iface->dev))
-        if (changed && 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_DISABLED | IRQF_TRIGGER_RISING
-                                | IRQF_TRIGGER_FALLING,
+                                     | IRQF_TRIGGER_FALLING | IRQF_SHARED,
-                                gadget_name, udc);
+                                     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(2," %s : enter", __FUNCTION__);
-                dbg(1," %s : dev is null", __FUNCTION__);
-                goto exit;
-        }
        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 */
+        /* check that nobody else is using the device */
-        if ((retval = mutex_lock_interruptible(&dev->mtx))) {
+        if (dev->open_count) {
-                dbg(2, "%s : mutex lock failed", __FUNCTION__);
+                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 */
-                /* initialize in direction */
+        dev->read_buffer_length = 0;
-                dev->read_buffer_length = 0;
-                /* fixup first read by having urb waiting for it */
+        /* fixup first read by having urb waiting for it */
-                usb_fill_int_urb(dev->interrupt_in_urb,dev->udev,
+        usb_fill_int_urb(dev->interrupt_in_urb,dev->udev,
-                                 usb_rcvintpipe(dev->udev,
+                         usb_rcvintpipe(dev->udev,
-                                                dev->interrupt_in_endpoint->bEndpointAddress),
+                                        dev->interrupt_in_endpoint->bEndpointAddress),
-                                 dev->interrupt_in_buffer,
+                         dev->interrupt_in_buffer,
-                                 le16_to_cpu(dev->interrupt_in_endpoint->wMaxPacketSize),
+                         le16_to_cpu(dev->interrupt_in_endpoint->wMaxPacketSize),
-                                 adu_interrupt_in_callback, dev,
+                         adu_interrupt_in_callback, dev,
-                                 dev->interrupt_in_endpoint->bInterval);
+                         dev->interrupt_in_endpoint->bInterval);
-                /* dev->interrupt_in_urb->transfer_flags |= URB_ASYNC_UNLINK; */
+        dev->read_urb_finished = 0;
-                dev->read_urb_finished = 0;
+        if (usb_submit_urb(dev->interrupt_in_urb, GFP_KERNEL))
-                retval = usb_submit_urb(dev->interrupt_in_urb, GFP_KERNEL);
+                dev->read_urb_finished = 1;
-                if (retval)
+        /* we ignore failure */
-                        --dev->open_count;
+        /* end of fixup for first read */
-        }
-        mutex_unlock(&dev->mtx);
+        /* 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(&adutux_mutex); /* not interruptible */
-        mutex_lock(&dev->mtx); /* 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);
+                if (!dev->open_count)   /* ... and we're the last user */
-                adu_delete(dev);
+                        adu_delete(dev);
-                dev = NULL;
-        } else {
-                /* do the work */
-                retval = adu_release_internal(dev);
        }
 exit:
-        if (dev)
+        mutex_unlock(&adutux_mutex);
-                mutex_unlock(&dev->mtx);
        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);
+                                        retval = usb_submit_urb(dev->interrupt_in_urb, GFP_KERNEL);
-                                        if (!retval) {
+                                        if (retval) {
-                                                spin_unlock_irqrestore(&dev->buflock, flags);
+                                                dev->read_urb_finished = 1;
-                                                dbg(2," %s : submitted OK", __FUNCTION__);
-                                        } else {
                                                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,
+                                dev->interrupt_in_buffer,
-                                                le16_to_cpu(dev->interrupt_in_endpoint->wMaxPacketSize),
+                                le16_to_cpu(dev->interrupt_in_endpoint->wMaxPacketSize),
-                                                adu_interrupt_in_callback,
+                                adu_interrupt_in_callback,
-                                                dev,
+                                dev,
-                                                dev->interrupt_in_endpoint->bInterval);
+                                dev->interrupt_in_endpoint->bInterval);
-                /* dev->interrupt_in_urb->transfer_flags |= URB_ASYNC_UNLINK; */
+                if (usb_submit_urb(dev->interrupt_in_urb, GFP_KERNEL) != 0)
-                dev->read_urb_finished = 0;
+                        dev->read_urb_finished = 1;
-                usb_submit_urb(dev->interrupt_in_urb, GFP_KERNEL);
                /* 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) {
+                add_wait_queue(&dev->write_wait, &waita);
-                        timeout = COMMAND_TIMEOUT;
+                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) {
+                        mutex_unlock(&dev->mtx);
-                                if (signal_pending(current)) {
+                        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);
+                        if (schedule_timeout(COMMAND_TIMEOUT) == 0) {
-                        timeout = interruptible_sleep_on_timeout(&dev->write_wait, timeout);
+                                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_out_endpoint->bInterval);
-                        /* dev->interrupt_in_urb->transfer_flags |= URB_ASYNC_UNLINK; */
                        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;
                }
        }
+        mutex_unlock(&dev->mtx);
-        retval = bytes_written;
+        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) {
+        if (!dev->open_count)
-                mutex_unlock(&dev->mtx);
                adu_delete(dev);
-        } else {
-                dev->udev = NULL;
+        mutex_unlock(&adutux_mutex);
-                mutex_unlock(&dev->mtx);
-        }
        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_port_private     *p_priv;
-        struct keyspan_serial_private   *s_priv;
+        struct keyspan_serial_private   *s_priv;
-        struct usb_serial               *serial = port->serial;
+        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,
+UNUSUAL_DEV(  0x04b0, 0x040f, 0x0100, 0x0200,
-       "NIKON",
+                "NIKON",
-       "NIKON DSC D200",
+                "NIKON DSC D200",
-       US_SC_DEVICE, US_PR_DEVICE, NULL,
+                US_SC_DEVICE, US_PR_DEVICE, NULL,
-       US_FL_FIX_CAPACITY),
+                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->setsda(algo_data->data, 1);
-        algo_data->setscl(algo_data->data, 0);
+        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,
 };
author	Jeff Garzik <jeff@garzik.org>	2007-12-01 16:18:56 -0500
committer	Jeff Garzik <jeff@garzik.org>	2007-12-01 16:18:56 -0500
commit	c99da91e7a12724127475a85cc7a38214b3504e2 (patch)
tree	de0eb3fe32ce58804457963fd133a53bb8fba5b8 /drivers
parent	a31e23e15cbb9734c5883a4a7f58d8712d303e0b (diff)
parent	92d499d991ec4f5cbd00d6f33967eab9d3ee8d6c (diff)