186 files changed, 4910 insertions, 3304 deletions

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 0f9d4be7ed..1639998e4d 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -11,7 +11,7 @@ config ACPI
         bool "ACPI Support"
         depends on IA64 || X86
         depends on PCI
-        select PM
+        depends on PM
         default y
         ---help---
           Advanced Configuration and Power Interface (ACPI) support for 
@@ -97,6 +97,7 @@ config ACPI_BATTERY
 
 config ACPI_BUTTON
         tristate "Button"
+        depends on INPUT
         default y
         help
           This driver handles events on the power, sleep and lid buttons.
@@ -172,6 +173,7 @@ config ACPI_NUMA
 config ACPI_ASUS
         tristate "ASUS/Medion Laptop Extras"
         depends on X86
+        select BACKLIGHT_CLASS_DEVICE
         ---help---
           This driver provides support for extra features of ACPI-compatible
           ASUS laptops. As some of Medion laptops are made by ASUS, it may also
@@ -200,6 +202,7 @@ config ACPI_ASUS
 config ACPI_IBM
         tristate "IBM ThinkPad Laptop Extras"
         depends on X86
+        select BACKLIGHT_CLASS_DEVICE
         ---help---
           This is a Linux ACPI driver for the IBM ThinkPad laptops. It adds
           support for Fn-Fx key combinations, Bluetooth control, video
@@ -222,9 +225,21 @@ config ACPI_IBM_DOCK
 
           If you are not sure, say N here.
 
+config ACPI_IBM_BAY
+        bool "Legacy Removable Bay Support"
+        depends on ACPI_IBM
+        depends on ACPI_BAY=n
+        default n
+        ---help---
+          Allows the ibm_acpi driver to handle removable bays.
+          This support is obsoleted by CONFIG_ACPI_BAY.
+
+          If you are not sure, say N here.
+
 config ACPI_TOSHIBA
         tristate "Toshiba Laptop Extras"
         depends on X86
+        select BACKLIGHT_CLASS_DEVICE
         ---help---
           This driver adds support for access to certain system settings
           on "legacy free" Toshiba laptops.  These laptops can be recognized by
diff --git a/drivers/acpi/ac.c b/drivers/acpi/ac.c
index 11abc7bf77..6daeace796 100644
--- a/drivers/acpi/ac.c
+++ b/drivers/acpi/ac.c
@@ -109,7 +109,7 @@ static struct proc_dir_entry *acpi_ac_dir;
 
 static int acpi_ac_seq_show(struct seq_file *seq, void *offset)
 {
-        struct acpi_ac *ac = (struct acpi_ac *)seq->private;
+        struct acpi_ac *ac = seq->private;
 
 
         if (!ac)
@@ -187,7 +187,7 @@ static int acpi_ac_remove_fs(struct acpi_device *device)
 
 static void acpi_ac_notify(acpi_handle handle, u32 event, void *data)
 {
-        struct acpi_ac *ac = (struct acpi_ac *)data;
+        struct acpi_ac *ac = data;
         struct acpi_device *device = NULL;
 
 
@@ -221,10 +221,9 @@ static int acpi_ac_add(struct acpi_device *device)
         if (!device)
                 return -EINVAL;
 
-        ac = kmalloc(sizeof(struct acpi_ac), GFP_KERNEL);
+        ac = kzalloc(sizeof(struct acpi_ac), GFP_KERNEL);
         if (!ac)
                 return -ENOMEM;
-        memset(ac, 0, sizeof(struct acpi_ac));
 
         ac->device = device;
         strcpy(acpi_device_name(device), ACPI_AC_DEVICE_NAME);
@@ -269,7 +268,7 @@ static int acpi_ac_remove(struct acpi_device *device, int type)
         if (!device || !acpi_driver_data(device))
                 return -EINVAL;
 
-        ac = (struct acpi_ac *)acpi_driver_data(device);
+        ac = acpi_driver_data(device);
 
         status = acpi_remove_notify_handler(device->handle,
                                             ACPI_ALL_NOTIFY, acpi_ac_notify);
diff --git a/drivers/acpi/acpi_memhotplug.c b/drivers/acpi/acpi_memhotplug.c
index 6bcd9e8e7b..cd946ed192 100644
--- a/drivers/acpi/acpi_memhotplug.c
+++ b/drivers/acpi/acpi_memhotplug.c
@@ -395,10 +395,9 @@ static int acpi_memory_device_add(struct acpi_device *device)
         if (!device)
                 return -EINVAL;
 
-        mem_device = kmalloc(sizeof(struct acpi_memory_device), GFP_KERNEL);
+        mem_device = kzalloc(sizeof(struct acpi_memory_device), GFP_KERNEL);
         if (!mem_device)
                 return -ENOMEM;
-        memset(mem_device, 0, sizeof(struct acpi_memory_device));
 
         INIT_LIST_HEAD(&mem_device->res_list);
         mem_device->device = device;
@@ -429,7 +428,7 @@ static int acpi_memory_device_remove(struct acpi_device *device, int type)
         if (!device || !acpi_driver_data(device))
                 return -EINVAL;
 
-        mem_device = (struct acpi_memory_device *)acpi_driver_data(device);
+        mem_device = acpi_driver_data(device);
         kfree(mem_device);
 
         return 0;
diff --git a/drivers/acpi/asus_acpi.c b/drivers/acpi/asus_acpi.c
index c7ac9297a2..396140bbbe 100644
--- a/drivers/acpi/asus_acpi.c
+++ b/drivers/acpi/asus_acpi.c
@@ -35,6 +35,7 @@
 #include <linux/init.h>
 #include <linux/types.h>
 #include <linux/proc_fs.h>
+#include <linux/backlight.h>
 #include <acpi/acpi_drivers.h>
 #include <acpi/acpi_bus.h>
 #include <asm/uaccess.h>
@@ -402,6 +403,8 @@ static struct model_data model_conf[END_MODEL] = {
 /* procdir we use */
 static struct proc_dir_entry *asus_proc_dir;
 
+static struct backlight_device *asus_backlight_device;
+
 /*
  * This header is made available to allow proper configuration given model,
  * revision number , ... this info cannot go in struct asus_hotk because it is
@@ -779,7 +782,7 @@ proc_write_lcd(struct file *file, const char __user * buffer,
         return rv;
 }
 
-static int read_brightness(void)
+static int read_brightness(struct backlight_device *bd)
 {
         int value;
 
@@ -801,9 +804,10 @@ static int read_brightness(void)
 /*
  * Change the brightness level
  */
-static void set_brightness(int value)
+static int set_brightness(int value)
 {
         acpi_status status = 0;
+        int ret = 0;
 
         /* SPLV laptop */
         if (hotk->methods->brightness_set) {
@@ -811,11 +815,12 @@ static void set_brightness(int value)
                                     value, NULL))
                         printk(KERN_WARNING
                                "Asus ACPI: Error changing brightness\n");
-                return;
+                        ret = -EIO;
+                goto out;
         }
 
         /* No SPLV method if we are here, act as appropriate */
-        value -= read_brightness();
+        value -= read_brightness(NULL);
         while (value != 0) {
                 status = acpi_evaluate_object(NULL, (value > 0) ?
                                               hotk->methods->brightness_up :
@@ -825,15 +830,22 @@ static void set_brightness(int value)
                 if (ACPI_FAILURE(status))
                         printk(KERN_WARNING
                                "Asus ACPI: Error changing brightness\n");
+                        ret = -EIO;
         }
-        return;
+out:
+        return ret;
+}
+
+static int set_brightness_status(struct backlight_device *bd)
+{
+        return set_brightness(bd->props->brightness);
 }
 
 static int
 proc_read_brn(char *page, char **start, off_t off, int count, int *eof,
               void *data)
 {
-        return sprintf(page, "%d\n", read_brightness());
+        return sprintf(page, "%d\n", read_brightness(NULL));
 }
 
 static int
@@ -1134,7 +1146,7 @@ static int asus_hotk_get_info(void)
         if (ACPI_FAILURE(status))
                 printk(KERN_WARNING "  Couldn't get the DSDT table header\n");
         else
-                asus_info = (struct acpi_table_header *)dsdt.pointer;
+                asus_info = dsdt.pointer;
 
         /* We have to write 0 on init this far for all ASUS models */
         if (!write_acpi_int(hotk->handle, "INIT", 0, &buffer)) {
@@ -1156,7 +1168,7 @@ static int asus_hotk_get_info(void)
          * asus_model_match() and try something completely different.
          */
         if (buffer.pointer) {
-                model = (union acpi_object *)buffer.pointer;
+                model = buffer.pointer;
                 switch (model->type) {
                 case ACPI_TYPE_STRING:
                         string = model->string.pointer;
@@ -1252,11 +1264,9 @@ static int asus_hotk_add(struct acpi_device *device)
         printk(KERN_NOTICE "Asus Laptop ACPI Extras version %s\n",
                ASUS_ACPI_VERSION);
 
-        hotk =
-            (struct asus_hotk *)kmalloc(sizeof(struct asus_hotk), GFP_KERNEL);
+        hotk = kzalloc(sizeof(struct asus_hotk), GFP_KERNEL);
         if (!hotk)
                 return -ENOMEM;
-        memset(hotk, 0, sizeof(struct asus_hotk));
 
         hotk->handle = device->handle;
         strcpy(acpi_device_name(device), ACPI_HOTK_DEVICE_NAME);
@@ -1333,6 +1343,26 @@ static int asus_hotk_remove(struct acpi_device *device, int type)
         return 0;
 }
 
+static struct backlight_properties asus_backlight_data = {
+        .owner          = THIS_MODULE,
+        .get_brightness = read_brightness,
+        .update_status  = set_brightness_status,
+        .max_brightness = 15,
+};
+
+static void __exit asus_acpi_exit(void)
+{
+        if (asus_backlight_device)
+                backlight_device_unregister(asus_backlight_device);
+
+        acpi_bus_unregister_driver(&asus_hotk_driver);
+        remove_proc_entry(PROC_ASUS, acpi_root_dir);
+
+        kfree(asus_info);
+
+        return;
+}
+
 static int __init asus_acpi_init(void)
 {
         int result;
@@ -1370,17 +1400,15 @@ static int __init asus_acpi_init(void)
                 return result;
         }
 
-        return 0;
-}
-
-static void __exit asus_acpi_exit(void)
-{
-        acpi_bus_unregister_driver(&asus_hotk_driver);
-        remove_proc_entry(PROC_ASUS, acpi_root_dir);
-
-        kfree(asus_info);
+        asus_backlight_device = backlight_device_register("asus",NULL,NULL,
+                                                          &asus_backlight_data);
+        if (IS_ERR(asus_backlight_device)) {
+                printk(KERN_ERR "Could not register asus backlight device\n");
+                asus_backlight_device = NULL;
+                asus_acpi_exit();
+        }
 
-        return;
+        return 0;
 }
 
 module_init(asus_acpi_init);
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index 026e40755c..5f43e0d148 100644
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -149,7 +149,7 @@ acpi_battery_get_info(struct acpi_battery *battery,
                 return -ENODEV;
         }
 
-        package = (union acpi_object *)buffer.pointer;
+        package = buffer.pointer;
 
         /* Extract Package Data */
 
@@ -160,12 +160,11 @@ acpi_battery_get_info(struct acpi_battery *battery,
                 goto end;
         }
 
-        data.pointer = kmalloc(data.length, GFP_KERNEL);
+        data.pointer = kzalloc(data.length, GFP_KERNEL);
         if (!data.pointer) {
                 result = -ENOMEM;
                 goto end;
         }
-        memset(data.pointer, 0, data.length);
 
         status = acpi_extract_package(package, &format, &data);
         if (ACPI_FAILURE(status)) {
@@ -179,7 +178,7 @@ acpi_battery_get_info(struct acpi_battery *battery,
         kfree(buffer.pointer);
 
         if (!result)
-                (*bif) = (struct acpi_battery_info *)data.pointer;
+                (*bif) = data.pointer;
 
         return result;
 }
@@ -209,7 +208,7 @@ acpi_battery_get_status(struct acpi_battery *battery,
                 return -ENODEV;
         }
 
-        package = (union acpi_object *)buffer.pointer;
+        package = buffer.pointer;
 
         /* Extract Package Data */
 
@@ -220,12 +219,11 @@ acpi_battery_get_status(struct acpi_battery *battery,
                 goto end;
         }
 
-        data.pointer = kmalloc(data.length, GFP_KERNEL);
+        data.pointer = kzalloc(data.length, GFP_KERNEL);
         if (!data.pointer) {
                 result = -ENOMEM;
                 goto end;
         }
-        memset(data.pointer, 0, data.length);
 
         status = acpi_extract_package(package, &format, &data);
         if (ACPI_FAILURE(status)) {
@@ -239,7 +237,7 @@ acpi_battery_get_status(struct acpi_battery *battery,
         kfree(buffer.pointer);
 
         if (!result)
-                (*bst) = (struct acpi_battery_status *)data.pointer;
+                (*bst) = data.pointer;
 
         return result;
 }
@@ -334,7 +332,7 @@ static struct proc_dir_entry *acpi_battery_dir;
 static int acpi_battery_read_info(struct seq_file *seq, void *offset)
 {
         int result = 0;
-        struct acpi_battery *battery = (struct acpi_battery *)seq->private;
+        struct acpi_battery *battery = seq->private;
         struct acpi_battery_info *bif = NULL;
         char *units = "?";
 
@@ -418,7 +416,7 @@ static int acpi_battery_info_open_fs(struct inode *inode, struct file *file)
 static int acpi_battery_read_state(struct seq_file *seq, void *offset)
 {
         int result = 0;
-        struct acpi_battery *battery = (struct acpi_battery *)seq->private;
+        struct acpi_battery *battery = seq->private;
         struct acpi_battery_status *bst = NULL;
         char *units = "?";
 
@@ -494,7 +492,7 @@ static int acpi_battery_state_open_fs(struct inode *inode, struct file *file)
 
 static int acpi_battery_read_alarm(struct seq_file *seq, void *offset)
 {
-        struct acpi_battery *battery = (struct acpi_battery *)seq->private;
+        struct acpi_battery *battery = seq->private;
         char *units = "?";
 
 
@@ -531,8 +529,8 @@ acpi_battery_write_alarm(struct file *file,
 {
         int result = 0;
         char alarm_string[12] = { '\0' };
-        struct seq_file *m = (struct seq_file *)file->private_data;
-        struct acpi_battery *battery = (struct acpi_battery *)m->private;
+        struct seq_file *m = file->private_data;
+        struct acpi_battery *battery = m->private;
 
 
         if (!battery || (count > sizeof(alarm_string) - 1))
@@ -658,7 +656,7 @@ static int acpi_battery_remove_fs(struct acpi_device *device)
 
 static void acpi_battery_notify(acpi_handle handle, u32 event, void *data)
 {
-        struct acpi_battery *battery = (struct acpi_battery *)data;
+        struct acpi_battery *battery = data;
         struct acpi_device *device = NULL;
 
 
@@ -694,10 +692,9 @@ static int acpi_battery_add(struct acpi_device *device)
         if (!device)
                 return -EINVAL;
 
-        battery = kmalloc(sizeof(struct acpi_battery), GFP_KERNEL);
+        battery = kzalloc(sizeof(struct acpi_battery), GFP_KERNEL);
         if (!battery)
                 return -ENOMEM;
-        memset(battery, 0, sizeof(struct acpi_battery));
 
         battery->device = device;
         strcpy(acpi_device_name(device), ACPI_BATTERY_DEVICE_NAME);
@@ -742,7 +739,7 @@ static int acpi_battery_remove(struct acpi_device *device, int type)
         if (!device || !acpi_driver_data(device))
                 return -EINVAL;
 
-        battery = (struct acpi_battery *)acpi_driver_data(device);
+        battery = acpi_driver_data(device);
 
         status = acpi_remove_notify_handler(device->handle,
                                             ACPI_ALL_NOTIFY,
diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c
index 5ef885e82c..ac860583c2 100644
--- a/drivers/acpi/button.c
+++ b/drivers/acpi/button.c
@@ -29,6 +29,7 @@
 #include <linux/types.h>
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
+#include <linux/input.h>
 #include <acpi/acpi_bus.h>
 #include <acpi/acpi_drivers.h>
 
@@ -62,7 +63,7 @@
 #define _COMPONENT              ACPI_BUTTON_COMPONENT
 ACPI_MODULE_NAME("acpi_button")
 
-    MODULE_AUTHOR("Paul Diefenbaugh");
+MODULE_AUTHOR("Paul Diefenbaugh");
 MODULE_DESCRIPTION(ACPI_BUTTON_DRIVER_NAME);
 MODULE_LICENSE("GPL");
 
@@ -78,12 +79,14 @@ static struct acpi_driver acpi_button_driver = {
         .ops = {
                 .add = acpi_button_add,
                 .remove = acpi_button_remove,
-                },
+        },
 };
 
 struct acpi_button {
         struct acpi_device *device;     /* Fixed button kludge */
-        u8 type;
+        unsigned int type;
+        struct input_dev *input;
+        char phys[32];                  /* for input device */
         unsigned long pushed;
 };
 
@@ -109,8 +112,7 @@ static struct proc_dir_entry *acpi_button_dir;
 
 static int acpi_button_info_seq_show(struct seq_file *seq, void *offset)
 {
-        struct acpi_button *button = (struct acpi_button *)seq->private;
-
+        struct acpi_button *button = seq->private;
 
         if (!button || !button->device)
                 return 0;
@@ -128,22 +130,17 @@ static int acpi_button_info_open_fs(struct inode *inode, struct file *file)
 
 static int acpi_button_state_seq_show(struct seq_file *seq, void *offset)
 {
-        struct acpi_button *button = (struct acpi_button *)seq->private;
+        struct acpi_button *button = seq->private;
         acpi_status status;
         unsigned long state;
 
-
         if (!button || !button->device)
                 return 0;
 
         status = acpi_evaluate_integer(button->device->handle, "_LID", NULL, &state);
-        if (ACPI_FAILURE(status)) {
-                seq_printf(seq, "state:      unsupported\n");
-        } else {
-                seq_printf(seq, "state:      %s\n",
-                           (state ? "open" : "closed"));
-        }
-
+        seq_printf(seq, "state:      %s\n",
+                   ACPI_FAILURE(status) ? "unsupported" :
+                        (state ? "open" : "closed"));
         return 0;
 }
 
@@ -159,8 +156,7 @@ static struct proc_dir_entry *acpi_lid_dir;
 static int acpi_button_add_fs(struct acpi_device *device)
 {
         struct proc_dir_entry *entry = NULL;
-        struct acpi_button *button = NULL;
-
+        struct acpi_button *button;
 
         if (!device || !acpi_driver_data(device))
                 return -EINVAL;
@@ -228,10 +224,8 @@ static int acpi_button_add_fs(struct acpi_device *device)
 
 static int acpi_button_remove_fs(struct acpi_device *device)
 {
-        struct acpi_button *button = NULL;
-
+        struct acpi_button *button = acpi_driver_data(device);
 
-        button = acpi_driver_data(device);
         if (acpi_device_dir(device)) {
                 if (button->type == ACPI_BUTTON_TYPE_LID)
                         remove_proc_entry(ACPI_BUTTON_FILE_STATE,
@@ -253,14 +247,34 @@ static int acpi_button_remove_fs(struct acpi_device *device)
 
 static void acpi_button_notify(acpi_handle handle, u32 event, void *data)
 {
-        struct acpi_button *button = (struct acpi_button *)data;
-
+        struct acpi_button *button = data;
+        struct input_dev *input;
 
         if (!button || !button->device)
                 return;
 
         switch (event) {
         case ACPI_BUTTON_NOTIFY_STATUS:
+                input = button->input;
+
+                if (button->type == ACPI_BUTTON_TYPE_LID) {
+                        struct acpi_handle *handle = button->device->handle;
+                        unsigned long state;
+
+                        if (!ACPI_FAILURE(acpi_evaluate_integer(handle, "_LID",
+                                                                NULL, &state)))
+                                input_report_switch(input, SW_LID, !state);
+
+                } else {
+                        int keycode = test_bit(KEY_SLEEP, input->keybit) ?
+                                                KEY_SLEEP : KEY_POWER;
+
+                        input_report_key(input, keycode, 1);
+                        input_sync(input);
+                        input_report_key(input, keycode, 0);
+                }
+                input_sync(input);
+
                 acpi_bus_generate_event(button->device, event,
                                         ++button->pushed);
                 break;
@@ -275,8 +289,7 @@ static void acpi_button_notify(acpi_handle handle, u32 event, void *data)
 
 static acpi_status acpi_button_notify_fixed(void *data)
 {
-        struct acpi_button *button = (struct acpi_button *)data;
-
+        struct acpi_button *button = data;
 
         if (!button)
                 return AE_BAD_PARAMETER;
@@ -286,24 +299,75 @@ static acpi_status acpi_button_notify_fixed(void *data)
         return AE_OK;
 }
 
-static int acpi_button_add(struct acpi_device *device)
+static int acpi_button_install_notify_handlers(struct acpi_button *button)
 {
-        int result = 0;
-        acpi_status status = AE_OK;
-        struct acpi_button *button = NULL;
+        acpi_status status;
 
+        switch (button->type) {
+        case ACPI_BUTTON_TYPE_POWERF:
+                status =
+                    acpi_install_fixed_event_handler(ACPI_EVENT_POWER_BUTTON,
+                                                     acpi_button_notify_fixed,
+                                                     button);
+                break;
+        case ACPI_BUTTON_TYPE_SLEEPF:
+                status =
+                    acpi_install_fixed_event_handler(ACPI_EVENT_SLEEP_BUTTON,
+                                                     acpi_button_notify_fixed,
+                                                     button);
+                break;
+        default:
+                status = acpi_install_notify_handler(button->device->handle,
+                                                     ACPI_DEVICE_NOTIFY,
+                                                     acpi_button_notify,
+                                                     button);
+                break;
+        }
+
+        return ACPI_FAILURE(status) ? -ENODEV : 0;
+}
+
+static void acpi_button_remove_notify_handlers(struct acpi_button *button)
+{
+        switch (button->type) {
+        case ACPI_BUTTON_TYPE_POWERF:
+                acpi_remove_fixed_event_handler(ACPI_EVENT_POWER_BUTTON,
+                                                acpi_button_notify_fixed);
+                break;
+        case ACPI_BUTTON_TYPE_SLEEPF:
+                acpi_remove_fixed_event_handler(ACPI_EVENT_SLEEP_BUTTON,
+                                                acpi_button_notify_fixed);
+                break;
+        default:
+                acpi_remove_notify_handler(button->device->handle,
+                                           ACPI_DEVICE_NOTIFY,
+                                           acpi_button_notify);
+                break;
+        }
+}
+
+static int acpi_button_add(struct acpi_device *device)
+{
+        int error;
+        struct acpi_button *button;
+        struct input_dev *input;
 
         if (!device)
                 return -EINVAL;
 
-        button = kmalloc(sizeof(struct acpi_button), GFP_KERNEL);
+        button = kzalloc(sizeof(struct acpi_button), GFP_KERNEL);
         if (!button)
                 return -ENOMEM;
-        memset(button, 0, sizeof(struct acpi_button));
 
         button->device = device;
         acpi_driver_data(device) = button;
 
+        button->input = input = input_allocate_device();
+        if (!input) {
+                error = -ENOMEM;
+                goto err_free_button;
+        }
+
         /*
          * Determine the button type (via hid), as fixed-feature buttons
          * need to be handled a bit differently than generic-space.
@@ -338,39 +402,48 @@ static int acpi_button_add(struct acpi_device *device)
         } else {
                 printk(KERN_ERR PREFIX "Unsupported hid [%s]\n",
                             acpi_device_hid(device));
-                result = -ENODEV;
-                goto end;
+                error = -ENODEV;
+                goto err_free_input;
         }
 
-        result = acpi_button_add_fs(device);
-        if (result)
-                goto end;
+        error = acpi_button_add_fs(device);
+        if (error)
+                goto err_free_input;
+
+        error = acpi_button_install_notify_handlers(button);
+        if (error)
+                goto err_remove_fs;
+
+        snprintf(button->phys, sizeof(button->phys),
+                 "%s/button/input0", acpi_device_hid(device));
+
+        input->name = acpi_device_name(device);
+        input->phys = button->phys;
+        input->id.bustype = BUS_HOST;
+        input->id.product = button->type;
 
         switch (button->type) {
+        case ACPI_BUTTON_TYPE_POWER:
         case ACPI_BUTTON_TYPE_POWERF:
-                status =
-                    acpi_install_fixed_event_handler(ACPI_EVENT_POWER_BUTTON,
-                                                     acpi_button_notify_fixed,
-                                                     button);
+                input->evbit[0] = BIT(EV_KEY);
+                set_bit(KEY_POWER, input->keybit);
                 break;
+
+        case ACPI_BUTTON_TYPE_SLEEP:
         case ACPI_BUTTON_TYPE_SLEEPF:
-                status =
-                    acpi_install_fixed_event_handler(ACPI_EVENT_SLEEP_BUTTON,
-                                                     acpi_button_notify_fixed,
-                                                     button);
+                input->evbit[0] = BIT(EV_KEY);
+                set_bit(KEY_SLEEP, input->keybit);
                 break;
-        default:
-                status = acpi_install_notify_handler(device->handle,
-                                                     ACPI_DEVICE_NOTIFY,
-                                                     acpi_button_notify,
-                                                     button);
+
+        case ACPI_BUTTON_TYPE_LID:
+                input->evbit[0] = BIT(EV_SW);
+                set_bit(SW_LID, input->swbit);
                 break;
         }
 
-        if (ACPI_FAILURE(status)) {
-                result = -ENODEV;
-                goto end;
-        }
+        error = input_register_device(input);
+        if (error)
+                goto err_remove_handlers;
 
         if (device->wakeup.flags.valid) {
                 /* Button's GPE is run-wake GPE */
@@ -385,47 +458,31 @@ static int acpi_button_add(struct acpi_device *device)
         printk(KERN_INFO PREFIX "%s [%s]\n",
                acpi_device_name(device), acpi_device_bid(device));
 
-      end:
-        if (result) {
-                acpi_button_remove_fs(device);
-                kfree(button);
-        }
+        return 0;
 
-        return result;
+ err_remove_handlers:
+        acpi_button_remove_notify_handlers(button);
+ err_remove_fs:
+        acpi_button_remove_fs(device);
+ err_free_input:
+        input_free_device(input);
+ err_free_button:
+        kfree(button);
+        return error;
 }
 
 static int acpi_button_remove(struct acpi_device *device, int type)
 {
-        acpi_status status = 0;
-        struct acpi_button *button = NULL;
-
+        struct acpi_button *button;
 
         if (!device || !acpi_driver_data(device))
                 return -EINVAL;
 
         button = acpi_driver_data(device);
 
-        /* Unregister for device notifications. */
-        switch (button->type) {
-        case ACPI_BUTTON_TYPE_POWERF:
-                status =
-                    acpi_remove_fixed_event_handler(ACPI_EVENT_POWER_BUTTON,
-                                                    acpi_button_notify_fixed);
-                break;
-        case ACPI_BUTTON_TYPE_SLEEPF:
-                status =
-                    acpi_remove_fixed_event_handler(ACPI_EVENT_SLEEP_BUTTON,
-                                                    acpi_button_notify_fixed);
-                break;
-        default:
-                status = acpi_remove_notify_handler(device->handle,
-                                                    ACPI_DEVICE_NOTIFY,
-                                                    acpi_button_notify);
-                break;
-        }
-
+        acpi_button_remove_notify_handlers(button);
         acpi_button_remove_fs(device);
-
+        input_unregister_device(button->input);
         kfree(button);
 
         return 0;
@@ -433,8 +490,7 @@ static int acpi_button_remove(struct acpi_device *device, int type)
 
 static int __init acpi_button_init(void)
 {
-        int result = 0;
-
+        int result;
 
         acpi_button_dir = proc_mkdir(ACPI_BUTTON_CLASS, acpi_root_dir);
         if (!acpi_button_dir)
@@ -451,7 +507,6 @@ static int __init acpi_button_init(void)
 
 static void __exit acpi_button_exit(void)
 {
-
         acpi_bus_unregister_driver(&acpi_button_driver);
 
         if (acpi_power_dir)
@@ -461,8 +516,6 @@ static void __exit acpi_button_exit(void)
         if (acpi_lid_dir)
                 remove_proc_entry(ACPI_BUTTON_SUBCLASS_LID, acpi_button_dir);
         remove_proc_entry(ACPI_BUTTON_CLASS, acpi_root_dir);
-
-        return;
 }
 
 module_init(acpi_button_init);
diff --git a/drivers/acpi/container.c b/drivers/acpi/container.c
index 871aa520ec..0a1863ec91 100644
--- a/drivers/acpi/container.c
+++ b/drivers/acpi/container.c
@@ -96,11 +96,10 @@ static int acpi_container_add(struct acpi_device *device)
                 return -EINVAL;
         }
 
-        container = kmalloc(sizeof(struct acpi_container), GFP_KERNEL);
+        container = kzalloc(sizeof(struct acpi_container), GFP_KERNEL);
         if (!container)
                 return -ENOMEM;
 
-        memset(container, 0, sizeof(struct acpi_container));
         container->handle = device->handle;
         strcpy(acpi_device_name(device), ACPI_CONTAINER_DEVICE_NAME);
         strcpy(acpi_device_class(device), ACPI_CONTAINER_CLASS);
@@ -117,7 +116,7 @@ static int acpi_container_remove(struct acpi_device *device, int type)
         acpi_status status = AE_OK;
         struct acpi_container *pc = NULL;
 
-        pc = (struct acpi_container *)acpi_driver_data(device);
+        pc = acpi_driver_data(device);
         kfree(pc);
         return status;
 }
diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c
index bf5b79ed36..90990a4b65 100644
--- a/drivers/acpi/dock.c
+++ b/drivers/acpi/dock.c
@@ -27,6 +27,7 @@
 #include <linux/init.h>
 #include <linux/types.h>
 #include <linux/notifier.h>
+#include <linux/platform_device.h>
 #include <linux/jiffies.h>
 #include <acpi/acpi_bus.h>
 #include <acpi/acpi_drivers.h>
@@ -39,13 +40,15 @@ MODULE_DESCRIPTION(ACPI_DOCK_DRIVER_NAME);
 MODULE_LICENSE("GPL");
 
 static struct atomic_notifier_head dock_notifier_list;
+static struct platform_device dock_device;
+static char dock_device_name[] = "dock";
 
 struct dock_station {
         acpi_handle handle;
         unsigned long last_dock_time;
         u32 flags;
         spinlock_t dd_lock;
-        spinlock_t hp_lock;
+        struct mutex hp_lock;
         struct list_head dependent_devices;
         struct list_head hotplug_devices;
 };
@@ -115,9 +118,9 @@ static void
 dock_add_hotplug_device(struct dock_station *ds,
                         struct dock_dependent_device *dd)
 {
-        spin_lock(&ds->hp_lock);
+        mutex_lock(&ds->hp_lock);
         list_add_tail(&dd->hotplug_list, &ds->hotplug_devices);
-        spin_unlock(&ds->hp_lock);
+        mutex_unlock(&ds->hp_lock);
 }
 
 /**
@@ -131,9 +134,9 @@ static void
 dock_del_hotplug_device(struct dock_station *ds,
                         struct dock_dependent_device *dd)
 {
-        spin_lock(&ds->hp_lock);
+        mutex_lock(&ds->hp_lock);
         list_del(&dd->hotplug_list);
-        spin_unlock(&ds->hp_lock);
+        mutex_unlock(&ds->hp_lock);
 }
 
 /**
@@ -296,7 +299,7 @@ static void hotplug_dock_devices(struct dock_station *ds, u32 event)
 {
         struct dock_dependent_device *dd;
 
-        spin_lock(&ds->hp_lock);
+        mutex_lock(&ds->hp_lock);
 
         /*
          * First call driver specific hotplug functions
@@ -318,15 +321,17 @@ static void hotplug_dock_devices(struct dock_station *ds, u32 event)
                 else
                         dock_create_acpi_device(dd->handle);
         }
-        spin_unlock(&ds->hp_lock);
+        mutex_unlock(&ds->hp_lock);
 }
 
 static void dock_event(struct dock_station *ds, u32 event, int num)
 {
+        struct device *dev = &dock_device.dev;
         /*
-         * we don't do events until someone tells me that
-         * they would like to have them.
+         * Indicate that the status of the dock station has
+         * changed.
          */
+        kobject_uevent(&dev->kobj, KOBJ_CHANGE);
 }
 
 /**
@@ -441,6 +446,9 @@ static int dock_in_progress(struct dock_station *ds)
  */
 int register_dock_notifier(struct notifier_block *nb)
 {
+        if (!dock_station)
+                return -ENODEV;
+
         return atomic_notifier_chain_register(&dock_notifier_list, nb);
 }
 
@@ -452,6 +460,9 @@ EXPORT_SYMBOL_GPL(register_dock_notifier);
  */
 void unregister_dock_notifier(struct notifier_block *nb)
 {
+        if (!dock_station)
+                return;
+
         atomic_notifier_chain_unregister(&dock_notifier_list, nb);
 }
 
@@ -512,6 +523,37 @@ void unregister_hotplug_dock_device(acpi_handle handle)
 EXPORT_SYMBOL_GPL(unregister_hotplug_dock_device);
 
 /**
+ * handle_eject_request - handle an undock request checking for error conditions
+ *
+ * Check to make sure the dock device is still present, then undock and
+ * hotremove all the devices that may need removing.
+ */
+static int handle_eject_request(struct dock_station *ds, u32 event)
+{
+        if (!dock_present(ds))
+                return -ENODEV;
+
+        if (dock_in_progress(ds))
+                return -EBUSY;
+
+        /*
+         * here we need to generate the undock
+         * event prior to actually doing the undock
+         * so that the device struct still exists.
+         */
+        dock_event(ds, event, UNDOCK_EVENT);
+        hotplug_dock_devices(ds, ACPI_NOTIFY_EJECT_REQUEST);
+        undock(ds);
+        eject_dock(ds);
+        if (dock_present(ds)) {
+                printk(KERN_ERR PREFIX "Unable to undock!\n");
+                return -EBUSY;
+        }
+
+        return 0;
+}
+
+/**
  * dock_notify - act upon an acpi dock notification
  * @handle: the dock station handle
  * @event: the acpi event
@@ -519,13 +561,11 @@ EXPORT_SYMBOL_GPL(unregister_hotplug_dock_device);
  *
  * If we are notified to dock, then check to see if the dock is
  * present and then dock.  Notify all drivers of the dock event,
- * and then hotplug and devices that may need hotplugging.  For undock
- * check to make sure the dock device is still present, then undock
- * and hotremove all the devices that may need removing.
+ * and then hotplug and devices that may need hotplugging.
  */
 static void dock_notify(acpi_handle handle, u32 event, void *data)
 {
-        struct dock_station *ds = (struct dock_station *)data;
+        struct dock_station *ds = data;
 
         switch (event) {
         case ACPI_NOTIFY_BUS_CHECK:
@@ -553,19 +593,7 @@ static void dock_notify(acpi_handle handle, u32 event, void *data)
          * to the driver who wish to hotplug.
          */
         case ACPI_NOTIFY_EJECT_REQUEST:
-                if (!dock_in_progress(ds) && dock_present(ds)) {
-                        /*
-                         * here we need to generate the undock
-                         * event prior to actually doing the undock
-                         * so that the device struct still exists.
-                         */
-                        dock_event(ds, event, UNDOCK_EVENT);
-                        hotplug_dock_devices(ds, ACPI_NOTIFY_EJECT_REQUEST);
-                        undock(ds);
-                        eject_dock(ds);
-                        if (dock_present(ds))
-                                printk(KERN_ERR PREFIX "Unable to undock!\n");
-                }
+                handle_eject_request(ds, event);
                 break;
         default:
                 printk(KERN_ERR PREFIX "Unknown dock event %d\n", event);
@@ -588,7 +616,7 @@ find_dock_devices(acpi_handle handle, u32 lvl, void *context, void **rv)
 {
         acpi_status status;
         acpi_handle tmp;
-        struct dock_station *ds = (struct dock_station *)context;
+        struct dock_station *ds = context;
         struct dock_dependent_device *dd;
 
         status = acpi_bus_get_ejd(handle, &tmp);
@@ -604,6 +632,33 @@ find_dock_devices(acpi_handle handle, u32 lvl, void *context, void **rv)
         return AE_OK;
 }
 
+/*
+ * show_docked - read method for "docked" file in sysfs
+ */
+static ssize_t show_docked(struct device *dev,
+                           struct device_attribute *attr, char *buf)
+{
+        return snprintf(buf, PAGE_SIZE, "%d\n", dock_present(dock_station));
+
+}
+DEVICE_ATTR(docked, S_IRUGO, show_docked, NULL);
+
+/*
+ * write_undock - write method for "undock" file in sysfs
+ */
+static ssize_t write_undock(struct device *dev, struct device_attribute *attr,
+                           const char *buf, size_t count)
+{
+        int ret;
+
+        if (!count)
+                return -EINVAL;
+
+        ret = handle_eject_request(dock_station, ACPI_NOTIFY_EJECT_REQUEST);
+        return ret ? ret: count;
+}
+DEVICE_ATTR(undock, S_IWUSR, NULL, write_undock);
+
 /**
  * dock_add - add a new dock station
  * @handle: the dock station handle
@@ -626,9 +681,33 @@ static int dock_add(acpi_handle handle)
         INIT_LIST_HEAD(&dock_station->dependent_devices);
         INIT_LIST_HEAD(&dock_station->hotplug_devices);
         spin_lock_init(&dock_station->dd_lock);
-        spin_lock_init(&dock_station->hp_lock);
+        mutex_init(&dock_station->hp_lock);
         ATOMIC_INIT_NOTIFIER_HEAD(&dock_notifier_list);
 
+        /* initialize platform device stuff */
+        dock_device.name = dock_device_name;
+        ret = platform_device_register(&dock_device);
+        if (ret) {
+                printk(KERN_ERR PREFIX "Error %d registering dock device\n", ret);
+                kfree(dock_station);
+                return ret;
+        }
+        ret = device_create_file(&dock_device.dev, &dev_attr_docked);
+        if (ret) {
+                printk("Error %d adding sysfs file\n", ret);
+                platform_device_unregister(&dock_device);
+                kfree(dock_station);
+                return ret;
+        }
+        ret = device_create_file(&dock_device.dev, &dev_attr_undock);
+        if (ret) {
+                printk("Error %d adding sysfs file\n", ret);
+                device_remove_file(&dock_device.dev, &dev_attr_docked);
+                platform_device_unregister(&dock_device);
+                kfree(dock_station);
+                return ret;
+        }
+
         /* Find dependent devices */
         acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,
                             ACPI_UINT32_MAX, find_dock_devices, dock_station,
@@ -638,7 +717,8 @@ static int dock_add(acpi_handle handle)
         dd = alloc_dock_dependent_device(handle);
         if (!dd) {
                 kfree(dock_station);
-                return -ENOMEM;
+                ret = -ENOMEM;
+                goto dock_add_err_unregister;
         }
         add_dock_dependent_device(dock_station, dd);
 
@@ -658,8 +738,12 @@ static int dock_add(acpi_handle handle)
         return 0;
 
 dock_add_err:
-        kfree(dock_station);
         kfree(dd);
+dock_add_err_unregister:
+        device_remove_file(&dock_device.dev, &dev_attr_docked);
+        device_remove_file(&dock_device.dev, &dev_attr_undock);
+        platform_device_unregister(&dock_device);
+        kfree(dock_station);
         return ret;
 }
 
@@ -686,6 +770,11 @@ static int dock_remove(void)
         if (ACPI_FAILURE(status))
                 printk(KERN_ERR "Error removing notify handler\n");
 
+        /* cleanup sysfs */
+        device_remove_file(&dock_device.dev, &dev_attr_docked);
+        device_remove_file(&dock_device.dev, &dev_attr_undock);
+        platform_device_unregister(&dock_device);
+
         /* free dock station memory */
         kfree(dock_station);
         return 0;
@@ -703,7 +792,7 @@ static int dock_remove(void)
 static acpi_status
 find_dock(acpi_handle handle, u32 lvl, void *context, void **rv)
 {
-        int *count = (int *)context;
+        int *count = context;
         acpi_status status = AE_OK;
 
         if (is_dock(handle)) {
@@ -726,7 +815,7 @@ static int __init dock_init(void)
                             ACPI_UINT32_MAX, find_dock, &num, NULL);
 
         if (!num)
-                return -ENODEV;
+                printk(KERN_INFO "No dock devices found.\n");
 
         return 0;
 }
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index e6d4b084dc..9c52d87d6f 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -45,35 +45,34 @@ ACPI_MODULE_NAME("acpi_ec")
 #define ACPI_EC_DRIVER_NAME             "ACPI Embedded Controller Driver"
 #define ACPI_EC_DEVICE_NAME             "Embedded Controller"
 #define ACPI_EC_FILE_INFO               "info"
-
+#undef PREFIX
+#define PREFIX                          "ACPI: EC: "
 /* EC status register */
 #define ACPI_EC_FLAG_OBF        0x01    /* Output buffer full */
 #define ACPI_EC_FLAG_IBF        0x02    /* Input buffer full */
 #define ACPI_EC_FLAG_BURST      0x10    /* burst mode */
 #define ACPI_EC_FLAG_SCI        0x20    /* EC-SCI occurred */
-
 /* EC commands */
-#define ACPI_EC_COMMAND_READ    0x80
-#define ACPI_EC_COMMAND_WRITE   0x81
-#define ACPI_EC_BURST_ENABLE    0x82
-#define ACPI_EC_BURST_DISABLE   0x83
-#define ACPI_EC_COMMAND_QUERY   0x84
-
+enum ec_command {
+        ACPI_EC_COMMAND_READ = 0x80,
+        ACPI_EC_COMMAND_WRITE = 0x81,
+        ACPI_EC_BURST_ENABLE = 0x82,
+        ACPI_EC_BURST_DISABLE = 0x83,
+        ACPI_EC_COMMAND_QUERY = 0x84,
+};
 /* EC events */
-enum {
+enum ec_event {
         ACPI_EC_EVENT_OBF_1 = 1,        /* Output buffer full */
-        ACPI_EC_EVENT_IBF_0,            /* Input buffer empty */
+        ACPI_EC_EVENT_IBF_0,    /* Input buffer empty */
 };
 
-#define ACPI_EC_DELAY           50      /* Wait 50ms max. during EC ops */
+#define ACPI_EC_DELAY           500     /* Wait 500ms max. during EC ops */
 #define ACPI_EC_UDELAY_GLK      1000    /* Wait 1ms max. to get global lock */
-#define ACPI_EC_UDELAY         100      /* Poll @ 100us increments */
-#define ACPI_EC_UDELAY_COUNT   1000     /* Wait 10ms max. during EC ops */
 
-enum {
-        EC_INTR = 1,    /* Output buffer full */
-        EC_POLL,        /* Input buffer empty */
-};
+static enum ec_mode {
+        EC_INTR = 1,            /* Output buffer full */
+        EC_POLL,                /* Input buffer empty */
+} acpi_ec_mode = EC_INTR;
 
 static int acpi_ec_remove(struct acpi_device *device, int type);
 static int acpi_ec_start(struct acpi_device *device);
@@ -93,22 +92,21 @@ static struct acpi_driver acpi_ec_driver = {
 };
 
 /* If we find an EC via the ECDT, we need to keep a ptr to its context */
-struct acpi_ec {
+static struct acpi_ec {
         acpi_handle handle;
         unsigned long uid;
-        unsigned long gpe_bit;
+        unsigned long gpe;
         unsigned long command_addr;
         unsigned long data_addr;
         unsigned long global_lock;
-        struct semaphore sem;
-        unsigned int expect_event;
+        struct mutex lock;
+        atomic_t query_pending;
         atomic_t leaving_burst; /* 0 : No, 1 : Yes, 2: abort */
         wait_queue_head_t wait;
 } *ec_ecdt;
 
 /* External interfaces use first EC only, so remember */
 static struct acpi_device *first_ec;
-static int acpi_ec_mode = EC_INTR;
 
 /* --------------------------------------------------------------------------
                              Transaction Management
@@ -134,54 +132,41 @@ static inline void acpi_ec_write_data(struct acpi_ec *ec, u8 data)
         outb(data, ec->data_addr);
 }
 
-static int acpi_ec_check_status(u8 status, u8 event)
+static inline int acpi_ec_check_status(struct acpi_ec *ec, enum ec_event event)
 {
-        switch (event) {
-        case ACPI_EC_EVENT_OBF_1:
+        u8 status = acpi_ec_read_status(ec);
+
+        if (event == ACPI_EC_EVENT_OBF_1) {
                 if (status & ACPI_EC_FLAG_OBF)
                         return 1;
-                break;
-        case ACPI_EC_EVENT_IBF_0:
+        } else if (event == ACPI_EC_EVENT_IBF_0) {
                 if (!(status & ACPI_EC_FLAG_IBF))
                         return 1;
-                break;
-        default:
-                break;
         }
 
         return 0;
 }
 
-static int acpi_ec_wait(struct acpi_ec *ec, u8 event)
+static int acpi_ec_wait(struct acpi_ec *ec, enum ec_event event)
 {
-        int i = (acpi_ec_mode == EC_POLL) ? ACPI_EC_UDELAY_COUNT : 0;
-        long time_left;
-
-        ec->expect_event = event;
-        if (acpi_ec_check_status(acpi_ec_read_status(ec), event)) {
-                ec->expect_event = 0;
-                return 0;
-        }
-
-        do {
-                if (acpi_ec_mode == EC_POLL) {
-                        udelay(ACPI_EC_UDELAY);
-                } else {
-                        time_left = wait_event_timeout(ec->wait,
-                                    !ec->expect_event,
-                                    msecs_to_jiffies(ACPI_EC_DELAY));
-                        if (time_left > 0) {
-                                ec->expect_event = 0;
+        if (acpi_ec_mode == EC_POLL) {
+                unsigned long delay = jiffies + msecs_to_jiffies(ACPI_EC_DELAY);
+                while (time_before(jiffies, delay)) {
+                        if (acpi_ec_check_status(ec, event))
                                 return 0;
-                        }
                 }
-                if (acpi_ec_check_status(acpi_ec_read_status(ec), event)) {
-                        ec->expect_event = 0;
+        } else {
+                if (wait_event_timeout(ec->wait,
+                                       acpi_ec_check_status(ec, event),
+                                       msecs_to_jiffies(ACPI_EC_DELAY)) ||
+                    acpi_ec_check_status(ec, event)) {
                         return 0;
+                } else {
+                        printk(KERN_ERR PREFIX "acpi_ec_wait timeout,"
+                               " status = %d, expect_event = %d\n",
+                               acpi_ec_read_status(ec), event);
                 }
-        } while (--i > 0);
-
-        ec->expect_event = 0;
+        }
 
         return -ETIME;
 }
@@ -196,7 +181,6 @@ int acpi_ec_enter_burst_mode(struct acpi_ec *ec)
         u8 tmp = 0;
         u8 status = 0;
 
-
         status = acpi_ec_read_status(ec);
         if (status != -EINVAL && !(status & ACPI_EC_FLAG_BURST)) {
                 status = acpi_ec_wait(ec, ACPI_EC_EVENT_IBF_0);
@@ -212,7 +196,7 @@ int acpi_ec_enter_burst_mode(struct acpi_ec *ec)
 
         atomic_set(&ec->leaving_burst, 0);
         return 0;
-  end:
+      end:
         ACPI_EXCEPTION((AE_INFO, status, "EC wait, burst mode"));
         return -1;
 }
@@ -221,58 +205,68 @@ int acpi_ec_leave_burst_mode(struct acpi_ec *ec)
 {
         u8 status = 0;
 
-
         status = acpi_ec_read_status(ec);
-        if (status != -EINVAL && (status & ACPI_EC_FLAG_BURST)){
+        if (status != -EINVAL && (status & ACPI_EC_FLAG_BURST)) {
                 status = acpi_ec_wait(ec, ACPI_EC_EVENT_IBF_0);
-                if(status)
+                if (status)
                         goto end;
                 acpi_ec_write_cmd(ec, ACPI_EC_BURST_DISABLE);
                 acpi_ec_wait(ec, ACPI_EC_EVENT_IBF_0);
         }
         atomic_set(&ec->leaving_burst, 1);
         return 0;
-  end:
+      end:
         ACPI_EXCEPTION((AE_INFO, status, "EC leave burst mode"));
         return -1;
 }
-#endif /* ACPI_FUTURE_USAGE */
+#endif                          /* ACPI_FUTURE_USAGE */
 
 static int acpi_ec_transaction_unlocked(struct acpi_ec *ec, u8 command,
-                                        const u8 *wdata, unsigned wdata_len,
-                                        u8 *rdata, unsigned rdata_len)
+                                        const u8 * wdata, unsigned wdata_len,
+                                        u8 * rdata, unsigned rdata_len)
 {
-        int result;
+        int result = 0;
 
         acpi_ec_write_cmd(ec, command);
 
-        for (; wdata_len > 0; wdata_len --) {
+        for (; wdata_len > 0; --wdata_len) {
                 result = acpi_ec_wait(ec, ACPI_EC_EVENT_IBF_0);
-                if (result)
-                        return result;
+                if (result) {
+                        printk(KERN_ERR PREFIX
+                               "write_cmd timeout, command = %d\n", command);
+                        goto end;
+                }
                 acpi_ec_write_data(ec, *(wdata++));
         }
 
-        if (command == ACPI_EC_COMMAND_WRITE) {
+        if (!rdata_len) {
                 result = acpi_ec_wait(ec, ACPI_EC_EVENT_IBF_0);
-                if (result)
-                        return result;
+                if (result) {
+                        printk(KERN_ERR PREFIX
+                               "finish-write timeout, command = %d\n", command);
+                        goto end;
+                }
+        } else if (command == ACPI_EC_COMMAND_QUERY) {
+                atomic_set(&ec->query_pending, 0);
         }
 
-        for (; rdata_len > 0; rdata_len --) {
+        for (; rdata_len > 0; --rdata_len) {
                 result = acpi_ec_wait(ec, ACPI_EC_EVENT_OBF_1);
-                if (result)
-                        return result;
+                if (result) {
+                        printk(KERN_ERR PREFIX "read timeout, command = %d\n",
+                               command);
+                        goto end;
+                }
 
                 *(rdata++) = acpi_ec_read_data(ec);
         }
-
-        return 0;
+      end:
+        return result;
 }
 
 static int acpi_ec_transaction(struct acpi_ec *ec, u8 command,
-                                const u8 *wdata, unsigned wdata_len,
-                                u8 *rdata, unsigned rdata_len)
+                               const u8 * wdata, unsigned wdata_len,
+                               u8 * rdata, unsigned rdata_len)
 {
         int status;
         u32 glk;
@@ -280,36 +274,40 @@ static int acpi_ec_transaction(struct acpi_ec *ec, u8 command,
         if (!ec || (wdata_len && !wdata) || (rdata_len && !rdata))
                 return -EINVAL;
 
-        if (rdata)
-                memset(rdata, 0, rdata_len);
+        if (rdata)
+                memset(rdata, 0, rdata_len);
 
+        mutex_lock(&ec->lock);
         if (ec->global_lock) {
                 status = acpi_acquire_global_lock(ACPI_EC_UDELAY_GLK, &glk);
                 if (ACPI_FAILURE(status))
                         return -ENODEV;
         }
-        down(&ec->sem);
+
+        /* Make sure GPE is enabled before doing transaction */
+        acpi_enable_gpe(NULL, ec->gpe, ACPI_NOT_ISR);
 
         status = acpi_ec_wait(ec, ACPI_EC_EVENT_IBF_0);
         if (status) {
-                printk(KERN_DEBUG PREFIX "read EC, IB not empty\n");
+                printk(KERN_DEBUG PREFIX
+                       "input buffer is not empty, aborting transaction\n");
                 goto end;
         }
 
-        status = acpi_ec_transaction_unlocked(ec, command,
-                                              wdata, wdata_len,
-                                              rdata, rdata_len);
+        status = acpi_ec_transaction_unlocked(ec, command,
+                                              wdata, wdata_len,
+                                              rdata, rdata_len);
 
-end:
-        up(&ec->sem);
+      end:
 
         if (ec->global_lock)
                 acpi_release_global_lock(glk);
+        mutex_unlock(&ec->lock);
 
         return status;
 }
 
-static int acpi_ec_read(struct acpi_ec *ec, u8 address, u8 *data)
+static int acpi_ec_read(struct acpi_ec *ec, u8 address, u8 * data)
 {
         int result;
         u8 d;
@@ -322,15 +320,15 @@ static int acpi_ec_read(struct acpi_ec *ec, u8 address, u8 *data)
 
 static int acpi_ec_write(struct acpi_ec *ec, u8 address, u8 data)
 {
-        u8 wdata[2] = { address, data };
-        return acpi_ec_transaction(ec, ACPI_EC_COMMAND_WRITE,
+        u8 wdata[2] = { address, data };
+        return acpi_ec_transaction(ec, ACPI_EC_COMMAND_WRITE,
                                    wdata, 2, NULL, 0);
 }
 
 /*
  * Externally callable EC access functions. For now, assume 1 EC only
  */
-int ec_read(u8 addr, u8 *val)
+int ec_read(u8 addr, u8 * val)
 {
         struct acpi_ec *ec;
         int err;
@@ -369,9 +367,9 @@ int ec_write(u8 addr, u8 val)
 
 EXPORT_SYMBOL(ec_write);
 
-extern int ec_transaction(u8 command,
-                          const u8 *wdata, unsigned wdata_len,
-                          u8 *rdata, unsigned rdata_len)
+int ec_transaction(u8 command,
+                          const u8 * wdata, unsigned wdata_len,
+                          u8 * rdata, unsigned rdata_len)
 {
         struct acpi_ec *ec;
 
@@ -386,65 +384,49 @@ extern int ec_transaction(u8 command,
 
 EXPORT_SYMBOL(ec_transaction);
 
-static int acpi_ec_query(struct acpi_ec *ec, u8 *data)
+static int acpi_ec_query(struct acpi_ec *ec, u8 * data)
 {
         int result;
-        u8 d;
+        u8 d;
 
-        if (!ec || !data)
-                return -EINVAL;
+        if (!ec || !data)
+                return -EINVAL;
 
-        /*
-         * Query the EC to find out which _Qxx method we need to evaluate.
-         * Note that successful completion of the query causes the ACPI_EC_SCI
-         * bit to be cleared (and thus clearing the interrupt source).
-         */
+        /*
+         * Query the EC to find out which _Qxx method we need to evaluate.
+         * Note that successful completion of the query causes the ACPI_EC_SCI
+         * bit to be cleared (and thus clearing the interrupt source).
+         */
 
-        result = acpi_ec_transaction(ec, ACPI_EC_COMMAND_QUERY, NULL, 0, &d, 1);
-        if (result)
-                return result;
+        result = acpi_ec_transaction(ec, ACPI_EC_COMMAND_QUERY, NULL, 0, &d, 1);
+        if (result)
+                return result;
 
-        if (!d)
-                return -ENODATA;
+        if (!d)
+                return -ENODATA;
 
-        *data = d;
-        return 0;
+        *data = d;
+        return 0;
 }
 
 /* --------------------------------------------------------------------------
                                 Event Management
    -------------------------------------------------------------------------- */
 
-struct acpi_ec_query_data {
-        acpi_handle handle;
-        u8 data;
-};
-
 static void acpi_ec_gpe_query(void *ec_cxt)
 {
         struct acpi_ec *ec = (struct acpi_ec *)ec_cxt;
         u8 value = 0;
-        static char object_name[8];
+        char object_name[8];
 
-        if (!ec)
-                goto end;
-
-        value = acpi_ec_read_status(ec);
-
-        if (!(value & ACPI_EC_FLAG_SCI))
-                goto end;
-
-        if (acpi_ec_query(ec, &value))
-                goto end;
+        if (!ec || acpi_ec_query(ec, &value))
+                return;
 
         snprintf(object_name, 8, "_Q%2.2X", value);
 
-        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Evaluating %s", object_name));
+        printk(KERN_INFO PREFIX "evaluating %s\n", object_name);
 
         acpi_evaluate_object(ec->handle, object_name, NULL, NULL);
-
-      end:
-        acpi_enable_gpe(NULL, ec->gpe_bit, ACPI_NOT_ISR);
 }
 
 static u32 acpi_ec_gpe_handler(void *data)
@@ -453,22 +435,18 @@ static u32 acpi_ec_gpe_handler(void *data)
         u8 value;
         struct acpi_ec *ec = (struct acpi_ec *)data;
 
-        acpi_clear_gpe(NULL, ec->gpe_bit, ACPI_ISR);
-        value = acpi_ec_read_status(ec);
-
         if (acpi_ec_mode == EC_INTR) {
-                if (acpi_ec_check_status(value, ec->expect_event)) {
-                        ec->expect_event = 0;
-                        wake_up(&ec->wait);
-                }
+                wake_up(&ec->wait);
         }
 
-        if (value & ACPI_EC_FLAG_SCI) {
-                status = acpi_os_execute(OSL_EC_BURST_HANDLER, acpi_ec_gpe_query, ec);
-                return status == AE_OK ?
-                    ACPI_INTERRUPT_HANDLED : ACPI_INTERRUPT_NOT_HANDLED;
+        value = acpi_ec_read_status(ec);
+        if ((value & ACPI_EC_FLAG_SCI) && !atomic_read(&ec->query_pending)) {
+                atomic_set(&ec->query_pending, 1);
+                status =
+                    acpi_os_execute(OSL_EC_BURST_HANDLER, acpi_ec_gpe_query,
+                                    ec);
         }
-        acpi_enable_gpe(NULL, ec->gpe_bit, ACPI_ISR);
+
         return status == AE_OK ?
             ACPI_INTERRUPT_HANDLED : ACPI_INTERRUPT_NOT_HANDLED;
 }
@@ -504,7 +482,6 @@ acpi_ec_space_handler(u32 function,
         acpi_integer f_v = 0;
         int i = 0;
 
-
         if ((address > 0xFF) || !value || !handler_context)
                 return AE_BAD_PARAMETER;
 
@@ -518,7 +495,7 @@ acpi_ec_space_handler(u32 function,
         switch (function) {
         case ACPI_READ:
                 temp = 0;
-                result = acpi_ec_read(ec, (u8) address, (u8 *) &temp);
+                result = acpi_ec_read(ec, (u8) address, (u8 *) & temp);
                 break;
         case ACPI_WRITE:
                 result = acpi_ec_write(ec, (u8) address, (u8) temp);
@@ -571,18 +548,15 @@ static int acpi_ec_read_info(struct seq_file *seq, void *offset)
 {
         struct acpi_ec *ec = (struct acpi_ec *)seq->private;
 
-
         if (!ec)
                 goto end;
 
-        seq_printf(seq, "gpe bit:                 0x%02x\n",
-                   (u32) ec->gpe_bit);
+        seq_printf(seq, "gpe:                 0x%02x\n", (u32) ec->gpe);
         seq_printf(seq, "ports:                   0x%02x, 0x%02x\n",
-                   (u32) ec->command_addr,
-                   (u32) ec->data_addr);
+                   (u32) ec->command_addr, (u32) ec->data_addr);
         seq_printf(seq, "use global lock:         %s\n",
                    ec->global_lock ? "yes" : "no");
-        acpi_enable_gpe(NULL, ec->gpe_bit, ACPI_NOT_ISR);
+        acpi_enable_gpe(NULL, ec->gpe, ACPI_NOT_ISR);
 
       end:
         return 0;
@@ -605,7 +579,6 @@ static int acpi_ec_add_fs(struct acpi_device *device)
 {
         struct proc_dir_entry *entry = NULL;
 
-
         if (!acpi_device_dir(device)) {
                 acpi_device_dir(device) = proc_mkdir(acpi_device_bid(device),
                                                      acpi_ec_dir);
@@ -648,18 +621,17 @@ static int acpi_ec_add(struct acpi_device *device)
         acpi_status status = AE_OK;
         struct acpi_ec *ec = NULL;
 
-
         if (!device)
                 return -EINVAL;
 
-        ec = kmalloc(sizeof(struct acpi_ec), GFP_KERNEL);
+        ec = kzalloc(sizeof(struct acpi_ec), GFP_KERNEL);
         if (!ec)
                 return -ENOMEM;
-        memset(ec, 0, sizeof(struct acpi_ec));
 
         ec->handle = device->handle;
         ec->uid = -1;
-        init_MUTEX(&ec->sem);
+        mutex_init(&ec->lock);
+        atomic_set(&ec->query_pending, 0);
         if (acpi_ec_mode == EC_INTR) {
                 atomic_set(&ec->leaving_burst, 1);
                 init_waitqueue_head(&ec->wait);
@@ -669,8 +641,7 @@ static int acpi_ec_add(struct acpi_device *device)
         acpi_driver_data(device) = ec;
 
         /* Use the global lock for all EC transactions? */
-        acpi_evaluate_integer(ec->handle, "_GLK", NULL,
-                              &ec->global_lock);
+        acpi_evaluate_integer(ec->handle, "_GLK", NULL, &ec->global_lock);
 
         /* XXX we don't test uids, because on some boxes ecdt uid = 0, see:
            http://bugzilla.kernel.org/show_bug.cgi?id=6111 */
@@ -679,7 +650,7 @@ static int acpi_ec_add(struct acpi_device *device)
                                                   ACPI_ADR_SPACE_EC,
                                                   &acpi_ec_space_handler);
 
-                acpi_remove_gpe_handler(NULL, ec_ecdt->gpe_bit,
+                acpi_remove_gpe_handler(NULL, ec_ecdt->gpe,
                                         &acpi_ec_gpe_handler);
 
                 kfree(ec_ecdt);
@@ -687,11 +658,10 @@ static int acpi_ec_add(struct acpi_device *device)
 
         /* Get GPE bit assignment (EC events). */
         /* TODO: Add support for _GPE returning a package */
-        status =
-            acpi_evaluate_integer(ec->handle, "_GPE", NULL,
-                                  &ec->gpe_bit);
+        status = acpi_evaluate_integer(ec->handle, "_GPE", NULL, &ec->gpe);
         if (ACPI_FAILURE(status)) {
-                ACPI_EXCEPTION((AE_INFO, status, "Obtaining GPE bit assignment"));
+                ACPI_EXCEPTION((AE_INFO, status,
+                                "Obtaining GPE bit assignment"));
                 result = -ENODEV;
                 goto end;
         }
@@ -701,13 +671,13 @@ static int acpi_ec_add(struct acpi_device *device)
                 goto end;
 
         ACPI_DEBUG_PRINT((ACPI_DB_INFO, "%s [%s] (gpe %d) interrupt mode.",
-               acpi_device_name(device), acpi_device_bid(device),
-               (u32) ec->gpe_bit));
+                          acpi_device_name(device), acpi_device_bid(device),
+                          (u32) ec->gpe));
 
         if (!first_ec)
                 first_ec = device;
 
-  end:
+      end:
         if (result)
                 kfree(ec);
 
@@ -718,7 +688,6 @@ static int acpi_ec_remove(struct acpi_device *device, int type)
 {
         struct acpi_ec *ec = NULL;
 
-
         if (!device)
                 return -EINVAL;
 
@@ -761,7 +730,6 @@ static int acpi_ec_start(struct acpi_device *device)
         acpi_status status = AE_OK;
         struct acpi_ec *ec = NULL;
 
-
         if (!device)
                 return -EINVAL;
 
@@ -782,27 +750,26 @@ static int acpi_ec_start(struct acpi_device *device)
         }
 
         ACPI_DEBUG_PRINT((ACPI_DB_INFO, "gpe=0x%02lx, ports=0x%2lx,0x%2lx",
-                          ec->gpe_bit, ec->command_addr, ec->data_addr));
+                          ec->gpe, ec->command_addr, ec->data_addr));
 
         /*
          * Install GPE handler
          */
-        status = acpi_install_gpe_handler(NULL, ec->gpe_bit,
+        status = acpi_install_gpe_handler(NULL, ec->gpe,
                                           ACPI_GPE_EDGE_TRIGGERED,
                                           &acpi_ec_gpe_handler, ec);
         if (ACPI_FAILURE(status)) {
                 return -ENODEV;
         }
-        acpi_set_gpe_type(NULL, ec->gpe_bit, ACPI_GPE_TYPE_RUNTIME);
-        acpi_enable_gpe(NULL, ec->gpe_bit, ACPI_NOT_ISR);
+        acpi_set_gpe_type(NULL, ec->gpe, ACPI_GPE_TYPE_RUNTIME);
+        acpi_enable_gpe(NULL, ec->gpe, ACPI_NOT_ISR);
 
         status = acpi_install_address_space_handler(ec->handle,
                                                     ACPI_ADR_SPACE_EC,
                                                     &acpi_ec_space_handler,
                                                     &acpi_ec_space_setup, ec);
         if (ACPI_FAILURE(status)) {
-                acpi_remove_gpe_handler(NULL, ec->gpe_bit,
-                                        &acpi_ec_gpe_handler);
+                acpi_remove_gpe_handler(NULL, ec->gpe, &acpi_ec_gpe_handler);
                 return -ENODEV;
         }
 
@@ -814,7 +781,6 @@ static int acpi_ec_stop(struct acpi_device *device, int type)
         acpi_status status = AE_OK;
         struct acpi_ec *ec = NULL;
 
-
         if (!device)
                 return -EINVAL;
 
@@ -826,9 +792,7 @@ static int acpi_ec_stop(struct acpi_device *device, int type)
         if (ACPI_FAILURE(status))
                 return -ENODEV;
 
-        status =
-            acpi_remove_gpe_handler(NULL, ec->gpe_bit,
-                                    &acpi_ec_gpe_handler);
+        status = acpi_remove_gpe_handler(NULL, ec->gpe, &acpi_ec_gpe_handler);
         if (ACPI_FAILURE(status))
                 return -ENODEV;
 
@@ -841,7 +805,7 @@ acpi_fake_ecdt_callback(acpi_handle handle,
 {
         acpi_status status;
 
-        init_MUTEX(&ec_ecdt->sem);
+        mutex_init(&ec_ecdt->lock);
         if (acpi_ec_mode == EC_INTR) {
                 init_waitqueue_head(&ec_ecdt->wait);
         }
@@ -853,16 +817,15 @@ acpi_fake_ecdt_callback(acpi_handle handle,
         ec_ecdt->uid = -1;
         acpi_evaluate_integer(handle, "_UID", NULL, &ec_ecdt->uid);
 
-        status =
-            acpi_evaluate_integer(handle, "_GPE", NULL,
-                                  &ec_ecdt->gpe_bit);
+        status = acpi_evaluate_integer(handle, "_GPE", NULL, &ec_ecdt->gpe);
         if (ACPI_FAILURE(status))
                 return status;
         ec_ecdt->global_lock = TRUE;
         ec_ecdt->handle = handle;
 
         ACPI_DEBUG_PRINT((ACPI_DB_INFO, "GPE=0x%02lx, ports=0x%2lx, 0x%2lx",
-               ec_ecdt->gpe_bit, ec_ecdt->command_addr, ec_ecdt->data_addr));
+                          ec_ecdt->gpe, ec_ecdt->command_addr,
+                          ec_ecdt->data_addr));
 
         return AE_CTRL_TERMINATE;
 }
@@ -884,12 +847,11 @@ static int __init acpi_ec_fake_ecdt(void)
 
         ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Try to make an fake ECDT"));
 
-        ec_ecdt = kmalloc(sizeof(struct acpi_ec), GFP_KERNEL);
+        ec_ecdt = kzalloc(sizeof(struct acpi_ec), GFP_KERNEL);
         if (!ec_ecdt) {
                 ret = -ENOMEM;
                 goto error;
         }
-        memset(ec_ecdt, 0, sizeof(struct acpi_ec));
 
         status = acpi_get_devices(ACPI_EC_HID,
                                   acpi_fake_ecdt_callback, NULL, NULL);
@@ -901,7 +863,7 @@ static int __init acpi_ec_fake_ecdt(void)
                 goto error;
         }
         return 0;
-  error:
+      error:
         return ret;
 }
 
@@ -921,30 +883,28 @@ static int __init acpi_ec_get_real_ecdt(void)
         /*
          * Generate a temporary ec context to use until the namespace is scanned
          */
-        ec_ecdt = kmalloc(sizeof(struct acpi_ec), GFP_KERNEL);
+        ec_ecdt = kzalloc(sizeof(struct acpi_ec), GFP_KERNEL);
         if (!ec_ecdt)
                 return -ENOMEM;
-        memset(ec_ecdt, 0, sizeof(struct acpi_ec));
 
-        init_MUTEX(&ec_ecdt->sem);
+        mutex_init(&ec_ecdt->lock);
         if (acpi_ec_mode == EC_INTR) {
                 init_waitqueue_head(&ec_ecdt->wait);
         }
         ec_ecdt->command_addr = ecdt_ptr->ec_control.address;
         ec_ecdt->data_addr = ecdt_ptr->ec_data.address;
-        ec_ecdt->gpe_bit = ecdt_ptr->gpe_bit;
+        ec_ecdt->gpe = ecdt_ptr->gpe_bit;
         /* use the GL just to be safe */
         ec_ecdt->global_lock = TRUE;
         ec_ecdt->uid = ecdt_ptr->uid;
 
-        status =
-            acpi_get_handle(NULL, ecdt_ptr->ec_id, &ec_ecdt->handle);
+        status = acpi_get_handle(NULL, ecdt_ptr->ec_id, &ec_ecdt->handle);
         if (ACPI_FAILURE(status)) {
                 goto error;
         }
 
         return 0;
-  error:
+      error:
         ACPI_EXCEPTION((AE_INFO, status, "Could not use ECDT"));
         kfree(ec_ecdt);
         ec_ecdt = NULL;
@@ -970,14 +930,14 @@ int __init acpi_ec_ecdt_probe(void)
         /*
          * Install GPE handler
          */
-        status = acpi_install_gpe_handler(NULL, ec_ecdt->gpe_bit,
+        status = acpi_install_gpe_handler(NULL, ec_ecdt->gpe,
                                           ACPI_GPE_EDGE_TRIGGERED,
                                           &acpi_ec_gpe_handler, ec_ecdt);
         if (ACPI_FAILURE(status)) {
                 goto error;
         }
-        acpi_set_gpe_type(NULL, ec_ecdt->gpe_bit, ACPI_GPE_TYPE_RUNTIME);
-        acpi_enable_gpe(NULL, ec_ecdt->gpe_bit, ACPI_NOT_ISR);
+        acpi_set_gpe_type(NULL, ec_ecdt->gpe, ACPI_GPE_TYPE_RUNTIME);
+        acpi_enable_gpe(NULL, ec_ecdt->gpe, ACPI_NOT_ISR);
 
         status = acpi_install_address_space_handler(ACPI_ROOT_OBJECT,
                                                     ACPI_ADR_SPACE_EC,
@@ -985,7 +945,7 @@ int __init acpi_ec_ecdt_probe(void)
                                                     &acpi_ec_space_setup,
                                                     ec_ecdt);
         if (ACPI_FAILURE(status)) {
-                acpi_remove_gpe_handler(NULL, ec_ecdt->gpe_bit,
+                acpi_remove_gpe_handler(NULL, ec_ecdt->gpe,
                                         &acpi_ec_gpe_handler);
                 goto error;
         }
@@ -1004,7 +964,6 @@ static int __init acpi_ec_init(void)
 {
         int result = 0;
 
-
         if (acpi_disabled)
                 return 0;
 
@@ -1057,7 +1016,8 @@ static int __init acpi_ec_set_intr_mode(char *str)
                 acpi_ec_mode = EC_POLL;
         }
         acpi_ec_driver.ops.add = acpi_ec_add;
-        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "EC %s mode.\n", intr ? "interrupt" : "polling"));
+        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "EC %s mode.\n",
+                          intr ? "interrupt" : "polling"));
 
         return 1;
 }
diff --git a/drivers/acpi/events/evmisc.c b/drivers/acpi/events/evmisc.c
index ee2a10bf90..bf63edc660 100644
--- a/drivers/acpi/events/evmisc.c
+++ b/drivers/acpi/events/evmisc.c
@@ -331,7 +331,6 @@ static void ACPI_SYSTEM_XFACE acpi_ev_global_lock_thread(void *context)
 static u32 acpi_ev_global_lock_handler(void *context)
 {
         u8 acquired = FALSE;
-        acpi_status status;
 
         /*
          * Attempt to get the lock
diff --git a/drivers/acpi/executer/exmutex.c b/drivers/acpi/executer/exmutex.c
index 3a39c2e8e1..bf90f04f2c 100644
--- a/drivers/acpi/executer/exmutex.c
+++ b/drivers/acpi/executer/exmutex.c
@@ -266,10 +266,10 @@ acpi_ex_release_mutex(union acpi_operand_object *obj_desc,
              walk_state->thread->thread_id)
             && (obj_desc->mutex.os_mutex != ACPI_GLOBAL_LOCK)) {
                 ACPI_ERROR((AE_INFO,
-                            "Thread %X cannot release Mutex [%4.4s] acquired by thread %X",
-                            (u32) walk_state->thread->thread_id,
+                            "Thread %lX cannot release Mutex [%4.4s] acquired by thread %lX",
+                            (unsigned long)walk_state->thread->thread_id,
                             acpi_ut_get_node_name(obj_desc->mutex.node),
-                            (u32) obj_desc->mutex.owner_thread->thread_id));
+                            (unsigned long)obj_desc->mutex.owner_thread->thread_id));
                 return_ACPI_STATUS(AE_AML_NOT_OWNER);
         }
 
diff --git a/drivers/acpi/fan.c b/drivers/acpi/fan.c
index 045c89477e..f305a826ca 100644
--- a/drivers/acpi/fan.c
+++ b/drivers/acpi/fan.c
@@ -99,8 +99,8 @@ acpi_fan_write_state(struct file *file, const char __user * buffer,
                      size_t count, loff_t * ppos)
 {
         int result = 0;
-        struct seq_file *m = (struct seq_file *)file->private_data;
-        struct acpi_fan *fan = (struct acpi_fan *)m->private;
+        struct seq_file *m = file->private_data;
+        struct acpi_fan *fan = m->private;
         char state_string[12] = { '\0' };
 
 
@@ -186,10 +186,9 @@ static int acpi_fan_add(struct acpi_device *device)
         if (!device)
                 return -EINVAL;
 
-        fan = kmalloc(sizeof(struct acpi_fan), GFP_KERNEL);
+        fan = kzalloc(sizeof(struct acpi_fan), GFP_KERNEL);
         if (!fan)
                 return -ENOMEM;
-        memset(fan, 0, sizeof(struct acpi_fan));
 
         fan->device = device;
         strcpy(acpi_device_name(device), "Fan");
@@ -229,7 +228,7 @@ static int acpi_fan_remove(struct acpi_device *device, int type)
         if (!device || !acpi_driver_data(device))
                 return -EINVAL;
 
-        fan = (struct acpi_fan *)acpi_driver_data(device);
+        fan = acpi_driver_data(device);
 
         acpi_fan_remove_fs(device);
 
diff --git a/drivers/acpi/glue.c b/drivers/acpi/glue.c
index a2f46d587d..8a0324b43e 100644
--- a/drivers/acpi/glue.c
+++ b/drivers/acpi/glue.c
@@ -96,7 +96,7 @@ struct acpi_find_pci_root {
 static acpi_status
 do_root_bridge_busnr_callback(struct acpi_resource *resource, void *data)
 {
-        unsigned long *busnr = (unsigned long *)data;
+        unsigned long *busnr = data;
         struct acpi_resource_address64 address;
 
         if (resource->type != ACPI_RESOURCE_TYPE_ADDRESS16 &&
@@ -189,8 +189,12 @@ find_pci_rootbridge(acpi_handle handle, u32 lvl, void *context, void **rv)
         bus = tmp;
 
         if (seg == find->seg && bus == find->bus)
+        {
                 find->handle = handle;
-        status = AE_OK;
+                status = AE_CTRL_TERMINATE;
+        }
+        else
+                status = AE_OK;
       exit:
         kfree(buffer.pointer);
         return status;
@@ -217,7 +221,7 @@ do_acpi_find_child(acpi_handle handle, u32 lvl, void *context, void **rv)
         acpi_status status;
         struct acpi_device_info *info;
         struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
-        struct acpi_find_child *find = (struct acpi_find_child *)context;
+        struct acpi_find_child *find = context;
 
         status = acpi_get_object_info(handle, &buffer);
         if (ACPI_SUCCESS(status)) {
diff --git a/drivers/acpi/hotkey.c b/drivers/acpi/hotkey.c
index 1ba2db6718..8edfb92f7e 100644
--- a/drivers/acpi/hotkey.c
+++ b/drivers/acpi/hotkey.c
@@ -265,8 +265,7 @@ static char *format_result(union acpi_object *object)
 
 static int hotkey_polling_seq_show(struct seq_file *seq, void *offset)
 {
-        struct acpi_polling_hotkey *poll_hotkey =
-            (struct acpi_polling_hotkey *)seq->private;
+        struct acpi_polling_hotkey *poll_hotkey = seq->private;
         char *buf;
 
 
@@ -577,7 +576,7 @@ init_poll_hotkey_device(union acpi_hotkey *key, char **config_entry,
         if (ACPI_FAILURE(status))
                 goto do_fail_zero;
         key->poll_hotkey.poll_result =
-            (union acpi_object *)kmalloc(sizeof(union acpi_object), GFP_KERNEL);
+            kmalloc(sizeof(union acpi_object), GFP_KERNEL);
         if (!key->poll_hotkey.poll_result)
                 goto do_fail_zero;
         return AE_OK;
diff --git a/drivers/acpi/i2c_ec.c b/drivers/acpi/i2c_ec.c
index 6342e612c2..8338be0990 100644
--- a/drivers/acpi/i2c_ec.c
+++ b/drivers/acpi/i2c_ec.c
@@ -309,18 +309,16 @@ static int acpi_ec_hc_add(struct acpi_device *device)
                 return -EINVAL;
         }
 
-        ec_hc = kmalloc(sizeof(struct acpi_ec_hc), GFP_KERNEL);
+        ec_hc = kzalloc(sizeof(struct acpi_ec_hc), GFP_KERNEL);
         if (!ec_hc) {
                 return -ENOMEM;
         }
-        memset(ec_hc, 0, sizeof(struct acpi_ec_hc));
 
-        smbus = kmalloc(sizeof(struct acpi_ec_smbus), GFP_KERNEL);
+        smbus = kzalloc(sizeof(struct acpi_ec_smbus), GFP_KERNEL);
         if (!smbus) {
                 kfree(ec_hc);
                 return -ENOMEM;
         }
-        memset(smbus, 0, sizeof(struct acpi_ec_smbus));
 
         ec_hc->handle = device->handle;
         strcpy(acpi_device_name(device), ACPI_EC_HC_DEVICE_NAME);
@@ -393,7 +391,7 @@ static void __exit acpi_ec_hc_exit(void)
 
 struct acpi_ec_hc *acpi_get_ec_hc(struct acpi_device *device)
 {
-        return ((struct acpi_ec_hc *)acpi_driver_data(device->parent));
+        return acpi_driver_data(device->parent);
 }
 
 EXPORT_SYMBOL(acpi_get_ec_hc);
diff --git a/drivers/acpi/ibm_acpi.c b/drivers/acpi/ibm_acpi.c
index 003a9876c9..b72d13d11a 100644
--- a/drivers/acpi/ibm_acpi.c
+++ b/drivers/acpi/ibm_acpi.c
@@ -3,6 +3,7 @@
  *
  *
  *  Copyright (C) 2004-2005 Borislav Deianov <borislav@users.sf.net>
+ *  Copyright (C) 2006 Henrique de Moraes Holschuh <hmh@hmh.eng.br>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -19,10 +20,14 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#define IBM_VERSION "0.12a"
+#define IBM_VERSION "0.13"
 
 /*
  *  Changelog:
+ *
+ *  2006-11-22  0.13    new maintainer
+ *                      changelog now lives in git commit history, and will
+ *                      not be updated further in-file.
  *  
  *  2005-08-17  0.12    fix compilation on 2.6.13-rc kernels
  *  2005-03-17  0.11    support for 600e, 770x
@@ -77,9 +82,16 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/types.h>
+#include <linux/string.h>
+
 #include <linux/proc_fs.h>
+#include <linux/backlight.h>
 #include <asm/uaccess.h>
 
+#include <linux/dmi.h>
+#include <linux/jiffies.h>
+#include <linux/workqueue.h>
+
 #include <acpi/acpi_drivers.h>
 #include <acpi/acnamesp.h>
 
@@ -88,7 +100,7 @@
 #define IBM_FILE "ibm_acpi"
 #define IBM_URL "http://ibm-acpi.sf.net/"
 
-MODULE_AUTHOR("Borislav Deianov");
+MODULE_AUTHOR("Borislav Deianov, Henrique de Moraes Holschuh");
 MODULE_DESCRIPTION(IBM_DESC);
 MODULE_VERSION(IBM_VERSION);
 MODULE_LICENSE("GPL");
@@ -116,28 +128,6 @@ static acpi_handle root_handle = NULL;
         static char        *object##_path;                      \
         static char        *object##_paths[] = { paths }
 
-/*
- * The following models are supported to various degrees:
- *
- * 570, 600e, 600x, 770e, 770x
- * A20m, A21e, A21m, A21p, A22p, A30, A30p, A31, A31p
- * G40, G41
- * R30, R31, R32, R40, R40e, R50, R50e, R50p, R51
- * T20, T21, T22, T23, T30, T40, T40p, T41, T41p, T42, T42p, T43
- * X20, X21, X22, X23, X24, X30, X31, X40
- *
- * The following models have no supported features:
- *
- * 240, 240x, i1400
- *
- * Still missing DSDTs for the following models:
- *
- * A20p, A22e, A22m
- * R52
- * S31
- * T43p
- */
-
 IBM_HANDLE(ec, root, "\\_SB.PCI0.ISA.EC0",      /* 240, 240x */
            "\\_SB.PCI.ISA.EC",  /* 570 */
            "\\_SB.PCI0.ISA0.EC0",       /* 600e/x, 770e, 770x */
@@ -167,8 +157,10 @@ IBM_HANDLE(dock, root, "\\_SB.GDCK",	/* X30, X31, X40 */
            "\\_SB.PCI.ISA.SLCE",        /* 570 */
     );                          /* A21e,G4x,R30,R31,R32,R40,R40e,R50e */
 #endif
+#ifdef CONFIG_ACPI_IBM_BAY
 IBM_HANDLE(bay, root, "\\_SB.PCI.IDE.SECN.MAST",        /* 570 */
            "\\_SB.PCI0.IDE0.IDES.IDSM", /* 600e/x, 770e, 770x */
+           "\\_SB.PCI0.SATA.SCND.MSTR", /* T60, X60, Z60 */ 
            "\\_SB.PCI0.IDE0.SCND.MSTR", /* all others */
     );                          /* A21e, R30, R31 */
 
@@ -183,6 +175,7 @@ IBM_HANDLE(bay2, root, "\\_SB.PCI0.IDE0.PRIM.SLAV",	/* A3x, R32 */
 IBM_HANDLE(bay2_ej, bay2, "_EJ3",       /* 600e/x, 770e, A3x */
            "_EJ0",              /* 770x */
     );                          /* all others */
+#endif
 
 /* don't list other alternatives as we install a notify handler on the 570 */
 IBM_HANDLE(pci, root, "\\_SB.PCI");     /* 570 */
@@ -203,7 +196,7 @@ IBM_HANDLE(led, ec, "SLED",	/* 570 */
 IBM_HANDLE(beep, ec, "BEEP");   /* all except R30, R31 */
 IBM_HANDLE(ecrd, ec, "ECRD");   /* 570 */
 IBM_HANDLE(ecwr, ec, "ECWR");   /* 570 */
-IBM_HANDLE(fans, ec, "FANS");   /* X31, X40 */
+IBM_HANDLE(fans, ec, "FANS");   /* X31, X40, X41 */
 
 IBM_HANDLE(gfan, ec, "GFAN",    /* 570 */
            "\\FSPD",            /* 600e/x, 770e, 770x */
@@ -216,6 +209,152 @@ IBM_HANDLE(sfan, ec, "SFAN",	/* 570 */
 #define IBM_HKEY_HID    "IBM0068"
 #define IBM_PCI_HID     "PNP0A03"
 
+enum thermal_access_mode {
+        IBMACPI_THERMAL_NONE = 0,       /* No thermal support */
+        IBMACPI_THERMAL_ACPI_TMP07,     /* Use ACPI TMP0-7 */
+        IBMACPI_THERMAL_ACPI_UPDT,      /* Use ACPI TMP0-7 with UPDT */
+        IBMACPI_THERMAL_TPEC_8,         /* Use ACPI EC regs, 8 sensors */
+        IBMACPI_THERMAL_TPEC_16,        /* Use ACPI EC regs, 16 sensors */
+};
+
+#define IBMACPI_MAX_THERMAL_SENSORS 16  /* Max thermal sensors supported */
+struct ibm_thermal_sensors_struct {
+        s32 temp[IBMACPI_MAX_THERMAL_SENSORS];
+};
+
+/*
+ * FAN ACCESS MODES
+ *
+ * IBMACPI_FAN_RD_ACPI_GFAN:
+ *      ACPI GFAN method: returns fan level
+ *
+ *      see IBMACPI_FAN_WR_ACPI_SFAN
+ *      EC 0x2f not available if GFAN exists
+ *
+ * IBMACPI_FAN_WR_ACPI_SFAN:
+ *      ACPI SFAN method: sets fan level, 0 (stop) to 7 (max)
+ *
+ *      EC 0x2f might be available *for reading*, but never for writing.
+ *
+ * IBMACPI_FAN_WR_TPEC:
+ *      ThinkPad EC register 0x2f (HFSP): fan control loop mode Supported
+ *      on almost all ThinkPads
+ *
+ *      Fan speed changes of any sort (including those caused by the
+ *      disengaged mode) are usually done slowly by the firmware as the
+ *      maximum ammount of fan duty cycle change per second seems to be
+ *      limited.
+ *
+ *      Reading is not available if GFAN exists.
+ *      Writing is not available if SFAN exists.
+ *
+ *      Bits
+ *       7      automatic mode engaged;
+ *              (default operation mode of the ThinkPad)
+ *              fan level is ignored in this mode.
+ *       6      disengage mode (takes precedence over bit 7);
+ *              not available on all thinkpads.  May disable
+ *              the tachometer, and speeds up fan to 100% duty-cycle,
+ *              which speeds it up far above the standard RPM
+ *              levels.  It is not impossible that it could cause
+ *              hardware damage.
+ *      5-3     unused in some models.  Extra bits for fan level
+ *              in others, but still useless as all values above
+ *              7 map to the same speed as level 7 in these models.
+ *      2-0     fan level (0..7 usually)
+ *                      0x00 = stop
+ *                      0x07 = max (set when temperatures critical)
+ *              Some ThinkPads may have other levels, see
+ *              IBMACPI_FAN_WR_ACPI_FANS (X31/X40/X41)
+ *
+ *      FIRMWARE BUG: on some models, EC 0x2f might not be initialized at
+ *      boot. Apparently the EC does not intialize it, so unless ACPI DSDT
+ *      does so, its initial value is meaningless (0x07).
+ *
+ *      For firmware bugs, refer to:
+ *      http://thinkwiki.org/wiki/Embedded_Controller_Firmware#Firmware_Issues
+ *
+ *      ----
+ *
+ *      ThinkPad EC register 0x84 (LSB), 0x85 (MSB):
+ *      Main fan tachometer reading (in RPM)
+ *
+ *      This register is present on all ThinkPads with a new-style EC, and
+ *      it is known not to be present on the A21m/e, and T22, as there is
+ *      something else in offset 0x84 according to the ACPI DSDT.  Other
+ *      ThinkPads from this same time period (and earlier) probably lack the
+ *      tachometer as well.
+ *
+ *      Unfortunately a lot of ThinkPads with new-style ECs but whose firwmare
+ *      was never fixed by IBM to report the EC firmware version string
+ *      probably support the tachometer (like the early X models), so
+ *      detecting it is quite hard.  We need more data to know for sure.
+ *
+ *      FIRMWARE BUG: always read 0x84 first, otherwise incorrect readings
+ *      might result.
+ *
+ *      FIRMWARE BUG: when EC 0x2f bit 6 is set (disengaged mode), this
+ *      register is not invalidated in ThinkPads that disable tachometer
+ *      readings.  Thus, the tachometer readings go stale.
+ *
+ *      For firmware bugs, refer to:
+ *      http://thinkwiki.org/wiki/Embedded_Controller_Firmware#Firmware_Issues
+ *
+ * IBMACPI_FAN_WR_ACPI_FANS:
+ *      ThinkPad X31, X40, X41.  Not available in the X60.
+ *
+ *      FANS ACPI handle: takes three arguments: low speed, medium speed,
+ *      high speed.  ACPI DSDT seems to map these three speeds to levels
+ *      as follows: STOP LOW LOW MED MED HIGH HIGH HIGH HIGH
+ *      (this map is stored on FAN0..FAN8 as "0,1,1,2,2,3,3,3,3")
+ *
+ *      The speeds are stored on handles
+ *      (FANA:FAN9), (FANC:FANB), (FANE:FAND).
+ *
+ *      There are three default speed sets, acessible as handles:
+ *      FS1L,FS1M,FS1H; FS2L,FS2M,FS2H; FS3L,FS3M,FS3H
+ *
+ *      ACPI DSDT switches which set is in use depending on various
+ *      factors.
+ *
+ *      IBMACPI_FAN_WR_TPEC is also available and should be used to
+ *      command the fan.  The X31/X40/X41 seems to have 8 fan levels,
+ *      but the ACPI tables just mention level 7.
+ */
+
+enum fan_status_access_mode {
+        IBMACPI_FAN_NONE = 0,           /* No fan status or control */
+        IBMACPI_FAN_RD_ACPI_GFAN,       /* Use ACPI GFAN */
+        IBMACPI_FAN_RD_TPEC,            /* Use ACPI EC regs 0x2f, 0x84-0x85 */
+};
+
+enum fan_control_access_mode {
+        IBMACPI_FAN_WR_NONE = 0,        /* No fan control */
+        IBMACPI_FAN_WR_ACPI_SFAN,       /* Use ACPI SFAN */
+        IBMACPI_FAN_WR_TPEC,            /* Use ACPI EC reg 0x2f */
+        IBMACPI_FAN_WR_ACPI_FANS,       /* Use ACPI FANS and EC reg 0x2f */
+};
+
+enum fan_control_commands {
+        IBMACPI_FAN_CMD_SPEED   = 0x0001,       /* speed command */
+        IBMACPI_FAN_CMD_LEVEL   = 0x0002,       /* level command  */
+        IBMACPI_FAN_CMD_ENABLE  = 0x0004,       /* enable/disable cmd,
+                                                 * and also watchdog cmd */
+};
+
+enum {                                  /* Fan control constants */
+        fan_status_offset = 0x2f,       /* EC register 0x2f */
+        fan_rpm_offset = 0x84,          /* EC register 0x84: LSB, 0x85 MSB (RPM)
+                                         * 0x84 must be read before 0x85 */
+
+        IBMACPI_FAN_EC_DISENGAGED       = 0x40, /* EC mode: tachometer
+                                                 * disengaged */
+        IBMACPI_FAN_EC_AUTO             = 0x80, /* EC mode: auto fan
+                                                 * control */
+};
+
+static char *ibm_thinkpad_ec_found = NULL;
+
 struct ibm_struct {
         char *name;
         char param[32];
@@ -243,6 +382,8 @@ struct ibm_struct {
 
 static struct proc_dir_entry *proc_dir = NULL;
 
+static struct backlight_device *ibm_backlight_device = NULL;
+
 #define onoff(status,bit) ((status) & (1 << (bit)) ? "on" : "off")
 #define enabled(status,bit) ((status) & (1 << (bit)) ? "enabled" : "disabled")
 #define strlencmp(a,b) (strncmp((a), (b), strlen(b)))
@@ -352,7 +493,7 @@ static char *next_cmd(char **cmds)
         return start;
 }
 
-static int driver_init(void)
+static int ibm_acpi_driver_init(void)
 {
         printk(IBM_INFO "%s v%s\n", IBM_DESC, IBM_VERSION);
         printk(IBM_INFO "%s\n", IBM_URL);
@@ -581,8 +722,7 @@ static int wan_status(void)
 {
         int status;
 
-        if (!wan_supported ||
-            !acpi_evalf(hkey_handle, &status, "GWAN", "d"))
+        if (!wan_supported || !acpi_evalf(hkey_handle, &status, "GWAN", "d"))
                 status = 0;
 
         return status;
@@ -630,12 +770,15 @@ static int wan_write(char *buf)
         return 0;
 }
 
-static int video_supported;
-static int video_orig_autosw;
+enum video_access_mode {
+        IBMACPI_VIDEO_NONE = 0,
+        IBMACPI_VIDEO_570,      /* 570 */
+        IBMACPI_VIDEO_770,      /* 600e/x, 770e, 770x */
+        IBMACPI_VIDEO_NEW,      /* all others */
+};
 
-#define VIDEO_570 1
-#define VIDEO_770 2
-#define VIDEO_NEW 3
+static enum video_access_mode video_supported;
+static int video_orig_autosw;
 
 static int video_init(void)
 {
@@ -647,16 +790,16 @@ static int video_init(void)
 
         if (!vid_handle)
                 /* video switching not supported on R30, R31 */
-                video_supported = 0;
+                video_supported = IBMACPI_VIDEO_NONE;
         else if (acpi_evalf(vid_handle, &video_orig_autosw, "SWIT", "qd"))
                 /* 570 */
-                video_supported = VIDEO_570;
+                video_supported = IBMACPI_VIDEO_570;
         else if (acpi_evalf(vid_handle, &video_orig_autosw, "^VADL", "qd"))
                 /* 600e/x, 770e, 770x */
-                video_supported = VIDEO_770;
+                video_supported = IBMACPI_VIDEO_770;
         else
                 /* all others */
-                video_supported = VIDEO_NEW;
+                video_supported = IBMACPI_VIDEO_NEW;
 
         return 0;
 }
@@ -666,15 +809,15 @@ static int video_status(void)
         int status = 0;
         int i;
 
-        if (video_supported == VIDEO_570) {
+        if (video_supported == IBMACPI_VIDEO_570) {
                 if (acpi_evalf(NULL, &i, "\\_SB.PHS", "dd", 0x87))
                         status = i & 3;
-        } else if (video_supported == VIDEO_770) {
+        } else if (video_supported == IBMACPI_VIDEO_770) {
                 if (acpi_evalf(NULL, &i, "\\VCDL", "d"))
                         status |= 0x01 * i;
                 if (acpi_evalf(NULL, &i, "\\VCDC", "d"))
                         status |= 0x02 * i;
-        } else if (video_supported == VIDEO_NEW) {
+        } else if (video_supported == IBMACPI_VIDEO_NEW) {
                 acpi_evalf(NULL, NULL, "\\VUPS", "vd", 1);
                 if (acpi_evalf(NULL, &i, "\\VCDC", "d"))
                         status |= 0x02 * i;
@@ -693,9 +836,10 @@ static int video_autosw(void)
 {
         int autosw = 0;
 
-        if (video_supported == VIDEO_570)
+        if (video_supported == IBMACPI_VIDEO_570)
                 acpi_evalf(vid_handle, &autosw, "SWIT", "d");
-        else if (video_supported == VIDEO_770 || video_supported == VIDEO_NEW)
+        else if (video_supported == IBMACPI_VIDEO_770 ||
+                 video_supported == IBMACPI_VIDEO_NEW)
                 acpi_evalf(vid_handle, &autosw, "^VDEE", "d");
 
         return autosw & 1;
@@ -715,12 +859,12 @@ static int video_read(char *p)
         len += sprintf(p + len, "status:\t\tsupported\n");
         len += sprintf(p + len, "lcd:\t\t%s\n", enabled(status, 0));
         len += sprintf(p + len, "crt:\t\t%s\n", enabled(status, 1));
-        if (video_supported == VIDEO_NEW)
+        if (video_supported == IBMACPI_VIDEO_NEW)
                 len += sprintf(p + len, "dvi:\t\t%s\n", enabled(status, 3));
         len += sprintf(p + len, "auto:\t\t%s\n", enabled(autosw, 0));
         len += sprintf(p + len, "commands:\tlcd_enable, lcd_disable\n");
         len += sprintf(p + len, "commands:\tcrt_enable, crt_disable\n");
-        if (video_supported == VIDEO_NEW)
+        if (video_supported == IBMACPI_VIDEO_NEW)
                 len += sprintf(p + len, "commands:\tdvi_enable, dvi_disable\n");
         len += sprintf(p + len, "commands:\tauto_enable, auto_disable\n");
         len += sprintf(p + len, "commands:\tvideo_switch, expand_toggle\n");
@@ -735,7 +879,7 @@ static int video_switch(void)
 
         if (!acpi_evalf(vid_handle, NULL, "_DOS", "vd", 1))
                 return -EIO;
-        ret = video_supported == VIDEO_570 ?
+        ret = video_supported == IBMACPI_VIDEO_570 ?
             acpi_evalf(ec_handle, NULL, "_Q16", "v") :
             acpi_evalf(vid_handle, NULL, "VSWT", "v");
         acpi_evalf(vid_handle, NULL, "_DOS", "vd", autosw);
@@ -745,9 +889,9 @@ static int video_switch(void)
 
 static int video_expand(void)
 {
-        if (video_supported == VIDEO_570)
+        if (video_supported == IBMACPI_VIDEO_570)
                 return acpi_evalf(ec_handle, NULL, "_Q17", "v");
-        else if (video_supported == VIDEO_770)
+        else if (video_supported == IBMACPI_VIDEO_770)
                 return acpi_evalf(vid_handle, NULL, "VEXP", "v");
         else
                 return acpi_evalf(NULL, NULL, "\\VEXP", "v");
@@ -757,10 +901,10 @@ static int video_switch2(int status)
 {
         int ret;
 
-        if (video_supported == VIDEO_570) {
+        if (video_supported == IBMACPI_VIDEO_570) {
                 ret = acpi_evalf(NULL, NULL,
                                  "\\_SB.PHS2", "vdd", 0x8b, status | 0x80);
-        } else if (video_supported == VIDEO_770) {
+        } else if (video_supported == IBMACPI_VIDEO_770) {
                 int autosw = video_autosw();
                 if (!acpi_evalf(vid_handle, NULL, "_DOS", "vd", 1))
                         return -EIO;
@@ -796,10 +940,10 @@ static int video_write(char *buf)
                         enable |= 0x02;
                 } else if (strlencmp(cmd, "crt_disable") == 0) {
                         disable |= 0x02;
-                } else if (video_supported == VIDEO_NEW &&
+                } else if (video_supported == IBMACPI_VIDEO_NEW &&
                            strlencmp(cmd, "dvi_enable") == 0) {
                         enable |= 0x08;
-                } else if (video_supported == VIDEO_NEW &&
+                } else if (video_supported == IBMACPI_VIDEO_NEW &&
                            strlencmp(cmd, "dvi_disable") == 0) {
                         disable |= 0x08;
                 } else if (strlencmp(cmd, "auto_enable") == 0) {
@@ -898,6 +1042,7 @@ static int light_write(char *buf)
         return 0;
 }
 
+#if defined(CONFIG_ACPI_IBM_DOCK) || defined(CONFIG_ACPI_IBM_BAY)
 static int _sta(acpi_handle handle)
 {
         int status;
@@ -907,6 +1052,7 @@ static int _sta(acpi_handle handle)
 
         return status;
 }
+#endif
 #ifdef CONFIG_ACPI_IBM_DOCK
 #define dock_docked() (_sta(dock_handle) & 1)
 
@@ -972,6 +1118,7 @@ static void dock_notify(struct ibm_struct *ibm, u32 event)
 }
 #endif
 
+#ifdef CONFIG_ACPI_IBM_BAY
 static int bay_status_supported;
 static int bay_status2_supported;
 static int bay_eject_supported;
@@ -1047,6 +1194,7 @@ static void bay_notify(struct ibm_struct *ibm, u32 event)
 {
         acpi_bus_generate_event(ibm->device, event, 0);
 }
+#endif
 
 static int cmos_read(char *p)
 {
@@ -1094,26 +1242,28 @@ static int cmos_write(char *buf)
         return 0;
 }
 
-static int led_supported;
-
-#define LED_570 1
-#define LED_OLD 2
-#define LED_NEW 3
+enum led_access_mode {
+        IBMACPI_LED_NONE = 0,
+        IBMACPI_LED_570,        /* 570 */
+        IBMACPI_LED_OLD,        /* 600e/x, 770e, 770x, A21e, A2xm/p, T20-22, X20-21 */
+        IBMACPI_LED_NEW,        /* all others */
+};
+static enum led_access_mode led_supported;
 
 static int led_init(void)
 {
         if (!led_handle)
                 /* led not supported on R30, R31 */
-                led_supported = 0;
+                led_supported = IBMACPI_LED_NONE;
         else if (strlencmp(led_path, "SLED") == 0)
                 /* 570 */
-                led_supported = LED_570;
+                led_supported = IBMACPI_LED_570;
         else if (strlencmp(led_path, "SYSL") == 0)
                 /* 600e/x, 770e, 770x, A21e, A2xm/p, T20-22, X20-21 */
-                led_supported = LED_OLD;
+                led_supported = IBMACPI_LED_OLD;
         else
                 /* all others */
-                led_supported = LED_NEW;
+                led_supported = IBMACPI_LED_NEW;
 
         return 0;
 }
@@ -1130,7 +1280,7 @@ static int led_read(char *p)
         }
         len += sprintf(p + len, "status:\t\tsupported\n");
 
-        if (led_supported == LED_570) {
+        if (led_supported == IBMACPI_LED_570) {
                 /* 570 */
                 int i, status;
                 for (i = 0; i < 8; i++) {
@@ -1179,13 +1329,13 @@ static int led_write(char *buf)
                 } else
                         return -EINVAL;
 
-                if (led_supported == LED_570) {
+                if (led_supported == IBMACPI_LED_570) {
                         /* 570 */
                         led = 1 << led;
                         if (!acpi_evalf(led_handle, NULL, NULL, "vdd",
                                         led, led_sled_arg1[ind]))
                                 return -EIO;
-                } else if (led_supported == LED_OLD) {
+                } else if (led_supported == IBMACPI_LED_OLD) {
                         /* 600e/x, 770e, 770x, A21e, A2xm/p, T20-22, X20 */
                         led = 1 << led;
                         ret = ec_write(EC_HLMS, led);
@@ -1272,50 +1422,142 @@ static int acpi_ec_write(int i, u8 v)
         return 1;
 }
 
-static int thermal_tmp_supported;
-static int thermal_updt_supported;
+static enum thermal_access_mode thermal_read_mode;
 
 static int thermal_init(void)
 {
-        /* temperatures not supported on 570, G4x, R30, R31, R32 */
-        thermal_tmp_supported = acpi_evalf(ec_handle, NULL, "TMP7", "qv");
+        u8 t, ta1, ta2;
+        int i;
+        int acpi_tmp7 = acpi_evalf(ec_handle, NULL, "TMP7", "qv");
+
+        if (ibm_thinkpad_ec_found && experimental) {
+                /*
+                 * Direct EC access mode: sensors at registers
+                 * 0x78-0x7F, 0xC0-0xC7.  Registers return 0x00 for
+                 * non-implemented, thermal sensors return 0x80 when
+                 * not available
+                 */
 
-        /* 600e/x, 770e, 770x */
-        thermal_updt_supported = acpi_evalf(ec_handle, NULL, "UPDT", "qv");
+                ta1 = ta2 = 0;
+                for (i = 0; i < 8; i++) {
+                        if (likely(acpi_ec_read(0x78 + i, &t))) {
+                                ta1 |= t;
+                        } else {
+                                ta1 = 0;
+                                break;
+                        }
+                        if (likely(acpi_ec_read(0xC0 + i, &t))) {
+                                ta2 |= t;
+                        } else {
+                                ta1 = 0;
+                                break;
+                        }
+                }
+                if (ta1 == 0) {
+                        /* This is sheer paranoia, but we handle it anyway */
+                        if (acpi_tmp7) {
+                                printk(IBM_ERR
+                                       "ThinkPad ACPI EC access misbehaving, "
+                                       "falling back to ACPI TMPx access mode\n");
+                                thermal_read_mode = IBMACPI_THERMAL_ACPI_TMP07;
+                        } else {
+                                printk(IBM_ERR
+                                       "ThinkPad ACPI EC access misbehaving, "
+                                       "disabling thermal sensors access\n");
+                                thermal_read_mode = IBMACPI_THERMAL_NONE;
+                        }
+                } else {
+                        thermal_read_mode =
+                            (ta2 != 0) ?
+                            IBMACPI_THERMAL_TPEC_16 : IBMACPI_THERMAL_TPEC_8;
+                }
+        } else if (acpi_tmp7) {
+                if (acpi_evalf(ec_handle, NULL, "UPDT", "qv")) {
+                        /* 600e/x, 770e, 770x */
+                        thermal_read_mode = IBMACPI_THERMAL_ACPI_UPDT;
+                } else {
+                        /* Standard ACPI TMPx access, max 8 sensors */
+                        thermal_read_mode = IBMACPI_THERMAL_ACPI_TMP07;
+                }
+        } else {
+                /* temperatures not supported on 570, G4x, R30, R31, R32 */
+                thermal_read_mode = IBMACPI_THERMAL_NONE;
+        }
 
         return 0;
 }
 
-static int thermal_read(char *p)
+static int thermal_get_sensors(struct ibm_thermal_sensors_struct *s)
 {
-        int len = 0;
+        int i, t;
+        s8 tmp;
+        char tmpi[] = "TMPi";
 
-        if (!thermal_tmp_supported)
-                len += sprintf(p + len, "temperatures:\tnot supported\n");
-        else {
-                int i, t;
-                char tmpi[] = "TMPi";
-                s8 tmp[8];
+        if (!s)
+                return -EINVAL;
 
-                if (thermal_updt_supported)
-                        if (!acpi_evalf(ec_handle, NULL, "UPDT", "v"))
+        switch (thermal_read_mode) {
+#if IBMACPI_MAX_THERMAL_SENSORS >= 16
+        case IBMACPI_THERMAL_TPEC_16:
+                for (i = 0; i < 8; i++) {
+                        if (!acpi_ec_read(0xC0 + i, &tmp))
+                                return -EIO;
+                        s->temp[i + 8] = tmp * 1000;
+                }
+                /* fallthrough */
+#endif
+        case IBMACPI_THERMAL_TPEC_8:
+                for (i = 0; i < 8; i++) {
+                        if (!acpi_ec_read(0x78 + i, &tmp))
                                 return -EIO;
+                        s->temp[i] = tmp * 1000;
+                }
+                return (thermal_read_mode == IBMACPI_THERMAL_TPEC_16) ? 16 : 8;
 
+        case IBMACPI_THERMAL_ACPI_UPDT:
+                if (!acpi_evalf(ec_handle, NULL, "UPDT", "v"))
+                        return -EIO;
                 for (i = 0; i < 8; i++) {
                         tmpi[3] = '0' + i;
                         if (!acpi_evalf(ec_handle, &t, tmpi, "d"))
                                 return -EIO;
-                        if (thermal_updt_supported)
-                                tmp[i] = (t - 2732 + 5) / 10;
-                        else
-                                tmp[i] = t;
+                        s->temp[i] = (t - 2732) * 100;
                 }
+                return 8;
 
-                len += sprintf(p + len,
-                               "temperatures:\t%d %d %d %d %d %d %d %d\n",
-                               tmp[0], tmp[1], tmp[2], tmp[3],
-                               tmp[4], tmp[5], tmp[6], tmp[7]);
+        case IBMACPI_THERMAL_ACPI_TMP07:
+                for (i = 0; i < 8; i++) {
+                        tmpi[3] = '0' + i;
+                        if (!acpi_evalf(ec_handle, &t, tmpi, "d"))
+                                return -EIO;
+                        s->temp[i] = t * 1000;
+                }
+                return 8;
+
+        case IBMACPI_THERMAL_NONE:
+        default:
+                return 0;
         }
+}
+
+static int thermal_read(char *p)
+{
+        int len = 0;
+        int n, i;
+        struct ibm_thermal_sensors_struct t;
+
+        n = thermal_get_sensors(&t);
+        if (unlikely(n < 0))
+                return n;
+
+        len += sprintf(p + len, "temperatures:\t");
+
+        if (n > 0) {
+                for (i = 0; i < (n - 1); i++)
+                        len += sprintf(p + len, "%d ", t.temp[i] / 1000);
+                len += sprintf(p + len, "%d\n", t.temp[i] / 1000);
+        } else
+                len += sprintf(p + len, "not supported\n");
 
         return len;
 }
@@ -1381,12 +1623,23 @@ static int ecdump_write(char *buf)
 
 static int brightness_offset = 0x31;
 
+static int brightness_get(struct backlight_device *bd)
+{
+        u8 level;
+        if (!acpi_ec_read(brightness_offset, &level))
+                return -EIO;
+
+        level &= 0x7;
+
+        return level;
+}
+
 static int brightness_read(char *p)
 {
         int len = 0;
-        u8 level;
+        int level;
 
-        if (!acpi_ec_read(brightness_offset, &level)) {
+        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);
@@ -1401,16 +1654,34 @@ static int brightness_read(char *p)
 #define BRIGHTNESS_UP   4
 #define BRIGHTNESS_DOWN 5
 
-static int brightness_write(char *buf)
+static int brightness_set(int value)
 {
         int cmos_cmd, inc, i;
-        u8 level;
+        int current_value = brightness_get(NULL);
+
+        value &= 7;
+
+        cmos_cmd = value > current_value ? BRIGHTNESS_UP : BRIGHTNESS_DOWN;
+        inc = value > current_value ? 1 : -1;
+        for (i = current_value; i != value; i += inc) {
+                if (!cmos_eval(cmos_cmd))
+                        return -EIO;
+                if (!acpi_ec_write(brightness_offset, i + inc))
+                        return -EIO;
+        }
+
+        return 0;
+}
+
+static int brightness_write(char *buf)
+{
+        int level;
         int new_level;
         char *cmd;
 
         while ((cmd = next_cmd(&buf))) {
-                if (!acpi_ec_read(brightness_offset, &level))
-                        return -EIO;
+                if ((level = brightness_get(NULL)) < 0)
+                        return level;
                 level &= 7;
 
                 if (strlencmp(cmd, "up") == 0) {
@@ -1423,19 +1694,44 @@ static int brightness_write(char *buf)
                 } else
                         return -EINVAL;
 
-                cmos_cmd = new_level > level ? BRIGHTNESS_UP : BRIGHTNESS_DOWN;
-                inc = new_level > level ? 1 : -1;
-                for (i = level; i != new_level; i += inc) {
-                        if (!cmos_eval(cmos_cmd))
-                                return -EIO;
-                        if (!acpi_ec_write(brightness_offset, i + inc))
-                                return -EIO;
-                }
+                brightness_set(new_level);
         }
 
         return 0;
 }
 
+static int brightness_update_status(struct backlight_device *bd)
+{
+        return brightness_set(bd->props->brightness);
+}
+
+static struct backlight_properties ibm_backlight_data = {
+        .owner          = THIS_MODULE,
+        .get_brightness = brightness_get,
+        .update_status  = brightness_update_status,
+        .max_brightness = 7,
+};
+
+static int brightness_init(void)
+{
+        ibm_backlight_device = backlight_device_register("ibm", NULL, NULL,
+                                                         &ibm_backlight_data);
+        if (IS_ERR(ibm_backlight_device)) {
+                printk(IBM_ERR "Could not register backlight device\n");
+                return PTR_ERR(ibm_backlight_device);
+        }
+
+        return 0;
+}
+
+static void brightness_exit(void)
+{
+        if (ibm_backlight_device) {
+                backlight_device_unregister(ibm_backlight_device);
+                ibm_backlight_device = NULL;
+        }
+}
+
 static int volume_offset = 0x30;
 
 static int volume_read(char *p)
@@ -1522,90 +1818,486 @@ static int volume_write(char *buf)
         return 0;
 }
 
-static int fan_status_offset = 0x2f;
-static int fan_rpm_offset = 0x84;
+static enum fan_status_access_mode fan_status_access_mode;
+static enum fan_control_access_mode fan_control_access_mode;
+static enum fan_control_commands fan_control_commands;
 
-static int fan_read(char *p)
+static int fan_control_status_known;
+static u8 fan_control_initial_status;
+
+static void fan_watchdog_fire(struct work_struct *ignored);
+static int fan_watchdog_maxinterval;
+static DECLARE_DELAYED_WORK(fan_watchdog_task, fan_watchdog_fire);
+
+static int fan_init(void)
 {
-        int len = 0;
-        int s;
-        u8 lo, hi, status;
+        fan_status_access_mode = IBMACPI_FAN_NONE;
+        fan_control_access_mode = IBMACPI_FAN_WR_NONE;
+        fan_control_commands = 0;
+        fan_control_status_known = 1;
+        fan_watchdog_maxinterval = 0;
 
         if (gfan_handle) {
                 /* 570, 600e/x, 770e, 770x */
-                if (!acpi_evalf(gfan_handle, &s, NULL, "d"))
-                        return -EIO;
+                fan_status_access_mode = IBMACPI_FAN_RD_ACPI_GFAN;
+        } else {
+                /* all other ThinkPads: note that even old-style
+                 * ThinkPad ECs supports the fan control register */
+                if (likely(acpi_ec_read(fan_status_offset,
+                                        &fan_control_initial_status))) {
+                        fan_status_access_mode = IBMACPI_FAN_RD_TPEC;
+
+                        /* In some ThinkPads, neither the EC nor the ACPI
+                         * DSDT initialize the fan status, and it ends up
+                         * being set to 0x07 when it *could* be either
+                         * 0x07 or 0x80.
+                         *
+                         * Enable for TP-1Y (T43), TP-78 (R51e),
+                         * TP-76 (R52), TP-70 (T43, R52), which are known
+                         * to be buggy. */
+                        if (fan_control_initial_status == 0x07 &&
+                            ibm_thinkpad_ec_found &&
+                            ((ibm_thinkpad_ec_found[0] == '1' &&
+                              ibm_thinkpad_ec_found[1] == 'Y') ||
+                             (ibm_thinkpad_ec_found[0] == '7' &&
+                              (ibm_thinkpad_ec_found[1] == '6' ||
+                               ibm_thinkpad_ec_found[1] == '8' ||
+                               ibm_thinkpad_ec_found[1] == '0'))
+                            )) {
+                                printk(IBM_NOTICE
+                                       "fan_init: initial fan status is "
+                                       "unknown, assuming it is in auto "
+                                       "mode\n");
+                                fan_control_status_known = 0;
+                        }
+                } else {
+                        printk(IBM_ERR
+                               "ThinkPad ACPI EC access misbehaving, "
+                               "fan status and control unavailable\n");
+                        return 0;
+                }
+        }
 
-                len += sprintf(p + len, "level:\t\t%d\n", s);
+        if (sfan_handle) {
+                /* 570, 770x-JL */
+                fan_control_access_mode = IBMACPI_FAN_WR_ACPI_SFAN;
+                fan_control_commands |=
+                    IBMACPI_FAN_CMD_LEVEL | IBMACPI_FAN_CMD_ENABLE;
         } else {
+                if (!gfan_handle) {
+                        /* gfan without sfan means no fan control */
+                        /* all other models implement TP EC 0x2f control */
+
+                        if (fans_handle) {
+                                /* X31, X40, X41 */
+                                fan_control_access_mode =
+                                    IBMACPI_FAN_WR_ACPI_FANS;
+                                fan_control_commands |=
+                                    IBMACPI_FAN_CMD_SPEED |
+                                    IBMACPI_FAN_CMD_LEVEL |
+                                    IBMACPI_FAN_CMD_ENABLE;
+                        } else {
+                                fan_control_access_mode = IBMACPI_FAN_WR_TPEC;
+                                fan_control_commands |=
+                                    IBMACPI_FAN_CMD_LEVEL |
+                                    IBMACPI_FAN_CMD_ENABLE;
+                        }
+                }
+        }
+
+        return 0;
+}
+
+static int fan_get_status(u8 *status)
+{
+        u8 s;
+
+        /* TODO:
+         * Add IBMACPI_FAN_RD_ACPI_FANS ? */
+
+        switch (fan_status_access_mode) {
+        case IBMACPI_FAN_RD_ACPI_GFAN:
+                /* 570, 600e/x, 770e, 770x */
+
+                if (unlikely(!acpi_evalf(gfan_handle, &s, NULL, "d")))
+                        return -EIO;
+
+                if (likely(status))
+                        *status = s & 0x07;
+
+                break;
+
+        case IBMACPI_FAN_RD_TPEC:
                 /* all except 570, 600e/x, 770e, 770x */
-                if (!acpi_ec_read(fan_status_offset, &status))
-                        len += sprintf(p + len, "status:\t\tunreadable\n");
-                else
-                        len += sprintf(p + len, "status:\t\t%s\n",
-                                       enabled(status, 7));
+                if (unlikely(!acpi_ec_read(fan_status_offset, &s)))
+                        return -EIO;
 
-                if (!acpi_ec_read(fan_rpm_offset, &lo) ||
-                    !acpi_ec_read(fan_rpm_offset + 1, &hi))
-                        len += sprintf(p + len, "speed:\t\tunreadable\n");
-                else
-                        len += sprintf(p + len, "speed:\t\t%d\n",
-                                       (hi << 8) + lo);
+                if (likely(status))
+                        *status = s;
+
+                break;
+
+        default:
+                return -ENXIO;
         }
 
-        if (sfan_handle)
-                /* 570, 770x-JL */
-                len += sprintf(p + len, "commands:\tlevel <level>"
-                               " (<level> is 0-7)\n");
-        if (!gfan_handle)
+        return 0;
+}
+
+static int fan_get_speed(unsigned int *speed)
+{
+        u8 hi, lo;
+
+        switch (fan_status_access_mode) {
+        case IBMACPI_FAN_RD_TPEC:
                 /* all except 570, 600e/x, 770e, 770x */
-                len += sprintf(p + len, "commands:\tenable, disable\n");
-        if (fans_handle)
-                /* X31, X40 */
+                if (unlikely(!acpi_ec_read(fan_rpm_offset, &lo) ||
+                             !acpi_ec_read(fan_rpm_offset + 1, &hi)))
+                        return -EIO;
+
+                if (likely(speed))
+                        *speed = (hi << 8) | lo;
+
+                break;
+
+        default:
+                return -ENXIO;
+        }
+
+        return 0;
+}
+
+static void fan_exit(void)
+{
+        cancel_delayed_work(&fan_watchdog_task);
+        flush_scheduled_work();
+}
+
+static void fan_watchdog_reset(void)
+{
+        static int fan_watchdog_active = 0;
+
+        if (fan_watchdog_active)
+                cancel_delayed_work(&fan_watchdog_task);
+
+        if (fan_watchdog_maxinterval > 0) {
+                fan_watchdog_active = 1;
+                if (!schedule_delayed_work(&fan_watchdog_task,
+                                msecs_to_jiffies(fan_watchdog_maxinterval
+                                                 * 1000))) {
+                        printk(IBM_ERR "failed to schedule the fan watchdog, "
+                               "watchdog will not trigger\n");
+                }
+        } else
+                fan_watchdog_active = 0;
+}
+
+static int fan_read(char *p)
+{
+        int len = 0;
+        int rc;
+        u8 status;
+        unsigned int speed = 0;
+
+        switch (fan_status_access_mode) {
+        case IBMACPI_FAN_RD_ACPI_GFAN:
+                /* 570, 600e/x, 770e, 770x */
+                if ((rc = fan_get_status(&status)) < 0)
+                        return rc;
+
+                len += sprintf(p + len, "status:\t\t%s\n"
+                               "level:\t\t%d\n",
+                               (status != 0) ? "enabled" : "disabled", status);
+                break;
+
+        case IBMACPI_FAN_RD_TPEC:
+                /* all except 570, 600e/x, 770e, 770x */
+                if ((rc = fan_get_status(&status)) < 0)
+                        return rc;
+
+                if (unlikely(!fan_control_status_known)) {
+                        if (status != fan_control_initial_status)
+                                fan_control_status_known = 1;
+                        else
+                                /* Return most likely status. In fact, it
+                                 * might be the only possible status */
+                                status = IBMACPI_FAN_EC_AUTO;
+                }
+
+                len += sprintf(p + len, "status:\t\t%s\n",
+                               (status != 0) ? "enabled" : "disabled");
+
+                /* No ThinkPad boots on disengaged mode, we can safely
+                 * assume the tachometer is online if fan control status
+                 * was unknown */
+                if ((rc = fan_get_speed(&speed)) < 0)
+                        return rc;
+
+                len += sprintf(p + len, "speed:\t\t%d\n", speed);
+
+                if (status & IBMACPI_FAN_EC_DISENGAGED)
+                        /* Disengaged mode takes precedence */
+                        len += sprintf(p + len, "level:\t\tdisengaged\n");
+                else if (status & IBMACPI_FAN_EC_AUTO)
+                        len += sprintf(p + len, "level:\t\tauto\n");
+                else
+                        len += sprintf(p + len, "level:\t\t%d\n", status);
+                break;
+
+        case IBMACPI_FAN_NONE:
+        default:
+                len += sprintf(p + len, "status:\t\tnot supported\n");
+        }
+
+        if (fan_control_commands & IBMACPI_FAN_CMD_LEVEL) {
+                len += sprintf(p + len, "commands:\tlevel <level>");
+
+                switch (fan_control_access_mode) {
+                case IBMACPI_FAN_WR_ACPI_SFAN:
+                        len += sprintf(p + len, " (<level> is 0-7)\n");
+                        break;
+
+                default:
+                        len += sprintf(p + len, " (<level> is 0-7, "
+                                       "auto, disengaged)\n");
+                        break;
+                }
+        }
+
+        if (fan_control_commands & IBMACPI_FAN_CMD_ENABLE)
+                len += sprintf(p + len, "commands:\tenable, disable\n"
+                               "commands:\twatchdog <timeout> (<timeout> is 0 (off), "
+                               "1-120 (seconds))\n");
+
+        if (fan_control_commands & IBMACPI_FAN_CMD_SPEED)
                 len += sprintf(p + len, "commands:\tspeed <speed>"
                                " (<speed> is 0-65535)\n");
 
         return len;
 }
 
-static int fan_write(char *buf)
+static int fan_set_level(int level)
 {
-        char *cmd;
-        int level, speed;
-
-        while ((cmd = next_cmd(&buf))) {
-                if (sfan_handle &&
-                    sscanf(cmd, "level %d", &level) == 1 &&
-                    level >= 0 && level <= 7) {
-                        /* 570, 770x-JL */
+        switch (fan_control_access_mode) {
+        case IBMACPI_FAN_WR_ACPI_SFAN:
+                if (level >= 0 && level <= 7) {
                         if (!acpi_evalf(sfan_handle, NULL, NULL, "vd", level))
                                 return -EIO;
-                } else if (!gfan_handle && strlencmp(cmd, "enable") == 0) {
-                        /* all except 570, 600e/x, 770e, 770x */
-                        if (!acpi_ec_write(fan_status_offset, 0x80))
-                                return -EIO;
-                } else if (!gfan_handle && strlencmp(cmd, "disable") == 0) {
-                        /* all except 570, 600e/x, 770e, 770x */
-                        if (!acpi_ec_write(fan_status_offset, 0x00))
-                                return -EIO;
-                } else if (fans_handle &&
-                           sscanf(cmd, "speed %d", &speed) == 1 &&
-                           speed >= 0 && speed <= 65535) {
-                        /* X31, X40 */
+                } else
+                        return -EINVAL;
+                break;
+
+        case IBMACPI_FAN_WR_ACPI_FANS:
+        case IBMACPI_FAN_WR_TPEC:
+                if ((level != IBMACPI_FAN_EC_AUTO) &&
+                    (level != IBMACPI_FAN_EC_DISENGAGED) &&
+                    ((level < 0) || (level > 7)))
+                        return -EINVAL;
+
+                if (!acpi_ec_write(fan_status_offset, level))
+                        return -EIO;
+                else
+                        fan_control_status_known = 1;
+                break;
+
+        default:
+                return -ENXIO;
+        }
+        return 0;
+}
+
+static int fan_set_enable(void)
+{
+        u8 s;
+        int rc;
+
+        switch (fan_control_access_mode) {
+        case IBMACPI_FAN_WR_ACPI_FANS:
+        case IBMACPI_FAN_WR_TPEC:
+                if ((rc = fan_get_status(&s)) < 0)
+                        return rc;
+
+                /* Don't go out of emergency fan mode */
+                if (s != 7)
+                        s = IBMACPI_FAN_EC_AUTO;
+
+                if (!acpi_ec_write(fan_status_offset, s))
+                        return -EIO;
+                else
+                        fan_control_status_known = 1;
+                break;
+
+        case IBMACPI_FAN_WR_ACPI_SFAN:
+                if ((rc = fan_get_status(&s)) < 0)
+                        return rc;
+
+                s &= 0x07;
+
+                /* Set fan to at least level 4 */
+                if (s < 4)
+                        s = 4;
+
+                if (!acpi_evalf(sfan_handle, NULL, NULL, "vd", s))
+                        return -EIO;
+                break;
+
+        default:
+                return -ENXIO;
+        }
+        return 0;
+}
+
+static int fan_set_disable(void)
+{
+        switch (fan_control_access_mode) {
+        case IBMACPI_FAN_WR_ACPI_FANS:
+        case IBMACPI_FAN_WR_TPEC:
+                if (!acpi_ec_write(fan_status_offset, 0x00))
+                        return -EIO;
+                else
+                        fan_control_status_known = 1;
+                break;
+
+        case IBMACPI_FAN_WR_ACPI_SFAN:
+                if (!acpi_evalf(sfan_handle, NULL, NULL, "vd", 0x00))
+                        return -EIO;
+                break;
+
+        default:
+                return -ENXIO;
+        }
+        return 0;
+}
+
+static int fan_set_speed(int speed)
+{
+        switch (fan_control_access_mode) {
+        case IBMACPI_FAN_WR_ACPI_FANS:
+                if (speed >= 0 && speed <= 65535) {
                         if (!acpi_evalf(fans_handle, NULL, NULL, "vddd",
                                         speed, speed, speed))
                                 return -EIO;
                 } else
                         return -EINVAL;
-        }
+                break;
 
+        default:
+                return -ENXIO;
+        }
         return 0;
 }
 
+static int fan_write_cmd_level(const char *cmd, int *rc)
+{
+        int level;
+
+        if (strlencmp(cmd, "level auto") == 0)
+                level = IBMACPI_FAN_EC_AUTO;
+        else if (strlencmp(cmd, "level disengaged") == 0)
+                level = IBMACPI_FAN_EC_DISENGAGED;
+        else if (sscanf(cmd, "level %d", &level) != 1)
+                return 0;
+
+        if ((*rc = fan_set_level(level)) == -ENXIO)
+                printk(IBM_ERR "level command accepted for unsupported "
+                       "access mode %d", fan_control_access_mode);
+
+        return 1;
+}
+
+static int fan_write_cmd_enable(const char *cmd, int *rc)
+{
+        if (strlencmp(cmd, "enable") != 0)
+                return 0;
+
+        if ((*rc = fan_set_enable()) == -ENXIO)
+                printk(IBM_ERR "enable command accepted for unsupported "
+                       "access mode %d", fan_control_access_mode);
+
+        return 1;
+}
+
+static int fan_write_cmd_disable(const char *cmd, int *rc)
+{
+        if (strlencmp(cmd, "disable") != 0)
+                return 0;
+
+        if ((*rc = fan_set_disable()) == -ENXIO)
+                printk(IBM_ERR "disable command accepted for unsupported "
+                       "access mode %d", fan_control_access_mode);
+
+        return 1;
+}
+
+static int fan_write_cmd_speed(const char *cmd, int *rc)
+{
+        int speed;
+
+        /* TODO:
+         * Support speed <low> <medium> <high> ? */
+
+        if (sscanf(cmd, "speed %d", &speed) != 1)
+                return 0;
+
+        if ((*rc = fan_set_speed(speed)) == -ENXIO)
+                printk(IBM_ERR "speed command accepted for unsupported "
+                       "access mode %d", fan_control_access_mode);
+
+        return 1;
+}
+
+static int fan_write_cmd_watchdog(const char *cmd, int *rc)
+{
+        int interval;
+
+        if (sscanf(cmd, "watchdog %d", &interval) != 1)
+                return 0;
+
+        if (interval < 0 || interval > 120)
+                *rc = -EINVAL;
+        else
+                fan_watchdog_maxinterval = interval;
+
+        return 1;
+}
+
+static int fan_write(char *buf)
+{
+        char *cmd;
+        int rc = 0;
+
+        while (!rc && (cmd = next_cmd(&buf))) {
+                if (!((fan_control_commands & IBMACPI_FAN_CMD_LEVEL) &&
+                      fan_write_cmd_level(cmd, &rc)) &&
+                    !((fan_control_commands & IBMACPI_FAN_CMD_ENABLE) &&
+                      (fan_write_cmd_enable(cmd, &rc) ||
+                       fan_write_cmd_disable(cmd, &rc) ||
+                       fan_write_cmd_watchdog(cmd, &rc))) &&
+                    !((fan_control_commands & IBMACPI_FAN_CMD_SPEED) &&
+                      fan_write_cmd_speed(cmd, &rc))
+                    )
+                        rc = -EINVAL;
+                else if (!rc)
+                        fan_watchdog_reset();
+        }
+
+        return rc;
+}
+
+static void fan_watchdog_fire(struct work_struct *ignored)
+{
+        printk(IBM_NOTICE "fan watchdog: enabling fan\n");
+        if (fan_set_enable()) {
+                printk(IBM_ERR "fan watchdog: error while enabling fan\n");
+                /* reschedule for later */
+                fan_watchdog_reset();
+        }
+}
+
 static struct ibm_struct ibms[] = {
         {
          .name = "driver",
-         .init = driver_init,
+         .init = ibm_acpi_driver_init,
          .read = driver_read,
          },
         {
@@ -1662,6 +2354,7 @@ static struct ibm_struct ibms[] = {
          .type = ACPI_SYSTEM_NOTIFY,
          },
 #endif
+#ifdef CONFIG_ACPI_IBM_BAY
         {
          .name = "bay",
          .init = bay_init,
@@ -1671,6 +2364,7 @@ static struct ibm_struct ibms[] = {
          .handle = &bay_handle,
          .type = ACPI_SYSTEM_NOTIFY,
          },
+#endif
         {
          .name = "cmos",
          .read = cmos_read,
@@ -1702,6 +2396,8 @@ static struct ibm_struct ibms[] = {
          .name = "brightness",
          .read = brightness_read,
          .write = brightness_write,
+         .init = brightness_init,
+         .exit = brightness_exit,
          },
         {
          .name = "volume",
@@ -1712,6 +2408,8 @@ static struct ibm_struct ibms[] = {
          .name = "fan",
          .read = fan_read,
          .write = fan_write,
+         .init = fan_init,
+         .exit = fan_exit,
          .experimental = 1,
          },
 };
@@ -1719,7 +2417,7 @@ static struct ibm_struct ibms[] = {
 static int dispatch_read(char *page, char **start, off_t off, int count,
                          int *eof, void *data)
 {
-        struct ibm_struct *ibm = (struct ibm_struct *)data;
+        struct ibm_struct *ibm = data;
         int len;
 
         if (!ibm || !ibm->read)
@@ -1744,7 +2442,7 @@ static int dispatch_read(char *page, char **start, off_t off, int count,
 static int dispatch_write(struct file *file, const char __user * userbuf,
                           unsigned long count, void *data)
 {
-        struct ibm_struct *ibm = (struct ibm_struct *)data;
+        struct ibm_struct *ibm = data;
         char *kernbuf;
         int ret;
 
@@ -1773,7 +2471,7 @@ static int dispatch_write(struct file *file, const char __user * userbuf,
 
 static void dispatch_notify(acpi_handle handle, u32 event, void *data)
 {
-        struct ibm_struct *ibm = (struct ibm_struct *)data;
+        struct ibm_struct *ibm = data;
 
         if (!ibm || !ibm->notify)
                 return;
@@ -1805,7 +2503,7 @@ static int __init setup_notify(struct ibm_struct *ibm)
                        ibm->name, status);
                 return -ENODEV;
         }
-
+        ibm->notify_installed = 1;
         return 0;
 }
 
@@ -1818,14 +2516,13 @@ static int __init register_driver(struct ibm_struct *ibm)
 {
         int ret;
 
-        ibm->driver = kmalloc(sizeof(struct acpi_driver), GFP_KERNEL);
+        ibm->driver = kzalloc(sizeof(struct acpi_driver), GFP_KERNEL);
         if (!ibm->driver) {
                 printk(IBM_ERR "kmalloc(ibm->driver) failed\n");
                 return -1;
         }
 
-        memset(ibm->driver, 0, sizeof(struct acpi_driver));
-        sprintf(ibm->driver->name, "%s/%s", IBM_NAME, ibm->name);
+        sprintf(ibm->driver->name, "%s_%s", IBM_NAME, ibm->name);
         ibm->driver->ids = ibm->hid;
         ibm->driver->ops.add = &ibm_device_add;
 
@@ -1882,7 +2579,6 @@ static int __init ibm_init(struct ibm_struct *ibm)
                 ret = setup_notify(ibm);
                 if (ret < 0)
                         return ret;
-                ibm->notify_installed = 1;
         }
 
         return 0;
@@ -1954,7 +2650,9 @@ IBM_PARAM(light);
 #ifdef CONFIG_ACPI_IBM_DOCK
 IBM_PARAM(dock);
 #endif
+#ifdef CONFIG_ACPI_IBM_BAY
 IBM_PARAM(bay);
+#endif
 IBM_PARAM(cmos);
 IBM_PARAM(led);
 IBM_PARAM(beep);
@@ -1971,6 +2669,33 @@ static void acpi_ibm_exit(void)
                 ibm_exit(&ibms[i]);
 
         remove_proc_entry(IBM_DIR, acpi_root_dir);
+
+        if (ibm_thinkpad_ec_found)
+                kfree(ibm_thinkpad_ec_found);
+}
+
+static char* __init check_dmi_for_ec(void)
+{
+        struct dmi_device *dev = NULL;
+        char ec_fw_string[18];
+
+        /*
+         * ThinkPad T23 or newer, A31 or newer, R50e or newer,
+         * X32 or newer, all Z series;  Some models must have an
+         * up-to-date BIOS or they will not be detected.
+         *
+         * See http://thinkwiki.org/wiki/List_of_DMI_IDs
+         */
+        while ((dev = dmi_find_device(DMI_DEV_TYPE_OEM_STRING, NULL, dev))) {
+                if (sscanf(dev->name,
+                           "IBM ThinkPad Embedded Controller -[%17c",
+                           ec_fw_string) == 1) {
+                        ec_fw_string[sizeof(ec_fw_string) - 1] = 0;
+                        ec_fw_string[strcspn(ec_fw_string, " ]")] = 0;
+                        return kstrdup(ec_fw_string, GFP_KERNEL);
+                }
+        }
+        return NULL;
 }
 
 static int __init acpi_ibm_init(void)
@@ -1992,6 +2717,12 @@ static int __init acpi_ibm_init(void)
                 return -ENODEV;
         }
 
+        /* Models with newer firmware report the EC in DMI */
+        ibm_thinkpad_ec_found = check_dmi_for_ec();
+        if (ibm_thinkpad_ec_found)
+                printk(IBM_INFO "ThinkPad EC firmware %s\n",
+                       ibm_thinkpad_ec_found);
+
         /* these handles are not required */
         IBM_HANDLE_INIT(vid);
         IBM_HANDLE_INIT(vid2);
@@ -2004,12 +2735,14 @@ static int __init acpi_ibm_init(void)
         IBM_HANDLE_INIT(dock);
 #endif
         IBM_HANDLE_INIT(pci);
+#ifdef CONFIG_ACPI_IBM_BAY
         IBM_HANDLE_INIT(bay);
         if (bay_handle)
                 IBM_HANDLE_INIT(bay_ej);
         IBM_HANDLE_INIT(bay2);
         if (bay2_handle)
                 IBM_HANDLE_INIT(bay2_ej);
+#endif
         IBM_HANDLE_INIT(beep);
         IBM_HANDLE_INIT(ecrd);
         IBM_HANDLE_INIT(ecwr);
diff --git a/drivers/acpi/namespace/nsxfobj.c b/drivers/acpi/namespace/nsxfobj.c
index a163e1d370..a18b1c2231 100644
--- a/drivers/acpi/namespace/nsxfobj.c
+++ b/drivers/acpi/namespace/nsxfobj.c
@@ -50,6 +50,50 @@ ACPI_MODULE_NAME("nsxfobj")
 
 /*******************************************************************************
  *
+ * FUNCTION:    acpi_get_id
+ *
+ * PARAMETERS:  Handle          - Handle of object whose id is desired
+ *              ret_id          - Where the id will be placed
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: This routine returns the owner id associated with a handle
+ *
+ ******************************************************************************/
+acpi_status acpi_get_id(acpi_handle handle, acpi_owner_id * ret_id)
+{
+        struct acpi_namespace_node *node;
+        acpi_status status;
+
+        /* Parameter Validation */
+
+        if (!ret_id) {
+                return (AE_BAD_PARAMETER);
+        }
+
+        status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);
+        if (ACPI_FAILURE(status)) {
+                return (status);
+        }
+
+        /* Convert and validate the handle */
+
+        node = acpi_ns_map_handle_to_node(handle);
+        if (!node) {
+                (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
+                return (AE_BAD_PARAMETER);
+        }
+
+        *ret_id = node->owner_id;
+
+        status = acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
+        return (status);
+}
+
+ACPI_EXPORT_SYMBOL(acpi_get_id)
+
+/*******************************************************************************
+ *
  * FUNCTION:    acpi_get_type
  *
  * PARAMETERS:  Handle          - Handle of object whose type is desired
diff --git a/drivers/acpi/numa.c b/drivers/acpi/numa.c
index e5e448edca..bd96a70459 100644
--- a/drivers/acpi/numa.c
+++ b/drivers/acpi/numa.c
@@ -248,7 +248,7 @@ int acpi_get_pxm(acpi_handle h)
                 handle = phandle;
                 status = acpi_evaluate_integer(handle, "_PXM", NULL, &pxm);
                 if (ACPI_SUCCESS(status))
-                        return (int)pxm;
+                        return pxm;
                 status = acpi_get_parent(handle, &phandle);
         } while (ACPI_SUCCESS(status));
         return -1;
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index 02b30ae6a6..57ae1e5cde 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -568,6 +568,7 @@ void acpi_os_derive_pci_id(acpi_handle rhandle,	/* upper bound  */
 static void acpi_os_execute_deferred(struct work_struct *work)
 {
         struct acpi_os_dpc *dpc = container_of(work, struct acpi_os_dpc, work);
+
         if (!dpc) {
                 printk(KERN_ERR PREFIX "Invalid (NULL) context\n");
                 return;
@@ -1031,7 +1032,7 @@ acpi_status
 acpi_os_create_cache(char *name, u16 size, u16 depth, acpi_cache_t ** cache)
 {
         *cache = kmem_cache_create(name, size, 0, 0, NULL, NULL);
-        if (cache == NULL)
+        if (*cache == NULL)
                 return AE_ERROR;
         else
                 return AE_OK;
@@ -1051,7 +1052,7 @@ acpi_os_create_cache(char *name, u16 size, u16 depth, acpi_cache_t ** cache)
 
 acpi_status acpi_os_purge_cache(acpi_cache_t * cache)
 {
-        (void)kmem_cache_shrink(cache);
+        kmem_cache_shrink(cache);
         return (AE_OK);
 }
 
diff --git a/drivers/acpi/pci_bind.c b/drivers/acpi/pci_bind.c
index 1e2ae6e7a7..55f57a61c5 100644
--- a/drivers/acpi/pci_bind.c
+++ b/drivers/acpi/pci_bind.c
@@ -122,19 +122,17 @@ int acpi_pci_bind(struct acpi_device *device)
         if (!device || !device->parent)
                 return -EINVAL;
 
-        pathname = kmalloc(ACPI_PATHNAME_MAX, GFP_KERNEL);
+        pathname = kzalloc(ACPI_PATHNAME_MAX, GFP_KERNEL);
         if (!pathname)
                 return -ENOMEM;
-        memset(pathname, 0, ACPI_PATHNAME_MAX);
         buffer.length = ACPI_PATHNAME_MAX;
         buffer.pointer = pathname;
 
-        data = kmalloc(sizeof(struct acpi_pci_data), GFP_KERNEL);
+        data = kzalloc(sizeof(struct acpi_pci_data), GFP_KERNEL);
         if (!data) {
                 kfree(pathname);
                 return -ENOMEM;
         }
-        memset(data, 0, sizeof(struct acpi_pci_data));
 
         acpi_get_name(device->handle, ACPI_FULL_PATHNAME, &buffer);
         ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Binding PCI device [%s]...\n",
@@ -281,10 +279,9 @@ int acpi_pci_unbind(struct acpi_device *device)
         if (!device || !device->parent)
                 return -EINVAL;
 
-        pathname = (char *)kmalloc(ACPI_PATHNAME_MAX, GFP_KERNEL);
+        pathname = kzalloc(ACPI_PATHNAME_MAX, GFP_KERNEL);
         if (!pathname)
                 return -ENOMEM;
-        memset(pathname, 0, ACPI_PATHNAME_MAX);
 
         buffer.length = ACPI_PATHNAME_MAX;
         buffer.pointer = pathname;
@@ -331,11 +328,9 @@ acpi_pci_bind_root(struct acpi_device *device,
         char *pathname = NULL;
         struct acpi_buffer buffer = { 0, NULL };
 
-
-        pathname = (char *)kmalloc(ACPI_PATHNAME_MAX, GFP_KERNEL);
+        pathname = kzalloc(ACPI_PATHNAME_MAX, GFP_KERNEL);
         if (!pathname)
                 return -ENOMEM;
-        memset(pathname, 0, ACPI_PATHNAME_MAX);
 
         buffer.length = ACPI_PATHNAME_MAX;
         buffer.pointer = pathname;
@@ -345,12 +340,11 @@ acpi_pci_bind_root(struct acpi_device *device,
                 return -EINVAL;
         }
 
-        data = kmalloc(sizeof(struct acpi_pci_data), GFP_KERNEL);
+        data = kzalloc(sizeof(struct acpi_pci_data), GFP_KERNEL);
         if (!data) {
                 kfree(pathname);
                 return -ENOMEM;
         }
-        memset(data, 0, sizeof(struct acpi_pci_data));
 
         data->id = *id;
         data->bus = bus;
diff --git a/drivers/acpi/pci_irq.c b/drivers/acpi/pci_irq.c
index feda0341f5..fe7d007833 100644
--- a/drivers/acpi/pci_irq.c
+++ b/drivers/acpi/pci_irq.c
@@ -89,10 +89,9 @@ acpi_pci_irq_add_entry(acpi_handle handle,
         if (!prt)
                 return -EINVAL;
 
-        entry = kmalloc(sizeof(struct acpi_prt_entry), GFP_KERNEL);
+        entry = kzalloc(sizeof(struct acpi_prt_entry), GFP_KERNEL);
         if (!entry)
                 return -ENOMEM;
-        memset(entry, 0, sizeof(struct acpi_prt_entry));
 
         entry->id.segment = segment;
         entry->id.bus = bus;
@@ -161,10 +160,9 @@ int acpi_pci_irq_add_prt(acpi_handle handle, int segment, int bus)
         static int first_time = 1;
 
 
-        pathname = (char *)kmalloc(ACPI_PATHNAME_MAX, GFP_KERNEL);
+        pathname = kzalloc(ACPI_PATHNAME_MAX, GFP_KERNEL);
         if (!pathname)
                 return -ENOMEM;
-        memset(pathname, 0, ACPI_PATHNAME_MAX);
 
         if (first_time) {
                 acpi_prt.count = 0;
@@ -198,11 +196,10 @@ int acpi_pci_irq_add_prt(acpi_handle handle, int segment, int bus)
                 return -ENODEV;
         }
 
-        prt = kmalloc(buffer.length, GFP_KERNEL);
+        prt = kzalloc(buffer.length, GFP_KERNEL);
         if (!prt) {
                 return -ENOMEM;
         }
-        memset(prt, 0, buffer.length);
         buffer.pointer = prt;
 
         status = acpi_get_irq_routing_table(handle, &buffer);
diff --git a/drivers/acpi/pci_link.c b/drivers/acpi/pci_link.c
index d53bd9878c..481e633bbf 100644
--- a/drivers/acpi/pci_link.c
+++ b/drivers/acpi/pci_link.c
@@ -103,7 +103,7 @@ DEFINE_MUTEX(acpi_link_lock);
 static acpi_status
 acpi_pci_link_check_possible(struct acpi_resource *resource, void *context)
 {
-        struct acpi_pci_link *link = (struct acpi_pci_link *)context;
+        struct acpi_pci_link *link = context;
         u32 i = 0;
 
 
@@ -307,11 +307,10 @@ static int acpi_pci_link_set(struct acpi_pci_link *link, int irq)
         if (!link || !irq)
                 return -EINVAL;
 
-        resource = kmalloc(sizeof(*resource) + 1, irqs_disabled() ? GFP_ATOMIC: GFP_KERNEL);
+        resource = kzalloc(sizeof(*resource) + 1, irqs_disabled() ? GFP_ATOMIC: GFP_KERNEL);
         if (!resource)
                 return -ENOMEM;
 
-        memset(resource, 0, sizeof(*resource) + 1);
         buffer.length = sizeof(*resource) + 1;
         buffer.pointer = resource;
 
@@ -613,7 +612,7 @@ acpi_pci_link_allocate_irq(acpi_handle handle,
                 return -1;
         }
 
-        link = (struct acpi_pci_link *)acpi_driver_data(device);
+        link = acpi_driver_data(device);
         if (!link) {
                 printk(KERN_ERR PREFIX "Invalid link context\n");
                 return -1;
@@ -668,7 +667,7 @@ int acpi_pci_link_free_irq(acpi_handle handle)
                 return -1;
         }
 
-        link = (struct acpi_pci_link *)acpi_driver_data(device);
+        link = acpi_driver_data(device);
         if (!link) {
                 printk(KERN_ERR PREFIX "Invalid link context\n");
                 return -1;
@@ -718,10 +717,9 @@ static int acpi_pci_link_add(struct acpi_device *device)
         if (!device)
                 return -EINVAL;
 
-        link = kmalloc(sizeof(struct acpi_pci_link), GFP_KERNEL);
+        link = kzalloc(sizeof(struct acpi_pci_link), GFP_KERNEL);
         if (!link)
                 return -ENOMEM;
-        memset(link, 0, sizeof(struct acpi_pci_link));
 
         link->device = device;
         strcpy(acpi_device_name(device), ACPI_PCI_LINK_DEVICE_NAME);
@@ -808,7 +806,7 @@ static int acpi_pci_link_remove(struct acpi_device *device, int type)
         if (!device || !acpi_driver_data(device))
                 return -EINVAL;
 
-        link = (struct acpi_pci_link *)acpi_driver_data(device);
+        link = acpi_driver_data(device);
 
         mutex_lock(&acpi_link_lock);
         list_del(&link->node);
diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c
index 0984a1ee24..a860efa2c5 100644
--- a/drivers/acpi/pci_root.c
+++ b/drivers/acpi/pci_root.c
@@ -98,11 +98,12 @@ void acpi_pci_unregister_driver(struct acpi_pci_driver *driver)
 
         struct acpi_pci_driver **pptr = &sub_driver;
         while (*pptr) {
-                if (*pptr != driver)
-                        continue;
-                *pptr = (*pptr)->next;
-                break;
+                if (*pptr == driver)
+                        break;
+                pptr = &(*pptr)->next;
         }
+        BUG_ON(!*pptr);
+        *pptr = (*pptr)->next;
 
         if (!driver->remove)
                 return;
@@ -119,7 +120,7 @@ EXPORT_SYMBOL(acpi_pci_unregister_driver);
 static acpi_status
 get_root_bridge_busnr_callback(struct acpi_resource *resource, void *data)
 {
-        int *busnr = (int *)data;
+        int *busnr = data;
         struct acpi_resource_address64 address;
 
         if (resource->type != ACPI_RESOURCE_TYPE_ADDRESS16 &&
@@ -164,10 +165,9 @@ static int acpi_pci_root_add(struct acpi_device *device)
         if (!device)
                 return -EINVAL;
 
-        root = kmalloc(sizeof(struct acpi_pci_root), GFP_KERNEL);
+        root = kzalloc(sizeof(struct acpi_pci_root), GFP_KERNEL);
         if (!root)
                 return -ENOMEM;
-        memset(root, 0, sizeof(struct acpi_pci_root));
         INIT_LIST_HEAD(&root->node);
 
         root->device = device;
@@ -331,7 +331,7 @@ static int acpi_pci_root_remove(struct acpi_device *device, int type)
         if (!device || !acpi_driver_data(device))
                 return -EINVAL;
 
-        root = (struct acpi_pci_root *)acpi_driver_data(device);
+        root = acpi_driver_data(device);
 
         kfree(root);
 
diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c
index fe67a8af52..0ba7dfbbb2 100644
--- a/drivers/acpi/power.c
+++ b/drivers/acpi/power.c
@@ -108,7 +108,7 @@ acpi_power_get_context(acpi_handle handle,
                 return result;
         }
 
-        *resource = (struct acpi_power_resource *)acpi_driver_data(device);
+        *resource = acpi_driver_data(device);
         if (!resource)
                 return -ENODEV;
 
@@ -442,7 +442,7 @@ static int acpi_power_seq_show(struct seq_file *seq, void *offset)
         struct acpi_power_resource *resource = NULL;
 
 
-        resource = (struct acpi_power_resource *)seq->private;
+        resource = seq->private;
 
         if (!resource)
                 goto end;
@@ -532,10 +532,9 @@ static int acpi_power_add(struct acpi_device *device)
         if (!device)
                 return -EINVAL;
 
-        resource = kmalloc(sizeof(struct acpi_power_resource), GFP_KERNEL);
+        resource = kzalloc(sizeof(struct acpi_power_resource), GFP_KERNEL);
         if (!resource)
                 return -ENOMEM;
-        memset(resource, 0, sizeof(struct acpi_power_resource));
 
         resource->device = device;
         strcpy(resource->name, device->pnp.bus_id);
@@ -590,7 +589,7 @@ static int acpi_power_remove(struct acpi_device *device, int type)
         if (!device || !acpi_driver_data(device))
                 return -EINVAL;
 
-        resource = (struct acpi_power_resource *)acpi_driver_data(device);
+        resource = acpi_driver_data(device);
 
         acpi_power_remove_fs(device);
 
diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c
index 1908e0d202..25718fed39 100644
--- a/drivers/acpi/processor_core.c
+++ b/drivers/acpi/processor_core.c
@@ -277,7 +277,7 @@ static struct proc_dir_entry *acpi_processor_dir = NULL;
 
 static int acpi_processor_info_seq_show(struct seq_file *seq, void *offset)
 {
-        struct acpi_processor *pr = (struct acpi_processor *)seq->private;
+        struct acpi_processor *pr = seq->private;
 
 
         if (!pr)
@@ -542,12 +542,12 @@ static int __cpuinit acpi_processor_start(struct acpi_device *device)
          * Don't trust it blindly
          */
         if (processor_device_array[pr->id] != NULL &&
-            processor_device_array[pr->id] != (void *)device) {
+            processor_device_array[pr->id] != device) {
                 printk(KERN_WARNING "BIOS reported wrong ACPI id"
                         "for the processor\n");
                 return -ENODEV;
         }
-        processor_device_array[pr->id] = (void *)device;
+        processor_device_array[pr->id] = device;
 
         processors[pr->id] = pr;
 
@@ -578,7 +578,7 @@ static int __cpuinit acpi_processor_start(struct acpi_device *device)
 
 static void acpi_processor_notify(acpi_handle handle, u32 event, void *data)
 {
-        struct acpi_processor *pr = (struct acpi_processor *)data;
+        struct acpi_processor *pr = data;
         struct acpi_device *device = NULL;
 
 
@@ -615,10 +615,9 @@ static int acpi_processor_add(struct acpi_device *device)
         if (!device)
                 return -EINVAL;
 
-        pr = kmalloc(sizeof(struct acpi_processor), GFP_KERNEL);
+        pr = kzalloc(sizeof(struct acpi_processor), GFP_KERNEL);
         if (!pr)
                 return -ENOMEM;
-        memset(pr, 0, sizeof(struct acpi_processor));
 
         pr->handle = device->handle;
         strcpy(acpi_device_name(device), ACPI_PROCESSOR_DEVICE_NAME);
@@ -637,7 +636,7 @@ static int acpi_processor_remove(struct acpi_device *device, int type)
         if (!device || !acpi_driver_data(device))
                 return -EINVAL;
 
-        pr = (struct acpi_processor *)acpi_driver_data(device);
+        pr = acpi_driver_data(device);
 
         if (pr->id >= NR_CPUS) {
                 kfree(pr);
@@ -901,13 +900,13 @@ static int __init acpi_processor_init(void)
 
         acpi_processor_dir = proc_mkdir(ACPI_PROCESSOR_CLASS, acpi_root_dir);
         if (!acpi_processor_dir)
-                return 0;
+                return -ENOMEM;
         acpi_processor_dir->owner = THIS_MODULE;
 
         result = acpi_bus_register_driver(&acpi_processor_driver);
         if (result < 0) {
                 remove_proc_entry(ACPI_PROCESSOR_CLASS, acpi_root_dir);
-                return 0;
+                return result;
         }
 
         acpi_processor_install_hotplug_notify();
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index 65b3f056ad..3f30af2157 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -211,7 +211,11 @@ acpi_processor_power_activate(struct acpi_processor *pr,
 static void acpi_safe_halt(void)
 {
         current_thread_info()->status &= ~TS_POLLING;
-        smp_mb__after_clear_bit();
+        /*
+         * 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;
@@ -345,7 +349,11 @@ static void acpi_processor_idle(void)
          */
         if (cx->type == ACPI_STATE_C2 || cx->type == ACPI_STATE_C3) {
                 current_thread_info()->status &= ~TS_POLLING;
-                smp_mb__after_clear_bit();
+                /*
+                 * TS_POLLING-cleared state must be visible before we
+                 * test NEED_RESCHED:
+                 */
+                smp_mb();
                 if (need_resched()) {
                         current_thread_info()->status |= TS_POLLING;
                         local_irq_enable();
@@ -673,7 +681,7 @@ static int acpi_processor_get_power_info_cst(struct acpi_processor *pr)
                 return -ENODEV;
         }
 
-        cst = (union acpi_object *)buffer.pointer;
+        cst = buffer.pointer;
 
         /* There must be at least 2 elements */
         if (!cst || (cst->type != ACPI_TYPE_PACKAGE) || cst->package.count < 2) {
@@ -702,14 +710,14 @@ static int acpi_processor_get_power_info_cst(struct acpi_processor *pr)
 
                 memset(&cx, 0, sizeof(cx));
 
-                element = (union acpi_object *)&(cst->package.elements[i]);
+                element = &(cst->package.elements[i]);
                 if (element->type != ACPI_TYPE_PACKAGE)
                         continue;
 
                 if (element->package.count != 4)
                         continue;
 
-                obj = (union acpi_object *)&(element->package.elements[0]);
+                obj = &(element->package.elements[0]);
 
                 if (obj->type != ACPI_TYPE_BUFFER)
                         continue;
@@ -721,7 +729,7 @@ static int acpi_processor_get_power_info_cst(struct acpi_processor *pr)
                         continue;
 
                 /* There should be an easy way to extract an integer... */
-                obj = (union acpi_object *)&(element->package.elements[1]);
+                obj = &(element->package.elements[1]);
                 if (obj->type != ACPI_TYPE_INTEGER)
                         continue;
 
@@ -754,13 +762,13 @@ static int acpi_processor_get_power_info_cst(struct acpi_processor *pr)
                         }
                 }
 
-                obj = (union acpi_object *)&(element->package.elements[2]);
+                obj = &(element->package.elements[2]);
                 if (obj->type != ACPI_TYPE_INTEGER)
                         continue;
 
                 cx.latency = obj->integer.value;
 
-                obj = (union acpi_object *)&(element->package.elements[3]);
+                obj = &(element->package.elements[3]);
                 if (obj->type != ACPI_TYPE_INTEGER)
                         continue;
 
@@ -1029,7 +1037,7 @@ int acpi_processor_cst_has_changed(struct acpi_processor *pr)
 
 static int acpi_processor_power_seq_show(struct seq_file *seq, void *offset)
 {
-        struct acpi_processor *pr = (struct acpi_processor *)seq->private;
+        struct acpi_processor *pr = seq->private;
         unsigned int i;
 
 
diff --git a/drivers/acpi/processor_perflib.c b/drivers/acpi/processor_perflib.c
index 6fd174a371..0e60382714 100644
--- a/drivers/acpi/processor_perflib.c
+++ b/drivers/acpi/processor_perflib.c
@@ -236,7 +236,7 @@ static int acpi_processor_get_performance_states(struct acpi_processor *pr)
                 return -ENODEV;
         }
 
-        pss = (union acpi_object *)buffer.pointer;
+        pss = buffer.pointer;
         if (!pss || (pss->type != ACPI_TYPE_PACKAGE)) {
                 printk(KERN_ERR PREFIX "Invalid _PSS data\n");
                 result = -EFAULT;
@@ -410,7 +410,7 @@ static struct file_operations acpi_processor_perf_fops = {
 
 static int acpi_processor_perf_seq_show(struct seq_file *seq, void *offset)
 {
-        struct acpi_processor *pr = (struct acpi_processor *)seq->private;
+        struct acpi_processor *pr = seq->private;
         int i;
 
 
@@ -451,8 +451,8 @@ acpi_processor_write_performance(struct file *file,
                                  size_t count, loff_t * data)
 {
         int result = 0;
-        struct seq_file *m = (struct seq_file *)file->private_data;
-        struct acpi_processor *pr = (struct acpi_processor *)m->private;
+        struct seq_file *m = file->private_data;
+        struct acpi_processor *pr = m->private;
         struct acpi_processor_performance *perf;
         char state_string[12] = { '\0' };
         unsigned int new_state = 0;
@@ -551,7 +551,7 @@ static int acpi_processor_get_psd(struct acpi_processor	*pr)
                 return -ENODEV;
         }
 
-        psd = (union acpi_object *) buffer.pointer;
+        psd = buffer.pointer;
         if (!psd || (psd->type != ACPI_TYPE_PACKAGE)) {
                 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Invalid _PSD data\n"));
                 result = -EFAULT;
diff --git a/drivers/acpi/processor_thermal.c b/drivers/acpi/processor_thermal.c
index ef5e0f6efd..40fecd67ad 100644
--- a/drivers/acpi/processor_thermal.c
+++ b/drivers/acpi/processor_thermal.c
@@ -208,7 +208,7 @@ int acpi_processor_set_thermal_limit(acpi_handle handle, int type)
         if (result)
                 return result;
 
-        pr = (struct acpi_processor *)acpi_driver_data(device);
+        pr = acpi_driver_data(device);
         if (!pr)
                 return -ENODEV;
 
@@ -348,8 +348,8 @@ static ssize_t acpi_processor_write_limit(struct file * file,
                                           size_t count, loff_t * data)
 {
         int result = 0;
-        struct seq_file *m = (struct seq_file *)file->private_data;
-        struct acpi_processor *pr = (struct acpi_processor *)m->private;
+        struct seq_file *m = file->private_data;
+        struct acpi_processor *pr = m->private;
         char limit_string[25] = { '\0' };
         int px = 0;
         int tx = 0;
diff --git a/drivers/acpi/processor_throttling.c b/drivers/acpi/processor_throttling.c
index d044ec519d..0ec7dcde00 100644
--- a/drivers/acpi/processor_throttling.c
+++ b/drivers/acpi/processor_throttling.c
@@ -259,7 +259,7 @@ int acpi_processor_get_throttling_info(struct acpi_processor *pr)
 static int acpi_processor_throttling_seq_show(struct seq_file *seq,
                                               void *offset)
 {
-        struct acpi_processor *pr = (struct acpi_processor *)seq->private;
+        struct acpi_processor *pr = seq->private;
         int i = 0;
         int result = 0;
 
@@ -307,8 +307,8 @@ static ssize_t acpi_processor_write_throttling(struct file * file,
                                                size_t count, loff_t * data)
 {
         int result = 0;
-        struct seq_file *m = (struct seq_file *)file->private_data;
-        struct acpi_processor *pr = (struct acpi_processor *)m->private;
+        struct seq_file *m = file->private_data;
+        struct acpi_processor *pr = m->private;
         char state_string[12] = { '\0' };
 
 
diff --git a/drivers/acpi/sbs.c b/drivers/acpi/sbs.c
index 8908a975e5..f58fc7447a 100644
--- a/drivers/acpi/sbs.c
+++ b/drivers/acpi/sbs.c
@@ -923,7 +923,7 @@ static struct proc_dir_entry *acpi_battery_dir = NULL;
 
 static int acpi_battery_read_info(struct seq_file *seq, void *offset)
 {
-        struct acpi_battery *battery = (struct acpi_battery *)seq->private;
+        struct acpi_battery *battery = seq->private;
         int cscale;
         int result = 0;
 
@@ -1076,7 +1076,7 @@ static int acpi_battery_state_open_fs(struct inode *inode, struct file *file)
 
 static int acpi_battery_read_alarm(struct seq_file *seq, void *offset)
 {
-        struct acpi_battery *battery = (struct acpi_battery *)seq->private;
+        struct acpi_battery *battery = seq->private;
         int result = 0;
         int cscale;
 
@@ -1125,8 +1125,8 @@ static ssize_t
 acpi_battery_write_alarm(struct file *file, const char __user * buffer,
                          size_t count, loff_t * ppos)
 {
-        struct seq_file *seq = (struct seq_file *)file->private_data;
-        struct acpi_battery *battery = (struct acpi_battery *)seq->private;
+        struct seq_file *seq = file->private_data;
+        struct acpi_battery *battery = seq->private;
         char alarm_string[12] = { '\0' };
         int result, old_alarm, new_alarm;
 
@@ -1160,14 +1160,14 @@ acpi_battery_write_alarm(struct file *file, const char __user * buffer,
         if (result) {
                 ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
                                   "acpi_battery_set_alarm() failed\n"));
-                (void)acpi_battery_set_alarm(battery, old_alarm);
+                acpi_battery_set_alarm(battery, old_alarm);
                 goto end;
         }
         result = acpi_battery_get_alarm(battery);
         if (result) {
                 ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
                                   "acpi_battery_get_alarm() failed\n"));
-                (void)acpi_battery_set_alarm(battery, old_alarm);
+                acpi_battery_set_alarm(battery, old_alarm);
                 goto end;
         }
 
@@ -1217,7 +1217,7 @@ static struct proc_dir_entry *acpi_ac_dir = NULL;
 
 static int acpi_ac_read_state(struct seq_file *seq, void *offset)
 {
-        struct acpi_sbs *sbs = (struct acpi_sbs *)seq->private;
+        struct acpi_sbs *sbs = seq->private;
         int result;
 
         if (sbs->zombie) {
@@ -1302,7 +1302,7 @@ static int acpi_battery_add(struct acpi_sbs *sbs, int id)
                 battery->init_state = 1;
         }
 
-        (void)sprintf(dir_name, ACPI_BATTERY_DIR_NAME, id);
+        sprintf(dir_name, ACPI_BATTERY_DIR_NAME, id);
 
         result = acpi_sbs_generic_add_fs(&battery->battery_entry,
                                          acpi_battery_dir,
@@ -1485,7 +1485,7 @@ static int acpi_sbs_update_run(struct acpi_sbs *sbs, int data_type)
                 }
 
                 if (old_battery_present != new_battery_present) {
-                        (void)sprintf(dir_name, ACPI_BATTERY_DIR_NAME, id);
+                        sprintf(dir_name, ACPI_BATTERY_DIR_NAME, id);
                         result = acpi_sbs_generate_event(sbs->device,
                                                          ACPI_SBS_BATTERY_NOTIFY_STATUS,
                                                          new_battery_present,
@@ -1498,7 +1498,7 @@ static int acpi_sbs_update_run(struct acpi_sbs *sbs, int data_type)
                         }
                 }
                 if (old_remaining_capacity != battery->state.remaining_capacity) {
-                        (void)sprintf(dir_name, ACPI_BATTERY_DIR_NAME, id);
+                        sprintf(dir_name, ACPI_BATTERY_DIR_NAME, id);
                         result = acpi_sbs_generate_event(sbs->device,
                                                          ACPI_SBS_BATTERY_NOTIFY_STATUS,
                                                          new_battery_present,
@@ -1576,12 +1576,11 @@ static int acpi_sbs_add(struct acpi_device *device)
         int id, cnt;
         acpi_status status = AE_OK;
 
-        sbs = kmalloc(sizeof(struct acpi_sbs), GFP_KERNEL);
+        sbs = kzalloc(sizeof(struct acpi_sbs), GFP_KERNEL);
         if (!sbs) {
                 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "kmalloc() failed\n"));
                 return -ENOMEM;
         }
-        memset(sbs, 0, sizeof(struct acpi_sbs));
 
         cnt = 0;
         while (cnt < 10) {
@@ -1659,7 +1658,7 @@ static int acpi_sbs_add(struct acpi_device *device)
         init_timer(&sbs->update_timer);
         if (update_mode == QUEUE_UPDATE_MODE) {
                 status = acpi_os_execute(OSL_GPE_HANDLER,
-                                         acpi_sbs_update_queue, (void *)sbs);
+                                         acpi_sbs_update_queue, sbs);
                 if (status != AE_OK) {
                         ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
                                           "acpi_os_execute() failed\n"));
@@ -1685,7 +1684,7 @@ static int acpi_sbs_add(struct acpi_device *device)
 
 int acpi_sbs_remove(struct acpi_device *device, int type)
 {
-        struct acpi_sbs *sbs = NULL;
+        struct acpi_sbs *sbs;
         int id;
 
         if (!device) {
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 698a1540e3..283d87522c 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -984,12 +984,11 @@ acpi_add_single_object(struct acpi_device **child,
         if (!child)
                 return -EINVAL;
 
-        device = kmalloc(sizeof(struct acpi_device), GFP_KERNEL);
+        device = kzalloc(sizeof(struct acpi_device), GFP_KERNEL);
         if (!device) {
                 printk(KERN_ERR PREFIX "Memory allocation error\n");
                 return -ENOMEM;
         }
-        memset(device, 0, sizeof(struct acpi_device));
 
         device->handle = handle;
         device->parent = parent;
diff --git a/drivers/acpi/sleep/wakeup.c b/drivers/acpi/sleep/wakeup.c
index af1dbabaf0..fab8f2694f 100644
--- a/drivers/acpi/sleep/wakeup.c
+++ b/drivers/acpi/sleep/wakeup.c
@@ -183,11 +183,11 @@ late_initcall(acpi_wakeup_device_init);
 #endif
 
 /*
- * Disable all wakeup GPEs before power off.
- * 
+ * Disable all wakeup GPEs before entering requested sleep state.
+ *      @sleep_state:   ACPI state
  * Since acpi_enter_sleep_state() will disable all
  * RUNTIME GPEs, we simply mark all GPES that
- * are not enabled for wakeup from S5 as RUNTIME.
+ * are not enabled for wakeup from requested state as RUNTIME.
  */
 void acpi_gpe_sleep_prepare(u32 sleep_state)
 {
diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c
index bfb3bfcf9e..ffa30c9fcc 100644
--- a/drivers/acpi/tables.c
+++ b/drivers/acpi/tables.c
@@ -228,7 +228,7 @@ void acpi_table_print_madt_entry(acpi_table_entry_header * header)
 static int
 acpi_table_compute_checksum(void *table_pointer, unsigned long length)
 {
-        u8 *p = (u8 *) table_pointer;
+        u8 *p = table_pointer;
         unsigned long remains = length;
         unsigned long sum = 0;
 
diff --git a/drivers/acpi/tables/tbxface.c b/drivers/acpi/tables/tbxface.c
index 7767987be1..5ba9303293 100644
--- a/drivers/acpi/tables/tbxface.c
+++ b/drivers/acpi/tables/tbxface.c
@@ -123,7 +123,6 @@ acpi_status acpi_load_tables(void)
 
 ACPI_EXPORT_SYMBOL(acpi_load_tables)
 
-#ifdef ACPI_FUTURE_USAGE
 /*******************************************************************************
  *
  * FUNCTION:    acpi_load_table
@@ -221,6 +220,59 @@ ACPI_EXPORT_SYMBOL(acpi_load_table)
 
 /*******************************************************************************
  *
+ * FUNCTION:    acpi_unload_table_id
+ *
+ * PARAMETERS:  table_type    - Type of table to be unloaded
+ *              id            - Owner ID of the table to be removed.
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: This routine is used to force the unload of a table (by id)
+ *
+ ******************************************************************************/
+acpi_status acpi_unload_table_id(acpi_table_type table_type, acpi_owner_id id)
+{
+        struct acpi_table_desc *table_desc;
+        acpi_status status;
+
+        ACPI_FUNCTION_TRACE(acpi_unload_table);
+
+        /* Parameter validation */
+        if (table_type > ACPI_TABLE_ID_MAX)
+                return_ACPI_STATUS(AE_BAD_PARAMETER);
+
+        /* Find table from the requested type list */
+        table_desc = acpi_gbl_table_lists[table_type].next;
+        while (table_desc && table_desc->owner_id != id)
+                table_desc = table_desc->next;
+
+        if (!table_desc)
+                return_ACPI_STATUS(AE_NOT_EXIST);
+
+        /*
+         * Delete all namespace objects owned by this table. Note that these
+         * objects can appear anywhere in the namespace by virtue of the AML
+         * "Scope" operator. Thus, we need to track ownership by an ID, not
+         * simply a position within the hierarchy
+         */
+        acpi_ns_delete_namespace_by_owner(table_desc->owner_id);
+
+        status = acpi_ut_acquire_mutex(ACPI_MTX_TABLES);
+        if (ACPI_FAILURE(status))
+                return_ACPI_STATUS(status);
+
+        (void)acpi_tb_uninstall_table(table_desc);
+
+        (void)acpi_ut_release_mutex(ACPI_MTX_TABLES);
+
+        return_ACPI_STATUS(AE_OK);
+}
+
+ACPI_EXPORT_SYMBOL(acpi_unload_table_id)
+
+#ifdef ACPI_FUTURE_USAGE
+/*******************************************************************************
+ *
  * FUNCTION:    acpi_unload_table
  *
  * PARAMETERS:  table_type    - Type of table to be unloaded
diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c
index 5753d06b78..40ddb4dd96 100644
--- a/drivers/acpi/thermal.c
+++ b/drivers/acpi/thermal.c
@@ -663,7 +663,7 @@ static void acpi_thermal_run(unsigned long data)
 static void acpi_thermal_check(void *data)
 {
         int result = 0;
-        struct acpi_thermal *tz = (struct acpi_thermal *)data;
+        struct acpi_thermal *tz = data;
         unsigned long sleep_time = 0;
         int i = 0;
         struct acpi_thermal_state state;
@@ -778,7 +778,7 @@ static struct proc_dir_entry *acpi_thermal_dir;
 
 static int acpi_thermal_state_seq_show(struct seq_file *seq, void *offset)
 {
-        struct acpi_thermal *tz = (struct acpi_thermal *)seq->private;
+        struct acpi_thermal *tz = seq->private;
 
 
         if (!tz)
@@ -813,7 +813,7 @@ static int acpi_thermal_state_open_fs(struct inode *inode, struct file *file)
 static int acpi_thermal_temp_seq_show(struct seq_file *seq, void *offset)
 {
         int result = 0;
-        struct acpi_thermal *tz = (struct acpi_thermal *)seq->private;
+        struct acpi_thermal *tz = seq->private;
 
 
         if (!tz)
@@ -837,7 +837,7 @@ static int acpi_thermal_temp_open_fs(struct inode *inode, struct file *file)
 
 static int acpi_thermal_trip_seq_show(struct seq_file *seq, void *offset)
 {
-        struct acpi_thermal *tz = (struct acpi_thermal *)seq->private;
+        struct acpi_thermal *tz = seq->private;
         int i = 0;
         int j = 0;
 
@@ -893,8 +893,8 @@ acpi_thermal_write_trip_points(struct file *file,
                                const char __user * buffer,
                                size_t count, loff_t * ppos)
 {
-        struct seq_file *m = (struct seq_file *)file->private_data;
-        struct acpi_thermal *tz = (struct acpi_thermal *)m->private;
+        struct seq_file *m = file->private_data;
+        struct acpi_thermal *tz = m->private;
 
         char *limit_string;
         int num, critical, hot, passive;
@@ -902,12 +902,10 @@ acpi_thermal_write_trip_points(struct file *file,
         int i = 0;
 
 
-        limit_string = kmalloc(ACPI_THERMAL_MAX_LIMIT_STR_LEN, GFP_KERNEL);
+        limit_string = kzalloc(ACPI_THERMAL_MAX_LIMIT_STR_LEN, GFP_KERNEL);
         if (!limit_string)
                 return -ENOMEM;
 
-        memset(limit_string, 0, ACPI_THERMAL_MAX_LIMIT_STR_LEN);
-
         active = kmalloc(ACPI_THERMAL_MAX_ACTIVE * sizeof(int), GFP_KERNEL);
         if (!active) {
                 kfree(limit_string);
@@ -953,7 +951,7 @@ acpi_thermal_write_trip_points(struct file *file,
 
 static int acpi_thermal_cooling_seq_show(struct seq_file *seq, void *offset)
 {
-        struct acpi_thermal *tz = (struct acpi_thermal *)seq->private;
+        struct acpi_thermal *tz = seq->private;
 
 
         if (!tz)
@@ -984,8 +982,8 @@ acpi_thermal_write_cooling_mode(struct file *file,
                                 const char __user * buffer,
                                 size_t count, loff_t * ppos)
 {
-        struct seq_file *m = (struct seq_file *)file->private_data;
-        struct acpi_thermal *tz = (struct acpi_thermal *)m->private;
+        struct seq_file *m = file->private_data;
+        struct acpi_thermal *tz = m->private;
         int result = 0;
         char mode_string[12] = { '\0' };
 
@@ -1014,7 +1012,7 @@ acpi_thermal_write_cooling_mode(struct file *file,
 
 static int acpi_thermal_polling_seq_show(struct seq_file *seq, void *offset)
 {
-        struct acpi_thermal *tz = (struct acpi_thermal *)seq->private;
+        struct acpi_thermal *tz = seq->private;
 
 
         if (!tz)
@@ -1043,8 +1041,8 @@ acpi_thermal_write_polling(struct file *file,
                            const char __user * buffer,
                            size_t count, loff_t * ppos)
 {
-        struct seq_file *m = (struct seq_file *)file->private_data;
-        struct acpi_thermal *tz = (struct acpi_thermal *)m->private;
+        struct seq_file *m = file->private_data;
+        struct acpi_thermal *tz = m->private;
         int result = 0;
         char polling_string[12] = { '\0' };
         int seconds = 0;
@@ -1170,7 +1168,7 @@ static int acpi_thermal_remove_fs(struct acpi_device *device)
 
 static void acpi_thermal_notify(acpi_handle handle, u32 event, void *data)
 {
-        struct acpi_thermal *tz = (struct acpi_thermal *)data;
+        struct acpi_thermal *tz = data;
         struct acpi_device *device = NULL;
 
 
@@ -1271,10 +1269,9 @@ static int acpi_thermal_add(struct acpi_device *device)
         if (!device)
                 return -EINVAL;
 
-        tz = kmalloc(sizeof(struct acpi_thermal), GFP_KERNEL);
+        tz = kzalloc(sizeof(struct acpi_thermal), GFP_KERNEL);
         if (!tz)
                 return -ENOMEM;
-        memset(tz, 0, sizeof(struct acpi_thermal));
 
         tz->device = device;
         strcpy(tz->name, device->pnp.bus_id);
@@ -1324,7 +1321,7 @@ static int acpi_thermal_remove(struct acpi_device *device, int type)
         if (!device || !acpi_driver_data(device))
                 return -EINVAL;
 
-        tz = (struct acpi_thermal *)acpi_driver_data(device);
+        tz = acpi_driver_data(device);
 
         /* avoid timer adding new defer task */
         tz->zombie = 1;
@@ -1364,7 +1361,7 @@ static int acpi_thermal_resume(struct acpi_device *device, int state)
         if (!device || !acpi_driver_data(device))
                 return -EINVAL;
 
-        tz = (struct acpi_thermal *)acpi_driver_data(device);
+        tz = acpi_driver_data(device);
 
         acpi_thermal_get_temperature(tz);
 
diff --git a/drivers/acpi/toshiba_acpi.c b/drivers/acpi/toshiba_acpi.c
index 7fe0b7ae97..88aeccbafa 100644
--- a/drivers/acpi/toshiba_acpi.c
+++ b/drivers/acpi/toshiba_acpi.c
@@ -41,6 +41,8 @@
 #include <linux/init.h>
 #include <linux/types.h>
 #include <linux/proc_fs.h>
+#include <linux/backlight.h>
+
 #include <asm/uaccess.h>
 
 #include <acpi/acpi_drivers.h>
@@ -210,6 +212,7 @@ static acpi_status hci_read1(u32 reg, u32 * out1, u32 * result)
 }
 
 static struct proc_dir_entry *toshiba_proc_dir /*= 0*/ ;
+static struct backlight_device *toshiba_backlight_device;
 static int force_fan;
 static int last_key_event;
 static int key_event_valid;
@@ -271,14 +274,23 @@ dispatch_write(struct file *file, const char __user * buffer,
         return result;
 }
 
-static char *read_lcd(char *p)
+static int get_lcd(struct backlight_device *bd)
 {
         u32 hci_result;
         u32 value;
 
         hci_read1(HCI_LCD_BRIGHTNESS, &value, &hci_result);
         if (hci_result == HCI_SUCCESS) {
-                value = value >> HCI_LCD_BRIGHTNESS_SHIFT;
+                return (value >> HCI_LCD_BRIGHTNESS_SHIFT);
+        } else
+                return -EFAULT;
+}
+
+static char *read_lcd(char *p)
+{
+        int value = get_lcd(NULL);
+
+        if (value >= 0) {
                 p += sprintf(p, "brightness:              %d\n", value);
                 p += sprintf(p, "brightness_levels:       %d\n",
                              HCI_LCD_BRIGHTNESS_LEVELS);
@@ -289,22 +301,34 @@ static char *read_lcd(char *p)
         return p;
 }
 
+static int set_lcd(int value)
+{
+        u32 hci_result;
+
+        value = value << HCI_LCD_BRIGHTNESS_SHIFT;
+        hci_write1(HCI_LCD_BRIGHTNESS, value, &hci_result);
+        if (hci_result != HCI_SUCCESS)
+                return -EFAULT;
+
+        return 0;
+}
+
+static int set_lcd_status(struct backlight_device *bd)
+{
+        return set_lcd(bd->props->brightness);
+}
+
 static unsigned long write_lcd(const char *buffer, unsigned long count)
 {
         int value;
-        u32 hci_result;
+        int ret = count;
 
         if (sscanf(buffer, " brightness : %i", &value) == 1 &&
-            value >= 0 && value < HCI_LCD_BRIGHTNESS_LEVELS) {
-                value = value << HCI_LCD_BRIGHTNESS_SHIFT;
-                hci_write1(HCI_LCD_BRIGHTNESS, value, &hci_result);
-                if (hci_result != HCI_SUCCESS)
-                        return -EFAULT;
-        } else {
-                return -EINVAL;
-        }
-
-        return count;
+            value >= 0 && value < HCI_LCD_BRIGHTNESS_LEVELS)
+                ret = set_lcd(value);
+        else
+                ret = -EINVAL;
+        return ret;
 }
 
 static char *read_video(char *p)
@@ -506,6 +530,26 @@ static acpi_status __exit remove_device(void)
         return AE_OK;
 }
 
+static struct backlight_properties toshiba_backlight_data = {
+        .owner          = THIS_MODULE,
+        .get_brightness = get_lcd,
+        .update_status  = set_lcd_status,
+        .max_brightness = HCI_LCD_BRIGHTNESS_LEVELS - 1,
+};
+
+static void __exit toshiba_acpi_exit(void)
+{
+        if (toshiba_backlight_device)
+                backlight_device_unregister(toshiba_backlight_device);
+
+        remove_device();
+
+        if (toshiba_proc_dir)
+                remove_proc_entry(PROC_TOSHIBA, acpi_root_dir);
+
+        return;
+}
+
 static int __init toshiba_acpi_init(void)
 {
         acpi_status status = AE_OK;
@@ -546,17 +590,16 @@ static int __init toshiba_acpi_init(void)
                         remove_proc_entry(PROC_TOSHIBA, acpi_root_dir);
         }
 
-        return (ACPI_SUCCESS(status)) ? 0 : -ENODEV;
-}
-
-static void __exit toshiba_acpi_exit(void)
-{
-        remove_device();
-
-        if (toshiba_proc_dir)
-                remove_proc_entry(PROC_TOSHIBA, acpi_root_dir);
+        toshiba_backlight_device = backlight_device_register("toshiba",NULL,
+                                                NULL,
+                                                &toshiba_backlight_data);
+        if (IS_ERR(toshiba_backlight_device)) {
+                printk(KERN_ERR "Could not register toshiba backlight device\n");
+                toshiba_backlight_device = NULL;
+                toshiba_acpi_exit();
+        }
 
-        return;
+        return (ACPI_SUCCESS(status)) ? 0 : -ENODEV;
 }
 
 module_init(toshiba_acpi_init);
diff --git a/drivers/acpi/utilities/utdebug.c b/drivers/acpi/utilities/utdebug.c
index bb1eaf9aa6..9e9054e155 100644
--- a/drivers/acpi/utilities/utdebug.c
+++ b/drivers/acpi/utilities/utdebug.c
@@ -180,8 +180,9 @@ acpi_ut_debug_print(u32 requested_debug_level,
         if (thread_id != acpi_gbl_prev_thread_id) {
                 if (ACPI_LV_THREADS & acpi_dbg_level) {
                         acpi_os_printf
-                            ("\n**** Context Switch from TID %X to TID %X ****\n\n",
-                             (u32) acpi_gbl_prev_thread_id, (u32) thread_id);
+                            ("\n**** Context Switch from TID %lX to TID %lX ****\n\n",
+                             (unsigned long) acpi_gbl_prev_thread_id,
+                             (unsigned long) thread_id);
                 }
 
                 acpi_gbl_prev_thread_id = thread_id;
diff --git a/drivers/acpi/utilities/utmutex.c b/drivers/acpi/utilities/utmutex.c
index c39062a047..180e73ceb6 100644
--- a/drivers/acpi/utilities/utmutex.c
+++ b/drivers/acpi/utilities/utmutex.c
@@ -243,23 +243,24 @@ acpi_status acpi_ut_acquire_mutex(acpi_mutex_handle mutex_id)
 #endif
 
         ACPI_DEBUG_PRINT((ACPI_DB_MUTEX,
-                          "Thread %X attempting to acquire Mutex [%s]\n",
-                          (u32) this_thread_id, acpi_ut_get_mutex_name(mutex_id)));
+                          "Thread %lX attempting to acquire Mutex [%s]\n",
+                          (unsigned long) this_thread_id,
+                          acpi_ut_get_mutex_name(mutex_id)));
 
         status = acpi_os_acquire_mutex(acpi_gbl_mutex_info[mutex_id].mutex,
                                        ACPI_WAIT_FOREVER);
         if (ACPI_SUCCESS(status)) {
                 ACPI_DEBUG_PRINT((ACPI_DB_MUTEX,
-                                  "Thread %X acquired Mutex [%s]\n",
-                                  (u32) this_thread_id,
+                                  "Thread %lX acquired Mutex [%s]\n",
+                                  (unsigned long) this_thread_id,
                                   acpi_ut_get_mutex_name(mutex_id)));
 
                 acpi_gbl_mutex_info[mutex_id].use_count++;
                 acpi_gbl_mutex_info[mutex_id].thread_id = this_thread_id;
         } else {
                 ACPI_EXCEPTION((AE_INFO, status,
-                                "Thread %X could not acquire Mutex [%X]",
-                                (u32) this_thread_id, mutex_id));
+                                "Thread %lX could not acquire Mutex [%X]",
+                                (unsigned long) this_thread_id, mutex_id));
         }
 
         return (status);
@@ -285,7 +286,8 @@ acpi_status acpi_ut_release_mutex(acpi_mutex_handle mutex_id)
 
         this_thread_id = acpi_os_get_thread_id();
         ACPI_DEBUG_PRINT((ACPI_DB_MUTEX,
-                          "Thread %X releasing Mutex [%s]\n", (u32) this_thread_id,
+                          "Thread %lX releasing Mutex [%s]\n",
+                          (unsigned long) this_thread_id,
                           acpi_ut_get_mutex_name(mutex_id)));
 
         if (mutex_id > ACPI_MAX_MUTEX) {
diff --git a/drivers/acpi/utils.c b/drivers/acpi/utils.c
index d0d84c43a9..68a809fa7b 100644
--- a/drivers/acpi/utils.c
+++ b/drivers/acpi/utils.c
@@ -83,7 +83,7 @@ acpi_extract_package(union acpi_object *package,
                 return AE_BAD_DATA;
         }
 
-        format_string = (char *)format->pointer;
+        format_string = format->pointer;
 
         /*
          * Calculate size_required.
@@ -262,11 +262,10 @@ acpi_evaluate_integer(acpi_handle handle,
         if (!data)
                 return AE_BAD_PARAMETER;
 
-        element = kmalloc(sizeof(union acpi_object), irqs_disabled() ? GFP_ATOMIC: GFP_KERNEL);
+        element = kzalloc(sizeof(union acpi_object), irqs_disabled() ? GFP_ATOMIC: GFP_KERNEL);
         if (!element)
                 return AE_NO_MEMORY;
 
-        memset(element, 0, sizeof(union acpi_object));
         buffer.length = sizeof(union acpi_object);
         buffer.pointer = element;
         status = acpi_evaluate_object(handle, pathname, arguments, &buffer);
@@ -321,12 +320,11 @@ acpi_evaluate_string(acpi_handle handle,
                 return AE_BAD_DATA;
         }
 
-        *data = kmalloc(element->string.length + 1, GFP_KERNEL);
+        *data = kzalloc(element->string.length + 1, GFP_KERNEL);
         if (!data) {
                 printk(KERN_ERR PREFIX "Memory allocation\n");
                 return -ENOMEM;
         }
-        memset(*data, 0, element->string.length + 1);
 
         memcpy(*data, element->string.pointer, element->string.length);
 
@@ -361,7 +359,7 @@ acpi_evaluate_reference(acpi_handle handle,
         if (ACPI_FAILURE(status))
                 goto end;
 
-        package = (union acpi_object *)buffer.pointer;
+        package = buffer.pointer;
 
         if ((buffer.length == 0) || !package) {
                 printk(KERN_ERR PREFIX "No return object (len %X ptr %p)\n",
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index 56666a9824..36b37d755d 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -3,6 +3,7 @@
  *
  *  Copyright (C) 2004 Luming Yu <luming.yu@intel.com>
  *  Copyright (C) 2004 Bruno Ducrot <ducrot@poupinou.org>
+ *  Copyright (C) 2006 Thomas Tuttle <linux-kernel@ttuttle.net>
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  *
@@ -47,11 +48,11 @@
 #define ACPI_VIDEO_NOTIFY_NEXT_OUTPUT   0x83
 #define ACPI_VIDEO_NOTIFY_PREV_OUTPUT   0x84
 
-#define ACPI_VIDEO_NOTIFY_CYCLE_BRIGHTNESS      0x82
-#define ACPI_VIDEO_NOTIFY_INC_BRIGHTNESS        0x83
-#define ACPI_VIDEO_NOTIFY_DEC_BRIGHTNESS        0x84
-#define ACPI_VIDEO_NOTIFY_ZERO_BRIGHTNESS       0x85
-#define ACPI_VIDEO_NOTIFY_DISPLAY_OFF           0x86
+#define ACPI_VIDEO_NOTIFY_CYCLE_BRIGHTNESS      0x85
+#define ACPI_VIDEO_NOTIFY_INC_BRIGHTNESS        0x86
+#define ACPI_VIDEO_NOTIFY_DEC_BRIGHTNESS        0x87
+#define ACPI_VIDEO_NOTIFY_ZERO_BRIGHTNESS       0x88
+#define ACPI_VIDEO_NOTIFY_DISPLAY_OFF           0x89
 
 #define ACPI_VIDEO_HEAD_INVALID         (~0u - 1)
 #define ACPI_VIDEO_HEAD_END             (~0u)
@@ -386,7 +387,7 @@ acpi_video_device_EDID(struct acpi_video_device *device,
         if (ACPI_FAILURE(status))
                 return -ENODEV;
 
-        obj = (union acpi_object *)buffer.pointer;
+        obj = buffer.pointer;
 
         if (obj && obj->type == ACPI_TYPE_BUFFER)
                 *edid = obj;
@@ -532,11 +533,10 @@ static void acpi_video_device_find_cap(struct acpi_video_device *device)
                 int count = 0;
                 union acpi_object *o;
 
-                br = kmalloc(sizeof(*br), GFP_KERNEL);
+                br = kzalloc(sizeof(*br), GFP_KERNEL);
                 if (!br) {
                         printk(KERN_ERR "can't allocate memory\n");
                 } else {
-                        memset(br, 0, sizeof(*br));
                         br->levels = kmalloc(obj->package.count *
                                              sizeof *(br->levels), GFP_KERNEL);
                         if (!br->levels)
@@ -654,8 +654,7 @@ static struct proc_dir_entry *acpi_video_dir;
 
 static int acpi_video_device_info_seq_show(struct seq_file *seq, void *offset)
 {
-        struct acpi_video_device *dev =
-            (struct acpi_video_device *)seq->private;
+        struct acpi_video_device *dev = seq->private;
 
 
         if (!dev)
@@ -688,8 +687,7 @@ acpi_video_device_info_open_fs(struct inode *inode, struct file *file)
 static int acpi_video_device_state_seq_show(struct seq_file *seq, void *offset)
 {
         int status;
-        struct acpi_video_device *dev =
-            (struct acpi_video_device *)seq->private;
+        struct acpi_video_device *dev = seq->private;
         unsigned long state;
 
 
@@ -727,8 +725,8 @@ acpi_video_device_write_state(struct file *file,
                               size_t count, loff_t * data)
 {
         int status;
-        struct seq_file *m = (struct seq_file *)file->private_data;
-        struct acpi_video_device *dev = (struct acpi_video_device *)m->private;
+        struct seq_file *m = file->private_data;
+        struct acpi_video_device *dev = m->private;
         char str[12] = { 0 };
         u32 state = 0;
 
@@ -754,8 +752,7 @@ acpi_video_device_write_state(struct file *file,
 static int
 acpi_video_device_brightness_seq_show(struct seq_file *seq, void *offset)
 {
-        struct acpi_video_device *dev =
-            (struct acpi_video_device *)seq->private;
+        struct acpi_video_device *dev = seq->private;
         int i;
 
 
@@ -784,8 +781,8 @@ acpi_video_device_write_brightness(struct file *file,
                                    const char __user * buffer,
                                    size_t count, loff_t * data)
 {
-        struct seq_file *m = (struct seq_file *)file->private_data;
-        struct acpi_video_device *dev = (struct acpi_video_device *)m->private;
+        struct seq_file *m = file->private_data;
+        struct acpi_video_device *dev = m->private;
         char str[4] = { 0 };
         unsigned int level = 0;
         int i;
@@ -817,8 +814,7 @@ acpi_video_device_write_brightness(struct file *file,
 
 static int acpi_video_device_EDID_seq_show(struct seq_file *seq, void *offset)
 {
-        struct acpi_video_device *dev =
-            (struct acpi_video_device *)seq->private;
+        struct acpi_video_device *dev = seq->private;
         int status;
         int i;
         union acpi_object *edid = NULL;
@@ -866,7 +862,7 @@ static int acpi_video_device_add_fs(struct acpi_device *device)
         if (!device)
                 return -ENODEV;
 
-        vid_dev = (struct acpi_video_device *)acpi_driver_data(device);
+        vid_dev = acpi_driver_data(device);
         if (!vid_dev)
                 return -ENODEV;
 
@@ -931,7 +927,7 @@ static int acpi_video_device_remove_fs(struct acpi_device *device)
 {
         struct acpi_video_device *vid_dev;
 
-        vid_dev = (struct acpi_video_device *)acpi_driver_data(device);
+        vid_dev = acpi_driver_data(device);
         if (!vid_dev || !vid_dev->video || !vid_dev->video->dir)
                 return -ENODEV;
 
@@ -950,7 +946,7 @@ static int acpi_video_device_remove_fs(struct acpi_device *device)
 /* video bus */
 static int acpi_video_bus_info_seq_show(struct seq_file *seq, void *offset)
 {
-        struct acpi_video_bus *video = (struct acpi_video_bus *)seq->private;
+        struct acpi_video_bus *video = seq->private;
 
 
         if (!video)
@@ -975,7 +971,7 @@ static int acpi_video_bus_info_open_fs(struct inode *inode, struct file *file)
 
 static int acpi_video_bus_ROM_seq_show(struct seq_file *seq, void *offset)
 {
-        struct acpi_video_bus *video = (struct acpi_video_bus *)seq->private;
+        struct acpi_video_bus *video = seq->private;
 
 
         if (!video)
@@ -995,7 +991,7 @@ static int acpi_video_bus_ROM_open_fs(struct inode *inode, struct file *file)
 
 static int acpi_video_bus_POST_info_seq_show(struct seq_file *seq, void *offset)
 {
-        struct acpi_video_bus *video = (struct acpi_video_bus *)seq->private;
+        struct acpi_video_bus *video = seq->private;
         unsigned long options;
         int status;
 
@@ -1033,7 +1029,7 @@ acpi_video_bus_POST_info_open_fs(struct inode *inode, struct file *file)
 
 static int acpi_video_bus_POST_seq_show(struct seq_file *seq, void *offset)
 {
-        struct acpi_video_bus *video = (struct acpi_video_bus *)seq->private;
+        struct acpi_video_bus *video = seq->private;
         int status;
         unsigned long id;
 
@@ -1054,7 +1050,7 @@ static int acpi_video_bus_POST_seq_show(struct seq_file *seq, void *offset)
 
 static int acpi_video_bus_DOS_seq_show(struct seq_file *seq, void *offset)
 {
-        struct acpi_video_bus *video = (struct acpi_video_bus *)seq->private;
+        struct acpi_video_bus *video = seq->private;
 
 
         seq_printf(seq, "DOS setting: <%d>\n", video->dos_setting);
@@ -1079,8 +1075,8 @@ acpi_video_bus_write_POST(struct file *file,
                           size_t count, loff_t * data)
 {
         int status;
-        struct seq_file *m = (struct seq_file *)file->private_data;
-        struct acpi_video_bus *video = (struct acpi_video_bus *)m->private;
+        struct seq_file *m = file->private_data;
+        struct acpi_video_bus *video = m->private;
         char str[12] = { 0 };
         unsigned long opt, options;
 
@@ -1119,8 +1115,8 @@ acpi_video_bus_write_DOS(struct file *file,
                          size_t count, loff_t * data)
 {
         int status;
-        struct seq_file *m = (struct seq_file *)file->private_data;
-        struct acpi_video_bus *video = (struct acpi_video_bus *)m->private;
+        struct seq_file *m = file->private_data;
+        struct acpi_video_bus *video = m->private;
         char str[12] = { 0 };
         unsigned long opt;
 
@@ -1150,7 +1146,7 @@ static int acpi_video_bus_add_fs(struct acpi_device *device)
         struct acpi_video_bus *video;
 
 
-        video = (struct acpi_video_bus *)acpi_driver_data(device);
+        video = acpi_driver_data(device);
 
         if (!acpi_device_dir(device)) {
                 acpi_device_dir(device) = proc_mkdir(acpi_device_bid(device),
@@ -1226,7 +1222,7 @@ static int acpi_video_bus_remove_fs(struct acpi_device *device)
         struct acpi_video_bus *video;
 
 
-        video = (struct acpi_video_bus *)acpi_driver_data(device);
+        video = acpi_driver_data(device);
 
         if (acpi_device_dir(device)) {
                 remove_proc_entry("info", acpi_device_dir(device));
@@ -1263,12 +1259,10 @@ acpi_video_bus_get_one_device(struct acpi_device *device,
             acpi_evaluate_integer(device->handle, "_ADR", NULL, &device_id);
         if (ACPI_SUCCESS(status)) {
 
-                data = kmalloc(sizeof(struct acpi_video_device), GFP_KERNEL);
+                data = kzalloc(sizeof(struct acpi_video_device), GFP_KERNEL);
                 if (!data)
                         return -ENOMEM;
 
-                memset(data, 0, sizeof(struct acpi_video_device));
-
                 strcpy(acpi_device_name(device), ACPI_VIDEO_DEVICE_NAME);
                 strcpy(acpi_device_class(device), ACPI_VIDEO_CLASS);
                 acpi_driver_data(device) = data;
@@ -1403,7 +1397,7 @@ static int acpi_video_device_enumerate(struct acpi_video_bus *video)
                 return status;
         }
 
-        dod = (union acpi_object *)buffer.pointer;
+        dod = buffer.pointer;
         if (!dod || (dod->type != ACPI_TYPE_PACKAGE)) {
                 ACPI_EXCEPTION((AE_INFO, status, "Invalid _DOD data"));
                 status = -EFAULT;
@@ -1426,7 +1420,7 @@ static int acpi_video_device_enumerate(struct acpi_video_bus *video)
 
         count = 0;
         for (i = 0; i < dod->package.count; i++) {
-                obj = (union acpi_object *)&dod->package.elements[i];
+                obj = &dod->package.elements[i];
 
                 if (obj->type != ACPI_TYPE_INTEGER) {
                         printk(KERN_ERR PREFIX "Invalid _DOD data\n");
@@ -1509,8 +1503,34 @@ static int
 acpi_video_get_next_level(struct acpi_video_device *device,
                           u32 level_current, u32 event)
 {
-        /*Fix me */
-        return level_current;
+        int min, max, min_above, max_below, i, l;
+        max = max_below = 0;
+        min = min_above = 255;
+        for (i = 0; i < device->brightness->count; i++) {
+                l = device->brightness->levels[i];
+                if (l < min)
+                        min = l;
+                if (l > max)
+                        max = l;
+                if (l < min_above && l > level_current)
+                        min_above = l;
+                if (l > max_below && l < level_current)
+                        max_below = l;
+        }
+
+        switch (event) {
+        case ACPI_VIDEO_NOTIFY_CYCLE_BRIGHTNESS:
+                return (level_current < max) ? min_above : min;
+        case ACPI_VIDEO_NOTIFY_INC_BRIGHTNESS:
+                return (level_current < max) ? min_above : max;
+        case ACPI_VIDEO_NOTIFY_DEC_BRIGHTNESS:
+                return (level_current > min) ? max_below : min;
+        case ACPI_VIDEO_NOTIFY_ZERO_BRIGHTNESS:
+        case ACPI_VIDEO_NOTIFY_DISPLAY_OFF:
+                return 0;
+        default:
+                return level_current;
+        }
 }
 
 static void
@@ -1612,7 +1632,7 @@ static int acpi_video_bus_stop_devices(struct acpi_video_bus *video)
 
 static void acpi_video_bus_notify(acpi_handle handle, u32 event, void *data)
 {
-        struct acpi_video_bus *video = (struct acpi_video_bus *)data;
+        struct acpi_video_bus *video = data;
         struct acpi_device *device = NULL;
 
         printk("video bus notify\n");
@@ -1654,8 +1674,7 @@ static void acpi_video_bus_notify(acpi_handle handle, u32 event, void *data)
 
 static void acpi_video_device_notify(acpi_handle handle, u32 event, void *data)
 {
-        struct acpi_video_device *video_device =
-            (struct acpi_video_device *)data;
+        struct acpi_video_device *video_device = data;
         struct acpi_device *device = NULL;
 
 
@@ -1696,10 +1715,9 @@ static int acpi_video_bus_add(struct acpi_device *device)
         if (!device)
                 return -EINVAL;
 
-        video = kmalloc(sizeof(struct acpi_video_bus), GFP_KERNEL);
+        video = kzalloc(sizeof(struct acpi_video_bus), GFP_KERNEL);
         if (!video)
                 return -ENOMEM;
-        memset(video, 0, sizeof(struct acpi_video_bus));
 
         video->device = device;
         strcpy(acpi_device_name(device), ACPI_VIDEO_BUS_NAME);
@@ -1757,7 +1775,7 @@ static int acpi_video_bus_remove(struct acpi_device *device, int type)
         if (!device || !acpi_driver_data(device))
                 return -EINVAL;
 
-        video = (struct acpi_video_bus *)acpi_driver_data(device);
+        video = acpi_driver_data(device);
 
         acpi_video_bus_stop_devices(video);
 
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index dbae6d9710..b517d24935 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -402,6 +402,14 @@ static const struct pci_device_id ahci_pci_tbl[] = {
         { PCI_VDEVICE(NVIDIA, 0x044d), board_ahci },            /* MCP65 */
         { PCI_VDEVICE(NVIDIA, 0x044e), board_ahci },            /* MCP65 */
         { PCI_VDEVICE(NVIDIA, 0x044f), board_ahci },            /* MCP65 */
+        { PCI_VDEVICE(NVIDIA, 0x045c), board_ahci },            /* MCP65 */
+        { PCI_VDEVICE(NVIDIA, 0x045d), board_ahci },            /* MCP65 */
+        { PCI_VDEVICE(NVIDIA, 0x045e), board_ahci },            /* MCP65 */
+        { PCI_VDEVICE(NVIDIA, 0x045f), board_ahci },            /* MCP65 */
+        { PCI_VDEVICE(NVIDIA, 0x0550), board_ahci },            /* MCP67 */
+        { PCI_VDEVICE(NVIDIA, 0x0551), board_ahci },            /* MCP67 */
+        { PCI_VDEVICE(NVIDIA, 0x0552), board_ahci },            /* MCP67 */
+        { PCI_VDEVICE(NVIDIA, 0x0553), board_ahci },            /* MCP67 */
         { PCI_VDEVICE(NVIDIA, 0x0554), board_ahci },            /* MCP67 */
         { PCI_VDEVICE(NVIDIA, 0x0555), board_ahci },            /* MCP67 */
         { PCI_VDEVICE(NVIDIA, 0x0556), board_ahci },            /* MCP67 */
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index a4790be41d..836947da5b 100644
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -51,7 +51,7 @@
 
 #define SECTOR_SIZE     512
 
-typedef unsigned int (*ata_xlat_func_t)(struct ata_queued_cmd *qc, const u8 *scsicmd);
+typedef unsigned int (*ata_xlat_func_t)(struct ata_queued_cmd *qc);
 
 static struct ata_device * __ata_scsi_find_dev(struct ata_port *ap,
                                         const struct scsi_device *scsidev);
@@ -935,7 +935,6 @@ int ata_scsi_change_queue_depth(struct scsi_device *sdev, int queue_depth)
 /**
  *      ata_scsi_start_stop_xlat - Translate SCSI START STOP UNIT command
  *      @qc: Storage for translated ATA taskfile
- *      @scsicmd: SCSI command to translate
  *
  *      Sets up an ATA taskfile to issue STANDBY (to stop) or READ VERIFY
  *      (to start). Perhaps these commands should be preceded by
@@ -948,22 +947,25 @@ int ata_scsi_change_queue_depth(struct scsi_device *sdev, int queue_depth)
  *      RETURNS:
  *      Zero on success, non-zero on error.
  */
-
-static unsigned int ata_scsi_start_stop_xlat(struct ata_queued_cmd *qc,
-                                             const u8 *scsicmd)
+static unsigned int ata_scsi_start_stop_xlat(struct ata_queued_cmd *qc)
 {
+        struct scsi_cmnd *scmd = qc->scsicmd;
         struct ata_taskfile *tf = &qc->tf;
+        const u8 *cdb = scmd->cmnd;
+
+        if (scmd->cmd_len < 5)
+                goto invalid_fld;
 
         tf->flags |= ATA_TFLAG_DEVICE | ATA_TFLAG_ISADDR;
         tf->protocol = ATA_PROT_NODATA;
-        if (scsicmd[1] & 0x1) {
+        if (cdb[1] & 0x1) {
                 ;       /* ignore IMMED bit, violates sat-r05 */
         }
-        if (scsicmd[4] & 0x2)
+        if (cdb[4] & 0x2)
                 goto invalid_fld;       /* LOEJ bit set not supported */
-        if (((scsicmd[4] >> 4) & 0xf) != 0)
+        if (((cdb[4] >> 4) & 0xf) != 0)
                 goto invalid_fld;       /* power conditions not supported */
-        if (scsicmd[4] & 0x1) {
+        if (cdb[4] & 0x1) {
                 tf->nsect = 1;  /* 1 sector, lba=0 */
 
                 if (qc->dev->flags & ATA_DFLAG_LBA) {
@@ -996,7 +998,7 @@ static unsigned int ata_scsi_start_stop_xlat(struct ata_queued_cmd *qc,
         return 0;
 
 invalid_fld:
-        ata_scsi_set_sense(qc->scsicmd, ILLEGAL_REQUEST, 0x24, 0x0);
+        ata_scsi_set_sense(scmd, ILLEGAL_REQUEST, 0x24, 0x0);
         /* "Invalid field in cbd" */
         return 1;
 }
@@ -1005,7 +1007,6 @@ invalid_fld:
 /**
  *      ata_scsi_flush_xlat - Translate SCSI SYNCHRONIZE CACHE command
  *      @qc: Storage for translated ATA taskfile
- *      @scsicmd: SCSI command to translate (ignored)
  *
  *      Sets up an ATA taskfile to issue FLUSH CACHE or
  *      FLUSH CACHE EXT.
@@ -1016,8 +1017,7 @@ invalid_fld:
  *      RETURNS:
  *      Zero on success, non-zero on error.
  */
-
-static unsigned int ata_scsi_flush_xlat(struct ata_queued_cmd *qc, const u8 *scsicmd)
+static unsigned int ata_scsi_flush_xlat(struct ata_queued_cmd *qc)
 {
         struct ata_taskfile *tf = &qc->tf;
 
@@ -1034,7 +1034,7 @@ static unsigned int ata_scsi_flush_xlat(struct ata_queued_cmd *qc, const u8 *scs
 
 /**
  *      scsi_6_lba_len - Get LBA and transfer length
- *      @scsicmd: SCSI command to translate
+ *      @cdb: SCSI command to translate
  *
  *      Calculate LBA and transfer length for 6-byte commands.
  *
@@ -1042,18 +1042,17 @@ static unsigned int ata_scsi_flush_xlat(struct ata_queued_cmd *qc, const u8 *scs
  *      @plba: the LBA
  *      @plen: the transfer length
  */
-
-static void scsi_6_lba_len(const u8 *scsicmd, u64 *plba, u32 *plen)
+static void scsi_6_lba_len(const u8 *cdb, u64 *plba, u32 *plen)
 {
         u64 lba = 0;
         u32 len = 0;
 
         VPRINTK("six-byte command\n");
 
-        lba |= ((u64)scsicmd[2]) << 8;
-        lba |= ((u64)scsicmd[3]);
+        lba |= ((u64)cdb[2]) << 8;
+        lba |= ((u64)cdb[3]);
 
-        len |= ((u32)scsicmd[4]);
+        len |= ((u32)cdb[4]);
 
         *plba = lba;
         *plen = len;
@@ -1061,7 +1060,7 @@ static void scsi_6_lba_len(const u8 *scsicmd, u64 *plba, u32 *plen)
 
 /**
  *      scsi_10_lba_len - Get LBA and transfer length
- *      @scsicmd: SCSI command to translate
+ *      @cdb: SCSI command to translate
  *
  *      Calculate LBA and transfer length for 10-byte commands.
  *
@@ -1069,21 +1068,20 @@ static void scsi_6_lba_len(const u8 *scsicmd, u64 *plba, u32 *plen)
  *      @plba: the LBA
  *      @plen: the transfer length
  */
-
-static void scsi_10_lba_len(const u8 *scsicmd, u64 *plba, u32 *plen)
+static void scsi_10_lba_len(const u8 *cdb, u64 *plba, u32 *plen)
 {
         u64 lba = 0;
         u32 len = 0;
 
         VPRINTK("ten-byte command\n");
 
-        lba |= ((u64)scsicmd[2]) << 24;
-        lba |= ((u64)scsicmd[3]) << 16;
-        lba |= ((u64)scsicmd[4]) << 8;
-        lba |= ((u64)scsicmd[5]);
+        lba |= ((u64)cdb[2]) << 24;
+        lba |= ((u64)cdb[3]) << 16;
+        lba |= ((u64)cdb[4]) << 8;
+        lba |= ((u64)cdb[5]);
 
-        len |= ((u32)scsicmd[7]) << 8;
-        len |= ((u32)scsicmd[8]);
+        len |= ((u32)cdb[7]) << 8;
+        len |= ((u32)cdb[8]);
 
         *plba = lba;
         *plen = len;
@@ -1091,7 +1089,7 @@ static void scsi_10_lba_len(const u8 *scsicmd, u64 *plba, u32 *plen)
 
 /**
  *      scsi_16_lba_len - Get LBA and transfer length
- *      @scsicmd: SCSI command to translate
+ *      @cdb: SCSI command to translate
  *
  *      Calculate LBA and transfer length for 16-byte commands.
  *
@@ -1099,27 +1097,26 @@ static void scsi_10_lba_len(const u8 *scsicmd, u64 *plba, u32 *plen)
  *      @plba: the LBA
  *      @plen: the transfer length
  */
-
-static void scsi_16_lba_len(const u8 *scsicmd, u64 *plba, u32 *plen)
+static void scsi_16_lba_len(const u8 *cdb, u64 *plba, u32 *plen)
 {
         u64 lba = 0;
         u32 len = 0;
 
         VPRINTK("sixteen-byte command\n");
 
-        lba |= ((u64)scsicmd[2]) << 56;
-        lba |= ((u64)scsicmd[3]) << 48;
-        lba |= ((u64)scsicmd[4]) << 40;
-        lba |= ((u64)scsicmd[5]) << 32;
-        lba |= ((u64)scsicmd[6]) << 24;
-        lba |= ((u64)scsicmd[7]) << 16;
-        lba |= ((u64)scsicmd[8]) << 8;
-        lba |= ((u64)scsicmd[9]);
+        lba |= ((u64)cdb[2]) << 56;
+        lba |= ((u64)cdb[3]) << 48;
+        lba |= ((u64)cdb[4]) << 40;
+        lba |= ((u64)cdb[5]) << 32;
+        lba |= ((u64)cdb[6]) << 24;
+        lba |= ((u64)cdb[7]) << 16;
+        lba |= ((u64)cdb[8]) << 8;
+        lba |= ((u64)cdb[9]);
 
-        len |= ((u32)scsicmd[10]) << 24;
-        len |= ((u32)scsicmd[11]) << 16;
-        len |= ((u32)scsicmd[12]) << 8;
-        len |= ((u32)scsicmd[13]);
+        len |= ((u32)cdb[10]) << 24;
+        len |= ((u32)cdb[11]) << 16;
+        len |= ((u32)cdb[12]) << 8;
+        len |= ((u32)cdb[13]);
 
         *plba = lba;
         *plen = len;
@@ -1128,7 +1125,6 @@ static void scsi_16_lba_len(const u8 *scsicmd, u64 *plba, u32 *plen)
 /**
  *      ata_scsi_verify_xlat - Translate SCSI VERIFY command into an ATA one
  *      @qc: Storage for translated ATA taskfile
- *      @scsicmd: SCSI command to translate
  *
  *      Converts SCSI VERIFY command to an ATA READ VERIFY command.
  *
@@ -1138,23 +1134,28 @@ static void scsi_16_lba_len(const u8 *scsicmd, u64 *plba, u32 *plen)
  *      RETURNS:
  *      Zero on success, non-zero on error.
  */
-
-static unsigned int ata_scsi_verify_xlat(struct ata_queued_cmd *qc, const u8 *scsicmd)
+static unsigned int ata_scsi_verify_xlat(struct ata_queued_cmd *qc)
 {
+        struct scsi_cmnd *scmd = qc->scsicmd;
         struct ata_taskfile *tf = &qc->tf;
         struct ata_device *dev = qc->dev;
         u64 dev_sectors = qc->dev->n_sectors;
+        const u8 *cdb = scmd->cmnd;
         u64 block;
         u32 n_block;
 
         tf->flags |= ATA_TFLAG_ISADDR | ATA_TFLAG_DEVICE;
         tf->protocol = ATA_PROT_NODATA;
 
-        if (scsicmd[0] == VERIFY)
-                scsi_10_lba_len(scsicmd, &block, &n_block);
-        else if (scsicmd[0] == VERIFY_16)
-                scsi_16_lba_len(scsicmd, &block, &n_block);
-        else
+        if (cdb[0] == VERIFY) {
+                if (scmd->cmd_len < 10)
+                        goto invalid_fld;
+                scsi_10_lba_len(cdb, &block, &n_block);
+        } else if (cdb[0] == VERIFY_16) {
+                if (scmd->cmd_len < 16)
+                        goto invalid_fld;
+                scsi_16_lba_len(cdb, &block, &n_block);
+        } else
                 goto invalid_fld;
 
         if (!n_block)
@@ -1229,24 +1230,23 @@ static unsigned int ata_scsi_verify_xlat(struct ata_queued_cmd *qc, const u8 *sc
         return 0;
 
 invalid_fld:
-        ata_scsi_set_sense(qc->scsicmd, ILLEGAL_REQUEST, 0x24, 0x0);
+        ata_scsi_set_sense(scmd, ILLEGAL_REQUEST, 0x24, 0x0);
         /* "Invalid field in cbd" */
         return 1;
 
 out_of_range:
-        ata_scsi_set_sense(qc->scsicmd, ILLEGAL_REQUEST, 0x21, 0x0);
+        ata_scsi_set_sense(scmd, ILLEGAL_REQUEST, 0x21, 0x0);
         /* "Logical Block Address out of range" */
         return 1;
 
 nothing_to_do:
-        qc->scsicmd->result = SAM_STAT_GOOD;
+        scmd->result = SAM_STAT_GOOD;
         return 1;
 }
 
 /**
  *      ata_scsi_rw_xlat - Translate SCSI r/w command into an ATA one
  *      @qc: Storage for translated ATA taskfile
- *      @scsicmd: SCSI command to translate
  *
  *      Converts any of six SCSI read/write commands into the
  *      ATA counterpart, including starting sector (LBA),
@@ -1262,29 +1262,33 @@ nothing_to_do:
  *      RETURNS:
  *      Zero on success, non-zero on error.
  */
-
-static unsigned int ata_scsi_rw_xlat(struct ata_queued_cmd *qc, const u8 *scsicmd)
+static unsigned int ata_scsi_rw_xlat(struct ata_queued_cmd *qc)
 {
+        struct scsi_cmnd *scmd = qc->scsicmd;
+        const u8 *cdb = scmd->cmnd;
         unsigned int tf_flags = 0;
         u64 block;
         u32 n_block;
         int rc;
 
-        if (scsicmd[0] == WRITE_10 || scsicmd[0] == WRITE_6 ||
-            scsicmd[0] == WRITE_16)
+        if (cdb[0] == WRITE_10 || cdb[0] == WRITE_6 || cdb[0] == WRITE_16)
                 tf_flags |= ATA_TFLAG_WRITE;
 
         /* Calculate the SCSI LBA, transfer length and FUA. */
-        switch (scsicmd[0]) {
+        switch (cdb[0]) {
         case READ_10:
         case WRITE_10:
-                scsi_10_lba_len(scsicmd, &block, &n_block);
-                if (unlikely(scsicmd[1] & (1 << 3)))
+                if (unlikely(scmd->cmd_len < 10))
+                        goto invalid_fld;
+                scsi_10_lba_len(cdb, &block, &n_block);
+                if (unlikely(cdb[1] & (1 << 3)))
                         tf_flags |= ATA_TFLAG_FUA;
                 break;
         case READ_6:
         case WRITE_6:
-                scsi_6_lba_len(scsicmd, &block, &n_block);
+                if (unlikely(scmd->cmd_len < 6))
+                        goto invalid_fld;
+                scsi_6_lba_len(cdb, &block, &n_block);
 
                 /* for 6-byte r/w commands, transfer length 0
                  * means 256 blocks of data, not 0 block.
@@ -1294,8 +1298,10 @@ static unsigned int ata_scsi_rw_xlat(struct ata_queued_cmd *qc, const u8 *scsicm
                 break;
         case READ_16:
         case WRITE_16:
-                scsi_16_lba_len(scsicmd, &block, &n_block);
-                if (unlikely(scsicmd[1] & (1 << 3)))
+                if (unlikely(scmd->cmd_len < 16))
+                        goto invalid_fld;
+                scsi_16_lba_len(cdb, &block, &n_block);
+                if (unlikely(cdb[1] & (1 << 3)))
                         tf_flags |= ATA_TFLAG_FUA;
                 break;
         default:
@@ -1326,17 +1332,17 @@ static unsigned int ata_scsi_rw_xlat(struct ata_queued_cmd *qc, const u8 *scsicm
                 goto out_of_range;
         /* treat all other errors as -EINVAL, fall through */
 invalid_fld:
-        ata_scsi_set_sense(qc->scsicmd, ILLEGAL_REQUEST, 0x24, 0x0);
+        ata_scsi_set_sense(scmd, ILLEGAL_REQUEST, 0x24, 0x0);
         /* "Invalid field in cbd" */
         return 1;
 
 out_of_range:
-        ata_scsi_set_sense(qc->scsicmd, ILLEGAL_REQUEST, 0x21, 0x0);
+        ata_scsi_set_sense(scmd, ILLEGAL_REQUEST, 0x21, 0x0);
         /* "Logical Block Address out of range" */
         return 1;
 
 nothing_to_do:
-        qc->scsicmd->result = SAM_STAT_GOOD;
+        scmd->result = SAM_STAT_GOOD;
         return 1;
 }
 
@@ -1456,7 +1462,6 @@ static int ata_scsi_translate(struct ata_device *dev, struct scsi_cmnd *cmd,
                               ata_xlat_func_t xlat_func)
 {
         struct ata_queued_cmd *qc;
-        u8 *scsicmd = cmd->cmnd;
         int is_io = xlat_func == ata_scsi_rw_xlat;
 
         VPRINTK("ENTER\n");
@@ -1488,7 +1493,7 @@ static int ata_scsi_translate(struct ata_device *dev, struct scsi_cmnd *cmd,
 
         qc->complete_fn = ata_scsi_qc_complete;
 
-        if (xlat_func(qc, scsicmd))
+        if (xlat_func(qc))
                 goto early_finish;
 
         /* select device, send command to hardware */
@@ -2344,7 +2349,6 @@ static void atapi_qc_complete(struct ata_queued_cmd *qc)
 /**
  *      atapi_xlat - Initialize PACKET taskfile
  *      @qc: command structure to be initialized
- *      @scsicmd: SCSI CDB associated with this PACKET command
  *
  *      LOCKING:
  *      spin_lock_irqsave(host lock)
@@ -2352,25 +2356,25 @@ static void atapi_qc_complete(struct ata_queued_cmd *qc)
  *      RETURNS:
  *      Zero on success, non-zero on failure.
  */
-
-static unsigned int atapi_xlat(struct ata_queued_cmd *qc, const u8 *scsicmd)
+static unsigned int atapi_xlat(struct ata_queued_cmd *qc)
 {
-        struct scsi_cmnd *cmd = qc->scsicmd;
+        struct scsi_cmnd *scmd = qc->scsicmd;
         struct ata_device *dev = qc->dev;
         int using_pio = (dev->flags & ATA_DFLAG_PIO);
-        int nodata = (cmd->sc_data_direction == DMA_NONE);
+        int nodata = (scmd->sc_data_direction == DMA_NONE);
 
         if (!using_pio)
                 /* Check whether ATAPI DMA is safe */
                 if (ata_check_atapi_dma(qc))
                         using_pio = 1;
 
-        memcpy(&qc->cdb, scsicmd, dev->cdb_len);
+        memset(qc->cdb, 0, dev->cdb_len);
+        memcpy(qc->cdb, scmd->cmnd, scmd->cmd_len);
 
         qc->complete_fn = atapi_qc_complete;
 
         qc->tf.flags |= ATA_TFLAG_ISADDR | ATA_TFLAG_DEVICE;
-        if (cmd->sc_data_direction == DMA_TO_DEVICE) {
+        if (scmd->sc_data_direction == DMA_TO_DEVICE) {
                 qc->tf.flags |= ATA_TFLAG_WRITE;
                 DPRINTK("direction: write\n");
         }
@@ -2392,12 +2396,12 @@ static unsigned int atapi_xlat(struct ata_queued_cmd *qc, const u8 *scsicmd)
                 qc->tf.protocol = ATA_PROT_ATAPI_DMA;
                 qc->tf.feature |= ATAPI_PKT_DMA;
 
-                if (atapi_dmadir && (cmd->sc_data_direction != DMA_TO_DEVICE))
+                if (atapi_dmadir && (scmd->sc_data_direction != DMA_TO_DEVICE))
                         /* some SATA bridges need us to indicate data xfer direction */
                         qc->tf.feature |= ATAPI_DMADIR;
         }
 
-        qc->nbytes = cmd->request_bufflen;
+        qc->nbytes = scmd->request_bufflen;
 
         return 0;
 }
@@ -2517,28 +2521,27 @@ ata_scsi_map_proto(u8 byte1)
 /**
  *      ata_scsi_pass_thru - convert ATA pass-thru CDB to taskfile
  *      @qc: command structure to be initialized
- *      @scsicmd: SCSI command to convert
  *
  *      Handles either 12 or 16-byte versions of the CDB.
  *
  *      RETURNS:
  *      Zero on success, non-zero on failure.
  */
-static unsigned int
-ata_scsi_pass_thru(struct ata_queued_cmd *qc, const u8 *scsicmd)
+static unsigned int ata_scsi_pass_thru(struct ata_queued_cmd *qc)
 {
         struct ata_taskfile *tf = &(qc->tf);
-        struct scsi_cmnd *cmd = qc->scsicmd;
+        struct scsi_cmnd *scmd = qc->scsicmd;
         struct ata_device *dev = qc->dev;
+        const u8 *cdb = scmd->cmnd;
 
-        if ((tf->protocol = ata_scsi_map_proto(scsicmd[1])) == ATA_PROT_UNKNOWN)
+        if ((tf->protocol = ata_scsi_map_proto(cdb[1])) == ATA_PROT_UNKNOWN)
                 goto invalid_fld;
 
         /* We may not issue DMA commands if no DMA mode is set */
         if (tf->protocol == ATA_PROT_DMA && dev->dma_mode == 0)
                 goto invalid_fld;
 
-        if (scsicmd[1] & 0xe0)
+        if (cdb[1] & 0xe0)
                 /* PIO multi not supported yet */
                 goto invalid_fld;
 
@@ -2546,18 +2549,18 @@ ata_scsi_pass_thru(struct ata_queued_cmd *qc, const u8 *scsicmd)
          * 12 and 16 byte CDBs use different offsets to
          * provide the various register values.
          */
-        if (scsicmd[0] == ATA_16) {
+        if (cdb[0] == ATA_16) {
                 /*
                  * 16-byte CDB - may contain extended commands.
                  *
                  * If that is the case, copy the upper byte register values.
                  */
-                if (scsicmd[1] & 0x01) {
-                        tf->hob_feature = scsicmd[3];
-                        tf->hob_nsect = scsicmd[5];
-                        tf->hob_lbal = scsicmd[7];
-                        tf->hob_lbam = scsicmd[9];
-                        tf->hob_lbah = scsicmd[11];
+                if (cdb[1] & 0x01) {
+                        tf->hob_feature = cdb[3];
+                        tf->hob_nsect = cdb[5];
+                        tf->hob_lbal = cdb[7];
+                        tf->hob_lbam = cdb[9];
+                        tf->hob_lbah = cdb[11];
                         tf->flags |= ATA_TFLAG_LBA48;
                 } else
                         tf->flags &= ~ATA_TFLAG_LBA48;
@@ -2565,26 +2568,26 @@ ata_scsi_pass_thru(struct ata_queued_cmd *qc, const u8 *scsicmd)
                 /*
                  * Always copy low byte, device and command registers.
                  */
-                tf->feature = scsicmd[4];
-                tf->nsect = scsicmd[6];
-                tf->lbal = scsicmd[8];
-                tf->lbam = scsicmd[10];
-                tf->lbah = scsicmd[12];
-                tf->device = scsicmd[13];
-                tf->command = scsicmd[14];
+                tf->feature = cdb[4];
+                tf->nsect = cdb[6];
+                tf->lbal = cdb[8];
+                tf->lbam = cdb[10];
+                tf->lbah = cdb[12];
+                tf->device = cdb[13];
+                tf->command = cdb[14];
         } else {
                 /*
                  * 12-byte CDB - incapable of extended commands.
                  */
                 tf->flags &= ~ATA_TFLAG_LBA48;
 
-                tf->feature = scsicmd[3];
-                tf->nsect = scsicmd[4];
-                tf->lbal = scsicmd[5];
-                tf->lbam = scsicmd[6];
-                tf->lbah = scsicmd[7];
-                tf->device = scsicmd[8];
-                tf->command = scsicmd[9];
+                tf->feature = cdb[3];
+                tf->nsect = cdb[4];
+                tf->lbal = cdb[5];
+                tf->lbam = cdb[6];
+                tf->lbah = cdb[7];
+                tf->device = cdb[8];
+                tf->command = cdb[9];
         }
         /*
          * If slave is possible, enforce correct master/slave bit
@@ -2611,7 +2614,7 @@ ata_scsi_pass_thru(struct ata_queued_cmd *qc, const u8 *scsicmd)
          */
         tf->flags |= (ATA_TFLAG_ISADDR | ATA_TFLAG_DEVICE);
 
-        if (cmd->sc_data_direction == DMA_TO_DEVICE)
+        if (scmd->sc_data_direction == DMA_TO_DEVICE)
                 tf->flags |= ATA_TFLAG_WRITE;
 
         /*
@@ -2620,7 +2623,7 @@ ata_scsi_pass_thru(struct ata_queued_cmd *qc, const u8 *scsicmd)
          * TODO: find out if we need to do more here to
          *       cover scatter/gather case.
          */
-        qc->nsect = cmd->request_bufflen / ATA_SECT_SIZE;
+        qc->nsect = scmd->request_bufflen / ATA_SECT_SIZE;
 
         /* request result TF */
         qc->flags |= ATA_QCFLAG_RESULT_TF;
@@ -2628,7 +2631,7 @@ ata_scsi_pass_thru(struct ata_queued_cmd *qc, const u8 *scsicmd)
         return 0;
 
  invalid_fld:
-        ata_scsi_set_sense(qc->scsicmd, ILLEGAL_REQUEST, 0x24, 0x00);
+        ata_scsi_set_sense(scmd, ILLEGAL_REQUEST, 0x24, 0x00);
         /* "Invalid field in cdb" */
         return 1;
 }
@@ -2701,22 +2704,29 @@ static inline void ata_scsi_dump_cdb(struct ata_port *ap,
 #endif
 }
 
-static inline int __ata_scsi_queuecmd(struct scsi_cmnd *cmd,
+static inline int __ata_scsi_queuecmd(struct scsi_cmnd *scmd,
                                       void (*done)(struct scsi_cmnd *),
                                       struct ata_device *dev)
 {
         int rc = 0;
 
+        if (unlikely(!scmd->cmd_len)) {
+                ata_dev_printk(dev, KERN_WARNING, "WARNING: zero len CDB\n");
+                scmd->result = DID_ERROR << 16;
+                done(scmd);
+                return 0;
+        }
+
         if (dev->class == ATA_DEV_ATA) {
                 ata_xlat_func_t xlat_func = ata_get_xlat_func(dev,
-                                                              cmd->cmnd[0]);
+                                                              scmd->cmnd[0]);
 
                 if (xlat_func)
-                        rc = ata_scsi_translate(dev, cmd, done, xlat_func);
+                        rc = ata_scsi_translate(dev, scmd, done, xlat_func);
                 else
-                        ata_scsi_simulate(dev, cmd, done);
+                        ata_scsi_simulate(dev, scmd, done);
         } else
-                rc = ata_scsi_translate(dev, cmd, done, atapi_xlat);
+                rc = ata_scsi_translate(dev, scmd, done, atapi_xlat);
 
         return rc;
 }
diff --git a/drivers/ata/pata_cs5530.c b/drivers/ata/pata_cs5530.c
index 1c628014da..b1ca207e35 100644
--- a/drivers/ata/pata_cs5530.c
+++ b/drivers/ata/pata_cs5530.c
@@ -372,7 +372,8 @@ static int cs5530_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
 static int cs5530_reinit_one(struct pci_dev *pdev)
 {
         /* If we fail on resume we are doomed */
-        BUG_ON(cs5530_init_chip());
+        if (cs5530_init_chip())
+                BUG();
         return ata_pci_device_resume(pdev);
 }
         
diff --git a/drivers/ata/pata_via.c b/drivers/ata/pata_via.c
index ff93e8f71c..f0d4f7e9ed 100644
--- a/drivers/ata/pata_via.c
+++ b/drivers/ata/pata_via.c
@@ -395,7 +395,7 @@ static void via_config_fifo(struct pci_dev *pdev, unsigned int flags)
         enable &= 3;
         
         if (flags & VIA_SET_FIFO) {
-                u8 fifo_setting[4] = {0x00, 0x60, 0x00, 0x20};
+                static const u8 fifo_setting[4] = {0x00, 0x60, 0x00, 0x20};
                 u8 fifo;
 
                 pci_read_config_byte(pdev, 0x43, &fifo);
diff --git a/drivers/ata/sata_nv.c b/drivers/ata/sata_nv.c
index 0d316eb3c2..f6d498e1cf 100644
--- a/drivers/ata/sata_nv.c
+++ b/drivers/ata/sata_nv.c
@@ -270,14 +270,6 @@ static const struct pci_device_id nv_pci_tbl[] = {
         { PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP61_SATA), GENERIC },
         { PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP61_SATA2), GENERIC },
         { PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP61_SATA3), GENERIC },
-        { PCI_VDEVICE(NVIDIA, 0x045c), GENERIC }, /* MCP65 */
-        { PCI_VDEVICE(NVIDIA, 0x045d), GENERIC }, /* MCP65 */
-        { PCI_VDEVICE(NVIDIA, 0x045e), GENERIC }, /* MCP65 */
-        { PCI_VDEVICE(NVIDIA, 0x045f), GENERIC }, /* MCP65 */
-        { PCI_VDEVICE(NVIDIA, 0x0550), GENERIC }, /* MCP67 */
-        { PCI_VDEVICE(NVIDIA, 0x0551), GENERIC }, /* MCP67 */
-        { PCI_VDEVICE(NVIDIA, 0x0552), GENERIC }, /* MCP67 */
-        { PCI_VDEVICE(NVIDIA, 0x0553), GENERIC }, /* MCP67 */
         { PCI_VENDOR_ID_NVIDIA, PCI_ANY_ID,
                 PCI_ANY_ID, PCI_ANY_ID,
                 PCI_CLASS_STORAGE_IDE<<8, 0xffff00, GENERIC },
diff --git a/drivers/ata/sata_svw.c b/drivers/ata/sata_svw.c
index d89c9590b8..46d8a94669 100644
--- a/drivers/ata/sata_svw.c
+++ b/drivers/ata/sata_svw.c
@@ -135,26 +135,31 @@ static void k2_sata_tf_load(struct ata_port *ap, const struct ata_taskfile *tf)
         unsigned int is_addr = tf->flags & ATA_TFLAG_ISADDR;
 
         if (tf->ctl != ap->last_ctl) {
-                writeb(tf->ctl, ioaddr->ctl_addr);
+                writeb(tf->ctl, (void __iomem *) ioaddr->ctl_addr);
                 ap->last_ctl = tf->ctl;
                 ata_wait_idle(ap);
         }
         if (is_addr && (tf->flags & ATA_TFLAG_LBA48)) {
-                writew(tf->feature | (((u16)tf->hob_feature) << 8), ioaddr->feature_addr);
-                writew(tf->nsect | (((u16)tf->hob_nsect) << 8), ioaddr->nsect_addr);
-                writew(tf->lbal | (((u16)tf->hob_lbal) << 8), ioaddr->lbal_addr);
-                writew(tf->lbam | (((u16)tf->hob_lbam) << 8), ioaddr->lbam_addr);
-                writew(tf->lbah | (((u16)tf->hob_lbah) << 8), ioaddr->lbah_addr);
+                writew(tf->feature | (((u16)tf->hob_feature) << 8),
+                       (void __iomem *) ioaddr->feature_addr);
+                writew(tf->nsect | (((u16)tf->hob_nsect) << 8),
+                       (void __iomem *) ioaddr->nsect_addr);
+                writew(tf->lbal | (((u16)tf->hob_lbal) << 8),
+                       (void __iomem *) ioaddr->lbal_addr);
+                writew(tf->lbam | (((u16)tf->hob_lbam) << 8),
+                       (void __iomem *) ioaddr->lbam_addr);
+                writew(tf->lbah | (((u16)tf->hob_lbah) << 8),
+                       (void __iomem *) ioaddr->lbah_addr);
         } else if (is_addr) {
-                writew(tf->feature, ioaddr->feature_addr);
-                writew(tf->nsect, ioaddr->nsect_addr);
-                writew(tf->lbal, ioaddr->lbal_addr);
-                writew(tf->lbam, ioaddr->lbam_addr);
-                writew(tf->lbah, ioaddr->lbah_addr);
+                writew(tf->feature, (void __iomem *) ioaddr->feature_addr);
+                writew(tf->nsect, (void __iomem *) ioaddr->nsect_addr);
+                writew(tf->lbal, (void __iomem *) ioaddr->lbal_addr);
+                writew(tf->lbam, (void __iomem *) ioaddr->lbam_addr);
+                writew(tf->lbah, (void __iomem *) ioaddr->lbah_addr);
         }
 
         if (tf->flags & ATA_TFLAG_DEVICE)
-                writeb(tf->device, ioaddr->device_addr);
+                writeb(tf->device, (void __iomem *) ioaddr->device_addr);
 
         ata_wait_idle(ap);
 }
@@ -166,12 +171,12 @@ static void k2_sata_tf_read(struct ata_port *ap, struct ata_taskfile *tf)
         u16 nsect, lbal, lbam, lbah, feature;
 
         tf->command = k2_stat_check_status(ap);
-        tf->device = readw(ioaddr->device_addr);
-        feature = readw(ioaddr->error_addr);
-        nsect = readw(ioaddr->nsect_addr);
-        lbal = readw(ioaddr->lbal_addr);
-        lbam = readw(ioaddr->lbam_addr);
-        lbah = readw(ioaddr->lbah_addr);
+        tf->device = readw((void __iomem *)ioaddr->device_addr);
+        feature = readw((void __iomem *)ioaddr->error_addr);
+        nsect = readw((void __iomem *)ioaddr->nsect_addr);
+        lbal = readw((void __iomem *)ioaddr->lbal_addr);
+        lbam = readw((void __iomem *)ioaddr->lbam_addr);
+        lbah = readw((void __iomem *)ioaddr->lbah_addr);
 
         tf->feature = feature;
         tf->nsect = nsect;
diff --git a/drivers/ata/sata_vsc.c b/drivers/ata/sata_vsc.c
index e654b990b9..0fa1b89f76 100644
--- a/drivers/ata/sata_vsc.c
+++ b/drivers/ata/sata_vsc.c
@@ -149,21 +149,26 @@ static void vsc_sata_tf_load(struct ata_port *ap, const struct ata_taskfile *tf)
                 vsc_intr_mask_update(ap, tf->ctl & ATA_NIEN);
         }
         if (is_addr && (tf->flags & ATA_TFLAG_LBA48)) {
-                writew(tf->feature | (((u16)tf->hob_feature) << 8), ioaddr->feature_addr);
-                writew(tf->nsect | (((u16)tf->hob_nsect) << 8), ioaddr->nsect_addr);
-                writew(tf->lbal | (((u16)tf->hob_lbal) << 8), ioaddr->lbal_addr);
-                writew(tf->lbam | (((u16)tf->hob_lbam) << 8), ioaddr->lbam_addr);
-                writew(tf->lbah | (((u16)tf->hob_lbah) << 8), ioaddr->lbah_addr);
+                writew(tf->feature | (((u16)tf->hob_feature) << 8),
+                       (void __iomem *) ioaddr->feature_addr);
+                writew(tf->nsect | (((u16)tf->hob_nsect) << 8),
+                       (void __iomem *) ioaddr->nsect_addr);
+                writew(tf->lbal | (((u16)tf->hob_lbal) << 8),
+                       (void __iomem *) ioaddr->lbal_addr);
+                writew(tf->lbam | (((u16)tf->hob_lbam) << 8),
+                       (void __iomem *) ioaddr->lbam_addr);
+                writew(tf->lbah | (((u16)tf->hob_lbah) << 8),
+                       (void __iomem *) ioaddr->lbah_addr);
         } else if (is_addr) {
-                writew(tf->feature, ioaddr->feature_addr);
-                writew(tf->nsect, ioaddr->nsect_addr);
-                writew(tf->lbal, ioaddr->lbal_addr);
-                writew(tf->lbam, ioaddr->lbam_addr);
-                writew(tf->lbah, ioaddr->lbah_addr);
+                writew(tf->feature, (void __iomem *) ioaddr->feature_addr);
+                writew(tf->nsect, (void __iomem *) ioaddr->nsect_addr);
+                writew(tf->lbal, (void __iomem *) ioaddr->lbal_addr);
+                writew(tf->lbam, (void __iomem *) ioaddr->lbam_addr);
+                writew(tf->lbah, (void __iomem *) ioaddr->lbah_addr);
         }
 
         if (tf->flags & ATA_TFLAG_DEVICE)
-                writeb(tf->device, ioaddr->device_addr);
+                writeb(tf->device, (void __iomem *) ioaddr->device_addr);
 
         ata_wait_idle(ap);
 }
@@ -175,12 +180,12 @@ static void vsc_sata_tf_read(struct ata_port *ap, struct ata_taskfile *tf)
         u16 nsect, lbal, lbam, lbah, feature;
 
         tf->command = ata_check_status(ap);
-        tf->device = readw(ioaddr->device_addr);
-        feature = readw(ioaddr->error_addr);
-        nsect = readw(ioaddr->nsect_addr);
-        lbal = readw(ioaddr->lbal_addr);
-        lbam = readw(ioaddr->lbam_addr);
-        lbah = readw(ioaddr->lbah_addr);
+        tf->device = readw((void __iomem *) ioaddr->device_addr);
+        feature = readw((void __iomem *) ioaddr->error_addr);
+        nsect = readw((void __iomem *) ioaddr->nsect_addr);
+        lbal = readw((void __iomem *) ioaddr->lbal_addr);
+        lbam = readw((void __iomem *) ioaddr->lbam_addr);
+        lbah = readw((void __iomem *) ioaddr->lbah_addr);
 
         tf->feature = feature;
         tf->nsect = nsect;
@@ -327,8 +332,8 @@ static void __devinit vsc_sata_setup_port(struct ata_ioports *port, unsigned lon
         port->ctl_addr          = base + VSC_SATA_TF_CTL_OFFSET;
         port->bmdma_addr        = base + VSC_SATA_DMA_CMD_OFFSET;
         port->scr_addr          = base + VSC_SATA_SCR_STATUS_OFFSET;
-        writel(0, base + VSC_SATA_UP_DESCRIPTOR_OFFSET);
-        writel(0, base + VSC_SATA_UP_DATA_BUFFER_OFFSET);
+        writel(0, (void __iomem *) base + VSC_SATA_UP_DESCRIPTOR_OFFSET);
+        writel(0, (void __iomem *) base + VSC_SATA_UP_DATA_BUFFER_OFFSET);
 }
 
 
diff --git a/drivers/atm/Kconfig b/drivers/atm/Kconfig
index 2ddd76fdbc..33687454eb 100644
--- a/drivers/atm/Kconfig
+++ b/drivers/atm/Kconfig
@@ -167,10 +167,6 @@ config ATM_ZATM_DEBUG
           Note that extended debugging may create certain race conditions
           itself. Enable this ONLY if you suspect problems with the driver.
 
-#   bool 'Rolfs TI TNETA1570' CONFIG_ATM_TNETA1570 y
-#   if [ "$CONFIG_ATM_TNETA1570" = "y" ]; then
-#      bool '  Enable extended debugging' CONFIG_ATM_TNETA1570_DEBUG n
-#   fi
 config ATM_NICSTAR
         tristate "IDT 77201 (NICStAR) (ForeRunnerLE)"
         depends on PCI && ATM && !64BIT
diff --git a/drivers/atm/fore200e.c b/drivers/atm/fore200e.c
index 3a7b21ff30..4aeb3d062f 100644
--- a/drivers/atm/fore200e.c
+++ b/drivers/atm/fore200e.c
@@ -172,25 +172,6 @@ fore200e_irq_itoa(int irq)
 }
 
 
-static void*
-fore200e_kmalloc(int size, gfp_t flags)
-{
-    void *chunk = kzalloc(size, flags);
-
-    if (!chunk)
-        printk(FORE200E "kmalloc() failed, requested size = %d, flags = 0x%x\n",                        size, flags);
-    
-    return chunk;
-}
-
-
-static void
-fore200e_kfree(void* chunk)
-{
-    kfree(chunk);
-}
-
-
 /* allocate and align a chunk of memory intended to hold the data behing exchanged
    between the driver and the adapter (using streaming DVMA) */
 
@@ -206,7 +187,7 @@ fore200e_chunk_alloc(struct fore200e* fore200e, struct chunk* chunk, int size, i
     chunk->align_size = size;
     chunk->direction  = direction;
 
-    chunk->alloc_addr = fore200e_kmalloc(chunk->alloc_size, GFP_KERNEL | GFP_DMA);
+    chunk->alloc_addr = kzalloc(chunk->alloc_size, GFP_KERNEL | GFP_DMA);
     if (chunk->alloc_addr == NULL)
         return -ENOMEM;
 
@@ -228,7 +209,7 @@ fore200e_chunk_free(struct fore200e* fore200e, struct chunk* chunk)
 {
     fore200e->bus->dma_unmap(fore200e, chunk->dma_addr, chunk->dma_size, chunk->direction);
 
-    fore200e_kfree(chunk->alloc_addr);
+    kfree(chunk->alloc_addr);
 }
 
 
@@ -882,7 +863,7 @@ fore200e_sba_detect(const struct fore200e_bus* bus, int index)
         return NULL;
     }
 
-    fore200e = fore200e_kmalloc(sizeof(struct fore200e), GFP_KERNEL);
+    fore200e = kzalloc(sizeof(struct fore200e), GFP_KERNEL);
     if (fore200e == NULL)
         return NULL;
 
@@ -1505,7 +1486,7 @@ fore200e_open(struct atm_vcc *vcc)
 
     spin_unlock_irqrestore(&fore200e->q_lock, flags);
 
-    fore200e_vcc = fore200e_kmalloc(sizeof(struct fore200e_vcc), GFP_ATOMIC);
+    fore200e_vcc = kzalloc(sizeof(struct fore200e_vcc), GFP_ATOMIC);
     if (fore200e_vcc == NULL) {
         vc_map->vcc = NULL;
         return -ENOMEM;
@@ -1526,7 +1507,7 @@ fore200e_open(struct atm_vcc *vcc)
         if (fore200e->available_cell_rate < vcc->qos.txtp.max_pcr) {
             up(&fore200e->rate_sf);
 
-            fore200e_kfree(fore200e_vcc);
+            kfree(fore200e_vcc);
             vc_map->vcc = NULL;
             return -EAGAIN;
         }
@@ -1554,7 +1535,7 @@ fore200e_open(struct atm_vcc *vcc)
 
         fore200e->available_cell_rate += vcc->qos.txtp.max_pcr;
 
-        fore200e_kfree(fore200e_vcc);
+        kfree(fore200e_vcc);
         return -EINVAL;
     }
     
@@ -1630,7 +1611,7 @@ fore200e_close(struct atm_vcc* vcc)
     clear_bit(ATM_VF_PARTIAL,&vcc->flags);
 
     ASSERT(fore200e_vcc);
-    fore200e_kfree(fore200e_vcc);
+    kfree(fore200e_vcc);
 }
 
 
@@ -1831,7 +1812,7 @@ fore200e_getstats(struct fore200e* fore200e)
     u32                     stats_dma_addr;
 
     if (fore200e->stats == NULL) {
-        fore200e->stats = fore200e_kmalloc(sizeof(struct stats), GFP_KERNEL | GFP_DMA);
+        fore200e->stats = kzalloc(sizeof(struct stats), GFP_KERNEL | GFP_DMA);
         if (fore200e->stats == NULL)
             return -ENOMEM;
     }
@@ -2002,17 +1983,6 @@ fore200e_setloop(struct fore200e* fore200e, int loop_mode)
 }
 
 
-static inline unsigned int
-fore200e_swap(unsigned int in)
-{
-#if defined(__LITTLE_ENDIAN)
-    return swab32(in);
-#else
-    return in;
-#endif
-}
-
-
 static int
 fore200e_fetch_stats(struct fore200e* fore200e, struct sonet_stats __user *arg)
 {
@@ -2021,19 +1991,19 @@ fore200e_fetch_stats(struct fore200e* fore200e, struct sonet_stats __user *arg)
     if (fore200e_getstats(fore200e) < 0)
         return -EIO;
 
-    tmp.section_bip = fore200e_swap(fore200e->stats->oc3.section_bip8_errors);
-    tmp.line_bip    = fore200e_swap(fore200e->stats->oc3.line_bip24_errors);
-    tmp.path_bip    = fore200e_swap(fore200e->stats->oc3.path_bip8_errors);
-    tmp.line_febe   = fore200e_swap(fore200e->stats->oc3.line_febe_errors);
-    tmp.path_febe   = fore200e_swap(fore200e->stats->oc3.path_febe_errors);
-    tmp.corr_hcs    = fore200e_swap(fore200e->stats->oc3.corr_hcs_errors);
-    tmp.uncorr_hcs  = fore200e_swap(fore200e->stats->oc3.ucorr_hcs_errors);
-    tmp.tx_cells    = fore200e_swap(fore200e->stats->aal0.cells_transmitted)  +
-                      fore200e_swap(fore200e->stats->aal34.cells_transmitted) +
-                      fore200e_swap(fore200e->stats->aal5.cells_transmitted);
-    tmp.rx_cells    = fore200e_swap(fore200e->stats->aal0.cells_received)     +
-                      fore200e_swap(fore200e->stats->aal34.cells_received)    +
-                      fore200e_swap(fore200e->stats->aal5.cells_received);
+    tmp.section_bip = cpu_to_be32(fore200e->stats->oc3.section_bip8_errors);
+    tmp.line_bip    = cpu_to_be32(fore200e->stats->oc3.line_bip24_errors);
+    tmp.path_bip    = cpu_to_be32(fore200e->stats->oc3.path_bip8_errors);
+    tmp.line_febe   = cpu_to_be32(fore200e->stats->oc3.line_febe_errors);
+    tmp.path_febe   = cpu_to_be32(fore200e->stats->oc3.path_febe_errors);
+    tmp.corr_hcs    = cpu_to_be32(fore200e->stats->oc3.corr_hcs_errors);
+    tmp.uncorr_hcs  = cpu_to_be32(fore200e->stats->oc3.ucorr_hcs_errors);
+    tmp.tx_cells    = cpu_to_be32(fore200e->stats->aal0.cells_transmitted)  +
+                      cpu_to_be32(fore200e->stats->aal34.cells_transmitted) +
+                      cpu_to_be32(fore200e->stats->aal5.cells_transmitted);
+    tmp.rx_cells    = cpu_to_be32(fore200e->stats->aal0.cells_received)     +
+                      cpu_to_be32(fore200e->stats->aal34.cells_received)    +
+                      cpu_to_be32(fore200e->stats->aal5.cells_received);
 
     if (arg)
         return copy_to_user(arg, &tmp, sizeof(struct sonet_stats)) ? -EFAULT : 0;       
@@ -2146,7 +2116,7 @@ fore200e_irq_request(struct fore200e* fore200e)
 static int __devinit
 fore200e_get_esi(struct fore200e* fore200e)
 {
-    struct prom_data* prom = fore200e_kmalloc(sizeof(struct prom_data), GFP_KERNEL | GFP_DMA);
+    struct prom_data* prom = kzalloc(sizeof(struct prom_data), GFP_KERNEL | GFP_DMA);
     int ok, i;
 
     if (!prom)
@@ -2154,7 +2124,7 @@ fore200e_get_esi(struct fore200e* fore200e)
 
     ok = fore200e->bus->prom_read(fore200e, prom);
     if (ok < 0) {
-        fore200e_kfree(prom);
+        kfree(prom);
         return -EBUSY;
     }
         
@@ -2169,7 +2139,7 @@ fore200e_get_esi(struct fore200e* fore200e)
         fore200e->esi[ i ] = fore200e->atm_dev->esi[ i ] = prom->mac_addr[ i + 2 ];
     }
     
-    fore200e_kfree(prom);
+    kfree(prom);
 
     return 0;
 }
@@ -2194,7 +2164,7 @@ fore200e_alloc_rx_buf(struct fore200e* fore200e)
             DPRINTK(2, "rx buffers %d / %d are being allocated\n", scheme, magn);
 
             /* allocate the array of receive buffers */
-            buffer = bsq->buffer = fore200e_kmalloc(nbr * sizeof(struct buffer), GFP_KERNEL);
+            buffer = bsq->buffer = kzalloc(nbr * sizeof(struct buffer), GFP_KERNEL);
 
             if (buffer == NULL)
                 return -ENOMEM;
@@ -2217,7 +2187,7 @@ fore200e_alloc_rx_buf(struct fore200e* fore200e)
                     
                     while (i > 0)
                         fore200e_chunk_free(fore200e, &buffer[ --i ].data);
-                    fore200e_kfree(buffer);
+                    kfree(buffer);
                     
                     return -ENOMEM;
                 }
@@ -2736,7 +2706,7 @@ fore200e_pca_detect(struct pci_dev *pci_dev, const struct pci_device_id *pci_ent
         goto out;
     }
     
-    fore200e = fore200e_kmalloc(sizeof(struct fore200e), GFP_KERNEL);
+    fore200e = kzalloc(sizeof(struct fore200e), GFP_KERNEL);
     if (fore200e == NULL) {
         err = -ENOMEM;
         goto out_disable;
@@ -2999,8 +2969,8 @@ fore200e_proc_read(struct atm_dev *dev, loff_t* pos, char* page)
                        "  4b5b:\n"
                        "     crc_header_errors:\t\t%10u\n"
                        "     framing_errors:\t\t%10u\n",
-                       fore200e_swap(fore200e->stats->phy.crc_header_errors),
-                       fore200e_swap(fore200e->stats->phy.framing_errors));
+                       cpu_to_be32(fore200e->stats->phy.crc_header_errors),
+                       cpu_to_be32(fore200e->stats->phy.framing_errors));
     
     if (!left--)
         return sprintf(page, "\n"
@@ -3012,13 +2982,13 @@ fore200e_proc_read(struct atm_dev *dev, loff_t* pos, char* page)
                        "     path_febe_errors:\t\t%10u\n"
                        "     corr_hcs_errors:\t\t%10u\n"
                        "     ucorr_hcs_errors:\t\t%10u\n",
-                       fore200e_swap(fore200e->stats->oc3.section_bip8_errors),
-                       fore200e_swap(fore200e->stats->oc3.path_bip8_errors),
-                       fore200e_swap(fore200e->stats->oc3.line_bip24_errors),
-                       fore200e_swap(fore200e->stats->oc3.line_febe_errors),
-                       fore200e_swap(fore200e->stats->oc3.path_febe_errors),
-                       fore200e_swap(fore200e->stats->oc3.corr_hcs_errors),
-                       fore200e_swap(fore200e->stats->oc3.ucorr_hcs_errors));
+                       cpu_to_be32(fore200e->stats->oc3.section_bip8_errors),
+                       cpu_to_be32(fore200e->stats->oc3.path_bip8_errors),
+                       cpu_to_be32(fore200e->stats->oc3.line_bip24_errors),
+                       cpu_to_be32(fore200e->stats->oc3.line_febe_errors),
+                       cpu_to_be32(fore200e->stats->oc3.path_febe_errors),
+                       cpu_to_be32(fore200e->stats->oc3.corr_hcs_errors),
+                       cpu_to_be32(fore200e->stats->oc3.ucorr_hcs_errors));
 
     if (!left--)
         return sprintf(page,"\n"
@@ -3029,12 +2999,12 @@ fore200e_proc_read(struct atm_dev *dev, loff_t* pos, char* page)
                        "     vpi no conn:\t\t%10u\n"
                        "     vci out of range:\t\t%10u\n"
                        "     vci no conn:\t\t%10u\n",
-                       fore200e_swap(fore200e->stats->atm.cells_transmitted),
-                       fore200e_swap(fore200e->stats->atm.cells_received),
-                       fore200e_swap(fore200e->stats->atm.vpi_bad_range),
-                       fore200e_swap(fore200e->stats->atm.vpi_no_conn),
-                       fore200e_swap(fore200e->stats->atm.vci_bad_range),
-                       fore200e_swap(fore200e->stats->atm.vci_no_conn));
+                       cpu_to_be32(fore200e->stats->atm.cells_transmitted),
+                       cpu_to_be32(fore200e->stats->atm.cells_received),
+                       cpu_to_be32(fore200e->stats->atm.vpi_bad_range),
+                       cpu_to_be32(fore200e->stats->atm.vpi_no_conn),
+                       cpu_to_be32(fore200e->stats->atm.vci_bad_range),
+                       cpu_to_be32(fore200e->stats->atm.vci_no_conn));
     
     if (!left--)
         return sprintf(page,"\n"
@@ -3042,9 +3012,9 @@ fore200e_proc_read(struct atm_dev *dev, loff_t* pos, char* page)
                        "     TX:\t\t\t%10u\n"
                        "     RX:\t\t\t%10u\n"
                        "     dropped:\t\t\t%10u\n",
-                       fore200e_swap(fore200e->stats->aal0.cells_transmitted),
-                       fore200e_swap(fore200e->stats->aal0.cells_received),
-                       fore200e_swap(fore200e->stats->aal0.cells_dropped));
+                       cpu_to_be32(fore200e->stats->aal0.cells_transmitted),
+                       cpu_to_be32(fore200e->stats->aal0.cells_received),
+                       cpu_to_be32(fore200e->stats->aal0.cells_dropped));
     
     if (!left--)
         return sprintf(page,"\n"
@@ -3060,15 +3030,15 @@ fore200e_proc_read(struct atm_dev *dev, loff_t* pos, char* page)
                        "       RX:\t\t\t%10u\n"
                        "       dropped:\t\t\t%10u\n"
                        "       protocol errors:\t\t%10u\n",
-                       fore200e_swap(fore200e->stats->aal34.cells_transmitted),
-                       fore200e_swap(fore200e->stats->aal34.cells_received),
-                       fore200e_swap(fore200e->stats->aal34.cells_dropped),
-                       fore200e_swap(fore200e->stats->aal34.cells_crc_errors),
-                       fore200e_swap(fore200e->stats->aal34.cells_protocol_errors),
-                       fore200e_swap(fore200e->stats->aal34.cspdus_transmitted),
-                       fore200e_swap(fore200e->stats->aal34.cspdus_received),
-                       fore200e_swap(fore200e->stats->aal34.cspdus_dropped),
-                       fore200e_swap(fore200e->stats->aal34.cspdus_protocol_errors));
+                       cpu_to_be32(fore200e->stats->aal34.cells_transmitted),
+                       cpu_to_be32(fore200e->stats->aal34.cells_received),
+                       cpu_to_be32(fore200e->stats->aal34.cells_dropped),
+                       cpu_to_be32(fore200e->stats->aal34.cells_crc_errors),
+                       cpu_to_be32(fore200e->stats->aal34.cells_protocol_errors),
+                       cpu_to_be32(fore200e->stats->aal34.cspdus_transmitted),
+                       cpu_to_be32(fore200e->stats->aal34.cspdus_received),
+                       cpu_to_be32(fore200e->stats->aal34.cspdus_dropped),
+                       cpu_to_be32(fore200e->stats->aal34.cspdus_protocol_errors));
     
     if (!left--)
         return sprintf(page,"\n"
@@ -3084,15 +3054,15 @@ fore200e_proc_read(struct atm_dev *dev, loff_t* pos, char* page)
                        "       dropped:\t\t\t%10u\n"
                        "       CRC errors:\t\t%10u\n"
                        "       protocol errors:\t\t%10u\n",
-                       fore200e_swap(fore200e->stats->aal5.cells_transmitted),
-                       fore200e_swap(fore200e->stats->aal5.cells_received),
-                       fore200e_swap(fore200e->stats->aal5.cells_dropped),
-                       fore200e_swap(fore200e->stats->aal5.congestion_experienced),
-                       fore200e_swap(fore200e->stats->aal5.cspdus_transmitted),
-                       fore200e_swap(fore200e->stats->aal5.cspdus_received),
-                       fore200e_swap(fore200e->stats->aal5.cspdus_dropped),
-                       fore200e_swap(fore200e->stats->aal5.cspdus_crc_errors),
-                       fore200e_swap(fore200e->stats->aal5.cspdus_protocol_errors));
+                       cpu_to_be32(fore200e->stats->aal5.cells_transmitted),
+                       cpu_to_be32(fore200e->stats->aal5.cells_received),
+                       cpu_to_be32(fore200e->stats->aal5.cells_dropped),
+                       cpu_to_be32(fore200e->stats->aal5.congestion_experienced),
+                       cpu_to_be32(fore200e->stats->aal5.cspdus_transmitted),
+                       cpu_to_be32(fore200e->stats->aal5.cspdus_received),
+                       cpu_to_be32(fore200e->stats->aal5.cspdus_dropped),
+                       cpu_to_be32(fore200e->stats->aal5.cspdus_crc_errors),
+                       cpu_to_be32(fore200e->stats->aal5.cspdus_protocol_errors));
     
     if (!left--)
         return sprintf(page,"\n"
@@ -3103,11 +3073,11 @@ fore200e_proc_read(struct atm_dev *dev, loff_t* pos, char* page)
                        "     large b2:\t\t\t%10u\n"
                        "     RX PDUs:\t\t\t%10u\n"
                        "     TX PDUs:\t\t\t%10lu\n",
-                       fore200e_swap(fore200e->stats->aux.small_b1_failed),
-                       fore200e_swap(fore200e->stats->aux.large_b1_failed),
-                       fore200e_swap(fore200e->stats->aux.small_b2_failed),
-                       fore200e_swap(fore200e->stats->aux.large_b2_failed),
-                       fore200e_swap(fore200e->stats->aux.rpd_alloc_failed),
+                       cpu_to_be32(fore200e->stats->aux.small_b1_failed),
+                       cpu_to_be32(fore200e->stats->aux.large_b1_failed),
+                       cpu_to_be32(fore200e->stats->aux.small_b2_failed),
+                       cpu_to_be32(fore200e->stats->aux.large_b2_failed),
+                       cpu_to_be32(fore200e->stats->aux.rpd_alloc_failed),
                        fore200e->tx_sat);
     
     if (!left--)
diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
index 4bad2870c4..64558f45e6 100644
--- a/drivers/base/firmware_class.c
+++ b/drivers/base/firmware_class.c
@@ -127,6 +127,7 @@ static ssize_t firmware_loading_show(struct device *dev,
 /**
  * firmware_loading_store - set value in the 'loading' control file
  * @dev: device pointer
+ * @attr: device attribute pointer
  * @buf: buffer to scan for loading control value
  * @count: number of bytes in @buf
  *
diff --git a/drivers/block/aoe/aoecmd.c b/drivers/block/aoe/aoecmd.c
index 97f7f535f4..bb022ed4a8 100644
--- a/drivers/block/aoe/aoecmd.c
+++ b/drivers/block/aoe/aoecmd.c
@@ -30,8 +30,6 @@ new_skb(ulong len)
                 skb->nh.raw = skb->mac.raw = skb->data;
                 skb->protocol = __constant_htons(ETH_P_AOE);
                 skb->priority = 0;
-                skb_put(skb, len);
-                memset(skb->head, 0, len);
                 skb->next = skb->prev = NULL;
 
                 /* tell the network layer not to perform IP checksums
@@ -122,8 +120,8 @@ aoecmd_ata_rw(struct aoedev *d, struct frame *f)
         skb = f->skb;
         h = (struct aoe_hdr *) skb->mac.raw;
         ah = (struct aoe_atahdr *) (h+1);
-        skb->len = sizeof *h + sizeof *ah;
-        memset(h, 0, ETH_ZLEN);
+        skb_put(skb, sizeof *h + sizeof *ah);
+        memset(h, 0, skb->len);
         f->tag = aoehdr_atainit(d, h);
         f->waited = 0;
         f->buf = buf;
@@ -149,7 +147,6 @@ aoecmd_ata_rw(struct aoedev *d, struct frame *f)
                 skb->len += bcnt;
                 skb->data_len = bcnt;
         } else {
-                skb->len = ETH_ZLEN;
                 writebit = 0;
         }
 
@@ -206,6 +203,7 @@ aoecmd_cfg_pkts(ushort aoemajor, unsigned char aoeminor, struct sk_buff **tail)
                         printk(KERN_INFO "aoe: skb alloc failure\n");
                         continue;
                 }
+                skb_put(skb, sizeof *h + sizeof *ch);
                 skb->dev = ifp;
                 if (sl_tail == NULL)
                         sl_tail = skb;
@@ -243,6 +241,7 @@ freeframe(struct aoedev *d)
                         continue;
                 if (atomic_read(&skb_shinfo(f->skb)->dataref) == 1) {
                         skb_shinfo(f->skb)->nr_frags = f->skb->data_len = 0;
+                        skb_trim(f->skb, 0);
                         return f;
                 }
                 n++;
@@ -698,8 +697,8 @@ aoecmd_ata_id(struct aoedev *d)
         skb = f->skb;
         h = (struct aoe_hdr *) skb->mac.raw;
         ah = (struct aoe_atahdr *) (h+1);
-        skb->len = ETH_ZLEN;
-        memset(h, 0, ETH_ZLEN);
+        skb_put(skb, sizeof *h + sizeof *ah);
+        memset(h, 0, skb->len);
         f->tag = aoehdr_atainit(d, h);
         f->waited = 0;
 
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index d719a5d8f4..9d2ddb2093 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -1907,6 +1907,7 @@ static void cciss_geometry_inquiry(int ctlr, int logvol,
                                "does not support reading geometry\n");
                         drv->heads = 255;
                         drv->sectors = 32;      // Sectors per track
+                        drv->raid_level = RAID_UNKNOWN;
                 } else {
                         drv->heads = inq_buff->data_byte[6];
                         drv->sectors = inq_buff->data_byte[7];
@@ -2491,7 +2492,7 @@ static void do_cciss_request(request_queue_t *q)
         c->Request.Type.Type = TYPE_CMD;        // It is a command.
         c->Request.Type.Attribute = ATTR_SIMPLE;
         c->Request.Type.Direction =
-            (rq_data_dir(creq) == READ) ? h->cciss_read : h->cciss_write;
+            (rq_data_dir(creq) == READ) ? XFER_READ : XFER_WRITE;
         c->Request.Timeout = 0; // Don't time out
         c->Request.CDB[0] =
             (rq_data_dir(creq) == READ) ? h->cciss_read : h->cciss_write;
diff --git a/drivers/block/viodasd.c b/drivers/block/viodasd.c
index e19ba4ebcd..68592c3360 100644
--- a/drivers/block/viodasd.c
+++ b/drivers/block/viodasd.c
@@ -49,6 +49,7 @@
 #include <asm/iseries/hv_lp_event.h>
 #include <asm/iseries/hv_lp_config.h>
 #include <asm/iseries/vio.h>
+#include <asm/firmware.h>
 
 MODULE_DESCRIPTION("iSeries Virtual DASD");
 MODULE_AUTHOR("Dave Boutcher");
@@ -769,6 +770,11 @@ static int __init viodasd_init(void)
 {
         int rc;
 
+        if (!firmware_has_feature(FW_FEATURE_ISERIES)) {
+                rc = -ENODEV;
+                goto early_fail;
+        }
+
         /* Try to open to our host lp */
         if (viopath_hostLp == HvLpIndexInvalid)
                 vio_set_hostlp();
diff --git a/drivers/bluetooth/hci_usb.c b/drivers/bluetooth/hci_usb.c
index fdea58ae16..aeefec97fd 100644
--- a/drivers/bluetooth/hci_usb.c
+++ b/drivers/bluetooth/hci_usb.c
@@ -126,6 +126,7 @@ static struct usb_device_id blacklist_ids[] = {
 
         /* Kensington Bluetooth USB adapter */
         { USB_DEVICE(0x047d, 0x105d), .driver_info = HCI_RESET },
+        { USB_DEVICE(0x047d, 0x105e), .driver_info = HCI_WRONG_SCO_MTU },
 
         /* ISSC Bluetooth Adapter v3.1 */
         { USB_DEVICE(0x1131, 0x1001), .driver_info = HCI_RESET },
diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
index e4a2f8f3a1..66d028d304 100644
--- a/drivers/cdrom/cdrom.c
+++ b/drivers/cdrom/cdrom.c
@@ -2139,8 +2139,7 @@ static int cdrom_read_cdda_bpc(struct cdrom_device_info *cdi, __u8 __user *ubuf,
                         cdi->last_sense = s->sense_key;
                 }
 
-                rq->bio = bio;
-                if (blk_rq_unmap_user(rq))
+                if (blk_rq_unmap_user(bio))
                         ret = -EFAULT;
 
                 if (ret)
diff --git a/drivers/cdrom/viocd.c b/drivers/cdrom/viocd.c
index 54ca931e19..93fbf84dcc 100644
--- a/drivers/cdrom/viocd.c
+++ b/drivers/cdrom/viocd.c
@@ -47,6 +47,7 @@
 #include <asm/iseries/hv_types.h>
 #include <asm/iseries/hv_lp_event.h>
 #include <asm/iseries/vio.h>
+#include <asm/firmware.h>
 
 #define VIOCD_DEVICE                    "iseries/vcd"
 
@@ -748,6 +749,9 @@ static int __init viocd_init(void)
         struct proc_dir_entry *e;
         int ret = 0;
 
+        if (!firmware_has_feature(FW_FEATURE_ISERIES))
+                return -ENODEV;
+
         if (viopath_hostLp == HvLpIndexInvalid) {
                 vio_set_hostlp();
                 /* If we don't have a host, bail out */
diff --git a/drivers/char/drm/drmP.h b/drivers/char/drm/drmP.h
index 0bbb04f239..6dcdceb812 100644
--- a/drivers/char/drm/drmP.h
+++ b/drivers/char/drm/drmP.h
@@ -561,8 +561,7 @@ struct drm_driver {
         int (*context_dtor) (struct drm_device * dev, int context);
         int (*kernel_context_switch) (struct drm_device * dev, int old,
                                       int new);
-        void (*kernel_context_switch_unlock) (struct drm_device * dev,
-                                              drm_lock_t *lock);
+        void (*kernel_context_switch_unlock) (struct drm_device * dev);
         int (*vblank_wait) (struct drm_device * dev, unsigned int *sequence);
         int (*vblank_wait2) (struct drm_device * dev, unsigned int *sequence);
         int (*dri_library_name) (struct drm_device *dev, char *buf);
@@ -1143,9 +1142,5 @@ extern void *drm_calloc(size_t nmemb, size_t size, int area);
 extern unsigned long drm_core_get_map_ofs(drm_map_t * map);
 extern unsigned long drm_core_get_reg_ofs(struct drm_device *dev);
 
-#ifndef pci_pretty_name
-#define pci_pretty_name(dev) ""
-#endif
-
 #endif                          /* __KERNEL__ */
 #endif
diff --git a/drivers/char/drm/drm_lock.c b/drivers/char/drm/drm_lock.c
index 116ed0f2ac..e9993ba461 100644
--- a/drivers/char/drm/drm_lock.c
+++ b/drivers/char/drm/drm_lock.c
@@ -182,7 +182,7 @@ int drm_unlock(struct inode *inode, struct file *filp,
          * modules but is required by the Sparc driver.
          */
         if (dev->driver->kernel_context_switch_unlock)
-                dev->driver->kernel_context_switch_unlock(dev, &lock);
+                dev->driver->kernel_context_switch_unlock(dev);
         else {
                 drm_lock_transfer(dev, &dev->lock.hw_lock->lock,
                                   DRM_KERNEL_CONTEXT);
diff --git a/drivers/char/drm/drm_stub.c b/drivers/char/drm/drm_stub.c
index 5fd6dc0870..120d10256f 100644
--- a/drivers/char/drm/drm_stub.c
+++ b/drivers/char/drm/drm_stub.c
@@ -211,14 +211,16 @@ int drm_get_dev(struct pci_dev *pdev, const struct pci_device_id *ent,
         if (!dev)
                 return -ENOMEM;
 
-        pci_enable_device(pdev);
+        ret = pci_enable_device(pdev);
+        if (ret)
+                goto err_g1;
 
         if ((ret = drm_fill_in_dev(dev, pdev, ent, driver))) {
                 printk(KERN_ERR "DRM: Fill_in_dev failed.\n");
-                goto err_g1;
+                goto err_g2;
         }
         if ((ret = drm_get_head(dev, &dev->primary)))
-                goto err_g1;
+                goto err_g2;
         
         DRM_INFO("Initialized %s %d.%d.%d %s on minor %d\n",
                  driver->name, driver->major, driver->minor, driver->patchlevel,
@@ -226,7 +228,9 @@ int drm_get_dev(struct pci_dev *pdev, const struct pci_device_id *ent,
 
         return 0;
 
-      err_g1:
+err_g2:
+        pci_disable_device(pdev);
+err_g1:
         drm_free(dev, sizeof(*dev), DRM_MEM_STUB);
         return ret;
 }
diff --git a/drivers/char/drm/drm_sysfs.c b/drivers/char/drm/drm_sysfs.c
index ba4b8de83c..cc8e2ebe12 100644
--- a/drivers/char/drm/drm_sysfs.c
+++ b/drivers/char/drm/drm_sysfs.c
@@ -45,8 +45,8 @@ struct class *drm_sysfs_create(struct module *owner, char *name)
         int err;
 
         class = class_create(owner, name);
-        if (!class) {
-                err = -ENOMEM;
+        if (IS_ERR(class)) {
+                err = PTR_ERR(class);
                 goto err_out;
         }
 
@@ -113,8 +113,8 @@ struct class_device *drm_sysfs_device_add(struct class *cs, drm_head_t *head)
                                         MKDEV(DRM_MAJOR, head->minor),
                                         &(head->dev->pdev)->dev,
                                         "card%d", head->minor);
-        if (!class_dev) {
-                err = -ENOMEM;
+        if (IS_ERR(class_dev)) {
+                err = PTR_ERR(class_dev);
                 goto err_out;
         }
 
diff --git a/drivers/char/drm/i915_irq.c b/drivers/char/drm/i915_irq.c
index e5463b111f..e2c4b3a41b 100644
--- a/drivers/char/drm/i915_irq.c
+++ b/drivers/char/drm/i915_irq.c
@@ -46,88 +46,167 @@ static void i915_vblank_tasklet(drm_device_t *dev)
 {
         drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
         unsigned long irqflags;
-        struct list_head *list, *tmp;
+        struct list_head *list, *tmp, hits, *hit;
+        int nhits, nrects, slice[2], upper[2], lower[2], i;
+        unsigned counter[2] = { atomic_read(&dev->vbl_received),
+                                atomic_read(&dev->vbl_received2) };
+        drm_drawable_info_t *drw;
+        drm_i915_sarea_t *sarea_priv = dev_priv->sarea_priv;
+        u32 cpp = dev_priv->cpp;
+        u32 cmd = (cpp == 4) ? (XY_SRC_COPY_BLT_CMD |
+                                XY_SRC_COPY_BLT_WRITE_ALPHA |
+                                XY_SRC_COPY_BLT_WRITE_RGB)
+                             : XY_SRC_COPY_BLT_CMD;
+        u32 pitchropcpp = (sarea_priv->pitch * cpp) | (0xcc << 16) |
+                          (cpp << 23) | (1 << 24);
+        RING_LOCALS;
 
         DRM_DEBUG("\n");
 
+        INIT_LIST_HEAD(&hits);
+
+        nhits = nrects = 0;
+
         spin_lock_irqsave(&dev_priv->swaps_lock, irqflags);
 
+        /* Find buffer swaps scheduled for this vertical blank */
         list_for_each_safe(list, tmp, &dev_priv->vbl_swaps.head) {
                 drm_i915_vbl_swap_t *vbl_swap =
                         list_entry(list, drm_i915_vbl_swap_t, head);
-                atomic_t *counter = vbl_swap->pipe ? &dev->vbl_received2 :
-                        &dev->vbl_received;
-
-                if ((atomic_read(counter) - vbl_swap->sequence) <= (1<<23)) {
-                        drm_drawable_info_t *drw;
-
-                        spin_unlock(&dev_priv->swaps_lock);
-
-                        spin_lock(&dev->drw_lock);
-
-                        drw = drm_get_drawable_info(dev, vbl_swap->drw_id);
-                                
-                        if (drw) {
-                                int i, num_rects = drw->num_rects;
-                                drm_clip_rect_t *rect = drw->rects;
-                                drm_i915_sarea_t *sarea_priv =
-                                    dev_priv->sarea_priv;
-                                u32 cpp = dev_priv->cpp;
-                                u32 cmd = (cpp == 4) ? (XY_SRC_COPY_BLT_CMD |
-                                                        XY_SRC_COPY_BLT_WRITE_ALPHA |
-                                                        XY_SRC_COPY_BLT_WRITE_RGB)
-                                                     : XY_SRC_COPY_BLT_CMD;
-                                u32 pitchropcpp = (sarea_priv->pitch * cpp) |
-                                                  (0xcc << 16) | (cpp << 23) |
-                                                  (1 << 24);
-                                RING_LOCALS;
-
-                                i915_kernel_lost_context(dev);
-
-                                BEGIN_LP_RING(6);
-
-                                OUT_RING(GFX_OP_DRAWRECT_INFO);
-                                OUT_RING(0);
-                                OUT_RING(0);
-                                OUT_RING(sarea_priv->width |
-                                         sarea_priv->height << 16);
-                                OUT_RING(sarea_priv->width |
-                                         sarea_priv->height << 16);
-                                OUT_RING(0);
 
-                                ADVANCE_LP_RING();
+                if ((counter[vbl_swap->pipe] - vbl_swap->sequence) > (1<<23))
+                        continue;
+
+                list_del(list);
+                dev_priv->swaps_pending--;
 
-                                sarea_priv->ctxOwner = DRM_KERNEL_CONTEXT;
+                spin_unlock(&dev_priv->swaps_lock);
+                spin_lock(&dev->drw_lock);
 
-                                for (i = 0; i < num_rects; i++, rect++) {
-                                        BEGIN_LP_RING(8);
+                drw = drm_get_drawable_info(dev, vbl_swap->drw_id);
+
+                if (!drw) {
+                        spin_unlock(&dev->drw_lock);
+                        drm_free(vbl_swap, sizeof(*vbl_swap), DRM_MEM_DRIVER);
+                        spin_lock(&dev_priv->swaps_lock);
+                        continue;
+                }
 
-                                        OUT_RING(cmd);
-                                        OUT_RING(pitchropcpp);
-                                        OUT_RING((rect->y1 << 16) | rect->x1);
-                                        OUT_RING((rect->y2 << 16) | rect->x2);
-                                        OUT_RING(sarea_priv->front_offset);
-                                        OUT_RING((rect->y1 << 16) | rect->x1);
-                                        OUT_RING(pitchropcpp & 0xffff);
-                                        OUT_RING(sarea_priv->back_offset);
+                list_for_each(hit, &hits) {
+                        drm_i915_vbl_swap_t *swap_cmp =
+                                list_entry(hit, drm_i915_vbl_swap_t, head);
+                        drm_drawable_info_t *drw_cmp =
+                                drm_get_drawable_info(dev, swap_cmp->drw_id);
 
-                                        ADVANCE_LP_RING();
-                                }
+                        if (drw_cmp &&
+                            drw_cmp->rects[0].y1 > drw->rects[0].y1) {
+                                list_add_tail(list, hit);
+                                break;
                         }
+                }
 
-                        spin_unlock(&dev->drw_lock);
+                spin_unlock(&dev->drw_lock);
 
-                        spin_lock(&dev_priv->swaps_lock);
+                /* List of hits was empty, or we reached the end of it */
+                if (hit == &hits)
+                        list_add_tail(list, hits.prev);
 
-                        list_del(list);
+                nhits++;
 
-                        drm_free(vbl_swap, sizeof(*vbl_swap), DRM_MEM_DRIVER);
+                spin_lock(&dev_priv->swaps_lock);
+        }
+
+        if (nhits == 0) {
+                spin_unlock_irqrestore(&dev_priv->swaps_lock, irqflags);
+                return;
+        }
+
+        spin_unlock(&dev_priv->swaps_lock);
 
-                        dev_priv->swaps_pending--;
+        i915_kernel_lost_context(dev);
+
+        BEGIN_LP_RING(6);
+
+        OUT_RING(GFX_OP_DRAWRECT_INFO);
+        OUT_RING(0);
+        OUT_RING(0);
+        OUT_RING(sarea_priv->width | sarea_priv->height << 16);
+        OUT_RING(sarea_priv->width | sarea_priv->height << 16);
+        OUT_RING(0);
+
+        ADVANCE_LP_RING();
+
+        sarea_priv->ctxOwner = DRM_KERNEL_CONTEXT;
+
+        upper[0] = upper[1] = 0;
+        slice[0] = max(sarea_priv->pipeA_h / nhits, 1);
+        slice[1] = max(sarea_priv->pipeB_h / nhits, 1);
+        lower[0] = sarea_priv->pipeA_y + slice[0];
+        lower[1] = sarea_priv->pipeB_y + slice[0];
+
+        spin_lock(&dev->drw_lock);
+
+        /* Emit blits for buffer swaps, partitioning both outputs into as many
+         * slices as there are buffer swaps scheduled in order to avoid tearing
+         * (based on the assumption that a single buffer swap would always
+         * complete before scanout starts).
+         */
+        for (i = 0; i++ < nhits;
+             upper[0] = lower[0], lower[0] += slice[0],
+             upper[1] = lower[1], lower[1] += slice[1]) {
+                if (i == nhits)
+                        lower[0] = lower[1] = sarea_priv->height;
+
+                list_for_each(hit, &hits) {
+                        drm_i915_vbl_swap_t *swap_hit =
+                                list_entry(hit, drm_i915_vbl_swap_t, head);
+                        drm_clip_rect_t *rect;
+                        int num_rects, pipe;
+                        unsigned short top, bottom;
+
+                        drw = drm_get_drawable_info(dev, swap_hit->drw_id);
+
+                        if (!drw)
+                                continue;
+
+                        rect = drw->rects;
+                        pipe = swap_hit->pipe;
+                        top = upper[pipe];
+                        bottom = lower[pipe];
+
+                        for (num_rects = drw->num_rects; num_rects--; rect++) {
+                                int y1 = max(rect->y1, top);
+                                int y2 = min(rect->y2, bottom);
+
+                                if (y1 >= y2)
+                                        continue;
+
+                                BEGIN_LP_RING(8);
+
+                                OUT_RING(cmd);
+                                OUT_RING(pitchropcpp);
+                                OUT_RING((y1 << 16) | rect->x1);
+                                OUT_RING((y2 << 16) | rect->x2);
+                                OUT_RING(sarea_priv->front_offset);
+                                OUT_RING((y1 << 16) | rect->x1);
+                                OUT_RING(pitchropcpp & 0xffff);
+                                OUT_RING(sarea_priv->back_offset);
+
+                                ADVANCE_LP_RING();
+                        }
                 }
         }
 
-        spin_unlock_irqrestore(&dev_priv->swaps_lock, irqflags);
+        spin_unlock_irqrestore(&dev->drw_lock, irqflags);
+
+        list_for_each_safe(hit, tmp, &hits) {
+                drm_i915_vbl_swap_t *swap_hit =
+                        list_entry(hit, drm_i915_vbl_swap_t, head);
+
+                list_del(hit);
+
+                drm_free(swap_hit, sizeof(*swap_hit), DRM_MEM_DRIVER);
+        }
 }
 
 irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
diff --git a/drivers/char/drm/r128_drm.h b/drivers/char/drm/r128_drm.h
index 5d835b006f..6e8af313f2 100644
--- a/drivers/char/drm/r128_drm.h
+++ b/drivers/char/drm/r128_drm.h
@@ -1,7 +1,8 @@
 /* r128_drm.h -- Public header for the r128 driver -*- linux-c -*-
  * Created: Wed Apr  5 19:24:19 2000 by kevin@precisioninsight.com
  */
-/* Copyright 2000 Precision Insight, Inc., Cedar Park, Texas.
+/*
+ * Copyright 2000 Precision Insight, Inc., Cedar Park, Texas.
  * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
  * All rights reserved.
  *
diff --git a/drivers/char/drm/r128_drv.h b/drivers/char/drm/r128_drv.h
index 94abffb2cc..f1efb49de8 100644
--- a/drivers/char/drm/r128_drv.h
+++ b/drivers/char/drm/r128_drv.h
@@ -1,7 +1,8 @@
 /* r128_drv.h -- Private header for r128 driver -*- linux-c -*-
  * Created: Mon Dec 13 09:51:11 1999 by faith@precisioninsight.com
  */
-/* Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+/*
+ * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
  * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
  * All rights reserved.
  *
diff --git a/drivers/char/drm/r128_state.c b/drivers/char/drm/r128_state.c
index a080cdd608..17b11e7d8f 100644
--- a/drivers/char/drm/r128_state.c
+++ b/drivers/char/drm/r128_state.c
@@ -1,7 +1,8 @@
 /* r128_state.c -- State support for r128 -*- linux-c -*-
  * Created: Thu Jan 27 02:53:43 2000 by gareth@valinux.com
  */
-/* Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+/*
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
  * All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
diff --git a/drivers/char/drm/r300_cmdbuf.c b/drivers/char/drm/r300_cmdbuf.c
index d14477ba36..032a022ec6 100644
--- a/drivers/char/drm/r300_cmdbuf.c
+++ b/drivers/char/drm/r300_cmdbuf.c
@@ -242,26 +242,6 @@ static __inline__ int r300_check_range(unsigned reg, int count)
         return 0;
 }
 
-/*
- * we expect offsets passed to the framebuffer to be either within video 
- * memory or within AGP space 
- */
-static __inline__ int r300_check_offset(drm_radeon_private_t *dev_priv,
-                                        u32 offset)
-{
-        /* we realy want to check against end of video aperture
-           but this value is not being kept.
-           This code is correct for now (does the same thing as the
-           code that sets MC_FB_LOCATION) in radeon_cp.c */
-        if (offset >= dev_priv->fb_location &&
-            offset < (dev_priv->fb_location + dev_priv->fb_size))
-                return 0;
-        if (offset >= dev_priv->gart_vm_start &&
-            offset < (dev_priv->gart_vm_start + dev_priv->gart_size))
-                return 0;
-        return 1;
-}
-
 static __inline__ int r300_emit_carefully_checked_packet0(drm_radeon_private_t *
                                                           dev_priv,
                                                           drm_radeon_kcmd_buffer_t
@@ -290,7 +270,7 @@ static __inline__ int r300_emit_carefully_checked_packet0(drm_radeon_private_t *
                 case MARK_SAFE:
                         break;
                 case MARK_CHECK_OFFSET:
-                        if (r300_check_offset(dev_priv, (u32) values[i])) {
+                        if (!radeon_check_offset(dev_priv, (u32) values[i])) {
                                 DRM_ERROR
                                     ("Offset failed range check (reg=%04x sz=%d)\n",
                                      reg, sz);
@@ -452,7 +432,7 @@ static __inline__ int r300_emit_3d_load_vbpntr(drm_radeon_private_t *dev_priv,
         i = 1;
         while ((k < narrays) && (i < (count + 1))) {
                 i++;            /* skip attribute field */
-                if (r300_check_offset(dev_priv, payload[i])) {
+                if (!radeon_check_offset(dev_priv, payload[i])) {
                         DRM_ERROR
                             ("Offset failed range check (k=%d i=%d) while processing 3D_LOAD_VBPNTR packet.\n",
                              k, i);
@@ -463,7 +443,7 @@ static __inline__ int r300_emit_3d_load_vbpntr(drm_radeon_private_t *dev_priv,
                 if (k == narrays)
                         break;
                 /* have one more to process, they come in pairs */
-                if (r300_check_offset(dev_priv, payload[i])) {
+                if (!radeon_check_offset(dev_priv, payload[i])) {
                         DRM_ERROR
                             ("Offset failed range check (k=%d i=%d) while processing 3D_LOAD_VBPNTR packet.\n",
                              k, i);
@@ -508,7 +488,7 @@ static __inline__ int r300_emit_bitblt_multi(drm_radeon_private_t *dev_priv,
                 if (cmd[1] & (RADEON_GMC_SRC_PITCH_OFFSET_CNTL 
                               | RADEON_GMC_DST_PITCH_OFFSET_CNTL)) {
                         offset = cmd[2] << 10;
-                        ret = r300_check_offset(dev_priv, offset);
+                        ret = !radeon_check_offset(dev_priv, offset);
                         if (ret) {
                                 DRM_ERROR("Invalid bitblt first offset is %08X\n", offset);
                                 return DRM_ERR(EINVAL);
@@ -518,7 +498,7 @@ static __inline__ int r300_emit_bitblt_multi(drm_radeon_private_t *dev_priv,
                 if ((cmd[1] & RADEON_GMC_SRC_PITCH_OFFSET_CNTL) &&
                     (cmd[1] & RADEON_GMC_DST_PITCH_OFFSET_CNTL)) {
                         offset = cmd[3] << 10;
-                        ret = r300_check_offset(dev_priv, offset);
+                        ret = !radeon_check_offset(dev_priv, offset);
                         if (ret) {
                                 DRM_ERROR("Invalid bitblt second offset is %08X\n", offset);
                                 return DRM_ERR(EINVAL);
@@ -551,7 +531,7 @@ static __inline__ int r300_emit_indx_buffer(drm_radeon_private_t *dev_priv,
                 DRM_ERROR("Invalid indx_buffer reg address %08X\n", cmd[1]);
                 return DRM_ERR(EINVAL);
         }
-        ret = r300_check_offset(dev_priv, cmd[2]);
+        ret = !radeon_check_offset(dev_priv, cmd[2]);
         if (ret) {
                 DRM_ERROR("Invalid indx_buffer offset is %08X\n", cmd[2]);
                 return DRM_ERR(EINVAL);
diff --git a/drivers/char/drm/radeon_drv.h b/drivers/char/drm/radeon_drv.h
index f45cd7f147..8b105f1460 100644
--- a/drivers/char/drm/radeon_drv.h
+++ b/drivers/char/drm/radeon_drv.h
@@ -303,6 +303,21 @@ extern int radeon_no_wb;
 extern drm_ioctl_desc_t radeon_ioctls[];
 extern int radeon_max_ioctl;
 
+/* Check whether the given hardware address is inside the framebuffer or the
+ * GART area.
+ */
+static __inline__ int radeon_check_offset(drm_radeon_private_t *dev_priv,
+                                          u64 off)
+{
+        u32 fb_start = dev_priv->fb_location;
+        u32 fb_end = fb_start + dev_priv->fb_size - 1;
+        u32 gart_start = dev_priv->gart_vm_start;
+        u32 gart_end = gart_start + dev_priv->gart_size - 1;
+
+        return ((off >= fb_start && off <= fb_end) ||
+                (off >= gart_start && off <= gart_end));
+}
+
                                 /* radeon_cp.c */
 extern int radeon_cp_init(DRM_IOCTL_ARGS);
 extern int radeon_cp_start(DRM_IOCTL_ARGS);
diff --git a/drivers/char/drm/radeon_irq.c b/drivers/char/drm/radeon_irq.c
index d60519de88..3ff0baa2fb 100644
--- a/drivers/char/drm/radeon_irq.c
+++ b/drivers/char/drm/radeon_irq.c
@@ -1,5 +1,5 @@
-/* radeon_irq.c -- IRQ handling for radeon -*- linux-c -*-
- *
+/* radeon_irq.c -- IRQ handling for radeon -*- linux-c -*- */
+/*
  * Copyright (C) The Weather Channel, Inc.  2002.  All Rights Reserved.
  *
  * The Weather Channel (TM) funded Tungsten Graphics to develop the
diff --git a/drivers/char/drm/radeon_mem.c b/drivers/char/drm/radeon_mem.c
index 030a6fad0d..517cad8b6e 100644
--- a/drivers/char/drm/radeon_mem.c
+++ b/drivers/char/drm/radeon_mem.c
@@ -1,5 +1,5 @@
-/* radeon_mem.c -- Simple GART/fb memory manager for radeon -*- linux-c -*-
- *
+/* radeon_mem.c -- Simple GART/fb memory manager for radeon -*- linux-c -*- */
+/*
  * Copyright (C) The Weather Channel, Inc.  2002.  All Rights Reserved.
  *
  * The Weather Channel (TM) funded Tungsten Graphics to develop the
diff --git a/drivers/char/drm/radeon_state.c b/drivers/char/drm/radeon_state.c
index 6e04fdd732..938eccb78c 100644
--- a/drivers/char/drm/radeon_state.c
+++ b/drivers/char/drm/radeon_state.c
@@ -43,10 +43,7 @@ static __inline__ int radeon_check_and_fixup_offset(drm_radeon_private_t *
                                                     u32 *offset)
 {
         u64 off = *offset;
-        u32 fb_start = dev_priv->fb_location;
-        u32 fb_end = fb_start + dev_priv->fb_size - 1;
-        u32 gart_start = dev_priv->gart_vm_start;
-        u32 gart_end = gart_start + dev_priv->gart_size - 1;
+        u32 fb_end = dev_priv->fb_location + dev_priv->fb_size - 1;
         struct drm_radeon_driver_file_fields *radeon_priv;
 
         /* Hrm ... the story of the offset ... So this function converts
@@ -66,8 +63,7 @@ static __inline__ int radeon_check_and_fixup_offset(drm_radeon_private_t *
         /* First, the best case, the offset already lands in either the
          * framebuffer or the GART mapped space
          */
-        if ((off >= fb_start && off <= fb_end) ||
-            (off >= gart_start && off <= gart_end))
+        if (radeon_check_offset(dev_priv, off))
                 return 0;
 
         /* Ok, that didn't happen... now check if we have a zero based
@@ -81,11 +77,10 @@ static __inline__ int radeon_check_and_fixup_offset(drm_radeon_private_t *
 
         /* Finally, assume we aimed at a GART offset if beyond the fb */
         if (off > fb_end)
-                off = off - fb_end - 1 + gart_start;
+                off = off - fb_end - 1 + dev_priv->gart_vm_start;
 
         /* Now recheck and fail if out of bounds */
-        if ((off >= fb_start && off <= fb_end) ||
-            (off >= gart_start && off <= gart_end)) {
+        if (radeon_check_offset(dev_priv, off)) {
                 DRM_DEBUG("offset fixed up to 0x%x\n", (unsigned int)off);
                 *offset = off;
                 return 0;
diff --git a/drivers/char/drm/savage_bci.c b/drivers/char/drm/savage_bci.c
index a9a84f88df..b94fab5568 100644
--- a/drivers/char/drm/savage_bci.c
+++ b/drivers/char/drm/savage_bci.c
@@ -963,8 +963,8 @@ static int savage_bci_event_emit(DRM_IOCTL_ARGS)
 
         event.count = savage_bci_emit_event(dev_priv, event.flags);
         event.count |= dev_priv->event_wrap << 16;
-        DRM_COPY_TO_USER_IOCTL(&((drm_savage_event_emit_t __user *) data)->
-                               count, event.count, sizeof(event.count));
+        DRM_COPY_TO_USER_IOCTL((drm_savage_event_emit_t __user *) data,
+                               event, sizeof(event));
         return 0;
 }
 
diff --git a/drivers/char/rtc.c b/drivers/char/rtc.c
index e1d70e8b62..664f36c98e 100644
--- a/drivers/char/rtc.c
+++ b/drivers/char/rtc.c
@@ -113,7 +113,12 @@ static int rtc_has_irq = 1;
 #define hpet_set_rtc_irq_bit(arg)               0
 #define hpet_rtc_timer_init()                   do { } while (0)
 #define hpet_rtc_dropped_irq()                  0
-static irqreturn_t hpet_rtc_interrupt(int irq, void *dev_id) {return 0;}
+#ifdef RTC_IRQ
+static irqreturn_t hpet_rtc_interrupt(int irq, void *dev_id)
+{
+        return 0;
+}
+#endif
 #else
 extern irqreturn_t hpet_rtc_interrupt(int irq, void *dev_id);
 #endif
diff --git a/drivers/char/tlclk.c b/drivers/char/tlclk.c
index 244d30a03f..448d5083c3 100644
--- a/drivers/char/tlclk.c
+++ b/drivers/char/tlclk.c
@@ -807,8 +807,6 @@ static int __init tlclk_init(void)
                         &tlclk_attribute_group);
         if (ret) {
                 printk(KERN_ERR "tlclk: failed to create sysfs device attributes.\n");
-                sysfs_remove_group(&tlclk_device->dev.kobj,
-                        &tlclk_attribute_group);
                 goto out5;
         }
 
diff --git a/drivers/char/viocons.c b/drivers/char/viocons.c
index 0e0da443cb..8de6b95aeb 100644
--- a/drivers/char/viocons.c
+++ b/drivers/char/viocons.c
@@ -42,6 +42,7 @@
 #include <linux/tty_flip.h>
 #include <linux/sysrq.h>
 
+#include <asm/firmware.h>
 #include <asm/iseries/vio.h>
 #include <asm/iseries/hv_lp_event.h>
 #include <asm/iseries/hv_call_event.h>
@@ -1060,6 +1061,9 @@ static int __init viocons_init2(void)
         atomic_t wait_flag;
         int rc;
 
+        if (!firmware_has_feature(FW_FEATURE_ISERIES))
+                return -ENODEV;
+
         /* +2 for fudge */
         rc = viopath_open(HvLpConfig_getPrimaryLpIndex(),
                         viomajorsubtype_chario, VIOCHAR_WINDOW + 2);
@@ -1145,6 +1149,9 @@ static int __init viocons_init(void)
 {
         int i;
 
+        if (!firmware_has_feature(FW_FEATURE_ISERIES))
+                return -ENODEV;
+
         printk(VIOCONS_KERN_INFO "registering console\n");
         for (i = 0; i < VTTY_PORTS; i++) {
                 port_info[i].lp = HvLpIndexInvalid;
diff --git a/drivers/char/viotape.c b/drivers/char/viotape.c
index 94d79cb8ce..9438512b17 100644
--- a/drivers/char/viotape.c
+++ b/drivers/char/viotape.c
@@ -49,7 +49,7 @@
 
 #include <asm/uaccess.h>
 #include <asm/ioctls.h>
-
+#include <asm/firmware.h>
 #include <asm/vio.h>
 #include <asm/iseries/vio.h>
 #include <asm/iseries/hv_lp_event.h>
@@ -997,6 +997,9 @@ int __init viotap_init(void)
         int ret;
         struct proc_dir_entry *e;
 
+        if (!firmware_has_feature(FW_FEATURE_ISERIES))
+                return -ENODEV;
+
         op_struct_list = NULL;
         if ((ret = add_op_structs(VIOTAPE_MAXREQ)) < 0) {
                 printk(VIOTAPE_KERN_WARN "couldn't allocate op structs\n");
diff --git a/drivers/connector/cn_queue.c b/drivers/connector/cn_queue.c
index b418b16e91..296f51002b 100644
--- a/drivers/connector/cn_queue.c
+++ b/drivers/connector/cn_queue.c
@@ -34,7 +34,7 @@
 void cn_queue_wrapper(struct work_struct *work)
 {
         struct cn_callback_entry *cbq =
-                container_of(work, struct cn_callback_entry, work.work);
+                container_of(work, struct cn_callback_entry, work);
         struct cn_callback_data *d = &cbq->data;
 
         d->callback(d->callback_priv);
@@ -59,13 +59,12 @@ static struct cn_callback_entry *cn_queue_alloc_callback_entry(char *name, struc
         memcpy(&cbq->id.id, id, sizeof(struct cb_id));
         cbq->data.callback = callback;
         
-        INIT_DELAYED_WORK(&cbq->work, &cn_queue_wrapper);
+        INIT_WORK(&cbq->work, &cn_queue_wrapper);
         return cbq;
 }
 
 static void cn_queue_free_callback(struct cn_callback_entry *cbq)
 {
-        cancel_delayed_work(&cbq->work);
         flush_workqueue(cbq->pdev->cn_queue);
 
         kfree(cbq);
diff --git a/drivers/connector/connector.c b/drivers/connector/connector.c
index 5e7cd45d10..a44db75bc2 100644
--- a/drivers/connector/connector.c
+++ b/drivers/connector/connector.c
@@ -135,17 +135,15 @@ static int cn_call_callback(struct cn_msg *msg, void (*destruct_data)(void *), v
         spin_lock_bh(&dev->cbdev->queue_lock);
         list_for_each_entry(__cbq, &dev->cbdev->queue_list, callback_entry) {
                 if (cn_cb_equal(&__cbq->id.id, &msg->id)) {
-                        if (likely(!test_bit(WORK_STRUCT_PENDING,
-                                             &__cbq->work.work.management) &&
+                        if (likely(!work_pending(&__cbq->work) &&
                                         __cbq->data.ddata == NULL)) {
                                 __cbq->data.callback_priv = msg;
 
                                 __cbq->data.ddata = data;
                                 __cbq->data.destruct_data = destruct_data;
 
-                                if (queue_delayed_work(
-                                            dev->cbdev->cn_queue,
-                                            &__cbq->work, 0))
+                                if (queue_work(dev->cbdev->cn_queue,
+                                                        &__cbq->work))
                                         err = 0;
                         } else {
                                 struct cn_callback_data *d;
@@ -159,12 +157,11 @@ static int cn_call_callback(struct cn_msg *msg, void (*destruct_data)(void *), v
                                         d->destruct_data = destruct_data;
                                         d->free = __cbq;
 
-                                        INIT_DELAYED_WORK(&__cbq->work,
-                                                          &cn_queue_wrapper);
+                                        INIT_WORK(&__cbq->work,
+                                                        &cn_queue_wrapper);
                                         
-                                        if (queue_delayed_work(
-                                                    dev->cbdev->cn_queue,
-                                                    &__cbq->work, 0))
+                                        if (queue_work(dev->cbdev->cn_queue,
+                                                    &__cbq->work))
                                                 err = 0;
                                         else {
                                                 kfree(__cbq);
diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c
index 14cdf09316..998638020e 100644
--- a/drivers/hid/hid-input.c
+++ b/drivers/hid/hid-input.c
@@ -415,12 +415,31 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
                                 case 0x000: goto ignore;
                                 case 0x034: map_key_clear(KEY_SLEEP);           break;
                                 case 0x036: map_key_clear(BTN_MISC);            break;
+                                case 0x040: map_key_clear(KEY_MENU);            break;
                                 case 0x045: map_key_clear(KEY_RADIO);           break;
+
+                                case 0x088: map_key_clear(KEY_PC);              break;
+                                case 0x089: map_key_clear(KEY_TV);              break;
                                 case 0x08a: map_key_clear(KEY_WWW);             break;
+                                case 0x08b: map_key_clear(KEY_DVD);             break;
+                                case 0x08c: map_key_clear(KEY_PHONE);           break;
                                 case 0x08d: map_key_clear(KEY_PROGRAM);         break;
+                                case 0x08e: map_key_clear(KEY_VIDEOPHONE);      break;
+                                case 0x08f: map_key_clear(KEY_GAMES);           break;
+                                case 0x090: map_key_clear(KEY_MEMO);            break;
+                                case 0x091: map_key_clear(KEY_CD);              break;
+                                case 0x092: map_key_clear(KEY_VCR);             break;
+                                case 0x093: map_key_clear(KEY_TUNER);           break;
+                                case 0x094: map_key_clear(KEY_EXIT);            break;
                                 case 0x095: map_key_clear(KEY_HELP);            break;
+                                case 0x096: map_key_clear(KEY_TAPE);            break;
+                                case 0x097: map_key_clear(KEY_TV2);             break;
+                                case 0x098: map_key_clear(KEY_SAT);             break;
+
                                 case 0x09c: map_key_clear(KEY_CHANNELUP);       break;
                                 case 0x09d: map_key_clear(KEY_CHANNELDOWN);     break;
+                                case 0x0a0: map_key_clear(KEY_VCR2);            break;
+
                                 case 0x0b0: map_key_clear(KEY_PLAY);            break;
                                 case 0x0b1: map_key_clear(KEY_PAUSE);           break;
                                 case 0x0b2: map_key_clear(KEY_RECORD);          break;
@@ -430,6 +449,7 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
                                 case 0x0b6: map_key_clear(KEY_PREVIOUSSONG);    break;
                                 case 0x0b7: map_key_clear(KEY_STOPCD);          break;
                                 case 0x0b8: map_key_clear(KEY_EJECTCD);         break;
+
                                 case 0x0cd: map_key_clear(KEY_PLAYPAUSE);       break;
                                 case 0x0e0: map_abs_clear(ABS_VOLUME);          break;
                                 case 0x0e2: map_key_clear(KEY_MUTE);            break;
@@ -437,11 +457,30 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
                                 case 0x0e9: map_key_clear(KEY_VOLUMEUP);        break;
                                 case 0x0ea: map_key_clear(KEY_VOLUMEDOWN);      break;
                                 case 0x183: map_key_clear(KEY_CONFIG);          break;
+                                case 0x184: map_key_clear(KEY_WORDPROCESSOR);   break;
+                                case 0x185: map_key_clear(KEY_EDITOR);          break;
+                                case 0x186: map_key_clear(KEY_SPREADSHEET);     break;
+                                case 0x187: map_key_clear(KEY_GRAPHICSEDITOR);  break;
+                                case 0x188: map_key_clear(KEY_PRESENTATION);    break;
+                                case 0x189: map_key_clear(KEY_DATABASE);        break;
                                 case 0x18a: map_key_clear(KEY_MAIL);            break;
+                                case 0x18b: map_key_clear(KEY_NEWS);            break;
+                                case 0x18c: map_key_clear(KEY_VOICEMAIL);       break;
+                                case 0x18d: map_key_clear(KEY_ADDRESSBOOK);     break;
+                                case 0x18e: map_key_clear(KEY_CALENDAR);        break;
+                                case 0x191: map_key_clear(KEY_FINANCE);         break;
                                 case 0x192: map_key_clear(KEY_CALC);            break;
                                 case 0x194: map_key_clear(KEY_FILE);            break;
+                                case 0x196: map_key_clear(KEY_WWW);             break;
+                                case 0x19e: map_key_clear(KEY_COFFEE);          break;
+                                case 0x1a6: map_key_clear(KEY_HELP);            break;
                                 case 0x1a7: map_key_clear(KEY_DOCUMENTS);       break;
+                                case 0x1bc: map_key_clear(KEY_MESSENGER);       break;
+                                case 0x1bd: map_key_clear(KEY_INFO);            break;
                                 case 0x201: map_key_clear(KEY_NEW);             break;
+                                case 0x202: map_key_clear(KEY_OPEN);            break;
+                                case 0x203: map_key_clear(KEY_CLOSE);           break;
+                                case 0x204: map_key_clear(KEY_EXIT);            break;
                                 case 0x207: map_key_clear(KEY_SAVE);            break;
                                 case 0x208: map_key_clear(KEY_PRINT);           break;
                                 case 0x209: map_key_clear(KEY_PROPS);           break;
@@ -456,10 +495,15 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
                                 case 0x226: map_key_clear(KEY_STOP);            break;
                                 case 0x227: map_key_clear(KEY_REFRESH);         break;
                                 case 0x22a: map_key_clear(KEY_BOOKMARKS);       break;
+                                case 0x22d: map_key_clear(KEY_ZOOMIN);          break;
+                                case 0x22e: map_key_clear(KEY_ZOOMOUT);         break;
+                                case 0x22f: map_key_clear(KEY_ZOOMRESET);       break;
                                 case 0x233: map_key_clear(KEY_SCROLLUP);        break;
                                 case 0x234: map_key_clear(KEY_SCROLLDOWN);      break;
                                 case 0x238: map_rel(REL_HWHEEL);                break;
+                                case 0x25f: map_key_clear(KEY_CANCEL);          break;
                                 case 0x279: map_key_clear(KEY_REDO);            break;
+
                                 case 0x289: map_key_clear(KEY_REPLY);           break;
                                 case 0x28b: map_key_clear(KEY_FORWARDMAIL);     break;
                                 case 0x28c: map_key_clear(KEY_SEND);            break;
diff --git a/drivers/ide/pci/atiixp.c b/drivers/ide/pci/atiixp.c
index d55b938b1a..ffdffb6379 100644
--- a/drivers/ide/pci/atiixp.c
+++ b/drivers/ide/pci/atiixp.c
@@ -368,7 +368,6 @@ static struct pci_device_id atiixp_pci_tbl[] = {
         { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP300_IDE, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
         { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP400_IDE, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
         { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP600_IDE, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP600_SATA, PCI_ANY_ID, PCI_ANY_ID, (PCI_CLASS_STORAGE_IDE<<8)|0x8a, 0xffff05, 1},
         { 0, },
 };
 MODULE_DEVICE_TABLE(pci, atiixp_pci_tbl);
diff --git a/drivers/isdn/i4l/isdn_ppp.c b/drivers/isdn/i4l/isdn_ppp.c
index 1726131b20..4e3f127e40 100644
--- a/drivers/isdn/i4l/isdn_ppp.c
+++ b/drivers/isdn/i4l/isdn_ppp.c
@@ -2339,6 +2339,7 @@ static struct ippp_ccp_reset_state *isdn_ppp_ccp_reset_alloc_state(struct ippp_s
                 rs->state = CCPResetIdle;
                 rs->is = is;
                 rs->id = id;
+                init_timer(&rs->timer);
                 rs->timer.data = (unsigned long)rs;
                 rs->timer.function = isdn_ppp_ccp_timer_callback;
                 is->reset->rs[id] = rs;
diff --git a/drivers/kvm/kvm_main.c b/drivers/kvm/kvm_main.c
index fd1bb87054..9f24f22e4c 100644
--- a/drivers/kvm/kvm_main.c
+++ b/drivers/kvm/kvm_main.c
@@ -113,6 +113,11 @@ unsigned long segment_base(u16 selector)
 }
 EXPORT_SYMBOL_GPL(segment_base);
 
+static inline int valid_vcpu(int n)
+{
+        return likely(n >= 0 && n < KVM_MAX_VCPUS);
+}
+
 int kvm_read_guest(struct kvm_vcpu *vcpu,
                              gva_t addr,
                              unsigned long size,
@@ -494,7 +499,7 @@ static int kvm_dev_ioctl_create_vcpu(struct kvm *kvm, int n)
         struct kvm_vcpu *vcpu;
 
         r = -EINVAL;
-        if (n < 0 || n >= KVM_MAX_VCPUS)
+        if (!valid_vcpu(n))
                 goto out;
 
         vcpu = &kvm->vcpus[n];
@@ -1179,7 +1184,7 @@ static int kvm_dev_ioctl_run(struct kvm *kvm, struct kvm_run *kvm_run)
         struct kvm_vcpu *vcpu;
         int r;
 
-        if (kvm_run->vcpu < 0 || kvm_run->vcpu >= KVM_MAX_VCPUS)
+        if (!valid_vcpu(kvm_run->vcpu))
                 return -EINVAL;
 
         vcpu = vcpu_load(kvm, kvm_run->vcpu);
@@ -1208,7 +1213,7 @@ static int kvm_dev_ioctl_get_regs(struct kvm *kvm, struct kvm_regs *regs)
 {
         struct kvm_vcpu *vcpu;
 
-        if (regs->vcpu < 0 || regs->vcpu >= KVM_MAX_VCPUS)
+        if (!valid_vcpu(regs->vcpu))
                 return -EINVAL;
 
         vcpu = vcpu_load(kvm, regs->vcpu);
@@ -1254,7 +1259,7 @@ static int kvm_dev_ioctl_set_regs(struct kvm *kvm, struct kvm_regs *regs)
 {
         struct kvm_vcpu *vcpu;
 
-        if (regs->vcpu < 0 || regs->vcpu >= KVM_MAX_VCPUS)
+        if (!valid_vcpu(regs->vcpu))
                 return -EINVAL;
 
         vcpu = vcpu_load(kvm, regs->vcpu);
@@ -1301,7 +1306,7 @@ static int kvm_dev_ioctl_get_sregs(struct kvm *kvm, struct kvm_sregs *sregs)
         struct kvm_vcpu *vcpu;
         struct descriptor_table dt;
 
-        if (sregs->vcpu < 0 || sregs->vcpu >= KVM_MAX_VCPUS)
+        if (!valid_vcpu(sregs->vcpu))
                 return -EINVAL;
         vcpu = vcpu_load(kvm, sregs->vcpu);
         if (!vcpu)
@@ -1353,7 +1358,7 @@ static int kvm_dev_ioctl_set_sregs(struct kvm *kvm, struct kvm_sregs *sregs)
         int i;
         struct descriptor_table dt;
 
-        if (sregs->vcpu < 0 || sregs->vcpu >= KVM_MAX_VCPUS)
+        if (!valid_vcpu(sregs->vcpu))
                 return -EINVAL;
         vcpu = vcpu_load(kvm, sregs->vcpu);
         if (!vcpu)
@@ -1412,6 +1417,9 @@ static int kvm_dev_ioctl_set_sregs(struct kvm *kvm, struct kvm_sregs *sregs)
 /*
  * List of msr numbers which we expose to userspace through KVM_GET_MSRS
  * and KVM_SET_MSRS, and KVM_GET_MSR_INDEX_LIST.
+ *
+ * This list is modified at module load time to reflect the
+ * capabilities of the host cpu.
  */
 static u32 msrs_to_save[] = {
         MSR_IA32_SYSENTER_CS, MSR_IA32_SYSENTER_ESP, MSR_IA32_SYSENTER_EIP,
@@ -1422,6 +1430,22 @@ static u32 msrs_to_save[] = {
         MSR_IA32_TIME_STAMP_COUNTER,
 };
 
+static unsigned num_msrs_to_save;
+
+static __init void kvm_init_msr_list(void)
+{
+        u32 dummy[2];
+        unsigned i, j;
+
+        for (i = j = 0; i < ARRAY_SIZE(msrs_to_save); i++) {
+                if (rdmsr_safe(msrs_to_save[i], &dummy[0], &dummy[1]) < 0)
+                        continue;
+                if (j < i)
+                        msrs_to_save[j] = msrs_to_save[i];
+                j++;
+        }
+        num_msrs_to_save = j;
+}
 
 /*
  * Adapt set_msr() to msr_io()'s calling convention
@@ -1444,7 +1468,7 @@ static int __msr_io(struct kvm *kvm, struct kvm_msrs *msrs,
         struct kvm_vcpu *vcpu;
         int i;
 
-        if (msrs->vcpu < 0 || msrs->vcpu >= KVM_MAX_VCPUS)
+        if (!valid_vcpu(msrs->vcpu))
                 return -EINVAL;
 
         vcpu = vcpu_load(kvm, msrs->vcpu);
@@ -1537,7 +1561,7 @@ static int kvm_dev_ioctl_interrupt(struct kvm *kvm, struct kvm_interrupt *irq)
 {
         struct kvm_vcpu *vcpu;
 
-        if (irq->vcpu < 0 || irq->vcpu >= KVM_MAX_VCPUS)
+        if (!valid_vcpu(irq->vcpu))
                 return -EINVAL;
         if (irq->irq < 0 || irq->irq >= 256)
                 return -EINVAL;
@@ -1559,7 +1583,7 @@ static int kvm_dev_ioctl_debug_guest(struct kvm *kvm,
         struct kvm_vcpu *vcpu;
         int r;
 
-        if (dbg->vcpu < 0 || dbg->vcpu >= KVM_MAX_VCPUS)
+        if (!valid_vcpu(dbg->vcpu))
                 return -EINVAL;
         vcpu = vcpu_load(kvm, dbg->vcpu);
         if (!vcpu)
@@ -1579,6 +1603,9 @@ static long kvm_dev_ioctl(struct file *filp,
         int r = -EINVAL;
 
         switch (ioctl) {
+        case KVM_GET_API_VERSION:
+                r = KVM_API_VERSION;
+                break;
         case KVM_CREATE_VCPU: {
                 r = kvm_dev_ioctl_create_vcpu(kvm, arg);
                 if (r)
@@ -1730,15 +1757,15 @@ static long kvm_dev_ioctl(struct file *filp,
                 if (copy_from_user(&msr_list, user_msr_list, sizeof msr_list))
                         goto out;
                 n = msr_list.nmsrs;
-                msr_list.nmsrs = ARRAY_SIZE(msrs_to_save);
+                msr_list.nmsrs = num_msrs_to_save;
                 if (copy_to_user(user_msr_list, &msr_list, sizeof msr_list))
                         goto out;
                 r = -E2BIG;
-                if (n < ARRAY_SIZE(msrs_to_save))
+                if (n < num_msrs_to_save)
                         goto out;
                 r = -EFAULT;
                 if (copy_to_user(user_msr_list->indices, &msrs_to_save,
-                                 sizeof msrs_to_save))
+                                 num_msrs_to_save * sizeof(u32)))
                         goto out;
                 r = 0;
         }
@@ -1889,6 +1916,8 @@ static __init int kvm_init(void)
 
         kvm_init_debug();
 
+        kvm_init_msr_list();
+
         if ((bad_page = alloc_page(GFP_KERNEL)) == NULL) {
                 r = -ENOMEM;
                 goto out;
diff --git a/drivers/kvm/mmu.c b/drivers/kvm/mmu.c
index 3d367cbfe1..bdffe83b19 100644
--- a/drivers/kvm/mmu.c
+++ b/drivers/kvm/mmu.c
@@ -647,14 +647,20 @@ int kvm_mmu_init(struct kvm_vcpu *vcpu)
         ASSERT(!VALID_PAGE(vcpu->mmu.root_hpa));
         ASSERT(list_empty(&vcpu->free_pages));
 
-        if ((r = alloc_mmu_pages(vcpu)))
-                return r;
+        r = alloc_mmu_pages(vcpu);
+        if (r)
+                goto out;
+
+        r = init_kvm_mmu(vcpu);
+        if (r)
+                goto out_free_pages;
 
-        if ((r = init_kvm_mmu(vcpu))) {
-                free_mmu_pages(vcpu);
-                return r;
-        }
         return 0;
+
+out_free_pages:
+        free_mmu_pages(vcpu);
+out:
+        return r;
 }
 
 void kvm_mmu_destroy(struct kvm_vcpu *vcpu)
diff --git a/drivers/kvm/svm.c b/drivers/kvm/svm.c
index 0e6bc8c649..9ec87636de 100644
--- a/drivers/kvm/svm.c
+++ b/drivers/kvm/svm.c
@@ -402,11 +402,11 @@ static __init int svm_hardware_setup(void)
         set_msr_interception(msrpm_va, MSR_GS_BASE, 1, 1);
         set_msr_interception(msrpm_va, MSR_FS_BASE, 1, 1);
         set_msr_interception(msrpm_va, MSR_KERNEL_GS_BASE, 1, 1);
-        set_msr_interception(msrpm_va, MSR_STAR, 1, 1);
         set_msr_interception(msrpm_va, MSR_LSTAR, 1, 1);
         set_msr_interception(msrpm_va, MSR_CSTAR, 1, 1);
         set_msr_interception(msrpm_va, MSR_SYSCALL_MASK, 1, 1);
 #endif
+        set_msr_interception(msrpm_va, MSR_K6_STAR, 1, 1);
         set_msr_interception(msrpm_va, MSR_IA32_SYSENTER_CS, 1, 1);
         set_msr_interception(msrpm_va, MSR_IA32_SYSENTER_ESP, 1, 1);
         set_msr_interception(msrpm_va, MSR_IA32_SYSENTER_EIP, 1, 1);
@@ -575,6 +575,8 @@ static int svm_create_vcpu(struct kvm_vcpu *vcpu)
         memset(vcpu->svm->db_regs, 0, sizeof(vcpu->svm->db_regs));
         init_vmcb(vcpu->svm->vmcb);
 
+        fx_init(vcpu);
+
         return 0;
 
 out2:
@@ -1071,6 +1073,8 @@ static int emulate_on_interception(struct kvm_vcpu *vcpu, struct kvm_run *kvm_ru
 static int svm_get_msr(struct kvm_vcpu *vcpu, unsigned ecx, u64 *data)
 {
         switch (ecx) {
+        case MSR_IA32_P5_MC_ADDR:
+        case MSR_IA32_P5_MC_TYPE:
         case MSR_IA32_MC0_CTL:
         case MSR_IA32_MCG_STATUS:
         case MSR_IA32_MCG_CAP:
@@ -1098,10 +1102,10 @@ static int svm_get_msr(struct kvm_vcpu *vcpu, unsigned ecx, u64 *data)
         case MSR_IA32_APICBASE:
                 *data = vcpu->apic_base;
                 break;
-#ifdef CONFIG_X86_64
-        case MSR_STAR:
+        case MSR_K6_STAR:
                 *data = vcpu->svm->vmcb->save.star;
                 break;
+#ifdef CONFIG_X86_64
         case MSR_LSTAR:
                 *data = vcpu->svm->vmcb->save.lstar;
                 break;
@@ -1173,10 +1177,10 @@ static int svm_set_msr(struct kvm_vcpu *vcpu, unsigned ecx, u64 data)
         case MSR_IA32_APICBASE:
                 vcpu->apic_base = data;
                 break;
-#ifdef CONFIG_X86_64_
-        case MSR_STAR:
+        case MSR_K6_STAR:
                 vcpu->svm->vmcb->save.star = data;
                 break;
+#ifdef CONFIG_X86_64_
         case MSR_LSTAR:
                 vcpu->svm->vmcb->save.lstar = data;
                 break;
@@ -1387,6 +1391,10 @@ again:
                 save_db_regs(vcpu->svm->host_db_regs);
                 load_db_regs(vcpu->svm->db_regs);
         }
+
+        fx_save(vcpu->host_fx_image);
+        fx_restore(vcpu->guest_fx_image);
+
         asm volatile (
 #ifdef CONFIG_X86_64
                 "push %%rbx; push %%rcx; push %%rdx;"
@@ -1496,6 +1504,9 @@ again:
 #endif
                 : "cc", "memory" );
 
+        fx_save(vcpu->guest_fx_image);
+        fx_restore(vcpu->host_fx_image);
+
         if ((vcpu->svm->vmcb->save.dr7 & 0xff))
                 load_db_regs(vcpu->svm->host_db_regs);
 
diff --git a/drivers/kvm/vmx.c b/drivers/kvm/vmx.c
index f0f0b1a781..983a15b197 100644
--- a/drivers/kvm/vmx.c
+++ b/drivers/kvm/vmx.c
@@ -359,6 +359,8 @@ static int vmx_get_msr(struct kvm_vcpu *vcpu, u32 msr_index, u64 *pdata)
         case MSR_IA32_SYSENTER_ESP:
                 data = vmcs_read32(GUEST_SYSENTER_ESP);
                 break;
+        case MSR_IA32_P5_MC_ADDR:
+        case MSR_IA32_P5_MC_TYPE:
         case MSR_IA32_MC0_CTL:
         case MSR_IA32_MCG_STATUS:
         case MSR_IA32_MCG_CAP:
@@ -726,6 +728,7 @@ static void enter_rmode(struct kvm_vcpu *vcpu)
         vmcs_write32(GUEST_SS_AR_BYTES, 0xf3);
 
         vmcs_write32(GUEST_CS_AR_BYTES, 0xf3);
+        vmcs_write32(GUEST_CS_LIMIT, 0xffff);
         vmcs_write16(GUEST_CS_SELECTOR, vmcs_readl(GUEST_CS_BASE) >> 4);
 
         fix_rmode_seg(VCPU_SREG_ES, &vcpu->rmode.es);
diff --git a/drivers/md/md.c b/drivers/md/md.c
index 21e2a7b088..d1cb45f6d6 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -1792,7 +1792,8 @@ state_store(mdk_rdev_t *rdev, const char *buf, size_t len)
                 else {
                         mddev_t *mddev = rdev->mddev;
                         kick_rdev_from_array(rdev);
-                        md_update_sb(mddev, 1);
+                        if (mddev->pers)
+                                md_update_sb(mddev, 1);
                         md_new_event(mddev);
                         err = 0;
                 }
@@ -2004,6 +2005,7 @@ static mdk_rdev_t *md_import_device(dev_t newdev, int super_format, int super_mi
 
         rdev->desc_nr = -1;
         rdev->saved_raid_disk = -1;
+        rdev->raid_disk = -1;
         rdev->flags = 0;
         rdev->data_offset = 0;
         rdev->sb_events = 0;
@@ -2233,7 +2235,6 @@ static int update_raid_disks(mddev_t *mddev, int raid_disks);
 static ssize_t
 raid_disks_store(mddev_t *mddev, const char *buf, size_t len)
 {
-        /* can only set raid_disks if array is not yet active */
         char *e;
         int rv = 0;
         unsigned long n = simple_strtoul(buf, &e, 10);
@@ -2631,7 +2632,7 @@ metadata_store(mddev_t *mddev, const char *buf, size_t len)
                 return -EINVAL;
         buf = e+1;
         minor = simple_strtoul(buf, &e, 10);
-        if (e==buf || *e != '\n')
+        if (e==buf || (*e && *e != '\n') )
                 return -EINVAL;
         if (major >= sizeof(super_types)/sizeof(super_types[0]) ||
             super_types[major].name == NULL)
@@ -3980,6 +3981,7 @@ static int set_array_info(mddev_t * mddev, mdu_array_info_t *info)
                 mddev->major_version = info->major_version;
                 mddev->minor_version = info->minor_version;
                 mddev->patch_version = info->patch_version;
+                mddev->persistent = !info->not_persistent;
                 return 0;
         }
         mddev->major_version = MD_MAJOR_VERSION;
@@ -4304,9 +4306,10 @@ static int md_ioctl(struct inode *inode, struct file *file,
          * Commands querying/configuring an existing array:
          */
         /* if we are not initialised yet, only ADD_NEW_DISK, STOP_ARRAY,
-         * RUN_ARRAY, and SET_BITMAP_FILE are allowed */
+         * RUN_ARRAY, and GET_ and SET_BITMAP_FILE are allowed */
         if (!mddev->raid_disks && cmd != ADD_NEW_DISK && cmd != STOP_ARRAY
-                        && cmd != RUN_ARRAY && cmd != SET_BITMAP_FILE) {
+                        && cmd != RUN_ARRAY && cmd != SET_BITMAP_FILE
+                        && cmd != GET_BITMAP_FILE) {
                 err = -ENODEV;
                 goto abort_unlock;
         }
diff --git a/drivers/message/i2o/exec-osm.c b/drivers/message/i2o/exec-osm.c
index a539d3b61e..5278aad92b 100644
--- a/drivers/message/i2o/exec-osm.c
+++ b/drivers/message/i2o/exec-osm.c
@@ -367,7 +367,7 @@ static int i2o_exec_remove(struct device *dev)
 
 /**
  *      i2o_exec_lct_modified - Called on LCT NOTIFY reply
- *      @work: work struct for a specific controller
+ *      @_work: work struct for a specific controller
  *
  *      This function handles asynchronus LCT NOTIFY replies. It parses the
  *      new LCT and if the buffer for the LCT was to small sends a LCT NOTIFY
diff --git a/drivers/misc/msi-laptop.c b/drivers/misc/msi-laptop.c
index fdb7153f44..8e5e07e4c1 100644
--- a/drivers/misc/msi-laptop.c
+++ b/drivers/misc/msi-laptop.c
@@ -317,7 +317,8 @@ static int __init msi_init(void)
 
         /* Register backlight stuff */
 
-        msibl_device = backlight_device_register("msi-laptop-bl", NULL, &msibl_props);
+        msibl_device = backlight_device_register("msi-laptop-bl", NULL, NULL,
+                                                &msibl_props);
         if (IS_ERR(msibl_device))
                 return PTR_ERR(msibl_device);
 
diff --git a/drivers/net/8139cp.c b/drivers/net/8139cp.c
index 458dd9f830..e2cb19b582 100644
--- a/drivers/net/8139cp.c
+++ b/drivers/net/8139cp.c
@@ -617,13 +617,15 @@ rx_next:
          * this round of polling
          */
         if (rx_work) {
+                unsigned long flags;
+
                 if (cpr16(IntrStatus) & cp_rx_intr_mask)
                         goto rx_status_loop;
 
-                local_irq_disable();
+                local_irq_save(flags);
                 cpw16_f(IntrMask, cp_intr_mask);
                 __netif_rx_complete(dev);
-                local_irq_enable();
+                local_irq_restore(flags);
 
                 return 0;       /* done */
         }
diff --git a/drivers/net/b44.c b/drivers/net/b44.c
index 474a4e3438..5eb2ec6839 100644
--- a/drivers/net/b44.c
+++ b/drivers/net/b44.c
@@ -879,12 +879,14 @@ static int b44_poll(struct net_device *netdev, int *budget)
         }
 
         if (bp->istat & ISTAT_ERRORS) {
-                spin_lock_irq(&bp->lock);
+                unsigned long flags;
+
+                spin_lock_irqsave(&bp->lock, flags);
                 b44_halt(bp);
                 b44_init_rings(bp);
                 b44_init_hw(bp, 1);
                 netif_wake_queue(bp->dev);
-                spin_unlock_irq(&bp->lock);
+                spin_unlock_irqrestore(&bp->lock, flags);
                 done = 1;
         }
 
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index 7d824cf8ee..ada5e9b998 100644
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -57,8 +57,8 @@
 
 #define DRV_MODULE_NAME         "bnx2"
 #define PFX DRV_MODULE_NAME     ": "
-#define DRV_MODULE_VERSION      "1.5.1"
-#define DRV_MODULE_RELDATE      "November 15, 2006"
+#define DRV_MODULE_VERSION      "1.5.2"
+#define DRV_MODULE_RELDATE      "December 13, 2006"
 
 #define RUN_AT(x) (jiffies + (x))
 
@@ -217,9 +217,16 @@ static inline u32 bnx2_tx_avail(struct bnx2 *bp)
         u32 diff;
 
         smp_mb();
-        diff = TX_RING_IDX(bp->tx_prod) - TX_RING_IDX(bp->tx_cons);
-        if (diff > MAX_TX_DESC_CNT)
-                diff = (diff & MAX_TX_DESC_CNT) - 1;
+
+        /* The ring uses 256 indices for 255 entries, one of them
+         * needs to be skipped.
+         */
+        diff = bp->tx_prod - bp->tx_cons;
+        if (unlikely(diff >= TX_DESC_CNT)) {
+                diff &= 0xffff;
+                if (diff == TX_DESC_CNT)
+                        diff = MAX_TX_DESC_CNT;
+        }
         return (bp->tx_ring_size - diff);
 }
 
@@ -3089,7 +3096,7 @@ bnx2_nvram_write(struct bnx2 *bp, u32 offset, u8 *data_buf,
 
         if ((align_start = (offset32 & 3))) {
                 offset32 &= ~3;
-                len32 += align_start;
+                len32 += (4 - align_start);
                 if ((rc = bnx2_nvram_read(bp, offset32, start, 4)))
                         return rc;
         }
@@ -3107,7 +3114,7 @@ bnx2_nvram_write(struct bnx2 *bp, u32 offset, u8 *data_buf,
 
         if (align_start || align_end) {
                 buf = kmalloc(len32, GFP_KERNEL);
-                if (buf == 0)
+                if (buf == NULL)
                         return -ENOMEM;
                 if (align_start) {
                         memcpy(buf, start, 4);
@@ -3998,7 +4005,7 @@ bnx2_run_loopback(struct bnx2 *bp, int loopback_mode)
         if (!skb)
                 return -ENOMEM;
         packet = skb_put(skb, pkt_size);
-        memcpy(packet, bp->mac_addr, 6);
+        memcpy(packet, bp->dev->dev_addr, 6);
         memset(packet + 6, 0x0, 8);
         for (i = 14; i < pkt_size; i++)
                 packet[i] = (unsigned char) (i & 0xff);
diff --git a/drivers/net/e1000/e1000_ethtool.c b/drivers/net/e1000/e1000_ethtool.c
index da459f7177..fb96c87f9e 100644
--- a/drivers/net/e1000/e1000_ethtool.c
+++ b/drivers/net/e1000/e1000_ethtool.c
@@ -100,6 +100,9 @@ static const struct e1000_stats e1000_gstrings_stats[] = {
         { "rx_csum_offload_errors", E1000_STAT(hw_csum_err) },
         { "rx_header_split", E1000_STAT(rx_hdr_split) },
         { "alloc_rx_buff_failed", E1000_STAT(alloc_rx_buff_failed) },
+        { "tx_smbus", E1000_STAT(stats.mgptc) },
+        { "rx_smbus", E1000_STAT(stats.mgprc) },
+        { "dropped_smbus", E1000_STAT(stats.mgpdc) },
 };
 
 #define E1000_QUEUE_STATS_LEN 0
diff --git a/drivers/net/e1000/e1000_hw.c b/drivers/net/e1000/e1000_hw.c
index 3655d902b0..9be4469930 100644
--- a/drivers/net/e1000/e1000_hw.c
+++ b/drivers/net/e1000/e1000_hw.c
@@ -308,141 +308,160 @@ e1000_phy_init_script(struct e1000_hw *hw)
 int32_t
 e1000_set_mac_type(struct e1000_hw *hw)
 {
-    DEBUGFUNC("e1000_set_mac_type");
-
-    switch (hw->device_id) {
-    case E1000_DEV_ID_82542:
-        switch (hw->revision_id) {
-        case E1000_82542_2_0_REV_ID:
-            hw->mac_type = e1000_82542_rev2_0;
-            break;
-        case E1000_82542_2_1_REV_ID:
-            hw->mac_type = e1000_82542_rev2_1;
-            break;
-        default:
-            /* Invalid 82542 revision ID */
-            return -E1000_ERR_MAC_TYPE;
-        }
-        break;
-    case E1000_DEV_ID_82543GC_FIBER:
-    case E1000_DEV_ID_82543GC_COPPER:
-        hw->mac_type = e1000_82543;
-        break;
-    case E1000_DEV_ID_82544EI_COPPER:
-    case E1000_DEV_ID_82544EI_FIBER:
-    case E1000_DEV_ID_82544GC_COPPER:
-    case E1000_DEV_ID_82544GC_LOM:
-        hw->mac_type = e1000_82544;
-        break;
-    case E1000_DEV_ID_82540EM:
-    case E1000_DEV_ID_82540EM_LOM:
-    case E1000_DEV_ID_82540EP:
-    case E1000_DEV_ID_82540EP_LOM:
-    case E1000_DEV_ID_82540EP_LP:
-        hw->mac_type = e1000_82540;
-        break;
-    case E1000_DEV_ID_82545EM_COPPER:
-    case E1000_DEV_ID_82545EM_FIBER:
-        hw->mac_type = e1000_82545;
-        break;
-    case E1000_DEV_ID_82545GM_COPPER:
-    case E1000_DEV_ID_82545GM_FIBER:
-    case E1000_DEV_ID_82545GM_SERDES:
-        hw->mac_type = e1000_82545_rev_3;
-        break;
-    case E1000_DEV_ID_82546EB_COPPER:
-    case E1000_DEV_ID_82546EB_FIBER:
-    case E1000_DEV_ID_82546EB_QUAD_COPPER:
-        hw->mac_type = e1000_82546;
-        break;
-    case E1000_DEV_ID_82546GB_COPPER:
-    case E1000_DEV_ID_82546GB_FIBER:
-    case E1000_DEV_ID_82546GB_SERDES:
-    case E1000_DEV_ID_82546GB_PCIE:
-    case E1000_DEV_ID_82546GB_QUAD_COPPER:
-    case E1000_DEV_ID_82546GB_QUAD_COPPER_KSP3:
-        hw->mac_type = e1000_82546_rev_3;
-        break;
-    case E1000_DEV_ID_82541EI:
-    case E1000_DEV_ID_82541EI_MOBILE:
-    case E1000_DEV_ID_82541ER_LOM:
-        hw->mac_type = e1000_82541;
-        break;
-    case E1000_DEV_ID_82541ER:
-    case E1000_DEV_ID_82541GI:
-    case E1000_DEV_ID_82541GI_LF:
-    case E1000_DEV_ID_82541GI_MOBILE:
-        hw->mac_type = e1000_82541_rev_2;
-        break;
-    case E1000_DEV_ID_82547EI:
-    case E1000_DEV_ID_82547EI_MOBILE:
-        hw->mac_type = e1000_82547;
-        break;
-    case E1000_DEV_ID_82547GI:
-        hw->mac_type = e1000_82547_rev_2;
-        break;
-    case E1000_DEV_ID_82571EB_COPPER:
-    case E1000_DEV_ID_82571EB_FIBER:
-    case E1000_DEV_ID_82571EB_SERDES:
-    case E1000_DEV_ID_82571EB_QUAD_COPPER:
-    case E1000_DEV_ID_82571EB_QUAD_COPPER_LOWPROFILE:
-            hw->mac_type = e1000_82571;
-        break;
-    case E1000_DEV_ID_82572EI_COPPER:
-    case E1000_DEV_ID_82572EI_FIBER:
-    case E1000_DEV_ID_82572EI_SERDES:
-    case E1000_DEV_ID_82572EI:
-        hw->mac_type = e1000_82572;
-        break;
-    case E1000_DEV_ID_82573E:
-    case E1000_DEV_ID_82573E_IAMT:
-    case E1000_DEV_ID_82573L:
-        hw->mac_type = e1000_82573;
-        break;
-    case E1000_DEV_ID_80003ES2LAN_COPPER_SPT:
-    case E1000_DEV_ID_80003ES2LAN_SERDES_SPT:
-    case E1000_DEV_ID_80003ES2LAN_COPPER_DPT:
-    case E1000_DEV_ID_80003ES2LAN_SERDES_DPT:
-        hw->mac_type = e1000_80003es2lan;
-        break;
-    case E1000_DEV_ID_ICH8_IGP_M_AMT:
-    case E1000_DEV_ID_ICH8_IGP_AMT:
-    case E1000_DEV_ID_ICH8_IGP_C:
-    case E1000_DEV_ID_ICH8_IFE:
-    case E1000_DEV_ID_ICH8_IFE_GT:
-    case E1000_DEV_ID_ICH8_IFE_G:
-    case E1000_DEV_ID_ICH8_IGP_M:
-        hw->mac_type = e1000_ich8lan;
-        break;
-    default:
-        /* Should never have loaded on this device */
-        return -E1000_ERR_MAC_TYPE;
-    }
-
-    switch (hw->mac_type) {
-    case e1000_ich8lan:
-        hw->swfwhw_semaphore_present = TRUE;
-        hw->asf_firmware_present = TRUE;
-        break;
-    case e1000_80003es2lan:
-        hw->swfw_sync_present = TRUE;
-        /* fall through */
-    case e1000_82571:
-    case e1000_82572:
-    case e1000_82573:
-        hw->eeprom_semaphore_present = TRUE;
-        /* fall through */
-    case e1000_82541:
-    case e1000_82547:
-    case e1000_82541_rev_2:
-    case e1000_82547_rev_2:
-        hw->asf_firmware_present = TRUE;
-        break;
-    default:
-        break;
-    }
-
-    return E1000_SUCCESS;
+        DEBUGFUNC("e1000_set_mac_type");
+
+        switch (hw->device_id) {
+        case E1000_DEV_ID_82542:
+                switch (hw->revision_id) {
+                case E1000_82542_2_0_REV_ID:
+                        hw->mac_type = e1000_82542_rev2_0;
+                        break;
+                case E1000_82542_2_1_REV_ID:
+                        hw->mac_type = e1000_82542_rev2_1;
+                        break;
+                default:
+                        /* Invalid 82542 revision ID */
+                        return -E1000_ERR_MAC_TYPE;
+                }
+                break;
+        case E1000_DEV_ID_82543GC_FIBER:
+        case E1000_DEV_ID_82543GC_COPPER:
+                hw->mac_type = e1000_82543;
+                break;
+        case E1000_DEV_ID_82544EI_COPPER:
+        case E1000_DEV_ID_82544EI_FIBER:
+        case E1000_DEV_ID_82544GC_COPPER:
+        case E1000_DEV_ID_82544GC_LOM:
+                hw->mac_type = e1000_82544;
+                break;
+        case E1000_DEV_ID_82540EM:
+        case E1000_DEV_ID_82540EM_LOM:
+        case E1000_DEV_ID_82540EP:
+        case E1000_DEV_ID_82540EP_LOM:
+        case E1000_DEV_ID_82540EP_LP:
+                hw->mac_type = e1000_82540;
+                break;
+        case E1000_DEV_ID_82545EM_COPPER:
+        case E1000_DEV_ID_82545EM_FIBER:
+                hw->mac_type = e1000_82545;
+                break;
+        case E1000_DEV_ID_82545GM_COPPER:
+        case E1000_DEV_ID_82545GM_FIBER:
+        case E1000_DEV_ID_82545GM_SERDES:
+                hw->mac_type = e1000_82545_rev_3;
+                break;
+        case E1000_DEV_ID_82546EB_COPPER:
+        case E1000_DEV_ID_82546EB_FIBER:
+        case E1000_DEV_ID_82546EB_QUAD_COPPER:
+                hw->mac_type = e1000_82546;
+                break;
+        case E1000_DEV_ID_82546GB_COPPER:
+        case E1000_DEV_ID_82546GB_FIBER:
+        case E1000_DEV_ID_82546GB_SERDES:
+        case E1000_DEV_ID_82546GB_PCIE:
+        case E1000_DEV_ID_82546GB_QUAD_COPPER:
+        case E1000_DEV_ID_82546GB_QUAD_COPPER_KSP3:
+                hw->mac_type = e1000_82546_rev_3;
+                break;
+        case E1000_DEV_ID_82541EI:
+        case E1000_DEV_ID_82541EI_MOBILE:
+        case E1000_DEV_ID_82541ER_LOM:
+                hw->mac_type = e1000_82541;
+                break;
+        case E1000_DEV_ID_82541ER:
+        case E1000_DEV_ID_82541GI:
+        case E1000_DEV_ID_82541GI_LF:
+        case E1000_DEV_ID_82541GI_MOBILE:
+                hw->mac_type = e1000_82541_rev_2;
+                break;
+        case E1000_DEV_ID_82547EI:
+        case E1000_DEV_ID_82547EI_MOBILE:
+                hw->mac_type = e1000_82547;
+                break;
+        case E1000_DEV_ID_82547GI:
+                hw->mac_type = e1000_82547_rev_2;
+                break;
+        case E1000_DEV_ID_82571EB_COPPER:
+        case E1000_DEV_ID_82571EB_FIBER:
+        case E1000_DEV_ID_82571EB_SERDES:
+        case E1000_DEV_ID_82571EB_QUAD_COPPER:
+        case E1000_DEV_ID_82571EB_QUAD_COPPER_LOWPROFILE:
+                hw->mac_type = e1000_82571;
+                break;
+        case E1000_DEV_ID_82572EI_COPPER:
+        case E1000_DEV_ID_82572EI_FIBER:
+        case E1000_DEV_ID_82572EI_SERDES:
+        case E1000_DEV_ID_82572EI:
+                hw->mac_type = e1000_82572;
+                break;
+        case E1000_DEV_ID_82573E:
+        case E1000_DEV_ID_82573E_IAMT:
+        case E1000_DEV_ID_82573L:
+                hw->mac_type = e1000_82573;
+                break;
+        case E1000_DEV_ID_80003ES2LAN_COPPER_SPT:
+        case E1000_DEV_ID_80003ES2LAN_SERDES_SPT:
+        case E1000_DEV_ID_80003ES2LAN_COPPER_DPT:
+        case E1000_DEV_ID_80003ES2LAN_SERDES_DPT:
+                hw->mac_type = e1000_80003es2lan;
+                break;
+        case E1000_DEV_ID_ICH8_IGP_M_AMT:
+        case E1000_DEV_ID_ICH8_IGP_AMT:
+        case E1000_DEV_ID_ICH8_IGP_C:
+        case E1000_DEV_ID_ICH8_IFE:
+        case E1000_DEV_ID_ICH8_IFE_GT:
+        case E1000_DEV_ID_ICH8_IFE_G:
+        case E1000_DEV_ID_ICH8_IGP_M:
+                hw->mac_type = e1000_ich8lan;
+                break;
+        default:
+                /* Should never have loaded on this device */
+                return -E1000_ERR_MAC_TYPE;
+        }
+
+        switch (hw->mac_type) {
+        case e1000_ich8lan:
+                hw->swfwhw_semaphore_present = TRUE;
+                hw->asf_firmware_present = TRUE;
+                break;
+        case e1000_80003es2lan:
+                hw->swfw_sync_present = TRUE;
+                /* fall through */
+        case e1000_82571:
+        case e1000_82572:
+        case e1000_82573:
+                hw->eeprom_semaphore_present = TRUE;
+                /* fall through */
+        case e1000_82541:
+        case e1000_82547:
+        case e1000_82541_rev_2:
+        case e1000_82547_rev_2:
+                hw->asf_firmware_present = TRUE;
+                break;
+        default:
+                break;
+        }
+
+        /* The 82543 chip does not count tx_carrier_errors properly in
+         * FD mode
+         */
+        if (hw->mac_type == e1000_82543)
+                hw->bad_tx_carr_stats_fd = TRUE;
+
+        /* capable of receiving management packets to the host */
+        if (hw->mac_type >= e1000_82571)
+                hw->has_manc2h = TRUE;
+
+        /* In rare occasions, ESB2 systems would end up started without
+         * the RX unit being turned on.
+         */
+        if (hw->mac_type == e1000_80003es2lan)
+                hw->rx_needs_kicking = TRUE;
+
+        if (hw->mac_type > e1000_82544)
+                hw->has_smbus = TRUE;
+
+        return E1000_SUCCESS;
 }
 
 /*****************************************************************************
@@ -6575,7 +6594,7 @@ e1000_get_bus_info(struct e1000_hw *hw)
     switch (hw->mac_type) {
     case e1000_82542_rev2_0:
     case e1000_82542_rev2_1:
-        hw->bus_type = e1000_bus_type_unknown;
+        hw->bus_type = e1000_bus_type_pci;
         hw->bus_speed = e1000_bus_speed_unknown;
         hw->bus_width = e1000_bus_width_unknown;
         break;
@@ -7817,9 +7836,8 @@ e1000_enable_mng_pass_thru(struct e1000_hw *hw)
             fwsm = E1000_READ_REG(hw, FWSM);
             factps = E1000_READ_REG(hw, FACTPS);
 
-            if (((fwsm & E1000_FWSM_MODE_MASK) ==
-                (e1000_mng_mode_pt << E1000_FWSM_MODE_SHIFT)) &&
-                (factps & E1000_FACTPS_MNGCG))
+            if ((((fwsm & E1000_FWSM_MODE_MASK) >> E1000_FWSM_MODE_SHIFT) ==
+                   e1000_mng_mode_pt) && !(factps & E1000_FACTPS_MNGCG))
                 return TRUE;
         } else
             if ((manc & E1000_MANC_SMBUS_EN) && !(manc & E1000_MANC_ASF_EN))
diff --git a/drivers/net/e1000/e1000_hw.h b/drivers/net/e1000/e1000_hw.h
index 3321fb13bf..d671058833 100644
--- a/drivers/net/e1000/e1000_hw.h
+++ b/drivers/net/e1000/e1000_hw.h
@@ -1301,165 +1301,170 @@ struct e1000_ffvt_entry {
 #define E1000_82542_RSSIR       E1000_RSSIR
 #define E1000_82542_KUMCTRLSTA E1000_KUMCTRLSTA
 #define E1000_82542_SW_FW_SYNC E1000_SW_FW_SYNC
+#define E1000_82542_MANC2H      E1000_MANC2H
 
 /* Statistics counters collected by the MAC */
 struct e1000_hw_stats {
-    uint64_t crcerrs;
-    uint64_t algnerrc;
-    uint64_t symerrs;
-    uint64_t rxerrc;
-    uint64_t txerrc;
-    uint64_t mpc;
-    uint64_t scc;
-    uint64_t ecol;
-    uint64_t mcc;
-    uint64_t latecol;
-    uint64_t colc;
-    uint64_t dc;
-    uint64_t tncrs;
-    uint64_t sec;
-    uint64_t cexterr;
-    uint64_t rlec;
-    uint64_t xonrxc;
-    uint64_t xontxc;
-    uint64_t xoffrxc;
-    uint64_t xofftxc;
-    uint64_t fcruc;
-    uint64_t prc64;
-    uint64_t prc127;
-    uint64_t prc255;
-    uint64_t prc511;
-    uint64_t prc1023;
-    uint64_t prc1522;
-    uint64_t gprc;
-    uint64_t bprc;
-    uint64_t mprc;
-    uint64_t gptc;
-    uint64_t gorcl;
-    uint64_t gorch;
-    uint64_t gotcl;
-    uint64_t gotch;
-    uint64_t rnbc;
-    uint64_t ruc;
-    uint64_t rfc;
-    uint64_t roc;
-    uint64_t rlerrc;
-    uint64_t rjc;
-    uint64_t mgprc;
-    uint64_t mgpdc;
-    uint64_t mgptc;
-    uint64_t torl;
-    uint64_t torh;
-    uint64_t totl;
-    uint64_t toth;
-    uint64_t tpr;
-    uint64_t tpt;
-    uint64_t ptc64;
-    uint64_t ptc127;
-    uint64_t ptc255;
-    uint64_t ptc511;
-    uint64_t ptc1023;
-    uint64_t ptc1522;
-    uint64_t mptc;
-    uint64_t bptc;
-    uint64_t tsctc;
-    uint64_t tsctfc;
-    uint64_t iac;
-    uint64_t icrxptc;
-    uint64_t icrxatc;
-    uint64_t ictxptc;
-    uint64_t ictxatc;
-    uint64_t ictxqec;
-    uint64_t ictxqmtc;
-    uint64_t icrxdmtc;
-    uint64_t icrxoc;
+        uint64_t                crcerrs;
+        uint64_t                algnerrc;
+        uint64_t                symerrs;
+        uint64_t                rxerrc;
+        uint64_t                txerrc;
+        uint64_t                mpc;
+        uint64_t                scc;
+        uint64_t                ecol;
+        uint64_t                mcc;
+        uint64_t                latecol;
+        uint64_t                colc;
+        uint64_t                dc;
+        uint64_t                tncrs;
+        uint64_t                sec;
+        uint64_t                cexterr;
+        uint64_t                rlec;
+        uint64_t                xonrxc;
+        uint64_t                xontxc;
+        uint64_t                xoffrxc;
+        uint64_t                xofftxc;
+        uint64_t                fcruc;
+        uint64_t                prc64;
+        uint64_t                prc127;
+        uint64_t                prc255;
+        uint64_t                prc511;
+        uint64_t                prc1023;
+        uint64_t                prc1522;
+        uint64_t                gprc;
+        uint64_t                bprc;
+        uint64_t                mprc;
+        uint64_t                gptc;
+        uint64_t                gorcl;
+        uint64_t                gorch;
+        uint64_t                gotcl;
+        uint64_t                gotch;
+        uint64_t                rnbc;
+        uint64_t                ruc;
+        uint64_t                rfc;
+        uint64_t                roc;
+        uint64_t                rlerrc;
+        uint64_t                rjc;
+        uint64_t                mgprc;
+        uint64_t                mgpdc;
+        uint64_t                mgptc;
+        uint64_t                torl;
+        uint64_t                torh;
+        uint64_t                totl;
+        uint64_t                toth;
+        uint64_t                tpr;
+        uint64_t                tpt;
+        uint64_t                ptc64;
+        uint64_t                ptc127;
+        uint64_t                ptc255;
+        uint64_t                ptc511;
+        uint64_t                ptc1023;
+        uint64_t                ptc1522;
+        uint64_t                mptc;
+        uint64_t                bptc;
+        uint64_t                tsctc;
+        uint64_t                tsctfc;
+        uint64_t                iac;
+        uint64_t                icrxptc;
+        uint64_t                icrxatc;
+        uint64_t                ictxptc;
+        uint64_t                ictxatc;
+        uint64_t                ictxqec;
+        uint64_t                ictxqmtc;
+        uint64_t                icrxdmtc;
+        uint64_t                icrxoc;
 };
 
 /* Structure containing variables used by the shared code (e1000_hw.c) */
 struct e1000_hw {
-    uint8_t __iomem *hw_addr;
-    uint8_t __iomem *flash_address;
-    e1000_mac_type mac_type;
-    e1000_phy_type phy_type;
-    uint32_t phy_init_script;
-    e1000_media_type media_type;
-    void *back;
-    struct e1000_shadow_ram *eeprom_shadow_ram;
-    uint32_t flash_bank_size;
-    uint32_t flash_base_addr;
-    e1000_fc_type fc;
-    e1000_bus_speed bus_speed;
-    e1000_bus_width bus_width;
-    e1000_bus_type bus_type;
-    struct e1000_eeprom_info eeprom;
-    e1000_ms_type master_slave;
-    e1000_ms_type original_master_slave;
-    e1000_ffe_config ffe_config_state;
-    uint32_t asf_firmware_present;
-    uint32_t eeprom_semaphore_present;
-    uint32_t swfw_sync_present;
-    uint32_t swfwhw_semaphore_present;
-    unsigned long io_base;
-    uint32_t phy_id;
-    uint32_t phy_revision;
-    uint32_t phy_addr;
-    uint32_t original_fc;
-    uint32_t txcw;
-    uint32_t autoneg_failed;
-    uint32_t max_frame_size;
-    uint32_t min_frame_size;
-    uint32_t mc_filter_type;
-    uint32_t num_mc_addrs;
-    uint32_t collision_delta;
-    uint32_t tx_packet_delta;
-    uint32_t ledctl_default;
-    uint32_t ledctl_mode1;
-    uint32_t ledctl_mode2;
-    boolean_t tx_pkt_filtering;
-    struct e1000_host_mng_dhcp_cookie mng_cookie;
-    uint16_t phy_spd_default;
-    uint16_t autoneg_advertised;
-    uint16_t pci_cmd_word;
-    uint16_t fc_high_water;
-    uint16_t fc_low_water;
-    uint16_t fc_pause_time;
-    uint16_t current_ifs_val;
-    uint16_t ifs_min_val;
-    uint16_t ifs_max_val;
-    uint16_t ifs_step_size;
-    uint16_t ifs_ratio;
-    uint16_t device_id;
-    uint16_t vendor_id;
-    uint16_t subsystem_id;
-    uint16_t subsystem_vendor_id;
-    uint8_t revision_id;
-    uint8_t autoneg;
-    uint8_t mdix;
-    uint8_t forced_speed_duplex;
-    uint8_t wait_autoneg_complete;
-    uint8_t dma_fairness;
-    uint8_t mac_addr[NODE_ADDRESS_SIZE];
-    uint8_t perm_mac_addr[NODE_ADDRESS_SIZE];
-    boolean_t disable_polarity_correction;
-    boolean_t speed_downgraded;
-    e1000_smart_speed smart_speed;
-    e1000_dsp_config dsp_config_state;
-    boolean_t get_link_status;
-    boolean_t serdes_link_down;
-    boolean_t tbi_compatibility_en;
-    boolean_t tbi_compatibility_on;
-    boolean_t laa_is_present;
-    boolean_t phy_reset_disable;
-    boolean_t initialize_hw_bits_disable;
-    boolean_t fc_send_xon;
-    boolean_t fc_strict_ieee;
-    boolean_t report_tx_early;
-    boolean_t adaptive_ifs;
-    boolean_t ifs_params_forced;
-    boolean_t in_ifs_mode;
-    boolean_t mng_reg_access_disabled;
-    boolean_t leave_av_bit_off;
-    boolean_t kmrn_lock_loss_workaround_disabled;
+        uint8_t __iomem         *hw_addr;
+        uint8_t __iomem         *flash_address;
+        e1000_mac_type          mac_type;
+        e1000_phy_type          phy_type;
+        uint32_t                phy_init_script;
+        e1000_media_type        media_type;
+        void                    *back;
+        struct e1000_shadow_ram *eeprom_shadow_ram;
+        uint32_t                flash_bank_size;
+        uint32_t                flash_base_addr;
+        e1000_fc_type           fc;
+        e1000_bus_speed         bus_speed;
+        e1000_bus_width         bus_width;
+        e1000_bus_type          bus_type;
+        struct e1000_eeprom_info eeprom;
+        e1000_ms_type           master_slave;
+        e1000_ms_type           original_master_slave;
+        e1000_ffe_config        ffe_config_state;
+        uint32_t                asf_firmware_present;
+        uint32_t                eeprom_semaphore_present;
+        uint32_t                swfw_sync_present;
+        uint32_t                swfwhw_semaphore_present;
+        unsigned long           io_base;
+        uint32_t                phy_id;
+        uint32_t                phy_revision;
+        uint32_t                phy_addr;
+        uint32_t                original_fc;
+        uint32_t                txcw;
+        uint32_t                autoneg_failed;
+        uint32_t                max_frame_size;
+        uint32_t                min_frame_size;
+        uint32_t                mc_filter_type;
+        uint32_t                num_mc_addrs;
+        uint32_t                collision_delta;
+        uint32_t                tx_packet_delta;
+        uint32_t                ledctl_default;
+        uint32_t                ledctl_mode1;
+        uint32_t                ledctl_mode2;
+        boolean_t               tx_pkt_filtering;
+        struct e1000_host_mng_dhcp_cookie mng_cookie;
+        uint16_t                phy_spd_default;
+        uint16_t                autoneg_advertised;
+        uint16_t                pci_cmd_word;
+        uint16_t                fc_high_water;
+        uint16_t                fc_low_water;
+        uint16_t                fc_pause_time;
+        uint16_t                current_ifs_val;
+        uint16_t                ifs_min_val;
+        uint16_t                ifs_max_val;
+        uint16_t                ifs_step_size;
+        uint16_t                ifs_ratio;
+        uint16_t                device_id;
+        uint16_t                vendor_id;
+        uint16_t                subsystem_id;
+        uint16_t                subsystem_vendor_id;
+        uint8_t                 revision_id;
+        uint8_t                 autoneg;
+        uint8_t                 mdix;
+        uint8_t                 forced_speed_duplex;
+        uint8_t                 wait_autoneg_complete;
+        uint8_t                 dma_fairness;
+        uint8_t                 mac_addr[NODE_ADDRESS_SIZE];
+        uint8_t                 perm_mac_addr[NODE_ADDRESS_SIZE];
+        boolean_t               disable_polarity_correction;
+        boolean_t               speed_downgraded;
+        e1000_smart_speed       smart_speed;
+        e1000_dsp_config        dsp_config_state;
+        boolean_t               get_link_status;
+        boolean_t               serdes_link_down;
+        boolean_t               tbi_compatibility_en;
+        boolean_t               tbi_compatibility_on;
+        boolean_t               laa_is_present;
+        boolean_t               phy_reset_disable;
+        boolean_t               initialize_hw_bits_disable;
+        boolean_t               fc_send_xon;
+        boolean_t               fc_strict_ieee;
+        boolean_t               report_tx_early;
+        boolean_t               adaptive_ifs;
+        boolean_t               ifs_params_forced;
+        boolean_t               in_ifs_mode;
+        boolean_t               mng_reg_access_disabled;
+        boolean_t               leave_av_bit_off;
+        boolean_t               kmrn_lock_loss_workaround_disabled;
+        boolean_t               bad_tx_carr_stats_fd;
+        boolean_t               has_manc2h;
+        boolean_t               rx_needs_kicking;
+        boolean_t               has_smbus;
 };
 
 
@@ -2418,6 +2423,7 @@ struct e1000_host_command_info {
 #define E1000_PBA_8K 0x0008    /* 8KB, default Rx allocation */
 #define E1000_PBA_12K 0x000C    /* 12KB, default Rx allocation */
 #define E1000_PBA_16K 0x0010    /* 16KB, default TX allocation */
+#define E1000_PBA_20K 0x0014
 #define E1000_PBA_22K 0x0016
 #define E1000_PBA_24K 0x0018
 #define E1000_PBA_30K 0x001E
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 73f3a85fd2..4c1ff75204 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -213,6 +213,12 @@ static void e1000_netpoll (struct net_device *netdev);
 
 extern void e1000_check_options(struct e1000_adapter *adapter);
 
+#define COPYBREAK_DEFAULT 256
+static unsigned int copybreak __read_mostly = COPYBREAK_DEFAULT;
+module_param(copybreak, uint, 0644);
+MODULE_PARM_DESC(copybreak,
+        "Maximum size of packet that is copied to a new buffer on receive");
+
 static pci_ers_result_t e1000_io_error_detected(struct pci_dev *pdev,
                      pci_channel_state_t state);
 static pci_ers_result_t e1000_io_slot_reset(struct pci_dev *pdev);
@@ -264,7 +270,13 @@ e1000_init_module(void)
         printk(KERN_INFO "%s\n", e1000_copyright);
 
         ret = pci_register_driver(&e1000_driver);
-
+        if (copybreak != COPYBREAK_DEFAULT) {
+                if (copybreak == 0)
+                        printk(KERN_INFO "e1000: copybreak disabled\n");
+                else
+                        printk(KERN_INFO "e1000: copybreak enabled for "
+                               "packets <= %u bytes\n", copybreak);
+        }
         return ret;
 }
 
@@ -464,6 +476,52 @@ e1000_get_hw_control(struct e1000_adapter *adapter)
         }
 }
 
+static void
+e1000_init_manageability(struct e1000_adapter *adapter)
+{
+        if (adapter->en_mng_pt) {
+                uint32_t manc = E1000_READ_REG(&adapter->hw, MANC);
+
+                /* disable hardware interception of ARP */
+                manc &= ~(E1000_MANC_ARP_EN);
+
+                /* enable receiving management packets to the host */
+                /* this will probably generate destination unreachable messages
+                 * from the host OS, but the packets will be handled on SMBUS */
+                if (adapter->hw.has_manc2h) {
+                        uint32_t manc2h = E1000_READ_REG(&adapter->hw, MANC2H);
+
+                        manc |= E1000_MANC_EN_MNG2HOST;
+#define E1000_MNG2HOST_PORT_623 (1 << 5)
+#define E1000_MNG2HOST_PORT_664 (1 << 6)
+                        manc2h |= E1000_MNG2HOST_PORT_623;
+                        manc2h |= E1000_MNG2HOST_PORT_664;
+                        E1000_WRITE_REG(&adapter->hw, MANC2H, manc2h);
+                }
+
+                E1000_WRITE_REG(&adapter->hw, MANC, manc);
+        }
+}
+
+static void
+e1000_release_manageability(struct e1000_adapter *adapter)
+{
+        if (adapter->en_mng_pt) {
+                uint32_t manc = E1000_READ_REG(&adapter->hw, MANC);
+
+                /* re-enable hardware interception of ARP */
+                manc |= E1000_MANC_ARP_EN;
+
+                if (adapter->hw.has_manc2h)
+                        manc &= ~E1000_MANC_EN_MNG2HOST;
+
+                /* don't explicitly have to mess with MANC2H since
+                 * MANC has an enable disable that gates MANC2H */
+
+                E1000_WRITE_REG(&adapter->hw, MANC, manc);
+        }
+}
+
 int
 e1000_up(struct e1000_adapter *adapter)
 {
@@ -475,6 +533,7 @@ e1000_up(struct e1000_adapter *adapter)
         e1000_set_multi(netdev);
 
         e1000_restore_vlan(adapter);
+        e1000_init_manageability(adapter);
 
         e1000_configure_tx(adapter);
         e1000_setup_rctl(adapter);
@@ -497,7 +556,8 @@ e1000_up(struct e1000_adapter *adapter)
 
         clear_bit(__E1000_DOWN, &adapter->flags);
 
-        mod_timer(&adapter->watchdog_timer, jiffies + 2 * HZ);
+        /* fire a link change interrupt to start the watchdog */
+        E1000_WRITE_REG(&adapter->hw, ICS, E1000_ICS_LSC);
         return 0;
 }
 
@@ -614,16 +674,34 @@ e1000_reinit_locked(struct e1000_adapter *adapter)
 void
 e1000_reset(struct e1000_adapter *adapter)
 {
-        uint32_t pba, manc;
+        uint32_t pba = 0, tx_space, min_tx_space, min_rx_space;
         uint16_t fc_high_water_mark = E1000_FC_HIGH_DIFF;
+        boolean_t legacy_pba_adjust = FALSE;
 
         /* Repartition Pba for greater than 9k mtu
          * To take effect CTRL.RST is required.
          */
 
         switch (adapter->hw.mac_type) {
+        case e1000_82542_rev2_0:
+        case e1000_82542_rev2_1:
+        case e1000_82543:
+        case e1000_82544:
+        case e1000_82540:
+        case e1000_82541:
+        case e1000_82541_rev_2:
+                legacy_pba_adjust = TRUE;
+                pba = E1000_PBA_48K;
+                break;
+        case e1000_82545:
+        case e1000_82545_rev_3:
+        case e1000_82546:
+        case e1000_82546_rev_3:
+                pba = E1000_PBA_48K;
+                break;
         case e1000_82547:
         case e1000_82547_rev_2:
+                legacy_pba_adjust = TRUE;
                 pba = E1000_PBA_30K;
                 break;
         case e1000_82571:
@@ -632,27 +710,80 @@ e1000_reset(struct e1000_adapter *adapter)
                 pba = E1000_PBA_38K;
                 break;
         case e1000_82573:
-                pba = E1000_PBA_12K;
+                pba = E1000_PBA_20K;
                 break;
         case e1000_ich8lan:
                 pba = E1000_PBA_8K;
-                break;
-        default:
-                pba = E1000_PBA_48K;
+        case e1000_undefined:
+        case e1000_num_macs:
                 break;
         }
 
-        if ((adapter->hw.mac_type != e1000_82573) &&
-           (adapter->netdev->mtu > E1000_RXBUFFER_8192))
-                pba -= 8; /* allocate more FIFO for Tx */
+        if (legacy_pba_adjust == TRUE) {
+                if (adapter->netdev->mtu > E1000_RXBUFFER_8192)
+                        pba -= 8; /* allocate more FIFO for Tx */
 
+                if (adapter->hw.mac_type == e1000_82547) {
+                        adapter->tx_fifo_head = 0;
+                        adapter->tx_head_addr = pba << E1000_TX_HEAD_ADDR_SHIFT;
+                        adapter->tx_fifo_size =
+                                (E1000_PBA_40K - pba) << E1000_PBA_BYTES_SHIFT;
+                        atomic_set(&adapter->tx_fifo_stall, 0);
+                }
+        } else if (adapter->hw.max_frame_size > MAXIMUM_ETHERNET_FRAME_SIZE) {
+                /* adjust PBA for jumbo frames */
+                E1000_WRITE_REG(&adapter->hw, PBA, pba);
+
+                /* To maintain wire speed transmits, the Tx FIFO should be
+                 * large enough to accomodate two full transmit packets,
+                 * rounded up to the next 1KB and expressed in KB.  Likewise,
+                 * the Rx FIFO should be large enough to accomodate at least
+                 * one full receive packet and is similarly rounded up and
+                 * expressed in KB. */
+                pba = E1000_READ_REG(&adapter->hw, PBA);
+                /* upper 16 bits has Tx packet buffer allocation size in KB */
+                tx_space = pba >> 16;
+                /* lower 16 bits has Rx packet buffer allocation size in KB */
+                pba &= 0xffff;
+                /* don't include ethernet FCS because hardware appends/strips */
+                min_rx_space = adapter->netdev->mtu + ENET_HEADER_SIZE +
+                               VLAN_TAG_SIZE;
+                min_tx_space = min_rx_space;
+                min_tx_space *= 2;
+                E1000_ROUNDUP(min_tx_space, 1024);
+                min_tx_space >>= 10;
+                E1000_ROUNDUP(min_rx_space, 1024);
+                min_rx_space >>= 10;
+
+                /* If current Tx allocation is less than the min Tx FIFO size,
+                 * and the min Tx FIFO size is less than the current Rx FIFO
+                 * allocation, take space away from current Rx allocation */
+                if (tx_space < min_tx_space &&
+                    ((min_tx_space - tx_space) < pba)) {
+                        pba = pba - (min_tx_space - tx_space);
+
+                        /* PCI/PCIx hardware has PBA alignment constraints */
+                        switch (adapter->hw.mac_type) {
+                        case e1000_82545 ... e1000_82546_rev_3:
+                                pba &= ~(E1000_PBA_8K - 1);
+                                break;
+                        default:
+                                break;
+                        }
 
-        if (adapter->hw.mac_type == e1000_82547) {
-                adapter->tx_fifo_head = 0;
-                adapter->tx_head_addr = pba << E1000_TX_HEAD_ADDR_SHIFT;
-                adapter->tx_fifo_size =
-                        (E1000_PBA_40K - pba) << E1000_PBA_BYTES_SHIFT;
-                atomic_set(&adapter->tx_fifo_stall, 0);
+                        /* if short on rx space, rx wins and must trump tx
+                         * adjustment or use Early Receive if available */
+                        if (pba < min_rx_space) {
+                                switch (adapter->hw.mac_type) {
+                                case e1000_82573:
+                                        /* ERT enabled in e1000_configure_rx */
+                                        break;
+                                default:
+                                        pba = min_rx_space;
+                                        break;
+                                }
+                        }
+                }
         }
 
         E1000_WRITE_REG(&adapter->hw, PBA, pba);
@@ -685,6 +816,20 @@ e1000_reset(struct e1000_adapter *adapter)
         if (e1000_init_hw(&adapter->hw))
                 DPRINTK(PROBE, ERR, "Hardware Error\n");
         e1000_update_mng_vlan(adapter);
+
+        /* if (adapter->hwflags & HWFLAGS_PHY_PWR_BIT) { */
+        if (adapter->hw.mac_type >= e1000_82544 &&
+            adapter->hw.mac_type <= e1000_82547_rev_2 &&
+            adapter->hw.autoneg == 1 &&
+            adapter->hw.autoneg_advertised == ADVERTISE_1000_FULL) {
+                uint32_t ctrl = E1000_READ_REG(&adapter->hw, CTRL);
+                /* clear phy power management bit if we are in gig only mode,
+                 * which if enabled will attempt negotiation to 100Mb, which
+                 * can cause a loss of link at power off or driver unload */
+                ctrl &= ~E1000_CTRL_SWDPIN3;
+                E1000_WRITE_REG(&adapter->hw, CTRL, ctrl);
+        }
+
         /* Enable h/w to recognize an 802.1Q VLAN Ethernet packet */
         E1000_WRITE_REG(&adapter->hw, VET, ETHERNET_IEEE_VLAN_TYPE);
 
@@ -705,14 +850,7 @@ e1000_reset(struct e1000_adapter *adapter)
                                     phy_data);
         }
 
-        if ((adapter->en_mng_pt) &&
-            (adapter->hw.mac_type >= e1000_82540) &&
-            (adapter->hw.mac_type < e1000_82571) &&
-            (adapter->hw.media_type == e1000_media_type_copper)) {
-                manc = E1000_READ_REG(&adapter->hw, MANC);
-                manc |= (E1000_MANC_ARP_EN | E1000_MANC_EN_MNG2HOST);
-                E1000_WRITE_REG(&adapter->hw, MANC, manc);
-        }
+        e1000_release_manageability(adapter);
 }
 
 /**
@@ -857,6 +995,12 @@ e1000_probe(struct pci_dev *pdev,
            (adapter->hw.mac_type != e1000_82547))
                 netdev->features |= NETIF_F_TSO;
 
+#ifdef CONFIG_DEBUG_SLAB
+        /* 82544's work arounds do not play nicely with DEBUG SLAB */
+        if (adapter->hw.mac_type == e1000_82544)
+                netdev->features &= ~NETIF_F_TSO;
+#endif
+
 #ifdef NETIF_F_TSO6
         if (adapter->hw.mac_type > e1000_82547_rev_2)
                 netdev->features |= NETIF_F_TSO6;
@@ -1078,22 +1222,13 @@ e1000_remove(struct pci_dev *pdev)
 {
         struct net_device *netdev = pci_get_drvdata(pdev);
         struct e1000_adapter *adapter = netdev_priv(netdev);
-        uint32_t manc;
 #ifdef CONFIG_E1000_NAPI
         int i;
 #endif
 
         flush_scheduled_work();
 
-        if (adapter->hw.mac_type >= e1000_82540 &&
-            adapter->hw.mac_type < e1000_82571 &&
-            adapter->hw.media_type == e1000_media_type_copper) {
-                manc = E1000_READ_REG(&adapter->hw, MANC);
-                if (manc & E1000_MANC_SMBUS_EN) {
-                        manc |= E1000_MANC_ARP_EN;
-                        E1000_WRITE_REG(&adapter->hw, MANC, manc);
-                }
-        }
+        e1000_release_manageability(adapter);
 
         /* Release control of h/w to f/w.  If f/w is AMT enabled, this
          * would have already happened in close and is redundant. */
@@ -1531,9 +1666,9 @@ e1000_configure_tx(struct e1000_adapter *adapter)
         }
 
         /* Set the default values for the Tx Inter Packet Gap timer */
-
-        if (hw->media_type == e1000_media_type_fiber ||
-            hw->media_type == e1000_media_type_internal_serdes)
+        if (adapter->hw.mac_type <= e1000_82547_rev_2 &&
+            (hw->media_type == e1000_media_type_fiber ||
+             hw->media_type == e1000_media_type_internal_serdes))
                 tipg = DEFAULT_82543_TIPG_IPGT_FIBER;
         else
                 tipg = DEFAULT_82543_TIPG_IPGT_COPPER;
@@ -2528,6 +2663,13 @@ e1000_watchdog(unsigned long data)
                         netif_wake_queue(netdev);
                         mod_timer(&adapter->phy_info_timer, jiffies + 2 * HZ);
                         adapter->smartspeed = 0;
+                } else {
+                        /* make sure the receive unit is started */
+                        if (adapter->hw.rx_needs_kicking) {
+                                struct e1000_hw *hw = &adapter->hw;
+                                uint32_t rctl = E1000_READ_REG(hw, RCTL);
+                                E1000_WRITE_REG(hw, RCTL, rctl | E1000_RCTL_EN);
+                        }
                 }
         } else {
                 if (netif_carrier_ok(netdev)) {
@@ -2628,29 +2770,34 @@ static unsigned int e1000_update_itr(struct e1000_adapter *adapter,
         if (packets == 0)
                 goto update_itr_done;
 
-
         switch (itr_setting) {
         case lowest_latency:
-                if ((packets < 5) && (bytes > 512))
+                /* jumbo frames get bulk treatment*/
+                if (bytes/packets > 8000)
+                        retval = bulk_latency;
+                else if ((packets < 5) && (bytes > 512))
                         retval = low_latency;
                 break;
         case low_latency:  /* 50 usec aka 20000 ints/s */
                 if (bytes > 10000) {
-                        if ((packets < 10) ||
-                             ((bytes/packets) > 1200))
+                        /* jumbo frames need bulk latency setting */
+                        if (bytes/packets > 8000)
+                                retval = bulk_latency;
+                        else if ((packets < 10) || ((bytes/packets) > 1200))
                                 retval = bulk_latency;
                         else if ((packets > 35))
                                 retval = lowest_latency;
-                } else if (packets <= 2 && bytes < 512)
+                } else if (bytes/packets > 2000)
+                        retval = bulk_latency;
+                else if (packets <= 2 && bytes < 512)
                         retval = lowest_latency;
                 break;
         case bulk_latency: /* 250 usec aka 4000 ints/s */
                 if (bytes > 25000) {
                         if (packets > 35)
                                 retval = low_latency;
-                } else {
-                        if (bytes < 6000)
-                                retval = low_latency;
+                } else if (bytes < 6000) {
+                        retval = low_latency;
                 }
                 break;
         }
@@ -2679,17 +2826,20 @@ static void e1000_set_itr(struct e1000_adapter *adapter)
                                     adapter->tx_itr,
                                     adapter->total_tx_packets,
                                     adapter->total_tx_bytes);
+        /* conservative mode (itr 3) eliminates the lowest_latency setting */
+        if (adapter->itr_setting == 3 && adapter->tx_itr == lowest_latency)
+                adapter->tx_itr = low_latency;
+
         adapter->rx_itr = e1000_update_itr(adapter,
                                     adapter->rx_itr,
                                     adapter->total_rx_packets,
                                     adapter->total_rx_bytes);
+        /* conservative mode (itr 3) eliminates the lowest_latency setting */
+        if (adapter->itr_setting == 3 && adapter->rx_itr == lowest_latency)
+                adapter->rx_itr = low_latency;
 
         current_itr = max(adapter->rx_itr, adapter->tx_itr);
 
-        /* conservative mode eliminates the lowest_latency setting */
-        if (current_itr == lowest_latency && (adapter->itr_setting == 3))
-                current_itr = low_latency;
-
         switch (current_itr) {
         /* counts and packets in update_itr are dependent on these numbers */
         case lowest_latency:
@@ -3168,6 +3318,16 @@ e1000_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
                 if (skb->data_len && (hdr_len == (skb->len - skb->data_len))) {
                         switch (adapter->hw.mac_type) {
                                 unsigned int pull_size;
+                        case e1000_82544:
+                                /* Make sure we have room to chop off 4 bytes,
+                                 * and that the end alignment will work out to
+                                 * this hardware's requirements
+                                 * NOTE: this is a TSO only workaround
+                                 * if end byte alignment not correct move us
+                                 * into the next dword */
+                                if ((unsigned long)(skb->tail - 1) & 4)
+                                        break;
+                                /* fall through */
                         case e1000_82571:
                         case e1000_82572:
                         case e1000_82573:
@@ -3419,12 +3579,11 @@ e1000_change_mtu(struct net_device *netdev, int new_mtu)
                 adapter->rx_buffer_len = MAXIMUM_ETHERNET_VLAN_SIZE;
 
         netdev->mtu = new_mtu;
+        adapter->hw.max_frame_size = max_frame;
 
         if (netif_running(netdev))
                 e1000_reinit_locked(adapter);
 
-        adapter->hw.max_frame_size = max_frame;
-
         return 0;
 }
 
@@ -3573,6 +3732,11 @@ e1000_update_stats(struct e1000_adapter *adapter)
         adapter->net_stats.tx_aborted_errors = adapter->stats.ecol;
         adapter->net_stats.tx_window_errors = adapter->stats.latecol;
         adapter->net_stats.tx_carrier_errors = adapter->stats.tncrs;
+        if (adapter->hw.bad_tx_carr_stats_fd &&
+            adapter->link_duplex == FULL_DUPLEX) {
+                adapter->net_stats.tx_carrier_errors = 0;
+                adapter->stats.tncrs = 0;
+        }
 
         /* Tx Dropped needs to be maintained elsewhere */
 
@@ -3590,6 +3754,13 @@ e1000_update_stats(struct e1000_adapter *adapter)
                         adapter->phy_stats.receive_errors += phy_tmp;
         }
 
+        /* Management Stats */
+        if (adapter->hw.has_smbus) {
+                adapter->stats.mgptc += E1000_READ_REG(hw, MGTPTC);
+                adapter->stats.mgprc += E1000_READ_REG(hw, MGTPRC);
+                adapter->stats.mgpdc += E1000_READ_REG(hw, MGTPDC);
+        }
+
         spin_unlock_irqrestore(&adapter->stats_lock, flags);
 }
 #ifdef CONFIG_PCI_MSI
@@ -3868,11 +4039,11 @@ e1000_clean_tx_irq(struct e1000_adapter *adapter,
                         cleaned = (i == eop);
 
                         if (cleaned) {
-                                /* this packet count is wrong for TSO but has a
-                                 * tendency to make dynamic ITR change more
-                                 * towards bulk */
+                                struct sk_buff *skb = buffer_info->skb;
+                                unsigned int segs = skb_shinfo(skb)->gso_segs;
+                                total_tx_packets += segs;
                                 total_tx_packets++;
-                                total_tx_bytes += buffer_info->skb->len;
+                                total_tx_bytes += skb->len;
                         }
                         e1000_unmap_and_free_tx_resource(adapter, buffer_info);
                         tx_desc->upper.data = 0;
@@ -4094,8 +4265,7 @@ e1000_clean_rx_irq(struct e1000_adapter *adapter,
                 /* code added for copybreak, this should improve
                  * performance for small packets with large amounts
                  * of reassembly being done in the stack */
-#define E1000_CB_LENGTH 256
-                if (length < E1000_CB_LENGTH) {
+                if (length < copybreak) {
                         struct sk_buff *new_skb =
                             netdev_alloc_skb(netdev, length + NET_IP_ALIGN);
                         if (new_skb) {
@@ -4253,7 +4423,7 @@ e1000_clean_rx_irq_ps(struct e1000_adapter *adapter,
 
                 /* page alloc/put takes too long and effects small packet
                  * throughput, so unsplit small packets and save the alloc/put*/
-                if (l1 && ((length + l1) <= adapter->rx_ps_bsize0)) {
+                if (l1 && (l1 <= copybreak) && ((length + l1) <= adapter->rx_ps_bsize0)) {
                         u8 *vaddr;
                         /* there is no documentation about how to call
                          * kmap_atomic, so we can't hold the mapping
@@ -4998,7 +5168,7 @@ e1000_suspend(struct pci_dev *pdev, pm_message_t state)
 {
         struct net_device *netdev = pci_get_drvdata(pdev);
         struct e1000_adapter *adapter = netdev_priv(netdev);
-        uint32_t ctrl, ctrl_ext, rctl, manc, status;
+        uint32_t ctrl, ctrl_ext, rctl, status;
         uint32_t wufc = adapter->wol;
 #ifdef CONFIG_PM
         int retval = 0;
@@ -5067,16 +5237,12 @@ e1000_suspend(struct pci_dev *pdev, pm_message_t state)
                 pci_enable_wake(pdev, PCI_D3cold, 0);
         }
 
-        if (adapter->hw.mac_type >= e1000_82540 &&
-            adapter->hw.mac_type < e1000_82571 &&
-            adapter->hw.media_type == e1000_media_type_copper) {
-                manc = E1000_READ_REG(&adapter->hw, MANC);
-                if (manc & E1000_MANC_SMBUS_EN) {
-                        manc |= E1000_MANC_ARP_EN;
-                        E1000_WRITE_REG(&adapter->hw, MANC, manc);
-                        pci_enable_wake(pdev, PCI_D3hot, 1);
-                        pci_enable_wake(pdev, PCI_D3cold, 1);
-                }
+        e1000_release_manageability(adapter);
+
+        /* make sure adapter isn't asleep if manageability is enabled */
+        if (adapter->en_mng_pt) {
+                pci_enable_wake(pdev, PCI_D3hot, 1);
+                pci_enable_wake(pdev, PCI_D3cold, 1);
         }
 
         if (adapter->hw.phy_type == e1000_phy_igp_3)
@@ -5102,7 +5268,7 @@ e1000_resume(struct pci_dev *pdev)
 {
         struct net_device *netdev = pci_get_drvdata(pdev);
         struct e1000_adapter *adapter = netdev_priv(netdev);
-        uint32_t manc, err;
+        uint32_t err;
 
         pci_set_power_state(pdev, PCI_D0);
         e1000_pci_restore_state(adapter);
@@ -5122,19 +5288,13 @@ e1000_resume(struct pci_dev *pdev)
         e1000_reset(adapter);
         E1000_WRITE_REG(&adapter->hw, WUS, ~0);
 
+        e1000_init_manageability(adapter);
+
         if (netif_running(netdev))
                 e1000_up(adapter);
 
         netif_device_attach(netdev);
 
-        if (adapter->hw.mac_type >= e1000_82540 &&
-            adapter->hw.mac_type < e1000_82571 &&
-            adapter->hw.media_type == e1000_media_type_copper) {
-                manc = E1000_READ_REG(&adapter->hw, MANC);
-                manc &= ~(E1000_MANC_ARP_EN);
-                E1000_WRITE_REG(&adapter->hw, MANC, manc);
-        }
-
         /* If the controller is 82573 and f/w is AMT, do not set
          * DRV_LOAD until the interface is up.  For all other cases,
          * let the f/w know that the h/w is now under the control
@@ -5235,7 +5395,8 @@ static void e1000_io_resume(struct pci_dev *pdev)
 {
         struct net_device *netdev = pci_get_drvdata(pdev);
         struct e1000_adapter *adapter = netdev->priv;
-        uint32_t manc, swsm;
+
+        e1000_init_manageability(adapter);
 
         if (netif_running(netdev)) {
                 if (e1000_up(adapter)) {
@@ -5246,26 +5407,14 @@ static void e1000_io_resume(struct pci_dev *pdev)
 
         netif_device_attach(netdev);
 
-        if (adapter->hw.mac_type >= e1000_82540 &&
-            adapter->hw.mac_type < e1000_82571 &&
-            adapter->hw.media_type == e1000_media_type_copper) {
-                manc = E1000_READ_REG(&adapter->hw, MANC);
-                manc &= ~(E1000_MANC_ARP_EN);
-                E1000_WRITE_REG(&adapter->hw, MANC, manc);
-        }
-
-        switch (adapter->hw.mac_type) {
-        case e1000_82573:
-                swsm = E1000_READ_REG(&adapter->hw, SWSM);
-                E1000_WRITE_REG(&adapter->hw, SWSM,
-                                swsm | E1000_SWSM_DRV_LOAD);
-                break;
-        default:
-                break;
-        }
+        /* If the controller is 82573 and f/w is AMT, do not set
+         * DRV_LOAD until the interface is up.  For all other cases,
+         * let the f/w know that the h/w is now under the control
+         * of the driver. */
+        if (adapter->hw.mac_type != e1000_82573 ||
+            !e1000_check_mng_mode(&adapter->hw))
+                e1000_get_hw_control(adapter);
 
-        if (netif_running(netdev))
-                mod_timer(&adapter->watchdog_timer, jiffies);
 }
 
 /* e1000_main.c */
diff --git a/drivers/net/e1000/e1000_param.c b/drivers/net/e1000/e1000_param.c
index cbfcd7f288..cf2a279307 100644
--- a/drivers/net/e1000/e1000_param.c
+++ b/drivers/net/e1000/e1000_param.c
@@ -487,7 +487,9 @@ e1000_check_options(struct e1000_adapter *adapter)
                                 e1000_validate_option(&adapter->itr, &opt,
                                         adapter);
                                 /* save the setting, because the dynamic bits change itr */
-                                adapter->itr_setting = adapter->itr;
+                                /* clear the lower two bits because they are
+                                 * used as control */
+                                adapter->itr_setting = adapter->itr & ~3;
                                 break;
                         }
                 } else {
diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c
index 439f413382..820f8c7984 100644
--- a/drivers/net/forcedeth.c
+++ b/drivers/net/forcedeth.c
@@ -2576,14 +2576,15 @@ static int nv_napi_poll(struct net_device *dev, int *budget)
         int pkts, limit = min(*budget, dev->quota);
         struct fe_priv *np = netdev_priv(dev);
         u8 __iomem *base = get_hwbase(dev);
+        unsigned long flags;
 
         pkts = nv_rx_process(dev, limit);
 
         if (nv_alloc_rx(dev)) {
-                spin_lock_irq(&np->lock);
+                spin_lock_irqsave(&np->lock, flags);
                 if (!np->in_shutdown)
                         mod_timer(&np->oom_kick, jiffies + OOM_REFILL);
-                spin_unlock_irq(&np->lock);
+                spin_unlock_irqrestore(&np->lock, flags);
         }
 
         if (pkts < limit) {
@@ -2591,13 +2592,15 @@ static int nv_napi_poll(struct net_device *dev, int *budget)
                 netif_rx_complete(dev);
 
                 /* re-enable receive interrupts */
-                spin_lock_irq(&np->lock);
+                spin_lock_irqsave(&np->lock, flags);
+
                 np->irqmask |= NVREG_IRQ_RX_ALL;
                 if (np->msi_flags & NV_MSI_X_ENABLED)
                         writel(NVREG_IRQ_RX_ALL, base + NvRegIrqMask);
                 else
                         writel(np->irqmask, base + NvRegIrqMask);
-                spin_unlock_irq(&np->lock);
+
+                spin_unlock_irqrestore(&np->lock, flags);
                 return 0;
         } else {
                 /* used up our quantum, so reschedule */
diff --git a/drivers/net/iseries_veth.c b/drivers/net/iseries_veth.c
index d6f4f185bf..2194b56723 100644
--- a/drivers/net/iseries_veth.c
+++ b/drivers/net/iseries_veth.c
@@ -73,7 +73,7 @@
 #include <asm/abs_addr.h>
 #include <asm/iseries/mf.h>
 #include <asm/uaccess.h>
-
+#include <asm/firmware.h>
 #include <asm/iseries/hv_lp_config.h>
 #include <asm/iseries/hv_types.h>
 #include <asm/iseries/hv_lp_event.h>
@@ -1668,7 +1668,7 @@ static struct vio_driver veth_driver = {
  * Module initialization/cleanup
  */
 
-void __exit veth_module_cleanup(void)
+static void __exit veth_module_cleanup(void)
 {
         int i;
         struct veth_lpar_connection *cnx;
@@ -1697,11 +1697,14 @@ void __exit veth_module_cleanup(void)
 }
 module_exit(veth_module_cleanup);
 
-int __init veth_module_init(void)
+static int __init veth_module_init(void)
 {
         int i;
         int rc;
 
+        if (!firmware_has_feature(FW_FEATURE_ISERIES))
+                return -ENODEV;
+
         this_lp = HvLpConfig_getLpIndex_outline();
 
         for (i = 0; i < HVMAXARCHITECTEDLPS; ++i) {
diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c
index 94ac168be5..07cf574197 100644
--- a/drivers/net/myri10ge/myri10ge.c
+++ b/drivers/net/myri10ge/myri10ge.c
@@ -199,8 +199,6 @@ struct myri10ge_priv {
         unsigned long serial_number;
         int vendor_specific_offset;
         int fw_multicast_support;
-        u32 devctl;
-        u16 msi_flags;
         u32 read_dma;
         u32 write_dma;
         u32 read_write_dma;
@@ -228,7 +226,7 @@ module_param(myri10ge_small_bytes, int, S_IRUGO | S_IWUSR);
 MODULE_PARM_DESC(myri10ge_small_bytes, "Threshold of small packets\n");
 
 static int myri10ge_msi = 1;    /* enable msi by default */
-module_param(myri10ge_msi, int, S_IRUGO);
+module_param(myri10ge_msi, int, S_IRUGO | S_IWUSR);
 MODULE_PARM_DESC(myri10ge_msi, "Enable Message Signalled Interrupts\n");
 
 static int myri10ge_intr_coal_delay = 25;
@@ -721,12 +719,10 @@ static int myri10ge_reset(struct myri10ge_priv *mgp)
         status |=
             myri10ge_send_cmd(mgp, MXGEFW_CMD_GET_IRQ_ACK_OFFSET, &cmd, 0);
         mgp->irq_claim = (__iomem __be32 *) (mgp->sram + cmd.data0);
-        if (!mgp->msi_enabled) {
-                status |= myri10ge_send_cmd
-                    (mgp, MXGEFW_CMD_GET_IRQ_DEASSERT_OFFSET, &cmd, 0);
-                mgp->irq_deassert = (__iomem __be32 *) (mgp->sram + cmd.data0);
+        status |= myri10ge_send_cmd(mgp, MXGEFW_CMD_GET_IRQ_DEASSERT_OFFSET,
+                                    &cmd, 0);
+        mgp->irq_deassert = (__iomem __be32 *) (mgp->sram + cmd.data0);
 
-        }
         status |= myri10ge_send_cmd
             (mgp, MXGEFW_CMD_GET_INTR_COAL_DELAY_OFFSET, &cmd, 0);
         mgp->intr_coal_delay_ptr = (__iomem __be32 *) (mgp->sram + cmd.data0);
@@ -1619,6 +1615,41 @@ static void myri10ge_free_rings(struct net_device *dev)
         mgp->tx.req_list = NULL;
 }
 
+static int myri10ge_request_irq(struct myri10ge_priv *mgp)
+{
+        struct pci_dev *pdev = mgp->pdev;
+        int status;
+
+        if (myri10ge_msi) {
+                status = pci_enable_msi(pdev);
+                if (status != 0)
+                        dev_err(&pdev->dev,
+                                "Error %d setting up MSI; falling back to xPIC\n",
+                                status);
+                else
+                        mgp->msi_enabled = 1;
+        } else {
+                mgp->msi_enabled = 0;
+        }
+        status = request_irq(pdev->irq, myri10ge_intr, IRQF_SHARED,
+                             mgp->dev->name, mgp);
+        if (status != 0) {
+                dev_err(&pdev->dev, "failed to allocate IRQ\n");
+                if (mgp->msi_enabled)
+                        pci_disable_msi(pdev);
+        }
+        return status;
+}
+
+static void myri10ge_free_irq(struct myri10ge_priv *mgp)
+{
+        struct pci_dev *pdev = mgp->pdev;
+
+        free_irq(pdev->irq, mgp);
+        if (mgp->msi_enabled)
+                pci_disable_msi(pdev);
+}
+
 static int myri10ge_open(struct net_device *dev)
 {
         struct myri10ge_priv *mgp;
@@ -1634,10 +1665,13 @@ static int myri10ge_open(struct net_device *dev)
         status = myri10ge_reset(mgp);
         if (status != 0) {
                 printk(KERN_ERR "myri10ge: %s: failed reset\n", dev->name);
-                mgp->running = MYRI10GE_ETH_STOPPED;
-                return -ENXIO;
+                goto abort_with_nothing;
         }
 
+        status = myri10ge_request_irq(mgp);
+        if (status != 0)
+                goto abort_with_nothing;
+
         /* decide what small buffer size to use.  For good TCP rx
          * performance, it is important to not receive 1514 byte
          * frames into jumbo buffers, as it confuses the socket buffer
@@ -1677,7 +1711,7 @@ static int myri10ge_open(struct net_device *dev)
                        "myri10ge: %s: failed to get ring sizes or locations\n",
                        dev->name);
                 mgp->running = MYRI10GE_ETH_STOPPED;
-                return -ENXIO;
+                goto abort_with_irq;
         }
 
         if (mgp->mtrr >= 0) {
@@ -1708,7 +1742,7 @@ static int myri10ge_open(struct net_device *dev)
 
         status = myri10ge_allocate_rings(dev);
         if (status != 0)
-                goto abort_with_nothing;
+                goto abort_with_irq;
 
         /* now give firmware buffers sizes, and MTU */
         cmd.data0 = dev->mtu + ETH_HLEN + VLAN_HLEN;
@@ -1771,6 +1805,9 @@ static int myri10ge_open(struct net_device *dev)
 abort_with_rings:
         myri10ge_free_rings(dev);
 
+abort_with_irq:
+        myri10ge_free_irq(mgp);
+
 abort_with_nothing:
         mgp->running = MYRI10GE_ETH_STOPPED;
         return -ENOMEM;
@@ -1807,7 +1844,7 @@ static int myri10ge_close(struct net_device *dev)
                 printk(KERN_ERR "myri10ge: %s never got down irq\n", dev->name);
 
         netif_tx_disable(dev);
-
+        myri10ge_free_irq(mgp);
         myri10ge_free_rings(dev);
 
         mgp->running = MYRI10GE_ETH_STOPPED;
@@ -2481,34 +2518,6 @@ static void myri10ge_select_firmware(struct myri10ge_priv *mgp)
         }
 }
 
-static void myri10ge_save_state(struct myri10ge_priv *mgp)
-{
-        struct pci_dev *pdev = mgp->pdev;
-        int cap;
-
-        pci_save_state(pdev);
-        /* now save PCIe and MSI state that Linux will not
-         * save for us */
-        cap = pci_find_capability(pdev, PCI_CAP_ID_EXP);
-        pci_read_config_dword(pdev, cap + PCI_EXP_DEVCTL, &mgp->devctl);
-        cap = pci_find_capability(pdev, PCI_CAP_ID_MSI);
-        pci_read_config_word(pdev, cap + PCI_MSI_FLAGS, &mgp->msi_flags);
-}
-
-static void myri10ge_restore_state(struct myri10ge_priv *mgp)
-{
-        struct pci_dev *pdev = mgp->pdev;
-        int cap;
-
-        /* restore PCIe and MSI state that linux will not */
-        cap = pci_find_capability(pdev, PCI_CAP_ID_EXP);
-        pci_write_config_dword(pdev, cap + PCI_CAP_ID_EXP, mgp->devctl);
-        cap = pci_find_capability(pdev, PCI_CAP_ID_MSI);
-        pci_write_config_word(pdev, cap + PCI_MSI_FLAGS, mgp->msi_flags);
-
-        pci_restore_state(pdev);
-}
-
 #ifdef CONFIG_PM
 
 static int myri10ge_suspend(struct pci_dev *pdev, pm_message_t state)
@@ -2529,11 +2538,10 @@ static int myri10ge_suspend(struct pci_dev *pdev, pm_message_t state)
                 rtnl_unlock();
         }
         myri10ge_dummy_rdma(mgp, 0);
-        free_irq(pdev->irq, mgp);
-        myri10ge_save_state(mgp);
+        pci_save_state(pdev);
         pci_disable_device(pdev);
-        pci_set_power_state(pdev, pci_choose_state(pdev, state));
-        return 0;
+
+        return pci_set_power_state(pdev, pci_choose_state(pdev, state));
 }
 
 static int myri10ge_resume(struct pci_dev *pdev)
@@ -2555,34 +2563,33 @@ static int myri10ge_resume(struct pci_dev *pdev)
                        mgp->dev->name);
                 return -EIO;
         }
-        myri10ge_restore_state(mgp);
+
+        status = pci_restore_state(pdev);
+        if (status)
+                return status;
 
         status = pci_enable_device(pdev);
-        if (status < 0) {
+        if (status) {
                 dev_err(&pdev->dev, "failed to enable device\n");
-                return -EIO;
+                return status;
         }
 
         pci_set_master(pdev);
 
-        status = request_irq(pdev->irq, myri10ge_intr, IRQF_SHARED,
-                             netdev->name, mgp);
-        if (status != 0) {
-                dev_err(&pdev->dev, "failed to allocate IRQ\n");
-                goto abort_with_enabled;
-        }
-
         myri10ge_reset(mgp);
         myri10ge_dummy_rdma(mgp, 1);
 
         /* Save configuration space to be restored if the
          * nic resets due to a parity error */
-        myri10ge_save_state(mgp);
+        pci_save_state(pdev);
 
         if (netif_running(netdev)) {
                 rtnl_lock();
-                myri10ge_open(netdev);
+                status = myri10ge_open(netdev);
                 rtnl_unlock();
+                if (status != 0)
+                        goto abort_with_enabled;
+
         }
         netif_device_attach(netdev);
 
@@ -2640,7 +2647,11 @@ static void myri10ge_watchdog(struct work_struct *work)
                  * when the driver was loaded, or the last time the
                  * nic was resumed from power saving mode.
                  */
-                myri10ge_restore_state(mgp);
+                pci_restore_state(mgp->pdev);
+
+                /* save state again for accounting reasons */
+                pci_save_state(mgp->pdev);
+
         } else {
                 /* if we get back -1's from our slot, perhaps somebody
                  * powered off our card.  Don't try to reset it in
@@ -2856,23 +2867,6 @@ static int myri10ge_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                 goto abort_with_firmware;
         }
 
-        if (myri10ge_msi) {
-                status = pci_enable_msi(pdev);
-                if (status != 0)
-                        dev_err(&pdev->dev,
-                                "Error %d setting up MSI; falling back to xPIC\n",
-                                status);
-                else
-                        mgp->msi_enabled = 1;
-        }
-
-        status = request_irq(pdev->irq, myri10ge_intr, IRQF_SHARED,
-                             netdev->name, mgp);
-        if (status != 0) {
-                dev_err(&pdev->dev, "failed to allocate IRQ\n");
-                goto abort_with_firmware;
-        }
-
         pci_set_drvdata(pdev, mgp);
         if ((myri10ge_initial_mtu + ETH_HLEN) > MYRI10GE_MAX_ETHER_MTU)
                 myri10ge_initial_mtu = MYRI10GE_MAX_ETHER_MTU - ETH_HLEN;
@@ -2896,7 +2890,7 @@ static int myri10ge_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 
         /* Save configuration space to be restored if the
          * nic resets due to a parity error */
-        myri10ge_save_state(mgp);
+        pci_save_state(pdev);
 
         /* Setup the watchdog timer */
         setup_timer(&mgp->watchdog_timer, myri10ge_watchdog_timer,
@@ -2907,19 +2901,16 @@ static int myri10ge_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         status = register_netdev(netdev);
         if (status != 0) {
                 dev_err(&pdev->dev, "register_netdev failed: %d\n", status);
-                goto abort_with_irq;
+                goto abort_with_state;
         }
-        dev_info(dev, "%s IRQ %d, tx bndry %d, fw %s, WC %s\n",
-                 (mgp->msi_enabled ? "MSI" : "xPIC"),
+        dev_info(dev, "%d, tx bndry %d, fw %s, WC %s\n",
                  pdev->irq, mgp->tx.boundary, mgp->fw_name,
                  (mgp->mtrr >= 0 ? "Enabled" : "Disabled"));
 
         return 0;
 
-abort_with_irq:
-        free_irq(pdev->irq, mgp);
-        if (mgp->msi_enabled)
-                pci_disable_msi(pdev);
+abort_with_state:
+        pci_restore_state(pdev);
 
 abort_with_firmware:
         myri10ge_dummy_rdma(mgp, 0);
@@ -2970,12 +2961,12 @@ static void myri10ge_remove(struct pci_dev *pdev)
         flush_scheduled_work();
         netdev = mgp->dev;
         unregister_netdev(netdev);
-        free_irq(pdev->irq, mgp);
-        if (mgp->msi_enabled)
-                pci_disable_msi(pdev);
 
         myri10ge_dummy_rdma(mgp, 0);
 
+        /* avoid a memory leak */
+        pci_restore_state(pdev);
+
         bytes = myri10ge_max_intr_slots * sizeof(*mgp->rx_done.entry);
         dma_free_coherent(&pdev->dev, bytes,
                           mgp->rx_done.entry, mgp->rx_done.bus);
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index f83b41d4cb..148910025f 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -225,7 +225,6 @@ MODULE_DEVICE_TABLE(pci, rtl8169_pci_tbl);
 
 static int rx_copybreak = 200;
 static int use_dac;
-static int ignore_parity_err;
 static struct {
         u32 msg_enable;
 } debug = { -1 };
@@ -471,8 +470,6 @@ module_param(use_dac, int, 0);
 MODULE_PARM_DESC(use_dac, "Enable PCI DAC. Unsafe on 32 bit PCI slot.");
 module_param_named(debug, debug.msg_enable, int, 0);
 MODULE_PARM_DESC(debug, "Debug verbosity level (0=none, ..., 16=all)");
-module_param_named(ignore_parity_err, ignore_parity_err, bool, 0);
-MODULE_PARM_DESC(ignore_parity_err, "Ignore PCI parity error as target. Default: false");
 MODULE_LICENSE("GPL");
 MODULE_VERSION(RTL8169_VERSION);
 
@@ -2388,7 +2385,7 @@ static void rtl8169_pcierr_interrupt(struct net_device *dev)
          *
          * Feel free to adjust to your needs.
          */
-        if (ignore_parity_err)
+        if (pdev->broken_parity_status)
                 pci_cmd &= ~PCI_COMMAND_PARITY;
         else
                 pci_cmd |= PCI_COMMAND_SERR | PCI_COMMAND_PARITY;
diff --git a/drivers/net/skge.c b/drivers/net/skge.c
index 8a39376f87..deedfd5f82 100644
--- a/drivers/net/skge.c
+++ b/drivers/net/skge.c
@@ -2920,6 +2920,7 @@ static int skge_poll(struct net_device *dev, int *budget)
         struct skge_hw *hw = skge->hw;
         struct skge_ring *ring = &skge->rx_ring;
         struct skge_element *e;
+        unsigned long flags;
         int to_do = min(dev->quota, *budget);
         int work_done = 0;
 
@@ -2957,12 +2958,12 @@ static int skge_poll(struct net_device *dev, int *budget)
         if (work_done >=  to_do)
                 return 1; /* not done */
 
-        spin_lock_irq(&hw->hw_lock);
+        spin_lock_irqsave(&hw->hw_lock, flags);
         __netif_rx_complete(dev);
         hw->intr_mask |= irqmask[skge->port];
         skge_write32(hw, B0_IMSK, hw->intr_mask);
         skge_read32(hw, B0_IMSK);
-        spin_unlock_irq(&hw->hw_lock);
+        spin_unlock_irqrestore(&hw->hw_lock, flags);
 
         return 0;
 }
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index fb1d2c30c1..a6601e8d42 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -569,8 +569,8 @@ static void sky2_phy_power(struct sky2_hw *hw, unsigned port, int onoff)
         if (hw->chip_id == CHIP_ID_YUKON_XL && hw->chip_rev > 1)
                 onoff = !onoff;
 
+        sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_ON);
         reg1 = sky2_pci_read32(hw, PCI_DEV_REG1);
-
         if (onoff)
                 /* Turn off phy power saving */
                 reg1 &= ~phy_power[port];
@@ -579,6 +579,7 @@ static void sky2_phy_power(struct sky2_hw *hw, unsigned port, int onoff)
 
         sky2_pci_write32(hw, PCI_DEV_REG1, reg1);
         sky2_pci_read32(hw, PCI_DEV_REG1);
+        sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_OFF);
         udelay(100);
 }
 
@@ -1511,6 +1512,13 @@ static int sky2_down(struct net_device *dev)
         imask &= ~portirq_msk[port];
         sky2_write32(hw, B0_IMSK, imask);
 
+        /*
+         * Both ports share the NAPI poll on port 0, so if necessary undo the
+         * the disable that is done in dev_close.
+         */
+        if (sky2->port == 0 && hw->ports > 1)
+                netif_poll_enable(dev);
+
         sky2_gmac_reset(hw, port);
 
         /* Stop transmitter */
@@ -3631,6 +3639,29 @@ static int sky2_resume(struct pci_dev *pdev)
 out:
         return err;
 }
+
+/* BIOS resume runs after device (it's a bug in PM)
+ * as a temporary workaround on suspend/resume leave MSI disabled
+ */
+static int sky2_suspend_late(struct pci_dev *pdev, pm_message_t state)
+{
+        struct sky2_hw *hw = pci_get_drvdata(pdev);
+
+        free_irq(pdev->irq, hw);
+        if (hw->msi) {
+                pci_disable_msi(pdev);
+                hw->msi = 0;
+        }
+        return 0;
+}
+
+static int sky2_resume_early(struct pci_dev *pdev)
+{
+        struct sky2_hw *hw = pci_get_drvdata(pdev);
+        struct net_device *dev = hw->dev[0];
+
+        return request_irq(pdev->irq, sky2_intr, IRQF_SHARED, dev->name, hw);
+}
 #endif
 
 static struct pci_driver sky2_driver = {
@@ -3641,6 +3672,8 @@ static struct pci_driver sky2_driver = {
 #ifdef CONFIG_PM
         .suspend = sky2_suspend,
         .resume = sky2_resume,
+        .suspend_late = sky2_suspend_late,
+        .resume_early = sky2_resume_early,
 #endif
 };
 
diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c
index 2c4343395a..880d9fdd7c 100644
--- a/drivers/net/smc911x.c
+++ b/drivers/net/smc911x.c
@@ -148,6 +148,8 @@ struct smc911x_local {
         int tx_throttle;
         spinlock_t lock;
 
+        struct net_device *netdev;
+
 #ifdef SMC_USE_DMA
         /* DMA needs the physical address of the chip */
         u_long physaddr;
@@ -948,10 +950,11 @@ static void smc911x_phy_check_media(struct net_device *dev, int init)
  * of autonegotiation.)  If the RPC ANEG bit is cleared, the selection
  * is controlled by the RPC SPEED and RPC DPLX bits.
  */
-static void smc911x_phy_configure(void *data)
+static void smc911x_phy_configure(struct work_struct *work)
 {
-        struct net_device *dev = data;
-        struct smc911x_local *lp = netdev_priv(dev);
+        struct smc911x_local *lp = container_of(work, struct smc911x_local,
+                                                phy_configure);
+        struct net_device *dev = lp->netdev;
         unsigned long ioaddr = dev->base_addr;
         int phyaddr = lp->mii.phy_id;
         int my_phy_caps; /* My PHY capabilities */
@@ -1331,7 +1334,7 @@ smc911x_rx_dma_irq(int dma, void *data)
 static void smc911x_poll_controller(struct net_device *dev)
 {
         disable_irq(dev->irq);
-        smc911x_interrupt(dev->irq, dev, NULL);
+        smc911x_interrupt(dev->irq, dev);
         enable_irq(dev->irq);
 }
 #endif
@@ -1495,6 +1498,8 @@ static void smc911x_set_multicast_list(struct net_device *dev)
 static int
 smc911x_open(struct net_device *dev)
 {
+        struct smc911x_local *lp = netdev_priv(dev);
+
         DBG(SMC_DEBUG_FUNC, "%s: --> %s\n", dev->name, __FUNCTION__);
 
         /*
@@ -1511,7 +1516,7 @@ smc911x_open(struct net_device *dev)
         smc911x_reset(dev);
 
         /* Configure the PHY, initialize the link state */
-        smc911x_phy_configure(dev);
+        smc911x_phy_configure(&lp->phy_configure);
 
         /* Turn on Tx + Rx */
         smc911x_enable(dev);
@@ -2060,7 +2065,7 @@ static int __init smc911x_probe(struct net_device *dev, unsigned long ioaddr)
         dev->poll_controller = smc911x_poll_controller;
 #endif
 
-        INIT_WORK(&lp->phy_configure, smc911x_phy_configure, dev);
+        INIT_WORK(&lp->phy_configure, smc911x_phy_configure);
         lp->mii.phy_id_mask = 0x1f;
         lp->mii.reg_num_mask = 0x1f;
         lp->mii.force_media = 0;
@@ -2154,6 +2159,7 @@ static int smc911x_drv_probe(struct platform_device *pdev)
 {
         struct net_device *ndev;
         struct resource *res;
+        struct smc911x_local *lp;
         unsigned int *addr;
         int ret;
 
@@ -2183,6 +2189,8 @@ static int smc911x_drv_probe(struct platform_device *pdev)
 
         ndev->dma = (unsigned char)-1;
         ndev->irq = platform_get_irq(pdev, 0);
+        lp = netdev_priv(ndev);
+        lp->netdev = ndev;
 
         addr = ioremap(res->start, SMC911X_IO_EXTENT);
         if (!addr) {
@@ -2204,7 +2212,6 @@ out:
         }
 #ifdef SMC_USE_DMA
         else {
-                struct smc911x_local *lp = netdev_priv(ndev);
                 lp->physaddr = res->start;
                 lp->dev = &pdev->dev;
         }
@@ -2275,7 +2282,7 @@ static int smc911x_drv_resume(struct platform_device *dev)
                         smc911x_reset(ndev);
                         smc911x_enable(ndev);
                         if (lp->phy_type != 0)
-                                smc911x_phy_configure(ndev);
+                                smc911x_phy_configure(&lp->phy_configure);
                         netif_device_attach(ndev);
                 }
         }
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index 571320ae87..4056ba1ff3 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -68,8 +68,8 @@
 
 #define DRV_MODULE_NAME         "tg3"
 #define PFX DRV_MODULE_NAME     ": "
-#define DRV_MODULE_VERSION      "3.70"
-#define DRV_MODULE_RELDATE      "December 1, 2006"
+#define DRV_MODULE_VERSION      "3.71"
+#define DRV_MODULE_RELDATE      "December 15, 2006"
 
 #define TG3_DEF_MAC_MODE        0
 #define TG3_DEF_RX_MODE         0
@@ -959,6 +959,13 @@ static int tg3_phy_reset(struct tg3 *tp)
         u32 phy_status;
         int err;
 
+        if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5906) {
+                u32 val;
+
+                val = tr32(GRC_MISC_CFG);
+                tw32_f(GRC_MISC_CFG, val & ~GRC_MISC_CFG_EPHY_IDDQ);
+                udelay(40);
+        }
         err  = tg3_readphy(tp, MII_BMSR, &phy_status);
         err |= tg3_readphy(tp, MII_BMSR, &phy_status);
         if (err != 0)
@@ -1170,7 +1177,15 @@ static void tg3_power_down_phy(struct tg3 *tp)
         if (tp->tg3_flags2 & TG3_FLG2_PHY_SERDES)
                 return;
 
-        if (GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5906) {
+        if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5906) {
+                u32 val;
+
+                tg3_bmcr_reset(tp);
+                val = tr32(GRC_MISC_CFG);
+                tw32_f(GRC_MISC_CFG, val | GRC_MISC_CFG_EPHY_IDDQ);
+                udelay(40);
+                return;
+        } else {
                 tg3_writephy(tp, MII_TG3_EXT_CTRL,
                              MII_TG3_EXT_CTRL_FORCE_LED_OFF);
                 tg3_writephy(tp, MII_TG3_AUX_CTRL, 0x01b2);
@@ -4426,7 +4441,7 @@ static void tg3_free_consistent(struct tg3 *tp)
  */
 static int tg3_alloc_consistent(struct tg3 *tp)
 {
-        tp->rx_std_buffers = kmalloc((sizeof(struct ring_info) *
+        tp->rx_std_buffers = kzalloc((sizeof(struct ring_info) *
                                       (TG3_RX_RING_SIZE +
                                        TG3_RX_JUMBO_RING_SIZE)) +
                                      (sizeof(struct tx_ring_info) *
@@ -4435,13 +4450,6 @@ static int tg3_alloc_consistent(struct tg3 *tp)
         if (!tp->rx_std_buffers)
                 return -ENOMEM;
 
-        memset(tp->rx_std_buffers, 0,
-               (sizeof(struct ring_info) *
-                (TG3_RX_RING_SIZE +
-                 TG3_RX_JUMBO_RING_SIZE)) +
-               (sizeof(struct tx_ring_info) *
-                TG3_TX_RING_SIZE));
-
         tp->rx_jumbo_buffers = &tp->rx_std_buffers[TG3_RX_RING_SIZE];
         tp->tx_buffers = (struct tx_ring_info *)
                 &tp->rx_jumbo_buffers[TG3_RX_JUMBO_RING_SIZE];
@@ -6988,6 +6996,8 @@ static int tg3_open(struct net_device *dev)
         struct tg3 *tp = netdev_priv(dev);
         int err;
 
+        netif_carrier_off(tp->dev);
+
         tg3_full_lock(tp, 0);
 
         err = tg3_set_power_state(tp, PCI_D0);
@@ -7981,6 +7991,10 @@ static int tg3_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
                 tp->link_config.duplex = cmd->duplex;
         }
 
+        tp->link_config.orig_speed = tp->link_config.speed;
+        tp->link_config.orig_duplex = tp->link_config.duplex;
+        tp->link_config.orig_autoneg = tp->link_config.autoneg;
+
         if (netif_running(dev))
                 tg3_setup_phy(tp, 1);
 
@@ -11923,6 +11937,8 @@ static int __devinit tg3_init_one(struct pci_dev *pdev,
          */
         pci_save_state(tp->pdev);
 
+        pci_set_drvdata(pdev, dev);
+
         err = register_netdev(dev);
         if (err) {
                 printk(KERN_ERR PFX "Cannot register net device, "
@@ -11930,8 +11946,6 @@ static int __devinit tg3_init_one(struct pci_dev *pdev,
                 goto err_out_iounmap;
         }
 
-        pci_set_drvdata(pdev, dev);
-
         printk(KERN_INFO "%s: Tigon3 [partno(%s) rev %04x PHY(%s)] (%s) %s Ethernet ",
                dev->name,
                tp->board_part_number,
@@ -11962,8 +11976,6 @@ static int __devinit tg3_init_one(struct pci_dev *pdev,
                (pdev->dma_mask == DMA_32BIT_MASK) ? 32 :
                 (((u64) pdev->dma_mask == DMA_40BIT_MASK) ? 40 : 64));
 
-        netif_carrier_off(tp->dev);
-
         return 0;
 
 err_out_iounmap:
diff --git a/drivers/net/tg3.h b/drivers/net/tg3.h
index dfaf4ed127..cf78a7e599 100644
--- a/drivers/net/tg3.h
+++ b/drivers/net/tg3.h
@@ -1350,6 +1350,7 @@
 #define  GRC_MISC_CFG_BOARD_ID_5788     0x00010000
 #define  GRC_MISC_CFG_BOARD_ID_5788M    0x00018000
 #define  GRC_MISC_CFG_BOARD_ID_AC91002A1 0x00018000
+#define  GRC_MISC_CFG_EPHY_IDDQ         0x00200000
 #define  GRC_MISC_CFG_KEEP_GPHY_POWER   0x04000000
 #define GRC_LOCAL_CTRL                  0x00006808
 #define  GRC_LCLCTRL_INT_ACTIVE         0x00000001
diff --git a/drivers/net/via-velocity.c b/drivers/net/via-velocity.c
index 4587f23f4e..8e5d82051b 100644
--- a/drivers/net/via-velocity.c
+++ b/drivers/net/via-velocity.c
@@ -265,15 +265,19 @@ static int velocity_set_media_mode(struct velocity_info *vptr, u32 mii_status);
 static int velocity_suspend(struct pci_dev *pdev, pm_message_t state);
 static int velocity_resume(struct pci_dev *pdev);
 
+static DEFINE_SPINLOCK(velocity_dev_list_lock);
+static LIST_HEAD(velocity_dev_list);
+
+#endif
+
+#if defined(CONFIG_PM) && defined(CONFIG_INET)
+
 static int velocity_netdev_event(struct notifier_block *nb, unsigned long notification, void *ptr);
 
 static struct notifier_block velocity_inetaddr_notifier = {
       .notifier_call    = velocity_netdev_event,
 };
 
-static DEFINE_SPINLOCK(velocity_dev_list_lock);
-static LIST_HEAD(velocity_dev_list);
-
 static void velocity_register_notifier(void)
 {
         register_inetaddr_notifier(&velocity_inetaddr_notifier);
@@ -284,12 +288,12 @@ static void velocity_unregister_notifier(void)
         unregister_inetaddr_notifier(&velocity_inetaddr_notifier);
 }
 
-#else                           /* CONFIG_PM */
+#else
 
 #define velocity_register_notifier()    do {} while (0)
 #define velocity_unregister_notifier()  do {} while (0)
 
-#endif                          /* !CONFIG_PM */
+#endif
 
 /*
  *      Internal board variants. At the moment we have only one
@@ -3292,6 +3296,8 @@ static int velocity_resume(struct pci_dev *pdev)
         return 0;
 }
 
+#ifdef CONFIG_INET
+
 static int velocity_netdev_event(struct notifier_block *nb, unsigned long notification, void *ptr)
 {
         struct in_ifaddr *ifa = (struct in_ifaddr *) ptr;
@@ -3312,4 +3318,6 @@ static int velocity_netdev_event(struct notifier_block *nb, unsigned long notifi
         }
         return NOTIFY_DONE;
 }
+
+#endif
 #endif
diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c
index 0b9d0db159..bd1faebf61 100644
--- a/drivers/pci/hotplug/acpiphp_glue.c
+++ b/drivers/pci/hotplug/acpiphp_glue.c
@@ -1682,7 +1682,7 @@ int __init acpiphp_glue_init(void)
  *
  * This function frees all data allocated in acpiphp_glue_init()
  */
-void __exit acpiphp_glue_exit(void)
+void  acpiphp_glue_exit(void)
 {
         acpi_pci_unregister_driver(&acpi_pci_hp_driver);
 }
diff --git a/drivers/pci/hotplug/acpiphp_ibm.c b/drivers/pci/hotplug/acpiphp_ibm.c
index bd40aee10e..7f03881a8b 100644
--- a/drivers/pci/hotplug/acpiphp_ibm.c
+++ b/drivers/pci/hotplug/acpiphp_ibm.c
@@ -319,13 +319,12 @@ static int ibm_get_table_from_acpi(char **bufp)
         if (bufp == NULL)
                 goto read_table_done;
 
-        lbuf = kmalloc(size, GFP_KERNEL);
+        lbuf = kzalloc(size, GFP_KERNEL);
         dbg("%s: element count: %i, ASL table size: %i, &table = 0x%p\n",
                         __FUNCTION__, package->package.count, size, lbuf);
 
         if (lbuf) {
                 *bufp = lbuf;
-                memset(lbuf, 0, size);
         } else {
                 size = -ENOMEM;
                 goto read_table_done;
diff --git a/drivers/pci/hotplug/rpaphp_slot.c b/drivers/pci/hotplug/rpaphp_slot.c
index b771196a65..3009193f00 100644
--- a/drivers/pci/hotplug/rpaphp_slot.c
+++ b/drivers/pci/hotplug/rpaphp_slot.c
@@ -47,21 +47,11 @@ static ssize_t location_read_file (struct hotplug_slot *php_slot, char *buf)
         return retval;
 }
 
-static struct hotplug_slot_attribute hotplug_slot_attr_location = {
+static struct hotplug_slot_attribute php_attr_location = {
         .attr = {.name = "phy_location", .mode = S_IFREG | S_IRUGO},
         .show = location_read_file,
 };
 
-static void rpaphp_sysfs_add_attr_location (struct hotplug_slot *slot)
-{
-        sysfs_create_file(&slot->kobj, &hotplug_slot_attr_location.attr);
-}
-
-static void rpaphp_sysfs_remove_attr_location (struct hotplug_slot *slot)
-{
-        sysfs_remove_file(&slot->kobj, &hotplug_slot_attr_location.attr);
-}
-
 /* free up the memory used by a slot */
 static void rpaphp_release_slot(struct hotplug_slot *hotplug_slot)
 {
@@ -145,7 +135,7 @@ int rpaphp_deregister_slot(struct slot *slot)
         list_del(&slot->rpaphp_slot_list);
         
         /* remove "phy_location" file */
-        rpaphp_sysfs_remove_attr_location(php_slot);
+        sysfs_remove_file(&php_slot->kobj, &php_attr_location.attr);
 
         retval = pci_hp_deregister(php_slot);
         if (retval)
@@ -160,36 +150,45 @@ EXPORT_SYMBOL_GPL(rpaphp_deregister_slot);
 
 int rpaphp_register_slot(struct slot *slot)
 {
+        struct hotplug_slot *php_slot = slot->hotplug_slot;
         int retval;
 
         dbg("%s registering slot:path[%s] index[%x], name[%s] pdomain[%x] type[%d]\n", 
                 __FUNCTION__, slot->dn->full_name, slot->index, slot->name, 
                 slot->power_domain, slot->type);
+
         /* should not try to register the same slot twice */
-        if (is_registered(slot)) { /* should't be here */
+        if (is_registered(slot)) {
                 err("rpaphp_register_slot: slot[%s] is already registered\n", slot->name);
-                rpaphp_release_slot(slot->hotplug_slot);
-                return -EAGAIN;
+                retval = -EAGAIN;
+                goto register_fail;
         }       
-        retval = pci_hp_register(slot->hotplug_slot);
+
+        retval = pci_hp_register(php_slot);
         if (retval) {
                 err("pci_hp_register failed with error %d\n", retval);
-                rpaphp_release_slot(slot->hotplug_slot);
-                return retval;
+                goto register_fail;
         }
-        
-        /* create "phy_locatoin" file */
-        rpaphp_sysfs_add_attr_location(slot->hotplug_slot);     
 
-        /* add slot to our internal list */
-        dbg("%s adding slot[%s] to rpaphp_slot_list\n",
-            __FUNCTION__, slot->name);
+        /* create "phy_location" file */
+        retval = sysfs_create_file(&php_slot->kobj, &php_attr_location.attr);
+        if (retval) {
+                err("sysfs_create_file failed with error %d\n", retval);
+                goto sysfs_fail;
+        }
 
+        /* add slot to our internal list */
         list_add(&slot->rpaphp_slot_list, &rpaphp_slot_head);
         info("Slot [%s](PCI location=%s) registered\n", slot->name,
                         slot->location);
         num_slots++;
         return 0;
+
+sysfs_fail:
+        pci_hp_deregister(php_slot);
+register_fail:
+        rpaphp_release_slot(php_slot);
+        return retval;
 }
 
 int rpaphp_get_power_status(struct slot *slot, u8 * value)
diff --git a/drivers/pci/hotplug/shpchp.h b/drivers/pci/hotplug/shpchp.h
index 5075769584..3ca6a4f574 100644
--- a/drivers/pci/hotplug/shpchp.h
+++ b/drivers/pci/hotplug/shpchp.h
@@ -47,11 +47,17 @@ extern int shpchp_poll_time;
 extern int shpchp_debug;
 extern struct workqueue_struct *shpchp_wq;
 
-/*#define dbg(format, arg...) do { if (shpchp_debug) printk(KERN_DEBUG "%s: " format, MY_NAME , ## arg); } while (0)*/
-#define dbg(format, arg...) do { if (shpchp_debug) printk("%s: " format, MY_NAME , ## arg); } while (0)
-#define err(format, arg...) printk(KERN_ERR "%s: " format, MY_NAME , ## arg)
-#define info(format, arg...) printk(KERN_INFO "%s: " format, MY_NAME , ## arg)
-#define warn(format, arg...) printk(KERN_WARNING "%s: " format, MY_NAME , ## arg)
+#define dbg(format, arg...)                                             \
+        do {                                                            \
+                if (shpchp_debug)                                       \
+                        printk("%s: " format, MY_NAME , ## arg);        \
+        } while (0)
+#define err(format, arg...)                                             \
+        printk(KERN_ERR "%s: " format, MY_NAME , ## arg)
+#define info(format, arg...)                                            \
+        printk(KERN_INFO "%s: " format, MY_NAME , ## arg)
+#define warn(format, arg...)                                            \
+        printk(KERN_WARNING "%s: " format, MY_NAME , ## arg)
 
 #define SLOT_NAME_SIZE 10
 struct slot {
@@ -83,34 +89,27 @@ struct event_info {
 struct controller {
         struct mutex crit_sect;         /* critical section mutex */
         struct mutex cmd_lock;          /* command lock */
-        struct php_ctlr_state_s *hpc_ctlr_handle; /* HPC controller handle */
         int num_slots;                  /* Number of slots on ctlr */
         int slot_num_inc;               /* 1 or -1 */
         struct pci_dev *pci_dev;
         struct list_head slot_list;
         struct hpc_ops *hpc_ops;
         wait_queue_head_t queue;        /* sleep & wake process */
-        u8 bus;
-        u8 device;
-        u8 function;
         u8 slot_device_offset;
-        u8 add_support;
         u32 pcix_misc2_reg;     /* for amd pogo errata */
-        enum pci_bus_speed speed;
         u32 first_slot;         /* First physical slot number */
-        u8 slot_bus;            /* Bus where the slots handled by this controller sit */
         u32 cap_offset;
         unsigned long mmio_base;
         unsigned long mmio_size;
+        void __iomem *creg;
+        struct timer_list poll_timer;
 };
 
-
 /* Define AMD SHPC ID  */
 #define PCI_DEVICE_ID_AMD_GOLAM_7450    0x7450 
 #define PCI_DEVICE_ID_AMD_POGO_7458     0x7458
 
 /* AMD PCIX bridge registers */
-
 #define PCIX_MEM_BASE_LIMIT_OFFSET      0x1C
 #define PCIX_MISCII_OFFSET              0x48
 #define PCIX_MISC_BRIDGE_ERRORS_OFFSET  0x80
@@ -145,8 +144,6 @@ struct controller {
 #define POWERON_STATE                   3
 #define POWEROFF_STATE                  4
 
-#define PCI_TO_PCI_BRIDGE_CLASS         0x00060400
-
 /* Error messages */
 #define INTERLOCK_OPEN                  0x00000002
 #define ADD_NOT_SUPPORTED               0x00000003
@@ -158,50 +155,32 @@ struct controller {
 #define WRONG_BUS_FREQUENCY             0x0000000D
 #define POWER_FAILURE                   0x0000000E
 
-#define REMOVE_NOT_SUPPORTED            0x00000003
-
-#define DISABLE_CARD                    1
-
-/*
- * error Messages
- */
-#define msg_initialization_err  "Initialization failure, error=%d\n"
-#define msg_button_on           "PCI slot #%s - powering on due to button press.\n"
-#define msg_button_off          "PCI slot #%s - powering off due to button press.\n"
-#define msg_button_cancel       "PCI slot #%s - action canceled due to button press.\n"
-
-/* sysfs functions for the hotplug controller info */
 extern int __must_check shpchp_create_ctrl_files(struct controller *ctrl);
-
-extern int      shpchp_sysfs_enable_slot(struct slot *slot);
-extern int      shpchp_sysfs_disable_slot(struct slot *slot);
-
-extern u8       shpchp_handle_attention_button(u8 hp_slot, void *inst_id);
-extern u8       shpchp_handle_switch_change(u8 hp_slot, void *inst_id);
-extern u8       shpchp_handle_presence_change(u8 hp_slot, void *inst_id);
-extern u8       shpchp_handle_power_fault(u8 hp_slot, void *inst_id);
-
-/* pci functions */
-extern int      shpchp_save_config(struct controller *ctrl, int busnumber, int num_ctlr_slots, int first_device_num);
-extern int      shpchp_configure_device(struct slot *p_slot);
-extern int      shpchp_unconfigure_device(struct slot *p_slot);
-extern void     shpchp_remove_ctrl_files(struct controller *ctrl);
-extern void     cleanup_slots(struct controller *ctrl);
-extern void     queue_pushbutton_work(struct work_struct *work);
-
+extern void shpchp_remove_ctrl_files(struct controller *ctrl);
+extern int shpchp_sysfs_enable_slot(struct slot *slot);
+extern int shpchp_sysfs_disable_slot(struct slot *slot);
+extern u8 shpchp_handle_attention_button(u8 hp_slot, struct controller *ctrl);
+extern u8 shpchp_handle_switch_change(u8 hp_slot, struct controller *ctrl);
+extern u8 shpchp_handle_presence_change(u8 hp_slot, struct controller *ctrl);
+extern u8 shpchp_handle_power_fault(u8 hp_slot, struct controller *ctrl);
+extern int shpchp_configure_device(struct slot *p_slot);
+extern int shpchp_unconfigure_device(struct slot *p_slot);
+extern void cleanup_slots(struct controller *ctrl);
+extern void queue_pushbutton_work(struct work_struct *work);
+extern int shpc_init( struct controller *ctrl, struct pci_dev *pdev);
 
 #ifdef CONFIG_ACPI
 static inline int get_hp_params_from_firmware(struct pci_dev *dev,
-                        struct hotplug_params *hpp)
+                                              struct hotplug_params *hpp)
 {
         if (ACPI_FAILURE(acpi_get_hp_params_from_firmware(dev->bus, hpp)))
                         return -ENODEV;
         return 0;
 }
-#define get_hp_hw_control_from_firmware(pdev) \
-        do { \
-                if (DEVICE_ACPI_HANDLE(&(pdev->dev))) \
-                        acpi_run_oshp(DEVICE_ACPI_HANDLE(&(pdev->dev))); \
+#define get_hp_hw_control_from_firmware(pdev)                           \
+        do {                                                            \
+                if (DEVICE_ACPI_HANDLE(&(pdev->dev)))                   \
+                        acpi_run_oshp(DEVICE_ACPI_HANDLE(&(pdev->dev)));\
         } while (0)
 #else
 #define get_hp_params_from_firmware(dev, hpp) (-ENODEV)
@@ -222,108 +201,40 @@ struct ctrl_reg {
         volatile u32 serr_loc;
         volatile u32 serr_intr_enable;
         volatile u32 slot1;
-        volatile u32 slot2;
-        volatile u32 slot3;
-        volatile u32 slot4;
-        volatile u32 slot5;
-        volatile u32 slot6;
-        volatile u32 slot7;
-        volatile u32 slot8;
-        volatile u32 slot9;
-        volatile u32 slot10;
-        volatile u32 slot11;
-        volatile u32 slot12;
 } __attribute__ ((packed));
 
 /* offsets to the controller registers based on the above structure layout */
 enum ctrl_offsets {
-        BASE_OFFSET =   offsetof(struct ctrl_reg, base_offset),
-        SLOT_AVAIL1 =   offsetof(struct ctrl_reg, slot_avail1),
-        SLOT_AVAIL2     =       offsetof(struct ctrl_reg, slot_avail2),
-        SLOT_CONFIG =   offsetof(struct ctrl_reg, slot_config),
-        SEC_BUS_CONFIG =        offsetof(struct ctrl_reg, sec_bus_config),
-        MSI_CTRL        =       offsetof(struct ctrl_reg, msi_ctrl),
-        PROG_INTERFACE =        offsetof(struct ctrl_reg, prog_interface),
-        CMD             =       offsetof(struct ctrl_reg, cmd),
-        CMD_STATUS      =       offsetof(struct ctrl_reg, cmd_status),
-        INTR_LOC        =       offsetof(struct ctrl_reg, intr_loc),
-        SERR_LOC        =       offsetof(struct ctrl_reg, serr_loc),
-        SERR_INTR_ENABLE =      offsetof(struct ctrl_reg, serr_intr_enable),
-        SLOT1 =         offsetof(struct ctrl_reg, slot1),
-        SLOT2 =         offsetof(struct ctrl_reg, slot2),
-        SLOT3 =         offsetof(struct ctrl_reg, slot3),
-        SLOT4 =         offsetof(struct ctrl_reg, slot4),
-        SLOT5 =         offsetof(struct ctrl_reg, slot5),
-        SLOT6 =         offsetof(struct ctrl_reg, slot6),               
-        SLOT7 =         offsetof(struct ctrl_reg, slot7),
-        SLOT8 =         offsetof(struct ctrl_reg, slot8),
-        SLOT9 =         offsetof(struct ctrl_reg, slot9),
-        SLOT10 =        offsetof(struct ctrl_reg, slot10),
-        SLOT11 =        offsetof(struct ctrl_reg, slot11),
-        SLOT12 =        offsetof(struct ctrl_reg, slot12),
-};
-typedef u8(*php_intr_callback_t) (u8 hp_slot, void *instance_id);
-struct php_ctlr_state_s {
-        struct php_ctlr_state_s *pnext;
-        struct pci_dev *pci_dev;
-        unsigned int irq;
-        unsigned long flags;    /* spinlock's */
-        u32 slot_device_offset;
-        u32 num_slots;
-        struct timer_list       int_poll_timer; /* Added for poll event */
-        php_intr_callback_t attention_button_callback;
-        php_intr_callback_t switch_change_callback;
-        php_intr_callback_t presence_change_callback;
-        php_intr_callback_t power_fault_callback;
-        void *callback_instance_id;
-        void __iomem *creg;                     /* Ptr to controller register space */
+        BASE_OFFSET      = offsetof(struct ctrl_reg, base_offset),
+        SLOT_AVAIL1      = offsetof(struct ctrl_reg, slot_avail1),
+        SLOT_AVAIL2      = offsetof(struct ctrl_reg, slot_avail2),
+        SLOT_CONFIG      = offsetof(struct ctrl_reg, slot_config),
+        SEC_BUS_CONFIG   = offsetof(struct ctrl_reg, sec_bus_config),
+        MSI_CTRL         = offsetof(struct ctrl_reg, msi_ctrl),
+        PROG_INTERFACE   = offsetof(struct ctrl_reg, prog_interface),
+        CMD              = offsetof(struct ctrl_reg, cmd),
+        CMD_STATUS       = offsetof(struct ctrl_reg, cmd_status),
+        INTR_LOC         = offsetof(struct ctrl_reg, intr_loc),
+        SERR_LOC         = offsetof(struct ctrl_reg, serr_loc),
+        SERR_INTR_ENABLE = offsetof(struct ctrl_reg, serr_intr_enable),
+        SLOT1            = offsetof(struct ctrl_reg, slot1),
 };
-/* Inline functions */
 
-
-/* Inline functions to check the sanity of a pointer that is passed to us */
-static inline int slot_paranoia_check (struct slot *slot, const char *function)
-{
-        if (!slot) {
-                dbg("%s - slot == NULL", function);
-                return -1;
-        }
-        if (!slot->hotplug_slot) {
-                dbg("%s - slot->hotplug_slot == NULL!", function);
-                return -1;
-        }
-        return 0;
-}
-
-static inline struct slot *get_slot (struct hotplug_slot *hotplug_slot, const char *function)
+static inline struct slot *get_slot(struct hotplug_slot *hotplug_slot)
 { 
-        struct slot *slot;
-
-        if (!hotplug_slot) {
-                dbg("%s - hotplug_slot == NULL\n", function);
-                return NULL;
-        }
-
-        slot = (struct slot *)hotplug_slot->private;
-        if (slot_paranoia_check (slot, function))
-                return NULL;
-        return slot;
+        return hotplug_slot->private;
 }
 
-static inline struct slot *shpchp_find_slot (struct controller *ctrl, u8 device)
+static inline struct slot *shpchp_find_slot(struct controller *ctrl, u8 device)
 {
         struct slot *slot;
 
-        if (!ctrl)
-                return NULL;
-
         list_for_each_entry(slot, &ctrl->slot_list, slot_list) {
                 if (slot->device == device)
                         return slot;
         }
 
         err("%s: slot (device=0x%x) not found\n", __FUNCTION__, device);
-
         return NULL;
 }
 
@@ -400,44 +311,27 @@ static inline void amd_pogo_errata_restore_misc_reg(struct slot *p_slot)
         pci_write_config_dword(p_slot->ctrl->pci_dev, PCIX_MISCII_OFFSET, pcix_misc2_temp);
 }
 
-enum php_ctlr_type {
-        PCI,
-        ISA,
-        ACPI
-};
-
-int shpc_init( struct controller *ctrl, struct pci_dev *pdev);
-
-int shpc_get_ctlr_slot_config( struct controller *ctrl,
-                int *num_ctlr_slots,
-                int *first_device_num,
-                int *physical_slot_num,
-                int *updown,
-                int *flags);
-
 struct hpc_ops {
-        int     (*power_on_slot )               (struct slot *slot);
-        int     (*slot_enable )                 (struct slot *slot);
-        int     (*slot_disable )                (struct slot *slot);
-        int     (*set_bus_speed_mode)   (struct slot *slot, enum pci_bus_speed speed);
-        int     (*get_power_status)             (struct slot *slot, u8 *status);
-        int     (*get_attention_status) (struct slot *slot, u8 *status);
-        int     (*set_attention_status) (struct slot *slot, u8 status);
-        int     (*get_latch_status)             (struct slot *slot, u8 *status);
-        int     (*get_adapter_status)   (struct slot *slot, u8 *status);
-
-        int     (*get_max_bus_speed)    (struct slot *slot, enum pci_bus_speed *speed);
-        int     (*get_cur_bus_speed)    (struct slot *slot, enum pci_bus_speed *speed);
-        int     (*get_adapter_speed)    (struct slot *slot, enum pci_bus_speed *speed);
-        int     (*get_mode1_ECC_cap)    (struct slot *slot, u8 *mode);
-        int     (*get_prog_int)                 (struct slot *slot, u8 *prog_int);
-
-        int     (*query_power_fault)    (struct slot *slot);
-        void    (*green_led_on)         (struct slot *slot);
-        void    (*green_led_off)        (struct slot *slot);
-        void    (*green_led_blink)      (struct slot *slot);
-        void    (*release_ctlr)         (struct controller *ctrl);
-        int (*check_cmd_status)         (struct controller *ctrl);
+        int (*power_on_slot)(struct slot *slot);
+        int (*slot_enable)(struct slot *slot);
+        int (*slot_disable)(struct slot *slot);
+        int (*set_bus_speed_mode)(struct slot *slot, enum pci_bus_speed speed);
+        int (*get_power_status)(struct slot *slot, u8 *status);
+        int (*get_attention_status)(struct slot *slot, u8 *status);
+        int (*set_attention_status)(struct slot *slot, u8 status);
+        int (*get_latch_status)(struct slot *slot, u8 *status);
+        int (*get_adapter_status)(struct slot *slot, u8 *status);
+        int (*get_max_bus_speed)(struct slot *slot, enum pci_bus_speed *speed);
+        int (*get_cur_bus_speed)(struct slot *slot, enum pci_bus_speed *speed);
+        int (*get_adapter_speed)(struct slot *slot, enum pci_bus_speed *speed);
+        int (*get_mode1_ECC_cap)(struct slot *slot, u8 *mode);
+        int (*get_prog_int)(struct slot *slot, u8 *prog_int);
+        int (*query_power_fault)(struct slot *slot);
+        void (*green_led_on)(struct slot *slot);
+        void (*green_led_off)(struct slot *slot);
+        void (*green_led_blink)(struct slot *slot);
+        void (*release_ctlr)(struct controller *ctrl);
+        int (*check_cmd_status)(struct controller *ctrl);
 };
 
 #endif                          /* _SHPCHP_H */
diff --git a/drivers/pci/hotplug/shpchp_core.c b/drivers/pci/hotplug/shpchp_core.c
index 4eac85b3d9..590cd3cbe0 100644
--- a/drivers/pci/hotplug/shpchp_core.c
+++ b/drivers/pci/hotplug/shpchp_core.c
@@ -104,23 +104,6 @@ static void make_slot_name(struct slot *slot)
                  slot->bus, slot->number);
 }
 
-
-
-
-static int
-shpchprm_get_physical_slot_number(struct controller *ctrl, u32 *sun,
-                                u8 busnum, u8 devnum)
-{
-        int offset = devnum - ctrl->slot_device_offset;
-
-        dbg("%s: ctrl->slot_num_inc %d, offset %d\n", __FUNCTION__,
-                        ctrl->slot_num_inc, offset);
-        *sun = (u8) (ctrl->first_slot + ctrl->slot_num_inc *offset);
-        return 0;
-}
-
-
-
 static int init_slots(struct controller *ctrl)
 {
         struct slot *slot;
@@ -128,7 +111,6 @@ static int init_slots(struct controller *ctrl)
         struct hotplug_slot_info *info;
         int retval = -ENOMEM;
         int i;
-        u32 sun;
 
         for (i = 0; i < ctrl->num_slots; i++) {
                 slot = kzalloc(sizeof(*slot), GFP_KERNEL);
@@ -149,16 +131,11 @@ static int init_slots(struct controller *ctrl)
 
                 slot->hp_slot = i;
                 slot->ctrl = ctrl;
-                slot->bus = ctrl->slot_bus;
+                slot->bus = ctrl->pci_dev->subordinate->number;
                 slot->device = ctrl->slot_device_offset + i;
                 slot->hpc_ops = ctrl->hpc_ops;
+                slot->number = ctrl->first_slot + (ctrl->slot_num_inc * i);
                 mutex_init(&slot->lock);
-
-                if (shpchprm_get_physical_slot_number(ctrl, &sun,
-                                                      slot->bus, slot->device))
-                        goto error_info;
-
-                slot->number = sun;
                 INIT_DELAYED_WORK(&slot->work, queue_pushbutton_work);
 
                 /* register this slot with the hotplug pci core */
@@ -211,42 +188,12 @@ void cleanup_slots(struct controller *ctrl)
         }
 }
 
-static int get_ctlr_slot_config(struct controller *ctrl)
-{
-        int num_ctlr_slots;
-        int first_device_num;
-        int physical_slot_num;
-        int updown;
-        int rc;
-        int flags;
-
-        rc = shpc_get_ctlr_slot_config(ctrl, &num_ctlr_slots,
-                                       &first_device_num, &physical_slot_num,
-                                       &updown, &flags);
-        if (rc) {
-                err("%s: get_ctlr_slot_config fail for b:d (%x:%x)\n",
-                    __FUNCTION__, ctrl->bus, ctrl->device);
-                return -1;
-        }
-
-        ctrl->num_slots = num_ctlr_slots;
-        ctrl->slot_device_offset = first_device_num;
-        ctrl->first_slot = physical_slot_num;
-        ctrl->slot_num_inc = updown;            /* either -1 or 1 */
-
-        dbg("%s: num_slot(0x%x) 1st_dev(0x%x) psn(0x%x) updown(%d) for b:d "
-            "(%x:%x)\n", __FUNCTION__, num_ctlr_slots, first_device_num,
-            physical_slot_num, updown, ctrl->bus, ctrl->device);
-
-        return 0;
-}
-
 /*
  * set_attention_status - Turns the Amber LED for a slot on, off or blink
  */
 static int set_attention_status (struct hotplug_slot *hotplug_slot, u8 status)
 {
-        struct slot *slot = get_slot(hotplug_slot, __FUNCTION__);
+        struct slot *slot = get_slot(hotplug_slot);
 
         dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
 
@@ -258,7 +205,7 @@ static int set_attention_status (struct hotplug_slot *hotplug_slot, u8 status)
 
 static int enable_slot (struct hotplug_slot *hotplug_slot)
 {
-        struct slot *slot = get_slot(hotplug_slot, __FUNCTION__);
+        struct slot *slot = get_slot(hotplug_slot);
 
         dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
 
@@ -267,7 +214,7 @@ static int enable_slot (struct hotplug_slot *hotplug_slot)
 
 static int disable_slot (struct hotplug_slot *hotplug_slot)
 {
-        struct slot *slot = get_slot(hotplug_slot, __FUNCTION__);
+        struct slot *slot = get_slot(hotplug_slot);
 
         dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
 
@@ -276,7 +223,7 @@ static int disable_slot (struct hotplug_slot *hotplug_slot)
 
 static int get_power_status (struct hotplug_slot *hotplug_slot, u8 *value)
 {
-        struct slot *slot = get_slot(hotplug_slot, __FUNCTION__);
+        struct slot *slot = get_slot(hotplug_slot);
         int retval;
 
         dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
@@ -290,7 +237,7 @@ static int get_power_status (struct hotplug_slot *hotplug_slot, u8 *value)
 
 static int get_attention_status (struct hotplug_slot *hotplug_slot, u8 *value)
 {
-        struct slot *slot = get_slot(hotplug_slot, __FUNCTION__);
+        struct slot *slot = get_slot(hotplug_slot);
         int retval;
 
         dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
@@ -304,7 +251,7 @@ static int get_attention_status (struct hotplug_slot *hotplug_slot, u8 *value)
 
 static int get_latch_status (struct hotplug_slot *hotplug_slot, u8 *value)
 {
-        struct slot *slot = get_slot(hotplug_slot, __FUNCTION__);
+        struct slot *slot = get_slot(hotplug_slot);
         int retval;
 
         dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
@@ -318,7 +265,7 @@ static int get_latch_status (struct hotplug_slot *hotplug_slot, u8 *value)
 
 static int get_adapter_status (struct hotplug_slot *hotplug_slot, u8 *value)
 {
-        struct slot *slot = get_slot(hotplug_slot, __FUNCTION__);
+        struct slot *slot = get_slot(hotplug_slot);
         int retval;
 
         dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
@@ -332,7 +279,7 @@ static int get_adapter_status (struct hotplug_slot *hotplug_slot, u8 *value)
 
 static int get_address (struct hotplug_slot *hotplug_slot, u32 *value)
 {
-        struct slot *slot = get_slot(hotplug_slot, __FUNCTION__);
+        struct slot *slot = get_slot(hotplug_slot);
         struct pci_bus *bus = slot->ctrl->pci_dev->subordinate;
 
         dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
@@ -344,7 +291,7 @@ static int get_address (struct hotplug_slot *hotplug_slot, u32 *value)
 
 static int get_max_bus_speed (struct hotplug_slot *hotplug_slot, enum pci_bus_speed *value)
 {
-        struct slot *slot = get_slot(hotplug_slot, __FUNCTION__);
+        struct slot *slot = get_slot(hotplug_slot);
         int retval;
 
         dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
@@ -358,7 +305,7 @@ static int get_max_bus_speed (struct hotplug_slot *hotplug_slot, enum pci_bus_sp
 
 static int get_cur_bus_speed (struct hotplug_slot *hotplug_slot, enum pci_bus_speed *value)
 {
-        struct slot *slot = get_slot(hotplug_slot, __FUNCTION__);
+        struct slot *slot = get_slot(hotplug_slot);
         int retval;
 
         dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
@@ -385,9 +332,6 @@ static int shpc_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 {
         int rc;
         struct controller *ctrl;
-        struct slot *t_slot;
-        int first_device_num;   /* first PCI device number */
-        int num_ctlr_slots;     /* number of slots implemented */
 
         if (!is_shpc_capable(pdev))
                 return -ENODEV;
@@ -408,47 +352,13 @@ static int shpc_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 
         pci_set_drvdata(pdev, ctrl);
 
-        ctrl->bus = pdev->bus->number;
-        ctrl->slot_bus = pdev->subordinate->number;
-        ctrl->device = PCI_SLOT(pdev->devfn);
-        ctrl->function = PCI_FUNC(pdev->devfn);
-
-        dbg("ctrl bus=0x%x, device=%x, function=%x, irq=%x\n",
-            ctrl->bus, ctrl->device, ctrl->function, pdev->irq);
-
-        /*
-         * Save configuration headers for this and subordinate PCI buses
-         */
-        rc = get_ctlr_slot_config(ctrl);
-        if (rc) {
-                err(msg_initialization_err, rc);
-                goto err_out_release_ctlr;
-        }
-        first_device_num = ctrl->slot_device_offset;
-        num_ctlr_slots = ctrl->num_slots;
-
-        ctrl->add_support = 1;
-
         /* Setup the slot information structures */
         rc = init_slots(ctrl);
         if (rc) {
-                err(msg_initialization_err, 6);
+                err("%s: slot initialization failed\n", SHPC_MODULE_NAME);
                 goto err_out_release_ctlr;
         }
 
-        /* Now hpc_functions (slot->hpc_ops->functions) are ready  */
-        t_slot = shpchp_find_slot(ctrl, first_device_num);
-
-        /* Check for operation bus speed */
-        rc = t_slot->hpc_ops->get_cur_bus_speed(t_slot, &ctrl->speed);
-        dbg("%s: t_slot->hp_slot %x\n", __FUNCTION__,t_slot->hp_slot);
-
-        if (rc || ctrl->speed == PCI_SPEED_UNKNOWN) {
-                err(SHPC_MODULE_NAME ": Can't get current bus speed. "
-                    "Set to 33MHz PCI.\n");
-                ctrl->speed = PCI_SPEED_33MHz;
-        }
-
         rc = shpchp_create_ctrl_files(ctrl);
         if (rc)
                 goto err_cleanup_slots;
diff --git a/drivers/pci/hotplug/shpchp_ctrl.c b/drivers/pci/hotplug/shpchp_ctrl.c
index 158ac78360..6bb84734cd 100644
--- a/drivers/pci/hotplug/shpchp_ctrl.c
+++ b/drivers/pci/hotplug/shpchp_ctrl.c
@@ -57,9 +57,8 @@ static int queue_interrupt_event(struct slot *p_slot, u32 event_type)
         return 0;
 }
 
-u8 shpchp_handle_attention_button(u8 hp_slot, void *inst_id)
+u8 shpchp_handle_attention_button(u8 hp_slot, struct controller *ctrl)
 {
-        struct controller *ctrl = (struct controller *) inst_id;
         struct slot *p_slot;
         u32 event_type;
 
@@ -81,9 +80,8 @@ u8 shpchp_handle_attention_button(u8 hp_slot, void *inst_id)
 
 }
 
-u8 shpchp_handle_switch_change(u8 hp_slot, void *inst_id)
+u8 shpchp_handle_switch_change(u8 hp_slot, struct controller *ctrl)
 {
-        struct controller *ctrl = (struct controller *) inst_id;
         struct slot *p_slot;
         u8 getstatus;
         u32 event_type;
@@ -120,9 +118,8 @@ u8 shpchp_handle_switch_change(u8 hp_slot, void *inst_id)
         return 1;
 }
 
-u8 shpchp_handle_presence_change(u8 hp_slot, void *inst_id)
+u8 shpchp_handle_presence_change(u8 hp_slot, struct controller *ctrl)
 {
-        struct controller *ctrl = (struct controller *) inst_id;
         struct slot *p_slot;
         u32 event_type;
 
@@ -154,9 +151,8 @@ u8 shpchp_handle_presence_change(u8 hp_slot, void *inst_id)
         return 1;
 }
 
-u8 shpchp_handle_power_fault(u8 hp_slot, void *inst_id)
+u8 shpchp_handle_power_fault(u8 hp_slot, struct controller *ctrl)
 {
-        struct controller *ctrl = (struct controller *) inst_id;
         struct slot *p_slot;
         u32 event_type;
 
@@ -497,10 +493,12 @@ static void handle_button_press_event(struct slot *p_slot)
                 p_slot->hpc_ops->get_power_status(p_slot, &getstatus);
                 if (getstatus) {
                         p_slot->state = BLINKINGOFF_STATE;
-                        info(msg_button_off, p_slot->name);
+                        info("PCI slot #%s - powering off due to button "
+                             "press.\n", p_slot->name);
                 } else {
                         p_slot->state = BLINKINGON_STATE;
-                        info(msg_button_on, p_slot->name);
+                        info("PCI slot #%s - powering on due to button "
+                             "press.\n", p_slot->name);
                 }
                 /* blink green LED and turn off amber */
                 p_slot->hpc_ops->green_led_blink(p_slot);
@@ -523,7 +521,8 @@ static void handle_button_press_event(struct slot *p_slot)
                 else
                         p_slot->hpc_ops->green_led_off(p_slot);
                 p_slot->hpc_ops->set_attention_status(p_slot, 0);
-                info(msg_button_cancel, p_slot->name);
+                info("PCI slot #%s - action canceled due to button press\n",
+                     p_slot->name);
                 p_slot->state = STATIC_STATE;
                 break;
         case POWEROFF_STATE:
diff --git a/drivers/pci/hotplug/shpchp_hpc.c b/drivers/pci/hotplug/shpchp_hpc.c
index 83a5226ba9..b7bede4b7c 100644
--- a/drivers/pci/hotplug/shpchp_hpc.c
+++ b/drivers/pci/hotplug/shpchp_hpc.c
@@ -212,44 +212,40 @@
 #define SLOT_SERR_INT_MASK      0x3
 
 DEFINE_DBG_BUFFER               /* Debug string buffer for entire HPC defined here */
-static struct php_ctlr_state_s *php_ctlr_list_head;     /* HPC state linked list */
-static int ctlr_seq_num = 0;    /* Controller sequenc # */
-static spinlock_t list_lock;
-
 static atomic_t shpchp_num_controllers = ATOMIC_INIT(0);
 
 static irqreturn_t shpc_isr(int irq, void *dev_id);
-static void start_int_poll_timer(struct php_ctlr_state_s *php_ctlr, int sec);
+static void start_int_poll_timer(struct controller *ctrl, int sec);
 static int hpc_check_cmd_status(struct controller *ctrl);
 
 static inline u8 shpc_readb(struct controller *ctrl, int reg)
 {
-        return readb(ctrl->hpc_ctlr_handle->creg + reg);
+        return readb(ctrl->creg + reg);
 }
 
 static inline void shpc_writeb(struct controller *ctrl, int reg, u8 val)
 {
-        writeb(val, ctrl->hpc_ctlr_handle->creg + reg);
+        writeb(val, ctrl->creg + reg);
 }
 
 static inline u16 shpc_readw(struct controller *ctrl, int reg)
 {
-        return readw(ctrl->hpc_ctlr_handle->creg + reg);
+        return readw(ctrl->creg + reg);
 }
 
 static inline void shpc_writew(struct controller *ctrl, int reg, u16 val)
 {
-        writew(val, ctrl->hpc_ctlr_handle->creg + reg);
+        writew(val, ctrl->creg + reg);
 }
 
 static inline u32 shpc_readl(struct controller *ctrl, int reg)
 {
-        return readl(ctrl->hpc_ctlr_handle->creg + reg);
+        return readl(ctrl->creg + reg);
 }
 
 static inline void shpc_writel(struct controller *ctrl, int reg, u32 val)
 {
-        writel(val, ctrl->hpc_ctlr_handle->creg + reg);
+        writel(val, ctrl->creg + reg);
 }
 
 static inline int shpc_indirect_read(struct controller *ctrl, int index,
@@ -268,21 +264,20 @@ static inline int shpc_indirect_read(struct controller *ctrl, int index,
 /*
  * This is the interrupt polling timeout function.
  */
-static void int_poll_timeout(unsigned long lphp_ctlr)
+static void int_poll_timeout(unsigned long data)
 {
-        struct php_ctlr_state_s *php_ctlr =
-                (struct php_ctlr_state_s *)lphp_ctlr;
+        struct controller *ctrl = (struct controller *)data;
 
         DBG_ENTER_ROUTINE
 
         /* Poll for interrupt events.  regs == NULL => polling */
-        shpc_isr(0, php_ctlr->callback_instance_id);
+        shpc_isr(0, ctrl);
 
-        init_timer(&php_ctlr->int_poll_timer);
+        init_timer(&ctrl->poll_timer);
         if (!shpchp_poll_time)
                 shpchp_poll_time = 2; /* default polling interval is 2 sec */
 
-        start_int_poll_timer(php_ctlr, shpchp_poll_time);
+        start_int_poll_timer(ctrl, shpchp_poll_time);
 
         DBG_LEAVE_ROUTINE
 }
@@ -290,16 +285,16 @@ static void int_poll_timeout(unsigned long lphp_ctlr)
 /*
  * This function starts the interrupt polling timer.
  */
-static void start_int_poll_timer(struct php_ctlr_state_s *php_ctlr, int sec)
+static void start_int_poll_timer(struct controller *ctrl, int sec)
 {
         /* Clamp to sane value */
         if ((sec <= 0) || (sec > 60))
                 sec = 2;
 
-        php_ctlr->int_poll_timer.function = &int_poll_timeout;
-        php_ctlr->int_poll_timer.data = (unsigned long)php_ctlr;
-        php_ctlr->int_poll_timer.expires = jiffies + sec * HZ;
-        add_timer(&php_ctlr->int_poll_timer);
+        ctrl->poll_timer.function = &int_poll_timeout;
+        ctrl->poll_timer.data = (unsigned long)ctrl;
+        ctrl->poll_timer.expires = jiffies + sec * HZ;
+        add_timer(&ctrl->poll_timer);
 }
 
 static inline int is_ctrl_busy(struct controller *ctrl)
@@ -666,33 +661,8 @@ static void hpc_set_green_led_blink(struct slot *slot)
         shpc_write_cmd(slot, slot->hp_slot, SET_PWR_BLINK);
 }
 
-int shpc_get_ctlr_slot_config(struct controller *ctrl,
-        int *num_ctlr_slots,    /* number of slots in this HPC                  */
-        int *first_device_num,  /* PCI dev num of the first slot in this SHPC   */
-        int *physical_slot_num, /* phy slot num of the first slot in this SHPC  */
-        int *updown,            /* physical_slot_num increament: 1 or -1        */
-        int *flags)
-{
-        u32 slot_config;
-
-        DBG_ENTER_ROUTINE 
-
-        slot_config = shpc_readl(ctrl, SLOT_CONFIG);
-        *first_device_num = (slot_config & FIRST_DEV_NUM) >> 8;
-        *num_ctlr_slots = slot_config & SLOT_NUM;
-        *physical_slot_num = (slot_config & PSN) >> 16;
-        *updown = ((slot_config & UPDOWN) >> 29) ? 1 : -1;
-
-        dbg("%s: physical_slot_num = %x\n", __FUNCTION__, *physical_slot_num);
-
-        DBG_LEAVE_ROUTINE 
-        return 0;
-}
-
 static void hpc_release_ctlr(struct controller *ctrl)
 {
-        struct php_ctlr_state_s *php_ctlr = ctrl->hpc_ctlr_handle;
-        struct php_ctlr_state_s *p, *p_prev;
         int i;
         u32 slot_reg, serr_int;
 
@@ -722,40 +692,15 @@ static void hpc_release_ctlr(struct controller *ctrl)
         serr_int &= ~SERR_INTR_RSVDZ_MASK;
         shpc_writel(ctrl, SERR_INTR_ENABLE, serr_int);
 
-        if (shpchp_poll_mode) {
-            del_timer(&php_ctlr->int_poll_timer);
-        } else {        
-                if (php_ctlr->irq) {
-                        free_irq(php_ctlr->irq, ctrl);
-                        php_ctlr->irq = 0;
-                        pci_disable_msi(php_ctlr->pci_dev);
-                }
-        }
-
-        if (php_ctlr->pci_dev) {
-                iounmap(php_ctlr->creg);
-                release_mem_region(ctrl->mmio_base, ctrl->mmio_size);
-                php_ctlr->pci_dev = NULL;
-        }
-
-        spin_lock(&list_lock);
-        p = php_ctlr_list_head;
-        p_prev = NULL;
-        while (p) {
-                if (p == php_ctlr) {
-                        if (p_prev)
-                                p_prev->pnext = p->pnext;
-                        else
-                                php_ctlr_list_head = p->pnext;
-                        break;
-                } else {
-                        p_prev = p;
-                        p = p->pnext;
-                }
+        if (shpchp_poll_mode)
+                del_timer(&ctrl->poll_timer);
+        else {
+                free_irq(ctrl->pci_dev->irq, ctrl);
+                pci_disable_msi(ctrl->pci_dev);
         }
-        spin_unlock(&list_lock);
 
-        kfree(php_ctlr);
+        iounmap(ctrl->creg);
+        release_mem_region(ctrl->mmio_base, ctrl->mmio_size);
 
         /*
          * If this is the last controller to be released, destroy the
@@ -764,8 +709,7 @@ static void hpc_release_ctlr(struct controller *ctrl)
         if (atomic_dec_and_test(&shpchp_num_controllers))
                 destroy_workqueue(shpchp_wq);
 
-DBG_LEAVE_ROUTINE
-                          
+        DBG_LEAVE_ROUTINE
 }
 
 static int hpc_power_on_slot(struct slot * slot)
@@ -891,7 +835,6 @@ static int hpc_set_bus_speed_mode(struct slot * slot, enum pci_bus_speed value)
 static irqreturn_t shpc_isr(int irq, void *dev_id)
 {
         struct controller *ctrl = (struct controller *)dev_id;
-        struct php_ctlr_state_s *php_ctlr = ctrl->hpc_ctlr_handle;
         u32 serr_int, slot_reg, intr_loc, intr_loc2;
         int hp_slot;
 
@@ -942,20 +885,16 @@ static irqreturn_t shpc_isr(int irq, void *dev_id)
                     __FUNCTION__, hp_slot, slot_reg);
 
                 if (slot_reg & MRL_CHANGE_DETECTED)
-                        php_ctlr->switch_change_callback(
-                                hp_slot, php_ctlr->callback_instance_id);
+                        shpchp_handle_switch_change(hp_slot, ctrl);
 
                 if (slot_reg & BUTTON_PRESS_DETECTED)
-                        php_ctlr->attention_button_callback(
-                                hp_slot, php_ctlr->callback_instance_id);
+                        shpchp_handle_attention_button(hp_slot, ctrl);
 
                 if (slot_reg & PRSNT_CHANGE_DETECTED)
-                        php_ctlr->presence_change_callback(
-                                hp_slot , php_ctlr->callback_instance_id);
+                        shpchp_handle_presence_change(hp_slot, ctrl);
 
                 if (slot_reg & (ISO_PFAULT_DETECTED | CON_PFAULT_DETECTED))
-                        php_ctlr->power_fault_callback(
-                                hp_slot, php_ctlr->callback_instance_id);
+                        shpchp_handle_power_fault(hp_slot, ctrl);
 
                 /* Clear all slot events */
                 slot_reg &= ~SLOT_REG_RSVDZ_MASK;
@@ -1114,10 +1053,8 @@ static struct hpc_ops shpchp_hpc_ops = {
         .release_ctlr                   = hpc_release_ctlr,
 };
 
-int shpc_init(struct controller * ctrl, struct pci_dev * pdev)
+int shpc_init(struct controller *ctrl, struct pci_dev *pdev)
 {
-        struct php_ctlr_state_s *php_ctlr, *p;
-        void *instance_id = ctrl;
         int rc = -1, num_slots = 0;
         u8 hp_slot;
         u32 shpc_base_offset;
@@ -1128,16 +1065,6 @@ int shpc_init(struct controller * ctrl, struct pci_dev * pdev)
 
         ctrl->pci_dev = pdev;  /* pci_dev of the P2P bridge */
 
-        spin_lock_init(&list_lock);
-        php_ctlr = kzalloc(sizeof(*php_ctlr), GFP_KERNEL);
-
-        if (!php_ctlr) {        /* allocate controller state data */
-                err("%s: HPC controller memory allocation error!\n", __FUNCTION__);
-                goto abort;
-        }
-
-        php_ctlr->pci_dev = pdev;       /* save pci_dev in context */
-
         if ((pdev->vendor == PCI_VENDOR_ID_AMD) || (pdev->device ==
                                 PCI_DEVICE_ID_AMD_GOLAM_7450)) {
                 /* amd shpc driver doesn't use Base Offset; assume 0 */
@@ -1147,20 +1074,20 @@ int shpc_init(struct controller * ctrl, struct pci_dev * pdev)
                 ctrl->cap_offset = pci_find_capability(pdev, PCI_CAP_ID_SHPC);
                 if (!ctrl->cap_offset) {
                         err("%s : cap_offset == 0\n", __FUNCTION__);
-                        goto abort_free_ctlr;
+                        goto abort;
                 }
                 dbg("%s: cap_offset = %x\n", __FUNCTION__, ctrl->cap_offset);
 
                 rc = shpc_indirect_read(ctrl, 0, &shpc_base_offset);
                 if (rc) {
                         err("%s: cannot read base_offset\n", __FUNCTION__);
-                        goto abort_free_ctlr;
+                        goto abort;
                 }
 
                 rc = shpc_indirect_read(ctrl, 3, &tempdword);
                 if (rc) {
                         err("%s: cannot read slot config\n", __FUNCTION__);
-                        goto abort_free_ctlr;
+                        goto abort;
                 }
                 num_slots = tempdword & SLOT_NUM;
                 dbg("%s: num_slots (indirect) %x\n", __FUNCTION__, num_slots);
@@ -1170,7 +1097,7 @@ int shpc_init(struct controller * ctrl, struct pci_dev * pdev)
                         if (rc) {
                                 err("%s: cannot read creg (index = %d)\n",
                                     __FUNCTION__, i);
-                                goto abort_free_ctlr;
+                                goto abort;
                         }
                         dbg("%s: offset %d: value %x\n", __FUNCTION__,i,
                                         tempdword);
@@ -1187,24 +1114,24 @@ int shpc_init(struct controller * ctrl, struct pci_dev * pdev)
         rc = pci_enable_device(pdev);
         if (rc) {
                 err("%s: pci_enable_device failed\n", __FUNCTION__);
-                goto abort_free_ctlr;
+                goto abort;
         }
 
         if (!request_mem_region(ctrl->mmio_base, ctrl->mmio_size, MY_NAME)) {
                 err("%s: cannot reserve MMIO region\n", __FUNCTION__);
                 rc = -1;
-                goto abort_free_ctlr;
+                goto abort;
         }
 
-        php_ctlr->creg = ioremap(ctrl->mmio_base, ctrl->mmio_size);
-        if (!php_ctlr->creg) {
+        ctrl->creg = ioremap(ctrl->mmio_base, ctrl->mmio_size);
+        if (!ctrl->creg) {
                 err("%s: cannot remap MMIO region %lx @ %lx\n", __FUNCTION__,
                     ctrl->mmio_size, ctrl->mmio_base);
                 release_mem_region(ctrl->mmio_base, ctrl->mmio_size);
                 rc = -1;
-                goto abort_free_ctlr;
+                goto abort;
         }
-        dbg("%s: php_ctlr->creg %p\n", __FUNCTION__, php_ctlr->creg);
+        dbg("%s: ctrl->creg %p\n", __FUNCTION__, ctrl->creg);
 
         mutex_init(&ctrl->crit_sect);
         mutex_init(&ctrl->cmd_lock);
@@ -1212,23 +1139,14 @@ int shpc_init(struct controller * ctrl, struct pci_dev * pdev)
         /* Setup wait queue */
         init_waitqueue_head(&ctrl->queue);
 
-        /* Find the IRQ */
-        php_ctlr->irq = pdev->irq;
-        php_ctlr->attention_button_callback = shpchp_handle_attention_button,
-        php_ctlr->switch_change_callback = shpchp_handle_switch_change;
-        php_ctlr->presence_change_callback = shpchp_handle_presence_change;
-        php_ctlr->power_fault_callback = shpchp_handle_power_fault;
-        php_ctlr->callback_instance_id = instance_id;
-
-        ctrl->hpc_ctlr_handle = php_ctlr;
         ctrl->hpc_ops = &shpchp_hpc_ops;
 
         /* Return PCI Controller Info */
         slot_config = shpc_readl(ctrl, SLOT_CONFIG);
-        php_ctlr->slot_device_offset = (slot_config & FIRST_DEV_NUM) >> 8;
-        php_ctlr->num_slots = slot_config & SLOT_NUM;
-        dbg("%s: slot_device_offset %x\n", __FUNCTION__, php_ctlr->slot_device_offset);
-        dbg("%s: num_slots %x\n", __FUNCTION__, php_ctlr->num_slots);
+        ctrl->slot_device_offset = (slot_config & FIRST_DEV_NUM) >> 8;
+        ctrl->num_slots = slot_config & SLOT_NUM;
+        ctrl->first_slot = (slot_config & PSN) >> 16;
+        ctrl->slot_num_inc = ((slot_config & UPDOWN) >> 29) ? 1 : -1;
 
         /* Mask Global Interrupt Mask & Command Complete Interrupt Mask */
         tempdword = shpc_readl(ctrl, SERR_INTR_ENABLE);
@@ -1243,7 +1161,7 @@ int shpc_init(struct controller * ctrl, struct pci_dev * pdev)
         /* Mask the MRL sensor SERR Mask of individual slot in
          * Slot SERR-INT Mask & clear all the existing event if any
          */
-        for (hp_slot = 0; hp_slot < php_ctlr->num_slots; hp_slot++) {
+        for (hp_slot = 0; hp_slot < ctrl->num_slots; hp_slot++) {
                 slot_reg = shpc_readl(ctrl, SLOT_REG(hp_slot));
                 dbg("%s: Default Logical Slot Register %d value %x\n", __FUNCTION__,
                         hp_slot, slot_reg);
@@ -1255,24 +1173,27 @@ int shpc_init(struct controller * ctrl, struct pci_dev * pdev)
                 shpc_writel(ctrl, SLOT_REG(hp_slot), slot_reg);
         }
         
-        if (shpchp_poll_mode)  {/* Install interrupt polling code */
-                /* Install and start the interrupt polling timer */
-                init_timer(&php_ctlr->int_poll_timer);
-                start_int_poll_timer( php_ctlr, 10 );   /* start with 10 second delay */
+        if (shpchp_poll_mode) {
+                /* Install interrupt polling timer. Start with 10 sec delay */
+                init_timer(&ctrl->poll_timer);
+                start_int_poll_timer(ctrl, 10);
         } else {
                 /* Installs the interrupt handler */
                 rc = pci_enable_msi(pdev);
                 if (rc) {
                         info("Can't get msi for the hotplug controller\n");
                         info("Use INTx for the hotplug controller\n");
-                } else
-                        php_ctlr->irq = pdev->irq;
+                }
                 
-                rc = request_irq(php_ctlr->irq, shpc_isr, IRQF_SHARED, MY_NAME, (void *) ctrl);
-                dbg("%s: request_irq %d for hpc%d (returns %d)\n", __FUNCTION__, php_ctlr->irq, ctlr_seq_num, rc);
+                rc = request_irq(ctrl->pci_dev->irq, shpc_isr, IRQF_SHARED,
+                                 MY_NAME, (void *)ctrl);
+                dbg("%s: request_irq %d for hpc%d (returns %d)\n",
+                    __FUNCTION__, ctrl->pci_dev->irq,
+                    atomic_read(&shpchp_num_controllers), rc);
                 if (rc) {
-                        err("Can't get irq %d for the hotplug controller\n", php_ctlr->irq);
-                        goto abort_free_ctlr;
+                        err("Can't get irq %d for the hotplug controller\n",
+                            ctrl->pci_dev->irq);
+                        goto abort_iounmap;
                 }
         }
         dbg("%s: HPC at b:d:f:irq=0x%x:%x:%x:%x\n", __FUNCTION__,
@@ -1280,24 +1201,6 @@ int shpc_init(struct controller * ctrl, struct pci_dev * pdev)
                         PCI_FUNC(pdev->devfn), pdev->irq);
         get_hp_hw_control_from_firmware(pdev);
 
-        /*  Add this HPC instance into the HPC list */
-        spin_lock(&list_lock);
-        if (php_ctlr_list_head == 0) {
-                php_ctlr_list_head = php_ctlr;
-                p = php_ctlr_list_head;
-                p->pnext = NULL;
-        } else {
-                p = php_ctlr_list_head;
-
-                while (p->pnext)
-                        p = p->pnext;
-
-                p->pnext = php_ctlr;
-        }
-        spin_unlock(&list_lock);
-
-        ctlr_seq_num++;
-
         /*
          * If this is the first controller to be initialized,
          * initialize the shpchpd work queue
@@ -1306,14 +1209,14 @@ int shpc_init(struct controller * ctrl, struct pci_dev * pdev)
                 shpchp_wq = create_singlethread_workqueue("shpchpd");
                 if (!shpchp_wq) {
                         rc = -ENOMEM;
-                        goto abort_free_ctlr;
+                        goto abort_iounmap;
                 }
         }
 
         /*
          * Unmask all event interrupts of all slots
          */
-        for (hp_slot = 0; hp_slot < php_ctlr->num_slots; hp_slot++) {
+        for (hp_slot = 0; hp_slot < ctrl->num_slots; hp_slot++) {
                 slot_reg = shpc_readl(ctrl, SLOT_REG(hp_slot));
                 dbg("%s: Default Logical Slot Register %d value %x\n", __FUNCTION__,
                         hp_slot, slot_reg);
@@ -1336,10 +1239,8 @@ int shpc_init(struct controller * ctrl, struct pci_dev * pdev)
         return 0;
 
         /* We end up here for the many possible ways to fail this API.  */
-abort_free_ctlr:
-        if (php_ctlr->creg)
-                iounmap(php_ctlr->creg);
-        kfree(php_ctlr);
+abort_iounmap:
+        iounmap(ctrl->creg);
 abort:
         DBG_LEAVE_ROUTINE
         return rc;
diff --git a/drivers/pci/htirq.c b/drivers/pci/htirq.c
index 0a8d1cce9f..279c940a00 100644
--- a/drivers/pci/htirq.c
+++ b/drivers/pci/htirq.c
@@ -99,14 +99,7 @@ int __ht_create_irq(struct pci_dev *dev, int idx, ht_irq_update_t *update)
         int pos;
         int irq;
 
-        pos = pci_find_capability(dev, PCI_CAP_ID_HT);
-        while (pos) {
-                u8 subtype;
-                pci_read_config_byte(dev, pos + 3, &subtype);
-                if (subtype == HT_CAPTYPE_IRQ)
-                        break;
-                pos = pci_find_next_capability(dev, pos, PCI_CAP_ID_HT);
-        }
+        pos = pci_find_ht_capability(dev, HT_CAPTYPE_IRQ);
         if (!pos)
                 return -EINVAL;
 
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index e5ae3a0c13..b8d2385e29 100644
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -162,14 +162,9 @@ const struct pci_device_id *pci_match_id(const struct pci_device_id *ids,
 const struct pci_device_id *pci_match_device(struct pci_driver *drv,
                                              struct pci_dev *dev)
 {
-        const struct pci_device_id *id;
         struct pci_dynid *dynid;
 
-        id = pci_match_id(drv->id_table, dev);
-        if (id)
-                return id;
-
-        /* static ids didn't match, lets look at the dynamic ones */
+        /* Look at the dynamic ids first, before the static ones */
         spin_lock(&drv->dynids.lock);
         list_for_each_entry(dynid, &drv->dynids.list, node) {
                 if (pci_match_one_device(&dynid->id, dev)) {
@@ -178,7 +173,8 @@ const struct pci_device_id *pci_match_device(struct pci_driver *drv,
                 }
         }
         spin_unlock(&drv->dynids.lock);
-        return NULL;
+
+        return pci_match_id(drv->id_table, dev);
 }
 
 static int pci_call_probe(struct pci_driver *drv, struct pci_dev *dev,
@@ -357,6 +353,8 @@ static int pci_device_resume_early(struct device * dev)
         struct pci_dev * pci_dev = to_pci_dev(dev);
         struct pci_driver * drv = pci_dev->driver;
 
+        pci_fixup_device(pci_fixup_resume, pci_dev);
+
         if (drv && drv->resume_early)
                 error = drv->resume_early(pci_dev);
         return error;
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 5a14b73cf3..6bfb942428 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -68,12 +68,14 @@ pci_max_busnr(void)
 
 #endif  /*  0  */
 
-static int __pci_find_next_cap(struct pci_bus *bus, unsigned int devfn, u8 pos, int cap)
+#define PCI_FIND_CAP_TTL        48
+
+static int __pci_find_next_cap_ttl(struct pci_bus *bus, unsigned int devfn,
+                                   u8 pos, int cap, int *ttl)
 {
         u8 id;
-        int ttl = 48;
 
-        while (ttl--) {
+        while ((*ttl)--) {
                 pci_bus_read_config_byte(bus, devfn, pos, &pos);
                 if (pos < 0x40)
                         break;
@@ -89,6 +91,14 @@ static int __pci_find_next_cap(struct pci_bus *bus, unsigned int devfn, u8 pos,
         return 0;
 }
 
+static int __pci_find_next_cap(struct pci_bus *bus, unsigned int devfn,
+                               u8 pos, int cap)
+{
+        int ttl = PCI_FIND_CAP_TTL;
+
+        return __pci_find_next_cap_ttl(bus, devfn, pos, cap, &ttl);
+}
+
 int pci_find_next_capability(struct pci_dev *dev, u8 pos, int cap)
 {
         return __pci_find_next_cap(dev->bus, dev->devfn,
@@ -96,10 +106,10 @@ int pci_find_next_capability(struct pci_dev *dev, u8 pos, int cap)
 }
 EXPORT_SYMBOL_GPL(pci_find_next_capability);
 
-static int __pci_bus_find_cap(struct pci_bus *bus, unsigned int devfn, u8 hdr_type, int cap)
+static int __pci_bus_find_cap_start(struct pci_bus *bus,
+                                    unsigned int devfn, u8 hdr_type)
 {
         u16 status;
-        u8 pos;
 
         pci_bus_read_config_word(bus, devfn, PCI_STATUS, &status);
         if (!(status & PCI_STATUS_CAP_LIST))
@@ -108,15 +118,14 @@ static int __pci_bus_find_cap(struct pci_bus *bus, unsigned int devfn, u8 hdr_ty
         switch (hdr_type) {
         case PCI_HEADER_TYPE_NORMAL:
         case PCI_HEADER_TYPE_BRIDGE:
-                pos = PCI_CAPABILITY_LIST;
-                break;
+                return PCI_CAPABILITY_LIST;
         case PCI_HEADER_TYPE_CARDBUS:
-                pos = PCI_CB_CAPABILITY_LIST;
-                break;
+                return PCI_CB_CAPABILITY_LIST;
         default:
                 return 0;
         }
-        return __pci_find_next_cap(bus, devfn, pos, cap);
+
+        return 0;
 }
 
 /**
@@ -140,7 +149,13 @@ static int __pci_bus_find_cap(struct pci_bus *bus, unsigned int devfn, u8 hdr_ty
  */
 int pci_find_capability(struct pci_dev *dev, int cap)
 {
-        return __pci_bus_find_cap(dev->bus, dev->devfn, dev->hdr_type, cap);
+        int pos;
+
+        pos = __pci_bus_find_cap_start(dev->bus, dev->devfn, dev->hdr_type);
+        if (pos)
+                pos = __pci_find_next_cap(dev->bus, dev->devfn, pos, cap);
+
+        return pos;
 }
 
 /**
@@ -158,11 +173,16 @@ int pci_find_capability(struct pci_dev *dev, int cap)
  */
 int pci_bus_find_capability(struct pci_bus *bus, unsigned int devfn, int cap)
 {
+        int pos;
         u8 hdr_type;
 
         pci_bus_read_config_byte(bus, devfn, PCI_HEADER_TYPE, &hdr_type);
 
-        return __pci_bus_find_cap(bus, devfn, hdr_type & 0x7f, cap);
+        pos = __pci_bus_find_cap_start(bus, devfn, hdr_type & 0x7f);
+        if (pos)
+                pos = __pci_find_next_cap(bus, devfn, pos, cap);
+
+        return pos;
 }
 
 /**
@@ -214,6 +234,74 @@ int pci_find_ext_capability(struct pci_dev *dev, int cap)
 }
 EXPORT_SYMBOL_GPL(pci_find_ext_capability);
 
+static int __pci_find_next_ht_cap(struct pci_dev *dev, int pos, int ht_cap)
+{
+        int rc, ttl = PCI_FIND_CAP_TTL;
+        u8 cap, mask;
+
+        if (ht_cap == HT_CAPTYPE_SLAVE || ht_cap == HT_CAPTYPE_HOST)
+                mask = HT_3BIT_CAP_MASK;
+        else
+                mask = HT_5BIT_CAP_MASK;
+
+        pos = __pci_find_next_cap_ttl(dev->bus, dev->devfn, pos,
+                                      PCI_CAP_ID_HT, &ttl);
+        while (pos) {
+                rc = pci_read_config_byte(dev, pos + 3, &cap);
+                if (rc != PCIBIOS_SUCCESSFUL)
+                        return 0;
+
+                if ((cap & mask) == ht_cap)
+                        return pos;
+
+                pos = __pci_find_next_cap_ttl(dev->bus, dev->devfn, pos,
+                                              PCI_CAP_ID_HT, &ttl);
+        }
+
+        return 0;
+}
+/**
+ * pci_find_next_ht_capability - query a device's Hypertransport capabilities
+ * @dev: PCI device to query
+ * @pos: Position from which to continue searching
+ * @ht_cap: Hypertransport capability code
+ *
+ * To be used in conjunction with pci_find_ht_capability() to search for
+ * all capabilities matching @ht_cap. @pos should always be a value returned
+ * from pci_find_ht_capability().
+ *
+ * NB. To be 100% safe against broken PCI devices, the caller should take
+ * steps to avoid an infinite loop.
+ */
+int pci_find_next_ht_capability(struct pci_dev *dev, int pos, int ht_cap)
+{
+        return __pci_find_next_ht_cap(dev, pos + PCI_CAP_LIST_NEXT, ht_cap);
+}
+EXPORT_SYMBOL_GPL(pci_find_next_ht_capability);
+
+/**
+ * pci_find_ht_capability - query a device's Hypertransport capabilities
+ * @dev: PCI device to query
+ * @ht_cap: Hypertransport capability code
+ *
+ * Tell if a device supports a given Hypertransport capability.
+ * Returns an address within the device's PCI configuration space
+ * or 0 in case the device does not support the request capability.
+ * The address points to the PCI capability, of type PCI_CAP_ID_HT,
+ * which has a Hypertransport capability matching @ht_cap.
+ */
+int pci_find_ht_capability(struct pci_dev *dev, int ht_cap)
+{
+        int pos;
+
+        pos = __pci_bus_find_cap_start(dev->bus, dev->devfn, dev->hdr_type);
+        if (pos)
+                pos = __pci_find_next_ht_cap(dev, pos, ht_cap);
+
+        return pos;
+}
+EXPORT_SYMBOL_GPL(pci_find_ht_capability);
+
 /**
  * pci_find_parent_resource - return resource region of parent bus of given region
  * @dev: PCI device structure contains resources to be searched
diff --git a/drivers/pci/pcie/portdrv_pci.c b/drivers/pci/pcie/portdrv_pci.c
index b4da795461..f17e7ed2b2 100644
--- a/drivers/pci/pcie/portdrv_pci.c
+++ b/drivers/pci/pcie/portdrv_pci.c
@@ -90,7 +90,7 @@ static int __devinit pcie_portdrv_probe (struct pci_dev *dev,
                 return -ENODEV;
         
         pci_set_master(dev);
-        if (!dev->irq) {
+        if (!dev->irq && dev->pin) {
                 printk(KERN_WARNING 
                 "%s->Dev[%04x:%04x] has invalid IRQ. Check vendor BIOS\n", 
                 __FUNCTION__, dev->device, dev->vendor);
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 6a3c1e7289..1ae9c3f50f 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -649,6 +649,9 @@ static void pci_read_irq(struct pci_dev *dev)
  * Returns 0 on success and -1 if unknown type of device (not normal, bridge
  * or CardBus).
  */
+
+#define LEGACY_IO_RESOURCE      (IORESOURCE_IO | IORESOURCE_PCI_FIXED)
+
 static int pci_setup_device(struct pci_dev * dev)
 {
         u32 class;
@@ -692,18 +695,18 @@ static int pci_setup_device(struct pci_dev * dev)
                         if ((progif & 1) == 0) {
                                 dev->resource[0].start = 0x1F0;
                                 dev->resource[0].end = 0x1F7;
-                                dev->resource[0].flags = IORESOURCE_IO;
+                                dev->resource[0].flags = LEGACY_IO_RESOURCE;
                                 dev->resource[1].start = 0x3F6;
                                 dev->resource[1].end = 0x3F6;
-                                dev->resource[1].flags = IORESOURCE_IO;
+                                dev->resource[1].flags = LEGACY_IO_RESOURCE;
                         }
                         if ((progif & 4) == 0) {
                                 dev->resource[2].start = 0x170;
                                 dev->resource[2].end = 0x177;
-                                dev->resource[2].flags = IORESOURCE_IO;
+                                dev->resource[2].flags = LEGACY_IO_RESOURCE;
                                 dev->resource[3].start = 0x376;
                                 dev->resource[3].end = 0x376;
-                                dev->resource[3].flags = IORESOURCE_IO;
+                                dev->resource[3].flags = LEGACY_IO_RESOURCE;
                         }
                 }
                 break;
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index 9ca9b9bf61..8f0322d6f3 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -36,7 +36,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_MELLANOX,PCI_DEVICE_ID_MELLANOX_TAVOR_BRID
 
 /* Deal with broken BIOS'es that neglect to enable passive release,
    which can cause problems in combination with the 82441FX/PPro MTRRs */
-static void __devinit quirk_passive_release(struct pci_dev *dev)
+static void quirk_passive_release(struct pci_dev *dev)
 {
         struct pci_dev *d = NULL;
         unsigned char dlc;
@@ -53,6 +53,7 @@ static void __devinit quirk_passive_release(struct pci_dev *dev)
         }
 }
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL,    PCI_DEVICE_ID_INTEL_82441,      quirk_passive_release );
+DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_82441,      quirk_passive_release );
 
 /*  The VIA VP2/VP3/MVP3 seem to have some 'features'. There may be a workaround
     but VIA don't answer queries. If you happen to have good contacts at VIA
@@ -134,7 +135,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 	PCI_DEVICE_ID_INTEL_82439TX, 	quir
  *      Updated based on further information from the site and also on
  *      information provided by VIA 
  */
-static void __devinit quirk_vialatency(struct pci_dev *dev)
+static void quirk_vialatency(struct pci_dev *dev)
 {
         struct pci_dev *p;
         u8 rev;
@@ -185,6 +186,10 @@ exit:
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA,      PCI_DEVICE_ID_VIA_8363_0,       quirk_vialatency );
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA,      PCI_DEVICE_ID_VIA_8371_1,       quirk_vialatency );
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA,      PCI_DEVICE_ID_VIA_8361,         quirk_vialatency );
+/* Must restore this on a resume from RAM */
+DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_VIA,     PCI_DEVICE_ID_VIA_8363_0,       quirk_vialatency );
+DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_VIA,     PCI_DEVICE_ID_VIA_8371_1,       quirk_vialatency );
+DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_VIA,     PCI_DEVICE_ID_VIA_8361,         quirk_vialatency );
 
 /*
  *      VIA Apollo VP3 needs ETBF on BT848/878
@@ -532,7 +537,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_VIA,	PCI_DEVICE_ID_VIA_8235,	quirk_vt8235
  * TODO: When we have device-specific interrupt routers,
  * this code will go away from quirks.
  */
-static void __devinit quirk_via_ioapic(struct pci_dev *dev)
+static void quirk_via_ioapic(struct pci_dev *dev)
 {
         u8 tmp;
         
@@ -548,6 +553,7 @@ static void __devinit quirk_via_ioapic(struct pci_dev *dev)
         pci_write_config_byte (dev, 0x58, tmp);
 }
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA,      PCI_DEVICE_ID_VIA_82C686,       quirk_via_ioapic );
+DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_VIA,     PCI_DEVICE_ID_VIA_82C686,       quirk_via_ioapic );
 
 /*
  * VIA 8237: Some BIOSs don't set the 'Bypass APIC De-Assert Message' Bit.
@@ -555,7 +561,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA,	PCI_DEVICE_ID_VIA_82C686,	quirk_via_i
  * Set this bit to get rid of cycle wastage.
  * Otherwise uncritical.
  */
-static void __devinit quirk_via_vt8237_bypass_apic_deassert(struct pci_dev *dev)
+static void quirk_via_vt8237_bypass_apic_deassert(struct pci_dev *dev)
 {
         u8 misc_control2;
 #define BYPASS_APIC_DEASSERT 8
@@ -567,6 +573,7 @@ static void __devinit quirk_via_vt8237_bypass_apic_deassert(struct pci_dev *dev)
         }
 }
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA,      PCI_DEVICE_ID_VIA_8237,         quirk_via_vt8237_bypass_apic_deassert);
+DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_VIA,     PCI_DEVICE_ID_VIA_8237,         quirk_via_vt8237_bypass_apic_deassert);
 
 /*
  * The AMD io apic can hang the box when an apic irq is masked.
@@ -600,7 +607,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_SI,	PCI_ANY_ID,			quirk_ioapic_rmw );
 #define AMD8131_revB0        0x11
 #define AMD8131_MISC         0x40
 #define AMD8131_NIOAMODE_BIT 0
-static void __init quirk_amd_8131_ioapic(struct pci_dev *dev) 
+static void quirk_amd_8131_ioapic(struct pci_dev *dev)
 { 
         unsigned char revid, tmp;
         
@@ -616,6 +623,7 @@ static void __init quirk_amd_8131_ioapic(struct pci_dev *dev)
         }
 } 
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8131_BRIDGE, quirk_amd_8131_ioapic);
+DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8131_BRIDGE, quirk_amd_8131_ioapic);
 #endif /* CONFIG_X86_IO_APIC */
 
 
@@ -641,65 +649,84 @@ static void __devinit quirk_via_acpi(struct pci_dev *d)
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_VIA,     PCI_DEVICE_ID_VIA_82C586_3,     quirk_via_acpi );
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_VIA,     PCI_DEVICE_ID_VIA_82C686_4,     quirk_via_acpi );
 
-/*
- * Via 686A/B:  The PCI_INTERRUPT_LINE register for the on-chip
- * devices, USB0/1, AC97, MC97, and ACPI, has an unusual feature:
- * when written, it makes an internal connection to the PIC.
- * For these devices, this register is defined to be 4 bits wide.
- * Normally this is fine.  However for IO-APIC motherboards, or
- * non-x86 architectures (yes Via exists on PPC among other places),
- * we must mask the PCI_INTERRUPT_LINE value versus 0xf to get
- * interrupts delivered properly.
- *
- * Some of the on-chip devices are actually '586 devices' so they are
- * listed here.
- */
-
-static int via_irq_fixup_needed = -1;
 
 /*
- * As some VIA hardware is available in PCI-card form, we need to restrict
- * this quirk to VIA PCI hardware built onto VIA-based motherboards only.
- * We try to locate a VIA southbridge before deciding whether the quirk
- * should be applied.
+ *      VIA bridges which have VLink
  */
-static const struct pci_device_id via_irq_fixup_tbl[] = {
-        {
-                .vendor         = PCI_VENDOR_ID_VIA,
-                .device         = PCI_ANY_ID,
-                .subvendor      = PCI_ANY_ID,
-                .subdevice      = PCI_ANY_ID,
-                .class          = PCI_CLASS_BRIDGE_ISA << 8,
-                .class_mask     = 0xffff00,
-        },
+
+static const struct pci_device_id via_vlink_fixup_tbl[] = {
+        /* Internal devices need IRQ line routing, pre VLink */
+        { PCI_VDEVICE(VIA, PCI_DEVICE_ID_VIA_82C686), 0 },
+        { PCI_VDEVICE(VIA, PCI_DEVICE_ID_VIA_8231), 17 },
+        /* Devices with VLink */
+        { PCI_VDEVICE(VIA, PCI_DEVICE_ID_VIA_8233_0), 17},
+        { PCI_VDEVICE(VIA, PCI_DEVICE_ID_VIA_8233A), 17 },
+        { PCI_VDEVICE(VIA, PCI_DEVICE_ID_VIA_8233C_0), 17 },
+        { PCI_VDEVICE(VIA, PCI_DEVICE_ID_VIA_8235), 16 },
+        { PCI_VDEVICE(VIA, PCI_DEVICE_ID_VIA_8237), 15 },
+        { PCI_VDEVICE(VIA, PCI_DEVICE_ID_VIA_8237A), 15 },
         { 0, },
 };
 
-static void quirk_via_irq(struct pci_dev *dev)
+/**
+ *      quirk_via_vlink         -       VIA VLink IRQ number update
+ *      @dev: PCI device
+ *
+ *      If the device we are dealing with is on a PIC IRQ we need to
+ *      ensure that the IRQ line register which usually is not relevant
+ *      for PCI cards, is actually written so that interrupts get sent
+ *      to the right place
+ */
+
+static void quirk_via_vlink(struct pci_dev *dev)
 {
+        const struct pci_device_id *via_vlink_fixup;
+        static int dev_lo = -1, dev_hi = 18;
         u8 irq, new_irq;
 
-        if (via_irq_fixup_needed == -1)
-                via_irq_fixup_needed = pci_dev_present(via_irq_fixup_tbl);
+        /* Check if we have VLink and cache the result */
 
-        if (!via_irq_fixup_needed)
+        /* Checked already - no */
+        if (dev_lo == -2)
                 return;
 
+        /* Not checked - see what bridge we have and find the device
+           ranges */
+
+        if (dev_lo == -1) {
+                via_vlink_fixup = pci_find_present(via_vlink_fixup_tbl);
+                if (via_vlink_fixup == NULL) {
+                        dev_lo = -2;
+                        return;
+                }
+                dev_lo = via_vlink_fixup->driver_data;
+                /* 82C686 is special - 0/0 */
+                if (dev_lo == 0)
+                        dev_hi = 0;
+        }
         new_irq = dev->irq;
 
         /* Don't quirk interrupts outside the legacy IRQ range */
         if (!new_irq || new_irq > 15)
                 return;
 
+        /* Internal device ? */
+        if (dev->bus->number != 0 || PCI_SLOT(dev->devfn) > dev_hi ||
+                PCI_SLOT(dev->devfn) < dev_lo)
+                return;
+
+        /* This is an internal VLink device on a PIC interrupt. The BIOS
+           ought to have set this but may not have, so we redo it */
+
         pci_read_config_byte(dev, PCI_INTERRUPT_LINE, &irq);
         if (new_irq != irq) {
-                printk(KERN_INFO "PCI: VIA IRQ fixup for %s, from %d to %d\n",
+                printk(KERN_INFO "PCI: VIA VLink IRQ fixup for %s, from %d to %d\n",
                         pci_name(dev), irq, new_irq);
                 udelay(15);     /* unknown if delay really needed */
                 pci_write_config_byte(dev, PCI_INTERRUPT_LINE, new_irq);
         }
 }
-DECLARE_PCI_FIXUP_ENABLE(PCI_VENDOR_ID_VIA, PCI_ANY_ID, quirk_via_irq);
+DECLARE_PCI_FIXUP_ENABLE(PCI_VENDOR_ID_VIA, PCI_ANY_ID, quirk_via_vlink);
 
 /*
  * VIA VT82C598 has its device ID settable and many BIOSes
@@ -720,13 +747,14 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_VIA,	PCI_DEVICE_ID_VIA_82C597_0,	quirk_vt
  * do this even if the Linux CardBus driver is not loaded, because
  * the Linux i82365 driver does not (and should not) handle CardBus.
  */
-static void __devinit quirk_cardbus_legacy(struct pci_dev *dev)
+static void quirk_cardbus_legacy(struct pci_dev *dev)
 {
         if ((PCI_CLASS_BRIDGE_CARDBUS << 8) ^ dev->class)
                 return;
         pci_write_config_dword(dev, PCI_CB_LEGACY_MODE_BASE, 0);
 }
 DECLARE_PCI_FIXUP_FINAL(PCI_ANY_ID, PCI_ANY_ID, quirk_cardbus_legacy);
+DECLARE_PCI_FIXUP_RESUME(PCI_ANY_ID, PCI_ANY_ID, quirk_cardbus_legacy);
 
 /*
  * Following the PCI ordering rules is optional on the AMD762. I'm not
@@ -735,7 +763,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_ANY_ID, PCI_ANY_ID, quirk_cardbus_legacy);
  * To be fair to AMD, it follows the spec by default, its BIOS people
  * who turn it off!
  */
-static void __devinit quirk_amd_ordering(struct pci_dev *dev)
+static void quirk_amd_ordering(struct pci_dev *dev)
 {
         u32 pcic;
         pci_read_config_dword(dev, 0x4C, &pcic);
@@ -749,6 +777,7 @@ static void __devinit quirk_amd_ordering(struct pci_dev *dev)
         }
 }
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD,      PCI_DEVICE_ID_AMD_FE_GATE_700C, quirk_amd_ordering );
+DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_AMD,     PCI_DEVICE_ID_AMD_FE_GATE_700C, quirk_amd_ordering );
 
 /*
  *      DreamWorks provided workaround for Dunord I-3000 problem
@@ -784,7 +813,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_TOSHIBA,	0x605,	quirk_transparent_bridge
  * datasheets found at http://www.national.com/ds/GX for info on what
  * these bits do.  <christer@weinigel.se>
  */
-static void __init quirk_mediagx_master(struct pci_dev *dev)
+static void quirk_mediagx_master(struct pci_dev *dev)
 {
         u8 reg;
         pci_read_config_byte(dev, 0x41, &reg);
@@ -795,13 +824,14 @@ static void __init quirk_mediagx_master(struct pci_dev *dev)
         }
 }
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_CYRIX,    PCI_DEVICE_ID_CYRIX_PCI_MASTER, quirk_mediagx_master );
+DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_CYRIX,   PCI_DEVICE_ID_CYRIX_PCI_MASTER, quirk_mediagx_master );
 
 /*
  *      Ensure C0 rev restreaming is off. This is normally done by
  *      the BIOS but in the odd case it is not the results are corruption
  *      hence the presence of a Linux check
  */
-static void __init quirk_disable_pxb(struct pci_dev *pdev)
+static void quirk_disable_pxb(struct pci_dev *pdev)
 {
         u16 config;
         u8 rev;
@@ -817,7 +847,25 @@ static void __init quirk_disable_pxb(struct pci_dev *pdev)
         }
 }
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL,    PCI_DEVICE_ID_INTEL_82454NX,    quirk_disable_pxb );
+DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_82454NX,    quirk_disable_pxb );
+
+
+static void __devinit quirk_sb600_sata(struct pci_dev *pdev)
+{
+        /* set sb600 sata to ahci mode */
+        if ((pdev->class >> 8) == PCI_CLASS_STORAGE_IDE) {
+                u8 tmp;
 
+                pci_read_config_byte(pdev, 0x40, &tmp);
+                pci_write_config_byte(pdev, 0x40, tmp|1);
+                pci_write_config_byte(pdev, 0x9, 1);
+                pci_write_config_byte(pdev, 0xa, 6);
+                pci_write_config_byte(pdev, 0x40, tmp);
+
+                pdev->class = 0x010601;
+        }
+}
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP600_SATA, quirk_sb600_sata);
 
 /*
  *      Serverworks CSB5 IDE does not fully support native mode
@@ -874,7 +922,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,	PCI_DEVICE_ID_INTEL_82375,	quirk_e
  * runs everywhere at present we suppress the printk output in most
  * irrelevant cases.
  */
-static void __init k8t_sound_hostbridge(struct pci_dev *dev)
+static void k8t_sound_hostbridge(struct pci_dev *dev)
 {
         unsigned char val;
 
@@ -893,8 +941,8 @@ static void __init k8t_sound_hostbridge(struct pci_dev *dev)
         }
 }
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8237, k8t_sound_hostbridge);
+DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8237, k8t_sound_hostbridge);
 
-#ifndef CONFIG_ACPI_SLEEP
 /*
  * On ASUS P4B boards, the SMBus PCI Device within the ICH2/4 southbridge
  * is not activated. The myth is that Asus said that they do not want the
@@ -906,10 +954,6 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8237, k8t_sound_ho
  * bridge. Unfortunately, this device has no subvendor/subdevice ID. So it 
  * becomes necessary to do this tweak in two steps -- I've chosen the Host
  * bridge as trigger.
- *
- * Actually, leaving it unhidden and not redoing the quirk over suspend2ram
- * will cause thermal management to break down, and causing machine to
- * overheat.
  */
 static int __initdata asus_hides_smbus;
 
@@ -1019,7 +1063,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,	PCI_DEVICE_ID_INTEL_82855PM_HB,	as
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_82855GM_HB, asus_hides_smbus_hostbridge );
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_82915GM_HB, asus_hides_smbus_hostbridge );
 
-static void __init asus_hides_smbus_lpc(struct pci_dev *dev)
+static void asus_hides_smbus_lpc(struct pci_dev *dev)
 {
         u16 val;
         
@@ -1042,8 +1086,14 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,	PCI_DEVICE_ID_INTEL_82801CA_0,	asu
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_82801CA_12, asus_hides_smbus_lpc );
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_82801DB_12, asus_hides_smbus_lpc );
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_82801EB_0,  asus_hides_smbus_lpc );
+DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_82801DB_0,  asus_hides_smbus_lpc );
+DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_82801BA_0,  asus_hides_smbus_lpc );
+DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_82801CA_0,  asus_hides_smbus_lpc );
+DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_82801CA_12, asus_hides_smbus_lpc );
+DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_82801DB_12, asus_hides_smbus_lpc );
+DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_82801EB_0,  asus_hides_smbus_lpc );
 
-static void __init asus_hides_smbus_lpc_ich6(struct pci_dev *dev)
+static void asus_hides_smbus_lpc_ich6(struct pci_dev *dev)
 {
         u32 val, rcba;
         void __iomem *base;
@@ -1059,13 +1109,12 @@ static void __init asus_hides_smbus_lpc_ich6(struct pci_dev *dev)
         printk(KERN_INFO "PCI: Enabled ICH6/i801 SMBus device\n");
 }
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_ICH6_1,     asus_hides_smbus_lpc_ich6 );
-
-#endif
+DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_ICH6_1,     asus_hides_smbus_lpc_ich6 );
 
 /*
  * SiS 96x south bridge: BIOS typically hides SMBus device...
  */
-static void __init quirk_sis_96x_smbus(struct pci_dev *dev)
+static void quirk_sis_96x_smbus(struct pci_dev *dev)
 {
         u8 val = 0;
         printk(KERN_INFO "Enabling SiS 96x SMBus.\n");
@@ -1086,7 +1135,7 @@ static int __devinitdata sis_96x_compatible = 0;
 
 #define SIS_DETECT_REGISTER 0x40
 
-static void __init quirk_sis_503(struct pci_dev *dev)
+static void quirk_sis_503(struct pci_dev *dev)
 {
         u8 reg;
         u16 devid;
@@ -1122,13 +1171,14 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SI,	PCI_DEVICE_ID_SI_651,		quirk_sis_96x_
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SI,      PCI_DEVICE_ID_SI_735,           quirk_sis_96x_compatible );
 
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SI,      PCI_DEVICE_ID_SI_503,           quirk_sis_503 );
+DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_SI,      PCI_DEVICE_ID_SI_503,           quirk_sis_503 );
 /*
  * On ASUS A8V and A8V Deluxe boards, the onboard AC97 audio controller
  * and MC97 modem controller are disabled when a second PCI soundcard is
  * present. This patch, tweaking the VT8237 ISA bridge, enables them.
  * -- bjd
  */
-static void __init asus_hides_ac97_lpc(struct pci_dev *dev)
+static void asus_hides_ac97_lpc(struct pci_dev *dev)
 {
         u8 val;
         int asus_hides_ac97 = 0;
@@ -1159,6 +1209,14 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SI,	PCI_DEVICE_ID_SI_962,		quirk_sis_96x_
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SI,      PCI_DEVICE_ID_SI_963,           quirk_sis_96x_smbus );
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SI,      PCI_DEVICE_ID_SI_LPC,           quirk_sis_96x_smbus );
 
+DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_VIA,     PCI_DEVICE_ID_VIA_8237, asus_hides_ac97_lpc );
+
+
+DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_SI,      PCI_DEVICE_ID_SI_961,           quirk_sis_96x_smbus );
+DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_SI,      PCI_DEVICE_ID_SI_962,           quirk_sis_96x_smbus );
+DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_SI,      PCI_DEVICE_ID_SI_963,           quirk_sis_96x_smbus );
+DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_SI,      PCI_DEVICE_ID_SI_LPC,           quirk_sis_96x_smbus );
+
 #if defined(CONFIG_ATA) || defined(CONFIG_ATA_MODULE)
 
 /*
@@ -1167,7 +1225,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SI,	PCI_DEVICE_ID_SI_LPC,		quirk_sis_96x_
  *      the PCI scanning.
  */
 
-static void __devinit quirk_jmicron_dualfn(struct pci_dev *pdev)
+static void quirk_jmicron_dualfn(struct pci_dev *pdev)
 {
         u32 conf;
         u8 hdr;
@@ -1205,6 +1263,7 @@ static void __devinit quirk_jmicron_dualfn(struct pci_dev *pdev)
 }
 
 DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_JMICRON, PCI_ANY_ID, quirk_jmicron_dualfn);
+DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_JMICRON, PCI_ANY_ID, quirk_jmicron_dualfn);
 
 #endif
 
@@ -1532,6 +1591,8 @@ extern struct pci_fixup __start_pci_fixups_final[];
 extern struct pci_fixup __end_pci_fixups_final[];
 extern struct pci_fixup __start_pci_fixups_enable[];
 extern struct pci_fixup __end_pci_fixups_enable[];
+extern struct pci_fixup __start_pci_fixups_resume[];
+extern struct pci_fixup __end_pci_fixups_resume[];
 
 
 void pci_fixup_device(enum pci_fixup_pass pass, struct pci_dev *dev)
@@ -1559,6 +1620,11 @@ void pci_fixup_device(enum pci_fixup_pass pass, struct pci_dev *dev)
                 end = __end_pci_fixups_enable;
                 break;
 
+        case pci_fixup_resume:
+                start = __start_pci_fixups_resume;
+                end = __end_pci_fixups_resume;
+                break;
+
         default:
                 /* stupid compiler warning, you would think with an enum... */
                 return;
@@ -1596,7 +1662,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,	0x1460,		quirk_p64h2_1k_io);
  * Force it to be linked by setting the corresponding control bit in the
  * config space.
  */
-static void __devinit quirk_nvidia_ck804_pcie_aer_ext_cap(struct pci_dev *dev)
+static void quirk_nvidia_ck804_pcie_aer_ext_cap(struct pci_dev *dev)
 {
         uint8_t b;
         if (pci_read_config_byte(dev, 0xf41, &b) == 0) {
@@ -1610,6 +1676,8 @@ static void __devinit quirk_nvidia_ck804_pcie_aer_ext_cap(struct pci_dev *dev)
 }
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_NVIDIA,  PCI_DEVICE_ID_NVIDIA_CK804_PCIE,
                         quirk_nvidia_ck804_pcie_aer_ext_cap);
+DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_NVIDIA,  PCI_DEVICE_ID_NVIDIA_CK804_PCIE,
+                        quirk_nvidia_ck804_pcie_aer_ext_cap);
 
 #ifdef CONFIG_PCI_MSI
 /* To disable MSI globally */
@@ -1644,19 +1712,23 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8131_BRIDGE, quirk_
  * return 1 if a HT MSI capability is found and enabled */
 static int __devinit msi_ht_cap_enabled(struct pci_dev *dev)
 {
-        u8 pos;
-        int ttl;
-        for (pos = pci_find_capability(dev, PCI_CAP_ID_HT), ttl = 48;
-             pos && ttl;
-             pos = pci_find_next_capability(dev, pos, PCI_CAP_ID_HT), ttl--) {
-                u32 cap_hdr;
-                /* MSI mapping section according to Hypertransport spec */
-                if (pci_read_config_dword(dev, pos, &cap_hdr) == 0
-                    && (cap_hdr & 0xf8000000) == 0xa8000000 /* MSI mapping */) {
-                        printk(KERN_INFO "PCI: Found HT MSI mapping on %s with capability %s\n",
-                               pci_name(dev), cap_hdr & 0x10000 ? "enabled" : "disabled");
-                        return (cap_hdr & 0x10000) != 0; /* MSI mapping cap enabled */
+        int pos, ttl = 48;
+
+        pos = pci_find_ht_capability(dev, HT_CAPTYPE_MSI_MAPPING);
+        while (pos && ttl--) {
+                u8 flags;
+
+                if (pci_read_config_byte(dev, pos + HT_MSI_FLAGS,
+                                         &flags) == 0)
+                {
+                        printk(KERN_INFO "PCI: Found %s HT MSI Mapping on %s\n",
+                                flags & HT_MSI_FLAGS_ENABLE ?
+                                "enabled" : "disabled", pci_name(dev));
+                        return (flags & HT_MSI_FLAGS_ENABLE) != 0;
                 }
+
+                pos = pci_find_next_ht_capability(dev, pos,
+                                                  HT_CAPTYPE_MSI_MAPPING);
         }
         return 0;
 }
@@ -1688,8 +1760,9 @@ static void __devinit quirk_nvidia_ck804_msi_ht_cap(struct pci_dev *dev)
          * a single one having MSI is enough to be sure that MSI are supported.
          */
         pdev = pci_get_slot(dev->bus, 0);
-        if (dev->subordinate && !msi_ht_cap_enabled(dev)
-            && !msi_ht_cap_enabled(pdev)) {
+        if (!pdev)
+                return;
+        if (!msi_ht_cap_enabled(dev) && !msi_ht_cap_enabled(pdev)) {
                 printk(KERN_WARNING "PCI: MSI quirk detected. "
                        "MSI disabled on chipset %s.\n",
                        pci_name(dev));
diff --git a/drivers/pci/search.c b/drivers/pci/search.c
index 2f13eba5d5..45f2b20ef5 100644
--- a/drivers/pci/search.c
+++ b/drivers/pci/search.c
@@ -413,6 +413,24 @@ exit:
         return dev;
 }
 
+const struct pci_device_id *pci_find_present(const struct pci_device_id *ids)
+{
+        struct pci_dev *dev;
+        const struct pci_device_id *found = NULL;
+
+        WARN_ON(in_interrupt());
+        down_read(&pci_bus_sem);
+        while (ids->vendor || ids->subvendor || ids->class_mask) {
+                list_for_each_entry(dev, &pci_devices, global_list) {
+                        if ((found = pci_match_one_device(ids, dev)) != NULL)
+                                break;
+                }
+                ids++;
+        }
+        up_read(&pci_bus_sem);
+        return found;
+}
+
 /**
  * pci_dev_present - Returns 1 if device matching the device list is present, 0 if not.
  * @ids: A pointer to a null terminated list of struct pci_device_id structures
@@ -426,25 +444,11 @@ exit:
  */
 int pci_dev_present(const struct pci_device_id *ids)
 {
-        struct pci_dev *dev;
-        int found = 0;
-
-        WARN_ON(in_interrupt());
-        down_read(&pci_bus_sem);
-        while (ids->vendor || ids->subvendor || ids->class_mask) {
-                list_for_each_entry(dev, &pci_devices, global_list) {
-                        if (pci_match_one_device(ids, dev)) {
-                                found = 1;
-                                goto exit;
-                        }
-                }
-                ids++;
-        }
-exit:
-        up_read(&pci_bus_sem);
-        return found;
+        return pci_find_present(ids) == NULL ? 0 : 1;
 }
+
 EXPORT_SYMBOL(pci_dev_present);
+EXPORT_SYMBOL(pci_find_present);
 
 EXPORT_SYMBOL(pci_find_device);
 EXPORT_SYMBOL(pci_find_device_reverse);
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index 8f7bcf56f1..89f3036f0d 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -41,7 +41,7 @@
  * have a P2P bridge below a cardbus bridge, we need 4K.
  */
 #define CARDBUS_IO_SIZE         (256)
-#define CARDBUS_MEM_SIZE        (32*1024*1024)
+#define CARDBUS_MEM_SIZE        (64*1024*1024)
 
 static void __devinit
 pbus_assign_resources_sorted(struct pci_bus *bus)
diff --git a/drivers/pci/setup-res.c b/drivers/pci/setup-res.c
index ab78e4bbdd..cb4ced3560 100644
--- a/drivers/pci/setup-res.c
+++ b/drivers/pci/setup-res.c
@@ -33,11 +33,22 @@ pci_update_resource(struct pci_dev *dev, struct resource *res, int resno)
         u32 new, check, mask;
         int reg;
 
-        /* Ignore resources for unimplemented BARs and unused resource slots
-           for 64 bit BARs. */
+        /*
+         * Ignore resources for unimplemented BARs and unused resource slots
+         * for 64 bit BARs.
+         */
         if (!res->flags)
                 return;
 
+        /*
+         * Ignore non-moveable resources.  This might be legacy resources for
+         * which no functional BAR register exists or another important
+         * system resource we should better not move around in system address
+         * space.
+         */
+        if (res->flags & IORESOURCE_PCI_FIXED)
+                return;
+
         pcibios_resource_to_bus(dev, &region, res);
 
         pr_debug("  got res [%llx:%llx] bus [%lx:%lx] flags %lx for "
@@ -212,6 +223,10 @@ pdev_sort_resources(struct pci_dev *dev, struct resource_list *head)
                 resource_size_t r_align;
 
                 r = &dev->resource[i];
+
+                if (r->flags & IORESOURCE_PCI_FIXED)
+                        continue;
+
                 r_align = r->end - r->start;
                 
                 if (!(r->flags) || r->parent)
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index 1748e27501..f02f48a882 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -265,13 +265,11 @@ static int scsi_merge_bio(struct request *rq, struct bio *bio)
 
         if (!rq->bio)
                 blk_rq_bio_prep(q, rq, bio);
-        else if (!q->back_merge_fn(q, rq, bio))
+        else if (!ll_back_merge_fn(q, rq, bio))
                 return -EINVAL;
         else {
                 rq->biotail->bi_next = bio;
                 rq->biotail = bio;
-                rq->hard_nr_sectors += bio_sectors(bio);
-                rq->nr_sectors = rq->hard_nr_sectors;
         }
 
         return 0;
diff --git a/drivers/serial/uartlite.c b/drivers/serial/uartlite.c
index 92eba89355..db8607e3d5 100644
--- a/drivers/serial/uartlite.c
+++ b/drivers/serial/uartlite.c
@@ -278,8 +278,8 @@ static int ulite_request_port(struct uart_port *port)
 
 static void ulite_config_port(struct uart_port *port, int flags)
 {
-        ulite_request_port(port);
-        port->type = PORT_UARTLITE;
+        if (!ulite_request_port(port))
+                port->type = PORT_UARTLITE;
 }
 
 static int ulite_verify_port(struct uart_port *port, struct serial_struct *ser)
diff --git a/drivers/spi/spi_s3c24xx_gpio.c b/drivers/spi/spi_s3c24xx_gpio.c
index a5d2cdfff4..bcaf4bd18e 100644
--- a/drivers/spi/spi_s3c24xx_gpio.c
+++ b/drivers/spi/spi_s3c24xx_gpio.c
@@ -15,6 +15,7 @@
 #include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/spinlock.h>
+#include <linux/workqueue.h>
 #include <linux/platform_device.h>
 
 #include <linux/spi/spi.h>
diff --git a/drivers/usb/class/usblp.c b/drivers/usb/class/usblp.c
index 6303970e93..24ee8be359 100644
--- a/drivers/usb/class/usblp.c
+++ b/drivers/usb/class/usblp.c
@@ -130,7 +130,7 @@ MFG:HEWLETT-PACKARD;MDL:DESKJET 970C;CMD:MLC,PCL,PML;CLASS:PRINTER;DESCRIPTION:H
 
 struct usblp {
         struct usb_device       *dev;                   /* USB device */
-        struct semaphore        sem;                    /* locks this struct, especially "dev" */
+        struct mutex            mut;                    /* locks this struct, especially "dev" */
         char                    *writebuf;              /* write transfer_buffer */
         char                    *readbuf;               /* read transfer_buffer */
         char                    *statusbuf;             /* status transfer_buffer */
@@ -465,7 +465,7 @@ static long usblp_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
         int twoints[2];
         int retval = 0;
 
-        down (&usblp->sem);
+        mutex_lock (&usblp->mut);
         if (!usblp->present) {
                 retval = -ENODEV;
                 goto done;
@@ -644,14 +644,14 @@ static long usblp_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                 }
 
 done:
-        up (&usblp->sem);
+        mutex_unlock (&usblp->mut);
         return retval;
 }
 
 static ssize_t usblp_write(struct file *file, const char __user *buffer, size_t count, loff_t *ppos)
 {
         struct usblp *usblp = file->private_data;
-        int timeout, rv, err = 0, transfer_length = 0;
+        int timeout, intr, rv, err = 0, transfer_length = 0;
         size_t writecount = 0;
 
         while (writecount < count) {
@@ -668,14 +668,16 @@ static ssize_t usblp_write(struct file *file, const char __user *buffer, size_t
                         if (rv < 0)
                                 return writecount ? writecount : -EINTR;
                 }
-                down (&usblp->sem);
+                intr = mutex_lock_interruptible (&usblp->mut);
+                if (intr)
+                        return writecount ? writecount : -EINTR;
                 if (!usblp->present) {
-                        up (&usblp->sem);
+                        mutex_unlock (&usblp->mut);
                         return -ENODEV;
                 }
 
                 if (usblp->sleeping) {
-                        up (&usblp->sem);
+                        mutex_unlock (&usblp->mut);
                         return writecount ? writecount : -ENODEV;
                 }
 
@@ -687,10 +689,10 @@ static ssize_t usblp_write(struct file *file, const char __user *buffer, size_t
                                 err = usblp->writeurb->status;
                         } else
                                 err = usblp_check_status(usblp, err);
-                        up (&usblp->sem);
+                        mutex_unlock (&usblp->mut);
 
                         /* if the fault was due to disconnect, let khubd's
-                         * call to usblp_disconnect() grab usblp->sem ...
+                         * call to usblp_disconnect() grab usblp->mut ...
                          */
                         schedule ();
                         continue;
@@ -702,7 +704,7 @@ static ssize_t usblp_write(struct file *file, const char __user *buffer, size_t
                  */
                 writecount += transfer_length;
                 if (writecount == count) {
-                        up(&usblp->sem);
+                        mutex_unlock(&usblp->mut);
                         break;
                 }
 
@@ -714,7 +716,7 @@ static ssize_t usblp_write(struct file *file, const char __user *buffer, size_t
 
                 if (copy_from_user(usblp->writeurb->transfer_buffer, 
                                    buffer + writecount, transfer_length)) {
-                        up(&usblp->sem);
+                        mutex_unlock(&usblp->mut);
                         return writecount ? writecount : -EFAULT;
                 }
 
@@ -727,10 +729,10 @@ static ssize_t usblp_write(struct file *file, const char __user *buffer, size_t
                                 count = -EIO;
                         else
                                 count = writecount ? writecount : -ENOMEM;
-                        up (&usblp->sem);
+                        mutex_unlock (&usblp->mut);
                         break;
                 }
-                up (&usblp->sem);
+                mutex_unlock (&usblp->mut);
         }
 
         return count;
@@ -739,12 +741,14 @@ static ssize_t usblp_write(struct file *file, const char __user *buffer, size_t
 static ssize_t usblp_read(struct file *file, char __user *buffer, size_t count, loff_t *ppos)
 {
         struct usblp *usblp = file->private_data;
-        int rv;
+        int rv, intr;
 
         if (!usblp->bidir)
                 return -EINVAL;
 
-        down (&usblp->sem);
+        intr = mutex_lock_interruptible (&usblp->mut);
+        if (intr)
+                return -EINTR;
         if (!usblp->present) {
                 count = -ENODEV;
                 goto done;
@@ -757,9 +761,9 @@ static ssize_t usblp_read(struct file *file, char __user *buffer, size_t count,
                         count = -EAGAIN;
                         goto done;
                 }
-                up(&usblp->sem);
+                mutex_unlock(&usblp->mut);
                 rv = wait_event_interruptible(usblp->wait, usblp->rcomplete || !usblp->present);
-                down(&usblp->sem);
+                mutex_lock(&usblp->mut);
                 if (rv < 0) {
                         count = -EINTR;
                         goto done;
@@ -807,7 +811,7 @@ static ssize_t usblp_read(struct file *file, char __user *buffer, size_t count,
         }
 
 done:
-        up (&usblp->sem);
+        mutex_unlock (&usblp->mut);
         return count;
 }
 
@@ -886,7 +890,7 @@ static int usblp_probe(struct usb_interface *intf,
                 goto abort;
         }
         usblp->dev = dev;
-        init_MUTEX (&usblp->sem);
+        mutex_init (&usblp->mut);
         init_waitqueue_head(&usblp->wait);
         usblp->ifnum = intf->cur_altsetting->desc.bInterfaceNumber;
         usblp->intf = intf;
@@ -1178,7 +1182,7 @@ static void usblp_disconnect(struct usb_interface *intf)
         device_remove_file(&intf->dev, &dev_attr_ieee1284_id);
 
         mutex_lock (&usblp_mutex);
-        down (&usblp->sem);
+        mutex_lock (&usblp->mut);
         usblp->present = 0;
         usb_set_intfdata (intf, NULL);
 
@@ -1187,7 +1191,7 @@ static void usblp_disconnect(struct usb_interface *intf)
                         usblp->writebuf, usblp->writeurb->transfer_dma);
         usb_buffer_free (usblp->dev, USBLP_BUF_SIZE,
                         usblp->readbuf, usblp->readurb->transfer_dma);
-        up (&usblp->sem);
+        mutex_unlock (&usblp->mut);
 
         if (!usblp->used)
                 usblp_cleanup (usblp);
@@ -1200,11 +1204,11 @@ static int usblp_suspend (struct usb_interface *intf, pm_message_t message)
 
         /* this races against normal access and open */
         mutex_lock (&usblp_mutex);
-        down (&usblp->sem);
+        mutex_lock (&usblp->mut);
         /* we take no more IO */
         usblp->sleeping = 1;
         usblp_unlink_urbs(usblp);
-        up (&usblp->sem);
+        mutex_unlock (&usblp->mut);
         mutex_unlock (&usblp_mutex);
 
         return 0;
@@ -1216,12 +1220,12 @@ static int usblp_resume (struct usb_interface *intf)
         int r;
 
         mutex_lock (&usblp_mutex);
-        down (&usblp->sem);
+        mutex_lock (&usblp->mut);
 
         usblp->sleeping = 0;
         r = handle_bidir (usblp);
 
-        up (&usblp->sem);
+        mutex_unlock (&usblp->mut);
         mutex_unlock (&usblp_mutex);
 
         return r;
diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c
index 3ed4cb2d56..4b3a6ab29b 100644
--- a/drivers/usb/core/devio.c
+++ b/drivers/usb/core/devio.c
@@ -962,7 +962,11 @@ static int proc_do_submiturb(struct dev_state *ps, struct usbdevfs_urb *uurb,
                         kfree(dr);
                         return -EFAULT;
                 }
-                snoop(&ps->dev->dev, "control urb\n");
+                snoop(&ps->dev->dev, "control urb: bRequest=%02x "
+                        "bRrequestType=%02x wValue=%04x "
+                        "wIndex=%04x wLength=%04x\n",
+                        dr->bRequest, dr->bRequestType, dr->wValue,
+                        dr->wIndex, dr->wLength);
                 break;
 
         case USBDEVFS_URB_TYPE_BULK:
diff --git a/drivers/usb/gadget/at91_udc.c b/drivers/usb/gadget/at91_udc.c
index 3e0abbb49f..812c733ba8 100644
--- a/drivers/usb/gadget/at91_udc.c
+++ b/drivers/usb/gadget/at91_udc.c
@@ -43,14 +43,16 @@
 #include <linux/usb_gadget.h>
 
 #include <asm/byteorder.h>
+#include <asm/hardware.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/system.h>
 #include <asm/mach-types.h>
 
-#include <asm/arch/hardware.h>
 #include <asm/arch/gpio.h>
 #include <asm/arch/board.h>
+#include <asm/arch/cpu.h>
+#include <asm/arch/at91sam9261_matrix.h>
 
 #include "at91_udc.h"
 
@@ -78,27 +80,11 @@
 static const char driver_name [] = "at91_udc";
 static const char ep0name[] = "ep0";
 
-/*-------------------------------------------------------------------------*/
 
-/*
- * Read from a UDP register.
- */
-static inline unsigned long at91_udp_read(unsigned int reg)
-{
-        void __iomem *udp_base = (void __iomem *)AT91_VA_BASE_UDP;
-
-        return __raw_readl(udp_base + reg);
-}
-
-/*
- * Write to a UDP register.
- */
-static inline void at91_udp_write(unsigned int reg, unsigned long value)
-{
-        void __iomem *udp_base = (void __iomem *)AT91_VA_BASE_UDP;
-
-        __raw_writel(value, udp_base + reg);
-}
+#define at91_udp_read(dev, reg) \
+        __raw_readl((dev)->udp_baseaddr + (reg))
+#define at91_udp_write(dev, reg, val) \
+        __raw_writel((val), (dev)->udp_baseaddr + (reg))
 
 /*-------------------------------------------------------------------------*/
 
@@ -210,13 +196,13 @@ static int proc_udc_show(struct seq_file *s, void *unused)
                 return 0;
         }
 
-        tmp = at91_udp_read(AT91_UDP_FRM_NUM);
+        tmp = at91_udp_read(udc, AT91_UDP_FRM_NUM);
         seq_printf(s, "frame %05x:%s%s frame=%d\n", tmp,
                 (tmp & AT91_UDP_FRM_OK) ? " ok" : "",
                 (tmp & AT91_UDP_FRM_ERR) ? " err" : "",
                 (tmp & AT91_UDP_NUM));
 
-        tmp = at91_udp_read(AT91_UDP_GLB_STAT);
+        tmp = at91_udp_read(udc, AT91_UDP_GLB_STAT);
         seq_printf(s, "glbstate %02x:%s" FOURBITS "\n", tmp,
                 (tmp & AT91_UDP_RMWUPE) ? " rmwupe" : "",
                 (tmp & AT91_UDP_RSMINPR) ? " rsminpr" : "",
@@ -224,13 +210,13 @@ static int proc_udc_show(struct seq_file *s, void *unused)
                 (tmp & AT91_UDP_CONFG) ? " confg" : "",
                 (tmp & AT91_UDP_FADDEN) ? " fadden" : "");
 
-        tmp = at91_udp_read(AT91_UDP_FADDR);
+        tmp = at91_udp_read(udc, AT91_UDP_FADDR);
         seq_printf(s, "faddr   %03x:%s fadd=%d\n", tmp,
                 (tmp & AT91_UDP_FEN) ? " fen" : "",
                 (tmp & AT91_UDP_FADD));
 
-        proc_irq_show(s, "imr   ", at91_udp_read(AT91_UDP_IMR));
-        proc_irq_show(s, "isr   ", at91_udp_read(AT91_UDP_ISR));
+        proc_irq_show(s, "imr   ", at91_udp_read(udc, AT91_UDP_IMR));
+        proc_irq_show(s, "isr   ", at91_udp_read(udc, AT91_UDP_ISR));
 
         if (udc->enabled && udc->vbus) {
                 proc_ep_show(s, &udc->ep[0]);
@@ -286,6 +272,7 @@ static inline void remove_debug_file(struct at91_udc *udc) {}
 static void done(struct at91_ep *ep, struct at91_request *req, int status)
 {
         unsigned        stopped = ep->stopped;
+        struct at91_udc *udc = ep->udc;
 
         list_del_init(&req->queue);
         if (req->req.status == -EINPROGRESS)
@@ -301,7 +288,7 @@ static void done(struct at91_ep *ep, struct at91_request *req, int status)
 
         /* ep0 is always ready; other endpoints need a non-empty queue */
         if (list_empty(&ep->queue) && ep->int_mask != (1 << 0))
-                at91_udp_write(AT91_UDP_IDR, ep->int_mask);
+                at91_udp_write(udc, AT91_UDP_IDR, ep->int_mask);
 }
 
 /*-------------------------------------------------------------------------*/
@@ -554,8 +541,8 @@ ok:
          * reset/init endpoint fifo.  NOTE:  leaves fifo_bank alone,
          * since endpoint resets don't reset hw pingpong state.
          */
-        at91_udp_write(AT91_UDP_RST_EP, ep->int_mask);
-        at91_udp_write(AT91_UDP_RST_EP, 0);
+        at91_udp_write(dev, AT91_UDP_RST_EP, ep->int_mask);
+        at91_udp_write(dev, AT91_UDP_RST_EP, 0);
 
         local_irq_restore(flags);
         return 0;
@@ -564,6 +551,7 @@ ok:
 static int at91_ep_disable (struct usb_ep * _ep)
 {
         struct at91_ep  *ep = container_of(_ep, struct at91_ep, ep);
+        struct at91_udc *udc = ep->udc;
         unsigned long   flags;
 
         if (ep == &ep->udc->ep[0])
@@ -579,8 +567,8 @@ static int at91_ep_disable (struct usb_ep * _ep)
 
         /* reset fifos and endpoint */
         if (ep->udc->clocked) {
-                at91_udp_write(AT91_UDP_RST_EP, ep->int_mask);
-                at91_udp_write(AT91_UDP_RST_EP, 0);
+                at91_udp_write(udc, AT91_UDP_RST_EP, ep->int_mask);
+                at91_udp_write(udc, AT91_UDP_RST_EP, 0);
                 __raw_writel(0, ep->creg);
         }
 
@@ -695,10 +683,10 @@ static int at91_ep_queue(struct usb_ep *_ep,
                          * reconfigures the endpoints.
                          */
                         if (dev->wait_for_config_ack) {
-                                tmp = at91_udp_read(AT91_UDP_GLB_STAT);
+                                tmp = at91_udp_read(dev, AT91_UDP_GLB_STAT);
                                 tmp ^= AT91_UDP_CONFG;
                                 VDBG("toggle config\n");
-                                at91_udp_write(AT91_UDP_GLB_STAT, tmp);
+                                at91_udp_write(dev, AT91_UDP_GLB_STAT, tmp);
                         }
                         if (req->req.length == 0) {
 ep0_in_status:
@@ -727,7 +715,7 @@ ep0_in_status:
 
         if (req && !status) {
                 list_add_tail (&req->queue, &ep->queue);
-                at91_udp_write(AT91_UDP_IER, ep->int_mask);
+                at91_udp_write(dev, AT91_UDP_IER, ep->int_mask);
         }
 done:
         local_irq_restore(flags);
@@ -758,6 +746,7 @@ static int at91_ep_dequeue(struct usb_ep *_ep, struct usb_request *_req)
 static int at91_ep_set_halt(struct usb_ep *_ep, int value)
 {
         struct at91_ep  *ep = container_of(_ep, struct at91_ep, ep);
+        struct at91_udc *udc = ep->udc;
         u32 __iomem     *creg;
         u32             csr;
         unsigned long   flags;
@@ -785,8 +774,8 @@ static int at91_ep_set_halt(struct usb_ep *_ep, int value)
                         csr |= AT91_UDP_FORCESTALL;
                         VDBG("halt %s\n", ep->ep.name);
                 } else {
-                        at91_udp_write(AT91_UDP_RST_EP, ep->int_mask);
-                        at91_udp_write(AT91_UDP_RST_EP, 0);
+                        at91_udp_write(udc, AT91_UDP_RST_EP, ep->int_mask);
+                        at91_udp_write(udc, AT91_UDP_RST_EP, 0);
                         csr &= ~AT91_UDP_FORCESTALL;
                 }
                 __raw_writel(csr, creg);
@@ -813,9 +802,11 @@ static struct usb_ep_ops at91_ep_ops = {
 
 static int at91_get_frame(struct usb_gadget *gadget)
 {
+        struct at91_udc *udc = to_udc(gadget);
+
         if (!to_udc(gadget)->clocked)
                 return -EINVAL;
-        return at91_udp_read(AT91_UDP_FRM_NUM) & AT91_UDP_NUM;
+        return at91_udp_read(udc, AT91_UDP_FRM_NUM) & AT91_UDP_NUM;
 }
 
 static int at91_wakeup(struct usb_gadget *gadget)
@@ -833,11 +824,11 @@ static int at91_wakeup(struct usb_gadget *gadget)
 
         /* NOTE:  some "early versions" handle ESR differently ... */
 
-        glbstate = at91_udp_read(AT91_UDP_GLB_STAT);
+        glbstate = at91_udp_read(udc, AT91_UDP_GLB_STAT);
         if (!(glbstate & AT91_UDP_ESR))
                 goto done;
         glbstate |= AT91_UDP_ESR;
-        at91_udp_write(AT91_UDP_GLB_STAT, glbstate);
+        at91_udp_write(udc, AT91_UDP_GLB_STAT, glbstate);
 
 done:
         local_irq_restore(flags);
@@ -861,6 +852,7 @@ static void udc_reinit(struct at91_udc *udc)
                 ep->stopped = 0;
                 ep->fifo_bank = 0;
                 ep->ep.maxpacket = ep->maxpacket;
+                ep->creg = (void __iomem *) udc->udp_baseaddr + AT91_UDP_CSR(i);
                 // initialiser une queue par endpoint
                 INIT_LIST_HEAD(&ep->queue);
         }
@@ -915,14 +907,41 @@ static void pullup(struct at91_udc *udc, int is_on)
         if (!udc->enabled || !udc->vbus)
                 is_on = 0;
         DBG("%sactive\n", is_on ? "" : "in");
+
         if (is_on) {
                 clk_on(udc);
-                at91_udp_write(AT91_UDP_TXVC, 0);
-                at91_set_gpio_value(udc->board.pullup_pin, 1);
-        } else  {
+                at91_udp_write(udc, AT91_UDP_TXVC, 0);
+                if (cpu_is_at91rm9200())
+                        at91_set_gpio_value(udc->board.pullup_pin, 1);
+                else if (cpu_is_at91sam9260()) {
+                        u32     txvc = at91_udp_read(udc, AT91_UDP_TXVC);
+
+                        txvc |= AT91_UDP_TXVC_PUON;
+                        at91_udp_write(udc, AT91_UDP_TXVC, txvc);
+                } else if (cpu_is_at91sam9261()) {
+                        u32     usbpucr;
+
+                        usbpucr = at91_sys_read(AT91_MATRIX_USBPUCR);
+                        usbpucr |= AT91_MATRIX_USBPUCR_PUON;
+                        at91_sys_write(AT91_MATRIX_USBPUCR, usbpucr);
+                }
+        } else {
                 stop_activity(udc);
-                at91_udp_write(AT91_UDP_TXVC, AT91_UDP_TXVC_TXVDIS);
-                at91_set_gpio_value(udc->board.pullup_pin, 0);
+                at91_udp_write(udc, AT91_UDP_TXVC, AT91_UDP_TXVC_TXVDIS);
+                if (cpu_is_at91rm9200())
+                        at91_set_gpio_value(udc->board.pullup_pin, 0);
+                else if (cpu_is_at91sam9260()) {
+                        u32     txvc = at91_udp_read(udc, AT91_UDP_TXVC);
+
+                        txvc &= ~AT91_UDP_TXVC_PUON;
+                        at91_udp_write(udc, AT91_UDP_TXVC, txvc);
+                } else if (cpu_is_at91sam9261()) {
+                        u32     usbpucr;
+
+                        usbpucr = at91_sys_read(AT91_MATRIX_USBPUCR);
+                        usbpucr &= ~AT91_MATRIX_USBPUCR_PUON;
+                        at91_sys_write(AT91_MATRIX_USBPUCR, usbpucr);
+                }
                 clk_off(udc);
         }
 }
@@ -936,7 +955,10 @@ static int at91_vbus_session(struct usb_gadget *gadget, int is_active)
         // VDBG("vbus %s\n", is_active ? "on" : "off");
         local_irq_save(flags);
         udc->vbus = (is_active != 0);
-        pullup(udc, is_active);
+        if (udc->driver)
+                pullup(udc, is_active);
+        else
+                pullup(udc, 0);
         local_irq_restore(flags);
         return 0;
 }
@@ -1086,7 +1108,7 @@ static void handle_setup(struct at91_udc *udc, struct at91_ep *ep, u32 csr)
 
         case ((USB_TYPE_STANDARD|USB_RECIP_DEVICE) << 8)
                         | USB_REQ_SET_CONFIGURATION:
-                tmp = at91_udp_read(AT91_UDP_GLB_STAT) & AT91_UDP_CONFG;
+                tmp = at91_udp_read(udc, AT91_UDP_GLB_STAT) & AT91_UDP_CONFG;
                 if (pkt.r.wValue)
                         udc->wait_for_config_ack = (tmp == 0);
                 else
@@ -1103,7 +1125,7 @@ static void handle_setup(struct at91_udc *udc, struct at91_ep *ep, u32 csr)
         case ((USB_DIR_IN|USB_TYPE_STANDARD|USB_RECIP_DEVICE) << 8)
                         | USB_REQ_GET_STATUS:
                 tmp = (udc->selfpowered << USB_DEVICE_SELF_POWERED);
-                if (at91_udp_read(AT91_UDP_GLB_STAT) & AT91_UDP_ESR)
+                if (at91_udp_read(udc, AT91_UDP_GLB_STAT) & AT91_UDP_ESR)
                         tmp |= (1 << USB_DEVICE_REMOTE_WAKEUP);
                 PACKET("get device status\n");
                 __raw_writeb(tmp, dreg);
@@ -1114,17 +1136,17 @@ static void handle_setup(struct at91_udc *udc, struct at91_ep *ep, u32 csr)
                         | USB_REQ_SET_FEATURE:
                 if (w_value != USB_DEVICE_REMOTE_WAKEUP)
                         goto stall;
-                tmp = at91_udp_read(AT91_UDP_GLB_STAT);
+                tmp = at91_udp_read(udc, AT91_UDP_GLB_STAT);
                 tmp |= AT91_UDP_ESR;
-                at91_udp_write(AT91_UDP_GLB_STAT, tmp);
+                at91_udp_write(udc, AT91_UDP_GLB_STAT, tmp);
                 goto succeed;
         case ((USB_TYPE_STANDARD|USB_RECIP_DEVICE) << 8)
                         | USB_REQ_CLEAR_FEATURE:
                 if (w_value != USB_DEVICE_REMOTE_WAKEUP)
                         goto stall;
-                tmp = at91_udp_read(AT91_UDP_GLB_STAT);
+                tmp = at91_udp_read(udc, AT91_UDP_GLB_STAT);
                 tmp &= ~AT91_UDP_ESR;
-                at91_udp_write(AT91_UDP_GLB_STAT, tmp);
+                at91_udp_write(udc, AT91_UDP_GLB_STAT, tmp);
                 goto succeed;
 
         /*
@@ -1206,8 +1228,8 @@ static void handle_setup(struct at91_udc *udc, struct at91_ep *ep, u32 csr)
                 } else if (ep->is_in)
                         goto stall;
 
-                at91_udp_write(AT91_UDP_RST_EP, ep->int_mask);
-                at91_udp_write(AT91_UDP_RST_EP, 0);
+                at91_udp_write(udc, AT91_UDP_RST_EP, ep->int_mask);
+                at91_udp_write(udc, AT91_UDP_RST_EP, 0);
                 tmp = __raw_readl(ep->creg);
                 tmp |= CLR_FX;
                 tmp &= ~(SET_FX | AT91_UDP_FORCESTALL);
@@ -1222,7 +1244,10 @@ static void handle_setup(struct at91_udc *udc, struct at91_ep *ep, u32 csr)
 #undef w_length
 
         /* pass request up to the gadget driver */
-        status = udc->driver->setup(&udc->gadget, &pkt.r);
+        if (udc->driver)
+                status = udc->driver->setup(&udc->gadget, &pkt.r);
+        else
+                status = -ENODEV;
         if (status < 0) {
 stall:
                 VDBG("req %02x.%02x protocol STALL; stat %d\n",
@@ -1300,13 +1325,13 @@ static void handle_ep0(struct at91_udc *udc)
                         if (udc->wait_for_addr_ack) {
                                 u32     tmp;
 
-                                at91_udp_write(AT91_UDP_FADDR,
+                                at91_udp_write(udc, AT91_UDP_FADDR,
                                                 AT91_UDP_FEN | udc->addr);
-                                tmp = at91_udp_read(AT91_UDP_GLB_STAT);
+                                tmp = at91_udp_read(udc, AT91_UDP_GLB_STAT);
                                 tmp &= ~AT91_UDP_FADDEN;
                                 if (udc->addr)
                                         tmp |= AT91_UDP_FADDEN;
-                                at91_udp_write(AT91_UDP_GLB_STAT, tmp);
+                                at91_udp_write(udc, AT91_UDP_GLB_STAT, tmp);
 
                                 udc->wait_for_addr_ack = 0;
                                 VDBG("address %d\n", udc->addr);
@@ -1374,28 +1399,28 @@ static irqreturn_t at91_udc_irq (int irq, void *_udc)
         while (rescans--) {
                 u32 status;
 
-                status = at91_udp_read(AT91_UDP_ISR)
-                        & at91_udp_read(AT91_UDP_IMR);
+                status = at91_udp_read(udc, AT91_UDP_ISR)
+                        & at91_udp_read(udc, AT91_UDP_IMR);
                 if (!status)
                         break;
 
                 /* USB reset irq:  not maskable */
                 if (status & AT91_UDP_ENDBUSRES) {
-                        at91_udp_write(AT91_UDP_IDR, ~MINIMUS_INTERRUPTUS);
-                        at91_udp_write(AT91_UDP_IER, MINIMUS_INTERRUPTUS);
+                        at91_udp_write(udc, AT91_UDP_IDR, ~MINIMUS_INTERRUPTUS);
+                        at91_udp_write(udc, AT91_UDP_IER, MINIMUS_INTERRUPTUS);
                         /* Atmel code clears this irq twice */
-                        at91_udp_write(AT91_UDP_ICR, AT91_UDP_ENDBUSRES);
-                        at91_udp_write(AT91_UDP_ICR, AT91_UDP_ENDBUSRES);
+                        at91_udp_write(udc, AT91_UDP_ICR, AT91_UDP_ENDBUSRES);
+                        at91_udp_write(udc, AT91_UDP_ICR, AT91_UDP_ENDBUSRES);
                         VDBG("end bus reset\n");
                         udc->addr = 0;
                         stop_activity(udc);
 
                         /* enable ep0 */
-                        at91_udp_write(AT91_UDP_CSR(0),
+                        at91_udp_write(udc, AT91_UDP_CSR(0),
                                         AT91_UDP_EPEDS | AT91_UDP_EPTYPE_CTRL);
                         udc->gadget.speed = USB_SPEED_FULL;
                         udc->suspended = 0;
-                        at91_udp_write(AT91_UDP_IER, AT91_UDP_EP(0));
+                        at91_udp_write(udc, AT91_UDP_IER, AT91_UDP_EP(0));
 
                         /*
                          * NOTE:  this driver keeps clocks off unless the
@@ -1406,9 +1431,9 @@ static irqreturn_t at91_udc_irq (int irq, void *_udc)
 
                 /* host initiated suspend (3+ms bus idle) */
                 } else if (status & AT91_UDP_RXSUSP) {
-                        at91_udp_write(AT91_UDP_IDR, AT91_UDP_RXSUSP);
-                        at91_udp_write(AT91_UDP_IER, AT91_UDP_RXRSM);
-                        at91_udp_write(AT91_UDP_ICR, AT91_UDP_RXSUSP);
+                        at91_udp_write(udc, AT91_UDP_IDR, AT91_UDP_RXSUSP);
+                        at91_udp_write(udc, AT91_UDP_IER, AT91_UDP_RXRSM);
+                        at91_udp_write(udc, AT91_UDP_ICR, AT91_UDP_RXSUSP);
                         // VDBG("bus suspend\n");
                         if (udc->suspended)
                                 continue;
@@ -1425,9 +1450,9 @@ static irqreturn_t at91_udc_irq (int irq, void *_udc)
 
                 /* host initiated resume */
                 } else if (status & AT91_UDP_RXRSM) {
-                        at91_udp_write(AT91_UDP_IDR, AT91_UDP_RXRSM);
-                        at91_udp_write(AT91_UDP_IER, AT91_UDP_RXSUSP);
-                        at91_udp_write(AT91_UDP_ICR, AT91_UDP_RXRSM);
+                        at91_udp_write(udc, AT91_UDP_IDR, AT91_UDP_RXRSM);
+                        at91_udp_write(udc, AT91_UDP_IER, AT91_UDP_RXSUSP);
+                        at91_udp_write(udc, AT91_UDP_ICR, AT91_UDP_RXRSM);
                         // VDBG("bus resume\n");
                         if (!udc->suspended)
                                 continue;
@@ -1485,8 +1510,6 @@ static struct at91_udc controller = {
                 },
                 .udc            = &controller,
                 .maxpacket      = 8,
-                .creg           = (void __iomem *)(AT91_VA_BASE_UDP
-                                        + AT91_UDP_CSR(0)),
                 .int_mask       = 1 << 0,
         },
         .ep[1] = {
@@ -1497,8 +1520,6 @@ static struct at91_udc controller = {
                 .udc            = &controller,
                 .is_pingpong    = 1,
                 .maxpacket      = 64,
-                .creg           = (void __iomem *)(AT91_VA_BASE_UDP
-                                        + AT91_UDP_CSR(1)),
                 .int_mask       = 1 << 1,
         },
         .ep[2] = {
@@ -1509,8 +1530,6 @@ static struct at91_udc controller = {
                 .udc            = &controller,
                 .is_pingpong    = 1,
                 .maxpacket      = 64,
-                .creg           = (void __iomem *)(AT91_VA_BASE_UDP
-                                        + AT91_UDP_CSR(2)),
                 .int_mask       = 1 << 2,
         },
         .ep[3] = {
@@ -1521,8 +1540,6 @@ static struct at91_udc controller = {
                 },
                 .udc            = &controller,
                 .maxpacket      = 8,
-                .creg           = (void __iomem *)(AT91_VA_BASE_UDP
-                                        + AT91_UDP_CSR(3)),
                 .int_mask       = 1 << 3,
         },
         .ep[4] = {
@@ -1533,8 +1550,6 @@ static struct at91_udc controller = {
                 .udc            = &controller,
                 .is_pingpong    = 1,
                 .maxpacket      = 256,
-                .creg           = (void __iomem *)(AT91_VA_BASE_UDP
-                                        + AT91_UDP_CSR(4)),
                 .int_mask       = 1 << 4,
         },
         .ep[5] = {
@@ -1545,8 +1560,6 @@ static struct at91_udc controller = {
                 .udc            = &controller,
                 .is_pingpong    = 1,
                 .maxpacket      = 256,
-                .creg           = (void __iomem *)(AT91_VA_BASE_UDP
-                                        + AT91_UDP_CSR(5)),
                 .int_mask       = 1 << 5,
         },
         /* ep6 and ep7 are also reserved (custom silicon might use them) */
@@ -1572,9 +1585,8 @@ int usb_gadget_register_driver (struct usb_gadget_driver *driver)
         int             retval;
 
         if (!driver
-                        || driver->speed != USB_SPEED_FULL
+                        || driver->speed < USB_SPEED_FULL
                         || !driver->bind
-                        || !driver->unbind
                         || !driver->setup) {
                 DBG("bad parameter.\n");
                 return -EINVAL;
@@ -1595,6 +1607,10 @@ int usb_gadget_register_driver (struct usb_gadget_driver *driver)
         if (retval) {
                 DBG("driver->bind() returned %d\n", retval);
                 udc->driver = NULL;
+                udc->gadget.dev.driver = NULL;
+                udc->gadget.dev.driver_data = NULL;
+                udc->enabled = 0;
+                udc->selfpowered = 0;
                 return retval;
         }
 
@@ -1611,12 +1627,12 @@ int usb_gadget_unregister_driver (struct usb_gadget_driver *driver)
 {
         struct at91_udc *udc = &controller;
 
-        if (!driver || driver != udc->driver)
+        if (!driver || driver != udc->driver || !driver->unbind)
                 return -EINVAL;
 
         local_irq_disable();
         udc->enabled = 0;
-        at91_udp_write(AT91_UDP_IDR, ~0);
+        at91_udp_write(udc, AT91_UDP_IDR, ~0);
         pullup(udc, 0);
         local_irq_enable();
 
@@ -1641,6 +1657,7 @@ static int __devinit at91udc_probe(struct platform_device *pdev)
         struct device   *dev = &pdev->dev;
         struct at91_udc *udc;
         int             retval;
+        struct resource *res;
 
         if (!dev->platform_data) {
                 /* small (so we copy it) but critical! */
@@ -1658,7 +1675,13 @@ static int __devinit at91udc_probe(struct platform_device *pdev)
                 return -ENODEV;
         }
 
-        if (!request_mem_region(AT91RM9200_BASE_UDP, SZ_16K, driver_name)) {
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        if (!res)
+                return -ENXIO;
+
+        if (!request_mem_region(res->start,
+                        res->end - res->start + 1,
+                        driver_name)) {
                 DBG("someone's using UDC memory\n");
                 return -EBUSY;
         }
@@ -1668,15 +1691,23 @@ static int __devinit at91udc_probe(struct platform_device *pdev)
         udc->gadget.dev.parent = dev;
         udc->board = *(struct at91_udc_data *) dev->platform_data;
         udc->pdev = pdev;
-        udc_reinit(udc);
         udc->enabled = 0;
 
+        udc->udp_baseaddr = ioremap(res->start, res->end - res->start + 1);
+        if (!udc->udp_baseaddr) {
+                release_mem_region(res->start, res->end - res->start + 1);
+                return -ENOMEM;
+        }
+
+        udc_reinit(udc);
+
         /* get interface and function clocks */
         udc->iclk = clk_get(dev, "udc_clk");
         udc->fclk = clk_get(dev, "udpck");
         if (IS_ERR(udc->iclk) || IS_ERR(udc->fclk)) {
                 DBG("clocks missing\n");
-                return -ENODEV;
+                retval = -ENODEV;
+                goto fail0;
         }
 
         retval = device_register(&udc->gadget.dev);
@@ -1685,8 +1716,10 @@ static int __devinit at91udc_probe(struct platform_device *pdev)
 
         /* don't do anything until we have both gadget driver and VBUS */
         clk_enable(udc->iclk);
-        at91_udp_write(AT91_UDP_TXVC, AT91_UDP_TXVC_TXVDIS);
-        at91_udp_write(AT91_UDP_IDR, 0xffffffff);
+        at91_udp_write(udc, AT91_UDP_TXVC, AT91_UDP_TXVC_TXVDIS);
+        at91_udp_write(udc, AT91_UDP_IDR, 0xffffffff);
+        /* Clear all pending interrupts - UDP may be used by bootloader. */
+        at91_udp_write(udc, AT91_UDP_ICR, 0xffffffff);
         clk_disable(udc->iclk);
 
         /* request UDC and maybe VBUS irqs */
@@ -1698,6 +1731,11 @@ static int __devinit at91udc_probe(struct platform_device *pdev)
                 goto fail1;
         }
         if (udc->board.vbus_pin > 0) {
+                /*
+                 * Get the initial state of VBUS - we cannot expect
+                 * a pending interrupt.
+                 */
+                udc->vbus = at91_get_gpio_value(udc->board.vbus_pin);
                 if (request_irq(udc->board.vbus_pin, at91_vbus_irq,
                                 IRQF_DISABLED, driver_name, udc)) {
                         DBG("request vbus irq %d failed\n",
@@ -1720,7 +1758,7 @@ static int __devinit at91udc_probe(struct platform_device *pdev)
 fail1:
         device_unregister(&udc->gadget.dev);
 fail0:
-        release_mem_region(AT91RM9200_BASE_UDP, SZ_16K);
+        release_mem_region(res->start, res->end - res->start + 1);
         DBG("%s probe failed, %d\n", driver_name, retval);
         return retval;
 }
@@ -1728,13 +1766,14 @@ fail0:
 static int __devexit at91udc_remove(struct platform_device *pdev)
 {
         struct at91_udc *udc = platform_get_drvdata(pdev);
+        struct resource *res;
 
         DBG("remove\n");
 
-        pullup(udc, 0);
+        if (udc->driver)
+                return -EBUSY;
 
-        if (udc->driver != 0)
-                usb_gadget_unregister_driver(udc->driver);
+        pullup(udc, 0);
 
         device_init_wakeup(&pdev->dev, 0);
         remove_debug_file(udc);
@@ -1742,7 +1781,10 @@ static int __devexit at91udc_remove(struct platform_device *pdev)
                 free_irq(udc->board.vbus_pin, udc);
         free_irq(udc->udp_irq, udc);
         device_unregister(&udc->gadget.dev);
-        release_mem_region(AT91RM9200_BASE_UDP, SZ_16K);
+
+        iounmap(udc->udp_baseaddr);
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        release_mem_region(res->start, res->end - res->start + 1);
 
         clk_put(udc->iclk);
         clk_put(udc->fclk);
diff --git a/drivers/usb/gadget/at91_udc.h b/drivers/usb/gadget/at91_udc.h
index 882af42e86..677089baa5 100644
--- a/drivers/usb/gadget/at91_udc.h
+++ b/drivers/usb/gadget/at91_udc.h
@@ -51,10 +51,10 @@
 #define     AT91_UDP_EP(n)      (1 << (n))      /* Endpoint Interrupt Status */
 #define     AT91_UDP_RXSUSP     (1 <<  8)       /* USB Suspend Interrupt Status */
 #define     AT91_UDP_RXRSM      (1 <<  9)       /* USB Resume Interrupt Status */
-#define     AT91_UDP_EXTRSM     (1 << 10)       /* External Resume Interrupt Status */
+#define     AT91_UDP_EXTRSM     (1 << 10)       /* External Resume Interrupt Status [AT91RM9200 only] */
 #define     AT91_UDP_SOFINT     (1 << 11)       /* Start of Frame Interrupt Status */
 #define     AT91_UDP_ENDBUSRES  (1 << 12)       /* End of Bus Reset Interrpt Status */
-#define     AT91_UDP_WAKEUP     (1 << 13)       /* USB Wakeup Interrupt Status */
+#define     AT91_UDP_WAKEUP     (1 << 13)       /* USB Wakeup Interrupt Status [AT91RM9200 only] */
 
 #define AT91_UDP_ICR            0x20            /* Interrupt Clear Register */
 #define AT91_UDP_RST_EP         0x28            /* Reset Endpoint Register */
@@ -84,7 +84,7 @@
 
 #define AT91_UDP_TXVC           0x74            /* Transceiver Control Register */
 #define     AT91_UDP_TXVC_TXVDIS (1 << 8)       /* Transceiver Disable */
-
+#define     AT91_UDP_TXVC_PUON   (1 << 9)       /* PullUp On [AT91SAM9260 only] */
 
 /*-------------------------------------------------------------------------*/
 
@@ -141,6 +141,7 @@ struct at91_udc {
         struct clk                      *iclk, *fclk;
         struct platform_device          *pdev;
         struct proc_dir_entry           *pde;
+        void __iomem                    *udp_baseaddr;
         int                             udp_irq;
 };
 
diff --git a/drivers/usb/gadget/dummy_hcd.c b/drivers/usb/gadget/dummy_hcd.c
index f1f32d7be5..3c2bc075ef 100644
--- a/drivers/usb/gadget/dummy_hcd.c
+++ b/drivers/usb/gadget/dummy_hcd.c
@@ -779,7 +779,7 @@ usb_gadget_register_driver (struct usb_gadget_driver *driver)
                 return -EINVAL;
         if (dum->driver)
                 return -EBUSY;
-        if (!driver->bind || !driver->unbind || !driver->setup
+        if (!driver->bind || !driver->setup
                         || driver->speed == USB_SPEED_UNKNOWN)
                 return -EINVAL;
 
@@ -837,7 +837,8 @@ usb_gadget_register_driver (struct usb_gadget_driver *driver)
 err_bind_driver:
         driver_unregister (&driver->driver);
 err_register:
-        driver->unbind (&dum->gadget);
+        if (driver->unbind)
+                driver->unbind (&dum->gadget);
         spin_lock_irq (&dum->lock);
         dum->pullup = 0;
         set_link_state (dum);
@@ -857,7 +858,7 @@ usb_gadget_unregister_driver (struct usb_gadget_driver *driver)
 
         if (!dum)
                 return -ENODEV;
-        if (!driver || driver != dum->driver)
+        if (!driver || driver != dum->driver || !driver->unbind)
                 return -EINVAL;
 
         dev_dbg (udc_dev(dum), "unregister gadget driver '%s'\n",
diff --git a/drivers/usb/gadget/file_storage.c b/drivers/usb/gadget/file_storage.c
index a265e262a2..72f2ae96fb 100644
--- a/drivers/usb/gadget/file_storage.c
+++ b/drivers/usb/gadget/file_storage.c
@@ -4100,7 +4100,7 @@ static struct usb_gadget_driver		fsg_driver = {
 #endif
         .function       = (char *) longname,
         .bind           = fsg_bind,
-        .unbind         = __exit_p(fsg_unbind),
+        .unbind         = fsg_unbind,
         .disconnect     = fsg_disconnect,
         .setup          = fsg_setup,
         .suspend        = fsg_suspend,
diff --git a/drivers/usb/gadget/gmidi.c b/drivers/usb/gadget/gmidi.c
index 31351826f2..f1a679656c 100644
--- a/drivers/usb/gadget/gmidi.c
+++ b/drivers/usb/gadget/gmidi.c
@@ -123,7 +123,7 @@ struct gmidi_device {
         struct usb_request      *req;           /* for control responses */
         u8                      config;
         struct usb_ep           *in_ep, *out_ep;
-        struct snd_card         *card;
+        struct snd_card         *card;
         struct snd_rawmidi      *rmidi;
         struct snd_rawmidi_substream *in_substream;
         struct snd_rawmidi_substream *out_substream;
@@ -490,7 +490,7 @@ static void gmidi_complete(struct usb_ep *ep, struct usb_request *req)
         int status = req->status;
 
         switch (status) {
-        case 0:                         /* normal completion */
+        case 0:                         /* normal completion */
                 if (ep == dev->out_ep) {
                         /* we received stuff.
                            req is queued again, below */
@@ -505,7 +505,7 @@ static void gmidi_complete(struct usb_ep *ep, struct usb_request *req)
                 break;
 
         /* this endpoint is normally active while we're configured */
-        case -ECONNABORTED:             /* hardware forced ep reset */
+        case -ECONNABORTED:             /* hardware forced ep reset */
         case -ECONNRESET:               /* request dequeued */
         case -ESHUTDOWN:                /* disconnect from host */
                 VDBG(dev, "%s gone (%d), %d/%d\n", ep->name, status,
@@ -656,7 +656,7 @@ gmidi_set_config(struct gmidi_device *dev, unsigned number, gfp_t gfp_flags)
                 case USB_SPEED_LOW:     speed = "low"; break;
                 case USB_SPEED_FULL:    speed = "full"; break;
                 case USB_SPEED_HIGH:    speed = "high"; break;
-                default:                speed = "?"; break;
+                default:                speed = "?"; break;
                 }
 
                 dev->config = number;
@@ -1308,7 +1308,7 @@ static struct usb_gadget_driver gmidi_driver = {
         .speed          = USB_SPEED_FULL,
         .function       = (char *)longname,
         .bind           = gmidi_bind,
-        .unbind         = __exit_p(gmidi_unbind),
+        .unbind         = gmidi_unbind,
 
         .setup          = gmidi_setup,
         .disconnect     = gmidi_disconnect,
@@ -1316,7 +1316,7 @@ static struct usb_gadget_driver gmidi_driver = {
         .suspend        = gmidi_suspend,
         .resume         = gmidi_resume,
 
-        .driver         = {
+        .driver         = {
                 .name           = (char *)shortname,
                 .owner          = THIS_MODULE,
         },
diff --git a/drivers/usb/gadget/goku_udc.c b/drivers/usb/gadget/goku_udc.c
index 805a982684..d0ef1d6b3f 100644
--- a/drivers/usb/gadget/goku_udc.c
+++ b/drivers/usb/gadget/goku_udc.c
@@ -1432,7 +1432,6 @@ int usb_gadget_register_driver(struct usb_gadget_driver *driver)
         if (!driver
                         || driver->speed != USB_SPEED_FULL
                         || !driver->bind
-                        || !driver->unbind
                         || !driver->disconnect
                         || !driver->setup)
                 return -EINVAL;
@@ -1495,7 +1494,7 @@ int usb_gadget_unregister_driver(struct usb_gadget_driver *driver)
 
         if (!dev)
                 return -ENODEV;
-        if (!driver || driver != dev->driver)
+        if (!driver || driver != dev->driver || !driver->unbind)
                 return -EINVAL;
 
         spin_lock_irqsave(&dev->lock, flags);
@@ -1808,13 +1807,8 @@ static void goku_remove(struct pci_dev *pdev)
         struct goku_udc         *dev = pci_get_drvdata(pdev);
 
         DBG(dev, "%s\n", __FUNCTION__);
-        /* start with the driver above us */
-        if (dev->driver) {
-                /* should have been done already by driver model core */
-                WARN(dev, "pci remove, driver '%s' is still registered\n",
-                                dev->driver->driver.name);
-                usb_gadget_unregister_driver(dev->driver);
-        }
+
+        BUG_ON(dev->driver);
 
 #ifdef CONFIG_USB_GADGET_DEBUG_FILES
         remove_proc_entry(proc_node_name, NULL);
diff --git a/drivers/usb/gadget/lh7a40x_udc.c b/drivers/usb/gadget/lh7a40x_udc.c
index 4a991564a0..a0a73c08a3 100644
--- a/drivers/usb/gadget/lh7a40x_udc.c
+++ b/drivers/usb/gadget/lh7a40x_udc.c
@@ -422,9 +422,10 @@ int usb_gadget_register_driver(struct usb_gadget_driver *driver)
         DEBUG("%s: %s\n", __FUNCTION__, driver->driver.name);
 
         if (!driver
-            || driver->speed != USB_SPEED_FULL
-            || !driver->bind
-            || !driver->unbind || !driver->disconnect || !driver->setup)
+                        || driver->speed != USB_SPEED_FULL
+                        || !driver->bind
+                        || !driver->disconnect
+                        || !driver->setup)
                 return -EINVAL;
         if (!dev)
                 return -ENODEV;
@@ -471,7 +472,7 @@ int usb_gadget_unregister_driver(struct usb_gadget_driver *driver)
 
         if (!dev)
                 return -ENODEV;
-        if (!driver || driver != dev->driver)
+        if (!driver || driver != dev->driver || !driver->unbind)
                 return -EINVAL;
 
         spin_lock_irqsave(&dev->lock, flags);
@@ -2125,9 +2126,11 @@ static int lh7a40x_udc_remove(struct platform_device *pdev)
 
         DEBUG("%s: %p\n", __FUNCTION__, pdev);
 
+        if (dev->driver)
+                return -EBUSY;
+
         udc_disable(dev);
         remove_proc_files();
-        usb_gadget_unregister_driver(dev->driver);
 
         free_irq(IRQ_USBINTR, dev);
 
diff --git a/drivers/usb/gadget/net2280.c b/drivers/usb/gadget/net2280.c
index 3024c679e3..569eb8ccf2 100644
--- a/drivers/usb/gadget/net2280.c
+++ b/drivers/usb/gadget/net2280.c
@@ -2020,7 +2020,6 @@ int usb_gadget_register_driver (struct usb_gadget_driver *driver)
         if (!driver
                         || driver->speed != USB_SPEED_HIGH
                         || !driver->bind
-                        || !driver->unbind
                         || !driver->setup)
                 return -EINVAL;
         if (!dev)
@@ -2107,7 +2106,7 @@ int usb_gadget_unregister_driver (struct usb_gadget_driver *driver)
 
         if (!dev)
                 return -ENODEV;
-        if (!driver || driver != dev->driver)
+        if (!driver || driver != dev->driver || !driver->unbind)
                 return -EINVAL;
 
         spin_lock_irqsave (&dev->lock, flags);
@@ -2803,13 +2802,7 @@ static void net2280_remove (struct pci_dev *pdev)
 {
         struct net2280          *dev = pci_get_drvdata (pdev);
 
-        /* start with the driver above us */
-        if (dev->driver) {
-                /* should have been done already by driver model core */
-                WARN (dev, "pci remove, driver '%s' is still registered\n",
-                                dev->driver->driver.name);
-                usb_gadget_unregister_driver (dev->driver);
-        }
+        BUG_ON(dev->driver);
 
         /* then clean up the resources we allocated during probe() */
         net2280_led_shutdown (dev);
diff --git a/drivers/usb/gadget/omap_udc.c b/drivers/usb/gadget/omap_udc.c
index 030d87c28c..15d77c3079 100644
--- a/drivers/usb/gadget/omap_udc.c
+++ b/drivers/usb/gadget/omap_udc.c
@@ -2043,7 +2043,6 @@ int usb_gadget_register_driver (struct usb_gadget_driver *driver)
                         // FIXME if otg, check:  driver->is_otg
                         || driver->speed < USB_SPEED_FULL
                         || !driver->bind
-                        || !driver->unbind
                         || !driver->setup)
                 return -EINVAL;
 
@@ -2087,9 +2086,11 @@ int usb_gadget_register_driver (struct usb_gadget_driver *driver)
                 status = otg_set_peripheral(udc->transceiver, &udc->gadget);
                 if (status < 0) {
                         ERR("can't bind to transceiver\n");
-                        driver->unbind (&udc->gadget);
-                        udc->gadget.dev.driver = NULL;
-                        udc->driver = NULL;
+                        if (driver->unbind) {
+                                driver->unbind (&udc->gadget);
+                                udc->gadget.dev.driver = NULL;
+                                udc->driver = NULL;
+                        }
                         goto done;
                 }
         } else {
@@ -2117,7 +2118,7 @@ int usb_gadget_unregister_driver (struct usb_gadget_driver *driver)
 
         if (!udc)
                 return -ENODEV;
-        if (!driver || driver != udc->driver)
+        if (!driver || driver != udc->driver || !driver->unbind)
                 return -EINVAL;
 
         if (machine_is_omap_innovator() || machine_is_omap_osk())
@@ -2870,6 +2871,8 @@ static int __exit omap_udc_remove(struct platform_device *pdev)
 
         if (!udc)
                 return -ENODEV;
+        if (udc->driver)
+                return -EBUSY;
 
         udc->done = &done;
 
diff --git a/drivers/usb/gadget/pxa2xx_udc.c b/drivers/usb/gadget/pxa2xx_udc.c
index 1ed506e959..b78de96946 100644
--- a/drivers/usb/gadget/pxa2xx_udc.c
+++ b/drivers/usb/gadget/pxa2xx_udc.c
@@ -1623,7 +1623,6 @@ int usb_gadget_register_driver(struct usb_gadget_driver *driver)
         if (!driver
                         || driver->speed < USB_SPEED_FULL
                         || !driver->bind
-                        || !driver->unbind
                         || !driver->disconnect
                         || !driver->setup)
                 return -EINVAL;
@@ -1694,7 +1693,7 @@ int usb_gadget_unregister_driver(struct usb_gadget_driver *driver)
 
         if (!dev)
                 return -ENODEV;
-        if (!driver || driver != dev->driver)
+        if (!driver || driver != dev->driver || !driver->unbind)
                 return -EINVAL;
 
         local_irq_disable();
@@ -2638,9 +2637,11 @@ static int __exit pxa2xx_udc_remove(struct platform_device *pdev)
 {
         struct pxa2xx_udc *dev = platform_get_drvdata(pdev);
 
+        if (dev->driver)
+                return -EBUSY;
+
         udc_disable(dev);
         remove_proc_files();
-        usb_gadget_unregister_driver(dev->driver);
 
         if (dev->got_irq) {
                 free_irq(IRQ_USB, dev);
diff --git a/drivers/usb/gadget/serial.c b/drivers/usb/gadget/serial.c
index 2d12bf9f19..f8a3ec6463 100644
--- a/drivers/usb/gadget/serial.c
+++ b/drivers/usb/gadget/serial.c
@@ -296,7 +296,7 @@ static struct usb_gadget_driver gs_gadget_driver = {
 #endif /* CONFIG_USB_GADGET_DUALSPEED */
         .function =             GS_LONG_NAME,
         .bind =                 gs_bind,
-        .unbind =               __exit_p(gs_unbind),
+        .unbind =               gs_unbind,
         .setup =                gs_setup,
         .disconnect =           gs_disconnect,
         .driver = {
diff --git a/drivers/usb/host/ohci-at91.c b/drivers/usb/host/ohci-at91.c
index b466581beb..cc405512fa 100644
--- a/drivers/usb/host/ohci-at91.c
+++ b/drivers/usb/host/ohci-at91.c
@@ -187,7 +187,6 @@ ohci_at91_start (struct usb_hcd *hcd)
 {
         struct at91_usbh_data   *board = hcd->self.controller->platform_data;
         struct ohci_hcd         *ohci = hcd_to_ohci (hcd);
-        struct usb_device       *root = hcd->self.root_hub;
         int                     ret;
 
         if ((ret = ohci_init(ohci)) < 0)
@@ -221,7 +220,7 @@ static const struct hc_driver ohci_at91_hc_driver = {
          */
         .start =                ohci_at91_start,
         .stop =                 ohci_stop,
-        .shutdown =             ohci_shutdown,
+        .shutdown =             ohci_shutdown,
 
         /*
          * managing i/o requests and associated device resources
diff --git a/drivers/usb/host/ohci-au1xxx.c b/drivers/usb/host/ohci-au1xxx.c
index 24e23c5783..e70b2430e2 100644
--- a/drivers/usb/host/ohci-au1xxx.c
+++ b/drivers/usb/host/ohci-au1xxx.c
@@ -269,7 +269,7 @@ static const struct hc_driver ohci_au1xxx_hc_driver = {
          */
         .start =                ohci_au1xxx_start,
         .stop =                 ohci_stop,
-        .shutdown =             ohci_shutdown,
+        .shutdown =             ohci_shutdown,
 
         /*
          * managing i/o requests and associated device resources
@@ -336,7 +336,7 @@ static int ohci_hcd_au1xxx_drv_resume(struct platform_device *dev)
 static struct platform_driver ohci_hcd_au1xxx_driver = {
         .probe          = ohci_hcd_au1xxx_drv_probe,
         .remove         = ohci_hcd_au1xxx_drv_remove,
-        .shutdown       = usb_hcd_platform_shutdown,
+        .shutdown       = usb_hcd_platform_shutdown,
         /*.suspend      = ohci_hcd_au1xxx_drv_suspend, */
         /*.resume       = ohci_hcd_au1xxx_drv_resume, */
         .driver         = {
diff --git a/drivers/usb/host/ohci-dbg.c b/drivers/usb/host/ohci-dbg.c
index 0f47a57dac..273d5ddb72 100644
--- a/drivers/usb/host/ohci-dbg.c
+++ b/drivers/usb/host/ohci-dbg.c
@@ -16,7 +16,7 @@
         case PIPE_CONTROL:      temp = "ctrl"; break; \
         case PIPE_BULK:         temp = "bulk"; break; \
         case PIPE_INTERRUPT:    temp = "intr"; break; \
-        default:                temp = "isoc"; break; \
+        default:                temp = "isoc"; break; \
         }; temp;})
 #define pipestring(pipe) edstring(usb_pipetype(pipe))
 
@@ -205,13 +205,13 @@ ohci_dump_status (struct ohci_hcd *controller, char **next, unsigned *size)
                 (temp & RH_PS_PSSC) ? " PSSC" : "", \
                 (temp & RH_PS_PESC) ? " PESC" : "", \
                 (temp & RH_PS_CSC) ? " CSC" : "", \
-                \
+                \
                 (temp & RH_PS_LSDA) ? " LSDA" : "", \
                 (temp & RH_PS_PPS) ? " PPS" : "", \
                 (temp & RH_PS_PRS) ? " PRS" : "", \
                 (temp & RH_PS_POCI) ? " POCI" : "", \
                 (temp & RH_PS_PSS) ? " PSS" : "", \
-                \
+                \
                 (temp & RH_PS_PES) ? " PES" : "", \
                 (temp & RH_PS_CCS) ? " CCS" : "" \
                 );
@@ -563,7 +563,7 @@ show_periodic (struct class_device *class_dev, char *buf)
                                         (info & ED_SKIP) ? " K" : "",
                                         (ed->hwHeadP &
                                                 cpu_to_hc32(ohci, ED_H)) ?
-                                                        " H" : "");
+                                                        " H" : "");
                                 size -= temp;
                                 next += temp;
 
diff --git a/drivers/usb/host/ohci-ep93xx.c b/drivers/usb/host/ohci-ep93xx.c
index 1bf5e7a4e7..43ae696b2e 100644
--- a/drivers/usb/host/ohci-ep93xx.c
+++ b/drivers/usb/host/ohci-ep93xx.c
@@ -204,7 +204,7 @@ static int ohci_hcd_ep93xx_drv_resume(struct platform_device *pdev)
 static struct platform_driver ohci_hcd_ep93xx_driver = {
         .probe          = ohci_hcd_ep93xx_drv_probe,
         .remove         = ohci_hcd_ep93xx_drv_remove,
-        .shutdown       = usb_hcd_platform_shutdown,
+        .shutdown       = usb_hcd_platform_shutdown,
 #ifdef CONFIG_PM
         .suspend        = ohci_hcd_ep93xx_drv_suspend,
         .resume         = ohci_hcd_ep93xx_drv_resume,
diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c
index b28a9b6020..c1c1d871ab 100644
--- a/drivers/usb/host/ohci-hcd.c
+++ b/drivers/usb/host/ohci-hcd.c
@@ -3,77 +3,21 @@
  *
  * (C) Copyright 1999 Roman Weissgaerber <weissg@vienna.at>
  * (C) Copyright 2000-2004 David Brownell <dbrownell@users.sourceforge.net>
- * 
+ *
  * [ Initialisation is based on Linus'  ]
  * [ uhci code and gregs ohci fragments ]
  * [ (C) Copyright 1999 Linus Torvalds  ]
  * [ (C) Copyright 1999 Gregory P. Smith]
- * 
- * 
+ *
+ *
  * OHCI is the main "non-Intel/VIA" standard for USB 1.1 host controller
  * interfaces (though some non-x86 Intel chips use it).  It supports
  * smarter hardware than UHCI.  A download link for the spec available
  * through the http://www.usb.org website.
  *
- * History:
- * 
- * 2004/03/24 LH7A404 support (Durgesh Pattamatta & Marc Singer)
- * 2004/02/04 use generic dma_* functions instead of pci_* (dsaxena@plexity.net)
- * 2003/02/24 show registers in sysfs (Kevin Brosius)
- *
- * 2002/09/03 get rid of ed hashtables, rework periodic scheduling and
- *      bandwidth accounting; if debugging, show schedules in driverfs
- * 2002/07/19 fixes to management of ED and schedule state.
- * 2002/06/09 SA-1111 support (Christopher Hoover)
- * 2002/06/01 remember frame when HC won't see EDs any more; use that info
- *      to fix urb unlink races caused by interrupt latency assumptions;
- *      minor ED field and function naming updates
- * 2002/01/18 package as a patch for 2.5.3; this should match the
- *      2.4.17 kernel modulo some bugs being fixed.
- *
- * 2001/10/18 merge pmac cleanup (Benjamin Herrenschmidt) and bugfixes
- *      from post-2.4.5 patches.
- * 2001/09/20 URB_ZERO_PACKET support; hcca_dma portability, OPTi warning
- * 2001/09/07 match PCI PM changes, errnos from Linus' tree
- * 2001/05/05 fork 2.4.5 version into "hcd" framework, cleanup, simplify;
- *      pbook pci quirks gone (please fix pbook pci sw!) (db)
- *
- * 2001/04/08 Identify version on module load (gb)
- * 2001/03/24 td/ed hashing to remove bus_to_virt (Steve Longerbeam);
-        pci_map_single (db)
- * 2001/03/21 td and dev/ed allocation uses new pci_pool API (db)
- * 2001/03/07 hcca allocation uses pci_alloc_consistent (Steve Longerbeam)
- *
- * 2000/09/26 fixed races in removing the private portion of the urb
- * 2000/09/07 disable bulk and control lists when unlinking the last
- *      endpoint descriptor in order to avoid unrecoverable errors on
- *      the Lucent chips. (rwc@sgi)
- * 2000/08/29 use bandwidth claiming hooks (thanks Randy!), fix some
- *      urb unlink probs, indentation fixes
- * 2000/08/11 various oops fixes mostly affecting iso and cleanup from
- *      device unplugs.
- * 2000/06/28 use PCI hotplug framework, for better power management
- *      and for Cardbus support (David Brownell)
- * 2000/earlier:  fixes for NEC/Lucent chips; suspend/resume handling
- *      when the controller loses power; handle UE; cleanup; ...
- *
- * v5.2 1999/12/07 URB 3rd preview, 
- * v5.1 1999/11/30 URB 2nd preview, cpia, (usb-scsi)
- * v5.0 1999/11/22 URB Technical preview, Paul Mackerras powerbook susp/resume 
- *      i386: HUB, Keyboard, Mouse, Printer 
- *
- * v4.3 1999/10/27 multiple HCs, bulk_request
- * v4.2 1999/09/05 ISO API alpha, new dev alloc, neg Error-codes
- * v4.1 1999/08/27 Randy Dunlap's - ISO API first impl.
- * v4.0 1999/08/18 
- * v3.0 1999/06/25 
- * v2.1 1999/05/09  code clean up
- * v2.0 1999/05/04 
- * v1.0 1999/04/27 initial release
- *
  * This file is licenced under the GPL.
  */
- 
+
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/pci.h>
@@ -89,7 +33,7 @@
 #include <linux/list.h>
 #include <linux/usb.h>
 #include <linux/usb/otg.h>
-#include <linux/dma-mapping.h> 
+#include <linux/dma-mapping.h>
 #include <linux/dmapool.h>
 #include <linux/reboot.h>
 
@@ -183,11 +127,11 @@ static int ohci_urb_enqueue (
         int             i, size = 0;
         unsigned long   flags;
         int             retval = 0;
-        
+
 #ifdef OHCI_VERBOSE_DEBUG
         urb_print (urb, "SUB", usb_pipein (pipe));
 #endif
-        
+
         /* every endpoint has a ed, locate and maybe (re)initialize it */
         if (! (ed = ed_get (ohci, ep, urb->dev, pipe, urb->interval)))
                 return -ENOMEM;
@@ -232,7 +176,7 @@ static int ohci_urb_enqueue (
         memset (urb_priv, 0, sizeof (urb_priv_t) + size * sizeof (struct td *));
         INIT_LIST_HEAD (&urb_priv->pending);
         urb_priv->length = size;
-        urb_priv->ed = ed;      
+        urb_priv->ed = ed;
 
         /* allocate the TDs (deferring hash chain updates) */
         for (i = 0; i < size; i++) {
@@ -242,7 +186,7 @@ static int ohci_urb_enqueue (
                         urb_free_priv (ohci, urb_priv);
                         return -ENOMEM;
                 }
-        }       
+        }
 
         spin_lock_irqsave (&ohci->lock, flags);
 
@@ -313,13 +257,13 @@ static int ohci_urb_dequeue (struct usb_hcd *hcd, struct urb *urb)
 {
         struct ohci_hcd         *ohci = hcd_to_ohci (hcd);
         unsigned long           flags;
-        
+
 #ifdef OHCI_VERBOSE_DEBUG
         urb_print (urb, "UNLINK", 1);
-#endif            
+#endif
 
         spin_lock_irqsave (&ohci->lock, flags);
-        if (HC_IS_RUNNING(hcd->state)) {
+        if (HC_IS_RUNNING(hcd->state)) {
                 urb_priv_t  *urb_priv;
 
                 /* Unless an IRQ completed the unlink while it was being
@@ -512,11 +456,11 @@ static int ohci_init (struct ohci_hcd *ohci)
 
 /* Start an OHCI controller, set the BUS operational
  * resets USB and controller
- * enable interrupts 
+ * enable interrupts
  */
 static int ohci_run (struct ohci_hcd *ohci)
 {
-        u32                     mask, temp;
+        u32                     mask, temp;
         int                     first = ohci->fminterval == 0;
         struct usb_hcd          *hcd = ohci_to_hcd(ohci);
 
@@ -534,7 +478,7 @@ static int ohci_run (struct ohci_hcd *ohci)
                 /* also: power/overcurrent flags in roothub.a */
         }
 
-        /* Reset USB nearly "by the book".  RemoteWakeupConnected was
+        /* Reset USB nearly "by the book".  RemoteWakeupConnected was
          * saved if boot firmware (BIOS/SMM/...) told us it's connected,
          * or if bus glue did the same (e.g. for PCI add-in cards with
          * PCI PM support).
@@ -765,9 +709,9 @@ static irqreturn_t ohci_irq (struct usb_hcd *hcd)
                 dl_done_list (ohci);
                 spin_unlock (&ohci->lock);
                 if (HC_IS_RUNNING(hcd->state))
-                        ohci_writel (ohci, OHCI_INTR_WDH, &regs->intrenable); 
+                        ohci_writel (ohci, OHCI_INTR_WDH, &regs->intrenable);
         }
-  
+
         /* could track INTR_SO to reduce available PCI/... bandwidth */
 
         /* handle any pending URB/ED unlinks, leaving INTR_SF enabled
@@ -778,12 +722,12 @@ static irqreturn_t ohci_irq (struct usb_hcd *hcd)
                 finish_unlinks (ohci, ohci_frame_no(ohci));
         if ((ints & OHCI_INTR_SF) != 0 && !ohci->ed_rm_list
                         && HC_IS_RUNNING(hcd->state))
-                ohci_writel (ohci, OHCI_INTR_SF, &regs->intrdisable);   
+                ohci_writel (ohci, OHCI_INTR_SF, &regs->intrdisable);
         spin_unlock (&ohci->lock);
 
         if (HC_IS_RUNNING(hcd->state)) {
                 ohci_writel (ohci, ints, &regs->intrstatus);
-                ohci_writel (ohci, OHCI_INTR_MIE, &regs->intrenable);   
+                ohci_writel (ohci, OHCI_INTR_MIE, &regs->intrenable);
                 // flush those writes
                 (void) ohci_readl (ohci, &ohci->regs->control);
         }
@@ -794,7 +738,7 @@ static irqreturn_t ohci_irq (struct usb_hcd *hcd)
 /*-------------------------------------------------------------------------*/
 
 static void ohci_stop (struct usb_hcd *hcd)
-{       
+{
         struct ohci_hcd         *ohci = hcd_to_ohci (hcd);
 
         ohci_dbg (ohci, "stop %s controller (state 0x%02x)\n",
@@ -812,8 +756,8 @@ static void ohci_stop (struct usb_hcd *hcd)
         remove_debug_files (ohci);
         ohci_mem_cleanup (ohci);
         if (ohci->hcca) {
-                dma_free_coherent (hcd->self.controller, 
-                                sizeof *ohci->hcca, 
+                dma_free_coherent (hcd->self.controller,
+                                sizeof *ohci->hcca,
                                 ohci->hcca, ohci->hcca_dma);
                 ohci->hcca = NULL;
                 ohci->hcca_dma = 0;
@@ -836,7 +780,7 @@ static int ohci_restart (struct ohci_hcd *ohci)
          * recycle any "live" eds/tds (and urbs) right away.
          * later, khubd disconnect processing will recycle the other state,
          * (either as disconnect/reconnect, or maybe someday as a reset).
-         */ 
+         */
         spin_lock_irq(&ohci->lock);
         disable (ohci);
         usb_root_hub_lost_power(ohci_to_hcd(ohci)->self.root_hub);
@@ -875,11 +819,11 @@ static int ohci_restart (struct ohci_hcd *ohci)
         /* empty the interrupt branches */
         for (i = 0; i < NUM_INTS; i++) ohci->load [i] = 0;
         for (i = 0; i < NUM_INTS; i++) ohci->hcca->int_table [i] = 0;
-        
+
         /* no EDs to remove */
         ohci->ed_rm_list = NULL;
 
-        /* empty control and bulk lists */       
+        /* empty control and bulk lists */
         ohci->ed_controltail = NULL;
         ohci->ed_bulktail    = NULL;
 
@@ -941,6 +885,10 @@ MODULE_LICENSE ("GPL");
 #include "ohci-au1xxx.c"
 #endif
 
+#ifdef CONFIG_PNX8550
+#include "ohci-pnx8550.c"
+#endif
+
 #ifdef CONFIG_USB_OHCI_HCD_PPC_SOC
 #include "ohci-ppc-soc.c"
 #endif
diff --git a/drivers/usb/host/ohci-hub.c b/drivers/usb/host/ohci-hub.c
index 2441642cb7..216c9c9d4d 100644
--- a/drivers/usb/host/ohci-hub.c
+++ b/drivers/usb/host/ohci-hub.c
@@ -1,9 +1,9 @@
 /*
  * OHCI HCD (Host Controller Driver) for USB.
- * 
+ *
  * (C) Copyright 1999 Roman Weissgaerber <weissg@vienna.at>
  * (C) Copyright 2000-2004 David Brownell <dbrownell@users.sourceforge.net>
- * 
+ *
  * This file is licenced under GPL
  */
 
@@ -23,13 +23,13 @@
                 (temp & RH_PS_PSSC) ? " PSSC" : "", \
                 (temp & RH_PS_PESC) ? " PESC" : "", \
                 (temp & RH_PS_CSC) ? " CSC" : "", \
-                \
+                \
                 (temp & RH_PS_LSDA) ? " LSDA" : "", \
                 (temp & RH_PS_PPS) ? " PPS" : "", \
                 (temp & RH_PS_PRS) ? " PRS" : "", \
                 (temp & RH_PS_POCI) ? " POCI" : "", \
                 (temp & RH_PS_PSS) ? " PSS" : "", \
-                \
+                \
                 (temp & RH_PS_PES) ? " PES" : "", \
                 (temp & RH_PS_CCS) ? " CCS" : "" \
                 );
@@ -484,7 +484,7 @@ ohci_hub_descriptor (
         temp = 0;
         if (rh & RH_A_NPS)              /* no power switching? */
             temp |= 0x0002;
-        if (rh & RH_A_PSM)              /* per-port power switching? */
+        if (rh & RH_A_PSM)              /* per-port power switching? */
             temp |= 0x0001;
         if (rh & RH_A_NOCP)             /* no overcurrent reporting? */
             temp |= 0x0010;
@@ -555,7 +555,7 @@ static void start_hnp(struct ohci_hcd *ohci);
 #define tick_before(t1,t2) ((s16)(((s16)(t1))-((s16)(t2))) < 0)
 
 /* called from some task, normally khubd */
-static inline void root_port_reset (struct ohci_hcd *ohci, unsigned port)
+static inline int root_port_reset (struct ohci_hcd *ohci, unsigned port)
 {
         __hc32 __iomem *portstat = &ohci->regs->roothub.portstatus [port];
         u32     temp;
@@ -570,10 +570,13 @@ static inline void root_port_reset (struct ohci_hcd *ohci, unsigned port)
                 /* spin until any current reset finishes */
                 for (;;) {
                         temp = ohci_readl (ohci, portstat);
+                        /* handle e.g. CardBus eject */
+                        if (temp == ~(u32)0)
+                                return -ESHUTDOWN;
                         if (!(temp & RH_PS_PRS))
                                 break;
                         udelay (500);
-                } 
+                }
 
                 if (!(temp & RH_PS_CCS))
                         break;
@@ -586,6 +589,8 @@ static inline void root_port_reset (struct ohci_hcd *ohci, unsigned port)
                 now = ohci_readl(ohci, &ohci->regs->fmnumber);
         } while (tick_before(now, reset_done));
         /* caller synchronizes using PRSC */
+
+        return 0;
 }
 
 static int ohci_hub_control (
@@ -702,7 +707,7 @@ static int ohci_hub_control (
                                 &ohci->regs->roothub.portstatus [wIndex]);
                         break;
                 case USB_PORT_FEAT_RESET:
-                        root_port_reset (ohci, wIndex);
+                        retval = root_port_reset (ohci, wIndex);
                         break;
                 default:
                         goto error;
diff --git a/drivers/usb/host/ohci-lh7a404.c b/drivers/usb/host/ohci-lh7a404.c
index e121d97ed9..e9807cf73a 100644
--- a/drivers/usb/host/ohci-lh7a404.c
+++ b/drivers/usb/host/ohci-lh7a404.c
@@ -38,7 +38,7 @@ static void lh7a404_start_hc(struct platform_device *dev)
         CSC_PWRCNT |= CSC_PWRCNT_USBH_EN; /* Enable clock */
         udelay(1000);
         USBH_CMDSTATUS = OHCI_HCR;
-        
+
         printk(KERN_DEBUG __FILE__
                    ": Clock to USB host has been enabled \n");
 }
@@ -89,7 +89,7 @@ int usb_hcd_lh7a404_probe (const struct hc_driver *driver,
                 retval = -EBUSY;
                 goto err1;
         }
-        
+
         hcd->regs = ioremap(hcd->rsrc_start, hcd->rsrc_len);
         if (!hcd->regs) {
                 pr_debug("ioremap failed");
@@ -174,7 +174,7 @@ static const struct hc_driver ohci_lh7a404_hc_driver = {
          */
         .start =                ohci_lh7a404_start,
         .stop =                 ohci_stop,
-        .shutdown =             ohci_shutdown,
+        .shutdown =             ohci_shutdown,
 
         /*
          * managing i/o requests and associated device resources
@@ -242,7 +242,7 @@ static int ohci_hcd_lh7a404_drv_resume(struct platform_device *dev)
 static struct platform_driver ohci_hcd_lh7a404_driver = {
         .probe          = ohci_hcd_lh7a404_drv_probe,
         .remove         = ohci_hcd_lh7a404_drv_remove,
-        .shutdown       = usb_hcd_platform_shutdown,
+        .shutdown       = usb_hcd_platform_shutdown,
         /*.suspend      = ohci_hcd_lh7a404_drv_suspend, */
         /*.resume       = ohci_hcd_lh7a404_drv_resume, */
         .driver         = {
diff --git a/drivers/usb/host/ohci-mem.c b/drivers/usb/host/ohci-mem.c
index d976614eeb..2f20d3dc89 100644
--- a/drivers/usb/host/ohci-mem.c
+++ b/drivers/usb/host/ohci-mem.c
@@ -1,24 +1,24 @@
 /*
  * OHCI HCD (Host Controller Driver) for USB.
- * 
+ *
  * (C) Copyright 1999 Roman Weissgaerber <weissg@vienna.at>
  * (C) Copyright 2000-2002 David Brownell <dbrownell@users.sourceforge.net>
- * 
+ *
  * This file is licenced under the GPL.
  */
 
 /*-------------------------------------------------------------------------*/
 
 /*
- * There's basically three types of memory:
+ * OHCI deals with three types of memory:
  *      - data used only by the HCD ... kmalloc is fine
  *      - async and periodic schedules, shared by HC and HCD ... these
  *        need to use dma_pool or dma_alloc_coherent
  *      - driver buffers, read/written by HC ... the hcd glue or the
  *        device driver provides us with dma addresses
  *
- * There's also PCI "register" data, which is memory mapped.
- * No memory seen by this driver is pagable.
+ * There's also "register" data, which is memory mapped.
+ * No memory seen by this driver (or any HCD) may be paged out.
  */
 
 /*-------------------------------------------------------------------------*/
diff --git a/drivers/usb/host/ohci-omap.c b/drivers/usb/host/ohci-omap.c
index 9c02177de5..27be1f9368 100644
--- a/drivers/usb/host/ohci-omap.c
+++ b/drivers/usb/host/ohci-omap.c
@@ -447,7 +447,7 @@ static const struct hc_driver ohci_omap_hc_driver = {
         .reset =                ohci_omap_init,
         .start =                ohci_omap_start,
         .stop =                 ohci_omap_stop,
-        .shutdown =             ohci_shutdown,
+        .shutdown =             ohci_shutdown,
 
         /*
          * managing i/o requests and associated device resources
@@ -533,7 +533,7 @@ static int ohci_omap_resume(struct platform_device *dev)
 static struct platform_driver ohci_hcd_omap_driver = {
         .probe          = ohci_hcd_omap_drv_probe,
         .remove         = ohci_hcd_omap_drv_remove,
-        .shutdown       = usb_hcd_platform_shutdown,
+        .shutdown       = usb_hcd_platform_shutdown,
 #ifdef  CONFIG_PM
         .suspend        = ohci_omap_suspend,
         .resume         = ohci_omap_resume,
diff --git a/drivers/usb/host/ohci-pci.c b/drivers/usb/host/ohci-pci.c
index 8744185527..596e0b41e6 100644
--- a/drivers/usb/host/ohci-pci.c
+++ b/drivers/usb/host/ohci-pci.c
@@ -3,17 +3,17 @@
  *
  * (C) Copyright 1999 Roman Weissgaerber <weissg@vienna.at>
  * (C) Copyright 2000-2002 David Brownell <dbrownell@users.sourceforge.net>
- * 
+ *
  * [ Initialisation is based on Linus'  ]
  * [ uhci code and gregs ohci fragments ]
  * [ (C) Copyright 1999 Linus Torvalds  ]
  * [ (C) Copyright 1999 Gregory P. Smith]
- * 
+ *
  * PCI Bus Glue
  *
  * This file is licenced under the GPL.
  */
- 
+
 #ifndef CONFIG_PCI
 #error "This file is PCI bus glue.  CONFIG_PCI must be defined."
 #endif
@@ -83,7 +83,7 @@ ohci_pci_start (struct usb_hcd *hcd)
                         pci_dev_put(b);
                 }
 
-                /* Check for Compaq's ZFMicro chipset, which needs short 
+                /* Check for Compaq's ZFMicro chipset, which needs short
                  * delays before control or bulk queues get re-activated
                  * in finish_unlinks()
                  */
@@ -238,8 +238,8 @@ static struct pci_driver ohci_pci_driver = {
         .shutdown =     usb_hcd_pci_shutdown,
 };
 
- 
-static int __init ohci_hcd_pci_init (void) 
+
+static int __init ohci_hcd_pci_init (void)
 {
         printk (KERN_DEBUG "%s: " DRIVER_INFO " (PCI)\n", hcd_name);
         if (usb_disabled())
@@ -253,8 +253,8 @@ module_init (ohci_hcd_pci_init);
 
 /*-------------------------------------------------------------------------*/
 
-static void __exit ohci_hcd_pci_cleanup (void) 
-{       
+static void __exit ohci_hcd_pci_cleanup (void)
+{
         pci_unregister_driver (&ohci_pci_driver);
 }
 module_exit (ohci_hcd_pci_cleanup);
diff --git a/drivers/usb/host/ohci-pnx4008.c b/drivers/usb/host/ohci-pnx4008.c
index 7f26f9bdba..3a8cbfb690 100644
--- a/drivers/usb/host/ohci-pnx4008.c
+++ b/drivers/usb/host/ohci-pnx4008.c
@@ -4,7 +4,7 @@
  * driver for Philips PNX4008 USB Host
  *
  * Authors: Dmitry Chigirev <source@mvista.com>
- *          Vitaly Wool <vitalywool@gmail.com>
+ *          Vitaly Wool <vitalywool@gmail.com>
  *
  * register initialization is based on code examples provided by Philips
  * Copyright (c) 2005 Koninklijke Philips Electronics N.V.
@@ -29,7 +29,7 @@
 #include <asm/arch/irqs.h>
 #include <asm/arch/gpio.h>
 
-#define USB_CTRL        IO_ADDRESS(PNX4008_PWRMAN_BASE + 0x64)
+#define USB_CTRL        IO_ADDRESS(PNX4008_PWRMAN_BASE + 0x64)
 
 /* USB_CTRL bit defines */
 #define USB_SLAVE_HCLK_EN       (1 << 24)
diff --git a/drivers/usb/host/ohci-pnx8550.c b/drivers/usb/host/ohci-pnx8550.c
new file mode 100644
index 0000000000..6922b91b17
--- /dev/null
+++ b/drivers/usb/host/ohci-pnx8550.c
@@ -0,0 +1,258 @@
+/*
+ * OHCI HCD (Host Controller Driver) for USB.
+ *
+ * (C) Copyright 1999 Roman Weissgaerber <weissg@vienna.at>
+ * (C) Copyright 2000-2002 David Brownell <dbrownell@users.sourceforge.net>
+ * (C) Copyright 2002 Hewlett-Packard Company
+ * (C) Copyright 2005 Embedded Alley Solutions, Inc.
+ *
+ * Bus Glue for PNX8550
+ *
+ * Written by Christopher Hoover <ch@hpl.hp.com>
+ * Based on fragments of previous driver by Russell King et al.
+ *
+ * Modified for LH7A404 from ohci-sa1111.c
+ *  by Durgesh Pattamatta <pattamattad@sharpsec.com>
+ *
+ * Modified for PNX8550 from ohci-sa1111.c and sa-omap.c
+ *  by Vitaly Wool <vitalywool@gmail.com>
+ *
+ * This file is licenced under the GPL.
+ */
+
+#include <linux/device.h>
+#include <linux/platform_device.h>
+#include <asm/mach-pnx8550/usb.h>
+#include <asm/mach-pnx8550/int.h>
+#include <asm/mach-pnx8550/pci.h>
+
+#ifndef CONFIG_PNX8550
+#error "This file is PNX8550 bus glue.  CONFIG_PNX8550 must be defined."
+#endif
+
+extern int usb_disabled(void);
+
+/*-------------------------------------------------------------------------*/
+
+static void pnx8550_start_hc(struct platform_device *dev)
+{
+        /*
+         * Set register CLK48CTL to enable and 48MHz
+         */
+        outl(0x00000003, PCI_BASE | 0x0004770c);
+
+        /*
+         * Set register CLK12CTL to enable and 48MHz
+         */
+        outl(0x00000003, PCI_BASE | 0x00047710);
+
+        udelay(100);
+}
+
+static void pnx8550_stop_hc(struct platform_device *dev)
+{
+        udelay(10);
+}
+
+
+/*-------------------------------------------------------------------------*/
+
+/* configure so an HC device and id are always provided */
+/* always called with process context; sleeping is OK */
+
+
+/**
+ * usb_hcd_pnx8550_probe - initialize pnx8550-based HCDs
+ * Context: !in_interrupt()
+ *
+ * Allocates basic resources for this USB host controller, and
+ * then invokes the start() method for the HCD associated with it
+ * through the hotplug entry's driver_data.
+ *
+ */
+int usb_hcd_pnx8550_probe (const struct hc_driver *driver,
+                          struct platform_device *dev)
+{
+        int retval;
+        struct usb_hcd *hcd;
+
+        if (dev->resource[0].flags != IORESOURCE_MEM ||
+                        dev->resource[1].flags != IORESOURCE_IRQ) {
+                dev_err (&dev->dev,"invalid resource type\n");
+                return -ENOMEM;
+        }
+
+        hcd = usb_create_hcd (driver, &dev->dev, "pnx8550");
+        if (!hcd)
+                return -ENOMEM;
+        hcd->rsrc_start = dev->resource[0].start;
+        hcd->rsrc_len = dev->resource[0].end - dev->resource[0].start + 1;
+
+        if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, hcd_name)) {
+                dev_err(&dev->dev, "request_mem_region [0x%08llx, 0x%08llx] "
+                                "failed\n", hcd->rsrc_start, hcd->rsrc_len);
+                retval = -EBUSY;
+                goto err1;
+        }
+
+        hcd->regs = ioremap(hcd->rsrc_start, hcd->rsrc_len);
+        if (!hcd->regs) {
+                dev_err(&dev->dev, "ioremap [[0x%08llx, 0x%08llx] failed\n",
+                                hcd->rsrc_start, hcd->rsrc_len);
+                retval = -ENOMEM;
+                goto err2;
+        }
+
+        pnx8550_start_hc(dev);
+
+        ohci_hcd_init(hcd_to_ohci(hcd));
+
+        retval = usb_add_hcd(hcd, dev->resource[1].start, SA_INTERRUPT);
+        if (retval == 0)
+                return retval;
+
+        pnx8550_stop_hc(dev);
+        iounmap(hcd->regs);
+ err2:
+        release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
+ err1:
+        usb_put_hcd(hcd);
+        return retval;
+}
+
+
+/* may be called without controller electrically present */
+/* may be called with controller, bus, and devices active */
+
+/**
+ * usb_hcd_pnx8550_remove - shutdown processing for pnx8550-based HCDs
+ * @dev: USB Host Controller being removed
+ * Context: !in_interrupt()
+ *
+ * Reverses the effect of usb_hcd_pnx8550_probe(), first invoking
+ * the HCD's stop() method.  It is always called from a thread
+ * context, normally "rmmod", "apmd", or something similar.
+ *
+ */
+void usb_hcd_pnx8550_remove (struct usb_hcd *hcd, struct platform_device *dev)
+{
+        usb_remove_hcd(hcd);
+        pnx8550_stop_hc(dev);
+        iounmap(hcd->regs);
+        release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
+        usb_put_hcd(hcd);
+}
+
+/*-------------------------------------------------------------------------*/
+
+static int __devinit
+ohci_pnx8550_start (struct usb_hcd *hcd)
+{
+        struct ohci_hcd *ohci = hcd_to_ohci (hcd);
+        int             ret;
+
+        ohci_dbg (ohci, "ohci_pnx8550_start, ohci:%p", ohci);
+
+        if ((ret = ohci_init(ohci)) < 0)
+                return ret;
+
+        if ((ret = ohci_run (ohci)) < 0) {
+                err ("can't start %s", hcd->self.bus_name);
+                ohci_stop (hcd);
+                return ret;
+        }
+
+        return 0;
+}
+
+/*-------------------------------------------------------------------------*/
+
+static const struct hc_driver ohci_pnx8550_hc_driver = {
+        .description =          hcd_name,
+        .product_desc =         "PNX8550 OHCI",
+        .hcd_priv_size =        sizeof(struct ohci_hcd),
+
+        /*
+         * generic hardware linkage
+         */
+        .irq =                  ohci_irq,
+        .flags =                HCD_USB11 | HCD_MEMORY,
+
+        /*
+         * basic lifecycle operations
+         */
+        .start =                ohci_pnx8550_start,
+        .stop =                 ohci_stop,
+
+        /*
+         * managing i/o requests and associated device resources
+         */
+        .urb_enqueue =          ohci_urb_enqueue,
+        .urb_dequeue =          ohci_urb_dequeue,
+        .endpoint_disable =     ohci_endpoint_disable,
+
+        /*
+         * scheduling support
+         */
+        .get_frame_number =     ohci_get_frame,
+
+        /*
+         * root hub support
+         */
+        .hub_status_data =      ohci_hub_status_data,
+        .hub_control =          ohci_hub_control,
+        .hub_irq_enable =       ohci_rhsc_enable,
+#ifdef  CONFIG_PM
+        .bus_suspend =          ohci_bus_suspend,
+        .bus_resume =           ohci_bus_resume,
+#endif
+        .start_port_reset =     ohci_start_port_reset,
+};
+
+/*-------------------------------------------------------------------------*/
+
+static int ohci_hcd_pnx8550_drv_probe(struct platform_device *pdev)
+{
+        int ret;
+
+        if (usb_disabled())
+                return -ENODEV;
+
+        ret = usb_hcd_pnx8550_probe(&ohci_pnx8550_hc_driver, pdev);
+        return ret;
+}
+
+static int ohci_hcd_pnx8550_drv_remove(struct platform_device *pdev)
+{
+        struct usb_hcd *hcd = platform_get_drvdata(pdev);
+
+        usb_hcd_pnx8550_remove(hcd, pdev);
+        return 0;
+}
+
+MODULE_ALIAS("pnx8550-ohci");
+
+static struct platform_driver ohci_hcd_pnx8550_driver = {
+        .driver = {
+                .name           = "pnx8550-ohci",
+        },
+        .probe          = ohci_hcd_pnx8550_drv_probe,
+        .remove         = ohci_hcd_pnx8550_drv_remove,
+};
+
+static int __init ohci_hcd_pnx8550_init (void)
+{
+        pr_debug (DRIVER_INFO " (pnx8550)");
+        pr_debug ("block sizes: ed %d td %d\n",
+                sizeof (struct ed), sizeof (struct td));
+
+        return platform_driver_register(&ohci_hcd_pnx8550_driver);
+}
+
+static void __exit ohci_hcd_pnx8550_cleanup (void)
+{
+        platform_driver_unregister(&ohci_hcd_pnx8550_driver);
+}
+
+module_init (ohci_hcd_pnx8550_init);
+module_exit (ohci_hcd_pnx8550_cleanup);
diff --git a/drivers/usb/host/ohci-ppc-soc.c b/drivers/usb/host/ohci-ppc-soc.c
index d9d1ae236b..e1a7eb8173 100644
--- a/drivers/usb/host/ohci-ppc-soc.c
+++ b/drivers/usb/host/ohci-ppc-soc.c
@@ -5,7 +5,7 @@
  * (C) Copyright 2000-2002 David Brownell <dbrownell@users.sourceforge.net>
  * (C) Copyright 2002 Hewlett-Packard Company
  * (C) Copyright 2003-2005 MontaVista Software Inc.
- * 
+ *
  * Bus Glue for PPC On-Chip OHCI driver
  * Tested on Freescale MPC5200 and IBM STB04xxx
  *
@@ -85,7 +85,7 @@ static int usb_hcd_ppc_soc_probe(const struct hc_driver *driver,
  err2:
         release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
  err1:
-        usb_put_hcd(hcd);
+        usb_put_hcd(hcd);
         return retval;
 }
 
@@ -148,7 +148,7 @@ static const struct hc_driver ohci_ppc_soc_hc_driver = {
          */
         .start =                ohci_ppc_soc_start,
         .stop =                 ohci_stop,
-        .shutdown =             ohci_shutdown,
+        .shutdown =             ohci_shutdown,
 
         /*
          * managing i/o requests and associated device resources
@@ -197,7 +197,7 @@ static int ohci_hcd_ppc_soc_drv_remove(struct platform_device *pdev)
 static struct platform_driver ohci_hcd_ppc_soc_driver = {
         .probe          = ohci_hcd_ppc_soc_drv_probe,
         .remove         = ohci_hcd_ppc_soc_drv_remove,
-        .shutdown       = usb_hcd_platform_shutdown,
+        .shutdown       = usb_hcd_platform_shutdown,
 #ifdef  CONFIG_PM
         /*.suspend      = ohci_hcd_ppc_soc_drv_suspend,*/
         /*.resume       = ohci_hcd_ppc_soc_drv_resume,*/
diff --git a/drivers/usb/host/ohci-pxa27x.c b/drivers/usb/host/ohci-pxa27x.c
index e176b04d7a..3bbea844a9 100644
--- a/drivers/usb/host/ohci-pxa27x.c
+++ b/drivers/usb/host/ohci-pxa27x.c
@@ -47,7 +47,7 @@ static int pxa27x_ohci_select_pmm( int mode )
         switch ( mode ) {
         case PMM_NPS_MODE:
                 UHCRHDA |= RH_A_NPS;
-                break; 
+                break;
         case PMM_GLOBAL_MODE:
                 UHCRHDA &= ~(RH_A_NPS & RH_A_PSM);
                 break;
@@ -60,7 +60,7 @@ static int pxa27x_ohci_select_pmm( int mode )
                 break;
         default:
                 printk( KERN_ERR
-                        "Invalid mode %d, set to non-power switch mode.\n", 
+                        "Invalid mode %d, set to non-power switch mode.\n",
                         mode );
 
                 UHCRHDA |= RH_A_NPS;
@@ -270,7 +270,7 @@ static const struct hc_driver ohci_pxa27x_hc_driver = {
          */
         .start =                ohci_pxa27x_start,
         .stop =                 ohci_stop,
-        .shutdown =             ohci_shutdown,
+        .shutdown =             ohci_shutdown,
 
         /*
          * managing i/o requests and associated device resources
@@ -359,9 +359,9 @@ static int ohci_hcd_pxa27x_drv_resume(struct platform_device *pdev)
 static struct platform_driver ohci_hcd_pxa27x_driver = {
         .probe          = ohci_hcd_pxa27x_drv_probe,
         .remove         = ohci_hcd_pxa27x_drv_remove,
-        .shutdown       = usb_hcd_platform_shutdown,
+        .shutdown       = usb_hcd_platform_shutdown,
 #ifdef CONFIG_PM
-        .suspend        = ohci_hcd_pxa27x_drv_suspend, 
+        .suspend        = ohci_hcd_pxa27x_drv_suspend,
         .resume         = ohci_hcd_pxa27x_drv_resume,
 #endif
         .driver         = {
diff --git a/drivers/usb/host/ohci-q.c b/drivers/usb/host/ohci-q.c
index fe1fe2f97c..830a3fe861 100644
--- a/drivers/usb/host/ohci-q.c
+++ b/drivers/usb/host/ohci-q.c
@@ -1,9 +1,9 @@
 /*
  * OHCI HCD (Host Controller Driver) for USB.
- * 
+ *
  * (C) Copyright 1999 Roman Weissgaerber <weissg@vienna.at>
  * (C) Copyright 2000-2002 David Brownell <dbrownell@users.sourceforge.net>
- * 
+ *
  * This file is licenced under the GPL.
  */
 
@@ -89,7 +89,7 @@ __acquires(ohci->lock)
 
 /*-------------------------------------------------------------------------*
  * ED handling functions
- *-------------------------------------------------------------------------*/  
+ *-------------------------------------------------------------------------*/
 
 /* search for the right schedule branch to use for a periodic ed.
  * does some load balancing; returns the branch, or negative errno.
@@ -107,7 +107,6 @@ static int balance (struct ohci_hcd *ohci, int interval, int load)
          */
         for (i = 0; i < interval ; i++) {
                 if (branch < 0 || ohci->load [branch] > ohci->load [i]) {
-#if 1   /* CONFIG_USB_BANDWIDTH */
                         int     j;
 
                         /* usb 1.1 says 90% of one frame */
@@ -117,8 +116,7 @@ static int balance (struct ohci_hcd *ohci, int interval, int load)
                         }
                         if (j < NUM_INTS)
                                 continue;
-#endif
-                        branch = i; 
+                        branch = i;
                 }
         }
         return branch;
@@ -171,7 +169,7 @@ static void periodic_link (struct ohci_hcd *ohci, struct ed *ed)
 /* link an ed into one of the HC chains */
 
 static int ed_schedule (struct ohci_hcd *ohci, struct ed *ed)
-{        
+{
         int     branch;
 
         if (ohci_to_hcd(ohci)->state == HC_STATE_QUIESCING)
@@ -248,7 +246,7 @@ static int ed_schedule (struct ohci_hcd *ohci, struct ed *ed)
                 }
                 ed->branch = branch;
                 periodic_link (ohci, ed);
-        }               
+        }
 
         /* the HC may not see the schedule updates yet, but if it does
          * then they'll be properly ordered.
@@ -277,7 +275,7 @@ static void periodic_unlink (struct ohci_hcd *ohci, struct ed *ed)
                         *prev = ed->ed_next;
                 }
                 ohci->load [i] -= ed->load;
-        }       
+        }
         ohci_to_hcd(ohci)->self.bandwidth_allocated -= ed->load / ed->interval;
 
         ohci_vdbg (ohci, "unlink %sed %p branch %d [%dus.], interval %d\n",
@@ -285,7 +283,7 @@ static void periodic_unlink (struct ohci_hcd *ohci, struct ed *ed)
                 ed, ed->branch, ed->load, ed->interval);
 }
 
-/* unlink an ed from one of the HC chains. 
+/* unlink an ed from one of the HC chains.
  * just the link to the ed is unlinked.
  * the link from the ed still points to another operational ed or 0
  * so the HC can eventually finish the processing of the unlinked ed
@@ -307,7 +305,7 @@ static void periodic_unlink (struct ohci_hcd *ohci, struct ed *ed)
  * When finish_unlinks() runs later, after SOF interrupt, it will often
  * complete one or more URB unlinks before making that state change.
  */
-static void ed_deschedule (struct ohci_hcd *ohci, struct ed *ed) 
+static void ed_deschedule (struct ohci_hcd *ohci, struct ed *ed)
 {
         ed->hwINFO |= cpu_to_hc32 (ohci, ED_SKIP);
         wmb ();
@@ -397,7 +395,7 @@ static struct ed *ed_get (
         unsigned int            pipe,
         int                     interval
 ) {
-        struct ed               *ed; 
+        struct ed               *ed;
         unsigned long           flags;
 
         spin_lock_irqsave (&ohci->lock, flags);
@@ -413,9 +411,9 @@ static struct ed *ed_get (
                         goto done;
                 }
 
-                /* dummy td; end of td list for ed */
+                /* dummy td; end of td list for ed */
                 td = td_alloc (ohci, GFP_ATOMIC);
-                if (!td) {
+                if (!td) {
                         /* out of memory */
                         ed_free (ohci, ed);
                         ed = NULL;
@@ -462,7 +460,7 @@ static struct ed *ed_get (
 
 done:
         spin_unlock_irqrestore (&ohci->lock, flags);
-        return ed; 
+        return ed;
 }
 
 /*-------------------------------------------------------------------------*/
@@ -474,7 +472,7 @@ done:
  * and that ed->state is ED_OPER
  */
 static void start_ed_unlink (struct ohci_hcd *ohci, struct ed *ed)
-{    
+{
         ed->hwINFO |= cpu_to_hc32 (ohci, ED_DEQUEUE);
         ed_deschedule (ohci, ed);
 
@@ -541,7 +539,7 @@ td_fill (struct ohci_hcd *ohci, u32 info,
         td->ed = urb_priv->ed;
         td->next_dl_td = NULL;
         td->index = index;
-        td->urb = urb; 
+        td->urb = urb;
         td->data_dma = data;
         if (!len)
                 data = 0;
@@ -553,8 +551,8 @@ td_fill (struct ohci_hcd *ohci, u32 info,
                                                 (data & 0x0FFF) | 0xE000);
                 td->ed->last_iso = info & 0xffff;
         } else {
-                td->hwCBP = cpu_to_hc32 (ohci, data); 
-        }                       
+                td->hwCBP = cpu_to_hc32 (ohci, data);
+        }
         if (data)
                 td->hwBE = cpu_to_hc32 (ohci, data + len - 1);
         else
@@ -597,7 +595,7 @@ static void td_submit_urb (
          * use the device toggle bits for resetting, and rely on the fact
          * that resetting toggle is meaningless if the endpoint is active.
          */
-        if (!usb_gettoggle (urb->dev, usb_pipeendpoint (urb->pipe), is_out)) {
+        if (!usb_gettoggle (urb->dev, usb_pipeendpoint (urb->pipe), is_out)) {
                 usb_settoggle (urb->dev, usb_pipeendpoint (urb->pipe),
                         is_out, 1);
                 urb_priv->ed->hwHeadP &= ~cpu_to_hc32 (ohci, ED_C);
@@ -721,16 +719,16 @@ static void td_done (struct ohci_hcd *ohci, struct urb *urb, struct td *td)
         list_del (&td->td_list);
 
         /* ISO ... drivers see per-TD length/status */
-        if (tdINFO & TD_ISO) {
-                u16     tdPSW = ohci_hwPSW (ohci, td, 0);
+        if (tdINFO & TD_ISO) {
+                u16     tdPSW = ohci_hwPSW (ohci, td, 0);
                 int     dlen = 0;
 
                 /* NOTE:  assumes FC in tdINFO == 0, and that
                  * only the first of 0..MAXPSW psws is used.
                  */
 
-                cc = (tdPSW >> 12) & 0xF;
-                if (tdINFO & TD_CC)     /* hc didn't touch? */
+                cc = (tdPSW >> 12) & 0xF;
+                if (tdINFO & TD_CC)     /* hc didn't touch? */
                         return;
 
                 if (usb_pipeout (urb->pipe))
@@ -758,7 +756,7 @@ static void td_done (struct ohci_hcd *ohci, struct urb *urb, struct td *td)
                 int     type = usb_pipetype (urb->pipe);
                 u32     tdBE = hc32_to_cpup (ohci, &td->hwBE);
 
-                cc = TD_CC_GET (tdINFO);
+                cc = TD_CC_GET (tdINFO);
 
                 /* update packet status if needed (short is normally ok) */
                 if (cc == TD_DATAUNDERRUN
@@ -787,7 +785,7 @@ static void td_done (struct ohci_hcd *ohci, struct urb *urb, struct td *td)
                                 urb, td, 1 + td->index, cc,
                                 urb->actual_length,
                                 urb->transfer_buffer_length);
-        }
+        }
 }
 
 /*-------------------------------------------------------------------------*/
@@ -795,7 +793,7 @@ static void td_done (struct ohci_hcd *ohci, struct urb *urb, struct td *td)
 static inline struct td *
 ed_halted (struct ohci_hcd *ohci, struct td *td, int cc, struct td *rev)
 {
-        struct urb              *urb = td->urb;
+        struct urb              *urb = td->urb;
         struct ed               *ed = td->ed;
         struct list_head        *tmp = td->td_list.next;
         __hc32                  toggle = ed->hwHeadP & cpu_to_hc32 (ohci, ED_C);
@@ -805,7 +803,7 @@ ed_halted (struct ohci_hcd *ohci, struct td *td, int cc, struct td *rev)
          */
         ed->hwINFO |= cpu_to_hc32 (ohci, ED_SKIP);
         wmb ();
-        ed->hwHeadP &= ~cpu_to_hc32 (ohci, ED_H); 
+        ed->hwHeadP &= ~cpu_to_hc32 (ohci, ED_H);
 
         /* put any later tds from this urb onto the donelist, after 'td',
          * order won't matter here: no errors, and nothing was transferred.
@@ -833,7 +831,7 @@ ed_halted (struct ohci_hcd *ohci, struct td *td, int cc, struct td *rev)
                 info &= ~cpu_to_hc32 (ohci, TD_CC);
                 next->hwINFO = info;
 
-                next->next_dl_td = rev; 
+                next->next_dl_td = rev;
                 rev = next;
 
                 ed->hwHeadP = next->hwNextTD | toggle;
@@ -881,8 +879,8 @@ static struct td *dl_reverse_done_list (struct ohci_hcd *ohci)
         /* get TD from hc's singly linked list, and
          * prepend to ours.  ed->td_list changes later.
          */
-        while (td_dma) {                
-                int             cc;
+        while (td_dma) {
+                int             cc;
 
                 td = dma_to_td (ohci, td_dma);
                 if (!td) {
@@ -901,10 +899,10 @@ static struct td *dl_reverse_done_list (struct ohci_hcd *ohci)
                                 && (td->ed->hwHeadP & cpu_to_hc32 (ohci, ED_H)))
                         td_rev = ed_halted (ohci, td, cc, td_rev);
 
-                td->next_dl_td = td_rev;        
+                td->next_dl_td = td_rev;
                 td_rev = td;
                 td_dma = hc32_to_cpup (ohci, &td->hwNextTD);
-        }       
+        }
         return td_rev;
 }
 
@@ -1013,9 +1011,9 @@ rescan_this:
 
                 if (modified)
                         goto rescan_all;
-        }
+        }
 
-        /* maybe reenable control and bulk lists */ 
+        /* maybe reenable control and bulk lists */
         if (HC_IS_RUNNING(ohci_to_hcd(ohci)->state)
                         && ohci_to_hcd(ohci)->state != HC_STATE_QUIESCING
                         && !ohci->ed_rm_list) {
@@ -1041,20 +1039,20 @@ rescan_this:
                                         &ohci->regs->ed_bulkcurrent);
                         }
                 }
-                
+
                 /* CLE/BLE to enable, CLF/BLF to (maybe) kickstart */
                 if (control) {
                         ohci->hc_control |= control;
                         if (ohci->flags & OHCI_QUIRK_ZFMICRO)
                                 mdelay(1);
-                        ohci_writel (ohci, ohci->hc_control,
-                                        &ohci->regs->control);   
-                }
+                        ohci_writel (ohci, ohci->hc_control,
+                                        &ohci->regs->control);
+                }
                 if (command) {
                         if (ohci->flags & OHCI_QUIRK_ZFMICRO)
                                 mdelay(1);
-                        ohci_writel (ohci, command, &ohci->regs->cmdstatus);   
-                }
+                        ohci_writel (ohci, command, &ohci->regs->cmdstatus);
+                }
         }
 }
 
@@ -1074,19 +1072,19 @@ dl_done_list (struct ohci_hcd *ohci)
 {
         struct td       *td = dl_reverse_done_list (ohci);
 
-        while (td) {
+        while (td) {
                 struct td       *td_next = td->next_dl_td;
                 struct urb      *urb = td->urb;
                 urb_priv_t      *urb_priv = urb->hcpriv;
                 struct ed       *ed = td->ed;
 
                 /* update URB's length and status from TD */
-                td_done (ohci, urb, td);
-                urb_priv->td_cnt++;
+                td_done (ohci, urb, td);
+                urb_priv->td_cnt++;
 
                 /* If all this urb's TDs are done, call complete() */
-                if (urb_priv->td_cnt == urb_priv->length)
-                        finish_urb (ohci, urb);
+                if (urb_priv->td_cnt == urb_priv->length)
+                        finish_urb (ohci, urb);
 
                 /* clean schedule:  unlink EDs that are no longer busy */
                 if (list_empty (&ed->td_list)) {
@@ -1094,25 +1092,26 @@ dl_done_list (struct ohci_hcd *ohci)
                                 start_ed_unlink (ohci, ed);
 
                 /* ... reenabling halted EDs only after fault cleanup */
-                } else if ((ed->hwINFO & cpu_to_hc32 (ohci, ED_SKIP | ED_DEQUEUE))
+                } else if ((ed->hwINFO & cpu_to_hc32 (ohci,
+                                                ED_SKIP | ED_DEQUEUE))
                                         == cpu_to_hc32 (ohci, ED_SKIP)) {
                         td = list_entry (ed->td_list.next, struct td, td_list);
-                        if (!(td->hwINFO & cpu_to_hc32 (ohci, TD_DONE))) {
+                        if (!(td->hwINFO & cpu_to_hc32 (ohci, TD_DONE))) {
                                 ed->hwINFO &= ~cpu_to_hc32 (ohci, ED_SKIP);
                                 /* ... hc may need waking-up */
                                 switch (ed->type) {
                                 case PIPE_CONTROL:
                                         ohci_writel (ohci, OHCI_CLF,
-                                                &ohci->regs->cmdstatus);   
+                                                &ohci->regs->cmdstatus);
                                         break;
                                 case PIPE_BULK:
                                         ohci_writel (ohci, OHCI_BLF,
-                                                &ohci->regs->cmdstatus);   
+                                                &ohci->regs->cmdstatus);
                                         break;
                                 }
                         }
                 }
 
-                td = td_next;
-        }  
+                td = td_next;
+        }
 }
diff --git a/drivers/usb/host/ohci-s3c2410.c b/drivers/usb/host/ohci-s3c2410.c
index 59e436424d..b350d45033 100644
--- a/drivers/usb/host/ohci-s3c2410.c
+++ b/drivers/usb/host/ohci-s3c2410.c
@@ -447,7 +447,7 @@ static const struct hc_driver ohci_s3c2410_hc_driver = {
          */
         .start =                ohci_s3c2410_start,
         .stop =                 ohci_stop,
-        .shutdown =             ohci_shutdown,
+        .shutdown =             ohci_shutdown,
 
         /*
          * managing i/o requests and associated device resources
@@ -492,7 +492,7 @@ static int ohci_hcd_s3c2410_drv_remove(struct platform_device *pdev)
 static struct platform_driver ohci_hcd_s3c2410_driver = {
         .probe          = ohci_hcd_s3c2410_drv_probe,
         .remove         = ohci_hcd_s3c2410_drv_remove,
-        .shutdown       = usb_hcd_platform_shutdown,
+        .shutdown       = usb_hcd_platform_shutdown,
         /*.suspend      = ohci_hcd_s3c2410_drv_suspend, */
         /*.resume       = ohci_hcd_s3c2410_drv_resume, */
         .driver         = {
diff --git a/drivers/usb/host/ohci-sa1111.c b/drivers/usb/host/ohci-sa1111.c
index 71371de32a..fe0090e336 100644
--- a/drivers/usb/host/ohci-sa1111.c
+++ b/drivers/usb/host/ohci-sa1111.c
@@ -4,7 +4,7 @@
  * (C) Copyright 1999 Roman Weissgaerber <weissg@vienna.at>
  * (C) Copyright 2000-2002 David Brownell <dbrownell@users.sourceforge.net>
  * (C) Copyright 2002 Hewlett-Packard Company
- * 
+ *
  * SA1111 Bus Glue
  *
  * Written by Christopher Hoover <ch@hpl.hp.com>
@@ -12,7 +12,7 @@
  *
  * This file is licenced under the GPL.
  */
- 
+
 #include <asm/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/arch/assabet.h>
@@ -31,7 +31,7 @@ static void sa1111_start_hc(struct sa1111_dev *dev)
 {
         unsigned int usb_rst = 0;
 
-        printk(KERN_DEBUG __FILE__ 
+        printk(KERN_DEBUG __FILE__
                ": starting SA-1111 OHCI USB Controller\n");
 
 #ifdef CONFIG_SA1100_BADGE4
@@ -65,7 +65,7 @@ static void sa1111_start_hc(struct sa1111_dev *dev)
 static void sa1111_stop_hc(struct sa1111_dev *dev)
 {
         unsigned int usb_rst;
-        printk(KERN_DEBUG __FILE__ 
+        printk(KERN_DEBUG __FILE__
                ": stopping SA-1111 OHCI USB Controller\n");
 
         /*
diff --git a/drivers/usb/host/ohci.h b/drivers/usb/host/ohci.h
index a2f42a2f47..405257f3e8 100644
--- a/drivers/usb/host/ohci.h
+++ b/drivers/usb/host/ohci.h
@@ -1,9 +1,9 @@
 /*
  * OHCI HCD (Host Controller Driver) for USB.
- * 
+ *
  * (C) Copyright 1999 Roman Weissgaerber <weissg@vienna.at>
  * (C) Copyright 2000-2002 David Brownell <dbrownell@users.sourceforge.net>
- * 
+ *
  * This file is licenced under the GPL.
  */
 
@@ -14,7 +14,7 @@
  */
 typedef __u32 __bitwise __hc32;
 typedef __u16 __bitwise __hc16;
- 
+
 /*
  * OHCI Endpoint Descriptor (ED) ... holds TD queue
  * See OHCI spec, section 4.2
@@ -24,7 +24,7 @@ typedef __u16 __bitwise __hc16;
  */
 struct ed {
         /* first fields are hardware-specified */
-        __hc32                  hwINFO;         /* endpoint config bitmap */
+        __hc32                  hwINFO;      /* endpoint config bitmap */
         /* info bits defined by hcd */
 #define ED_DEQUEUE      (1 << 27)
         /* info bits defined by the hardware */
@@ -52,11 +52,11 @@ struct ed {
          * usually:  OPER --> UNLINK --> (IDLE | OPER) --> ...
          */
         u8                      state;          /* ED_{IDLE,UNLINK,OPER} */
-#define ED_IDLE         0x00            /* NOT linked to HC */
-#define ED_UNLINK       0x01            /* being unlinked from hc */
+#define ED_IDLE         0x00            /* NOT linked to HC */
+#define ED_UNLINK       0x01            /* being unlinked from hc */
 #define ED_OPER         0x02            /* IS linked to hc */
 
-        u8                      type;           /* PIPE_{BULK,...} */
+        u8                      type;           /* PIPE_{BULK,...} */
 
         /* periodic scheduling params (for intr and iso) */
         u8                      branch;
@@ -70,7 +70,7 @@ struct ed {
 
 #define ED_MASK ((u32)~0x0f)            /* strip hw status in low addr bits */
 
- 
+
 /*
  * OHCI Transfer Descriptor (TD) ... one per transfer segment
  * See OHCI spec, sections 4.3.1 (general = control/bulk/interrupt)
@@ -107,22 +107,22 @@ struct td {
 
         /* (no hwINFO #defines yet for iso tds) */
 
-        __hc32          hwCBP;          /* Current Buffer Pointer (or 0) */
-        __hc32          hwNextTD;       /* Next TD Pointer */
-        __hc32          hwBE;           /* Memory Buffer End Pointer */
+        __hc32          hwCBP;          /* Current Buffer Pointer (or 0) */
+        __hc32          hwNextTD;       /* Next TD Pointer */
+        __hc32          hwBE;           /* Memory Buffer End Pointer */
 
         /* PSW is only for ISO.  Only 1 PSW entry is used, but on
          * big-endian PPC hardware that's the second entry.
          */
 #define MAXPSW  2
-        __hc16          hwPSW [MAXPSW];
+        __hc16          hwPSW [MAXPSW];
 
         /* rest are purely for the driver's use */
-        __u8            index;
-        struct ed       *ed;
-        struct td       *td_hash;       /* dma-->td hashtable */
-        struct td       *next_dl_td;
-        struct urb      *urb;
+        __u8            index;
+        struct ed       *ed;
+        struct td       *td_hash;       /* dma-->td hashtable */
+        struct td       *next_dl_td;
+        struct urb      *urb;
 
         dma_addr_t      td_dma;         /* addr of this TD */
         dma_addr_t      data_dma;       /* addr of data it points to */
@@ -152,8 +152,8 @@ struct td {
 #define TD_NOTACCESSED     0x0F
 
 
-/* map OHCI TD status codes (CC) to errno values */ 
-static const int cc_to_error [16] = { 
+/* map OHCI TD status codes (CC) to errno values */
+static const int cc_to_error [16] = {
         /* No  Error  */               0,
         /* CRC Error  */               -EILSEQ,
         /* Bit Stuff  */               -EPROTO,
@@ -169,7 +169,7 @@ static const int cc_to_error [16] = {
         /* BufferOver */               -ECOMM,
         /* BuffUnder  */               -ENOSR,
         /* (for HCD)  */               -EALREADY,
-        /* (for HCD)  */               -EALREADY 
+        /* (for HCD)  */               -EALREADY
 };
 
 
@@ -182,7 +182,7 @@ struct ohci_hcca {
 #define NUM_INTS 32
         __hc32  int_table [NUM_INTS];   /* periodic schedule */
 
-        /* 
+        /*
          * OHCI defines u16 frame_no, followed by u16 zero pad.
          * Since some processors can't do 16 bit bus accesses,
          * portable access must be a 32 bits wide.
@@ -262,10 +262,10 @@ struct ohci_regs {
  * HcCommandStatus (cmdstatus) register masks
  */
 #define OHCI_HCR        (1 << 0)        /* host controller reset */
-#define OHCI_CLF        (1 << 1)        /* control list filled */
-#define OHCI_BLF        (1 << 2)        /* bulk list filled */
-#define OHCI_OCR        (1 << 3)        /* ownership change request */
-#define OHCI_SOC        (3 << 16)       /* scheduling overrun count */
+#define OHCI_CLF        (1 << 1)        /* control list filled */
+#define OHCI_BLF        (1 << 2)        /* bulk list filled */
+#define OHCI_OCR        (1 << 3)        /* ownership change request */
+#define OHCI_SOC        (3 << 16)       /* scheduling overrun count */
 
 /*
  * masks used with interrupt registers:
@@ -285,20 +285,20 @@ struct ohci_regs {
 
 
 /* OHCI ROOT HUB REGISTER MASKS */
- 
+
 /* roothub.portstatus [i] bits */
-#define RH_PS_CCS            0x00000001         /* current connect status */
-#define RH_PS_PES            0x00000002         /* port enable status*/
-#define RH_PS_PSS            0x00000004         /* port suspend status */
-#define RH_PS_POCI           0x00000008         /* port over current indicator */
-#define RH_PS_PRS            0x00000010         /* port reset status */
-#define RH_PS_PPS            0x00000100         /* port power status */
-#define RH_PS_LSDA           0x00000200         /* low speed device attached */
-#define RH_PS_CSC            0x00010000         /* connect status change */
-#define RH_PS_PESC           0x00020000         /* port enable status change */
-#define RH_PS_PSSC           0x00040000         /* port suspend status change */
-#define RH_PS_OCIC           0x00080000         /* over current indicator change */
-#define RH_PS_PRSC           0x00100000         /* port reset status change */
+#define RH_PS_CCS            0x00000001         /* current connect status */
+#define RH_PS_PES            0x00000002         /* port enable status*/
+#define RH_PS_PSS            0x00000004         /* port suspend status */
+#define RH_PS_POCI           0x00000008         /* port over current indicator */
+#define RH_PS_PRS            0x00000010         /* port reset status */
+#define RH_PS_PPS            0x00000100         /* port power status */
+#define RH_PS_LSDA           0x00000200         /* low speed device attached */
+#define RH_PS_CSC            0x00010000         /* connect status change */
+#define RH_PS_PESC           0x00020000         /* port enable status change */
+#define RH_PS_PSSC           0x00040000         /* port suspend status change */
+#define RH_PS_OCIC           0x00080000         /* over current indicator change */
+#define RH_PS_PRSC           0x00100000         /* port reset status change */
 
 /* roothub.status bits */
 #define RH_HS_LPS            0x00000001         /* local power status */
@@ -333,7 +333,7 @@ typedef struct urb_priv {
 } urb_priv_t;
 
 #define TD_HASH_SIZE    64    /* power'o'two */
-// sizeof (struct td) ~= 64 == 2^6 ... 
+// sizeof (struct td) ~= 64 == 2^6 ...
 #define TD_HASH_FUNC(td_dma) ((td_dma ^ (td_dma >> 6)) % TD_HASH_SIZE)
 
 
@@ -364,11 +364,11 @@ struct ohci_hcd {
 
         struct ed               *ed_bulktail;           /* last in bulk list */
         struct ed               *ed_controltail;        /* last in ctrl list */
-        struct ed               *periodic [NUM_INTS];   /* shadow int_table */
+        struct ed               *periodic [NUM_INTS];   /* shadow int_table */
 
         /*
          * OTG controllers and transceivers need software interaction;
-         * other external transceivers should be software-transparent 
+         * other external transceivers should be software-transparent
          */
         struct otg_transceiver  *transceiver;
 
@@ -385,7 +385,7 @@ struct ohci_hcd {
          */
         int                     num_ports;
         int                     load [NUM_INTS];
-        u32                     hc_control;     /* copy of hc control reg */
+        u32                     hc_control;     /* copy of hc control reg */
         unsigned long           next_statechange;       /* suspend/resume */
         u32                     fminterval;             /* saved register */
         unsigned                autostop:1;     /* rh auto stopping/stopped */
@@ -598,11 +598,11 @@ static inline void disable (struct ohci_hcd *ohci)
 }
 
 #define FI                      0x2edf          /* 12000 bits per frame (-1) */
-#define FSMP(fi)                (0x7fff & ((6 * ((fi) - 210)) / 7))
+#define FSMP(fi)                (0x7fff & ((6 * ((fi) - 210)) / 7))
 #define FIT                     (1 << 31)
 #define LSTHRESH                0x628           /* lowspeed bit threshold */
 
-static void periodic_reinit (struct ohci_hcd *ohci)
+static inline void periodic_reinit (struct ohci_hcd *ohci)
 {
         u32     fi = ohci->fminterval & 0x03fff;
         u32     fit = ohci_readl(ohci, &ohci->regs->fminterval) & FIT;
@@ -626,11 +626,11 @@ static void periodic_reinit (struct ohci_hcd *ohci)
                         temp = ohci_readl (hc, &hc->regs->roothub.register); \
         temp; })
 
-static u32 roothub_a (struct ohci_hcd *hc)
+static inline u32 roothub_a (struct ohci_hcd *hc)
         { return read_roothub (hc, a, 0xfc0fe000); }
 static inline u32 roothub_b (struct ohci_hcd *hc)
         { return ohci_readl (hc, &hc->regs->roothub.b); }
 static inline u32 roothub_status (struct ohci_hcd *hc)
         { return ohci_readl (hc, &hc->regs->roothub.status); }
-static u32 roothub_portstatus (struct ohci_hcd *hc, int i)
+static inline u32 roothub_portstatus (struct ohci_hcd *hc, int i)
         { return read_roothub (hc, portstatus [i], 0xffe0fce0); }
diff --git a/drivers/usb/host/u132-hcd.c b/drivers/usb/host/u132-hcd.c
index a9d7119e31..a7fa0d7556 100644
--- a/drivers/usb/host/u132-hcd.c
+++ b/drivers/usb/host/u132-hcd.c
@@ -40,6 +40,7 @@
 #include <linux/moduleparam.h>
 #include <linux/delay.h>
 #include <linux/ioport.h>
+#include <linux/pci_ids.h>
 #include <linux/sched.h>
 #include <linux/slab.h>
 #include <linux/smp_lock.h>
@@ -210,15 +211,16 @@ struct u132 {
 * these cannot be inlines because we need the structure offset!!
 * Does anyone have a better way?????
 */
+#define ftdi_read_pcimem(pdev, member, data) usb_ftdi_elan_read_pcimem(pdev, \
+        offsetof(struct ohci_regs, member), 0, data);
+#define ftdi_write_pcimem(pdev, member, data) usb_ftdi_elan_write_pcimem(pdev, \
+        offsetof(struct ohci_regs, member), 0, data);
 #define u132_read_pcimem(u132, member, data) \
         usb_ftdi_elan_read_pcimem(u132->platform_dev, offsetof(struct \
         ohci_regs, member), 0, data);
 #define u132_write_pcimem(u132, member, data) \
         usb_ftdi_elan_write_pcimem(u132->platform_dev, offsetof(struct \
         ohci_regs, member), 0, data);
-#define u132_write_pcimem_byte(u132, member, data) \
-        usb_ftdi_elan_write_pcimem(u132->platform_dev, offsetof(struct \
-        ohci_regs, member), 0x0e, data);
 static inline struct u132 *udev_to_u132(struct u132_udev *udev)
 {
         u8 udev_number = udev->udev_number;
@@ -1574,59 +1576,12 @@ static char *hcfs2string(int state)
         return "?";
 }
 
-static int u132_usb_reset(struct u132 *u132)
-{
-        int retval;
-        retval = u132_read_pcimem(u132, control, &u132->hc_control);
-        if (retval)
-                return retval;
-        u132->hc_control &= OHCI_CTRL_RWC;
-        retval = u132_write_pcimem(u132, control, u132->hc_control);
-        if (retval)
-                return retval;
-        return 0;
-}
-
 static int u132_init(struct u132 *u132)
 {
         int retval;
         u32 control;
         u132_disable(u132);
-        u132->next_statechange =
-                jiffies; /* SMM owns the HC? not for long! */  {
-                u32 control;
-                retval = u132_read_pcimem(u132, control, &control);
-                if (retval)
-                        return retval;
-                if (control & OHCI_CTRL_IR) {
-                        u32 temp = 50;
-                        retval = u132_write_pcimem(u132, intrenable,
-                                OHCI_INTR_OC);
-                        if (retval)
-                                return retval;
-                        retval = u132_write_pcimem_byte(u132, cmdstatus,
-                                OHCI_OCR);
-                        if (retval)
-                                return retval;
-                      check:{
-                                retval = u132_read_pcimem(u132, control,
-                                        &control);
-                                if (retval)
-                                        return retval;
-                        }
-                        if (control & OHCI_CTRL_IR) {
-                                msleep(10);
-                                if (--temp == 0) {
-                                        dev_err(&u132->platform_dev->dev, "USB "
-                                                "HC takeover failed!(BIOS/SMM b"
-                                                "ug) control=%08X\n", control);
-                                        return -EBUSY;
-                                }
-                                goto check;
-                        }
-                        u132_usb_reset(u132);
-                }
-        }
+        u132->next_statechange = jiffies;
         retval = u132_write_pcimem(u132, intrdisable, OHCI_INTR_MIE);
         if (retval)
                 return retval;
@@ -1725,7 +1680,7 @@ static int u132_run(struct u132 *u132)
       retry:retval = u132_read_pcimem(u132, cmdstatus, &status);
         if (retval)
                 return retval;
-        retval = u132_write_pcimem_byte(u132, cmdstatus, OHCI_HCR);
+        retval = u132_write_pcimem(u132, cmdstatus, OHCI_HCR);
         if (retval)
                 return retval;
       extra:{
@@ -1782,7 +1737,7 @@ static int u132_run(struct u132 *u132)
         retval = u132_write_pcimem(u132, control, u132->hc_control);
         if (retval)
                 return retval;
-        retval = u132_write_pcimem_byte(u132, cmdstatus, OHCI_BLF);
+        retval = u132_write_pcimem(u132, cmdstatus, OHCI_BLF);
         if (retval)
                 return retval;
         retval = u132_read_pcimem(u132, cmdstatus, &cmdstatus);
@@ -1839,8 +1794,8 @@ static void u132_hcd_stop(struct usb_hcd *hcd)
 {
         struct u132 *u132 = hcd_to_u132(hcd);
         if (u132->going > 1) {
-                dev_err(&u132->platform_dev->dev, "device has been removed %d\n"
-                        , u132->going);
+                dev_err(&u132->platform_dev->dev, "u132 device %p(hcd=%p) has b"
+                        "een removed %d\n", u132, hcd, u132->going);
         } else if (u132->going > 0) {
                 dev_err(&u132->platform_dev->dev, "device hcd=%p is being remov"
                         "ed\n", hcd);
@@ -2545,8 +2500,9 @@ static void u132_endpoint_disable(struct usb_hcd *hcd,
 {
         struct u132 *u132 = hcd_to_u132(hcd);
         if (u132->going > 2) {
-                dev_err(&u132->platform_dev->dev, "device has been removed %d\n"
-                        , u132->going);
+                dev_err(&u132->platform_dev->dev, "u132 device %p(hcd=%p hep=%p"
+                        ") has been removed %d\n", u132, hcd, hep,
+                        u132->going);
         } else {
                 struct u132_endp *endp = hep->hcpriv;
                 if (endp)
@@ -2790,7 +2746,6 @@ static int u132_hub_status_data(struct usb_hcd *hcd, char *buf)
         } else if (u132->going > 0) {
                 dev_err(&u132->platform_dev->dev, "device hcd=%p is being remov"
                         "ed\n", hcd);
-                dump_stack();
                 return -ESHUTDOWN;
         } else {
                 int i, changed = 0, length = 1;
@@ -3034,12 +2989,15 @@ static int __devexit u132_remove(struct platform_device *pdev)
         struct usb_hcd *hcd = platform_get_drvdata(pdev);
         if (hcd) {
                 struct u132 *u132 = hcd_to_u132(hcd);
-                dump_stack();
                 if (u132->going++ > 1) {
+                        dev_err(&u132->platform_dev->dev, "already being remove"
+                                "d\n");
                         return -ENODEV;
                 } else {
                         int rings = MAX_U132_RINGS;
                         int endps = MAX_U132_ENDPS;
+                        dev_err(&u132->platform_dev->dev, "removing device u132"
+                                ".%d\n", u132->sequence_num);
                         msleep(100);
                         down(&u132->sw_lock);
                         u132_monitor_cancel_work(u132);
@@ -3121,10 +3079,24 @@ static void u132_initialise(struct u132 *u132, struct platform_device *pdev)
 static int __devinit u132_probe(struct platform_device *pdev)
 {
         struct usb_hcd *hcd;
+        int retval;
+        u32 control;
+        u32 rh_a = -1;
+        u32 num_ports;
         msleep(100);
         if (u132_exiting > 0) {
                 return -ENODEV;
-        }                        /* refuse to confuse usbcore */
+        }
+        retval = ftdi_write_pcimem(pdev, intrdisable, OHCI_INTR_MIE);
+        if (retval)
+                return retval;
+        retval = ftdi_read_pcimem(pdev, control, &control);
+        if (retval)
+                return retval;
+        retval = ftdi_read_pcimem(pdev, roothub.a, &rh_a);
+        if (retval)
+                return retval;
+        num_ports = rh_a & RH_A_NDP;        /* refuse to confuse usbcore */
         if (pdev->dev.dma_mask) {
                 return -EINVAL;
         }
diff --git a/drivers/usb/host/uhci-hcd.c b/drivers/usb/host/uhci-hcd.c
index e87692c31b..acd101caee 100644
--- a/drivers/usb/host/uhci-hcd.c
+++ b/drivers/usb/host/uhci-hcd.c
@@ -60,6 +60,11 @@ Randy Dunlap, Georg Acher, Deti Fliegl, Thomas Sailer, Roman Weissgaerber, \
 Alan Stern"
 #define DRIVER_DESC "USB Universal Host Controller Interface driver"
 
+/* for flakey hardware, ignore overcurrent indicators */
+static int ignore_oc;
+module_param(ignore_oc, bool, S_IRUGO);
+MODULE_PARM_DESC(ignore_oc, "ignore hardware overcurrent indications");
+
 /*
  * debug = 0, no debugging messages
  * debug = 1, dump failed URBs except for stalls
@@ -169,6 +174,11 @@ static int resume_detect_interrupts_are_broken(struct uhci_hcd *uhci)
 {
         int port;
 
+        /* If we have to ignore overcurrent events then almost by definition
+         * we can't depend on resume-detect interrupts. */
+        if (ignore_oc)
+                return 1;
+
         switch (to_pci_dev(uhci_dev(uhci))->vendor) {
             default:
                 break;
@@ -921,7 +931,8 @@ static int __init uhci_hcd_init(void)
 {
         int retval = -ENOMEM;
 
-        printk(KERN_INFO DRIVER_DESC " " DRIVER_VERSION "\n");
+        printk(KERN_INFO DRIVER_DESC " " DRIVER_VERSION "%s\n",
+                        ignore_oc ? ", overcurrent ignored" : "");
 
         if (usb_disabled())
                 return -ENODEV;
diff --git a/drivers/usb/host/uhci-hub.c b/drivers/usb/host/uhci-hub.c
index f8347f1a10..bacc25c53b 100644
--- a/drivers/usb/host/uhci-hub.c
+++ b/drivers/usb/host/uhci-hub.c
@@ -52,10 +52,20 @@ static int any_ports_active(struct uhci_hcd *uhci)
 static inline int get_hub_status_data(struct uhci_hcd *uhci, char *buf)
 {
         int port;
+        int mask = RWC_BITS;
+
+        /* Some boards (both VIA and Intel apparently) report bogus
+         * overcurrent indications, causing massive log spam unless
+         * we completely ignore them.  This doesn't seem to be a problem
+         * with the chipset so much as with the way it is connected on
+         * the motherboard; if the overcurrent input is left to float
+         * then it may constantly register false positives. */
+        if (ignore_oc)
+                mask &= ~USBPORTSC_OCC;
 
         *buf = 0;
         for (port = 0; port < uhci->rh_numports; ++port) {
-                if ((inw(uhci->io_addr + USBPORTSC1 + port * 2) & RWC_BITS) ||
+                if ((inw(uhci->io_addr + USBPORTSC1 + port * 2) & mask) ||
                                 test_bit(port, &uhci->port_c_suspend))
                         *buf |= (1 << (port + 1));
         }
@@ -263,7 +273,7 @@ static int uhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
                         wPortChange |= USB_PORT_STAT_C_CONNECTION;
                 if (status & USBPORTSC_PEC)
                         wPortChange |= USB_PORT_STAT_C_ENABLE;
-                if (status & USBPORTSC_OCC)
+                if ((status & USBPORTSC_OCC) && !ignore_oc)
                         wPortChange |= USB_PORT_STAT_C_OVERCURRENT;
 
                 if (test_bit(port, &uhci->port_c_suspend)) {
diff --git a/drivers/usb/input/Kconfig b/drivers/usb/input/Kconfig
index 8a62d47857..e308f6dc2b 100644
--- a/drivers/usb/input/Kconfig
+++ b/drivers/usb/input/Kconfig
@@ -7,7 +7,8 @@ comment "USB Input Devices"
 config USB_HID
         tristate "USB Human Interface Device (full HID) support"
         default y
-        depends on USB && HID
+        depends on USB
+        select HID
         ---help---
           Say Y here if you want full HID support to connect USB keyboards,
           mice, joysticks, graphic tablets, or any other HID based devices
diff --git a/drivers/usb/input/wacom_sys.c b/drivers/usb/input/wacom_sys.c
index e7cc20ab81..12b42746de 100644
--- a/drivers/usb/input/wacom_sys.c
+++ b/drivers/usb/input/wacom_sys.c
@@ -159,13 +159,13 @@ void input_dev_i3s(struct input_dev *input_dev, struct wacom_wac *wacom_wac)
 {
         input_dev->keybit[LONG(BTN_DIGI)] |= BIT(BTN_TOOL_FINGER);
         input_dev->keybit[LONG(BTN_LEFT)] |= BIT(BTN_0) | BIT(BTN_1) | BIT(BTN_2) | BIT(BTN_3);
-        input_set_abs_params(input_dev, ABS_RX, 0, 4097, 0, 0);
+        input_set_abs_params(input_dev, ABS_RX, 0, 4096, 0, 0);
 }
 
 void input_dev_i3(struct input_dev *input_dev, struct wacom_wac *wacom_wac)
 {
         input_dev->keybit[LONG(BTN_LEFT)] |= BIT(BTN_4) | BIT(BTN_5) | BIT(BTN_6) | BIT(BTN_7);
-        input_set_abs_params(input_dev, ABS_RY, 0, 4097, 0, 0);
+        input_set_abs_params(input_dev, ABS_RY, 0, 4096, 0, 0);
 }
 
 void input_dev_i(struct input_dev *input_dev, struct wacom_wac *wacom_wac)
diff --git a/drivers/usb/input/wacom_wac.c b/drivers/usb/input/wacom_wac.c
index 92726fe893..4142e36730 100644
--- a/drivers/usb/input/wacom_wac.c
+++ b/drivers/usb/input/wacom_wac.c
@@ -209,13 +209,15 @@ static int wacom_graphire_irq(struct wacom_wac *wacom, void *wcombo)
                         wacom_report_key(wcombo, BTN_STYLUS, data[1] & 0x02);
                         wacom_report_key(wcombo, BTN_STYLUS2, data[1] & 0x04);
                 }
-        }
-
-        if (data[1] & 0x10)
                 wacom_report_abs(wcombo, ABS_MISC, id); /* report tool id */
+        }
         else
                 wacom_report_abs(wcombo, ABS_MISC, 0); /* reset tool id */
-        wacom_report_key(wcombo, wacom->tool[0], data[1] & 0x10);
+
+        if (data[1] & 0x10)  /* only report prox-in when in area */
+                wacom_report_key(wcombo, wacom->tool[0], 1);
+        if (!(data[1] & 0x90))  /* report prox-out when physically out */
+                wacom_report_key(wcombo, wacom->tool[0], 0);
         wacom_input_sync(wcombo);
 
         /* send pad data */
@@ -405,7 +407,7 @@ static int wacom_intuos_irq(struct wacom_wac *wacom, void *wcombo)
         if ((wacom->features->type == CINTIQ) && !(data[1] & 0x40))
                  return 0;
 
-        if (wacom->features->type >= INTUOS3) {
+        if (wacom->features->type >= INTUOS3S) {
                 wacom_report_abs(wcombo, ABS_X, (data[2] << 9) | (data[3] << 1) | ((data[9] >> 1) & 1));
                 wacom_report_abs(wcombo, ABS_Y, (data[4] << 9) | (data[5] << 1) | (data[9] & 1));
                 wacom_report_abs(wcombo, ABS_DISTANCE, ((data[9] >> 2) & 0x3f));
@@ -423,7 +425,7 @@ static int wacom_intuos_irq(struct wacom_wac *wacom, void *wcombo)
 
                 if (data[1] & 0x02) {
                         /* Rotation packet */
-                        if (wacom->features->type >= INTUOS3) {
+                        if (wacom->features->type >= INTUOS3S) {
                                 /* I3 marker pen rotation reported as wheel
                                  * due to valuator limitation
                                  */
@@ -547,11 +549,11 @@ static struct wacom_features wacom_features[] = {
         { "Wacom Graphire3 6x8", 8,  16704, 12064,  511, 63, GRAPHIRE },
         { "Wacom Graphire4 4x5", 8,  10208,  7424,  511, 63, WACOM_G4 },
         { "Wacom Graphire4 6x8", 8,  16704, 12064,  511, 63, WACOM_G4 },
-        { "Wacom Volito",        8,   5104,  3712,  511,  0, GRAPHIRE },
-        { "Wacom PenStation2",   8,   3250,  2320,  255,  0, GRAPHIRE },
-        { "Wacom Volito2 4x5",   8,   5104,  3712,  511,  0, GRAPHIRE },
-        { "Wacom Volito2 2x3",   8,   3248,  2320,  511,  0, GRAPHIRE },
-        { "Wacom PenPartner2",   8,   3250,  2320,  255,  0, GRAPHIRE },
+        { "Wacom Volito",        8,   5104,  3712,  511, 63, GRAPHIRE },
+        { "Wacom PenStation2",   8,   3250,  2320,  255, 63, GRAPHIRE },
+        { "Wacom Volito2 4x5",   8,   5104,  3712,  511, 63, GRAPHIRE },
+        { "Wacom Volito2 2x3",   8,   3248,  2320,  511, 63, GRAPHIRE },
+        { "Wacom PenPartner2",   8,   3250,  2320,  255, 63, GRAPHIRE },
         { "Wacom Intuos 4x5",   10,  12700, 10600, 1023, 63, INTUOS },
         { "Wacom Intuos 6x8",   10,  20320, 16240, 1023, 63, INTUOS },
         { "Wacom Intuos 9x12",  10,  30480, 24060, 1023, 63, INTUOS },
@@ -580,7 +582,7 @@ static struct wacom_features wacom_features[] = {
         { "Wacom Intuos3 12x12", 10, 60960, 60960, 1023, 63, INTUOS3L },
         { "Wacom Intuos3 12x19", 10, 97536, 60960, 1023, 63, INTUOS3L },
         { "Wacom Intuos3 6x11",  10, 54204, 31750, 1023, 63, INTUOS3 },
-        { "Wacom Intuos3 4x6",   10, 31496, 19685, 1023, 15, INTUOS3S },
+        { "Wacom Intuos3 4x6",   10, 31496, 19685, 1023, 63, INTUOS3S },
         { "Wacom Cintiq 21UX",   10, 87200, 65600, 1023, 63, CINTIQ },
         { "Wacom Intuos2 6x8",   10, 20320, 16240, 1023, 63, INTUOS },
         { }
diff --git a/drivers/usb/misc/appledisplay.c b/drivers/usb/misc/appledisplay.c
index 02cbb7fff2..a7932a72d2 100644
--- a/drivers/usb/misc/appledisplay.c
+++ b/drivers/usb/misc/appledisplay.c
@@ -281,7 +281,7 @@ static int appledisplay_probe(struct usb_interface *iface,
         /* Register backlight device */
         snprintf(bl_name, sizeof(bl_name), "appledisplay%d",
                 atomic_inc_return(&count_displays) - 1);
-        pdata->bd = backlight_device_register(bl_name, pdata,
+        pdata->bd = backlight_device_register(bl_name, NULL, NULL,
                                                 &appledisplay_bl_data);
         if (IS_ERR(pdata->bd)) {
                 err("appledisplay: Backlight registration failed");
diff --git a/drivers/usb/misc/auerswald.c b/drivers/usb/misc/auerswald.c
index 6c7f3efb1d..b5332e679c 100644
--- a/drivers/usb/misc/auerswald.c
+++ b/drivers/usb/misc/auerswald.c
@@ -1376,7 +1376,7 @@ static int auerchar_open (struct inode *inode, struct file *file)
         }
 
         /* we have access to the device. Now lets allocate memory */
-        ccp = (pauerchar_t) kmalloc(sizeof(auerchar_t), GFP_KERNEL);
+        ccp = kzalloc(sizeof(auerchar_t), GFP_KERNEL);
         if (ccp == NULL) {
                 err ("out of memory");
                 ret = -ENOMEM;
@@ -1384,7 +1384,6 @@ static int auerchar_open (struct inode *inode, struct file *file)
         }
 
         /* Initialize device descriptor */
-        memset( ccp, 0, sizeof(auerchar_t));
         init_MUTEX( &ccp->mutex);
         init_MUTEX( &ccp->readmutex);
         auerbuf_init (&ccp->bufctl);
@@ -1912,14 +1911,13 @@ static int auerswald_probe (struct usb_interface *intf,
                 return -ENODEV;
 
         /* allocate memory for our device and initialize it */
-        cp = kmalloc (sizeof(auerswald_t), GFP_KERNEL);
+        cp = kzalloc (sizeof(auerswald_t), GFP_KERNEL);
         if (cp == NULL) {
                 err ("out of memory");
                 goto pfail;
         }
 
         /* Initialize device descriptor */
-        memset (cp, 0, sizeof(auerswald_t));
         init_MUTEX (&cp->mutex);
         cp->usbdev = usbdev;
         auerchain_init (&cp->controlchain);
diff --git a/drivers/usb/misc/ftdi-elan.c b/drivers/usb/misc/ftdi-elan.c
index 18b1925032..41c0161abd 100644
--- a/drivers/usb/misc/ftdi-elan.c
+++ b/drivers/usb/misc/ftdi-elan.c
@@ -40,6 +40,7 @@
 #include <linux/init.h>
 #include <linux/list.h>
 #include <linux/ioctl.h>
+#include <linux/pci_ids.h>
 #include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/kref.h>
@@ -51,6 +52,10 @@ MODULE_AUTHOR("Tony Olech");
 MODULE_DESCRIPTION("FTDI ELAN driver");
 MODULE_LICENSE("GPL");
 #define INT_MODULE_PARM(n, v) static int n = v;module_param(n, int, 0444)
+static int distrust_firmware = 1;
+module_param(distrust_firmware, bool, 0);
+MODULE_PARM_DESC(distrust_firmware, "true to distrust firmware power/overcurren"
+        "t setup");
 extern struct platform_driver u132_platform_driver;
 static struct workqueue_struct *status_queue;
 static struct workqueue_struct *command_queue;
@@ -66,7 +71,9 @@ static struct list_head ftdi_static_list;
 * end of the global variables protected by ftdi_module_lock
 */
 #include "usb_u132.h"
-#define TD_DEVNOTRESP 5
+#include <asm/io.h>
+#include "../core/hcd.h"
+#include "../host/ohci.h"
 /* Define these values to match your devices*/
 #define USB_FTDI_ELAN_VENDOR_ID 0x0403
 #define USB_FTDI_ELAN_PRODUCT_ID 0xd6ea
@@ -551,7 +558,7 @@ static void ftdi_elan_status_work(struct work_struct *work)
                 } else {
                         dev_err(&ftdi->udev->dev, "initialized failed - trying "
                                 "again in 10 seconds\n");
-                        work_delay_in_msec = 10 *1000;
+                        work_delay_in_msec = 1 *1000;
                 }
         } else if (ftdi->registered == 0) {
                 work_delay_in_msec = 10;
@@ -2288,82 +2295,288 @@ static int ftdi_elan_checkingPCI(struct usb_ftdi *ftdi)
         }
 }
 
-static int ftdi_elan_enumeratePCI(struct usb_ftdi *ftdi)
+
+#define ftdi_read_pcimem(ftdi, member, data) ftdi_elan_read_pcimem(ftdi, \
+        offsetof(struct ohci_regs, member), 0, data);
+#define ftdi_write_pcimem(ftdi, member, data) ftdi_elan_write_pcimem(ftdi, \
+        offsetof(struct ohci_regs, member), 0, data);
+#define OHCI_QUIRK_AMD756 0x01
+#define OHCI_QUIRK_SUPERIO 0x02
+#define OHCI_QUIRK_INITRESET 0x04
+#define OHCI_BIG_ENDIAN 0x08
+#define OHCI_QUIRK_ZFMICRO 0x10
+#define OHCI_CONTROL_INIT OHCI_CTRL_CBSR
+#define OHCI_INTR_INIT (OHCI_INTR_MIE | OHCI_INTR_UE | OHCI_INTR_RD | \
+        OHCI_INTR_WDH)
+static int ftdi_elan_check_controller(struct usb_ftdi *ftdi, int quirk)
+{
+        int devices = 0;
+        int retval;
+        u32 hc_control;
+        int num_ports;
+        u32 control;
+        u32 rh_a = -1;
+        u32 status;
+        u32 fminterval;
+        u32 hc_fminterval;
+        u32 periodicstart;
+        u32 cmdstatus;
+        u32 roothub_a;
+        int mask = OHCI_INTR_INIT;
+        int sleep_time = 0;
+        int reset_timeout = 30;        /* ... allow extra time */
+        int temp;
+        retval = ftdi_write_pcimem(ftdi, intrdisable, OHCI_INTR_MIE);
+        if (retval)
+                return retval;
+        retval = ftdi_read_pcimem(ftdi, control, &control);
+        if (retval)
+                return retval;
+        retval = ftdi_read_pcimem(ftdi, roothub.a, &rh_a);
+        if (retval)
+                return retval;
+        num_ports = rh_a & RH_A_NDP;
+        retval = ftdi_read_pcimem(ftdi, fminterval, &hc_fminterval);
+        if (retval)
+                return retval;
+        hc_fminterval &= 0x3fff;
+        if (hc_fminterval != FI) {
+        }
+        hc_fminterval |= FSMP(hc_fminterval) << 16;
+        retval = ftdi_read_pcimem(ftdi, control, &hc_control);
+        if (retval)
+                return retval;
+        switch (hc_control & OHCI_CTRL_HCFS) {
+        case OHCI_USB_OPER:
+                sleep_time = 0;
+                break;
+        case OHCI_USB_SUSPEND:
+        case OHCI_USB_RESUME:
+                hc_control &= OHCI_CTRL_RWC;
+                hc_control |= OHCI_USB_RESUME;
+                sleep_time = 10;
+                break;
+        default:
+                hc_control &= OHCI_CTRL_RWC;
+                hc_control |= OHCI_USB_RESET;
+                sleep_time = 50;
+                break;
+        }
+        retval = ftdi_write_pcimem(ftdi, control, hc_control);
+        if (retval)
+                return retval;
+        retval = ftdi_read_pcimem(ftdi, control, &control);
+        if (retval)
+                return retval;
+        msleep(sleep_time);
+        retval = ftdi_read_pcimem(ftdi, roothub.a, &roothub_a);
+        if (retval)
+                return retval;
+        if (!(roothub_a & RH_A_NPS)) {        /* power down each port */
+                for (temp = 0; temp < num_ports; temp++) {
+                        retval = ftdi_write_pcimem(ftdi,
+                                roothub.portstatus[temp], RH_PS_LSDA);
+                        if (retval)
+                                return retval;
+                }
+        }
+        retval = ftdi_read_pcimem(ftdi, control, &control);
+        if (retval)
+                return retval;
+      retry:retval = ftdi_read_pcimem(ftdi, cmdstatus, &status);
+        if (retval)
+                return retval;
+        retval = ftdi_write_pcimem(ftdi, cmdstatus, OHCI_HCR);
+        if (retval)
+                return retval;
+      extra:{
+                retval = ftdi_read_pcimem(ftdi, cmdstatus, &status);
+                if (retval)
+                        return retval;
+                if (0 != (status & OHCI_HCR)) {
+                        if (--reset_timeout == 0) {
+                                dev_err(&ftdi->udev->dev, "USB HC reset timed o"
+                                        "ut!\n");
+                                return -ENODEV;
+                        } else {
+                                msleep(5);
+                                goto extra;
+                        }
+                }
+        }
+        if (quirk & OHCI_QUIRK_INITRESET) {
+                retval = ftdi_write_pcimem(ftdi, control, hc_control);
+                if (retval)
+                        return retval;
+                retval = ftdi_read_pcimem(ftdi, control, &control);
+                if (retval)
+                        return retval;
+        }
+        retval = ftdi_write_pcimem(ftdi, ed_controlhead, 0x00000000);
+        if (retval)
+                return retval;
+        retval = ftdi_write_pcimem(ftdi, ed_bulkhead, 0x11000000);
+        if (retval)
+                return retval;
+        retval = ftdi_write_pcimem(ftdi, hcca, 0x00000000);
+        if (retval)
+                return retval;
+        retval = ftdi_read_pcimem(ftdi, fminterval, &fminterval);
+        if (retval)
+                return retval;
+        retval = ftdi_write_pcimem(ftdi, fminterval,
+                ((fminterval & FIT) ^ FIT) | hc_fminterval);
+        if (retval)
+                return retval;
+        retval = ftdi_write_pcimem(ftdi, periodicstart,
+                ((9 *hc_fminterval) / 10) & 0x3fff);
+        if (retval)
+                return retval;
+        retval = ftdi_read_pcimem(ftdi, fminterval, &fminterval);
+        if (retval)
+                return retval;
+        retval = ftdi_read_pcimem(ftdi, periodicstart, &periodicstart);
+        if (retval)
+                return retval;
+        if (0 == (fminterval & 0x3fff0000) || 0 == periodicstart) {
+                if (!(quirk & OHCI_QUIRK_INITRESET)) {
+                        quirk |= OHCI_QUIRK_INITRESET;
+                        goto retry;
+                } else
+                        dev_err(&ftdi->udev->dev, "init err(%08x %04x)\n",
+                                fminterval, periodicstart);
+        }                        /* start controller operations */
+        hc_control &= OHCI_CTRL_RWC;
+        hc_control |= OHCI_CONTROL_INIT | OHCI_CTRL_BLE | OHCI_USB_OPER;
+        retval = ftdi_write_pcimem(ftdi, control, hc_control);
+        if (retval)
+                return retval;
+        retval = ftdi_write_pcimem(ftdi, cmdstatus, OHCI_BLF);
+        if (retval)
+                return retval;
+        retval = ftdi_read_pcimem(ftdi, cmdstatus, &cmdstatus);
+        if (retval)
+                return retval;
+        retval = ftdi_read_pcimem(ftdi, control, &control);
+        if (retval)
+                return retval;
+        retval = ftdi_write_pcimem(ftdi, roothub.status, RH_HS_DRWE);
+        if (retval)
+                return retval;
+        retval = ftdi_write_pcimem(ftdi, intrstatus, mask);
+        if (retval)
+                return retval;
+        retval = ftdi_write_pcimem(ftdi, intrdisable,
+                OHCI_INTR_MIE | OHCI_INTR_OC | OHCI_INTR_RHSC | OHCI_INTR_FNO |
+                OHCI_INTR_UE | OHCI_INTR_RD | OHCI_INTR_SF | OHCI_INTR_WDH |
+                OHCI_INTR_SO);
+        if (retval)
+                return retval;        /* handle root hub init quirks ... */
+        retval = ftdi_read_pcimem(ftdi, roothub.a, &roothub_a);
+        if (retval)
+                return retval;
+        roothub_a &= ~(RH_A_PSM | RH_A_OCPM);
+        if (quirk & OHCI_QUIRK_SUPERIO) {
+                roothub_a |= RH_A_NOCP;
+                roothub_a &= ~(RH_A_POTPGT | RH_A_NPS);
+                retval = ftdi_write_pcimem(ftdi, roothub.a, roothub_a);
+                if (retval)
+                        return retval;
+        } else if ((quirk & OHCI_QUIRK_AMD756) || distrust_firmware) {
+                roothub_a |= RH_A_NPS;
+                retval = ftdi_write_pcimem(ftdi, roothub.a, roothub_a);
+                if (retval)
+                        return retval;
+        }
+        retval = ftdi_write_pcimem(ftdi, roothub.status, RH_HS_LPSC);
+        if (retval)
+                return retval;
+        retval = ftdi_write_pcimem(ftdi, roothub.b,
+                (roothub_a & RH_A_NPS) ? 0 : RH_B_PPCM);
+        if (retval)
+                return retval;
+        retval = ftdi_read_pcimem(ftdi, control, &control);
+        if (retval)
+                return retval;
+        mdelay((roothub_a >> 23) & 0x1fe);
+        for (temp = 0; temp < num_ports; temp++) {
+                u32 portstatus;
+                retval = ftdi_read_pcimem(ftdi, roothub.portstatus[temp],
+                        &portstatus);
+                if (retval)
+                        return retval;
+                if (1 & portstatus)
+                        devices += 1;
+        }
+        return devices;
+}
+
+static int ftdi_elan_setup_controller(struct usb_ftdi *ftdi, int fn)
 {
         u32 latence_timer;
-        u32 controlreg;
         int UxxxStatus;
         u32 pcidata;
         int reg = 0;
-        int foundOHCI = 0;
-        u8 fn;
-        int activePCIfn = 0;
-        u32 pciVID = 0;
-        u32 pciPID = 0;
-        UxxxStatus = ftdi_elan_read_reg(ftdi, &controlreg);
-        if (UxxxStatus)
-                return UxxxStatus;
-        UxxxStatus = ftdi_elan_write_reg(ftdi, 0x00000000L);
-        if (UxxxStatus)
-                return UxxxStatus;
-        msleep(750);
-        UxxxStatus = ftdi_elan_write_reg(ftdi, 0x00000200L | 0x100);
+        int activePCIfn = fn << 8;
+        UxxxStatus = ftdi_elan_write_reg(ftdi, 0x0000025FL | 0x2800);
         if (UxxxStatus)
                 return UxxxStatus;
-        UxxxStatus = ftdi_elan_write_reg(ftdi, 0x00000200L | 0x500);
+        reg = 16;
+        UxxxStatus = ftdi_elan_write_config(ftdi, activePCIfn | reg, 0,
+                0xFFFFFFFF);
         if (UxxxStatus)
                 return UxxxStatus;
-        UxxxStatus = ftdi_elan_read_reg(ftdi, &controlreg);
+        UxxxStatus = ftdi_elan_read_config(ftdi, activePCIfn | reg, 0,
+                &pcidata);
         if (UxxxStatus)
                 return UxxxStatus;
-        UxxxStatus = ftdi_elan_write_reg(ftdi, 0x0000020CL | 0x000);
+        UxxxStatus = ftdi_elan_write_config(ftdi, activePCIfn | reg, 0,
+                0xF0000000);
         if (UxxxStatus)
                 return UxxxStatus;
-        UxxxStatus = ftdi_elan_write_reg(ftdi, 0x0000020DL | 0x000);
+        UxxxStatus = ftdi_elan_read_config(ftdi, activePCIfn | reg, 0,
+                &pcidata);
         if (UxxxStatus)
                 return UxxxStatus;
-        msleep(250);
-        UxxxStatus = ftdi_elan_write_reg(ftdi, 0x0000020FL | 0x000);
+        reg = 12;
+        UxxxStatus = ftdi_elan_read_config(ftdi, activePCIfn | reg, 0,
+                &latence_timer);
         if (UxxxStatus)
                 return UxxxStatus;
-        UxxxStatus = ftdi_elan_read_reg(ftdi, &controlreg);
+        latence_timer &= 0xFFFF00FF;
+        latence_timer |= 0x00001600;
+        UxxxStatus = ftdi_elan_write_config(ftdi, activePCIfn | reg, 0x00,
+                latence_timer);
         if (UxxxStatus)
                 return UxxxStatus;
-        UxxxStatus = ftdi_elan_write_reg(ftdi, 0x0000025FL | 0x800);
+        UxxxStatus = ftdi_elan_read_config(ftdi, activePCIfn | reg, 0,
+                &pcidata);
         if (UxxxStatus)
                 return UxxxStatus;
-        UxxxStatus = ftdi_elan_read_reg(ftdi, &controlreg);
+        reg = 4;
+        UxxxStatus = ftdi_elan_write_config(ftdi, activePCIfn | reg, 0x00,
+                0x06);
         if (UxxxStatus)
                 return UxxxStatus;
-        UxxxStatus = ftdi_elan_read_reg(ftdi, &controlreg);
+        UxxxStatus = ftdi_elan_read_config(ftdi, activePCIfn | reg, 0,
+                &pcidata);
         if (UxxxStatus)
                 return UxxxStatus;
-        msleep(1000);
-        for (fn = 0; (fn < 4) && (!foundOHCI); fn++) {
-                activePCIfn = fn << 8;
-                ftdi->function = fn + 1;
-                UxxxStatus = ftdi_elan_read_config(ftdi, activePCIfn | reg, 0,
-                        &pcidata);
+        for (reg = 0; reg <= 0x54; reg += 4) {
+                UxxxStatus = ftdi_elan_read_pcimem(ftdi, reg, 0, &pcidata);
                 if (UxxxStatus)
                         return UxxxStatus;
-                pciVID = pcidata & 0xFFFF;
-                pciPID = (pcidata >> 16) & 0xFFFF;
-                if ((pciVID == 0x1045) && (pciPID == 0xc861)) {
-                        foundOHCI = 1;
-                } else if ((pciVID == 0x1033) && (pciPID == 0x0035)) {
-                        foundOHCI = 1;
-                } else if ((pciVID == 0x10b9) && (pciPID == 0x5237)) {
-                        foundOHCI = 1;
-                } else if ((pciVID == 0x11c1) && (pciPID == 0x5802)) {
-                        foundOHCI = 1;
-                } else if ((pciVID == 0x11AB) && (pciPID == 0x1FA6)) {
-                }
-        }
-        if (foundOHCI == 0) {
-                return -ENXIO;
         }
-        ftdi->platform_data.vendor = pciVID;
-        ftdi->platform_data.device = pciPID;
+        return 0;
+}
+
+static int ftdi_elan_close_controller(struct usb_ftdi *ftdi, int fn)
+{
+        u32 latence_timer;
+        int UxxxStatus;
+        u32 pcidata;
+        int reg = 0;
+        int activePCIfn = fn << 8;
         UxxxStatus = ftdi_elan_write_reg(ftdi, 0x0000025FL | 0x2800);
         if (UxxxStatus)
                 return UxxxStatus;
@@ -2377,7 +2590,7 @@ static int ftdi_elan_enumeratePCI(struct usb_ftdi *ftdi)
         if (UxxxStatus)
                 return UxxxStatus;
         UxxxStatus = ftdi_elan_write_config(ftdi, activePCIfn | reg, 0,
-                0xF0000000);
+                0x00000000);
         if (UxxxStatus)
                 return UxxxStatus;
         UxxxStatus = ftdi_elan_read_config(ftdi, activePCIfn | reg, 0,
@@ -2401,7 +2614,7 @@ static int ftdi_elan_enumeratePCI(struct usb_ftdi *ftdi)
                 return UxxxStatus;
         reg = 4;
         UxxxStatus = ftdi_elan_write_config(ftdi, activePCIfn | reg, 0x00,
-                0x06);
+                0x00);
         if (UxxxStatus)
                 return UxxxStatus;
         UxxxStatus = ftdi_elan_read_config(ftdi, activePCIfn | reg, 0,
@@ -2411,159 +2624,139 @@ static int ftdi_elan_enumeratePCI(struct usb_ftdi *ftdi)
         return 0;
 }
 
+static int ftdi_elan_found_controller(struct usb_ftdi *ftdi, int fn, int quirk)
+{
+        int result;
+        int UxxxStatus;
+        UxxxStatus = ftdi_elan_setup_controller(ftdi, fn);
+        if (UxxxStatus)
+                return UxxxStatus;
+        result = ftdi_elan_check_controller(ftdi, quirk);
+        UxxxStatus = ftdi_elan_close_controller(ftdi, fn);
+        if (UxxxStatus)
+                return UxxxStatus;
+        return result;
+}
+
+static int ftdi_elan_enumeratePCI(struct usb_ftdi *ftdi)
+{
+        u32 controlreg;
+        u8 sensebits;
+        int UxxxStatus;
+        UxxxStatus = ftdi_elan_read_reg(ftdi, &controlreg);
+        if (UxxxStatus)
+                return UxxxStatus;
+        UxxxStatus = ftdi_elan_write_reg(ftdi, 0x00000000L);
+        if (UxxxStatus)
+                return UxxxStatus;
+        msleep(750);
+        UxxxStatus = ftdi_elan_write_reg(ftdi, 0x00000200L | 0x100);
+        if (UxxxStatus)
+                return UxxxStatus;
+        UxxxStatus = ftdi_elan_write_reg(ftdi, 0x00000200L | 0x500);
+        if (UxxxStatus)
+                return UxxxStatus;
+        UxxxStatus = ftdi_elan_read_reg(ftdi, &controlreg);
+        if (UxxxStatus)
+                return UxxxStatus;
+        UxxxStatus = ftdi_elan_write_reg(ftdi, 0x0000020CL | 0x000);
+        if (UxxxStatus)
+                return UxxxStatus;
+        UxxxStatus = ftdi_elan_write_reg(ftdi, 0x0000020DL | 0x000);
+        if (UxxxStatus)
+                return UxxxStatus;
+        msleep(250);
+        UxxxStatus = ftdi_elan_write_reg(ftdi, 0x0000020FL | 0x000);
+        if (UxxxStatus)
+                return UxxxStatus;
+        UxxxStatus = ftdi_elan_read_reg(ftdi, &controlreg);
+        if (UxxxStatus)
+                return UxxxStatus;
+        UxxxStatus = ftdi_elan_write_reg(ftdi, 0x0000025FL | 0x800);
+        if (UxxxStatus)
+                return UxxxStatus;
+        UxxxStatus = ftdi_elan_read_reg(ftdi, &controlreg);
+        if (UxxxStatus)
+                return UxxxStatus;
+        UxxxStatus = ftdi_elan_read_reg(ftdi, &controlreg);
+        if (UxxxStatus)
+                return UxxxStatus;
+        msleep(1000);
+        sensebits = (controlreg >> 16) & 0x000F;
+        if (0x0D == sensebits)
+                return 0;
+        else
+                return - ENXIO;
+}
+
 static int ftdi_elan_setupOHCI(struct usb_ftdi *ftdi)
 {
+        int UxxxStatus;
         u32 pcidata;
-        int U132Status;
-        int reg;
-        int reset_repeat = 0;
-      do_reset:reg = 8;
-        U132Status = ftdi_elan_write_pcimem(ftdi, reg, 0x0e, 0x01);
-        if (U132Status)
-                return U132Status;
-      reset_check:{
-                U132Status = ftdi_elan_read_pcimem(ftdi, reg, 0, &pcidata);
-                if (U132Status)
-                        return U132Status;
-                if (pcidata & 1) {
-                        msleep(500);
-                        if (reset_repeat++ > 100) {
-                                reset_repeat = 0;
-                                goto do_reset;
-                        } else
-                                goto reset_check;
+        int reg = 0;
+        u8 fn;
+        int activePCIfn = 0;
+        int max_devices = 0;
+        int controllers = 0;
+        int unrecognized = 0;
+        ftdi->function = 0;
+        for (fn = 0; (fn < 4); fn++) {
+                u32 pciVID = 0;
+                u32 pciPID = 0;
+                int devices = 0;
+                activePCIfn = fn << 8;
+                UxxxStatus = ftdi_elan_read_config(ftdi, activePCIfn | reg, 0,
+                        &pcidata);
+                if (UxxxStatus)
+                        return UxxxStatus;
+                pciVID = pcidata & 0xFFFF;
+                pciPID = (pcidata >> 16) & 0xFFFF;
+                if ((pciVID == PCI_VENDOR_ID_OPTI) && (pciPID == 0xc861)) {
+                        devices = ftdi_elan_found_controller(ftdi, fn, 0);
+                        controllers += 1;
+                } else if ((pciVID == PCI_VENDOR_ID_NEC) && (pciPID == 0x0035))
+                        {
+                        devices = ftdi_elan_found_controller(ftdi, fn, 0);
+                        controllers += 1;
+                } else if ((pciVID == PCI_VENDOR_ID_AL) && (pciPID == 0x5237)) {
+                        devices = ftdi_elan_found_controller(ftdi, fn, 0);
+                        controllers += 1;
+                } else if ((pciVID == PCI_VENDOR_ID_ATT) && (pciPID == 0x5802))
+                        {
+                        devices = ftdi_elan_found_controller(ftdi, fn, 0);
+                        controllers += 1;
+                } else if (pciVID == PCI_VENDOR_ID_AMD && pciPID == 0x740c) {
+                        devices = ftdi_elan_found_controller(ftdi, fn,
+                                OHCI_QUIRK_AMD756);
+                        controllers += 1;
+                } else if (pciVID == PCI_VENDOR_ID_COMPAQ && pciPID == 0xa0f8) {
+                        devices = ftdi_elan_found_controller(ftdi, fn,
+                                OHCI_QUIRK_ZFMICRO);
+                        controllers += 1;
+                } else if (0 == pcidata) {
+                } else
+                        unrecognized += 1;
+                if (devices > max_devices) {
+                        max_devices = devices;
+                        ftdi->function = fn + 1;
+                        ftdi->platform_data.vendor = pciVID;
+                        ftdi->platform_data.device = pciPID;
                 }
         }
-        goto dump_regs;
-        msleep(500);
-        reg = 0x28;
-        U132Status = ftdi_elan_write_pcimem(ftdi, reg, 0x00, 0x11000000);
-        if (U132Status)
-                return U132Status;
-        U132Status = ftdi_elan_read_pcimem(ftdi, reg, 0, &pcidata);
-        if (U132Status)
-                return U132Status;
-        reg = 0x40;
-        U132Status = ftdi_elan_write_pcimem(ftdi, reg, 0x00, 0x2edf);
-        if (U132Status)
-                return U132Status;
-        U132Status = ftdi_elan_read_pcimem(ftdi, reg, 0, &pcidata);
-        if (U132Status)
-                return U132Status;
-        reg = 0x34;
-        U132Status = ftdi_elan_write_pcimem(ftdi, reg, 0x00, 0x2edf2edf);
-        if (U132Status)
-                return U132Status;
-        U132Status = ftdi_elan_read_pcimem(ftdi, reg, 0, &pcidata);
-        if (U132Status)
-                return U132Status;
-        reg = 4;
-        U132Status = ftdi_elan_write_pcimem(ftdi, reg, 0x00, 0xA0);
-        if (U132Status)
-                return U132Status;
-        U132Status = ftdi_elan_read_pcimem(ftdi, reg, 0, &pcidata);
-        if (U132Status)
-                return U132Status;
-        msleep(250);
-        reg = 8;
-        U132Status = ftdi_elan_write_pcimem(ftdi, reg, 0x0e, 0x04);
-        if (U132Status)
-                return U132Status;
-        U132Status = ftdi_elan_read_pcimem(ftdi, reg, 0, &pcidata);
-        if (U132Status)
-                return U132Status;
-        reg = 0x28;
-        U132Status = ftdi_elan_read_pcimem(ftdi, reg, 0, &pcidata);
-        if (U132Status)
-                return U132Status;
-        reg = 8;
-        U132Status = ftdi_elan_read_pcimem(ftdi, reg, 0, &pcidata);
-        if (U132Status)
-                return U132Status;
-        reg = 0x48;
-        U132Status = ftdi_elan_write_pcimem(ftdi, reg, 0x00, 0x00001200);
-        if (U132Status)
-                return U132Status;
-        U132Status = ftdi_elan_read_pcimem(ftdi, reg, 0, &pcidata);
-        if (U132Status)
-                return U132Status;
-        reg = 0x54;
-        U132Status = ftdi_elan_read_pcimem(ftdi, reg, 0, &pcidata);
-        if (U132Status)
-                return U132Status;
-        reg = 0x58;
-        U132Status = ftdi_elan_read_pcimem(ftdi, reg, 0, &pcidata);
-        if (U132Status)
-                return U132Status;
-        reg = 0x34;
-        U132Status = ftdi_elan_write_pcimem(ftdi, reg, 0x00, 0x28002edf);
-        if (U132Status)
-                return U132Status;
-        U132Status = ftdi_elan_read_pcimem(ftdi, reg, 0, &pcidata);
-        if (U132Status)
-                return U132Status;
-        msleep(100);
-        reg = 0x50;
-        U132Status = ftdi_elan_write_pcimem(ftdi, reg, 0x00, 0x10000);
-        if (U132Status)
-                return U132Status;
-        reg = 0x54;
-      power_check:U132Status = ftdi_elan_read_pcimem(ftdi, reg, 0, &pcidata);
-        if (U132Status)
-                return U132Status;
-        if (!(pcidata & 1)) {
-                msleep(500);
-                goto power_check;
-        }
-        msleep(3000);
-        reg = 0x54;
-        U132Status = ftdi_elan_read_pcimem(ftdi, reg, 0, &pcidata);
-        if (U132Status)
-                return U132Status;
-        reg = 0x58;
-        U132Status = ftdi_elan_read_pcimem(ftdi, reg, 0, &pcidata);
-        if (U132Status)
-                return U132Status;
-        reg = 0x54;
-        U132Status = ftdi_elan_write_pcimem(ftdi, reg, 0x00, 0x02);
-        if (U132Status)
-                return U132Status;
-        U132Status = ftdi_elan_read_pcimem(ftdi, reg, 0, &pcidata);
-        if (U132Status)
-                return U132Status;
-        reg = 0x54;
-        U132Status = ftdi_elan_write_pcimem(ftdi, reg, 0x00, 0x10);
-        if (U132Status)
-                return U132Status;
-        U132Status = ftdi_elan_read_pcimem(ftdi, reg, 0, &pcidata);
-        if (U132Status)
-                return U132Status;
-        msleep(750);
-        reg = 0x54;
-        if (0) {
-                U132Status = ftdi_elan_write_pcimem(ftdi, reg, 0x00, 0x02);
-                if (U132Status)
-                        return U132Status;
-        }
-        if (0) {
-                U132Status = ftdi_elan_read_pcimem(ftdi, reg, 0, &pcidata);
-                if (U132Status)
-                        return U132Status;
-        }
-        reg = 0x54;
-        U132Status = ftdi_elan_read_pcimem(ftdi, reg, 0, &pcidata);
-        if (U132Status)
-                return U132Status;
-        reg = 0x58;
-        U132Status = ftdi_elan_read_pcimem(ftdi, reg, 0, &pcidata);
-        if (U132Status)
-                return U132Status;
-      dump_regs:for (reg = 0; reg <= 0x54; reg += 4) {
-                U132Status = ftdi_elan_read_pcimem(ftdi, reg, 0, &pcidata);
-                if (U132Status)
-                        return U132Status;
+        if (ftdi->function > 0) {
+                UxxxStatus = ftdi_elan_setup_controller(ftdi,
+                        ftdi->function - 1);
+                if (UxxxStatus)
+                        return UxxxStatus;
+                return 0;
+        } else if (controllers > 0) {
+                return -ENXIO;
+        } else if (unrecognized > 0) {
+                return -ENXIO;
+        } else {
+                ftdi->enumerated = 0;
+                return -ENXIO;
         }
-        return 0;
 }
 
 
@@ -2688,6 +2881,7 @@ static void ftdi_elan_disconnect(struct usb_interface *interface)
                         platform_device_unregister(&ftdi->platform_dev);
                         ftdi->synchronized = 0;
                         ftdi->enumerated = 0;
+                        ftdi->initialized = 0;
                         ftdi->registered = 0;
                 }
                 flush_workqueue(status_queue);
diff --git a/drivers/usb/misc/phidgetservo.c b/drivers/usb/misc/phidgetservo.c
index 7163f05c5b..0d9de2f739 100644
--- a/drivers/usb/misc/phidgetservo.c
+++ b/drivers/usb/misc/phidgetservo.c
@@ -282,6 +282,7 @@ servo_probe(struct usb_interface *interface, const struct usb_device_id *id)
                 dev->dev = NULL;
                 goto out;
         }
+        dev_set_drvdata(dev->dev, dev);
 
         servo_count = dev->type & SERVO_COUNT_QUAD ? 4 : 1;
 
diff --git a/drivers/usb/misc/trancevibrator.c b/drivers/usb/misc/trancevibrator.c
index 33cd91d11e..67e2fc20ee 100644
--- a/drivers/usb/misc/trancevibrator.c
+++ b/drivers/usb/misc/trancevibrator.c
@@ -120,8 +120,8 @@ static void tv_disconnect(struct usb_interface *interface)
         struct trancevibrator *dev;
 
         dev = usb_get_intfdata (interface);
-        usb_set_intfdata(interface, NULL);
         device_remove_file(&interface->dev, &dev_attr_speed);
+        usb_set_intfdata(interface, NULL);
         usb_put_dev(dev->udev);
         kfree(dev);
 }
diff --git a/drivers/usb/net/gl620a.c b/drivers/usb/net/gl620a.c
index a3242be219..a6f0f4d934 100644
--- a/drivers/usb/net/gl620a.c
+++ b/drivers/usb/net/gl620a.c
@@ -79,160 +79,6 @@ struct gl_header {
         struct gl_packet        packets;
 };
 
-#ifdef  GENELINK_ACK
-
-// FIXME:  this code is incomplete, not debugged; it doesn't
-// handle interrupts correctly; it should use the generic
-// status IRQ code (which didn't exist back in 2001).
-
-struct gl_priv {
-        struct urb      *irq_urb;
-        char            irq_buf [INTERRUPT_BUFSIZE];
-};
-
-static inline int gl_control_write(struct usbnet *dev, u8 request, u16 value)
-{
-        int retval;
-
-        retval = usb_control_msg(dev->udev,
-                      usb_sndctrlpipe(dev->udev, 0),
-                      request,
-                      USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE,
-                      value,
-                      0,                        // index
-                      0,                        // data buffer
-                      0,                        // size
-                      USB_CTRL_SET_TIMEOUT);
-        return retval;
-}
-
-static void gl_interrupt_complete(struct urb *urb)
-{
-        int status = urb->status;
-
-        switch (status) {
-        case 0:
-                /* success */
-                break;
-        case -ECONNRESET:
-        case -ENOENT:
-        case -ESHUTDOWN:
-                /* this urb is terminated, clean up */
-                dbg("%s - urb shutting down with status: %d",
-                                __FUNCTION__, status);
-                return;
-        default:
-                dbg("%s - nonzero urb status received: %d",
-                                __FUNCTION__, urb->status);
-        }
-
-        status = usb_submit_urb(urb, GFP_ATOMIC);
-        if (status)
-                err("%s - usb_submit_urb failed with result %d",
-                     __FUNCTION__, status);
-}
-
-static int gl_interrupt_read(struct usbnet *dev)
-{
-        struct gl_priv  *priv = dev->priv_data;
-        int             retval;
-
-        // issue usb interrupt read
-        if (priv && priv->irq_urb) {
-                // submit urb
-                if ((retval = usb_submit_urb(priv->irq_urb, GFP_KERNEL)) != 0)
-                        dbg("gl_interrupt_read: submit fail - %X...", retval);
-                else
-                        dbg("gl_interrupt_read: submit success...");
-        }
-
-        return 0;
-}
-
-// check whether another side is connected
-static int genelink_check_connect(struct usbnet *dev)
-{
-        int                     retval;
-
-        dbg("genelink_check_connect...");
-
-        // detect whether another side is connected
-        if ((retval = gl_control_write(dev, GENELINK_CONNECT_WRITE, 0)) != 0) {
-                dbg("%s: genelink_check_connect write fail - %X",
-                        dev->net->name, retval);
-                return retval;
-        }
-
-        // usb interrupt read to ack another side
-        if ((retval = gl_interrupt_read(dev)) != 0) {
-                dbg("%s: genelink_check_connect read fail - %X",
-                        dev->net->name, retval);
-                return retval;
-        }
-
-        dbg("%s: genelink_check_connect read success", dev->net->name);
-        return 0;
-}
-
-// allocate and initialize the private data for genelink
-static int genelink_init(struct usbnet *dev)
-{
-        struct gl_priv *priv;
-
-        // allocate the private data structure
-        if ((priv = kmalloc(sizeof *priv, GFP_KERNEL)) == 0) {
-                dbg("%s: cannot allocate private data per device",
-                        dev->net->name);
-                return -ENOMEM;
-        }
-
-        // allocate irq urb
-        if ((priv->irq_urb = usb_alloc_urb(0, GFP_KERNEL)) == 0) {
-                dbg("%s: cannot allocate private irq urb per device",
-                        dev->net->name);
-                kfree(priv);
-                return -ENOMEM;
-        }
-
-        // fill irq urb
-        usb_fill_int_urb(priv->irq_urb, dev->udev,
-                usb_rcvintpipe(dev->udev, GENELINK_INTERRUPT_PIPE),
-                priv->irq_buf, INTERRUPT_BUFSIZE,
-                gl_interrupt_complete, 0,
-                GENELINK_INTERRUPT_INTERVAL);
-
-        // set private data pointer
-        dev->priv_data = priv;
-
-        return 0;
-}
-
-// release the private data
-static int genelink_free(struct usbnet *dev)
-{
-        struct gl_priv  *priv = dev->priv_data;
-
-        if (!priv)
-                return 0;
-
-// FIXME:  can't cancel here; it's synchronous, and
-// should have happened earlier in any case (interrupt
-// handling needs to be generic)
-
-        // cancel irq urb first
-        usb_kill_urb(priv->irq_urb);
-
-        // free irq urb
-        usb_free_urb(priv->irq_urb);
-
-        // free the private data structure
-        kfree(priv);
-
-        return 0;
-}
-
-#endif
-
 static int genelink_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
 {
         struct gl_header        *header;
diff --git a/drivers/usb/net/rtl8150.c b/drivers/usb/net/rtl8150.c
index c54235f73c..e0eecda78e 100644
--- a/drivers/usb/net/rtl8150.c
+++ b/drivers/usb/net/rtl8150.c
@@ -124,10 +124,11 @@
 #define RX_URB_FAIL             3
 
 /* Define these values to match your device */
-#define VENDOR_ID_REALTEK               0x0bda
+#define VENDOR_ID_REALTEK               0x0bda
 #define VENDOR_ID_MELCO                 0x0411
-#define VENDOR_ID_MICRONET              0x3980
+#define VENDOR_ID_MICRONET              0x3980
 #define VENDOR_ID_LONGSHINE             0x07b8
+#define VENDOR_ID_OQO                   0x1557
 #define VENDOR_ID_ZYXEL                 0x0586
 
 #define PRODUCT_ID_RTL8150              0x8150
@@ -144,6 +145,7 @@ static struct usb_device_id rtl8150_table[] = {
         {USB_DEVICE(VENDOR_ID_MELCO, PRODUCT_ID_LUAKTX)},
         {USB_DEVICE(VENDOR_ID_MICRONET, PRODUCT_ID_SP128AR)},
         {USB_DEVICE(VENDOR_ID_LONGSHINE, PRODUCT_ID_LCS8138TX)},
+        {USB_DEVICE(VENDOR_ID_OQO, PRODUCT_ID_RTL8150)},
         {USB_DEVICE(VENDOR_ID_ZYXEL, PRODUCT_ID_PRESTIGE)},
         {}
 };
diff --git a/drivers/usb/serial/airprime.c b/drivers/usb/serial/airprime.c
index 96c73726d7..f2ca76a9cb 100644
--- a/drivers/usb/serial/airprime.c
+++ b/drivers/usb/serial/airprime.c
@@ -19,8 +19,11 @@
 static struct usb_device_id id_table [] = {
         { USB_DEVICE(0x0c88, 0x17da) }, /* Kyocera Wireless KPC650/Passport */
         { USB_DEVICE(0x1410, 0x1110) }, /* Novatel Wireless Merlin CDMA */
+        { USB_DEVICE(0x1410, 0x1130) }, /* Novatel Wireless S720 CDMA/EV-DO */
+        { USB_DEVICE(0x1410, 0x2110) }, /* Novatel Wireless U720 CDMA/EV-DO */
         { USB_DEVICE(0x1410, 0x1430) }, /* Novatel Merlin XU870 HSDPA/3G */
         { USB_DEVICE(0x1410, 0x1100) }, /* ExpressCard34 Qualcomm 3G CDMA */
+        { USB_DEVICE(0x413c, 0x8115) }, /* Dell Wireless HSDPA 5500 */
         { },
 };
 MODULE_DEVICE_TABLE(usb, id_table);
diff --git a/drivers/usb/serial/cp2101.c b/drivers/usb/serial/cp2101.c
index 2f9b7ac326..7ebaffd6ed 100644
--- a/drivers/usb/serial/cp2101.c
+++ b/drivers/usb/serial/cp2101.c
@@ -69,6 +69,7 @@ static struct usb_device_id id_table [] = {
         { USB_DEVICE(0x10C4, 0x8218) }, /* Lipowsky Industrie Elektronik GmbH, HARP-1 */
         { USB_DEVICE(0x10C4, 0xEA60) }, /* Silicon Labs factory default */
         { USB_DEVICE(0x10C4, 0xEA61) }, /* Silicon Labs factory default */
+        { USB_DEVICE(0x13AD, 0x9999) }, /* Baltech card reader */
         { USB_DEVICE(0x16D6, 0x0001) }, /* Jablotron serial interface */
         { } /* Terminating Entry */
 };
diff --git a/drivers/usb/serial/cypress_m8.c b/drivers/usb/serial/cypress_m8.c
index 45cdf9bc43..6bc1f404e1 100644
--- a/drivers/usb/serial/cypress_m8.c
+++ b/drivers/usb/serial/cypress_m8.c
@@ -962,21 +962,6 @@ static int cypress_ioctl (struct usb_serial_port *port, struct file * file, unsi
                         cypress_set_termios(port, &priv->tmp_termios);
                         return (0);
                         break;
-                /* these are called when setting baud rate from gpsd */
-                case TCGETS:
-                        if (copy_to_user((void __user *)arg, port->tty->termios, sizeof(struct termios))) {
-                                return -EFAULT;
-                        }
-                        return (0);
-                        break;
-                case TCSETS:
-                        if (copy_from_user(port->tty->termios, (void __user *)arg, sizeof(struct termios))) {
-                                return -EFAULT;
-                        }
-                        /* here we need to call cypress_set_termios to invoke the new settings */
-                        cypress_set_termios(port, &priv->tmp_termios);
-                        return (0);
-                        break;
                 /* This code comes from drivers/char/serial.c and ftdi_sio.c */
                 case TIOCMIWAIT:
                         while (priv != NULL) {
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 41b0ad2d56..6986e756f7 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -452,6 +452,7 @@ static struct usb_device_id id_table_combined [] = {
         { USB_DEVICE(FTDI_VID, LINX_FUTURE_2_PID) },
         { USB_DEVICE(FTDI_VID, FTDI_CCSICDU20_0_PID) },
         { USB_DEVICE(FTDI_VID, FTDI_CCSICDU40_1_PID) },
+        { USB_DEVICE(FTDI_VID, FTDI_CCSMACHX_2_PID) },
         { USB_DEVICE(FTDI_VID, INSIDE_ACCESSO) },
         { USB_DEVICE(INTREPID_VID, INTREPID_VALUECAN_PID) },
         { USB_DEVICE(INTREPID_VID, INTREPID_NEOVI_PID) },
diff --git a/drivers/usb/serial/ftdi_sio.h b/drivers/usb/serial/ftdi_sio.h
index bae117d359..40dd394de5 100644
--- a/drivers/usb/serial/ftdi_sio.h
+++ b/drivers/usb/serial/ftdi_sio.h
@@ -312,8 +312,9 @@
 
 /* CCS Inc. ICDU/ICDU40 product ID - the FT232BM is used in an in-circuit-debugger */
 /* unit for PIC16's/PIC18's */
-#define FTDI_CCSICDU20_0_PID    0xF9D0     
-#define FTDI_CCSICDU40_1_PID    0xF9D1     
+#define FTDI_CCSICDU20_0_PID    0xF9D0
+#define FTDI_CCSICDU40_1_PID    0xF9D1
+#define FTDI_CCSMACHX_2_PID     0xF9D2
 
 /* Inside Accesso contactless reader (http://www.insidefr.com) */
 #define INSIDE_ACCESSO          0xFAD0
diff --git a/drivers/usb/serial/funsoft.c b/drivers/usb/serial/funsoft.c
index 77b977206a..d3be9214c7 100644
--- a/drivers/usb/serial/funsoft.c
+++ b/drivers/usb/serial/funsoft.c
@@ -14,6 +14,9 @@
 #include <linux/module.h>
 #include <linux/usb.h>
 #include <linux/usb/serial.h>
+#include <asm/uaccess.h>
+
+static int debug;
 
 static struct usb_device_id id_table [] = {
         { USB_DEVICE(0x1404, 0xcddc) },
@@ -21,6 +24,26 @@ static struct usb_device_id id_table [] = {
 };
 MODULE_DEVICE_TABLE(usb, id_table);
 
+static int funsoft_ioctl(struct usb_serial_port *port, struct file *file,
+                         unsigned int cmd, unsigned long arg)
+{
+        struct termios t;
+
+        dbg("%s - port %d, cmd 0x%04x", __FUNCTION__, port->number, cmd);
+
+        if (cmd == TCSETSF) {
+                if (user_termios_to_kernel_termios(&t, (void __user *)arg))
+                        return -EFAULT;
+
+                dbg("%s - iflag:%x oflag:%x cflag:%x lflag:%x", __FUNCTION__,
+                    t.c_iflag, t.c_oflag, t.c_cflag, t.c_lflag);
+
+                if (!(t.c_lflag & ICANON))
+                        return -EINVAL;
+        }
+        return -ENOIOCTLCMD;
+}
+
 static struct usb_driver funsoft_driver = {
         .name =         "funsoft",
         .probe =        usb_serial_probe,
@@ -39,6 +62,7 @@ static struct usb_serial_driver funsoft_device = {
         .num_bulk_in =          NUM_DONT_CARE,
         .num_bulk_out =         NUM_DONT_CARE,
         .num_ports =            1,
+        .ioctl =                funsoft_ioctl,
 };
 
 static int __init funsoft_init(void)
@@ -63,3 +87,6 @@ static void __exit funsoft_exit(void)
 module_init(funsoft_init);
 module_exit(funsoft_exit);
 MODULE_LICENSE("GPL");
+
+module_param(debug, bool, S_IRUGO | S_IWUSR);
+MODULE_PARM_DESC(debug, "Debug enabled or not");
diff --git a/drivers/usb/serial/kl5kusb105.c b/drivers/usb/serial/kl5kusb105.c
index 73d755df48..5c4b06a99a 100644
--- a/drivers/usb/serial/kl5kusb105.c
+++ b/drivers/usb/serial/kl5kusb105.c
@@ -87,10 +87,6 @@ static int  klsi_105_write_room          (struct usb_serial_port *port);
 static void klsi_105_read_bulk_callback  (struct urb *urb);
 static void klsi_105_set_termios         (struct usb_serial_port *port,
                                           struct ktermios *old);
-static int  klsi_105_ioctl               (struct usb_serial_port *port,
-                                          struct file * file,
-                                          unsigned int cmd,
-                                          unsigned long arg);
 static void klsi_105_throttle            (struct usb_serial_port *port);
 static void klsi_105_unthrottle          (struct usb_serial_port *port);
 /*
@@ -140,7 +136,6 @@ static struct usb_serial_driver kl5kusb105d_device = {
         .chars_in_buffer =   klsi_105_chars_in_buffer,
         .write_room =        klsi_105_write_room,
         .read_bulk_callback =klsi_105_read_bulk_callback,
-        .ioctl =             klsi_105_ioctl,
         .set_termios =       klsi_105_set_termios,
         /*.break_ctl =       klsi_105_break_ctl,*/
         .tiocmget =          klsi_105_tiocmget,
@@ -899,69 +894,6 @@ static int klsi_105_tiocmset (struct usb_serial_port *port, struct file *file,
 */
         return retval;
 }
-                                        
-static int klsi_105_ioctl (struct usb_serial_port *port, struct file * file,
-                           unsigned int cmd, unsigned long arg)
-{
-        struct klsi_105_private *priv = usb_get_serial_port_data(port);
-        void __user *user_arg = (void __user *)arg;
-        
-        dbg("%scmd=0x%x", __FUNCTION__, cmd);
-
-        /* Based on code from acm.c and others */
-        switch (cmd) {
-        case TIOCMIWAIT:
-                /* wait for any of the 4 modem inputs (DCD,RI,DSR,CTS)*/
-                /* TODO */
-                dbg("%s - TIOCMIWAIT not handled", __FUNCTION__);
-                return -ENOIOCTLCMD;
-        case TIOCGICOUNT:
-                /* return count of modemline transitions */
-                /* TODO */
-                dbg("%s - TIOCGICOUNT not handled", __FUNCTION__);
-                return -ENOIOCTLCMD;
-        case TCGETS:
-                /* return current info to caller */
-                dbg("%s - TCGETS data faked/incomplete", __FUNCTION__);
-
-                if (!access_ok(VERIFY_WRITE, user_arg, sizeof(struct termios)))
-                        return -EFAULT;
-
-                if (kernel_termios_to_user_termios((struct termios __user *)arg,
-                                                   &priv->termios))
-                        return -EFAULT;
-                return 0;
-        case TCSETS:
-                /* set port termios to the one given by the user */
-                dbg("%s - TCSETS not handled", __FUNCTION__);
-
-                if (!access_ok(VERIFY_READ, user_arg, sizeof(struct termios)))
-                        return -EFAULT;
-
-                if (user_termios_to_kernel_termios(&priv->termios,
-                                                   (struct termios __user *)arg))
-                        return -EFAULT;
-                klsi_105_set_termios(port, &priv->termios);
-                return 0;
-        case TCSETSW: {
-                /* set port termios and try to wait for completion of last
-                 * write operation */
-                /* We guess here. If there are not too many write urbs
-                 * outstanding, we lie. */
-                /* what is the right way to wait here? schedule() ? */
-                /*
-                while (klsi_105_chars_in_buffer(port) > (NUM_URBS / 4 ) * URB_TRANSFER_BUFFER_SIZE)
-                            schedule();
-                 */
-                return -ENOIOCTLCMD;
-                      }
-        default:
-                dbg("%s: arg not supported - 0x%04x", __FUNCTION__,cmd);
-                return(-ENOIOCTLCMD);
-                break;
-        }
-        return 0;
-} /* klsi_105_ioctl */
 
 static void klsi_105_throttle (struct usb_serial_port *port)
 {
diff --git a/drivers/usb/serial/mos7840.c b/drivers/usb/serial/mos7840.c
index 8cc728a49e..83f661403b 100644
--- a/drivers/usb/serial/mos7840.c
+++ b/drivers/usb/serial/mos7840.c
@@ -2460,12 +2460,6 @@ static int mos7840_ioctl(struct usb_serial_port *port, struct file *file,
                 tty_ldisc_deref(ld);
                 return 0;
 
-        case TCGETS:
-                if (kernel_termios_to_user_termios
-                    ((struct termios __user *)argp, tty->termios))
-                        return -EFAULT;
-                return 0;
-
         case TIOCSERGETLSR:
                 dbg("%s (%d) TIOCSERGETLSR", __FUNCTION__, port->number);
                 return mos7840_get_lsr_info(mos7840_port, argp);
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index 0ae4098718..819266b7e2 100644
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -79,6 +79,7 @@ static int  option_send_setup(struct usb_serial_port *port);
 #define OPTION_PRODUCT_COBRA            0x6500
 #define OPTION_PRODUCT_COBRA2           0x6600
 #define HUAWEI_PRODUCT_E600             0x1001
+#define HUAWEI_PRODUCT_E220             0x1003
 #define AUDIOVOX_PRODUCT_AIRCARD        0x0112
 #define NOVATELWIRELESS_PRODUCT_U740    0x1400
 #define ANYDATA_PRODUCT_ID              0x6501
@@ -90,6 +91,7 @@ static struct usb_device_id option_ids[] = {
         { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COBRA) },
         { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COBRA2) },
         { USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E600) },
+        { USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E220) },
         { USB_DEVICE(AUDIOVOX_VENDOR_ID, AUDIOVOX_PRODUCT_AIRCARD) },
         { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID,NOVATELWIRELESS_PRODUCT_U740) },
         { USB_DEVICE(ANYDATA_VENDOR_ID, ANYDATA_PRODUCT_ID) },
@@ -103,6 +105,7 @@ static struct usb_device_id option_ids1[] = {
         { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COBRA) },
         { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COBRA2) },
         { USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E600) },
+        { USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E220) },
         { USB_DEVICE(AUDIOVOX_VENDOR_ID, AUDIOVOX_PRODUCT_AIRCARD) },
         { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID,NOVATELWIRELESS_PRODUCT_U740) },
         { USB_DEVICE(ANYDATA_VENDOR_ID, ANYDATA_PRODUCT_ID) },
diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
index db8b26012c..5fe7ff441a 100644
--- a/drivers/usb/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h
@@ -153,6 +153,13 @@ UNUSUAL_DEV(  0x0421, 0x042e, 0x0100, 0x0100,
                 US_SC_DEVICE, US_PR_DEVICE, NULL,
                 US_FL_IGNORE_RESIDUE | US_FL_FIX_CAPACITY ),
 
+/* Reported by <honkkis@gmail.com> */
+UNUSUAL_DEV(  0x0421, 0x0433, 0x0100, 0x0100,
+                "Nokia",
+                "E70",
+                US_SC_DEVICE, US_PR_DEVICE, NULL,
+                US_FL_IGNORE_RESIDUE | US_FL_FIX_CAPACITY ),
+
 /* Reported by Jon Hart <Jon.Hart@web.de> */
 UNUSUAL_DEV(  0x0421, 0x0434, 0x0100, 0x0100,
                 "Nokia",
@@ -1328,6 +1335,15 @@ UNUSUAL_DEV(  0x1210, 0x0003, 0x0100, 0x0100,
                 US_SC_DEVICE, US_PR_DEVICE, NULL,
                 US_FL_IGNORE_RESIDUE ),
 
+/* This prevents the kernel from detecting the virtual cd-drive with the
+ * Windows drivers.  <johann.wilhelm@student.tugraz.at>
+*/
+UNUSUAL_DEV( 0x12d1, 0x1003, 0x0000, 0xffff,
+                "HUAWEI",
+                "E220 USB-UMTS Install",
+                US_SC_DEVICE, US_PR_DEVICE, NULL,
+                US_FL_IGNORE_DEVICE),
+
 /* Reported by Vilius Bilinkevicius <vilisas AT xxx DOT lt) */
 UNUSUAL_DEV(  0x132b, 0x000b, 0x0001, 0x0001,
                 "Minolta",
diff --git a/drivers/video/aty/aty128fb.c b/drivers/video/aty/aty128fb.c
index 3feddf89d1..2e976ffcde 100644
--- a/drivers/video/aty/aty128fb.c
+++ b/drivers/video/aty/aty128fb.c
@@ -1834,7 +1834,7 @@ static void aty128_bl_init(struct aty128fb_par *par)
 
         snprintf(name, sizeof(name), "aty128bl%d", info->node);
 
-        bd = backlight_device_register(name, par, &aty128_bl_data);
+        bd = backlight_device_register(name, info->dev, par, &aty128_bl_data);
         if (IS_ERR(bd)) {
                 info->bl_dev = NULL;
                 printk(KERN_WARNING "aty128: Backlight registration failed\n");
diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c
index 09684d7a7c..f2ebdd8800 100644
--- a/drivers/video/aty/atyfb_base.c
+++ b/drivers/video/aty/atyfb_base.c
@@ -2211,7 +2211,7 @@ static void aty_bl_init(struct atyfb_par *par)
 
         snprintf(name, sizeof(name), "atybl%d", info->node);
 
-        bd = backlight_device_register(name, par, &aty_bl_data);
+        bd = backlight_device_register(name, info->dev, par, &aty_bl_data);
         if (IS_ERR(bd)) {
                 info->bl_dev = NULL;
                 printk(KERN_WARNING "aty: Backlight registration failed\n");
diff --git a/drivers/video/aty/radeon_backlight.c b/drivers/video/aty/radeon_backlight.c
index 585eb7b9e6..3abfd4a380 100644
--- a/drivers/video/aty/radeon_backlight.c
+++ b/drivers/video/aty/radeon_backlight.c
@@ -163,7 +163,7 @@ void radeonfb_bl_init(struct radeonfb_info *rinfo)
 
         snprintf(name, sizeof(name), "radeonbl%d", rinfo->info->node);
 
-        bd = backlight_device_register(name, pdata, &radeon_bl_data);
+        bd = backlight_device_register(name, rinfo->info->dev, pdata, &radeon_bl_data);
         if (IS_ERR(bd)) {
                 rinfo->info->bl_dev = NULL;
                 printk("radeonfb: Backlight registration failed\n");
diff --git a/drivers/video/backlight/backlight.c b/drivers/video/backlight/backlight.c
index db8c191b12..9601bfe309 100644
--- a/drivers/video/backlight/backlight.c
+++ b/drivers/video/backlight/backlight.c
@@ -216,8 +216,10 @@ static const struct class_device_attribute bl_class_device_attributes[] = {
  * Creates and registers new backlight class_device. Returns either an
  * ERR_PTR() or a pointer to the newly allocated device.
  */
-struct backlight_device *backlight_device_register(const char *name, void *devdata,
-                                                   struct backlight_properties *bp)
+struct backlight_device *backlight_device_register(const char *name,
+        struct device *dev,
+        void *devdata,
+        struct backlight_properties *bp)
 {
         int i, rc;
         struct backlight_device *new_bd;
@@ -232,6 +234,7 @@ struct backlight_device *backlight_device_register(const char *name, void *devda
         new_bd->props = bp;
         memset(&new_bd->class_dev, 0, sizeof(new_bd->class_dev));
         new_bd->class_dev.class = &backlight_class;
+        new_bd->class_dev.dev = dev;
         strlcpy(new_bd->class_dev.class_id, name, KOBJ_NAME_LEN);
         class_set_devdata(&new_bd->class_dev, devdata);
 
diff --git a/drivers/video/gxt4500.c b/drivers/video/gxt4500.c
index 3adf6ab076..23a6bcc3e3 100644
--- a/drivers/video/gxt4500.c
+++ b/drivers/video/gxt4500.c
@@ -1,5 +1,5 @@
 /*
- * Frame buffer device for IBM GXT4500P display adaptor
+ * Frame buffer device for IBM GXT4500P and GXT6000P display adaptors
  *
  * Copyright (C) 2006 Paul Mackerras, IBM Corp. <paulus@samba.org>
  */
@@ -11,8 +11,10 @@
 #include <linux/pci.h>
 #include <linux/pci_ids.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #define PCI_DEVICE_ID_IBM_GXT4500P      0x21c
+#define PCI_DEVICE_ID_IBM_GXT6000P      0x170
 
 /* GXT4500P registers */
 
@@ -94,6 +96,7 @@ static const unsigned char pixsize[] = {
 #define PLL_M                   0x4040
 #define PLL_N                   0x4044
 #define PLL_POSTDIV             0x4048
+#define PLL_C                   0x404c
 
 /* Hardware cursor */
 #define CURSOR_X                0x4078
@@ -140,6 +143,7 @@ struct gxt4500_par {
         int pixfmt;             /* pixel format, see DFA_PIX_* values */
 
         /* PLL parameters */
+        int refclk_ps;          /* ref clock period in picoseconds */
         int pll_m;              /* ref clock divisor */
         int pll_n;              /* VCO divisor */
         int pll_pd1;            /* first post-divisor */
@@ -166,6 +170,21 @@ static const struct fb_videomode defaultmode __devinitdata = {
         .vmode = FB_VMODE_NONINTERLACED
 };
 
+/* List of supported cards */
+enum gxt_cards {
+        GXT4500P,
+        GXT6000P
+};
+
+/* Card-specific information */
+static const struct cardinfo {
+        int     refclk_ps;      /* period of PLL reference clock in ps */
+        const char *cardname;
+} cardinfo[] = {
+        [GXT4500P] = { .refclk_ps = 9259, .cardname = "IBM GXT4500P" },
+        [GXT6000P] = { .refclk_ps = 40000, .cardname = "IBM GXT6000P" },
+};
+
 /*
  * The refclk and VCO dividers appear to use a linear feedback shift
  * register, which gets reloaded when it reaches a terminal value, at
@@ -203,27 +222,16 @@ static const unsigned char ndivtab[] = {
 /* 130 */       0x9e, 0x4f, 0x27, 0x93, 0xc9, 0xe4, 0x72, 0x39, 0x1c, 0x0e,
 /* 140 */       0x87, 0xc3, 0x61, 0x30, 0x18, 0x8c, 0xc6, 0x63, 0x31, 0x98,
 /* 150 */       0xcc, 0xe6, 0x73, 0xb9, 0x5c, 0x2e, 0x97, 0x4b, 0xa5, 0xd2,
-/* 160 */       0x69, 0xb4, 0xda, 0xed, 0x76, 0xbb, 0x5d, 0xae, 0xd7, 0x6b,
-/* 170 */       0xb5, 0x5a, 0xad, 0x56, 0xab, 0xd5, 0x6a, 0x35, 0x1a, 0x8d,
-/* 180 */       0x46, 0x23, 0x11, 0x88, 0x44, 0x22, 0x91, 0xc8, 0x64, 0x32,
-/* 190 */       0x19, 0x0c, 0x86, 0x43, 0x21, 0x10, 0x08, 0x04, 0x02, 0x81,
-/* 200 */       0x40, 0xa0, 0xd0, 0x68, 0x34, 0x9a, 0xcd, 0x66, 0x33, 0x99,
-/* 210 */       0x4c, 0xa6, 0x53, 0xa9, 0xd4, 0xea, 0x75, 0x3a, 0x9d, 0xce,
-/* 220 */       0xe7, 0xf3, 0xf9, 0x7c, 0x3e, 0x1f, 0x8f, 0x47, 0xa3, 0x51,
-/* 230 */       0xa8, 0x54, 0xaa, 0x55, 0x2a, 0x15, 0x0a, 0x05, 0x82, 0xc1,
-/* 240 */       0x60, 0xb0, 0x58, 0xac, 0xd6, 0xeb, 0xf5, 0x7a, 0xbd, 0xde,
-/* 250 */       0x6f, 0x37, 0x1b, 0x0d, 0x06, 0x03, 0x01,
+/* 160 */       0x69,
 };
 
-#define REF_PERIOD_PS   9259    /* period of reference clock in ps */
-
 static int calc_pll(int period_ps, struct gxt4500_par *par)
 {
         int m, n, pdiv1, pdiv2, postdiv;
-        int pll_period, best_error, t;
+        int pll_period, best_error, t, intf;
 
-        /* only deal with range 1MHz - 400MHz */
-        if (period_ps < 2500 || period_ps > 1000000)
+        /* only deal with range 5MHz - 300MHz */
+        if (period_ps < 3333 || period_ps > 200000)
                 return -1;
 
         best_error = 1000000;
@@ -231,14 +239,17 @@ static int calc_pll(int period_ps, struct gxt4500_par *par)
                 for (pdiv2 = 1; pdiv2 <= pdiv1; ++pdiv2) {
                         postdiv = pdiv1 * pdiv2;
                         pll_period = (period_ps + postdiv - 1) / postdiv;
-                        /* keep pll in range 500..1250 MHz */
-                        if (pll_period < 800 || pll_period > 2000)
+                        /* keep pll in range 350..600 MHz */
+                        if (pll_period < 1666 || pll_period > 2857)
                                 continue;
-                        for (m = 3; m <= 40; ++m) {
-                                n = REF_PERIOD_PS * m * postdiv / period_ps;
-                                if (n < 5 || n > 256)
+                        for (m = 1; m <= 64; ++m) {
+                                intf = m * par->refclk_ps;
+                                if (intf > 500000)
+                                        break;
+                                n = intf * postdiv / period_ps;
+                                if (n < 3 || n > 160)
                                         continue;
-                                t = REF_PERIOD_PS * m * postdiv / n;
+                                t = par->refclk_ps * m * postdiv / n;
                                 t -= period_ps;
                                 if (t >= 0 && t < best_error) {
                                         par->pll_m = m;
@@ -257,7 +268,7 @@ static int calc_pll(int period_ps, struct gxt4500_par *par)
 
 static int calc_pixclock(struct gxt4500_par *par)
 {
-        return REF_PERIOD_PS * par->pll_m * par->pll_pd1 * par->pll_pd2
+        return par->refclk_ps * par->pll_m * par->pll_pd1 * par->pll_pd2
                 / par->pll_n;
 }
 
@@ -357,7 +368,7 @@ static int gxt4500_set_par(struct fb_info *info)
         struct gxt4500_par *par = info->par;
         struct fb_var_screeninfo *var = &info->var;
         int err;
-        u32 ctrlreg;
+        u32 ctrlreg, tmp;
         unsigned int dfa_ctl, pixfmt, stride;
         unsigned int wid_tiles, i;
         unsigned int prefetch_pix, htot;
@@ -376,10 +387,25 @@ static int gxt4500_set_par(struct fb_info *info)
         writereg(par, DTG_CONTROL, ctrlreg);
 
         /* set PLL registers */
+        tmp = readreg(par, PLL_C) & ~0x7f;
+        if (par->pll_n < 38)
+                tmp |= 0x29;
+        if (par->pll_n < 69)
+                tmp |= 0x35;
+        else if (par->pll_n < 100)
+                tmp |= 0x76;
+        else
+                tmp |= 0x7e;
+        writereg(par, PLL_C, tmp);
         writereg(par, PLL_M, mdivtab[par->pll_m - 1]);
         writereg(par, PLL_N, ndivtab[par->pll_n - 2]);
-        writereg(par, PLL_POSTDIV,
-                 ((8 - par->pll_pd1) << 3) | (8 - par->pll_pd2));
+        tmp = ((8 - par->pll_pd2) << 3) | (8 - par->pll_pd1);
+        if (par->pll_pd1 == 8 || par->pll_pd2 == 8) {
+                /* work around erratum */
+                writereg(par, PLL_POSTDIV, tmp | 0x9);
+                udelay(1);
+        }
+        writereg(par, PLL_POSTDIV, tmp);
         msleep(20);
 
         /* turn off hardware cursor */
@@ -483,8 +509,8 @@ static int gxt4500_setcolreg(unsigned int reg, unsigned int red,
 
         if (reg > 1023)
                 return 1;
-        cmap_entry = ((transp & 0xff00) << 16) | ((blue & 0xff00) << 8) |
-                (green & 0xff00) | (red >> 8);
+        cmap_entry = ((transp & 0xff00) << 16) | ((red & 0xff00) << 8) |
+                (green & 0xff00) | (blue >> 8);
         writereg(par, CMAP + reg * 4, cmap_entry);
 
         if (reg < 16 && par->pixfmt != DFA_PIX_8BIT) {
@@ -585,6 +611,7 @@ static int __devinit gxt4500_probe(struct pci_dev *pdev,
         struct gxt4500_par *par;
         struct fb_info *info;
         struct fb_var_screeninfo var;
+        enum gxt_cards cardtype;
 
         err = pci_enable_device(pdev);
         if (err) {
@@ -613,7 +640,11 @@ static int __devinit gxt4500_probe(struct pci_dev *pdev,
                 goto err_free_fb;
         }
         par = info->par;
+        cardtype = ent->driver_data;
+        par->refclk_ps = cardinfo[cardtype].refclk_ps;
         info->fix = gxt4500_fix;
+        strlcpy(info->fix.id, cardinfo[cardtype].cardname,
+                sizeof(info->fix.id));
         info->pseudo_palette = par->pseudo_palette;
 
         info->fix.mmio_start = reg_phys;
@@ -703,8 +734,10 @@ static void __devexit gxt4500_remove(struct pci_dev *pdev)
 
 /* supported chipsets */
 static const struct pci_device_id gxt4500_pci_tbl[] = {
-        { PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_GXT4500P,
-          PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
+        { PCI_DEVICE(PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_GXT4500P),
+          .driver_data = GXT4500P },
+        { PCI_DEVICE(PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_GXT6000P),
+          .driver_data = GXT6000P },
         { 0 }
 };
 
@@ -735,7 +768,7 @@ static void __exit gxt4500_exit(void)
 module_exit(gxt4500_exit);
 
 MODULE_AUTHOR("Paul Mackerras <paulus@samba.org>");
-MODULE_DESCRIPTION("FBDev driver for IBM GXT4500P");
+MODULE_DESCRIPTION("FBDev driver for IBM GXT4500P/6000P");
 MODULE_LICENSE("GPL");
 module_param(mode_option, charp, 0);
 MODULE_PARM_DESC(mode_option, "Specify resolution as \"<xres>x<yres>[-<bpp>][@<refresh>]\"");
diff --git a/drivers/video/nvidia/nv_backlight.c b/drivers/video/nvidia/nv_backlight.c
index 5b75ae4e94..df934bd218 100644
--- a/drivers/video/nvidia/nv_backlight.c
+++ b/drivers/video/nvidia/nv_backlight.c
@@ -141,7 +141,7 @@ void nvidia_bl_init(struct nvidia_par *par)
 
         snprintf(name, sizeof(name), "nvidiabl%d", info->node);
 
-        bd = backlight_device_register(name, par, &nvidia_bl_data);
+        bd = backlight_device_register(name, info->dev, par, &nvidia_bl_data);
         if (IS_ERR(bd)) {
                 info->bl_dev = NULL;
                 printk(KERN_WARNING "nvidia: Backlight registration failed\n");
diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c
index 38eb0b69c2..b4947c8107 100644
--- a/drivers/video/pxafb.c
+++ b/drivers/video/pxafb.c
@@ -1216,7 +1216,7 @@ static int __init pxafb_parse_options(struct device *dev, char *options)
                 done:
                         if (res_specified) {
                                 dev_info(dev, "overriding resolution: %dx%d\n", xres, yres);
-                                inf->xres = xres; inf->yres = yres;
+                                inf->modes[0].xres = xres; inf->modes[0].yres = yres;
                         }
                         if (bpp_specified)
                                 switch (bpp) {
@@ -1225,48 +1225,48 @@ static int __init pxafb_parse_options(struct device *dev, char *options)
                                 case 4:
                                 case 8:
                                 case 16:
-                                        inf->bpp = bpp;
+                                        inf->modes[0].bpp = bpp;
                                         dev_info(dev, "overriding bit depth: %d\n", bpp);
                                         break;
                                 default:
                                         dev_err(dev, "Depth %d is not valid\n", bpp);
                                 }
                 } else if (!strncmp(this_opt, "pixclock:", 9)) {
-                        inf->pixclock = simple_strtoul(this_opt+9, NULL, 0);
-                        dev_info(dev, "override pixclock: %ld\n", inf->pixclock);
+                        inf->modes[0].pixclock = simple_strtoul(this_opt+9, NULL, 0);
+                        dev_info(dev, "override pixclock: %ld\n", inf->modes[0].pixclock);
                 } else if (!strncmp(this_opt, "left:", 5)) {
-                        inf->left_margin = simple_strtoul(this_opt+5, NULL, 0);
-                        dev_info(dev, "override left: %u\n", inf->left_margin);
+                        inf->modes[0].left_margin = simple_strtoul(this_opt+5, NULL, 0);
+                        dev_info(dev, "override left: %u\n", inf->modes[0].left_margin);
                 } else if (!strncmp(this_opt, "right:", 6)) {
-                        inf->right_margin = simple_strtoul(this_opt+6, NULL, 0);
-                        dev_info(dev, "override right: %u\n", inf->right_margin);
+                        inf->modes[0].right_margin = simple_strtoul(this_opt+6, NULL, 0);
+                        dev_info(dev, "override right: %u\n", inf->modes[0].right_margin);
                 } else if (!strncmp(this_opt, "upper:", 6)) {
-                        inf->upper_margin = simple_strtoul(this_opt+6, NULL, 0);
-                        dev_info(dev, "override upper: %u\n", inf->upper_margin);
+                        inf->modes[0].upper_margin = simple_strtoul(this_opt+6, NULL, 0);
+                        dev_info(dev, "override upper: %u\n", inf->modes[0].upper_margin);
                 } else if (!strncmp(this_opt, "lower:", 6)) {
-                        inf->lower_margin = simple_strtoul(this_opt+6, NULL, 0);
-                        dev_info(dev, "override lower: %u\n", inf->lower_margin);
+                        inf->modes[0].lower_margin = simple_strtoul(this_opt+6, NULL, 0);
+                        dev_info(dev, "override lower: %u\n", inf->modes[0].lower_margin);
                 } else if (!strncmp(this_opt, "hsynclen:", 9)) {
-                        inf->hsync_len = simple_strtoul(this_opt+9, NULL, 0);
-                        dev_info(dev, "override hsynclen: %u\n", inf->hsync_len);
+                        inf->modes[0].hsync_len = simple_strtoul(this_opt+9, NULL, 0);
+                        dev_info(dev, "override hsynclen: %u\n", inf->modes[0].hsync_len);
                 } else if (!strncmp(this_opt, "vsynclen:", 9)) {
-                        inf->vsync_len = simple_strtoul(this_opt+9, NULL, 0);
-                        dev_info(dev, "override vsynclen: %u\n", inf->vsync_len);
+                        inf->modes[0].vsync_len = simple_strtoul(this_opt+9, NULL, 0);
+                        dev_info(dev, "override vsynclen: %u\n", inf->modes[0].vsync_len);
                 } else if (!strncmp(this_opt, "hsync:", 6)) {
                         if (simple_strtoul(this_opt+6, NULL, 0) == 0) {
                                 dev_info(dev, "override hsync: Active Low\n");
-                                inf->sync &= ~FB_SYNC_HOR_HIGH_ACT;
+                                inf->modes[0].sync &= ~FB_SYNC_HOR_HIGH_ACT;
                         } else {
                                 dev_info(dev, "override hsync: Active High\n");
-                                inf->sync |= FB_SYNC_HOR_HIGH_ACT;
+                                inf->modes[0].sync |= FB_SYNC_HOR_HIGH_ACT;
                         }
                 } else if (!strncmp(this_opt, "vsync:", 6)) {
                         if (simple_strtoul(this_opt+6, NULL, 0) == 0) {
                                 dev_info(dev, "override vsync: Active Low\n");
-                                inf->sync &= ~FB_SYNC_VERT_HIGH_ACT;
+                                inf->modes[0].sync &= ~FB_SYNC_VERT_HIGH_ACT;
                         } else {
                                 dev_info(dev, "override vsync: Active High\n");
-                                inf->sync |= FB_SYNC_VERT_HIGH_ACT;
+                                inf->modes[0].sync |= FB_SYNC_VERT_HIGH_ACT;
                         }
                 } else if (!strncmp(this_opt, "dpc:", 4)) {
                         if (simple_strtoul(this_opt+4, NULL, 0) == 0) {
diff --git a/drivers/video/riva/fbdev.c b/drivers/video/riva/fbdev.c
index 345e8b1c1a..1a13966b7d 100644
--- a/drivers/video/riva/fbdev.c
+++ b/drivers/video/riva/fbdev.c
@@ -384,7 +384,7 @@ static void riva_bl_init(struct riva_par *par)
 
         snprintf(name, sizeof(name), "rivabl%d", info->node);
 
-        bd = backlight_device_register(name, par, &riva_bl_data);
+        bd = backlight_device_register(name, info->dev, par, &riva_bl_data);
         if (IS_ERR(bd)) {
                 info->bl_dev = NULL;
                 printk(KERN_WARNING "riva: Backlight registration failed\n");
diff --git a/drivers/video/sa1100fb.c b/drivers/video/sa1100fb.c
index cd10b18150..5d2a4a4b73 100644
--- a/drivers/video/sa1100fb.c
+++ b/drivers/video/sa1100fb.c
@@ -1200,9 +1200,9 @@ static void set_ctrlr_state(struct sa1100fb_info *fbi, u_int state)
  * Our LCD controller task (which is called when we blank or unblank)
  * via keventd.
  */
-static void sa1100fb_task(void *dummy)
+static void sa1100fb_task(struct work_struct *w)
 {
-        struct sa1100fb_info *fbi = dummy;
+        struct sa1100fb_info *fbi = container_of(w, struct sa1100fb_info, task);
         u_int state = xchg(&fbi->task_state, -1);
 
         set_ctrlr_state(fbi, state);
@@ -1444,7 +1444,7 @@ static struct sa1100fb_info * __init sa1100fb_init_fbinfo(struct device *dev)
                                           fbi->max_bpp / 8;
 
         init_waitqueue_head(&fbi->ctrlr_wait);
-        INIT_WORK(&fbi->task, sa1100fb_task, fbi);
+        INIT_WORK(&fbi->task, sa1100fb_task);
         init_MUTEX(&fbi->ctrlr_sem);
 
         return fbi;