Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

226 files changed, 8907 insertions, 6632 deletions

diff --git a/drivers/acpi/ac.c b/drivers/acpi/ac.c
index 9b917dac7732..88e42abf5d88 100644
--- a/drivers/acpi/ac.c
+++ b/drivers/acpi/ac.c
@@ -191,7 +191,6 @@ static int acpi_ac_add_fs(struct acpi_device *device)
                                                      acpi_ac_dir);
                 if (!acpi_device_dir(device))
                         return -ENODEV;
-                acpi_device_dir(device)->owner = THIS_MODULE;
         }
 
         /* 'state' [R] */
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index 69cbc57c2d1c..3bcb5bfc45d3 100644
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -760,7 +760,6 @@ static int acpi_battery_add_fs(struct acpi_device *device)
                                                      acpi_battery_dir);
                 if (!acpi_device_dir(device))
                         return -ENODEV;
-                acpi_device_dir(device)->owner = THIS_MODULE;
         }
 
         for (i = 0; i < ACPI_BATTERY_NUMFILES; ++i) {
diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c
index 171fd914f435..c2f06069dcd4 100644
--- a/drivers/acpi/button.c
+++ b/drivers/acpi/button.c
@@ -200,12 +200,10 @@ static int acpi_button_add_fs(struct acpi_device *device)
 
         if (!entry)
                 return -ENODEV;
-        entry->owner = THIS_MODULE;
 
         acpi_device_dir(device) = proc_mkdir(acpi_device_bid(device), entry);
         if (!acpi_device_dir(device))
                 return -ENODEV;
-        acpi_device_dir(device)->owner = THIS_MODULE;
 
         /* 'info' [R] */
         entry = proc_create_data(ACPI_BUTTON_FILE_INFO,
@@ -522,7 +520,6 @@ static int __init acpi_button_init(void)
         acpi_button_dir = proc_mkdir(ACPI_BUTTON_CLASS, acpi_root_dir);
         if (!acpi_button_dir)
                 return -ENODEV;
-        acpi_button_dir->owner = THIS_MODULE;
         result = acpi_bus_register_driver(&acpi_button_driver);
         if (result < 0) {
                 remove_proc_entry(ACPI_BUTTON_CLASS, acpi_root_dir);
diff --git a/drivers/acpi/fan.c b/drivers/acpi/fan.c
index eaaee1660bdf..8a02944bf92d 100644
--- a/drivers/acpi/fan.c
+++ b/drivers/acpi/fan.c
@@ -193,7 +193,6 @@ static int acpi_fan_add_fs(struct acpi_device *device)
                                                      acpi_fan_dir);
                 if (!acpi_device_dir(device))
                         return -ENODEV;
-                acpi_device_dir(device)->owner = THIS_MODULE;
         }
 
         /* 'status' [R/W] */
@@ -347,7 +346,6 @@ static int __init acpi_fan_init(void)
         acpi_fan_dir = proc_mkdir(ACPI_FAN_CLASS, acpi_root_dir);
         if (!acpi_fan_dir)
                 return -ENODEV;
-        acpi_fan_dir->owner = THIS_MODULE;
 #endif
 
         result = acpi_bus_register_driver(&acpi_fan_driver);
diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c
index 5b38a026d122..196f97d00956 100644
--- a/drivers/acpi/pci_root.c
+++ b/drivers/acpi/pci_root.c
@@ -66,11 +66,18 @@ struct acpi_pci_root {
         struct acpi_device * device;
         struct acpi_pci_id id;
         struct pci_bus *bus;
+
+        u32 osc_support_set;    /* _OSC state of support bits */
+        u32 osc_control_set;    /* _OSC state of control bits */
+        u32 osc_control_qry;    /* the latest _OSC query result */
+
+        u32 osc_queried:1;      /* has _OSC control been queried? */
 };
 
 static LIST_HEAD(acpi_pci_roots);
 
 static struct acpi_pci_driver *sub_driver;
+static DEFINE_MUTEX(osc_lock);
 
 int acpi_pci_register_driver(struct acpi_pci_driver *driver)
 {
@@ -185,6 +192,175 @@ static void acpi_pci_bridge_scan(struct acpi_device *device)
                 }
 }
 
+static u8 OSC_UUID[16] = {0x5B, 0x4D, 0xDB, 0x33, 0xF7, 0x1F, 0x1C, 0x40,
+                          0x96, 0x57, 0x74, 0x41, 0xC0, 0x3D, 0xD7, 0x66};
+
+static acpi_status acpi_pci_run_osc(acpi_handle handle,
+                                    const u32 *capbuf, u32 *retval)
+{
+        acpi_status status;
+        struct acpi_object_list input;
+        union acpi_object in_params[4];
+        struct acpi_buffer output = {ACPI_ALLOCATE_BUFFER, NULL};
+        union acpi_object *out_obj;
+        u32 errors;
+
+        /* Setting up input parameters */
+        input.count = 4;
+        input.pointer = in_params;
+        in_params[0].type               = ACPI_TYPE_BUFFER;
+        in_params[0].buffer.length      = 16;
+        in_params[0].buffer.pointer     = OSC_UUID;
+        in_params[1].type               = ACPI_TYPE_INTEGER;
+        in_params[1].integer.value      = 1;
+        in_params[2].type               = ACPI_TYPE_INTEGER;
+        in_params[2].integer.value      = 3;
+        in_params[3].type               = ACPI_TYPE_BUFFER;
+        in_params[3].buffer.length      = 12;
+        in_params[3].buffer.pointer     = (u8 *)capbuf;
+
+        status = acpi_evaluate_object(handle, "_OSC", &input, &output);
+        if (ACPI_FAILURE(status))
+                return status;
+
+        if (!output.length)
+                return AE_NULL_OBJECT;
+
+        out_obj = output.pointer;
+        if (out_obj->type != ACPI_TYPE_BUFFER) {
+                printk(KERN_DEBUG "_OSC evaluation returned wrong type\n");
+                status = AE_TYPE;
+                goto out_kfree;
+        }
+        /* Need to ignore the bit0 in result code */
+        errors = *((u32 *)out_obj->buffer.pointer) & ~(1 << 0);
+        if (errors) {
+                if (errors & OSC_REQUEST_ERROR)
+                        printk(KERN_DEBUG "_OSC request failed\n");
+                if (errors & OSC_INVALID_UUID_ERROR)
+                        printk(KERN_DEBUG "_OSC invalid UUID\n");
+                if (errors & OSC_INVALID_REVISION_ERROR)
+                        printk(KERN_DEBUG "_OSC invalid revision\n");
+                if (errors & OSC_CAPABILITIES_MASK_ERROR) {
+                        if (capbuf[OSC_QUERY_TYPE] & OSC_QUERY_ENABLE)
+                                goto out_success;
+                        printk(KERN_DEBUG
+                               "Firmware did not grant requested _OSC control\n");
+                        status = AE_SUPPORT;
+                        goto out_kfree;
+                }
+                status = AE_ERROR;
+                goto out_kfree;
+        }
+out_success:
+        *retval = *((u32 *)(out_obj->buffer.pointer + 8));
+        status = AE_OK;
+
+out_kfree:
+        kfree(output.pointer);
+        return status;
+}
+
+static acpi_status acpi_pci_query_osc(struct acpi_pci_root *root, u32 flags)
+{
+        acpi_status status;
+        u32 support_set, result, capbuf[3];
+
+        /* do _OSC query for all possible controls */
+        support_set = root->osc_support_set | (flags & OSC_SUPPORT_MASKS);
+        capbuf[OSC_QUERY_TYPE] = OSC_QUERY_ENABLE;
+        capbuf[OSC_SUPPORT_TYPE] = support_set;
+        capbuf[OSC_CONTROL_TYPE] = OSC_CONTROL_MASKS;
+
+        status = acpi_pci_run_osc(root->device->handle, capbuf, &result);
+        if (ACPI_SUCCESS(status)) {
+                root->osc_support_set = support_set;
+                root->osc_control_qry = result;
+                root->osc_queried = 1;
+        }
+        return status;
+}
+
+static acpi_status acpi_pci_osc_support(struct acpi_pci_root *root, u32 flags)
+{
+        acpi_status status;
+        acpi_handle tmp;
+
+        status = acpi_get_handle(root->device->handle, "_OSC", &tmp);
+        if (ACPI_FAILURE(status))
+                return status;
+        mutex_lock(&osc_lock);
+        status = acpi_pci_query_osc(root, flags);
+        mutex_unlock(&osc_lock);
+        return status;
+}
+
+static struct acpi_pci_root *acpi_pci_find_root(acpi_handle handle)
+{
+        struct acpi_pci_root *root;
+        list_for_each_entry(root, &acpi_pci_roots, node) {
+                if (root->device->handle == handle)
+                        return root;
+        }
+        return NULL;
+}
+
+/**
+ * acpi_pci_osc_control_set - commit requested control to Firmware
+ * @handle: acpi_handle for the target ACPI object
+ * @flags: driver's requested control bits
+ *
+ * Attempt to take control from Firmware on requested control bits.
+ **/
+acpi_status acpi_pci_osc_control_set(acpi_handle handle, u32 flags)
+{
+        acpi_status status;
+        u32 control_req, result, capbuf[3];
+        acpi_handle tmp;
+        struct acpi_pci_root *root;
+
+        status = acpi_get_handle(handle, "_OSC", &tmp);
+        if (ACPI_FAILURE(status))
+                return status;
+
+        control_req = (flags & OSC_CONTROL_MASKS);
+        if (!control_req)
+                return AE_TYPE;
+
+        root = acpi_pci_find_root(handle);
+        if (!root)
+                return AE_NOT_EXIST;
+
+        mutex_lock(&osc_lock);
+        /* No need to evaluate _OSC if the control was already granted. */
+        if ((root->osc_control_set & control_req) == control_req)
+                goto out;
+
+        /* Need to query controls first before requesting them */
+        if (!root->osc_queried) {
+                status = acpi_pci_query_osc(root, root->osc_support_set);
+                if (ACPI_FAILURE(status))
+                        goto out;
+        }
+        if ((root->osc_control_qry & control_req) != control_req) {
+                printk(KERN_DEBUG
+                       "Firmware did not grant requested _OSC control\n");
+                status = AE_SUPPORT;
+                goto out;
+        }
+
+        capbuf[OSC_QUERY_TYPE] = 0;
+        capbuf[OSC_SUPPORT_TYPE] = root->osc_support_set;
+        capbuf[OSC_CONTROL_TYPE] = root->osc_control_set | control_req;
+        status = acpi_pci_run_osc(handle, capbuf, &result);
+        if (ACPI_SUCCESS(status))
+                root->osc_control_set = result;
+out:
+        mutex_unlock(&osc_lock);
+        return status;
+}
+EXPORT_SYMBOL(acpi_pci_osc_control_set);
+
 static int __devinit acpi_pci_root_add(struct acpi_device *device)
 {
         int result = 0;
@@ -217,7 +393,7 @@ static int __devinit acpi_pci_root_add(struct acpi_device *device)
          * PCI domains, so we indicate this in _OSC support capabilities.
          */
         flags = base_flags = OSC_PCI_SEGMENT_GROUPS_SUPPORT;
-        pci_acpi_osc_support(device->handle, flags);
+        acpi_pci_osc_support(root, flags);
 
         /* 
          * Segment
@@ -353,7 +529,7 @@ static int __devinit acpi_pci_root_add(struct acpi_device *device)
         if (pci_msi_enabled())
                 flags |= OSC_MSI_SUPPORT;
         if (flags != base_flags)
-                pci_acpi_osc_support(device->handle, flags);
+                acpi_pci_osc_support(root, flags);
 
       end:
         if (result) {
diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c
index 0cc2fd31e376..fa2f7422d23d 100644
--- a/drivers/acpi/processor_core.c
+++ b/drivers/acpi/processor_core.c
@@ -359,7 +359,6 @@ static int acpi_processor_add_fs(struct acpi_device *device)
                 if (!acpi_device_dir(device))
                         return -ENODEV;
         }
-        acpi_device_dir(device)->owner = THIS_MODULE;
 
         /* 'info' [R] */
         entry = proc_create_data(ACPI_PROCESSOR_FILE_INFO,
@@ -1137,7 +1136,6 @@ static int __init acpi_processor_init(void)
         acpi_processor_dir = proc_mkdir(ACPI_PROCESSOR_CLASS, acpi_root_dir);
         if (!acpi_processor_dir)
                 return -ENOMEM;
-        acpi_processor_dir->owner = THIS_MODULE;
 
         /*
          * Check whether the system is DMI table. If yes, OSPM
diff --git a/drivers/acpi/sbs.c b/drivers/acpi/sbs.c
index 6050ce481873..59afd52ccc12 100644
--- a/drivers/acpi/sbs.c
+++ b/drivers/acpi/sbs.c
@@ -488,7 +488,6 @@ acpi_sbs_add_fs(struct proc_dir_entry **dir,
                 if (!*dir) {
                         return -ENODEV;
                 }
-                (*dir)->owner = THIS_MODULE;
         }
 
         /* 'info' [R] */
diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c
index 99e6f1f8ea45..c11f9aeca706 100644
--- a/drivers/acpi/thermal.c
+++ b/drivers/acpi/thermal.c
@@ -1506,7 +1506,6 @@ static int acpi_thermal_add_fs(struct acpi_device *device)
                                                      acpi_thermal_dir);
                 if (!acpi_device_dir(device))
                         return -ENODEV;
-                acpi_device_dir(device)->owner = THIS_MODULE;
         }
 
         /* 'state' [R] */
@@ -1875,7 +1874,6 @@ static int __init acpi_thermal_init(void)
         acpi_thermal_dir = proc_mkdir(ACPI_THERMAL_CLASS, acpi_root_dir);
         if (!acpi_thermal_dir)
                 return -ENODEV;
-        acpi_thermal_dir->owner = THIS_MODULE;
 
         result = acpi_bus_register_driver(&acpi_thermal_driver);
         if (result < 0) {
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index bb5ed059114a..67cc36dc9b82 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -1125,8 +1125,6 @@ static int acpi_video_device_add_fs(struct acpi_device *device)
         if (!device_dir)
                 return -ENOMEM;
 
-        device_dir->owner = THIS_MODULE;
-
         /* 'info' [R] */
         entry = proc_create_data("info", S_IRUGO, device_dir,
                         &acpi_video_device_info_fops, acpi_driver_data(device));
@@ -1403,8 +1401,6 @@ static int acpi_video_bus_add_fs(struct acpi_device *device)
         if (!device_dir)
                 return -ENOMEM;
 
-        device_dir->owner = THIS_MODULE;
-
         /* 'info' [R] */
         entry = proc_create_data("info", S_IRUGO, device_dir,
                                  &acpi_video_bus_info_fops,
@@ -2131,7 +2127,6 @@ static int __init acpi_video_init(void)
         acpi_video_dir = proc_mkdir(ACPI_VIDEO_CLASS, acpi_root_dir);
         if (!acpi_video_dir)
                 return -ENODEV;
-        acpi_video_dir->owner = THIS_MODULE;
 
         result = acpi_bus_register_driver(&acpi_video_bus);
         if (result < 0) {
diff --git a/drivers/auxdisplay/Kconfig b/drivers/auxdisplay/Kconfig
index 14b9d5f4c203..c07e725ea93d 100644
--- a/drivers/auxdisplay/Kconfig
+++ b/drivers/auxdisplay/Kconfig
@@ -6,7 +6,6 @@
 #
 
 menuconfig AUXDISPLAY
-        depends on PARPORT
         bool "Auxiliary Display support"
         ---help---
           Say Y here to get to see options for auxiliary display drivers.
@@ -14,7 +13,7 @@ menuconfig AUXDISPLAY
 
           If you say N, all options in this submenu will be skipped and disabled.
 
-if AUXDISPLAY && PARPORT
+if AUXDISPLAY
 
 config KS0108
         tristate "KS0108 LCD Controller"
diff --git a/drivers/base/cpu.c b/drivers/base/cpu.c
index 5b257a57bc57..e62a4ccea54d 100644
--- a/drivers/base/cpu.c
+++ b/drivers/base/cpu.c
@@ -119,7 +119,7 @@ static ssize_t print_cpus_map(char *buf, const struct cpumask *map)
 #define print_cpus_func(type) \
 static ssize_t print_cpus_##type(struct sysdev_class *class, char *buf) \
 {                                                                       \
-        return print_cpus_map(buf, &cpu_##type##_map);                  \
+        return print_cpus_map(buf, cpu_##type##_mask);                  \
 }                                                                       \
 static struct sysdev_class_attribute attr_##type##_map =                \
         _SYSDEV_CLASS_ATTR(type, 0444, print_cpus_##type, NULL)
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index 2621ed2ce6d2..40b17d3b55a1 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -1192,6 +1192,30 @@ loop_get_status64(struct loop_device *lo, struct loop_info64 __user *arg) {
         return err;
 }
 
+static int loop_set_capacity(struct loop_device *lo, struct block_device *bdev)
+{
+        int err;
+        sector_t sec;
+        loff_t sz;
+
+        err = -ENXIO;
+        if (unlikely(lo->lo_state != Lo_bound))
+                goto out;
+        err = figure_loop_size(lo);
+        if (unlikely(err))
+                goto out;
+        sec = get_capacity(lo->lo_disk);
+        /* the width of sector_t may be narrow for bit-shift */
+        sz = sec;
+        sz <<= 9;
+        mutex_lock(&bdev->bd_mutex);
+        bd_set_size(bdev, sz);
+        mutex_unlock(&bdev->bd_mutex);
+
+ out:
+        return err;
+}
+
 static int lo_ioctl(struct block_device *bdev, fmode_t mode,
         unsigned int cmd, unsigned long arg)
 {
@@ -1224,6 +1248,11 @@ static int lo_ioctl(struct block_device *bdev, fmode_t mode,
         case LOOP_GET_STATUS64:
                 err = loop_get_status64(lo, (struct loop_info64 __user *) arg);
                 break;
+        case LOOP_SET_CAPACITY:
+                err = -EPERM;
+                if ((mode & FMODE_WRITE) || capable(CAP_SYS_ADMIN))
+                        err = loop_set_capacity(lo, bdev);
+                break;
         default:
                 err = lo->ioctl ? lo->ioctl(lo, cmd, arg) : -EINVAL;
         }
@@ -1371,6 +1400,7 @@ static int lo_compat_ioctl(struct block_device *bdev, fmode_t mode,
                         lo, (struct compat_loop_info __user *) arg);
                 mutex_unlock(&lo->lo_ctl_mutex);
                 break;
+        case LOOP_SET_CAPACITY:
         case LOOP_CLR_FD:
         case LOOP_GET_STATUS64:
         case LOOP_SET_STATUS64:
diff --git a/drivers/block/ps3vram.c b/drivers/block/ps3vram.c
index 393ed6760d78..8eddef373a91 100644
--- a/drivers/block/ps3vram.c
+++ b/drivers/block/ps3vram.c
@@ -551,8 +551,6 @@ static void __devinit ps3vram_proc_init(struct ps3_system_bus_device *dev)
                 dev_warn(&dev->core, "failed to create /proc entry\n");
                 return;
         }
-
-        pde->owner = THIS_MODULE;
         pde->data = priv;
 }
 
diff --git a/drivers/char/amiserial.c b/drivers/char/amiserial.c
index a58869ea8513..fd3ebd1be570 100644
--- a/drivers/char/amiserial.c
+++ b/drivers/char/amiserial.c
@@ -79,6 +79,7 @@ static char *serial_version = "4.30";
 #include <linux/ptrace.h>
 #include <linux/ioport.h>
 #include <linux/mm.h>
+#include <linux/seq_file.h>
 #include <linux/slab.h>
 #include <linux/init.h>
 #include <linux/bitops.h>
@@ -1825,14 +1826,13 @@ static int rs_open(struct tty_struct *tty, struct file * filp)
  * /proc fs routines....
  */
 
-static inline int line_info(char *buf, struct serial_state *state)
+static inline void line_info(struct seq_file *m, struct serial_state *state)
 {
         struct async_struct *info = state->info, scr_info;
         char    stat_buf[30], control, status;
-        int     ret;
         unsigned long flags;
 
-        ret = sprintf(buf, "%d: uart:amiga_builtin",state->line);
+        seq_printf(m, "%d: uart:amiga_builtin",state->line);
 
         /*
          * Figure out the current RS-232 lines
@@ -1864,55 +1864,49 @@ static inline int line_info(char *buf, struct serial_state *state)
                 strcat(stat_buf, "|CD");
 
         if (info->quot) {
-                ret += sprintf(buf+ret, " baud:%d",
-                               state->baud_base / info->quot);
+                seq_printf(m, " baud:%d", state->baud_base / info->quot);
         }
 
-        ret += sprintf(buf+ret, " tx:%d rx:%d",
-                      state->icount.tx, state->icount.rx);
+        seq_printf(m, " tx:%d rx:%d", state->icount.tx, state->icount.rx);
 
         if (state->icount.frame)
-                ret += sprintf(buf+ret, " fe:%d", state->icount.frame);
+                seq_printf(m, " fe:%d", state->icount.frame);
 
         if (state->icount.parity)
-                ret += sprintf(buf+ret, " pe:%d", state->icount.parity);
+                seq_printf(m, " pe:%d", state->icount.parity);
 
         if (state->icount.brk)
-                ret += sprintf(buf+ret, " brk:%d", state->icount.brk);
+                seq_printf(m, " brk:%d", state->icount.brk);
 
         if (state->icount.overrun)
-                ret += sprintf(buf+ret, " oe:%d", state->icount.overrun);
+                seq_printf(m, " oe:%d", state->icount.overrun);
 
         /*
          * Last thing is the RS-232 status lines
          */
-        ret += sprintf(buf+ret, " %s\n", stat_buf+1);
-        return ret;
+        seq_printf(m, " %s\n", stat_buf+1);
 }
 
-static int rs_read_proc(char *page, char **start, off_t off, int count,
-                        int *eof, void *data)
+static int rs_proc_show(struct seq_file *m, void *v)
 {
-        int len = 0, l;
-        off_t   begin = 0;
-
-        len += sprintf(page, "serinfo:1.0 driver:%s\n", serial_version);
-        l = line_info(page + len, &rs_table[0]);
-        len += l;
-        if (len+begin > off+count)
-          goto done;
-        if (len+begin < off) {
-          begin += len;
-          len = 0;
-        }
-        *eof = 1;
-done:
-        if (off >= len+begin)
-                return 0;
-        *start = page + (off-begin);
-        return ((count < begin+len-off) ? count : begin+len-off);
+        seq_printf(m, "serinfo:1.0 driver:%s\n", serial_version);
+        line_info(m, &rs_table[0]);
+        return 0;
 }
 
+static int rs_proc_open(struct inode *inode, struct file *file)
+{
+        return single_open(file, rs_proc_show, NULL);
+}
+
+static const struct file_operations rs_proc_fops = {
+        .owner          = THIS_MODULE,
+        .open           = rs_proc_open,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+        .release        = single_release,
+};
+
 /*
  * ---------------------------------------------------------------------
  * rs_init() and friends
@@ -1951,9 +1945,9 @@ static const struct tty_operations serial_ops = {
         .break_ctl = rs_break,
         .send_xchar = rs_send_xchar,
         .wait_until_sent = rs_wait_until_sent,
-        .read_proc = rs_read_proc,
         .tiocmget = rs_tiocmget,
         .tiocmset = rs_tiocmset,
+        .proc_fops = &rs_proc_fops,
 };
 
 /*
diff --git a/drivers/char/cyclades.c b/drivers/char/cyclades.c
index 6a59f72a9c21..272db0e2b491 100644
--- a/drivers/char/cyclades.c
+++ b/drivers/char/cyclades.c
@@ -657,6 +657,7 @@
 
 #include <linux/stat.h>
 #include <linux/proc_fs.h>
+#include <linux/seq_file.h>
 
 static void cy_throttle(struct tty_struct *tty);
 static void cy_send_xchar(struct tty_struct *tty, char ch);
@@ -868,8 +869,6 @@ static int cyz_issue_cmd(struct cyclades_card *, __u32, __u8, __u32);
 static unsigned detect_isa_irq(void __iomem *);
 #endif                          /* CONFIG_ISA */
 
-static int cyclades_get_proc_info(char *, char **, off_t, int, int *, void *);
-
 #ifndef CONFIG_CYZ_INTR
 static void cyz_poll(unsigned long);
 
@@ -5216,31 +5215,22 @@ static struct pci_driver cy_pci_driver = {
 };
 #endif
 
-static int
-cyclades_get_proc_info(char *buf, char **start, off_t offset, int length,
-                int *eof, void *data)
+static int cyclades_proc_show(struct seq_file *m, void *v)
 {
         struct cyclades_port *info;
         unsigned int i, j;
-        int len = 0;
-        off_t begin = 0;
-        off_t pos = 0;
-        int size;
         __u32 cur_jifs = jiffies;
 
-        size = sprintf(buf, "Dev TimeOpen   BytesOut  IdleOut    BytesIn   "
+        seq_puts(m, "Dev TimeOpen   BytesOut  IdleOut    BytesIn   "
                         "IdleIn  Overruns  Ldisc\n");
 
-        pos += size;
-        len += size;
-
         /* Output one line for each known port */
         for (i = 0; i < NR_CARDS; i++)
                 for (j = 0; j < cy_card[i].nports; j++) {
                         info = &cy_card[i].ports[j];
 
                         if (info->port.count)
-                                size = sprintf(buf + len, "%3d %8lu %10lu %8lu "
+                                seq_printf(m, "%3d %8lu %10lu %8lu "
                                         "%10lu %8lu %9lu %6ld\n", info->line,
                                         (cur_jifs - info->idle_stats.in_use) /
                                         HZ, info->idle_stats.xmit_bytes,
@@ -5251,30 +5241,26 @@ cyclades_get_proc_info(char *buf, char **start, off_t offset, int length,
                                         /* FIXME: double check locking */
                                         (long)info->port.tty->ldisc.ops->num);
                         else
-                                size = sprintf(buf + len, "%3d %8lu %10lu %8lu "
+                                seq_printf(m, "%3d %8lu %10lu %8lu "
                                         "%10lu %8lu %9lu %6ld\n",
                                         info->line, 0L, 0L, 0L, 0L, 0L, 0L, 0L);
-                        len += size;
-                        pos = begin + len;
-
-                        if (pos < offset) {
-                                len = 0;
-                                begin = pos;
-                        }
-                        if (pos > offset + length)
-                                goto done;
                 }
-        *eof = 1;
-done:
-        *start = buf + (offset - begin);        /* Start of wanted data */
-        len -= (offset - begin);        /* Start slop */
-        if (len > length)
-                len = length;   /* Ending slop */
-        if (len < 0)
-                len = 0;
-        return len;
+        return 0;
+}
+
+static int cyclades_proc_open(struct inode *inode, struct file *file)
+{
+        return single_open(file, cyclades_proc_show, NULL);
 }
 
+static const struct file_operations cyclades_proc_fops = {
+        .owner          = THIS_MODULE,
+        .open           = cyclades_proc_open,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+        .release        = single_release,
+};
+
 /* The serial driver boot-time initialization code!
     Hardware I/O ports are mapped to character special devices on a
     first found, first allocated manner.  That is, this code searches
@@ -5311,9 +5297,9 @@ static const struct tty_operations cy_ops = {
         .hangup = cy_hangup,
         .break_ctl = cy_break,
         .wait_until_sent = cy_wait_until_sent,
-        .read_proc = cyclades_get_proc_info,
         .tiocmget = cy_tiocmget,
         .tiocmset = cy_tiocmset,
+        .proc_fops = &cyclades_proc_fops,
 };
 
 static int __init cy_init(void)
diff --git a/drivers/char/ip2/ip2main.c b/drivers/char/ip2/ip2main.c
index 70e0ebc30bd0..afd9247cf082 100644
--- a/drivers/char/ip2/ip2main.c
+++ b/drivers/char/ip2/ip2main.c
@@ -139,7 +139,7 @@
 #include <linux/seq_file.h>
 
 static const struct file_operations ip2mem_proc_fops;
-static int ip2_read_proc(char *, char **, off_t, int, int *, void * );
+static const struct file_operations ip2_proc_fops;
 
 /********************/
 /* Type Definitions */
@@ -446,9 +446,9 @@ static const struct tty_operations ip2_ops = {
         .stop            = ip2_stop,
         .start           = ip2_start,
         .hangup          = ip2_hangup,
-        .read_proc       = ip2_read_proc,
         .tiocmget        = ip2_tiocmget,
         .tiocmset        = ip2_tiocmset,
+        .proc_fops       = &ip2_proc_fops,
 };
 
 /******************************************************************************/
@@ -3029,19 +3029,17 @@ static const struct file_operations ip2mem_proc_fops = {
  * different sources including ip2mkdev.c and a couple of other drivers.
  * The bugs are all mine.  :-)  =mhw=
  */
-static int ip2_read_proc(char *page, char **start, off_t off,
-                                int count, int *eof, void *data)
+static int ip2_proc_show(struct seq_file *m, void *v)
 {
         int     i, j, box;
-        int     len = 0;
         int     boxes = 0;
         int     ports = 0;
         int     tports = 0;
-        off_t   begin = 0;
         i2eBordStrPtr  pB;
+        char *sep;
 
-        len += sprintf(page, "ip2info: 1.0 driver: %s\n", pcVersion );
-        len += sprintf(page+len, "Driver: SMajor=%d CMajor=%d IMajor=%d MaxBoards=%d MaxBoxes=%d MaxPorts=%d\n",
+        seq_printf(m, "ip2info: 1.0 driver: %s\n", pcVersion);
+        seq_printf(m, "Driver: SMajor=%d CMajor=%d IMajor=%d MaxBoards=%d MaxBoxes=%d MaxPorts=%d\n",
                         IP2_TTY_MAJOR, IP2_CALLOUT_MAJOR, IP2_IPL_MAJOR,
                         IP2_MAX_BOARDS, ABS_MAX_BOXES, ABS_BIGGEST_BOX);
 
@@ -3053,7 +3051,8 @@ static int ip2_read_proc(char *page, char **start, off_t off,
                         switch( pB->i2ePom.e.porID & ~POR_ID_RESERVED ) 
                         {
                         case POR_ID_FIIEX:
-                                len += sprintf( page+len, "Board %d: EX ports=", i );
+                                seq_printf(m, "Board %d: EX ports=", i);
+                                sep = "";
                                 for( box = 0; box < ABS_MAX_BOXES; ++box )
                                 {
                                         ports = 0;
@@ -3065,79 +3064,74 @@ static int ip2_read_proc(char *page, char **start, off_t off,
                                                         ++ports;
                                                 }
                                         }
-                                        len += sprintf( page+len, "%d,", ports );
+                                        seq_printf(m, "%s%d", sep, ports);
+                                        sep = ",";
                                         tports += ports;
                                 }
-
-                                --len;  /* Backup over that last comma */
-
-                                len += sprintf( page+len, " boxes=%d width=%d", boxes, pB->i2eDataWidth16 ? 16 : 8 );
+                                seq_printf(m, " boxes=%d width=%d", boxes, pB->i2eDataWidth16 ? 16 : 8);
                                 break;
 
                         case POR_ID_II_4:
-                                len += sprintf(page+len, "Board %d: ISA-4 ports=4 boxes=1", i );
+                                seq_printf(m, "Board %d: ISA-4 ports=4 boxes=1", i);
                                 tports = ports = 4;
                                 break;
 
                         case POR_ID_II_8:
-                                len += sprintf(page+len, "Board %d: ISA-8-std ports=8 boxes=1", i );
+                                seq_printf(m, "Board %d: ISA-8-std ports=8 boxes=1", i);
                                 tports = ports = 8;
                                 break;
 
                         case POR_ID_II_8R:
-                                len += sprintf(page+len, "Board %d: ISA-8-RJ11 ports=8 boxes=1", i );
+                                seq_printf(m, "Board %d: ISA-8-RJ11 ports=8 boxes=1", i);
                                 tports = ports = 8;
                                 break;
 
                         default:
-                                len += sprintf(page+len, "Board %d: unknown", i );
+                                seq_printf(m, "Board %d: unknown", i);
                                 /* Don't try and probe for minor numbers */
                                 tports = ports = 0;
                         }
 
                 } else {
                         /* Don't try and probe for minor numbers */
-                        len += sprintf(page+len, "Board %d: vacant", i );
+                        seq_printf(m, "Board %d: vacant", i);
                         tports = ports = 0;
                 }
 
                 if( tports ) {
-                        len += sprintf(page+len, " minors=" );
-
+                        seq_puts(m, " minors=");
+                        sep = "";
                         for ( box = 0; box < ABS_MAX_BOXES; ++box )
                         {
                                 for ( j = 0; j < ABS_BIGGEST_BOX; ++j )
                                 {
                                         if ( pB->i2eChannelMap[box] & (1 << j) )
                                         {
-                                                len += sprintf (page+len,"%d,",
+                                                seq_printf(m, "%s%d", sep,
                                                         j + ABS_BIGGEST_BOX *
                                                         (box+i*ABS_MAX_BOXES));
+                                                sep = ",";
                                         }
                                 }
                         }
-
-                        page[ len - 1 ] = '\n'; /* Overwrite that last comma */
-                } else {
-                        len += sprintf (page+len,"\n" );
-                }
-
-                if (len+begin > off+count)
-                        break;
-                if (len+begin < off) {
-                        begin += len;
-                        len = 0;
                 }
+                seq_putc(m, '\n');
         }
+        return 0;
+ }
 
-        if (i >= IP2_MAX_BOARDS)
-                *eof = 1;
-        if (off >= len+begin)
-                return 0;
+static int ip2_proc_open(struct inode *inode, struct file *file)
+{
+        return single_open(file, ip2_proc_show, NULL);
+}
 
-        *start = page + (off-begin);
-        return ((count < begin+len-off) ? count : begin+len-off);
- }
+static const struct file_operations ip2_proc_fops = {
+        .owner          = THIS_MODULE,
+        .open           = ip2_proc_open,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+        .release        = single_release,
+};
  
 /******************************************************************************/
 /* Function:   ip2trace()                                                     */
diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c
index 7a88dfd4427b..e93fc8d22fb2 100644
--- a/drivers/char/ipmi/ipmi_msghandler.c
+++ b/drivers/char/ipmi/ipmi_msghandler.c
@@ -1944,7 +1944,7 @@ static int stat_file_read_proc(char *page, char **start, off_t off,
 
 int ipmi_smi_add_proc_entry(ipmi_smi_t smi, char *name,
                             read_proc_t *read_proc,
-                            void *data, struct module *owner)
+                            void *data)
 {
         int                    rv = 0;
 #ifdef CONFIG_PROC_FS
@@ -1970,7 +1970,6 @@ int ipmi_smi_add_proc_entry(ipmi_smi_t smi, char *name,
         } else {
                 file->data = data;
                 file->read_proc = read_proc;
-                file->owner = owner;
 
                 mutex_lock(&smi->proc_entry_lock);
                 /* Stick it on the list. */
@@ -1993,23 +1992,21 @@ static int add_proc_entries(ipmi_smi_t smi, int num)
         smi->proc_dir = proc_mkdir(smi->proc_dir_name, proc_ipmi_root);
         if (!smi->proc_dir)
                 rv = -ENOMEM;
-        else
-                smi->proc_dir->owner = THIS_MODULE;
 
         if (rv == 0)
                 rv = ipmi_smi_add_proc_entry(smi, "stats",
                                              stat_file_read_proc,
-                                             smi, THIS_MODULE);
+                                             smi);
 
         if (rv == 0)
                 rv = ipmi_smi_add_proc_entry(smi, "ipmb",
                                              ipmb_file_read_proc,
-                                             smi, THIS_MODULE);
+                                             smi);
 
         if (rv == 0)
                 rv = ipmi_smi_add_proc_entry(smi, "version",
                                              version_file_read_proc,
-                                             smi, THIS_MODULE);
+                                             smi);
 #endif /* CONFIG_PROC_FS */
 
         return rv;
@@ -4265,7 +4262,6 @@ static int ipmi_init_msghandler(void)
             return -ENOMEM;
         }
 
-        proc_ipmi_root->owner = THIS_MODULE;
 #endif /* CONFIG_PROC_FS */
 
         setup_timer(&ipmi_timer, ipmi_timeout, 0);
diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
index 3000135f2ead..e58ea4cd55ce 100644
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
@@ -2899,7 +2899,7 @@ static int try_smi_init(struct smi_info *new_smi)
 
         rv = ipmi_smi_add_proc_entry(new_smi->intf, "type",
                                      type_file_read_proc,
-                                     new_smi, THIS_MODULE);
+                                     new_smi);
         if (rv) {
                 printk(KERN_ERR
                        "ipmi_si: Unable to create proc entry: %d\n",
@@ -2909,7 +2909,7 @@ static int try_smi_init(struct smi_info *new_smi)
 
         rv = ipmi_smi_add_proc_entry(new_smi->intf, "si_stats",
                                      stat_file_read_proc,
-                                     new_smi, THIS_MODULE);
+                                     new_smi);
         if (rv) {
                 printk(KERN_ERR
                        "ipmi_si: Unable to create proc entry: %d\n",
@@ -2919,7 +2919,7 @@ static int try_smi_init(struct smi_info *new_smi)
 
         rv = ipmi_smi_add_proc_entry(new_smi->intf, "params",
                                      param_read_proc,
-                                     new_smi, THIS_MODULE);
+                                     new_smi);
         if (rv) {
                 printk(KERN_ERR
                        "ipmi_si: Unable to create proc entry: %d\n",
diff --git a/drivers/char/istallion.c b/drivers/char/istallion.c
index 5c3dc6b8411c..fff19f7e29d2 100644
--- a/drivers/char/istallion.c
+++ b/drivers/char/istallion.c
@@ -24,6 +24,7 @@
 #include <linux/tty.h>
 #include <linux/tty_flip.h>
 #include <linux/serial.h>
+#include <linux/seq_file.h>
 #include <linux/cdk.h>
 #include <linux/comstats.h>
 #include <linux/istallion.h>
@@ -613,7 +614,6 @@ static int	stli_breakctl(struct tty_struct *tty, int state);
 static void     stli_waituntilsent(struct tty_struct *tty, int timeout);
 static void     stli_sendxchar(struct tty_struct *tty, char ch);
 static void     stli_hangup(struct tty_struct *tty);
-static int      stli_portinfo(struct stlibrd *brdp, struct stliport *portp, int portnr, char *pos);
 
 static int      stli_brdinit(struct stlibrd *brdp);
 static int      stli_startbrd(struct stlibrd *brdp);
@@ -1893,20 +1893,10 @@ static void stli_sendxchar(struct tty_struct *tty, char ch)
         stli_cmdwait(brdp, portp, A_PORTCTRL, &actrl, sizeof(asyctrl_t), 0);
 }
 
-/*****************************************************************************/
-
-#define MAXLINE         80
-
-/*
- *      Format info for a specified port. The line is deliberately limited
- *      to 80 characters. (If it is too long it will be truncated, if too
- *      short then padded with spaces).
- */
-
-static int stli_portinfo(struct stlibrd *brdp, struct stliport *portp, int portnr, char *pos)
+static void stli_portinfo(struct seq_file *m, struct stlibrd *brdp, struct stliport *portp, int portnr)
 {
-        char *sp, *uart;
-        int rc, cnt;
+        char *uart;
+        int rc;
 
         rc = stli_portcmdstats(NULL, portp);
 
@@ -1918,44 +1908,50 @@ static int stli_portinfo(struct stlibrd *brdp, struct stliport *portp, int portn
                 default:uart = "CD1400"; break;
                 }
         }
-
-        sp = pos;
-        sp += sprintf(sp, "%d: uart:%s ", portnr, uart);
+        seq_printf(m, "%d: uart:%s ", portnr, uart);
 
         if ((brdp->state & BST_STARTED) && (rc >= 0)) {
-                sp += sprintf(sp, "tx:%d rx:%d", (int) stli_comstats.txtotal,
+                char sep;
+
+                seq_printf(m, "tx:%d rx:%d", (int) stli_comstats.txtotal,
                         (int) stli_comstats.rxtotal);
 
                 if (stli_comstats.rxframing)
-                        sp += sprintf(sp, " fe:%d",
+                        seq_printf(m, " fe:%d",
                                 (int) stli_comstats.rxframing);
                 if (stli_comstats.rxparity)
-                        sp += sprintf(sp, " pe:%d",
+                        seq_printf(m, " pe:%d",
                                 (int) stli_comstats.rxparity);
                 if (stli_comstats.rxbreaks)
-                        sp += sprintf(sp, " brk:%d",
+                        seq_printf(m, " brk:%d",
                                 (int) stli_comstats.rxbreaks);
                 if (stli_comstats.rxoverrun)
-                        sp += sprintf(sp, " oe:%d",
+                        seq_printf(m, " oe:%d",
                                 (int) stli_comstats.rxoverrun);
 
-                cnt = sprintf(sp, "%s%s%s%s%s ",
-                        (stli_comstats.signals & TIOCM_RTS) ? "|RTS" : "",
-                        (stli_comstats.signals & TIOCM_CTS) ? "|CTS" : "",
-                        (stli_comstats.signals & TIOCM_DTR) ? "|DTR" : "",
-                        (stli_comstats.signals & TIOCM_CD) ? "|DCD" : "",
-                        (stli_comstats.signals & TIOCM_DSR) ? "|DSR" : "");
-                *sp = ' ';
-                sp += cnt;
+                sep = ' ';
+                if (stli_comstats.signals & TIOCM_RTS) {
+                        seq_printf(m, "%c%s", sep, "RTS");
+                        sep = '|';
+                }
+                if (stli_comstats.signals & TIOCM_CTS) {
+                        seq_printf(m, "%c%s", sep, "CTS");
+                        sep = '|';
+                }
+                if (stli_comstats.signals & TIOCM_DTR) {
+                        seq_printf(m, "%c%s", sep, "DTR");
+                        sep = '|';
+                }
+                if (stli_comstats.signals & TIOCM_CD) {
+                        seq_printf(m, "%c%s", sep, "DCD");
+                        sep = '|';
+                }
+                if (stli_comstats.signals & TIOCM_DSR) {
+                        seq_printf(m, "%c%s", sep, "DSR");
+                        sep = '|';
+                }
         }
-
-        for (cnt = (sp - pos); (cnt < (MAXLINE - 1)); cnt++)
-                *sp++ = ' ';
-        if (cnt >= MAXLINE)
-                pos[(MAXLINE - 2)] = '+';
-        pos[(MAXLINE - 1)] = '\n';
-
-        return(MAXLINE);
+        seq_putc(m, '\n');
 }
 
 /*****************************************************************************/
@@ -1964,26 +1960,15 @@ static int stli_portinfo(struct stlibrd *brdp, struct stliport *portp, int portn
  *      Port info, read from the /proc file system.
  */
 
-static int stli_readproc(char *page, char **start, off_t off, int count, int *eof, void *data)
+static int stli_proc_show(struct seq_file *m, void *v)
 {
         struct stlibrd *brdp;
         struct stliport *portp;
         unsigned int brdnr, portnr, totalport;
-        int curoff, maxoff;
-        char *pos;
 
-        pos = page;
         totalport = 0;
-        curoff = 0;
-
-        if (off == 0) {
-                pos += sprintf(pos, "%s: version %s", stli_drvtitle,
-                        stli_drvversion);
-                while (pos < (page + MAXLINE - 1))
-                        *pos++ = ' ';
-                *pos++ = '\n';
-        }
-        curoff =  MAXLINE;
+
+        seq_printf(m, "%s: version %s\n", stli_drvtitle, stli_drvversion);
 
 /*
  *      We scan through for each board, panel and port. The offset is
@@ -1996,33 +1981,31 @@ static int stli_readproc(char *page, char **start, off_t off, int count, int *eo
                 if (brdp->state == 0)
                         continue;
 
-                maxoff = curoff + (brdp->nrports * MAXLINE);
-                if (off >= maxoff) {
-                        curoff = maxoff;
-                        continue;
-                }
-
                 totalport = brdnr * STL_MAXPORTS;
                 for (portnr = 0; (portnr < brdp->nrports); portnr++,
                     totalport++) {
                         portp = brdp->ports[portnr];
                         if (portp == NULL)
                                 continue;
-                        if (off >= (curoff += MAXLINE))
-                                continue;
-                        if ((pos - page + MAXLINE) > count)
-                                goto stli_readdone;
-                        pos += stli_portinfo(brdp, portp, totalport, pos);
+                        stli_portinfo(m, brdp, portp, totalport);
                 }
         }
+        return 0;
+}
 
-        *eof = 1;
-
-stli_readdone:
-        *start = page;
-        return(pos - page);
+static int stli_proc_open(struct inode *inode, struct file *file)
+{
+        return single_open(file, stli_proc_show, NULL);
 }
 
+static const struct file_operations stli_proc_fops = {
+        .owner          = THIS_MODULE,
+        .open           = stli_proc_open,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+        .release        = single_release,
+};
+
 /*****************************************************************************/
 
 /*
@@ -4427,9 +4410,9 @@ static const struct tty_operations stli_ops = {
         .break_ctl = stli_breakctl,
         .wait_until_sent = stli_waituntilsent,
         .send_xchar = stli_sendxchar,
-        .read_proc = stli_readproc,
         .tiocmget = stli_tiocmget,
         .tiocmset = stli_tiocmset,
+        .proc_fops = &stli_proc_fops,
 };
 
 static const struct tty_port_operations stli_port_ops = {
diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c
index 5608a1e5a3b3..19d79fc54461 100644
--- a/drivers/char/pcmcia/synclink_cs.c
+++ b/drivers/char/pcmcia/synclink_cs.c
@@ -51,6 +51,7 @@
 #include <linux/ptrace.h>
 #include <linux/ioport.h>
 #include <linux/mm.h>
+#include <linux/seq_file.h>
 #include <linux/slab.h>
 #include <linux/netdevice.h>
 #include <linux/vmalloc.h>
@@ -2619,13 +2620,12 @@ cleanup:
  * /proc fs routines....
  */
 
-static inline int line_info(char *buf, MGSLPC_INFO *info)
+static inline void line_info(struct seq_file *m, MGSLPC_INFO *info)
 {
         char    stat_buf[30];
-        int     ret;
         unsigned long flags;
 
-        ret = sprintf(buf, "%s:io:%04X irq:%d",
+        seq_printf(m, "%s:io:%04X irq:%d",
                       info->device_name, info->io_base, info->irq_level);
 
         /* output current serial signal states */
@@ -2649,75 +2649,70 @@ static inline int line_info(char *buf, MGSLPC_INFO *info)
                 strcat(stat_buf, "|RI");
 
         if (info->params.mode == MGSL_MODE_HDLC) {
-                ret += sprintf(buf+ret, " HDLC txok:%d rxok:%d",
+                seq_printf(m, " HDLC txok:%d rxok:%d",
                               info->icount.txok, info->icount.rxok);
                 if (info->icount.txunder)
-                        ret += sprintf(buf+ret, " txunder:%d", info->icount.txunder);
+                        seq_printf(m, " txunder:%d", info->icount.txunder);
                 if (info->icount.txabort)
-                        ret += sprintf(buf+ret, " txabort:%d", info->icount.txabort);
+                        seq_printf(m, " txabort:%d", info->icount.txabort);
                 if (info->icount.rxshort)
-                        ret += sprintf(buf+ret, " rxshort:%d", info->icount.rxshort);
+                        seq_printf(m, " rxshort:%d", info->icount.rxshort);
                 if (info->icount.rxlong)
-                        ret += sprintf(buf+ret, " rxlong:%d", info->icount.rxlong);
+                        seq_printf(m, " rxlong:%d", info->icount.rxlong);
                 if (info->icount.rxover)
-                        ret += sprintf(buf+ret, " rxover:%d", info->icount.rxover);
+                        seq_printf(m, " rxover:%d", info->icount.rxover);
                 if (info->icount.rxcrc)
-                        ret += sprintf(buf+ret, " rxcrc:%d", info->icount.rxcrc);
+                        seq_printf(m, " rxcrc:%d", info->icount.rxcrc);
         } else {
-                ret += sprintf(buf+ret, " ASYNC tx:%d rx:%d",
+                seq_printf(m, " ASYNC tx:%d rx:%d",
                               info->icount.tx, info->icount.rx);
                 if (info->icount.frame)
-                        ret += sprintf(buf+ret, " fe:%d", info->icount.frame);
+                        seq_printf(m, " fe:%d", info->icount.frame);
                 if (info->icount.parity)
-                        ret += sprintf(buf+ret, " pe:%d", info->icount.parity);
+                        seq_printf(m, " pe:%d", info->icount.parity);
                 if (info->icount.brk)
-                        ret += sprintf(buf+ret, " brk:%d", info->icount.brk);
+                        seq_printf(m, " brk:%d", info->icount.brk);
                 if (info->icount.overrun)
-                        ret += sprintf(buf+ret, " oe:%d", info->icount.overrun);
+                        seq_printf(m, " oe:%d", info->icount.overrun);
         }
 
         /* Append serial signal status to end */
-        ret += sprintf(buf+ret, " %s\n", stat_buf+1);
+        seq_printf(m, " %s\n", stat_buf+1);
 
-        ret += sprintf(buf+ret, "txactive=%d bh_req=%d bh_run=%d pending_bh=%x\n",
+        seq_printf(m, "txactive=%d bh_req=%d bh_run=%d pending_bh=%x\n",
                        info->tx_active,info->bh_requested,info->bh_running,
                        info->pending_bh);
-
-        return ret;
 }
 
 /* Called to print information about devices
  */
-static int mgslpc_read_proc(char *page, char **start, off_t off, int count,
-                 int *eof, void *data)
+static int mgslpc_proc_show(struct seq_file *m, void *v)
 {
-        int len = 0, l;
-        off_t   begin = 0;
         MGSLPC_INFO *info;
 
-        len += sprintf(page, "synclink driver:%s\n", driver_version);
+        seq_printf(m, "synclink driver:%s\n", driver_version);
 
         info = mgslpc_device_list;
         while( info ) {
-                l = line_info(page + len, info);
-                len += l;
-                if (len+begin > off+count)
-                        goto done;
-                if (len+begin < off) {
-                        begin += len;
-                        len = 0;
-                }
+                line_info(m, info);
                 info = info->next_device;
         }
+        return 0;
+}
 
-        *eof = 1;
-done:
-        if (off >= len+begin)
-                return 0;
-        *start = page + (off-begin);
-        return ((count < begin+len-off) ? count : begin+len-off);
+static int mgslpc_proc_open(struct inode *inode, struct file *file)
+{
+        return single_open(file, mgslpc_proc_show, NULL);
 }
 
+static const struct file_operations mgslpc_proc_fops = {
+        .owner          = THIS_MODULE,
+        .open           = mgslpc_proc_open,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+        .release        = single_release,
+};
+
 static int rx_alloc_buffers(MGSLPC_INFO *info)
 {
         /* each buffer has header and data */
@@ -2861,13 +2856,13 @@ static const struct tty_operations mgslpc_ops = {
         .send_xchar = mgslpc_send_xchar,
         .break_ctl = mgslpc_break,
         .wait_until_sent = mgslpc_wait_until_sent,
-        .read_proc = mgslpc_read_proc,
         .set_termios = mgslpc_set_termios,
         .stop = tx_pause,
         .start = tx_release,
         .hangup = mgslpc_hangup,
         .tiocmget = tiocmget,
         .tiocmset = tiocmset,
+        .proc_fops = &mgslpc_proc_fops,
 };
 
 static void synclink_cs_cleanup(void)
diff --git a/drivers/char/stallion.c b/drivers/char/stallion.c
index e1e0dd89ac9a..2ad813a801dc 100644
--- a/drivers/char/stallion.c
+++ b/drivers/char/stallion.c
@@ -32,6 +32,7 @@
 #include <linux/tty.h>
 #include <linux/tty_flip.h>
 #include <linux/serial.h>
+#include <linux/seq_file.h>
 #include <linux/cd1400.h>
 #include <linux/sc26198.h>
 #include <linux/comstats.h>
@@ -1379,52 +1380,47 @@ static void stl_sendxchar(struct tty_struct *tty, char ch)
                 stl_putchar(tty, ch);
 }
 
-/*****************************************************************************/
-
-#define MAXLINE         80
-
-/*
- *      Format info for a specified port. The line is deliberately limited
- *      to 80 characters. (If it is too long it will be truncated, if too
- *      short then padded with spaces).
- */
-
-static int stl_portinfo(struct stlport *portp, int portnr, char *pos)
+static void stl_portinfo(struct seq_file *m, struct stlport *portp, int portnr)
 {
-        char    *sp;
-        int     sigs, cnt;
+        int     sigs;
+        char sep;
 
-        sp = pos;
-        sp += sprintf(sp, "%d: uart:%s tx:%d rx:%d",
+        seq_printf(m, "%d: uart:%s tx:%d rx:%d",
                 portnr, (portp->hwid == 1) ? "SC26198" : "CD1400",
                 (int) portp->stats.txtotal, (int) portp->stats.rxtotal);
 
         if (portp->stats.rxframing)
-                sp += sprintf(sp, " fe:%d", (int) portp->stats.rxframing);
+                seq_printf(m, " fe:%d", (int) portp->stats.rxframing);
         if (portp->stats.rxparity)
-                sp += sprintf(sp, " pe:%d", (int) portp->stats.rxparity);
+                seq_printf(m, " pe:%d", (int) portp->stats.rxparity);
         if (portp->stats.rxbreaks)
-                sp += sprintf(sp, " brk:%d", (int) portp->stats.rxbreaks);
+                seq_printf(m, " brk:%d", (int) portp->stats.rxbreaks);
         if (portp->stats.rxoverrun)
-                sp += sprintf(sp, " oe:%d", (int) portp->stats.rxoverrun);
+                seq_printf(m, " oe:%d", (int) portp->stats.rxoverrun);
 
         sigs = stl_getsignals(portp);
-        cnt = sprintf(sp, "%s%s%s%s%s ",
-                (sigs & TIOCM_RTS) ? "|RTS" : "",
-                (sigs & TIOCM_CTS) ? "|CTS" : "",
-                (sigs & TIOCM_DTR) ? "|DTR" : "",
-                (sigs & TIOCM_CD) ? "|DCD" : "",
-                (sigs & TIOCM_DSR) ? "|DSR" : "");
-        *sp = ' ';
-        sp += cnt;
-
-        for (cnt = sp - pos; cnt < (MAXLINE - 1); cnt++)
-                *sp++ = ' ';
-        if (cnt >= MAXLINE)
-                pos[(MAXLINE - 2)] = '+';
-        pos[(MAXLINE - 1)] = '\n';
-
-        return MAXLINE;
+        sep = ' ';
+        if (sigs & TIOCM_RTS) {
+                seq_printf(m, "%c%s", sep, "RTS");
+                sep = '|';
+        }
+        if (sigs & TIOCM_CTS) {
+                seq_printf(m, "%c%s", sep, "CTS");
+                sep = '|';
+        }
+        if (sigs & TIOCM_DTR) {
+                seq_printf(m, "%c%s", sep, "DTR");
+                sep = '|';
+        }
+        if (sigs & TIOCM_CD) {
+                seq_printf(m, "%c%s", sep, "DCD");
+                sep = '|';
+        }
+        if (sigs & TIOCM_DSR) {
+                seq_printf(m, "%c%s", sep, "DSR");
+                sep = '|';
+        }
+        seq_putc(m, '\n');
 }
 
 /*****************************************************************************/
@@ -1433,30 +1429,17 @@ static int stl_portinfo(struct stlport *portp, int portnr, char *pos)
  *      Port info, read from the /proc file system.
  */
 
-static int stl_readproc(char *page, char **start, off_t off, int count, int *eof, void *data)
+static int stl_proc_show(struct seq_file *m, void *v)
 {
         struct stlbrd   *brdp;
         struct stlpanel *panelp;
         struct stlport  *portp;
         unsigned int    brdnr, panelnr, portnr;
-        int             totalport, curoff, maxoff;
-        char            *pos;
+        int             totalport;
 
-        pr_debug("stl_readproc(page=%p,start=%p,off=%lx,count=%d,eof=%p,"
-                "data=%p\n", page, start, off, count, eof, data);
-
-        pos = page;
         totalport = 0;
-        curoff = 0;
-
-        if (off == 0) {
-                pos += sprintf(pos, "%s: version %s", stl_drvtitle,
-                        stl_drvversion);
-                while (pos < (page + MAXLINE - 1))
-                        *pos++ = ' ';
-                *pos++ = '\n';
-        }
-        curoff =  MAXLINE;
+
+        seq_printf(m, "%s: version %s\n", stl_drvtitle, stl_drvversion);
 
 /*
  *      We scan through for each board, panel and port. The offset is
@@ -1469,46 +1452,37 @@ static int stl_readproc(char *page, char **start, off_t off, int count, int *eof
                 if (brdp->state == 0)
                         continue;
 
-                maxoff = curoff + (brdp->nrports * MAXLINE);
-                if (off >= maxoff) {
-                        curoff = maxoff;
-                        continue;
-                }
-
                 totalport = brdnr * STL_MAXPORTS;
                 for (panelnr = 0; panelnr < brdp->nrpanels; panelnr++) {
                         panelp = brdp->panels[panelnr];
                         if (panelp == NULL)
                                 continue;
 
-                        maxoff = curoff + (panelp->nrports * MAXLINE);
-                        if (off >= maxoff) {
-                                curoff = maxoff;
-                                totalport += panelp->nrports;
-                                continue;
-                        }
-
                         for (portnr = 0; portnr < panelp->nrports; portnr++,
                             totalport++) {
                                 portp = panelp->ports[portnr];
                                 if (portp == NULL)
                                         continue;
-                                if (off >= (curoff += MAXLINE))
-                                        continue;
-                                if ((pos - page + MAXLINE) > count)
-                                        goto stl_readdone;
-                                pos += stl_portinfo(portp, totalport, pos);
+                                stl_portinfo(m, portp, totalport);
                         }
                 }
         }
+        return 0;
+}
 
-        *eof = 1;
-
-stl_readdone:
-        *start = page;
-        return pos - page;
+static int stl_proc_open(struct inode *inode, struct file *file)
+{
+        return single_open(file, stl_proc_show, NULL);
 }
 
+static const struct file_operations stl_proc_fops = {
+        .owner          = THIS_MODULE,
+        .open           = stl_proc_open,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+        .release        = single_release,
+};
+
 /*****************************************************************************/
 
 /*
@@ -2566,9 +2540,9 @@ static const struct tty_operations stl_ops = {
         .break_ctl = stl_breakctl,
         .wait_until_sent = stl_waituntilsent,
         .send_xchar = stl_sendxchar,
-        .read_proc = stl_readproc,
         .tiocmget = stl_tiocmget,
         .tiocmset = stl_tiocmset,
+        .proc_fops = &stl_proc_fops,
 };
 
 static const struct tty_port_operations stl_port_ops = {
diff --git a/drivers/char/synclink.c b/drivers/char/synclink.c
index 0057a8f58cb1..afd0b26ca056 100644
--- a/drivers/char/synclink.c
+++ b/drivers/char/synclink.c
@@ -79,6 +79,7 @@
 #include <linux/ptrace.h>
 #include <linux/ioport.h>
 #include <linux/mm.h>
+#include <linux/seq_file.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/netdevice.h>
@@ -3459,18 +3460,17 @@ cleanup:
  * /proc fs routines....
  */
 
-static inline int line_info(char *buf, struct mgsl_struct *info)
+static inline void line_info(struct seq_file *m, struct mgsl_struct *info)
 {
         char    stat_buf[30];
-        int     ret;
         unsigned long flags;
 
         if (info->bus_type == MGSL_BUS_TYPE_PCI) {
-                ret = sprintf(buf, "%s:PCI io:%04X irq:%d mem:%08X lcr:%08X",
+                seq_printf(m, "%s:PCI io:%04X irq:%d mem:%08X lcr:%08X",
                         info->device_name, info->io_base, info->irq_level,
                         info->phys_memory_base, info->phys_lcr_base);
         } else {
-                ret = sprintf(buf, "%s:(E)ISA io:%04X irq:%d dma:%d",
+                seq_printf(m, "%s:(E)ISA io:%04X irq:%d dma:%d",
                         info->device_name, info->io_base, 
                         info->irq_level, info->dma_level);
         }
@@ -3497,37 +3497,37 @@ static inline int line_info(char *buf, struct mgsl_struct *info)
 
         if (info->params.mode == MGSL_MODE_HDLC ||
             info->params.mode == MGSL_MODE_RAW ) {
-                ret += sprintf(buf+ret, " HDLC txok:%d rxok:%d",
+                seq_printf(m, " HDLC txok:%d rxok:%d",
                               info->icount.txok, info->icount.rxok);
                 if (info->icount.txunder)
-                        ret += sprintf(buf+ret, " txunder:%d", info->icount.txunder);
+                        seq_printf(m, " txunder:%d", info->icount.txunder);
                 if (info->icount.txabort)
-                        ret += sprintf(buf+ret, " txabort:%d", info->icount.txabort);
+                        seq_printf(m, " txabort:%d", info->icount.txabort);
                 if (info->icount.rxshort)
-                        ret += sprintf(buf+ret, " rxshort:%d", info->icount.rxshort);   
+                        seq_printf(m, " rxshort:%d", info->icount.rxshort);
                 if (info->icount.rxlong)
-                        ret += sprintf(buf+ret, " rxlong:%d", info->icount.rxlong);
+                        seq_printf(m, " rxlong:%d", info->icount.rxlong);
                 if (info->icount.rxover)
-                        ret += sprintf(buf+ret, " rxover:%d", info->icount.rxover);
+                        seq_printf(m, " rxover:%d", info->icount.rxover);
                 if (info->icount.rxcrc)
-                        ret += sprintf(buf+ret, " rxcrc:%d", info->icount.rxcrc);
+                        seq_printf(m, " rxcrc:%d", info->icount.rxcrc);
         } else {
-                ret += sprintf(buf+ret, " ASYNC tx:%d rx:%d",
+                seq_printf(m, " ASYNC tx:%d rx:%d",
                               info->icount.tx, info->icount.rx);
                 if (info->icount.frame)
-                        ret += sprintf(buf+ret, " fe:%d", info->icount.frame);
+                        seq_printf(m, " fe:%d", info->icount.frame);
                 if (info->icount.parity)
-                        ret += sprintf(buf+ret, " pe:%d", info->icount.parity);
+                        seq_printf(m, " pe:%d", info->icount.parity);
                 if (info->icount.brk)
-                        ret += sprintf(buf+ret, " brk:%d", info->icount.brk);   
+                        seq_printf(m, " brk:%d", info->icount.brk);
                 if (info->icount.overrun)
-                        ret += sprintf(buf+ret, " oe:%d", info->icount.overrun);
+                        seq_printf(m, " oe:%d", info->icount.overrun);
         }
         
         /* Append serial signal status to end */
-        ret += sprintf(buf+ret, " %s\n", stat_buf+1);
+        seq_printf(m, " %s\n", stat_buf+1);
         
-        ret += sprintf(buf+ret, "txactive=%d bh_req=%d bh_run=%d pending_bh=%x\n",
+        seq_printf(m, "txactive=%d bh_req=%d bh_run=%d pending_bh=%x\n",
          info->tx_active,info->bh_requested,info->bh_running,
          info->pending_bh);
          
@@ -3544,60 +3544,40 @@ static inline int line_info(char *buf, struct mgsl_struct *info)
         u16 Tmr = usc_InReg( info, TMR );
         u16 Tccr = usc_InReg( info, TCCR );
         u16 Ccar = inw( info->io_base + CCAR );
-        ret += sprintf(buf+ret, "tcsr=%04X tdmr=%04X ticr=%04X rcsr=%04X rdmr=%04X\n"
+        seq_printf(m, "tcsr=%04X tdmr=%04X ticr=%04X rcsr=%04X rdmr=%04X\n"
                         "ricr=%04X icr =%04X dccr=%04X tmr=%04X tccr=%04X ccar=%04X\n",
                         Tcsr,Tdmr,Ticr,Rscr,Rdmr,Ricr,Icr,Dccr,Tmr,Tccr,Ccar );
         }
         spin_unlock_irqrestore(&info->irq_spinlock,flags);
-        
-        return ret;
-        
-}       /* end of line_info() */
+}
 
-/* mgsl_read_proc()
- * 
- * Called to print information about devices
- * 
- * Arguments:
- *      page    page of memory to hold returned info
- *      start   
- *      off
- *      count
- *      eof
- *      data
- *      
- * Return Value:
- */
-static int mgsl_read_proc(char *page, char **start, off_t off, int count,
-                 int *eof, void *data)
+/* Called to print information about devices */
+static int mgsl_proc_show(struct seq_file *m, void *v)
 {
-        int len = 0, l;
-        off_t   begin = 0;
         struct mgsl_struct *info;
         
-        len += sprintf(page, "synclink driver:%s\n", driver_version);
+        seq_printf(m, "synclink driver:%s\n", driver_version);
         
         info = mgsl_device_list;
         while( info ) {
-                l = line_info(page + len, info);
-                len += l;
-                if (len+begin > off+count)
-                        goto done;
-                if (len+begin < off) {
-                        begin += len;
-                        len = 0;
-                }
+                line_info(m, info);
                 info = info->next_device;
         }
+        return 0;
+}
 
-        *eof = 1;
-done:
-        if (off >= len+begin)
-                return 0;
-        *start = page + (off-begin);
-        return ((count < begin+len-off) ? count : begin+len-off);
-        
-}       /* end of mgsl_read_proc() */
+static int mgsl_proc_open(struct inode *inode, struct file *file)
+{
+        return single_open(file, mgsl_proc_show, NULL);
+}
+
+static const struct file_operations mgsl_proc_fops = {
+        .owner          = THIS_MODULE,
+        .open           = mgsl_proc_open,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+        .release        = single_release,
+};
 
 /* mgsl_allocate_dma_buffers()
  * 
@@ -4335,13 +4315,13 @@ static const struct tty_operations mgsl_ops = {
         .send_xchar = mgsl_send_xchar,
         .break_ctl = mgsl_break,
         .wait_until_sent = mgsl_wait_until_sent,
-        .read_proc = mgsl_read_proc,
         .set_termios = mgsl_set_termios,
         .stop = mgsl_stop,
         .start = mgsl_start,
         .hangup = mgsl_hangup,
         .tiocmget = tiocmget,
         .tiocmset = tiocmset,
+        .proc_fops = &mgsl_proc_fops,
 };
 
 /*
diff --git a/drivers/char/synclink_gt.c b/drivers/char/synclink_gt.c
index efb3dc928a43..6ec6e13d47d7 100644
--- a/drivers/char/synclink_gt.c
+++ b/drivers/char/synclink_gt.c
@@ -60,6 +60,7 @@
 #include <linux/ptrace.h>
 #include <linux/ioport.h>
 #include <linux/mm.h>
+#include <linux/seq_file.h>
 #include <linux/slab.h>
 #include <linux/netdevice.h>
 #include <linux/vmalloc.h>
@@ -154,7 +155,6 @@ static void tx_hold(struct tty_struct *tty);
 static void tx_release(struct tty_struct *tty);
 
 static int  ioctl(struct tty_struct *tty, struct file *file, unsigned int cmd, unsigned long arg);
-static int  read_proc(char *page, char **start, off_t off, int count,int *eof, void *data);
 static int  chars_in_buffer(struct tty_struct *tty);
 static void throttle(struct tty_struct * tty);
 static void unthrottle(struct tty_struct * tty);
@@ -1229,13 +1229,12 @@ static long slgt_compat_ioctl(struct tty_struct *tty, struct file *file,
 /*
  * proc fs support
  */
-static inline int line_info(char *buf, struct slgt_info *info)
+static inline void line_info(struct seq_file *m, struct slgt_info *info)
 {
         char stat_buf[30];
-        int ret;
         unsigned long flags;
 
-        ret = sprintf(buf, "%s: IO=%08X IRQ=%d MaxFrameSize=%u\n",
+        seq_printf(m, "%s: IO=%08X IRQ=%d MaxFrameSize=%u\n",
                       info->device_name, info->phys_reg_addr,
                       info->irq_level, info->max_frame_size);
 
@@ -1260,75 +1259,70 @@ static inline int line_info(char *buf, struct slgt_info *info)
                 strcat(stat_buf, "|RI");
 
         if (info->params.mode != MGSL_MODE_ASYNC) {
-                ret += sprintf(buf+ret, "\tHDLC txok:%d rxok:%d",
+                seq_printf(m, "\tHDLC txok:%d rxok:%d",
                                info->icount.txok, info->icount.rxok);
                 if (info->icount.txunder)
-                        ret += sprintf(buf+ret, " txunder:%d", info->icount.txunder);
+                        seq_printf(m, " txunder:%d", info->icount.txunder);
                 if (info->icount.txabort)
-                        ret += sprintf(buf+ret, " txabort:%d", info->icount.txabort);
+                        seq_printf(m, " txabort:%d", info->icount.txabort);
                 if (info->icount.rxshort)
-                        ret += sprintf(buf+ret, " rxshort:%d", info->icount.rxshort);
+                        seq_printf(m, " rxshort:%d", info->icount.rxshort);
                 if (info->icount.rxlong)
-                        ret += sprintf(buf+ret, " rxlong:%d", info->icount.rxlong);
+                        seq_printf(m, " rxlong:%d", info->icount.rxlong);
                 if (info->icount.rxover)
-                        ret += sprintf(buf+ret, " rxover:%d", info->icount.rxover);
+                        seq_printf(m, " rxover:%d", info->icount.rxover);
                 if (info->icount.rxcrc)
-                        ret += sprintf(buf+ret, " rxcrc:%d", info->icount.rxcrc);
+                        seq_printf(m, " rxcrc:%d", info->icount.rxcrc);
         } else {
-                ret += sprintf(buf+ret, "\tASYNC tx:%d rx:%d",
+                seq_printf(m, "\tASYNC tx:%d rx:%d",
                                info->icount.tx, info->icount.rx);
                 if (info->icount.frame)
-                        ret += sprintf(buf+ret, " fe:%d", info->icount.frame);
+                        seq_printf(m, " fe:%d", info->icount.frame);
                 if (info->icount.parity)
-                        ret += sprintf(buf+ret, " pe:%d", info->icount.parity);
+                        seq_printf(m, " pe:%d", info->icount.parity);
                 if (info->icount.brk)
-                        ret += sprintf(buf+ret, " brk:%d", info->icount.brk);
+                        seq_printf(m, " brk:%d", info->icount.brk);
                 if (info->icount.overrun)
-                        ret += sprintf(buf+ret, " oe:%d", info->icount.overrun);
+                        seq_printf(m, " oe:%d", info->icount.overrun);
         }
 
         /* Append serial signal status to end */
-        ret += sprintf(buf+ret, " %s\n", stat_buf+1);
+        seq_printf(m, " %s\n", stat_buf+1);
 
-        ret += sprintf(buf+ret, "\ttxactive=%d bh_req=%d bh_run=%d pending_bh=%x\n",
+        seq_printf(m, "\ttxactive=%d bh_req=%d bh_run=%d pending_bh=%x\n",
                        info->tx_active,info->bh_requested,info->bh_running,
                        info->pending_bh);
-
-        return ret;
 }
 
 /* Called to print information about devices
  */
-static int read_proc(char *page, char **start, off_t off, int count,
-                     int *eof, void *data)
+static int synclink_gt_proc_show(struct seq_file *m, void *v)
 {
-        int len = 0, l;
-        off_t   begin = 0;
         struct slgt_info *info;
 
-        len += sprintf(page, "synclink_gt driver\n");
+        seq_puts(m, "synclink_gt driver\n");
 
         info = slgt_device_list;
         while( info ) {
-                l = line_info(page + len, info);
-                len += l;
-                if (len+begin > off+count)
-                        goto done;
-                if (len+begin < off) {
-                        begin += len;
-                        len = 0;
-                }
+                line_info(m, info);
                 info = info->next_device;
         }
+        return 0;
+}
 
-        *eof = 1;
-done:
-        if (off >= len+begin)
-                return 0;
-        *start = page + (off-begin);
-        return ((count < begin+len-off) ? count : begin+len-off);
+static int synclink_gt_proc_open(struct inode *inode, struct file *file)
+{
+        return single_open(file, synclink_gt_proc_show, NULL);
 }
 
+static const struct file_operations synclink_gt_proc_fops = {
+        .owner          = THIS_MODULE,
+        .open           = synclink_gt_proc_open,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+        .release        = single_release,
+};
+
 /*
  * return count of bytes in transmit buffer
  */
@@ -3562,13 +3556,13 @@ static const struct tty_operations ops = {
         .send_xchar = send_xchar,
         .break_ctl = set_break,
         .wait_until_sent = wait_until_sent,
-        .read_proc = read_proc,
         .set_termios = set_termios,
         .stop = tx_hold,
         .start = tx_release,
         .hangup = hangup,
         .tiocmget = tiocmget,
         .tiocmset = tiocmset,
+        .proc_fops = &synclink_gt_proc_fops,
 };
 
 static void slgt_cleanup(void)
diff --git a/drivers/char/synclinkmp.c b/drivers/char/synclinkmp.c
index 8eb6c89a980e..26de60efe4b2 100644
--- a/drivers/char/synclinkmp.c
+++ b/drivers/char/synclinkmp.c
@@ -50,6 +50,7 @@
 #include <linux/ptrace.h>
 #include <linux/ioport.h>
 #include <linux/mm.h>
+#include <linux/seq_file.h>
 #include <linux/slab.h>
 #include <linux/netdevice.h>
 #include <linux/vmalloc.h>
@@ -520,7 +521,6 @@ static void tx_hold(struct tty_struct *tty);
 static void tx_release(struct tty_struct *tty);
 
 static int  ioctl(struct tty_struct *tty, struct file *file, unsigned int cmd, unsigned long arg);
-static int  read_proc(char *page, char **start, off_t off, int count,int *eof, void *data);
 static int  chars_in_buffer(struct tty_struct *tty);
 static void throttle(struct tty_struct * tty);
 static void unthrottle(struct tty_struct * tty);
@@ -1354,13 +1354,12 @@ static int ioctl(struct tty_struct *tty, struct file *file,
  * /proc fs routines....
  */
 
-static inline int line_info(char *buf, SLMP_INFO *info)
+static inline void line_info(struct seq_file *m, SLMP_INFO *info)
 {
         char    stat_buf[30];
-        int     ret;
         unsigned long flags;
 
-        ret = sprintf(buf, "%s: SCABase=%08x Mem=%08X StatusControl=%08x LCR=%08X\n"
+        seq_printf(m, "%s: SCABase=%08x Mem=%08X StatusControl=%08x LCR=%08X\n"
                        "\tIRQ=%d MaxFrameSize=%u\n",
                 info->device_name,
                 info->phys_sca_base,
@@ -1391,75 +1390,70 @@ static inline int line_info(char *buf, SLMP_INFO *info)
                 strcat(stat_buf, "|RI");
 
         if (info->params.mode == MGSL_MODE_HDLC) {
-                ret += sprintf(buf+ret, "\tHDLC txok:%d rxok:%d",
+                seq_printf(m, "\tHDLC txok:%d rxok:%d",
                               info->icount.txok, info->icount.rxok);
                 if (info->icount.txunder)
-                        ret += sprintf(buf+ret, " txunder:%d", info->icount.txunder);
+                        seq_printf(m, " txunder:%d", info->icount.txunder);
                 if (info->icount.txabort)
-                        ret += sprintf(buf+ret, " txabort:%d", info->icount.txabort);
+                        seq_printf(m, " txabort:%d", info->icount.txabort);
                 if (info->icount.rxshort)
-                        ret += sprintf(buf+ret, " rxshort:%d", info->icount.rxshort);
+                        seq_printf(m, " rxshort:%d", info->icount.rxshort);
                 if (info->icount.rxlong)
-                        ret += sprintf(buf+ret, " rxlong:%d", info->icount.rxlong);
+                        seq_printf(m, " rxlong:%d", info->icount.rxlong);
                 if (info->icount.rxover)
-                        ret += sprintf(buf+ret, " rxover:%d", info->icount.rxover);
+                        seq_printf(m, " rxover:%d", info->icount.rxover);
                 if (info->icount.rxcrc)
-                        ret += sprintf(buf+ret, " rxlong:%d", info->icount.rxcrc);
+                        seq_printf(m, " rxlong:%d", info->icount.rxcrc);
         } else {
-                ret += sprintf(buf+ret, "\tASYNC tx:%d rx:%d",
+                seq_printf(m, "\tASYNC tx:%d rx:%d",
                               info->icount.tx, info->icount.rx);
                 if (info->icount.frame)
-                        ret += sprintf(buf+ret, " fe:%d", info->icount.frame);
+                        seq_printf(m, " fe:%d", info->icount.frame);
                 if (info->icount.parity)
-                        ret += sprintf(buf+ret, " pe:%d", info->icount.parity);
+                        seq_printf(m, " pe:%d", info->icount.parity);
                 if (info->icount.brk)
-                        ret += sprintf(buf+ret, " brk:%d", info->icount.brk);
+                        seq_printf(m, " brk:%d", info->icount.brk);
                 if (info->icount.overrun)
-                        ret += sprintf(buf+ret, " oe:%d", info->icount.overrun);
+                        seq_printf(m, " oe:%d", info->icount.overrun);
         }
 
         /* Append serial signal status to end */
-        ret += sprintf(buf+ret, " %s\n", stat_buf+1);
+        seq_printf(m, " %s\n", stat_buf+1);
 
-        ret += sprintf(buf+ret, "\ttxactive=%d bh_req=%d bh_run=%d pending_bh=%x\n",
+        seq_printf(m, "\ttxactive=%d bh_req=%d bh_run=%d pending_bh=%x\n",
          info->tx_active,info->bh_requested,info->bh_running,
          info->pending_bh);
-
-        return ret;
 }
 
 /* Called to print information about devices
  */
-static int read_proc(char *page, char **start, off_t off, int count,
-              int *eof, void *data)
+static int synclinkmp_proc_show(struct seq_file *m, void *v)
 {
-        int len = 0, l;
-        off_t   begin = 0;
         SLMP_INFO *info;
 
-        len += sprintf(page, "synclinkmp driver:%s\n", driver_version);
+        seq_printf(m, "synclinkmp driver:%s\n", driver_version);
 
         info = synclinkmp_device_list;
         while( info ) {
-                l = line_info(page + len, info);
-                len += l;
-                if (len+begin > off+count)
-                        goto done;
-                if (len+begin < off) {
-                        begin += len;
-                        len = 0;
-                }
+                line_info(m, info);
                 info = info->next_device;
         }
+        return 0;
+}
 
-        *eof = 1;
-done:
-        if (off >= len+begin)
-                return 0;
-        *start = page + (off-begin);
-        return ((count < begin+len-off) ? count : begin+len-off);
+static int synclinkmp_proc_open(struct inode *inode, struct file *file)
+{
+        return single_open(file, synclinkmp_proc_show, NULL);
 }
 
+static const struct file_operations synclinkmp_proc_fops = {
+        .owner          = THIS_MODULE,
+        .open           = synclinkmp_proc_open,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+        .release        = single_release,
+};
+
 /* Return the count of bytes in transmit buffer
  */
 static int chars_in_buffer(struct tty_struct *tty)
@@ -3905,13 +3899,13 @@ static const struct tty_operations ops = {
         .send_xchar = send_xchar,
         .break_ctl = set_break,
         .wait_until_sent = wait_until_sent,
-        .read_proc = read_proc,
         .set_termios = set_termios,
         .stop = tx_hold,
         .start = tx_release,
         .hangup = hangup,
         .tiocmget = tiocmget,
         .tiocmset = tiocmset,
+        .proc_fops = &synclinkmp_proc_fops,
 };
 
 
diff --git a/drivers/char/sysrq.c b/drivers/char/sysrq.c
index 33a9351c896d..ebea9b2c30a5 100644
--- a/drivers/char/sysrq.c
+++ b/drivers/char/sysrq.c
@@ -35,7 +35,7 @@
 #include <linux/vt_kern.h>
 #include <linux/workqueue.h>
 #include <linux/kexec.h>
-#include <linux/irq.h>
+#include <linux/interrupt.h>
 #include <linux/hrtimer.h>
 #include <linux/oom.h>
 
@@ -346,6 +346,19 @@ static struct sysrq_key_op sysrq_moom_op = {
         .enable_mask    = SYSRQ_ENABLE_SIGNAL,
 };
 
+#ifdef CONFIG_BLOCK
+static void sysrq_handle_thaw(int key, struct tty_struct *tty)
+{
+        emergency_thaw_all();
+}
+static struct sysrq_key_op sysrq_thaw_op = {
+        .handler        = sysrq_handle_thaw,
+        .help_msg       = "thaw-filesystems(J)",
+        .action_msg     = "Emergency Thaw of all frozen filesystems",
+        .enable_mask    = SYSRQ_ENABLE_SIGNAL,
+};
+#endif
+
 static void sysrq_handle_kill(int key, struct tty_struct *tty)
 {
         send_sig_all(SIGKILL);
@@ -396,9 +409,13 @@ static struct sysrq_key_op *sysrq_key_table[36] = {
         &sysrq_moom_op,                 /* f */
         /* g: May be registered by ppc for kgdb */
         NULL,                           /* g */
-        NULL,                           /* h */
+        NULL,                           /* h - reserved for help */
         &sysrq_kill_op,                 /* i */
+#ifdef CONFIG_BLOCK
+        &sysrq_thaw_op,                 /* j */
+#else
         NULL,                           /* j */
+#endif
         &sysrq_SAK_op,                  /* k */
 #ifdef CONFIG_SMP
         &sysrq_showallcpus_op,          /* l */
diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
index 224f271d8cbe..33dac94922a7 100644
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
@@ -464,7 +464,7 @@ void tty_wakeup(struct tty_struct *tty)
                         tty_ldisc_deref(ld);
                 }
         }
-        wake_up_interruptible(&tty->write_wait);
+        wake_up_interruptible_poll(&tty->write_wait, POLLOUT);
 }
 
 EXPORT_SYMBOL_GPL(tty_wakeup);
@@ -587,8 +587,8 @@ static void do_tty_hangup(struct work_struct *work)
          * FIXME: Once we trust the LDISC code better we can wait here for
          * ldisc completion and fix the driver call race
          */
-        wake_up_interruptible(&tty->write_wait);
-        wake_up_interruptible(&tty->read_wait);
+        wake_up_interruptible_poll(&tty->write_wait, POLLOUT);
+        wake_up_interruptible_poll(&tty->read_wait, POLLIN);
         /*
          * Shutdown the current line discipline, and reset it to
          * N_TTY.
@@ -879,7 +879,7 @@ void stop_tty(struct tty_struct *tty)
         if (tty->link && tty->link->packet) {
                 tty->ctrl_status &= ~TIOCPKT_START;
                 tty->ctrl_status |= TIOCPKT_STOP;
-                wake_up_interruptible(&tty->link->read_wait);
+                wake_up_interruptible_poll(&tty->link->read_wait, POLLIN);
         }
         spin_unlock_irqrestore(&tty->ctrl_lock, flags);
         if (tty->ops->stop)
@@ -913,7 +913,7 @@ void start_tty(struct tty_struct *tty)
         if (tty->link && tty->link->packet) {
                 tty->ctrl_status &= ~TIOCPKT_STOP;
                 tty->ctrl_status |= TIOCPKT_START;
-                wake_up_interruptible(&tty->link->read_wait);
+                wake_up_interruptible_poll(&tty->link->read_wait, POLLIN);
         }
         spin_unlock_irqrestore(&tty->ctrl_lock, flags);
         if (tty->ops->start)
@@ -970,7 +970,7 @@ static ssize_t tty_read(struct file *file, char __user *buf, size_t count,
 void tty_write_unlock(struct tty_struct *tty)
 {
         mutex_unlock(&tty->atomic_write_lock);
-        wake_up_interruptible(&tty->write_wait);
+        wake_up_interruptible_poll(&tty->write_wait, POLLOUT);
 }
 
 int tty_write_lock(struct tty_struct *tty, int ndelay)
@@ -1623,21 +1623,21 @@ void tty_release_dev(struct file *filp)
 
                 if (tty_closing) {
                         if (waitqueue_active(&tty->read_wait)) {
-                                wake_up(&tty->read_wait);
+                                wake_up_poll(&tty->read_wait, POLLIN);
                                 do_sleep++;
                         }
                         if (waitqueue_active(&tty->write_wait)) {
-                                wake_up(&tty->write_wait);
+                                wake_up_poll(&tty->write_wait, POLLOUT);
                                 do_sleep++;
                         }
                 }
                 if (o_tty_closing) {
                         if (waitqueue_active(&o_tty->read_wait)) {
-                                wake_up(&o_tty->read_wait);
+                                wake_up_poll(&o_tty->read_wait, POLLIN);
                                 do_sleep++;
                         }
                         if (waitqueue_active(&o_tty->write_wait)) {
-                                wake_up(&o_tty->write_wait);
+                                wake_up_poll(&o_tty->write_wait, POLLOUT);
                                 do_sleep++;
                         }
                 }
diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c
index 8f0f7c449305..5f1b5400d96a 100644
--- a/drivers/firmware/dmi_scan.c
+++ b/drivers/firmware/dmi_scan.c
@@ -68,7 +68,8 @@ static char * __init dmi_string(const struct dmi_header *dm, u8 s)
  *      pointing to completely the wrong place for example
  */
 static void dmi_table(u8 *buf, int len, int num,
-                      void (*decode)(const struct dmi_header *))
+                      void (*decode)(const struct dmi_header *, void *),
+                      void *private_data)
 {
         u8 *data = buf;
         int i = 0;
@@ -89,7 +90,7 @@ static void dmi_table(u8 *buf, int len, int num,
                 while ((data - buf < len - 1) && (data[0] || data[1]))
                         data++;
                 if (data - buf < len - 1)
-                        decode(dm);
+                        decode(dm, private_data);
                 data += 2;
                 i++;
         }
@@ -99,7 +100,8 @@ static u32 dmi_base;
 static u16 dmi_len;
 static u16 dmi_num;
 
-static int __init dmi_walk_early(void (*decode)(const struct dmi_header *))
+static int __init dmi_walk_early(void (*decode)(const struct dmi_header *,
+                void *))
 {
         u8 *buf;
 
@@ -107,7 +109,7 @@ static int __init dmi_walk_early(void (*decode)(const struct dmi_header *))
         if (buf == NULL)
                 return -1;
 
-        dmi_table(buf, dmi_len, dmi_num, decode);
+        dmi_table(buf, dmi_len, dmi_num, decode, NULL);
 
         dmi_iounmap(buf, dmi_len);
         return 0;
@@ -295,7 +297,7 @@ static void __init dmi_save_extended_devices(const struct dmi_header *dm)
  *      and machine entries. For 2.5 we should pull the smbus controller info
  *      out of here.
  */
-static void __init dmi_decode(const struct dmi_header *dm)
+static void __init dmi_decode(const struct dmi_header *dm, void *dummy)
 {
         switch(dm->type) {
         case 0:         /* BIOS Information */
@@ -598,10 +600,12 @@ int dmi_get_year(int field)
 /**
  *      dmi_walk - Walk the DMI table and get called back for every record
  *      @decode: Callback function
+ *      @private_data: Private data to be passed to the callback function
  *
  *      Returns -1 when the DMI table can't be reached, 0 on success.
  */
-int dmi_walk(void (*decode)(const struct dmi_header *))
+int dmi_walk(void (*decode)(const struct dmi_header *, void *),
+             void *private_data)
 {
         u8 *buf;
 
@@ -612,7 +616,7 @@ int dmi_walk(void (*decode)(const struct dmi_header *))
         if (buf == NULL)
                 return -1;
 
-        dmi_table(buf, dmi_len, dmi_num, decode);
+        dmi_table(buf, dmi_len, dmi_num, decode, private_data);
 
         iounmap(buf);
         return 0;
diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index b4eea0292c1a..ce52bf2f235e 100644
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -343,12 +343,13 @@ config SENSORS_FSCPOS
           will be called fscpos.
 
 config SENSORS_FSCHMD
-        tristate "FSC Poseidon, Scylla, Hermes, Heimdall and Heracles"
+        tristate "Fujitsu Siemens Computers sensor chips"
         depends on X86 && I2C
         help
-          If you say yes here you get support for various Fujitsu Siemens
-          Computers sensor chips, including support for the integrated
-          watchdog.
+          If you say yes here you get support for the following Fujitsu
+          Siemens Computers (FSC) sensor chips: Poseidon, Scylla, Hermes,
+          Heimdall, Heracles, Hades and Syleus including support for the
+          integrated watchdog.
 
           This is a merged driver for FSC sensor chips replacing the fscpos,
           fscscy and fscher drivers and adding support for several other FSC
@@ -570,6 +571,17 @@ config SENSORS_LM93
           This driver can also be built as a module.  If so, the module
           will be called lm93.
 
+config SENSORS_LTC4215
+        tristate "Linear Technology LTC4215"
+        depends on I2C && EXPERIMENTAL
+        default n
+        help
+          If you say yes here you get support for Linear Technology LTC4215
+          Hot Swap Controller I2C interface.
+
+          This driver can also be built as a module. If so, the module will
+          be called ltc4215.
+
 config SENSORS_LTC4245
         tristate "Linear Technology LTC4245"
         depends on I2C && EXPERIMENTAL
@@ -581,6 +593,15 @@ config SENSORS_LTC4245
           This driver can also be built as a module. If so, the module will
           be called ltc4245.
 
+config SENSORS_LM95241
+        tristate "National Semiconductor LM95241 sensor chip"
+        depends on I2C
+        help
+          If you say yes here you get support for LM95241 sensor chip.
+
+          This driver can also be built as a module.  If so, the module
+          will be called lm95241.
+
 config SENSORS_MAX1111
         tristate "Maxim MAX1111 Multichannel, Serial 8-bit ADC chip"
         depends on SPI_MASTER
@@ -635,6 +656,20 @@ config SENSORS_PC87427
           This driver can also be built as a module.  If so, the module
           will be called pc87427.
 
+config SENSORS_PCF8591
+        tristate "Philips PCF8591 ADC/DAC"
+        depends on I2C
+        default n
+        help
+          If you say yes here you get support for Philips PCF8591 4-channel
+          ADC, 1-channel DAC chips.
+
+          This driver can also be built as a module.  If so, the module
+          will be called pcf8591.
+
+          These devices are hard to detect and rarely found on mainstream
+          hardware.  If unsure, say N.
+
 config SENSORS_SIS5595
         tristate "Silicon Integrated Systems Corp. SiS5595"
         depends on PCI
@@ -827,7 +862,7 @@ config SENSORS_W83627HF
           will be called w83627hf.
 
 config SENSORS_W83627EHF
-        tristate "Winbond W83627EHF/DHG"
+        tristate "Winbond W83627EHF/EHG/DHG, W83667HG"
         select HWMON_VID
         help
           If you say yes here you get support for the hardware
@@ -838,6 +873,8 @@ config SENSORS_W83627EHF
           chip suited for specific Intel processors that use PECI such as
           the Core 2 Duo.
 
+          This driver also supports the W83667HG chip.
+
           This driver can also be built as a module.  If so, the module
           will be called w83627ehf.
 
@@ -895,6 +932,22 @@ config SENSORS_LIS3LV02D
           Say Y here if you have an applicable laptop and want to experience
           the awesome power of lis3lv02d.
 
+config SENSORS_LIS3_SPI
+        tristate "STMicroeletronics LIS3LV02Dx three-axis digital accelerometer (SPI)"
+        depends on !ACPI && SPI_MASTER && INPUT
+        default n
+        help
+          This driver provides support for the LIS3LV02Dx accelerometer connected
+          via SPI. The accelerometer data is readable via
+          /sys/devices/platform/lis3lv02d.
+
+          This driver also provides an absolute input class device, allowing
+          the laptop to act as a pinball machine-esque joystick.
+
+          This driver can also be built as modules.  If so, the core module
+          will be called lis3lv02d and a specific module for the SPI transport
+          is called lis3lv02d_spi.
+
 config SENSORS_APPLESMC
         tristate "Apple SMC (Motion sensor, light sensor, keyboard backlight)"
         depends on INPUT && X86
diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile
index 2e80f37f39eb..3a6b1f06f8f4 100644
--- a/drivers/hwmon/Makefile
+++ b/drivers/hwmon/Makefile
@@ -52,6 +52,7 @@ obj-$(CONFIG_SENSORS_IBMPEX)	+= ibmpex.o
 obj-$(CONFIG_SENSORS_IT87)      += it87.o
 obj-$(CONFIG_SENSORS_K8TEMP)    += k8temp.o
 obj-$(CONFIG_SENSORS_LIS3LV02D) += lis3lv02d.o hp_accel.o
+obj-$(CONFIG_SENSORS_LIS3_SPI)  += lis3lv02d.o lis3lv02d_spi.o
 obj-$(CONFIG_SENSORS_LM63)      += lm63.o
 obj-$(CONFIG_SENSORS_LM70)      += lm70.o
 obj-$(CONFIG_SENSORS_LM75)      += lm75.o
@@ -64,12 +65,15 @@ obj-$(CONFIG_SENSORS_LM87)	+= lm87.o
 obj-$(CONFIG_SENSORS_LM90)      += lm90.o
 obj-$(CONFIG_SENSORS_LM92)      += lm92.o
 obj-$(CONFIG_SENSORS_LM93)      += lm93.o
+obj-$(CONFIG_SENSORS_LM95241)   += lm95241.o
+obj-$(CONFIG_SENSORS_LTC4215)   += ltc4215.o
 obj-$(CONFIG_SENSORS_LTC4245)   += ltc4245.o
 obj-$(CONFIG_SENSORS_MAX1111)   += max1111.o
 obj-$(CONFIG_SENSORS_MAX1619)   += max1619.o
 obj-$(CONFIG_SENSORS_MAX6650)   += max6650.o
 obj-$(CONFIG_SENSORS_PC87360)   += pc87360.o
 obj-$(CONFIG_SENSORS_PC87427)   += pc87427.o
+obj-$(CONFIG_SENSORS_PCF8591)   += pcf8591.o
 obj-$(CONFIG_SENSORS_SIS5595)   += sis5595.o
 obj-$(CONFIG_SENSORS_SMSC47B397)+= smsc47b397.o
 obj-$(CONFIG_SENSORS_SMSC47M1)  += smsc47m1.o
diff --git a/drivers/hwmon/ds1621.c b/drivers/hwmon/ds1621.c
index 7415381601c3..53f88f511816 100644
--- a/drivers/hwmon/ds1621.c
+++ b/drivers/hwmon/ds1621.c
@@ -81,71 +81,84 @@ struct ds1621_data {
         u8 conf;                        /* Register encoding, combined */
 };
 
-static int ds1621_probe(struct i2c_client *client,
-                        const struct i2c_device_id *id);
-static int ds1621_detect(struct i2c_client *client, int kind,
-                         struct i2c_board_info *info);
-static void ds1621_init_client(struct i2c_client *client);
-static int ds1621_remove(struct i2c_client *client);
-static struct ds1621_data *ds1621_update_client(struct device *dev);
-
-static const struct i2c_device_id ds1621_id[] = {
-        { "ds1621", ds1621 },
-        { "ds1625", ds1621 },
-        { }
-};
-MODULE_DEVICE_TABLE(i2c, ds1621_id);
-
-/* This is the driver that will be inserted */
-static struct i2c_driver ds1621_driver = {
-        .class          = I2C_CLASS_HWMON,
-        .driver = {
-                .name   = "ds1621",
-        },
-        .probe          = ds1621_probe,
-        .remove         = ds1621_remove,
-        .id_table       = ds1621_id,
-        .detect         = ds1621_detect,
-        .address_data   = &addr_data,
-};
-
-/* All registers are word-sized, except for the configuration register.
+/* Temperature registers are word-sized.
    DS1621 uses a high-byte first convention, which is exactly opposite to
    the SMBus standard. */
-static int ds1621_read_value(struct i2c_client *client, u8 reg)
+static int ds1621_read_temp(struct i2c_client *client, u8 reg)
 {
-        if (reg == DS1621_REG_CONF)
-                return i2c_smbus_read_byte_data(client, reg);
-        else
-                return swab16(i2c_smbus_read_word_data(client, reg));
+        int ret;
+
+        ret = i2c_smbus_read_word_data(client, reg);
+        if (ret < 0)
+                return ret;
+        return swab16(ret);
 }
 
-static int ds1621_write_value(struct i2c_client *client, u8 reg, u16 value)
+static int ds1621_write_temp(struct i2c_client *client, u8 reg, u16 value)
 {
-        if (reg == DS1621_REG_CONF)
-                return i2c_smbus_write_byte_data(client, reg, value);
-        else
-                return i2c_smbus_write_word_data(client, reg, swab16(value));
+        return i2c_smbus_write_word_data(client, reg, swab16(value));
 }
 
 static void ds1621_init_client(struct i2c_client *client)
 {
-        int reg = ds1621_read_value(client, DS1621_REG_CONF);
+        u8 conf, new_conf;
+
+        new_conf = conf = i2c_smbus_read_byte_data(client, DS1621_REG_CONF);
         /* switch to continuous conversion mode */
-        reg &= ~ DS1621_REG_CONFIG_1SHOT;
+        new_conf &= ~DS1621_REG_CONFIG_1SHOT;
 
         /* setup output polarity */
         if (polarity == 0)
-                reg &= ~DS1621_REG_CONFIG_POLARITY;
+                new_conf &= ~DS1621_REG_CONFIG_POLARITY;
         else if (polarity == 1)
-                reg |= DS1621_REG_CONFIG_POLARITY;
+                new_conf |= DS1621_REG_CONFIG_POLARITY;
         
-        ds1621_write_value(client, DS1621_REG_CONF, reg);
+        if (conf != new_conf)
+                i2c_smbus_write_byte_data(client, DS1621_REG_CONF, new_conf);
         
         /* start conversion */
         i2c_smbus_write_byte(client, DS1621_COM_START);
 }
 
+static struct ds1621_data *ds1621_update_client(struct device *dev)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        struct ds1621_data *data = i2c_get_clientdata(client);
+        u8 new_conf;
+
+        mutex_lock(&data->update_lock);
+
+        if (time_after(jiffies, data->last_updated + HZ + HZ / 2)
+            || !data->valid) {
+                int i;
+
+                dev_dbg(&client->dev, "Starting ds1621 update\n");
+
+                data->conf = i2c_smbus_read_byte_data(client, DS1621_REG_CONF);
+
+                for (i = 0; i < ARRAY_SIZE(data->temp); i++)
+                        data->temp[i] = ds1621_read_temp(client,
+                                                         DS1621_REG_TEMP[i]);
+
+                /* reset alarms if necessary */
+                new_conf = data->conf;
+                if (data->temp[0] > data->temp[1])      /* input > min */
+                        new_conf &= ~DS1621_ALARM_TEMP_LOW;
+                if (data->temp[0] < data->temp[2])      /* input < max */
+                        new_conf &= ~DS1621_ALARM_TEMP_HIGH;
+                if (data->conf != new_conf)
+                        i2c_smbus_write_byte_data(client, DS1621_REG_CONF,
+                                                  new_conf);
+
+                data->last_updated = jiffies;
+                data->valid = 1;
+        }
+
+        mutex_unlock(&data->update_lock);
+
+        return data;
+}
+
 static ssize_t show_temp(struct device *dev, struct device_attribute *da,
                          char *buf)
 {
@@ -160,13 +173,13 @@ static ssize_t set_temp(struct device *dev, struct device_attribute *da,
 {
         struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
         struct i2c_client *client = to_i2c_client(dev);
-        struct ds1621_data *data = ds1621_update_client(dev);
+        struct ds1621_data *data = i2c_get_clientdata(client);
         u16 val = LM75_TEMP_TO_REG(simple_strtol(buf, NULL, 10));
 
         mutex_lock(&data->update_lock);
         data->temp[attr->index] = val;
-        ds1621_write_value(client, DS1621_REG_TEMP[attr->index],
-                           data->temp[attr->index]);
+        ds1621_write_temp(client, DS1621_REG_TEMP[attr->index],
+                          data->temp[attr->index]);
         mutex_unlock(&data->update_lock);
         return count;
 }
@@ -228,13 +241,14 @@ static int ds1621_detect(struct i2c_client *client, int kind,
                 /* The NVB bit should be low if no EEPROM write has been 
                    requested during the latest 10ms, which is highly 
                    improbable in our case. */
-                conf = ds1621_read_value(client, DS1621_REG_CONF);
-                if (conf & DS1621_REG_CONFIG_NVB)
+                conf = i2c_smbus_read_byte_data(client, DS1621_REG_CONF);
+                if (conf < 0 || conf & DS1621_REG_CONFIG_NVB)
                         return -ENODEV;
                 /* The 7 lowest bits of a temperature should always be 0. */
                 for (i = 0; i < ARRAY_SIZE(DS1621_REG_TEMP); i++) {
-                        temp = ds1621_read_value(client, DS1621_REG_TEMP[i]);
-                        if (temp & 0x007f)
+                        temp = i2c_smbus_read_word_data(client,
+                                                        DS1621_REG_TEMP[i]);
+                        if (temp < 0 || (temp & 0x7f00))
                                 return -ENODEV;
                 }
         }
@@ -294,45 +308,25 @@ static int ds1621_remove(struct i2c_client *client)
         return 0;
 }
 
+static const struct i2c_device_id ds1621_id[] = {
+        { "ds1621", ds1621 },
+        { "ds1625", ds1621 },
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, ds1621_id);
 
-static struct ds1621_data *ds1621_update_client(struct device *dev)
-{
-        struct i2c_client *client = to_i2c_client(dev);
-        struct ds1621_data *data = i2c_get_clientdata(client);
-        u8 new_conf;
-
-        mutex_lock(&data->update_lock);
-
-        if (time_after(jiffies, data->last_updated + HZ + HZ / 2)
-            || !data->valid) {
-                int i;
-
-                dev_dbg(&client->dev, "Starting ds1621 update\n");
-
-                data->conf = ds1621_read_value(client, DS1621_REG_CONF);
-
-                for (i = 0; i < ARRAY_SIZE(data->temp); i++)
-                        data->temp[i] = ds1621_read_value(client,
-                                                          DS1621_REG_TEMP[i]);
-
-                /* reset alarms if necessary */
-                new_conf = data->conf;
-                if (data->temp[0] > data->temp[1])      /* input > min */
-                        new_conf &= ~DS1621_ALARM_TEMP_LOW;
-                if (data->temp[0] < data->temp[2])      /* input < max */
-                        new_conf &= ~DS1621_ALARM_TEMP_HIGH;
-                if (data->conf != new_conf)
-                        ds1621_write_value(client, DS1621_REG_CONF,
-                                           new_conf);
-
-                data->last_updated = jiffies;
-                data->valid = 1;
-        }
-
-        mutex_unlock(&data->update_lock);
-
-        return data;
-}
+/* This is the driver that will be inserted */
+static struct i2c_driver ds1621_driver = {
+        .class          = I2C_CLASS_HWMON,
+        .driver = {
+                .name   = "ds1621",
+        },
+        .probe          = ds1621_probe,
+        .remove         = ds1621_remove,
+        .id_table       = ds1621_id,
+        .detect         = ds1621_detect,
+        .address_data   = &addr_data,
+};
 
 static int __init ds1621_init(void)
 {
diff --git a/drivers/hwmon/fschmd.c b/drivers/hwmon/fschmd.c
index d07f4ef75092..ea955edde87e 100644
--- a/drivers/hwmon/fschmd.c
+++ b/drivers/hwmon/fschmd.c
@@ -1,6 +1,6 @@
 /* fschmd.c
  *
- * Copyright (C) 2007,2008 Hans de Goede <hdegoede@redhat.com>
+ * Copyright (C) 2007 - 2009 Hans de Goede <hdegoede@redhat.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@
 
 /*
  *  Merged Fujitsu Siemens hwmon driver, supporting the Poseidon, Hermes,
- *  Scylla, Heracles and Heimdall chips
+ *  Scylla, Heracles, Heimdall, Hades and Syleus chips
  *
  *  Based on the original 2.4 fscscy, 2.6 fscpos, 2.6 fscher and 2.6
  *  (candidate) fschmd drivers:
@@ -56,7 +56,7 @@ static int nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, int, 0);
 MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
         __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
-I2C_CLIENT_INSMOD_5(fscpos, fscher, fscscy, fschrc, fschmd);
+I2C_CLIENT_INSMOD_7(fscpos, fscher, fscscy, fschrc, fschmd, fschds, fscsyl);
 
 /*
  * The FSCHMD registers and other defines
@@ -75,9 +75,12 @@ I2C_CLIENT_INSMOD_5(fscpos, fscher, fscscy, fschrc, fschmd);
 #define FSCHMD_CONTROL_ALERT_LED        0x01
 
 /* watchdog */
-#define FSCHMD_REG_WDOG_PRESET          0x28
-#define FSCHMD_REG_WDOG_STATE           0x23
-#define FSCHMD_REG_WDOG_CONTROL         0x21
+static const u8 FSCHMD_REG_WDOG_CONTROL[7] =
+        { 0x21, 0x21, 0x21, 0x21, 0x21, 0x28, 0x28 };
+static const u8 FSCHMD_REG_WDOG_STATE[7] =
+        { 0x23, 0x23, 0x23, 0x23, 0x23, 0x29, 0x29 };
+static const u8 FSCHMD_REG_WDOG_PRESET[7] =
+        { 0x28, 0x28, 0x28, 0x28, 0x28, 0x2a, 0x2a };
 
 #define FSCHMD_WDOG_CONTROL_TRIGGER     0x10
 #define FSCHMD_WDOG_CONTROL_STARTED     0x10 /* the same as trigger */
@@ -87,70 +90,95 @@ I2C_CLIENT_INSMOD_5(fscpos, fscher, fscscy, fschrc, fschmd);
 #define FSCHMD_WDOG_STATE_CARDRESET     0x02
 
 /* voltages, weird order is to keep the same order as the old drivers */
-static const u8 FSCHMD_REG_VOLT[3] = { 0x45, 0x42, 0x48 };
+static const u8 FSCHMD_REG_VOLT[7][6] = {
+        { 0x45, 0x42, 0x48 },                           /* pos */
+        { 0x45, 0x42, 0x48 },                           /* her */
+        { 0x45, 0x42, 0x48 },                           /* scy */
+        { 0x45, 0x42, 0x48 },                           /* hrc */
+        { 0x45, 0x42, 0x48 },                           /* hmd */
+        { 0x21, 0x20, 0x22 },                           /* hds */
+        { 0x21, 0x20, 0x22, 0x23, 0x24, 0x25 },         /* syl */
+};
+
+static const int FSCHMD_NO_VOLT_SENSORS[7] = { 3, 3, 3, 3, 3, 3, 6 };
 
 /* minimum pwm at which the fan is driven (pwm can by increased depending on
    the temp. Notice that for the scy some fans share there minimum speed.
    Also notice that with the scy the sensor order is different than with the
    other chips, this order was in the 2.4 driver and kept for consistency. */
-static const u8 FSCHMD_REG_FAN_MIN[5][6] = {
+static const u8 FSCHMD_REG_FAN_MIN[7][7] = {
         { 0x55, 0x65 },                                 /* pos */
         { 0x55, 0x65, 0xb5 },                           /* her */
         { 0x65, 0x65, 0x55, 0xa5, 0x55, 0xa5 },         /* scy */
         { 0x55, 0x65, 0xa5, 0xb5 },                     /* hrc */
         { 0x55, 0x65, 0xa5, 0xb5, 0xc5 },               /* hmd */
+        { 0x55, 0x65, 0xa5, 0xb5, 0xc5 },               /* hds */
+        { 0x54, 0x64, 0x74, 0x84, 0x94, 0xa4, 0xb4 },   /* syl */
 };
 
 /* actual fan speed */
-static const u8 FSCHMD_REG_FAN_ACT[5][6] = {
+static const u8 FSCHMD_REG_FAN_ACT[7][7] = {
         { 0x0e, 0x6b, 0xab },                           /* pos */
         { 0x0e, 0x6b, 0xbb },                           /* her */
         { 0x6b, 0x6c, 0x0e, 0xab, 0x5c, 0xbb },         /* scy */
         { 0x0e, 0x6b, 0xab, 0xbb },                     /* hrc */
         { 0x5b, 0x6b, 0xab, 0xbb, 0xcb },               /* hmd */
+        { 0x5b, 0x6b, 0xab, 0xbb, 0xcb },               /* hds */
+        { 0x57, 0x67, 0x77, 0x87, 0x97, 0xa7, 0xb7 },   /* syl */
 };
 
 /* fan status registers */
-static const u8 FSCHMD_REG_FAN_STATE[5][6] = {
+static const u8 FSCHMD_REG_FAN_STATE[7][7] = {
         { 0x0d, 0x62, 0xa2 },                           /* pos */
         { 0x0d, 0x62, 0xb2 },                           /* her */
         { 0x62, 0x61, 0x0d, 0xa2, 0x52, 0xb2 },         /* scy */
         { 0x0d, 0x62, 0xa2, 0xb2 },                     /* hrc */
         { 0x52, 0x62, 0xa2, 0xb2, 0xc2 },               /* hmd */
+        { 0x52, 0x62, 0xa2, 0xb2, 0xc2 },               /* hds */
+        { 0x50, 0x60, 0x70, 0x80, 0x90, 0xa0, 0xb0 },   /* syl */
 };
 
 /* fan ripple / divider registers */
-static const u8 FSCHMD_REG_FAN_RIPPLE[5][6] = {
+static const u8 FSCHMD_REG_FAN_RIPPLE[7][7] = {
         { 0x0f, 0x6f, 0xaf },                           /* pos */
         { 0x0f, 0x6f, 0xbf },                           /* her */
         { 0x6f, 0x6f, 0x0f, 0xaf, 0x0f, 0xbf },         /* scy */
         { 0x0f, 0x6f, 0xaf, 0xbf },                     /* hrc */
         { 0x5f, 0x6f, 0xaf, 0xbf, 0xcf },               /* hmd */
+        { 0x5f, 0x6f, 0xaf, 0xbf, 0xcf },               /* hds */
+        { 0x56, 0x66, 0x76, 0x86, 0x96, 0xa6, 0xb6 },   /* syl */
 };
 
-static const int FSCHMD_NO_FAN_SENSORS[5] = { 3, 3, 6, 4, 5 };
+static const int FSCHMD_NO_FAN_SENSORS[7] = { 3, 3, 6, 4, 5, 5, 7 };
 
 /* Fan status register bitmasks */
 #define FSCHMD_FAN_ALARM        0x04 /* called fault by FSC! */
-#define FSCHMD_FAN_NOT_PRESENT  0x08 /* not documented */
+#define FSCHMD_FAN_NOT_PRESENT  0x08
+#define FSCHMD_FAN_DISABLED     0x80
 
 
 /* actual temperature registers */
-static const u8 FSCHMD_REG_TEMP_ACT[5][5] = {
+static const u8 FSCHMD_REG_TEMP_ACT[7][11] = {
         { 0x64, 0x32, 0x35 },                           /* pos */
         { 0x64, 0x32, 0x35 },                           /* her */
         { 0x64, 0xD0, 0x32, 0x35 },                     /* scy */
         { 0x64, 0x32, 0x35 },                           /* hrc */
         { 0x70, 0x80, 0x90, 0xd0, 0xe0 },               /* hmd */
+        { 0x70, 0x80, 0x90, 0xd0, 0xe0 },               /* hds */
+        { 0x58, 0x68, 0x78, 0x88, 0x98, 0xa8,           /* syl */
+          0xb8, 0xc8, 0xd8, 0xe8, 0xf8 },
 };
 
 /* temperature state registers */
-static const u8 FSCHMD_REG_TEMP_STATE[5][5] = {
+static const u8 FSCHMD_REG_TEMP_STATE[7][11] = {
         { 0x71, 0x81, 0x91 },                           /* pos */
         { 0x71, 0x81, 0x91 },                           /* her */
         { 0x71, 0xd1, 0x81, 0x91 },                     /* scy */
         { 0x71, 0x81, 0x91 },                           /* hrc */
         { 0x71, 0x81, 0x91, 0xd1, 0xe1 },               /* hmd */
+        { 0x71, 0x81, 0x91, 0xd1, 0xe1 },               /* hds */
+        { 0x59, 0x69, 0x79, 0x89, 0x99, 0xa9,           /* syl */
+          0xb9, 0xc9, 0xd9, 0xe9, 0xf9 },
 };
 
 /* temperature high limit registers, FSC does not document these. Proven to be
@@ -158,24 +186,31 @@ static const u8 FSCHMD_REG_TEMP_STATE[5][5] = {
    in the fscscy 2.4 driver. FSC has confirmed that the fschmd has registers
    at these addresses, but doesn't want to confirm they are the same as with
    the fscher?? */
-static const u8 FSCHMD_REG_TEMP_LIMIT[5][5] = {
+static const u8 FSCHMD_REG_TEMP_LIMIT[7][11] = {
         { 0, 0, 0 },                                    /* pos */
         { 0x76, 0x86, 0x96 },                           /* her */
         { 0x76, 0xd6, 0x86, 0x96 },                     /* scy */
         { 0x76, 0x86, 0x96 },                           /* hrc */
         { 0x76, 0x86, 0x96, 0xd6, 0xe6 },               /* hmd */
+        { 0x76, 0x86, 0x96, 0xd6, 0xe6 },               /* hds */
+        { 0x5a, 0x6a, 0x7a, 0x8a, 0x9a, 0xaa,           /* syl */
+          0xba, 0xca, 0xda, 0xea, 0xfa },
 };
 
 /* These were found through experimenting with an fscher, currently they are
    not used, but we keep them around for future reference.
+   On the fscsyl AUTOP1 lives at 0x#c (so 0x5c for fan1, 0x6c for fan2, etc),
+   AUTOP2 lives at 0x#e, and 0x#1 is a bitmask defining which temps influence
+   the fan speed.
 static const u8 FSCHER_REG_TEMP_AUTOP1[] =      { 0x73, 0x83, 0x93 };
 static const u8 FSCHER_REG_TEMP_AUTOP2[] =      { 0x75, 0x85, 0x95 }; */
 
-static const int FSCHMD_NO_TEMP_SENSORS[5] = { 3, 3, 4, 3, 5 };
+static const int FSCHMD_NO_TEMP_SENSORS[7] = { 3, 3, 4, 3, 5, 5, 11 };
 
 /* temp status register bitmasks */
 #define FSCHMD_TEMP_WORKING     0x01
 #define FSCHMD_TEMP_ALERT       0x02
+#define FSCHMD_TEMP_DISABLED    0x80
 /* there only really is an alarm if the sensor is working and alert == 1 */
 #define FSCHMD_TEMP_ALARM_MASK \
         (FSCHMD_TEMP_WORKING | FSCHMD_TEMP_ALERT)
@@ -201,6 +236,8 @@ static const struct i2c_device_id fschmd_id[] = {
         { "fscscy", fscscy },
         { "fschrc", fschrc },
         { "fschmd", fschmd },
+        { "fschds", fschds },
+        { "fscsyl", fscsyl },
         { }
 };
 MODULE_DEVICE_TABLE(i2c, fschmd_id);
@@ -242,14 +279,14 @@ struct fschmd_data {
         u8 watchdog_control;    /* watchdog control register */
         u8 watchdog_state;      /* watchdog status register */
         u8 watchdog_preset;     /* watchdog counter preset on trigger val */
-        u8 volt[3];             /* 12, 5, battery voltage */
-        u8 temp_act[5];         /* temperature */
-        u8 temp_status[5];      /* status of sensor */
-        u8 temp_max[5];         /* high temp limit, notice: undocumented! */
-        u8 fan_act[6];          /* fans revolutions per second */
-        u8 fan_status[6];       /* fan status */
-        u8 fan_min[6];          /* fan min value for rps */
-        u8 fan_ripple[6];       /* divider for rps */
+        u8 volt[6];             /* voltage */
+        u8 temp_act[11];        /* temperature */
+        u8 temp_status[11];     /* status of sensor */
+        u8 temp_max[11];        /* high temp limit, notice: undocumented! */
+        u8 fan_act[7];          /* fans revolutions per second */
+        u8 fan_status[7];       /* fan status */
+        u8 fan_min[7];          /* fan min value for rps */
+        u8 fan_ripple[7];       /* divider for rps */
 };
 
 /* Global variables to hold information read from special DMI tables, which are
@@ -257,8 +294,8 @@ struct fschmd_data {
    protect these with a lock as they are only modified from our attach function
    which always gets called with the i2c-core lock held and never accessed
    before the attach function is done with them. */
-static int dmi_mult[3] = { 490, 200, 100 };
-static int dmi_offset[3] = { 0, 0, 0 };
+static int dmi_mult[6] = { 490, 200, 100, 100, 200, 100 };
+static int dmi_offset[6] = { 0, 0, 0, 0, 0, 0 };
 static int dmi_vref = -1;
 
 /* Somewhat ugly :( global data pointer list with all fschmd devices, so that
@@ -450,10 +487,11 @@ static ssize_t show_pwm_auto_point1_pwm(struct device *dev,
         struct device_attribute *devattr, char *buf)
 {
         int index = to_sensor_dev_attr(devattr)->index;
-        int val = fschmd_update_device(dev)->fan_min[index];
+        struct fschmd_data *data = fschmd_update_device(dev);
+        int val = data->fan_min[index];
 
-        /* 0 = allow turning off, 1-255 = 50-100% */
-        if (val)
+        /* 0 = allow turning off (except on the syl), 1-255 = 50-100% */
+        if (val || data->kind == fscsyl - 1)
                 val = val / 2 + 128;
 
         return sprintf(buf, "%d\n", val);
@@ -466,8 +504,8 @@ static ssize_t store_pwm_auto_point1_pwm(struct device *dev,
         struct fschmd_data *data = dev_get_drvdata(dev);
         unsigned long v = simple_strtoul(buf, NULL, 10);
 
-        /* register: 0 = allow turning off, 1-255 = 50-100% */
-        if (v) {
+        /* reg: 0 = allow turning off (except on the syl), 1-255 = 50-100% */
+        if (v || data->kind == fscsyl - 1) {
                 v = SENSORS_LIMIT(v, 128, 255);
                 v = (v - 128) * 2 + 1;
         }
@@ -522,11 +560,15 @@ static ssize_t store_alert_led(struct device *dev,
         return count;
 }
 
+static DEVICE_ATTR(alert_led, 0644, show_alert_led, store_alert_led);
+
 static struct sensor_device_attribute fschmd_attr[] = {
         SENSOR_ATTR(in0_input, 0444, show_in_value, NULL, 0),
         SENSOR_ATTR(in1_input, 0444, show_in_value, NULL, 1),
         SENSOR_ATTR(in2_input, 0444, show_in_value, NULL, 2),
-        SENSOR_ATTR(alert_led, 0644, show_alert_led, store_alert_led, 0),
+        SENSOR_ATTR(in3_input, 0444, show_in_value, NULL, 3),
+        SENSOR_ATTR(in4_input, 0444, show_in_value, NULL, 4),
+        SENSOR_ATTR(in5_input, 0444, show_in_value, NULL, 5),
 };
 
 static struct sensor_device_attribute fschmd_temp_attr[] = {
@@ -550,6 +592,30 @@ static struct sensor_device_attribute fschmd_temp_attr[] = {
         SENSOR_ATTR(temp5_max,   0644, show_temp_max, store_temp_max, 4),
         SENSOR_ATTR(temp5_fault, 0444, show_temp_fault, NULL, 4),
         SENSOR_ATTR(temp5_alarm, 0444, show_temp_alarm, NULL, 4),
+        SENSOR_ATTR(temp6_input, 0444, show_temp_value, NULL, 5),
+        SENSOR_ATTR(temp6_max,   0644, show_temp_max, store_temp_max, 5),
+        SENSOR_ATTR(temp6_fault, 0444, show_temp_fault, NULL, 5),
+        SENSOR_ATTR(temp6_alarm, 0444, show_temp_alarm, NULL, 5),
+        SENSOR_ATTR(temp7_input, 0444, show_temp_value, NULL, 6),
+        SENSOR_ATTR(temp7_max,   0644, show_temp_max, store_temp_max, 6),
+        SENSOR_ATTR(temp7_fault, 0444, show_temp_fault, NULL, 6),
+        SENSOR_ATTR(temp7_alarm, 0444, show_temp_alarm, NULL, 6),
+        SENSOR_ATTR(temp8_input, 0444, show_temp_value, NULL, 7),
+        SENSOR_ATTR(temp8_max,   0644, show_temp_max, store_temp_max, 7),
+        SENSOR_ATTR(temp8_fault, 0444, show_temp_fault, NULL, 7),
+        SENSOR_ATTR(temp8_alarm, 0444, show_temp_alarm, NULL, 7),
+        SENSOR_ATTR(temp9_input, 0444, show_temp_value, NULL, 8),
+        SENSOR_ATTR(temp9_max,   0644, show_temp_max, store_temp_max, 8),
+        SENSOR_ATTR(temp9_fault, 0444, show_temp_fault, NULL, 8),
+        SENSOR_ATTR(temp9_alarm, 0444, show_temp_alarm, NULL, 8),
+        SENSOR_ATTR(temp10_input, 0444, show_temp_value, NULL, 9),
+        SENSOR_ATTR(temp10_max,   0644, show_temp_max, store_temp_max, 9),
+        SENSOR_ATTR(temp10_fault, 0444, show_temp_fault, NULL, 9),
+        SENSOR_ATTR(temp10_alarm, 0444, show_temp_alarm, NULL, 9),
+        SENSOR_ATTR(temp11_input, 0444, show_temp_value, NULL, 10),
+        SENSOR_ATTR(temp11_max,   0644, show_temp_max, store_temp_max, 10),
+        SENSOR_ATTR(temp11_fault, 0444, show_temp_fault, NULL, 10),
+        SENSOR_ATTR(temp11_alarm, 0444, show_temp_alarm, NULL, 10),
 };
 
 static struct sensor_device_attribute fschmd_fan_attr[] = {
@@ -589,6 +655,12 @@ static struct sensor_device_attribute fschmd_fan_attr[] = {
         SENSOR_ATTR(fan6_fault, 0444, show_fan_fault, NULL, 5),
         SENSOR_ATTR(pwm6_auto_point1_pwm, 0644, show_pwm_auto_point1_pwm,
                 store_pwm_auto_point1_pwm, 5),
+        SENSOR_ATTR(fan7_input, 0444, show_fan_value, NULL, 6),
+        SENSOR_ATTR(fan7_div,   0644, show_fan_div, store_fan_div, 6),
+        SENSOR_ATTR(fan7_alarm, 0444, show_fan_alarm, NULL, 6),
+        SENSOR_ATTR(fan7_fault, 0444, show_fan_fault, NULL, 6),
+        SENSOR_ATTR(pwm7_auto_point1_pwm, 0644, show_pwm_auto_point1_pwm,
+                store_pwm_auto_point1_pwm, 6),
 };
 
 
@@ -624,10 +696,11 @@ static int watchdog_set_timeout(struct fschmd_data *data, int timeout)
         data->watchdog_preset = DIV_ROUND_UP(timeout, resolution);
 
         /* Write new timeout value */
-        i2c_smbus_write_byte_data(data->client, FSCHMD_REG_WDOG_PRESET,
-                data->watchdog_preset);
+        i2c_smbus_write_byte_data(data->client,
+                FSCHMD_REG_WDOG_PRESET[data->kind], data->watchdog_preset);
         /* Write new control register, do not trigger! */
-        i2c_smbus_write_byte_data(data->client, FSCHMD_REG_WDOG_CONTROL,
+        i2c_smbus_write_byte_data(data->client,
+                FSCHMD_REG_WDOG_CONTROL[data->kind],
                 data->watchdog_control & ~FSCHMD_WDOG_CONTROL_TRIGGER);
 
         ret = data->watchdog_preset * resolution;
@@ -662,8 +735,9 @@ static int watchdog_trigger(struct fschmd_data *data)
         }
 
         data->watchdog_control |= FSCHMD_WDOG_CONTROL_TRIGGER;
-        i2c_smbus_write_byte_data(data->client, FSCHMD_REG_WDOG_CONTROL,
-                                        data->watchdog_control);
+        i2c_smbus_write_byte_data(data->client,
+                                  FSCHMD_REG_WDOG_CONTROL[data->kind],
+                                  data->watchdog_control);
 leave:
         mutex_unlock(&data->watchdog_lock);
         return ret;
@@ -682,7 +756,8 @@ static int watchdog_stop(struct fschmd_data *data)
         data->watchdog_control &= ~FSCHMD_WDOG_CONTROL_STARTED;
         /* Don't store the stop flag in our watchdog control register copy, as
            its a write only bit (read always returns 0) */
-        i2c_smbus_write_byte_data(data->client, FSCHMD_REG_WDOG_CONTROL,
+        i2c_smbus_write_byte_data(data->client,
+                FSCHMD_REG_WDOG_CONTROL[data->kind],
                 data->watchdog_control | FSCHMD_WDOG_CONTROL_STOP);
 leave:
         mutex_unlock(&data->watchdog_lock);
@@ -856,7 +931,7 @@ static struct file_operations watchdog_fops = {
 
 /* DMI decode routine to read voltage scaling factors from special DMI tables,
    which are available on FSC machines with an fscher or later chip. */
-static void fschmd_dmi_decode(const struct dmi_header *header)
+static void fschmd_dmi_decode(const struct dmi_header *header, void *dummy)
 {
         int i, mult[3] = { 0 }, offset[3] = { 0 }, vref = 0, found = 0;
 
@@ -912,6 +987,15 @@ static void fschmd_dmi_decode(const struct dmi_header *header)
                         dmi_mult[i] = mult[i] * 10;
                         dmi_offset[i] = offset[i] * 10;
                 }
+                /* According to the docs there should be separate dmi entries
+                   for the mult's and offsets of in3-5 of the syl, but on
+                   my test machine these are not present */
+                dmi_mult[3] = dmi_mult[2];
+                dmi_mult[4] = dmi_mult[1];
+                dmi_mult[5] = dmi_mult[2];
+                dmi_offset[3] = dmi_offset[2];
+                dmi_offset[4] = dmi_offset[1];
+                dmi_offset[5] = dmi_offset[2];
                 dmi_vref = vref;
         }
 }
@@ -920,8 +1004,6 @@ static int fschmd_detect(struct i2c_client *client, int kind,
                          struct i2c_board_info *info)
 {
         struct i2c_adapter *adapter = client->adapter;
-        const char * const client_names[5] = { "fscpos", "fscher", "fscscy",
-                                                "fschrc", "fschmd" };
 
         if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))
                 return -ENODEV;
@@ -948,11 +1030,15 @@ static int fschmd_detect(struct i2c_client *client, int kind,
                         kind = fschrc;
                 else if (!strcmp(id, "HMD"))
                         kind = fschmd;
+                else if (!strcmp(id, "HDS"))
+                        kind = fschds;
+                else if (!strcmp(id, "SYL"))
+                        kind = fscsyl;
                 else
                         return -ENODEV;
         }
 
-        strlcpy(info->type, client_names[kind - 1], I2C_NAME_SIZE);
+        strlcpy(info->type, fschmd_id[kind - 1].name, I2C_NAME_SIZE);
 
         return 0;
 }
@@ -961,8 +1047,8 @@ static int fschmd_probe(struct i2c_client *client,
                         const struct i2c_device_id *id)
 {
         struct fschmd_data *data;
-        const char * const names[5] = { "Poseidon", "Hermes", "Scylla",
-                                        "Heracles", "Heimdall" };
+        const char * const names[7] = { "Poseidon", "Hermes", "Scylla",
+                                "Heracles", "Heimdall", "Hades", "Syleus" };
         const int watchdog_minors[] = { WATCHDOG_MINOR, 212, 213, 214, 215 };
         int i, err;
         enum chips kind = id->driver_data;
@@ -991,7 +1077,7 @@ static int fschmd_probe(struct i2c_client *client,
 
         /* Read the special DMI table for fscher and newer chips */
         if ((kind == fscher || kind >= fschrc) && dmi_vref == -1) {
-                dmi_walk(fschmd_dmi_decode);
+                dmi_walk(fschmd_dmi_decode, NULL);
                 if (dmi_vref == -1) {
                         dev_warn(&client->dev,
                                 "Couldn't get voltage scaling factors from "
@@ -1000,21 +1086,25 @@ static int fschmd_probe(struct i2c_client *client,
                 }
         }
 
+        /* i2c kind goes from 1-6, we want from 0-5 to address arrays */
+        data->kind = kind - 1;
+
         /* Read in some never changing registers */
         data->revision = i2c_smbus_read_byte_data(client, FSCHMD_REG_REVISION);
         data->global_control = i2c_smbus_read_byte_data(client,
                                         FSCHMD_REG_CONTROL);
         data->watchdog_control = i2c_smbus_read_byte_data(client,
-                                        FSCHMD_REG_WDOG_CONTROL);
+                                        FSCHMD_REG_WDOG_CONTROL[data->kind]);
         data->watchdog_state = i2c_smbus_read_byte_data(client,
-                                        FSCHMD_REG_WDOG_STATE);
+                                        FSCHMD_REG_WDOG_STATE[data->kind]);
         data->watchdog_preset = i2c_smbus_read_byte_data(client,
-                                        FSCHMD_REG_WDOG_PRESET);
+                                        FSCHMD_REG_WDOG_PRESET[data->kind]);
 
-        /* i2c kind goes from 1-5, we want from 0-4 to address arrays */
-        data->kind = kind - 1;
+        err = device_create_file(&client->dev, &dev_attr_alert_led);
+        if (err)
+                goto exit_detach;
 
-        for (i = 0; i < ARRAY_SIZE(fschmd_attr); i++) {
+        for (i = 0; i < FSCHMD_NO_VOLT_SENSORS[data->kind]; i++) {
                 err = device_create_file(&client->dev,
                                         &fschmd_attr[i].dev_attr);
                 if (err)
@@ -1027,6 +1117,16 @@ static int fschmd_probe(struct i2c_client *client,
                                 show_temp_max)
                         continue;
 
+                if (kind == fscsyl) {
+                        if (i % 4 == 0)
+                                data->temp_status[i / 4] =
+                                        i2c_smbus_read_byte_data(client,
+                                                FSCHMD_REG_TEMP_STATE
+                                                [data->kind][i / 4]);
+                        if (data->temp_status[i / 4] & FSCHMD_TEMP_DISABLED)
+                                continue;
+                }
+
                 err = device_create_file(&client->dev,
                                         &fschmd_temp_attr[i].dev_attr);
                 if (err)
@@ -1040,6 +1140,16 @@ static int fschmd_probe(struct i2c_client *client,
                                         "pwm3_auto_point1_pwm"))
                         continue;
 
+                if (kind == fscsyl) {
+                        if (i % 5 == 0)
+                                data->fan_status[i / 5] =
+                                        i2c_smbus_read_byte_data(client,
+                                                FSCHMD_REG_FAN_STATE
+                                                [data->kind][i / 5]);
+                        if (data->fan_status[i / 5] & FSCHMD_FAN_DISABLED)
+                                continue;
+                }
+
                 err = device_create_file(&client->dev,
                                         &fschmd_fan_attr[i].dev_attr);
                 if (err)
@@ -1126,7 +1236,8 @@ static int fschmd_remove(struct i2c_client *client)
         if (data->hwmon_dev)
                 hwmon_device_unregister(data->hwmon_dev);
 
-        for (i = 0; i < ARRAY_SIZE(fschmd_attr); i++)
+        device_remove_file(&client->dev, &dev_attr_alert_led);
+        for (i = 0; i < (FSCHMD_NO_VOLT_SENSORS[data->kind]); i++)
                 device_remove_file(&client->dev, &fschmd_attr[i].dev_attr);
         for (i = 0; i < (FSCHMD_NO_TEMP_SENSORS[data->kind] * 4); i++)
                 device_remove_file(&client->dev,
@@ -1171,7 +1282,7 @@ static struct fschmd_data *fschmd_update_device(struct device *dev)
                                         data->temp_act[i] < data->temp_max[i])
                                 i2c_smbus_write_byte_data(client,
                                         FSCHMD_REG_TEMP_STATE[data->kind][i],
-                                        FSCHMD_TEMP_ALERT);
+                                        data->temp_status[i]);
                 }
 
                 for (i = 0; i < FSCHMD_NO_FAN_SENSORS[data->kind]; i++) {
@@ -1193,12 +1304,12 @@ static struct fschmd_data *fschmd_update_device(struct device *dev)
                                         data->fan_act[i])
                                 i2c_smbus_write_byte_data(client,
                                         FSCHMD_REG_FAN_STATE[data->kind][i],
-                                        FSCHMD_FAN_ALARM);
+                                        data->fan_status[i]);
                 }
 
-                for (i = 0; i < 3; i++)
+                for (i = 0; i < FSCHMD_NO_VOLT_SENSORS[data->kind]; i++)
                         data->volt[i] = i2c_smbus_read_byte_data(client,
-                                                FSCHMD_REG_VOLT[i]);
+                                               FSCHMD_REG_VOLT[data->kind][i]);
 
                 data->last_updated = jiffies;
                 data->valid = 1;
@@ -1220,8 +1331,8 @@ static void __exit fschmd_exit(void)
 }
 
 MODULE_AUTHOR("Hans de Goede <hdegoede@redhat.com>");
-MODULE_DESCRIPTION("FSC Poseidon, Hermes, Scylla, Heracles and "
-                        "Heimdall driver");
+MODULE_DESCRIPTION("FSC Poseidon, Hermes, Scylla, Heracles, Heimdall, Hades "
+                        "and Syleus driver");
 MODULE_LICENSE("GPL");
 
 module_init(fschmd_init);
diff --git a/drivers/hwmon/hdaps.c b/drivers/hwmon/hdaps.c
index a4d92d246d52..d3612a1f1981 100644
--- a/drivers/hwmon/hdaps.c
+++ b/drivers/hwmon/hdaps.c
@@ -65,6 +65,10 @@
 #define HDAPS_INPUT_FUZZ        4       /* input event threshold */
 #define HDAPS_INPUT_FLAT        4
 
+#define HDAPS_X_AXIS            (1 << 0)
+#define HDAPS_Y_AXIS            (1 << 1)
+#define HDAPS_BOTH_AXES         (HDAPS_X_AXIS | HDAPS_Y_AXIS)
+
 static struct platform_device *pdev;
 static struct input_polled_dev *hdaps_idev;
 static unsigned int hdaps_invert;
@@ -182,11 +186,11 @@ static int __hdaps_read_pair(unsigned int port1, unsigned int port2,
         km_activity = inb(HDAPS_PORT_KMACT);
         __device_complete();
 
-        /* if hdaps_invert is set, negate the two values */
-        if (hdaps_invert) {
+        /* hdaps_invert is a bitvector to negate the axes */
+        if (hdaps_invert & HDAPS_X_AXIS)
                 *x = -*x;
+        if (hdaps_invert & HDAPS_Y_AXIS)
                 *y = -*y;
-        }
 
         return 0;
 }
@@ -436,7 +440,8 @@ static ssize_t hdaps_invert_store(struct device *dev,
 {
         int invert;
 
-        if (sscanf(buf, "%d", &invert) != 1 || (invert != 1 && invert != 0))
+        if (sscanf(buf, "%d", &invert) != 1 ||
+            invert < 0 || invert > HDAPS_BOTH_AXES)
                 return -EINVAL;
 
         hdaps_invert = invert;
@@ -483,56 +488,52 @@ static int __init hdaps_dmi_match(const struct dmi_system_id *id)
 /* hdaps_dmi_match_invert - found an inverted match. */
 static int __init hdaps_dmi_match_invert(const struct dmi_system_id *id)
 {
-        hdaps_invert = 1;
-        printk(KERN_INFO "hdaps: inverting axis readings.\n");
+        hdaps_invert = (unsigned long)id->driver_data;
+        printk(KERN_INFO "hdaps: inverting axis (%u) readings.\n",
+               hdaps_invert);
         return hdaps_dmi_match(id);
 }
 
-#define HDAPS_DMI_MATCH_NORMAL(vendor, model) {         \
-        .ident = vendor " " model,                      \
-        .callback = hdaps_dmi_match,                    \
-        .matches = {                                    \
-                DMI_MATCH(DMI_BOARD_VENDOR, vendor),    \
-                DMI_MATCH(DMI_PRODUCT_VERSION, model)   \
-        }                                               \
-}
-
-#define HDAPS_DMI_MATCH_INVERT(vendor, model) {         \
+#define HDAPS_DMI_MATCH_INVERT(vendor, model, axes) {   \
         .ident = vendor " " model,                      \
         .callback = hdaps_dmi_match_invert,             \
+        .driver_data = (void *)axes,                    \
         .matches = {                                    \
                 DMI_MATCH(DMI_BOARD_VENDOR, vendor),    \
                 DMI_MATCH(DMI_PRODUCT_VERSION, model)   \
         }                                               \
 }
 
+#define HDAPS_DMI_MATCH_NORMAL(vendor, model)           \
+        HDAPS_DMI_MATCH_INVERT(vendor, model, 0)
+
 /* Note that HDAPS_DMI_MATCH_NORMAL("ThinkPad T42") would match
    "ThinkPad T42p", so the order of the entries matters.
    If your ThinkPad is not recognized, please update to latest
    BIOS. This is especially the case for some R52 ThinkPads. */
 static struct dmi_system_id __initdata hdaps_whitelist[] = {
-        HDAPS_DMI_MATCH_INVERT("IBM", "ThinkPad R50p"),
+        HDAPS_DMI_MATCH_INVERT("IBM", "ThinkPad R50p", HDAPS_BOTH_AXES),
         HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad R50"),
         HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad R51"),
         HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad R52"),
-        HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad R61i"),
-        HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad R61"),
-        HDAPS_DMI_MATCH_INVERT("IBM", "ThinkPad T41p"),
+        HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad R61i", HDAPS_BOTH_AXES),
+        HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad R61", HDAPS_BOTH_AXES),
+        HDAPS_DMI_MATCH_INVERT("IBM", "ThinkPad T41p", HDAPS_BOTH_AXES),
         HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad T41"),
-        HDAPS_DMI_MATCH_INVERT("IBM", "ThinkPad T42p"),
+        HDAPS_DMI_MATCH_INVERT("IBM", "ThinkPad T42p", HDAPS_BOTH_AXES),
         HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad T42"),
         HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad T43"),
-        HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad T60"),
-        HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad T61p"),
-        HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad T61"),
+        HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad T60", HDAPS_BOTH_AXES),
+        HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad T61p", HDAPS_BOTH_AXES),
+        HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad T61", HDAPS_BOTH_AXES),
         HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad X40"),
-        HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad X41"),
-        HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad X60"),
-        HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad X61s"),
-        HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad X61"),
+        HDAPS_DMI_MATCH_INVERT("IBM", "ThinkPad X41", HDAPS_Y_AXIS),
+        HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad X60", HDAPS_BOTH_AXES),
+        HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad X61s", HDAPS_BOTH_AXES),
+        HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad X61", HDAPS_BOTH_AXES),
         HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad Z60m"),
-        HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad Z61m"),
-        HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad Z61p"),
+        HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad Z61m", HDAPS_BOTH_AXES),
+        HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad Z61p", HDAPS_BOTH_AXES),
         { .ident = NULL }
 };
 
@@ -627,8 +628,9 @@ static void __exit hdaps_exit(void)
 module_init(hdaps_init);
 module_exit(hdaps_exit);
 
-module_param_named(invert, hdaps_invert, bool, 0);
-MODULE_PARM_DESC(invert, "invert data along each axis");
+module_param_named(invert, hdaps_invert, int, 0);
+MODULE_PARM_DESC(invert, "invert data along each axis. 1 invert x-axis, "
+                 "2 invert y-axis, 3 invert both axes.");
 
 MODULE_AUTHOR("Robert Love");
 MODULE_DESCRIPTION("IBM Hard Drive Active Protection System (HDAPS) driver");
diff --git a/drivers/hwmon/hp_accel.c b/drivers/hwmon/hp_accel.c
index 29c83b5b9697..55d3dc565be6 100644
--- a/drivers/hwmon/hp_accel.c
+++ b/drivers/hwmon/hp_accel.c
@@ -85,25 +85,31 @@ MODULE_DEVICE_TABLE(acpi, lis3lv02d_device_ids);
 
 /**
  * lis3lv02d_acpi_init - ACPI _INI method: initialize the device.
- * @handle: the handle of the device
+ * @lis3: pointer to the device struct
  *
- * Returns AE_OK on success.
+ * Returns 0 on success.
  */
-acpi_status lis3lv02d_acpi_init(acpi_handle handle)
+int lis3lv02d_acpi_init(struct lis3lv02d *lis3)
 {
-        return acpi_evaluate_object(handle, METHOD_NAME__INI, NULL, NULL);
+        struct acpi_device *dev = lis3->bus_priv;
+        if (acpi_evaluate_object(dev->handle, METHOD_NAME__INI,
+                                 NULL, NULL) != AE_OK)
+                return -EINVAL;
+
+        return 0;
 }
 
 /**
  * lis3lv02d_acpi_read - ACPI ALRD method: read a register
- * @handle: the handle of the device
+ * @lis3: pointer to the device struct
  * @reg:    the register to read
  * @ret:    result of the operation
  *
- * Returns AE_OK on success.
+ * Returns 0 on success.
  */
-acpi_status lis3lv02d_acpi_read(acpi_handle handle, int reg, u8 *ret)
+int lis3lv02d_acpi_read(struct lis3lv02d *lis3, int reg, u8 *ret)
 {
+        struct acpi_device *dev = lis3->bus_priv;
         union acpi_object arg0 = { ACPI_TYPE_INTEGER };
         struct acpi_object_list args = { 1, &arg0 };
         unsigned long long lret;
@@ -111,21 +117,22 @@ acpi_status lis3lv02d_acpi_read(acpi_handle handle, int reg, u8 *ret)
 
         arg0.integer.value = reg;
 
-        status = acpi_evaluate_integer(handle, "ALRD", &args, &lret);
+        status = acpi_evaluate_integer(dev->handle, "ALRD", &args, &lret);
         *ret = lret;
-        return status;
+        return (status != AE_OK) ? -EINVAL : 0;
 }
 
 /**
  * lis3lv02d_acpi_write - ACPI ALWR method: write to a register
- * @handle: the handle of the device
+ * @lis3: pointer to the device struct
  * @reg:    the register to write to
  * @val:    the value to write
  *
- * Returns AE_OK on success.
+ * Returns 0 on success.
  */
-acpi_status lis3lv02d_acpi_write(acpi_handle handle, int reg, u8 val)
+int lis3lv02d_acpi_write(struct lis3lv02d *lis3, int reg, u8 val)
 {
+        struct acpi_device *dev = lis3->bus_priv;
         unsigned long long ret; /* Not used when writting */
         union acpi_object in_obj[2];
         struct acpi_object_list args = { 2, in_obj };
@@ -135,12 +142,15 @@ acpi_status lis3lv02d_acpi_write(acpi_handle handle, int reg, u8 val)
         in_obj[1].type          = ACPI_TYPE_INTEGER;
         in_obj[1].integer.value = val;
 
-        return acpi_evaluate_integer(handle, "ALWR", &args, &ret);
+        if (acpi_evaluate_integer(dev->handle, "ALWR", &args, &ret) != AE_OK)
+                return -EINVAL;
+
+        return 0;
 }
 
 static int lis3lv02d_dmi_matched(const struct dmi_system_id *dmi)
 {
-        adev.ac = *((struct axis_conversion *)dmi->driver_data);
+        lis3_dev.ac = *((struct axis_conversion *)dmi->driver_data);
         printk(KERN_INFO DRIVER_NAME ": hardware type %s found.\n", dmi->ident);
 
         return 1;
@@ -187,6 +197,7 @@ static struct dmi_system_id lis3lv02d_dmi_ids[] = {
         AXIS_DMI_MATCH("NC2510", "HP Compaq 2510", y_inverted),
         AXIS_DMI_MATCH("NC8510", "HP Compaq 8510", xy_swap_inverted),
         AXIS_DMI_MATCH("HP2133", "HP 2133", xy_rotated_left),
+        AXIS_DMI_MATCH("HP2140", "HP 2140", xy_swap_inverted),
         AXIS_DMI_MATCH("NC653x", "HP Compaq 653", xy_rotated_left_usd),
         AXIS_DMI_MATCH("NC673x", "HP Compaq 673", xy_rotated_left_usd),
         AXIS_DMI_MATCH("NC651xx", "HP Compaq 651", xy_rotated_right),
@@ -201,6 +212,8 @@ static struct dmi_system_id lis3lv02d_dmi_ids[] = {
                         PRODUCT_NAME, "HP Pavilion dv5",
                         BOARD_NAME, "3600",
                         y_inverted),
+        AXIS_DMI_MATCH("DV7", "HP Pavilion dv7", x_inverted),
+        AXIS_DMI_MATCH("HP8710", "HP Compaq 8710", y_inverted),
         { NULL, }
 /* Laptop models without axis info (yet):
  * "NC6910" "HP Compaq 6910"
@@ -214,7 +227,7 @@ static struct dmi_system_id lis3lv02d_dmi_ids[] = {
 
 static void hpled_set(struct delayed_led_classdev *led_cdev, enum led_brightness value)
 {
-        acpi_handle handle = adev.device->handle;
+        struct acpi_device *dev = lis3_dev.bus_priv;
         unsigned long long ret; /* Not used when writing */
         union acpi_object in_obj[1];
         struct acpi_object_list args = { 1, in_obj };
@@ -222,7 +235,7 @@ static void hpled_set(struct delayed_led_classdev *led_cdev, enum led_brightness
         in_obj[0].type          = ACPI_TYPE_INTEGER;
         in_obj[0].integer.value = !!value;
 
-        acpi_evaluate_integer(handle, "ALED", &args, &ret);
+        acpi_evaluate_integer(dev->handle, "ALED", &args, &ret);
 }
 
 static struct delayed_led_classdev hpled_led = {
@@ -254,28 +267,11 @@ static void lis3lv02d_enum_resources(struct acpi_device *device)
         acpi_status status;
 
         status = acpi_walk_resources(device->handle, METHOD_NAME__CRS,
-                                        lis3lv02d_get_resource, &adev.irq);
+                                        lis3lv02d_get_resource, &lis3_dev.irq);
         if (ACPI_FAILURE(status))
                 printk(KERN_DEBUG DRIVER_NAME ": Error getting resources\n");
 }
 
-static s16 lis3lv02d_read_16(acpi_handle handle, int reg)
-{
-        u8 lo, hi;
-
-        adev.read(handle, reg - 1, &lo);
-        adev.read(handle, reg, &hi);
-        /* In "12 bit right justified" mode, bit 6, bit 7, bit 8 = bit 5 */
-        return (s16)((hi << 8) | lo);
-}
-
-static s16 lis3lv02d_read_8(acpi_handle handle, int reg)
-{
-        s8 lo;
-        adev.read(handle, reg, &lo);
-        return lo;
-}
-
 static int lis3lv02d_add(struct acpi_device *device)
 {
         int ret;
@@ -283,51 +279,35 @@ static int lis3lv02d_add(struct acpi_device *device)
         if (!device)
                 return -EINVAL;
 
-        adev.device = device;
-        adev.init = lis3lv02d_acpi_init;
-        adev.read = lis3lv02d_acpi_read;
-        adev.write = lis3lv02d_acpi_write;
+        lis3_dev.bus_priv = device;
+        lis3_dev.init = lis3lv02d_acpi_init;
+        lis3_dev.read = lis3lv02d_acpi_read;
+        lis3_dev.write = lis3lv02d_acpi_write;
         strcpy(acpi_device_name(device), DRIVER_NAME);
         strcpy(acpi_device_class(device), ACPI_MDPS_CLASS);
-        device->driver_data = &adev;
-
-        lis3lv02d_acpi_read(device->handle, WHO_AM_I, &adev.whoami);
-        switch (adev.whoami) {
-        case LIS_DOUBLE_ID:
-                printk(KERN_INFO DRIVER_NAME ": 2-byte sensor found\n");
-                adev.read_data = lis3lv02d_read_16;
-                adev.mdps_max_val = 2048;
-                break;
-        case LIS_SINGLE_ID:
-                printk(KERN_INFO DRIVER_NAME ": 1-byte sensor found\n");
-                adev.read_data = lis3lv02d_read_8;
-                adev.mdps_max_val = 128;
-                break;
-        default:
-                printk(KERN_ERR DRIVER_NAME
-                        ": unknown sensor type 0x%X\n", adev.whoami);
-                return -EINVAL;
-        }
+        device->driver_data = &lis3_dev;
+
+        /* obtain IRQ number of our device from ACPI */
+        lis3lv02d_enum_resources(device);
 
         /* If possible use a "standard" axes order */
         if (dmi_check_system(lis3lv02d_dmi_ids) == 0) {
                 printk(KERN_INFO DRIVER_NAME ": laptop model unknown, "
                                  "using default axes configuration\n");
-                adev.ac = lis3lv02d_axis_normal;
+                lis3_dev.ac = lis3lv02d_axis_normal;
         }
 
-        INIT_WORK(&hpled_led.work, delayed_set_status_worker);
-        ret = led_classdev_register(NULL, &hpled_led.led_classdev);
+        /* call the core layer do its init */
+        ret = lis3lv02d_init_device(&lis3_dev);
         if (ret)
                 return ret;
 
-        /* obtain IRQ number of our device from ACPI */
-        lis3lv02d_enum_resources(adev.device);
-
-        ret = lis3lv02d_init_device(&adev);
+        INIT_WORK(&hpled_led.work, delayed_set_status_worker);
+        ret = led_classdev_register(NULL, &hpled_led.led_classdev);
         if (ret) {
+                lis3lv02d_joystick_disable();
+                lis3lv02d_poweroff(&lis3_dev);
                 flush_work(&hpled_led.work);
-                led_classdev_unregister(&hpled_led.led_classdev);
                 return ret;
         }
 
@@ -340,7 +320,7 @@ static int lis3lv02d_remove(struct acpi_device *device, int type)
                 return -EINVAL;
 
         lis3lv02d_joystick_disable();
-        lis3lv02d_poweroff(device->handle);
+        lis3lv02d_poweroff(&lis3_dev);
 
         flush_work(&hpled_led.work);
         led_classdev_unregister(&hpled_led.led_classdev);
@@ -353,19 +333,19 @@ static int lis3lv02d_remove(struct acpi_device *device, int type)
 static int lis3lv02d_suspend(struct acpi_device *device, pm_message_t state)
 {
         /* make sure the device is off when we suspend */
-        lis3lv02d_poweroff(device->handle);
+        lis3lv02d_poweroff(&lis3_dev);
         return 0;
 }
 
 static int lis3lv02d_resume(struct acpi_device *device)
 {
         /* put back the device in the right state (ACPI might turn it on) */
-        mutex_lock(&adev.lock);
-        if (adev.usage > 0)
-                lis3lv02d_poweron(device->handle);
+        mutex_lock(&lis3_dev.lock);
+        if (lis3_dev.usage > 0)
+                lis3lv02d_poweron(&lis3_dev);
         else
-                lis3lv02d_poweroff(device->handle);
-        mutex_unlock(&adev.lock);
+                lis3lv02d_poweroff(&lis3_dev);
+        mutex_unlock(&lis3_dev.lock);
         return 0;
 }
 #else
diff --git a/drivers/hwmon/lis3lv02d.c b/drivers/hwmon/lis3lv02d.c
index 8bb2158f0453..778eb7795983 100644
--- a/drivers/hwmon/lis3lv02d.c
+++ b/drivers/hwmon/lis3lv02d.c
@@ -36,7 +36,6 @@
 #include <linux/freezer.h>
 #include <linux/uaccess.h>
 #include <linux/miscdevice.h>
-#include <acpi/acpi_drivers.h>
 #include <asm/atomic.h>
 #include "lis3lv02d.h"
 
@@ -53,13 +52,30 @@
  * joystick.
  */
 
-struct acpi_lis3lv02d adev = {
-        .misc_wait   = __WAIT_QUEUE_HEAD_INITIALIZER(adev.misc_wait),
+struct lis3lv02d lis3_dev = {
+        .misc_wait   = __WAIT_QUEUE_HEAD_INITIALIZER(lis3_dev.misc_wait),
 };
 
-EXPORT_SYMBOL_GPL(adev);
+EXPORT_SYMBOL_GPL(lis3_dev);
 
-static int lis3lv02d_add_fs(struct acpi_device *device);
+static s16 lis3lv02d_read_8(struct lis3lv02d *lis3, int reg)
+{
+        s8 lo;
+        if (lis3->read(lis3, reg, &lo) < 0)
+                return 0;
+
+        return lo;
+}
+
+static s16 lis3lv02d_read_16(struct lis3lv02d *lis3, int reg)
+{
+        u8 lo, hi;
+
+        lis3->read(lis3, reg - 1, &lo);
+        lis3->read(lis3, reg, &hi);
+        /* In "12 bit right justified" mode, bit 6, bit 7, bit 8 = bit 5 */
+        return (s16)((hi << 8) | lo);
+}
 
 /**
  * lis3lv02d_get_axis - For the given axis, give the value converted
@@ -78,36 +94,36 @@ static inline int lis3lv02d_get_axis(s8 axis, int hw_values[3])
 
 /**
  * lis3lv02d_get_xyz - Get X, Y and Z axis values from the accelerometer
- * @handle: the handle to the device
- * @x:      where to store the X axis value
- * @y:      where to store the Y axis value
- * @z:      where to store the Z axis value
+ * @lis3: pointer to the device struct
+ * @x:    where to store the X axis value
+ * @y:    where to store the Y axis value
+ * @z:    where to store the Z axis value
  *
  * Note that 40Hz input device can eat up about 10% CPU at 800MHZ
  */
-static void lis3lv02d_get_xyz(acpi_handle handle, int *x, int *y, int *z)
+static void lis3lv02d_get_xyz(struct lis3lv02d *lis3, int *x, int *y, int *z)
 {
         int position[3];
 
-        position[0] = adev.read_data(handle, OUTX);
-        position[1] = adev.read_data(handle, OUTY);
-        position[2] = adev.read_data(handle, OUTZ);
+        position[0] = lis3_dev.read_data(lis3, OUTX);
+        position[1] = lis3_dev.read_data(lis3, OUTY);
+        position[2] = lis3_dev.read_data(lis3, OUTZ);
 
-        *x = lis3lv02d_get_axis(adev.ac.x, position);
-        *y = lis3lv02d_get_axis(adev.ac.y, position);
-        *z = lis3lv02d_get_axis(adev.ac.z, position);
+        *x = lis3lv02d_get_axis(lis3_dev.ac.x, position);
+        *y = lis3lv02d_get_axis(lis3_dev.ac.y, position);
+        *z = lis3lv02d_get_axis(lis3_dev.ac.z, position);
 }
 
-void lis3lv02d_poweroff(acpi_handle handle)
+void lis3lv02d_poweroff(struct lis3lv02d *lis3)
 {
-        adev.is_on = 0;
+        lis3_dev.is_on = 0;
 }
 EXPORT_SYMBOL_GPL(lis3lv02d_poweroff);
 
-void lis3lv02d_poweron(acpi_handle handle)
+void lis3lv02d_poweron(struct lis3lv02d *lis3)
 {
-        adev.is_on = 1;
-        adev.init(handle);
+        lis3_dev.is_on = 1;
+        lis3_dev.init(lis3);
 }
 EXPORT_SYMBOL_GPL(lis3lv02d_poweron);
 
@@ -116,13 +132,13 @@ EXPORT_SYMBOL_GPL(lis3lv02d_poweron);
  * device will always be on until a call to lis3lv02d_decrease_use(). Not to be
  * used from interrupt context.
  */
-static void lis3lv02d_increase_use(struct acpi_lis3lv02d *dev)
+static void lis3lv02d_increase_use(struct lis3lv02d *dev)
 {
         mutex_lock(&dev->lock);
         dev->usage++;
         if (dev->usage == 1) {
                 if (!dev->is_on)
-                        lis3lv02d_poweron(dev->device->handle);
+                        lis3lv02d_poweron(dev);
         }
         mutex_unlock(&dev->lock);
 }
@@ -131,12 +147,12 @@ static void lis3lv02d_increase_use(struct acpi_lis3lv02d *dev)
  * To be called whenever a usage of the device is stopped.
  * It will make sure to turn off the device when there is not usage.
  */
-static void lis3lv02d_decrease_use(struct acpi_lis3lv02d *dev)
+static void lis3lv02d_decrease_use(struct lis3lv02d *dev)
 {
         mutex_lock(&dev->lock);
         dev->usage--;
         if (dev->usage == 0)
-                lis3lv02d_poweroff(dev->device->handle);
+                lis3lv02d_poweroff(dev);
         mutex_unlock(&dev->lock);
 }
 
@@ -147,10 +163,10 @@ static irqreturn_t lis302dl_interrupt(int irq, void *dummy)
          * the lid is closed. This leads to interrupts as soon as a little move
          * is done.
          */
-        atomic_inc(&adev.count);
+        atomic_inc(&lis3_dev.count);
 
-        wake_up_interruptible(&adev.misc_wait);
-        kill_fasync(&adev.async_queue, SIGIO, POLL_IN);
+        wake_up_interruptible(&lis3_dev.misc_wait);
+        kill_fasync(&lis3_dev.async_queue, SIGIO, POLL_IN);
         return IRQ_HANDLED;
 }
 
@@ -158,10 +174,10 @@ static int lis3lv02d_misc_open(struct inode *inode, struct file *file)
 {
         int ret;
 
-        if (test_and_set_bit(0, &adev.misc_opened))
+        if (test_and_set_bit(0, &lis3_dev.misc_opened))
                 return -EBUSY; /* already open */
 
-        atomic_set(&adev.count, 0);
+        atomic_set(&lis3_dev.count, 0);
 
         /*
          * The sensor can generate interrupts for free-fall and direction
@@ -174,25 +190,25 @@ static int lis3lv02d_misc_open(struct inode *inode, struct file *file)
          * io-apic is not configurable (and generates a warning) but I keep it
          * in case of support for other hardware.
          */
-        ret = request_irq(adev.irq, lis302dl_interrupt, IRQF_TRIGGER_RISING,
-                          DRIVER_NAME, &adev);
+        ret = request_irq(lis3_dev.irq, lis302dl_interrupt, IRQF_TRIGGER_RISING,
+                          DRIVER_NAME, &lis3_dev);
 
         if (ret) {
-                clear_bit(0, &adev.misc_opened);
-                printk(KERN_ERR DRIVER_NAME ": IRQ%d allocation failed\n", adev.irq);
+                clear_bit(0, &lis3_dev.misc_opened);
+                printk(KERN_ERR DRIVER_NAME ": IRQ%d allocation failed\n", lis3_dev.irq);
                 return -EBUSY;
         }
-        lis3lv02d_increase_use(&adev);
-        printk("lis3: registered interrupt %d\n", adev.irq);
+        lis3lv02d_increase_use(&lis3_dev);
+        printk("lis3: registered interrupt %d\n", lis3_dev.irq);
         return 0;
 }
 
 static int lis3lv02d_misc_release(struct inode *inode, struct file *file)
 {
-        fasync_helper(-1, file, 0, &adev.async_queue);
-        lis3lv02d_decrease_use(&adev);
-        free_irq(adev.irq, &adev);
-        clear_bit(0, &adev.misc_opened); /* release the device */
+        fasync_helper(-1, file, 0, &lis3_dev.async_queue);
+        lis3lv02d_decrease_use(&lis3_dev);
+        free_irq(lis3_dev.irq, &lis3_dev);
+        clear_bit(0, &lis3_dev.misc_opened); /* release the device */
         return 0;
 }
 
@@ -207,10 +223,10 @@ static ssize_t lis3lv02d_misc_read(struct file *file, char __user *buf,
         if (count < 1)
                 return -EINVAL;
 
-        add_wait_queue(&adev.misc_wait, &wait);
+        add_wait_queue(&lis3_dev.misc_wait, &wait);
         while (true) {
                 set_current_state(TASK_INTERRUPTIBLE);
-                data = atomic_xchg(&adev.count, 0);
+                data = atomic_xchg(&lis3_dev.count, 0);
                 if (data)
                         break;
 
@@ -240,22 +256,22 @@ static ssize_t lis3lv02d_misc_read(struct file *file, char __user *buf,
 
 out:
         __set_current_state(TASK_RUNNING);
-        remove_wait_queue(&adev.misc_wait, &wait);
+        remove_wait_queue(&lis3_dev.misc_wait, &wait);
 
         return retval;
 }
 
 static unsigned int lis3lv02d_misc_poll(struct file *file, poll_table *wait)
 {
-        poll_wait(file, &adev.misc_wait, wait);
-        if (atomic_read(&adev.count))
+        poll_wait(file, &lis3_dev.misc_wait, wait);
+        if (atomic_read(&lis3_dev.count))
                 return POLLIN | POLLRDNORM;
         return 0;
 }
 
 static int lis3lv02d_misc_fasync(int fd, struct file *file, int on)
 {
-        return fasync_helper(fd, file, on, &adev.async_queue);
+        return fasync_helper(fd, file, on, &lis3_dev.async_queue);
 }
 
 static const struct file_operations lis3lv02d_misc_fops = {
@@ -283,12 +299,12 @@ static int lis3lv02d_joystick_kthread(void *data)
         int x, y, z;
 
         while (!kthread_should_stop()) {
-                lis3lv02d_get_xyz(adev.device->handle, &x, &y, &z);
-                input_report_abs(adev.idev, ABS_X, x - adev.xcalib);
-                input_report_abs(adev.idev, ABS_Y, y - adev.ycalib);
-                input_report_abs(adev.idev, ABS_Z, z - adev.zcalib);
+                lis3lv02d_get_xyz(&lis3_dev, &x, &y, &z);
+                input_report_abs(lis3_dev.idev, ABS_X, x - lis3_dev.xcalib);
+                input_report_abs(lis3_dev.idev, ABS_Y, y - lis3_dev.ycalib);
+                input_report_abs(lis3_dev.idev, ABS_Z, z - lis3_dev.zcalib);
 
-                input_sync(adev.idev);
+                input_sync(lis3_dev.idev);
 
                 try_to_freeze();
                 msleep_interruptible(MDPS_POLL_INTERVAL);
@@ -299,11 +315,11 @@ static int lis3lv02d_joystick_kthread(void *data)
 
 static int lis3lv02d_joystick_open(struct input_dev *input)
 {
-        lis3lv02d_increase_use(&adev);
-        adev.kthread = kthread_run(lis3lv02d_joystick_kthread, NULL, "klis3lv02d");
-        if (IS_ERR(adev.kthread)) {
-                lis3lv02d_decrease_use(&adev);
-                return PTR_ERR(adev.kthread);
+        lis3lv02d_increase_use(&lis3_dev);
+        lis3_dev.kthread = kthread_run(lis3lv02d_joystick_kthread, NULL, "klis3lv02d");
+        if (IS_ERR(lis3_dev.kthread)) {
+                lis3lv02d_decrease_use(&lis3_dev);
+                return PTR_ERR(lis3_dev.kthread);
         }
 
         return 0;
@@ -311,45 +327,46 @@ static int lis3lv02d_joystick_open(struct input_dev *input)
 
 static void lis3lv02d_joystick_close(struct input_dev *input)
 {
-        kthread_stop(adev.kthread);
-        lis3lv02d_decrease_use(&adev);
+        kthread_stop(lis3_dev.kthread);
+        lis3lv02d_decrease_use(&lis3_dev);
 }
 
 static inline void lis3lv02d_calibrate_joystick(void)
 {
-        lis3lv02d_get_xyz(adev.device->handle, &adev.xcalib, &adev.ycalib, &adev.zcalib);
+        lis3lv02d_get_xyz(&lis3_dev,
+                &lis3_dev.xcalib, &lis3_dev.ycalib, &lis3_dev.zcalib);
 }
 
 int lis3lv02d_joystick_enable(void)
 {
         int err;
 
-        if (adev.idev)
+        if (lis3_dev.idev)
                 return -EINVAL;
 
-        adev.idev = input_allocate_device();
-        if (!adev.idev)
+        lis3_dev.idev = input_allocate_device();
+        if (!lis3_dev.idev)
                 return -ENOMEM;
 
         lis3lv02d_calibrate_joystick();
 
-        adev.idev->name       = "ST LIS3LV02DL Accelerometer";
-        adev.idev->phys       = DRIVER_NAME "/input0";
-        adev.idev->id.bustype = BUS_HOST;
-        adev.idev->id.vendor  = 0;
-        adev.idev->dev.parent = &adev.pdev->dev;
-        adev.idev->open       = lis3lv02d_joystick_open;
-        adev.idev->close      = lis3lv02d_joystick_close;
+        lis3_dev.idev->name       = "ST LIS3LV02DL Accelerometer";
+        lis3_dev.idev->phys       = DRIVER_NAME "/input0";
+        lis3_dev.idev->id.bustype = BUS_HOST;
+        lis3_dev.idev->id.vendor  = 0;
+        lis3_dev.idev->dev.parent = &lis3_dev.pdev->dev;
+        lis3_dev.idev->open       = lis3lv02d_joystick_open;
+        lis3_dev.idev->close      = lis3lv02d_joystick_close;
 
-        set_bit(EV_ABS, adev.idev->evbit);
-        input_set_abs_params(adev.idev, ABS_X, -adev.mdps_max_val, adev.mdps_max_val, 3, 3);
-        input_set_abs_params(adev.idev, ABS_Y, -adev.mdps_max_val, adev.mdps_max_val, 3, 3);
-        input_set_abs_params(adev.idev, ABS_Z, -adev.mdps_max_val, adev.mdps_max_val, 3, 3);
+        set_bit(EV_ABS, lis3_dev.idev->evbit);
+        input_set_abs_params(lis3_dev.idev, ABS_X, -lis3_dev.mdps_max_val, lis3_dev.mdps_max_val, 3, 3);
+        input_set_abs_params(lis3_dev.idev, ABS_Y, -lis3_dev.mdps_max_val, lis3_dev.mdps_max_val, 3, 3);
+        input_set_abs_params(lis3_dev.idev, ABS_Z, -lis3_dev.mdps_max_val, lis3_dev.mdps_max_val, 3, 3);
 
-        err = input_register_device(adev.idev);
+        err = input_register_device(lis3_dev.idev);
         if (err) {
-                input_free_device(adev.idev);
-                adev.idev = NULL;
+                input_free_device(lis3_dev.idev);
+                lis3_dev.idev = NULL;
         }
 
         return err;
@@ -358,71 +375,40 @@ EXPORT_SYMBOL_GPL(lis3lv02d_joystick_enable);
 
 void lis3lv02d_joystick_disable(void)
 {
-        if (!adev.idev)
+        if (!lis3_dev.idev)
                 return;
 
         misc_deregister(&lis3lv02d_misc_device);
-        input_unregister_device(adev.idev);
-        adev.idev = NULL;
+        input_unregister_device(lis3_dev.idev);
+        lis3_dev.idev = NULL;
 }
 EXPORT_SYMBOL_GPL(lis3lv02d_joystick_disable);
 
-/*
- * Initialise the accelerometer and the various subsystems.
- * Should be rather independant of the bus system.
- */
-int lis3lv02d_init_device(struct acpi_lis3lv02d *dev)
-{
-        mutex_init(&dev->lock);
-        lis3lv02d_add_fs(dev->device);
-        lis3lv02d_increase_use(dev);
-
-        if (lis3lv02d_joystick_enable())
-                printk(KERN_ERR DRIVER_NAME ": joystick initialization failed\n");
-
-        printk("lis3_init_device: irq %d\n", dev->irq);
-
-        /* if we did not get an IRQ from ACPI - we have nothing more to do */
-        if (!dev->irq) {
-                printk(KERN_ERR DRIVER_NAME
-                        ": No IRQ in ACPI. Disabling /dev/freefall\n");
-                goto out;
-        }
-
-        printk("lis3: registering device\n");
-        if (misc_register(&lis3lv02d_misc_device))
-                printk(KERN_ERR DRIVER_NAME ": misc_register failed\n");
-out:
-        lis3lv02d_decrease_use(dev);
-        return 0;
-}
-EXPORT_SYMBOL_GPL(lis3lv02d_init_device);
-
 /* Sysfs stuff */
 static ssize_t lis3lv02d_position_show(struct device *dev,
                                 struct device_attribute *attr, char *buf)
 {
         int x, y, z;
 
-        lis3lv02d_increase_use(&adev);
-        lis3lv02d_get_xyz(adev.device->handle, &x, &y, &z);
-        lis3lv02d_decrease_use(&adev);
+        lis3lv02d_increase_use(&lis3_dev);
+        lis3lv02d_get_xyz(&lis3_dev, &x, &y, &z);
+        lis3lv02d_decrease_use(&lis3_dev);
         return sprintf(buf, "(%d,%d,%d)\n", x, y, z);
 }
 
 static ssize_t lis3lv02d_calibrate_show(struct device *dev,
                                 struct device_attribute *attr, char *buf)
 {
-        return sprintf(buf, "(%d,%d,%d)\n", adev.xcalib, adev.ycalib, adev.zcalib);
+        return sprintf(buf, "(%d,%d,%d)\n", lis3_dev.xcalib, lis3_dev.ycalib, lis3_dev.zcalib);
 }
 
 static ssize_t lis3lv02d_calibrate_store(struct device *dev,
                                 struct device_attribute *attr,
                                 const char *buf, size_t count)
 {
-        lis3lv02d_increase_use(&adev);
+        lis3lv02d_increase_use(&lis3_dev);
         lis3lv02d_calibrate_joystick();
-        lis3lv02d_decrease_use(&adev);
+        lis3lv02d_decrease_use(&lis3_dev);
         return count;
 }
 
@@ -434,9 +420,9 @@ static ssize_t lis3lv02d_rate_show(struct device *dev,
         u8 ctrl;
         int val;
 
-        lis3lv02d_increase_use(&adev);
-        adev.read(adev.device->handle, CTRL_REG1, &ctrl);
-        lis3lv02d_decrease_use(&adev);
+        lis3lv02d_increase_use(&lis3_dev);
+        lis3_dev.read(&lis3_dev, CTRL_REG1, &ctrl);
+        lis3lv02d_decrease_use(&lis3_dev);
         val = (ctrl & (CTRL1_DF0 | CTRL1_DF1)) >> 4;
         return sprintf(buf, "%d\n", lis3lv02dl_df_val[val]);
 }
@@ -458,23 +444,73 @@ static struct attribute_group lis3lv02d_attribute_group = {
 };
 
 
-static int lis3lv02d_add_fs(struct acpi_device *device)
+static int lis3lv02d_add_fs(struct lis3lv02d *lis3)
 {
-        adev.pdev = platform_device_register_simple(DRIVER_NAME, -1, NULL, 0);
-        if (IS_ERR(adev.pdev))
-                return PTR_ERR(adev.pdev);
+        lis3_dev.pdev = platform_device_register_simple(DRIVER_NAME, -1, NULL, 0);
+        if (IS_ERR(lis3_dev.pdev))
+                return PTR_ERR(lis3_dev.pdev);
 
-        return sysfs_create_group(&adev.pdev->dev.kobj, &lis3lv02d_attribute_group);
+        return sysfs_create_group(&lis3_dev.pdev->dev.kobj, &lis3lv02d_attribute_group);
 }
 
 int lis3lv02d_remove_fs(void)
 {
-        sysfs_remove_group(&adev.pdev->dev.kobj, &lis3lv02d_attribute_group);
-        platform_device_unregister(adev.pdev);
+        sysfs_remove_group(&lis3_dev.pdev->dev.kobj, &lis3lv02d_attribute_group);
+        platform_device_unregister(lis3_dev.pdev);
         return 0;
 }
 EXPORT_SYMBOL_GPL(lis3lv02d_remove_fs);
 
+/*
+ * Initialise the accelerometer and the various subsystems.
+ * Should be rather independant of the bus system.
+ */
+int lis3lv02d_init_device(struct lis3lv02d *dev)
+{
+        dev->whoami = lis3lv02d_read_8(dev, WHO_AM_I);
+
+        switch (dev->whoami) {
+        case LIS_DOUBLE_ID:
+                printk(KERN_INFO DRIVER_NAME ": 2-byte sensor found\n");
+                dev->read_data = lis3lv02d_read_16;
+                dev->mdps_max_val = 2048;
+                break;
+        case LIS_SINGLE_ID:
+                printk(KERN_INFO DRIVER_NAME ": 1-byte sensor found\n");
+                dev->read_data = lis3lv02d_read_8;
+                dev->mdps_max_val = 128;
+                break;
+        default:
+                printk(KERN_ERR DRIVER_NAME
+                        ": unknown sensor type 0x%X\n", lis3_dev.whoami);
+                return -EINVAL;
+        }
+
+        mutex_init(&dev->lock);
+        lis3lv02d_add_fs(dev);
+        lis3lv02d_increase_use(dev);
+
+        if (lis3lv02d_joystick_enable())
+                printk(KERN_ERR DRIVER_NAME ": joystick initialization failed\n");
+
+        printk("lis3_init_device: irq %d\n", dev->irq);
+
+        /* bail if we did not get an IRQ from the bus layer */
+        if (!dev->irq) {
+                printk(KERN_ERR DRIVER_NAME
+                        ": No IRQ. Disabling /dev/freefall\n");
+                goto out;
+        }
+
+        printk("lis3: registering device\n");
+        if (misc_register(&lis3lv02d_misc_device))
+                printk(KERN_ERR DRIVER_NAME ": misc_register failed\n");
+out:
+        lis3lv02d_decrease_use(dev);
+        return 0;
+}
+EXPORT_SYMBOL_GPL(lis3lv02d_init_device);
+
 MODULE_DESCRIPTION("ST LIS3LV02Dx three-axis digital accelerometer driver");
 MODULE_AUTHOR("Yan Burman, Eric Piel, Pavel Machek");
 MODULE_LICENSE("GPL");
diff --git a/drivers/hwmon/lis3lv02d.h b/drivers/hwmon/lis3lv02d.h
index 75972bf372ff..745ec96806d4 100644
--- a/drivers/hwmon/lis3lv02d.h
+++ b/drivers/hwmon/lis3lv02d.h
@@ -159,14 +159,14 @@ struct axis_conversion {
         s8      z;
 };
 
-struct acpi_lis3lv02d {
-        struct acpi_device      *device;   /* The ACPI device */
-        acpi_status (*init) (acpi_handle handle);
-        acpi_status (*write) (acpi_handle handle, int reg, u8 val);
-        acpi_status (*read) (acpi_handle handle, int reg, u8 *ret);
+struct lis3lv02d {
+        void                    *bus_priv; /* used by the bus layer only */
+        int (*init) (struct lis3lv02d *lis3);
+        int (*write) (struct lis3lv02d *lis3, int reg, u8 val);
+        int (*read) (struct lis3lv02d *lis3, int reg, u8 *ret);
 
         u8                      whoami;    /* 3Ah: 2-byte registries, 3Bh: 1-byte registries */
-        s16 (*read_data) (acpi_handle handle, int reg);
+        s16 (*read_data) (struct lis3lv02d *lis3, int reg);
         int                     mdps_max_val;
 
         struct input_dev        *idev;     /* input device */
@@ -187,11 +187,11 @@ struct acpi_lis3lv02d {
         unsigned long           misc_opened; /* bit0: whether the device is open */
 };
 
-int lis3lv02d_init_device(struct acpi_lis3lv02d *dev);
+int lis3lv02d_init_device(struct lis3lv02d *lis3);
 int lis3lv02d_joystick_enable(void);
 void lis3lv02d_joystick_disable(void);
-void lis3lv02d_poweroff(acpi_handle handle);
-void lis3lv02d_poweron(acpi_handle handle);
+void lis3lv02d_poweroff(struct lis3lv02d *lis3);
+void lis3lv02d_poweron(struct lis3lv02d *lis3);
 int lis3lv02d_remove_fs(void);
 
-extern struct acpi_lis3lv02d adev;
+extern struct lis3lv02d lis3_dev;
diff --git a/drivers/hwmon/lis3lv02d_spi.c b/drivers/hwmon/lis3lv02d_spi.c
new file mode 100644
index 000000000000..07ae74b0e191
--- /dev/null
+++ b/drivers/hwmon/lis3lv02d_spi.c
@@ -0,0 +1,114 @@
+/*
+ * lis3lv02d_spi - SPI glue layer for lis3lv02d
+ *
+ * Copyright (c) 2009 Daniel Mack <daniel@caiaq.de>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  publishhed by the Free Software Foundation.
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/err.h>
+#include <linux/input.h>
+#include <linux/interrupt.h>
+#include <linux/workqueue.h>
+#include <linux/spi/spi.h>
+
+#include "lis3lv02d.h"
+
+#define DRV_NAME        "lis3lv02d_spi"
+#define LIS3_SPI_READ   0x80
+
+static int lis3_spi_read(struct lis3lv02d *lis3, int reg, u8 *v)
+{
+        struct spi_device *spi = lis3->bus_priv;
+        int ret = spi_w8r8(spi, reg | LIS3_SPI_READ);
+        if (ret < 0)
+                return -EINVAL;
+
+        *v = (u8) ret;
+        return 0;
+}
+
+static int lis3_spi_write(struct lis3lv02d *lis3, int reg, u8 val)
+{
+        u8 tmp[2] = { reg, val };
+        struct spi_device *spi = lis3->bus_priv;
+        return spi_write(spi, tmp, sizeof(tmp));
+}
+
+static int lis3_spi_init(struct lis3lv02d *lis3)
+{
+        u8 reg;
+        int ret;
+
+        /* power up the device */
+        ret = lis3->read(lis3, CTRL_REG1, &reg);
+        if (ret < 0)
+                return ret;
+
+        reg |= CTRL1_PD0;
+        return lis3->write(lis3, CTRL_REG1, reg);
+}
+
+static struct axis_conversion lis3lv02d_axis_normal = { 1, 2, 3 };
+
+static int __devinit lis302dl_spi_probe(struct spi_device *spi)
+{
+        int ret;
+
+        spi->bits_per_word = 8;
+        spi->mode = SPI_MODE_0;
+        ret = spi_setup(spi);
+        if (ret < 0)
+                return ret;
+
+        lis3_dev.bus_priv = spi;
+        lis3_dev.init = lis3_spi_init;
+        lis3_dev.read = lis3_spi_read;
+        lis3_dev.write = lis3_spi_write;
+        lis3_dev.irq = spi->irq;
+        lis3_dev.ac = lis3lv02d_axis_normal;
+        spi_set_drvdata(spi, &lis3_dev);
+
+        ret = lis3lv02d_init_device(&lis3_dev);
+        return ret;
+}
+
+static int __devexit lis302dl_spi_remove(struct spi_device *spi)
+{
+        struct lis3lv02d *lis3 = spi_get_drvdata(spi);
+        lis3lv02d_joystick_disable();
+        lis3lv02d_poweroff(lis3);
+        return 0;
+}
+
+static struct spi_driver lis302dl_spi_driver = {
+        .driver  = {
+                .name   = DRV_NAME,
+                .owner  = THIS_MODULE,
+        },
+        .probe  = lis302dl_spi_probe,
+        .remove = __devexit_p(lis302dl_spi_remove),
+};
+
+static int __init lis302dl_init(void)
+{
+        return spi_register_driver(&lis302dl_spi_driver);
+}
+
+static void __exit lis302dl_exit(void)
+{
+        spi_unregister_driver(&lis302dl_spi_driver);
+}
+
+module_init(lis302dl_init);
+module_exit(lis302dl_exit);
+
+MODULE_AUTHOR("Daniel Mack <daniel@caiaq.de>");
+MODULE_DESCRIPTION("lis3lv02d SPI glue layer");
+MODULE_LICENSE("GPL");
+
diff --git a/drivers/hwmon/lm95241.c b/drivers/hwmon/lm95241.c
new file mode 100644
index 000000000000..091d95f38aaa
--- /dev/null
+++ b/drivers/hwmon/lm95241.c
@@ -0,0 +1,527 @@
+/*
+ * lm95241.c - Part of lm_sensors, Linux kernel modules for hardware
+ *             monitoring
+ * Copyright (C) 2008 Davide Rizzo <elpa-rizzo@gmail.com>
+ *
+ * Based on the max1619 driver. The LM95241 is a sensor chip made by National
+ *   Semiconductors.
+ * It reports up to three temperatures (its own plus up to
+ * two external ones). Complete datasheet can be
+ * obtained from National's website at:
+ *   http://www.national.com/ds.cgi/LM/LM95241.pdf
+ *
+ * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <linux/jiffies.h>
+#include <linux/i2c.h>
+#include <linux/hwmon.h>
+#include <linux/hwmon-sysfs.h>
+#include <linux/err.h>
+#include <linux/mutex.h>
+#include <linux/sysfs.h>
+
+static const unsigned short normal_i2c[] = {
+        0x19, 0x2a, 0x2b, I2C_CLIENT_END};
+
+/* Insmod parameters */
+I2C_CLIENT_INSMOD_1(lm95241);
+
+/* LM95241 registers */
+#define LM95241_REG_R_MAN_ID            0xFE
+#define LM95241_REG_R_CHIP_ID           0xFF
+#define LM95241_REG_R_STATUS            0x02
+#define LM95241_REG_RW_CONFIG           0x03
+#define LM95241_REG_RW_REM_FILTER       0x06
+#define LM95241_REG_RW_TRUTHERM         0x07
+#define LM95241_REG_W_ONE_SHOT          0x0F
+#define LM95241_REG_R_LOCAL_TEMPH       0x10
+#define LM95241_REG_R_REMOTE1_TEMPH     0x11
+#define LM95241_REG_R_REMOTE2_TEMPH     0x12
+#define LM95241_REG_R_LOCAL_TEMPL       0x20
+#define LM95241_REG_R_REMOTE1_TEMPL     0x21
+#define LM95241_REG_R_REMOTE2_TEMPL     0x22
+#define LM95241_REG_RW_REMOTE_MODEL     0x30
+
+/* LM95241 specific bitfields */
+#define CFG_STOP 0x40
+#define CFG_CR0076 0x00
+#define CFG_CR0182 0x10
+#define CFG_CR1000 0x20
+#define CFG_CR2700 0x30
+#define R1MS_SHIFT 0
+#define R2MS_SHIFT 2
+#define R1MS_MASK (0x01 << (R1MS_SHIFT))
+#define R2MS_MASK (0x01 << (R2MS_SHIFT))
+#define R1DF_SHIFT 1
+#define R2DF_SHIFT 2
+#define R1DF_MASK (0x01 << (R1DF_SHIFT))
+#define R2DF_MASK (0x01 << (R2DF_SHIFT))
+#define R1FE_MASK 0x01
+#define R2FE_MASK 0x05
+#define TT1_SHIFT 0
+#define TT2_SHIFT 4
+#define TT_OFF 0
+#define TT_ON 1
+#define TT_MASK 7
+#define MANUFACTURER_ID 0x01
+#define DEFAULT_REVISION 0xA4
+
+/* Conversions and various macros */
+#define TEMP_FROM_REG(val_h, val_l) (((val_h) & 0x80 ? (val_h) - 0x100 : \
+    (val_h)) * 1000 + (val_l) * 1000 / 256)
+
+/* Functions declaration */
+static int lm95241_attach_adapter(struct i2c_adapter *adapter);
+static int lm95241_detect(struct i2c_adapter *adapter, int address,
+                          int kind);
+static void lm95241_init_client(struct i2c_client *client);
+static int lm95241_detach_client(struct i2c_client *client);
+static struct lm95241_data *lm95241_update_device(struct device *dev);
+
+/* Driver data (common to all clients) */
+static struct i2c_driver lm95241_driver = {
+        .driver = {
+                .name   = "lm95241",
+        },
+        .attach_adapter = lm95241_attach_adapter,
+        .detach_client  = lm95241_detach_client,
+};
+
+/* Client data (each client gets its own) */
+struct lm95241_data {
+        struct i2c_client client;
+        struct device *hwmon_dev;
+        struct mutex update_lock;
+        unsigned long last_updated, rate; /* in jiffies */
+        char valid; /* zero until following fields are valid */
+        /* registers values */
+        u8 local_h, local_l; /* local */
+        u8 remote1_h, remote1_l; /* remote1 */
+        u8 remote2_h, remote2_l; /* remote2 */
+        u8 config, model, trutherm;
+};
+
+/* Sysfs stuff */
+#define show_temp(value) \
+static ssize_t show_##value(struct device *dev, \
+    struct device_attribute *attr, char *buf) \
+{ \
+        struct lm95241_data *data = lm95241_update_device(dev); \
+        snprintf(buf, PAGE_SIZE - 1, "%d\n", \
+                TEMP_FROM_REG(data->value##_h, data->value##_l)); \
+        return strlen(buf); \
+}
+show_temp(local);
+show_temp(remote1);
+show_temp(remote2);
+
+static ssize_t show_rate(struct device *dev, struct device_attribute *attr,
+                         char *buf)
+{
+        struct lm95241_data *data = lm95241_update_device(dev);
+
+        snprintf(buf, PAGE_SIZE - 1, "%lu\n", 1000 * data->rate / HZ);
+        return strlen(buf);
+}
+
+static ssize_t set_rate(struct device *dev, struct device_attribute *attr,
+                        const char *buf, size_t count)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        struct lm95241_data *data = i2c_get_clientdata(client);
+
+        strict_strtol(buf, 10, &data->rate);
+        data->rate = data->rate * HZ / 1000;
+
+        return count;
+}
+
+#define show_type(flag) \
+static ssize_t show_type##flag(struct device *dev, \
+                                   struct device_attribute *attr, char *buf) \
+{ \
+        struct i2c_client *client = to_i2c_client(dev); \
+        struct lm95241_data *data = i2c_get_clientdata(client); \
+\
+        snprintf(buf, PAGE_SIZE - 1, \
+                data->model & R##flag##MS_MASK ? "1\n" : "2\n"); \
+        return strlen(buf); \
+}
+show_type(1);
+show_type(2);
+
+#define show_min(flag) \
+static ssize_t show_min##flag(struct device *dev, \
+    struct device_attribute *attr, char *buf) \
+{ \
+        struct i2c_client *client = to_i2c_client(dev); \
+        struct lm95241_data *data = i2c_get_clientdata(client); \
+\
+        snprintf(buf, PAGE_SIZE - 1, \
+                data->config & R##flag##DF_MASK ?       \
+                "-127000\n" : "0\n"); \
+        return strlen(buf); \
+}
+show_min(1);
+show_min(2);
+
+#define show_max(flag) \
+static ssize_t show_max##flag(struct device *dev, \
+    struct device_attribute *attr, char *buf) \
+{ \
+        struct i2c_client *client = to_i2c_client(dev); \
+        struct lm95241_data *data = i2c_get_clientdata(client); \
+\
+        snprintf(buf, PAGE_SIZE - 1, \
+                data->config & R##flag##DF_MASK ? \
+                "127000\n" : "255000\n"); \
+        return strlen(buf); \
+}
+show_max(1);
+show_max(2);
+
+#define set_type(flag) \
+static ssize_t set_type##flag(struct device *dev, \
+                                  struct device_attribute *attr, \
+                                  const char *buf, size_t count) \
+{ \
+        struct i2c_client *client = to_i2c_client(dev); \
+        struct lm95241_data *data = i2c_get_clientdata(client); \
+\
+        long val; \
+        strict_strtol(buf, 10, &val); \
+\
+        if ((val == 1) || (val == 2)) { \
+\
+                mutex_lock(&data->update_lock); \
+\
+                data->trutherm &= ~(TT_MASK << TT##flag##_SHIFT); \
+                if (val == 1) { \
+                        data->model |= R##flag##MS_MASK; \
+                        data->trutherm |= (TT_ON << TT##flag##_SHIFT); \
+                } \
+                else { \
+                        data->model &= ~R##flag##MS_MASK; \
+                        data->trutherm |= (TT_OFF << TT##flag##_SHIFT); \
+                } \
+\
+                data->valid = 0; \
+\
+                i2c_smbus_write_byte_data(client, LM95241_REG_RW_REMOTE_MODEL, \
+                                          data->model); \
+                i2c_smbus_write_byte_data(client, LM95241_REG_RW_TRUTHERM, \
+                                          data->trutherm); \
+\
+                mutex_unlock(&data->update_lock); \
+\
+        } \
+        return count; \
+}
+set_type(1);
+set_type(2);
+
+#define set_min(flag) \
+static ssize_t set_min##flag(struct device *dev, \
+        struct device_attribute *devattr, const char *buf, size_t count) \
+{ \
+        struct i2c_client *client = to_i2c_client(dev); \
+        struct lm95241_data *data = i2c_get_clientdata(client); \
+\
+        long val; \
+        strict_strtol(buf, 10, &val); \
+\
+        mutex_lock(&data->update_lock); \
+\
+        if (val < 0) \
+                data->config |= R##flag##DF_MASK; \
+        else \
+                data->config &= ~R##flag##DF_MASK; \
+\
+        data->valid = 0; \
+\
+        i2c_smbus_write_byte_data(client, LM95241_REG_RW_CONFIG, \
+                data->config); \
+\
+        mutex_unlock(&data->update_lock); \
+\
+        return count; \
+}
+set_min(1);
+set_min(2);
+
+#define set_max(flag) \
+static ssize_t set_max##flag(struct device *dev, \
+        struct device_attribute *devattr, const char *buf, size_t count) \
+{ \
+        struct i2c_client *client = to_i2c_client(dev); \
+        struct lm95241_data *data = i2c_get_clientdata(client); \
+\
+        long val; \
+        strict_strtol(buf, 10, &val); \
+\
+        mutex_lock(&data->update_lock); \
+\
+        if (val <= 127000) \
+                data->config |= R##flag##DF_MASK; \
+        else \
+                data->config &= ~R##flag##DF_MASK; \
+\
+        data->valid = 0; \
+\
+        i2c_smbus_write_byte_data(client, LM95241_REG_RW_CONFIG, \
+                data->config); \
+\
+        mutex_unlock(&data->update_lock); \
+\
+        return count; \
+}
+set_max(1);
+set_max(2);
+
+static DEVICE_ATTR(temp1_input, S_IRUGO, show_local, NULL);
+static DEVICE_ATTR(temp2_input, S_IRUGO, show_remote1, NULL);
+static DEVICE_ATTR(temp3_input, S_IRUGO, show_remote2, NULL);
+static DEVICE_ATTR(temp2_type, S_IWUSR | S_IRUGO, show_type1, set_type1);
+static DEVICE_ATTR(temp3_type, S_IWUSR | S_IRUGO, show_type2, set_type2);
+static DEVICE_ATTR(temp2_min, S_IWUSR | S_IRUGO, show_min1, set_min1);
+static DEVICE_ATTR(temp3_min, S_IWUSR | S_IRUGO, show_min2, set_min2);
+static DEVICE_ATTR(temp2_max, S_IWUSR | S_IRUGO, show_max1, set_max1);
+static DEVICE_ATTR(temp3_max, S_IWUSR | S_IRUGO, show_max2, set_max2);
+static DEVICE_ATTR(rate, S_IWUSR | S_IRUGO, show_rate, set_rate);
+
+static struct attribute *lm95241_attributes[] = {
+        &dev_attr_temp1_input.attr,
+        &dev_attr_temp2_input.attr,
+        &dev_attr_temp3_input.attr,
+        &dev_attr_temp2_type.attr,
+        &dev_attr_temp3_type.attr,
+        &dev_attr_temp2_min.attr,
+        &dev_attr_temp3_min.attr,
+        &dev_attr_temp2_max.attr,
+        &dev_attr_temp3_max.attr,
+        &dev_attr_rate.attr,
+        NULL
+};
+
+static const struct attribute_group lm95241_group = {
+        .attrs = lm95241_attributes,
+};
+
+/* Init/exit code */
+static int lm95241_attach_adapter(struct i2c_adapter *adapter)
+{
+        if (!(adapter->class & I2C_CLASS_HWMON))
+                return 0;
+        return i2c_probe(adapter, &addr_data, lm95241_detect);
+}
+
+/*
+ * The following function does more than just detection. If detection
+ * succeeds, it also registers the new chip.
+ */
+static int lm95241_detect(struct i2c_adapter *adapter, int address, int kind)
+{
+        struct i2c_client *new_client;
+        struct lm95241_data *data;
+        int err = 0;
+        const char *name = "";
+
+        if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))
+                goto exit;
+
+        data = kzalloc(sizeof(struct lm95241_data), GFP_KERNEL);
+        if (!data) {
+                err = -ENOMEM;
+                goto exit;
+        }
+
+        /* The common I2C client data is placed right before the
+           LM95241-specific data. */
+        new_client = &data->client;
+        i2c_set_clientdata(new_client, data);
+        new_client->addr = address;
+        new_client->adapter = adapter;
+        new_client->driver = &lm95241_driver;
+        new_client->flags = 0;
+
+        /*
+         * Now we do the remaining detection. A negative kind means that
+         * the driver was loaded with no force parameter (default), so we
+         * must both detect and identify the chip. A zero kind means that
+         * the driver was loaded with the force parameter, the detection
+         * step shall be skipped. A positive kind means that the driver
+         * was loaded with the force parameter and a given kind of chip is
+         * requested, so both the detection and the identification steps
+         * are skipped.
+         */
+        if (kind < 0) { /* detection */
+                if ((i2c_smbus_read_byte_data(new_client, LM95241_REG_R_MAN_ID)
+                     != MANUFACTURER_ID)
+                || (i2c_smbus_read_byte_data(new_client, LM95241_REG_R_CHIP_ID)
+                    < DEFAULT_REVISION)) {
+                        dev_dbg(&adapter->dev,
+                                "LM95241 detection failed at 0x%02x.\n",
+                                address);
+                        goto exit_free;
+                }
+        }
+
+        if (kind <= 0) { /* identification */
+                if ((i2c_smbus_read_byte_data(new_client, LM95241_REG_R_MAN_ID)
+                     == MANUFACTURER_ID)
+                && (i2c_smbus_read_byte_data(new_client, LM95241_REG_R_CHIP_ID)
+                    >= DEFAULT_REVISION)) {
+
+                        kind = lm95241;
+
+                        if (kind <= 0) { /* identification failed */
+                                dev_info(&adapter->dev, "Unsupported chip\n");
+                                goto exit_free;
+                        }
+                }
+        }
+
+        if (kind == lm95241)
+                name = "lm95241";
+
+        /* We can fill in the remaining client fields */
+        strlcpy(new_client->name, name, I2C_NAME_SIZE);
+        data->valid = 0;
+        mutex_init(&data->update_lock);
+
+        /* Tell the I2C layer a new client has arrived */
+        err = i2c_attach_client(new_client);
+        if (err)
+                goto exit_free;
+
+        /* Initialize the LM95241 chip */
+        lm95241_init_client(new_client);
+
+        /* Register sysfs hooks */
+        err = sysfs_create_group(&new_client->dev.kobj, &lm95241_group);
+        if (err)
+                goto exit_detach;
+
+        data->hwmon_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->hwmon_dev)) {
+                err = PTR_ERR(data->hwmon_dev);
+                goto exit_remove_files;
+        }
+
+        return 0;
+
+exit_remove_files:
+        sysfs_remove_group(&new_client->dev.kobj, &lm95241_group);
+exit_detach:
+        i2c_detach_client(new_client);
+exit_free:
+        kfree(data);
+exit:
+        return err;
+}
+
+static void lm95241_init_client(struct i2c_client *client)
+{
+        struct lm95241_data *data = i2c_get_clientdata(client);
+
+        data->rate = HZ;    /* 1 sec default */
+        data->valid = 0;
+        data->config = CFG_CR0076;
+        data->model = 0;
+        data->trutherm = (TT_OFF << TT1_SHIFT) | (TT_OFF << TT2_SHIFT);
+
+        i2c_smbus_write_byte_data(client, LM95241_REG_RW_CONFIG,
+                                  data->config);
+        i2c_smbus_write_byte_data(client, LM95241_REG_RW_REM_FILTER,
+                                  R1FE_MASK | R2FE_MASK);
+        i2c_smbus_write_byte_data(client, LM95241_REG_RW_TRUTHERM,
+                                  data->trutherm);
+        i2c_smbus_write_byte_data(client, LM95241_REG_RW_REMOTE_MODEL,
+                                  data->model);
+}
+
+static int lm95241_detach_client(struct i2c_client *client)
+{
+        struct lm95241_data *data = i2c_get_clientdata(client);
+        int err;
+
+        hwmon_device_unregister(data->hwmon_dev);
+        sysfs_remove_group(&client->dev.kobj, &lm95241_group);
+
+        err = i2c_detach_client(client);
+        if (err)
+                return err;
+
+        kfree(data);
+        return 0;
+}
+
+static struct lm95241_data *lm95241_update_device(struct device *dev)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        struct lm95241_data *data = i2c_get_clientdata(client);
+
+        mutex_lock(&data->update_lock);
+
+        if (time_after(jiffies, data->last_updated + data->rate) ||
+            !data->valid) {
+                dev_dbg(&client->dev, "Updating lm95241 data.\n");
+                data->local_h =
+                        i2c_smbus_read_byte_data(client,
+                                                 LM95241_REG_R_LOCAL_TEMPH);
+                data->local_l =
+                        i2c_smbus_read_byte_data(client,
+                                                 LM95241_REG_R_LOCAL_TEMPL);
+                data->remote1_h =
+                        i2c_smbus_read_byte_data(client,
+                                                 LM95241_REG_R_REMOTE1_TEMPH);
+                data->remote1_l =
+                        i2c_smbus_read_byte_data(client,
+                                                 LM95241_REG_R_REMOTE1_TEMPL);
+                data->remote2_h =
+                        i2c_smbus_read_byte_data(client,
+                                                 LM95241_REG_R_REMOTE2_TEMPH);
+                data->remote2_l =
+                        i2c_smbus_read_byte_data(client,
+                                                 LM95241_REG_R_REMOTE2_TEMPL);
+                data->last_updated = jiffies;
+                data->valid = 1;
+        }
+
+        mutex_unlock(&data->update_lock);
+
+        return data;
+}
+
+static int __init sensors_lm95241_init(void)
+{
+        return i2c_add_driver(&lm95241_driver);
+}
+
+static void __exit sensors_lm95241_exit(void)
+{
+        i2c_del_driver(&lm95241_driver);
+}
+
+MODULE_AUTHOR("Davide Rizzo <elpa-rizzo@gmail.com>");
+MODULE_DESCRIPTION("LM95241 sensor driver");
+MODULE_LICENSE("GPL");
+
+module_init(sensors_lm95241_init);
+module_exit(sensors_lm95241_exit);
diff --git a/drivers/hwmon/ltc4215.c b/drivers/hwmon/ltc4215.c
new file mode 100644
index 000000000000..9386e2a39211
--- /dev/null
+++ b/drivers/hwmon/ltc4215.c
@@ -0,0 +1,364 @@
+/*
+ * Driver for Linear Technology LTC4215 I2C Hot Swap Controller
+ *
+ * Copyright (C) 2009 Ira W. Snyder <iws@ovro.caltech.edu>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * Datasheet:
+ * http://www.linear.com/pc/downloadDocument.do?navId=H0,C1,C1003,C1006,C1163,P17572,D12697
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/err.h>
+#include <linux/slab.h>
+#include <linux/i2c.h>
+#include <linux/hwmon.h>
+#include <linux/hwmon-sysfs.h>
+
+static const unsigned short normal_i2c[] = { I2C_CLIENT_END };
+
+/* Insmod parameters */
+I2C_CLIENT_INSMOD_1(ltc4215);
+
+/* Here are names of the chip's registers (a.k.a. commands) */
+enum ltc4215_cmd {
+        LTC4215_CONTROL                 = 0x00, /* rw */
+        LTC4215_ALERT                   = 0x01, /* rw */
+        LTC4215_STATUS                  = 0x02, /* ro */
+        LTC4215_FAULT                   = 0x03, /* rw */
+        LTC4215_SENSE                   = 0x04, /* rw */
+        LTC4215_SOURCE                  = 0x05, /* rw */
+        LTC4215_ADIN                    = 0x06, /* rw */
+};
+
+struct ltc4215_data {
+        struct device *hwmon_dev;
+
+        struct mutex update_lock;
+        bool valid;
+        unsigned long last_updated; /* in jiffies */
+
+        /* Registers */
+        u8 regs[7];
+};
+
+static struct ltc4215_data *ltc4215_update_device(struct device *dev)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        struct ltc4215_data *data = i2c_get_clientdata(client);
+        s32 val;
+        int i;
+
+        mutex_lock(&data->update_lock);
+
+        /* The chip's A/D updates 10 times per second */
+        if (time_after(jiffies, data->last_updated + HZ / 10) || !data->valid) {
+
+                dev_dbg(&client->dev, "Starting ltc4215 update\n");
+
+                /* Read all registers */
+                for (i = 0; i < ARRAY_SIZE(data->regs); i++) {
+                        val = i2c_smbus_read_byte_data(client, i);
+                        if (unlikely(val < 0))
+                                data->regs[i] = 0;
+                        else
+                                data->regs[i] = val;
+                }
+
+                data->last_updated = jiffies;
+                data->valid = 1;
+        }
+
+        mutex_unlock(&data->update_lock);
+
+        return data;
+}
+
+/* Return the voltage from the given register in millivolts */
+static int ltc4215_get_voltage(struct device *dev, u8 reg)
+{
+        struct ltc4215_data *data = ltc4215_update_device(dev);
+        const u8 regval = data->regs[reg];
+        u32 voltage = 0;
+
+        switch (reg) {
+        case LTC4215_SENSE:
+                /* 151 uV per increment */
+                voltage = regval * 151 / 1000;
+                break;
+        case LTC4215_SOURCE:
+                /* 60.5 mV per increment */
+                voltage = regval * 605 / 10;
+                break;
+        case LTC4215_ADIN:
+                /* The ADIN input is divided by 12.5, and has 4.82 mV
+                 * per increment, so we have the additional multiply */
+                voltage = regval * 482 * 125 / 1000;
+                break;
+        default:
+                /* If we get here, the developer messed up */
+                WARN_ON_ONCE(1);
+                break;
+        }
+
+        return voltage;
+}
+
+/* Return the current from the sense resistor in mA */
+static unsigned int ltc4215_get_current(struct device *dev)
+{
+        struct ltc4215_data *data = ltc4215_update_device(dev);
+
+        /* The strange looking conversions that follow are fixed-point
+         * math, since we cannot do floating point in the kernel.
+         *
+         * Step 1: convert sense register to microVolts
+         * Step 2: convert voltage to milliAmperes
+         *
+         * If you play around with the V=IR equation, you come up with
+         * the following: X uV / Y mOhm == Z mA
+         *
+         * With the resistors that are fractions of a milliOhm, we multiply
+         * the voltage and resistance by 10, to shift the decimal point.
+         * Now we can use the normal division operator again.
+         */
+
+        /* Calculate voltage in microVolts (151 uV per increment) */
+        const unsigned int voltage = data->regs[LTC4215_SENSE] * 151;
+
+        /* Calculate current in milliAmperes (4 milliOhm sense resistor) */
+        const unsigned int curr = voltage / 4;
+
+        return curr;
+}
+
+static ssize_t ltc4215_show_voltage(struct device *dev,
+                                    struct device_attribute *da,
+                                    char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
+        const int voltage = ltc4215_get_voltage(dev, attr->index);
+
+        return snprintf(buf, PAGE_SIZE, "%d\n", voltage);
+}
+
+static ssize_t ltc4215_show_current(struct device *dev,
+                                    struct device_attribute *da,
+                                    char *buf)
+{
+        const unsigned int curr = ltc4215_get_current(dev);
+
+        return snprintf(buf, PAGE_SIZE, "%u\n", curr);
+}
+
+static ssize_t ltc4215_show_power(struct device *dev,
+                                  struct device_attribute *da,
+                                  char *buf)
+{
+        const unsigned int curr = ltc4215_get_current(dev);
+        const int output_voltage = ltc4215_get_voltage(dev, LTC4215_ADIN);
+
+        /* current in mA * voltage in mV == power in uW */
+        const unsigned int power = abs(output_voltage * curr);
+
+        return snprintf(buf, PAGE_SIZE, "%u\n", power);
+}
+
+static ssize_t ltc4215_show_alarm(struct device *dev,
+                                          struct device_attribute *da,
+                                          char *buf)
+{
+        struct sensor_device_attribute_2 *attr = to_sensor_dev_attr_2(da);
+        struct ltc4215_data *data = ltc4215_update_device(dev);
+        const u8 reg = data->regs[attr->index];
+        const u32 mask = attr->nr;
+
+        return snprintf(buf, PAGE_SIZE, "%u\n", (reg & mask) ? 1 : 0);
+}
+
+/* These macros are used below in constructing device attribute objects
+ * for use with sysfs_create_group() to make a sysfs device file
+ * for each register.
+ */
+
+#define LTC4215_VOLTAGE(name, ltc4215_cmd_idx) \
+        static SENSOR_DEVICE_ATTR(name, S_IRUGO, \
+        ltc4215_show_voltage, NULL, ltc4215_cmd_idx)
+
+#define LTC4215_CURRENT(name) \
+        static SENSOR_DEVICE_ATTR(name, S_IRUGO, \
+        ltc4215_show_current, NULL, 0);
+
+#define LTC4215_POWER(name) \
+        static SENSOR_DEVICE_ATTR(name, S_IRUGO, \
+        ltc4215_show_power, NULL, 0);
+
+#define LTC4215_ALARM(name, mask, reg) \
+        static SENSOR_DEVICE_ATTR_2(name, S_IRUGO, \
+        ltc4215_show_alarm, NULL, (mask), reg)
+
+/* Construct a sensor_device_attribute structure for each register */
+
+/* Current */
+LTC4215_CURRENT(curr1_input);
+LTC4215_ALARM(curr1_max_alarm,  (1 << 2),       LTC4215_STATUS);
+
+/* Power (virtual) */
+LTC4215_POWER(power1_input);
+LTC4215_ALARM(power1_alarm,     (1 << 3),       LTC4215_STATUS);
+
+/* Input Voltage */
+LTC4215_VOLTAGE(in1_input,                      LTC4215_ADIN);
+LTC4215_ALARM(in1_max_alarm,    (1 << 0),       LTC4215_STATUS);
+LTC4215_ALARM(in1_min_alarm,    (1 << 1),       LTC4215_STATUS);
+
+/* Output Voltage */
+LTC4215_VOLTAGE(in2_input,                      LTC4215_SOURCE);
+
+/* Finally, construct an array of pointers to members of the above objects,
+ * as required for sysfs_create_group()
+ */
+static struct attribute *ltc4215_attributes[] = {
+        &sensor_dev_attr_curr1_input.dev_attr.attr,
+        &sensor_dev_attr_curr1_max_alarm.dev_attr.attr,
+
+        &sensor_dev_attr_power1_input.dev_attr.attr,
+        &sensor_dev_attr_power1_alarm.dev_attr.attr,
+
+        &sensor_dev_attr_in1_input.dev_attr.attr,
+        &sensor_dev_attr_in1_max_alarm.dev_attr.attr,
+        &sensor_dev_attr_in1_min_alarm.dev_attr.attr,
+
+        &sensor_dev_attr_in2_input.dev_attr.attr,
+
+        NULL,
+};
+
+static const struct attribute_group ltc4215_group = {
+        .attrs = ltc4215_attributes,
+};
+
+static int ltc4215_probe(struct i2c_client *client,
+                         const struct i2c_device_id *id)
+{
+        struct ltc4215_data *data;
+        int ret;
+
+        data = kzalloc(sizeof(*data), GFP_KERNEL);
+        if (!data) {
+                ret = -ENOMEM;
+                goto out_kzalloc;
+        }
+
+        i2c_set_clientdata(client, data);
+        mutex_init(&data->update_lock);
+
+        /* Initialize the LTC4215 chip */
+        /* TODO */
+
+        /* Register sysfs hooks */
+        ret = sysfs_create_group(&client->dev.kobj, &ltc4215_group);
+        if (ret)
+                goto out_sysfs_create_group;
+
+        data->hwmon_dev = hwmon_device_register(&client->dev);
+        if (IS_ERR(data->hwmon_dev)) {
+                ret = PTR_ERR(data->hwmon_dev);
+                goto out_hwmon_device_register;
+        }
+
+        return 0;
+
+out_hwmon_device_register:
+        sysfs_remove_group(&client->dev.kobj, &ltc4215_group);
+out_sysfs_create_group:
+        kfree(data);
+out_kzalloc:
+        return ret;
+}
+
+static int ltc4215_remove(struct i2c_client *client)
+{
+        struct ltc4215_data *data = i2c_get_clientdata(client);
+
+        hwmon_device_unregister(data->hwmon_dev);
+        sysfs_remove_group(&client->dev.kobj, &ltc4215_group);
+
+        kfree(data);
+
+        return 0;
+}
+
+static int ltc4215_detect(struct i2c_client *client,
+                          int kind,
+                          struct i2c_board_info *info)
+{
+        struct i2c_adapter *adapter = client->adapter;
+
+        if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))
+                return -ENODEV;
+
+        if (kind < 0) {         /* probed detection - check the chip type */
+                s32 v;          /* 8 bits from the chip, or -ERRNO */
+
+                /*
+                 * Register 0x01 bit b7 is reserved, expect 0
+                 * Register 0x03 bit b6 and b7 are reserved, expect 0
+                 */
+                v = i2c_smbus_read_byte_data(client, LTC4215_ALERT);
+                if (v < 0 || (v & (1 << 7)) != 0)
+                        return -ENODEV;
+
+                v = i2c_smbus_read_byte_data(client, LTC4215_FAULT);
+                if (v < 0 || (v & ((1 << 6) | (1 << 7))) != 0)
+                                return -ENODEV;
+        }
+
+        strlcpy(info->type, "ltc4215", I2C_NAME_SIZE);
+        dev_info(&adapter->dev, "ltc4215 %s at address 0x%02x\n",
+                        kind < 0 ? "probed" : "forced",
+                        client->addr);
+
+        return 0;
+}
+
+static const struct i2c_device_id ltc4215_id[] = {
+        { "ltc4215", ltc4215 },
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, ltc4215_id);
+
+/* This is the driver that will be inserted */
+static struct i2c_driver ltc4215_driver = {
+        .class          = I2C_CLASS_HWMON,
+        .driver = {
+                .name   = "ltc4215",
+        },
+        .probe          = ltc4215_probe,
+        .remove         = ltc4215_remove,
+        .id_table       = ltc4215_id,
+        .detect         = ltc4215_detect,
+        .address_data   = &addr_data,
+};
+
+static int __init ltc4215_init(void)
+{
+        return i2c_add_driver(&ltc4215_driver);
+}
+
+static void __exit ltc4215_exit(void)
+{
+        i2c_del_driver(&ltc4215_driver);
+}
+
+MODULE_AUTHOR("Ira W. Snyder <iws@ovro.caltech.edu>");
+MODULE_DESCRIPTION("LTC4215 driver");
+MODULE_LICENSE("GPL");
+
+module_init(ltc4215_init);
+module_exit(ltc4215_exit);
diff --git a/drivers/i2c/chips/pcf8591.c b/drivers/hwmon/pcf8591.c
index 16ce3e193776..1d7ffebd679d 100644
--- a/drivers/i2c/chips/pcf8591.c
+++ b/drivers/hwmon/pcf8591.c
@@ -1,6 +1,6 @@
 /*
     Copyright (C) 2001-2004 Aurelien Jarno <aurelien@aurel32.net>
-    Ported to Linux 2.6 by Aurelien Jarno <aurelien@aurel32.net> with 
+    Ported to Linux 2.6 by Aurelien Jarno <aurelien@aurel32.net> with
     the help of Jean Delvare <khali@linux-fr.org>
 
     This program is free software; you can redistribute it and/or modify
@@ -41,13 +41,13 @@ MODULE_PARM_DESC(input_mode,
         " 3 = two differential inputs\n");
 
 /* The PCF8591 control byte
-      7    6    5    4    3    2    1    0  
+      7    6    5    4    3    2    1    0
    |  0 |AOEF|   AIP   |  0 |AINC|  AICH   | */
 
 /* Analog Output Enable Flag (analog output active if 1) */
 #define PCF8591_CONTROL_AOEF            0x40
-                                        
-/* Analog Input Programming 
+
+/* Analog Input Programming
    0x00 = four single ended inputs
    0x10 = three differential inputs
    0x20 = single ended and differential mixed
@@ -58,7 +58,7 @@ MODULE_PARM_DESC(input_mode,
 #define PCF8591_CONTROL_AINC            0x04
 
 /* Channel selection
-   0x00 = channel 0 
+   0x00 = channel 0
    0x01 = channel 1
    0x02 = channel 2
    0x03 = channel 3 */
@@ -114,7 +114,7 @@ static ssize_t set_out0_output(struct device *dev, struct device_attribute *attr
         return -EINVAL;
 }
 
-static DEVICE_ATTR(out0_output, S_IWUSR | S_IRUGO, 
+static DEVICE_ATTR(out0_output, S_IWUSR | S_IRUGO,
                    show_out0_ouput, set_out0_output);
 
 static ssize_t show_out0_enable(struct device *dev, struct device_attribute *attr, char *buf)
@@ -139,7 +139,7 @@ static ssize_t set_out0_enable(struct device *dev, struct device_attribute *attr
         return count;
 }
 
-static DEVICE_ATTR(out0_enable, S_IWUSR | S_IRUGO, 
+static DEVICE_ATTR(out0_enable, S_IWUSR | S_IRUGO,
                    show_out0_enable, set_out0_enable);
 
 static struct attribute *pcf8591_attributes[] = {
@@ -196,7 +196,7 @@ static int pcf8591_probe(struct i2c_client *client,
                 err = -ENOMEM;
                 goto exit;
         }
-        
+
         i2c_set_clientdata(client, data);
         mutex_init(&data->update_lock);
 
@@ -249,8 +249,8 @@ static void pcf8591_init_client(struct i2c_client *client)
         data->aout = PCF8591_INIT_AOUT;
 
         i2c_smbus_write_byte_data(client, data->control, data->aout);
-        
-        /* The first byte transmitted contains the conversion code of the 
+
+        /* The first byte transmitted contains the conversion code of the
            previous read cycle. FLUSH IT! */
         i2c_smbus_read_byte(client);
 }
@@ -267,8 +267,8 @@ static int pcf8591_read_channel(struct device *dev, int channel)
                 data->control = (data->control & ~PCF8591_CONTROL_AICH_MASK)
                               | channel;
                 i2c_smbus_write_byte(client, data->control);
-        
-                /* The first byte transmitted contains the conversion code of 
+
+                /* The first byte transmitted contains the conversion code of
                    the previous read cycle. FLUSH IT! */
                 i2c_smbus_read_byte(client);
         }
diff --git a/drivers/hwmon/w83627ehf.c b/drivers/hwmon/w83627ehf.c
index feae743ba991..e64b42058b21 100644
--- a/drivers/hwmon/w83627ehf.c
+++ b/drivers/hwmon/w83627ehf.c
@@ -36,6 +36,7 @@
     w83627ehf   10      5       4       3      0x8850 0x88    0x5ca3
                                                0x8860 0xa1
     w83627dhg    9      5       4       3      0xa020 0xc1    0x5ca3
+    w83667hg     9      5       3       3      0xa510 0xc1    0x5ca3
 */
 
 #include <linux/module.h>
@@ -52,12 +53,13 @@
 #include <asm/io.h>
 #include "lm75.h"
 
-enum kinds { w83627ehf, w83627dhg };
+enum kinds { w83627ehf, w83627dhg, w83667hg };
 
 /* used to set data->name = w83627ehf_device_names[data->sio_kind] */
 static const char * w83627ehf_device_names[] = {
         "w83627ehf",
         "w83627dhg",
+        "w83667hg",
 };
 
 static unsigned short force_id;
@@ -71,6 +73,7 @@ MODULE_PARM_DESC(force_id, "Override the detected device ID");
  */
 
 #define W83627EHF_LD_HWM        0x0b
+#define W83667HG_LD_VID         0x0d
 
 #define SIO_REG_LDSEL           0x07    /* Logical device select */
 #define SIO_REG_DEVID           0x20    /* Device ID (2 bytes) */
@@ -83,6 +86,7 @@ MODULE_PARM_DESC(force_id, "Override the detected device ID");
 #define SIO_W83627EHF_ID        0x8850
 #define SIO_W83627EHG_ID        0x8860
 #define SIO_W83627DHG_ID        0xa020
+#define SIO_W83667HG_ID         0xa510
 #define SIO_ID_MASK             0xFFF0
 
 static inline void
@@ -289,6 +293,7 @@ struct w83627ehf_data {
         u8 pwm_mode[4]; /* 0->DC variable voltage, 1->PWM variable duty cycle */
         u8 pwm_enable[4]; /* 1->manual
                              2->thermal cruise (also called SmartFan I) */
+        u8 pwm_num;             /* number of pwm */
         u8 pwm[4];
         u8 target_temp[4];
         u8 tolerance[4];
@@ -298,6 +303,9 @@ struct w83627ehf_data {
 
         u8 vid;
         u8 vrm;
+
+        u8 temp3_disable;
+        u8 in6_skip;
 };
 
 struct w83627ehf_sio_data {
@@ -866,25 +874,37 @@ show_temp_type(struct device *dev, struct device_attribute *attr, char *buf)
         return sprintf(buf, "%d\n", (int)data->temp_type[nr]);
 }
 
-static struct sensor_device_attribute sda_temp[] = {
+static struct sensor_device_attribute sda_temp_input[] = {
         SENSOR_ATTR(temp1_input, S_IRUGO, show_temp1, NULL, 0),
         SENSOR_ATTR(temp2_input, S_IRUGO, show_temp, NULL, 0),
         SENSOR_ATTR(temp3_input, S_IRUGO, show_temp, NULL, 1),
+};
+
+static struct sensor_device_attribute sda_temp_max[] = {
         SENSOR_ATTR(temp1_max, S_IRUGO | S_IWUSR, show_temp1_max,
                     store_temp1_max, 0),
         SENSOR_ATTR(temp2_max, S_IRUGO | S_IWUSR, show_temp_max,
                     store_temp_max, 0),
         SENSOR_ATTR(temp3_max, S_IRUGO | S_IWUSR, show_temp_max,
                     store_temp_max, 1),
+};
+
+static struct sensor_device_attribute sda_temp_max_hyst[] = {
         SENSOR_ATTR(temp1_max_hyst, S_IRUGO | S_IWUSR, show_temp1_max_hyst,
                     store_temp1_max_hyst, 0),
         SENSOR_ATTR(temp2_max_hyst, S_IRUGO | S_IWUSR, show_temp_max_hyst,
                     store_temp_max_hyst, 0),
         SENSOR_ATTR(temp3_max_hyst, S_IRUGO | S_IWUSR, show_temp_max_hyst,
                     store_temp_max_hyst, 1),
+};
+
+static struct sensor_device_attribute sda_temp_alarm[] = {
         SENSOR_ATTR(temp1_alarm, S_IRUGO, show_alarm, NULL, 4),
         SENSOR_ATTR(temp2_alarm, S_IRUGO, show_alarm, NULL, 5),
         SENSOR_ATTR(temp3_alarm, S_IRUGO, show_alarm, NULL, 13),
+};
+
+static struct sensor_device_attribute sda_temp_type[] = {
         SENSOR_ATTR(temp1_type, S_IRUGO, show_temp_type, NULL, 0),
         SENSOR_ATTR(temp2_type, S_IRUGO, show_temp_type, NULL, 1),
         SENSOR_ATTR(temp3_type, S_IRUGO, show_temp_type, NULL, 2),
@@ -1181,6 +1201,8 @@ static void w83627ehf_device_remove_files(struct device *dev)
         for (i = 0; i < ARRAY_SIZE(sda_sf3_arrays_fan4); i++)
                 device_remove_file(dev, &sda_sf3_arrays_fan4[i].dev_attr);
         for (i = 0; i < data->in_num; i++) {
+                if ((i == 6) && data->in6_skip)
+                        continue;
                 device_remove_file(dev, &sda_in_input[i].dev_attr);
                 device_remove_file(dev, &sda_in_alarm[i].dev_attr);
                 device_remove_file(dev, &sda_in_min[i].dev_attr);
@@ -1192,15 +1214,22 @@ static void w83627ehf_device_remove_files(struct device *dev)
                 device_remove_file(dev, &sda_fan_div[i].dev_attr);
                 device_remove_file(dev, &sda_fan_min[i].dev_attr);
         }
-        for (i = 0; i < 4; i++) {
+        for (i = 0; i < data->pwm_num; i++) {
                 device_remove_file(dev, &sda_pwm[i].dev_attr);
                 device_remove_file(dev, &sda_pwm_mode[i].dev_attr);
                 device_remove_file(dev, &sda_pwm_enable[i].dev_attr);
                 device_remove_file(dev, &sda_target_temp[i].dev_attr);
                 device_remove_file(dev, &sda_tolerance[i].dev_attr);
         }
-        for (i = 0; i < ARRAY_SIZE(sda_temp); i++)
-                device_remove_file(dev, &sda_temp[i].dev_attr);
+        for (i = 0; i < 3; i++) {
+                if ((i == 2) && data->temp3_disable)
+                        continue;
+                device_remove_file(dev, &sda_temp_input[i].dev_attr);
+                device_remove_file(dev, &sda_temp_max[i].dev_attr);
+                device_remove_file(dev, &sda_temp_max_hyst[i].dev_attr);
+                device_remove_file(dev, &sda_temp_alarm[i].dev_attr);
+                device_remove_file(dev, &sda_temp_type[i].dev_attr);
+        }
 
         device_remove_file(dev, &dev_attr_name);
         device_remove_file(dev, &dev_attr_cpu0_vid);
@@ -1222,6 +1251,8 @@ static inline void __devinit w83627ehf_init_device(struct w83627ehf_data *data)
         for (i = 0; i < 2; i++) {
                 tmp = w83627ehf_read_value(data,
                                            W83627EHF_REG_TEMP_CONFIG[i]);
+                if ((i == 1) && data->temp3_disable)
+                        continue;
                 if (tmp & 0x01)
                         w83627ehf_write_value(data,
                                               W83627EHF_REG_TEMP_CONFIG[i],
@@ -1272,8 +1303,17 @@ static int __devinit w83627ehf_probe(struct platform_device *pdev)
         data->name = w83627ehf_device_names[sio_data->kind];
         platform_set_drvdata(pdev, data);
 
-        /* 627EHG and 627EHF have 10 voltage inputs; DHG has 9 */
-        data->in_num = (sio_data->kind == w83627dhg) ? 9 : 10;
+        /* 627EHG and 627EHF have 10 voltage inputs; 627DHG and 667HG have 9 */
+        data->in_num = (sio_data->kind == w83627ehf) ? 10 : 9;
+        /* 667HG has 3 pwms */
+        data->pwm_num = (sio_data->kind == w83667hg) ? 3 : 4;
+
+        /* Check temp3 configuration bit for 667HG */
+        if (sio_data->kind == w83667hg) {
+                data->temp3_disable = w83627ehf_read_value(data,
+                                        W83627EHF_REG_TEMP_CONFIG[1]) & 0x01;
+                data->in6_skip = !data->temp3_disable;
+        }
 
         /* Initialize the chip */
         w83627ehf_init_device(data);
@@ -1281,44 +1321,64 @@ static int __devinit w83627ehf_probe(struct platform_device *pdev)
         data->vrm = vid_which_vrm();
         superio_enter(sio_data->sioreg);
         /* Read VID value */
-        superio_select(sio_data->sioreg, W83627EHF_LD_HWM);
-        if (superio_inb(sio_data->sioreg, SIO_REG_VID_CTRL) & 0x80) {
-                /* Set VID input sensibility if needed. In theory the BIOS
-                   should have set it, but in practice it's not always the
-                   case. We only do it for the W83627EHF/EHG because the
-                   W83627DHG is more complex in this respect. */
-                if (sio_data->kind == w83627ehf) {
-                        en_vrm10 = superio_inb(sio_data->sioreg,
-                                               SIO_REG_EN_VRM10);
-                        if ((en_vrm10 & 0x08) && data->vrm == 90) {
-                                dev_warn(dev, "Setting VID input voltage to "
-                                         "TTL\n");
-                                superio_outb(sio_data->sioreg, SIO_REG_EN_VRM10,
-                                             en_vrm10 & ~0x08);
-                        } else if (!(en_vrm10 & 0x08) && data->vrm == 100) {
-                                dev_warn(dev, "Setting VID input voltage to "
-                                         "VRM10\n");
-                                superio_outb(sio_data->sioreg, SIO_REG_EN_VRM10,
-                                             en_vrm10 | 0x08);
-                        }
-                }
-
-                data->vid = superio_inb(sio_data->sioreg, SIO_REG_VID_DATA);
-                if (sio_data->kind == w83627ehf) /* 6 VID pins only */
-                        data->vid &= 0x3f;
-
+        if (sio_data->kind == w83667hg) {
+                /* W83667HG has different pins for VID input and output, so
+                we can get the VID input values directly at logical device D
+                0xe3. */
+                superio_select(sio_data->sioreg, W83667HG_LD_VID);
+                data->vid = superio_inb(sio_data->sioreg, 0xe3);
                 err = device_create_file(dev, &dev_attr_cpu0_vid);
                 if (err)
                         goto exit_release;
         } else {
-                dev_info(dev, "VID pins in output mode, CPU VID not "
-                         "available\n");
+                superio_select(sio_data->sioreg, W83627EHF_LD_HWM);
+                if (superio_inb(sio_data->sioreg, SIO_REG_VID_CTRL) & 0x80) {
+                        /* Set VID input sensibility if needed. In theory the
+                           BIOS should have set it, but in practice it's not
+                           always the case. We only do it for the W83627EHF/EHG
+                           because the W83627DHG is more complex in this
+                           respect. */
+                        if (sio_data->kind == w83627ehf) {
+                                en_vrm10 = superio_inb(sio_data->sioreg,
+                                                       SIO_REG_EN_VRM10);
+                                if ((en_vrm10 & 0x08) && data->vrm == 90) {
+                                        dev_warn(dev, "Setting VID input "
+                                                 "voltage to TTL\n");
+                                        superio_outb(sio_data->sioreg,
+                                                     SIO_REG_EN_VRM10,
+                                                     en_vrm10 & ~0x08);
+                                } else if (!(en_vrm10 & 0x08)
+                                           && data->vrm == 100) {
+                                        dev_warn(dev, "Setting VID input "
+                                                 "voltage to VRM10\n");
+                                        superio_outb(sio_data->sioreg,
+                                                     SIO_REG_EN_VRM10,
+                                                     en_vrm10 | 0x08);
+                                }
+                        }
+
+                        data->vid = superio_inb(sio_data->sioreg,
+                                                SIO_REG_VID_DATA);
+                        if (sio_data->kind == w83627ehf) /* 6 VID pins only */
+                                data->vid &= 0x3f;
+
+                        err = device_create_file(dev, &dev_attr_cpu0_vid);
+                        if (err)
+                                goto exit_release;
+                } else {
+                        dev_info(dev, "VID pins in output mode, CPU VID not "
+                                 "available\n");
+                }
         }
 
         /* fan4 and fan5 share some pins with the GPIO and serial flash */
-
-        fan5pin = superio_inb(sio_data->sioreg, 0x24) & 0x2;
-        fan4pin = superio_inb(sio_data->sioreg, 0x29) & 0x6;
+        if (sio_data->kind == w83667hg) {
+                fan5pin = superio_inb(sio_data->sioreg, 0x27) & 0x20;
+                fan4pin = superio_inb(sio_data->sioreg, 0x27) & 0x40;
+        } else {
+                fan5pin = !(superio_inb(sio_data->sioreg, 0x24) & 0x02);
+                fan4pin = !(superio_inb(sio_data->sioreg, 0x29) & 0x06);
+        }
         superio_exit(sio_data->sioreg);
 
         /* It looks like fan4 and fan5 pins can be alternatively used
@@ -1329,9 +1389,9 @@ static int __devinit w83627ehf_probe(struct platform_device *pdev)
 
         data->has_fan = 0x07; /* fan1, fan2 and fan3 */
         i = w83627ehf_read_value(data, W83627EHF_REG_FANDIV1);
-        if ((i & (1 << 2)) && (!fan4pin))
+        if ((i & (1 << 2)) && fan4pin)
                 data->has_fan |= (1 << 3);
-        if (!(i & (1 << 1)) && (!fan5pin))
+        if (!(i & (1 << 1)) && fan5pin)
                 data->has_fan |= (1 << 4);
 
         /* Read fan clock dividers immediately */
@@ -1344,14 +1404,16 @@ static int __devinit w83627ehf_probe(struct platform_device *pdev)
                         goto exit_remove;
 
         /* if fan4 is enabled create the sf3 files for it */
-        if (data->has_fan & (1 << 3))
+        if ((data->has_fan & (1 << 3)) && data->pwm_num >= 4)
                 for (i = 0; i < ARRAY_SIZE(sda_sf3_arrays_fan4); i++) {
                         if ((err = device_create_file(dev,
                                 &sda_sf3_arrays_fan4[i].dev_attr)))
                                 goto exit_remove;
                 }
 
-        for (i = 0; i < data->in_num; i++)
+        for (i = 0; i < data->in_num; i++) {
+                if ((i == 6) && data->in6_skip)
+                        continue;
                 if ((err = device_create_file(dev, &sda_in_input[i].dev_attr))
                         || (err = device_create_file(dev,
                                 &sda_in_alarm[i].dev_attr))
@@ -1360,6 +1422,7 @@ static int __devinit w83627ehf_probe(struct platform_device *pdev)
                         || (err = device_create_file(dev,
                                 &sda_in_max[i].dev_attr)))
                         goto exit_remove;
+        }
 
         for (i = 0; i < 5; i++) {
                 if (data->has_fan & (1 << i)) {
@@ -1372,7 +1435,7 @@ static int __devinit w83627ehf_probe(struct platform_device *pdev)
                                 || (err = device_create_file(dev,
                                         &sda_fan_min[i].dev_attr)))
                                 goto exit_remove;
-                        if (i < 4 && /* w83627ehf only has 4 pwm */
+                        if (i < data->pwm_num &&
                                 ((err = device_create_file(dev,
                                         &sda_pwm[i].dev_attr))
                                 || (err = device_create_file(dev,
@@ -1387,9 +1450,21 @@ static int __devinit w83627ehf_probe(struct platform_device *pdev)
                 }
         }
 
-        for (i = 0; i < ARRAY_SIZE(sda_temp); i++)
-                if ((err = device_create_file(dev, &sda_temp[i].dev_attr)))
+        for (i = 0; i < 3; i++) {
+                if ((i == 2) && data->temp3_disable)
+                        continue;
+                if ((err = device_create_file(dev,
+                                &sda_temp_input[i].dev_attr))
+                        || (err = device_create_file(dev,
+                                &sda_temp_max[i].dev_attr))
+                        || (err = device_create_file(dev,
+                                &sda_temp_max_hyst[i].dev_attr))
+                        || (err = device_create_file(dev,
+                                &sda_temp_alarm[i].dev_attr))
+                        || (err = device_create_file(dev,
+                                &sda_temp_type[i].dev_attr)))
                         goto exit_remove;
+        }
 
         err = device_create_file(dev, &dev_attr_name);
         if (err)
@@ -1442,6 +1517,7 @@ static int __init w83627ehf_find(int sioaddr, unsigned short *addr,
         static const char __initdata sio_name_W83627EHF[] = "W83627EHF";
         static const char __initdata sio_name_W83627EHG[] = "W83627EHG";
         static const char __initdata sio_name_W83627DHG[] = "W83627DHG";
+        static const char __initdata sio_name_W83667HG[] = "W83667HG";
 
         u16 val;
         const char *sio_name;
@@ -1466,6 +1542,10 @@ static int __init w83627ehf_find(int sioaddr, unsigned short *addr,
                 sio_data->kind = w83627dhg;
                 sio_name = sio_name_W83627DHG;
                 break;
+        case SIO_W83667HG_ID:
+                sio_data->kind = w83667hg;
+                sio_name = sio_name_W83667HG;
+                break;
         default:
                 if (val != 0xffff)
                         pr_debug(DRVNAME ": unsupported chip ID: 0x%04x\n",
diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c
index 230238df56c4..10411848fd70 100644
--- a/drivers/i2c/busses/i2c-i801.c
+++ b/drivers/i2c/busses/i2c-i801.c
@@ -65,6 +65,7 @@
 #include <linux/i2c.h>
 #include <linux/acpi.h>
 #include <linux/io.h>
+#include <linux/dmi.h>
 
 /* I801 SMBus address offsets */
 #define SMBHSTSTS       (0 + i801_smba)
@@ -616,10 +617,81 @@ static void __init input_apanel_init(void)
 static void __init input_apanel_init(void) {}
 #endif
 
+#if defined CONFIG_SENSORS_FSCHMD || defined CONFIG_SENSORS_FSCHMD_MODULE
+struct dmi_onboard_device_info {
+        const char *name;
+        u8 type;
+        unsigned short i2c_addr;
+        const char *i2c_type;
+};
+
+static struct dmi_onboard_device_info __devinitdata dmi_devices[] = {
+        { "Syleus", DMI_DEV_TYPE_OTHER, 0x73, "fscsyl" },
+        { "Hermes", DMI_DEV_TYPE_OTHER, 0x73, "fscher" },
+        { "Hades",  DMI_DEV_TYPE_OTHER, 0x73, "fschds" },
+};
+
+static void __devinit dmi_check_onboard_device(u8 type, const char *name,
+                                               struct i2c_adapter *adap)
+{
+        int i;
+        struct i2c_board_info info;
+
+        for (i = 0; i < ARRAY_SIZE(dmi_devices); i++) {
+                /* & ~0x80, ignore enabled/disabled bit */
+                if ((type & ~0x80) != dmi_devices[i].type)
+                        continue;
+                if (strcmp(name, dmi_devices[i].name))
+                        continue;
+
+                memset(&info, 0, sizeof(struct i2c_board_info));
+                info.addr = dmi_devices[i].i2c_addr;
+                strlcpy(info.type, dmi_devices[i].i2c_type, I2C_NAME_SIZE);
+                i2c_new_device(adap, &info);
+                break;
+        }
+}
+
+/* We use our own function to check for onboard devices instead of
+   dmi_find_device() as some buggy BIOS's have the devices we are interested
+   in marked as disabled */
+static void __devinit dmi_check_onboard_devices(const struct dmi_header *dm,
+                                                void *adap)
+{
+        int i, count;
+
+        if (dm->type != 10)
+                return;
+
+        count = (dm->length - sizeof(struct dmi_header)) / 2;
+        for (i = 0; i < count; i++) {
+                const u8 *d = (char *)(dm + 1) + (i * 2);
+                const char *name = ((char *) dm) + dm->length;
+                u8 type = d[0];
+                u8 s = d[1];
+
+                if (!s)
+                        continue;
+                s--;
+                while (s > 0 && name[0]) {
+                        name += strlen(name) + 1;
+                        s--;
+                }
+                if (name[0] == 0) /* Bogus string reference */
+                        continue;
+
+                dmi_check_onboard_device(type, name, adap);
+        }
+}
+#endif
+
 static int __devinit i801_probe(struct pci_dev *dev, const struct pci_device_id *id)
 {
         unsigned char temp;
         int err;
+#if defined CONFIG_SENSORS_FSCHMD || defined CONFIG_SENSORS_FSCHMD_MODULE
+        const char *vendor;
+#endif
 
         I801_dev = dev;
         i801_features = 0;
@@ -712,6 +784,11 @@ static int __devinit i801_probe(struct pci_dev *dev, const struct pci_device_id
                 i2c_new_device(&i801_adapter, &info);
         }
 #endif
+#if defined CONFIG_SENSORS_FSCHMD || defined CONFIG_SENSORS_FSCHMD_MODULE
+        vendor = dmi_get_system_info(DMI_BOARD_VENDOR);
+        if (vendor && !strcmp(vendor, "FUJITSU SIEMENS"))
+                dmi_walk(dmi_check_onboard_devices, &i801_adapter);
+#endif
 
         return 0;
 
diff --git a/drivers/i2c/chips/Kconfig b/drivers/i2c/chips/Kconfig
index c80312c1f382..8f8c81eb0aee 100644
--- a/drivers/i2c/chips/Kconfig
+++ b/drivers/i2c/chips/Kconfig
@@ -64,19 +64,6 @@ config SENSORS_PCA9539
           This driver is deprecated and will be dropped soon. Use
           drivers/gpio/pca953x.c instead.
 
-config SENSORS_PCF8591
-        tristate "Philips PCF8591"
-        depends on EXPERIMENTAL
-        default n
-        help
-          If you say yes here you get support for Philips PCF8591 chips.
-
-          This driver can also be built as a module.  If so, the module
-          will be called pcf8591.
-
-          These devices are hard to detect and rarely found on mainstream
-          hardware.  If unsure, say N.
-
 config SENSORS_MAX6875
         tristate "Maxim MAX6875 Power supply supervisor"
         depends on EXPERIMENTAL
diff --git a/drivers/i2c/chips/Makefile b/drivers/i2c/chips/Makefile
index d142f238a2de..55a376037183 100644
--- a/drivers/i2c/chips/Makefile
+++ b/drivers/i2c/chips/Makefile
@@ -15,7 +15,6 @@ obj-$(CONFIG_SENSORS_MAX6875)	+= max6875.o
 obj-$(CONFIG_SENSORS_PCA9539)   += pca9539.o
 obj-$(CONFIG_SENSORS_PCF8574)   += pcf8574.o
 obj-$(CONFIG_PCF8575)           += pcf8575.o
-obj-$(CONFIG_SENSORS_PCF8591)   += pcf8591.o
 obj-$(CONFIG_SENSORS_TSL2550)   += tsl2550.o
 
 ifeq ($(CONFIG_I2C_DEBUG_CHIP),y)
diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig
index 640c99207242..cf06494bb744 100644
--- a/drivers/ide/Kconfig
+++ b/drivers/ide/Kconfig
@@ -222,7 +222,8 @@ comment "IDE chipset support/bugfixes"
 
 config IDE_GENERIC
         tristate "generic/default IDE chipset support"
-        depends on ALPHA || X86 || IA64 || M32R || MIPS
+        depends on ALPHA || X86 || IA64 || M32R || MIPS || ARCH_RPC || ARCH_SHARK
+        default ARM && (ARCH_RPC || ARCH_SHARK)
         help
           This is the generic IDE driver.  This driver attaches to the
           fixed legacy ports (e.g. on PCs 0x1f0/0x170, 0x1e8/0x168 and
@@ -680,7 +681,7 @@ endif
 # TODO: BLK_DEV_IDEDMA_PCI -> BLK_DEV_IDEDMA_SFF
 config BLK_DEV_IDE_PMAC
         tristate "PowerMac on-board IDE support"
-        depends on PPC_PMAC && IDE=y
+        depends on PPC_PMAC
         select IDE_TIMINGS
         select BLK_DEV_IDEDMA_PCI
         help
@@ -731,11 +732,6 @@ config BLK_DEV_IDE_AT91
         depends on ARM && ARCH_AT91 && !ARCH_AT91RM9200 && !ARCH_AT91X40
         select IDE_TIMINGS
 
-config IDE_ARM
-        tristate "ARM IDE support"
-        depends on ARM && (ARCH_RPC || ARCH_SHARK)
-        default y
-
 config BLK_DEV_IDE_ICSIDE
         tristate "ICS IDE interface support"
         depends on ARM && ARCH_ACORN
@@ -774,27 +770,20 @@ config BLK_DEV_GAYLE
           This includes on-board IDE interfaces on some Amiga models (A600,
           A1200, A4000, and A4000T), and IDE interfaces on the Zorro expansion
           bus (M-Tech E-Matrix 530 expansion card).
-          Say Y if you have an Amiga with a Gayle IDE interface and want to use
-          IDE devices (hard disks, CD-ROM drives, etc.) that are connected to
-          it.
-          Note that you also have to enable Zorro bus support if you want to
-          use Gayle IDE interfaces on the Zorro expansion bus.
 
-config BLK_DEV_IDEDOUBLER
-        bool "Amiga IDE Doubler support (EXPERIMENTAL)"
-        depends on BLK_DEV_GAYLE && EXPERIMENTAL
-        ---help---
-          This feature provides support for the so-called `IDE doublers' (made
+          It also provides support for the so-called `IDE doublers' (made
           by various manufacturers, e.g. Eyetech) that can be connected to
           the on-board IDE interface of some Amiga models. Using such an IDE
           doubler, you can connect up to four instead of two IDE devices to
-          the Amiga's on-board IDE interface.
+          the Amiga's on-board IDE interface. The feature is enabled at kernel
+          runtime using the "gayle.doubler" kernel boot parameter.
 
-          Note that the normal Amiga Gayle IDE driver may not work correctly
-          if you have an IDE doubler and don't enable this feature!
+          Say Y if you have an Amiga with a Gayle IDE interface and want to use
+          IDE devices (hard disks, CD-ROM drives, etc.) that are connected to
+          it.
 
-          Say Y if you have an IDE doubler.  The feature is enabled at kernel
-          runtime using the "gayle.doubler" kernel boot parameter.
+          Note that you also have to enable Zorro bus support if you want to
+          use Gayle IDE interfaces on the Zorro expansion bus.
 
 config BLK_DEV_BUDDHA
         tristate "Buddha/Catweasel/X-Surf IDE interface support (EXPERIMENTAL)"
diff --git a/drivers/ide/Makefile b/drivers/ide/Makefile
index 9b4bbe1cdc1a..81df925f0e8b 100644
--- a/drivers/ide/Makefile
+++ b/drivers/ide/Makefile
@@ -21,8 +21,6 @@ ide-core-$(CONFIG_IDE_LEGACY)		+= ide-legacy.o
 
 obj-$(CONFIG_IDE)                       += ide-core.o
 
-obj-$(CONFIG_IDE_ARM)                   += ide_arm.o
-
 obj-$(CONFIG_BLK_DEV_ALI14XX)           += ali14xx.o
 obj-$(CONFIG_BLK_DEV_UMC8672)           += umc8672.o
 obj-$(CONFIG_BLK_DEV_DTC2278)           += dtc2278.o
diff --git a/drivers/ide/alim15x3.c b/drivers/ide/alim15x3.c
index d516168464fc..537da1cde16d 100644
--- a/drivers/ide/alim15x3.c
+++ b/drivers/ide/alim15x3.c
@@ -189,20 +189,20 @@ static void ali_set_dma_mode(ide_drive_t *drive, const u8 speed)
 }
 
 /**
- *      ali15x3_dma_setup       -       begin a DMA phase
+ *      ali_dma_check   -       DMA check
  *      @drive: target device
  *      @cmd: command
  *
  *      Returns 1 if the DMA cannot be performed, zero on success.
  */
 
-static int ali15x3_dma_setup(ide_drive_t *drive, struct ide_cmd *cmd)
+static int ali_dma_check(ide_drive_t *drive, struct ide_cmd *cmd)
 {
         if (m5229_revision < 0xC2 && drive->media != ide_disk) {
                 if (cmd->tf_flags & IDE_TFLAG_WRITE)
                         return 1;       /* try PIO instead of DMA */
         }
-        return ide_dma_setup(drive, cmd);
+        return 0;
 }
 
 /**
@@ -503,13 +503,13 @@ static const struct ide_port_ops ali_port_ops = {
 
 static const struct ide_dma_ops ali_dma_ops = {
         .dma_host_set           = ide_dma_host_set,
-        .dma_setup              = ali15x3_dma_setup,
+        .dma_setup              = ide_dma_setup,
         .dma_start              = ide_dma_start,
         .dma_end                = ide_dma_end,
         .dma_test_irq           = ide_dma_test_irq,
         .dma_lost_irq           = ide_dma_lost_irq,
+        .dma_check              = ali_dma_check,
         .dma_timer_expiry       = ide_dma_sff_timer_expiry,
-        .dma_timeout            = ide_dma_timeout,
         .dma_sff_read_status    = ide_dma_sff_read_status,
 };
 
diff --git a/drivers/ide/at91_ide.c b/drivers/ide/at91_ide.c
index 27547121daff..8eda552326e9 100644
--- a/drivers/ide/at91_ide.c
+++ b/drivers/ide/at91_ide.c
@@ -192,15 +192,9 @@ static void at91_ide_tf_load(ide_drive_t *drive, struct ide_cmd *cmd)
         struct ide_taskfile *tf = &cmd->tf;
         u8 HIHI = (cmd->tf_flags & IDE_TFLAG_LBA48) ? 0xE0 : 0xEF;
 
-        if (cmd->tf_flags & IDE_FTFLAG_FLAGGED)
+        if (cmd->ftf_flags & IDE_FTFLAG_FLAGGED)
                 HIHI = 0xFF;
 
-        if (cmd->tf_flags & IDE_FTFLAG_OUT_DATA) {
-                u16 data = (tf->hob_data << 8) | tf->data;
-
-                at91_ide_output_data(drive, NULL, &data, 2);
-        }
-
         if (cmd->tf_flags & IDE_TFLAG_OUT_HOB_FEATURE)
                 ide_mm_outb(tf->hob_feature, io_ports->feature_addr);
         if (cmd->tf_flags & IDE_TFLAG_OUT_HOB_NSECT)
@@ -233,19 +227,11 @@ static void at91_ide_tf_read(ide_drive_t *drive, struct ide_cmd *cmd)
         struct ide_io_ports *io_ports = &hwif->io_ports;
         struct ide_taskfile *tf = &cmd->tf;
 
-        if (cmd->tf_flags & IDE_FTFLAG_IN_DATA) {
-                u16 data;
-
-                at91_ide_input_data(drive, NULL, &data, 2);
-                tf->data = data & 0xff;
-                tf->hob_data = (data >> 8) & 0xff;
-        }
-
         /* be sure we're looking at the low order bits */
-        ide_mm_outb(ATA_DEVCTL_OBS & ~0x80, io_ports->ctl_addr);
+        ide_mm_outb(ATA_DEVCTL_OBS, io_ports->ctl_addr);
 
-        if (cmd->tf_flags & IDE_TFLAG_IN_FEATURE)
-                tf->feature = ide_mm_inb(io_ports->feature_addr);
+        if (cmd->tf_flags & IDE_TFLAG_IN_ERROR)
+                tf->error  = ide_mm_inb(io_ports->feature_addr);
         if (cmd->tf_flags & IDE_TFLAG_IN_NSECT)
                 tf->nsect  = ide_mm_inb(io_ports->nsect_addr);
         if (cmd->tf_flags & IDE_TFLAG_IN_LBAL)
@@ -258,18 +244,18 @@ static void at91_ide_tf_read(ide_drive_t *drive, struct ide_cmd *cmd)
                 tf->device = ide_mm_inb(io_ports->device_addr);
 
         if (cmd->tf_flags & IDE_TFLAG_LBA48) {
-                ide_mm_outb(ATA_DEVCTL_OBS | 0x80, io_ports->ctl_addr);
+                ide_mm_outb(ATA_HOB | ATA_DEVCTL_OBS, io_ports->ctl_addr);
 
-                if (cmd->tf_flags & IDE_TFLAG_IN_HOB_FEATURE)
-                        tf->hob_feature = ide_mm_inb(io_ports->feature_addr);
+                if (cmd->tf_flags & IDE_TFLAG_IN_HOB_ERROR)
+                        tf->hob_error = ide_mm_inb(io_ports->feature_addr);
                 if (cmd->tf_flags & IDE_TFLAG_IN_HOB_NSECT)
-                        tf->hob_nsect   = ide_mm_inb(io_ports->nsect_addr);
+                        tf->hob_nsect = ide_mm_inb(io_ports->nsect_addr);
                 if (cmd->tf_flags & IDE_TFLAG_IN_HOB_LBAL)
-                        tf->hob_lbal    = ide_mm_inb(io_ports->lbal_addr);
+                        tf->hob_lbal  = ide_mm_inb(io_ports->lbal_addr);
                 if (cmd->tf_flags & IDE_TFLAG_IN_HOB_LBAM)
-                        tf->hob_lbam    = ide_mm_inb(io_ports->lbam_addr);
+                        tf->hob_lbam  = ide_mm_inb(io_ports->lbam_addr);
                 if (cmd->tf_flags & IDE_TFLAG_IN_HOB_LBAH)
-                        tf->hob_lbah    = ide_mm_inb(io_ports->lbah_addr);
+                        tf->hob_lbah  = ide_mm_inb(io_ports->lbah_addr);
         }
 }
 
@@ -295,8 +281,9 @@ static const struct ide_tp_ops at91_ide_tp_ops = {
         .exec_command   = ide_exec_command,
         .read_status    = ide_read_status,
         .read_altstatus = ide_read_altstatus,
-        .set_irq        = ide_set_irq,
+        .write_devctl   = ide_write_devctl,
 
+        .dev_select     = ide_dev_select,
         .tf_load        = at91_ide_tf_load,
         .tf_read        = at91_ide_tf_read,
 
diff --git a/drivers/ide/au1xxx-ide.c b/drivers/ide/au1xxx-ide.c
index d3a9d6c15328..46013644c965 100644
--- a/drivers/ide/au1xxx-ide.c
+++ b/drivers/ide/au1xxx-ide.c
@@ -50,7 +50,7 @@ static _auide_hwif auide_hwif;
 
 #if defined(CONFIG_BLK_DEV_IDE_AU1XXX_PIO_DBDMA)
 
-void auide_insw(unsigned long port, void *addr, u32 count)
+static inline void auide_insw(unsigned long port, void *addr, u32 count)
 {
         _auide_hwif *ahwif = &auide_hwif;
         chan_tab_t *ctp;
@@ -68,7 +68,7 @@ void auide_insw(unsigned long port, void *addr, u32 count)
         ctp->cur_ptr = au1xxx_ddma_get_nextptr_virt(dp);
 }
 
-void auide_outsw(unsigned long port, void *addr, u32 count)
+static inline void auide_outsw(unsigned long port, void *addr, u32 count)
 {
         _auide_hwif *ahwif = &auide_hwif;
         chan_tab_t *ctp;
@@ -236,7 +236,7 @@ static int auide_build_dmatable(ide_drive_t *drive, struct ide_cmd *cmd)
                         if (++count >= PRD_ENTRIES) {
                                 printk(KERN_WARNING "%s: DMA table too small\n",
                                        drive->name);
-                                goto use_pio_instead;
+                                return 0;
                         }
 
                         /* Lets enable intr for the last descriptor only */
@@ -272,16 +272,11 @@ static int auide_build_dmatable(ide_drive_t *drive, struct ide_cmd *cmd)
         if (count)
                 return 1;
 
- use_pio_instead:
-        ide_destroy_dmatable(drive);
-
         return 0; /* revert to PIO for this request */
 }
 
 static int auide_dma_end(ide_drive_t *drive)
 {
-        ide_destroy_dmatable(drive);
-
         return 0;
 }
 
@@ -292,12 +287,9 @@ static void auide_dma_start(ide_drive_t *drive )
 
 static int auide_dma_setup(ide_drive_t *drive, struct ide_cmd *cmd)
 {
-        if (auide_build_dmatable(drive, cmd) == 0) {
-                ide_map_sg(drive, cmd);
+        if (auide_build_dmatable(drive, cmd) == 0)
                 return 1;
-        }
 
-        drive->waiting_for_dma = 1;
         return 0;
 }
 
@@ -322,16 +314,11 @@ static void auide_dma_host_set(ide_drive_t *drive, int on)
 
 static void auide_ddma_tx_callback(int irq, void *param)
 {
-        _auide_hwif *ahwif = (_auide_hwif*)param;
-        ahwif->drive->waiting_for_dma = 0;
 }
 
 static void auide_ddma_rx_callback(int irq, void *param)
 {
-        _auide_hwif *ahwif = (_auide_hwif*)param;
-        ahwif->drive->waiting_for_dma = 0;
 }
-
 #endif /* end CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA */
 
 static void auide_init_dbdma_dev(dbdev_tab_t *dev, u32 dev_id, u32 tsize, u32 devwidth, u32 flags)
@@ -353,7 +340,6 @@ static const struct ide_dma_ops au1xxx_dma_ops = {
         .dma_end                = auide_dma_end,
         .dma_test_irq           = auide_dma_test_irq,
         .dma_lost_irq           = ide_dma_lost_irq,
-        .dma_timeout            = ide_dma_timeout,
 };
 
 static int auide_ddma_init(ide_hwif_t *hwif, const struct ide_port_info *d)
@@ -481,9 +467,9 @@ static const struct ide_tp_ops au1xxx_tp_ops = {
         .exec_command           = ide_exec_command,
         .read_status            = ide_read_status,
         .read_altstatus         = ide_read_altstatus,
+        .write_devctl           = ide_write_devctl,
 
-        .set_irq                = ide_set_irq,
-
+        .dev_select             = ide_dev_select,
         .tf_load                = ide_tf_load,
         .tf_read                = ide_tf_read,
 
diff --git a/drivers/ide/cmd64x.c b/drivers/ide/cmd64x.c
index bf0e3f470824..80b777e4247b 100644
--- a/drivers/ide/cmd64x.c
+++ b/drivers/ide/cmd64x.c
@@ -318,7 +318,6 @@ static int cmd646_1_dma_end(ide_drive_t *drive)
         ide_hwif_t *hwif = drive->hwif;
         u8 dma_stat = 0, dma_cmd = 0;
 
-        drive->waiting_for_dma = 0;
         /* get DMA status */
         dma_stat = inb(hwif->dma_base + ATA_DMA_STATUS);
         /* read DMA command state */
@@ -327,8 +326,6 @@ static int cmd646_1_dma_end(ide_drive_t *drive)
         outb(dma_cmd & ~1, hwif->dma_base + ATA_DMA_CMD);
         /* clear the INTR & ERROR bits */
         outb(dma_stat | 6, hwif->dma_base + ATA_DMA_STATUS);
-        /* and free any DMA resources */
-        ide_destroy_dmatable(drive);
         /* verify good DMA status */
         return (dma_stat & 7) != 4;
 }
@@ -384,7 +381,6 @@ static const struct ide_dma_ops cmd64x_dma_ops = {
         .dma_test_irq           = cmd64x_dma_test_irq,
         .dma_lost_irq           = ide_dma_lost_irq,
         .dma_timer_expiry       = ide_dma_sff_timer_expiry,
-        .dma_timeout            = ide_dma_timeout,
         .dma_sff_read_status    = ide_dma_sff_read_status,
 };
 
@@ -396,7 +392,6 @@ static const struct ide_dma_ops cmd646_rev1_dma_ops = {
         .dma_test_irq           = ide_dma_test_irq,
         .dma_lost_irq           = ide_dma_lost_irq,
         .dma_timer_expiry       = ide_dma_sff_timer_expiry,
-        .dma_timeout            = ide_dma_timeout,
         .dma_sff_read_status    = ide_dma_sff_read_status,
 };
 
@@ -408,7 +403,6 @@ static const struct ide_dma_ops cmd648_dma_ops = {
         .dma_test_irq           = cmd648_dma_test_irq,
         .dma_lost_irq           = ide_dma_lost_irq,
         .dma_timer_expiry       = ide_dma_sff_timer_expiry,
-        .dma_timeout            = ide_dma_timeout,
         .dma_sff_read_status    = ide_dma_sff_read_status,
 };
 
diff --git a/drivers/ide/cs5530.c b/drivers/ide/cs5530.c
index 8e8b35a89901..40bf05eddf6e 100644
--- a/drivers/ide/cs5530.c
+++ b/drivers/ide/cs5530.c
@@ -92,8 +92,7 @@ static u8 cs5530_udma_filter(ide_drive_t *drive)
                 if ((mateid[ATA_ID_FIELD_VALID] & 4) &&
                     (mateid[ATA_ID_UDMA_MODES] & 7))
                         goto out;
-                if ((mateid[ATA_ID_FIELD_VALID] & 2) &&
-                    (mateid[ATA_ID_MWDMA_MODES] & 7))
+                if (mateid[ATA_ID_MWDMA_MODES] & 7)
                         mask = 0;
         }
 out:
diff --git a/drivers/ide/cs5536.c b/drivers/ide/cs5536.c
index d5dcf4899607..353a35bbba63 100644
--- a/drivers/ide/cs5536.c
+++ b/drivers/ide/cs5536.c
@@ -236,7 +236,6 @@ static const struct ide_dma_ops cs5536_dma_ops = {
         .dma_test_irq           = ide_dma_test_irq,
         .dma_lost_irq           = ide_dma_lost_irq,
         .dma_timer_expiry       = ide_dma_sff_timer_expiry,
-        .dma_timeout            = ide_dma_timeout,
 };
 
 static const struct ide_port_info cs5536_info = {
diff --git a/drivers/ide/falconide.c b/drivers/ide/falconide.c
index b368a5effc3a..afa2af9a362b 100644
--- a/drivers/ide/falconide.c
+++ b/drivers/ide/falconide.c
@@ -89,9 +89,9 @@ static const struct ide_tp_ops falconide_tp_ops = {
         .exec_command           = ide_exec_command,
         .read_status            = ide_read_status,
         .read_altstatus         = ide_read_altstatus,
+        .write_devctl           = ide_write_devctl,
 
-        .set_irq                = ide_set_irq,
-
+        .dev_select             = ide_dev_select,
         .tf_load                = ide_tf_load,
         .tf_read                = ide_tf_read,
 
diff --git a/drivers/ide/gayle.c b/drivers/ide/gayle.c
index dc778251cb05..c7119516c5a7 100644
--- a/drivers/ide/gayle.c
+++ b/drivers/ide/gayle.c
@@ -53,11 +53,6 @@
 
 #define GAYLE_NEXT_PORT 0x1000
 
-#ifndef CONFIG_BLK_DEV_IDEDOUBLER
-#define GAYLE_NUM_HWIFS         1
-#define GAYLE_NUM_PROBE_HWIFS   GAYLE_NUM_HWIFS
-#define GAYLE_HAS_CONTROL_REG   1
-#else /* CONFIG_BLK_DEV_IDEDOUBLER */
 #define GAYLE_NUM_HWIFS         2
 #define GAYLE_NUM_PROBE_HWIFS   (ide_doubler ? GAYLE_NUM_HWIFS : \
                                                GAYLE_NUM_HWIFS-1)
@@ -66,8 +61,6 @@
 static int ide_doubler;
 module_param_named(doubler, ide_doubler, bool, 0);
 MODULE_PARM_DESC(doubler, "enable support for IDE doublers");
-#endif /* CONFIG_BLK_DEV_IDEDOUBLER */
-
 
     /*
      *  Check and acknowledge the interrupt status
@@ -151,10 +144,7 @@ static int __init gayle_init(void)
 found:
         printk(KERN_INFO "ide: Gayle IDE controller (A%d style%s)\n",
                          a4000 ? 4000 : 1200,
-#ifdef CONFIG_BLK_DEV_IDEDOUBLER
-                         ide_doubler ? ", IDE doubler" :
-#endif
-                         "");
+                         ide_doubler ? ", IDE doubler" : "");
 
         if (a4000) {
             phys_base = GAYLE_BASE_4000;
diff --git a/drivers/ide/hpt366.c b/drivers/ide/hpt366.c
index dbaf184ed9c5..a0eb87f59134 100644
--- a/drivers/ide/hpt366.c
+++ b/drivers/ide/hpt366.c
@@ -835,12 +835,6 @@ static int hpt370_dma_end(ide_drive_t *drive)
         return ide_dma_end(drive);
 }
 
-static void hpt370_dma_timeout(ide_drive_t *drive)
-{
-        hpt370_irq_timeout(drive);
-        ide_dma_timeout(drive);
-}
-
 /* returns 1 if DMA IRQ issued, 0 otherwise */
 static int hpt374_dma_test_irq(ide_drive_t *drive)
 {
@@ -1423,7 +1417,6 @@ static const struct ide_dma_ops hpt37x_dma_ops = {
         .dma_test_irq           = hpt374_dma_test_irq,
         .dma_lost_irq           = ide_dma_lost_irq,
         .dma_timer_expiry       = ide_dma_sff_timer_expiry,
-        .dma_timeout            = ide_dma_timeout,
         .dma_sff_read_status    = ide_dma_sff_read_status,
 };
 
@@ -1435,7 +1428,7 @@ static const struct ide_dma_ops hpt370_dma_ops = {
         .dma_test_irq           = ide_dma_test_irq,
         .dma_lost_irq           = ide_dma_lost_irq,
         .dma_timer_expiry       = ide_dma_sff_timer_expiry,
-        .dma_timeout            = hpt370_dma_timeout,
+        .dma_clear              = hpt370_irq_timeout,
         .dma_sff_read_status    = ide_dma_sff_read_status,
 };
 
@@ -1447,7 +1440,6 @@ static const struct ide_dma_ops hpt36x_dma_ops = {
         .dma_test_irq           = ide_dma_test_irq,
         .dma_lost_irq           = hpt366_dma_lost_irq,
         .dma_timer_expiry       = ide_dma_sff_timer_expiry,
-        .dma_timeout            = ide_dma_timeout,
         .dma_sff_read_status    = ide_dma_sff_read_status,
 };
 
diff --git a/drivers/ide/ht6560b.c b/drivers/ide/ht6560b.c
index c7e5c2246b79..2fb0f2965009 100644
--- a/drivers/ide/ht6560b.c
+++ b/drivers/ide/ht6560b.c
@@ -103,7 +103,7 @@
 /*
  * This routine is invoked from ide.c to prepare for access to a given drive.
  */
-static void ht6560b_selectproc (ide_drive_t *drive)
+static void ht6560b_dev_select(ide_drive_t *drive)
 {
         ide_hwif_t *hwif = drive->hwif;
         unsigned long flags;
@@ -143,6 +143,8 @@ static void ht6560b_selectproc (ide_drive_t *drive)
 #endif
         }
         local_irq_restore(flags);
+
+        outb(drive->select | ATA_DEVICE_OBS, hwif->io_ports.device_addr);
 }
 
 /*
@@ -305,15 +307,29 @@ static int probe_ht6560b;
 module_param_named(probe, probe_ht6560b, bool, 0);
 MODULE_PARM_DESC(probe, "probe for HT6560B chipset");
 
+static const struct ide_tp_ops ht6560b_tp_ops = {
+        .exec_command           = ide_exec_command,
+        .read_status            = ide_read_status,
+        .read_altstatus         = ide_read_altstatus,
+        .write_devctl           = ide_write_devctl,
+
+        .dev_select             = ht6560b_dev_select,
+        .tf_load                = ide_tf_load,
+        .tf_read                = ide_tf_read,
+
+        .input_data             = ide_input_data,
+        .output_data            = ide_output_data,
+};
+
 static const struct ide_port_ops ht6560b_port_ops = {
         .init_dev               = ht6560b_init_dev,
         .set_pio_mode           = ht6560b_set_pio_mode,
-        .selectproc             = ht6560b_selectproc,
 };
 
 static const struct ide_port_info ht6560b_port_info __initdata = {
         .name                   = DRV_NAME,
         .chipset                = ide_ht6560b,
+        .tp_ops                 = &ht6560b_tp_ops,
         .port_ops               = &ht6560b_port_ops,
         .host_flags             = IDE_HFLAG_SERIALIZE | /* is this needed? */
                                   IDE_HFLAG_NO_DMA |
diff --git a/drivers/ide/icside.c b/drivers/ide/icside.c
index 51ce404fe532..4e16ce68b063 100644
--- a/drivers/ide/icside.c
+++ b/drivers/ide/icside.c
@@ -287,13 +287,8 @@ static int icside_dma_end(ide_drive_t *drive)
         ide_hwif_t *hwif = drive->hwif;
         struct expansion_card *ec = ECARD_DEV(hwif->dev);
 
-        drive->waiting_for_dma = 0;
-
         disable_dma(ec->dma);
 
-        /* Teardown mappings after DMA has completed. */
-        ide_destroy_dmatable(drive);
-
         return get_dma_residue(ec->dma) != 0;
 }
 
@@ -346,8 +341,6 @@ static int icside_dma_setup(ide_drive_t *drive, struct ide_cmd *cmd)
         set_dma_sg(ec->dma, hwif->sg_table, cmd->sg_nents);
         set_dma_mode(ec->dma, dma_mode);
 
-        drive->waiting_for_dma = 1;
-
         return 0;
 }
 
@@ -377,7 +370,6 @@ static const struct ide_dma_ops icside_v6_dma_ops = {
         .dma_start              = icside_dma_start,
         .dma_end                = icside_dma_end,
         .dma_test_irq           = icside_dma_test_irq,
-        .dma_timeout            = ide_dma_timeout,
         .dma_lost_irq           = ide_dma_lost_irq,
 };
 #else
diff --git a/drivers/ide/ide-atapi.c b/drivers/ide/ide-atapi.c
index 2fb5d28a9be5..3e43b889dd64 100644
--- a/drivers/ide/ide-atapi.c
+++ b/drivers/ide/ide-atapi.c
@@ -6,6 +6,8 @@
 #include <linux/cdrom.h>
 #include <linux/delay.h>
 #include <linux/ide.h>
+#include <linux/scatterlist.h>
+
 #include <scsi/scsi.h>
 
 #ifdef DEBUG
@@ -69,56 +71,6 @@ int ide_check_atapi_device(ide_drive_t *drive, const char *s)
 }
 EXPORT_SYMBOL_GPL(ide_check_atapi_device);
 
-/* PIO data transfer routine using the scatter gather table. */
-int ide_io_buffers(ide_drive_t *drive, struct ide_atapi_pc *pc,
-                    unsigned int bcount, int write)
-{
-        ide_hwif_t *hwif = drive->hwif;
-        const struct ide_tp_ops *tp_ops = hwif->tp_ops;
-        xfer_func_t *xf = write ? tp_ops->output_data : tp_ops->input_data;
-        struct scatterlist *sg = pc->sg;
-        char *buf;
-        int count, done = 0;
-
-        while (bcount) {
-                count = min(sg->length - pc->b_count, bcount);
-
-                if (PageHighMem(sg_page(sg))) {
-                        unsigned long flags;
-
-                        local_irq_save(flags);
-                        buf = kmap_atomic(sg_page(sg), KM_IRQ0) + sg->offset;
-                        xf(drive, NULL, buf + pc->b_count, count);
-                        kunmap_atomic(buf - sg->offset, KM_IRQ0);
-                        local_irq_restore(flags);
-                } else {
-                        buf = sg_virt(sg);
-                        xf(drive, NULL, buf + pc->b_count, count);
-                }
-
-                bcount -= count;
-                pc->b_count += count;
-                done += count;
-
-                if (pc->b_count == sg->length) {
-                        if (!--pc->sg_cnt)
-                                break;
-                        pc->sg = sg = sg_next(sg);
-                        pc->b_count = 0;
-                }
-        }
-
-        if (bcount) {
-                printk(KERN_ERR "%s: %d leftover bytes, %s\n", drive->name,
-                        bcount, write ? "padding with zeros"
-                                      : "discarding data");
-                ide_pad_transfer(drive, write, bcount);
-        }
-
-        return done;
-}
-EXPORT_SYMBOL_GPL(ide_io_buffers);
-
 void ide_init_pc(struct ide_atapi_pc *pc)
 {
         memset(pc, 0, sizeof(*pc));
@@ -324,12 +276,14 @@ static ide_startstop_t ide_pc_intr(ide_drive_t *drive)
 {
         struct ide_atapi_pc *pc = drive->pc;
         ide_hwif_t *hwif = drive->hwif;
+        struct ide_cmd *cmd = &hwif->cmd;
         struct request *rq = hwif->rq;
         const struct ide_tp_ops *tp_ops = hwif->tp_ops;
         xfer_func_t *xferfunc;
-        unsigned int timeout, temp;
+        unsigned int timeout, done;
         u16 bcount;
         u8 stat, ireason, dsc = 0;
+        u8 write = !!(pc->flags & PC_FLAG_WRITING);
 
         debug_log("Enter %s - interrupt handler\n", __func__);
 
@@ -340,8 +294,13 @@ static ide_startstop_t ide_pc_intr(ide_drive_t *drive)
         stat = tp_ops->read_status(hwif);
 
         if (pc->flags & PC_FLAG_DMA_IN_PROGRESS) {
-                if (hwif->dma_ops->dma_end(drive) ||
-                    (drive->media == ide_tape && (stat & ATA_ERR))) {
+                int rc;
+
+                drive->waiting_for_dma = 0;
+                rc = hwif->dma_ops->dma_end(drive);
+                ide_dma_unmap_sg(drive, cmd);
+
+                if (rc || (drive->media == ide_tape && (stat & ATA_ERR))) {
                         if (drive->media == ide_floppy)
                                 printk(KERN_ERR "%s: DMA %s error\n",
                                         drive->name, rq_data_dir(pc->rq)
@@ -357,7 +316,8 @@ static ide_startstop_t ide_pc_intr(ide_drive_t *drive)
 
         /* No more interrupts */
         if ((stat & ATA_DRQ) == 0) {
-                int uptodate;
+                int uptodate, error;
+                unsigned int done;
 
                 debug_log("Packet command completed, %d bytes transferred\n",
                           pc->xferred);
@@ -404,16 +364,24 @@ static ide_startstop_t ide_pc_intr(ide_drive_t *drive)
 
                 if (blk_special_request(rq)) {
                         rq->errors = 0;
-                        ide_complete_rq(drive, 0, blk_rq_bytes(rq));
+                        done = blk_rq_bytes(rq);
+                        error = 0;
                 } else {
+
                         if (blk_fs_request(rq) == 0 && uptodate <= 0) {
                                 if (rq->errors == 0)
                                         rq->errors = -EIO;
                         }
-                        ide_complete_rq(drive, uptodate ? 0 : -EIO,
-                                        ide_rq_bytes(rq));
+
+                        if (drive->media == ide_tape)
+                                done = ide_rq_bytes(rq); /* FIXME */
+                        else
+                                done = blk_rq_bytes(rq);
+
+                        error = uptodate ? 0 : -EIO;
                 }
 
+                ide_complete_rq(drive, error, done);
                 return ide_stopped;
         }
 
@@ -433,8 +401,7 @@ static ide_startstop_t ide_pc_intr(ide_drive_t *drive)
                 return ide_do_reset(drive);
         }
 
-        if (((ireason & ATAPI_IO) == ATAPI_IO) ==
-                !!(pc->flags & PC_FLAG_WRITING)) {
+        if (((ireason & ATAPI_IO) == ATAPI_IO) == write) {
                 /* Hopefully, we will never get here */
                 printk(KERN_ERR "%s: We wanted to %s, but the device wants us "
                                 "to %s!\n", drive->name,
@@ -443,45 +410,30 @@ static ide_startstop_t ide_pc_intr(ide_drive_t *drive)
                 return ide_do_reset(drive);
         }
 
-        if (!(pc->flags & PC_FLAG_WRITING)) {
-                /* Reading - Check that we have enough space */
-                temp = pc->xferred + bcount;
-                if (temp > pc->req_xfer) {
-                        if (temp > pc->buf_size) {
-                                printk(KERN_ERR "%s: The device wants to send "
-                                                "us more data than expected - "
-                                                "discarding data\n",
-                                                drive->name);
-
-                                ide_pad_transfer(drive, 0, bcount);
-                                goto next_irq;
-                        }
-                        debug_log("The device wants to send us more data than "
-                                  "expected - allowing transfer\n");
-                }
-                xferfunc = tp_ops->input_data;
-        } else
-                xferfunc = tp_ops->output_data;
-
-        if ((drive->media == ide_floppy && !pc->buf) ||
-            (drive->media == ide_tape && pc->bh)) {
-                int done = drive->pc_io_buffers(drive, pc, bcount,
-                                  !!(pc->flags & PC_FLAG_WRITING));
-
-                /* FIXME: don't do partial completions */
-                if (drive->media == ide_floppy)
-                        ide_complete_rq(drive, 0,
-                                        done ? done : ide_rq_bytes(rq));
-        } else
-                xferfunc(drive, NULL, pc->cur_pos, bcount);
+        xferfunc = write ? tp_ops->output_data : tp_ops->input_data;
+
+        if (drive->media == ide_floppy && pc->buf == NULL) {
+                done = min_t(unsigned int, bcount, cmd->nleft);
+                ide_pio_bytes(drive, cmd, write, done);
+        } else if (drive->media == ide_tape && pc->bh) {
+                done = drive->pc_io_buffers(drive, pc, bcount, write);
+        } else {
+                done = min_t(unsigned int, bcount, pc->req_xfer - pc->xferred);
+                xferfunc(drive, NULL, pc->cur_pos, done);
+        }
 
         /* Update the current position */
-        pc->xferred += bcount;
-        pc->cur_pos += bcount;
+        pc->xferred += done;
+        pc->cur_pos += done;
+
+        bcount -= done;
+
+        if (bcount)
+                ide_pad_transfer(drive, write, bcount);
+
+        debug_log("[cmd %x] transferred %d bytes, padded %d bytes\n",
+                  rq->cmd[0], done, bcount);
 
-        debug_log("[cmd %x] transferred %d bytes on that intr.\n",
-                  rq->cmd[0], bcount);
-next_irq:
         /* And set the interrupt handler again */
         ide_set_handler(drive, ide_pc_intr, timeout);
         return ide_started;
@@ -611,6 +563,10 @@ static ide_startstop_t ide_transfer_pc(ide_drive_t *drive)
                                              : ide_pc_intr),
                         timeout);
 
+        /* Send the actual packet */
+        if ((drive->atapi_flags & IDE_AFLAG_ZIP_DRIVE) == 0)
+                hwif->tp_ops->output_data(drive, NULL, rq->cmd, cmd_len);
+
         /* Begin DMA, if necessary */
         if (dev_is_idecd(drive)) {
                 if (drive->dma)
@@ -622,10 +578,6 @@ static ide_startstop_t ide_transfer_pc(ide_drive_t *drive)
                 }
         }
 
-        /* Send the actual packet */
-        if ((drive->atapi_flags & IDE_AFLAG_ZIP_DRIVE) == 0)
-                hwif->tp_ops->output_data(drive, NULL, rq->cmd, cmd_len);
-
         return ide_started;
 }
 
@@ -633,7 +585,6 @@ ide_startstop_t ide_issue_pc(ide_drive_t *drive, struct ide_cmd *cmd)
 {
         struct ide_atapi_pc *pc;
         ide_hwif_t *hwif = drive->hwif;
-        const struct ide_dma_ops *dma_ops = hwif->dma_ops;
         ide_expiry_t *expiry = NULL;
         struct request *rq = hwif->rq;
         unsigned int timeout;
@@ -647,12 +598,8 @@ ide_startstop_t ide_issue_pc(ide_drive_t *drive, struct ide_cmd *cmd)
                 expiry = ide_cd_expiry;
                 timeout = ATAPI_WAIT_PC;
 
-                if (drive->dma) {
-                        if (ide_build_sglist(drive, cmd))
-                                drive->dma = !dma_ops->dma_setup(drive, cmd);
-                        else
-                                drive->dma = 0;
-                }
+                if (drive->dma)
+                        drive->dma = !ide_dma_prepare(drive, cmd);
         } else {
                 pc = drive->pc;
 
@@ -670,13 +617,8 @@ ide_startstop_t ide_issue_pc(ide_drive_t *drive, struct ide_cmd *cmd)
                         ide_dma_off(drive);
                 }
 
-                if ((pc->flags & PC_FLAG_DMA_OK) &&
-                     (drive->dev_flags & IDE_DFLAG_USING_DMA)) {
-                        if (ide_build_sglist(drive, cmd))
-                                drive->dma = !dma_ops->dma_setup(drive, cmd);
-                        else
-                                drive->dma = 0;
-                }
+                if (pc->flags & PC_FLAG_DMA_OK)
+                        drive->dma = !ide_dma_prepare(drive, cmd);
 
                 if (!drive->dma)
                         pc->flags &= ~PC_FLAG_DMA_OK;
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
index 3f630e4080d4..35729a47f797 100644
--- a/drivers/ide/ide-cd.c
+++ b/drivers/ide/ide-cd.c
@@ -4,7 +4,7 @@
  * Copyright (C) 1994-1996   Scott Snyder <snyder@fnald0.fnal.gov>
  * Copyright (C) 1996-1998   Erik Andersen <andersee@debian.org>
  * Copyright (C) 1998-2000   Jens Axboe <axboe@suse.de>
- * Copyright (C) 2005, 2007  Bartlomiej Zolnierkiewicz
+ * Copyright (C) 2005, 2007-2009  Bartlomiej Zolnierkiewicz
  *
  * May be copied or modified under the terms of the GNU General Public
  * License.  See linux/COPYING for more information.
@@ -12,12 +12,9 @@
  * See Documentation/cdrom/ide-cd for usage information.
  *
  * Suggestions are welcome. Patches that work are more welcome though. ;-)
- * For those wishing to work on this driver, please be sure you download
- * and comply with the latest Mt. Fuji (SFF8090 version 4) and ATAPI
- * (SFF-8020i rev 2.6) standards. These documents can be obtained by
- * anonymous ftp from:
- * ftp://fission.dt.wdc.com/pub/standards/SFF_atapi/spec/SFF8020-r2.6/PS/8020r26.ps
- * ftp://ftp.avc-pioneer.com/Mtfuji4/Spec/Fuji4r10.pdf
+ *
+ * Documentation:
+ *      Mt. Fuji (SFF8090 version 4) and ATAPI (SFF-8020i rev 2.6) standards.
  *
  * For historical changelog please see:
  *      Documentation/ide/ChangeLog.ide-cd.1994-2004
@@ -245,73 +242,34 @@ static void cdrom_queue_request_sense(ide_drive_t *drive, void *sense,
         elv_add_request(drive->queue, rq, ELEVATOR_INSERT_FRONT, 0);
 }
 
-static void cdrom_end_request(ide_drive_t *drive, int uptodate)
+static void ide_cd_complete_failed_rq(ide_drive_t *drive, struct request *rq)
 {
-        struct request *rq = drive->hwif->rq;
-        int nsectors = rq->hard_cur_sectors;
-
-        ide_debug_log(IDE_DBG_FUNC, "cmd: 0x%x, uptodate: 0x%x, nsectors: %d",
-                                    rq->cmd[0], uptodate, nsectors);
-
-        if (blk_sense_request(rq) && uptodate) {
-                /*
-                 * For REQ_TYPE_SENSE, "rq->buffer" points to the original
-                 * failed request
-                 */
-                struct request *failed = (struct request *) rq->buffer;
-                struct cdrom_info *info = drive->driver_data;
-                void *sense = &info->sense_data;
-
-                if (failed) {
-                        if (failed->sense) {
-                                sense = failed->sense;
-                                failed->sense_len = rq->sense_len;
-                        }
-                        cdrom_analyze_sense_data(drive, failed, sense);
-                        /*
-                         * now end the failed request
-                         */
-                        if (blk_fs_request(failed)) {
-                                if (ide_end_rq(drive, failed, -EIO,
-                                                failed->hard_nr_sectors << 9))
-                                        BUG();
-                        } else {
-                                if (blk_end_request(failed, -EIO,
-                                                    failed->data_len))
-                                        BUG();
-                        }
-                } else
-                        cdrom_analyze_sense_data(drive, NULL, sense);
-        }
-
-        if (!rq->current_nr_sectors && blk_fs_request(rq))
-                uptodate = 1;
-        /* make sure it's fully ended */
-        if (blk_pc_request(rq))
-                nsectors = (rq->data_len + 511) >> 9;
-        if (!nsectors)
-                nsectors = 1;
-
-        ide_debug_log(IDE_DBG_FUNC, "uptodate: 0x%x, nsectors: %d",
-                                    uptodate, nsectors);
-
-        if (blk_fs_request(rq) == 0 && uptodate <= 0 && rq->errors == 0)
-                rq->errors = -EIO;
+        /*
+         * For REQ_TYPE_SENSE, "rq->buffer" points to the original
+         * failed request
+         */
+        struct request *failed = (struct request *)rq->buffer;
+        struct cdrom_info *info = drive->driver_data;
+        void *sense = &info->sense_data;
 
-        ide_complete_rq(drive, uptodate ? 0 : -EIO, nsectors << 9);
-}
+        if (failed) {
+                if (failed->sense) {
+                        sense = failed->sense;
+                        failed->sense_len = rq->sense_len;
+                }
+                cdrom_analyze_sense_data(drive, failed, sense);
 
-static void ide_dump_status_no_sense(ide_drive_t *drive, const char *msg, u8 st)
-{
-        if (st & 0x80)
-                return;
-        ide_dump_status(drive, msg, st);
+                if (ide_end_rq(drive, failed, -EIO, blk_rq_bytes(failed)))
+                        BUG();
+        } else
+                cdrom_analyze_sense_data(drive, NULL, sense);
 }
 
 /*
  * Returns:
  * 0: if the request should be continued.
- * 1: if the request was ended.
+ * 1: if the request will be going through error recovery.
+ * 2: if the request should be ended.
  */
 static int cdrom_decode_status(ide_drive_t *drive, int good_stat, int *stat_ret)
 {
@@ -332,12 +290,6 @@ static int cdrom_decode_status(ide_drive_t *drive, int good_stat, int *stat_ret)
         err = ide_read_error(drive);
         sense_key = err >> 4;
 
-        if (rq == NULL) {
-                printk(KERN_ERR PFX "%s: missing rq in %s\n",
-                                drive->name, __func__);
-                return 1;
-        }
-
         ide_debug_log(IDE_DBG_RQ, "stat: 0x%x, good_stat: 0x%x, cmd[0]: 0x%x, "
                                   "rq->cmd_type: 0x%x, err: 0x%x",
                                   stat, good_stat, rq->cmd[0], rq->cmd_type,
@@ -350,10 +302,7 @@ static int cdrom_decode_status(ide_drive_t *drive, int good_stat, int *stat_ret)
                  * Just give up.
                  */
                 rq->cmd_flags |= REQ_FAILED;
-                cdrom_end_request(drive, 0);
-                ide_error(drive, "request sense failure", stat);
-                return 1;
-
+                return 2;
         } else if (blk_pc_request(rq) || rq->cmd_type == REQ_TYPE_ATA_PC) {
                 /* All other functions, except for READ. */
 
@@ -456,21 +405,19 @@ static int cdrom_decode_status(ide_drive_t *drive, int good_stat, int *stat_ret)
                          * No point in retrying after an illegal request or data
                          * protect error.
                          */
-                        ide_dump_status_no_sense(drive, "command error", stat);
+                        ide_dump_status(drive, "command error", stat);
                         do_end_request = 1;
                 } else if (sense_key == MEDIUM_ERROR) {
                         /*
                          * No point in re-trying a zillion times on a bad
                          * sector. If we got here the error is not correctable.
                          */
-                        ide_dump_status_no_sense(drive,
-                                                 "media error (bad sector)",
-                                                 stat);
+                        ide_dump_status(drive, "media error (bad sector)",
+                                        stat);
                         do_end_request = 1;
                 } else if (sense_key == BLANK_CHECK) {
                         /* disk appears blank ?? */
-                        ide_dump_status_no_sense(drive, "media error (blank)",
-                                                 stat);
+                        ide_dump_status(drive, "media error (blank)", stat);
                         do_end_request = 1;
                 } else if ((err & ~ATA_ABORTED) != 0) {
                         /* go to the default handler for other errors */
@@ -495,14 +442,12 @@ static int cdrom_decode_status(ide_drive_t *drive, int good_stat, int *stat_ret)
                  */
                 if (stat & ATA_ERR)
                         cdrom_queue_request_sense(drive, NULL, NULL);
+                return 1;
         } else {
                 blk_dump_rq_flags(rq, PFX "bad rq");
-                cdrom_end_request(drive, 0);
+                return 2;
         }
 
-        /* retry, or handle the next request */
-        return 1;
-
 end_request:
         if (stat & ATA_ERR) {
                 struct request_queue *q = drive->queue;
@@ -515,10 +460,9 @@ end_request:
                 hwif->rq = NULL;
 
                 cdrom_queue_request_sense(drive, rq->sense, rq);
+                return 1;
         } else
-                cdrom_end_request(drive, 0);
-
-        return 1;
+                return 2;
 }
 
 /*
@@ -562,101 +506,13 @@ static int ide_cd_check_ireason(ide_drive_t *drive, struct request *rq,
         if (rq->cmd_type == REQ_TYPE_ATA_PC)
                 rq->cmd_flags |= REQ_FAILED;
 
-        cdrom_end_request(drive, 0);
         return -1;
 }
 
-/*
- * Assume that the drive will always provide data in multiples of at least
- * SECTOR_SIZE, as it gets hairy to keep track of the transfers otherwise.
- */
-static int ide_cd_check_transfer_size(ide_drive_t *drive, int len)
+static void ide_cd_request_sense_fixup(ide_drive_t *drive, struct ide_cmd *cmd)
 {
-        ide_debug_log(IDE_DBG_FUNC, "len: %d", len);
-
-        if ((len % SECTOR_SIZE) == 0)
-                return 0;
+        struct request *rq = cmd->rq;
 
-        printk(KERN_ERR PFX "%s: %s: Bad transfer size %d\n", drive->name,
-                        __func__, len);
-
-        if (drive->atapi_flags & IDE_AFLAG_LIMIT_NFRAMES)
-                printk(KERN_ERR PFX "This drive is not supported by this "
-                                "version of the driver\n");
-        else {
-                printk(KERN_ERR PFX "Trying to limit transfer sizes\n");
-                drive->atapi_flags |= IDE_AFLAG_LIMIT_NFRAMES;
-        }
-
-        return 1;
-}
-
-static ide_startstop_t ide_cd_prepare_rw_request(ide_drive_t *drive,
-                                                 struct request *rq)
-{
-        ide_debug_log(IDE_DBG_RQ, "rq->cmd_flags: 0x%x", rq->cmd_flags);
-
-        if (rq_data_dir(rq) == READ) {
-                unsigned short sectors_per_frame =
-                        queue_hardsect_size(drive->queue) >> SECTOR_BITS;
-                int nskip = rq->sector & (sectors_per_frame - 1);
-
-                /*
-                 * If the requested sector doesn't start on a frame boundary,
-                 * we must adjust the start of the transfer so that it does,
-                 * and remember to skip the first few sectors.
-                 *
-                 * If the rq->current_nr_sectors field is larger than the size
-                 * of the buffer, it will mean that we're to skip a number of
-                 * sectors equal to the amount by which rq->current_nr_sectors
-                 * is larger than the buffer size.
-                 */
-                if (nskip > 0) {
-                        /* sanity check... */
-                        if (rq->current_nr_sectors !=
-                            bio_cur_sectors(rq->bio)) {
-                                printk(KERN_ERR PFX "%s: %s: buffer botch (%u)\n",
-                                                drive->name, __func__,
-                                                rq->current_nr_sectors);
-                                cdrom_end_request(drive, 0);
-                                return ide_stopped;
-                        }
-                        rq->current_nr_sectors += nskip;
-                }
-        }
-
-        /* set up the command */
-        rq->timeout = ATAPI_WAIT_PC;
-
-        return ide_started;
-}
-
-/*
- * Fix up a possibly partially-processed request so that we can start it over
- * entirely, or even put it back on the request queue.
- */
-static void ide_cd_restore_request(ide_drive_t *drive, struct request *rq)
-{
-
-        ide_debug_log(IDE_DBG_FUNC, "enter");
-
-        if (rq->buffer != bio_data(rq->bio)) {
-                sector_t n =
-                        (rq->buffer - (char *)bio_data(rq->bio)) / SECTOR_SIZE;
-
-                rq->buffer = bio_data(rq->bio);
-                rq->nr_sectors += n;
-                rq->sector -= n;
-        }
-        rq->current_nr_sectors = bio_cur_sectors(rq->bio);
-        rq->hard_cur_sectors = rq->current_nr_sectors;
-        rq->hard_nr_sectors = rq->nr_sectors;
-        rq->hard_sector = rq->sector;
-        rq->q->prep_rq_fn(rq->q, rq);
-}
-
-static void ide_cd_request_sense_fixup(ide_drive_t *drive, struct request *rq)
-{
         ide_debug_log(IDE_DBG_FUNC, "rq->cmd[0]: 0x%x", rq->cmd[0]);
 
         /*
@@ -664,11 +520,14 @@ static void ide_cd_request_sense_fixup(ide_drive_t *drive, struct request *rq)
          * and some drives don't send them.  Sigh.
          */
         if (rq->cmd[0] == GPCMD_REQUEST_SENSE &&
-            rq->data_len > 0 && rq->data_len <= 5)
-                while (rq->data_len > 0) {
-                        *(u8 *)rq->data++ = 0;
-                        --rq->data_len;
+            cmd->nleft > 0 && cmd->nleft <= 5) {
+                unsigned int ofs = cmd->nbytes - cmd->nleft;
+
+                while (cmd->nleft > 0) {
+                        *((u8 *)rq->data + ofs++) = 0;
+                        cmd->nleft--;
                 }
+        }
 }
 
 int ide_cd_queue_pc(ide_drive_t *drive, const unsigned char *cmd,
@@ -748,24 +607,26 @@ int ide_cd_queue_pc(ide_drive_t *drive, const unsigned char *cmd,
         return (flags & REQ_FAILED) ? -EIO : 0;
 }
 
-/*
- * Called from blk_end_request_callback() after the data of the request is
- * completed and before the request itself is completed. By returning value '1',
- * blk_end_request_callback() returns immediately without completing it.
- */
-static int cdrom_newpc_intr_dummy_cb(struct request *rq)
+static void ide_cd_error_cmd(ide_drive_t *drive, struct ide_cmd *cmd)
 {
-        return 1;
+        unsigned int nr_bytes = cmd->nbytes - cmd->nleft;
+
+        if (cmd->tf_flags & IDE_TFLAG_WRITE)
+                nr_bytes -= cmd->last_xfer_len;
+
+        if (nr_bytes > 0)
+                ide_complete_rq(drive, 0, nr_bytes);
 }
 
 static ide_startstop_t cdrom_newpc_intr(ide_drive_t *drive)
 {
         ide_hwif_t *hwif = drive->hwif;
+        struct ide_cmd *cmd = &hwif->cmd;
         struct request *rq = hwif->rq;
-        xfer_func_t *xferfunc;
         ide_expiry_t *expiry = NULL;
         int dma_error = 0, dma, stat, thislen, uptodate = 0;
-        int write = (rq_data_dir(rq) == WRITE) ? 1 : 0;
+        int write = (rq_data_dir(rq) == WRITE) ? 1 : 0, rc, nsectors;
+        int sense = blk_sense_request(rq);
         unsigned int timeout;
         u16 len;
         u8 ireason;
@@ -777,7 +638,9 @@ static ide_startstop_t cdrom_newpc_intr(ide_drive_t *drive)
         dma = drive->dma;
         if (dma) {
                 drive->dma = 0;
+                drive->waiting_for_dma = 0;
                 dma_error = hwif->dma_ops->dma_end(drive);
+                ide_dma_unmap_sg(drive, cmd);
                 if (dma_error) {
                         printk(KERN_ERR PFX "%s: DMA %s error\n", drive->name,
                                         write ? "write" : "read");
@@ -785,27 +648,24 @@ static ide_startstop_t cdrom_newpc_intr(ide_drive_t *drive)
                 }
         }
 
-        if (cdrom_decode_status(drive, 0, &stat))
+        rc = cdrom_decode_status(drive, 0, &stat);
+        if (rc) {
+                if (rc == 2)
+                        goto out_end;
                 return ide_stopped;
+        }
 
         /* using dma, transfer is complete now */
         if (dma) {
                 if (dma_error)
                         return ide_error(drive, "dma error", stat);
-                if (blk_fs_request(rq)) {
-                        ide_complete_rq(drive, 0, rq->nr_sectors
-                                ? (rq->nr_sectors << 9) : ide_rq_bytes(rq));
-                        return ide_stopped;
-                } else if (rq->cmd_type == REQ_TYPE_ATA_PC && !rq->bio) {
-                        ide_complete_rq(drive, 0, 512);
-                        return ide_stopped;
-                }
-                goto end_request;
+                uptodate = 1;
+                goto out_end;
         }
 
         ide_read_bcount_and_ireason(drive, &len, &ireason);
 
-        thislen = blk_fs_request(rq) ? len : rq->data_len;
+        thislen = blk_fs_request(rq) ? len : cmd->nleft;
         if (thislen > len)
                 thislen = len;
 
@@ -820,60 +680,30 @@ static ide_startstop_t cdrom_newpc_intr(ide_drive_t *drive)
                          * Otherwise, complete the command normally.
                          */
                         uptodate = 1;
-                        if (rq->current_nr_sectors > 0) {
+                        if (cmd->nleft > 0) {
                                 printk(KERN_ERR PFX "%s: %s: data underrun "
-                                                "(%d blocks)\n",
-                                                drive->name, __func__,
-                                                rq->current_nr_sectors);
+                                        "(%u bytes)\n", drive->name, __func__,
+                                        cmd->nleft);
                                 if (!write)
                                         rq->cmd_flags |= REQ_FAILED;
                                 uptodate = 0;
                         }
-                        cdrom_end_request(drive, uptodate);
-                        return ide_stopped;
                 } else if (!blk_pc_request(rq)) {
-                        ide_cd_request_sense_fixup(drive, rq);
+                        ide_cd_request_sense_fixup(drive, cmd);
                         /* complain if we still have data left to transfer */
-                        uptodate = rq->data_len ? 0 : 1;
+                        uptodate = cmd->nleft ? 0 : 1;
+                        if (uptodate == 0)
+                                rq->cmd_flags |= REQ_FAILED;
                 }
-                goto end_request;
+                goto out_end;
         }
 
         /* check which way to transfer data */
-        if (ide_cd_check_ireason(drive, rq, len, ireason, write))
-                return ide_stopped;
+        rc = ide_cd_check_ireason(drive, rq, len, ireason, write);
+        if (rc)
+                goto out_end;
 
-        if (blk_fs_request(rq)) {
-                if (write == 0) {
-                        int nskip;
-
-                        if (ide_cd_check_transfer_size(drive, len)) {
-                                cdrom_end_request(drive, 0);
-                                return ide_stopped;
-                        }
-
-                        /*
-                         * First, figure out if we need to bit-bucket
-                         * any of the leading sectors.
-                         */
-                        nskip = min_t(int, rq->current_nr_sectors
-                                           - bio_cur_sectors(rq->bio),
-                                           thislen >> 9);
-                        if (nskip > 0) {
-                                ide_pad_transfer(drive, write, nskip << 9);
-                                rq->current_nr_sectors -= nskip;
-                                thislen -= (nskip << 9);
-                        }
-                }
-        }
-
-        if (ireason == 0) {
-                write = 1;
-                xferfunc = hwif->tp_ops->output_data;
-        } else {
-                write = 0;
-                xferfunc = hwif->tp_ops->input_data;
-        }
+        cmd->last_xfer_len = 0;
 
         ide_debug_log(IDE_DBG_PC, "data transfer, rq->cmd_type: 0x%x, "
                                   "ireason: 0x%x",
@@ -881,75 +711,31 @@ static ide_startstop_t cdrom_newpc_intr(ide_drive_t *drive)
 
         /* transfer data */
         while (thislen > 0) {
-                u8 *ptr = blk_fs_request(rq) ? NULL : rq->data;
-                int blen = rq->data_len;
-
-                /* bio backed? */
-                if (rq->bio) {
-                        if (blk_fs_request(rq)) {
-                                ptr = rq->buffer;
-                                blen = rq->current_nr_sectors << 9;
-                        } else {
-                                ptr = bio_data(rq->bio);
-                                blen = bio_iovec(rq->bio)->bv_len;
-                        }
-                }
+                int blen = min_t(int, thislen, cmd->nleft);
 
-                if (!ptr) {
-                        if (blk_fs_request(rq) && !write)
-                                /*
-                                 * If the buffers are full, pipe the rest into
-                                 * oblivion.
-                                 */
-                                ide_pad_transfer(drive, 0, thislen);
-                        else {
-                                printk(KERN_ERR PFX "%s: confused, missing data\n",
-                                                drive->name);
-                                blk_dump_rq_flags(rq, rq_data_dir(rq)
-                                                  ? "cdrom_newpc_intr, write"
-                                                  : "cdrom_newpc_intr, read");
-                        }
+                if (cmd->nleft == 0)
                         break;
-                }
-
-                if (blen > thislen)
-                        blen = thislen;
 
-                xferfunc(drive, NULL, ptr, blen);
+                ide_pio_bytes(drive, cmd, write, blen);
+                cmd->last_xfer_len += blen;
 
                 thislen -= blen;
                 len -= blen;
 
-                if (blk_fs_request(rq)) {
-                        rq->buffer += blen;
-                        rq->nr_sectors -= (blen >> 9);
-                        rq->current_nr_sectors -= (blen >> 9);
-                        rq->sector += (blen >> 9);
-
-                        if (rq->current_nr_sectors == 0 && rq->nr_sectors)
-                                cdrom_end_request(drive, 1);
-                } else {
-                        rq->data_len -= blen;
-
-                        /*
-                         * The request can't be completed until DRQ is cleared.
-                         * So complete the data, but don't complete the request
-                         * using the dummy function for the callback feature
-                         * of blk_end_request_callback().
-                         */
-                        if (rq->bio)
-                                blk_end_request_callback(rq, 0, blen,
-                                                 cdrom_newpc_intr_dummy_cb);
-                        else
-                                rq->data += blen;
-                }
-                if (!write && blk_sense_request(rq))
+                if (sense && write == 0)
                         rq->sense_len += blen;
         }
 
         /* pad, if necessary */
-        if (!blk_fs_request(rq) && len > 0)
-                ide_pad_transfer(drive, write, len);
+        if (len > 0) {
+                if (blk_fs_request(rq) == 0 || write == 0)
+                        ide_pad_transfer(drive, write, len);
+                else {
+                        printk(KERN_ERR PFX "%s: confused, missing data\n",
+                                drive->name);
+                        blk_dump_rq_flags(rq, "cdrom_newpc_intr");
+                }
+        }
 
         if (blk_pc_request(rq)) {
                 timeout = rq->timeout;
@@ -963,21 +749,50 @@ static ide_startstop_t cdrom_newpc_intr(ide_drive_t *drive)
         ide_set_handler(drive, cdrom_newpc_intr, timeout);
         return ide_started;
 
-end_request:
-        if (blk_pc_request(rq)) {
+out_end:
+        if (blk_pc_request(rq) && rc == 0) {
                 unsigned int dlen = rq->data_len;
 
-                if (dma)
-                        rq->data_len = 0;
+                rq->data_len = 0;
 
                 if (blk_end_request(rq, 0, dlen))
                         BUG();
 
                 hwif->rq = NULL;
         } else {
-                if (!uptodate)
-                        rq->cmd_flags |= REQ_FAILED;
-                cdrom_end_request(drive, uptodate);
+                if (sense && uptodate)
+                        ide_cd_complete_failed_rq(drive, rq);
+
+                if (blk_fs_request(rq)) {
+                        if (cmd->nleft == 0)
+                                uptodate = 1;
+                } else {
+                        if (uptodate <= 0 && rq->errors == 0)
+                                rq->errors = -EIO;
+                }
+
+                if (uptodate == 0)
+                        ide_cd_error_cmd(drive, cmd);
+
+                /* make sure it's fully ended */
+                if (blk_pc_request(rq))
+                        nsectors = (rq->data_len + 511) >> 9;
+                else
+                        nsectors = rq->hard_nr_sectors;
+
+                if (nsectors == 0)
+                        nsectors = 1;
+
+                if (blk_fs_request(rq) == 0) {
+                        rq->data_len -= (cmd->nbytes - cmd->nleft);
+                        if (uptodate == 0 && (cmd->tf_flags & IDE_TFLAG_WRITE))
+                                rq->data_len += cmd->last_xfer_len;
+                }
+
+                ide_complete_rq(drive, uptodate ? 0 : -EIO, nsectors << 9);
+
+                if (sense && rc == 2)
+                        ide_error(drive, "request sense failure", stat);
         }
         return ide_stopped;
 }
@@ -985,42 +800,40 @@ end_request:
 static ide_startstop_t cdrom_start_rw(ide_drive_t *drive, struct request *rq)
 {
         struct cdrom_info *cd = drive->driver_data;
+        struct request_queue *q = drive->queue;
         int write = rq_data_dir(rq) == WRITE;
         unsigned short sectors_per_frame =
-                queue_hardsect_size(drive->queue) >> SECTOR_BITS;
+                queue_hardsect_size(q) >> SECTOR_BITS;
 
-        ide_debug_log(IDE_DBG_RQ, "rq->cmd[0]: 0x%x, write: 0x%x, "
+        ide_debug_log(IDE_DBG_RQ, "rq->cmd[0]: 0x%x, rq->cmd_flags: 0x%x, "
                                   "secs_per_frame: %u",
-                                  rq->cmd[0], write, sectors_per_frame);
+                                  rq->cmd[0], rq->cmd_flags, sectors_per_frame);
 
         if (write) {
                 /* disk has become write protected */
-                if (get_disk_ro(cd->disk)) {
-                        cdrom_end_request(drive, 0);
+                if (get_disk_ro(cd->disk))
                         return ide_stopped;
-                }
         } else {
                 /*
                  * We may be retrying this request after an error.  Fix up any
                  * weirdness which might be present in the request packet.
                  */
-                ide_cd_restore_request(drive, rq);
+                q->prep_rq_fn(q, rq);
         }
 
-        /* use DMA, if possible / writes *must* be hardware frame aligned */
+        /* fs requests *must* be hardware frame aligned */
         if ((rq->nr_sectors & (sectors_per_frame - 1)) ||
-            (rq->sector & (sectors_per_frame - 1))) {
-                if (write) {
-                        cdrom_end_request(drive, 0);
-                        return ide_stopped;
-                }
-                drive->dma = 0;
-        } else
-                drive->dma = !!(drive->dev_flags & IDE_DFLAG_USING_DMA);
+            (rq->sector & (sectors_per_frame - 1)))
+                return ide_stopped;
+
+        /* use DMA, if possible */
+        drive->dma = !!(drive->dev_flags & IDE_DFLAG_USING_DMA);
 
         if (write)
                 cd->devinfo.media_written = 1;
 
+        rq->timeout = ATAPI_WAIT_PC;
+
         return ide_started;
 }
 
@@ -1068,6 +881,7 @@ static ide_startstop_t ide_cd_do_request(ide_drive_t *drive, struct request *rq,
                                         sector_t block)
 {
         struct ide_cmd cmd;
+        int uptodate = 0, nsectors;
 
         ide_debug_log(IDE_DBG_RQ, "cmd: 0x%x, block: %llu",
                                   rq->cmd[0], (unsigned long long)block);
@@ -1077,10 +891,7 @@ static ide_startstop_t ide_cd_do_request(ide_drive_t *drive, struct request *rq,
 
         if (blk_fs_request(rq)) {
                 if (cdrom_start_rw(drive, rq) == ide_stopped)
-                        return ide_stopped;
-
-                if (ide_cd_prepare_rw_request(drive, rq) == ide_stopped)
-                        return ide_stopped;
+                        goto out_end;
         } else if (blk_sense_request(rq) || blk_pc_request(rq) ||
                    rq->cmd_type == REQ_TYPE_ATA_PC) {
                 if (!rq->timeout)
@@ -1089,12 +900,13 @@ static ide_startstop_t ide_cd_do_request(ide_drive_t *drive, struct request *rq,
                 cdrom_do_block_pc(drive, rq);
         } else if (blk_special_request(rq)) {
                 /* right now this can only be a reset... */
-                cdrom_end_request(drive, 1);
-                return ide_stopped;
+                uptodate = 1;
+                goto out_end;
         } else {
                 blk_dump_rq_flags(rq, DRV_NAME " bad flags");
-                cdrom_end_request(drive, 0);
-                return ide_stopped;
+                if (rq->errors == 0)
+                        rq->errors = -EIO;
+                goto out_end;
         }
 
         memset(&cmd, 0, sizeof(cmd));
@@ -1104,7 +916,22 @@ static ide_startstop_t ide_cd_do_request(ide_drive_t *drive, struct request *rq,
 
         cmd.rq = rq;
 
+        if (blk_fs_request(rq) || rq->data_len) {
+                ide_init_sg_cmd(&cmd, blk_fs_request(rq) ? (rq->nr_sectors << 9)
+                                                         : rq->data_len);
+                ide_map_sg(drive, &cmd);
+        }
+
         return ide_issue_pc(drive, &cmd);
+out_end:
+        nsectors = rq->hard_nr_sectors;
+
+        if (nsectors == 0)
+                nsectors = 1;
+
+        ide_complete_rq(drive, uptodate ? 0 : -EIO, nsectors << 9);
+
+        return ide_stopped;
 }
 
 /*
@@ -1696,9 +1523,6 @@ static const struct ide_proc_devset *ide_cd_proc_devsets(ide_drive_t *drive)
 #endif
 
 static const struct cd_list_entry ide_cd_quirks_list[] = {
-        /* Limit transfer size per interrupt. */
-        { "SAMSUNG CD-ROM SCR-2430", NULL,   IDE_AFLAG_LIMIT_NFRAMES         },
-        { "SAMSUNG CD-ROM SCR-2432", NULL,   IDE_AFLAG_LIMIT_NFRAMES         },
         /* SCR-3231 doesn't support the SET_CD_SPEED command. */
         { "SAMSUNG CD-ROM SCR-3231", NULL,   IDE_AFLAG_NO_SPEED_SELECT       },
         /* Old NEC260 (not R) was released before ATAPI 1.2 spec. */
@@ -1759,18 +1583,18 @@ static int ide_cdrom_setup(ide_drive_t *drive)
 {
         struct cdrom_info *cd = drive->driver_data;
         struct cdrom_device_info *cdi = &cd->devinfo;
+        struct request_queue *q = drive->queue;
         u16 *id = drive->id;
         char *fw_rev = (char *)&id[ATA_ID_FW_REV];
         int nslots;
 
         ide_debug_log(IDE_DBG_PROBE, "enter");
 
-        blk_queue_prep_rq(drive->queue, ide_cdrom_prep_fn);
-        blk_queue_dma_alignment(drive->queue, 31);
-        blk_queue_update_dma_pad(drive->queue, 15);
-        drive->queue->unplug_delay = (1 * HZ) / 1000;
-        if (!drive->queue->unplug_delay)
-                drive->queue->unplug_delay = 1;
+        blk_queue_prep_rq(q, ide_cdrom_prep_fn);
+        blk_queue_dma_alignment(q, 31);
+        blk_queue_update_dma_pad(q, 15);
+
+        q->unplug_delay = max((1 * HZ) / 1000, 1);
 
         drive->dev_flags |= IDE_DFLAG_MEDIA_CHANGED;
         drive->atapi_flags = IDE_AFLAG_NO_EJECT | ide_cd_flags(id);
@@ -1788,8 +1612,7 @@ static int ide_cdrom_setup(ide_drive_t *drive)
 
         nslots = ide_cdrom_probe_capabilities(drive);
 
-        /* set correct block size */
-        blk_queue_hardsect_size(drive->queue, CD_FRAMESIZE);
+        blk_queue_hardsect_size(q, CD_FRAMESIZE);
 
         if (ide_cdrom_register(drive, nslots)) {
                 printk(KERN_ERR PFX "%s: %s failed to register device with the"
@@ -1968,9 +1791,6 @@ static struct block_device_operations idecd_ops = {
 };
 
 /* module options */
-static char *ignore;
-module_param(ignore, charp, 0400);
-
 static unsigned long debug_mask;
 module_param(debug_mask, ulong, 0644);
 
@@ -1991,15 +1811,6 @@ static int ide_cd_probe(ide_drive_t *drive)
         if (drive->media != ide_cdrom && drive->media != ide_optical)
                 goto failed;
 
-        /* skip drives that we were told to ignore */
-        if (ignore != NULL) {
-                if (strstr(ignore, drive->name)) {
-                        printk(KERN_INFO PFX "ignoring drive %s\n",
-                                         drive->name);
-                        goto failed;
-                }
-        }
-
         drive->debug_mask = debug_mask;
         drive->irq_handler = cdrom_newpc_intr;
 
diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c
index ca934c8a1289..c998cf8e971a 100644
--- a/drivers/ide/ide-disk.c
+++ b/drivers/ide/ide-disk.c
@@ -227,7 +227,7 @@ static u64 idedisk_read_native_max_address(ide_drive_t *drive, int lba48)
         ide_no_data_taskfile(drive, &cmd);
 
         /* if OK, compute maximum address value */
-        if ((tf->status & 0x01) == 0)
+        if (!(tf->status & ATA_ERR))
                 addr = ide_get_lba_addr(tf, lba48) + 1;
 
         return addr;
@@ -267,7 +267,7 @@ static u64 idedisk_set_max_address(ide_drive_t *drive, u64 addr_req, int lba48)
         ide_no_data_taskfile(drive, &cmd);
 
         /* if OK, compute maximum address value */
-        if ((tf->status & 0x01) == 0)
+        if (!(tf->status & ATA_ERR))
                 addr_set = ide_get_lba_addr(tf, lba48) + 1;
 
         return addr_set;
diff --git a/drivers/ide/ide-dma-sff.c b/drivers/ide/ide-dma-sff.c
index 75a9ea2e4c82..16fc46edc32d 100644
--- a/drivers/ide/ide-dma-sff.c
+++ b/drivers/ide/ide-dma-sff.c
@@ -38,10 +38,9 @@ int config_drive_for_dma(ide_drive_t *drive)
          * Enable DMA on any drive that has mode2 DMA
          * (multi or single) enabled
          */
-        if (id[ATA_ID_FIELD_VALID] & 2) /* regular DMA */
-                if ((id[ATA_ID_MWDMA_MODES] & 0x404) == 0x404 ||
-                    (id[ATA_ID_SWDMA_MODES] & 0x404) == 0x404)
-                        return 1;
+        if ((id[ATA_ID_MWDMA_MODES] & 0x404) == 0x404 ||
+            (id[ATA_ID_SWDMA_MODES] & 0x404) == 0x404)
+                return 1;
 
         /* Consult the list of known "good" drives */
         if (ide_dma_good_drive(drive))
@@ -166,8 +165,6 @@ use_pio_instead:
         printk(KERN_ERR "%s: %s\n", drive->name,
                 count ? "DMA table too small" : "empty DMA table?");
 
-        ide_destroy_dmatable(drive);
-
         return 0; /* revert to PIO for this request */
 }
 EXPORT_SYMBOL_GPL(ide_build_dmatable);
@@ -218,7 +215,6 @@ int ide_dma_setup(ide_drive_t *drive, struct ide_cmd *cmd)
         /* clear INTR & ERROR flags */
         ide_dma_sff_write_status(hwif, dma_stat | ATA_DMA_ERR | ATA_DMA_INTR);
 
-        drive->waiting_for_dma = 1;
         return 0;
 }
 EXPORT_SYMBOL_GPL(ide_dma_setup);
@@ -292,8 +288,6 @@ int ide_dma_end(ide_drive_t *drive)
         ide_hwif_t *hwif = drive->hwif;
         u8 dma_stat = 0, dma_cmd = 0, mask;
 
-        drive->waiting_for_dma = 0;
-
         /* stop DMA */
         if (hwif->host_flags & IDE_HFLAG_MMIO) {
                 dma_cmd = readb((void __iomem *)(hwif->dma_base + ATA_DMA_CMD));
@@ -310,8 +304,6 @@ int ide_dma_end(ide_drive_t *drive)
         /* clear INTR & ERROR bits */
         ide_dma_sff_write_status(hwif, dma_stat | ATA_DMA_ERR | ATA_DMA_INTR);
 
-        /* purge DMA mappings */
-        ide_destroy_dmatable(drive);
         wmb();
 
         /* verify good DMA status */
@@ -338,9 +330,8 @@ const struct ide_dma_ops sff_dma_ops = {
         .dma_start              = ide_dma_start,
         .dma_end                = ide_dma_end,
         .dma_test_irq           = ide_dma_test_irq,
-        .dma_timer_expiry       = ide_dma_sff_timer_expiry,
-        .dma_timeout            = ide_dma_timeout,
         .dma_lost_irq           = ide_dma_lost_irq,
+        .dma_timer_expiry       = ide_dma_sff_timer_expiry,
         .dma_sff_read_status    = ide_dma_sff_read_status,
 };
 EXPORT_SYMBOL_GPL(sff_dma_ops);
diff --git a/drivers/ide/ide-dma.c b/drivers/ide/ide-dma.c
index 3dbf80c15491..a0b8cab1d9a6 100644
--- a/drivers/ide/ide-dma.c
+++ b/drivers/ide/ide-dma.c
@@ -89,15 +89,16 @@ static const struct drive_list_entry drive_blacklist[] = {
 ide_startstop_t ide_dma_intr(ide_drive_t *drive)
 {
         ide_hwif_t *hwif = drive->hwif;
+        struct ide_cmd *cmd = &hwif->cmd;
         u8 stat = 0, dma_stat = 0;
 
+        drive->waiting_for_dma = 0;
         dma_stat = hwif->dma_ops->dma_end(drive);
+        ide_dma_unmap_sg(drive, cmd);
         stat = hwif->tp_ops->read_status(hwif);
 
         if (OK_STAT(stat, DRIVE_READY, drive->bad_wstat | ATA_DRQ)) {
                 if (!dma_stat) {
-                        struct ide_cmd *cmd = &hwif->cmd;
-
                         if ((cmd->tf_flags & IDE_TFLAG_FS) == 0)
                                 ide_finish_cmd(drive, cmd, stat);
                         else
@@ -117,8 +118,8 @@ int ide_dma_good_drive(ide_drive_t *drive)
 }
 
 /**
- *      ide_build_sglist        -       map IDE scatter gather for DMA I/O
- *      @drive: the drive to build the DMA table for
+ *      ide_dma_map_sg  -       map IDE scatter gather for DMA I/O
+ *      @drive: the drive to map the DMA table for
  *      @cmd: command
  *
  *      Perform the DMA mapping magic necessary to access the source or
@@ -127,23 +128,19 @@ int ide_dma_good_drive(ide_drive_t *drive)
  *      operate in a portable fashion.
  */
 
-int ide_build_sglist(ide_drive_t *drive, struct ide_cmd *cmd)
+static int ide_dma_map_sg(ide_drive_t *drive, struct ide_cmd *cmd)
 {
         ide_hwif_t *hwif = drive->hwif;
         struct scatterlist *sg = hwif->sg_table;
         int i;
 
-        ide_map_sg(drive, cmd);
-
         if (cmd->tf_flags & IDE_TFLAG_WRITE)
                 cmd->sg_dma_direction = DMA_TO_DEVICE;
         else
                 cmd->sg_dma_direction = DMA_FROM_DEVICE;
 
         i = dma_map_sg(hwif->dev, sg, cmd->sg_nents, cmd->sg_dma_direction);
-        if (i == 0)
-                ide_map_sg(drive, cmd);
-        else {
+        if (i) {
                 cmd->orig_sg_nents = cmd->sg_nents;
                 cmd->sg_nents = i;
         }
@@ -152,7 +149,7 @@ int ide_build_sglist(ide_drive_t *drive, struct ide_cmd *cmd)
 }
 
 /**
- *      ide_destroy_dmatable    -       clean up DMA mapping
+ *      ide_dma_unmap_sg        -       clean up DMA mapping
  *      @drive: The drive to unmap
  *
  *      Teardown mappings after DMA has completed. This must be called
@@ -162,15 +159,14 @@ int ide_build_sglist(ide_drive_t *drive, struct ide_cmd *cmd)
  *      time.
  */
 
-void ide_destroy_dmatable(ide_drive_t *drive)
+void ide_dma_unmap_sg(ide_drive_t *drive, struct ide_cmd *cmd)
 {
         ide_hwif_t *hwif = drive->hwif;
-        struct ide_cmd *cmd = &hwif->cmd;
 
         dma_unmap_sg(hwif->dev, hwif->sg_table, cmd->orig_sg_nents,
                      cmd->sg_dma_direction);
 }
-EXPORT_SYMBOL_GPL(ide_destroy_dmatable);
+EXPORT_SYMBOL_GPL(ide_dma_unmap_sg);
 
 /**
  *      ide_dma_off_quietly     -       Generic DMA kill
@@ -249,12 +245,11 @@ static unsigned int ide_get_mode_mask(ide_drive_t *drive, u8 base, u8 req_mode)
         case XFER_UDMA_0:
                 if ((id[ATA_ID_FIELD_VALID] & 4) == 0)
                         break;
-
+                mask = id[ATA_ID_UDMA_MODES];
                 if (port_ops && port_ops->udma_filter)
-                        mask = port_ops->udma_filter(drive);
+                        mask &= port_ops->udma_filter(drive);
                 else
-                        mask = hwif->ultra_mask;
-                mask &= id[ATA_ID_UDMA_MODES];
+                        mask &= hwif->ultra_mask;
 
                 /*
                  * avoid false cable warning from eighty_ninty_three()
@@ -265,18 +260,23 @@ static unsigned int ide_get_mode_mask(ide_drive_t *drive, u8 base, u8 req_mode)
                 }
                 break;
         case XFER_MW_DMA_0:
-                if ((id[ATA_ID_FIELD_VALID] & 2) == 0)
-                        break;
+                mask = id[ATA_ID_MWDMA_MODES];
+
+                /* Also look for the CF specific MWDMA modes... */
+                if (ata_id_is_cfa(id) && (id[ATA_ID_CFA_MODES] & 0x38)) {
+                        u8 mode = ((id[ATA_ID_CFA_MODES] & 0x38) >> 3) - 1;
+
+                        mask |= ((2 << mode) - 1) << 3;
+                }
+
                 if (port_ops && port_ops->mdma_filter)
-                        mask = port_ops->mdma_filter(drive);
+                        mask &= port_ops->mdma_filter(drive);
                 else
-                        mask = hwif->mwdma_mask;
-                mask &= id[ATA_ID_MWDMA_MODES];
+                        mask &= hwif->mwdma_mask;
                 break;
         case XFER_SW_DMA_0:
-                if (id[ATA_ID_FIELD_VALID] & 2) {
-                        mask = id[ATA_ID_SWDMA_MODES] & hwif->swdma_mask;
-                } else if (id[ATA_ID_OLD_DMA_MODES] >> 8) {
+                mask = id[ATA_ID_SWDMA_MODES];
+                if (!(mask & ATA_SWDMA2) && (id[ATA_ID_OLD_DMA_MODES] >> 8)) {
                         u8 mode = id[ATA_ID_OLD_DMA_MODES] >> 8;
 
                         /*
@@ -284,8 +284,9 @@ static unsigned int ide_get_mode_mask(ide_drive_t *drive, u8 base, u8 req_mode)
                          * (the maximum allowed mode is XFER_SW_DMA_2)
                          */
                         if (mode <= 2)
-                                mask = ((2 << mode) - 1) & hwif->swdma_mask;
+                                mask = (2 << mode) - 1;
                 }
+                mask &= hwif->swdma_mask;
                 break;
         default:
                 BUG();
@@ -402,11 +403,10 @@ int ide_id_dma_bug(ide_drive_t *drive)
                 if ((id[ATA_ID_UDMA_MODES] >> 8) &&
                     (id[ATA_ID_MWDMA_MODES] >> 8))
                         goto err_out;
-        } else if (id[ATA_ID_FIELD_VALID] & 2) {
-                if ((id[ATA_ID_MWDMA_MODES] >> 8) &&
-                    (id[ATA_ID_SWDMA_MODES] >> 8))
-                        goto err_out;
-        }
+        } else if ((id[ATA_ID_MWDMA_MODES] >> 8) &&
+                   (id[ATA_ID_SWDMA_MODES] >> 8))
+                goto err_out;
+
         return 0;
 err_out:
         printk(KERN_ERR "%s: bad DMA info in identify block\n", drive->name);
@@ -460,21 +460,6 @@ void ide_dma_lost_irq(ide_drive_t *drive)
 }
 EXPORT_SYMBOL_GPL(ide_dma_lost_irq);
 
-void ide_dma_timeout(ide_drive_t *drive)
-{
-        ide_hwif_t *hwif = drive->hwif;
-
-        printk(KERN_ERR "%s: timeout waiting for DMA\n", drive->name);
-
-        if (hwif->dma_ops->dma_test_irq(drive))
-                return;
-
-        ide_dump_status(drive, "DMA timeout", hwif->tp_ops->read_status(hwif));
-
-        hwif->dma_ops->dma_end(drive);
-}
-EXPORT_SYMBOL_GPL(ide_dma_timeout);
-
 /*
  * un-busy the port etc, and clear any pending DMA status. we want to
  * retry the current request in pio mode instead of risking tossing it
@@ -483,6 +468,8 @@ EXPORT_SYMBOL_GPL(ide_dma_timeout);
 ide_startstop_t ide_dma_timeout_retry(ide_drive_t *drive, int error)
 {
         ide_hwif_t *hwif = drive->hwif;
+        const struct ide_dma_ops *dma_ops = hwif->dma_ops;
+        struct ide_cmd *cmd = &hwif->cmd;
         struct request *rq;
         ide_startstop_t ret = ide_stopped;
 
@@ -492,12 +479,23 @@ ide_startstop_t ide_dma_timeout_retry(ide_drive_t *drive, int error)
 
         if (error < 0) {
                 printk(KERN_WARNING "%s: DMA timeout error\n", drive->name);
-                (void)hwif->dma_ops->dma_end(drive);
+                drive->waiting_for_dma = 0;
+                (void)dma_ops->dma_end(drive);
+                ide_dma_unmap_sg(drive, cmd);
                 ret = ide_error(drive, "dma timeout error",
                                 hwif->tp_ops->read_status(hwif));
         } else {
                 printk(KERN_WARNING "%s: DMA timeout retry\n", drive->name);
-                hwif->dma_ops->dma_timeout(drive);
+                if (dma_ops->dma_clear)
+                        dma_ops->dma_clear(drive);
+                printk(KERN_ERR "%s: timeout waiting for DMA\n", drive->name);
+                if (dma_ops->dma_test_irq(drive) == 0) {
+                        ide_dump_status(drive, "DMA timeout",
+                                        hwif->tp_ops->read_status(hwif));
+                        drive->waiting_for_dma = 0;
+                        (void)dma_ops->dma_end(drive);
+                        ide_dma_unmap_sg(drive, cmd);
+                }
         }
 
         /*
@@ -567,3 +565,25 @@ int ide_allocate_dma_engine(ide_hwif_t *hwif)
         return 0;
 }
 EXPORT_SYMBOL_GPL(ide_allocate_dma_engine);
+
+int ide_dma_prepare(ide_drive_t *drive, struct ide_cmd *cmd)
+{
+        const struct ide_dma_ops *dma_ops = drive->hwif->dma_ops;
+
+        if ((drive->dev_flags & IDE_DFLAG_USING_DMA) == 0 ||
+            (dma_ops->dma_check && dma_ops->dma_check(drive, cmd)))
+                goto out;
+        ide_map_sg(drive, cmd);
+        if (ide_dma_map_sg(drive, cmd) == 0)
+                goto out_map;
+        if (dma_ops->dma_setup(drive, cmd))
+                goto out_dma_unmap;
+        drive->waiting_for_dma = 1;
+        return 0;
+out_dma_unmap:
+        ide_dma_unmap_sg(drive, cmd);
+out_map:
+        ide_map_sg(drive, cmd);
+out:
+        return 1;
+}
diff --git a/drivers/ide/ide-eh.c b/drivers/ide/ide-eh.c
index 11664976eea3..5d5fb961b5ce 100644
--- a/drivers/ide/ide-eh.c
+++ b/drivers/ide/ide-eh.c
@@ -165,11 +165,12 @@ static ide_startstop_t do_reset1(ide_drive_t *, int);
 static ide_startstop_t atapi_reset_pollfunc(ide_drive_t *drive)
 {
         ide_hwif_t *hwif = drive->hwif;
+        const struct ide_tp_ops *tp_ops = hwif->tp_ops;
         u8 stat;
 
-        SELECT_DRIVE(drive);
+        tp_ops->dev_select(drive);
         udelay(10);
-        stat = hwif->tp_ops->read_status(hwif);
+        stat = tp_ops->read_status(hwif);
 
         if (OK_STAT(stat, 0, ATA_BUSY))
                 printk(KERN_INFO "%s: ATAPI reset complete\n", drive->name);
@@ -348,7 +349,7 @@ static ide_startstop_t do_reset1(ide_drive_t *drive, int do_not_try_atapi)
         /* For an ATAPI device, first try an ATAPI SRST. */
         if (drive->media != ide_disk && !do_not_try_atapi) {
                 pre_reset(drive);
-                SELECT_DRIVE(drive);
+                tp_ops->dev_select(drive);
                 udelay(20);
                 tp_ops->exec_command(hwif, ATA_CMD_DEV_RESET);
                 ndelay(400);
@@ -401,15 +402,14 @@ static ide_startstop_t do_reset1(ide_drive_t *drive, int do_not_try_atapi)
          * immediate interrupt due to the edge transition it produces.
          * This single interrupt gives us a "fast poll" for drives that
          * recover from reset very quickly, saving us the first 50ms wait time.
-         *
-         * TODO: add ->softreset method and stop abusing ->set_irq
          */
         /* set SRST and nIEN */
-        tp_ops->set_irq(hwif, 4);
+        tp_ops->write_devctl(hwif, ATA_SRST | ATA_NIEN | ATA_DEVCTL_OBS);
         /* more than enough time */
         udelay(10);
         /* clear SRST, leave nIEN (unless device is on the quirk list) */
-        tp_ops->set_irq(hwif, drive->quirk_list == 2);
+        tp_ops->write_devctl(hwif, (drive->quirk_list == 2 ? 0 : ATA_NIEN) |
+                             ATA_DEVCTL_OBS);
         /* more than enough time */
         udelay(10);
         hwif->poll_timeout = jiffies + WAIT_WORSTCASE;
diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c
index 7ae662334835..2b4868d95f8b 100644
--- a/drivers/ide/ide-floppy.c
+++ b/drivers/ide/ide-floppy.c
@@ -61,16 +61,6 @@
  */
 #define IDEFLOPPY_PC_DELAY      (HZ/20) /* default delay for ZIP 100 (50ms) */
 
-static void idefloppy_update_buffers(ide_drive_t *drive,
-                                struct ide_atapi_pc *pc)
-{
-        struct request *rq = pc->rq;
-        struct bio *bio = rq->bio;
-
-        while ((bio = rq->bio) != NULL)
-                ide_complete_rq(drive, 0, ide_rq_bytes(rq));
-}
-
 static int ide_floppy_callback(ide_drive_t *drive, int dsc)
 {
         struct ide_disk_obj *floppy = drive->driver_data;
@@ -213,7 +203,6 @@ static void idefloppy_create_rw_cmd(ide_drive_t *drive,
         memcpy(rq->cmd, pc->c, 12);
 
         pc->rq = rq;
-        pc->b_count = 0;
         if (rq->cmd_flags & REQ_RW)
                 pc->flags |= PC_FLAG_WRITING;
         pc->buf = NULL;
@@ -227,7 +216,6 @@ static void idefloppy_blockpc_cmd(struct ide_disk_obj *floppy,
         ide_init_pc(pc);
         memcpy(pc->c, rq->cmd, sizeof(pc->c));
         pc->rq = rq;
-        pc->b_count = 0;
         if (rq->data_len && rq_data_dir(rq) == WRITE)
                 pc->flags |= PC_FLAG_WRITING;
         pc->buf = rq->data;
@@ -244,10 +232,11 @@ static ide_startstop_t ide_floppy_do_request(ide_drive_t *drive,
                                              struct request *rq, sector_t block)
 {
         struct ide_disk_obj *floppy = drive->driver_data;
-        ide_hwif_t *hwif = drive->hwif;
         struct ide_cmd cmd;
         struct ide_atapi_pc *pc;
 
+        ide_debug_log(IDE_DBG_FUNC, "enter, cmd: 0x%x\n", rq->cmd[0]);
+
         if (drive->debug_mask & IDE_DBG_RQ)
                 blk_dump_rq_flags(rq, (rq->rq_disk
                                         ? rq->rq_disk->disk_name
@@ -294,13 +283,10 @@ static ide_startstop_t ide_floppy_do_request(ide_drive_t *drive,
         cmd.rq = rq;
 
         if (blk_fs_request(rq) || pc->req_xfer) {
-                ide_init_sg_cmd(&cmd, rq->nr_sectors << 9);
+                ide_init_sg_cmd(&cmd, pc->req_xfer);
                 ide_map_sg(drive, &cmd);
         }
 
-        pc->sg = hwif->sg_table;
-        pc->sg_cnt = cmd.sg_nents;
-
         pc->rq = rq;
 
         return ide_floppy_issue_pc(drive, &cmd, pc);
@@ -385,9 +371,11 @@ static int ide_floppy_get_capacity(ide_drive_t *drive)
         struct gendisk *disk = floppy->disk;
         struct ide_atapi_pc pc;
         u8 *cap_desc;
-        u8 header_len, desc_cnt;
+        u8 pc_buf[256], header_len, desc_cnt;
         int i, rc = 1, blocks, length;
 
+        ide_debug_log(IDE_DBG_FUNC, "enter");
+
         drive->bios_cyl = 0;
         drive->bios_head = drive->bios_sect = 0;
         floppy->blocks = 0;
@@ -395,6 +383,9 @@ static int ide_floppy_get_capacity(ide_drive_t *drive)
         drive->capacity64 = 0;
 
         ide_floppy_create_read_capacity_cmd(&pc);
+        pc.buf = &pc_buf[0];
+        pc.buf_size = sizeof(pc_buf);
+
         if (ide_queue_pc_tail(drive, disk, &pc)) {
                 printk(KERN_ERR PFX "Can't get floppy parameters\n");
                 return 1;
@@ -485,8 +476,6 @@ static void ide_floppy_setup(ide_drive_t *drive)
         u16 *id = drive->id;
 
         drive->pc_callback       = ide_floppy_callback;
-        drive->pc_update_buffers = idefloppy_update_buffers;
-        drive->pc_io_buffers     = ide_io_buffers;
 
         /*
          * We used to check revisions here. At this point however I'm giving up.
diff --git a/drivers/ide/ide-floppy_ioctl.c b/drivers/ide/ide-floppy_ioctl.c
index 8f8be8546038..cd8a42027ede 100644
--- a/drivers/ide/ide-floppy_ioctl.c
+++ b/drivers/ide/ide-floppy_ioctl.c
@@ -36,9 +36,9 @@ static int ide_floppy_get_format_capacities(ide_drive_t *drive,
                                             int __user *arg)
 {
         struct ide_disk_obj *floppy = drive->driver_data;
-        u8 header_len, desc_cnt;
         int i, blocks, length, u_array_size, u_index;
         int __user *argp;
+        u8 pc_buf[256], header_len, desc_cnt;
 
         if (get_user(u_array_size, arg))
                 return -EFAULT;
@@ -47,6 +47,9 @@ static int ide_floppy_get_format_capacities(ide_drive_t *drive,
                 return -EINVAL;
 
         ide_floppy_create_read_capacity_cmd(pc);
+        pc->buf = &pc_buf[0];
+        pc->buf_size = sizeof(pc_buf);
+
         if (ide_queue_pc_tail(drive, floppy->disk, pc)) {
                 printk(KERN_ERR "ide-floppy: Can't get floppy parameters\n");
                 return -EIO;
diff --git a/drivers/ide/ide-generic.c b/drivers/ide/ide-generic.c
index 9d03e8211536..7812ca0be13b 100644
--- a/drivers/ide/ide-generic.c
+++ b/drivers/ide/ide-generic.c
@@ -1,27 +1,22 @@
 /*
  * generic/default IDE host driver
  *
- * Copyright (C) 2004, 2008 Bartlomiej Zolnierkiewicz
+ * Copyright (C) 2004, 2008-2009 Bartlomiej Zolnierkiewicz
  * This code was split off from ide.c.  See it for original copyrights.
  *
  * May be copied or modified under the terms of the GNU General Public License.
  */
 
-/*
- * For special cases new interfaces may be added using sysfs, i.e.
- *
- *      echo -n "0x168:0x36e:10" > /sys/class/ide_generic/add
- *
- * will add an interface using I/O ports 0x168-0x16f/0x36e and IRQ 10.
- */
-
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/ide.h>
 #include <linux/pci_ids.h>
 
-/* FIXME: convert m32r to use ide_platform host driver */
+/* FIXME: convert arm and m32r to use ide_platform host driver */
+#ifdef CONFIG_ARM
+#include <asm/irq.h>
+#endif
 #ifdef CONFIG_M32R
 #include <asm/m32r.h>
 #endif
@@ -36,62 +31,11 @@ static const struct ide_port_info ide_generic_port_info = {
         .host_flags             = IDE_HFLAG_NO_DMA,
 };
 
-static ssize_t store_add(struct class *cls, const char *buf, size_t n)
-{
-        unsigned int base, ctl;
-        int irq, rc;
-        hw_regs_t hw, *hws[] = { &hw, NULL, NULL, NULL };
-
-        if (sscanf(buf, "%x:%x:%d", &base, &ctl, &irq) != 3)
-                return -EINVAL;
-
-        memset(&hw, 0, sizeof(hw));
-        ide_std_init_ports(&hw, base, ctl);
-        hw.irq = irq;
-        hw.chipset = ide_generic;
-
-        rc = ide_host_add(&ide_generic_port_info, hws, NULL);
-        if (rc)
-                return rc;
-
-        return n;
-};
-
-static struct class_attribute ide_generic_class_attrs[] = {
-        __ATTR(add, S_IWUSR, NULL, store_add),
-        __ATTR_NULL
-};
-
-static void ide_generic_class_release(struct class *cls)
-{
-        kfree(cls);
-}
-
-static int __init ide_generic_sysfs_init(void)
-{
-        struct class *cls;
-        int rc;
-
-        cls = kzalloc(sizeof(*cls), GFP_KERNEL);
-        if (!cls)
-                return -ENOMEM;
-
-        cls->name = DRV_NAME;
-        cls->owner = THIS_MODULE;
-        cls->class_release = ide_generic_class_release;
-        cls->class_attrs = ide_generic_class_attrs;
-
-        rc = class_register(cls);
-        if (rc) {
-                kfree(cls);
-                return rc;
-        }
-
-        return 0;
-}
-
-#if defined(CONFIG_PLAT_M32700UT) || defined(CONFIG_PLAT_MAPPI2) \
-        || defined(CONFIG_PLAT_OPSPUT)
+#ifdef CONFIG_ARM
+static const u16 legacy_bases[] = { 0x1f0 };
+static const int legacy_irqs[]  = { IRQ_HARDDISK };
+#elif defined(CONFIG_PLAT_M32700UT) || defined(CONFIG_PLAT_MAPPI2) || \
+      defined(CONFIG_PLAT_OPSPUT)
 static const u16 legacy_bases[] = { 0x1f0 };
 static const int legacy_irqs[]  = { PLD_IRQ_CFIREQ };
 #elif defined(CONFIG_PLAT_MAPPI3)
@@ -107,11 +51,11 @@ static const int legacy_irqs[]  = { 14, 15, 11, 10, 8, 12 };
 
 static void ide_generic_check_pci_legacy_iobases(int *primary, int *secondary)
 {
+#ifdef CONFIG_PCI
         struct pci_dev *p = NULL;
         u16 val;
 
         for_each_pci_dev(p) {
-
                 if (pci_resource_start(p, 0) == 0x1f0)
                         *primary = 1;
                 if (pci_resource_start(p, 2) == 0x170)
@@ -126,7 +70,6 @@ static void ide_generic_check_pci_legacy_iobases(int *primary, int *secondary)
                 /* Intel MPIIX - PIO ATA on non PCI side of bridge */
                 if (p->vendor == PCI_VENDOR_ID_INTEL &&
                     p->device == PCI_DEVICE_ID_INTEL_82371MX) {
-
                         pci_read_config_word(p, 0x6C, &val);
                         if (val & 0x8000) {
                                 /* ATA port enabled */
@@ -137,6 +80,7 @@ static void ide_generic_check_pci_legacy_iobases(int *primary, int *secondary)
                         }
                 }
         }
+#endif
 }
 
 static int __init ide_generic_init(void)
@@ -168,6 +112,7 @@ static int __init ide_generic_init(void)
                                 printk(KERN_ERR "%s: I/O resource 0x%lX-0x%lX "
                                                 "not free.\n",
                                                 DRV_NAME, io_addr, io_addr + 7);
+                                rc = -EBUSY;
                                 continue;
                         }
 
@@ -176,6 +121,7 @@ static int __init ide_generic_init(void)
                                                 "not free.\n",
                                                 DRV_NAME, io_addr + 0x206);
                                 release_region(io_addr, 8);
+                                rc = -EBUSY;
                                 continue;
                         }
 
@@ -196,10 +142,6 @@ static int __init ide_generic_init(void)
                 }
         }
 
-        if (ide_generic_sysfs_init())
-                printk(KERN_ERR DRV_NAME ": failed to create ide_generic "
-                                         "class\n");
-
         return rc;
 }
 
diff --git a/drivers/ide/ide-h8300.c b/drivers/ide/ide-h8300.c
index ff8339ed59ab..dac9a6d44963 100644
--- a/drivers/ide/ide-h8300.c
+++ b/drivers/ide/ide-h8300.c
@@ -54,9 +54,6 @@ static void h8300_tf_load(ide_drive_t *drive, struct ide_cmd *cmd)
         if (cmd->ftf_flags & IDE_FTFLAG_FLAGGED)
                 HIHI = 0xFF;
 
-        if (cmd->ftf_flags & IDE_FTFLAG_OUT_DATA)
-                mm_outw((tf->hob_data << 8) | tf->data, io_ports->data_addr);
-
         if (cmd->tf_flags & IDE_TFLAG_OUT_HOB_FEATURE)
                 outb(tf->hob_feature, io_ports->feature_addr);
         if (cmd->tf_flags & IDE_TFLAG_OUT_HOB_NSECT)
@@ -90,18 +87,11 @@ static void h8300_tf_read(ide_drive_t *drive, struct ide_cmd *cmd)
         struct ide_io_ports *io_ports = &hwif->io_ports;
         struct ide_taskfile *tf = &cmd->tf;
 
-        if (cmd->ftf_flags & IDE_FTFLAG_IN_DATA) {
-                u16 data = mm_inw(io_ports->data_addr);
-
-                tf->data = data & 0xff;
-                tf->hob_data = (data >> 8) & 0xff;
-        }
-
         /* be sure we're looking at the low order bits */
-        outb(ATA_DEVCTL_OBS & ~0x80, io_ports->ctl_addr);
+        outb(ATA_DEVCTL_OBS, io_ports->ctl_addr);
 
-        if (cmd->tf_flags & IDE_TFLAG_IN_FEATURE)
-                tf->feature = inb(io_ports->feature_addr);
+        if (cmd->tf_flags & IDE_TFLAG_IN_ERROR)
+                tf->error  = inb(io_ports->feature_addr);
         if (cmd->tf_flags & IDE_TFLAG_IN_NSECT)
                 tf->nsect  = inb(io_ports->nsect_addr);
         if (cmd->tf_flags & IDE_TFLAG_IN_LBAL)
@@ -114,18 +104,18 @@ static void h8300_tf_read(ide_drive_t *drive, struct ide_cmd *cmd)
                 tf->device = inb(io_ports->device_addr);
 
         if (cmd->tf_flags & IDE_TFLAG_LBA48) {
-                outb(ATA_DEVCTL_OBS | 0x80, io_ports->ctl_addr);
+                outb(ATA_HOB | ATA_DEVCTL_OBS, io_ports->ctl_addr);
 
-                if (cmd->tf_flags & IDE_TFLAG_IN_HOB_FEATURE)
-                        tf->hob_feature = inb(io_ports->feature_addr);
+                if (cmd->tf_flags & IDE_TFLAG_IN_HOB_ERROR)
+                        tf->hob_error = inb(io_ports->feature_addr);
                 if (cmd->tf_flags & IDE_TFLAG_IN_HOB_NSECT)
-                        tf->hob_nsect   = inb(io_ports->nsect_addr);
+                        tf->hob_nsect = inb(io_ports->nsect_addr);
                 if (cmd->tf_flags & IDE_TFLAG_IN_HOB_LBAL)
-                        tf->hob_lbal    = inb(io_ports->lbal_addr);
+                        tf->hob_lbal  = inb(io_ports->lbal_addr);
                 if (cmd->tf_flags & IDE_TFLAG_IN_HOB_LBAM)
-                        tf->hob_lbam    = inb(io_ports->lbam_addr);
+                        tf->hob_lbam  = inb(io_ports->lbam_addr);
                 if (cmd->tf_flags & IDE_TFLAG_IN_HOB_LBAH)
-                        tf->hob_lbah    = inb(io_ports->lbah_addr);
+                        tf->hob_lbah  = inb(io_ports->lbah_addr);
         }
 }
 
@@ -159,9 +149,9 @@ static const struct ide_tp_ops h8300_tp_ops = {
         .exec_command           = ide_exec_command,
         .read_status            = ide_read_status,
         .read_altstatus         = ide_read_altstatus,
+        .write_devctl           = ide_write_devctl,
 
-        .set_irq                = ide_set_irq,
-
+        .dev_select             = ide_dev_select,
         .tf_load                = h8300_tf_load,
         .tf_read                = h8300_tf_read,
 
diff --git a/drivers/ide/ide-io-std.c b/drivers/ide/ide-io-std.c
index 2d9c6dc3f956..9cac281d82c4 100644
--- a/drivers/ide/ide-io-std.c
+++ b/drivers/ide/ide-io-std.c
@@ -64,23 +64,26 @@ u8 ide_read_altstatus(ide_hwif_t *hwif)
 }
 EXPORT_SYMBOL_GPL(ide_read_altstatus);
 
-void ide_set_irq(ide_hwif_t *hwif, int on)
+void ide_write_devctl(ide_hwif_t *hwif, u8 ctl)
 {
-        u8 ctl = ATA_DEVCTL_OBS;
-
-        if (on == 4) { /* hack for SRST */
-                ctl |= 4;
-                on &= ~4;
-        }
-
-        ctl |= on ? 0 : 2;
-
         if (hwif->host_flags & IDE_HFLAG_MMIO)
                 writeb(ctl, (void __iomem *)hwif->io_ports.ctl_addr);
         else
                 outb(ctl, hwif->io_ports.ctl_addr);
 }
-EXPORT_SYMBOL_GPL(ide_set_irq);
+EXPORT_SYMBOL_GPL(ide_write_devctl);
+
+void ide_dev_select(ide_drive_t *drive)
+{
+        ide_hwif_t *hwif = drive->hwif;
+        u8 select = drive->select | ATA_DEVICE_OBS;
+
+        if (hwif->host_flags & IDE_HFLAG_MMIO)
+                writeb(select, (void __iomem *)hwif->io_ports.device_addr);
+        else
+                outb(select, hwif->io_ports.device_addr);
+}
+EXPORT_SYMBOL_GPL(ide_dev_select);
 
 void ide_tf_load(ide_drive_t *drive, struct ide_cmd *cmd)
 {
@@ -99,15 +102,6 @@ void ide_tf_load(ide_drive_t *drive, struct ide_cmd *cmd)
         if (cmd->ftf_flags & IDE_FTFLAG_FLAGGED)
                 HIHI = 0xFF;
 
-        if (cmd->ftf_flags & IDE_FTFLAG_OUT_DATA) {
-                u16 data = (tf->hob_data << 8) | tf->data;
-
-                if (mmio)
-                        writew(data, (void __iomem *)io_ports->data_addr);
-                else
-                        outw(data, io_ports->data_addr);
-        }
-
         if (cmd->tf_flags & IDE_TFLAG_OUT_HOB_FEATURE)
                 tf_outb(tf->hob_feature, io_ports->feature_addr);
         if (cmd->tf_flags & IDE_TFLAG_OUT_HOB_NSECT)
@@ -153,23 +147,11 @@ void ide_tf_read(ide_drive_t *drive, struct ide_cmd *cmd)
                 tf_inb  = ide_inb;
         }
 
-        if (cmd->ftf_flags & IDE_FTFLAG_IN_DATA) {
-                u16 data;
-
-                if (mmio)
-                        data = readw((void __iomem *)io_ports->data_addr);
-                else
-                        data = inw(io_ports->data_addr);
-
-                tf->data = data & 0xff;
-                tf->hob_data = (data >> 8) & 0xff;
-        }
-
         /* be sure we're looking at the low order bits */
-        tf_outb(ATA_DEVCTL_OBS & ~0x80, io_ports->ctl_addr);
+        tf_outb(ATA_DEVCTL_OBS, io_ports->ctl_addr);
 
-        if (cmd->tf_flags & IDE_TFLAG_IN_FEATURE)
-                tf->feature = tf_inb(io_ports->feature_addr);
+        if (cmd->tf_flags & IDE_TFLAG_IN_ERROR)
+                tf->error  = tf_inb(io_ports->feature_addr);
         if (cmd->tf_flags & IDE_TFLAG_IN_NSECT)
                 tf->nsect  = tf_inb(io_ports->nsect_addr);
         if (cmd->tf_flags & IDE_TFLAG_IN_LBAL)
@@ -182,18 +164,18 @@ void ide_tf_read(ide_drive_t *drive, struct ide_cmd *cmd)
                 tf->device = tf_inb(io_ports->device_addr);
 
         if (cmd->tf_flags & IDE_TFLAG_LBA48) {
-                tf_outb(ATA_DEVCTL_OBS | 0x80, io_ports->ctl_addr);
+                tf_outb(ATA_HOB | ATA_DEVCTL_OBS, io_ports->ctl_addr);
 
-                if (cmd->tf_flags & IDE_TFLAG_IN_HOB_FEATURE)
-                        tf->hob_feature = tf_inb(io_ports->feature_addr);
+                if (cmd->tf_flags & IDE_TFLAG_IN_HOB_ERROR)
+                        tf->hob_error = tf_inb(io_ports->feature_addr);
                 if (cmd->tf_flags & IDE_TFLAG_IN_HOB_NSECT)
-                        tf->hob_nsect   = tf_inb(io_ports->nsect_addr);
+                        tf->hob_nsect = tf_inb(io_ports->nsect_addr);
                 if (cmd->tf_flags & IDE_TFLAG_IN_HOB_LBAL)
-                        tf->hob_lbal    = tf_inb(io_ports->lbal_addr);
+                        tf->hob_lbal  = tf_inb(io_ports->lbal_addr);
                 if (cmd->tf_flags & IDE_TFLAG_IN_HOB_LBAM)
-                        tf->hob_lbam    = tf_inb(io_ports->lbam_addr);
+                        tf->hob_lbam  = tf_inb(io_ports->lbam_addr);
                 if (cmd->tf_flags & IDE_TFLAG_IN_HOB_LBAH)
-                        tf->hob_lbah    = tf_inb(io_ports->lbah_addr);
+                        tf->hob_lbah  = tf_inb(io_ports->lbah_addr);
         }
 }
 EXPORT_SYMBOL_GPL(ide_tf_read);
@@ -225,11 +207,10 @@ void ide_input_data(ide_drive_t *drive, struct ide_cmd *cmd, void *buf,
         ide_hwif_t *hwif = drive->hwif;
         struct ide_io_ports *io_ports = &hwif->io_ports;
         unsigned long data_addr = io_ports->data_addr;
+        unsigned int words = (len + 1) >> 1;
         u8 io_32bit = drive->io_32bit;
         u8 mmio = (hwif->host_flags & IDE_HFLAG_MMIO) ? 1 : 0;
 
-        len++;
-
         if (io_32bit) {
                 unsigned long uninitialized_var(flags);
 
@@ -238,27 +219,26 @@ void ide_input_data(ide_drive_t *drive, struct ide_cmd *cmd, void *buf,
                         ata_vlb_sync(io_ports->nsect_addr);
                 }
 
+                words >>= 1;
                 if (mmio)
-                        __ide_mm_insl((void __iomem *)data_addr, buf, len / 4);
+                        __ide_mm_insl((void __iomem *)data_addr, buf, words);
                 else
-                        insl(data_addr, buf, len / 4);
+                        insl(data_addr, buf, words);
 
                 if ((io_32bit & 2) && !mmio)
                         local_irq_restore(flags);
 
-                if ((len & 3) >= 2) {
-                        if (mmio)
-                                __ide_mm_insw((void __iomem *)data_addr,
-                                                (u8 *)buf + (len & ~3), 1);
-                        else
-                                insw(data_addr, (u8 *)buf + (len & ~3), 1);
-                }
-        } else {
-                if (mmio)
-                        __ide_mm_insw((void __iomem *)data_addr, buf, len / 2);
-                else
-                        insw(data_addr, buf, len / 2);
+                if (((len + 1) & 3) < 2)
+                        return;
+
+                buf += len & ~3;
+                words = 1;
         }
+
+        if (mmio)
+                __ide_mm_insw((void __iomem *)data_addr, buf, words);
+        else
+                insw(data_addr, buf, words);
 }
 EXPORT_SYMBOL_GPL(ide_input_data);
 
@@ -271,11 +251,10 @@ void ide_output_data(ide_drive_t *drive, struct ide_cmd *cmd, void *buf,
         ide_hwif_t *hwif = drive->hwif;
         struct ide_io_ports *io_ports = &hwif->io_ports;
         unsigned long data_addr = io_ports->data_addr;
+        unsigned int words = (len + 1) >> 1;
         u8 io_32bit = drive->io_32bit;
         u8 mmio = (hwif->host_flags & IDE_HFLAG_MMIO) ? 1 : 0;
 
-        len++;
-
         if (io_32bit) {
                 unsigned long uninitialized_var(flags);
 
@@ -284,27 +263,26 @@ void ide_output_data(ide_drive_t *drive, struct ide_cmd *cmd, void *buf,
                         ata_vlb_sync(io_ports->nsect_addr);
                 }
 
+                words >>= 1;
                 if (mmio)
-                        __ide_mm_outsl((void __iomem *)data_addr, buf, len / 4);
+                        __ide_mm_outsl((void __iomem *)data_addr, buf, words);
                 else
-                        outsl(data_addr, buf, len / 4);
+                        outsl(data_addr, buf, words);
 
                 if ((io_32bit & 2) && !mmio)
                         local_irq_restore(flags);
 
-                if ((len & 3) >= 2) {
-                        if (mmio)
-                                __ide_mm_outsw((void __iomem *)data_addr,
-                                                 (u8 *)buf + (len & ~3), 1);
-                        else
-                                outsw(data_addr, (u8 *)buf + (len & ~3), 1);
-                }
-        } else {
-                if (mmio)
-                        __ide_mm_outsw((void __iomem *)data_addr, buf, len / 2);
-                else
-                        outsw(data_addr, buf, len / 2);
+                if (((len + 1) & 3) < 2)
+                        return;
+
+                buf += len & ~3;
+                words = 1;
         }
+
+        if (mmio)
+                __ide_mm_outsw((void __iomem *)data_addr, buf, words);
+        else
+                outsw(data_addr, buf, words);
 }
 EXPORT_SYMBOL_GPL(ide_output_data);
 
@@ -312,9 +290,9 @@ const struct ide_tp_ops default_tp_ops = {
         .exec_command           = ide_exec_command,
         .read_status            = ide_read_status,
         .read_altstatus         = ide_read_altstatus,
+        .write_devctl           = ide_write_devctl,
 
-        .set_irq                = ide_set_irq,
-
+        .dev_select             = ide_dev_select,
         .tf_load                = ide_tf_load,
         .tf_read                = ide_tf_read,
 
diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
index 1adc5e2e7fb3..1deb6d29b186 100644
--- a/drivers/ide/ide-io.c
+++ b/drivers/ide/ide-io.c
@@ -73,6 +73,7 @@ EXPORT_SYMBOL_GPL(ide_end_rq);
 
 void ide_complete_cmd(ide_drive_t *drive, struct ide_cmd *cmd, u8 stat, u8 err)
 {
+        const struct ide_tp_ops *tp_ops = drive->hwif->tp_ops;
         struct ide_taskfile *tf = &cmd->tf;
         struct request *rq = cmd->rq;
         u8 tf_cmd = tf->command;
@@ -80,7 +81,16 @@ void ide_complete_cmd(ide_drive_t *drive, struct ide_cmd *cmd, u8 stat, u8 err)
         tf->error = err;
         tf->status = stat;
 
-        drive->hwif->tp_ops->tf_read(drive, cmd);
+        if (cmd->ftf_flags & IDE_FTFLAG_IN_DATA) {
+                u8 data[2];
+
+                tp_ops->input_data(drive, cmd, data, 2);
+
+                tf->data = data[0];
+                tf->hob_data = data[1];
+        }
+
+        tp_ops->tf_read(drive, cmd);
 
         if ((cmd->tf_flags & IDE_TFLAG_CUSTOM_HANDLER) &&
             tf_cmd == ATA_CMD_IDLEIMMEDIATE) {
@@ -338,7 +348,7 @@ static ide_startstop_t start_request (ide_drive_t *drive, struct request *rq)
         if (blk_pm_request(rq))
                 ide_check_pm_state(drive, rq);
 
-        SELECT_DRIVE(drive);
+        drive->hwif->tp_ops->dev_select(drive);
         if (ide_wait_stat(&startstop, drive, drive->ready_stat,
                           ATA_BUSY | ATA_DRQ, WAIT_READY)) {
                 printk(KERN_ERR "%s: drive not ready for command\n", drive->name);
@@ -481,11 +491,10 @@ repeat:
                 prev_port = hwif->host->cur_port;
                 hwif->rq = NULL;
 
-                if (drive->dev_flags & IDE_DFLAG_SLEEPING) {
-                        if (time_before(drive->sleep, jiffies)) {
-                                ide_unlock_port(hwif);
-                                goto plug_device;
-                        }
+                if (drive->dev_flags & IDE_DFLAG_SLEEPING &&
+                    time_after(drive->sleep, jiffies)) {
+                        ide_unlock_port(hwif);
+                        goto plug_device;
                 }
 
                 if ((hwif->host->host_flags & IDE_HFLAG_SERIALIZE) &&
@@ -495,7 +504,9 @@ repeat:
                          * quirk_list may not like intr setups/cleanups
                          */
                         if (prev_port && prev_port->cur_dev->quirk_list == 0)
-                                prev_port->tp_ops->set_irq(prev_port, 0);
+                                prev_port->tp_ops->write_devctl(prev_port,
+                                                                ATA_NIEN |
+                                                                ATA_DEVCTL_OBS);
 
                         hwif->host->cur_port = hwif;
                 }
diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c
index 5403e4a44be4..27bb70ddd459 100644
--- a/drivers/ide/ide-iops.c
+++ b/drivers/ide/ide-iops.c
@@ -27,21 +27,6 @@
 #include <asm/uaccess.h>
 #include <asm/io.h>
 
-void SELECT_DRIVE(ide_drive_t *drive)
-{
-        ide_hwif_t *hwif = drive->hwif;
-        const struct ide_port_ops *port_ops = hwif->port_ops;
-        struct ide_cmd cmd;
-
-        if (port_ops && port_ops->selectproc)
-                port_ops->selectproc(drive);
-
-        memset(&cmd, 0, sizeof(cmd));
-        cmd.tf_flags = IDE_TFLAG_OUT_DEVICE;
-
-        drive->hwif->tp_ops->tf_load(drive, &cmd);
-}
-
 void SELECT_MASK(ide_drive_t *drive, int mask)
 {
         const struct ide_port_ops *port_ops = drive->hwif->port_ops;
@@ -55,7 +40,7 @@ u8 ide_read_error(ide_drive_t *drive)
         struct ide_cmd cmd;
 
         memset(&cmd, 0, sizeof(cmd));
-        cmd.tf_flags = IDE_TFLAG_IN_FEATURE;
+        cmd.tf_flags = IDE_TFLAG_IN_ERROR;
 
         drive->hwif->tp_ops->tf_read(drive, &cmd);
 
@@ -306,6 +291,7 @@ int ide_driveid_update(ide_drive_t *drive)
         drive->id[ATA_ID_UDMA_MODES]  = id[ATA_ID_UDMA_MODES];
         drive->id[ATA_ID_MWDMA_MODES] = id[ATA_ID_MWDMA_MODES];
         drive->id[ATA_ID_SWDMA_MODES] = id[ATA_ID_SWDMA_MODES];
+        drive->id[ATA_ID_CFA_MODES]   = id[ATA_ID_CFA_MODES];
         /* anything more ? */
 
         kfree(id);
@@ -356,10 +342,10 @@ int ide_config_drive_speed(ide_drive_t *drive, u8 speed)
         disable_irq_nosync(hwif->irq);
 
         udelay(1);
-        SELECT_DRIVE(drive);
+        tp_ops->dev_select(drive);
         SELECT_MASK(drive, 1);
         udelay(1);
-        tp_ops->set_irq(hwif, 0);
+        tp_ops->write_devctl(hwif, ATA_NIEN | ATA_DEVCTL_OBS);
 
         memset(&cmd, 0, sizeof(cmd));
         cmd.tf_flags = IDE_TFLAG_OUT_FEATURE | IDE_TFLAG_OUT_NSECT;
@@ -371,7 +357,7 @@ int ide_config_drive_speed(ide_drive_t *drive, u8 speed)
         tp_ops->exec_command(hwif, ATA_CMD_SET_FEATURES);
 
         if (drive->quirk_list == 2)
-                tp_ops->set_irq(hwif, 1);
+                tp_ops->write_devctl(hwif, ATA_DEVCTL_OBS);
 
         error = __ide_wait_stat(drive, drive->ready_stat,
                                 ATA_BUSY | ATA_DRQ | ATA_ERR,
@@ -386,9 +372,14 @@ int ide_config_drive_speed(ide_drive_t *drive, u8 speed)
                 return error;
         }
 
-        id[ATA_ID_UDMA_MODES]  &= ~0xFF00;
-        id[ATA_ID_MWDMA_MODES] &= ~0x0F00;
-        id[ATA_ID_SWDMA_MODES] &= ~0x0F00;
+        if (speed >= XFER_SW_DMA_0) {
+                id[ATA_ID_UDMA_MODES]  &= ~0xFF00;
+                id[ATA_ID_MWDMA_MODES] &= ~0x0700;
+                id[ATA_ID_SWDMA_MODES] &= ~0x0700;
+                if (ata_id_is_cfa(id))
+                        id[ATA_ID_CFA_MODES] &= ~0x0E00;
+        } else  if (ata_id_is_cfa(id))
+                id[ATA_ID_CFA_MODES] &= ~0x01C0;
 
  skip:
 #ifdef CONFIG_BLK_DEV_IDEDMA
@@ -401,12 +392,18 @@ int ide_config_drive_speed(ide_drive_t *drive, u8 speed)
         if (speed >= XFER_UDMA_0) {
                 i = 1 << (speed - XFER_UDMA_0);
                 id[ATA_ID_UDMA_MODES] |= (i << 8 | i);
+        } else if (ata_id_is_cfa(id) && speed >= XFER_MW_DMA_3) {
+                i = speed - XFER_MW_DMA_2;
+                id[ATA_ID_CFA_MODES] |= i << 9;
         } else if (speed >= XFER_MW_DMA_0) {
                 i = 1 << (speed - XFER_MW_DMA_0);
                 id[ATA_ID_MWDMA_MODES] |= (i << 8 | i);
         } else if (speed >= XFER_SW_DMA_0) {
                 i = 1 << (speed - XFER_SW_DMA_0);
                 id[ATA_ID_SWDMA_MODES] |= (i << 8 | i);
+        } else if (ata_id_is_cfa(id) && speed >= XFER_PIO_5) {
+                i = speed - XFER_PIO_4;
+                id[ATA_ID_CFA_MODES] |= i << 6;
         }
 
         if (!drive->init_speed)
diff --git a/drivers/ide/ide-pm.c b/drivers/ide/ide-pm.c
index ebf2d21ebdcb..bb7858ebb7d1 100644
--- a/drivers/ide/ide-pm.c
+++ b/drivers/ide/ide-pm.c
@@ -223,6 +223,7 @@ void ide_check_pm_state(ide_drive_t *drive, struct request *rq)
                  * point.
                  */
                 ide_hwif_t *hwif = drive->hwif;
+                const struct ide_tp_ops *tp_ops = hwif->tp_ops;
                 struct request_queue *q = drive->queue;
                 unsigned long flags;
                 int rc;
@@ -232,8 +233,8 @@ void ide_check_pm_state(ide_drive_t *drive, struct request *rq)
                 rc = ide_wait_not_busy(hwif, 35000);
                 if (rc)
                         printk(KERN_WARNING "%s: bus not ready on wakeup\n", drive->name);
-                SELECT_DRIVE(drive);
-                hwif->tp_ops->set_irq(hwif, 1);
+                tp_ops->dev_select(drive);
+                tp_ops->write_devctl(hwif, ATA_DEVCTL_OBS);
                 rc = ide_wait_not_busy(hwif, 100000);
                 if (rc)
                         printk(KERN_WARNING "%s: drive not ready on wakeup\n", drive->name);
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index 548864510ba9..d8c1c3e735bb 100644
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -260,7 +260,7 @@ int ide_dev_read_id(ide_drive_t *drive, u8 cmd, u16 *id)
          * during the identify phase that the IRQ handler isn't expecting.
          */
         if (io_ports->ctl_addr)
-                tp_ops->set_irq(hwif, 0);
+                tp_ops->write_devctl(hwif, ATA_NIEN | ATA_DEVCTL_OBS);
 
         /* take a deep breath */
         msleep(50);
@@ -390,13 +390,13 @@ static int do_probe (ide_drive_t *drive, u8 cmd)
          * (e.g. crw9624 as drive0 with disk as slave)
          */
         msleep(50);
-        SELECT_DRIVE(drive);
+        tp_ops->dev_select(drive);
         msleep(50);
 
         if (ide_read_device(drive) != drive->select && present == 0) {
                 if (drive->dn & 1) {
                         /* exit with drive0 selected */
-                        SELECT_DRIVE(hwif->devices[0]);
+                        tp_ops->dev_select(hwif->devices[0]);
                         /* allow ATA_BUSY to assert & clear */
                         msleep(50);
                 }
@@ -422,7 +422,7 @@ static int do_probe (ide_drive_t *drive, u8 cmd)
                         printk(KERN_ERR "%s: no response (status = 0x%02x), "
                                         "resetting drive\n", drive->name, stat);
                         msleep(50);
-                        SELECT_DRIVE(drive);
+                        tp_ops->dev_select(drive);
                         msleep(50);
                         tp_ops->exec_command(hwif, ATA_CMD_DEV_RESET);
                         (void)ide_busy_sleep(hwif, WAIT_WORSTCASE, 0);
@@ -441,7 +441,7 @@ static int do_probe (ide_drive_t *drive, u8 cmd)
         }
         if (drive->dn & 1) {
                 /* exit with drive0 selected */
-                SELECT_DRIVE(hwif->devices[0]);
+                tp_ops->dev_select(hwif->devices[0]);
                 msleep(50);
                 /* ensure drive irq is clear */
                 (void)tp_ops->read_status(hwif);
@@ -605,6 +605,7 @@ out:
 
 static int ide_port_wait_ready(ide_hwif_t *hwif)
 {
+        const struct ide_tp_ops *tp_ops = hwif->tp_ops;
         ide_drive_t *drive;
         int i, rc;
 
@@ -627,8 +628,8 @@ static int ide_port_wait_ready(ide_hwif_t *hwif)
                 /* Ignore disks that we will not probe for later. */
                 if ((drive->dev_flags & IDE_DFLAG_NOPROBE) == 0 ||
                     (drive->dev_flags & IDE_DFLAG_PRESENT)) {
-                        SELECT_DRIVE(drive);
-                        hwif->tp_ops->set_irq(hwif, 1);
+                        tp_ops->dev_select(drive);
+                        tp_ops->write_devctl(hwif, ATA_DEVCTL_OBS);
                         mdelay(2);
                         rc = ide_wait_not_busy(hwif, 35000);
                         if (rc)
@@ -640,7 +641,7 @@ static int ide_port_wait_ready(ide_hwif_t *hwif)
 out:
         /* Exit function with master reselected (let's be sane) */
         if (i)
-                SELECT_DRIVE(hwif->devices[0]);
+                tp_ops->dev_select(hwif->devices[0]);
 
         return rc;
 }
@@ -845,7 +846,7 @@ static int init_irq (ide_hwif_t *hwif)
                 irq_handler = ide_intr;
 
         if (io_ports->ctl_addr)
-                hwif->tp_ops->set_irq(hwif, 1);
+                hwif->tp_ops->write_devctl(hwif, ATA_DEVCTL_OBS);
 
         if (request_irq(hwif->irq, irq_handler, sa, hwif->name, hwif))
                 goto out_up;
@@ -942,20 +943,16 @@ EXPORT_SYMBOL_GPL(ide_init_disk);
 static void drive_release_dev (struct device *dev)
 {
         ide_drive_t *drive = container_of(dev, ide_drive_t, gendev);
-        ide_hwif_t *hwif = drive->hwif;
 
         ide_proc_unregister_device(drive);
 
-        spin_lock_irq(&hwif->lock);
+        blk_cleanup_queue(drive->queue);
+        drive->queue = NULL;
+
         kfree(drive->id);
         drive->id = NULL;
+
         drive->dev_flags &= ~IDE_DFLAG_PRESENT;
-        /* Messed up locking ... */
-        spin_unlock_irq(&hwif->lock);
-        blk_cleanup_queue(drive->queue);
-        spin_lock_irq(&hwif->lock);
-        drive->queue = NULL;
-        spin_unlock_irq(&hwif->lock);
 
         complete(&drive->gendev_rel_comp);
 }
diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c
index 64dfa7458f8d..cb942a9b580f 100644
--- a/drivers/ide/ide-tape.c
+++ b/drivers/ide/ide-tape.c
@@ -297,19 +297,15 @@ static struct ide_tape_obj *ide_tape_chrdev_get(unsigned int i)
         return tape;
 }
 
-static void idetape_input_buffers(ide_drive_t *drive, struct ide_atapi_pc *pc,
+static int idetape_input_buffers(ide_drive_t *drive, struct ide_atapi_pc *pc,
                                   unsigned int bcount)
 {
         struct idetape_bh *bh = pc->bh;
         int count;
 
         while (bcount) {
-                if (bh == NULL) {
-                        printk(KERN_ERR "ide-tape: bh == NULL in "
-                                "idetape_input_buffers\n");
-                        ide_pad_transfer(drive, 0, bcount);
-                        return;
-                }
+                if (bh == NULL)
+                        break;
                 count = min(
                         (unsigned int)(bh->b_size - atomic_read(&bh->b_count)),
                         bcount);
@@ -323,21 +319,21 @@ static void idetape_input_buffers(ide_drive_t *drive, struct ide_atapi_pc *pc,
                                 atomic_set(&bh->b_count, 0);
                 }
         }
+
         pc->bh = bh;
+
+        return bcount;
 }
 
-static void idetape_output_buffers(ide_drive_t *drive, struct ide_atapi_pc *pc,
+static int idetape_output_buffers(ide_drive_t *drive, struct ide_atapi_pc *pc,
                                    unsigned int bcount)
 {
         struct idetape_bh *bh = pc->bh;
         int count;
 
         while (bcount) {
-                if (bh == NULL) {
-                        printk(KERN_ERR "ide-tape: bh == NULL in %s\n",
-                                        __func__);
-                        return;
-                }
+                if (bh == NULL)
+                        break;
                 count = min((unsigned int)pc->b_count, (unsigned int)bcount);
                 drive->hwif->tp_ops->output_data(drive, NULL, pc->b_data, count);
                 bcount -= count;
@@ -352,6 +348,8 @@ static void idetape_output_buffers(ide_drive_t *drive, struct ide_atapi_pc *pc,
                         }
                 }
         }
+
+        return bcount;
 }
 
 static void idetape_update_buffers(ide_drive_t *drive, struct ide_atapi_pc *pc)
@@ -563,12 +561,14 @@ static void ide_tape_handle_dsc(ide_drive_t *drive)
 static int ide_tape_io_buffers(ide_drive_t *drive, struct ide_atapi_pc *pc,
                                 unsigned int bcount, int write)
 {
+        unsigned int bleft;
+
         if (write)
-                idetape_output_buffers(drive, pc, bcount);
+                bleft = idetape_output_buffers(drive, pc, bcount);
         else
-                idetape_input_buffers(drive, pc, bcount);
+                bleft = idetape_input_buffers(drive, pc, bcount);
 
-        return bcount;
+        return bcount - bleft;
 }
 
 /*
@@ -2014,9 +2014,13 @@ static void idetape_get_inquiry_results(ide_drive_t *drive)
 {
         idetape_tape_t *tape = drive->driver_data;
         struct ide_atapi_pc pc;
+        u8 pc_buf[256];
         char fw_rev[4], vendor_id[8], product_id[16];
 
         idetape_create_inquiry_cmd(&pc);
+        pc.buf = &pc_buf[0];
+        pc.buf_size = sizeof(pc_buf);
+
         if (ide_queue_pc_tail(drive, tape->disk, &pc)) {
                 printk(KERN_ERR "ide-tape: %s: can't get INQUIRY results\n",
                                 tape->name);
diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c
index 84532be97c00..243421ce40d0 100644
--- a/drivers/ide/ide-taskfile.c
+++ b/drivers/ide/ide-taskfile.c
@@ -80,8 +80,14 @@ ide_startstop_t do_rw_taskfile(ide_drive_t *drive, struct ide_cmd *orig_cmd)
 
         if ((cmd->tf_flags & IDE_TFLAG_DMA_PIO_FALLBACK) == 0) {
                 ide_tf_dump(drive->name, tf);
-                tp_ops->set_irq(hwif, 1);
+                tp_ops->write_devctl(hwif, ATA_DEVCTL_OBS);
                 SELECT_MASK(drive, 0);
+
+                if (cmd->ftf_flags & IDE_FTFLAG_OUT_DATA) {
+                        u8 data[2] = { tf->data, tf->hob_data };
+
+                        tp_ops->output_data(drive, cmd, data, 2);
+                }
                 tp_ops->tf_load(drive, cmd);
         }
 
@@ -100,9 +106,7 @@ ide_startstop_t do_rw_taskfile(ide_drive_t *drive, struct ide_cmd *orig_cmd)
                 ide_execute_command(drive, cmd, handler, WAIT_WORSTCASE);
                 return ide_started;
         case ATA_PROT_DMA:
-                if ((drive->dev_flags & IDE_DFLAG_USING_DMA) == 0 ||
-                    ide_build_sglist(drive, cmd) == 0 ||
-                    dma_ops->dma_setup(drive, cmd))
+                if (ide_dma_prepare(drive, cmd))
                         return ide_stopped;
                 hwif->expiry = dma_ops->dma_timer_expiry;
                 ide_execute_command(drive, cmd, ide_dma_intr, 2 * WAIT_CMD);
@@ -188,70 +192,68 @@ static u8 wait_drive_not_busy(ide_drive_t *drive)
         return stat;
 }
 
-static void ide_pio_bytes(ide_drive_t *drive, struct ide_cmd *cmd,
-                          unsigned int write, unsigned int nr_bytes)
+void ide_pio_bytes(ide_drive_t *drive, struct ide_cmd *cmd,
+                   unsigned int write, unsigned int len)
 {
         ide_hwif_t *hwif = drive->hwif;
         struct scatterlist *sg = hwif->sg_table;
         struct scatterlist *cursg = cmd->cursg;
         struct page *page;
-#ifdef CONFIG_HIGHMEM
         unsigned long flags;
-#endif
         unsigned int offset;
         u8 *buf;
 
         cursg = cmd->cursg;
-        if (!cursg) {
-                cursg = sg;
-                cmd->cursg = sg;
-        }
+        if (cursg == NULL)
+                cursg = cmd->cursg = sg;
 
-        page = sg_page(cursg);
-        offset = cursg->offset + cmd->cursg_ofs;
+        while (len) {
+                unsigned nr_bytes = min(len, cursg->length - cmd->cursg_ofs);
 
-        /* get the current page and offset */
-        page = nth_page(page, (offset >> PAGE_SHIFT));
-        offset %= PAGE_SIZE;
+                if (nr_bytes > PAGE_SIZE)
+                        nr_bytes = PAGE_SIZE;
 
-#ifdef CONFIG_HIGHMEM
-        local_irq_save(flags);
-#endif
-        buf = kmap_atomic(page, KM_BIO_SRC_IRQ) + offset;
+                page = sg_page(cursg);
+                offset = cursg->offset + cmd->cursg_ofs;
 
-        cmd->nleft -= nr_bytes;
-        cmd->cursg_ofs += nr_bytes;
+                /* get the current page and offset */
+                page = nth_page(page, (offset >> PAGE_SHIFT));
+                offset %= PAGE_SIZE;
 
-        if (cmd->cursg_ofs == cursg->length) {
-                cmd->cursg = sg_next(cmd->cursg);
-                cmd->cursg_ofs = 0;
-        }
+                if (PageHighMem(page))
+                        local_irq_save(flags);
 
-        /* do the actual data transfer */
-        if (write)
-                hwif->tp_ops->output_data(drive, cmd, buf, nr_bytes);
-        else
-                hwif->tp_ops->input_data(drive, cmd, buf, nr_bytes);
+                buf = kmap_atomic(page, KM_BIO_SRC_IRQ) + offset;
 
-        kunmap_atomic(buf, KM_BIO_SRC_IRQ);
-#ifdef CONFIG_HIGHMEM
-        local_irq_restore(flags);
-#endif
-}
+                cmd->nleft -= nr_bytes;
+                cmd->cursg_ofs += nr_bytes;
 
-static void ide_pio_multi(ide_drive_t *drive, struct ide_cmd *cmd,
-                          unsigned int write)
-{
-        unsigned int nsect;
+                if (cmd->cursg_ofs == cursg->length) {
+                        cursg = cmd->cursg = sg_next(cmd->cursg);
+                        cmd->cursg_ofs = 0;
+                }
+
+                /* do the actual data transfer */
+                if (write)
+                        hwif->tp_ops->output_data(drive, cmd, buf, nr_bytes);
+                else
+                        hwif->tp_ops->input_data(drive, cmd, buf, nr_bytes);
+
+                kunmap_atomic(buf, KM_BIO_SRC_IRQ);
 
-        nsect = min_t(unsigned int, cmd->nleft >> 9, drive->mult_count);
-        while (nsect--)
-                ide_pio_bytes(drive, cmd, write, SECTOR_SIZE);
+                if (PageHighMem(page))
+                        local_irq_restore(flags);
+
+                len -= nr_bytes;
+        }
 }
+EXPORT_SYMBOL_GPL(ide_pio_bytes);
 
 static void ide_pio_datablock(ide_drive_t *drive, struct ide_cmd *cmd,
                               unsigned int write)
 {
+        unsigned int nr_bytes;
+
         u8 saved_io_32bit = drive->io_32bit;
 
         if (cmd->tf_flags & IDE_TFLAG_FS)
@@ -263,9 +265,11 @@ static void ide_pio_datablock(ide_drive_t *drive, struct ide_cmd *cmd,
         touch_softlockup_watchdog();
 
         if (cmd->tf_flags & IDE_TFLAG_MULTI_PIO)
-                ide_pio_multi(drive, cmd, write);
+                nr_bytes = min_t(unsigned, cmd->nleft, drive->mult_count << 9);
         else
-                ide_pio_bytes(drive, cmd, write, SECTOR_SIZE);
+                nr_bytes = SECTOR_SIZE;
+
+        ide_pio_bytes(drive, cmd, write, nr_bytes);
 
         drive->io_32bit = saved_io_32bit;
 }
diff --git a/drivers/ide/ide-timings.c b/drivers/ide/ide-timings.c
index 81f527af8fae..001a56365be5 100644
--- a/drivers/ide/ide-timings.c
+++ b/drivers/ide/ide-timings.c
@@ -43,6 +43,8 @@ static struct ide_timing ide_timing[] = {
         { XFER_UDMA_1,     0,   0,   0,   0,   0,   0,   0,  80 },
         { XFER_UDMA_0,     0,   0,   0,   0,   0,   0,   0, 120 },
 
+        { XFER_MW_DMA_4,  25,   0,   0,   0,  55,  20,  80,   0 },
+        { XFER_MW_DMA_3,  25,   0,   0,   0,  65,  25, 100,   0 },
         { XFER_MW_DMA_2,  25,   0,   0,   0,  70,  25, 120,   0 },
         { XFER_MW_DMA_1,  45,   0,   0,   0,  80,  50, 150,   0 },
         { XFER_MW_DMA_0,  60,   0,   0,   0, 215, 215, 480,   0 },
@@ -51,7 +53,8 @@ static struct ide_timing ide_timing[] = {
         { XFER_SW_DMA_1,  90,   0,   0,   0, 240, 240, 480,   0 },
         { XFER_SW_DMA_0, 120,   0,   0,   0, 480, 480, 960,   0 },
 
-        { XFER_PIO_5,     20,  50,  30, 100,  50,  30, 100,   0 },
+        { XFER_PIO_6,     10,  55,  20,  80,  55,  20,  80,   0 },
+        { XFER_PIO_5,     15,  65,  25, 100,  65,  25, 100,   0 },
         { XFER_PIO_4,     25,  70,  25, 120,  70,  25, 120,   0 },
         { XFER_PIO_3,     30,  80,  70, 180,  80,  70, 180,   0 },
 
@@ -90,6 +93,10 @@ u16 ide_pio_cycle_time(ide_drive_t *drive, u8 pio)
                 /* conservative "downgrade" for all pre-ATA2 drives */
                 if (pio < 3 && cycle < t->cycle)
                         cycle = 0; /* use standard timing */
+
+                /* Use the standard timing for the CF specific modes too */
+                if (pio > 4 && ata_id_is_cfa(id))
+                        cycle = 0;
         }
 
         return cycle ? cycle : t->cycle;
@@ -161,7 +168,8 @@ int ide_timing_compute(ide_drive_t *drive, u8 speed,
 
                 if (speed <= XFER_PIO_2)
                         p.cycle = p.cyc8b = id[ATA_ID_EIDE_PIO];
-                else if (speed <= XFER_PIO_5)
+                else if ((speed <= XFER_PIO_4) ||
+                         (speed == XFER_PIO_5 && !ata_id_is_cfa(id)))
                         p.cycle = p.cyc8b = id[ATA_ID_EIDE_PIO_IORDY];
                 else if (speed >= XFER_MW_DMA_0 && speed <= XFER_MW_DMA_2)
                         p.cycle = id[ATA_ID_EIDE_DMA_MIN];
diff --git a/drivers/ide/ide-xfer-mode.c b/drivers/ide/ide-xfer-mode.c
index 6910f6a257e8..af44be9d546c 100644
--- a/drivers/ide/ide-xfer-mode.c
+++ b/drivers/ide/ide-xfer-mode.c
@@ -9,11 +9,11 @@ static const char *udma_str[] =
          { "UDMA/16", "UDMA/25",  "UDMA/33",  "UDMA/44",
            "UDMA/66", "UDMA/100", "UDMA/133", "UDMA7" };
 static const char *mwdma_str[] =
-        { "MWDMA0", "MWDMA1", "MWDMA2" };
+        { "MWDMA0", "MWDMA1", "MWDMA2", "MWDMA3", "MWDMA4" };
 static const char *swdma_str[] =
         { "SWDMA0", "SWDMA1", "SWDMA2" };
 static const char *pio_str[] =
-        { "PIO0", "PIO1", "PIO2", "PIO3", "PIO4", "PIO5" };
+        { "PIO0", "PIO1", "PIO2", "PIO3", "PIO4", "PIO5", "PIO6" };
 
 /**
  *      ide_xfer_verbose        -       return IDE mode names
@@ -30,11 +30,11 @@ const char *ide_xfer_verbose(u8 mode)
 
         if (mode >= XFER_UDMA_0 && mode <= XFER_UDMA_7)
                 s = udma_str[i];
-        else if (mode >= XFER_MW_DMA_0 && mode <= XFER_MW_DMA_2)
+        else if (mode >= XFER_MW_DMA_0 && mode <= XFER_MW_DMA_4)
                 s = mwdma_str[i];
         else if (mode >= XFER_SW_DMA_0 && mode <= XFER_SW_DMA_2)
                 s = swdma_str[i];
-        else if (mode >= XFER_PIO_0 && mode <= XFER_PIO_5)
+        else if (mode >= XFER_PIO_0 && mode <= XFER_PIO_6)
                 s = pio_str[i & 0x7];
         else if (mode == XFER_PIO_SLOW)
                 s = "PIO SLOW";
@@ -79,7 +79,10 @@ u8 ide_get_best_pio_mode(ide_drive_t *drive, u8 mode_wanted, u8 max_mode)
                 }
 
                 if (id[ATA_ID_FIELD_VALID] & 2) {             /* ATA2? */
-                        if (ata_id_has_iordy(id)) {
+                        if (ata_id_is_cfa(id) && (id[ATA_ID_CFA_MODES] & 7))
+                                pio_mode = 4 + min_t(int, 2,
+                                                     id[ATA_ID_CFA_MODES] & 7);
+                        else if (ata_id_has_iordy(id)) {
                                 if (id[ATA_ID_PIO_MODES] & 7) {
                                         overridden = 0;
                                         if (id[ATA_ID_PIO_MODES] & 4)
@@ -239,7 +242,7 @@ int ide_set_xfer_rate(ide_drive_t *drive, u8 rate)
 
         BUG_ON(rate < XFER_PIO_0);
 
-        if (rate >= XFER_PIO_0 && rate <= XFER_PIO_5)
+        if (rate >= XFER_PIO_0 && rate <= XFER_PIO_6)
                 return ide_set_pio_mode(drive, rate);
 
         return ide_set_dma_mode(drive, rate);
diff --git a/drivers/ide/ide_arm.c b/drivers/ide/ide_arm.c
deleted file mode 100644
index cf6385446ece..000000000000
--- a/drivers/ide/ide_arm.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * ARM default IDE host driver
- *
- * Copyright (C) 2004 Bartlomiej Zolnierkiewicz
- * Based on code by: Russell King, Ian Molton and Alexander Schulz.
- *
- * May be copied or modified under the terms of the GNU General Public License.
- */
-
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/ide.h>
-
-#include <asm/irq.h>
-
-#define DRV_NAME "ide_arm"
-
-#define IDE_ARM_IO      0x1f0
-#define IDE_ARM_IRQ     IRQ_HARDDISK
-
-static const struct ide_port_info ide_arm_port_info = {
-        .host_flags             = IDE_HFLAG_NO_DMA,
-};
-
-static int __init ide_arm_init(void)
-{
-        unsigned long base = IDE_ARM_IO, ctl = IDE_ARM_IO + 0x206;
-        hw_regs_t hw, *hws[] = { &hw, NULL, NULL, NULL };
-
-        if (!request_region(base, 8, DRV_NAME)) {
-                printk(KERN_ERR "%s: I/O resource 0x%lX-0x%lX not free.\n",
-                                DRV_NAME, base, base + 7);
-                return -EBUSY;
-        }
-
-        if (!request_region(ctl, 1, DRV_NAME)) {
-                printk(KERN_ERR "%s: I/O resource 0x%lX not free.\n",
-                                DRV_NAME, ctl);
-                release_region(base, 8);
-                return -EBUSY;
-        }
-
-        memset(&hw, 0, sizeof(hw));
-        ide_std_init_ports(&hw, base, ctl);
-        hw.irq = IDE_ARM_IRQ;
-        hw.chipset = ide_generic;
-
-        return ide_host_add(&ide_arm_port_info, hws, NULL);
-}
-
-module_init(ide_arm_init);
-
-MODULE_LICENSE("GPL");
diff --git a/drivers/ide/it821x.c b/drivers/ide/it821x.c
index 0d4ac65cf949..51aa745246dc 100644
--- a/drivers/ide/it821x.c
+++ b/drivers/ide/it821x.c
@@ -511,9 +511,8 @@ static struct ide_dma_ops it821x_pass_through_dma_ops = {
         .dma_start              = it821x_dma_start,
         .dma_end                = it821x_dma_end,
         .dma_test_irq           = ide_dma_test_irq,
-        .dma_timer_expiry       = ide_dma_sff_timer_expiry,
-        .dma_timeout            = ide_dma_timeout,
         .dma_lost_irq           = ide_dma_lost_irq,
+        .dma_timer_expiry       = ide_dma_sff_timer_expiry,
         .dma_sff_read_status    = ide_dma_sff_read_status,
 };
 
diff --git a/drivers/ide/ns87415.c b/drivers/ide/ns87415.c
index 7b65fe5bf449..71a39fb3856f 100644
--- a/drivers/ide/ns87415.c
+++ b/drivers/ide/ns87415.c
@@ -66,18 +66,11 @@ static void superio_tf_read(ide_drive_t *drive, struct ide_cmd *cmd)
         struct ide_io_ports *io_ports = &drive->hwif->io_ports;
         struct ide_taskfile *tf = &cmd->tf;
 
-        if (cmd->ftf_flags & IDE_FTFLAG_IN_DATA) {
-                u16 data = inw(io_ports->data_addr);
-
-                tf->data = data & 0xff;
-                tf->hob_data = (data >> 8) & 0xff;
-        }
-
         /* be sure we're looking at the low order bits */
-        outb(ATA_DEVCTL_OBS & ~0x80, io_ports->ctl_addr);
+        outb(ATA_DEVCTL_OBS, io_ports->ctl_addr);
 
-        if (cmd->tf_flags & IDE_TFLAG_IN_FEATURE)
-                tf->feature = inb(io_ports->feature_addr);
+        if (cmd->tf_flags & IDE_TFLAG_IN_ERROR)
+                tf->error  = inb(io_ports->feature_addr);
         if (cmd->tf_flags & IDE_TFLAG_IN_NSECT)
                 tf->nsect  = inb(io_ports->nsect_addr);
         if (cmd->tf_flags & IDE_TFLAG_IN_LBAL)
@@ -90,28 +83,30 @@ static void superio_tf_read(ide_drive_t *drive, struct ide_cmd *cmd)
                 tf->device = superio_ide_inb(io_ports->device_addr);
 
         if (cmd->tf_flags & IDE_TFLAG_LBA48) {
-                outb(ATA_DEVCTL_OBS | 0x80, io_ports->ctl_addr);
+                outb(ATA_HOB | ATA_DEVCTL_OBS, io_ports->ctl_addr);
 
-                if (cmd->tf_flags & IDE_TFLAG_IN_HOB_FEATURE)
-                        tf->hob_feature = inb(io_ports->feature_addr);
+                if (cmd->tf_flags & IDE_TFLAG_IN_HOB_ERROR)
+                        tf->hob_error = inb(io_ports->feature_addr);
                 if (cmd->tf_flags & IDE_TFLAG_IN_HOB_NSECT)
-                        tf->hob_nsect   = inb(io_ports->nsect_addr);
+                        tf->hob_nsect = inb(io_ports->nsect_addr);
                 if (cmd->tf_flags & IDE_TFLAG_IN_HOB_LBAL)
-                        tf->hob_lbal    = inb(io_ports->lbal_addr);
+                        tf->hob_lbal  = inb(io_ports->lbal_addr);
                 if (cmd->tf_flags & IDE_TFLAG_IN_HOB_LBAM)
-                        tf->hob_lbam    = inb(io_ports->lbam_addr);
+                        tf->hob_lbam  = inb(io_ports->lbam_addr);
                 if (cmd->tf_flags & IDE_TFLAG_IN_HOB_LBAH)
-                        tf->hob_lbah    = inb(io_ports->lbah_addr);
+                        tf->hob_lbah  = inb(io_ports->lbah_addr);
         }
 }
 
+static void ns87415_dev_select(ide_drive_t *drive);
+
 static const struct ide_tp_ops superio_tp_ops = {
         .exec_command           = ide_exec_command,
         .read_status            = superio_read_status,
         .read_altstatus         = ide_read_altstatus,
+        .write_devctl           = ide_write_devctl,
 
-        .set_irq                = ide_set_irq,
-
+        .dev_select             = ns87415_dev_select,
         .tf_load                = ide_tf_load,
         .tf_read                = superio_tf_read,
 
@@ -190,10 +185,18 @@ static void ns87415_prepare_drive (ide_drive_t *drive, unsigned int use_dma)
         local_irq_restore(flags);
 }
 
-static void ns87415_selectproc (ide_drive_t *drive)
+static void ns87415_dev_select(ide_drive_t *drive)
 {
         ns87415_prepare_drive(drive,
                               !!(drive->dev_flags & IDE_DFLAG_USING_DMA));
+
+        outb(drive->select | ATA_DEVICE_OBS, drive->hwif->io_ports.device_addr);
+}
+
+static void ns87415_dma_start(ide_drive_t *drive)
+{
+        ns87415_prepare_drive(drive, 1);
+        ide_dma_start(drive);
 }
 
 static int ns87415_dma_end(ide_drive_t *drive)
@@ -201,7 +204,6 @@ static int ns87415_dma_end(ide_drive_t *drive)
         ide_hwif_t *hwif = drive->hwif;
         u8 dma_stat = 0, dma_cmd = 0;
 
-        drive->waiting_for_dma = 0;
         dma_stat = hwif->dma_ops->dma_sff_read_status(hwif);
         /* get DMA command mode */
         dma_cmd = inb(hwif->dma_base + ATA_DMA_CMD);
@@ -210,21 +212,11 @@ static int ns87415_dma_end(ide_drive_t *drive)
         /* from ERRATA: clear the INTR & ERROR bits */
         dma_cmd = inb(hwif->dma_base + ATA_DMA_CMD);
         outb(dma_cmd | 6, hwif->dma_base + ATA_DMA_CMD);
-        /* and free any DMA resources */
-        ide_destroy_dmatable(drive);
-        /* verify good DMA status */
-        return (dma_stat & 7) != 4;
-}
 
-static int ns87415_dma_setup(ide_drive_t *drive, struct ide_cmd *cmd)
-{
-        /* select DMA xfer */
-        ns87415_prepare_drive(drive, 1);
-        if (ide_dma_setup(drive, cmd) == 0)
-                return 0;
-        /* DMA failed: select PIO xfer */
         ns87415_prepare_drive(drive, 0);
-        return 1;
+
+        /* verify good DMA status */
+        return (dma_stat & 7) != 4;
 }
 
 static void __devinit init_hwif_ns87415 (ide_hwif_t *hwif)
@@ -242,7 +234,7 @@ static void __devinit init_hwif_ns87415 (ide_hwif_t *hwif)
          * Also, leave IRQ masked during drive probing, to prevent infinite
          * interrupts from a potentially floating INTA..
          *
-         * IRQs get unmasked in selectproc when drive is first used.
+         * IRQs get unmasked in dev_select() when drive is first used.
          */
         (void) pci_read_config_dword(dev, 0x40, &ctrl);
         (void) pci_read_config_byte(dev, 0x09, &progif);
@@ -270,7 +262,7 @@ static void __devinit init_hwif_ns87415 (ide_hwif_t *hwif)
 #ifdef __sparc_v9__
                 /*
                  * XXX: Reset the device, if we don't it will not respond to
-                 *      SELECT_DRIVE() properly during first ide_probe_port().
+                 *      dev_select() properly during first ide_probe_port().
                  */
                 timeout = 10000;
                 outb(12, hwif->io_ports.ctl_addr);
@@ -294,26 +286,35 @@ static void __devinit init_hwif_ns87415 (ide_hwif_t *hwif)
         outb(0x60, hwif->dma_base + ATA_DMA_STATUS);
 }
 
-static const struct ide_port_ops ns87415_port_ops = {
-        .selectproc             = ns87415_selectproc,
+static const struct ide_tp_ops ns87415_tp_ops = {
+        .exec_command           = ide_exec_command,
+        .read_status            = ide_read_status,
+        .read_altstatus         = ide_read_altstatus,
+        .write_devctl           = ide_write_devctl,
+
+        .dev_select             = ns87415_dev_select,
+        .tf_load                = ide_tf_load,
+        .tf_read                = ide_tf_read,
+
+        .input_data             = ide_input_data,
+        .output_data            = ide_output_data,
 };
 
 static const struct ide_dma_ops ns87415_dma_ops = {
         .dma_host_set           = ide_dma_host_set,
-        .dma_setup              = ns87415_dma_setup,
-        .dma_start              = ide_dma_start,
+        .dma_setup              = ide_dma_setup,
+        .dma_start              = ns87415_dma_start,
         .dma_end                = ns87415_dma_end,
         .dma_test_irq           = ide_dma_test_irq,
         .dma_lost_irq           = ide_dma_lost_irq,
         .dma_timer_expiry       = ide_dma_sff_timer_expiry,
-        .dma_timeout            = ide_dma_timeout,
         .dma_sff_read_status    = superio_dma_sff_read_status,
 };
 
 static const struct ide_port_info ns87415_chipset __devinitdata = {
         .name           = DRV_NAME,
         .init_hwif      = init_hwif_ns87415,
-        .port_ops       = &ns87415_port_ops,
+        .tp_ops         = &ns87415_tp_ops,
         .dma_ops        = &ns87415_dma_ops,
         .host_flags     = IDE_HFLAG_TRUST_BIOS_FOR_DMA |
                           IDE_HFLAG_NO_ATAPI_DMA,
diff --git a/drivers/ide/pdc202xx_old.c b/drivers/ide/pdc202xx_old.c
index f7536d1943f7..248a54bd2386 100644
--- a/drivers/ide/pdc202xx_old.c
+++ b/drivers/ide/pdc202xx_old.c
@@ -258,12 +258,6 @@ static void pdc202xx_dma_lost_irq(ide_drive_t *drive)
         ide_dma_lost_irq(drive);
 }
 
-static void pdc202xx_dma_timeout(ide_drive_t *drive)
-{
-        pdc202xx_reset(drive);
-        ide_dma_timeout(drive);
-}
-
 static int init_chipset_pdc202xx(struct pci_dev *dev)
 {
         unsigned long dmabase = pci_resource_start(dev, 4);
@@ -336,7 +330,7 @@ static const struct ide_dma_ops pdc20246_dma_ops = {
         .dma_test_irq           = pdc202xx_dma_test_irq,
         .dma_lost_irq           = pdc202xx_dma_lost_irq,
         .dma_timer_expiry       = ide_dma_sff_timer_expiry,
-        .dma_timeout            = pdc202xx_dma_timeout,
+        .dma_clear              = pdc202xx_reset,
         .dma_sff_read_status    = ide_dma_sff_read_status,
 };
 
@@ -348,7 +342,7 @@ static const struct ide_dma_ops pdc2026x_dma_ops = {
         .dma_test_irq           = pdc202xx_dma_test_irq,
         .dma_lost_irq           = pdc202xx_dma_lost_irq,
         .dma_timer_expiry       = ide_dma_sff_timer_expiry,
-        .dma_timeout            = pdc202xx_dma_timeout,
+        .dma_clear              = pdc202xx_reset,
         .dma_sff_read_status    = ide_dma_sff_read_status,
 };
 
diff --git a/drivers/ide/pmac.c b/drivers/ide/pmac.c
index 2bfcfedaa076..052b9bf1f8fb 100644
--- a/drivers/ide/pmac.c
+++ b/drivers/ide/pmac.c
@@ -404,8 +404,6 @@ kauai_lookup_timing(struct kauai_timing* table, int cycle_time)
 #define IDE_WAKEUP_DELAY        (1*HZ)
 
 static int pmac_ide_init_dma(ide_hwif_t *, const struct ide_port_info *);
-static void pmac_ide_selectproc(ide_drive_t *drive);
-static void pmac_ide_kauai_selectproc(ide_drive_t *drive);
 
 #define PMAC_IDE_REG(x) \
         ((void __iomem *)((drive)->hwif->io_ports.data_addr + (x)))
@@ -415,8 +413,7 @@ static void pmac_ide_kauai_selectproc(ide_drive_t *drive);
  * timing register when selecting that unit. This version is for
  * ASICs with a single timing register
  */
-static void
-pmac_ide_selectproc(ide_drive_t *drive)
+static void pmac_ide_apply_timings(ide_drive_t *drive)
 {
         ide_hwif_t *hwif = drive->hwif;
         pmac_ide_hwif_t *pmif =
@@ -434,8 +431,7 @@ pmac_ide_selectproc(ide_drive_t *drive)
  * timing register when selecting that unit. This version is for
  * ASICs with a dual timing register (Kauai)
  */
-static void
-pmac_ide_kauai_selectproc(ide_drive_t *drive)
+static void pmac_ide_kauai_apply_timings(ide_drive_t *drive)
 {
         ide_hwif_t *hwif = drive->hwif;
         pmac_ide_hwif_t *pmif =
@@ -464,9 +460,25 @@ pmac_ide_do_update_timings(ide_drive_t *drive)
         if (pmif->kind == controller_sh_ata6 ||
             pmif->kind == controller_un_ata6 ||
             pmif->kind == controller_k2_ata6)
-                pmac_ide_kauai_selectproc(drive);
+                pmac_ide_kauai_apply_timings(drive);
         else
-                pmac_ide_selectproc(drive);
+                pmac_ide_apply_timings(drive);
+}
+
+static void pmac_dev_select(ide_drive_t *drive)
+{
+        pmac_ide_apply_timings(drive);
+
+        writeb(drive->select | ATA_DEVICE_OBS,
+               (void __iomem *)drive->hwif->io_ports.device_addr);
+}
+
+static void pmac_kauai_dev_select(ide_drive_t *drive)
+{
+        pmac_ide_kauai_apply_timings(drive);
+
+        writeb(drive->select | ATA_DEVICE_OBS,
+               (void __iomem *)drive->hwif->io_ports.device_addr);
 }
 
 static void pmac_exec_command(ide_hwif_t *hwif, u8 cmd)
@@ -476,17 +488,8 @@ static void pmac_exec_command(ide_hwif_t *hwif, u8 cmd)
                                      + IDE_TIMING_CONFIG));
 }
 
-static void pmac_set_irq(ide_hwif_t *hwif, int on)
+static void pmac_write_devctl(ide_hwif_t *hwif, u8 ctl)
 {
-        u8 ctl = ATA_DEVCTL_OBS;
-
-        if (on == 4) { /* hack for SRST */
-                ctl |= 4;
-                on &= ~4;
-        }
-
-        ctl |= on ? 0 : 2;
-
         writeb(ctl, (void __iomem *)hwif->io_ports.ctl_addr);
         (void)readl((void __iomem *)(hwif->io_ports.data_addr
                                      + IDE_TIMING_CONFIG));
@@ -916,10 +919,18 @@ static u8 pmac_ide_cable_detect(ide_hwif_t *hwif)
                 (pmac_ide_hwif_t *)dev_get_drvdata(hwif->gendev.parent);
         struct device_node *np = pmif->node;
         const char *cable = of_get_property(np, "cable-type", NULL);
+        struct device_node *root = of_find_node_by_path("/");
+        const char *model = of_get_property(root, "model", NULL);
 
         /* Get cable type from device-tree. */
-        if (cable && !strncmp(cable, "80-", 3))
-                return ATA_CBL_PATA80;
+        if (cable && !strncmp(cable, "80-", 3)) {
+                /* Some drives fail to detect 80c cable in PowerBook */
+                /* These machine use proprietary short IDE cable anyway */
+                if (!strncmp(model, "PowerBook", 9))
+                        return ATA_CBL_PATA40_SHORT;
+                else
+                        return ATA_CBL_PATA80;
+        }
 
         /*
          * G5's seem to have incorrect cable type in device-tree.
@@ -954,9 +965,9 @@ static const struct ide_tp_ops pmac_tp_ops = {
         .exec_command           = pmac_exec_command,
         .read_status            = ide_read_status,
         .read_altstatus         = ide_read_altstatus,
+        .write_devctl           = pmac_write_devctl,
 
-        .set_irq                = pmac_set_irq,
-
+        .dev_select             = pmac_dev_select,
         .tf_load                = ide_tf_load,
         .tf_read                = ide_tf_read,
 
@@ -964,19 +975,24 @@ static const struct ide_tp_ops pmac_tp_ops = {
         .output_data            = ide_output_data,
 };
 
-static const struct ide_port_ops pmac_ide_ata6_port_ops = {
-        .init_dev               = pmac_ide_init_dev,
-        .set_pio_mode           = pmac_ide_set_pio_mode,
-        .set_dma_mode           = pmac_ide_set_dma_mode,
-        .selectproc             = pmac_ide_kauai_selectproc,
-        .cable_detect           = pmac_ide_cable_detect,
+static const struct ide_tp_ops pmac_ata6_tp_ops = {
+        .exec_command           = pmac_exec_command,
+        .read_status            = ide_read_status,
+        .read_altstatus         = ide_read_altstatus,
+        .write_devctl           = pmac_write_devctl,
+
+        .dev_select             = pmac_kauai_dev_select,
+        .tf_load                = ide_tf_load,
+        .tf_read                = ide_tf_read,
+
+        .input_data             = ide_input_data,
+        .output_data            = ide_output_data,
 };
 
 static const struct ide_port_ops pmac_ide_ata4_port_ops = {
         .init_dev               = pmac_ide_init_dev,
         .set_pio_mode           = pmac_ide_set_pio_mode,
         .set_dma_mode           = pmac_ide_set_dma_mode,
-        .selectproc             = pmac_ide_selectproc,
         .cable_detect           = pmac_ide_cable_detect,
 };
 
@@ -984,7 +1000,6 @@ static const struct ide_port_ops pmac_ide_port_ops = {
         .init_dev               = pmac_ide_init_dev,
         .set_pio_mode           = pmac_ide_set_pio_mode,
         .set_dma_mode           = pmac_ide_set_dma_mode,
-        .selectproc             = pmac_ide_selectproc,
 };
 
 static const struct ide_dma_ops pmac_dma_ops;
@@ -1021,15 +1036,18 @@ static int __devinit pmac_ide_setup_device(pmac_ide_hwif_t *pmif, hw_regs_t *hw)
         pmif->broken_dma = pmif->broken_dma_warn = 0;
         if (of_device_is_compatible(np, "shasta-ata")) {
                 pmif->kind = controller_sh_ata6;
-                d.port_ops = &pmac_ide_ata6_port_ops;
+                d.tp_ops = &pmac_ata6_tp_ops;
+                d.port_ops = &pmac_ide_ata4_port_ops;
                 d.udma_mask = ATA_UDMA6;
         } else if (of_device_is_compatible(np, "kauai-ata")) {
                 pmif->kind = controller_un_ata6;
-                d.port_ops = &pmac_ide_ata6_port_ops;
+                d.tp_ops = &pmac_ata6_tp_ops;
+                d.port_ops = &pmac_ide_ata4_port_ops;
                 d.udma_mask = ATA_UDMA5;
         } else if (of_device_is_compatible(np, "K2-UATA")) {
                 pmif->kind = controller_k2_ata6;
-                d.port_ops = &pmac_ide_ata6_port_ops;
+                d.tp_ops = &pmac_ata6_tp_ops;
+                d.port_ops = &pmac_ide_ata4_port_ops;
                 d.udma_mask = ATA_UDMA5;
         } else if (of_device_is_compatible(np, "keylargo-ata")) {
                 if (strcmp(np->name, "ata-4") == 0) {
@@ -1455,7 +1473,7 @@ static int pmac_ide_build_dmatable(ide_drive_t *drive, struct ide_cmd *cmd)
                                        "switching to PIO on Ohare chipset\n", drive->name);
                                 pmif->broken_dma_warn = 1;
                         }
-                        goto use_pio_instead;
+                        return 0;
                 }
                 while (cur_len) {
                         unsigned int tc = (cur_len < 0xfe00)? cur_len: 0xfe00;
@@ -1463,7 +1481,7 @@ static int pmac_ide_build_dmatable(ide_drive_t *drive, struct ide_cmd *cmd)
                         if (count++ >= MAX_DCMDS) {
                                 printk(KERN_WARNING "%s: DMA table too small\n",
                                        drive->name);
-                                goto use_pio_instead;
+                                return 0;
                         }
                         st_le16(&table->command, wr? OUTPUT_MORE: INPUT_MORE);
                         st_le16(&table->req_count, tc);
@@ -1492,9 +1510,6 @@ static int pmac_ide_build_dmatable(ide_drive_t *drive, struct ide_cmd *cmd)
 
         printk(KERN_DEBUG "%s: empty DMA table?\n", drive->name);
 
-use_pio_instead:
-        ide_destroy_dmatable(drive);
-
         return 0; /* revert to PIO for this request */
 }
 
@@ -1510,10 +1525,8 @@ static int pmac_ide_dma_setup(ide_drive_t *drive, struct ide_cmd *cmd)
         u8 unit = drive->dn & 1, ata4 = (pmif->kind == controller_kl_ata4);
         u8 write = !!(cmd->tf_flags & IDE_TFLAG_WRITE);
 
-        if (pmac_ide_build_dmatable(drive, cmd) == 0) {
-                ide_map_sg(drive, cmd);
+        if (pmac_ide_build_dmatable(drive, cmd) == 0)
                 return 1;
-        }
 
         /* Apple adds 60ns to wrDataSetup on reads */
         if (ata4 && (pmif->timings[unit] & TR_66_UDMA_EN)) {
@@ -1522,8 +1535,6 @@ static int pmac_ide_dma_setup(ide_drive_t *drive, struct ide_cmd *cmd)
                 (void)readl(PMAC_IDE_REG(IDE_TIMING_CONFIG));
         }
 
-        drive->waiting_for_dma = 1;
-
         return 0;
 }
 
@@ -1558,12 +1569,9 @@ pmac_ide_dma_end (ide_drive_t *drive)
         volatile struct dbdma_regs __iomem *dma = pmif->dma_regs;
         u32 dstat;
 
-        drive->waiting_for_dma = 0;
         dstat = readl(&dma->status);
         writel(((RUN|WAKE|DEAD) << 16), &dma->control);
 
-        ide_destroy_dmatable(drive);
-
         /* verify good dma status. we don't check for ACTIVE beeing 0. We should...
          * in theory, but with ATAPI decices doing buffer underruns, that would
          * cause us to disable DMA, which isn't what we want
@@ -1650,7 +1658,6 @@ static const struct ide_dma_ops pmac_dma_ops = {
         .dma_start              = pmac_ide_dma_start,
         .dma_end                = pmac_ide_dma_end,
         .dma_test_irq           = pmac_ide_dma_test_irq,
-        .dma_timeout            = ide_dma_timeout,
         .dma_lost_irq           = pmac_ide_dma_lost_irq,
 };
 
diff --git a/drivers/ide/q40ide.c b/drivers/ide/q40ide.c
index 2a43a2f49633..d007e7f66598 100644
--- a/drivers/ide/q40ide.c
+++ b/drivers/ide/q40ide.c
@@ -99,9 +99,9 @@ static const struct ide_tp_ops q40ide_tp_ops = {
         .exec_command           = ide_exec_command,
         .read_status            = ide_read_status,
         .read_altstatus         = ide_read_altstatus,
+        .write_devctl           = ide_write_devctl,
 
-        .set_irq                = ide_set_irq,
-
+        .dev_select             = ide_dev_select,
         .tf_load                = ide_tf_load,
         .tf_read                = ide_tf_read,
 
diff --git a/drivers/ide/qd65xx.c b/drivers/ide/qd65xx.c
index 08c4fa35e9b1..c9a134986891 100644
--- a/drivers/ide/qd65xx.c
+++ b/drivers/ide/qd65xx.c
@@ -90,13 +90,15 @@ static int timings[4]={-1,-1,-1,-1}; /* stores current timing for each timer */
  * This routine is invoked to prepare for access to a given drive.
  */
 
-static void qd65xx_select(ide_drive_t *drive)
+static void qd65xx_dev_select(ide_drive_t *drive)
 {
         u8 index = ((   (QD_TIMREG(drive)) & 0x80 ) >> 7) |
                         (QD_TIMREG(drive) & 0x02);
 
         if (timings[index] != QD_TIMING(drive))
                 outb(timings[index] = QD_TIMING(drive), QD_TIMREG(drive));
+
+        outb(drive->select | ATA_DEVICE_OBS, drive->hwif->io_ports.device_addr);
 }
 
 /*
@@ -309,20 +311,33 @@ static void __init qd6580_init_dev(ide_drive_t *drive)
         drive->drive_data = (drive->dn & 1) ? t2 : t1;
 }
 
+static const struct ide_tp_ops qd65xx_tp_ops = {
+        .exec_command           = ide_exec_command,
+        .read_status            = ide_read_status,
+        .read_altstatus         = ide_read_altstatus,
+        .write_devctl           = ide_write_devctl,
+
+        .dev_select             = qd65xx_dev_select,
+        .tf_load                = ide_tf_load,
+        .tf_read                = ide_tf_read,
+
+        .input_data             = ide_input_data,
+        .output_data            = ide_output_data,
+};
+
 static const struct ide_port_ops qd6500_port_ops = {
         .init_dev               = qd6500_init_dev,
         .set_pio_mode           = qd6500_set_pio_mode,
-        .selectproc             = qd65xx_select,
 };
 
 static const struct ide_port_ops qd6580_port_ops = {
         .init_dev               = qd6580_init_dev,
         .set_pio_mode           = qd6580_set_pio_mode,
-        .selectproc             = qd65xx_select,
 };
 
 static const struct ide_port_info qd65xx_port_info __initdata = {
         .name                   = DRV_NAME,
+        .tp_ops                 = &qd65xx_tp_ops,
         .chipset                = ide_qd65xx,
         .host_flags             = IDE_HFLAG_IO_32BIT |
                                   IDE_HFLAG_NO_DMA,
diff --git a/drivers/ide/sc1200.c b/drivers/ide/sc1200.c
index 1c3a82914999..d467478d68da 100644
--- a/drivers/ide/sc1200.c
+++ b/drivers/ide/sc1200.c
@@ -115,8 +115,7 @@ static u8 sc1200_udma_filter(ide_drive_t *drive)
                 if ((mateid[ATA_ID_FIELD_VALID] & 4) &&
                     (mateid[ATA_ID_UDMA_MODES] & 7))
                         goto out;
-                if ((mateid[ATA_ID_FIELD_VALID] & 2) &&
-                    (mateid[ATA_ID_MWDMA_MODES] & 7))
+                if (mateid[ATA_ID_MWDMA_MODES] & 7)
                         mask = 0;
         }
 out:
@@ -183,9 +182,6 @@ static int sc1200_dma_end(ide_drive_t *drive)
         outb(dma_stat|0x1b, dma_base+2);        /* clear the INTR & ERROR bits */
         outb(inb(dma_base)&~1, dma_base);       /* !! DO THIS HERE !! stop DMA */
 
-        drive->waiting_for_dma = 0;
-        ide_destroy_dmatable(drive);            /* purge DMA mappings */
-
         return (dma_stat & 7) != 4;             /* verify good DMA status */
 }
 
@@ -291,7 +287,6 @@ static const struct ide_dma_ops sc1200_dma_ops = {
         .dma_test_irq           = ide_dma_test_irq,
         .dma_lost_irq           = ide_dma_lost_irq,
         .dma_timer_expiry       = ide_dma_sff_timer_expiry,
-        .dma_timeout            = ide_dma_timeout,
         .dma_sff_read_status    = ide_dma_sff_read_status,
 };
 
diff --git a/drivers/ide/scc_pata.c b/drivers/ide/scc_pata.c
index 0cc137cfe76d..6d8dbd9c10bc 100644
--- a/drivers/ide/scc_pata.c
+++ b/drivers/ide/scc_pata.c
@@ -148,17 +148,8 @@ static u8 scc_dma_sff_read_status(ide_hwif_t *hwif)
         return (u8)in_be32((void *)(hwif->dma_base + 4));
 }
 
-static void scc_set_irq(ide_hwif_t *hwif, int on)
+static void scc_write_devctl(ide_hwif_t *hwif, u8 ctl)
 {
-        u8 ctl = ATA_DEVCTL_OBS;
-
-        if (on == 4) { /* hack for SRST */
-                ctl |= 4;
-                on &= ~4;
-        }
-
-        ctl |= on ? 0 : 2;
-
         out_be32((void *)hwif->io_ports.ctl_addr, ctl);
         eieio();
         in_be32((void *)(hwif->dma_base + 0x01c));
@@ -321,10 +312,8 @@ static int scc_dma_setup(ide_drive_t *drive, struct ide_cmd *cmd)
         u8 dma_stat;
 
         /* fall back to pio! */
-        if (ide_build_dmatable(drive, cmd) == 0) {
-                ide_map_sg(drive, cmd);
+        if (ide_build_dmatable(drive, cmd) == 0)
                 return 1;
-        }
 
         /* PRD table */
         out_be32((void __iomem *)(hwif->dma_base + 8), hwif->dmatable_dma);
@@ -337,7 +326,7 @@ static int scc_dma_setup(ide_drive_t *drive, struct ide_cmd *cmd)
 
         /* clear INTR & ERROR flags */
         out_be32((void __iomem *)(hwif->dma_base + 4), dma_stat | 6);
-        drive->waiting_for_dma = 1;
+
         return 0;
 }
 
@@ -356,7 +345,6 @@ static int __scc_dma_end(ide_drive_t *drive)
         ide_hwif_t *hwif = drive->hwif;
         u8 dma_stat, dma_cmd;
 
-        drive->waiting_for_dma = 0;
         /* get DMA command mode */
         dma_cmd = scc_ide_inb(hwif->dma_base);
         /* stop DMA */
@@ -365,8 +353,6 @@ static int __scc_dma_end(ide_drive_t *drive)
         dma_stat = scc_dma_sff_read_status(hwif);
         /* clear the INTR & ERROR bits */
         scc_ide_outb(dma_stat | 6, hwif->dma_base + 4);
-        /* purge DMA mappings */
-        ide_destroy_dmatable(drive);
         /* verify good DMA status */
         wmb();
         return (dma_stat & 7) != 4 ? (0x10 | dma_stat) : 0;
@@ -670,10 +656,6 @@ static void scc_tf_load(ide_drive_t *drive, struct ide_cmd *cmd)
         if (cmd->ftf_flags & IDE_FTFLAG_FLAGGED)
                 HIHI = 0xFF;
 
-        if (cmd->ftf_flags & IDE_FTFLAG_OUT_DATA)
-                out_be32((void *)io_ports->data_addr,
-                         (tf->hob_data << 8) | tf->data);
-
         if (cmd->tf_flags & IDE_TFLAG_OUT_HOB_FEATURE)
                 scc_ide_outb(tf->hob_feature, io_ports->feature_addr);
         if (cmd->tf_flags & IDE_TFLAG_OUT_HOB_NSECT)
@@ -706,18 +688,11 @@ static void scc_tf_read(ide_drive_t *drive, struct ide_cmd *cmd)
         struct ide_io_ports *io_ports = &drive->hwif->io_ports;
         struct ide_taskfile *tf = &cmd->tf;
 
-        if (cmd->ftf_flags & IDE_FTFLAG_IN_DATA) {
-                u16 data = (u16)in_be32((void *)io_ports->data_addr);
-
-                tf->data = data & 0xff;
-                tf->hob_data = (data >> 8) & 0xff;
-        }
-
         /* be sure we're looking at the low order bits */
-        scc_ide_outb(ATA_DEVCTL_OBS & ~0x80, io_ports->ctl_addr);
+        scc_ide_outb(ATA_DEVCTL_OBS, io_ports->ctl_addr);
 
-        if (cmd->tf_flags & IDE_TFLAG_IN_FEATURE)
-                tf->feature = scc_ide_inb(io_ports->feature_addr);
+        if (cmd->tf_flags & IDE_TFLAG_IN_ERROR)
+                tf->error  = scc_ide_inb(io_ports->feature_addr);
         if (cmd->tf_flags & IDE_TFLAG_IN_NSECT)
                 tf->nsect  = scc_ide_inb(io_ports->nsect_addr);
         if (cmd->tf_flags & IDE_TFLAG_IN_LBAL)
@@ -730,18 +705,18 @@ static void scc_tf_read(ide_drive_t *drive, struct ide_cmd *cmd)
                 tf->device = scc_ide_inb(io_ports->device_addr);
 
         if (cmd->tf_flags & IDE_TFLAG_LBA48) {
-                scc_ide_outb(ATA_DEVCTL_OBS | 0x80, io_ports->ctl_addr);
+                scc_ide_outb(ATA_HOB | ATA_DEVCTL_OBS, io_ports->ctl_addr);
 
-                if (cmd->tf_flags & IDE_TFLAG_IN_HOB_FEATURE)
-                        tf->hob_feature = scc_ide_inb(io_ports->feature_addr);
+                if (cmd->tf_flags & IDE_TFLAG_IN_HOB_ERROR)
+                        tf->hob_error = scc_ide_inb(io_ports->feature_addr);
                 if (cmd->tf_flags & IDE_TFLAG_IN_HOB_NSECT)
-                        tf->hob_nsect   = scc_ide_inb(io_ports->nsect_addr);
+                        tf->hob_nsect = scc_ide_inb(io_ports->nsect_addr);
                 if (cmd->tf_flags & IDE_TFLAG_IN_HOB_LBAL)
-                        tf->hob_lbal    = scc_ide_inb(io_ports->lbal_addr);
+                        tf->hob_lbal  = scc_ide_inb(io_ports->lbal_addr);
                 if (cmd->tf_flags & IDE_TFLAG_IN_HOB_LBAM)
-                        tf->hob_lbam    = scc_ide_inb(io_ports->lbam_addr);
+                        tf->hob_lbam  = scc_ide_inb(io_ports->lbam_addr);
                 if (cmd->tf_flags & IDE_TFLAG_IN_HOB_LBAH)
-                        tf->hob_lbah    = scc_ide_inb(io_ports->lbah_addr);
+                        tf->hob_lbah  = scc_ide_inb(io_ports->lbah_addr);
         }
 }
 
@@ -848,9 +823,9 @@ static const struct ide_tp_ops scc_tp_ops = {
         .exec_command           = scc_exec_command,
         .read_status            = scc_read_status,
         .read_altstatus         = scc_read_altstatus,
+        .write_devctl           = scc_write_devctl,
 
-        .set_irq                = scc_set_irq,
-
+        .dev_select             = ide_dev_select,
         .tf_load                = scc_tf_load,
         .tf_read                = scc_tf_read,
 
@@ -872,7 +847,6 @@ static const struct ide_dma_ops scc_dma_ops = {
         .dma_end                = scc_dma_end,
         .dma_test_irq           = scc_dma_test_irq,
         .dma_lost_irq           = ide_dma_lost_irq,
-        .dma_timeout            = ide_dma_timeout,
         .dma_timer_expiry       = ide_dma_sff_timer_expiry,
         .dma_sff_read_status    = scc_dma_sff_read_status,
 };
diff --git a/drivers/ide/sgiioc4.c b/drivers/ide/sgiioc4.c
index b12de8346c73..e5d2a48a84de 100644
--- a/drivers/ide/sgiioc4.c
+++ b/drivers/ide/sgiioc4.c
@@ -258,9 +258,6 @@ static int sgiioc4_dma_end(ide_drive_t *drive)
                 }
         }
 
-        drive->waiting_for_dma = 0;
-        ide_destroy_dmatable(drive);
-
         return dma_stat;
 }
 
@@ -280,10 +277,12 @@ static void sgiioc4_dma_host_set(ide_drive_t *drive, int on)
                 sgiioc4_clearirq(drive);
 }
 
-static void
-sgiioc4_resetproc(ide_drive_t * drive)
+static void sgiioc4_resetproc(ide_drive_t *drive)
 {
+        struct ide_cmd *cmd = &drive->hwif->cmd;
+
         sgiioc4_dma_end(drive);
+        ide_dma_unmap_sg(drive, cmd);
         sgiioc4_clearirq(drive);
 }
 
@@ -412,7 +411,6 @@ sgiioc4_configure_for_dma(int dma_direction, ide_drive_t * drive)
         writel(ending_dma_addr, (void __iomem *)(dma_base + IOC4_DMA_END_ADDR * 4));
 
         writel(dma_direction, (void __iomem *)ioc4_dma_addr);
-        drive->waiting_for_dma = 1;
 }
 
 /* IOC4 Scatter Gather list Format                                       */
@@ -442,7 +440,7 @@ static int sgiioc4_build_dmatable(ide_drive_t *drive, struct ide_cmd *cmd)
                                 printk(KERN_WARNING
                                        "%s: DMA table too small\n",
                                        drive->name);
-                                goto use_pio_instead;
+                                return 0;
                         } else {
                                 u32 bcount =
                                     0x10000 - (cur_addr & 0xffff);
@@ -477,9 +475,6 @@ static int sgiioc4_build_dmatable(ide_drive_t *drive, struct ide_cmd *cmd)
                 return count;
         }
 
-use_pio_instead:
-        ide_destroy_dmatable(drive);
-
         return 0;               /* revert to PIO for this request */
 }
 
@@ -488,11 +483,9 @@ static int sgiioc4_dma_setup(ide_drive_t *drive, struct ide_cmd *cmd)
         int ddir;
         u8 write = !!(cmd->tf_flags & IDE_TFLAG_WRITE);
 
-        if (sgiioc4_build_dmatable(drive, cmd) == 0) {
+        if (sgiioc4_build_dmatable(drive, cmd) == 0)
                 /* try PIO instead of DMA */
-                ide_map_sg(drive, cmd);
                 return 1;
-        }
 
         if (write)
                 /* Writes TO the IOC4 FROM Main Memory */
@@ -510,9 +503,9 @@ static const struct ide_tp_ops sgiioc4_tp_ops = {
         .exec_command           = ide_exec_command,
         .read_status            = sgiioc4_read_status,
         .read_altstatus         = ide_read_altstatus,
+        .write_devctl           = ide_write_devctl,
 
-        .set_irq                = ide_set_irq,
-
+        .dev_select             = ide_dev_select,
         .tf_load                = ide_tf_load,
         .tf_read                = ide_tf_read,
 
@@ -533,7 +526,6 @@ static const struct ide_dma_ops sgiioc4_dma_ops = {
         .dma_end                = sgiioc4_dma_end,
         .dma_test_irq           = sgiioc4_dma_test_irq,
         .dma_lost_irq           = sgiioc4_dma_lost_irq,
-        .dma_timeout            = ide_dma_timeout,
 };
 
 static const struct ide_port_info sgiioc4_port_info __devinitconst = {
diff --git a/drivers/ide/siimage.c b/drivers/ide/siimage.c
index 075cb1243b2a..e4973cd1fba9 100644
--- a/drivers/ide/siimage.c
+++ b/drivers/ide/siimage.c
@@ -715,7 +715,6 @@ static const struct ide_dma_ops sil_dma_ops = {
         .dma_end                = ide_dma_end,
         .dma_test_irq           = siimage_dma_test_irq,
         .dma_timer_expiry       = ide_dma_sff_timer_expiry,
-        .dma_timeout            = ide_dma_timeout,
         .dma_lost_irq           = ide_dma_lost_irq,
         .dma_sff_read_status    = ide_dma_sff_read_status,
 };
diff --git a/drivers/ide/sl82c105.c b/drivers/ide/sl82c105.c
index d25137b04e7a..b0a460625335 100644
--- a/drivers/ide/sl82c105.c
+++ b/drivers/ide/sl82c105.c
@@ -61,7 +61,8 @@ static unsigned int get_pio_timings(ide_drive_t *drive, u8 pio)
         if (cmd_off == 0)
                 cmd_off = 1;
 
-        if (pio > 2 || ata_id_has_iordy(drive->id))
+        if ((pio > 2 || ata_id_has_iordy(drive->id)) &&
+            !(pio > 4 && ata_id_is_cfa(drive->id)))
                 iordy = 0x40;
 
         return (cmd_on - 1) << 8 | (cmd_off - 1) | iordy;
@@ -189,14 +190,13 @@ static void sl82c105_dma_start(ide_drive_t *drive)
         ide_dma_start(drive);
 }
 
-static void sl82c105_dma_timeout(ide_drive_t *drive)
+static void sl82c105_dma_clear(ide_drive_t *drive)
 {
         struct pci_dev *dev = to_pci_dev(drive->hwif->dev);
 
-        DBG(("sl82c105_dma_timeout(drive:%s)\n", drive->name));
+        DBG(("sl82c105_dma_clear(drive:%s)\n", drive->name));
 
         sl82c105_reset_host(dev);
-        ide_dma_timeout(drive);
 }
 
 static int sl82c105_dma_end(ide_drive_t *drive)
@@ -298,7 +298,7 @@ static const struct ide_dma_ops sl82c105_dma_ops = {
         .dma_test_irq           = ide_dma_test_irq,
         .dma_lost_irq           = sl82c105_dma_lost_irq,
         .dma_timer_expiry       = ide_dma_sff_timer_expiry,
-        .dma_timeout            = sl82c105_dma_timeout,
+        .dma_clear              = sl82c105_dma_clear,
         .dma_sff_read_status    = ide_dma_sff_read_status,
 };
 
diff --git a/drivers/ide/tc86c001.c b/drivers/ide/tc86c001.c
index 427d4b3c2c63..b4cf42dc8a6f 100644
--- a/drivers/ide/tc86c001.c
+++ b/drivers/ide/tc86c001.c
@@ -187,7 +187,6 @@ static const struct ide_dma_ops tc86c001_dma_ops = {
         .dma_test_irq           = ide_dma_test_irq,
         .dma_lost_irq           = ide_dma_lost_irq,
         .dma_timer_expiry       = ide_dma_sff_timer_expiry,
-        .dma_timeout            = ide_dma_timeout,
         .dma_sff_read_status    = ide_dma_sff_read_status,
 };
 
diff --git a/drivers/ide/trm290.c b/drivers/ide/trm290.c
index ed1496845a93..4b42ca091534 100644
--- a/drivers/ide/trm290.c
+++ b/drivers/ide/trm290.c
@@ -171,54 +171,51 @@ static void trm290_prepare_drive (ide_drive_t *drive, unsigned int use_dma)
         local_irq_restore(flags);
 }
 
-static void trm290_selectproc (ide_drive_t *drive)
+static void trm290_dev_select(ide_drive_t *drive)
 {
         trm290_prepare_drive(drive, !!(drive->dev_flags & IDE_DFLAG_USING_DMA));
+
+        outb(drive->select | ATA_DEVICE_OBS, drive->hwif->io_ports.device_addr);
 }
 
-static int trm290_dma_setup(ide_drive_t *drive, struct ide_cmd *cmd)
+static int trm290_dma_check(ide_drive_t *drive, struct ide_cmd *cmd)
 {
-        ide_hwif_t *hwif = drive->hwif;
-        unsigned int count, rw;
-
         if (cmd->tf_flags & IDE_TFLAG_WRITE) {
 #ifdef TRM290_NO_DMA_WRITES
                 /* always use PIO for writes */
-                trm290_prepare_drive(drive, 0); /* select PIO xfer */
                 return 1;
 #endif
-                rw = 1;
-        } else
-                rw = 2;
+        }
+        return 0;
+}
+
+static int trm290_dma_setup(ide_drive_t *drive, struct ide_cmd *cmd)
+{
+        ide_hwif_t *hwif = drive->hwif;
+        unsigned int count, rw = (cmd->tf_flags & IDE_TFLAG_WRITE) ? 1 : 2;
 
         count = ide_build_dmatable(drive, cmd);
-        if (count == 0) {
-                ide_map_sg(drive, cmd);
+        if (count == 0)
                 /* try PIO instead of DMA */
-                trm290_prepare_drive(drive, 0); /* select PIO xfer */
                 return 1;
-        }
-        /* select DMA xfer */
-        trm290_prepare_drive(drive, 1);
+
         outl(hwif->dmatable_dma | rw, hwif->dma_base);
-        drive->waiting_for_dma = 1;
         /* start DMA */
         outw(count * 2 - 1, hwif->dma_base + 2);
+
         return 0;
 }
 
 static void trm290_dma_start(ide_drive_t *drive)
 {
+        trm290_prepare_drive(drive, 1);
 }
 
 static int trm290_dma_end(ide_drive_t *drive)
 {
-        u16 status;
+        u16 status = inw(drive->hwif->dma_base + 2);
 
-        drive->waiting_for_dma = 0;
-        /* purge DMA mappings */
-        ide_destroy_dmatable(drive);
-        status = inw(drive->hwif->dma_base + 2);
+        trm290_prepare_drive(drive, 0);
 
         return status != 0x00ff;
 }
@@ -303,8 +300,18 @@ static void __devinit init_hwif_trm290(ide_hwif_t *hwif)
 #endif
 }
 
-static const struct ide_port_ops trm290_port_ops = {
-        .selectproc             = trm290_selectproc,
+static const struct ide_tp_ops trm290_tp_ops = {
+        .exec_command           = ide_exec_command,
+        .read_status            = ide_read_status,
+        .read_altstatus         = ide_read_altstatus,
+        .write_devctl           = ide_write_devctl,
+
+        .dev_select             = trm290_dev_select,
+        .tf_load                = ide_tf_load,
+        .tf_read                = ide_tf_read,
+
+        .input_data             = ide_input_data,
+        .output_data            = ide_output_data,
 };
 
 static struct ide_dma_ops trm290_dma_ops = {
@@ -314,13 +321,13 @@ static struct ide_dma_ops trm290_dma_ops = {
         .dma_end                = trm290_dma_end,
         .dma_test_irq           = trm290_dma_test_irq,
         .dma_lost_irq           = ide_dma_lost_irq,
-        .dma_timeout            = ide_dma_timeout,
+        .dma_check              = trm290_dma_check,
 };
 
 static const struct ide_port_info trm290_chipset __devinitdata = {
         .name           = DRV_NAME,
         .init_hwif      = init_hwif_trm290,
-        .port_ops       = &trm290_port_ops,
+        .tp_ops         = &trm290_tp_ops,
         .dma_ops        = &trm290_dma_ops,
         .host_flags     = IDE_HFLAG_TRM290 |
                           IDE_HFLAG_NO_ATAPI_DMA |
diff --git a/drivers/ide/tx4938ide.c b/drivers/ide/tx4938ide.c
index 657a61890b1c..4cb79c4c2604 100644
--- a/drivers/ide/tx4938ide.c
+++ b/drivers/ide/tx4938ide.c
@@ -92,13 +92,6 @@ static void tx4938ide_tf_load(ide_drive_t *drive, struct ide_cmd *cmd)
         if (cmd->ftf_flags & IDE_FTFLAG_FLAGGED)
                 HIHI = 0xFF;
 
-        if (cmd->ftf_flags & IDE_FTFLAG_OUT_DATA) {
-                u16 data = (tf->hob_data << 8) | tf->data;
-
-                /* no endian swap */
-                __raw_writew(data, (void __iomem *)io_ports->data_addr);
-        }
-
         if (cmd->tf_flags & IDE_TFLAG_OUT_HOB_FEATURE)
                 tx4938ide_outb(tf->hob_feature, io_ports->feature_addr);
         if (cmd->tf_flags & IDE_TFLAG_OUT_HOB_NSECT)
@@ -132,20 +125,11 @@ static void tx4938ide_tf_read(ide_drive_t *drive, struct ide_cmd *cmd)
         struct ide_io_ports *io_ports = &hwif->io_ports;
         struct ide_taskfile *tf = &cmd->tf;
 
-        if (cmd->ftf_flags & IDE_FTFLAG_IN_DATA) {
-                u16 data;
-
-                /* no endian swap */
-                data = __raw_readw((void __iomem *)io_ports->data_addr);
-                tf->data = data & 0xff;
-                tf->hob_data = (data >> 8) & 0xff;
-        }
-
         /* be sure we're looking at the low order bits */
-        tx4938ide_outb(ATA_DEVCTL_OBS & ~0x80, io_ports->ctl_addr);
+        tx4938ide_outb(ATA_DEVCTL_OBS, io_ports->ctl_addr);
 
-        if (cmd->tf_flags & IDE_TFLAG_IN_FEATURE)
-                tf->feature = tx4938ide_inb(io_ports->feature_addr);
+        if (cmd->tf_flags & IDE_TFLAG_IN_ERROR)
+                tf->error  = tx4938ide_inb(io_ports->feature_addr);
         if (cmd->tf_flags & IDE_TFLAG_IN_NSECT)
                 tf->nsect  = tx4938ide_inb(io_ports->nsect_addr);
         if (cmd->tf_flags & IDE_TFLAG_IN_LBAL)
@@ -158,19 +142,18 @@ static void tx4938ide_tf_read(ide_drive_t *drive, struct ide_cmd *cmd)
                 tf->device = tx4938ide_inb(io_ports->device_addr);
 
         if (cmd->tf_flags & IDE_TFLAG_LBA48) {
-                tx4938ide_outb(ATA_DEVCTL_OBS | 0x80, io_ports->ctl_addr);
+                tx4938ide_outb(ATA_HOB | ATA_DEVCTL_OBS, io_ports->ctl_addr);
 
-                if (cmd->tf_flags & IDE_TFLAG_IN_HOB_FEATURE)
-                        tf->hob_feature =
-                                tx4938ide_inb(io_ports->feature_addr);
+                if (cmd->tf_flags & IDE_TFLAG_IN_HOB_ERROR)
+                        tf->hob_error = tx4938ide_inb(io_ports->feature_addr);
                 if (cmd->tf_flags & IDE_TFLAG_IN_HOB_NSECT)
-                        tf->hob_nsect   = tx4938ide_inb(io_ports->nsect_addr);
+                        tf->hob_nsect = tx4938ide_inb(io_ports->nsect_addr);
                 if (cmd->tf_flags & IDE_TFLAG_IN_HOB_LBAL)
-                        tf->hob_lbal    = tx4938ide_inb(io_ports->lbal_addr);
+                        tf->hob_lbal  = tx4938ide_inb(io_ports->lbal_addr);
                 if (cmd->tf_flags & IDE_TFLAG_IN_HOB_LBAM)
-                        tf->hob_lbam    = tx4938ide_inb(io_ports->lbam_addr);
+                        tf->hob_lbam  = tx4938ide_inb(io_ports->lbam_addr);
                 if (cmd->tf_flags & IDE_TFLAG_IN_HOB_LBAH)
-                        tf->hob_lbah    = tx4938ide_inb(io_ports->lbah_addr);
+                        tf->hob_lbah  = tx4938ide_inb(io_ports->lbah_addr);
         }
 }
 
@@ -204,9 +187,9 @@ static const struct ide_tp_ops tx4938ide_tp_ops = {
         .exec_command           = ide_exec_command,
         .read_status            = ide_read_status,
         .read_altstatus         = ide_read_altstatus,
+        .write_devctl           = ide_write_devctl,
 
-        .set_irq                = ide_set_irq,
-
+        .dev_select             = ide_dev_select,
         .tf_load                = tx4938ide_tf_load,
         .tf_read                = tx4938ide_tf_read,
 
diff --git a/drivers/ide/tx4939ide.c b/drivers/ide/tx4939ide.c
index e0e0a803dde3..0040a9a3e26e 100644
--- a/drivers/ide/tx4939ide.c
+++ b/drivers/ide/tx4939ide.c
@@ -279,8 +279,6 @@ use_pio_instead:
         printk(KERN_ERR "%s: %s\n", drive->name,
                 count ? "DMA table too small" : "empty DMA table?");
 
-        ide_destroy_dmatable(drive);
-
         return 0; /* revert to PIO for this request */
 }
 #else
@@ -294,10 +292,8 @@ static int tx4939ide_dma_setup(ide_drive_t *drive, struct ide_cmd *cmd)
         u8 rw = (cmd->tf_flags & IDE_TFLAG_WRITE) ? 0 : ATA_DMA_WR;
 
         /* fall back to PIO! */
-        if (tx4939ide_build_dmatable(drive, cmd) == 0) {
-                ide_map_sg(drive, cmd);
+        if (tx4939ide_build_dmatable(drive, cmd) == 0)
                 return 1;
-        }
 
         /* PRD table */
         tx4939ide_writel(hwif->dmatable_dma, base, TX4939IDE_PRD_Ptr);
@@ -308,8 +304,6 @@ static int tx4939ide_dma_setup(ide_drive_t *drive, struct ide_cmd *cmd)
         /* clear INTR & ERROR flags */
         tx4939ide_clear_dma_status(base);
 
-        drive->waiting_for_dma = 1;
-
         tx4939ide_writew(SECTOR_SIZE / 2, base, drive->dn ?
                          TX4939IDE_Xfer_Cnt_2 : TX4939IDE_Xfer_Cnt_1);
 
@@ -325,8 +319,6 @@ static int tx4939ide_dma_end(ide_drive_t *drive)
         void __iomem *base = TX4939IDE_BASE(hwif);
         u16 ctl = tx4939ide_readw(base, TX4939IDE_Int_Ctl);
 
-        drive->waiting_for_dma = 0;
-
         /* get DMA command mode */
         dma_cmd = tx4939ide_readb(base, TX4939IDE_DMA_Cmd);
         /* stop DMA */
@@ -335,11 +327,9 @@ static int tx4939ide_dma_end(ide_drive_t *drive)
         /* read and clear the INTR & ERROR bits */
         dma_stat = tx4939ide_clear_dma_status(base);
 
-        /* purge DMA mappings */
-        ide_destroy_dmatable(drive);
-        /* verify good DMA status */
         wmb();
 
+        /* verify good DMA status */
         if ((dma_stat & (ATA_DMA_INTR | ATA_DMA_ERR | ATA_DMA_ACTIVE)) == 0 &&
             (ctl & (TX4939IDE_INT_XFEREND | TX4939IDE_INT_HOST)) ==
             (TX4939IDE_INT_XFEREND | TX4939IDE_INT_HOST))
@@ -439,7 +429,7 @@ static void tx4939ide_tf_load_fixup(ide_drive_t *drive)
          * Fix ATA100 CORE System Control Register. (The write to the
          * Device/Head register may write wrong data to the System
          * Control Register)
-         * While Sys_Ctl is written here, selectproc is not needed.
+         * While Sys_Ctl is written here, dev_select() is not needed.
          */
         tx4939ide_writew(sysctl, base, TX4939IDE_Sys_Ctl);
 }
@@ -467,13 +457,6 @@ static void tx4939ide_tf_load(ide_drive_t *drive, struct ide_cmd *cmd)
         if (cmd->ftf_flags & IDE_FTFLAG_FLAGGED)
                 HIHI = 0xFF;
 
-        if (cmd->ftf_flags & IDE_FTFLAG_OUT_DATA) {
-                u16 data = (tf->hob_data << 8) | tf->data;
-
-                /* no endian swap */
-                __raw_writew(data, (void __iomem *)io_ports->data_addr);
-        }
-
         if (cmd->tf_flags & IDE_TFLAG_OUT_HOB_FEATURE)
                 tx4939ide_outb(tf->hob_feature, io_ports->feature_addr);
         if (cmd->tf_flags & IDE_TFLAG_OUT_HOB_NSECT)
@@ -509,20 +492,11 @@ static void tx4939ide_tf_read(ide_drive_t *drive, struct ide_cmd *cmd)
         struct ide_io_ports *io_ports = &hwif->io_ports;
         struct ide_taskfile *tf = &cmd->tf;
 
-        if (cmd->ftf_flags & IDE_FTFLAG_IN_DATA) {
-                u16 data;
-
-                /* no endian swap */
-                data = __raw_readw((void __iomem *)io_ports->data_addr);
-                tf->data = data & 0xff;
-                tf->hob_data = (data >> 8) & 0xff;
-        }
-
         /* be sure we're looking at the low order bits */
-        tx4939ide_outb(ATA_DEVCTL_OBS & ~0x80, io_ports->ctl_addr);
+        tx4939ide_outb(ATA_DEVCTL_OBS, io_ports->ctl_addr);
 
-        if (cmd->tf_flags & IDE_TFLAG_IN_FEATURE)
-                tf->feature = tx4939ide_inb(io_ports->feature_addr);
+        if (cmd->tf_flags & IDE_TFLAG_IN_ERROR)
+                tf->error  = tx4939ide_inb(io_ports->feature_addr);
         if (cmd->tf_flags & IDE_TFLAG_IN_NSECT)
                 tf->nsect  = tx4939ide_inb(io_ports->nsect_addr);
         if (cmd->tf_flags & IDE_TFLAG_IN_LBAL)
@@ -535,19 +509,18 @@ static void tx4939ide_tf_read(ide_drive_t *drive, struct ide_cmd *cmd)
                 tf->device = tx4939ide_inb(io_ports->device_addr);
 
         if (cmd->tf_flags & IDE_TFLAG_LBA48) {
-                tx4939ide_outb(ATA_DEVCTL_OBS | 0x80, io_ports->ctl_addr);
+                tx4939ide_outb(ATA_HOB | ATA_DEVCTL_OBS, io_ports->ctl_addr);
 
-                if (cmd->tf_flags & IDE_TFLAG_IN_HOB_FEATURE)
-                        tf->hob_feature =
-                                tx4939ide_inb(io_ports->feature_addr);
+                if (cmd->tf_flags & IDE_TFLAG_IN_HOB_ERROR)
+                        tf->hob_error = tx4939ide_inb(io_ports->feature_addr);
                 if (cmd->tf_flags & IDE_TFLAG_IN_HOB_NSECT)
-                        tf->hob_nsect   = tx4939ide_inb(io_ports->nsect_addr);
+                        tf->hob_nsect = tx4939ide_inb(io_ports->nsect_addr);
                 if (cmd->tf_flags & IDE_TFLAG_IN_HOB_LBAL)
-                        tf->hob_lbal    = tx4939ide_inb(io_ports->lbal_addr);
+                        tf->hob_lbal  = tx4939ide_inb(io_ports->lbal_addr);
                 if (cmd->tf_flags & IDE_TFLAG_IN_HOB_LBAM)
-                        tf->hob_lbam    = tx4939ide_inb(io_ports->lbam_addr);
+                        tf->hob_lbam  = tx4939ide_inb(io_ports->lbam_addr);
                 if (cmd->tf_flags & IDE_TFLAG_IN_HOB_LBAH)
-                        tf->hob_lbah    = tx4939ide_inb(io_ports->lbah_addr);
+                        tf->hob_lbah  = tx4939ide_inb(io_ports->lbah_addr);
         }
 }
 
@@ -581,9 +554,9 @@ static const struct ide_tp_ops tx4939ide_tp_ops = {
         .exec_command           = ide_exec_command,
         .read_status            = ide_read_status,
         .read_altstatus         = ide_read_altstatus,
+        .write_devctl           = ide_write_devctl,
 
-        .set_irq                = ide_set_irq,
-
+        .dev_select             = ide_dev_select,
         .tf_load                = tx4939ide_tf_load,
         .tf_read                = tx4939ide_tf_read,
 
@@ -605,9 +578,9 @@ static const struct ide_tp_ops tx4939ide_tp_ops = {
         .exec_command           = ide_exec_command,
         .read_status            = ide_read_status,
         .read_altstatus         = ide_read_altstatus,
+        .write_devctl           = ide_write_devctl,
 
-        .set_irq                = ide_set_irq,
-
+        .dev_select             = ide_dev_select,
         .tf_load                = tx4939ide_tf_load,
         .tf_read                = ide_tf_read,
 
@@ -632,7 +605,6 @@ static const struct ide_dma_ops tx4939ide_dma_ops = {
         .dma_test_irq           = tx4939ide_dma_test_irq,
         .dma_lost_irq           = ide_dma_lost_irq,
         .dma_timer_expiry       = ide_dma_sff_timer_expiry,
-        .dma_timeout            = ide_dma_timeout,
         .dma_sff_read_status    = tx4939ide_dma_sff_read_status,
 };
 
diff --git a/drivers/input/input.c b/drivers/input/input.c
index 1730d7331a5d..ec3db3ade118 100644
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -903,8 +903,6 @@ static int __init input_proc_init(void)
         if (!proc_bus_input_dir)
                 return -ENOMEM;
 
-        proc_bus_input_dir->owner = THIS_MODULE;
-
         entry = proc_create("devices", 0, proc_bus_input_dir,
                             &input_devices_fileops);
         if (!entry)
diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c
index 3e468d2cf730..2d8352419c0d 100644
--- a/drivers/isdn/capi/capi.c
+++ b/drivers/isdn/capi/capi.c
@@ -1331,12 +1331,6 @@ static void capinc_tty_send_xchar(struct tty_struct *tty, char ch)
 #endif
 }
 
-static int capinc_tty_read_proc(char *page, char **start, off_t off,
-                                int count, int *eof, void *data)
-{
-        return 0;
-}
-
 static struct tty_driver *capinc_tty_driver;
 
 static const struct tty_operations capinc_ops = {
@@ -1358,7 +1352,6 @@ static const struct tty_operations capinc_ops = {
         .flush_buffer = capinc_tty_flush_buffer,
         .set_ldisc = capinc_tty_set_ldisc,
         .send_xchar = capinc_tty_send_xchar,
-        .read_proc = capinc_tty_read_proc,
 };
 
 static int capinc_tty_init(void)
diff --git a/drivers/isdn/hardware/eicon/divasi.c b/drivers/isdn/hardware/eicon/divasi.c
index f4969fe0a055..69e71ebe7841 100644
--- a/drivers/isdn/hardware/eicon/divasi.c
+++ b/drivers/isdn/hardware/eicon/divasi.c
@@ -118,7 +118,6 @@ static int DIVA_INIT_FUNCTION create_um_idi_proc(void)
                 return (0);
 
         um_idi_proc_entry->read_proc = um_idi_proc_read;
-        um_idi_proc_entry->owner = THIS_MODULE;
 
         return (1);
 }
diff --git a/drivers/lguest/core.c b/drivers/lguest/core.c
index 60156dfdc608..4845fb3cf74b 100644
--- a/drivers/lguest/core.c
+++ b/drivers/lguest/core.c
@@ -152,8 +152,8 @@ static void unmap_switcher(void)
  * code.  We have to check that the range is below the pfn_limit the Launcher
  * gave us.  We have to make sure that addr + len doesn't give us a false
  * positive by overflowing, too. */
-int lguest_address_ok(const struct lguest *lg,
-                      unsigned long addr, unsigned long len)
+bool lguest_address_ok(const struct lguest *lg,
+                       unsigned long addr, unsigned long len)
 {
         return (addr+len) / PAGE_SIZE < lg->pfn_limit && (addr+len >= addr);
 }
diff --git a/drivers/lguest/interrupts_and_traps.c b/drivers/lguest/interrupts_and_traps.c
index 415fab0125ac..6e99adbe1946 100644
--- a/drivers/lguest/interrupts_and_traps.c
+++ b/drivers/lguest/interrupts_and_traps.c
@@ -34,7 +34,7 @@ static int idt_type(u32 lo, u32 hi)
 }
 
 /* An IDT entry can't be used unless the "present" bit is set. */
-static int idt_present(u32 lo, u32 hi)
+static bool idt_present(u32 lo, u32 hi)
 {
         return (hi & 0x8000);
 }
@@ -60,7 +60,8 @@ static void push_guest_stack(struct lg_cpu *cpu, unsigned long *gstack, u32 val)
  * We set up the stack just like the CPU does for a real interrupt, so it's
  * identical for the Guest (and the standard "iret" instruction will undo
  * it). */
-static void set_guest_interrupt(struct lg_cpu *cpu, u32 lo, u32 hi, int has_err)
+static void set_guest_interrupt(struct lg_cpu *cpu, u32 lo, u32 hi,
+                                bool has_err)
 {
         unsigned long gstack, origstack;
         u32 eflags, ss, irq_enable;
@@ -184,7 +185,7 @@ void maybe_do_interrupt(struct lg_cpu *cpu)
                 /* set_guest_interrupt() takes the interrupt descriptor and a
                  * flag to say whether this interrupt pushes an error code onto
                  * the stack as well: virtual interrupts never do. */
-                set_guest_interrupt(cpu, idt->a, idt->b, 0);
+                set_guest_interrupt(cpu, idt->a, idt->b, false);
         }
 
         /* Every time we deliver an interrupt, we update the timestamp in the
@@ -244,26 +245,26 @@ void free_interrupts(void)
 /*H:220 Now we've got the routines to deliver interrupts, delivering traps like
  * page fault is easy.  The only trick is that Intel decided that some traps
  * should have error codes: */
-static int has_err(unsigned int trap)
+static bool has_err(unsigned int trap)
 {
         return (trap == 8 || (trap >= 10 && trap <= 14) || trap == 17);
 }
 
 /* deliver_trap() returns true if it could deliver the trap. */
-int deliver_trap(struct lg_cpu *cpu, unsigned int num)
+bool deliver_trap(struct lg_cpu *cpu, unsigned int num)
 {
         /* Trap numbers are always 8 bit, but we set an impossible trap number
          * for traps inside the Switcher, so check that here. */
         if (num >= ARRAY_SIZE(cpu->arch.idt))
-                return 0;
+                return false;
 
         /* Early on the Guest hasn't set the IDT entries (or maybe it put a
          * bogus one in): if we fail here, the Guest will be killed. */
         if (!idt_present(cpu->arch.idt[num].a, cpu->arch.idt[num].b))
-                return 0;
+                return false;
         set_guest_interrupt(cpu, cpu->arch.idt[num].a,
                             cpu->arch.idt[num].b, has_err(num));
-        return 1;
+        return true;
 }
 
 /*H:250 Here's the hard part: returning to the Host every time a trap happens
@@ -279,18 +280,19 @@ int deliver_trap(struct lg_cpu *cpu, unsigned int num)
  *
  * This routine indicates if a particular trap number could be delivered
  * directly. */
-static int direct_trap(unsigned int num)
+static bool direct_trap(unsigned int num)
 {
         /* Hardware interrupts don't go to the Guest at all (except system
          * call). */
         if (num >= FIRST_EXTERNAL_VECTOR && !could_be_syscall(num))
-                return 0;
+                return false;
 
         /* The Host needs to see page faults (for shadow paging and to save the
          * fault address), general protection faults (in/out emulation) and
-         * device not available (TS handling), and of course, the hypercall
-         * trap. */
-        return num != 14 && num != 13 && num != 7 && num != LGUEST_TRAP_ENTRY;
+         * device not available (TS handling), invalid opcode fault (kvm hcall),
+         * and of course, the hypercall trap. */
+        return num != 14 && num != 13 && num != 7 &&
+                        num != 6 && num != LGUEST_TRAP_ENTRY;
 }
 /*:*/
 
diff --git a/drivers/lguest/lg.h b/drivers/lguest/lg.h
index f2c641e0bdde..ac8a4a3741b8 100644
--- a/drivers/lguest/lg.h
+++ b/drivers/lguest/lg.h
@@ -109,8 +109,8 @@ struct lguest
 extern struct mutex lguest_lock;
 
 /* core.c: */
-int lguest_address_ok(const struct lguest *lg,
-                      unsigned long addr, unsigned long len);
+bool lguest_address_ok(const struct lguest *lg,
+                       unsigned long addr, unsigned long len);
 void __lgread(struct lg_cpu *, void *, unsigned long, unsigned);
 void __lgwrite(struct lg_cpu *, unsigned long, const void *, unsigned);
 
@@ -140,7 +140,7 @@ int run_guest(struct lg_cpu *cpu, unsigned long __user *user);
 
 /* interrupts_and_traps.c: */
 void maybe_do_interrupt(struct lg_cpu *cpu);
-int deliver_trap(struct lg_cpu *cpu, unsigned int num);
+bool deliver_trap(struct lg_cpu *cpu, unsigned int num);
 void load_guest_idt_entry(struct lg_cpu *cpu, unsigned int i,
                           u32 low, u32 hi);
 void guest_set_stack(struct lg_cpu *cpu, u32 seg, u32 esp, unsigned int pages);
@@ -173,7 +173,7 @@ void guest_pagetable_flush_user(struct lg_cpu *cpu);
 void guest_set_pte(struct lg_cpu *cpu, unsigned long gpgdir,
                    unsigned long vaddr, pte_t val);
 void map_switcher_in_guest(struct lg_cpu *cpu, struct lguest_pages *pages);
-int demand_page(struct lg_cpu *cpu, unsigned long cr2, int errcode);
+bool demand_page(struct lg_cpu *cpu, unsigned long cr2, int errcode);
 void pin_page(struct lg_cpu *cpu, unsigned long vaddr);
 unsigned long guest_pa(struct lg_cpu *cpu, unsigned long vaddr);
 void page_table_guest_data_init(struct lg_cpu *cpu);
diff --git a/drivers/lguest/lguest_device.c b/drivers/lguest/lguest_device.c
index 8132533d71f9..df44d962626d 100644
--- a/drivers/lguest/lguest_device.c
+++ b/drivers/lguest/lguest_device.c
@@ -161,7 +161,7 @@ static void set_status(struct virtio_device *vdev, u8 status)
 
         /* We set the status. */
         to_lgdev(vdev)->desc->status = status;
-        hcall(LHCALL_NOTIFY, (max_pfn<<PAGE_SHIFT) + offset, 0, 0);
+        kvm_hypercall1(LHCALL_NOTIFY, (max_pfn << PAGE_SHIFT) + offset);
 }
 
 static void lg_set_status(struct virtio_device *vdev, u8 status)
@@ -209,7 +209,7 @@ static void lg_notify(struct virtqueue *vq)
          * virtqueue structure. */
         struct lguest_vq_info *lvq = vq->priv;
 
-        hcall(LHCALL_NOTIFY, lvq->config.pfn << PAGE_SHIFT, 0, 0);
+        kvm_hypercall1(LHCALL_NOTIFY, lvq->config.pfn << PAGE_SHIFT);
 }
 
 /* An extern declaration inside a C file is bad form.  Don't do it. */
diff --git a/drivers/lguest/page_tables.c b/drivers/lguest/page_tables.c
index 576a8318221c..a059cf9980f7 100644
--- a/drivers/lguest/page_tables.c
+++ b/drivers/lguest/page_tables.c
@@ -199,7 +199,7 @@ static void check_gpgd(struct lg_cpu *cpu, pgd_t gpgd)
  *
  * If we fixed up the fault (ie. we mapped the address), this routine returns
  * true.  Otherwise, it was a real fault and we need to tell the Guest. */
-int demand_page(struct lg_cpu *cpu, unsigned long vaddr, int errcode)
+bool demand_page(struct lg_cpu *cpu, unsigned long vaddr, int errcode)
 {
         pgd_t gpgd;
         pgd_t *spgd;
@@ -211,7 +211,7 @@ int demand_page(struct lg_cpu *cpu, unsigned long vaddr, int errcode)
         gpgd = lgread(cpu, gpgd_addr(cpu, vaddr), pgd_t);
         /* Toplevel not present?  We can't map it in. */
         if (!(pgd_flags(gpgd) & _PAGE_PRESENT))
-                return 0;
+                return false;
 
         /* Now look at the matching shadow entry. */
         spgd = spgd_addr(cpu, cpu->cpu_pgd, vaddr);
@@ -222,7 +222,7 @@ int demand_page(struct lg_cpu *cpu, unsigned long vaddr, int errcode)
                  * simple for this corner case. */
                 if (!ptepage) {
                         kill_guest(cpu, "out of memory allocating pte page");
-                        return 0;
+                        return false;
                 }
                 /* We check that the Guest pgd is OK. */
                 check_gpgd(cpu, gpgd);
@@ -238,16 +238,16 @@ int demand_page(struct lg_cpu *cpu, unsigned long vaddr, int errcode)
 
         /* If this page isn't in the Guest page tables, we can't page it in. */
         if (!(pte_flags(gpte) & _PAGE_PRESENT))
-                return 0;
+                return false;
 
         /* Check they're not trying to write to a page the Guest wants
          * read-only (bit 2 of errcode == write). */
         if ((errcode & 2) && !(pte_flags(gpte) & _PAGE_RW))
-                return 0;
+                return false;
 
         /* User access to a kernel-only page? (bit 3 == user access) */
         if ((errcode & 4) && !(pte_flags(gpte) & _PAGE_USER))
-                return 0;
+                return false;
 
         /* Check that the Guest PTE flags are OK, and the page number is below
          * the pfn_limit (ie. not mapping the Launcher binary). */
@@ -283,7 +283,7 @@ int demand_page(struct lg_cpu *cpu, unsigned long vaddr, int errcode)
          * manipulated, the result returned and the code complete.  A small
          * delay and a trace of alliteration are the only indications the Guest
          * has that a page fault occurred at all. */
-        return 1;
+        return true;
 }
 
 /*H:360
@@ -296,7 +296,7 @@ int demand_page(struct lg_cpu *cpu, unsigned long vaddr, int errcode)
  *
  * This is a quick version which answers the question: is this virtual address
  * mapped by the shadow page tables, and is it writable? */
-static int page_writable(struct lg_cpu *cpu, unsigned long vaddr)
+static bool page_writable(struct lg_cpu *cpu, unsigned long vaddr)
 {
         pgd_t *spgd;
         unsigned long flags;
@@ -304,7 +304,7 @@ static int page_writable(struct lg_cpu *cpu, unsigned long vaddr)
         /* Look at the current top level entry: is it present? */
         spgd = spgd_addr(cpu, cpu->cpu_pgd, vaddr);
         if (!(pgd_flags(*spgd) & _PAGE_PRESENT))
-                return 0;
+                return false;
 
         /* Check the flags on the pte entry itself: it must be present and
          * writable. */
@@ -373,8 +373,10 @@ unsigned long guest_pa(struct lg_cpu *cpu, unsigned long vaddr)
         /* First step: get the top-level Guest page table entry. */
         gpgd = lgread(cpu, gpgd_addr(cpu, vaddr), pgd_t);
         /* Toplevel not present?  We can't map it in. */
-        if (!(pgd_flags(gpgd) & _PAGE_PRESENT))
+        if (!(pgd_flags(gpgd) & _PAGE_PRESENT)) {
                 kill_guest(cpu, "Bad address %#lx", vaddr);
+                return -1UL;
+        }
 
         gpte = lgread(cpu, gpte_addr(gpgd, vaddr), pte_t);
         if (!(pte_flags(gpte) & _PAGE_PRESENT))
diff --git a/drivers/lguest/segments.c b/drivers/lguest/segments.c
index ec6aa3f1c36b..4f15439b7f12 100644
--- a/drivers/lguest/segments.c
+++ b/drivers/lguest/segments.c
@@ -45,7 +45,7 @@
  * "Task State Segment" which controls all kinds of delicate things.  The
  * LGUEST_CS and LGUEST_DS entries are reserved for the Switcher, and the
  * the Guest can't be trusted to deal with double faults. */
-static int ignored_gdt(unsigned int num)
+static bool ignored_gdt(unsigned int num)
 {
         return (num == GDT_ENTRY_TSS
                 || num == GDT_ENTRY_LGUEST_CS
diff --git a/drivers/lguest/x86/core.c b/drivers/lguest/x86/core.c
index bf7942327bda..a6b717644be0 100644
--- a/drivers/lguest/x86/core.c
+++ b/drivers/lguest/x86/core.c
@@ -290,6 +290,57 @@ static int emulate_insn(struct lg_cpu *cpu)
         return 1;
 }
 
+/* Our hypercalls mechanism used to be based on direct software interrupts.
+ * After Anthony's "Refactor hypercall infrastructure" kvm patch, we decided to
+ * change over to using kvm hypercalls.
+ *
+ * KVM_HYPERCALL is actually a "vmcall" instruction, which generates an invalid
+ * opcode fault (fault 6) on non-VT cpus, so the easiest solution seemed to be
+ * an *emulation approach*: if the fault was really produced by an hypercall
+ * (is_hypercall() does exactly this check), we can just call the corresponding
+ * hypercall host implementation function.
+ *
+ * But these invalid opcode faults are notably slower than software interrupts.
+ * So we implemented the *patching (or rewriting) approach*: every time we hit
+ * the KVM_HYPERCALL opcode in Guest code, we patch it to the old "int 0x1f"
+ * opcode, so next time the Guest calls this hypercall it will use the
+ * faster trap mechanism.
+ *
+ * Matias even benchmarked it to convince you: this shows the average cycle
+ * cost of a hypercall.  For each alternative solution mentioned above we've
+ * made 5 runs of the benchmark:
+ *
+ * 1) direct software interrupt: 2915, 2789, 2764, 2721, 2898
+ * 2) emulation technique: 3410, 3681, 3466, 3392, 3780
+ * 3) patching (rewrite) technique: 2977, 2975, 2891, 2637, 2884
+ *
+ * One two-line function is worth a 20% hypercall speed boost!
+ */
+static void rewrite_hypercall(struct lg_cpu *cpu)
+{
+        /* This are the opcodes we use to patch the Guest.  The opcode for "int
+         * $0x1f" is "0xcd 0x1f" but vmcall instruction is 3 bytes long, so we
+         * complete the sequence with a NOP (0x90). */
+        u8 insn[3] = {0xcd, 0x1f, 0x90};
+
+        __lgwrite(cpu, guest_pa(cpu, cpu->regs->eip), insn, sizeof(insn));
+}
+
+static bool is_hypercall(struct lg_cpu *cpu)
+{
+        u8 insn[3];
+
+        /* This must be the Guest kernel trying to do something.
+         * The bottom two bits of the CS segment register are the privilege
+         * level. */
+        if ((cpu->regs->cs & 3) != GUEST_PL)
+                return false;
+
+        /* Is it a vmcall? */
+        __lgread(cpu, insn, guest_pa(cpu, cpu->regs->eip), sizeof(insn));
+        return insn[0] == 0x0f && insn[1] == 0x01 && insn[2] == 0xc1;
+}
+
 /*H:050 Once we've re-enabled interrupts, we look at why the Guest exited. */
 void lguest_arch_handle_trap(struct lg_cpu *cpu)
 {
@@ -337,7 +388,7 @@ void lguest_arch_handle_trap(struct lg_cpu *cpu)
                 break;
         case 32 ... 255:
                 /* These values mean a real interrupt occurred, in which case
-                 * the Host handler has already been run.  We just do a
+                 * the Host handler has already been run. We just do a
                  * friendly check if another process should now be run, then
                  * return to run the Guest again */
                 cond_resched();
@@ -347,6 +398,15 @@ void lguest_arch_handle_trap(struct lg_cpu *cpu)
                  * up the pointer now to indicate a hypercall is pending. */
                 cpu->hcall = (struct hcall_args *)cpu->regs;
                 return;
+        case 6:
+                /* kvm hypercalls trigger an invalid opcode fault (6).
+                 * We need to check if ring == GUEST_PL and
+                 * faulting instruction == vmcall. */
+                if (is_hypercall(cpu)) {
+                        rewrite_hypercall(cpu);
+                        return;
+                }
+                break;
         }
 
         /* We didn't handle the trap, so it needs to go to the Guest. */
diff --git a/drivers/media/video/cpia.c b/drivers/media/video/cpia.c
index c3b0c8c63c76..43ab0adf3b61 100644
--- a/drivers/media/video/cpia.c
+++ b/drivers/media/video/cpia.c
@@ -1381,9 +1381,7 @@ static void proc_cpia_create(void)
 {
         cpia_proc_root = proc_mkdir("cpia", NULL);
 
-        if (cpia_proc_root)
-                cpia_proc_root->owner = THIS_MODULE;
-        else
+        if (!cpia_proc_root)
                 LOG("Unable to initialise /proc/cpia\n");
 }
 
diff --git a/drivers/message/i2o/i2o_proc.c b/drivers/message/i2o/i2o_proc.c
index 9a36b5a7de57..7045c45da9b1 100644
--- a/drivers/message/i2o/i2o_proc.c
+++ b/drivers/message/i2o/i2o_proc.c
@@ -2037,8 +2037,6 @@ static int __init i2o_proc_fs_create(void)
         if (!i2o_proc_dir_root)
                 return -1;
 
-        i2o_proc_dir_root->owner = THIS_MODULE;
-
         list_for_each_entry(c, &i2o_controllers, list)
             i2o_proc_iop_add(i2o_proc_dir_root, c);
 
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index 1c484084ed4f..5f3bff434621 100644
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -223,6 +223,16 @@ config DELL_LAPTOP
         This driver adds support for rfkill and backlight control to Dell
         laptops.
 
+config ISL29003
+        tristate "Intersil ISL29003 ambient light sensor"
+        depends on I2C && SYSFS
+        help
+          If you say yes here you get support for the Intersil ISL29003
+          ambient light sensor.
+
+          This driver can also be built as a module.  If so, the module
+          will be called isl29003.
+
 source "drivers/misc/c2port/Kconfig"
 source "drivers/misc/eeprom/Kconfig"
 
diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
index bc1199830554..7871f05dcb9b 100644
--- a/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
@@ -18,5 +18,6 @@ obj-$(CONFIG_KGDB_TESTS)	+= kgdbts.o
 obj-$(CONFIG_SGI_XP)            += sgi-xp/
 obj-$(CONFIG_SGI_GRU)           += sgi-gru/
 obj-$(CONFIG_HP_ILO)            += hpilo.o
+obj-$(CONFIG_ISL29003)          += isl29003.o
 obj-$(CONFIG_C2PORT)            += c2port/
 obj-y                           += eeprom/
diff --git a/drivers/misc/hpilo.c b/drivers/misc/hpilo.c
index cf991850f01b..880ccf39e23b 100644
--- a/drivers/misc/hpilo.c
+++ b/drivers/misc/hpilo.c
@@ -209,7 +209,7 @@ static void ilo_ccb_close(struct pci_dev *pdev, struct ccb_data *data)
         /* give iLO some time to process stop request */
         for (retries = MAX_WAIT; retries > 0; retries--) {
                 doorbell_set(driver_ccb);
-                udelay(1);
+                udelay(WAIT_TIME);
                 if (!(ioread32(&device_ccb->send_ctrl) & (1 << CTRL_BITPOS_A))
                     &&
                     !(ioread32(&device_ccb->recv_ctrl) & (1 << CTRL_BITPOS_A)))
@@ -312,7 +312,7 @@ static int ilo_ccb_open(struct ilo_hwinfo *hw, struct ccb_data *data, int slot)
         for (i = MAX_WAIT; i > 0; i--) {
                 if (ilo_pkt_dequeue(hw, driver_ccb, SENDQ, &pkt_id, NULL, NULL))
                         break;
-                udelay(1);
+                udelay(WAIT_TIME);
         }
 
         if (i) {
@@ -759,7 +759,7 @@ static void __exit ilo_exit(void)
         class_destroy(ilo_class);
 }
 
-MODULE_VERSION("1.0");
+MODULE_VERSION("1.1");
 MODULE_ALIAS(ILO_NAME);
 MODULE_DESCRIPTION(ILO_NAME);
 MODULE_AUTHOR("David Altobelli <david.altobelli@hp.com>");
diff --git a/drivers/misc/hpilo.h b/drivers/misc/hpilo.h
index b64a20ef07e3..03a14c82aad9 100644
--- a/drivers/misc/hpilo.h
+++ b/drivers/misc/hpilo.h
@@ -19,8 +19,12 @@
 #define MAX_ILO_DEV     1
 /* max number of files */
 #define MAX_OPEN        (MAX_CCB * MAX_ILO_DEV)
+/* total wait time in usec */
+#define MAX_WAIT_TIME   10000
+/* per spin wait time in usec */
+#define WAIT_TIME       10
 /* spin counter for open/close delay */
-#define MAX_WAIT        10000
+#define MAX_WAIT        (MAX_WAIT_TIME / WAIT_TIME)
 
 /*
  * Per device, used to track global memory allocations.
diff --git a/drivers/misc/isl29003.c b/drivers/misc/isl29003.c
new file mode 100644
index 000000000000..2e2a5923d4c2
--- /dev/null
+++ b/drivers/misc/isl29003.c
@@ -0,0 +1,470 @@
+/*
+ *  isl29003.c - Linux kernel module for
+ *      Intersil ISL29003 ambient light sensor
+ *
+ *  See file:Documentation/misc-devices/isl29003
+ *
+ *  Copyright (c) 2009 Daniel Mack <daniel@caiaq.de>
+ *
+ *  Based on code written by
+ *      Rodolfo Giometti <giometti@linux.it>
+ *      Eurotech S.p.A. <info@eurotech.it>
+ *
+ *  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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <linux/i2c.h>
+#include <linux/mutex.h>
+#include <linux/delay.h>
+
+#define ISL29003_DRV_NAME       "isl29003"
+#define DRIVER_VERSION          "1.0"
+
+#define ISL29003_REG_COMMAND            0x00
+#define ISL29003_ADC_ENABLED            (1 << 7)
+#define ISL29003_ADC_PD                 (1 << 6)
+#define ISL29003_TIMING_INT             (1 << 5)
+#define ISL29003_MODE_SHIFT             (2)
+#define ISL29003_MODE_MASK              (0x3 << ISL29003_MODE_SHIFT)
+#define ISL29003_RES_SHIFT              (0)
+#define ISL29003_RES_MASK               (0x3 << ISL29003_RES_SHIFT)
+
+#define ISL29003_REG_CONTROL            0x01
+#define ISL29003_INT_FLG                (1 << 5)
+#define ISL29003_RANGE_SHIFT            (2)
+#define ISL29003_RANGE_MASK             (0x3 << ISL29003_RANGE_SHIFT)
+#define ISL29003_INT_PERSISTS_SHIFT     (0)
+#define ISL29003_INT_PERSISTS_MASK      (0xf << ISL29003_INT_PERSISTS_SHIFT)
+
+#define ISL29003_REG_IRQ_THRESH_HI      0x02
+#define ISL29003_REG_IRQ_THRESH_LO      0x03
+#define ISL29003_REG_LSB_SENSOR         0x04
+#define ISL29003_REG_MSB_SENSOR         0x05
+#define ISL29003_REG_LSB_TIMER          0x06
+#define ISL29003_REG_MSB_TIMER          0x07
+
+#define ISL29003_NUM_CACHABLE_REGS      4
+
+struct isl29003_data {
+        struct i2c_client *client;
+        struct mutex lock;
+        u8 reg_cache[ISL29003_NUM_CACHABLE_REGS];
+};
+
+static int gain_range[] = {
+        1000, 4000, 16000, 64000
+};
+
+/*
+ * register access helpers
+ */
+
+static int __isl29003_read_reg(struct i2c_client *client,
+                               u32 reg, u8 mask, u8 shift)
+{
+        struct isl29003_data *data = i2c_get_clientdata(client);
+        return (data->reg_cache[reg] & mask) >> shift;
+}
+
+static int __isl29003_write_reg(struct i2c_client *client,
+                                u32 reg, u8 mask, u8 shift, u8 val)
+{
+        struct isl29003_data *data = i2c_get_clientdata(client);
+        int ret = 0;
+        u8 tmp;
+
+        if (reg >= ISL29003_NUM_CACHABLE_REGS)
+                return -EINVAL;
+
+        mutex_lock(&data->lock);
+
+        tmp = data->reg_cache[reg];
+        tmp &= ~mask;
+        tmp |= val << shift;
+
+        ret = i2c_smbus_write_byte_data(client, reg, tmp);
+        if (!ret)
+                data->reg_cache[reg] = tmp;
+
+        mutex_unlock(&data->lock);
+        return ret;
+}
+
+/*
+ * internally used functions
+ */
+
+/* range */
+static int isl29003_get_range(struct i2c_client *client)
+{
+        return __isl29003_read_reg(client, ISL29003_REG_CONTROL,
+                ISL29003_RANGE_MASK, ISL29003_RANGE_SHIFT);
+}
+
+static int isl29003_set_range(struct i2c_client *client, int range)
+{
+        return __isl29003_write_reg(client, ISL29003_REG_CONTROL,
+                ISL29003_RANGE_MASK, ISL29003_RANGE_SHIFT, range);
+}
+
+/* resolution */
+static int isl29003_get_resolution(struct i2c_client *client)
+{
+        return __isl29003_read_reg(client, ISL29003_REG_COMMAND,
+                ISL29003_RES_MASK, ISL29003_RES_SHIFT);
+}
+
+static int isl29003_set_resolution(struct i2c_client *client, int res)
+{
+        return __isl29003_write_reg(client, ISL29003_REG_COMMAND,
+                ISL29003_RES_MASK, ISL29003_RES_SHIFT, res);
+}
+
+/* mode */
+static int isl29003_get_mode(struct i2c_client *client)
+{
+        return __isl29003_read_reg(client, ISL29003_REG_COMMAND,
+                ISL29003_RES_MASK, ISL29003_RES_SHIFT);
+}
+
+static int isl29003_set_mode(struct i2c_client *client, int mode)
+{
+        return __isl29003_write_reg(client, ISL29003_REG_COMMAND,
+                ISL29003_RES_MASK, ISL29003_RES_SHIFT, mode);
+}
+
+/* power_state */
+static int isl29003_set_power_state(struct i2c_client *client, int state)
+{
+        return __isl29003_write_reg(client, ISL29003_REG_COMMAND,
+                                ISL29003_ADC_ENABLED | ISL29003_ADC_PD, 0,
+                                state ? ISL29003_ADC_ENABLED : ISL29003_ADC_PD);
+}
+
+static int isl29003_get_power_state(struct i2c_client *client)
+{
+        struct isl29003_data *data = i2c_get_clientdata(client);
+        u8 cmdreg = data->reg_cache[ISL29003_REG_COMMAND];
+        return ~cmdreg & ISL29003_ADC_PD;
+}
+
+static int isl29003_get_adc_value(struct i2c_client *client)
+{
+        struct isl29003_data *data = i2c_get_clientdata(client);
+        int lsb, msb, range, bitdepth;
+
+        mutex_lock(&data->lock);
+        lsb = i2c_smbus_read_byte_data(client, ISL29003_REG_LSB_SENSOR);
+
+        if (lsb < 0) {
+                mutex_unlock(&data->lock);
+                return lsb;
+        }
+
+        msb = i2c_smbus_read_byte_data(client, ISL29003_REG_MSB_SENSOR);
+        mutex_unlock(&data->lock);
+
+        if (msb < 0)
+                return msb;
+
+        range = isl29003_get_range(client);
+        bitdepth = (4 - isl29003_get_resolution(client)) * 4;
+        return (((msb << 8) | lsb) * gain_range[range]) >> bitdepth;
+}
+
+/*
+ * sysfs layer
+ */
+
+/* range */
+static ssize_t isl29003_show_range(struct device *dev,
+                                   struct device_attribute *attr, char *buf)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        return sprintf(buf, "%i\n", isl29003_get_range(client));
+}
+
+static ssize_t isl29003_store_range(struct device *dev,
+                                    struct device_attribute *attr,
+                                    const char *buf, size_t count)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        unsigned long val;
+        int ret;
+
+        if ((strict_strtoul(buf, 10, &val) < 0) || (val > 3))
+                return -EINVAL;
+
+        ret = isl29003_set_range(client, val);
+        if (ret < 0)
+                return ret;
+
+        return count;
+}
+
+static DEVICE_ATTR(range, S_IWUSR | S_IRUGO,
+                   isl29003_show_range, isl29003_store_range);
+
+
+/* resolution */
+static ssize_t isl29003_show_resolution(struct device *dev,
+                                        struct device_attribute *attr,
+                                        char *buf)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        return sprintf(buf, "%d\n", isl29003_get_resolution(client));
+}
+
+static ssize_t isl29003_store_resolution(struct device *dev,
+                                         struct device_attribute *attr,
+                                         const char *buf, size_t count)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        unsigned long val;
+        int ret;
+
+        if ((strict_strtoul(buf, 10, &val) < 0) || (val > 3))
+                return -EINVAL;
+
+        ret = isl29003_set_resolution(client, val);
+        if (ret < 0)
+                return ret;
+
+        return count;
+}
+
+static DEVICE_ATTR(resolution, S_IWUSR | S_IRUGO,
+                   isl29003_show_resolution, isl29003_store_resolution);
+
+/* mode */
+static ssize_t isl29003_show_mode(struct device *dev,
+                                  struct device_attribute *attr, char *buf)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        return sprintf(buf, "%d\n", isl29003_get_mode(client));
+}
+
+static ssize_t isl29003_store_mode(struct device *dev,
+                struct device_attribute *attr, const char *buf, size_t count)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        unsigned long val;
+        int ret;
+
+        if ((strict_strtoul(buf, 10, &val) < 0) || (val > 2))
+                return -EINVAL;
+
+        ret = isl29003_set_mode(client, val);
+        if (ret < 0)
+                return ret;
+
+        return count;
+}
+
+static DEVICE_ATTR(mode, S_IWUSR | S_IRUGO,
+                   isl29003_show_mode, isl29003_store_mode);
+
+
+/* power state */
+static ssize_t isl29003_show_power_state(struct device *dev,
+                                         struct device_attribute *attr,
+                                         char *buf)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        return sprintf(buf, "%d\n", isl29003_get_power_state(client));
+}
+
+static ssize_t isl29003_store_power_state(struct device *dev,
+                                          struct device_attribute *attr,
+                                          const char *buf, size_t count)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        unsigned long val;
+        int ret;
+
+        if ((strict_strtoul(buf, 10, &val) < 0) || (val > 1))
+                return -EINVAL;
+
+        ret = isl29003_set_power_state(client, val);
+        return ret ? ret : count;
+}
+
+static DEVICE_ATTR(power_state, S_IWUSR | S_IRUGO,
+                   isl29003_show_power_state, isl29003_store_power_state);
+
+
+/* lux */
+static ssize_t isl29003_show_lux(struct device *dev,
+                                 struct device_attribute *attr, char *buf)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+
+        /* No LUX data if not operational */
+        if (!isl29003_get_power_state(client))
+                return -EBUSY;
+
+        return sprintf(buf, "%d\n", isl29003_get_adc_value(client));
+}
+
+static DEVICE_ATTR(lux, S_IRUGO, isl29003_show_lux, NULL);
+
+static struct attribute *isl29003_attributes[] = {
+        &dev_attr_range.attr,
+        &dev_attr_resolution.attr,
+        &dev_attr_mode.attr,
+        &dev_attr_power_state.attr,
+        &dev_attr_lux.attr,
+        NULL
+};
+
+static const struct attribute_group isl29003_attr_group = {
+        .attrs = isl29003_attributes,
+};
+
+static int isl29003_init_client(struct i2c_client *client)
+{
+        struct isl29003_data *data = i2c_get_clientdata(client);
+        int i;
+
+        /* read all the registers once to fill the cache.
+         * if one of the reads fails, we consider the init failed */
+        for (i = 0; i < ARRAY_SIZE(data->reg_cache); i++) {
+                int v = i2c_smbus_read_byte_data(client, i);
+                if (v < 0)
+                        return -ENODEV;
+
+                data->reg_cache[i] = v;
+        }
+
+        /* set defaults */
+        isl29003_set_range(client, 0);
+        isl29003_set_resolution(client, 0);
+        isl29003_set_mode(client, 0);
+        isl29003_set_power_state(client, 0);
+
+        return 0;
+}
+
+/*
+ * I2C layer
+ */
+
+static int __devinit isl29003_probe(struct i2c_client *client,
+                                    const struct i2c_device_id *id)
+{
+        struct i2c_adapter *adapter = to_i2c_adapter(client->dev.parent);
+        struct isl29003_data *data;
+        int err = 0;
+
+        if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE))
+                return -EIO;
+
+        data = kzalloc(sizeof(struct isl29003_data), GFP_KERNEL);
+        if (!data)
+                return -ENOMEM;
+
+        data->client = client;
+        i2c_set_clientdata(client, data);
+        mutex_init(&data->lock);
+
+        /* initialize the ISL29003 chip */
+        err = isl29003_init_client(client);
+        if (err)
+                goto exit_kfree;
+
+        /* register sysfs hooks */
+        err = sysfs_create_group(&client->dev.kobj, &isl29003_attr_group);
+        if (err)
+                goto exit_kfree;
+
+        dev_info(&client->dev, "driver version %s enabled\n", DRIVER_VERSION);
+        return 0;
+
+exit_kfree:
+        kfree(data);
+        return err;
+}
+
+static int __devexit isl29003_remove(struct i2c_client *client)
+{
+        sysfs_remove_group(&client->dev.kobj, &isl29003_attr_group);
+        isl29003_set_power_state(client, 0);
+        kfree(i2c_get_clientdata(client));
+        return 0;
+}
+
+#ifdef CONFIG_PM
+static int isl29003_suspend(struct i2c_client *client, pm_message_t mesg)
+{
+        return isl29003_set_power_state(client, 0);
+}
+
+static int isl29003_resume(struct i2c_client *client)
+{
+        int i;
+        struct isl29003_data *data = i2c_get_clientdata(client);
+
+        /* restore registers from cache */
+        for (i = 0; i < ARRAY_SIZE(data->reg_cache); i++)
+                if (!i2c_smbus_write_byte_data(client, i, data->reg_cache[i]))
+                        return -EIO;
+
+        return 0;
+}
+
+#else
+#define isl29003_suspend        NULL
+#define isl29003_resume         NULL
+#endif /* CONFIG_PM */
+
+static const struct i2c_device_id isl29003_id[] = {
+        { "isl29003", 0 },
+        {}
+};
+MODULE_DEVICE_TABLE(i2c, isl29003_id);
+
+static struct i2c_driver isl29003_driver = {
+        .driver = {
+                .name   = ISL29003_DRV_NAME,
+                .owner  = THIS_MODULE,
+        },
+        .suspend = isl29003_suspend,
+        .resume = isl29003_resume,
+        .probe  = isl29003_probe,
+        .remove = __devexit_p(isl29003_remove),
+        .id_table = isl29003_id,
+};
+
+static int __init isl29003_init(void)
+{
+        return i2c_add_driver(&isl29003_driver);
+}
+
+static void __exit isl29003_exit(void)
+{
+        i2c_del_driver(&isl29003_driver);
+}
+
+MODULE_AUTHOR("Daniel Mack <daniel@caiaq.de>");
+MODULE_DESCRIPTION("ISL29003 ambient light sensor driver");
+MODULE_LICENSE("GPL v2");
+MODULE_VERSION(DRIVER_VERSION);
+
+module_init(isl29003_init);
+module_exit(isl29003_exit);
+
diff --git a/drivers/mmc/card/sdio_uart.c b/drivers/mmc/card/sdio_uart.c
index 78ad48718ab0..36a8d53ad2a2 100644
--- a/drivers/mmc/card/sdio_uart.c
+++ b/drivers/mmc/card/sdio_uart.c
@@ -30,6 +30,7 @@
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/mutex.h>
+#include <linux/seq_file.h>
 #include <linux/serial_reg.h>
 #include <linux/circ_buf.h>
 #include <linux/gfp.h>
@@ -933,67 +934,64 @@ static int sdio_uart_tiocmset(struct tty_struct *tty, struct file *file,
         return result;
 }
 
-static int sdio_uart_read_proc(char *page, char **start, off_t off,
-                               int count, int *eof, void *data)
+static int sdio_uart_proc_show(struct seq_file *m, void *v)
 {
-        int i, len = 0;
-        off_t begin = 0;
+        int i;
 
-        len += sprintf(page, "serinfo:1.0 driver%s%s revision:%s\n",
+        seq_printf(m, "serinfo:1.0 driver%s%s revision:%s\n",
                        "", "", "");
-        for (i = 0; i < UART_NR && len < PAGE_SIZE - 96; i++) {
+        for (i = 0; i < UART_NR; i++) {
                 struct sdio_uart_port *port = sdio_uart_port_get(i);
                 if (port) {
-                        len += sprintf(page+len, "%d: uart:SDIO", i);
+                        seq_printf(m, "%d: uart:SDIO", i);
                         if(capable(CAP_SYS_ADMIN)) {
-                                len += sprintf(page + len, " tx:%d rx:%d",
+                                seq_printf(m, " tx:%d rx:%d",
                                                port->icount.tx, port->icount.rx);
                                 if (port->icount.frame)
-                                        len += sprintf(page + len, " fe:%d",
+                                        seq_printf(m, " fe:%d",
                                                        port->icount.frame);
                                 if (port->icount.parity)
-                                        len += sprintf(page + len, " pe:%d",
+                                        seq_printf(m, " pe:%d",
                                                        port->icount.parity);
                                 if (port->icount.brk)
-                                        len += sprintf(page + len, " brk:%d",
+                                        seq_printf(m, " brk:%d",
                                                        port->icount.brk);
                                 if (port->icount.overrun)
-                                        len += sprintf(page + len, " oe:%d",
+                                        seq_printf(m, " oe:%d",
                                                        port->icount.overrun);
                                 if (port->icount.cts)
-                                        len += sprintf(page + len, " cts:%d",
+                                        seq_printf(m, " cts:%d",
                                                        port->icount.cts);
                                 if (port->icount.dsr)
-                                        len += sprintf(page + len, " dsr:%d",
+                                        seq_printf(m, " dsr:%d",
                                                        port->icount.dsr);
                                 if (port->icount.rng)
-                                        len += sprintf(page + len, " rng:%d",
+                                        seq_printf(m, " rng:%d",
                                                        port->icount.rng);
                                 if (port->icount.dcd)
-                                        len += sprintf(page + len, " dcd:%d",
+                                        seq_printf(m, " dcd:%d",
                                                        port->icount.dcd);
                         }
-                        strcat(page, "\n");
-                        len++;
                         sdio_uart_port_put(port);
-                }
-
-                if (len + begin > off + count)
-                        goto done;
-                if (len + begin < off) {
-                        begin += len;
-                        len = 0;
+                        seq_putc(m, '\n');
                 }
         }
-        *eof = 1;
+        return 0;
+}
 
-done:
-        if (off >= len + begin)
-                return 0;
-        *start = page + (off - begin);
-        return (count < begin + len - off) ? count : (begin + len - off);
+static int sdio_uart_proc_open(struct inode *inode, struct file *file)
+{
+        return single_open(file, sdio_uart_proc_show, NULL);
 }
 
+static const struct file_operations sdio_uart_proc_fops = {
+        .owner          = THIS_MODULE,
+        .open           = sdio_uart_proc_open,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+        .release        = single_release,
+};
+
 static const struct tty_operations sdio_uart_ops = {
         .open                   = sdio_uart_open,
         .close                  = sdio_uart_close,
@@ -1007,7 +1005,7 @@ static const struct tty_operations sdio_uart_ops = {
         .break_ctl              = sdio_uart_break_ctl,
         .tiocmget               = sdio_uart_tiocmget,
         .tiocmset               = sdio_uart_tiocmset,
-        .read_proc              = sdio_uart_read_proc,
+        .proc_fops              = &sdio_uart_proc_fops,
 };
 
 static struct tty_driver *sdio_uart_tty_driver;
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 9c326a50a3ee..99610f358c40 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -3444,25 +3444,12 @@ static void bond_remove_proc_entry(struct bonding *bond)
  */
 static void bond_create_proc_dir(void)
 {
-        int len = strlen(DRV_NAME);
-
-        for (bond_proc_dir = init_net.proc_net->subdir; bond_proc_dir;
-             bond_proc_dir = bond_proc_dir->next) {
-                if ((bond_proc_dir->namelen == len) &&
-                    !memcmp(bond_proc_dir->name, DRV_NAME, len)) {
-                        break;
-                }
-        }
-
         if (!bond_proc_dir) {
                 bond_proc_dir = proc_mkdir(DRV_NAME, init_net.proc_net);
-                if (bond_proc_dir) {
-                        bond_proc_dir->owner = THIS_MODULE;
-                } else {
+                if (!bond_proc_dir)
                         printk(KERN_WARNING DRV_NAME
                                 ": Warning: cannot create /proc/net/%s\n",
                                 DRV_NAME);
-                }
         }
 }
 
@@ -3471,25 +3458,7 @@ static void bond_create_proc_dir(void)
  */
 static void bond_destroy_proc_dir(void)
 {
-        struct proc_dir_entry *de;
-
-        if (!bond_proc_dir) {
-                return;
-        }
-
-        /* verify that the /proc dir is empty */
-        for (de = bond_proc_dir->subdir; de; de = de->next) {
-                /* ignore . and .. */
-                if (*(de->name) != '.') {
-                        break;
-                }
-        }
-
-        if (de) {
-                if (bond_proc_dir->owner == THIS_MODULE) {
-                        bond_proc_dir->owner = NULL;
-                }
-        } else {
+        if (bond_proc_dir) {
                 remove_proc_entry(DRV_NAME, init_net.proc_net);
                 bond_proc_dir = NULL;
         }
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c
index 6a38800be3f1..65f55877be95 100644
--- a/drivers/net/gianfar.c
+++ b/drivers/net/gianfar.c
@@ -289,9 +289,9 @@ static int gfar_of_init(struct net_device *dev)
                 id = of_get_property(phy, "reg", NULL);
 
                 of_node_put(phy);
-                of_node_put(mdio);
 
                 fsl_pq_mdio_bus_name(bus_name, mdio);
+                of_node_put(mdio);
                 snprintf(priv->phy_bus_id, sizeof(priv->phy_bus_id), "%s:%02x",
                                 bus_name, *id);
         }
diff --git a/drivers/net/hamradio/dmascc.c b/drivers/net/hamradio/dmascc.c
index 881bf818bb48..7459b3ac77a9 100644
--- a/drivers/net/hamradio/dmascc.c
+++ b/drivers/net/hamradio/dmascc.c
@@ -445,6 +445,7 @@ static const struct net_device_ops scc_netdev_ops = {
         .ndo_stop = scc_close,
         .ndo_start_xmit = scc_send_packet,
         .ndo_do_ioctl = scc_ioctl,
+        .ndo_set_mac_address = scc_set_mac_address,
 };
 
 static int __init setup_adapter(int card_base, int type, int n)
@@ -584,7 +585,6 @@ static int __init setup_adapter(int card_base, int type, int n)
                 dev->irq = irq;
                 dev->netdev_ops = &scc_netdev_ops;
                 dev->header_ops = &ax25_header_ops;
-                dev->set_mac_address = scc_set_mac_address;
         }
         if (register_netdev(info->dev[0])) {
                 printk(KERN_ERR "dmascc: could not register %s\n",
diff --git a/drivers/net/irda/vlsi_ir.c b/drivers/net/irda/vlsi_ir.c
index 1243bc8e0035..ac0e4b6b6b66 100644
--- a/drivers/net/irda/vlsi_ir.c
+++ b/drivers/net/irda/vlsi_ir.c
@@ -1871,13 +1871,6 @@ static int __init vlsi_mod_init(void)
          * without procfs - it's not required for the driver to work.
          */
         vlsi_proc_root = proc_mkdir(PROC_DIR, NULL);
-        if (vlsi_proc_root) {
-                /* protect registered procdir against module removal.
-                 * Because we are in the module init path there's no race
-                 * window after create_proc_entry (and no barrier needed).
-                 */
-                vlsi_proc_root->owner = THIS_MODULE;
-        }
 
         ret = pci_register_driver(&vlsi_irda_driver);
 
diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c
index d304d38cd5d1..eceadf787a67 100644
--- a/drivers/net/netconsole.c
+++ b/drivers/net/netconsole.c
@@ -294,14 +294,12 @@ static ssize_t show_remote_port(struct netconsole_target *nt, char *buf)
 
 static ssize_t show_local_ip(struct netconsole_target *nt, char *buf)
 {
-        return snprintf(buf, PAGE_SIZE, "%d.%d.%d.%d\n",
-                        HIPQUAD(nt->np.local_ip));
+        return snprintf(buf, PAGE_SIZE, "%pI4\n", &nt->np.local_ip);
 }
 
 static ssize_t show_remote_ip(struct netconsole_target *nt, char *buf)
 {
-        return snprintf(buf, PAGE_SIZE, "%d.%d.%d.%d\n",
-                        HIPQUAD(nt->np.remote_ip));
+        return snprintf(buf, PAGE_SIZE, "%pI4\n", &nt->np.remote_ip);
 }
 
 static ssize_t show_local_mac(struct netconsole_target *nt, char *buf)
@@ -438,7 +436,7 @@ static ssize_t store_local_ip(struct netconsole_target *nt,
                 return -EINVAL;
         }
 
-        nt->np.local_ip = ntohl(in_aton(buf));
+        nt->np.local_ip = in_aton(buf);
 
         return strnlen(buf, count);
 }
@@ -454,7 +452,7 @@ static ssize_t store_remote_ip(struct netconsole_target *nt,
                 return -EINVAL;
         }
 
-        nt->np.remote_ip = ntohl(in_aton(buf));
+        nt->np.remote_ip = in_aton(buf);
 
         return strnlen(buf, count);
 }
diff --git a/drivers/net/ni5010.c b/drivers/net/ni5010.c
index 539e18ab485c..2a8da476ab3d 100644
--- a/drivers/net/ni5010.c
+++ b/drivers/net/ni5010.c
@@ -189,6 +189,17 @@ static void __init trigger_irq(int ioaddr)
                 outb(MM_EN_XMT|MM_MUX, IE_MMODE); /* Start transmission */
 }
 
+static const struct net_device_ops ni5010_netdev_ops = {
+        .ndo_open               = ni5010_open,
+        .ndo_stop               = ni5010_close,
+        .ndo_start_xmit         = ni5010_send_packet,
+        .ndo_set_multicast_list = ni5010_set_multicast_list,
+        .ndo_tx_timeout         = ni5010_timeout,
+        .ndo_validate_addr      = eth_validate_addr,
+        .ndo_set_mac_address    = eth_mac_addr,
+        .ndo_change_mtu         = eth_change_mtu,
+};
+
 /*
  *      This is the real probe routine.  Linux has a history of friendly device
  *      probes on the ISA bus.  A good device probes avoids doing writes, and
@@ -328,13 +339,8 @@ static int __init ni5010_probe1(struct net_device *dev, int ioaddr)
                 outb(0, IE_RBUF);       /* set buffer byte 0 to 0 again */
         }
         printk("-> bufsize rcv/xmt=%d/%d\n", bufsize_rcv, NI5010_BUFSIZE);
-        memset(netdev_priv(dev), 0, sizeof(struct ni5010_local));
 
-        dev->open               = ni5010_open;
-        dev->stop               = ni5010_close;
-        dev->hard_start_xmit    = ni5010_send_packet;
-        dev->set_multicast_list = ni5010_set_multicast_list;
-        dev->tx_timeout         = ni5010_timeout;
+        dev->netdev_ops         = &ni5010_netdev_ops;
         dev->watchdog_timeo     = HZ/20;
 
         dev->flags &= ~IFF_MULTICAST;   /* Multicast doesn't work */
diff --git a/drivers/net/niu.c b/drivers/net/niu.c
index 50c11126a3db..02c37e2f08a9 100644
--- a/drivers/net/niu.c
+++ b/drivers/net/niu.c
@@ -3441,7 +3441,8 @@ static int niu_rx_pkt_ignore(struct niu *np, struct rx_ring_info *rp)
         return num_rcr;
 }
 
-static int niu_process_rx_pkt(struct niu *np, struct rx_ring_info *rp)
+static int niu_process_rx_pkt(struct napi_struct *napi, struct niu *np,
+                              struct rx_ring_info *rp)
 {
         unsigned int index = rp->rcr_index;
         struct sk_buff *skb;
@@ -3518,7 +3519,7 @@ static int niu_process_rx_pkt(struct niu *np, struct rx_ring_info *rp)
 
         skb->protocol = eth_type_trans(skb, np->dev);
         skb_record_rx_queue(skb, rp->rx_channel);
-        netif_receive_skb(skb);
+        napi_gro_receive(napi, skb);
 
         return num_rcr;
 }
@@ -3706,7 +3707,8 @@ static inline void niu_sync_rx_discard_stats(struct niu *np,
         }
 }
 
-static int niu_rx_work(struct niu *np, struct rx_ring_info *rp, int budget)
+static int niu_rx_work(struct napi_struct *napi, struct niu *np,
+                       struct rx_ring_info *rp, int budget)
 {
         int qlen, rcr_done = 0, work_done = 0;
         struct rxdma_mailbox *mbox = rp->mbox;
@@ -3728,7 +3730,7 @@ static int niu_rx_work(struct niu *np, struct rx_ring_info *rp, int budget)
         rcr_done = work_done = 0;
         qlen = min(qlen, budget);
         while (work_done < qlen) {
-                rcr_done += niu_process_rx_pkt(np, rp);
+                rcr_done += niu_process_rx_pkt(napi, np, rp);
                 work_done++;
         }
 
@@ -3776,7 +3778,7 @@ static int niu_poll_core(struct niu *np, struct niu_ldg *lp, int budget)
                 if (rx_vec & (1 << rp->rx_channel)) {
                         int this_work_done;
 
-                        this_work_done = niu_rx_work(np, rp,
+                        this_work_done = niu_rx_work(&lp->napi, np, rp,
                                                      budget);
 
                         budget -= this_work_done;
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index f7efcecc4108..1205c2a22657 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -4392,7 +4392,7 @@ static void tg3_recycle_rx(struct tg3 *tp, u32 opaque_key,
 #if TG3_VLAN_TAG_USED
 static int tg3_vlan_rx(struct tg3 *tp, struct sk_buff *skb, u16 vlan_tag)
 {
-        return vlan_hwaccel_receive_skb(skb, tp->vlgrp, vlan_tag);
+        return vlan_gro_receive(&tp->napi, tp->vlgrp, vlan_tag, skb);
 }
 #endif
 
@@ -4539,7 +4539,7 @@ static int tg3_rx(struct tg3 *tp, int budget)
                                     desc->err_vlan & RXD_VLAN_MASK);
                 } else
 #endif
-                        netif_receive_skb(skb);
+                        napi_gro_receive(&tp->napi, skb);
 
                 received++;
                 budget--;
diff --git a/drivers/net/ucc_geth.c b/drivers/net/ucc_geth.c
index 86a479f61c0c..933fcfbf35e1 100644
--- a/drivers/net/ucc_geth.c
+++ b/drivers/net/ucc_geth.c
@@ -3648,15 +3648,16 @@ static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *ma
                 mdio = of_get_parent(phy);
 
                 if (mdio == NULL)
-                        return -1;
+                        return -ENODEV;
 
                 err = of_address_to_resource(mdio, 0, &res);
-                of_node_put(mdio);
-
-                if (err)
-                        return -1;
 
+                if (err) {
+                        of_node_put(mdio);
+                        return err;
+                }
                 fsl_pq_mdio_bus_name(bus_name, mdio);
+                of_node_put(mdio);
                 snprintf(ug_info->phy_bus_id, sizeof(ug_info->phy_bus_id),
                         "%s:%02x", bus_name, *prop);
         }
diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
index 7e80aba8a148..f21a6171c691 100644
--- a/drivers/net/wireless/airo.c
+++ b/drivers/net/wireless/airo.c
@@ -2752,7 +2752,6 @@ static const struct net_device_ops airo_netdev_ops = {
         .ndo_set_mac_address    = airo_set_mac_address,
         .ndo_do_ioctl           = airo_ioctl,
         .ndo_change_mtu         = airo_change_mtu,
-        .ndo_set_mac_address    = eth_mac_addr,
         .ndo_validate_addr      = eth_validate_addr,
 };
 
@@ -2765,7 +2764,6 @@ static const struct net_device_ops mpi_netdev_ops = {
         .ndo_set_mac_address    = airo_set_mac_address,
         .ndo_do_ioctl           = airo_ioctl,
         .ndo_change_mtu         = airo_change_mtu,
-        .ndo_set_mac_address    = eth_mac_addr,
         .ndo_validate_addr      = eth_validate_addr,
 };
 
@@ -4494,7 +4492,6 @@ static int setup_proc_entry( struct net_device *dev,
                 goto fail;
         apriv->proc_entry->uid = proc_uid;
         apriv->proc_entry->gid = proc_gid;
-        apriv->proc_entry->owner = THIS_MODULE;
 
         /* Setup the StatsDelta */
         entry = proc_create_data("StatsDelta",
diff --git a/drivers/net/wireless/ipw2x00/ipw2200.c b/drivers/net/wireless/ipw2x00/ipw2200.c
index b3449948a25a..4a92af1d7877 100644
--- a/drivers/net/wireless/ipw2x00/ipw2200.c
+++ b/drivers/net/wireless/ipw2x00/ipw2200.c
@@ -11593,7 +11593,6 @@ static const struct net_device_ops ipw_netdev_ops = {
         .ndo_set_mac_address    = ipw_net_set_mac_address,
         .ndo_start_xmit         = ieee80211_xmit,
         .ndo_change_mtu         = ieee80211_change_mtu,
-        .ndo_set_mac_address    = eth_mac_addr,
         .ndo_validate_addr      = eth_validate_addr,
 };
 
diff --git a/drivers/net/wireless/prism54/islpci_dev.c b/drivers/net/wireless/prism54/islpci_dev.c
index 166ed9584601..e26d7b3ceab5 100644
--- a/drivers/net/wireless/prism54/islpci_dev.c
+++ b/drivers/net/wireless/prism54/islpci_dev.c
@@ -803,7 +803,6 @@ static const struct net_device_ops islpci_netdev_ops = {
         .ndo_tx_timeout         = islpci_eth_tx_timeout,
         .ndo_set_mac_address    = prism54_set_mac_address,
         .ndo_change_mtu         = eth_change_mtu,
-        .ndo_set_mac_address    = eth_mac_addr,
         .ndo_validate_addr      = eth_validate_addr,
 };
 
diff --git a/drivers/net/wireless/zd1201.c b/drivers/net/wireless/zd1201.c
index 9b244c96b221..5fabd9c0f07a 100644
--- a/drivers/net/wireless/zd1201.c
+++ b/drivers/net/wireless/zd1201.c
@@ -1725,7 +1725,6 @@ static const struct net_device_ops zd1201_netdev_ops = {
         .ndo_set_multicast_list = zd1201_set_multicast,
         .ndo_set_mac_address    = zd1201_set_mac_address,
         .ndo_change_mtu         = eth_change_mtu,
-        .ndo_set_mac_address    = eth_mac_addr,
         .ndo_validate_addr      = eth_validate_addr,
 };
 
diff --git a/drivers/of/base.c b/drivers/of/base.c
index cd17092b82bd..41c5dfd85358 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -446,6 +446,7 @@ struct of_modalias_table {
 };
 static struct of_modalias_table of_modalias_table[] = {
         { "fsl,mcu-mpc8349emitx", "mcu-mpc8349emitx" },
+        { "mmc-spi-slot", "mmc_spi" },
 };
 
 /**
diff --git a/drivers/oprofile/buffer_sync.c b/drivers/oprofile/buffer_sync.c
index c3ea5fa7d05a..2c9aa49e43cd 100644
--- a/drivers/oprofile/buffer_sync.c
+++ b/drivers/oprofile/buffer_sync.c
@@ -574,7 +574,7 @@ int __init buffer_sync_init(void)
                 return 0;
 }
 
-void __exit buffer_sync_cleanup(void)
+void buffer_sync_cleanup(void)
 {
         free_cpumask_var(marked_cpus);
 }
diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig
index 2a4501dd2515..fdc864f9cf23 100644
--- a/drivers/pci/Kconfig
+++ b/drivers/pci/Kconfig
@@ -59,3 +59,13 @@ config HT_IRQ
            This allows native hypertransport devices to use interrupts.
 
            If unsure say Y.
+
+config PCI_IOV
+        bool "PCI IOV support"
+        depends on PCI
+        help
+          I/O Virtualization is a PCI feature supported by some devices
+          which allows them to create virtual devices which share their
+          physical resources.
+
+          If unsure, say N.
diff --git a/drivers/pci/Makefile b/drivers/pci/Makefile
index 3d07ce24f6a8..ba6af162fd39 100644
--- a/drivers/pci/Makefile
+++ b/drivers/pci/Makefile
@@ -29,6 +29,8 @@ obj-$(CONFIG_DMAR) += dmar.o iova.o intel-iommu.o
 
 obj-$(CONFIG_INTR_REMAP) += dmar.o intr_remapping.o
 
+obj-$(CONFIG_PCI_IOV) += iov.o
+
 #
 # Some architectures use the generic PCI setup functions
 #
diff --git a/drivers/pci/bus.c b/drivers/pci/bus.c
index 52b54f053be0..68f91a252595 100644
--- a/drivers/pci/bus.c
+++ b/drivers/pci/bus.c
@@ -133,7 +133,7 @@ int pci_bus_add_child(struct pci_bus *bus)
  *
  * Call hotplug for each new devices.
  */
-void pci_bus_add_devices(struct pci_bus *bus)
+void pci_bus_add_devices(const struct pci_bus *bus)
 {
         struct pci_dev *dev;
         struct pci_bus *child;
@@ -184,8 +184,10 @@ void pci_enable_bridges(struct pci_bus *bus)
 
         list_for_each_entry(dev, &bus->devices, bus_list) {
                 if (dev->subordinate) {
-                        retval = pci_enable_device(dev);
-                        pci_set_master(dev);
+                        if (atomic_read(&dev->enable_cnt) == 0) {
+                                retval = pci_enable_device(dev);
+                                pci_set_master(dev);
+                        }
                         pci_enable_bridges(dev->subordinate);
                 }
         }
diff --git a/drivers/pci/hotplug/acpi_pcihp.c b/drivers/pci/hotplug/acpi_pcihp.c
index 1c1141801060..fbc63d5e459f 100644
--- a/drivers/pci/hotplug/acpi_pcihp.c
+++ b/drivers/pci/hotplug/acpi_pcihp.c
@@ -30,9 +30,8 @@
 #include <linux/types.h>
 #include <linux/pci.h>
 #include <linux/pci_hotplug.h>
+#include <linux/acpi.h>
 #include <linux/pci-acpi.h>
-#include <acpi/acpi.h>
-#include <acpi/acpi_bus.h>
 
 #define MY_NAME "acpi_pcihp"
 
@@ -333,19 +332,14 @@ acpi_status acpi_get_hp_params_from_firmware(struct pci_bus *bus,
 {
         acpi_status status = AE_NOT_FOUND;
         acpi_handle handle, phandle;
-        struct pci_bus *pbus = bus;
-        struct pci_dev *pdev;
-
-        do {
-                pdev = pbus->self;
-                if (!pdev) {
-                        handle = acpi_get_pci_rootbridge_handle(
-                                pci_domain_nr(pbus), pbus->number);
+        struct pci_bus *pbus;
+
+        handle = NULL;
+        for (pbus = bus; pbus; pbus = pbus->parent) {
+                handle = acpi_pci_get_bridge_handle(pbus);
+                if (handle)
                         break;
-                }
-                handle = DEVICE_ACPI_HANDLE(&(pdev->dev));
-                pbus = pbus->parent;
-        } while (!handle);
+        }
 
         /*
          * _HPP settings apply to all child buses, until another _HPP is
@@ -378,12 +372,10 @@ EXPORT_SYMBOL_GPL(acpi_get_hp_params_from_firmware);
  *
  * Attempt to take hotplug control from firmware.
  */
-int acpi_get_hp_hw_control_from_firmware(struct pci_dev *dev, u32 flags)
+int acpi_get_hp_hw_control_from_firmware(struct pci_dev *pdev, u32 flags)
 {
         acpi_status status;
         acpi_handle chandle, handle;
-        struct pci_dev *pdev = dev;
-        struct pci_bus *parent;
         struct acpi_buffer string = { ACPI_ALLOCATE_BUFFER, NULL };
 
         flags &= (OSC_PCI_EXPRESS_NATIVE_HP_CONTROL |
@@ -408,33 +400,25 @@ int acpi_get_hp_hw_control_from_firmware(struct pci_dev *dev, u32 flags)
                 acpi_get_name(handle, ACPI_FULL_PATHNAME, &string);
                 dbg("Trying to get hotplug control for %s\n",
                                 (char *)string.pointer);
-                status = pci_osc_control_set(handle, flags);
+                status = acpi_pci_osc_control_set(handle, flags);
                 if (ACPI_SUCCESS(status))
                         goto got_one;
                 kfree(string.pointer);
                 string = (struct acpi_buffer){ ACPI_ALLOCATE_BUFFER, NULL };
         }
 
-        pdev = dev;
-        handle = DEVICE_ACPI_HANDLE(&dev->dev);
-        while (!handle) {
+        handle = DEVICE_ACPI_HANDLE(&pdev->dev);
+        if (!handle) {
                 /*
                  * This hotplug controller was not listed in the ACPI name
                  * space at all. Try to get acpi handle of parent pci bus.
                  */
-                if (!pdev || !pdev->bus->parent)
-                        break;
-                parent = pdev->bus->parent;
-                dbg("Could not find %s in acpi namespace, trying parent\n",
-                    pci_name(pdev));
-                if (!parent->self)
-                        /* Parent must be a host bridge */
-                        handle = acpi_get_pci_rootbridge_handle(
-                                        pci_domain_nr(parent),
-                                        parent->number);
-                else
-                        handle = DEVICE_ACPI_HANDLE(&(parent->self->dev));
-                pdev = parent->self;
+                struct pci_bus *pbus;
+                for (pbus = pdev->bus; pbus; pbus = pbus->parent) {
+                        handle = acpi_pci_get_bridge_handle(pbus);
+                        if (handle)
+                                break;
+                }
         }
 
         while (handle) {
@@ -453,13 +437,13 @@ int acpi_get_hp_hw_control_from_firmware(struct pci_dev *dev, u32 flags)
         }
 
         dbg("Cannot get control of hotplug hardware for pci %s\n",
-            pci_name(dev));
+            pci_name(pdev));
 
         kfree(string.pointer);
         return -ENODEV;
 got_one:
-        dbg("Gained control for hotplug HW for pci %s (%s)\n", pci_name(dev),
-                        (char *)string.pointer);
+        dbg("Gained control for hotplug HW for pci %s (%s)\n",
+            pci_name(pdev), (char *)string.pointer);
         kfree(string.pointer);
         return 0;
 }
diff --git a/drivers/pci/hotplug/fakephp.c b/drivers/pci/hotplug/fakephp.c
index d8649e127298..6151389fd903 100644
--- a/drivers/pci/hotplug/fakephp.c
+++ b/drivers/pci/hotplug/fakephp.c
@@ -1,395 +1,163 @@
-/*
- * Fake PCI Hot Plug Controller Driver
+/* Works like the fakephp driver used to, except a little better.
  *
- * Copyright (C) 2003 Greg Kroah-Hartman <greg@kroah.com>
- * Copyright (C) 2003 IBM Corp.
- * Copyright (C) 2003 Rolf Eike Beer <eike-kernel@sf-tec.de>
+ * - It's possible to remove devices with subordinate busses.
+ * - New PCI devices that appear via any method, not just a fakephp triggered
+ *   rescan, will be noticed.
+ * - Devices that are removed via any method, not just a fakephp triggered
+ *   removal, will also be noticed.
  *
- * Based on ideas and code from:
- *      Vladimir Kondratiev <vladimir.kondratiev@intel.com>
- *      Rolf Eike Beer <eike-kernel@sf-tec.de>
+ * Uses nothing from the pci-hotplug subsystem.
  *
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * Send feedback to <greg@kroah.com>
  */
 
-/*
- *
- * This driver will "emulate" removing PCI devices from the system.  If
- * the "power" file is written to with "0" then the specified PCI device
- * will be completely removed from the kernel.
- *
- * WARNING, this does NOT turn off the power to the PCI device.  This is
- * a "logical" removal, not a physical or electrical removal.
- *
- * Use this module at your own risk, you have been warned!
- *
- * Enabling PCI devices is left as an exercise for the reader...
- *
- */
-#include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/pci.h>
-#include <linux/pci_hotplug.h>
+#include <linux/kernel.h>
+#include <linux/types.h>
+#include <linux/list.h>
+#include <linux/kobject.h>
+#include <linux/sysfs.h>
 #include <linux/init.h>
-#include <linux/string.h>
-#include <linux/slab.h>
-#include <linux/workqueue.h>
+#include <linux/pci.h>
+#include <linux/device.h>
 #include "../pci.h"
 
-#if !defined(MODULE)
-        #define MY_NAME "fakephp"
-#else
-        #define MY_NAME THIS_MODULE->name
-#endif
-
-#define dbg(format, arg...)                                     \
-        do {                                                    \
-                if (debug)                                      \
-                        printk(KERN_DEBUG "%s: " format,        \
-                                MY_NAME , ## arg);              \
-        } while (0)
-#define err(format, arg...) printk(KERN_ERR "%s: " format, MY_NAME , ## arg)
-#define info(format, arg...) printk(KERN_INFO "%s: " format, MY_NAME , ## arg)
-
-#define DRIVER_AUTHOR   "Greg Kroah-Hartman <greg@kroah.com>"
-#define DRIVER_DESC     "Fake PCI Hot Plug Controller Driver"
-
-struct dummy_slot {
-        struct list_head node;
-        struct hotplug_slot *slot;
-        struct pci_dev *dev;
-        struct work_struct remove_work;
-        unsigned long removed;
+struct legacy_slot {
+        struct kobject          kobj;
+        struct pci_dev          *dev;
+        struct list_head        list;
 };
 
-static int debug;
-static int dup_slots;
-static LIST_HEAD(slot_list);
-static struct workqueue_struct *dummyphp_wq;
-
-static void pci_rescan_worker(struct work_struct *work);
-static DECLARE_WORK(pci_rescan_work, pci_rescan_worker);
-
-static int enable_slot (struct hotplug_slot *slot);
-static int disable_slot (struct hotplug_slot *slot);
+static LIST_HEAD(legacy_list);
 
-static struct hotplug_slot_ops dummy_hotplug_slot_ops = {
-        .owner                  = THIS_MODULE,
-        .enable_slot            = enable_slot,
-        .disable_slot           = disable_slot,
-};
-
-static void dummy_release(struct hotplug_slot *slot)
+static ssize_t legacy_show(struct kobject *kobj, struct attribute *attr,
+                           char *buf)
 {
-        struct dummy_slot *dslot = slot->private;
-
-        list_del(&dslot->node);
-        kfree(dslot->slot->info);
-        kfree(dslot->slot);
-        pci_dev_put(dslot->dev);
-        kfree(dslot);
+        struct legacy_slot *slot = container_of(kobj, typeof(*slot), kobj);
+        strcpy(buf, "1\n");
+        return 2;
 }
 
-#define SLOT_NAME_SIZE  8
-
-static int add_slot(struct pci_dev *dev)
+static void remove_callback(void *data)
 {
-        struct dummy_slot *dslot;
-        struct hotplug_slot *slot;
-        char name[SLOT_NAME_SIZE];
-        int retval = -ENOMEM;
-        static int count = 1;
-
-        slot = kzalloc(sizeof(struct hotplug_slot), GFP_KERNEL);
-        if (!slot)
-                goto error;
-
-        slot->info = kzalloc(sizeof(struct hotplug_slot_info), GFP_KERNEL);
-        if (!slot->info)
-                goto error_slot;
-
-        slot->info->power_status = 1;
-        slot->info->max_bus_speed = PCI_SPEED_UNKNOWN;
-        slot->info->cur_bus_speed = PCI_SPEED_UNKNOWN;
-
-        dslot = kzalloc(sizeof(struct dummy_slot), GFP_KERNEL);
-        if (!dslot)
-                goto error_info;
-
-        if (dup_slots)
-                snprintf(name, SLOT_NAME_SIZE, "fake");
-        else
-                snprintf(name, SLOT_NAME_SIZE, "fake%d", count++);
-        dbg("slot->name = %s\n", name);
-        slot->ops = &dummy_hotplug_slot_ops;
-        slot->release = &dummy_release;
-        slot->private = dslot;
-
-        retval = pci_hp_register(slot, dev->bus, PCI_SLOT(dev->devfn), name);
-        if (retval) {
-                err("pci_hp_register failed with error %d\n", retval);
-                goto error_dslot;
-        }
-
-        dbg("slot->name = %s\n", hotplug_slot_name(slot));
-        dslot->slot = slot;
-        dslot->dev = pci_dev_get(dev);
-        list_add (&dslot->node, &slot_list);
-        return retval;
-
-error_dslot:
-        kfree(dslot);
-error_info:
-        kfree(slot->info);
-error_slot:
-        kfree(slot);
-error:
-        return retval;
+        pci_remove_bus_device((struct pci_dev *)data);
 }
 
-static int __init pci_scan_buses(void)
+static ssize_t legacy_store(struct kobject *kobj, struct attribute *attr,
+                            const char *buf, size_t len)
 {
-        struct pci_dev *dev = NULL;
-        int lastslot = 0;
+        struct legacy_slot *slot = container_of(kobj, typeof(*slot), kobj);
+        unsigned long val;
 
-        while ((dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) {
-                if (PCI_FUNC(dev->devfn) > 0 &&
-                                lastslot == PCI_SLOT(dev->devfn))
-                        continue;
-                lastslot = PCI_SLOT(dev->devfn);
-                add_slot(dev);
-        }
+        if (strict_strtoul(buf, 0, &val) < 0)
+                return -EINVAL;
 
-        return 0;
+        if (val)
+                pci_rescan_bus(slot->dev->bus);
+        else
+                sysfs_schedule_callback(&slot->dev->dev.kobj, remove_callback,
+                                        slot->dev, THIS_MODULE);
+        return len;
 }
 
-static void remove_slot(struct dummy_slot *dslot)
-{
-        int retval;
-
-        dbg("removing slot %s\n", hotplug_slot_name(dslot->slot));
-        retval = pci_hp_deregister(dslot->slot);
-        if (retval)
-                err("Problem unregistering a slot %s\n",
-                        hotplug_slot_name(dslot->slot));
-}
+static struct attribute *legacy_attrs[] = {
+        &(struct attribute){ .name = "power", .mode = 0644 },
+        NULL,
+};
 
-/* called from the single-threaded workqueue handler to remove a slot */
-static void remove_slot_worker(struct work_struct *work)
+static void legacy_release(struct kobject *kobj)
 {
-        struct dummy_slot *dslot =
-                container_of(work, struct dummy_slot, remove_work);
-        remove_slot(dslot);
-}
+        struct legacy_slot *slot = container_of(kobj, typeof(*slot), kobj);
 
-/**
- * pci_rescan_slot - Rescan slot
- * @temp: Device template. Should be set: bus and devfn.
- *
- * Tries hard not to re-enable already existing devices;
- * also handles scanning of subfunctions.
- */
-static int pci_rescan_slot(struct pci_dev *temp)
-{
-        struct pci_bus *bus = temp->bus;
-        struct pci_dev *dev;
-        int func;
-        u8 hdr_type;
-        int count = 0;
-
-        if (!pci_read_config_byte(temp, PCI_HEADER_TYPE, &hdr_type)) {
-                temp->hdr_type = hdr_type & 0x7f;
-                if ((dev = pci_get_slot(bus, temp->devfn)) != NULL)
-                        pci_dev_put(dev);
-                else {
-                        dev = pci_scan_single_device(bus, temp->devfn);
-                        if (dev) {
-                                dbg("New device on %s function %x:%x\n",
-                                        bus->name, temp->devfn >> 3,
-                                        temp->devfn & 7);
-                                count++;
-                        }
-                }
-                /* multifunction device? */
-                if (!(hdr_type & 0x80))
-                        return count;
-
-                /* continue scanning for other functions */
-                for (func = 1, temp->devfn++; func < 8; func++, temp->devfn++) {
-                        if (pci_read_config_byte(temp, PCI_HEADER_TYPE, &hdr_type))
-                                continue;
-                        temp->hdr_type = hdr_type & 0x7f;
-
-                        if ((dev = pci_get_slot(bus, temp->devfn)) != NULL)
-                                pci_dev_put(dev);
-                        else {
-                                dev = pci_scan_single_device(bus, temp->devfn);
-                                if (dev) {
-                                        dbg("New device on %s function %x:%x\n",
-                                                bus->name, temp->devfn >> 3,
-                                                temp->devfn & 7);
-                                        count++;
-                                }
-                        }
-                }
-        }
-
-        return count;
+        pci_dev_put(slot->dev);
+        kfree(slot);
 }
 
+static struct kobj_type legacy_ktype = {
+        .sysfs_ops = &(struct sysfs_ops){
+                .store = legacy_store, .show = legacy_show
+        },
+        .release = &legacy_release,
+        .default_attrs = legacy_attrs,
+};
 
-/**
- * pci_rescan_bus - Rescan PCI bus
- * @bus: the PCI bus to rescan
- *
- * Call pci_rescan_slot for each possible function of the bus.
- */
-static void pci_rescan_bus(const struct pci_bus *bus)
+static int legacy_add_slot(struct pci_dev *pdev)
 {
-        unsigned int devfn;
-        struct pci_dev *dev;
-        int retval;
-        int found = 0;
-        dev = alloc_pci_dev();
-        if (!dev)
-                return;
+        struct legacy_slot *slot = kzalloc(sizeof(*slot), GFP_KERNEL);
 
-        dev->bus = (struct pci_bus*)bus;
-        dev->sysdata = bus->sysdata;
-        for (devfn = 0; devfn < 0x100; devfn += 8) {
-                dev->devfn = devfn;
-                found += pci_rescan_slot(dev);
-        }
-
-        if (found) {
-                pci_bus_assign_resources(bus);
-                list_for_each_entry(dev, &bus->devices, bus_list) {
-                        /* Skip already-added devices */
-                        if (dev->is_added)
-                                        continue;
-                        retval = pci_bus_add_device(dev);
-                        if (retval)
-                                dev_err(&dev->dev,
-                                        "Error adding device, continuing\n");
-                        else
-                                add_slot(dev);
-                }
-                pci_bus_add_devices(bus);
-        }
-        kfree(dev);
-}
+        if (!slot)
+                return -ENOMEM;
 
-/* recursively scan all buses */
-static void pci_rescan_buses(const struct list_head *list)
-{
-        const struct list_head *l;
-        list_for_each(l,list) {
-                const struct pci_bus *b = pci_bus_b(l);
-                pci_rescan_bus(b);
-                pci_rescan_buses(&b->children);
+        if (kobject_init_and_add(&slot->kobj, &legacy_ktype,
+                                 &pci_slots_kset->kobj, "%s",
+                                 dev_name(&pdev->dev))) {
+                dev_warn(&pdev->dev, "Failed to created legacy fake slot\n");
+                return -EINVAL;
         }
-}
+        slot->dev = pci_dev_get(pdev);
 
-/* initiate rescan of all pci buses */
-static inline void pci_rescan(void) {
-        pci_rescan_buses(&pci_root_buses);
-}
-
-/* called from the single-threaded workqueue handler to rescan all pci buses */
-static void pci_rescan_worker(struct work_struct *work)
-{
-        pci_rescan();
-}
+        list_add(&slot->list, &legacy_list);
 
-static int enable_slot(struct hotplug_slot *hotplug_slot)
-{
-        /* mis-use enable_slot for rescanning of the pci bus */
-        cancel_work_sync(&pci_rescan_work);
-        queue_work(dummyphp_wq, &pci_rescan_work);
         return 0;
 }
 
-static int disable_slot(struct hotplug_slot *slot)
+static int legacy_notify(struct notifier_block *nb,
+                         unsigned long action, void *data)
 {
-        struct dummy_slot *dslot;
-        struct pci_dev *dev;
-        int func;
-
-        if (!slot)
-                return -ENODEV;
-        dslot = slot->private;
-
-        dbg("%s - physical_slot = %s\n", __func__, hotplug_slot_name(slot));
+        struct pci_dev *pdev = to_pci_dev(data);
 
-        for (func = 7; func >= 0; func--) {
-                dev = pci_get_slot(dslot->dev->bus, dslot->dev->devfn + func);
-                if (!dev)
-                        continue;
+        if (action == BUS_NOTIFY_ADD_DEVICE) {
+                legacy_add_slot(pdev);
+        } else if (action == BUS_NOTIFY_DEL_DEVICE) {
+                struct legacy_slot *slot;
 
-                if (test_and_set_bit(0, &dslot->removed)) {
-                        dbg("Slot already scheduled for removal\n");
-                        pci_dev_put(dev);
-                        return -ENODEV;
-                }
+                list_for_each_entry(slot, &legacy_list, list)
+                        if (slot->dev == pdev)
+                                goto found;
 
-                /* remove the device from the pci core */
-                pci_remove_bus_device(dev);
-
-                /* queue work item to blow away this sysfs entry and other
-                 * parts.
-                 */
-                INIT_WORK(&dslot->remove_work, remove_slot_worker);
-                queue_work(dummyphp_wq, &dslot->remove_work);
-
-                pci_dev_put(dev);
+                dev_warn(&pdev->dev, "Missing legacy fake slot?");
+                return -ENODEV;
+found:
+                kobject_del(&slot->kobj);
+                list_del(&slot->list);
+                kobject_put(&slot->kobj);
         }
+
         return 0;
 }
 
-static void cleanup_slots (void)
-{
-        struct list_head *tmp;
-        struct list_head *next;
-        struct dummy_slot *dslot;
-
-        destroy_workqueue(dummyphp_wq);
-        list_for_each_safe (tmp, next, &slot_list) {
-                dslot = list_entry (tmp, struct dummy_slot, node);
-                remove_slot(dslot);
-        }
-        
-}
+static struct notifier_block legacy_notifier = {
+        .notifier_call = legacy_notify
+};
 
-static int __init dummyphp_init(void)
+static int __init init_legacy(void)
 {
-        info(DRIVER_DESC "\n");
+        struct pci_dev *pdev = NULL;
 
-        dummyphp_wq = create_singlethread_workqueue(MY_NAME);
-        if (!dummyphp_wq)
-                return -ENOMEM;
+        /* Add existing devices */
+        while ((pdev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, pdev)))
+                legacy_add_slot(pdev);
 
-        return pci_scan_buses();
+        /* Be alerted of any new ones */
+        bus_register_notifier(&pci_bus_type, &legacy_notifier);
+        return 0;
 }
+module_init(init_legacy);
 
-
-static void __exit dummyphp_exit(void)
+static void __exit remove_legacy(void)
 {
-        cleanup_slots();
+        struct legacy_slot *slot, *tmp;
+
+        bus_unregister_notifier(&pci_bus_type, &legacy_notifier);
+
+        list_for_each_entry_safe(slot, tmp, &legacy_list, list) {
+                list_del(&slot->list);
+                kobject_del(&slot->kobj);
+                kobject_put(&slot->kobj);
+        }
 }
+module_exit(remove_legacy);
 
-module_init(dummyphp_init);
-module_exit(dummyphp_exit);
 
-MODULE_AUTHOR(DRIVER_AUTHOR);
-MODULE_DESCRIPTION(DRIVER_DESC);
+MODULE_AUTHOR("Trent Piepho <xyzzy@speakeasy.org>");
+MODULE_DESCRIPTION("Legacy version of the fakephp interface");
 MODULE_LICENSE("GPL");
-module_param(debug, bool, S_IRUGO | S_IWUSR);
-MODULE_PARM_DESC(debug, "Debugging mode enabled or not");
-module_param(dup_slots, bool, S_IRUGO | S_IWUSR);
-MODULE_PARM_DESC(dup_slots, "Force duplicate slot names for debugging");
diff --git a/drivers/pci/hotplug/pciehp.h b/drivers/pci/hotplug/pciehp.h
index 39ae37589fda..0a368547e633 100644
--- a/drivers/pci/hotplug/pciehp.h
+++ b/drivers/pci/hotplug/pciehp.h
@@ -46,10 +46,10 @@ extern int pciehp_force;
 extern struct workqueue_struct *pciehp_wq;
 
 #define dbg(format, arg...)                                             \
-        do {                                                            \
-                if (pciehp_debug)                                       \
-                        printk("%s: " format, MY_NAME , ## arg);        \
-        } while (0)
+do {                                                                    \
+        if (pciehp_debug)                                               \
+                printk(KERN_DEBUG "%s: " format, MY_NAME , ## arg);     \
+} while (0)
 #define err(format, arg...)                                             \
         printk(KERN_ERR "%s: " format, MY_NAME , ## arg)
 #define info(format, arg...)                                            \
@@ -60,7 +60,7 @@ extern struct workqueue_struct *pciehp_wq;
 #define ctrl_dbg(ctrl, format, arg...)                                  \
         do {                                                            \
                 if (pciehp_debug)                                       \
-                        dev_printk(, &ctrl->pcie->device,               \
+                        dev_printk(KERN_DEBUG, &ctrl->pcie->device,     \
                                         format, ## arg);                \
         } while (0)
 #define ctrl_err(ctrl, format, arg...)                                  \
@@ -108,10 +108,11 @@ struct controller {
         u32 slot_cap;
         u8 cap_base;
         struct timer_list poll_timer;
-        int cmd_busy;
+        unsigned int cmd_busy:1;
         unsigned int no_cmd_complete:1;
         unsigned int link_active_reporting:1;
         unsigned int notification_enabled:1;
+        unsigned int power_fault_detected;
 };
 
 #define INT_BUTTON_IGNORE               0
diff --git a/drivers/pci/hotplug/pciehp_acpi.c b/drivers/pci/hotplug/pciehp_acpi.c
index 438d795f9fe3..96048010e7d9 100644
--- a/drivers/pci/hotplug/pciehp_acpi.c
+++ b/drivers/pci/hotplug/pciehp_acpi.c
@@ -67,37 +67,27 @@ static int __init parse_detect_mode(void)
         return PCIEHP_DETECT_DEFAULT;
 }
 
-static struct pcie_port_service_id __initdata port_pci_ids[] = {
-        {
-                .vendor = PCI_ANY_ID,
-                .device = PCI_ANY_ID,
-                .port_type = PCIE_ANY_PORT,
-                .service_type = PCIE_PORT_SERVICE_HP,
-                .driver_data =  0,
-        }, { /* end: all zeroes */ }
-};
-
 static int __initdata dup_slot_id;
 static int __initdata acpi_slot_detected;
 static struct list_head __initdata dummy_slots = LIST_HEAD_INIT(dummy_slots);
 
 /* Dummy driver for dumplicate name detection */
-static int __init dummy_probe(struct pcie_device *dev,
-                              const struct pcie_port_service_id *id)
+static int __init dummy_probe(struct pcie_device *dev)
 {
         int pos;
         u32 slot_cap;
         struct slot *slot, *tmp;
         struct pci_dev *pdev = dev->port;
         struct pci_bus *pbus = pdev->subordinate;
-        if (!(slot = kzalloc(sizeof(*slot), GFP_KERNEL)))
-                return -ENOMEM;
         /* Note: pciehp_detect_mode != PCIEHP_DETECT_ACPI here */
         if (pciehp_get_hp_hw_control_from_firmware(pdev))
                 return -ENODEV;
         if (!(pos = pci_find_capability(pdev, PCI_CAP_ID_EXP)))
                 return -ENODEV;
         pci_read_config_dword(pdev, pos + PCI_EXP_SLTCAP, &slot_cap);
+        slot = kzalloc(sizeof(*slot), GFP_KERNEL);
+        if (!slot)
+                return -ENOMEM;
         slot->number = slot_cap >> 19;
         list_for_each_entry(tmp, &dummy_slots, slot_list) {
                 if (tmp->number == slot->number)
@@ -111,7 +101,8 @@ static int __init dummy_probe(struct pcie_device *dev,
 
 static struct pcie_port_service_driver __initdata dummy_driver = {
         .name           = "pciehp_dummy",
-        .id_table       = port_pci_ids,
+        .port_type      = PCIE_ANY_PORT,
+        .service        = PCIE_PORT_SERVICE_HP,
         .probe          = dummy_probe,
 };
 
diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c
index 681e3912b821..fb254b2454de 100644
--- a/drivers/pci/hotplug/pciehp_core.c
+++ b/drivers/pci/hotplug/pciehp_core.c
@@ -401,7 +401,7 @@ static int get_cur_bus_speed(struct hotplug_slot *hotplug_slot, enum pci_bus_spe
         return 0;
 }
 
-static int pciehp_probe(struct pcie_device *dev, const struct pcie_port_service_id *id)
+static int pciehp_probe(struct pcie_device *dev)
 {
         int rc;
         struct controller *ctrl;
@@ -475,7 +475,7 @@ static void pciehp_remove (struct pcie_device *dev)
 }
 
 #ifdef CONFIG_PM
-static int pciehp_suspend (struct pcie_device *dev, pm_message_t state)
+static int pciehp_suspend (struct pcie_device *dev)
 {
         dev_info(&dev->device, "%s ENTRY\n", __func__);
         return 0;
@@ -503,20 +503,12 @@ static int pciehp_resume (struct pcie_device *dev)
         }
         return 0;
 }
-#endif
-
-static struct pcie_port_service_id port_pci_ids[] = { {
-        .vendor = PCI_ANY_ID,
-        .device = PCI_ANY_ID,
-        .port_type = PCIE_ANY_PORT,
-        .service_type = PCIE_PORT_SERVICE_HP,
-        .driver_data =  0,
-        }, { /* end: all zeroes */ }
-};
+#endif /* PM */
 
 static struct pcie_port_service_driver hpdriver_portdrv = {
         .name           = PCIE_MODULE_NAME,
-        .id_table       = &port_pci_ids[0],
+        .port_type      = PCIE_ANY_PORT,
+        .service        = PCIE_PORT_SERVICE_HP,
 
         .probe          = pciehp_probe,
         .remove         = pciehp_remove,
diff --git a/drivers/pci/hotplug/pciehp_hpc.c b/drivers/pci/hotplug/pciehp_hpc.c
index 7a16c6897bb9..07bd32151146 100644
--- a/drivers/pci/hotplug/pciehp_hpc.c
+++ b/drivers/pci/hotplug/pciehp_hpc.c
@@ -548,23 +548,21 @@ static int hpc_power_on_slot(struct slot * slot)
 
         slot_cmd = POWER_ON;
         cmd_mask = PCI_EXP_SLTCTL_PCC;
-        /* Enable detection that we turned off at slot power-off time */
         if (!pciehp_poll_mode) {
-                slot_cmd |= (PCI_EXP_SLTCTL_PFDE | PCI_EXP_SLTCTL_MRLSCE |
-                             PCI_EXP_SLTCTL_PDCE);
-                cmd_mask |= (PCI_EXP_SLTCTL_PFDE | PCI_EXP_SLTCTL_MRLSCE |
-                             PCI_EXP_SLTCTL_PDCE);
+                /* Enable power fault detection turned off at power off time */
+                slot_cmd |= PCI_EXP_SLTCTL_PFDE;
+                cmd_mask |= PCI_EXP_SLTCTL_PFDE;
         }
 
         retval = pcie_write_cmd(ctrl, slot_cmd, cmd_mask);
-
         if (retval) {
                 ctrl_err(ctrl, "Write %x command failed!\n", slot_cmd);
-                return -1;
+                return retval;
         }
         ctrl_dbg(ctrl, "%s: SLOTCTRL %x write cmd %x\n",
                  __func__, ctrl->cap_base + PCI_EXP_SLTCTL, slot_cmd);
 
+        ctrl->power_fault_detected = 0;
         return retval;
 }
 
@@ -621,18 +619,10 @@ static int hpc_power_off_slot(struct slot * slot)
 
         slot_cmd = POWER_OFF;
         cmd_mask = PCI_EXP_SLTCTL_PCC;
-        /*
-         * If we get MRL or presence detect interrupts now, the isr
-         * will notice the sticky power-fault bit too and issue power
-         * indicator change commands. This will lead to an endless loop
-         * of command completions, since the power-fault bit remains on
-         * till the slot is powered on again.
-         */
         if (!pciehp_poll_mode) {
-                slot_cmd &= ~(PCI_EXP_SLTCTL_PFDE | PCI_EXP_SLTCTL_MRLSCE |
-                              PCI_EXP_SLTCTL_PDCE);
-                cmd_mask |= (PCI_EXP_SLTCTL_PFDE | PCI_EXP_SLTCTL_MRLSCE |
-                             PCI_EXP_SLTCTL_PDCE);
+                /* Disable power fault detection */
+                slot_cmd &= ~PCI_EXP_SLTCTL_PFDE;
+                cmd_mask |= PCI_EXP_SLTCTL_PFDE;
         }
 
         retval = pcie_write_cmd(ctrl, slot_cmd, cmd_mask);
@@ -672,10 +662,11 @@ static irqreturn_t pcie_isr(int irq, void *dev_id)
                 detected &= (PCI_EXP_SLTSTA_ABP | PCI_EXP_SLTSTA_PFD |
                              PCI_EXP_SLTSTA_MRLSC | PCI_EXP_SLTSTA_PDC |
                              PCI_EXP_SLTSTA_CC);
+                detected &= ~intr_loc;
                 intr_loc |= detected;
                 if (!intr_loc)
                         return IRQ_NONE;
-                if (detected && pciehp_writew(ctrl, PCI_EXP_SLTSTA, detected)) {
+                if (detected && pciehp_writew(ctrl, PCI_EXP_SLTSTA, intr_loc)) {
                         ctrl_err(ctrl, "%s: Cannot write to SLOTSTATUS\n",
                                  __func__);
                         return IRQ_NONE;
@@ -709,9 +700,10 @@ static irqreturn_t pcie_isr(int irq, void *dev_id)
                 pciehp_handle_presence_change(p_slot);
 
         /* Check Power Fault Detected */
-        if (intr_loc & PCI_EXP_SLTSTA_PFD)
+        if ((intr_loc & PCI_EXP_SLTSTA_PFD) && !ctrl->power_fault_detected) {
+                ctrl->power_fault_detected = 1;
                 pciehp_handle_power_fault(p_slot);
-
+        }
         return IRQ_HANDLED;
 }
 
diff --git a/drivers/pci/hotplug/shpchp.h b/drivers/pci/hotplug/shpchp.h
index 6aba0b6cf2e0..974e924ca96d 100644
--- a/drivers/pci/hotplug/shpchp.h
+++ b/drivers/pci/hotplug/shpchp.h
@@ -48,10 +48,10 @@ extern int shpchp_debug;
 extern struct workqueue_struct *shpchp_wq;
 
 #define dbg(format, arg...)                                             \
-        do {                                                            \
-                if (shpchp_debug)                                       \
-                        printk("%s: " format, MY_NAME , ## arg);        \
-        } while (0)
+do {                                                                    \
+        if (shpchp_debug)                                               \
+                printk(KERN_DEBUG "%s: " format, MY_NAME , ## arg);     \
+} while (0)
 #define err(format, arg...)                                             \
         printk(KERN_ERR "%s: " format, MY_NAME , ## arg)
 #define info(format, arg...)                                            \
@@ -62,7 +62,7 @@ extern struct workqueue_struct *shpchp_wq;
 #define ctrl_dbg(ctrl, format, arg...)                                  \
         do {                                                            \
                 if (shpchp_debug)                                       \
-                        dev_printk(, &ctrl->pci_dev->dev,               \
+                        dev_printk(KERN_DEBUG, &ctrl->pci_dev->dev,     \
                                         format, ## arg);                \
         } while (0)
 #define ctrl_err(ctrl, format, arg...)                                  \
diff --git a/drivers/pci/hotplug/shpchp_pci.c b/drivers/pci/hotplug/shpchp_pci.c
index 138f161becc0..aa315e52529b 100644
--- a/drivers/pci/hotplug/shpchp_pci.c
+++ b/drivers/pci/hotplug/shpchp_pci.c
@@ -137,7 +137,7 @@ int __ref shpchp_configure_device(struct slot *p_slot)
                                                         busnr))
                                         break;
                         }
-                        if (busnr >= end) {
+                        if (busnr > end) {
                                 ctrl_err(ctrl,
                                          "No free bus for hot-added bridge\n");
                                 pci_dev_put(dev);
diff --git a/drivers/pci/intel-iommu.c b/drivers/pci/intel-iommu.c
index 49402c399232..9dbd5066acaf 100644
--- a/drivers/pci/intel-iommu.c
+++ b/drivers/pci/intel-iommu.c
@@ -1782,7 +1782,7 @@ static inline void iommu_prepare_isa(void)
         ret = iommu_prepare_identity_map(pdev, 0, 16*1024*1024);
 
         if (ret)
-                printk("IOMMU: Failed to create 0-64M identity map, "
+                printk(KERN_ERR "IOMMU: Failed to create 0-64M identity map, "
                         "floppy might not work\n");
 
 }
diff --git a/drivers/pci/iov.c b/drivers/pci/iov.c
new file mode 100644
index 000000000000..7227efc760db
--- /dev/null
+++ b/drivers/pci/iov.c
@@ -0,0 +1,680 @@
+/*
+ * drivers/pci/iov.c
+ *
+ * Copyright (C) 2009 Intel Corporation, Yu Zhao <yu.zhao@intel.com>
+ *
+ * PCI Express I/O Virtualization (IOV) support.
+ *   Single Root IOV 1.0
+ */
+
+#include <linux/pci.h>
+#include <linux/mutex.h>
+#include <linux/string.h>
+#include <linux/delay.h>
+#include "pci.h"
+
+#define VIRTFN_ID_LEN   16
+
+static inline u8 virtfn_bus(struct pci_dev *dev, int id)
+{
+        return dev->bus->number + ((dev->devfn + dev->sriov->offset +
+                                    dev->sriov->stride * id) >> 8);
+}
+
+static inline u8 virtfn_devfn(struct pci_dev *dev, int id)
+{
+        return (dev->devfn + dev->sriov->offset +
+                dev->sriov->stride * id) & 0xff;
+}
+
+static struct pci_bus *virtfn_add_bus(struct pci_bus *bus, int busnr)
+{
+        int rc;
+        struct pci_bus *child;
+
+        if (bus->number == busnr)
+                return bus;
+
+        child = pci_find_bus(pci_domain_nr(bus), busnr);
+        if (child)
+                return child;
+
+        child = pci_add_new_bus(bus, NULL, busnr);
+        if (!child)
+                return NULL;
+
+        child->subordinate = busnr;
+        child->dev.parent = bus->bridge;
+        rc = pci_bus_add_child(child);
+        if (rc) {
+                pci_remove_bus(child);
+                return NULL;
+        }
+
+        return child;
+}
+
+static void virtfn_remove_bus(struct pci_bus *bus, int busnr)
+{
+        struct pci_bus *child;
+
+        if (bus->number == busnr)
+                return;
+
+        child = pci_find_bus(pci_domain_nr(bus), busnr);
+        BUG_ON(!child);
+
+        if (list_empty(&child->devices))
+                pci_remove_bus(child);
+}
+
+static int virtfn_add(struct pci_dev *dev, int id, int reset)
+{
+        int i;
+        int rc;
+        u64 size;
+        char buf[VIRTFN_ID_LEN];
+        struct pci_dev *virtfn;
+        struct resource *res;
+        struct pci_sriov *iov = dev->sriov;
+
+        virtfn = alloc_pci_dev();
+        if (!virtfn)
+                return -ENOMEM;
+
+        mutex_lock(&iov->dev->sriov->lock);
+        virtfn->bus = virtfn_add_bus(dev->bus, virtfn_bus(dev, id));
+        if (!virtfn->bus) {
+                kfree(virtfn);
+                mutex_unlock(&iov->dev->sriov->lock);
+                return -ENOMEM;
+        }
+        virtfn->devfn = virtfn_devfn(dev, id);
+        virtfn->vendor = dev->vendor;
+        pci_read_config_word(dev, iov->pos + PCI_SRIOV_VF_DID, &virtfn->device);
+        pci_setup_device(virtfn);
+        virtfn->dev.parent = dev->dev.parent;
+
+        for (i = 0; i < PCI_SRIOV_NUM_BARS; i++) {
+                res = dev->resource + PCI_IOV_RESOURCES + i;
+                if (!res->parent)
+                        continue;
+                virtfn->resource[i].name = pci_name(virtfn);
+                virtfn->resource[i].flags = res->flags;
+                size = resource_size(res);
+                do_div(size, iov->total);
+                virtfn->resource[i].start = res->start + size * id;
+                virtfn->resource[i].end = virtfn->resource[i].start + size - 1;
+                rc = request_resource(res, &virtfn->resource[i]);
+                BUG_ON(rc);
+        }
+
+        if (reset)
+                pci_execute_reset_function(virtfn);
+
+        pci_device_add(virtfn, virtfn->bus);
+        mutex_unlock(&iov->dev->sriov->lock);
+
+        virtfn->physfn = pci_dev_get(dev);
+        virtfn->is_virtfn = 1;
+
+        rc = pci_bus_add_device(virtfn);
+        if (rc)
+                goto failed1;
+        sprintf(buf, "virtfn%u", id);
+        rc = sysfs_create_link(&dev->dev.kobj, &virtfn->dev.kobj, buf);
+        if (rc)
+                goto failed1;
+        rc = sysfs_create_link(&virtfn->dev.kobj, &dev->dev.kobj, "physfn");
+        if (rc)
+                goto failed2;
+
+        kobject_uevent(&virtfn->dev.kobj, KOBJ_CHANGE);
+
+        return 0;
+
+failed2:
+        sysfs_remove_link(&dev->dev.kobj, buf);
+failed1:
+        pci_dev_put(dev);
+        mutex_lock(&iov->dev->sriov->lock);
+        pci_remove_bus_device(virtfn);
+        virtfn_remove_bus(dev->bus, virtfn_bus(dev, id));
+        mutex_unlock(&iov->dev->sriov->lock);
+
+        return rc;
+}
+
+static void virtfn_remove(struct pci_dev *dev, int id, int reset)
+{
+        char buf[VIRTFN_ID_LEN];
+        struct pci_bus *bus;
+        struct pci_dev *virtfn;
+        struct pci_sriov *iov = dev->sriov;
+
+        bus = pci_find_bus(pci_domain_nr(dev->bus), virtfn_bus(dev, id));
+        if (!bus)
+                return;
+
+        virtfn = pci_get_slot(bus, virtfn_devfn(dev, id));
+        if (!virtfn)
+                return;
+
+        pci_dev_put(virtfn);
+
+        if (reset) {
+                device_release_driver(&virtfn->dev);
+                pci_execute_reset_function(virtfn);
+        }
+
+        sprintf(buf, "virtfn%u", id);
+        sysfs_remove_link(&dev->dev.kobj, buf);
+        sysfs_remove_link(&virtfn->dev.kobj, "physfn");
+
+        mutex_lock(&iov->dev->sriov->lock);
+        pci_remove_bus_device(virtfn);
+        virtfn_remove_bus(dev->bus, virtfn_bus(dev, id));
+        mutex_unlock(&iov->dev->sriov->lock);
+
+        pci_dev_put(dev);
+}
+
+static int sriov_migration(struct pci_dev *dev)
+{
+        u16 status;
+        struct pci_sriov *iov = dev->sriov;
+
+        if (!iov->nr_virtfn)
+                return 0;
+
+        if (!(iov->cap & PCI_SRIOV_CAP_VFM))
+                return 0;
+
+        pci_read_config_word(dev, iov->pos + PCI_SRIOV_STATUS, &status);
+        if (!(status & PCI_SRIOV_STATUS_VFM))
+                return 0;
+
+        schedule_work(&iov->mtask);
+
+        return 1;
+}
+
+static void sriov_migration_task(struct work_struct *work)
+{
+        int i;
+        u8 state;
+        u16 status;
+        struct pci_sriov *iov = container_of(work, struct pci_sriov, mtask);
+
+        for (i = iov->initial; i < iov->nr_virtfn; i++) {
+                state = readb(iov->mstate + i);
+                if (state == PCI_SRIOV_VFM_MI) {
+                        writeb(PCI_SRIOV_VFM_AV, iov->mstate + i);
+                        state = readb(iov->mstate + i);
+                        if (state == PCI_SRIOV_VFM_AV)
+                                virtfn_add(iov->self, i, 1);
+                } else if (state == PCI_SRIOV_VFM_MO) {
+                        virtfn_remove(iov->self, i, 1);
+                        writeb(PCI_SRIOV_VFM_UA, iov->mstate + i);
+                        state = readb(iov->mstate + i);
+                        if (state == PCI_SRIOV_VFM_AV)
+                                virtfn_add(iov->self, i, 0);
+                }
+        }
+
+        pci_read_config_word(iov->self, iov->pos + PCI_SRIOV_STATUS, &status);
+        status &= ~PCI_SRIOV_STATUS_VFM;
+        pci_write_config_word(iov->self, iov->pos + PCI_SRIOV_STATUS, status);
+}
+
+static int sriov_enable_migration(struct pci_dev *dev, int nr_virtfn)
+{
+        int bir;
+        u32 table;
+        resource_size_t pa;
+        struct pci_sriov *iov = dev->sriov;
+
+        if (nr_virtfn <= iov->initial)
+                return 0;
+
+        pci_read_config_dword(dev, iov->pos + PCI_SRIOV_VFM, &table);
+        bir = PCI_SRIOV_VFM_BIR(table);
+        if (bir > PCI_STD_RESOURCE_END)
+                return -EIO;
+
+        table = PCI_SRIOV_VFM_OFFSET(table);
+        if (table + nr_virtfn > pci_resource_len(dev, bir))
+                return -EIO;
+
+        pa = pci_resource_start(dev, bir) + table;
+        iov->mstate = ioremap(pa, nr_virtfn);
+        if (!iov->mstate)
+                return -ENOMEM;
+
+        INIT_WORK(&iov->mtask, sriov_migration_task);
+
+        iov->ctrl |= PCI_SRIOV_CTRL_VFM | PCI_SRIOV_CTRL_INTR;
+        pci_write_config_word(dev, iov->pos + PCI_SRIOV_CTRL, iov->ctrl);
+
+        return 0;
+}
+
+static void sriov_disable_migration(struct pci_dev *dev)
+{
+        struct pci_sriov *iov = dev->sriov;
+
+        iov->ctrl &= ~(PCI_SRIOV_CTRL_VFM | PCI_SRIOV_CTRL_INTR);
+        pci_write_config_word(dev, iov->pos + PCI_SRIOV_CTRL, iov->ctrl);
+
+        cancel_work_sync(&iov->mtask);
+        iounmap(iov->mstate);
+}
+
+static int sriov_enable(struct pci_dev *dev, int nr_virtfn)
+{
+        int rc;
+        int i, j;
+        int nres;
+        u16 offset, stride, initial;
+        struct resource *res;
+        struct pci_dev *pdev;
+        struct pci_sriov *iov = dev->sriov;
+
+        if (!nr_virtfn)
+                return 0;
+
+        if (iov->nr_virtfn)
+                return -EINVAL;
+
+        pci_read_config_word(dev, iov->pos + PCI_SRIOV_INITIAL_VF, &initial);
+        if (initial > iov->total ||
+            (!(iov->cap & PCI_SRIOV_CAP_VFM) && (initial != iov->total)))
+                return -EIO;
+
+        if (nr_virtfn < 0 || nr_virtfn > iov->total ||
+            (!(iov->cap & PCI_SRIOV_CAP_VFM) && (nr_virtfn > initial)))
+                return -EINVAL;
+
+        pci_write_config_word(dev, iov->pos + PCI_SRIOV_NUM_VF, nr_virtfn);
+        pci_read_config_word(dev, iov->pos + PCI_SRIOV_VF_OFFSET, &offset);
+        pci_read_config_word(dev, iov->pos + PCI_SRIOV_VF_STRIDE, &stride);
+        if (!offset || (nr_virtfn > 1 && !stride))
+                return -EIO;
+
+        nres = 0;
+        for (i = 0; i < PCI_SRIOV_NUM_BARS; i++) {
+                res = dev->resource + PCI_IOV_RESOURCES + i;
+                if (res->parent)
+                        nres++;
+        }
+        if (nres != iov->nres) {
+                dev_err(&dev->dev, "not enough MMIO resources for SR-IOV\n");
+                return -ENOMEM;
+        }
+
+        iov->offset = offset;
+        iov->stride = stride;
+
+        if (virtfn_bus(dev, nr_virtfn - 1) > dev->bus->subordinate) {
+                dev_err(&dev->dev, "SR-IOV: bus number out of range\n");
+                return -ENOMEM;
+        }
+
+        if (iov->link != dev->devfn) {
+                pdev = pci_get_slot(dev->bus, iov->link);
+                if (!pdev)
+                        return -ENODEV;
+
+                pci_dev_put(pdev);
+
+                if (!pdev->is_physfn)
+                        return -ENODEV;
+
+                rc = sysfs_create_link(&dev->dev.kobj,
+                                        &pdev->dev.kobj, "dep_link");
+                if (rc)
+                        return rc;
+        }
+
+        iov->ctrl |= PCI_SRIOV_CTRL_VFE | PCI_SRIOV_CTRL_MSE;
+        pci_block_user_cfg_access(dev);
+        pci_write_config_word(dev, iov->pos + PCI_SRIOV_CTRL, iov->ctrl);
+        msleep(100);
+        pci_unblock_user_cfg_access(dev);
+
+        iov->initial = initial;
+        if (nr_virtfn < initial)
+                initial = nr_virtfn;
+
+        for (i = 0; i < initial; i++) {
+                rc = virtfn_add(dev, i, 0);
+                if (rc)
+                        goto failed;
+        }
+
+        if (iov->cap & PCI_SRIOV_CAP_VFM) {
+                rc = sriov_enable_migration(dev, nr_virtfn);
+                if (rc)
+                        goto failed;
+        }
+
+        kobject_uevent(&dev->dev.kobj, KOBJ_CHANGE);
+        iov->nr_virtfn = nr_virtfn;
+
+        return 0;
+
+failed:
+        for (j = 0; j < i; j++)
+                virtfn_remove(dev, j, 0);
+
+        iov->ctrl &= ~(PCI_SRIOV_CTRL_VFE | PCI_SRIOV_CTRL_MSE);
+        pci_block_user_cfg_access(dev);
+        pci_write_config_word(dev, iov->pos + PCI_SRIOV_CTRL, iov->ctrl);
+        ssleep(1);
+        pci_unblock_user_cfg_access(dev);
+
+        if (iov->link != dev->devfn)
+                sysfs_remove_link(&dev->dev.kobj, "dep_link");
+
+        return rc;
+}
+
+static void sriov_disable(struct pci_dev *dev)
+{
+        int i;
+        struct pci_sriov *iov = dev->sriov;
+
+        if (!iov->nr_virtfn)
+                return;
+
+        if (iov->cap & PCI_SRIOV_CAP_VFM)
+                sriov_disable_migration(dev);
+
+        for (i = 0; i < iov->nr_virtfn; i++)
+                virtfn_remove(dev, i, 0);
+
+        iov->ctrl &= ~(PCI_SRIOV_CTRL_VFE | PCI_SRIOV_CTRL_MSE);
+        pci_block_user_cfg_access(dev);
+        pci_write_config_word(dev, iov->pos + PCI_SRIOV_CTRL, iov->ctrl);
+        ssleep(1);
+        pci_unblock_user_cfg_access(dev);
+
+        if (iov->link != dev->devfn)
+                sysfs_remove_link(&dev->dev.kobj, "dep_link");
+
+        iov->nr_virtfn = 0;
+}
+
+static int sriov_init(struct pci_dev *dev, int pos)
+{
+        int i;
+        int rc;
+        int nres;
+        u32 pgsz;
+        u16 ctrl, total, offset, stride;
+        struct pci_sriov *iov;
+        struct resource *res;
+        struct pci_dev *pdev;
+
+        if (dev->pcie_type != PCI_EXP_TYPE_RC_END &&
+            dev->pcie_type != PCI_EXP_TYPE_ENDPOINT)
+                return -ENODEV;
+
+        pci_read_config_word(dev, pos + PCI_SRIOV_CTRL, &ctrl);
+        if (ctrl & PCI_SRIOV_CTRL_VFE) {
+                pci_write_config_word(dev, pos + PCI_SRIOV_CTRL, 0);
+                ssleep(1);
+        }
+
+        pci_read_config_word(dev, pos + PCI_SRIOV_TOTAL_VF, &total);
+        if (!total)
+                return 0;
+
+        ctrl = 0;
+        list_for_each_entry(pdev, &dev->bus->devices, bus_list)
+                if (pdev->is_physfn)
+                        goto found;
+
+        pdev = NULL;
+        if (pci_ari_enabled(dev->bus))
+                ctrl |= PCI_SRIOV_CTRL_ARI;
+
+found:
+        pci_write_config_word(dev, pos + PCI_SRIOV_CTRL, ctrl);
+        pci_write_config_word(dev, pos + PCI_SRIOV_NUM_VF, total);
+        pci_read_config_word(dev, pos + PCI_SRIOV_VF_OFFSET, &offset);
+        pci_read_config_word(dev, pos + PCI_SRIOV_VF_STRIDE, &stride);
+        if (!offset || (total > 1 && !stride))
+                return -EIO;
+
+        pci_read_config_dword(dev, pos + PCI_SRIOV_SUP_PGSIZE, &pgsz);
+        i = PAGE_SHIFT > 12 ? PAGE_SHIFT - 12 : 0;
+        pgsz &= ~((1 << i) - 1);
+        if (!pgsz)
+                return -EIO;
+
+        pgsz &= ~(pgsz - 1);
+        pci_write_config_dword(dev, pos + PCI_SRIOV_SYS_PGSIZE, pgsz);
+
+        nres = 0;
+        for (i = 0; i < PCI_SRIOV_NUM_BARS; i++) {
+                res = dev->resource + PCI_IOV_RESOURCES + i;
+                i += __pci_read_base(dev, pci_bar_unknown, res,
+                                     pos + PCI_SRIOV_BAR + i * 4);
+                if (!res->flags)
+                        continue;
+                if (resource_size(res) & (PAGE_SIZE - 1)) {
+                        rc = -EIO;
+                        goto failed;
+                }
+                res->end = res->start + resource_size(res) * total - 1;
+                nres++;
+        }
+
+        iov = kzalloc(sizeof(*iov), GFP_KERNEL);
+        if (!iov) {
+                rc = -ENOMEM;
+                goto failed;
+        }
+
+        iov->pos = pos;
+        iov->nres = nres;
+        iov->ctrl = ctrl;
+        iov->total = total;
+        iov->offset = offset;
+        iov->stride = stride;
+        iov->pgsz = pgsz;
+        iov->self = dev;
+        pci_read_config_dword(dev, pos + PCI_SRIOV_CAP, &iov->cap);
+        pci_read_config_byte(dev, pos + PCI_SRIOV_FUNC_LINK, &iov->link);
+
+        if (pdev)
+                iov->dev = pci_dev_get(pdev);
+        else {
+                iov->dev = dev;
+                mutex_init(&iov->lock);
+        }
+
+        dev->sriov = iov;
+        dev->is_physfn = 1;
+
+        return 0;
+
+failed:
+        for (i = 0; i < PCI_SRIOV_NUM_BARS; i++) {
+                res = dev->resource + PCI_IOV_RESOURCES + i;
+                res->flags = 0;
+        }
+
+        return rc;
+}
+
+static void sriov_release(struct pci_dev *dev)
+{
+        BUG_ON(dev->sriov->nr_virtfn);
+
+        if (dev == dev->sriov->dev)
+                mutex_destroy(&dev->sriov->lock);
+        else
+                pci_dev_put(dev->sriov->dev);
+
+        kfree(dev->sriov);
+        dev->sriov = NULL;
+}
+
+static void sriov_restore_state(struct pci_dev *dev)
+{
+        int i;
+        u16 ctrl;
+        struct pci_sriov *iov = dev->sriov;
+
+        pci_read_config_word(dev, iov->pos + PCI_SRIOV_CTRL, &ctrl);
+        if (ctrl & PCI_SRIOV_CTRL_VFE)
+                return;
+
+        for (i = PCI_IOV_RESOURCES; i <= PCI_IOV_RESOURCE_END; i++)
+                pci_update_resource(dev, i);
+
+        pci_write_config_dword(dev, iov->pos + PCI_SRIOV_SYS_PGSIZE, iov->pgsz);
+        pci_write_config_word(dev, iov->pos + PCI_SRIOV_NUM_VF, iov->nr_virtfn);
+        pci_write_config_word(dev, iov->pos + PCI_SRIOV_CTRL, iov->ctrl);
+        if (iov->ctrl & PCI_SRIOV_CTRL_VFE)
+                msleep(100);
+}
+
+/**
+ * pci_iov_init - initialize the IOV capability
+ * @dev: the PCI device
+ *
+ * Returns 0 on success, or negative on failure.
+ */
+int pci_iov_init(struct pci_dev *dev)
+{
+        int pos;
+
+        if (!dev->is_pcie)
+                return -ENODEV;
+
+        pos = pci_find_ext_capability(dev, PCI_EXT_CAP_ID_SRIOV);
+        if (pos)
+                return sriov_init(dev, pos);
+
+        return -ENODEV;
+}
+
+/**
+ * pci_iov_release - release resources used by the IOV capability
+ * @dev: the PCI device
+ */
+void pci_iov_release(struct pci_dev *dev)
+{
+        if (dev->is_physfn)
+                sriov_release(dev);
+}
+
+/**
+ * pci_iov_resource_bar - get position of the SR-IOV BAR
+ * @dev: the PCI device
+ * @resno: the resource number
+ * @type: the BAR type to be filled in
+ *
+ * Returns position of the BAR encapsulated in the SR-IOV capability.
+ */
+int pci_iov_resource_bar(struct pci_dev *dev, int resno,
+                         enum pci_bar_type *type)
+{
+        if (resno < PCI_IOV_RESOURCES || resno > PCI_IOV_RESOURCE_END)
+                return 0;
+
+        BUG_ON(!dev->is_physfn);
+
+        *type = pci_bar_unknown;
+
+        return dev->sriov->pos + PCI_SRIOV_BAR +
+                4 * (resno - PCI_IOV_RESOURCES);
+}
+
+/**
+ * pci_restore_iov_state - restore the state of the IOV capability
+ * @dev: the PCI device
+ */
+void pci_restore_iov_state(struct pci_dev *dev)
+{
+        if (dev->is_physfn)
+                sriov_restore_state(dev);
+}
+
+/**
+ * pci_iov_bus_range - find bus range used by Virtual Function
+ * @bus: the PCI bus
+ *
+ * Returns max number of buses (exclude current one) used by Virtual
+ * Functions.
+ */
+int pci_iov_bus_range(struct pci_bus *bus)
+{
+        int max = 0;
+        u8 busnr;
+        struct pci_dev *dev;
+
+        list_for_each_entry(dev, &bus->devices, bus_list) {
+                if (!dev->is_physfn)
+                        continue;
+                busnr = virtfn_bus(dev, dev->sriov->total - 1);
+                if (busnr > max)
+                        max = busnr;
+        }
+
+        return max ? max - bus->number : 0;
+}
+
+/**
+ * pci_enable_sriov - enable the SR-IOV capability
+ * @dev: the PCI device
+ *
+ * Returns 0 on success, or negative on failure.
+ */
+int pci_enable_sriov(struct pci_dev *dev, int nr_virtfn)
+{
+        might_sleep();
+
+        if (!dev->is_physfn)
+                return -ENODEV;
+
+        return sriov_enable(dev, nr_virtfn);
+}
+EXPORT_SYMBOL_GPL(pci_enable_sriov);
+
+/**
+ * pci_disable_sriov - disable the SR-IOV capability
+ * @dev: the PCI device
+ */
+void pci_disable_sriov(struct pci_dev *dev)
+{
+        might_sleep();
+
+        if (!dev->is_physfn)
+                return;
+
+        sriov_disable(dev);
+}
+EXPORT_SYMBOL_GPL(pci_disable_sriov);
+
+/**
+ * pci_sriov_migration - notify SR-IOV core of Virtual Function Migration
+ * @dev: the PCI device
+ *
+ * Returns IRQ_HANDLED if the IRQ is handled, or IRQ_NONE if not.
+ *
+ * Physical Function driver is responsible to register IRQ handler using
+ * VF Migration Interrupt Message Number, and call this function when the
+ * interrupt is generated by the hardware.
+ */
+irqreturn_t pci_sriov_migration(struct pci_dev *dev)
+{
+        if (!dev->is_physfn)
+                return IRQ_NONE;
+
+        return sriov_migration(dev) ? IRQ_HANDLED : IRQ_NONE;
+}
+EXPORT_SYMBOL_GPL(pci_sriov_migration);
diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
index baba2eb5367d..6f2e6295e773 100644
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
@@ -27,48 +27,53 @@ static int pci_msi_enable = 1;
 
 /* Arch hooks */
 
-int __attribute__ ((weak))
-arch_msi_check_device(struct pci_dev *dev, int nvec, int type)
+#ifndef arch_msi_check_device
+int arch_msi_check_device(struct pci_dev *dev, int nvec, int type)
 {
         return 0;
 }
+#endif
 
-int __attribute__ ((weak))
-arch_setup_msi_irq(struct pci_dev *dev, struct msi_desc *entry)
-{
-        return 0;
-}
-
-int __attribute__ ((weak))
-arch_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
+#ifndef arch_setup_msi_irqs
+int arch_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
 {
         struct msi_desc *entry;
         int ret;
 
+        /*
+         * If an architecture wants to support multiple MSI, it needs to
+         * override arch_setup_msi_irqs()
+         */
+        if (type == PCI_CAP_ID_MSI && nvec > 1)
+                return 1;
+
         list_for_each_entry(entry, &dev->msi_list, list) {
                 ret = arch_setup_msi_irq(dev, entry);
-                if (ret)
+                if (ret < 0)
                         return ret;
+                if (ret > 0)
+                        return -ENOSPC;
         }
 
         return 0;
 }
+#endif
 
-void __attribute__ ((weak)) arch_teardown_msi_irq(unsigned int irq)
-{
-        return;
-}
-
-void __attribute__ ((weak))
-arch_teardown_msi_irqs(struct pci_dev *dev)
+#ifndef arch_teardown_msi_irqs
+void arch_teardown_msi_irqs(struct pci_dev *dev)
 {
         struct msi_desc *entry;
 
         list_for_each_entry(entry, &dev->msi_list, list) {
-                if (entry->irq != 0)
-                        arch_teardown_msi_irq(entry->irq);
+                int i, nvec;
+                if (entry->irq == 0)
+                        continue;
+                nvec = 1 << entry->msi_attrib.multiple;
+                for (i = 0; i < nvec; i++)
+                        arch_teardown_msi_irq(entry->irq + i);
         }
 }
+#endif
 
 static void __msi_set_enable(struct pci_dev *dev, int pos, int enable)
 {
@@ -111,27 +116,14 @@ static inline __attribute_const__ u32 msi_mask(unsigned x)
         return (1 << (1 << x)) - 1;
 }
 
-static void msix_flush_writes(struct irq_desc *desc)
+static inline __attribute_const__ u32 msi_capable_mask(u16 control)
 {
-        struct msi_desc *entry;
+        return msi_mask((control >> 1) & 7);
+}
 
-        entry = get_irq_desc_msi(desc);
-        BUG_ON(!entry || !entry->dev);
-        switch (entry->msi_attrib.type) {
-        case PCI_CAP_ID_MSI:
-                /* nothing to do */
-                break;
-        case PCI_CAP_ID_MSIX:
-        {
-                int offset = entry->msi_attrib.entry_nr * PCI_MSIX_ENTRY_SIZE +
-                        PCI_MSIX_ENTRY_VECTOR_CTRL_OFFSET;
-                readl(entry->mask_base + offset);
-                break;
-        }
-        default:
-                BUG();
-                break;
-        }
+static inline __attribute_const__ u32 msi_enabled_mask(u16 control)
+{
+        return msi_mask((control >> 4) & 7);
 }
 
 /*
@@ -143,49 +135,71 @@ static void msix_flush_writes(struct irq_desc *desc)
  * Returns 1 if it succeeded in masking the interrupt and 0 if the device
  * doesn't support MSI masking.
  */
-static int msi_set_mask_bits(struct irq_desc *desc, u32 mask, u32 flag)
+static void msi_mask_irq(struct msi_desc *desc, u32 mask, u32 flag)
 {
-        struct msi_desc *entry;
+        u32 mask_bits = desc->masked;
 
-        entry = get_irq_desc_msi(desc);
-        BUG_ON(!entry || !entry->dev);
-        switch (entry->msi_attrib.type) {
-        case PCI_CAP_ID_MSI:
-                if (entry->msi_attrib.maskbit) {
-                        int pos;
-                        u32 mask_bits;
-
-                        pos = (long)entry->mask_base;
-                        pci_read_config_dword(entry->dev, pos, &mask_bits);
-                        mask_bits &= ~(mask);
-                        mask_bits |= flag & mask;
-                        pci_write_config_dword(entry->dev, pos, mask_bits);
-                } else {
-                        return 0;
-                }
-                break;
-        case PCI_CAP_ID_MSIX:
-        {
-                int offset = entry->msi_attrib.entry_nr * PCI_MSIX_ENTRY_SIZE +
-                        PCI_MSIX_ENTRY_VECTOR_CTRL_OFFSET;
-                writel(flag, entry->mask_base + offset);
-                readl(entry->mask_base + offset);
-                break;
-        }
-        default:
-                BUG();
-                break;
+        if (!desc->msi_attrib.maskbit)
+                return;
+
+        mask_bits &= ~mask;
+        mask_bits |= flag;
+        pci_write_config_dword(desc->dev, desc->mask_pos, mask_bits);
+        desc->masked = mask_bits;
+}
+
+/*
+ * This internal function does not flush PCI writes to the device.
+ * All users must ensure that they read from the device before either
+ * assuming that the device state is up to date, or returning out of this
+ * file.  This saves a few milliseconds when initialising devices with lots
+ * of MSI-X interrupts.
+ */
+static void msix_mask_irq(struct msi_desc *desc, u32 flag)
+{
+        u32 mask_bits = desc->masked;
+        unsigned offset = desc->msi_attrib.entry_nr * PCI_MSIX_ENTRY_SIZE +
+                                        PCI_MSIX_ENTRY_VECTOR_CTRL_OFFSET;
+        mask_bits &= ~1;
+        mask_bits |= flag;
+        writel(mask_bits, desc->mask_base + offset);
+        desc->masked = mask_bits;
+}
+
+static void msi_set_mask_bit(unsigned irq, u32 flag)
+{
+        struct msi_desc *desc = get_irq_msi(irq);
+
+        if (desc->msi_attrib.is_msix) {
+                msix_mask_irq(desc, flag);
+                readl(desc->mask_base);         /* Flush write to device */
+        } else {
+                unsigned offset = irq - desc->dev->irq;
+                msi_mask_irq(desc, 1 << offset, flag << offset);
         }
-        entry->msi_attrib.masked = !!flag;
-        return 1;
+}
+
+void mask_msi_irq(unsigned int irq)
+{
+        msi_set_mask_bit(irq, 1);
+}
+
+void unmask_msi_irq(unsigned int irq)
+{
+        msi_set_mask_bit(irq, 0);
 }
 
 void read_msi_msg_desc(struct irq_desc *desc, struct msi_msg *msg)
 {
         struct msi_desc *entry = get_irq_desc_msi(desc);
-        switch(entry->msi_attrib.type) {
-        case PCI_CAP_ID_MSI:
-        {
+        if (entry->msi_attrib.is_msix) {
+                void __iomem *base = entry->mask_base +
+                        entry->msi_attrib.entry_nr * PCI_MSIX_ENTRY_SIZE;
+
+                msg->address_lo = readl(base + PCI_MSIX_ENTRY_LOWER_ADDR_OFFSET);
+                msg->address_hi = readl(base + PCI_MSIX_ENTRY_UPPER_ADDR_OFFSET);
+                msg->data = readl(base + PCI_MSIX_ENTRY_DATA_OFFSET);
+        } else {
                 struct pci_dev *dev = entry->dev;
                 int pos = entry->msi_attrib.pos;
                 u16 data;
@@ -201,21 +215,6 @@ void read_msi_msg_desc(struct irq_desc *desc, struct msi_msg *msg)
                         pci_read_config_word(dev, msi_data_reg(pos, 0), &data);
                 }
                 msg->data = data;
-                break;
-        }
-        case PCI_CAP_ID_MSIX:
-        {
-                void __iomem *base;
-                base = entry->mask_base +
-                        entry->msi_attrib.entry_nr * PCI_MSIX_ENTRY_SIZE;
-
-                msg->address_lo = readl(base + PCI_MSIX_ENTRY_LOWER_ADDR_OFFSET);
-                msg->address_hi = readl(base + PCI_MSIX_ENTRY_UPPER_ADDR_OFFSET);
-                msg->data = readl(base + PCI_MSIX_ENTRY_DATA_OFFSET);
-                break;
-        }
-        default:
-                BUG();
         }
 }
 
@@ -229,11 +228,25 @@ void read_msi_msg(unsigned int irq, struct msi_msg *msg)
 void write_msi_msg_desc(struct irq_desc *desc, struct msi_msg *msg)
 {
         struct msi_desc *entry = get_irq_desc_msi(desc);
-        switch (entry->msi_attrib.type) {
-        case PCI_CAP_ID_MSI:
-        {
+        if (entry->msi_attrib.is_msix) {
+                void __iomem *base;
+                base = entry->mask_base +
+                        entry->msi_attrib.entry_nr * PCI_MSIX_ENTRY_SIZE;
+
+                writel(msg->address_lo,
+                        base + PCI_MSIX_ENTRY_LOWER_ADDR_OFFSET);
+                writel(msg->address_hi,
+                        base + PCI_MSIX_ENTRY_UPPER_ADDR_OFFSET);
+                writel(msg->data, base + PCI_MSIX_ENTRY_DATA_OFFSET);
+        } else {
                 struct pci_dev *dev = entry->dev;
                 int pos = entry->msi_attrib.pos;
+                u16 msgctl;
+
+                pci_read_config_word(dev, msi_control_reg(pos), &msgctl);
+                msgctl &= ~PCI_MSI_FLAGS_QSIZE;
+                msgctl |= entry->msi_attrib.multiple << 4;
+                pci_write_config_word(dev, msi_control_reg(pos), msgctl);
 
                 pci_write_config_dword(dev, msi_lower_address_reg(pos),
                                         msg->address_lo);
@@ -246,23 +259,6 @@ void write_msi_msg_desc(struct irq_desc *desc, struct msi_msg *msg)
                         pci_write_config_word(dev, msi_data_reg(pos, 0),
                                                 msg->data);
                 }
-                break;
-        }
-        case PCI_CAP_ID_MSIX:
-        {
-                void __iomem *base;
-                base = entry->mask_base +
-                        entry->msi_attrib.entry_nr * PCI_MSIX_ENTRY_SIZE;
-
-                writel(msg->address_lo,
-                        base + PCI_MSIX_ENTRY_LOWER_ADDR_OFFSET);
-                writel(msg->address_hi,
-                        base + PCI_MSIX_ENTRY_UPPER_ADDR_OFFSET);
-                writel(msg->data, base + PCI_MSIX_ENTRY_DATA_OFFSET);
-                break;
-        }
-        default:
-                BUG();
         }
         entry->msg = *msg;
 }
@@ -274,37 +270,18 @@ void write_msi_msg(unsigned int irq, struct msi_msg *msg)
         write_msi_msg_desc(desc, msg);
 }
 
-void mask_msi_irq(unsigned int irq)
-{
-        struct irq_desc *desc = irq_to_desc(irq);
-
-        msi_set_mask_bits(desc, 1, 1);
-        msix_flush_writes(desc);
-}
-
-void unmask_msi_irq(unsigned int irq)
-{
-        struct irq_desc *desc = irq_to_desc(irq);
-
-        msi_set_mask_bits(desc, 1, 0);
-        msix_flush_writes(desc);
-}
-
 static int msi_free_irqs(struct pci_dev* dev);
 
-static struct msi_desc* alloc_msi_entry(void)
+static struct msi_desc *alloc_msi_entry(struct pci_dev *dev)
 {
-        struct msi_desc *entry;
-
-        entry = kzalloc(sizeof(struct msi_desc), GFP_KERNEL);
-        if (!entry)
+        struct msi_desc *desc = kzalloc(sizeof(*desc), GFP_KERNEL);
+        if (!desc)
                 return NULL;
 
-        INIT_LIST_HEAD(&entry->list);
-        entry->irq = 0;
-        entry->dev = NULL;
+        INIT_LIST_HEAD(&desc->list);
+        desc->dev = dev;
 
-        return entry;
+        return desc;
 }
 
 static void pci_intx_for_msi(struct pci_dev *dev, int enable)
@@ -328,15 +305,11 @@ static void __pci_restore_msi_state(struct pci_dev *dev)
         pci_intx_for_msi(dev, 0);
         msi_set_enable(dev, 0);
         write_msi_msg(dev->irq, &entry->msg);
-        if (entry->msi_attrib.maskbit) {
-                struct irq_desc *desc = irq_to_desc(dev->irq);
-                msi_set_mask_bits(desc, entry->msi_attrib.maskbits_mask,
-                                  entry->msi_attrib.masked);
-        }
 
         pci_read_config_word(dev, pos + PCI_MSI_FLAGS, &control);
+        msi_mask_irq(entry, msi_capable_mask(control), entry->masked);
         control &= ~PCI_MSI_FLAGS_QSIZE;
-        control |= PCI_MSI_FLAGS_ENABLE;
+        control |= (entry->msi_attrib.multiple << 4) | PCI_MSI_FLAGS_ENABLE;
         pci_write_config_word(dev, pos + PCI_MSI_FLAGS, control);
 }
 
@@ -354,9 +327,8 @@ static void __pci_restore_msix_state(struct pci_dev *dev)
         msix_set_enable(dev, 0);
 
         list_for_each_entry(entry, &dev->msi_list, list) {
-                struct irq_desc *desc = irq_to_desc(entry->irq);
                 write_msi_msg(entry->irq, &entry->msg);
-                msi_set_mask_bits(desc, 1, entry->msi_attrib.masked);
+                msix_mask_irq(entry, entry->masked);
         }
 
         BUG_ON(list_empty(&dev->msi_list));
@@ -378,52 +350,48 @@ EXPORT_SYMBOL_GPL(pci_restore_msi_state);
 /**
  * msi_capability_init - configure device's MSI capability structure
  * @dev: pointer to the pci_dev data structure of MSI device function
+ * @nvec: number of interrupts to allocate
  *
- * Setup the MSI capability structure of device function with a single
- * MSI irq, regardless of device function is capable of handling
- * multiple messages. A return of zero indicates the successful setup
- * of an entry zero with the new MSI irq or non-zero for otherwise.
- **/
-static int msi_capability_init(struct pci_dev *dev)
+ * Setup the MSI capability structure of the device with the requested
+ * number of interrupts.  A return value of zero indicates the successful
+ * setup of an entry with the new MSI irq.  A negative return value indicates
+ * an error, and a positive return value indicates the number of interrupts
+ * which could have been allocated.
+ */
+static int msi_capability_init(struct pci_dev *dev, int nvec)
 {
         struct msi_desc *entry;
         int pos, ret;
         u16 control;
+        unsigned mask;
 
         msi_set_enable(dev, 0); /* Ensure msi is disabled as I set it up */
 
         pos = pci_find_capability(dev, PCI_CAP_ID_MSI);
         pci_read_config_word(dev, msi_control_reg(pos), &control);
         /* MSI Entry Initialization */
-        entry = alloc_msi_entry();
+        entry = alloc_msi_entry(dev);
         if (!entry)
                 return -ENOMEM;
 
-        entry->msi_attrib.type = PCI_CAP_ID_MSI;
+        entry->msi_attrib.is_msix = 0;
         entry->msi_attrib.is_64 = is_64bit_address(control);
         entry->msi_attrib.entry_nr = 0;
         entry->msi_attrib.maskbit = is_mask_bit_support(control);
-        entry->msi_attrib.masked = 1;
         entry->msi_attrib.default_irq = dev->irq;       /* Save IOAPIC IRQ */
         entry->msi_attrib.pos = pos;
-        entry->dev = dev;
-        if (entry->msi_attrib.maskbit) {
-                unsigned int base, maskbits, temp;
-
-                base = msi_mask_bits_reg(pos, entry->msi_attrib.is_64);
-                entry->mask_base = (void __iomem *)(long)base;
-
-                /* All MSIs are unmasked by default, Mask them all */
-                pci_read_config_dword(dev, base, &maskbits);
-                temp = msi_mask((control & PCI_MSI_FLAGS_QMASK) >> 1);
-                maskbits |= temp;
-                pci_write_config_dword(dev, base, maskbits);
-                entry->msi_attrib.maskbits_mask = temp;
-        }
+
+        entry->mask_pos = msi_mask_bits_reg(pos, entry->msi_attrib.is_64);
+        /* All MSIs are unmasked by default, Mask them all */
+        if (entry->msi_attrib.maskbit)
+                pci_read_config_dword(dev, entry->mask_pos, &entry->masked);
+        mask = msi_capable_mask(control);
+        msi_mask_irq(entry, mask, mask);
+
         list_add_tail(&entry->list, &dev->msi_list);
 
         /* Configure MSI capability structure */
-        ret = arch_setup_msi_irqs(dev, 1, PCI_CAP_ID_MSI);
+        ret = arch_setup_msi_irqs(dev, nvec, PCI_CAP_ID_MSI);
         if (ret) {
                 msi_free_irqs(dev);
                 return ret;
@@ -476,26 +444,28 @@ static int msix_capability_init(struct pci_dev *dev,
 
         /* MSI-X Table Initialization */
         for (i = 0; i < nvec; i++) {
-                entry = alloc_msi_entry();
+                entry = alloc_msi_entry(dev);
                 if (!entry)
                         break;
 
                 j = entries[i].entry;
-                entry->msi_attrib.type = PCI_CAP_ID_MSIX;
+                entry->msi_attrib.is_msix = 1;
                 entry->msi_attrib.is_64 = 1;
                 entry->msi_attrib.entry_nr = j;
-                entry->msi_attrib.maskbit = 1;
-                entry->msi_attrib.masked = 1;
                 entry->msi_attrib.default_irq = dev->irq;
                 entry->msi_attrib.pos = pos;
-                entry->dev = dev;
                 entry->mask_base = base;
+                entry->masked = readl(base + j * PCI_MSIX_ENTRY_SIZE +
+                                        PCI_MSIX_ENTRY_VECTOR_CTRL_OFFSET);
+                msix_mask_irq(entry, 1);
 
                 list_add_tail(&entry->list, &dev->msi_list);
         }
 
         ret = arch_setup_msi_irqs(dev, nvec, PCI_CAP_ID_MSIX);
-        if (ret) {
+        if (ret < 0) {
+                /* If we had some success report the number of irqs
+                 * we succeeded in setting up. */
                 int avail = 0;
                 list_for_each_entry(entry, &dev->msi_list, list) {
                         if (entry->irq != 0) {
@@ -503,14 +473,13 @@ static int msix_capability_init(struct pci_dev *dev,
                         }
                 }
 
-                msi_free_irqs(dev);
+                if (avail != 0)
+                        ret = avail;
+        }
 
-                /* If we had some success report the number of irqs
-                 * we succeeded in setting up.
-                 */
-                if (avail == 0)
-                        avail = ret;
-                return avail;
+        if (ret) {
+                msi_free_irqs(dev);
+                return ret;
         }
 
         i = 0;
@@ -575,39 +544,54 @@ static int pci_msi_check_device(struct pci_dev* dev, int nvec, int type)
 }
 
 /**
- * pci_enable_msi - configure device's MSI capability structure
- * @dev: pointer to the pci_dev data structure of MSI device function
+ * pci_enable_msi_block - configure device's MSI capability structure
+ * @dev: device to configure
+ * @nvec: number of interrupts to configure
  *
- * Setup the MSI capability structure of device function with
- * a single MSI irq upon its software driver call to request for
- * MSI mode enabled on its hardware device function. A return of zero
- * indicates the successful setup of an entry zero with the new MSI
- * irq or non-zero for otherwise.
- **/
-int pci_enable_msi(struct pci_dev* dev)
+ * Allocate IRQs for a device with the MSI capability.
+ * This function returns a negative errno if an error occurs.  If it
+ * is unable to allocate the number of interrupts requested, it returns
+ * the number of interrupts it might be able to allocate.  If it successfully
+ * allocates at least the number of interrupts requested, it returns 0 and
+ * updates the @dev's irq member to the lowest new interrupt number; the
+ * other interrupt numbers allocated to this device are consecutive.
+ */
+int pci_enable_msi_block(struct pci_dev *dev, unsigned int nvec)
 {
-        int status;
+        int status, pos, maxvec;
+        u16 msgctl;
 
-        status = pci_msi_check_device(dev, 1, PCI_CAP_ID_MSI);
+        pos = pci_find_capability(dev, PCI_CAP_ID_MSI);
+        if (!pos)
+                return -EINVAL;
+        pci_read_config_word(dev, pos + PCI_MSI_FLAGS, &msgctl);
+        maxvec = 1 << ((msgctl & PCI_MSI_FLAGS_QMASK) >> 1);
+        if (nvec > maxvec)
+                return maxvec;
+
+        status = pci_msi_check_device(dev, nvec, PCI_CAP_ID_MSI);
         if (status)
                 return status;
 
         WARN_ON(!!dev->msi_enabled);
 
-        /* Check whether driver already requested for MSI-X irqs */
+        /* Check whether driver already requested MSI-X irqs */
         if (dev->msix_enabled) {
                 dev_info(&dev->dev, "can't enable MSI "
                          "(MSI-X already enabled)\n");
                 return -EINVAL;
         }
-        status = msi_capability_init(dev);
+
+        status = msi_capability_init(dev, nvec);
         return status;
 }
-EXPORT_SYMBOL(pci_enable_msi);
+EXPORT_SYMBOL(pci_enable_msi_block);
 
-void pci_msi_shutdown(struct pci_dev* dev)
+void pci_msi_shutdown(struct pci_dev *dev)
 {
-        struct msi_desc *entry;
+        struct msi_desc *desc;
+        u32 mask;
+        u16 ctrl;
 
         if (!pci_msi_enable || !dev || !dev->msi_enabled)
                 return;
@@ -617,19 +601,15 @@ void pci_msi_shutdown(struct pci_dev* dev)
         dev->msi_enabled = 0;
 
         BUG_ON(list_empty(&dev->msi_list));
-        entry = list_entry(dev->msi_list.next, struct msi_desc, list);
-        /* Return the the pci reset with msi irqs unmasked */
-        if (entry->msi_attrib.maskbit) {
-                u32 mask = entry->msi_attrib.maskbits_mask;
-                struct irq_desc *desc = irq_to_desc(dev->irq);
-                msi_set_mask_bits(desc, mask, ~mask);
-        }
-        if (!entry->dev || entry->msi_attrib.type != PCI_CAP_ID_MSI)
-                return;
+        desc = list_first_entry(&dev->msi_list, struct msi_desc, list);
+        pci_read_config_word(dev, desc->msi_attrib.pos + PCI_MSI_FLAGS, &ctrl);
+        mask = msi_capable_mask(ctrl);
+        msi_mask_irq(desc, mask, ~mask);
 
         /* Restore dev->irq to its default pin-assertion irq */
-        dev->irq = entry->msi_attrib.default_irq;
+        dev->irq = desc->msi_attrib.default_irq;
 }
+
 void pci_disable_msi(struct pci_dev* dev)
 {
         struct msi_desc *entry;
@@ -640,7 +620,7 @@ void pci_disable_msi(struct pci_dev* dev)
         pci_msi_shutdown(dev);
 
         entry = list_entry(dev->msi_list.next, struct msi_desc, list);
-        if (!entry->dev || entry->msi_attrib.type != PCI_CAP_ID_MSI)
+        if (entry->msi_attrib.is_msix)
                 return;
 
         msi_free_irqs(dev);
@@ -652,14 +632,18 @@ static int msi_free_irqs(struct pci_dev* dev)
         struct msi_desc *entry, *tmp;
 
         list_for_each_entry(entry, &dev->msi_list, list) {
-                if (entry->irq)
-                        BUG_ON(irq_has_action(entry->irq));
+                int i, nvec;
+                if (!entry->irq)
+                        continue;
+                nvec = 1 << entry->msi_attrib.multiple;
+                for (i = 0; i < nvec; i++)
+                        BUG_ON(irq_has_action(entry->irq + i));
         }
 
         arch_teardown_msi_irqs(dev);
 
         list_for_each_entry_safe(entry, tmp, &dev->msi_list, list) {
-                if (entry->msi_attrib.type == PCI_CAP_ID_MSIX) {
+                if (entry->msi_attrib.is_msix) {
                         writel(1, entry->mask_base + entry->msi_attrib.entry_nr
                                   * PCI_MSIX_ENTRY_SIZE
                                   + PCI_MSIX_ENTRY_VECTOR_CTRL_OFFSET);
@@ -675,6 +659,23 @@ static int msi_free_irqs(struct pci_dev* dev)
 }
 
 /**
+ * pci_msix_table_size - return the number of device's MSI-X table entries
+ * @dev: pointer to the pci_dev data structure of MSI-X device function
+ */
+int pci_msix_table_size(struct pci_dev *dev)
+{
+        int pos;
+        u16 control;
+
+        pos = pci_find_capability(dev, PCI_CAP_ID_MSIX);
+        if (!pos)
+                return 0;
+
+        pci_read_config_word(dev, msi_control_reg(pos), &control);
+        return multi_msix_capable(control);
+}
+
+/**
  * pci_enable_msix - configure device's MSI-X capability structure
  * @dev: pointer to the pci_dev data structure of MSI-X device function
  * @entries: pointer to an array of MSI-X entries
@@ -691,9 +692,8 @@ static int msi_free_irqs(struct pci_dev* dev)
  **/
 int pci_enable_msix(struct pci_dev* dev, struct msix_entry *entries, int nvec)
 {
-        int status, pos, nr_entries;
+        int status, nr_entries;
         int i, j;
-        u16 control;
 
         if (!entries)
                 return -EINVAL;
@@ -702,9 +702,7 @@ int pci_enable_msix(struct pci_dev* dev, struct msix_entry *entries, int nvec)
         if (status)
                 return status;
 
-        pos = pci_find_capability(dev, PCI_CAP_ID_MSIX);
-        pci_read_config_word(dev, msi_control_reg(pos), &control);
-        nr_entries = multi_msix_capable(control);
+        nr_entries = pci_msix_table_size(dev);
         if (nvec > nr_entries)
                 return -EINVAL;
 
diff --git a/drivers/pci/msi.h b/drivers/pci/msi.h
index 3898f5237144..71f4df2ef654 100644
--- a/drivers/pci/msi.h
+++ b/drivers/pci/msi.h
@@ -20,14 +20,8 @@
 #define msi_mask_bits_reg(base, is64bit) \
         ( (is64bit == 1) ? base+PCI_MSI_MASK_BIT : base+PCI_MSI_MASK_BIT-4)
 #define msi_disable(control)            control &= ~PCI_MSI_FLAGS_ENABLE
-#define multi_msi_capable(control) \
-        (1 << ((control & PCI_MSI_FLAGS_QMASK) >> 1))
-#define multi_msi_enable(control, num) \
-        control |= (((num >> 1) << 4) & PCI_MSI_FLAGS_QSIZE);
 #define is_64bit_address(control)       (!!(control & PCI_MSI_FLAGS_64BIT))
 #define is_mask_bit_support(control)    (!!(control & PCI_MSI_FLAGS_MASKBIT))
-#define msi_enable(control, num) multi_msi_enable(control, num); \
-        control |= PCI_MSI_FLAGS_ENABLE
 
 #define msix_table_offset_reg(base)     (base + 0x04)
 #define msix_pba_offset_reg(base)       (base + 0x08)
diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c
index deea8a187eb8..fac5eddcefd2 100644
--- a/drivers/pci/pci-acpi.c
+++ b/drivers/pci/pci-acpi.c
@@ -18,221 +18,6 @@
 #include <linux/pci-acpi.h>
 #include "pci.h"
 
-struct acpi_osc_data {
-        acpi_handle handle;
-        u32 support_set;
-        u32 control_set;
-        u32 control_query;
-        int is_queried;
-        struct list_head sibiling;
-};
-static LIST_HEAD(acpi_osc_data_list);
-
-struct acpi_osc_args {
-        u32 capbuf[3];
-};
-
-static DEFINE_MUTEX(pci_acpi_lock);
-
-static struct acpi_osc_data *acpi_get_osc_data(acpi_handle handle)
-{
-        struct acpi_osc_data *data;
-
-        list_for_each_entry(data, &acpi_osc_data_list, sibiling) {
-                if (data->handle == handle)
-                        return data;
-        }
-        data = kzalloc(sizeof(*data), GFP_KERNEL);
-        if (!data)
-                return NULL;
-        INIT_LIST_HEAD(&data->sibiling);
-        data->handle = handle;
-        list_add_tail(&data->sibiling, &acpi_osc_data_list);
-        return data;
-}
-
-static u8 OSC_UUID[16] = {0x5B, 0x4D, 0xDB, 0x33, 0xF7, 0x1F, 0x1C, 0x40,
-                          0x96, 0x57, 0x74, 0x41, 0xC0, 0x3D, 0xD7, 0x66};
-
-static acpi_status acpi_run_osc(acpi_handle handle,
-                                struct acpi_osc_args *osc_args, u32 *retval)
-{
-        acpi_status status;
-        struct acpi_object_list input;
-        union acpi_object in_params[4];
-        struct acpi_buffer output = {ACPI_ALLOCATE_BUFFER, NULL};
-        union acpi_object *out_obj;
-        u32 errors, flags = osc_args->capbuf[OSC_QUERY_TYPE];
-
-        /* Setting up input parameters */
-        input.count = 4;
-        input.pointer = in_params;
-        in_params[0].type               = ACPI_TYPE_BUFFER;
-        in_params[0].buffer.length      = 16;
-        in_params[0].buffer.pointer     = OSC_UUID;
-        in_params[1].type               = ACPI_TYPE_INTEGER;
-        in_params[1].integer.value      = 1;
-        in_params[2].type               = ACPI_TYPE_INTEGER;
-        in_params[2].integer.value      = 3;
-        in_params[3].type               = ACPI_TYPE_BUFFER;
-        in_params[3].buffer.length      = 12;
-        in_params[3].buffer.pointer     = (u8 *)osc_args->capbuf;
-
-        status = acpi_evaluate_object(handle, "_OSC", &input, &output);
-        if (ACPI_FAILURE(status))
-                return status;
-
-        if (!output.length)
-                return AE_NULL_OBJECT;
-
-        out_obj = output.pointer;
-        if (out_obj->type != ACPI_TYPE_BUFFER) {
-                printk(KERN_DEBUG "Evaluate _OSC returns wrong type\n");
-                status = AE_TYPE;
-                goto out_kfree;
-        }
-        /* Need to ignore the bit0 in result code */
-        errors = *((u32 *)out_obj->buffer.pointer) & ~(1 << 0);
-        if (errors) {
-                if (errors & OSC_REQUEST_ERROR)
-                        printk(KERN_DEBUG "_OSC request fails\n"); 
-                if (errors & OSC_INVALID_UUID_ERROR)
-                        printk(KERN_DEBUG "_OSC invalid UUID\n"); 
-                if (errors & OSC_INVALID_REVISION_ERROR)
-                        printk(KERN_DEBUG "_OSC invalid revision\n"); 
-                if (errors & OSC_CAPABILITIES_MASK_ERROR) {
-                        if (flags & OSC_QUERY_ENABLE)
-                                goto out_success;
-                        printk(KERN_DEBUG "_OSC FW not grant req. control\n");
-                        status = AE_SUPPORT;
-                        goto out_kfree;
-                }
-                status = AE_ERROR;
-                goto out_kfree;
-        }
-out_success:
-        *retval = *((u32 *)(out_obj->buffer.pointer + 8));
-        status = AE_OK;
-
-out_kfree:
-        kfree(output.pointer);
-        return status;
-}
-
-static acpi_status __acpi_query_osc(u32 flags, struct acpi_osc_data *osc_data)
-{
-        acpi_status status;
-        u32 support_set, result;
-        struct acpi_osc_args osc_args;
-
-        /* do _OSC query for all possible controls */
-        support_set = osc_data->support_set | (flags & OSC_SUPPORT_MASKS);
-        osc_args.capbuf[OSC_QUERY_TYPE] = OSC_QUERY_ENABLE;
-        osc_args.capbuf[OSC_SUPPORT_TYPE] = support_set;
-        osc_args.capbuf[OSC_CONTROL_TYPE] = OSC_CONTROL_MASKS;
-
-        status = acpi_run_osc(osc_data->handle, &osc_args, &result);
-        if (ACPI_SUCCESS(status)) {
-                osc_data->support_set = support_set;
-                osc_data->control_query = result;
-                osc_data->is_queried = 1;
-        }
-
-        return status;
-}
-
-/*
- * pci_acpi_osc_support: Invoke _OSC indicating support for the given feature
- * @flags: Bitmask of flags to support
- *
- * See the ACPI spec for the definition of the flags
- */
-int pci_acpi_osc_support(acpi_handle handle, u32 flags)
-{
-        acpi_status status;
-        acpi_handle tmp;
-        struct acpi_osc_data *osc_data;
-        int rc = 0;
-
-        status = acpi_get_handle(handle, "_OSC", &tmp);
-        if (ACPI_FAILURE(status))
-                return -ENOTTY;
-
-        mutex_lock(&pci_acpi_lock);
-        osc_data = acpi_get_osc_data(handle);
-        if (!osc_data) {
-                printk(KERN_ERR "acpi osc data array is full\n");
-                rc = -ENOMEM;
-                goto out;
-        }
-
-        __acpi_query_osc(flags, osc_data);
-out:
-        mutex_unlock(&pci_acpi_lock);
-        return rc;
-}
-
-/**
- * pci_osc_control_set - commit requested control to Firmware
- * @handle: acpi_handle for the target ACPI object
- * @flags: driver's requested control bits
- *
- * Attempt to take control from Firmware on requested control bits.
- **/
-acpi_status pci_osc_control_set(acpi_handle handle, u32 flags)
-{
-        acpi_status status;
-        u32 control_req, control_set, result;
-        acpi_handle tmp;
-        struct acpi_osc_data *osc_data;
-        struct acpi_osc_args osc_args;
-
-        status = acpi_get_handle(handle, "_OSC", &tmp);
-        if (ACPI_FAILURE(status))
-                return status;
-
-        mutex_lock(&pci_acpi_lock);
-        osc_data = acpi_get_osc_data(handle);
-        if (!osc_data) {
-                printk(KERN_ERR "acpi osc data array is full\n");
-                status = AE_ERROR;
-                goto out;
-        }
-
-        control_req = (flags & OSC_CONTROL_MASKS);
-        if (!control_req) {
-                status = AE_TYPE;
-                goto out;
-        }
-
-        /* No need to evaluate _OSC if the control was already granted. */
-        if ((osc_data->control_set & control_req) == control_req)
-                goto out;
-
-        if (!osc_data->is_queried) {
-                status = __acpi_query_osc(osc_data->support_set, osc_data);
-                if (ACPI_FAILURE(status))
-                        goto out;
-        }
-
-        if ((osc_data->control_query & control_req) != control_req) {
-                status = AE_SUPPORT;
-                goto out;
-        }
-
-        control_set = osc_data->control_set | control_req;
-        osc_args.capbuf[OSC_QUERY_TYPE] = 0;
-        osc_args.capbuf[OSC_SUPPORT_TYPE] = osc_data->support_set;
-        osc_args.capbuf[OSC_CONTROL_TYPE] = control_set;
-        status = acpi_run_osc(handle, &osc_args, &result);
-        if (ACPI_SUCCESS(status))
-                osc_data->control_set = result;
-out:
-        mutex_unlock(&pci_acpi_lock);
-        return status;
-}
-EXPORT_SYMBOL(pci_osc_control_set);
-
 /*
  * _SxD returns the D-state with the highest power
  * (lowest D-state number) supported in the S-state "x".
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index 267de88551c9..c0cbbb5a245e 100644
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -99,6 +99,52 @@ store_new_id(struct device_driver *driver, const char *buf, size_t count)
 }
 static DRIVER_ATTR(new_id, S_IWUSR, NULL, store_new_id);
 
+/**
+ * store_remove_id - remove a PCI device ID from this driver
+ * @driver: target device driver
+ * @buf: buffer for scanning device ID data
+ * @count: input size
+ *
+ * Removes a dynamic pci device ID to this driver.
+ */
+static ssize_t
+store_remove_id(struct device_driver *driver, const char *buf, size_t count)
+{
+        struct pci_dynid *dynid, *n;
+        struct pci_driver *pdrv = to_pci_driver(driver);
+        __u32 vendor, device, subvendor = PCI_ANY_ID,
+                subdevice = PCI_ANY_ID, class = 0, class_mask = 0;
+        int fields = 0;
+        int retval = -ENODEV;
+
+        fields = sscanf(buf, "%x %x %x %x %x %x",
+                        &vendor, &device, &subvendor, &subdevice,
+                        &class, &class_mask);
+        if (fields < 2)
+                return -EINVAL;
+
+        spin_lock(&pdrv->dynids.lock);
+        list_for_each_entry_safe(dynid, n, &pdrv->dynids.list, node) {
+                struct pci_device_id *id = &dynid->id;
+                if ((id->vendor == vendor) &&
+                    (id->device == device) &&
+                    (subvendor == PCI_ANY_ID || id->subvendor == subvendor) &&
+                    (subdevice == PCI_ANY_ID || id->subdevice == subdevice) &&
+                    !((id->class ^ class) & class_mask)) {
+                        list_del(&dynid->node);
+                        kfree(dynid);
+                        retval = 0;
+                        break;
+                }
+        }
+        spin_unlock(&pdrv->dynids.lock);
+
+        if (retval)
+                return retval;
+        return count;
+}
+static DRIVER_ATTR(remove_id, S_IWUSR, NULL, store_remove_id);
+
 static void
 pci_free_dynids(struct pci_driver *drv)
 {
@@ -125,6 +171,20 @@ static void pci_remove_newid_file(struct pci_driver *drv)
 {
         driver_remove_file(&drv->driver, &driver_attr_new_id);
 }
+
+static int
+pci_create_removeid_file(struct pci_driver *drv)
+{
+        int error = 0;
+        if (drv->probe != NULL)
+                error = driver_create_file(&drv->driver,&driver_attr_remove_id);
+        return error;
+}
+
+static void pci_remove_removeid_file(struct pci_driver *drv)
+{
+        driver_remove_file(&drv->driver, &driver_attr_remove_id);
+}
 #else /* !CONFIG_HOTPLUG */
 static inline void pci_free_dynids(struct pci_driver *drv) {}
 static inline int pci_create_newid_file(struct pci_driver *drv)
@@ -132,6 +192,11 @@ static inline int pci_create_newid_file(struct pci_driver *drv)
         return 0;
 }
 static inline void pci_remove_newid_file(struct pci_driver *drv) {}
+static inline int pci_create_removeid_file(struct pci_driver *drv)
+{
+        return 0;
+}
+static inline void pci_remove_removeid_file(struct pci_driver *drv) {}
 #endif
 
 /**
@@ -899,13 +964,23 @@ int __pci_register_driver(struct pci_driver *drv, struct module *owner,
         /* register with core */
         error = driver_register(&drv->driver);
         if (error)
-                return error;
+                goto out;
 
         error = pci_create_newid_file(drv);
         if (error)
-                driver_unregister(&drv->driver);
+                goto out_newid;
 
+        error = pci_create_removeid_file(drv);
+        if (error)
+                goto out_removeid;
+out:
         return error;
+
+out_removeid:
+        pci_remove_newid_file(drv);
+out_newid:
+        driver_unregister(&drv->driver);
+        goto out;
 }
 
 /**
@@ -921,6 +996,7 @@ int __pci_register_driver(struct pci_driver *drv, struct module *owner,
 void
 pci_unregister_driver(struct pci_driver *drv)
 {
+        pci_remove_removeid_file(drv);
         pci_remove_newid_file(drv);
         driver_unregister(&drv->driver);
         pci_free_dynids(drv);
@@ -1020,6 +1096,7 @@ struct bus_type pci_bus_type = {
         .remove         = pci_device_remove,
         .shutdown       = pci_device_shutdown,
         .dev_attrs      = pci_dev_attrs,
+        .bus_attrs      = pci_bus_attrs,
         .pm             = PCI_PM_OPS_PTR,
 };
 
diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
index dfc4e0ddf241..e9a8706a6401 100644
--- a/drivers/pci/pci-sysfs.c
+++ b/drivers/pci/pci-sysfs.c
@@ -219,6 +219,83 @@ msi_bus_store(struct device *dev, struct device_attribute *attr,
         return count;
 }
 
+#ifdef CONFIG_HOTPLUG
+static DEFINE_MUTEX(pci_remove_rescan_mutex);
+static ssize_t bus_rescan_store(struct bus_type *bus, const char *buf,
+                                size_t count)
+{
+        unsigned long val;
+        struct pci_bus *b = NULL;
+
+        if (strict_strtoul(buf, 0, &val) < 0)
+                return -EINVAL;
+
+        if (val) {
+                mutex_lock(&pci_remove_rescan_mutex);
+                while ((b = pci_find_next_bus(b)) != NULL)
+                        pci_rescan_bus(b);
+                mutex_unlock(&pci_remove_rescan_mutex);
+        }
+        return count;
+}
+
+struct bus_attribute pci_bus_attrs[] = {
+        __ATTR(rescan, (S_IWUSR|S_IWGRP), NULL, bus_rescan_store),
+        __ATTR_NULL
+};
+
+static ssize_t
+dev_rescan_store(struct device *dev, struct device_attribute *attr,
+                 const char *buf, size_t count)
+{
+        unsigned long val;
+        struct pci_dev *pdev = to_pci_dev(dev);
+
+        if (strict_strtoul(buf, 0, &val) < 0)
+                return -EINVAL;
+
+        if (val) {
+                mutex_lock(&pci_remove_rescan_mutex);
+                pci_rescan_bus(pdev->bus);
+                mutex_unlock(&pci_remove_rescan_mutex);
+        }
+        return count;
+}
+
+static void remove_callback(struct device *dev)
+{
+        struct pci_dev *pdev = to_pci_dev(dev);
+
+        mutex_lock(&pci_remove_rescan_mutex);
+        pci_remove_bus_device(pdev);
+        mutex_unlock(&pci_remove_rescan_mutex);
+}
+
+static ssize_t
+remove_store(struct device *dev, struct device_attribute *dummy,
+             const char *buf, size_t count)
+{
+        int ret = 0;
+        unsigned long val;
+        struct pci_dev *pdev = to_pci_dev(dev);
+
+        if (strict_strtoul(buf, 0, &val) < 0)
+                return -EINVAL;
+
+        if (pci_is_root_bus(pdev->bus))
+                return -EBUSY;
+
+        /* An attribute cannot be unregistered by one of its own methods,
+         * so we have to use this roundabout approach.
+         */
+        if (val)
+                ret = device_schedule_callback(dev, remove_callback);
+        if (ret)
+                count = ret;
+        return count;
+}
+#endif
+
 struct device_attribute pci_dev_attrs[] = {
         __ATTR_RO(resource),
         __ATTR_RO(vendor),
@@ -237,10 +314,25 @@ struct device_attribute pci_dev_attrs[] = {
         __ATTR(broken_parity_status,(S_IRUGO|S_IWUSR),
                 broken_parity_status_show,broken_parity_status_store),
         __ATTR(msi_bus, 0644, msi_bus_show, msi_bus_store),
+#ifdef CONFIG_HOTPLUG
+        __ATTR(remove, (S_IWUSR|S_IWGRP), NULL, remove_store),
+        __ATTR(rescan, (S_IWUSR|S_IWGRP), NULL, dev_rescan_store),
+#endif
         __ATTR_NULL,
 };
 
 static ssize_t
+boot_vga_show(struct device *dev, struct device_attribute *attr, char *buf)
+{
+        struct pci_dev *pdev = to_pci_dev(dev);
+
+        return sprintf(buf, "%u\n",
+                !!(pdev->resource[PCI_ROM_RESOURCE].flags &
+                   IORESOURCE_ROM_SHADOW));
+}
+struct device_attribute vga_attr = __ATTR_RO(boot_vga);
+
+static ssize_t
 pci_read_config(struct kobject *kobj, struct bin_attribute *bin_attr,
                 char *buf, loff_t off, size_t count)
 {
@@ -493,6 +585,19 @@ pci_mmap_legacy_io(struct kobject *kobj, struct bin_attribute *attr,
 }
 
 /**
+ * pci_adjust_legacy_attr - adjustment of legacy file attributes
+ * @b: bus to create files under
+ * @mmap_type: I/O port or memory
+ *
+ * Stub implementation. Can be overridden by arch if necessary.
+ */
+void __weak
+pci_adjust_legacy_attr(struct pci_bus *b, enum pci_mmap_state mmap_type)
+{
+        return;
+}
+
+/**
  * pci_create_legacy_files - create legacy I/O port and memory files
  * @b: bus to create files under
  *
@@ -518,6 +623,7 @@ void pci_create_legacy_files(struct pci_bus *b)
         b->legacy_io->read = pci_read_legacy_io;
         b->legacy_io->write = pci_write_legacy_io;
         b->legacy_io->mmap = pci_mmap_legacy_io;
+        pci_adjust_legacy_attr(b, pci_mmap_io);
         error = device_create_bin_file(&b->dev, b->legacy_io);
         if (error)
                 goto legacy_io_err;
@@ -528,6 +634,7 @@ void pci_create_legacy_files(struct pci_bus *b)
         b->legacy_mem->size = 1024*1024;
         b->legacy_mem->attr.mode = S_IRUSR | S_IWUSR;
         b->legacy_mem->mmap = pci_mmap_legacy_mem;
+        pci_adjust_legacy_attr(b, pci_mmap_mem);
         error = device_create_bin_file(&b->dev, b->legacy_mem);
         if (error)
                 goto legacy_mem_err;
@@ -719,8 +826,8 @@ static int pci_create_resource_files(struct pci_dev *pdev)
         return 0;
 }
 #else /* !HAVE_PCI_MMAP */
-static inline int pci_create_resource_files(struct pci_dev *dev) { return 0; }
-static inline void pci_remove_resource_files(struct pci_dev *dev) { return; }
+int __weak pci_create_resource_files(struct pci_dev *dev) { return 0; }
+void __weak pci_remove_resource_files(struct pci_dev *dev) { return; }
 #endif /* HAVE_PCI_MMAP */
 
 /**
@@ -884,18 +991,27 @@ int __must_check pci_create_sysfs_dev_files (struct pci_dev *pdev)
                 pdev->rom_attr = attr;
         }
 
+        if ((pdev->class >> 8) == PCI_CLASS_DISPLAY_VGA) {
+                retval = device_create_file(&pdev->dev, &vga_attr);
+                if (retval)
+                        goto err_rom_file;
+        }
+
         /* add platform-specific attributes */
         retval = pcibios_add_platform_entries(pdev);
         if (retval)
-                goto err_rom_file;
+                goto err_vga_file;
 
         /* add sysfs entries for various capabilities */
         retval = pci_create_capabilities_sysfs(pdev);
         if (retval)
-                goto err_rom_file;
+                goto err_vga_file;
 
         return 0;
 
+err_vga_file:
+        if ((pdev->class >> 8) == PCI_CLASS_DISPLAY_VGA)
+                device_remove_file(&pdev->dev, &vga_attr);
 err_rom_file:
         if (rom_size) {
                 sysfs_remove_bin_file(&pdev->dev.kobj, pdev->rom_attr);
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 0195066251e5..fe7ac2cea7c9 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -20,6 +20,8 @@
 #include <linux/pm_wakeup.h>
 #include <linux/interrupt.h>
 #include <asm/dma.h>    /* isa_dma_bridge_buggy */
+#include <linux/device.h>
+#include <asm/setup.h>
 #include "pci.h"
 
 unsigned int pci_pm_d3_delay = PCI_PM_D3_WAIT;
@@ -677,6 +679,8 @@ pci_power_t pci_choose_state(struct pci_dev *dev, pm_message_t state)
 
 EXPORT_SYMBOL(pci_choose_state);
 
+#define PCI_EXP_SAVE_REGS       7
+
 static int pci_save_pcie_state(struct pci_dev *dev)
 {
         int pos, i = 0;
@@ -689,7 +693,7 @@ static int pci_save_pcie_state(struct pci_dev *dev)
 
         save_state = pci_find_saved_cap(dev, PCI_CAP_ID_EXP);
         if (!save_state) {
-                dev_err(&dev->dev, "buffer not found in %s\n", __FUNCTION__);
+                dev_err(&dev->dev, "buffer not found in %s\n", __func__);
                 return -ENOMEM;
         }
         cap = (u16 *)&save_state->data[0];
@@ -698,6 +702,9 @@ static int pci_save_pcie_state(struct pci_dev *dev)
         pci_read_config_word(dev, pos + PCI_EXP_LNKCTL, &cap[i++]);
         pci_read_config_word(dev, pos + PCI_EXP_SLTCTL, &cap[i++]);
         pci_read_config_word(dev, pos + PCI_EXP_RTCTL, &cap[i++]);
+        pci_read_config_word(dev, pos + PCI_EXP_DEVCTL2, &cap[i++]);
+        pci_read_config_word(dev, pos + PCI_EXP_LNKCTL2, &cap[i++]);
+        pci_read_config_word(dev, pos + PCI_EXP_SLTCTL2, &cap[i++]);
 
         return 0;
 }
@@ -718,6 +725,9 @@ static void pci_restore_pcie_state(struct pci_dev *dev)
         pci_write_config_word(dev, pos + PCI_EXP_LNKCTL, cap[i++]);
         pci_write_config_word(dev, pos + PCI_EXP_SLTCTL, cap[i++]);
         pci_write_config_word(dev, pos + PCI_EXP_RTCTL, cap[i++]);
+        pci_write_config_word(dev, pos + PCI_EXP_DEVCTL2, cap[i++]);
+        pci_write_config_word(dev, pos + PCI_EXP_LNKCTL2, cap[i++]);
+        pci_write_config_word(dev, pos + PCI_EXP_SLTCTL2, cap[i++]);
 }
 
 
@@ -732,7 +742,7 @@ static int pci_save_pcix_state(struct pci_dev *dev)
 
         save_state = pci_find_saved_cap(dev, PCI_CAP_ID_PCIX);
         if (!save_state) {
-                dev_err(&dev->dev, "buffer not found in %s\n", __FUNCTION__);
+                dev_err(&dev->dev, "buffer not found in %s\n", __func__);
                 return -ENOMEM;
         }
 
@@ -805,6 +815,7 @@ pci_restore_state(struct pci_dev *dev)
         }
         pci_restore_pcix_state(dev);
         pci_restore_msi_state(dev);
+        pci_restore_iov_state(dev);
 
         return 0;
 }
@@ -1401,7 +1412,8 @@ void pci_allocate_cap_save_buffers(struct pci_dev *dev)
 {
         int error;
 
-        error = pci_add_cap_save_buffer(dev, PCI_CAP_ID_EXP, 4 * sizeof(u16));
+        error = pci_add_cap_save_buffer(dev, PCI_CAP_ID_EXP,
+                                        PCI_EXP_SAVE_REGS * sizeof(u16));
         if (error)
                 dev_err(&dev->dev,
                         "unable to preallocate PCI Express save buffer\n");
@@ -1472,7 +1484,7 @@ pci_get_interrupt_pin(struct pci_dev *dev, struct pci_dev **bridge)
         if (!pin)
                 return -1;
 
-        while (dev->bus->self) {
+        while (dev->bus->parent) {
                 pin = pci_swizzle_interrupt_pin(dev, pin);
                 dev = dev->bus->self;
         }
@@ -1492,7 +1504,7 @@ u8 pci_common_swizzle(struct pci_dev *dev, u8 *pinp)
 {
         u8 pin = *pinp;
 
-        while (dev->bus->self) {
+        while (dev->bus->parent) {
                 pin = pci_swizzle_interrupt_pin(dev, pin);
                 dev = dev->bus->self;
         }
@@ -2016,18 +2028,24 @@ static int __pcie_flr(struct pci_dev *dev, int probe)
         pci_block_user_cfg_access(dev);
 
         /* Wait for Transaction Pending bit clean */
+        pci_read_config_word(dev, exppos + PCI_EXP_DEVSTA, &status);
+        if (!(status & PCI_EXP_DEVSTA_TRPND))
+                goto transaction_done;
+
         msleep(100);
         pci_read_config_word(dev, exppos + PCI_EXP_DEVSTA, &status);
-        if (status & PCI_EXP_DEVSTA_TRPND) {
-                dev_info(&dev->dev, "Busy after 100ms while trying to reset; "
+        if (!(status & PCI_EXP_DEVSTA_TRPND))
+                goto transaction_done;
+
+        dev_info(&dev->dev, "Busy after 100ms while trying to reset; "
                         "sleeping for 1 second\n");
-                ssleep(1);
-                pci_read_config_word(dev, exppos + PCI_EXP_DEVSTA, &status);
-                if (status & PCI_EXP_DEVSTA_TRPND)
-                        dev_info(&dev->dev, "Still busy after 1s; "
+        ssleep(1);
+        pci_read_config_word(dev, exppos + PCI_EXP_DEVSTA, &status);
+        if (status & PCI_EXP_DEVSTA_TRPND)
+                dev_info(&dev->dev, "Still busy after 1s; "
                                 "proceeding with reset anyway\n");
-        }
 
+transaction_done:
         pci_write_config_word(dev, exppos + PCI_EXP_DEVCTL,
                                 PCI_EXP_DEVCTL_BCR_FLR);
         mdelay(100);
@@ -2054,18 +2072,24 @@ static int __pci_af_flr(struct pci_dev *dev, int probe)
         pci_block_user_cfg_access(dev);
 
         /* Wait for Transaction Pending bit clean */
+        pci_read_config_byte(dev, cappos + PCI_AF_STATUS, &status);
+        if (!(status & PCI_AF_STATUS_TP))
+                goto transaction_done;
+
         msleep(100);
         pci_read_config_byte(dev, cappos + PCI_AF_STATUS, &status);
-        if (status & PCI_AF_STATUS_TP) {
-                dev_info(&dev->dev, "Busy after 100ms while trying to"
-                                " reset; sleeping for 1 second\n");
-                ssleep(1);
-                pci_read_config_byte(dev,
-                                cappos + PCI_AF_STATUS, &status);
-                if (status & PCI_AF_STATUS_TP)
-                        dev_info(&dev->dev, "Still busy after 1s; "
-                                        "proceeding with reset anyway\n");
-        }
+        if (!(status & PCI_AF_STATUS_TP))
+                goto transaction_done;
+
+        dev_info(&dev->dev, "Busy after 100ms while trying to"
+                        " reset; sleeping for 1 second\n");
+        ssleep(1);
+        pci_read_config_byte(dev, cappos + PCI_AF_STATUS, &status);
+        if (status & PCI_AF_STATUS_TP)
+                dev_info(&dev->dev, "Still busy after 1s; "
+                                "proceeding with reset anyway\n");
+
+transaction_done:
         pci_write_config_byte(dev, cappos + PCI_AF_CTRL, PCI_AF_CTRL_FLR);
         mdelay(100);
 
@@ -2334,18 +2358,140 @@ int pci_select_bars(struct pci_dev *dev, unsigned long flags)
  */
 int pci_resource_bar(struct pci_dev *dev, int resno, enum pci_bar_type *type)
 {
+        int reg;
+
         if (resno < PCI_ROM_RESOURCE) {
                 *type = pci_bar_unknown;
                 return PCI_BASE_ADDRESS_0 + 4 * resno;
         } else if (resno == PCI_ROM_RESOURCE) {
                 *type = pci_bar_mem32;
                 return dev->rom_base_reg;
+        } else if (resno < PCI_BRIDGE_RESOURCES) {
+                /* device specific resource */
+                reg = pci_iov_resource_bar(dev, resno, type);
+                if (reg)
+                        return reg;
         }
 
         dev_err(&dev->dev, "BAR: invalid resource #%d\n", resno);
         return 0;
 }
 
+#define RESOURCE_ALIGNMENT_PARAM_SIZE COMMAND_LINE_SIZE
+static char resource_alignment_param[RESOURCE_ALIGNMENT_PARAM_SIZE] = {0};
+spinlock_t resource_alignment_lock = SPIN_LOCK_UNLOCKED;
+
+/**
+ * pci_specified_resource_alignment - get resource alignment specified by user.
+ * @dev: the PCI device to get
+ *
+ * RETURNS: Resource alignment if it is specified.
+ *          Zero if it is not specified.
+ */
+resource_size_t pci_specified_resource_alignment(struct pci_dev *dev)
+{
+        int seg, bus, slot, func, align_order, count;
+        resource_size_t align = 0;
+        char *p;
+
+        spin_lock(&resource_alignment_lock);
+        p = resource_alignment_param;
+        while (*p) {
+                count = 0;
+                if (sscanf(p, "%d%n", &align_order, &count) == 1 &&
+                                                        p[count] == '@') {
+                        p += count + 1;
+                } else {
+                        align_order = -1;
+                }
+                if (sscanf(p, "%x:%x:%x.%x%n",
+                        &seg, &bus, &slot, &func, &count) != 4) {
+                        seg = 0;
+                        if (sscanf(p, "%x:%x.%x%n",
+                                        &bus, &slot, &func, &count) != 3) {
+                                /* Invalid format */
+                                printk(KERN_ERR "PCI: Can't parse resource_alignment parameter: %s\n",
+                                        p);
+                                break;
+                        }
+                }
+                p += count;
+                if (seg == pci_domain_nr(dev->bus) &&
+                        bus == dev->bus->number &&
+                        slot == PCI_SLOT(dev->devfn) &&
+                        func == PCI_FUNC(dev->devfn)) {
+                        if (align_order == -1) {
+                                align = PAGE_SIZE;
+                        } else {
+                                align = 1 << align_order;
+                        }
+                        /* Found */
+                        break;
+                }
+                if (*p != ';' && *p != ',') {
+                        /* End of param or invalid format */
+                        break;
+                }
+                p++;
+        }
+        spin_unlock(&resource_alignment_lock);
+        return align;
+}
+
+/**
+ * pci_is_reassigndev - check if specified PCI is target device to reassign
+ * @dev: the PCI device to check
+ *
+ * RETURNS: non-zero for PCI device is a target device to reassign,
+ *          or zero is not.
+ */
+int pci_is_reassigndev(struct pci_dev *dev)
+{
+        return (pci_specified_resource_alignment(dev) != 0);
+}
+
+ssize_t pci_set_resource_alignment_param(const char *buf, size_t count)
+{
+        if (count > RESOURCE_ALIGNMENT_PARAM_SIZE - 1)
+                count = RESOURCE_ALIGNMENT_PARAM_SIZE - 1;
+        spin_lock(&resource_alignment_lock);
+        strncpy(resource_alignment_param, buf, count);
+        resource_alignment_param[count] = '\0';
+        spin_unlock(&resource_alignment_lock);
+        return count;
+}
+
+ssize_t pci_get_resource_alignment_param(char *buf, size_t size)
+{
+        size_t count;
+        spin_lock(&resource_alignment_lock);
+        count = snprintf(buf, size, "%s", resource_alignment_param);
+        spin_unlock(&resource_alignment_lock);
+        return count;
+}
+
+static ssize_t pci_resource_alignment_show(struct bus_type *bus, char *buf)
+{
+        return pci_get_resource_alignment_param(buf, PAGE_SIZE);
+}
+
+static ssize_t pci_resource_alignment_store(struct bus_type *bus,
+                                        const char *buf, size_t count)
+{
+        return pci_set_resource_alignment_param(buf, count);
+}
+
+BUS_ATTR(resource_alignment, 0644, pci_resource_alignment_show,
+                                        pci_resource_alignment_store);
+
+static int __init pci_resource_alignment_sysfs_init(void)
+{
+        return bus_create_file(&pci_bus_type,
+                                        &bus_attr_resource_alignment);
+}
+
+late_initcall(pci_resource_alignment_sysfs_init);
+
 static void __devinit pci_no_domains(void)
 {
 #ifdef CONFIG_PCI_DOMAINS
@@ -2394,6 +2540,9 @@ static int __init pci_setup(char *str)
                                 pci_cardbus_io_size = memparse(str + 9, &str);
                         } else if (!strncmp(str, "cbmemsize=", 10)) {
                                 pci_cardbus_mem_size = memparse(str + 10, &str);
+                        } else if (!strncmp(str, "resource_alignment=", 19)) {
+                                pci_set_resource_alignment_param(str + 19,
+                                                        strlen(str + 19));
                         } else {
                                 printk(KERN_ERR "PCI: Unknown option `%s'\n",
                                                 str);
diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
index 149fff65891f..d03f6b99f292 100644
--- a/drivers/pci/pci.h
+++ b/drivers/pci/pci.h
@@ -1,6 +1,8 @@
 #ifndef DRIVERS_PCI_H
 #define DRIVERS_PCI_H
 
+#include <linux/workqueue.h>
+
 #define PCI_CFG_SPACE_SIZE      256
 #define PCI_CFG_SPACE_EXP_SIZE  4096
 
@@ -135,6 +137,12 @@ extern int pcie_mch_quirk;
 extern struct device_attribute pci_dev_attrs[];
 extern struct device_attribute dev_attr_cpuaffinity;
 extern struct device_attribute dev_attr_cpulistaffinity;
+#ifdef CONFIG_HOTPLUG
+extern struct bus_attribute pci_bus_attrs[];
+#else
+#define pci_bus_attrs   NULL
+#endif
+
 
 /**
  * pci_match_one_device - Tell if a PCI device structure has a matching
@@ -177,6 +185,7 @@ enum pci_bar_type {
         pci_bar_mem64,          /* A 64-bit memory BAR */
 };
 
+extern int pci_setup_device(struct pci_dev *dev);
 extern int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,
                                 struct resource *res, unsigned int reg);
 extern int pci_resource_bar(struct pci_dev *dev, int resno,
@@ -194,4 +203,60 @@ static inline int pci_ari_enabled(struct pci_bus *bus)
         return bus->self && bus->self->ari_enabled;
 }
 
+#ifdef CONFIG_PCI_QUIRKS
+extern int pci_is_reassigndev(struct pci_dev *dev);
+resource_size_t pci_specified_resource_alignment(struct pci_dev *dev);
+extern void pci_disable_bridge_window(struct pci_dev *dev);
+#endif
+
+/* Single Root I/O Virtualization */
+struct pci_sriov {
+        int pos;                /* capability position */
+        int nres;               /* number of resources */
+        u32 cap;                /* SR-IOV Capabilities */
+        u16 ctrl;               /* SR-IOV Control */
+        u16 total;              /* total VFs associated with the PF */
+        u16 initial;            /* initial VFs associated with the PF */
+        u16 nr_virtfn;          /* number of VFs available */
+        u16 offset;             /* first VF Routing ID offset */
+        u16 stride;             /* following VF stride */
+        u32 pgsz;               /* page size for BAR alignment */
+        u8 link;                /* Function Dependency Link */
+        struct pci_dev *dev;    /* lowest numbered PF */
+        struct pci_dev *self;   /* this PF */
+        struct mutex lock;      /* lock for VF bus */
+        struct work_struct mtask; /* VF Migration task */
+        u8 __iomem *mstate;     /* VF Migration State Array */
+};
+
+#ifdef CONFIG_PCI_IOV
+extern int pci_iov_init(struct pci_dev *dev);
+extern void pci_iov_release(struct pci_dev *dev);
+extern int pci_iov_resource_bar(struct pci_dev *dev, int resno,
+                                enum pci_bar_type *type);
+extern void pci_restore_iov_state(struct pci_dev *dev);
+extern int pci_iov_bus_range(struct pci_bus *bus);
+#else
+static inline int pci_iov_init(struct pci_dev *dev)
+{
+        return -ENODEV;
+}
+static inline void pci_iov_release(struct pci_dev *dev)
+
+{
+}
+static inline int pci_iov_resource_bar(struct pci_dev *dev, int resno,
+                                       enum pci_bar_type *type)
+{
+        return 0;
+}
+static inline void pci_restore_iov_state(struct pci_dev *dev)
+{
+}
+static inline int pci_iov_bus_range(struct pci_bus *bus)
+{
+        return 0;
+}
+#endif /* CONFIG_PCI_IOV */
+
 #endif /* DRIVERS_PCI_H */
diff --git a/drivers/pci/pcie/aer/aerdrv.c b/drivers/pci/pcie/aer/aerdrv.c
index e390707661dd..32ade5af927e 100644
--- a/drivers/pci/pcie/aer/aerdrv.c
+++ b/drivers/pci/pcie/aer/aerdrv.c
@@ -38,30 +38,13 @@ MODULE_AUTHOR(DRIVER_AUTHOR);
 MODULE_DESCRIPTION(DRIVER_DESC);
 MODULE_LICENSE("GPL");
 
-static int __devinit aer_probe (struct pcie_device *dev,
-        const struct pcie_port_service_id *id );
+static int __devinit aer_probe (struct pcie_device *dev);
 static void aer_remove(struct pcie_device *dev);
-static int aer_suspend(struct pcie_device *dev, pm_message_t state)
-{return 0;}
-static int aer_resume(struct pcie_device *dev) {return 0;}
 static pci_ers_result_t aer_error_detected(struct pci_dev *dev,
         enum pci_channel_state error);
 static void aer_error_resume(struct pci_dev *dev);
 static pci_ers_result_t aer_root_reset(struct pci_dev *dev);
 
-/*
- * PCI Express bus's AER Root service driver data structure
- */
-static struct pcie_port_service_id aer_id[] = {
-        {
-        .vendor         = PCI_ANY_ID,
-        .device         = PCI_ANY_ID,
-        .port_type      = PCIE_RC_PORT,
-        .service_type   = PCIE_PORT_SERVICE_AER,
-        },
-        { /* end: all zeroes */ }
-};
-
 static struct pci_error_handlers aer_error_handlers = {
         .error_detected = aer_error_detected,
         .resume = aer_error_resume,
@@ -69,14 +52,12 @@ static struct pci_error_handlers aer_error_handlers = {
 
 static struct pcie_port_service_driver aerdriver = {
         .name           = "aer",
-        .id_table       = &aer_id[0],
+        .port_type      = PCIE_ANY_PORT,
+        .service        = PCIE_PORT_SERVICE_AER,
 
         .probe          = aer_probe,
         .remove         = aer_remove,
 
-        .suspend        = aer_suspend,
-        .resume         = aer_resume,
-
         .err_handler    = &aer_error_handlers,
 
         .reset_link     = aer_root_reset,
@@ -207,8 +188,7 @@ static void aer_remove(struct pcie_device *dev)
  *
  * Invoked when PCI Express bus loads AER service driver.
  **/
-static int __devinit aer_probe (struct pcie_device *dev,
-                                const struct pcie_port_service_id *id )
+static int __devinit aer_probe (struct pcie_device *dev)
 {
         int status;
         struct aer_rpc *rpc;
diff --git a/drivers/pci/pcie/aer/aerdrv_acpi.c b/drivers/pci/pcie/aer/aerdrv_acpi.c
index ebce26c37049..8edb2f300e8f 100644
--- a/drivers/pci/pcie/aer/aerdrv_acpi.c
+++ b/drivers/pci/pcie/aer/aerdrv_acpi.c
@@ -38,7 +38,7 @@ int aer_osc_setup(struct pcie_device *pciedev)
 
         handle = acpi_find_root_bridge_handle(pdev);
         if (handle) {
-                status = pci_osc_control_set(handle,
+                status = acpi_pci_osc_control_set(handle,
                                         OSC_PCI_EXPRESS_AER_CONTROL |
                                         OSC_PCI_EXPRESS_CAP_STRUCTURE_CONTROL);
         }
diff --git a/drivers/pci/pcie/aer/aerdrv_core.c b/drivers/pci/pcie/aer/aerdrv_core.c
index 382575007382..307452f30035 100644
--- a/drivers/pci/pcie/aer/aerdrv_core.c
+++ b/drivers/pci/pcie/aer/aerdrv_core.c
@@ -351,21 +351,21 @@ static int find_aer_service_iter(struct device *device, void *data)
 {
         struct device_driver *driver;
         struct pcie_port_service_driver *service_driver;
-        struct pcie_device *pcie_dev;
         struct find_aer_service_data *result;
 
         result = (struct find_aer_service_data *) data;
 
         if (device->bus == &pcie_port_bus_type) {
-                pcie_dev = to_pcie_device(device);
-                if (pcie_dev->id.port_type == PCIE_SW_DOWNSTREAM_PORT)
+                struct pcie_port_data *port_data;
+
+                port_data = pci_get_drvdata(to_pcie_device(device)->port);
+                if (port_data->port_type == PCIE_SW_DOWNSTREAM_PORT)
                         result->is_downstream = 1;
 
                 driver = device->driver;
                 if (driver) {
                         service_driver = to_service_driver(driver);
-                        if (service_driver->id_table->service_type ==
-                                        PCIE_PORT_SERVICE_AER) {
+                        if (service_driver->service == PCIE_PORT_SERVICE_AER) {
                                 result->aer_driver = service_driver;
                                 return 1;
                         }
diff --git a/drivers/pci/pcie/portdrv.h b/drivers/pci/pcie/portdrv.h
index 2529f3f2ea5a..17ad53868f9f 100644
--- a/drivers/pci/pcie/portdrv.h
+++ b/drivers/pci/pcie/portdrv.h
@@ -25,19 +25,21 @@
 #define PCIE_CAPABILITIES_REG           0x2
 #define PCIE_SLOT_CAPABILITIES_REG      0x14
 #define PCIE_PORT_DEVICE_MAXSERVICES    4
+#define PCIE_PORT_MSI_VECTOR_MASK       0x1f
+/*
+ * According to the PCI Express Base Specification 2.0, the indices of the MSI-X
+ * table entires used by port services must not exceed 31
+ */
+#define PCIE_PORT_MAX_MSIX_ENTRIES      32
 
 #define get_descriptor_id(type, service) (((type - 4) << 4) | service)
 
-struct pcie_port_device_ext {
-        int interrupt_mode;     /* [0:INTx | 1:MSI | 2:MSI-X] */
-};
-
 extern struct bus_type pcie_port_bus_type;
 extern int pcie_port_device_probe(struct pci_dev *dev);
 extern int pcie_port_device_register(struct pci_dev *dev);
 #ifdef CONFIG_PM
-extern int pcie_port_device_suspend(struct pci_dev *dev, pm_message_t state);
-extern int pcie_port_device_resume(struct pci_dev *dev);
+extern int pcie_port_device_suspend(struct device *dev);
+extern int pcie_port_device_resume(struct device *dev);
 #endif
 extern void pcie_port_device_remove(struct pci_dev *dev);
 extern int __must_check pcie_port_bus_register(void);
diff --git a/drivers/pci/pcie/portdrv_bus.c b/drivers/pci/pcie/portdrv_bus.c
index eec89b767f9f..ef3a4eeaebb4 100644
--- a/drivers/pci/pcie/portdrv_bus.c
+++ b/drivers/pci/pcie/portdrv_bus.c
@@ -26,20 +26,22 @@ EXPORT_SYMBOL_GPL(pcie_port_bus_type);
 static int pcie_port_bus_match(struct device *dev, struct device_driver *drv)
 {
         struct pcie_device *pciedev;
+        struct pcie_port_data *port_data;
         struct pcie_port_service_driver *driver;
 
         if (drv->bus != &pcie_port_bus_type || dev->bus != &pcie_port_bus_type)
                 return 0;
-        
+
         pciedev = to_pcie_device(dev);
         driver = to_service_driver(drv);
-        if (   (driver->id_table->vendor != PCI_ANY_ID && 
-                driver->id_table->vendor != pciedev->id.vendor) ||
-               (driver->id_table->device != PCI_ANY_ID &&
-                driver->id_table->device != pciedev->id.device) ||      
-               (driver->id_table->port_type != PCIE_ANY_PORT &&
-                driver->id_table->port_type != pciedev->id.port_type) ||
-                driver->id_table->service_type != pciedev->id.service_type )
+
+        if (driver->service != pciedev->service)
+                return 0;
+
+        port_data = pci_get_drvdata(pciedev->port);
+
+        if (driver->port_type != PCIE_ANY_PORT
+             && driver->port_type != port_data->port_type)
                 return 0;
 
         return 1;
diff --git a/drivers/pci/pcie/portdrv_core.c b/drivers/pci/pcie/portdrv_core.c
index 8b3f8c18032f..e39982503863 100644
--- a/drivers/pci/pcie/portdrv_core.c
+++ b/drivers/pci/pcie/portdrv_core.c
@@ -15,10 +15,9 @@
 #include <linux/slab.h>
 #include <linux/pcieport_if.h>
 
+#include "../pci.h"
 #include "portdrv.h"
 
-extern int pcie_mch_quirk;      /* MSI-quirk Indicator */
-
 /**
  * release_pcie_device - free PCI Express port service device structure
  * @dev: Port service device to release
@@ -31,26 +30,150 @@ static void release_pcie_device(struct device *dev)
         kfree(to_pcie_device(dev));                     
 }
 
-static int is_msi_quirked(struct pci_dev *dev)
+/**
+ * pcie_port_msix_add_entry - add entry to given array of MSI-X entries
+ * @entries: Array of MSI-X entries
+ * @new_entry: Index of the entry to add to the array
+ * @nr_entries: Number of entries aleady in the array
+ *
+ * Return value: Position of the added entry in the array
+ */
+static int pcie_port_msix_add_entry(
+        struct msix_entry *entries, int new_entry, int nr_entries)
 {
-        int port_type, quirk = 0;
+        int j;
+
+        for (j = 0; j < nr_entries; j++)
+                if (entries[j].entry == new_entry)
+                        return j;
+
+        entries[j].entry = new_entry;
+        return j;
+}
+
+/**
+ * pcie_port_enable_msix - try to set up MSI-X as interrupt mode for given port
+ * @dev: PCI Express port to handle
+ * @vectors: Array of interrupt vectors to populate
+ * @mask: Bitmask of port capabilities returned by get_port_device_capability()
+ *
+ * Return value: 0 on success, error code on failure
+ */
+static int pcie_port_enable_msix(struct pci_dev *dev, int *vectors, int mask)
+{
+        struct msix_entry *msix_entries;
+        int idx[PCIE_PORT_DEVICE_MAXSERVICES];
+        int nr_entries, status, pos, i, nvec;
         u16 reg16;
+        u32 reg32;
 
-        pci_read_config_word(dev, 
-                pci_find_capability(dev, PCI_CAP_ID_EXP) + 
-                PCIE_CAPABILITIES_REG, &reg16);
-        port_type = (reg16 >> 4) & PORT_TYPE_MASK;
-        switch(port_type) {
-        case PCIE_RC_PORT:
-                if (pcie_mch_quirk == 1)
-                        quirk = 1;
-                break;
-        case PCIE_SW_UPSTREAM_PORT:
-        case PCIE_SW_DOWNSTREAM_PORT:
-        default:
-                break;  
+        nr_entries = pci_msix_table_size(dev);
+        if (!nr_entries)
+                return -EINVAL;
+        if (nr_entries > PCIE_PORT_MAX_MSIX_ENTRIES)
+                nr_entries = PCIE_PORT_MAX_MSIX_ENTRIES;
+
+        msix_entries = kzalloc(sizeof(*msix_entries) * nr_entries, GFP_KERNEL);
+        if (!msix_entries)
+                return -ENOMEM;
+
+        /*
+         * Allocate as many entries as the port wants, so that we can check
+         * which of them will be useful.  Moreover, if nr_entries is correctly
+         * equal to the number of entries this port actually uses, we'll happily
+         * go through without any tricks.
+         */
+        for (i = 0; i < nr_entries; i++)
+                msix_entries[i].entry = i;
+
+        status = pci_enable_msix(dev, msix_entries, nr_entries);
+        if (status)
+                goto Exit;
+
+        for (i = 0; i < PCIE_PORT_DEVICE_MAXSERVICES; i++)
+                idx[i] = -1;
+        status = -EIO;
+        nvec = 0;
+
+        if (mask & (PCIE_PORT_SERVICE_PME | PCIE_PORT_SERVICE_HP)) {
+                int entry;
+
+                /*
+                 * The code below follows the PCI Express Base Specification 2.0
+                 * stating in Section 6.1.6 that "PME and Hot-Plug Event
+                 * interrupts (when both are implemented) always share the same
+                 * MSI or MSI-X vector, as indicated by the Interrupt Message
+                 * Number field in the PCI Express Capabilities register", where
+                 * according to Section 7.8.2 of the specification "For MSI-X,
+                 * the value in this field indicates which MSI-X Table entry is
+                 * used to generate the interrupt message."
+                 */
+                pos = pci_find_capability(dev, PCI_CAP_ID_EXP);
+                pci_read_config_word(dev, pos + PCIE_CAPABILITIES_REG, &reg16);
+                entry = (reg16 >> 9) & PCIE_PORT_MSI_VECTOR_MASK;
+                if (entry >= nr_entries)
+                        goto Error;
+
+                i = pcie_port_msix_add_entry(msix_entries, entry, nvec);
+                if (i == nvec)
+                        nvec++;
+
+                idx[PCIE_PORT_SERVICE_PME_SHIFT] = i;
+                idx[PCIE_PORT_SERVICE_HP_SHIFT] = i;
+        }
+
+        if (mask & PCIE_PORT_SERVICE_AER) {
+                int entry;
+
+                /*
+                 * The code below follows Section 7.10.10 of the PCI Express
+                 * Base Specification 2.0 stating that bits 31-27 of the Root
+                 * Error Status Register contain a value indicating which of the
+                 * MSI/MSI-X vectors assigned to the port is going to be used
+                 * for AER, where "For MSI-X, the value in this register
+                 * indicates which MSI-X Table entry is used to generate the
+                 * interrupt message."
+                 */
+                pos = pci_find_ext_capability(dev, PCI_EXT_CAP_ID_ERR);
+                pci_read_config_dword(dev, pos + PCI_ERR_ROOT_STATUS, &reg32);
+                entry = reg32 >> 27;
+                if (entry >= nr_entries)
+                        goto Error;
+
+                i = pcie_port_msix_add_entry(msix_entries, entry, nvec);
+                if (i == nvec)
+                        nvec++;
+
+                idx[PCIE_PORT_SERVICE_AER_SHIFT] = i;
         }
-        return quirk;
+
+        /*
+         * If nvec is equal to the allocated number of entries, we can just use
+         * what we have.  Otherwise, the port has some extra entries not for the
+         * services we know and we need to work around that.
+         */
+        if (nvec == nr_entries) {
+                status = 0;
+        } else {
+                /* Drop the temporary MSI-X setup */
+                pci_disable_msix(dev);
+
+                /* Now allocate the MSI-X vectors for real */
+                status = pci_enable_msix(dev, msix_entries, nvec);
+                if (status)
+                        goto Exit;
+        }
+
+        for (i = 0; i < PCIE_PORT_DEVICE_MAXSERVICES; i++)
+                vectors[i] = idx[i] >= 0 ? msix_entries[idx[i]].vector : -1;
+
+ Exit:
+        kfree(msix_entries);
+        return status;
+
+ Error:
+        pci_disable_msix(dev);
+        goto Exit;
 }
 
 /**
@@ -64,47 +187,32 @@ static int is_msi_quirked(struct pci_dev *dev)
  */
 static int assign_interrupt_mode(struct pci_dev *dev, int *vectors, int mask)
 {
-        int i, pos, nvec, status = -EINVAL;
-        int interrupt_mode = PCIE_PORT_INTx_MODE;
+        struct pcie_port_data *port_data = pci_get_drvdata(dev);
+        int irq, interrupt_mode = PCIE_PORT_NO_IRQ;
+        int i;
 
-        /* Set INTx as default */
-        for (i = 0, nvec = 0; i < PCIE_PORT_DEVICE_MAXSERVICES; i++) {
-                if (mask & (1 << i)) 
-                        nvec++;
-                vectors[i] = dev->irq;
-        }
-        
         /* Check MSI quirk */
-        if (is_msi_quirked(dev))
-                return interrupt_mode;
-
-        /* Select MSI-X over MSI if supported */                
-        pos = pci_find_capability(dev, PCI_CAP_ID_MSIX);
-        if (pos) {
-                struct msix_entry msix_entries[PCIE_PORT_DEVICE_MAXSERVICES] = 
-                        {{0, 0}, {0, 1}, {0, 2}, {0, 3}};
-                status = pci_enable_msix(dev, msix_entries, nvec);
-                if (!status) {
-                        int j = 0;
-
-                        interrupt_mode = PCIE_PORT_MSIX_MODE;
-                        for (i = 0; i < PCIE_PORT_DEVICE_MAXSERVICES; i++) {
-                                if (mask & (1 << i)) 
-                                        vectors[i] = msix_entries[j++].vector;
-                        }
-                }
-        } 
-        if (status) {
-                pos = pci_find_capability(dev, PCI_CAP_ID_MSI);
-                if (pos) {
-                        status = pci_enable_msi(dev);
-                        if (!status) {
-                                interrupt_mode = PCIE_PORT_MSI_MODE;
-                                for (i = 0;i < PCIE_PORT_DEVICE_MAXSERVICES;i++)
-                                        vectors[i] = dev->irq;
-                        }
-                }
-        } 
+        if (port_data->port_type == PCIE_RC_PORT && pcie_mch_quirk)
+                goto Fallback;
+
+        /* Try to use MSI-X if supported */
+        if (!pcie_port_enable_msix(dev, vectors, mask))
+                return PCIE_PORT_MSIX_MODE;
+
+        /* We're not going to use MSI-X, so try MSI and fall back to INTx */
+        if (!pci_enable_msi(dev))
+                interrupt_mode = PCIE_PORT_MSI_MODE;
+
+ Fallback:
+        if (interrupt_mode == PCIE_PORT_NO_IRQ && dev->pin)
+                interrupt_mode = PCIE_PORT_INTx_MODE;
+
+        irq = interrupt_mode != PCIE_PORT_NO_IRQ ? dev->irq : -1;
+        for (i = 0; i < PCIE_PORT_DEVICE_MAXSERVICES; i++)
+                vectors[i] = irq;
+
+        vectors[PCIE_PORT_SERVICE_VC_SHIFT] = -1;
+
         return interrupt_mode;
 }
 
@@ -132,13 +240,11 @@ static int get_port_device_capability(struct pci_dev *dev)
                         pos + PCIE_SLOT_CAPABILITIES_REG, &reg32);
                 if (reg32 & SLOT_HP_CAPABLE_MASK)
                         services |= PCIE_PORT_SERVICE_HP;
-        } 
-        /* PME Capable - root port capability */
-        if (((reg16 >> 4) & PORT_TYPE_MASK) == PCIE_RC_PORT)
-                services |= PCIE_PORT_SERVICE_PME;
-
+        }
+        /* AER capable */
         if (pci_find_ext_capability(dev, PCI_EXT_CAP_ID_ERR))
                 services |= PCIE_PORT_SERVICE_AER;
+        /* VC support */
         if (pci_find_ext_capability(dev, PCI_EXT_CAP_ID_VC))
                 services |= PCIE_PORT_SERVICE_VC;
 
@@ -152,20 +258,17 @@ static int get_port_device_capability(struct pci_dev *dev)
  * @port_type: Type of the port
  * @service_type: Type of service to associate with the service device
  * @irq: Interrupt vector to associate with the service device
- * @irq_mode: Interrupt mode of the service (INTx, MSI-X, MSI)
  */
 static void pcie_device_init(struct pci_dev *parent, struct pcie_device *dev, 
-        int port_type, int service_type, int irq, int irq_mode)
+        int service_type, int irq)
 {
+        struct pcie_port_data *port_data = pci_get_drvdata(parent);
         struct device *device;
+        int port_type = port_data->port_type;
 
         dev->port = parent;
-        dev->interrupt_mode = irq_mode;
         dev->irq = irq;
-        dev->id.vendor = parent->vendor;
-        dev->id.device = parent->device;
-        dev->id.port_type = port_type;
-        dev->id.service_type = (1 << service_type);
+        dev->service = service_type;
 
         /* Initialize generic device interface */
         device = &dev->device;
@@ -185,10 +288,9 @@ static void pcie_device_init(struct pci_dev *parent, struct pcie_device *dev,
  * @port_type: Type of the port
  * @service_type: Type of service to associate with the service device
  * @irq: Interrupt vector to associate with the service device
- * @irq_mode: Interrupt mode of the service (INTx, MSI-X, MSI)
  */
 static struct pcie_device* alloc_pcie_device(struct pci_dev *parent,
-        int port_type, int service_type, int irq, int irq_mode)
+        int service_type, int irq)
 {
         struct pcie_device *device;
 
@@ -196,7 +298,7 @@ static struct pcie_device* alloc_pcie_device(struct pci_dev *parent,
         if (!device)
                 return NULL;
 
-        pcie_device_init(parent, device, port_type, service_type, irq,irq_mode);
+        pcie_device_init(parent, device, service_type, irq);
         return device;
 }
 
@@ -230,63 +332,90 @@ int pcie_port_device_probe(struct pci_dev *dev)
  */
 int pcie_port_device_register(struct pci_dev *dev)
 {
-        struct pcie_port_device_ext *p_ext;
-        int status, type, capabilities, irq_mode, i;
+        struct pcie_port_data *port_data;
+        int status, capabilities, irq_mode, i, nr_serv;
         int vectors[PCIE_PORT_DEVICE_MAXSERVICES];
         u16 reg16;
 
-        /* Allocate port device extension */
-        if (!(p_ext = kmalloc(sizeof(struct pcie_port_device_ext), GFP_KERNEL)))
+        port_data = kzalloc(sizeof(*port_data), GFP_KERNEL);
+        if (!port_data)
                 return -ENOMEM;
-
-        pci_set_drvdata(dev, p_ext);
+        pci_set_drvdata(dev, port_data);
 
         /* Get port type */
         pci_read_config_word(dev,
                 pci_find_capability(dev, PCI_CAP_ID_EXP) +
                 PCIE_CAPABILITIES_REG, &reg16);
-        type = (reg16 >> 4) & PORT_TYPE_MASK;
+        port_data->port_type = (reg16 >> 4) & PORT_TYPE_MASK;
 
-        /* Now get port services */
         capabilities = get_port_device_capability(dev);
+        /* Root ports are capable of generating PME too */
+        if (port_data->port_type == PCIE_RC_PORT)
+                capabilities |= PCIE_PORT_SERVICE_PME;
+
         irq_mode = assign_interrupt_mode(dev, vectors, capabilities);
-        p_ext->interrupt_mode = irq_mode;
+        if (irq_mode == PCIE_PORT_NO_IRQ) {
+                /*
+                 * Don't use service devices that require interrupts if there is
+                 * no way to generate them.
+                 */
+                if (!(capabilities & PCIE_PORT_SERVICE_VC)) {
+                        status = -ENODEV;
+                        goto Error;
+                }
+                capabilities = PCIE_PORT_SERVICE_VC;
+        }
+        port_data->port_irq_mode = irq_mode;
+
+        status = pci_enable_device(dev);
+        if (status)
+                goto Error;
+        pci_set_master(dev);
 
         /* Allocate child services if any */
-        for (i = 0; i < PCIE_PORT_DEVICE_MAXSERVICES; i++) {
+        for (i = 0, nr_serv = 0; i < PCIE_PORT_DEVICE_MAXSERVICES; i++) {
                 struct pcie_device *child;
+                int service = 1 << i;
+
+                if (!(capabilities & service))
+                        continue;
 
-                if (capabilities & (1 << i)) {
-                        child = alloc_pcie_device(
-                                dev,            /* parent */
-                                type,           /* port type */
-                                i,              /* service type */
-                                vectors[i],     /* irq */
-                                irq_mode        /* interrupt mode */);
-                        if (child) {
-                                status = device_register(&child->device);
-                                if (status) {
-                                        kfree(child);
-                                        continue;
-                                }
-                                get_device(&child->device);
-                        }
+                child = alloc_pcie_device(dev, service, vectors[i]);
+                if (!child)
+                        continue;
+
+                status = device_register(&child->device);
+                if (status) {
+                        kfree(child);
+                        continue;
                 }
+
+                get_device(&child->device);
+                nr_serv++;
+        }
+        if (!nr_serv) {
+                pci_disable_device(dev);
+                status = -ENODEV;
+                goto Error;
         }
+
         return 0;
+
+ Error:
+        kfree(port_data);
+        return status;
 }
 
 #ifdef CONFIG_PM
 static int suspend_iter(struct device *dev, void *data)
 {
         struct pcie_port_service_driver *service_driver;
-        pm_message_t state = * (pm_message_t *) data;
 
         if ((dev->bus == &pcie_port_bus_type) &&
             (dev->driver)) {
                 service_driver = to_service_driver(dev->driver);
                 if (service_driver->suspend)
-                        service_driver->suspend(to_pcie_device(dev), state);
+                        service_driver->suspend(to_pcie_device(dev));
         }
         return 0;
 }
@@ -294,11 +423,10 @@ static int suspend_iter(struct device *dev, void *data)
 /**
  * pcie_port_device_suspend - suspend port services associated with a PCIe port
  * @dev: PCI Express port to handle
- * @state: Representation of system power management transition in progress
  */
-int pcie_port_device_suspend(struct pci_dev *dev, pm_message_t state)
+int pcie_port_device_suspend(struct device *dev)
 {
-        return device_for_each_child(&dev->dev, &state, suspend_iter);
+        return device_for_each_child(dev, NULL, suspend_iter);
 }
 
 static int resume_iter(struct device *dev, void *data)
@@ -318,24 +446,17 @@ static int resume_iter(struct device *dev, void *data)
  * pcie_port_device_suspend - resume port services associated with a PCIe port
  * @dev: PCI Express port to handle
  */
-int pcie_port_device_resume(struct pci_dev *dev)
+int pcie_port_device_resume(struct device *dev)
 {
-        return device_for_each_child(&dev->dev, NULL, resume_iter);
+        return device_for_each_child(dev, NULL, resume_iter);
 }
-#endif
+#endif /* PM */
 
 static int remove_iter(struct device *dev, void *data)
 {
-        struct pcie_port_service_driver *service_driver;
-
         if (dev->bus == &pcie_port_bus_type) {
-                if (dev->driver) {
-                        service_driver = to_service_driver(dev->driver);
-                        if (service_driver->remove)
-                                service_driver->remove(to_pcie_device(dev));
-                }
-                *(unsigned long*)data = (unsigned long)dev;
-                return 1;
+                put_device(dev);
+                device_unregister(dev);
         }
         return 0;
 }
@@ -349,25 +470,21 @@ static int remove_iter(struct device *dev, void *data)
  */
 void pcie_port_device_remove(struct pci_dev *dev)
 {
-        struct device *device;
-        unsigned long device_addr;
-        int interrupt_mode = PCIE_PORT_INTx_MODE;
-        int status;
+        struct pcie_port_data *port_data = pci_get_drvdata(dev);
 
-        do {
-                status = device_for_each_child(&dev->dev, &device_addr, remove_iter);
-                if (status) {
-                        device = (struct device*)device_addr;
-                        interrupt_mode = (to_pcie_device(device))->interrupt_mode;
-                        put_device(device);
-                        device_unregister(device);
-                }
-        } while (status);
-        /* Switch to INTx by default if MSI enabled */
-        if (interrupt_mode == PCIE_PORT_MSIX_MODE)
+        device_for_each_child(&dev->dev, NULL, remove_iter);
+        pci_disable_device(dev);
+
+        switch (port_data->port_irq_mode) {
+        case PCIE_PORT_MSIX_MODE:
                 pci_disable_msix(dev);
-        else if (interrupt_mode == PCIE_PORT_MSI_MODE)
+                break;
+        case PCIE_PORT_MSI_MODE:
                 pci_disable_msi(dev);
+                break;
+        }
+
+        kfree(port_data);
 }
 
 /**
@@ -392,7 +509,7 @@ static int pcie_port_probe_service(struct device *dev)
                 return -ENODEV;
 
         pciedev = to_pcie_device(dev);
-        status = driver->probe(pciedev, driver->id_table);
+        status = driver->probe(pciedev);
         if (!status) {
                 dev_printk(KERN_DEBUG, dev, "service driver %s loaded\n",
                         driver->name);
diff --git a/drivers/pci/pcie/portdrv_pci.c b/drivers/pci/pcie/portdrv_pci.c
index 5ea566e20b37..b924e2463f85 100644
--- a/drivers/pci/pcie/portdrv_pci.c
+++ b/drivers/pci/pcie/portdrv_pci.c
@@ -32,11 +32,6 @@ MODULE_LICENSE("GPL");
 /* global data */
 static const char device_name[] = "pcieport-driver";
 
-static int pcie_portdrv_save_config(struct pci_dev *dev)
-{
-        return pci_save_state(dev);
-}
-
 static int pcie_portdrv_restore_config(struct pci_dev *dev)
 {
         int retval;
@@ -49,21 +44,21 @@ static int pcie_portdrv_restore_config(struct pci_dev *dev)
 }
 
 #ifdef CONFIG_PM
-static int pcie_portdrv_suspend(struct pci_dev *dev, pm_message_t state)
-{
-        return pcie_port_device_suspend(dev, state);
+static struct dev_pm_ops pcie_portdrv_pm_ops = {
+        .suspend        = pcie_port_device_suspend,
+        .resume         = pcie_port_device_resume,
+        .freeze         = pcie_port_device_suspend,
+        .thaw           = pcie_port_device_resume,
+        .poweroff       = pcie_port_device_suspend,
+        .restore        = pcie_port_device_resume,
+};
 
-}
+#define PCIE_PORTDRV_PM_OPS     (&pcie_portdrv_pm_ops)
 
-static int pcie_portdrv_resume(struct pci_dev *dev)
-{
-        pci_set_master(dev);
-        return pcie_port_device_resume(dev);
-}
-#else
-#define pcie_portdrv_suspend NULL
-#define pcie_portdrv_resume NULL
-#endif
+#else /* !PM */
+
+#define PCIE_PORTDRV_PM_OPS     NULL
+#endif /* !PM */
 
 /*
  * pcie_portdrv_probe - Probe PCI-Express port devices
@@ -82,20 +77,15 @@ static int __devinit pcie_portdrv_probe (struct pci_dev *dev,
         if (status)
                 return status;
 
-        if (pci_enable_device(dev) < 0) 
-                return -ENODEV;
-        
-        pci_set_master(dev);
         if (!dev->irq && dev->pin) {
                 dev_warn(&dev->dev, "device [%04x:%04x] has invalid IRQ; "
                          "check vendor BIOS\n", dev->vendor, dev->device);
         }
-        if (pcie_port_device_register(dev)) {
-                pci_disable_device(dev);
-                return -ENOMEM;
-        }
+        status = pcie_port_device_register(dev);
+        if (status)
+                return status;
 
-        pcie_portdrv_save_config(dev);
+        pci_save_state(dev);
 
         return 0;
 }
@@ -104,7 +94,6 @@ static void pcie_portdrv_remove (struct pci_dev *dev)
 {
         pcie_port_device_remove(dev);
         pci_disable_device(dev);
-        kfree(pci_get_drvdata(dev));
 }
 
 static int error_detected_iter(struct device *device, void *data)
@@ -278,10 +267,9 @@ static struct pci_driver pcie_portdriver = {
         .probe          = pcie_portdrv_probe,
         .remove         = pcie_portdrv_remove,
 
-        .suspend        = pcie_portdrv_suspend,
-        .resume         = pcie_portdrv_resume,
-
         .err_handler    = &pcie_portdrv_err_handler,
+
+        .driver.pm      = PCIE_PORTDRV_PM_OPS,
 };
 
 static int __init pcie_portdrv_init(void)
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 55ec44a27e89..e2f3dd098cfa 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -287,7 +287,7 @@ void __devinit pci_read_bridge_bases(struct pci_bus *child)
         struct resource *res;
         int i;
 
-        if (!dev)               /* It's a host bus, nothing to read */
+        if (!child->parent)     /* It's a host bus, nothing to read */
                 return;
 
         if (dev->transparent) {
@@ -511,21 +511,21 @@ int __devinit pci_scan_bridge(struct pci_bus *bus, struct pci_dev *dev, int max,
 
                 /*
                  * If we already got to this bus through a different bridge,
-                 * ignore it.  This can happen with the i450NX chipset.
+                 * don't re-add it. This can happen with the i450NX chipset.
+                 *
+                 * However, we continue to descend down the hierarchy and
+                 * scan remaining child buses.
                  */
-                if (pci_find_bus(pci_domain_nr(bus), busnr)) {
-                        dev_info(&dev->dev, "bus %04x:%02x already known\n",
-                                 pci_domain_nr(bus), busnr);
-                        goto out;
+                child = pci_find_bus(pci_domain_nr(bus), busnr);
+                if (!child) {
+                        child = pci_add_new_bus(bus, dev, busnr);
+                        if (!child)
+                                goto out;
+                        child->primary = buses & 0xFF;
+                        child->subordinate = (buses >> 16) & 0xFF;
+                        child->bridge_ctl = bctl;
                 }
 
-                child = pci_add_new_bus(bus, dev, busnr);
-                if (!child)
-                        goto out;
-                child->primary = buses & 0xFF;
-                child->subordinate = (buses >> 16) & 0xFF;
-                child->bridge_ctl = bctl;
-
                 cmax = pci_scan_child_bus(child);
                 if (cmax > max)
                         max = cmax;
@@ -674,6 +674,19 @@ static void pci_read_irq(struct pci_dev *dev)
         dev->irq = irq;
 }
 
+static void set_pcie_port_type(struct pci_dev *pdev)
+{
+        int pos;
+        u16 reg16;
+
+        pos = pci_find_capability(pdev, PCI_CAP_ID_EXP);
+        if (!pos)
+                return;
+        pdev->is_pcie = 1;
+        pci_read_config_word(pdev, pos + PCI_EXP_FLAGS, &reg16);
+        pdev->pcie_type = (reg16 & PCI_EXP_FLAGS_TYPE) >> 4;
+}
+
 #define LEGACY_IO_RESOURCE      (IORESOURCE_IO | IORESOURCE_PCI_FIXED)
 
 /**
@@ -683,12 +696,33 @@ static void pci_read_irq(struct pci_dev *dev)
  * Initialize the device structure with information about the device's 
  * vendor,class,memory and IO-space addresses,IRQ lines etc.
  * Called at initialisation of the PCI subsystem and by CardBus services.
- * Returns 0 on success and -1 if unknown type of device (not normal, bridge
- * or CardBus).
+ * Returns 0 on success and negative if unknown type of device (not normal,
+ * bridge or CardBus).
  */
-static int pci_setup_device(struct pci_dev * dev)
+int pci_setup_device(struct pci_dev *dev)
 {
         u32 class;
+        u8 hdr_type;
+        struct pci_slot *slot;
+
+        if (pci_read_config_byte(dev, PCI_HEADER_TYPE, &hdr_type))
+                return -EIO;
+
+        dev->sysdata = dev->bus->sysdata;
+        dev->dev.parent = dev->bus->bridge;
+        dev->dev.bus = &pci_bus_type;
+        dev->hdr_type = hdr_type & 0x7f;
+        dev->multifunction = !!(hdr_type & 0x80);
+        dev->error_state = pci_channel_io_normal;
+        set_pcie_port_type(dev);
+
+        list_for_each_entry(slot, &dev->bus->slots, list)
+                if (PCI_SLOT(dev->devfn) == slot->number)
+                        dev->slot = slot;
+
+        /* Assume 32-bit PCI; let 64-bit PCI cards (which are far rarer)
+           set this higher, assuming the system even supports it.  */
+        dev->dma_mask = 0xffffffff;
 
         dev_set_name(&dev->dev, "%04x:%02x:%02x.%d", pci_domain_nr(dev->bus),
                      dev->bus->number, PCI_SLOT(dev->devfn),
@@ -703,12 +737,14 @@ static int pci_setup_device(struct pci_dev * dev)
         dev_dbg(&dev->dev, "found [%04x:%04x] class %06x header type %02x\n",
                  dev->vendor, dev->device, class, dev->hdr_type);
 
+        /* need to have dev->class ready */
+        dev->cfg_size = pci_cfg_space_size(dev);
+
         /* "Unknown power state" */
         dev->current_state = PCI_UNKNOWN;
 
         /* Early fixups, before probing the BARs */
         pci_fixup_device(pci_fixup_early, dev);
-        class = dev->class >> 8;
 
         switch (dev->hdr_type) {                    /* header type */
         case PCI_HEADER_TYPE_NORMAL:                /* standard header */
@@ -770,7 +806,7 @@ static int pci_setup_device(struct pci_dev * dev)
         default:                                    /* unknown header */
                 dev_err(&dev->dev, "unknown header type %02x, "
                         "ignoring device\n", dev->hdr_type);
-                return -1;
+                return -EIO;
 
         bad:
                 dev_err(&dev->dev, "ignoring class %02x (doesn't match header "
@@ -785,6 +821,7 @@ static int pci_setup_device(struct pci_dev * dev)
 static void pci_release_capabilities(struct pci_dev *dev)
 {
         pci_vpd_release(dev);
+        pci_iov_release(dev);
 }
 
 /**
@@ -803,19 +840,6 @@ static void pci_release_dev(struct device *dev)
         kfree(pci_dev);
 }
 
-static void set_pcie_port_type(struct pci_dev *pdev)
-{
-        int pos;
-        u16 reg16;
-
-        pos = pci_find_capability(pdev, PCI_CAP_ID_EXP);
-        if (!pos)
-                return;
-        pdev->is_pcie = 1;
-        pci_read_config_word(pdev, pos + PCI_EXP_FLAGS, &reg16);
-        pdev->pcie_type = (reg16 & PCI_EXP_FLAGS_TYPE) >> 4;
-}
-
 /**
  * pci_cfg_space_size - get the configuration space size of the PCI device.
  * @dev: PCI device
@@ -847,6 +871,11 @@ int pci_cfg_space_size(struct pci_dev *dev)
 {
         int pos;
         u32 status;
+        u16 class;
+
+        class = dev->class >> 8;
+        if (class == PCI_CLASS_BRIDGE_HOST)
+                return pci_cfg_space_size_ext(dev);
 
         pos = pci_find_capability(dev, PCI_CAP_ID_EXP);
         if (!pos) {
@@ -891,9 +920,7 @@ EXPORT_SYMBOL(alloc_pci_dev);
 static struct pci_dev *pci_scan_device(struct pci_bus *bus, int devfn)
 {
         struct pci_dev *dev;
-        struct pci_slot *slot;
         u32 l;
-        u8 hdr_type;
         int delay = 1;
 
         if (pci_bus_read_config_dword(bus, devfn, PCI_VENDOR_ID, &l))
@@ -920,34 +947,16 @@ static struct pci_dev *pci_scan_device(struct pci_bus *bus, int devfn)
                 }
         }
 
-        if (pci_bus_read_config_byte(bus, devfn, PCI_HEADER_TYPE, &hdr_type))
-                return NULL;
-
         dev = alloc_pci_dev();
         if (!dev)
                 return NULL;
 
         dev->bus = bus;
-        dev->sysdata = bus->sysdata;
-        dev->dev.parent = bus->bridge;
-        dev->dev.bus = &pci_bus_type;
         dev->devfn = devfn;
-        dev->hdr_type = hdr_type & 0x7f;
-        dev->multifunction = !!(hdr_type & 0x80);
         dev->vendor = l & 0xffff;
         dev->device = (l >> 16) & 0xffff;
-        dev->cfg_size = pci_cfg_space_size(dev);
-        dev->error_state = pci_channel_io_normal;
-        set_pcie_port_type(dev);
-
-        list_for_each_entry(slot, &bus->slots, list)
-                if (PCI_SLOT(devfn) == slot->number)
-                        dev->slot = slot;
 
-        /* Assume 32-bit PCI; let 64-bit PCI cards (which are far rarer)
-           set this higher, assuming the system even supports it.  */
-        dev->dma_mask = 0xffffffff;
-        if (pci_setup_device(dev) < 0) {
+        if (pci_setup_device(dev)) {
                 kfree(dev);
                 return NULL;
         }
@@ -972,6 +981,9 @@ static void pci_init_capabilities(struct pci_dev *dev)
 
         /* Alternative Routing-ID Forwarding */
         pci_enable_ari(dev);
+
+        /* Single Root I/O Virtualization */
+        pci_iov_init(dev);
 }
 
 void pci_device_add(struct pci_dev *dev, struct pci_bus *bus)
@@ -1006,6 +1018,12 @@ struct pci_dev *__ref pci_scan_single_device(struct pci_bus *bus, int devfn)
 {
         struct pci_dev *dev;
 
+        dev = pci_get_slot(bus, devfn);
+        if (dev) {
+                pci_dev_put(dev);
+                return dev;
+        }
+
         dev = pci_scan_device(bus, devfn);
         if (!dev)
                 return NULL;
@@ -1024,35 +1042,27 @@ EXPORT_SYMBOL(pci_scan_single_device);
  * Scan a PCI slot on the specified PCI bus for devices, adding
  * discovered devices to the @bus->devices list.  New devices
  * will not have is_added set.
+ *
+ * Returns the number of new devices found.
  */
 int pci_scan_slot(struct pci_bus *bus, int devfn)
 {
-        int func, nr = 0;
-        int scan_all_fns;
-
-        scan_all_fns = pcibios_scan_all_fns(bus, devfn);
-
-        for (func = 0; func < 8; func++, devfn++) {
-                struct pci_dev *dev;
-
-                dev = pci_scan_single_device(bus, devfn);
-                if (dev) {
-                        nr++;
+        int fn, nr = 0;
+        struct pci_dev *dev;
 
-                        /*
-                         * If this is a single function device,
-                         * don't scan past the first function.
-                         */
-                        if (!dev->multifunction) {
-                                if (func > 0) {
-                                        dev->multifunction = 1;
-                                } else {
-                                        break;
-                                }
+        dev = pci_scan_single_device(bus, devfn);
+        if (dev && !dev->is_added)      /* new device? */
+                nr++;
+
+        if ((dev && dev->multifunction) ||
+            (!dev && pcibios_scan_all_fns(bus, devfn))) {
+                for (fn = 1; fn < 8; fn++) {
+                        dev = pci_scan_single_device(bus, devfn + fn);
+                        if (dev) {
+                                if (!dev->is_added)
+                                        nr++;
+                                dev->multifunction = 1;
                         }
-                } else {
-                        if (func == 0 && !scan_all_fns)
-                                break;
                 }
         }
 
@@ -1074,12 +1084,21 @@ unsigned int __devinit pci_scan_child_bus(struct pci_bus *bus)
         for (devfn = 0; devfn < 0x100; devfn += 8)
                 pci_scan_slot(bus, devfn);
 
+        /* Reserve buses for SR-IOV capability. */
+        max += pci_iov_bus_range(bus);
+
         /*
          * After performing arch-dependent fixup of the bus, look behind
          * all PCI-to-PCI bridges on this bus.
          */
-        pr_debug("PCI: Fixups for bus %04x:%02x\n", pci_domain_nr(bus), bus->number);
-        pcibios_fixup_bus(bus);
+        if (!bus->is_added) {
+                pr_debug("PCI: Fixups for bus %04x:%02x\n",
+                         pci_domain_nr(bus), bus->number);
+                pcibios_fixup_bus(bus);
+                if (pci_is_root_bus(bus))
+                        bus->is_added = 1;
+        }
+
         for (pass=0; pass < 2; pass++)
                 list_for_each_entry(dev, &bus->devices, bus_list) {
                         if (dev->hdr_type == PCI_HEADER_TYPE_BRIDGE ||
@@ -1114,7 +1133,7 @@ struct pci_bus * pci_create_bus(struct device *parent,
         if (!b)
                 return NULL;
 
-        dev = kmalloc(sizeof(*dev), GFP_KERNEL);
+        dev = kzalloc(sizeof(*dev), GFP_KERNEL);
         if (!dev){
                 kfree(b);
                 return NULL;
@@ -1133,7 +1152,6 @@ struct pci_bus * pci_create_bus(struct device *parent,
         list_add_tail(&b->node, &pci_root_buses);
         up_write(&pci_bus_sem);
 
-        memset(dev, 0, sizeof(*dev));
         dev->parent = parent;
         dev->release = pci_release_bus_bridge_dev;
         dev_set_name(dev, "pci%04x:%02x", pci_domain_nr(b), bus);
@@ -1193,6 +1211,38 @@ struct pci_bus * __devinit pci_scan_bus_parented(struct device *parent,
 EXPORT_SYMBOL(pci_scan_bus_parented);
 
 #ifdef CONFIG_HOTPLUG
+/**
+ * pci_rescan_bus - scan a PCI bus for devices.
+ * @bus: PCI bus to scan
+ *
+ * Scan a PCI bus and child buses for new devices, adds them,
+ * and enables them.
+ *
+ * Returns the max number of subordinate bus discovered.
+ */
+unsigned int __devinit pci_rescan_bus(struct pci_bus *bus)
+{
+        unsigned int max;
+        struct pci_dev *dev;
+
+        max = pci_scan_child_bus(bus);
+
+        down_read(&pci_bus_sem);
+        list_for_each_entry(dev, &bus->devices, bus_list)
+                if (dev->hdr_type == PCI_HEADER_TYPE_BRIDGE ||
+                    dev->hdr_type == PCI_HEADER_TYPE_CARDBUS)
+                        if (dev->subordinate)
+                                pci_bus_size_bridges(dev->subordinate);
+        up_read(&pci_bus_sem);
+
+        pci_bus_assign_resources(bus);
+        pci_enable_bridges(bus);
+        pci_bus_add_devices(bus);
+
+        return max;
+}
+EXPORT_SYMBOL_GPL(pci_rescan_bus);
+
 EXPORT_SYMBOL(pci_add_new_bus);
 EXPORT_SYMBOL(pci_scan_slot);
 EXPORT_SYMBOL(pci_scan_bridge);
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index 92b9efe9bcaf..9b2f0d96900d 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -24,6 +24,7 @@
 #include <linux/kallsyms.h>
 #include <linux/dmi.h>
 #include <linux/pci-aspm.h>
+#include <linux/ioport.h>
 #include "pci.h"
 
 int isa_dma_bridge_buggy;
@@ -34,6 +35,65 @@ int pcie_mch_quirk;
 EXPORT_SYMBOL(pcie_mch_quirk);
 
 #ifdef CONFIG_PCI_QUIRKS
+/*
+ * This quirk function disables the device and releases resources
+ * which is specified by kernel's boot parameter 'pci=resource_alignment='.
+ * It also rounds up size to specified alignment.
+ * Later on, the kernel will assign page-aligned memory resource back
+ * to that device.
+ */
+static void __devinit quirk_resource_alignment(struct pci_dev *dev)
+{
+        int i;
+        struct resource *r;
+        resource_size_t align, size;
+
+        if (!pci_is_reassigndev(dev))
+                return;
+
+        if (dev->hdr_type == PCI_HEADER_TYPE_NORMAL &&
+            (dev->class >> 8) == PCI_CLASS_BRIDGE_HOST) {
+                dev_warn(&dev->dev,
+                        "Can't reassign resources to host bridge.\n");
+                return;
+        }
+
+        dev_info(&dev->dev, "Disabling device and release resources.\n");
+        pci_disable_device(dev);
+
+        align = pci_specified_resource_alignment(dev);
+        for (i=0; i < PCI_BRIDGE_RESOURCES; i++) {
+                r = &dev->resource[i];
+                if (!(r->flags & IORESOURCE_MEM))
+                        continue;
+                size = resource_size(r);
+                if (size < align) {
+                        size = align;
+                        dev_info(&dev->dev,
+                                "Rounding up size of resource #%d to %#llx.\n",
+                                i, (unsigned long long)size);
+                }
+                r->end = size - 1;
+                r->start = 0;
+        }
+        /* Need to disable bridge's resource window,
+         * to enable the kernel to reassign new resource
+         * window later on.
+         */
+        if (dev->hdr_type == PCI_HEADER_TYPE_BRIDGE &&
+            (dev->class >> 8) == PCI_CLASS_BRIDGE_PCI) {
+                for (i = PCI_BRIDGE_RESOURCES; i < PCI_NUM_RESOURCES; i++) {
+                        r = &dev->resource[i];
+                        if (!(r->flags & IORESOURCE_MEM))
+                                continue;
+                        r->end = resource_size(r) - 1;
+                        r->start = 0;
+                }
+                pci_disable_bridge_window(dev);
+        }
+}
+DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, quirk_resource_alignment);
+
 /* The Mellanox Tavor device gives false positive parity errors
  * Mark this device with a broken_parity_status, to allow
  * PCI scanning code to "skip" this now blacklisted device.
@@ -1126,10 +1186,15 @@ static void __init asus_hides_smbus_hostbridge(struct pci_dev *dev)
                                  * its on-board VGA controller */
                                 asus_hides_smbus = 1;
                         }
-                else if (dev->device == PCI_DEVICE_ID_INTEL_82845G_IG)
+                else if (dev->device == PCI_DEVICE_ID_INTEL_82801DB_2)
                         switch(dev->subsystem_device) {
                         case 0x00b8: /* Compaq Evo D510 CMT */
                         case 0x00b9: /* Compaq Evo D510 SFF */
+                                /* Motherboard doesn't have Host bridge
+                                 * subvendor/subdevice IDs and on-board VGA
+                                 * controller is disabled if an AGP card is
+                                 * inserted, therefore checking USB UHCI
+                                 * Controller #1 */
                                 asus_hides_smbus = 1;
                         }
                 else if (dev->device == PCI_DEVICE_ID_INTEL_82815_CGC)
@@ -1154,7 +1219,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,	PCI_DEVICE_ID_INTEL_82855GM_HB,	as
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_82915GM_HB, asus_hides_smbus_hostbridge);
 
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_82810_IG3,  asus_hides_smbus_hostbridge);
-DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_82845G_IG,  asus_hides_smbus_hostbridge);
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_82801DB_2,  asus_hides_smbus_hostbridge);
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_82815_CGC,  asus_hides_smbus_hostbridge);
 
 static void asus_hides_smbus_lpc(struct pci_dev *dev)
@@ -1664,9 +1729,13 @@ static void __devinit quirk_netmos(struct pci_dev *dev)
          * of parallel ports and <S> is the number of serial ports.
          */
         switch (dev->device) {
+        case PCI_DEVICE_ID_NETMOS_9835:
+                /* Well, this rule doesn't hold for the following 9835 device */
+                if (dev->subsystem_vendor == PCI_VENDOR_ID_IBM &&
+                                dev->subsystem_device == 0x0299)
+                        return;
         case PCI_DEVICE_ID_NETMOS_9735:
         case PCI_DEVICE_ID_NETMOS_9745:
-        case PCI_DEVICE_ID_NETMOS_9835:
         case PCI_DEVICE_ID_NETMOS_9845:
         case PCI_DEVICE_ID_NETMOS_9855:
                 if ((dev->class >> 8) == PCI_CLASS_COMMUNICATION_SERIAL &&
@@ -2078,6 +2147,92 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_NVIDIA,
                         PCI_DEVICE_ID_NVIDIA_NVENET_15,
                         nvenet_msi_disable);
 
+static int __devinit ht_check_msi_mapping(struct pci_dev *dev)
+{
+        int pos, ttl = 48;
+        int found = 0;
+
+        /* check if there is HT MSI cap or enabled on this device */
+        pos = pci_find_ht_capability(dev, HT_CAPTYPE_MSI_MAPPING);
+        while (pos && ttl--) {
+                u8 flags;
+
+                if (found < 1)
+                        found = 1;
+                if (pci_read_config_byte(dev, pos + HT_MSI_FLAGS,
+                                         &flags) == 0) {
+                        if (flags & HT_MSI_FLAGS_ENABLE) {
+                                if (found < 2) {
+                                        found = 2;
+                                        break;
+                                }
+                        }
+                }
+                pos = pci_find_next_ht_capability(dev, pos,
+                                                  HT_CAPTYPE_MSI_MAPPING);
+        }
+
+        return found;
+}
+
+static int __devinit host_bridge_with_leaf(struct pci_dev *host_bridge)
+{
+        struct pci_dev *dev;
+        int pos;
+        int i, dev_no;
+        int found = 0;
+
+        dev_no = host_bridge->devfn >> 3;
+        for (i = dev_no + 1; i < 0x20; i++) {
+                dev = pci_get_slot(host_bridge->bus, PCI_DEVFN(i, 0));
+                if (!dev)
+                        continue;
+
+                /* found next host bridge ?*/
+                pos = pci_find_ht_capability(dev, HT_CAPTYPE_SLAVE);
+                if (pos != 0) {
+                        pci_dev_put(dev);
+                        break;
+                }
+
+                if (ht_check_msi_mapping(dev)) {
+                        found = 1;
+                        pci_dev_put(dev);
+                        break;
+                }
+                pci_dev_put(dev);
+        }
+
+        return found;
+}
+
+#define PCI_HT_CAP_SLAVE_CTRL0     4    /* link control */
+#define PCI_HT_CAP_SLAVE_CTRL1     8    /* link control to */
+
+static int __devinit is_end_of_ht_chain(struct pci_dev *dev)
+{
+        int pos, ctrl_off;
+        int end = 0;
+        u16 flags, ctrl;
+
+        pos = pci_find_ht_capability(dev, HT_CAPTYPE_SLAVE);
+
+        if (!pos)
+                goto out;
+
+        pci_read_config_word(dev, pos + PCI_CAP_FLAGS, &flags);
+
+        ctrl_off = ((flags >> 10) & 1) ?
+                        PCI_HT_CAP_SLAVE_CTRL0 : PCI_HT_CAP_SLAVE_CTRL1;
+        pci_read_config_word(dev, pos + ctrl_off, &ctrl);
+
+        if (ctrl & (1 << 6))
+                end = 1;
+
+out:
+        return end;
+}
+
 static void __devinit nv_ht_enable_msi_mapping(struct pci_dev *dev)
 {
         struct pci_dev *host_bridge;
@@ -2102,6 +2257,11 @@ static void __devinit nv_ht_enable_msi_mapping(struct pci_dev *dev)
         if (!found)
                 return;
 
+        /* don't enable end_device/host_bridge with leaf directly here */
+        if (host_bridge == dev && is_end_of_ht_chain(host_bridge) &&
+            host_bridge_with_leaf(host_bridge))
+                goto out;
+
         /* root did that ! */
         if (msi_ht_cap_enabled(host_bridge))
                 goto out;
@@ -2132,44 +2292,12 @@ static void __devinit ht_disable_msi_mapping(struct pci_dev *dev)
         }
 }
 
-static int __devinit ht_check_msi_mapping(struct pci_dev *dev)
-{
-        int pos, ttl = 48;
-        int found = 0;
-
-        /* check if there is HT MSI cap or enabled on this device */
-        pos = pci_find_ht_capability(dev, HT_CAPTYPE_MSI_MAPPING);
-        while (pos && ttl--) {
-                u8 flags;
-
-                if (found < 1)
-                        found = 1;
-                if (pci_read_config_byte(dev, pos + HT_MSI_FLAGS,
-                                         &flags) == 0) {
-                        if (flags & HT_MSI_FLAGS_ENABLE) {
-                                if (found < 2) {
-                                        found = 2;
-                                        break;
-                                }
-                        }
-                }
-                pos = pci_find_next_ht_capability(dev, pos,
-                                                  HT_CAPTYPE_MSI_MAPPING);
-        }
-
-        return found;
-}
-
-static void __devinit nv_msi_ht_cap_quirk(struct pci_dev *dev)
+static void __devinit __nv_msi_ht_cap_quirk(struct pci_dev *dev, int all)
 {
         struct pci_dev *host_bridge;
         int pos;
         int found;
 
-        /* Enabling HT MSI mapping on this device breaks MCP51 */
-        if (dev->device == 0x270)
-                return;
-
         /* check if there is HT MSI cap or enabled on this device */
         found = ht_check_msi_mapping(dev);
 
@@ -2193,7 +2321,10 @@ static void __devinit nv_msi_ht_cap_quirk(struct pci_dev *dev)
                 /* Host bridge is to HT */
                 if (found == 1) {
                         /* it is not enabled, try to enable it */
-                        nv_ht_enable_msi_mapping(dev);
+                        if (all)
+                                ht_enable_msi_mapping(dev);
+                        else
+                                nv_ht_enable_msi_mapping(dev);
                 }
                 return;
         }
@@ -2205,8 +2336,20 @@ static void __devinit nv_msi_ht_cap_quirk(struct pci_dev *dev)
         /* Host bridge is not to HT, disable HT MSI mapping on this device */
         ht_disable_msi_mapping(dev);
 }
-DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_NVIDIA, PCI_ANY_ID, nv_msi_ht_cap_quirk);
-DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AL, PCI_ANY_ID, nv_msi_ht_cap_quirk);
+
+static void __devinit nv_msi_ht_cap_quirk_all(struct pci_dev *dev)
+{
+        return __nv_msi_ht_cap_quirk(dev, 1);
+}
+
+static void __devinit nv_msi_ht_cap_quirk_leaf(struct pci_dev *dev)
+{
+        return __nv_msi_ht_cap_quirk(dev, 0);
+}
+
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_NVIDIA, PCI_ANY_ID, nv_msi_ht_cap_quirk_leaf);
+
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AL, PCI_ANY_ID, nv_msi_ht_cap_quirk_all);
 
 static void __devinit quirk_msi_intx_disable_bug(struct pci_dev *dev)
 {
diff --git a/drivers/pci/remove.c b/drivers/pci/remove.c
index 042e08924421..86503c14ce7e 100644
--- a/drivers/pci/remove.c
+++ b/drivers/pci/remove.c
@@ -71,6 +71,9 @@ void pci_remove_bus(struct pci_bus *pci_bus)
         down_write(&pci_bus_sem);
         list_del(&pci_bus->node);
         up_write(&pci_bus_sem);
+        if (!pci_bus->is_added)
+                return;
+
         pci_remove_legacy_files(pci_bus);
         device_remove_file(&pci_bus->dev, &dev_attr_cpuaffinity);
         device_remove_file(&pci_bus->dev, &dev_attr_cpulistaffinity);
@@ -92,6 +95,7 @@ EXPORT_SYMBOL(pci_remove_bus);
  */
 void pci_remove_bus_device(struct pci_dev *dev)
 {
+        pci_stop_bus_device(dev);
         if (dev->subordinate) {
                 struct pci_bus *b = dev->subordinate;
 
diff --git a/drivers/pci/search.c b/drivers/pci/search.c
index 5af8bd538149..710d4ea69568 100644
--- a/drivers/pci/search.c
+++ b/drivers/pci/search.c
@@ -29,7 +29,7 @@ pci_find_upstream_pcie_bridge(struct pci_dev *pdev)
         if (pdev->is_pcie)
                 return NULL;
         while (1) {
-                if (!pdev->bus->self)
+                if (!pdev->bus->parent)
                         break;
                 pdev = pdev->bus->self;
                 /* a p2p bridge */
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index 704608945780..334285a8e237 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -27,7 +27,7 @@
 #include <linux/slab.h>
 
 
-static void pbus_assign_resources_sorted(struct pci_bus *bus)
+static void pbus_assign_resources_sorted(const struct pci_bus *bus)
 {
         struct pci_dev *dev;
         struct resource *res;
@@ -144,6 +144,9 @@ static void pci_setup_bridge(struct pci_bus *bus)
         struct pci_bus_region region;
         u32 l, bu, lu, io_upper16;
 
+        if (!pci_is_root_bus(bus) && bus->is_added)
+                return;
+
         dev_info(&bridge->dev, "PCI bridge, secondary bus %04x:%02x\n",
                  pci_domain_nr(bus), bus->number);
 
@@ -495,7 +498,7 @@ void __ref pci_bus_size_bridges(struct pci_bus *bus)
 }
 EXPORT_SYMBOL(pci_bus_size_bridges);
 
-void __ref pci_bus_assign_resources(struct pci_bus *bus)
+void __ref pci_bus_assign_resources(const struct pci_bus *bus)
 {
         struct pci_bus *b;
         struct pci_dev *dev;
diff --git a/drivers/pci/setup-res.c b/drivers/pci/setup-res.c
index 32e8d88a4619..3039fcb86afc 100644
--- a/drivers/pci/setup-res.c
+++ b/drivers/pci/setup-res.c
@@ -120,6 +120,21 @@ int pci_claim_resource(struct pci_dev *dev, int resource)
         return err;
 }
 
+#ifdef CONFIG_PCI_QUIRKS
+void pci_disable_bridge_window(struct pci_dev *dev)
+{
+        dev_dbg(&dev->dev, "Disabling bridge window.\n");
+
+        /* MMIO Base/Limit */
+        pci_write_config_dword(dev, PCI_MEMORY_BASE, 0x0000fff0);
+
+        /* Prefetchable MMIO Base/Limit */
+        pci_write_config_dword(dev, PCI_PREF_LIMIT_UPPER32, 0);
+        pci_write_config_dword(dev, PCI_PREF_MEMORY_BASE, 0x0000fff0);
+        pci_write_config_dword(dev, PCI_PREF_BASE_UPPER32, 0xffffffff);
+}
+#endif  /* CONFIG_PCI_QUIRKS */
+
 int pci_assign_resource(struct pci_dev *dev, int resno)
 {
         struct pci_bus *bus = dev->bus;
diff --git a/drivers/pci/slot.c b/drivers/pci/slot.c
index 5a8ccb4f604d..21189447e545 100644
--- a/drivers/pci/slot.c
+++ b/drivers/pci/slot.c
@@ -1,8 +1,8 @@
 /*
  * drivers/pci/slot.c
  * Copyright (C) 2006 Matthew Wilcox <matthew@wil.cx>
- * Copyright (C) 2006-2008 Hewlett-Packard Development Company, L.P.
- *      Alex Chiang <achiang@hp.com>
+ * Copyright (C) 2006-2009 Hewlett-Packard Development Company, L.P.
+ *      Alex Chiang <achiang@hp.com>
  */
 
 #include <linux/kobject.h>
@@ -52,8 +52,8 @@ static void pci_slot_release(struct kobject *kobj)
         struct pci_dev *dev;
         struct pci_slot *slot = to_pci_slot(kobj);
 
-        pr_debug("%s: releasing pci_slot on %x:%d\n", __func__,
-                 slot->bus->number, slot->number);
+        dev_dbg(&slot->bus->dev, "dev %02x, released physical slot %s\n",
+                slot->number, pci_slot_name(slot));
 
         list_for_each_entry(dev, &slot->bus->devices, bus_list)
                 if (PCI_SLOT(dev->devfn) == slot->number)
@@ -248,9 +248,8 @@ placeholder:
                 if (PCI_SLOT(dev->devfn) == slot_nr)
                         dev->slot = slot;
 
-        /* Don't care if debug printk has a -1 for slot_nr */
-        pr_debug("%s: created pci_slot on %04x:%02x:%02x\n",
-                 __func__, pci_domain_nr(parent), parent->number, slot_nr);
+        dev_dbg(&parent->dev, "dev %02x, created physical slot %s\n",
+                slot_nr, pci_slot_name(slot));
 
 out:
         kfree(slot_name);
@@ -299,9 +298,8 @@ EXPORT_SYMBOL_GPL(pci_renumber_slot);
  */
 void pci_destroy_slot(struct pci_slot *slot)
 {
-        pr_debug("%s: dec refcount to %d on %04x:%02x:%02x\n", __func__,
-                 atomic_read(&slot->kobj.kref.refcount) - 1,
-                 pci_domain_nr(slot->bus), slot->bus->number, slot->number);
+        dev_dbg(&slot->bus->dev, "dev %02x, dec refcount to %d\n",
+                slot->number, atomic_read(&slot->kobj.kref.refcount) - 1);
 
         down_write(&pci_bus_sem);
         kobject_put(&slot->kobj);
diff --git a/drivers/platform/x86/asus_acpi.c b/drivers/platform/x86/asus_acpi.c
index d63f26e666a4..ba1f7497e4b9 100644
--- a/drivers/platform/x86/asus_acpi.c
+++ b/drivers/platform/x86/asus_acpi.c
@@ -987,7 +987,6 @@ asus_proc_add(char *name, proc_writefunc *writefunc,
         proc->write_proc = writefunc;
         proc->read_proc = readfunc;
         proc->data = acpi_driver_data(device);
-        proc->owner = THIS_MODULE;
         proc->uid = asus_uid;
         proc->gid = asus_gid;
         return 0;
@@ -1020,7 +1019,6 @@ static int asus_hotk_add_fs(struct acpi_device *device)
         if (proc) {
                 proc->read_proc = proc_read_info;
                 proc->data = acpi_driver_data(device);
-                proc->owner = THIS_MODULE;
                 proc->uid = asus_uid;
                 proc->gid = asus_gid;
         } else {
@@ -1436,7 +1434,6 @@ static int __init asus_acpi_init(void)
                 printk(KERN_ERR "Asus ACPI: Unable to create /proc entry\n");
                 return -ENODEV;
         }
-        asus_proc_dir->owner = THIS_MODULE;
 
         result = acpi_bus_register_driver(&asus_hotk_driver);
         if (result < 0) {
diff --git a/drivers/platform/x86/dell-laptop.c b/drivers/platform/x86/dell-laptop.c
index 16e11c2ee19a..af9f43021172 100644
--- a/drivers/platform/x86/dell-laptop.c
+++ b/drivers/platform/x86/dell-laptop.c
@@ -103,7 +103,7 @@ static void parse_da_table(const struct dmi_header *dm)
         da_num_tokens += tokens;
 }
 
-static void find_tokens(const struct dmi_header *dm)
+static void find_tokens(const struct dmi_header *dm, void *dummy)
 {
         switch (dm->type) {
         case 0xd4: /* Indexed IO */
@@ -356,7 +356,7 @@ static int __init dell_init(void)
         if (!dmi_check_system(dell_device_table))
                 return -ENODEV;
 
-        dmi_walk(find_tokens);
+        dmi_walk(find_tokens, NULL);
 
         if (!da_tokens)  {
                 printk(KERN_INFO "dell-laptop: Unable to find dmi tokens\n");
diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
index d2433204a40c..3dad27a385d3 100644
--- a/drivers/platform/x86/thinkpad_acpi.c
+++ b/drivers/platform/x86/thinkpad_acpi.c
@@ -6992,7 +6992,6 @@ static int __init ibm_init(struct ibm_init_struct *iibm)
                         ret = -ENODEV;
                         goto err_out;
                 }
-                entry->owner = THIS_MODULE;
                 entry->data = ibm;
                 entry->read_proc = &dispatch_procfs_read;
                 if (ibm->write)
@@ -7405,7 +7404,6 @@ static int __init thinkpad_acpi_module_init(void)
                 thinkpad_acpi_module_exit();
                 return -ENODEV;
         }
-        proc_dir->owner = THIS_MODULE;
 
         ret = platform_driver_register(&tpacpi_pdriver);
         if (ret) {
diff --git a/drivers/platform/x86/toshiba_acpi.c b/drivers/platform/x86/toshiba_acpi.c
index 40e60fc2e596..9f187265db8e 100644
--- a/drivers/platform/x86/toshiba_acpi.c
+++ b/drivers/platform/x86/toshiba_acpi.c
@@ -679,8 +679,6 @@ static acpi_status __init add_device(void)
                                               toshiba_proc_dir,
                                               (read_proc_t *) dispatch_read,
                                               item);
-                if (proc)
-                        proc->owner = THIS_MODULE;
                 if (proc && item->write_func)
                         proc->write_proc = (write_proc_t *) dispatch_write;
         }
@@ -772,7 +770,6 @@ static int __init toshiba_acpi_init(void)
                 toshiba_acpi_exit();
                 return -ENODEV;
         } else {
-                toshiba_proc_dir->owner = THIS_MODULE;
                 status = add_device();
                 if (ACPI_FAILURE(status)) {
                         toshiba_acpi_exit();
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index 81450fbd8b12..09d5cd33a3f6 100644
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -129,13 +129,14 @@ comment "I2C RTC drivers"
 if I2C
 
 config RTC_DRV_DS1307
-        tristate "Dallas/Maxim DS1307/37/38/39/40, ST M41T00"
+        tristate "Dallas/Maxim DS1307/37/38/39/40, ST M41T00, EPSON RX-8025"
         help
           If you say yes here you get support for various compatible RTC
           chips (often with battery backup) connected with I2C. This driver
           should handle DS1307, DS1337, DS1338, DS1339, DS1340, ST M41T00,
-          and probably other chips. In some cases the RTC must already
-          have been initialized (by manufacturing or a bootloader).
+          EPSON RX-8025 and probably other chips. In some cases the RTC
+          must already have been initialized (by manufacturing or a
+          bootloader).
 
           The first seven registers on these chips hold an RTC, and other
           registers may add features such as NVRAM, a trickle charger for
@@ -440,6 +441,16 @@ config RTC_DRV_DS1742
           This driver can also be built as a module. If so, the module
           will be called rtc-ds1742.
 
+config RTC_DRV_EFI
+        tristate "EFI RTC"
+        depends on IA64
+        help
+          If you say yes here you will get support for the EFI
+          Real Time Clock.
+
+          This driver can also be built as a module. If so, the module
+          will be called rtc-efi.
+
 config RTC_DRV_STK17TA8
         tristate "Simtek STK17TA8"
         depends on RTC_CLASS
diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile
index 0e697aa51caa..e7b09986d26e 100644
--- a/drivers/rtc/Makefile
+++ b/drivers/rtc/Makefile
@@ -36,6 +36,7 @@ obj-$(CONFIG_RTC_DRV_DS1553)	+= rtc-ds1553.o
 obj-$(CONFIG_RTC_DRV_DS1672)    += rtc-ds1672.o
 obj-$(CONFIG_RTC_DRV_DS1742)    += rtc-ds1742.o
 obj-$(CONFIG_RTC_DRV_DS3234)    += rtc-ds3234.o
+obj-$(CONFIG_RTC_DRV_EFI)       += rtc-efi.o
 obj-$(CONFIG_RTC_DRV_EP93XX)    += rtc-ep93xx.o
 obj-$(CONFIG_RTC_DRV_FM3130)    += rtc-fm3130.o
 obj-$(CONFIG_RTC_DRV_ISL1208)   += rtc-isl1208.o
diff --git a/drivers/rtc/rtc-ds1307.c b/drivers/rtc/rtc-ds1307.c
index 7e5155e88ac7..2c4a65302a9d 100644
--- a/drivers/rtc/rtc-ds1307.c
+++ b/drivers/rtc/rtc-ds1307.c
@@ -3,6 +3,7 @@
  *
  *  Copyright (C) 2005 James Chapman (ds1337 core)
  *  Copyright (C) 2006 David Brownell
+ *  Copyright (C) 2009 Matthias Fuchs (rx8025 support)
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -31,6 +32,7 @@ enum ds_type {
         ds_1339,
         ds_1340,
         m41t00,
+        rx_8025,
         // rs5c372 too?  different address...
 };
 
@@ -83,6 +85,12 @@ enum ds_type {
 #define DS1339_REG_ALARM1_SECS  0x07
 #define DS1339_REG_TRICKLE      0x10
 
+#define RX8025_REG_CTRL1        0x0e
+#       define RX8025_BIT_2412          0x20
+#define RX8025_REG_CTRL2        0x0f
+#       define RX8025_BIT_PON           0x10
+#       define RX8025_BIT_VDET          0x40
+#       define RX8025_BIT_XST           0x20
 
 
 struct ds1307 {
@@ -94,6 +102,10 @@ struct ds1307 {
         struct i2c_client       *client;
         struct rtc_device       *rtc;
         struct work_struct      work;
+        s32 (*read_block_data)(struct i2c_client *client, u8 command,
+                               u8 length, u8 *values);
+        s32 (*write_block_data)(struct i2c_client *client, u8 command,
+                                u8 length, const u8 *values);
 };
 
 struct chip_desc {
@@ -117,6 +129,8 @@ static const struct chip_desc chips[] = {
 [ds_1340] = {
 },
 [m41t00] = {
+},
+[rx_8025] = {
 }, };
 
 static const struct i2c_device_id ds1307_id[] = {
@@ -126,12 +140,86 @@ static const struct i2c_device_id ds1307_id[] = {
         { "ds1339", ds_1339 },
         { "ds1340", ds_1340 },
         { "m41t00", m41t00 },
+        { "rx8025", rx_8025 },
         { }
 };
 MODULE_DEVICE_TABLE(i2c, ds1307_id);
 
 /*----------------------------------------------------------------------*/
 
+#define BLOCK_DATA_MAX_TRIES 10
+
+static s32 ds1307_read_block_data_once(struct i2c_client *client, u8 command,
+                                  u8 length, u8 *values)
+{
+        s32 i, data;
+
+        for (i = 0; i < length; i++) {
+                data = i2c_smbus_read_byte_data(client, command + i);
+                if (data < 0)
+                        return data;
+                values[i] = data;
+        }
+        return i;
+}
+
+static s32 ds1307_read_block_data(struct i2c_client *client, u8 command,
+                                  u8 length, u8 *values)
+{
+        u8 oldvalues[I2C_SMBUS_BLOCK_MAX];
+        s32 ret;
+        int tries = 0;
+
+        dev_dbg(&client->dev, "ds1307_read_block_data (length=%d)\n", length);
+        ret = ds1307_read_block_data_once(client, command, length, values);
+        if (ret < 0)
+                return ret;
+        do {
+                if (++tries > BLOCK_DATA_MAX_TRIES) {
+                        dev_err(&client->dev,
+                                "ds1307_read_block_data failed\n");
+                        return -EIO;
+                }
+                memcpy(oldvalues, values, length);
+                ret = ds1307_read_block_data_once(client, command, length,
+                                                  values);
+                if (ret < 0)
+                        return ret;
+        } while (memcmp(oldvalues, values, length));
+        return length;
+}
+
+static s32 ds1307_write_block_data(struct i2c_client *client, u8 command,
+                                   u8 length, const u8 *values)
+{
+        u8 currvalues[I2C_SMBUS_BLOCK_MAX];
+        int tries = 0;
+
+        dev_dbg(&client->dev, "ds1307_write_block_data (length=%d)\n", length);
+        do {
+                s32 i, ret;
+
+                if (++tries > BLOCK_DATA_MAX_TRIES) {
+                        dev_err(&client->dev,
+                                "ds1307_write_block_data failed\n");
+                        return -EIO;
+                }
+                for (i = 0; i < length; i++) {
+                        ret = i2c_smbus_write_byte_data(client, command + i,
+                                                        values[i]);
+                        if (ret < 0)
+                                return ret;
+                }
+                ret = ds1307_read_block_data_once(client, command, length,
+                                                  currvalues);
+                if (ret < 0)
+                        return ret;
+        } while (memcmp(currvalues, values, length));
+        return length;
+}
+
+/*----------------------------------------------------------------------*/
+
 /*
  * The IRQ logic includes a "real" handler running in IRQ context just
  * long enough to schedule this workqueue entry.   We need a task context
@@ -202,7 +290,7 @@ static int ds1307_get_time(struct device *dev, struct rtc_time *t)
         int             tmp;
 
         /* read the RTC date and time registers all at once */
-        tmp = i2c_smbus_read_i2c_block_data(ds1307->client,
+        tmp = ds1307->read_block_data(ds1307->client,
                 DS1307_REG_SECS, 7, ds1307->regs);
         if (tmp != 7) {
                 dev_err(dev, "%s error %d\n", "read", tmp);
@@ -279,7 +367,7 @@ static int ds1307_set_time(struct device *dev, struct rtc_time *t)
                 "write", buf[0], buf[1], buf[2], buf[3],
                 buf[4], buf[5], buf[6]);
 
-        result = i2c_smbus_write_i2c_block_data(ds1307->client, 0, 7, buf);
+        result = ds1307->write_block_data(ds1307->client, 0, 7, buf);
         if (result < 0) {
                 dev_err(dev, "%s error %d\n", "write", result);
                 return result;
@@ -297,7 +385,7 @@ static int ds1337_read_alarm(struct device *dev, struct rtc_wkalrm *t)
                 return -EINVAL;
 
         /* read all ALARM1, ALARM2, and status registers at once */
-        ret = i2c_smbus_read_i2c_block_data(client,
+        ret = ds1307->read_block_data(client,
                         DS1339_REG_ALARM1_SECS, 9, ds1307->regs);
         if (ret != 9) {
                 dev_err(dev, "%s error %d\n", "alarm read", ret);
@@ -356,7 +444,7 @@ static int ds1337_set_alarm(struct device *dev, struct rtc_wkalrm *t)
                 t->enabled, t->pending);
 
         /* read current status of both alarms and the chip */
-        ret = i2c_smbus_read_i2c_block_data(client,
+        ret = ds1307->read_block_data(client,
                         DS1339_REG_ALARM1_SECS, 9, buf);
         if (ret != 9) {
                 dev_err(dev, "%s error %d\n", "alarm write", ret);
@@ -391,7 +479,7 @@ static int ds1337_set_alarm(struct device *dev, struct rtc_wkalrm *t)
         }
         buf[8] = status & ~(DS1337_BIT_A1I | DS1337_BIT_A2I);
 
-        ret = i2c_smbus_write_i2c_block_data(client,
+        ret = ds1307->write_block_data(client,
                         DS1339_REG_ALARM1_SECS, 9, buf);
         if (ret < 0) {
                 dev_err(dev, "can't set alarm time\n");
@@ -479,7 +567,7 @@ ds1307_nvram_read(struct kobject *kobj, struct bin_attribute *attr,
         if (unlikely(!count))
                 return count;
 
-        result = i2c_smbus_read_i2c_block_data(client, 8 + off, count, buf);
+        result = ds1307->read_block_data(client, 8 + off, count, buf);
         if (result < 0)
                 dev_err(&client->dev, "%s error %d\n", "nvram read", result);
         return result;
@@ -490,9 +578,11 @@ ds1307_nvram_write(struct kobject *kobj, struct bin_attribute *attr,
                 char *buf, loff_t off, size_t count)
 {
         struct i2c_client       *client;
+        struct ds1307           *ds1307;
         int                     result;
 
         client = kobj_to_i2c_client(kobj);
+        ds1307 = i2c_get_clientdata(client);
 
         if (unlikely(off >= NVRAM_SIZE))
                 return -EFBIG;
@@ -501,7 +591,7 @@ ds1307_nvram_write(struct kobject *kobj, struct bin_attribute *attr,
         if (unlikely(!count))
                 return count;
 
-        result = i2c_smbus_write_i2c_block_data(client, 8 + off, count, buf);
+        result = ds1307->write_block_data(client, 8 + off, count, buf);
         if (result < 0) {
                 dev_err(&client->dev, "%s error %d\n", "nvram write", result);
                 return result;
@@ -535,9 +625,8 @@ static int __devinit ds1307_probe(struct i2c_client *client,
         int                     want_irq = false;
         unsigned char           *buf;
 
-        if (!i2c_check_functionality(adapter,
-                        I2C_FUNC_SMBUS_WRITE_BYTE_DATA |
-                        I2C_FUNC_SMBUS_I2C_BLOCK))
+        if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)
+            && !i2c_check_functionality(adapter, I2C_FUNC_SMBUS_I2C_BLOCK))
                 return -EIO;
 
         if (!(ds1307 = kzalloc(sizeof(struct ds1307), GFP_KERNEL)))
@@ -547,6 +636,13 @@ static int __devinit ds1307_probe(struct i2c_client *client,
         i2c_set_clientdata(client, ds1307);
         ds1307->type = id->driver_data;
         buf = ds1307->regs;
+        if (i2c_check_functionality(adapter, I2C_FUNC_SMBUS_I2C_BLOCK)) {
+                ds1307->read_block_data = i2c_smbus_read_i2c_block_data;
+                ds1307->write_block_data = i2c_smbus_write_i2c_block_data;
+        } else {
+                ds1307->read_block_data = ds1307_read_block_data;
+                ds1307->write_block_data = ds1307_write_block_data;
+        }
 
         switch (ds1307->type) {
         case ds_1337:
@@ -557,7 +653,7 @@ static int __devinit ds1307_probe(struct i2c_client *client,
                         want_irq = true;
                 }
                 /* get registers that the "rtc" read below won't read... */
-                tmp = i2c_smbus_read_i2c_block_data(ds1307->client,
+                tmp = ds1307->read_block_data(ds1307->client,
                                 DS1337_REG_CONTROL, 2, buf);
                 if (tmp != 2) {
                         pr_debug("read error %d\n", tmp);
@@ -589,13 +685,79 @@ static int __devinit ds1307_probe(struct i2c_client *client,
                         dev_warn(&client->dev, "SET TIME!\n");
                 }
                 break;
+
+        case rx_8025:
+                tmp = i2c_smbus_read_i2c_block_data(ds1307->client,
+                                RX8025_REG_CTRL1 << 4 | 0x08, 2, buf);
+                if (tmp != 2) {
+                        pr_debug("read error %d\n", tmp);
+                        err = -EIO;
+                        goto exit_free;
+                }
+
+                /* oscillator off?  turn it on, so clock can tick. */
+                if (!(ds1307->regs[1] & RX8025_BIT_XST)) {
+                        ds1307->regs[1] |= RX8025_BIT_XST;
+                        i2c_smbus_write_byte_data(client,
+                                                  RX8025_REG_CTRL2 << 4 | 0x08,
+                                                  ds1307->regs[1]);
+                        dev_warn(&client->dev,
+                                 "oscillator stop detected - SET TIME!\n");
+                }
+
+                if (ds1307->regs[1] & RX8025_BIT_PON) {
+                        ds1307->regs[1] &= ~RX8025_BIT_PON;
+                        i2c_smbus_write_byte_data(client,
+                                                  RX8025_REG_CTRL2 << 4 | 0x08,
+                                                  ds1307->regs[1]);
+                        dev_warn(&client->dev, "power-on detected\n");
+                }
+
+                if (ds1307->regs[1] & RX8025_BIT_VDET) {
+                        ds1307->regs[1] &= ~RX8025_BIT_VDET;
+                        i2c_smbus_write_byte_data(client,
+                                                  RX8025_REG_CTRL2 << 4 | 0x08,
+                                                  ds1307->regs[1]);
+                        dev_warn(&client->dev, "voltage drop detected\n");
+                }
+
+                /* make sure we are running in 24hour mode */
+                if (!(ds1307->regs[0] & RX8025_BIT_2412)) {
+                        u8 hour;
+
+                        /* switch to 24 hour mode */
+                        i2c_smbus_write_byte_data(client,
+                                                  RX8025_REG_CTRL1 << 4 | 0x08,
+                                                  ds1307->regs[0] |
+                                                  RX8025_BIT_2412);
+
+                        tmp = i2c_smbus_read_i2c_block_data(ds1307->client,
+                                        RX8025_REG_CTRL1 << 4 | 0x08, 2, buf);
+                        if (tmp != 2) {
+                                pr_debug("read error %d\n", tmp);
+                                err = -EIO;
+                                goto exit_free;
+                        }
+
+                        /* correct hour */
+                        hour = bcd2bin(ds1307->regs[DS1307_REG_HOUR]);
+                        if (hour == 12)
+                                hour = 0;
+                        if (ds1307->regs[DS1307_REG_HOUR] & DS1307_BIT_PM)
+                                hour += 12;
+
+                        i2c_smbus_write_byte_data(client,
+                                                  DS1307_REG_HOUR << 4 | 0x08,
+                                                  hour);
+                }
+                break;
         default:
                 break;
         }
 
 read_rtc:
         /* read RTC registers */
-        tmp = i2c_smbus_read_i2c_block_data(ds1307->client, 0, 8, buf);
+        tmp = ds1307->read_block_data(ds1307->client, 0, 8, buf);
         if (tmp != 8) {
                 pr_debug("read error %d\n", tmp);
                 err = -EIO;
@@ -649,6 +811,7 @@ read_rtc:
                         dev_warn(&client->dev, "SET TIME!\n");
                 }
                 break;
+        case rx_8025:
         case ds_1337:
         case ds_1339:
                 break;
@@ -662,6 +825,8 @@ read_rtc:
                  * systems that will run through year 2100.
                  */
                 break;
+        case rx_8025:
+                break;
         default:
                 if (!(tmp & DS1307_BIT_12HR))
                         break;
diff --git a/drivers/rtc/rtc-ds1374.c b/drivers/rtc/rtc-ds1374.c
index a5b0fc09f0c6..4d32e328f6cd 100644
--- a/drivers/rtc/rtc-ds1374.c
+++ b/drivers/rtc/rtc-ds1374.c
@@ -222,16 +222,16 @@ static int ds1374_set_alarm(struct device *dev, struct rtc_wkalrm *alarm)
         rtc_tm_to_time(&alarm->time, &new_alarm);
         rtc_tm_to_time(&now, &itime);
 
-        new_alarm -= itime;
-
         /* This can happen due to races, in addition to dates that are
          * truly in the past.  To avoid requiring the caller to check for
          * races, dates in the past are assumed to be in the recent past
          * (i.e. not something that we'd rather the caller know about via
          * an error), and the alarm is set to go off as soon as possible.
          */
-        if (new_alarm <= 0)
+        if (time_before_eq(new_alarm, itime))
                 new_alarm = 1;
+        else
+                new_alarm -= itime;
 
         mutex_lock(&ds1374->mutex);
 
diff --git a/drivers/rtc/rtc-efi.c b/drivers/rtc/rtc-efi.c
new file mode 100644
index 000000000000..550292304b0f
--- /dev/null
+++ b/drivers/rtc/rtc-efi.c
@@ -0,0 +1,235 @@
+/*
+ * rtc-efi: RTC Class Driver for EFI-based systems
+ *
+ * Copyright (C) 2009 Hewlett-Packard Development Company, L.P.
+ *
+ * Author: dann frazier <dannf@hp.com>
+ * Based on efirtc.c by Stephane Eranian
+ *
+ *  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.
+ *
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/time.h>
+#include <linux/platform_device.h>
+#include <linux/rtc.h>
+#include <linux/efi.h>
+
+#define EFI_ISDST (EFI_TIME_ADJUST_DAYLIGHT|EFI_TIME_IN_DAYLIGHT)
+/*
+ * EFI Epoch is 1/1/1998
+ */
+#define EFI_RTC_EPOCH           1998
+
+/*
+ * returns day of the year [0-365]
+ */
+static inline int
+compute_yday(efi_time_t *eft)
+{
+        /* efi_time_t.month is in the [1-12] so, we need -1 */
+        return rtc_year_days(eft->day - 1, eft->month - 1, eft->year);
+}
+/*
+ * returns day of the week [0-6] 0=Sunday
+ *
+ * Don't try to provide a year that's before 1998, please !
+ */
+static int
+compute_wday(efi_time_t *eft)
+{
+        int y;
+        int ndays = 0;
+
+        if (eft->year < 1998) {
+                printk(KERN_ERR "efirtc: EFI year < 1998, invalid date\n");
+                return -1;
+        }
+
+        for (y = EFI_RTC_EPOCH; y < eft->year; y++)
+                ndays += 365 + (is_leap_year(y) ? 1 : 0);
+
+        ndays += compute_yday(eft);
+
+        /*
+         * 4=1/1/1998 was a Thursday
+         */
+        return (ndays + 4) % 7;
+}
+
+static void
+convert_to_efi_time(struct rtc_time *wtime, efi_time_t *eft)
+{
+        eft->year       = wtime->tm_year + 1900;
+        eft->month      = wtime->tm_mon + 1;
+        eft->day        = wtime->tm_mday;
+        eft->hour       = wtime->tm_hour;
+        eft->minute     = wtime->tm_min;
+        eft->second     = wtime->tm_sec;
+        eft->nanosecond = 0;
+        eft->daylight   = wtime->tm_isdst ? EFI_ISDST : 0;
+        eft->timezone   = EFI_UNSPECIFIED_TIMEZONE;
+}
+
+static void
+convert_from_efi_time(efi_time_t *eft, struct rtc_time *wtime)
+{
+        memset(wtime, 0, sizeof(*wtime));
+        wtime->tm_sec  = eft->second;
+        wtime->tm_min  = eft->minute;
+        wtime->tm_hour = eft->hour;
+        wtime->tm_mday = eft->day;
+        wtime->tm_mon  = eft->month - 1;
+        wtime->tm_year = eft->year - 1900;
+
+        /* day of the week [0-6], Sunday=0 */
+        wtime->tm_wday = compute_wday(eft);
+
+        /* day in the year [1-365]*/
+        wtime->tm_yday = compute_yday(eft);
+
+
+        switch (eft->daylight & EFI_ISDST) {
+        case EFI_ISDST:
+                wtime->tm_isdst = 1;
+                break;
+        case EFI_TIME_ADJUST_DAYLIGHT:
+                wtime->tm_isdst = 0;
+                break;
+        default:
+                wtime->tm_isdst = -1;
+        }
+}
+
+static int efi_read_alarm(struct device *dev, struct rtc_wkalrm *wkalrm)
+{
+        efi_time_t eft;
+        efi_status_t status;
+
+        /*
+         * As of EFI v1.10, this call always returns an unsupported status
+         */
+        status = efi.get_wakeup_time((efi_bool_t *)&wkalrm->enabled,
+                                     (efi_bool_t *)&wkalrm->pending, &eft);
+
+        if (status != EFI_SUCCESS)
+                return -EINVAL;
+
+        convert_from_efi_time(&eft, &wkalrm->time);
+
+        return rtc_valid_tm(&wkalrm->time);
+}
+
+static int efi_set_alarm(struct device *dev, struct rtc_wkalrm *wkalrm)
+{
+        efi_time_t eft;
+        efi_status_t status;
+
+        convert_to_efi_time(&wkalrm->time, &eft);
+
+        /*
+         * XXX Fixme:
+         * As of EFI 0.92 with the firmware I have on my
+         * machine this call does not seem to work quite
+         * right
+         *
+         * As of v1.10, this call always returns an unsupported status
+         */
+        status = efi.set_wakeup_time((efi_bool_t)wkalrm->enabled, &eft);
+
+        printk(KERN_WARNING "write status is %d\n", (int)status);
+
+        return status == EFI_SUCCESS ? 0 : -EINVAL;
+}
+
+static int efi_read_time(struct device *dev, struct rtc_time *tm)
+{
+        efi_status_t status;
+        efi_time_t eft;
+        efi_time_cap_t cap;
+
+        status = efi.get_time(&eft, &cap);
+
+        if (status != EFI_SUCCESS) {
+                /* should never happen */
+                printk(KERN_ERR "efitime: can't read time\n");
+                return -EINVAL;
+        }
+
+        convert_from_efi_time(&eft, tm);
+
+        return rtc_valid_tm(tm);
+}
+
+static int efi_set_time(struct device *dev, struct rtc_time *tm)
+{
+        efi_status_t status;
+        efi_time_t eft;
+
+        convert_to_efi_time(tm, &eft);
+
+        status = efi.set_time(&eft);
+
+        return status == EFI_SUCCESS ? 0 : -EINVAL;
+}
+
+static const struct rtc_class_ops efi_rtc_ops = {
+        .read_time = efi_read_time,
+        .set_time = efi_set_time,
+        .read_alarm = efi_read_alarm,
+        .set_alarm = efi_set_alarm,
+};
+
+static int __init efi_rtc_probe(struct platform_device *dev)
+{
+        struct rtc_device *rtc;
+
+        rtc = rtc_device_register("rtc-efi", &dev->dev, &efi_rtc_ops,
+                                        THIS_MODULE);
+        if (IS_ERR(rtc))
+                return PTR_ERR(rtc);
+
+        platform_set_drvdata(dev, rtc);
+
+        return 0;
+}
+
+static int __exit efi_rtc_remove(struct platform_device *dev)
+{
+        struct rtc_device *rtc = platform_get_drvdata(dev);
+
+        rtc_device_unregister(rtc);
+
+        return 0;
+}
+
+static struct platform_driver efi_rtc_driver = {
+        .driver = {
+                .name = "rtc-efi",
+                .owner = THIS_MODULE,
+        },
+        .probe = efi_rtc_probe,
+        .remove = __exit_p(efi_rtc_remove),
+};
+
+static int __init efi_rtc_init(void)
+{
+        return platform_driver_probe(&efi_rtc_driver, efi_rtc_probe);
+}
+
+static void __exit efi_rtc_exit(void)
+{
+        platform_driver_unregister(&efi_rtc_driver);
+}
+
+module_init(efi_rtc_init);
+module_exit(efi_rtc_exit);
+
+MODULE_AUTHOR("dann frazier <dannf@hp.com>");
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("EFI RTC driver");
diff --git a/drivers/rtc/rtc-lib.c b/drivers/rtc/rtc-lib.c
index dd70bf73ce9d..773851f338b8 100644
--- a/drivers/rtc/rtc-lib.c
+++ b/drivers/rtc/rtc-lib.c
@@ -26,14 +26,13 @@ static const unsigned short rtc_ydays[2][13] = {
 };
 
 #define LEAPS_THRU_END_OF(y) ((y)/4 - (y)/100 + (y)/400)
-#define LEAP_YEAR(year) ((!(year % 4) && (year % 100)) || !(year % 400))
 
 /*
  * The number of days in the month.
  */
 int rtc_month_days(unsigned int month, unsigned int year)
 {
-        return rtc_days_in_month[month] + (LEAP_YEAR(year) && month == 1);
+        return rtc_days_in_month[month] + (is_leap_year(year) && month == 1);
 }
 EXPORT_SYMBOL(rtc_month_days);
 
@@ -42,7 +41,7 @@ EXPORT_SYMBOL(rtc_month_days);
  */
 int rtc_year_days(unsigned int day, unsigned int month, unsigned int year)
 {
-        return rtc_ydays[LEAP_YEAR(year)][month] + day-1;
+        return rtc_ydays[is_leap_year(year)][month] + day-1;
 }
 EXPORT_SYMBOL(rtc_year_days);
 
@@ -66,7 +65,7 @@ void rtc_time_to_tm(unsigned long time, struct rtc_time *tm)
                 - LEAPS_THRU_END_OF(1970 - 1);
         if (days < 0) {
                 year -= 1;
-                days += 365 + LEAP_YEAR(year);
+                days += 365 + is_leap_year(year);
         }
         tm->tm_year = year - 1900;
         tm->tm_yday = days + 1;
diff --git a/drivers/rtc/rtc-parisc.c b/drivers/rtc/rtc-parisc.c
index c6bfa6fe1a2a..b966f56da976 100644
--- a/drivers/rtc/rtc-parisc.c
+++ b/drivers/rtc/rtc-parisc.c
@@ -7,41 +7,25 @@
 #include <linux/module.h>
 #include <linux/time.h>
 #include <linux/platform_device.h>
+#include <linux/rtc.h>
 
 #include <asm/rtc.h>
 
-/* as simple as can be, and no simpler. */
-struct parisc_rtc {
-        struct rtc_device *rtc;
-        spinlock_t lock;
-};
-
 static int parisc_get_time(struct device *dev, struct rtc_time *tm)
 {
-        struct parisc_rtc *p = dev_get_drvdata(dev);
-        unsigned long flags, ret;
+        unsigned long ret;
 
-        spin_lock_irqsave(&p->lock, flags);
         ret = get_rtc_time(tm);
-        spin_unlock_irqrestore(&p->lock, flags);
 
         if (ret & RTC_BATT_BAD)
                 return -EOPNOTSUPP;
 
-        return 0;
+        return rtc_valid_tm(tm);
 }
 
 static int parisc_set_time(struct device *dev, struct rtc_time *tm)
 {
-        struct parisc_rtc *p = dev_get_drvdata(dev);
-        unsigned long flags;
-        int ret;
-
-        spin_lock_irqsave(&p->lock, flags);
-        ret = set_rtc_time(tm);
-        spin_unlock_irqrestore(&p->lock, flags);
-
-        if (ret < 0)
+        if (set_rtc_time(tm) < 0)
                 return -EOPNOTSUPP;
 
         return 0;
@@ -52,35 +36,25 @@ static const struct rtc_class_ops parisc_rtc_ops = {
         .set_time = parisc_set_time,
 };
 
-static int __devinit parisc_rtc_probe(struct platform_device *dev)
+static int __init parisc_rtc_probe(struct platform_device *dev)
 {
-        struct parisc_rtc *p;
-
-        p = kzalloc(sizeof (*p), GFP_KERNEL);
-        if (!p)
-                return -ENOMEM;
-
-        spin_lock_init(&p->lock);
+        struct rtc_device *rtc;
 
-        p->rtc = rtc_device_register("rtc-parisc", &dev->dev, &parisc_rtc_ops,
-                                        THIS_MODULE);
-        if (IS_ERR(p->rtc)) {
-                int err = PTR_ERR(p->rtc);
-                kfree(p);
-                return err;
-        }
+        rtc = rtc_device_register("rtc-parisc", &dev->dev, &parisc_rtc_ops,
+                                  THIS_MODULE);
+        if (IS_ERR(rtc))
+                return PTR_ERR(rtc);
 
-        platform_set_drvdata(dev, p);
+        platform_set_drvdata(dev, rtc);
 
         return 0;
 }
 
-static int __devexit parisc_rtc_remove(struct platform_device *dev)
+static int __exit parisc_rtc_remove(struct platform_device *dev)
 {
-        struct parisc_rtc *p = platform_get_drvdata(dev);
+        struct rtc_device *rtc = platform_get_drvdata(dev);
 
-        rtc_device_unregister(p->rtc);
-        kfree(p);
+        rtc_device_unregister(rtc);
 
         return 0;
 }
@@ -96,7 +70,7 @@ static struct platform_driver parisc_rtc_driver = {
 
 static int __init parisc_rtc_init(void)
 {
-        return platform_driver_register(&parisc_rtc_driver);
+        return platform_driver_probe(&parisc_rtc_driver, parisc_rtc_probe);
 }
 
 static void __exit parisc_rtc_fini(void)
diff --git a/drivers/rtc/rtc-proc.c b/drivers/rtc/rtc-proc.c
index 0c6257a034ff..c086fc30a84c 100644
--- a/drivers/rtc/rtc-proc.c
+++ b/drivers/rtc/rtc-proc.c
@@ -105,14 +105,8 @@ static const struct file_operations rtc_proc_fops = {
 
 void rtc_proc_add_device(struct rtc_device *rtc)
 {
-        if (rtc->id == 0) {
-                struct proc_dir_entry *ent;
-
-                ent = proc_create_data("driver/rtc", 0, NULL,
-                                       &rtc_proc_fops, rtc);
-                if (ent)
-                        ent->owner = rtc->owner;
-        }
+        if (rtc->id == 0)
+                proc_create_data("driver/rtc", 0, NULL, &rtc_proc_fops, rtc);
 }
 
 void rtc_proc_del_device(struct rtc_device *rtc)
diff --git a/drivers/rtc/rtc-v3020.c b/drivers/rtc/rtc-v3020.c
index 14d4f036a768..66955cc9c746 100644
--- a/drivers/rtc/rtc-v3020.c
+++ b/drivers/rtc/rtc-v3020.c
@@ -28,7 +28,7 @@
 #include <linux/rtc-v3020.h>
 #include <linux/delay.h>
 
-#include <asm/io.h>
+#include <linux/io.h>
 
 #undef DEBUG
 
@@ -63,7 +63,7 @@ static void v3020_set_reg(struct v3020 *chip, unsigned char address,
 
 static unsigned char v3020_get_reg(struct v3020 *chip, unsigned char address)
 {
-        unsigned int data=0;
+        unsigned int data = 0;
         int i;
 
         for (i = 0; i < 4; i++) {
@@ -106,16 +106,14 @@ static int v3020_read_time(struct device *dev, struct rtc_time *dt)
         tmp = v3020_get_reg(chip, V3020_YEAR);
         dt->tm_year = bcd2bin(tmp)+100;
 
-#ifdef DEBUG
-        printk("\n%s : Read RTC values\n",__func__);
-        printk("tm_hour: %i\n",dt->tm_hour);
-        printk("tm_min : %i\n",dt->tm_min);
-        printk("tm_sec : %i\n",dt->tm_sec);
-        printk("tm_year: %i\n",dt->tm_year);
-        printk("tm_mon : %i\n",dt->tm_mon);
-        printk("tm_mday: %i\n",dt->tm_mday);
-        printk("tm_wday: %i\n",dt->tm_wday);
-#endif
+        dev_dbg(dev, "\n%s : Read RTC values\n", __func__);
+        dev_dbg(dev, "tm_hour: %i\n", dt->tm_hour);
+        dev_dbg(dev, "tm_min : %i\n", dt->tm_min);
+        dev_dbg(dev, "tm_sec : %i\n", dt->tm_sec);
+        dev_dbg(dev, "tm_year: %i\n", dt->tm_year);
+        dev_dbg(dev, "tm_mon : %i\n", dt->tm_mon);
+        dev_dbg(dev, "tm_mday: %i\n", dt->tm_mday);
+        dev_dbg(dev, "tm_wday: %i\n", dt->tm_wday);
 
         return 0;
 }
@@ -125,15 +123,13 @@ static int v3020_set_time(struct device *dev, struct rtc_time *dt)
 {
         struct v3020 *chip = dev_get_drvdata(dev);
 
-#ifdef DEBUG
-        printk("\n%s : Setting RTC values\n",__func__);
-        printk("tm_sec : %i\n",dt->tm_sec);
-        printk("tm_min : %i\n",dt->tm_min);
-        printk("tm_hour: %i\n",dt->tm_hour);
-        printk("tm_mday: %i\n",dt->tm_mday);
-        printk("tm_wday: %i\n",dt->tm_wday);
-        printk("tm_year: %i\n",dt->tm_year);
-#endif
+        dev_dbg(dev, "\n%s : Setting RTC values\n", __func__);
+        dev_dbg(dev, "tm_sec : %i\n", dt->tm_sec);
+        dev_dbg(dev, "tm_min : %i\n", dt->tm_min);
+        dev_dbg(dev, "tm_hour: %i\n", dt->tm_hour);
+        dev_dbg(dev, "tm_mday: %i\n", dt->tm_mday);
+        dev_dbg(dev, "tm_wday: %i\n", dt->tm_wday);
+        dev_dbg(dev, "tm_year: %i\n", dt->tm_year);
 
         /* Write all the values to ram... */
         v3020_set_reg(chip, V3020_SECONDS,      bin2bcd(dt->tm_sec));
@@ -191,7 +187,7 @@ static int rtc_probe(struct platform_device *pdev)
         /* Test chip by doing a write/read sequence
          * to the chip ram */
         v3020_set_reg(chip, V3020_SECONDS, 0x33);
-        if(v3020_get_reg(chip, V3020_SECONDS) != 0x33) {
+        if (v3020_get_reg(chip, V3020_SECONDS) != 0x33) {
                 retval = -ENODEV;
                 goto err_io;
         }
diff --git a/drivers/rtc/rtc-wm8350.c b/drivers/rtc/rtc-wm8350.c
index 5c5e3aa91385..c91edc572eb6 100644
--- a/drivers/rtc/rtc-wm8350.c
+++ b/drivers/rtc/rtc-wm8350.c
@@ -122,7 +122,7 @@ static int wm8350_rtc_settime(struct device *dev, struct rtc_time *tm)
         do {
                 rtc_ctrl = wm8350_reg_read(wm8350, WM8350_RTC_TIME_CONTROL);
                 schedule_timeout_uninterruptible(msecs_to_jiffies(1));
-        } while (retries-- && !(rtc_ctrl & WM8350_RTC_STS));
+        } while (--retries && !(rtc_ctrl & WM8350_RTC_STS));
 
         if (!retries) {
                 dev_err(dev, "timed out on set confirmation\n");
@@ -236,6 +236,17 @@ static int wm8350_rtc_start_alarm(struct wm8350 *wm8350)
         return 0;
 }
 
+static int wm8350_rtc_alarm_irq_enable(struct device *dev,
+                                       unsigned int enabled)
+{
+        struct wm8350 *wm8350 = dev_get_drvdata(dev);
+
+        if (enabled)
+                return wm8350_rtc_start_alarm(wm8350);
+        else
+                return wm8350_rtc_stop_alarm(wm8350);
+}
+
 static int wm8350_rtc_setalarm(struct device *dev, struct rtc_wkalrm *alrm)
 {
         struct wm8350 *wm8350 = dev_get_drvdata(dev);
@@ -291,30 +302,15 @@ static int wm8350_rtc_setalarm(struct device *dev, struct rtc_wkalrm *alrm)
         return ret;
 }
 
-/*
- * Handle commands from user-space
- */
-static int wm8350_rtc_ioctl(struct device *dev, unsigned int cmd,
-                            unsigned long arg)
+static int wm8350_rtc_update_irq_enable(struct device *dev,
+                                        unsigned int enabled)
 {
         struct wm8350 *wm8350 = dev_get_drvdata(dev);
 
-        switch (cmd) {
-        case RTC_AIE_OFF:
-                return wm8350_rtc_stop_alarm(wm8350);
-        case RTC_AIE_ON:
-                return wm8350_rtc_start_alarm(wm8350);
-
-        case RTC_UIE_OFF:
-                wm8350_mask_irq(wm8350, WM8350_IRQ_RTC_SEC);
-                break;
-        case RTC_UIE_ON:
+        if (enabled)
                 wm8350_unmask_irq(wm8350, WM8350_IRQ_RTC_SEC);
-                break;
-
-        default:
-                return -ENOIOCTLCMD;
-        }
+        else
+                wm8350_mask_irq(wm8350, WM8350_IRQ_RTC_SEC);
 
         return 0;
 }
@@ -345,11 +341,12 @@ static void wm8350_rtc_update_handler(struct wm8350 *wm8350, int irq,
 }
 
 static const struct rtc_class_ops wm8350_rtc_ops = {
-        .ioctl = wm8350_rtc_ioctl,
         .read_time = wm8350_rtc_readtime,
         .set_time = wm8350_rtc_settime,
         .read_alarm = wm8350_rtc_readalarm,
         .set_alarm = wm8350_rtc_setalarm,
+        .alarm_irq_enable = wm8350_rtc_alarm_irq_enable,
+        .update_irq_enable = wm8350_rtc_update_irq_enable,
 };
 
 #ifdef CONFIG_PM
@@ -440,7 +437,7 @@ static int wm8350_rtc_probe(struct platform_device *pdev)
                 do {
                         timectl = wm8350_reg_read(wm8350,
                                                   WM8350_RTC_TIME_CONTROL);
-                } while (timectl & WM8350_RTC_STS && retries--);
+                } while (timectl & WM8350_RTC_STS && --retries);
 
                 if (retries == 0) {
                         dev_err(&pdev->dev, "failed to start: timeout\n");
diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c
index 2fd64e5a9ab2..0570794ccf1c 100644
--- a/drivers/s390/block/dasd.c
+++ b/drivers/s390/block/dasd.c
@@ -2363,6 +2363,7 @@ int dasd_generic_notify(struct ccw_device *cdev, int event)
         ret = 0;
         switch (event) {
         case CIO_GONE:
+        case CIO_BOXED:
         case CIO_NO_PATH:
                 /* First of all call extended error reporting. */
                 dasd_eer_write(device, NULL, DASD_EER_NOPATH);
diff --git a/drivers/s390/block/dasd_proc.c b/drivers/s390/block/dasd_proc.c
index 2080ba6a69b0..654daa3cdfda 100644
--- a/drivers/s390/block/dasd_proc.c
+++ b/drivers/s390/block/dasd_proc.c
@@ -320,7 +320,6 @@ dasd_proc_init(void)
         dasd_proc_root_entry = proc_mkdir("dasd", NULL);
         if (!dasd_proc_root_entry)
                 goto out_nodasd;
-        dasd_proc_root_entry->owner = THIS_MODULE;
         dasd_devices_entry = proc_create("devices",
                                          S_IFREG | S_IRUGO | S_IWUSR,
                                          dasd_proc_root_entry,
@@ -334,7 +333,6 @@ dasd_proc_init(void)
                 goto out_nostatistics;
         dasd_statistics_entry->read_proc = dasd_statistics_read;
         dasd_statistics_entry->write_proc = dasd_statistics_write;
-        dasd_statistics_entry->owner = THIS_MODULE;
         return 0;
 
  out_nostatistics:
diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c
index c4d2f667a2f6..35441fa16be1 100644
--- a/drivers/s390/cio/device.c
+++ b/drivers/s390/cio/device.c
@@ -310,8 +310,6 @@ static void ccw_device_remove_orphan_cb(struct work_struct *work)
         put_device(&cdev->dev);
 }
 
-static void ccw_device_call_sch_unregister(struct work_struct *work);
-
 static void
 ccw_device_remove_disconnected(struct ccw_device *cdev)
 {
@@ -335,11 +333,10 @@ ccw_device_remove_disconnected(struct ccw_device *cdev)
                 spin_unlock_irqrestore(cdev->ccwlock, flags);
                 PREPARE_WORK(&cdev->private->kick_work,
                                 ccw_device_remove_orphan_cb);
+                queue_work(slow_path_wq, &cdev->private->kick_work);
         } else
                 /* Deregister subchannel, which will kill the ccw device. */
-                PREPARE_WORK(&cdev->private->kick_work,
-                                ccw_device_call_sch_unregister);
-        queue_work(slow_path_wq, &cdev->private->kick_work);
+                ccw_device_schedule_sch_unregister(cdev);
 }
 
 /**
@@ -471,7 +468,7 @@ static int online_store_recog_and_online(struct ccw_device *cdev)
         int ret;
 
         /* Do device recognition, if needed. */
-        if (cdev->id.cu_type == 0) {
+        if (cdev->private->state == DEV_STATE_BOXED) {
                 ret = ccw_device_recognition(cdev);
                 if (ret) {
                         CIO_MSG_EVENT(0, "Couldn't start recognition "
@@ -482,17 +479,21 @@ static int online_store_recog_and_online(struct ccw_device *cdev)
                 }
                 wait_event(cdev->private->wait_q,
                            cdev->private->flags.recog_done);
+                if (cdev->private->state != DEV_STATE_OFFLINE)
+                        /* recognition failed */
+                        return -EAGAIN;
         }
         if (cdev->drv && cdev->drv->set_online)
                 ccw_device_set_online(cdev);
         return 0;
 }
+
 static int online_store_handle_online(struct ccw_device *cdev, int force)
 {
         int ret;
 
         ret = online_store_recog_and_online(cdev);
-        if (ret)
+        if (ret && !force)
                 return ret;
         if (force && cdev->private->state == DEV_STATE_BOXED) {
                 ret = ccw_device_stlck(cdev);
@@ -500,7 +501,9 @@ static int online_store_handle_online(struct ccw_device *cdev, int force)
                         return ret;
                 if (cdev->id.cu_type == 0)
                         cdev->private->state = DEV_STATE_NOT_OPER;
-                online_store_recog_and_online(cdev);
+                ret = online_store_recog_and_online(cdev);
+                if (ret)
+                        return ret;
         }
         return 0;
 }
@@ -512,7 +515,11 @@ static ssize_t online_store (struct device *dev, struct device_attribute *attr,
         int force, ret;
         unsigned long i;
 
-        if (atomic_cmpxchg(&cdev->private->onoff, 0, 1) != 0)
+        if ((cdev->private->state != DEV_STATE_OFFLINE &&
+             cdev->private->state != DEV_STATE_ONLINE &&
+             cdev->private->state != DEV_STATE_BOXED &&
+             cdev->private->state != DEV_STATE_DISCONNECTED) ||
+            atomic_cmpxchg(&cdev->private->onoff, 0, 1) != 0)
                 return -EAGAIN;
 
         if (cdev->drv && !try_module_get(cdev->drv->owner)) {
@@ -1014,6 +1021,13 @@ static void ccw_device_call_sch_unregister(struct work_struct *work)
         put_device(&sch->dev);
 }
 
+void ccw_device_schedule_sch_unregister(struct ccw_device *cdev)
+{
+        PREPARE_WORK(&cdev->private->kick_work,
+                     ccw_device_call_sch_unregister);
+        queue_work(slow_path_wq, &cdev->private->kick_work);
+}
+
 /*
  * subchannel recognition done. Called from the state machine.
  */
@@ -1025,19 +1039,17 @@ io_subchannel_recog_done(struct ccw_device *cdev)
                 return;
         }
         switch (cdev->private->state) {
+        case DEV_STATE_BOXED:
+                /* Device did not respond in time. */
         case DEV_STATE_NOT_OPER:
                 cdev->private->flags.recog_done = 1;
                 /* Remove device found not operational. */
                 if (!get_device(&cdev->dev))
                         break;
-                PREPARE_WORK(&cdev->private->kick_work,
-                             ccw_device_call_sch_unregister);
-                queue_work(slow_path_wq, &cdev->private->kick_work);
+                ccw_device_schedule_sch_unregister(cdev);
                 if (atomic_dec_and_test(&ccw_device_init_count))
                         wake_up(&ccw_device_init_wq);
                 break;
-        case DEV_STATE_BOXED:
-                /* Device did not respond in time. */
         case DEV_STATE_OFFLINE:
                 /* 
                  * We can't register the device in interrupt context so
@@ -1551,8 +1563,7 @@ static int purge_fn(struct device *dev, void *data)
                 goto out;
         CIO_MSG_EVENT(3, "ccw: purging 0.%x.%04x\n", priv->dev_id.ssid,
                       priv->dev_id.devno);
-        PREPARE_WORK(&cdev->private->kick_work, ccw_device_call_sch_unregister);
-        queue_work(slow_path_wq, &cdev->private->kick_work);
+        ccw_device_schedule_sch_unregister(cdev);
 
 out:
         /* Abort loop in case of pending signal. */
diff --git a/drivers/s390/cio/device.h b/drivers/s390/cio/device.h
index 85e01846ca65..f1cbbd94ad4e 100644
--- a/drivers/s390/cio/device.h
+++ b/drivers/s390/cio/device.h
@@ -87,6 +87,7 @@ int ccw_device_is_orphan(struct ccw_device *);
 int ccw_device_recognition(struct ccw_device *);
 int ccw_device_online(struct ccw_device *);
 int ccw_device_offline(struct ccw_device *);
+void ccw_device_schedule_sch_unregister(struct ccw_device *);
 int ccw_purge_blacklisted(void);
 
 /* Function prototypes for device status and basic sense stuff. */
diff --git a/drivers/s390/cio/device_fsm.c b/drivers/s390/cio/device_fsm.c
index 87b4bfca080f..e46049261561 100644
--- a/drivers/s390/cio/device_fsm.c
+++ b/drivers/s390/cio/device_fsm.c
@@ -256,13 +256,12 @@ ccw_device_recog_done(struct ccw_device *cdev, int state)
                 old_lpm = 0;
         if (sch->lpm != old_lpm)
                 __recover_lost_chpids(sch, old_lpm);
-        if (cdev->private->state == DEV_STATE_DISCONNECTED_SENSE_ID) {
-                if (state == DEV_STATE_NOT_OPER) {
-                        cdev->private->flags.recog_done = 1;
-                        cdev->private->state = DEV_STATE_DISCONNECTED;
-                        return;
-                }
-                /* Boxed devices don't need extra treatment. */
+        if (cdev->private->state == DEV_STATE_DISCONNECTED_SENSE_ID &&
+            (state == DEV_STATE_NOT_OPER || state == DEV_STATE_BOXED)) {
+                cdev->private->flags.recog_done = 1;
+                cdev->private->state = DEV_STATE_DISCONNECTED;
+                wake_up(&cdev->private->wait_q);
+                return;
         }
         notify = 0;
         same_dev = 0; /* Keep the compiler quiet... */
@@ -274,7 +273,7 @@ ccw_device_recog_done(struct ccw_device *cdev, int state)
                               sch->schid.ssid, sch->schid.sch_no);
                 break;
         case DEV_STATE_OFFLINE:
-                if (cdev->private->state == DEV_STATE_DISCONNECTED_SENSE_ID) {
+                if (cdev->online) {
                         same_dev = ccw_device_handle_oper(cdev);
                         notify = 1;
                 }
@@ -307,12 +306,17 @@ ccw_device_recog_done(struct ccw_device *cdev, int state)
                               " subchannel 0.%x.%04x\n",
                               cdev->private->dev_id.devno,
                               sch->schid.ssid, sch->schid.sch_no);
+                if (cdev->id.cu_type != 0) { /* device was recognized before */
+                        cdev->private->flags.recog_done = 1;
+                        cdev->private->state = DEV_STATE_BOXED;
+                        wake_up(&cdev->private->wait_q);
+                        return;
+                }
                 break;
         }
         cdev->private->state = state;
         io_subchannel_recog_done(cdev);
-        if (state != DEV_STATE_NOT_OPER)
-                wake_up(&cdev->private->wait_q);
+        wake_up(&cdev->private->wait_q);
 }
 
 /*
@@ -390,10 +394,13 @@ ccw_device_done(struct ccw_device *cdev, int state)
 
         cdev->private->state = state;
 
-
-        if (state == DEV_STATE_BOXED)
+        if (state == DEV_STATE_BOXED) {
                 CIO_MSG_EVENT(0, "Boxed device %04x on subchannel %04x\n",
                               cdev->private->dev_id.devno, sch->schid.sch_no);
+                if (cdev->online && !ccw_device_notify(cdev, CIO_BOXED))
+                        ccw_device_schedule_sch_unregister(cdev);
+                cdev->private->flags.donotify = 0;
+        }
 
         if (cdev->private->flags.donotify) {
                 cdev->private->flags.donotify = 0;
diff --git a/drivers/s390/net/qeth_core_offl.c b/drivers/s390/net/qeth_core_offl.c
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/drivers/s390/net/qeth_core_offl.c
+++ /dev/null
diff --git a/drivers/s390/net/qeth_core_offl.h b/drivers/s390/net/qeth_core_offl.h
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/drivers/s390/net/qeth_core_offl.h
+++ /dev/null
diff --git a/drivers/s390/scsi/zfcp_ccw.c b/drivers/s390/scsi/zfcp_ccw.c
index 1fe1e2eda512..cfb0dcb6e3ff 100644
--- a/drivers/s390/scsi/zfcp_ccw.c
+++ b/drivers/s390/scsi/zfcp_ccw.c
@@ -176,6 +176,11 @@ static int zfcp_ccw_notify(struct ccw_device *ccw_device, int event)
                 zfcp_erp_adapter_reopen(adapter, ZFCP_STATUS_COMMON_ERP_FAILED,
                                         "ccnoti4", NULL);
                 break;
+        case CIO_BOXED:
+                dev_warn(&adapter->ccw_device->dev,
+                         "The ccw device did not respond in time.\n");
+                zfcp_erp_adapter_shutdown(adapter, 0, "ccnoti5", NULL);
+                break;
         }
         return 1;
 }
diff --git a/drivers/scsi/scsi_devinfo.c b/drivers/scsi/scsi_devinfo.c
index 099b5455bbce..b13481369642 100644
--- a/drivers/scsi/scsi_devinfo.c
+++ b/drivers/scsi/scsi_devinfo.c
@@ -596,8 +596,6 @@ int __init scsi_init_devinfo(void)
                 error = -ENOMEM;
                 goto out;
         }
-
-        p->owner = THIS_MODULE;
 #endif /* CONFIG_SCSI_PROC_FS */
 
  out:
diff --git a/drivers/scsi/scsi_proc.c b/drivers/scsi/scsi_proc.c
index 82f7b2dd08a2..77fbddb507fd 100644
--- a/drivers/scsi/scsi_proc.c
+++ b/drivers/scsi/scsi_proc.c
@@ -115,8 +115,6 @@ void scsi_proc_hostdir_add(struct scsi_host_template *sht)
                 if (!sht->proc_dir)
                         printk(KERN_ERR "%s: proc_mkdir failed for %s\n",
                                __func__, sht->proc_name);
-                else
-                        sht->proc_dir->owner = sht->module;
         }
         mutex_unlock(&global_host_template_mutex);
 }
@@ -163,7 +161,6 @@ void scsi_proc_host_add(struct Scsi_Host *shost)
         } 
 
         p->write_proc = proc_scsi_write_proc;
-        p->owner = sht->module;
 }
 
 /**
diff --git a/drivers/serial/serial_core.c b/drivers/serial/serial_core.c
index 42f4e66fccaf..b0bb29d804ae 100644
--- a/drivers/serial/serial_core.c
+++ b/drivers/serial/serial_core.c
@@ -27,6 +27,8 @@
 #include <linux/slab.h>
 #include <linux/init.h>
 #include <linux/console.h>
+#include <linux/proc_fs.h>
+#include <linux/seq_file.h>
 #include <linux/serial_core.h>
 #include <linux/smp_lock.h>
 #include <linux/device.h>
@@ -1682,20 +1684,20 @@ static const char *uart_type(struct uart_port *port)
 
 #ifdef CONFIG_PROC_FS
 
-static int uart_line_info(char *buf, struct uart_driver *drv, int i)
+static void uart_line_info(struct seq_file *m, struct uart_driver *drv, int i)
 {
         struct uart_state *state = drv->state + i;
         int pm_state;
         struct uart_port *port = state->port;
         char stat_buf[32];
         unsigned int status;
-        int mmio, ret;
+        int mmio;
 
         if (!port)
-                return 0;
+                return;
 
         mmio = port->iotype >= UPIO_MEM;
-        ret = sprintf(buf, "%d: uart:%s %s%08llX irq:%d",
+        seq_printf(m, "%d: uart:%s %s%08llX irq:%d",
                         port->line, uart_type(port),
                         mmio ? "mmio:0x" : "port:",
                         mmio ? (unsigned long long)port->mapbase
@@ -1703,8 +1705,8 @@ static int uart_line_info(char *buf, struct uart_driver *drv, int i)
                         port->irq);
 
         if (port->type == PORT_UNKNOWN) {
-                strcat(buf, "\n");
-                return ret + 1;
+                seq_putc(m, '\n');
+                return;
         }
 
         if (capable(CAP_SYS_ADMIN)) {
@@ -1719,19 +1721,19 @@ static int uart_line_info(char *buf, struct uart_driver *drv, int i)
                         uart_change_pm(state, pm_state);
                 mutex_unlock(&state->mutex);
 
-                ret += sprintf(buf + ret, " tx:%d rx:%d",
+                seq_printf(m, " tx:%d rx:%d",
                                 port->icount.tx, port->icount.rx);
                 if (port->icount.frame)
-                        ret += sprintf(buf + ret, " fe:%d",
+                        seq_printf(m, " fe:%d",
                                 port->icount.frame);
                 if (port->icount.parity)
-                        ret += sprintf(buf + ret, " pe:%d",
+                        seq_printf(m, " pe:%d",
                                 port->icount.parity);
                 if (port->icount.brk)
-                        ret += sprintf(buf + ret, " brk:%d",
+                        seq_printf(m, " brk:%d",
                                 port->icount.brk);
                 if (port->icount.overrun)
-                        ret += sprintf(buf + ret, " oe:%d",
+                        seq_printf(m, " oe:%d",
                                 port->icount.overrun);
 
 #define INFOBIT(bit, str) \
@@ -1753,45 +1755,39 @@ static int uart_line_info(char *buf, struct uart_driver *drv, int i)
                 STATBIT(TIOCM_RNG, "|RI");
                 if (stat_buf[0])
                         stat_buf[0] = ' ';
-                strcat(stat_buf, "\n");
 
-                ret += sprintf(buf + ret, stat_buf);
-        } else {
-                strcat(buf, "\n");
-                ret++;
+                seq_puts(m, stat_buf);
         }
+        seq_putc(m, '\n');
 #undef STATBIT
 #undef INFOBIT
-        return ret;
 }
 
-static int uart_read_proc(char *page, char **start, off_t off,
-                          int count, int *eof, void *data)
+static int uart_proc_show(struct seq_file *m, void *v)
 {
-        struct tty_driver *ttydrv = data;
+        struct tty_driver *ttydrv = m->private;
         struct uart_driver *drv = ttydrv->driver_state;
-        int i, len = 0, l;
-        off_t begin = 0;
+        int i;
 
-        len += sprintf(page, "serinfo:1.0 driver%s%s revision:%s\n",
+        seq_printf(m, "serinfo:1.0 driver%s%s revision:%s\n",
                         "", "", "");
-        for (i = 0; i < drv->nr && len < PAGE_SIZE - 96; i++) {
-                l = uart_line_info(page + len, drv, i);
-                len += l;
-                if (len + begin > off + count)
-                        goto done;
-                if (len + begin < off) {
-                        begin += len;
-                        len = 0;
-                }
-        }
-        *eof = 1;
- done:
-        if (off >= len + begin)
-                return 0;
-        *start = page + (off - begin);
-        return (count < begin + len - off) ? count : (begin + len - off);
+        for (i = 0; i < drv->nr; i++)
+                uart_line_info(m, drv, i);
+        return 0;
 }
+
+static int uart_proc_open(struct inode *inode, struct file *file)
+{
+        return single_open(file, uart_proc_show, PDE(inode)->data);
+}
+
+static const struct file_operations uart_proc_fops = {
+        .owner          = THIS_MODULE,
+        .open           = uart_proc_open,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+        .release        = single_release,
+};
 #endif
 
 #if defined(CONFIG_SERIAL_CORE_CONSOLE) || defined(CONFIG_CONSOLE_POLL)
@@ -2299,7 +2295,7 @@ static const struct tty_operations uart_ops = {
         .break_ctl      = uart_break_ctl,
         .wait_until_sent= uart_wait_until_sent,
 #ifdef CONFIG_PROC_FS
-        .read_proc      = uart_read_proc,
+        .proc_fops      = &uart_proc_fops,
 #endif
         .tiocmget       = uart_tiocmget,
         .tiocmset       = uart_tiocmset,
diff --git a/drivers/spi/spi_mpc83xx.c b/drivers/spi/spi_mpc83xx.c
index 44a2b46ccb79..f4573a96af24 100644
--- a/drivers/spi/spi_mpc83xx.c
+++ b/drivers/spi/spi_mpc83xx.c
@@ -14,6 +14,8 @@
 #include <linux/init.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
+#include <linux/errno.h>
+#include <linux/err.h>
 #include <linux/completion.h>
 #include <linux/interrupt.h>
 #include <linux/delay.h>
@@ -23,7 +25,13 @@
 #include <linux/spi/spi_bitbang.h>
 #include <linux/platform_device.h>
 #include <linux/fsl_devices.h>
+#include <linux/of.h>
+#include <linux/of_platform.h>
+#include <linux/gpio.h>
+#include <linux/of_gpio.h>
+#include <linux/of_spi.h>
 
+#include <sysdev/fsl_soc.h>
 #include <asm/irq.h>
 #include <asm/io.h>
 
@@ -79,7 +87,7 @@ struct mpc83xx_spi {
         u32(*get_tx) (struct mpc83xx_spi *);
 
         unsigned int count;
-        int irq;
+        unsigned int irq;
 
         unsigned nsecs;         /* (clock cycle time)/2 */
 
@@ -89,9 +97,6 @@ struct mpc83xx_spi {
 
         bool qe_mode;
 
-        void (*activate_cs) (u8 cs, u8 polarity);
-        void (*deactivate_cs) (u8 cs, u8 polarity);
-
         u8 busy;
 
         struct workqueue_struct *workqueue;
@@ -123,6 +128,7 @@ static inline u32 mpc83xx_spi_read_reg(__be32 __iomem * reg)
 }
 
 #define MPC83XX_SPI_RX_BUF(type)                                          \
+static                                                                    \
 void mpc83xx_spi_rx_buf_##type(u32 data, struct mpc83xx_spi *mpc83xx_spi) \
 {                                                                         \
         type * rx = mpc83xx_spi->rx;                                      \
@@ -131,6 +137,7 @@ void mpc83xx_spi_rx_buf_##type(u32 data, struct mpc83xx_spi *mpc83xx_spi) \
 }
 
 #define MPC83XX_SPI_TX_BUF(type)                                \
+static                                                          \
 u32 mpc83xx_spi_tx_buf_##type(struct mpc83xx_spi *mpc83xx_spi)  \
 {                                                               \
         u32 data;                                               \
@@ -151,15 +158,14 @@ MPC83XX_SPI_TX_BUF(u32)
 
 static void mpc83xx_spi_chipselect(struct spi_device *spi, int value)
 {
-        struct mpc83xx_spi *mpc83xx_spi;
-        u8 pol = spi->mode & SPI_CS_HIGH ? 1 : 0;
+        struct mpc83xx_spi *mpc83xx_spi = spi_master_get_devdata(spi->master);
+        struct fsl_spi_platform_data *pdata = spi->dev.parent->platform_data;
+        bool pol = spi->mode & SPI_CS_HIGH;
         struct spi_mpc83xx_cs   *cs = spi->controller_state;
 
-        mpc83xx_spi = spi_master_get_devdata(spi->master);
-
         if (value == BITBANG_CS_INACTIVE) {
-                if (mpc83xx_spi->deactivate_cs)
-                        mpc83xx_spi->deactivate_cs(spi->chip_select, pol);
+                if (pdata->cs_control)
+                        pdata->cs_control(spi, !pol);
         }
 
         if (value == BITBANG_CS_ACTIVE) {
@@ -172,7 +178,7 @@ static void mpc83xx_spi_chipselect(struct spi_device *spi, int value)
 
                 if (cs->hw_mode != regval) {
                         unsigned long flags;
-                        void *tmp_ptr = &mpc83xx_spi->base->mode;
+                        __be32 __iomem *mode = &mpc83xx_spi->base->mode;
 
                         regval = cs->hw_mode;
                         /* Turn off IRQs locally to minimize time that
@@ -180,12 +186,12 @@ static void mpc83xx_spi_chipselect(struct spi_device *spi, int value)
                          */
                         local_irq_save(flags);
                         /* Turn off SPI unit prior changing mode */
-                        mpc83xx_spi_write_reg(tmp_ptr, regval & ~SPMODE_ENABLE);
-                        mpc83xx_spi_write_reg(tmp_ptr, regval);
+                        mpc83xx_spi_write_reg(mode, regval & ~SPMODE_ENABLE);
+                        mpc83xx_spi_write_reg(mode, regval);
                         local_irq_restore(flags);
                 }
-                if (mpc83xx_spi->activate_cs)
-                        mpc83xx_spi->activate_cs(spi->chip_select, pol);
+                if (pdata->cs_control)
+                        pdata->cs_control(spi, pol);
         }
 }
 
@@ -284,7 +290,7 @@ int mpc83xx_spi_setup_transfer(struct spi_device *spi, struct spi_transfer *t)
         regval =  mpc83xx_spi_read_reg(&mpc83xx_spi->base->mode);
         if (cs->hw_mode != regval) {
                 unsigned long flags;
-                void *tmp_ptr = &mpc83xx_spi->base->mode;
+                __be32 __iomem *mode = &mpc83xx_spi->base->mode;
 
                 regval = cs->hw_mode;
                 /* Turn off IRQs locally to minimize time
@@ -292,8 +298,8 @@ int mpc83xx_spi_setup_transfer(struct spi_device *spi, struct spi_transfer *t)
                  */
                 local_irq_save(flags);
                 /* Turn off SPI unit prior changing mode */
-                mpc83xx_spi_write_reg(tmp_ptr, regval & ~SPMODE_ENABLE);
-                mpc83xx_spi_write_reg(tmp_ptr, regval);
+                mpc83xx_spi_write_reg(mode, regval & ~SPMODE_ENABLE);
+                mpc83xx_spi_write_reg(mode, regval);
                 local_irq_restore(flags);
         }
         return 0;
@@ -483,7 +489,7 @@ static int mpc83xx_spi_setup(struct spi_device *spi)
         return 0;
 }
 
-irqreturn_t mpc83xx_spi_irq(s32 irq, void *context_data)
+static irqreturn_t mpc83xx_spi_irq(s32 irq, void *context_data)
 {
         struct mpc83xx_spi *mpc83xx_spi = context_data;
         u32 event;
@@ -545,43 +551,28 @@ static void mpc83xx_spi_cleanup(struct spi_device *spi)
         kfree(spi->controller_state);
 }
 
-static int __init mpc83xx_spi_probe(struct platform_device *dev)
+static struct spi_master * __devinit
+mpc83xx_spi_probe(struct device *dev, struct resource *mem, unsigned int irq)
 {
+        struct fsl_spi_platform_data *pdata = dev->platform_data;
         struct spi_master *master;
         struct mpc83xx_spi *mpc83xx_spi;
-        struct fsl_spi_platform_data *pdata;
-        struct resource *r;
         u32 regval;
         int ret = 0;
 
-        /* Get resources(memory, IRQ) associated with the device */
-        master = spi_alloc_master(&dev->dev, sizeof(struct mpc83xx_spi));
-
+        master = spi_alloc_master(dev, sizeof(struct mpc83xx_spi));
         if (master == NULL) {
                 ret = -ENOMEM;
                 goto err;
         }
 
-        platform_set_drvdata(dev, master);
-        pdata = dev->dev.platform_data;
+        dev_set_drvdata(dev, master);
 
-        if (pdata == NULL) {
-                ret = -ENODEV;
-                goto free_master;
-        }
-
-        r = platform_get_resource(dev, IORESOURCE_MEM, 0);
-        if (r == NULL) {
-                ret = -ENODEV;
-                goto free_master;
-        }
         master->setup = mpc83xx_spi_setup;
         master->transfer = mpc83xx_spi_transfer;
         master->cleanup = mpc83xx_spi_cleanup;
 
         mpc83xx_spi = spi_master_get_devdata(master);
-        mpc83xx_spi->activate_cs = pdata->activate_cs;
-        mpc83xx_spi->deactivate_cs = pdata->deactivate_cs;
         mpc83xx_spi->qe_mode = pdata->qe_mode;
         mpc83xx_spi->get_rx = mpc83xx_spi_rx_buf_u8;
         mpc83xx_spi->get_tx = mpc83xx_spi_tx_buf_u8;
@@ -596,18 +587,13 @@ static int __init mpc83xx_spi_probe(struct platform_device *dev)
 
         init_completion(&mpc83xx_spi->done);
 
-        mpc83xx_spi->base = ioremap(r->start, r->end - r->start + 1);
+        mpc83xx_spi->base = ioremap(mem->start, mem->end - mem->start + 1);
         if (mpc83xx_spi->base == NULL) {
                 ret = -ENOMEM;
                 goto put_master;
         }
 
-        mpc83xx_spi->irq = platform_get_irq(dev, 0);
-
-        if (mpc83xx_spi->irq < 0) {
-                ret = -ENXIO;
-                goto unmap_io;
-        }
+        mpc83xx_spi->irq = irq;
 
         /* Register for SPI Interrupt */
         ret = request_irq(mpc83xx_spi->irq, mpc83xx_spi_irq,
@@ -649,9 +635,9 @@ static int __init mpc83xx_spi_probe(struct platform_device *dev)
 
         printk(KERN_INFO
                "%s: MPC83xx SPI Controller driver at 0x%p (irq = %d)\n",
-               dev_name(&dev->dev), mpc83xx_spi->base, mpc83xx_spi->irq);
+               dev_name(dev), mpc83xx_spi->base, mpc83xx_spi->irq);
 
-        return ret;
+        return master;
 
 unreg_master:
         destroy_workqueue(mpc83xx_spi->workqueue);
@@ -661,18 +647,16 @@ unmap_io:
         iounmap(mpc83xx_spi->base);
 put_master:
         spi_master_put(master);
-free_master:
-        kfree(master);
 err:
-        return ret;
+        return ERR_PTR(ret);
 }
 
-static int __exit mpc83xx_spi_remove(struct platform_device *dev)
+static int __devexit mpc83xx_spi_remove(struct device *dev)
 {
         struct mpc83xx_spi *mpc83xx_spi;
         struct spi_master *master;
 
-        master = platform_get_drvdata(dev);
+        master = dev_get_drvdata(dev);
         mpc83xx_spi = spi_master_get_devdata(master);
 
         flush_workqueue(mpc83xx_spi->workqueue);
@@ -685,23 +669,293 @@ static int __exit mpc83xx_spi_remove(struct platform_device *dev)
         return 0;
 }
 
+struct mpc83xx_spi_probe_info {
+        struct fsl_spi_platform_data pdata;
+        int *gpios;
+        bool *alow_flags;
+};
+
+static struct mpc83xx_spi_probe_info *
+to_of_pinfo(struct fsl_spi_platform_data *pdata)
+{
+        return container_of(pdata, struct mpc83xx_spi_probe_info, pdata);
+}
+
+static void mpc83xx_spi_cs_control(struct spi_device *spi, bool on)
+{
+        struct device *dev = spi->dev.parent;
+        struct mpc83xx_spi_probe_info *pinfo = to_of_pinfo(dev->platform_data);
+        u16 cs = spi->chip_select;
+        int gpio = pinfo->gpios[cs];
+        bool alow = pinfo->alow_flags[cs];
+
+        gpio_set_value(gpio, on ^ alow);
+}
+
+static int of_mpc83xx_spi_get_chipselects(struct device *dev)
+{
+        struct device_node *np = dev_archdata_get_node(&dev->archdata);
+        struct fsl_spi_platform_data *pdata = dev->platform_data;
+        struct mpc83xx_spi_probe_info *pinfo = to_of_pinfo(pdata);
+        unsigned int ngpios;
+        int i = 0;
+        int ret;
+
+        ngpios = of_gpio_count(np);
+        if (!ngpios) {
+                /*
+                 * SPI w/o chip-select line. One SPI device is still permitted
+                 * though.
+                 */
+                pdata->max_chipselect = 1;
+                return 0;
+        }
+
+        pinfo->gpios = kmalloc(ngpios * sizeof(pinfo->gpios), GFP_KERNEL);
+        if (!pinfo->gpios)
+                return -ENOMEM;
+        memset(pinfo->gpios, -1, ngpios * sizeof(pinfo->gpios));
+
+        pinfo->alow_flags = kzalloc(ngpios * sizeof(pinfo->alow_flags),
+                                    GFP_KERNEL);
+        if (!pinfo->alow_flags) {
+                ret = -ENOMEM;
+                goto err_alloc_flags;
+        }
+
+        for (; i < ngpios; i++) {
+                int gpio;
+                enum of_gpio_flags flags;
+
+                gpio = of_get_gpio_flags(np, i, &flags);
+                if (!gpio_is_valid(gpio)) {
+                        dev_err(dev, "invalid gpio #%d: %d\n", i, gpio);
+                        goto err_loop;
+                }
+
+                ret = gpio_request(gpio, dev_name(dev));
+                if (ret) {
+                        dev_err(dev, "can't request gpio #%d: %d\n", i, ret);
+                        goto err_loop;
+                }
+
+                pinfo->gpios[i] = gpio;
+                pinfo->alow_flags[i] = flags & OF_GPIO_ACTIVE_LOW;
+
+                ret = gpio_direction_output(pinfo->gpios[i],
+                                            pinfo->alow_flags[i]);
+                if (ret) {
+                        dev_err(dev, "can't set output direction for gpio "
+                                "#%d: %d\n", i, ret);
+                        goto err_loop;
+                }
+        }
+
+        pdata->max_chipselect = ngpios;
+        pdata->cs_control = mpc83xx_spi_cs_control;
+
+        return 0;
+
+err_loop:
+        while (i >= 0) {
+                if (gpio_is_valid(pinfo->gpios[i]))
+                        gpio_free(pinfo->gpios[i]);
+                i--;
+        }
+
+        kfree(pinfo->alow_flags);
+        pinfo->alow_flags = NULL;
+err_alloc_flags:
+        kfree(pinfo->gpios);
+        pinfo->gpios = NULL;
+        return ret;
+}
+
+static int of_mpc83xx_spi_free_chipselects(struct device *dev)
+{
+        struct fsl_spi_platform_data *pdata = dev->platform_data;
+        struct mpc83xx_spi_probe_info *pinfo = to_of_pinfo(pdata);
+        int i;
+
+        if (!pinfo->gpios)
+                return 0;
+
+        for (i = 0; i < pdata->max_chipselect; i++) {
+                if (gpio_is_valid(pinfo->gpios[i]))
+                        gpio_free(pinfo->gpios[i]);
+        }
+
+        kfree(pinfo->gpios);
+        kfree(pinfo->alow_flags);
+        return 0;
+}
+
+static int __devinit of_mpc83xx_spi_probe(struct of_device *ofdev,
+                                          const struct of_device_id *ofid)
+{
+        struct device *dev = &ofdev->dev;
+        struct device_node *np = ofdev->node;
+        struct mpc83xx_spi_probe_info *pinfo;
+        struct fsl_spi_platform_data *pdata;
+        struct spi_master *master;
+        struct resource mem;
+        struct resource irq;
+        const void *prop;
+        int ret = -ENOMEM;
+
+        pinfo = kzalloc(sizeof(*pinfo), GFP_KERNEL);
+        if (!pinfo)
+                return -ENOMEM;
+
+        pdata = &pinfo->pdata;
+        dev->platform_data = pdata;
+
+        /* Allocate bus num dynamically. */
+        pdata->bus_num = -1;
+
+        /* SPI controller is either clocked from QE or SoC clock. */
+        pdata->sysclk = get_brgfreq();
+        if (pdata->sysclk == -1) {
+                pdata->sysclk = fsl_get_sys_freq();
+                if (pdata->sysclk == -1) {
+                        ret = -ENODEV;
+                        goto err_clk;
+                }
+        }
+
+        prop = of_get_property(np, "mode", NULL);
+        if (prop && !strcmp(prop, "cpu-qe"))
+                pdata->qe_mode = 1;
+
+        ret = of_mpc83xx_spi_get_chipselects(dev);
+        if (ret)
+                goto err;
+
+        ret = of_address_to_resource(np, 0, &mem);
+        if (ret)
+                goto err;
+
+        ret = of_irq_to_resource(np, 0, &irq);
+        if (!ret) {
+                ret = -EINVAL;
+                goto err;
+        }
+
+        master = mpc83xx_spi_probe(dev, &mem, irq.start);
+        if (IS_ERR(master)) {
+                ret = PTR_ERR(master);
+                goto err;
+        }
+
+        of_register_spi_devices(master, np);
+
+        return 0;
+
+err:
+        of_mpc83xx_spi_free_chipselects(dev);
+err_clk:
+        kfree(pinfo);
+        return ret;
+}
+
+static int __devexit of_mpc83xx_spi_remove(struct of_device *ofdev)
+{
+        int ret;
+
+        ret = mpc83xx_spi_remove(&ofdev->dev);
+        if (ret)
+                return ret;
+        of_mpc83xx_spi_free_chipselects(&ofdev->dev);
+        return 0;
+}
+
+static const struct of_device_id of_mpc83xx_spi_match[] = {
+        { .compatible = "fsl,spi" },
+        {},
+};
+MODULE_DEVICE_TABLE(of, of_mpc83xx_spi_match);
+
+static struct of_platform_driver of_mpc83xx_spi_driver = {
+        .name           = "mpc83xx_spi",
+        .match_table    = of_mpc83xx_spi_match,
+        .probe          = of_mpc83xx_spi_probe,
+        .remove         = __devexit_p(of_mpc83xx_spi_remove),
+};
+
+#ifdef CONFIG_MPC832x_RDB
+/*
+ *                              XXX XXX XXX
+ * This is "legacy" platform driver, was used by the MPC8323E-RDB boards
+ * only. The driver should go away soon, since newer MPC8323E-RDB's device
+ * tree can work with OpenFirmware driver. But for now we support old trees
+ * as well.
+ */
+static int __devinit plat_mpc83xx_spi_probe(struct platform_device *pdev)
+{
+        struct resource *mem;
+        unsigned int irq;
+        struct spi_master *master;
+
+        if (!pdev->dev.platform_data)
+                return -EINVAL;
+
+        mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        if (!mem)
+                return -EINVAL;
+
+        irq = platform_get_irq(pdev, 0);
+        if (!irq)
+                return -EINVAL;
+
+        master = mpc83xx_spi_probe(&pdev->dev, mem, irq);
+        if (IS_ERR(master))
+                return PTR_ERR(master);
+        return 0;
+}
+
+static int __devexit plat_mpc83xx_spi_remove(struct platform_device *pdev)
+{
+        return mpc83xx_spi_remove(&pdev->dev);
+}
+
 MODULE_ALIAS("platform:mpc83xx_spi");
 static struct platform_driver mpc83xx_spi_driver = {
-        .remove = __exit_p(mpc83xx_spi_remove),
+        .probe = plat_mpc83xx_spi_probe,
+        .remove = __exit_p(plat_mpc83xx_spi_remove),
         .driver = {
                 .name = "mpc83xx_spi",
                 .owner = THIS_MODULE,
         },
 };
 
+static bool legacy_driver_failed;
+
+static void __init legacy_driver_register(void)
+{
+        legacy_driver_failed = platform_driver_register(&mpc83xx_spi_driver);
+}
+
+static void __exit legacy_driver_unregister(void)
+{
+        if (legacy_driver_failed)
+                return;
+        platform_driver_unregister(&mpc83xx_spi_driver);
+}
+#else
+static void __init legacy_driver_register(void) {}
+static void __exit legacy_driver_unregister(void) {}
+#endif /* CONFIG_MPC832x_RDB */
+
 static int __init mpc83xx_spi_init(void)
 {
-        return platform_driver_probe(&mpc83xx_spi_driver, mpc83xx_spi_probe);
+        legacy_driver_register();
+        return of_register_platform_driver(&of_mpc83xx_spi_driver);
 }
 
 static void __exit mpc83xx_spi_exit(void)
 {
-        platform_driver_unregister(&mpc83xx_spi_driver);
+        of_unregister_platform_driver(&of_mpc83xx_spi_driver);
+        legacy_driver_unregister();
 }
 
 module_init(mpc83xx_spi_init);
diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c
index 742a5bc44be8..2a70563bbee1 100644
--- a/drivers/usb/serial/usb-serial.c
+++ b/drivers/usb/serial/usb-serial.c
@@ -26,6 +26,7 @@
 #include <linux/tty_flip.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
+#include <linux/seq_file.h>
 #include <linux/spinlock.h>
 #include <linux/mutex.h>
 #include <linux/list.h>
@@ -421,57 +422,52 @@ static int serial_break(struct tty_struct *tty, int break_state)
         return 0;
 }
 
-static int serial_read_proc(char *page, char **start, off_t off, int count,
-                                                        int *eof, void *data)
+static int serial_proc_show(struct seq_file *m, void *v)
 {
         struct usb_serial *serial;
-        int length = 0;
         int i;
-        off_t begin = 0;
         char tmp[40];
 
         dbg("%s", __func__);
-        length += sprintf(page, "usbserinfo:1.0 driver:2.0\n");
-        for (i = 0; i < SERIAL_TTY_MINORS && length < PAGE_SIZE; ++i) {
+        seq_puts(m, "usbserinfo:1.0 driver:2.0\n");
+        for (i = 0; i < SERIAL_TTY_MINORS; ++i) {
                 serial = usb_serial_get_by_index(i);
                 if (serial == NULL)
                         continue;
 
-                length += sprintf(page+length, "%d:", i);
+                seq_printf(m, "%d:", i);
                 if (serial->type->driver.owner)
-                        length += sprintf(page+length, " module:%s",
+                        seq_printf(m, " module:%s",
                                 module_name(serial->type->driver.owner));
-                length += sprintf(page+length, " name:\"%s\"",
+                seq_printf(m, " name:\"%s\"",
                                 serial->type->description);
-                length += sprintf(page+length, " vendor:%04x product:%04x",
+                seq_printf(m, " vendor:%04x product:%04x",
                         le16_to_cpu(serial->dev->descriptor.idVendor),
                         le16_to_cpu(serial->dev->descriptor.idProduct));
-                length += sprintf(page+length, " num_ports:%d",
-                                                        serial->num_ports);
-                length += sprintf(page+length, " port:%d",
-                                                        i - serial->minor + 1);
+                seq_printf(m, " num_ports:%d", serial->num_ports);
+                seq_printf(m, " port:%d", i - serial->minor + 1);
                 usb_make_path(serial->dev, tmp, sizeof(tmp));
-                length += sprintf(page+length, " path:%s", tmp);
+                seq_printf(m, " path:%s", tmp);
 
-                length += sprintf(page+length, "\n");
-                if ((length + begin) > (off + count)) {
-                        usb_serial_put(serial);
-                        goto done;
-                }
-                if ((length + begin) < off) {
-                        begin += length;
-                        length = 0;
-                }
+                seq_putc(m, '\n');
                 usb_serial_put(serial);
         }
-        *eof = 1;
-done:
-        if (off >= (length + begin))
-                return 0;
-        *start = page + (off-begin);
-        return (count < begin+length-off) ? count : begin+length-off;
+        return 0;
 }
 
+static int serial_proc_open(struct inode *inode, struct file *file)
+{
+        return single_open(file, serial_proc_show, NULL);
+}
+
+static const struct file_operations serial_proc_fops = {
+        .owner          = THIS_MODULE,
+        .open           = serial_proc_open,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+        .release        = single_release,
+};
+
 static int serial_tiocmget(struct tty_struct *tty, struct file *file)
 {
         struct usb_serial_port *port = tty->driver_data;
@@ -1113,9 +1109,9 @@ static const struct tty_operations serial_ops = {
         .unthrottle =           serial_unthrottle,
         .break_ctl =            serial_break,
         .chars_in_buffer =      serial_chars_in_buffer,
-        .read_proc =            serial_read_proc,
         .tiocmget =             serial_tiocmget,
         .tiocmset =             serial_tiocmset,
+        .proc_fops =            &serial_proc_fops,
 };
 
 struct tty_driver *usb_serial_tty_driver;
diff --git a/drivers/video/68328fb.c b/drivers/video/68328fb.c
index 7f907fb23b8a..0b17824b0eb5 100644
--- a/drivers/video/68328fb.c
+++ b/drivers/video/68328fb.c
@@ -471,9 +471,11 @@ int __init mc68x328fb_init(void)
         fb_info.pseudo_palette = &mc68x328fb_pseudo_palette;
         fb_info.flags = FBINFO_DEFAULT | FBINFO_HWACCEL_YPAN;
 
-        fb_alloc_cmap(&fb_info.cmap, 256, 0);
+        if (fb_alloc_cmap(&fb_info.cmap, 256, 0))
+                return -ENOMEM;
 
         if (register_framebuffer(&fb_info) < 0) {
+                fb_dealloc_cmap(&fb_info.cmap);
                 return -EINVAL;
         }
 
@@ -494,6 +496,7 @@ module_init(mc68x328fb_init);
 static void __exit mc68x328fb_cleanup(void)
 {
         unregister_framebuffer(&fb_info);
+        fb_dealloc_cmap(&fb_info.cmap);
 }
 
 module_exit(mc68x328fb_cleanup);
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 41c27a44bd82..ffe2f2796e29 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -1597,32 +1597,8 @@ config FB_VT8623
           Driver for CastleRock integrated graphics core in the
           VIA VT8623 [Apollo CLE266] chipset.
 
-config FB_CYBLA
-        tristate "Cyberblade/i1 support"
-        depends on FB && PCI && X86_32 && !64BIT
-        select FB_CFB_IMAGEBLIT
-        ---help---
-          This driver is supposed to support the Trident Cyberblade/i1
-          graphics core integrated in the VIA VT8601A North Bridge,
-          also known as VIA Apollo PLE133.
-
-          Status:
-           - Developed, tested and working on EPIA 5000 and EPIA 800.
-           - Does work reliable on all systems with CRT/LCD connected to
-             normal VGA ports.
-           - Should work on systems that do use the internal LCD port, but
-             this is absolutely not tested.
-
-          Character imageblit, copyarea and rectangle fill are hw accelerated,
-          ypan scrolling is used by default.
-
-          Please do read <file:Documentation/fb/cyblafb/*>.
-
-          To compile this driver as a module, choose M here: the
-          module will be called cyblafb.
-
 config FB_TRIDENT
-        tristate "Trident support"
+        tristate "Trident/CyberXXX/CyberBlade support"
         depends on FB && PCI
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
@@ -1633,21 +1609,14 @@ config FB_TRIDENT
           and Blade XP.
           There are also integrated versions of these chips called CyberXXXX,
           CyberImage or CyberBlade. These chips are mostly found in laptops
-          but also on some motherboards. For more information, read
-          <file:Documentation/fb/tridentfb.txt>
+          but also on some motherboards including early VIA EPIA motherboards.
+          For more information, read <file:Documentation/fb/tridentfb.txt>
 
           Say Y if you have such a graphics board.
 
           To compile this driver as a module, choose M here: the
           module will be called tridentfb.
 
-config FB_TRIDENT_ACCEL
-        bool "Trident Acceleration functions (EXPERIMENTAL)"
-        depends on FB_TRIDENT && EXPERIMENTAL
-        ---help---
-        This will compile the Trident frame buffer device with
-        acceleration functions.
-
 config FB_ARK
         tristate "ARK 2000PV support"
         depends on FB && PCI
@@ -1920,6 +1889,30 @@ config FB_TMIO_ACCELL
         depends on FB_TMIO
         default y
 
+config FB_S3C
+        tristate "Samsung S3C framebuffer support"
+        depends on FB && ARCH_S3C64XX
+        select FB_CFB_FILLRECT
+        select FB_CFB_COPYAREA
+        select FB_CFB_IMAGEBLIT
+        ---help---
+          Frame buffer driver for the built-in FB controller in the Samsung
+          SoC line from the S3C2443 onwards, including the S3C2416, S3C2450,
+          and the S3C64XX series such as the S3C6400 and S3C6410.
+
+          These chips all have the same basic framebuffer design with the
+          actual capabilities depending on the chip. For instance the S3C6400
+          and S3C6410 support 4 hardware windows whereas the S3C24XX series
+          currently only have two.
+
+          Currently the support is only for the S3C6400 and S3C6410 SoCs.
+
+config FB_S3C_DEBUG_REGWRITE
+       bool "Debug register writes"
+       depends on FB_S3C
+       ---help---
+         Show all register writes via printk(KERN_DEBUG)
+
 config FB_S3C2410
         tristate "S3C2410 LCD framebuffer support"
         depends on FB && ARCH_S3C2410
diff --git a/drivers/video/Makefile b/drivers/video/Makefile
index bb265eca7d57..0dbd6c68d76b 100644
--- a/drivers/video/Makefile
+++ b/drivers/video/Makefile
@@ -76,6 +76,7 @@ obj-$(CONFIG_FB_ATARI)            += atafb.o c2p_iplan2.o atafb_mfb.o \
                                      atafb_iplan2p2.o atafb_iplan2p4.o atafb_iplan2p8.o
 obj-$(CONFIG_FB_MAC)              += macfb.o
 obj-$(CONFIG_FB_HECUBA)           += hecubafb.o
+obj-$(CONFIG_FB_N411)             += n411.o
 obj-$(CONFIG_FB_HGA)              += hgafb.o
 obj-$(CONFIG_FB_XVR500)           += sunxvr500.o
 obj-$(CONFIG_FB_XVR2500)          += sunxvr2500.o
@@ -110,6 +111,7 @@ obj-$(CONFIG_FB_BROADSHEET)       += broadsheetfb.o
 obj-$(CONFIG_FB_S1D13XXX)         += s1d13xxxfb.o
 obj-$(CONFIG_FB_SH7760)           += sh7760fb.o
 obj-$(CONFIG_FB_IMX)              += imxfb.o
+obj-$(CONFIG_FB_S3C)              += s3c-fb.o
 obj-$(CONFIG_FB_S3C2410)          += s3c2410fb.o
 obj-$(CONFIG_FB_FSL_DIU)          += fsl-diu-fb.o
 obj-$(CONFIG_FB_COBALT)           += cobalt_lcdfb.o
diff --git a/drivers/video/amba-clcd.c b/drivers/video/amba-clcd.c
index 4e046fed1380..61050ab14128 100644
--- a/drivers/video/amba-clcd.c
+++ b/drivers/video/amba-clcd.c
@@ -408,7 +408,9 @@ static int clcdfb_register(struct clcd_fb *fb)
         /*
          * Allocate colourmap.
          */
-        fb_alloc_cmap(&fb->fb.cmap, 256, 0);
+        ret = fb_alloc_cmap(&fb->fb.cmap, 256, 0);
+        if (ret)
+                goto unmap;
 
         /*
          * Ensure interrupts are disabled.
@@ -426,6 +428,8 @@ static int clcdfb_register(struct clcd_fb *fb)
 
         printk(KERN_ERR "CLCD: cannot register framebuffer (%d)\n", ret);
 
+        fb_dealloc_cmap(&fb->fb.cmap);
+ unmap:
         iounmap(fb->regs);
  free_clk:
         clk_put(fb->clk);
@@ -485,6 +489,8 @@ static int clcdfb_remove(struct amba_device *dev)
 
         clcdfb_disable(fb);
         unregister_framebuffer(&fb->fb);
+        if (fb->fb.cmap.len)
+                fb_dealloc_cmap(&fb->fb.cmap);
         iounmap(fb->regs);
         clk_put(fb->clk);
 
diff --git a/drivers/video/amifb.c b/drivers/video/amifb.c
index 100f23661465..82bedd7f7789 100644
--- a/drivers/video/amifb.c
+++ b/drivers/video/amifb.c
@@ -2437,7 +2437,9 @@ default_chipset:
                 goto amifb_error;
         }
 
-        fb_alloc_cmap(&fb_info.cmap, 1<<fb_info.var.bits_per_pixel, 0);
+        err = fb_alloc_cmap(&fb_info.cmap, 1<<fb_info.var.bits_per_pixel, 0);
+        if (err)
+                goto amifb_error;
 
         if (register_framebuffer(&fb_info) < 0) {
                 err = -EINVAL;
@@ -2456,7 +2458,8 @@ amifb_error:
 
 static void amifb_deinit(void)
 {
-        fb_dealloc_cmap(&fb_info.cmap);
+        if (fb_info.cmap.len)
+                fb_dealloc_cmap(&fb_info.cmap);
         chipfree();
         if (videomemory)
                 iounmap((void*)videomemory);
diff --git a/drivers/video/arkfb.c b/drivers/video/arkfb.c
index 314d18694b6a..d583bea608fd 100644
--- a/drivers/video/arkfb.c
+++ b/drivers/video/arkfb.c
@@ -470,7 +470,7 @@ static void ark_dac_read_regs(void *data, u8 *code, int count)
 
         while (count != 0)
         {
-                vga_wseq(NULL, 0x1C, regval | (code[0] & 4) ? 0x80 : 0);
+                vga_wseq(NULL, 0x1C, regval | (code[0] & 4 ? 0x80 : 0));
                 code[1] = vga_r(NULL, dac_regs[code[0] & 3]);
                 count--;
                 code += 2;
@@ -485,7 +485,7 @@ static void ark_dac_write_regs(void *data, u8 *code, int count)
 
         while (count != 0)
         {
-                vga_wseq(NULL, 0x1C, regval | (code[0] & 4) ? 0x80 : 0);
+                vga_wseq(NULL, 0x1C, regval | (code[0] & 4 ? 0x80 : 0));
                 vga_w(NULL, dac_regs[code[0] & 3], code[1]);
                 count--;
                 code += 2;
diff --git a/drivers/video/asiliantfb.c b/drivers/video/asiliantfb.c
index 1fd22f460b0f..1a1f946d8fef 100644
--- a/drivers/video/asiliantfb.c
+++ b/drivers/video/asiliantfb.c
@@ -505,19 +505,27 @@ static struct fb_var_screeninfo asiliantfb_var __devinitdata = {
         .vsync_len      = 2,
 };
 
-static void __devinit init_asiliant(struct fb_info *p, unsigned long addr)
+static int __devinit init_asiliant(struct fb_info *p, unsigned long addr)
 {
+        int err;
+
         p->fix                  = asiliantfb_fix;
         p->fix.smem_start       = addr;
         p->var                  = asiliantfb_var;
         p->fbops                = &asiliantfb_ops;
         p->flags                = FBINFO_DEFAULT;
 
-        fb_alloc_cmap(&p->cmap, 256, 0);
+        err = fb_alloc_cmap(&p->cmap, 256, 0);
+        if (err) {
+                printk(KERN_ERR "C&T 69000 fb failed to alloc cmap memory\n");
+                return err;
+        }
 
-        if (register_framebuffer(p) < 0) {
+        err = register_framebuffer(p);
+        if (err < 0) {
                 printk(KERN_ERR "C&T 69000 framebuffer failed to register\n");
-                return;
+                fb_dealloc_cmap(&p->cmap);
+                return err;
         }
 
         printk(KERN_INFO "fb%d: Asiliant 69000 frame buffer (%dK RAM detected)\n",
@@ -532,6 +540,7 @@ asiliantfb_pci_init(struct pci_dev *dp, const struct pci_device_id *ent)
 {
         unsigned long addr, size;
         struct fb_info *p;
+        int err;
 
         if ((dp->resource[0].flags & IORESOURCE_MEM) == 0)
                 return -ENODEV;
@@ -560,7 +569,13 @@ asiliantfb_pci_init(struct pci_dev *dp, const struct pci_device_id *ent)
         pci_write_config_dword(dp, 4, 0x02800083);
         writeb(3, p->screen_base + 0x400784);
 
-        init_asiliant(p, addr);
+        err = init_asiliant(p, addr);
+        if (err) {
+                iounmap(p->screen_base);
+                release_mem_region(addr, size);
+                framebuffer_release(p);
+                return err;
+        }
 
         pci_set_drvdata(dp, p);
         return 0;
@@ -571,6 +586,7 @@ static void __devexit asiliantfb_remove(struct pci_dev *dp)
         struct fb_info *p = pci_get_drvdata(dp);
 
         unregister_framebuffer(p);
+        fb_dealloc_cmap(&p->cmap);
         iounmap(p->screen_base);
         release_mem_region(pci_resource_start(dp, 0), pci_resource_len(dp, 0));
         pci_set_drvdata(dp, NULL);
diff --git a/drivers/video/aty/mach64_accel.c b/drivers/video/aty/mach64_accel.c
index a8f60c33863c..0cc9724e61a2 100644
--- a/drivers/video/aty/mach64_accel.c
+++ b/drivers/video/aty/mach64_accel.c
@@ -39,7 +39,8 @@ void aty_reset_engine(const struct atyfb_par *par)
 {
         /* reset engine */
         aty_st_le32(GEN_TEST_CNTL,
-                aty_ld_le32(GEN_TEST_CNTL, par) & ~GUI_ENGINE_ENABLE, par);
+                aty_ld_le32(GEN_TEST_CNTL, par) &
+                ~(GUI_ENGINE_ENABLE | HWCURSOR_ENABLE), par);
         /* enable engine */
         aty_st_le32(GEN_TEST_CNTL,
                 aty_ld_le32(GEN_TEST_CNTL, par) | GUI_ENGINE_ENABLE, par);
diff --git a/drivers/video/aty/mach64_cursor.c b/drivers/video/aty/mach64_cursor.c
index faf95da8fcbc..04c710804bb0 100644
--- a/drivers/video/aty/mach64_cursor.c
+++ b/drivers/video/aty/mach64_cursor.c
@@ -77,9 +77,13 @@ static int atyfb_cursor(struct fb_info *info, struct fb_cursor *cursor)
         if (par->asleep)
                 return -EPERM;
 
-        /* Hide cursor */
         wait_for_fifo(1, par);
-        aty_st_le32(GEN_TEST_CNTL, aty_ld_le32(GEN_TEST_CNTL, par) & ~HWCURSOR_ENABLE, par);
+        if (cursor->enable)
+                aty_st_le32(GEN_TEST_CNTL, aty_ld_le32(GEN_TEST_CNTL, par)
+                            | HWCURSOR_ENABLE, par);
+        else
+                aty_st_le32(GEN_TEST_CNTL, aty_ld_le32(GEN_TEST_CNTL, par)
+                                & ~HWCURSOR_ENABLE, par);
 
         /* set position */
         if (cursor->set & FB_CUR_SETPOS) {
@@ -109,7 +113,7 @@ static int atyfb_cursor(struct fb_info *info, struct fb_cursor *cursor)
                         y<<=1;
                         h<<=1;
                 }
-                wait_for_fifo(4, par);
+                wait_for_fifo(3, par);
                 aty_st_le32(CUR_OFFSET, (info->fix.smem_len >> 3) + (yoff << 1), par);
                 aty_st_le32(CUR_HORZ_VERT_OFF,
                             ((u32) (64 - h + yoff) << 16) | xoff, par);
@@ -177,11 +181,6 @@ static int atyfb_cursor(struct fb_info *info, struct fb_cursor *cursor)
             }
         }
 
-        if (cursor->enable) {
-                wait_for_fifo(1, par);
-                aty_st_le32(GEN_TEST_CNTL, aty_ld_le32(GEN_TEST_CNTL, par)
-                            | HWCURSOR_ENABLE, par);
-        }
         return 0;
 }
 
diff --git a/drivers/video/aty/radeon_pm.c b/drivers/video/aty/radeon_pm.c
index 1de0c0032468..97a1f095f327 100644
--- a/drivers/video/aty/radeon_pm.c
+++ b/drivers/video/aty/radeon_pm.c
@@ -89,6 +89,9 @@ static struct radeon_device_id radeon_workaround_list[] = {
         BUGFIX("Acer Aspire 2010",
                PCI_VENDOR_ID_AI, 0x0061,
                radeon_pm_off, radeon_reinitialize_M10),
+        BUGFIX("Acer Travelmate 290D/292LMi",
+               PCI_VENDOR_ID_AI, 0x005a,
+               radeon_pm_off, radeon_reinitialize_M10),
         { .ident = NULL }
 };
 
diff --git a/drivers/video/backlight/backlight.c b/drivers/video/backlight/backlight.c
index 157057c79ca3..dd37cbcaf8ce 100644
--- a/drivers/video/backlight/backlight.c
+++ b/drivers/video/backlight/backlight.c
@@ -35,6 +35,8 @@ static int fb_notifier_callback(struct notifier_block *self,
                 return 0;
 
         bd = container_of(self, struct backlight_device, fb_notif);
+        if (!lock_fb_info(evdata->info))
+                return -ENODEV;
         mutex_lock(&bd->ops_lock);
         if (bd->ops)
                 if (!bd->ops->check_fb ||
@@ -47,6 +49,7 @@ static int fb_notifier_callback(struct notifier_block *self,
                         backlight_update_status(bd);
                 }
         mutex_unlock(&bd->ops_lock);
+        unlock_fb_info(evdata->info);
         return 0;
 }
 
diff --git a/drivers/video/backlight/lcd.c b/drivers/video/backlight/lcd.c
index b6449470106c..0bb13df0fa89 100644
--- a/drivers/video/backlight/lcd.c
+++ b/drivers/video/backlight/lcd.c
@@ -40,6 +40,8 @@ static int fb_notifier_callback(struct notifier_block *self,
         if (!ld->ops)
                 return 0;
 
+        if (!lock_fb_info(evdata->info))
+                return -ENODEV;
         mutex_lock(&ld->ops_lock);
         if (!ld->ops->check_fb || ld->ops->check_fb(ld, evdata->info)) {
                 if (event == FB_EVENT_BLANK) {
@@ -51,6 +53,7 @@ static int fb_notifier_callback(struct notifier_block *self,
                 }
         }
         mutex_unlock(&ld->ops_lock);
+        unlock_fb_info(evdata->info);
         return 0;
 }
 
diff --git a/drivers/video/cirrusfb.c b/drivers/video/cirrusfb.c
index a2aa6ddffbe2..d42e385f091c 100644
--- a/drivers/video/cirrusfb.c
+++ b/drivers/video/cirrusfb.c
@@ -34,8 +34,6 @@
  *
  */
 
-#define CIRRUSFB_VERSION "2.0-pre2"
-
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>
@@ -72,20 +70,9 @@
  *
  */
 
-/* enable debug output? */
-/* #define CIRRUSFB_DEBUG 1 */
-
 /* disable runtime assertions? */
 /* #define CIRRUSFB_NDEBUG */
 
-/* debug output */
-#ifdef CIRRUSFB_DEBUG
-#define DPRINTK(fmt, args...) \
-        printk(KERN_DEBUG "%s: " fmt, __func__ , ## args)
-#else
-#define DPRINTK(fmt, args...)
-#endif
-
 /* debugging assertions */
 #ifndef CIRRUSFB_NDEBUG
 #define assert(expr) \
@@ -108,14 +95,15 @@
 /* board types */
 enum cirrus_board {
         BT_NONE = 0,
-        BT_SD64,
-        BT_PICCOLO,
-        BT_PICASSO,
-        BT_SPECTRUM,
+        BT_SD64,        /* GD5434 */
+        BT_PICCOLO,     /* GD5426 */
+        BT_PICASSO,     /* GD5426 or GD5428 */
+        BT_SPECTRUM,    /* GD5426 or GD5428 */
         BT_PICASSO4,    /* GD5446 */
         BT_ALPINE,      /* GD543x/4x */
         BT_GD5480,
-        BT_LAGUNA,      /* GD546x */
+        BT_LAGUNA,      /* GD5462/64 */
+        BT_LAGUNAB,     /* GD5465 */
 };
 
 /*
@@ -150,15 +138,17 @@ static const struct cirrusfb_board_info_rec {
                 .maxclock               = {
                         /* guess */
                         /* the SD64/P4 have a higher max. videoclock */
-                        140000, 140000, 140000, 140000, 140000,
+                        135100, 135100, 85500, 85500, 0
                 },
                 .init_sr07              = true,
                 .init_sr1f              = true,
                 .scrn_start_bit19       = true,
                 .sr07                   = 0xF0,
                 .sr07_1bpp              = 0xF0,
+                .sr07_1bpp_mux          = 0xF6,
                 .sr07_8bpp              = 0xF1,
-                .sr1f                   = 0x20
+                .sr07_8bpp_mux          = 0xF7,
+                .sr1f                   = 0x1E
         },
         [BT_PICCOLO] = {
                 .name                   = "CL Piccolo",
@@ -210,9 +200,11 @@ static const struct cirrusfb_board_info_rec {
                 .init_sr07              = true,
                 .init_sr1f              = false,
                 .scrn_start_bit19       = true,
-                .sr07                   = 0x20,
-                .sr07_1bpp              = 0x20,
-                .sr07_8bpp              = 0x21,
+                .sr07                   = 0xA0,
+                .sr07_1bpp              = 0xA0,
+                .sr07_1bpp_mux          = 0xA6,
+                .sr07_8bpp              = 0xA1,
+                .sr07_8bpp_mux          = 0xA7,
                 .sr1f                   = 0
         },
         [BT_ALPINE] = {
@@ -225,8 +217,8 @@ static const struct cirrusfb_board_info_rec {
                 .init_sr1f              = true,
                 .scrn_start_bit19       = true,
                 .sr07                   = 0xA0,
-                .sr07_1bpp              = 0xA1,
-                .sr07_1bpp_mux          = 0xA7,
+                .sr07_1bpp              = 0xA0,
+                .sr07_1bpp_mux          = 0xA6,
                 .sr07_8bpp              = 0xA1,
                 .sr07_8bpp_mux          = 0xA7,
                 .sr1f                   = 0x1C
@@ -247,8 +239,18 @@ static const struct cirrusfb_board_info_rec {
         [BT_LAGUNA] = {
                 .name                   = "CL Laguna",
                 .maxclock               = {
-                        /* guess */
-                        135100, 135100, 135100, 135100, 135100,
+                        /* taken from X11 code */
+                        170000, 170000, 170000, 170000, 135100,
+                },
+                .init_sr07              = false,
+                .init_sr1f              = false,
+                .scrn_start_bit19       = true,
+        },
+        [BT_LAGUNAB] = {
+                .name                   = "CL Laguna AGP",
+                .maxclock               = {
+                        /* taken from X11 code */
+                        170000, 250000, 170000, 170000, 135100,
                 },
                 .init_sr07              = false,
                 .init_sr1f              = false,
@@ -262,8 +264,8 @@ static const struct cirrusfb_board_info_rec {
 
 static struct pci_device_id cirrusfb_pci_table[] = {
         CHIP(PCI_DEVICE_ID_CIRRUS_5436, BT_ALPINE),
-        CHIP(PCI_DEVICE_ID_CIRRUS_5434_8, BT_ALPINE),
-        CHIP(PCI_DEVICE_ID_CIRRUS_5434_4, BT_ALPINE),
+        CHIP(PCI_DEVICE_ID_CIRRUS_5434_8, BT_SD64),
+        CHIP(PCI_DEVICE_ID_CIRRUS_5434_4, BT_SD64),
         CHIP(PCI_DEVICE_ID_CIRRUS_5430, BT_ALPINE), /* GD-5440 is same id */
         CHIP(PCI_DEVICE_ID_CIRRUS_7543, BT_ALPINE),
         CHIP(PCI_DEVICE_ID_CIRRUS_7548, BT_ALPINE),
@@ -271,7 +273,7 @@ static struct pci_device_id cirrusfb_pci_table[] = {
         CHIP(PCI_DEVICE_ID_CIRRUS_5446, BT_PICASSO4), /* Picasso 4 is 5446 */
         CHIP(PCI_DEVICE_ID_CIRRUS_5462, BT_LAGUNA), /* CL Laguna */
         CHIP(PCI_DEVICE_ID_CIRRUS_5464, BT_LAGUNA), /* CL Laguna 3D */
-        CHIP(PCI_DEVICE_ID_CIRRUS_5465, BT_LAGUNA), /* CL Laguna 3DA*/
+        CHIP(PCI_DEVICE_ID_CIRRUS_5465, BT_LAGUNAB), /* CL Laguna 3DA*/
         { 0, }
 };
 MODULE_DEVICE_TABLE(pci, cirrusfb_pci_table);
@@ -326,10 +328,6 @@ static const struct {
 };
 #endif /* CONFIG_ZORRO */
 
-struct cirrusfb_regs {
-        int multiplexing;
-};
-
 #ifdef CIRRUSFB_DEBUG
 enum cirrusfb_dbg_reg_class {
         CRT,
@@ -340,10 +338,12 @@ enum cirrusfb_dbg_reg_class {
 /* info about board */
 struct cirrusfb_info {
         u8 __iomem *regbase;
+        u8 __iomem *laguna_mmio;
         enum cirrus_board btype;
         unsigned char SFR;      /* Shadow of special function register */
 
-        struct cirrusfb_regs currentmode;
+        int multiplexing;
+        int doubleVCLK;
         int blank_mode;
         u32 pseudo_palette[16];
 
@@ -357,43 +357,8 @@ static char *mode_option __devinitdata = "640x480@60";
 /**** BEGIN PROTOTYPES ******************************************************/
 
 /*--- Interface used by the world ------------------------------------------*/
-static int cirrusfb_init(void);
-#ifndef MODULE
-static int cirrusfb_setup(char *options);
-#endif
-
-static int cirrusfb_open(struct fb_info *info, int user);
-static int cirrusfb_release(struct fb_info *info, int user);
-static int cirrusfb_setcolreg(unsigned regno, unsigned red, unsigned green,
-                              unsigned blue, unsigned transp,
-                              struct fb_info *info);
-static int cirrusfb_check_var(struct fb_var_screeninfo *var,
-                              struct fb_info *info);
-static int cirrusfb_set_par(struct fb_info *info);
 static int cirrusfb_pan_display(struct fb_var_screeninfo *var,
                                 struct fb_info *info);
-static int cirrusfb_blank(int blank_mode, struct fb_info *info);
-static void cirrusfb_fillrect(struct fb_info *info,
-                              const struct fb_fillrect *region);
-static void cirrusfb_copyarea(struct fb_info *info,
-                              const struct fb_copyarea *area);
-static void cirrusfb_imageblit(struct fb_info *info,
-                               const struct fb_image *image);
-
-/* function table of the above functions */
-static struct fb_ops cirrusfb_ops = {
-        .owner          = THIS_MODULE,
-        .fb_open        = cirrusfb_open,
-        .fb_release     = cirrusfb_release,
-        .fb_setcolreg   = cirrusfb_setcolreg,
-        .fb_check_var   = cirrusfb_check_var,
-        .fb_set_par     = cirrusfb_set_par,
-        .fb_pan_display = cirrusfb_pan_display,
-        .fb_blank       = cirrusfb_blank,
-        .fb_fillrect    = cirrusfb_fillrect,
-        .fb_copyarea    = cirrusfb_copyarea,
-        .fb_imageblit   = cirrusfb_imageblit,
-};
 
 /*--- Internal routines ----------------------------------------------------*/
 static void init_vgachip(struct fb_info *info);
@@ -421,22 +386,27 @@ static void cirrusfb_BitBLT(u8 __iomem *regbase, int bits_per_pixel,
 static void cirrusfb_RectFill(u8 __iomem *regbase, int bits_per_pixel,
                               u_short x, u_short y,
                               u_short width, u_short height,
-                              u_char color, u_short line_length);
+                              u32 fg_color, u32 bg_color,
+                              u_short line_length, u_char blitmode);
 
 static void bestclock(long freq, int *nom, int *den, int *div);
 
 #ifdef CIRRUSFB_DEBUG
-static void cirrusfb_dump(void);
-static void cirrusfb_dbg_reg_dump(caddr_t regbase);
-static void cirrusfb_dbg_print_regs(caddr_t regbase,
+static void cirrusfb_dbg_reg_dump(struct fb_info *info, caddr_t regbase);
+static void cirrusfb_dbg_print_regs(struct fb_info *info,
+                                    caddr_t regbase,
                                     enum cirrusfb_dbg_reg_class reg_class, ...);
-static void cirrusfb_dbg_print_byte(const char *name, unsigned char val);
 #endif /* CIRRUSFB_DEBUG */
 
 /*** END   PROTOTYPES ********************************************************/
 /*****************************************************************************/
 /*** BEGIN Interface Used by the World ***************************************/
 
+static inline int is_laguna(const struct cirrusfb_info *cinfo)
+{
+        return cinfo->btype == BT_LAGUNA || cinfo->btype == BT_LAGUNAB;
+}
+
 static int opencount;
 
 /*--- Open /dev/fbx ---------------------------------------------------------*/
@@ -460,85 +430,94 @@ static int cirrusfb_release(struct fb_info *info, int user)
 /**** BEGIN Hardware specific Routines **************************************/
 
 /* Check if the MCLK is not a better clock source */
-static int cirrusfb_check_mclk(struct cirrusfb_info *cinfo, long freq)
+static int cirrusfb_check_mclk(struct fb_info *info, long freq)
 {
+        struct cirrusfb_info *cinfo = info->par;
         long mclk = vga_rseq(cinfo->regbase, CL_SEQR1F) & 0x3f;
 
         /* Read MCLK value */
         mclk = (14318 * mclk) >> 3;
-        DPRINTK("Read MCLK of %ld kHz\n", mclk);
+        dev_dbg(info->device, "Read MCLK of %ld kHz\n", mclk);
 
         /* Determine if we should use MCLK instead of VCLK, and if so, what we
          * should divide it by to get VCLK
          */
 
         if (abs(freq - mclk) < 250) {
-                DPRINTK("Using VCLK = MCLK\n");
+                dev_dbg(info->device, "Using VCLK = MCLK\n");
                 return 1;
         } else if (abs(freq - (mclk / 2)) < 250) {
-                DPRINTK("Using VCLK = MCLK/2\n");
+                dev_dbg(info->device, "Using VCLK = MCLK/2\n");
                 return 2;
         }
 
         return 0;
 }
 
-static int cirrusfb_check_var(struct fb_var_screeninfo *var,
-                              struct fb_info *info)
+static int cirrusfb_check_pixclock(const struct fb_var_screeninfo *var,
+                                   struct fb_info *info)
 {
-        int yres;
-        /* memory size in pixels */
-        unsigned pixels = info->screen_size * 8 / var->bits_per_pixel;
+        long freq;
+        long maxclock;
+        struct cirrusfb_info *cinfo = info->par;
+        unsigned maxclockidx = var->bits_per_pixel >> 3;
 
-        switch (var->bits_per_pixel) {
-        case 1:
-                pixels /= 4;
-                break;          /* 8 pixel per byte, only 1/4th of mem usable */
-        case 8:
-        case 16:
-        case 32:
-                break;          /* 1 pixel == 1 byte */
-        default:
-                printk(KERN_ERR "cirrusfb: mode %dx%dx%d rejected..."
-                        "color depth not supported.\n",
-                        var->xres, var->yres, var->bits_per_pixel);
-                DPRINTK("EXIT - EINVAL error\n");
-                return -EINVAL;
-        }
+        /* convert from ps to kHz */
+        freq = PICOS2KHZ(var->pixclock);
 
-        if (var->xres_virtual < var->xres)
-                var->xres_virtual = var->xres;
-        /* use highest possible virtual resolution */
-        if (var->yres_virtual == -1) {
-                var->yres_virtual = pixels / var->xres_virtual;
+        dev_dbg(info->device, "desired pixclock: %ld kHz\n", freq);
 
-                printk(KERN_INFO "cirrusfb: virtual resolution set to "
-                        "maximum of %dx%d\n", var->xres_virtual,
-                        var->yres_virtual);
-        }
-        if (var->yres_virtual < var->yres)
-                var->yres_virtual = var->yres;
+        maxclock = cirrusfb_board_info[cinfo->btype].maxclock[maxclockidx];
+        cinfo->multiplexing = 0;
 
-        if (var->xres_virtual * var->yres_virtual > pixels) {
-                printk(KERN_ERR "cirrusfb: mode %dx%dx%d rejected... "
-                      "virtual resolution too high to fit into video memory!\n",
-                        var->xres_virtual, var->yres_virtual,
-                        var->bits_per_pixel);
-                DPRINTK("EXIT - EINVAL error\n");
+        /* If the frequency is greater than we can support, we might be able
+         * to use multiplexing for the video mode */
+        if (freq > maxclock) {
+                dev_err(info->device,
+                        "Frequency greater than maxclock (%ld kHz)\n",
+                        maxclock);
                 return -EINVAL;
         }
+        /*
+         * Additional constraint: 8bpp uses DAC clock doubling to allow maximum
+         * pixel clock
+         */
+        if (var->bits_per_pixel == 8) {
+                switch (cinfo->btype) {
+                case BT_ALPINE:
+                case BT_SD64:
+                case BT_PICASSO4:
+                        if (freq > 85500)
+                                cinfo->multiplexing = 1;
+                        break;
+                case BT_GD5480:
+                        if (freq > 135100)
+                                cinfo->multiplexing = 1;
+                        break;
 
+                default:
+                        break;
+                }
+        }
 
-        if (var->xoffset < 0)
-                var->xoffset = 0;
-        if (var->yoffset < 0)
-                var->yoffset = 0;
+        /* If we have a 1MB 5434, we need to put ourselves in a mode where
+         * the VCLK is double the pixel clock. */
+        cinfo->doubleVCLK = 0;
+        if (cinfo->btype == BT_SD64 && info->fix.smem_len <= MB_ &&
+            var->bits_per_pixel == 16) {
+                cinfo->doubleVCLK = 1;
+        }
 
-        /* truncate xoffset and yoffset to maximum if too high */
-        if (var->xoffset > var->xres_virtual - var->xres)
-                var->xoffset = var->xres_virtual - var->xres - 1;
-        if (var->yoffset > var->yres_virtual - var->yres)
-                var->yoffset = var->yres_virtual - var->yres - 1;
+        return 0;
+}
+
+static int cirrusfb_check_var(struct fb_var_screeninfo *var,
+                              struct fb_info *info)
+{
+        int yres;
+        /* memory size in pixels */
+        unsigned pixels = info->screen_size * 8 / var->bits_per_pixel;
+        struct cirrusfb_info *cinfo = info->par;
 
         switch (var->bits_per_pixel) {
         case 1:
@@ -550,7 +529,7 @@ static int cirrusfb_check_var(struct fb_var_screeninfo *var,
 
         case 8:
                 var->red.offset = 0;
-                var->red.length = 6;
+                var->red.length = 8;
                 var->green = var->red;
                 var->blue = var->red;
                 break;
@@ -561,20 +540,20 @@ static int cirrusfb_check_var(struct fb_var_screeninfo *var,
                         var->green.offset = -3;
                         var->blue.offset = 8;
                 } else {
-                        var->red.offset = 10;
+                        var->red.offset = 11;
                         var->green.offset = 5;
                         var->blue.offset = 0;
                 }
                 var->red.length = 5;
-                var->green.length = 5;
+                var->green.length = 6;
                 var->blue.length = 5;
                 break;
 
-        case 32:
+        case 24:
                 if (isPReP) {
-                        var->red.offset = 8;
-                        var->green.offset = 16;
-                        var->blue.offset = 24;
+                        var->red.offset = 0;
+                        var->green.offset = 8;
+                        var->blue.offset = 16;
                 } else {
                         var->red.offset = 16;
                         var->green.offset = 8;
@@ -586,12 +565,45 @@ static int cirrusfb_check_var(struct fb_var_screeninfo *var,
                 break;
 
         default:
-                DPRINTK("Unsupported bpp size: %d\n", var->bits_per_pixel);
+                dev_dbg(info->device,
+                        "Unsupported bpp size: %d\n", var->bits_per_pixel);
                 assert(false);
                 /* should never occur */
                 break;
         }
 
+        if (var->xres_virtual < var->xres)
+                var->xres_virtual = var->xres;
+        /* use highest possible virtual resolution */
+        if (var->yres_virtual == -1) {
+                var->yres_virtual = pixels / var->xres_virtual;
+
+                dev_info(info->device,
+                         "virtual resolution set to maximum of %dx%d\n",
+                         var->xres_virtual, var->yres_virtual);
+        }
+        if (var->yres_virtual < var->yres)
+                var->yres_virtual = var->yres;
+
+        if (var->xres_virtual * var->yres_virtual > pixels) {
+                dev_err(info->device, "mode %dx%dx%d rejected... "
+                      "virtual resolution too high to fit into video memory!\n",
+                        var->xres_virtual, var->yres_virtual,
+                        var->bits_per_pixel);
+                return -EINVAL;
+        }
+
+        if (var->xoffset < 0)
+                var->xoffset = 0;
+        if (var->yoffset < 0)
+                var->yoffset = 0;
+
+        /* truncate xoffset and yoffset to maximum if too high */
+        if (var->xoffset > var->xres_virtual - var->xres)
+                var->xoffset = var->xres_virtual - var->xres - 1;
+        if (var->yoffset > var->yres_virtual - var->yres)
+                var->yoffset = var->yres_virtual - var->yres - 1;
+
         var->red.msb_right =
             var->green.msb_right =
             var->blue.msb_right =
@@ -606,99 +618,31 @@ static int cirrusfb_check_var(struct fb_var_screeninfo *var,
                 yres = (yres + 1) / 2;
 
         if (yres >= 1280) {
-                printk(KERN_ERR "cirrusfb: ERROR: VerticalTotal >= 1280; "
+                dev_err(info->device, "ERROR: VerticalTotal >= 1280; "
                         "special treatment required! (TODO)\n");
-                DPRINTK("EXIT - EINVAL error\n");
                 return -EINVAL;
         }
 
-        return 0;
-}
-
-static int cirrusfb_decode_var(const struct fb_var_screeninfo *var,
-                                struct cirrusfb_regs *regs,
-                                struct fb_info *info)
-{
-        long freq;
-        long maxclock;
-        int maxclockidx = var->bits_per_pixel >> 3;
-        struct cirrusfb_info *cinfo = info->par;
-
-        switch (var->bits_per_pixel) {
-        case 1:
-                info->fix.line_length = var->xres_virtual / 8;
-                info->fix.visual = FB_VISUAL_MONO10;
-                break;
-
-        case 8:
-                info->fix.line_length = var->xres_virtual;
-                info->fix.visual = FB_VISUAL_PSEUDOCOLOR;
-                break;
-
-        case 16:
-        case 32:
-                info->fix.line_length = var->xres_virtual * maxclockidx;
-                info->fix.visual = FB_VISUAL_TRUECOLOR;
-                break;
-
-        default:
-                DPRINTK("Unsupported bpp size: %d\n", var->bits_per_pixel);
-                assert(false);
-                /* should never occur */
-                break;
-        }
-
-        info->fix.type = FB_TYPE_PACKED_PIXELS;
-
-        /* convert from ps to kHz */
-        freq = PICOS2KHZ(var->pixclock);
-
-        DPRINTK("desired pixclock: %ld kHz\n", freq);
-
-        maxclock = cirrusfb_board_info[cinfo->btype].maxclock[maxclockidx];
-        regs->multiplexing = 0;
+        if (cirrusfb_check_pixclock(var, info))
+                return -EINVAL;
 
-        /* If the frequency is greater than we can support, we might be able
-         * to use multiplexing for the video mode */
-        if (freq > maxclock) {
-                switch (cinfo->btype) {
-                case BT_ALPINE:
-                case BT_GD5480:
-                        regs->multiplexing = 1;
-                        break;
+        if (!is_laguna(cinfo))
+                var->accel_flags = FB_ACCELF_TEXT;
 
-                default:
-                        printk(KERN_ERR "cirrusfb: Frequency greater "
-                                "than maxclock (%ld kHz)\n", maxclock);
-                        DPRINTK("EXIT - return -EINVAL\n");
-                        return -EINVAL;
-                }
-        }
-#if 0
-        /* TODO: If we have a 1MB 5434, we need to put ourselves in a mode where
-         * the VCLK is double the pixel clock. */
-        switch (var->bits_per_pixel) {
-        case 16:
-        case 32:
-                if (var->xres <= 800)
-                        /* Xbh has this type of clock for 32-bit */
-                        freq /= 2;
-                break;
-        }
-#endif
         return 0;
 }
 
-static void cirrusfb_set_mclk_as_source(const struct cirrusfb_info *cinfo,
-                                        int div)
+static void cirrusfb_set_mclk_as_source(const struct fb_info *info, int div)
 {
+        struct cirrusfb_info *cinfo = info->par;
         unsigned char old1f, old1e;
+
         assert(cinfo != NULL);
         old1f = vga_rseq(cinfo->regbase, CL_SEQR1F) & ~0x40;
 
         if (div) {
-                DPRINTK("Set %s as pixclock source.\n",
-                                        (div == 2) ? "MCLK/2" : "MCLK");
+                dev_dbg(info->device, "Set %s as pixclock source.\n",
+                        (div == 2) ? "MCLK/2" : "MCLK");
                 old1f |= 0x40;
                 old1e = vga_rseq(cinfo->regbase, CL_SEQR1E) & ~0x1;
                 if (div == 2)
@@ -718,101 +662,119 @@ static int cirrusfb_set_par_foo(struct fb_info *info)
 {
         struct cirrusfb_info *cinfo = info->par;
         struct fb_var_screeninfo *var = &info->var;
-        struct cirrusfb_regs regs;
         u8 __iomem *regbase = cinfo->regbase;
         unsigned char tmp;
-        int offset = 0, err;
+        int pitch;
         const struct cirrusfb_board_info_rec *bi;
         int hdispend, hsyncstart, hsyncend, htotal;
         int yres, vdispend, vsyncstart, vsyncend, vtotal;
         long freq;
         int nom, den, div;
+        unsigned int control = 0, format = 0, threshold = 0;
 
-        DPRINTK("ENTER\n");
-        DPRINTK("Requested mode: %dx%dx%d\n",
+        dev_dbg(info->device, "Requested mode: %dx%dx%d\n",
                var->xres, var->yres, var->bits_per_pixel);
-        DPRINTK("pixclock: %d\n", var->pixclock);
 
-        init_vgachip(info);
+        switch (var->bits_per_pixel) {
+        case 1:
+                info->fix.line_length = var->xres_virtual / 8;
+                info->fix.visual = FB_VISUAL_MONO10;
+                break;
 
-        err = cirrusfb_decode_var(var, &regs, info);
-        if (err) {
-                /* should never happen */
-                DPRINTK("mode change aborted.  invalid var.\n");
-                return -EINVAL;
+        case 8:
+                info->fix.line_length = var->xres_virtual;
+                info->fix.visual = FB_VISUAL_PSEUDOCOLOR;
+                break;
+
+        case 16:
+        case 24:
+                info->fix.line_length = var->xres_virtual *
+                                        var->bits_per_pixel >> 3;
+                info->fix.visual = FB_VISUAL_TRUECOLOR;
+                break;
         }
+        info->fix.type = FB_TYPE_PACKED_PIXELS;
+
+        init_vgachip(info);
 
         bi = &cirrusfb_board_info[cinfo->btype];
 
         hsyncstart = var->xres + var->right_margin;
         hsyncend = hsyncstart + var->hsync_len;
-        htotal = (hsyncend + var->left_margin) / 8 - 5;
-        hdispend = var->xres / 8 - 1;
-        hsyncstart = hsyncstart / 8 + 1;
-        hsyncend = hsyncend / 8 + 1;
+        htotal = (hsyncend + var->left_margin) / 8;
+        hdispend = var->xres / 8;
+        hsyncstart = hsyncstart / 8;
+        hsyncend = hsyncend / 8;
 
-        yres = var->yres;
-        vsyncstart = yres + var->lower_margin;
+        vdispend = var->yres;
+        vsyncstart = vdispend + var->lower_margin;
         vsyncend = vsyncstart + var->vsync_len;
         vtotal = vsyncend + var->upper_margin;
-        vdispend = yres - 1;
 
         if (var->vmode & FB_VMODE_DOUBLE) {
-                yres *= 2;
+                vdispend *= 2;
                 vsyncstart *= 2;
                 vsyncend *= 2;
                 vtotal *= 2;
         } else if (var->vmode & FB_VMODE_INTERLACED) {
-                yres = (yres + 1) / 2;
+                vdispend = (vdispend + 1) / 2;
                 vsyncstart = (vsyncstart + 1) / 2;
                 vsyncend = (vsyncend + 1) / 2;
                 vtotal = (vtotal + 1) / 2;
         }
-
-        vtotal -= 2;
-        vsyncstart -= 1;
-        vsyncend -= 1;
-
+        yres = vdispend;
         if (yres >= 1024) {
                 vtotal /= 2;
                 vsyncstart /= 2;
                 vsyncend /= 2;
                 vdispend /= 2;
         }
-        if (regs.multiplexing) {
+
+        vdispend -= 1;
+        vsyncstart -= 1;
+        vsyncend -= 1;
+        vtotal -= 2;
+
+        if (cinfo->multiplexing) {
                 htotal /= 2;
                 hsyncstart /= 2;
                 hsyncend /= 2;
                 hdispend /= 2;
         }
+
+        htotal -= 5;
+        hdispend -= 1;
+        hsyncstart += 1;
+        hsyncend += 1;
+
         /* unlock register VGA_CRTC_H_TOTAL..CRT7 */
         vga_wcrt(regbase, VGA_CRTC_V_SYNC_END, 0x20);   /* previously: 0x00) */
 
         /* if debugging is enabled, all parameters get output before writing */
-        DPRINTK("CRT0: %d\n", htotal);
+        dev_dbg(info->device, "CRT0: %d\n", htotal);
         vga_wcrt(regbase, VGA_CRTC_H_TOTAL, htotal);
 
-        DPRINTK("CRT1: %d\n", hdispend);
+        dev_dbg(info->device, "CRT1: %d\n", hdispend);
         vga_wcrt(regbase, VGA_CRTC_H_DISP, hdispend);
 
-        DPRINTK("CRT2: %d\n", var->xres / 8);
+        dev_dbg(info->device, "CRT2: %d\n", var->xres / 8);
         vga_wcrt(regbase, VGA_CRTC_H_BLANK_START, var->xres / 8);
 
         /*  + 128: Compatible read */
-        DPRINTK("CRT3: 128+%d\n", (htotal + 5) % 32);
+        dev_dbg(info->device, "CRT3: 128+%d\n", (htotal + 5) % 32);
         vga_wcrt(regbase, VGA_CRTC_H_BLANK_END,
                  128 + ((htotal + 5) % 32));
 
-        DPRINTK("CRT4: %d\n", hsyncstart);
+        dev_dbg(info->device, "CRT4: %d\n", hsyncstart);
         vga_wcrt(regbase, VGA_CRTC_H_SYNC_START, hsyncstart);
 
         tmp = hsyncend % 32;
         if ((htotal + 5) & 32)
                 tmp += 128;
-        DPRINTK("CRT5: %d\n", tmp);
+        dev_dbg(info->device, "CRT5: %d\n", tmp);
         vga_wcrt(regbase, VGA_CRTC_H_SYNC_END, tmp);
 
-        DPRINTK("CRT6: %d\n", vtotal & 0xff);
+        dev_dbg(info->device, "CRT6: %d\n", vtotal & 0xff);
         vga_wcrt(regbase, VGA_CRTC_V_TOTAL, vtotal & 0xff);
 
         tmp = 16;               /* LineCompare bit #9 */
@@ -830,7 +792,7 @@ static int cirrusfb_set_par_foo(struct fb_info *info)
                 tmp |= 64;
         if (vsyncstart & 512)
                 tmp |= 128;
-        DPRINTK("CRT7: %d\n", tmp);
+        dev_dbg(info->device, "CRT7: %d\n", tmp);
         vga_wcrt(regbase, VGA_CRTC_OVERFLOW, tmp);
 
         tmp = 0x40;             /* LineCompare bit #8 */
@@ -838,25 +800,25 @@ static int cirrusfb_set_par_foo(struct fb_info *info)
                 tmp |= 0x20;
         if (var->vmode & FB_VMODE_DOUBLE)
                 tmp |= 0x80;
-        DPRINTK("CRT9: %d\n", tmp);
+        dev_dbg(info->device, "CRT9: %d\n", tmp);
         vga_wcrt(regbase, VGA_CRTC_MAX_SCAN, tmp);
 
-        DPRINTK("CRT10: %d\n", vsyncstart & 0xff);
+        dev_dbg(info->device, "CRT10: %d\n", vsyncstart & 0xff);
         vga_wcrt(regbase, VGA_CRTC_V_SYNC_START, vsyncstart & 0xff);
 
-        DPRINTK("CRT11: 64+32+%d\n", vsyncend % 16);
+        dev_dbg(info->device, "CRT11: 64+32+%d\n", vsyncend % 16);
         vga_wcrt(regbase, VGA_CRTC_V_SYNC_END, vsyncend % 16 + 64 + 32);
 
-        DPRINTK("CRT12: %d\n", vdispend & 0xff);
+        dev_dbg(info->device, "CRT12: %d\n", vdispend & 0xff);
         vga_wcrt(regbase, VGA_CRTC_V_DISP_END, vdispend & 0xff);
 
-        DPRINTK("CRT15: %d\n", (vdispend + 1) & 0xff);
+        dev_dbg(info->device, "CRT15: %d\n", (vdispend + 1) & 0xff);
         vga_wcrt(regbase, VGA_CRTC_V_BLANK_START, (vdispend + 1) & 0xff);
 
-        DPRINTK("CRT16: %d\n", vtotal & 0xff);
+        dev_dbg(info->device, "CRT16: %d\n", vtotal & 0xff);
         vga_wcrt(regbase, VGA_CRTC_V_BLANK_END, vtotal & 0xff);
 
-        DPRINTK("CRT18: 0xff\n");
+        dev_dbg(info->device, "CRT18: 0xff\n");
         vga_wcrt(regbase, VGA_CRTC_LINE_COMPARE, 0xff);
 
         tmp = 0;
@@ -871,41 +833,75 @@ static int cirrusfb_set_par_foo(struct fb_info *info)
         if (vtotal & 512)
                 tmp |= 128;
 
-        DPRINTK("CRT1a: %d\n", tmp);
+        dev_dbg(info->device, "CRT1a: %d\n", tmp);
         vga_wcrt(regbase, CL_CRT1A, tmp);
 
         freq = PICOS2KHZ(var->pixclock);
+        if (var->bits_per_pixel == 24)
+                if (cinfo->btype == BT_ALPINE || cinfo->btype == BT_SD64)
+                        freq *= 3;
+        if (cinfo->multiplexing)
+                freq /= 2;
+        if (cinfo->doubleVCLK)
+                freq *= 2;
+
         bestclock(freq, &nom, &den, &div);
 
+        dev_dbg(info->device, "VCLK freq: %ld kHz  nom: %d  den: %d  div: %d\n",
+                freq, nom, den, div);
+
         /* set VCLK0 */
         /* hardware RefClock: 14.31818 MHz */
         /* formula: VClk = (OSC * N) / (D * (1+P)) */
         /* Example: VClk = (14.31818 * 91) / (23 * (1+1)) = 28.325 MHz */
 
-        if (cinfo->btype == BT_ALPINE) {
+        if (cinfo->btype == BT_ALPINE || cinfo->btype == BT_PICASSO4 ||
+            cinfo->btype == BT_SD64) {
                 /* if freq is close to mclk or mclk/2 select mclk
                  * as clock source
                  */
-                int divMCLK = cirrusfb_check_mclk(cinfo, freq);
-                if (divMCLK)  {
+                int divMCLK = cirrusfb_check_mclk(info, freq);
+                if (divMCLK)
                         nom = 0;
-                        cirrusfb_set_mclk_as_source(cinfo, divMCLK);
+                cirrusfb_set_mclk_as_source(info, divMCLK);
+        }
+        if (is_laguna(cinfo)) {
+                long pcifc = fb_readl(cinfo->laguna_mmio + 0x3fc);
+                unsigned char tile = fb_readb(cinfo->laguna_mmio + 0x407);
+                unsigned short tile_control;
+
+                if (cinfo->btype == BT_LAGUNAB) {
+                        tile_control = fb_readw(cinfo->laguna_mmio + 0x2c4);
+                        tile_control &= ~0x80;
+                        fb_writew(tile_control, cinfo->laguna_mmio + 0x2c4);
                 }
+
+                fb_writel(pcifc | 0x10000000l, cinfo->laguna_mmio + 0x3fc);
+                fb_writeb(tile & 0x3f, cinfo->laguna_mmio + 0x407);
+                control = fb_readw(cinfo->laguna_mmio + 0x402);
+                threshold = fb_readw(cinfo->laguna_mmio + 0xea);
+                control &= ~0x6800;
+                format = 0;
+                threshold &= 0xffc0 & 0x3fbf;
         }
         if (nom) {
-                vga_wseq(regbase, CL_SEQRB, nom);
                 tmp = den << 1;
                 if (div != 0)
                         tmp |= 1;
-
                 /* 6 bit denom; ONLY 5434!!! (bugged me 10 days) */
                 if ((cinfo->btype == BT_SD64) ||
                     (cinfo->btype == BT_ALPINE) ||
                     (cinfo->btype == BT_GD5480))
                         tmp |= 0x80;
 
-                DPRINTK("CL_SEQR1B: %ld\n", (long) tmp);
-                vga_wseq(regbase, CL_SEQR1B, tmp);
+                /* Laguna chipset has reversed clock registers */
+                if (is_laguna(cinfo)) {
+                        vga_wseq(regbase, CL_SEQRE, tmp);
+                        vga_wseq(regbase, CL_SEQR1E, nom);
+                } else {
+                        vga_wseq(regbase, CL_SEQRE, nom);
+                        vga_wseq(regbase, CL_SEQR1E, tmp);
+                }
         }
 
         if (yres >= 1024)
@@ -916,9 +912,6 @@ static int cirrusfb_set_par_foo(struct fb_info *info)
                  * address wrap, no compat. */
                 vga_wcrt(regbase, VGA_CRTC_MODE, 0xc3);
 
-/* HAEH?        vga_wcrt(regbase, VGA_CRTC_V_SYNC_END, 0x20);
- * previously: 0x00  unlock VGA_CRTC_H_TOTAL..CRT7 */
-
         /* don't know if it would hurt to also program this if no interlaced */
         /* mode is used, but I feel better this way.. :-) */
         if (var->vmode & FB_VMODE_INTERLACED)
@@ -926,19 +919,15 @@ static int cirrusfb_set_par_foo(struct fb_info *info)
         else
                 vga_wcrt(regbase, VGA_CRTC_REGS, 0x00); /* interlace control */
 
-        vga_wseq(regbase, VGA_SEQ_CHARACTER_MAP, 0);
-
-        /* adjust horizontal/vertical sync type (low/high) */
+        /* adjust horizontal/vertical sync type (low/high), use VCLK3 */
         /* enable display memory & CRTC I/O address for color mode */
-        tmp = 0x03;
+        tmp = 0x03 | 0xc;
         if (var->sync & FB_SYNC_HOR_HIGH_ACT)
                 tmp |= 0x40;
         if (var->sync & FB_SYNC_VERT_HIGH_ACT)
                 tmp |= 0x80;
         WGen(cinfo, VGA_MIS_W, tmp);
 
-        /* Screen A Preset Row-Scan register */
-        vga_wcrt(regbase, VGA_CRTC_PRESET_ROW, 0);
         /* text cursor on and start line */
         vga_wcrt(regbase, VGA_CRTC_CURSOR_START, 0);
         /* text cursor end line */
@@ -952,7 +941,7 @@ static int cirrusfb_set_par_foo(struct fb_info *info)
 
         /* programming for different color depths */
         if (var->bits_per_pixel == 1) {
-                DPRINTK("cirrusfb: preparing for 1 bit deep display\n");
+                dev_dbg(info->device, "preparing for 1 bit deep display\n");
                 vga_wgfx(regbase, VGA_GFX_MODE, 0);     /* mode register */
 
                 /* SR07 */
@@ -964,68 +953,53 @@ static int cirrusfb_set_par_foo(struct fb_info *info)
                 case BT_PICASSO4:
                 case BT_ALPINE:
                 case BT_GD5480:
-                        DPRINTK(" (for GD54xx)\n");
                         vga_wseq(regbase, CL_SEQR7,
-                                  regs.multiplexing ?
+                                 cinfo->multiplexing ?
                                         bi->sr07_1bpp_mux : bi->sr07_1bpp);
                         break;
 
                 case BT_LAGUNA:
-                        DPRINTK(" (for GD546x)\n");
+                case BT_LAGUNAB:
                         vga_wseq(regbase, CL_SEQR7,
                                 vga_rseq(regbase, CL_SEQR7) & ~0x01);
                         break;
 
                 default:
-                        printk(KERN_WARNING "cirrusfb: unknown Board\n");
+                        dev_warn(info->device, "unknown Board\n");
                         break;
                 }
 
                 /* Extended Sequencer Mode */
                 switch (cinfo->btype) {
-                case BT_SD64:
-                        /* setting the SEQRF on SD64 is not necessary
-                         * (only during init)
-                         */
-                        DPRINTK("(for SD64)\n");
-                        /*  MCLK select */
-                        vga_wseq(regbase, CL_SEQR1F, 0x1a);
-                        break;
 
                 case BT_PICCOLO:
                 case BT_SPECTRUM:
-                        DPRINTK("(for Piccolo/Spectrum)\n");
-                        /* ### ueberall 0x22? */
-                        /* ##vorher 1c MCLK select */
-                        vga_wseq(regbase, CL_SEQR1F, 0x22);
                         /* evtl d0 bei 1 bit? avoid FIFO underruns..? */
                         vga_wseq(regbase, CL_SEQRF, 0xb0);
                         break;
 
                 case BT_PICASSO:
-                        DPRINTK("(for Picasso)\n");
-                        /* ##vorher 22 MCLK select */
-                        vga_wseq(regbase, CL_SEQR1F, 0x22);
                         /* ## vorher d0 avoid FIFO underruns..? */
                         vga_wseq(regbase, CL_SEQRF, 0xd0);
                         break;
 
+                case BT_SD64:
                 case BT_PICASSO4:
                 case BT_ALPINE:
                 case BT_GD5480:
                 case BT_LAGUNA:
-                        DPRINTK(" (for GD54xx)\n");
+                case BT_LAGUNAB:
                         /* do nothing */
                         break;
 
                 default:
-                        printk(KERN_WARNING "cirrusfb: unknown Board\n");
+                        dev_warn(info->device, "unknown Board\n");
                         break;
                 }
 
                 /* pixel mask: pass-through for first plane */
                 WGen(cinfo, VGA_PEL_MSK, 0x01);
-                if (regs.multiplexing)
+                if (cinfo->multiplexing)
                         /* hidden dac reg: 1280x1024 */
                         WHDR(cinfo, 0x4a);
                 else
@@ -1035,7 +1009,6 @@ static int cirrusfb_set_par_foo(struct fb_info *info)
                 vga_wseq(regbase, VGA_SEQ_MEMORY_MODE, 0x06);
                 /* plane mask: only write to first plane */
                 vga_wseq(regbase, VGA_SEQ_PLANE_WRITE, 0x01);
-                offset = var->xres_virtual / 16;
         }
 
         /******************************************************
@@ -1045,7 +1018,7 @@ static int cirrusfb_set_par_foo(struct fb_info *info)
          */
 
         else if (var->bits_per_pixel == 8) {
-                DPRINTK("cirrusfb: preparing for 8 bit deep display\n");
+                dev_dbg(info->device, "preparing for 8 bit deep display\n");
                 switch (cinfo->btype) {
                 case BT_SD64:
                 case BT_PICCOLO:
@@ -1054,34 +1027,27 @@ static int cirrusfb_set_par_foo(struct fb_info *info)
                 case BT_PICASSO4:
                 case BT_ALPINE:
                 case BT_GD5480:
-                        DPRINTK(" (for GD54xx)\n");
                         vga_wseq(regbase, CL_SEQR7,
-                                  regs.multiplexing ?
+                                  cinfo->multiplexing ?
                                         bi->sr07_8bpp_mux : bi->sr07_8bpp);
                         break;
 
                 case BT_LAGUNA:
-                        DPRINTK(" (for GD546x)\n");
+                case BT_LAGUNAB:
                         vga_wseq(regbase, CL_SEQR7,
                                 vga_rseq(regbase, CL_SEQR7) | 0x01);
+                        threshold |= 0x10;
                         break;
 
                 default:
-                        printk(KERN_WARNING "cirrusfb: unknown Board\n");
+                        dev_warn(info->device, "unknown Board\n");
                         break;
                 }
 
                 switch (cinfo->btype) {
-                case BT_SD64:
-                        /* MCLK select */
-                        vga_wseq(regbase, CL_SEQR1F, 0x1d);
-                        break;
-
                 case BT_PICCOLO:
                 case BT_PICASSO:
                 case BT_SPECTRUM:
-                        /* ### vorher 1c MCLK select */
-                        vga_wseq(regbase, CL_SEQR1F, 0x22);
                         /* Fast Page-Mode writes */
                         vga_wseq(regbase, CL_SEQRF, 0xb0);
                         break;
@@ -1091,40 +1057,27 @@ static int cirrusfb_set_par_foo(struct fb_info *info)
                         /* ### INCOMPLETE!! */
                         vga_wseq(regbase, CL_SEQRF, 0xb8);
 #endif
-/*                      vga_wseq(regbase, CL_SEQR1F, 0x1c); */
-                        break;
-
                 case BT_ALPINE:
-                        DPRINTK(" (for GD543x)\n");
-                        /* We already set SRF and SR1F */
-                        break;
-
+                case BT_SD64:
                 case BT_GD5480:
                 case BT_LAGUNA:
-                        DPRINTK(" (for GD54xx)\n");
+                case BT_LAGUNAB:
                         /* do nothing */
                         break;
 
                 default:
-                        printk(KERN_WARNING "cirrusfb: unknown Board\n");
+                        dev_warn(info->device, "unknown board\n");
                         break;
                 }
 
                 /* mode register: 256 color mode */
                 vga_wgfx(regbase, VGA_GFX_MODE, 64);
-                /* pixel mask: pass-through all planes */
-                WGen(cinfo, VGA_PEL_MSK, 0xff);
-                if (regs.multiplexing)
+                if (cinfo->multiplexing)
                         /* hidden dac reg: 1280x1024 */
                         WHDR(cinfo, 0x4a);
                 else
                         /* hidden dac: nothing */
                         WHDR(cinfo, 0);
-                /* memory mode: chain4, ext. memory */
-                vga_wseq(regbase, VGA_SEQ_MEMORY_MODE, 0x0a);
-                /* plane mask: enable writing to all 4 planes */
-                vga_wseq(regbase, VGA_SEQ_PLANE_WRITE, 0xff);
-                offset = var->xres_virtual / 8;
         }
 
         /******************************************************
@@ -1134,147 +1087,110 @@ static int cirrusfb_set_par_foo(struct fb_info *info)
          */
 
         else if (var->bits_per_pixel == 16) {
-                DPRINTK("cirrusfb: preparing for 16 bit deep display\n");
+                dev_dbg(info->device, "preparing for 16 bit deep display\n");
                 switch (cinfo->btype) {
-                case BT_SD64:
-                        /* Extended Sequencer Mode: 256c col. mode */
-                        vga_wseq(regbase, CL_SEQR7, 0xf7);
-                        /* MCLK select */
-                        vga_wseq(regbase, CL_SEQR1F, 0x1e);
-                        break;
-
                 case BT_PICCOLO:
                 case BT_SPECTRUM:
                         vga_wseq(regbase, CL_SEQR7, 0x87);
                         /* Fast Page-Mode writes */
                         vga_wseq(regbase, CL_SEQRF, 0xb0);
-                        /* MCLK select */
-                        vga_wseq(regbase, CL_SEQR1F, 0x22);
                         break;
 
                 case BT_PICASSO:
                         vga_wseq(regbase, CL_SEQR7, 0x27);
                         /* Fast Page-Mode writes */
                         vga_wseq(regbase, CL_SEQRF, 0xb0);
-                        /* MCLK select */
-                        vga_wseq(regbase, CL_SEQR1F, 0x22);
                         break;
 
+                case BT_SD64:
                 case BT_PICASSO4:
-                        vga_wseq(regbase, CL_SEQR7, 0x27);
-/*                      vga_wseq(regbase, CL_SEQR1F, 0x1c);  */
-                        break;
-
                 case BT_ALPINE:
-                        DPRINTK(" (for GD543x)\n");
-                        vga_wseq(regbase, CL_SEQR7, 0xa7);
+                        /* Extended Sequencer Mode: 256c col. mode */
+                        vga_wseq(regbase, CL_SEQR7,
+                                        cinfo->doubleVCLK ? 0xa3 : 0xa7);
                         break;
 
                 case BT_GD5480:
-                        DPRINTK(" (for GD5480)\n");
                         vga_wseq(regbase, CL_SEQR7, 0x17);
                         /* We already set SRF and SR1F */
                         break;
 
                 case BT_LAGUNA:
-                        DPRINTK(" (for GD546x)\n");
+                case BT_LAGUNAB:
                         vga_wseq(regbase, CL_SEQR7,
                                 vga_rseq(regbase, CL_SEQR7) & ~0x01);
+                        control |= 0x2000;
+                        format |= 0x1400;
+                        threshold |= 0x10;
                         break;
 
                 default:
-                        printk(KERN_WARNING "CIRRUSFB: unknown Board\n");
+                        dev_warn(info->device, "unknown Board\n");
                         break;
                 }
 
                 /* mode register: 256 color mode */
                 vga_wgfx(regbase, VGA_GFX_MODE, 64);
-                /* pixel mask: pass-through all planes */
-                WGen(cinfo, VGA_PEL_MSK, 0xff);
 #ifdef CONFIG_PCI
-                WHDR(cinfo, 0xc0);      /* Copy Xbh */
+                WHDR(cinfo, cinfo->doubleVCLK ? 0xe1 : 0xc1);
 #elif defined(CONFIG_ZORRO)
                 /* FIXME: CONFIG_PCI and CONFIG_ZORRO may be defined both */
                 WHDR(cinfo, 0xa0);      /* hidden dac reg: nothing special */
 #endif
-                /* memory mode: chain4, ext. memory */
-                vga_wseq(regbase, VGA_SEQ_MEMORY_MODE, 0x0a);
-                /* plane mask: enable writing to all 4 planes */
-                vga_wseq(regbase, VGA_SEQ_PLANE_WRITE, 0xff);
-                offset = var->xres_virtual / 4;
         }
 
         /******************************************************
          *
-         * 32 bpp
+         * 24 bpp
          *
          */
 
-        else if (var->bits_per_pixel == 32) {
-                DPRINTK("cirrusfb: preparing for 32 bit deep display\n");
+        else if (var->bits_per_pixel == 24) {
+                dev_dbg(info->device, "preparing for 24 bit deep display\n");
                 switch (cinfo->btype) {
-                case BT_SD64:
-                        /* Extended Sequencer Mode: 256c col. mode */
-                        vga_wseq(regbase, CL_SEQR7, 0xf9);
-                        /* MCLK select */
-                        vga_wseq(regbase, CL_SEQR1F, 0x1e);
-                        break;
-
                 case BT_PICCOLO:
                 case BT_SPECTRUM:
                         vga_wseq(regbase, CL_SEQR7, 0x85);
                         /* Fast Page-Mode writes */
                         vga_wseq(regbase, CL_SEQRF, 0xb0);
-                        /* MCLK select */
-                        vga_wseq(regbase, CL_SEQR1F, 0x22);
                         break;
 
                 case BT_PICASSO:
                         vga_wseq(regbase, CL_SEQR7, 0x25);
                         /* Fast Page-Mode writes */
                         vga_wseq(regbase, CL_SEQRF, 0xb0);
-                        /* MCLK select */
-                        vga_wseq(regbase, CL_SEQR1F, 0x22);
                         break;
 
+                case BT_SD64:
                 case BT_PICASSO4:
-                        vga_wseq(regbase, CL_SEQR7, 0x25);
-/*                      vga_wseq(regbase, CL_SEQR1F, 0x1c);  */
-                        break;
-
                 case BT_ALPINE:
-                        DPRINTK(" (for GD543x)\n");
-                        vga_wseq(regbase, CL_SEQR7, 0xa9);
+                        /* Extended Sequencer Mode: 256c col. mode */
+                        vga_wseq(regbase, CL_SEQR7, 0xa5);
                         break;
 
                 case BT_GD5480:
-                        DPRINTK(" (for GD5480)\n");
-                        vga_wseq(regbase, CL_SEQR7, 0x19);
+                        vga_wseq(regbase, CL_SEQR7, 0x15);
                         /* We already set SRF and SR1F */
                         break;
 
                 case BT_LAGUNA:
-                        DPRINTK(" (for GD546x)\n");
+                case BT_LAGUNAB:
                         vga_wseq(regbase, CL_SEQR7,
                                 vga_rseq(regbase, CL_SEQR7) & ~0x01);
+                        control |= 0x4000;
+                        format |= 0x2400;
+                        threshold |= 0x20;
                         break;
 
                 default:
-                        printk(KERN_WARNING "cirrusfb: unknown Board\n");
+                        dev_warn(info->device, "unknown Board\n");
                         break;
                 }
 
                 /* mode register: 256 color mode */
                 vga_wgfx(regbase, VGA_GFX_MODE, 64);
-                /* pixel mask: pass-through all planes */
-                WGen(cinfo, VGA_PEL_MSK, 0xff);
                 /* hidden dac reg: 8-8-8 mode (24 or 32) */
                 WHDR(cinfo, 0xc5);
-                /* memory mode: chain4, ext. memory */
-                vga_wseq(regbase, VGA_SEQ_MEMORY_MODE, 0x0a);
-                /* plane mask: enable writing to all 4 planes */
-                vga_wseq(regbase, VGA_SEQ_PLANE_WRITE, 0xff);
-                offset = var->xres_virtual / 4;
         }
 
         /******************************************************
@@ -1284,67 +1200,55 @@ static int cirrusfb_set_par_foo(struct fb_info *info)
          */
 
         else
-                printk(KERN_ERR "cirrusfb: What's this?? "
-                        " requested color depth == %d.\n",
+                dev_err(info->device,
+                        "What's this? requested color depth == %d.\n",
                         var->bits_per_pixel);
 
-        vga_wcrt(regbase, VGA_CRTC_OFFSET, offset & 0xff);
+        pitch = info->fix.line_length >> 3;
+        vga_wcrt(regbase, VGA_CRTC_OFFSET, pitch & 0xff);
         tmp = 0x22;
-        if (offset & 0x100)
+        if (pitch & 0x100)
                 tmp |= 0x10;    /* offset overflow bit */
 
         /* screen start addr #16-18, fastpagemode cycles */
         vga_wcrt(regbase, CL_CRT1B, tmp);
 
-        if (cinfo->btype == BT_SD64 ||
-            cinfo->btype == BT_PICASSO4 ||
-            cinfo->btype == BT_ALPINE ||
-            cinfo->btype == BT_GD5480)
-                /* screen start address bit 19 */
-                vga_wcrt(regbase, CL_CRT1D, 0x00);
-
-        /* text cursor location high */
-        vga_wcrt(regbase, VGA_CRTC_CURSOR_HI, 0);
-        /* text cursor location low */
-        vga_wcrt(regbase, VGA_CRTC_CURSOR_LO, 0);
-        /* underline row scanline = at very bottom */
-        vga_wcrt(regbase, VGA_CRTC_UNDERLINE, 0);
-
-        /* controller mode */
-        vga_wattr(regbase, VGA_ATC_MODE, 1);
-        /* overscan (border) color */
-        vga_wattr(regbase, VGA_ATC_OVERSCAN, 0);
-        /* color plane enable */
-        vga_wattr(regbase, VGA_ATC_PLANE_ENABLE, 15);
+        /* screen start address bit 19 */
+        if (cirrusfb_board_info[cinfo->btype].scrn_start_bit19)
+                vga_wcrt(regbase, CL_CRT1D, (pitch >> 9) & 1);
+
+        if (is_laguna(cinfo)) {
+                tmp = 0;
+                if ((htotal + 5) & 256)
+                        tmp |= 128;
+                if (hdispend & 256)
+                        tmp |= 64;
+                if (hsyncstart & 256)
+                        tmp |= 48;
+                if (vtotal & 1024)
+                        tmp |= 8;
+                if (vdispend & 1024)
+                        tmp |= 4;
+                if (vsyncstart & 1024)
+                        tmp |= 3;
+
+                vga_wcrt(regbase, CL_CRT1E, tmp);
+                dev_dbg(info->device, "CRT1e: %d\n", tmp);
+        }
+
         /* pixel panning */
         vga_wattr(regbase, CL_AR33, 0);
-        /* color select */
-        vga_wattr(regbase, VGA_ATC_COLOR_PAGE, 0);
 
         /* [ EGS: SetOffset(); ] */
         /* From SetOffset(): Turn on VideoEnable bit in Attribute controller */
         AttrOn(cinfo);
 
-        /* set/reset register */
-        vga_wgfx(regbase, VGA_GFX_SR_VALUE, 0);
-        /* set/reset enable */
-        vga_wgfx(regbase, VGA_GFX_SR_ENABLE, 0);
-        /* color compare */
-        vga_wgfx(regbase, VGA_GFX_COMPARE_VALUE, 0);
-        /* data rotate */
-        vga_wgfx(regbase, VGA_GFX_DATA_ROTATE, 0);
-        /* read map select */
-        vga_wgfx(regbase, VGA_GFX_PLANE_READ, 0);
-        /* miscellaneous register */
-        vga_wgfx(regbase, VGA_GFX_MISC, 1);
-        /* color don't care */
-        vga_wgfx(regbase, VGA_GFX_COMPARE_MASK, 15);
-        /* bit mask */
-        vga_wgfx(regbase, VGA_GFX_BIT_MASK, 255);
-
-        /* graphics cursor attributes: nothing special */
-        vga_wseq(regbase, CL_SEQR12, 0x0);
-
+        if (is_laguna(cinfo)) {
+                /* no tiles */
+                fb_writew(control | 0x1000, cinfo->laguna_mmio + 0x402);
+                fb_writew(format, cinfo->laguna_mmio + 0xc0);
+                fb_writew(threshold, cinfo->laguna_mmio + 0xea);
+        }
         /* finally, turn on everything - turn off "FullBandwidth" bit */
         /* also, set "DotClock%2" bit where requested */
         tmp = 0x01;
@@ -1355,18 +1259,12 @@ static int cirrusfb_set_par_foo(struct fb_info *info)
 */
 
         vga_wseq(regbase, VGA_SEQ_CLOCK_MODE, tmp);
-        DPRINTK("CL_SEQR1: %d\n", tmp);
-
-        cinfo->currentmode = regs;
-
-        /* pan to requested offset */
-        cirrusfb_pan_display(var, info);
+        dev_dbg(info->device, "CL_SEQR1: %d\n", tmp);
 
 #ifdef CIRRUSFB_DEBUG
-        cirrusfb_dump();
+        cirrusfb_dbg_reg_dump(info, NULL);
 #endif
 
-        DPRINTK("EXIT\n");
         return 0;
 }
 
@@ -1418,27 +1316,19 @@ static int cirrusfb_setcolreg(unsigned regno, unsigned red, unsigned green,
 static int cirrusfb_pan_display(struct fb_var_screeninfo *var,
                                 struct fb_info *info)
 {
-        int xoffset = 0;
-        int yoffset = 0;
+        int xoffset;
         unsigned long base;
-        unsigned char tmp = 0, tmp2 = 0, xpix;
+        unsigned char tmp, xpix;
         struct cirrusfb_info *cinfo = info->par;
 
-        DPRINTK("ENTER\n");
-        DPRINTK("virtual offset: (%d,%d)\n", var->xoffset, var->yoffset);
-
         /* no range checks for xoffset and yoffset,   */
         /* as fb_pan_display has already done this */
         if (var->vmode & FB_VMODE_YWRAP)
                 return -EINVAL;
 
-        info->var.xoffset = var->xoffset;
-        info->var.yoffset = var->yoffset;
-
         xoffset = var->xoffset * info->var.bits_per_pixel / 8;
-        yoffset = var->yoffset;
 
-        base = yoffset * info->fix.line_length + xoffset;
+        base = var->yoffset * info->fix.line_length + xoffset;
 
         if (info->var.bits_per_pixel == 1) {
                 /* base is already correct */
@@ -1448,14 +1338,15 @@ static int cirrusfb_pan_display(struct fb_var_screeninfo *var,
                 xpix = (unsigned char) ((xoffset % 4) * 2);
         }
 
-        cirrusfb_WaitBLT(cinfo->regbase); /* make sure all the BLT's are done */
+        if (!is_laguna(cinfo))
+                cirrusfb_WaitBLT(cinfo->regbase);
 
         /* lower 8 + 8 bits of screen start address */
-        vga_wcrt(cinfo->regbase, VGA_CRTC_START_LO,
-                 (unsigned char) (base & 0xff));
-        vga_wcrt(cinfo->regbase, VGA_CRTC_START_HI,
-                 (unsigned char) (base >> 8));
+        vga_wcrt(cinfo->regbase, VGA_CRTC_START_LO, base & 0xff);
+        vga_wcrt(cinfo->regbase, VGA_CRTC_START_HI, (base >> 8) & 0xff);
 
+        /* 0xf2 is %11110010, exclude tmp bits */
+        tmp = vga_rcrt(cinfo->regbase, CL_CRT1B) & 0xf2;
         /* construct bits 16, 17 and 18 of screen start address */
         if (base & 0x10000)
                 tmp |= 0x01;
@@ -1464,13 +1355,17 @@ static int cirrusfb_pan_display(struct fb_var_screeninfo *var,
         if (base & 0x40000)
                 tmp |= 0x08;
 
-        /* 0xf2 is %11110010, exclude tmp bits */
-        tmp2 = (vga_rcrt(cinfo->regbase, CL_CRT1B) & 0xf2) | tmp;
-        vga_wcrt(cinfo->regbase, CL_CRT1B, tmp2);
+        vga_wcrt(cinfo->regbase, CL_CRT1B, tmp);
 
         /* construct bit 19 of screen start address */
-        if (cirrusfb_board_info[cinfo->btype].scrn_start_bit19)
-                vga_wcrt(cinfo->regbase, CL_CRT1D, (base >> 12) & 0x80);
+        if (cirrusfb_board_info[cinfo->btype].scrn_start_bit19) {
+                tmp = vga_rcrt(cinfo->regbase, CL_CRT1D);
+                if (is_laguna(cinfo))
+                        tmp = (tmp & ~0x18) | ((base >> 16) & 0x18);
+                else
+                        tmp = (tmp & ~0x80) | ((base >> 12) & 0x80);
+                vga_wcrt(cinfo->regbase, CL_CRT1D, tmp);
+        }
 
         /* write pixel panning value to AR33; this does not quite work in 8bpp
          *
@@ -1479,9 +1374,6 @@ static int cirrusfb_pan_display(struct fb_var_screeninfo *var,
         if (info->var.bits_per_pixel == 1)
                 vga_wattr(cinfo->regbase, CL_AR33, xpix);
 
-        cirrusfb_WaitBLT(cinfo->regbase);
-
-        DPRINTK("EXIT\n");
         return 0;
 }
 
@@ -1502,57 +1394,54 @@ static int cirrusfb_blank(int blank_mode, struct fb_info *info)
         struct cirrusfb_info *cinfo = info->par;
         int current_mode = cinfo->blank_mode;
 
-        DPRINTK("ENTER, blank mode = %d\n", blank_mode);
+        dev_dbg(info->device, "ENTER, blank mode = %d\n", blank_mode);
 
         if (info->state != FBINFO_STATE_RUNNING ||
             current_mode == blank_mode) {
-                DPRINTK("EXIT, returning 0\n");
+                dev_dbg(info->device, "EXIT, returning 0\n");
                 return 0;
         }
 
         /* Undo current */
         if (current_mode == FB_BLANK_NORMAL ||
-            current_mode == FB_BLANK_UNBLANK) {
-                /* unblank the screen */
-                val = vga_rseq(cinfo->regbase, VGA_SEQ_CLOCK_MODE);
+            current_mode == FB_BLANK_UNBLANK)
                 /* clear "FullBandwidth" bit */
-                vga_wseq(cinfo->regbase, VGA_SEQ_CLOCK_MODE, val & 0xdf);
-                /* and undo VESA suspend trickery */
-                vga_wgfx(cinfo->regbase, CL_GRE, 0x00);
-        }
-
-        /* set new */
-        if (blank_mode > FB_BLANK_NORMAL) {
-                /* blank the screen */
-                val = vga_rseq(cinfo->regbase, VGA_SEQ_CLOCK_MODE);
+                val = 0;
+        else
                 /* set "FullBandwidth" bit */
-                vga_wseq(cinfo->regbase, VGA_SEQ_CLOCK_MODE, val | 0x20);
-        }
+                val = 0x20;
+
+        val |= vga_rseq(cinfo->regbase, VGA_SEQ_CLOCK_MODE) & 0xdf;
+        vga_wseq(cinfo->regbase, VGA_SEQ_CLOCK_MODE, val);
 
         switch (blank_mode) {
         case FB_BLANK_UNBLANK:
         case FB_BLANK_NORMAL:
+                val = 0x00;
                 break;
         case FB_BLANK_VSYNC_SUSPEND:
-                vga_wgfx(cinfo->regbase, CL_GRE, 0x04);
+                val = 0x04;
                 break;
         case FB_BLANK_HSYNC_SUSPEND:
-                vga_wgfx(cinfo->regbase, CL_GRE, 0x02);
+                val = 0x02;
                 break;
         case FB_BLANK_POWERDOWN:
-                vga_wgfx(cinfo->regbase, CL_GRE, 0x06);
+                val = 0x06;
                 break;
         default:
-                DPRINTK("EXIT, returning 1\n");
+                dev_dbg(info->device, "EXIT, returning 1\n");
                 return 1;
         }
 
+        vga_wgfx(cinfo->regbase, CL_GRE, val);
+
         cinfo->blank_mode = blank_mode;
-        DPRINTK("EXIT, returning 0\n");
+        dev_dbg(info->device, "EXIT, returning 0\n");
 
         /* Let fbcon do a soft blank for us */
         return (blank_mode == FB_BLANK_NORMAL) ? 1 : 0;
 }
+
 /**** END   Hardware specific Routines **************************************/
 /****************************************************************************/
 /**** BEGIN Internal Routines ***********************************************/
@@ -1562,8 +1451,6 @@ static void init_vgachip(struct fb_info *info)
         struct cirrusfb_info *cinfo = info->par;
         const struct cirrusfb_board_info_rec *bi;
 
-        DPRINTK("ENTER\n");
-
         assert(cinfo != NULL);
 
         bi = &cirrusfb_board_info[cinfo->btype];
@@ -1591,25 +1478,23 @@ static void init_vgachip(struct fb_info *info)
                 /* disable flickerfixer */
                 vga_wcrt(cinfo->regbase, CL_CRT51, 0x00);
                 mdelay(100);
-                /* from Klaus' NetBSD driver: */
-                vga_wgfx(cinfo->regbase, CL_GR2F, 0x00);
-                /* put blitter into 542x compat */
-                vga_wgfx(cinfo->regbase, CL_GR33, 0x00);
                 /* mode */
                 vga_wgfx(cinfo->regbase, CL_GR31, 0x00);
-                break;
-
-        case BT_GD5480:
+        case BT_GD5480:  /* fall through */
                 /* from Klaus' NetBSD driver: */
                 vga_wgfx(cinfo->regbase, CL_GR2F, 0x00);
+        case BT_ALPINE:  /* fall through */
+                /* put blitter into 542x compat */
+                vga_wgfx(cinfo->regbase, CL_GR33, 0x00);
                 break;
 
-        case BT_ALPINE:
+        case BT_LAGUNA:
+        case BT_LAGUNAB:
                 /* Nothing to do to reset the board. */
                 break;
 
         default:
-                printk(KERN_ERR "cirrusfb: Warning: Unknown board type\n");
+                dev_err(info->device, "Warning: Unknown board type\n");
                 break;
         }
 
@@ -1629,31 +1514,28 @@ static void init_vgachip(struct fb_info *info)
                         WGen(cinfo, CL_VSSM2, 0x01);
 
                 /* reset sequencer logic */
-                vga_wseq(cinfo->regbase, CL_SEQR0, 0x03);
+                vga_wseq(cinfo->regbase, VGA_SEQ_RESET, 0x03);
 
                 /* FullBandwidth (video off) and 8/9 dot clock */
                 vga_wseq(cinfo->regbase, VGA_SEQ_CLOCK_MODE, 0x21);
-                /* polarity (-/-), disable access to display memory,
-                 * VGA_CRTC_START_HI base address: color
-                 */
-                WGen(cinfo, VGA_MIS_W, 0xc1);
 
                 /* "magic cookie" - doesn't make any sense to me.. */
 /*      vga_wgfx(cinfo->regbase, CL_GRA, 0xce);   */
                 /* unlock all extension registers */
                 vga_wseq(cinfo->regbase, CL_SEQR6, 0x12);
 
-                /* reset blitter */
-                vga_wgfx(cinfo->regbase, CL_GR31, 0x04);
-
                 switch (cinfo->btype) {
                 case BT_GD5480:
                         vga_wseq(cinfo->regbase, CL_SEQRF, 0x98);
                         break;
                 case BT_ALPINE:
+                case BT_LAGUNA:
+                case BT_LAGUNAB:
                         break;
                 case BT_SD64:
+#ifdef CONFIG_ZORRO
                         vga_wseq(cinfo->regbase, CL_SEQRF, 0xb8);
+#endif
                         break;
                 default:
                         vga_wseq(cinfo->regbase, CL_SEQR16, 0x0f);
@@ -1665,8 +1547,8 @@ static void init_vgachip(struct fb_info *info)
         vga_wseq(cinfo->regbase, VGA_SEQ_PLANE_WRITE, 0xff);
         /* character map select: doesn't even matter in gx mode */
         vga_wseq(cinfo->regbase, VGA_SEQ_CHARACTER_MAP, 0x00);
-        /* memory mode: chain-4, no odd/even, ext. memory */
-        vga_wseq(cinfo->regbase, VGA_SEQ_MEMORY_MODE, 0x0e);
+        /* memory mode: chain4, ext. memory */
+        vga_wseq(cinfo->regbase, VGA_SEQ_MEMORY_MODE, 0x0a);
 
         /* controller-internal base address of video memory */
         if (bi->init_sr07)
@@ -1692,20 +1574,12 @@ static void init_vgachip(struct fb_info *info)
                 vga_wseq(cinfo->regbase, CL_SEQR18, 0x02);
         }
 
-        /* MCLK select etc. */
-        if (bi->init_sr1f)
-                vga_wseq(cinfo->regbase, CL_SEQR1F, bi->sr1f);
-
         /* Screen A preset row scan: none */
         vga_wcrt(cinfo->regbase, VGA_CRTC_PRESET_ROW, 0x00);
         /* Text cursor start: disable text cursor */
         vga_wcrt(cinfo->regbase, VGA_CRTC_CURSOR_START, 0x20);
         /* Text cursor end: - */
         vga_wcrt(cinfo->regbase, VGA_CRTC_CURSOR_END, 0x00);
-        /* Screen start address high: 0 */
-        vga_wcrt(cinfo->regbase, VGA_CRTC_START_HI, 0x00);
-        /* Screen start address low: 0 */
-        vga_wcrt(cinfo->regbase, VGA_CRTC_START_LO, 0x00);
         /* text cursor location high: 0 */
         vga_wcrt(cinfo->regbase, VGA_CRTC_CURSOR_HI, 0x00);
         /* text cursor location low: 0 */
@@ -1713,10 +1587,6 @@ static void init_vgachip(struct fb_info *info)
 
         /* Underline Row scanline: - */
         vga_wcrt(cinfo->regbase, VGA_CRTC_UNDERLINE, 0x00);
-        /* mode control: timing enable, byte mode, no compat modes */
-        vga_wcrt(cinfo->regbase, VGA_CRTC_MODE, 0xc3);
-        /* Line Compare: not needed */
-        vga_wcrt(cinfo->regbase, VGA_CRTC_LINE_COMPARE, 0x00);
         /* ### add 0x40 for text modes with > 30 MHz pixclock */
         /* ext. display controls: ext.adr. wrap */
         vga_wcrt(cinfo->regbase, CL_CRT1B, 0x02);
@@ -1739,7 +1609,9 @@ static void init_vgachip(struct fb_info *info)
         vga_wgfx(cinfo->regbase, VGA_GFX_COMPARE_MASK, 0x0f);
         /* Bit Mask: no mask at all */
         vga_wgfx(cinfo->regbase, VGA_GFX_BIT_MASK, 0xff);
-        if (cinfo->btype == BT_ALPINE)
+
+        if (cinfo->btype == BT_ALPINE || cinfo->btype == BT_SD64 ||
+            is_laguna(cinfo))
                 /* (5434 can't have bit 3 set for bitblt) */
                 vga_wgfx(cinfo->regbase, CL_GRB, 0x20);
         else
@@ -1779,18 +1651,11 @@ static void init_vgachip(struct fb_info *info)
         vga_wattr(cinfo->regbase, VGA_ATC_OVERSCAN, 0x00);
         /* Color Plane enable: Enable all 4 planes */
         vga_wattr(cinfo->regbase, VGA_ATC_PLANE_ENABLE, 0x0f);
-/* ###  vga_wattr(cinfo->regbase, CL_AR33, 0x00); * Pixel Panning: - */
         /* Color Select: - */
         vga_wattr(cinfo->regbase, VGA_ATC_COLOR_PAGE, 0x00);
 
         WGen(cinfo, VGA_PEL_MSK, 0xff); /* Pixel mask: no mask */
 
-        if (cinfo->btype != BT_ALPINE && cinfo->btype != BT_GD5480)
-        /* polarity (-/-), enable display mem,
-         * VGA_CRTC_START_HI i/o base = color
-         */
-                WGen(cinfo, VGA_MIS_W, 0xc3);
-
         /* BLT Start/status: Blitter reset */
         vga_wgfx(cinfo->regbase, CL_GR31, 0x04);
         /* - " -           : "end-of-reset" */
@@ -1798,8 +1663,6 @@ static void init_vgachip(struct fb_info *info)
 
         /* misc... */
         WHDR(cinfo, 0); /* Hidden DAC register: - */
-
-        DPRINTK("EXIT\n");
         return;
 }
 
@@ -1808,8 +1671,6 @@ static void switch_monitor(struct cirrusfb_info *cinfo, int on)
 #ifdef CONFIG_ZORRO /* only works on Zorro boards */
         static int IsOn = 0;    /* XXX not ok for multiple boards */
 
-        DPRINTK("ENTER\n");
-
         if (cinfo->btype == BT_PICASSO4)
                 return;         /* nothing to switch */
         if (cinfo->btype == BT_ALPINE)
@@ -1819,8 +1680,6 @@ static void switch_monitor(struct cirrusfb_info *cinfo, int on)
         if (cinfo->btype == BT_PICASSO) {
                 if ((on && !IsOn) || (!on && IsOn))
                         WSFR(cinfo, 0xff);
-
-                DPRINTK("EXIT\n");
                 return;
         }
         if (on) {
@@ -1847,11 +1706,10 @@ static void switch_monitor(struct cirrusfb_info *cinfo, int on)
                 case BT_SPECTRUM:
                         WSFR(cinfo, 0x4f);
                         break;
-                default: /* do nothing */ break;
+                default: /* do nothing */
+                        break;
                 }
         }
-
-        DPRINTK("EXIT\n");
 #endif /* CONFIG_ZORRO */
 }
 
@@ -1859,6 +1717,17 @@ static void switch_monitor(struct cirrusfb_info *cinfo, int on)
 /* Linux 2.6-style  accelerated functions */
 /******************************************/
 
+static int cirrusfb_sync(struct fb_info *info)
+{
+        struct cirrusfb_info *cinfo = info->par;
+
+        if (!is_laguna(cinfo)) {
+                while (vga_rgfx(cinfo->regbase, CL_GR31) & 0x03)
+                        cpu_relax();
+        }
+        return 0;
+}
+
 static void cirrusfb_fillrect(struct fb_info *info,
                               const struct fb_fillrect *region)
 {
@@ -1894,8 +1763,8 @@ static void cirrusfb_fillrect(struct fb_info *info,
                           info->var.bits_per_pixel,
                           (region->dx * m) / 8, region->dy,
                           (region->width * m) / 8, region->height,
-                          color,
-                          info->fix.line_length);
+                          color, color,
+                          info->fix.line_length, 0x40);
 }
 
 static void cirrusfb_copyarea(struct fb_info *info,
@@ -1943,9 +1812,46 @@ static void cirrusfb_imageblit(struct fb_info *info,
                                const struct fb_image *image)
 {
         struct cirrusfb_info *cinfo = info->par;
+        unsigned char op = (info->var.bits_per_pixel == 24) ? 0xc : 0x4;
 
-        cirrusfb_WaitBLT(cinfo->regbase);
-        cfb_imageblit(info, image);
+        if (info->state != FBINFO_STATE_RUNNING)
+                return;
+        /* Alpine/SD64 does not work at 24bpp ??? */
+        if (info->flags & FBINFO_HWACCEL_DISABLED || image->depth != 1)
+                cfb_imageblit(info, image);
+        else if ((cinfo->btype == BT_ALPINE || cinfo->btype == BT_SD64) &&
+                  op == 0xc)
+                cfb_imageblit(info, image);
+        else {
+                unsigned size = ((image->width + 7) >> 3) * image->height;
+                int m = info->var.bits_per_pixel;
+                u32 fg, bg;
+
+                if (info->var.bits_per_pixel == 8) {
+                        fg = image->fg_color;
+                        bg = image->bg_color;
+                } else {
+                        fg = ((u32 *)(info->pseudo_palette))[image->fg_color];
+                        bg = ((u32 *)(info->pseudo_palette))[image->bg_color];
+                }
+                if (info->var.bits_per_pixel == 24) {
+                        /* clear background first */
+                        cirrusfb_RectFill(cinfo->regbase,
+                                          info->var.bits_per_pixel,
+                                          (image->dx * m) / 8, image->dy,
+                                          (image->width * m) / 8,
+                                          image->height,
+                                          bg, bg,
+                                          info->fix.line_length, 0x40);
+                }
+                cirrusfb_RectFill(cinfo->regbase,
+                                  info->var.bits_per_pixel,
+                                  (image->dx * m) / 8, image->dy,
+                                  (image->width * m) / 8, image->height,
+                                  fg, bg,
+                                  info->fix.line_length, op);
+                memcpy(info->screen_base, image->data, size);
+        }
 }
 
 #ifdef CONFIG_PPC_PREP
@@ -1953,12 +1859,8 @@ static void cirrusfb_imageblit(struct fb_info *info,
 #define PREP_IO_BASE    ((volatile unsigned char *) 0x80000000)
 static void get_prep_addrs(unsigned long *display, unsigned long *registers)
 {
-        DPRINTK("ENTER\n");
-
         *display = PREP_VIDEO_BASE;
         *registers = (unsigned long) PREP_IO_BASE;
-
-        DPRINTK("EXIT\n");
 }
 
 #endif                          /* CONFIG_PPC_PREP */
@@ -1970,40 +1872,43 @@ static int release_io_ports;
  * based on the DRAM bandwidth bit and DRAM bank switching bit.  This
  * works with 1MB, 2MB and 4MB configurations (which the Motorola boards
  * seem to have. */
-static unsigned int __devinit cirrusfb_get_memsize(u8 __iomem *regbase)
+static unsigned int __devinit cirrusfb_get_memsize(struct fb_info *info,
+                                                   u8 __iomem *regbase)
 {
         unsigned long mem;
-        unsigned char SRF;
+        struct cirrusfb_info *cinfo = info->par;
 
-        DPRINTK("ENTER\n");
+        if (is_laguna(cinfo)) {
+                unsigned char SR14 = vga_rseq(regbase, CL_SEQR14);
 
-        SRF = vga_rseq(regbase, CL_SEQRF);
-        switch ((SRF & 0x18)) {
-        case 0x08:
-                mem = 512 * 1024;
-                break;
-        case 0x10:
-                mem = 1024 * 1024;
-                break;
-        /* 64-bit DRAM data bus width; assume 2MB. Also indicates 2MB memory
-         * on the 5430.
-         */
-        case 0x18:
-                mem = 2048 * 1024;
-                break;
-        default:
-                printk(KERN_WARNING "CLgenfb: Unknown memory size!\n");
-                mem = 1024 * 1024;
+                mem = ((SR14 & 7) + 1) << 20;
+        } else {
+                unsigned char SRF = vga_rseq(regbase, CL_SEQRF);
+                switch ((SRF & 0x18)) {
+                case 0x08:
+                        mem = 512 * 1024;
+                        break;
+                case 0x10:
+                        mem = 1024 * 1024;
+                        break;
+                /* 64-bit DRAM data bus width; assume 2MB.
+                 * Also indicates 2MB memory on the 5430.
+                 */
+                case 0x18:
+                        mem = 2048 * 1024;
+                        break;
+                default:
+                        dev_warn(info->device, "Unknown memory size!\n");
+                        mem = 1024 * 1024;
+                }
+                /* If DRAM bank switching is enabled, there must be
+                 * twice as much memory installed. (4MB on the 5434)
+                 */
+                if (cinfo->btype != BT_ALPINE && (SRF & 0x80) != 0)
+                        mem *= 2;
         }
-        if (SRF & 0x80)
-        /* If DRAM bank switching is enabled, there must be twice as much
-         * memory installed. (4MB on the 5434)
-         */
-                mem *= 2;
 
         /* TODO: Handling of GD5446/5480 (see XF86 sources ...) */
-
-        DPRINTK("EXIT\n");
         return mem;
 }
 
@@ -2014,8 +1919,6 @@ static void get_pci_addrs(const struct pci_dev *pdev,
         assert(display != NULL);
         assert(registers != NULL);
 
-        DPRINTK("ENTER\n");
-
         *display = 0;
         *registers = 0;
 
@@ -2030,14 +1933,15 @@ static void get_pci_addrs(const struct pci_dev *pdev,
         }
 
         assert(*display != 0);
-
-        DPRINTK("EXIT\n");
 }
 
 static void cirrusfb_pci_unmap(struct fb_info *info)
 {
         struct pci_dev *pdev = to_pci_dev(info->device);
+        struct cirrusfb_info *cinfo = info->par;
 
+        if (cinfo->laguna_mmio == NULL)
+                iounmap(cinfo->laguna_mmio);
         iounmap(info->screen_base);
 #if 0 /* if system didn't claim this region, we would... */
         release_mem_region(0xA0000, 65535);
@@ -2067,6 +1971,22 @@ static void cirrusfb_zorro_unmap(struct fb_info *info)
 }
 #endif /* CONFIG_ZORRO */
 
+/* function table of the above functions */
+static struct fb_ops cirrusfb_ops = {
+        .owner          = THIS_MODULE,
+        .fb_open        = cirrusfb_open,
+        .fb_release     = cirrusfb_release,
+        .fb_setcolreg   = cirrusfb_setcolreg,
+        .fb_check_var   = cirrusfb_check_var,
+        .fb_set_par     = cirrusfb_set_par,
+        .fb_pan_display = cirrusfb_pan_display,
+        .fb_blank       = cirrusfb_blank,
+        .fb_fillrect    = cirrusfb_fillrect,
+        .fb_copyarea    = cirrusfb_copyarea,
+        .fb_sync        = cirrusfb_sync,
+        .fb_imageblit   = cirrusfb_imageblit,
+};
+
 static int __devinit cirrusfb_set_fbinfo(struct fb_info *info)
 {
         struct cirrusfb_info *cinfo = info->par;
@@ -2077,10 +1997,16 @@ static int __devinit cirrusfb_set_fbinfo(struct fb_info *info)
                     | FBINFO_HWACCEL_XPAN
                     | FBINFO_HWACCEL_YPAN
                     | FBINFO_HWACCEL_FILLRECT
+                    | FBINFO_HWACCEL_IMAGEBLIT
                     | FBINFO_HWACCEL_COPYAREA;
-        if (noaccel)
+        if (noaccel || is_laguna(cinfo)) {
                 info->flags |= FBINFO_HWACCEL_DISABLED;
+                info->fix.accel = FB_ACCEL_NONE;
+        } else
+                info->fix.accel = FB_ACCEL_CIRRUS_ALPINE;
+
         info->fbops = &cirrusfb_ops;
+
         if (cinfo->btype == BT_GD5480) {
                 if (var->bits_per_pixel == 16)
                         info->screen_base += 1 * MB_;
@@ -2104,7 +2030,6 @@ static int __devinit cirrusfb_set_fbinfo(struct fb_info *info)
 
         /* FIXME: map region at 0xB8000 if available, fill in here */
         info->fix.mmio_len   = 0;
-        info->fix.accel = FB_ACCEL_NONE;
 
         fb_alloc_cmap(&info->cmap, 256, 0);
 
@@ -2115,70 +2040,56 @@ static int __devinit cirrusfb_register(struct fb_info *info)
 {
         struct cirrusfb_info *cinfo = info->par;
         int err;
-        enum cirrus_board btype;
-
-        DPRINTK("ENTER\n");
-
-        printk(KERN_INFO "cirrusfb: Driver for Cirrus Logic based "
-                "graphic boards, v" CIRRUSFB_VERSION "\n");
-
-        btype = cinfo->btype;
 
         /* sanity checks */
-        assert(btype != BT_NONE);
+        assert(cinfo->btype != BT_NONE);
 
         /* set all the vital stuff */
         cirrusfb_set_fbinfo(info);
 
-        DPRINTK("cirrusfb: (RAM start set to: 0x%p)\n", info->screen_base);
+        dev_dbg(info->device, "(RAM start set to: 0x%p)\n", info->screen_base);
 
         err = fb_find_mode(&info->var, info, mode_option, NULL, 0, NULL, 8);
         if (!err) {
-                DPRINTK("wrong initial video mode\n");
+                dev_dbg(info->device, "wrong initial video mode\n");
                 err = -EINVAL;
                 goto err_dealloc_cmap;
         }
 
         info->var.activate = FB_ACTIVATE_NOW;
 
-        err = cirrusfb_decode_var(&info->var, &cinfo->currentmode, info);
+        err = cirrusfb_check_var(&info->var, info);
         if (err < 0) {
                 /* should never happen */
-                DPRINTK("choking on default var... umm, no good.\n");
+                dev_dbg(info->device,
+                        "choking on default var... umm, no good.\n");
                 goto err_dealloc_cmap;
         }
 
         err = register_framebuffer(info);
         if (err < 0) {
-                printk(KERN_ERR "cirrusfb: could not register "
-                        "fb device; err = %d!\n", err);
+                dev_err(info->device,
+                        "could not register fb device; err = %d!\n", err);
                 goto err_dealloc_cmap;
         }
 
-        DPRINTK("EXIT, returning 0\n");
         return 0;
 
 err_dealloc_cmap:
         fb_dealloc_cmap(&info->cmap);
-        cinfo->unmap(info);
-        framebuffer_release(info);
         return err;
 }
 
 static void __devexit cirrusfb_cleanup(struct fb_info *info)
 {
         struct cirrusfb_info *cinfo = info->par;
-        DPRINTK("ENTER\n");
 
         switch_monitor(cinfo, 0);
-
         unregister_framebuffer(info);
         fb_dealloc_cmap(&info->cmap);
-        printk("Framebuffer unregistered\n");
+        dev_dbg(info->device, "Framebuffer unregistered\n");
         cinfo->unmap(info);
         framebuffer_release(info);
-
-        DPRINTK("EXIT\n");
 }
 
 #ifdef CONFIG_PCI
@@ -2187,7 +2098,6 @@ static int __devinit cirrusfb_pci_register(struct pci_dev *pdev,
 {
         struct cirrusfb_info *cinfo;
         struct fb_info *info;
-        enum cirrus_board btype;
         unsigned long board_addr, board_size;
         int ret;
 
@@ -2201,15 +2111,17 @@ static int __devinit cirrusfb_pci_register(struct pci_dev *pdev,
         if (!info) {
                 printk(KERN_ERR "cirrusfb: could not allocate memory\n");
                 ret = -ENOMEM;
-                goto err_disable;
+                goto err_out;
         }
 
         cinfo = info->par;
-        cinfo->btype = btype = (enum cirrus_board) ent->driver_data;
+        cinfo->btype = (enum cirrus_board) ent->driver_data;
 
-        DPRINTK(" Found PCI device, base address 0 is 0x%x, btype set to %d\n",
-                pdev->resource[0].start, btype);
-        DPRINTK(" base address 1 is 0x%x\n", pdev->resource[1].start);
+        dev_dbg(info->device,
+                " Found PCI device, base address 0 is 0x%Lx, btype set to %d\n",
+                (unsigned long long)pdev->resource[0].start,  cinfo->btype);
+        dev_dbg(info->device, " base address 1 is 0x%Lx\n",
+                (unsigned long long)pdev->resource[1].start);
 
         if (isPReP) {
                 pci_write_config_dword(pdev, PCI_BASE_ADDRESS_0, 0x00000000);
@@ -2219,30 +2131,30 @@ static int __devinit cirrusfb_pci_register(struct pci_dev *pdev,
         /* PReP dies if we ioremap the IO registers, but it works w/out... */
                 cinfo->regbase = (char __iomem *) info->fix.mmio_start;
         } else {
-                DPRINTK("Attempt to get PCI info for Cirrus Graphics Card\n");
+                dev_dbg(info->device,
+                        "Attempt to get PCI info for Cirrus Graphics Card\n");
                 get_pci_addrs(pdev, &board_addr, &info->fix.mmio_start);
                 /* FIXME: this forces VGA.  alternatives? */
                 cinfo->regbase = NULL;
+                cinfo->laguna_mmio = ioremap(info->fix.mmio_start, 0x1000);
         }
 
-        DPRINTK("Board address: 0x%lx, register address: 0x%lx\n",
+        dev_dbg(info->device, "Board address: 0x%lx, register address: 0x%lx\n",
                 board_addr, info->fix.mmio_start);
 
-        board_size = (btype == BT_GD5480) ?
-                32 * MB_ : cirrusfb_get_memsize(cinfo->regbase);
+        board_size = (cinfo->btype == BT_GD5480) ?
+                32 * MB_ : cirrusfb_get_memsize(info, cinfo->regbase);
 
         ret = pci_request_regions(pdev, "cirrusfb");
         if (ret < 0) {
-                printk(KERN_ERR "cirrusfb: cannot reserve region 0x%lx, "
-                       "abort\n",
-                       board_addr);
+                dev_err(info->device, "cannot reserve region 0x%lx, abort\n",
+                        board_addr);
                 goto err_release_fb;
         }
 #if 0 /* if the system didn't claim this region, we would... */
         if (!request_mem_region(0xA0000, 65535, "cirrusfb")) {
-                printk(KERN_ERR "cirrusfb: cannot reserve region 0x%lx, abort\n"
-,
-                       0xA0000L);
+                dev_err(info->device, "cannot reserve region 0x%lx, abort\n",
+                        0xA0000L);
                 ret = -EBUSY;
                 goto err_release_regions;
         }
@@ -2260,16 +2172,17 @@ static int __devinit cirrusfb_pci_register(struct pci_dev *pdev,
         info->screen_size = board_size;
         cinfo->unmap = cirrusfb_pci_unmap;
 
-        printk(KERN_INFO "RAM (%lu kB) at 0x%lx, Cirrus "
-                        "Logic chipset on PCI bus\n",
-                        info->screen_size >> 10, board_addr);
+        dev_info(info->device,
+                 "Cirrus Logic chipset on PCI bus, RAM (%lu kB) at 0x%lx\n",
+                 info->screen_size >> 10, board_addr);
         pci_set_drvdata(pdev, info);
 
         ret = cirrusfb_register(info);
-        if (ret)
-                iounmap(info->screen_base);
-        return ret;
+        if (!ret)
+                return 0;
 
+        pci_set_drvdata(pdev, NULL);
+        iounmap(info->screen_base);
 err_release_legacy:
         if (release_io_ports)
                 release_region(0x3C0, 32);
@@ -2279,8 +2192,9 @@ err_release_regions:
 #endif
         pci_release_regions(pdev);
 err_release_fb:
+        if (cinfo->laguna_mmio != NULL)
+                iounmap(cinfo->laguna_mmio);
         framebuffer_release(info);
-err_disable:
 err_out:
         return ret;
 }
@@ -2288,11 +2202,8 @@ err_out:
 static void __devexit cirrusfb_pci_unregister(struct pci_dev *pdev)
 {
         struct fb_info *info = pci_get_drvdata(pdev);
-        DPRINTK("ENTER\n");
 
         cirrusfb_cleanup(info);
-
-        DPRINTK("EXIT\n");
 }
 
 static struct pci_driver cirrusfb_pci_driver = {
@@ -2324,8 +2235,6 @@ static int __devinit cirrusfb_zorro_register(struct zorro_dev *z,
         if (cirrusfb_zorro_table2[btype].id2)
                 z2 = zorro_find_device(cirrusfb_zorro_table2[btype].id2, NULL);
         size = cirrusfb_zorro_table2[btype].size;
-        printk(KERN_INFO "cirrusfb: %s board detected; ",
-               cirrusfb_board_info[btype].name);
 
         info = framebuffer_alloc(sizeof(struct cirrusfb_info), &z->dev);
         if (!info) {
@@ -2334,6 +2243,9 @@ static int __devinit cirrusfb_zorro_register(struct zorro_dev *z,
                 goto err_out;
         }
 
+        dev_info(info->device, "%s board detected\n",
+                 cirrusfb_board_info[btype].name);
+
         cinfo = info->par;
         cinfo->btype = btype;
 
@@ -2345,19 +2257,16 @@ static int __devinit cirrusfb_zorro_register(struct zorro_dev *z,
         info->screen_size = size;
 
         if (!zorro_request_device(z, "cirrusfb")) {
-                printk(KERN_ERR "cirrusfb: cannot reserve region 0x%lx, "
-                       "abort\n",
-                       board_addr);
+                dev_err(info->device, "cannot reserve region 0x%lx, abort\n",
+                        board_addr);
                 ret = -EBUSY;
                 goto err_release_fb;
         }
 
-        printk(" RAM (%lu MB) at $%lx, ", board_size / MB_, board_addr);
-
         ret = -EIO;
 
         if (btype == BT_PICASSO4) {
-                printk(KERN_INFO " REG at $%lx\n", board_addr + 0x600000);
+                dev_info(info->device, " REG at $%lx\n", board_addr + 0x600000);
 
                 /* To be precise, for the P4 this is not the */
                 /* begin of the board, but the begin of RAM. */
@@ -2367,7 +2276,7 @@ static int __devinit cirrusfb_zorro_register(struct zorro_dev *z,
                 if (!cinfo->regbase)
                         goto err_release_region;
 
-                DPRINTK("cirrusfb: Virtual address for board set to: $%p\n",
+                dev_dbg(info->device, "Virtual address for board set to: $%p\n",
                         cinfo->regbase);
                 cinfo->regbase += 0x600000;
                 info->fix.mmio_start = board_addr + 0x600000;
@@ -2377,8 +2286,8 @@ static int __devinit cirrusfb_zorro_register(struct zorro_dev *z,
                 if (!info->screen_base)
                         goto err_unmap_regbase;
         } else {
-                printk(KERN_INFO " REG at $%lx\n",
-                        (unsigned long) z2->resource.start);
+                dev_info(info->device, " REG at $%lx\n",
+                         (unsigned long) z2->resource.start);
 
                 info->fix.smem_start = board_addr;
                 if (board_addr > 0x01000000)
@@ -2392,27 +2301,32 @@ static int __devinit cirrusfb_zorro_register(struct zorro_dev *z,
                 cinfo->regbase = (caddr_t) ZTWO_VADDR(z2->resource.start);
                 info->fix.mmio_start = z2->resource.start;
 
-                DPRINTK("cirrusfb: Virtual address for board set to: $%p\n",
+                dev_dbg(info->device, "Virtual address for board set to: $%p\n",
                         cinfo->regbase);
         }
         cinfo->unmap = cirrusfb_zorro_unmap;
 
-        printk(KERN_INFO "Cirrus Logic chipset on Zorro bus\n");
+        dev_info(info->device,
+                 "Cirrus Logic chipset on Zorro bus, RAM (%lu MB) at $%lx\n",
+                 board_size / MB_, board_addr);
+
         zorro_set_drvdata(z, info);
 
+        /* MCLK select etc. */
+        if (cirrusfb_board_info[btype].init_sr1f)
+                vga_wseq(cinfo->regbase, CL_SEQR1F,
+                         cirrusfb_board_info[btype].sr1f);
+
         ret = cirrusfb_register(info);
-        if (ret) {
-                if (btype == BT_PICASSO4) {
-                        iounmap(info->screen_base);
-                        iounmap(cinfo->regbase - 0x600000);
-                } else if (board_addr > 0x01000000)
-                        iounmap(info->screen_base);
-        }
-        return ret;
+        if (!ret)
+                return 0;
+
+        if (btype == BT_PICASSO4 || board_addr > 0x01000000)
+                iounmap(info->screen_base);
 
 err_unmap_regbase:
-        /* Parental advisory: explicit hack */
-        iounmap(cinfo->regbase - 0x600000);
+        if (btype == BT_PICASSO4)
+                iounmap(cinfo->regbase - 0x600000);
 err_release_region:
         release_region(board_addr, board_size);
 err_release_fb:
@@ -2424,11 +2338,8 @@ err_out:
 void __devexit cirrusfb_zorro_unregister(struct zorro_dev *z)
 {
         struct fb_info *info = zorro_get_drvdata(z);
-        DPRINTK("ENTER\n");
 
         cirrusfb_cleanup(info);
-
-        DPRINTK("EXIT\n");
 }
 
 static struct zorro_driver cirrusfb_zorro_driver = {
@@ -2439,33 +2350,11 @@ static struct zorro_driver cirrusfb_zorro_driver = {
 };
 #endif /* CONFIG_ZORRO */
 
-static int __init cirrusfb_init(void)
-{
-        int error = 0;
-
 #ifndef MODULE
-        char *option = NULL;
-
-        if (fb_get_options("cirrusfb", &option))
-                return -ENODEV;
-        cirrusfb_setup(option);
-#endif
-
-#ifdef CONFIG_ZORRO
-        error |= zorro_register_driver(&cirrusfb_zorro_driver);
-#endif
-#ifdef CONFIG_PCI
-        error |= pci_register_driver(&cirrusfb_pci_driver);
-#endif
-        return error;
-}
-
-#ifndef MODULE
-static int __init cirrusfb_setup(char *options) {
+static int __init cirrusfb_setup(char *options)
+{
         char *this_opt;
 
-        DPRINTK("ENTER\n");
-
         if (!options || !*options)
                 return 0;
 
@@ -2473,8 +2362,6 @@ static int __init cirrusfb_setup(char *options) {
                 if (!*this_opt)
                         continue;
 
-                DPRINTK("cirrusfb_setup: option '%s'\n", this_opt);
-
                 if (!strcmp(this_opt, "noaccel"))
                         noaccel = 1;
                 else if (!strncmp(this_opt, "mode:", 5))
@@ -2494,6 +2381,27 @@ MODULE_AUTHOR("Copyright 1999,2000 Jeff Garzik <jgarzik@pobox.com>");
 MODULE_DESCRIPTION("Accelerated FBDev driver for Cirrus Logic chips");
 MODULE_LICENSE("GPL");
 
+static int __init cirrusfb_init(void)
+{
+        int error = 0;
+
+#ifndef MODULE
+        char *option = NULL;
+
+        if (fb_get_options("cirrusfb", &option))
+                return -ENODEV;
+        cirrusfb_setup(option);
+#endif
+
+#ifdef CONFIG_ZORRO
+        error |= zorro_register_driver(&cirrusfb_zorro_driver);
+#endif
+#ifdef CONFIG_PCI
+        error |= pci_register_driver(&cirrusfb_pci_driver);
+#endif
+        return error;
+}
+
 static void __exit cirrusfb_exit(void)
 {
 #ifdef CONFIG_PCI
@@ -2560,8 +2468,6 @@ static void AttrOn(const struct cirrusfb_info *cinfo)
 {
         assert(cinfo != NULL);
 
-        DPRINTK("ENTER\n");
-
         if (vga_rcrt(cinfo->regbase, CL_CRT24) & 0x80) {
                 /* if we're just in "write value" mode, write back the */
                 /* same value as before to not modify anything */
@@ -2574,8 +2480,6 @@ static void AttrOn(const struct cirrusfb_info *cinfo)
 
         /* dummy write on Reg0 to be on "write index" mode next time */
         vga_w(cinfo->regbase, VGA_ATT_IW, 0x00);
-
-        DPRINTK("EXIT\n");
 }
 
 /*** WHDR() - write into the Hidden DAC register ***/
@@ -2588,6 +2492,8 @@ static void WHDR(const struct cirrusfb_info *cinfo, unsigned char val)
 {
         unsigned char dummy;
 
+        if (is_laguna(cinfo))
+                return;
         if (cinfo->btype == BT_PICASSO) {
                 /* Klaus' hint for correct access to HDR on some boards */
                 /* first write 0 to pixel mask (3c6) */
@@ -2655,7 +2561,8 @@ static void WClut(struct cirrusfb_info *cinfo, unsigned char regnum, unsigned ch
         vga_w(cinfo->regbase, VGA_PEL_IW, regnum);
 
         if (cinfo->btype == BT_PICASSO || cinfo->btype == BT_PICASSO4 ||
-            cinfo->btype == BT_ALPINE || cinfo->btype == BT_GD5480) {
+            cinfo->btype == BT_ALPINE || cinfo->btype == BT_GD5480 ||
+            cinfo->btype == BT_SD64 || is_laguna(cinfo)) {
                 /* but DAC data register IS, at least for Picasso II */
                 if (cinfo->btype == BT_PICASSO)
                         data += 0xfff;
@@ -2702,9 +2609,8 @@ static void RClut(struct cirrusfb_info *cinfo, unsigned char regnum, unsigned ch
 /* FIXME: use interrupts instead */
 static void cirrusfb_WaitBLT(u8 __iomem *regbase)
 {
-        /* now busy-wait until we're done */
         while (vga_rgfx(regbase, CL_GR31) & 0x08)
-                /* do nothing */ ;
+                cpu_relax();
 }
 
 /*******************************************************************
@@ -2713,60 +2619,12 @@ static void cirrusfb_WaitBLT(u8 __iomem *regbase)
         perform accelerated "scrolling"
 ********************************************************************/
 
-static void cirrusfb_BitBLT(u8 __iomem *regbase, int bits_per_pixel,
-                            u_short curx, u_short cury,
-                            u_short destx, u_short desty,
-                            u_short width, u_short height,
-                            u_short line_length)
-{
-        u_short nwidth, nheight;
-        u_long nsrc, ndest;
-        u_char bltmode;
-
-        DPRINTK("ENTER\n");
-
-        nwidth = width - 1;
-        nheight = height - 1;
-
-        bltmode = 0x00;
-        /* if source adr < dest addr, do the Blt backwards */
-        if (cury <= desty) {
-                if (cury == desty) {
-                        /* if src and dest are on the same line, check x */
-                        if (curx < destx)
-                                bltmode |= 0x01;
-                } else
-                        bltmode |= 0x01;
-        }
-        if (!bltmode) {
-                /* standard case: forward blitting */
-                nsrc = (cury * line_length) + curx;
-                ndest = (desty * line_length) + destx;
-        } else {
-                /* this means start addresses are at the end,
-                 * counting backwards
-                 */
-                nsrc = cury * line_length + curx +
-                        nheight * line_length + nwidth;
-                ndest = desty * line_length + destx +
-                        nheight * line_length + nwidth;
-        }
-
-        /*
-           run-down of registers to be programmed:
-           destination pitch
-           source pitch
-           BLT width/height
-           source start
-           destination start
-           BLT mode
-           BLT ROP
-           VGA_GFX_SR_VALUE / VGA_GFX_SR_ENABLE: "fill color"
-           start/stop
-         */
-
-        cirrusfb_WaitBLT(regbase);
+static void cirrusfb_set_blitter(u8 __iomem *regbase,
+                            u_short nwidth, u_short nheight,
+                            u_long nsrc, u_long ndest,
+                            u_short bltmode, u_short line_length)
 
+{
         /* pitch: set to line_length */
         /* dest pitch low */
         vga_wgfx(regbase, CL_GR24, line_length & 0xff);
@@ -2813,91 +2671,91 @@ static void cirrusfb_BitBLT(u8 __iomem *regbase, int bits_per_pixel,
 
         /* and finally: GO! */
         vga_wgfx(regbase, CL_GR31, 0x02);       /* BLT Start/status */
-
-        DPRINTK("EXIT\n");
 }
 
 /*******************************************************************
-        cirrusfb_RectFill()
+        cirrusfb_BitBLT()
 
-        perform accelerated rectangle fill
+        perform accelerated "scrolling"
 ********************************************************************/
 
-static void cirrusfb_RectFill(u8 __iomem *regbase, int bits_per_pixel,
-                     u_short x, u_short y, u_short width, u_short height,
-                     u_char color, u_short line_length)
+static void cirrusfb_BitBLT(u8 __iomem *regbase, int bits_per_pixel,
+                            u_short curx, u_short cury,
+                            u_short destx, u_short desty,
+                            u_short width, u_short height,
+                            u_short line_length)
 {
-        u_short nwidth, nheight;
-        u_long ndest;
-        u_char op;
-
-        DPRINTK("ENTER\n");
-
-        nwidth = width - 1;
-        nheight = height - 1;
+        u_short nwidth = width - 1;
+        u_short nheight = height - 1;
+        u_long nsrc, ndest;
+        u_char bltmode;
 
-        ndest = (y * line_length) + x;
+        bltmode = 0x00;
+        /* if source adr < dest addr, do the Blt backwards */
+        if (cury <= desty) {
+                if (cury == desty) {
+                        /* if src and dest are on the same line, check x */
+                        if (curx < destx)
+                                bltmode |= 0x01;
+                } else
+                        bltmode |= 0x01;
+        }
+        /* standard case: forward blitting */
+        nsrc = (cury * line_length) + curx;
+        ndest = (desty * line_length) + destx;
+        if (bltmode) {
+                /* this means start addresses are at the end,
+                 * counting backwards
+                 */
+                nsrc += nheight * line_length + nwidth;
+                ndest += nheight * line_length + nwidth;
+        }
 
         cirrusfb_WaitBLT(regbase);
 
-        /* pitch: set to line_length */
-        vga_wgfx(regbase, CL_GR24, line_length & 0xff); /* dest pitch low */
-        vga_wgfx(regbase, CL_GR25, line_length >> 8);   /* dest pitch hi */
-        vga_wgfx(regbase, CL_GR26, line_length & 0xff); /* source pitch low */
-        vga_wgfx(regbase, CL_GR27, line_length >> 8);   /* source pitch hi */
+        cirrusfb_set_blitter(regbase, nwidth, nheight,
+                            nsrc, ndest, bltmode, line_length);
+}
 
-        /* BLT width: actual number of pixels - 1 */
-        vga_wgfx(regbase, CL_GR20, nwidth & 0xff);      /* BLT width low */
-        vga_wgfx(regbase, CL_GR21, nwidth >> 8);        /* BLT width hi */
+/*******************************************************************
+        cirrusfb_RectFill()
 
-        /* BLT height: actual number of lines -1 */
-        vga_wgfx(regbase, CL_GR22, nheight & 0xff);     /* BLT height low */
-        vga_wgfx(regbase, CL_GR23, nheight >> 8);       /* BLT width hi */
+        perform accelerated rectangle fill
+********************************************************************/
 
-        /* BLT destination */
-        /* BLT dest low */
-        vga_wgfx(regbase, CL_GR28, (u_char) (ndest & 0xff));
-        /* BLT dest mid */
-        vga_wgfx(regbase, CL_GR29, (u_char) (ndest >> 8));
-        /* BLT dest hi */
-        vga_wgfx(regbase, CL_GR2A, (u_char) (ndest >> 16));
+static void cirrusfb_RectFill(u8 __iomem *regbase, int bits_per_pixel,
+                     u_short x, u_short y, u_short width, u_short height,
+                     u32 fg_color, u32 bg_color, u_short line_length,
+                     u_char blitmode)
+{
+        u_long ndest = (y * line_length) + x;
+        u_char op;
 
-        /* BLT source: set to 0 (is a dummy here anyway) */
-        vga_wgfx(regbase, CL_GR2C, 0x00);       /* BLT src low */
-        vga_wgfx(regbase, CL_GR2D, 0x00);       /* BLT src mid */
-        vga_wgfx(regbase, CL_GR2E, 0x00);       /* BLT src hi */
+        cirrusfb_WaitBLT(regbase);
 
         /* This is a ColorExpand Blt, using the */
         /* same color for foreground and background */
-        vga_wgfx(regbase, VGA_GFX_SR_VALUE, color);     /* foreground color */
-        vga_wgfx(regbase, VGA_GFX_SR_ENABLE, color);    /* background color */
-
-        op = 0xc0;
-        if (bits_per_pixel == 16) {
-                vga_wgfx(regbase, CL_GR10, color);      /* foreground color */
-                vga_wgfx(regbase, CL_GR11, color);      /* background color */
-                op = 0x50;
-                op = 0xd0;
-        } else if (bits_per_pixel == 32) {
-                vga_wgfx(regbase, CL_GR10, color);      /* foreground color */
-                vga_wgfx(regbase, CL_GR11, color);      /* background color */
-                vga_wgfx(regbase, CL_GR12, color);      /* foreground color */
-                vga_wgfx(regbase, CL_GR13, color);      /* background color */
-                vga_wgfx(regbase, CL_GR14, 0);  /* foreground color */
-                vga_wgfx(regbase, CL_GR15, 0);  /* background color */
-                op = 0x50;
-                op = 0xf0;
-        }
-        /* BLT mode: color expand, Enable 8x8 copy (faster?) */
-        vga_wgfx(regbase, CL_GR30, op); /* BLT mode */
-
-        /* BLT ROP: SrcCopy */
-        vga_wgfx(regbase, CL_GR32, 0x0d);       /* BLT ROP */
-
-        /* and finally: GO! */
-        vga_wgfx(regbase, CL_GR31, 0x02);       /* BLT Start/status */
-
-        DPRINTK("EXIT\n");
+        vga_wgfx(regbase, VGA_GFX_SR_VALUE, bg_color);
+        vga_wgfx(regbase, VGA_GFX_SR_ENABLE, fg_color);
+
+        op = 0x80;
+        if (bits_per_pixel >= 16) {
+                vga_wgfx(regbase, CL_GR10, bg_color >> 8);
+                vga_wgfx(regbase, CL_GR11, fg_color >> 8);
+                op = 0x90;
+        }
+        if (bits_per_pixel >= 24) {
+                vga_wgfx(regbase, CL_GR12, bg_color >> 16);
+                vga_wgfx(regbase, CL_GR13, fg_color >> 16);
+                op = 0xa0;
+        }
+        if (bits_per_pixel == 32) {
+                vga_wgfx(regbase, CL_GR14, bg_color >> 24);
+                vga_wgfx(regbase, CL_GR15, fg_color >> 24);
+                op = 0xb0;
+        }
+        cirrusfb_set_blitter(regbase, width - 1, height - 1,
+                            0, ndest, op | blitmode, line_length);
 }
 
 /**************************************************************************
@@ -2917,8 +2775,6 @@ static void bestclock(long freq, int *nom, int *den, int *div)
         *den = 0;
         *div = 0;
 
-        DPRINTK("ENTER\n");
-
         if (freq < 8000)
                 freq = 8000;
 
@@ -2960,12 +2816,6 @@ static void bestclock(long freq, int *nom, int *den, int *div)
                         }
                 }
         }
-
-        DPRINTK("Best possible values for given frequency:\n");
-        DPRINTK("       freq: %ld kHz  nom: %d  den: %d  div: %d\n",
-                freq, *nom, *den, *div);
-
-        DPRINTK("EXIT\n");
 }
 
 /* -------------------------------------------------------------------------
@@ -2978,32 +2828,6 @@ static void bestclock(long freq, int *nom, int *den, int *div)
 #ifdef CIRRUSFB_DEBUG
 
 /**
- * cirrusfb_dbg_print_byte
- * @name: name associated with byte value to be displayed
- * @val: byte value to be displayed
- *
- * DESCRIPTION:
- * Display an indented string, along with a hexidecimal byte value, and
- * its decoded bits.  Bits 7 through 0 are listed in left-to-right
- * order.
- */
-
-static
-void cirrusfb_dbg_print_byte(const char *name, unsigned char val)
-{
-        DPRINTK("%8s = 0x%02X (bits 7-0: %c%c%c%c%c%c%c%c)\n",
-                name, val,
-                val & 0x80 ? '1' : '0',
-                val & 0x40 ? '1' : '0',
-                val & 0x20 ? '1' : '0',
-                val & 0x10 ? '1' : '0',
-                val & 0x08 ? '1' : '0',
-                val & 0x04 ? '1' : '0',
-                val & 0x02 ? '1' : '0',
-                val & 0x01 ? '1' : '0');
-}
-
-/**
  * cirrusfb_dbg_print_regs
  * @base: If using newmmio, the newmmio base address, otherwise %NULL
  * @reg_class: type of registers to read: %CRT, or %SEQ
@@ -3014,9 +2838,9 @@ void cirrusfb_dbg_print_byte(const char *name, unsigned char val)
  * used at the given @base address to query the information.
  */
 
-static
-void cirrusfb_dbg_print_regs(caddr_t regbase,
-                             enum cirrusfb_dbg_reg_class reg_class, ...)
+static void cirrusfb_dbg_print_regs(struct fb_info *info,
+                                    caddr_t regbase,
+                                    enum cirrusfb_dbg_reg_class reg_class, ...)
 {
         va_list list;
         unsigned char val = 0;
@@ -3042,7 +2866,7 @@ void cirrusfb_dbg_print_regs(caddr_t regbase,
                         break;
                 }
 
-                cirrusfb_dbg_print_byte(name, val);
+                dev_dbg(info->device, "%8s = 0x%02X\n", name, val);
 
                 name = va_arg(list, char *);
         }
@@ -3051,18 +2875,6 @@ void cirrusfb_dbg_print_regs(caddr_t regbase,
 }
 
 /**
- * cirrusfb_dump
- * @cirrusfbinfo:
- *
- * DESCRIPTION:
- */
-
-static void cirrusfb_dump(void)
-{
-        cirrusfb_dbg_reg_dump(NULL);
-}
-
-/**
  * cirrusfb_dbg_reg_dump
  * @base: If using newmmio, the newmmio base address, otherwise %NULL
  *
@@ -3072,12 +2884,11 @@ static void cirrusfb_dump(void)
  * used at the given @base address to query the information.
  */
 
-static
-void cirrusfb_dbg_reg_dump(caddr_t regbase)
+static void cirrusfb_dbg_reg_dump(struct fb_info *info, caddr_t regbase)
 {
-        DPRINTK("CIRRUSFB VGA CRTC register dump:\n");
+        dev_dbg(info->device, "VGA CRTC register dump:\n");
 
-        cirrusfb_dbg_print_regs(regbase, CRT,
+        cirrusfb_dbg_print_regs(info, regbase, CRT,
                            "CR00", 0x00,
                            "CR01", 0x01,
                            "CR02", 0x02,
@@ -3127,11 +2938,11 @@ void cirrusfb_dbg_reg_dump(caddr_t regbase)
                            "CR3F", 0x3F,
                            NULL);
 
-        DPRINTK("\n");
+        dev_dbg(info->device, "\n");
 
-        DPRINTK("CIRRUSFB VGA SEQ register dump:\n");
+        dev_dbg(info->device, "VGA SEQ register dump:\n");
 
-        cirrusfb_dbg_print_regs(regbase, SEQ,
+        cirrusfb_dbg_print_regs(info, regbase, SEQ,
                            "SR00", 0x00,
                            "SR01", 0x01,
                            "SR02", 0x02,
@@ -3160,7 +2971,7 @@ void cirrusfb_dbg_reg_dump(caddr_t regbase)
                            "SR1F", 0x1F,
                            NULL);
 
-        DPRINTK("\n");
+        dev_dbg(info->device, "\n");
 }
 
 #endif                          /* CIRRUSFB_DEBUG */
diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
index 1657b9608b04..2cd500a304f2 100644
--- a/drivers/video/console/fbcon.c
+++ b/drivers/video/console/fbcon.c
@@ -2954,8 +2954,11 @@ static int fbcon_fb_unbind(int idx)
 
 static int fbcon_fb_unregistered(struct fb_info *info)
 {
-        int i, idx = info->node;
+        int i, idx;
 
+        if (!lock_fb_info(info))
+                return -ENODEV;
+        idx = info->node;
         for (i = first_fb_vc; i <= last_fb_vc; i++) {
                 if (con2fb_map[i] == idx)
                         con2fb_map[i] = -1;
@@ -2979,13 +2982,14 @@ static int fbcon_fb_unregistered(struct fb_info *info)
                 }
         }
 
-        if (!num_registered_fb)
-                unregister_con_driver(&fb_con);
-
-
         if (primary_device == idx)
                 primary_device = -1;
 
+        unlock_fb_info(info);
+
+        if (!num_registered_fb)
+                unregister_con_driver(&fb_con);
+
         return 0;
 }
 
@@ -3021,9 +3025,13 @@ static inline void fbcon_select_primary(struct fb_info *info)
 
 static int fbcon_fb_registered(struct fb_info *info)
 {
-        int ret = 0, i, idx = info->node;
+        int ret = 0, i, idx;
 
+        if (!lock_fb_info(info))
+                return -ENODEV;
+        idx = info->node;
         fbcon_select_primary(info);
+        unlock_fb_info(info);
 
         if (info_idx == -1) {
                 for (i = first_fb_vc; i <= last_fb_vc; i++) {
@@ -3124,7 +3132,7 @@ static void fbcon_get_requirement(struct fb_info *info,
         }
 }
 
-static int fbcon_event_notify(struct notifier_block *self, 
+static int fbcon_event_notify(struct notifier_block *self,
                               unsigned long action, void *data)
 {
         struct fb_event *event = data;
@@ -3132,7 +3140,7 @@ static int fbcon_event_notify(struct notifier_block *self,
         struct fb_videomode *mode;
         struct fb_con2fbmap *con2fb;
         struct fb_blit_caps *caps;
-        int ret = 0;
+        int idx, ret = 0;
 
         /*
          * ignore all events except driver registration and deregistration
@@ -3144,23 +3152,54 @@ static int fbcon_event_notify(struct notifier_block *self,
 
         switch(action) {
         case FB_EVENT_SUSPEND:
+                if (!lock_fb_info(info)) {
+                        ret = -ENODEV;
+                        goto done;
+                }
                 fbcon_suspended(info);
+                unlock_fb_info(info);
                 break;
         case FB_EVENT_RESUME:
+                if (!lock_fb_info(info)) {
+                        ret = -ENODEV;
+                        goto done;
+                }
                 fbcon_resumed(info);
+                unlock_fb_info(info);
                 break;
         case FB_EVENT_MODE_CHANGE:
+                if (!lock_fb_info(info)) {
+                        ret = -ENODEV;
+                        goto done;
+                }
                 fbcon_modechanged(info);
+                unlock_fb_info(info);
                 break;
         case FB_EVENT_MODE_CHANGE_ALL:
+                if (!lock_fb_info(info)) {
+                        ret = -ENODEV;
+                        goto done;
+                }
                 fbcon_set_all_vcs(info);
+                unlock_fb_info(info);
                 break;
         case FB_EVENT_MODE_DELETE:
                 mode = event->data;
+                if (!lock_fb_info(info)) {
+                        ret = -ENODEV;
+                        goto done;
+                }
                 ret = fbcon_mode_deleted(info, mode);
+                unlock_fb_info(info);
                 break;
         case FB_EVENT_FB_UNBIND:
-                ret = fbcon_fb_unbind(info->node);
+                if (!lock_fb_info(info)) {
+                        ret = -ENODEV;
+                        goto done;
+                }
+                idx = info->node;
+                unlock_fb_info(info);
+                ret = fbcon_fb_unbind(idx);
                 break;
         case FB_EVENT_FB_REGISTERED:
                 ret = fbcon_fb_registered(info);
@@ -3178,17 +3217,31 @@ static int fbcon_event_notify(struct notifier_block *self,
                 con2fb->framebuffer = con2fb_map[con2fb->console - 1];
                 break;
         case FB_EVENT_BLANK:
+                if (!lock_fb_info(info)) {
+                        ret = -ENODEV;
+                        goto done;
+                }
                 fbcon_fb_blanked(info, *(int *)event->data);
+                unlock_fb_info(info);
                 break;
         case FB_EVENT_NEW_MODELIST:
+                if (!lock_fb_info(info)) {
+                        ret = -ENODEV;
+                        goto done;
+                }
                 fbcon_new_modelist(info);
+                unlock_fb_info(info);
                 break;
         case FB_EVENT_GET_REQ:
                 caps = event->data;
+                if (!lock_fb_info(info)) {
+                        ret = -ENODEV;
+                        goto done;
+                }
                 fbcon_get_requirement(info, caps);
+                unlock_fb_info(info);
                 break;
         }
-
 done:
         return ret;
 }
diff --git a/drivers/video/cyblafb.c b/drivers/video/cyblafb.c
deleted file mode 100644
index 9704b73135f5..000000000000
--- a/drivers/video/cyblafb.c
+++ /dev/null
@@ -1,1683 +0,0 @@
-/*
- * Frame buffer driver for Trident Cyberblade/i1 graphics core
- *
- * Copyright 2005 Knut Petersen <Knut_Petersen@t-online.de>
- *
- * CREDITS:
- *      tridentfb.c by Jani Monoses
- *      see files above for further credits
- *
- */
-
-#define CYBLAFB_DEBUG 0
-#define CYBLAFB_KD_GRAPHICS_QUIRK 1
-
-#define CYBLAFB_PIXMAPSIZE 8192
-
-#include <linux/module.h>
-#include <linux/string.h>
-#include <linux/fb.h>
-#include <linux/init.h>
-#include <linux/pci.h>
-#include <asm/types.h>
-#include <video/cyblafb.h>
-
-#define VERSION "0.62"
-
-struct cyblafb_par {
-        u32 pseudo_pal[16];
-        struct fb_ops ops;
-};
-
-static struct fb_fix_screeninfo cyblafb_fix __devinitdata = {
-        .id = "CyBla",
-        .type = FB_TYPE_PACKED_PIXELS,
-        .xpanstep = 1,
-        .ypanstep = 1,
-        .ywrapstep = 1,
-        .visual = FB_VISUAL_PSEUDOCOLOR,
-        .accel = FB_ACCEL_NONE,
-};
-
-static char *mode __devinitdata = NULL;
-static int bpp __devinitdata = 8;
-static int ref __devinitdata = 75;
-static int fp __devinitdata;
-static int crt __devinitdata;
-static int memsize __devinitdata;
-
-static int basestride;
-static int vesafb;
-static int nativex;
-static int center;
-static int stretch;
-static int pciwb = 1;
-static int pcirb = 1;
-static int pciwr = 1;
-static int pcirr = 1;
-static int disabled;
-static int verbosity;
-static int displaytype;
-
-static void __iomem *io_virt;   // iospace virtual memory address
-
-module_param(mode, charp, 0);
-module_param(bpp, int, 0);
-module_param(ref, int, 0);
-module_param(fp, int, 0);
-module_param(crt, int, 0);
-module_param(nativex, int, 0);
-module_param(center, int, 0);
-module_param(stretch, int, 0);
-module_param(pciwb, int, 0);
-module_param(pcirb, int, 0);
-module_param(pciwr, int, 0);
-module_param(pcirr, int, 0);
-module_param(memsize, int, 0);
-module_param(verbosity, int, 0);
-
-//=========================================
-//
-// Well, we have to fix the upper layers.
-// Until this has been done, we work around
-// the bugs.
-//
-//=========================================
-
-#if (CYBLAFB_KD_GRAPHICS_QUIRK && CYBLAFB_DEBUG)
-        if (disabled) { \
-                printk("********\n");\
-                dump_stack();\
-                return val;\
-        }
-
-#elif CYBLAFB_KD_GRAPHICS_QUIRK
-#define KD_GRAPHICS_RETURN(val)\
-        if (disabled) {\
-                return val;\
-        }
-#else
-#define KD_GRAPHICS_RETURN(val)
-#endif
-
-//=========================================
-//
-// Port access macros for memory mapped io
-//
-//=========================================
-
-#define out8(r, v) writeb(v, io_virt + r)
-#define out32(r, v) writel(v, io_virt + r)
-#define in8(r) readb(io_virt + r)
-#define in32(r) readl(io_virt + r)
-
-//======================================
-//
-// Hardware access inline functions
-//
-//======================================
-
-static inline u8 read3X4(u32 reg)
-{
-        out8(0x3D4, reg);
-        return in8(0x3D5);
-}
-
-static inline u8 read3C4(u32 reg)
-{
-        out8(0x3C4, reg);
-        return in8(0x3C5);
-}
-
-static inline u8 read3CE(u32 reg)
-{
-        out8(0x3CE, reg);
-        return in8(0x3CF);
-}
-
-static inline void write3X4(u32 reg, u8 val)
-{
-        out8(0x3D4, reg);
-        out8(0x3D5, val);
-}
-
-static inline void write3C4(u32 reg, u8 val)
-{
-        out8(0x3C4, reg);
-        out8(0x3C5, val);
-}
-
-static inline void write3CE(u32 reg, u8 val)
-{
-        out8(0x3CE, reg);
-        out8(0x3CF, val);
-}
-
-static inline void write3C0(u32 reg, u8 val)
-{
-        in8(0x3DA);             // read to reset index
-        out8(0x3C0, reg);
-        out8(0x3C0, val);
-}
-
-//=================================================
-//
-// Enable memory mapped io and unprotect registers
-//
-//=================================================
-
-static void enable_mmio(void)
-{
-        u8 tmp;
-
-        outb(0x0B, 0x3C4);
-        inb(0x3C5);             // Set NEW mode
-        outb(SR0E, 0x3C4);      // write enable a lot of extended ports
-        outb(0x80, 0x3C5);
-
-        outb(SR11, 0x3C4);      // write enable those extended ports that
-        outb(0x87, 0x3C5);      // are not affected by SR0E_New
-
-        outb(CR1E, 0x3d4);      // clear write protect bit for port 0x3c2
-        tmp = inb(0x3d5) & 0xBF;
-        outb(CR1E, 0x3d4);
-        outb(tmp, 0x3d5);
-
-        outb(CR39, 0x3D4);
-        outb(inb(0x3D5) | 0x01, 0x3D5); // Enable mmio
-}
-
-//=================================================
-//
-// Set pixel clock VCLK1
-// - multipliers set elswhere
-// - freq in units of 0.01 MHz
-//
-// Hardware bug: SR18 >= 250 is broken for the
-//               cyberblade/i1
-//
-//=================================================
-
-static void set_vclk(struct cyblafb_par *par, int freq)
-{
-        u32 m, n, k;
-        int f, fi, d, di;
-        u8 lo = 0, hi = 0;
-
-        d = 2000;
-        k = freq >= 10000 ? 0 : freq >= 5000 ? 1 : freq >= 2500 ? 2 : 3;
-        for (m = 0; m < 64; m++)
-                for (n = 0; n < 250; n++) {
-                        fi = (int)(((5864727 * (n + 8)) /
-                                    ((m + 2) * (1 << k))) >> 12);
-                        if ((di = abs(fi - freq)) < d) {
-                                d = di;
-                                f = fi;
-                                lo = (u8) n;
-                                hi = (u8) ((k << 6) | m);
-                        }
-                }
-        write3C4(SR19, hi);
-        write3C4(SR18, lo);
-        if (verbosity > 0)
-                output("pixclock = %d.%02d MHz, k/m/n %x %x %x\n",
-                       freq / 100, freq % 100, (hi & 0xc0) >> 6, hi & 0x3f, lo);
-}
-
-//================================================
-//
-// Cyberblade specific Graphics Engine (GE) setup
-//
-//================================================
-
-static void cyblafb_setup_GE(int pitch, int bpp)
-{
-        KD_GRAPHICS_RETURN();
-
-        switch (bpp) {
-        case 8:
-                basestride = ((pitch >> 3) << 20) | (0 << 29);
-                break;
-        case 15:
-                basestride = ((pitch >> 3) << 20) | (5 << 29);
-                break;
-        case 16:
-                basestride = ((pitch >> 3) << 20) | (1 << 29);
-                break;
-        case 24:
-        case 32:
-                basestride = ((pitch >> 3) << 20) | (2 << 29);
-                break;
-        }
-
-        write3X4(CR36, 0x90);   // reset GE
-        write3X4(CR36, 0x80);   // enable GE
-        out32(GE24, 1 << 7);    // reset all GE pointers by toggling
-        out32(GE24, 0);         //   d7 of GE24
-        write3X4(CR2D, 0x00);   // GE Timinigs, no delays
-        out32(GE6C, 0);         // Pattern and Style, p 129, ok
-}
-
-//=====================================================================
-//
-// Cyberblade specific syncing
-//
-//   A timeout might be caused by disabled mmio.
-//   Cause:
-//     - bit CR39 & 1 == 0 upon return, X trident driver bug
-//     - kdm bug (KD_GRAPHICS not set on first switch)
-//     - kernel design flaw (it believes in the correctness
-//       of kdm/X
-//   First we try to sync ignoring that problem, as most of the
-//   time that will succeed immediately and the enable_mmio()
-//   would only degrade performance.
-//
-//=====================================================================
-
-static int cyblafb_sync(struct fb_info *info)
-{
-        u32 status, i = 100000;
-
-        KD_GRAPHICS_RETURN(0);
-
-        while (((status = in32(GE20)) & 0xFe800000) && i != 0)
-                i--;
-
-        if (i == 0) {
-                enable_mmio();
-                i = 1000000;
-                while (((status = in32(GE20)) & 0xFA800000) && i != 0)
-                        i--;
-                if (i == 0) {
-                        output("GE Timeout, status: %x\n", status);
-                        if (status & 0x80000000)
-                                output("Bresenham Engine : Busy\n");
-                        if (status & 0x40000000)
-                                output("Setup Engine     : Busy\n");
-                        if (status & 0x20000000)
-                                output("SP / DPE         : Busy\n");
-                        if (status & 0x10000000)
-                                output("Memory Interface : Busy\n");
-                        if (status & 0x08000000)
-                                output("Com Lst Proc     : Busy\n");
-                        if (status & 0x04000000)
-                                output("Block Write      : Busy\n");
-                        if (status & 0x02000000)
-                                output("Command Buffer   : Full\n");
-                        if (status & 0x01000000)
-                                output("RESERVED         : Busy\n");
-                        if (status & 0x00800000)
-                                output("PCI Write Buffer : Busy\n");
-                        cyblafb_setup_GE(info->var.xres,
-                                         info->var.bits_per_pixel);
-                }
-        }
-
-        return 0;
-}
-
-//==============================
-//
-// Cyberblade specific fillrect
-//
-//==============================
-
-static void cyblafb_fillrect(struct fb_info *info, const struct fb_fillrect *fr)
-{
-        u32 bpp = info->var.bits_per_pixel, col, desty, height;
-
-        KD_GRAPHICS_RETURN();
-
-        switch (bpp) {
-        default:
-        case 8:
-                col = fr->color;
-                col |= col << 8;
-                col |= col << 16;
-                break;
-        case 16:
-                col = ((u32 *) (info->pseudo_palette))[fr->color];
-                col |= col << 16;
-                break;
-        case 32:
-                col = ((u32 *) (info->pseudo_palette))[fr->color];
-                break;
-        }
-
-        desty = fr->dy;
-        height = fr->height;
-        while (height) {
-                out32(GEB8, basestride | ((desty * info->var.xres_virtual *
-                                           bpp) >> 6));
-                out32(GE60, col);
-                out32(GE48, fr->rop ? 0x66 : ROP_S);
-                out32(GE44, 0x20000000 | 1 << 19 | 1 << 4 | 2 << 2);
-                out32(GE08, point(fr->dx, 0));
-                out32(GE0C, point(fr->dx + fr->width - 1,
-                                  height > 4096 ? 4095 : height - 1));
-                if (likely(height <= 4096))
-                        return;
-                desty += 4096;
-                height -= 4096;
-        }
-}
-
-//================================================
-//
-// Cyberblade specific copyarea
-//
-// This function silently assumes that it never
-// will be called with width or height exceeding
-// 4096.
-//
-//================================================
-
-static void cyblafb_copyarea(struct fb_info *info, const struct fb_copyarea *ca)
-{
-        u32 s1, s2, d1, d2, direction;
-
-        KD_GRAPHICS_RETURN();
-
-        s1 = point(ca->sx, 0);
-        s2 = point(ca->sx + ca->width - 1, ca->height - 1);
-        d1 = point(ca->dx, 0);
-        d2 = point(ca->dx + ca->width - 1, ca->height - 1);
-
-        if ((ca->sy > ca->dy) || ((ca->sy == ca->dy) && (ca->sx > ca->dx)))
-                direction = 0;
-        else
-                direction = 2;
-
-        out32(GEB8, basestride | ((ca->dy * info->var.xres_virtual *
-                                   info->var.bits_per_pixel) >> 6));
-        out32(GEC8, basestride | ((ca->sy * info->var.xres_virtual *
-                                   info->var.bits_per_pixel) >> 6));
-        out32(GE44, 0xa0000000 | 1 << 19 | 1 << 2 | direction);
-        out32(GE00, direction ? s2 : s1);
-        out32(GE04, direction ? s1 : s2);
-        out32(GE08, direction ? d2 : d1);
-        out32(GE0C, direction ? d1 : d2);
-}
-
-//=======================================================================
-//
-// Cyberblade specific imageblit
-//
-// Accelerated for the most usual case, blitting 1 - bit deep
-// character images. Everything else is passed to the generic imageblit
-// unless it is so insane that it is better to printk an alert.
-//
-// Hardware bug: _Never_ blit across pixel column 2048, that will lock
-// the system. We split those blit requests into three blitting
-// operations.
-//
-//=======================================================================
-
-static void cyblafb_imageblit(struct fb_info *info,
-                              const struct fb_image *image)
-{
-        u32 fgcol, bgcol;
-        u32 *pd = (u32 *) image->data;
-        u32 bpp = info->var.bits_per_pixel;
-
-        KD_GRAPHICS_RETURN();
-
-        // Used only for drawing the penguine (image->depth > 1)
-        if (image->depth != 1) {
-                cfb_imageblit(info, image);
-                return;
-        }
-        // That should never happen, but it would be fatal
-        if (image->width == 0 || image->height == 0) {
-                output("imageblit: width/height 0 detected\n");
-                return;
-        }
-
-        if (info->fix.visual == FB_VISUAL_TRUECOLOR ||
-            info->fix.visual == FB_VISUAL_DIRECTCOLOR) {
-                fgcol = ((u32 *) (info->pseudo_palette))[image->fg_color];
-                bgcol = ((u32 *) (info->pseudo_palette))[image->bg_color];
-        } else {
-                fgcol = image->fg_color;
-                bgcol = image->bg_color;
-        }
-
-        switch (bpp) {
-        case 8:
-                fgcol |= fgcol << 8;
-                bgcol |= bgcol << 8;
-        case 16:
-                fgcol |= fgcol << 16;
-                bgcol |= bgcol << 16;
-        default:
-                break;
-        }
-
-        out32(GEB8, basestride | ((image->dy * info->var.xres_virtual *
-                                   bpp) >> 6));
-        out32(GE60, fgcol);
-        out32(GE64, bgcol);
-
-        if (!(image->dx < 2048 && (image->dx + image->width - 1) >= 2048)) {
-                u32 dds = ((image->width + 31) >> 5) * image->height;
-                out32(GE44, 0xa0000000 | 1 << 20 | 1 << 19);
-                out32(GE08, point(image->dx, 0));
-                out32(GE0C, point(image->dx + image->width - 1,
-                                  image->height - 1));
-                while (dds--)
-                        out32(GE9C, *pd++);
-        } else {
-                int i, j;
-                u32 ddstotal = (image->width + 31) >> 5;
-                u32 ddsleft = (2048 - image->dx + 31) >> 5;
-                u32 skipleft = ddstotal - ddsleft;
-
-                out32(GE44, 0xa0000000 | 1 << 20 | 1 << 19);
-                out32(GE08, point(image->dx, 0));
-                out32(GE0C, point(2048 - 1, image->height - 1));
-                for (i = 0; i < image->height; i++) {
-                        for (j = 0; j < ddsleft; j++)
-                                out32(GE9C, *pd++);
-                        pd += skipleft;
-                }
-
-                if (image->dx % 32) {
-                        out32(GE44, 0xa0000000 | 1 << 20 | 1 << 19);
-                        out32(GE08, point(2048, 0));
-                        if (image->width > ddsleft << 5)
-                                out32(GE0C, point(image->dx + (ddsleft << 5) -
-                                                  1, image->height - 1));
-                        else
-                                out32(GE0C, point(image->dx + image->width - 1,
-                                                  image->height - 1));
-                        pd = ((u32 *) image->data) + ddstotal - skipleft - 1;
-                        for (i = 0; i < image->height; i++) {
-                                out32(GE9C, swab32(swab32(*pd) << ((32 -
-                                            (image->dx & 31)) & 31)));
-                                pd += ddstotal;
-                        }
-                }
-
-                if (skipleft) {
-                        out32(GE44, 0xa0000000 | 1 << 20 | 1 << 19);
-                        out32(GE08, point(image->dx + (ddsleft << 5), 0));
-                        out32(GE0C, point(image->dx + image->width - 1,
-                                          image->height - 1));
-                        pd = (u32 *) image->data;
-                        for (i = 0; i < image->height; i++) {
-                                pd += ddsleft;
-                                for (j = 0; j < skipleft; j++)
-                                        out32(GE9C, *pd++);
-                        }
-                }
-        }
-}
-
-//==========================================================
-//
-// Check if video mode is acceptable. We change var->??? if
-// video mode is slightly off or return error otherwise.
-// info->??? must not be changed!
-//
-//==========================================================
-
-static int cyblafb_check_var(struct fb_var_screeninfo *var,
-                             struct fb_info *info)
-{
-        int bpp = var->bits_per_pixel;
-
-        //
-        // we try to support 8, 16, 24 and 32 bpp modes,
-        // default to 8
-        //
-        // there is a 24 bpp mode, but for now we change requests to 32 bpp
-        // (This is what tridentfb does ... will be changed in the future)
-        //
-        //
-        if (bpp % 8 != 0 || bpp < 8 || bpp > 32)
-                bpp = 8;
-        if (bpp == 24)
-                bpp = var->bits_per_pixel = 32;
-
-        //
-        // interlaced modes are broken, fail if one is requested
-        //
-        if (var->vmode & FB_VMODE_INTERLACED)
-                return -EINVAL;
-
-        //
-        // fail if requested resolution is higher than physical
-        // flatpanel resolution
-        //
-        if ((displaytype == DISPLAY_FP) && nativex && var->xres > nativex)
-                return -EINVAL;
-
-        //
-        // we do not allow vclk to exceed 230 MHz. If the requested
-        // vclk is too high, we default to 200 MHz
-        //
-        if ((bpp == 32 ? 200000000 : 100000000) / var->pixclock > 23000)
-                var->pixclock = (bpp == 32 ? 200000000 : 100000000) / 20000;
-
-        //
-        // enforce (h|v)sync_len limits
-        //
-        var->hsync_len &= ~7;
-        if(var->hsync_len > 248)
-                var->hsync_len = 248;
-
-        var->vsync_len &= 15;
-
-        //
-        // Enforce horizontal and vertical hardware limits.
-        // 1600x1200 is mentioned as a maximum, but higher resolutions could
-        // work with slow refresh, small margins and short sync.
-        //
-        var->xres &= ~7;
-
-        if (((var->xres + var->left_margin + var->right_margin +
-                        var->hsync_len) > (bpp == 32 ? 2040 : 4088)) ||
-                        ((var->yres + var->upper_margin + var->lower_margin +
-                        var->vsync_len) > 2047))
-                return -EINVAL;
-
-        if ((var->xres > 1600) || (var->yres > 1200))
-                output("Mode %dx%d exceeds documented limits.\n",
-                                           var->xres, var->yres);
-        //
-        // try to be smart about (x|y)res_virtual problems.
-        //
-        if (var->xres > var->xres_virtual)
-                var->xres_virtual = var->xres;
-        if (var->yres > var->yres_virtual)
-                var->yres_virtual = var->yres;
-
-        if (bpp == 8 || bpp == 16) {
-                if (var->xres_virtual > 4088)
-                        var->xres_virtual = 4088;
-        } else {
-                if (var->xres_virtual > 2040)
-                        var->xres_virtual = 2040;
-        }
-        var->xres_virtual &= ~7;
-        while (var->xres_virtual * var->yres_virtual * bpp / 8 >
-               info->fix.smem_len) {
-                if (var->yres_virtual > var->yres)
-                        var->yres_virtual--;
-                else if (var->xres_virtual > var->xres)
-                        var->xres_virtual -= 8;
-                else
-                        return -EINVAL;
-        }
-
-        switch (bpp) {
-        case 8:
-                var->red.offset = 0;
-                var->green.offset = 0;
-                var->blue.offset = 0;
-                var->red.length = 6;
-                var->green.length = 6;
-                var->blue.length = 6;
-                break;
-        case 16:
-                var->red.offset = 11;
-                var->green.offset = 5;
-                var->blue.offset = 0;
-                var->red.length = 5;
-                var->green.length = 6;
-                var->blue.length = 5;
-                break;
-        case 32:
-                var->red.offset = 16;
-                var->green.offset = 8;
-                var->blue.offset = 0;
-                var->red.length = 8;
-                var->green.length = 8;
-                var->blue.length = 8;
-                break;
-        default:
-                return -EINVAL;
-        }
-
-        return 0;
-}
-
-//=====================================================================
-//
-// Pan the display
-//
-// The datasheets defines crt start address to be 20 bits wide and
-// to be programmed to CR0C, CR0D, CR1E and CR27. Actually there is
-// CR2B[5] as an undocumented extension bit. Epia BIOS 2.07 does use
-// it, so it is also safe to be used here. BTW: datasheet CR0E on page
-// 90 really is CR1E, the real CRE is documented on page 72.
-//
-// BUT:
-//
-// As of internal version 0.60 we do not use vga panning any longer.
-// Vga panning did not allow us the use of all available video memory
-// and thus prevented ywrap scrolling. We do use the "right view"
-// register now.
-//
-//
-//=====================================================================
-
-static int cyblafb_pan_display(struct fb_var_screeninfo *var,
-                               struct fb_info *info)
-{
-        KD_GRAPHICS_RETURN(0);
-
-        info->var.xoffset = var->xoffset;
-        info->var.yoffset = var->yoffset;
-        out32(GE10, 0x80000000 | ((var->xoffset + (var->yoffset *
-                    var->xres_virtual)) * var->bits_per_pixel / 32));
-        return 0;
-}
-
-//============================================
-//
-// This will really help in case of a bug ...
-// dump most gaphics core registers.
-//
-//============================================
-
-static void regdump(struct cyblafb_par *par)
-{
-        int i;
-
-        if (verbosity < 2)
-                return;
-
-        printk("\n");
-        for (i = 0; i <= 0xff; i++) {
-                outb(i, 0x3d4);
-                printk("CR%02x=%02x ", i, inb(0x3d5));
-                if (i % 16 == 15)
-                        printk("\n");
-        }
-
-        outb(0x30, 0x3ce);
-        outb(inb(0x3cf) | 0x40, 0x3cf);
-        for (i = 0; i <= 0x1f; i++) {
-                if (i == 0 || (i > 2 && i < 8) || i == 0x10 || i == 0x11
-                    || i == 0x16) {
-                        outb(i, 0x3d4);
-                        printk("CR%02x=%02x ", i, inb(0x3d5));
-                } else
-                        printk("------- ");
-                if (i % 16 == 15)
-                        printk("\n");
-        }
-        outb(0x30, 0x3ce);
-        outb(inb(0x3cf) & 0xbf, 0x3cf);
-
-        printk("\n");
-        for (i = 0; i <= 0x7f; i++) {
-                outb(i, 0x3ce);
-                printk("GR%02x=%02x ", i, inb(0x3cf));
-                if (i % 16 == 15)
-                        printk("\n");
-        }
-
-        printk("\n");
-        for (i = 0; i <= 0xff; i++) {
-                outb(i, 0x3c4);
-                printk("SR%02x=%02x ", i, inb(0x3c5));
-                if (i % 16 == 15)
-                        printk("\n");
-        }
-
-        printk("\n");
-        for (i = 0; i <= 0x1F; i++) {
-                inb(0x3da);     // next access is index!
-                outb(i, 0x3c0);
-                printk("AR%02x=%02x ", i, inb(0x3c1));
-                if (i % 16 == 15)
-                        printk("\n");
-        }
-        printk("\n");
-
-        inb(0x3DA);             // reset internal flag to 3c0 index
-        outb(0x20, 0x3C0);      // enable attr
-
-        return;
-}
-
-//=======================================================================
-//
-// Save State
-//
-// This function is called while a switch to KD_TEXT is in progress,
-// before any of the other functions are called.
-//
-//=======================================================================
-
-static void cyblafb_save_state(struct fb_info *info)
-{
-        struct cyblafb_par *par = info->par;
-        if (verbosity > 0)
-                output("Switching to KD_TEXT\n");
-        disabled = 0;
-        regdump(par);
-        enable_mmio();
-        return;
-}
-
-//=======================================================================
-//
-// Restore State
-//
-// This function is called while a switch to KD_GRAPHICS is in progress,
-// We have to turn on vga style panning registers again because the
-// trident driver of X does not know about GE10.
-//
-//=======================================================================
-
-static void cyblafb_restore_state(struct fb_info *info)
-{
-        if (verbosity > 0)
-                output("Switching to KD_GRAPHICS\n");
-        out32(GE10, 0);
-        disabled = 1;
-        return;
-}
-
-//======================================
-//
-// Set hardware to requested video mode
-//
-//======================================
-
-static int cyblafb_set_par(struct fb_info *info)
-{
-        struct cyblafb_par *par = info->par;
-        u32 htotal, hdispend, hsyncstart, hsyncend, hblankstart,
-            hblankend, preendfetch, vtotal, vdispend, vsyncstart,
-            vsyncend, vblankstart, vblankend;
-        struct fb_var_screeninfo *var = &info->var;
-        int bpp = var->bits_per_pixel;
-        int i;
-
-        KD_GRAPHICS_RETURN(0);
-
-        if (verbosity > 0)
-                output("Switching to new mode: "
-                       "fbset -g %d %d %d %d %d -t %d %d %d %d %d %d %d\n",
-                       var->xres, var->yres, var->xres_virtual,
-                       var->yres_virtual, var->bits_per_pixel, var->pixclock,
-                       var->left_margin, var->right_margin, var->upper_margin,
-                       var->lower_margin, var->hsync_len, var->vsync_len);
-
-        htotal = (var->xres + var->left_margin + var->right_margin +
-                  var->hsync_len) / 8 - 5;
-        hdispend = var->xres / 8 - 1;
-        hsyncstart = (var->xres + var->right_margin) / 8;
-        hsyncend = var->hsync_len / 8;
-        hblankstart = hdispend + 1;
-        hblankend = htotal + 3; // should be htotal + 5, bios does it this way
-        preendfetch = ((var->xres >> 3) + 1) * ((bpp + 1) >> 3);
-
-        vtotal = var->yres + var->upper_margin + var->lower_margin +
-                                                        var->vsync_len - 2;
-        vdispend = var->yres - 1;
-        vsyncstart = var->yres + var->lower_margin;
-        vblankstart = var->yres;
-        vblankend = vtotal; // should be vtotal + 2, but bios does it this way
-        vsyncend = var->vsync_len;
-
-        enable_mmio();          // necessary! ... check X ...
-
-        write3X4(CR11, read3X4(CR11) & 0x7F);   // unlock cr00 .. cr07
-
-        write3CE(GR30, 8);
-
-        if ((displaytype == DISPLAY_FP) && var->xres < nativex) {
-
-                // stretch or center ?
-
-                out8(0x3C2, 0xEB);
-
-                write3CE(GR30, read3CE(GR30) | 0x81);   // shadow mode on
-
-                if (center) {
-                        write3CE(GR52, (read3CE(GR52) & 0x7C) | 0x80);
-                        write3CE(GR53, (read3CE(GR53) & 0x7C) | 0x80);
-                } else if (stretch) {
-                        write3CE(GR5D, 0);
-                        write3CE(GR52, (read3CE(GR52) & 0x7C) | 1);
-                        write3CE(GR53, (read3CE(GR53) & 0x7C) | 1);
-                }
-
-        } else {
-                out8(0x3C2, 0x2B);
-                write3CE(GR30, 8);
-        }
-
-        //
-        // Setup CRxx regs
-        //
-
-        write3X4(CR00, htotal & 0xFF);
-        write3X4(CR01, hdispend & 0xFF);
-        write3X4(CR02, hblankstart & 0xFF);
-        write3X4(CR03, hblankend & 0x1F);
-        write3X4(CR04, hsyncstart & 0xFF);
-        write3X4(CR05, (hsyncend & 0x1F) | ((hblankend & 0x20) << 2));
-        write3X4(CR06, vtotal & 0xFF);
-        write3X4(CR07, (vtotal & 0x100) >> 8 |
-                       (vdispend & 0x100) >> 7 |
-                       (vsyncstart & 0x100) >> 6 |
-                       (vblankstart & 0x100) >> 5 |
-                       0x10 |
-                       (vtotal & 0x200) >> 4 |
-                       (vdispend & 0x200) >> 3 | (vsyncstart & 0x200) >> 2);
-        write3X4(CR08, 0);
-        write3X4(CR09, (vblankstart & 0x200) >> 4 | 0x40 |      // FIX !!!
-                       ((info->var.vmode & FB_VMODE_DOUBLE) ? 0x80 : 0));
-        write3X4(CR0A, 0);      // Init to some reasonable default
-        write3X4(CR0B, 0);      // Init to some reasonable default
-        write3X4(CR0C, 0);      // Offset 0
-        write3X4(CR0D, 0);      // Offset 0
-        write3X4(CR0E, 0);      // Init to some reasonable default
-        write3X4(CR0F, 0);      // Init to some reasonable default
-        write3X4(CR10, vsyncstart & 0xFF);
-        write3X4(CR11, (vsyncend & 0x0F));
-        write3X4(CR12, vdispend & 0xFF);
-        write3X4(CR13, ((info->var.xres_virtual * bpp) / (4 * 16)) & 0xFF);
-        write3X4(CR14, 0x40);   // double word mode
-        write3X4(CR15, vblankstart & 0xFF);
-        write3X4(CR16, vblankend & 0xFF);
-        write3X4(CR17, 0xE3);
-        write3X4(CR18, 0xFF);
-        //       CR19: needed for interlaced modes ... ignore it for now
-        write3X4(CR1A, 0x07);   // Arbitration Control Counter 1
-        write3X4(CR1B, 0x07);   // Arbitration Control Counter 2
-        write3X4(CR1C, 0x07);   // Arbitration Control Counter 3
-        write3X4(CR1D, 0x00);   // Don't know, doesn't hurt ; -)
-        write3X4(CR1E, (info->var.vmode & FB_VMODE_INTERLACED) ? 0x84 : 0x80);
-        //       CR1F: do not set, contains BIOS info about memsize
-        write3X4(CR20, 0x20);   // enabe wr buf, disable 16bit planar mode
-        write3X4(CR21, 0x20);   // enable linear memory access
-        //       CR22: RO cpu latch readback
-        //       CR23: ???
-        //       CR24: RO AR flag state
-        //       CR25: RAMDAC rw timing, pclk buffer tristate control ????
-        //       CR26: ???
-        write3X4(CR27, (vdispend & 0x400) >> 6 |
-                       (vsyncstart & 0x400) >> 5 |
-                       (vblankstart & 0x400) >> 4 |
-                       (vtotal & 0x400) >> 3 |
-                       0x8);
-        //       CR28: ???
-        write3X4(CR29, (read3X4(CR29) & 0xCF) | ((((info->var.xres_virtual *
-                        bpp) / (4 * 16)) & 0x300) >> 4));
-        write3X4(CR2A, read3X4(CR2A) | 0x40);
-        write3X4(CR2B, (htotal & 0x100) >> 8 |
-                       (hdispend & 0x100) >> 7 |
-                       // (0x00 & 0x100) >> 6 |   hinterlace para bit 8 ???
-                       (hsyncstart & 0x100) >> 5 |
-                       (hblankstart & 0x100) >> 4);
-        //       CR2C: ???
-        //       CR2D: initialized in cyblafb_setup_GE()
-        write3X4(CR2F, 0x92);   // conservative, better signal quality
-        //       CR30: reserved
-        //       CR31: reserved
-        //       CR32: reserved
-        //       CR33: reserved
-        //       CR34: disabled in CR36
-        //       CR35: disabled in CR36
-        //       CR36: initialized in cyblafb_setup_GE
-        //       CR37: i2c, ignore for now
-        write3X4(CR38, (bpp == 8) ? 0x00 :      //
-                       (bpp == 16) ? 0x05 :     // highcolor
-                       (bpp == 24) ? 0x29 :     // packed 24bit truecolor
-                       (bpp == 32) ? 0x09 : 0); // truecolor, 16 bit pixelbus
-        write3X4(CR39, 0x01 |   // MMIO enable
-                       (pcirb ? 0x02 : 0) |     // pci read burst enable
-                       (pciwb ? 0x04 : 0));     // pci write burst enable
-        write3X4(CR55, 0x1F | // pci clocks * 2 for STOP# during 1st data phase
-                       (pcirr ? 0x40 : 0) |     // pci read retry enable
-                       (pciwr ? 0x80 : 0));     // pci write retry enable
-        write3X4(CR56, preendfetch >> 8 < 2 ? (preendfetch >> 8 & 0x01) | 2
-                                            : 0);
-        write3X4(CR57, preendfetch >> 8 < 2 ? preendfetch & 0xff : 0);
-        write3X4(CR58, 0x82);   // Bios does this .... don't know more
-        //
-        // Setup SRxx regs
-        //
-        write3C4(SR00, 3);
-        write3C4(SR01, 1);      //set char clock 8 dots wide
-        write3C4(SR02, 0x0F);   //enable 4 maps needed in chain4 mode
-        write3C4(SR03, 0);      //no character map select
-        write3C4(SR04, 0x0E);   //memory mode: ext mem, even, chain4
-
-        out8(0x3C4, 0x0b);
-        in8(0x3C5);             // Set NEW mode
-        write3C4(SR0D, 0x00);   // test ... check
-
-        set_vclk(par, (bpp == 32 ? 200000000 : 100000000)
-                                        / info->var.pixclock);  //SR18, SR19
-
-        //
-        // Setup GRxx regs
-        //
-        write3CE(GR00, 0x00);   // test ... check
-        write3CE(GR01, 0x00);   // test ... check
-        write3CE(GR02, 0x00);   // test ... check
-        write3CE(GR03, 0x00);   // test ... check
-        write3CE(GR04, 0x00);   // test ... check
-        write3CE(GR05, 0x40);   // no CGA compat, allow 256 col
-        write3CE(GR06, 0x05);   // graphics mode
-        write3CE(GR07, 0x0F);   // planes?
-        write3CE(GR08, 0xFF);   // test ... check
-        write3CE(GR0F, (bpp == 32) ? 0x1A : 0x12); // vclk / 2 if 32bpp, chain4
-        write3CE(GR20, 0xC0);   // test ... check
-        write3CE(GR2F, 0xA0);   // PCLK = VCLK, no skew,
-
-        //
-        // Setup ARxx regs
-        //
-        for (i = 0; i < 0x10; i++)      // set AR00 .. AR0f
-                write3C0(i, i);
-        write3C0(AR10, 0x41);   // graphics mode and support 256 color modes
-        write3C0(AR12, 0x0F);   // planes
-        write3C0(AR13, 0);      // horizontal pel panning
-        in8(0x3DA);             // reset internal flag to 3c0 index
-        out8(0x3C0, 0x20);      // enable attr
-
-        //
-        // Setup hidden RAMDAC command register
-        //
-        in8(0x3C8);             // these reads are
-        in8(0x3C6);             // necessary to
-        in8(0x3C6);             // unmask the RAMDAC
-        in8(0x3C6);             // command reg, otherwise
-        in8(0x3C6);             // we would write the pixelmask reg!
-        out8(0x3C6, (bpp == 8) ? 0x00 : // 256 colors
-             (bpp == 15) ? 0x10 :       //
-             (bpp == 16) ? 0x30 :       // hicolor
-             (bpp == 24) ? 0xD0 :       // truecolor
-             (bpp == 32) ? 0xD0 : 0);   // truecolor
-        in8(0x3C8);
-
-        //
-        // GR31 is not mentioned in the datasheet
-        //
-        if (displaytype == DISPLAY_FP)
-                write3CE(GR31, (read3CE(GR31) & 0x8F) |
-                         ((info->var.yres > 1024) ? 0x50 :
-                          (info->var.yres > 768) ? 0x30 :
-                          (info->var.yres > 600) ? 0x20 :
-                          (info->var.yres > 480) ? 0x10 : 0));
-
-        info->fix.visual = (bpp == 8) ? FB_VISUAL_PSEUDOCOLOR
-                                      : FB_VISUAL_TRUECOLOR;
-        info->fix.line_length = info->var.xres_virtual * (bpp >> 3);
-        info->cmap.len = (bpp == 8) ? 256 : 16;
-
-        //
-        // init acceleration engine
-        //
-        cyblafb_setup_GE(info->var.xres_virtual, info->var.bits_per_pixel);
-
-        //
-        // Set/clear flags to allow proper scroll mode selection.
-        //
-        if (var->xres == var->xres_virtual)
-                info->flags &= ~FBINFO_HWACCEL_XPAN;
-        else
-                info->flags |= FBINFO_HWACCEL_XPAN;
-
-        if (var->yres == var->yres_virtual)
-                info->flags &= ~FBINFO_HWACCEL_YPAN;
-        else
-                info->flags |= FBINFO_HWACCEL_YPAN;
-
-        if (info->fix.smem_len !=
-            var->xres_virtual * var->yres_virtual * bpp / 8)
-                info->flags &= ~FBINFO_HWACCEL_YWRAP;
-        else
-                info->flags |= FBINFO_HWACCEL_YWRAP;
-
-        regdump(par);
-
-        return 0;
-}
-
-//========================
-//
-// Set one color register
-//
-//========================
-
-static int cyblafb_setcolreg(unsigned regno, unsigned red, unsigned green,
-                             unsigned blue, unsigned transp,
-                             struct fb_info *info)
-{
-        int bpp = info->var.bits_per_pixel;
-
-        KD_GRAPHICS_RETURN(0);
-
-        if (regno >= info->cmap.len)
-                return 1;
-
-        if (bpp == 8) {
-                out8(0x3C6, 0xFF);
-                out8(0x3C8, regno);
-                out8(0x3C9, red >> 10);
-                out8(0x3C9, green >> 10);
-                out8(0x3C9, blue >> 10);
-
-        } else if (regno < 16) {
-                if (bpp == 16)  // RGB 565
-                        ((u32 *) info->pseudo_palette)[regno] =
-                                (red & 0xF800) |
-                                ((green & 0xFC00) >> 5) |
-                                ((blue & 0xF800) >> 11);
-                else if (bpp == 32)     // ARGB 8888
-                        ((u32 *) info->pseudo_palette)[regno] =
-                                ((transp & 0xFF00) << 16) |
-                                ((red & 0xFF00) << 8) |
-                                ((green & 0xFF00)) | ((blue & 0xFF00) >> 8);
-        }
-
-        return 0;
-}
-
-//==========================================================
-//
-// Try blanking the screen. For flat panels it does nothing
-//
-//==========================================================
-
-static int cyblafb_blank(int blank_mode, struct fb_info *info)
-{
-        unsigned char PMCont, DPMSCont;
-
-        KD_GRAPHICS_RETURN(0);
-
-        if (displaytype == DISPLAY_FP)
-                return 0;
-
-        out8(0x83C8, 0x04);     // DPMS Control
-        PMCont = in8(0x83C6) & 0xFC;
-
-        DPMSCont = read3CE(GR23) & 0xFC;
-
-        switch (blank_mode) {
-        case FB_BLANK_UNBLANK:  // Screen: On, HSync: On, VSync: On
-        case FB_BLANK_NORMAL:   // Screen: Off, HSync: On, VSync: On
-                PMCont |= 0x03;
-                DPMSCont |= 0x00;
-                break;
-        case FB_BLANK_HSYNC_SUSPEND:    // Screen: Off, HSync: Off, VSync: On
-                PMCont |= 0x02;
-                DPMSCont |= 0x01;
-                break;
-        case FB_BLANK_VSYNC_SUSPEND:    // Screen: Off, HSync: On, VSync: Off
-                PMCont |= 0x02;
-                DPMSCont |= 0x02;
-                break;
-        case FB_BLANK_POWERDOWN:        // Screen: Off, HSync: Off, VSync: Off
-                PMCont |= 0x00;
-                DPMSCont |= 0x03;
-                break;
-        }
-
-        write3CE(GR23, DPMSCont);
-        out8(0x83C8, 4);
-        out8(0x83C6, PMCont);
-        //
-        // let fbcon do a softblank for us
-        //
-        return (blank_mode == FB_BLANK_NORMAL) ? 1 : 0;
-}
-
-static struct fb_ops cyblafb_ops __devinitdata = {
-        .owner = THIS_MODULE,
-        .fb_setcolreg = cyblafb_setcolreg,
-        .fb_pan_display = cyblafb_pan_display,
-        .fb_blank = cyblafb_blank,
-        .fb_check_var = cyblafb_check_var,
-        .fb_set_par = cyblafb_set_par,
-        .fb_fillrect = cyblafb_fillrect,
-        .fb_copyarea = cyblafb_copyarea,
-        .fb_imageblit = cyblafb_imageblit,
-        .fb_sync = cyblafb_sync,
-        .fb_restore_state = cyblafb_restore_state,
-        .fb_save_state = cyblafb_save_state,
-};
-
-//==========================================================================
-//
-// getstartupmode() decides about the inital video mode
-//
-// There is no reason to use modedb, a lot of video modes there would
-// need altered timings to display correctly. So I decided that it is much
-// better to provide a limited optimized set of modes plus the option of
-// using the mode in effect at startup time (might be selected using the
-// vga=??? parameter). After that the user might use fbset to select any
-// mode he likes, check_var will not try to alter geometry parameters as
-// it would be necessary otherwise.
-//
-//==========================================================================
-
-static int __devinit getstartupmode(struct fb_info *info)
-{
-        u32 htotal, hdispend, hsyncstart, hsyncend, hblankstart, hblankend,
-            vtotal, vdispend, vsyncstart, vsyncend, vblankstart, vblankend,
-            cr00, cr01, cr02, cr03, cr04, cr05, cr2b,
-            cr06, cr07, cr09, cr10, cr11, cr12, cr15, cr16, cr27,
-            cr38, sr0d, sr18, sr19, gr0f, fi, pxclkdiv, vclkdiv, tmp, i;
-
-        struct modus {
-                int xres; int vxres; int yres; int vyres;
-                int bpp; int pxclk;
-                int left_margin; int right_margin;
-                int upper_margin; int lower_margin;
-                int hsync_len; int vsync_len;
-        } modedb[5] = {
-                {
-                0, 2048, 0, 4096, 0, 0, 0, 0, 0, 0, 0, 0}, {
-                640, 2048, 480, 4096, 0, 0, -40, 24, 17, 0, 216, 3}, {
-                800, 2048, 600, 4096, 0, 0, 96, 24, 14, 0, 136, 11}, {
-                1024, 2048, 768, 4096, 0, 0, 144, 24, 29, 0, 120, 3}, {
-                1280, 2048, 1024, 4096, 0, 0, 232, 16, 39, 0, 160, 3}
-        };
-
-        outb(0x00, 0x3d4); cr00 = inb(0x3d5);
-        outb(0x01, 0x3d4); cr01 = inb(0x3d5);
-        outb(0x02, 0x3d4); cr02 = inb(0x3d5);
-        outb(0x03, 0x3d4); cr03 = inb(0x3d5);
-        outb(0x04, 0x3d4); cr04 = inb(0x3d5);
-        outb(0x05, 0x3d4); cr05 = inb(0x3d5);
-        outb(0x06, 0x3d4); cr06 = inb(0x3d5);
-        outb(0x07, 0x3d4); cr07 = inb(0x3d5);
-        outb(0x09, 0x3d4); cr09 = inb(0x3d5);
-        outb(0x10, 0x3d4); cr10 = inb(0x3d5);
-        outb(0x11, 0x3d4); cr11 = inb(0x3d5);
-        outb(0x12, 0x3d4); cr12 = inb(0x3d5);
-        outb(0x15, 0x3d4); cr15 = inb(0x3d5);
-        outb(0x16, 0x3d4); cr16 = inb(0x3d5);
-        outb(0x27, 0x3d4); cr27 = inb(0x3d5);
-        outb(0x2b, 0x3d4); cr2b = inb(0x3d5);
-        outb(0x38, 0x3d4); cr38 = inb(0x3d5);
-
-        outb(0x0b, 0x3c4);
-        inb(0x3c5);
-
-        outb(0x0d, 0x3c4); sr0d = inb(0x3c5);
-        outb(0x18, 0x3c4); sr18 = inb(0x3c5);
-        outb(0x19, 0x3c4); sr19 = inb(0x3c5);
-        outb(0x0f, 0x3ce); gr0f = inb(0x3cf);
-
-        htotal = cr00 | (cr2b & 0x01) << 8;
-        hdispend = cr01 | (cr2b & 0x02) << 7;
-        hblankstart = cr02 | (cr2b & 0x10) << 4;
-        hblankend = (cr03 & 0x1f) | (cr05 & 0x80) >> 2;
-        hsyncstart = cr04 | (cr2b & 0x08) << 5;
-        hsyncend = cr05 & 0x1f;
-
-        modedb[0].xres = hblankstart * 8;
-        modedb[0].hsync_len = hsyncend * 8;
-        modedb[0].right_margin = hsyncstart * 8 - modedb[0].xres;
-        modedb[0].left_margin = (htotal + 5) * 8 - modedb[0].xres -
-            modedb[0].right_margin - modedb[0].hsync_len;
-
-        vtotal = cr06 | (cr07 & 0x01) << 8 | (cr07 & 0x20) << 4
-            | (cr27 & 0x80) << 3;
-        vdispend = cr12 | (cr07 & 0x02) << 7 | (cr07 & 0x40) << 3
-            | (cr27 & 0x10) << 6;
-        vsyncstart = cr10 | (cr07 & 0x04) << 6 | (cr07 & 0x80) << 2
-            | (cr27 & 0x20) << 5;
-        vsyncend = cr11 & 0x0f;
-        vblankstart = cr15 | (cr07 & 0x08) << 5 | (cr09 & 0x20) << 4
-            | (cr27 & 0x40) << 4;
-        vblankend = cr16;
-
-        modedb[0].yres = vdispend + 1;
-        modedb[0].vsync_len = vsyncend;
-        modedb[0].lower_margin = vsyncstart - modedb[0].yres;
-        modedb[0].upper_margin = vtotal - modedb[0].yres -
-            modedb[0].lower_margin - modedb[0].vsync_len + 2;
-
-        tmp = cr38 & 0x3c;
-        modedb[0].bpp = tmp == 0 ? 8 : tmp == 4 ? 16 : tmp == 28 ? 24 :
-            tmp == 8 ? 32 : 8;
-
-        fi = ((5864727 * (sr18 + 8)) /
-              (((sr19 & 0x3f) + 2) * (1 << ((sr19 & 0xc0) >> 6)))) >> 12;
-        pxclkdiv = ((gr0f & 0x08) >> 3 | (gr0f & 0x40) >> 5) + 1;
-        tmp = sr0d & 0x06;
-        vclkdiv = tmp == 0 ? 2 : tmp == 2 ? 4 : tmp == 4 ? 8 : 3; // * 2 !
-        modedb[0].pxclk = ((100000000 * pxclkdiv * vclkdiv) >> 1) / fi;
-
-        if (verbosity > 0)
-                output("detected startup mode: "
-                       "fbset -g %d %d %d ??? %d -t %d %d %d %d %d %d %d\n",
-                       modedb[0].xres, modedb[0].yres, modedb[0].xres,
-                       modedb[0].bpp, modedb[0].pxclk, modedb[0].left_margin,
-                       modedb[0].right_margin, modedb[0].upper_margin,
-                       modedb[0].lower_margin, modedb[0].hsync_len,
-                       modedb[0].vsync_len);
-
-        //
-        // We use this goto target in case of a failed check_var. No, I really
-        // do not want to do it in another way!
-        //
-
-      tryagain:
-
-        i = (mode == NULL) ? 0 :
-            !strncmp(mode, "640x480", 7) ? 1 :
-            !strncmp(mode, "800x600", 7) ? 2 :
-            !strncmp(mode, "1024x768", 8) ? 3 :
-            !strncmp(mode, "1280x1024", 9) ? 4 : 0;
-
-        ref = (ref < 50) ? 50 : (ref > 85) ? 85 : ref;
-
-        if (i == 0) {
-                info->var.pixclock = modedb[i].pxclk;
-                info->var.bits_per_pixel = modedb[i].bpp;
-        } else {
-                info->var.pixclock = (100000000 /
-                                      ((modedb[i].left_margin +
-                                        modedb[i].xres +
-                                        modedb[i].right_margin +
-                                        modedb[i].hsync_len) *
-                                       (modedb[i].upper_margin +
-                                        modedb[i].yres +
-                                        modedb[i].lower_margin +
-                                        modedb[i].vsync_len) * ref / 10000));
-                info->var.bits_per_pixel = bpp;
-        }
-
-        info->var.left_margin = modedb[i].left_margin;
-        info->var.right_margin = modedb[i].right_margin;
-        info->var.xres = modedb[i].xres;
-        if (!(modedb[i].yres == 1280 && modedb[i].bpp == 32))
-                info->var.xres_virtual = modedb[i].vxres;
-        else
-                info->var.xres_virtual = modedb[i].xres;
-        info->var.xoffset = 0;
-        info->var.hsync_len = modedb[i].hsync_len;
-        info->var.upper_margin = modedb[i].upper_margin;
-        info->var.yres = modedb[i].yres;
-        info->var.yres_virtual = modedb[i].vyres;
-        info->var.yoffset = 0;
-        info->var.lower_margin = modedb[i].lower_margin;
-        info->var.vsync_len = modedb[i].vsync_len;
-        info->var.sync = 0;
-        info->var.vmode = FB_VMODE_NONINTERLACED;
-
-        if (cyblafb_check_var(&info->var, info)) {
-                // 640x480 - 8@75 should really never fail. One case would
-                // be fp == 1 and nativex < 640 ... give up then
-                if (i == 1 && bpp == 8 && ref == 75) {
-                        output("Can't find a valid mode :-(\n");
-                        return -EINVAL;
-                }
-                // Our detected mode is unlikely to fail. If it does,
-                // try 640x480 - 8@75 ...
-                if (i == 0) {
-                        mode = "640x480";
-                        bpp = 8;
-                        ref = 75;
-                        output("Detected mode failed check_var! "
-                               "Trying 640x480 - 8@75\n");
-                        goto tryagain;
-                }
-                // A specified video mode failed for some reason.
-                // Try the startup mode first
-                output("Specified mode '%s' failed check! "
-                       "Falling back to startup mode.\n", mode);
-                mode = NULL;
-                goto tryagain;
-        }
-
-        return 0;
-}
-
-//========================================================
-//
-// Detect activated memory size. Undefined values require
-// memsize parameter.
-//
-//========================================================
-
-static unsigned int __devinit get_memsize(void)
-{
-        unsigned char tmp;
-        unsigned int k;
-
-        if (memsize)
-                k = memsize * Kb;
-        else {
-                tmp = read3X4(CR1F) & 0x0F;
-                switch (tmp) {
-                case 0x03:
-                        k = 1 * 1024 * 1024;
-                        break;
-                case 0x07:
-                        k = 2 * 1024 * 1024;
-                        break;
-                case 0x0F:
-                        k = 4 * 1024 * 1024;
-                        break;
-                case 0x04:
-                        k = 8 * 1024 * 1024;
-                        break;
-                default:
-                        k = 1 * 1024 * 1024;
-                        output("Unknown memory size code %x in CR1F."
-                               " We default to 1 Mb for now, please"
-                               " do provide a memsize parameter!\n", tmp);
-                }
-        }
-
-        if (verbosity > 0)
-                output("framebuffer size = %d Kb\n", k / Kb);
-        return k;
-}
-
-//=========================================================
-//
-// Detect if a flat panel monitor connected to the special
-// interface is active. Override is possible by fp and crt
-// parameters.
-//
-//=========================================================
-
-static unsigned int __devinit get_displaytype(void)
-{
-        if (fp)
-                return DISPLAY_FP;
-        if (crt)
-                return DISPLAY_CRT;
-        return (read3CE(GR33) & 0x10) ? DISPLAY_FP : DISPLAY_CRT;
-}
-
-//=====================================
-//
-// Get native resolution of flat panel
-//
-//=====================================
-
-static int __devinit get_nativex(void)
-{
-        int x, y, tmp;
-
-        if (nativex)
-                return nativex;
-
-        tmp = (read3CE(GR52) >> 4) & 3;
-
-        switch (tmp) {
-        case 0: x = 1280; y = 1024;
-                break;
-        case 2: x = 1024; y = 768;
-                break;
-        case 3: x = 800;  y = 600;
-                break;
-        case 4: x = 1400; y = 1050;
-                break;
-        case 1:
-        default:
-                x = 640; y = 480;
-                break;
-        }
-
-        if (verbosity > 0)
-                output("%dx%d flat panel found\n", x, y);
-        return x;
-}
-
-static int __devinit cybla_pci_probe(struct pci_dev *dev,
-                                     const struct pci_device_id *id)
-{
-        struct fb_info *info;
-        struct cyblafb_par *par;
-
-        info = framebuffer_alloc(sizeof(struct cyblafb_par), &dev->dev);
-        if (!info)
-                goto errout_alloc_info;
-
-        info->pixmap.addr = kzalloc(CYBLAFB_PIXMAPSIZE, GFP_KERNEL);
-        if (!info->pixmap.addr) {
-                output("allocation of pixmap buffer failed!\n");
-                goto errout_alloc_pixmap;
-        }
-        info->pixmap.size = CYBLAFB_PIXMAPSIZE - 4;
-        info->pixmap.buf_align = 4;
-        info->pixmap.access_align = 32;
-        info->pixmap.flags = FB_PIXMAP_SYSTEM;
-        info->pixmap.scan_align = 4;
-
-        par = info->par;
-        par->ops = cyblafb_ops;
-
-        info->fix = cyblafb_fix;
-        info->fbops = &par->ops;
-        info->fix = cyblafb_fix;
-
-        if (pci_enable_device(dev)) {
-                output("could not enable device!\n");
-                goto errout_enable;
-        }
-        // might already be requested by vga console or vesafb,
-        // so we do care about success
-        if (!request_region(0x3c0, 0x20, "cyblafb")) {
-                output("region 0x3c0/0x20 already reserved\n");
-                vesafb |= 1;
-
-        }
-        //
-        // Graphics Engine Registers
-        //
-        if (!request_region(GEBase, 0x100, "cyblafb")) {
-                output("region %#x/0x100 already reserved\n", GEBase);
-                vesafb |= 2;
-        }
-
-        regdump(par);
-
-        enable_mmio();
-
-        // setup MMIO region
-        info->fix.mmio_start = pci_resource_start(dev, 1);
-        info->fix.mmio_len = 0x20000;
-
-        if (!request_mem_region(info->fix.mmio_start,
-                                info->fix.mmio_len, "cyblafb")) {
-                output("request_mem_region failed for mmio region!\n");
-                goto errout_mmio_reqmem;
-        }
-
-        io_virt = ioremap_nocache(info->fix.mmio_start, info->fix.mmio_len);
-
-        if (!io_virt) {
-                output("ioremap failed for mmio region\n");
-                goto errout_mmio_remap;
-        }
-        // setup framebuffer memory ... might already be requested
-        // by vesafb. Not to fail in case of an unsuccessful request
-        // is useful if both are loaded.
-        info->fix.smem_start = pci_resource_start(dev, 0);
-        info->fix.smem_len = get_memsize();
-
-        if (!request_mem_region(info->fix.smem_start,
-                                info->fix.smem_len, "cyblafb")) {
-                output("region %#lx/%#x already reserved\n",
-                       info->fix.smem_start, info->fix.smem_len);
-                vesafb |= 4;
-        }
-
-        info->screen_base = ioremap_nocache(info->fix.smem_start,
-                                            info->fix.smem_len);
-
-        if (!info->screen_base) {
-                output("ioremap failed for smem region\n");
-                goto errout_smem_remap;
-        }
-
-        displaytype = get_displaytype();
-
-        if (displaytype == DISPLAY_FP)
-                nativex = get_nativex();
-
-        info->flags = FBINFO_DEFAULT
-                    | FBINFO_HWACCEL_COPYAREA
-                    | FBINFO_HWACCEL_FILLRECT
-                    | FBINFO_HWACCEL_IMAGEBLIT
-                    | FBINFO_READS_FAST
-//                  | FBINFO_PARTIAL_PAN_OK
-                    | FBINFO_MISC_ALWAYS_SETPAR;
-
-        info->pseudo_palette = par->pseudo_pal;
-
-        if (getstartupmode(info))
-                goto errout_findmode;
-
-        fb_alloc_cmap(&info->cmap, 256, 0);
-
-        if (register_framebuffer(info)) {
-                output("Could not register CyBla framebuffer\n");
-                goto errout_register;
-        }
-
-        pci_set_drvdata(dev, info);
-
-        //
-        // normal exit and error paths
-        //
-
-        return 0;
-
-      errout_register:
-      errout_findmode:
-        iounmap(info->screen_base);
-      errout_smem_remap:
-        if (!(vesafb & 4))
-                release_mem_region(info->fix.smem_start, info->fix.smem_len);
-        iounmap(io_virt);
-      errout_mmio_remap:
-        release_mem_region(info->fix.mmio_start, info->fix.mmio_len);
-      errout_mmio_reqmem:
-        if (!(vesafb & 1))
-                release_region(0x3c0, 32);
-      errout_enable:
-        kfree(info->pixmap.addr);
-      errout_alloc_pixmap:
-        framebuffer_release(info);
-      errout_alloc_info:
-        output("CyblaFB version %s aborting init.\n", VERSION);
-        return -ENODEV;
-}
-
-static void __devexit cybla_pci_remove(struct pci_dev *dev)
-{
-        struct fb_info *info = pci_get_drvdata(dev);
-
-        unregister_framebuffer(info);
-        iounmap(io_virt);
-        iounmap(info->screen_base);
-        if (!(vesafb & 4))
-                release_mem_region(info->fix.smem_start, info->fix.smem_len);
-        release_mem_region(info->fix.mmio_start, info->fix.mmio_len);
-        fb_dealloc_cmap(&info->cmap);
-        if (!(vesafb & 2))
-                release_region(GEBase, 0x100);
-        if (!(vesafb & 1))
-                release_region(0x3c0, 32);
-        kfree(info->pixmap.addr);
-        framebuffer_release(info);
-        output("CyblaFB version %s normal exit.\n", VERSION);
-}
-
-//
-// List of boards that we are trying to support
-//
-static struct pci_device_id cybla_devices[] = {
-        {PCI_VENDOR_ID_TRIDENT, CYBERBLADEi1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {0,}
-};
-
-MODULE_DEVICE_TABLE(pci, cybla_devices);
-
-static struct pci_driver cyblafb_pci_driver = {
-        .name = "cyblafb",
-        .id_table = cybla_devices,
-        .probe = cybla_pci_probe,
-        .remove = __devexit_p(cybla_pci_remove)
-};
-
-//=============================================================
-//
-// kernel command line example:
-//
-//      video=cyblafb:1280x1024, bpp=16, ref=50 ...
-//
-// modprobe command line example:
-//
-//      modprobe cyblafb mode=1280x1024 bpp=16 ref=50 ...
-//
-//=============================================================
-
-static int __devinit cyblafb_init(void)
-{
-#ifndef MODULE
-        char *options = NULL;
-        char *opt;
-
-        if (fb_get_options("cyblafb", &options))
-                return -ENODEV;
-
-        if (options && *options)
-                while ((opt = strsep(&options, ",")) != NULL) {
-                        if (!*opt)
-                                continue;
-                        else if (!strncmp(opt, "bpp=", 4))
-                                bpp = simple_strtoul(opt + 4, NULL, 0);
-                        else if (!strncmp(opt, "ref=", 4))
-                                ref = simple_strtoul(opt + 4, NULL, 0);
-                        else if (!strncmp(opt, "fp", 2))
-                                displaytype = DISPLAY_FP;
-                        else if (!strncmp(opt, "crt", 3))
-                                displaytype = DISPLAY_CRT;
-                        else if (!strncmp(opt, "nativex=", 8))
-                                nativex = simple_strtoul(opt + 8, NULL, 0);
-                        else if (!strncmp(opt, "center", 6))
-                                center = 1;
-                        else if (!strncmp(opt, "stretch", 7))
-                                stretch = 1;
-                        else if (!strncmp(opt, "pciwb=", 6))
-                                pciwb = simple_strtoul(opt + 6, NULL, 0);
-                        else if (!strncmp(opt, "pcirb=", 6))
-                                pcirb = simple_strtoul(opt + 6, NULL, 0);
-                        else if (!strncmp(opt, "pciwr=", 6))
-                                pciwr = simple_strtoul(opt + 6, NULL, 0);
-                        else if (!strncmp(opt, "pcirr=", 6))
-                                pcirr = simple_strtoul(opt + 6, NULL, 0);
-                        else if (!strncmp(opt, "memsize=", 8))
-                                memsize = simple_strtoul(opt + 8, NULL, 0);
-                        else if (!strncmp(opt, "verbosity=", 10))
-                                verbosity = simple_strtoul(opt + 10, NULL, 0);
-                        else
-                                mode = opt;
-                }
-#endif
-        output("CyblaFB version %s initializing\n", VERSION);
-        return pci_register_driver(&cyblafb_pci_driver);
-}
-
-static void __exit cyblafb_exit(void)
-{
-        pci_unregister_driver(&cyblafb_pci_driver);
-}
-
-module_init(cyblafb_init);
-module_exit(cyblafb_exit);
-
-MODULE_AUTHOR("Knut Petersen <knut_petersen@t-online.de>");
-MODULE_DESCRIPTION("Framebuffer driver for Cyberblade/i1 graphics core");
-MODULE_LICENSE("GPL");
diff --git a/drivers/video/efifb.c b/drivers/video/efifb.c
index daf9b81878a4..0c5b9a9fd56f 100644
--- a/drivers/video/efifb.c
+++ b/drivers/video/efifb.c
@@ -129,6 +129,8 @@ static int set_system(const struct dmi_system_id *id)
                 screen_info.lfb_width = info->width;
         if (screen_info.lfb_height == 0)
                 screen_info.lfb_height = info->height;
+        if (screen_info.orig_video_isVGA == 0)
+                screen_info.orig_video_isVGA = VIDEO_TYPE_EFI;
 
         return 0;
 }
@@ -374,9 +376,10 @@ static int __init efifb_init(void)
         int ret;
         char *option = NULL;
 
+        dmi_check_system(dmi_system_table);
+
         if (screen_info.orig_video_isVGA != VIDEO_TYPE_EFI)
                 return -ENODEV;
-        dmi_check_system(dmi_system_table);
 
         if (fb_get_options("efifb", &option))
                 return -ENODEV;
diff --git a/drivers/video/fb_defio.c b/drivers/video/fb_defio.c
index 082026546aee..0a7a6679ee6e 100644
--- a/drivers/video/fb_defio.c
+++ b/drivers/video/fb_defio.c
@@ -85,8 +85,9 @@ EXPORT_SYMBOL_GPL(fb_deferred_io_fsync);
 
 /* vm_ops->page_mkwrite handler */
 static int fb_deferred_io_mkwrite(struct vm_area_struct *vma,
-                                  struct page *page)
+                                  struct vm_fault *vmf)
 {
+        struct page *page = vmf->page;
         struct fb_info *info = vma->vm_private_data;
         struct fb_deferred_io *fbdefio = info->fbdefio;
         struct page *cur;
diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
index cfd9dce1ce0b..2ac32e6b5953 100644
--- a/drivers/video/fbmem.c
+++ b/drivers/video/fbmem.c
@@ -46,6 +46,17 @@
 struct fb_info *registered_fb[FB_MAX] __read_mostly;
 int num_registered_fb __read_mostly;
 
+int lock_fb_info(struct fb_info *info)
+{
+        mutex_lock(&info->lock);
+        if (!info->fbops) {
+                mutex_unlock(&info->lock);
+                return 0;
+        }
+        return 1;
+}
+EXPORT_SYMBOL(lock_fb_info);
+
 /*
  * Helpers
  */
@@ -1086,13 +1097,8 @@ static long do_fb_ioctl(struct fb_info *info, unsigned int cmd,
                         return -EINVAL;
                 con2fb.framebuffer = -1;
                 event.data = &con2fb;
-
-                if (!lock_fb_info(info))
-                        return -ENODEV;
                 event.info = info;
                 fb_notifier_call_chain(FB_EVENT_GET_CONSOLE_MAP, &event);
-                unlock_fb_info(info);
-
                 ret = copy_to_user(argp, &con2fb, sizeof(con2fb)) ? -EFAULT : 0;
                 break;
         case FBIOPUT_CON2FBMAP:
@@ -1109,12 +1115,8 @@ static long do_fb_ioctl(struct fb_info *info, unsigned int cmd,
                         break;
                 }
                 event.data = &con2fb;
-                if (!lock_fb_info(info))
-                        return -ENODEV;
                 event.info = info;
-                ret = fb_notifier_call_chain(FB_EVENT_SET_CONSOLE_MAP,
-                                              &event);
-                unlock_fb_info(info);
+                ret = fb_notifier_call_chain(FB_EVENT_SET_CONSOLE_MAP, &event);
                 break;
         case FBIOBLANK:
                 if (!lock_fb_info(info))
diff --git a/drivers/video/nvidia/nv_type.h b/drivers/video/nvidia/nv_type.h
index f132aab8c5de..c03f7f55c76d 100644
--- a/drivers/video/nvidia/nv_type.h
+++ b/drivers/video/nvidia/nv_type.h
@@ -5,7 +5,6 @@
 #include <linux/types.h>
 #include <linux/i2c.h>
 #include <linux/i2c-algo-bit.h>
-#include <linux/mutex.h>
 #include <video/vga.h>
 
 #define NV_ARCH_04  0x04
@@ -99,7 +98,6 @@ struct nvidia_par {
         RIVA_HW_STATE initial_state;
         RIVA_HW_STATE *CurrentState;
         struct vgastate vgastate;
-        struct mutex open_lock;
         u32 pseudo_palette[16];
         struct pci_dev *pci_dev;
         u32 Architecture;
diff --git a/drivers/video/nvidia/nvidia.c b/drivers/video/nvidia/nvidia.c
index 9dbb5a5a267b..efe10ff86d63 100644
--- a/drivers/video/nvidia/nvidia.c
+++ b/drivers/video/nvidia/nvidia.c
@@ -1004,15 +1004,12 @@ static int nvidiafb_open(struct fb_info *info, int user)
 {
         struct nvidia_par *par = info->par;
 
-        mutex_lock(&par->open_lock);
-
         if (!par->open_count) {
                 save_vga_x86(par);
                 nvidia_save_vga(par, &par->initial_state);
         }
 
         par->open_count++;
-        mutex_unlock(&par->open_lock);
         return 0;
 }
 
@@ -1021,8 +1018,6 @@ static int nvidiafb_release(struct fb_info *info, int user)
         struct nvidia_par *par = info->par;
         int err = 0;
 
-        mutex_lock(&par->open_lock);
-
         if (!par->open_count) {
                 err = -EINVAL;
                 goto done;
@@ -1035,7 +1030,6 @@ static int nvidiafb_release(struct fb_info *info, int user)
 
         par->open_count--;
 done:
-        mutex_unlock(&par->open_lock);
         return err;
 }
 
@@ -1300,7 +1294,6 @@ static int __devinit nvidiafb_probe(struct pci_dev *pd,
 
         par = info->par;
         par->pci_dev = pd;
-        mutex_init(&par->open_lock);
         info->pixmap.addr = kzalloc(8 * 1024, GFP_KERNEL);
 
         if (info->pixmap.addr == NULL)
diff --git a/drivers/video/omap/hwa742.c b/drivers/video/omap/hwa742.c
index f24df0b54e1c..8aa6e47202b9 100644
--- a/drivers/video/omap/hwa742.c
+++ b/drivers/video/omap/hwa742.c
@@ -742,7 +742,7 @@ static int calc_extif_timings(unsigned long sysclk, int *extif_mem_div)
                 if (calc_reg_timing(sysclk, div) == 0)
                         break;
         }
-        if (div > max_clk_div)
+        if (div >= max_clk_div)
                 goto err;
 
         *extif_mem_div = div;
@@ -752,7 +752,7 @@ static int calc_extif_timings(unsigned long sysclk, int *extif_mem_div)
                         break;
         }
 
-        if (div > max_clk_div)
+        if (div >= max_clk_div)
                 goto err;
 
         return 0;
diff --git a/drivers/video/omap/omapfb_main.c b/drivers/video/omap/omapfb_main.c
index 1a49519dafa4..060d72fe57cb 100644
--- a/drivers/video/omap/omapfb_main.c
+++ b/drivers/video/omap/omapfb_main.c
@@ -338,7 +338,7 @@ static int omapfb_blank(int blank, struct fb_info *fbi)
 
         omapfb_rqueue_lock(fbdev);
         switch (blank) {
-        case VESA_NO_BLANKING:
+        case FB_BLANK_UNBLANK:
                 if (fbdev->state == OMAPFB_SUSPENDED) {
                         if (fbdev->ctrl->resume)
                                 fbdev->ctrl->resume();
@@ -349,7 +349,7 @@ static int omapfb_blank(int blank, struct fb_info *fbi)
                                 do_update = 1;
                 }
                 break;
-        case VESA_POWERDOWN:
+        case FB_BLANK_POWERDOWN:
                 if (fbdev->state == OMAPFB_ACTIVE) {
                         fbdev->panel->disable(fbdev->panel);
                         if (fbdev->ctrl->suspend)
@@ -1818,7 +1818,7 @@ static int omapfb_suspend(struct platform_device *pdev, pm_message_t mesg)
 {
         struct omapfb_device *fbdev = platform_get_drvdata(pdev);
 
-        omapfb_blank(VESA_POWERDOWN, fbdev->fb_info[0]);
+        omapfb_blank(FB_BLANK_POWERDOWN, fbdev->fb_info[0]);
 
         return 0;
 }
@@ -1828,7 +1828,7 @@ static int omapfb_resume(struct platform_device *pdev)
 {
         struct omapfb_device *fbdev = platform_get_drvdata(pdev);
 
-        omapfb_blank(VESA_NO_BLANKING, fbdev->fb_info[0]);
+        omapfb_blank(FB_BLANK_UNBLANK, fbdev->fb_info[0]);
         return 0;
 }
 
diff --git a/drivers/video/s1d13xxxfb.c b/drivers/video/s1d13xxxfb.c
index a7b01d2724b5..0726aecf3b7e 100644
--- a/drivers/video/s1d13xxxfb.c
+++ b/drivers/video/s1d13xxxfb.c
@@ -50,9 +50,22 @@
 #define dbg(fmt, args...) do { } while (0)
 #endif
 
-static const int __devinitconst s1d13xxxfb_revisions[] = {
-        S1D13506_CHIP_REV,      /* Rev.4 on HP Jornada 7xx S1D13506 */
-        S1D13806_CHIP_REV,      /* Rev.7 on .. */
+/*
+ * List of card production ids
+ */
+static const int s1d13xxxfb_prod_ids[] = {
+        S1D13505_PROD_ID,
+        S1D13506_PROD_ID,
+        S1D13806_PROD_ID,
+};
+
+/*
+ * List of card strings
+ */
+static const char *s1d13xxxfb_prod_names[] = {
+        "S1D13505",
+        "S1D13506",
+        "S1D13806",
 };
 
 /*
@@ -377,7 +390,6 @@ s1d13xxxfb_pan_display(struct fb_var_screeninfo *var, struct fb_info *info)
         return 0;
 }
 
-
 /* framebuffer information structures */
 
 static struct fb_ops s1d13xxxfb_fbops = {
@@ -544,7 +556,7 @@ s1d13xxxfb_probe(struct platform_device *pdev)
         struct s1d13xxxfb_pdata *pdata = NULL;
         int ret = 0;
         int i;
-        u8 revision;
+        u8 revision, prod_id;
 
         dbg("probe called: device is %p\n", pdev);
 
@@ -613,19 +625,31 @@ s1d13xxxfb_probe(struct platform_device *pdev)
                 goto bail;
         }
 
-        revision = s1d13xxxfb_readreg(default_par, S1DREG_REV_CODE) >> 2;
-
+        /* production id is top 6 bits */
+        prod_id = s1d13xxxfb_readreg(default_par, S1DREG_REV_CODE) >> 2;
+        /* revision id is lower 2 bits */
+        revision = s1d13xxxfb_readreg(default_par, S1DREG_REV_CODE) & 0x3;
         ret = -ENODEV;
 
-        for (i = 0; i < ARRAY_SIZE(s1d13xxxfb_revisions); i++) {
-                if (revision == s1d13xxxfb_revisions[i])
+        for (i = 0; i < ARRAY_SIZE(s1d13xxxfb_prod_ids); i++) {
+                if (prod_id == s1d13xxxfb_prod_ids[i]) {
+                        /* looks like we got it in our list */
+                        default_par->prod_id = prod_id;
+                        default_par->revision = revision;
                         ret = 0;
+                        break;
+                }
         }
 
-        if (!ret)
+        if (!ret) {
+                printk(KERN_INFO PFX "chip production id %i = %s\n",
+                        prod_id, s1d13xxxfb_prod_names[i]);
                 printk(KERN_INFO PFX "chip revision %i\n", revision);
-        else {
-                printk(KERN_INFO PFX "unknown chip revision %i\n", revision);
+        } else {
+                printk(KERN_INFO PFX
+                        "unknown chip production id %i, revision %i\n",
+                        prod_id, revision);
+                printk(KERN_INFO PFX "please contant maintainer\n");
                 goto bail;
         }
 
diff --git a/drivers/video/s3c-fb.c b/drivers/video/s3c-fb.c
new file mode 100644
index 000000000000..5e9c6302433b
--- /dev/null
+++ b/drivers/video/s3c-fb.c
@@ -0,0 +1,1036 @@
+/* linux/drivers/video/s3c-fb.c
+ *
+ * Copyright 2008 Openmoko Inc.
+ * Copyright 2008 Simtec Electronics
+ *      Ben Dooks <ben@simtec.co.uk>
+ *      http://armlinux.simtec.co.uk/
+ *
+ * Samsung SoC Framebuffer driver
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+*/
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/dma-mapping.h>
+#include <linux/init.h>
+#include <linux/gfp.h>
+#include <linux/clk.h>
+#include <linux/fb.h>
+#include <linux/io.h>
+
+#include <mach/map.h>
+#include <mach/regs-fb.h>
+#include <plat/fb.h>
+
+/* This driver will export a number of framebuffer interfaces depending
+ * on the configuration passed in via the platform data. Each fb instance
+ * maps to a hardware window. Currently there is no support for runtime
+ * setting of the alpha-blending functions that each window has, so only
+ * window 0 is actually useful.
+ *
+ * Window 0 is treated specially, it is used for the basis of the LCD
+ * output timings and as the control for the output power-down state.
+*/
+
+/* note, some of the functions that get called are derived from including
+ * <mach/regs-fb.h> as they are specific to the architecture that the code
+ * is being built for.
+*/
+
+#ifdef CONFIG_FB_S3C_DEBUG_REGWRITE
+#undef writel
+#define writel(v, r) do { \
+        printk(KERN_DEBUG "%s: %08x => %p\n", __func__, (unsigned int)v, r); \
+        __raw_writel(v, r); } while(0)
+#endif /* FB_S3C_DEBUG_REGWRITE */
+
+struct s3c_fb;
+
+/**
+ * struct s3c_fb_win - per window private data for each framebuffer.
+ * @windata: The platform data supplied for the window configuration.
+ * @parent: The hardware that this window is part of.
+ * @fbinfo: Pointer pack to the framebuffer info for this window.
+ * @palette_buffer: Buffer/cache to hold palette entries.
+ * @pseudo_palette: For use in TRUECOLOUR modes for entries 0..15/
+ * @index: The window number of this window.
+ * @palette: The bitfields for changing r/g/b into a hardware palette entry.
+ */
+struct s3c_fb_win {
+        struct s3c_fb_pd_win    *windata;
+        struct s3c_fb           *parent;
+        struct fb_info          *fbinfo;
+        struct s3c_fb_palette    palette;
+
+        u32                     *palette_buffer;
+        u32                      pseudo_palette[16];
+        unsigned int             index;
+};
+
+/**
+ * struct s3c_fb - overall hardware state of the hardware
+ * @dev: The device that we bound to, for printing, etc.
+ * @regs_res: The resource we claimed for the IO registers.
+ * @bus_clk: The clk (hclk) feeding our interface and possibly pixclk.
+ * @regs: The mapped hardware registers.
+ * @enabled: A bitmask of enabled hardware windows.
+ * @pdata: The platform configuration data passed with the device.
+ * @windows: The hardware windows that have been claimed.
+ */
+struct s3c_fb {
+        struct device           *dev;
+        struct resource         *regs_res;
+        struct clk              *bus_clk;
+        void __iomem            *regs;
+
+        unsigned char            enabled;
+
+        struct s3c_fb_platdata  *pdata;
+        struct s3c_fb_win       *windows[S3C_FB_MAX_WIN];
+};
+
+/**
+ * s3c_fb_win_has_palette() - determine if a mode has a palette
+ * @win: The window number being queried.
+ * @bpp: The number of bits per pixel to test.
+ *
+ * Work out if the given window supports palletised data at the specified bpp.
+ */
+static int s3c_fb_win_has_palette(unsigned int win, unsigned int bpp)
+{
+        return s3c_fb_win_pal_size(win) <= (1 << bpp);
+}
+
+/**
+ * s3c_fb_check_var() - framebuffer layer request to verify a given mode.
+ * @var: The screen information to verify.
+ * @info: The framebuffer device.
+ *
+ * Framebuffer layer call to verify the given information and allow us to
+ * update various information depending on the hardware capabilities.
+ */
+static int s3c_fb_check_var(struct fb_var_screeninfo *var,
+                            struct fb_info *info)
+{
+        struct s3c_fb_win *win = info->par;
+        struct s3c_fb_pd_win *windata = win->windata;
+        struct s3c_fb *sfb = win->parent;
+
+        dev_dbg(sfb->dev, "checking parameters\n");
+
+        var->xres_virtual = max((unsigned int)windata->virtual_x, var->xres);
+        var->yres_virtual = max((unsigned int)windata->virtual_y, var->yres);
+
+        if (!s3c_fb_validate_win_bpp(win->index, var->bits_per_pixel)) {
+                dev_dbg(sfb->dev, "win %d: unsupported bpp %d\n",
+                        win->index, var->bits_per_pixel);
+                return -EINVAL;
+        }
+
+        /* always ensure these are zero, for drop through cases below */
+        var->transp.offset = 0;
+        var->transp.length = 0;
+
+        switch (var->bits_per_pixel) {
+        case 1:
+        case 2:
+        case 4:
+        case 8:
+                if (!s3c_fb_win_has_palette(win->index, var->bits_per_pixel)) {
+                        /* non palletised, A:1,R:2,G:3,B:2 mode */
+                        var->red.offset         = 4;
+                        var->green.offset       = 2;
+                        var->blue.offset        = 0;
+                        var->red.length         = 5;
+                        var->green.length       = 3;
+                        var->blue.length        = 2;
+                        var->transp.offset      = 7;
+                        var->transp.length      = 1;
+                } else {
+                        var->red.offset = 0;
+                        var->red.length = var->bits_per_pixel;
+                        var->green      = var->red;
+                        var->blue       = var->red;
+                }
+                break;
+
+        case 19:
+                /* 666 with one bit alpha/transparency */
+                var->transp.offset      = 18;
+                var->transp.length      = 1;
+        case 18:
+                var->bits_per_pixel     = 32;
+
+                /* 666 format */
+                var->red.offset         = 12;
+                var->green.offset       = 6;
+                var->blue.offset        = 0;
+                var->red.length         = 6;
+                var->green.length       = 6;
+                var->blue.length        = 6;
+                break;
+
+        case 16:
+                /* 16 bpp, 565 format */
+                var->red.offset         = 11;
+                var->green.offset       = 5;
+                var->blue.offset        = 0;
+                var->red.length         = 5;
+                var->green.length       = 6;
+                var->blue.length        = 5;
+                break;
+
+        case 28:
+        case 25:
+                var->transp.length      = var->bits_per_pixel - 24;
+                var->transp.offset      = 24;
+                /* drop through */
+        case 24:
+                /* our 24bpp is unpacked, so 32bpp */
+                var->bits_per_pixel     = 32;
+        case 32:
+                var->red.offset         = 16;
+                var->red.length         = 8;
+                var->green.offset       = 8;
+                var->green.length       = 8;
+                var->blue.offset        = 0;
+                var->blue.length        = 8;
+                break;
+
+        default:
+                dev_err(sfb->dev, "invalid bpp\n");
+        }
+
+        dev_dbg(sfb->dev, "%s: verified parameters\n", __func__);
+        return 0;
+}
+
+/**
+ * s3c_fb_calc_pixclk() - calculate the divider to create the pixel clock.
+ * @sfb: The hardware state.
+ * @pixclock: The pixel clock wanted, in picoseconds.
+ *
+ * Given the specified pixel clock, work out the necessary divider to get
+ * close to the output frequency.
+ */
+static int s3c_fb_calc_pixclk(struct s3c_fb *sfb, unsigned int pixclk)
+{
+        unsigned long clk = clk_get_rate(sfb->bus_clk);
+        unsigned long long tmp;
+        unsigned int result;
+
+        tmp = (unsigned long long)clk;
+        tmp *= pixclk;
+
+        do_div(tmp, 1000000000UL);
+        result = (unsigned int)tmp / 1000;
+
+        dev_dbg(sfb->dev, "pixclk=%u, clk=%lu, div=%d (%lu)\n",
+                pixclk, clk, result, clk / result);
+
+        return result;
+}
+
+/**
+ * s3c_fb_align_word() - align pixel count to word boundary
+ * @bpp: The number of bits per pixel
+ * @pix: The value to be aligned.
+ *
+ * Align the given pixel count so that it will start on an 32bit word
+ * boundary.
+ */
+static int s3c_fb_align_word(unsigned int bpp, unsigned int pix)
+{
+        int pix_per_word;
+
+        if (bpp > 16)
+                return pix;
+
+        pix_per_word = (8 * 32) / bpp;
+        return ALIGN(pix, pix_per_word);
+}
+
+/**
+ * s3c_fb_set_par() - framebuffer request to set new framebuffer state.
+ * @info: The framebuffer to change.
+ *
+ * Framebuffer layer request to set a new mode for the specified framebuffer
+ */
+static int s3c_fb_set_par(struct fb_info *info)
+{
+        struct fb_var_screeninfo *var = &info->var;
+        struct s3c_fb_win *win = info->par;
+        struct s3c_fb *sfb = win->parent;
+        void __iomem *regs = sfb->regs;
+        int win_no = win->index;
+        u32 data;
+        u32 pagewidth;
+        int clkdiv;
+
+        dev_dbg(sfb->dev, "setting framebuffer parameters\n");
+
+        switch (var->bits_per_pixel) {
+        case 32:
+        case 24:
+        case 16:
+        case 12:
+                info->fix.visual = FB_VISUAL_TRUECOLOR;
+                break;
+        case 8:
+                if (s3c_fb_win_has_palette(win_no, 8))
+                        info->fix.visual = FB_VISUAL_PSEUDOCOLOR;
+                else
+                        info->fix.visual = FB_VISUAL_TRUECOLOR;
+                break;
+        case 1:
+                info->fix.visual = FB_VISUAL_MONO01;
+                break;
+        default:
+                info->fix.visual = FB_VISUAL_PSEUDOCOLOR;
+                break;
+        }
+
+        info->fix.line_length = (var->xres_virtual * var->bits_per_pixel) / 8;
+
+        /* disable the window whilst we update it */
+        writel(0, regs + WINCON(win_no));
+
+        /* use window 0 as the basis for the lcd output timings */
+
+        if (win_no == 0) {
+                clkdiv = s3c_fb_calc_pixclk(sfb, var->pixclock);
+
+                data = sfb->pdata->vidcon0;
+                data &= ~(VIDCON0_CLKVAL_F_MASK | VIDCON0_CLKDIR);
+
+                if (clkdiv > 1)
+                        data |= VIDCON0_CLKVAL_F(clkdiv-1) | VIDCON0_CLKDIR;
+                else
+                        data &= ~VIDCON0_CLKDIR;        /* 1:1 clock */
+
+                /* write the timing data to the panel */
+
+                data |= VIDCON0_ENVID | VIDCON0_ENVID_F;
+                writel(data, regs + VIDCON0);
+
+                data = VIDTCON0_VBPD(var->upper_margin - 1) |
+                       VIDTCON0_VFPD(var->lower_margin - 1) |
+                       VIDTCON0_VSPW(var->vsync_len - 1);
+
+                writel(data, regs + VIDTCON0);
+
+                data = VIDTCON1_HBPD(var->left_margin - 1) |
+                       VIDTCON1_HFPD(var->right_margin - 1) |
+                       VIDTCON1_HSPW(var->hsync_len - 1);
+
+                writel(data, regs + VIDTCON1);
+
+                data = VIDTCON2_LINEVAL(var->yres - 1) |
+                       VIDTCON2_HOZVAL(var->xres - 1);
+                writel(data, regs + VIDTCON2);
+        }
+
+        /* write the buffer address */
+
+        writel(info->fix.smem_start, regs + VIDW_BUF_START(win_no));
+
+        data = info->fix.smem_start + info->fix.line_length * var->yres;
+        writel(data, regs + VIDW_BUF_END(win_no));
+
+        pagewidth = (var->xres * var->bits_per_pixel) >> 3;
+        data = VIDW_BUF_SIZE_OFFSET(info->fix.line_length - pagewidth) |
+               VIDW_BUF_SIZE_PAGEWIDTH(pagewidth);
+        writel(data, regs + VIDW_BUF_SIZE(win_no));
+
+        /* write 'OSD' registers to control position of framebuffer */
+
+        data = VIDOSDxA_TOPLEFT_X(0) | VIDOSDxA_TOPLEFT_Y(0);
+        writel(data, regs + VIDOSD_A(win_no));
+
+        data = VIDOSDxB_BOTRIGHT_X(s3c_fb_align_word(var->bits_per_pixel,
+                                                     var->xres - 1)) |
+               VIDOSDxB_BOTRIGHT_Y(var->yres - 1);
+
+        writel(data, regs + VIDOSD_B(win_no));
+
+        data = var->xres * var->yres;
+        if (s3c_fb_has_osd_d(win_no)) {
+                writel(data, regs + VIDOSD_D(win_no));
+                writel(0, regs + VIDOSD_C(win_no));
+        } else
+                writel(data, regs + VIDOSD_C(win_no));
+
+        data = WINCONx_ENWIN;
+
+        /* note, since we have to round up the bits-per-pixel, we end up
+         * relying on the bitfield information for r/g/b/a to work out
+         * exactly which mode of operation is intended. */
+
+        switch (var->bits_per_pixel) {
+        case 1:
+                data |= WINCON0_BPPMODE_1BPP;
+                data |= WINCONx_BITSWP;
+                data |= WINCONx_BURSTLEN_4WORD;
+                break;
+        case 2:
+                data |= WINCON0_BPPMODE_2BPP;
+                data |= WINCONx_BITSWP;
+                data |= WINCONx_BURSTLEN_8WORD;
+                break;
+        case 4:
+                data |= WINCON0_BPPMODE_4BPP;
+                data |= WINCONx_BITSWP;
+                data |= WINCONx_BURSTLEN_8WORD;
+                break;
+        case 8:
+                if (var->transp.length != 0)
+                        data |= WINCON1_BPPMODE_8BPP_1232;
+                else
+                        data |= WINCON0_BPPMODE_8BPP_PALETTE;
+                data |= WINCONx_BURSTLEN_8WORD;
+                data |= WINCONx_BYTSWP;
+                break;
+        case 16:
+                if (var->transp.length != 0)
+                        data |= WINCON1_BPPMODE_16BPP_A1555;
+                else
+                        data |= WINCON0_BPPMODE_16BPP_565;
+                data |= WINCONx_HAWSWP;
+                data |= WINCONx_BURSTLEN_16WORD;
+                break;
+        case 24:
+        case 32:
+                if (var->red.length == 6) {
+                        if (var->transp.length != 0)
+                                data |= WINCON1_BPPMODE_19BPP_A1666;
+                        else
+                                data |= WINCON1_BPPMODE_18BPP_666;
+                } else if (var->transp.length != 0)
+                        data |= WINCON1_BPPMODE_25BPP_A1888;
+                else
+                        data |= WINCON0_BPPMODE_24BPP_888;
+
+                data |= WINCONx_BURSTLEN_16WORD;
+                break;
+        }
+
+        writel(data, regs + WINCON(win_no));
+        writel(0x0, regs + WINxMAP(win_no));
+
+        return 0;
+}
+
+/**
+ * s3c_fb_update_palette() - set or schedule a palette update.
+ * @sfb: The hardware information.
+ * @win: The window being updated.
+ * @reg: The palette index being changed.
+ * @value: The computed palette value.
+ *
+ * Change the value of a palette register, either by directly writing to
+ * the palette (this requires the palette RAM to be disconnected from the
+ * hardware whilst this is in progress) or schedule the update for later.
+ *
+ * At the moment, since we have no VSYNC interrupt support, we simply set
+ * the palette entry directly.
+ */
+static void s3c_fb_update_palette(struct s3c_fb *sfb,
+                                  struct s3c_fb_win *win,
+                                  unsigned int reg,
+                                  u32 value)
+{
+        void __iomem *palreg;
+        u32 palcon;
+
+        palreg = sfb->regs + s3c_fb_pal_reg(win->index, reg);
+
+        dev_dbg(sfb->dev, "%s: win %d, reg %d (%p): %08x\n",
+                __func__, win->index, reg, palreg, value);
+
+        win->palette_buffer[reg] = value;
+
+        palcon = readl(sfb->regs + WPALCON);
+        writel(palcon | WPALCON_PAL_UPDATE, sfb->regs + WPALCON);
+
+        if (s3c_fb_pal_is16(win->index))
+                writew(value, palreg);
+        else
+                writel(value, palreg);
+
+        writel(palcon, sfb->regs + WPALCON);
+}
+
+static inline unsigned int chan_to_field(unsigned int chan,
+                                         struct fb_bitfield *bf)
+{
+        chan &= 0xffff;
+        chan >>= 16 - bf->length;
+        return chan << bf->offset;
+}
+
+/**
+ * s3c_fb_setcolreg() - framebuffer layer request to change palette.
+ * @regno: The palette index to change.
+ * @red: The red field for the palette data.
+ * @green: The green field for the palette data.
+ * @blue: The blue field for the palette data.
+ * @trans: The transparency (alpha) field for the palette data.
+ * @info: The framebuffer being changed.
+ */
+static int s3c_fb_setcolreg(unsigned regno,
+                            unsigned red, unsigned green, unsigned blue,
+                            unsigned transp, struct fb_info *info)
+{
+        struct s3c_fb_win *win = info->par;
+        struct s3c_fb *sfb = win->parent;
+        unsigned int val;
+
+        dev_dbg(sfb->dev, "%s: win %d: %d => rgb=%d/%d/%d\n",
+                __func__, win->index, regno, red, green, blue);
+
+        switch (info->fix.visual) {
+        case FB_VISUAL_TRUECOLOR:
+                /* true-colour, use pseudo-palette */
+
+                if (regno < 16) {
+                        u32 *pal = info->pseudo_palette;
+
+                        val  = chan_to_field(red,   &info->var.red);
+                        val |= chan_to_field(green, &info->var.green);
+                        val |= chan_to_field(blue,  &info->var.blue);
+
+                        pal[regno] = val;
+                }
+                break;
+
+        case FB_VISUAL_PSEUDOCOLOR:
+                if (regno < s3c_fb_win_pal_size(win->index)) {
+                        val  = chan_to_field(red, &win->palette.r);
+                        val |= chan_to_field(green, &win->palette.g);
+                        val |= chan_to_field(blue, &win->palette.b);
+
+                        s3c_fb_update_palette(sfb, win, regno, val);
+                }
+
+                break;
+
+        default:
+                return 1;       /* unknown type */
+        }
+
+        return 0;
+}
+
+/**
+ * s3c_fb_enable() - Set the state of the main LCD output
+ * @sfb: The main framebuffer state.
+ * @enable: The state to set.
+ */
+static void s3c_fb_enable(struct s3c_fb *sfb, int enable)
+{
+        u32 vidcon0 = readl(sfb->regs + VIDCON0);
+
+        if (enable)
+                vidcon0 |= VIDCON0_ENVID | VIDCON0_ENVID_F;
+        else {
+                /* see the note in the framebuffer datasheet about
+                 * why you cannot take both of these bits down at the
+                 * same time. */
+
+                if (!(vidcon0 & VIDCON0_ENVID))
+                        return;
+
+                vidcon0 |= VIDCON0_ENVID;
+                vidcon0 &= ~VIDCON0_ENVID_F;
+        }
+
+        writel(vidcon0, sfb->regs + VIDCON0);
+}
+
+/**
+ * s3c_fb_blank() - blank or unblank the given window
+ * @blank_mode: The blank state from FB_BLANK_*
+ * @info: The framebuffer to blank.
+ *
+ * Framebuffer layer request to change the power state.
+ */
+static int s3c_fb_blank(int blank_mode, struct fb_info *info)
+{
+        struct s3c_fb_win *win = info->par;
+        struct s3c_fb *sfb = win->parent;
+        unsigned int index = win->index;
+        u32 wincon;
+
+        dev_dbg(sfb->dev, "blank mode %d\n", blank_mode);
+
+        wincon = readl(sfb->regs + WINCON(index));
+
+        switch (blank_mode) {
+        case FB_BLANK_POWERDOWN:
+                wincon &= ~WINCONx_ENWIN;
+                sfb->enabled &= ~(1 << index);
+                /* fall through to FB_BLANK_NORMAL */
+
+        case FB_BLANK_NORMAL:
+                /* disable the DMA and display 0x0 (black) */
+                writel(WINxMAP_MAP | WINxMAP_MAP_COLOUR(0x0),
+                       sfb->regs + WINxMAP(index));
+                break;
+
+        case FB_BLANK_UNBLANK:
+                writel(0x0, sfb->regs + WINxMAP(index));
+                wincon |= WINCONx_ENWIN;
+                sfb->enabled |= (1 << index);
+                break;
+
+        case FB_BLANK_VSYNC_SUSPEND:
+        case FB_BLANK_HSYNC_SUSPEND:
+        default:
+                return 1;
+        }
+
+        writel(wincon, sfb->regs + WINCON(index));
+
+        /* Check the enabled state to see if we need to be running the
+         * main LCD interface, as if there are no active windows then
+         * it is highly likely that we also do not need to output
+         * anything.
+         */
+
+        /* We could do something like the following code, but the current
+         * system of using framebuffer events means that we cannot make
+         * the distinction between just window 0 being inactive and all
+         * the windows being down.
+         *
+         * s3c_fb_enable(sfb, sfb->enabled ? 1 : 0);
+        */
+
+        /* we're stuck with this until we can do something about overriding
+         * the power control using the blanking event for a single fb.
+         */
+        if (index == 0)
+                s3c_fb_enable(sfb, blank_mode != FB_BLANK_POWERDOWN ? 1 : 0);
+
+        return 0;
+}
+
+static struct fb_ops s3c_fb_ops = {
+        .owner          = THIS_MODULE,
+        .fb_check_var   = s3c_fb_check_var,
+        .fb_set_par     = s3c_fb_set_par,
+        .fb_blank       = s3c_fb_blank,
+        .fb_setcolreg   = s3c_fb_setcolreg,
+        .fb_fillrect    = cfb_fillrect,
+        .fb_copyarea    = cfb_copyarea,
+        .fb_imageblit   = cfb_imageblit,
+};
+
+/**
+ * s3c_fb_alloc_memory() - allocate display memory for framebuffer window
+ * @sfb: The base resources for the hardware.
+ * @win: The window to initialise memory for.
+ *
+ * Allocate memory for the given framebuffer.
+ */
+static int __devinit s3c_fb_alloc_memory(struct s3c_fb *sfb,
+                                         struct s3c_fb_win *win)
+{
+        struct s3c_fb_pd_win *windata = win->windata;
+        unsigned int real_size, virt_size, size;
+        struct fb_info *fbi = win->fbinfo;
+        dma_addr_t map_dma;
+
+        dev_dbg(sfb->dev, "allocating memory for display\n");
+
+        real_size = windata->win_mode.xres * windata->win_mode.yres;
+        virt_size = windata->virtual_x * windata->virtual_y;
+
+        dev_dbg(sfb->dev, "real_size=%u (%u.%u), virt_size=%u (%u.%u)\n",
+                real_size, windata->win_mode.xres, windata->win_mode.yres,
+                virt_size, windata->virtual_x, windata->virtual_y);
+
+        size = (real_size > virt_size) ? real_size : virt_size;
+        size *= (windata->max_bpp > 16) ? 32 : windata->max_bpp;
+        size /= 8;
+
+        fbi->fix.smem_len = size;
+        size = PAGE_ALIGN(size);
+
+        dev_dbg(sfb->dev, "want %u bytes for window\n", size);
+
+        fbi->screen_base = dma_alloc_writecombine(sfb->dev, size,
+                                                  &map_dma, GFP_KERNEL);
+        if (!fbi->screen_base)
+                return -ENOMEM;
+
+        dev_dbg(sfb->dev, "mapped %x to %p\n",
+                (unsigned int)map_dma, fbi->screen_base);
+
+        memset(fbi->screen_base, 0x0, size);
+        fbi->fix.smem_start = map_dma;
+
+        return 0;
+}
+
+/**
+ * s3c_fb_free_memory() - free the display memory for the given window
+ * @sfb: The base resources for the hardware.
+ * @win: The window to free the display memory for.
+ *
+ * Free the display memory allocated by s3c_fb_alloc_memory().
+ */
+static void s3c_fb_free_memory(struct s3c_fb *sfb, struct s3c_fb_win *win)
+{
+        struct fb_info *fbi = win->fbinfo;
+
+        dma_free_writecombine(sfb->dev, PAGE_ALIGN(fbi->fix.smem_len),
+                              fbi->screen_base, fbi->fix.smem_start);
+}
+
+/**
+ * s3c_fb_release_win() - release resources for a framebuffer window.
+ * @win: The window to cleanup the resources for.
+ *
+ * Release the resources that where claimed for the hardware window,
+ * such as the framebuffer instance and any memory claimed for it.
+ */
+static void s3c_fb_release_win(struct s3c_fb *sfb, struct s3c_fb_win *win)
+{
+        fb_dealloc_cmap(&win->fbinfo->cmap);
+        unregister_framebuffer(win->fbinfo);
+        s3c_fb_free_memory(sfb, win);
+}
+
+/**
+ * s3c_fb_probe_win() - register an hardware window
+ * @sfb: The base resources for the hardware
+ * @res: Pointer to where to place the resultant window.
+ *
+ * Allocate and do the basic initialisation for one of the hardware's graphics
+ * windows.
+ */
+static int __devinit s3c_fb_probe_win(struct s3c_fb *sfb, unsigned int win_no,
+                                      struct s3c_fb_win **res)
+{
+        struct fb_var_screeninfo *var;
+        struct fb_videomode *initmode;
+        struct s3c_fb_pd_win *windata;
+        struct s3c_fb_win *win;
+        struct fb_info *fbinfo;
+        int palette_size;
+        int ret;
+
+        dev_dbg(sfb->dev, "probing window %d\n", win_no);
+
+        palette_size = s3c_fb_win_pal_size(win_no);
+
+        fbinfo = framebuffer_alloc(sizeof(struct s3c_fb_win) +
+                                   palette_size * sizeof(u32), sfb->dev);
+        if (!fbinfo) {
+                dev_err(sfb->dev, "failed to allocate framebuffer\n");
+                return -ENOENT;
+        }
+
+        windata = sfb->pdata->win[win_no];
+        initmode = &windata->win_mode;
+
+        WARN_ON(windata->max_bpp == 0);
+        WARN_ON(windata->win_mode.xres == 0);
+        WARN_ON(windata->win_mode.yres == 0);
+
+        win = fbinfo->par;
+        var = &fbinfo->var;
+        win->fbinfo = fbinfo;
+        win->parent = sfb;
+        win->windata = windata;
+        win->index = win_no;
+        win->palette_buffer = (u32 *)(win + 1);
+
+        ret = s3c_fb_alloc_memory(sfb, win);
+        if (ret) {
+                dev_err(sfb->dev, "failed to allocate display memory\n");
+                goto err_framebuffer;
+        }
+
+        /* setup the r/b/g positions for the window's palette */
+        s3c_fb_init_palette(win_no, &win->palette);
+
+        /* setup the initial video mode from the window */
+        fb_videomode_to_var(&fbinfo->var, initmode);
+
+        fbinfo->fix.type        = FB_TYPE_PACKED_PIXELS;
+        fbinfo->fix.accel       = FB_ACCEL_NONE;
+        fbinfo->var.activate    = FB_ACTIVATE_NOW;
+        fbinfo->var.vmode       = FB_VMODE_NONINTERLACED;
+        fbinfo->var.bits_per_pixel = windata->default_bpp;
+        fbinfo->fbops           = &s3c_fb_ops;
+        fbinfo->flags           = FBINFO_FLAG_DEFAULT;
+        fbinfo->pseudo_palette  = &win->pseudo_palette;
+
+        /* prepare to actually start the framebuffer */
+
+        ret = s3c_fb_check_var(&fbinfo->var, fbinfo);
+        if (ret < 0) {
+                dev_err(sfb->dev, "check_var failed on initial video params\n");
+                goto err_alloc_mem;
+        }
+
+        /* create initial colour map */
+
+        ret = fb_alloc_cmap(&fbinfo->cmap, s3c_fb_win_pal_size(win_no), 1);
+        if (ret == 0)
+                fb_set_cmap(&fbinfo->cmap, fbinfo);
+        else
+                dev_err(sfb->dev, "failed to allocate fb cmap\n");
+
+        s3c_fb_set_par(fbinfo);
+
+        dev_dbg(sfb->dev, "about to register framebuffer\n");
+
+        /* run the check_var and set_par on our configuration. */
+
+        ret = register_framebuffer(fbinfo);
+        if (ret < 0) {
+                dev_err(sfb->dev, "failed to register framebuffer\n");
+                goto err_alloc_mem;
+        }
+
+        *res = win;
+        dev_info(sfb->dev, "window %d: fb %s\n", win_no, fbinfo->fix.id);
+
+        return 0;
+
+err_alloc_mem:
+        s3c_fb_free_memory(sfb, win);
+
+err_framebuffer:
+        unregister_framebuffer(fbinfo);
+        return ret;
+}
+
+/**
+ * s3c_fb_clear_win() - clear hardware window registers.
+ * @sfb: The base resources for the hardware.
+ * @win: The window to process.
+ *
+ * Reset the specific window registers to a known state.
+ */
+static void s3c_fb_clear_win(struct s3c_fb *sfb, int win)
+{
+        void __iomem *regs = sfb->regs;
+
+        writel(0, regs + WINCON(win));
+        writel(0xffffff, regs + WxKEYCONy(win, 0));
+        writel(0xffffff, regs + WxKEYCONy(win, 1));
+
+        writel(0, regs + VIDOSD_A(win));
+        writel(0, regs + VIDOSD_B(win));
+        writel(0, regs + VIDOSD_C(win));
+}
+
+static int __devinit s3c_fb_probe(struct platform_device *pdev)
+{
+        struct device *dev = &pdev->dev;
+        struct s3c_fb_platdata *pd;
+        struct s3c_fb *sfb;
+        struct resource *res;
+        int win;
+        int ret = 0;
+
+        pd = pdev->dev.platform_data;
+        if (!pd) {
+                dev_err(dev, "no platform data specified\n");
+                return -EINVAL;
+        }
+
+        sfb = kzalloc(sizeof(struct s3c_fb), GFP_KERNEL);
+        if (!sfb) {
+                dev_err(dev, "no memory for framebuffers\n");
+                return -ENOMEM;
+        }
+
+        sfb->dev = dev;
+        sfb->pdata = pd;
+
+        sfb->bus_clk = clk_get(dev, "lcd");
+        if (IS_ERR(sfb->bus_clk)) {
+                dev_err(dev, "failed to get bus clock\n");
+                goto err_sfb;
+        }
+
+        clk_enable(sfb->bus_clk);
+
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        if (!res) {
+                dev_err(dev, "failed to find registers\n");
+                ret = -ENOENT;
+                goto err_clk;
+        }
+
+        sfb->regs_res = request_mem_region(res->start, resource_size(res),
+                                           dev_name(dev));
+        if (!sfb->regs_res) {
+                dev_err(dev, "failed to claim register region\n");
+                ret = -ENOENT;
+                goto err_clk;
+        }
+
+        sfb->regs = ioremap(res->start, resource_size(res));
+        if (!sfb->regs) {
+                dev_err(dev, "failed to map registers\n");
+                ret = -ENXIO;
+                goto err_req_region;
+        }
+
+        dev_dbg(dev, "got resources (regs %p), probing windows\n", sfb->regs);
+
+        /* setup gpio and output polarity controls */
+
+        pd->setup_gpio();
+
+        writel(pd->vidcon1, sfb->regs + VIDCON1);
+
+        /* zero all windows before we do anything */
+
+        for (win = 0; win < S3C_FB_MAX_WIN; win++)
+                s3c_fb_clear_win(sfb, win);
+
+        /* we have the register setup, start allocating framebuffers */
+
+        for (win = 0; win < S3C_FB_MAX_WIN; win++) {
+                if (!pd->win[win])
+                        continue;
+
+                ret = s3c_fb_probe_win(sfb, win, &sfb->windows[win]);
+                if (ret < 0) {
+                        dev_err(dev, "failed to create window %d\n", win);
+                        for (; win >= 0; win--)
+                                s3c_fb_release_win(sfb, sfb->windows[win]);
+                        goto err_ioremap;
+                }
+        }
+
+        platform_set_drvdata(pdev, sfb);
+
+        return 0;
+
+err_ioremap:
+        iounmap(sfb->regs);
+
+err_req_region:
+        release_resource(sfb->regs_res);
+        kfree(sfb->regs_res);
+
+err_clk:
+        clk_disable(sfb->bus_clk);
+        clk_put(sfb->bus_clk);
+
+err_sfb:
+        kfree(sfb);
+        return ret;
+}
+
+/**
+ * s3c_fb_remove() - Cleanup on module finalisation
+ * @pdev: The platform device we are bound to.
+ *
+ * Shutdown and then release all the resources that the driver allocated
+ * on initialisation.
+ */
+static int __devexit s3c_fb_remove(struct platform_device *pdev)
+{
+        struct s3c_fb *sfb = platform_get_drvdata(pdev);
+        int win;
+
+        for (win = 0; win <= S3C_FB_MAX_WIN; win++)
+                s3c_fb_release_win(sfb, sfb->windows[win]);
+
+        iounmap(sfb->regs);
+
+        clk_disable(sfb->bus_clk);
+        clk_put(sfb->bus_clk);
+
+        release_resource(sfb->regs_res);
+        kfree(sfb->regs_res);
+
+        kfree(sfb);
+
+        return 0;
+}
+
+#ifdef CONFIG_PM
+static int s3c_fb_suspend(struct platform_device *pdev, pm_message_t state)
+{
+        struct s3c_fb *sfb = platform_get_drvdata(pdev);
+        struct s3c_fb_win *win;
+        int win_no;
+
+        for (win_no = S3C_FB_MAX_WIN; win_no >= 0; win_no--) {
+                win = sfb->windows[win_no];
+                if (!win)
+                        continue;
+
+                /* use the blank function to push into power-down */
+                s3c_fb_blank(FB_BLANK_POWERDOWN, win->fbinfo);
+        }
+
+        clk_disable(sfb->bus_clk);
+        return 0;
+}
+
+static int s3c_fb_resume(struct platform_device *pdev)
+{
+        struct s3c_fb *sfb = platform_get_drvdata(pdev);
+        struct s3c_fb_win *win;
+        int win_no;
+
+        clk_enable(sfb->bus_clk);
+
+        for (win_no = 0; win_no < S3C_FB_MAX_WIN; win_no++) {
+                win = sfb->windows[win_no];
+                if (!win)
+                        continue;
+
+                dev_dbg(&pdev->dev, "resuming window %d\n", win_no);
+                s3c_fb_set_par(win->fbinfo);
+        }
+
+        return 0;
+}
+#else
+#define s3c_fb_suspend NULL
+#define s3c_fb_resume  NULL
+#endif
+
+static struct platform_driver s3c_fb_driver = {
+        .probe          = s3c_fb_probe,
+        .remove         = s3c_fb_remove,
+        .suspend        = s3c_fb_suspend,
+        .resume         = s3c_fb_resume,
+        .driver         = {
+                .name   = "s3c-fb",
+                .owner  = THIS_MODULE,
+        },
+};
+
+static int __init s3c_fb_init(void)
+{
+        return platform_driver_register(&s3c_fb_driver);
+}
+
+static void __exit s3c_fb_cleanup(void)
+{
+        platform_driver_unregister(&s3c_fb_driver);
+}
+
+module_init(s3c_fb_init);
+module_exit(s3c_fb_cleanup);
+
+MODULE_AUTHOR("Ben Dooks <ben@simtec.co.uk>");
+MODULE_DESCRIPTION("Samsung S3C SoC Framebuffer driver");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:s3c-fb");
diff --git a/drivers/video/sgivwfb.c b/drivers/video/sgivwfb.c
index f5252c2552fd..bba53714a7b1 100644
--- a/drivers/video/sgivwfb.c
+++ b/drivers/video/sgivwfb.c
@@ -837,6 +837,8 @@ static int sgivwfb_remove(struct platform_device *dev)
                 iounmap(par->regs);
                 iounmap(info->screen_base);
                 release_mem_region(DBE_REG_PHYS, DBE_REG_SIZE);
+                fb_dealloc_cmap(&info->cmap);
+                framebuffer_release(info);
         }
         return 0;
 }
diff --git a/drivers/video/skeletonfb.c b/drivers/video/skeletonfb.c
index df5336561d13..a439159204a8 100644
--- a/drivers/video/skeletonfb.c
+++ b/drivers/video/skeletonfb.c
@@ -795,8 +795,9 @@ static int __devinit xxxfb_probe(struct pci_dev *dev,
     if (!retval || retval == 4)
         return -EINVAL;                 
 
-    /* This has to been done !!! */     
-    fb_alloc_cmap(&info->cmap, cmap_len, 0);
+    /* This has to be done! */
+    if (fb_alloc_cmap(&info->cmap, cmap_len, 0))
+        return -ENOMEM;
         
     /* 
      * The following is done in the case of having hardware with a static 
@@ -820,8 +821,10 @@ static int __devinit xxxfb_probe(struct pci_dev *dev,
      */
     /* xxxfb_set_par(info); */
 
-    if (register_framebuffer(info) < 0)
+    if (register_framebuffer(info) < 0) {
+        fb_dealloc_cmap(&info->cmap);
         return -EINVAL;
+    }
     printk(KERN_INFO "fb%d: %s frame buffer device\n", info->node,
            info->fix.id);
     pci_set_drvdata(dev, info); /* or platform_set_drvdata(pdev, info) */
diff --git a/drivers/video/sm501fb.c b/drivers/video/sm501fb.c
index dcd98793d568..eb5d73a06702 100644
--- a/drivers/video/sm501fb.c
+++ b/drivers/video/sm501fb.c
@@ -1525,7 +1525,10 @@ static int sm501fb_init_fb(struct fb_info *fb,
         }
 
         /* initialise and set the palette */
-        fb_alloc_cmap(&fb->cmap, NR_PALETTE, 0);
+        if (fb_alloc_cmap(&fb->cmap, NR_PALETTE, 0)) {
+                dev_err(info->dev, "failed to allocate cmap memory\n");
+                return -ENOMEM;
+        }
         fb_set_cmap(&fb->cmap, fb);
 
         ret = (fb->fbops->fb_check_var)(&fb->var, fb);
diff --git a/drivers/video/sstfb.c b/drivers/video/sstfb.c
index 5b11a00f49bc..609d0a521ca2 100644
--- a/drivers/video/sstfb.c
+++ b/drivers/video/sstfb.c
@@ -1421,13 +1421,16 @@ static int __devinit sstfb_probe(struct pci_dev *pdev,
                 goto fail;
         }
         
-        fb_alloc_cmap(&info->cmap, 256, 0);
+        if (fb_alloc_cmap(&info->cmap, 256, 0)) {
+                printk(KERN_ERR "sstfb: can't alloc cmap memory.\n");
+                goto fail;
+        }
 
         /* register fb */
         info->device = &pdev->dev;
         if (register_framebuffer(info) < 0) {
                 printk(KERN_ERR "sstfb: can't register framebuffer.\n");
-                goto fail;
+                goto fail_register;
         }
 
         sstfb_clear_screen(info);
@@ -1441,8 +1444,9 @@ static int __devinit sstfb_probe(struct pci_dev *pdev,
 
         return 0;
 
-fail:
+fail_register:
         fb_dealloc_cmap(&info->cmap);
+fail:
         iounmap(info->screen_base);
 fail_fb_remap:
         iounmap(par->mmio_vbase);
diff --git a/drivers/video/stifb.c b/drivers/video/stifb.c
index 166481402412..eabaad765aeb 100644
--- a/drivers/video/stifb.c
+++ b/drivers/video/stifb.c
@@ -1262,24 +1262,25 @@ static int __init stifb_init_fb(struct sti_struct *sti, int bpp_pref)
         info->flags = FBINFO_DEFAULT;
         info->pseudo_palette = &fb->pseudo_palette;
 
-        /* This has to been done !!! */
-        fb_alloc_cmap(&info->cmap, NR_PALETTE, 0);
+        /* This has to be done !!! */
+        if (fb_alloc_cmap(&info->cmap, NR_PALETTE, 0))
+                goto out_err1;
         stifb_init_display(fb);
 
         if (!request_mem_region(fix->smem_start, fix->smem_len, "stifb fb")) {
                 printk(KERN_ERR "stifb: cannot reserve fb region 0x%04lx-0x%04lx\n",
                                 fix->smem_start, fix->smem_start+fix->smem_len);
-                goto out_err1;
+                goto out_err2;
         }
                 
         if (!request_mem_region(fix->mmio_start, fix->mmio_len, "stifb mmio")) {
                 printk(KERN_ERR "stifb: cannot reserve sti mmio region 0x%04lx-0x%04lx\n",
                                 fix->mmio_start, fix->mmio_start+fix->mmio_len);
-                goto out_err2;
+                goto out_err3;
         }
 
         if (register_framebuffer(&fb->info) < 0)
-                goto out_err3;
+                goto out_err4;
 
         sti->info = info; /* save for unregister_framebuffer() */
 
@@ -1297,13 +1298,14 @@ static int __init stifb_init_fb(struct sti_struct *sti, int bpp_pref)
         return 0;
 
 
-out_err3:
+out_err4:
         release_mem_region(fix->mmio_start, fix->mmio_len);
-out_err2:
+out_err3:
         release_mem_region(fix->smem_start, fix->smem_len);
+out_err2:
+        fb_dealloc_cmap(&info->cmap);
 out_err1:
         iounmap(info->screen_base);
-        fb_dealloc_cmap(&info->cmap);
 out_err0:
         kfree(fb);
         return -ENXIO;
diff --git a/drivers/video/sunxvr500.c b/drivers/video/sunxvr500.c
index c2ba51b7ea18..18b950706cad 100644
--- a/drivers/video/sunxvr500.c
+++ b/drivers/video/sunxvr500.c
@@ -349,11 +349,14 @@ static int __devinit e3d_pci_register(struct pci_dev *pdev,
         if (err < 0) {
                 printk(KERN_ERR "e3d: Could not register framebuffer %s\n",
                        pci_name(pdev));
-                goto err_unmap_fb;
+                goto err_free_cmap;
         }
 
         return 0;
 
+err_free_cmap:
+        fb_dealloc_cmap(&info->cmap);
+
 err_unmap_fb:
         iounmap(ep->fb_base);
 
@@ -389,6 +392,7 @@ static void __devexit e3d_pci_unregister(struct pci_dev *pdev)
         pci_release_region(pdev, 0);
         pci_release_region(pdev, 1);
 
+        fb_dealloc_cmap(&info->cmap);
         framebuffer_release(info);
 
         pci_disable_device(pdev);
diff --git a/drivers/video/tdfxfb.c b/drivers/video/tdfxfb.c
index 14bd3f3680b8..ee64771fbe3d 100644
--- a/drivers/video/tdfxfb.c
+++ b/drivers/video/tdfxfb.c
@@ -1393,6 +1393,7 @@ static void __devexit tdfxfb_remove(struct pci_dev *pdev)
         release_mem_region(pci_resource_start(pdev, 0),
                            pci_resource_len(pdev, 0));
         pci_set_drvdata(pdev, NULL);
+        fb_dealloc_cmap(&info->cmap);
         framebuffer_release(info);
 }
 
diff --git a/drivers/video/tgafb.c b/drivers/video/tgafb.c
index 680642c089c9..a86046ff60ad 100644
--- a/drivers/video/tgafb.c
+++ b/drivers/video/tgafb.c
@@ -1663,7 +1663,7 @@ tgafb_register(struct device *dev)
         if (register_framebuffer(info) < 0) {
                 printk(KERN_ERR "tgafb: Could not register framebuffer\n");
                 ret = -EINVAL;
-                goto err1;
+                goto err2;
         }
 
         if (tga_bus_pci) {
@@ -1682,6 +1682,8 @@ tgafb_register(struct device *dev)
 
         return 0;
 
+ err2:
+        fb_dealloc_cmap(&info->cmap);
  err1:
         if (mem_base)
                 iounmap(mem_base);
diff --git a/drivers/video/tridentfb.c b/drivers/video/tridentfb.c
index 479b2e79ad68..03a9c35e9f55 100644
--- a/drivers/video/tridentfb.c
+++ b/drivers/video/tridentfb.c
@@ -2,7 +2,7 @@
  * Frame buffer driver for Trident TGUI, Blade and Image series
  *
  * Copyright 2001, 2002 - Jani Monoses   <jani@iv.ro>
- *
+ * Copyright 2009 Krzysztof Helt <krzysztof.h1@wp.pl>
  *
  * CREDITS:(in order of appearance)
  *      skeletonfb.c by Geert Uytterhoeven and other fb code in drivers/video
@@ -490,7 +490,6 @@ static void tgui_copy_rect(struct tridentfb_par *par,
 /*
  * Accel functions called by the upper layers
  */
-#ifdef CONFIG_FB_TRIDENT_ACCEL
 static void tridentfb_fillrect(struct fb_info *info,
                                const struct fb_fillrect *fr)
 {
@@ -565,11 +564,6 @@ static int tridentfb_sync(struct fb_info *info)
                 par->wait_engine(par);
         return 0;
 }
-#else
-#define tridentfb_fillrect cfb_fillrect
-#define tridentfb_copyarea cfb_copyarea
-#define tridentfb_imageblit cfb_imageblit
-#endif /* CONFIG_FB_TRIDENT_ACCEL */
 
 /*
  * Hardware access functions
@@ -1333,9 +1327,7 @@ static struct fb_ops tridentfb_ops = {
         .fb_fillrect = tridentfb_fillrect,
         .fb_copyarea = tridentfb_copyarea,
         .fb_imageblit = tridentfb_imageblit,
-#ifdef CONFIG_FB_TRIDENT_ACCEL
         .fb_sync = tridentfb_sync,
-#endif
 };
 
 static int __devinit trident_pci_probe(struct pci_dev *dev,
@@ -1359,10 +1351,6 @@ static int __devinit trident_pci_probe(struct pci_dev *dev,
 
         chip_id = id->device;
 
-#ifndef CONFIG_FB_TRIDENT_ACCEL
-        noaccel = 1;
-#endif
-
         /* If PCI id is 0x9660 then further detect chip type */
 
         if (chip_id == TGUI9660) {
@@ -1490,6 +1478,9 @@ static int __devinit trident_pci_probe(struct pci_dev *dev,
         } else
                 info->flags |= FBINFO_HWACCEL_DISABLED;
 
+        if (is_blade(chip_id) && chip_id != BLADE3D)
+                info->flags |= FBINFO_READS_FAST;
+
         info->pixmap.addr = kmalloc(4096, GFP_KERNEL);
         if (!info->pixmap.addr) {
                 err = -ENOMEM;
@@ -1563,6 +1554,7 @@ static void __devexit trident_pci_remove(struct pci_dev *dev)
         release_mem_region(tridentfb_fix.mmio_start, tridentfb_fix.mmio_len);
         pci_set_drvdata(dev, NULL);
         kfree(info->pixmap.addr);
+        fb_dealloc_cmap(&info->cmap);
         framebuffer_release(info);
 }
 
@@ -1663,4 +1655,5 @@ module_exit(tridentfb_exit);
 MODULE_AUTHOR("Jani Monoses <jani@iv.ro>");
 MODULE_DESCRIPTION("Framebuffer driver for Trident cards");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("cyblafb");
 
diff --git a/drivers/video/uvesafb.c b/drivers/video/uvesafb.c
index 74ae75899009..0b370aebdbfd 100644
--- a/drivers/video/uvesafb.c
+++ b/drivers/video/uvesafb.c
@@ -189,7 +189,7 @@ static int uvesafb_exec(struct uvesafb_ktask *task)
         uvfb_tasks[seq] = task;
         mutex_unlock(&uvfb_lock);
 
-        err = cn_netlink_send(m, 0, gfp_any());
+        err = cn_netlink_send(m, 0, GFP_KERNEL);
         if (err == -ESRCH) {
                 /*
                  * Try to start the userspace helper if sending
@@ -850,14 +850,16 @@ static int __devinit uvesafb_vbe_init_mode(struct fb_info *info)
         if (vbemode) {
                 for (i = 0; i < par->vbe_modes_cnt; i++) {
                         if (par->vbe_modes[i].mode_id == vbemode) {
+                                modeid = i;
+                                uvesafb_setup_var(&info->var, info,
+                                                &par->vbe_modes[modeid]);
                                 fb_get_mode(FB_VSYNCTIMINGS | FB_IGNOREMON, 60,
-                                                        &info->var, info);
+                                                &info->var, info);
                                 /*
                                  * With pixclock set to 0, the default BIOS
                                  * timings will be used in set_par().
                                  */
                                 info->var.pixclock = 0;
-                                modeid = i;
                                 goto gotmode;
                         }
                 }
@@ -904,8 +906,11 @@ static int __devinit uvesafb_vbe_init_mode(struct fb_info *info)
                         fb_videomode_to_var(&info->var, mode);
                 } else {
                         modeid = par->vbe_modes[0].mode_id;
+                        uvesafb_setup_var(&info->var, info,
+                                        &par->vbe_modes[modeid]);
                         fb_get_mode(FB_VSYNCTIMINGS | FB_IGNOREMON, 60,
-                                    &info->var, info);
+                                        &info->var, info);
+
                         goto gotmode;
                 }
         }
@@ -917,9 +922,9 @@ static int __devinit uvesafb_vbe_init_mode(struct fb_info *info)
         if (modeid == -1)
                 return -EINVAL;
 
-gotmode:
         uvesafb_setup_var(&info->var, info, &par->vbe_modes[modeid]);
 
+gotmode:
         /*
          * If we are not VBE3.0+ compliant, we're done -- the BIOS will
          * ignore our timings anyway.
@@ -1552,7 +1557,7 @@ static void __devinit uvesafb_init_info(struct fb_info *info,
         }
 
         info->flags = FBINFO_FLAG_DEFAULT |
-                        (par->ypan) ? FBINFO_HWACCEL_YPAN : 0;
+                        (par->ypan ? FBINFO_HWACCEL_YPAN : 0);
 
         if (!par->ypan)
                 info->fbops->fb_pan_display = NULL;
diff --git a/drivers/video/valkyriefb.c b/drivers/video/valkyriefb.c
index 7b0cef9ca8f9..4bb9a0b18950 100644
--- a/drivers/video/valkyriefb.c
+++ b/drivers/video/valkyriefb.c
@@ -119,7 +119,7 @@ static void set_valkyrie_clock(unsigned char *params);
 static int valkyrie_var_to_par(struct fb_var_screeninfo *var,
         struct fb_par_valkyrie *par, const struct fb_info *fb_info);
 
-static void valkyrie_init_info(struct fb_info *info, struct fb_info_valkyrie *p);
+static int valkyrie_init_info(struct fb_info *info, struct fb_info_valkyrie *p);
 static void valkyrie_par_to_fix(struct fb_par_valkyrie *par, struct fb_fix_screeninfo *fix);
 static void valkyrie_init_fix(struct fb_fix_screeninfo *fix, struct fb_info_valkyrie *p);
 
@@ -381,18 +381,22 @@ int __init valkyriefb_init(void)
 
         valkyrie_choose_mode(p);
         mac_vmode_to_var(default_vmode, default_cmode, &p->info.var);
-        valkyrie_init_info(&p->info, p);
+        err = valkyrie_init_info(&p->info, p);
+        if (err < 0)
+                goto out_free;
         valkyrie_init_fix(&p->info.fix, p);
         if (valkyriefb_set_par(&p->info))
                 /* "can't happen" */
                 printk(KERN_ERR "valkyriefb: can't set default video mode\n");
 
         if ((err = register_framebuffer(&p->info)) != 0)
-                goto out_free;
+                goto out_cmap_free;
 
         printk(KERN_INFO "fb%d: valkyrie frame buffer device\n", p->info.node);
         return 0;
 
+ out_cmap_free:
+        fb_dealloc_cmap(&p->info.cmap);
  out_free:
         if (p->frame_buffer)
                 iounmap(p->frame_buffer);
@@ -538,14 +542,15 @@ static void valkyrie_par_to_fix(struct fb_par_valkyrie *par,
                 /* ywrapstep, xpanstep, ypanstep */
 }
 
-static void __init valkyrie_init_info(struct fb_info *info, struct fb_info_valkyrie *p)
+static int __init valkyrie_init_info(struct fb_info *info,
+                struct fb_info_valkyrie *p)
 {
         info->fbops = &valkyriefb_ops;
         info->screen_base = p->frame_buffer + 0x1000;
         info->flags = FBINFO_DEFAULT;
         info->pseudo_palette = p->pseudo_palette;
-        fb_alloc_cmap(&info->cmap, 256, 0);
         info->par = &p->par;
+        return fb_alloc_cmap(&info->cmap, 256, 0);
 }
 
 
diff --git a/drivers/video/vesafb.c b/drivers/video/vesafb.c
index e16322d157d0..d6856f43d241 100644
--- a/drivers/video/vesafb.c
+++ b/drivers/video/vesafb.c
@@ -438,7 +438,7 @@ static int __init vesafb_probe(struct platform_device *dev)
         info->var = vesafb_defined;
         info->fix = vesafb_fix;
         info->flags = FBINFO_FLAG_DEFAULT |
-                (ypan) ? FBINFO_HWACCEL_YPAN : 0;
+                (ypan ? FBINFO_HWACCEL_YPAN : 0);
 
         if (!ypan)
                 info->fbops->fb_pan_display = NULL;
diff --git a/drivers/video/vfb.c b/drivers/video/vfb.c
index 93fe08d6c78f..cc919ae46571 100644
--- a/drivers/video/vfb.c
+++ b/drivers/video/vfb.c
@@ -543,6 +543,7 @@ static int vfb_remove(struct platform_device *dev)
         if (info) {
                 unregister_framebuffer(info);
                 rvfree(videomemory, videomemorysize);
+                fb_dealloc_cmap(&info->cmap);
                 framebuffer_release(info);
         }
         return 0;
diff --git a/drivers/video/via/accel.c b/drivers/video/via/accel.c
index 632523ff1fb7..45c54bfe99bb 100644
--- a/drivers/video/via/accel.c
+++ b/drivers/video/via/accel.c
@@ -267,13 +267,17 @@ int viafb_wait_engine_idle(void)
         int loop = 0;
 
         while (!(readl(viaparinfo->io_virt + VIA_REG_STATUS) &
-                        VIA_VR_QUEUE_BUSY) && (loop++ < MAXLOOP))
+                        VIA_VR_QUEUE_BUSY) && (loop < MAXLOOP)) {
+                loop++;
                 cpu_relax();
+        }
 
         while ((readl(viaparinfo->io_virt + VIA_REG_STATUS) &
                     (VIA_CMD_RGTR_BUSY | VIA_2D_ENG_BUSY | VIA_3D_ENG_BUSY)) &&
-                    (loop++ < MAXLOOP))
+                    (loop < MAXLOOP)) {
+                loop++;
                 cpu_relax();
+        }
 
         return loop >= MAXLOOP;
 }
diff --git a/drivers/video/via/viafbdev.c b/drivers/video/via/viafbdev.c
index 37b433a08ce8..e327b84820d2 100644
--- a/drivers/video/via/viafbdev.c
+++ b/drivers/video/via/viafbdev.c
@@ -2059,25 +2059,21 @@ static void viafb_init_proc(struct proc_dir_entry **viafb_entry)
         if (viafb_entry) {
                 entry = create_proc_entry("dvp0", 0, *viafb_entry);
                 if (entry) {
-                        entry->owner = THIS_MODULE;
                         entry->read_proc = viafb_dvp0_proc_read;
                         entry->write_proc = viafb_dvp0_proc_write;
                 }
                 entry = create_proc_entry("dvp1", 0, *viafb_entry);
                 if (entry) {
-                        entry->owner = THIS_MODULE;
                         entry->read_proc = viafb_dvp1_proc_read;
                         entry->write_proc = viafb_dvp1_proc_write;
                 }
                 entry = create_proc_entry("dfph", 0, *viafb_entry);
                 if (entry) {
-                        entry->owner = THIS_MODULE;
                         entry->read_proc = viafb_dfph_proc_read;
                         entry->write_proc = viafb_dfph_proc_write;
                 }
                 entry = create_proc_entry("dfpl", 0, *viafb_entry);
                 if (entry) {
-                        entry->owner = THIS_MODULE;
                         entry->read_proc = viafb_dfpl_proc_read;
                         entry->write_proc = viafb_dfpl_proc_write;
                 }
@@ -2086,7 +2082,6 @@ static void viafb_init_proc(struct proc_dir_entry **viafb_entry)
                     viaparinfo->chip_info->lvds_chip_info2.lvds_chip_name) {
                         entry = create_proc_entry("vt1636", 0, *viafb_entry);
                         if (entry) {
-                                entry->owner = THIS_MODULE;
                                 entry->read_proc = viafb_vt1636_proc_read;
                                 entry->write_proc = viafb_vt1636_proc_write;
                         }
diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c
index 5777196bf6c9..5c52369ab9bb 100644
--- a/drivers/virtio/virtio_ring.c
+++ b/drivers/virtio/virtio_ring.c
@@ -23,15 +23,21 @@
 
 #ifdef DEBUG
 /* For development, we want to crash whenever the ring is screwed. */
-#define BAD_RING(vq, fmt...)                    \
-        do { dev_err(&vq->vq.vdev->dev, fmt); BUG(); } while(0)
-#define START_USE(vq) \
-        do { if ((vq)->in_use) panic("in_use = %i\n", (vq)->in_use); (vq)->in_use = __LINE__; mb(); } while(0)
-#define END_USE(vq) \
-        do { BUG_ON(!(vq)->in_use); (vq)->in_use = 0; mb(); } while(0)
+#define BAD_RING(_vq, fmt...)                   \
+        do { dev_err(&(_vq)->vq.vdev->dev, fmt); BUG(); } while(0)
+/* Caller is supposed to guarantee no reentry. */
+#define START_USE(_vq)                                          \
+        do {                                                    \
+                if ((_vq)->in_use)                              \
+                        panic("in_use = %i\n", (_vq)->in_use);  \
+                (_vq)->in_use = __LINE__;                       \
+                mb();                                           \
+        } while(0)
+#define END_USE(_vq) \
+        do { BUG_ON(!(_vq)->in_use); (_vq)->in_use = 0; mb(); } while(0)
 #else
-#define BAD_RING(vq, fmt...)                    \
-        do { dev_err(&vq->vq.vdev->dev, fmt); (vq)->broken = true; } while(0)
+#define BAD_RING(_vq, fmt...)                   \
+        do { dev_err(&_vq->vq.vdev->dev, fmt); (_vq)->broken = true; } while(0)
 #define START_USE(vq)
 #define END_USE(vq)
 #endif
diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c
index 6cf155d6b350..3137361ccbfe 100644
--- a/drivers/watchdog/hpwdt.c
+++ b/drivers/watchdog/hpwdt.c
@@ -380,7 +380,7 @@ asm(".text                      \n\t"
  *      This function checks whether or not a SMBIOS/DMI record is
  *      the 64bit CRU info or not
  */
-static void __devinit dmi_find_cru(const struct dmi_header *dm)
+static void __devinit dmi_find_cru(const struct dmi_header *dm, void *dummy)
 {
         struct smbios_cru64_info *smbios_cru64_ptr;
         unsigned long cru_physical_address;
@@ -403,7 +403,7 @@ static int __devinit detect_cru_service(void)
 {
         cru_rom_addr = NULL;
 
-        dmi_walk(dmi_find_cru);
+        dmi_walk(dmi_find_cru, NULL);
 
         /* if cru_rom_addr has been set then we found a CRU service */
         return ((cru_rom_addr != NULL) ? 0 : -ENODEV);