317 files changed, 6683 insertions, 4473 deletions

diff --git a/drivers/Makefile b/drivers/Makefile
index d2dc01cc73e7..cfe38ffff28a 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -76,6 +76,7 @@ obj-$(CONFIG_MCA)		+= mca/
 obj-$(CONFIG_EISA)              += eisa/
 obj-$(CONFIG_LGUEST_GUEST)      += lguest/
 obj-$(CONFIG_CPU_FREQ)          += cpufreq/
+obj-$(CONFIG_CPU_IDLE)          += cpuidle/
 obj-$(CONFIG_MMC)               += mmc/
 obj-$(CONFIG_NEW_LEDS)          += leds/
 obj-$(CONFIG_INFINIBAND)        += infiniband/
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 4875f0149eb4..b83389145f28 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -88,7 +88,7 @@ config ACPI_PROC_EVENT
 
 config ACPI_AC
         tristate "AC Adapter"
-        depends on X86
+        depends on X86 && POWER_SUPPLY
         default y
         help
           This driver adds support for the AC Adapter object, which indicates
@@ -97,7 +97,7 @@ config ACPI_AC
 
 config ACPI_BATTERY
         tristate "Battery"
-        depends on X86
+        depends on X86 && POWER_SUPPLY
         default y
         help
           This driver adds support for battery information through
@@ -117,6 +117,7 @@ config ACPI_BUTTON
 config ACPI_VIDEO
         tristate "Video"
         depends on X86 && BACKLIGHT_CLASS_DEVICE && VIDEO_OUTPUT_CONTROL
+        depends on INPUT
         help
           This driver implement the ACPI Extensions For Display Adapters
           for integrated graphics devices on motherboard, as specified in
@@ -349,12 +350,11 @@ config ACPI_HOTPLUG_MEMORY
                 $>modprobe acpi_memhotplug 
 
 config ACPI_SBS
-        tristate "Smart Battery System (EXPERIMENTAL)"
+        tristate "Smart Battery System"
         depends on X86
-        depends on EXPERIMENTAL
+        depends on POWER_SUPPLY
         help
-          This driver adds support for the Smart Battery System.
-          A "Smart Battery" is quite old and quite rare compared
-          to today's ACPI "Control Method" battery.
+          This driver adds support for the Smart Battery System, another
+          type of access to battery information, found on some laptops.
 
 endif   # ACPI
diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile
index d4336f1730e9..54e3ab0e5fc0 100644
--- a/drivers/acpi/Makefile
+++ b/drivers/acpi/Makefile
@@ -60,3 +60,4 @@ obj-$(CONFIG_ACPI_TOSHIBA)	+= toshiba_acpi.o
 obj-$(CONFIG_ACPI_HOTPLUG_MEMORY)       += acpi_memhotplug.o
 obj-y                           += cm_sbs.o
 obj-$(CONFIG_ACPI_SBS)          += sbs.o
+obj-$(CONFIG_ACPI_SBS)          += sbshc.o
diff --git a/drivers/acpi/ac.c b/drivers/acpi/ac.c
index 26d70702b313..e03de37a750d 100644
--- a/drivers/acpi/ac.c
+++ b/drivers/acpi/ac.c
@@ -29,6 +29,7 @@
 #include <linux/types.h>
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
+#include <linux/power_supply.h>
 #include <acpi/acpi_bus.h>
 #include <acpi/acpi_drivers.h>
 
@@ -72,16 +73,37 @@ static struct acpi_driver acpi_ac_driver = {
 };
 
 struct acpi_ac {
+        struct power_supply charger;
         struct acpi_device * device;
         unsigned long state;
 };
 
+#define to_acpi_ac(x) container_of(x, struct acpi_ac, charger);
+
 static const struct file_operations acpi_ac_fops = {
         .open = acpi_ac_open_fs,
         .read = seq_read,
         .llseek = seq_lseek,
         .release = single_release,
 };
+static int get_ac_property(struct power_supply *psy,
+                           enum power_supply_property psp,
+                           union power_supply_propval *val)
+{
+        struct acpi_ac *ac = to_acpi_ac(psy);
+        switch (psp) {
+        case POWER_SUPPLY_PROP_ONLINE:
+                val->intval = ac->state;
+                break;
+        default:
+                return -EINVAL;
+        }
+        return 0;
+}
+
+static enum power_supply_property ac_props[] = {
+        POWER_SUPPLY_PROP_ONLINE,
+};
 
 /* --------------------------------------------------------------------------
                                AC Adapter Management
@@ -208,6 +230,7 @@ static void acpi_ac_notify(acpi_handle handle, u32 event, void *data)
                 acpi_bus_generate_netlink_event(device->pnp.device_class,
                                                   device->dev.bus_id, event,
                                                   (u32) ac->state);
+                kobject_uevent(&ac->charger.dev->kobj, KOBJ_CHANGE);
                 break;
         default:
                 ACPI_DEBUG_PRINT((ACPI_DB_INFO,
@@ -244,7 +267,12 @@ static int acpi_ac_add(struct acpi_device *device)
         result = acpi_ac_add_fs(device);
         if (result)
                 goto end;
-
+        ac->charger.name = acpi_device_bid(device);
+        ac->charger.type = POWER_SUPPLY_TYPE_MAINS;
+        ac->charger.properties = ac_props;
+        ac->charger.num_properties = ARRAY_SIZE(ac_props);
+        ac->charger.get_property = get_ac_property;
+        power_supply_register(&ac->device->dev, &ac->charger);
         status = acpi_install_notify_handler(device->handle,
                                              ACPI_ALL_NOTIFY, acpi_ac_notify,
                                              ac);
@@ -279,7 +307,8 @@ static int acpi_ac_remove(struct acpi_device *device, int type)
 
         status = acpi_remove_notify_handler(device->handle,
                                             ACPI_ALL_NOTIFY, acpi_ac_notify);
-
+        if (ac->charger.dev)
+                power_supply_unregister(&ac->charger);
         acpi_ac_remove_fs(device);
 
         kfree(ac);
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index 9b2c0f74f869..681e26b56b11 100644
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -1,6 +1,8 @@
 /*
- *  acpi_battery.c - ACPI Battery Driver ($Revision: 37 $)
+ *  battery.c - ACPI Battery Driver (Revision: 2.0)
  *
+ *  Copyright (C) 2007 Alexey Starikovskiy <astarikovskiy@suse.de>
+ *  Copyright (C) 2004-2007 Vladimir Lebedev <vladimir.p.lebedev@intel.com>
  *  Copyright (C) 2001, 2002 Andy Grover <andrew.grover@intel.com>
  *  Copyright (C) 2001, 2002 Paul Diefenbaugh <paul.s.diefenbaugh@intel.com>
  *
@@ -27,244 +29,288 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/types.h>
+#include <linux/jiffies.h>
+
+#ifdef CONFIG_ACPI_PROCFS
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
 #include <asm/uaccess.h>
+#endif
 
 #include <acpi/acpi_bus.h>
 #include <acpi/acpi_drivers.h>
 
-#define ACPI_BATTERY_VALUE_UNKNOWN 0xFFFFFFFF
+#include <linux/power_supply.h>
 
-#define ACPI_BATTERY_FORMAT_BIF "NNNNNNNNNSSSS"
-#define ACPI_BATTERY_FORMAT_BST "NNNN"
+#define ACPI_BATTERY_VALUE_UNKNOWN 0xFFFFFFFF
 
 #define ACPI_BATTERY_COMPONENT          0x00040000
 #define ACPI_BATTERY_CLASS              "battery"
 #define ACPI_BATTERY_DEVICE_NAME        "Battery"
 #define ACPI_BATTERY_NOTIFY_STATUS      0x80
 #define ACPI_BATTERY_NOTIFY_INFO        0x81
-#define ACPI_BATTERY_UNITS_WATTS        "mW"
-#define ACPI_BATTERY_UNITS_AMPS         "mA"
 
 #define _COMPONENT              ACPI_BATTERY_COMPONENT
 
-#define ACPI_BATTERY_UPDATE_TIME        0
-
-#define ACPI_BATTERY_NONE_UPDATE        0
-#define ACPI_BATTERY_EASY_UPDATE        1
-#define ACPI_BATTERY_INIT_UPDATE        2
-
 ACPI_MODULE_NAME("battery");
 
 MODULE_AUTHOR("Paul Diefenbaugh");
+MODULE_AUTHOR("Alexey Starikovskiy <astarikovskiy@suse.de>");
 MODULE_DESCRIPTION("ACPI Battery Driver");
 MODULE_LICENSE("GPL");
 
-static unsigned int update_time = ACPI_BATTERY_UPDATE_TIME;
-
-/* 0 - every time, > 0 - by update_time */
-module_param(update_time, uint, 0644);
+static unsigned int cache_time = 1000;
+module_param(cache_time, uint, 0644);
+MODULE_PARM_DESC(cache_time, "cache time in milliseconds");
 
+#ifdef CONFIG_ACPI_PROCFS
 extern struct proc_dir_entry *acpi_lock_battery_dir(void);
 extern void *acpi_unlock_battery_dir(struct proc_dir_entry *acpi_battery_dir);
 
-static int acpi_battery_add(struct acpi_device *device);
-static int acpi_battery_remove(struct acpi_device *device, int type);
-static int acpi_battery_resume(struct acpi_device *device);
+enum acpi_battery_files {
+        info_tag = 0,
+        state_tag,
+        alarm_tag,
+        ACPI_BATTERY_NUMFILES,
+};
+
+#endif
 
 static const struct acpi_device_id battery_device_ids[] = {
         {"PNP0C0A", 0},
         {"", 0},
 };
-MODULE_DEVICE_TABLE(acpi, battery_device_ids);
-
-static struct acpi_driver acpi_battery_driver = {
-        .name = "battery",
-        .class = ACPI_BATTERY_CLASS,
-        .ids = battery_device_ids,
-        .ops = {
-                .add = acpi_battery_add,
-                .resume = acpi_battery_resume,
-                .remove = acpi_battery_remove,
-                },
-};
 
-struct acpi_battery_state {
-        acpi_integer state;
-        acpi_integer present_rate;
-        acpi_integer remaining_capacity;
-        acpi_integer present_voltage;
-};
-
-struct acpi_battery_info {
-        acpi_integer power_unit;
-        acpi_integer design_capacity;
-        acpi_integer last_full_capacity;
-        acpi_integer battery_technology;
-        acpi_integer design_voltage;
-        acpi_integer design_capacity_warning;
-        acpi_integer design_capacity_low;
-        acpi_integer battery_capacity_granularity_1;
-        acpi_integer battery_capacity_granularity_2;
-        acpi_string model_number;
-        acpi_string serial_number;
-        acpi_string battery_type;
-        acpi_string oem_info;
-};
-
-enum acpi_battery_files{
-        ACPI_BATTERY_INFO = 0,
-        ACPI_BATTERY_STATE,
-        ACPI_BATTERY_ALARM,
-        ACPI_BATTERY_NUMFILES,
-};
+MODULE_DEVICE_TABLE(acpi, battery_device_ids);
 
-struct acpi_battery_flags {
-        u8 battery_present_prev;
-        u8 alarm_present;
-        u8 init_update;
-        u8 update[ACPI_BATTERY_NUMFILES];
-        u8 power_unit;
-};
 
 struct acpi_battery {
-        struct mutex mutex;
+        struct mutex lock;
+        struct power_supply bat;
         struct acpi_device *device;
-        struct acpi_battery_flags flags;
-        struct acpi_buffer bif_data;
-        struct acpi_buffer bst_data;
-        unsigned long alarm;
-        unsigned long update_time[ACPI_BATTERY_NUMFILES];
+        unsigned long update_time;
+        int current_now;
+        int capacity_now;
+        int voltage_now;
+        int design_capacity;
+        int full_charge_capacity;
+        int technology;
+        int design_voltage;
+        int design_capacity_warning;
+        int design_capacity_low;
+        int capacity_granularity_1;
+        int capacity_granularity_2;
+        int alarm;
+        char model_number[32];
+        char serial_number[32];
+        char type[32];
+        char oem_info[32];
+        int state;
+        int power_unit;
+        u8 alarm_present;
 };
 
+#define to_acpi_battery(x) container_of(x, struct acpi_battery, bat);
+
 inline int acpi_battery_present(struct acpi_battery *battery)
 {
         return battery->device->status.battery_present;
 }
-inline char *acpi_battery_power_units(struct acpi_battery *battery)
-{
-        if (battery->flags.power_unit)
-                return ACPI_BATTERY_UNITS_AMPS;
-        else
-                return ACPI_BATTERY_UNITS_WATTS;
-}
 
-inline acpi_handle acpi_battery_handle(struct acpi_battery *battery)
+static int acpi_battery_technology(struct acpi_battery *battery)
 {
-        return battery->device->handle;
+        if (!strcasecmp("NiCd", battery->type))
+                return POWER_SUPPLY_TECHNOLOGY_NiCd;
+        if (!strcasecmp("NiMH", battery->type))
+                return POWER_SUPPLY_TECHNOLOGY_NiMH;
+        if (!strcasecmp("LION", battery->type))
+                return POWER_SUPPLY_TECHNOLOGY_LION;
+        if (!strcasecmp("LiP", battery->type))
+                return POWER_SUPPLY_TECHNOLOGY_LIPO;
+        return POWER_SUPPLY_TECHNOLOGY_UNKNOWN;
 }
 
-/* --------------------------------------------------------------------------
-                               Battery Management
-   -------------------------------------------------------------------------- */
-
-static void acpi_battery_check_result(struct acpi_battery *battery, int result)
+static int acpi_battery_get_property(struct power_supply *psy,
+                                     enum power_supply_property psp,
+                                     union power_supply_propval *val)
 {
-        if (!battery)
-                return;
+        struct acpi_battery *battery = to_acpi_battery(psy);
 
-        if (result) {
-                battery->flags.init_update = 1;
+        if ((!acpi_battery_present(battery)) &&
+             psp != POWER_SUPPLY_PROP_PRESENT)
+                return -ENODEV;
+        switch (psp) {
+        case POWER_SUPPLY_PROP_STATUS:
+                if (battery->state & 0x01)
+                        val->intval = POWER_SUPPLY_STATUS_DISCHARGING;
+                else if (battery->state & 0x02)
+                        val->intval = POWER_SUPPLY_STATUS_CHARGING;
+                else if (battery->state == 0)
+                        val->intval = POWER_SUPPLY_STATUS_FULL;
+                break;
+        case POWER_SUPPLY_PROP_PRESENT:
+                val->intval = acpi_battery_present(battery);
+                break;
+        case POWER_SUPPLY_PROP_TECHNOLOGY:
+                val->intval = acpi_battery_technology(battery);
+                break;
+        case POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN:
+                val->intval = battery->design_voltage * 1000;
+                break;
+        case POWER_SUPPLY_PROP_VOLTAGE_NOW:
+                val->intval = battery->voltage_now * 1000;
+                break;
+        case POWER_SUPPLY_PROP_CURRENT_NOW:
+                val->intval = battery->current_now * 1000;
+                break;
+        case POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN:
+        case POWER_SUPPLY_PROP_ENERGY_FULL_DESIGN:
+                val->intval = battery->design_capacity * 1000;
+                break;
+        case POWER_SUPPLY_PROP_CHARGE_FULL:
+        case POWER_SUPPLY_PROP_ENERGY_FULL:
+                val->intval = battery->full_charge_capacity * 1000;
+                break;
+        case POWER_SUPPLY_PROP_CHARGE_NOW:
+        case POWER_SUPPLY_PROP_ENERGY_NOW:
+                val->intval = battery->capacity_now * 1000;
+                break;
+        case POWER_SUPPLY_PROP_MODEL_NAME:
+                val->strval = battery->model_number;
+                break;
+        case POWER_SUPPLY_PROP_MANUFACTURER:
+                val->strval = battery->oem_info;
+                break;
+        default:
+                return -EINVAL;
         }
+        return 0;
 }
 
-static int acpi_battery_extract_package(struct acpi_battery *battery,
-                                        union acpi_object *package,
-                                        struct acpi_buffer *format,
-                                        struct acpi_buffer *data,
-                                        char *package_name)
+static enum power_supply_property charge_battery_props[] = {
+        POWER_SUPPLY_PROP_STATUS,
+        POWER_SUPPLY_PROP_PRESENT,
+        POWER_SUPPLY_PROP_TECHNOLOGY,
+        POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN,
+        POWER_SUPPLY_PROP_VOLTAGE_NOW,
+        POWER_SUPPLY_PROP_CURRENT_NOW,
+        POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN,
+        POWER_SUPPLY_PROP_CHARGE_FULL,
+        POWER_SUPPLY_PROP_CHARGE_NOW,
+        POWER_SUPPLY_PROP_MODEL_NAME,
+        POWER_SUPPLY_PROP_MANUFACTURER,
+};
+
+static enum power_supply_property energy_battery_props[] = {
+        POWER_SUPPLY_PROP_STATUS,
+        POWER_SUPPLY_PROP_PRESENT,
+        POWER_SUPPLY_PROP_TECHNOLOGY,
+        POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN,
+        POWER_SUPPLY_PROP_VOLTAGE_NOW,
+        POWER_SUPPLY_PROP_CURRENT_NOW,
+        POWER_SUPPLY_PROP_ENERGY_FULL_DESIGN,
+        POWER_SUPPLY_PROP_ENERGY_FULL,
+        POWER_SUPPLY_PROP_ENERGY_NOW,
+        POWER_SUPPLY_PROP_MODEL_NAME,
+        POWER_SUPPLY_PROP_MANUFACTURER,
+};
+
+#ifdef CONFIG_ACPI_PROCFS
+inline char *acpi_battery_units(struct acpi_battery *battery)
 {
-        acpi_status status = AE_OK;
-        struct acpi_buffer data_null = { 0, NULL };
+        return (battery->power_unit)?"mA":"mW";
+}
+#endif
 
-        status = acpi_extract_package(package, format, &data_null);
-        if (status != AE_BUFFER_OVERFLOW) {
-                ACPI_EXCEPTION((AE_INFO, status, "Extracting size %s",
-                                package_name));
-                return -ENODEV;
-        }
+/* --------------------------------------------------------------------------
+                               Battery Management
+   -------------------------------------------------------------------------- */
+struct acpi_offsets {
+        size_t offset;          /* offset inside struct acpi_sbs_battery */
+        u8 mode;                /* int or string? */
+};
 
-        if (data_null.length != data->length) {
-                kfree(data->pointer);
-                data->pointer = kzalloc(data_null.length, GFP_KERNEL);
-                if (!data->pointer) {
-                        ACPI_EXCEPTION((AE_INFO, AE_NO_MEMORY, "kzalloc()"));
-                        return -ENOMEM;
-                }
-                data->length = data_null.length;
-        }
+static struct acpi_offsets state_offsets[] = {
+        {offsetof(struct acpi_battery, state), 0},
+        {offsetof(struct acpi_battery, current_now), 0},
+        {offsetof(struct acpi_battery, capacity_now), 0},
+        {offsetof(struct acpi_battery, voltage_now), 0},
+};
 
-        status = acpi_extract_package(package, format, data);
-        if (ACPI_FAILURE(status)) {
-                ACPI_EXCEPTION((AE_INFO, status, "Extracting %s",
-                                package_name));
-                return -ENODEV;
-        }
+static struct acpi_offsets info_offsets[] = {
+        {offsetof(struct acpi_battery, power_unit), 0},
+        {offsetof(struct acpi_battery, design_capacity), 0},
+        {offsetof(struct acpi_battery, full_charge_capacity), 0},
+        {offsetof(struct acpi_battery, technology), 0},
+        {offsetof(struct acpi_battery, design_voltage), 0},
+        {offsetof(struct acpi_battery, design_capacity_warning), 0},
+        {offsetof(struct acpi_battery, design_capacity_low), 0},
+        {offsetof(struct acpi_battery, capacity_granularity_1), 0},
+        {offsetof(struct acpi_battery, capacity_granularity_2), 0},
+        {offsetof(struct acpi_battery, model_number), 1},
+        {offsetof(struct acpi_battery, serial_number), 1},
+        {offsetof(struct acpi_battery, type), 1},
+        {offsetof(struct acpi_battery, oem_info), 1},
+};
 
+static int extract_package(struct acpi_battery *battery,
+                           union acpi_object *package,
+                           struct acpi_offsets *offsets, int num)
+{
+        int i, *x;
+        union acpi_object *element;
+        if (package->type != ACPI_TYPE_PACKAGE)
+                return -EFAULT;
+        for (i = 0; i < num; ++i) {
+                if (package->package.count <= i)
+                        return -EFAULT;
+                element = &package->package.elements[i];
+                if (offsets[i].mode) {
+                        if (element->type != ACPI_TYPE_STRING &&
+                            element->type != ACPI_TYPE_BUFFER)
+                                return -EFAULT;
+                        strncpy((u8 *)battery + offsets[i].offset,
+                                element->string.pointer, 32);
+                } else {
+                        if (element->type != ACPI_TYPE_INTEGER)
+                                return -EFAULT;
+                        x = (int *)((u8 *)battery + offsets[i].offset);
+                        *x = element->integer.value;
+                }
+        }
         return 0;
 }
 
 static int acpi_battery_get_status(struct acpi_battery *battery)
 {
-        int result = 0;
-
-        result = acpi_bus_get_status(battery->device);
-        if (result) {
+        if (acpi_bus_get_status(battery->device)) {
                 ACPI_EXCEPTION((AE_INFO, AE_ERROR, "Evaluating _STA"));
                 return -ENODEV;
         }
-        return result;
+        return 0;
 }
 
 static int acpi_battery_get_info(struct acpi_battery *battery)
 {
-        int result = 0;
+        int result = -EFAULT;
         acpi_status status = 0;
         struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
-        struct acpi_buffer format = { sizeof(ACPI_BATTERY_FORMAT_BIF),
-                ACPI_BATTERY_FORMAT_BIF
-        };
-        union acpi_object *package = NULL;
-        struct acpi_buffer *data = NULL;
-        struct acpi_battery_info *bif = NULL;
-
-        battery->update_time[ACPI_BATTERY_INFO] = get_seconds();
 
         if (!acpi_battery_present(battery))
                 return 0;
+        mutex_lock(&battery->lock);
+        status = acpi_evaluate_object(battery->device->handle, "_BIF",
+                                      NULL, &buffer);
+        mutex_unlock(&battery->lock);
 
-        /* Evaluate _BIF */
-
-        status =
-            acpi_evaluate_object(acpi_battery_handle(battery), "_BIF", NULL,
-                                 &buffer);
         if (ACPI_FAILURE(status)) {
                 ACPI_EXCEPTION((AE_INFO, status, "Evaluating _BIF"));
                 return -ENODEV;
         }
 
-        package = buffer.pointer;
-
-        data = &battery->bif_data;
-
-        /* Extract Package Data */
-
-        result =
-            acpi_battery_extract_package(battery, package, &format, data,
-                                         "_BIF");
-        if (result)
-                goto end;
-
-      end:
-
+        result = extract_package(battery, buffer.pointer,
+                                 info_offsets, ARRAY_SIZE(info_offsets));
         kfree(buffer.pointer);
-
-        if (!result) {
-                bif = data->pointer;
-                battery->flags.power_unit = bif->power_unit;
-        }
-
         return result;
 }
 
@@ -273,342 +319,203 @@ static int acpi_battery_get_state(struct acpi_battery *battery)
         int result = 0;
         acpi_status status = 0;
         struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
-        struct acpi_buffer format = { sizeof(ACPI_BATTERY_FORMAT_BST),
-                ACPI_BATTERY_FORMAT_BST
-        };
-        union acpi_object *package = NULL;
-        struct acpi_buffer *data = NULL;
-
-        battery->update_time[ACPI_BATTERY_STATE] = get_seconds();
 
         if (!acpi_battery_present(battery))
                 return 0;
 
-        /* Evaluate _BST */
+        if (battery->update_time &&
+            time_before(jiffies, battery->update_time +
+                        msecs_to_jiffies(cache_time)))
+                return 0;
+
+        mutex_lock(&battery->lock);
+        status = acpi_evaluate_object(battery->device->handle, "_BST",
+                                      NULL, &buffer);
+        mutex_unlock(&battery->lock);
 
-        status =
-            acpi_evaluate_object(acpi_battery_handle(battery), "_BST", NULL,
-                                 &buffer);
         if (ACPI_FAILURE(status)) {
                 ACPI_EXCEPTION((AE_INFO, status, "Evaluating _BST"));
                 return -ENODEV;
         }
 
-        package = buffer.pointer;
-
-        data = &battery->bst_data;
-
-        /* Extract Package Data */
-
-        result =
-            acpi_battery_extract_package(battery, package, &format, data,
-                                         "_BST");
-        if (result)
-                goto end;
-
-      end:
+        result = extract_package(battery, buffer.pointer,
+                                 state_offsets, ARRAY_SIZE(state_offsets));
+        battery->update_time = jiffies;
         kfree(buffer.pointer);
-
         return result;
 }
 
-static int acpi_battery_get_alarm(struct acpi_battery *battery)
-{
-        battery->update_time[ACPI_BATTERY_ALARM] = get_seconds();
-
-        return 0;
-}
-
-static int acpi_battery_set_alarm(struct acpi_battery *battery,
-                                  unsigned long alarm)
+static int acpi_battery_set_alarm(struct acpi_battery *battery)
 {
         acpi_status status = 0;
-        union acpi_object arg0 = { ACPI_TYPE_INTEGER };
+        union acpi_object arg0 = { .type = ACPI_TYPE_INTEGER };
         struct acpi_object_list arg_list = { 1, &arg0 };
 
-        battery->update_time[ACPI_BATTERY_ALARM] = get_seconds();
-
-        if (!acpi_battery_present(battery))
+        if (!acpi_battery_present(battery)|| !battery->alarm_present)
                 return -ENODEV;
 
-        if (!battery->flags.alarm_present)
-                return -ENODEV;
-
-        arg0.integer.value = alarm;
+        arg0.integer.value = battery->alarm;
 
-        status =
-            acpi_evaluate_object(acpi_battery_handle(battery), "_BTP",
+        mutex_lock(&battery->lock);
+        status = acpi_evaluate_object(battery->device->handle, "_BTP",
                                  &arg_list, NULL);
+        mutex_unlock(&battery->lock);
+
         if (ACPI_FAILURE(status))
                 return -ENODEV;
 
-        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Alarm set to %d\n", (u32) alarm));
-
-        battery->alarm = alarm;
-
+        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Alarm set to %d\n", battery->alarm));
         return 0;
 }
 
 static int acpi_battery_init_alarm(struct acpi_battery *battery)
 {
-        int result = 0;
         acpi_status status = AE_OK;
         acpi_handle handle = NULL;
-        struct acpi_battery_info *bif = battery->bif_data.pointer;
-        unsigned long alarm = battery->alarm;
 
         /* See if alarms are supported, and if so, set default */
-
-        status = acpi_get_handle(acpi_battery_handle(battery), "_BTP", &handle);
-        if (ACPI_SUCCESS(status)) {
-                battery->flags.alarm_present = 1;
-                if (!alarm && bif) {
-                        alarm = bif->design_capacity_warning;
-                }
-                result = acpi_battery_set_alarm(battery, alarm);
-                if (result)
-                        goto end;
-        } else {
-                battery->flags.alarm_present = 0;
+        status = acpi_get_handle(battery->device->handle, "_BTP", &handle);
+        if (ACPI_FAILURE(status)) {
+                battery->alarm_present = 0;
+                return 0;
         }
-
-      end:
-
-        return result;
+        battery->alarm_present = 1;
+        if (!battery->alarm)
+                battery->alarm = battery->design_capacity_warning;
+        return acpi_battery_set_alarm(battery);
 }
 
-static int acpi_battery_init_update(struct acpi_battery *battery)
+static int acpi_battery_update(struct acpi_battery *battery)
 {
-        int result = 0;
-
-        result = acpi_battery_get_status(battery);
-        if (result)
+        int saved_present = acpi_battery_present(battery);
+        int result = acpi_battery_get_status(battery);
+        if (result || !acpi_battery_present(battery))
                 return result;
-
-        battery->flags.battery_present_prev = acpi_battery_present(battery);
-
-        if (acpi_battery_present(battery)) {
+        if (saved_present != acpi_battery_present(battery) ||
+            !battery->update_time) {
+                battery->update_time = 0;
                 result = acpi_battery_get_info(battery);
                 if (result)
                         return result;
-                result = acpi_battery_get_state(battery);
-                if (result)
-                        return result;
-
-                acpi_battery_init_alarm(battery);
-        }
-
-        return result;
-}
-
-static int acpi_battery_update(struct acpi_battery *battery,
-                               int update, int *update_result_ptr)
-{
-        int result = 0;
-        int update_result = ACPI_BATTERY_NONE_UPDATE;
-
-        if (!acpi_battery_present(battery)) {
-                update = 1;
-        }
-
-        if (battery->flags.init_update) {
-                result = acpi_battery_init_update(battery);
-                if (result)
-                        goto end;
-                update_result = ACPI_BATTERY_INIT_UPDATE;
-        } else if (update) {
-                result = acpi_battery_get_status(battery);
-                if (result)
-                        goto end;
-                if ((!battery->flags.battery_present_prev & acpi_battery_present(battery))
-                    || (battery->flags.battery_present_prev & !acpi_battery_present(battery))) {
-                        result = acpi_battery_init_update(battery);
-                        if (result)
-                                goto end;
-                        update_result = ACPI_BATTERY_INIT_UPDATE;
+                if (battery->power_unit) {
+                        battery->bat.properties = charge_battery_props;
+                        battery->bat.num_properties =
+                                ARRAY_SIZE(charge_battery_props);
                 } else {
-                        update_result = ACPI_BATTERY_EASY_UPDATE;
+                        battery->bat.properties = energy_battery_props;
+                        battery->bat.num_properties =
+                                ARRAY_SIZE(energy_battery_props);
                 }
+                acpi_battery_init_alarm(battery);
         }
-
-      end:
-
-        battery->flags.init_update = (result != 0);
-
-        *update_result_ptr = update_result;
-
-        return result;
-}
-
-static void acpi_battery_notify_update(struct acpi_battery *battery)
-{
-        acpi_battery_get_status(battery);
-
-        if (battery->flags.init_update) {
-                return;
-        }
-
-        if ((!battery->flags.battery_present_prev &
-             acpi_battery_present(battery)) ||
-            (battery->flags.battery_present_prev &
-             !acpi_battery_present(battery))) {
-                battery->flags.init_update = 1;
-        } else {
-                battery->flags.update[ACPI_BATTERY_INFO] = 1;
-                battery->flags.update[ACPI_BATTERY_STATE] = 1;
-                battery->flags.update[ACPI_BATTERY_ALARM] = 1;
-        }
+        return acpi_battery_get_state(battery);
 }
 
 /* --------------------------------------------------------------------------
                               FS Interface (/proc)
    -------------------------------------------------------------------------- */
 
+#ifdef CONFIG_ACPI_PROCFS
 static struct proc_dir_entry *acpi_battery_dir;
 
 static int acpi_battery_print_info(struct seq_file *seq, int result)
 {
         struct acpi_battery *battery = seq->private;
-        struct acpi_battery_info *bif = NULL;
-        char *units = "?";
 
         if (result)
                 goto end;
 
-        if (acpi_battery_present(battery))
-                seq_printf(seq, "present:                 yes\n");
-        else {
-                seq_printf(seq, "present:                 no\n");
-                goto end;
-        }
-
-        bif = battery->bif_data.pointer;
-        if (!bif) {
-                ACPI_EXCEPTION((AE_INFO, AE_ERROR, "BIF buffer is NULL"));
-                result = -ENODEV;
+        seq_printf(seq, "present:                 %s\n",
+                   acpi_battery_present(battery)?"yes":"no");
+        if (!acpi_battery_present(battery))
                 goto end;
-        }
-
-        /* Battery Units */
-
-        units = acpi_battery_power_units(battery);
-
-        if (bif->design_capacity == ACPI_BATTERY_VALUE_UNKNOWN)
+        if (battery->design_capacity == ACPI_BATTERY_VALUE_UNKNOWN)
                 seq_printf(seq, "design capacity:         unknown\n");
         else
                 seq_printf(seq, "design capacity:         %d %sh\n",
-                           (u32) bif->design_capacity, units);
+                           battery->design_capacity,
+                           acpi_battery_units(battery));
 
-        if (bif->last_full_capacity == ACPI_BATTERY_VALUE_UNKNOWN)
+        if (battery->full_charge_capacity == ACPI_BATTERY_VALUE_UNKNOWN)
                 seq_printf(seq, "last full capacity:      unknown\n");
         else
                 seq_printf(seq, "last full capacity:      %d %sh\n",
-                           (u32) bif->last_full_capacity, units);
+                           battery->full_charge_capacity,
+                           acpi_battery_units(battery));
 
-        switch ((u32) bif->battery_technology) {
-        case 0:
-                seq_printf(seq, "battery technology:      non-rechargeable\n");
-                break;
-        case 1:
-                seq_printf(seq, "battery technology:      rechargeable\n");
-                break;
-        default:
-                seq_printf(seq, "battery technology:      unknown\n");
-                break;
-        }
+        seq_printf(seq, "battery technology:      %srechargeable\n",
+                   (!battery->technology)?"non-":"");
 
-        if (bif->design_voltage == ACPI_BATTERY_VALUE_UNKNOWN)
+        if (battery->design_voltage == ACPI_BATTERY_VALUE_UNKNOWN)
                 seq_printf(seq, "design voltage:          unknown\n");
         else
                 seq_printf(seq, "design voltage:          %d mV\n",
-                           (u32) bif->design_voltage);
+                           battery->design_voltage);
         seq_printf(seq, "design capacity warning: %d %sh\n",
-                   (u32) bif->design_capacity_warning, units);
+                   battery->design_capacity_warning,
+                   acpi_battery_units(battery));
         seq_printf(seq, "design capacity low:     %d %sh\n",
-                   (u32) bif->design_capacity_low, units);
+                   battery->design_capacity_low,
+                   acpi_battery_units(battery));
         seq_printf(seq, "capacity granularity 1:  %d %sh\n",
-                   (u32) bif->battery_capacity_granularity_1, units);
+                   battery->capacity_granularity_1,
+                   acpi_battery_units(battery));
         seq_printf(seq, "capacity granularity 2:  %d %sh\n",
-                   (u32) bif->battery_capacity_granularity_2, units);
-        seq_printf(seq, "model number:            %s\n", bif->model_number);
-        seq_printf(seq, "serial number:           %s\n", bif->serial_number);
-        seq_printf(seq, "battery type:            %s\n", bif->battery_type);
-        seq_printf(seq, "OEM info:                %s\n", bif->oem_info);
-
+                   battery->capacity_granularity_2,
+                   acpi_battery_units(battery));
+        seq_printf(seq, "model number:            %s\n", battery->model_number);
+        seq_printf(seq, "serial number:           %s\n", battery->serial_number);
+        seq_printf(seq, "battery type:            %s\n", battery->type);
+        seq_printf(seq, "OEM info:                %s\n", battery->oem_info);
       end:
-
         if (result)
                 seq_printf(seq, "ERROR: Unable to read battery info\n");
-
         return result;
 }
 
 static int acpi_battery_print_state(struct seq_file *seq, int result)
 {
         struct acpi_battery *battery = seq->private;
-        struct acpi_battery_state *bst = NULL;
-        char *units = "?";
 
         if (result)
                 goto end;
 
-        if (acpi_battery_present(battery))
-                seq_printf(seq, "present:                 yes\n");
-        else {
-                seq_printf(seq, "present:                 no\n");
-                goto end;
-        }
-
-        bst = battery->bst_data.pointer;
-        if (!bst) {
-                ACPI_EXCEPTION((AE_INFO, AE_ERROR, "BST buffer is NULL"));
-                result = -ENODEV;
+        seq_printf(seq, "present:                 %s\n",
+                   acpi_battery_present(battery)?"yes":"no");
+        if (!acpi_battery_present(battery))
                 goto end;
-        }
-
-        /* Battery Units */
-
-        units = acpi_battery_power_units(battery);
-
-        if (!(bst->state & 0x04))
-                seq_printf(seq, "capacity state:          ok\n");
-        else
-                seq_printf(seq, "capacity state:          critical\n");
 
-        if ((bst->state & 0x01) && (bst->state & 0x02)) {
+        seq_printf(seq, "capacity state:          %s\n",
+                        (battery->state & 0x04)?"critical":"ok");
+        if ((battery->state & 0x01) && (battery->state & 0x02))
                 seq_printf(seq,
                            "charging state:          charging/discharging\n");
-        } else if (bst->state & 0x01)
+        else if (battery->state & 0x01)
                 seq_printf(seq, "charging state:          discharging\n");
-        else if (bst->state & 0x02)
+        else if (battery->state & 0x02)
                 seq_printf(seq, "charging state:          charging\n");
-        else {
+        else
                 seq_printf(seq, "charging state:          charged\n");
-        }
 
-        if (bst->present_rate == ACPI_BATTERY_VALUE_UNKNOWN)
+        if (battery->current_now == ACPI_BATTERY_VALUE_UNKNOWN)
                 seq_printf(seq, "present rate:            unknown\n");
         else
                 seq_printf(seq, "present rate:            %d %s\n",
-                           (u32) bst->present_rate, units);
+                           battery->current_now, acpi_battery_units(battery));
 
-        if (bst->remaining_capacity == ACPI_BATTERY_VALUE_UNKNOWN)
+        if (battery->capacity_now == ACPI_BATTERY_VALUE_UNKNOWN)
                 seq_printf(seq, "remaining capacity:      unknown\n");
         else
                 seq_printf(seq, "remaining capacity:      %d %sh\n",
-                           (u32) bst->remaining_capacity, units);
-
-        if (bst->present_voltage == ACPI_BATTERY_VALUE_UNKNOWN)
+                           battery->capacity_now, acpi_battery_units(battery));
+        if (battery->voltage_now == ACPI_BATTERY_VALUE_UNKNOWN)
                 seq_printf(seq, "present voltage:         unknown\n");
         else
                 seq_printf(seq, "present voltage:         %d mV\n",
-                           (u32) bst->present_voltage);
-
+                           battery->voltage_now);
       end:
-
-        if (result) {
+        if (result)
                 seq_printf(seq, "ERROR: Unable to read battery state\n");
-        }
 
         return result;
 }
@@ -616,7 +523,6 @@ static int acpi_battery_print_state(struct seq_file *seq, int result)
 static int acpi_battery_print_alarm(struct seq_file *seq, int result)
 {
         struct acpi_battery *battery = seq->private;
-        char *units = "?";
 
         if (result)
                 goto end;
@@ -625,189 +531,121 @@ static int acpi_battery_print_alarm(struct seq_file *seq, int result)
                 seq_printf(seq, "present:                 no\n");
                 goto end;
         }
-
-        /* Battery Units */
-
-        units = acpi_battery_power_units(battery);
-
         seq_printf(seq, "alarm:                   ");
         if (!battery->alarm)
                 seq_printf(seq, "unsupported\n");
         else
-                seq_printf(seq, "%lu %sh\n", battery->alarm, units);
-
+                seq_printf(seq, "%u %sh\n", battery->alarm,
+                                acpi_battery_units(battery));
       end:
-
         if (result)
                 seq_printf(seq, "ERROR: Unable to read battery alarm\n");
-
         return result;
 }
 
-static ssize_t
-acpi_battery_write_alarm(struct file *file,
-                         const char __user * buffer,
-                         size_t count, loff_t * ppos)
+static ssize_t acpi_battery_write_alarm(struct file *file,
+                                        const char __user * buffer,
+                                        size_t count, loff_t * ppos)
 {
         int result = 0;
         char alarm_string[12] = { '\0' };
         struct seq_file *m = file->private_data;
         struct acpi_battery *battery = m->private;
-        int update_result = ACPI_BATTERY_NONE_UPDATE;
 
         if (!battery || (count > sizeof(alarm_string) - 1))
                 return -EINVAL;
-
-        mutex_lock(&battery->mutex);
-
-        result = acpi_battery_update(battery, 1, &update_result);
         if (result) {
                 result = -ENODEV;
                 goto end;
         }
-
         if (!acpi_battery_present(battery)) {
                 result = -ENODEV;
                 goto end;
         }
-
         if (copy_from_user(alarm_string, buffer, count)) {
                 result = -EFAULT;
                 goto end;
         }
-
         alarm_string[count] = '\0';
-
-        result = acpi_battery_set_alarm(battery,
-                                        simple_strtoul(alarm_string, NULL, 0));
-        if (result)
-                goto end;
-
+        battery->alarm = simple_strtol(alarm_string, NULL, 0);
+        result = acpi_battery_set_alarm(battery);
       end:
-
-        acpi_battery_check_result(battery, result);
-
         if (!result)
-                result = count;
-
-        mutex_unlock(&battery->mutex);
-
+                return count;
         return result;
 }
 
 typedef int(*print_func)(struct seq_file *seq, int result);
-typedef int(*get_func)(struct acpi_battery *battery);
-
-static struct acpi_read_mux {
-        print_func print;
-        get_func get;
-} acpi_read_funcs[ACPI_BATTERY_NUMFILES] = {
-        {.get = acpi_battery_get_info, .print = acpi_battery_print_info},
-        {.get = acpi_battery_get_state, .print = acpi_battery_print_state},
-        {.get = acpi_battery_get_alarm, .print = acpi_battery_print_alarm},
+
+static print_func acpi_print_funcs[ACPI_BATTERY_NUMFILES] = {
+        acpi_battery_print_info,
+        acpi_battery_print_state,
+        acpi_battery_print_alarm,
 };
 
 static int acpi_battery_read(int fid, struct seq_file *seq)
 {
         struct acpi_battery *battery = seq->private;
-        int result = 0;
-        int update_result = ACPI_BATTERY_NONE_UPDATE;
-        int update = 0;
-
-        mutex_lock(&battery->mutex);
-
-        update = (get_seconds() - battery->update_time[fid] >= update_time);
-        update = (update | battery->flags.update[fid]);
-
-        result = acpi_battery_update(battery, update, &update_result);
-        if (result)
-                goto end;
-
-        if (update_result == ACPI_BATTERY_EASY_UPDATE) {
-                result = acpi_read_funcs[fid].get(battery);
-                if (result)
-                        goto end;
+        int result = acpi_battery_update(battery);
+        return acpi_print_funcs[fid](seq, result);
+}
+
+#define DECLARE_FILE_FUNCTIONS(_name) \
+static int acpi_battery_read_##_name(struct seq_file *seq, void *offset) \
+{ \
+        return acpi_battery_read(_name##_tag, seq); \
+} \
+static int acpi_battery_##_name##_open_fs(struct inode *inode, struct file *file) \
+{ \
+        return single_open(file, acpi_battery_read_##_name, PDE(inode)->data); \
+}
+
+DECLARE_FILE_FUNCTIONS(info);
+DECLARE_FILE_FUNCTIONS(state);
+DECLARE_FILE_FUNCTIONS(alarm);
+
+#undef DECLARE_FILE_FUNCTIONS
+
+#define FILE_DESCRIPTION_RO(_name) \
+        { \
+        .name = __stringify(_name), \
+        .mode = S_IRUGO, \
+        .ops = { \
+                .open = acpi_battery_##_name##_open_fs, \
+                .read = seq_read, \
+                .llseek = seq_lseek, \
+                .release = single_release, \
+                .owner = THIS_MODULE, \
+                }, \
+        }
+
+#define FILE_DESCRIPTION_RW(_name) \
+        { \
+        .name = __stringify(_name), \
+        .mode = S_IFREG | S_IRUGO | S_IWUSR, \
+        .ops = { \
+                .open = acpi_battery_##_name##_open_fs, \
+                .read = seq_read, \
+                .llseek = seq_lseek, \
+                .write = acpi_battery_write_##_name, \
+                .release = single_release, \
+                .owner = THIS_MODULE, \
+                }, \
         }
 
-      end:
-        result = acpi_read_funcs[fid].print(seq, result);
-        acpi_battery_check_result(battery, result);
-        battery->flags.update[fid] = result;
-        mutex_unlock(&battery->mutex);
-        return result;
-}
-
-static int acpi_battery_read_info(struct seq_file *seq, void *offset)
-{
-        return acpi_battery_read(ACPI_BATTERY_INFO, seq);
-}
-
-static int acpi_battery_read_state(struct seq_file *seq, void *offset)
-{
-        return acpi_battery_read(ACPI_BATTERY_STATE, seq);
-}
-
-static int acpi_battery_read_alarm(struct seq_file *seq, void *offset)
-{
-        return acpi_battery_read(ACPI_BATTERY_ALARM, seq);
-}
-
-static int acpi_battery_info_open_fs(struct inode *inode, struct file *file)
-{
-        return single_open(file, acpi_battery_read_info, PDE(inode)->data);
-}
-
-static int acpi_battery_state_open_fs(struct inode *inode, struct file *file)
-{
-        return single_open(file, acpi_battery_read_state, PDE(inode)->data);
-}
-
-static int acpi_battery_alarm_open_fs(struct inode *inode, struct file *file)
-{
-        return single_open(file, acpi_battery_read_alarm, PDE(inode)->data);
-}
-
 static struct battery_file {
         struct file_operations ops;
         mode_t mode;
         char *name;
 } acpi_battery_file[] = {
-        {
-        .name = "info",
-        .mode = S_IRUGO,
-        .ops = {
-        .open = acpi_battery_info_open_fs,
-        .read = seq_read,
-        .llseek = seq_lseek,
-        .release = single_release,
-        .owner = THIS_MODULE,
-        },
-        },
-        {
-        .name = "state",
-        .mode = S_IRUGO,
-        .ops = {
-        .open = acpi_battery_state_open_fs,
-        .read = seq_read,
-        .llseek = seq_lseek,
-        .release = single_release,
-        .owner = THIS_MODULE,
-        },
-        },
-        {
-        .name = "alarm",
-        .mode = S_IFREG | S_IRUGO | S_IWUSR,
-        .ops = {
-        .open = acpi_battery_alarm_open_fs,
-        .read = seq_read,
-        .write = acpi_battery_write_alarm,
-        .llseek = seq_lseek,
-        .release = single_release,
-        .owner = THIS_MODULE,
-        },
-        },
+        FILE_DESCRIPTION_RO(info),
+        FILE_DESCRIPTION_RO(state),
+        FILE_DESCRIPTION_RW(alarm),
 };
 
+#undef FILE_DESCRIPTION_RO
+#undef FILE_DESCRIPTION_RW
+
 static int acpi_battery_add_fs(struct acpi_device *device)
 {
         struct proc_dir_entry *entry = NULL;
@@ -832,25 +670,51 @@ static int acpi_battery_add_fs(struct acpi_device *device)
                         entry->owner = THIS_MODULE;
                 }
         }
-
         return 0;
 }
 
-static int acpi_battery_remove_fs(struct acpi_device *device)
+static void acpi_battery_remove_fs(struct acpi_device *device)
 {
         int i;
-        if (acpi_device_dir(device)) {
-                for (i = 0; i < ACPI_BATTERY_NUMFILES; ++i) {
-                        remove_proc_entry(acpi_battery_file[i].name,
+        if (!acpi_device_dir(device))
+                return;
+        for (i = 0; i < ACPI_BATTERY_NUMFILES; ++i)
+                remove_proc_entry(acpi_battery_file[i].name,
                                   acpi_device_dir(device));
-                }
-                remove_proc_entry(acpi_device_bid(device), acpi_battery_dir);
-                acpi_device_dir(device) = NULL;
-        }
 
-        return 0;
+        remove_proc_entry(acpi_device_bid(device), acpi_battery_dir);
+        acpi_device_dir(device) = NULL;
+}
+
+#endif
+
+static ssize_t acpi_battery_alarm_show(struct device *dev,
+                                        struct device_attribute *attr,
+                                        char *buf)
+{
+        struct acpi_battery *battery = to_acpi_battery(dev_get_drvdata(dev));
+        return sprintf(buf, "%d\n", battery->alarm * 1000);
+}
+
+static ssize_t acpi_battery_alarm_store(struct device *dev,
+                                        struct device_attribute *attr,
+                                        const char *buf, size_t count)
+{
+        unsigned long x;
+        struct acpi_battery *battery = to_acpi_battery(dev_get_drvdata(dev));
+        if (sscanf(buf, "%ld\n", &x) == 1)
+                battery->alarm = x/1000;
+        if (acpi_battery_present(battery))
+                acpi_battery_set_alarm(battery);
+        return count;
 }
 
+static struct device_attribute alarm_attr = {
+        .attr = {.name = "alarm", .mode = 0644, .owner = THIS_MODULE},
+        .show = acpi_battery_alarm_show,
+        .store = acpi_battery_alarm_store,
+};
+
 /* --------------------------------------------------------------------------
                                  Driver Interface
    -------------------------------------------------------------------------- */
@@ -858,33 +722,17 @@ 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 = data;
-        struct acpi_device *device = NULL;
-
+        struct acpi_device *device;
         if (!battery)
                 return;
-
         device = battery->device;
-
-        switch (event) {
-        case ACPI_BATTERY_NOTIFY_STATUS:
-        case ACPI_BATTERY_NOTIFY_INFO:
-        case ACPI_NOTIFY_BUS_CHECK:
-        case ACPI_NOTIFY_DEVICE_CHECK:
-                device = battery->device;
-                acpi_battery_notify_update(battery);
-                acpi_bus_generate_proc_event(device, event,
+        acpi_battery_update(battery);
+        acpi_bus_generate_proc_event(device, event,
+                                     acpi_battery_present(battery));
+        acpi_bus_generate_netlink_event(device->pnp.device_class,
+                                        device->dev.bus_id, event,
                                         acpi_battery_present(battery));
-                acpi_bus_generate_netlink_event(device->pnp.device_class,
-                                                  device->dev.bus_id, event,
-                                                  acpi_battery_present(battery));
-                break;
-        default:
-                ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                                  "Unsupported event [0x%x]\n", event));
-                break;
-        }
-
-        return;
+        kobject_uevent(&battery->bat.dev->kobj, KOBJ_CHANGE);
 }
 
 static int acpi_battery_add(struct acpi_device *device)
@@ -892,33 +740,27 @@ static int acpi_battery_add(struct acpi_device *device)
         int result = 0;
         acpi_status status = 0;
         struct acpi_battery *battery = NULL;
-
         if (!device)
                 return -EINVAL;
-
         battery = kzalloc(sizeof(struct acpi_battery), GFP_KERNEL);
         if (!battery)
                 return -ENOMEM;
-
-        mutex_init(&battery->mutex);
-
-        mutex_lock(&battery->mutex);
-
         battery->device = device;
         strcpy(acpi_device_name(device), ACPI_BATTERY_DEVICE_NAME);
         strcpy(acpi_device_class(device), ACPI_BATTERY_CLASS);
         acpi_driver_data(device) = battery;
-
-        result = acpi_battery_get_status(battery);
-        if (result)
-                goto end;
-
-        battery->flags.init_update = 1;
-
+        mutex_init(&battery->lock);
+        acpi_battery_update(battery);
+#ifdef CONFIG_ACPI_PROCFS
         result = acpi_battery_add_fs(device);
         if (result)
                 goto end;
-
+#endif
+        battery->bat.name = acpi_device_bid(device);
+        battery->bat.type = POWER_SUPPLY_TYPE_BATTERY;
+        battery->bat.get_property = acpi_battery_get_property;
+        result = power_supply_register(&battery->device->dev, &battery->bat);
+        result = device_create_file(battery->bat.dev, &alarm_attr);
         status = acpi_install_notify_handler(device->handle,
                                              ACPI_ALL_NOTIFY,
                                              acpi_battery_notify, battery);
@@ -927,20 +769,16 @@ static int acpi_battery_add(struct acpi_device *device)
                 result = -ENODEV;
                 goto end;
         }
-
         printk(KERN_INFO PREFIX "%s Slot [%s] (battery %s)\n",
                ACPI_BATTERY_DEVICE_NAME, acpi_device_bid(device),
                device->status.battery_present ? "present" : "absent");
-
       end:
-
         if (result) {
+#ifdef CONFIG_ACPI_PROCFS
                 acpi_battery_remove_fs(device);
+#endif
                 kfree(battery);
         }
-
-        mutex_unlock(&battery->mutex);
-
         return result;
 }
 
@@ -951,27 +789,19 @@ static int acpi_battery_remove(struct acpi_device *device, int type)
 
         if (!device || !acpi_driver_data(device))
                 return -EINVAL;
-
         battery = acpi_driver_data(device);
-
-        mutex_lock(&battery->mutex);
-
         status = acpi_remove_notify_handler(device->handle,
                                             ACPI_ALL_NOTIFY,
                                             acpi_battery_notify);
-
+#ifdef CONFIG_ACPI_PROCFS
         acpi_battery_remove_fs(device);
-
-        kfree(battery->bif_data.pointer);
-
-        kfree(battery->bst_data.pointer);
-
-        mutex_unlock(&battery->mutex);
-
-        mutex_destroy(&battery->mutex);
-
+#endif
+        if (battery->bat.dev) {
+                device_remove_file(battery->bat.dev, &alarm_attr);
+                power_supply_unregister(&battery->bat);
+        }
+        mutex_destroy(&battery->lock);
         kfree(battery);
-
         return 0;
 }
 
@@ -979,44 +809,48 @@ static int acpi_battery_remove(struct acpi_device *device, int type)
 static int acpi_battery_resume(struct acpi_device *device)
 {
         struct acpi_battery *battery;
-
         if (!device)
                 return -EINVAL;
-
-        battery = device->driver_data;
-
-        battery->flags.init_update = 1;
-
+        battery = acpi_driver_data(device);
+        battery->update_time = 0;
         return 0;
 }
 
+static struct acpi_driver acpi_battery_driver = {
+        .name = "battery",
+        .class = ACPI_BATTERY_CLASS,
+        .ids = battery_device_ids,
+        .ops = {
+                .add = acpi_battery_add,
+                .resume = acpi_battery_resume,
+                .remove = acpi_battery_remove,
+                },
+};
+
 static int __init acpi_battery_init(void)
 {
-        int result;
-
         if (acpi_disabled)
                 return -ENODEV;
-
+#ifdef CONFIG_ACPI_PROCFS
         acpi_battery_dir = acpi_lock_battery_dir();
         if (!acpi_battery_dir)
                 return -ENODEV;
-
-        result = acpi_bus_register_driver(&acpi_battery_driver);
-        if (result < 0) {
+#endif
+        if (acpi_bus_register_driver(&acpi_battery_driver) < 0) {
+#ifdef CONFIG_ACPI_PROCFS
                 acpi_unlock_battery_dir(acpi_battery_dir);
+#endif
                 return -ENODEV;
         }
-
         return 0;
 }
 
 static void __exit acpi_battery_exit(void)
 {
         acpi_bus_unregister_driver(&acpi_battery_driver);
-
+#ifdef CONFIG_ACPI_PROCFS
         acpi_unlock_battery_dir(acpi_battery_dir);
-
-        return;
+#endif
 }
 
 module_init(acpi_battery_init);
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index cbfc81579c9a..fb2cff9a2d24 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -286,15 +286,11 @@ DECLARE_WAIT_QUEUE_HEAD(acpi_bus_event_queue);
 
 extern int event_is_open;
 
-int acpi_bus_generate_proc_event(struct acpi_device *device, u8 type, int data)
+int acpi_bus_generate_proc_event4(const char *device_class, const char *bus_id, u8 type, int data)
 {
-        struct acpi_bus_event *event = NULL;
+        struct acpi_bus_event *event;
         unsigned long flags = 0;
 
-
-        if (!device)
-                return -EINVAL;
-
         /* drop event on the floor if no one's listening */
         if (!event_is_open)
                 return 0;
@@ -303,8 +299,8 @@ int acpi_bus_generate_proc_event(struct acpi_device *device, u8 type, int data)
         if (!event)
                 return -ENOMEM;
 
-        strcpy(event->device_class, device->pnp.device_class);
-        strcpy(event->bus_id, device->pnp.bus_id);
+        strcpy(event->device_class, device_class);
+        strcpy(event->bus_id, bus_id);
         event->type = type;
         event->data = data;
 
@@ -315,6 +311,17 @@ int acpi_bus_generate_proc_event(struct acpi_device *device, u8 type, int data)
         wake_up_interruptible(&acpi_bus_event_queue);
 
         return 0;
+
+}
+
+EXPORT_SYMBOL_GPL(acpi_bus_generate_proc_event4);
+
+int acpi_bus_generate_proc_event(struct acpi_device *device, u8 type, int data)
+{
+        if (!device)
+                return -EINVAL;
+        return acpi_bus_generate_proc_event4(device->pnp.device_class,
+                                             device->pnp.bus_id, type, data);
 }
 
 EXPORT_SYMBOL(acpi_bus_generate_proc_event);
diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c
index 2e79a3395ecf..301e832e6961 100644
--- a/drivers/acpi/button.c
+++ b/drivers/acpi/button.c
@@ -434,18 +434,18 @@ static int acpi_button_add(struct acpi_device *device)
         switch (button->type) {
         case ACPI_BUTTON_TYPE_POWER:
         case ACPI_BUTTON_TYPE_POWERF:
-                input->evbit[0] = BIT(EV_KEY);
+                input->evbit[0] = BIT_MASK(EV_KEY);
                 set_bit(KEY_POWER, input->keybit);
                 break;
 
         case ACPI_BUTTON_TYPE_SLEEP:
         case ACPI_BUTTON_TYPE_SLEEPF:
-                input->evbit[0] = BIT(EV_KEY);
+                input->evbit[0] = BIT_MASK(EV_KEY);
                 set_bit(KEY_SLEEP, input->keybit);
                 break;
 
         case ACPI_BUTTON_TYPE_LID:
-                input->evbit[0] = BIT(EV_SW);
+                input->evbit[0] = BIT_MASK(EV_SW);
                 set_bit(SW_LID, input->swbit);
                 break;
         }
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index 3f7935ab0cf5..7b4178393e34 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -121,6 +121,7 @@ static struct acpi_ec {
         atomic_t event_count;
         wait_queue_head_t wait;
         struct list_head list;
+        u8 handlers_installed;
 } *boot_ec, *first_ec;
 
 /* --------------------------------------------------------------------------
@@ -425,7 +426,7 @@ int acpi_ec_add_query_handler(struct acpi_ec *ec, u8 query_bit,
         handler->func = func;
         handler->data = data;
         mutex_lock(&ec->lock);
-        list_add_tail(&handler->node, &ec->list);
+        list_add(&handler->node, &ec->list);
         mutex_unlock(&ec->lock);
         return 0;
 }
@@ -440,7 +441,6 @@ void acpi_ec_remove_query_handler(struct acpi_ec *ec, u8 query_bit)
                 if (query_bit == handler->query_bit) {
                         list_del(&handler->node);
                         kfree(handler);
-                        break;
                 }
         }
         mutex_unlock(&ec->lock);
@@ -680,32 +680,50 @@ ec_parse_device(acpi_handle handle, u32 Level, void *context, void **retval)
         status = acpi_evaluate_integer(handle, "_GPE", NULL, &ec->gpe);
         if (ACPI_FAILURE(status))
                 return status;
-
         /* Find and register all query methods */
         acpi_walk_namespace(ACPI_TYPE_METHOD, handle, 1,
                             acpi_ec_register_query_methods, ec, NULL);
-
         /* Use the global lock for all EC transactions? */
         acpi_evaluate_integer(handle, "_GLK", NULL, &ec->global_lock);
-
         ec->handle = handle;
-
-        printk(KERN_INFO PREFIX "GPE = 0x%lx, I/O: command/status = 0x%lx, data = 0x%lx\n",
-                          ec->gpe, ec->command_addr, ec->data_addr);
-
         return AE_CTRL_TERMINATE;
 }
 
+static void ec_remove_handlers(struct acpi_ec *ec)
+{
+        if (ACPI_FAILURE(acpi_remove_address_space_handler(ec->handle,
+                                ACPI_ADR_SPACE_EC, &acpi_ec_space_handler)))
+                printk(KERN_ERR PREFIX "failed to remove space handler\n");
+        if (ACPI_FAILURE(acpi_remove_gpe_handler(NULL, ec->gpe,
+                                &acpi_ec_gpe_handler)))
+                printk(KERN_ERR PREFIX "failed to remove gpe handler\n");
+        ec->handlers_installed = 0;
+}
+
 static int acpi_ec_add(struct acpi_device *device)
 {
         struct acpi_ec *ec = NULL;
 
         if (!device)
                 return -EINVAL;
-
         strcpy(acpi_device_name(device), ACPI_EC_DEVICE_NAME);
         strcpy(acpi_device_class(device), ACPI_EC_CLASS);
 
+        /* Check for boot EC */
+        if (boot_ec) {
+                if (boot_ec->handle == device->handle) {
+                        /* Pre-loaded EC from DSDT, just move pointer */
+                        ec = boot_ec;
+                        boot_ec = NULL;
+                        goto end;
+                } else if (boot_ec->handle == ACPI_ROOT_OBJECT) {
+                        /* ECDT-based EC, time to shut it down */
+                        ec_remove_handlers(boot_ec);
+                        kfree(boot_ec);
+                        first_ec = boot_ec = NULL;
+                }
+        }
+
         ec = make_acpi_ec();
         if (!ec)
                 return -ENOMEM;
@@ -715,25 +733,14 @@ static int acpi_ec_add(struct acpi_device *device)
                 kfree(ec);
                 return -EINVAL;
         }
-
-        /* Check if we found the boot EC */
-        if (boot_ec) {
-                if (boot_ec->gpe == ec->gpe) {
-                        /* We might have incorrect info for GL at boot time */
-                        mutex_lock(&boot_ec->lock);
-                        boot_ec->global_lock = ec->global_lock;
-                        /* Copy handlers from new ec into boot ec */
-                        list_splice(&ec->list, &boot_ec->list);
-                        mutex_unlock(&boot_ec->lock);
-                        kfree(ec);
-                        ec = boot_ec;
-                }
-        } else
-                first_ec = ec;
         ec->handle = device->handle;
+      end:
+        if (!first_ec)
+                first_ec = ec;
         acpi_driver_data(device) = ec;
-
         acpi_ec_add_fs(device);
+        printk(KERN_INFO PREFIX "GPE = 0x%lx, I/O: command/status = 0x%lx, data = 0x%lx\n",
+                          ec->gpe, ec->command_addr, ec->data_addr);
         return 0;
 }
 
@@ -756,10 +763,7 @@ static int acpi_ec_remove(struct acpi_device *device, int type)
         acpi_driver_data(device) = NULL;
         if (ec == first_ec)
                 first_ec = NULL;
-
-        /* Don't touch boot EC */
-        if (boot_ec != ec)
-                kfree(ec);
+        kfree(ec);
         return 0;
 }
 
@@ -789,6 +793,8 @@ ec_parse_io_ports(struct acpi_resource *resource, void *context)
 static int ec_install_handlers(struct acpi_ec *ec)
 {
         acpi_status status;
+        if (ec->handlers_installed)
+                return 0;
         status = acpi_install_gpe_handler(NULL, ec->gpe,
                                           ACPI_GPE_EDGE_TRIGGERED,
                                           &acpi_ec_gpe_handler, ec);
@@ -807,6 +813,7 @@ static int ec_install_handlers(struct acpi_ec *ec)
                 return -ENODEV;
         }
 
+        ec->handlers_installed = 1;
         return 0;
 }
 
@@ -823,41 +830,22 @@ static int acpi_ec_start(struct acpi_device *device)
         if (!ec)
                 return -EINVAL;
 
-        /* Boot EC is already working */
-        if (ec != boot_ec)
-                ret = ec_install_handlers(ec);
+        ret = ec_install_handlers(ec);
 
         /* EC is fully operational, allow queries */
         atomic_set(&ec->query_pending, 0);
-
         return ret;
 }
 
 static int acpi_ec_stop(struct acpi_device *device, int type)
 {
-        acpi_status status;
         struct acpi_ec *ec;
-
         if (!device)
                 return -EINVAL;
-
         ec = acpi_driver_data(device);
         if (!ec)
                 return -EINVAL;
-
-        /* Don't touch boot EC */
-        if (ec == boot_ec)
-                return 0;
-
-        status = acpi_remove_address_space_handler(ec->handle,
-                                                   ACPI_ADR_SPACE_EC,
-                                                   &acpi_ec_space_handler);
-        if (ACPI_FAILURE(status))
-                return -ENODEV;
-
-        status = acpi_remove_gpe_handler(NULL, ec->gpe, &acpi_ec_gpe_handler);
-        if (ACPI_FAILURE(status))
-                return -ENODEV;
+        ec_remove_handlers(ec);
 
         return 0;
 }
@@ -877,7 +865,7 @@ int __init acpi_ec_ecdt_probe(void)
         status = acpi_get_table(ACPI_SIG_ECDT, 1,
                                 (struct acpi_table_header **)&ecdt_ptr);
         if (ACPI_SUCCESS(status)) {
-                printk(KERN_INFO PREFIX "EC description table is found, configuring boot EC\n\n");
+                printk(KERN_INFO PREFIX "EC description table is found, configuring boot EC\n");
                 boot_ec->command_addr = ecdt_ptr->control.address;
                 boot_ec->data_addr = ecdt_ptr->data.address;
                 boot_ec->gpe = ecdt_ptr->gpe;
@@ -899,7 +887,6 @@ int __init acpi_ec_ecdt_probe(void)
       error:
         kfree(boot_ec);
         boot_ec = NULL;
-
         return -ENODEV;
 }
 
diff --git a/drivers/acpi/events/evevent.c b/drivers/acpi/events/evevent.c
index a1f87b5def2a..e41287815ea1 100644
--- a/drivers/acpi/events/evevent.c
+++ b/drivers/acpi/events/evevent.c
@@ -239,10 +239,8 @@ u32 acpi_ev_fixed_event_detect(void)
          * Read the fixed feature status and enable registers, as all the cases
          * depend on their values.  Ignore errors here.
          */
-        (void)acpi_hw_register_read(ACPI_MTX_DO_NOT_LOCK,
-                                    ACPI_REGISTER_PM1_STATUS, &fixed_status);
-        (void)acpi_hw_register_read(ACPI_MTX_DO_NOT_LOCK,
-                                    ACPI_REGISTER_PM1_ENABLE, &fixed_enable);
+        (void)acpi_hw_register_read(ACPI_REGISTER_PM1_STATUS, &fixed_status);
+        (void)acpi_hw_register_read(ACPI_REGISTER_PM1_ENABLE, &fixed_enable);
 
         ACPI_DEBUG_PRINT((ACPI_DB_INTERRUPTS,
                           "Fixed Event Block: Enable %08X Status %08X\n",
diff --git a/drivers/acpi/hardware/hwregs.c b/drivers/acpi/hardware/hwregs.c
index 1d371fa663f2..73f9c5fb1ba7 100644
--- a/drivers/acpi/hardware/hwregs.c
+++ b/drivers/acpi/hardware/hwregs.c
@@ -75,8 +75,7 @@ acpi_status acpi_hw_clear_acpi_status(void)
 
         lock_flags = acpi_os_acquire_lock(acpi_gbl_hardware_lock);
 
-        status = acpi_hw_register_write(ACPI_MTX_DO_NOT_LOCK,
-                                        ACPI_REGISTER_PM1_STATUS,
+        status = acpi_hw_register_write(ACPI_REGISTER_PM1_STATUS,
                                         ACPI_BITMASK_ALL_FIXED_STATUS);
         if (ACPI_FAILURE(status)) {
                 goto unlock_and_exit;
@@ -259,7 +258,7 @@ struct acpi_bit_register_info *acpi_hw_get_bit_register_info(u32 register_id)
  *
  ******************************************************************************/
 
-acpi_status acpi_get_register(u32 register_id, u32 * return_value)
+acpi_status acpi_get_register_unlocked(u32 register_id, u32 * return_value)
 {
         u32 register_value = 0;
         struct acpi_bit_register_info *bit_reg_info;
@@ -276,8 +275,7 @@ acpi_status acpi_get_register(u32 register_id, u32 * return_value)
 
         /* Read from the register */
 
-        status = acpi_hw_register_read(ACPI_MTX_LOCK,
-                                       bit_reg_info->parent_register,
+        status = acpi_hw_register_read(bit_reg_info->parent_register,
                                        &register_value);
 
         if (ACPI_SUCCESS(status)) {
@@ -298,6 +296,16 @@ acpi_status acpi_get_register(u32 register_id, u32 * return_value)
         return_ACPI_STATUS(status);
 }
 
+acpi_status acpi_get_register(u32 register_id, u32 * return_value)
+{
+        acpi_status status;
+        acpi_cpu_flags flags;
+        flags = acpi_os_acquire_lock(acpi_gbl_hardware_lock);
+        status = acpi_get_register_unlocked(register_id, return_value);
+        acpi_os_release_lock(acpi_gbl_hardware_lock, flags);
+        return status;
+}
+
 ACPI_EXPORT_SYMBOL(acpi_get_register)
 
 /*******************************************************************************
@@ -335,8 +343,7 @@ acpi_status acpi_set_register(u32 register_id, u32 value)
 
         /* Always do a register read first so we can insert the new bits  */
 
-        status = acpi_hw_register_read(ACPI_MTX_DO_NOT_LOCK,
-                                       bit_reg_info->parent_register,
+        status = acpi_hw_register_read(bit_reg_info->parent_register,
                                        &register_value);
         if (ACPI_FAILURE(status)) {
                 goto unlock_and_exit;
@@ -363,8 +370,7 @@ acpi_status acpi_set_register(u32 register_id, u32 value)
                                                    bit_reg_info->
                                                    access_bit_mask);
                 if (value) {
-                        status = acpi_hw_register_write(ACPI_MTX_DO_NOT_LOCK,
-                                                        ACPI_REGISTER_PM1_STATUS,
+                        status = acpi_hw_register_write(ACPI_REGISTER_PM1_STATUS,
                                                         (u16) value);
                         register_value = 0;
                 }
@@ -377,8 +383,7 @@ acpi_status acpi_set_register(u32 register_id, u32 value)
                                            bit_reg_info->access_bit_mask,
                                            value);
 
-                status = acpi_hw_register_write(ACPI_MTX_DO_NOT_LOCK,
-                                                ACPI_REGISTER_PM1_ENABLE,
+                status = acpi_hw_register_write(ACPI_REGISTER_PM1_ENABLE,
                                                 (u16) register_value);
                 break;
 
@@ -397,15 +402,13 @@ acpi_status acpi_set_register(u32 register_id, u32 value)
                                            bit_reg_info->access_bit_mask,
                                            value);
 
-                status = acpi_hw_register_write(ACPI_MTX_DO_NOT_LOCK,
-                                                ACPI_REGISTER_PM1_CONTROL,
+                status = acpi_hw_register_write(ACPI_REGISTER_PM1_CONTROL,
                                                 (u16) register_value);
                 break;
 
         case ACPI_REGISTER_PM2_CONTROL:
 
-                status = acpi_hw_register_read(ACPI_MTX_DO_NOT_LOCK,
-                                               ACPI_REGISTER_PM2_CONTROL,
+                status = acpi_hw_register_read(ACPI_REGISTER_PM2_CONTROL,
                                                &register_value);
                 if (ACPI_FAILURE(status)) {
                         goto unlock_and_exit;
@@ -430,8 +433,7 @@ acpi_status acpi_set_register(u32 register_id, u32 value)
                                                      xpm2_control_block.
                                                      address)));
 
-                status = acpi_hw_register_write(ACPI_MTX_DO_NOT_LOCK,
-                                                ACPI_REGISTER_PM2_CONTROL,
+                status = acpi_hw_register_write(ACPI_REGISTER_PM2_CONTROL,
                                                 (u8) (register_value));
                 break;
 
@@ -461,8 +463,7 @@ ACPI_EXPORT_SYMBOL(acpi_set_register)
  *
  * FUNCTION:    acpi_hw_register_read
  *
- * PARAMETERS:  use_lock            - Lock hardware? True/False
- *              register_id         - ACPI Register ID
+ * PARAMETERS:  register_id         - ACPI Register ID
  *              return_value        - Where the register value is returned
  *
  * RETURN:      Status and the value read.
@@ -471,19 +472,14 @@ ACPI_EXPORT_SYMBOL(acpi_set_register)
  *
  ******************************************************************************/
 acpi_status
-acpi_hw_register_read(u8 use_lock, u32 register_id, u32 * return_value)
+acpi_hw_register_read(u32 register_id, u32 * return_value)
 {
         u32 value1 = 0;
         u32 value2 = 0;
         acpi_status status;
-        acpi_cpu_flags lock_flags = 0;
 
         ACPI_FUNCTION_TRACE(hw_register_read);
 
-        if (ACPI_MTX_LOCK == use_lock) {
-                lock_flags = acpi_os_acquire_lock(acpi_gbl_hardware_lock);
-        }
-
         switch (register_id) {
         case ACPI_REGISTER_PM1_STATUS:  /* 16-bit access */
 
@@ -491,7 +487,7 @@ acpi_hw_register_read(u8 use_lock, u32 register_id, u32 * return_value)
                     acpi_hw_low_level_read(16, &value1,
                                            &acpi_gbl_FADT.xpm1a_event_block);
                 if (ACPI_FAILURE(status)) {
-                        goto unlock_and_exit;
+                        goto exit;
                 }
 
                 /* PM1B is optional */
@@ -507,7 +503,7 @@ acpi_hw_register_read(u8 use_lock, u32 register_id, u32 * return_value)
                 status =
                     acpi_hw_low_level_read(16, &value1, &acpi_gbl_xpm1a_enable);
                 if (ACPI_FAILURE(status)) {
-                        goto unlock_and_exit;
+                        goto exit;
                 }
 
                 /* PM1B is optional */
@@ -523,7 +519,7 @@ acpi_hw_register_read(u8 use_lock, u32 register_id, u32 * return_value)
                     acpi_hw_low_level_read(16, &value1,
                                            &acpi_gbl_FADT.xpm1a_control_block);
                 if (ACPI_FAILURE(status)) {
-                        goto unlock_and_exit;
+                        goto exit;
                 }
 
                 status =
@@ -558,10 +554,7 @@ acpi_hw_register_read(u8 use_lock, u32 register_id, u32 * return_value)
                 break;
         }
 
-      unlock_and_exit:
-        if (ACPI_MTX_LOCK == use_lock) {
-                acpi_os_release_lock(acpi_gbl_hardware_lock, lock_flags);
-        }
+      exit:
 
         if (ACPI_SUCCESS(status)) {
                 *return_value = value1;
@@ -574,8 +567,7 @@ acpi_hw_register_read(u8 use_lock, u32 register_id, u32 * return_value)
  *
  * FUNCTION:    acpi_hw_register_write
  *
- * PARAMETERS:  use_lock            - Lock hardware? True/False
- *              register_id         - ACPI Register ID
+ * PARAMETERS:  register_id         - ACPI Register ID
  *              Value               - The value to write
  *
  * RETURN:      Status
@@ -597,28 +589,22 @@ acpi_hw_register_read(u8 use_lock, u32 register_id, u32 * return_value)
  *
  ******************************************************************************/
 
-acpi_status acpi_hw_register_write(u8 use_lock, u32 register_id, u32 value)
+acpi_status acpi_hw_register_write(u32 register_id, u32 value)
 {
         acpi_status status;
-        acpi_cpu_flags lock_flags = 0;
         u32 read_value;
 
         ACPI_FUNCTION_TRACE(hw_register_write);
 
-        if (ACPI_MTX_LOCK == use_lock) {
-                lock_flags = acpi_os_acquire_lock(acpi_gbl_hardware_lock);
-        }
-
         switch (register_id) {
         case ACPI_REGISTER_PM1_STATUS:  /* 16-bit access */
 
                 /* Perform a read first to preserve certain bits (per ACPI spec) */
 
-                status = acpi_hw_register_read(ACPI_MTX_DO_NOT_LOCK,
-                                               ACPI_REGISTER_PM1_STATUS,
+                status = acpi_hw_register_read(ACPI_REGISTER_PM1_STATUS,
                                                &read_value);
                 if (ACPI_FAILURE(status)) {
-                        goto unlock_and_exit;
+                        goto exit;
                 }
 
                 /* Insert the bits to be preserved */
@@ -632,7 +618,7 @@ acpi_status acpi_hw_register_write(u8 use_lock, u32 register_id, u32 value)
                     acpi_hw_low_level_write(16, value,
                                             &acpi_gbl_FADT.xpm1a_event_block);
                 if (ACPI_FAILURE(status)) {
-                        goto unlock_and_exit;
+                        goto exit;
                 }
 
                 /* PM1B is optional */
@@ -647,7 +633,7 @@ acpi_status acpi_hw_register_write(u8 use_lock, u32 register_id, u32 value)
                 status =
                     acpi_hw_low_level_write(16, value, &acpi_gbl_xpm1a_enable);
                 if (ACPI_FAILURE(status)) {
-                        goto unlock_and_exit;
+                        goto exit;
                 }
 
                 /* PM1B is optional */
@@ -661,11 +647,10 @@ acpi_status acpi_hw_register_write(u8 use_lock, u32 register_id, u32 value)
                 /*
                  * Perform a read first to preserve certain bits (per ACPI spec)
                  */
-                status = acpi_hw_register_read(ACPI_MTX_DO_NOT_LOCK,
-                                               ACPI_REGISTER_PM1_CONTROL,
+                status = acpi_hw_register_read(ACPI_REGISTER_PM1_CONTROL,
                                                &read_value);
                 if (ACPI_FAILURE(status)) {
-                        goto unlock_and_exit;
+                        goto exit;
                 }
 
                 /* Insert the bits to be preserved */
@@ -679,7 +664,7 @@ acpi_status acpi_hw_register_write(u8 use_lock, u32 register_id, u32 value)
                     acpi_hw_low_level_write(16, value,
                                             &acpi_gbl_FADT.xpm1a_control_block);
                 if (ACPI_FAILURE(status)) {
-                        goto unlock_and_exit;
+                        goto exit;
                 }
 
                 status =
@@ -728,11 +713,7 @@ acpi_status acpi_hw_register_write(u8 use_lock, u32 register_id, u32 value)
                 break;
         }
 
-      unlock_and_exit:
-        if (ACPI_MTX_LOCK == use_lock) {
-                acpi_os_release_lock(acpi_gbl_hardware_lock, lock_flags);
-        }
-
+      exit:
         return_ACPI_STATUS(status);
 }
 
diff --git a/drivers/acpi/hardware/hwsleep.c b/drivers/acpi/hardware/hwsleep.c
index cf69c0040a39..81b248429703 100644
--- a/drivers/acpi/hardware/hwsleep.c
+++ b/drivers/acpi/hardware/hwsleep.c
@@ -234,15 +234,11 @@ acpi_status acpi_enter_sleep_state_prep(u8 sleep_state)
                                 "While executing method _SST"));
         }
 
-        /*
-         * 1) Disable/Clear all GPEs
-         */
+        /* Disable/Clear all GPEs */
+
         status = acpi_hw_disable_all_gpes();
-        if (ACPI_FAILURE(status)) {
-                return_ACPI_STATUS(status);
-        }
 
-        return_ACPI_STATUS(AE_OK);
+        return_ACPI_STATUS(status);
 }
 
 ACPI_EXPORT_SYMBOL(acpi_enter_sleep_state_prep)
@@ -313,8 +309,7 @@ acpi_status asmlinkage acpi_enter_sleep_state(u8 sleep_state)
 
         /* Get current value of PM1A control */
 
-        status = acpi_hw_register_read(ACPI_MTX_DO_NOT_LOCK,
-                                       ACPI_REGISTER_PM1_CONTROL, &PM1Acontrol);
+        status = acpi_hw_register_read(ACPI_REGISTER_PM1_CONTROL, &PM1Acontrol);
         if (ACPI_FAILURE(status)) {
                 return_ACPI_STATUS(status);
         }
@@ -341,15 +336,13 @@ acpi_status asmlinkage acpi_enter_sleep_state(u8 sleep_state)
 
         /* Write #1: fill in SLP_TYP data */
 
-        status = acpi_hw_register_write(ACPI_MTX_DO_NOT_LOCK,
-                                        ACPI_REGISTER_PM1A_CONTROL,
+        status = acpi_hw_register_write(ACPI_REGISTER_PM1A_CONTROL,
                                         PM1Acontrol);
         if (ACPI_FAILURE(status)) {
                 return_ACPI_STATUS(status);
         }
 
-        status = acpi_hw_register_write(ACPI_MTX_DO_NOT_LOCK,
-                                        ACPI_REGISTER_PM1B_CONTROL,
+        status = acpi_hw_register_write(ACPI_REGISTER_PM1B_CONTROL,
                                         PM1Bcontrol);
         if (ACPI_FAILURE(status)) {
                 return_ACPI_STATUS(status);
@@ -364,15 +357,13 @@ acpi_status asmlinkage acpi_enter_sleep_state(u8 sleep_state)
 
         ACPI_FLUSH_CPU_CACHE();
 
-        status = acpi_hw_register_write(ACPI_MTX_DO_NOT_LOCK,
-                                        ACPI_REGISTER_PM1A_CONTROL,
+        status = acpi_hw_register_write(ACPI_REGISTER_PM1A_CONTROL,
                                         PM1Acontrol);
         if (ACPI_FAILURE(status)) {
                 return_ACPI_STATUS(status);
         }
 
-        status = acpi_hw_register_write(ACPI_MTX_DO_NOT_LOCK,
-                                        ACPI_REGISTER_PM1B_CONTROL,
+        status = acpi_hw_register_write(ACPI_REGISTER_PM1B_CONTROL,
                                         PM1Bcontrol);
         if (ACPI_FAILURE(status)) {
                 return_ACPI_STATUS(status);
@@ -392,8 +383,7 @@ acpi_status asmlinkage acpi_enter_sleep_state(u8 sleep_state)
                  */
                 acpi_os_stall(10000000);
 
-                status = acpi_hw_register_write(ACPI_MTX_DO_NOT_LOCK,
-                                                ACPI_REGISTER_PM1_CONTROL,
+                status = acpi_hw_register_write(ACPI_REGISTER_PM1_CONTROL,
                                                 sleep_enable_reg_info->
                                                 access_bit_mask);
                 if (ACPI_FAILURE(status)) {
@@ -404,7 +394,8 @@ acpi_status asmlinkage acpi_enter_sleep_state(u8 sleep_state)
         /* Wait until we enter sleep state */
 
         do {
-                status = acpi_get_register(ACPI_BITREG_WAKE_STATUS, &in_value);
+                status = acpi_get_register_unlocked(ACPI_BITREG_WAKE_STATUS,
+                                                    &in_value);
                 if (ACPI_FAILURE(status)) {
                         return_ACPI_STATUS(status);
                 }
@@ -520,8 +511,7 @@ acpi_status acpi_leave_sleep_state(u8 sleep_state)
 
                 /* Get current value of PM1A control */
 
-                status = acpi_hw_register_read(ACPI_MTX_DO_NOT_LOCK,
-                                               ACPI_REGISTER_PM1_CONTROL,
+                status = acpi_hw_register_read(ACPI_REGISTER_PM1_CONTROL,
                                                &PM1Acontrol);
                 if (ACPI_SUCCESS(status)) {
 
@@ -543,11 +533,9 @@ acpi_status acpi_leave_sleep_state(u8 sleep_state)
 
                         /* Just ignore any errors */
 
-                        (void)acpi_hw_register_write(ACPI_MTX_DO_NOT_LOCK,
-                                                     ACPI_REGISTER_PM1A_CONTROL,
+                        (void)acpi_hw_register_write(ACPI_REGISTER_PM1A_CONTROL,
                                                      PM1Acontrol);
-                        (void)acpi_hw_register_write(ACPI_MTX_DO_NOT_LOCK,
-                                                     ACPI_REGISTER_PM1B_CONTROL,
+                        (void)acpi_hw_register_write(ACPI_REGISTER_PM1B_CONTROL,
                                                      PM1Bcontrol);
                 }
         }
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index 352cf81af581..aabc6ca4a81c 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -1043,14 +1043,6 @@ static int __init acpi_wake_gpes_always_on_setup(char *str)
 __setup("acpi_wake_gpes_always_on", acpi_wake_gpes_always_on_setup);
 
 /*
- * max_cstate is defined in the base kernel so modules can
- * change it w/o depending on the state of the processor module.
- */
-unsigned int max_cstate = ACPI_PROCESSOR_MAX_POWER;
-
-EXPORT_SYMBOL(max_cstate);
-
-/*
  * Acquire a spinlock.
  *
  * handle is a pointer to the spinlock_t.
diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c
index 9f11dc296cdd..235a51e328c3 100644
--- a/drivers/acpi/processor_core.c
+++ b/drivers/acpi/processor_core.c
@@ -44,6 +44,7 @@
 #include <linux/seq_file.h>
 #include <linux/dmi.h>
 #include <linux/moduleparam.h>
+#include <linux/cpuidle.h>
 
 #include <asm/io.h>
 #include <asm/system.h>
@@ -421,12 +422,6 @@ static int map_lsapic_id(struct acpi_subtable_header *entry,
         return 0;
 }
 
-#ifdef CONFIG_IA64
-#define arch_cpu_to_apicid      ia64_cpu_to_sapicid
-#else
-#define arch_cpu_to_apicid      x86_cpu_to_apicid
-#endif
-
 static int map_madt_entry(u32 acpi_id)
 {
         unsigned long madt_end, entry;
@@ -500,7 +495,7 @@ static int get_cpu_id(acpi_handle handle, u32 acpi_id)
                 return apic_id;
 
         for (i = 0; i < NR_CPUS; ++i) {
-                if (arch_cpu_to_apicid[i] == apic_id)
+                if (cpu_physical_id(i) == apic_id)
                         return i;
         }
         return -1;
@@ -1049,11 +1044,13 @@ static int __init acpi_processor_init(void)
                 return -ENOMEM;
         acpi_processor_dir->owner = THIS_MODULE;
 
+        result = cpuidle_register_driver(&acpi_idle_driver);
+        if (result < 0)
+                goto out_proc;
+
         result = acpi_bus_register_driver(&acpi_processor_driver);
-        if (result < 0) {
-                remove_proc_entry(ACPI_PROCESSOR_CLASS, acpi_root_dir);
-                return result;
-        }
+        if (result < 0)
+                goto out_cpuidle;
 
         acpi_processor_install_hotplug_notify();
 
@@ -1062,11 +1059,18 @@ static int __init acpi_processor_init(void)
         acpi_processor_ppc_init();
 
         return 0;
+
+out_cpuidle:
+        cpuidle_unregister_driver(&acpi_idle_driver);
+
+out_proc:
+        remove_proc_entry(ACPI_PROCESSOR_CLASS, acpi_root_dir);
+
+        return result;
 }
 
 static void __exit acpi_processor_exit(void)
 {
-
         acpi_processor_ppc_exit();
 
         acpi_thermal_cpufreq_exit();
@@ -1075,6 +1079,8 @@ static void __exit acpi_processor_exit(void)
 
         acpi_bus_unregister_driver(&acpi_processor_driver);
 
+        cpuidle_unregister_driver(&acpi_idle_driver);
+
         remove_proc_entry(ACPI_PROCESSOR_CLASS, acpi_root_dir);
 
         return;
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index 1f6fb38de017..f996d0e37689 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -40,6 +40,7 @@
 #include <linux/sched.h>        /* need_resched() */
 #include <linux/latency.h>
 #include <linux/clockchips.h>
+#include <linux/cpuidle.h>
 
 /*
  * Include the apic definitions for x86 to have the APIC timer related defines
@@ -64,14 +65,22 @@ ACPI_MODULE_NAME("processor_idle");
 #define ACPI_PROCESSOR_FILE_POWER       "power"
 #define US_TO_PM_TIMER_TICKS(t)         ((t * (PM_TIMER_FREQUENCY/1000)) / 1000)
 #define PM_TIMER_TICK_NS                (1000000000ULL/PM_TIMER_FREQUENCY)
+#ifndef CONFIG_CPU_IDLE
 #define C2_OVERHEAD                     4       /* 1us (3.579 ticks per us) */
 #define C3_OVERHEAD                     4       /* 1us (3.579 ticks per us) */
 static void (*pm_idle_save) (void) __read_mostly;
-module_param(max_cstate, uint, 0644);
+#else
+#define C2_OVERHEAD                     1       /* 1us */
+#define C3_OVERHEAD                     1       /* 1us */
+#endif
+#define PM_TIMER_TICKS_TO_US(p)         (((p) * 1000)/(PM_TIMER_FREQUENCY/1000))
 
+static unsigned int max_cstate __read_mostly = ACPI_PROCESSOR_MAX_POWER;
+module_param(max_cstate, uint, 0000);
 static unsigned int nocst __read_mostly;
 module_param(nocst, uint, 0000);
 
+#ifndef CONFIG_CPU_IDLE
 /*
  * bm_history -- bit-mask with a bit per jiffy of bus-master activity
  * 1000 HZ: 0xFFFFFFFF: 32 jiffies = 32ms
@@ -82,9 +91,10 @@ module_param(nocst, uint, 0000);
 static unsigned int bm_history __read_mostly =
     (HZ >= 800 ? 0xFFFFFFFF : ((1U << (HZ / 25)) - 1));
 module_param(bm_history, uint, 0644);
-/* --------------------------------------------------------------------------
-                                Power Management
-   -------------------------------------------------------------------------- */
+
+static int acpi_processor_set_power_policy(struct acpi_processor *pr);
+
+#endif
 
 /*
  * IBM ThinkPad R40e crashes mysteriously when going into C2 or C3.
@@ -177,6 +187,18 @@ static inline u32 ticks_elapsed(u32 t1, u32 t2)
                 return ((0xFFFFFFFF - t1) + t2);
 }
 
+static inline u32 ticks_elapsed_in_us(u32 t1, u32 t2)
+{
+        if (t2 >= t1)
+                return PM_TIMER_TICKS_TO_US(t2 - t1);
+        else if (!(acpi_gbl_FADT.flags & ACPI_FADT_32BIT_TIMER))
+                return PM_TIMER_TICKS_TO_US(((0x00FFFFFF - t1) + t2) & 0x00FFFFFF);
+        else
+                return PM_TIMER_TICKS_TO_US((0xFFFFFFFF - t1) + t2);
+}
+
+#ifndef CONFIG_CPU_IDLE
+
 static void
 acpi_processor_power_activate(struct acpi_processor *pr,
                               struct acpi_processor_cx *new)
@@ -248,6 +270,7 @@ static void acpi_cstate_enter(struct acpi_processor_cx *cstate)
                 unused = inl(acpi_gbl_FADT.xpm_timer_block.address);
         }
 }
+#endif /* !CONFIG_CPU_IDLE */
 
 #ifdef ARCH_APICTIMER_STOPS_ON_C3
 
@@ -330,6 +353,7 @@ int acpi_processor_resume(struct acpi_device * device)
         return 0;
 }
 
+#ifndef CONFIG_CPU_IDLE
 static void acpi_processor_idle(void)
 {
         struct acpi_processor *pr = NULL;
@@ -427,7 +451,7 @@ static void acpi_processor_idle(void)
          * an SMP system. We do it here instead of doing it at _CST/P_LVL
          * detection phase, to work cleanly with logical CPU hotplug.
          */
-        if ((cx->type != ACPI_STATE_C1) && (num_online_cpus() > 1) && 
+        if ((cx->type != ACPI_STATE_C1) && (num_online_cpus() > 1) &&
             !pr->flags.has_cst && !(acpi_gbl_FADT.flags & ACPI_FADT_C2_MP_SUPPORTED))
                 cx = &pr->power.states[ACPI_STATE_C1];
 #endif
@@ -727,6 +751,7 @@ static int acpi_processor_set_power_policy(struct acpi_processor *pr)
 
         return 0;
 }
+#endif /* !CONFIG_CPU_IDLE */
 
 static int acpi_processor_get_power_info_fadt(struct acpi_processor *pr)
 {
@@ -744,7 +769,7 @@ static int acpi_processor_get_power_info_fadt(struct acpi_processor *pr)
 #ifndef CONFIG_HOTPLUG_CPU
         /*
          * Check for P_LVL2_UP flag before entering C2 and above on
-         * an SMP system. 
+         * an SMP system.
          */
         if ((num_online_cpus() > 1) &&
             !(acpi_gbl_FADT.flags & ACPI_FADT_C2_MP_SUPPORTED))
@@ -945,7 +970,12 @@ static void acpi_processor_power_verify_c2(struct acpi_processor_cx *cx)
          * Normalize the C2 latency to expidite policy
          */
         cx->valid = 1;
+
+#ifndef CONFIG_CPU_IDLE
         cx->latency_ticks = US_TO_PM_TIMER_TICKS(cx->latency);
+#else
+        cx->latency_ticks = cx->latency;
+#endif
 
         return;
 }
@@ -1025,7 +1055,12 @@ static void acpi_processor_power_verify_c3(struct acpi_processor *pr,
          * use this in our C3 policy
          */
         cx->valid = 1;
+
+#ifndef CONFIG_CPU_IDLE
         cx->latency_ticks = US_TO_PM_TIMER_TICKS(cx->latency);
+#else
+        cx->latency_ticks = cx->latency;
+#endif
 
         return;
 }
@@ -1090,6 +1125,7 @@ static int acpi_processor_get_power_info(struct acpi_processor *pr)
 
         pr->power.count = acpi_processor_power_verify(pr);
 
+#ifndef CONFIG_CPU_IDLE
         /*
          * Set Default Policy
          * ------------------
@@ -1101,6 +1137,7 @@ static int acpi_processor_get_power_info(struct acpi_processor *pr)
         result = acpi_processor_set_power_policy(pr);
         if (result)
                 return result;
+#endif
 
         /*
          * if one state of type C2 or C3 is available, mark this
@@ -1117,35 +1154,6 @@ static int acpi_processor_get_power_info(struct acpi_processor *pr)
         return 0;
 }
 
-int acpi_processor_cst_has_changed(struct acpi_processor *pr)
-{
-        int result = 0;
-
-
-        if (!pr)
-                return -EINVAL;
-
-        if (nocst) {
-                return -ENODEV;
-        }
-
-        if (!pr->flags.power_setup_done)
-                return -ENODEV;
-
-        /* Fall back to the default idle loop */
-        pm_idle = pm_idle_save;
-        synchronize_sched();    /* Relies on interrupts forcing exit from idle. */
-
-        pr->flags.power = 0;
-        result = acpi_processor_get_power_info(pr);
-        if ((pr->flags.power == 1) && (pr->flags.power_setup_done))
-                pm_idle = acpi_processor_idle;
-
-        return result;
-}
-
-/* proc interface */
-
 static int acpi_processor_power_seq_show(struct seq_file *seq, void *offset)
 {
         struct acpi_processor *pr = seq->private;
@@ -1227,6 +1235,35 @@ static const struct file_operations acpi_processor_power_fops = {
         .release = single_release,
 };
 
+#ifndef CONFIG_CPU_IDLE
+
+int acpi_processor_cst_has_changed(struct acpi_processor *pr)
+{
+        int result = 0;
+
+
+        if (!pr)
+                return -EINVAL;
+
+        if (nocst) {
+                return -ENODEV;
+        }
+
+        if (!pr->flags.power_setup_done)
+                return -ENODEV;
+
+        /* Fall back to the default idle loop */
+        pm_idle = pm_idle_save;
+        synchronize_sched();    /* Relies on interrupts forcing exit from idle. */
+
+        pr->flags.power = 0;
+        result = acpi_processor_get_power_info(pr);
+        if ((pr->flags.power == 1) && (pr->flags.power_setup_done))
+                pm_idle = acpi_processor_idle;
+
+        return result;
+}
+
 #ifdef CONFIG_SMP
 static void smp_callback(void *v)
 {
@@ -1249,7 +1286,366 @@ static int acpi_processor_latency_notify(struct notifier_block *b,
 static struct notifier_block acpi_processor_latency_notifier = {
         .notifier_call = acpi_processor_latency_notify,
 };
+
+#endif
+
+#else /* CONFIG_CPU_IDLE */
+
+/**
+ * acpi_idle_bm_check - checks if bus master activity was detected
+ */
+static int acpi_idle_bm_check(void)
+{
+        u32 bm_status = 0;
+
+        acpi_get_register(ACPI_BITREG_BUS_MASTER_STATUS, &bm_status);
+        if (bm_status)
+                acpi_set_register(ACPI_BITREG_BUS_MASTER_STATUS, 1);
+        /*
+         * PIIX4 Erratum #18: Note that BM_STS doesn't always reflect
+         * the true state of bus mastering activity; forcing us to
+         * manually check the BMIDEA bit of each IDE channel.
+         */
+        else if (errata.piix4.bmisx) {
+                if ((inb_p(errata.piix4.bmisx + 0x02) & 0x01)
+                    || (inb_p(errata.piix4.bmisx + 0x0A) & 0x01))
+                        bm_status = 1;
+        }
+        return bm_status;
+}
+
+/**
+ * acpi_idle_update_bm_rld - updates the BM_RLD bit depending on target state
+ * @pr: the processor
+ * @target: the new target state
+ */
+static inline void acpi_idle_update_bm_rld(struct acpi_processor *pr,
+                                           struct acpi_processor_cx *target)
+{
+        if (pr->flags.bm_rld_set && target->type != ACPI_STATE_C3) {
+                acpi_set_register(ACPI_BITREG_BUS_MASTER_RLD, 0);
+                pr->flags.bm_rld_set = 0;
+        }
+
+        if (!pr->flags.bm_rld_set && target->type == ACPI_STATE_C3) {
+                acpi_set_register(ACPI_BITREG_BUS_MASTER_RLD, 1);
+                pr->flags.bm_rld_set = 1;
+        }
+}
+
+/**
+ * acpi_idle_do_entry - a helper function that does C2 and C3 type entry
+ * @cx: cstate data
+ */
+static inline void acpi_idle_do_entry(struct acpi_processor_cx *cx)
+{
+        if (cx->space_id == ACPI_CSTATE_FFH) {
+                /* Call into architectural FFH based C-state */
+                acpi_processor_ffh_cstate_enter(cx);
+        } else {
+                int unused;
+                /* IO port based C-state */
+                inb(cx->address);
+                /* Dummy wait op - must do something useless after P_LVL2 read
+                   because chipsets cannot guarantee that STPCLK# signal
+                   gets asserted in time to freeze execution properly. */
+                unused = inl(acpi_gbl_FADT.xpm_timer_block.address);
+        }
+}
+
+/**
+ * acpi_idle_enter_c1 - enters an ACPI C1 state-type
+ * @dev: the target CPU
+ * @state: the state data
+ *
+ * This is equivalent to the HALT instruction.
+ */
+static int acpi_idle_enter_c1(struct cpuidle_device *dev,
+                              struct cpuidle_state *state)
+{
+        struct acpi_processor *pr;
+        struct acpi_processor_cx *cx = cpuidle_get_statedata(state);
+        pr = processors[smp_processor_id()];
+
+        if (unlikely(!pr))
+                return 0;
+
+        if (pr->flags.bm_check)
+                acpi_idle_update_bm_rld(pr, cx);
+
+        current_thread_info()->status &= ~TS_POLLING;
+        /*
+         * TS_POLLING-cleared state must be visible before we test
+         * NEED_RESCHED:
+         */
+        smp_mb();
+        if (!need_resched())
+                safe_halt();
+        current_thread_info()->status |= TS_POLLING;
+
+        cx->usage++;
+
+        return 0;
+}
+
+/**
+ * acpi_idle_enter_simple - enters an ACPI state without BM handling
+ * @dev: the target CPU
+ * @state: the state data
+ */
+static int acpi_idle_enter_simple(struct cpuidle_device *dev,
+                                  struct cpuidle_state *state)
+{
+        struct acpi_processor *pr;
+        struct acpi_processor_cx *cx = cpuidle_get_statedata(state);
+        u32 t1, t2;
+        pr = processors[smp_processor_id()];
+
+        if (unlikely(!pr))
+                return 0;
+
+        if (acpi_idle_suspend)
+                return(acpi_idle_enter_c1(dev, state));
+
+        if (pr->flags.bm_check)
+                acpi_idle_update_bm_rld(pr, cx);
+
+        local_irq_disable();
+        current_thread_info()->status &= ~TS_POLLING;
+        /*
+         * TS_POLLING-cleared state must be visible before we test
+         * NEED_RESCHED:
+         */
+        smp_mb();
+
+        if (unlikely(need_resched())) {
+                current_thread_info()->status |= TS_POLLING;
+                local_irq_enable();
+                return 0;
+        }
+
+        if (cx->type == ACPI_STATE_C3)
+                ACPI_FLUSH_CPU_CACHE();
+
+        t1 = inl(acpi_gbl_FADT.xpm_timer_block.address);
+        acpi_state_timer_broadcast(pr, cx, 1);
+        acpi_idle_do_entry(cx);
+        t2 = inl(acpi_gbl_FADT.xpm_timer_block.address);
+
+#if defined (CONFIG_GENERIC_TIME) && defined (CONFIG_X86_TSC)
+        /* TSC could halt in idle, so notify users */
+        mark_tsc_unstable("TSC halts in idle");;
+#endif
+
+        local_irq_enable();
+        current_thread_info()->status |= TS_POLLING;
+
+        cx->usage++;
+
+        acpi_state_timer_broadcast(pr, cx, 0);
+        cx->time += ticks_elapsed(t1, t2);
+        return ticks_elapsed_in_us(t1, t2);
+}
+
+static int c3_cpu_count;
+static DEFINE_SPINLOCK(c3_lock);
+
+/**
+ * acpi_idle_enter_bm - enters C3 with proper BM handling
+ * @dev: the target CPU
+ * @state: the state data
+ *
+ * If BM is detected, the deepest non-C3 idle state is entered instead.
+ */
+static int acpi_idle_enter_bm(struct cpuidle_device *dev,
+                              struct cpuidle_state *state)
+{
+        struct acpi_processor *pr;
+        struct acpi_processor_cx *cx = cpuidle_get_statedata(state);
+        u32 t1, t2;
+        pr = processors[smp_processor_id()];
+
+        if (unlikely(!pr))
+                return 0;
+
+        if (acpi_idle_suspend)
+                return(acpi_idle_enter_c1(dev, state));
+
+        local_irq_disable();
+        current_thread_info()->status &= ~TS_POLLING;
+        /*
+         * TS_POLLING-cleared state must be visible before we test
+         * NEED_RESCHED:
+         */
+        smp_mb();
+
+        if (unlikely(need_resched())) {
+                current_thread_info()->status |= TS_POLLING;
+                local_irq_enable();
+                return 0;
+        }
+
+        /*
+         * Must be done before busmaster disable as we might need to
+         * access HPET !
+         */
+        acpi_state_timer_broadcast(pr, cx, 1);
+
+        if (acpi_idle_bm_check()) {
+                cx = pr->power.bm_state;
+
+                acpi_idle_update_bm_rld(pr, cx);
+
+                t1 = inl(acpi_gbl_FADT.xpm_timer_block.address);
+                acpi_idle_do_entry(cx);
+                t2 = inl(acpi_gbl_FADT.xpm_timer_block.address);
+        } else {
+                acpi_idle_update_bm_rld(pr, cx);
+
+                spin_lock(&c3_lock);
+                c3_cpu_count++;
+                /* Disable bus master arbitration when all CPUs are in C3 */
+                if (c3_cpu_count == num_online_cpus())
+                        acpi_set_register(ACPI_BITREG_ARB_DISABLE, 1);
+                spin_unlock(&c3_lock);
+
+                t1 = inl(acpi_gbl_FADT.xpm_timer_block.address);
+                acpi_idle_do_entry(cx);
+                t2 = inl(acpi_gbl_FADT.xpm_timer_block.address);
+
+                spin_lock(&c3_lock);
+                /* Re-enable bus master arbitration */
+                if (c3_cpu_count == num_online_cpus())
+                        acpi_set_register(ACPI_BITREG_ARB_DISABLE, 0);
+                c3_cpu_count--;
+                spin_unlock(&c3_lock);
+        }
+
+#if defined (CONFIG_GENERIC_TIME) && defined (CONFIG_X86_TSC)
+        /* TSC could halt in idle, so notify users */
+        mark_tsc_unstable("TSC halts in idle");
+#endif
+
+        local_irq_enable();
+        current_thread_info()->status |= TS_POLLING;
+
+        cx->usage++;
+
+        acpi_state_timer_broadcast(pr, cx, 0);
+        cx->time += ticks_elapsed(t1, t2);
+        return ticks_elapsed_in_us(t1, t2);
+}
+
+struct cpuidle_driver acpi_idle_driver = {
+        .name =         "acpi_idle",
+        .owner =        THIS_MODULE,
+};
+
+/**
+ * acpi_processor_setup_cpuidle - prepares and configures CPUIDLE
+ * @pr: the ACPI processor
+ */
+static int acpi_processor_setup_cpuidle(struct acpi_processor *pr)
+{
+        int i, count = 0;
+        struct acpi_processor_cx *cx;
+        struct cpuidle_state *state;
+        struct cpuidle_device *dev = &pr->power.dev;
+
+        if (!pr->flags.power_setup_done)
+                return -EINVAL;
+
+        if (pr->flags.power == 0) {
+                return -EINVAL;
+        }
+
+        for (i = 1; i < ACPI_PROCESSOR_MAX_POWER && i <= max_cstate; i++) {
+                cx = &pr->power.states[i];
+                state = &dev->states[count];
+
+                if (!cx->valid)
+                        continue;
+
+#ifdef CONFIG_HOTPLUG_CPU
+                if ((cx->type != ACPI_STATE_C1) && (num_online_cpus() > 1) &&
+                    !pr->flags.has_cst &&
+                    !(acpi_gbl_FADT.flags & ACPI_FADT_C2_MP_SUPPORTED))
+                        continue;
 #endif
+                cpuidle_set_statedata(state, cx);
+
+                snprintf(state->name, CPUIDLE_NAME_LEN, "C%d", i);
+                state->exit_latency = cx->latency;
+                state->target_residency = cx->latency * 6;
+                state->power_usage = cx->power;
+
+                state->flags = 0;
+                switch (cx->type) {
+                        case ACPI_STATE_C1:
+                        state->flags |= CPUIDLE_FLAG_SHALLOW;
+                        state->enter = acpi_idle_enter_c1;
+                        break;
+
+                        case ACPI_STATE_C2:
+                        state->flags |= CPUIDLE_FLAG_BALANCED;
+                        state->flags |= CPUIDLE_FLAG_TIME_VALID;
+                        state->enter = acpi_idle_enter_simple;
+                        break;
+
+                        case ACPI_STATE_C3:
+                        state->flags |= CPUIDLE_FLAG_DEEP;
+                        state->flags |= CPUIDLE_FLAG_TIME_VALID;
+                        state->flags |= CPUIDLE_FLAG_CHECK_BM;
+                        state->enter = pr->flags.bm_check ?
+                                        acpi_idle_enter_bm :
+                                        acpi_idle_enter_simple;
+                        break;
+                }
+
+                count++;
+        }
+
+        dev->state_count = count;
+
+        if (!count)
+                return -EINVAL;
+
+        /* find the deepest state that can handle active BM */
+        if (pr->flags.bm_check) {
+                for (i = 1; i < ACPI_PROCESSOR_MAX_POWER && i <= max_cstate; i++)
+                        if (pr->power.states[i].type == ACPI_STATE_C3)
+                                break;
+                pr->power.bm_state = &pr->power.states[i-1];
+        }
+
+        return 0;
+}
+
+int acpi_processor_cst_has_changed(struct acpi_processor *pr)
+{
+        int ret;
+
+        if (!pr)
+                return -EINVAL;
+
+        if (nocst) {
+                return -ENODEV;
+        }
+
+        if (!pr->flags.power_setup_done)
+                return -ENODEV;
+
+        cpuidle_pause_and_lock();
+        cpuidle_disable_device(&pr->power.dev);
+        acpi_processor_get_power_info(pr);
+        acpi_processor_setup_cpuidle(pr);
+        ret = cpuidle_enable_device(&pr->power.dev);
+        cpuidle_resume_and_unlock();
+
+        return ret;
+}
+
+#endif /* CONFIG_CPU_IDLE */
 
 int __cpuinit acpi_processor_power_init(struct acpi_processor *pr,
                               struct acpi_device *device)
@@ -1267,7 +1663,7 @@ int __cpuinit acpi_processor_power_init(struct acpi_processor *pr,
                                "ACPI: processor limited to max C-state %d\n",
                                max_cstate);
                 first_run++;
-#ifdef CONFIG_SMP
+#if !defined (CONFIG_CPU_IDLE) && defined (CONFIG_SMP)
                 register_latency_notifier(&acpi_processor_latency_notifier);
 #endif
         }
@@ -1285,6 +1681,7 @@ int __cpuinit acpi_processor_power_init(struct acpi_processor *pr,
         }
 
         acpi_processor_get_power_info(pr);
+        pr->flags.power_setup_done = 1;
 
         /*
          * Install the idle handler if processor power management is supported.
@@ -1292,6 +1689,13 @@ int __cpuinit acpi_processor_power_init(struct acpi_processor *pr,
          * platforms that only support C1.
          */
         if ((pr->flags.power) && (!boot_option_idle_override)) {
+#ifdef CONFIG_CPU_IDLE
+                acpi_processor_setup_cpuidle(pr);
+                pr->power.dev.cpu = pr->id;
+                if (cpuidle_register_device(&pr->power.dev))
+                        return -EIO;
+#endif
+
                 printk(KERN_INFO PREFIX "CPU%d (power states:", pr->id);
                 for (i = 1; i <= pr->power.count; i++)
                         if (pr->power.states[i].valid)
@@ -1299,10 +1703,12 @@ int __cpuinit acpi_processor_power_init(struct acpi_processor *pr,
                                        pr->power.states[i].type);
                 printk(")\n");
 
+#ifndef CONFIG_CPU_IDLE
                 if (pr->id == 0) {
                         pm_idle_save = pm_idle;
                         pm_idle = acpi_processor_idle;
                 }
+#endif
         }
 
         /* 'power' [R] */
@@ -1316,21 +1722,24 @@ int __cpuinit acpi_processor_power_init(struct acpi_processor *pr,
                 entry->owner = THIS_MODULE;
         }
 
-        pr->flags.power_setup_done = 1;
-
         return 0;
 }
 
 int acpi_processor_power_exit(struct acpi_processor *pr,
                               struct acpi_device *device)
 {
-
+#ifdef CONFIG_CPU_IDLE
+        if ((pr->flags.power) && (!boot_option_idle_override))
+                cpuidle_unregister_device(&pr->power.dev);
+#endif
         pr->flags.power_setup_done = 0;
 
         if (acpi_device_dir(device))
                 remove_proc_entry(ACPI_PROCESSOR_FILE_POWER,
                                   acpi_device_dir(device));
 
+#ifndef CONFIG_CPU_IDLE
+
         /* Unregister the idle handler when processor #0 is removed. */
         if (pr->id == 0) {
                 pm_idle = pm_idle_save;
@@ -1345,6 +1754,7 @@ int acpi_processor_power_exit(struct acpi_processor *pr,
                 unregister_latency_notifier(&acpi_processor_latency_notifier);
 #endif
         }
+#endif
 
         return 0;
 }
diff --git a/drivers/acpi/sbs.c b/drivers/acpi/sbs.c
index a578986e3214..90fd09c65f95 100644
--- a/drivers/acpi/sbs.c
+++ b/drivers/acpi/sbs.c
@@ -1,6 +1,8 @@
 /*
- *  acpi_sbs.c - ACPI Smart Battery System Driver ($Revision: 1.16 $)
+ *  sbs.c - ACPI Smart Battery System Driver ($Revision: 2.0 $)
  *
+ *  Copyright (c) 2007 Alexey Starikovskiy <astarikovskiy@suse.de>
+ *  Copyright (c) 2005-2007 Vladimir Lebedev <vladimir.p.lebedev@intel.com>
  *  Copyright (c) 2005 Rich Townsend <rhdt@bartol.udel.edu>
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -26,15 +28,22 @@
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/kernel.h>
+
+#ifdef CONFIG_ACPI_PROCFS
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
 #include <asm/uaccess.h>
+#endif
+
 #include <linux/acpi.h>
 #include <linux/timer.h>
 #include <linux/jiffies.h>
 #include <linux/delay.h>
 
-#define ACPI_SBS_COMPONENT              0x00080000
+#include <linux/power_supply.h>
+
+#include "sbshc.h"
+
 #define ACPI_SBS_CLASS                  "sbs"
 #define ACPI_AC_CLASS                   "ac_adapter"
 #define ACPI_BATTERY_CLASS              "battery"
@@ -44,836 +53,436 @@
 #define ACPI_SBS_FILE_ALARM             "alarm"
 #define ACPI_BATTERY_DIR_NAME           "BAT%i"
 #define ACPI_AC_DIR_NAME                "AC0"
-#define ACPI_SBC_SMBUS_ADDR             0x9
-#define ACPI_SBSM_SMBUS_ADDR            0xa
-#define ACPI_SB_SMBUS_ADDR              0xb
-#define ACPI_SBS_AC_NOTIFY_STATUS       0x80
-#define ACPI_SBS_BATTERY_NOTIFY_STATUS  0x80
-#define ACPI_SBS_BATTERY_NOTIFY_INFO    0x81
 
-#define _COMPONENT                      ACPI_SBS_COMPONENT
+enum acpi_sbs_device_addr {
+        ACPI_SBS_CHARGER = 0x9,
+        ACPI_SBS_MANAGER = 0xa,
+        ACPI_SBS_BATTERY = 0xb,
+};
 
-ACPI_MODULE_NAME("sbs");
+#define ACPI_SBS_NOTIFY_STATUS          0x80
+#define ACPI_SBS_NOTIFY_INFO            0x81
 
-MODULE_AUTHOR("Rich Townsend");
+MODULE_AUTHOR("Alexey Starikovskiy <astarikovskiy@suse.de>");
 MODULE_DESCRIPTION("Smart Battery System ACPI interface driver");
 MODULE_LICENSE("GPL");
 
-#define xmsleep(t)      msleep(t)
-
-#define ACPI_EC_SMB_PRTCL       0x00    /* protocol, PEC */
-
-#define ACPI_EC_SMB_STS         0x01    /* status */
-#define ACPI_EC_SMB_ADDR        0x02    /* address */
-#define ACPI_EC_SMB_CMD         0x03    /* command */
-#define ACPI_EC_SMB_DATA        0x04    /* 32 data registers */
-#define ACPI_EC_SMB_BCNT        0x24    /* number of data bytes */
-
-#define ACPI_EC_SMB_STS_DONE    0x80
-#define ACPI_EC_SMB_STS_STATUS  0x1f
-
-#define ACPI_EC_SMB_PRTCL_WRITE         0x00
-#define ACPI_EC_SMB_PRTCL_READ          0x01
-#define ACPI_EC_SMB_PRTCL_WORD_DATA     0x08
-#define ACPI_EC_SMB_PRTCL_BLOCK_DATA    0x0a
-
-#define ACPI_EC_SMB_TRANSACTION_SLEEP   1
-#define ACPI_EC_SMB_ACCESS_SLEEP1       1
-#define ACPI_EC_SMB_ACCESS_SLEEP2       10
-
-#define DEF_CAPACITY_UNIT       3
-#define MAH_CAPACITY_UNIT       1
-#define MWH_CAPACITY_UNIT       2
-#define CAPACITY_UNIT           DEF_CAPACITY_UNIT
-
-#define REQUEST_UPDATE_MODE     1
-#define QUEUE_UPDATE_MODE       2
-
-#define DATA_TYPE_COMMON        0
-#define DATA_TYPE_INFO          1
-#define DATA_TYPE_STATE         2
-#define DATA_TYPE_ALARM         3
-#define DATA_TYPE_AC_STATE      4
+static unsigned int cache_time = 1000;
+module_param(cache_time, uint, 0644);
+MODULE_PARM_DESC(cache_time, "cache time in milliseconds");
 
 extern struct proc_dir_entry *acpi_lock_ac_dir(void);
 extern struct proc_dir_entry *acpi_lock_battery_dir(void);
 extern void acpi_unlock_ac_dir(struct proc_dir_entry *acpi_ac_dir);
 extern void acpi_unlock_battery_dir(struct proc_dir_entry *acpi_battery_dir);
 
-#define MAX_SBS_BAT                     4
+#define MAX_SBS_BAT                     4
 #define ACPI_SBS_BLOCK_MAX              32
 
-#define ACPI_SBS_SMBUS_READ             1
-#define ACPI_SBS_SMBUS_WRITE            2
-
-#define ACPI_SBS_WORD_DATA              1
-#define ACPI_SBS_BLOCK_DATA             2
-
-#define UPDATE_DELAY    10
-
-/* 0 - every time, > 0 - by update_time */
-static unsigned int update_time = 120;
-
-static unsigned int capacity_mode = CAPACITY_UNIT;
-
-module_param(update_time, uint, 0644);
-module_param(capacity_mode, uint, 0444);
-
-static int acpi_sbs_add(struct acpi_device *device);
-static int acpi_sbs_remove(struct acpi_device *device, int type);
-static int acpi_sbs_resume(struct acpi_device *device);
-
 static const struct acpi_device_id sbs_device_ids[] = {
-        {"ACPI0001", 0},
-        {"ACPI0005", 0},
+        {"ACPI0002", 0},
         {"", 0},
 };
 MODULE_DEVICE_TABLE(acpi, sbs_device_ids);
 
-static struct acpi_driver acpi_sbs_driver = {
-        .name = "sbs",
-        .class = ACPI_SBS_CLASS,
-        .ids = sbs_device_ids,
-        .ops = {
-                .add = acpi_sbs_add,
-                .remove = acpi_sbs_remove,
-                .resume = acpi_sbs_resume,
-                },
-};
-
-struct acpi_ac {
-        int ac_present;
-};
-
-struct acpi_battery_info {
-        int capacity_mode;
-        s16 full_charge_capacity;
-        s16 design_capacity;
-        s16 design_voltage;
-        int vscale;
-        int ipscale;
-        s16 serial_number;
-        char manufacturer_name[ACPI_SBS_BLOCK_MAX + 3];
-        char device_name[ACPI_SBS_BLOCK_MAX + 3];
-        char device_chemistry[ACPI_SBS_BLOCK_MAX + 3];
-};
-
-struct acpi_battery_state {
-        s16 voltage;
-        s16 amperage;
-        s16 remaining_capacity;
-        s16 battery_state;
-};
-
-struct acpi_battery_alarm {
-        s16 remaining_capacity;
-};
-
 struct acpi_battery {
-        int alive;
-        int id;
-        int init_state;
-        int battery_present;
+        struct power_supply bat;
         struct acpi_sbs *sbs;
-        struct acpi_battery_info info;
-        struct acpi_battery_state state;
-        struct acpi_battery_alarm alarm;
-        struct proc_dir_entry *battery_entry;
+#ifdef CONFIG_ACPI_PROCFS
+        struct proc_dir_entry *proc_entry;
+#endif
+        unsigned long update_time;
+        char name[8];
+        char manufacturer_name[ACPI_SBS_BLOCK_MAX];
+        char device_name[ACPI_SBS_BLOCK_MAX];
+        char device_chemistry[ACPI_SBS_BLOCK_MAX];
+        u16 alarm_capacity;
+        u16 full_charge_capacity;
+        u16 design_capacity;
+        u16 design_voltage;
+        u16 serial_number;
+        u16 cycle_count;
+        u16 temp_now;
+        u16 voltage_now;
+        s16 current_now;
+        s16 current_avg;
+        u16 capacity_now;
+        u16 state_of_charge;
+        u16 state;
+        u16 mode;
+        u16 spec;
+        u8 id;
+        u8 present:1;
 };
 
+#define to_acpi_battery(x) container_of(x, struct acpi_battery, bat);
+
 struct acpi_sbs {
-        int base;
+        struct power_supply charger;
         struct acpi_device *device;
-        struct mutex mutex;
-        int sbsm_present;
-        int sbsm_batteries_supported;
-        struct proc_dir_entry *ac_entry;
-        struct acpi_ac ac;
+        struct acpi_smb_hc *hc;
+        struct mutex lock;
+#ifdef CONFIG_ACPI_PROCFS
+        struct proc_dir_entry *charger_entry;
+#endif
         struct acpi_battery battery[MAX_SBS_BAT];
-        int zombie;
-        struct timer_list update_timer;
-        int run_cnt;
-        int update_proc_flg;
+        u8 batteries_supported:4;
+        u8 manager_present:1;
+        u8 charger_present:1;
 };
 
-static int acpi_sbs_update_run(struct acpi_sbs *sbs, int id, int data_type);
-static void acpi_sbs_update_time(void *data);
+#define to_acpi_sbs(x) container_of(x, struct acpi_sbs, charger)
 
-union sbs_rw_data {
-        u16 word;
-        u8 block[ACPI_SBS_BLOCK_MAX + 2];
-};
-
-static int acpi_ec_sbs_access(struct acpi_sbs *sbs, u16 addr,
-                              char read_write, u8 command, int size,
-                              union sbs_rw_data *data);
-
-/* --------------------------------------------------------------------------
-                               SMBus Communication
-   -------------------------------------------------------------------------- */
-
-static int acpi_ec_sbs_read(struct acpi_sbs *sbs, u8 address, u8 * data)
+static inline int battery_scale(int log)
 {
-        u8 val;
-        int err;
-
-        err = ec_read(sbs->base + address, &val);
-        if (!err) {
-                *data = val;
-        }
-        xmsleep(ACPI_EC_SMB_TRANSACTION_SLEEP);
-        return (err);
-}
-
-static int acpi_ec_sbs_write(struct acpi_sbs *sbs, u8 address, u8 data)
-{
-        int err;
-
-        err = ec_write(sbs->base + address, data);
-        return (err);
-}
-
-static int
-acpi_ec_sbs_access(struct acpi_sbs *sbs, u16 addr,
-                   char read_write, u8 command, int size,
-                   union sbs_rw_data *data)
-{
-        unsigned char protocol, len = 0, temp[2] = { 0, 0 };
-        int i;
-
-        if (read_write == ACPI_SBS_SMBUS_READ) {
-                protocol = ACPI_EC_SMB_PRTCL_READ;
-        } else {
-                protocol = ACPI_EC_SMB_PRTCL_WRITE;
-        }
-
-        switch (size) {
-
-        case ACPI_SBS_WORD_DATA:
-                acpi_ec_sbs_write(sbs, ACPI_EC_SMB_CMD, command);
-                if (read_write == ACPI_SBS_SMBUS_WRITE) {
-                        acpi_ec_sbs_write(sbs, ACPI_EC_SMB_DATA, data->word);
-                        acpi_ec_sbs_write(sbs, ACPI_EC_SMB_DATA + 1,
-                                          data->word >> 8);
-                }
-                protocol |= ACPI_EC_SMB_PRTCL_WORD_DATA;
-                break;
-        case ACPI_SBS_BLOCK_DATA:
-                acpi_ec_sbs_write(sbs, ACPI_EC_SMB_CMD, command);
-                if (read_write == ACPI_SBS_SMBUS_WRITE) {
-                        len = min_t(u8, data->block[0], 32);
-                        acpi_ec_sbs_write(sbs, ACPI_EC_SMB_BCNT, len);
-                        for (i = 0; i < len; i++)
-                                acpi_ec_sbs_write(sbs, ACPI_EC_SMB_DATA + i,
-                                                  data->block[i + 1]);
-                }
-                protocol |= ACPI_EC_SMB_PRTCL_BLOCK_DATA;
-                break;
-        default:
-                ACPI_EXCEPTION((AE_INFO, AE_ERROR,
-                                "unsupported transaction %d", size));
-                return (-1);
-        }
-
-        acpi_ec_sbs_write(sbs, ACPI_EC_SMB_ADDR, addr << 1);
-        acpi_ec_sbs_write(sbs, ACPI_EC_SMB_PRTCL, protocol);
-
-        acpi_ec_sbs_read(sbs, ACPI_EC_SMB_STS, temp);
-
-        if (~temp[0] & ACPI_EC_SMB_STS_DONE) {
-                xmsleep(ACPI_EC_SMB_ACCESS_SLEEP1);
-                acpi_ec_sbs_read(sbs, ACPI_EC_SMB_STS, temp);
-        }
-        if (~temp[0] & ACPI_EC_SMB_STS_DONE) {
-                xmsleep(ACPI_EC_SMB_ACCESS_SLEEP2);
-                acpi_ec_sbs_read(sbs, ACPI_EC_SMB_STS, temp);
-        }
-        if ((~temp[0] & ACPI_EC_SMB_STS_DONE)
-            || (temp[0] & ACPI_EC_SMB_STS_STATUS)) {
-                ACPI_EXCEPTION((AE_INFO, AE_ERROR,
-                                "transaction %d error", size));
-                return (-1);
-        }
-
-        if (read_write == ACPI_SBS_SMBUS_WRITE) {
-                return (0);
-        }
-
-        switch (size) {
-
-        case ACPI_SBS_WORD_DATA:
-                acpi_ec_sbs_read(sbs, ACPI_EC_SMB_DATA, temp);
-                acpi_ec_sbs_read(sbs, ACPI_EC_SMB_DATA + 1, temp + 1);
-                data->word = (temp[1] << 8) | temp[0];
-                break;
-
-        case ACPI_SBS_BLOCK_DATA:
-                len = 0;
-                acpi_ec_sbs_read(sbs, ACPI_EC_SMB_BCNT, &len);
-                len = min_t(u8, len, 32);
-                for (i = 0; i < len; i++)
-                        acpi_ec_sbs_read(sbs, ACPI_EC_SMB_DATA + i,
-                                         data->block + i + 1);
-                data->block[0] = len;
-                break;
-        default:
-                ACPI_EXCEPTION((AE_INFO, AE_ERROR,
-                                "unsupported transaction %d", size));
-                return (-1);
-        }
-
-        return (0);
+        int scale = 1;
+        while (log--)
+                scale *= 10;
+        return scale;
 }
 
-static int
-acpi_sbs_read_word(struct acpi_sbs *sbs, int addr, int func, u16 * word)
+static inline int acpi_battery_vscale(struct acpi_battery *battery)
 {
-        union sbs_rw_data data;
-        int result = 0;
-
-        result = acpi_ec_sbs_access(sbs, addr,
-                                    ACPI_SBS_SMBUS_READ, func,
-                                    ACPI_SBS_WORD_DATA, &data);
-        if (result) {
-                ACPI_EXCEPTION((AE_INFO, AE_ERROR,
-                                "acpi_ec_sbs_access() failed"));
-        } else {
-                *word = data.word;
-        }
-
-        return result;
+        return battery_scale((battery->spec & 0x0f00) >> 8);
 }
 
-static int
-acpi_sbs_read_str(struct acpi_sbs *sbs, int addr, int func, char *str)
+static inline int acpi_battery_ipscale(struct acpi_battery *battery)
 {
-        union sbs_rw_data data;
-        int result = 0;
-
-        result = acpi_ec_sbs_access(sbs, addr,
-                                    ACPI_SBS_SMBUS_READ, func,
-                                    ACPI_SBS_BLOCK_DATA, &data);
-        if (result) {
-                ACPI_EXCEPTION((AE_INFO, AE_ERROR,
-                                "acpi_ec_sbs_access() failed"));
-        } else {
-                strncpy(str, (const char *)data.block + 1, data.block[0]);
-                str[data.block[0]] = 0;
-        }
-
-        return result;
+        return battery_scale((battery->spec & 0xf000) >> 12);
 }
 
-static int
-acpi_sbs_write_word(struct acpi_sbs *sbs, int addr, int func, int word)
+static inline int acpi_battery_mode(struct acpi_battery *battery)
 {
-        union sbs_rw_data data;
-        int result = 0;
-
-        data.word = word;
-
-        result = acpi_ec_sbs_access(sbs, addr,
-                                    ACPI_SBS_SMBUS_WRITE, func,
-                                    ACPI_SBS_WORD_DATA, &data);
-        if (result) {
-                ACPI_EXCEPTION((AE_INFO, AE_ERROR,
-                                "acpi_ec_sbs_access() failed"));
-        }
-
-        return result;
+        return (battery->mode & 0x8000);
 }
 
-static int sbs_zombie(struct acpi_sbs *sbs)
+static inline int acpi_battery_scale(struct acpi_battery *battery)
 {
-        return (sbs->zombie);
+        return (acpi_battery_mode(battery) ? 10 : 1) *
+            acpi_battery_ipscale(battery);
 }
 
-static int sbs_mutex_lock(struct acpi_sbs *sbs)
+static int sbs_get_ac_property(struct power_supply *psy,
+                               enum power_supply_property psp,
+                               union power_supply_propval *val)
 {
-        if (sbs_zombie(sbs)) {
-                return -ENODEV;
+        struct acpi_sbs *sbs = to_acpi_sbs(psy);
+        switch (psp) {
+        case POWER_SUPPLY_PROP_ONLINE:
+                val->intval = sbs->charger_present;
+                break;
+        default:
+                return -EINVAL;
         }
-        mutex_lock(&sbs->mutex);
         return 0;
 }
 
-static void sbs_mutex_unlock(struct acpi_sbs *sbs)
+static int acpi_battery_technology(struct acpi_battery *battery)
 {
-        mutex_unlock(&sbs->mutex);
+        if (!strcasecmp("NiCd", battery->device_chemistry))
+                return POWER_SUPPLY_TECHNOLOGY_NiCd;
+        if (!strcasecmp("NiMH", battery->device_chemistry))
+                return POWER_SUPPLY_TECHNOLOGY_NiMH;
+        if (!strcasecmp("LION", battery->device_chemistry))
+                return POWER_SUPPLY_TECHNOLOGY_LION;
+        if (!strcasecmp("LiP", battery->device_chemistry))
+                return POWER_SUPPLY_TECHNOLOGY_LIPO;
+        return POWER_SUPPLY_TECHNOLOGY_UNKNOWN;
 }
 
-/* --------------------------------------------------------------------------
-                            Smart Battery System Management
-   -------------------------------------------------------------------------- */
-
-static int acpi_check_update_proc(struct acpi_sbs *sbs)
+static int acpi_sbs_battery_get_property(struct power_supply *psy,
+                                         enum power_supply_property psp,
+                                         union power_supply_propval *val)
 {
-        acpi_status status = AE_OK;
+        struct acpi_battery *battery = to_acpi_battery(psy);
 
-        if (update_time == 0) {
-                sbs->update_proc_flg = 0;
-                return 0;
-        }
-        if (sbs->update_proc_flg == 0) {
-                status = acpi_os_execute(OSL_GPE_HANDLER,
-                                         acpi_sbs_update_time, sbs);
-                if (status != AE_OK) {
-                        ACPI_EXCEPTION((AE_INFO, status,
-                                        "acpi_os_execute() failed"));
-                        return 1;
-                }
-                sbs->update_proc_flg = 1;
+        if ((!battery->present) && psp != POWER_SUPPLY_PROP_PRESENT)
+                return -ENODEV;
+        switch (psp) {
+        case POWER_SUPPLY_PROP_STATUS:
+                if (battery->current_now < 0)
+                        val->intval = POWER_SUPPLY_STATUS_DISCHARGING;
+                else if (battery->current_now > 0)
+                        val->intval = POWER_SUPPLY_STATUS_CHARGING;
+                else
+                        val->intval = POWER_SUPPLY_STATUS_FULL;
+                break;
+        case POWER_SUPPLY_PROP_PRESENT:
+                val->intval = battery->present;
+                break;
+        case POWER_SUPPLY_PROP_TECHNOLOGY:
+                val->intval = acpi_battery_technology(battery);
+                break;
+        case POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN:
+                val->intval = battery->design_voltage *
+                        acpi_battery_vscale(battery) * 1000;
+                break;
+        case POWER_SUPPLY_PROP_VOLTAGE_NOW:
+                val->intval = battery->voltage_now *
+                                acpi_battery_vscale(battery) * 1000;
+                break;
+        case POWER_SUPPLY_PROP_CURRENT_NOW:
+                val->intval = abs(battery->current_now) *
+                                acpi_battery_ipscale(battery) * 1000;
+                break;
+        case POWER_SUPPLY_PROP_CURRENT_AVG:
+                val->intval = abs(battery->current_avg) *
+                                acpi_battery_ipscale(battery) * 1000;
+                break;
+        case POWER_SUPPLY_PROP_CAPACITY:
+                val->intval = battery->state_of_charge;
+                break;
+        case POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN:
+        case POWER_SUPPLY_PROP_ENERGY_FULL_DESIGN:
+                val->intval = battery->design_capacity *
+                        acpi_battery_scale(battery) * 1000;
+                break;
+        case POWER_SUPPLY_PROP_CHARGE_FULL:
+        case POWER_SUPPLY_PROP_ENERGY_FULL:
+                val->intval = battery->full_charge_capacity *
+                        acpi_battery_scale(battery) * 1000;
+                break;
+        case POWER_SUPPLY_PROP_CHARGE_NOW:
+        case POWER_SUPPLY_PROP_ENERGY_NOW:
+                val->intval = battery->capacity_now *
+                                acpi_battery_scale(battery) * 1000;
+                break;
+        case POWER_SUPPLY_PROP_TEMP:
+                val->intval = battery->temp_now - 2730; // dK -> dC
+                break;
+        case POWER_SUPPLY_PROP_MODEL_NAME:
+                val->strval = battery->device_name;
+                break;
+        case POWER_SUPPLY_PROP_MANUFACTURER:
+                val->strval = battery->manufacturer_name;
+                break;
+        default:
+                return -EINVAL;
         }
         return 0;
 }
 
-static int acpi_sbs_generate_event(struct acpi_device *device,
-                                   int event, int state, char *bid, char *class)
-{
-        char bid_saved[5];
-        char class_saved[20];
-        int result = 0;
-
-        strcpy(bid_saved, acpi_device_bid(device));
-        strcpy(class_saved, acpi_device_class(device));
-
-        strcpy(acpi_device_bid(device), bid);
-        strcpy(acpi_device_class(device), class);
-
-        result = acpi_bus_generate_proc_event(device, event, state);
-
-        strcpy(acpi_device_bid(device), bid_saved);
-        strcpy(acpi_device_class(device), class_saved);
-
-        acpi_bus_generate_netlink_event(class, bid, event, state);
-        return result;
-}
-
-static int acpi_battery_get_present(struct acpi_battery *battery)
-{
-        s16 state;
-        int result = 0;
-        int is_present = 0;
-
-        result = acpi_sbs_read_word(battery->sbs,
-                                    ACPI_SBSM_SMBUS_ADDR, 0x01, &state);
-        if (result) {
-                ACPI_EXCEPTION((AE_INFO, AE_ERROR,
-                                "acpi_sbs_read_word() failed"));
-        }
-        if (!result) {
-                is_present = (state & 0x000f) & (1 << battery->id);
-        }
-        battery->battery_present = is_present;
-
-        return result;
-}
+static enum power_supply_property sbs_ac_props[] = {
+        POWER_SUPPLY_PROP_ONLINE,
+};
 
-static int acpi_battery_select(struct acpi_battery *battery)
-{
-        struct acpi_sbs *sbs = battery->sbs;
-        int result = 0;
-        s16 state;
-        int foo;
+static enum power_supply_property sbs_charge_battery_props[] = {
+        POWER_SUPPLY_PROP_STATUS,
+        POWER_SUPPLY_PROP_PRESENT,
+        POWER_SUPPLY_PROP_TECHNOLOGY,
+        POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN,
+        POWER_SUPPLY_PROP_VOLTAGE_NOW,
+        POWER_SUPPLY_PROP_CURRENT_NOW,
+        POWER_SUPPLY_PROP_CURRENT_AVG,
+        POWER_SUPPLY_PROP_CAPACITY,
+        POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN,
+        POWER_SUPPLY_PROP_CHARGE_FULL,
+        POWER_SUPPLY_PROP_CHARGE_NOW,
+        POWER_SUPPLY_PROP_TEMP,
+        POWER_SUPPLY_PROP_MODEL_NAME,
+        POWER_SUPPLY_PROP_MANUFACTURER,
+};
 
-        if (sbs->sbsm_present) {
+static enum power_supply_property sbs_energy_battery_props[] = {
+        POWER_SUPPLY_PROP_STATUS,
+        POWER_SUPPLY_PROP_PRESENT,
+        POWER_SUPPLY_PROP_TECHNOLOGY,
+        POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN,
+        POWER_SUPPLY_PROP_VOLTAGE_NOW,
+        POWER_SUPPLY_PROP_CURRENT_NOW,
+        POWER_SUPPLY_PROP_CURRENT_AVG,
+        POWER_SUPPLY_PROP_CAPACITY,
+        POWER_SUPPLY_PROP_ENERGY_FULL_DESIGN,
+        POWER_SUPPLY_PROP_ENERGY_FULL,
+        POWER_SUPPLY_PROP_ENERGY_NOW,
+        POWER_SUPPLY_PROP_TEMP,
+        POWER_SUPPLY_PROP_MODEL_NAME,
+        POWER_SUPPLY_PROP_MANUFACTURER,
+};
 
-                /* Take special care not to knobble other nibbles of
-                 * state (aka selector_state), since
-                 * it causes charging to halt on SBSELs */
+/* --------------------------------------------------------------------------
+                            Smart Battery System Management
+   -------------------------------------------------------------------------- */
 
-                result =
-                    acpi_sbs_read_word(sbs, ACPI_SBSM_SMBUS_ADDR, 0x01, &state);
-                if (result) {
-                        ACPI_EXCEPTION((AE_INFO, AE_ERROR,
-                                        "acpi_sbs_read_word() failed"));
-                        goto end;
-                }
+struct acpi_battery_reader {
+        u8 command;             /* command for battery */
+        u8 mode;                /* word or block? */
+        size_t offset;          /* offset inside struct acpi_sbs_battery */
+};
 
-                foo = (state & 0x0fff) | (1 << (battery->id + 12));
-                result =
-                    acpi_sbs_write_word(sbs, ACPI_SBSM_SMBUS_ADDR, 0x01, foo);
-                if (result) {
-                        ACPI_EXCEPTION((AE_INFO, AE_ERROR,
-                                        "acpi_sbs_write_word() failed"));
-                        goto end;
-                }
-        }
+static struct acpi_battery_reader info_readers[] = {
+        {0x01, SMBUS_READ_WORD, offsetof(struct acpi_battery, alarm_capacity)},
+        {0x03, SMBUS_READ_WORD, offsetof(struct acpi_battery, mode)},
+        {0x10, SMBUS_READ_WORD, offsetof(struct acpi_battery, full_charge_capacity)},
+        {0x17, SMBUS_READ_WORD, offsetof(struct acpi_battery, cycle_count)},
+        {0x18, SMBUS_READ_WORD, offsetof(struct acpi_battery, design_capacity)},
+        {0x19, SMBUS_READ_WORD, offsetof(struct acpi_battery, design_voltage)},
+        {0x1a, SMBUS_READ_WORD, offsetof(struct acpi_battery, spec)},
+        {0x1c, SMBUS_READ_WORD, offsetof(struct acpi_battery, serial_number)},
+        {0x20, SMBUS_READ_BLOCK, offsetof(struct acpi_battery, manufacturer_name)},
+        {0x21, SMBUS_READ_BLOCK, offsetof(struct acpi_battery, device_name)},
+        {0x22, SMBUS_READ_BLOCK, offsetof(struct acpi_battery, device_chemistry)},
+};
 
-      end:
-        return result;
-}
+static struct acpi_battery_reader state_readers[] = {
+        {0x08, SMBUS_READ_WORD, offsetof(struct acpi_battery, temp_now)},
+        {0x09, SMBUS_READ_WORD, offsetof(struct acpi_battery, voltage_now)},
+        {0x0a, SMBUS_READ_WORD, offsetof(struct acpi_battery, current_now)},
+        {0x0b, SMBUS_READ_WORD, offsetof(struct acpi_battery, current_avg)},
+        {0x0f, SMBUS_READ_WORD, offsetof(struct acpi_battery, capacity_now)},
+        {0x0e, SMBUS_READ_WORD, offsetof(struct acpi_battery, state_of_charge)},
+        {0x16, SMBUS_READ_WORD, offsetof(struct acpi_battery, state)},
+};
 
-static int acpi_sbsm_get_info(struct acpi_sbs *sbs)
+static int acpi_manager_get_info(struct acpi_sbs *sbs)
 {
         int result = 0;
-        s16 battery_system_info;
-
-        result = acpi_sbs_read_word(sbs, ACPI_SBSM_SMBUS_ADDR, 0x04,
-                                    &battery_system_info);
-        if (result) {
-                ACPI_EXCEPTION((AE_INFO, AE_ERROR,
-                                "acpi_sbs_read_word() failed"));
-                goto end;
-        }
-        sbs->sbsm_present = 1;
-        sbs->sbsm_batteries_supported = battery_system_info & 0x000f;
-
-      end:
+        u16 battery_system_info;
 
+        result = acpi_smbus_read(sbs->hc, SMBUS_READ_WORD, ACPI_SBS_MANAGER,
+                                 0x04, (u8 *)&battery_system_info);
+        if (!result)
+                sbs->batteries_supported = battery_system_info & 0x000f;
         return result;
 }
 
 static int acpi_battery_get_info(struct acpi_battery *battery)
 {
-        struct acpi_sbs *sbs = battery->sbs;
-        int result = 0;
-        s16 battery_mode;
-        s16 specification_info;
-
-        result = acpi_sbs_read_word(sbs, ACPI_SB_SMBUS_ADDR, 0x03,
-                                    &battery_mode);
-        if (result) {
-                ACPI_EXCEPTION((AE_INFO, AE_ERROR,
-                                "acpi_sbs_read_word() failed"));
-                goto end;
-        }
-        battery->info.capacity_mode = (battery_mode & 0x8000) >> 15;
-
-        result = acpi_sbs_read_word(sbs, ACPI_SB_SMBUS_ADDR, 0x10,
-                                    &battery->info.full_charge_capacity);
-        if (result) {
-                ACPI_EXCEPTION((AE_INFO, AE_ERROR,
-                                "acpi_sbs_read_word() failed"));
-                goto end;
-        }
-
-        result = acpi_sbs_read_word(sbs, ACPI_SB_SMBUS_ADDR, 0x18,
-                                    &battery->info.design_capacity);
-
-        if (result) {
-                ACPI_EXCEPTION((AE_INFO, AE_ERROR,
-                                "acpi_sbs_read_word() failed"));
-                goto end;
-        }
-
-        result = acpi_sbs_read_word(sbs, ACPI_SB_SMBUS_ADDR, 0x19,
-                                    &battery->info.design_voltage);
-        if (result) {
-                ACPI_EXCEPTION((AE_INFO, AE_ERROR,
-                                "acpi_sbs_read_word() failed"));
-                goto end;
+        int i, result = 0;
+
+        for (i = 0; i < ARRAY_SIZE(info_readers); ++i) {
+                result = acpi_smbus_read(battery->sbs->hc,
+                                         info_readers[i].mode,
+                                         ACPI_SBS_BATTERY,
+                                         info_readers[i].command,
+                                         (u8 *) battery +
+                                                info_readers[i].offset);
+                if (result)
+                        break;
         }
-
-        result = acpi_sbs_read_word(sbs, ACPI_SB_SMBUS_ADDR, 0x1a,
-                                    &specification_info);
-        if (result) {
-                ACPI_EXCEPTION((AE_INFO, AE_ERROR,
-                                "acpi_sbs_read_word() failed"));
-                goto end;
-        }
-
-        switch ((specification_info & 0x0f00) >> 8) {
-        case 1:
-                battery->info.vscale = 10;
-                break;
-        case 2:
-                battery->info.vscale = 100;
-                break;
-        case 3:
-                battery->info.vscale = 1000;
-                break;
-        default:
-                battery->info.vscale = 1;
-        }
-
-        switch ((specification_info & 0xf000) >> 12) {
-        case 1:
-                battery->info.ipscale = 10;
-                break;
-        case 2:
-                battery->info.ipscale = 100;
-                break;
-        case 3:
-                battery->info.ipscale = 1000;
-                break;
-        default:
-                battery->info.ipscale = 1;
-        }
-
-        result = acpi_sbs_read_word(sbs, ACPI_SB_SMBUS_ADDR, 0x1c,
-                                    &battery->info.serial_number);
-        if (result) {
-                ACPI_EXCEPTION((AE_INFO, AE_ERROR,
-                                "acpi_sbs_read_word() failed"));
-                goto end;
-        }
-
-        result = acpi_sbs_read_str(sbs, ACPI_SB_SMBUS_ADDR, 0x20,
-                                   battery->info.manufacturer_name);
-        if (result) {
-                ACPI_EXCEPTION((AE_INFO, AE_ERROR,
-                                "acpi_sbs_read_str() failed"));
-                goto end;
-        }
-
-        result = acpi_sbs_read_str(sbs, ACPI_SB_SMBUS_ADDR, 0x21,
-                                   battery->info.device_name);
-        if (result) {
-                ACPI_EXCEPTION((AE_INFO, AE_ERROR,
-                                "acpi_sbs_read_str() failed"));
-                goto end;
-        }
-
-        result = acpi_sbs_read_str(sbs, ACPI_SB_SMBUS_ADDR, 0x22,
-                                   battery->info.device_chemistry);
-        if (result) {
-                ACPI_EXCEPTION((AE_INFO, AE_ERROR,
-                                "acpi_sbs_read_str() failed"));
-                goto end;
-        }
-
-      end:
         return result;
 }
 
 static int acpi_battery_get_state(struct acpi_battery *battery)
 {
-        struct acpi_sbs *sbs = battery->sbs;
-        int result = 0;
+        int i, result = 0;
 
-        result = acpi_sbs_read_word(sbs, ACPI_SB_SMBUS_ADDR, 0x09,
-                                    &battery->state.voltage);
-        if (result) {
-                ACPI_EXCEPTION((AE_INFO, AE_ERROR,
-                                "acpi_sbs_read_word() failed"));
-                goto end;
-        }
-
-        result = acpi_sbs_read_word(sbs, ACPI_SB_SMBUS_ADDR, 0x0a,
-                                    &battery->state.amperage);
-        if (result) {
-                ACPI_EXCEPTION((AE_INFO, AE_ERROR,
-                                "acpi_sbs_read_word() failed"));
-                goto end;
-        }
-
-        result = acpi_sbs_read_word(sbs, ACPI_SB_SMBUS_ADDR, 0x0f,
-                                    &battery->state.remaining_capacity);
-        if (result) {
-                ACPI_EXCEPTION((AE_INFO, AE_ERROR,
-                                "acpi_sbs_read_word() failed"));
-                goto end;
-        }
-
-        result = acpi_sbs_read_word(sbs, ACPI_SB_SMBUS_ADDR, 0x16,
-                                    &battery->state.battery_state);
-        if (result) {
-                ACPI_EXCEPTION((AE_INFO, AE_ERROR,
-                                "acpi_sbs_read_word() failed"));
-                goto end;
+        if (battery->update_time &&
+            time_before(jiffies, battery->update_time +
+                                msecs_to_jiffies(cache_time)))
+                return 0;
+        for (i = 0; i < ARRAY_SIZE(state_readers); ++i) {
+                result = acpi_smbus_read(battery->sbs->hc,
+                                         state_readers[i].mode,
+                                         ACPI_SBS_BATTERY,
+                                         state_readers[i].command,
+                                         (u8 *)battery +
+                                                state_readers[i].offset);
+                if (result)
+                        goto end;
         }
-
       end:
+        battery->update_time = jiffies;
         return result;
 }
 
 static int acpi_battery_get_alarm(struct acpi_battery *battery)
 {
-        struct acpi_sbs *sbs = battery->sbs;
-        int result = 0;
-
-        result = acpi_sbs_read_word(sbs, ACPI_SB_SMBUS_ADDR, 0x01,
-                                    &battery->alarm.remaining_capacity);
-        if (result) {
-                ACPI_EXCEPTION((AE_INFO, AE_ERROR,
-                                "acpi_sbs_read_word() failed"));
-                goto end;
-        }
-
-      end:
-
-        return result;
+        return acpi_smbus_read(battery->sbs->hc, SMBUS_READ_WORD,
+                                 ACPI_SBS_BATTERY, 0x01,
+                                 (u8 *)&battery->alarm_capacity);
 }
 
-static int acpi_battery_set_alarm(struct acpi_battery *battery,
-                                  unsigned long alarm)
+static int acpi_battery_set_alarm(struct acpi_battery *battery)
 {
         struct acpi_sbs *sbs = battery->sbs;
-        int result = 0;
-        s16 battery_mode;
-        int foo;
+        u16 value, sel = 1 << (battery->id + 12);
 
-        result = acpi_battery_select(battery);
-        if (result) {
-                ACPI_EXCEPTION((AE_INFO, AE_ERROR,
-                                "acpi_battery_select() failed"));
-                goto end;
-        }
+        int ret;
 
-        /* If necessary, enable the alarm */
 
-        if (alarm > 0) {
-                result =
-                    acpi_sbs_read_word(sbs, ACPI_SB_SMBUS_ADDR, 0x03,
-                                       &battery_mode);
-                if (result) {
-                        ACPI_EXCEPTION((AE_INFO, AE_ERROR,
-                                        "acpi_sbs_read_word() failed"));
+        if (sbs->manager_present) {
+                ret = acpi_smbus_read(sbs->hc, SMBUS_READ_WORD, ACPI_SBS_MANAGER,
+                                0x01, (u8 *)&value);
+                if (ret)
                         goto end;
-                }
-
-                result =
-                    acpi_sbs_write_word(sbs, ACPI_SB_SMBUS_ADDR, 0x01,
-                                        battery_mode & 0xbfff);
-                if (result) {
-                        ACPI_EXCEPTION((AE_INFO, AE_ERROR,
-                                        "acpi_sbs_write_word() failed"));
+                if ((value & 0xf000) != sel) {
+                        value &= 0x0fff;
+                        value |= sel;
+                ret = acpi_smbus_write(sbs->hc, SMBUS_WRITE_WORD,
+                                         ACPI_SBS_MANAGER,
+                                         0x01, (u8 *)&value, 2);
+                if (ret)
                         goto end;
                 }
         }
-
-        foo = alarm / (battery->info.capacity_mode ? 10 : 1);
-        result = acpi_sbs_write_word(sbs, ACPI_SB_SMBUS_ADDR, 0x01, foo);
-        if (result) {
-                ACPI_EXCEPTION((AE_INFO, AE_ERROR,
-                                "acpi_sbs_write_word() failed"));
-                goto end;
-        }
-
+        ret = acpi_smbus_write(sbs->hc, SMBUS_WRITE_WORD, ACPI_SBS_BATTERY,
+                                0x01, (u8 *)&battery->alarm_capacity, 2);
       end:
-
-        return result;
+        return ret;
 }
 
-static int acpi_battery_set_mode(struct acpi_battery *battery)
+static int acpi_ac_get_present(struct acpi_sbs *sbs)
 {
-        struct acpi_sbs *sbs = battery->sbs;
-        int result = 0;
-        s16 battery_mode;
-
-        if (capacity_mode == DEF_CAPACITY_UNIT) {
-                goto end;
-        }
-
-        result = acpi_sbs_read_word(sbs,
-                                    ACPI_SB_SMBUS_ADDR, 0x03, &battery_mode);
-        if (result) {
-                ACPI_EXCEPTION((AE_INFO, AE_ERROR,
-                                "acpi_sbs_read_word() failed"));
-                goto end;
-        }
-
-        if (capacity_mode == MAH_CAPACITY_UNIT) {
-                battery_mode &= 0x7fff;
-        } else {
-                battery_mode |= 0x8000;
-        }
-        result = acpi_sbs_write_word(sbs,
-                                     ACPI_SB_SMBUS_ADDR, 0x03, battery_mode);
-        if (result) {
-                ACPI_EXCEPTION((AE_INFO, AE_ERROR,
-                                "acpi_sbs_write_word() failed"));
-                goto end;
-        }
-
-        result = acpi_sbs_read_word(sbs,
-                                    ACPI_SB_SMBUS_ADDR, 0x03, &battery_mode);
-        if (result) {
-                ACPI_EXCEPTION((AE_INFO, AE_ERROR,
-                                "acpi_sbs_read_word() failed"));
-                goto end;
-        }
+        int result;
+        u16 status;
 
-      end:
+        result = acpi_smbus_read(sbs->hc, SMBUS_READ_WORD, ACPI_SBS_CHARGER,
+                                 0x13, (u8 *) & status);
+        if (!result)
+                sbs->charger_present = (status >> 15) & 0x1;
         return result;
 }
 
-static int acpi_battery_init(struct acpi_battery *battery)
+static ssize_t acpi_battery_alarm_show(struct device *dev,
+                                        struct device_attribute *attr,
+                                        char *buf)
 {
-        int result = 0;
-
-        result = acpi_battery_select(battery);
-        if (result) {
-                ACPI_EXCEPTION((AE_INFO, AE_ERROR,
-                                "acpi_battery_select() failed"));
-                goto end;
-        }
-
-        result = acpi_battery_set_mode(battery);
-        if (result) {
-                ACPI_EXCEPTION((AE_INFO, AE_ERROR,
-                                "acpi_battery_set_mode() failed"));
-                goto end;
-        }
-
-        result = acpi_battery_get_info(battery);
-        if (result) {
-                ACPI_EXCEPTION((AE_INFO, AE_ERROR,
-                                "acpi_battery_get_info() failed"));
-                goto end;
-        }
-
-        result = acpi_battery_get_state(battery);
-        if (result) {
-                ACPI_EXCEPTION((AE_INFO, AE_ERROR,
-                                "acpi_battery_get_state() failed"));
-                goto end;
-        }
-
-        result = acpi_battery_get_alarm(battery);
-        if (result) {
-                ACPI_EXCEPTION((AE_INFO, AE_ERROR,
-                                "acpi_battery_get_alarm() failed"));
-                goto end;
-        }
-
-      end:
-        return result;
+        struct acpi_battery *battery = to_acpi_battery(dev_get_drvdata(dev));
+        acpi_battery_get_alarm(battery);
+        return sprintf(buf, "%d\n", battery->alarm_capacity *
+                                acpi_battery_scale(battery) * 1000);
 }
 
-static int acpi_ac_get_present(struct acpi_sbs *sbs)
+static ssize_t acpi_battery_alarm_store(struct device *dev,
+                                        struct device_attribute *attr,
+                                        const char *buf, size_t count)
 {
-        int result = 0;
-        s16 charger_status;
-
-        result = acpi_sbs_read_word(sbs, ACPI_SBC_SMBUS_ADDR, 0x13,
-                                    &charger_status);
-
-        if (result) {
-                ACPI_EXCEPTION((AE_INFO, AE_ERROR,
-                                "acpi_sbs_read_word() failed"));
-                goto end;
-        }
-
-        sbs->ac.ac_present = (charger_status & 0x8000) >> 15;
-
-      end:
-
-        return result;
+        unsigned long x;
+        struct acpi_battery *battery = to_acpi_battery(dev_get_drvdata(dev));
+        if (sscanf(buf, "%ld\n", &x) == 1)
+                battery->alarm_capacity = x /
+                        (1000 * acpi_battery_scale(battery));
+        if (battery->present)
+                acpi_battery_set_alarm(battery);
+        return count;
 }
 
+static struct device_attribute alarm_attr = {
+        .attr = {.name = "alarm", .mode = 0644, .owner = THIS_MODULE},
+        .show = acpi_battery_alarm_show,
+        .store = acpi_battery_alarm_store,
+};
+
 /* --------------------------------------------------------------------------
                               FS Interface (/proc/acpi)
    -------------------------------------------------------------------------- */
 
+#ifdef CONFIG_ACPI_PROCFS
 /* Generic Routines */
-
 static int
-acpi_sbs_generic_add_fs(struct proc_dir_entry **dir,
-                        struct proc_dir_entry *parent_dir,
-                        char *dir_name,
-                        struct file_operations *info_fops,
-                        struct file_operations *state_fops,
-                        struct file_operations *alarm_fops, void *data)
+acpi_sbs_add_fs(struct proc_dir_entry **dir,
+                struct proc_dir_entry *parent_dir,
+                char *dir_name,
+                struct file_operations *info_fops,
+                struct file_operations *state_fops,
+                struct file_operations *alarm_fops, void *data)
 {
         struct proc_dir_entry *entry = NULL;
 
         if (!*dir) {
                 *dir = proc_mkdir(dir_name, parent_dir);
                 if (!*dir) {
-                        ACPI_EXCEPTION((AE_INFO, AE_ERROR,
-                                        "proc_mkdir() failed"));
                         return -ENODEV;
                 }
                 (*dir)->owner = THIS_MODULE;
@@ -882,10 +491,7 @@ acpi_sbs_generic_add_fs(struct proc_dir_entry **dir,
         /* 'info' [R] */
         if (info_fops) {
                 entry = create_proc_entry(ACPI_SBS_FILE_INFO, S_IRUGO, *dir);
-                if (!entry) {
-                        ACPI_EXCEPTION((AE_INFO, AE_ERROR,
-                                        "create_proc_entry() failed"));
-                } else {
+                if (entry) {
                         entry->proc_fops = info_fops;
                         entry->data = data;
                         entry->owner = THIS_MODULE;
@@ -895,10 +501,7 @@ acpi_sbs_generic_add_fs(struct proc_dir_entry **dir,
         /* 'state' [R] */
         if (state_fops) {
                 entry = create_proc_entry(ACPI_SBS_FILE_STATE, S_IRUGO, *dir);
-                if (!entry) {
-                        ACPI_EXCEPTION((AE_INFO, AE_ERROR,
-                                        "create_proc_entry() failed"));
-                } else {
+                if (entry) {
                         entry->proc_fops = state_fops;
                         entry->data = data;
                         entry->owner = THIS_MODULE;
@@ -908,24 +511,19 @@ acpi_sbs_generic_add_fs(struct proc_dir_entry **dir,
         /* 'alarm' [R/W] */
         if (alarm_fops) {
                 entry = create_proc_entry(ACPI_SBS_FILE_ALARM, S_IRUGO, *dir);
-                if (!entry) {
-                        ACPI_EXCEPTION((AE_INFO, AE_ERROR,
-                                        "create_proc_entry() failed"));
-                } else {
+                if (entry) {
                         entry->proc_fops = alarm_fops;
                         entry->data = data;
                         entry->owner = THIS_MODULE;
                 }
         }
-
         return 0;
 }
 
 static void
-acpi_sbs_generic_remove_fs(struct proc_dir_entry **dir,
+acpi_sbs_remove_fs(struct proc_dir_entry **dir,
                            struct proc_dir_entry *parent_dir)
 {
-
         if (*dir) {
                 remove_proc_entry(ACPI_SBS_FILE_INFO, *dir);
                 remove_proc_entry(ACPI_SBS_FILE_STATE, *dir);
@@ -933,82 +531,52 @@ acpi_sbs_generic_remove_fs(struct proc_dir_entry **dir,
                 remove_proc_entry((*dir)->name, parent_dir);
                 *dir = NULL;
         }
-
 }
 
 /* Smart Battery Interface */
-
 static struct proc_dir_entry *acpi_battery_dir = NULL;
 
+static inline char *acpi_battery_units(struct acpi_battery *battery)
+{
+        return acpi_battery_mode(battery) ? " mWh" : " mAh";
+}
+
+
 static int acpi_battery_read_info(struct seq_file *seq, void *offset)
 {
         struct acpi_battery *battery = seq->private;
         struct acpi_sbs *sbs = battery->sbs;
-        int cscale;
         int result = 0;
 
-        if (sbs_mutex_lock(sbs)) {
-                return -ENODEV;
-        }
-
-        result = acpi_check_update_proc(sbs);
-        if (result)
-                goto end;
-
-        if (update_time == 0) {
-                result = acpi_sbs_update_run(sbs, battery->id, DATA_TYPE_INFO);
-                if (result) {
-                        ACPI_EXCEPTION((AE_INFO, AE_ERROR,
-                                        "acpi_sbs_update_run() failed"));
-                }
-        }
+        mutex_lock(&sbs->lock);
 
-        if (battery->battery_present) {
-                seq_printf(seq, "present:                 yes\n");
-        } else {
-                seq_printf(seq, "present:                 no\n");
+        seq_printf(seq, "present:                 %s\n",
+                   (battery->present) ? "yes" : "no");
+        if (!battery->present)
                 goto end;
-        }
 
-        if (battery->info.capacity_mode) {
-                cscale = battery->info.vscale * battery->info.ipscale;
-        } else {
-                cscale = battery->info.ipscale;
-        }
         seq_printf(seq, "design capacity:         %i%s\n",
-                   battery->info.design_capacity * cscale,
-                   battery->info.capacity_mode ? "0 mWh" : " mAh");
-
+                   battery->design_capacity * acpi_battery_scale(battery),
+                   acpi_battery_units(battery));
         seq_printf(seq, "last full capacity:      %i%s\n",
-                   battery->info.full_charge_capacity * cscale,
-                   battery->info.capacity_mode ? "0 mWh" : " mAh");
-
+                   battery->full_charge_capacity * acpi_battery_scale(battery),
+                   acpi_battery_units(battery));
         seq_printf(seq, "battery technology:      rechargeable\n");
-
         seq_printf(seq, "design voltage:          %i mV\n",
-                   battery->info.design_voltage * battery->info.vscale);
-
+                   battery->design_voltage * acpi_battery_vscale(battery));
         seq_printf(seq, "design capacity warning: unknown\n");
         seq_printf(seq, "design capacity low:     unknown\n");
         seq_printf(seq, "capacity granularity 1:  unknown\n");
         seq_printf(seq, "capacity granularity 2:  unknown\n");
-
-        seq_printf(seq, "model number:            %s\n",
-                   battery->info.device_name);
-
+        seq_printf(seq, "model number:            %s\n", battery->device_name);
         seq_printf(seq, "serial number:           %i\n",
-                   battery->info.serial_number);
-
+                   battery->serial_number);
         seq_printf(seq, "battery type:            %s\n",
-                   battery->info.device_chemistry);
-
+                   battery->device_chemistry);
         seq_printf(seq, "OEM info:                %s\n",
-                   battery->info.manufacturer_name);
-
+                   battery->manufacturer_name);
       end:
-
-        sbs_mutex_unlock(sbs);
-
+        mutex_unlock(&sbs->lock);
         return result;
 }
 
@@ -1022,73 +590,29 @@ static int acpi_battery_read_state(struct seq_file *seq, void *offset)
         struct acpi_battery *battery = seq->private;
         struct acpi_sbs *sbs = battery->sbs;
         int result = 0;
-        int cscale;
-        int foo;
-
-        if (sbs_mutex_lock(sbs)) {
-                return -ENODEV;
-        }
 
-        result = acpi_check_update_proc(sbs);
-        if (result)
+        mutex_lock(&sbs->lock);
+        seq_printf(seq, "present:                 %s\n",
+                   (battery->present) ? "yes" : "no");
+        if (!battery->present)
                 goto end;
 
-        if (update_time == 0) {
-                result = acpi_sbs_update_run(sbs, battery->id, DATA_TYPE_STATE);
-                if (result) {
-                        ACPI_EXCEPTION((AE_INFO, AE_ERROR,
-                                        "acpi_sbs_update_run() failed"));
-                }
-        }
-
-        if (battery->battery_present) {
-                seq_printf(seq, "present:                 yes\n");
-        } else {
-                seq_printf(seq, "present:                 no\n");
-                goto end;
-        }
-
-        if (battery->info.capacity_mode) {
-                cscale = battery->info.vscale * battery->info.ipscale;
-        } else {
-                cscale = battery->info.ipscale;
-        }
-
-        if (battery->state.battery_state & 0x0010) {
-                seq_printf(seq, "capacity state:          critical\n");
-        } else {
-                seq_printf(seq, "capacity state:          ok\n");
-        }
-
-        foo = (s16) battery->state.amperage * battery->info.ipscale;
-        if (battery->info.capacity_mode) {
-                foo = foo * battery->info.design_voltage / 1000;
-        }
-        if (battery->state.amperage < 0) {
-                seq_printf(seq, "charging state:          discharging\n");
-                seq_printf(seq, "present rate:            %d %s\n",
-                           -foo, battery->info.capacity_mode ? "mW" : "mA");
-        } else if (battery->state.amperage > 0) {
-                seq_printf(seq, "charging state:          charging\n");
-                seq_printf(seq, "present rate:            %d %s\n",
-                           foo, battery->info.capacity_mode ? "mW" : "mA");
-        } else {
-                seq_printf(seq, "charging state:          charged\n");
-                seq_printf(seq, "present rate:            0 %s\n",
-                           battery->info.capacity_mode ? "mW" : "mA");
-        }
-
+        acpi_battery_get_state(battery);
+        seq_printf(seq, "capacity state:          %s\n",
+                   (battery->state & 0x0010) ? "critical" : "ok");
+        seq_printf(seq, "charging state:          %s\n",
+                   (battery->current_now < 0) ? "discharging" :
+                   ((battery->current_now > 0) ? "charging" : "charged"));
+        seq_printf(seq, "present rate:            %d mA\n",
+                   abs(battery->current_now) * acpi_battery_ipscale(battery));
         seq_printf(seq, "remaining capacity:      %i%s\n",
-                   battery->state.remaining_capacity * cscale,
-                   battery->info.capacity_mode ? "0 mWh" : " mAh");
-
+                   battery->capacity_now * acpi_battery_scale(battery),
+                   acpi_battery_units(battery));
         seq_printf(seq, "present voltage:         %i mV\n",
-                   battery->state.voltage * battery->info.vscale);
+                   battery->voltage_now * acpi_battery_vscale(battery));
 
       end:
-
-        sbs_mutex_unlock(sbs);
-
+        mutex_unlock(&sbs->lock);
         return result;
 }
 
@@ -1102,48 +626,25 @@ static int acpi_battery_read_alarm(struct seq_file *seq, void *offset)
         struct acpi_battery *battery = seq->private;
         struct acpi_sbs *sbs = battery->sbs;
         int result = 0;
-        int cscale;
-
-        if (sbs_mutex_lock(sbs)) {
-                return -ENODEV;
-        }
-
-        result = acpi_check_update_proc(sbs);
-        if (result)
-                goto end;
 
-        if (update_time == 0) {
-                result = acpi_sbs_update_run(sbs, battery->id, DATA_TYPE_ALARM);
-                if (result) {
-                        ACPI_EXCEPTION((AE_INFO, AE_ERROR,
-                                        "acpi_sbs_update_run() failed"));
-                }
-        }
+        mutex_lock(&sbs->lock);
 
-        if (!battery->battery_present) {
+        if (!battery->present) {
                 seq_printf(seq, "present:                 no\n");
                 goto end;
         }
 
-        if (battery->info.capacity_mode) {
-                cscale = battery->info.vscale * battery->info.ipscale;
-        } else {
-                cscale = battery->info.ipscale;
-        }
-
+        acpi_battery_get_alarm(battery);
         seq_printf(seq, "alarm:                   ");
-        if (battery->alarm.remaining_capacity) {
+        if (battery->alarm_capacity)
                 seq_printf(seq, "%i%s\n",
-                           battery->alarm.remaining_capacity * cscale,
-                           battery->info.capacity_mode ? "0 mWh" : " mAh");
-        } else {
+                           battery->alarm_capacity *
+                           acpi_battery_scale(battery),
+                           acpi_battery_units(battery));
+        else
                 seq_printf(seq, "disabled\n");
-        }
-
       end:
-
-        sbs_mutex_unlock(sbs);
-
+        mutex_unlock(&sbs->lock);
         return result;
 }
 
@@ -1155,59 +656,29 @@ acpi_battery_write_alarm(struct file *file, const char __user * buffer,
         struct acpi_battery *battery = seq->private;
         struct acpi_sbs *sbs = battery->sbs;
         char alarm_string[12] = { '\0' };
-        int result, old_alarm, new_alarm;
-
-        if (sbs_mutex_lock(sbs)) {
-                return -ENODEV;
-        }
-
-        result = acpi_check_update_proc(sbs);
-        if (result)
-                goto end;
-
-        if (!battery->battery_present) {
+        int result = 0;
+        mutex_lock(&sbs->lock);
+        if (!battery->present) {
                 result = -ENODEV;
                 goto end;
         }
-
         if (count > sizeof(alarm_string) - 1) {
                 result = -EINVAL;
                 goto end;
         }
-
         if (copy_from_user(alarm_string, buffer, count)) {
                 result = -EFAULT;
                 goto end;
         }
-
         alarm_string[count] = 0;
-
-        old_alarm = battery->alarm.remaining_capacity;
-        new_alarm = simple_strtoul(alarm_string, NULL, 0);
-
-        result = acpi_battery_set_alarm(battery, new_alarm);
-        if (result) {
-                ACPI_EXCEPTION((AE_INFO, AE_ERROR,
-                                "acpi_battery_set_alarm() failed"));
-                acpi_battery_set_alarm(battery, old_alarm);
-                goto end;
-        }
-        result = acpi_battery_get_alarm(battery);
-        if (result) {
-                ACPI_EXCEPTION((AE_INFO, AE_ERROR,
-                                "acpi_battery_get_alarm() failed"));
-                acpi_battery_set_alarm(battery, old_alarm);
-                goto end;
-        }
-
+        battery->alarm_capacity = simple_strtoul(alarm_string, NULL, 0) /
+                                        acpi_battery_scale(battery);
+        acpi_battery_set_alarm(battery);
       end:
-        sbs_mutex_unlock(sbs);
-
-        if (result) {
+        mutex_unlock(&sbs->lock);
+        if (result)
                 return result;
-        } else {
-                return count;
-        }
+        return count;
 }
 
 static int acpi_battery_alarm_open_fs(struct inode *inode, struct file *file)
@@ -1246,26 +717,15 @@ 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 = seq->private;
-        int result;
 
-        if (sbs_mutex_lock(sbs)) {
-                return -ENODEV;
-        }
+        struct acpi_sbs *sbs = seq->private;
 
-        if (update_time == 0) {
-                result = acpi_sbs_update_run(sbs, -1, DATA_TYPE_AC_STATE);
-                if (result) {
-                        ACPI_EXCEPTION((AE_INFO, AE_ERROR,
-                                        "acpi_sbs_update_run() failed"));
-                }
-        }
+        mutex_lock(&sbs->lock);
 
         seq_printf(seq, "state:                   %s\n",
-                   sbs->ac.ac_present ? "on-line" : "off-line");
-
-        sbs_mutex_unlock(sbs);
+                   sbs->charger_present ? "on-line" : "off-line");
 
+        mutex_unlock(&sbs->lock);
         return 0;
 }
 
@@ -1282,429 +742,203 @@ static struct file_operations acpi_ac_state_fops = {
         .owner = THIS_MODULE,
 };
 
+#endif
+
 /* --------------------------------------------------------------------------
                                  Driver Interface
    -------------------------------------------------------------------------- */
+static int acpi_battery_read(struct acpi_battery *battery)
+{
+        int result = 0, saved_present = battery->present;
+        u16 state;
+
+        if (battery->sbs->manager_present) {
+                result = acpi_smbus_read(battery->sbs->hc, SMBUS_READ_WORD,
+                                ACPI_SBS_MANAGER, 0x01, (u8 *)&state);
+                if (!result)
+                        battery->present = state & (1 << battery->id);
+                state &= 0x0fff;
+                state |= 1 << (battery->id + 12);
+                acpi_smbus_write(battery->sbs->hc, SMBUS_WRITE_WORD,
+                                  ACPI_SBS_MANAGER, 0x01, (u8 *)&state, 2);
+        } else if (battery->id == 0)
+                battery->present = 1;
+        if (result || !battery->present)
+                return result;
 
-/* Smart Battery */
+        if (saved_present != battery->present) {
+                battery->update_time = 0;
+                result = acpi_battery_get_info(battery);
+                if (result)
+                        return result;
+        }
+        result = acpi_battery_get_state(battery);
+        return result;
+}
 
+/* Smart Battery */
 static int acpi_battery_add(struct acpi_sbs *sbs, int id)
 {
-        int is_present;
+        struct acpi_battery *battery = &sbs->battery[id];
         int result;
-        char dir_name[32];
-        struct acpi_battery *battery;
-
-        battery = &sbs->battery[id];
-
-        battery->alive = 0;
 
-        battery->init_state = 0;
         battery->id = id;
         battery->sbs = sbs;
+        result = acpi_battery_read(battery);
+        if (result)
+                return result;
 
-        result = acpi_battery_select(battery);
-        if (result) {
-                ACPI_EXCEPTION((AE_INFO, AE_ERROR,
-                                "acpi_battery_select() failed"));
-                goto end;
-        }
-
-        result = acpi_battery_get_present(battery);
-        if (result) {
-                ACPI_EXCEPTION((AE_INFO, AE_ERROR,
-                                "acpi_battery_get_present() failed"));
-                goto end;
-        }
-
-        is_present = battery->battery_present;
-
-        if (is_present) {
-                result = acpi_battery_init(battery);
-                if (result) {
-                        ACPI_EXCEPTION((AE_INFO, AE_ERROR,
-                                        "acpi_battery_init() failed"));
-                        goto end;
-                }
-                battery->init_state = 1;
-        }
-
-        sprintf(dir_name, ACPI_BATTERY_DIR_NAME, id);
-
-        result = acpi_sbs_generic_add_fs(&battery->battery_entry,
-                                         acpi_battery_dir,
-                                         dir_name,
-                                         &acpi_battery_info_fops,
-                                         &acpi_battery_state_fops,
-                                         &acpi_battery_alarm_fops, battery);
-        if (result) {
-                ACPI_EXCEPTION((AE_INFO, AE_ERROR,
-                                "acpi_sbs_generic_add_fs() failed"));
-                goto end;
+        sprintf(battery->name, ACPI_BATTERY_DIR_NAME, id);
+#ifdef CONFIG_ACPI_PROCFS
+        acpi_sbs_add_fs(&battery->proc_entry, acpi_battery_dir,
+                        battery->name, &acpi_battery_info_fops,
+                        &acpi_battery_state_fops, &acpi_battery_alarm_fops,
+                        battery);
+#endif
+        battery->bat.name = battery->name;
+        battery->bat.type = POWER_SUPPLY_TYPE_BATTERY;
+        if (!acpi_battery_mode(battery)) {
+                battery->bat.properties = sbs_charge_battery_props;
+                battery->bat.num_properties =
+                    ARRAY_SIZE(sbs_charge_battery_props);
+        } else {
+                battery->bat.properties = sbs_energy_battery_props;
+                battery->bat.num_properties =
+                    ARRAY_SIZE(sbs_energy_battery_props);
         }
-        battery->alive = 1;
-
+        battery->bat.get_property = acpi_sbs_battery_get_property;
+        result = power_supply_register(&sbs->device->dev, &battery->bat);
+        device_create_file(battery->bat.dev, &alarm_attr);
         printk(KERN_INFO PREFIX "%s [%s]: Battery Slot [%s] (battery %s)\n",
-               ACPI_SBS_DEVICE_NAME, acpi_device_bid(sbs->device), dir_name,
-               sbs->battery->battery_present ? "present" : "absent");
-
-      end:
+               ACPI_SBS_DEVICE_NAME, acpi_device_bid(sbs->device),
+               battery->name, sbs->battery->present ? "present" : "absent");
         return result;
 }
 
 static void acpi_battery_remove(struct acpi_sbs *sbs, int id)
 {
-
-        if (sbs->battery[id].battery_entry) {
-                acpi_sbs_generic_remove_fs(&(sbs->battery[id].battery_entry),
-                                           acpi_battery_dir);
-        }
+        if (sbs->battery[id].bat.dev)
+                device_remove_file(sbs->battery[id].bat.dev, &alarm_attr);
+                power_supply_unregister(&sbs->battery[id].bat);
+#ifdef CONFIG_ACPI_PROCFS
+        if (sbs->battery[id].proc_entry) {
+                acpi_sbs_remove_fs(&(sbs->battery[id].proc_entry),
+                                   acpi_battery_dir);
+        }
+#endif
 }
 
-static int acpi_ac_add(struct acpi_sbs *sbs)
+static int acpi_charger_add(struct acpi_sbs *sbs)
 {
         int result;
 
         result = acpi_ac_get_present(sbs);
-        if (result) {
-                ACPI_EXCEPTION((AE_INFO, AE_ERROR,
-                                "acpi_ac_get_present() failed"));
+        if (result)
                 goto end;
-        }
-
-        result = acpi_sbs_generic_add_fs(&sbs->ac_entry,
-                                         acpi_ac_dir,
-                                         ACPI_AC_DIR_NAME,
-                                         NULL, &acpi_ac_state_fops, NULL, sbs);
-        if (result) {
-                ACPI_EXCEPTION((AE_INFO, AE_ERROR,
-                                "acpi_sbs_generic_add_fs() failed"));
+#ifdef CONFIG_ACPI_PROCFS
+        result = acpi_sbs_add_fs(&sbs->charger_entry, acpi_ac_dir,
+                                 ACPI_AC_DIR_NAME, NULL,
+                                 &acpi_ac_state_fops, NULL, sbs);
+        if (result)
                 goto end;
-        }
-
+#endif
+        sbs->charger.name = "sbs-charger";
+        sbs->charger.type = POWER_SUPPLY_TYPE_MAINS;
+        sbs->charger.properties = sbs_ac_props;
+        sbs->charger.num_properties = ARRAY_SIZE(sbs_ac_props);
+        sbs->charger.get_property = sbs_get_ac_property;
+        power_supply_register(&sbs->device->dev, &sbs->charger);
         printk(KERN_INFO PREFIX "%s [%s]: AC Adapter [%s] (%s)\n",
                ACPI_SBS_DEVICE_NAME, acpi_device_bid(sbs->device),
-               ACPI_AC_DIR_NAME, sbs->ac.ac_present ? "on-line" : "off-line");
-
+               ACPI_AC_DIR_NAME, sbs->charger_present ? "on-line" : "off-line");
       end:
-
         return result;
 }
 
-static void acpi_ac_remove(struct acpi_sbs *sbs)
+static void acpi_charger_remove(struct acpi_sbs *sbs)
 {
-
-        if (sbs->ac_entry) {
-                acpi_sbs_generic_remove_fs(&sbs->ac_entry, acpi_ac_dir);
-        }
+        if (sbs->charger.dev)
+                power_supply_unregister(&sbs->charger);
+#ifdef CONFIG_ACPI_PROCFS
+        if (sbs->charger_entry)
+                acpi_sbs_remove_fs(&sbs->charger_entry, acpi_ac_dir);
+#endif
 }
 
-static void acpi_sbs_update_time_run(unsigned long data)
+void acpi_sbs_callback(void *context)
 {
-        acpi_os_execute(OSL_GPE_HANDLER, acpi_sbs_update_time, (void *)data);
-}
-
-static int acpi_sbs_update_run(struct acpi_sbs *sbs, int id, int data_type)
-{
-        struct acpi_battery *battery;
-        int result = 0, cnt;
-        int old_ac_present = -1;
-        int old_battery_present = -1;
-        int new_ac_present = -1;
-        int new_battery_present = -1;
-        int id_min = 0, id_max = MAX_SBS_BAT - 1;
-        char dir_name[32];
-        int do_battery_init = 0, do_ac_init = 0;
-        int old_remaining_capacity = 0;
-        int update_battery = 1;
-        int up_tm = update_time;
-
-        if (sbs_zombie(sbs)) {
-                goto end;
-        }
-
-        if (id >= 0) {
-                id_min = id_max = id;
-        }
-
-        if (data_type == DATA_TYPE_COMMON && up_tm > 0) {
-                cnt = up_tm / (up_tm > UPDATE_DELAY ? UPDATE_DELAY : up_tm);
-                if (sbs->run_cnt % cnt != 0) {
-                        update_battery = 0;
-                }
-        }
-
-        sbs->run_cnt++;
-
-        old_ac_present = sbs->ac.ac_present;
-
-        result = acpi_ac_get_present(sbs);
-        if (result) {
-                ACPI_EXCEPTION((AE_INFO, AE_ERROR,
-                                "acpi_ac_get_present() failed"));
-        }
-
-        new_ac_present = sbs->ac.ac_present;
-
-        do_ac_init = (old_ac_present != new_ac_present);
-        if (sbs->run_cnt == 1 && data_type == DATA_TYPE_COMMON) {
-                do_ac_init = 1;
-        }
-
-        if (do_ac_init) {
-                result = acpi_sbs_generate_event(sbs->device,
-                                                 ACPI_SBS_AC_NOTIFY_STATUS,
-                                                 new_ac_present,
-                                                 ACPI_AC_DIR_NAME,
-                                                 ACPI_AC_CLASS);
-                if (result) {
-                        ACPI_EXCEPTION((AE_INFO, AE_ERROR,
-                                        "acpi_sbs_generate_event() failed"));
-                }
-        }
-
-        if (data_type == DATA_TYPE_COMMON) {
-                if (!do_ac_init && !update_battery) {
-                        goto end;
-                }
-        }
-
-        if (data_type == DATA_TYPE_AC_STATE && !do_ac_init) {
-                goto end;
-        }
-
-        for (id = id_min; id <= id_max; id++) {
-                battery = &sbs->battery[id];
-                if (battery->alive == 0) {
-                        continue;
-                }
-
-                old_remaining_capacity = battery->state.remaining_capacity;
-
-                old_battery_present = battery->battery_present;
-
-                result = acpi_battery_select(battery);
-                if (result) {
-                        ACPI_EXCEPTION((AE_INFO, AE_ERROR,
-                                        "acpi_battery_select() failed"));
-                }
-
-                result = acpi_battery_get_present(battery);
-                if (result) {
-                        ACPI_EXCEPTION((AE_INFO, AE_ERROR,
-                                        "acpi_battery_get_present() failed"));
-                }
-
-                new_battery_present = battery->battery_present;
-
-                do_battery_init = ((old_battery_present != new_battery_present)
-                                   && new_battery_present);
-                if (!new_battery_present)
-                        goto event;
-                if (do_ac_init || do_battery_init) {
-                        result = acpi_battery_init(battery);
-                        if (result) {
-                                ACPI_EXCEPTION((AE_INFO, AE_ERROR,
-                                                "acpi_battery_init() "
-                                                "failed"));
-                        }
-                }
-                if (sbs_zombie(sbs)) {
-                        goto end;
-                }
-
-                if ((data_type == DATA_TYPE_COMMON
-                     || data_type == DATA_TYPE_INFO)
-                    && new_battery_present) {
-                        result = acpi_battery_get_info(battery);
-                        if (result) {
-                                ACPI_EXCEPTION((AE_INFO, AE_ERROR,
-                                                "acpi_battery_get_info() failed"));
-                        }
-                }
-                if (data_type == DATA_TYPE_INFO) {
-                        continue;
-                }
-                if (sbs_zombie(sbs)) {
-                        goto end;
-                }
-
-                if ((data_type == DATA_TYPE_COMMON
-                     || data_type == DATA_TYPE_STATE)
-                    && new_battery_present) {
-                        result = acpi_battery_get_state(battery);
-                        if (result) {
-                                ACPI_EXCEPTION((AE_INFO, AE_ERROR,
-                                                "acpi_battery_get_state() failed"));
-                        }
-                }
-                if (data_type == DATA_TYPE_STATE) {
-                        goto event;
-                }
-                if (sbs_zombie(sbs)) {
-                        goto end;
-                }
-
-                if ((data_type == DATA_TYPE_COMMON
-                     || data_type == DATA_TYPE_ALARM)
-                    && new_battery_present) {
-                        result = acpi_battery_get_alarm(battery);
-                        if (result) {
-                                ACPI_EXCEPTION((AE_INFO, AE_ERROR,
-                                                "acpi_battery_get_alarm() "
-                                                "failed"));
-                        }
-                }
-                if (data_type == DATA_TYPE_ALARM) {
-                        continue;
-                }
-                if (sbs_zombie(sbs)) {
-                        goto end;
-                }
-
-              event:
-
-                if (old_battery_present != new_battery_present || do_ac_init ||
-                    old_remaining_capacity !=
-                    battery->state.remaining_capacity) {
-                        sprintf(dir_name, ACPI_BATTERY_DIR_NAME, id);
-                        result = acpi_sbs_generate_event(sbs->device,
-                                                         ACPI_SBS_BATTERY_NOTIFY_STATUS,
-                                                         new_battery_present,
-                                                         dir_name,
-                                                         ACPI_BATTERY_CLASS);
-                        if (result) {
-                                ACPI_EXCEPTION((AE_INFO, AE_ERROR,
-                                                "acpi_sbs_generate_event() "
-                                                "failed"));
-                        }
+        int id;
+        struct acpi_sbs *sbs = context;
+        struct acpi_battery *bat;
+        u8 saved_charger_state = sbs->charger_present;
+        u8 saved_battery_state;
+        acpi_ac_get_present(sbs);
+        if (sbs->charger_present != saved_charger_state) {
+#ifdef CONFIG_ACPI_PROC_EVENT
+                acpi_bus_generate_proc_event4(ACPI_AC_CLASS, ACPI_AC_DIR_NAME,
+                                              ACPI_SBS_NOTIFY_STATUS,
+                                              sbs->charger_present);
+#endif
+                kobject_uevent(&sbs->charger.dev->kobj, KOBJ_CHANGE);
+        }
+        if (sbs->manager_present) {
+                for (id = 0; id < MAX_SBS_BAT; ++id) {
+                        if (!(sbs->batteries_supported & (1 << id)))
+                                continue;
+                        bat = &sbs->battery[id];
+                        saved_battery_state = bat->present;
+                        acpi_battery_read(bat);
+                        if (saved_battery_state == bat->present)
+                                continue;
+#ifdef CONFIG_ACPI_PROC_EVENT
+                        acpi_bus_generate_proc_event4(ACPI_BATTERY_CLASS,
+                                                      bat->name,
+                                                      ACPI_SBS_NOTIFY_STATUS,
+                                                      bat->present);
+#endif
+                        kobject_uevent(&bat->bat.dev->kobj, KOBJ_CHANGE);
                 }
         }
-
-      end:
-
-        return result;
 }
 
-static void acpi_sbs_update_time(void *data)
-{
-        struct acpi_sbs *sbs = data;
-        unsigned long delay = -1;
-        int result;
-        unsigned int up_tm = update_time;
-
-        if (sbs_mutex_lock(sbs))
-                return;
-
-        result = acpi_sbs_update_run(sbs, -1, DATA_TYPE_COMMON);
-        if (result) {
-                ACPI_EXCEPTION((AE_INFO, AE_ERROR,
-                                "acpi_sbs_update_run() failed"));
-        }
-
-        if (sbs_zombie(sbs)) {
-                goto end;
-        }
-
-        if (!up_tm) {
-                if (timer_pending(&sbs->update_timer))
-                        del_timer(&sbs->update_timer);
-        } else {
-                delay = (up_tm > UPDATE_DELAY ? UPDATE_DELAY : up_tm);
-                delay = jiffies + HZ * delay;
-                if (timer_pending(&sbs->update_timer)) {
-                        mod_timer(&sbs->update_timer, delay);
-                } else {
-                        sbs->update_timer.data = (unsigned long)data;
-                        sbs->update_timer.function = acpi_sbs_update_time_run;
-                        sbs->update_timer.expires = delay;
-                        add_timer(&sbs->update_timer);
-                }
-        }
-
-      end:
-
-        sbs_mutex_unlock(sbs);
-}
+static int acpi_sbs_remove(struct acpi_device *device, int type);
 
 static int acpi_sbs_add(struct acpi_device *device)
 {
-        struct acpi_sbs *sbs = NULL;
-        int result = 0, remove_result = 0;
+        struct acpi_sbs *sbs;
+        int result = 0;
         int id;
-        acpi_status status = AE_OK;
-        unsigned long val;
-
-        status =
-            acpi_evaluate_integer(device->handle, "_EC", NULL, &val);
-        if (ACPI_FAILURE(status)) {
-                ACPI_EXCEPTION((AE_INFO, AE_ERROR, "Error obtaining _EC"));
-                return -EIO;
-        }
 
         sbs = kzalloc(sizeof(struct acpi_sbs), GFP_KERNEL);
         if (!sbs) {
-                ACPI_EXCEPTION((AE_INFO, AE_ERROR, "kzalloc() failed"));
                 result = -ENOMEM;
                 goto end;
         }
 
-        mutex_init(&sbs->mutex);
-
-        sbs_mutex_lock(sbs);
+        mutex_init(&sbs->lock);
 
-        sbs->base = 0xff & (val >> 8);
+        sbs->hc = acpi_driver_data(device->parent);
         sbs->device = device;
-
         strcpy(acpi_device_name(device), ACPI_SBS_DEVICE_NAME);
         strcpy(acpi_device_class(device), ACPI_SBS_CLASS);
         acpi_driver_data(device) = sbs;
 
-        result = acpi_ac_add(sbs);
-        if (result) {
-                ACPI_EXCEPTION((AE_INFO, AE_ERROR, "acpi_ac_add() failed"));
-                goto end;
-        }
-
-        acpi_sbsm_get_info(sbs);
-
-        if (!sbs->sbsm_present) {
-                result = acpi_battery_add(sbs, 0);
-                if (result) {
-                        ACPI_EXCEPTION((AE_INFO, AE_ERROR,
-                                        "acpi_battery_add() failed"));
-                        goto end;
-                }
-        } else {
-                for (id = 0; id < MAX_SBS_BAT; id++) {
-                        if ((sbs->sbsm_batteries_supported & (1 << id))) {
-                                result = acpi_battery_add(sbs, id);
-                                if (result) {
-                                        ACPI_EXCEPTION((AE_INFO, AE_ERROR,
-                                                        "acpi_battery_add() failed"));
-                                        goto end;
-                                }
-                        }
-                }
-        }
-
-        init_timer(&sbs->update_timer);
-        result = acpi_check_update_proc(sbs);
+        result = acpi_charger_add(sbs);
         if (result)
                 goto end;
 
+        result = acpi_manager_get_info(sbs);
+        if (!result) {
+                sbs->manager_present = 1;
+                for (id = 0; id < MAX_SBS_BAT; ++id)
+                        if ((sbs->batteries_supported & (1 << id)))
+                                acpi_battery_add(sbs, id);
+        } else
+                acpi_battery_add(sbs, 0);
+        acpi_smbus_register_callback(sbs->hc, acpi_sbs_callback, sbs);
       end:
-
-        sbs_mutex_unlock(sbs);
-
-        if (result) {
-                remove_result = acpi_sbs_remove(device, 0);
-                if (remove_result) {
-                        ACPI_EXCEPTION((AE_INFO, AE_ERROR,
-                                        "acpi_sbs_remove() failed"));
-                }
-        }
-
+        if (result)
+                acpi_sbs_remove(device, 0);
         return result;
 }
 
@@ -1713,39 +947,25 @@ static int acpi_sbs_remove(struct acpi_device *device, int type)
         struct acpi_sbs *sbs;
         int id;
 
-        if (!device) {
+        if (!device)
                 return -EINVAL;
-        }
-
         sbs = acpi_driver_data(device);
-        if (!sbs) {
+        if (!sbs)
                 return -EINVAL;
-        }
-
-        sbs_mutex_lock(sbs);
-
-        sbs->zombie = 1;
-        del_timer_sync(&sbs->update_timer);
-        acpi_os_wait_events_complete(NULL);
-        del_timer_sync(&sbs->update_timer);
-
-        for (id = 0; id < MAX_SBS_BAT; id++) {
+        mutex_lock(&sbs->lock);
+        acpi_smbus_unregister_callback(sbs->hc);
+        for (id = 0; id < MAX_SBS_BAT; ++id)
                 acpi_battery_remove(sbs, id);
-        }
-
-        acpi_ac_remove(sbs);
-
-        sbs_mutex_unlock(sbs);
-
-        mutex_destroy(&sbs->mutex);
-
+        acpi_charger_remove(sbs);
+        mutex_unlock(&sbs->lock);
+        mutex_destroy(&sbs->lock);
         kfree(sbs);
-
         return 0;
 }
 
 static void acpi_sbs_rmdirs(void)
 {
+#ifdef CONFIG_ACPI_PROCFS
         if (acpi_ac_dir) {
                 acpi_unlock_ac_dir(acpi_ac_dir);
                 acpi_ac_dir = NULL;
@@ -1754,69 +974,58 @@ static void acpi_sbs_rmdirs(void)
                 acpi_unlock_battery_dir(acpi_battery_dir);
                 acpi_battery_dir = NULL;
         }
+#endif
 }
 
 static int acpi_sbs_resume(struct acpi_device *device)
 {
         struct acpi_sbs *sbs;
-
         if (!device)
                 return -EINVAL;
-
         sbs = device->driver_data;
-
-        sbs->run_cnt = 0;
-
+        acpi_sbs_callback(sbs);
         return 0;
 }
 
+static struct acpi_driver acpi_sbs_driver = {
+        .name = "sbs",
+        .class = ACPI_SBS_CLASS,
+        .ids = sbs_device_ids,
+        .ops = {
+                .add = acpi_sbs_add,
+                .remove = acpi_sbs_remove,
+                .resume = acpi_sbs_resume,
+                },
+};
+
 static int __init acpi_sbs_init(void)
 {
         int result = 0;
 
         if (acpi_disabled)
                 return -ENODEV;
-
-        if (capacity_mode != DEF_CAPACITY_UNIT
-            && capacity_mode != MAH_CAPACITY_UNIT
-            && capacity_mode != MWH_CAPACITY_UNIT) {
-                ACPI_EXCEPTION((AE_INFO, AE_ERROR,
-                                "invalid capacity_mode = %d", capacity_mode));
-                return -EINVAL;
-        }
-
+#ifdef CONFIG_ACPI_PROCFS
         acpi_ac_dir = acpi_lock_ac_dir();
-        if (!acpi_ac_dir) {
-                ACPI_EXCEPTION((AE_INFO, AE_ERROR,
-                                "acpi_lock_ac_dir() failed"));
+        if (!acpi_ac_dir)
                 return -ENODEV;
-        }
-
         acpi_battery_dir = acpi_lock_battery_dir();
         if (!acpi_battery_dir) {
-                ACPI_EXCEPTION((AE_INFO, AE_ERROR,
-                                "acpi_lock_battery_dir() failed"));
                 acpi_sbs_rmdirs();
                 return -ENODEV;
         }
-
+#endif
         result = acpi_bus_register_driver(&acpi_sbs_driver);
         if (result < 0) {
-                ACPI_EXCEPTION((AE_INFO, AE_ERROR,
-                                "acpi_bus_register_driver() failed"));
                 acpi_sbs_rmdirs();
                 return -ENODEV;
         }
-
         return 0;
 }
 
 static void __exit acpi_sbs_exit(void)
 {
         acpi_bus_unregister_driver(&acpi_sbs_driver);
-
         acpi_sbs_rmdirs();
-
         return;
 }
 
diff --git a/drivers/acpi/sbshc.c b/drivers/acpi/sbshc.c
new file mode 100644
index 000000000000..046d7c3ed356
--- /dev/null
+++ b/drivers/acpi/sbshc.c
@@ -0,0 +1,309 @@
+/*
+ * SMBus driver for ACPI Embedded Controller (v0.1)
+ *
+ * Copyright (c) 2007 Alexey Starikovskiy
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2.
+ */
+
+#include <acpi/acpi_bus.h>
+#include <acpi/acpi_drivers.h>
+#include <acpi/actypes.h>
+#include <linux/wait.h>
+#include <linux/delay.h>
+#include <linux/interrupt.h>
+#include "sbshc.h"
+
+#define ACPI_SMB_HC_CLASS       "smbus_host_controller"
+#define ACPI_SMB_HC_DEVICE_NAME "ACPI SMBus HC"
+
+struct acpi_smb_hc {
+        struct acpi_ec *ec;
+        struct mutex lock;
+        wait_queue_head_t wait;
+        u8 offset;
+        u8 query_bit;
+        smbus_alarm_callback callback;
+        void *context;
+};
+
+static int acpi_smbus_hc_add(struct acpi_device *device);
+static int acpi_smbus_hc_remove(struct acpi_device *device, int type);
+
+static const struct acpi_device_id sbs_device_ids[] = {
+        {"ACPI0001", 0},
+        {"ACPI0005", 0},
+        {"", 0},
+};
+
+MODULE_DEVICE_TABLE(acpi, sbs_device_ids);
+
+static struct acpi_driver acpi_smb_hc_driver = {
+        .name = "smbus_hc",
+        .class = ACPI_SMB_HC_CLASS,
+        .ids = sbs_device_ids,
+        .ops = {
+                .add = acpi_smbus_hc_add,
+                .remove = acpi_smbus_hc_remove,
+                },
+};
+
+union acpi_smb_status {
+        u8 raw;
+        struct {
+                u8 status:5;
+                u8 reserved:1;
+                u8 alarm:1;
+                u8 done:1;
+        } fields;
+};
+
+enum acpi_smb_status_codes {
+        SMBUS_OK = 0,
+        SMBUS_UNKNOWN_FAILURE = 0x07,
+        SMBUS_DEVICE_ADDRESS_NACK = 0x10,
+        SMBUS_DEVICE_ERROR = 0x11,
+        SMBUS_DEVICE_COMMAND_ACCESS_DENIED = 0x12,
+        SMBUS_UNKNOWN_ERROR = 0x13,
+        SMBUS_DEVICE_ACCESS_DENIED = 0x17,
+        SMBUS_TIMEOUT = 0x18,
+        SMBUS_HOST_UNSUPPORTED_PROTOCOL = 0x19,
+        SMBUS_BUSY = 0x1a,
+        SMBUS_PEC_ERROR = 0x1f,
+};
+
+enum acpi_smb_offset {
+        ACPI_SMB_PROTOCOL = 0,  /* protocol, PEC */
+        ACPI_SMB_STATUS = 1,    /* status */
+        ACPI_SMB_ADDRESS = 2,   /* address */
+        ACPI_SMB_COMMAND = 3,   /* command */
+        ACPI_SMB_DATA = 4,      /* 32 data registers */
+        ACPI_SMB_BLOCK_COUNT = 0x24,    /* number of data bytes */
+        ACPI_SMB_ALARM_ADDRESS = 0x25,  /* alarm address */
+        ACPI_SMB_ALARM_DATA = 0x26,     /* 2 bytes alarm data */
+};
+
+static inline int smb_hc_read(struct acpi_smb_hc *hc, u8 address, u8 *data)
+{
+        return ec_read(hc->offset + address, data);
+}
+
+static inline int smb_hc_write(struct acpi_smb_hc *hc, u8 address, u8 data)
+{
+        return ec_write(hc->offset + address, data);
+}
+
+static inline int smb_check_done(struct acpi_smb_hc *hc)
+{
+        union acpi_smb_status status = {.raw = 0};
+        smb_hc_read(hc, ACPI_SMB_STATUS, &status.raw);
+        return status.fields.done && (status.fields.status == SMBUS_OK);
+}
+
+static int wait_transaction_complete(struct acpi_smb_hc *hc, int timeout)
+{
+        if (wait_event_timeout(hc->wait, smb_check_done(hc),
+                               msecs_to_jiffies(timeout)))
+                return 0;
+        else
+                return -ETIME;
+}
+
+int acpi_smbus_transaction(struct acpi_smb_hc *hc, u8 protocol, u8 address,
+                    u8 command, u8 *data, u8 length)
+{
+        int ret = -EFAULT, i;
+        u8 temp, sz = 0;
+
+        mutex_lock(&hc->lock);
+        if (smb_hc_read(hc, ACPI_SMB_PROTOCOL, &temp))
+                goto end;
+        if (temp) {
+                ret = -EBUSY;
+                goto end;
+        }
+        smb_hc_write(hc, ACPI_SMB_COMMAND, command);
+        smb_hc_write(hc, ACPI_SMB_COMMAND, command);
+        if (!(protocol & 0x01)) {
+                smb_hc_write(hc, ACPI_SMB_BLOCK_COUNT, length);
+                for (i = 0; i < length; ++i)
+                        smb_hc_write(hc, ACPI_SMB_DATA + i, data[i]);
+        }
+        smb_hc_write(hc, ACPI_SMB_ADDRESS, address << 1);
+        smb_hc_write(hc, ACPI_SMB_PROTOCOL, protocol);
+        /*
+         * Wait for completion. Save the status code, data size,
+         * and data into the return package (if required by the protocol).
+         */
+        ret = wait_transaction_complete(hc, 1000);
+        if (ret || !(protocol & 0x01))
+                goto end;
+        switch (protocol) {
+        case SMBUS_RECEIVE_BYTE:
+        case SMBUS_READ_BYTE:
+                sz = 1;
+                break;
+        case SMBUS_READ_WORD:
+                sz = 2;
+                break;
+        case SMBUS_READ_BLOCK:
+                if (smb_hc_read(hc, ACPI_SMB_BLOCK_COUNT, &sz)) {
+                        ret = -EFAULT;
+                        goto end;
+                }
+                sz &= 0x1f;
+                break;
+        }
+        for (i = 0; i < sz; ++i)
+                smb_hc_read(hc, ACPI_SMB_DATA + i, &data[i]);
+      end:
+        mutex_unlock(&hc->lock);
+        return ret;
+}
+
+int acpi_smbus_read(struct acpi_smb_hc *hc, u8 protocol, u8 address,
+                    u8 command, u8 *data)
+{
+        return acpi_smbus_transaction(hc, protocol, address, command, data, 0);
+}
+
+EXPORT_SYMBOL_GPL(acpi_smbus_read);
+
+int acpi_smbus_write(struct acpi_smb_hc *hc, u8 protocol, u8 address,
+                     u8 command, u8 *data, u8 length)
+{
+        return acpi_smbus_transaction(hc, protocol, address, command, data, length);
+}
+
+EXPORT_SYMBOL_GPL(acpi_smbus_write);
+
+int acpi_smbus_register_callback(struct acpi_smb_hc *hc,
+                                 smbus_alarm_callback callback, void *context)
+{
+        mutex_lock(&hc->lock);
+        hc->callback = callback;
+        hc->context = context;
+        mutex_unlock(&hc->lock);
+        return 0;
+}
+
+EXPORT_SYMBOL_GPL(acpi_smbus_register_callback);
+
+int acpi_smbus_unregister_callback(struct acpi_smb_hc *hc)
+{
+        mutex_lock(&hc->lock);
+        hc->callback = NULL;
+        hc->context = NULL;
+        mutex_unlock(&hc->lock);
+        return 0;
+}
+
+EXPORT_SYMBOL_GPL(acpi_smbus_unregister_callback);
+
+static void acpi_smbus_callback(void *context)
+{
+        struct acpi_smb_hc *hc = context;
+
+        if (hc->callback)
+                hc->callback(hc->context);
+}
+
+static int smbus_alarm(void *context)
+{
+        struct acpi_smb_hc *hc = context;
+        union acpi_smb_status status;
+        if (smb_hc_read(hc, ACPI_SMB_STATUS, &status.raw))
+                return 0;
+        /* Check if it is only a completion notify */
+        if (status.fields.done)
+                wake_up(&hc->wait);
+        if (!status.fields.alarm)
+                return 0;
+        mutex_lock(&hc->lock);
+        smb_hc_write(hc, ACPI_SMB_STATUS, status.raw);
+        if (hc->callback)
+                acpi_os_execute(OSL_GPE_HANDLER, acpi_smbus_callback, hc);
+        mutex_unlock(&hc->lock);
+        return 0;
+}
+
+typedef int (*acpi_ec_query_func) (void *data);
+
+extern int acpi_ec_add_query_handler(struct acpi_ec *ec, u8 query_bit,
+                              acpi_handle handle, acpi_ec_query_func func,
+                              void *data);
+
+static int acpi_smbus_hc_add(struct acpi_device *device)
+{
+        int status;
+        unsigned long val;
+        struct acpi_smb_hc *hc;
+
+        if (!device)
+                return -EINVAL;
+
+        status = acpi_evaluate_integer(device->handle, "_EC", NULL, &val);
+        if (ACPI_FAILURE(status)) {
+                printk(KERN_ERR PREFIX "error obtaining _EC.\n");
+                return -EIO;
+        }
+
+        strcpy(acpi_device_name(device), ACPI_SMB_HC_DEVICE_NAME);
+        strcpy(acpi_device_class(device), ACPI_SMB_HC_CLASS);
+
+        hc = kzalloc(sizeof(struct acpi_smb_hc), GFP_KERNEL);
+        if (!hc)
+                return -ENOMEM;
+        mutex_init(&hc->lock);
+        init_waitqueue_head(&hc->wait);
+
+        hc->ec = acpi_driver_data(device->parent);
+        hc->offset = (val >> 8) & 0xff;
+        hc->query_bit = val & 0xff;
+        acpi_driver_data(device) = hc;
+
+        acpi_ec_add_query_handler(hc->ec, hc->query_bit, NULL, smbus_alarm, hc);
+        printk(KERN_INFO PREFIX "SBS HC: EC = 0x%p, offset = 0x%0x, query_bit = 0x%0x\n",
+                hc->ec, hc->offset, hc->query_bit);
+
+        return 0;
+}
+
+extern void acpi_ec_remove_query_handler(struct acpi_ec *ec, u8 query_bit);
+
+static int acpi_smbus_hc_remove(struct acpi_device *device, int type)
+{
+        struct acpi_smb_hc *hc;
+
+        if (!device)
+                return -EINVAL;
+
+        hc = acpi_driver_data(device);
+        acpi_ec_remove_query_handler(hc->ec, hc->query_bit);
+        kfree(hc);
+        return 0;
+}
+
+static int __init acpi_smb_hc_init(void)
+{
+        int result;
+
+        result = acpi_bus_register_driver(&acpi_smb_hc_driver);
+        if (result < 0)
+                return -ENODEV;
+        return 0;
+}
+
+static void __exit acpi_smb_hc_exit(void)
+{
+        acpi_bus_unregister_driver(&acpi_smb_hc_driver);
+}
+
+module_init(acpi_smb_hc_init);
+module_exit(acpi_smb_hc_exit);
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Alexey Starikovskiy");
+MODULE_DESCRIPTION("ACPI SMBus HC driver");
diff --git a/drivers/acpi/sbshc.h b/drivers/acpi/sbshc.h
new file mode 100644
index 000000000000..3bda3491a97b
--- /dev/null
+++ b/drivers/acpi/sbshc.h
@@ -0,0 +1,27 @@
+struct acpi_smb_hc;
+enum acpi_smb_protocol {
+        SMBUS_WRITE_QUICK = 2,
+        SMBUS_READ_QUICK = 3,
+        SMBUS_SEND_BYTE = 4,
+        SMBUS_RECEIVE_BYTE = 5,
+        SMBUS_WRITE_BYTE = 6,
+        SMBUS_READ_BYTE = 7,
+        SMBUS_WRITE_WORD  = 8,
+        SMBUS_READ_WORD  = 9,
+        SMBUS_WRITE_BLOCK = 0xa,
+        SMBUS_READ_BLOCK = 0xb,
+        SMBUS_PROCESS_CALL = 0xc,
+        SMBUS_BLOCK_PROCESS_CALL = 0xd,
+};
+
+static const u8 SMBUS_PEC = 0x80;
+
+typedef void (*smbus_alarm_callback)(void *context);
+
+extern int acpi_smbus_read(struct acpi_smb_hc *hc, u8 protocol, u8 address,
+               u8 command, u8 * data);
+extern int acpi_smbus_write(struct acpi_smb_hc *hc, u8 protocol, u8 slave_address,
+                u8 command, u8 * data, u8 length);
+extern int acpi_smbus_register_callback(struct acpi_smb_hc *hc,
+                                 smbus_alarm_callback callback, void *context);
+extern int acpi_smbus_unregister_callback(struct acpi_smb_hc *hc);
diff --git a/drivers/acpi/sleep/main.c b/drivers/acpi/sleep/main.c
index 048295ec3707..f3d3867303ec 100644
--- a/drivers/acpi/sleep/main.c
+++ b/drivers/acpi/sleep/main.c
@@ -44,7 +44,6 @@ int acpi_sleep_prepare(u32 acpi_state)
         ACPI_FLUSH_CPU_CACHE();
         acpi_enable_wakeup_device_prep(acpi_state);
 #endif
-        acpi_gpe_sleep_prepare(acpi_state);
         acpi_enter_sleep_state_prep(acpi_state);
         return 0;
 }
@@ -268,6 +267,11 @@ static void acpi_hibernation_leave(void)
 
 static void acpi_hibernation_finish(void)
 {
+        /*
+         * If ACPI is not enabled by the BIOS and the boot kernel, we need to
+         * enable it here.
+         */
+        acpi_enable();
         acpi_leave_sleep_state(ACPI_STATE_S4);
         acpi_disable_wakeup_device(ACPI_STATE_S4);
 
diff --git a/drivers/acpi/sleep/sleep.h b/drivers/acpi/sleep/sleep.h
index ff1f8504f497..a2ea125ae2d0 100644
--- a/drivers/acpi/sleep/sleep.h
+++ b/drivers/acpi/sleep/sleep.h
@@ -5,6 +5,5 @@ extern int acpi_suspend (u32 state);
 extern void acpi_enable_wakeup_device_prep(u8 sleep_state);
 extern void acpi_enable_wakeup_device(u8 sleep_state);
 extern void acpi_disable_wakeup_device(u8 sleep_state);
-extern void acpi_gpe_sleep_prepare(u32 sleep_state);
 
 extern int acpi_sleep_prepare(u32 acpi_state);
diff --git a/drivers/acpi/sleep/wakeup.c b/drivers/acpi/sleep/wakeup.c
index 97c27ddb144d..ed8e41becf0c 100644
--- a/drivers/acpi/sleep/wakeup.c
+++ b/drivers/acpi/sleep/wakeup.c
@@ -64,36 +64,29 @@ void acpi_enable_wakeup_device(u8 sleep_state)
         ACPI_FUNCTION_TRACE("acpi_enable_wakeup_device");
         spin_lock(&acpi_device_lock);
         list_for_each_safe(node, next, &acpi_wakeup_device_list) {
-                struct acpi_device *dev = container_of(node,
-                                                       struct acpi_device,
-                                                       wakeup_list);
-
+                struct acpi_device *dev =
+                        container_of(node, struct acpi_device, wakeup_list);
+                if (!dev->wakeup.flags.valid)
+                        continue;
                 /* If users want to disable run-wake GPE,
                  * we only disable it for wake and leave it for runtime
                  */
-                if (dev->wakeup.flags.run_wake && !dev->wakeup.state.enabled) {
-                        spin_unlock(&acpi_device_lock);
-                        acpi_set_gpe_type(dev->wakeup.gpe_device,
-                                          dev->wakeup.gpe_number,
-                                          ACPI_GPE_TYPE_RUNTIME);
-                        /* Re-enable it, since set_gpe_type will disable it */
-                        acpi_enable_gpe(dev->wakeup.gpe_device,
-                                        dev->wakeup.gpe_number, ACPI_ISR);
-                        spin_lock(&acpi_device_lock);
+                if (!dev->wakeup.state.enabled ||
+                    sleep_state > (u32) dev->wakeup.sleep_state) {
+                        if (dev->wakeup.flags.run_wake) {
+                                spin_unlock(&acpi_device_lock);
+                                /* set_gpe_type will disable GPE, leave it like that */
+                                acpi_set_gpe_type(dev->wakeup.gpe_device,
+                                                  dev->wakeup.gpe_number,
+                                                  ACPI_GPE_TYPE_RUNTIME);
+                                spin_lock(&acpi_device_lock);
+                        }
                         continue;
                 }
-
-                if (!dev->wakeup.flags.valid ||
-                    !dev->wakeup.state.enabled ||
-                    (sleep_state > (u32) dev->wakeup.sleep_state))
-                        continue;
-
                 spin_unlock(&acpi_device_lock);
-                /* run-wake GPE has been enabled */
                 if (!dev->wakeup.flags.run_wake)
                         acpi_enable_gpe(dev->wakeup.gpe_device,
                                         dev->wakeup.gpe_number, ACPI_ISR);
-                dev->wakeup.state.active = 1;
                 spin_lock(&acpi_device_lock);
         }
         spin_unlock(&acpi_device_lock);
@@ -112,26 +105,25 @@ void acpi_disable_wakeup_device(u8 sleep_state)
 
         spin_lock(&acpi_device_lock);
         list_for_each_safe(node, next, &acpi_wakeup_device_list) {
-                struct acpi_device *dev = container_of(node,
-                                                       struct acpi_device,
-                                                       wakeup_list);
+                struct acpi_device *dev =
+                        container_of(node, struct acpi_device, wakeup_list);
 
-                if (dev->wakeup.flags.run_wake && !dev->wakeup.state.enabled) {
-                        spin_unlock(&acpi_device_lock);
-                        acpi_set_gpe_type(dev->wakeup.gpe_device,
-                                          dev->wakeup.gpe_number,
-                                          ACPI_GPE_TYPE_WAKE_RUN);
-                        /* Re-enable it, since set_gpe_type will disable it */
-                        acpi_enable_gpe(dev->wakeup.gpe_device,
-                                        dev->wakeup.gpe_number, ACPI_NOT_ISR);
-                        spin_lock(&acpi_device_lock);
+                if (!dev->wakeup.flags.valid)
                         continue;
-                }
-
-                if (!dev->wakeup.flags.valid ||
-                    !dev->wakeup.state.active ||
-                    (sleep_state > (u32) dev->wakeup.sleep_state))
+                if (!dev->wakeup.state.enabled ||
+                    sleep_state > (u32) dev->wakeup.sleep_state) {
+                        if (dev->wakeup.flags.run_wake) {
+                                spin_unlock(&acpi_device_lock);
+                                acpi_set_gpe_type(dev->wakeup.gpe_device,
+                                                  dev->wakeup.gpe_number,
+                                                  ACPI_GPE_TYPE_WAKE_RUN);
+                                /* Re-enable it, since set_gpe_type will disable it */
+                                acpi_enable_gpe(dev->wakeup.gpe_device,
+                                                dev->wakeup.gpe_number, ACPI_NOT_ISR);
+                                spin_lock(&acpi_device_lock);
+                        }
                         continue;
+                }
 
                 spin_unlock(&acpi_device_lock);
                 acpi_disable_wakeup_device_power(dev);
@@ -142,7 +134,6 @@ void acpi_disable_wakeup_device(u8 sleep_state)
                         acpi_clear_gpe(dev->wakeup.gpe_device,
                                        dev->wakeup.gpe_number, ACPI_NOT_ISR);
                 }
-                dev->wakeup.state.active = 0;
                 spin_lock(&acpi_device_lock);
         }
         spin_unlock(&acpi_device_lock);
@@ -160,48 +151,20 @@ static int __init acpi_wakeup_device_init(void)
                 struct acpi_device *dev = container_of(node,
                                                        struct acpi_device,
                                                        wakeup_list);
-
                 /* In case user doesn't load button driver */
-                if (dev->wakeup.flags.run_wake && !dev->wakeup.state.enabled) {
-                        spin_unlock(&acpi_device_lock);
-                        acpi_set_gpe_type(dev->wakeup.gpe_device,
-                                          dev->wakeup.gpe_number,
-                                          ACPI_GPE_TYPE_WAKE_RUN);
-                        acpi_enable_gpe(dev->wakeup.gpe_device,
-                                        dev->wakeup.gpe_number, ACPI_NOT_ISR);
-                        dev->wakeup.state.enabled = 1;
-                        spin_lock(&acpi_device_lock);
-                }
+                if (!dev->wakeup.flags.run_wake || dev->wakeup.state.enabled)
+                        continue;
+                spin_unlock(&acpi_device_lock);
+                acpi_set_gpe_type(dev->wakeup.gpe_device,
+                                  dev->wakeup.gpe_number,
+                                  ACPI_GPE_TYPE_WAKE_RUN);
+                acpi_enable_gpe(dev->wakeup.gpe_device,
+                                dev->wakeup.gpe_number, ACPI_NOT_ISR);
+                dev->wakeup.state.enabled = 1;
+                spin_lock(&acpi_device_lock);
         }
         spin_unlock(&acpi_device_lock);
-
         return 0;
 }
 
 late_initcall(acpi_wakeup_device_init);
-
-/*
- * 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 requested state as RUNTIME.
- */
-void acpi_gpe_sleep_prepare(u32 sleep_state)
-{
-        struct list_head *node, *next;
-
-        list_for_each_safe(node, next, &acpi_wakeup_device_list) {
-                struct acpi_device *dev = container_of(node,
-                                                       struct acpi_device,
-                                                       wakeup_list);
-
-                /* The GPE can wakeup system from this state, don't touch it */
-                if ((u32) dev->wakeup.sleep_state >= sleep_state)
-                        continue;
-                /* acpi_set_gpe_type will automatically disable GPE */
-                acpi_set_gpe_type(dev->wakeup.gpe_device,
-                                  dev->wakeup.gpe_number,
-                                  ACPI_GPE_TYPE_RUNTIME);
-        }
-}
diff --git a/drivers/acpi/tables/tbutils.c b/drivers/acpi/tables/tbutils.c
index 8cc9492ffbf2..5f1d85f2ffe4 100644
--- a/drivers/acpi/tables/tbutils.c
+++ b/drivers/acpi/tables/tbutils.c
@@ -400,7 +400,7 @@ acpi_tb_parse_root_table(acpi_physical_address rsdp_address, u8 flags)
         u32 table_count;
         struct acpi_table_header *table;
         acpi_physical_address address;
-        acpi_physical_address rsdt_address;
+        acpi_physical_address uninitialized_var(rsdt_address);
         u32 length;
         u8 *table_entry;
         acpi_status status;
diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c
index ad898e10c1a9..5f79b4451212 100644
--- a/drivers/acpi/thermal.c
+++ b/drivers/acpi/thermal.c
@@ -195,6 +195,7 @@ struct acpi_thermal {
         struct acpi_thermal_trips trips;
         struct acpi_handle_list devices;
         struct timer_list timer;
+        struct mutex lock;
 };
 
 static const struct file_operations acpi_thermal_state_fops = {
@@ -711,6 +712,7 @@ static void acpi_thermal_check(void *data)
         int result = 0;
         struct acpi_thermal *tz = data;
         unsigned long sleep_time = 0;
+        unsigned long timeout_jiffies = 0;
         int i = 0;
         struct acpi_thermal_state state;
 
@@ -720,11 +722,15 @@ static void acpi_thermal_check(void *data)
                 return;
         }
 
+        /* Check if someone else is already running */
+        if (!mutex_trylock(&tz->lock))
+                return;
+
         state = tz->state;
 
         result = acpi_thermal_get_temperature(tz);
         if (result)
-                return;
+                goto unlock;
 
         memset(&tz->state, 0, sizeof(tz->state));
 
@@ -787,10 +793,13 @@ static void acpi_thermal_check(void *data)
          * a thermal event occurs).  Note that _TSP and _TZD values are
          * given in 1/10th seconds (we must covert to milliseconds).
          */
-        if (tz->state.passive)
+        if (tz->state.passive) {
                 sleep_time = tz->trips.passive.tsp * 100;
-        else if (tz->polling_frequency > 0)
+                timeout_jiffies =  jiffies + (HZ * sleep_time) / 1000;
+        } else if (tz->polling_frequency > 0) {
                 sleep_time = tz->polling_frequency * 100;
+                timeout_jiffies =  round_jiffies(jiffies + (HZ * sleep_time) / 1000);
+        }
 
         ACPI_DEBUG_PRINT((ACPI_DB_INFO, "%s: temperature[%lu] sleep[%lu]\n",
                           tz->name, tz->temperature, sleep_time));
@@ -804,17 +813,16 @@ static void acpi_thermal_check(void *data)
                         del_timer(&(tz->timer));
         } else {
                 if (timer_pending(&(tz->timer)))
-                        mod_timer(&(tz->timer),
-                                        jiffies + (HZ * sleep_time) / 1000);
+                        mod_timer(&(tz->timer), timeout_jiffies);
                 else {
                         tz->timer.data = (unsigned long)tz;
                         tz->timer.function = acpi_thermal_run;
-                        tz->timer.expires = jiffies + (HZ * sleep_time) / 1000;
+                        tz->timer.expires = timeout_jiffies;
                         add_timer(&(tz->timer));
                 }
         }
-
-        return;
+      unlock:
+        mutex_unlock(&tz->lock);
 }
 
 /* --------------------------------------------------------------------------
@@ -1251,7 +1259,7 @@ static int acpi_thermal_add(struct acpi_device *device)
         strcpy(acpi_device_name(device), ACPI_THERMAL_DEVICE_NAME);
         strcpy(acpi_device_class(device), ACPI_THERMAL_CLASS);
         acpi_driver_data(device) = tz;
-
+        mutex_init(&tz->lock);
         result = acpi_thermal_get_info(tz);
         if (result)
                 goto end;
@@ -1321,7 +1329,7 @@ static int acpi_thermal_remove(struct acpi_device *device, int type)
         }
 
         acpi_thermal_remove_fs(device);
-
+        mutex_destroy(&tz->lock);
         kfree(tz);
         return 0;
 }
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index b8a2095cb5ee..bac956b30c57 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -409,14 +409,17 @@ acpi_video_device_lcd_query_levels(struct acpi_video_device *device,
 static int
 acpi_video_device_lcd_set_level(struct acpi_video_device *device, int level)
 {
-        int status;
+        int status = AE_OK;
         union acpi_object arg0 = { ACPI_TYPE_INTEGER };
         struct acpi_object_list args = { 1, &arg0 };
 
 
         arg0.integer.value = level;
-        status = acpi_evaluate_object(device->dev->handle, "_BCM", &args, NULL);
 
+        if (device->cap._BCM)
+                status = acpi_evaluate_object(device->dev->handle, "_BCM",
+                                              &args, NULL);
+        device->brightness->curr = level;
         return status;
 }
 
@@ -424,11 +427,11 @@ static int
 acpi_video_device_lcd_get_level_current(struct acpi_video_device *device,
                                         unsigned long *level)
 {
-        int status;
-
-        status = acpi_evaluate_integer(device->dev->handle, "_BQC", NULL, level);
-
-        return status;
+        if (device->cap._BQC)
+                return acpi_evaluate_integer(device->dev->handle, "_BQC", NULL,
+                                             level);
+        *level = device->brightness->curr;
+        return AE_OK;
 }
 
 static int
@@ -1633,9 +1636,20 @@ static int
 acpi_video_get_next_level(struct acpi_video_device *device,
                           u32 level_current, u32 event)
 {
-        int min, max, min_above, max_below, i, l;
+        int min, max, min_above, max_below, i, l, delta = 255;
         max = max_below = 0;
         min = min_above = 255;
+        /* Find closest level to level_current */
+        for (i = 0; i < device->brightness->count; i++) {
+                l = device->brightness->levels[i];
+                if (abs(l - level_current) < abs(delta)) {
+                        delta = l - level_current;
+                        if (!delta)
+                                break;
+                }
+        }
+        /* Ajust level_current to closest available level */
+        level_current += delta;
         for (i = 0; i < device->brightness->count; i++) {
                 l = device->brightness->levels[i];
                 if (l < min)
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index bbaa545ea999..629eadbd0ec0 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -1392,7 +1392,7 @@ static void ata_qc_complete_internal(struct ata_queued_cmd *qc)
  *      @tf: Taskfile registers for the command and the result
  *      @cdb: CDB for packet command
  *      @dma_dir: Data tranfer direction of the command
- *      @sg: sg list for the data buffer of the command
+ *      @sgl: sg list for the data buffer of the command
  *      @n_elem: Number of sg entries
  *      @timeout: Timeout in msecs (0 for default)
  *
diff --git a/drivers/ata/pata_cs5536.c b/drivers/ata/pata_cs5536.c
index 53070f6b1fc4..d753e568588e 100644
--- a/drivers/ata/pata_cs5536.c
+++ b/drivers/ata/pata_cs5536.c
@@ -40,7 +40,7 @@
 #include <asm/msr.h>
 
 #define DRV_NAME        "pata_cs5536"
-#define DRV_VERSION     "0.0.5"
+#define DRV_VERSION     "0.0.6"
 
 enum {
         CFG                     = 0,
@@ -214,7 +214,7 @@ static void cs5536_set_dmamode(struct ata_port *ap, struct ata_device *adev)
                 cs5536_read(pdev, DTC, &dtc);
 
                 dtc &= ~(IDE_DRV_MASK << dshift);
-                dtc |= mwdma_timings[mode] << dshift;
+                dtc |= mwdma_timings[mode - XFER_MW_DMA_0] << dshift;
 
                 cs5536_write(pdev, DTC, dtc);
         }
diff --git a/drivers/ata/sata_sis.c b/drivers/ata/sata_sis.c
index 8d98a9fb0a42..f147dc7bf464 100644
--- a/drivers/ata/sata_sis.c
+++ b/drivers/ata/sata_sis.c
@@ -92,7 +92,7 @@ static struct scsi_host_template sis_sht = {
         .queuecommand           = ata_scsi_queuecmd,
         .can_queue              = ATA_DEF_QUEUE,
         .this_id                = ATA_SHT_THIS_ID,
-        .sg_tablesize           = ATA_MAX_PRD,
+        .sg_tablesize           = LIBATA_MAX_PRD,
         .cmd_per_lun            = ATA_SHT_CMD_PER_LUN,
         .emulated               = ATA_SHT_EMULATED,
         .use_clustering         = ATA_SHT_USE_CLUSTERING,
@@ -166,11 +166,11 @@ static unsigned int get_scr_cfg_addr(struct ata_port *ap, unsigned int sc_reg)
         return addr;
 }
 
-static u32 sis_scr_cfg_read (struct ata_port *ap, unsigned int sc_reg)
+static u32 sis_scr_cfg_read (struct ata_port *ap, unsigned int sc_reg, u32 *val)
 {
         struct pci_dev *pdev = to_pci_dev(ap->host->dev);
         unsigned int cfg_addr = get_scr_cfg_addr(ap, sc_reg);
-        u32 val, val2 = 0;
+        u32 val2 = 0;
         u8 pmr;
 
         if (sc_reg == SCR_ERROR) /* doesn't exist in PCI cfg space */
@@ -178,13 +178,16 @@ static u32 sis_scr_cfg_read (struct ata_port *ap, unsigned int sc_reg)
 
         pci_read_config_byte(pdev, SIS_PMR, &pmr);
 
-        pci_read_config_dword(pdev, cfg_addr, &val);
+        pci_read_config_dword(pdev, cfg_addr, val);
 
         if ((pdev->device == 0x0182) || (pdev->device == 0x0183) ||
             (pdev->device == 0x1182) || (pmr & SIS_PMR_COMBINED))
                 pci_read_config_dword(pdev, cfg_addr+0x10, &val2);
 
-        return (val|val2) &  0xfffffffb; /* avoid problems with powerdowned ports */
+        *val |= val2;
+        *val &= 0xfffffffb;     /* avoid problems with powerdowned ports */
+
+        return 0;
 }
 
 static void sis_scr_cfg_write (struct ata_port *ap, unsigned int sc_reg, u32 val)
@@ -214,7 +217,7 @@ static int sis_scr_read(struct ata_port *ap, unsigned int sc_reg, u32 *val)
                 return -EINVAL;
 
         if (ap->flags & SIS_FLAG_CFGSCR)
-                return sis_scr_cfg_read(ap, sc_reg);
+                return sis_scr_cfg_read(ap, sc_reg, val);
 
         pci_read_config_byte(pdev, SIS_PMR, &pmr);
 
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index cb136a919f2a..ac4a0cb217ab 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -188,7 +188,7 @@ static int sock_xmit(struct nbd_device *lo, int send, void *buf, int size,
                 if (signal_pending(current)) {
                         siginfo_t info;
                         printk(KERN_WARNING "nbd (pid %d: %s) got signal %d\n",
-                                current->pid, current->comm,
+                                task_pid_nr(current), current->comm,
                                 dequeue_signal_lock(current, &current->blocked, &info));
                         result = -EINTR;
                         sock_shutdown(lo, !send);
diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
index d70745c84250..af0561053167 100644
--- a/drivers/cdrom/cdrom.c
+++ b/drivers/cdrom/cdrom.c
@@ -1107,7 +1107,7 @@ int open_for_data(struct cdrom_device_info * cdi)
                        is the default case! */
                     cdinfo(CD_OPEN, "bummer. wrong media type.\n"); 
                     cdinfo(CD_WARNING, "pid %d must open device O_NONBLOCK!\n",
-                                        (unsigned int)current->pid); 
+                                        (unsigned int)task_pid_nr(current));
                     ret=-EMEDIUMTYPE;
                     goto clean_up_and_return;
                 }
diff --git a/drivers/char/drm/drm_bufs.c b/drivers/char/drm/drm_bufs.c
index 856774fbe025..d24a6c2c2c24 100644
--- a/drivers/char/drm/drm_bufs.c
+++ b/drivers/char/drm/drm_bufs.c
@@ -1456,7 +1456,7 @@ int drm_freebufs(struct drm_device *dev, void *data,
                 buf = dma->buflist[idx];
                 if (buf->file_priv != file_priv) {
                         DRM_ERROR("Process %d freeing buffer not owned\n",
-                                  current->pid);
+                                  task_pid_nr(current));
                         return -EINVAL;
                 }
                 drm_free_buffer(dev, buf);
diff --git a/drivers/char/drm/drm_drv.c b/drivers/char/drm/drm_drv.c
index 72668b15e5ce..44a46268b02b 100644
--- a/drivers/char/drm/drm_drv.c
+++ b/drivers/char/drm/drm_drv.c
@@ -463,7 +463,7 @@ int drm_ioctl(struct inode *inode, struct file *filp,
         ++file_priv->ioctl_count;
 
         DRM_DEBUG("pid=%d, cmd=0x%02x, nr=0x%02x, dev 0x%lx, auth=%d\n",
-                  current->pid, cmd, nr,
+                  task_pid_nr(current), cmd, nr,
                   (long)old_encode_dev(file_priv->head->device),
                   file_priv->authenticated);
 
diff --git a/drivers/char/drm/drm_fops.c b/drivers/char/drm/drm_fops.c
index f383fc37190c..3992f73299cc 100644
--- a/drivers/char/drm/drm_fops.c
+++ b/drivers/char/drm/drm_fops.c
@@ -234,7 +234,7 @@ static int drm_open_helper(struct inode *inode, struct file *filp,
         if (!drm_cpu_valid())
                 return -EINVAL;
 
-        DRM_DEBUG("pid = %d, minor = %d\n", current->pid, minor);
+        DRM_DEBUG("pid = %d, minor = %d\n", task_pid_nr(current), minor);
 
         priv = drm_alloc(sizeof(*priv), DRM_MEM_FILES);
         if (!priv)
@@ -244,7 +244,7 @@ static int drm_open_helper(struct inode *inode, struct file *filp,
         filp->private_data = priv;
         priv->filp = filp;
         priv->uid = current->euid;
-        priv->pid = current->pid;
+        priv->pid = task_pid_nr(current);
         priv->minor = minor;
         priv->head = drm_heads[minor];
         priv->ioctl_count = 0;
@@ -339,7 +339,8 @@ int drm_release(struct inode *inode, struct file *filp)
          */
 
         DRM_DEBUG("pid = %d, device = 0x%lx, open_count = %d\n",
-                  current->pid, (long)old_encode_dev(file_priv->head->device),
+                  task_pid_nr(current),
+                  (long)old_encode_dev(file_priv->head->device),
                   dev->open_count);
 
         if (dev->driver->reclaim_buffers_locked && dev->lock.hw_lock) {
diff --git a/drivers/char/drm/drm_lock.c b/drivers/char/drm/drm_lock.c
index c6b73e744d67..bea2a7d5b2b2 100644
--- a/drivers/char/drm/drm_lock.c
+++ b/drivers/char/drm/drm_lock.c
@@ -58,12 +58,12 @@ int drm_lock(struct drm_device *dev, void *data, struct drm_file *file_priv)
 
         if (lock->context == DRM_KERNEL_CONTEXT) {
                 DRM_ERROR("Process %d using kernel context %d\n",
-                          current->pid, lock->context);
+                          task_pid_nr(current), lock->context);
                 return -EINVAL;
         }
 
         DRM_DEBUG("%d (pid %d) requests lock (0x%08x), flags = 0x%08x\n",
-                  lock->context, current->pid,
+                  lock->context, task_pid_nr(current),
                   dev->lock.hw_lock->lock, lock->flags);
 
         if (drm_core_check_feature(dev, DRIVER_DMA_QUEUE))
@@ -153,7 +153,7 @@ int drm_unlock(struct drm_device *dev, void *data, struct drm_file *file_priv)
 
         if (lock->context == DRM_KERNEL_CONTEXT) {
                 DRM_ERROR("Process %d using kernel context %d\n",
-                          current->pid, lock->context);
+                          task_pid_nr(current), lock->context);
                 return -EINVAL;
         }
 
diff --git a/drivers/char/drm/drm_os_linux.h b/drivers/char/drm/drm_os_linux.h
index 114e54e0f61b..76e44ac94fb5 100644
--- a/drivers/char/drm/drm_os_linux.h
+++ b/drivers/char/drm/drm_os_linux.h
@@ -7,7 +7,7 @@
 #include <linux/delay.h>
 
 /** Current process ID */
-#define DRM_CURRENTPID                  current->pid
+#define DRM_CURRENTPID                  task_pid_nr(current)
 #define DRM_SUSER(p)                    capable(CAP_SYS_ADMIN)
 #define DRM_UDELAY(d)                   udelay(d)
 /** Read a byte from a MMIO region */
diff --git a/drivers/char/drm/i810_dma.c b/drivers/char/drm/i810_dma.c
index 8e841bdee6dc..eb381a7c5bee 100644
--- a/drivers/char/drm/i810_dma.c
+++ b/drivers/char/drm/i810_dma.c
@@ -1024,7 +1024,7 @@ static int i810_getbuf(struct drm_device *dev, void *data,
         retcode = i810_dma_get_buffer(dev, d, file_priv);
 
         DRM_DEBUG("i810_dma: %d returning %d, granted = %d\n",
-                  current->pid, retcode, d->granted);
+                  task_pid_nr(current), retcode, d->granted);
 
         sarea_priv->last_dispatch = (int)hw_status[5];
 
diff --git a/drivers/char/drm/i830_dma.c b/drivers/char/drm/i830_dma.c
index 43a1f78712d6..69a363edb0d2 100644
--- a/drivers/char/drm/i830_dma.c
+++ b/drivers/char/drm/i830_dma.c
@@ -1409,7 +1409,7 @@ static int i830_getbuf(struct drm_device *dev, void *data,
         retcode = i830_dma_get_buffer(dev, d, file_priv);
 
         DRM_DEBUG("i830_dma: %d returning %d, granted = %d\n",
-                  current->pid, retcode, d->granted);
+                  task_pid_nr(current), retcode, d->granted);
 
         sarea_priv->last_dispatch = (int)hw_status[5];
 
diff --git a/drivers/char/esp.c b/drivers/char/esp.c
index 2e7ae42a5503..0f8fb135da53 100644
--- a/drivers/char/esp.c
+++ b/drivers/char/esp.c
@@ -58,10 +58,10 @@
 #include <linux/mm.h>
 #include <linux/init.h>
 #include <linux/delay.h>
+#include <linux/bitops.h>
 
 #include <asm/system.h>
 #include <asm/io.h>
-#include <asm/bitops.h>
 
 #include <asm/dma.h>
 #include <linux/slab.h>
diff --git a/drivers/char/keyboard.c b/drivers/char/keyboard.c
index 212276affa1f..fc54d234507a 100644
--- a/drivers/char/keyboard.c
+++ b/drivers/char/keyboard.c
@@ -42,6 +42,7 @@
 #include <linux/sysrq.h>
 #include <linux/input.h>
 #include <linux/reboot.h>
+#include <linux/notifier.h>
 
 extern void ctrl_alt_del(void);
 
@@ -81,7 +82,8 @@ void compute_shiftstate(void);
 typedef void (k_handler_fn)(struct vc_data *vc, unsigned char value,
                             char up_flag);
 static k_handler_fn K_HANDLERS;
-static k_handler_fn *k_handler[16] = { K_HANDLERS };
+k_handler_fn *k_handler[16] = { K_HANDLERS };
+EXPORT_SYMBOL_GPL(k_handler);
 
 #define FN_HANDLERS\
         fn_null,        fn_enter,       fn_show_ptregs, fn_show_mem,\
@@ -127,7 +129,7 @@ int shift_state = 0;
  */
 
 static struct input_handler kbd_handler;
-static unsigned long key_down[NBITS(KEY_MAX)];          /* keyboard key bitmap */
+static unsigned long key_down[BITS_TO_LONGS(KEY_CNT)];  /* keyboard key bitmap */
 static unsigned char shift_down[NR_SHIFT];              /* shift state counters.. */
 static int dead_key_next;
 static int npadch = -1;                                 /* -1 or number assembled on pad */
@@ -160,6 +162,23 @@ static int sysrq_alt_use;
 static int sysrq_alt;
 
 /*
+ * Notifier list for console keyboard events
+ */
+static ATOMIC_NOTIFIER_HEAD(keyboard_notifier_list);
+
+int register_keyboard_notifier(struct notifier_block *nb)
+{
+        return atomic_notifier_chain_register(&keyboard_notifier_list, nb);
+}
+EXPORT_SYMBOL_GPL(register_keyboard_notifier);
+
+int unregister_keyboard_notifier(struct notifier_block *nb)
+{
+        return atomic_notifier_chain_unregister(&keyboard_notifier_list, nb);
+}
+EXPORT_SYMBOL_GPL(unregister_keyboard_notifier);
+
+/*
  * Translation of scancodes to keycodes. We set them on only the first
  * keyboard in the list that accepts the scancode and keycode.
  * Explanation for not choosing the first attached keyboard anymore:
@@ -1130,6 +1149,7 @@ static void kbd_keycode(unsigned int keycode, int down, int hw_raw)
         unsigned char type, raw_mode;
         struct tty_struct *tty;
         int shift_final;
+        struct keyboard_notifier_param param = { .vc = vc, .value = keycode, .down = down };
 
         tty = vc->vc_tty;
 
@@ -1217,10 +1237,11 @@ static void kbd_keycode(unsigned int keycode, int down, int hw_raw)
                 return;
         }
 
-        shift_final = (shift_state | kbd->slockstate) ^ kbd->lockstate;
+        param.shift = shift_final = (shift_state | kbd->slockstate) ^ kbd->lockstate;
         key_map = key_maps[shift_final];
 
-        if (!key_map) {
+        if (atomic_notifier_call_chain(&keyboard_notifier_list, KBD_KEYCODE, &param) == NOTIFY_STOP || !key_map) {
+                atomic_notifier_call_chain(&keyboard_notifier_list, KBD_UNBOUND_KEYCODE, &param);
                 compute_shiftstate();
                 kbd->slockstate = 0;
                 return;
@@ -1237,6 +1258,9 @@ static void kbd_keycode(unsigned int keycode, int down, int hw_raw)
         type = KTYP(keysym);
 
         if (type < 0xf0) {
+                param.value = keysym;
+                if (atomic_notifier_call_chain(&keyboard_notifier_list, KBD_UNICODE, &param) == NOTIFY_STOP)
+                        return;
                 if (down && !raw_mode)
                         to_utf8(vc, keysym);
                 return;
@@ -1244,9 +1268,6 @@ static void kbd_keycode(unsigned int keycode, int down, int hw_raw)
 
         type -= 0xf0;
 
-        if (raw_mode && type != KT_SPEC && type != KT_SHIFT)
-                return;
-
         if (type == KT_LETTER) {
                 type = KT_LATIN;
                 if (vc_kbd_led(kbd, VC_CAPSLOCK)) {
@@ -1255,9 +1276,18 @@ static void kbd_keycode(unsigned int keycode, int down, int hw_raw)
                                 keysym = key_map[keycode];
                 }
         }
+        param.value = keysym;
+
+        if (atomic_notifier_call_chain(&keyboard_notifier_list, KBD_KEYSYM, &param) == NOTIFY_STOP)
+                return;
+
+        if (raw_mode && type != KT_SPEC && type != KT_SHIFT)
+                return;
 
         (*k_handler[type])(vc, keysym & 0xff, !down);
 
+        atomic_notifier_call_chain(&keyboard_notifier_list, KBD_POST_KEYSYM, &param);
+
         if (type != KT_SLOCK)
                 kbd->slockstate = 0;
 }
@@ -1347,12 +1377,12 @@ static void kbd_start(struct input_handle *handle)
 static const struct input_device_id kbd_ids[] = {
         {
                 .flags = INPUT_DEVICE_ID_MATCH_EVBIT,
-                .evbit = { BIT(EV_KEY) },
+                .evbit = { BIT_MASK(EV_KEY) },
         },
 
         {
                 .flags = INPUT_DEVICE_ID_MATCH_EVBIT,
-                .evbit = { BIT(EV_SND) },
+                .evbit = { BIT_MASK(EV_SND) },
         },
 
         { },    /* Terminating entry */
diff --git a/drivers/char/mxser.c b/drivers/char/mxser.c
index 661aca0e155d..fd0abef7ee08 100644
--- a/drivers/char/mxser.c
+++ b/drivers/char/mxser.c
@@ -56,11 +56,11 @@
 #include <linux/mm.h>
 #include <linux/delay.h>
 #include <linux/pci.h>
+#include <linux/bitops.h>
 
 #include <asm/system.h>
 #include <asm/io.h>
 #include <asm/irq.h>
-#include <asm/bitops.h>
 #include <asm/uaccess.h>
 
 #include "mxser.h"
diff --git a/drivers/char/mxser_new.c b/drivers/char/mxser_new.c
index 854dbf59eb68..081c84c7b548 100644
--- a/drivers/char/mxser_new.c
+++ b/drivers/char/mxser_new.c
@@ -39,11 +39,11 @@
 #include <linux/mm.h>
 #include <linux/delay.h>
 #include <linux/pci.h>
+#include <linux/bitops.h>
 
 #include <asm/system.h>
 #include <asm/io.h>
 #include <asm/irq.h>
-#include <asm/bitops.h>
 #include <asm/uaccess.h>
 
 #include "mxser_new.h"
diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c
index 859858561ab6..9782cb4d30dc 100644
--- a/drivers/char/sonypi.c
+++ b/drivers/char/sonypi.c
@@ -1178,9 +1178,9 @@ static int __devinit sonypi_create_input_devices(void)
         jog_dev->id.bustype = BUS_ISA;
         jog_dev->id.vendor = PCI_VENDOR_ID_SONY;
 
-        jog_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REL);
-        jog_dev->keybit[LONG(BTN_MOUSE)] = BIT(BTN_MIDDLE);
-        jog_dev->relbit[0] = BIT(REL_WHEEL);
+        jog_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_REL);
+        jog_dev->keybit[BIT_WORD(BTN_MOUSE)] = BIT_MASK(BTN_MIDDLE);
+        jog_dev->relbit[0] = BIT_MASK(REL_WHEEL);
 
         sonypi_device.input_key_dev = key_dev = input_allocate_device();
         if (!key_dev) {
@@ -1193,7 +1193,7 @@ static int __devinit sonypi_create_input_devices(void)
         key_dev->id.vendor = PCI_VENDOR_ID_SONY;
 
         /* Initialize the Input Drivers: special keys */
-        key_dev->evbit[0] = BIT(EV_KEY);
+        key_dev->evbit[0] = BIT_MASK(EV_KEY);
         for (i = 0; sonypi_inputkeys[i].sonypiev; i++)
                 if (sonypi_inputkeys[i].inputev)
                         set_bit(sonypi_inputkeys[i].inputev, key_dev->keybit);
diff --git a/drivers/char/sx.c b/drivers/char/sx.c
index 85a23283dff5..a6e1c9ba1217 100644
--- a/drivers/char/sx.c
+++ b/drivers/char/sx.c
@@ -1467,7 +1467,7 @@ static int sx_open(struct tty_struct *tty, struct file *filp)
 
         line = tty->index;
         sx_dprintk(SX_DEBUG_OPEN, "%d: opening line %d. tty=%p ctty=%p, "
-                        "np=%d)\n", current->pid, line, tty,
+                        "np=%d)\n", task_pid_nr(current), line, tty,
                         current->signal->tty, sx_nports);
 
         if ((line < 0) || (line >= SX_NPORTS) || (line >= sx_nports))
diff --git a/drivers/char/sysrq.c b/drivers/char/sysrq.c
index 78d14935f2b8..de60e1ea4fb3 100644
--- a/drivers/char/sysrq.c
+++ b/drivers/char/sysrq.c
@@ -251,7 +251,7 @@ static void send_sig_all(int sig)
         struct task_struct *p;
 
         for_each_process(p) {
-                if (p->mm && !is_init(p))
+                if (p->mm && !is_global_init(p))
                         /* Not swapper, init nor kernel thread */
                         force_sig(sig, p);
         }
diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
index 9c867cf6de64..13a53575a016 100644
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
@@ -103,6 +103,7 @@
 #include <linux/selection.h>
 
 #include <linux/kmod.h>
+#include <linux/nsproxy.h>
 
 #undef TTY_DEBUG_HANGUP
 
@@ -3107,7 +3108,7 @@ static int tiocgpgrp(struct tty_struct *tty, struct tty_struct *real_tty, pid_t
          */
         if (tty == real_tty && current->signal->tty != real_tty)
                 return -ENOTTY;
-        return put_user(pid_nr(real_tty->pgrp), p);
+        return put_user(pid_vnr(real_tty->pgrp), p);
 }
 
 /**
@@ -3141,7 +3142,7 @@ static int tiocspgrp(struct tty_struct *tty, struct tty_struct *real_tty, pid_t
         if (pgrp_nr < 0)
                 return -EINVAL;
         rcu_read_lock();
-        pgrp = find_pid(pgrp_nr);
+        pgrp = find_vpid(pgrp_nr);
         retval = -ESRCH;
         if (!pgrp)
                 goto out_unlock;
@@ -3178,7 +3179,7 @@ static int tiocgsid(struct tty_struct *tty, struct tty_struct *real_tty, pid_t _
                 return -ENOTTY;
         if (!real_tty->session)
                 return -ENOTTY;
-        return put_user(pid_nr(real_tty->session), p);
+        return put_user(pid_vnr(real_tty->session), p);
 }
 
 /**
@@ -3528,8 +3529,8 @@ void __do_SAK(struct tty_struct *tty)
         /* Kill the entire session */
         do_each_pid_task(session, PIDTYPE_SID, p) {
                 printk(KERN_NOTICE "SAK: killed process %d"
-                        " (%s): process_session(p)==tty->session\n",
-                        p->pid, p->comm);
+                        " (%s): task_session_nr(p)==tty->session\n",
+                        task_pid_nr(p), p->comm);
                 send_sig(SIGKILL, p, 1);
         } while_each_pid_task(session, PIDTYPE_SID, p);
         /* Now kill any processes that happen to have the
@@ -3538,8 +3539,8 @@ void __do_SAK(struct tty_struct *tty)
         do_each_thread(g, p) {
                 if (p->signal->tty == tty) {
                         printk(KERN_NOTICE "SAK: killed process %d"
-                            " (%s): process_session(p)==tty->session\n",
-                            p->pid, p->comm);
+                            " (%s): task_session_nr(p)==tty->session\n",
+                            task_pid_nr(p), p->comm);
                         send_sig(SIGKILL, p, 1);
                         continue;
                 }
@@ -3559,7 +3560,7 @@ void __do_SAK(struct tty_struct *tty)
                                     filp->private_data == tty) {
                                         printk(KERN_NOTICE "SAK: killed process %d"
                                             " (%s): fd#%d opened to the tty\n",
-                                            p->pid, p->comm, i);
+                                            task_pid_nr(p), p->comm, i);
                                         force_sig(SIGKILL, p);
                                         break;
                                 }
diff --git a/drivers/char/vt.c b/drivers/char/vt.c
index 1764c67b585f..7a5badfb7d84 100644
--- a/drivers/char/vt.c
+++ b/drivers/char/vt.c
@@ -99,6 +99,7 @@
 #include <linux/pm.h>
 #include <linux/font.h>
 #include <linux/bitops.h>
+#include <linux/notifier.h>
 
 #include <asm/io.h>
 #include <asm/system.h>
@@ -223,6 +224,35 @@ enum {
 };
 
 /*
+ * Notifier list for console events.
+ */
+static ATOMIC_NOTIFIER_HEAD(vt_notifier_list);
+
+int register_vt_notifier(struct notifier_block *nb)
+{
+        return atomic_notifier_chain_register(&vt_notifier_list, nb);
+}
+EXPORT_SYMBOL_GPL(register_vt_notifier);
+
+int unregister_vt_notifier(struct notifier_block *nb)
+{
+        return atomic_notifier_chain_unregister(&vt_notifier_list, nb);
+}
+EXPORT_SYMBOL_GPL(unregister_vt_notifier);
+
+static void notify_write(struct vc_data *vc, unsigned int unicode)
+{
+        struct vt_notifier_param param = { .vc = vc, unicode = unicode };
+        atomic_notifier_call_chain(&vt_notifier_list, VT_WRITE, &param);
+}
+
+static void notify_update(struct vc_data *vc)
+{
+        struct vt_notifier_param param = { .vc = vc };
+        atomic_notifier_call_chain(&vt_notifier_list, VT_UPDATE, &param);
+}
+
+/*
  *      Low-Level Functions
  */
 
@@ -718,6 +748,7 @@ int vc_allocate(unsigned int currcons)	/* return 0 on success */
                 return -ENXIO;
         if (!vc_cons[currcons].d) {
             struct vc_data *vc;
+            struct vt_notifier_param param;
 
             /* prevent users from taking too much memory */
             if (currcons >= MAX_NR_USER_CONSOLES && !capable(CAP_SYS_RESOURCE))
@@ -729,7 +760,7 @@ int vc_allocate(unsigned int currcons)	/* return 0 on success */
             /* although the numbers above are not valid since long ago, the
                point is still up-to-date and the comment still has its value
                even if only as a historical artifact.  --mj, July 1998 */
-            vc = kzalloc(sizeof(struct vc_data), GFP_KERNEL);
+            param.vc = vc = kzalloc(sizeof(struct vc_data), GFP_KERNEL);
             if (!vc)
                 return -ENOMEM;
             vc_cons[currcons].d = vc;
@@ -746,6 +777,7 @@ int vc_allocate(unsigned int currcons)	/* return 0 on success */
             }
             vc->vc_kmalloced = 1;
             vc_init(vc, vc->vc_rows, vc->vc_cols, 1);
+            atomic_notifier_call_chain(&vt_notifier_list, VT_ALLOCATE, &param);
         }
         return 0;
 }
@@ -907,6 +939,8 @@ void vc_deallocate(unsigned int currcons)
 
         if (vc_cons_allocated(currcons)) {
                 struct vc_data *vc = vc_cons[currcons].d;
+                struct vt_notifier_param param = { .vc = vc };
+                atomic_notifier_call_chain(&vt_notifier_list, VT_DEALLOCATE, &param);
                 vc->vc_sw->con_deinit(vc);
                 put_pid(vc->vt_pid);
                 module_put(vc->vc_sw->owner);
@@ -1019,6 +1053,7 @@ static void lf(struct vc_data *vc)
                 vc->vc_pos += vc->vc_size_row;
         }
         vc->vc_need_wrap = 0;
+        notify_write(vc, '\n');
 }
 
 static void ri(struct vc_data *vc)
@@ -1039,6 +1074,7 @@ static inline void cr(struct vc_data *vc)
 {
         vc->vc_pos -= vc->vc_x << 1;
         vc->vc_need_wrap = vc->vc_x = 0;
+        notify_write(vc, '\r');
 }
 
 static inline void bs(struct vc_data *vc)
@@ -1047,6 +1083,7 @@ static inline void bs(struct vc_data *vc)
                 vc->vc_pos -= 2;
                 vc->vc_x--;
                 vc->vc_need_wrap = 0;
+                notify_write(vc, '\b');
         }
 }
 
@@ -1593,6 +1630,7 @@ static void do_con_trol(struct tty_struct *tty, struct vc_data *vc, int c)
                                 break;
                 }
                 vc->vc_pos += (vc->vc_x << 1);
+                notify_write(vc, '\t');
                 return;
         case 10: case 11: case 12:
                 lf(vc);
@@ -2252,6 +2290,7 @@ rescan_last_byte:
                                 tc = conv_uni_to_pc(vc, ' '); /* A space is printed in the second column */
                                 if (tc < 0) tc = ' ';
                         }
+                        notify_write(vc, c);
 
                         if (inverse) {
                                 FLUSH
@@ -2274,6 +2313,7 @@ rescan_last_byte:
         release_console_sem();
 
 out:
+        notify_update(vc);
         return n;
 #undef FLUSH
 }
@@ -2317,6 +2357,7 @@ static void console_callback(struct work_struct *ignored)
                 do_blank_screen(0);
                 blank_timer_expired = 0;
         }
+        notify_update(vc_cons[fg_console].d);
 
         release_console_sem();
 }
@@ -2418,6 +2459,7 @@ static void vt_console_print(struct console *co, const char *b, unsigned count)
                                 continue;
                 }
                 scr_writew((vc->vc_attr << 8) + c, (unsigned short *)vc->vc_pos);
+                notify_write(vc, c);
                 cnt++;
                 if (myx == vc->vc_cols - 1) {
                         vc->vc_need_wrap = 1;
@@ -2436,6 +2478,7 @@ static void vt_console_print(struct console *co, const char *b, unsigned count)
                 }
         }
         set_cursor(vc);
+        notify_update(vc);
 
 quit:
         clear_bit(0, &printing);
diff --git a/drivers/cpuidle/Kconfig b/drivers/cpuidle/Kconfig
new file mode 100644
index 000000000000..3bed4127d4ad
--- /dev/null
+++ b/drivers/cpuidle/Kconfig
@@ -0,0 +1,20 @@
+
+config CPU_IDLE
+        bool "CPU idle PM support"
+        help
+          CPU idle is a generic framework for supporting software-controlled
+          idle processor power management.  It includes modular cross-platform
+          governors that can be swapped during runtime.
+
+          If you're using a mobile platform that supports CPU idle PM (e.g.
+          an ACPI-capable notebook), you should say Y here.
+
+config CPU_IDLE_GOV_LADDER
+        bool
+        depends on CPU_IDLE
+        default y
+
+config CPU_IDLE_GOV_MENU
+        bool
+        depends on CPU_IDLE && NO_HZ
+        default y
diff --git a/drivers/cpuidle/Makefile b/drivers/cpuidle/Makefile
new file mode 100644
index 000000000000..5634f88379df
--- /dev/null
+++ b/drivers/cpuidle/Makefile
@@ -0,0 +1,5 @@
+#
+# Makefile for cpuidle.
+#
+
+obj-y += cpuidle.o driver.o governor.o sysfs.o governors/
diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c
new file mode 100644
index 000000000000..fdf4106b817b
--- /dev/null
+++ b/drivers/cpuidle/cpuidle.c
@@ -0,0 +1,295 @@
+/*
+ * cpuidle.c - core cpuidle infrastructure
+ *
+ * (C) 2006-2007 Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
+ *               Shaohua Li <shaohua.li@intel.com>
+ *               Adam Belay <abelay@novell.com>
+ *
+ * This code is licenced under the GPL.
+ */
+
+#include <linux/kernel.h>
+#include <linux/mutex.h>
+#include <linux/sched.h>
+#include <linux/notifier.h>
+#include <linux/latency.h>
+#include <linux/cpu.h>
+#include <linux/cpuidle.h>
+
+#include "cpuidle.h"
+
+DEFINE_PER_CPU(struct cpuidle_device *, cpuidle_devices);
+EXPORT_PER_CPU_SYMBOL_GPL(cpuidle_devices);
+
+DEFINE_MUTEX(cpuidle_lock);
+LIST_HEAD(cpuidle_detected_devices);
+static void (*pm_idle_old)(void);
+
+static int enabled_devices;
+
+/**
+ * cpuidle_idle_call - the main idle loop
+ *
+ * NOTE: no locks or semaphores should be used here
+ */
+static void cpuidle_idle_call(void)
+{
+        struct cpuidle_device *dev = __get_cpu_var(cpuidle_devices);
+        struct cpuidle_state *target_state;
+        int next_state;
+
+        /* check if the device is ready */
+        if (!dev || !dev->enabled) {
+                if (pm_idle_old)
+                        pm_idle_old();
+                else
+                        local_irq_enable();
+                return;
+        }
+
+        /* ask the governor for the next state */
+        next_state = cpuidle_curr_governor->select(dev);
+        if (need_resched())
+                return;
+        target_state = &dev->states[next_state];
+
+        /* enter the state and update stats */
+        dev->last_residency = target_state->enter(dev, target_state);
+        dev->last_state = target_state;
+        target_state->time += dev->last_residency;
+        target_state->usage++;
+
+        /* give the governor an opportunity to reflect on the outcome */
+        if (cpuidle_curr_governor->reflect)
+                cpuidle_curr_governor->reflect(dev);
+}
+
+/**
+ * cpuidle_install_idle_handler - installs the cpuidle idle loop handler
+ */
+void cpuidle_install_idle_handler(void)
+{
+        if (enabled_devices && (pm_idle != cpuidle_idle_call)) {
+                /* Make sure all changes finished before we switch to new idle */
+                smp_wmb();
+                pm_idle = cpuidle_idle_call;
+        }
+}
+
+/**
+ * cpuidle_uninstall_idle_handler - uninstalls the cpuidle idle loop handler
+ */
+void cpuidle_uninstall_idle_handler(void)
+{
+        if (enabled_devices && (pm_idle != pm_idle_old)) {
+                pm_idle = pm_idle_old;
+                cpu_idle_wait();
+        }
+}
+
+/**
+ * cpuidle_pause_and_lock - temporarily disables CPUIDLE
+ */
+void cpuidle_pause_and_lock(void)
+{
+        mutex_lock(&cpuidle_lock);
+        cpuidle_uninstall_idle_handler();
+}
+
+EXPORT_SYMBOL_GPL(cpuidle_pause_and_lock);
+
+/**
+ * cpuidle_resume_and_unlock - resumes CPUIDLE operation
+ */
+void cpuidle_resume_and_unlock(void)
+{
+        cpuidle_install_idle_handler();
+        mutex_unlock(&cpuidle_lock);
+}
+
+EXPORT_SYMBOL_GPL(cpuidle_resume_and_unlock);
+
+/**
+ * cpuidle_enable_device - enables idle PM for a CPU
+ * @dev: the CPU
+ *
+ * This function must be called between cpuidle_pause_and_lock and
+ * cpuidle_resume_and_unlock when used externally.
+ */
+int cpuidle_enable_device(struct cpuidle_device *dev)
+{
+        int ret, i;
+
+        if (dev->enabled)
+                return 0;
+        if (!cpuidle_curr_driver || !cpuidle_curr_governor)
+                return -EIO;
+        if (!dev->state_count)
+                return -EINVAL;
+
+        if ((ret = cpuidle_add_state_sysfs(dev)))
+                return ret;
+
+        if (cpuidle_curr_governor->enable &&
+            (ret = cpuidle_curr_governor->enable(dev)))
+                goto fail_sysfs;
+
+        for (i = 0; i < dev->state_count; i++) {
+                dev->states[i].usage = 0;
+                dev->states[i].time = 0;
+        }
+        dev->last_residency = 0;
+        dev->last_state = NULL;
+
+        smp_wmb();
+
+        dev->enabled = 1;
+
+        enabled_devices++;
+        return 0;
+
+fail_sysfs:
+        cpuidle_remove_state_sysfs(dev);
+
+        return ret;
+}
+
+EXPORT_SYMBOL_GPL(cpuidle_enable_device);
+
+/**
+ * cpuidle_disable_device - disables idle PM for a CPU
+ * @dev: the CPU
+ *
+ * This function must be called between cpuidle_pause_and_lock and
+ * cpuidle_resume_and_unlock when used externally.
+ */
+void cpuidle_disable_device(struct cpuidle_device *dev)
+{
+        if (!dev->enabled)
+                return;
+        if (!cpuidle_curr_driver || !cpuidle_curr_governor)
+                return;
+
+        dev->enabled = 0;
+
+        if (cpuidle_curr_governor->disable)
+                cpuidle_curr_governor->disable(dev);
+
+        cpuidle_remove_state_sysfs(dev);
+        enabled_devices--;
+}
+
+EXPORT_SYMBOL_GPL(cpuidle_disable_device);
+
+/**
+ * cpuidle_register_device - registers a CPU's idle PM feature
+ * @dev: the cpu
+ */
+int cpuidle_register_device(struct cpuidle_device *dev)
+{
+        int ret;
+        struct sys_device *sys_dev = get_cpu_sysdev((unsigned long)dev->cpu);
+
+        if (!sys_dev)
+                return -EINVAL;
+        if (!try_module_get(cpuidle_curr_driver->owner))
+                return -EINVAL;
+
+        init_completion(&dev->kobj_unregister);
+
+        mutex_lock(&cpuidle_lock);
+
+        per_cpu(cpuidle_devices, dev->cpu) = dev;
+        list_add(&dev->device_list, &cpuidle_detected_devices);
+        if ((ret = cpuidle_add_sysfs(sys_dev))) {
+                mutex_unlock(&cpuidle_lock);
+                module_put(cpuidle_curr_driver->owner);
+                return ret;
+        }
+
+        cpuidle_enable_device(dev);
+        cpuidle_install_idle_handler();
+
+        mutex_unlock(&cpuidle_lock);
+
+        return 0;
+
+}
+
+EXPORT_SYMBOL_GPL(cpuidle_register_device);
+
+/**
+ * cpuidle_unregister_device - unregisters a CPU's idle PM feature
+ * @dev: the cpu
+ */
+void cpuidle_unregister_device(struct cpuidle_device *dev)
+{
+        struct sys_device *sys_dev = get_cpu_sysdev((unsigned long)dev->cpu);
+
+        cpuidle_pause_and_lock();
+
+        cpuidle_disable_device(dev);
+
+        cpuidle_remove_sysfs(sys_dev);
+        list_del(&dev->device_list);
+        wait_for_completion(&dev->kobj_unregister);
+        per_cpu(cpuidle_devices, dev->cpu) = NULL;
+
+        cpuidle_resume_and_unlock();
+
+        module_put(cpuidle_curr_driver->owner);
+}
+
+EXPORT_SYMBOL_GPL(cpuidle_unregister_device);
+
+#ifdef CONFIG_SMP
+
+static void smp_callback(void *v)
+{
+        /* we already woke the CPU up, nothing more to do */
+}
+
+/*
+ * This function gets called when a part of the kernel has a new latency
+ * requirement.  This means we need to get all processors out of their C-state,
+ * and then recalculate a new suitable C-state. Just do a cross-cpu IPI; that
+ * wakes them all right up.
+ */
+static int cpuidle_latency_notify(struct notifier_block *b,
+                unsigned long l, void *v)
+{
+        smp_call_function(smp_callback, NULL, 0, 1);
+        return NOTIFY_OK;
+}
+
+static struct notifier_block cpuidle_latency_notifier = {
+        .notifier_call = cpuidle_latency_notify,
+};
+
+#define latency_notifier_init(x) do { register_latency_notifier(x); } while (0)
+
+#else /* CONFIG_SMP */
+
+#define latency_notifier_init(x) do { } while (0)
+
+#endif /* CONFIG_SMP */
+
+/**
+ * cpuidle_init - core initializer
+ */
+static int __init cpuidle_init(void)
+{
+        int ret;
+
+        pm_idle_old = pm_idle;
+
+        ret = cpuidle_add_class_sysfs(&cpu_sysdev_class);
+        if (ret)
+                return ret;
+
+        latency_notifier_init(&cpuidle_latency_notifier);
+
+        return 0;
+}
+
+core_initcall(cpuidle_init);
diff --git a/drivers/cpuidle/cpuidle.h b/drivers/cpuidle/cpuidle.h
new file mode 100644
index 000000000000..9476ba33ee2c
--- /dev/null
+++ b/drivers/cpuidle/cpuidle.h
@@ -0,0 +1,33 @@
+/*
+ * cpuidle.h - The internal header file
+ */
+
+#ifndef __DRIVER_CPUIDLE_H
+#define __DRIVER_CPUIDLE_H
+
+#include <linux/sysdev.h>
+
+/* For internal use only */
+extern struct cpuidle_governor *cpuidle_curr_governor;
+extern struct cpuidle_driver *cpuidle_curr_driver;
+extern struct list_head cpuidle_governors;
+extern struct list_head cpuidle_detected_devices;
+extern struct mutex cpuidle_lock;
+extern spinlock_t cpuidle_driver_lock;
+
+/* idle loop */
+extern void cpuidle_install_idle_handler(void);
+extern void cpuidle_uninstall_idle_handler(void);
+
+/* governors */
+extern int cpuidle_switch_governor(struct cpuidle_governor *gov);
+
+/* sysfs */
+extern int cpuidle_add_class_sysfs(struct sysdev_class *cls);
+extern void cpuidle_remove_class_sysfs(struct sysdev_class *cls);
+extern int cpuidle_add_state_sysfs(struct cpuidle_device *device);
+extern void cpuidle_remove_state_sysfs(struct cpuidle_device *device);
+extern int cpuidle_add_sysfs(struct sys_device *sysdev);
+extern void cpuidle_remove_sysfs(struct sys_device *sysdev);
+
+#endif /* __DRIVER_CPUIDLE_H */
diff --git a/drivers/cpuidle/driver.c b/drivers/cpuidle/driver.c
new file mode 100644
index 000000000000..2257004fe33d
--- /dev/null
+++ b/drivers/cpuidle/driver.c
@@ -0,0 +1,56 @@
+/*
+ * driver.c - driver support
+ *
+ * (C) 2006-2007 Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
+ *               Shaohua Li <shaohua.li@intel.com>
+ *               Adam Belay <abelay@novell.com>
+ *
+ * This code is licenced under the GPL.
+ */
+
+#include <linux/mutex.h>
+#include <linux/module.h>
+#include <linux/cpuidle.h>
+
+#include "cpuidle.h"
+
+struct cpuidle_driver *cpuidle_curr_driver;
+DEFINE_SPINLOCK(cpuidle_driver_lock);
+
+/**
+ * cpuidle_register_driver - registers a driver
+ * @drv: the driver
+ */
+int cpuidle_register_driver(struct cpuidle_driver *drv)
+{
+        if (!drv)
+                return -EINVAL;
+
+        spin_lock(&cpuidle_driver_lock);
+        if (cpuidle_curr_driver) {
+                spin_unlock(&cpuidle_driver_lock);
+                return -EBUSY;
+        }
+        cpuidle_curr_driver = drv;
+        spin_unlock(&cpuidle_driver_lock);
+
+        return 0;
+}
+
+EXPORT_SYMBOL_GPL(cpuidle_register_driver);
+
+/**
+ * cpuidle_unregister_driver - unregisters a driver
+ * @drv: the driver
+ */
+void cpuidle_unregister_driver(struct cpuidle_driver *drv)
+{
+        if (!drv)
+                return;
+
+        spin_lock(&cpuidle_driver_lock);
+        cpuidle_curr_driver = NULL;
+        spin_unlock(&cpuidle_driver_lock);
+}
+
+EXPORT_SYMBOL_GPL(cpuidle_unregister_driver);
diff --git a/drivers/cpuidle/governor.c b/drivers/cpuidle/governor.c
new file mode 100644
index 000000000000..bb699cb2dc5a
--- /dev/null
+++ b/drivers/cpuidle/governor.c
@@ -0,0 +1,141 @@
+/*
+ * governor.c - governor support
+ *
+ * (C) 2006-2007 Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
+ *               Shaohua Li <shaohua.li@intel.com>
+ *               Adam Belay <abelay@novell.com>
+ *
+ * This code is licenced under the GPL.
+ */
+
+#include <linux/mutex.h>
+#include <linux/module.h>
+#include <linux/cpuidle.h>
+
+#include "cpuidle.h"
+
+LIST_HEAD(cpuidle_governors);
+struct cpuidle_governor *cpuidle_curr_governor;
+
+/**
+ * __cpuidle_find_governor - finds a governor of the specified name
+ * @str: the name
+ *
+ * Must be called with cpuidle_lock aquired.
+ */
+static struct cpuidle_governor * __cpuidle_find_governor(const char *str)
+{
+        struct cpuidle_governor *gov;
+
+        list_for_each_entry(gov, &cpuidle_governors, governor_list)
+                if (!strnicmp(str, gov->name, CPUIDLE_NAME_LEN))
+                        return gov;
+
+        return NULL;
+}
+
+/**
+ * cpuidle_switch_governor - changes the governor
+ * @gov: the new target governor
+ *
+ * NOTE: "gov" can be NULL to specify disabled
+ * Must be called with cpuidle_lock aquired.
+ */
+int cpuidle_switch_governor(struct cpuidle_governor *gov)
+{
+        struct cpuidle_device *dev;
+
+        if (gov == cpuidle_curr_governor)
+                return 0;
+
+        cpuidle_uninstall_idle_handler();
+
+        if (cpuidle_curr_governor) {
+                list_for_each_entry(dev, &cpuidle_detected_devices, device_list)
+                        cpuidle_disable_device(dev);
+                module_put(cpuidle_curr_governor->owner);
+        }
+
+        cpuidle_curr_governor = gov;
+
+        if (gov) {
+                if (!try_module_get(cpuidle_curr_governor->owner))
+                        return -EINVAL;
+                list_for_each_entry(dev, &cpuidle_detected_devices, device_list)
+                        cpuidle_enable_device(dev);
+                cpuidle_install_idle_handler();
+                printk(KERN_INFO "cpuidle: using governor %s\n", gov->name);
+        }
+
+        return 0;
+}
+
+/**
+ * cpuidle_register_governor - registers a governor
+ * @gov: the governor
+ */
+int cpuidle_register_governor(struct cpuidle_governor *gov)
+{
+        int ret = -EEXIST;
+
+        if (!gov || !gov->select)
+                return -EINVAL;
+
+        mutex_lock(&cpuidle_lock);
+        if (__cpuidle_find_governor(gov->name) == NULL) {
+                ret = 0;
+                list_add_tail(&gov->governor_list, &cpuidle_governors);
+                if (!cpuidle_curr_governor ||
+                    cpuidle_curr_governor->rating < gov->rating)
+                        cpuidle_switch_governor(gov);
+        }
+        mutex_unlock(&cpuidle_lock);
+
+        return ret;
+}
+
+EXPORT_SYMBOL_GPL(cpuidle_register_governor);
+
+/**
+ * cpuidle_replace_governor - find a replacement governor
+ * @exclude_rating: the rating that will be skipped while looking for
+ * new governor.
+ */
+static struct cpuidle_governor *cpuidle_replace_governor(int exclude_rating)
+{
+        struct cpuidle_governor *gov;
+        struct cpuidle_governor *ret_gov = NULL;
+        unsigned int max_rating = 0;
+
+        list_for_each_entry(gov, &cpuidle_governors, governor_list) {
+                if (gov->rating == exclude_rating)
+                        continue;
+                if (gov->rating > max_rating) {
+                        max_rating = gov->rating;
+                        ret_gov = gov;
+                }
+        }
+
+        return ret_gov;
+}
+
+/**
+ * cpuidle_unregister_governor - unregisters a governor
+ * @gov: the governor
+ */
+void cpuidle_unregister_governor(struct cpuidle_governor *gov)
+{
+        if (!gov)
+                return;
+
+        mutex_lock(&cpuidle_lock);
+        if (gov == cpuidle_curr_governor) {
+                struct cpuidle_governor *new_gov;
+                new_gov = cpuidle_replace_governor(gov->rating);
+                cpuidle_switch_governor(new_gov);
+        }
+        list_del(&gov->governor_list);
+        mutex_unlock(&cpuidle_lock);
+}
+
+EXPORT_SYMBOL_GPL(cpuidle_unregister_governor);
diff --git a/drivers/cpuidle/governors/Makefile b/drivers/cpuidle/governors/Makefile
new file mode 100644
index 000000000000..1b512722689f
--- /dev/null
+++ b/drivers/cpuidle/governors/Makefile
@@ -0,0 +1,6 @@
+#
+# Makefile for cpuidle governors.
+#
+
+obj-$(CONFIG_CPU_IDLE_GOV_LADDER) += ladder.o
+obj-$(CONFIG_CPU_IDLE_GOV_MENU) += menu.o
diff --git a/drivers/cpuidle/governors/ladder.c b/drivers/cpuidle/governors/ladder.c
new file mode 100644
index 000000000000..eb666ecae7c9
--- /dev/null
+++ b/drivers/cpuidle/governors/ladder.c
@@ -0,0 +1,166 @@
+/*
+ * ladder.c - the residency ladder algorithm
+ *
+ *  Copyright (C) 2001, 2002 Andy Grover <andrew.grover@intel.com>
+ *  Copyright (C) 2001, 2002 Paul Diefenbaugh <paul.s.diefenbaugh@intel.com>
+ *  Copyright (C) 2004, 2005 Dominik Brodowski <linux@brodo.de>
+ *
+ * (C) 2006-2007 Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
+ *               Shaohua Li <shaohua.li@intel.com>
+ *               Adam Belay <abelay@novell.com>
+ *
+ * This code is licenced under the GPL.
+ */
+
+#include <linux/kernel.h>
+#include <linux/cpuidle.h>
+#include <linux/latency.h>
+#include <linux/moduleparam.h>
+#include <linux/jiffies.h>
+
+#include <asm/io.h>
+#include <asm/uaccess.h>
+
+#define PROMOTION_COUNT 4
+#define DEMOTION_COUNT 1
+
+struct ladder_device_state {
+        struct {
+                u32 promotion_count;
+                u32 demotion_count;
+                u32 promotion_time;
+                u32 demotion_time;
+        } threshold;
+        struct {
+                int promotion_count;
+                int demotion_count;
+        } stats;
+};
+
+struct ladder_device {
+        struct ladder_device_state states[CPUIDLE_STATE_MAX];
+        int last_state_idx;
+};
+
+static DEFINE_PER_CPU(struct ladder_device, ladder_devices);
+
+/**
+ * ladder_do_selection - prepares private data for a state change
+ * @ldev: the ladder device
+ * @old_idx: the current state index
+ * @new_idx: the new target state index
+ */
+static inline void ladder_do_selection(struct ladder_device *ldev,
+                                       int old_idx, int new_idx)
+{
+        ldev->states[old_idx].stats.promotion_count = 0;
+        ldev->states[old_idx].stats.demotion_count = 0;
+        ldev->last_state_idx = new_idx;
+}
+
+/**
+ * ladder_select_state - selects the next state to enter
+ * @dev: the CPU
+ */
+static int ladder_select_state(struct cpuidle_device *dev)
+{
+        struct ladder_device *ldev = &__get_cpu_var(ladder_devices);
+        struct ladder_device_state *last_state;
+        int last_residency, last_idx = ldev->last_state_idx;
+
+        if (unlikely(!ldev))
+                return 0;
+
+        last_state = &ldev->states[last_idx];
+
+        if (dev->states[last_idx].flags & CPUIDLE_FLAG_TIME_VALID)
+                last_residency = cpuidle_get_last_residency(dev) - dev->states[last_idx].exit_latency;
+        else
+                last_residency = last_state->threshold.promotion_time + 1;
+
+        /* consider promotion */
+        if (last_idx < dev->state_count - 1 &&
+            last_residency > last_state->threshold.promotion_time &&
+            dev->states[last_idx + 1].exit_latency <= system_latency_constraint()) {
+                last_state->stats.promotion_count++;
+                last_state->stats.demotion_count = 0;
+                if (last_state->stats.promotion_count >= last_state->threshold.promotion_count) {
+                        ladder_do_selection(ldev, last_idx, last_idx + 1);
+                        return last_idx + 1;
+                }
+        }
+
+        /* consider demotion */
+        if (last_idx > 0 &&
+            last_residency < last_state->threshold.demotion_time) {
+                last_state->stats.demotion_count++;
+                last_state->stats.promotion_count = 0;
+                if (last_state->stats.demotion_count >= last_state->threshold.demotion_count) {
+                        ladder_do_selection(ldev, last_idx, last_idx - 1);
+                        return last_idx - 1;
+                }
+        }
+
+        /* otherwise remain at the current state */
+        return last_idx;
+}
+
+/**
+ * ladder_enable_device - setup for the governor
+ * @dev: the CPU
+ */
+static int ladder_enable_device(struct cpuidle_device *dev)
+{
+        int i;
+        struct ladder_device *ldev = &per_cpu(ladder_devices, dev->cpu);
+        struct ladder_device_state *lstate;
+        struct cpuidle_state *state;
+
+        ldev->last_state_idx = 0;
+
+        for (i = 0; i < dev->state_count; i++) {
+                state = &dev->states[i];
+                lstate = &ldev->states[i];
+
+                lstate->stats.promotion_count = 0;
+                lstate->stats.demotion_count = 0;
+
+                lstate->threshold.promotion_count = PROMOTION_COUNT;
+                lstate->threshold.demotion_count = DEMOTION_COUNT;
+
+                if (i < dev->state_count - 1)
+                        lstate->threshold.promotion_time = state->exit_latency;
+                if (i > 0)
+                        lstate->threshold.demotion_time = state->exit_latency;
+        }
+
+        return 0;
+}
+
+static struct cpuidle_governor ladder_governor = {
+        .name =         "ladder",
+        .rating =       10,
+        .enable =       ladder_enable_device,
+        .select =       ladder_select_state,
+        .owner =        THIS_MODULE,
+};
+
+/**
+ * init_ladder - initializes the governor
+ */
+static int __init init_ladder(void)
+{
+        return cpuidle_register_governor(&ladder_governor);
+}
+
+/**
+ * exit_ladder - exits the governor
+ */
+static void __exit exit_ladder(void)
+{
+        cpuidle_unregister_governor(&ladder_governor);
+}
+
+MODULE_LICENSE("GPL");
+module_init(init_ladder);
+module_exit(exit_ladder);
diff --git a/drivers/cpuidle/governors/menu.c b/drivers/cpuidle/governors/menu.c
new file mode 100644
index 000000000000..299d45c3bdd2
--- /dev/null
+++ b/drivers/cpuidle/governors/menu.c
@@ -0,0 +1,137 @@
+/*
+ * menu.c - the menu idle governor
+ *
+ * Copyright (C) 2006-2007 Adam Belay <abelay@novell.com>
+ *
+ * This code is licenced under the GPL.
+ */
+
+#include <linux/kernel.h>
+#include <linux/cpuidle.h>
+#include <linux/latency.h>
+#include <linux/time.h>
+#include <linux/ktime.h>
+#include <linux/hrtimer.h>
+#include <linux/tick.h>
+
+#define BREAK_FUZZ      4       /* 4 us */
+
+struct menu_device {
+        int             last_state_idx;
+
+        unsigned int    expected_us;
+        unsigned int    predicted_us;
+        unsigned int    last_measured_us;
+        unsigned int    elapsed_us;
+};
+
+static DEFINE_PER_CPU(struct menu_device, menu_devices);
+
+/**
+ * menu_select - selects the next idle state to enter
+ * @dev: the CPU
+ */
+static int menu_select(struct cpuidle_device *dev)
+{
+        struct menu_device *data = &__get_cpu_var(menu_devices);
+        int i;
+
+        /* determine the expected residency time */
+        data->expected_us =
+                (u32) ktime_to_ns(tick_nohz_get_sleep_length()) / 1000;
+
+        /* find the deepest idle state that satisfies our constraints */
+        for (i = 1; i < dev->state_count; i++) {
+                struct cpuidle_state *s = &dev->states[i];
+
+                if (s->target_residency > data->expected_us)
+                        break;
+                if (s->target_residency > data->predicted_us)
+                        break;
+                if (s->exit_latency > system_latency_constraint())
+                        break;
+        }
+
+        data->last_state_idx = i - 1;
+        return i - 1;
+}
+
+/**
+ * menu_reflect - attempts to guess what happened after entry
+ * @dev: the CPU
+ *
+ * NOTE: it's important to be fast here because this operation will add to
+ *       the overall exit latency.
+ */
+static void menu_reflect(struct cpuidle_device *dev)
+{
+        struct menu_device *data = &__get_cpu_var(menu_devices);
+        int last_idx = data->last_state_idx;
+        unsigned int measured_us =
+                cpuidle_get_last_residency(dev) + data->elapsed_us;
+        struct cpuidle_state *target = &dev->states[last_idx];
+
+        /*
+         * Ugh, this idle state doesn't support residency measurements, so we
+         * are basically lost in the dark.  As a compromise, assume we slept
+         * for one full standard timer tick.  However, be aware that this
+         * could potentially result in a suboptimal state transition.
+         */
+        if (!(target->flags & CPUIDLE_FLAG_TIME_VALID))
+                measured_us = USEC_PER_SEC / HZ;
+
+        /* Predict time remaining until next break event */
+        if (measured_us + BREAK_FUZZ < data->expected_us - target->exit_latency) {
+                data->predicted_us = max(measured_us, data->last_measured_us);
+                data->last_measured_us = measured_us;
+                data->elapsed_us = 0;
+        } else {
+                if (data->elapsed_us < data->elapsed_us + measured_us)
+                        data->elapsed_us = measured_us;
+                else
+                        data->elapsed_us = -1;
+                data->predicted_us = max(measured_us, data->last_measured_us);
+        }
+}
+
+/**
+ * menu_enable_device - scans a CPU's states and does setup
+ * @dev: the CPU
+ */
+static int menu_enable_device(struct cpuidle_device *dev)
+{
+        struct menu_device *data = &per_cpu(menu_devices, dev->cpu);
+
+        memset(data, 0, sizeof(struct menu_device));
+
+        return 0;
+}
+
+static struct cpuidle_governor menu_governor = {
+        .name =         "menu",
+        .rating =       20,
+        .enable =       menu_enable_device,
+        .select =       menu_select,
+        .reflect =      menu_reflect,
+        .owner =        THIS_MODULE,
+};
+
+/**
+ * init_menu - initializes the governor
+ */
+static int __init init_menu(void)
+{
+        return cpuidle_register_governor(&menu_governor);
+}
+
+/**
+ * exit_menu - exits the governor
+ */
+static void __exit exit_menu(void)
+{
+        cpuidle_unregister_governor(&menu_governor);
+}
+
+MODULE_LICENSE("GPL");
+module_init(init_menu);
+module_exit(exit_menu);
diff --git a/drivers/cpuidle/sysfs.c b/drivers/cpuidle/sysfs.c
new file mode 100644
index 000000000000..0f3515e77d4b
--- /dev/null
+++ b/drivers/cpuidle/sysfs.c
@@ -0,0 +1,361 @@
+/*
+ * sysfs.c - sysfs support
+ *
+ * (C) 2006-2007 Shaohua Li <shaohua.li@intel.com>
+ *
+ * This code is licenced under the GPL.
+ */
+
+#include <linux/kernel.h>
+#include <linux/cpuidle.h>
+#include <linux/sysfs.h>
+#include <linux/cpu.h>
+
+#include "cpuidle.h"
+
+static unsigned int sysfs_switch;
+static int __init cpuidle_sysfs_setup(char *unused)
+{
+        sysfs_switch = 1;
+        return 1;
+}
+__setup("cpuidle_sysfs_switch", cpuidle_sysfs_setup);
+
+static ssize_t show_available_governors(struct sys_device *dev, char *buf)
+{
+        ssize_t i = 0;
+        struct cpuidle_governor *tmp;
+
+        mutex_lock(&cpuidle_lock);
+        list_for_each_entry(tmp, &cpuidle_governors, governor_list) {
+                if (i >= (ssize_t) ((PAGE_SIZE/sizeof(char)) - CPUIDLE_NAME_LEN - 2))
+                        goto out;
+                i += scnprintf(&buf[i], CPUIDLE_NAME_LEN, "%s ", tmp->name);
+        }
+
+out:
+        i+= sprintf(&buf[i], "\n");
+        mutex_unlock(&cpuidle_lock);
+        return i;
+}
+
+static ssize_t show_current_driver(struct sys_device *dev, char *buf)
+{
+        ssize_t ret;
+
+        spin_lock(&cpuidle_driver_lock);
+        if (cpuidle_curr_driver)
+                ret = sprintf(buf, "%s\n", cpuidle_curr_driver->name);
+        else
+                ret = sprintf(buf, "none\n");
+        spin_unlock(&cpuidle_driver_lock);
+
+        return ret;
+}
+
+static ssize_t show_current_governor(struct sys_device *dev, char *buf)
+{
+        ssize_t ret;
+
+        mutex_lock(&cpuidle_lock);
+        if (cpuidle_curr_governor)
+                ret = sprintf(buf, "%s\n", cpuidle_curr_governor->name);
+        else
+                ret = sprintf(buf, "none\n");
+        mutex_unlock(&cpuidle_lock);
+
+        return ret;
+}
+
+static ssize_t store_current_governor(struct sys_device *dev,
+        const char *buf, size_t count)
+{
+        char gov_name[CPUIDLE_NAME_LEN];
+        int ret = -EINVAL;
+        size_t len = count;
+        struct cpuidle_governor *gov;
+
+        if (!len || len >= sizeof(gov_name))
+                return -EINVAL;
+
+        memcpy(gov_name, buf, len);
+        gov_name[len] = '\0';
+        if (gov_name[len - 1] == '\n')
+                gov_name[--len] = '\0';
+
+        mutex_lock(&cpuidle_lock);
+
+        list_for_each_entry(gov, &cpuidle_governors, governor_list) {
+                if (strlen(gov->name) == len && !strcmp(gov->name, gov_name)) {
+                        ret = cpuidle_switch_governor(gov);
+                        break;
+                }
+        }
+
+        mutex_unlock(&cpuidle_lock);
+
+        if (ret)
+                return ret;
+        else
+                return count;
+}
+
+static SYSDEV_ATTR(current_driver, 0444, show_current_driver, NULL);
+static SYSDEV_ATTR(current_governor_ro, 0444, show_current_governor, NULL);
+
+static struct attribute *cpuclass_default_attrs[] = {
+        &attr_current_driver.attr,
+        &attr_current_governor_ro.attr,
+        NULL
+};
+
+static SYSDEV_ATTR(available_governors, 0444, show_available_governors, NULL);
+static SYSDEV_ATTR(current_governor, 0644, show_current_governor,
+        store_current_governor);
+
+static struct attribute *cpuclass_switch_attrs[] = {
+        &attr_available_governors.attr,
+        &attr_current_driver.attr,
+        &attr_current_governor.attr,
+        NULL
+};
+
+static struct attribute_group cpuclass_attr_group = {
+        .attrs = cpuclass_default_attrs,
+        .name = "cpuidle",
+};
+
+/**
+ * cpuidle_add_class_sysfs - add CPU global sysfs attributes
+ */
+int cpuidle_add_class_sysfs(struct sysdev_class *cls)
+{
+        if (sysfs_switch)
+                cpuclass_attr_group.attrs = cpuclass_switch_attrs;
+
+        return sysfs_create_group(&cls->kset.kobj, &cpuclass_attr_group);
+}
+
+/**
+ * cpuidle_remove_class_sysfs - remove CPU global sysfs attributes
+ */
+void cpuidle_remove_class_sysfs(struct sysdev_class *cls)
+{
+        sysfs_remove_group(&cls->kset.kobj, &cpuclass_attr_group);
+}
+
+struct cpuidle_attr {
+        struct attribute attr;
+        ssize_t (*show)(struct cpuidle_device *, char *);
+        ssize_t (*store)(struct cpuidle_device *, const char *, size_t count);
+};
+
+#define define_one_ro(_name, show) \
+        static struct cpuidle_attr attr_##_name = __ATTR(_name, 0444, show, NULL)
+#define define_one_rw(_name, show, store) \
+        static struct cpuidle_attr attr_##_name = __ATTR(_name, 0644, show, store)
+
+#define kobj_to_cpuidledev(k) container_of(k, struct cpuidle_device, kobj)
+#define attr_to_cpuidleattr(a) container_of(a, struct cpuidle_attr, attr)
+static ssize_t cpuidle_show(struct kobject * kobj, struct attribute * attr ,char * buf)
+{
+        int ret = -EIO;
+        struct cpuidle_device *dev = kobj_to_cpuidledev(kobj);
+        struct cpuidle_attr * cattr = attr_to_cpuidleattr(attr);
+
+        if (cattr->show) {
+                mutex_lock(&cpuidle_lock);
+                ret = cattr->show(dev, buf);
+                mutex_unlock(&cpuidle_lock);
+        }
+        return ret;
+}
+
+static ssize_t cpuidle_store(struct kobject * kobj, struct attribute * attr,
+                     const char * buf, size_t count)
+{
+        int ret = -EIO;
+        struct cpuidle_device *dev = kobj_to_cpuidledev(kobj);
+        struct cpuidle_attr * cattr = attr_to_cpuidleattr(attr);
+
+        if (cattr->store) {
+                mutex_lock(&cpuidle_lock);
+                ret = cattr->store(dev, buf, count);
+                mutex_unlock(&cpuidle_lock);
+        }
+        return ret;
+}
+
+static struct sysfs_ops cpuidle_sysfs_ops = {
+        .show = cpuidle_show,
+        .store = cpuidle_store,
+};
+
+static void cpuidle_sysfs_release(struct kobject *kobj)
+{
+        struct cpuidle_device *dev = kobj_to_cpuidledev(kobj);
+
+        complete(&dev->kobj_unregister);
+}
+
+static struct kobj_type ktype_cpuidle = {
+        .sysfs_ops = &cpuidle_sysfs_ops,
+        .release = cpuidle_sysfs_release,
+};
+
+struct cpuidle_state_attr {
+        struct attribute attr;
+        ssize_t (*show)(struct cpuidle_state *, char *);
+        ssize_t (*store)(struct cpuidle_state *, const char *, size_t);
+};
+
+#define define_one_state_ro(_name, show) \
+static struct cpuidle_state_attr attr_##_name = __ATTR(_name, 0444, show, NULL)
+
+#define define_show_state_function(_name) \
+static ssize_t show_state_##_name(struct cpuidle_state *state, char *buf) \
+{ \
+        return sprintf(buf, "%u\n", state->_name);\
+}
+
+static ssize_t show_state_name(struct cpuidle_state *state, char *buf)
+{
+        return sprintf(buf, "%s\n", state->name);
+}
+
+define_show_state_function(exit_latency)
+define_show_state_function(power_usage)
+define_show_state_function(usage)
+define_show_state_function(time)
+define_one_state_ro(name, show_state_name);
+define_one_state_ro(latency, show_state_exit_latency);
+define_one_state_ro(power, show_state_power_usage);
+define_one_state_ro(usage, show_state_usage);
+define_one_state_ro(time, show_state_time);
+
+static struct attribute *cpuidle_state_default_attrs[] = {
+        &attr_name.attr,
+        &attr_latency.attr,
+        &attr_power.attr,
+        &attr_usage.attr,
+        &attr_time.attr,
+        NULL
+};
+
+#define kobj_to_state_obj(k) container_of(k, struct cpuidle_state_kobj, kobj)
+#define kobj_to_state(k) (kobj_to_state_obj(k)->state)
+#define attr_to_stateattr(a) container_of(a, struct cpuidle_state_attr, attr)
+static ssize_t cpuidle_state_show(struct kobject * kobj,
+        struct attribute * attr ,char * buf)
+{
+        int ret = -EIO;
+        struct cpuidle_state *state = kobj_to_state(kobj);
+        struct cpuidle_state_attr * cattr = attr_to_stateattr(attr);
+
+        if (cattr->show)
+                ret = cattr->show(state, buf);
+
+        return ret;
+}
+
+static struct sysfs_ops cpuidle_state_sysfs_ops = {
+        .show = cpuidle_state_show,
+};
+
+static void cpuidle_state_sysfs_release(struct kobject *kobj)
+{
+        struct cpuidle_state_kobj *state_obj = kobj_to_state_obj(kobj);
+
+        complete(&state_obj->kobj_unregister);
+}
+
+static struct kobj_type ktype_state_cpuidle = {
+        .sysfs_ops = &cpuidle_state_sysfs_ops,
+        .default_attrs = cpuidle_state_default_attrs,
+        .release = cpuidle_state_sysfs_release,
+};
+
+static void inline cpuidle_free_state_kobj(struct cpuidle_device *device, int i)
+{
+        kobject_unregister(&device->kobjs[i]->kobj);
+        wait_for_completion(&device->kobjs[i]->kobj_unregister);
+        kfree(device->kobjs[i]);
+        device->kobjs[i] = NULL;
+}
+
+/**
+ * cpuidle_add_driver_sysfs - adds driver-specific sysfs attributes
+ * @device: the target device
+ */
+int cpuidle_add_state_sysfs(struct cpuidle_device *device)
+{
+        int i, ret = -ENOMEM;
+        struct cpuidle_state_kobj *kobj;
+
+        /* state statistics */
+        for (i = 0; i < device->state_count; i++) {
+                kobj = kzalloc(sizeof(struct cpuidle_state_kobj), GFP_KERNEL);
+                if (!kobj)
+                        goto error_state;
+                kobj->state = &device->states[i];
+                init_completion(&kobj->kobj_unregister);
+
+                kobj->kobj.parent = &device->kobj;
+                kobj->kobj.ktype = &ktype_state_cpuidle;
+                kobject_set_name(&kobj->kobj, "state%d", i);
+                ret = kobject_register(&kobj->kobj);
+                if (ret) {
+                        kfree(kobj);
+                        goto error_state;
+                }
+                device->kobjs[i] = kobj;
+        }
+
+        return 0;
+
+error_state:
+        for (i = i - 1; i >= 0; i--)
+                cpuidle_free_state_kobj(device, i);
+        return ret;
+}
+
+/**
+ * cpuidle_remove_driver_sysfs - removes driver-specific sysfs attributes
+ * @device: the target device
+ */
+void cpuidle_remove_state_sysfs(struct cpuidle_device *device)
+{
+        int i;
+
+        for (i = 0; i < device->state_count; i++)
+                cpuidle_free_state_kobj(device, i);
+}
+
+/**
+ * cpuidle_add_sysfs - creates a sysfs instance for the target device
+ * @sysdev: the target device
+ */
+int cpuidle_add_sysfs(struct sys_device *sysdev)
+{
+        int cpu = sysdev->id;
+        struct cpuidle_device *dev;
+
+        dev = per_cpu(cpuidle_devices, cpu);
+        dev->kobj.parent = &sysdev->kobj;
+        dev->kobj.ktype = &ktype_cpuidle;
+        kobject_set_name(&dev->kobj, "%s", "cpuidle");
+        return kobject_register(&dev->kobj);
+}
+
+/**
+ * cpuidle_remove_sysfs - deletes a sysfs instance on the target device
+ * @sysdev: the target device
+ */
+void cpuidle_remove_sysfs(struct sys_device *sysdev)
+{
+        int cpu = sysdev->id;
+        struct cpuidle_device *dev;
+
+        dev = per_cpu(cpuidle_devices, cpu);
+        kobject_unregister(&dev->kobj);
+}
diff --git a/drivers/edac/edac_core.h b/drivers/edac/edac_core.h
index e80af67664cc..2d23e304f5ec 100644
--- a/drivers/edac/edac_core.h
+++ b/drivers/edac/edac_core.h
@@ -94,8 +94,6 @@ extern int edac_debug_level;
 
 #endif                          /* !CONFIG_EDAC_DEBUG */
 
-#define BIT(x) (1 << (x))
-
 #define PCI_VEND_DEV(vend, dev) PCI_VENDOR_ID_ ## vend, \
         PCI_DEVICE_ID_ ## vend ## _ ## dev
 
diff --git a/drivers/edac/pasemi_edac.c b/drivers/edac/pasemi_edac.c
index e66cdd42a392..9007d0677220 100644
--- a/drivers/edac/pasemi_edac.c
+++ b/drivers/edac/pasemi_edac.c
@@ -270,6 +270,7 @@ static void __devexit pasemi_edac_remove(struct pci_dev *pdev)
 
 static const struct pci_device_id pasemi_edac_pci_tbl[] = {
         { PCI_DEVICE(PCI_VENDOR_ID_PASEMI, 0xa00a) },
+        { }
 };
 
 MODULE_DEVICE_TABLE(pci, pasemi_edac_pci_tbl);
diff --git a/drivers/firmware/dcdbas.h b/drivers/firmware/dcdbas.h
index dcdba0f1b32c..87bc3417de27 100644
--- a/drivers/firmware/dcdbas.h
+++ b/drivers/firmware/dcdbas.h
@@ -17,7 +17,6 @@
 #define _DCDBAS_H_
 
 #include <linux/device.h>
-#include <linux/input.h>
 #include <linux/sysfs.h>
 #include <linux/types.h>
 
diff --git a/drivers/hid/hidraw.c b/drivers/hid/hidraw.c
index a702e2f6da7d..1ca6f4635eeb 100644
--- a/drivers/hid/hidraw.c
+++ b/drivers/hid/hidraw.c
@@ -113,13 +113,13 @@ static ssize_t hidraw_write(struct file *file, const char __user *buffer, size_t
 
         if (count > HID_MIN_BUFFER_SIZE) {
                 printk(KERN_WARNING "hidraw: pid %d passed too large report\n",
-                                current->pid);
+                                task_pid_nr(current));
                 return -EINVAL;
         }
 
         if (count < 2) {
                 printk(KERN_WARNING "hidraw: pid %d passed too short report\n",
-                                current->pid);
+                                task_pid_nr(current));
                 return -EINVAL;
         }
 
diff --git a/drivers/hid/usbhid/usbkbd.c b/drivers/hid/usbhid/usbkbd.c
index b76b02f7b52d..775a1ef28a29 100644
--- a/drivers/hid/usbhid/usbkbd.c
+++ b/drivers/hid/usbhid/usbkbd.c
@@ -274,8 +274,11 @@ static int usb_kbd_probe(struct usb_interface *iface,
 
         input_set_drvdata(input_dev, kbd);
 
-        input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_LED) | BIT(EV_REP);
-        input_dev->ledbit[0] = BIT(LED_NUML) | BIT(LED_CAPSL) | BIT(LED_SCROLLL) | BIT(LED_COMPOSE) | BIT(LED_KANA);
+        input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_LED) |
+                BIT_MASK(EV_REP);
+        input_dev->ledbit[0] = BIT_MASK(LED_NUML) | BIT_MASK(LED_CAPSL) |
+                BIT_MASK(LED_SCROLLL) | BIT_MASK(LED_COMPOSE) |
+                BIT_MASK(LED_KANA);
 
         for (i = 0; i < 255; i++)
                 set_bit(usb_kbd_keycode[i], input_dev->keybit);
diff --git a/drivers/hid/usbhid/usbmouse.c b/drivers/hid/usbhid/usbmouse.c
index 5345c73bcf62..f8ad6910d3d9 100644
--- a/drivers/hid/usbhid/usbmouse.c
+++ b/drivers/hid/usbhid/usbmouse.c
@@ -173,11 +173,13 @@ static int usb_mouse_probe(struct usb_interface *intf, const struct usb_device_i
         usb_to_input_id(dev, &input_dev->id);
         input_dev->dev.parent = &intf->dev;
 
-        input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REL);
-        input_dev->keybit[LONG(BTN_MOUSE)] = BIT(BTN_LEFT) | BIT(BTN_RIGHT) | BIT(BTN_MIDDLE);
-        input_dev->relbit[0] = BIT(REL_X) | BIT(REL_Y);
-        input_dev->keybit[LONG(BTN_MOUSE)] |= BIT(BTN_SIDE) | BIT(BTN_EXTRA);
-        input_dev->relbit[0] |= BIT(REL_WHEEL);
+        input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_REL);
+        input_dev->keybit[BIT_WORD(BTN_MOUSE)] = BIT_MASK(BTN_LEFT) |
+                BIT_MASK(BTN_RIGHT) | BIT_MASK(BTN_MIDDLE);
+        input_dev->relbit[0] = BIT_MASK(REL_X) | BIT_MASK(REL_Y);
+        input_dev->keybit[BIT_WORD(BTN_MOUSE)] |= BIT_MASK(BTN_SIDE) |
+                BIT_MASK(BTN_EXTRA);
+        input_dev->relbit[0] |= BIT_MASK(REL_WHEEL);
 
         input_set_drvdata(input_dev, mouse);
 
diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c
index 4879125b4cdc..1001d2e122a2 100644
--- a/drivers/hwmon/applesmc.c
+++ b/drivers/hwmon/applesmc.c
@@ -1099,7 +1099,7 @@ static int applesmc_create_accelerometer(void)
         idev->name = "applesmc";
         idev->id.bustype = BUS_HOST;
         idev->dev.parent = &pdev->dev;
-        idev->evbit[0] = BIT(EV_ABS);
+        idev->evbit[0] = BIT_MASK(EV_ABS);
         input_set_abs_params(idev, ABS_X,
                         -256, 256, APPLESMC_INPUT_FUZZ, APPLESMC_INPUT_FLAT);
         input_set_abs_params(idev, ABS_Y,
diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c
index 6f66551d9e51..5c82ec7f8bbd 100644
--- a/drivers/hwmon/coretemp.c
+++ b/drivers/hwmon/coretemp.c
@@ -150,7 +150,7 @@ static struct coretemp_data *coretemp_update_device(struct device *dev)
 static int __devinit coretemp_probe(struct platform_device *pdev)
 {
         struct coretemp_data *data;
-        struct cpuinfo_x86 *c = &(cpu_data)[pdev->id];
+        struct cpuinfo_x86 *c = &cpu_data(pdev->id);
         int err;
         u32 eax, edx;
 
@@ -359,7 +359,7 @@ static int __init coretemp_init(void)
         struct pdev_entry *p, *n;
 
         /* quick check if we run Intel */
-        if (cpu_data[0].x86_vendor != X86_VENDOR_INTEL)
+        if (cpu_data(0).x86_vendor != X86_VENDOR_INTEL)
                 goto exit;
 
         err = platform_driver_register(&coretemp_driver);
@@ -367,7 +367,7 @@ static int __init coretemp_init(void)
                 goto exit;
 
         for_each_online_cpu(i) {
-                struct cpuinfo_x86 *c = &(cpu_data)[i];
+                struct cpuinfo_x86 *c = &cpu_data(i);
 
                 /* check if family 6, models e, f, 16 */
                 if ((c->cpuid_level < 0) || (c->x86 != 0x6) ||
diff --git a/drivers/hwmon/hdaps.c b/drivers/hwmon/hdaps.c
index 8a7ae03aeee4..bab5fd2e4dfd 100644
--- a/drivers/hwmon/hdaps.c
+++ b/drivers/hwmon/hdaps.c
@@ -574,7 +574,7 @@ static int __init hdaps_init(void)
         idev = hdaps_idev->input;
         idev->name = "hdaps";
         idev->dev.parent = &pdev->dev;
-        idev->evbit[0] = BIT(EV_ABS);
+        idev->evbit[0] = BIT_MASK(EV_ABS);
         input_set_abs_params(idev, ABS_X,
                         -256, 256, HDAPS_INPUT_FUZZ, HDAPS_INPUT_FLAT);
         input_set_abs_params(idev, ABS_Y,
diff --git a/drivers/hwmon/hwmon-vid.c b/drivers/hwmon/hwmon-vid.c
index f17e771e42f8..3330667280b9 100644
--- a/drivers/hwmon/hwmon-vid.c
+++ b/drivers/hwmon/hwmon-vid.c
@@ -200,7 +200,7 @@ static u8 find_vrm(u8 eff_family, u8 eff_model, u8 eff_stepping, u8 vendor)
 
 u8 vid_which_vrm(void)
 {
-        struct cpuinfo_x86 *c = cpu_data;
+        struct cpuinfo_x86 *c = &cpu_data(0);
         u32 eax;
         u8 eff_family, eff_model, eff_stepping, vrm_ret;
 
diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c
index 00fad11733ad..6426a61f8d4d 100644
--- a/drivers/i2c/busses/i2c-pxa.c
+++ b/drivers/i2c/busses/i2c-pxa.c
@@ -85,7 +85,7 @@ struct bits {
         const char *set;
         const char *unset;
 };
-#define BIT(m, s, u)    { .mask = m, .set = s, .unset = u }
+#define PXA_BIT(m, s, u)        { .mask = m, .set = s, .unset = u }
 
 static inline void
 decode_bits(const char *prefix, const struct bits *bits, int num, u32 val)
@@ -100,17 +100,17 @@ decode_bits(const char *prefix, const struct bits *bits, int num, u32 val)
 }
 
 static const struct bits isr_bits[] = {
-        BIT(ISR_RWM,    "RX",           "TX"),
-        BIT(ISR_ACKNAK, "NAK",          "ACK"),
-        BIT(ISR_UB,     "Bsy",          "Rdy"),
-        BIT(ISR_IBB,    "BusBsy",       "BusRdy"),
-        BIT(ISR_SSD,    "SlaveStop",    NULL),
-        BIT(ISR_ALD,    "ALD",          NULL),
-        BIT(ISR_ITE,    "TxEmpty",      NULL),
-        BIT(ISR_IRF,    "RxFull",       NULL),
-        BIT(ISR_GCAD,   "GenCall",      NULL),
-        BIT(ISR_SAD,    "SlaveAddr",    NULL),
-        BIT(ISR_BED,    "BusErr",       NULL),
+        PXA_BIT(ISR_RWM,        "RX",           "TX"),
+        PXA_BIT(ISR_ACKNAK,     "NAK",          "ACK"),
+        PXA_BIT(ISR_UB,         "Bsy",          "Rdy"),
+        PXA_BIT(ISR_IBB,        "BusBsy",       "BusRdy"),
+        PXA_BIT(ISR_SSD,        "SlaveStop",    NULL),
+        PXA_BIT(ISR_ALD,        "ALD",          NULL),
+        PXA_BIT(ISR_ITE,        "TxEmpty",      NULL),
+        PXA_BIT(ISR_IRF,        "RxFull",       NULL),
+        PXA_BIT(ISR_GCAD,       "GenCall",      NULL),
+        PXA_BIT(ISR_SAD,        "SlaveAddr",    NULL),
+        PXA_BIT(ISR_BED,        "BusErr",       NULL),
 };
 
 static void decode_ISR(unsigned int val)
@@ -120,21 +120,21 @@ static void decode_ISR(unsigned int val)
 }
 
 static const struct bits icr_bits[] = {
-        BIT(ICR_START,  "START",        NULL),
-        BIT(ICR_STOP,   "STOP",         NULL),
-        BIT(ICR_ACKNAK, "ACKNAK",       NULL),
-        BIT(ICR_TB,     "TB",           NULL),
-        BIT(ICR_MA,     "MA",           NULL),
-        BIT(ICR_SCLE,   "SCLE",         "scle"),
-        BIT(ICR_IUE,    "IUE",          "iue"),
-        BIT(ICR_GCD,    "GCD",          NULL),
-        BIT(ICR_ITEIE,  "ITEIE",        NULL),
-        BIT(ICR_IRFIE,  "IRFIE",        NULL),
-        BIT(ICR_BEIE,   "BEIE",         NULL),
-        BIT(ICR_SSDIE,  "SSDIE",        NULL),
-        BIT(ICR_ALDIE,  "ALDIE",        NULL),
-        BIT(ICR_SADIE,  "SADIE",        NULL),
-        BIT(ICR_UR,     "UR",           "ur"),
+        PXA_BIT(ICR_START,  "START",    NULL),
+        PXA_BIT(ICR_STOP,   "STOP",     NULL),
+        PXA_BIT(ICR_ACKNAK, "ACKNAK",   NULL),
+        PXA_BIT(ICR_TB,     "TB",       NULL),
+        PXA_BIT(ICR_MA,     "MA",       NULL),
+        PXA_BIT(ICR_SCLE,   "SCLE",     "scle"),
+        PXA_BIT(ICR_IUE,    "IUE",      "iue"),
+        PXA_BIT(ICR_GCD,    "GCD",      NULL),
+        PXA_BIT(ICR_ITEIE,  "ITEIE",    NULL),
+        PXA_BIT(ICR_IRFIE,  "IRFIE",    NULL),
+        PXA_BIT(ICR_BEIE,   "BEIE",     NULL),
+        PXA_BIT(ICR_SSDIE,  "SSDIE",    NULL),
+        PXA_BIT(ICR_ALDIE,  "ALDIE",    NULL),
+        PXA_BIT(ICR_SADIE,  "SADIE",    NULL),
+        PXA_BIT(ICR_UR,     "UR",               "ur"),
 };
 
 static void decode_ICR(unsigned int val)
diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig
index 6d9fd92763f4..6eaece96524e 100644
--- a/drivers/ide/Kconfig
+++ b/drivers/ide/Kconfig
@@ -1056,6 +1056,9 @@ endif
 config BLK_DEV_IDEDMA
         def_bool BLK_DEV_IDEDMA_PCI || BLK_DEV_IDEDMA_PMAC || BLK_DEV_IDEDMA_ICS || BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA
 
+config IDE_ARCH_OBSOLETE_INIT
+        def_bool ALPHA || (ARM && !ARCH_L7200) || BLACKFIN || X86 || IA64 || M32R || MIPS || PARISC || PPC || (SUPERH64 && BLK_DEV_IDEPCI) || SPARC
+
 endif
 
 config BLK_DEV_HD_ONLY
diff --git a/drivers/ide/arm/bast-ide.c b/drivers/ide/arm/bast-ide.c
index f7449d04114a..48db6167bb90 100644
--- a/drivers/ide/arm/bast-ide.c
+++ b/drivers/ide/arm/bast-ide.c
@@ -45,7 +45,7 @@ bastide_register(unsigned int base, unsigned int aux, int irq,
         hw.io_ports[IDE_CONTROL_OFFSET] = aux + (6 * 0x20);
         hw.irq = irq;
 
-        ide_register_hw(&hw, 0, hwif);
+        ide_register_hw(&hw, NULL, 0, hwif);
 
         return 0;
 }
diff --git a/drivers/ide/arm/icside.c b/drivers/ide/arm/icside.c
index 3af33fbf1f88..410a0d13e35e 100644
--- a/drivers/ide/arm/icside.c
+++ b/drivers/ide/arm/icside.c
@@ -316,27 +316,29 @@ static int icside_dma_end(ide_drive_t *drive)
 
         drive->waiting_for_dma = 0;
 
-        disable_dma(hwif->hw.dma);
+        disable_dma(state->dev->dma);
 
         /* Teardown mappings after DMA has completed. */
         dma_unmap_sg(state->dev, hwif->sg_table, hwif->sg_nents,
                      hwif->sg_dma_direction);
 
-        return get_dma_residue(hwif->hw.dma) != 0;
+        return get_dma_residue(state->dev->dma) != 0;
 }
 
 static void icside_dma_start(ide_drive_t *drive)
 {
         ide_hwif_t *hwif = HWIF(drive);
+        struct icside_state *state = hwif->hwif_data;
 
         /* We can not enable DMA on both channels simultaneously. */
-        BUG_ON(dma_channel_active(hwif->hw.dma));
-        enable_dma(hwif->hw.dma);
+        BUG_ON(dma_channel_active(state->dev->dma));
+        enable_dma(state->dev->dma);
 }
 
 static int icside_dma_setup(ide_drive_t *drive)
 {
         ide_hwif_t *hwif = HWIF(drive);
+        struct icside_state *state = hwif->hwif_data;
         struct request *rq = hwif->hwgroup->rq;
         unsigned int dma_mode;
 
@@ -348,7 +350,7 @@ static int icside_dma_setup(ide_drive_t *drive)
         /*
          * We can not enable DMA on both channels.
          */
-        BUG_ON(dma_channel_active(hwif->hw.dma));
+        BUG_ON(dma_channel_active(state->dev->dma));
 
         icside_build_sglist(drive, rq);
 
@@ -365,14 +367,14 @@ static int icside_dma_setup(ide_drive_t *drive)
         /*
          * Select the correct timing for this drive.
          */
-        set_dma_speed(hwif->hw.dma, drive->drive_data);
+        set_dma_speed(state->dev->dma, drive->drive_data);
 
         /*
          * Tell the DMA engine about the SG table and
          * data direction.
          */
-        set_dma_sg(hwif->hw.dma, hwif->sg_table, hwif->sg_nents);
-        set_dma_mode(hwif->hw.dma, dma_mode);
+        set_dma_sg(state->dev->dma, hwif->sg_table, hwif->sg_nents);
+        set_dma_mode(state->dev->dma, dma_mode);
 
         drive->waiting_for_dma = 1;
 
@@ -438,40 +440,16 @@ static void icside_dma_init(ide_hwif_t *hwif)
 #define icside_dma_init(hwif)   (0)
 #endif
 
-static ide_hwif_t *icside_find_hwif(unsigned long dataport)
-{
-        ide_hwif_t *hwif;
-        int index;
-
-        for (index = 0; index < MAX_HWIFS; ++index) {
-                hwif = &ide_hwifs[index];
-                if (hwif->io_ports[IDE_DATA_OFFSET] == dataport)
-                        goto found;
-        }
-
-        for (index = 0; index < MAX_HWIFS; ++index) {
-                hwif = &ide_hwifs[index];
-                if (!hwif->io_ports[IDE_DATA_OFFSET])
-                        goto found;
-        }
-
-        hwif = NULL;
-found:
-        return hwif;
-}
-
 static ide_hwif_t *
 icside_setup(void __iomem *base, struct cardinfo *info, struct expansion_card *ec)
 {
         unsigned long port = (unsigned long)base + info->dataoffset;
         ide_hwif_t *hwif;
 
-        hwif = icside_find_hwif(port);
+        hwif = ide_find_port(port);
         if (hwif) {
                 int i;
 
-                memset(&hwif->hw, 0, sizeof(hw_regs_t));
-
                 /*
                  * Ensure we're using MMIO
                  */
@@ -479,13 +457,10 @@ icside_setup(void __iomem *base, struct cardinfo *info, struct expansion_card *e
                 hwif->mmio = 1;
 
                 for (i = IDE_DATA_OFFSET; i <= IDE_STATUS_OFFSET; i++) {
-                        hwif->hw.io_ports[i] = port;
                         hwif->io_ports[i] = port;
                         port += 1 << info->stepping;
                 }
-                hwif->hw.io_ports[IDE_CONTROL_OFFSET] = (unsigned long)base + info->ctrloffset;
                 hwif->io_ports[IDE_CONTROL_OFFSET] = (unsigned long)base + info->ctrloffset;
-                hwif->hw.irq  = ec->irq;
                 hwif->irq     = ec->irq;
                 hwif->noprobe = 0;
                 hwif->chipset = ide_acorn;
@@ -500,6 +475,7 @@ icside_register_v5(struct icside_state *state, struct expansion_card *ec)
 {
         ide_hwif_t *hwif;
         void __iomem *base;
+        u8 idx[4] = { 0xff, 0xff, 0xff, 0xff };
 
         base = ecardm_iomap(ec, ECARD_RES_MEMC, 0, 0);
         if (!base)
@@ -523,9 +499,9 @@ icside_register_v5(struct icside_state *state, struct expansion_card *ec)
 
         state->hwif[0] = hwif;
 
-        probe_hwif_init(hwif);
+        idx[0] = hwif->index;
 
-        ide_proc_register_port(hwif);
+        ide_device_add(idx);
 
         return 0;
 }
@@ -537,6 +513,7 @@ icside_register_v6(struct icside_state *state, struct expansion_card *ec)
         void __iomem *ioc_base, *easi_base;
         unsigned int sel = 0;
         int ret;
+        u8 idx[4] = { 0xff, 0xff, 0xff, 0xff };
 
         ioc_base = ecardm_iomap(ec, ECARD_RES_IOCFAST, 0, 0);
         if (!ioc_base) {
@@ -592,7 +569,6 @@ icside_register_v6(struct icside_state *state, struct expansion_card *ec)
         hwif->serialized  = 1;
         hwif->config_data = (unsigned long)ioc_base;
         hwif->select_data = sel;
-        hwif->hw.dma      = ec->dma;
 
         mate->maskproc    = icside_maskproc;
         mate->channel     = 1;
@@ -601,18 +577,16 @@ icside_register_v6(struct icside_state *state, struct expansion_card *ec)
         mate->serialized  = 1;
         mate->config_data = (unsigned long)ioc_base;
         mate->select_data = sel | 1;
-        mate->hw.dma      = ec->dma;
 
         if (ec->dma != NO_DMA && !request_dma(ec->dma, hwif->name)) {
                 icside_dma_init(hwif);
                 icside_dma_init(mate);
         }
 
-        probe_hwif_init(hwif);
-        probe_hwif_init(mate);
+        idx[0] = hwif->index;
+        idx[1] = mate->index;
 
-        ide_proc_register_port(hwif);
-        ide_proc_register_port(mate);
+        ide_device_add(idx);
 
         return 0;
 
diff --git a/drivers/ide/arm/ide_arm.c b/drivers/ide/arm/ide_arm.c
index bce2bec81413..8957cbadf5c2 100644
--- a/drivers/ide/arm/ide_arm.c
+++ b/drivers/ide/arm/ide_arm.c
@@ -31,5 +31,5 @@ void __init ide_arm_init(void)
         memset(&hw, 0, sizeof(hw));
         ide_std_init_ports(&hw, IDE_ARM_IO, IDE_ARM_IO + 0x206);
         hw.irq = IDE_ARM_IRQ;
-        ide_register_hw(&hw, 1, NULL);
+        ide_register_hw(&hw, NULL, 1, NULL);
 }
diff --git a/drivers/ide/arm/rapide.c b/drivers/ide/arm/rapide.c
index 83811af11610..0775a3afef48 100644
--- a/drivers/ide/arm/rapide.c
+++ b/drivers/ide/arm/rapide.c
@@ -13,42 +13,25 @@
 
 #include <asm/ecard.h>
 
-/*
- * Something like this really should be in generic code, but isn't.
- */
 static ide_hwif_t *
 rapide_locate_hwif(void __iomem *base, void __iomem *ctrl, unsigned int sz, int irq)
 {
         unsigned long port = (unsigned long)base;
-        ide_hwif_t *hwif;
-        int index, i;
-
-        for (index = 0; index < MAX_HWIFS; ++index) {
-                hwif = ide_hwifs + index;
-                if (hwif->io_ports[IDE_DATA_OFFSET] == port)
-                        goto found;
-        }
-
-        for (index = 0; index < MAX_HWIFS; ++index) {
-                hwif = ide_hwifs + index;
-                if (hwif->io_ports[IDE_DATA_OFFSET] == 0)
-                        goto found;
-        }
+        ide_hwif_t *hwif = ide_find_port(port);
+        int i;
 
-        return NULL;
+        if (hwif == NULL)
+                goto out;
 
- found:
         for (i = IDE_DATA_OFFSET; i <= IDE_STATUS_OFFSET; i++) {
-                hwif->hw.io_ports[i] = port;
                 hwif->io_ports[i] = port;
                 port += sz;
         }
-        hwif->hw.io_ports[IDE_CONTROL_OFFSET] = (unsigned long)ctrl;
         hwif->io_ports[IDE_CONTROL_OFFSET] = (unsigned long)ctrl;
-        hwif->hw.irq = hwif->irq = irq;
+        hwif->irq = irq;
         hwif->mmio = 1;
         default_hwif_mmiops(hwif);
-
+out:
         return hwif;
 }
 
@@ -58,6 +41,7 @@ rapide_probe(struct expansion_card *ec, const struct ecard_id *id)
         ide_hwif_t *hwif;
         void __iomem *base;
         int ret;
+        u8 idx[4] = { 0xff, 0xff, 0xff, 0xff };
 
         ret = ecard_request_resources(ec);
         if (ret)
@@ -74,8 +58,11 @@ rapide_probe(struct expansion_card *ec, const struct ecard_id *id)
                 hwif->hwif_data = base;
                 hwif->gendev.parent = &ec->dev;
                 hwif->noprobe = 0;
-                probe_hwif_init(hwif);
-                ide_proc_register_port(hwif);
+
+                idx[0] = hwif->index;
+
+                ide_device_add(idx);
+
                 ecard_set_drvdata(ec, hwif);
                 goto out;
         }
diff --git a/drivers/ide/cris/ide-cris.c b/drivers/ide/cris/ide-cris.c
index 9a96a10ba9d3..ff20377b4c82 100644
--- a/drivers/ide/cris/ide-cris.c
+++ b/drivers/ide/cris/ide-cris.c
@@ -782,7 +782,7 @@ init_e100_ide (void)
                                 ide_offsets,
                                 0, 0, cris_ide_ack_intr,
                                 ide_default_irq(0));
-                ide_register_hw(&hw, 1, &hwif);
+                ide_register_hw(&hw, NULL, 1, &hwif);
                 hwif->mmio = 1;
                 hwif->chipset = ide_etrax100;
                 hwif->set_pio_mode = &cris_set_pio_mode;
diff --git a/drivers/ide/h8300/ide-h8300.c b/drivers/ide/h8300/ide-h8300.c
index 6d26ad7360d5..4a49b5c59acb 100644
--- a/drivers/ide/h8300/ide-h8300.c
+++ b/drivers/ide/h8300/ide-h8300.c
@@ -68,7 +68,6 @@ static inline void hw_setup(hw_regs_t *hw)
                 hw->io_ports[i] = CONFIG_H8300_IDE_BASE + H8300_IDE_GAP*i;
         hw->io_ports[IDE_CONTROL_OFFSET] = CONFIG_H8300_IDE_ALT;
         hw->irq = EXT_IRQ0 + CONFIG_H8300_IDE_IRQ;
-        hw->dma = NO_DMA;
         hw->chipset = ide_generic;
 }
 
@@ -101,7 +100,7 @@ void __init h8300_ide_init(void)
         hw_setup(&hw);
 
         /* register if */
-        idx = ide_register_hw(&hw, 1, &hwif);
+        idx = ide_register_hw(&hw, NULL, 1, &hwif);
         if (idx == -1) {
                 printk(KERN_ERR "ide-h8300: IDE I/F register failed\n");
                 return;
diff --git a/drivers/ide/ide-acpi.c b/drivers/ide/ide-acpi.c
index 1d5f6823101c..89df48fdc69d 100644
--- a/drivers/ide/ide-acpi.c
+++ b/drivers/ide/ide-acpi.c
@@ -350,7 +350,7 @@ static int taskfile_load_raw(ide_drive_t *drive,
 
         memset(&args, 0, sizeof(ide_task_t));
         args.command_type = IDE_DRIVE_TASK_NO_DATA;
-        args.data_phase   = TASKFILE_IN;
+        args.data_phase   = TASKFILE_NO_DATA;
         args.handler      = &task_no_data_intr;
 
         /* convert gtf to IDE Taskfile */
diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c
index 2722d9165b6b..00123d99527a 100644
--- a/drivers/ide/ide-disk.c
+++ b/drivers/ide/ide-disk.c
@@ -593,28 +593,12 @@ static int smart_enable(ide_drive_t *drive)
         return ide_raw_taskfile(drive, &args, NULL);
 }
 
-static int get_smart_values(ide_drive_t *drive, u8 *buf)
+static int get_smart_data(ide_drive_t *drive, u8 *buf, u8 sub_cmd)
 {
         ide_task_t args;
 
         memset(&args, 0, sizeof(ide_task_t));
-        args.tfRegister[IDE_FEATURE_OFFSET]     = SMART_READ_VALUES;
-        args.tfRegister[IDE_NSECTOR_OFFSET]     = 0x01;
-        args.tfRegister[IDE_LCYL_OFFSET]        = SMART_LCYL_PASS;
-        args.tfRegister[IDE_HCYL_OFFSET]        = SMART_HCYL_PASS;
-        args.tfRegister[IDE_COMMAND_OFFSET]     = WIN_SMART;
-        args.command_type                       = IDE_DRIVE_TASK_IN;
-        args.data_phase                         = TASKFILE_IN;
-        args.handler                            = &task_in_intr;
-        (void) smart_enable(drive);
-        return ide_raw_taskfile(drive, &args, buf);
-}
-
-static int get_smart_thresholds(ide_drive_t *drive, u8 *buf)
-{
-        ide_task_t args;
-        memset(&args, 0, sizeof(ide_task_t));
-        args.tfRegister[IDE_FEATURE_OFFSET]     = SMART_READ_THRESHOLDS;
+        args.tfRegister[IDE_FEATURE_OFFSET]     = sub_cmd;
         args.tfRegister[IDE_NSECTOR_OFFSET]     = 0x01;
         args.tfRegister[IDE_LCYL_OFFSET]        = SMART_LCYL_PASS;
         args.tfRegister[IDE_HCYL_OFFSET]        = SMART_HCYL_PASS;
@@ -656,7 +640,7 @@ static int proc_idedisk_read_smart_thresholds
         ide_drive_t     *drive = (ide_drive_t *)data;
         int             len = 0, i = 0;
 
-        if (!get_smart_thresholds(drive, page)) {
+        if (get_smart_data(drive, page, SMART_READ_THRESHOLDS) == 0) {
                 unsigned short *val = (unsigned short *) page;
                 char *out = ((char *)val) + (SECTOR_WORDS * 4);
                 page = out;
@@ -675,7 +659,7 @@ static int proc_idedisk_read_smart_values
         ide_drive_t     *drive = (ide_drive_t *)data;
         int             len = 0, i = 0;
 
-        if (!get_smart_values(drive, page)) {
+        if (get_smart_data(drive, page, SMART_READ_VALUES) == 0) {
                 unsigned short *val = (unsigned short *) page;
                 char *out = ((char *)val) + (SECTOR_WORDS * 4);
                 page = out;
diff --git a/drivers/ide/ide-dma.c b/drivers/ide/ide-dma.c
index 80b4f17f3941..428f7a8a00b6 100644
--- a/drivers/ide/ide-dma.c
+++ b/drivers/ide/ide-dma.c
@@ -901,10 +901,7 @@ void ide_dma_timeout (ide_drive_t *drive)
 
 EXPORT_SYMBOL(ide_dma_timeout);
 
-/*
- * Needed for allowing full modular support of ide-driver
- */
-static int ide_release_dma_engine(ide_hwif_t *hwif)
+static void ide_release_dma_engine(ide_hwif_t *hwif)
 {
         if (hwif->dmatable_cpu) {
                 pci_free_consistent(hwif->pci_dev,
@@ -913,7 +910,6 @@ static int ide_release_dma_engine(ide_hwif_t *hwif)
                                     hwif->dmatable_dma);
                 hwif->dmatable_cpu = NULL;
         }
-        return 1;
 }
 
 static int ide_release_iomio_dma(ide_hwif_t *hwif)
@@ -956,12 +952,6 @@ static int ide_mapped_mmio_dma(ide_hwif_t *hwif, unsigned long base, unsigned in
 {
         printk(KERN_INFO "    %s: MMIO-DMA ", hwif->name);
 
-        hwif->dma_base = base;
-
-        if(hwif->mate)
-                hwif->dma_master = (hwif->channel) ? hwif->mate->dma_base : base;
-        else
-                hwif->dma_master = base;
         return 0;
 }
 
@@ -975,8 +965,6 @@ static int ide_iomio_dma(ide_hwif_t *hwif, unsigned long base, unsigned int port
                 return 1;
         }
 
-        hwif->dma_base = base;
-
         if (hwif->cds->extra) {
                 hwif->extra_base = base + (hwif->channel ? 8 : 16);
 
@@ -991,10 +979,6 @@ static int ide_iomio_dma(ide_hwif_t *hwif, unsigned long base, unsigned int port
                 }
         }
 
-        if(hwif->mate)
-                hwif->dma_master = (hwif->channel) ? hwif->mate->dma_base:base;
-        else
-                hwif->dma_master = base;
         return 0;
 }
 
@@ -1006,12 +990,9 @@ static int ide_dma_iobase(ide_hwif_t *hwif, unsigned long base, unsigned int por
         return ide_iomio_dma(hwif, base, ports);
 }
 
-/*
- * This can be called for a dynamically installed interface. Don't __init it
- */
-void ide_setup_dma (ide_hwif_t *hwif, unsigned long dma_base, unsigned int num_ports)
+void ide_setup_dma(ide_hwif_t *hwif, unsigned long base, unsigned num_ports)
 {
-        if (ide_dma_iobase(hwif, dma_base, num_ports))
+        if (ide_dma_iobase(hwif, base, num_ports))
                 return;
 
         if (ide_allocate_dma_engine(hwif)) {
@@ -1019,6 +1000,13 @@ void ide_setup_dma (ide_hwif_t *hwif, unsigned long dma_base, unsigned int num_p
                 return;
         }
 
+        hwif->dma_base = base;
+
+        if (hwif->mate)
+                hwif->dma_master = hwif->channel ? hwif->mate->dma_base : base;
+        else
+                hwif->dma_master = base;
+
         if (!(hwif->dma_command))
                 hwif->dma_command       = hwif->dma_base;
         if (!(hwif->dma_vendor1))
diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
index 5c8b008676fb..c89f0d3058e9 100644
--- a/drivers/ide/ide-io.c
+++ b/drivers/ide/ide-io.c
@@ -47,15 +47,15 @@
 #include <linux/device.h>
 #include <linux/kmod.h>
 #include <linux/scatterlist.h>
+#include <linux/bitops.h>
 
 #include <asm/byteorder.h>
 #include <asm/irq.h>
 #include <asm/uaccess.h>
 #include <asm/io.h>
-#include <asm/bitops.h>
 
 static int __ide_end_request(ide_drive_t *drive, struct request *rq,
-                             int uptodate, unsigned int nr_bytes)
+                             int uptodate, unsigned int nr_bytes, int dequeue)
 {
         int ret = 1;
 
@@ -80,9 +80,11 @@ static int __ide_end_request(ide_drive_t *drive, struct request *rq,
 
         if (!end_that_request_chunk(rq, uptodate, nr_bytes)) {
                 add_disk_randomness(rq->rq_disk);
-                if (!list_empty(&rq->queuelist))
-                        blkdev_dequeue_request(rq);
-                HWGROUP(drive)->rq = NULL;
+                if (dequeue) {
+                        if (!list_empty(&rq->queuelist))
+                                blkdev_dequeue_request(rq);
+                        HWGROUP(drive)->rq = NULL;
+                }
                 end_that_request_last(rq, uptodate);
                 ret = 0;
         }
@@ -122,7 +124,7 @@ int ide_end_request (ide_drive_t *drive, int uptodate, int nr_sectors)
                         nr_bytes = rq->hard_cur_sectors << 9;
         }
 
-        ret = __ide_end_request(drive, rq, uptodate, nr_bytes);
+        ret = __ide_end_request(drive, rq, uptodate, nr_bytes, 1);
 
         spin_unlock_irqrestore(&ide_lock, flags);
         return ret;
@@ -255,39 +257,13 @@ int ide_end_dequeued_request(ide_drive_t *drive, struct request *rq,
                              int uptodate, int nr_sectors)
 {
         unsigned long flags;
-        int ret = 1;
+        int ret;
 
         spin_lock_irqsave(&ide_lock, flags);
-
         BUG_ON(!blk_rq_started(rq));
-
-        /*
-         * if failfast is set on a request, override number of sectors and
-         * complete the whole request right now
-         */
-        if (blk_noretry_request(rq) && end_io_error(uptodate))
-                nr_sectors = rq->hard_nr_sectors;
-
-        if (!blk_fs_request(rq) && end_io_error(uptodate) && !rq->errors)
-                rq->errors = -EIO;
-
-        /*
-         * decide whether to reenable DMA -- 3 is a random magic for now,
-         * if we DMA timeout more than 3 times, just stay in PIO
-         */
-        if (drive->state == DMA_PIO_RETRY && drive->retry_pio <= 3) {
-                drive->state = 0;
-                HWGROUP(drive)->hwif->ide_dma_on(drive);
-        }
-
-        if (!end_that_request_first(rq, uptodate, nr_sectors)) {
-                add_disk_randomness(rq->rq_disk);
-                if (blk_rq_tagged(rq))
-                        blk_queue_end_tag(drive->queue, rq);
-                end_that_request_last(rq, uptodate);
-                ret = 0;
-        }
+        ret = __ide_end_request(drive, rq, uptodate, nr_sectors << 9, 0);
         spin_unlock_irqrestore(&ide_lock, flags);
+
         return ret;
 }
 EXPORT_SYMBOL_GPL(ide_end_dequeued_request);
@@ -800,7 +776,20 @@ static ide_startstop_t do_special (ide_drive_t *drive)
                 s->b.set_tune = 0;
 
                 if (set_pio_mode_abuse(drive->hwif, req_pio)) {
-                        if (hwif->set_pio_mode)
+
+                        if (hwif->set_pio_mode == NULL)
+                                return ide_stopped;
+
+                        /*
+                         * take ide_lock for drive->[no_]unmask/[no_]io_32bit
+                         */
+                        if (req_pio == 8 || req_pio == 9) {
+                                unsigned long flags;
+
+                                spin_lock_irqsave(&ide_lock, flags);
+                                hwif->set_pio_mode(drive, req_pio);
+                                spin_unlock_irqrestore(&ide_lock, flags);
+                        } else
                                 hwif->set_pio_mode(drive, req_pio);
                 } else {
                         int keep_dma = drive->using_dma;
diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c
index d4d790f91f91..95168833d069 100644
--- a/drivers/ide/ide-iops.c
+++ b/drivers/ide/ide-iops.c
@@ -693,35 +693,16 @@ static u8 ide_auto_reduce_xfer (ide_drive_t *drive)
 }
 #endif /* CONFIG_BLK_DEV_IDEDMA */
 
-/*
- * Update the 
- */
-int ide_driveid_update (ide_drive_t *drive)
+int ide_driveid_update(ide_drive_t *drive)
 {
-        ide_hwif_t *hwif        = HWIF(drive);
+        ide_hwif_t *hwif = drive->hwif;
         struct hd_driveid *id;
-#if 0
-        id = kmalloc(SECTOR_WORDS*4, GFP_ATOMIC);
-        if (!id)
-                return 0;
-
-        taskfile_lib_get_identify(drive, (char *)&id);
+        unsigned long timeout, flags;
 
-        ide_fix_driveid(id);
-        if (id) {
-                drive->id->dma_ultra = id->dma_ultra;
-                drive->id->dma_mword = id->dma_mword;
-                drive->id->dma_1word = id->dma_1word;
-                /* anything more ? */
-                kfree(id);
-        }
-        return 1;
-#else
         /*
          * Re-read drive->id for possible DMA mode
          * change (copied from ide-probe.c)
          */
-        unsigned long timeout, flags;
 
         SELECT_MASK(drive, 1);
         if (IDE_CONTROL_REG)
@@ -763,7 +744,6 @@ int ide_driveid_update (ide_drive_t *drive)
         }
 
         return 1;
-#endif
 }
 
 int ide_config_drive_speed(ide_drive_t *drive, u8 speed)
diff --git a/drivers/ide/ide-pnp.c b/drivers/ide/ide-pnp.c
index 2b8009c50e91..e245521af7b5 100644
--- a/drivers/ide/ide-pnp.c
+++ b/drivers/ide/ide-pnp.c
@@ -40,9 +40,8 @@ static int idepnp_probe(struct pnp_dev * dev, const struct pnp_device_id *dev_id
         ide_std_init_ports(&hw, pnp_port_start(dev, 0),
                                 pnp_port_start(dev, 1));
         hw.irq = pnp_irq(dev, 0);
-        hw.dma = NO_DMA;
 
-        index = ide_register_hw(&hw, 1, &hwif);
+        index = ide_register_hw(&hw, NULL, 1, &hwif);
 
         if (index != -1) {
                 printk(KERN_INFO "ide%d: generic PnP IDE interface\n", index);
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index e294c7415c27..d5146c57e5b3 100644
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -717,7 +717,7 @@ EXPORT_SYMBOL_GPL(ide_undecoded_slave);
  * This routine only knows how to look for drive units 0 and 1
  * on an interface, so any setting of MAX_DRIVES > 2 won't work here.
  */
-static void probe_hwif(ide_hwif_t *hwif, void (*fixup)(ide_hwif_t *hwif))
+static void probe_hwif(ide_hwif_t *hwif)
 {
         unsigned long flags;
         unsigned int irqd;
@@ -819,8 +819,8 @@ static void probe_hwif(ide_hwif_t *hwif, void (*fixup)(ide_hwif_t *hwif))
                 return;
         }
 
-        if (fixup)
-                fixup(hwif);
+        if (hwif->fixup)
+                hwif->fixup(hwif);
 
         for (unit = 0; unit < MAX_DRIVES; ++unit) {
                 ide_drive_t *drive = &hwif->drives[unit];
@@ -859,10 +859,11 @@ static void probe_hwif(ide_hwif_t *hwif, void (*fixup)(ide_hwif_t *hwif))
 }
 
 static int hwif_init(ide_hwif_t *hwif);
+static void hwif_register_devices(ide_hwif_t *hwif);
 
-int probe_hwif_init_with_fixup(ide_hwif_t *hwif, void (*fixup)(ide_hwif_t *hwif))
+static int probe_hwif_init(ide_hwif_t *hwif)
 {
-        probe_hwif(hwif, fixup);
+        probe_hwif(hwif);
 
         if (!hwif_init(hwif)) {
                 printk(KERN_INFO "%s: failed to initialize IDE interface\n",
@@ -870,34 +871,12 @@ int probe_hwif_init_with_fixup(ide_hwif_t *hwif, void (*fixup)(ide_hwif_t *hwif)
                 return -1;
         }
 
-        if (hwif->present) {
-                u16 unit = 0;
-                int ret;
+        if (hwif->present)
+                hwif_register_devices(hwif);
 
-                for (unit = 0; unit < MAX_DRIVES; ++unit) {
-                        ide_drive_t *drive = &hwif->drives[unit];
-                        /* For now don't attach absent drives, we may
-                           want them on default or a new "empty" class
-                           for hotplug reprobing ? */
-                        if (drive->present) {
-                                ret = device_register(&drive->gendev);
-                                if (ret < 0)
-                                        printk(KERN_WARNING "IDE: %s: "
-                                                "device_register error: %d\n",
-                                                __FUNCTION__, ret);
-                        }
-                }
-        }
         return 0;
 }
 
-int probe_hwif_init(ide_hwif_t *hwif)
-{
-        return probe_hwif_init_with_fixup(hwif, NULL);
-}
-
-EXPORT_SYMBOL(probe_hwif_init);
-
 #if MAX_HWIFS > 1
 /*
  * save_match() is used to simplify logic in init_irq() below.
@@ -1379,6 +1358,24 @@ out:
         return 0;
 }
 
+static void hwif_register_devices(ide_hwif_t *hwif)
+{
+        unsigned int i;
+
+        for (i = 0; i < MAX_DRIVES; i++) {
+                ide_drive_t *drive = &hwif->drives[i];
+
+                if (drive->present) {
+                        int ret = device_register(&drive->gendev);
+
+                        if (ret < 0)
+                                printk(KERN_WARNING "IDE: %s: "
+                                        "device_register error: %d\n",
+                                        __FUNCTION__, ret);
+                }
+        }
+}
+
 int ideprobe_init (void)
 {
         unsigned int index;
@@ -1390,27 +1387,18 @@ int ideprobe_init (void)
 
         for (index = 0; index < MAX_HWIFS; ++index)
                 if (probe[index])
-                        probe_hwif(&ide_hwifs[index], NULL);
+                        probe_hwif(&ide_hwifs[index]);
         for (index = 0; index < MAX_HWIFS; ++index)
                 if (probe[index])
                         hwif_init(&ide_hwifs[index]);
         for (index = 0; index < MAX_HWIFS; ++index) {
                 if (probe[index]) {
                         ide_hwif_t *hwif = &ide_hwifs[index];
-                        int unit;
                         if (!hwif->present)
                                 continue;
                         if (hwif->chipset == ide_unknown || hwif->chipset == ide_forced)
                                 hwif->chipset = ide_generic;
-                        for (unit = 0; unit < MAX_DRIVES; ++unit)
-                                if (hwif->drives[unit].present) {
-                                        int ret = device_register(
-                                                &hwif->drives[unit].gendev);
-                                        if (ret < 0)
-                                                printk(KERN_WARNING "IDE: %s: "
-                                                        "device_register error: %d\n",
-                                                        __FUNCTION__, ret);
-                                }
+                        hwif_register_devices(hwif);
                 }
         }
         for (index = 0; index < MAX_HWIFS; ++index)
@@ -1420,3 +1408,22 @@ int ideprobe_init (void)
 }
 
 EXPORT_SYMBOL_GPL(ideprobe_init);
+
+int ide_device_add(u8 idx[4])
+{
+        int i, rc = 0;
+
+        for (i = 0; i < 4; i++) {
+                if (idx[i] != 0xff)
+                        rc |= probe_hwif_init(&ide_hwifs[idx[i]]);
+        }
+
+        for (i = 0; i < 4; i++) {
+                if (idx[i] != 0xff)
+                        ide_proc_register_port(&ide_hwifs[idx[i]]);
+        }
+
+        return rc;
+}
+
+EXPORT_SYMBOL_GPL(ide_device_add);
diff --git a/drivers/ide/ide-proc.c b/drivers/ide/ide-proc.c
index fc1d8ae6a803..a4007d30da52 100644
--- a/drivers/ide/ide-proc.c
+++ b/drivers/ide/ide-proc.c
@@ -804,8 +804,6 @@ void ide_proc_register_port(ide_hwif_t *hwif)
         create_proc_ide_drives(hwif);
 }
 
-EXPORT_SYMBOL_GPL(ide_proc_register_port);
-
 #ifdef CONFIG_BLK_DEV_IDEPCI
 void ide_pci_create_host_proc(const char *name, get_info_t *get_info)
 {
diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c
index 1fa57947bca0..e5a86a962b26 100644
--- a/drivers/ide/ide-tape.c
+++ b/drivers/ide/ide-tape.c
@@ -621,7 +621,6 @@ typedef struct os_dat_s {
  */
 #define USE_IOTRACE     0
 #if USE_IOTRACE
-#include <linux/io_trace.h>
 #define IO_IDETAPE_FIFO 500
 #endif
 
diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c
index 2a3c8d498343..73ef6bf5fbcc 100644
--- a/drivers/ide/ide-taskfile.c
+++ b/drivers/ide/ide-taskfile.c
@@ -8,23 +8,6 @@
  *  Copyright (C) 2003-2004     Bartlomiej Zolnierkiewicz
  *
  *  The big the bad and the ugly.
- *
- *  Problems to be fixed because of BH interface or the lack therefore.
- *
- *  Fill me in stupid !!!
- *
- *  HOST:
- *      General refers to the Controller and Driver "pair".
- *  DATA HANDLER:
- *      Under the context of Linux it generally refers to an interrupt handler.
- *      However, it correctly describes the 'HOST'
- *  DATA BLOCK:
- *      The amount of data needed to be transfered as predefined in the
- *      setup of the device.
- *  STORAGE ATOMIC:
- *      The 'DATA BLOCK' associated to the 'DATA HANDLER', and can be as
- *      small as a single sector or as large as the entire command block
- *      request.
  */
 
 #include <linux/module.h>
@@ -695,9 +678,6 @@ int ide_wait_cmd (ide_drive_t *drive, u8 cmd, u8 nsect, u8 feature, u8 sectors,
         return ide_do_drive_cmd(drive, &rq, ide_wait);
 }
 
-/*
- * FIXME : this needs to map into at taskfile. <andre@linux-ide.org>
- */
 int ide_cmd_ioctl (ide_drive_t *drive, unsigned int cmd, unsigned long arg)
 {
         int err = 0;
@@ -761,9 +741,6 @@ static int ide_wait_cmd_task(ide_drive_t *drive, u8 *buf)
         return ide_do_drive_cmd(drive, &rq, ide_wait);
 }
 
-/*
- * FIXME : this needs to map into at taskfile. <andre@linux-ide.org>
- */
 int ide_task_ioctl (ide_drive_t *drive, unsigned int cmd, unsigned long arg)
 {
         void __user *p = (void __user *)arg;
@@ -860,9 +837,14 @@ ide_startstop_t flagged_taskfile (ide_drive_t *drive, ide_task_t *task)
                 case TASKFILE_OUT_DMA:
                 case TASKFILE_IN_DMAQ:
                 case TASKFILE_IN_DMA:
-                        hwif->dma_setup(drive);
-                        hwif->dma_exec_cmd(drive, taskfile->command);
-                        hwif->dma_start(drive);
+                        if (!drive->using_dma)
+                                break;
+
+                        if (!hwif->dma_setup(drive)) {
+                                hwif->dma_exec_cmd(drive, taskfile->command);
+                                hwif->dma_start(drive);
+                                return ide_started;
+                        }
                         break;
 
                 default:
@@ -876,7 +858,8 @@ ide_startstop_t flagged_taskfile (ide_drive_t *drive, ide_task_t *task)
                                 return task->prehandler(drive, task->rq);
                         }
                         ide_execute_command(drive, taskfile->command, task->handler, WAIT_WORSTCASE, NULL);
+                        return ide_started;
         }
 
-        return ide_started;
+        return ide_stopped;
 }
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index 961e6c897286..674a65c1a130 100644
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -168,7 +168,6 @@ static void init_hwif_default(ide_hwif_t *hwif, unsigned int index)
 
         ide_init_hwif_ports(&hw, ide_default_io_base(index), 0, &hwif->irq);
 
-        memcpy(&hwif->hw, &hw, sizeof(hw));
         memcpy(hwif->io_ports, hw.io_ports, sizeof(hw.io_ports));
 
         hwif->noprobe = !hwif->io_ports[IDE_DATA_OFFSET];
@@ -214,7 +213,7 @@ static void __init init_ide_data (void)
                 init_hwif_data(hwif, index);
                 init_hwif_default(hwif, index);
 #if !defined(CONFIG_PPC32) || !defined(CONFIG_PCI)
-                hwif->irq = hwif->hw.irq =
+                hwif->irq =
                         ide_init_default_irq(hwif->io_ports[IDE_DATA_OFFSET]);
 #endif
         }
@@ -265,6 +264,30 @@ static int ide_system_bus_speed(void)
         return system_bus_speed;
 }
 
+ide_hwif_t * ide_find_port(unsigned long base)
+{
+        ide_hwif_t *hwif;
+        int i;
+
+        for (i = 0; i < MAX_HWIFS; i++) {
+                hwif = &ide_hwifs[i];
+                if (hwif->io_ports[IDE_DATA_OFFSET] == base)
+                        goto found;
+        }
+
+        for (i = 0; i < MAX_HWIFS; i++) {
+                hwif = &ide_hwifs[i];
+                if (hwif->io_ports[IDE_DATA_OFFSET] == 0)
+                        goto found;
+        }
+
+        hwif = NULL;
+found:
+        return hwif;
+}
+
+EXPORT_SYMBOL_GPL(ide_find_port);
+
 static struct resource* hwif_request_region(ide_hwif_t *hwif,
                                             unsigned long addr, int num)
 {
@@ -391,6 +414,8 @@ static void ide_hwif_restore(ide_hwif_t *hwif, ide_hwif_t *tmp_hwif)
         hwif->cds                       = tmp_hwif->cds;
 #endif
 
+        hwif->fixup                     = tmp_hwif->fixup;
+
         hwif->set_pio_mode              = tmp_hwif->set_pio_mode;
         hwif->set_dma_mode              = tmp_hwif->set_dma_mode;
         hwif->mdma_filter               = tmp_hwif->mdma_filter;
@@ -652,7 +677,6 @@ void ide_setup_ports (	hw_regs_t *hw,
                 }
         }
         hw->irq = irq;
-        hw->dma = NO_DMA;
         hw->ack_intr = ack_intr;
 /*
  *      hw->iops = iops;
@@ -660,11 +684,11 @@ void ide_setup_ports (	hw_regs_t *hw,
 }
 
 /**
- *      ide_register_hw_with_fixup      -       register IDE interface
+ *      ide_register_hw         -       register IDE interface
  *      @hw: hardware registers
+ *      @fixup: fixup function
  *      @initializing: set while initializing built-in drivers
  *      @hwifp: pointer to returned hwif
- *      @fixup: fixup function
  *
  *      Register an IDE interface, specifying exactly the registers etc.
  *      Set init=1 iff calling before probes have taken place.
@@ -672,9 +696,8 @@ void ide_setup_ports (	hw_regs_t *hw,
  *      Returns -1 on error.
  */
 
-int ide_register_hw_with_fixup(hw_regs_t *hw, int initializing,
-                               ide_hwif_t **hwifp,
-                               void(*fixup)(ide_hwif_t *hwif))
+int ide_register_hw(hw_regs_t *hw, void (*fixup)(ide_hwif_t *),
+                    int initializing, ide_hwif_t **hwifp)
 {
         int index, retry = 1;
         ide_hwif_t *hwif;
@@ -682,7 +705,7 @@ int ide_register_hw_with_fixup(hw_regs_t *hw, int initializing,
         do {
                 for (index = 0; index < MAX_HWIFS; ++index) {
                         hwif = &ide_hwifs[index];
-                        if (hwif->hw.io_ports[IDE_DATA_OFFSET] == hw->io_ports[IDE_DATA_OFFSET])
+                        if (hwif->io_ports[IDE_DATA_OFFSET] == hw->io_ports[IDE_DATA_OFFSET])
                                 goto found;
                 }
                 for (index = 0; index < MAX_HWIFS; ++index) {
@@ -690,7 +713,7 @@ int ide_register_hw_with_fixup(hw_regs_t *hw, int initializing,
                         if (hwif->hold)
                                 continue;
                         if ((!hwif->present && !hwif->mate && !initializing) ||
-                            (!hwif->hw.io_ports[IDE_DATA_OFFSET] && initializing))
+                            (!hwif->io_ports[IDE_DATA_OFFSET] && initializing))
                                 goto found;
                 }
                 for (index = 0; index < MAX_HWIFS; index++)
@@ -706,16 +729,18 @@ found:
         }
         if (hwif->present)
                 return -1;
-        memcpy(&hwif->hw, hw, sizeof(*hw));
-        memcpy(hwif->io_ports, hwif->hw.io_ports, sizeof(hwif->hw.io_ports));
+        memcpy(hwif->io_ports, hw->io_ports, sizeof(hwif->io_ports));
         hwif->irq = hw->irq;
         hwif->noprobe = 0;
+        hwif->fixup = fixup;
         hwif->chipset = hw->chipset;
         hwif->gendev.parent = hw->dev;
+        hwif->ack_intr = hw->ack_intr;
+
+        if (initializing == 0) {
+                u8 idx[4] = { index, 0xff, 0xff, 0xff };
 
-        if (!initializing) {
-                probe_hwif_init_with_fixup(hwif, fixup);
-                ide_proc_register_port(hwif);
+                ide_device_add(idx);
         }
 
         if (hwifp)
@@ -724,13 +749,6 @@ found:
         return (initializing || hwif->present) ? index : -1;
 }
 
-EXPORT_SYMBOL(ide_register_hw_with_fixup);
-
-int ide_register_hw(hw_regs_t *hw, int initializing, ide_hwif_t **hwifp)
-{
-        return ide_register_hw_with_fixup(hw, initializing, hwifp, NULL);
-}
-
 EXPORT_SYMBOL(ide_register_hw);
 
 /*
@@ -1046,7 +1064,7 @@ int generic_ide_ioctl(ide_drive_t *drive, struct file *file, struct block_device
                         ide_init_hwif_ports(&hw, (unsigned long) args[0],
                                             (unsigned long) args[1], NULL);
                         hw.irq = args[2];
-                        if (ide_register_hw(&hw, 0, NULL) == -1)
+                        if (ide_register_hw(&hw, NULL, 0, NULL) == -1)
                                 return -EIO;
                         return 0;
                 }
@@ -1397,6 +1415,9 @@ static int __init ide_setup(char *s)
                         "reset", "minus6", "ata66", "minus8", "minus9",
                         "minus10", "four", "qd65xx", "ht6560b", "cmd640_vlb",
                         "dtc2278", "umc8672", "ali14xx", NULL };
+
+                hw_regs_t hwregs;
+
                 hw = s[3] - '0';
                 hwif = &ide_hwifs[hw];
                 i = match_parm(&s[4], ide_words, vals, 3);
@@ -1506,9 +1527,9 @@ static int __init ide_setup(char *s)
                         case 2: /* base,ctl */
                                 vals[2] = 0;    /* default irq = probe for it */
                         case 3: /* base,ctl,irq */
-                                hwif->hw.irq = vals[2];
-                                ide_init_hwif_ports(&hwif->hw, (unsigned long) vals[0], (unsigned long) vals[1], &hwif->irq);
-                                memcpy(hwif->io_ports, hwif->hw.io_ports, sizeof(hwif->io_ports));
+                                memset(&hwregs, 0, sizeof(hwregs));
+                                ide_init_hwif_ports(&hwregs, vals[0], vals[1], &hwif->irq);
+                                memcpy(hwif->io_ports, hwregs.io_ports, sizeof(hwif->io_ports));
                                 hwif->irq      = vals[2];
                                 hwif->noprobe  = 0;
                                 hwif->chipset  = ide_forced;
diff --git a/drivers/ide/legacy/ali14xx.c b/drivers/ide/legacy/ali14xx.c
index 2f0ef9b44033..10311ecc674a 100644
--- a/drivers/ide/legacy/ali14xx.c
+++ b/drivers/ide/legacy/ali14xx.c
@@ -102,6 +102,8 @@ static void outReg (u8 data, u8 reg)
         outb_p(data, dataPort);
 }
 
+static DEFINE_SPINLOCK(ali14xx_lock);
+
 /*
  * Set PIO mode for the specified drive.
  * This function computes timing parameters
@@ -129,14 +131,14 @@ static void ali14xx_set_pio_mode(ide_drive_t *drive, const u8 pio)
 
         /* stuff timing parameters into controller registers */
         driveNum = (HWIF(drive)->index << 1) + drive->select.b.unit;
-        spin_lock_irqsave(&ide_lock, flags);
+        spin_lock_irqsave(&ali14xx_lock, flags);
         outb_p(regOn, basePort);
         outReg(param1, regTab[driveNum].reg1);
         outReg(param2, regTab[driveNum].reg2);
         outReg(param3, regTab[driveNum].reg3);
         outReg(param4, regTab[driveNum].reg4);
         outb_p(regOff, basePort);
-        spin_unlock_irqrestore(&ide_lock, flags);
+        spin_unlock_irqrestore(&ali14xx_lock, flags);
 }
 
 /*
@@ -193,6 +195,7 @@ static int __init initRegisters (void) {
 static int __init ali14xx_probe(void)
 {
         ide_hwif_t *hwif, *mate;
+        static u8 idx[4] = { 0, 1, 0xff, 0xff };
 
         printk(KERN_DEBUG "ali14xx: base=0x%03x, regOn=0x%02x.\n",
                           basePort, regOn);
@@ -217,11 +220,7 @@ static int __init ali14xx_probe(void)
         mate->mate = hwif;
         mate->channel = 1;
 
-        probe_hwif_init(hwif);
-        probe_hwif_init(mate);
-
-        ide_proc_register_port(hwif);
-        ide_proc_register_port(mate);
+        ide_device_add(idx);
 
         return 0;
 }
diff --git a/drivers/ide/legacy/buddha.c b/drivers/ide/legacy/buddha.c
index 101aee1711c4..4a0be251a05f 100644
--- a/drivers/ide/legacy/buddha.c
+++ b/drivers/ide/legacy/buddha.c
@@ -212,8 +212,8 @@ fail_base2:
 //                                              xsurf_iops,
                                                 IRQ_AMIGA_PORTS);
                         }       
-                        
-                        index = ide_register_hw(&hw, 1, &hwif);
+
+                        index = ide_register_hw(&hw, NULL, 1, &hwif);
                         if (index != -1) {
                                 hwif->mmio = 1;
                                 printk("ide%d: ", index);
diff --git a/drivers/ide/legacy/dtc2278.c b/drivers/ide/legacy/dtc2278.c
index f16521254867..24a845d45bd2 100644
--- a/drivers/ide/legacy/dtc2278.c
+++ b/drivers/ide/legacy/dtc2278.c
@@ -67,20 +67,24 @@ static void sub22 (char b, char c)
         }
 }
 
+static DEFINE_SPINLOCK(dtc2278_lock);
+
 static void dtc2278_set_pio_mode(ide_drive_t *drive, const u8 pio)
 {
         unsigned long flags;
 
         if (pio >= 3) {
-                spin_lock_irqsave(&ide_lock, flags);
+                spin_lock_irqsave(&dtc2278_lock, flags);
                 /*
                  * This enables PIO mode4 (3?) on the first interface
                  */
                 sub22(1,0xc3);
                 sub22(0,0xa0);
-                spin_unlock_irqrestore(&ide_lock, flags);
+                spin_unlock_irqrestore(&dtc2278_lock, flags);
         } else {
                 /* we don't know how to set it back again.. */
+                /* Actually we do - there is a data sheet available for the
+                   Winbond but does anyone actually care */
         }
 
         /*
@@ -94,6 +98,7 @@ static int __init dtc2278_probe(void)
 {
         unsigned long flags;
         ide_hwif_t *hwif, *mate;
+        static u8 idx[4] = { 0, 1, 0xff, 0xff };
 
         hwif = &ide_hwifs[0];
         mate = &ide_hwifs[1];
@@ -129,16 +134,13 @@ static int __init dtc2278_probe(void)
 
         mate->serialized = 1;
         mate->chipset = ide_dtc2278;
+        mate->pio_mask = ATA_PIO4;
         mate->drives[0].no_unmask = 1;
         mate->drives[1].no_unmask = 1;
         mate->mate = hwif;
         mate->channel = 1;
 
-        probe_hwif_init(hwif);
-        probe_hwif_init(mate);
-
-        ide_proc_register_port(hwif);
-        ide_proc_register_port(mate);
+        ide_device_add(idx);
 
         return 0;
 }
diff --git a/drivers/ide/legacy/falconide.c b/drivers/ide/legacy/falconide.c
index f0829b83e970..7d7936f1b900 100644
--- a/drivers/ide/legacy/falconide.c
+++ b/drivers/ide/legacy/falconide.c
@@ -72,7 +72,7 @@ void __init falconide_init(void)
                         0, 0, NULL,
 //                      falconide_iops,
                         IRQ_MFP_IDE);
-        index = ide_register_hw(&hw, 1, NULL);
+        index = ide_register_hw(&hw, NULL, 1, NULL);
 
         if (index != -1)
             printk("ide%d: Falcon IDE interface\n", index);
diff --git a/drivers/ide/legacy/gayle.c b/drivers/ide/legacy/gayle.c
index 0830a021bbb6..53331ee1e957 100644
--- a/drivers/ide/legacy/gayle.c
+++ b/drivers/ide/legacy/gayle.c
@@ -165,7 +165,7 @@ found:
 //                      &gayle_iops,
                         IRQ_AMIGA_PORTS);
 
-        index = ide_register_hw(&hw, 1, &hwif);
+        index = ide_register_hw(&hw, NULL, 1, &hwif);
         if (index != -1) {
             hwif->mmio = 1;
             switch (i) {
diff --git a/drivers/ide/legacy/ht6560b.c b/drivers/ide/legacy/ht6560b.c
index 2e5a9cc5c0f7..a4245d13f11b 100644
--- a/drivers/ide/legacy/ht6560b.c
+++ b/drivers/ide/legacy/ht6560b.c
@@ -247,6 +247,8 @@ static u8 ht_pio2timings(ide_drive_t *drive, const u8 pio)
         }
 }
 
+static DEFINE_SPINLOCK(ht6560b_lock);
+
 /*
  *  Enable/Disable so called prefetch mode
  */
@@ -254,9 +256,9 @@ static void ht_set_prefetch(ide_drive_t *drive, u8 state)
 {
         unsigned long flags;
         int t = HT_PREFETCH_MODE << 8;
-        
-        spin_lock_irqsave(&ide_lock, flags);
-        
+
+        spin_lock_irqsave(&ht6560b_lock, flags);
+
         /*
          *  Prefetch mode and unmask irq seems to conflict
          */
@@ -268,9 +270,9 @@ static void ht_set_prefetch(ide_drive_t *drive, u8 state)
                 drive->drive_data &= ~t;  /* disable prefetch mode */
                 drive->no_unmask = 0;
         }
-        
-        spin_unlock_irqrestore(&ide_lock, flags);
-        
+
+        spin_unlock_irqrestore(&ht6560b_lock, flags);
+
 #ifdef DEBUG
         printk("ht6560b: drive %s prefetch mode %sabled\n", drive->name, (state ? "en" : "dis"));
 #endif
@@ -287,16 +289,14 @@ static void ht6560b_set_pio_mode(ide_drive_t *drive, const u8 pio)
                 ht_set_prefetch(drive, pio & 1);
                 return;
         }
-        
+
         timing = ht_pio2timings(drive, pio);
-        
-        spin_lock_irqsave(&ide_lock, flags);
-        
+
+        spin_lock_irqsave(&ht6560b_lock, flags);
         drive->drive_data &= 0xff00;
         drive->drive_data |= timing;
-        
-        spin_unlock_irqrestore(&ide_lock, flags);
-        
+        spin_unlock_irqrestore(&ht6560b_lock, flags);
+
 #ifdef DEBUG
         printk("ht6560b: drive %s tuned to pio mode %#x timing=%#x\n", drive->name, pio, timing);
 #endif
@@ -311,6 +311,7 @@ MODULE_PARM_DESC(probe, "probe for HT6560B chipset");
 int __init ht6560b_init(void)
 {
         ide_hwif_t *hwif, *mate;
+        static u8 idx[4] = { 0, 1, 0xff, 0xff };
         int t;
 
         if (probe_ht6560b == 0)
@@ -359,11 +360,7 @@ int __init ht6560b_init(void)
         mate->drives[0].drive_data = t;
         mate->drives[1].drive_data = t;
 
-        probe_hwif_init(hwif);
-        probe_hwif_init(mate);
-
-        ide_proc_register_port(hwif);
-        ide_proc_register_port(mate);
+        ide_device_add(idx);
 
         return 0;
 
diff --git a/drivers/ide/legacy/ide-cs.c b/drivers/ide/legacy/ide-cs.c
index e8e360c2619d..03715c058664 100644
--- a/drivers/ide/legacy/ide-cs.c
+++ b/drivers/ide/legacy/ide-cs.c
@@ -153,7 +153,7 @@ static int idecs_register(unsigned long io, unsigned long ctl, unsigned long irq
     hw.irq = irq;
     hw.chipset = ide_pci;
     hw.dev = &handle->dev;
-    return ide_register_hw_with_fixup(&hw, 0, NULL, ide_undecoded_slave);
+    return ide_register_hw(&hw, &ide_undecoded_slave, 0, NULL);
 }
 
 /*======================================================================
diff --git a/drivers/ide/legacy/ide_platform.c b/drivers/ide/legacy/ide_platform.c
index b992b2b91fe2..7bb79f53dac8 100644
--- a/drivers/ide/legacy/ide_platform.c
+++ b/drivers/ide/legacy/ide_platform.c
@@ -33,39 +33,24 @@ static ide_hwif_t *__devinit plat_ide_locate_hwif(void __iomem *base,
             int mmio)
 {
         unsigned long port = (unsigned long)base;
-        ide_hwif_t *hwif;
-        int index, i;
-
-        for (index = 0; index < MAX_HWIFS; ++index) {
-                hwif = ide_hwifs + index;
-                if (hwif->io_ports[IDE_DATA_OFFSET] == port)
-                        goto found;
-        }
-
-        for (index = 0; index < MAX_HWIFS; ++index) {
-                hwif = ide_hwifs + index;
-                if (hwif->io_ports[IDE_DATA_OFFSET] == 0)
-                        goto found;
-        }
+        ide_hwif_t *hwif = ide_find_port(port);
+        int i;
 
-        return NULL;
-
-found:
+        if (hwif == NULL)
+                goto out;
 
-        hwif->hw.io_ports[IDE_DATA_OFFSET] = port;
+        hwif->io_ports[IDE_DATA_OFFSET] = port;
 
         port += (1 << pdata->ioport_shift);
         for (i = IDE_ERROR_OFFSET; i <= IDE_STATUS_OFFSET;
              i++, port += (1 << pdata->ioport_shift))
-                hwif->hw.io_ports[i] = port;
+                hwif->io_ports[i] = port;
 
-        hwif->hw.io_ports[IDE_CONTROL_OFFSET] = (unsigned long)ctrl;
+        hwif->io_ports[IDE_CONTROL_OFFSET] = (unsigned long)ctrl;
 
-        memcpy(hwif->io_ports, hwif->hw.io_ports, sizeof(hwif->hw.io_ports));
-        hwif->hw.irq = hwif->irq = irq;
+        hwif->irq = irq;
 
-        hwif->hw.dma = NO_DMA;
-        hwif->chipset = hwif->hw.chipset = ide_generic;
+        hwif->chipset = ide_generic;
 
         if (mmio) {
                 hwif->mmio = 1;
@@ -73,8 +58,8 @@ found:
         }
 
         hwif_prop.hwif = hwif;
-        hwif_prop.index = index;
-
+        hwif_prop.index = hwif->index;
+out:
         return hwif;
 }
 
@@ -83,6 +68,7 @@ static int __devinit plat_ide_probe(struct platform_device *pdev)
         struct resource *res_base, *res_alt, *res_irq;
         ide_hwif_t *hwif;
         struct pata_platform_info *pdata;
+        u8 idx[4] = { 0xff, 0xff, 0xff, 0xff };
         int ret = 0;
         int mmio = 0;
 
@@ -130,10 +116,11 @@ static int __devinit plat_ide_probe(struct platform_device *pdev)
         hwif->gendev.parent = &pdev->dev;
         hwif->noprobe = 0;
 
-        probe_hwif_init(hwif);
+        idx[0] = hwif->index;
+
+        ide_device_add(idx);
 
         platform_set_drvdata(pdev, hwif);
-        ide_proc_register_port(hwif);
 
         return 0;
 
diff --git a/drivers/ide/legacy/macide.c b/drivers/ide/legacy/macide.c
index b557c45a5a9d..e87cd2f16430 100644
--- a/drivers/ide/legacy/macide.c
+++ b/drivers/ide/legacy/macide.c
@@ -93,21 +93,21 @@ void macide_init(void)
                                 0, 0, macide_ack_intr,
 //                              quadra_ide_iops,
                                 IRQ_NUBUS_F);
-                index = ide_register_hw(&hw, 1, &hwif);
+                index = ide_register_hw(&hw, NULL, 1, &hwif);
                 break;
         case MAC_IDE_PB:
                 ide_setup_ports(&hw, IDE_BASE, macide_offsets,
                                 0, 0, macide_ack_intr,
 //                              macide_pb_iops,
                                 IRQ_NUBUS_C);
-                index = ide_register_hw(&hw, 1, &hwif);
+                index = ide_register_hw(&hw, NULL, 1, &hwif);
                 break;
         case MAC_IDE_BABOON:
                 ide_setup_ports(&hw, BABOON_BASE, macide_offsets,
                                 0, 0, NULL,
 //                              macide_baboon_iops,
                                 IRQ_BABOON_1);
-                index = ide_register_hw(&hw, 1, &hwif);
+                index = ide_register_hw(&hw, NULL, 1, &hwif);
                 if (index == -1) break;
                 if (macintosh_config->ident == MAC_MODEL_PB190) {
 
diff --git a/drivers/ide/legacy/q40ide.c b/drivers/ide/legacy/q40ide.c
index e628a983ce33..44cdb745a6ff 100644
--- a/drivers/ide/legacy/q40ide.c
+++ b/drivers/ide/legacy/q40ide.c
@@ -89,9 +89,8 @@ void q40_ide_setup_ports ( hw_regs_t *hw,
                 else
                         hw->io_ports[i] = Q40_ISA_IO_B(base + offsets[i]);
         }
-        
+
         hw->irq = irq;
-        hw->dma = NO_DMA;
         hw->ack_intr = ack_intr;
 /*
  *      hw->iops = iops;
@@ -142,7 +141,7 @@ void q40ide_init(void)
                         0, NULL,
 //                      m68kide_iops,
                         q40ide_default_irq(pcide_bases[i]));
-        index = ide_register_hw(&hw, 1, &hwif);
+        index = ide_register_hw(&hw, NULL, 1, &hwif);
         // **FIXME**
         if (index != -1)
                 hwif->mmio = 1;
diff --git a/drivers/ide/legacy/qd65xx.c b/drivers/ide/legacy/qd65xx.c
index 0c81d2d0b941..912e73853faa 100644
--- a/drivers/ide/legacy/qd65xx.c
+++ b/drivers/ide/legacy/qd65xx.c
@@ -89,26 +89,6 @@
 
 static int timings[4]={-1,-1,-1,-1}; /* stores current timing for each timer */
 
-static void qd_write_reg (u8 content, unsigned long reg)
-{
-        unsigned long flags;
-
-        spin_lock_irqsave(&ide_lock, flags);
-        outb(content,reg);
-        spin_unlock_irqrestore(&ide_lock, flags);
-}
-
-static u8 __init qd_read_reg (unsigned long reg)
-{
-        unsigned long flags;
-        u8 read;
-
-        spin_lock_irqsave(&ide_lock, flags);
-        read = inb(reg);
-        spin_unlock_irqrestore(&ide_lock, flags);
-        return read;
-}
-
 /*
  * qd_select:
  *
@@ -121,7 +101,7 @@ static void qd_select (ide_drive_t *drive)
                         (QD_TIMREG(drive) & 0x02);
 
         if (timings[index] != QD_TIMING(drive))
-                qd_write_reg(timings[index] = QD_TIMING(drive), QD_TIMREG(drive));
+                outb(timings[index] = QD_TIMING(drive), QD_TIMREG(drive));
 }
 
 /*
@@ -284,7 +264,7 @@ static void qd6580_set_pio_mode(ide_drive_t *drive, const u8 pio)
         }
 
         if (!HWIF(drive)->channel && drive->media != ide_disk) {
-                qd_write_reg(0x5f, QD_CONTROL_PORT);
+                outb(0x5f, QD_CONTROL_PORT);
                 printk(KERN_WARNING "%s: ATAPI: disabled read-ahead FIFO "
                         "and post-write buffer on %s.\n",
                         drive->name, HWIF(drive)->name);
@@ -301,16 +281,15 @@ static void qd6580_set_pio_mode(ide_drive_t *drive, const u8 pio)
 
 static int __init qd_testreg(int port)
 {
-        u8 savereg;
-        u8 readreg;
         unsigned long flags;
+        u8 savereg, readreg;
 
-        spin_lock_irqsave(&ide_lock, flags);
+        local_irq_save(flags);
         savereg = inb_p(port);
         outb_p(QD_TESTVAL, port);       /* safe value */
         readreg = inb_p(port);
         outb(savereg, port);
-        spin_unlock_irqrestore(&ide_lock, flags);
+        local_irq_restore(flags);
 
         if (savereg == QD_TESTVAL) {
                 printk(KERN_ERR "Outch ! the probe for qd65xx isn't reliable !\n");
@@ -364,13 +343,13 @@ static void __exit qd_unsetup(ide_hwif_t *hwif)
 
         if (set_pio_mode == (void *)qd6500_set_pio_mode) {
                 // will do it for both
-                qd_write_reg(QD6500_DEF_DATA, QD_TIMREG(&hwif->drives[0]));
+                outb(QD6500_DEF_DATA, QD_TIMREG(&hwif->drives[0]));
         } else if (set_pio_mode == (void *)qd6580_set_pio_mode) {
                 if (QD_CONTROL(hwif) & QD_CONTR_SEC_DISABLED) {
-                        qd_write_reg(QD6580_DEF_DATA, QD_TIMREG(&hwif->drives[0]));
-                        qd_write_reg(QD6580_DEF_DATA2, QD_TIMREG(&hwif->drives[1]));
+                        outb(QD6580_DEF_DATA, QD_TIMREG(&hwif->drives[0]));
+                        outb(QD6580_DEF_DATA2, QD_TIMREG(&hwif->drives[1]));
                 } else {
-                        qd_write_reg(hwif->channel ? QD6580_DEF_DATA2 : QD6580_DEF_DATA, QD_TIMREG(&hwif->drives[0]));
+                        outb(hwif->channel ? QD6580_DEF_DATA2 : QD6580_DEF_DATA, QD_TIMREG(&hwif->drives[0]));
                 }
         } else {
                 printk(KERN_WARNING "Unknown qd65xx tuning fonction !\n");
@@ -389,10 +368,11 @@ static void __exit qd_unsetup(ide_hwif_t *hwif)
 static int __init qd_probe(int base)
 {
         ide_hwif_t *hwif;
+        u8 idx[4] = { 0xff, 0xff, 0xff, 0xff };
         u8 config;
         u8 unit;
 
-        config = qd_read_reg(QD_CONFIG_PORT);
+        config = inb(QD_CONFIG_PORT);
 
         if (! ((config & QD_CONFIG_BASEPORT) >> 1 == (base == 0xb0)) )
                 return 1;
@@ -419,9 +399,9 @@ static int __init qd_probe(int base)
 
                 hwif->set_pio_mode = &qd6500_set_pio_mode;
 
-                probe_hwif_init(hwif);
+                idx[0] = unit;
 
-                ide_proc_register_port(hwif);
+                ide_device_add(idx);
 
                 return 1;
         }
@@ -436,7 +416,7 @@ static int __init qd_probe(int base)
 
                 /* qd6580 found */
 
-                control = qd_read_reg(QD_CONTROL_PORT);
+                control = inb(QD_CONTROL_PORT);
 
                 printk(KERN_NOTICE "qd6580 at %#x\n", base);
                 printk(KERN_DEBUG "qd6580: config=%#x, control=%#x, ID3=%u\n",
@@ -453,11 +433,11 @@ static int __init qd_probe(int base)
 
                         hwif->set_pio_mode = &qd6580_set_pio_mode;
 
-                        probe_hwif_init(hwif);
+                        idx[0] = unit;
 
-                        qd_write_reg(QD_DEF_CONTR,QD_CONTROL_PORT);
+                        ide_device_add(idx);
 
-                        ide_proc_register_port(hwif);
+                        outb(QD_DEF_CONTR, QD_CONTROL_PORT);
 
                         return 1;
                 } else {
@@ -474,19 +454,17 @@ static int __init qd_probe(int base)
 
                         hwif->set_pio_mode = &qd6580_set_pio_mode;
 
-                        probe_hwif_init(hwif);
-
                         qd_setup(mate, base, config | (control << 8),
                                  QD6580_DEF_DATA2, QD6580_DEF_DATA2);
 
                         mate->set_pio_mode = &qd6580_set_pio_mode;
 
-                        probe_hwif_init(mate);
+                        idx[0] = 0;
+                        idx[1] = 1;
 
-                        qd_write_reg(QD_DEF_CONTR,QD_CONTROL_PORT);
+                        ide_device_add(idx);
 
-                        ide_proc_register_port(hwif);
-                        ide_proc_register_port(mate);
+                        outb(QD_DEF_CONTR, QD_CONTROL_PORT);
 
                         return 0; /* no other qd65xx possible */
                 }
diff --git a/drivers/ide/legacy/umc8672.c b/drivers/ide/legacy/umc8672.c
index 1151c92dd531..79577b916874 100644
--- a/drivers/ide/legacy/umc8672.c
+++ b/drivers/ide/legacy/umc8672.c
@@ -124,8 +124,9 @@ static void umc_set_pio_mode(ide_drive_t *drive, const u8 pio)
 
 static int __init umc8672_probe(void)
 {
-        unsigned long flags;
         ide_hwif_t *hwif, *mate;
+        unsigned long flags;
+        static u8 idx[4] = { 0, 1, 0xff, 0xff };
 
         if (!request_region(0x108, 2, "umc8672")) {
                 printk(KERN_ERR "umc8672: ports 0x108-0x109 already in use.\n");
@@ -158,11 +159,7 @@ static int __init umc8672_probe(void)
         mate->mate = hwif;
         mate->channel = 1;
 
-        probe_hwif_init(hwif);
-        probe_hwif_init(mate);
-
-        ide_proc_register_port(hwif);
-        ide_proc_register_port(mate);
+        ide_device_add(idx);
 
         return 0;
 }
diff --git a/drivers/ide/mips/au1xxx-ide.c b/drivers/ide/mips/au1xxx-ide.c
index 2f322d7e881b..1de58566e5b6 100644
--- a/drivers/ide/mips/au1xxx-ide.c
+++ b/drivers/ide/mips/au1xxx-ide.c
@@ -601,8 +601,9 @@ static int au_ide_probe(struct device *dev)
         _auide_hwif *ahwif = &auide_hwif;
         ide_hwif_t *hwif;
         struct resource *res;
-        hw_regs_t *hw;
         int ret = 0;
+        u8 idx[4] = { 0xff, 0xff, 0xff, 0xff };
+        hw_regs_t hw;
 
 #if defined(CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA)
         char *mode = "MWDMA2";
@@ -644,12 +645,12 @@ static int au_ide_probe(struct device *dev)
         /* FIXME:  This might possibly break PCMCIA IDE devices */
 
         hwif                            = &ide_hwifs[pdev->id];
-        hw                              = &hwif->hw;
-        hwif->irq = hw->irq             = ahwif->irq;
+        hwif->irq                       = ahwif->irq;
         hwif->chipset                   = ide_au1xxx;
 
-        auide_setup_ports(hw, ahwif);
-        memcpy(hwif->io_ports, hw->io_ports, sizeof(hwif->io_ports));
+        memset(&hw, 0, sizeof(hw));
+        auide_setup_ports(&hw, ahwif);
+        memcpy(hwif->io_ports, hw.io_ports, sizeof(hwif->io_ports));
 
         hwif->ultra_mask                = 0x0;  /* Disable Ultra DMA */
 #ifdef CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA
@@ -706,8 +707,10 @@ static int au_ide_probe(struct device *dev)
         hwif->config_data               = 0;    /* no chipset-specific code */
 
         hwif->drives[0].autotune        = 1;    /* 1=autotune, 2=noautotune, 0=default */
+        hwif->drives[1].autotune        = 1;
 #endif
-        hwif->drives[0].no_io_32bit     = 1;   
+        hwif->drives[0].no_io_32bit     = 1;
+        hwif->drives[1].no_io_32bit     = 1;
 
         auide_hwif.hwif                 = hwif;
         hwif->hwif_data                 = &auide_hwif;
@@ -717,9 +720,9 @@ static int au_ide_probe(struct device *dev)
         dbdma_init_done = 1;
 #endif
 
-        probe_hwif_init(hwif);
+        idx[0] = hwif->index;
 
-        ide_proc_register_port(hwif);
+        ide_device_add(idx);
 
         dev_set_drvdata(dev, hwif);
 
diff --git a/drivers/ide/mips/swarm.c b/drivers/ide/mips/swarm.c
index c2e29571b007..521edd41b572 100644
--- a/drivers/ide/mips/swarm.c
+++ b/drivers/ide/mips/swarm.c
@@ -71,6 +71,7 @@ static int __devinit swarm_ide_probe(struct device *dev)
         u8 __iomem *base;
         phys_t offset, size;
         int i;
+        u8 idx[4] = { 0xff, 0xff, 0xff, 0xff };
 
         if (!SIBYTE_HAVE_IDE)
                 return -ENODEV;
@@ -119,18 +120,15 @@ static int __devinit swarm_ide_probe(struct device *dev)
         hwif->noprobe = 0;
 
         for (i = IDE_DATA_OFFSET; i <= IDE_STATUS_OFFSET; i++)
-                hwif->hw.io_ports[i] =
+                hwif->io_ports[i] =
                                 (unsigned long)(base + ((0x1f0 + i) << 5));
-        hwif->hw.io_ports[IDE_CONTROL_OFFSET] =
+        hwif->io_ports[IDE_CONTROL_OFFSET] =
                                 (unsigned long)(base + (0x3f6 << 5));
-        hwif->hw.irq = K_INT_GB_IDE;
+        hwif->irq = K_INT_GB_IDE;
 
-        memcpy(hwif->io_ports, hwif->hw.io_ports, sizeof(hwif->io_ports));
-        hwif->irq = hwif->hw.irq;
+        idx[0] = hwif->index;
 
-        probe_hwif_init(hwif);
-
-        ide_proc_register_port(hwif);
+        ide_device_add(idx);
 
         dev_set_drvdata(dev, hwif);
 
diff --git a/drivers/ide/pci/aec62xx.c b/drivers/ide/pci/aec62xx.c
index b3dc12a70d51..19ec421f7b9f 100644
--- a/drivers/ide/pci/aec62xx.c
+++ b/drivers/ide/pci/aec62xx.c
@@ -1,5 +1,5 @@
 /*
- * linux/drivers/ide/pci/aec62xx.c              Version 0.26    Sep 1, 2007
+ * linux/drivers/ide/pci/aec62xx.c              Version 0.27    Sep 16, 2007
  *
  * Copyright (C) 1999-2002      Andre Hedrick <andre@linux-ide.org>
  * Copyright (C) 2007           MontaVista Software, Inc. <source@mvista.com>
@@ -141,19 +141,6 @@ static void aec_set_pio_mode(ide_drive_t *drive, const u8 pio)
         drive->hwif->set_dma_mode(drive, pio + XFER_PIO_0);
 }
 
-static void aec62xx_dma_lost_irq (ide_drive_t *drive)
-{
-        switch (HWIF(drive)->pci_dev->device) {
-                case PCI_DEVICE_ID_ARTOP_ATP860:
-                case PCI_DEVICE_ID_ARTOP_ATP860R:
-                case PCI_DEVICE_ID_ARTOP_ATP865:
-                case PCI_DEVICE_ID_ARTOP_ATP865R:
-                        printk(" AEC62XX time out ");
-                default:
-                        break;
-        }
-}
-
 static unsigned int __devinit init_chipset_aec62xx(struct pci_dev *dev, const char *name)
 {
         int bus_speed = system_bus_clock();
@@ -195,8 +182,6 @@ static void __devinit init_hwif_aec62xx(ide_hwif_t *hwif)
         if (hwif->dma_base == 0)
                 return;
 
-        hwif->dma_lost_irq      = &aec62xx_dma_lost_irq;
-
         if (dev->device == PCI_DEVICE_ID_ARTOP_ATP850UF)
                 return;
 
@@ -209,7 +194,7 @@ static void __devinit init_hwif_aec62xx(ide_hwif_t *hwif)
         }
 }
 
-static ide_pci_device_t aec62xx_chipsets[] __devinitdata = {
+static const struct ide_port_info aec62xx_chipsets[] __devinitdata = {
         {       /* 0 */
                 .name           = "AEC6210",
                 .init_chipset   = init_chipset_aec62xx,
@@ -268,12 +253,12 @@ static ide_pci_device_t aec62xx_chipsets[] __devinitdata = {
  *      finds a device matching our IDE device tables.
  *
  *      NOTE: since we're going to modify the 'name' field for AEC-6[26]80[R]
- *      chips, pass a local copy of 'struct pci_device_id' down the call chain.
+ *      chips, pass a local copy of 'struct ide_port_info' down the call chain.
  */
- 
+
 static int __devinit aec62xx_init_one(struct pci_dev *dev, const struct pci_device_id *id)
 {
-        ide_pci_device_t d;
+        struct ide_port_info d;
         u8 idx = id->driver_data;
 
         d = aec62xx_chipsets[idx];
diff --git a/drivers/ide/pci/alim15x3.c b/drivers/ide/pci/alim15x3.c
index 8ee2b48d105d..a607dd31a64c 100644
--- a/drivers/ide/pci/alim15x3.c
+++ b/drivers/ide/pci/alim15x3.c
@@ -1,5 +1,5 @@
 /*
- * linux/drivers/ide/pci/alim15x3.c             Version 0.27    Aug 27 2007
+ * linux/drivers/ide/pci/alim15x3.c             Version 0.29    Sep 16 2007
  *
  *  Copyright (C) 1998-2000 Michel Aubry, Maintainer
  *  Copyright (C) 1998-2000 Andrzej Krzysztofowicz, Maintainer
@@ -492,6 +492,13 @@ static unsigned int __devinit init_chipset_ali15x3 (struct pci_dev *dev, const c
                  * clear bit 7
                  */
                 pci_write_config_byte(dev, 0x4b, tmpbyte & 0x7F);
+                /*
+                 * check m1533, 0x5e, bit 1~4 == 1001 => & 00011110 = 00010010
+                 */
+                if (m5229_revision >= 0x20 && isa_dev) {
+                        pci_read_config_byte(isa_dev, 0x5e, &tmpbyte);
+                        chip_is_1543c_e = ((tmpbyte & 0x1e) == 0x12) ? 1: 0;
+                }
                 goto out;
         }
 
@@ -537,7 +544,30 @@ static unsigned int __devinit init_chipset_ali15x3 (struct pci_dev *dev, const c
                         pci_write_config_byte(isa_dev, 0x79, tmpbyte | 0x02);
                 }
         }
+
 out:
+        /*
+         * CD_ROM DMA on (m5229, 0x53, bit0)
+         *      Enable this bit even if we want to use PIO.
+         * PIO FIFO off (m5229, 0x53, bit1)
+         *      The hardware will use 0x54h and 0x55h to control PIO FIFO.
+         *      (Not on later devices it seems)
+         *
+         *      0x53 changes meaning on later revs - we must no touch
+         *      bit 1 on them.  Need to check if 0x20 is the right break.
+         */
+        if (m5229_revision >= 0x20) {
+                pci_read_config_byte(dev, 0x53, &tmpbyte);
+
+                if (m5229_revision <= 0x20)
+                        tmpbyte = (tmpbyte & (~0x02)) | 0x01;
+                else if (m5229_revision == 0xc7 || m5229_revision == 0xc8)
+                        tmpbyte |= 0x03;
+                else
+                        tmpbyte |= 0x01;
+
+                pci_write_config_byte(dev, 0x53, tmpbyte);
+        }
         pci_dev_put(north);
         pci_dev_put(isa_dev);
         local_irq_restore(flags);
@@ -616,36 +646,8 @@ static u8 __devinit ata66_ali15x3(ide_hwif_t *hwif)
                         if ((tmpbyte & (1 << hwif->channel)) == 0)
                                 cbl = ATA_CBL_PATA80;
                 }
-        } else {
-                /*
-                 * check m1533, 0x5e, bit 1~4 == 1001 => & 00011110 = 00010010
-                 */
-                pci_read_config_byte(isa_dev, 0x5e, &tmpbyte);
-                chip_is_1543c_e = ((tmpbyte & 0x1e) == 0x12) ? 1: 0;
         }
 
-        /*
-         * CD_ROM DMA on (m5229, 0x53, bit0)
-         *      Enable this bit even if we want to use PIO
-         * PIO FIFO off (m5229, 0x53, bit1)
-         *      The hardware will use 0x54h and 0x55h to control PIO FIFO
-         *      (Not on later devices it seems)
-         *
-         *      0x53 changes meaning on later revs - we must no touch
-         *      bit 1 on them. Need to check if 0x20 is the right break
-         */
-         
-        pci_read_config_byte(dev, 0x53, &tmpbyte);
-        
-        if(m5229_revision <= 0x20)
-                tmpbyte = (tmpbyte & (~0x02)) | 0x01;
-        else if (m5229_revision == 0xc7 || m5229_revision == 0xc8)
-                tmpbyte |= 0x03;
-        else
-                tmpbyte |= 0x01;
-
-        pci_write_config_byte(dev, 0x53, tmpbyte);
-
         local_irq_restore(flags);
 
         return cbl;
@@ -664,31 +666,9 @@ static void __devinit init_hwif_common_ali15x3 (ide_hwif_t *hwif)
         hwif->set_dma_mode = &ali_set_dma_mode;
         hwif->udma_filter = &ali_udma_filter;
 
-        /* don't use LBA48 DMA on ALi devices before rev 0xC5 */
-        if (m5229_revision <= 0xC4)
-                hwif->host_flags |= IDE_HFLAG_NO_LBA48_DMA;
-
         if (hwif->dma_base == 0)
                 return;
 
-        /*
-         * check in ->init_dma guarantees m5229_revision >= 0x20 here
-         */
-
-        if (m5229_revision == 0x20)
-                hwif->host_flags |= IDE_HFLAG_NO_ATAPI_DMA;
-
-        if (m5229_revision <= 0x20)
-                hwif->ultra_mask = 0x00; /* no udma */
-        else if (m5229_revision < 0xC2)
-                hwif->ultra_mask = ATA_UDMA2;
-        else if (m5229_revision == 0xC2 || m5229_revision == 0xC3)
-                hwif->ultra_mask = ATA_UDMA4;
-        else if (m5229_revision == 0xC4)
-                hwif->ultra_mask = ATA_UDMA5;
-        else
-                hwif->ultra_mask = ATA_UDMA6;
-
         hwif->dma_setup = &ali15x3_dma_setup;
 
         if (hwif->cbl != ATA_CBL_PATA40_SHORT)
@@ -766,7 +746,7 @@ static void __devinit init_dma_ali15x3 (ide_hwif_t *hwif, unsigned long dmabase)
         ide_setup_dma(hwif, dmabase, 8);
 }
 
-static ide_pci_device_t ali15x3_chipset __devinitdata = {
+static const struct ide_port_info ali15x3_chipset __devinitdata = {
         .name           = "ALI15X3",
         .init_chipset   = init_chipset_ali15x3,
         .init_hwif      = init_hwif_ali15x3,
@@ -792,15 +772,34 @@ static int __devinit alim15x3_init_one(struct pci_dev *dev, const struct pci_dev
                 { },
         };
 
-        ide_pci_device_t *d = &ali15x3_chipset;
+        struct ide_port_info d = ali15x3_chipset;
+        u8 rev = dev->revision;
 
         if (pci_dev_present(ati_rs100))
                 printk(KERN_WARNING "alim15x3: ATI Radeon IGP Northbridge is not yet fully tested.\n");
 
+        /* don't use LBA48 DMA on ALi devices before rev 0xC5 */
+        if (rev <= 0xC4)
+                d.host_flags |= IDE_HFLAG_NO_LBA48_DMA;
+
+        if (rev >= 0x20) {
+                if (rev == 0x20)
+                        d.host_flags |= IDE_HFLAG_NO_ATAPI_DMA;
+
+                if (rev < 0xC2)
+                        d.udma_mask = ATA_UDMA2;
+                else if (rev == 0xC2 || rev == 0xC3)
+                        d.udma_mask = ATA_UDMA4;
+                else if (rev == 0xC4)
+                        d.udma_mask = ATA_UDMA5;
+                else
+                        d.udma_mask = ATA_UDMA6;
+        }
+
 #if defined(CONFIG_SPARC64)
-        d->init_hwif = init_hwif_common_ali15x3;
+        d.init_hwif = init_hwif_common_ali15x3;
 #endif /* CONFIG_SPARC64 */
-        return ide_setup_pci_device(dev, d);
+        return ide_setup_pci_device(dev, &d);
 }
 
 
diff --git a/drivers/ide/pci/amd74xx.c b/drivers/ide/pci/amd74xx.c
index 7cafefbf6c1b..8d4125ec252c 100644
--- a/drivers/ide/pci/amd74xx.c
+++ b/drivers/ide/pci/amd74xx.c
@@ -77,7 +77,7 @@ static struct amd_ide_chip {
 };
 
 static struct amd_ide_chip *amd_config;
-static ide_pci_device_t *amd_chipset;
+static const struct ide_port_info *amd_chipset;
 static unsigned int amd_80w;
 static unsigned int amd_clock;
 
@@ -242,19 +242,12 @@ static unsigned int __devinit init_chipset_amd74xx(struct pci_dev *dev, const ch
 
 static void __devinit init_hwif_amd74xx(ide_hwif_t *hwif)
 {
-        int i;
-
         if (hwif->irq == 0) /* 0 is bogus but will do for now */
                 hwif->irq = pci_get_legacy_ide_irq(hwif->pci_dev, hwif->channel);
 
         hwif->set_pio_mode = &amd_set_pio_mode;
         hwif->set_dma_mode = &amd_set_drive;
 
-        for (i = 0; i < 2; i++) {
-                hwif->drives[i].io_32bit = 1;
-                hwif->drives[i].unmask = 1;
-        }
-
         if (!hwif->dma_base)
                 return;
 
@@ -270,16 +263,21 @@ static void __devinit init_hwif_amd74xx(ide_hwif_t *hwif)
         }
 }
 
+#define IDE_HFLAGS_AMD \
+        (IDE_HFLAG_PIO_NO_BLACKLIST | \
+         IDE_HFLAG_PIO_NO_DOWNGRADE | \
+         IDE_HFLAG_POST_SET_MODE | \
+         IDE_HFLAG_IO_32BIT | \
+         IDE_HFLAG_UNMASK_IRQS | \
+         IDE_HFLAG_BOOTABLE)
+
 #define DECLARE_AMD_DEV(name_str)                                       \
         {                                                               \
                 .name           = name_str,                             \
                 .init_chipset   = init_chipset_amd74xx,                 \
                 .init_hwif      = init_hwif_amd74xx,                    \
                 .enablebits     = {{0x40,0x02,0x02}, {0x40,0x01,0x01}}, \
-                .host_flags     = IDE_HFLAG_PIO_NO_BLACKLIST |          \
-                                  IDE_HFLAG_PIO_NO_DOWNGRADE |          \
-                                  IDE_HFLAG_POST_SET_MODE |             \
-                                  IDE_HFLAG_BOOTABLE,                   \
+                .host_flags     = IDE_HFLAGS_AMD,                       \
                 .pio_mask       = ATA_PIO5,                             \
                 .swdma_mask     = ATA_SWDMA2,                           \
                 .mwdma_mask     = ATA_MWDMA2,                           \
@@ -291,16 +289,13 @@ static void __devinit init_hwif_amd74xx(ide_hwif_t *hwif)
                 .init_chipset   = init_chipset_amd74xx,                 \
                 .init_hwif      = init_hwif_amd74xx,                    \
                 .enablebits     = {{0x50,0x02,0x02}, {0x50,0x01,0x01}}, \
-                .host_flags     = IDE_HFLAG_PIO_NO_BLACKLIST |          \
-                                  IDE_HFLAG_PIO_NO_DOWNGRADE |          \
-                                  IDE_HFLAG_POST_SET_MODE |             \
-                                  IDE_HFLAG_BOOTABLE,                   \
+                .host_flags     = IDE_HFLAGS_AMD,                       \
                 .pio_mask       = ATA_PIO5,                             \
                 .swdma_mask     = ATA_SWDMA2,                           \
                 .mwdma_mask     = ATA_MWDMA2,                           \
         }
 
-static ide_pci_device_t amd74xx_chipsets[] __devinitdata = {
+static const struct ide_port_info amd74xx_chipsets[] __devinitdata = {
         /*  0 */ DECLARE_AMD_DEV("AMD7401"),
         /*  1 */ DECLARE_AMD_DEV("AMD7409"),
         /*  2 */ DECLARE_AMD_DEV("AMD7411"),
diff --git a/drivers/ide/pci/atiixp.c b/drivers/ide/pci/atiixp.c
index 307843053078..ef8e0164ef7a 100644
--- a/drivers/ide/pci/atiixp.c
+++ b/drivers/ide/pci/atiixp.c
@@ -189,8 +189,7 @@ static void __devinit init_hwif_atiixp(ide_hwif_t *hwif)
         hwif->dma_host_off = &atiixp_dma_host_off;
 }
 
-
-static ide_pci_device_t atiixp_pci_info[] __devinitdata = {
+static const struct ide_port_info atiixp_pci_info[] __devinitdata = {
         {       /* 0 */
                 .name           = "ATIIXP",
                 .init_hwif      = init_hwif_atiixp,
diff --git a/drivers/ide/pci/cmd640.c b/drivers/ide/pci/cmd640.c
index f369645e4d16..4aa48104e0c1 100644
--- a/drivers/ide/pci/cmd640.c
+++ b/drivers/ide/pci/cmd640.c
@@ -185,6 +185,8 @@ static u8 recovery_counts[4] = {16, 16, 16, 16}; /* Recovery count (encoded) */
 
 #endif /* CONFIG_BLK_DEV_CMD640_ENHANCED */
 
+static DEFINE_SPINLOCK(cmd640_lock);
+
 /*
  * These are initialized to point at the devices we control
  */
@@ -258,12 +260,12 @@ static u8 get_cmd640_reg_vlb (u16 reg)
 
 static u8 get_cmd640_reg(u16 reg)
 {
-        u8 b;
         unsigned long flags;
+        u8 b;
 
-        spin_lock_irqsave(&ide_lock, flags);
+        spin_lock_irqsave(&cmd640_lock, flags);
         b = __get_cmd640_reg(reg);
-        spin_unlock_irqrestore(&ide_lock, flags);
+        spin_unlock_irqrestore(&cmd640_lock, flags);
         return b;
 }
 
@@ -271,9 +273,9 @@ static void put_cmd640_reg(u16 reg, u8 val)
 {
         unsigned long flags;
 
-        spin_lock_irqsave(&ide_lock, flags);
+        spin_lock_irqsave(&cmd640_lock, flags);
         __put_cmd640_reg(reg,val);
-        spin_unlock_irqrestore(&ide_lock, flags);
+        spin_unlock_irqrestore(&cmd640_lock, flags);
 }
 
 static int __init match_pci_cmd640_device (void)
@@ -351,7 +353,7 @@ static int __init secondary_port_responding (void)
 {
         unsigned long flags;
 
-        spin_lock_irqsave(&ide_lock, flags);
+        spin_lock_irqsave(&cmd640_lock, flags);
 
         outb_p(0x0a, 0x170 + IDE_SELECT_OFFSET);        /* select drive0 */
         udelay(100);
@@ -359,11 +361,11 @@ static int __init secondary_port_responding (void)
                 outb_p(0x1a, 0x170 + IDE_SELECT_OFFSET); /* select drive1 */
                 udelay(100);
                 if ((inb_p(0x170 + IDE_SELECT_OFFSET) & 0x1f) != 0x1a) {
-                        spin_unlock_irqrestore(&ide_lock, flags);
+                        spin_unlock_irqrestore(&cmd640_lock, flags);
                         return 0; /* nothing responded */
                 }
         }
-        spin_unlock_irqrestore(&ide_lock, flags);
+        spin_unlock_irqrestore(&cmd640_lock, flags);
         return 1; /* success */
 }
 
@@ -440,11 +442,11 @@ static void __init setup_device_ptrs (void)
 static void set_prefetch_mode (unsigned int index, int mode)
 {
         ide_drive_t *drive = cmd_drives[index];
+        unsigned long flags;
         int reg = prefetch_regs[index];
         u8 b;
-        unsigned long flags;
 
-        spin_lock_irqsave(&ide_lock, flags);
+        spin_lock_irqsave(&cmd640_lock, flags);
         b = __get_cmd640_reg(reg);
         if (mode) {     /* want prefetch on? */
 #if CMD640_PREFETCH_MASKS
@@ -460,7 +462,7 @@ static void set_prefetch_mode (unsigned int index, int mode)
                 b |= prefetch_masks[index];     /* disable prefetch */
         }
         __put_cmd640_reg(reg, b);
-        spin_unlock_irqrestore(&ide_lock, flags);
+        spin_unlock_irqrestore(&cmd640_lock, flags);
 }
 
 /*
@@ -561,7 +563,7 @@ static void program_drive_counts (unsigned int index)
         /*
          * Now that everything is ready, program the new timings
          */
-        spin_lock_irqsave(&ide_lock, flags);
+        spin_lock_irqsave(&cmd640_lock, flags);
         /*
          * Program the address_setup clocks into ARTTIM reg,
          * and then the active/recovery counts into the DRWTIM reg
@@ -570,7 +572,7 @@ static void program_drive_counts (unsigned int index)
         setup_count |= __get_cmd640_reg(arttim_regs[index]) & 0x3f;
         __put_cmd640_reg(arttim_regs[index], setup_count);
         __put_cmd640_reg(drwtim_regs[index], pack_nibbles(active_count, recovery_count));
-        spin_unlock_irqrestore(&ide_lock, flags);
+        spin_unlock_irqrestore(&cmd640_lock, flags);
 }
 
 /*
@@ -670,20 +672,20 @@ static void cmd640_set_pio_mode(ide_drive_t *drive, const u8 pio)
 
 static int pci_conf1(void)
 {
-        u32 tmp;
         unsigned long flags;
+        u32 tmp;
 
-        spin_lock_irqsave(&ide_lock, flags);
+        spin_lock_irqsave(&cmd640_lock, flags);
         outb(0x01, 0xCFB);
         tmp = inl(0xCF8);
         outl(0x80000000, 0xCF8);
         if (inl(0xCF8) == 0x80000000) {
                 outl(tmp, 0xCF8);
-                spin_unlock_irqrestore(&ide_lock, flags);
+                spin_unlock_irqrestore(&cmd640_lock, flags);
                 return 1;
         }
         outl(tmp, 0xCF8);
-        spin_unlock_irqrestore(&ide_lock, flags);
+        spin_unlock_irqrestore(&cmd640_lock, flags);
         return 0;
 }
 
@@ -691,15 +693,15 @@ static int pci_conf2(void)
 {
         unsigned long flags;
 
-        spin_lock_irqsave(&ide_lock, flags);
+        spin_lock_irqsave(&cmd640_lock, flags);
         outb(0x00, 0xCFB);
         outb(0x00, 0xCF8);
         outb(0x00, 0xCFA);
         if (inb(0xCF8) == 0x00 && inb(0xCF8) == 0x00) {
-                spin_unlock_irqrestore(&ide_lock, flags);
+                spin_unlock_irqrestore(&cmd640_lock, flags);
                 return 1;
         }
-        spin_unlock_irqrestore(&ide_lock, flags);
+        spin_unlock_irqrestore(&cmd640_lock, flags);
         return 0;
 }
 
diff --git a/drivers/ide/pci/cmd64x.c b/drivers/ide/pci/cmd64x.c
index adee2ef6fd71..ea0143ef5fe5 100644
--- a/drivers/ide/pci/cmd64x.c
+++ b/drivers/ide/pci/cmd64x.c
@@ -535,7 +535,6 @@ static void __devinit init_hwif_cmd64x(ide_hwif_t *hwif)
                 hwif->ide_dma_test_irq  = &cmd648_ide_dma_test_irq;
                 break;
         case PCI_DEVICE_ID_CMD_646:
-                hwif->chipset = ide_cmd646;
                 if (dev->revision == 0x01) {
                         hwif->ide_dma_end = &cmd646_1_ide_dma_end;
                         break;
@@ -549,7 +548,7 @@ static void __devinit init_hwif_cmd64x(ide_hwif_t *hwif)
         }
 }
 
-static ide_pci_device_t cmd64x_chipsets[] __devinitdata = {
+static const struct ide_port_info cmd64x_chipsets[] __devinitdata = {
         {       /* 0 */
                 .name           = "CMD643",
                 .init_chipset   = init_chipset_cmd64x,
@@ -573,6 +572,7 @@ static ide_pci_device_t cmd64x_chipsets[] __devinitdata = {
                 .init_chipset   = init_chipset_cmd64x,
                 .init_hwif      = init_hwif_cmd64x,
                 .enablebits     = {{0x51,0x04,0x04}, {0x51,0x08,0x08}},
+                .chipset        = ide_cmd646,
                 .host_flags     = IDE_HFLAG_ABUSE_PREFETCH | IDE_HFLAG_BOOTABLE,
                 .pio_mask       = ATA_PIO5,
                 .mwdma_mask     = ATA_MWDMA2,
@@ -591,7 +591,7 @@ static ide_pci_device_t cmd64x_chipsets[] __devinitdata = {
 
 static int __devinit cmd64x_init_one(struct pci_dev *dev, const struct pci_device_id *id)
 {
-        ide_pci_device_t d;
+        struct ide_port_info d;
         u8 idx = id->driver_data;
 
         d = cmd64x_chipsets[idx];
diff --git a/drivers/ide/pci/cs5520.c b/drivers/ide/pci/cs5520.c
index aa98e817d385..0466462fd21b 100644
--- a/drivers/ide/pci/cs5520.c
+++ b/drivers/ide/pci/cs5520.c
@@ -141,7 +141,7 @@ static void __devinit init_hwif_cs5520(ide_hwif_t *hwif)
                 .pio_mask       = ATA_PIO4,                     \
         }
 
-static ide_pci_device_t cyrix_chipsets[] __devinitdata = {
+static const struct ide_port_info cyrix_chipsets[] __devinitdata = {
         /* 0 */ DECLARE_CS_DEV("Cyrix 5510"),
         /* 1 */ DECLARE_CS_DEV("Cyrix 5520")
 };
@@ -154,9 +154,8 @@ static ide_pci_device_t cyrix_chipsets[] __devinitdata = {
  
 static int __devinit cs5520_init_one(struct pci_dev *dev, const struct pci_device_id *id)
 {
-        ide_hwif_t *hwif = NULL, *mate = NULL;
-        ata_index_t index;
-        ide_pci_device_t *d = &cyrix_chipsets[id->driver_data];
+        const struct ide_port_info *d = &cyrix_chipsets[id->driver_data];
+        u8 idx[4] = { 0xff, 0xff, 0xff, 0xff };
 
         ide_setup_pci_noise(dev, d);
 
@@ -172,29 +171,14 @@ static int __devinit cs5520_init_one(struct pci_dev *dev, const struct pci_devic
                 return -ENODEV;
         }
 
-        index.all = 0xf0f0;
-
         /*
          *      Now the chipset is configured we can let the core
          *      do all the device setup for us
          */
 
-        ide_pci_setup_ports(dev, d, 14, &index);
-
-        if ((index.b.low & 0xf0) != 0xf0)
-                hwif = &ide_hwifs[index.b.low];
-        if ((index.b.high & 0xf0) != 0xf0)
-                mate = &ide_hwifs[index.b.high];
-
-        if (hwif)
-                probe_hwif_init(hwif);
-        if (mate)
-                probe_hwif_init(mate);
+        ide_pci_setup_ports(dev, d, 14, &idx[0]);
 
-        if (hwif)
-                ide_proc_register_port(hwif);
-        if (mate)
-                ide_proc_register_port(mate);
+        ide_device_add(idx);
 
         return 0;
 }
diff --git a/drivers/ide/pci/cs5530.c b/drivers/ide/pci/cs5530.c
index ba0c6eba024b..599408952bd4 100644
--- a/drivers/ide/pci/cs5530.c
+++ b/drivers/ide/pci/cs5530.c
@@ -1,5 +1,5 @@
 /*
- * linux/drivers/ide/pci/cs5530.c               Version 0.76    Aug 3 2007
+ * linux/drivers/ide/pci/cs5530.c               Version 0.77    Sep 24 2007
  *
  * Copyright (C) 2000                   Andre Hedrick <andre@linux-ide.org>
  * Copyright (C) 2000                   Mark Lord <mlord@pobox.com>
@@ -146,7 +146,6 @@ static void cs5530_set_dma_mode(ide_drive_t *drive, const u8 mode)
 static unsigned int __devinit init_chipset_cs5530 (struct pci_dev *dev, const char *name)
 {
         struct pci_dev *master_0 = NULL, *cs5530_0 = NULL;
-        unsigned long flags;
 
         if (pci_resource_start(dev, 4) == 0)
                 return -EFAULT;
@@ -171,9 +170,6 @@ static unsigned int __devinit init_chipset_cs5530 (struct pci_dev *dev, const ch
                 goto out;
         }
 
-        spin_lock_irqsave(&ide_lock, flags);
-                /* all CPUs (there should only be one CPU with this chipset) */
-
         /*
          * Enable BusMaster and MemoryWriteAndInvalidate for the cs5530:
          * -->  OR 0x14 into 16-bit PCI COMMAND reg of function 0 of the cs5530
@@ -224,8 +220,6 @@ static unsigned int __devinit init_chipset_cs5530 (struct pci_dev *dev, const ch
         pci_write_config_byte(master_0, 0x42, 0x00);
         pci_write_config_byte(master_0, 0x43, 0xc1);
 
-        spin_unlock_irqrestore(&ide_lock, flags);
-
 out:
         pci_dev_put(master_0);
         pci_dev_put(cs5530_0);
@@ -261,7 +255,7 @@ static void __devinit init_hwif_cs5530 (ide_hwif_t *hwif)
         hwif->udma_filter = cs5530_udma_filter;
 }
 
-static ide_pci_device_t cs5530_chipset __devinitdata = {
+static const struct ide_port_info cs5530_chipset __devinitdata = {
         .name           = "CS5530",
         .init_chipset   = init_chipset_cs5530,
         .init_hwif      = init_hwif_cs5530,
diff --git a/drivers/ide/pci/cs5535.c b/drivers/ide/pci/cs5535.c
index 5ac82ffa5c09..9094916e3780 100644
--- a/drivers/ide/pci/cs5535.c
+++ b/drivers/ide/pci/cs5535.c
@@ -186,7 +186,7 @@ static void __devinit init_hwif_cs5535(ide_hwif_t *hwif)
         hwif->cbl = cs5535_cable_detect(hwif->pci_dev);
 }
 
-static ide_pci_device_t cs5535_chipset __devinitdata = {
+static const struct ide_port_info cs5535_chipset __devinitdata = {
         .name           = "CS5535",
         .init_hwif      = init_hwif_cs5535,
         .host_flags     = IDE_HFLAG_SINGLE | IDE_HFLAG_POST_SET_MODE |
diff --git a/drivers/ide/pci/cy82c693.c b/drivers/ide/pci/cy82c693.c
index efc20bd97fd5..3ef4fc10fe2c 100644
--- a/drivers/ide/pci/cy82c693.c
+++ b/drivers/ide/pci/cy82c693.c
@@ -428,7 +428,6 @@ static unsigned int __devinit init_chipset_cy82c693(struct pci_dev *dev, const c
  */
 static void __devinit init_hwif_cy82c693(ide_hwif_t *hwif)
 {
-        hwif->chipset = ide_cy82c693;
         hwif->set_pio_mode = &cy82c693_set_pio_mode;
 
         if (hwif->dma_base == 0)
@@ -449,11 +448,12 @@ static void __devinit init_iops_cy82c693(ide_hwif_t *hwif)
         }
 }
 
-static ide_pci_device_t cy82c693_chipset __devinitdata = {
+static const struct ide_port_info cy82c693_chipset __devinitdata = {
         .name           = "CY82C693",
         .init_chipset   = init_chipset_cy82c693,
         .init_iops      = init_iops_cy82c693,
         .init_hwif      = init_hwif_cy82c693,
+        .chipset        = ide_cy82c693,
         .host_flags     = IDE_HFLAG_SINGLE | IDE_HFLAG_TRUST_BIOS_FOR_DMA |
                           IDE_HFLAG_BOOTABLE,
         .pio_mask       = ATA_PIO4,
diff --git a/drivers/ide/pci/delkin_cb.c b/drivers/ide/pci/delkin_cb.c
index 46f4a888c037..83829081640a 100644
--- a/drivers/ide/pci/delkin_cb.c
+++ b/drivers/ide/pci/delkin_cb.c
@@ -80,7 +80,7 @@ delkin_cb_probe (struct pci_dev *dev, const struct pci_device_id *id)
         hw.irq = dev->irq;
         hw.chipset = ide_pci;           /* this enables IRQ sharing */
 
-        rc = ide_register_hw_with_fixup(&hw, 0, &hwif, ide_undecoded_slave);
+        rc = ide_register_hw(&hw, &ide_undecoded_slave, 0, &hwif);
         if (rc < 0) {
                 printk(KERN_ERR "delkin_cb: ide_register_hw failed (%d)\n", rc);
                 pci_disable_device(dev);
diff --git a/drivers/ide/pci/generic.c b/drivers/ide/pci/generic.c
index 51165832e7f2..f44d70852c3c 100644
--- a/drivers/ide/pci/generic.c
+++ b/drivers/ide/pci/generic.c
@@ -54,37 +54,24 @@ __setup("all-generic-ide", ide_generic_all_on);
 module_param_named(all_generic_ide, ide_generic_all, bool, 0444);
 MODULE_PARM_DESC(all_generic_ide, "IDE generic will claim all unknown PCI IDE storage controllers.");
 
-static void __devinit init_hwif_generic (ide_hwif_t *hwif)
-{
-        switch(hwif->pci_dev->device) {
-                case PCI_DEVICE_ID_UMC_UM8673F:
-                case PCI_DEVICE_ID_UMC_UM8886A:
-                case PCI_DEVICE_ID_UMC_UM8886BF:
-                        hwif->irq = hwif->channel ? 15 : 14;
-                        break;
-                default:
-                        break;
-        }
-}
+#define IDE_HFLAGS_UMC (IDE_HFLAG_NO_DMA | IDE_HFLAG_FORCE_LEGACY_IRQS)
 
-#define DECLARE_GENERIC_PCI_DEV(name_str, dma_setting) \
+#define DECLARE_GENERIC_PCI_DEV(name_str, extra_flags) \
         { \
                 .name           = name_str, \
-                .init_hwif      = init_hwif_generic, \
                 .host_flags     = IDE_HFLAG_TRUST_BIOS_FOR_DMA | \
-                                  dma_setting | \
+                                  extra_flags | \
                                   IDE_HFLAG_BOOTABLE, \
                 .swdma_mask     = ATA_SWDMA2, \
                 .mwdma_mask     = ATA_MWDMA2, \
                 .udma_mask      = ATA_UDMA6, \
         }
 
-static ide_pci_device_t generic_chipsets[] __devinitdata = {
+static const struct ide_port_info generic_chipsets[] __devinitdata = {
         /*  0 */ DECLARE_GENERIC_PCI_DEV("Unknown",     0),
 
         {       /* 1 */
                 .name           = "NS87410",
-                .init_hwif      = init_hwif_generic,
                 .enablebits     = {{0x43,0x08,0x08}, {0x47,0x08,0x08}},
                 .host_flags     = IDE_HFLAG_TRUST_BIOS_FOR_DMA |
                                   IDE_HFLAG_BOOTABLE,
@@ -95,16 +82,15 @@ static ide_pci_device_t generic_chipsets[] __devinitdata = {
 
         /*  2 */ DECLARE_GENERIC_PCI_DEV("SAMURAI",     0),
         /*  3 */ DECLARE_GENERIC_PCI_DEV("HT6565",      0),
-        /*  4 */ DECLARE_GENERIC_PCI_DEV("UM8673F",     IDE_HFLAG_NO_DMA),
-        /*  5 */ DECLARE_GENERIC_PCI_DEV("UM8886A",     IDE_HFLAG_NO_DMA),
-        /*  6 */ DECLARE_GENERIC_PCI_DEV("UM8886BF",    IDE_HFLAG_NO_DMA),
+        /*  4 */ DECLARE_GENERIC_PCI_DEV("UM8673F",     IDE_HFLAGS_UMC),
+        /*  5 */ DECLARE_GENERIC_PCI_DEV("UM8886A",     IDE_HFLAGS_UMC),
+        /*  6 */ DECLARE_GENERIC_PCI_DEV("UM8886BF",    IDE_HFLAGS_UMC),
         /*  7 */ DECLARE_GENERIC_PCI_DEV("HINT_IDE",    0),
         /*  8 */ DECLARE_GENERIC_PCI_DEV("VIA_IDE",     IDE_HFLAG_NO_AUTODMA),
         /*  9 */ DECLARE_GENERIC_PCI_DEV("OPTI621V",    IDE_HFLAG_NO_AUTODMA),
 
         {       /* 10 */
                 .name           = "VIA8237SATA",
-                .init_hwif      = init_hwif_generic,
                 .host_flags     = IDE_HFLAG_TRUST_BIOS_FOR_DMA |
                                   IDE_HFLAG_OFF_BOARD,
                 .swdma_mask     = ATA_SWDMA2,
@@ -118,7 +104,6 @@ static ide_pci_device_t generic_chipsets[] __devinitdata = {
 
         {       /* 14 */
                 .name           = "Revolution",
-                .init_hwif      = init_hwif_generic,
                 .host_flags     = IDE_HFLAG_TRUST_BIOS_FOR_DMA |
                                   IDE_HFLAG_OFF_BOARD,
                 .swdma_mask     = ATA_SWDMA2,
@@ -138,7 +123,7 @@ static ide_pci_device_t generic_chipsets[] __devinitdata = {
  
 static int __devinit generic_init_one(struct pci_dev *dev, const struct pci_device_id *id)
 {
-        ide_pci_device_t *d = &generic_chipsets[id->driver_data];
+        const struct ide_port_info *d = &generic_chipsets[id->driver_data];
         int ret = -ENODEV;
 
         /* Don't use the generic entry unless instructed to do so */
diff --git a/drivers/ide/pci/hpt34x.c b/drivers/ide/pci/hpt34x.c
index 67af1a7dde30..ae6307fae4f9 100644
--- a/drivers/ide/pci/hpt34x.c
+++ b/drivers/ide/pci/hpt34x.c
@@ -129,7 +129,7 @@ static void __devinit init_hwif_hpt34x(ide_hwif_t *hwif)
         hwif->set_dma_mode = &hpt34x_set_mode;
 }
 
-static ide_pci_device_t hpt34x_chipsets[] __devinitdata = {
+static const struct ide_port_info hpt34x_chipsets[] __devinitdata = {
         { /* 0 */
                 .name           = "HPT343",
                 .init_chipset   = init_chipset_hpt34x,
@@ -158,7 +158,7 @@ static ide_pci_device_t hpt34x_chipsets[] __devinitdata = {
 
 static int __devinit hpt34x_init_one(struct pci_dev *dev, const struct pci_device_id *id)
 {
-        ide_pci_device_t *d;
+        const struct ide_port_info *d;
         u16 pcicmd = 0;
 
         pci_read_config_word(dev, PCI_COMMAND, &pcicmd);
diff --git a/drivers/ide/pci/hpt366.c b/drivers/ide/pci/hpt366.c
index 18f5b7ddaee6..612b795241bf 100644
--- a/drivers/ide/pci/hpt366.c
+++ b/drivers/ide/pci/hpt366.c
@@ -1425,7 +1425,7 @@ static int __devinit hpt36x_init(struct pci_dev *dev, struct pci_dev *dev2)
         return 0;
 }
 
-static ide_pci_device_t hpt366_chipsets[] __devinitdata = {
+static const struct ide_port_info hpt366_chipsets[] __devinitdata = {
         {       /* 0 */
                 .name           = "HPT36x",
                 .init_chipset   = init_chipset_hpt366,
@@ -1510,7 +1510,7 @@ static int __devinit hpt366_init_one(struct pci_dev *dev, const struct pci_devic
 {
         struct hpt_info *info = NULL;
         struct pci_dev *dev2 = NULL;
-        ide_pci_device_t d;
+        struct ide_port_info d;
         u8 idx = id->driver_data;
         u8 rev = dev->revision;
 
diff --git a/drivers/ide/pci/it8213.c b/drivers/ide/pci/it8213.c
index dfbe605120cb..90b52ed37bfc 100644
--- a/drivers/ide/pci/it8213.c
+++ b/drivers/ide/pci/it8213.c
@@ -193,7 +193,7 @@ static void __devinit init_hwif_it8213(ide_hwif_t *hwif)
                 .udma_mask      = ATA_UDMA6,            \
         }
 
-static ide_pci_device_t it8213_chipsets[] __devinitdata = {
+static const struct ide_port_info it8213_chipsets[] __devinitdata = {
         /* 0 */ DECLARE_ITE_DEV("IT8213"),
 };
 
diff --git a/drivers/ide/pci/it821x.c b/drivers/ide/pci/it821x.c
index ec45b7247209..1a7ddd12e65c 100644
--- a/drivers/ide/pci/it821x.c
+++ b/drivers/ide/pci/it821x.c
@@ -638,7 +638,7 @@ static unsigned int __devinit init_chipset_it821x(struct pci_dev *dev, const cha
                 .pio_mask       = ATA_PIO4,             \
         }
 
-static ide_pci_device_t it821x_chipsets[] __devinitdata = {
+static const struct ide_port_info it821x_chipsets[] __devinitdata = {
         /* 0 */ DECLARE_ITE_DEV("IT8212"),
 };
 
diff --git a/drivers/ide/pci/jmicron.c b/drivers/ide/pci/jmicron.c
index 2eeff670d9a6..bdf64d997708 100644
--- a/drivers/ide/pci/jmicron.c
+++ b/drivers/ide/pci/jmicron.c
@@ -118,7 +118,7 @@ static void __devinit init_hwif_jmicron(ide_hwif_t *hwif)
                 hwif->cbl = ata66_jmicron(hwif);
 }
 
-static ide_pci_device_t jmicron_chipset __devinitdata = {
+static const struct ide_port_info jmicron_chipset __devinitdata = {
         .name           = "JMB",
         .init_hwif      = init_hwif_jmicron,
         .host_flags     = IDE_HFLAG_BOOTABLE,
diff --git a/drivers/ide/pci/ns87415.c b/drivers/ide/pci/ns87415.c
index d21b58923829..d4df4642dbb5 100644
--- a/drivers/ide/pci/ns87415.c
+++ b/drivers/ide/pci/ns87415.c
@@ -260,7 +260,7 @@ static void __devinit init_hwif_ns87415 (ide_hwif_t *hwif)
         hwif->ide_dma_end = &ns87415_ide_dma_end;
 }
 
-static ide_pci_device_t ns87415_chipset __devinitdata = {
+static const struct ide_port_info ns87415_chipset __devinitdata = {
         .name           = "NS87415",
 #ifdef CONFIG_SUPERIO
         .init_iops      = init_iops_ns87415,
diff --git a/drivers/ide/pci/opti621.c b/drivers/ide/pci/opti621.c
index 3573ffeaaa34..8953d9c3926f 100644
--- a/drivers/ide/pci/opti621.c
+++ b/drivers/ide/pci/opti621.c
@@ -1,5 +1,5 @@
 /*
- *  linux/drivers/ide/pci/opti621.c             Version 0.8     Aug 27, 2007
+ *  linux/drivers/ide/pci/opti621.c             Version 0.9     Sep 24, 2007
  *
  *  Copyright (C) 1996-1998  Linus Torvalds & authors (see below)
  */
@@ -133,6 +133,8 @@ static int reg_base;
 #define PIO_NOT_EXIST 254
 #define PIO_DONT_KNOW 255
 
+static DEFINE_SPINLOCK(opti621_lock);
+
 /* there are stored pio numbers from other calls of opti621_set_pio_mode */
 static void compute_pios(ide_drive_t *drive, const u8 pio)
 /* Store values into drive->drive_data
@@ -278,7 +280,7 @@ static void opti621_set_pio_mode(ide_drive_t *drive, const u8 pio)
                 second.recovery_time, drdy);
 #endif
 
-        spin_lock_irqsave(&ide_lock, flags);
+        spin_lock_irqsave(&opti621_lock, flags);
 
         reg_base = hwif->io_ports[IDE_DATA_OFFSET];
 
@@ -317,7 +319,7 @@ static void opti621_set_pio_mode(ide_drive_t *drive, const u8 pio)
         /*  and read prefetch for both drives */
         write_reg(misc, MISC_REG);
 
-        spin_unlock_irqrestore(&ide_lock, flags);
+        spin_unlock_irqrestore(&opti621_lock, flags);
 }
 
 /*
@@ -331,7 +333,7 @@ static void __devinit init_hwif_opti621 (ide_hwif_t *hwif)
         hwif->set_pio_mode = &opti621_set_pio_mode;
 }
 
-static ide_pci_device_t opti621_chipsets[] __devinitdata = {
+static const struct ide_port_info opti621_chipsets[] __devinitdata = {
         {       /* 0 */
                 .name           = "OPTI621",
                 .init_hwif      = init_hwif_opti621,
diff --git a/drivers/ide/pci/pdc202xx_new.c b/drivers/ide/pci/pdc202xx_new.c
index d1e7823454f3..4234efeba606 100644
--- a/drivers/ide/pci/pdc202xx_new.c
+++ b/drivers/ide/pci/pdc202xx_new.c
@@ -513,7 +513,7 @@ static struct pci_dev * __devinit pdc20270_get_dev2(struct pci_dev *dev)
                 .udma_mask      = udma, \
         }
 
-static ide_pci_device_t pdcnew_chipsets[] __devinitdata = {
+static const struct ide_port_info pdcnew_chipsets[] __devinitdata = {
         /* 0 */ DECLARE_PDCNEW_DEV("PDC20268", ATA_UDMA5),
         /* 1 */ DECLARE_PDCNEW_DEV("PDC20269", ATA_UDMA6),
         /* 2 */ DECLARE_PDCNEW_DEV("PDC20270", ATA_UDMA5),
@@ -534,7 +534,7 @@ static ide_pci_device_t pdcnew_chipsets[] __devinitdata = {
  
 static int __devinit pdc202new_init_one(struct pci_dev *dev, const struct pci_device_id *id)
 {
-        ide_pci_device_t *d;
+        const struct ide_port_info *d;
         struct pci_dev *bridge = dev->bus->self;
         u8 idx = id->driver_data;
 
diff --git a/drivers/ide/pci/pdc202xx_old.c b/drivers/ide/pci/pdc202xx_old.c
index 29306121dc4a..e09742e2ba59 100644
--- a/drivers/ide/pci/pdc202xx_old.c
+++ b/drivers/ide/pci/pdc202xx_old.c
@@ -302,13 +302,6 @@ static unsigned int __devinit init_chipset_pdc202xx(struct pci_dev *dev,
 
 static void __devinit init_hwif_pdc202xx(ide_hwif_t *hwif)
 {
-        struct pci_dev *dev = hwif->pci_dev;
-
-        /* PDC20265 has problems with large LBA48 requests */
-        if ((dev->device == PCI_DEVICE_ID_PROMISE_20267) ||
-            (dev->device == PCI_DEVICE_ID_PROMISE_20265))
-                hwif->rqsize = 256;
-
         hwif->set_pio_mode = &pdc202xx_set_pio_mode;
         hwif->set_dma_mode = &pdc202xx_set_mode;
 
@@ -382,7 +375,7 @@ static void __devinit pdc202ata4_fixup_irq(struct pci_dev *dev,
         }
 }
 
-#define DECLARE_PDC2026X_DEV(name_str, udma) \
+#define DECLARE_PDC2026X_DEV(name_str, udma, extra_flags) \
         { \
                 .name           = name_str, \
                 .init_chipset   = init_chipset_pdc202xx, \
@@ -390,13 +383,14 @@ static void __devinit pdc202ata4_fixup_irq(struct pci_dev *dev,
                 .init_dma       = init_dma_pdc202xx, \
                 .extra          = 48, \
                 .host_flags     = IDE_HFLAG_ERROR_STOPS_FIFO | \
+                                  extra_flags | \
                                   IDE_HFLAG_OFF_BOARD, \
                 .pio_mask       = ATA_PIO4, \
                 .mwdma_mask     = ATA_MWDMA2, \
                 .udma_mask      = udma, \
         }
 
-static ide_pci_device_t pdc202xx_chipsets[] __devinitdata = {
+static const struct ide_port_info pdc202xx_chipsets[] __devinitdata = {
         {       /* 0 */
                 .name           = "PDC20246",
                 .init_chipset   = init_chipset_pdc202xx,
@@ -410,10 +404,10 @@ static ide_pci_device_t pdc202xx_chipsets[] __devinitdata = {
                 .udma_mask      = ATA_UDMA2,
         },
 
-        /* 1 */ DECLARE_PDC2026X_DEV("PDC20262", ATA_UDMA4),
-        /* 2 */ DECLARE_PDC2026X_DEV("PDC20263", ATA_UDMA4),
-        /* 3 */ DECLARE_PDC2026X_DEV("PDC20265", ATA_UDMA5),
-        /* 4 */ DECLARE_PDC2026X_DEV("PDC20267", ATA_UDMA5),
+        /* 1 */ DECLARE_PDC2026X_DEV("PDC20262", ATA_UDMA4, 0),
+        /* 2 */ DECLARE_PDC2026X_DEV("PDC20263", ATA_UDMA4, 0),
+        /* 3 */ DECLARE_PDC2026X_DEV("PDC20265", ATA_UDMA5, IDE_HFLAG_RQSIZE_256),
+        /* 4 */ DECLARE_PDC2026X_DEV("PDC20267", ATA_UDMA5, IDE_HFLAG_RQSIZE_256),
 };
 
 /**
@@ -427,7 +421,7 @@ static ide_pci_device_t pdc202xx_chipsets[] __devinitdata = {
  
 static int __devinit pdc202xx_init_one(struct pci_dev *dev, const struct pci_device_id *id)
 {
-        ide_pci_device_t *d;
+        const struct ide_port_info *d;
         u8 idx = id->driver_data;
 
         d = &pdc202xx_chipsets[idx];
diff --git a/drivers/ide/pci/piix.c b/drivers/ide/pci/piix.c
index ec0c6e96a213..9329d4a810e5 100644
--- a/drivers/ide/pci/piix.c
+++ b/drivers/ide/pci/piix.c
@@ -396,7 +396,7 @@ static void __devinit init_hwif_ich(ide_hwif_t *hwif)
                 .udma_mask      = udma, \
         }
 
-static ide_pci_device_t piix_pci_info[] __devinitdata = {
+static const struct ide_port_info piix_pci_info[] __devinitdata = {
         /*  0 */ DECLARE_PIIX_DEV("PIIXa",      0x00),  /* no udma */
         /*  1 */ DECLARE_PIIX_DEV("PIIXb",      0x00),  /* no udma */
 
@@ -449,9 +449,7 @@ static ide_pci_device_t piix_pci_info[] __devinitdata = {
  
 static int __devinit piix_init_one(struct pci_dev *dev, const struct pci_device_id *id)
 {
-        ide_pci_device_t *d = &piix_pci_info[id->driver_data];
-
-        return ide_setup_pci_device(dev, d);
+        return ide_setup_pci_device(dev, &piix_pci_info[id->driver_data]);
 }
 
 /**
diff --git a/drivers/ide/pci/rz1000.c b/drivers/ide/pci/rz1000.c
index dd2583ef1ad7..6b10ae260fa2 100644
--- a/drivers/ide/pci/rz1000.c
+++ b/drivers/ide/pci/rz1000.c
@@ -35,13 +35,13 @@ static void __devinit init_hwif_rz1000 (ide_hwif_t *hwif)
         u16 reg;
         struct pci_dev *dev = hwif->pci_dev;
 
-        hwif->chipset = ide_rz1000;
         if (!pci_read_config_word (dev, 0x40, &reg) &&
             !pci_write_config_word(dev, 0x40, reg & 0xdfff)) {
                 printk(KERN_INFO "%s: disabled chipset read-ahead "
                         "(buggy RZ1000/RZ1001)\n", hwif->name);
         } else {
-                hwif->serialized = 1;
+                if (hwif->mate)
+                        hwif->mate->serialized = hwif->serialized = 1;
                 hwif->drives[0].no_unmask = 1;
                 hwif->drives[1].no_unmask = 1;
                 printk(KERN_INFO "%s: serialized, disabled unmasking "
@@ -49,9 +49,10 @@ static void __devinit init_hwif_rz1000 (ide_hwif_t *hwif)
         }
 }
 
-static ide_pci_device_t rz1000_chipset __devinitdata = {
+static const struct ide_port_info rz1000_chipset __devinitdata = {
         .name           = "RZ100x",
         .init_hwif      = init_hwif_rz1000,
+        .chipset        = ide_rz1000,
         .host_flags     = IDE_HFLAG_NO_DMA | IDE_HFLAG_BOOTABLE,
 };
 
diff --git a/drivers/ide/pci/sc1200.c b/drivers/ide/pci/sc1200.c
index b2423e03bf36..d2c8b5524f28 100644
--- a/drivers/ide/pci/sc1200.c
+++ b/drivers/ide/pci/sc1200.c
@@ -372,7 +372,7 @@ static void __devinit init_hwif_sc1200 (ide_hwif_t *hwif)
         hwif->ide_dma_end   = &sc1200_ide_dma_end;
 }
 
-static ide_pci_device_t sc1200_chipset __devinitdata = {
+static const struct ide_port_info sc1200_chipset __devinitdata = {
         .name           = "SC1200",
         .init_hwif      = init_hwif_sc1200,
         .host_flags     = IDE_HFLAG_SERIALIZE |
diff --git a/drivers/ide/pci/scc_pata.c b/drivers/ide/pci/scc_pata.c
index ae9b50331d2a..ebb7132b9b84 100644
--- a/drivers/ide/pci/scc_pata.c
+++ b/drivers/ide/pci/scc_pata.c
@@ -538,12 +538,13 @@ static int setup_mmio_scc (struct pci_dev *dev, const char *name)
 /**
  *      init_setup_scc  -       set up an SCC PATA Controller
  *      @dev: PCI device
- *      @d: IDE PCI device
+ *      @d: IDE port info
  *
  *      Perform the initial set up for this device.
  */
 
-static int __devinit init_setup_scc(struct pci_dev *dev, ide_pci_device_t *d)
+static int __devinit init_setup_scc(struct pci_dev *dev,
+                                    const struct ide_port_info *d)
 {
         unsigned long ctl_base;
         unsigned long dma_base;
@@ -702,7 +703,7 @@ static void __devinit init_hwif_scc(ide_hwif_t *hwif)
       .pio_mask         = ATA_PIO4,                     \
   }
 
-static ide_pci_device_t scc_chipsets[] __devinitdata = {
+static const struct ide_port_info scc_chipsets[] __devinitdata = {
         /* 0 */ DECLARE_SCC_DEV("sccIDE"),
 };
 
@@ -717,9 +718,7 @@ static ide_pci_device_t scc_chipsets[] __devinitdata = {
 
 static int __devinit scc_init_one(struct pci_dev *dev, const struct pci_device_id *id)
 {
-        ide_pci_device_t *d = &scc_chipsets[id->driver_data];
-
-        return init_setup_scc(dev, d);
+        return init_setup_scc(dev, &scc_chipsets[id->driver_data]);
 }
 
 /**
diff --git a/drivers/ide/pci/serverworks.c b/drivers/ide/pci/serverworks.c
index a3d880e21d0b..a7280311357b 100644
--- a/drivers/ide/pci/serverworks.c
+++ b/drivers/ide/pci/serverworks.c
@@ -158,13 +158,6 @@ static void svwks_set_dma_mode(ide_drive_t *drive, const u8 speed)
 
         u8 ultra_enable  = 0, ultra_timing = 0, dma_timing = 0;
 
-        /* If we are about to put a disk into UDMA mode we screwed up.
-           Our code assumes we never _ever_ do this on an OSB4 */
-           
-        if(dev->device == PCI_DEVICE_ID_SERVERWORKS_OSB4 &&
-                drive->media == ide_disk && speed >= XFER_UDMA_0)
-                        BUG();
-
         pci_read_config_byte(dev, (0x56|hwif->channel), &ultra_timing);
         pci_read_config_byte(dev, 0x54, &ultra_enable);
 
@@ -373,7 +366,7 @@ static void __devinit init_hwif_svwks (ide_hwif_t *hwif)
         }
 }
 
-static ide_pci_device_t serverworks_chipsets[] __devinitdata = {
+static const struct ide_port_info serverworks_chipsets[] __devinitdata = {
         {       /* 0 */
                 .name           = "SvrWks OSB4",
                 .init_chipset   = init_chipset_svwks,
@@ -430,7 +423,7 @@ static ide_pci_device_t serverworks_chipsets[] __devinitdata = {
  
 static int __devinit svwks_init_one(struct pci_dev *dev, const struct pci_device_id *id)
 {
-        ide_pci_device_t d;
+        struct ide_port_info d;
         u8 idx = id->driver_data;
 
         d = serverworks_chipsets[idx];
diff --git a/drivers/ide/pci/sgiioc4.c b/drivers/ide/pci/sgiioc4.c
index 5af74ea1d46e..de820aa58cd0 100644
--- a/drivers/ide/pci/sgiioc4.c
+++ b/drivers/ide/pci/sgiioc4.c
@@ -614,6 +614,7 @@ sgiioc4_ide_setup_pci_device(struct pci_dev *dev)
         void __iomem *virt_base;
         ide_hwif_t *hwif;
         int h;
+        u8 idx[4] = { 0xff, 0xff, 0xff, 0xff };
 
         /*
          * Find an empty HWIF; if none available, return -ENOMEM.
@@ -654,10 +655,12 @@ sgiioc4_ide_setup_pci_device(struct pci_dev *dev)
         }
 
         if (hwif->io_ports[IDE_DATA_OFFSET] != cmd_base) {
+                hw_regs_t hw;
+
                 /* Initialize the IO registers */
-                sgiioc4_init_hwif_ports(&hwif->hw, cmd_base, ctl, irqport);
-                memcpy(hwif->io_ports, hwif->hw.io_ports,
-                       sizeof (hwif->io_ports));
+                memset(&hw, 0, sizeof(hw));
+                sgiioc4_init_hwif_ports(&hw, cmd_base, ctl, irqport);
+                memcpy(hwif->io_ports, hw.io_ports, sizeof(hwif->io_ports));
                 hwif->noprobe = !hwif->io_ports[IDE_DATA_OFFSET];
         }
 
@@ -679,11 +682,10 @@ sgiioc4_ide_setup_pci_device(struct pci_dev *dev)
 
         ide_init_sgiioc4(hwif);
 
-        if (probe_hwif_init(hwif))
-                return -EIO;
+        idx[0] = hwif->index;
 
-        /* Create /proc/ide entries */
-        ide_proc_register_port(hwif);
+        if (ide_device_add(idx))
+                return -EIO;
 
         return 0;
 }
diff --git a/drivers/ide/pci/siimage.c b/drivers/ide/pci/siimage.c
index 689786df1ede..dc915cb22bec 100644
--- a/drivers/ide/pci/siimage.c
+++ b/drivers/ide/pci/siimage.c
@@ -1,5 +1,5 @@
 /*
- * linux/drivers/ide/pci/siimage.c              Version 1.17    Oct 18 2007
+ * linux/drivers/ide/pci/siimage.c              Version 1.18    Oct 18 2007
  *
  * Copyright (C) 2001-2002      Andre Hedrick <andre@linux-ide.org>
  * Copyright (C) 2003           Red Hat <alan@redhat.com>
@@ -57,8 +57,8 @@
  
 static int pdev_is_sata(struct pci_dev *pdev)
 {
-        switch(pdev->device)
-        {
+#ifdef CONFIG_BLK_DEV_IDE_SATA
+        switch(pdev->device) {
                 case PCI_DEVICE_ID_SII_3112:
                 case PCI_DEVICE_ID_SII_1210SA:
                         return 1;
@@ -66,9 +66,10 @@ static int pdev_is_sata(struct pci_dev *pdev)
                         return 0;
         }
         BUG();
+#endif
         return 0;
 }
- 
+
 /**
  *      is_sata                 -       check if hwif is SATA
  *      @hwif:  interface to check
@@ -136,7 +137,7 @@ static inline unsigned long siimage_seldev(ide_drive_t *drive, int r)
  *      SI3112 SATA controller life is a bit simpler.
  */
 
-static u8 sil_udma_filter(ide_drive_t *drive)
+static u8 sil_pata_udma_filter(ide_drive_t *drive)
 {
         ide_hwif_t *hwif = drive->hwif;
         unsigned long base = (unsigned long) hwif->hwif_data;
@@ -147,23 +148,23 @@ static u8 sil_udma_filter(ide_drive_t *drive)
         else
                 pci_read_config_byte(hwif->pci_dev, 0x8A, &scsc);
 
-        if (is_sata(hwif)) {
-                mask = strstr(drive->id->model, "Maxtor") ? 0x3f : 0x7f;
-                goto out;
-        }
-
         if ((scsc & 0x30) == 0x10)      /* 133 */
-                mask = 0x7f;
+                mask = ATA_UDMA6;
         else if ((scsc & 0x30) == 0x20) /* 2xPCI */
-                mask = 0x7f;
+                mask = ATA_UDMA6;
         else if ((scsc & 0x30) == 0x00) /* 100 */
-                mask = 0x3f;
+                mask = ATA_UDMA5;
         else    /* Disabled ? */
                 BUG();
-out:
+
         return mask;
 }
 
+static u8 sil_sata_udma_filter(ide_drive_t *drive)
+{
+        return strstr(drive->id->model, "Maxtor") ? ATA_UDMA5 : ATA_UDMA6;
+}
+
 /**
  *      sil_set_pio_mode        -       set host controller for PIO mode
  *      @drive: drive
@@ -340,10 +341,11 @@ static int siimage_io_ide_dma_test_irq (ide_drive_t *drive)
 static int siimage_mmio_ide_dma_test_irq (ide_drive_t *drive)
 {
         ide_hwif_t *hwif        = HWIF(drive);
-        unsigned long base      = (unsigned long)hwif->hwif_data;
         unsigned long addr      = siimage_selreg(hwif, 0x1);
 
         if (SATA_ERROR_REG) {
+                unsigned long base = (unsigned long)hwif->hwif_data;
+
                 u32 ext_stat = readl((void __iomem *)(base + 0x10));
                 u8 watchdog = 0;
                 if (ext_stat & ((hwif->channel) ? 0x40 : 0x10)) {
@@ -376,7 +378,7 @@ static int siimage_mmio_ide_dma_test_irq (ide_drive_t *drive)
 }
 
 /**
- *      siimage_busproc         -       bus isolation ioctl
+ *      sil_sata_busproc        -       bus isolation IOCTL
  *      @drive: drive to isolate/restore
  *      @state: bus state to set
  *
@@ -384,8 +386,8 @@ static int siimage_mmio_ide_dma_test_irq (ide_drive_t *drive)
  *      SATA controller the work required is quite limited, we 
  *      just have to clean up the statistics
  */
- 
-static int siimage_busproc (ide_drive_t * drive, int state)
+
+static int sil_sata_busproc(ide_drive_t * drive, int state)
 {
         ide_hwif_t *hwif        = HWIF(drive);
         u32 stat_config         = 0;
@@ -417,14 +419,14 @@ static int siimage_busproc (ide_drive_t * drive, int state)
 }
 
 /**
- *      siimage_reset_poll      -       wait for sata reset
+ *      sil_sata_reset_poll     -       wait for SATA reset
  *      @drive: drive we are resetting
  *
  *      Poll the SATA phy and see whether it has come back from the dead
  *      yet.
  */
- 
-static int siimage_reset_poll (ide_drive_t *drive)
+
+static int sil_sata_reset_poll(ide_drive_t *drive)
 {
         if (SATA_STATUS_REG) {
                 ide_hwif_t *hwif        = HWIF(drive);
@@ -436,27 +438,22 @@ static int siimage_reset_poll (ide_drive_t *drive)
                         HWGROUP(drive)->polling = 0;
                         return ide_started;
                 }
-                return 0;
-        } else {
-                return 0;
         }
+
+        return 0;
 }
 
 /**
- *      siimage_pre_reset       -       reset hook
+ *      sil_sata_pre_reset      -       reset hook
  *      @drive: IDE device being reset
  *
  *      For the SATA devices we need to handle recalibration/geometry
  *      differently
  */
- 
-static void siimage_pre_reset (ide_drive_t *drive)
-{
-        if (drive->media != ide_disk)
-                return;
 
-        if (is_sata(HWIF(drive)))
-        {
+static void sil_sata_pre_reset(ide_drive_t *drive)
+{
+        if (drive->media == ide_disk) {
                 drive->special.b.set_geometry = 0;
                 drive->special.b.recalibrate = 0;
         }
@@ -502,7 +499,6 @@ static void siimage_reset (ide_drive_t *drive)
                         drive->failures++;
                 }
         }
-
 }
 
 /**
@@ -758,16 +754,11 @@ static void __devinit init_mmio_iops_siimage(ide_hwif_t *hwif)
                 hwif->sata_misc[SATA_IEN_OFFSET]        = base + 0x148;
         }
 
-        hw.irq                          = hwif->pci_dev->irq;
+        memcpy(hwif->io_ports, hw.io_ports, sizeof(hwif->io_ports));
 
-        memcpy(&hwif->hw, &hw, sizeof(hw));
-        memcpy(hwif->io_ports, hwif->hw.io_ports, sizeof(hwif->hw.io_ports));
+        hwif->irq = dev->irq;
 
-        hwif->irq                       = hw.irq;
-
-        base = (unsigned long) addr;
-
-        hwif->dma_base                  = base + (ch ? 0x08 : 0x00);
+        hwif->dma_base = (unsigned long)addr + (ch ? 0x08 : 0x00);
 
         hwif->mmio = 1;
 }
@@ -864,28 +855,31 @@ static u8 __devinit ata66_siimage(ide_hwif_t *hwif)
 
 static void __devinit init_hwif_siimage(ide_hwif_t *hwif)
 {
+        u8 sata = is_sata(hwif);
+
         hwif->resetproc = &siimage_reset;
         hwif->set_pio_mode = &sil_set_pio_mode;
         hwif->set_dma_mode = &sil_set_dma_mode;
-        hwif->reset_poll = &siimage_reset_poll;
-        hwif->pre_reset = &siimage_pre_reset;
-        hwif->udma_filter = &sil_udma_filter;
 
-        if(is_sata(hwif)) {
+        if (sata) {
                 static int first = 1;
 
-                hwif->busproc   = &siimage_busproc;
+                hwif->busproc = &sil_sata_busproc;
+                hwif->reset_poll = &sil_sata_reset_poll;
+                hwif->pre_reset = &sil_sata_pre_reset;
+                hwif->udma_filter = &sil_sata_udma_filter;
 
                 if (first) {
                         printk(KERN_INFO "siimage: For full SATA support you should use the libata sata_sil module.\n");
                         first = 0;
                 }
-        }
+        } else
+                hwif->udma_filter = &sil_pata_udma_filter;
 
         if (hwif->dma_base == 0)
                 return;
 
-        if (is_sata(hwif))
+        if (sata)
                 hwif->host_flags |= IDE_HFLAG_NO_ATAPI_DMA;
 
         if (hwif->cbl != ATA_CBL_PATA40_SHORT)
@@ -911,7 +905,7 @@ static void __devinit init_hwif_siimage(ide_hwif_t *hwif)
                 .udma_mask      = ATA_UDMA6,            \
         }
 
-static ide_pci_device_t siimage_chipsets[] __devinitdata = {
+static const struct ide_port_info siimage_chipsets[] __devinitdata = {
         /* 0 */ DECLARE_SII_DEV("SiI680"),
         /* 1 */ DECLARE_SII_DEV("SiI3112 Serial ATA"),
         /* 2 */ DECLARE_SII_DEV("Adaptec AAR-1210SA")
diff --git a/drivers/ide/pci/sis5513.c b/drivers/ide/pci/sis5513.c
index c1d280b06391..6b7bb53acefd 100644
--- a/drivers/ide/pci/sis5513.c
+++ b/drivers/ide/pci/sis5513.c
@@ -264,7 +264,7 @@ static void sis_ata133_program_timings(ide_drive_t *drive, const u8 mode)
         if (mode >= XFER_MW_DMA_0) {
                 t1 &= ~0x04;    /* disable UDMA */
                 idx = mode - XFER_MW_DMA_0 + 5;
-        }
+        } else
                 idx = mode - XFER_PIO_0;
         t1 |= ini_time_value[clk][idx] << 12;
         t1 |= act_time_value[clk][idx] << 16;
@@ -579,7 +579,7 @@ static void __devinit init_hwif_sis5513 (ide_hwif_t *hwif)
                 hwif->cbl = ata66_sis5513(hwif);
 }
 
-static ide_pci_device_t sis5513_chipset __devinitdata = {
+static const struct ide_port_info sis5513_chipset __devinitdata = {
         .name           = "SIS5513",
         .init_chipset   = init_chipset_sis5513,
         .init_hwif      = init_hwif_sis5513,
diff --git a/drivers/ide/pci/sl82c105.c b/drivers/ide/pci/sl82c105.c
index 0dce459b1269..147d783f7529 100644
--- a/drivers/ide/pci/sl82c105.c
+++ b/drivers/ide/pci/sl82c105.c
@@ -361,13 +361,6 @@ static void __devinit init_hwif_sl82c105(ide_hwif_t *hwif)
         hwif->selectproc        = &sl82c105_selectproc;
         hwif->resetproc         = &sl82c105_resetproc;
 
-        /*
-         * We support 32-bit I/O on this interface, and
-         * it doesn't have problems with interrupts.
-         */
-        hwif->drives[0].io_32bit = hwif->drives[1].io_32bit = 1;
-        hwif->drives[0].unmask   = hwif->drives[1].unmask   = 1;
-
         if (!hwif->dma_base)
                 return;
 
@@ -394,12 +387,15 @@ static void __devinit init_hwif_sl82c105(ide_hwif_t *hwif)
                 hwif->serialized = hwif->mate->serialized = 1;
 }
 
-static ide_pci_device_t sl82c105_chipset __devinitdata = {
+static const struct ide_port_info sl82c105_chipset __devinitdata = {
         .name           = "W82C105",
         .init_chipset   = init_chipset_sl82c105,
         .init_hwif      = init_hwif_sl82c105,
         .enablebits     = {{0x40,0x01,0x01}, {0x40,0x10,0x10}},
-        .host_flags     = IDE_HFLAG_NO_AUTODMA | IDE_HFLAG_BOOTABLE,
+        .host_flags     = IDE_HFLAG_IO_32BIT |
+                          IDE_HFLAG_UNMASK_IRQS |
+                          IDE_HFLAG_NO_AUTODMA |
+                          IDE_HFLAG_BOOTABLE,
         .pio_mask       = ATA_PIO5,
 };
 
diff --git a/drivers/ide/pci/slc90e66.c b/drivers/ide/pci/slc90e66.c
index 4f22dffdf8ef..eb4445b229ed 100644
--- a/drivers/ide/pci/slc90e66.c
+++ b/drivers/ide/pci/slc90e66.c
@@ -1,5 +1,5 @@
 /*
- *  linux/drivers/ide/pci/slc90e66.c    Version 0.18    Aug 9, 2007
+ *  linux/drivers/ide/pci/slc90e66.c    Version 0.19    Sep 24, 2007
  *
  *  Copyright (C) 2000-2002 Andre Hedrick <andre@linux-ide.org>
  *  Copyright (C) 2006-2007 MontaVista Software, Inc. <source@mvista.com>
@@ -21,6 +21,8 @@
 
 #include <asm/io.h>
 
+static DEFINE_SPINLOCK(slc90e66_lock);
+
 static void slc90e66_set_pio_mode(ide_drive_t *drive, const u8 pio)
 {
         ide_hwif_t *hwif        = HWIF(drive);
@@ -40,7 +42,7 @@ static void slc90e66_set_pio_mode(ide_drive_t *drive, const u8 pio)
                                         { 2, 1 },
                                         { 2, 3 }, };
 
-        spin_lock_irqsave(&ide_lock, flags);
+        spin_lock_irqsave(&slc90e66_lock, flags);
         pci_read_config_word(dev, master_port, &master_data);
 
         if (pio > 1)
@@ -71,7 +73,7 @@ static void slc90e66_set_pio_mode(ide_drive_t *drive, const u8 pio)
         pci_write_config_word(dev, master_port, master_data);
         if (is_slave)
                 pci_write_config_byte(dev, slave_port, slave_data);
-        spin_unlock_irqrestore(&ide_lock, flags);
+        spin_unlock_irqrestore(&slc90e66_lock, flags);
 }
 
 static void slc90e66_set_dma_mode(ide_drive_t *drive, const u8 speed)
@@ -146,7 +148,7 @@ static void __devinit init_hwif_slc90e66 (ide_hwif_t *hwif)
                 hwif->cbl = (reg47 & mask) ? ATA_CBL_PATA40 : ATA_CBL_PATA80;
 }
 
-static ide_pci_device_t slc90e66_chipset __devinitdata = {
+static const struct ide_port_info slc90e66_chipset __devinitdata = {
         .name           = "SLC90E66",
         .init_hwif      = init_hwif_slc90e66,
         .enablebits     = {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
diff --git a/drivers/ide/pci/tc86c001.c b/drivers/ide/pci/tc86c001.c
index 631506e9b5d2..a66ebd14664e 100644
--- a/drivers/ide/pci/tc86c001.c
+++ b/drivers/ide/pci/tc86c001.c
@@ -218,7 +218,7 @@ static unsigned int __devinit init_chipset_tc86c001(struct pci_dev *dev,
         return err;
 }
 
-static ide_pci_device_t tc86c001_chipset __devinitdata = {
+static const struct ide_port_info tc86c001_chipset __devinitdata = {
         .name           = "TC86C001",
         .init_chipset   = init_chipset_tc86c001,
         .init_hwif      = init_hwif_tc86c001,
diff --git a/drivers/ide/pci/triflex.c b/drivers/ide/pci/triflex.c
index 30b52f62699a..a227c41d23a3 100644
--- a/drivers/ide/pci/triflex.c
+++ b/drivers/ide/pci/triflex.c
@@ -102,7 +102,7 @@ static void __devinit init_hwif_triflex(ide_hwif_t *hwif)
         hwif->set_dma_mode = &triflex_set_mode;
 }
 
-static ide_pci_device_t triflex_device __devinitdata = {
+static const struct ide_port_info triflex_device __devinitdata = {
         .name           = "TRIFLEX",
         .init_hwif      = init_hwif_triflex,
         .enablebits     = {{0x80, 0x01, 0x01}, {0x80, 0x02, 0x02}},
diff --git a/drivers/ide/pci/trm290.c b/drivers/ide/pci/trm290.c
index 140d486f6237..5011ba22e36c 100644
--- a/drivers/ide/pci/trm290.c
+++ b/drivers/ide/pci/trm290.c
@@ -250,7 +250,6 @@ static void __devinit init_hwif_trm290(ide_hwif_t *hwif)
         u8 reg = 0;
         struct pci_dev *dev = hwif->pci_dev;
 
-        hwif->chipset = ide_trm290;
         cfgbase = pci_resource_start(dev, 4);
         if ((dev->class & 5) && cfgbase) {
                 hwif->config_data = cfgbase;
@@ -320,9 +319,10 @@ static void __devinit init_hwif_trm290(ide_hwif_t *hwif)
 #endif
 }
 
-static ide_pci_device_t trm290_chipset __devinitdata = {
+static const struct ide_port_info trm290_chipset __devinitdata = {
         .name           = "TRM290",
         .init_hwif      = init_hwif_trm290,
+        .chipset        = ide_trm290,
         .host_flags     = IDE_HFLAG_NO_ATAPI_DMA |
 #if 0 /* play it safe for now */
                           IDE_HFLAG_TRUST_BIOS_FOR_DMA |
diff --git a/drivers/ide/pci/via82cxxx.c b/drivers/ide/pci/via82cxxx.c
index c8022a92a0e3..a0d3c16b68ec 100644
--- a/drivers/ide/pci/via82cxxx.c
+++ b/drivers/ide/pci/via82cxxx.c
@@ -1,6 +1,6 @@
 /*
  *
- * Version 3.49
+ * Version 3.50
  *
  * VIA IDE driver for Linux. Supported southbridges:
  *
@@ -422,65 +422,40 @@ static u8 __devinit via82cxxx_cable_detect(ide_hwif_t *hwif)
 
 static void __devinit init_hwif_via82cxxx(ide_hwif_t *hwif)
 {
-        struct via82cxxx_dev *vdev = pci_get_drvdata(hwif->pci_dev);
-        int i;
-
         hwif->set_pio_mode = &via_set_pio_mode;
         hwif->set_dma_mode = &via_set_drive;
 
-#ifdef CONFIG_PPC_CHRP
-        if(machine_is(chrp) && _chrp_type == _CHRP_Pegasos) {
-                hwif->irq = hwif->channel ? 15 : 14;
-        }
-#endif
-
-        for (i = 0; i < 2; i++) {
-                hwif->drives[i].io_32bit = 1;
-                hwif->drives[i].unmask = (vdev->via_config->flags & VIA_NO_UNMASK) ? 0 : 1;
-        }
-
         if (!hwif->dma_base)
                 return;
 
-        hwif->ultra_mask = vdev->via_config->udma_mask;
-
         if (hwif->cbl != ATA_CBL_PATA40_SHORT)
                 hwif->cbl = via82cxxx_cable_detect(hwif);
 }
 
-static ide_pci_device_t via82cxxx_chipsets[] __devinitdata = {
-        {       /* 0 */
-                .name           = "VP_IDE",
-                .init_chipset   = init_chipset_via82cxxx,
-                .init_hwif      = init_hwif_via82cxxx,
-                .enablebits     = {{0x40,0x02,0x02}, {0x40,0x01,0x01}},
-                .host_flags     = IDE_HFLAG_PIO_NO_BLACKLIST |
-                                  IDE_HFLAG_PIO_NO_DOWNGRADE |
-                                  IDE_HFLAG_POST_SET_MODE |
-                                  IDE_HFLAG_NO_AUTODMA |
-                                  IDE_HFLAG_BOOTABLE,
-                .pio_mask       = ATA_PIO5,
-                .swdma_mask     = ATA_SWDMA2,
-                .mwdma_mask     = ATA_MWDMA2,
-        },{     /* 1 */
-                .name           = "VP_IDE",
-                .init_chipset   = init_chipset_via82cxxx,
-                .init_hwif      = init_hwif_via82cxxx,
-                .enablebits     = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
-                .host_flags     = IDE_HFLAG_PIO_NO_BLACKLIST |
-                                  IDE_HFLAG_PIO_NO_DOWNGRADE |
-                                  IDE_HFLAG_POST_SET_MODE |
-                                  IDE_HFLAG_BOOTABLE,
-                .pio_mask       = ATA_PIO5,
-                .swdma_mask     = ATA_SWDMA2,
-                .mwdma_mask     = ATA_MWDMA2,
-        }
+static const struct ide_port_info via82cxxx_chipset __devinitdata = {
+        .name           = "VP_IDE",
+        .init_chipset   = init_chipset_via82cxxx,
+        .init_hwif      = init_hwif_via82cxxx,
+        .enablebits     = { { 0x40, 0x02, 0x02 }, { 0x40, 0x01, 0x01 } },
+        .host_flags     = IDE_HFLAG_PIO_NO_BLACKLIST |
+                          IDE_HFLAG_PIO_NO_DOWNGRADE |
+                          IDE_HFLAG_POST_SET_MODE |
+                          IDE_HFLAG_IO_32BIT |
+                          IDE_HFLAG_BOOTABLE,
+        .pio_mask       = ATA_PIO5,
+        .swdma_mask     = ATA_SWDMA2,
+        .mwdma_mask     = ATA_MWDMA2,
 };
 
 static int __devinit via_init_one(struct pci_dev *dev, const struct pci_device_id *id)
 {
         struct pci_dev *isa = NULL;
         struct via_isa_bridge *via_config;
+        u8 idx = id->driver_data;
+        struct ide_port_info d;
+
+        d = via82cxxx_chipset;
+
         /*
          * Find the ISA bridge and check we know what it is.
          */
@@ -490,7 +465,23 @@ static int __devinit via_init_one(struct pci_dev *dev, const struct pci_device_i
                 printk(KERN_WARNING "VP_IDE: Unknown VIA SouthBridge, disabling DMA.\n");
                 return -ENODEV;
         }
-        return ide_setup_pci_device(dev, &via82cxxx_chipsets[id->driver_data]);
+
+        if (idx == 0)
+                d.host_flags |= IDE_HFLAG_NO_AUTODMA;
+        else
+                d.enablebits[1].reg = d.enablebits[0].reg = 0;
+
+        if ((via_config->flags & VIA_NO_UNMASK) == 0)
+                d.host_flags |= IDE_HFLAG_UNMASK_IRQS;
+
+#ifdef CONFIG_PPC_CHRP
+        if (machine_is(chrp) && _chrp_type == _CHRP_Pegasos)
+                d.host_flags |= IDE_HFLAG_FORCE_LEGACY_IRQS;
+#endif
+
+        d.udma_mask = via_config->udma_mask;
+
+        return ide_setup_pci_device(dev, &d);
 }
 
 static const struct pci_device_id via_pci_tbl[] = {
diff --git a/drivers/ide/ppc/mpc8xx.c b/drivers/ide/ppc/mpc8xx.c
index df2e92034f5d..5f0da35ab5ad 100644
--- a/drivers/ide/ppc/mpc8xx.c
+++ b/drivers/ide/ppc/mpc8xx.c
@@ -316,8 +316,8 @@ m8xx_ide_init_hwif_ports(hw_regs_t *hw, unsigned long data_port,
 
         ide_hwifs[data_port].pio_mask = ATA_PIO4;
         ide_hwifs[data_port].set_pio_mode = m8xx_ide_set_pio_mode;
+        ide_hwifs[data_port].ack_intr = (ide_ack_intr_t *)ide_interrupt_ack;
 
-        hw->ack_intr = (ide_ack_intr_t *) ide_interrupt_ack;
         /* Enable Harddisk Interrupt,
          * and make it edge sensitive
          */
@@ -402,8 +402,8 @@ void m8xx_ide_init_hwif_ports (hw_regs_t *hw,
 
         ide_hwifs[data_port].pio_mask = ATA_PIO4;
         ide_hwifs[data_port].set_pio_mode = m8xx_ide_set_pio_mode;
+        ide_hwifs[data_port].ack_intr = (ide_ack_intr_t *)ide_interrupt_ack;
 
-        hw->ack_intr = (ide_ack_intr_t *) ide_interrupt_ack;
         /* Enable Harddisk Interrupt,
          * and make it edge sensitive
          */
diff --git a/drivers/ide/ppc/pmac.c b/drivers/ide/ppc/pmac.c
index c55479356768..816b5311dad6 100644
--- a/drivers/ide/ppc/pmac.c
+++ b/drivers/ide/ppc/pmac.c
@@ -1039,6 +1039,8 @@ pmac_ide_setup_device(pmac_ide_hwif_t *pmif, ide_hwif_t *hwif)
 {
         struct device_node *np = pmif->node;
         const int *bidp;
+        u8 idx[4] = { 0xff, 0xff, 0xff, 0xff };
+        hw_regs_t hw;
 
         pmif->cable_80 = 0;
         pmif->broken_dma = pmif->broken_dma_warn = 0;
@@ -1124,8 +1126,9 @@ pmac_ide_setup_device(pmac_ide_hwif_t *pmif, ide_hwif_t *hwif)
         /* Tell common code _not_ to mess with resources */
         hwif->mmio = 1;
         hwif->hwif_data = pmif;
-        pmac_ide_init_hwif_ports(&hwif->hw, pmif->regbase, 0, &hwif->irq);
-        memcpy(hwif->io_ports, hwif->hw.io_ports, sizeof(hwif->io_ports));
+        memset(&hw, 0, sizeof(hw));
+        pmac_ide_init_hwif_ports(&hw, pmif->regbase, 0, &hwif->irq);
+        memcpy(hwif->io_ports, hw.io_ports, sizeof(hwif->io_ports));
         hwif->chipset = ide_pmac;
         hwif->noprobe = !hwif->io_ports[IDE_DATA_OFFSET] || pmif->mediabay;
         hwif->hold = pmif->mediabay;
@@ -1163,10 +1166,9 @@ pmac_ide_setup_device(pmac_ide_hwif_t *pmif, ide_hwif_t *hwif)
                 pmac_ide_setup_dma(pmif, hwif);
 #endif /* CONFIG_BLK_DEV_IDEDMA_PMAC */
 
-        /* We probe the hwif now */
-        probe_hwif_init(hwif);
+        idx[0] = hwif->index;
 
-        ide_proc_register_port(hwif);
+        ide_device_add(idx);
 
         return 0;
 }
diff --git a/drivers/ide/setup-pci.c b/drivers/ide/setup-pci.c
index fff567bcedbe..02d14bf85ab2 100644
--- a/drivers/ide/setup-pci.c
+++ b/drivers/ide/setup-pci.c
@@ -147,15 +147,15 @@ static int ide_setup_pci_baseregs (struct pci_dev *dev, const char *name)
 #ifdef CONFIG_BLK_DEV_IDEDMA_PCI
 /**
  *      ide_get_or_set_dma_base         -       setup BMIBA
- *      @d: IDE pci device data
- *      @hwif: Interface
+ *      @d: IDE port info
+ *      @hwif: IDE interface
  *
  *      Fetch the DMA Bus-Master-I/O-Base-Address (BMIBA) from PCI space.
  *      Where a device has a partner that is already in DMA mode we check
  *      and enforce IDE simplex rules.
  */
 
-static unsigned long ide_get_or_set_dma_base(ide_pci_device_t *d, ide_hwif_t *hwif)
+static unsigned long ide_get_or_set_dma_base(const struct ide_port_info *d, ide_hwif_t *hwif)
 {
         unsigned long   dma_base = 0;
         struct pci_dev  *dev = hwif->pci_dev;
@@ -225,10 +225,11 @@ static unsigned long ide_get_or_set_dma_base(ide_pci_device_t *d, ide_hwif_t *hw
 }
 #endif /* CONFIG_BLK_DEV_IDEDMA_PCI */
 
-void ide_setup_pci_noise (struct pci_dev *dev, ide_pci_device_t *d)
+void ide_setup_pci_noise(struct pci_dev *dev, const struct ide_port_info *d)
 {
-        printk(KERN_INFO "%s: IDE controller at PCI slot %s\n",
-                         d->name, pci_name(dev));
+        printk(KERN_INFO "%s: IDE controller (0x%04x:0x%04x rev 0x%02x) at "
+                         " PCI slot %s\n", d->name, dev->vendor, dev->device,
+                         dev->revision, pci_name(dev));
 }
 
 EXPORT_SYMBOL_GPL(ide_setup_pci_noise);
@@ -237,15 +238,15 @@ EXPORT_SYMBOL_GPL(ide_setup_pci_noise);
 /**
  *      ide_pci_enable  -       do PCI enables
  *      @dev: PCI device
- *      @d: IDE pci device data
+ *      @d: IDE port info
  *
  *      Enable the IDE PCI device. We attempt to enable the device in full
  *      but if that fails then we only need BAR4 so we will enable that.
  *      
  *      Returns zero on success or an error code
  */
- 
-static int ide_pci_enable(struct pci_dev *dev, ide_pci_device_t *d)
+
+static int ide_pci_enable(struct pci_dev *dev, const struct ide_port_info *d)
 {
         int ret;
 
@@ -260,9 +261,9 @@ static int ide_pci_enable(struct pci_dev *dev, ide_pci_device_t *d)
         }
 
         /*
-         * assume all devices can do 32-bit dma for now. we can add a
-         * dma mask field to the ide_pci_device_t if we need it (or let
-         * lower level driver set the dma mask)
+         * assume all devices can do 32-bit DMA for now, we can add
+         * a DMA mask field to the struct ide_port_info if we need it
+         * (or let lower level driver set the DMA mask)
          */
         ret = pci_set_dma_mask(dev, DMA_32BIT_MASK);
         if (ret < 0) {
@@ -284,13 +285,13 @@ out:
 /**
  *      ide_pci_configure       -       configure an unconfigured device
  *      @dev: PCI device
- *      @d: IDE pci device data
+ *      @d: IDE port info
  *
  *      Enable and configure the PCI device we have been passed.
  *      Returns zero on success or an error code.
  */
- 
-static int ide_pci_configure(struct pci_dev *dev, ide_pci_device_t *d)
+
+static int ide_pci_configure(struct pci_dev *dev, const struct ide_port_info *d)
 {
         u16 pcicmd = 0;
         /*
@@ -318,15 +319,15 @@ static int ide_pci_configure(struct pci_dev *dev, ide_pci_device_t *d)
 
 /**
  *      ide_pci_check_iomem     -       check a register is I/O
- *      @dev: pci device
- *      @d: ide_pci_device
- *      @bar: bar number
+ *      @dev: PCI device
+ *      @d: IDE port info
+ *      @bar: BAR number
  *
  *      Checks if a BAR is configured and points to MMIO space. If so
  *      print an error and return an error code. Otherwise return 0
  */
- 
-static int ide_pci_check_iomem(struct pci_dev *dev, ide_pci_device_t *d, int bar)
+
+static int ide_pci_check_iomem(struct pci_dev *dev, const struct ide_port_info *d, int bar)
 {
         ulong flags = pci_resource_flags(dev, bar);
         
@@ -348,7 +349,7 @@ static int ide_pci_check_iomem(struct pci_dev *dev, ide_pci_device_t *d, int bar
 /**
  *      ide_hwif_configure      -       configure an IDE interface
  *      @dev: PCI device holding interface
- *      @d: IDE pci data
+ *      @d: IDE port info
  *      @mate: Paired interface if any
  *
  *      Perform the initial set up for the hardware interface structure. This
@@ -357,8 +358,8 @@ static int ide_pci_check_iomem(struct pci_dev *dev, ide_pci_device_t *d, int bar
  *
  *      Returns the new hardware interface structure, or NULL on a failure
  */
- 
-static ide_hwif_t *ide_hwif_configure(struct pci_dev *dev, ide_pci_device_t *d, ide_hwif_t *mate, int port, int irq)
+
+static ide_hwif_t *ide_hwif_configure(struct pci_dev *dev, const struct ide_port_info *d, ide_hwif_t *mate, int port, int irq)
 {
         unsigned long ctl = 0, base = 0;
         ide_hwif_t *hwif;
@@ -387,19 +388,20 @@ static ide_hwif_t *ide_hwif_configure(struct pci_dev *dev, ide_pci_device_t *d,
                 return NULL;    /* no room in ide_hwifs[] */
         if (hwif->io_ports[IDE_DATA_OFFSET] != base ||
             hwif->io_ports[IDE_CONTROL_OFFSET] != (ctl | 2)) {
-                memset(&hwif->hw, 0, sizeof(hwif->hw));
-#ifndef IDE_ARCH_OBSOLETE_INIT
-                ide_std_init_ports(&hwif->hw, base, (ctl | 2));
-                hwif->hw.io_ports[IDE_IRQ_OFFSET] = 0;
+                hw_regs_t hw;
+
+                memset(&hw, 0, sizeof(hw));
+#ifndef CONFIG_IDE_ARCH_OBSOLETE_INIT
+                ide_std_init_ports(&hw, base, ctl | 2);
 #else
-                ide_init_hwif_ports(&hwif->hw, base, (ctl | 2), NULL);
+                ide_init_hwif_ports(&hw, base, ctl | 2, NULL);
 #endif
-                memcpy(hwif->io_ports, hwif->hw.io_ports, sizeof(hwif->io_ports));
+                memcpy(hwif->io_ports, hw.io_ports, sizeof(hwif->io_ports));
                 hwif->noprobe = !hwif->io_ports[IDE_DATA_OFFSET];
         }
-        hwif->chipset = ide_pci;
+        hwif->chipset = d->chipset ? d->chipset : ide_pci;
         hwif->pci_dev = dev;
-        hwif->cds = (struct ide_pci_device_s *) d;
+        hwif->cds = d;
         hwif->channel = port;
 
         if (!hwif->irq)
@@ -414,21 +416,17 @@ static ide_hwif_t *ide_hwif_configure(struct pci_dev *dev, ide_pci_device_t *d,
 /**
  *      ide_hwif_setup_dma      -       configure DMA interface
  *      @dev: PCI device
- *      @d: IDE pci data
- *      @hwif: Hardware interface we are configuring
+ *      @d: IDE port info
+ *      @hwif: IDE interface
  *
  *      Set up the DMA base for the interface. Enable the master bits as
  *      necessary and attempt to bring the device DMA into a ready to use
  *      state
  */
- 
-#ifndef CONFIG_BLK_DEV_IDEDMA_PCI
-static void ide_hwif_setup_dma(struct pci_dev *dev, ide_pci_device_t *d, ide_hwif_t *hwif)
-{
-}
-#else
-static void ide_hwif_setup_dma(struct pci_dev *dev, ide_pci_device_t *d, ide_hwif_t *hwif)
+
+static void ide_hwif_setup_dma(struct pci_dev *dev, const struct ide_port_info *d, ide_hwif_t *hwif)
 {
+#ifdef CONFIG_BLK_DEV_IDEDMA_PCI
         u16 pcicmd;
 
         pci_read_config_word(dev, PCI_COMMAND, &pcicmd);
@@ -460,13 +458,13 @@ static void ide_hwif_setup_dma(struct pci_dev *dev, ide_pci_device_t *d, ide_hwi
                                 "(BIOS)\n", hwif->name, d->name);
                 }
         }
-}
 #endif /* CONFIG_BLK_DEV_IDEDMA_PCI*/
+}
 
 /**
  *      ide_setup_pci_controller        -       set up IDE PCI
  *      @dev: PCI device
- *      @d: IDE PCI data
+ *      @d: IDE port info
  *      @noisy: verbose flag
  *      @config: returned as 1 if we configured the hardware
  *
@@ -474,8 +472,8 @@ static void ide_hwif_setup_dma(struct pci_dev *dev, ide_pci_device_t *d, ide_hwi
  *      up the PCI side of the device, checks that the device is enabled
  *      and enables it if need be
  */
- 
-static int ide_setup_pci_controller(struct pci_dev *dev, ide_pci_device_t *d, int noisy, int *config)
+
+static int ide_setup_pci_controller(struct pci_dev *dev, const struct ide_port_info *d, int noisy, int *config)
 {
         int ret;
         u16 pcicmd;
@@ -500,9 +498,6 @@ static int ide_setup_pci_controller(struct pci_dev *dev, ide_pci_device_t *d, in
                 printk(KERN_INFO "%s: device enabled (Linux)\n", d->name);
         }
 
-        if (noisy)
-                printk(KERN_INFO "%s: chipset revision %d\n",
-                                 d->name, dev->revision);
 out:
         return ret;
 }
@@ -510,9 +505,9 @@ out:
 /**
  *      ide_pci_setup_ports     -       configure ports/devices on PCI IDE
  *      @dev: PCI device
- *      @d: IDE pci device info
+ *      @d: IDE port info
  *      @pciirq: IRQ line
- *      @index: ata index to update
+ *      @idx: ATA index table to update
  *
  *      Scan the interfaces attached to this device and do any
  *      necessary per port setup. Attach the devices and ask the
@@ -522,26 +517,25 @@ out:
  *      but is also used directly as a helper function by some controllers
  *      where the chipset setup is not the default PCI IDE one.
  */
- 
-void ide_pci_setup_ports(struct pci_dev *dev, ide_pci_device_t *d, int pciirq, ata_index_t *index)
+
+void ide_pci_setup_ports(struct pci_dev *dev, const struct ide_port_info *d, int pciirq, u8 *idx)
 {
         int channels = (d->host_flags & IDE_HFLAG_SINGLE) ? 1 : 2, port;
-        int at_least_one_hwif_enabled = 0;
         ide_hwif_t *hwif, *mate = NULL;
         u8 tmp;
 
-        index->all = 0xf0f0;
-
         /*
          * Set up the IDE ports
          */
-         
+
         for (port = 0; port < channels; ++port) {
-                ide_pci_enablebit_t *e = &(d->enablebits[port]);
-        
+                const ide_pci_enablebit_t *e = &(d->enablebits[port]);
+
                 if (e->reg && (pci_read_config_byte(dev, e->reg, &tmp) ||
-                    (tmp & e->mask) != e->val))
+                    (tmp & e->mask) != e->val)) {
+                        printk(KERN_INFO "%s: IDE port disabled\n", d->name);
                         continue;       /* port not enabled */
+                }
 
                 if ((hwif = ide_hwif_configure(dev, d, mate, port, pciirq)) == NULL)
                         continue;
@@ -549,11 +543,7 @@ void ide_pci_setup_ports(struct pci_dev *dev, ide_pci_device_t *d, int pciirq, a
                 /* setup proper ancestral information */
                 hwif->gendev.parent = &dev->dev;
 
-                if (hwif->channel) {
-                        index->b.high = hwif->index;
-                } else {
-                        index->b.low = hwif->index;
-                }
+                *(idx + port) = hwif->index;
 
                 
                 if (d->init_iops)
@@ -562,15 +552,28 @@ void ide_pci_setup_ports(struct pci_dev *dev, ide_pci_device_t *d, int pciirq, a
                 if ((d->host_flags & IDE_HFLAG_NO_DMA) == 0)
                         ide_hwif_setup_dma(dev, d, hwif);
 
-                if ((d->host_flags & IDE_HFLAG_LEGACY_IRQS) && hwif->irq == 0)
+                if ((!hwif->irq && (d->host_flags & IDE_HFLAG_LEGACY_IRQS)) ||
+                    (d->host_flags & IDE_HFLAG_FORCE_LEGACY_IRQS))
                         hwif->irq = port ? 15 : 14;
 
+                hwif->fixup = d->fixup;
+
                 hwif->host_flags = d->host_flags;
                 hwif->pio_mask = d->pio_mask;
 
                 if ((d->host_flags & IDE_HFLAG_SERIALIZE) && hwif->mate)
                         hwif->mate->serialized = hwif->serialized = 1;
 
+                if (d->host_flags & IDE_HFLAG_IO_32BIT) {
+                        hwif->drives[0].io_32bit = 1;
+                        hwif->drives[1].io_32bit = 1;
+                }
+
+                if (d->host_flags & IDE_HFLAG_UNMASK_IRQS) {
+                        hwif->drives[0].unmask = 1;
+                        hwif->drives[1].unmask = 1;
+                }
+
                 if (hwif->dma_base) {
                         hwif->swdma_mask = d->swdma_mask;
                         hwif->mwdma_mask = d->mwdma_mask;
@@ -580,6 +583,9 @@ void ide_pci_setup_ports(struct pci_dev *dev, ide_pci_device_t *d, int pciirq, a
                 hwif->drives[0].autotune = 1;
                 hwif->drives[1].autotune = 1;
 
+                if (d->host_flags & IDE_HFLAG_RQSIZE_256)
+                        hwif->rqsize = 256;
+
                 if (d->init_hwif)
                         /* Call chipset-specific routine
                          * for each enabled hwif
@@ -587,10 +593,7 @@ void ide_pci_setup_ports(struct pci_dev *dev, ide_pci_device_t *d, int pciirq, a
                         d->init_hwif(hwif);
 
                 mate = hwif;
-                at_least_one_hwif_enabled = 1;
         }
-        if (!at_least_one_hwif_enabled)
-                printk(KERN_INFO "%s: neither IDE port enabled (BIOS)\n", d->name);
 }
 
 EXPORT_SYMBOL_GPL(ide_pci_setup_ports);
@@ -602,13 +605,13 @@ EXPORT_SYMBOL_GPL(ide_pci_setup_ports);
  *
  * One thing that is not standardized is the location of the
  * primary/secondary interface "enable/disable" bits.  For chipsets that
- * we "know" about, this information is in the ide_pci_device_t struct;
+ * we "know" about, this information is in the struct ide_port_info;
  * for all other chipsets, we just assume both interfaces are enabled.
  */
-static int do_ide_setup_pci_device(struct pci_dev *dev, ide_pci_device_t *d,
-                                   ata_index_t *index, u8 noisy)
+static int do_ide_setup_pci_device(struct pci_dev *dev,
+                                   const struct ide_port_info *d,
+                                   u8 *idx, u8 noisy)
 {
-        static ata_index_t ata_index = { .b = { .low = 0xff, .high = 0xff } };
         int tried_config = 0;
         int pciirq, ret;
 
@@ -658,51 +661,35 @@ static int do_ide_setup_pci_device(struct pci_dev *dev, ide_pci_device_t *d,
 
         /* FIXME: silent failure can happen */
 
-        *index = ata_index;
-        ide_pci_setup_ports(dev, d, pciirq, index);
+        ide_pci_setup_ports(dev, d, pciirq, idx);
 out:
         return ret;
 }
 
-int ide_setup_pci_device(struct pci_dev *dev, ide_pci_device_t *d)
+int ide_setup_pci_device(struct pci_dev *dev, const struct ide_port_info *d)
 {
-        ide_hwif_t *hwif = NULL, *mate = NULL;
-        ata_index_t index_list;
+        u8 idx[4] = { 0xff, 0xff, 0xff, 0xff };
         int ret;
 
-        ret = do_ide_setup_pci_device(dev, d, &index_list, 1);
-        if (ret < 0)
-                goto out;
+        ret = do_ide_setup_pci_device(dev, d, &idx[0], 1);
 
-        if ((index_list.b.low & 0xf0) != 0xf0)
-                hwif = &ide_hwifs[index_list.b.low];
-        if ((index_list.b.high & 0xf0) != 0xf0)
-                mate = &ide_hwifs[index_list.b.high];
+        if (ret >= 0)
+                ide_device_add(idx);
 
-        if (hwif)
-                probe_hwif_init_with_fixup(hwif, d->fixup);
-        if (mate)
-                probe_hwif_init_with_fixup(mate, d->fixup);
-
-        if (hwif)
-                ide_proc_register_port(hwif);
-        if (mate)
-                ide_proc_register_port(mate);
-out:
         return ret;
 }
 
 EXPORT_SYMBOL_GPL(ide_setup_pci_device);
 
 int ide_setup_pci_devices(struct pci_dev *dev1, struct pci_dev *dev2,
-                          ide_pci_device_t *d)
+                          const struct ide_port_info *d)
 {
         struct pci_dev *pdev[] = { dev1, dev2 };
-        ata_index_t index_list[2];
         int ret, i;
+        u8 idx[4] = { 0xff, 0xff, 0xff, 0xff };
 
         for (i = 0; i < 2; i++) {
-                ret = do_ide_setup_pci_device(pdev[i], d, index_list + i, !i);
+                ret = do_ide_setup_pci_device(pdev[i], d, &idx[i*2], !i);
                 /*
                  * FIXME: Mom, mom, they stole me the helper function to undo
                  * do_ide_setup_pci_device() on the first device!
@@ -711,25 +698,7 @@ int ide_setup_pci_devices(struct pci_dev *dev1, struct pci_dev *dev2,
                         goto out;
         }
 
-        for (i = 0; i < 2; i++) {
-                u8 idx[2] = { index_list[i].b.low, index_list[i].b.high };
-                int j;
-
-                for (j = 0; j < 2; j++) {
-                        if ((idx[j] & 0xf0) != 0xf0)
-                                probe_hwif_init(ide_hwifs + idx[j]);
-                }
-        }
-
-        for (i = 0; i < 2; i++) {
-                u8 idx[2] = { index_list[i].b.low, index_list[i].b.high };
-                int j;
-
-                for (j = 0; j < 2; j++) {
-                        if ((idx[j] & 0xf0) != 0xf0)
-                                ide_proc_register_port(ide_hwifs + idx[j]);
-                }
-        }
+        ide_device_add(idx);
 out:
         return ret;
 }
@@ -754,9 +723,6 @@ static LIST_HEAD(ide_pci_drivers);
  *      hands the controllers off to the core PCI code to do the rest of
  *      the work.
  *
- *      The driver_data of the driver table must point to an ide_pci_device_t
- *      describing the interface.
- *
  *      Returns are the same as for pci_register_driver
  */
 
diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c
index 93644f82592c..d08fb30768bc 100644
--- a/drivers/infiniband/core/cma.c
+++ b/drivers/infiniband/core/cma.c
@@ -2797,11 +2797,12 @@ static void cma_remove_one(struct ib_device *device)
 
 static int cma_init(void)
 {
-        int ret, low, high;
+        int ret, low, high, remaining;
 
         get_random_bytes(&next_port, sizeof next_port);
         inet_get_local_port_range(&low, &high);
-        next_port = ((unsigned int) next_port % (high - low)) + low;
+        remaining = (high - low) + 1;
+        next_port = ((unsigned int) next_port % remaining) + low;
 
         cma_wq = create_singlethread_workqueue("rdma_cm");
         if (!cma_wq)
diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c
index 1d62c8b88e12..e5b4e9bfbdc5 100644
--- a/drivers/input/evdev.c
+++ b/drivers/input/evdev.c
@@ -495,7 +495,7 @@ static unsigned int evdev_poll(struct file *file, poll_table *wait)
 #ifdef CONFIG_COMPAT
 
 #define BITS_PER_LONG_COMPAT (sizeof(compat_long_t) * 8)
-#define NBITS_COMPAT(x) ((((x) - 1) / BITS_PER_LONG_COMPAT) + 1)
+#define BITS_TO_LONGS_COMPAT(x) ((((x) - 1) / BITS_PER_LONG_COMPAT) + 1)
 
 #ifdef __BIG_ENDIAN
 static int bits_to_user(unsigned long *bits, unsigned int maxbit,
@@ -504,7 +504,7 @@ static int bits_to_user(unsigned long *bits, unsigned int maxbit,
         int len, i;
 
         if (compat) {
-                len = NBITS_COMPAT(maxbit) * sizeof(compat_long_t);
+                len = BITS_TO_LONGS_COMPAT(maxbit) * sizeof(compat_long_t);
                 if (len > maxlen)
                         len = maxlen;
 
@@ -515,7 +515,7 @@ static int bits_to_user(unsigned long *bits, unsigned int maxbit,
                                          sizeof(compat_long_t)))
                                 return -EFAULT;
         } else {
-                len = NBITS(maxbit) * sizeof(long);
+                len = BITS_TO_LONGS(maxbit) * sizeof(long);
                 if (len > maxlen)
                         len = maxlen;
 
@@ -530,8 +530,8 @@ static int bits_to_user(unsigned long *bits, unsigned int maxbit,
                         unsigned int maxlen, void __user *p, int compat)
 {
         int len = compat ?
-                        NBITS_COMPAT(maxbit) * sizeof(compat_long_t) :
-                        NBITS(maxbit) * sizeof(long);
+                        BITS_TO_LONGS_COMPAT(maxbit) * sizeof(compat_long_t) :
+                        BITS_TO_LONGS(maxbit) * sizeof(long);
 
         if (len > maxlen)
                 len = maxlen;
@@ -545,7 +545,7 @@ static int bits_to_user(unsigned long *bits, unsigned int maxbit,
 static int bits_to_user(unsigned long *bits, unsigned int maxbit,
                         unsigned int maxlen, void __user *p, int compat)
 {
-        int len = NBITS(maxbit) * sizeof(long);
+        int len = BITS_TO_LONGS(maxbit) * sizeof(long);
 
         if (len > maxlen)
                 len = maxlen;
diff --git a/drivers/input/gameport/gameport.c b/drivers/input/gameport/gameport.c
index ec1b6cfefcd3..bfc6061f1554 100644
--- a/drivers/input/gameport/gameport.c
+++ b/drivers/input/gameport/gameport.c
@@ -136,7 +136,8 @@ static int gameport_measure_speed(struct gameport *gameport)
         }
 
         gameport_close(gameport);
-        return (cpu_data[raw_smp_processor_id()].loops_per_jiffy * (unsigned long)HZ / (1000 / 50)) / (tx < 1 ? 1 : tx);
+        return (cpu_data(raw_smp_processor_id()).loops_per_jiffy *
+                (unsigned long)HZ / (1000 / 50)) / (tx < 1 ? 1 : tx);
 
 #else
 
diff --git a/drivers/input/input.c b/drivers/input/input.c
index 2f2b020cd629..307c7b5c2b33 100644
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -584,10 +584,10 @@ static int input_default_setkeycode(struct input_dev *dev,
 
 
 #define MATCH_BIT(bit, max) \
-                for (i = 0; i < NBITS(max); i++) \
+                for (i = 0; i < BITS_TO_LONGS(max); i++) \
                         if ((id->bit[i] & dev->bit[i]) != id->bit[i]) \
                                 break; \
-                if (i != NBITS(max)) \
+                if (i != BITS_TO_LONGS(max)) \
                         continue;
 
 static const struct input_device_id *input_match_device(const struct input_device_id *id,
@@ -698,7 +698,7 @@ static void input_seq_print_bitmap(struct seq_file *seq, const char *name,
 {
         int i;
 
-        for (i = NBITS(max) - 1; i > 0; i--)
+        for (i = BITS_TO_LONGS(max) - 1; i > 0; i--)
                 if (bitmap[i])
                         break;
 
@@ -892,7 +892,7 @@ static int input_print_modalias_bits(char *buf, int size,
 
         len += snprintf(buf, max(size, 0), "%c", name);
         for (i = min_bit; i < max_bit; i++)
-                if (bm[LONG(i)] & BIT(i))
+                if (bm[BIT_WORD(i)] & BIT_MASK(i))
                         len += snprintf(buf + len, max(size - len, 0), "%X,", i);
         return len;
 }
@@ -991,7 +991,7 @@ static int input_print_bitmap(char *buf, int buf_size, unsigned long *bitmap,
         int i;
         int len = 0;
 
-        for (i = NBITS(max) - 1; i > 0; i--)
+        for (i = BITS_TO_LONGS(max) - 1; i > 0; i--)
                 if (bitmap[i])
                         break;
 
diff --git a/drivers/input/joydev.c b/drivers/input/joydev.c
index 2b201f9aa024..22b2789ef58a 100644
--- a/drivers/input/joydev.c
+++ b/drivers/input/joydev.c
@@ -844,8 +844,8 @@ static const struct input_device_id joydev_blacklist[] = {
         {
                 .flags = INPUT_DEVICE_ID_MATCH_EVBIT |
                                 INPUT_DEVICE_ID_MATCH_KEYBIT,
-                .evbit = { BIT(EV_KEY) },
-                .keybit = { [LONG(BTN_TOUCH)] = BIT(BTN_TOUCH) },
+                .evbit = { BIT_MASK(EV_KEY) },
+                .keybit = { [BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH) },
         },      /* Avoid itouchpads, touchscreens and tablets */
         { }     /* Terminating entry */
 };
@@ -854,20 +854,20 @@ static const struct input_device_id joydev_ids[] = {
         {
                 .flags = INPUT_DEVICE_ID_MATCH_EVBIT |
                                 INPUT_DEVICE_ID_MATCH_ABSBIT,
-                .evbit = { BIT(EV_ABS) },
-                .absbit = { BIT(ABS_X) },
+                .evbit = { BIT_MASK(EV_ABS) },
+                .absbit = { BIT_MASK(ABS_X) },
         },
         {
                 .flags = INPUT_DEVICE_ID_MATCH_EVBIT |
                                 INPUT_DEVICE_ID_MATCH_ABSBIT,
-                .evbit = { BIT(EV_ABS) },
-                .absbit = { BIT(ABS_WHEEL) },
+                .evbit = { BIT_MASK(EV_ABS) },
+                .absbit = { BIT_MASK(ABS_WHEEL) },
         },
         {
                 .flags = INPUT_DEVICE_ID_MATCH_EVBIT |
                                 INPUT_DEVICE_ID_MATCH_ABSBIT,
-                .evbit = { BIT(EV_ABS) },
-                .absbit = { BIT(ABS_THROTTLE) },
+                .evbit = { BIT_MASK(EV_ABS) },
+                .absbit = { BIT_MASK(ABS_THROTTLE) },
         },
         { }     /* Terminating entry */
 };
diff --git a/drivers/input/joystick/a3d.c b/drivers/input/joystick/a3d.c
index ff701ab10d74..52ba16f487c7 100644
--- a/drivers/input/joystick/a3d.c
+++ b/drivers/input/joystick/a3d.c
@@ -326,14 +326,19 @@ static int a3d_connect(struct gameport *gameport, struct gameport_driver *drv)
 
                 a3d->length = 33;
 
-                input_dev->evbit[0] |= BIT(EV_ABS) | BIT(EV_KEY) | BIT(EV_REL);
-                input_dev->relbit[0] |= BIT(REL_X) | BIT(REL_Y);
-                input_dev->absbit[0] |= BIT(ABS_X) | BIT(ABS_Y) | BIT(ABS_THROTTLE) | BIT(ABS_RUDDER)
-                                        | BIT(ABS_HAT0X) | BIT(ABS_HAT0Y) | BIT(ABS_HAT1X) | BIT(ABS_HAT1Y);
-                input_dev->keybit[LONG(BTN_MOUSE)] |= BIT(BTN_RIGHT) | BIT(BTN_LEFT) | BIT(BTN_MIDDLE)
-                                                        | BIT(BTN_SIDE) | BIT(BTN_EXTRA);
-                input_dev->keybit[LONG(BTN_JOYSTICK)] |= BIT(BTN_TRIGGER) | BIT(BTN_THUMB) | BIT(BTN_TOP)
-                                                        | BIT(BTN_PINKIE);
+                input_dev->evbit[0] |= BIT_MASK(EV_ABS) | BIT_MASK(EV_KEY) |
+                        BIT_MASK(EV_REL);
+                input_dev->relbit[0] |= BIT_MASK(REL_X) | BIT_MASK(REL_Y);
+                input_dev->absbit[0] |= BIT_MASK(ABS_X) | BIT_MASK(ABS_Y) |
+                        BIT_MASK(ABS_THROTTLE) | BIT_MASK(ABS_RUDDER) |
+                        BIT_MASK(ABS_HAT0X) | BIT_MASK(ABS_HAT0Y) |
+                        BIT_MASK(ABS_HAT1X) | BIT_MASK(ABS_HAT1Y);
+                input_dev->keybit[BIT_WORD(BTN_MOUSE)] |= BIT_MASK(BTN_RIGHT) |
+                        BIT_MASK(BTN_LEFT) | BIT_MASK(BTN_MIDDLE) |
+                        BIT_MASK(BTN_SIDE) | BIT_MASK(BTN_EXTRA);
+                input_dev->keybit[BIT_WORD(BTN_JOYSTICK)] |=
+                        BIT_MASK(BTN_TRIGGER) | BIT_MASK(BTN_THUMB) |
+                        BIT_MASK(BTN_TOP) | BIT_MASK(BTN_PINKIE);
 
                 a3d_read(a3d, data);
 
@@ -348,9 +353,10 @@ static int a3d_connect(struct gameport *gameport, struct gameport_driver *drv)
         } else {
                 a3d->length = 29;
 
-                input_dev->evbit[0] |= BIT(EV_KEY) | BIT(EV_REL);
-                input_dev->relbit[0] |= BIT(REL_X) | BIT(REL_Y);
-                input_dev->keybit[LONG(BTN_MOUSE)] |= BIT(BTN_RIGHT) | BIT(BTN_LEFT) | BIT(BTN_MIDDLE);
+                input_dev->evbit[0] |= BIT_MASK(EV_KEY) | BIT_MASK(EV_REL);
+                input_dev->relbit[0] |= BIT_MASK(REL_X) | BIT_MASK(REL_Y);
+                input_dev->keybit[BIT_WORD(BTN_MOUSE)] |= BIT_MASK(BTN_RIGHT) |
+                        BIT_MASK(BTN_LEFT) | BIT_MASK(BTN_MIDDLE);
 
                 a3d_read(a3d, data);
 
diff --git a/drivers/input/joystick/adi.c b/drivers/input/joystick/adi.c
index 28140c4a110d..d1ca8a14950f 100644
--- a/drivers/input/joystick/adi.c
+++ b/drivers/input/joystick/adi.c
@@ -431,7 +431,7 @@ static int adi_init_input(struct adi *adi, struct adi_port *port, int half)
         input_dev->open = adi_open;
         input_dev->close = adi_close;
 
-        input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
+        input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
 
         for (i = 0; i < adi->axes10 + adi->axes8 + (adi->hats + (adi->pad != -1)) * 2; i++)
                 set_bit(adi->abs[i], input_dev->absbit);
diff --git a/drivers/input/joystick/amijoy.c b/drivers/input/joystick/amijoy.c
index b0f5541ec3e6..5cf9f3610e67 100644
--- a/drivers/input/joystick/amijoy.c
+++ b/drivers/input/joystick/amijoy.c
@@ -137,9 +137,10 @@ static int __init amijoy_init(void)
                 amijoy_dev[i]->open = amijoy_open;
                 amijoy_dev[i]->close = amijoy_close;
 
-                amijoy_dev[i]->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
-                amijoy_dev[i]->absbit[0] = BIT(ABS_X) | BIT(ABS_Y);
-                amijoy_dev[i]->keybit[LONG(BTN_LEFT)] = BIT(BTN_LEFT) | BIT(BTN_MIDDLE) | BIT(BTN_RIGHT);
+                amijoy_dev[i]->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
+                amijoy_dev[i]->absbit[0] = BIT_MASK(ABS_X) | BIT_MASK(ABS_Y);
+                amijoy_dev[i]->keybit[BIT_WORD(BTN_LEFT)] = BIT_MASK(BTN_LEFT) |
+                        BIT_MASK(BTN_MIDDLE) | BIT_MASK(BTN_RIGHT);
                 for (j = 0; j < 2; j++) {
                         amijoy_dev[i]->absmin[ABS_X + j] = -1;
                         amijoy_dev[i]->absmax[ABS_X + j] = 1;
diff --git a/drivers/input/joystick/analog.c b/drivers/input/joystick/analog.c
index bdd157c1ebf8..15739880afc6 100644
--- a/drivers/input/joystick/analog.c
+++ b/drivers/input/joystick/analog.c
@@ -456,7 +456,7 @@ static int analog_init_device(struct analog_port *port, struct analog *analog, i
         input_dev->open = analog_open;
         input_dev->close = analog_close;
 
-        input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
+        input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
 
         for (i = j = 0; i < 4; i++)
                 if (analog->mask & (1 << i)) {
diff --git a/drivers/input/joystick/cobra.c b/drivers/input/joystick/cobra.c
index d3352a849b85..55646a6d89f5 100644
--- a/drivers/input/joystick/cobra.c
+++ b/drivers/input/joystick/cobra.c
@@ -218,7 +218,7 @@ static int cobra_connect(struct gameport *gameport, struct gameport_driver *drv)
                 input_dev->open = cobra_open;
                 input_dev->close = cobra_close;
 
-                input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
+                input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
                 input_set_abs_params(input_dev, ABS_X, -1, 1, 0, 0);
                 input_set_abs_params(input_dev, ABS_Y, -1, 1, 0, 0);
                 for (j = 0; cobra_btn[j]; j++)
diff --git a/drivers/input/joystick/db9.c b/drivers/input/joystick/db9.c
index b069ee18e353..27fc475bd3a1 100644
--- a/drivers/input/joystick/db9.c
+++ b/drivers/input/joystick/db9.c
@@ -631,7 +631,7 @@ static struct db9 __init *db9_probe(int parport, int mode)
                 input_dev->open = db9_open;
                 input_dev->close = db9_close;
 
-                input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
+                input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
                 for (j = 0; j < db9_mode->n_buttons; j++)
                         set_bit(db9_mode->buttons[j], input_dev->keybit);
                 for (j = 0; j < db9_mode->n_axis; j++) {
diff --git a/drivers/input/joystick/gamecon.c b/drivers/input/joystick/gamecon.c
index 1a452e0e5f25..df2a9d02ca6c 100644
--- a/drivers/input/joystick/gamecon.c
+++ b/drivers/input/joystick/gamecon.c
@@ -653,12 +653,12 @@ static int __init gc_setup_pad(struct gc *gc, int idx, int pad_type)
         input_dev->close = gc_close;
 
         if (pad_type != GC_SNESMOUSE) {
-                input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
+                input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
 
                 for (i = 0; i < 2; i++)
                         input_set_abs_params(input_dev, ABS_X + i, -1, 1, 0, 0);
         } else
-                input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REL);
+                input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_REL);
 
         gc->pads[0] |= gc_status_bit[idx];
         gc->pads[pad_type] |= gc_status_bit[idx];
diff --git a/drivers/input/joystick/gf2k.c b/drivers/input/joystick/gf2k.c
index d514aebf7554..1f6302c0eb3f 100644
--- a/drivers/input/joystick/gf2k.c
+++ b/drivers/input/joystick/gf2k.c
@@ -315,7 +315,7 @@ static int gf2k_connect(struct gameport *gameport, struct gameport_driver *drv)
         input_dev->open = gf2k_open;
         input_dev->close = gf2k_close;
 
-        input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
+        input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
 
         for (i = 0; i < gf2k_axes[gf2k->id]; i++)
                 set_bit(gf2k_abs[i], input_dev->absbit);
diff --git a/drivers/input/joystick/grip.c b/drivers/input/joystick/grip.c
index 73eb5ab6f140..fd3853ab1aad 100644
--- a/drivers/input/joystick/grip.c
+++ b/drivers/input/joystick/grip.c
@@ -370,7 +370,7 @@ static int grip_connect(struct gameport *gameport, struct gameport_driver *drv)
                 input_dev->open = grip_open;
                 input_dev->close = grip_close;
 
-                input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
+                input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
 
                 for (j = 0; (t = grip_abs[grip->mode[i]][j]) >= 0; j++) {
 
diff --git a/drivers/input/joystick/grip_mp.c b/drivers/input/joystick/grip_mp.c
index 4ed3a3eadf19..c57e21d68c00 100644
--- a/drivers/input/joystick/grip_mp.c
+++ b/drivers/input/joystick/grip_mp.c
@@ -606,7 +606,7 @@ static int register_slot(int slot, struct grip_mp *grip)
         input_dev->open = grip_open;
         input_dev->close = grip_close;
 
-        input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
+        input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
 
         for (j = 0; (t = grip_abs[port->mode][j]) >= 0; j++)
                 input_set_abs_params(input_dev, t, -1, 1, 0, 0);
diff --git a/drivers/input/joystick/guillemot.c b/drivers/input/joystick/guillemot.c
index d4e8073caf27..aa6bfb3fb8cd 100644
--- a/drivers/input/joystick/guillemot.c
+++ b/drivers/input/joystick/guillemot.c
@@ -238,7 +238,7 @@ static int guillemot_connect(struct gameport *gameport, struct gameport_driver *
         input_dev->open = guillemot_open;
         input_dev->close = guillemot_close;
 
-        input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
+        input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
 
         for (i = 0; (t = guillemot->type->abs[i]) >= 0; i++)
                 input_set_abs_params(input_dev, t, 0, 255, 0, 0);
diff --git a/drivers/input/joystick/iforce/iforce-main.c b/drivers/input/joystick/iforce/iforce-main.c
index 682244b1c042..6f826b37d9aa 100644
--- a/drivers/input/joystick/iforce/iforce-main.c
+++ b/drivers/input/joystick/iforce/iforce-main.c
@@ -389,7 +389,8 @@ int iforce_init_device(struct iforce *iforce)
  * Set input device bitfields and ranges.
  */
 
-        input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS) | BIT(EV_FF_STATUS);
+        input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS) |
+                BIT_MASK(EV_FF_STATUS);
 
         for (i = 0; iforce->type->btn[i] >= 0; i++)
                 set_bit(iforce->type->btn[i], input_dev->keybit);
diff --git a/drivers/input/joystick/iforce/iforce.h b/drivers/input/joystick/iforce/iforce.h
index 40a853ac21c7..a964a7cfd210 100644
--- a/drivers/input/joystick/iforce/iforce.h
+++ b/drivers/input/joystick/iforce/iforce.h
@@ -62,13 +62,13 @@
 #define FF_CORE_IS_PLAYED       3       /* Effect is currently being played */
 #define FF_CORE_SHOULD_PLAY     4       /* User wants the effect to be played */
 #define FF_CORE_UPDATE          5       /* Effect is being updated */
-#define FF_MODCORE_MAX          5
+#define FF_MODCORE_CNT          6
 
 struct iforce_core_effect {
         /* Information about where modifiers are stored in the device's memory */
         struct resource mod1_chunk;
         struct resource mod2_chunk;
-        unsigned long flags[NBITS(FF_MODCORE_MAX)];
+        unsigned long flags[BITS_TO_LONGS(FF_MODCORE_CNT)];
 };
 
 #define FF_CMD_EFFECT           0x010e
diff --git a/drivers/input/joystick/interact.c b/drivers/input/joystick/interact.c
index 1aec1e9d7c59..bc8ea95dfd0e 100644
--- a/drivers/input/joystick/interact.c
+++ b/drivers/input/joystick/interact.c
@@ -269,7 +269,7 @@ static int interact_connect(struct gameport *gameport, struct gameport_driver *d
         input_dev->open = interact_open;
         input_dev->close = interact_close;
 
-        input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
+        input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
 
         for (i = 0; (t = interact_type[interact->type].abs[i]) >= 0; i++) {
                 set_bit(t, input_dev->absbit);
diff --git a/drivers/input/joystick/magellan.c b/drivers/input/joystick/magellan.c
index b35604ee43ae..54e676948ebb 100644
--- a/drivers/input/joystick/magellan.c
+++ b/drivers/input/joystick/magellan.c
@@ -170,7 +170,7 @@ static int magellan_connect(struct serio *serio, struct serio_driver *drv)
         input_dev->id.version = 0x0100;
         input_dev->dev.parent = &serio->dev;
 
-        input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
+        input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
 
         for (i = 0; i < 9; i++)
                 set_bit(magellan_buttons[i], input_dev->keybit);
diff --git a/drivers/input/joystick/sidewinder.c b/drivers/input/joystick/sidewinder.c
index 2adf73f63c94..7b4865fdee54 100644
--- a/drivers/input/joystick/sidewinder.c
+++ b/drivers/input/joystick/sidewinder.c
@@ -758,7 +758,7 @@ static int sw_connect(struct gameport *gameport, struct gameport_driver *drv)
                 input_dev->open = sw_open;
                 input_dev->close = sw_close;
 
-                input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
+                input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
 
                 for (j = 0; (bits = sw_bit[sw->type][j]); j++) {
                         code = sw_abs[sw->type][j];
diff --git a/drivers/input/joystick/spaceball.c b/drivers/input/joystick/spaceball.c
index abb7c4cf54ad..d4087fd49656 100644
--- a/drivers/input/joystick/spaceball.c
+++ b/drivers/input/joystick/spaceball.c
@@ -228,18 +228,23 @@ static int spaceball_connect(struct serio *serio, struct serio_driver *drv)
         input_dev->id.version = 0x0100;
         input_dev->dev.parent = &serio->dev;
 
-        input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
+        input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
 
         switch (id) {
                 case SPACEBALL_4000FLX:
                 case SPACEBALL_4000FLX_L:
-                        input_dev->keybit[LONG(BTN_0)] |= BIT(BTN_9);
-                        input_dev->keybit[LONG(BTN_A)] |= BIT(BTN_A) | BIT(BTN_B) | BIT(BTN_C) | BIT(BTN_MODE);
+                        input_dev->keybit[BIT_WORD(BTN_0)] |= BIT_MASK(BTN_9);
+                        input_dev->keybit[BIT_WORD(BTN_A)] |= BIT_MASK(BTN_A) |
+                                BIT_MASK(BTN_B) | BIT_MASK(BTN_C) |
+                                BIT_MASK(BTN_MODE);
                 default:
-                        input_dev->keybit[LONG(BTN_0)] |= BIT(BTN_2) | BIT(BTN_3) | BIT(BTN_4)
-                                | BIT(BTN_5) | BIT(BTN_6) | BIT(BTN_7) | BIT(BTN_8);
+                        input_dev->keybit[BIT_WORD(BTN_0)] |= BIT_MASK(BTN_2) |
+                                BIT_MASK(BTN_3) | BIT_MASK(BTN_4) |
+                                BIT_MASK(BTN_5) | BIT_MASK(BTN_6) |
+                                BIT_MASK(BTN_7) | BIT_MASK(BTN_8);
                 case SPACEBALL_3003C:
-                        input_dev->keybit[LONG(BTN_0)] |= BIT(BTN_1) | BIT(BTN_8);
+                        input_dev->keybit[BIT_WORD(BTN_0)] |= BIT_MASK(BTN_1) |
+                                BIT_MASK(BTN_8);
         }
 
         for (i = 0; i < 3; i++) {
diff --git a/drivers/input/joystick/spaceorb.c b/drivers/input/joystick/spaceorb.c
index c4937f1e837c..f7ce4004f4ba 100644
--- a/drivers/input/joystick/spaceorb.c
+++ b/drivers/input/joystick/spaceorb.c
@@ -185,7 +185,7 @@ static int spaceorb_connect(struct serio *serio, struct serio_driver *drv)
         input_dev->id.version = 0x0100;
         input_dev->dev.parent = &serio->dev;
 
-        input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
+        input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
 
         for (i = 0; i < 6; i++)
                 set_bit(spaceorb_buttons[i], input_dev->keybit);
diff --git a/drivers/input/joystick/stinger.c b/drivers/input/joystick/stinger.c
index 8581ee991d4e..baa10b2f7ba1 100644
--- a/drivers/input/joystick/stinger.c
+++ b/drivers/input/joystick/stinger.c
@@ -156,10 +156,11 @@ static int stinger_connect(struct serio *serio, struct serio_driver *drv)
         input_dev->id.version = 0x0100;
         input_dev->dev.parent = &serio->dev;
 
-        input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
-        input_dev->keybit[LONG(BTN_A)] = BIT(BTN_A) | BIT(BTN_B) | BIT(BTN_C) | BIT(BTN_X) |
-                                         BIT(BTN_Y) | BIT(BTN_Z) | BIT(BTN_TL) | BIT(BTN_TR) |
-                                         BIT(BTN_START) | BIT(BTN_SELECT);
+        input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
+        input_dev->keybit[BIT_WORD(BTN_A)] = BIT_MASK(BTN_A) | BIT_MASK(BTN_B) |
+                BIT_MASK(BTN_C) | BIT_MASK(BTN_X) | BIT_MASK(BTN_Y) |
+                BIT_MASK(BTN_Z) | BIT_MASK(BTN_TL) | BIT_MASK(BTN_TR) |
+                BIT_MASK(BTN_START) | BIT_MASK(BTN_SELECT);
         input_set_abs_params(input_dev, ABS_X, -64, 64, 0, 4);
         input_set_abs_params(input_dev, ABS_Y, -64, 64, 0, 4);
 
diff --git a/drivers/input/joystick/tmdc.c b/drivers/input/joystick/tmdc.c
index 3b36ee04f726..0feeb8acb532 100644
--- a/drivers/input/joystick/tmdc.c
+++ b/drivers/input/joystick/tmdc.c
@@ -333,7 +333,7 @@ static int tmdc_setup_port(struct tmdc *tmdc, int idx, unsigned char *data)
         input_dev->open = tmdc_open;
         input_dev->close = tmdc_close;
 
-        input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
+        input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
 
         for (i = 0; i < port->absc && i < TMDC_ABS; i++)
                 if (port->abs[i] >= 0)
diff --git a/drivers/input/joystick/turbografx.c b/drivers/input/joystick/turbografx.c
index 8381c6f14373..bbebd4e2ad7f 100644
--- a/drivers/input/joystick/turbografx.c
+++ b/drivers/input/joystick/turbografx.c
@@ -229,7 +229,7 @@ static struct tgfx __init *tgfx_probe(int parport, int *n_buttons, int n_devs)
                 input_dev->open = tgfx_open;
                 input_dev->close = tgfx_close;
 
-                input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
+                input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
                 input_set_abs_params(input_dev, ABS_X, -1, 1, 0, 0);
                 input_set_abs_params(input_dev, ABS_Y, -1, 1, 0, 0);
 
diff --git a/drivers/input/joystick/twidjoy.c b/drivers/input/joystick/twidjoy.c
index c91504ec38eb..1085c841fec4 100644
--- a/drivers/input/joystick/twidjoy.c
+++ b/drivers/input/joystick/twidjoy.c
@@ -207,7 +207,7 @@ static int twidjoy_connect(struct serio *serio, struct serio_driver *drv)
         input_dev->id.version = 0x0100;
         input_dev->dev.parent = &serio->dev;
 
-        input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
+        input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
         input_set_abs_params(input_dev, ABS_X, -50, 50, 4, 4);
         input_set_abs_params(input_dev, ABS_Y, -50, 50, 4, 4);
 
diff --git a/drivers/input/joystick/warrior.c b/drivers/input/joystick/warrior.c
index 4e85f72eefd7..e928b6e3724a 100644
--- a/drivers/input/joystick/warrior.c
+++ b/drivers/input/joystick/warrior.c
@@ -162,9 +162,11 @@ static int warrior_connect(struct serio *serio, struct serio_driver *drv)
         input_dev->id.version = 0x0100;
         input_dev->dev.parent = &serio->dev;
 
-        input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REL) | BIT(EV_ABS);
-        input_dev->keybit[LONG(BTN_TRIGGER)] = BIT(BTN_TRIGGER) | BIT(BTN_THUMB) | BIT(BTN_TOP) | BIT(BTN_TOP2);
-        input_dev->relbit[0] = BIT(REL_DIAL);
+        input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_REL) |
+                BIT_MASK(EV_ABS);
+        input_dev->keybit[BIT_WORD(BTN_TRIGGER)] = BIT_MASK(BTN_TRIGGER) |
+                BIT_MASK(BTN_THUMB) | BIT_MASK(BTN_TOP) | BIT_MASK(BTN_TOP2);
+        input_dev->relbit[0] = BIT_MASK(REL_DIAL);
         input_set_abs_params(input_dev, ABS_X, -64, 64, 0, 8);
         input_set_abs_params(input_dev, ABS_Y, -64, 64, 0, 8);
         input_set_abs_params(input_dev, ABS_THROTTLE, -112, 112, 0, 0);
diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
index 623629a69b03..6dd375825a14 100644
--- a/drivers/input/joystick/xpad.c
+++ b/drivers/input/joystick/xpad.c
@@ -658,7 +658,7 @@ static int xpad_probe(struct usb_interface *intf, const struct usb_device_id *id
         input_dev->open = xpad_open;
         input_dev->close = xpad_close;
 
-        input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
+        input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
 
         /* set up buttons */
         for (i = 0; xpad_btn[i] >= 0; i++)
diff --git a/drivers/input/keyboard/aaed2000_kbd.c b/drivers/input/keyboard/aaed2000_kbd.c
index 63d6ead6b877..72abc196ce66 100644
--- a/drivers/input/keyboard/aaed2000_kbd.c
+++ b/drivers/input/keyboard/aaed2000_kbd.c
@@ -125,7 +125,7 @@ static int __devinit aaedkbd_probe(struct platform_device *pdev)
         input_dev->id.version = 0x0100;
         input_dev->dev.parent = &pdev->dev;
 
-        input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REP);
+        input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_REP);
         input_dev->keycode = aaedkbd->keycode;
         input_dev->keycodesize = sizeof(unsigned char);
         input_dev->keycodemax = ARRAY_SIZE(aaedkbd_keycode);
diff --git a/drivers/input/keyboard/amikbd.c b/drivers/input/keyboard/amikbd.c
index c67e84ec2d6a..81bf7562aca0 100644
--- a/drivers/input/keyboard/amikbd.c
+++ b/drivers/input/keyboard/amikbd.c
@@ -209,7 +209,7 @@ static int __init amikbd_init(void)
         amikbd_dev->id.product = 0x0001;
         amikbd_dev->id.version = 0x0100;
 
-        amikbd_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REP);
+        amikbd_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_REP);
 
         for (i = 0; i < 0x78; i++)
                 set_bit(i, amikbd_dev->keybit);
diff --git a/drivers/input/keyboard/atakbd.c b/drivers/input/keyboard/atakbd.c
index a1800151b6ce..4e92100c56a8 100644
--- a/drivers/input/keyboard/atakbd.c
+++ b/drivers/input/keyboard/atakbd.c
@@ -237,7 +237,7 @@ static int __init atakbd_init(void)
         atakbd_dev->id.product = 0x0001;
         atakbd_dev->id.version = 0x0100;
 
-        atakbd_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REP);
+        atakbd_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_REP);
         atakbd_dev->keycode = atakbd_keycode;
         atakbd_dev->keycodesize = sizeof(unsigned char);
         atakbd_dev->keycodemax = ARRAY_SIZE(atakbd_keycode);
diff --git a/drivers/input/keyboard/atkbd.c b/drivers/input/keyboard/atkbd.c
index 41fc3d03b6eb..b39c5b31e620 100644
--- a/drivers/input/keyboard/atkbd.c
+++ b/drivers/input/keyboard/atkbd.c
@@ -900,27 +900,32 @@ static void atkbd_set_device_attrs(struct atkbd *atkbd)
 
         input_set_drvdata(input_dev, atkbd);
 
-        input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REP) | BIT(EV_MSC);
+        input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_REP) |
+                BIT_MASK(EV_MSC);
 
         if (atkbd->write) {
-                input_dev->evbit[0] |= BIT(EV_LED);
-                input_dev->ledbit[0] = BIT(LED_NUML) | BIT(LED_CAPSL) | BIT(LED_SCROLLL);
+                input_dev->evbit[0] |= BIT_MASK(EV_LED);
+                input_dev->ledbit[0] = BIT_MASK(LED_NUML) |
+                        BIT_MASK(LED_CAPSL) | BIT_MASK(LED_SCROLLL);
         }
 
         if (atkbd->extra)
-                input_dev->ledbit[0] |= BIT(LED_COMPOSE) | BIT(LED_SUSPEND) |
-                                        BIT(LED_SLEEP) | BIT(LED_MUTE) | BIT(LED_MISC);
+                input_dev->ledbit[0] |= BIT_MASK(LED_COMPOSE) |
+                        BIT_MASK(LED_SUSPEND) | BIT_MASK(LED_SLEEP) |
+                        BIT_MASK(LED_MUTE) | BIT_MASK(LED_MISC);
 
         if (!atkbd->softrepeat) {
                 input_dev->rep[REP_DELAY] = 250;
                 input_dev->rep[REP_PERIOD] = 33;
         }
 
-        input_dev->mscbit[0] = atkbd->softraw ? BIT(MSC_SCAN) : BIT(MSC_RAW) | BIT(MSC_SCAN);
+        input_dev->mscbit[0] = atkbd->softraw ? BIT_MASK(MSC_SCAN) :
+                BIT_MASK(MSC_RAW) | BIT_MASK(MSC_SCAN);
 
         if (atkbd->scroll) {
-                input_dev->evbit[0] |= BIT(EV_REL);
-                input_dev->relbit[0] = BIT(REL_WHEEL) | BIT(REL_HWHEEL);
+                input_dev->evbit[0] |= BIT_MASK(EV_REL);
+                input_dev->relbit[0] = BIT_MASK(REL_WHEEL) |
+                        BIT_MASK(REL_HWHEEL);
                 set_bit(BTN_MIDDLE, input_dev->keybit);
         }
 
diff --git a/drivers/input/keyboard/corgikbd.c b/drivers/input/keyboard/corgikbd.c
index 6578bfff644b..790fed368aae 100644
--- a/drivers/input/keyboard/corgikbd.c
+++ b/drivers/input/keyboard/corgikbd.c
@@ -325,7 +325,8 @@ static int __init corgikbd_probe(struct platform_device *pdev)
         input_dev->id.version = 0x0100;
         input_dev->dev.parent = &pdev->dev;
 
-        input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REP) | BIT(EV_PWR) | BIT(EV_SW);
+        input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_REP) |
+                BIT_MASK(EV_PWR) | BIT_MASK(EV_SW);
         input_dev->keycode = corgikbd->keycode;
         input_dev->keycodesize = sizeof(unsigned char);
         input_dev->keycodemax = ARRAY_SIZE(corgikbd_keycode);
diff --git a/drivers/input/keyboard/gpio_keys.c b/drivers/input/keyboard/gpio_keys.c
index e2a3293bc67e..3eddf52a0bba 100644
--- a/drivers/input/keyboard/gpio_keys.c
+++ b/drivers/input/keyboard/gpio_keys.c
@@ -62,7 +62,7 @@ static int __devinit gpio_keys_probe(struct platform_device *pdev)
 
         platform_set_drvdata(pdev, input);
 
-        input->evbit[0] = BIT(EV_KEY);
+        input->evbit[0] = BIT_MASK(EV_KEY);
 
         input->name = pdev->name;
         input->phys = "gpio-keys/input0";
diff --git a/drivers/input/keyboard/hil_kbd.c b/drivers/input/keyboard/hil_kbd.c
index cdd254f2e6c7..adbf29f0169d 100644
--- a/drivers/input/keyboard/hil_kbd.c
+++ b/drivers/input/keyboard/hil_kbd.c
@@ -323,8 +323,9 @@ static int hil_kbd_connect(struct serio *serio, struct serio_driver *drv)
                 goto bail2;
         }
 
-        kbd->dev->evbit[0]      = BIT(EV_KEY) | BIT(EV_REP);
-        kbd->dev->ledbit[0]     = BIT(LED_NUML) | BIT(LED_CAPSL) | BIT(LED_SCROLLL);
+        kbd->dev->evbit[0]      = BIT_MASK(EV_KEY) | BIT_MASK(EV_REP);
+        kbd->dev->ledbit[0]     = BIT_MASK(LED_NUML) | BIT_MASK(LED_CAPSL) |
+                BIT_MASK(LED_SCROLLL);
         kbd->dev->keycodemax    = HIL_KEYCODES_SET1_TBLSIZE;
         kbd->dev->keycodesize   = sizeof(hil_kbd_set1[0]);
         kbd->dev->keycode       = hil_kbd_set1;
diff --git a/drivers/input/keyboard/hilkbd.c b/drivers/input/keyboard/hilkbd.c
index 499b6974457f..50d80ecf0b80 100644
--- a/drivers/input/keyboard/hilkbd.c
+++ b/drivers/input/keyboard/hilkbd.c
@@ -266,8 +266,9 @@ hil_keyb_init(void)
                 if (hphilkeyb_keycode[i] != KEY_RESERVED)
                         set_bit(hphilkeyb_keycode[i], hil_dev.dev->keybit);
 
-        hil_dev.dev->evbit[0]   = BIT(EV_KEY) | BIT(EV_REP);
-        hil_dev.dev->ledbit[0]  = BIT(LED_NUML) | BIT(LED_CAPSL) | BIT(LED_SCROLLL);
+        hil_dev.dev->evbit[0]   = BIT_MASK(EV_KEY) | BIT_MASK(EV_REP);
+        hil_dev.dev->ledbit[0]  = BIT_MASK(LED_NUML) | BIT_MASK(LED_CAPSL) |
+                BIT_MASK(LED_SCROLLL);
         hil_dev.dev->keycodemax = HIL_KEYCODES_SET1_TBLSIZE;
         hil_dev.dev->keycodesize= sizeof(hphilkeyb_keycode[0]);
         hil_dev.dev->keycode    = hphilkeyb_keycode;
diff --git a/drivers/input/keyboard/locomokbd.c b/drivers/input/keyboard/locomokbd.c
index 7a41b271f222..5a0ca18d6755 100644
--- a/drivers/input/keyboard/locomokbd.c
+++ b/drivers/input/keyboard/locomokbd.c
@@ -233,7 +233,7 @@ static int locomokbd_probe(struct locomo_dev *dev)
         input_dev->id.version = 0x0100;
         input_dev->dev.parent = &dev->dev;
 
-        input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REP);
+        input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_REP);
         input_dev->keycode = locomokbd->keycode;
         input_dev->keycodesize = sizeof(unsigned char);
         input_dev->keycodemax = ARRAY_SIZE(locomokbd_keycode);
diff --git a/drivers/input/keyboard/newtonkbd.c b/drivers/input/keyboard/newtonkbd.c
index b97a41e3ee56..48d1cab0aa1c 100644
--- a/drivers/input/keyboard/newtonkbd.c
+++ b/drivers/input/keyboard/newtonkbd.c
@@ -106,7 +106,7 @@ static int nkbd_connect(struct serio *serio, struct serio_driver *drv)
         input_dev->id.version = 0x0100;
         input_dev->dev.parent = &serio->dev;
 
-        input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REP);
+        input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_REP);
         input_dev->keycode = nkbd->keycode;
         input_dev->keycodesize = sizeof(unsigned char);
         input_dev->keycodemax = ARRAY_SIZE(nkbd_keycode);
diff --git a/drivers/input/keyboard/pxa27x_keyboard.c b/drivers/input/keyboard/pxa27x_keyboard.c
index b7061aa38816..bdd64ee4c5c8 100644
--- a/drivers/input/keyboard/pxa27x_keyboard.c
+++ b/drivers/input/keyboard/pxa27x_keyboard.c
@@ -183,8 +183,9 @@ static int __devinit pxakbd_probe(struct platform_device *pdev)
         input_dev->close = pxakbd_close;
         input_dev->dev.parent = &pdev->dev;
 
-        input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REP) | BIT(EV_REL);
-        input_dev->relbit[LONG(REL_WHEEL)] = BIT(REL_WHEEL);
+        input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_REP) |
+                BIT_MASK(EV_REL);
+        input_dev->relbit[BIT_WORD(REL_WHEEL)] = BIT_MASK(REL_WHEEL);
         for (row = 0; row < pdata->nr_rows; row++) {
                 for (col = 0; col < pdata->nr_cols; col++) {
                         int code = pdata->keycodes[row][col];
diff --git a/drivers/input/keyboard/spitzkbd.c b/drivers/input/keyboard/spitzkbd.c
index 41b80385476c..410d78a774d0 100644
--- a/drivers/input/keyboard/spitzkbd.c
+++ b/drivers/input/keyboard/spitzkbd.c
@@ -381,7 +381,8 @@ static int __init spitzkbd_probe(struct platform_device *dev)
         input_dev->id.product = 0x0001;
         input_dev->id.version = 0x0100;
 
-        input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REP) | BIT(EV_PWR) | BIT(EV_SW);
+        input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_REP) |
+                BIT_MASK(EV_PWR) | BIT_MASK(EV_SW);
         input_dev->keycode = spitzkbd->keycode;
         input_dev->keycodesize = sizeof(unsigned char);
         input_dev->keycodemax = ARRAY_SIZE(spitzkbd_keycode);
diff --git a/drivers/input/keyboard/stowaway.c b/drivers/input/keyboard/stowaway.c
index b44b0684d543..7437219370b1 100644
--- a/drivers/input/keyboard/stowaway.c
+++ b/drivers/input/keyboard/stowaway.c
@@ -110,7 +110,7 @@ static int skbd_connect(struct serio *serio, struct serio_driver *drv)
         input_dev->id.version = 0x0100;
         input_dev->dev.parent = &serio->dev;
 
-        input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REP);
+        input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_REP);
         input_dev->keycode = skbd->keycode;
         input_dev->keycodesize = sizeof(unsigned char);
         input_dev->keycodemax = ARRAY_SIZE(skbd_keycode);
diff --git a/drivers/input/keyboard/sunkbd.c b/drivers/input/keyboard/sunkbd.c
index 1d4e39624cfe..be0f5d19d023 100644
--- a/drivers/input/keyboard/sunkbd.c
+++ b/drivers/input/keyboard/sunkbd.c
@@ -277,9 +277,11 @@ static int sunkbd_connect(struct serio *serio, struct serio_driver *drv)
 
         input_dev->event = sunkbd_event;
 
-        input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_LED) | BIT(EV_SND) | BIT(EV_REP);
-        input_dev->ledbit[0] = BIT(LED_CAPSL) | BIT(LED_COMPOSE) | BIT(LED_SCROLLL) | BIT(LED_NUML);
-        input_dev->sndbit[0] = BIT(SND_CLICK) | BIT(SND_BELL);
+        input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_LED) |
+                BIT_MASK(EV_SND) | BIT_MASK(EV_REP);
+        input_dev->ledbit[0] = BIT_MASK(LED_CAPSL) | BIT_MASK(LED_COMPOSE) |
+                BIT_MASK(LED_SCROLLL) | BIT_MASK(LED_NUML);
+        input_dev->sndbit[0] = BIT_MASK(SND_CLICK) | BIT_MASK(SND_BELL);
 
         input_dev->keycode = sunkbd->keycode;
         input_dev->keycodesize = sizeof(unsigned char);
diff --git a/drivers/input/keyboard/xtkbd.c b/drivers/input/keyboard/xtkbd.c
index f3a56eb58ed1..152a2c070508 100644
--- a/drivers/input/keyboard/xtkbd.c
+++ b/drivers/input/keyboard/xtkbd.c
@@ -110,7 +110,7 @@ static int xtkbd_connect(struct serio *serio, struct serio_driver *drv)
         input_dev->id.version = 0x0100;
         input_dev->dev.parent = &serio->dev;
 
-        input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REP);
+        input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_REP);
         input_dev->keycode = xtkbd->keycode;
         input_dev->keycodesize = sizeof(unsigned char);
         input_dev->keycodemax = ARRAY_SIZE(xtkbd_keycode);
diff --git a/drivers/input/misc/ati_remote.c b/drivers/input/misc/ati_remote.c
index 471aab206443..3a7937481ad8 100644
--- a/drivers/input/misc/ati_remote.c
+++ b/drivers/input/misc/ati_remote.c
@@ -662,10 +662,10 @@ static void ati_remote_input_init(struct ati_remote *ati_remote)
         struct input_dev *idev = ati_remote->idev;
         int i;
 
-        idev->evbit[0] = BIT(EV_KEY) | BIT(EV_REL);
-        idev->keybit[LONG(BTN_MOUSE)] = ( BIT(BTN_LEFT) | BIT(BTN_RIGHT) |
-                                          BIT(BTN_SIDE) | BIT(BTN_EXTRA) );
-        idev->relbit[0] = BIT(REL_X) | BIT(REL_Y);
+        idev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_REL);
+        idev->keybit[BIT_WORD(BTN_MOUSE)] = BIT_MASK(BTN_LEFT) |
+                BIT_MASK(BTN_RIGHT) | BIT_MASK(BTN_SIDE) | BIT_MASK(BTN_EXTRA);
+        idev->relbit[0] = BIT_MASK(REL_X) | BIT_MASK(REL_Y);
         for (i = 0; ati_remote_tbl[i].kind != KIND_END; i++)
                 if (ati_remote_tbl[i].type == EV_KEY)
                         set_bit(ati_remote_tbl[i].code, idev->keybit);
diff --git a/drivers/input/misc/ati_remote2.c b/drivers/input/misc/ati_remote2.c
index 1031543e5c3f..f2709b82485c 100644
--- a/drivers/input/misc/ati_remote2.c
+++ b/drivers/input/misc/ati_remote2.c
@@ -346,9 +346,10 @@ static int ati_remote2_input_init(struct ati_remote2 *ar2)
         ar2->idev = idev;
         input_set_drvdata(idev, ar2);
 
-        idev->evbit[0] = BIT(EV_KEY) | BIT(EV_REP) | BIT(EV_REL);
-        idev->keybit[LONG(BTN_MOUSE)] = BIT(BTN_LEFT) | BIT(BTN_RIGHT);
-        idev->relbit[0] = BIT(REL_X) | BIT(REL_Y);
+        idev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_REP) | BIT_MASK(EV_REL);
+        idev->keybit[BIT_WORD(BTN_MOUSE)] = BIT_MASK(BTN_LEFT) |
+                BIT_MASK(BTN_RIGHT);
+        idev->relbit[0] = BIT_MASK(REL_X) | BIT_MASK(REL_Y);
         for (i = 0; ati_remote2_key_table[i].key_code != KEY_RESERVED; i++)
                 set_bit(ati_remote2_key_table[i].key_code, idev->keybit);
 
diff --git a/drivers/input/misc/atlas_btns.c b/drivers/input/misc/atlas_btns.c
index e43e92fd9e23..4e3ad657ed80 100644
--- a/drivers/input/misc/atlas_btns.c
+++ b/drivers/input/misc/atlas_btns.c
@@ -81,7 +81,7 @@ static int atlas_acpi_button_add(struct acpi_device *device)
         input_dev->name = "Atlas ACPI button driver";
         input_dev->phys = "ASIM0000/atlas/input0";
         input_dev->id.bustype = BUS_HOST;
-        input_dev->evbit[LONG(EV_KEY)] = BIT(EV_KEY);
+        input_dev->evbit[BIT_WORD(EV_KEY)] = BIT_MASK(EV_KEY);
 
         set_bit(KEY_F1, input_dev->keybit);
         set_bit(KEY_F2, input_dev->keybit);
diff --git a/drivers/input/misc/cobalt_btns.c b/drivers/input/misc/cobalt_btns.c
index 064b07936019..1aef97ed5e84 100644
--- a/drivers/input/misc/cobalt_btns.c
+++ b/drivers/input/misc/cobalt_btns.c
@@ -104,7 +104,7 @@ static int __devinit cobalt_buttons_probe(struct platform_device *pdev)
         input->id.bustype = BUS_HOST;
         input->cdev.dev = &pdev->dev;
 
-        input->evbit[0] = BIT(EV_KEY);
+        input->evbit[0] = BIT_MASK(EV_KEY);
         for (i = 0; i < ARRAY_SIZE(buttons_map); i++) {
                 set_bit(buttons_map[i].keycode, input->keybit);
                 buttons_map[i].count = 0;
diff --git a/drivers/input/misc/ixp4xx-beeper.c b/drivers/input/misc/ixp4xx-beeper.c
index e759944041ab..d2ade7443b7d 100644
--- a/drivers/input/misc/ixp4xx-beeper.c
+++ b/drivers/input/misc/ixp4xx-beeper.c
@@ -109,8 +109,8 @@ static int __devinit ixp4xx_spkr_probe(struct platform_device *dev)
         input_dev->id.version = 0x0100;
         input_dev->dev.parent = &dev->dev;
 
-        input_dev->evbit[0] = BIT(EV_SND);
-        input_dev->sndbit[0] = BIT(SND_BELL) | BIT(SND_TONE);
+        input_dev->evbit[0] = BIT_MASK(EV_SND);
+        input_dev->sndbit[0] = BIT_MASK(SND_BELL) | BIT_MASK(SND_TONE);
         input_dev->event = ixp4xx_spkr_event;
 
         err = request_irq(IRQ_IXP4XX_TIMER2, &ixp4xx_spkr_interrupt,
diff --git a/drivers/input/misc/keyspan_remote.c b/drivers/input/misc/keyspan_remote.c
index 1bffc9fa98c2..fd74347047dd 100644
--- a/drivers/input/misc/keyspan_remote.c
+++ b/drivers/input/misc/keyspan_remote.c
@@ -497,7 +497,7 @@ static int keyspan_probe(struct usb_interface *interface, const struct usb_devic
         usb_to_input_id(udev, &input_dev->id);
         input_dev->dev.parent = &interface->dev;
 
-        input_dev->evbit[0] = BIT(EV_KEY);              /* We will only report KEY events. */
+        input_dev->evbit[0] = BIT_MASK(EV_KEY);         /* We will only report KEY events. */
         for (i = 0; i < ARRAY_SIZE(keyspan_key_table); i++)
                 if (keyspan_key_table[i] != KEY_RESERVED)
                         set_bit(keyspan_key_table[i], input_dev->keybit);
diff --git a/drivers/input/misc/m68kspkr.c b/drivers/input/misc/m68kspkr.c
index e9f26e766b4d..0c64d9bb718e 100644
--- a/drivers/input/misc/m68kspkr.c
+++ b/drivers/input/misc/m68kspkr.c
@@ -65,8 +65,8 @@ static int __devinit m68kspkr_probe(struct platform_device *dev)
         input_dev->id.version = 0x0100;
         input_dev->dev.parent = &dev->dev;
 
-        input_dev->evbit[0] = BIT(EV_SND);
-        input_dev->sndbit[0] = BIT(SND_BELL) | BIT(SND_TONE);
+        input_dev->evbit[0] = BIT_MASK(EV_SND);
+        input_dev->sndbit[0] = BIT_MASK(SND_BELL) | BIT_MASK(SND_TONE);
         input_dev->event = m68kspkr_event;
 
         err = input_register_device(input_dev);
diff --git a/drivers/input/misc/pcspkr.c b/drivers/input/misc/pcspkr.c
index c19f77fbaf2a..4941a9e61e90 100644
--- a/drivers/input/misc/pcspkr.c
+++ b/drivers/input/misc/pcspkr.c
@@ -86,8 +86,8 @@ static int __devinit pcspkr_probe(struct platform_device *dev)
         pcspkr_dev->id.version = 0x0100;
         pcspkr_dev->dev.parent = &dev->dev;
 
-        pcspkr_dev->evbit[0] = BIT(EV_SND);
-        pcspkr_dev->sndbit[0] = BIT(SND_BELL) | BIT(SND_TONE);
+        pcspkr_dev->evbit[0] = BIT_MASK(EV_SND);
+        pcspkr_dev->sndbit[0] = BIT_MASK(SND_BELL) | BIT_MASK(SND_TONE);
         pcspkr_dev->event = pcspkr_event;
 
         err = input_register_device(pcspkr_dev);
diff --git a/drivers/input/misc/powermate.c b/drivers/input/misc/powermate.c
index 448a470d28f2..7a7b8c7b9633 100644
--- a/drivers/input/misc/powermate.c
+++ b/drivers/input/misc/powermate.c
@@ -363,10 +363,11 @@ static int powermate_probe(struct usb_interface *intf, const struct usb_device_i
 
         input_dev->event = powermate_input_event;
 
-        input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REL) | BIT(EV_MSC);
-        input_dev->keybit[LONG(BTN_0)] = BIT(BTN_0);
-        input_dev->relbit[LONG(REL_DIAL)] = BIT(REL_DIAL);
-        input_dev->mscbit[LONG(MSC_PULSELED)] = BIT(MSC_PULSELED);
+        input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_REL) |
+                BIT_MASK(EV_MSC);
+        input_dev->keybit[BIT_WORD(BTN_0)] = BIT_MASK(BTN_0);
+        input_dev->relbit[BIT_WORD(REL_DIAL)] = BIT_MASK(REL_DIAL);
+        input_dev->mscbit[BIT_WORD(MSC_PULSELED)] = BIT_MASK(MSC_PULSELED);
 
         /* get a handle to the interrupt data pipe */
         pipe = usb_rcvintpipe(udev, endpoint->bEndpointAddress);
diff --git a/drivers/input/misc/sparcspkr.c b/drivers/input/misc/sparcspkr.c
index e36ec1d92be8..a3637d870880 100644
--- a/drivers/input/misc/sparcspkr.c
+++ b/drivers/input/misc/sparcspkr.c
@@ -115,8 +115,8 @@ static int __devinit sparcspkr_probe(struct device *dev)
         input_dev->id.version = 0x0100;
         input_dev->dev.parent = dev;
 
-        input_dev->evbit[0] = BIT(EV_SND);
-        input_dev->sndbit[0] = BIT(SND_BELL) | BIT(SND_TONE);
+        input_dev->evbit[0] = BIT_MASK(EV_SND);
+        input_dev->sndbit[0] = BIT_MASK(SND_BELL) | BIT_MASK(SND_TONE);
 
         input_dev->event = state->event;
 
diff --git a/drivers/input/misc/yealink.c b/drivers/input/misc/yealink.c
index ab15880fd566..46279ef2b649 100644
--- a/drivers/input/misc/yealink.c
+++ b/drivers/input/misc/yealink.c
@@ -945,7 +945,7 @@ static int usb_probe(struct usb_interface *intf, const struct usb_device_id *id)
         /* input_dev->event = input_ev; TODO */
 
         /* register available key events */
-        input_dev->evbit[0] = BIT(EV_KEY);
+        input_dev->evbit[0] = BIT_MASK(EV_KEY);
         for (i = 0; i < 256; i++) {
                 int k = map_p1k_to_key(i);
                 if (k >= 0) {
diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c
index 64d70a9b714c..2b5ed119c9a9 100644
--- a/drivers/input/mouse/alps.c
+++ b/drivers/input/mouse/alps.c
@@ -455,24 +455,25 @@ int alps_init(struct psmouse *psmouse)
         if (alps_hw_init(psmouse, &version))
                 goto init_fail;
 
-        dev1->evbit[LONG(EV_KEY)] |= BIT(EV_KEY);
-        dev1->keybit[LONG(BTN_TOUCH)] |= BIT(BTN_TOUCH);
-        dev1->keybit[LONG(BTN_TOOL_FINGER)] |= BIT(BTN_TOOL_FINGER);
-        dev1->keybit[LONG(BTN_LEFT)] |= BIT(BTN_LEFT) | BIT(BTN_MIDDLE) | BIT(BTN_RIGHT);
+        dev1->evbit[BIT_WORD(EV_KEY)] |= BIT_MASK(EV_KEY);
+        dev1->keybit[BIT_WORD(BTN_TOUCH)] |= BIT_MASK(BTN_TOUCH);
+        dev1->keybit[BIT_WORD(BTN_TOOL_FINGER)] |= BIT_MASK(BTN_TOOL_FINGER);
+        dev1->keybit[BIT_WORD(BTN_LEFT)] |= BIT_MASK(BTN_LEFT) |
+                BIT_MASK(BTN_MIDDLE) | BIT_MASK(BTN_RIGHT);
 
-        dev1->evbit[LONG(EV_ABS)] |= BIT(EV_ABS);
+        dev1->evbit[BIT_WORD(EV_ABS)] |= BIT_MASK(EV_ABS);
         input_set_abs_params(dev1, ABS_X, 0, 1023, 0, 0);
         input_set_abs_params(dev1, ABS_Y, 0, 767, 0, 0);
         input_set_abs_params(dev1, ABS_PRESSURE, 0, 127, 0, 0);
 
         if (priv->i->flags & ALPS_WHEEL) {
-                dev1->evbit[LONG(EV_REL)] |= BIT(EV_REL);
-                dev1->relbit[LONG(REL_WHEEL)] |= BIT(REL_WHEEL);
+                dev1->evbit[BIT_WORD(EV_REL)] |= BIT_MASK(EV_REL);
+                dev1->relbit[BIT_WORD(REL_WHEEL)] |= BIT_MASK(REL_WHEEL);
         }
 
         if (priv->i->flags & (ALPS_FW_BK_1 | ALPS_FW_BK_2)) {
-                dev1->keybit[LONG(BTN_FORWARD)] |= BIT(BTN_FORWARD);
-                dev1->keybit[LONG(BTN_BACK)] |= BIT(BTN_BACK);
+                dev1->keybit[BIT_WORD(BTN_FORWARD)] |= BIT_MASK(BTN_FORWARD);
+                dev1->keybit[BIT_WORD(BTN_BACK)] |= BIT_MASK(BTN_BACK);
         }
 
         snprintf(priv->phys, sizeof(priv->phys), "%s/input1", psmouse->ps2dev.serio->phys);
@@ -483,9 +484,10 @@ int alps_init(struct psmouse *psmouse)
         dev2->id.product = PSMOUSE_ALPS;
         dev2->id.version = 0x0000;
 
-        dev2->evbit[0] = BIT(EV_KEY) | BIT(EV_REL);
-        dev2->relbit[LONG(REL_X)] |= BIT(REL_X) | BIT(REL_Y);
-        dev2->keybit[LONG(BTN_LEFT)] |= BIT(BTN_LEFT) | BIT(BTN_MIDDLE) | BIT(BTN_RIGHT);
+        dev2->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_REL);
+        dev2->relbit[BIT_WORD(REL_X)] |= BIT_MASK(REL_X) | BIT_MASK(REL_Y);
+        dev2->keybit[BIT_WORD(BTN_LEFT)] |= BIT_MASK(BTN_LEFT) |
+                BIT_MASK(BTN_MIDDLE) | BIT_MASK(BTN_RIGHT);
 
         if (input_register_device(priv->dev2))
                 goto init_fail;
diff --git a/drivers/input/mouse/amimouse.c b/drivers/input/mouse/amimouse.c
index 239a0e16d91a..a185ac78a42c 100644
--- a/drivers/input/mouse/amimouse.c
+++ b/drivers/input/mouse/amimouse.c
@@ -111,9 +111,10 @@ static int __init amimouse_init(void)
         amimouse_dev->id.product = 0x0002;
         amimouse_dev->id.version = 0x0100;
 
-        amimouse_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REL);
-        amimouse_dev->relbit[0] = BIT(REL_X) | BIT(REL_Y);
-        amimouse_dev->keybit[LONG(BTN_LEFT)] = BIT(BTN_LEFT) | BIT(BTN_MIDDLE) | BIT(BTN_RIGHT);
+        amimouse_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_REL);
+        amimouse_dev->relbit[0] = BIT_MASK(REL_X) | BIT_MASK(REL_Y);
+        amimouse_dev->keybit[BIT_WORD(BTN_LEFT)] = BIT_MASK(BTN_LEFT) |
+                BIT_MASK(BTN_MIDDLE) | BIT_MASK(BTN_RIGHT);
         amimouse_dev->open = amimouse_open;
         amimouse_dev->close = amimouse_close;
 
diff --git a/drivers/input/mouse/atarimouse.c b/drivers/input/mouse/atarimouse.c
index c8c7244b48a1..98a3561d4b05 100644
--- a/drivers/input/mouse/atarimouse.c
+++ b/drivers/input/mouse/atarimouse.c
@@ -137,9 +137,10 @@ static int __init atamouse_init(void)
         atamouse_dev->id.product = 0x0002;
         atamouse_dev->id.version = 0x0100;
 
-        atamouse_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REL);
-        atamouse_dev->relbit[0] = BIT(REL_X) | BIT(REL_Y);
-        atamouse_dev->keybit[LONG(BTN_LEFT)] = BIT(BTN_LEFT) | BIT(BTN_MIDDLE) | BIT(BTN_RIGHT);
+        atamouse_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_REL);
+        atamouse_dev->relbit[0] = BIT_MASK(REL_X) | BIT_MASK(REL_Y);
+        atamouse_dev->keybit[BIT_WORD(BTN_LEFT)] = BIT_MASK(BTN_LEFT) |
+                BIT_MASK(BTN_MIDDLE) | BIT_MASK(BTN_RIGHT);
         atamouse_dev->open = atamouse_open;
         atamouse_dev->close = atamouse_close;
 
diff --git a/drivers/input/mouse/hil_ptr.c b/drivers/input/mouse/hil_ptr.c
index 449bf4dcbbcc..27f88fbb7136 100644
--- a/drivers/input/mouse/hil_ptr.c
+++ b/drivers/input/mouse/hil_ptr.c
@@ -298,12 +298,12 @@ static int hil_ptr_connect(struct serio *serio, struct serio_driver *driver)
         idd = ptr->idd + 1;
         txt = "unknown";
         if ((did & HIL_IDD_DID_TYPE_MASK) == HIL_IDD_DID_TYPE_REL) {
-                ptr->dev->evbit[0] = BIT(EV_REL);
+                ptr->dev->evbit[0] = BIT_MASK(EV_REL);
                 txt = "relative";
         }
 
         if ((did & HIL_IDD_DID_TYPE_MASK) == HIL_IDD_DID_TYPE_ABS) {
-                ptr->dev->evbit[0] = BIT(EV_ABS);
+                ptr->dev->evbit[0] = BIT_MASK(EV_ABS);
                 txt = "absolute";
         }
         if (!ptr->dev->evbit[0])
@@ -311,7 +311,7 @@ static int hil_ptr_connect(struct serio *serio, struct serio_driver *driver)
 
         ptr->nbtn = HIL_IDD_NUM_BUTTONS(idd);
         if (ptr->nbtn)
-                ptr->dev->evbit[0] |= BIT(EV_KEY);
+                ptr->dev->evbit[0] |= BIT_MASK(EV_KEY);
 
         naxsets = HIL_IDD_NUM_AXSETS(*idd);
         ptr->naxes = HIL_IDD_NUM_AXES_PER_SET(*idd);
diff --git a/drivers/input/mouse/inport.c b/drivers/input/mouse/inport.c
index 79b624fe8994..655a39217432 100644
--- a/drivers/input/mouse/inport.c
+++ b/drivers/input/mouse/inport.c
@@ -163,9 +163,10 @@ static int __init inport_init(void)
         inport_dev->id.product = 0x0001;
         inport_dev->id.version = 0x0100;
 
-        inport_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REL);
-        inport_dev->keybit[LONG(BTN_LEFT)] = BIT(BTN_LEFT) | BIT(BTN_MIDDLE) | BIT(BTN_RIGHT);
-        inport_dev->relbit[0] = BIT(REL_X) | BIT(REL_Y);
+        inport_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_REL);
+        inport_dev->keybit[BIT_WORD(BTN_LEFT)] = BIT_MASK(BTN_LEFT) |
+                BIT_MASK(BTN_MIDDLE) | BIT_MASK(BTN_RIGHT);
+        inport_dev->relbit[0] = BIT_MASK(REL_X) | BIT_MASK(REL_Y);
 
         inport_dev->open  = inport_open;
         inport_dev->close = inport_close;
diff --git a/drivers/input/mouse/lifebook.c b/drivers/input/mouse/lifebook.c
index d7de4c53b3d8..9ec57d80186e 100644
--- a/drivers/input/mouse/lifebook.c
+++ b/drivers/input/mouse/lifebook.c
@@ -270,9 +270,10 @@ static int lifebook_create_relative_device(struct psmouse *psmouse)
         dev2->id.version = 0x0000;
         dev2->dev.parent = &psmouse->ps2dev.serio->dev;
 
-        dev2->evbit[0] = BIT(EV_KEY) | BIT(EV_REL);
-        dev2->relbit[LONG(REL_X)] = BIT(REL_X) | BIT(REL_Y);
-        dev2->keybit[LONG(BTN_LEFT)] = BIT(BTN_LEFT) | BIT(BTN_RIGHT);
+        dev2->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_REL);
+        dev2->relbit[BIT_WORD(REL_X)] = BIT_MASK(REL_X) | BIT_MASK(REL_Y);
+        dev2->keybit[BIT_WORD(BTN_LEFT)] = BIT_MASK(BTN_LEFT) |
+                BIT_MASK(BTN_RIGHT);
 
         error = input_register_device(priv->dev2);
         if (error)
@@ -295,9 +296,9 @@ int lifebook_init(struct psmouse *psmouse)
         if (lifebook_absolute_mode(psmouse))
                 return -1;
 
-        dev1->evbit[0] = BIT(EV_ABS) | BIT(EV_KEY);
+        dev1->evbit[0] = BIT_MASK(EV_ABS) | BIT_MASK(EV_KEY);
         dev1->relbit[0] = 0;
-        dev1->keybit[LONG(BTN_TOUCH)] = BIT(BTN_TOUCH);
+        dev1->keybit[BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH);
         input_set_abs_params(dev1, ABS_X, 0, max_coord, 0, 0);
         input_set_abs_params(dev1, ABS_Y, 0, max_coord, 0, 0);
 
diff --git a/drivers/input/mouse/logibm.c b/drivers/input/mouse/logibm.c
index 26c3b2e2ca94..b23a4f3ea5cd 100644
--- a/drivers/input/mouse/logibm.c
+++ b/drivers/input/mouse/logibm.c
@@ -156,9 +156,10 @@ static int __init logibm_init(void)
         logibm_dev->id.product = 0x0001;
         logibm_dev->id.version = 0x0100;
 
-        logibm_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REL);
-        logibm_dev->keybit[LONG(BTN_LEFT)] = BIT(BTN_LEFT) | BIT(BTN_MIDDLE) | BIT(BTN_RIGHT);
-        logibm_dev->relbit[0] = BIT(REL_X) | BIT(REL_Y);
+        logibm_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_REL);
+        logibm_dev->keybit[BIT_WORD(BTN_LEFT)] = BIT_MASK(BTN_LEFT) |
+                BIT_MASK(BTN_MIDDLE) | BIT_MASK(BTN_RIGHT);
+        logibm_dev->relbit[0] = BIT_MASK(REL_X) | BIT_MASK(REL_Y);
 
         logibm_dev->open  = logibm_open;
         logibm_dev->close = logibm_close;
diff --git a/drivers/input/mouse/pc110pad.c b/drivers/input/mouse/pc110pad.c
index 05d992e514f0..8991ab0b4fe3 100644
--- a/drivers/input/mouse/pc110pad.c
+++ b/drivers/input/mouse/pc110pad.c
@@ -144,9 +144,9 @@ static int __init pc110pad_init(void)
         pc110pad_dev->id.product = 0x0001;
         pc110pad_dev->id.version = 0x0100;
 
-        pc110pad_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
-        pc110pad_dev->absbit[0] = BIT(ABS_X) | BIT(ABS_Y);
-        pc110pad_dev->keybit[LONG(BTN_TOUCH)] = BIT(BTN_TOUCH);
+        pc110pad_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
+        pc110pad_dev->absbit[0] = BIT_MASK(ABS_X) | BIT_MASK(ABS_Y);
+        pc110pad_dev->keybit[BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH);
 
         pc110pad_dev->absmax[ABS_X] = 0x1ff;
         pc110pad_dev->absmax[ABS_Y] = 0x0ff;
diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c
index 073525756532..da316d13d7f5 100644
--- a/drivers/input/mouse/psmouse-base.c
+++ b/drivers/input/mouse/psmouse-base.c
@@ -1115,9 +1115,10 @@ static int psmouse_switch_protocol(struct psmouse *psmouse, const struct psmouse
 
         input_dev->dev.parent = &psmouse->ps2dev.serio->dev;
 
-        input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REL);
-        input_dev->keybit[LONG(BTN_MOUSE)] = BIT(BTN_LEFT) | BIT(BTN_MIDDLE) | BIT(BTN_RIGHT);
-        input_dev->relbit[0] = BIT(REL_X) | BIT(REL_Y);
+        input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_REL);
+        input_dev->keybit[BIT_WORD(BTN_MOUSE)] = BIT_MASK(BTN_LEFT) |
+                BIT_MASK(BTN_MIDDLE) | BIT_MASK(BTN_RIGHT);
+        input_dev->relbit[0] = BIT_MASK(REL_X) | BIT_MASK(REL_Y);
 
         psmouse->set_rate = psmouse_set_rate;
         psmouse->set_resolution = psmouse_set_resolution;
diff --git a/drivers/input/mouse/rpcmouse.c b/drivers/input/mouse/rpcmouse.c
index 355efd0423e7..18a48636ba4a 100644
--- a/drivers/input/mouse/rpcmouse.c
+++ b/drivers/input/mouse/rpcmouse.c
@@ -78,9 +78,10 @@ static int __init rpcmouse_init(void)
         rpcmouse_dev->id.product = 0x0001;
         rpcmouse_dev->id.version = 0x0100;
 
-        rpcmouse_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REL);
-        rpcmouse_dev->keybit[LONG(BTN_LEFT)] = BIT(BTN_LEFT) | BIT(BTN_MIDDLE) | BIT(BTN_RIGHT);
-        rpcmouse_dev->relbit[0] = BIT(REL_X) | BIT(REL_Y);
+        rpcmouse_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_REL);
+        rpcmouse_dev->keybit[BIT_WORD(BTN_LEFT)] = BIT_MASK(BTN_LEFT) |
+                BIT_MASK(BTN_MIDDLE) | BIT_MASK(BTN_RIGHT);
+        rpcmouse_dev->relbit[0] = BIT_MASK(REL_X) | BIT_MASK(REL_Y);
 
         rpcmouse_lastx = (short) iomd_readl(IOMD_MOUSEX);
         rpcmouse_lasty = (short) iomd_readl(IOMD_MOUSEY);
diff --git a/drivers/input/mouse/sermouse.c b/drivers/input/mouse/sermouse.c
index 77b8ee2b9651..ed917bfd086a 100644
--- a/drivers/input/mouse/sermouse.c
+++ b/drivers/input/mouse/sermouse.c
@@ -268,9 +268,10 @@ static int sermouse_connect(struct serio *serio, struct serio_driver *drv)
         input_dev->id.version = 0x0100;
         input_dev->dev.parent = &serio->dev;
 
-        input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REL);
-        input_dev->keybit[LONG(BTN_MOUSE)] = BIT(BTN_LEFT) | BIT(BTN_RIGHT);
-        input_dev->relbit[0] = BIT(REL_X) | BIT(REL_Y);
+        input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_REL);
+        input_dev->keybit[BIT_WORD(BTN_MOUSE)] = BIT_MASK(BTN_LEFT) |
+                BIT_MASK(BTN_RIGHT);
+        input_dev->relbit[0] = BIT_MASK(REL_X) | BIT_MASK(REL_Y);
 
         if (c & 0x01) set_bit(BTN_MIDDLE, input_dev->keybit);
         if (c & 0x02) set_bit(BTN_SIDE, input_dev->keybit);
diff --git a/drivers/input/mouse/touchkit_ps2.c b/drivers/input/mouse/touchkit_ps2.c
index 7b977fd23571..3fadb2accac0 100644
--- a/drivers/input/mouse/touchkit_ps2.c
+++ b/drivers/input/mouse/touchkit_ps2.c
@@ -85,7 +85,7 @@ int touchkit_ps2_detect(struct psmouse *psmouse, int set_properties)
                 return -ENODEV;
 
         if (set_properties) {
-                dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
+                dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
                 set_bit(BTN_TOUCH, dev->keybit);
                 input_set_abs_params(dev, ABS_X, 0, TOUCHKIT_MAX_XC, 0, 0);
                 input_set_abs_params(dev, ABS_Y, 0, TOUCHKIT_MAX_YC, 0, 0);
diff --git a/drivers/input/mousedev.c b/drivers/input/mousedev.c
index 79146d6ed2ab..78c3ea75da2a 100644
--- a/drivers/input/mousedev.c
+++ b/drivers/input/mousedev.c
@@ -998,34 +998,36 @@ static const struct input_device_id mousedev_ids[] = {
                 .flags = INPUT_DEVICE_ID_MATCH_EVBIT |
                                 INPUT_DEVICE_ID_MATCH_KEYBIT |
                                 INPUT_DEVICE_ID_MATCH_RELBIT,
-                .evbit = { BIT(EV_KEY) | BIT(EV_REL) },
-                .keybit = { [LONG(BTN_LEFT)] = BIT(BTN_LEFT) },
-                .relbit = { BIT(REL_X) | BIT(REL_Y) },
+                .evbit = { BIT_MASK(EV_KEY) | BIT_MASK(EV_REL) },
+                .keybit = { [BIT_WORD(BTN_LEFT)] = BIT_MASK(BTN_LEFT) },
+                .relbit = { BIT_MASK(REL_X) | BIT_MASK(REL_Y) },
         },      /* A mouse like device, at least one button,
                    two relative axes */
         {
                 .flags = INPUT_DEVICE_ID_MATCH_EVBIT |
                                 INPUT_DEVICE_ID_MATCH_RELBIT,
-                .evbit = { BIT(EV_KEY) | BIT(EV_REL) },
-                .relbit = { BIT(REL_WHEEL) },
+                .evbit = { BIT_MASK(EV_KEY) | BIT_MASK(EV_REL) },
+                .relbit = { BIT_MASK(REL_WHEEL) },
         },      /* A separate scrollwheel */
         {
                 .flags = INPUT_DEVICE_ID_MATCH_EVBIT |
                                 INPUT_DEVICE_ID_MATCH_KEYBIT |
                                 INPUT_DEVICE_ID_MATCH_ABSBIT,
-                .evbit = { BIT(EV_KEY) | BIT(EV_ABS) },
-                .keybit = { [LONG(BTN_TOUCH)] = BIT(BTN_TOUCH) },
-                .absbit = { BIT(ABS_X) | BIT(ABS_Y) },
+                .evbit = { BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS) },
+                .keybit = { [BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH) },
+                .absbit = { BIT_MASK(ABS_X) | BIT_MASK(ABS_Y) },
         },      /* A tablet like device, at least touch detection,
                    two absolute axes */
         {
                 .flags = INPUT_DEVICE_ID_MATCH_EVBIT |
                                 INPUT_DEVICE_ID_MATCH_KEYBIT |
                                 INPUT_DEVICE_ID_MATCH_ABSBIT,
-                .evbit = { BIT(EV_KEY) | BIT(EV_ABS) },
-                .keybit = { [LONG(BTN_TOOL_FINGER)] = BIT(BTN_TOOL_FINGER) },
-                .absbit = { BIT(ABS_X) | BIT(ABS_Y) | BIT(ABS_PRESSURE) |
-                                BIT(ABS_TOOL_WIDTH) },
+                .evbit = { BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS) },
+                .keybit = { [BIT_WORD(BTN_TOOL_FINGER)] =
+                                BIT_MASK(BTN_TOOL_FINGER) },
+                .absbit = { BIT_MASK(ABS_X) | BIT_MASK(ABS_Y) |
+                                BIT_MASK(ABS_PRESSURE) |
+                                BIT_MASK(ABS_TOOL_WIDTH) },
         },      /* A touchpad */
 
         { },    /* Terminating entry */
diff --git a/drivers/input/tablet/acecad.c b/drivers/input/tablet/acecad.c
index dd2310458c46..b973d0ef6d16 100644
--- a/drivers/input/tablet/acecad.c
+++ b/drivers/input/tablet/acecad.c
@@ -192,10 +192,14 @@ static int usb_acecad_probe(struct usb_interface *intf, const struct usb_device_
         input_dev->open = usb_acecad_open;
         input_dev->close = usb_acecad_close;
 
-        input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
-        input_dev->absbit[0] = BIT(ABS_X) | BIT(ABS_Y) | BIT(ABS_PRESSURE);
-        input_dev->keybit[LONG(BTN_LEFT)] = BIT(BTN_LEFT) | BIT(BTN_RIGHT) | BIT(BTN_MIDDLE);
-        input_dev->keybit[LONG(BTN_DIGI)] = BIT(BTN_TOOL_PEN) |BIT(BTN_TOUCH) | BIT(BTN_STYLUS) | BIT(BTN_STYLUS2);
+        input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
+        input_dev->absbit[0] = BIT_MASK(ABS_X) | BIT_MASK(ABS_Y) |
+                BIT_MASK(ABS_PRESSURE);
+        input_dev->keybit[BIT_WORD(BTN_LEFT)] = BIT_MASK(BTN_LEFT) |
+                BIT_MASK(BTN_RIGHT) | BIT_MASK(BTN_MIDDLE);
+        input_dev->keybit[BIT_WORD(BTN_DIGI)] = BIT_MASK(BTN_TOOL_PEN) |
+                BIT_MASK(BTN_TOUCH) | BIT_MASK(BTN_STYLUS) |
+                BIT_MASK(BTN_STYLUS2);
 
         switch (id->driver_info) {
                 case 0:
diff --git a/drivers/input/tablet/gtco.c b/drivers/input/tablet/gtco.c
index b2ca10f2fe0e..d2c6da264722 100644
--- a/drivers/input/tablet/gtco.c
+++ b/drivers/input/tablet/gtco.c
@@ -573,10 +573,12 @@ static void gtco_setup_caps(struct input_dev *inputdev)
         struct gtco *device = input_get_drvdata(inputdev);
 
         /* Which events */
-        inputdev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS) | BIT(EV_MSC);
+        inputdev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS) |
+                BIT_MASK(EV_MSC);
 
         /* Misc event menu block */
-        inputdev->mscbit[0] = BIT(MSC_SCAN)|BIT(MSC_SERIAL)|BIT(MSC_RAW) ;
+        inputdev->mscbit[0] = BIT_MASK(MSC_SCAN) | BIT_MASK(MSC_SERIAL) |
+                BIT_MASK(MSC_RAW);
 
         /* Absolute values based on HID report info */
         input_set_abs_params(inputdev, ABS_X, device->min_X, device->max_X,
diff --git a/drivers/input/tablet/kbtab.c b/drivers/input/tablet/kbtab.c
index 91e6d00d4a43..1182fc133167 100644
--- a/drivers/input/tablet/kbtab.c
+++ b/drivers/input/tablet/kbtab.c
@@ -153,10 +153,13 @@ static int kbtab_probe(struct usb_interface *intf, const struct usb_device_id *i
         input_dev->open = kbtab_open;
         input_dev->close = kbtab_close;
 
-        input_dev->evbit[0] |= BIT(EV_KEY) | BIT(EV_ABS) | BIT(EV_MSC);
-        input_dev->keybit[LONG(BTN_LEFT)] |= BIT(BTN_LEFT) | BIT(BTN_RIGHT) | BIT(BTN_MIDDLE);
-        input_dev->keybit[LONG(BTN_DIGI)] |= BIT(BTN_TOOL_PEN) | BIT(BTN_TOUCH);
-        input_dev->mscbit[0] |= BIT(MSC_SERIAL);
+        input_dev->evbit[0] |= BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS) |
+                BIT_MASK(EV_MSC);
+        input_dev->keybit[BIT_WORD(BTN_LEFT)] |= BIT_MASK(BTN_LEFT) |
+                BIT_MASK(BTN_RIGHT) | BIT_MASK(BTN_MIDDLE);
+        input_dev->keybit[BIT_WORD(BTN_DIGI)] |= BIT_MASK(BTN_TOOL_PEN) |
+                BIT_MASK(BTN_TOUCH);
+        input_dev->mscbit[0] |= BIT_MASK(MSC_SERIAL);
         input_set_abs_params(input_dev, ABS_X, 0, 0x2000, 4, 0);
         input_set_abs_params(input_dev, ABS_Y, 0, 0x1750, 4, 0);
         input_set_abs_params(input_dev, ABS_PRESSURE, 0, 0xff, 0, 0);
diff --git a/drivers/input/tablet/wacom_sys.c b/drivers/input/tablet/wacom_sys.c
index 064e123c9b76..d64b1ea136b3 100644
--- a/drivers/input/tablet/wacom_sys.c
+++ b/drivers/input/tablet/wacom_sys.c
@@ -140,48 +140,58 @@ static void wacom_close(struct input_dev *dev)
 
 void input_dev_mo(struct input_dev *input_dev, struct wacom_wac *wacom_wac)
 {
-        input_dev->keybit[LONG(BTN_LEFT)] |= BIT(BTN_1) | BIT(BTN_5);
+        input_dev->keybit[BIT_WORD(BTN_LEFT)] |= BIT_MASK(BTN_1) |
+                BIT_MASK(BTN_5);
         input_set_abs_params(input_dev, ABS_WHEEL, 0, 71, 0, 0);
 }
 
 void input_dev_g4(struct input_dev *input_dev, struct wacom_wac *wacom_wac)
 {
-        input_dev->evbit[0] |= BIT(EV_MSC);
-        input_dev->mscbit[0] |= BIT(MSC_SERIAL);
-        input_dev->keybit[LONG(BTN_DIGI)] |= BIT(BTN_TOOL_FINGER);
-        input_dev->keybit[LONG(BTN_LEFT)] |= BIT(BTN_0) | BIT(BTN_4);
+        input_dev->evbit[0] |= BIT_MASK(EV_MSC);
+        input_dev->mscbit[0] |= BIT_MASK(MSC_SERIAL);
+        input_dev->keybit[BIT_WORD(BTN_DIGI)] |= BIT_MASK(BTN_TOOL_FINGER);
+        input_dev->keybit[BIT_WORD(BTN_LEFT)] |= BIT_MASK(BTN_0) |
+                BIT_MASK(BTN_4);
 }
 
 void input_dev_g(struct input_dev *input_dev, struct wacom_wac *wacom_wac)
 {
-        input_dev->evbit[0] |= BIT(EV_REL);
-        input_dev->relbit[0] |= BIT(REL_WHEEL);
-        input_dev->keybit[LONG(BTN_LEFT)] |= BIT(BTN_LEFT) | BIT(BTN_RIGHT) | BIT(BTN_MIDDLE);
-        input_dev->keybit[LONG(BTN_DIGI)] |= BIT(BTN_TOOL_RUBBER) | BIT(BTN_TOOL_MOUSE) | BIT(BTN_STYLUS2);
+        input_dev->evbit[0] |= BIT_MASK(EV_REL);
+        input_dev->relbit[0] |= BIT_MASK(REL_WHEEL);
+        input_dev->keybit[BIT_WORD(BTN_LEFT)] |= BIT_MASK(BTN_LEFT) |
+                BIT_MASK(BTN_RIGHT) | BIT_MASK(BTN_MIDDLE);
+        input_dev->keybit[BIT_WORD(BTN_DIGI)] |= BIT_MASK(BTN_TOOL_RUBBER) |
+                BIT_MASK(BTN_TOOL_MOUSE) | BIT_MASK(BTN_STYLUS2);
         input_set_abs_params(input_dev, ABS_DISTANCE, 0, wacom_wac->features->distance_max, 0, 0);
 }
 
 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_dev->keybit[BIT_WORD(BTN_DIGI)] |= BIT_MASK(BTN_TOOL_FINGER);
+        input_dev->keybit[BIT_WORD(BTN_LEFT)] |= BIT_MASK(BTN_0) |
+                BIT_MASK(BTN_1) | BIT_MASK(BTN_2) | BIT_MASK(BTN_3);
         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_dev->keybit[BIT_WORD(BTN_LEFT)] |= BIT_MASK(BTN_4) |
+                BIT_MASK(BTN_5) | BIT_MASK(BTN_6) | BIT_MASK(BTN_7);
         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)
 {
-        input_dev->evbit[0] |= BIT(EV_MSC) | BIT(EV_REL);
-        input_dev->mscbit[0] |= BIT(MSC_SERIAL);
-        input_dev->relbit[0] |= BIT(REL_WHEEL);
-        input_dev->keybit[LONG(BTN_LEFT)] |= BIT(BTN_LEFT) | BIT(BTN_RIGHT) | BIT(BTN_MIDDLE) | BIT(BTN_SIDE) | BIT(BTN_EXTRA);
-        input_dev->keybit[LONG(BTN_DIGI)] |= BIT(BTN_TOOL_RUBBER) | BIT(BTN_TOOL_MOUSE) | BIT(BTN_TOOL_BRUSH)
-                | BIT(BTN_TOOL_PENCIL) | BIT(BTN_TOOL_AIRBRUSH) | BIT(BTN_TOOL_LENS) | BIT(BTN_STYLUS2);
+        input_dev->evbit[0] |= BIT_MASK(EV_MSC) | BIT_MASK(EV_REL);
+        input_dev->mscbit[0] |= BIT_MASK(MSC_SERIAL);
+        input_dev->relbit[0] |= BIT_MASK(REL_WHEEL);
+        input_dev->keybit[BIT_WORD(BTN_LEFT)] |= BIT_MASK(BTN_LEFT) |
+                BIT_MASK(BTN_RIGHT) | BIT_MASK(BTN_MIDDLE) |
+                BIT_MASK(BTN_SIDE) | BIT_MASK(BTN_EXTRA);
+        input_dev->keybit[BIT_WORD(BTN_DIGI)] |= BIT_MASK(BTN_TOOL_RUBBER) |
+                BIT_MASK(BTN_TOOL_MOUSE) | BIT_MASK(BTN_TOOL_BRUSH) |
+                BIT_MASK(BTN_TOOL_PENCIL) | BIT_MASK(BTN_TOOL_AIRBRUSH) |
+                BIT_MASK(BTN_TOOL_LENS) | BIT_MASK(BTN_STYLUS2);
         input_set_abs_params(input_dev, ABS_DISTANCE, 0, wacom_wac->features->distance_max, 0, 0);
         input_set_abs_params(input_dev, ABS_WHEEL, 0, 1023, 0, 0);
         input_set_abs_params(input_dev, ABS_TILT_X, 0, 127, 0, 0);
@@ -192,12 +202,13 @@ void input_dev_i(struct input_dev *input_dev, struct wacom_wac *wacom_wac)
 
 void input_dev_pl(struct input_dev *input_dev, struct wacom_wac *wacom_wac)
 {
-        input_dev->keybit[LONG(BTN_DIGI)] |= BIT(BTN_STYLUS2) | BIT(BTN_TOOL_RUBBER);
+        input_dev->keybit[BIT_WORD(BTN_DIGI)] |= BIT_MASK(BTN_STYLUS2) |
+                BIT_MASK(BTN_TOOL_RUBBER);
 }
 
 void input_dev_pt(struct input_dev *input_dev, struct wacom_wac *wacom_wac)
 {
-        input_dev->keybit[LONG(BTN_DIGI)] |= BIT(BTN_TOOL_RUBBER);
+        input_dev->keybit[BIT_WORD(BTN_DIGI)] |= BIT_MASK(BTN_TOOL_RUBBER);
 }
 
 static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *id)
@@ -243,12 +254,13 @@ static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *i
         input_dev->open = wacom_open;
         input_dev->close = wacom_close;
 
-        input_dev->evbit[0] |= BIT(EV_KEY) | BIT(EV_ABS);
-        input_dev->keybit[LONG(BTN_DIGI)] |= BIT(BTN_TOOL_PEN) | BIT(BTN_TOUCH) | BIT(BTN_STYLUS);
+        input_dev->evbit[0] |= BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
+        input_dev->keybit[BIT_WORD(BTN_DIGI)] |= BIT_MASK(BTN_TOOL_PEN) |
+                BIT_MASK(BTN_TOUCH) | BIT_MASK(BTN_STYLUS);
         input_set_abs_params(input_dev, ABS_X, 0, wacom_wac->features->x_max, 4, 0);
         input_set_abs_params(input_dev, ABS_Y, 0, wacom_wac->features->y_max, 4, 0);
         input_set_abs_params(input_dev, ABS_PRESSURE, 0, wacom_wac->features->pressure_max, 0, 0);
-        input_dev->absbit[LONG(ABS_MISC)] |= BIT(ABS_MISC);
+        input_dev->absbit[BIT_WORD(ABS_MISC)] |= BIT_MASK(ABS_MISC);
 
         wacom_init_input_dev(input_dev, wacom_wac);
 
diff --git a/drivers/input/touchscreen/ads7846.c b/drivers/input/touchscreen/ads7846.c
index 51ae4fb7d123..f59aecf5ec15 100644
--- a/drivers/input/touchscreen/ads7846.c
+++ b/drivers/input/touchscreen/ads7846.c
@@ -917,8 +917,8 @@ static int __devinit ads7846_probe(struct spi_device *spi)
         input_dev->phys = ts->phys;
         input_dev->dev.parent = &spi->dev;
 
-        input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
-        input_dev->keybit[LONG(BTN_TOUCH)] = BIT(BTN_TOUCH);
+        input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
+        input_dev->keybit[BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH);
         input_set_abs_params(input_dev, ABS_X,
                         pdata->x_min ? : 0,
                         pdata->x_max ? : MAX_12BIT,
diff --git a/drivers/input/touchscreen/corgi_ts.c b/drivers/input/touchscreen/corgi_ts.c
index e6a31d118786..b1b2e07bf080 100644
--- a/drivers/input/touchscreen/corgi_ts.c
+++ b/drivers/input/touchscreen/corgi_ts.c
@@ -302,8 +302,8 @@ static int __init corgits_probe(struct platform_device *pdev)
         input_dev->id.version = 0x0100;
         input_dev->dev.parent = &pdev->dev;
 
-        input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
-        input_dev->keybit[LONG(BTN_TOUCH)] = BIT(BTN_TOUCH);
+        input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
+        input_dev->keybit[BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH);
         input_set_abs_params(input_dev, ABS_X, X_AXIS_MIN, X_AXIS_MAX, 0, 0);
         input_set_abs_params(input_dev, ABS_Y, Y_AXIS_MIN, Y_AXIS_MAX, 0, 0);
         input_set_abs_params(input_dev, ABS_PRESSURE, PRESSURE_MIN, PRESSURE_MAX, 0, 0);
diff --git a/drivers/input/touchscreen/elo.c b/drivers/input/touchscreen/elo.c
index 557d781719f1..d20689cdbd5d 100644
--- a/drivers/input/touchscreen/elo.c
+++ b/drivers/input/touchscreen/elo.c
@@ -320,8 +320,8 @@ static int elo_connect(struct serio *serio, struct serio_driver *drv)
         input_dev->id.version = 0x0100;
         input_dev->dev.parent = &serio->dev;
 
-        input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
-        input_dev->keybit[LONG(BTN_TOUCH)] = BIT(BTN_TOUCH);
+        input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
+        input_dev->keybit[BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH);
 
         serio_set_drvdata(serio, elo);
         err = serio_open(serio, drv);
diff --git a/drivers/input/touchscreen/fujitsu_ts.c b/drivers/input/touchscreen/fujitsu_ts.c
index daf7a4afc935..80b21800355f 100644
--- a/drivers/input/touchscreen/fujitsu_ts.c
+++ b/drivers/input/touchscreen/fujitsu_ts.c
@@ -122,8 +122,8 @@ static int fujitsu_connect(struct serio *serio, struct serio_driver *drv)
         input_dev->id.vendor = SERIO_FUJITSU;
         input_dev->id.product = 0;
         input_dev->id.version = 0x0100;
-        input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
-        input_dev->keybit[LONG(BTN_TOUCH)] = BIT(BTN_TOUCH);
+        input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
+        input_dev->keybit[BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH);
 
         input_set_abs_params(input_dev, ABS_X, 0, 4096, 0, 0);
         input_set_abs_params(input_dev, ABS_Y, 0, 4096, 0, 0);
diff --git a/drivers/input/touchscreen/gunze.c b/drivers/input/touchscreen/gunze.c
index 39d602600d7c..a48a15868c4a 100644
--- a/drivers/input/touchscreen/gunze.c
+++ b/drivers/input/touchscreen/gunze.c
@@ -137,8 +137,8 @@ static int gunze_connect(struct serio *serio, struct serio_driver *drv)
         input_dev->id.product = 0x0051;
         input_dev->id.version = 0x0100;
         input_dev->dev.parent = &serio->dev;
-        input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
-        input_dev->keybit[LONG(BTN_TOUCH)] = BIT(BTN_TOUCH);
+        input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
+        input_dev->keybit[BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH);
         input_set_abs_params(input_dev, ABS_X, 24, 1000, 0, 0);
         input_set_abs_params(input_dev, ABS_Y, 24, 1000, 0, 0);
 
diff --git a/drivers/input/touchscreen/h3600_ts_input.c b/drivers/input/touchscreen/h3600_ts_input.c
index 09ed7803cb8f..2ae6c6016a86 100644
--- a/drivers/input/touchscreen/h3600_ts_input.c
+++ b/drivers/input/touchscreen/h3600_ts_input.c
@@ -373,8 +373,9 @@ static int h3600ts_connect(struct serio *serio, struct serio_driver *drv)
 
         input_dev->event = h3600ts_event;
 
-        input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS) | BIT(EV_LED) | BIT(EV_PWR);
-        input_dev->ledbit[0] = BIT(LED_SLEEP);
+        input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS) |
+                BIT_MASK(EV_LED) | BIT_MASK(EV_PWR);
+        input_dev->ledbit[0] = BIT_MASK(LED_SLEEP);
         input_set_abs_params(input_dev, ABS_X, 60, 985, 0, 0);
         input_set_abs_params(input_dev, ABS_Y, 35, 1024, 0, 0);
 
diff --git a/drivers/input/touchscreen/hp680_ts_input.c b/drivers/input/touchscreen/hp680_ts_input.c
index 1a15475aedfc..c38d4e0f95c6 100644
--- a/drivers/input/touchscreen/hp680_ts_input.c
+++ b/drivers/input/touchscreen/hp680_ts_input.c
@@ -81,8 +81,8 @@ static int __init hp680_ts_init(void)
         if (!hp680_ts_dev)
                 return -ENOMEM;
 
-        hp680_ts_dev->evbit[0] = BIT(EV_ABS) | BIT(EV_KEY);
-        hp680_ts_dev->keybit[LONG(BTN_TOUCH)] = BIT(BTN_TOUCH);
+        hp680_ts_dev->evbit[0] = BIT_MASK(EV_ABS) | BIT_MASK(EV_KEY);
+        hp680_ts_dev->keybit[BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH);
 
         input_set_abs_params(hp680_ts_dev, ABS_X,
                 HP680_TS_ABS_X_MIN, HP680_TS_ABS_X_MAX, 0, 0);
diff --git a/drivers/input/touchscreen/mk712.c b/drivers/input/touchscreen/mk712.c
index 44140feeffc5..80a658868706 100644
--- a/drivers/input/touchscreen/mk712.c
+++ b/drivers/input/touchscreen/mk712.c
@@ -186,8 +186,8 @@ static int __init mk712_init(void)
         mk712_dev->open    = mk712_open;
         mk712_dev->close   = mk712_close;
 
-        mk712_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
-        mk712_dev->keybit[LONG(BTN_TOUCH)] = BIT(BTN_TOUCH);
+        mk712_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
+        mk712_dev->keybit[BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH);
         input_set_abs_params(mk712_dev, ABS_X, 0, 0xfff, 88, 0);
         input_set_abs_params(mk712_dev, ABS_Y, 0, 0xfff, 88, 0);
 
diff --git a/drivers/input/touchscreen/mtouch.c b/drivers/input/touchscreen/mtouch.c
index 4ec3b1f940c8..9077228418b7 100644
--- a/drivers/input/touchscreen/mtouch.c
+++ b/drivers/input/touchscreen/mtouch.c
@@ -151,8 +151,8 @@ static int mtouch_connect(struct serio *serio, struct serio_driver *drv)
         input_dev->id.product = 0;
         input_dev->id.version = 0x0100;
         input_dev->dev.parent = &serio->dev;
-        input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
-        input_dev->keybit[LONG(BTN_TOUCH)] = BIT(BTN_TOUCH);
+        input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
+        input_dev->keybit[BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH);
         input_set_abs_params(mtouch->dev, ABS_X, MTOUCH_MIN_XC, MTOUCH_MAX_XC, 0, 0);
         input_set_abs_params(mtouch->dev, ABS_Y, MTOUCH_MIN_YC, MTOUCH_MAX_YC, 0, 0);
 
diff --git a/drivers/input/touchscreen/penmount.c b/drivers/input/touchscreen/penmount.c
index f2c0d3c7149c..c7f9cebebbb6 100644
--- a/drivers/input/touchscreen/penmount.c
+++ b/drivers/input/touchscreen/penmount.c
@@ -113,8 +113,8 @@ static int pm_connect(struct serio *serio, struct serio_driver *drv)
         input_dev->id.version = 0x0100;
         input_dev->dev.parent = &serio->dev;
 
-        input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
-        input_dev->keybit[LONG(BTN_TOUCH)] = BIT(BTN_TOUCH);
+        input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
+        input_dev->keybit[BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH);
         input_set_abs_params(pm->dev, ABS_X, 0, 0x3ff, 0, 0);
         input_set_abs_params(pm->dev, ABS_Y, 0, 0x3ff, 0, 0);
 
diff --git a/drivers/input/touchscreen/touchright.c b/drivers/input/touchscreen/touchright.c
index 3def7bb1df44..3a5c142c2a78 100644
--- a/drivers/input/touchscreen/touchright.c
+++ b/drivers/input/touchscreen/touchright.c
@@ -125,8 +125,8 @@ static int tr_connect(struct serio *serio, struct serio_driver *drv)
         input_dev->id.product = 0;
         input_dev->id.version = 0x0100;
         input_dev->dev.parent = &serio->dev;
-        input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
-        input_dev->keybit[LONG(BTN_TOUCH)] = BIT(BTN_TOUCH);
+        input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
+        input_dev->keybit[BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH);
         input_set_abs_params(tr->dev, ABS_X, TR_MIN_XC, TR_MAX_XC, 0, 0);
         input_set_abs_params(tr->dev, ABS_Y, TR_MIN_YC, TR_MAX_YC, 0, 0);
 
diff --git a/drivers/input/touchscreen/touchwin.c b/drivers/input/touchscreen/touchwin.c
index ac4bdcf18666..763a656a59f8 100644
--- a/drivers/input/touchscreen/touchwin.c
+++ b/drivers/input/touchscreen/touchwin.c
@@ -132,8 +132,8 @@ static int tw_connect(struct serio *serio, struct serio_driver *drv)
         input_dev->id.product = 0;
         input_dev->id.version = 0x0100;
         input_dev->dev.parent = &serio->dev;
-        input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
-        input_dev->keybit[LONG(BTN_TOUCH)] = BIT(BTN_TOUCH);
+        input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
+        input_dev->keybit[BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH);
         input_set_abs_params(tw->dev, ABS_X, TW_MIN_XC, TW_MAX_XC, 0, 0);
         input_set_abs_params(tw->dev, ABS_Y, TW_MIN_YC, TW_MAX_YC, 0, 0);
 
diff --git a/drivers/input/touchscreen/ucb1400_ts.c b/drivers/input/touchscreen/ucb1400_ts.c
index 89373b01d8f5..7549939b9535 100644
--- a/drivers/input/touchscreen/ucb1400_ts.c
+++ b/drivers/input/touchscreen/ucb1400_ts.c
@@ -517,7 +517,7 @@ static int ucb1400_ts_probe(struct device *dev)
         idev->id.product        = id;
         idev->open              = ucb1400_ts_open;
         idev->close             = ucb1400_ts_close;
-        idev->evbit[0]          = BIT(EV_ABS);
+        idev->evbit[0]          = BIT_MASK(EV_ABS);
 
         ucb1400_adc_enable(ucb);
         x_res = ucb1400_ts_read_xres(ucb);
diff --git a/drivers/input/touchscreen/usbtouchscreen.c b/drivers/input/touchscreen/usbtouchscreen.c
index 9fb3d5c30999..5f34b78d5ddb 100644
--- a/drivers/input/touchscreen/usbtouchscreen.c
+++ b/drivers/input/touchscreen/usbtouchscreen.c
@@ -868,8 +868,8 @@ static int usbtouch_probe(struct usb_interface *intf,
         input_dev->open = usbtouch_open;
         input_dev->close = usbtouch_close;
 
-        input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
-        input_dev->keybit[LONG(BTN_TOUCH)] = BIT(BTN_TOUCH);
+        input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
+        input_dev->keybit[BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH);
         input_set_abs_params(input_dev, ABS_X, type->min_xc, type->max_xc, 0, 0);
         input_set_abs_params(input_dev, ABS_Y, type->min_yc, type->max_yc, 0, 0);
         if (type->max_press)
diff --git a/drivers/isdn/hardware/avm/b1dma.c b/drivers/isdn/hardware/avm/b1dma.c
index 428872b653e9..669f6f67449c 100644
--- a/drivers/isdn/hardware/avm/b1dma.c
+++ b/drivers/isdn/hardware/avm/b1dma.c
@@ -486,11 +486,13 @@ static void b1dma_handle_rx(avmcard *card)
                                         card->name);
                 } else {
                         memcpy(skb_put(skb, MsgLen), card->msgbuf, MsgLen);
-                        if (CAPIMSG_CMD(skb->data) == CAPI_DATA_B3_CONF)
+                        if (CAPIMSG_CMD(skb->data) == CAPI_DATA_B3_CONF) {
+                                spin_lock(&card->lock);
                                 capilib_data_b3_conf(&cinfo->ncci_head, ApplId,
-                                                     CAPIMSG_NCCI(skb->data),
-                                                     CAPIMSG_MSGID(skb->data));
-
+                                        CAPIMSG_NCCI(skb->data),
+                                        CAPIMSG_MSGID(skb->data));
+                                spin_unlock(&card->lock);
+                        }
                         capi_ctr_handle_message(ctrl, ApplId, skb);
                 }
                 break;
@@ -500,9 +502,9 @@ static void b1dma_handle_rx(avmcard *card)
                 ApplId = _get_word(&p);
                 NCCI = _get_word(&p);
                 WindowSize = _get_word(&p);
-
+                spin_lock(&card->lock);
                 capilib_new_ncci(&cinfo->ncci_head, ApplId, NCCI, WindowSize);
-
+                spin_unlock(&card->lock);
                 break;
 
         case RECEIVE_FREE_NCCI:
@@ -510,9 +512,11 @@ static void b1dma_handle_rx(avmcard *card)
                 ApplId = _get_word(&p);
                 NCCI = _get_word(&p);
 
-                if (NCCI != 0xffffffff)
+                if (NCCI != 0xffffffff) {
+                        spin_lock(&card->lock);
                         capilib_free_ncci(&cinfo->ncci_head, ApplId, NCCI);
-
+                        spin_unlock(&card->lock);
+                }
                 break;
 
         case RECEIVE_START:
@@ -751,10 +755,10 @@ void b1dma_reset_ctr(struct capi_ctr *ctrl)
 
         spin_lock_irqsave(&card->lock, flags);
         b1dma_reset(card);
-        spin_unlock_irqrestore(&card->lock, flags);
 
         memset(cinfo->version, 0, sizeof(cinfo->version));
         capilib_release(&cinfo->ncci_head);
+        spin_unlock_irqrestore(&card->lock, flags);
         capi_ctr_reseted(ctrl);
 }
 
@@ -803,8 +807,11 @@ void b1dma_release_appl(struct capi_ctr *ctrl, u16 appl)
         avmcard *card = cinfo->card;
         struct sk_buff *skb;
         void *p;
+        unsigned long flags;
 
+        spin_lock_irqsave(&card->lock, flags);
         capilib_release_appl(&cinfo->ncci_head, appl);
+        spin_unlock_irqrestore(&card->lock, flags);
 
         skb = alloc_skb(7, GFP_ATOMIC);
         if (!skb) {
@@ -832,10 +839,13 @@ u16 b1dma_send_message(struct capi_ctr *ctrl, struct sk_buff *skb)
         u16 retval = CAPI_NOERROR;
 
         if (CAPIMSG_CMD(skb->data) == CAPI_DATA_B3_REQ) {
+                unsigned long flags;
+                spin_lock_irqsave(&card->lock, flags);
                 retval = capilib_data_b3_req(&cinfo->ncci_head,
                                              CAPIMSG_APPID(skb->data),
                                              CAPIMSG_NCCI(skb->data),
                                              CAPIMSG_MSGID(skb->data));
+                spin_unlock_irqrestore(&card->lock, flags);
         }
         if (retval == CAPI_NOERROR) 
                 b1dma_queue_tx(card, skb);
diff --git a/drivers/isdn/hardware/avm/c4.c b/drivers/isdn/hardware/avm/c4.c
index 8710cf6214d9..4bbbbe688077 100644
--- a/drivers/isdn/hardware/avm/c4.c
+++ b/drivers/isdn/hardware/avm/c4.c
@@ -678,7 +678,9 @@ static irqreturn_t c4_handle_interrupt(avmcard *card)
                 for (i=0; i < card->nr_controllers; i++) {
                         avmctrl_info *cinfo = &card->ctrlinfo[i];
                         memset(cinfo->version, 0, sizeof(cinfo->version));
+                        spin_lock_irqsave(&card->lock, flags);
                         capilib_release(&cinfo->ncci_head);
+                        spin_unlock_irqrestore(&card->lock, flags);
                         capi_ctr_reseted(&cinfo->capi_ctrl);
                 }
                 card->nlogcontr = 0;
diff --git a/drivers/isdn/hardware/avm/t1isa.c b/drivers/isdn/hardware/avm/t1isa.c
index c925020fe9b7..6130724e46e7 100644
--- a/drivers/isdn/hardware/avm/t1isa.c
+++ b/drivers/isdn/hardware/avm/t1isa.c
@@ -180,8 +180,8 @@ static irqreturn_t t1isa_interrupt(int interrupt, void *devptr)
 
                         ApplId = (unsigned) b1_get_word(card->port);
                         MsgLen = t1_get_slice(card->port, card->msgbuf);
-                        spin_unlock_irqrestore(&card->lock, flags);
                         if (!(skb = alloc_skb(MsgLen, GFP_ATOMIC))) {
+                                spin_unlock_irqrestore(&card->lock, flags);
                                 printk(KERN_ERR "%s: incoming packet dropped\n",
                                                 card->name);
                         } else {
@@ -190,7 +190,7 @@ static irqreturn_t t1isa_interrupt(int interrupt, void *devptr)
                                         capilib_data_b3_conf(&cinfo->ncci_head, ApplId,
                                                              CAPIMSG_NCCI(skb->data),
                                                              CAPIMSG_MSGID(skb->data));
-
+                                spin_unlock_irqrestore(&card->lock, flags);
                                 capi_ctr_handle_message(ctrl, ApplId, skb);
                         }
                         break;
@@ -200,21 +200,17 @@ static irqreturn_t t1isa_interrupt(int interrupt, void *devptr)
                         ApplId = b1_get_word(card->port);
                         NCCI = b1_get_word(card->port);
                         WindowSize = b1_get_word(card->port);
-                        spin_unlock_irqrestore(&card->lock, flags);
-
                         capilib_new_ncci(&cinfo->ncci_head, ApplId, NCCI, WindowSize);
-
+                        spin_unlock_irqrestore(&card->lock, flags);
                         break;
 
                 case RECEIVE_FREE_NCCI:
 
                         ApplId = b1_get_word(card->port);
                         NCCI = b1_get_word(card->port);
-                        spin_unlock_irqrestore(&card->lock, flags);
-
                         if (NCCI != 0xffffffff)
                                 capilib_free_ncci(&cinfo->ncci_head, ApplId, NCCI);
-
+                        spin_unlock_irqrestore(&card->lock, flags);
                         break;
 
                 case RECEIVE_START:
@@ -333,13 +329,16 @@ static void t1isa_reset_ctr(struct capi_ctr *ctrl)
         avmctrl_info *cinfo = (avmctrl_info *)(ctrl->driverdata);
         avmcard *card = cinfo->card;
         unsigned int port = card->port;
+        unsigned long flags;
 
         t1_disable_irq(port);
         b1_reset(port);
         b1_reset(port);
 
         memset(cinfo->version, 0, sizeof(cinfo->version));
+        spin_lock_irqsave(&card->lock, flags);
         capilib_release(&cinfo->ncci_head);
+        spin_unlock_irqrestore(&card->lock, flags);
         capi_ctr_reseted(ctrl);
 }
 
@@ -466,29 +465,26 @@ static u16 t1isa_send_message(struct capi_ctr *ctrl, struct sk_buff *skb)
         u8 subcmd = CAPIMSG_SUBCOMMAND(skb->data);
         u16 dlen, retval;
 
+        spin_lock_irqsave(&card->lock, flags);
         if (CAPICMD(cmd, subcmd) == CAPI_DATA_B3_REQ) {
                 retval = capilib_data_b3_req(&cinfo->ncci_head,
                                              CAPIMSG_APPID(skb->data),
                                              CAPIMSG_NCCI(skb->data),
                                              CAPIMSG_MSGID(skb->data));
-                if (retval != CAPI_NOERROR) 
+                if (retval != CAPI_NOERROR) {
+                        spin_unlock_irqrestore(&card->lock, flags);
                         return retval;
-
+                }
                 dlen = CAPIMSG_DATALEN(skb->data);
 
-                spin_lock_irqsave(&card->lock, flags);
                 b1_put_byte(port, SEND_DATA_B3_REQ);
                 t1_put_slice(port, skb->data, len);
                 t1_put_slice(port, skb->data + len, dlen);
-                spin_unlock_irqrestore(&card->lock, flags);
         } else {
-
-                spin_lock_irqsave(&card->lock, flags);
                 b1_put_byte(port, SEND_MESSAGE);
                 t1_put_slice(port, skb->data, len);
-                spin_unlock_irqrestore(&card->lock, flags);
         }
-
+        spin_unlock_irqrestore(&card->lock, flags);
         dev_kfree_skb_any(skb);
         return CAPI_NOERROR;
 }
diff --git a/drivers/isdn/sc/debug.h b/drivers/isdn/sc/debug.h
deleted file mode 100644
index e9db96ede4b2..000000000000
--- a/drivers/isdn/sc/debug.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* $Id: debug.h,v 1.2.8.1 2001/09/23 22:24:59 kai Exp $
- *
- * Copyright (C) 1996  SpellCaster Telecommunications Inc.
- *
- * This software may be used and distributed according to the terms
- * of the GNU General Public License, incorporated herein by reference.
- *
- * For more information, please contact gpl-info@spellcast.com or write:
- *
- *     SpellCaster Telecommunications Inc.
- *     5621 Finch Avenue East, Unit #3
- *     Scarborough, Ontario  Canada
- *     M1B 2T9
- *     +1 (416) 297-8565
- *     +1 (416) 297-6433 Facsimile
- */
-
-#define REQUEST_IRQ(a,b,c,d,e) request_irq(a,b,c,d,e)
-#define FREE_IRQ(a,b) free_irq(a,b)
diff --git a/drivers/isdn/sc/includes.h b/drivers/isdn/sc/includes.h
index 5286e0c810a9..4766e5b77378 100644
--- a/drivers/isdn/sc/includes.h
+++ b/drivers/isdn/sc/includes.h
@@ -14,4 +14,3 @@
 #include <linux/timer.h>
 #include <linux/wait.h>
 #include <linux/isdnif.h>
-#include "debug.h"
diff --git a/drivers/isdn/sc/init.c b/drivers/isdn/sc/init.c
index 0bf76344a0d5..d09c854cfac7 100644
--- a/drivers/isdn/sc/init.c
+++ b/drivers/isdn/sc/init.c
@@ -404,7 +404,7 @@ static void __exit sc_exit(void)
                 /*
                  * Release the IRQ
                  */
-                FREE_IRQ(sc_adapter[i]->interrupt, NULL);
+                free_irq(sc_adapter[i]->interrupt, NULL);
 
                 /*
                  * Reset for a clean start
diff --git a/drivers/macintosh/adbhid.c b/drivers/macintosh/adbhid.c
index 2766e4fc4ea8..883da72b5368 100644
--- a/drivers/macintosh/adbhid.c
+++ b/drivers/macintosh/adbhid.c
@@ -791,8 +791,10 @@ adbhid_input_register(int id, int default_id, int original_handler_id,
                         if (hid->keycode[i])
                                 set_bit(hid->keycode[i], input_dev->keybit);
 
-                input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_LED) | BIT(EV_REP);
-                input_dev->ledbit[0] = BIT(LED_SCROLLL) | BIT(LED_CAPSL) | BIT(LED_NUML);
+                input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_LED) |
+                        BIT_MASK(EV_REP);
+                input_dev->ledbit[0] = BIT_MASK(LED_SCROLLL) |
+                        BIT_MASK(LED_CAPSL) | BIT_MASK(LED_NUML);
                 input_dev->event = adbhid_kbd_event;
                 input_dev->keycodemax = KEY_FN;
                 input_dev->keycodesize = sizeof(hid->keycode[0]);
@@ -801,16 +803,18 @@ adbhid_input_register(int id, int default_id, int original_handler_id,
         case ADB_MOUSE:
                 sprintf(hid->name, "ADB mouse");
 
-                input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REL);
-                input_dev->keybit[LONG(BTN_MOUSE)] = BIT(BTN_LEFT) | BIT(BTN_MIDDLE) | BIT(BTN_RIGHT);
-                input_dev->relbit[0] = BIT(REL_X) | BIT(REL_Y);
+                input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_REL);
+                input_dev->keybit[BIT_WORD(BTN_MOUSE)] = BIT_MASK(BTN_LEFT) |
+                        BIT_MASK(BTN_MIDDLE) | BIT_MASK(BTN_RIGHT);
+                input_dev->relbit[0] = BIT_MASK(REL_X) | BIT_MASK(REL_Y);
                 break;
 
         case ADB_MISC:
                 switch (original_handler_id) {
                 case 0x02: /* Adjustable keyboard button device */
                         sprintf(hid->name, "ADB adjustable keyboard buttons");
-                        input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REP);
+                        input_dev->evbit[0] = BIT_MASK(EV_KEY) |
+                                BIT_MASK(EV_REP);
                         set_bit(KEY_SOUND, input_dev->keybit);
                         set_bit(KEY_MUTE, input_dev->keybit);
                         set_bit(KEY_VOLUMEUP, input_dev->keybit);
@@ -818,7 +822,8 @@ adbhid_input_register(int id, int default_id, int original_handler_id,
                         break;
                 case 0x1f: /* Powerbook button device */
                         sprintf(hid->name, "ADB Powerbook buttons");
-                        input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REP);
+                        input_dev->evbit[0] = BIT_MASK(EV_KEY) |
+                                BIT_MASK(EV_REP);
                         set_bit(KEY_MUTE, input_dev->keybit);
                         set_bit(KEY_VOLUMEUP, input_dev->keybit);
                         set_bit(KEY_VOLUMEDOWN, input_dev->keybit);
diff --git a/drivers/macintosh/mac_hid.c b/drivers/macintosh/mac_hid.c
index 33dee3a773ed..89302309da92 100644
--- a/drivers/macintosh/mac_hid.c
+++ b/drivers/macintosh/mac_hid.c
@@ -117,9 +117,10 @@ static int emumousebtn_input_register(void)
         emumousebtn->id.product = 0x0001;
         emumousebtn->id.version = 0x0100;
 
-        emumousebtn->evbit[0] = BIT(EV_KEY) | BIT(EV_REL);
-        emumousebtn->keybit[LONG(BTN_MOUSE)] = BIT(BTN_LEFT) | BIT(BTN_MIDDLE) | BIT(BTN_RIGHT);
-        emumousebtn->relbit[0] = BIT(REL_X) | BIT(REL_Y);
+        emumousebtn->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_REL);
+        emumousebtn->keybit[BIT_WORD(BTN_MOUSE)] = BIT_MASK(BTN_LEFT) |
+                BIT_MASK(BTN_MIDDLE) | BIT_MASK(BTN_RIGHT);
+        emumousebtn->relbit[0] = BIT_MASK(REL_X) | BIT_MASK(REL_Y);
 
         ret = input_register_device(emumousebtn);
         if (ret)
diff --git a/drivers/macintosh/mediabay.c b/drivers/macintosh/mediabay.c
index c803d2bba65d..48d647abea46 100644
--- a/drivers/macintosh/mediabay.c
+++ b/drivers/macintosh/mediabay.c
@@ -563,7 +563,7 @@ static void media_bay_step(int i)
                                 ide_init_hwif_ports(&hw, (unsigned long) bay->cd_base, (unsigned long) 0, NULL);
                                 hw.irq = bay->cd_irq;
                                 hw.chipset = ide_pmac;
-                                bay->cd_index = ide_register_hw(&hw, 0, NULL);
+                                bay->cd_index = ide_register_hw(&hw, NULL, 0, NULL);
                                 pmu_resume();
                         }
                         if (bay->cd_index == -1) {
diff --git a/drivers/md/Kconfig b/drivers/md/Kconfig
index 34a8c60a254a..9b6fbf044fd8 100644
--- a/drivers/md/Kconfig
+++ b/drivers/md/Kconfig
@@ -267,6 +267,12 @@ config DM_MULTIPATH_RDAC
         ---help---
           Multipath support for LSI/Engenio RDAC.
 
+config DM_MULTIPATH_HP
+        tristate "HP MSA multipath support (EXPERIMENTAL)"
+        depends on DM_MULTIPATH && BLK_DEV_DM && EXPERIMENTAL
+        ---help---
+          Multipath support for HP MSA (Active/Passive) series hardware.
+
 config DM_DELAY
         tristate "I/O delaying target (EXPERIMENTAL)"
         depends on BLK_DEV_DM && EXPERIMENTAL
@@ -276,4 +282,10 @@ config DM_DELAY
 
         If unsure, say N.
 
+config DM_UEVENT
+        bool "DM uevents (EXPERIMENTAL)"
+        depends on BLK_DEV_DM && EXPERIMENTAL
+        ---help---
+        Generate udev events for DM events.
+
 endif # MD
diff --git a/drivers/md/Makefile b/drivers/md/Makefile
index c49366cdc05d..d9aa7edb8780 100644
--- a/drivers/md/Makefile
+++ b/drivers/md/Makefile
@@ -8,6 +8,7 @@ dm-multipath-objs := dm-hw-handler.o dm-path-selector.o dm-mpath.o
 dm-snapshot-objs := dm-snap.o dm-exception-store.o
 dm-mirror-objs  := dm-log.o dm-raid1.o
 dm-rdac-objs    := dm-mpath-rdac.o
+dm-hp-sw-objs   := dm-mpath-hp-sw.o
 md-mod-objs     := md.o bitmap.o
 raid456-objs    := raid5.o raid6algos.o raid6recov.o raid6tables.o \
                    raid6int1.o raid6int2.o raid6int4.o \
@@ -35,6 +36,7 @@ obj-$(CONFIG_DM_CRYPT)		+= dm-crypt.o
 obj-$(CONFIG_DM_DELAY)          += dm-delay.o
 obj-$(CONFIG_DM_MULTIPATH)      += dm-multipath.o dm-round-robin.o
 obj-$(CONFIG_DM_MULTIPATH_EMC)  += dm-emc.o
+obj-$(CONFIG_DM_MULTIPATH_HP)   += dm-hp-sw.o
 obj-$(CONFIG_DM_MULTIPATH_RDAC) += dm-rdac.o
 obj-$(CONFIG_DM_SNAPSHOT)       += dm-snapshot.o
 obj-$(CONFIG_DM_MIRROR)         += dm-mirror.o
@@ -48,6 +50,10 @@ ifeq ($(CONFIG_ALTIVEC),y)
 altivec_flags := -maltivec -mabi=altivec
 endif
 
+ifeq ($(CONFIG_DM_UEVENT),y)
+dm-mod-objs                     += dm-uevent.o
+endif
+
 targets += raid6int1.c
 $(obj)/raid6int1.c:   UNROLL := 1
 $(obj)/raid6int1.c:   $(src)/raid6int.uc $(src)/unroll.pl FORCE
diff --git a/drivers/md/dm-bio-list.h b/drivers/md/dm-bio-list.h
index 3f7b827649e3..d4509be0fe67 100644
--- a/drivers/md/dm-bio-list.h
+++ b/drivers/md/dm-bio-list.h
@@ -21,11 +21,6 @@ static inline int bio_list_empty(const struct bio_list *bl)
         return bl->head == NULL;
 }
 
-#define BIO_LIST_INIT { .head = NULL, .tail = NULL }
-
-#define BIO_LIST(bl) \
-        struct bio_list bl = BIO_LIST_INIT
-
 static inline void bio_list_init(struct bio_list *bl)
 {
         bl->head = bl->tail = NULL;
diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c
index 64fee90bb68b..b41f945df8a1 100644
--- a/drivers/md/dm-crypt.c
+++ b/drivers/md/dm-crypt.c
@@ -36,7 +36,6 @@ struct dm_crypt_io {
         struct work_struct work;
         atomic_t pending;
         int error;
-        int post_process;
 };
 
 /*
@@ -57,7 +56,7 @@ struct crypt_config;
 
 struct crypt_iv_operations {
         int (*ctr)(struct crypt_config *cc, struct dm_target *ti,
-                   const char *opts);
+                   const char *opts);
         void (*dtr)(struct crypt_config *cc);
         const char *(*status)(struct crypt_config *cc);
         int (*generator)(struct crypt_config *cc, u8 *iv, sector_t sector);
@@ -80,6 +79,8 @@ struct crypt_config {
         mempool_t *page_pool;
         struct bio_set *bs;
 
+        struct workqueue_struct *io_queue;
+        struct workqueue_struct *crypt_queue;
         /*
          * crypto related data
          */
@@ -137,7 +138,7 @@ static int crypt_iv_plain_gen(struct crypt_config *cc, u8 *iv, sector_t sector)
 }
 
 static int crypt_iv_essiv_ctr(struct crypt_config *cc, struct dm_target *ti,
-                              const char *opts)
+                              const char *opts)
 {
         struct crypto_cipher *essiv_tfm;
         struct crypto_hash *hash_tfm;
@@ -175,6 +176,7 @@ static int crypt_iv_essiv_ctr(struct crypt_config *cc, struct dm_target *ti,
 
         if (err) {
                 ti->error = "Error calculating hash in ESSIV";
+                kfree(salt);
                 return err;
         }
 
@@ -188,7 +190,7 @@ static int crypt_iv_essiv_ctr(struct crypt_config *cc, struct dm_target *ti,
         if (crypto_cipher_blocksize(essiv_tfm) !=
             crypto_blkcipher_ivsize(cc->tfm)) {
                 ti->error = "Block size of ESSIV cipher does "
-                                "not match IV size of block cipher";
+                            "not match IV size of block cipher";
                 crypto_free_cipher(essiv_tfm);
                 kfree(salt);
                 return -EINVAL;
@@ -319,10 +321,10 @@ crypt_convert_scatterlist(struct crypt_config *cc, struct scatterlist *out,
         return r;
 }
 
-static void
-crypt_convert_init(struct crypt_config *cc, struct convert_context *ctx,
-                   struct bio *bio_out, struct bio *bio_in,
-                   sector_t sector, int write)
+static void crypt_convert_init(struct crypt_config *cc,
+                               struct convert_context *ctx,
+                               struct bio *bio_out, struct bio *bio_in,
+                               sector_t sector, int write)
 {
         ctx->bio_in = bio_in;
         ctx->bio_out = bio_out;
@@ -338,7 +340,7 @@ crypt_convert_init(struct crypt_config *cc, struct convert_context *ctx,
  * Encrypt / decrypt data from one bio to another one (can be the same one)
  */
 static int crypt_convert(struct crypt_config *cc,
-                         struct convert_context *ctx)
+                         struct convert_context *ctx)
 {
         int r = 0;
 
@@ -370,7 +372,7 @@ static int crypt_convert(struct crypt_config *cc,
                 }
 
                 r = crypt_convert_scatterlist(cc, &sg_out, &sg_in, sg_in.length,
-                                              ctx->write, ctx->sector);
+                                              ctx->write, ctx->sector);
                 if (r < 0)
                         break;
 
@@ -380,13 +382,13 @@ static int crypt_convert(struct crypt_config *cc,
         return r;
 }
 
- static void dm_crypt_bio_destructor(struct bio *bio)
- {
+static void dm_crypt_bio_destructor(struct bio *bio)
+{
         struct dm_crypt_io *io = bio->bi_private;
         struct crypt_config *cc = io->target->private;
 
         bio_free(bio, cc->bs);
- }
+}
 
 /*
  * Generate a new unfragmented bio with the given size
@@ -458,7 +460,7 @@ static void crypt_free_buffer_pages(struct crypt_config *cc, struct bio *clone)
  * One of the bios was finished. Check for completion of
  * the whole request and correctly clean up the buffer.
  */
-static void dec_pending(struct dm_crypt_io *io, int error)
+static void crypt_dec_pending(struct dm_crypt_io *io, int error)
 {
         struct crypt_config *cc = (struct crypt_config *) io->target->private;
 
@@ -474,18 +476,36 @@ static void dec_pending(struct dm_crypt_io *io, int error)
 }
 
 /*
- * kcryptd:
+ * kcryptd/kcryptd_io:
  *
  * Needed because it would be very unwise to do decryption in an
  * interrupt context.
+ *
+ * kcryptd performs the actual encryption or decryption.
+ *
+ * kcryptd_io performs the IO submission.
+ *
+ * They must be separated as otherwise the final stages could be
+ * starved by new requests which can block in the first stages due
+ * to memory allocation.
  */
-static struct workqueue_struct *_kcryptd_workqueue;
 static void kcryptd_do_work(struct work_struct *work);
+static void kcryptd_do_crypt(struct work_struct *work);
 
 static void kcryptd_queue_io(struct dm_crypt_io *io)
 {
+        struct crypt_config *cc = io->target->private;
+
         INIT_WORK(&io->work, kcryptd_do_work);
-        queue_work(_kcryptd_workqueue, &io->work);
+        queue_work(cc->io_queue, &io->work);
+}
+
+static void kcryptd_queue_crypt(struct dm_crypt_io *io)
+{
+        struct crypt_config *cc = io->target->private;
+
+        INIT_WORK(&io->work, kcryptd_do_crypt);
+        queue_work(cc->crypt_queue, &io->work);
 }
 
 static void crypt_endio(struct bio *clone, int error)
@@ -508,13 +528,12 @@ static void crypt_endio(struct bio *clone, int error)
         }
 
         bio_put(clone);
-        io->post_process = 1;
-        kcryptd_queue_io(io);
+        kcryptd_queue_crypt(io);
         return;
 
 out:
         bio_put(clone);
-        dec_pending(io, error);
+        crypt_dec_pending(io, error);
 }
 
 static void clone_init(struct dm_crypt_io *io, struct bio *clone)
@@ -544,7 +563,7 @@ static void process_read(struct dm_crypt_io *io)
          */
         clone = bio_alloc_bioset(GFP_NOIO, bio_segments(base_bio), cc->bs);
         if (unlikely(!clone)) {
-                dec_pending(io, -ENOMEM);
+                crypt_dec_pending(io, -ENOMEM);
                 return;
         }
 
@@ -579,7 +598,7 @@ static void process_write(struct dm_crypt_io *io)
         while (remaining) {
                 clone = crypt_alloc_buffer(io, remaining);
                 if (unlikely(!clone)) {
-                        dec_pending(io, -ENOMEM);
+                        crypt_dec_pending(io, -ENOMEM);
                         return;
                 }
 
@@ -589,7 +608,7 @@ static void process_write(struct dm_crypt_io *io)
                 if (unlikely(crypt_convert(cc, &ctx) < 0)) {
                         crypt_free_buffer_pages(cc, clone);
                         bio_put(clone);
-                        dec_pending(io, -EIO);
+                        crypt_dec_pending(io, -EIO);
                         return;
                 }
 
@@ -624,17 +643,23 @@ static void process_read_endio(struct dm_crypt_io *io)
         crypt_convert_init(cc, &ctx, io->base_bio, io->base_bio,
                            io->base_bio->bi_sector - io->target->begin, 0);
 
-        dec_pending(io, crypt_convert(cc, &ctx));
+        crypt_dec_pending(io, crypt_convert(cc, &ctx));
 }
 
 static void kcryptd_do_work(struct work_struct *work)
 {
         struct dm_crypt_io *io = container_of(work, struct dm_crypt_io, work);
 
-        if (io->post_process)
-                process_read_endio(io);
-        else if (bio_data_dir(io->base_bio) == READ)
+        if (bio_data_dir(io->base_bio) == READ)
                 process_read(io);
+}
+
+static void kcryptd_do_crypt(struct work_struct *work)
+{
+        struct dm_crypt_io *io = container_of(work, struct dm_crypt_io, work);
+
+        if (bio_data_dir(io->base_bio) == READ)
+                process_read_endio(io);
         else
                 process_write(io);
 }
@@ -690,7 +715,7 @@ static int crypt_set_key(struct crypt_config *cc, char *key)
         cc->key_size = key_size; /* initial settings */
 
         if ((!key_size && strcmp(key, "-")) ||
-            (key_size && crypt_decode_key(cc->key, key, key_size) < 0))
+           (key_size && crypt_decode_key(cc->key, key, key_size) < 0))
                 return -EINVAL;
 
         set_bit(DM_CRYPT_KEY_VALID, &cc->flags);
@@ -746,7 +771,7 @@ static int crypt_ctr(struct dm_target *ti, unsigned int argc, char **argv)
 
         if (crypt_set_key(cc, argv[1])) {
                 ti->error = "Error decoding key";
-                goto bad1;
+                goto bad_cipher;
         }
 
         /* Compatiblity mode for old dm-crypt cipher strings */
@@ -757,19 +782,19 @@ static int crypt_ctr(struct dm_target *ti, unsigned int argc, char **argv)
 
         if (strcmp(chainmode, "ecb") && !ivmode) {
                 ti->error = "This chaining mode requires an IV mechanism";
-                goto bad1;
+                goto bad_cipher;
         }
 
-        if (snprintf(cc->cipher, CRYPTO_MAX_ALG_NAME, "%s(%s)", chainmode, 
-                     cipher) >= CRYPTO_MAX_ALG_NAME) {
+        if (snprintf(cc->cipher, CRYPTO_MAX_ALG_NAME, "%s(%s)",
+                     chainmode, cipher) >= CRYPTO_MAX_ALG_NAME) {
                 ti->error = "Chain mode + cipher name is too long";
-                goto bad1;
+                goto bad_cipher;
         }
 
         tfm = crypto_alloc_blkcipher(cc->cipher, 0, CRYPTO_ALG_ASYNC);
         if (IS_ERR(tfm)) {
                 ti->error = "Error allocating crypto tfm";
-                goto bad1;
+                goto bad_cipher;
         }
 
         strcpy(cc->cipher, cipher);
@@ -793,18 +818,18 @@ static int crypt_ctr(struct dm_target *ti, unsigned int argc, char **argv)
                 cc->iv_gen_ops = &crypt_iv_null_ops;
         else {
                 ti->error = "Invalid IV mode";
-                goto bad2;
+                goto bad_ivmode;
         }
 
         if (cc->iv_gen_ops && cc->iv_gen_ops->ctr &&
             cc->iv_gen_ops->ctr(cc, ti, ivopts) < 0)
-                goto bad2;
+                goto bad_ivmode;
 
         cc->iv_size = crypto_blkcipher_ivsize(tfm);
         if (cc->iv_size)
                 /* at least a 64 bit sector number should fit in our buffer */
                 cc->iv_size = max(cc->iv_size,
-                                  (unsigned int)(sizeof(u64) / sizeof(u8)));
+                                  (unsigned int)(sizeof(u64) / sizeof(u8)));
         else {
                 if (cc->iv_gen_ops) {
                         DMWARN("Selected cipher does not support IVs");
@@ -817,13 +842,13 @@ static int crypt_ctr(struct dm_target *ti, unsigned int argc, char **argv)
         cc->io_pool = mempool_create_slab_pool(MIN_IOS, _crypt_io_pool);
         if (!cc->io_pool) {
                 ti->error = "Cannot allocate crypt io mempool";
-                goto bad3;
+                goto bad_slab_pool;
         }
 
         cc->page_pool = mempool_create_page_pool(MIN_POOL_PAGES, 0);
         if (!cc->page_pool) {
                 ti->error = "Cannot allocate page mempool";
-                goto bad4;
+                goto bad_page_pool;
         }
 
         cc->bs = bioset_create(MIN_IOS, MIN_IOS);
@@ -834,25 +859,25 @@ static int crypt_ctr(struct dm_target *ti, unsigned int argc, char **argv)
 
         if (crypto_blkcipher_setkey(tfm, cc->key, key_size) < 0) {
                 ti->error = "Error setting key";
-                goto bad5;
+                goto bad_device;
         }
 
         if (sscanf(argv[2], "%llu", &tmpll) != 1) {
                 ti->error = "Invalid iv_offset sector";
-                goto bad5;
+                goto bad_device;
         }
         cc->iv_offset = tmpll;
 
         if (sscanf(argv[4], "%llu", &tmpll) != 1) {
                 ti->error = "Invalid device sector";
-                goto bad5;
+                goto bad_device;
         }
         cc->start = tmpll;
 
         if (dm_get_device(ti, argv[3], cc->start, ti->len,
-                          dm_table_get_mode(ti->table), &cc->dev)) {
+                          dm_table_get_mode(ti->table), &cc->dev)) {
                 ti->error = "Device lookup failed";
-                goto bad5;
+                goto bad_device;
         }
 
         if (ivmode && cc->iv_gen_ops) {
@@ -861,27 +886,45 @@ static int crypt_ctr(struct dm_target *ti, unsigned int argc, char **argv)
                 cc->iv_mode = kmalloc(strlen(ivmode) + 1, GFP_KERNEL);
                 if (!cc->iv_mode) {
                         ti->error = "Error kmallocing iv_mode string";
-                        goto bad5;
+                        goto bad_ivmode_string;
                 }
                 strcpy(cc->iv_mode, ivmode);
         } else
                 cc->iv_mode = NULL;
 
+        cc->io_queue = create_singlethread_workqueue("kcryptd_io");
+        if (!cc->io_queue) {
+                ti->error = "Couldn't create kcryptd io queue";
+                goto bad_io_queue;
+        }
+
+        cc->crypt_queue = create_singlethread_workqueue("kcryptd");
+        if (!cc->crypt_queue) {
+                ti->error = "Couldn't create kcryptd queue";
+                goto bad_crypt_queue;
+        }
+
         ti->private = cc;
         return 0;
 
-bad5:
+bad_crypt_queue:
+        destroy_workqueue(cc->io_queue);
+bad_io_queue:
+        kfree(cc->iv_mode);
+bad_ivmode_string:
+        dm_put_device(ti, cc->dev);
+bad_device:
         bioset_free(cc->bs);
 bad_bs:
         mempool_destroy(cc->page_pool);
-bad4:
+bad_page_pool:
         mempool_destroy(cc->io_pool);
-bad3:
+bad_slab_pool:
         if (cc->iv_gen_ops && cc->iv_gen_ops->dtr)
                 cc->iv_gen_ops->dtr(cc);
-bad2:
+bad_ivmode:
         crypto_free_blkcipher(tfm);
-bad1:
+bad_cipher:
         /* Must zero key material before freeing */
         memset(cc, 0, sizeof(*cc) + cc->key_size * sizeof(u8));
         kfree(cc);
@@ -892,7 +935,8 @@ static void crypt_dtr(struct dm_target *ti)
 {
         struct crypt_config *cc = (struct crypt_config *) ti->private;
 
-        flush_workqueue(_kcryptd_workqueue);
+        destroy_workqueue(cc->io_queue);
+        destroy_workqueue(cc->crypt_queue);
 
         bioset_free(cc->bs);
         mempool_destroy(cc->page_pool);
@@ -918,9 +962,13 @@ static int crypt_map(struct dm_target *ti, struct bio *bio,
         io = mempool_alloc(cc->io_pool, GFP_NOIO);
         io->target = ti;
         io->base_bio = bio;
-        io->error = io->post_process = 0;
+        io->error = 0;
         atomic_set(&io->pending, 0);
-        kcryptd_queue_io(io);
+
+        if (bio_data_dir(io->base_bio) == READ)
+                kcryptd_queue_io(io);
+        else
+                kcryptd_queue_crypt(io);
 
         return DM_MAPIO_SUBMITTED;
 }
@@ -1037,25 +1085,12 @@ static int __init dm_crypt_init(void)
         if (!_crypt_io_pool)
                 return -ENOMEM;
 
-        _kcryptd_workqueue = create_workqueue("kcryptd");
-        if (!_kcryptd_workqueue) {
-                r = -ENOMEM;
-                DMERR("couldn't create kcryptd");
-                goto bad1;
-        }
-
         r = dm_register_target(&crypt_target);
         if (r < 0) {
                 DMERR("register failed %d", r);
-                goto bad2;
+                kmem_cache_destroy(_crypt_io_pool);
         }
 
-        return 0;
-
-bad2:
-        destroy_workqueue(_kcryptd_workqueue);
-bad1:
-        kmem_cache_destroy(_crypt_io_pool);
         return r;
 }
 
@@ -1066,7 +1101,6 @@ static void __exit dm_crypt_exit(void)
         if (r < 0)
                 DMERR("unregister failed %d", r);
 
-        destroy_workqueue(_kcryptd_workqueue);
         kmem_cache_destroy(_crypt_io_pool);
 }
 
diff --git a/drivers/md/dm-delay.c b/drivers/md/dm-delay.c
index 6928c136d3c5..bdd37f881c42 100644
--- a/drivers/md/dm-delay.c
+++ b/drivers/md/dm-delay.c
@@ -83,7 +83,7 @@ static struct bio *flush_delayed_bios(struct delay_c *dc, int flush_all)
         struct dm_delay_info *delayed, *next;
         unsigned long next_expires = 0;
         int start_timer = 0;
-        BIO_LIST(flush_bios);
+        struct bio_list flush_bios = { };
 
         mutex_lock(&delayed_bios_lock);
         list_for_each_entry_safe(delayed, next, &dc->delayed_bios, list) {
@@ -163,34 +163,32 @@ static int delay_ctr(struct dm_target *ti, unsigned int argc, char **argv)
                 goto bad;
         }
 
-        if (argc == 3) {
-                dc->dev_write = NULL;
+        dc->dev_write = NULL;
+        if (argc == 3)
                 goto out;
-        }
 
         if (sscanf(argv[4], "%llu", &tmpll) != 1) {
                 ti->error = "Invalid write device sector";
-                goto bad;
+                goto bad_dev_read;
         }
         dc->start_write = tmpll;
 
         if (sscanf(argv[5], "%u", &dc->write_delay) != 1) {
                 ti->error = "Invalid write delay";
-                goto bad;
+                goto bad_dev_read;
         }
 
         if (dm_get_device(ti, argv[3], dc->start_write, ti->len,
                           dm_table_get_mode(ti->table), &dc->dev_write)) {
                 ti->error = "Write device lookup failed";
-                dm_put_device(ti, dc->dev_read);
-                goto bad;
+                goto bad_dev_read;
         }
 
 out:
         dc->delayed_pool = mempool_create_slab_pool(128, delayed_cache);
         if (!dc->delayed_pool) {
                 DMERR("Couldn't create delayed bio pool.");
-                goto bad;
+                goto bad_dev_write;
         }
 
         setup_timer(&dc->delay_timer, handle_delayed_timer, (unsigned long)dc);
@@ -203,6 +201,11 @@ out:
         ti->private = dc;
         return 0;
 
+bad_dev_write:
+        if (dc->dev_write)
+                dm_put_device(ti, dc->dev_write);
+bad_dev_read:
+        dm_put_device(ti, dc->dev_read);
 bad:
         kfree(dc);
         return -EINVAL;
@@ -305,7 +308,7 @@ static int delay_status(struct dm_target *ti, status_type_t type,
                        (unsigned long long) dc->start_read,
                        dc->read_delay);
                 if (dc->dev_write)
-                        DMEMIT("%s %llu %u", dc->dev_write->name,
+                        DMEMIT(" %s %llu %u", dc->dev_write->name,
                                (unsigned long long) dc->start_write,
                                dc->write_delay);
                 break;
diff --git a/drivers/md/dm-emc.c b/drivers/md/dm-emc.c
index 342517261ece..6b91b9ab1d41 100644
--- a/drivers/md/dm-emc.c
+++ b/drivers/md/dm-emc.c
@@ -81,7 +81,7 @@ static struct bio *get_failover_bio(struct dm_path *path, unsigned data_size)
         }
 
         if (bio_add_page(bio, page, data_size, 0) != data_size) {
-                DMERR("get_failover_bio: alloc_page() failed.");
+                DMERR("get_failover_bio: bio_add_page() failed.");
                 __free_page(page);
                 bio_put(bio);
                 return NULL;
@@ -211,12 +211,10 @@ fail_path:
 
 static struct emc_handler *alloc_emc_handler(void)
 {
-        struct emc_handler *h = kmalloc(sizeof(*h), GFP_KERNEL);
+        struct emc_handler *h = kzalloc(sizeof(*h), GFP_KERNEL);
 
-        if (h) {
-                memset(h, 0, sizeof(*h));
+        if (h)
                 spin_lock_init(&h->lock);
-        }
 
         return h;
 }
diff --git a/drivers/md/dm-hw-handler.c b/drivers/md/dm-hw-handler.c
index baafaaba4d4b..2ee84d8aa0bf 100644
--- a/drivers/md/dm-hw-handler.c
+++ b/drivers/md/dm-hw-handler.c
@@ -91,12 +91,10 @@ void dm_put_hw_handler(struct hw_handler_type *hwht)
 
 static struct hwh_internal *_alloc_hw_handler(struct hw_handler_type *hwht)
 {
-        struct hwh_internal *hwhi = kmalloc(sizeof(*hwhi), GFP_KERNEL);
+        struct hwh_internal *hwhi = kzalloc(sizeof(*hwhi), GFP_KERNEL);
 
-        if (hwhi) {
-                memset(hwhi, 0, sizeof(*hwhi));
+        if (hwhi)
                 hwhi->hwht = *hwht;
-        }
 
         return hwhi;
 }
diff --git a/drivers/md/dm-hw-handler.h b/drivers/md/dm-hw-handler.h
index e0832e6fcf36..46809dcb121a 100644
--- a/drivers/md/dm-hw-handler.h
+++ b/drivers/md/dm-hw-handler.h
@@ -58,5 +58,6 @@ unsigned dm_scsi_err_handler(struct hw_handler *hwh, struct bio *bio);
 #define MP_FAIL_PATH 1
 #define MP_BYPASS_PG 2
 #define MP_ERROR_IO  4  /* Don't retry this I/O */
+#define MP_RETRY 8
 
 #endif
diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c
index b441d82c338a..138200bf5e0b 100644
--- a/drivers/md/dm-ioctl.c
+++ b/drivers/md/dm-ioctl.c
@@ -700,7 +700,7 @@ static int dev_rename(struct dm_ioctl *param, size_t param_size)
         int r;
         char *new_name = (char *) param + param->data_start;
 
-        if (new_name < (char *) (param + 1) ||
+        if (new_name < (char *) param->data ||
             invalid_str(new_name, (void *) param + param_size)) {
                 DMWARN("Invalid new logical volume name supplied.");
                 return -EINVAL;
@@ -726,7 +726,7 @@ static int dev_set_geometry(struct dm_ioctl *param, size_t param_size)
         if (!md)
                 return -ENXIO;
 
-        if (geostr < (char *) (param + 1) ||
+        if (geostr < (char *) param->data ||
             invalid_str(geostr, (void *) param + param_size)) {
                 DMWARN("Invalid geometry supplied.");
                 goto out;
@@ -1233,7 +1233,7 @@ static int target_message(struct dm_ioctl *param, size_t param_size)
         if (r)
                 goto out;
 
-        if (tmsg < (struct dm_target_msg *) (param + 1) ||
+        if (tmsg < (struct dm_target_msg *) param->data ||
             invalid_str(tmsg->message, (void *) param + param_size)) {
                 DMWARN("Invalid target message parameters.");
                 r = -EINVAL;
@@ -1358,7 +1358,7 @@ static int copy_params(struct dm_ioctl __user *user, struct dm_ioctl **param)
         if (tmp.data_size < sizeof(tmp))
                 return -EINVAL;
 
-        dmi = (struct dm_ioctl *) vmalloc(tmp.data_size);
+        dmi = vmalloc(tmp.data_size);
         if (!dmi)
                 return -ENOMEM;
 
@@ -1515,3 +1515,35 @@ void dm_interface_exit(void)
 
         dm_hash_exit();
 }
+
+/**
+ * dm_copy_name_and_uuid - Copy mapped device name & uuid into supplied buffers
+ * @md: Pointer to mapped_device
+ * @name: Buffer (size DM_NAME_LEN) for name
+ * @uuid: Buffer (size DM_UUID_LEN) for uuid or empty string if uuid not defined
+ */
+int dm_copy_name_and_uuid(struct mapped_device *md, char *name, char *uuid)
+{
+        int r = 0;
+        struct hash_cell *hc;
+
+        if (!md)
+                return -ENXIO;
+
+        dm_get(md);
+        down_read(&_hash_lock);
+        hc = dm_get_mdptr(md);
+        if (!hc || hc->md != md) {
+                r = -ENXIO;
+                goto out;
+        }
+
+        strcpy(name, hc->name);
+        strcpy(uuid, hc->uuid ? : "");
+
+out:
+        up_read(&_hash_lock);
+        dm_put(md);
+
+        return r;
+}
diff --git a/drivers/md/dm-log.c b/drivers/md/dm-log.c
index a66428d860fe..072ee4353eab 100644
--- a/drivers/md/dm-log.c
+++ b/drivers/md/dm-log.c
@@ -696,7 +696,7 @@ static struct dirty_log_type _disk_type = {
         .module = THIS_MODULE,
         .ctr = disk_ctr,
         .dtr = disk_dtr,
-        .suspend = disk_flush,
+        .postsuspend = disk_flush,
         .resume = disk_resume,
         .get_region_size = core_get_region_size,
         .is_clean = core_is_clean,
diff --git a/drivers/md/dm-log.h b/drivers/md/dm-log.h
index 86a301c8daf1..3fae87eb5963 100644
--- a/drivers/md/dm-log.h
+++ b/drivers/md/dm-log.h
@@ -32,7 +32,8 @@ struct dirty_log_type {
          * There are times when we don't want the log to touch
          * the disk.
          */
-        int (*suspend)(struct dirty_log *log);
+        int (*presuspend)(struct dirty_log *log);
+        int (*postsuspend)(struct dirty_log *log);
         int (*resume)(struct dirty_log *log);
 
         /*
diff --git a/drivers/md/dm-mpath-hp-sw.c b/drivers/md/dm-mpath-hp-sw.c
new file mode 100644
index 000000000000..204bf42c9449
--- /dev/null
+++ b/drivers/md/dm-mpath-hp-sw.c
@@ -0,0 +1,248 @@
+/*
+ * Copyright (C) 2005 Mike Christie, All rights reserved.
+ * Copyright (C) 2007 Red Hat, Inc. All rights reserved.
+ * Authors: Mike Christie
+ *          Dave Wysochanski
+ *
+ * This file is released under the GPL.
+ *
+ * This module implements the specific path activation code for
+ * HP StorageWorks and FSC FibreCat Asymmetric (Active/Passive)
+ * storage arrays.
+ * These storage arrays have controller-based failover, not
+ * LUN-based failover.  However, LUN-based failover is the design
+ * of dm-multipath. Thus, this module is written for LUN-based failover.
+ */
+#include <linux/blkdev.h>
+#include <linux/list.h>
+#include <linux/types.h>
+#include <scsi/scsi.h>
+#include <scsi/scsi_cmnd.h>
+#include <scsi/scsi_dbg.h>
+
+#include "dm.h"
+#include "dm-hw-handler.h"
+
+#define DM_MSG_PREFIX "multipath hp-sw"
+#define DM_HP_HWH_NAME "hp-sw"
+#define DM_HP_HWH_VER "1.0.0"
+
+struct hp_sw_context {
+        unsigned char sense[SCSI_SENSE_BUFFERSIZE];
+};
+
+/*
+ * hp_sw_error_is_retryable - Is an HP-specific check condition retryable?
+ * @req: path activation request
+ *
+ * Examine error codes of request and determine whether the error is retryable.
+ * Some error codes are already retried by scsi-ml (see
+ * scsi_decide_disposition), but some HP specific codes are not.
+ * The intent of this routine is to supply the logic for the HP specific
+ * check conditions.
+ *
+ * Returns:
+ *  1 - command completed with retryable error
+ *  0 - command completed with non-retryable error
+ *
+ * Possible optimizations
+ * 1. More hardware-specific error codes
+ */
+static int hp_sw_error_is_retryable(struct request *req)
+{
+        /*
+         * NOT_READY is known to be retryable
+         * For now we just dump out the sense data and call it retryable
+         */
+        if (status_byte(req->errors) == CHECK_CONDITION)
+                __scsi_print_sense(DM_HP_HWH_NAME, req->sense, req->sense_len);
+
+        /*
+         * At this point we don't have complete information about all the error
+         * codes from this hardware, so we are just conservative and retry
+         * when in doubt.
+         */
+        return 1;
+}
+
+/*
+ * hp_sw_end_io - Completion handler for HP path activation.
+ * @req: path activation request
+ * @error: scsi-ml error
+ *
+ *  Check sense data, free request structure, and notify dm that
+ *  pg initialization has completed.
+ *
+ * Context: scsi-ml softirq
+ *
+ */
+static void hp_sw_end_io(struct request *req, int error)
+{
+        struct dm_path *path = req->end_io_data;
+        unsigned err_flags = 0;
+
+        if (!error) {
+                DMDEBUG("%s path activation command - success",
+                        path->dev->name);
+                goto out;
+        }
+
+        if (hp_sw_error_is_retryable(req)) {
+                DMDEBUG("%s path activation command - retry",
+                        path->dev->name);
+                err_flags = MP_RETRY;
+                goto out;
+        }
+
+        DMWARN("%s path activation fail - error=0x%x",
+               path->dev->name, error);
+        err_flags = MP_FAIL_PATH;
+
+out:
+        req->end_io_data = NULL;
+        __blk_put_request(req->q, req);
+        dm_pg_init_complete(path, err_flags);
+}
+
+/*
+ * hp_sw_get_request - Allocate an HP specific path activation request
+ * @path: path on which request will be sent (needed for request queue)
+ *
+ * The START command is used for path activation request.
+ * These arrays are controller-based failover, not LUN based.
+ * One START command issued to a single path will fail over all
+ * LUNs for the same controller.
+ *
+ * Possible optimizations
+ * 1. Make timeout configurable
+ * 2. Preallocate request
+ */
+static struct request *hp_sw_get_request(struct dm_path *path)
+{
+        struct request *req;
+        struct block_device *bdev = path->dev->bdev;
+        struct request_queue *q = bdev_get_queue(bdev);
+        struct hp_sw_context *h = path->hwhcontext;
+
+        req = blk_get_request(q, WRITE, GFP_NOIO);
+        if (!req)
+                goto out;
+
+        req->timeout = 60 * HZ;
+
+        req->errors = 0;
+        req->cmd_type = REQ_TYPE_BLOCK_PC;
+        req->cmd_flags |= REQ_FAILFAST | REQ_NOMERGE;
+        req->end_io_data = path;
+        req->sense = h->sense;
+        memset(req->sense, 0, SCSI_SENSE_BUFFERSIZE);
+
+        memset(&req->cmd, 0, BLK_MAX_CDB);
+        req->cmd[0] = START_STOP;
+        req->cmd[4] = 1;
+        req->cmd_len = COMMAND_SIZE(req->cmd[0]);
+
+out:
+        return req;
+}
+
+/*
+ * hp_sw_pg_init - HP path activation implementation.
+ * @hwh: hardware handler specific data
+ * @bypassed: unused; is the path group bypassed? (see dm-mpath.c)
+ * @path: path to send initialization command
+ *
+ * Send an HP-specific path activation command on 'path'.
+ * Do not try to optimize in any way, just send the activation command.
+ * More than one path activation command may be sent to the same controller.
+ * This seems to work fine for basic failover support.
+ *
+ * Possible optimizations
+ * 1. Detect an in-progress activation request and avoid submitting another one
+ * 2. Model the controller and only send a single activation request at a time
+ * 3. Determine the state of a path before sending an activation request
+ *
+ * Context: kmpathd (see process_queued_ios() in dm-mpath.c)
+ */
+static void hp_sw_pg_init(struct hw_handler *hwh, unsigned bypassed,
+                          struct dm_path *path)
+{
+        struct request *req;
+        struct hp_sw_context *h;
+
+        path->hwhcontext = hwh->context;
+        h = hwh->context;
+
+        req = hp_sw_get_request(path);
+        if (!req) {
+                DMERR("%s path activation command - allocation fail",
+                      path->dev->name);
+                goto retry;
+        }
+
+        DMDEBUG("%s path activation command - sent", path->dev->name);
+
+        blk_execute_rq_nowait(req->q, NULL, req, 1, hp_sw_end_io);
+        return;
+
+retry:
+        dm_pg_init_complete(path, MP_RETRY);
+}
+
+static int hp_sw_create(struct hw_handler *hwh, unsigned argc, char **argv)
+{
+        struct hp_sw_context *h;
+
+        h = kmalloc(sizeof(*h), GFP_KERNEL);
+        if (!h)
+                return -ENOMEM;
+
+        hwh->context = h;
+
+        return 0;
+}
+
+static void hp_sw_destroy(struct hw_handler *hwh)
+{
+        struct hp_sw_context *h = hwh->context;
+
+        kfree(h);
+}
+
+static struct hw_handler_type hp_sw_hwh = {
+        .name = DM_HP_HWH_NAME,
+        .module = THIS_MODULE,
+        .create = hp_sw_create,
+        .destroy = hp_sw_destroy,
+        .pg_init = hp_sw_pg_init,
+};
+
+static int __init hp_sw_init(void)
+{
+        int r;
+
+        r = dm_register_hw_handler(&hp_sw_hwh);
+        if (r < 0)
+                DMERR("register failed %d", r);
+        else
+                DMINFO("version " DM_HP_HWH_VER " loaded");
+
+        return r;
+}
+
+static void __exit hp_sw_exit(void)
+{
+        int r;
+
+        r = dm_unregister_hw_handler(&hp_sw_hwh);
+        if (r < 0)
+                DMERR("unregister failed %d", r);
+}
+
+module_init(hp_sw_init);
+module_exit(hp_sw_exit);
+
+MODULE_DESCRIPTION("DM Multipath HP StorageWorks / FSC FibreCat (A/P) support");
+MODULE_AUTHOR("Mike Christie, Dave Wysochanski <dm-devel@redhat.com>");
+MODULE_LICENSE("GPL");
+MODULE_VERSION(DM_HP_HWH_VER);
diff --git a/drivers/md/dm-mpath-rdac.c b/drivers/md/dm-mpath-rdac.c
index 16b161345775..e04eb5c697fb 100644
--- a/drivers/md/dm-mpath-rdac.c
+++ b/drivers/md/dm-mpath-rdac.c
@@ -664,20 +664,21 @@ static struct hw_handler_type rdac_handler = {
 
 static int __init rdac_init(void)
 {
-        int r = dm_register_hw_handler(&rdac_handler);
-
-        if (r < 0) {
-                DMERR("%s: register failed %d", RDAC_DM_HWH_NAME, r);
-                return r;
-        }
+        int r;
 
         rdac_wkqd = create_singlethread_workqueue("rdac_wkqd");
         if (!rdac_wkqd) {
                 DMERR("Failed to create workqueue rdac_wkqd.");
-                dm_unregister_hw_handler(&rdac_handler);
                 return -ENOMEM;
         }
 
+        r = dm_register_hw_handler(&rdac_handler);
+        if (r < 0) {
+                DMERR("%s: register failed %d", RDAC_DM_HWH_NAME, r);
+                destroy_workqueue(rdac_wkqd);
+                return r;
+        }
+
         DMINFO("%s: version %s loaded", RDAC_DM_HWH_NAME, RDAC_DM_HWH_VER);
         return 0;
 }
diff --git a/drivers/md/dm-mpath.c b/drivers/md/dm-mpath.c
index 31056abca89d..24b2b1e32fae 100644
--- a/drivers/md/dm-mpath.c
+++ b/drivers/md/dm-mpath.c
@@ -10,6 +10,7 @@
 #include "dm-hw-handler.h"
 #include "dm-bio-list.h"
 #include "dm-bio-record.h"
+#include "dm-uevent.h"
 
 #include <linux/ctype.h>
 #include <linux/init.h>
@@ -75,6 +76,8 @@ struct multipath {
         unsigned queue_io;              /* Must we queue all I/O? */
         unsigned queue_if_no_path;      /* Queue I/O if last path fails? */
         unsigned saved_queue_if_no_path;/* Saved state during suspension */
+        unsigned pg_init_retries;       /* Number of times to retry pg_init */
+        unsigned pg_init_count;         /* Number of times pg_init called */
 
         struct work_struct process_queued_ios;
         struct bio_list queued_ios;
@@ -225,6 +228,8 @@ static void __switch_pg(struct multipath *m, struct pgpath *pgpath)
                 m->pg_init_required = 0;
                 m->queue_io = 0;
         }
+
+        m->pg_init_count = 0;
 }
 
 static int __choose_path_in_pg(struct multipath *m, struct priority_group *pg)
@@ -424,6 +429,7 @@ static void process_queued_ios(struct work_struct *work)
                 must_queue = 0;
 
         if (m->pg_init_required && !m->pg_init_in_progress) {
+                m->pg_init_count++;
                 m->pg_init_required = 0;
                 m->pg_init_in_progress = 1;
                 init_required = 1;
@@ -689,9 +695,11 @@ static int parse_features(struct arg_set *as, struct multipath *m)
         int r;
         unsigned argc;
         struct dm_target *ti = m->ti;
+        const char *param_name;
 
         static struct param _params[] = {
-                {0, 1, "invalid number of feature args"},
+                {0, 3, "invalid number of feature args"},
+                {1, 50, "pg_init_retries must be between 1 and 50"},
         };
 
         r = read_param(_params, shift(as), &argc, &ti->error);
@@ -701,12 +709,28 @@ static int parse_features(struct arg_set *as, struct multipath *m)
         if (!argc)
                 return 0;
 
-        if (!strnicmp(shift(as), MESG_STR("queue_if_no_path")))
-                return queue_if_no_path(m, 1, 0);
-        else {
+        do {
+                param_name = shift(as);
+                argc--;
+
+                if (!strnicmp(param_name, MESG_STR("queue_if_no_path"))) {
+                        r = queue_if_no_path(m, 1, 0);
+                        continue;
+                }
+
+                if (!strnicmp(param_name, MESG_STR("pg_init_retries")) &&
+                    (argc >= 1)) {
+                        r = read_param(_params + 1, shift(as),
+                                       &m->pg_init_retries, &ti->error);
+                        argc--;
+                        continue;
+                }
+
                 ti->error = "Unrecognised multipath feature request";
-                return -EINVAL;
-        }
+                r = -EINVAL;
+        } while (argc && !r);
+
+        return r;
 }
 
 static int multipath_ctr(struct dm_target *ti, unsigned int argc,
@@ -834,6 +858,9 @@ static int fail_path(struct pgpath *pgpath)
         if (pgpath == m->current_pgpath)
                 m->current_pgpath = NULL;
 
+        dm_path_uevent(DM_UEVENT_PATH_FAILED, m->ti,
+                      pgpath->path.dev->name, m->nr_valid_paths);
+
         queue_work(kmultipathd, &m->trigger_event);
 
 out:
@@ -873,6 +900,9 @@ static int reinstate_path(struct pgpath *pgpath)
         if (!m->nr_valid_paths++ && m->queue_size)
                 queue_work(kmultipathd, &m->process_queued_ios);
 
+        dm_path_uevent(DM_UEVENT_PATH_REINSTATED, m->ti,
+                      pgpath->path.dev->name, m->nr_valid_paths);
+
         queue_work(kmultipathd, &m->trigger_event);
 
 out:
@@ -976,6 +1006,26 @@ static int bypass_pg_num(struct multipath *m, const char *pgstr, int bypassed)
 }
 
 /*
+ * Should we retry pg_init immediately?
+ */
+static int pg_init_limit_reached(struct multipath *m, struct pgpath *pgpath)
+{
+        unsigned long flags;
+        int limit_reached = 0;
+
+        spin_lock_irqsave(&m->lock, flags);
+
+        if (m->pg_init_count <= m->pg_init_retries)
+                m->pg_init_required = 1;
+        else
+                limit_reached = 1;
+
+        spin_unlock_irqrestore(&m->lock, flags);
+
+        return limit_reached;
+}
+
+/*
  * pg_init must call this when it has completed its initialisation
  */
 void dm_pg_init_complete(struct dm_path *path, unsigned err_flags)
@@ -985,8 +1035,14 @@ void dm_pg_init_complete(struct dm_path *path, unsigned err_flags)
         struct multipath *m = pg->m;
         unsigned long flags;
 
-        /* We insist on failing the path if the PG is already bypassed. */
-        if (err_flags && pg->bypassed)
+        /*
+         * If requested, retry pg_init until maximum number of retries exceeded.
+         * If retry not requested and PG already bypassed, always fail the path.
+         */
+        if (err_flags & MP_RETRY) {
+                if (pg_init_limit_reached(m, pgpath))
+                        err_flags |= MP_FAIL_PATH;
+        } else if (err_flags && pg->bypassed)
                 err_flags |= MP_FAIL_PATH;
 
         if (err_flags & MP_FAIL_PATH)
@@ -996,7 +1052,7 @@ void dm_pg_init_complete(struct dm_path *path, unsigned err_flags)
                 bypass_pg(m, pg, 1);
 
         spin_lock_irqsave(&m->lock, flags);
-        if (err_flags) {
+        if (err_flags & ~MP_RETRY) {
                 m->current_pgpath = NULL;
                 m->current_pg = NULL;
         } else if (!m->pg_init_required)
@@ -1148,11 +1204,15 @@ static int multipath_status(struct dm_target *ti, status_type_t type,
 
         /* Features */
         if (type == STATUSTYPE_INFO)
-                DMEMIT("1 %u ", m->queue_size);
-        else if (m->queue_if_no_path)
-                DMEMIT("1 queue_if_no_path ");
-        else
-                DMEMIT("0 ");
+                DMEMIT("2 %u %u ", m->queue_size, m->pg_init_count);
+        else {
+                DMEMIT("%u ", m->queue_if_no_path +
+                              (m->pg_init_retries > 0) * 2);
+                if (m->queue_if_no_path)
+                        DMEMIT("queue_if_no_path ");
+                if (m->pg_init_retries)
+                        DMEMIT("pg_init_retries %u ", m->pg_init_retries);
+        }
 
         if (hwh->type && hwh->type->status)
                 sz += hwh->type->status(hwh, type, result + sz, maxlen - sz);
diff --git a/drivers/md/dm-path-selector.c b/drivers/md/dm-path-selector.c
index f10a0c89b3f4..ca1bb636a3e4 100644
--- a/drivers/md/dm-path-selector.c
+++ b/drivers/md/dm-path-selector.c
@@ -94,12 +94,10 @@ out:
 
 static struct ps_internal *_alloc_path_selector(struct path_selector_type *pst)
 {
-        struct ps_internal *psi = kmalloc(sizeof(*psi), GFP_KERNEL);
+        struct ps_internal *psi = kzalloc(sizeof(*psi), GFP_KERNEL);
 
-        if (psi) {
-                memset(psi, 0, sizeof(*psi));
+        if (psi)
                 psi->pst = *pst;
-        }
 
         return psi;
 }
diff --git a/drivers/md/dm-raid1.c b/drivers/md/dm-raid1.c
index d09ff15490a5..31123d4a6b9c 100644
--- a/drivers/md/dm-raid1.c
+++ b/drivers/md/dm-raid1.c
@@ -19,6 +19,7 @@
 #include <linux/time.h>
 #include <linux/vmalloc.h>
 #include <linux/workqueue.h>
+#include <linux/log2.h>
 
 #define DM_MSG_PREFIX "raid1"
 #define DM_IO_PAGES 64
@@ -113,6 +114,7 @@ struct region {
  * Mirror set structures.
  *---------------------------------------------------------------*/
 struct mirror {
+        struct mirror_set *ms;
         atomic_t error_count;
         struct dm_dev *dev;
         sector_t offset;
@@ -974,6 +976,7 @@ static struct mirror_set *alloc_context(unsigned int nr_mirrors,
 
         if (rh_init(&ms->rh, ms, dl, region_size, ms->nr_regions)) {
                 ti->error = "Error creating dirty region hash";
+                dm_io_client_destroy(ms->io_client);
                 kfree(ms);
                 return NULL;
         }
@@ -994,7 +997,7 @@ static void free_context(struct mirror_set *ms, struct dm_target *ti,
 
 static inline int _check_region_size(struct dm_target *ti, uint32_t size)
 {
-        return !(size % (PAGE_SIZE >> 9) || (size & (size - 1)) ||
+        return !(size % (PAGE_SIZE >> 9) || !is_power_of_2(size) ||
                  size > ti->len);
 }
 
@@ -1015,6 +1018,7 @@ static int get_mirror(struct mirror_set *ms, struct dm_target *ti,
                 return -ENXIO;
         }
 
+        ms->mirror[mirror].ms = ms;
         ms->mirror[mirror].offset = offset;
 
         return 0;
@@ -1163,16 +1167,14 @@ static int mirror_ctr(struct dm_target *ti, unsigned int argc, char **argv)
         ms->kmirrord_wq = create_singlethread_workqueue("kmirrord");
         if (!ms->kmirrord_wq) {
                 DMERR("couldn't start kmirrord");
-                free_context(ms, ti, m);
-                return -ENOMEM;
+                r = -ENOMEM;
+                goto err_free_context;
         }
         INIT_WORK(&ms->kmirrord_work, do_mirror);
 
         r = parse_features(ms, argc, argv, &args_used);
-        if (r) {
-                free_context(ms, ti, ms->nr_mirrors);
-                return r;
-        }
+        if (r)
+                goto err_destroy_wq;
 
         argv += args_used;
         argc -= args_used;
@@ -1188,19 +1190,22 @@ static int mirror_ctr(struct dm_target *ti, unsigned int argc, char **argv)
 
         if (argc) {
                 ti->error = "Too many mirror arguments";
-                free_context(ms, ti, ms->nr_mirrors);
-                return -EINVAL;
+                r = -EINVAL;
+                goto err_destroy_wq;
         }
 
         r = kcopyd_client_create(DM_IO_PAGES, &ms->kcopyd_client);
-        if (r) {
-                destroy_workqueue(ms->kmirrord_wq);
-                free_context(ms, ti, ms->nr_mirrors);
-                return r;
-        }
+        if (r)
+                goto err_destroy_wq;
 
         wake(ms);
         return 0;
+
+err_destroy_wq:
+        destroy_workqueue(ms->kmirrord_wq);
+err_free_context:
+        free_context(ms, ti, ms->nr_mirrors);
+        return r;
 }
 
 static void mirror_dtr(struct dm_target *ti)
@@ -1302,7 +1307,7 @@ static void mirror_postsuspend(struct dm_target *ti)
         wait_event(_kmirrord_recovery_stopped,
                    !atomic_read(&ms->rh.recovery_in_flight));
 
-        if (log->type->suspend && log->type->suspend(log))
+        if (log->type->postsuspend && log->type->postsuspend(log))
                 /* FIXME: need better error handling */
                 DMWARN("log suspend failed");
 }
diff --git a/drivers/md/dm-snap.c b/drivers/md/dm-snap.c
index 98a633f3d6b0..cee16fadd9ee 100644
--- a/drivers/md/dm-snap.c
+++ b/drivers/md/dm-snap.c
@@ -17,6 +17,7 @@
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
+#include <linux/log2.h>
 
 #include "dm-snap.h"
 #include "dm-bio-list.h"
@@ -415,7 +416,7 @@ static int set_chunk_size(struct dm_snapshot *s, const char *chunk_size_arg,
         chunk_size = round_up(chunk_size, PAGE_SIZE >> 9);
 
         /* Check chunk_size is a power of 2 */
-        if (chunk_size & (chunk_size - 1)) {
+        if (!is_power_of_2(chunk_size)) {
                 *error = "Chunk size is not a power of 2";
                 return -EINVAL;
         }
diff --git a/drivers/md/dm-stripe.c b/drivers/md/dm-stripe.c
index 51f5e0760012..969944a8aba2 100644
--- a/drivers/md/dm-stripe.c
+++ b/drivers/md/dm-stripe.c
@@ -11,6 +11,7 @@
 #include <linux/blkdev.h>
 #include <linux/bio.h>
 #include <linux/slab.h>
+#include <linux/log2.h>
 
 #define DM_MSG_PREFIX "striped"
 
@@ -99,7 +100,7 @@ static int stripe_ctr(struct dm_target *ti, unsigned int argc, char **argv)
         /*
          * chunk_size is a power of two
          */
-        if (!chunk_size || (chunk_size & (chunk_size - 1)) ||
+        if (!is_power_of_2(chunk_size) ||
             (chunk_size < (PAGE_SIZE >> SECTOR_SHIFT))) {
                 ti->error = "Invalid chunk size";
                 return -EINVAL;
diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
index fbe477bb2c68..8939e6105088 100644
--- a/drivers/md/dm-table.c
+++ b/drivers/md/dm-table.c
@@ -213,12 +213,11 @@ static int alloc_targets(struct dm_table *t, unsigned int num)
 int dm_table_create(struct dm_table **result, int mode,
                     unsigned num_targets, struct mapped_device *md)
 {
-        struct dm_table *t = kmalloc(sizeof(*t), GFP_KERNEL);
+        struct dm_table *t = kzalloc(sizeof(*t), GFP_KERNEL);
 
         if (!t)
                 return -ENOMEM;
 
-        memset(t, 0, sizeof(*t));
         INIT_LIST_HEAD(&t->devices);
         atomic_set(&t->holders, 1);
 
diff --git a/drivers/md/dm-target.c b/drivers/md/dm-target.c
index 477a041a41cf..835cf95b857f 100644
--- a/drivers/md/dm-target.c
+++ b/drivers/md/dm-target.c
@@ -88,12 +88,10 @@ void dm_put_target_type(struct target_type *t)
 
 static struct tt_internal *alloc_target(struct target_type *t)
 {
-        struct tt_internal *ti = kmalloc(sizeof(*ti), GFP_KERNEL);
+        struct tt_internal *ti = kzalloc(sizeof(*ti), GFP_KERNEL);
 
-        if (ti) {
-                memset(ti, 0, sizeof(*ti));
+        if (ti)
                 ti->tt = *t;
-        }
 
         return ti;
 }
diff --git a/drivers/md/dm-uevent.c b/drivers/md/dm-uevent.c
new file mode 100644
index 000000000000..50377e5dc2a3
--- /dev/null
+++ b/drivers/md/dm-uevent.c
@@ -0,0 +1,222 @@
+/*
+ * Device Mapper Uevent Support (dm-uevent)
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Copyright IBM Corporation, 2007
+ *      Author: Mike Anderson <andmike@linux.vnet.ibm.com>
+ */
+#include <linux/list.h>
+#include <linux/slab.h>
+#include <linux/kobject.h>
+#include <linux/dm-ioctl.h>
+
+#include "dm.h"
+#include "dm-uevent.h"
+
+#define DM_MSG_PREFIX "uevent"
+
+static const struct {
+        enum dm_uevent_type type;
+        enum kobject_action action;
+        char *name;
+} _dm_uevent_type_names[] = {
+        {DM_UEVENT_PATH_FAILED, KOBJ_CHANGE, "PATH_FAILED"},
+        {DM_UEVENT_PATH_REINSTATED, KOBJ_CHANGE, "PATH_REINSTATED"},
+};
+
+static struct kmem_cache *_dm_event_cache;
+
+struct dm_uevent {
+        struct mapped_device *md;
+        enum kobject_action action;
+        struct kobj_uevent_env ku_env;
+        struct list_head elist;
+        char name[DM_NAME_LEN];
+        char uuid[DM_UUID_LEN];
+};
+
+static void dm_uevent_free(struct dm_uevent *event)
+{
+        kmem_cache_free(_dm_event_cache, event);
+}
+
+static struct dm_uevent *dm_uevent_alloc(struct mapped_device *md)
+{
+        struct dm_uevent *event;
+
+        event = kmem_cache_zalloc(_dm_event_cache, GFP_ATOMIC);
+        if (!event)
+                return NULL;
+
+        INIT_LIST_HEAD(&event->elist);
+        event->md = md;
+
+        return event;
+}
+
+static struct dm_uevent *dm_build_path_uevent(struct mapped_device *md,
+                                              struct dm_target *ti,
+                                              enum kobject_action action,
+                                              const char *dm_action,
+                                              const char *path,
+                                              unsigned nr_valid_paths)
+{
+        struct dm_uevent *event;
+
+        event = dm_uevent_alloc(md);
+        if (!event) {
+                DMERR("%s: dm_uevent_alloc() failed", __FUNCTION__);
+                goto err_nomem;
+        }
+
+        event->action = action;
+
+        if (add_uevent_var(&event->ku_env, "DM_TARGET=%s", ti->type->name)) {
+                DMERR("%s: add_uevent_var() for DM_TARGET failed",
+                      __FUNCTION__);
+                goto err_add;
+        }
+
+        if (add_uevent_var(&event->ku_env, "DM_ACTION=%s", dm_action)) {
+                DMERR("%s: add_uevent_var() for DM_ACTION failed",
+                      __FUNCTION__);
+                goto err_add;
+        }
+
+        if (add_uevent_var(&event->ku_env, "DM_SEQNUM=%u",
+                           dm_next_uevent_seq(md))) {
+                DMERR("%s: add_uevent_var() for DM_SEQNUM failed",
+                      __FUNCTION__);
+                goto err_add;
+        }
+
+        if (add_uevent_var(&event->ku_env, "DM_PATH=%s", path)) {
+                DMERR("%s: add_uevent_var() for DM_PATH failed", __FUNCTION__);
+                goto err_add;
+        }
+
+        if (add_uevent_var(&event->ku_env, "DM_NR_VALID_PATHS=%d",
+                           nr_valid_paths)) {
+                DMERR("%s: add_uevent_var() for DM_NR_VALID_PATHS failed",
+                      __FUNCTION__);
+                goto err_add;
+        }
+
+        return event;
+
+err_add:
+        dm_uevent_free(event);
+err_nomem:
+        return ERR_PTR(-ENOMEM);
+}
+
+/**
+ * dm_send_uevents - send uevents for given list
+ *
+ * @events:     list of events to send
+ * @kobj:       kobject generating event
+ *
+ */
+void dm_send_uevents(struct list_head *events, struct kobject *kobj)
+{
+        int r;
+        struct dm_uevent *event, *next;
+
+        list_for_each_entry_safe(event, next, events, elist) {
+                list_del_init(&event->elist);
+
+                /*
+                 * Need to call dm_copy_name_and_uuid from here for now.
+                 * Context of previous var adds and locking used for
+                 * hash_cell not compatable.
+                 */
+                if (dm_copy_name_and_uuid(event->md, event->name,
+                                          event->uuid)) {
+                        DMERR("%s: dm_copy_name_and_uuid() failed",
+                              __FUNCTION__);
+                        goto uevent_free;
+                }
+
+                if (add_uevent_var(&event->ku_env, "DM_NAME=%s", event->name)) {
+                        DMERR("%s: add_uevent_var() for DM_NAME failed",
+                              __FUNCTION__);
+                        goto uevent_free;
+                }
+
+                if (add_uevent_var(&event->ku_env, "DM_UUID=%s", event->uuid)) {
+                        DMERR("%s: add_uevent_var() for DM_UUID failed",
+                              __FUNCTION__);
+                        goto uevent_free;
+                }
+
+                r = kobject_uevent_env(kobj, event->action, event->ku_env.envp);
+                if (r)
+                        DMERR("%s: kobject_uevent_env failed", __FUNCTION__);
+uevent_free:
+                dm_uevent_free(event);
+        }
+}
+EXPORT_SYMBOL_GPL(dm_send_uevents);
+
+/**
+ * dm_path_uevent - called to create a new path event and queue it
+ *
+ * @event_type: path event type enum
+ * @ti:                 pointer to a dm_target
+ * @path:               string containing pathname
+ * @nr_valid_paths:     number of valid paths remaining
+ *
+ */
+void dm_path_uevent(enum dm_uevent_type event_type, struct dm_target *ti,
+                   const char *path, unsigned nr_valid_paths)
+{
+        struct mapped_device *md = dm_table_get_md(ti->table);
+        struct dm_uevent *event;
+
+        if (event_type >= ARRAY_SIZE(_dm_uevent_type_names)) {
+                DMERR("%s: Invalid event_type %d", __FUNCTION__, event_type);
+                goto out;
+        }
+
+        event = dm_build_path_uevent(md, ti,
+                                     _dm_uevent_type_names[event_type].action,
+                                     _dm_uevent_type_names[event_type].name,
+                                     path, nr_valid_paths);
+        if (IS_ERR(event))
+                goto out;
+
+        dm_uevent_add(md, &event->elist);
+
+out:
+        dm_put(md);
+}
+EXPORT_SYMBOL_GPL(dm_path_uevent);
+
+int dm_uevent_init(void)
+{
+        _dm_event_cache = KMEM_CACHE(dm_uevent, 0);
+        if (!_dm_event_cache)
+                return -ENOMEM;
+
+        DMINFO("version 1.0.3");
+
+        return 0;
+}
+
+void dm_uevent_exit(void)
+{
+        kmem_cache_destroy(_dm_event_cache);
+}
diff --git a/drivers/md/dm-uevent.h b/drivers/md/dm-uevent.h
new file mode 100644
index 000000000000..2eccc8bd671a
--- /dev/null
+++ b/drivers/md/dm-uevent.h
@@ -0,0 +1,59 @@
+/*
+ * Device Mapper Uevent Support
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Copyright IBM Corporation, 2007
+ *      Author: Mike Anderson <andmike@linux.vnet.ibm.com>
+ */
+#ifndef DM_UEVENT_H
+#define DM_UEVENT_H
+
+enum dm_uevent_type {
+        DM_UEVENT_PATH_FAILED,
+        DM_UEVENT_PATH_REINSTATED,
+};
+
+#ifdef CONFIG_DM_UEVENT
+
+extern int dm_uevent_init(void);
+extern void dm_uevent_exit(void);
+extern void dm_send_uevents(struct list_head *events, struct kobject *kobj);
+extern void dm_path_uevent(enum dm_uevent_type event_type,
+                           struct dm_target *ti, const char *path,
+                           unsigned nr_valid_paths);
+
+#else
+
+static inline int dm_uevent_init(void)
+{
+        return 0;
+}
+static inline void dm_uevent_exit(void)
+{
+}
+static inline void dm_send_uevents(struct list_head *events,
+                                   struct kobject *kobj)
+{
+}
+static inline void dm_path_uevent(enum dm_uevent_type event_type,
+                                  struct dm_target *ti, const char *path,
+                                  unsigned nr_valid_paths)
+{
+}
+
+#endif  /* CONFIG_DM_UEVENT */
+
+#endif  /* DM_UEVENT_H */
diff --git a/drivers/md/dm.c b/drivers/md/dm.c
index d837d37f6209..07cbbb8eb3e0 100644
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@ -7,6 +7,7 @@
 
 #include "dm.h"
 #include "dm-bio-list.h"
+#include "dm-uevent.h"
 
 #include <linux/init.h>
 #include <linux/module.h>
@@ -112,6 +113,9 @@ struct mapped_device {
          */
         atomic_t event_nr;
         wait_queue_head_t eventq;
+        atomic_t uevent_seq;
+        struct list_head uevent_list;
+        spinlock_t uevent_lock; /* Protect access to uevent_list */
 
         /*
          * freeze/thaw support require holding onto a super block
@@ -143,11 +147,19 @@ static int __init local_init(void)
                 return -ENOMEM;
         }
 
+        r = dm_uevent_init();
+        if (r) {
+                kmem_cache_destroy(_tio_cache);
+                kmem_cache_destroy(_io_cache);
+                return r;
+        }
+
         _major = major;
         r = register_blkdev(_major, _name);
         if (r < 0) {
                 kmem_cache_destroy(_tio_cache);
                 kmem_cache_destroy(_io_cache);
+                dm_uevent_exit();
                 return r;
         }
 
@@ -162,6 +174,7 @@ static void local_exit(void)
         kmem_cache_destroy(_tio_cache);
         kmem_cache_destroy(_io_cache);
         unregister_blkdev(_major, _name);
+        dm_uevent_exit();
 
         _major = 0;
 
@@ -751,15 +764,13 @@ static void __clone_and_map(struct clone_info *ci)
 /*
  * Split the bio into several clones.
  */
-static void __split_bio(struct mapped_device *md, struct bio *bio)
+static int __split_bio(struct mapped_device *md, struct bio *bio)
 {
         struct clone_info ci;
 
         ci.map = dm_get_table(md);
-        if (!ci.map) {
-                bio_io_error(bio);
-                return;
-        }
+        if (unlikely(!ci.map))
+                return -EIO;
 
         ci.md = md;
         ci.bio = bio;
@@ -779,6 +790,8 @@ static void __split_bio(struct mapped_device *md, struct bio *bio)
         /* drop the extra reference count */
         dec_pending(ci.io, 0);
         dm_table_put(ci.map);
+
+        return 0;
 }
 /*-----------------------------------------------------------------
  * CRUD END
@@ -790,7 +803,7 @@ static void __split_bio(struct mapped_device *md, struct bio *bio)
  */
 static int dm_request(struct request_queue *q, struct bio *bio)
 {
-        int r;
+        int r = -EIO;
         int rw = bio_data_dir(bio);
         struct mapped_device *md = q->queuedata;
 
@@ -815,18 +828,11 @@ static int dm_request(struct request_queue *q, struct bio *bio)
         while (test_bit(DMF_BLOCK_IO, &md->flags)) {
                 up_read(&md->io_lock);
 
-                if (bio_rw(bio) == READA) {
-                        bio_io_error(bio);
-                        return 0;
-                }
-
-                r = queue_io(md, bio);
-                if (r < 0) {
-                        bio_io_error(bio);
-                        return 0;
+                if (bio_rw(bio) != READA)
+                        r = queue_io(md, bio);
 
-                } else if (r == 0)
-                        return 0;       /* deferred successfully */
+                if (r <= 0)
+                        goto out_req;
 
                 /*
                  * We're in a while loop, because someone could suspend
@@ -835,8 +841,13 @@ static int dm_request(struct request_queue *q, struct bio *bio)
                 down_read(&md->io_lock);
         }
 
-        __split_bio(md, bio);
+        r = __split_bio(md, bio);
         up_read(&md->io_lock);
+
+out_req:
+        if (r < 0)
+                bio_io_error(bio);
+
         return 0;
 }
 
@@ -977,6 +988,9 @@ static struct mapped_device *alloc_dev(int minor)
         atomic_set(&md->holders, 1);
         atomic_set(&md->open_count, 0);
         atomic_set(&md->event_nr, 0);
+        atomic_set(&md->uevent_seq, 0);
+        INIT_LIST_HEAD(&md->uevent_list);
+        spin_lock_init(&md->uevent_lock);
 
         md->queue = blk_alloc_queue(GFP_KERNEL);
         if (!md->queue)
@@ -1044,12 +1058,14 @@ static struct mapped_device *alloc_dev(int minor)
         return NULL;
 }
 
+static void unlock_fs(struct mapped_device *md);
+
 static void free_dev(struct mapped_device *md)
 {
         int minor = md->disk->first_minor;
 
         if (md->suspended_bdev) {
-                thaw_bdev(md->suspended_bdev, NULL);
+                unlock_fs(md);
                 bdput(md->suspended_bdev);
         }
         mempool_destroy(md->tio_pool);
@@ -1073,8 +1089,16 @@ static void free_dev(struct mapped_device *md)
  */
 static void event_callback(void *context)
 {
+        unsigned long flags;
+        LIST_HEAD(uevents);
         struct mapped_device *md = (struct mapped_device *) context;
 
+        spin_lock_irqsave(&md->uevent_lock, flags);
+        list_splice_init(&md->uevent_list, &uevents);
+        spin_unlock_irqrestore(&md->uevent_lock, flags);
+
+        dm_send_uevents(&uevents, &md->disk->kobj);
+
         atomic_inc(&md->event_nr);
         wake_up(&md->eventq);
 }
@@ -1233,7 +1257,8 @@ static void __flush_deferred_io(struct mapped_device *md, struct bio *c)
         while (c) {
                 n = c->bi_next;
                 c->bi_next = NULL;
-                __split_bio(md, c);
+                if (__split_bio(md, c))
+                        bio_io_error(c);
                 c = n;
         }
 }
@@ -1491,6 +1516,11 @@ out:
 /*-----------------------------------------------------------------
  * Event notification.
  *---------------------------------------------------------------*/
+uint32_t dm_next_uevent_seq(struct mapped_device *md)
+{
+        return atomic_add_return(1, &md->uevent_seq);
+}
+
 uint32_t dm_get_event_nr(struct mapped_device *md)
 {
         return atomic_read(&md->event_nr);
@@ -1502,6 +1532,15 @@ int dm_wait_event(struct mapped_device *md, int event_nr)
                         (event_nr != atomic_read(&md->event_nr)));
 }
 
+void dm_uevent_add(struct mapped_device *md, struct list_head *elist)
+{
+        unsigned long flags;
+
+        spin_lock_irqsave(&md->uevent_lock, flags);
+        list_add(elist, &md->uevent_list);
+        spin_unlock_irqrestore(&md->uevent_lock, flags);
+}
+
 /*
  * The gendisk is only valid as long as you have a reference
  * count on 'md'.
diff --git a/drivers/md/kcopyd.c b/drivers/md/kcopyd.c
index 7e052378c47e..f3831f31223e 100644
--- a/drivers/md/kcopyd.c
+++ b/drivers/md/kcopyd.c
@@ -198,7 +198,7 @@ struct kcopyd_job {
          * These fields are only used if the job has been split
          * into more manageable parts.
          */
-        struct semaphore lock;
+        struct mutex lock;
         atomic_t sub_jobs;
         sector_t progress;
 };
@@ -456,7 +456,7 @@ static void segment_complete(int read_err,
         sector_t count = 0;
         struct kcopyd_job *job = (struct kcopyd_job *) context;
 
-        down(&job->lock);
+        mutex_lock(&job->lock);
 
         /* update the error */
         if (read_err)
@@ -480,7 +480,7 @@ static void segment_complete(int read_err,
                         job->progress += count;
                 }
         }
-        up(&job->lock);
+        mutex_unlock(&job->lock);
 
         if (count) {
                 int i;
@@ -562,7 +562,7 @@ int kcopyd_copy(struct kcopyd_client *kc, struct io_region *from,
                 dispatch_job(job);
 
         else {
-                init_MUTEX(&job->lock);
+                mutex_init(&job->lock);
                 job->progress = 0;
                 split_job(job);
         }
diff --git a/drivers/md/md.c b/drivers/md/md.c
index c059ae6f37e5..808cd9549456 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -4717,7 +4717,7 @@ mdk_thread_t *md_register_thread(void (*run) (mddev_t *), mddev_t *mddev,
 
 void md_unregister_thread(mdk_thread_t *thread)
 {
-        dprintk("interrupting MD-thread pid %d\n", thread->tsk->pid);
+        dprintk("interrupting MD-thread pid %d\n", task_pid_nr(thread->tsk));
 
         kthread_stop(thread->tsk);
         kfree(thread);
diff --git a/drivers/media/dvb/cinergyT2/cinergyT2.c b/drivers/media/dvb/cinergyT2/cinergyT2.c
index 5a12b5679556..154a7ce7cb82 100644
--- a/drivers/media/dvb/cinergyT2/cinergyT2.c
+++ b/drivers/media/dvb/cinergyT2/cinergyT2.c
@@ -820,7 +820,7 @@ static int cinergyt2_register_rc(struct cinergyt2 *cinergyt2)
 
         input_dev->name = DRIVER_NAME " remote control";
         input_dev->phys = cinergyt2->phys;
-        input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REP);
+        input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_REP);
         for (i = 0; i < ARRAY_SIZE(rc_keys); i += 3)
                 set_bit(rc_keys[i + 2], input_dev->keybit);
         input_dev->keycodesize = 0;
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-remote.c b/drivers/media/dvb/dvb-usb/dvb-usb-remote.c
index 7b9f35bfb4f0..c0c2c22ddd83 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-remote.c
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-remote.c
@@ -106,7 +106,7 @@ int dvb_usb_remote_init(struct dvb_usb_device *d)
         if (!input_dev)
                 return -ENOMEM;
 
-        input_dev->evbit[0] = BIT(EV_KEY);
+        input_dev->evbit[0] = BIT_MASK(EV_KEY);
         input_dev->name = "IR-receiver inside an USB DVB receiver";
         input_dev->phys = d->rc_phys;
         usb_to_input_id(d->udev, &input_dev->id);
diff --git a/drivers/media/dvb/ttpci/av7110_ir.c b/drivers/media/dvb/ttpci/av7110_ir.c
index 5d19c402dad1..a283e1de83fa 100644
--- a/drivers/media/dvb/ttpci/av7110_ir.c
+++ b/drivers/media/dvb/ttpci/av7110_ir.c
@@ -27,7 +27,7 @@
 #include <linux/module.h>
 #include <linux/proc_fs.h>
 #include <linux/kernel.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 
 #include "av7110.h"
 #include "av7110_hw.h"
diff --git a/drivers/media/dvb/ttusb-dec/ttusb_dec.c b/drivers/media/dvb/ttusb-dec/ttusb_dec.c
index 5e691fd79904..1ec981d98b91 100644
--- a/drivers/media/dvb/ttusb-dec/ttusb_dec.c
+++ b/drivers/media/dvb/ttusb-dec/ttusb_dec.c
@@ -1198,7 +1198,7 @@ static int ttusb_init_rc( struct ttusb_dec *dec)
 
         input_dev->name = "ttusb_dec remote control";
         input_dev->phys = dec->rc_phys;
-        input_dev->evbit[0] = BIT(EV_KEY);
+        input_dev->evbit[0] = BIT_MASK(EV_KEY);
         input_dev->keycodesize = sizeof(u16);
         input_dev->keycodemax = 0x1a;
         input_dev->keycode = rc_keys;
diff --git a/drivers/media/video/usbvideo/konicawc.c b/drivers/media/video/usbvideo/konicawc.c
index 491505d6fdee..3e93f8058770 100644
--- a/drivers/media/video/usbvideo/konicawc.c
+++ b/drivers/media/video/usbvideo/konicawc.c
@@ -238,8 +238,8 @@ static void konicawc_register_input(struct konicawc *cam, struct usb_device *dev
         usb_to_input_id(dev, &input_dev->id);
         input_dev->dev.parent = &dev->dev;
 
-        input_dev->evbit[0] = BIT(EV_KEY);
-        input_dev->keybit[LONG(BTN_0)] = BIT(BTN_0);
+        input_dev->evbit[0] = BIT_MASK(EV_KEY);
+        input_dev->keybit[BIT_WORD(BTN_0)] = BIT_MASK(BTN_0);
 
         input_dev->private = cam;
 
diff --git a/drivers/media/video/usbvideo/quickcam_messenger.c b/drivers/media/video/usbvideo/quickcam_messenger.c
index dd1a6d6bbc9e..d847273eeba0 100644
--- a/drivers/media/video/usbvideo/quickcam_messenger.c
+++ b/drivers/media/video/usbvideo/quickcam_messenger.c
@@ -102,8 +102,8 @@ static void qcm_register_input(struct qcm *cam, struct usb_device *dev)
         usb_to_input_id(dev, &input_dev->id);
         input_dev->dev.parent = &dev->dev;
 
-        input_dev->evbit[0] = BIT(EV_KEY);
-        input_dev->keybit[LONG(BTN_0)] = BIT(BTN_0);
+        input_dev->evbit[0] = BIT_MASK(EV_KEY);
+        input_dev->keybit[BIT_WORD(BTN_0)] = BIT_MASK(BTN_0);
 
         input_dev->private = cam;
 
diff --git a/drivers/media/video/zoran_driver.c b/drivers/media/video/zoran_driver.c
index 1c14fa2bd411..419e5af78533 100644
--- a/drivers/media/video/zoran_driver.c
+++ b/drivers/media/video/zoran_driver.c
@@ -1285,7 +1285,7 @@ zoran_open (struct inode *inode,
         }
 
         dprintk(1, KERN_INFO "%s: zoran_open(%s, pid=[%d]), users(-)=%d\n",
-                ZR_DEVNAME(zr), current->comm, current->pid, zr->user);
+                ZR_DEVNAME(zr), current->comm, task_pid_nr(current), zr->user);
 
         /* now, create the open()-specific file_ops struct */
         fh = kzalloc(sizeof(struct zoran_fh), GFP_KERNEL);
@@ -1358,7 +1358,7 @@ zoran_close (struct inode *inode,
         struct zoran *zr = fh->zr;
 
         dprintk(1, KERN_INFO "%s: zoran_close(%s, pid=[%d]), users(+)=%d\n",
-                ZR_DEVNAME(zr), current->comm, current->pid, zr->user);
+                ZR_DEVNAME(zr), current->comm, task_pid_nr(current), zr->user);
 
         /* kernel locks (fs/device.c), so don't do that ourselves
          * (prevents deadlocks) */
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index 346c44eff95e..cf02ddc3436f 100644
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -111,6 +111,21 @@ config ASUS_LAPTOP
 
           If you have an ACPI-compatible ASUS laptop, say Y or M here.
 
+config FUJITSU_LAPTOP
+        tristate "Fujitsu Laptop Extras"
+        depends on X86
+        depends on ACPI
+        depends on BACKLIGHT_CLASS_DEVICE
+        ---help---
+          This is a driver for laptops built by Fujitsu:
+
+            * P2xxx/P5xxx/S6xxx/S7xxx series Lifebooks
+            * Possibly other Fujitsu laptop models
+
+          It adds support for LCD brightness control.
+
+          If you have a Fujitsu laptop, say Y or M here.
+
 config MSI_LAPTOP
         tristate "MSI Laptop Extras"
         depends on X86
@@ -134,6 +149,7 @@ config SONY_LAPTOP
         tristate "Sony Laptop Extras"
         depends on X86 && ACPI
         select BACKLIGHT_CLASS_DEVICE
+        depends on INPUT
           ---help---
           This mini-driver drives the SNC and SPIC devices present in the ACPI
           BIOS of the Sony Vaio laptops.
@@ -156,6 +172,7 @@ config THINKPAD_ACPI
         select BACKLIGHT_CLASS_DEVICE
         select HWMON
         select NVRAM
+        depends on INPUT
         ---help---
           This is a driver for the IBM and Lenovo ThinkPad laptops. It adds
           support for Fn-Fx key combinations, Bluetooth control, video
diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
index a24c61475c2f..87f2685d728f 100644
--- a/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
@@ -15,4 +15,5 @@ obj-$(CONFIG_PHANTOM)		+= phantom.o
 obj-$(CONFIG_SGI_IOC4)          += ioc4.o
 obj-$(CONFIG_SONY_LAPTOP)       += sony-laptop.o
 obj-$(CONFIG_THINKPAD_ACPI)     += thinkpad_acpi.o
+obj-$(CONFIG_FUJITSU_LAPTOP)    += fujitsu-laptop.o
 obj-$(CONFIG_EEPROM_93CX6)      += eeprom_93cx6.o
diff --git a/drivers/misc/fujitsu-laptop.c b/drivers/misc/fujitsu-laptop.c
new file mode 100644
index 000000000000..d366a6cc1fd9
--- /dev/null
+++ b/drivers/misc/fujitsu-laptop.c
@@ -0,0 +1,358 @@
+/*-*-linux-c-*-*/
+
+/*
+  Copyright (C) 2007 Jonathan Woithe <jwoithe@physics.adelaide.edu.au>
+  Based on earlier work:
+    Copyright (C) 2003 Shane Spencer <shane@bogomip.com>
+    Adrian Yee <brewt-fujitsu@brewt.org>
+
+  Templated from msi-laptop.c which is copyright by its respective authors.
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+  02110-1301, USA.
+ */
+
+/*
+ * fujitsu-laptop.c - Fujitsu laptop support, providing access to additional
+ * features made available on a range of Fujitsu laptops including the
+ * P2xxx/P5xxx/S6xxx/S7xxx series.
+ *
+ * This driver exports a few files in /sys/devices/platform/fujitsu-laptop/;
+ * others may be added at a later date.
+ *
+ *   lcd_level - Screen brightness: contains a single integer in the
+ *   range 0..7. (rw)
+ *
+ * In addition to these platform device attributes the driver
+ * registers itself in the Linux backlight control subsystem and is
+ * available to userspace under /sys/class/backlight/fujitsu-laptop/.
+ *
+ * This driver has been tested on a Fujitsu Lifebook S7020.  It should
+ * work on most P-series and S-series Lifebooks, but YMMV.
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/acpi.h>
+#include <linux/dmi.h>
+#include <linux/backlight.h>
+#include <linux/platform_device.h>
+#include <linux/autoconf.h>
+
+#define FUJITSU_DRIVER_VERSION "0.3"
+
+#define FUJITSU_LCD_N_LEVELS 8
+
+#define ACPI_FUJITSU_CLASS              "fujitsu"
+#define ACPI_FUJITSU_HID                "FUJ02B1"
+#define ACPI_FUJITSU_DRIVER_NAME        "Fujitsu laptop FUJ02B1 ACPI extras driver"
+#define ACPI_FUJITSU_DEVICE_NAME        "Fujitsu FUJ02B1"
+
+struct fujitsu_t {
+        acpi_handle acpi_handle;
+        struct backlight_device *bl_device;
+        struct platform_device *pf_device;
+
+        unsigned long fuj02b1_state;
+        unsigned int brightness_changed;
+        unsigned int brightness_level;
+};
+
+static struct fujitsu_t *fujitsu;
+
+/* Hardware access */
+
+static int set_lcd_level(int level)
+{
+        acpi_status status = AE_OK;
+        union acpi_object arg0 = { ACPI_TYPE_INTEGER };
+        struct acpi_object_list arg_list = { 1, &arg0 };
+        acpi_handle handle = NULL;
+
+        if (level < 0 || level >= FUJITSU_LCD_N_LEVELS)
+                return -EINVAL;
+
+        if (!fujitsu)
+                return -EINVAL;
+
+        status = acpi_get_handle(fujitsu->acpi_handle, "SBLL", &handle);
+        if (ACPI_FAILURE(status)) {
+                ACPI_DEBUG_PRINT((ACPI_DB_INFO, "SBLL not present\n"));
+                return -ENODEV;
+        }
+
+        arg0.integer.value = level;
+
+        status = acpi_evaluate_object(handle, NULL, &arg_list, NULL);
+        if (ACPI_FAILURE(status))
+                return -ENODEV;
+
+        return 0;
+}
+
+static int get_lcd_level(void)
+{
+        unsigned long state = 0;
+        acpi_status status = AE_OK;
+
+        // Get the Brightness
+        status =
+            acpi_evaluate_integer(fujitsu->acpi_handle, "GBLL", NULL, &state);
+        if (status < 0)
+                return status;
+
+        fujitsu->fuj02b1_state = state;
+        fujitsu->brightness_level = state & 0x0fffffff;
+
+        if (state & 0x80000000)
+                fujitsu->brightness_changed = 1;
+        else
+                fujitsu->brightness_changed = 0;
+
+        if (status < 0)
+                return status;
+
+        return fujitsu->brightness_level;
+}
+
+/* Backlight device stuff */
+
+static int bl_get_brightness(struct backlight_device *b)
+{
+        return get_lcd_level();
+}
+
+static int bl_update_status(struct backlight_device *b)
+{
+        return set_lcd_level(b->props.brightness);
+}
+
+static struct backlight_ops fujitsubl_ops = {
+        .get_brightness = bl_get_brightness,
+        .update_status = bl_update_status,
+};
+
+/* Platform device */
+
+static ssize_t show_lcd_level(struct device *dev,
+                              struct device_attribute *attr, char *buf)
+{
+
+        int ret;
+
+        ret = get_lcd_level();
+        if (ret < 0)
+                return ret;
+
+        return sprintf(buf, "%i\n", ret);
+}
+
+static ssize_t store_lcd_level(struct device *dev,
+                               struct device_attribute *attr, const char *buf,
+                               size_t count)
+{
+
+        int level, ret;
+
+        if (sscanf(buf, "%i", &level) != 1
+            || (level < 0 || level >= FUJITSU_LCD_N_LEVELS))
+                return -EINVAL;
+
+        ret = set_lcd_level(level);
+        if (ret < 0)
+                return ret;
+
+        return count;
+}
+
+static DEVICE_ATTR(lcd_level, 0644, show_lcd_level, store_lcd_level);
+
+static struct attribute *fujitsupf_attributes[] = {
+        &dev_attr_lcd_level.attr,
+        NULL
+};
+
+static struct attribute_group fujitsupf_attribute_group = {
+        .attrs = fujitsupf_attributes
+};
+
+static struct platform_driver fujitsupf_driver = {
+        .driver = {
+                   .name = "fujitsu-laptop",
+                   .owner = THIS_MODULE,
+                   }
+};
+
+/* ACPI device */
+
+int acpi_fujitsu_add(struct acpi_device *device)
+{
+        int result = 0;
+        int state = 0;
+
+        ACPI_FUNCTION_TRACE("acpi_fujitsu_add");
+
+        if (!device)
+                return -EINVAL;
+
+        fujitsu->acpi_handle = device->handle;
+        sprintf(acpi_device_name(device), "%s", ACPI_FUJITSU_DEVICE_NAME);
+        sprintf(acpi_device_class(device), "%s", ACPI_FUJITSU_CLASS);
+        acpi_driver_data(device) = fujitsu;
+
+        result = acpi_bus_get_power(fujitsu->acpi_handle, &state);
+        if (result) {
+                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                                  "Error reading power state\n"));
+                goto end;
+        }
+
+        printk(KERN_INFO PREFIX "%s [%s] (%s)\n",
+               acpi_device_name(device), acpi_device_bid(device),
+               !device->power.state ? "on" : "off");
+
+      end:
+
+        return result;
+}
+
+int acpi_fujitsu_remove(struct acpi_device *device, int type)
+{
+        ACPI_FUNCTION_TRACE("acpi_fujitsu_remove");
+
+        if (!device || !acpi_driver_data(device))
+                return -EINVAL;
+        fujitsu->acpi_handle = 0;
+
+        return 0;
+}
+
+static const struct acpi_device_id fujitsu_device_ids[] = {
+        {ACPI_FUJITSU_HID, 0},
+        {"", 0},
+};
+
+static struct acpi_driver acpi_fujitsu_driver = {
+        .name = ACPI_FUJITSU_DRIVER_NAME,
+        .class = ACPI_FUJITSU_CLASS,
+        .ids = fujitsu_device_ids,
+        .ops = {
+                .add = acpi_fujitsu_add,
+                .remove = acpi_fujitsu_remove,
+                },
+};
+
+/* Initialization */
+
+static int __init fujitsu_init(void)
+{
+        int ret, result;
+
+        if (acpi_disabled)
+                return -ENODEV;
+
+        fujitsu = kmalloc(sizeof(struct fujitsu_t), GFP_KERNEL);
+        if (!fujitsu)
+                return -ENOMEM;
+        memset(fujitsu, 0, sizeof(struct fujitsu_t));
+
+        result = acpi_bus_register_driver(&acpi_fujitsu_driver);
+        if (result < 0) {
+                ret = -ENODEV;
+                goto fail_acpi;
+        }
+
+        /* Register backlight stuff */
+
+        fujitsu->bl_device =
+            backlight_device_register("fujitsu-laptop", NULL, NULL,
+                                      &fujitsubl_ops);
+        if (IS_ERR(fujitsu->bl_device))
+                return PTR_ERR(fujitsu->bl_device);
+
+        fujitsu->bl_device->props.max_brightness = FUJITSU_LCD_N_LEVELS - 1;
+        ret = platform_driver_register(&fujitsupf_driver);
+        if (ret)
+                goto fail_backlight;
+
+        /* Register platform stuff */
+
+        fujitsu->pf_device = platform_device_alloc("fujitsu-laptop", -1);
+        if (!fujitsu->pf_device) {
+                ret = -ENOMEM;
+                goto fail_platform_driver;
+        }
+
+        ret = platform_device_add(fujitsu->pf_device);
+        if (ret)
+                goto fail_platform_device1;
+
+        ret =
+            sysfs_create_group(&fujitsu->pf_device->dev.kobj,
+                               &fujitsupf_attribute_group);
+        if (ret)
+                goto fail_platform_device2;
+
+        printk(KERN_INFO "fujitsu-laptop: driver " FUJITSU_DRIVER_VERSION
+               " successfully loaded.\n");
+
+        return 0;
+
+      fail_platform_device2:
+
+        platform_device_del(fujitsu->pf_device);
+
+      fail_platform_device1:
+
+        platform_device_put(fujitsu->pf_device);
+
+      fail_platform_driver:
+
+        platform_driver_unregister(&fujitsupf_driver);
+
+      fail_backlight:
+
+        backlight_device_unregister(fujitsu->bl_device);
+
+      fail_acpi:
+
+        kfree(fujitsu);
+
+        return ret;
+}
+
+static void __exit fujitsu_cleanup(void)
+{
+        sysfs_remove_group(&fujitsu->pf_device->dev.kobj,
+                           &fujitsupf_attribute_group);
+        platform_device_unregister(fujitsu->pf_device);
+        platform_driver_unregister(&fujitsupf_driver);
+        backlight_device_unregister(fujitsu->bl_device);
+
+        acpi_bus_unregister_driver(&acpi_fujitsu_driver);
+
+        kfree(fujitsu);
+
+        printk(KERN_INFO "fujitsu-laptop: driver unloaded.\n");
+}
+
+module_init(fujitsu_init);
+module_exit(fujitsu_cleanup);
+
+MODULE_AUTHOR("Jonathan Woithe");
+MODULE_DESCRIPTION("Fujitsu laptop extras support");
+MODULE_VERSION(FUJITSU_DRIVER_VERSION);
+MODULE_LICENSE("GPL");
diff --git a/drivers/misc/ibmasm/remote.c b/drivers/misc/ibmasm/remote.c
index 0550ce075fc4..1d9defb1a10c 100644
--- a/drivers/misc/ibmasm/remote.c
+++ b/drivers/misc/ibmasm/remote.c
@@ -226,9 +226,9 @@ int ibmasm_init_remote_input_dev(struct service_processor *sp)
         mouse_dev->id.product = pdev->device;
         mouse_dev->id.version = 1;
         mouse_dev->dev.parent = sp->dev;
-        mouse_dev->evbit[0]  = BIT(EV_KEY) | BIT(EV_ABS);
-        mouse_dev->keybit[LONG(BTN_MOUSE)] = BIT(BTN_LEFT) |
-                BIT(BTN_RIGHT) | BIT(BTN_MIDDLE);
+        mouse_dev->evbit[0]  = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
+        mouse_dev->keybit[BIT_WORD(BTN_MOUSE)] = BIT_MASK(BTN_LEFT) |
+                BIT_MASK(BTN_RIGHT) | BIT_MASK(BTN_MIDDLE);
         set_bit(BTN_TOUCH, mouse_dev->keybit);
         mouse_dev->name = "ibmasm RSA I remote mouse";
         input_set_abs_params(mouse_dev, ABS_X, 0, MOUSE_X_MAX, 0, 0);
@@ -239,7 +239,7 @@ int ibmasm_init_remote_input_dev(struct service_processor *sp)
         keybd_dev->id.product = pdev->device;
         keybd_dev->id.version = 2;
         keybd_dev->dev.parent = sp->dev;
-        keybd_dev->evbit[0]  = BIT(EV_KEY);
+        keybd_dev->evbit[0]  = BIT_MASK(EV_KEY);
         keybd_dev->name = "ibmasm RSA I remote keyboard";
 
         for (i = 0; i < XLATE_SIZE; i++) {
diff --git a/drivers/misc/phantom.c b/drivers/misc/phantom.c
index 5108b7c576df..cd221fd0fb94 100644
--- a/drivers/misc/phantom.c
+++ b/drivers/misc/phantom.c
@@ -9,6 +9,7 @@
  *  You need an userspace library to cooperate with this driver. It (and other
  *  info) may be obtained here:
  *  http://www.fi.muni.cz/~xslaby/phantom.html
+ *  or alternatively, you might use OpenHaptics provided by Sensable.
  */
 
 #include <linux/kernel.h>
@@ -24,13 +25,14 @@
 #include <asm/atomic.h>
 #include <asm/io.h>
 
-#define PHANTOM_VERSION         "n0.9.5"
+#define PHANTOM_VERSION         "n0.9.7"
 
 #define PHANTOM_MAX_MINORS      8
 
 #define PHN_IRQCTL              0x4c    /* irq control in caddr space */
 
 #define PHB_RUNNING             1
+#define PHB_NOT_OH              2
 
 static struct class *phantom_class;
 static int phantom_major;
@@ -47,7 +49,11 @@ struct phantom_device {
         struct cdev cdev;
 
         struct mutex open_lock;
-        spinlock_t ioctl_lock;
+        spinlock_t regs_lock;
+
+        /* used in NOT_OH mode */
+        struct phm_regs oregs;
+        u32 ctl_reg;
 };
 
 static unsigned char phantom_devices[PHANTOM_MAX_MINORS];
@@ -82,6 +88,7 @@ static long phantom_ioctl(struct file *file, unsigned int cmd,
         struct phm_regs rs;
         struct phm_reg r;
         void __user *argp = (void __user *)arg;
+        unsigned long flags;
         unsigned int i;
 
         if (_IOC_TYPE(cmd) != PH_IOC_MAGIC ||
@@ -96,32 +103,45 @@ static long phantom_ioctl(struct file *file, unsigned int cmd,
                 if (r.reg > 7)
                         return -EINVAL;
 
-                spin_lock(&dev->ioctl_lock);
+                spin_lock_irqsave(&dev->regs_lock, flags);
                 if (r.reg == PHN_CONTROL && (r.value & PHN_CTL_IRQ) &&
                                 phantom_status(dev, dev->status | PHB_RUNNING)){
-                        spin_unlock(&dev->ioctl_lock);
+                        spin_unlock_irqrestore(&dev->regs_lock, flags);
                         return -ENODEV;
                 }
 
                 pr_debug("phantom: writing %x to %u\n", r.value, r.reg);
+
+                /* preserve amp bit (don't allow to change it when in NOT_OH) */
+                if (r.reg == PHN_CONTROL && (dev->status & PHB_NOT_OH)) {
+                        r.value &= ~PHN_CTL_AMP;
+                        r.value |= dev->ctl_reg & PHN_CTL_AMP;
+                        dev->ctl_reg = r.value;
+                }
+
                 iowrite32(r.value, dev->iaddr + r.reg);
                 ioread32(dev->iaddr); /* PCI posting */
 
                 if (r.reg == PHN_CONTROL && !(r.value & PHN_CTL_IRQ))
                         phantom_status(dev, dev->status & ~PHB_RUNNING);
-                spin_unlock(&dev->ioctl_lock);
+                spin_unlock_irqrestore(&dev->regs_lock, flags);
                 break;
         case PHN_SET_REGS:
                 if (copy_from_user(&rs, argp, sizeof(rs)))
                         return -EFAULT;
 
                 pr_debug("phantom: SRS %u regs %x\n", rs.count, rs.mask);
-                spin_lock(&dev->ioctl_lock);
-                for (i = 0; i < min(rs.count, 8U); i++)
-                        if ((1 << i) & rs.mask)
-                                iowrite32(rs.values[i], dev->oaddr + i);
-                ioread32(dev->iaddr); /* PCI posting */
-                spin_unlock(&dev->ioctl_lock);
+                spin_lock_irqsave(&dev->regs_lock, flags);
+                if (dev->status & PHB_NOT_OH)
+                        memcpy(&dev->oregs, &rs, sizeof(rs));
+                else {
+                        u32 m = min(rs.count, 8U);
+                        for (i = 0; i < m; i++)
+                                if (rs.mask & BIT(i))
+                                        iowrite32(rs.values[i], dev->oaddr + i);
+                        ioread32(dev->iaddr); /* PCI posting */
+                }
+                spin_unlock_irqrestore(&dev->regs_lock, flags);
                 break;
         case PHN_GET_REG:
                 if (copy_from_user(&r, argp, sizeof(r)))
@@ -135,20 +155,35 @@ static long phantom_ioctl(struct file *file, unsigned int cmd,
                 if (copy_to_user(argp, &r, sizeof(r)))
                         return -EFAULT;
                 break;
-        case PHN_GET_REGS:
+        case PHN_GET_REGS: {
+                u32 m;
+
                 if (copy_from_user(&rs, argp, sizeof(rs)))
                         return -EFAULT;
 
+                m = min(rs.count, 8U);
+
                 pr_debug("phantom: GRS %u regs %x\n", rs.count, rs.mask);
-                spin_lock(&dev->ioctl_lock);
-                for (i = 0; i < min(rs.count, 8U); i++)
-                        if ((1 << i) & rs.mask)
+                spin_lock_irqsave(&dev->regs_lock, flags);
+                for (i = 0; i < m; i++)
+                        if (rs.mask & BIT(i))
                                 rs.values[i] = ioread32(dev->iaddr + i);
-                spin_unlock(&dev->ioctl_lock);
+                spin_unlock_irqrestore(&dev->regs_lock, flags);
 
                 if (copy_to_user(argp, &rs, sizeof(rs)))
                         return -EFAULT;
                 break;
+        } case PHN_NOT_OH:
+                spin_lock_irqsave(&dev->regs_lock, flags);
+                if (dev->status & PHB_RUNNING) {
+                        printk(KERN_ERR "phantom: you need to set NOT_OH "
+                                        "before you start the device!\n");
+                        spin_unlock_irqrestore(&dev->regs_lock, flags);
+                        return -EINVAL;
+                }
+                dev->status |= PHB_NOT_OH;
+                spin_unlock_irqrestore(&dev->regs_lock, flags);
+                break;
         default:
                 return -ENOTTY;
         }
@@ -171,8 +206,11 @@ static int phantom_open(struct inode *inode, struct file *file)
                 return -EINVAL;
         }
 
+        WARN_ON(dev->status & PHB_NOT_OH);
+
         file->private_data = dev;
 
+        atomic_set(&dev->counter, 0);
         dev->opened++;
         mutex_unlock(&dev->open_lock);
 
@@ -187,6 +225,7 @@ static int phantom_release(struct inode *inode, struct file *file)
 
         dev->opened = 0;
         phantom_status(dev, dev->status & ~PHB_RUNNING);
+        dev->status &= ~PHB_NOT_OH;
 
         mutex_unlock(&dev->open_lock);
 
@@ -220,12 +259,32 @@ static struct file_operations phantom_file_ops = {
 static irqreturn_t phantom_isr(int irq, void *data)
 {
         struct phantom_device *dev = data;
+        unsigned int i;
+        u32 ctl;
 
-        if (!(ioread32(dev->iaddr + PHN_CONTROL) & PHN_CTL_IRQ))
+        spin_lock(&dev->regs_lock);
+        ctl = ioread32(dev->iaddr + PHN_CONTROL);
+        if (!(ctl & PHN_CTL_IRQ)) {
+                spin_unlock(&dev->regs_lock);
                 return IRQ_NONE;
+        }
 
         iowrite32(0, dev->iaddr);
         iowrite32(0xc0, dev->iaddr);
+
+        if (dev->status & PHB_NOT_OH) {
+                struct phm_regs *r = &dev->oregs;
+                u32 m = min(r->count, 8U);
+
+                for (i = 0; i < m; i++)
+                        if (r->mask & BIT(i))
+                                iowrite32(r->values[i], dev->oaddr + i);
+
+                dev->ctl_reg ^= PHN_CTL_AMP;
+                iowrite32(dev->ctl_reg, dev->iaddr + PHN_CONTROL);
+        }
+        spin_unlock(&dev->regs_lock);
+
         ioread32(dev->iaddr); /* PCI posting */
 
         atomic_inc(&dev->counter);
@@ -297,7 +356,7 @@ static int __devinit phantom_probe(struct pci_dev *pdev,
         }
 
         mutex_init(&pht->open_lock);
-        spin_lock_init(&pht->ioctl_lock);
+        spin_lock_init(&pht->regs_lock);
         init_waitqueue_head(&pht->wait);
         cdev_init(&pht->cdev, &phantom_file_ops);
         pht->cdev.owner = THIS_MODULE;
@@ -378,6 +437,8 @@ static int phantom_suspend(struct pci_dev *pdev, pm_message_t state)
         iowrite32(0, dev->caddr + PHN_IRQCTL);
         ioread32(dev->caddr + PHN_IRQCTL); /* PCI posting */
 
+        synchronize_irq(pdev->irq);
+
         return 0;
 }
 
diff --git a/drivers/misc/sony-laptop.c b/drivers/misc/sony-laptop.c
index e73a71f04bb4..1bfbb87e5793 100644
--- a/drivers/misc/sony-laptop.c
+++ b/drivers/misc/sony-laptop.c
@@ -411,9 +411,9 @@ static int sony_laptop_setup_input(void)
         jog_dev->id.bustype = BUS_ISA;
         jog_dev->id.vendor = PCI_VENDOR_ID_SONY;
 
-        jog_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REL);
-        jog_dev->keybit[LONG(BTN_MOUSE)] = BIT(BTN_MIDDLE);
-        jog_dev->relbit[0] = BIT(REL_WHEEL);
+        jog_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_REL);
+        jog_dev->keybit[BIT_WORD(BTN_MOUSE)] = BIT_MASK(BTN_MIDDLE);
+        jog_dev->relbit[0] = BIT_MASK(REL_WHEEL);
 
         error = input_register_device(jog_dev);
         if (error)
@@ -1173,7 +1173,8 @@ static struct acpi_driver sony_nc_driver = {
 #define SONYPI_TYPE3_OFFSET     0x12
 
 struct sony_pic_ioport {
-        struct acpi_resource_io io;
+        struct acpi_resource_io io1;
+        struct acpi_resource_io io2;
         struct list_head        list;
 };
 
@@ -1443,11 +1444,11 @@ static u8 sony_pic_call1(u8 dev)
 {
         u8 v1, v2;
 
-        wait_on_command(inb_p(spic_dev.cur_ioport->io.minimum + 4) & 2,
+        wait_on_command(inb_p(spic_dev.cur_ioport->io1.minimum + 4) & 2,
                         ITERATIONS_LONG);
-        outb(dev, spic_dev.cur_ioport->io.minimum + 4);
-        v1 = inb_p(spic_dev.cur_ioport->io.minimum + 4);
-        v2 = inb_p(spic_dev.cur_ioport->io.minimum);
+        outb(dev, spic_dev.cur_ioport->io1.minimum + 4);
+        v1 = inb_p(spic_dev.cur_ioport->io1.minimum + 4);
+        v2 = inb_p(spic_dev.cur_ioport->io1.minimum);
         dprintk("sony_pic_call1: 0x%.4x\n", (v2 << 8) | v1);
         return v2;
 }
@@ -1456,13 +1457,13 @@ static u8 sony_pic_call2(u8 dev, u8 fn)
 {
         u8 v1;
 
-        wait_on_command(inb_p(spic_dev.cur_ioport->io.minimum + 4) & 2,
+        wait_on_command(inb_p(spic_dev.cur_ioport->io1.minimum + 4) & 2,
                         ITERATIONS_LONG);
-        outb(dev, spic_dev.cur_ioport->io.minimum + 4);
-        wait_on_command(inb_p(spic_dev.cur_ioport->io.minimum + 4) & 2,
+        outb(dev, spic_dev.cur_ioport->io1.minimum + 4);
+        wait_on_command(inb_p(spic_dev.cur_ioport->io1.minimum + 4) & 2,
                         ITERATIONS_LONG);
-        outb(fn, spic_dev.cur_ioport->io.minimum);
-        v1 = inb_p(spic_dev.cur_ioport->io.minimum);
+        outb(fn, spic_dev.cur_ioport->io1.minimum);
+        v1 = inb_p(spic_dev.cur_ioport->io1.minimum);
         dprintk("sony_pic_call2: 0x%.4x\n", v1);
         return v1;
 }
@@ -1471,13 +1472,13 @@ static u8 sony_pic_call3(u8 dev, u8 fn, u8 v)
 {
         u8 v1;
 
-        wait_on_command(inb_p(spic_dev.cur_ioport->io.minimum + 4) & 2, ITERATIONS_LONG);
-        outb(dev, spic_dev.cur_ioport->io.minimum + 4);
-        wait_on_command(inb_p(spic_dev.cur_ioport->io.minimum + 4) & 2, ITERATIONS_LONG);
-        outb(fn, spic_dev.cur_ioport->io.minimum);
-        wait_on_command(inb_p(spic_dev.cur_ioport->io.minimum + 4) & 2, ITERATIONS_LONG);
-        outb(v, spic_dev.cur_ioport->io.minimum);
-        v1 = inb_p(spic_dev.cur_ioport->io.minimum);
+        wait_on_command(inb_p(spic_dev.cur_ioport->io1.minimum + 4) & 2, ITERATIONS_LONG);
+        outb(dev, spic_dev.cur_ioport->io1.minimum + 4);
+        wait_on_command(inb_p(spic_dev.cur_ioport->io1.minimum + 4) & 2, ITERATIONS_LONG);
+        outb(fn, spic_dev.cur_ioport->io1.minimum);
+        wait_on_command(inb_p(spic_dev.cur_ioport->io1.minimum + 4) & 2, ITERATIONS_LONG);
+        outb(v, spic_dev.cur_ioport->io1.minimum);
+        v1 = inb_p(spic_dev.cur_ioport->io1.minimum);
         dprintk("sony_pic_call3: 0x%.4x\n", v1);
         return v1;
 }
@@ -2074,7 +2075,18 @@ sony_pic_read_possible_resource(struct acpi_resource *resource, void *context)
 
         switch (resource->type) {
         case ACPI_RESOURCE_TYPE_START_DEPENDENT:
+                {
+                        /* start IO enumeration */
+                        struct sony_pic_ioport *ioport = kzalloc(sizeof(*ioport), GFP_KERNEL);
+                        if (!ioport)
+                                return AE_ERROR;
+
+                        list_add(&ioport->list, &dev->ioports);
+                        return AE_OK;
+                }
+
         case ACPI_RESOURCE_TYPE_END_DEPENDENT:
+                /* end IO enumeration */
                 return AE_OK;
 
         case ACPI_RESOURCE_TYPE_IRQ:
@@ -2101,7 +2113,7 @@ sony_pic_read_possible_resource(struct acpi_resource *resource, void *context)
                                 if (!interrupt)
                                         return AE_ERROR;
 
-                                list_add_tail(&interrupt->list, &dev->interrupts);
+                                list_add(&interrupt->list, &dev->interrupts);
                                 interrupt->irq.triggering = p->triggering;
                                 interrupt->irq.polarity = p->polarity;
                                 interrupt->irq.sharable = p->sharable;
@@ -2113,18 +2125,27 @@ sony_pic_read_possible_resource(struct acpi_resource *resource, void *context)
         case ACPI_RESOURCE_TYPE_IO:
                 {
                         struct acpi_resource_io *io = &resource->data.io;
-                        struct sony_pic_ioport *ioport = NULL;
+                        struct sony_pic_ioport *ioport =
+                                list_first_entry(&dev->ioports, struct sony_pic_ioport, list);
                         if (!io) {
                                 dprintk("Blank IO resource\n");
                                 return AE_OK;
                         }
 
-                        ioport = kzalloc(sizeof(*ioport), GFP_KERNEL);
-                        if (!ioport)
+                        if (!ioport->io1.minimum) {
+                                memcpy(&ioport->io1, io, sizeof(*io));
+                                dprintk("IO1 at 0x%.4x (0x%.2x)\n", ioport->io1.minimum,
+                                                ioport->io1.address_length);
+                        }
+                        else if (!ioport->io2.minimum) {
+                                memcpy(&ioport->io2, io, sizeof(*io));
+                                dprintk("IO2 at 0x%.4x (0x%.2x)\n", ioport->io2.minimum,
+                                                ioport->io2.address_length);
+                        }
+                        else {
+                                printk(KERN_ERR DRV_PFX "Unknown SPIC Type, more than 2 IO Ports\n");
                                 return AE_ERROR;
-
-                        list_add_tail(&ioport->list, &dev->ioports);
-                        memcpy(&ioport->io, io, sizeof(*io));
+                        }
                         return AE_OK;
                 }
         default:
@@ -2199,10 +2220,22 @@ static int sony_pic_enable(struct acpi_device *device,
 {
         acpi_status status;
         int result = 0;
+        /* Type 1 resource layout is:
+         *    IO
+         *    IO
+         *    IRQNoFlags
+         *    End
+         *
+         * Type 2 and 3 resource layout is:
+         *    IO
+         *    IRQNoFlags
+         *    End
+         */
         struct {
-                struct acpi_resource io_res;
-                struct acpi_resource irq_res;
-                struct acpi_resource end;
+                struct acpi_resource res1;
+                struct acpi_resource res2;
+                struct acpi_resource res3;
+                struct acpi_resource res4;
         } *resource;
         struct acpi_buffer buffer = { 0, NULL };
 
@@ -2217,21 +2250,49 @@ static int sony_pic_enable(struct acpi_device *device,
         buffer.length = sizeof(*resource) + 1;
         buffer.pointer = resource;
 
-        /* setup io resource */
-        resource->io_res.type = ACPI_RESOURCE_TYPE_IO;
-        resource->io_res.length = sizeof(struct acpi_resource);
-        memcpy(&resource->io_res.data.io, &ioport->io,
-                        sizeof(struct acpi_resource_io));
+        /* setup Type 1 resources */
+        if (spic_dev.model == SONYPI_DEVICE_TYPE1) {
 
-        /* setup irq resource */
-        resource->irq_res.type = ACPI_RESOURCE_TYPE_IRQ;
-        resource->irq_res.length = sizeof(struct acpi_resource);
-        memcpy(&resource->irq_res.data.irq, &irq->irq,
-                        sizeof(struct acpi_resource_irq));
-        /* we requested a shared irq */
-        resource->irq_res.data.irq.sharable = ACPI_SHARED;
+                /* setup io resources */
+                resource->res1.type = ACPI_RESOURCE_TYPE_IO;
+                resource->res1.length = sizeof(struct acpi_resource);
+                memcpy(&resource->res1.data.io, &ioport->io1,
+                                sizeof(struct acpi_resource_io));
 
-        resource->end.type = ACPI_RESOURCE_TYPE_END_TAG;
+                resource->res2.type = ACPI_RESOURCE_TYPE_IO;
+                resource->res2.length = sizeof(struct acpi_resource);
+                memcpy(&resource->res2.data.io, &ioport->io2,
+                                sizeof(struct acpi_resource_io));
+
+                /* setup irq resource */
+                resource->res3.type = ACPI_RESOURCE_TYPE_IRQ;
+                resource->res3.length = sizeof(struct acpi_resource);
+                memcpy(&resource->res3.data.irq, &irq->irq,
+                                sizeof(struct acpi_resource_irq));
+                /* we requested a shared irq */
+                resource->res3.data.irq.sharable = ACPI_SHARED;
+
+                resource->res4.type = ACPI_RESOURCE_TYPE_END_TAG;
+
+        }
+        /* setup Type 2/3 resources */
+        else {
+                /* setup io resource */
+                resource->res1.type = ACPI_RESOURCE_TYPE_IO;
+                resource->res1.length = sizeof(struct acpi_resource);
+                memcpy(&resource->res1.data.io, &ioport->io1,
+                                sizeof(struct acpi_resource_io));
+
+                /* setup irq resource */
+                resource->res2.type = ACPI_RESOURCE_TYPE_IRQ;
+                resource->res2.length = sizeof(struct acpi_resource);
+                memcpy(&resource->res2.data.irq, &irq->irq,
+                                sizeof(struct acpi_resource_irq));
+                /* we requested a shared irq */
+                resource->res2.data.irq.sharable = ACPI_SHARED;
+
+                resource->res3.type = ACPI_RESOURCE_TYPE_END_TAG;
+        }
 
         /* Attempt to set the resource */
         dprintk("Evaluating _SRS\n");
@@ -2239,7 +2300,7 @@ static int sony_pic_enable(struct acpi_device *device,
 
         /* check for total failure */
         if (ACPI_FAILURE(status)) {
-                printk(KERN_ERR DRV_PFX "Error evaluating _SRS");
+                printk(KERN_ERR DRV_PFX "Error evaluating _SRS\n");
                 result = -ENODEV;
                 goto end;
         }
@@ -2268,11 +2329,14 @@ static irqreturn_t sony_pic_irq(int irq, void *dev_id)
 
         struct sony_pic_dev *dev = (struct sony_pic_dev *) dev_id;
 
-        ev = inb_p(dev->cur_ioport->io.minimum);
-        data_mask = inb_p(dev->cur_ioport->io.minimum + dev->evport_offset);
+        ev = inb_p(dev->cur_ioport->io1.minimum);
+        if (dev->cur_ioport->io2.minimum)
+                data_mask = inb_p(dev->cur_ioport->io2.minimum);
+        else
+                data_mask = inb_p(dev->cur_ioport->io1.minimum + dev->evport_offset);
 
         dprintk("event ([%.2x] [%.2x]) at port 0x%.4x(+0x%.2x)\n",
-                        ev, data_mask, dev->cur_ioport->io.minimum, dev->evport_offset);
+                        ev, data_mask, dev->cur_ioport->io1.minimum, dev->evport_offset);
 
         if (ev == 0x00 || ev == 0xff)
                 return IRQ_HANDLED;
@@ -2323,8 +2387,11 @@ static int sony_pic_remove(struct acpi_device *device, int type)
         }
 
         free_irq(spic_dev.cur_irq->irq.interrupts[0], &spic_dev);
-        release_region(spic_dev.cur_ioport->io.minimum,
-                        spic_dev.cur_ioport->io.address_length);
+        release_region(spic_dev.cur_ioport->io1.minimum,
+                        spic_dev.cur_ioport->io1.address_length);
+        if (spic_dev.cur_ioport->io2.minimum)
+                release_region(spic_dev.cur_ioport->io2.minimum,
+                                spic_dev.cur_ioport->io2.address_length);
 
         sonypi_compat_exit();
 
@@ -2397,14 +2464,36 @@ static int sony_pic_add(struct acpi_device *device)
                 goto err_remove_input;
 
         /* request io port */
-        list_for_each_entry(io, &spic_dev.ioports, list) {
-                if (request_region(io->io.minimum, io->io.address_length,
+        list_for_each_entry_reverse(io, &spic_dev.ioports, list) {
+                if (request_region(io->io1.minimum, io->io1.address_length,
                                         "Sony Programable I/O Device")) {
-                        dprintk("I/O port: 0x%.4x (0x%.4x) + 0x%.2x\n",
-                                        io->io.minimum, io->io.maximum,
-                                        io->io.address_length);
-                        spic_dev.cur_ioport = io;
-                        break;
+                        dprintk("I/O port1: 0x%.4x (0x%.4x) + 0x%.2x\n",
+                                        io->io1.minimum, io->io1.maximum,
+                                        io->io1.address_length);
+                        /* Type 1 have 2 ioports */
+                        if (io->io2.minimum) {
+                                if (request_region(io->io2.minimum,
+                                                io->io2.address_length,
+                                                "Sony Programable I/O Device")) {
+                                        dprintk("I/O port2: 0x%.4x (0x%.4x) + 0x%.2x\n",
+                                                        io->io2.minimum, io->io2.maximum,
+                                                        io->io2.address_length);
+                                        spic_dev.cur_ioport = io;
+                                        break;
+                                }
+                                else {
+                                        dprintk("Unable to get I/O port2: "
+                                                        "0x%.4x (0x%.4x) + 0x%.2x\n",
+                                                        io->io2.minimum, io->io2.maximum,
+                                                        io->io2.address_length);
+                                        release_region(io->io1.minimum,
+                                                        io->io1.address_length);
+                                }
+                        }
+                        else {
+                                spic_dev.cur_ioport = io;
+                                break;
+                        }
                 }
         }
         if (!spic_dev.cur_ioport) {
@@ -2414,7 +2503,7 @@ static int sony_pic_add(struct acpi_device *device)
         }
 
         /* request IRQ */
-        list_for_each_entry(irq, &spic_dev.interrupts, list) {
+        list_for_each_entry_reverse(irq, &spic_dev.interrupts, list) {
                 if (!request_irq(irq->irq.interrupts[0], sony_pic_irq,
                                         IRQF_SHARED, "sony-laptop", &spic_dev)) {
                         dprintk("IRQ: %d - triggering: %d - "
@@ -2462,8 +2551,11 @@ err_free_irq:
         free_irq(spic_dev.cur_irq->irq.interrupts[0], &spic_dev);
 
 err_release_region:
-        release_region(spic_dev.cur_ioport->io.minimum,
-                        spic_dev.cur_ioport->io.address_length);
+        release_region(spic_dev.cur_ioport->io1.minimum,
+                        spic_dev.cur_ioport->io1.address_length);
+        if (spic_dev.cur_ioport->io2.minimum)
+                release_region(spic_dev.cur_ioport->io2.minimum,
+                                spic_dev.cur_ioport->io2.address_length);
 
 err_remove_compat:
         sonypi_compat_exit();
diff --git a/drivers/misc/thinkpad_acpi.c b/drivers/misc/thinkpad_acpi.c
index 81e068fa7ac5..e953276664a0 100644
--- a/drivers/misc/thinkpad_acpi.c
+++ b/drivers/misc/thinkpad_acpi.c
@@ -22,7 +22,7 @@
  */
 
 #define IBM_VERSION "0.16"
-#define TPACPI_SYSFS_VERSION 0x010000
+#define TPACPI_SYSFS_VERSION 0x020000
 
 /*
  *  Changelog:
@@ -117,6 +117,12 @@ IBM_BIOS_MODULE_ALIAS("K[U,X-Z]");
 
 #define __unused __attribute__ ((unused))
 
+static enum {
+        TPACPI_LIFE_INIT = 0,
+        TPACPI_LIFE_RUNNING,
+        TPACPI_LIFE_EXITING,
+} tpacpi_lifecycle;
+
 /****************************************************************************
  ****************************************************************************
  *
@@ -342,6 +348,9 @@ static void dispatch_acpi_notify(acpi_handle handle, u32 event, void *data)
 {
         struct ibm_struct *ibm = data;
 
+        if (tpacpi_lifecycle != TPACPI_LIFE_RUNNING)
+                return;
+
         if (!ibm || !ibm->acpi || !ibm->acpi->notify)
                 return;
 
@@ -517,8 +526,10 @@ static char *next_cmd(char **cmds)
  ****************************************************************************/
 
 static struct platform_device *tpacpi_pdev;
+static struct platform_device *tpacpi_sensors_pdev;
 static struct device *tpacpi_hwmon;
 static struct input_dev *tpacpi_inputdev;
+static struct mutex tpacpi_inputdev_send_mutex;
 
 
 static int tpacpi_resume_handler(struct platform_device *pdev)
@@ -543,6 +554,12 @@ static struct platform_driver tpacpi_pdriver = {
         .resume = tpacpi_resume_handler,
 };
 
+static struct platform_driver tpacpi_hwmon_pdriver = {
+        .driver = {
+                .name = IBM_HWMON_DRVR_NAME,
+                .owner = THIS_MODULE,
+        },
+};
 
 /*************************************************************************
  * thinkpad-acpi driver attributes
@@ -692,6 +709,8 @@ static int parse_strtoul(const char *buf,
 {
         char *endp;
 
+        while (*buf && isspace(*buf))
+                buf++;
         *value = simple_strtoul(buf, &endp, 0);
         while (*endp && isspace(*endp))
                 endp++;
@@ -989,6 +1008,7 @@ static int __init hotkey_init(struct ibm_init_struct *iibm)
 
         int res, i;
         int status;
+        int hkeyv;
 
         vdbg_printk(TPACPI_DBG_INIT, "initializing hotkey subdriver\n");
 
@@ -1014,18 +1034,35 @@ static int __init hotkey_init(struct ibm_init_struct *iibm)
                         return res;
 
                 /* mask not supported on 570, 600e/x, 770e, 770x, A21e, A2xm/p,
-                   A30, R30, R31, T20-22, X20-21, X22-24 */
-                tp_features.hotkey_mask =
-                        acpi_evalf(hkey_handle, NULL, "DHKN", "qv");
+                   A30, R30, R31, T20-22, X20-21, X22-24.  Detected by checking
+                   for HKEY interface version 0x100 */
+                if (acpi_evalf(hkey_handle, &hkeyv, "MHKV", "qd")) {
+                        if ((hkeyv >> 8) != 1) {
+                                printk(IBM_ERR "unknown version of the "
+                                       "HKEY interface: 0x%x\n", hkeyv);
+                                printk(IBM_ERR "please report this to %s\n",
+                                       IBM_MAIL);
+                        } else {
+                                /*
+                                 * MHKV 0x100 in A31, R40, R40e,
+                                 * T4x, X31, and later
+                                 * */
+                                tp_features.hotkey_mask = 1;
+                        }
+                }
 
                 vdbg_printk(TPACPI_DBG_INIT, "hotkey masks are %s\n",
                         str_supported(tp_features.hotkey_mask));
 
                 if (tp_features.hotkey_mask) {
-                        /* MHKA available in A31, R40, R40e, T4x, X31, and later */
                         if (!acpi_evalf(hkey_handle, &hotkey_all_mask,
-                                        "MHKA", "qd"))
+                                        "MHKA", "qd")) {
+                                printk(IBM_ERR
+                                       "missing MHKA handler, "
+                                       "please report this to %s\n",
+                                       IBM_MAIL);
                                 hotkey_all_mask = 0x080cU; /* FN+F12, FN+F4, FN+F3 */
+                        }
                 }
 
                 res = hotkey_get(&hotkey_orig_status, &hotkey_orig_mask);
@@ -1131,6 +1168,8 @@ static void tpacpi_input_send_key(unsigned int scancode,
                                   unsigned int keycode)
 {
         if (keycode != KEY_RESERVED) {
+                mutex_lock(&tpacpi_inputdev_send_mutex);
+
                 input_report_key(tpacpi_inputdev, keycode, 1);
                 if (keycode == KEY_UNKNOWN)
                         input_event(tpacpi_inputdev, EV_MSC, MSC_SCAN,
@@ -1142,6 +1181,8 @@ static void tpacpi_input_send_key(unsigned int scancode,
                         input_event(tpacpi_inputdev, EV_MSC, MSC_SCAN,
                                     scancode);
                 input_sync(tpacpi_inputdev);
+
+                mutex_unlock(&tpacpi_inputdev_send_mutex);
         }
 }
 
@@ -1149,18 +1190,47 @@ static void tpacpi_input_send_radiosw(void)
 {
         int wlsw;
 
-        if (tp_features.hotkey_wlsw && !hotkey_get_wlsw(&wlsw))
+        mutex_lock(&tpacpi_inputdev_send_mutex);
+
+        if (tp_features.hotkey_wlsw && !hotkey_get_wlsw(&wlsw)) {
                 input_report_switch(tpacpi_inputdev,
                                     SW_RADIO, !!wlsw);
+                input_sync(tpacpi_inputdev);
+        }
+
+        mutex_unlock(&tpacpi_inputdev_send_mutex);
 }
 
 static void hotkey_notify(struct ibm_struct *ibm, u32 event)
 {
         u32 hkey;
         unsigned int keycode, scancode;
-        int send_acpi_ev = 0;
+        int send_acpi_ev;
+        int ignore_acpi_ev;
+
+        if (event != 0x80) {
+                printk(IBM_ERR "unknown HKEY notification event %d\n", event);
+                /* forward it to userspace, maybe it knows how to handle it */
+                acpi_bus_generate_netlink_event(ibm->acpi->device->pnp.device_class,
+                                                ibm->acpi->device->dev.bus_id,
+                                                event, 0);
+                return;
+        }
+
+        while (1) {
+                if (!acpi_evalf(hkey_handle, &hkey, "MHKP", "d")) {
+                        printk(IBM_ERR "failed to retrieve HKEY event\n");
+                        return;
+                }
+
+                if (hkey == 0) {
+                        /* queue empty */
+                        return;
+                }
+
+                send_acpi_ev = 0;
+                ignore_acpi_ev = 0;
 
-        if (event == 0x80 && acpi_evalf(hkey_handle, &hkey, "MHKP", "d")) {
                 switch (hkey >> 12) {
                 case 1:
                         /* 0x1000-0x1FFF: key presses */
@@ -1182,9 +1252,11 @@ static void hotkey_notify(struct ibm_struct *ibm, u32 event)
                          * eat up known LID events */
                         if (hkey != 0x5001 && hkey != 0x5002) {
                                 printk(IBM_ERR
-                                        "unknown LID-related hotkey event: 0x%04x\n",
-                                        hkey);
+                                       "unknown LID-related HKEY event: 0x%04x\n",
+                                       hkey);
                                 send_acpi_ev = 1;
+                        } else {
+                                ignore_acpi_ev = 1;
                         }
                         break;
                 case 7:
@@ -1202,21 +1274,18 @@ static void hotkey_notify(struct ibm_struct *ibm, u32 event)
                         printk(IBM_NOTICE "unhandled HKEY event 0x%04x\n", hkey);
                         send_acpi_ev = 1;
                 }
-        } else {
-                printk(IBM_ERR "unknown hotkey notification event %d\n", event);
-                hkey = 0;
-                send_acpi_ev = 1;
-        }
 
-        /* Legacy events */
-        if (send_acpi_ev || hotkey_report_mode < 2)
-                acpi_bus_generate_proc_event(ibm->acpi->device, event, hkey);
+                /* Legacy events */
+                if (!ignore_acpi_ev && (send_acpi_ev || hotkey_report_mode < 2)) {
+                        acpi_bus_generate_proc_event(ibm->acpi->device, event, hkey);
+                }
 
-        /* netlink events */
-        if (send_acpi_ev) {
-                acpi_bus_generate_netlink_event(ibm->acpi->device->pnp.device_class,
-                                                ibm->acpi->device->dev.bus_id,
-                                                event, hkey);
+                /* netlink events */
+                if (!ignore_acpi_ev && send_acpi_ev) {
+                        acpi_bus_generate_netlink_event(ibm->acpi->device->pnp.device_class,
+                                                        ibm->acpi->device->dev.bus_id,
+                                                        event, hkey);
+                }
         }
 }
 
@@ -2812,7 +2881,7 @@ static int __init thermal_init(struct ibm_init_struct *iibm)
 
         switch(thermal_read_mode) {
         case TPACPI_THERMAL_TPEC_16:
-                res = sysfs_create_group(&tpacpi_pdev->dev.kobj,
+                res = sysfs_create_group(&tpacpi_sensors_pdev->dev.kobj,
                                 &thermal_temp_input16_group);
                 if (res)
                         return res;
@@ -2820,7 +2889,7 @@ static int __init thermal_init(struct ibm_init_struct *iibm)
         case TPACPI_THERMAL_TPEC_8:
         case TPACPI_THERMAL_ACPI_TMP07:
         case TPACPI_THERMAL_ACPI_UPDT:
-                res = sysfs_create_group(&tpacpi_pdev->dev.kobj,
+                res = sysfs_create_group(&tpacpi_sensors_pdev->dev.kobj,
                                 &thermal_temp_input8_group);
                 if (res)
                         return res;
@@ -2837,13 +2906,13 @@ static void thermal_exit(void)
 {
         switch(thermal_read_mode) {
         case TPACPI_THERMAL_TPEC_16:
-                sysfs_remove_group(&tpacpi_pdev->dev.kobj,
+                sysfs_remove_group(&tpacpi_sensors_pdev->dev.kobj,
                                    &thermal_temp_input16_group);
                 break;
         case TPACPI_THERMAL_TPEC_8:
         case TPACPI_THERMAL_ACPI_TMP07:
         case TPACPI_THERMAL_ACPI_UPDT:
-                sysfs_remove_group(&tpacpi_pdev->dev.kobj,
+                sysfs_remove_group(&tpacpi_sensors_pdev->dev.kobj,
                                    &thermal_temp_input16_group);
                 break;
         case TPACPI_THERMAL_NONE:
@@ -3626,7 +3695,7 @@ static struct device_attribute dev_attr_fan_fan1_input =
         __ATTR(fan1_input, S_IRUGO,
                 fan_fan1_input_show, NULL);
 
-/* sysfs fan fan_watchdog (driver) ------------------------------------- */
+/* sysfs fan fan_watchdog (hwmon driver) ------------------------------- */
 static ssize_t fan_fan_watchdog_show(struct device_driver *drv,
                                      char *buf)
 {
@@ -3768,10 +3837,10 @@ static int __init fan_init(struct ibm_init_struct *iibm)
 
         if (fan_status_access_mode != TPACPI_FAN_NONE ||
             fan_control_access_mode != TPACPI_FAN_WR_NONE) {
-                rc = sysfs_create_group(&tpacpi_pdev->dev.kobj,
+                rc = sysfs_create_group(&tpacpi_sensors_pdev->dev.kobj,
                                          &fan_attr_group);
                 if (!(rc < 0))
-                        rc = driver_create_file(&tpacpi_pdriver.driver,
+                        rc = driver_create_file(&tpacpi_hwmon_pdriver.driver,
                                         &driver_attr_fan_watchdog);
                 if (rc < 0)
                         return rc;
@@ -3854,8 +3923,8 @@ static void fan_exit(void)
         vdbg_printk(TPACPI_DBG_EXIT, "cancelling any pending fan watchdog tasks\n");
 
         /* FIXME: can we really do this unconditionally? */
-        sysfs_remove_group(&tpacpi_pdev->dev.kobj, &fan_attr_group);
-        driver_remove_file(&tpacpi_pdriver.driver, &driver_attr_fan_watchdog);
+        sysfs_remove_group(&tpacpi_sensors_pdev->dev.kobj, &fan_attr_group);
+        driver_remove_file(&tpacpi_hwmon_pdriver.driver, &driver_attr_fan_watchdog);
 
         cancel_delayed_work(&fan_watchdog_task);
         flush_scheduled_work();
@@ -3888,6 +3957,9 @@ static void fan_watchdog_fire(struct work_struct *ignored)
 {
         int rc;
 
+        if (tpacpi_lifecycle != TPACPI_LIFE_RUNNING)
+                return;
+
         printk(IBM_NOTICE "fan watchdog: enabling fan\n");
         rc = fan_set_enable();
         if (rc < 0) {
@@ -3908,7 +3980,8 @@ static void fan_watchdog_reset(void)
         if (fan_watchdog_active)
                 cancel_delayed_work(&fan_watchdog_task);
 
-        if (fan_watchdog_maxinterval > 0) {
+        if (fan_watchdog_maxinterval > 0 &&
+            tpacpi_lifecycle != TPACPI_LIFE_EXITING) {
                 fan_watchdog_active = 1;
                 if (!schedule_delayed_work(&fan_watchdog_task,
                                 msecs_to_jiffies(fan_watchdog_maxinterval
@@ -4302,6 +4375,19 @@ static struct ibm_struct fan_driver_data = {
  ****************************************************************************
  ****************************************************************************/
 
+/* sysfs name ---------------------------------------------------------- */
+static ssize_t thinkpad_acpi_pdev_name_show(struct device *dev,
+                           struct device_attribute *attr,
+                           char *buf)
+{
+        return snprintf(buf, PAGE_SIZE, "%s\n", IBM_NAME);
+}
+
+static struct device_attribute dev_attr_thinkpad_acpi_pdev_name =
+        __ATTR(name, S_IRUGO, thinkpad_acpi_pdev_name_show, NULL);
+
+/* --------------------------------------------------------------------- */
+
 /* /proc support */
 static struct proc_dir_entry *proc_dir;
 
@@ -4674,6 +4760,8 @@ static int __init thinkpad_acpi_module_init(void)
 {
         int ret, i;
 
+        tpacpi_lifecycle = TPACPI_LIFE_INIT;
+
         /* Parameter checking */
         if (hotkey_report_mode > 2)
                 return -EINVAL;
@@ -4702,19 +4790,31 @@ static int __init thinkpad_acpi_module_init(void)
 
         ret = platform_driver_register(&tpacpi_pdriver);
         if (ret) {
-                printk(IBM_ERR "unable to register platform driver\n");
+                printk(IBM_ERR "unable to register main platform driver\n");
                 thinkpad_acpi_module_exit();
                 return ret;
         }
         tp_features.platform_drv_registered = 1;
 
+        ret = platform_driver_register(&tpacpi_hwmon_pdriver);
+        if (ret) {
+                printk(IBM_ERR "unable to register hwmon platform driver\n");
+                thinkpad_acpi_module_exit();
+                return ret;
+        }
+        tp_features.sensors_pdrv_registered = 1;
+
         ret = tpacpi_create_driver_attributes(&tpacpi_pdriver.driver);
+        if (!ret) {
+                tp_features.platform_drv_attrs_registered = 1;
+                ret = tpacpi_create_driver_attributes(&tpacpi_hwmon_pdriver.driver);
+        }
         if (ret) {
                 printk(IBM_ERR "unable to create sysfs driver attributes\n");
                 thinkpad_acpi_module_exit();
                 return ret;
         }
-        tp_features.platform_drv_attrs_registered = 1;
+        tp_features.sensors_pdrv_attrs_registered = 1;
 
 
         /* Device initialization */
@@ -4727,7 +4827,26 @@ static int __init thinkpad_acpi_module_init(void)
                 thinkpad_acpi_module_exit();
                 return ret;
         }
-        tpacpi_hwmon = hwmon_device_register(&tpacpi_pdev->dev);
+        tpacpi_sensors_pdev = platform_device_register_simple(
+                                                        IBM_HWMON_DRVR_NAME,
+                                                        -1, NULL, 0);
+        if (IS_ERR(tpacpi_sensors_pdev)) {
+                ret = PTR_ERR(tpacpi_sensors_pdev);
+                tpacpi_sensors_pdev = NULL;
+                printk(IBM_ERR "unable to register hwmon platform device\n");
+                thinkpad_acpi_module_exit();
+                return ret;
+        }
+        ret = device_create_file(&tpacpi_sensors_pdev->dev,
+                                 &dev_attr_thinkpad_acpi_pdev_name);
+        if (ret) {
+                printk(IBM_ERR
+                        "unable to create sysfs hwmon device attributes\n");
+                thinkpad_acpi_module_exit();
+                return ret;
+        }
+        tp_features.sensors_pdev_attrs_registered = 1;
+        tpacpi_hwmon = hwmon_device_register(&tpacpi_sensors_pdev->dev);
         if (IS_ERR(tpacpi_hwmon)) {
                 ret = PTR_ERR(tpacpi_hwmon);
                 tpacpi_hwmon = NULL;
@@ -4735,6 +4854,7 @@ static int __init thinkpad_acpi_module_init(void)
                 thinkpad_acpi_module_exit();
                 return ret;
         }
+        mutex_init(&tpacpi_inputdev_send_mutex);
         tpacpi_inputdev = input_allocate_device();
         if (!tpacpi_inputdev) {
                 printk(IBM_ERR "unable to allocate input device\n");
@@ -4769,6 +4889,7 @@ static int __init thinkpad_acpi_module_init(void)
                 tp_features.input_device_registered = 1;
         }
 
+        tpacpi_lifecycle = TPACPI_LIFE_RUNNING;
         return 0;
 }
 
@@ -4776,6 +4897,8 @@ static void thinkpad_acpi_module_exit(void)
 {
         struct ibm_struct *ibm, *itmp;
 
+        tpacpi_lifecycle = TPACPI_LIFE_EXITING;
+
         list_for_each_entry_safe_reverse(ibm, itmp,
                                          &tpacpi_all_drivers,
                                          all_drivers) {
@@ -4794,12 +4917,22 @@ static void thinkpad_acpi_module_exit(void)
         if (tpacpi_hwmon)
                 hwmon_device_unregister(tpacpi_hwmon);
 
+        if (tp_features.sensors_pdev_attrs_registered)
+                device_remove_file(&tpacpi_sensors_pdev->dev,
+                                   &dev_attr_thinkpad_acpi_pdev_name);
+        if (tpacpi_sensors_pdev)
+                platform_device_unregister(tpacpi_sensors_pdev);
         if (tpacpi_pdev)
                 platform_device_unregister(tpacpi_pdev);
 
+        if (tp_features.sensors_pdrv_attrs_registered)
+                tpacpi_remove_driver_attributes(&tpacpi_hwmon_pdriver.driver);
         if (tp_features.platform_drv_attrs_registered)
                 tpacpi_remove_driver_attributes(&tpacpi_pdriver.driver);
 
+        if (tp_features.sensors_pdrv_registered)
+                platform_driver_unregister(&tpacpi_hwmon_pdriver);
+
         if (tp_features.platform_drv_registered)
                 platform_driver_unregister(&tpacpi_pdriver);
 
diff --git a/drivers/misc/thinkpad_acpi.h b/drivers/misc/thinkpad_acpi.h
index acd5835ec889..3abcc8120634 100644
--- a/drivers/misc/thinkpad_acpi.h
+++ b/drivers/misc/thinkpad_acpi.h
@@ -58,13 +58,14 @@
 
 #define IBM_NAME "thinkpad"
 #define IBM_DESC "ThinkPad ACPI Extras"
-#define IBM_FILE "thinkpad_acpi"
+#define IBM_FILE IBM_NAME "_acpi"
 #define IBM_URL "http://ibm-acpi.sf.net/"
 #define IBM_MAIL "ibm-acpi-devel@lists.sourceforge.net"
 
 #define IBM_PROC_DIR "ibm"
 #define IBM_ACPI_EVENT_PREFIX "ibm"
 #define IBM_DRVR_NAME IBM_FILE
+#define IBM_HWMON_DRVR_NAME IBM_NAME "_hwmon"
 
 #define IBM_LOG IBM_FILE ": "
 #define IBM_ERR    KERN_ERR    IBM_LOG
@@ -171,6 +172,7 @@ static int parse_strtoul(const char *buf, unsigned long max,
 
 /* Device model */
 static struct platform_device *tpacpi_pdev;
+static struct platform_device *tpacpi_sensors_pdev;
 static struct device *tpacpi_hwmon;
 static struct platform_driver tpacpi_pdriver;
 static struct input_dev *tpacpi_inputdev;
@@ -233,22 +235,25 @@ struct ibm_init_struct {
 
 static struct {
 #ifdef CONFIG_THINKPAD_ACPI_BAY
-        u16 bay_status:1;
-        u16 bay_eject:1;
-        u16 bay_status2:1;
-        u16 bay_eject2:1;
+        u32 bay_status:1;
+        u32 bay_eject:1;
+        u32 bay_status2:1;
+        u32 bay_eject2:1;
 #endif
-        u16 bluetooth:1;
-        u16 hotkey:1;
-        u16 hotkey_mask:1;
-        u16 hotkey_wlsw:1;
-        u16 light:1;
-        u16 light_status:1;
-        u16 wan:1;
-        u16 fan_ctrl_status_undef:1;
-        u16 input_device_registered:1;
-        u16 platform_drv_registered:1;
-        u16 platform_drv_attrs_registered:1;
+        u32 bluetooth:1;
+        u32 hotkey:1;
+        u32 hotkey_mask:1;
+        u32 hotkey_wlsw:1;
+        u32 light:1;
+        u32 light_status:1;
+        u32 wan:1;
+        u32 fan_ctrl_status_undef:1;
+        u32 input_device_registered:1;
+        u32 platform_drv_registered:1;
+        u32 platform_drv_attrs_registered:1;
+        u32 sensors_pdrv_registered:1;
+        u32 sensors_pdrv_attrs_registered:1;
+        u32 sensors_pdev_attrs_registered:1;
 } tp_features;
 
 struct thinkpad_id_data {
diff --git a/drivers/mtd/ubi/wl.c b/drivers/mtd/ubi/wl.c
index a4f1bf33164a..6330c8cc72b5 100644
--- a/drivers/mtd/ubi/wl.c
+++ b/drivers/mtd/ubi/wl.c
@@ -1309,7 +1309,7 @@ static int ubi_thread(void *u)
         struct ubi_device *ubi = u;
 
         ubi_msg("background thread \"%s\" started, PID %d",
-                ubi->bgt_name, current->pid);
+                ubi->bgt_name, task_pid_nr(current));
 
         set_freezable();
         for (;;) {
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index 96cee4badd28..da767d3d5af5 100644
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -26,7 +26,7 @@
 #include <linux/etherdevice.h>
 #include <linux/skbuff.h>
 #include <linux/dma-mapping.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <linux/delay.h>
diff --git a/drivers/net/bonding/bond_3ad.c b/drivers/net/bonding/bond_3ad.c
index 7a045a37056e..084f0292ea6e 100644
--- a/drivers/net/bonding/bond_3ad.c
+++ b/drivers/net/bonding/bond_3ad.c
@@ -126,7 +126,7 @@ static struct aggregator *__get_active_agg(struct aggregator *aggregator);
 
 // ================= main 802.3ad protocol functions ==================
 static int ad_lacpdu_send(struct port *port);
-static int ad_marker_send(struct port *port, struct marker *marker);
+static int ad_marker_send(struct port *port, struct bond_marker *marker);
 static void ad_mux_machine(struct port *port);
 static void ad_rx_machine(struct lacpdu *lacpdu, struct port *port);
 static void ad_tx_machine(struct port *port);
@@ -139,8 +139,8 @@ static void ad_initialize_port(struct port *port, int lacp_fast);
 static void ad_initialize_lacpdu(struct lacpdu *Lacpdu);
 static void ad_enable_collecting_distributing(struct port *port);
 static void ad_disable_collecting_distributing(struct port *port);
-static void ad_marker_info_received(struct marker *marker_info, struct port *port);
-static void ad_marker_response_received(struct marker *marker, struct port *port);
+static void ad_marker_info_received(struct bond_marker *marker_info, struct port *port);
+static void ad_marker_response_received(struct bond_marker *marker, struct port *port);
 
 
 /////////////////////////////////////////////////////////////////////////////////
@@ -889,12 +889,12 @@ static int ad_lacpdu_send(struct port *port)
  * Returns:   0 on success
  *          < 0 on error
  */
-static int ad_marker_send(struct port *port, struct marker *marker)
+static int ad_marker_send(struct port *port, struct bond_marker *marker)
 {
         struct slave *slave = port->slave;
         struct sk_buff *skb;
-        struct marker_header *marker_header;
-        int length = sizeof(struct marker_header);
+        struct bond_marker_header *marker_header;
+        int length = sizeof(struct bond_marker_header);
         struct mac_addr lacpdu_multicast_address = AD_MULTICAST_LACPDU_ADDR;
 
         skb = dev_alloc_skb(length + 16);
@@ -909,7 +909,7 @@ static int ad_marker_send(struct port *port, struct marker *marker)
         skb->network_header = skb->mac_header + ETH_HLEN;
         skb->protocol = PKT_TYPE_LACPDU;
 
-        marker_header = (struct marker_header *)skb_put(skb, length);
+        marker_header = (struct bond_marker_header *)skb_put(skb, length);
 
         marker_header->ad_header.destination_address = lacpdu_multicast_address;
         /* Note: source addres is set to be the member's PERMANENT address, because we use it
@@ -1709,7 +1709,7 @@ static void ad_disable_collecting_distributing(struct port *port)
  */
 static void ad_marker_info_send(struct port *port)
 {
-        struct marker marker;
+        struct bond_marker marker;
         u16 index;
 
         // fill the marker PDU with the appropriate values
@@ -1742,13 +1742,14 @@ static void ad_marker_info_send(struct port *port)
  * @port: the port we're looking at
  *
  */
-static void ad_marker_info_received(struct marker *marker_info,struct port *port)
+static void ad_marker_info_received(struct bond_marker *marker_info,
+        struct port *port)
 {
-        struct marker marker;
+        struct bond_marker marker;
 
         // copy the received marker data to the response marker
         //marker = *marker_info;
-        memcpy(&marker, marker_info, sizeof(struct marker));
+        memcpy(&marker, marker_info, sizeof(struct bond_marker));
         // change the marker subtype to marker response
         marker.tlv_type=AD_MARKER_RESPONSE_SUBTYPE;
         // send the marker response
@@ -1767,7 +1768,8 @@ static void ad_marker_info_received(struct marker *marker_info,struct port *port
  * response for marker PDU's, in this stage, but only to respond to marker
  * information.
  */
-static void ad_marker_response_received(struct marker *marker, struct port *port)
+static void ad_marker_response_received(struct bond_marker *marker,
+        struct port *port)
 {
         marker=NULL; // just to satisfy the compiler
         port=NULL;  // just to satisfy the compiler
@@ -2164,15 +2166,15 @@ static void bond_3ad_rx_indication(struct lacpdu *lacpdu, struct slave *slave, u
                 case AD_TYPE_MARKER:
                         // No need to convert fields to Little Endian since we don't use the marker's fields.
 
-                        switch (((struct marker *)lacpdu)->tlv_type) {
+                        switch (((struct bond_marker *)lacpdu)->tlv_type) {
                         case AD_MARKER_INFORMATION_SUBTYPE:
                                 dprintk("Received Marker Information on port %d\n", port->actor_port_number);
-                                ad_marker_info_received((struct marker *)lacpdu, port);
+                                ad_marker_info_received((struct bond_marker *)lacpdu, port);
                                 break;
 
                         case AD_MARKER_RESPONSE_SUBTYPE:
                                 dprintk("Received Marker Response on port %d\n", port->actor_port_number);
-                                ad_marker_response_received((struct marker *)lacpdu, port);
+                                ad_marker_response_received((struct bond_marker *)lacpdu, port);
                                 break;
 
                         default:
diff --git a/drivers/net/bonding/bond_3ad.h b/drivers/net/bonding/bond_3ad.h
index 862952fa6fd9..f16557264944 100644
--- a/drivers/net/bonding/bond_3ad.h
+++ b/drivers/net/bonding/bond_3ad.h
@@ -92,7 +92,7 @@ typedef enum {
 typedef enum {
         AD_MARKER_INFORMATION_SUBTYPE = 1, // marker imformation subtype
         AD_MARKER_RESPONSE_SUBTYPE     // marker response subtype
-} marker_subtype_t;
+} bond_marker_subtype_t;
 
 // timers types(43.4.9 in the 802.3ad standard)
 typedef enum {
@@ -148,7 +148,7 @@ typedef struct lacpdu_header {
 } lacpdu_header_t;
 
 // Marker Protocol Data Unit(PDU) structure(43.5.3.2 in the 802.3ad standard)
-typedef struct marker {
+typedef struct bond_marker {
         u8 subtype;              //  = 0x02  (marker PDU)
         u8 version_number;       //  = 0x01
         u8 tlv_type;             //  = 0x01  (marker information)
@@ -161,12 +161,12 @@ typedef struct marker {
         u8 tlv_type_terminator;      //  = 0x00
         u8 terminator_length;        //  = 0x00
         u8 reserved_90[90];          //  = 0
-} marker_t;
+} bond_marker_t;
 
-typedef struct marker_header {
+typedef struct bond_marker_header {
         struct ad_header ad_header;
-        struct marker marker;
-} marker_header_t;
+        struct bond_marker marker;
+} bond_marker_header_t;
 
 #pragma pack()
 
diff --git a/drivers/net/cris/eth_v10.c b/drivers/net/cris/eth_v10.c
index 314b2f68f78f..edd6828f0a78 100644
--- a/drivers/net/cris/eth_v10.c
+++ b/drivers/net/cris/eth_v10.c
@@ -234,6 +234,7 @@
 #include <linux/spinlock.h>
 #include <linux/errno.h>
 #include <linux/init.h>
+#include <linux/bitops.h>
 
 #include <linux/if.h>
 #include <linux/mii.h>
@@ -247,7 +248,6 @@
 #include <asm/irq.h>
 #include <asm/dma.h>
 #include <asm/system.h>
-#include <asm/bitops.h>
 #include <asm/ethernet.h>
 #include <asm/cache.h>
 
diff --git a/drivers/net/cxgb3/adapter.h b/drivers/net/cxgb3/adapter.h
index 044261703381..2a3df145850d 100644
--- a/drivers/net/cxgb3/adapter.h
+++ b/drivers/net/cxgb3/adapter.h
@@ -41,9 +41,9 @@
 #include <linux/timer.h>
 #include <linux/cache.h>
 #include <linux/mutex.h>
+#include <linux/bitops.h>
 #include "t3cdev.h"
 #include <asm/semaphore.h>
-#include <asm/bitops.h>
 #include <asm/io.h>
 
 typedef irqreturn_t(*intr_handler_t) (int, void *);
diff --git a/drivers/net/eth16i.c b/drivers/net/eth16i.c
index 243fc6b354b5..e3dd8b136908 100644
--- a/drivers/net/eth16i.c
+++ b/drivers/net/eth16i.c
@@ -170,7 +170,6 @@ static char *version =
 
 
 /* Few macros */
-#define BIT(a)                 ( (1 << (a)) )
 #define BITSET(ioaddr, bnum)   ((outb(((inb(ioaddr)) | (bnum)), ioaddr)))
 #define BITCLR(ioaddr, bnum)   ((outb(((inb(ioaddr)) & (~(bnum))), ioaddr)))
 
diff --git a/drivers/net/hamradio/dmascc.c b/drivers/net/hamradio/dmascc.c
index bc02e4694804..11b83dae00ac 100644
--- a/drivers/net/hamradio/dmascc.c
+++ b/drivers/net/hamradio/dmascc.c
@@ -21,6 +21,7 @@
 
 
 #include <linux/module.h>
+#include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/if_arp.h>
@@ -35,7 +36,6 @@
 #include <linux/sockios.h>
 #include <linux/workqueue.h>
 #include <asm/atomic.h>
-#include <asm/bitops.h>
 #include <asm/dma.h>
 #include <asm/io.h>
 #include <asm/irq.h>
diff --git a/drivers/net/mac89x0.c b/drivers/net/mac89x0.c
index 30854f094965..a19b5958cee9 100644
--- a/drivers/net/mac89x0.c
+++ b/drivers/net/mac89x0.c
@@ -99,9 +99,9 @@ static char *version =
 #include <linux/etherdevice.h>
 #include <linux/skbuff.h>
 #include <linux/delay.h>
+#include <linux/bitops.h>
 
 #include <asm/system.h>
-#include <asm/bitops.h>
 #include <asm/io.h>
 #include <asm/hwtest.h>
 #include <asm/macints.h>
diff --git a/drivers/net/meth.h b/drivers/net/meth.h
index ea3b8fc86d1e..a78dc1ca8c29 100644
--- a/drivers/net/meth.h
+++ b/drivers/net/meth.h
@@ -28,9 +28,6 @@
 #define RX_BUFFER_OFFSET (sizeof(rx_status_vector)+2) /* staus vector + 2 bytes of padding */
 #define RX_BUCKET_SIZE 256
 
-#undef BIT
-#define BIT(x)  (1UL << (x))
-
 /* For more detailed explanations of what each field menas,
    see Nick's great comments to #defines below (or docs, if
    you are lucky enough toget hold of them :)*/
diff --git a/drivers/net/s2io-regs.h b/drivers/net/s2io-regs.h
index aef66e2d98d2..01f08d726ace 100644
--- a/drivers/net/s2io-regs.h
+++ b/drivers/net/s2io-regs.h
@@ -20,17 +20,17 @@ struct XENA_dev_config {
 
 /* General Control-Status Registers */
         u64 general_int_status;
-#define GEN_INTR_TXPIC             BIT(0)
-#define GEN_INTR_TXDMA             BIT(1)
-#define GEN_INTR_TXMAC             BIT(2)
-#define GEN_INTR_TXXGXS            BIT(3)
-#define GEN_INTR_TXTRAFFIC         BIT(8)
-#define GEN_INTR_RXPIC             BIT(32)
-#define GEN_INTR_RXDMA             BIT(33)
-#define GEN_INTR_RXMAC             BIT(34)
-#define GEN_INTR_MC                BIT(35)
-#define GEN_INTR_RXXGXS            BIT(36)
-#define GEN_INTR_RXTRAFFIC         BIT(40)
+#define GEN_INTR_TXPIC             s2BIT(0)
+#define GEN_INTR_TXDMA             s2BIT(1)
+#define GEN_INTR_TXMAC             s2BIT(2)
+#define GEN_INTR_TXXGXS            s2BIT(3)
+#define GEN_INTR_TXTRAFFIC         s2BIT(8)
+#define GEN_INTR_RXPIC             s2BIT(32)
+#define GEN_INTR_RXDMA             s2BIT(33)
+#define GEN_INTR_RXMAC             s2BIT(34)
+#define GEN_INTR_MC                s2BIT(35)
+#define GEN_INTR_RXXGXS            s2BIT(36)
+#define GEN_INTR_RXTRAFFIC         s2BIT(40)
 #define GEN_ERROR_INTR             GEN_INTR_TXPIC | GEN_INTR_RXPIC | \
                                    GEN_INTR_TXDMA | GEN_INTR_RXDMA | \
                                    GEN_INTR_TXMAC | GEN_INTR_RXMAC | \
@@ -54,36 +54,36 @@ struct XENA_dev_config {
 
 
         u64 adapter_status;
-#define ADAPTER_STATUS_TDMA_READY          BIT(0)
-#define ADAPTER_STATUS_RDMA_READY          BIT(1)
-#define ADAPTER_STATUS_PFC_READY           BIT(2)
-#define ADAPTER_STATUS_TMAC_BUF_EMPTY      BIT(3)
-#define ADAPTER_STATUS_PIC_QUIESCENT       BIT(5)
-#define ADAPTER_STATUS_RMAC_REMOTE_FAULT   BIT(6)
-#define ADAPTER_STATUS_RMAC_LOCAL_FAULT    BIT(7)
+#define ADAPTER_STATUS_TDMA_READY          s2BIT(0)
+#define ADAPTER_STATUS_RDMA_READY          s2BIT(1)
+#define ADAPTER_STATUS_PFC_READY           s2BIT(2)
+#define ADAPTER_STATUS_TMAC_BUF_EMPTY      s2BIT(3)
+#define ADAPTER_STATUS_PIC_QUIESCENT       s2BIT(5)
+#define ADAPTER_STATUS_RMAC_REMOTE_FAULT   s2BIT(6)
+#define ADAPTER_STATUS_RMAC_LOCAL_FAULT    s2BIT(7)
 #define ADAPTER_STATUS_RMAC_PCC_IDLE       vBIT(0xFF,8,8)
 #define ADAPTER_STATUS_RMAC_PCC_FOUR_IDLE  vBIT(0x0F,8,8)
 #define ADAPTER_STATUS_RC_PRC_QUIESCENT    vBIT(0xFF,16,8)
-#define ADAPTER_STATUS_MC_DRAM_READY       BIT(24)
-#define ADAPTER_STATUS_MC_QUEUES_READY     BIT(25)
-#define ADAPTER_STATUS_M_PLL_LOCK          BIT(30)
-#define ADAPTER_STATUS_P_PLL_LOCK          BIT(31)
+#define ADAPTER_STATUS_MC_DRAM_READY       s2BIT(24)
+#define ADAPTER_STATUS_MC_QUEUES_READY     s2BIT(25)
+#define ADAPTER_STATUS_M_PLL_LOCK          s2BIT(30)
+#define ADAPTER_STATUS_P_PLL_LOCK          s2BIT(31)
 
         u64 adapter_control;
-#define ADAPTER_CNTL_EN                    BIT(7)
-#define ADAPTER_EOI_TX_ON                  BIT(15)
-#define ADAPTER_LED_ON                     BIT(23)
+#define ADAPTER_CNTL_EN                    s2BIT(7)
+#define ADAPTER_EOI_TX_ON                  s2BIT(15)
+#define ADAPTER_LED_ON                     s2BIT(23)
 #define ADAPTER_UDPI(val)                  vBIT(val,36,4)
-#define ADAPTER_WAIT_INT                   BIT(48)
-#define ADAPTER_ECC_EN                     BIT(55)
+#define ADAPTER_WAIT_INT                   s2BIT(48)
+#define ADAPTER_ECC_EN                     s2BIT(55)
 
         u64 serr_source;
-#define SERR_SOURCE_PIC                 BIT(0)
-#define SERR_SOURCE_TXDMA               BIT(1)
-#define SERR_SOURCE_RXDMA               BIT(2)
-#define SERR_SOURCE_MAC                 BIT(3)
-#define SERR_SOURCE_MC                  BIT(4)
-#define SERR_SOURCE_XGXS                BIT(5)
+#define SERR_SOURCE_PIC                 s2BIT(0)
+#define SERR_SOURCE_TXDMA               s2BIT(1)
+#define SERR_SOURCE_RXDMA               s2BIT(2)
+#define SERR_SOURCE_MAC                 s2BIT(3)
+#define SERR_SOURCE_MC                  s2BIT(4)
+#define SERR_SOURCE_XGXS                s2BIT(5)
 #define SERR_SOURCE_ANY                 (SERR_SOURCE_PIC        | \
                                         SERR_SOURCE_TXDMA       | \
                                         SERR_SOURCE_RXDMA       | \
@@ -101,41 +101,41 @@ struct XENA_dev_config {
 #define PCI_MODE_PCIX_M2_66             0x5
 #define PCI_MODE_PCIX_M2_100            0x6
 #define PCI_MODE_PCIX_M2_133            0x7
-#define PCI_MODE_UNSUPPORTED            BIT(0)
-#define PCI_MODE_32_BITS                BIT(8)
-#define PCI_MODE_UNKNOWN_MODE           BIT(9)
+#define PCI_MODE_UNSUPPORTED            s2BIT(0)
+#define PCI_MODE_32_BITS                s2BIT(8)
+#define PCI_MODE_UNKNOWN_MODE           s2BIT(9)
 
         u8 unused_0[0x800 - 0x128];
 
 /* PCI-X Controller registers */
         u64 pic_int_status;
         u64 pic_int_mask;
-#define PIC_INT_TX                     BIT(0)
-#define PIC_INT_FLSH                   BIT(1)
-#define PIC_INT_MDIO                   BIT(2)
-#define PIC_INT_IIC                    BIT(3)
-#define PIC_INT_GPIO                   BIT(4)
-#define PIC_INT_RX                     BIT(32)
+#define PIC_INT_TX                     s2BIT(0)
+#define PIC_INT_FLSH                   s2BIT(1)
+#define PIC_INT_MDIO                   s2BIT(2)
+#define PIC_INT_IIC                    s2BIT(3)
+#define PIC_INT_GPIO                   s2BIT(4)
+#define PIC_INT_RX                     s2BIT(32)
 
         u64 txpic_int_reg;
         u64 txpic_int_mask;
-#define PCIX_INT_REG_ECC_SG_ERR                BIT(0)
-#define PCIX_INT_REG_ECC_DB_ERR                BIT(1)
-#define PCIX_INT_REG_FLASHR_R_FSM_ERR          BIT(8)
-#define PCIX_INT_REG_FLASHR_W_FSM_ERR          BIT(9)
-#define PCIX_INT_REG_INI_TX_FSM_SERR           BIT(10)
-#define PCIX_INT_REG_INI_TXO_FSM_ERR           BIT(11)
-#define PCIX_INT_REG_TRT_FSM_SERR              BIT(13)
-#define PCIX_INT_REG_SRT_FSM_SERR              BIT(14)
-#define PCIX_INT_REG_PIFR_FSM_SERR             BIT(15)
-#define PCIX_INT_REG_WRC_TX_SEND_FSM_SERR      BIT(21)
-#define PCIX_INT_REG_RRC_TX_REQ_FSM_SERR       BIT(23)
-#define PCIX_INT_REG_INI_RX_FSM_SERR           BIT(48)
-#define PCIX_INT_REG_RA_RX_FSM_SERR            BIT(50)
+#define PCIX_INT_REG_ECC_SG_ERR                s2BIT(0)
+#define PCIX_INT_REG_ECC_DB_ERR                s2BIT(1)
+#define PCIX_INT_REG_FLASHR_R_FSM_ERR          s2BIT(8)
+#define PCIX_INT_REG_FLASHR_W_FSM_ERR          s2BIT(9)
+#define PCIX_INT_REG_INI_TX_FSM_SERR           s2BIT(10)
+#define PCIX_INT_REG_INI_TXO_FSM_ERR           s2BIT(11)
+#define PCIX_INT_REG_TRT_FSM_SERR              s2BIT(13)
+#define PCIX_INT_REG_SRT_FSM_SERR              s2BIT(14)
+#define PCIX_INT_REG_PIFR_FSM_SERR             s2BIT(15)
+#define PCIX_INT_REG_WRC_TX_SEND_FSM_SERR      s2BIT(21)
+#define PCIX_INT_REG_RRC_TX_REQ_FSM_SERR       s2BIT(23)
+#define PCIX_INT_REG_INI_RX_FSM_SERR           s2BIT(48)
+#define PCIX_INT_REG_RA_RX_FSM_SERR            s2BIT(50)
 /*
-#define PCIX_INT_REG_WRC_RX_SEND_FSM_SERR      BIT(52)
-#define PCIX_INT_REG_RRC_RX_REQ_FSM_SERR       BIT(54)
-#define PCIX_INT_REG_RRC_RX_SPLIT_FSM_SERR     BIT(58)
+#define PCIX_INT_REG_WRC_RX_SEND_FSM_SERR      s2BIT(52)
+#define PCIX_INT_REG_RRC_RX_REQ_FSM_SERR       s2BIT(54)
+#define PCIX_INT_REG_RRC_RX_SPLIT_FSM_SERR     s2BIT(58)
 */
         u64 txpic_alarms;
         u64 rxpic_int_reg;
@@ -144,92 +144,92 @@ struct XENA_dev_config {
 
         u64 flsh_int_reg;
         u64 flsh_int_mask;
-#define PIC_FLSH_INT_REG_CYCLE_FSM_ERR         BIT(63)
-#define PIC_FLSH_INT_REG_ERR                   BIT(62)
+#define PIC_FLSH_INT_REG_CYCLE_FSM_ERR         s2BIT(63)
+#define PIC_FLSH_INT_REG_ERR                   s2BIT(62)
         u64 flash_alarms;
 
         u64 mdio_int_reg;
         u64 mdio_int_mask;
-#define MDIO_INT_REG_MDIO_BUS_ERR              BIT(0)
-#define MDIO_INT_REG_DTX_BUS_ERR               BIT(8)
-#define MDIO_INT_REG_LASI                      BIT(39)
+#define MDIO_INT_REG_MDIO_BUS_ERR              s2BIT(0)
+#define MDIO_INT_REG_DTX_BUS_ERR               s2BIT(8)
+#define MDIO_INT_REG_LASI                      s2BIT(39)
         u64 mdio_alarms;
 
         u64 iic_int_reg;
         u64 iic_int_mask;
-#define IIC_INT_REG_BUS_FSM_ERR                BIT(4)
-#define IIC_INT_REG_BIT_FSM_ERR                BIT(5)
-#define IIC_INT_REG_CYCLE_FSM_ERR              BIT(6)
-#define IIC_INT_REG_REQ_FSM_ERR                BIT(7)
-#define IIC_INT_REG_ACK_ERR                    BIT(8)
+#define IIC_INT_REG_BUS_FSM_ERR                s2BIT(4)
+#define IIC_INT_REG_BIT_FSM_ERR                s2BIT(5)
+#define IIC_INT_REG_CYCLE_FSM_ERR              s2BIT(6)
+#define IIC_INT_REG_REQ_FSM_ERR                s2BIT(7)
+#define IIC_INT_REG_ACK_ERR                    s2BIT(8)
         u64 iic_alarms;
 
         u8 unused4[0x08];
 
         u64 gpio_int_reg;
-#define GPIO_INT_REG_DP_ERR_INT                BIT(0)
-#define GPIO_INT_REG_LINK_DOWN                 BIT(1)
-#define GPIO_INT_REG_LINK_UP                   BIT(2)
+#define GPIO_INT_REG_DP_ERR_INT                s2BIT(0)
+#define GPIO_INT_REG_LINK_DOWN                 s2BIT(1)
+#define GPIO_INT_REG_LINK_UP                   s2BIT(2)
         u64 gpio_int_mask;
-#define GPIO_INT_MASK_LINK_DOWN                BIT(1)
-#define GPIO_INT_MASK_LINK_UP                  BIT(2)
+#define GPIO_INT_MASK_LINK_DOWN                s2BIT(1)
+#define GPIO_INT_MASK_LINK_UP                  s2BIT(2)
         u64 gpio_alarms;
 
         u8 unused5[0x38];
 
         u64 tx_traffic_int;
-#define TX_TRAFFIC_INT_n(n)                    BIT(n)
+#define TX_TRAFFIC_INT_n(n)                    s2BIT(n)
         u64 tx_traffic_mask;
 
         u64 rx_traffic_int;
-#define RX_TRAFFIC_INT_n(n)                    BIT(n)
+#define RX_TRAFFIC_INT_n(n)                    s2BIT(n)
         u64 rx_traffic_mask;
 
 /* PIC Control registers */
         u64 pic_control;
-#define PIC_CNTL_RX_ALARM_MAP_1                BIT(0)
+#define PIC_CNTL_RX_ALARM_MAP_1                s2BIT(0)
 #define PIC_CNTL_SHARED_SPLITS(n)              vBIT(n,11,5)
 
         u64 swapper_ctrl;
-#define SWAPPER_CTRL_PIF_R_FE                  BIT(0)
-#define SWAPPER_CTRL_PIF_R_SE                  BIT(1)
-#define SWAPPER_CTRL_PIF_W_FE                  BIT(8)
-#define SWAPPER_CTRL_PIF_W_SE                  BIT(9)
-#define SWAPPER_CTRL_TXP_FE                    BIT(16)
-#define SWAPPER_CTRL_TXP_SE                    BIT(17)
-#define SWAPPER_CTRL_TXD_R_FE                  BIT(18)
-#define SWAPPER_CTRL_TXD_R_SE                  BIT(19)
-#define SWAPPER_CTRL_TXD_W_FE                  BIT(20)
-#define SWAPPER_CTRL_TXD_W_SE                  BIT(21)
-#define SWAPPER_CTRL_TXF_R_FE                  BIT(22)
-#define SWAPPER_CTRL_TXF_R_SE                  BIT(23)
-#define SWAPPER_CTRL_RXD_R_FE                  BIT(32)
-#define SWAPPER_CTRL_RXD_R_SE                  BIT(33)
-#define SWAPPER_CTRL_RXD_W_FE                  BIT(34)
-#define SWAPPER_CTRL_RXD_W_SE                  BIT(35)
-#define SWAPPER_CTRL_RXF_W_FE                  BIT(36)
-#define SWAPPER_CTRL_RXF_W_SE                  BIT(37)
-#define SWAPPER_CTRL_XMSI_FE                   BIT(40)
-#define SWAPPER_CTRL_XMSI_SE                   BIT(41)
-#define SWAPPER_CTRL_STATS_FE                  BIT(48)
-#define SWAPPER_CTRL_STATS_SE                  BIT(49)
+#define SWAPPER_CTRL_PIF_R_FE                  s2BIT(0)
+#define SWAPPER_CTRL_PIF_R_SE                  s2BIT(1)
+#define SWAPPER_CTRL_PIF_W_FE                  s2BIT(8)
+#define SWAPPER_CTRL_PIF_W_SE                  s2BIT(9)
+#define SWAPPER_CTRL_TXP_FE                    s2BIT(16)
+#define SWAPPER_CTRL_TXP_SE                    s2BIT(17)
+#define SWAPPER_CTRL_TXD_R_FE                  s2BIT(18)
+#define SWAPPER_CTRL_TXD_R_SE                  s2BIT(19)
+#define SWAPPER_CTRL_TXD_W_FE                  s2BIT(20)
+#define SWAPPER_CTRL_TXD_W_SE                  s2BIT(21)
+#define SWAPPER_CTRL_TXF_R_FE                  s2BIT(22)
+#define SWAPPER_CTRL_TXF_R_SE                  s2BIT(23)
+#define SWAPPER_CTRL_RXD_R_FE                  s2BIT(32)
+#define SWAPPER_CTRL_RXD_R_SE                  s2BIT(33)
+#define SWAPPER_CTRL_RXD_W_FE                  s2BIT(34)
+#define SWAPPER_CTRL_RXD_W_SE                  s2BIT(35)
+#define SWAPPER_CTRL_RXF_W_FE                  s2BIT(36)
+#define SWAPPER_CTRL_RXF_W_SE                  s2BIT(37)
+#define SWAPPER_CTRL_XMSI_FE                   s2BIT(40)
+#define SWAPPER_CTRL_XMSI_SE                   s2BIT(41)
+#define SWAPPER_CTRL_STATS_FE                  s2BIT(48)
+#define SWAPPER_CTRL_STATS_SE                  s2BIT(49)
 
         u64 pif_rd_swapper_fb;
 #define IF_RD_SWAPPER_FB                            0x0123456789ABCDEF
 
         u64 scheduled_int_ctrl;
-#define SCHED_INT_CTRL_TIMER_EN                BIT(0)
-#define SCHED_INT_CTRL_ONE_SHOT                BIT(1)
+#define SCHED_INT_CTRL_TIMER_EN                s2BIT(0)
+#define SCHED_INT_CTRL_ONE_SHOT                s2BIT(1)
 #define SCHED_INT_CTRL_INT2MSI(val)             vBIT(val,10,6)
 #define SCHED_INT_PERIOD                       TBD
 
         u64 txreqtimeout;
 #define TXREQTO_VAL(val)                                                vBIT(val,0,32)
-#define TXREQTO_EN                                                              BIT(63)
+#define TXREQTO_EN                                                              s2BIT(63)
 
         u64 statsreqtimeout;
 #define STATREQTO_VAL(n)                       TBD
-#define STATREQTO_EN                           BIT(63)
+#define STATREQTO_EN                           s2BIT(63)
 
         u64 read_retry_delay;
         u64 read_retry_acceleration;
@@ -255,10 +255,10 @@ struct XENA_dev_config {
 
         /* Automated statistics collection */
         u64 stat_cfg;
-#define STAT_CFG_STAT_EN           BIT(0)
-#define STAT_CFG_ONE_SHOT_EN       BIT(1)
-#define STAT_CFG_STAT_NS_EN        BIT(8)
-#define STAT_CFG_STAT_RO           BIT(9)
+#define STAT_CFG_STAT_EN           s2BIT(0)
+#define STAT_CFG_ONE_SHOT_EN       s2BIT(1)
+#define STAT_CFG_STAT_NS_EN        s2BIT(8)
+#define STAT_CFG_STAT_RO           s2BIT(9)
 #define STAT_TRSF_PER(n)           TBD
 #define PER_SEC                                    0x208d5
 #define SET_UPDT_PERIOD(n)                 vBIT((PER_SEC*n),32,32)
@@ -290,18 +290,18 @@ struct XENA_dev_config {
 #define I2C_CONTROL_DEV_ID(id)          vBIT(id,1,3)
 #define I2C_CONTROL_ADDR(addr)          vBIT(addr,5,11)
 #define I2C_CONTROL_BYTE_CNT(cnt)       vBIT(cnt,22,2)
-#define I2C_CONTROL_READ                        BIT(24)
-#define I2C_CONTROL_NACK                        BIT(25)
+#define I2C_CONTROL_READ                        s2BIT(24)
+#define I2C_CONTROL_NACK                        s2BIT(25)
 #define I2C_CONTROL_CNTL_START          vBIT(0xE,28,4)
 #define I2C_CONTROL_CNTL_END(val)       (val & vBIT(0x1,28,4))
 #define I2C_CONTROL_GET_DATA(val)       (u32)(val & 0xFFFFFFFF)
 #define I2C_CONTROL_SET_DATA(val)       vBIT(val,32,32)
 
         u64 gpio_control;
-#define GPIO_CTRL_GPIO_0                BIT(8)
+#define GPIO_CTRL_GPIO_0                s2BIT(8)
         u64 misc_control;
-#define FAULT_BEHAVIOUR                 BIT(0)
-#define EXT_REQ_EN                      BIT(1)
+#define FAULT_BEHAVIOUR                 s2BIT(0)
+#define EXT_REQ_EN                      s2BIT(1)
 #define MISC_LINK_STABILITY_PRD(val)   vBIT(val,29,3)
 
         u8 unused7_1[0x230 - 0x208];
@@ -317,29 +317,29 @@ struct XENA_dev_config {
 /* TxDMA registers */
         u64 txdma_int_status;
         u64 txdma_int_mask;
-#define TXDMA_PFC_INT                  BIT(0)
-#define TXDMA_TDA_INT                  BIT(1)
-#define TXDMA_PCC_INT                  BIT(2)
-#define TXDMA_TTI_INT                  BIT(3)
-#define TXDMA_LSO_INT                  BIT(4)
-#define TXDMA_TPA_INT                  BIT(5)
-#define TXDMA_SM_INT                   BIT(6)
+#define TXDMA_PFC_INT                  s2BIT(0)
+#define TXDMA_TDA_INT                  s2BIT(1)
+#define TXDMA_PCC_INT                  s2BIT(2)
+#define TXDMA_TTI_INT                  s2BIT(3)
+#define TXDMA_LSO_INT                  s2BIT(4)
+#define TXDMA_TPA_INT                  s2BIT(5)
+#define TXDMA_SM_INT                   s2BIT(6)
         u64 pfc_err_reg;
-#define PFC_ECC_SG_ERR                  BIT(7)
-#define PFC_ECC_DB_ERR                  BIT(15)
-#define PFC_SM_ERR_ALARM                BIT(23)
-#define PFC_MISC_0_ERR                  BIT(31)
-#define PFC_MISC_1_ERR                  BIT(32)
-#define PFC_PCIX_ERR                    BIT(39)
+#define PFC_ECC_SG_ERR                  s2BIT(7)
+#define PFC_ECC_DB_ERR                  s2BIT(15)
+#define PFC_SM_ERR_ALARM                s2BIT(23)
+#define PFC_MISC_0_ERR                  s2BIT(31)
+#define PFC_MISC_1_ERR                  s2BIT(32)
+#define PFC_PCIX_ERR                    s2BIT(39)
         u64 pfc_err_mask;
         u64 pfc_err_alarm;
 
         u64 tda_err_reg;
 #define TDA_Fn_ECC_SG_ERR               vBIT(0xff,0,8)
 #define TDA_Fn_ECC_DB_ERR               vBIT(0xff,8,8)
-#define TDA_SM0_ERR_ALARM               BIT(22)
-#define TDA_SM1_ERR_ALARM               BIT(23)
-#define TDA_PCIX_ERR                    BIT(39)
+#define TDA_SM0_ERR_ALARM               s2BIT(22)
+#define TDA_SM1_ERR_ALARM               s2BIT(23)
+#define TDA_PCIX_ERR                    s2BIT(39)
         u64 tda_err_mask;
         u64 tda_err_alarm;
 
@@ -351,40 +351,40 @@ struct XENA_dev_config {
 #define PCC_SM_ERR_ALARM                vBIT(0xff,32,8)
 #define PCC_WR_ERR_ALARM                vBIT(0xff,40,8)
 #define PCC_N_SERR                      vBIT(0xff,48,8)
-#define PCC_6_COF_OV_ERR                BIT(56)
-#define PCC_7_COF_OV_ERR                BIT(57)
-#define PCC_6_LSO_OV_ERR                BIT(58)
-#define PCC_7_LSO_OV_ERR                BIT(59)
+#define PCC_6_COF_OV_ERR                s2BIT(56)
+#define PCC_7_COF_OV_ERR                s2BIT(57)
+#define PCC_6_LSO_OV_ERR                s2BIT(58)
+#define PCC_7_LSO_OV_ERR                s2BIT(59)
 #define PCC_ENABLE_FOUR                 vBIT(0x0F,0,8)
         u64 pcc_err_mask;
         u64 pcc_err_alarm;
 
         u64 tti_err_reg;
-#define TTI_ECC_SG_ERR                  BIT(7)
-#define TTI_ECC_DB_ERR                  BIT(15)
-#define TTI_SM_ERR_ALARM                BIT(23)
+#define TTI_ECC_SG_ERR                  s2BIT(7)
+#define TTI_ECC_DB_ERR                  s2BIT(15)
+#define TTI_SM_ERR_ALARM                s2BIT(23)
         u64 tti_err_mask;
         u64 tti_err_alarm;
 
         u64 lso_err_reg;
-#define LSO6_SEND_OFLOW                 BIT(12)
-#define LSO7_SEND_OFLOW                 BIT(13)
-#define LSO6_ABORT                      BIT(14)
-#define LSO7_ABORT                      BIT(15)
-#define LSO6_SM_ERR_ALARM               BIT(22)
-#define LSO7_SM_ERR_ALARM               BIT(23)
+#define LSO6_SEND_OFLOW                 s2BIT(12)
+#define LSO7_SEND_OFLOW                 s2BIT(13)
+#define LSO6_ABORT                      s2BIT(14)
+#define LSO7_ABORT                      s2BIT(15)
+#define LSO6_SM_ERR_ALARM               s2BIT(22)
+#define LSO7_SM_ERR_ALARM               s2BIT(23)
         u64 lso_err_mask;
         u64 lso_err_alarm;
 
         u64 tpa_err_reg;
-#define TPA_TX_FRM_DROP                 BIT(7)
-#define TPA_SM_ERR_ALARM                BIT(23)
+#define TPA_TX_FRM_DROP                 s2BIT(7)
+#define TPA_SM_ERR_ALARM                s2BIT(23)
 
         u64 tpa_err_mask;
         u64 tpa_err_alarm;
 
         u64 sm_err_reg;
-#define SM_SM_ERR_ALARM                 BIT(15)
+#define SM_SM_ERR_ALARM                 s2BIT(15)
         u64 sm_err_mask;
         u64 sm_err_alarm;
 
@@ -397,7 +397,7 @@ struct XENA_dev_config {
 #define X_MAX_FIFOS                        8
 #define X_FIFO_MAX_LEN                     0x1FFF       /*8191 */
         u64 tx_fifo_partition_0;
-#define TX_FIFO_PARTITION_EN               BIT(0)
+#define TX_FIFO_PARTITION_EN               s2BIT(0)
 #define TX_FIFO_PARTITION_0_PRI(val)       vBIT(val,5,3)
 #define TX_FIFO_PARTITION_0_LEN(val)       vBIT(val,19,13)
 #define TX_FIFO_PARTITION_1_PRI(val)       vBIT(val,37,3)
@@ -437,16 +437,16 @@ struct XENA_dev_config {
         u64 tx_w_round_robin_4;
 
         u64 tti_command_mem;
-#define TTI_CMD_MEM_WE                     BIT(7)
-#define TTI_CMD_MEM_STROBE_NEW_CMD         BIT(15)
-#define TTI_CMD_MEM_STROBE_BEING_EXECUTED  BIT(15)
+#define TTI_CMD_MEM_WE                     s2BIT(7)
+#define TTI_CMD_MEM_STROBE_NEW_CMD         s2BIT(15)
+#define TTI_CMD_MEM_STROBE_BEING_EXECUTED  s2BIT(15)
 #define TTI_CMD_MEM_OFFSET(n)              vBIT(n,26,6)
 
         u64 tti_data1_mem;
 #define TTI_DATA1_MEM_TX_TIMER_VAL(n)      vBIT(n,6,26)
 #define TTI_DATA1_MEM_TX_TIMER_AC_CI(n)    vBIT(n,38,2)
-#define TTI_DATA1_MEM_TX_TIMER_AC_EN       BIT(38)
-#define TTI_DATA1_MEM_TX_TIMER_CI_EN       BIT(39)
+#define TTI_DATA1_MEM_TX_TIMER_AC_EN       s2BIT(38)
+#define TTI_DATA1_MEM_TX_TIMER_CI_EN       s2BIT(39)
 #define TTI_DATA1_MEM_TX_URNG_A(n)         vBIT(n,41,7)
 #define TTI_DATA1_MEM_TX_URNG_B(n)         vBIT(n,49,7)
 #define TTI_DATA1_MEM_TX_URNG_C(n)         vBIT(n,57,7)
@@ -459,11 +459,11 @@ struct XENA_dev_config {
 
 /* Tx Protocol assist */
         u64 tx_pa_cfg;
-#define TX_PA_CFG_IGNORE_FRM_ERR           BIT(1)
-#define TX_PA_CFG_IGNORE_SNAP_OUI          BIT(2)
-#define TX_PA_CFG_IGNORE_LLC_CTRL          BIT(3)
-#define TX_PA_CFG_IGNORE_L2_ERR                    BIT(6)
-#define RX_PA_CFG_STRIP_VLAN_TAG                BIT(15)
+#define TX_PA_CFG_IGNORE_FRM_ERR           s2BIT(1)
+#define TX_PA_CFG_IGNORE_SNAP_OUI          s2BIT(2)
+#define TX_PA_CFG_IGNORE_LLC_CTRL          s2BIT(3)
+#define TX_PA_CFG_IGNORE_L2_ERR                    s2BIT(6)
+#define RX_PA_CFG_STRIP_VLAN_TAG                s2BIT(15)
 
 /* Recent add, used only debug purposes. */
         u64 pcc_enable;
@@ -477,31 +477,31 @@ struct XENA_dev_config {
 /* RxDMA Registers */
         u64 rxdma_int_status;
         u64 rxdma_int_mask;
-#define RXDMA_INT_RC_INT_M             BIT(0)
-#define RXDMA_INT_RPA_INT_M            BIT(1)
-#define RXDMA_INT_RDA_INT_M            BIT(2)
-#define RXDMA_INT_RTI_INT_M            BIT(3)
+#define RXDMA_INT_RC_INT_M             s2BIT(0)
+#define RXDMA_INT_RPA_INT_M            s2BIT(1)
+#define RXDMA_INT_RDA_INT_M            s2BIT(2)
+#define RXDMA_INT_RTI_INT_M            s2BIT(3)
 
         u64 rda_err_reg;
 #define RDA_RXDn_ECC_SG_ERR             vBIT(0xFF,0,8)
 #define RDA_RXDn_ECC_DB_ERR             vBIT(0xFF,8,8)
-#define RDA_FRM_ECC_SG_ERR              BIT(23)
-#define RDA_FRM_ECC_DB_N_AERR           BIT(31)
-#define RDA_SM1_ERR_ALARM               BIT(38)
-#define RDA_SM0_ERR_ALARM               BIT(39)
-#define RDA_MISC_ERR                    BIT(47)
-#define RDA_PCIX_ERR                    BIT(55)
-#define RDA_RXD_ECC_DB_SERR             BIT(63)
+#define RDA_FRM_ECC_SG_ERR              s2BIT(23)
+#define RDA_FRM_ECC_DB_N_AERR           s2BIT(31)
+#define RDA_SM1_ERR_ALARM               s2BIT(38)
+#define RDA_SM0_ERR_ALARM               s2BIT(39)
+#define RDA_MISC_ERR                    s2BIT(47)
+#define RDA_PCIX_ERR                    s2BIT(55)
+#define RDA_RXD_ECC_DB_SERR             s2BIT(63)
         u64 rda_err_mask;
         u64 rda_err_alarm;
 
         u64 rc_err_reg;
 #define RC_PRCn_ECC_SG_ERR              vBIT(0xFF,0,8)
 #define RC_PRCn_ECC_DB_ERR              vBIT(0xFF,8,8)
-#define RC_FTC_ECC_SG_ERR               BIT(23)
-#define RC_FTC_ECC_DB_ERR               BIT(31)
+#define RC_FTC_ECC_SG_ERR               s2BIT(23)
+#define RC_FTC_ECC_DB_ERR               s2BIT(31)
 #define RC_PRCn_SM_ERR_ALARM            vBIT(0xFF,32,8)
-#define RC_FTC_SM_ERR_ALARM             BIT(47)
+#define RC_FTC_SM_ERR_ALARM             s2BIT(47)
 #define RC_RDA_FAIL_WR_Rn               vBIT(0xFF,48,8)
         u64 rc_err_mask;
         u64 rc_err_alarm;
@@ -517,18 +517,18 @@ struct XENA_dev_config {
         u64 prc_pcix_err_alarm;
 
         u64 rpa_err_reg;
-#define RPA_ECC_SG_ERR                  BIT(7)
-#define RPA_ECC_DB_ERR                  BIT(15)
-#define RPA_FLUSH_REQUEST               BIT(22)
-#define RPA_SM_ERR_ALARM                BIT(23)
-#define RPA_CREDIT_ERR                  BIT(31)
+#define RPA_ECC_SG_ERR                  s2BIT(7)
+#define RPA_ECC_DB_ERR                  s2BIT(15)
+#define RPA_FLUSH_REQUEST               s2BIT(22)
+#define RPA_SM_ERR_ALARM                s2BIT(23)
+#define RPA_CREDIT_ERR                  s2BIT(31)
         u64 rpa_err_mask;
         u64 rpa_err_alarm;
 
         u64 rti_err_reg;
-#define RTI_ECC_SG_ERR                  BIT(7)
-#define RTI_ECC_DB_ERR                  BIT(15)
-#define RTI_SM_ERR_ALARM                BIT(23)
+#define RTI_ECC_SG_ERR                  s2BIT(7)
+#define RTI_ECC_DB_ERR                  s2BIT(15)
+#define RTI_SM_ERR_ALARM                s2BIT(23)
         u64 rti_err_mask;
         u64 rti_err_alarm;
 
@@ -568,49 +568,49 @@ struct XENA_dev_config {
 #endif
         u64 prc_rxd0_n[RX_MAX_RINGS];
         u64 prc_ctrl_n[RX_MAX_RINGS];
-#define PRC_CTRL_RC_ENABLED                    BIT(7)
-#define PRC_CTRL_RING_MODE                     (BIT(14)|BIT(15))
+#define PRC_CTRL_RC_ENABLED                    s2BIT(7)
+#define PRC_CTRL_RING_MODE                     (s2BIT(14)|s2BIT(15))
 #define PRC_CTRL_RING_MODE_1                   vBIT(0,14,2)
 #define PRC_CTRL_RING_MODE_3                   vBIT(1,14,2)
 #define PRC_CTRL_RING_MODE_5                   vBIT(2,14,2)
 #define PRC_CTRL_RING_MODE_x                   vBIT(3,14,2)
-#define PRC_CTRL_NO_SNOOP                      (BIT(22)|BIT(23))
-#define PRC_CTRL_NO_SNOOP_DESC                 BIT(22)
-#define PRC_CTRL_NO_SNOOP_BUFF                 BIT(23)
-#define PRC_CTRL_BIMODAL_INTERRUPT             BIT(37)
-#define PRC_CTRL_GROUP_READS                   BIT(38)
+#define PRC_CTRL_NO_SNOOP                      (s2BIT(22)|s2BIT(23))
+#define PRC_CTRL_NO_SNOOP_DESC                 s2BIT(22)
+#define PRC_CTRL_NO_SNOOP_BUFF                 s2BIT(23)
+#define PRC_CTRL_BIMODAL_INTERRUPT             s2BIT(37)
+#define PRC_CTRL_GROUP_READS                   s2BIT(38)
 #define PRC_CTRL_RXD_BACKOFF_INTERVAL(val)     vBIT(val,40,24)
 
         u64 prc_alarm_action;
-#define PRC_ALARM_ACTION_RR_R0_STOP            BIT(3)
-#define PRC_ALARM_ACTION_RW_R0_STOP            BIT(7)
-#define PRC_ALARM_ACTION_RR_R1_STOP            BIT(11)
-#define PRC_ALARM_ACTION_RW_R1_STOP            BIT(15)
-#define PRC_ALARM_ACTION_RR_R2_STOP            BIT(19)
-#define PRC_ALARM_ACTION_RW_R2_STOP            BIT(23)
-#define PRC_ALARM_ACTION_RR_R3_STOP            BIT(27)
-#define PRC_ALARM_ACTION_RW_R3_STOP            BIT(31)
-#define PRC_ALARM_ACTION_RR_R4_STOP            BIT(35)
-#define PRC_ALARM_ACTION_RW_R4_STOP            BIT(39)
-#define PRC_ALARM_ACTION_RR_R5_STOP            BIT(43)
-#define PRC_ALARM_ACTION_RW_R5_STOP            BIT(47)
-#define PRC_ALARM_ACTION_RR_R6_STOP            BIT(51)
-#define PRC_ALARM_ACTION_RW_R6_STOP            BIT(55)
-#define PRC_ALARM_ACTION_RR_R7_STOP            BIT(59)
-#define PRC_ALARM_ACTION_RW_R7_STOP            BIT(63)
+#define PRC_ALARM_ACTION_RR_R0_STOP            s2BIT(3)
+#define PRC_ALARM_ACTION_RW_R0_STOP            s2BIT(7)
+#define PRC_ALARM_ACTION_RR_R1_STOP            s2BIT(11)
+#define PRC_ALARM_ACTION_RW_R1_STOP            s2BIT(15)
+#define PRC_ALARM_ACTION_RR_R2_STOP            s2BIT(19)
+#define PRC_ALARM_ACTION_RW_R2_STOP            s2BIT(23)
+#define PRC_ALARM_ACTION_RR_R3_STOP            s2BIT(27)
+#define PRC_ALARM_ACTION_RW_R3_STOP            s2BIT(31)
+#define PRC_ALARM_ACTION_RR_R4_STOP            s2BIT(35)
+#define PRC_ALARM_ACTION_RW_R4_STOP            s2BIT(39)
+#define PRC_ALARM_ACTION_RR_R5_STOP            s2BIT(43)
+#define PRC_ALARM_ACTION_RW_R5_STOP            s2BIT(47)
+#define PRC_ALARM_ACTION_RR_R6_STOP            s2BIT(51)
+#define PRC_ALARM_ACTION_RW_R6_STOP            s2BIT(55)
+#define PRC_ALARM_ACTION_RR_R7_STOP            s2BIT(59)
+#define PRC_ALARM_ACTION_RW_R7_STOP            s2BIT(63)
 
 /* Receive traffic interrupts */
         u64 rti_command_mem;
-#define RTI_CMD_MEM_WE                          BIT(7)
-#define RTI_CMD_MEM_STROBE                      BIT(15)
-#define RTI_CMD_MEM_STROBE_NEW_CMD              BIT(15)
-#define RTI_CMD_MEM_STROBE_CMD_BEING_EXECUTED   BIT(15)
+#define RTI_CMD_MEM_WE                          s2BIT(7)
+#define RTI_CMD_MEM_STROBE                      s2BIT(15)
+#define RTI_CMD_MEM_STROBE_NEW_CMD              s2BIT(15)
+#define RTI_CMD_MEM_STROBE_CMD_BEING_EXECUTED   s2BIT(15)
 #define RTI_CMD_MEM_OFFSET(n)                   vBIT(n,29,3)
 
         u64 rti_data1_mem;
 #define RTI_DATA1_MEM_RX_TIMER_VAL(n)      vBIT(n,3,29)
-#define RTI_DATA1_MEM_RX_TIMER_AC_EN       BIT(38)
-#define RTI_DATA1_MEM_RX_TIMER_CI_EN       BIT(39)
+#define RTI_DATA1_MEM_RX_TIMER_AC_EN       s2BIT(38)
+#define RTI_DATA1_MEM_RX_TIMER_CI_EN       s2BIT(39)
 #define RTI_DATA1_MEM_RX_URNG_A(n)         vBIT(n,41,7)
 #define RTI_DATA1_MEM_RX_URNG_B(n)         vBIT(n,49,7)
 #define RTI_DATA1_MEM_RX_URNG_C(n)         vBIT(n,57,7)
@@ -622,10 +622,10 @@ struct XENA_dev_config {
 #define RTI_DATA2_MEM_RX_UFC_D(n)          vBIT(n,48,16)
 
         u64 rx_pa_cfg;
-#define RX_PA_CFG_IGNORE_FRM_ERR           BIT(1)
-#define RX_PA_CFG_IGNORE_SNAP_OUI          BIT(2)
-#define RX_PA_CFG_IGNORE_LLC_CTRL          BIT(3)
-#define RX_PA_CFG_IGNORE_L2_ERR            BIT(6)
+#define RX_PA_CFG_IGNORE_FRM_ERR           s2BIT(1)
+#define RX_PA_CFG_IGNORE_SNAP_OUI          s2BIT(2)
+#define RX_PA_CFG_IGNORE_LLC_CTRL          s2BIT(3)
+#define RX_PA_CFG_IGNORE_L2_ERR            s2BIT(6)
 
         u64 unused_11_1;
 
@@ -641,64 +641,64 @@ struct XENA_dev_config {
 /* Media Access Controller Register */
         u64 mac_int_status;
         u64 mac_int_mask;
-#define MAC_INT_STATUS_TMAC_INT            BIT(0)
-#define MAC_INT_STATUS_RMAC_INT            BIT(1)
+#define MAC_INT_STATUS_TMAC_INT            s2BIT(0)
+#define MAC_INT_STATUS_RMAC_INT            s2BIT(1)
 
         u64 mac_tmac_err_reg;
-#define TMAC_ECC_SG_ERR                         BIT(7)
-#define TMAC_ECC_DB_ERR                         BIT(15)
-#define TMAC_TX_BUF_OVRN                        BIT(23)
-#define TMAC_TX_CRI_ERR                         BIT(31)
-#define TMAC_TX_SM_ERR                          BIT(39)
-#define TMAC_DESC_ECC_SG_ERR                    BIT(47)
-#define TMAC_DESC_ECC_DB_ERR                    BIT(55)
+#define TMAC_ECC_SG_ERR                         s2BIT(7)
+#define TMAC_ECC_DB_ERR                         s2BIT(15)
+#define TMAC_TX_BUF_OVRN                        s2BIT(23)
+#define TMAC_TX_CRI_ERR                         s2BIT(31)
+#define TMAC_TX_SM_ERR                          s2BIT(39)
+#define TMAC_DESC_ECC_SG_ERR                    s2BIT(47)
+#define TMAC_DESC_ECC_DB_ERR                    s2BIT(55)
 
         u64 mac_tmac_err_mask;
         u64 mac_tmac_err_alarm;
 
         u64 mac_rmac_err_reg;
-#define RMAC_RX_BUFF_OVRN                       BIT(0)
-#define RMAC_FRM_RCVD_INT                       BIT(1)
-#define RMAC_UNUSED_INT                         BIT(2)
-#define RMAC_RTS_PNUM_ECC_SG_ERR                BIT(5)
-#define RMAC_RTS_DS_ECC_SG_ERR                  BIT(6)
-#define RMAC_RD_BUF_ECC_SG_ERR                  BIT(7)
-#define RMAC_RTH_MAP_ECC_SG_ERR                 BIT(8)
-#define RMAC_RTH_SPDM_ECC_SG_ERR                BIT(9)
-#define RMAC_RTS_VID_ECC_SG_ERR                 BIT(10)
-#define RMAC_DA_SHADOW_ECC_SG_ERR               BIT(11)
-#define RMAC_RTS_PNUM_ECC_DB_ERR                BIT(13)
-#define RMAC_RTS_DS_ECC_DB_ERR                  BIT(14)
-#define RMAC_RD_BUF_ECC_DB_ERR                  BIT(15)
-#define RMAC_RTH_MAP_ECC_DB_ERR                 BIT(16)
-#define RMAC_RTH_SPDM_ECC_DB_ERR                BIT(17)
-#define RMAC_RTS_VID_ECC_DB_ERR                 BIT(18)
-#define RMAC_DA_SHADOW_ECC_DB_ERR               BIT(19)
-#define RMAC_LINK_STATE_CHANGE_INT              BIT(31)
-#define RMAC_RX_SM_ERR                          BIT(39)
-#define RMAC_SINGLE_ECC_ERR                     (BIT(5) | BIT(6) | BIT(7) |\
-                                                BIT(8)  | BIT(9) | BIT(10)|\
-                                                BIT(11))
-#define RMAC_DOUBLE_ECC_ERR                     (BIT(13) | BIT(14) | BIT(15) |\
-                                                BIT(16)  | BIT(17) | BIT(18)|\
-                                                BIT(19))
+#define RMAC_RX_BUFF_OVRN                       s2BIT(0)
+#define RMAC_FRM_RCVD_INT                       s2BIT(1)
+#define RMAC_UNUSED_INT                         s2BIT(2)
+#define RMAC_RTS_PNUM_ECC_SG_ERR                s2BIT(5)
+#define RMAC_RTS_DS_ECC_SG_ERR                  s2BIT(6)
+#define RMAC_RD_BUF_ECC_SG_ERR                  s2BIT(7)
+#define RMAC_RTH_MAP_ECC_SG_ERR                 s2BIT(8)
+#define RMAC_RTH_SPDM_ECC_SG_ERR                s2BIT(9)
+#define RMAC_RTS_VID_ECC_SG_ERR                 s2BIT(10)
+#define RMAC_DA_SHADOW_ECC_SG_ERR               s2BIT(11)
+#define RMAC_RTS_PNUM_ECC_DB_ERR                s2BIT(13)
+#define RMAC_RTS_DS_ECC_DB_ERR                  s2BIT(14)
+#define RMAC_RD_BUF_ECC_DB_ERR                  s2BIT(15)
+#define RMAC_RTH_MAP_ECC_DB_ERR                 s2BIT(16)
+#define RMAC_RTH_SPDM_ECC_DB_ERR                s2BIT(17)
+#define RMAC_RTS_VID_ECC_DB_ERR                 s2BIT(18)
+#define RMAC_DA_SHADOW_ECC_DB_ERR               s2BIT(19)
+#define RMAC_LINK_STATE_CHANGE_INT              s2BIT(31)
+#define RMAC_RX_SM_ERR                          s2BIT(39)
+#define RMAC_SINGLE_ECC_ERR                     (s2BIT(5) | s2BIT(6) | s2BIT(7) |\
+                                                s2BIT(8)  | s2BIT(9) | s2BIT(10)|\
+                                                s2BIT(11))
+#define RMAC_DOUBLE_ECC_ERR                     (s2BIT(13) | s2BIT(14) | s2BIT(15) |\
+                                                s2BIT(16)  | s2BIT(17) | s2BIT(18)|\
+                                                s2BIT(19))
         u64 mac_rmac_err_mask;
         u64 mac_rmac_err_alarm;
 
         u8 unused14[0x100 - 0x40];
 
         u64 mac_cfg;
-#define MAC_CFG_TMAC_ENABLE             BIT(0)
-#define MAC_CFG_RMAC_ENABLE             BIT(1)
-#define MAC_CFG_LAN_NOT_WAN             BIT(2)
-#define MAC_CFG_TMAC_LOOPBACK           BIT(3)
-#define MAC_CFG_TMAC_APPEND_PAD         BIT(4)
-#define MAC_CFG_RMAC_STRIP_FCS          BIT(5)
-#define MAC_CFG_RMAC_STRIP_PAD          BIT(6)
-#define MAC_CFG_RMAC_PROM_ENABLE        BIT(7)
-#define MAC_RMAC_DISCARD_PFRM           BIT(8)
-#define MAC_RMAC_BCAST_ENABLE           BIT(9)
-#define MAC_RMAC_ALL_ADDR_ENABLE        BIT(10)
+#define MAC_CFG_TMAC_ENABLE             s2BIT(0)
+#define MAC_CFG_RMAC_ENABLE             s2BIT(1)
+#define MAC_CFG_LAN_NOT_WAN             s2BIT(2)
+#define MAC_CFG_TMAC_LOOPBACK           s2BIT(3)
+#define MAC_CFG_TMAC_APPEND_PAD         s2BIT(4)
+#define MAC_CFG_RMAC_STRIP_FCS          s2BIT(5)
+#define MAC_CFG_RMAC_STRIP_PAD          s2BIT(6)
+#define MAC_CFG_RMAC_PROM_ENABLE        s2BIT(7)
+#define MAC_RMAC_DISCARD_PFRM           s2BIT(8)
+#define MAC_RMAC_BCAST_ENABLE           s2BIT(9)
+#define MAC_RMAC_ALL_ADDR_ENABLE        s2BIT(10)
 #define MAC_RMAC_INVLD_IPG_THR(val)     vBIT(val,16,8)
 
         u64 tmac_avg_ipg;
@@ -710,14 +710,14 @@ struct XENA_dev_config {
 #define RMAC_MAX_PYLD_LEN_JUMBO_DEF vBIT(9600,2,14)
 
         u64 rmac_err_cfg;
-#define RMAC_ERR_FCS                    BIT(0)
-#define RMAC_ERR_FCS_ACCEPT             BIT(1)
-#define RMAC_ERR_TOO_LONG               BIT(1)
-#define RMAC_ERR_TOO_LONG_ACCEPT        BIT(1)
-#define RMAC_ERR_RUNT                   BIT(2)
-#define RMAC_ERR_RUNT_ACCEPT            BIT(2)
-#define RMAC_ERR_LEN_MISMATCH           BIT(3)
-#define RMAC_ERR_LEN_MISMATCH_ACCEPT    BIT(3)
+#define RMAC_ERR_FCS                    s2BIT(0)
+#define RMAC_ERR_FCS_ACCEPT             s2BIT(1)
+#define RMAC_ERR_TOO_LONG               s2BIT(1)
+#define RMAC_ERR_TOO_LONG_ACCEPT        s2BIT(1)
+#define RMAC_ERR_RUNT                   s2BIT(2)
+#define RMAC_ERR_RUNT_ACCEPT            s2BIT(2)
+#define RMAC_ERR_LEN_MISMATCH           s2BIT(3)
+#define RMAC_ERR_LEN_MISMATCH_ACCEPT    s2BIT(3)
 
         u64 rmac_cfg_key;
 #define RMAC_CFG_KEY(val)               vBIT(val,0,16)
@@ -728,15 +728,15 @@ struct XENA_dev_config {
 #define MAC_MC_ADDR_START_OFFSET    16
 #define MAC_MC_ALL_MC_ADDR_OFFSET   63  /* enables all multicast pkts */
         u64 rmac_addr_cmd_mem;
-#define RMAC_ADDR_CMD_MEM_WE                    BIT(7)
+#define RMAC_ADDR_CMD_MEM_WE                    s2BIT(7)
 #define RMAC_ADDR_CMD_MEM_RD                    0
-#define RMAC_ADDR_CMD_MEM_STROBE_NEW_CMD        BIT(15)
-#define RMAC_ADDR_CMD_MEM_STROBE_CMD_EXECUTING  BIT(15)
+#define RMAC_ADDR_CMD_MEM_STROBE_NEW_CMD        s2BIT(15)
+#define RMAC_ADDR_CMD_MEM_STROBE_CMD_EXECUTING  s2BIT(15)
 #define RMAC_ADDR_CMD_MEM_OFFSET(n)             vBIT(n,26,6)
 
         u64 rmac_addr_data0_mem;
 #define RMAC_ADDR_DATA0_MEM_ADDR(n)    vBIT(n,0,48)
-#define RMAC_ADDR_DATA0_MEM_USER       BIT(48)
+#define RMAC_ADDR_DATA0_MEM_USER       s2BIT(48)
 
         u64 rmac_addr_data1_mem;
 #define RMAC_ADDR_DATA1_MEM_MASK(n)    vBIT(n,0,48)
@@ -753,10 +753,10 @@ struct XENA_dev_config {
         u64 tmac_ipg_cfg;
 
         u64 rmac_pause_cfg;
-#define RMAC_PAUSE_GEN             BIT(0)
-#define RMAC_PAUSE_GEN_ENABLE      BIT(0)
-#define RMAC_PAUSE_RX              BIT(1)
-#define RMAC_PAUSE_RX_ENABLE       BIT(1)
+#define RMAC_PAUSE_GEN             s2BIT(0)
+#define RMAC_PAUSE_GEN_ENABLE      s2BIT(0)
+#define RMAC_PAUSE_RX              s2BIT(1)
+#define RMAC_PAUSE_RX_ENABLE       s2BIT(1)
 #define RMAC_PAUSE_HG_PTIME_DEF    vBIT(0xFFFF,16,16)
 #define RMAC_PAUSE_HG_PTIME(val)    vBIT(val,16,16)
 
@@ -787,29 +787,29 @@ struct XENA_dev_config {
 #define MAX_DIX_MAP                         4
         u64 rts_dix_map_n[MAX_DIX_MAP];
 #define RTS_DIX_MAP_ETYPE(val)             vBIT(val,0,16)
-#define RTS_DIX_MAP_SCW(val)               BIT(val,21)
+#define RTS_DIX_MAP_SCW(val)               s2BIT(val,21)
 
         u64 rts_q_alternates;
         u64 rts_default_q;
 
         u64 rts_ctrl;
-#define RTS_CTRL_IGNORE_SNAP_OUI           BIT(2)
-#define RTS_CTRL_IGNORE_LLC_CTRL           BIT(3)
+#define RTS_CTRL_IGNORE_SNAP_OUI           s2BIT(2)
+#define RTS_CTRL_IGNORE_LLC_CTRL           s2BIT(3)
 
         u64 rts_pn_cam_ctrl;
-#define RTS_PN_CAM_CTRL_WE                 BIT(7)
-#define RTS_PN_CAM_CTRL_STROBE_NEW_CMD     BIT(15)
-#define RTS_PN_CAM_CTRL_STROBE_BEING_EXECUTED   BIT(15)
+#define RTS_PN_CAM_CTRL_WE                 s2BIT(7)
+#define RTS_PN_CAM_CTRL_STROBE_NEW_CMD     s2BIT(15)
+#define RTS_PN_CAM_CTRL_STROBE_BEING_EXECUTED   s2BIT(15)
 #define RTS_PN_CAM_CTRL_OFFSET(n)          vBIT(n,24,8)
         u64 rts_pn_cam_data;
-#define RTS_PN_CAM_DATA_TCP_SELECT         BIT(7)
+#define RTS_PN_CAM_DATA_TCP_SELECT         s2BIT(7)
 #define RTS_PN_CAM_DATA_PORT(val)          vBIT(val,8,16)
 #define RTS_PN_CAM_DATA_SCW(val)           vBIT(val,24,8)
 
         u64 rts_ds_mem_ctrl;
-#define RTS_DS_MEM_CTRL_WE                 BIT(7)
-#define RTS_DS_MEM_CTRL_STROBE_NEW_CMD     BIT(15)
-#define RTS_DS_MEM_CTRL_STROBE_CMD_BEING_EXECUTED   BIT(15)
+#define RTS_DS_MEM_CTRL_WE                 s2BIT(7)
+#define RTS_DS_MEM_CTRL_STROBE_NEW_CMD     s2BIT(15)
+#define RTS_DS_MEM_CTRL_STROBE_CMD_BEING_EXECUTED   s2BIT(15)
 #define RTS_DS_MEM_CTRL_OFFSET(n)          vBIT(n,26,6)
         u64 rts_ds_mem_data;
 #define RTS_DS_MEM_DATA(n)                 vBIT(n,0,8)
@@ -823,23 +823,23 @@ struct XENA_dev_config {
 
 /* memory controller registers */
         u64 mc_int_status;
-#define MC_INT_STATUS_MC_INT               BIT(0)
+#define MC_INT_STATUS_MC_INT               s2BIT(0)
         u64 mc_int_mask;
-#define MC_INT_MASK_MC_INT                 BIT(0)
+#define MC_INT_MASK_MC_INT                 s2BIT(0)
 
         u64 mc_err_reg;
-#define MC_ERR_REG_ECC_DB_ERR_L            BIT(14)
-#define MC_ERR_REG_ECC_DB_ERR_U            BIT(15)
-#define MC_ERR_REG_MIRI_ECC_DB_ERR_0       BIT(18)
-#define MC_ERR_REG_MIRI_ECC_DB_ERR_1       BIT(20)
-#define MC_ERR_REG_MIRI_CRI_ERR_0          BIT(22)
-#define MC_ERR_REG_MIRI_CRI_ERR_1          BIT(23)
-#define MC_ERR_REG_SM_ERR                  BIT(31)
-#define MC_ERR_REG_ECC_ALL_SNG             (BIT(2) | BIT(3) | BIT(4) | BIT(5) |\
-                                        BIT(17) | BIT(19))
-#define MC_ERR_REG_ECC_ALL_DBL             (BIT(10) | BIT(11) | BIT(12) |\
-                                        BIT(13) | BIT(18) | BIT(20))
-#define PLL_LOCK_N                      BIT(39)
+#define MC_ERR_REG_ECC_DB_ERR_L            s2BIT(14)
+#define MC_ERR_REG_ECC_DB_ERR_U            s2BIT(15)
+#define MC_ERR_REG_MIRI_ECC_DB_ERR_0       s2BIT(18)
+#define MC_ERR_REG_MIRI_ECC_DB_ERR_1       s2BIT(20)
+#define MC_ERR_REG_MIRI_CRI_ERR_0          s2BIT(22)
+#define MC_ERR_REG_MIRI_CRI_ERR_1          s2BIT(23)
+#define MC_ERR_REG_SM_ERR                  s2BIT(31)
+#define MC_ERR_REG_ECC_ALL_SNG             (s2BIT(2) | s2BIT(3) | s2BIT(4) | s2BIT(5) |\
+                                        s2BIT(17) | s2BIT(19))
+#define MC_ERR_REG_ECC_ALL_DBL             (s2BIT(10) | s2BIT(11) | s2BIT(12) |\
+                                        s2BIT(13) | s2BIT(18) | s2BIT(20))
+#define PLL_LOCK_N                      s2BIT(39)
         u64 mc_err_mask;
         u64 mc_err_alarm;
 
@@ -857,8 +857,8 @@ struct XENA_dev_config {
 #define RX_QUEUE_CFG_Q7_SZ(n)              vBIT(n,56,8)
 
         u64 mc_rldram_mrs;
-#define MC_RLDRAM_QUEUE_SIZE_ENABLE                     BIT(39)
-#define MC_RLDRAM_MRS_ENABLE                            BIT(47)
+#define MC_RLDRAM_QUEUE_SIZE_ENABLE                     s2BIT(39)
+#define MC_RLDRAM_MRS_ENABLE                            s2BIT(47)
 
         u64 mc_rldram_interleave;
 
@@ -871,11 +871,11 @@ struct XENA_dev_config {
         u64 mc_rldram_ref_per;
         u8 unused20[0x220 - 0x208];
         u64 mc_rldram_test_ctrl;
-#define MC_RLDRAM_TEST_MODE             BIT(47)
-#define MC_RLDRAM_TEST_WRITE    BIT(7)
-#define MC_RLDRAM_TEST_GO               BIT(15)
-#define MC_RLDRAM_TEST_DONE             BIT(23)
-#define MC_RLDRAM_TEST_PASS             BIT(31)
+#define MC_RLDRAM_TEST_MODE             s2BIT(47)
+#define MC_RLDRAM_TEST_WRITE    s2BIT(7)
+#define MC_RLDRAM_TEST_GO               s2BIT(15)
+#define MC_RLDRAM_TEST_DONE             s2BIT(23)
+#define MC_RLDRAM_TEST_PASS             s2BIT(31)
 
         u8 unused21[0x240 - 0x228];
         u64 mc_rldram_test_add;
@@ -888,7 +888,7 @@ struct XENA_dev_config {
 
         u8 unused24_1[0x360 - 0x308];
         u64 mc_rldram_ctrl;
-#define MC_RLDRAM_ENABLE_ODT            BIT(7)
+#define MC_RLDRAM_ENABLE_ODT            s2BIT(7)
 
         u8 unused24_2[0x640 - 0x368];
         u64 mc_rldram_ref_per_herc;
@@ -906,24 +906,24 @@ struct XENA_dev_config {
         /* XGXS control registers */
 
         u64 xgxs_int_status;
-#define XGXS_INT_STATUS_TXGXS              BIT(0)
-#define XGXS_INT_STATUS_RXGXS              BIT(1)
+#define XGXS_INT_STATUS_TXGXS              s2BIT(0)
+#define XGXS_INT_STATUS_RXGXS              s2BIT(1)
         u64 xgxs_int_mask;
-#define XGXS_INT_MASK_TXGXS                BIT(0)
-#define XGXS_INT_MASK_RXGXS                BIT(1)
+#define XGXS_INT_MASK_TXGXS                s2BIT(0)
+#define XGXS_INT_MASK_RXGXS                s2BIT(1)
 
         u64 xgxs_txgxs_err_reg;
-#define TXGXS_ECC_SG_ERR                BIT(7)
-#define TXGXS_ECC_DB_ERR                BIT(15)
-#define TXGXS_ESTORE_UFLOW              BIT(31)
-#define TXGXS_TX_SM_ERR                 BIT(39)
+#define TXGXS_ECC_SG_ERR                s2BIT(7)
+#define TXGXS_ECC_DB_ERR                s2BIT(15)
+#define TXGXS_ESTORE_UFLOW              s2BIT(31)
+#define TXGXS_TX_SM_ERR                 s2BIT(39)
 
         u64 xgxs_txgxs_err_mask;
         u64 xgxs_txgxs_err_alarm;
 
         u64 xgxs_rxgxs_err_reg;
-#define RXGXS_ESTORE_OFLOW              BIT(7)
-#define RXGXS_RX_SM_ERR                 BIT(39)
+#define RXGXS_ESTORE_OFLOW              s2BIT(7)
+#define RXGXS_RX_SM_ERR                 s2BIT(39)
         u64 xgxs_rxgxs_err_mask;
         u64 xgxs_rxgxs_err_alarm;
 
@@ -942,10 +942,10 @@ struct XENA_dev_config {
 #define SPI_CONTROL_BYTECNT(cnt)        vBIT(cnt,29,3)
 #define SPI_CONTROL_CMD(cmd)            vBIT(cmd,32,8)
 #define SPI_CONTROL_ADDR(addr)          vBIT(addr,40,24)
-#define SPI_CONTROL_SEL1                BIT(4)
-#define SPI_CONTROL_REQ                 BIT(7)
-#define SPI_CONTROL_NACK                BIT(5)
-#define SPI_CONTROL_DONE                BIT(6)
+#define SPI_CONTROL_SEL1                s2BIT(4)
+#define SPI_CONTROL_REQ                 s2BIT(7)
+#define SPI_CONTROL_NACK                s2BIT(5)
+#define SPI_CONTROL_DONE                s2BIT(6)
         u64 spi_data;
 #define SPI_DATA_WRITE(data,len)        vBIT(data,0,len)
 };
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index 22e4054d4fcb..b8c0e7b4ca1c 100644
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
@@ -1716,7 +1716,7 @@ static int init_nic(struct s2io_nic *nic)
                         MISC_LINK_STABILITY_PRD(3);
                 writeq(val64, &bar0->misc_control);
                 val64 = readq(&bar0->pic_control2);
-                val64 &= ~(BIT(13)|BIT(14)|BIT(15));
+                val64 &= ~(s2BIT(13)|s2BIT(14)|s2BIT(15));
                 writeq(val64, &bar0->pic_control2);
         }
         if (strstr(nic->product_name, "CX4")) {
@@ -2427,7 +2427,7 @@ static int fill_rx_buffers(struct s2io_nic *nic, int ring_no)
                 }
                 if ((rxdp->Control_1 & RXD_OWN_XENA) &&
                         ((nic->rxd_mode == RXD_MODE_3B) &&
-                                (rxdp->Control_2 & BIT(0)))) {
+                                (rxdp->Control_2 & s2BIT(0)))) {
                         mac_control->rings[ring_no].rx_curr_put_info.
                                         offset = off;
                         goto end;
@@ -2540,7 +2540,7 @@ static int fill_rx_buffers(struct s2io_nic *nic, int ring_no)
                                 rxdp->Control_2 |= SET_BUFFER2_SIZE_3
                                                                 (dev->mtu + 4);
                         }
-                        rxdp->Control_2 |= BIT(0);
+                        rxdp->Control_2 |= s2BIT(0);
                 }
                 rxdp->Host_Control = (unsigned long) (skb);
                 if (alloc_tab & ((1 << rxsync_frequency) - 1))
@@ -3377,7 +3377,7 @@ static void s2io_reset(struct s2io_nic * sp)
                 pci_write_config_dword(sp->pdev, 0x68, 0x7C);
 
                 /* Clearing PCI_STATUS error reflected here */
-                writeq(BIT(62), &bar0->txpic_int_reg);
+                writeq(s2BIT(62), &bar0->txpic_int_reg);
         }
 
         /* Reset device statistics maintained by OS */
@@ -3575,7 +3575,7 @@ static int wait_for_msix_trans(struct s2io_nic *nic, int i)
 
         do {
                 val64 = readq(&bar0->xmsi_access);
-                if (!(val64 & BIT(15)))
+                if (!(val64 & s2BIT(15)))
                         break;
                 mdelay(1);
                 cnt++;
@@ -3597,7 +3597,7 @@ static void restore_xmsi_data(struct s2io_nic *nic)
         for (i=0; i < MAX_REQUESTED_MSI_X; i++) {
                 writeq(nic->msix_info[i].addr, &bar0->xmsi_address);
                 writeq(nic->msix_info[i].data, &bar0->xmsi_data);
-                val64 = (BIT(7) | BIT(15) | vBIT(i, 26, 6));
+                val64 = (s2BIT(7) | s2BIT(15) | vBIT(i, 26, 6));
                 writeq(val64, &bar0->xmsi_access);
                 if (wait_for_msix_trans(nic, i)) {
                         DBG_PRINT(ERR_DBG, "failed in %s\n", __FUNCTION__);
@@ -3614,7 +3614,7 @@ static void store_xmsi_data(struct s2io_nic *nic)
 
         /* Store and display */
         for (i=0; i < MAX_REQUESTED_MSI_X; i++) {
-                val64 = (BIT(15) | vBIT(i, 26, 6));
+                val64 = (s2BIT(15) | vBIT(i, 26, 6));
                 writeq(val64, &bar0->xmsi_access);
                 if (wait_for_msix_trans(nic, i)) {
                         DBG_PRINT(ERR_DBG, "failed in %s\n", __FUNCTION__);
@@ -4634,7 +4634,7 @@ static void s2io_updt_stats(struct s2io_nic *sp)
                 do {
                         udelay(100);
                         val64 = readq(&bar0->stat_cfg);
-                        if (!(val64 & BIT(0)))
+                        if (!(val64 & s2BIT(0)))
                                 break;
                         cnt++;
                         if (cnt == 5)
diff --git a/drivers/net/s2io.h b/drivers/net/s2io.h
index f6b45565304f..cc1797a071aa 100644
--- a/drivers/net/s2io.h
+++ b/drivers/net/s2io.h
@@ -14,7 +14,7 @@
 #define _S2IO_H
 
 #define TBD 0
-#define BIT(loc)                (0x8000000000000000ULL >> (loc))
+#define s2BIT(loc)              (0x8000000000000000ULL >> (loc))
 #define vBIT(val, loc, sz)      (((u64)val) << (64-loc-sz))
 #define INV(d)  ((d&0xff)<<24) | (((d>>8)&0xff)<<16) | (((d>>16)&0xff)<<8)| ((d>>24)&0xff)
 
@@ -473,42 +473,42 @@ struct TxFIFO_element {
 
         u64 List_Control;
 #define TX_FIFO_LAST_TXD_NUM( val)     vBIT(val,0,8)
-#define TX_FIFO_FIRST_LIST             BIT(14)
-#define TX_FIFO_LAST_LIST              BIT(15)
+#define TX_FIFO_FIRST_LIST             s2BIT(14)
+#define TX_FIFO_LAST_LIST              s2BIT(15)
 #define TX_FIFO_FIRSTNLAST_LIST        vBIT(3,14,2)
-#define TX_FIFO_SPECIAL_FUNC           BIT(23)
-#define TX_FIFO_DS_NO_SNOOP            BIT(31)
-#define TX_FIFO_BUFF_NO_SNOOP          BIT(30)
+#define TX_FIFO_SPECIAL_FUNC           s2BIT(23)
+#define TX_FIFO_DS_NO_SNOOP            s2BIT(31)
+#define TX_FIFO_BUFF_NO_SNOOP          s2BIT(30)
 };
 
 /* Tx descriptor structure */
 struct TxD {
         u64 Control_1;
 /* bit mask */
-#define TXD_LIST_OWN_XENA       BIT(7)
-#define TXD_T_CODE              (BIT(12)|BIT(13)|BIT(14)|BIT(15))
+#define TXD_LIST_OWN_XENA       s2BIT(7)
+#define TXD_T_CODE              (s2BIT(12)|s2BIT(13)|s2BIT(14)|s2BIT(15))
 #define TXD_T_CODE_OK(val)      (|(val & TXD_T_CODE))
 #define GET_TXD_T_CODE(val)     ((val & TXD_T_CODE)<<12)
-#define TXD_GATHER_CODE         (BIT(22) | BIT(23))
-#define TXD_GATHER_CODE_FIRST   BIT(22)
-#define TXD_GATHER_CODE_LAST    BIT(23)
-#define TXD_TCP_LSO_EN          BIT(30)
-#define TXD_UDP_COF_EN          BIT(31)
-#define TXD_UFO_EN              BIT(31) | BIT(30)
+#define TXD_GATHER_CODE         (s2BIT(22) | s2BIT(23))
+#define TXD_GATHER_CODE_FIRST   s2BIT(22)
+#define TXD_GATHER_CODE_LAST    s2BIT(23)
+#define TXD_TCP_LSO_EN          s2BIT(30)
+#define TXD_UDP_COF_EN          s2BIT(31)
+#define TXD_UFO_EN              s2BIT(31) | s2BIT(30)
 #define TXD_TCP_LSO_MSS(val)    vBIT(val,34,14)
 #define TXD_UFO_MSS(val)        vBIT(val,34,14)
 #define TXD_BUFFER0_SIZE(val)   vBIT(val,48,16)
 
         u64 Control_2;
-#define TXD_TX_CKO_CONTROL      (BIT(5)|BIT(6)|BIT(7))
-#define TXD_TX_CKO_IPV4_EN      BIT(5)
-#define TXD_TX_CKO_TCP_EN       BIT(6)
-#define TXD_TX_CKO_UDP_EN       BIT(7)
-#define TXD_VLAN_ENABLE         BIT(15)
+#define TXD_TX_CKO_CONTROL      (s2BIT(5)|s2BIT(6)|s2BIT(7))
+#define TXD_TX_CKO_IPV4_EN      s2BIT(5)
+#define TXD_TX_CKO_TCP_EN       s2BIT(6)
+#define TXD_TX_CKO_UDP_EN       s2BIT(7)
+#define TXD_VLAN_ENABLE         s2BIT(15)
 #define TXD_VLAN_TAG(val)       vBIT(val,16,16)
 #define TXD_INT_NUMBER(val)     vBIT(val,34,6)
-#define TXD_INT_TYPE_PER_LIST   BIT(47)
-#define TXD_INT_TYPE_UTILZ      BIT(46)
+#define TXD_INT_TYPE_PER_LIST   s2BIT(47)
+#define TXD_INT_TYPE_UTILZ      s2BIT(46)
 #define TXD_SET_MARKER         vBIT(0x6,0,4)
 
         u64 Buffer_Pointer;
@@ -525,14 +525,14 @@ struct list_info_hold {
 struct RxD_t {
         u64 Host_Control;       /* reserved for host */
         u64 Control_1;
-#define RXD_OWN_XENA            BIT(7)
-#define RXD_T_CODE              (BIT(12)|BIT(13)|BIT(14)|BIT(15))
+#define RXD_OWN_XENA            s2BIT(7)
+#define RXD_T_CODE              (s2BIT(12)|s2BIT(13)|s2BIT(14)|s2BIT(15))
 #define RXD_FRAME_PROTO         vBIT(0xFFFF,24,8)
-#define RXD_FRAME_PROTO_IPV4    BIT(27)
-#define RXD_FRAME_PROTO_IPV6    BIT(28)
-#define RXD_FRAME_IP_FRAG       BIT(29)
-#define RXD_FRAME_PROTO_TCP     BIT(30)
-#define RXD_FRAME_PROTO_UDP     BIT(31)
+#define RXD_FRAME_PROTO_IPV4    s2BIT(27)
+#define RXD_FRAME_PROTO_IPV6    s2BIT(28)
+#define RXD_FRAME_IP_FRAG       s2BIT(29)
+#define RXD_FRAME_PROTO_TCP     s2BIT(30)
+#define RXD_FRAME_PROTO_UDP     s2BIT(31)
 #define TCP_OR_UDP_FRAME        (RXD_FRAME_PROTO_TCP | RXD_FRAME_PROTO_UDP)
 #define RXD_GET_L3_CKSUM(val)   ((u16)(val>> 16) & 0xFFFF)
 #define RXD_GET_L4_CKSUM(val)   ((u16)(val) & 0xFFFF)
@@ -998,26 +998,26 @@ static inline void SPECIAL_REG_WRITE(u64 val, void __iomem *addr, int order)
 /*  Interrupt masks for the general interrupt mask register */
 #define DISABLE_ALL_INTRS   0xFFFFFFFFFFFFFFFFULL
 
-#define TXPIC_INT_M         BIT(0)
-#define TXDMA_INT_M         BIT(1)
-#define TXMAC_INT_M         BIT(2)
-#define TXXGXS_INT_M        BIT(3)
-#define TXTRAFFIC_INT_M     BIT(8)
-#define PIC_RX_INT_M        BIT(32)
-#define RXDMA_INT_M         BIT(33)
-#define RXMAC_INT_M         BIT(34)
-#define MC_INT_M            BIT(35)
-#define RXXGXS_INT_M        BIT(36)
-#define RXTRAFFIC_INT_M     BIT(40)
+#define TXPIC_INT_M         s2BIT(0)
+#define TXDMA_INT_M         s2BIT(1)
+#define TXMAC_INT_M         s2BIT(2)
+#define TXXGXS_INT_M        s2BIT(3)
+#define TXTRAFFIC_INT_M     s2BIT(8)
+#define PIC_RX_INT_M        s2BIT(32)
+#define RXDMA_INT_M         s2BIT(33)
+#define RXMAC_INT_M         s2BIT(34)
+#define MC_INT_M            s2BIT(35)
+#define RXXGXS_INT_M        s2BIT(36)
+#define RXTRAFFIC_INT_M     s2BIT(40)
 
 /*  PIC level Interrupts TODO*/
 
 /*  DMA level Inressupts */
-#define TXDMA_PFC_INT_M     BIT(0)
-#define TXDMA_PCC_INT_M     BIT(2)
+#define TXDMA_PFC_INT_M     s2BIT(0)
+#define TXDMA_PCC_INT_M     s2BIT(2)
 
 /*  PFC block interrupts */
-#define PFC_MISC_ERR_1      BIT(0)      /* Interrupt to indicate FIFO full */
+#define PFC_MISC_ERR_1      s2BIT(0)    /* Interrupt to indicate FIFO full */
 
 /* PCC block interrupts. */
 #define PCC_FB_ECC_ERR     vBIT(0xff, 16, 8)    /* Interrupt to indicate
diff --git a/drivers/net/spider_net.c b/drivers/net/spider_net.c
index fab055ffcc90..571060a3c91e 100644
--- a/drivers/net/spider_net.c
+++ b/drivers/net/spider_net.c
@@ -46,7 +46,7 @@
 #include <linux/vmalloc.h>
 #include <linux/wait.h>
 #include <linux/workqueue.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include <asm/pci-bridge.h>
 #include <net/checksum.h>
 
diff --git a/drivers/net/tulip/uli526x.c b/drivers/net/tulip/uli526x.c
index 76e55612430b..a7afeea156bd 100644
--- a/drivers/net/tulip/uli526x.c
+++ b/drivers/net/tulip/uli526x.c
@@ -34,9 +34,9 @@
 #include <linux/delay.h>
 #include <linux/spinlock.h>
 #include <linux/dma-mapping.h>
+#include <linux/bitops.h>
 
 #include <asm/processor.h>
-#include <asm/bitops.h>
 #include <asm/io.h>
 #include <asm/dma.h>
 #include <asm/uaccess.h>
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_leds.c b/drivers/net/wireless/bcm43xx/bcm43xx_leds.c
index 8f198befba39..cb51dc51cce6 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx_leds.c
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_leds.c
@@ -29,7 +29,7 @@
 #include "bcm43xx_radio.h"
 #include "bcm43xx.h"
 
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 
 
 static void bcm43xx_led_changestate(struct bcm43xx_led *led)
diff --git a/drivers/net/wireless/hostap/hostap_common.h b/drivers/net/wireless/hostap/hostap_common.h
index ceb7f1e5e9e0..517f89845144 100644
--- a/drivers/net/wireless/hostap/hostap_common.h
+++ b/drivers/net/wireless/hostap/hostap_common.h
@@ -4,9 +4,6 @@
 #include <linux/types.h>
 #include <linux/if_ether.h>
 
-#define BIT(x) (1 << (x))
-
-
 /* IEEE 802.11 defines */
 
 /* Information Element IDs */
diff --git a/drivers/net/wireless/hostap/hostap_ioctl.c b/drivers/net/wireless/hostap/hostap_ioctl.c
index 40f516d42c5e..d8f5efcfcab9 100644
--- a/drivers/net/wireless/hostap/hostap_ioctl.c
+++ b/drivers/net/wireless/hostap/hostap_ioctl.c
@@ -2920,7 +2920,7 @@ static int prism2_ioctl_priv_monitor(struct net_device *dev, int *i)
 
         printk(KERN_DEBUG "%s: process %d (%s) used deprecated iwpriv monitor "
                "- update software to use iwconfig mode monitor\n",
-               dev->name, current->pid, current->comm);
+               dev->name, task_pid_nr(current), current->comm);
 
         /* Backward compatibility code - this can be removed at some point */
 
diff --git a/drivers/net/wireless/ipw2100.c b/drivers/net/wireless/ipw2100.c
index 2fa8eed86dc1..7a7797560a23 100644
--- a/drivers/net/wireless/ipw2100.c
+++ b/drivers/net/wireless/ipw2100.c
@@ -1858,14 +1858,6 @@ static void ipw2100_down(struct ipw2100_priv *priv)
 
         modify_acceptable_latency("ipw2100", INFINITE_LATENCY);
 
-#ifdef ACPI_CSTATE_LIMIT_DEFINED
-        if (priv->config & CFG_C3_DISABLED) {
-                IPW_DEBUG_INFO(": Resetting C3 transitions.\n");
-                acpi_set_cstate_limit(priv->cstate_limit);
-                priv->config &= ~CFG_C3_DISABLED;
-        }
-#endif
-
         /* We have to signal any supplicant if we are disassociating */
         if (associated)
                 wireless_send_event(priv->net_dev, SIOCGIWAP, &wrqu, NULL);
@@ -2091,14 +2083,6 @@ static void isr_indicate_rf_kill(struct ipw2100_priv *priv, u32 status)
         /* RF_KILL is now enabled (else we wouldn't be here) */
         priv->status |= STATUS_RF_KILL_HW;
 
-#ifdef ACPI_CSTATE_LIMIT_DEFINED
-        if (priv->config & CFG_C3_DISABLED) {
-                IPW_DEBUG_INFO(": Resetting C3 transitions.\n");
-                acpi_set_cstate_limit(priv->cstate_limit);
-                priv->config &= ~CFG_C3_DISABLED;
-        }
-#endif
-
         /* Make sure the RF Kill check timer is running */
         priv->stop_rf_kill = 0;
         cancel_delayed_work(&priv->rf_kill);
@@ -2363,23 +2347,10 @@ static void ipw2100_corruption_detected(struct ipw2100_priv *priv, int i)
         u32 match, reg;
         int j;
 #endif
-#ifdef ACPI_CSTATE_LIMIT_DEFINED
-        int limit;
-#endif
 
         IPW_DEBUG_INFO(": PCI latency error detected at 0x%04zX.\n",
                        i * sizeof(struct ipw2100_status));
 
-#ifdef ACPI_CSTATE_LIMIT_DEFINED
-        IPW_DEBUG_INFO(": Disabling C3 transitions.\n");
-        limit = acpi_get_cstate_limit();
-        if (limit > 2) {
-                priv->cstate_limit = limit;
-                acpi_set_cstate_limit(2);
-                priv->config |= CFG_C3_DISABLED;
-        }
-#endif
-
 #ifdef IPW2100_DEBUG_C3
         /* Halt the fimrware so we can get a good image */
         write_register(priv->net_dev, IPW_REG_RESET_REG,
diff --git a/drivers/net/wireless/ipw2100.h b/drivers/net/wireless/ipw2100.h
index 1ee3348aedd9..bbf1ddcafba8 100644
--- a/drivers/net/wireless/ipw2100.h
+++ b/drivers/net/wireless/ipw2100.h
@@ -479,7 +479,6 @@ enum {
 #define CFG_ASSOCIATE           (1<<6)
 #define CFG_FIXED_RATE          (1<<7)
 #define CFG_ADHOC_CREATE        (1<<8)
-#define CFG_C3_DISABLED         (1<<9)
 #define CFG_PASSIVE_SCAN        (1<<10)
 #ifdef CONFIG_IPW2100_MONITOR
 #define CFG_CRC_CHECK           (1<<11)
@@ -508,7 +507,6 @@ struct ipw2100_priv {
         u8 bssid[ETH_ALEN];
         u8 channel;
         int last_mode;
-        int cstate_limit;
 
         unsigned long connect_start;
         unsigned long last_reset;
diff --git a/drivers/pcmcia/m32r_pcc.c b/drivers/pcmcia/m32r_pcc.c
index 67d28ee80f22..c5e0d89c3ece 100644
--- a/drivers/pcmcia/m32r_pcc.c
+++ b/drivers/pcmcia/m32r_pcc.c
@@ -22,9 +22,9 @@
 #include <linux/workqueue.h>
 #include <linux/interrupt.h>
 #include <linux/platform_device.h>
+#include <linux/bitops.h>
 #include <asm/irq.h>
 #include <asm/io.h>
-#include <asm/bitops.h>
 #include <asm/system.h>
 #include <asm/addrspace.h>
 
diff --git a/drivers/pcmcia/m8xx_pcmcia.c b/drivers/pcmcia/m8xx_pcmcia.c
index b01985498460..d182760f035b 100644
--- a/drivers/pcmcia/m8xx_pcmcia.c
+++ b/drivers/pcmcia/m8xx_pcmcia.c
@@ -48,9 +48,9 @@
 #include <linux/delay.h>
 #include <linux/interrupt.h>
 #include <linux/fsl_devices.h>
+#include <linux/bitops.h>
 
 #include <asm/io.h>
-#include <asm/bitops.h>
 #include <asm/system.h>
 #include <asm/time.h>
 #include <asm/mpc8xx.h>
diff --git a/drivers/ps3/ps3av.c b/drivers/ps3/ps3av.c
index 397f4ce849dc..87b3493d88e5 100644
--- a/drivers/ps3/ps3av.c
+++ b/drivers/ps3/ps3av.c
@@ -729,7 +729,7 @@ static void ps3av_monitor_info_dump(const struct ps3av_pkt_av_get_monitor_info *
 
 static const struct ps3av_monitor_quirk {
         const char *monitor_name;
-        u32 clear_60, clear_50, clear_vesa;
+        u32 clear_60;
 } ps3av_monitor_quirks[] = {
         {
                 .monitor_name   = "DELL 2007WFP",
@@ -757,10 +757,6 @@ static void ps3av_fixup_monitor_info(struct ps3av_info_monitor *info)
                                 quirk->monitor_name);
                         info->res_60.res_bits &= ~quirk->clear_60;
                         info->res_60.native &= ~quirk->clear_60;
-                        info->res_50.res_bits &= ~quirk->clear_50;
-                        info->res_50.native &= ~quirk->clear_50;
-                        info->res_vesa.res_bits &= ~quirk->clear_vesa;
-                        info->res_vesa.native &= ~quirk->clear_vesa;
                         break;
                 }
         }
diff --git a/drivers/ps3/vuart.c b/drivers/ps3/vuart.c
index bea25a1391ee..9dea585ef806 100644
--- a/drivers/ps3/vuart.c
+++ b/drivers/ps3/vuart.c
@@ -22,11 +22,11 @@
 #include <linux/module.h>
 #include <linux/interrupt.h>
 #include <linux/workqueue.h>
+#include <linux/bitops.h>
 #include <asm/ps3.h>
 
 #include <asm/firmware.h>
 #include <asm/lv1call.h>
-#include <asm/bitops.h>
 
 #include "vuart.h"
 
diff --git a/drivers/rtc/rtc-pl031.c b/drivers/rtc/rtc-pl031.c
index e4bf68ca96f7..2fd49edcc712 100644
--- a/drivers/rtc/rtc-pl031.c
+++ b/drivers/rtc/rtc-pl031.c
@@ -21,11 +21,11 @@
 #include <linux/interrupt.h>
 #include <linux/string.h>
 #include <linux/pm.h>
+#include <linux/bitops.h>
 
 #include <linux/amba/bus.h>
 
 #include <asm/io.h>
-#include <asm/bitops.h>
 #include <asm/hardware.h>
 #include <asm/irq.h>
 #include <asm/rtc.h>
diff --git a/drivers/rtc/rtc-sa1100.c b/drivers/rtc/rtc-sa1100.c
index 0918b787c4dd..6f1e9a9804bc 100644
--- a/drivers/rtc/rtc-sa1100.c
+++ b/drivers/rtc/rtc-sa1100.c
@@ -29,8 +29,8 @@
 #include <linux/interrupt.h>
 #include <linux/string.h>
 #include <linux/pm.h>
+#include <linux/bitops.h>
 
-#include <asm/bitops.h>
 #include <asm/hardware.h>
 #include <asm/irq.h>
 #include <asm/rtc.h>
diff --git a/drivers/s390/cio/idset.c b/drivers/s390/cio/idset.c
index 16ea828e99f7..ef7bc0a125ef 100644
--- a/drivers/s390/cio/idset.c
+++ b/drivers/s390/cio/idset.c
@@ -6,7 +6,7 @@
  */
 
 #include <linux/slab.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include "idset.h"
 #include "css.h"
 
diff --git a/drivers/s390/net/claw.c b/drivers/s390/net/claw.c
index 399695f7b1af..3561982749e3 100644
--- a/drivers/s390/net/claw.c
+++ b/drivers/s390/net/claw.c
@@ -59,13 +59,13 @@
  *    1.15  Changed for 2.6 Kernel  No longer compiles on 2.4 or lower
  *    1.25  Added Packing support
  */
-#include <asm/bitops.h>
 #include <asm/ccwdev.h>
 #include <asm/ccwgroup.h>
 #include <asm/debug.h>
 #include <asm/idals.h>
 #include <asm/io.h>
 
+#include <linux/bitops.h>
 #include <linux/ctype.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/drivers/scsi/FlashPoint.c b/drivers/scsi/FlashPoint.c
index a7f916c0c9cd..1c9078191d9e 100644
--- a/drivers/scsi/FlashPoint.c
+++ b/drivers/scsi/FlashPoint.c
@@ -25,9 +25,6 @@
 
 #define FAILURE         0xFFFFFFFFL
 
-#define BIT(x)          ((unsigned char)(1<<(x)))       /* single-bit mask in bit position x */
-#define BITW(x)          ((unsigned short)(1<<(x)))     /* single-bit mask in bit position x */
-
 struct sccb;
 typedef void (*CALL_BK_FN) (struct sccb *);
 
@@ -374,9 +371,9 @@ typedef struct SCCBscam_info {
 #define  SCAM_ENABLED   BIT(2)
 #define  SCAM_LEVEL2    BIT(3)
 
-#define RENEGO_ENA              BITW(10)
-#define CONNIO_ENA              BITW(11)
-#define  GREEN_PC_ENA   BITW(12)
+#define RENEGO_ENA              BIT(10)
+#define CONNIO_ENA              BIT(11)
+#define  GREEN_PC_ENA   BIT(12)
 
 #define  AUTO_RATE_00   00
 #define  AUTO_RATE_05   01
@@ -511,23 +508,23 @@ typedef struct SCCBscam_info {
 
 #define  hp_intena               0x40
 
-#define  RESET           BITW(7)
-#define  PROG_HLT                BITW(6)
-#define  PARITY          BITW(5)
-#define  FIFO            BITW(4)
-#define  SEL             BITW(3)
-#define  SCAM_SEL                BITW(2)
-#define  RSEL            BITW(1)
-#define  TIMEOUT                 BITW(0)
-#define  BUS_FREE                BITW(15)
-#define  XFER_CNT_0      BITW(14)
-#define  PHASE           BITW(13)
-#define  IUNKWN          BITW(12)
-#define  ICMD_COMP       BITW(11)
-#define  ITICKLE                 BITW(10)
-#define  IDO_STRT                BITW(9)
-#define  ITAR_DISC       BITW(8)
-#define  AUTO_INT                (BITW(12)+BITW(11)+BITW(10)+BITW(9)+BITW(8))
+#define  RESET           BIT(7)
+#define  PROG_HLT                BIT(6)
+#define  PARITY          BIT(5)
+#define  FIFO            BIT(4)
+#define  SEL             BIT(3)
+#define  SCAM_SEL                BIT(2)
+#define  RSEL            BIT(1)
+#define  TIMEOUT                 BIT(0)
+#define  BUS_FREE                BIT(15)
+#define  XFER_CNT_0      BIT(14)
+#define  PHASE           BIT(13)
+#define  IUNKWN          BIT(12)
+#define  ICMD_COMP       BIT(11)
+#define  ITICKLE                 BIT(10)
+#define  IDO_STRT                BIT(9)
+#define  ITAR_DISC       BIT(8)
+#define  AUTO_INT                (BIT(12)+BIT(11)+BIT(10)+BIT(9)+BIT(8))
 #define  CLR_ALL_INT     0xFFFF
 #define  CLR_ALL_INT_1   0xFF00
 
@@ -674,37 +671,37 @@ typedef struct SCCBscam_info {
 #define  BIOS_DATA_OFFSET     0x60
 #define  BIOS_RELATIVE_CARD   0x64
 
-#define  AR3      (BITW(9) + BITW(8))
-#define  SDATA    BITW(10)
+#define  AR3      (BIT(9) + BIT(8))
+#define  SDATA    BIT(10)
 
-#define  CRD_OP   BITW(11)      /* Cmp Reg. w/ Data */
+#define  CRD_OP   BIT(11)       /* Cmp Reg. w/ Data */
 
-#define  CRR_OP   BITW(12)      /* Cmp Reg. w. Reg. */
+#define  CRR_OP   BIT(12)       /* Cmp Reg. w. Reg. */
 
-#define  CPE_OP   (BITW(14)+BITW(11))   /* Cmp SCSI phs & Branch EQ */
+#define  CPE_OP   (BIT(14)+BIT(11))     /* Cmp SCSI phs & Branch EQ */
 
-#define  CPN_OP   (BITW(14)+BITW(12))   /* Cmp SCSI phs & Branch NOT EQ */
+#define  CPN_OP   (BIT(14)+BIT(12))     /* Cmp SCSI phs & Branch NOT EQ */
 
 #define  ADATA_OUT   0x00
-#define  ADATA_IN    BITW(8)
-#define  ACOMMAND    BITW(10)
-#define  ASTATUS     (BITW(10)+BITW(8))
-#define  AMSG_OUT    (BITW(10)+BITW(9))
-#define  AMSG_IN     (BITW(10)+BITW(9)+BITW(8))
+#define  ADATA_IN    BIT(8)
+#define  ACOMMAND    BIT(10)
+#define  ASTATUS     (BIT(10)+BIT(8))
+#define  AMSG_OUT    (BIT(10)+BIT(9))
+#define  AMSG_IN     (BIT(10)+BIT(9)+BIT(8))
 
-#define  BRH_OP   BITW(13)      /* Branch */
+#define  BRH_OP   BIT(13)       /* Branch */
 
 #define  ALWAYS   0x00
-#define  EQUAL    BITW(8)
-#define  NOT_EQ   BITW(9)
+#define  EQUAL    BIT(8)
+#define  NOT_EQ   BIT(9)
 
-#define  TCB_OP   (BITW(13)+BITW(11))   /* Test condition & branch */
+#define  TCB_OP   (BIT(13)+BIT(11))     /* Test condition & branch */
 
-#define  FIFO_0      BITW(10)
+#define  FIFO_0      BIT(10)
 
-#define  MPM_OP   BITW(15)      /* Match phase and move data */
+#define  MPM_OP   BIT(15)       /* Match phase and move data */
 
-#define  MRR_OP   BITW(14)      /* Move DReg. to Reg. */
+#define  MRR_OP   BIT(14)       /* Move DReg. to Reg. */
 
 #define  S_IDREG  (BIT(2)+BIT(1)+BIT(0))
 
@@ -712,9 +709,9 @@ typedef struct SCCBscam_info {
 #define  D_AR1    BIT(0)
 #define  D_BUCKET (BIT(2) + BIT(1) + BIT(0))
 
-#define  RAT_OP      (BITW(14)+BITW(13)+BITW(11))
+#define  RAT_OP      (BIT(14)+BIT(13)+BIT(11))
 
-#define  SSI_OP      (BITW(15)+BITW(11))
+#define  SSI_OP      (BIT(15)+BIT(11))
 
 #define  SSI_ITAR_DISC  (ITAR_DISC >> 8)
 #define  SSI_IDO_STRT   (IDO_STRT >> 8)
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index 30905cebefbb..a5763c6e9362 100644
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -521,7 +521,7 @@ config SCSI_DPT_I2O
 
 config SCSI_ADVANSYS
         tristate "AdvanSys SCSI support"
-        depends on SCSI
+        depends on SCSI && VIRT_TO_BUS
         depends on ISA || EISA || PCI
         help
           This is a driver for all SCSI host adapters manufactured by
diff --git a/drivers/scsi/ide-scsi.c b/drivers/scsi/ide-scsi.c
index fa7ba64483fb..252d1806467f 100644
--- a/drivers/scsi/ide-scsi.c
+++ b/drivers/scsi/ide-scsi.c
@@ -47,9 +47,9 @@
 #include <linux/scatterlist.h>
 #include <linux/delay.h>
 #include <linux/mutex.h>
+#include <linux/bitops.h>
 
 #include <asm/io.h>
-#include <asm/bitops.h>
 #include <asm/uaccess.h>
 
 #include <scsi/scsi.h>
diff --git a/drivers/scsi/libsas/sas_discover.c b/drivers/scsi/libsas/sas_discover.c
index 7ef0afc3cd68..5f3a0d7b18de 100644
--- a/drivers/scsi/libsas/sas_discover.c
+++ b/drivers/scsi/libsas/sas_discover.c
@@ -285,7 +285,7 @@ static void sas_discover_domain(struct work_struct *work)
         dev = port->port_dev;
 
         SAS_DPRINTK("DOING DISCOVERY on port %d, pid:%d\n", port->id,
-                    current->pid);
+                    task_pid_nr(current));
 
         switch (dev->dev_type) {
         case SAS_END_DEV:
@@ -320,7 +320,7 @@ static void sas_discover_domain(struct work_struct *work)
         }
 
         SAS_DPRINTK("DONE DISCOVERY on port %d, pid:%d, result:%d\n", port->id,
-                    current->pid, error);
+                    task_pid_nr(current), error);
 }
 
 static void sas_revalidate_domain(struct work_struct *work)
@@ -334,12 +334,12 @@ static void sas_revalidate_domain(struct work_struct *work)
                         &port->disc.pending);
 
         SAS_DPRINTK("REVALIDATING DOMAIN on port %d, pid:%d\n", port->id,
-                    current->pid);
+                    task_pid_nr(current));
         if (port->port_dev)
                 res = sas_ex_revalidate_domain(port->port_dev);
 
         SAS_DPRINTK("done REVALIDATING DOMAIN on port %d, pid:%d, res 0x%x\n",
-                    port->id, current->pid, res);
+                    port->id, task_pid_nr(current), res);
 }
 
 /* ---------- Events ---------- */
diff --git a/drivers/scsi/nsp32.h b/drivers/scsi/nsp32.h
index a976e8193d16..6715ecb3bfca 100644
--- a/drivers/scsi/nsp32.h
+++ b/drivers/scsi/nsp32.h
@@ -69,11 +69,6 @@ typedef u32 u32_le;
 typedef u16 u16_le;
 
 /*
- * MACRO
- */
-#define BIT(x)      (1UL << (x))
-
-/*
  * BASIC Definitions
  */
 #ifndef TRUE
diff --git a/drivers/scsi/pcmcia/nsp_cs.h b/drivers/scsi/pcmcia/nsp_cs.h
index b7f0fa246413..98397559c53b 100644
--- a/drivers/scsi/pcmcia/nsp_cs.h
+++ b/drivers/scsi/pcmcia/nsp_cs.h
@@ -24,7 +24,6 @@
 /************************************
  * Some useful macros...
  */
-#define BIT(x)      (1L << (x))
 
 /* SCSI initiator must be ID 7 */
 #define NSP_INITIATOR_ID  7
diff --git a/drivers/scsi/qla4xxx/ql4_fw.h b/drivers/scsi/qla4xxx/ql4_fw.h
index 9bb3d1d2a925..fe415ec85655 100644
--- a/drivers/scsi/qla4xxx/ql4_fw.h
+++ b/drivers/scsi/qla4xxx/ql4_fw.h
@@ -671,7 +671,7 @@ struct continuation_t1_entry {
 #define ET_CONTINUE     ET_CONT_T1
 
 /* Marker entry structure*/
-struct marker_entry {
+struct qla4_marker_entry {
         struct qla4_header hdr; /* 00-03 */
 
         uint32_t system_defined; /* 04-07 */
diff --git a/drivers/scsi/qla4xxx/ql4_iocb.c b/drivers/scsi/qla4xxx/ql4_iocb.c
index 5006ecb3ef5e..e4461b5d767a 100644
--- a/drivers/scsi/qla4xxx/ql4_iocb.c
+++ b/drivers/scsi/qla4xxx/ql4_iocb.c
@@ -69,7 +69,7 @@ static int qla4xxx_get_req_pkt(struct scsi_qla_host *ha,
 static int qla4xxx_send_marker_iocb(struct scsi_qla_host *ha,
                                     struct ddb_entry *ddb_entry, int lun)
 {
-        struct marker_entry *marker_entry;
+        struct qla4_marker_entry *marker_entry;
         unsigned long flags = 0;
         uint8_t status = QLA_SUCCESS;
 
diff --git a/drivers/serial/amba-pl011.c b/drivers/serial/amba-pl011.c
index 72229df9dc11..40604a092921 100644
--- a/drivers/serial/amba-pl011.c
+++ b/drivers/serial/amba-pl011.c
@@ -263,15 +263,15 @@ static unsigned int pl01x_get_mctrl(struct uart_port *port)
         unsigned int result = 0;
         unsigned int status = readw(uap->port.membase + UART01x_FR);
 
-#define BIT(uartbit, tiocmbit)          \
+#define TIOCMBIT(uartbit, tiocmbit)     \
         if (status & uartbit)           \
                 result |= tiocmbit
 
-        BIT(UART01x_FR_DCD, TIOCM_CAR);
-        BIT(UART01x_FR_DSR, TIOCM_DSR);
-        BIT(UART01x_FR_CTS, TIOCM_CTS);
-        BIT(UART011_FR_RI, TIOCM_RNG);
-#undef BIT
+        TIOCMBIT(UART01x_FR_DCD, TIOCM_CAR);
+        TIOCMBIT(UART01x_FR_DSR, TIOCM_DSR);
+        TIOCMBIT(UART01x_FR_CTS, TIOCM_CTS);
+        TIOCMBIT(UART011_FR_RI, TIOCM_RNG);
+#undef TIOCMBIT
         return result;
 }
 
@@ -282,18 +282,18 @@ static void pl011_set_mctrl(struct uart_port *port, unsigned int mctrl)
 
         cr = readw(uap->port.membase + UART011_CR);
 
-#define BIT(tiocmbit, uartbit)          \
+#define TIOCMBIT(tiocmbit, uartbit)             \
         if (mctrl & tiocmbit)           \
                 cr |= uartbit;          \
         else                            \
                 cr &= ~uartbit
 
-        BIT(TIOCM_RTS, UART011_CR_RTS);
-        BIT(TIOCM_DTR, UART011_CR_DTR);
-        BIT(TIOCM_OUT1, UART011_CR_OUT1);
-        BIT(TIOCM_OUT2, UART011_CR_OUT2);
-        BIT(TIOCM_LOOP, UART011_CR_LBE);
-#undef BIT
+        TIOCMBIT(TIOCM_RTS, UART011_CR_RTS);
+        TIOCMBIT(TIOCM_DTR, UART011_CR_DTR);
+        TIOCMBIT(TIOCM_OUT1, UART011_CR_OUT1);
+        TIOCMBIT(TIOCM_OUT2, UART011_CR_OUT2);
+        TIOCMBIT(TIOCM_LOOP, UART011_CR_LBE);
+#undef TIOCMBIT
 
         writew(cr, uap->port.membase + UART011_CR);
 }
diff --git a/drivers/serial/crisv10.c b/drivers/serial/crisv10.c
index 7e8724d3571f..f523cdf4b02b 100644
--- a/drivers/serial/crisv10.c
+++ b/drivers/serial/crisv10.c
@@ -442,11 +442,11 @@ static char *serial_version = "$Revision: 1.25 $";
 #include <asm/uaccess.h>
 #include <linux/kernel.h>
 #include <linux/mutex.h>
+#include <linux/bitops.h>
 
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/system.h>
-#include <asm/bitops.h>
 #include <linux/delay.h>
 
 #include <asm/arch/svinto.h>
diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c
index f013b4012c9a..1f4f6d02fe25 100644
--- a/drivers/usb/core/devio.c
+++ b/drivers/usb/core/devio.c
@@ -460,7 +460,7 @@ static int checkintf(struct dev_state *ps, unsigned int ifnum)
                 return 0;
         /* if not yet claimed, claim it for the driver */
         dev_warn(&ps->dev->dev, "usbfs: process %d (%s) did not claim interface %u before use\n",
-               current->pid, current->comm, ifnum);
+               task_pid_nr(current), current->comm, ifnum);
         return claimintf(ps, ifnum);
 }
 
diff --git a/drivers/usb/gadget/file_storage.c b/drivers/usb/gadget/file_storage.c
index 73726c570a6e..1d174dcb3ac9 100644
--- a/drivers/usb/gadget/file_storage.c
+++ b/drivers/usb/gadget/file_storage.c
@@ -4006,7 +4006,7 @@ static int __init fsg_bind(struct usb_gadget *gadget)
         DBG(fsg, "removable=%d, stall=%d, buflen=%u\n",
                         mod_data.removable, mod_data.can_stall,
                         mod_data.buflen);
-        DBG(fsg, "I/O thread pid: %d\n", fsg->thread_task->pid);
+        DBG(fsg, "I/O thread pid: %d\n", task_pid_nr(fsg->thread_task));
 
         set_bit(REGISTERED, &fsg->atomic_bitflags);
 
diff --git a/drivers/video/cyber2000fb.c b/drivers/video/cyber2000fb.c
index 9bb2cbfe4a3d..5fb8675e0d6b 100644
--- a/drivers/video/cyber2000fb.c
+++ b/drivers/video/cyber2000fb.c
@@ -62,7 +62,7 @@ struct cfb_info {
         struct display_switch   *dispsw;
         struct display          *display;
         struct pci_dev          *dev;
-        unsigned char           __iomem *region;
+        unsigned char           __iomem *region;
         unsigned char           __iomem *regs;
         u_int                   id;
         int                     func_use_count;
@@ -97,11 +97,11 @@ MODULE_PARM_DESC(default_font, "Default font name");
 /*
  * Our access methods.
  */
-#define cyber2000fb_writel(val,reg,cfb) writel(val, (cfb)->regs + (reg))
-#define cyber2000fb_writew(val,reg,cfb) writew(val, (cfb)->regs + (reg))
-#define cyber2000fb_writeb(val,reg,cfb) writeb(val, (cfb)->regs + (reg))
+#define cyber2000fb_writel(val, reg, cfb)       writel(val, (cfb)->regs + (reg))
+#define cyber2000fb_writew(val, reg, cfb)       writew(val, (cfb)->regs + (reg))
+#define cyber2000fb_writeb(val, reg, cfb)       writeb(val, (cfb)->regs + (reg))
 
-#define cyber2000fb_readb(reg,cfb)      readb((cfb)->regs + (reg))
+#define cyber2000fb_readb(reg, cfb)             readb((cfb)->regs + (reg))
 
 static inline void
 cyber2000_crtcw(unsigned int reg, unsigned int val, struct cfb_info *cfb)
@@ -221,12 +221,8 @@ cyber2000fb_copyarea(struct fb_info *info, const struct fb_copyarea *region)
 static void
 cyber2000fb_imageblit(struct fb_info *info, const struct fb_image *image)
 {
-//      struct cfb_info *cfb = (struct cfb_info *)info;
-
-//      if (!(cfb->fb.var.accel_flags & FB_ACCELF_TEXT)) {
-                cfb_imageblit(info, image);
-                return;
-//      }
+        cfb_imageblit(info, image);
+        return;
 }
 
 static int cyber2000fb_sync(struct fb_info *info)
@@ -277,12 +273,12 @@ cyber2000fb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
 
         /*
          * Pseudocolour:
-         *         8     8
+         *         8     8
          * pixel --/--+--/-->  red lut  --> red dac
-         *            |  8
-         *            +--/--> green lut --> green dac
-         *            |  8
-         *            +--/-->  blue lut --> blue dac
+         *            |  8
+         *            +--/--> green lut --> green dac
+         *            |  8
+         *            +--/-->  blue lut --> blue dac
          */
         case FB_VISUAL_PSEUDOCOLOR:
                 if (regno >= NR_PALETTE)
@@ -292,9 +288,9 @@ cyber2000fb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
                 green >>= 8;
                 blue >>= 8;
 
-                cfb->palette[regno].red   = red;
+                cfb->palette[regno].red = red;
                 cfb->palette[regno].green = green;
-                cfb->palette[regno].blue  = blue;
+                cfb->palette[regno].blue = blue;
 
                 cyber2000fb_writeb(regno, 0x3c8, cfb);
                 cyber2000fb_writeb(red, 0x3c9, cfb);
@@ -304,12 +300,12 @@ cyber2000fb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
 
         /*
          * Direct colour:
-         *          n     rl
-         *  pixel --/--+--/-->  red lut  --> red dac
-         *             |  gl
-         *             +--/--> green lut --> green dac
-         *             |  bl
-         *             +--/-->  blue lut --> blue dac
+         *         n     rl
+         * pixel --/--+--/-->  red lut  --> red dac
+         *            |  gl
+         *            +--/--> green lut --> green dac
+         *            |  bl
+         *            +--/-->  blue lut --> blue dac
          * n = bpp, rl = red length, gl = green length, bl = blue length
          */
         case FB_VISUAL_DIRECTCOLOR:
@@ -325,9 +321,11 @@ cyber2000fb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
                          * to the high 6 bits of the LUT.
                          */
                         cyber2000fb_writeb(regno << 2, 0x3c8, cfb);
-                        cyber2000fb_writeb(cfb->palette[regno >> 1].red, 0x3c9, cfb);
+                        cyber2000fb_writeb(cfb->palette[regno >> 1].red,
+                                           0x3c9, cfb);
                         cyber2000fb_writeb(green, 0x3c9, cfb);
-                        cyber2000fb_writeb(cfb->palette[regno >> 1].blue, 0x3c9, cfb);
+                        cyber2000fb_writeb(cfb->palette[regno >> 1].blue,
+                                           0x3c9, cfb);
 
                         green = cfb->palette[regno << 3].green;
 
@@ -335,9 +333,9 @@ cyber2000fb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
                 }
 
                 if (var->green.length >= 5 && regno < 32) {
-                        cfb->palette[regno << 3].red   = red;
+                        cfb->palette[regno << 3].red = red;
                         cfb->palette[regno << 3].green = green;
-                        cfb->palette[regno << 3].blue  = blue;
+                        cfb->palette[regno << 3].blue = blue;
 
                         /*
                          * The 5 bits of each colour component are
@@ -351,9 +349,9 @@ cyber2000fb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
                 }
 
                 if (var->green.length == 4 && regno < 16) {
-                        cfb->palette[regno << 4].red   = red;
+                        cfb->palette[regno << 4].red = red;
                         cfb->palette[regno << 4].green = green;
-                        cfb->palette[regno << 4].blue  = blue;
+                        cfb->palette[regno << 4].blue = blue;
 
                         /*
                          * The 5 bits of each colour component are
@@ -377,12 +375,12 @@ cyber2000fb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
 
         /*
          * True colour:
-         *          n     rl
-         *  pixel --/--+--/--> red dac
-         *             |  gl
-         *             +--/--> green dac
-         *             |  bl
-         *             +--/--> blue dac
+         *         n     rl
+         * pixel --/--+--/--> red dac
+         *            |  gl
+         *            +--/--> green dac
+         *            |  bl
+         *            +--/--> blue dac
          * n = bpp, rl = red length, gl = green length, bl = blue length
          */
         case FB_VISUAL_TRUECOLOR:
@@ -494,9 +492,9 @@ static void cyber2000fb_set_timing(struct cfb_info *cfb, struct par_info *hw)
 
         /* PLL registers */
         cyber2000_grphw(EXT_DCLK_MULT, hw->clock_mult, cfb);
-        cyber2000_grphw(EXT_DCLK_DIV,  hw->clock_div, cfb);
+        cyber2000_grphw(EXT_DCLK_DIV, hw->clock_div, cfb);
         cyber2000_grphw(EXT_MCLK_MULT, cfb->mclk_mult, cfb);
-        cyber2000_grphw(EXT_MCLK_DIV,  cfb->mclk_div, cfb);
+        cyber2000_grphw(EXT_MCLK_DIV, cfb->mclk_div, cfb);
         cyber2000_grphw(0x90, 0x01, cfb);
         cyber2000_grphw(0xb9, 0x80, cfb);
         cyber2000_grphw(0xb9, 0x00, cfb);
@@ -515,8 +513,8 @@ static void cyber2000fb_set_timing(struct cfb_info *cfb, struct par_info *hw)
         /*
          * Set up accelerator registers
          */
-        cyber2000fb_writew(hw->width,     CO_REG_SRC_WIDTH,  cfb);
-        cyber2000fb_writew(hw->width,     CO_REG_DEST_WIDTH, cfb);
+        cyber2000fb_writew(hw->width, CO_REG_SRC_WIDTH, cfb);
+        cyber2000fb_writew(hw->width, CO_REG_DEST_WIDTH, cfb);
         cyber2000fb_writeb(hw->co_pixfmt, CO_REG_PIXFMT, cfb);
 }
 
@@ -549,15 +547,15 @@ cyber2000fb_decode_crtc(struct par_info *hw, struct cfb_info *cfb,
 {
         u_int Htotal, Hblankend, Hsyncend;
         u_int Vtotal, Vdispend, Vblankstart, Vblankend, Vsyncstart, Vsyncend;
-#define BIT(v,b1,m,b2) (((v >> b1) & m) << b2)
+#define ENCODE_BIT(v, b1, m, b2) ((((v) >> (b1)) & (m)) << (b2))
 
         hw->crtc[13] = hw->pitch;
         hw->crtc[17] = 0xe3;
         hw->crtc[14] = 0;
         hw->crtc[8]  = 0;
 
-        Htotal      = var->xres + var->right_margin +
-                      var->hsync_len + var->left_margin;
+        Htotal     = var->xres + var->right_margin +
+                     var->hsync_len + var->left_margin;
 
         if (Htotal > 2080)
                 return -EINVAL;
@@ -567,15 +565,15 @@ cyber2000fb_decode_crtc(struct par_info *hw, struct cfb_info *cfb,
         hw->crtc[2] = var->xres >> 3;
         hw->crtc[4] = (var->xres + var->right_margin) >> 3;
 
-        Hblankend   = (Htotal - 4*8) >> 3;
+        Hblankend   = (Htotal - 4 * 8) >> 3;
 
-        hw->crtc[3] = BIT(Hblankend,  0, 0x1f,  0) |
-                      BIT(1,          0, 0x01,  7);
+        hw->crtc[3] = ENCODE_BIT(Hblankend,  0, 0x1f,  0) |
+                      ENCODE_BIT(1,          0, 0x01,  7);
 
         Hsyncend    = (var->xres + var->right_margin + var->hsync_len) >> 3;
 
-        hw->crtc[5] = BIT(Hsyncend,   0, 0x1f,  0) |
-                      BIT(Hblankend,  5, 0x01,  7);
+        hw->crtc[5] = ENCODE_BIT(Hsyncend,   0, 0x1f,  0) |
+                      ENCODE_BIT(Hblankend,  5, 0x01,  7);
 
         Vdispend    = var->yres - 1;
         Vsyncstart  = var->yres + var->lower_margin;
@@ -590,20 +588,20 @@ cyber2000fb_decode_crtc(struct par_info *hw, struct cfb_info *cfb,
         Vblankend   = Vtotal - 10;
 
         hw->crtc[6]  = Vtotal;
-        hw->crtc[7]  = BIT(Vtotal,     8, 0x01,  0) |
-                        BIT(Vdispend,   8, 0x01,  1) |
-                        BIT(Vsyncstart, 8, 0x01,  2) |
-                        BIT(Vblankstart,8, 0x01,  3) |
-                        BIT(1,          0, 0x01,  4) |
-                        BIT(Vtotal,     9, 0x01,  5) |
-                        BIT(Vdispend,   9, 0x01,  6) |
-                        BIT(Vsyncstart, 9, 0x01,  7);
-        hw->crtc[9]  = BIT(0,          0, 0x1f,  0) |
-                        BIT(Vblankstart,9, 0x01,  5) |
-                        BIT(1,          0, 0x01,  6);
+        hw->crtc[7]  = ENCODE_BIT(Vtotal,     8, 0x01,  0) |
+                        ENCODE_BIT(Vdispend,   8, 0x01,  1) |
+                        ENCODE_BIT(Vsyncstart, 8, 0x01,  2) |
+                        ENCODE_BIT(Vblankstart, 8, 0x01,  3) |
+                        ENCODE_BIT(1,          0, 0x01,  4) |
+                        ENCODE_BIT(Vtotal,     9, 0x01,  5) |
+                        ENCODE_BIT(Vdispend,   9, 0x01,  6) |
+                        ENCODE_BIT(Vsyncstart, 9, 0x01,  7);
+        hw->crtc[9]  = ENCODE_BIT(0,          0, 0x1f,  0) |
+                        ENCODE_BIT(Vblankstart, 9, 0x01,  5) |
+                        ENCODE_BIT(1,          0, 0x01,  6);
         hw->crtc[10] = Vsyncstart;
-        hw->crtc[11] = BIT(Vsyncend,   0, 0x0f,  0) |
-                       BIT(1,          0, 0x01,  7);
+        hw->crtc[11] = ENCODE_BIT(Vsyncend,   0, 0x0f,  0) |
+                       ENCODE_BIT(1,          0, 0x01,  7);
         hw->crtc[12] = Vdispend;
         hw->crtc[15] = Vblankstart;
         hw->crtc[16] = Vblankend;
@@ -615,10 +613,10 @@ cyber2000fb_decode_crtc(struct par_info *hw, struct cfb_info *cfb,
          * 4=LINECOMP:10 5-IVIDEO 6=FIXCNT
          */
         hw->crtc_ofl =
-                BIT(Vtotal,     10, 0x01,  0) |
-                BIT(Vdispend,   10, 0x01,  1) |
-                BIT(Vsyncstart, 10, 0x01,  2) |
-                BIT(Vblankstart,10, 0x01,  3) |
+                ENCODE_BIT(Vtotal, 10, 0x01, 0) |
+                ENCODE_BIT(Vdispend, 10, 0x01, 1) |
+                ENCODE_BIT(Vsyncstart, 10, 0x01, 2) |
+                ENCODE_BIT(Vblankstart, 10, 0x01, 3) |
                 EXT_CRT_VRTOFL_LINECOMP10;
 
         /* woody: set the interlaced bit... */
@@ -750,11 +748,11 @@ cyber2000fb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
         var->red.msb_right      = 0;
         var->green.msb_right    = 0;
         var->blue.msb_right     = 0;
+        var->transp.offset      = 0;
+        var->transp.length      = 0;
 
         switch (var->bits_per_pixel) {
         case 8: /* PSEUDOCOLOUR, 256 */
-                var->transp.offset      = 0;
-                var->transp.length      = 0;
                 var->red.offset         = 0;
                 var->red.length         = 8;
                 var->green.offset       = 0;
@@ -766,8 +764,6 @@ cyber2000fb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
         case 16:/* DIRECTCOLOUR, 64k or 32k */
                 switch (var->green.length) {
                 case 6: /* RGB565, 64k */
-                        var->transp.offset      = 0;
-                        var->transp.length      = 0;
                         var->red.offset         = 11;
                         var->red.length         = 5;
                         var->green.offset       = 5;
@@ -778,8 +774,6 @@ cyber2000fb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
 
                 default:
                 case 5: /* RGB555, 32k */
-                        var->transp.offset      = 0;
-                        var->transp.length      = 0;
                         var->red.offset         = 10;
                         var->red.length         = 5;
                         var->green.offset       = 5;
@@ -802,8 +796,6 @@ cyber2000fb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
                 break;
 
         case 24:/* TRUECOLOUR, 16m */
-                var->transp.offset      = 0;
-                var->transp.length      = 0;
                 var->red.offset         = 16;
                 var->red.length         = 8;
                 var->green.offset       = 8;
@@ -830,7 +822,7 @@ cyber2000fb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
         mem = var->xres_virtual * var->yres_virtual * (var->bits_per_pixel / 8);
         if (mem > cfb->fb.fix.smem_len)
                 var->yres_virtual = cfb->fb.fix.smem_len * 8 /
-                        (var->bits_per_pixel * var->xres_virtual);
+                                    (var->bits_per_pixel * var->xres_virtual);
 
         if (var->yres > var->yres_virtual)
                 var->yres = var->yres_virtual;
@@ -921,7 +913,7 @@ static int cyber2000fb_set_par(struct fb_info *info)
                 hw.fetch <<= 1;
         hw.fetch += 1;
 
-        cfb->fb.fix.line_length = var->xres_virtual * var->bits_per_pixel / 8;
+        cfb->fb.fix.line_length = var->xres_virtual * var->bits_per_pixel / 8;
 
         /*
          * Same here - if the size of the video mode exceeds the
@@ -952,7 +944,6 @@ static int cyber2000fb_set_par(struct fb_info *info)
         return 0;
 }
 
-
 /*
  *    Pan or Wrap the Display
  */
@@ -1002,15 +993,15 @@ static int cyber2000fb_blank(int blank, struct fb_info *info)
         switch (blank) {
         case FB_BLANK_POWERDOWN:        /* powerdown - both sync lines down */
                 sync = EXT_SYNC_CTL_VS_0 | EXT_SYNC_CTL_HS_0;
-                break;  
+                break;
         case FB_BLANK_HSYNC_SUSPEND:    /* hsync off */
                 sync = EXT_SYNC_CTL_VS_NORMAL | EXT_SYNC_CTL_HS_0;
-                break;  
+                break;
         case FB_BLANK_VSYNC_SUSPEND:    /* vsync off */
                 sync = EXT_SYNC_CTL_VS_0 | EXT_SYNC_CTL_HS_NORMAL;
                 break;
-        case FB_BLANK_NORMAL:           /* soft blank */
-        default: /* unblank */
+        case FB_BLANK_NORMAL:           /* soft blank */
+        default:                        /* unblank */
                 break;
         }
 
@@ -1018,7 +1009,8 @@ static int cyber2000fb_blank(int blank, struct fb_info *info)
 
         if (blank <= 1) {
                 /* turn on ramdacs */
-                cfb->ramdac_powerdown &= ~(RAMDAC_DACPWRDN | RAMDAC_BYPASS | RAMDAC_RAMPWRDN);
+                cfb->ramdac_powerdown &= ~(RAMDAC_DACPWRDN | RAMDAC_BYPASS |
+                                           RAMDAC_RAMPWRDN);
                 cyber2000fb_write_ramdac_ctrl(cfb);
         }
 
@@ -1043,7 +1035,8 @@ static int cyber2000fb_blank(int blank, struct fb_info *info)
 
         if (blank >= 2) {
                 /* turn off ramdacs */
-                cfb->ramdac_powerdown |= RAMDAC_DACPWRDN | RAMDAC_BYPASS | RAMDAC_RAMPWRDN;
+                cfb->ramdac_powerdown |= RAMDAC_DACPWRDN | RAMDAC_BYPASS |
+                                         RAMDAC_RAMPWRDN;
                 cyber2000fb_write_ramdac_ctrl(cfb);
         }
 
@@ -1068,7 +1061,7 @@ static struct fb_ops cyber2000fb_ops = {
  * of this driver.  It is here solely at the moment to support the other
  * CyberPro modules external to this driver.
  */
-static struct cfb_info          *int_cfb_info;
+static struct cfb_info *int_cfb_info;
 
 /*
  * Enable access to the extended registers
@@ -1085,6 +1078,7 @@ void cyber2000fb_enable_extregs(struct cfb_info *cfb)
                 cyber2000_grphw(EXT_FUNC_CTL, old, cfb);
         }
 }
+EXPORT_SYMBOL(cyber2000fb_enable_extregs);
 
 /*
  * Disable access to the extended registers
@@ -1104,11 +1098,13 @@ void cyber2000fb_disable_extregs(struct cfb_info *cfb)
         else
                 cfb->func_use_count -= 1;
 }
+EXPORT_SYMBOL(cyber2000fb_disable_extregs);
 
 void cyber2000fb_get_fb_var(struct cfb_info *cfb, struct fb_var_screeninfo *var)
 {
         memcpy(var, &cfb->fb.var, sizeof(struct fb_var_screeninfo));
 }
+EXPORT_SYMBOL(cyber2000fb_get_fb_var);
 
 /*
  * Attach a capture/tv driver to the core CyberX0X0 driver.
@@ -1122,13 +1118,15 @@ int cyber2000fb_attach(struct cyberpro_info *info, int idx)
                 info->fb_size         = int_cfb_info->fb.fix.smem_len;
                 info->enable_extregs  = cyber2000fb_enable_extregs;
                 info->disable_extregs = cyber2000fb_disable_extregs;
-                info->info            = int_cfb_info;
+                info->info            = int_cfb_info;
 
-                strlcpy(info->dev_name, int_cfb_info->fb.fix.id, sizeof(info->dev_name));
+                strlcpy(info->dev_name, int_cfb_info->fb.fix.id,
+                        sizeof(info->dev_name));
         }
 
         return int_cfb_info != NULL;
 }
+EXPORT_SYMBOL(cyber2000fb_attach);
 
 /*
  * Detach a capture/tv driver from the core CyberX0X0 driver.
@@ -1136,12 +1134,7 @@ int cyber2000fb_attach(struct cyberpro_info *info, int idx)
 void cyber2000fb_detach(int idx)
 {
 }
-
-EXPORT_SYMBOL(cyber2000fb_attach);
 EXPORT_SYMBOL(cyber2000fb_detach);
-EXPORT_SYMBOL(cyber2000fb_enable_extregs);
-EXPORT_SYMBOL(cyber2000fb_disable_extregs);
-EXPORT_SYMBOL(cyber2000fb_get_fb_var);
 
 /*
  * These parameters give
@@ -1205,7 +1198,7 @@ static void cyberpro_init_hw(struct cfb_info *cfb)
         int i;
 
         for (i = 0; i < sizeof(igs_regs); i += 2)
-                cyber2000_grphw(igs_regs[i], igs_regs[i+1], cfb);
+                cyber2000_grphw(igs_regs[i], igs_regs[i + 1], cfb);
 
         if (cfb->id == ID_CYBERPRO_5000) {
                 unsigned char val;
@@ -1215,8 +1208,8 @@ static void cyberpro_init_hw(struct cfb_info *cfb)
         }
 }
 
-static struct cfb_info * __devinit
-cyberpro_alloc_fb_info(unsigned int id, char *name)
+static struct cfb_info __devinit *cyberpro_alloc_fb_info(unsigned int id,
+                                                         char *name)
 {
         struct cfb_info *cfb;
 
@@ -1228,9 +1221,9 @@ cyberpro_alloc_fb_info(unsigned int id, char *name)
         cfb->id                 = id;
 
         if (id == ID_CYBERPRO_5000)
-                cfb->ref_ps     = 40690; // 24.576 MHz
+                cfb->ref_ps     = 40690; /* 24.576 MHz */
         else
-                cfb->ref_ps     = 69842; // 14.31818 MHz (69841?)
+                cfb->ref_ps     = 69842; /* 14.31818 MHz (69841?) */
 
         cfb->divisors[0]        = 1;
         cfb->divisors[1]        = 2;
@@ -1282,8 +1275,7 @@ cyberpro_alloc_fb_info(unsigned int id, char *name)
         return cfb;
 }
 
-static void
-cyberpro_free_fb_info(struct cfb_info *cfb)
+static void cyberpro_free_fb_info(struct cfb_info *cfb)
 {
         if (cfb) {
                 /*
@@ -1300,8 +1292,7 @@ cyberpro_free_fb_info(struct cfb_info *cfb)
  *  video=cyber2000:font:fontname
  */
 #ifndef MODULE
-static int
-cyber2000fb_setup(char *options)
+static int cyber2000fb_setup(char *options)
 {
         char *opt;
 
@@ -1315,7 +1306,8 @@ cyber2000fb_setup(char *options)
                 if (strncmp(opt, "font:", 5) == 0) {
                         static char default_font_storage[40];
 
-                        strlcpy(default_font_storage, opt + 5, sizeof(default_font_storage));
+                        strlcpy(default_font_storage, opt + 5,
+                                sizeof(default_font_storage));
                         default_font = default_font_storage;
                         continue;
                 }
@@ -1354,10 +1346,18 @@ static int __devinit cyberpro_common_probe(struct cfb_info *cfb)
          * Determine the size of the memory.
          */
         switch (cfb->mem_ctl2 & MEM_CTL2_SIZE_MASK) {
-        case MEM_CTL2_SIZE_4MB: smem_size = 0x00400000; break;
-        case MEM_CTL2_SIZE_2MB: smem_size = 0x00200000; break;
-        case MEM_CTL2_SIZE_1MB: smem_size = 0x00100000; break;
-        default:                smem_size = 0x00100000; break;
+        case MEM_CTL2_SIZE_4MB:
+                smem_size = 0x00400000;
+                break;
+        case MEM_CTL2_SIZE_2MB:
+                smem_size = 0x00200000;
+                break;
+        case MEM_CTL2_SIZE_1MB:
+                smem_size = 0x00100000;
+                break;
+        default:
+                smem_size = 0x00100000;
+                break;
         }
 
         cfb->fb.fix.smem_len   = smem_size;
@@ -1366,8 +1366,8 @@ static int __devinit cyberpro_common_probe(struct cfb_info *cfb)
 
         err = -EINVAL;
         if (!fb_find_mode(&cfb->fb.var, &cfb->fb, NULL, NULL, 0,
-                          &cyber2000fb_default_mode, 8)) {
-                printk("%s: no valid mode found\n", cfb->fb.fix.id);
+                          &cyber2000fb_default_mode, 8)) {
+                printk(KERN_ERR "%s: no valid mode found\n", cfb->fb.fix.id);
                 goto failed;
         }
 
@@ -1377,7 +1377,7 @@ static int __devinit cyberpro_common_probe(struct cfb_info *cfb)
         if (cfb->fb.var.yres_virtual < cfb->fb.var.yres)
                 cfb->fb.var.yres_virtual = cfb->fb.var.yres;
 
-//      fb_set_var(&cfb->fb.var, -1, &cfb->fb);
+/*      fb_set_var(&cfb->fb.var, -1, &cfb->fb); */
 
         /*
          * Calculate the hsync and vsync frequencies.  Note that
@@ -1425,20 +1425,20 @@ static void cyberpro_common_resume(struct cfb_info *cfb)
 
 #include <asm/arch/hardware.h>
 
-static int __devinit
-cyberpro_vl_probe(void)
+static int __devinit cyberpro_vl_probe(void)
 {
         struct cfb_info *cfb;
         int err = -ENOMEM;
 
-        if (!request_mem_region(FB_START,FB_SIZE,"CyberPro2010")) return err;
+        if (!request_mem_region(FB_START, FB_SIZE, "CyberPro2010"))
+                return err;
 
         cfb = cyberpro_alloc_fb_info(ID_CYBERPRO_2010, "CyberPro2010");
         if (!cfb)
                 goto failed_release;
 
         cfb->dev = NULL;
-        cfb->region = ioremap(FB_START,FB_SIZE);
+        cfb->region = ioremap(FB_START, FB_SIZE);
         if (!cfb->region)
                 goto failed_ioremap;
 
@@ -1475,7 +1475,7 @@ failed:
 failed_ioremap:
         cyberpro_free_fb_info(cfb);
 failed_release:
-        release_mem_region(FB_START,FB_SIZE);
+        release_mem_region(FB_START, FB_SIZE);
 
         return err;
 }
@@ -1538,7 +1538,8 @@ static int cyberpro_pci_enable_mmio(struct cfb_info *cfb)
          * Allow the CyberPro to accept PCI burst accesses
          */
         if (cfb->id == ID_CYBERPRO_2010) {
-                printk(KERN_INFO "%s: NOT enabling PCI bursts\n", cfb->fb.fix.id);
+                printk(KERN_INFO "%s: NOT enabling PCI bursts\n",
+                       cfb->fb.fix.id);
         } else {
                 val = cyber2000_grphr(EXT_BUS_CTL, cfb);
                 if (!(val & EXT_BUS_CTL_PCIBURST_WRITE)) {
@@ -1688,9 +1689,10 @@ static int cyberpro_pci_resume(struct pci_dev *dev)
 }
 
 static struct pci_device_id cyberpro_pci_table[] = {
-//      Not yet
-//      { PCI_VENDOR_ID_INTERG, PCI_DEVICE_ID_INTERG_1682,
-//              PCI_ANY_ID, PCI_ANY_ID, 0, 0, ID_IGA_1682 },
+/*      Not yet
+ *      { PCI_VENDOR_ID_INTERG, PCI_DEVICE_ID_INTERG_1682,
+ *              PCI_ANY_ID, PCI_ANY_ID, 0, 0, ID_IGA_1682 },
+ */
         { PCI_VENDOR_ID_INTERG, PCI_DEVICE_ID_INTERG_2000,
                 PCI_ANY_ID, PCI_ANY_ID, 0, 0, ID_CYBERPRO_2000 },
         { PCI_VENDOR_ID_INTERG, PCI_DEVICE_ID_INTERG_2010,
@@ -1700,7 +1702,7 @@ static struct pci_device_id cyberpro_pci_table[] = {
         { 0, }
 };
 
-MODULE_DEVICE_TABLE(pci,cyberpro_pci_table);
+MODULE_DEVICE_TABLE(pci, cyberpro_pci_table);
 
 static struct pci_driver cyberpro_driver = {
         .name           = "CyberPro",
diff --git a/drivers/video/geode/video_gx.c b/drivers/video/geode/video_gx.c
index 7f3f18d06718..febf09c63492 100644
--- a/drivers/video/geode/video_gx.c
+++ b/drivers/video/geode/video_gx.c
@@ -127,7 +127,7 @@ static void gx_set_dclk_frequency(struct fb_info *info)
         int timeout = 1000;
 
         /* Rev. 1 Geode GXs use a 14 MHz reference clock instead of 48 MHz. */
-        if (cpu_data->x86_mask == 1) {
+        if (cpu_data(0).x86_mask == 1) {
                 pll_table = gx_pll_table_14MHz;
                 pll_table_len = ARRAY_SIZE(gx_pll_table_14MHz);
         } else {
diff --git a/drivers/video/pnx4008/sdum.h b/drivers/video/pnx4008/sdum.h
index e8c5dcdd8813..189c3d641383 100644
--- a/drivers/video/pnx4008/sdum.h
+++ b/drivers/video/pnx4008/sdum.h
@@ -77,9 +77,6 @@
 #define CONF_DIRTYDETECTION_OFF (0x600)
 #define CONF_DIRTYDETECTION_ON  (0x601)
 
-/* Set the corresponding bit. */
-#define BIT(n) (0x1U << (n))
-
 struct dumchannel_uf {
         int channelnr;
         u32 *dirty;
diff --git a/drivers/watchdog/at91rm9200_wdt.c b/drivers/watchdog/at91rm9200_wdt.c
index 38bd37372599..a684b1e87372 100644
--- a/drivers/watchdog/at91rm9200_wdt.c
+++ b/drivers/watchdog/at91rm9200_wdt.c
@@ -9,6 +9,7 @@
  * 2 of the License, or (at your option) any later version.
  */
 
+#include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/fs.h>
 #include <linux/init.h>
@@ -19,7 +20,6 @@
 #include <linux/platform_device.h>
 #include <linux/types.h>
 #include <linux/watchdog.h>
-#include <asm/bitops.h>
 #include <asm/uaccess.h>
 #include <asm/arch/at91_st.h>
 
diff --git a/drivers/watchdog/ks8695_wdt.c b/drivers/watchdog/ks8695_wdt.c
index 7150fb945eaf..e3a29c302309 100644
--- a/drivers/watchdog/ks8695_wdt.c
+++ b/drivers/watchdog/ks8695_wdt.c
@@ -8,6 +8,7 @@
  * published by the Free Software Foundation.
  */
 
+#include <linux/bitops.h>
 #include <linux/errno.h>
 #include <linux/fs.h>
 #include <linux/init.h>
@@ -18,7 +19,6 @@
 #include <linux/platform_device.h>
 #include <linux/types.h>
 #include <linux/watchdog.h>
-#include <asm/bitops.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>
 #include <asm/arch/regs-timer.h>
diff --git a/drivers/watchdog/omap_wdt.c b/drivers/watchdog/omap_wdt.c
index 719b066f73c4..635ca454f56b 100644
--- a/drivers/watchdog/omap_wdt.c
+++ b/drivers/watchdog/omap_wdt.c
@@ -39,11 +39,11 @@
 #include <linux/platform_device.h>
 #include <linux/moduleparam.h>
 #include <linux/clk.h>
+#include <linux/bitops.h>
 
 #include <asm/io.h>
 #include <asm/uaccess.h>
 #include <asm/hardware.h>
-#include <asm/bitops.h>
 
 #include <asm/arch/prcm.h>
 
diff --git a/drivers/watchdog/sa1100_wdt.c b/drivers/watchdog/sa1100_wdt.c
index 3475f47aaa45..34a2b3b81800 100644
--- a/drivers/watchdog/sa1100_wdt.c
+++ b/drivers/watchdog/sa1100_wdt.c
@@ -25,13 +25,13 @@
 #include <linux/miscdevice.h>
 #include <linux/watchdog.h>
 #include <linux/init.h>
+#include <linux/bitops.h>
 
 #ifdef CONFIG_ARCH_PXA
 #include <asm/arch/pxa-regs.h>
 #endif
 
 #include <asm/hardware.h>
-#include <asm/bitops.h>
 #include <asm/uaccess.h>
 
 #define OSCR_FREQ               CLOCK_TICK_RATE